From fedora-extras-commits at redhat.com  Sun Oct  1 01:32:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 30 Sep 2006 18:32:53 -0700
Subject: rpms/perl-Alien-wxWidgets/devel
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch, NONE,
	1.1 perl-Alien-wxWidgets.spec, 1.2, 1.3
Message-ID: <200610010132.k911WtOP009761@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9741

Modified Files:
	perl-Alien-wxWidgets.spec 
Added Files:
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch 
Log Message:
Patch to add /usr/lib64 to the library search path.

Alien-wxWidgets-0.21-Any_wx_config.pm.patch:

--- NEW FILE Alien-wxWidgets-0.21-Any_wx_config.pm.patch ---
diff -ruN Alien-wxWidgets-0.21-orig/inc/My/Build/Any_wx_config.pm Alien-wxWidgets-0.21/inc/My/Build/Any_wx_config.pm
--- Alien-wxWidgets-0.21-orig/inc/My/Build/Any_wx_config.pm	2006-08-27 16:21:49.000000000 +0100
+++ Alien-wxWidgets-0.21/inc/My/Build/Any_wx_config.pm	2006-10-01 02:27:40.000000000 +0100
@@ -116,7 +116,7 @@
     }
 
     my @paths = ( ( map { s/^-L//; $_ } grep { /^-L/ } split ' ', $libs ),
-                  qw(/usr/local/lib /usr/lib) );
+                  qw(/usr/local/lib /usr/lib /usr/lib64) );
 
     foreach ( split /\s+/, $libs ) {
         m{^-[lL]|/} && do { $config{link_libraries} .= " $_"; next; };


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Alien-wxWidgets.spec	28 Sep 2006 12:48:56 -0000	1.2
+++ perl-Alien-wxWidgets.spec	1 Oct 2006 01:32:52 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           perl-Alien-wxWidgets
 Version:        0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
+Patch0:         Alien-wxWidgets-0.21-Any_wx_config.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
+%patch0 -p1
 
 
 %build
@@ -51,6 +53,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-3
+- Patch to add /usr/lib64 to the library search path.
+
 * Thu Sep 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-2
 - This is a binary RPM (see bug #208007 comment #2).
 



From fedora-extras-commits at redhat.com  Sun Oct  1 01:48:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 30 Sep 2006 18:48:42 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-5
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch, NONE,
	1.1 perl-Alien-wxWidgets.spec, 1.2, 1.3
Message-ID: <200610010148.k911miIF009854@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834

Modified Files:
	perl-Alien-wxWidgets.spec 
Added Files:
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch 
Log Message:
Patch to add /usr/lib64 to the library search path.

Alien-wxWidgets-0.21-Any_wx_config.pm.patch:

--- NEW FILE Alien-wxWidgets-0.21-Any_wx_config.pm.patch ---
diff -ruN Alien-wxWidgets-0.21-orig/inc/My/Build/Any_wx_config.pm Alien-wxWidgets-0.21/inc/My/Build/Any_wx_config.pm
--- Alien-wxWidgets-0.21-orig/inc/My/Build/Any_wx_config.pm	2006-08-27 16:21:49.000000000 +0100
+++ Alien-wxWidgets-0.21/inc/My/Build/Any_wx_config.pm	2006-10-01 02:27:40.000000000 +0100
@@ -116,7 +116,7 @@
     }
 
     my @paths = ( ( map { s/^-L//; $_ } grep { /^-L/ } split ' ', $libs ),
-                  qw(/usr/local/lib /usr/lib) );
+                  qw(/usr/local/lib /usr/lib /usr/lib64) );
 
     foreach ( split /\s+/, $libs ) {
         m{^-[lL]|/} && do { $config{link_libraries} .= " $_"; next; };


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/perl-Alien-wxWidgets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Alien-wxWidgets.spec	28 Sep 2006 12:48:56 -0000	1.2
+++ perl-Alien-wxWidgets.spec	1 Oct 2006 01:48:42 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           perl-Alien-wxWidgets
 Version:        0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
+Patch0:         Alien-wxWidgets-0.21-Any_wx_config.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
+%patch0 -p1
 
 
 %build
@@ -51,6 +53,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-3
+- Patch to add /usr/lib64 to the library search path.
+
 * Thu Sep 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-2
 - This is a binary RPM (see bug #208007 comment #2).
 



From fedora-extras-commits at redhat.com  Sun Oct  1 04:20:42 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 30 Sep 2006 21:20:42 -0700
Subject: owners owners.list,1.1748,1.1749
Message-ID: <200610010420.k914Ki7d019098@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081/owners

Modified Files:
	owners.list 
Log Message:
No need to automatically CC: the extras-orphan account for ots, right? :)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -r1.1748 -r1.1749
--- owners.list	30 Sep 2006 20:33:40 -0000	1.1748
+++ owners.list	1 Oct 2006 04:20:41 -0000	1.1749
@@ -1155,7 +1155,7 @@
 Fedora Extras|osgcal|Adapts OpenSceneGraph to use Cal3D|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
 Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|otrs|The Open Ticket Request System|imlinux at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|ots|A text summarizer|peter at thecodergeek.com|extras-qa at fedoraproject.org|extras-orphan at fedoraproject.org
+Fedora Extras|ots|A text summarizer|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|overgod|Another Asteroid like game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|p0rn-comfort|Support programs for browsing image-gallery sites|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 04:41:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:41:27 -0700
Subject: rpms/evolution-bogofilter - New directory
Message-ID: <200610010441.k914fTdu019253@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19227/evolution-bogofilter

Log Message:
Directory /cvs/extras/rpms/evolution-bogofilter added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 04:41:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:41:28 -0700
Subject: rpms/evolution-bogofilter/devel - New directory
Message-ID: <200610010441.k914fU9h019256@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19227/evolution-bogofilter/devel

Log Message:
Directory /cvs/extras/rpms/evolution-bogofilter/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 04:41:36 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:41:36 -0700
Subject: rpms/evolution-bogofilter Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610010441.k914fcYB019300@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19272

Added Files:
	Makefile import.log 
Log Message:
Setup of module evolution-bogofilter


--- NEW FILE Makefile ---
# Top level Makefile for module evolution-bogofilter
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 04:41:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:41:37 -0700
Subject: rpms/evolution-bogofilter/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610010441.k914fdh6019303@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19272/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module evolution-bogofilter


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 04:42:01 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:42:01 -0700
Subject: rpms/evolution-bogofilter import.log,1.1,1.2
Message-ID: <200610010442.k914gXj1019370@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19336

Modified Files:
	import.log 
Log Message:
auto-import evolution-bogofilter-0.2.0-3.fc6 on branch devel from evolution-bogofilter-0.2.0-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/evolution-bogofilter/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 04:41:36 -0000	1.1
+++ import.log	1 Oct 2006 04:42:01 -0000	1.2
@@ -0,0 +1 @@
+evolution-bogofilter-0_2_0-3_fc6:HEAD:evolution-bogofilter-0.2.0-3.fc6.src.rpm:1159659718



From fedora-extras-commits at redhat.com  Sun Oct  1 04:42:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:42:02 -0700
Subject: rpms/evolution-bogofilter/devel evolution-bogofilter.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610010442.k914gY4l019374@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19336/devel

Modified Files:
	.cvsignore sources 
Added Files:
	evolution-bogofilter.spec 
Log Message:
auto-import evolution-bogofilter-0.2.0-3.fc6 on branch devel from evolution-bogofilter-0.2.0-3.fc6.src.rpm


--- NEW FILE evolution-bogofilter.spec ---
%define	evopluginver	%(pkg-config --list-all |grep evolution-plugin | sed -e "s/evolution-plugin-//g" | cut -d " " -f 1)

Name:		evolution-bogofilter
Summary:	A plugin for bogofilter support in evolution
Version: 	0.2.0
Release:	3%{?dist}
License:	GPL
Group:		Applications/Internet
URL:		http://people.altlinux.ru/~mhz/software/projects/bf-eplugin/
Source0:	http://people.altlinux.ru/~mhz/software/projects/bf-eplugin/bf-eplugin-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	evolution-devel, evolution-data-server-devel
BuildRequires:	pkgconfig
Requires:	bogofilter
Requires(post):	GConf2

%description
This plugin implements junk filtering for the Evolution mailer, provided by 
the bogofilter utility. Bogofilter (http://www.bogofilter.org) is a fast and 
nimble mail filter using a so-called Bayesian technique to classify junk and 
non-junk email.

%prep
%setup -q -n bf-eplugin-%{version}
%if "%{evopluginver}" != "2.6"
sed -i 's/evolution-plugin-2.6/evolution-plugin-%{evopluginver}/g' configure
%endif

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
rm -rf $RPM_BUILD_ROOT%{_libdir}/evolution/%{evopluginver}/plugins/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
SCHEMAS="bf-eplugin.schemas"
for S in $SCHEMAS; do
  gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
done

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%config(noreplace) %{_sysconfdir}/gconf/schemas/bf-eplugin.schemas
%{_libdir}/evolution/%{evopluginver}/plugins/*

%changelog
* Fri Sep 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.0-3
- add URL, even if it is a bit pointless
- add docs
- mark schemas as config
- change defattr to be more accurate

* Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.0-2
- add missing BR: evolution-data-server-devel

* Wed Jul 26 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.0-1
- Initial package for Fedora Extras.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evolution-bogofilter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 04:41:36 -0000	1.1
+++ .cvsignore	1 Oct 2006 04:42:02 -0000	1.2
@@ -0,0 +1 @@
+bf-eplugin-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evolution-bogofilter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 04:41:36 -0000	1.1
+++ sources	1 Oct 2006 04:42:02 -0000	1.2
@@ -0,0 +1 @@
+668f11a7f04a1af32b1077420854bd98  bf-eplugin-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 04:58:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:58:56 -0700
Subject: owners owners.list,1.1749,1.1750
Message-ID: <200610010458.k914wwS0019609@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19592

Modified Files:
	owners.list 
Log Message:

Add evolution-bogofilter.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1749
retrieving revision 1.1750
diff -u -r1.1749 -r1.1750
--- owners.list	1 Oct 2006 04:20:41 -0000	1.1749
+++ owners.list	1 Oct 2006 04:58:56 -0000	1.1750
@@ -350,6 +350,7 @@
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|evas|A hardware-accelerated canvas API|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|eventlog|Syslog-ng v2 support library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|evolution-bogofilter|A plugin for bogofilter support in evolution|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exiv2|Exif and Iptc metadata manipulation library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 05:00:54 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 22:00:54 -0700
Subject: comps comps-fe5.xml.in,1.157,1.158 comps-fe6.xml.in,1.170,1.171
Message-ID: <200610010500.k9150uxq019655@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19636

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:

Evolution-bogofilter



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- comps-fe5.xml.in	28 Sep 2006 20:07:53 -0000	1.157
+++ comps-fe5.xml.in	1 Oct 2006 05:00:54 -0000	1.158
@@ -451,6 +451,7 @@
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">dillo</packagereq>
       <packagereq type="optional">drivel</packagereq>
+      <packagereq type="optional">evolution-bogofilter</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
       <packagereq type="optional">gaim-gaym</packagereq>
       <packagereq type="optional">gajim</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- comps-fe6.xml.in	28 Sep 2006 20:07:53 -0000	1.170
+++ comps-fe6.xml.in	1 Oct 2006 05:00:54 -0000	1.171
@@ -521,6 +521,7 @@
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">dillo</packagereq>
       <packagereq type="optional">drivel</packagereq>
+      <packagereq type="optional">evolution-bogofilter</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
       <packagereq type="optional">gajim</packagereq>
       <packagereq type="optional">galeon</packagereq>



From fedora-extras-commits at redhat.com  Sun Oct  1 09:43:24 2006
From: fedora-extras-commits at redhat.com (Frank Arnold (farnold))
Date: Sun,  1 Oct 2006 02:43:24 -0700
Subject: rpms/linux-libertine-fonts/devel .cvsignore, 1.4,
	1.5 linux-libertine-fonts.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200610010943.k919hQrw003856@cvs-int.fedora.redhat.com>

Author: farnold

Update of /cvs/extras/rpms/linux-libertine-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3835

Modified Files:
	.cvsignore linux-libertine-fonts.spec sources 
Log Message:
* Tue Oct 01 2006 Frank Arnold <frank at scirocco-5v-turbo.de> 2.2.0-1
- Updated to 2.2.0
- Removed ghosted cache file as it's no longer stored in tree
- Disabled generation of PDF files because fontforge will segfault
- Added OFL to License field



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Sep 2006 00:06:46 -0000	1.4
+++ .cvsignore	1 Oct 2006 09:43:23 -0000	1.5
@@ -1 +1 @@
-LinLibertineSRC-2.1.9.tgz
+LinLibertineSRC-2.2.0.tgz


Index: linux-libertine-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/linux-libertine-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-libertine-fonts.spec	20 Sep 2006 00:06:46 -0000	1.4
+++ linux-libertine-fonts.spec	1 Oct 2006 09:43:23 -0000	1.5
@@ -2,11 +2,11 @@
 %define fontdir         %{_datadir}/fonts/linux-libertine
 
 Name:          linux-libertine-fonts
-Version:       2.1.9
-Release:       2%{?dist}
+Version:       2.2.0
+Release:       1%{?dist}
 Summary:       Linux Libertine Open Fonts
 Group:         User Interface/X
-License:       GPL
+License:       OFL/GPL
 URL:           http://linuxlibertine.sf.net
 Source:        http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,8 +29,8 @@
 while ( i < \$argc )
   Open (\$argv[i], 1)
   Generate (\$fontname + ".ttf")
-  PrintSetup (5)
-  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
+# PrintSetup (5)
+# PrintFont (0, 0, "", \$fontname + "-sample.pdf")
   Close()
   i++
 endloop
@@ -43,10 +43,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -p -m 0644 *.ttf  $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,18 +64,23 @@
 
 %files
 %defattr(644,root,root,755)
-%doc Bugs ChangeLog.txt Readme *.pdf
+%doc Bugs Readme *.txt
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Tue Oct 01 2006 Frank Arnold <frank at scirocco-5v-turbo.de> 2.2.0-1
+- Updated to 2.2.0
+- Removed ghosted cache file as it's no longer stored in tree
+- Disabled generation of PDF files because fontforge will segfault
+- Added OFL to License field
+
 * Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> 2.1.9-2
-- Upload proper 2.9.1 sources and rebuild
+- Upload proper 2.1.9 sources and rebuild
 
 * Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> 2.1.9-1
-- Update to 2.9.1
+- Update to 2.1.9
 
 * Tue Aug 29 2006 Frank Arnold <frank at scirocco-5v-turbo.de> 2.1.0-1
 - Updated to 2.1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Sep 2006 00:06:46 -0000	1.4
+++ sources	1 Oct 2006 09:43:23 -0000	1.5
@@ -1 +1 @@
-18a516945e3b2e40bb34bacad3453b20  LinLibertineSRC-2.1.9.tgz
+7262729601f8e308a5a4c51b54a34057  LinLibertineSRC-2.2.0.tgz



From fedora-extras-commits at redhat.com  Sun Oct  1 12:04:35 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:04:35 -0700
Subject: rpms/newsx/devel - New directory
Message-ID: <200610011204.k91C4bTl019187@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19158/newsx/devel

Log Message:
Directory /cvs/extras/rpms/newsx/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 12:04:34 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:04:34 -0700
Subject: rpms/newsx - New directory
Message-ID: <200610011204.k91C4a7Y019181@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19158/newsx

Log Message:
Directory /cvs/extras/rpms/newsx added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 12:05:00 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:05:00 -0700
Subject: rpms/newsx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610011205.k91C52GT019236@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19203

Added Files:
	Makefile import.log 
Log Message:
Setup of module newsx


--- NEW FILE Makefile ---
# Top level Makefile for module newsx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 12:05:01 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:05:01 -0700
Subject: rpms/newsx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610011205.k91C54Oc019239@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19203/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module newsx


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 12:06:47 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:06:47 -0700
Subject: rpms/newsx import.log,1.1,1.2
Message-ID: <200610011206.k91C6nWW019309@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19275

Modified Files:
	import.log 
Log Message:
auto-import newsx-1.6-3 on branch devel from newsx-1.6-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/newsx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 12:04:59 -0000	1.1
+++ import.log	1 Oct 2006 12:06:47 -0000	1.2
@@ -0,0 +1 @@
+newsx-1_6-3:HEAD:newsx-1.6-3.src.rpm:1159704400



From fedora-extras-commits at redhat.com  Sun Oct  1 12:06:47 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:06:47 -0700
Subject: rpms/newsx/devel newsx-make.patch, NONE, 1.1 newsx.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610011206.k91C6nOF019316@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19275/devel

Modified Files:
	.cvsignore sources 
Added Files:
	newsx-make.patch newsx.spec 
Log Message:
auto-import newsx-1.6-3 on branch devel from newsx-1.6-3.src.rpm

newsx-make.patch:

--- NEW FILE newsx-make.patch ---
--- newsx-1.6/configure.ac.orig	2003-05-18 12:57:24.000000000 +0200
+++ newsx-1.6/configure.ac	2003-11-01 17:49:44.632034248 +0100
@@ -690,7 +690,6 @@
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MMAP
-AC_CHECK_LIB(nsl, main)
 AC_CHECK_LIB(inet, main)
 AC_CHECK_LIB(socket, main)
 AC_CHECK_LIB(gen, syslog)
@@ -719,7 +718,7 @@
     dnl Note that double inclusion of -lstorage seem to be required
     dnl on some systems to get the QIO-functions
     dnl
-    LIBS="$LIBS -linn -lstorage"
+    LIBS="$LIBS -linnhist -linn -lstorage"
     AC_CHECK_LIB(storage, IsToken, HAVE_LIBSTORAGE=1)
 
     dnl
@@ -774,7 +773,7 @@
     dnl Note that double inclusion of -lstorage seem to be required
     dnl on some systems to get the QIO-functions
     dnl
-    MORELIBS2="-lstorage $MORELIBS2 -lstorage"
+    MORELIBS2="-lstorage -linnhist $MORELIBS2 -lstorage"
     dnl BUG: remove...
     dnl LIBS="-lstorage $LIBS -lstorage"
     AC_DEFINE_UNQUOTED(HAVE_LIBSTORAGE, 1, [for INN 2.x: storage-API available?])
--- newsx-1.6/src/Makefile.am.orig	2003-05-18 12:57:24.000000000 +0200
+++ newsx-1.6/src/Makefile.am	2003-11-01 18:12:59.022054744 +0100
@@ -99,16 +99,16 @@
 
 # Prepare a place for newsx in the news spool: 
 install-exec-local:
-	if test ! -d ${INHOSTS} ; then \
-	    if test -d ${SPOOL}/in.hosts ; then \
+	if test ! -d $(DESTDIR)${INHOSTS} ; then \
+	    if test -d $(DESTDIR)${SPOOL}/in.hosts ; then \
 		echo The default location has changed, so we move ;\
 		echo the directory ${SPOOL}/in.hosts to ${INHOSTS} ;\
-		mv ${SPOOL}/in.hosts ${INHOSTS} ;\
+		mv $(DESTDIR)${SPOOL}/in.hosts $(DESTDIR)${INHOSTS} ;\
 	    else \
-		echo Creating directory ${INHOSTS} ;\
+		echo Creating directory $(DESTDIR)${INHOSTS} ;\
 		umask @INN_NEWSUMASK@ ;\
-		mkdir ${INHOSTS} ;\
-		chown ${NEWSUSER} ${INHOSTS} ;\
+		install -d $(DESTDIR)${INHOSTS} ;\
+		[ `id -u` -gt 0 ] || chown ${NEWSUSER} $(DESTDIR)${INHOSTS} ;\
 	    fi ;\
 	fi
 


--- NEW FILE newsx.spec ---
# $Revision: 1.5 $, $Date: 2006/07/28 17:49:36 $
Name:		newsx
Version:	1.6
Release:	3%{?dist}
License:	GPL
Summary:	NNTP news exchange utility
Summary(pl):	Narz??dzie do wymiany news??w po NNTP
Group:		Applications/Internet
Source0:	ftp://ftp.kvaleberg.com/pub/%{name}-%{version}.tar.gz
# Source0-md5:	ad9c76c53d5c7d21d86bec805fe8cd34
Patch0:		%{name}-make.patch
URL:		http://www.kvaleberg.com/newsx.html
BuildRequires:	inn-devel
BuildRequires:	automake
BuildRequires:	autoconf
Requires:	inn
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Newsx is an NNTP client that will connect to a remote NNTP server and
post outgoing news articles batched by the news system (e.g. INN), as
well as fetch incoming articles.

%description -l pl
Newsx jest klientem NNTP kt??ry ????czy si?? ze zdalnym serwerem i wysy??a
wychodz??ce artyku??y zgromadzone przez system news??w (np. INN) oraz
pobiera przychodz??ce artyku??y.

%prep
%setup -q
%patch0 -p1

%build
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
%configure

%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

%{__make} install \
	DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
%attr(755,root,root) %{_bindir}/*
%attr(770,root,news) %dir /var/spool/news/inhosts
%{_mandir}/man[158]/*

%changelog
* Fri Jul 27 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-3
- remove unnecessary Provides: tag

* Sun Apr 02 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-2
- fix BuildReqs

* Sat Jan 07 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-1
- FE compliance

* Sun Sep 25 2005 Dominik Mierzejewski <rpm at greysector.net>
- rebuilt for Fedora based on PLD specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 12:05:00 -0000	1.1
+++ .cvsignore	1 Oct 2006 12:06:47 -0000	1.2
@@ -0,0 +1 @@
+newsx-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 12:05:00 -0000	1.1
+++ sources	1 Oct 2006 12:06:47 -0000	1.2
@@ -0,0 +1 @@
+ad9c76c53d5c7d21d86bec805fe8cd34  newsx-1.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 12:09:48 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:09:48 -0700
Subject: owners owners.list,1.1750,1.1751
Message-ID: <200610011209.k91C9oM1019487@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19470

Modified Files:
	owners.list 
Log Message:
Add myself as the maintainer of newsx.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1750
retrieving revision 1.1751
diff -u -r1.1750 -r1.1751
--- owners.list	1 Oct 2006 04:58:56 -0000	1.1750
+++ owners.list	1 Oct 2006 12:09:48 -0000	1.1751
@@ -1095,6 +1095,7 @@
 Fedora Extras|new|A simple template system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
+Fedora Extras|newsx|NNTP news exchange utility|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 12:22:31 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:22:31 -0700
Subject: rpms/newsx/devel newsx.spec,1.1,1.2
Message-ID: <200610011222.k91CMXBY019531@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19514

Modified Files:
	newsx.spec 
Log Message:
- fix build on devel


Index: newsx.spec
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/newsx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newsx.spec	1 Oct 2006 12:06:47 -0000	1.1
+++ newsx.spec	1 Oct 2006 12:22:31 -0000	1.2
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 Name:		newsx
 Version:	1.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz??dzie do wymiany news??w po NNTP
@@ -35,7 +35,7 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure --with-history=%{_var}/lib/news/history
 
 %{__make} %{?_smp_mflags}
 
@@ -56,6 +56,9 @@
 %{_mandir}/man[158]/*
 
 %changelog
+* Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-4
+- fix build on devel
+
 * Fri Jul 27 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-3
 - remove unnecessary Provides: tag
 



From fedora-extras-commits at redhat.com  Sun Oct  1 12:27:49 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:27:49 -0700
Subject: rpms/newsx/devel newsx.spec,1.2,1.3
Message-ID: <200610011227.k91CRp5W019609@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19592

Modified Files:
	newsx.spec 
Log Message:
- really fix build on devel


Index: newsx.spec
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/newsx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newsx.spec	1 Oct 2006 12:22:31 -0000	1.2
+++ newsx.spec	1 Oct 2006 12:27:49 -0000	1.3
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 Name:		newsx
 Version:	1.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz??dzie do wymiany news??w po NNTP
@@ -35,7 +35,7 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure --with-history=%{_var}/lib/news/history
+%configure --without-history
 
 %{__make} %{?_smp_mflags}
 
@@ -56,7 +56,7 @@
 %{_mandir}/man[158]/*
 
 %changelog
-* Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-4
+* Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-5
 - fix build on devel
 
 * Fri Jul 27 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-3



From fedora-extras-commits at redhat.com  Sun Oct  1 12:36:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:36:51 -0700
Subject: rpms/php-pear-Console-Getargs - New directory
Message-ID: <200610011236.k91CarCP019755@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19729/php-pear-Console-Getargs

Log Message:
Directory /cvs/extras/rpms/php-pear-Console-Getargs added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 12:36:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:36:51 -0700
Subject: rpms/php-pear-Console-Getargs/devel - New directory
Message-ID: <200610011236.k91Car3M019758@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19729/php-pear-Console-Getargs/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Console-Getargs/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 12:37:14 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:37:14 -0700
Subject: rpms/php-pear-Console-Getargs/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610011237.k91CbGWp019810@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19774/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Console-Getargs


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 12:37:14 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:37:14 -0700
Subject: rpms/php-pear-Console-Getargs Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200610011237.k91CbGSX019807@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19774

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Console-Getargs


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Console-Getargs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 12:38:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:38:04 -0700
Subject: rpms/php-pear-Console-Getargs import.log,1.1,1.2
Message-ID: <200610011238.k91Cc6Wb019883@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19848

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Console-Getargs-1.3.1-1.fc5 on branch devel from php-pear-Console-Getargs-1.3.1-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 12:37:13 -0000	1.1
+++ import.log	1 Oct 2006 12:38:04 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Console-Getargs-1_3_1-1_fc5:HEAD:php-pear-Console-Getargs-1.3.1-1.fc5.src.rpm:1159706275



From fedora-extras-commits at redhat.com  Sun Oct  1 12:38:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:38:04 -0700
Subject: rpms/php-pear-Console-Getargs/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-Console-Getargs.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610011238.k91Cc6n0019888@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19848/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-Console-Getargs.spec xml2changelog 
Log Message:
auto-import php-pear-Console-Getargs-1.3.1-1.fc5 on branch devel from php-pear-Console-Getargs-1.3.1-1.fc5.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     <http://www.php.net/software/>".

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

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

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see <http://www.php.net>.

PHP includes the Zend Engine, freely available at
<http://www.zend.com>.


--- NEW FILE php-pear-Console-Getargs.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Console_Getargs

Name:           php-pear-Console-Getargs
Version:        1.3.1
Release:        1%{?dist}
Summary:        Command-line arguments and parameters parser
Summary(fr):    Analyseur des arguments et param??tres en ligne de commande

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Console_Getargs
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php >= 4.1.0 php-pear(PEAR)

%description
The Console_Getargs package implements a Command Line arguments and
parameters parser for your CLI applications. It performs some basic
arguments validation and automatically creates a formatted help text,
based on the given configuration.
 
%description -l fr
L'extension Console_Getargs fournit un analyseur des arguments et des
param??tres pass??s ?? vos applications sur la ligne de commande. 
Il r??alise quelques validations simples des arguments et cr??e 
automatiquement un texte d'aide ?? partir de la configuration fournie.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml

%{__install} -m 644 -c %{SOURCE1} LICENSE

%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.

%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE docdir/examples
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Console/Getargs.php
%{pear_testdir}/%{pear_name}

%changelog
* Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
- generated specfile (pear make-rpm-spec) + cleaning
- generated CHANGELOG
- add LICENSE, french summary and description


--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 12:37:14 -0000	1.1
+++ .cvsignore	1 Oct 2006 12:38:04 -0000	1.2
@@ -0,0 +1 @@
+Console_Getargs-1.3.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 12:37:14 -0000	1.1
+++ sources	1 Oct 2006 12:38:04 -0000	1.2
@@ -0,0 +1 @@
+67b5918343fa24f3e311d159e168b5dc  Console_Getargs-1.3.1.tgz



From fedora-extras-commits at redhat.com  Sun Oct  1 12:40:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  1 Oct 2006 05:40:27 -0700
Subject: rpms/libcddb/devel .cvsignore, 1.5, 1.6 libcddb.spec, 1.19,
	1.20 sources, 1.6, 1.7
Message-ID: <200610011240.k91CeT6u019957@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libcddb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19936

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
* Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
- New upstream release 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 14:50:41 -0000	1.5
+++ .cvsignore	1 Oct 2006 12:40:27 -0000	1.6
@@ -1 +1 @@
-libcddb-1.2.1.tar.bz2
+libcddb-1.2.2.tar.bz2


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libcddb.spec	24 Sep 2006 06:35:52 -0000	1.19
+++ libcddb.spec	1 Oct 2006 12:40:27 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.2.1
-Release:	5%{?dist}
+Version:	1.2.2
+Release:	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://libcddb.sourceforge.net/
@@ -33,6 +33,9 @@
 
 %build
 %configure
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -66,6 +69,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
+- New upstream release 1.2.2
+
 * Sun Sep 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-5
 - Rebuild for new libcdio
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Aug 2005 14:50:41 -0000	1.6
+++ sources	1 Oct 2006 12:40:27 -0000	1.7
@@ -1 +1 @@
-2861fe1299da273fe68783abecc3fe62  libcddb-1.2.1.tar.bz2
+0735015d78b2d951fae3e2fcfb660591  libcddb-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 12:41:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  1 Oct 2006 05:41:13 -0700
Subject: rpms/libcddb/FC-5 .cvsignore, 1.5, 1.6 libcddb.spec, 1.17,
	1.18 sources, 1.6, 1.7
Message-ID: <200610011241.k91CfFAw020022@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libcddb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20001

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
* Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
- New upstream release 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 14:50:41 -0000	1.5
+++ .cvsignore	1 Oct 2006 12:41:13 -0000	1.6
@@ -1 +1 @@
-libcddb-1.2.1.tar.bz2
+libcddb-1.2.2.tar.bz2


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-5/libcddb.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libcddb.spec	23 Jul 2006 09:07:31 -0000	1.17
+++ libcddb.spec	1 Oct 2006 12:41:13 -0000	1.18
@@ -1,12 +1,11 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.2.1
-Release:	3%{?dist}
-
+Version:	1.2.2
+Release:	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://libcddb.sourceforge.net/
-Source0: 	http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2
+Source0: 	http://dl.sf.net/sourceforge/libcddb/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires:	pkgconfig libcdio-devel >= 0.67
 
@@ -14,6 +13,7 @@
 Libcddb is a library that implements the different protocols (CDDBP,
 HTTP, SMTP) to access data on a CDDB server (e.g http://freedb.org/).
 
+
 %package devel
 Summary:	Development files for libcddb
 Group:		Development/Libraries
@@ -33,13 +33,15 @@
 
 %build
 %configure
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
@@ -48,6 +50,7 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
@@ -66,6 +69,15 @@
 
 
 %changelog
+* Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
+- New upstream release 1.2.2
+
+* Sun Sep 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-5
+- Rebuild for new libcdio
+
+* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-4
+- FE6 Rebuild
+
 * Sun Jul 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-3
 - Taking over as maintainer since Anvil has other priorities
 - Long long due rebuild with new gcc for FC-5, it seems this may have already


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Aug 2005 14:50:41 -0000	1.6
+++ sources	1 Oct 2006 12:41:13 -0000	1.7
@@ -1 +1 @@
-2861fe1299da273fe68783abecc3fe62  libcddb-1.2.1.tar.bz2
+0735015d78b2d951fae3e2fcfb660591  libcddb-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 12:42:00 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:42:00 -0700
Subject: owners owners.list,1.1751,1.1752
Message-ID: <200610011242.k91Cg2om020083@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20066

Modified Files:
	owners.list 
Log Message:
	add php-pear-Console-Getargs



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1751
retrieving revision 1.1752
diff -u -r1.1751 -r1.1752
--- owners.list	1 Oct 2006 12:09:48 -0000	1.1751
+++ owners.list	1 Oct 2006 12:42:00 -0000	1.1752
@@ -1691,6 +1691,7 @@
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Auth-SASL|Abstraction of various SASL mechanism responses|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Benchmark|Framework to benchmark PHP scripts or function calls|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Console-Getargs|Command-line arguments and parameters parser|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Console-Table|Class that makes it easy to build console style tables|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:06 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:06 -0700
Subject: rpms/telepathy-filesystem - New directory
Message-ID: <200610011312.k91DC8Om023059@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23033/telepathy-filesystem

Log Message:
Directory /cvs/extras/rpms/telepathy-filesystem added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:07 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:07 -0700
Subject: rpms/telepathy-filesystem/devel - New directory
Message-ID: <200610011312.k91DC9Iq023062@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23033/telepathy-filesystem/devel

Log Message:
Directory /cvs/extras/rpms/telepathy-filesystem/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:22 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:22 -0700
Subject: rpms/telepathy-filesystem/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610011312.k91DCOSQ023109@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23078/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module telepathy-filesystem


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:21 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:21 -0700
Subject: rpms/telepathy-filesystem Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610011312.k91DCNN6023106@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23078

Added Files:
	Makefile import.log 
Log Message:
Setup of module telepathy-filesystem


--- NEW FILE Makefile ---
# Top level Makefile for module telepathy-filesystem
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:38 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:38 -0700
Subject: rpms/telepathy-filesystem/devel telepathy-filesystem.spec,NONE,1.1
Message-ID: <200610011312.k91DCe7T023161@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23135/devel

Added Files:
	telepathy-filesystem.spec 
Log Message:
auto-import telepathy-filesystem-0.0.1-1 on branch devel from telepathy-filesystem-0.0.1-1.src.rpm


--- NEW FILE telepathy-filesystem.spec ---
Name:           telepathy-filesystem
Version:        0.0.1
Release:        1%{?dist}
Summary:        Telepathy filesystem layout

Group:          System Environment/Base
License:        Public Domain
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       filesystem


%description
This package provides some directories which are required by other
packages which comprise the Telepathy release.  

%prep


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/telepathy/managers


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_datadir}/telepathy
%dir %{_datadir}/telepathy/managers


%changelog
* Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.1-1
- Initial FE spec.




From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:37 -0700
Subject: rpms/telepathy-filesystem import.log,1.1,1.2
Message-ID: <200610011313.k91DD960023170@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23135

Modified Files:
	import.log 
Log Message:
auto-import telepathy-filesystem-0.0.1-1 on branch devel from telepathy-filesystem-0.0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/telepathy-filesystem/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 13:12:21 -0000	1.1
+++ import.log	1 Oct 2006 13:12:37 -0000	1.2
@@ -0,0 +1 @@
+telepathy-filesystem-0_0_1-1:HEAD:telepathy-filesystem-0.0.1-1.src.rpm:1159708380



From fedora-extras-commits at redhat.com  Sun Oct  1 13:16:53 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:16:53 -0700
Subject: owners owners.list,1.1752,1.1753
Message-ID: <200610011316.k91DGtAl023239@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23222

Modified Files:
	owners.list 
Log Message:
add telepathy-filesystem & telepathy-butterfly


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1752
retrieving revision 1.1753
diff -u -r1.1752 -r1.1753
--- owners.list	1 Oct 2006 12:42:00 -0000	1.1752
+++ owners.list	1 Oct 2006 13:16:53 -0000	1.1753
@@ -2092,7 +2092,9 @@
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcpick|A tcp stream sniffer, tracker and capturer|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|telepathy-butterfly|MSN connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|telepathy-filesystem|Telepathy filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tellico|A collection manager|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|terminus-font|Clean fixed width font|rhbugs at n-dimensional.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 13:17:43 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:17:43 -0700
Subject: rpms/telepathy-butterfly - New directory
Message-ID: <200610011317.k91DHjQ3023314@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288/telepathy-butterfly

Log Message:
Directory /cvs/extras/rpms/telepathy-butterfly added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 13:17:44 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:17:44 -0700
Subject: rpms/telepathy-butterfly/devel - New directory
Message-ID: <200610011317.k91DHk02023317@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288/telepathy-butterfly/devel

Log Message:
Directory /cvs/extras/rpms/telepathy-butterfly/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 13:17:52 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:17:52 -0700
Subject: rpms/telepathy-butterfly Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610011317.k91DHsew023362@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23334

Added Files:
	Makefile import.log 
Log Message:
Setup of module telepathy-butterfly


--- NEW FILE Makefile ---
# Top level Makefile for module telepathy-butterfly
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 13:17:53 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:17:53 -0700
Subject: rpms/telepathy-butterfly/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610011317.k91DHthY023365@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23334/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module telepathy-butterfly


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 13:18:12 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:18:12 -0700
Subject: rpms/telepathy-butterfly/devel telepathy-butterfly.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610011318.k91DIid6023438@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23398/devel

Modified Files:
	.cvsignore sources 
Added Files:
	telepathy-butterfly.spec 
Log Message:
auto-import telepathy-butterfly-0.1.0-1 on branch devel from telepathy-butterfly-0.1.0-1.src.rpm


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

Name:           telepathy-butterfly
Version:        0.1.0
Release:        1%{?dist}
Summary:        MSN connection manager for Telepathy

Group:          Applications/Communications
License:        GPL
URL:            http://telepathy.freedesktop.org/wiki/
Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	dbus-devel
BuildRequires:	pkgconfig

Requires:	python-telepathy
Requires:	pymsn
Requires:	dbus
Requires:	telepathy-filesystem


%description
An MSN connection manager that handles presence, personal messages,
and conversations


%prep
%setup -q


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_bindir}/%{name}
%{_datadir}/dbus-1/services/*.service
%{_datadir}/telepathy/managers/*.manager
%{python_sitelib}/*



%changelog
* Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.0-1
- Initial FE spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 13:17:53 -0000	1.1
+++ .cvsignore	1 Oct 2006 13:18:12 -0000	1.2
@@ -0,0 +1 @@
+telepathy-butterfly-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 13:17:53 -0000	1.1
+++ sources	1 Oct 2006 13:18:12 -0000	1.2
@@ -0,0 +1 @@
+425c5ea49c01a88b7b7eb144a52e6c54  telepathy-butterfly-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 13:18:11 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:18:11 -0700
Subject: rpms/telepathy-butterfly import.log,1.1,1.2
Message-ID: <200610011318.k91DIhSu023434@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23398

Modified Files:
	import.log 
Log Message:
auto-import telepathy-butterfly-0.1.0-1 on branch devel from telepathy-butterfly-0.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 13:17:52 -0000	1.1
+++ import.log	1 Oct 2006 13:18:11 -0000	1.2
@@ -0,0 +1 @@
+telepathy-butterfly-0_1_0-1:HEAD:telepathy-butterfly-0.1.0-1.src.rpm:1159708714



From fedora-extras-commits at redhat.com  Sun Oct  1 13:37:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:37:34 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 telepathy-gabble.spec, 1.5, 1.6
Message-ID: <200610011337.k91DbaZ8023646@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23625

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Sun Oct  1 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
- Update to 0.3.7.
- Add requires on telepathy-filesystem.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 23:01:12 -0000	1.5
+++ .cvsignore	1 Oct 2006 13:37:34 -0000	1.6
@@ -1 +1 @@
-telepathy-gabble-0.3.6.tar.gz
+telepathy-gabble-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 23:01:12 -0000	1.5
+++ sources	1 Oct 2006 13:37:34 -0000	1.6
@@ -1 +1 @@
-c00abd483990efca44a4699e3f533505  telepathy-gabble-0.3.6.tar.gz
+f47b65038041173885b5dacdc0d9881e  telepathy-gabble-0.3.7.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- telepathy-gabble.spec	21 Sep 2006 23:01:12 -0000	1.5
+++ telepathy-gabble.spec	1 Oct 2006 13:37:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.6
+Version:        0.3.7
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -13,6 +13,8 @@
 BuildRequires:	dbus-glib-devel
 BuildRequires:	loudmouth-devel
 
+Requires:	telepathy-filesystem
+
 
 %description
 A Jabber/XMPP connection manager, that handles single and multi-user
@@ -42,12 +44,14 @@
 %doc COPYING AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/dbus-1/services/*.service
-%dir %{_datadir}/telepathy/
-%dir %{_datadir}/telepathy/managers/
 %{_datadir}/telepathy/managers/*.manager
 
 
 %changelog
+* Sun Oct  1 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
+- Update to 0.3.7.
+- Add requires on telepathy-filesystem.
+
 * Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.6-1
 - Update to 0.3.6.
 



From fedora-extras-commits at redhat.com  Sun Oct  1 13:54:52 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sun,  1 Oct 2006 06:54:52 -0700
Subject: rpms/libpng10/devel libpng10.spec,1.3,1.4
Message-ID: <200610011354.k91DssST023734@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libpng10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23717

Modified Files:
	libpng10.spec 
Log Message:
rebuild with latest toolchain



Index: libpng10.spec
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libpng10.spec	2 Aug 2006 07:18:24 -0000	1.3
+++ libpng10.spec	1 Oct 2006 13:54:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
 Version:	1.0.20
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	zlib License
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Sun Oct  1 2006 Paul Howarth <paul at city-fan.org> 1.0.20-4
+- rebuild with latest toolchain
+
 * Tue Aug  1 2006 Paul Howarth <paul at city-fan.org> 1.0.20-3
 - reenable %%{_smp_mflags}
 - use patched configure script rather than old Makefiles



From fedora-extras-commits at redhat.com  Sun Oct  1 14:39:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Oct 2006 07:39:02 -0700
Subject: rpms/ksensors/FC-5 ksensors-0.7.3-po.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 ksensors.spec, 1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200610011439.k91Ed4kA026891@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ksensors/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26850/FC-5

Modified Files:
	.cvsignore ksensors.spec sources 
Added Files:
	ksensors-0.7.3-po.patch 
Log Message:
* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-7
- Apply Debian -11 patchset for upstream radio button state fix,
  support for hddtemp with SCSI disks and more translations.


ksensors-0.7.3-po.patch:

--- NEW FILE ksensors-0.7.3-po.patch ---
--- ksensors-0.7.3/po/Makefile.in~	2004-08-19 00:39:08.000000000 +0300
+++ ksensors-0.7.3/po/Makefile.in	2006-10-01 00:08:46.000000000 +0300
@@ -255,8 +255,8 @@
 xdg_directorydir = @xdg_directorydir@
 #>- POFILES = AUTO
 #>+ 2
-POFILES = nl.po fr.po es.po de.po cs.po
-GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo
+POFILES = nl.po fr.po es.po de.po cs.po it.po pl.po sv.po
+GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo it.gmo pl.gmo sv.gmo
 subdir = po
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -431,6 +431,15 @@
 cs.gmo: cs.po
 	rm -f cs.gmo; $(GMSGFMT) -o cs.gmo $(srcdir)/cs.po
 	test ! -f cs.gmo || touch cs.gmo
+it.gmo: it.po
+	rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po
+	test ! -f it.gmo || touch it.gmo
+pl.gmo: pl.po
+	rm -f pl.gmo; $(GMSGFMT) -o pl.gmo $(srcdir)/pl.po
+	test ! -f pl.gmo || touch pl.gmo
+sv.gmo: sv.po
+	rm -f sv.gmo; $(GMSGFMT) -o sv.gmo $(srcdir)/sv.po
+	test ! -f sv.gmo || touch sv.gmo
 
 #>+ 3
 clean-nls:
@@ -438,7 +447,7 @@
 
 #>+ 10
 install-nls:
-	@for base in nl fr es de cs ; do \
+	@for base in nl fr es de cs it pl sv ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
 	  $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksensors/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 04:41:36 -0000	1.4
+++ .cvsignore	1 Oct 2006 14:39:02 -0000	1.5
@@ -1 +1,2 @@
 ksensors-0.7.3.tar.gz
+ksensors_0.7.3-11.diff.gz


Index: ksensors.spec
===================================================================
RCS file: /cvs/extras/rpms/ksensors/FC-5/ksensors.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ksensors.spec	15 Feb 2006 20:22:49 -0000	1.11
+++ ksensors.spec	1 Oct 2006 14:39:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ksensors
 Version:        0.7.3
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        KDE frontend to lm_sensors
 
 Group:          Applications/System
@@ -9,8 +9,11 @@
 Source0:        http://download.sf.net/ksensors/%{name}-%{version}.tar.gz
 Patch0:         %{name}-hddtemp-detect.patch
 Patch1:         %{name}-desktop.patch
+Patch2:         http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-11.diff.gz
+Patch3:         %{name}-0.7.3-po.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# lm_sensors available for these only; report a bug if something's missing
 ExclusiveArch:  %{ix86} x86_64 alpha
 BuildRequires:  kdelibs-devel
 BuildRequires:  lm_sensors-devel
@@ -27,6 +30,8 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
 %{__perl} -pi -e 's/\$\(kde_datadir\)/\$(datadir)/' src/sounds/Makefile.*
 
 
@@ -69,6 +74,13 @@
 
 
 %changelog
+* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-7
+- Apply Debian -11 patchset for upstream radio button state fix,
+  support for hddtemp with SCSI disks and more translations.
+
+* Wed Aug 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-6
+- Rebuild.
+
 * Wed Feb 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-5
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksensors/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 04:41:36 -0000	1.4
+++ sources	1 Oct 2006 14:39:02 -0000	1.5
@@ -1 +1,2 @@
 4f6c5d7dea5e637e772d17f1e547d6f1  ksensors-0.7.3.tar.gz
+b6b26cf4fb7c75a777139291440ad6fa  ksensors_0.7.3-11.diff.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 14:39:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Oct 2006 07:39:03 -0700
Subject: rpms/ksensors/devel ksensors-0.7.3-po.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 ksensors.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <200610011439.k91Ed5lQ026899@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ksensors/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26850/devel

Modified Files:
	.cvsignore ksensors.spec sources 
Added Files:
	ksensors-0.7.3-po.patch 
Log Message:
* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-7
- Apply Debian -11 patchset for upstream radio button state fix,
  support for hddtemp with SCSI disks and more translations.


ksensors-0.7.3-po.patch:

--- NEW FILE ksensors-0.7.3-po.patch ---
--- ksensors-0.7.3/po/Makefile.in~	2004-08-19 00:39:08.000000000 +0300
+++ ksensors-0.7.3/po/Makefile.in	2006-10-01 00:08:46.000000000 +0300
@@ -255,8 +255,8 @@
 xdg_directorydir = @xdg_directorydir@
 #>- POFILES = AUTO
 #>+ 2
-POFILES = nl.po fr.po es.po de.po cs.po
-GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo
+POFILES = nl.po fr.po es.po de.po cs.po it.po pl.po sv.po
+GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo it.gmo pl.gmo sv.gmo
 subdir = po
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -431,6 +431,15 @@
 cs.gmo: cs.po
 	rm -f cs.gmo; $(GMSGFMT) -o cs.gmo $(srcdir)/cs.po
 	test ! -f cs.gmo || touch cs.gmo
+it.gmo: it.po
+	rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po
+	test ! -f it.gmo || touch it.gmo
+pl.gmo: pl.po
+	rm -f pl.gmo; $(GMSGFMT) -o pl.gmo $(srcdir)/pl.po
+	test ! -f pl.gmo || touch pl.gmo
+sv.gmo: sv.po
+	rm -f sv.gmo; $(GMSGFMT) -o sv.gmo $(srcdir)/sv.po
+	test ! -f sv.gmo || touch sv.gmo
 
 #>+ 3
 clean-nls:
@@ -438,7 +447,7 @@
 
 #>+ 10
 install-nls:
-	@for base in nl fr es de cs ; do \
+	@for base in nl fr es de cs it pl sv ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
 	  $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksensors/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 04:41:36 -0000	1.4
+++ .cvsignore	1 Oct 2006 14:39:03 -0000	1.5
@@ -1 +1,2 @@
 ksensors-0.7.3.tar.gz
+ksensors_0.7.3-11.diff.gz


Index: ksensors.spec
===================================================================
RCS file: /cvs/extras/rpms/ksensors/devel/ksensors.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ksensors.spec	29 Aug 2006 21:43:17 -0000	1.12
+++ ksensors.spec	1 Oct 2006 14:39:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ksensors
 Version:        0.7.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        KDE frontend to lm_sensors
 
 Group:          Applications/System
@@ -9,6 +9,8 @@
 Source0:        http://download.sf.net/ksensors/%{name}-%{version}.tar.gz
 Patch0:         %{name}-hddtemp-detect.patch
 Patch1:         %{name}-desktop.patch
+Patch2:         http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-11.diff.gz
+Patch3:         %{name}-0.7.3-po.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # lm_sensors available for these only; report a bug if something's missing
@@ -28,6 +30,8 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
 %{__perl} -pi -e 's/\$\(kde_datadir\)/\$(datadir)/' src/sounds/Makefile.*
 
 
@@ -70,6 +74,10 @@
 
 
 %changelog
+* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-7
+- Apply Debian -11 patchset for upstream radio button state fix,
+  support for hddtemp with SCSI disks and more translations.
+
 * Wed Aug 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-6
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksensors/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 04:41:36 -0000	1.4
+++ sources	1 Oct 2006 14:39:03 -0000	1.5
@@ -1 +1,2 @@
 4f6c5d7dea5e637e772d17f1e547d6f1  ksensors-0.7.3.tar.gz
+b6b26cf4fb7c75a777139291440ad6fa  ksensors_0.7.3-11.diff.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 16:17:05 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun,  1 Oct 2006 09:17:05 -0700
Subject: rpms/pl/FC-5 .cvsignore, 1.10, 1.11 pl.spec, 1.30, 1.31 sources,
	1.10, 1.11
Message-ID: <200610011617.k91GH7qe000907@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv870/FC-5

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Sep 2006 23:05:09 -0000	1.10
+++ .cvsignore	1 Oct 2006 16:17:04 -0000	1.11
@@ -1,3 +1,3 @@
-pl-5.6.18.tar.gz
-userguide.html.tgz
+pl-5.6.20.tar.gz
 HTMLmanual.tar.gz
+userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/pl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pl.spec	1 Sep 2006 23:15:15 -0000	1.30
+++ pl.spec	1 Oct 2006 16:17:04 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.18
+Version:	5.6.20
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.18.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.20.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.20-1
+- new version 5.6.20
+
 * Sat Sep  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.18-1
 - updated to 5.6.18
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Sep 2006 23:05:09 -0000	1.10
+++ sources	1 Oct 2006 16:17:04 -0000	1.11
@@ -1,3 +1,3 @@
-32fc7336c9eed667e04d6cd2b7efb3bd  pl-5.6.18.tar.gz
+0f13bc81a83e29ef90dee6058f84d8ae  pl-5.6.20.tar.gz
+fd43b315a103de4a3c739ca699a9f2d5  HTMLmanual.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
-7e7fc9e384cf7babc872b6f5e539ea73  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 16:17:05 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun,  1 Oct 2006 09:17:05 -0700
Subject: rpms/pl/devel .cvsignore, 1.10, 1.11 pl.spec, 1.29, 1.30 sources,
	1.10, 1.11
Message-ID: <200610011617.k91GH7Co000913@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv870/devel

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Sep 2006 23:15:15 -0000	1.10
+++ .cvsignore	1 Oct 2006 16:17:05 -0000	1.11
@@ -1,3 +1,3 @@
-pl-5.6.18.tar.gz
-userguide.html.tgz
+pl-5.6.20.tar.gz
 HTMLmanual.tar.gz
+userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pl.spec	1 Sep 2006 23:15:15 -0000	1.29
+++ pl.spec	1 Oct 2006 16:17:05 -0000	1.30
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.18
+Version:	5.6.20
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.18.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.20.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.20-1
+- new version 5.6.20
+
 * Sat Sep  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.18-1
 - updated to 5.6.18
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Sep 2006 23:15:15 -0000	1.10
+++ sources	1 Oct 2006 16:17:05 -0000	1.11
@@ -1,3 +1,3 @@
-32fc7336c9eed667e04d6cd2b7efb3bd  pl-5.6.18.tar.gz
+0f13bc81a83e29ef90dee6058f84d8ae  pl-5.6.20.tar.gz
+fd43b315a103de4a3c739ca699a9f2d5  HTMLmanual.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
-7e7fc9e384cf7babc872b6f5e539ea73  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 16:22:24 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun,  1 Oct 2006 09:22:24 -0700
Subject: rpms/kita/devel kita-0.177.3-nonweak-symbol.patch, NONE,
	1.1 kita.spec, 1.5, 1.6
Message-ID: <200610011622.k91GMQda001037@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1017

Modified Files:
	kita.spec 
Added Files:
	kita-0.177.3-nonweak-symbol.patch 
Log Message:
* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
- Make common directory link again by symlink
- First remove undefined non-weak symbol related to Qt and KDE
  (still need fixes for Kita internal undefined symbol).


kita-0.177.3-nonweak-symbol.patch:

--- NEW FILE kita-0.177.3-nonweak-symbol.patch ---
--- ./kita-0.177.3/kita/src/bbs/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/bbs/Makefile.in	2006-09-28 02:08:03.000000000 +0900
@@ -353,7 +353,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitabbs.la: $(libkitabbs_la_OBJECTS) $(libkitabbs_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/board/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/board/Makefile.in	2006-09-28 02:21:26.000000000 +0900
@@ -370,7 +370,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitaboard.la: $(libkitaboard_la_OBJECTS) $(libkitaboard_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KPARTS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/image/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/image/Makefile.in	2006-09-28 02:54:57.000000000 +0900
@@ -357,7 +357,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitaimage.la: $(libkitaimage_la_OBJECTS) $(libkitaimage_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/libkita/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/libkita/Makefile.in	2006-09-28 03:12:51.000000000 +0900
@@ -411,7 +411,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkita.la: $(libkita_la_OBJECTS) $(libkita_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS) $(LIB_QT) $(QT_LDFLAGS) $(LIB_KDECORE) $(LIB_KFILE)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/prefs/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/prefs/Makefile.in	2006-09-28 03:20:04.000000000 +0900
@@ -358,7 +358,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitapref.la: $(libkitapref_la_OBJECTS) $(libkitapref_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/thread/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/thread/Makefile.in	2006-09-28 03:26:37.000000000 +0900
@@ -366,7 +366,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitathread.la: $(libkitathread_la_OBJECTS) $(libkitathread_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/write/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/write/Makefile.in	2006-09-28 03:35:14.000000000 +0900
@@ -358,7 +358,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitawrite.la: $(libkitawrite_la_OBJECTS) $(libkitawrite_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) 
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kita.spec	19 Sep 2006 13:16:41 -0000	1.5
+++ kita.spec	1 Oct 2006 16:22:23 -0000	1.6
@@ -3,8 +3,9 @@
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    9%{?dist}
+Release:    10%{?dist}
 Source:     http://keihanna.dl.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
+Patch0:     kita-0.177.3-nonweak-symbol.patch
 License:    GPL
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -24,13 +25,15 @@
 %prep
 %setup -q
 
-%build
+%patch0 -p2 -b .link
+
 %{__sed} -i.soname \
    -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
    -e 's|\([^a-zA-Z]\)kita\([\._][lL]\)|\1libkitamain\2|g' \
    -e 's|-avoid-version||' \
    kita/src/Makefile.in
 
+%build
 if [ %{_arch} == x86_64 ] ; then
    SUF=64
 else
@@ -51,7 +54,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-
 %{__sed} -i -e 's|Terminal=0|Terminal=false|' \
       %{buildroot}/%{name}.desktop
 
@@ -71,6 +73,7 @@
 %{__mkdir} DOC
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
+ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 
 # convert encoding
 for f in README README.2ch TODO ; do
@@ -108,6 +111,11 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
+- Make common directory link again by symlink
+- First remove undefined non-weak symbol related to Qt and KDE
+  (still need fixes for Kita internal undefined symbol).
+
 * Tue Sep 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-9
 - Again move HTML directory to the original.
 



From fedora-extras-commits at redhat.com  Sun Oct  1 16:23:23 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun,  1 Oct 2006 09:23:23 -0700
Subject: rpms/kita/FC-5 kita-0.177.3-nonweak-symbol.patch, NONE,
	1.1 kita.spec, 1.5, 1.6
Message-ID: <200610011623.k91GNQ8X001073@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1053

Modified Files:
	kita.spec 
Added Files:
	kita-0.177.3-nonweak-symbol.patch 
Log Message:
* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
- Make common directory link again by symlink
- First remove undefined non-weak symbol related to Qt and KDE
  (still need fixes for Kita internal undefined symbol).


kita-0.177.3-nonweak-symbol.patch:

--- NEW FILE kita-0.177.3-nonweak-symbol.patch ---
--- ./kita-0.177.3/kita/src/bbs/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/bbs/Makefile.in	2006-09-28 02:08:03.000000000 +0900
@@ -353,7 +353,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitabbs.la: $(libkitabbs_la_OBJECTS) $(libkitabbs_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/board/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/board/Makefile.in	2006-09-28 02:21:26.000000000 +0900
@@ -370,7 +370,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitaboard.la: $(libkitaboard_la_OBJECTS) $(libkitaboard_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KPARTS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/image/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/image/Makefile.in	2006-09-28 02:54:57.000000000 +0900
@@ -357,7 +357,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitaimage.la: $(libkitaimage_la_OBJECTS) $(libkitaimage_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/libkita/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/libkita/Makefile.in	2006-09-28 03:12:51.000000000 +0900
@@ -411,7 +411,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkita.la: $(libkita_la_OBJECTS) $(libkita_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS) $(LIB_QT) $(QT_LDFLAGS) $(LIB_KDECORE) $(LIB_KFILE)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/prefs/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/prefs/Makefile.in	2006-09-28 03:20:04.000000000 +0900
@@ -358,7 +358,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitapref.la: $(libkitapref_la_OBJECTS) $(libkitapref_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/thread/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/thread/Makefile.in	2006-09-28 03:26:37.000000000 +0900
@@ -366,7 +366,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitathread.la: $(libkitathread_la_OBJECTS) $(libkitathread_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/write/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/write/Makefile.in	2006-09-28 03:35:14.000000000 +0900
@@ -358,7 +358,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitawrite.la: $(libkitawrite_la_OBJECTS) $(libkitawrite_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) 
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/FC-5/kita.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kita.spec	19 Sep 2006 13:18:20 -0000	1.5
+++ kita.spec	1 Oct 2006 16:23:23 -0000	1.6
@@ -3,8 +3,9 @@
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    9%{?dist}
+Release:    10%{?dist}
 Source:     http://keihanna.dl.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
+Patch0:     kita-0.177.3-nonweak-symbol.patch
 License:    GPL
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -24,13 +25,15 @@
 %prep
 %setup -q
 
-%build
+%patch0 -p2 -b .link
+
 %{__sed} -i.soname \
    -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
    -e 's|\([^a-zA-Z]\)kita\([\._][lL]\)|\1libkitamain\2|g' \
    -e 's|-avoid-version||' \
    kita/src/Makefile.in
 
+%build
 if [ %{_arch} == x86_64 ] ; then
    SUF=64
 else
@@ -51,7 +54,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-
 %{__sed} -i -e 's|Terminal=0|Terminal=false|' \
       %{buildroot}/%{name}.desktop
 
@@ -71,6 +73,7 @@
 %{__mkdir} DOC
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
+ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 
 # convert encoding
 for f in README README.2ch TODO ; do
@@ -108,6 +111,11 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
+- Make common directory link again by symlink
+- First remove undefined non-weak symbol related to Qt and KDE
+  (still need fixes for Kita internal undefined symbol).
+
 * Tue Sep 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-9
 - Again move HTML directory to the original.
 



From fedora-extras-commits at redhat.com  Sun Oct  1 16:35:32 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:35:32 -0700
Subject: rpms/fwbackups - New directory
Message-ID: <200610011635.k91GZYZA001261@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1235/fwbackups

Log Message:
Directory /cvs/extras/rpms/fwbackups added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 16:35:33 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:35:33 -0700
Subject: rpms/fwbackups/devel - New directory
Message-ID: <200610011635.k91GZZFb001264@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1235/fwbackups/devel

Log Message:
Directory /cvs/extras/rpms/fwbackups/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 16:35:44 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:35:44 -0700
Subject: rpms/fwbackups Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610011635.k91GZkEx001313@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280

Added Files:
	Makefile import.log 
Log Message:
Setup of module fwbackups


--- NEW FILE Makefile ---
# Top level Makefile for module fwbackups
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 16:35:44 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:35:44 -0700
Subject: rpms/fwbackups/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610011635.k91GZkZv001316@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fwbackups


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 16:36:22 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:36:22 -0700
Subject: rpms/fwbackups import.log,1.1,1.2
Message-ID: <200610011636.k91GaODu001379@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1345

Modified Files:
	import.log 
Log Message:
auto-import fwbackups-1.42.1-2 on branch devel from fwbackups-1.42.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 16:35:44 -0000	1.1
+++ import.log	1 Oct 2006 16:36:22 -0000	1.2
@@ -0,0 +1 @@
+fwbackups-1_42_1-2:HEAD:fwbackups-1.42.1-2.src.rpm:1159720527



From fedora-extras-commits at redhat.com  Sun Oct  1 16:36:23 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:36:23 -0700
Subject: rpms/fwbackups/devel fwbackups.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610011636.k91GaPH7001384@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1345/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fwbackups.spec 
Log Message:
auto-import fwbackups-1.42.1-2 on branch devel from fwbackups-1.42.1-2.src.rpm


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

Name:		fwbackups
Version:		1.42.1
Release:		2%{?dist}
BuildArch:	noarch
Summary:	A feature-rich user backup program

Group:		Applications/System
License:		GPL
URL:		http://www.diffingo.com/content/view/12/45/lang,en/
Source0:		http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:		desktop-file-utils
Requires:		pygtk2 pygtk2-libglade redhat-artwork usermode
#Provides:		fwbackups
%description
fwbackups is a user backups program that can run a backup on-the-spot based
on user-specified paths, or by it's automated backup feature which will backup
user-specified paths and backup them to an appropriate location automatically,
at a specified time and date.


%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT

#install -d -p -m755 etc/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/fwbackups
#install -d -p -m755 usr/lib/python2.4/site-packages/fwbackups ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups
#install -d -p -m755 usr/share/fwbackups ${RPM_BUILD_ROOT}%{_datadir}/fwbackups
#install -d -p -m755 ${RPM_BUILD_ROOT}%{_docdir}/fwbackups
#install -d -p -m755 ${RPM_BUILD_ROOT}%{_sbindir}
# This one we DO need because ln doesn't create the directories like install did
install -d -p -m755 ${RPM_BUILD_ROOT}%{_bindir}

install -D -p -m644 etc/fwbackups/fwbackups.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/fwbackups/fwbackups.conf

install -D -p -m444 usr/share/fwbackups/fwbackups.conf.default ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups.conf.default

install -D -p -m644 etc/pam.d/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwbackups
install -D -p -m644 etc/pam.d/fwbackups-run ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwbackups-run

install -D -p -m644 etc/security/console.apps/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwbackups
install -D -p -m644 etc/security/console.apps/fwbackups-run ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwbackups-run 



install -D -p -m755 usr/share/fwbackups/fwbackups-runapp.py ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups-runapp.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/__init__.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/__init__.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/Backuper.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/Backuper.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/BaseClasses.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/BaseClasses.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/Callbacks.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/Callbacks.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/shutil_modded.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/shutil_modded.py

install -D -p -m644 usr/share/fwbackups/fwbackups-new.glade ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups-new.glade

install -D -p -m755 usr/sbin/fwbackups ${RPM_BUILD_ROOT}%{_sbindir}/fwbackups
install -D -p -m755 usr/sbin/fwbackups-run ${RPM_BUILD_ROOT}%{_sbindir}/fwbackups-run

ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwbackups
ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwbackups-run

desktop-file-install --vendor fedora\
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
	--add-category X-Fedora\
	usr/share/applications/fwbackups.desktop
desktop-file-install --vendor fedora\
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
	--add-category X-Fedora\
	usr/share/applications/fwbackups-run.desktop

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/fwbackups
%dir %{_datadir}/fwbackups
%dir %{python_sitelib}/fwbackups

%{_bindir}/fwbackups
%{_bindir}/fwbackups-run
%{_sbindir}/fwbackups
%{_sbindir}/fwbackups-run
%{_datadir}/fwbackups/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/fwbackups/*

%config(noreplace) %{_sysconfdir}/fwbackups/fwbackups.conf
%config(noreplace) %{_sysconfdir}/security/console.apps/fwbackups
%config(noreplace) %{_sysconfdir}/security/console.apps/fwbackups-run
%config(noreplace) %{_sysconfdir}/pam.d/fwbackups
%config(noreplace) %{_sysconfdir}/pam.d/fwbackups-run

%doc README COPYING CHANGELOG

%changelog

* Sat Sep 30 2006 Stewart Adam <s.adam at diffingo.com> 1.42.1-2
- Match upstream md5sum
- Fix capitals in %%Source0 tag

* Tue Sep 26 2006 Stewart Adam <s.adam at diffingo.com> 1.42.1-1
- Clean up %%install section
- Don't install fwbackups.conf twice
- Make tarball match upstream
- Add the default configuration file to %%doc, and make it replaceable
- Update to version 1.42.1 (see CHANGELOG file for details on version changes)

* Thu Sep 21 2006 Stewart Adam <s.adam at diffingo.com> 1.42-5
- Add %%requires: pygtk2-libglade

* Wed Sep 13 2006 Stewart Adam <s.adam at diffingo.com> 1.42-4
- Fix the python_sitearch macro
- Update file paths
- Fix URL tag

* Wed Sep 06 2006 Stewart Adam <s.adam at diffingo.com> 1.42-3
- Made pam use 'include' statements and not the old pam_stack
- Use relative symlinks

* Sun Sep 03 2006 Stewart Adam <s.adam at diffingo.com> 1.42-2
- Added CHANGELOG file for detailed information on changes between versions
- Made this .spec and package files suitable for Fedora Extras submission

* Thu Aug 29 2006 Stewart Adam <s.adam at diffingo.com> 1.42-1
- Fixed errors when removing symbolic links
- Make listing files in RemoveOldBackups list files and directory names, not their contents

* Thu Aug 15 2006 Stewart Adam <s.adam at diffingo.com> 1.42-0
- Rebuild using sample .spec file from Fedora Extras
- Update to version 1.42 (see CHANGELOG file for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 16:35:44 -0000	1.1
+++ .cvsignore	1 Oct 2006 16:36:22 -0000	1.2
@@ -0,0 +1 @@
+fwbackups-1.42.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 16:35:44 -0000	1.1
+++ sources	1 Oct 2006 16:36:22 -0000	1.2
@@ -0,0 +1 @@
+bd0a4d63e0729fa3ed89eccb10fee2da  fwbackups-1.42.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 16:40:27 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:40:27 -0700
Subject: owners owners.list,1.1753,1.1754
Message-ID: <200610011640.k91GeTtd001465@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1448

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1753
retrieving revision 1.1754
diff -u -r1.1753 -r1.1754
--- owners.list	1 Oct 2006 13:16:53 -0000	1.1753
+++ owners.list	1 Oct 2006 16:40:27 -0000	1.1754
@@ -422,6 +422,7 @@
 Fedora Extras|fuse-emulator-utils|Utilities for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 17:18:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Oct 2006 10:18:26 -0700
Subject: owners owners.list,1.1754,1.1755
Message-ID: <200610011718.k91HISJw004687@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4667

Modified Files:
	owners.list 
Log Message:
Fix broken fwbackups entry.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1754
retrieving revision 1.1755
diff -u -r1.1754 -r1.1755
--- owners.list	1 Oct 2006 16:40:27 -0000	1.1754
+++ owners.list	1 Oct 2006 17:18:25 -0000	1.1755
@@ -422,7 +422,7 @@
 Fedora Extras|fuse-emulator-utils|Utilities for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org
+Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 19:23:16 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  1 Oct 2006 12:23:16 -0700
Subject: rpms/amarok/devel amarok.spec,1.60,1.61
Message-ID: <200610011923.k91JNIf0010822@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10797

Modified Files:
	amarok.spec 
Log Message:
rebuild


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- amarok.spec	15 Sep 2006 10:56:59 -0000	1.60
+++ amarok.spec	1 Oct 2006 19:23:16 -0000	1.61
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -239,6 +239,9 @@
 
 
 %changelog
+* Sun Oct 01 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-4
+- rebuild
+
 * Fri Sep 15 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-3
 - add patch for playlist encoding
 



From fedora-extras-commits at redhat.com  Sun Oct  1 21:36:53 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 14:36:53 -0700
Subject: rpms/geomview/devel .cvsignore, 1.12, 1.13 geomview.spec, 1.26,
	1.27 sources, 1.11, 1.12
Message-ID: <200610012136.k91LatXO019699@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19676

Modified Files:
	.cvsignore geomview.spec sources 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
- 1.8.2rc9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Sep 2006 20:21:37 -0000	1.12
+++ .cvsignore	1 Oct 2006 21:36:53 -0000	1.13
@@ -2,3 +2,4 @@
 orrery-0.9.3.tar.gz
 geomview-1.8.2-rc8.tar.bz2
 geomview.png
+geomview-1.8.2-rc9.tar.bz2


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- geomview.spec	7 Sep 2006 20:21:07 -0000	1.26
+++ geomview.spec	1 Oct 2006 21:36:53 -0000	1.27
@@ -3,17 +3,17 @@
 %define _with_orrery --with-orrery
 #define _with_maniview --with-maniview
 
-%define beta rc8
+%define beta rc9
 
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.20.%{beta}%{?dist}
+Release: 0.21.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
 Group:   Applications/Engineering
-Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
+Source0: http://osdn.dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
 #Source0: geomview-%{cvs}.tar.bz2
 #Source1: geomview-cvs_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,12 @@
 BuildRequires: desktop-file-utils
 BuildRequires: automake libtool
 BuildRequires: byacc flex
+# Until we have a generic BR: motif-devel -- Rex
+%if "%{?fedora}" > "5"
 BuildRequires: lesstif-devel
+%else
+BuildRequires: openmotif-devel
+%endif
 BuildRequires: xforms-devel
 BuildRequires: libGL-devel libGLU-devel
 %if "%{?fedora}" > "4"
@@ -271,8 +276,11 @@
 
 
 %changelog
-* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.20.rc9
-- BR: openmotif-devel -> lesstif-devel
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
+- 1.8.2rc9
+
+* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.20.rc8
+- fc6: BR: openmotif-devel -> lesstif-devel
 
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.19.rc8
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Aug 2006 14:23:14 -0000	1.11
+++ sources	1 Oct 2006 21:36:53 -0000	1.12
@@ -1,4 +1,4 @@
 f5588be3402850ed4cc9ef0dac48013a  geomview.png
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
-16ef195e606ecb8338dd239500cae55c  geomview-1.8.2-rc8.tar.bz2
+a8d62bdf60e385f36e0a59f4d8bec361  geomview-1.8.2-rc9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 21:54:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 14:54:51 -0700
Subject: rpms/geomview/FC-5 .cvsignore, 1.6, 1.7 geomview.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200610012154.k91Lsr7J020599@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20576

Modified Files:
	.cvsignore geomview.spec sources 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
- 1.8.2rc9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Aug 2006 15:42:44 -0000	1.6
+++ .cvsignore	1 Oct 2006 21:54:51 -0000	1.7
@@ -1,3 +1,5 @@
 maniview-2.0.0.tar.gz
 orrery-0.9.3.tar.gz
 geomview-1.8.2-rc8.tar.bz2
+geomview.png
+geomview-1.8.2-rc9.tar.bz2


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/geomview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geomview.spec	9 Aug 2006 14:21:35 -0000	1.14
+++ geomview.spec	1 Oct 2006 21:54:51 -0000	1.15
@@ -3,17 +3,17 @@
 %define _with_orrery --with-orrery
 #define _with_maniview --with-maniview
 
-%define beta rc8
+%define beta rc9
 
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.18.%{beta}%{?dist}
+Release: 0.21.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
 Group:   Applications/Engineering
-Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
+Source0: http://osdn.dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
 #Source0: geomview-%{cvs}.tar.bz2
 #Source1: geomview-cvs_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,12 @@
 BuildRequires: desktop-file-utils
 BuildRequires: automake libtool
 BuildRequires: byacc flex
+# Until we have a generic BR: motif-devel -- Rex
+%if "%{?fedora}" > "5"
+BuildRequires: lesstif-devel
+%else
 BuildRequires: openmotif-devel
+%endif
 BuildRequires: xforms-devel
 BuildRequires: libGL-devel libGLU-devel
 %if "%{?fedora}" > "4"
@@ -271,9 +276,18 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
+- 1.8.2rc9
+
+* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.20.rc8
+- fc6: BR: openmotif-devel -> lesstif-devel
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.19.rc8
+- fc6 respin
+
 * Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.18.rc8
 - rename (man/man1/)animate.1 -> geomview-animate.1 to avoid 
-  Conflicts: ImageMagick
+  Conflicts: ImageMagick (bug #202039)
 
 * Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.17.rc8
 - 1.8.2-rc8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Aug 2006 15:42:44 -0000	1.6
+++ sources	1 Oct 2006 21:54:51 -0000	1.7
@@ -1,4 +1,4 @@
 f5588be3402850ed4cc9ef0dac48013a  geomview.png
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
-16ef195e606ecb8338dd239500cae55c  geomview-1.8.2-rc8.tar.bz2
+a8d62bdf60e385f36e0a59f4d8bec361  geomview-1.8.2-rc9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 22:02:10 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  1 Oct 2006 15:02:10 -0700
Subject: owners owners.list,1.1755,1.1756
Message-ID: <200610012202.k91M2hPT023827@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23778

Modified Files:
	owners.list 
Log Message:
take over deskbar-applet


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1755
retrieving revision 1.1756
diff -u -r1.1755 -r1.1756
--- owners.list	1 Oct 2006 17:18:25 -0000	1.1755
+++ owners.list	1 Oct 2006 22:02:10 -0000	1.1756
@@ -272,7 +272,7 @@
 Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
 Fedora Extras|deltarpm|Create deltas between rpms|misa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
-Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|deutex|Doom wad manipulation tool|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|DevIL|A cross-platform image library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 22:03:15 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  1 Oct 2006 15:03:15 -0700
Subject: rpms/deskbar-applet/devel .cvsignore, 1.13, 1.14 deskbar-applet.spec,
	1.30, 1.31 sources, 1.13, 1.14
Message-ID: <200610012203.k91M3mbR023889@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.16.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 Aug 2006 05:28:02 -0000	1.13
+++ .cvsignore	1 Oct 2006 22:03:15 -0000	1.14
@@ -1 +1 @@
-deskbar-applet-2.15.91.tar.bz2
+deskbar-applet-2.16.0.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- deskbar-applet.spec	6 Sep 2006 19:15:08 -0000	1.30
+++ deskbar-applet.spec	1 Oct 2006 22:03:15 -0000	1.31
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.15.91
-Release:        5%{?dist}
+Version:        2.16.0
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -50,15 +50,7 @@
 install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT$hdir
 install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT$adir
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
-install -D -m 0644 -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*/apps/deskbar-applet.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
-rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora              \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora                       \
-    --add-category Utility                        \
-    --add-category Application                    \
-    data/%{name}.desktop
 
 %{find_lang} %{name}
 
@@ -96,17 +88,18 @@
 %{_libdir}/pkgconfig/%{name}.pc
 %{python_sitelib}/deskbar
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Oct  1 2006 Luke Macken <lmacken at redhat.com> - 2.16.0-1
+- 2.16.0
+
 * Wed Sep 06 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.15.91-5
 - rebuild for FC6
 - added BR on XML::Parser
 
 * Sat Aug 19 2006 Luke Macken <lmacken at redhat.com> 2.15.91-3
-- Instally desktop file correctly
+- Install desktop file correctly
 
 * Wed Aug 17 2006 Luke Macken <lmacken at redhat.com> 2.15.91-1
 - 2.15.91


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Aug 2006 05:28:02 -0000	1.13
+++ sources	1 Oct 2006 22:03:15 -0000	1.14
@@ -1 +1 @@
-2e3ee26af253286d2f0be845d42c023c  deskbar-applet-2.15.91.tar.bz2
+9f14a65f75142cd5b233bf9376a1f946  deskbar-applet-2.16.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 23:14:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:14:32 -0700
Subject: rpms/lyx/devel lyx-1.4.3-helpers.patch, 1.1, 1.2 lyx-qt.desktop, 1.1,
	1.2 lyx-xforms.desktop, 1.1, 1.2 lyx.desktop, 1.3, 1.4 lyx.spec,
	1.46, 1.47
Message-ID: <200610012314.k91NEY53028860@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28832

Modified Files:
	lyx-1.4.3-helpers.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.desktop lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils


lyx-1.4.3-helpers.patch:

Index: lyx-1.4.3-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-1.4.3-helpers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.3-helpers.patch	21 Sep 2006 15:26:46 -0000	1.1
+++ lyx-1.4.3-helpers.patch	1 Oct 2006 23:14:31 -0000	1.2
@@ -5,20 +5,20 @@
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
 -    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
-+    checkViewer('a Postscript previewer', ['evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
++    checkViewer('a Postscript previewer', ['xdg-open', 'evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""
  \Format ps         ps      Postscript             t  "%%"	""'''])
      #
 -    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
 -                            'xpdf', 'kpdf', 'kghostview'],
-+    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'evince', \
++    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'evince', \
 +                            'xpdf', 'kpdf', 'gsview', 'kghostview', 'gv', 'ghostview'],
          rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""
  \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""
  \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""'''])
      #
 -    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
-+    checkViewer('a DVI previewer', ['kdvi', 'xdvi'],
++    checkViewer('a DVI previewer', ['xdg-open', 'kdvi', 'xdvi'],
          rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""'])
      if ((os.name == 'nt' or sys.platform == 'cygwin') and
              checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
@@ -27,7 +27,7 @@
          addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""')
      #
 -    checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
-+    checkViewer('a HTML previewer', ['htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
++    checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
          rc_entry = [r'\Format html       html    HTML                   H  "%%"	""'])
      #
      # entried that do not need checkProg


Index: lyx-qt.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-qt.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-qt.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-qt.desktop	1 Oct 2006 23:14:31 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-qt
-GenericName=WYSIWYM document processor
-Comment=Lyx using Qt frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-qt
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Qt;Application;Office;WordProcessor;
 


Index: lyx-xforms.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-xforms.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-xforms.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-xforms.desktop	1 Oct 2006 23:14:31 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-xforms
-GenericName=WYSIWYM document processor
-Comment=Lyx using XForms frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-xforms
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lyx.desktop	20 Jan 2006 15:37:52 -0000	1.3
+++ lyx.desktop	1 Oct 2006 23:14:31 -0000	1.4
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX
-GenericName=WYSIWYM document processor
-Comment=WYSIWYM document processor
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lyx.spec	21 Sep 2006 15:26:46 -0000	1.46
+++ lyx.spec	1 Oct 2006 23:14:31 -0000	1.47
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -46,6 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
+Requires: xdg-utils
 ## Soft dependencies
 %if "%{?fedora}" > "3"
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -144,7 +145,7 @@
 # .desktop
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="fedora" \
+  --add-category="X-Fedora" --vendor="" \
   %{SOURCE21} %{SOURCE22}
 
 # generic/hicolor icon
@@ -219,6 +220,10 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+- sync .desktop files with upstream
+- use xdg-open as default helper, +Requires: xdg-utils
+
 * Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-1
 - 1.4.3
 



From fedora-extras-commits at redhat.com  Sun Oct  1 23:15:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:15:30 -0700
Subject: rpms/lyx/FC-5 lyx-1.4.3-helpers.patch, 1.1, 1.2 lyx-qt.desktop, 1.1,
	1.2 lyx-xforms.desktop, 1.1, 1.2 lyx.desktop, 1.3, 1.4 lyx.spec,
	1.42, 1.43
Message-ID: <200610012315.k91NFWhL028944@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28916

Modified Files:
	lyx-1.4.3-helpers.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.desktop lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils


lyx-1.4.3-helpers.patch:

Index: lyx-1.4.3-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-1.4.3-helpers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.3-helpers.patch	21 Sep 2006 15:43:12 -0000	1.1
+++ lyx-1.4.3-helpers.patch	1 Oct 2006 23:15:30 -0000	1.2
@@ -5,20 +5,20 @@
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
 -    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
-+    checkViewer('a Postscript previewer', ['evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
++    checkViewer('a Postscript previewer', ['xdg-open', 'evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""
  \Format ps         ps      Postscript             t  "%%"	""'''])
      #
 -    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
 -                            'xpdf', 'kpdf', 'kghostview'],
-+    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'evince', \
++    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'evince', \
 +                            'xpdf', 'kpdf', 'gsview', 'kghostview', 'gv', 'ghostview'],
          rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""
  \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""
  \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""'''])
      #
 -    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
-+    checkViewer('a DVI previewer', ['kdvi', 'xdvi'],
++    checkViewer('a DVI previewer', ['xdg-open', 'kdvi', 'xdvi'],
          rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""'])
      if ((os.name == 'nt' or sys.platform == 'cygwin') and
              checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
@@ -27,7 +27,7 @@
          addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""')
      #
 -    checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
-+    checkViewer('a HTML previewer', ['htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
++    checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
          rc_entry = [r'\Format html       html    HTML                   H  "%%"	""'])
      #
      # entried that do not need checkProg


Index: lyx-qt.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-qt.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-qt.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-qt.desktop	1 Oct 2006 23:15:30 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-qt
-GenericName=WYSIWYM document processor
-Comment=Lyx using Qt frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-qt
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Qt;Application;Office;WordProcessor;
 


Index: lyx-xforms.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-xforms.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-xforms.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-xforms.desktop	1 Oct 2006 23:15:30 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-xforms
-GenericName=WYSIWYM document processor
-Comment=Lyx using XForms frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-xforms
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lyx.desktop	20 Jan 2006 15:37:52 -0000	1.3
+++ lyx.desktop	1 Oct 2006 23:15:30 -0000	1.4
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX
-GenericName=WYSIWYM document processor
-Comment=WYSIWYM document processor
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- lyx.spec	21 Sep 2006 15:43:12 -0000	1.42
+++ lyx.spec	1 Oct 2006 23:15:30 -0000	1.43
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -46,6 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
+Requires: xdg-utils
 ## Soft dependencies
 %if "%{?fedora}" > "3"
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -144,7 +145,7 @@
 # .desktop
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="fedora" \
+  --add-category="X-Fedora" --vendor="" \
   %{SOURCE21} %{SOURCE22}
 
 # generic/hicolor icon
@@ -219,6 +220,10 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+- sync .desktop files with upstream
+- use xdg-open as default helper, +Requires: xdg-utils
+
 * Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-1
 - 1.4.3
 



From fedora-extras-commits at redhat.com  Sun Oct  1 23:16:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:16:01 -0700
Subject: rpms/lyx/FC-4 lyx-1.4.3-helpers.patch, 1.1, 1.2 lyx-qt.desktop, 1.1,
	1.2 lyx-xforms.desktop, 1.1, 1.2 lyx.desktop, 1.3, 1.4 lyx.spec,
	1.30, 1.31
Message-ID: <200610012316.k91NG3hT029033@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29003

Modified Files:
	lyx-1.4.3-helpers.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.desktop lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils


lyx-1.4.3-helpers.patch:

Index: lyx-1.4.3-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx-1.4.3-helpers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.3-helpers.patch	28 Sep 2006 12:35:35 -0000	1.1
+++ lyx-1.4.3-helpers.patch	1 Oct 2006 23:16:01 -0000	1.2
@@ -5,20 +5,20 @@
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
 -    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
-+    checkViewer('a Postscript previewer', ['evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
++    checkViewer('a Postscript previewer', ['xdg-open', 'evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""
  \Format ps         ps      Postscript             t  "%%"	""'''])
      #
 -    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
 -                            'xpdf', 'kpdf', 'kghostview'],
-+    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'evince', \
++    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'evince', \
 +                            'xpdf', 'kpdf', 'gsview', 'kghostview', 'gv', 'ghostview'],
          rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""
  \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""
  \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""'''])
      #
 -    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
-+    checkViewer('a DVI previewer', ['kdvi', 'xdvi'],
++    checkViewer('a DVI previewer', ['xdg-open', 'kdvi', 'xdvi'],
          rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""'])
      if ((os.name == 'nt' or sys.platform == 'cygwin') and
              checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
@@ -27,7 +27,7 @@
          addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""')
      #
 -    checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
-+    checkViewer('a HTML previewer', ['htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
++    checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
          rc_entry = [r'\Format html       html    HTML                   H  "%%"	""'])
      #
      # entried that do not need checkProg


Index: lyx-qt.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx-qt.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-qt.desktop	20 Jan 2006 17:51:39 -0000	1.1
+++ lyx-qt.desktop	1 Oct 2006 23:16:01 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-qt
-GenericName=WYSIWYM document processor
-Comment=Lyx using Qt frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-qt
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Qt;Application;Office;WordProcessor;
 


Index: lyx-xforms.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx-xforms.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-xforms.desktop	20 Jan 2006 17:51:39 -0000	1.1
+++ lyx-xforms.desktop	1 Oct 2006 23:16:01 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-xforms
-GenericName=WYSIWYM document processor
-Comment=Lyx using XForms frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-xforms
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lyx.desktop	20 Jan 2006 17:51:39 -0000	1.3
+++ lyx.desktop	1 Oct 2006 23:16:01 -0000	1.4
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX
-GenericName=WYSIWYM document processor
-Comment=WYSIWYM document processor
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- lyx.spec	28 Sep 2006 12:35:35 -0000	1.30
+++ lyx.spec	1 Oct 2006 23:16:01 -0000	1.31
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -46,6 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
+Requires: xdg-utils
 ## Soft dependencies
 %if "%{?fedora}" > "3"
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -144,7 +145,7 @@
 # .desktop
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="fedora" \
+  --add-category="X-Fedora" --vendor="" \
   %{SOURCE21} %{SOURCE22}
 
 # generic/hicolor icon
@@ -219,6 +220,10 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+- sync .desktop files with upstream
+- use xdg-open as default helper, +Requires: xdg-utils
+
 * Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-1
 - 1.4.3
 



From fedora-extras-commits at redhat.com  Sun Oct  1 23:55:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:55:58 -0700
Subject: rpms/lyx/devel lyx.spec,1.47,1.48 lyxrc.defaults.custom,1.2,NONE
Message-ID: <200610012356.k91Nu0pZ029213@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29196

Modified Files:
	lyx.spec 
Removed Files:
	lyxrc.defaults.custom 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- lyx.spec	1 Oct 2006 23:14:31 -0000	1.47
+++ lyx.spec	1 Oct 2006 23:55:58 -0000	1.48
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -211,16 +211,16 @@
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/lyx-qt
-%{_datadir}/applications/*-lyx-qt.desktop
+%{_datadir}/applications/*lyx-qt.desktop
 
 %files xforms
 %defattr(-,root,root,-)
 %{_bindir}/lyx-xforms
-%{_datadir}/applications/*-lyx-xforms.desktop
+%{_datadir}/applications/*lyx-xforms.desktop
 
 
 %changelog
-* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
 - sync .desktop files with upstream
 - use xdg-open as default helper, +Requires: xdg-utils
 


--- lyxrc.defaults.custom DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  1 23:56:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:56:14 -0700
Subject: rpms/lyx/FC-5 lyx.spec,1.43,1.44
Message-ID: <200610012356.k91NuGUv029274@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29256

Modified Files:
	lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- lyx.spec	1 Oct 2006 23:15:30 -0000	1.43
+++ lyx.spec	1 Oct 2006 23:56:13 -0000	1.44
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -211,16 +211,16 @@
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/lyx-qt
-%{_datadir}/applications/*-lyx-qt.desktop
+%{_datadir}/applications/*lyx-qt.desktop
 
 %files xforms
 %defattr(-,root,root,-)
 %{_bindir}/lyx-xforms
-%{_datadir}/applications/*-lyx-xforms.desktop
+%{_datadir}/applications/*lyx-xforms.desktop
 
 
 %changelog
-* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
 - sync .desktop files with upstream
 - use xdg-open as default helper, +Requires: xdg-utils
 



From fedora-extras-commits at redhat.com  Sun Oct  1 23:56:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:56:30 -0700
Subject: rpms/lyx/FC-4 lyx.spec,1.31,1.32
Message-ID: <200610012356.k91NuWpo029369@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29323

Modified Files:
	lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lyx.spec	1 Oct 2006 23:16:01 -0000	1.31
+++ lyx.spec	1 Oct 2006 23:56:30 -0000	1.32
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -211,16 +211,16 @@
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/lyx-qt
-%{_datadir}/applications/*-lyx-qt.desktop
+%{_datadir}/applications/*lyx-qt.desktop
 
 %files xforms
 %defattr(-,root,root,-)
 %{_bindir}/lyx-xforms
-%{_datadir}/applications/*-lyx-xforms.desktop
+%{_datadir}/applications/*lyx-xforms.desktop
 
 
 %changelog
-* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
 - sync .desktop files with upstream
 - use xdg-open as default helper, +Requires: xdg-utils
 



From fedora-extras-commits at redhat.com  Mon Oct  2 00:26:31 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Sun,  1 Oct 2006 17:26:31 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools-0.17-new-hdrs.patch, NONE, 
	1.1
Message-ID: <200610020026.k920QXZB032363@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32345

Added Files:
	netlabel_tools-0.17-new-hdrs.patch 
Log Message:
* Fri Sep 29 2006 James Antill <james at and.org> - 0.17-1
- Upgrade to latest upstream.


netlabel_tools-0.17-new-hdrs.patch:

--- NEW FILE netlabel_tools-0.17-new-hdrs.patch ---
--- netlabel_tools-0.16-orig/Makefile	2006-06-27 13:06:28.000000000 -0400
+++ netlabel_tools-0.16/Makefile	2006-08-29 16:42:09.000000000 -0400
@@ -43,8 +43,9 @@ INSTALL_SBIN_DIR = $(INSTALL_PREFIX)/sbi
 INSTALL_BIN_DIR = $(INSTALL_PREFIX)/bin
 INSTALL_MAN_DIR = $(INSTALL_PREFIX)/share/man
 
-OWNER = root
-GROUP = root
+# Mock doesn't allow this.
+#OWNER = root
+#GROUP = root
 
 #
 # targets
@@ -77,9 +78,9 @@ install: $(SUBDIRS)
 	@echo "INFO: installing files in $(INSTALL_PREFIX)"
 	@mkdir -p $(INSTALL_SBIN_DIR)
 	@mkdir -p $(INSTALL_MAN_DIR)/man8
-	@install -o $(OWNER) -g $(GROUP) -m 755 netlabelctl/netlabelctl \
+	@install -m 755 netlabelctl/netlabelctl \
 	 $(INSTALL_SBIN_DIR)/netlabelctl
-	@install -o $(OWNER) -g $(GROUP) -m 644 docs/man/netlabelctl.8 \
+	@install -m 644 docs/man/netlabelctl.8 \
 	 $(INSTALL_MAN_DIR)/man8
 
 clean:



From fedora-extras-commits at redhat.com  Mon Oct  2 00:28:43 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Sun,  1 Oct 2006 17:28:43 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools.spec,1.2,1.3
Message-ID: <200610020028.k920Sjfq032416@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32399

Modified Files:
	netlabel_tools.spec 
Log Message:
* Sun Oct  1 2006 James Antill <james at and.org> - 0.17-2
- Upgrade to latest upstream.



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netlabel_tools.spec	30 Sep 2006 07:08:50 -0000	1.2
+++ netlabel_tools.spec	2 Oct 2006 00:28:43 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}
@@ -45,7 +45,7 @@
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
-* Fri Sep 29 2006 James Antill <james at and.org> - 0.17-1
+* Sun Oct  1 2006 James Antill <james at and.org> - 0.17-2
 - Upgrade to latest upstream.
 
 * Tue Aug 29 2006 James Antill <james at and.org> - 0.16-5



From fedora-extras-commits at redhat.com  Mon Oct  2 02:25:50 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sun,  1 Oct 2006 19:25:50 -0700
Subject: rpms/lft/devel lft.spec,1.21,1.22
Message-ID: <200610020225.k922PqFC006018@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6001

Modified Files:
	lft.spec 
Log Message:
* Sun Oct 01 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1:2.5-6
- Rebuild due to gcc bug.



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lft.spec	19 Sep 2006 14:58:08 -0000	1.21
+++ lft.spec	2 Oct 2006 02:25:50 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          1
 Summary:        Alternate traceroute tool
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Oct 01 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1:2.5-6
+- Rebuild due to gcc bug.
+
 * Tue Sep 19 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1:2.5-5
 - Bump release for rebuild.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 02:46:33 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Sun,  1 Oct 2006 19:46:33 -0700
Subject: accounts2 fedoraPerson.schema,1.1,1.2
Message-ID: <200610020246.k922kX8U006110@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6092

Modified Files:
	fedoraPerson.schema 
Log Message:



Index: fedoraPerson.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraPerson.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedoraPerson.schema	27 Sep 2006 01:17:49 -0000	1.1
+++ fedoraPerson.schema	2 Oct 2006 02:46:31 -0000	1.2
@@ -4,7 +4,35 @@
 #for now this is the contents
 #ssh_key
 attributeType ( 2.5.4.41 NAME 'ssh_key'
-                DESC 'group name'
+                DESC 'ssh key for this memeber'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
\ No newline at end of file
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
+
+attributeType ( 2.5.4.41 NAME 'bugzilla_email'
+                DESC 'members preferred bugzilla email address'
+		EQUALITY caseIgnoreIA5Match
+		SUBSTR caseIgnoreIA5SubstringsMatch
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
+
+# fedoraPerson
+# The fedoraPerson represents people who are a member of the fedora project
+# in some way.  It is a structural class and inherits
+# from the inetOrgPerson class
+objectclass	( 2.16.840.1.113730.3.2.2
+    NAME 'fedoraPerson'
+	DESC 'A member of the fedoraproject group'
+    SUP inetOrgPerson
+    STRUCTURAL
+	MAY (
+		audio $ businessCategory $ carLicense $ departmentNumber $
+		displayName $ employeeNumber $ employeeType $ givenName $
+		homePhone $ homePostalAddress $ initials $ jpegPhoto $
+		labeledURI $ mail $ manager $ mobile $ o $ pager $
+		photo $ roomNumber $ secretary $ uid $ userCertificate $
+		x500uniqueIdentifier $ preferredLanguage $
+		userSMIMECertificate $ userPKCS12 )
+	)
+	MUST (
+		ssh_key $ bugzilla_email 
+	)



From fedora-extras-commits at redhat.com  Mon Oct  2 04:05:04 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:05:04 -0700
Subject: rpms/Inventor/devel .cvsignore, 1.3, 1.4 Inventor.spec, 1.33,
	1.34 sources, 1.3, 1.4
Message-ID: <200610020405.k9245agn012032@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
- Add make-var _PDFVIEWER.
- Backport to FC4.
- Fix path to chessboard.iv in chesschairs.iv.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2006 08:39:13 -0000	1.3
+++ .cvsignore	2 Oct 2006 04:05:04 -0000	1.4
@@ -1,2 +1,3 @@
 inventor-2.1.5-10.src.tar.gz
 Inventor-2.1.5-22.diff
+Inventor-2.1.5-23.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Inventor.spec	28 Sep 2006 08:39:13 -0000	1.33
+++ Inventor.spec	2 Oct 2006 04:05:04 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        22%{?dist}
+Release:        23%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,14 +14,22 @@
 License:        LGPL
 URL:            http://oss.sgi.com/projects/inventor/
 Source0:        ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
-Patch0:		Inventor-2.1.5-22.diff
+Patch0:		Inventor-2.1.5-23.diff.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{?fedora}" < "5"
+BuildRequires:  xorg-x11-Mesa-libGLU
+BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  xorg-x11-devel
+%endif
+
 BuildRequires:  libGLU-devel
+%if "%{?fedora}" >= "5"
 BuildRequires:	libGLw-devel
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
+%endif
 
 %if "%{?fedora}" >= "6"
 BuildRequires:	lesstif-devel
@@ -157,6 +165,8 @@
     < $i > $(basename $i .in)
 done
 
+rm -f data/models/scenes/chesschairs.iv
+
 %build
 # Inventor's build system wants us to install and build everything at once.
 rm -rf $RPM_BUILD_ROOT
@@ -171,7 +181,7 @@
   LSUBDIRS="lib libSoXt"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} BUILDMAN=1 \
-  LSUBDIRS="doc data apps"
+  LSUBDIRS="doc apps data"
 
 # convert Mentor and Toolmaker examples into a standalone package
 rm -rf devel-docs
@@ -284,6 +294,11 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
+- Add make-var _PDFVIEWER.
+- Backport to FC4.
+- Fix path to chessboard.iv in chesschairs.iv.
+
 * Thu Sep 25 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-22
 - Misc minor fixes.
 - Add dep to xmessage.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 08:39:13 -0000	1.3
+++ sources	2 Oct 2006 04:05:04 -0000	1.4
@@ -1,2 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
-6fa640c31471056a882c536a41040a71  Inventor-2.1.5-22.diff
+c8e1cbcc3ae9f51f97940b06d522bd47  Inventor-2.1.5-23.diff.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 04:06:41 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:06:41 -0700
Subject: rpms/Inventor/devel .cvsignore,1.4,1.5
Message-ID: <200610020406.k9246hBn012067@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12041

Modified Files:
	.cvsignore 
Log Message:
* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
- Add make-var _PDFVIEWER.
- Backport to FC4.
- Fix path to chessboard.iv in chesschairs.iv.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 04:05:04 -0000	1.4
+++ .cvsignore	2 Oct 2006 04:06:41 -0000	1.5
@@ -1,3 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
-Inventor-2.1.5-22.diff
 Inventor-2.1.5-23.diff.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 04:46:04 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:46:04 -0700
Subject: rpms/Inventor/FC-5 .cvsignore, 1.3, 1.4 Inventor.spec, 1.32,
	1.33 sources, 1.3, 1.4
Message-ID: <200610020446.k924k6oU012266@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12245

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
- Add make-var _PDFVIEWER.
- Backport to FC4.
- Fix path to chessboard.iv in chesschairs.iv.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2006 09:00:00 -0000	1.3
+++ .cvsignore	2 Oct 2006 04:46:03 -0000	1.4
@@ -1,2 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
-Inventor-2.1.5-22.diff
+Inventor-2.1.5-23.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/Inventor.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Inventor.spec	28 Sep 2006 09:00:00 -0000	1.32
+++ Inventor.spec	2 Oct 2006 04:46:03 -0000	1.33
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        22%{?dist}
+Release:        23%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,14 +14,22 @@
 License:        LGPL
 URL:            http://oss.sgi.com/projects/inventor/
 Source0:        ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
-Patch0:		Inventor-2.1.5-22.diff
+Patch0:		Inventor-2.1.5-23.diff.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{?fedora}" < "5"
+BuildRequires:  xorg-x11-Mesa-libGLU
+BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  xorg-x11-devel
+%endif
+
 BuildRequires:  libGLU-devel
+%if "%{?fedora}" >= "5"
 BuildRequires:	libGLw-devel
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
+%endif
 
 %if "%{?fedora}" >= "6"
 BuildRequires:	lesstif-devel
@@ -157,6 +165,8 @@
     < $i > $(basename $i .in)
 done
 
+rm -f data/models/scenes/chesschairs.iv
+
 %build
 # Inventor's build system wants us to install and build everything at once.
 rm -rf $RPM_BUILD_ROOT
@@ -171,7 +181,7 @@
   LSUBDIRS="lib libSoXt"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} BUILDMAN=1 \
-  LSUBDIRS="doc data apps"
+  LSUBDIRS="doc apps data"
 
 # convert Mentor and Toolmaker examples into a standalone package
 rm -rf devel-docs
@@ -284,6 +294,11 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
+- Add make-var _PDFVIEWER.
+- Backport to FC4.
+- Fix path to chessboard.iv in chesschairs.iv.
+
 * Thu Sep 25 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-22
 - Misc minor fixes.
 - Add dep to xmessage.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 09:00:00 -0000	1.3
+++ sources	2 Oct 2006 04:46:03 -0000	1.4
@@ -1,2 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
-6fa640c31471056a882c536a41040a71  Inventor-2.1.5-22.diff
+c8e1cbcc3ae9f51f97940b06d522bd47  Inventor-2.1.5-23.diff.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 04:52:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:52:12 -0700
Subject: rpms/Inventor/FC-4 Inventor-apps.diff, 1.1,
	NONE Inventor-makeManDirs.diff, 1.1, NONE Inventor-yacc.diff,
	1.1, NONE Inventor-SoPath.diff, 1.1,
	NONE Inventor-pkgconfig.diff, 1.1,
	NONE Inventor-libInventor.diff, 1.1, NONE Inventor-decal.diff,
	1.1, NONE
Message-ID: <200610020452.k924qE26012355@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12340

Removed Files:
	Inventor-apps.diff Inventor-makeManDirs.diff 
	Inventor-yacc.diff Inventor-SoPath.diff 
	Inventor-pkgconfig.diff Inventor-libInventor.diff 
	Inventor-decal.diff 
Log Message:
Remove.


--- Inventor-apps.diff DELETED ---


--- Inventor-makeManDirs.diff DELETED ---


--- Inventor-yacc.diff DELETED ---


--- Inventor-SoPath.diff DELETED ---


--- Inventor-pkgconfig.diff DELETED ---


--- Inventor-libInventor.diff DELETED ---


--- Inventor-decal.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 04:53:25 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:53:25 -0700
Subject: rpms/Inventor/FC-4 inventor_2.1.5-10-2.diff,1.1,NONE
Message-ID: <200610020453.k924rREg012391@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376

Removed Files:
	inventor_2.1.5-10-2.diff 
Log Message:
Remove.


--- inventor_2.1.5-10-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 04:54:10 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:54:10 -0700
Subject: rpms/Inventor/FC-4 .cvsignore, 1.2, 1.3 Inventor.spec, 1.14,
	1.15 sources, 1.2, 1.3
Message-ID: <200610020454.k924sDQr012427@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:59:15 -0000	1.2
+++ .cvsignore	2 Oct 2006 04:54:10 -0000	1.3
@@ -1 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
+Inventor-2.1.5-23.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/Inventor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Inventor.spec	3 Aug 2005 04:06:39 -0000	1.14
+++ Inventor.spec	2 Oct 2006 04:54:10 -0000	1.15
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 
 Name:           Inventor
 Version:        2.1.5
-Release:        13%{?dist}
+Release:        23%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,31 +14,30 @@
 License:        LGPL
 URL:            http://oss.sgi.com/projects/inventor/
 Source0:        ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
-# Debian patch
-Patch0:         inventor_2.1.5-10-2.diff
-# fix broken GNUmakefiles
-Patch1:		Inventor-apps.diff
-# fixes one of the GNUmakefile bugs (currently unused)
-Patch2:		Inventor-libSoXt.diff
-# use bison
-Patch3:		Inventor-yacc.diff
-# use /bin/csh (Revert debian patch)
-Patch4:		Inventor-makeManDirs.diff
-# Add libdl to libInventor
-Patch5:		Inventor-libInventor.diff
-# Add libgl to Decal.so
-Patch6:		Inventor-decal.diff
-# Add pkgconfig support
-Patch7:		Inventor-pkgconfig.diff
-# Declare SoTempPath forward
-Patch8:		Inventor-SoPath.diff
+Patch0:		Inventor-2.1.5-23.diff.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{?fedora}" < "5"
 BuildRequires:  xorg-x11-Mesa-libGLU
 BuildRequires:  xorg-x11-Mesa-libGL
-BuildRequires:	xorg-x11-devel
-BuildRequires:	openmotif-devel freetype-devel libjpeg-devel
+BuildRequires:  xorg-x11-devel
+%endif
+
+BuildRequires:  libGLU-devel
+%if "%{?fedora}" >= "5"
+BuildRequires:	libGLw-devel
+# FIXME: Why is libXi required?
+BuildRequires: 	libXi-devel
+%endif
+
+%if "%{?fedora}" >= "6"
+BuildRequires:	lesstif-devel
+%else
+BuildRequires:	openmotif-devel
+%endif
+BuildRequires:	freetype-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	bison
 # Workaround to RH shipping bison with broken package dependencies
 BuildRequires:	m4
@@ -59,29 +58,37 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	xorg-x11-devel
+Requires:	libGLU-devel
 Requires:	freetype-devel libjpeg-devel
 
 %description    devel
 SGI Open Inventor (TM) development files.
 
 %package        -n InventorXt
-Summary:        SGI Open Inventor (TM) Motif bindings.
+Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	pkgconfig
+%if "%{?fedora}" >= "4"
+Requires:	%{_bindir}/xmessage
+%else
+Requires:	/usr/X11R6/bin/xmessage
+%endif
 
 %description    -n InventorXt
 SGI Open Inventor (TM) development files.
 
 %package        -n InventorXt-devel
-Summary:        SGI Open Inventor (TM) Motif bindings.
+Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
+%if "%{?fedora}" >= "6"
+Requires:	lesstif-devel
+%else
 Requires:	openmotif-devel
+%endif
 
 %description    -n InventorXt-devel
 SGI Open Inventor (TM) development files.
@@ -103,7 +110,7 @@
 
 %package	examples
 Summary:	SGI Open Inventor (TM) source code examples
-Group:		Development/Demos
+Group:		Development/Libraries
 # Should we once ship binary examples, this requirement can be dropped
 Requires:	InventorXt-devel
 
@@ -113,15 +120,8 @@
 
 %prep
 %setup -q -n inventor
-%patch0 -p1 -b .debian
-%patch1 -p0
-# %patch2 -p0 -b .orig
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
+find -name CVS | xargs rm -rf
+%patch0 -p0
 
 grep -Rl __ia64 lib* | while read a; do \
   sed -i -e 's,__ia64,__ia64__,g' \
@@ -165,12 +165,14 @@
     < $i > $(basename $i .in)
 done
 
+rm -f data/models/scenes/chesschairs.iv
+
 %build
 # Inventor's build system wants us to install and build everything at once.
 rm -rf $RPM_BUILD_ROOT
 export LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir}
 export VCOPTS="${RPM_OPT_FLAGS} -D_REENTRANT"
-export VCXXOPTS="${RPM_OPT_FLAGS} -D_REENTRANT"
+export VCXXOPTS="${RPM_OPT_FLAGS} -D_REENTRANT -D__STDC_FORMAT_MACROS"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} \
   LSUBDIRS="libimage tools libFL"
@@ -179,15 +181,13 @@
   LSUBDIRS="lib libSoXt"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} BUILDMAN=1 \
-  LSUBDIRS="doc data apps"
+  LSUBDIRS="doc apps data"
 
 # convert Mentor and Toolmaker examples into a standalone package
 rm -rf devel-docs
 cp -a apps/examples devel-docs
 cp -a make devel-docs
 pushd devel-docs > /dev/null
-find -name CVS | xargs rm -rf
-find \( -name '*~' -o -name '*.debian' \) -exec rm -f {} \;
 find -name 'GNUmakefile*' | while read a; do \
   b=`echo $a | sed 's,GNUmakefile.*$,,;s,^\./,,;s,[^/]*/,../,g;s,\/$,,;s,^$,.,'`
   sed -i -e "s,^IVDEPTH = .*$,IVDEPTH = $b," $a
@@ -294,6 +294,45 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
+- Add make-var _PDFVIEWER.
+- Backport to FC4.
+- Fix path to chessboard.iv in chesschairs.iv.
+
+* Thu Sep 25 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-22
+- Misc minor fixes.
+- Add dep to xmessage.
+- Use unified patch.
+- Rebuild against lesscrap.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-21
+- Mass rebuild.
+
+* Sun Feb 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-20
+- Rebuild.
+
+* Fri Dec 30 2005 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-19
+- Don't BR: libXau-devel (#176313 reported to be fixed).
+
+* Wed Dec 28 2005 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-18
+- Remove patch10 (#173879, #175251 are reported to be fixed).
+
+* Thu Dec 22 2005 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-17
+- Remove BR: libX11-devel (#173712 reported to be fixed).
+- Remove BR: libGL-devel (#175253 reported to be fixed).
+
+* Wed Dec 14 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-16
+- Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
+- Remove BR: xorg-x11-proto-devel (PR #175256).
+
+* Thu Dec 8 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-15
+- Further modular X fixes.
+- Reflect modular X pkgconfigs.
+
+* Thu Dec 8 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-14
+- Attempt to build against modular X.
+- Add Inventor-redhat-bugs patch.
+
 * Tue Aug 03 2005 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-13
 - Let PPC use standard RPM_OPT_FLAGS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:59:15 -0000	1.2
+++ sources	2 Oct 2006 04:54:10 -0000	1.3
@@ -1 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
+c8e1cbcc3ae9f51f97940b06d522bd47  Inventor-2.1.5-23.diff.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 06:12:12 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 23:12:12 -0700
Subject: rpms/php-pear-Console-Getargs/FC-5 php-pear-Console-Getargs.spec,
	1.1, 1.2
Message-ID: <200610020612.k926CEoK018461@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18444

Modified Files:
	php-pear-Console-Getargs.spec 
Log Message:
	bump release to build under FC5



Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/php-pear-Console-Getargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Console-Getargs.spec	1 Oct 2006 12:38:04 -0000	1.1
+++ php-pear-Console-Getargs.spec	2 Oct 2006 06:12:12 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Console-Getargs
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
 



From fedora-extras-commits at redhat.com  Mon Oct  2 06:57:34 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:57:34 -0700
Subject: rpms/gnome-python2-gda - New directory
Message-ID: <200610020657.k926vaZn018702@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18676/gnome-python2-gda

Log Message:
Directory /cvs/extras/rpms/gnome-python2-gda added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 06:57:35 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:57:35 -0700
Subject: rpms/gnome-python2-gda/devel - New directory
Message-ID: <200610020657.k926vbTe018705@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18676/gnome-python2-gda/devel

Log Message:
Directory /cvs/extras/rpms/gnome-python2-gda/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 06:57:52 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:57:52 -0700
Subject: rpms/gnome-python2-gda Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610020657.k926vsUs018752@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18724

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnome-python2-gda


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-python2-gda
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 06:57:53 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:57:53 -0700
Subject: rpms/gnome-python2-gda/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610020658.k926vt2Y018755@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18724/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-python2-gda


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 06:59:01 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:59:01 -0700
Subject: rpms/gnome-python2-gda/devel gnome-python2-gda-configure.patch, NONE,
	1.1 gnome-python2-gda.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610020659.k926x3Jw018834@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18793/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-python2-gda-configure.patch gnome-python2-gda.spec 
Log Message:
auto-import gnome-python2-gda-2.14.2-2 on branch devel from gnome-python2-gda-2.14.2-2.src.rpm

gnome-python2-gda-configure.patch:

--- NEW FILE gnome-python2-gda-configure.patch ---
--- gnome-python-extras-2.14.0.orig/configure	2006-07-24 12:02:29.000000000 +0200
+++ gnome-python-extras-2.14.0/configure	2006-07-24 12:05:04.000000000 +0200
@@ -20972,6 +20972,7 @@
 
 
 
+build_gtkhtml2=false
 if $build_gtkhtml2; then
   BUILD_GTKHTML2_TRUE=
   BUILD_GTKHTML2_FALSE='#'
@@ -21037,6 +21038,7 @@
 fi
 
 
+build_eggtray=false
 if $build_eggtray; then
   BUILD_EGGTRAY_TRUE=
   BUILD_EGGTRAY_FALSE='#'
@@ -21115,6 +21117,7 @@
 fi
 
 
+build_eggrecent=false
 if $build_eggrecent; then
   BUILD_EGGRECENT_TRUE=
   BUILD_EGGRECENT_FALSE='#'
@@ -21382,6 +21385,7 @@
 
 
 
+build_gtkmozembed=false
 if $build_gtkmozembed; then
   BUILD_GTKMOZEMBED_TRUE=
   BUILD_GTKMOZEMBED_FALSE='#'
@@ -21449,6 +21453,7 @@
 fi
 
 
+build_gtkspell=false
 if $build_gtkspell; then
   BUILD_GTKSPELL_TRUE=
   BUILD_GTKSPELL_FALSE='#'
@@ -21513,6 +21518,7 @@
 fi
 
 
+build_gdl=false
 if $build_gdl; then
   BUILD_GDL_TRUE=
   BUILD_GDL_FALSE='#'
@@ -21649,6 +21655,7 @@
 fi
 
 
+build_gksu=false
 if $build_gksu; then
   BUILD_GKSU_TRUE=
   BUILD_GKSU_FALSE='#'
@@ -21720,6 +21727,7 @@
 fi
 
 
+build_gksuui=false
 if $build_gksuui; then
   BUILD_GKSUUI_TRUE=
   BUILD_GKSUUI_FALSE='#'


--- NEW FILE gnome-python2-gda.spec ---
%define pyver %(%{__python} -c "import sys; print sys.version[:3]")

%define glib_version 2.6.0
%define gtk_version 2.4.0
%define gnome_python_version 2.9.0
%define gda_version 1.2.0

Summary: PyGNOME Python extension module for interacting with gda
Name: gnome-python2-gda
Version: 2.14.2
Release: 2%{?dist}
License: LGPL
Group: Development/Languages
URL: http://developer.gnome.org
Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.14/gnome-python-extras-%{version}.tar.bz2
Patch0: gnome-python2-gda-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

Requires:  compat-libgda >= %{gda_version}
Requires: gnome-python2 >= %{gnome_python_version}
Requires: python-abi = %{pyver}
BuildRequires: gtk2-devel >= %{gtk_version}
BuildRequires: gnome-python2 >= %{gnome_python_version}
BuildRequires: compat-libgda-devel >= %{gda_version}
BuildRequires: python-devel
BuildRequires: pygtk2-devel


%description
The gnome-python-extra package contains the source packages for
additional Python bindings for GNOME. It should be used together with
gnome-python. This module contains a wrapper that allows the use of
gda via Python.


%package        devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       pygobject2-devel
Requires:       compat-libgda-devel


%description devel
This package contains the static libraries and header files needed for
developing gtkmm applications.


%prep
%setup -q -n gnome-python-extras-%{version}
%patch0 -p1 -b .configure


%build
%configure --disable-glib-test --disable-gtk-test --disable-dependency-tracking 
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;

rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/gnome-python-extras-2.0.pc
rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/gtk-2.0/egg
rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gksu
rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS COPYING COPYING.LGPL MAINTAINERS
%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gda.so
%{_datadir}/pygtk/2.0/defs/gda.defs


%files devel
%defattr(-,root,root,-)
%doc README ChangeLog
%{_libdir}/pkgconfig/pygda-1.2.pc
%{_includedir}/pygda-1.2


%changelog
* Mon Oct  2 2006 Denis Leroy <denis at poolshark.org> - 2.14.2-2
- Split for devel package

* Sun Oct  1 2006 Denis Leroy <denis at poolshark.org> - 2.14.2-1
- Update to upstream version 2.14.2

* Mon Jul 24 2006 Denis Leroy <denis at poolshark.org> - 2.14.0-1
- First draft, adapted from gnome-python2-extras from core



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 06:57:52 -0000	1.1
+++ .cvsignore	2 Oct 2006 06:59:01 -0000	1.2
@@ -0,0 +1 @@
+gnome-python-extras-2.14.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 06:57:52 -0000	1.1
+++ sources	2 Oct 2006 06:59:01 -0000	1.2
@@ -0,0 +1 @@
+039e1300368df17de9867685e9705091  gnome-python-extras-2.14.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 06:59:01 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:59:01 -0700
Subject: rpms/gnome-python2-gda import.log,1.1,1.2
Message-ID: <200610020659.k926x3Dl018827@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18793

Modified Files:
	import.log 
Log Message:
auto-import gnome-python2-gda-2.14.2-2 on branch devel from gnome-python2-gda-2.14.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 06:57:52 -0000	1.1
+++ import.log	2 Oct 2006 06:59:00 -0000	1.2
@@ -0,0 +1 @@
+gnome-python2-gda-2_14_2-2:HEAD:gnome-python2-gda-2.14.2-2.src.rpm:1159772284



From fedora-extras-commits at redhat.com  Mon Oct  2 07:03:54 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  2 Oct 2006 00:03:54 -0700
Subject: owners owners.list,1.1756,1.1757
Message-ID: <200610020704.k9274TMR021714@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21697

Modified Files:
	owners.list 
Log Message:
Added gnome-python2-gda


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1756
retrieving revision 1.1757
diff -u -r1.1756 -r1.1757
--- owners.list	1 Oct 2006 22:02:10 -0000	1.1756
+++ owners.list	2 Oct 2006 07:03:54 -0000	1.1757
@@ -536,6 +536,7 @@
 Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-phone-manager|Desktop SMS and phone handler|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-ppp|A GNOME 2 WvDial frontend|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-python2-gda|PyGNOME Python extension for libgda access|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-schedule|A GTK+ based user interface for cron and at|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-telnet|A fancy GNOME telnet client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 08:15:21 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon,  2 Oct 2006 01:15:21 -0700
Subject: rpms/pdftohtml/FC-5 pdftohtml.spec,1.10,1.11
Message-ID: <200610020815.k928FNkV025037@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pdftohtml/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006/FC-5

Modified Files:
	pdftohtml.spec 
Log Message:
conflict with poppler-utils (bug 208790)


Index: pdftohtml.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftohtml/FC-5/pdftohtml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pdftohtml.spec	22 Feb 2006 08:34:00 -0000	1.10
+++ pdftohtml.spec	2 Oct 2006 08:15:21 -0000	1.11
@@ -1,14 +1,17 @@
-Name:		pdftohtml
-Version:	0.36
-Release:	7%{?dist}
-
-Summary:	PDF to HTML converter
-License:	GPL
-Group:		Applications/Text
-Url:		http://pdftohtml.sourceforge.net/
-Source0:	http://dl.sf.net/pdftohtml/pdftohtml-0.36.tar.gz
+Name:       pdftohtml
+Version:    0.36
+Release:    9%{?dist}
+
+Summary:    PDF to HTML converter
+License:    GPL
+Group:      Applications/Text
+Url:        http://pdftohtml.sourceforge.net/
+Source0:    http://dl.sf.net/pdftohtml/pdftohtml-0.36.tar.gz
 Patch0:     pdftohtml-0.36-gcc41.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Conflicts:  poppler-utils
+
 
 %description
 PDFTOHTML converts Portable Document Format (PDF) files to HTML
@@ -39,6 +42,12 @@
 %{_bindir}/%{name}
 
 %changelog
+* Mon Oct 02 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-9
+- conflicts with poppler-utils, which also provides /usr/bin/pdftohtml
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-8
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.36-7
 - rebuild 
 



From fedora-extras-commits at redhat.com  Mon Oct  2 08:15:22 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon,  2 Oct 2006 01:15:22 -0700
Subject: rpms/pdftohtml/devel pdftohtml.spec,1.11,1.12
Message-ID: <200610020815.k928FO9w025041@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pdftohtml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006/devel

Modified Files:
	pdftohtml.spec 
Log Message:
conflict with poppler-utils (bug 208790)


Index: pdftohtml.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftohtml/devel/pdftohtml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pdftohtml.spec	30 Aug 2006 15:57:54 -0000	1.11
+++ pdftohtml.spec	2 Oct 2006 08:15:22 -0000	1.12
@@ -1,6 +1,6 @@
 Name:       pdftohtml
 Version:    0.36
-Release:    8%{?dist}
+Release:    9%{?dist}
 
 Summary:    PDF to HTML converter
 License:    GPL
@@ -10,6 +10,9 @@
 Patch0:     pdftohtml-0.36-gcc41.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Conflicts:  poppler-utils
+
+
 %description
 PDFTOHTML converts Portable Document Format (PDF) files to HTML
 format. This release converts text and links. Bold and italic face are
@@ -39,6 +42,9 @@
 %{_bindir}/%{name}
 
 %changelog
+* Mon Oct 02 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-9
+- conflicts with poppler-utils, which also provides /usr/bin/pdftohtml
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-8
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  2 08:40:37 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:40:37 -0700
Subject: rpms/kbackup/devel kbackup-0.5.1.desktop.Encoding.patch, NONE,
	1.1 kbackup-0.5.1.docbook-fr.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 kbackup.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610020840.k928ed7S025200@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25173

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.1.desktop.Encoding.patch 
	kbackup-0.5.1.docbook-fr.patch 
Log Message:
New upstream version.

kbackup-0.5.1.desktop.Encoding.patch:

--- NEW FILE kbackup-0.5.1.desktop.Encoding.patch ---
--- src/kbackup.desktop.orig	2006-09-23 20:53:47.000000000 +0200
+++ src/kbackup.desktop	2006-09-25 18:53:43.000000000 +0200
@@ -1,15 +1,16 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Exec=kbackup %f
-Name=KBackup (Backup Program)
+Name=KBackup
 Comment=Backup your data with an easy to use user interface
 Icon=kbackup
 MimeType=text/x-kbp;
 Terminal=false
 Categories=System;KDE;X-SuSE-Backup;
 
-Name[de]=KBackup (Datensicherungs Programm)
+Name[de]=KBackup
 Comment[de]=Datensicherung mit einem einfach zu bedienended User Interface
 
-Name[fr]=KBackup (Programme de sauvegarde)
+Name[fr]=KBackup
 Comment[fr]=Sauvegarder vos donn??es avec une interface utilisateur facile ?? utiliser

kbackup-0.5.1.docbook-fr.patch:

--- NEW FILE kbackup-0.5.1.docbook-fr.patch ---
--- doc/fr/index.docbook.orig	2006-10-01 22:33:33.000000000 +0200
+++ doc/fr/index.docbook	2006-10-02 10:25:55.000000000 +0200
@@ -69,8 +69,8 @@
      and in the FDL itself on how to use it. -->
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2006-09-24</date>
-<releaseinfo>1.02.00</releaseinfo>
+<date>2006-10-01</date>
+<releaseinfo>1.03.00</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
@@ -196,7 +196,8 @@
 <para>
 &kbackup; enregistre dans un fichier profil une s??lection de tous les fichiers
 et r??pertoires inclus, les fichiers et r??pertoires exclus, le r??pertoire ou
-l'URL cible et le pr??fixe de l'archive.
+l'URL cible, le pr??fixe de l'archive et la taille maximum d'une tranche
+d'archive.
 </para>
 
 <para>
@@ -244,6 +245,16 @@
 Dans le menu Fichier/Configuration du profil, vous pouvez d??finir un pr??fixe
 pour l'archive diff??rent que la valeur par d??faut ??&nbsp;defaut&nbsp;??
 </para>
+
+<para>
+Vous pouvez ??galement d??finir la taille maximum d'une tranche d'archive.
+Cela permet donc de limiter la taille d'une tranche d'archive, m??me s'il
+reste de l'espace sur le p??riph??rique cible. Cela permet de cr??er des tranches
+d'archive qui peuvent ??tre ensuite grav??es sur un CD ou un DVD.
+Si vous avez explicitement limit?? la taille d'une archive, la taille disponible
+sera marqu??e par une ??&nbsp;*&nbsp;?? dans la fen??tre principale.
+</para>
+
 </sect1>
 
 <sect1 id="archive-compression">


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 10:49:08 -0000	1.2
+++ .cvsignore	2 Oct 2006 08:40:37 -0000	1.3
@@ -1 +1 @@
-kbackup-0.5.tar.bz2
+kbackup-0.5.1.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kbackup.spec	27 Sep 2006 09:01:03 -0000	1.2
+++ kbackup.spec	2 Oct 2006 08:40:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		kbackup
-Version:	0.5
-Release:	6%{?dist}
+Version:	0.5.1
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -10,12 +10,9 @@
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}.desktop.Encoding.patch
 Patch1:		%{name}-%{version}.fr.po.patch
+Patch2:		%{name}-%{version}.docbook-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Only for FC-4
-#Requires(post):		desktop-file-utils
-#Requires(postun):	desktop-file-utils
-
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 %description
@@ -37,7 +34,6 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
 
 %build
 %configure --disable-rpath
@@ -51,6 +47,7 @@
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor="" \
   --dir %{buildroot}%{_datadir}/applications/kde \
+  --add-category "Application" \
   --add-category "Utility" \
   --add-category "X-KDE-Utilities-File" \
   --add-category "X-Fedora" \
@@ -61,7 +58,9 @@
 # Fix absolute symlink
 %{__rm} -f %{buildroot}%{_docdir}/HTML/*/%{name}/common
 BKP_PWD=`pwd`
-for lang_dir in de en
+cd %{buildroot}%{_docdir}/HTML/en/%{name}/
+ln -s ../common .
+for lang_dir in de fr
 do
   cd %{buildroot}%{_docdir}/HTML/$lang_dir/%{name}/
   ln -s ../docs/common common
@@ -94,7 +93,15 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
-* Wed Sep 26 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-6
+* Mon Oct  2 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1
+  - New upstream tarball
+  - Update patch1
+  - Add new patch for french doc
+  - Add Application category in desktop file
+  - Fix symlink: english is the only language where common directory is in
+  LANG directory while for other, common is in LANG/docs directory
+
+* Wed Sep 27 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-6
   - Link the good directories
 
 * Tue Sep 26 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 10:49:08 -0000	1.2
+++ sources	2 Oct 2006 08:40:37 -0000	1.3
@@ -1 +1 @@
-94bb56ea9a048622c2bd2677e2e81e82  kbackup-0.5.tar.bz2
+9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 08:45:35 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:45:35 -0700
Subject: rpms/kbackup/devel kbackup.spec,1.3,1.4
Message-ID: <200610020845.k928jbZO025227@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25210

Modified Files:
	kbackup.spec 
Log Message:
Fix spec.


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbackup.spec	2 Oct 2006 08:40:37 -0000	1.3
+++ kbackup.spec	2 Oct 2006 08:45:35 -0000	1.4
@@ -34,6 +34,8 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %configure --disable-rpath



From fedora-extras-commits at redhat.com  Mon Oct  2 08:49:10 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:49:10 -0700
Subject: rpms/kbackup/FC-5 kbackup-0.5.1.desktop.Encoding.patch, NONE,
	1.1 kbackup-0.5.1.docbook-fr.patch, NONE,
	1.1 kbackup-0.5.1.fr.po.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 kbackup.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610020849.k928nCBD025308@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25278

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.1.desktop.Encoding.patch 
	kbackup-0.5.1.docbook-fr.patch kbackup-0.5.1.fr.po.patch 
Log Message:
New upstream version.

kbackup-0.5.1.desktop.Encoding.patch:

--- NEW FILE kbackup-0.5.1.desktop.Encoding.patch ---
--- src/kbackup.desktop.orig	2006-09-23 20:53:47.000000000 +0200
+++ src/kbackup.desktop	2006-09-25 18:53:43.000000000 +0200
@@ -1,15 +1,16 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Exec=kbackup %f
-Name=KBackup (Backup Program)
+Name=KBackup
 Comment=Backup your data with an easy to use user interface
 Icon=kbackup
 MimeType=text/x-kbp;
 Terminal=false
 Categories=System;KDE;X-SuSE-Backup;
 
-Name[de]=KBackup (Datensicherungs Programm)
+Name[de]=KBackup
 Comment[de]=Datensicherung mit einem einfach zu bedienended User Interface
 
-Name[fr]=KBackup (Programme de sauvegarde)
+Name[fr]=KBackup
 Comment[fr]=Sauvegarder vos donn??es avec une interface utilisateur facile ?? utiliser

kbackup-0.5.1.docbook-fr.patch:

--- NEW FILE kbackup-0.5.1.docbook-fr.patch ---
--- doc/fr/index.docbook.orig	2006-10-01 22:33:33.000000000 +0200
+++ doc/fr/index.docbook	2006-10-02 10:25:55.000000000 +0200
@@ -69,8 +69,8 @@
      and in the FDL itself on how to use it. -->
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2006-09-24</date>
-<releaseinfo>1.02.00</releaseinfo>
+<date>2006-10-01</date>
+<releaseinfo>1.03.00</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
@@ -196,7 +196,8 @@
 <para>
 &kbackup; enregistre dans un fichier profil une s??lection de tous les fichiers
 et r??pertoires inclus, les fichiers et r??pertoires exclus, le r??pertoire ou
-l'URL cible et le pr??fixe de l'archive.
+l'URL cible, le pr??fixe de l'archive et la taille maximum d'une tranche
+d'archive.
 </para>
 
 <para>
@@ -244,6 +245,16 @@
 Dans le menu Fichier/Configuration du profil, vous pouvez d??finir un pr??fixe
 pour l'archive diff??rent que la valeur par d??faut ??&nbsp;defaut&nbsp;??
 </para>
+
+<para>
+Vous pouvez ??galement d??finir la taille maximum d'une tranche d'archive.
+Cela permet donc de limiter la taille d'une tranche d'archive, m??me s'il
+reste de l'espace sur le p??riph??rique cible. Cela permet de cr??er des tranches
+d'archive qui peuvent ??tre ensuite grav??es sur un CD ou un DVD.
+Si vous avez explicitement limit?? la taille d'une archive, la taille disponible
+sera marqu??e par une ??&nbsp;*&nbsp;?? dans la fen??tre principale.
+</para>
+
 </sect1>
 
 <sect1 id="archive-compression">

kbackup-0.5.1.fr.po.patch:

--- NEW FILE kbackup-0.5.1.fr.po.patch ---
--- po/fr.po.orig	2006-10-01 22:33:33.000000000 +0200
+++ po/fr.po	2006-10-02 01:41:29.000000000 +0200
@@ -2,14 +2,13 @@
 # This file is put in the public domain.
 #
 # regis Floret <r.floret at laposte.net>, 2006.
-# Martin Koller <koller at etm.at>, 2006.
 # Alain PORTAL <aportal at univ-montp2.fr>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-10-01 20:10+0200\n"
-"PO-Revision-Date: 2006-09-27 11:19+0200\n"
+"PO-Revision-Date: 2006-10-02 01:39+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -311,7 +310,7 @@
 #: SettingsDialog.cxx:86 rc.cpp:15
 #, no-c-format
 msgid "Maximum Archive Slice Size:"
-msgstr ""
+msgstr "Taille maximum d'une tranche d'archive :"
 
 #: main.cxx:23
 msgid "An easy to use backup program"
@@ -340,3 +339,4 @@
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "regis <r.floret at laposte.net>"
+


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 10:49:08 -0000	1.2
+++ .cvsignore	2 Oct 2006 08:49:10 -0000	1.3
@@ -1 +1 @@
-kbackup-0.5.tar.bz2
+kbackup-0.5.1.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-5/kbackup.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kbackup.spec	27 Sep 2006 09:02:34 -0000	1.2
+++ kbackup.spec	2 Oct 2006 08:49:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		kbackup
-Version:	0.5
-Release:	6%{?dist}
+Version:	0.5.1
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -10,12 +10,9 @@
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}.desktop.Encoding.patch
 Patch1:		%{name}-%{version}.fr.po.patch
+Patch2:		%{name}-%{version}.docbook-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Only for FC-4
-#Requires(post):		desktop-file-utils
-#Requires(postun):	desktop-file-utils
-
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 %description
@@ -38,6 +35,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 %configure --disable-rpath
@@ -51,6 +49,7 @@
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor="" \
   --dir %{buildroot}%{_datadir}/applications/kde \
+  --add-category "Application" \
   --add-category "Utility" \
   --add-category "X-KDE-Utilities-File" \
   --add-category "X-Fedora" \
@@ -61,7 +60,9 @@
 # Fix absolute symlink
 %{__rm} -f %{buildroot}%{_docdir}/HTML/*/%{name}/common
 BKP_PWD=`pwd`
-for lang_dir in de en
+cd %{buildroot}%{_docdir}/HTML/en/%{name}/
+ln -s ../common .
+for lang_dir in de fr
 do
   cd %{buildroot}%{_docdir}/HTML/$lang_dir/%{name}/
   ln -s ../docs/common common
@@ -94,7 +95,15 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
-* Wed Sep 26 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-6
+* Mon Oct  2 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1
+  - New upstream tarball
+  - Update patch1
+  - Add new patch for french doc
+  - Add Application category in desktop file
+  - Fix symlink: english is the only language where common directory is in
+  LANG directory while for other, common is in LANG/docs directory
+
+* Wed Sep 27 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-6
   - Link the good directories
 
 * Tue Sep 26 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 10:49:08 -0000	1.2
+++ sources	2 Oct 2006 08:49:10 -0000	1.3
@@ -1 +1 @@
-94bb56ea9a048622c2bd2677e2e81e82  kbackup-0.5.tar.bz2
+9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 08:50:32 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:50:32 -0700
Subject: rpms/kbackup/devel kbackup-0.5.1.fr.po.patch,NONE,1.1
Message-ID: <200610020850.k928oYxw025387@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25365

Added Files:
	kbackup-0.5.1.fr.po.patch 
Log Message:
Add patch1.

kbackup-0.5.1.fr.po.patch:

--- NEW FILE kbackup-0.5.1.fr.po.patch ---
--- po/fr.po.orig	2006-10-01 22:33:33.000000000 +0200
+++ po/fr.po	2006-10-02 01:41:29.000000000 +0200
@@ -2,14 +2,13 @@
 # This file is put in the public domain.
 #
 # regis Floret <r.floret at laposte.net>, 2006.
-# Martin Koller <koller at etm.at>, 2006.
 # Alain PORTAL <aportal at univ-montp2.fr>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-10-01 20:10+0200\n"
-"PO-Revision-Date: 2006-09-27 11:19+0200\n"
+"PO-Revision-Date: 2006-10-02 01:39+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -311,7 +310,7 @@
 #: SettingsDialog.cxx:86 rc.cpp:15
 #, no-c-format
 msgid "Maximum Archive Slice Size:"
-msgstr ""
+msgstr "Taille maximum d'une tranche d'archive :"
 
 #: main.cxx:23
 msgid "An easy to use backup program"
@@ -340,3 +339,4 @@
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "regis <r.floret at laposte.net>"
+



From fedora-extras-commits at redhat.com  Mon Oct  2 08:55:16 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:55:16 -0700
Subject: rpms/kbackup/devel kbackup.spec,1.4,1.5
Message-ID: <200610020855.k928tIUr025432@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415

Modified Files:
	kbackup.spec 
Log Message:
Fix mistake.


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kbackup.spec	2 Oct 2006 08:45:35 -0000	1.4
+++ kbackup.spec	2 Oct 2006 08:55:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		kbackup
 Version:	0.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -95,6 +95,9 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Mon Oct  2 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.2
+  - Really add patch1
+
 * Mon Oct  2 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1
   - New upstream tarball
   - Update patch1



From fedora-extras-commits at redhat.com  Mon Oct  2 10:29:08 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon,  2 Oct 2006 03:29:08 -0700
Subject: rpms/pan/devel .cvsignore, 1.10, 1.11 pan.spec, 1.19, 1.20 sources, 
	1.10, 1.11
Message-ID: <200610021029.k92ATACv031740@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31716

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
Taking over orphaned package pan from mpeters.

New upstream release 0.115 from beta tree, with comment:

This is the last `big change' release before 1.0. The week's cuts the
memory overhead in large groups by almost two thirds compared to last
week's release! This is huge news for alt.binaries readers.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 May 2006 19:50:35 -0000	1.10
+++ .cvsignore	2 Oct 2006 10:29:08 -0000	1.11
@@ -1,2 +1 @@
-pan-0.98.tar.bz2
-pan-0.99.tar.bz2
+pan-0.115.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pan.spec	3 Jun 2006 10:07:14 -0000	1.19
+++ pan.spec	2 Oct 2006 10:29:08 -0000	1.20
@@ -1,19 +1,18 @@
-Summary: A GNOME/GTK+ news reader for X
-Name: pan
-Version: 0.99
-Release: 2%{?dist}
-Epoch: 1
-License: GPL
-Group: Applications/Internet
-Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2
-Patch0: pan-0.99-gi18n.patch
-URL: http://pan.rebelbase.com/
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
-BuildRequires: pcre-devel >= 5.0
-BuildRequires: gtkspell-devel >= 2.0.7
-BuildRequires: gettext
-BuildRequires: gmime-devel >= 2.1.0
+Summary:	A GNOME/GTK+ news reader for X
+Name:		pan
+Version:	0.115
+Release:	1%{?dist}
+Epoch:		1
+License:	GPL
+Group:		Applications/Internet
+Source0:	http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2
+URL:		http://pan.rebelbase.com/
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	desktop-file-utils
+BuildRequires:	pcre-devel >= 5.0
+BuildRequires:	gtkspell-devel >= 2.0.7
+BuildRequires:	gettext
+BuildRequires:	gmime-devel >= 2.1.0
 
 %description
 Pan is a newsreader which attempts to be pleasant to new and
@@ -27,39 +26,28 @@
 
 %prep
 %setup -q
-%patch0 -p0
-
-echo "StartupNotify=true" >> pan.desktop
-
-# fix debuginfo rpmlint errors
-for file in `find pan/gui -type f -name "*.cc"`; do
-  [ -x ${file} ] && chmod 644 ${file}
-done
-for file in `find pan/gui -type f -name "*.h"`; do
-  [ -x ${file} ] && chmod 644 ${file}
-done
-
 
+sed -i -e 's|StartupNotify=false|StartupNotify=true|' %{name}.desktop.in
 
 %build
 %configure 
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf %buildroot
-make DESTDIR=%buildroot install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
-install -d $RPM_BUILD_ROOT%_datadir/applications
-desktop-file-install $RPM_BUILD_ROOT%_datadir/gnome/apps/Internet/%{name}.desktop \
+install -d $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \
 --vendor=fedora \
 --add-category=Application \
 --add-category=Network \
 --add-category=X-Fedora \
---dir=$RPM_BUILD_ROOT%_datadir/applications \
+--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 --copy-name-to-generic-name \
 --delete-original
 
-%find_lang %name
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
@@ -67,11 +55,16 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/pan
+%{_bindir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/applications/fedora-pan.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Oct 02 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.115-1
+- Update to 0.115 (last `big change' release before 1.0)
+- removed unnecessary Patch0 pan-0.99-gi18n.patch
+- spec cleanups
+
 * Sat Jun 03 2006 Michael A. Peters <mpeters at mac.com> - 1:0.99-2
 - Patch0 to try and fix devel build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 May 2006 19:50:35 -0000	1.10
+++ sources	2 Oct 2006 10:29:08 -0000	1.11
@@ -1,2 +1 @@
-004dd79036b726e666cadcfd080fd515  pan-0.98.tar.bz2
-d67316c696298e37471bd3638828de67  pan-0.99.tar.bz2
+45174cd93f9b1b9e3466cd8a74436c23  pan-0.115.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 10:33:01 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon,  2 Oct 2006 03:33:01 -0700
Subject: owners owners.list,1.1757,1.1758
Message-ID: <200610021033.k92AX30l031831@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31808

Modified Files:
	owners.list 
Log Message:
Taking over orphaned package pan from mpeters.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1757
retrieving revision 1.1758
diff -u -r1.1757 -r1.1758
--- owners.list	2 Oct 2006 07:03:54 -0000	1.1757
+++ owners.list	2 Oct 2006 10:33:01 -0000	1.1758
@@ -1174,7 +1174,7 @@
 Fedora Extras|pam_ssh|PAM module for use with SSH keys and ssh-agent|pertusus at free.fr|extras-qa at fedoraproject.org|dmitry at butskoy.name
 Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|paman|Management tool for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
-Fedora Extras|pan|A GNOME/GTK+ news reader for X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|mpeters at mac.com
+Fedora Extras|pan|A GNOME/GTK+ news reader for X|alex at dalloz.de|extras-qa at fedoraproject.org|mpeters at mac.com
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|papyrus|A C++ canvas library similar to the Gnome canvas|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 10:41:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:41:19 -0700
Subject: rpms/perl-Wx/devel - New directory
Message-ID: <200610021041.k92AfLJo031917@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31888/perl-Wx/devel

Log Message:
Directory /cvs/extras/rpms/perl-Wx/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 10:41:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:41:18 -0700
Subject: rpms/perl-Wx - New directory
Message-ID: <200610021041.k92AfK6w031914@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31888/perl-Wx

Log Message:
Directory /cvs/extras/rpms/perl-Wx added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 10:41:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:41:35 -0700
Subject: rpms/perl-Wx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610021041.k92Afb3j031966@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31933

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Wx


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Wx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 10:41:36 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:41:36 -0700
Subject: rpms/perl-Wx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610021041.k92AfckI031969@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31933/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Wx


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 10:42:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:42:07 -0700
Subject: rpms/perl-Wx import.log,1.1,1.2
Message-ID: <200610021042.k92Ag9pj032030@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31997

Modified Files:
	import.log 
Log Message:
auto-import perl-Wx-0.57-2 on branch devel from perl-Wx-0.57-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 10:41:35 -0000	1.1
+++ import.log	2 Oct 2006 10:42:06 -0000	1.2
@@ -0,0 +1 @@
+perl-Wx-0_57-2:HEAD:perl-Wx-0.57-2.src.rpm:1159785719



From fedora-extras-commits at redhat.com  Mon Oct  2 10:42:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:42:07 -0700
Subject: rpms/perl-Wx/devel perl-Wx.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610021042.k92Ag9qU032035@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31997/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Wx.spec 
Log Message:
auto-import perl-Wx-0.57-2 on branch devel from perl-Wx-0.57-2.src.rpm


--- NEW FILE perl-Wx.spec ---
#
# Rebuild option:
#
#   --with testsuite         - run the test suite (requires X)
#

Name:           perl-Wx
Version:        0.57
Release:        2%{?dist}
Summary:        Interface to the wxWidgets cross-platform GUI toolkit

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Wx/
Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Wx-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  wxGTK-devel
BuildRequires:  perl(Alien::wxWidgets) >= 0.15
BuildRequires:  perl(Module::Info)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(YAML) >= 0.35
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Wx module is a wrapper for the wxWidgets (formerly known as
wxWindows) GUI toolkit.

This module comes with extensive documentation in HTML format;
you can download it from http://wxperl.sourceforge.net/.


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

chmod -c a-x README.txt docs/todo.txt samples/*/*.pl
find . -type f -name "*.pm" -o -name "*.h" -o -name "*.cpp" |
    xargs chmod -c a-x


# Provides: exclude perl(Wx)
cat <<__EOF__ > %{name}-perl.prov
#!/bin/sh
/usr/lib/rpm/perl.prov \$* | grep -v '^perl(Wx)$'
__EOF__
%define __perl_provides %{_builddir}/Wx-%{version}/%{name}-perl.prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
%{?_with_testsuite:make test}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README.txt docs/todo.txt wxpl.ico wxpl.xpm
%doc run samples/
%{_bindir}/*
%{perl_vendorarch}/Wx*
%{perl_vendorarch}/auto/Wx/
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3pm*


%changelog
* Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.57-2
- Filtered perl(Wx) duplicate provide.
- Corrected several file permission.

* Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.57-1
- Update to 0.57.

* Sun May 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.27-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 10:41:36 -0000	1.1
+++ .cvsignore	2 Oct 2006 10:42:07 -0000	1.2
@@ -0,0 +1 @@
+Wx-0.57.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 10:41:36 -0000	1.1
+++ sources	2 Oct 2006 10:42:07 -0000	1.2
@@ -0,0 +1 @@
+95689cae67e55eb62febe8f41751c1c2  Wx-0.57.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 10:46:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:46:42 -0700
Subject: owners owners.list,1.1758,1.1759
Message-ID: <200610021046.k92AkipV032195@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32178

Modified Files:
	owners.list 
Log Message:
New package: perl-Wx (#208009)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1758
retrieving revision 1.1759
diff -u -r1.1758 -r1.1759
--- owners.list	2 Oct 2006 10:33:01 -0000	1.1758
+++ owners.list	2 Oct 2006 10:46:42 -0000	1.1759
@@ -1667,6 +1667,7 @@
 Fedora Extras|perl-WWW-Bugzilla|Handles submission/update of bugzilla bugs via WWW::Mechanize|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Myspace|Access your myspace.com profile in Perl!|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Wx|Interface to the wxWidgets cross-platform GUI toolkit|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|zing at fastmail.fm|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Oct  2 11:24:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 04:24:26 -0700
Subject: rpms/clisp/FC-5 .cvsignore, 1.6, 1.7 clisp.spec, 1.16, 1.17 sources,
	1.7, 1.8
Message-ID: <200610021124.k92BOSAV004950@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4913/FC-5

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.40


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jul 2006 19:32:58 -0000	1.6
+++ .cvsignore	2 Oct 2006 11:24:25 -0000	1.7
@@ -1 +1 @@
-clisp-2.39.tar.bz2
+clisp-2.40.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/clisp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- clisp.spec	28 Jul 2006 18:34:56 -0000	1.16
+++ clisp.spec	2 Oct 2006 11:24:25 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.39
-Release: 	3%{?dist}
+Version:	2.40
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
-Source:		http://download.sourceforge.net/clisp/clisp-2.39.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -105,6 +105,7 @@
 %{_libdir}/clisp/full/lispinit.mem
 %{_libdir}/clisp/full/lisp.run
 %{_libdir}/clisp/data
+%{_datadir}/emacs/site-lisp/*
 
 
 %files devel
@@ -128,6 +129,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-1
+- new version 2.40
+
 * Fri Jul 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.39-3
 - changed url to canonical web page
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jul 2006 19:32:58 -0000	1.7
+++ sources	2 Oct 2006 11:24:25 -0000	1.8
@@ -1 +1 @@
-70ea408e7c9b69d5feb5e408084ecfff  clisp-2.39.tar.bz2
+87e9c4807a8fa3a9b6f7bc25e9e368a4  clisp-2.40.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 11:24:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 04:24:26 -0700
Subject: rpms/clisp/devel .cvsignore, 1.6, 1.7 clisp.spec, 1.17, 1.18 sources,
	1.7, 1.8
Message-ID: <200610021124.k92BOTSo004956@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4913/devel

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.40


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jul 2006 19:51:13 -0000	1.6
+++ .cvsignore	2 Oct 2006 11:24:26 -0000	1.7
@@ -1 +1 @@
-clisp-2.39.tar.bz2
+clisp-2.40.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- clisp.spec	27 Aug 2006 23:26:05 -0000	1.17
+++ clisp.spec	2 Oct 2006 11:24:26 -0000	1.18
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.39
-Release: 	4%{?dist}
+Version:	2.40
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
-Source:		http://download.sourceforge.net/clisp/clisp-2.39.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -105,6 +105,7 @@
 %{_libdir}/clisp/full/lispinit.mem
 %{_libdir}/clisp/full/lisp.run
 %{_libdir}/clisp/data
+%{_datadir}/emacs/site-lisp/*
 
 
 %files devel
@@ -128,6 +129,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-1
+- new version 2.40
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.39-4
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jul 2006 19:51:13 -0000	1.7
+++ sources	2 Oct 2006 11:24:26 -0000	1.8
@@ -1 +1 @@
-70ea408e7c9b69d5feb5e408084ecfff  clisp-2.39.tar.bz2
+87e9c4807a8fa3a9b6f7bc25e9e368a4  clisp-2.40.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 11:38:45 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 04:38:45 -0700
Subject: rpms/piklab/devel piklab-0.12.0.desktop.typo-fr.patch, NONE,
	1.1 piklab-0.12.0.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 piklab.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610021138.k92Bcl0u005137@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5108

Modified Files:
	.cvsignore piklab.spec sources 
Added Files:
	piklab-0.12.0.desktop.typo-fr.patch 
	piklab-0.12.0.x-desktop-fr.patch 
Log Message:
New upstream version.

piklab-0.12.0.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.0.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 DocPath=piklab/index.html
 Categories=QT;KDE;Development;IDE;Electronics;
-Comment=Integrated development environment for applications based on PIC microcontrollers.
-Comment[fr]=Environnement de d?velopement int?gr? pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de d??velopement int??gr?? pour applications ?? base de microcontr??leurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.0.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.0.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2006 16:44:24 -0000	1.2
+++ .cvsignore	2 Oct 2006 11:38:45 -0000	1.3
@@ -1 +1 @@
-piklab-0.11.3.tar.bz2
+piklab-0.12.0.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- piklab.spec	29 Sep 2006 16:44:24 -0000	1.1
+++ piklab.spec	2 Oct 2006 11:38:45 -0000	1.2
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.11.3
-Release:	5%{?dist}
+Version:	0.12.0
+Release:	1%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -17,7 +17,7 @@
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
 #Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
+#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
 Patch2:		%{name}-%{version}.desktop.typo-fr.patch
 Patch3:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +49,7 @@
 %setup -q
 
 #%patch0 -p0
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 
@@ -77,7 +77,6 @@
   --dir %{buildroot}%{_datadir}/applications/kde \
   --add-category "Application" \
   --add-category "X-Fedora" \
-  --remove-only-show-in="KDE" \
   --remove-key="Patterns" \
   src/data/app_data/%{name}.desktop
 
@@ -96,7 +95,7 @@
 ln -s ../common .
 cd $BKP_PWD
 
-#%find_lang %{name}
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -111,8 +110,7 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
 
-#%files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
@@ -126,6 +124,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
+  - New upstream version
+  - Remove patch1 that is no more needed
+
 * Fri Sep 29 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-5
   - Fix typo in pickit2.perms
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 16:44:24 -0000	1.2
+++ sources	2 Oct 2006 11:38:45 -0000	1.3
@@ -1 +1 @@
-0509671541cfc69a3c8b3ce95a9c3beb  piklab-0.11.3.tar.bz2
+2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 11:39:54 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 04:39:54 -0700
Subject: rpms/piklab/FC-5 piklab-0.12.0.desktop.typo-fr.patch, NONE,
	1.1 piklab-0.12.0.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 piklab.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610021139.k92BduJX005222@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5195

Modified Files:
	.cvsignore piklab.spec sources 
Added Files:
	piklab-0.12.0.desktop.typo-fr.patch 
	piklab-0.12.0.x-desktop-fr.patch 
Log Message:
New upstream version.

piklab-0.12.0.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.0.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 DocPath=piklab/index.html
 Categories=QT;KDE;Development;IDE;Electronics;
-Comment=Integrated development environment for applications based on PIC microcontrollers.
-Comment[fr]=Environnement de d?velopement int?gr? pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de d??velopement int??gr?? pour applications ?? base de microcontr??leurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.0.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.0.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2006 16:44:24 -0000	1.2
+++ .cvsignore	2 Oct 2006 11:39:54 -0000	1.3
@@ -1 +1 @@
-piklab-0.11.3.tar.bz2
+piklab-0.12.0.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- piklab.spec	29 Sep 2006 16:44:24 -0000	1.1
+++ piklab.spec	2 Oct 2006 11:39:54 -0000	1.2
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.11.3
-Release:	5%{?dist}
+Version:	0.12.0
+Release:	1%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -17,7 +17,7 @@
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
 #Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
+#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
 Patch2:		%{name}-%{version}.desktop.typo-fr.patch
 Patch3:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +49,7 @@
 %setup -q
 
 #%patch0 -p0
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 
@@ -77,7 +77,6 @@
   --dir %{buildroot}%{_datadir}/applications/kde \
   --add-category "Application" \
   --add-category "X-Fedora" \
-  --remove-only-show-in="KDE" \
   --remove-key="Patterns" \
   src/data/app_data/%{name}.desktop
 
@@ -96,7 +95,7 @@
 ln -s ../common .
 cd $BKP_PWD
 
-#%find_lang %{name}
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -111,8 +110,7 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
 
-#%files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
@@ -126,6 +124,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
+  - New upstream version
+  - Remove patch1 that is no more needed
+
 * Fri Sep 29 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-5
   - Fix typo in pickit2.perms
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 16:44:24 -0000	1.2
+++ sources	2 Oct 2006 11:39:54 -0000	1.3
@@ -1 +1 @@
-0509671541cfc69a3c8b3ce95a9c3beb  piklab-0.11.3.tar.bz2
+2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 12:06:00 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon,  2 Oct 2006 05:06:00 -0700
Subject: rpms/xplanet/devel xplanet.spec,1.10,1.11
Message-ID: <200610021206.k92C6WdN011793@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11679

Modified Files:
	xplanet.spec 
Log Message:
* Mon Oct  2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-2.1
- rebuild against newest gcc(-4.1.1-27 or -28)



Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/xplanet.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xplanet.spec	22 Sep 2006 14:43:24 -0000	1.10
+++ xplanet.spec	2 Oct 2006 12:05:59 -0000	1.11
@@ -50,6 +50,9 @@
 %{_datadir}/xplanet
 
 %changelog
+* Mon Oct  2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-2.1
+- rebuild against newest gcc(-4.1.1-27 or -28)
+
 * Fri Sep 22 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-2
 - bump release
 



From fedora-extras-commits at redhat.com  Mon Oct  2 12:07:35 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon,  2 Oct 2006 05:07:35 -0700
Subject: rpms/xplanet/devel xplanet.spec,1.11,1.12
Message-ID: <200610021207.k92C7bGB012096@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12072

Modified Files:
	xplanet.spec 
Log Message:
fix release number


Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/xplanet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xplanet.spec	2 Oct 2006 12:05:59 -0000	1.11
+++ xplanet.spec	2 Oct 2006 12:07:35 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Render a planetary image into an X window
 Name:		xplanet
 Version:	1.2.0
-Release:	2%{?dist}
+Release:	2.1%{?dist}
 
 License:	GPL
 Group:		Amusements/Graphics



From fedora-extras-commits at redhat.com  Mon Oct  2 12:13:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:13:30 -0700
Subject: rpms/libglade - New directory
Message-ID: <200610021213.k92CDWKC013255@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13221/libglade

Log Message:
Directory /cvs/extras/rpms/libglade added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 12:13:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:13:30 -0700
Subject: rpms/libglade/devel - New directory
Message-ID: <200610021213.k92CDWvq013260@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13221/libglade/devel

Log Message:
Directory /cvs/extras/rpms/libglade/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 12:13:51 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:13:51 -0700
Subject: rpms/libglade Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610021213.k92CDr3c013364@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13328

Added Files:
	Makefile import.log 
Log Message:
Setup of module libglade


--- NEW FILE Makefile ---
# Top level Makefile for module libglade
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 12:13:52 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:13:52 -0700
Subject: rpms/libglade/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610021213.k92CDs92013369@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13328/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libglade


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 12:15:11 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:15:11 -0700
Subject: rpms/libglade import.log,1.1,1.2
Message-ID: <200610021215.k92CFDMe013699@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13651

Modified Files:
	import.log 
Log Message:
auto-import libglade-0.17-19 on branch devel from libglade-0.17-19.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libglade/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 12:13:51 -0000	1.1
+++ import.log	2 Oct 2006 12:15:11 -0000	1.2
@@ -0,0 +1 @@
+libglade-0_17-19:HEAD:libglade-0.17-19.src.rpm:1159791299



From fedora-extras-commits at redhat.com  Mon Oct  2 12:15:12 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:15:12 -0700
Subject: rpms/libglade/devel libglade-0.16-fixquote.patch, NONE,
	1.1 libglade-0.17-clist-gettext.patch, NONE,
	1.1 libglade-0.17-gtkdoc.patch, NONE,
	1.1 libglade-0.17-non-weak-symbols.patch, NONE,
	1.1 libglade-0.17-underquoted.patch, NONE, 1.1 libglade.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610021215.k92CFE3N013716@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13651/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libglade-0.16-fixquote.patch libglade-0.17-clist-gettext.patch 
	libglade-0.17-gtkdoc.patch 
	libglade-0.17-non-weak-symbols.patch 
	libglade-0.17-underquoted.patch libglade.spec 
Log Message:
auto-import libglade-0.17-19 on branch devel from libglade-0.17-19.src.rpm

libglade-0.16-fixquote.patch:

--- NEW FILE libglade-0.16-fixquote.patch ---
--- libglade-0.16/libglade-xgettext.fixquote	Mon Aug 20 12:22:54 2001
+++ libglade-0.16/libglade-xgettext	Mon Aug 20 12:37:59 2001
@@ -104,6 +104,8 @@
 				fp.write(p)
 				length = length + 1 + len(p)
 			fp.write(' */\n')
+			str = string.replace (str, '\\', '\\\\')
+			str = string.replace (str, '"', '\\"')
 			if '\n' in str:
 				fp.write('  _(""\n')
 				lines = string.split(str, '\n')

libglade-0.17-clist-gettext.patch:

--- NEW FILE libglade-0.17-clist-gettext.patch ---
--- libglade-0.17/glade/glade-gtk.c.clist-gettext	Tue Apr 16 10:30:00 2002
+++ libglade-0.17/glade/glade-gtk.c	Tue Apr 16 10:30:48 2002
@@ -289,7 +289,7 @@
 			}
 			if (label) {
 				gtk_clist_set_column_title (GTK_CLIST(w), col,
-							    label);
+							    _(label));
 				/* get the GtkLabel, which is a child
 				 * of the alignment widget used as
 				 * title. */

libglade-0.17-gtkdoc.patch:

--- NEW FILE libglade-0.17-gtkdoc.patch ---
--- libglade-0.17/configure.in.gtkdoc	Wed Jan 23 16:10:42 2002
+++ libglade-0.17/configure.in	Wed Jan 23 16:11:04 2002
@@ -85,7 +85,7 @@
 
 GNOME_COMPILE_WARNINGS
 
-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
+AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, false, false)
 AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
 
 dnl gettext stuff ... there is no message catalog for libglade -- libglade

libglade-0.17-non-weak-symbols.patch:

--- NEW FILE libglade-0.17-non-weak-symbols.patch ---
--- libglade-0.17/glade/Makefile.am	2006-10-02 10:27:20.000000000 +0100
+++ libglade-0.17/glade/Makefile.am	2006-10-02 10:33:07.000000000 +0100
@@ -47,7 +47,7 @@
 libglade_la_LDFLAGS  = -version-info $(LTVERSION)
 
 libglade_gnome_la_SOURCES  = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD   = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD   = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
 libglade_gnome_la_LDFLAGS  = -version-info $(LTVERSION)
 
 libglade_bonobo_la_SOURCES  = glade-bonobo.c glade-build.h glade-xml.h
--- libglade-0.17/glade/Makefile.in	2006-10-02 10:28:06.000000000 +0100
+++ libglade-0.17/glade/Makefile.in	2006-10-02 10:43:03.000000000 +0100
@@ -176,7 +176,7 @@
 libglade_la_LDFLAGS = -version-info $(LTVERSION)
 
 libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
 libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION)
 
 libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h

libglade-0.17-underquoted.patch:

--- NEW FILE libglade-0.17-underquoted.patch ---
--- libglade-0.17/libglade.m4.underquoted	2004-08-06 14:23:18.440417729 +0100
+++ libglade-0.17/libglade.m4	2004-08-06 14:23:36.167030605 +0100
@@ -4,7 +4,7 @@
 dnl AM_PATH_LIBGLADE([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]])
 dnl Test to see if libglade is installed, and define LIBGLADE_CFLAGS, LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBGLADE,
+AC_DEFUN([AM_PATH_LIBGLADE],
 [dnl
 dnl Get the cflags and libraries from the libglade-config script
 dnl


--- NEW FILE libglade.spec ---
Summary:	Gnome-1 support library for loading user interfaces
Name:		libglade
Version:	0.17
Release:	19%{?dist}
Epoch:		1
License:	LGPL
Group:		System Environment/Libraries
URL:		http://www.jamesh.id.au/software/libglade/
Source0:	http://ftp.gnome.org/pub/GNOME/sources/libglade/%{version}/libglade-%{version}.tar.gz
Patch:		libglade-0.16-fixquote.patch
Patch1:		libglade-0.17-gtkdoc.patch
Patch2:		libglade-0.17-clist-gettext.patch
Patch3:		libglade-0.17-underquoted.patch
Patch4:		libglade-0.17-non-weak-symbols.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gnome-libs-devel >= 1:1.4.1.2
BuildRequires:	libxml-devel >= 1:1.8.16
BuildRequires:	autoconf, gettext, gtk-doc, libtool

%description
Libglade is a small library that allows a program to load its user interface
from am XML description at runtime. Libglade uses the XML file format used by
the GLADE user interface builder GLADE, so libglade acts as an alternative to
GLADE's code generation approach. Libglade also provides a simple interface
for connecting handlers to the various signals in the interface (on platforms
where the gmodule library works correctly, it is possible to connect all the
handlers with a single function call). Once the interface has been
instantiated, libglade gives no overhead, so other than the short initial
interface loading time, there is no performance tradeoff.

%package devel
Summary:	The files needed for libglade application development
Group:		Development/Libraries
Requires:	%{name} = %{epoch}:%{version}-%{release}
Requires:	gnome-libs-devel >= 1:1.4.1.2
Requires:	libxml-devel >= 1:1.8.16
Requires:	pkgconfig

%description devel
The libglade-devel package contains the libraries and include files
that you can use to develop libglade applications.

%prep
%setup -q -n %{name}-%{version}
%patch -p1 -b ".fixquote"
%patch1 -p1 -b .gtkdoc
%patch2 -p1 -b .clist-gettext
%patch3 -p1 -b .underquoted
%patch4 -p1 -b .non-weak-symbols

%build
%{__autoconf}
%configure --without-bonobo
%{__make} LIBTOOL=/usr/bin/libtool

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool install

# remove unpackaged files from the buildroot
%{__rm} -f %{buildroot}%{_libdir}/{libglade.a,libglade.la}
%{__rm} -f %{buildroot}%{_libdir}/{libglade-gnome.a,libglade-gnome.la}

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

%post	-p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,0755)
%doc AUTHORS ChangeLog NEWS README COPYING
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,0755)
%doc test-libglade.c
%doc *.glade
%{_bindir}/*
%{_libdir}/lib*.so
%{_includedir}/*
%{_datadir}/aclocal/*
%{_libdir}/libgladeConf.sh
%{_libdir}/pkgconfig/*.pc
%doc %{_datadir}/gnome/html/

%changelog
* Mon Oct  2 2006 Paul Howarth <paul at city-fan.org> 1:0.17-19
- add new buildreq libtool and use the system libtool instead of the bundled
  one to avoid /usr/lib64 rpaths
- add patch to fix non-weak-symbols issues in libglade-gnome.so
- include epoch in versioned gnome-libs-devel dependencies

* Sat Aug 26 2006 Paul Howarth <paul at city-fan.org> 1:0.17-18
- include epoch in versioned libxml-devel dependencies

* Mon Jul 10 2006 Paul Howarth <paul at city-fan.org> 1:0.17-17
- update URL
- add %%{?dist} tag
- remove explicit runtime library deps (rpm will generate what's needed)
- use Fedora Extras standard buildroot
- wrap description text at 80 columns
- add pkgconfig as dep of devel package
- use "make DESTDIR=%%{buildroot} install" instead of deprecated %%makeinstall
- add buildreqs autoconf, gettext, gtk-doc
- disable static libraries
- minor cosmetic spec file tweaks

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-16.2.1
- bump again for double-long bug on ppc(64)

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

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

* Wed Mar  2 2005 Matthias Clasen <mclasen at redhat.com> 1:0.17-16
- Replace Copyright: with License:
- rebuilt with gcc4

* Fri Aug  6 2004 Tim Waugh <twaugh at redhat.com> 1:0.17-15
- Fixed underquoted m4 definition.

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

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

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

* Sun Jun  8 2003 Tim Powers <timp at redhat.com> 1:0.17-12.1
- add epoch to versioned requires where needed
- built for RHEL

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

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

* Fri Jan  3 2003 Owen Taylor <otaylor at redhat.com> 1:0.17-10
- Own /usr/share/gnome/html (#73953, Enrico Scholz)

* Fri Dec 13 2002 Tim Powers <timp at redhat.com> 1:0.17-9
- remove buildrequires on autoconf-2.53
- remove unpackaged files from the buildroot

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

* Wed Jun 19 2002 Jeremy Katz <katzj at redhat.com>
- remove .la files

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

* Tue Apr 16 2002 Havoc Pennington <hp at redhat.com>
- patch from Harald to call gettext on clist column titles, #63338

* Tue Mar  5 2002 Havoc Pennington <hp at redhat.com>
- rebuild in new environment
- install .pc files, #59522
- fix more prefix/lib->libdir sort of things
- use autoconf-2.52 binary

* Wed Jan 23 2002 Havoc Pennington <hp at redhat.com>
- rebuild for db1 stuff
- fix some prefix/lib -> libdir sort of things
- use configure/makeinstall macros
- disable gtk-doc so we don't need an X display

* Fri Sep 21 2001 Havoc Pennington <hp at redhat.com>
- 0.17
- remove libtoolize for now to avoid running autoconf since it requires 2.52

* Mon Aug 20 2001 Jonathan Blandford <jrb at redhat.com>
- Escape strings, #51966

* Sun Jul 22 2001 Havoc Pennington <hp at redhat.com>
- add build requires, bug #49508

* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
- Bump release + rebuild.

* Tue Apr 17 2001 Jonathan Blandford <jrb at redhat.com>
- New Version.

* Thu Mar 01 2001 Owen Taylor <otaylor at redhat.com>
- Rebuild for GTK+-1.2.9 include paths

* Thu Feb 08 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- add libtoolize to make porting to new archs easy

* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
- 0.14
- added patch for gtk-doc scanner linkage

* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Thu Jun 29 2000 Owen Taylor <otaylor at redhat.com>
- specfile fixes

* Wed May 31 2000 Owen Taylor <otaylor at redhat.com>
- Upgraded to libglade-0.13
- Use %%makeinstall, since that is required when %%configure is used.

* Fri May 19 2000 Owen Taylor <otaylor at redhat.com>
- Upgraded to libglade-0.12

* Tue Sep 07 1999 Elliot Lee <sopwith at redhat.com>
- Updated RHL 6.1 package to libglade-0.5

* Sun Nov  1 1998 James Henstridge <james at daa.com.au>

- Updated the dependencies of the devel package, so users must have gtk+-devel.

* Sun Oct 25 1998 James Henstridge <james at daa.com.au>

- Initial release 0.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libglade/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 12:13:51 -0000	1.1
+++ .cvsignore	2 Oct 2006 12:15:12 -0000	1.2
@@ -0,0 +1 @@
+libglade-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libglade/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 12:13:51 -0000	1.1
+++ sources	2 Oct 2006 12:15:12 -0000	1.2
@@ -0,0 +1 @@
+38b2e2cfd813783fe157617813bfe3b3  libglade-0.17.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 12:20:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:20:30 -0700
Subject: owners owners.list,1.1759,1.1760
Message-ID: <200610021220.k92CKWQJ014771@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14714

Modified Files:
	owners.list 
Log Message:
Add libglade



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1759
retrieving revision 1.1760
diff -u -r1.1759 -r1.1760
--- owners.list	2 Oct 2006 10:46:42 -0000	1.1759
+++ owners.list	2 Oct 2006 12:20:30 -0000	1.1760
@@ -846,6 +846,7 @@
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgeda|The library needed by gEDA applications|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
+Fedora Extras|libglade|Gnome-1 support library for loading user interfaces|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 12:32:23 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Mon,  2 Oct 2006 05:32:23 -0700
Subject: comps comps-fe5.xml.in,1.158,1.159
Message-ID: <200610021232.k92CWPuE016912@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16885

Modified Files:
	comps-fe5.xml.in 
Log Message:
klamav is added


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- comps-fe5.xml.in	1 Oct 2006 05:00:54 -0000	1.158
+++ comps-fe5.xml.in	2 Oct 2006 12:32:23 -0000	1.159
@@ -595,6 +595,7 @@
       <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kickpim</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
+      <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">knemo</packagereq>
       <packagereq type="optional">kompose</packagereq>



From fedora-extras-commits at redhat.com  Mon Oct  2 13:23:13 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 06:23:13 -0700
Subject: rpms/piklab/devel piklab.spec,1.2,1.3
Message-ID: <200610021323.k92DNFil021689@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21672

Modified Files:
	piklab.spec 
Log Message:
There is a translation in this new version;


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- piklab.spec	2 Oct 2006 11:38:45 -0000	1.2
+++ piklab.spec	2 Oct 2006 13:23:13 -0000	1.3
@@ -24,7 +24,7 @@
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
 # Needed for FC6
-BuildRequires:	ncurses-devel
+BuildRequires:	ncurses-devel, gettext
 
 %description
 Piklab is a graphic development environment for PIC and dsPIC microcontrollers.
@@ -124,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-2
+  - Add BR gettext since there is now translation
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
   - New upstream version
   - Remove patch1 that is no more needed



From fedora-extras-commits at redhat.com  Mon Oct  2 13:24:48 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 06:24:48 -0700
Subject: rpms/piklab/devel piklab.spec,1.3,1.4
Message-ID: <200610021324.k92DOob5021742@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21725

Modified Files:
	piklab.spec 
Log Message:
Fix release.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- piklab.spec	2 Oct 2006 13:23:13 -0000	1.3
+++ piklab.spec	2 Oct 2006 13:24:47 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 



From fedora-extras-commits at redhat.com  Mon Oct  2 13:25:25 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 06:25:25 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.2,1.3
Message-ID: <200610021325.k92DPR5X021805@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788

Modified Files:
	piklab.spec 
Log Message:
There is a translation in this new version.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- piklab.spec	2 Oct 2006 11:39:54 -0000	1.2
+++ piklab.spec	2 Oct 2006 13:25:25 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -24,7 +24,7 @@
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
 # Needed for FC6
-BuildRequires:	ncurses-devel
+BuildRequires:	ncurses-devel, gettext
 
 %description
 Piklab is a graphic development environment for PIC and dsPIC microcontrollers.
@@ -124,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-2
+  - Add BR gettext since there is now translation
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
   - New upstream version
   - Remove patch1 that is no more needed



From fedora-extras-commits at redhat.com  Mon Oct  2 13:38:05 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 06:38:05 -0700
Subject: rpms/telepathy-gabble/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 telepathy-gabble.spec, 1.3, 1.4
Message-ID: <200610021338.k92Dc7Bb022019@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21998

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
- Update to 0.3.7.
- Use -disable-loudmouth-versioning to build with stable version of loudmouth.
- Add requires on telepathy-filesystem.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2006 13:27:53 -0000	1.2
+++ .cvsignore	2 Oct 2006 13:38:05 -0000	1.3
@@ -1 +1 @@
-telepathy-gabble-0.3.1.tar.gz
+telepathy-gabble-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2006 13:27:53 -0000	1.2
+++ sources	2 Oct 2006 13:38:05 -0000	1.3
@@ -1 +1 @@
-feb6766c1d2f984f1f37ffc8889e6faa  telepathy-gabble-0.3.1.tar.gz
+f47b65038041173885b5dacdc0d9881e  telepathy-gabble-0.3.7.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-5/telepathy-gabble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-gabble.spec	9 Sep 2006 23:36:29 -0000	1.3
+++ telepathy-gabble.spec	2 Oct 2006 13:38:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.3.7
+Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -13,6 +13,8 @@
 BuildRequires:	dbus-glib
 BuildRequires:	loudmouth-devel
 
+Requires:	telepathy-filesystem
+
 
 %description
 A Jabber/XMPP connection manager, that handles single and multi-user
@@ -24,7 +26,7 @@
 
 
 %build
-%configure
+%configure --disable-loudmouth-versioning
 make %{?_smp_mflags}
 
 
@@ -42,12 +44,15 @@
 %doc COPYING AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/dbus-1/services/*.service
-%dir %{_datadir}/telepathy/
-%dir %{_datadir}/telepathy/managers/
 %{_datadir}/telepathy/managers/*.manager
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
+- Update to 0.3.7.
+- Use -disable-loudmouth-versioning to build with stable version of loudmouth.
+- Add requires on telepathy-filesystem.
+
 * Sat Sep  9 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.1-2
 - Add BR on dbus-glib.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 14:49:59 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 07:49:59 -0700
Subject: rpms/telepathy-butterfly/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 telepathy-butterfly.spec, 1.1, 1.2
Message-ID: <200610021450.k92Eo1DT025278@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25257

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2006 13:18:12 -0000	1.2
+++ .cvsignore	2 Oct 2006 14:49:58 -0000	1.3
@@ -1 +1 @@
-telepathy-butterfly-0.1.0.tar.gz
+telepathy-butterfly-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2006 13:18:12 -0000	1.2
+++ sources	2 Oct 2006 14:49:59 -0000	1.3
@@ -1 +1 @@
-425c5ea49c01a88b7b7eb144a52e6c54  telepathy-butterfly-0.1.0.tar.gz
+05fa11dc4221d456e068e77c3aecb897  telepathy-butterfly-0.1.1.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/telepathy-butterfly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telepathy-butterfly.spec	1 Oct 2006 13:18:12 -0000	1.1
+++ telepathy-butterfly.spec	2 Oct 2006 14:49:59 -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:           telepathy-butterfly
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1.
+
 * Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.0-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 14:51:26 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 07:51:26 -0700
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 telepathy-butterfly.spec, 1.1, 1.2
Message-ID: <200610021451.k92EpSH7025364@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25343

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2006 13:18:12 -0000	1.2
+++ .cvsignore	2 Oct 2006 14:51:26 -0000	1.3
@@ -1 +1 @@
-telepathy-butterfly-0.1.0.tar.gz
+telepathy-butterfly-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2006 13:18:12 -0000	1.2
+++ sources	2 Oct 2006 14:51:26 -0000	1.3
@@ -1 +1 @@
-425c5ea49c01a88b7b7eb144a52e6c54  telepathy-butterfly-0.1.0.tar.gz
+05fa11dc4221d456e068e77c3aecb897  telepathy-butterfly-0.1.1.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telepathy-butterfly.spec	1 Oct 2006 13:18:12 -0000	1.1
+++ telepathy-butterfly.spec	2 Oct 2006 14:51:26 -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:           telepathy-butterfly
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1.
+
 * Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.0-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 14:53:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:53:26 -0700
Subject: rpms/kdeartwork-extras - New directory
Message-ID: <200610021453.k92ErSmw025478@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25457/kdeartwork-extras

Log Message:
Directory /cvs/extras/rpms/kdeartwork-extras added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 14:53:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:53:27 -0700
Subject: rpms/kdeartwork-extras/devel - New directory
Message-ID: <200610021453.k92ErTYN025481@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25457/kdeartwork-extras/devel

Log Message:
Directory /cvs/extras/rpms/kdeartwork-extras/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 14:53:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:53:42 -0700
Subject: rpms/kdeartwork-extras Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610021453.k92EridE025535@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25502

Added Files:
	Makefile import.log 
Log Message:
Setup of module kdeartwork-extras


--- NEW FILE Makefile ---
# Top level Makefile for module kdeartwork-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 14:53:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:53:43 -0700
Subject: rpms/kdeartwork-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610021453.k92Erjad025538@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25502/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kdeartwork-extras


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 14:54:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:54:30 -0700
Subject: rpms/kdeartwork-extras import.log,1.1,1.2
Message-ID: <200610021454.k92EsWhl025605@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25571

Modified Files:
	import.log 
Log Message:
auto-import kdeartwork-extras-3.5.4-5 on branch devel from kdeartwork-extras-3.5.4-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 14:53:42 -0000	1.1
+++ import.log	2 Oct 2006 14:54:30 -0000	1.2
@@ -0,0 +1 @@
+kdeartwork-extras-3_5_4-5:HEAD:kdeartwork-extras-3.5.4-5.src.rpm:1159800865



From fedora-extras-commits at redhat.com  Mon Oct  2 14:54:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:54:31 -0700
Subject: rpms/kdeartwork-extras/devel kdeartwork-3.5.3-inherits.patch, NONE, 
	1.1 kdeartwork-extras.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610021454.k92EsX1E025612@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25571/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kdeartwork-3.5.3-inherits.patch kdeartwork-extras.spec 
Log Message:
auto-import kdeartwork-extras-3.5.4-5 on branch devel from kdeartwork-extras-3.5.4-5.src.rpm

kdeartwork-3.5.3-inherits.patch:

--- NEW FILE kdeartwork-3.5.3-inherits.patch ---
--- kdeartwork-3.5.3/IconThemes/kdeclassic/index.theme.Inherits	2006-05-22 13:01:15.000000000 -0500
+++ kdeartwork-3.5.3/IconThemes/kdeclassic/index.theme	2006-06-16 12:04:48.000000000 -0500
@@ -97,6 +97,7 @@
 LinkOverlay=link
 LockOverlay=lockoverlay
 ZipOverlay=zip
+Inherits=default
 DesktopDefault=32
 DesktopSizes=16,32,48,64
 ToolbarDefault=22


--- NEW FILE kdeartwork-extras.spec ---

# Fedora Reviews:
# core/icons - http://bugzilla.redhat.com/194279
# extras - http://bugzilla.redhat.com/196379

# NOTE: can only build *one* of the following at a time
#  core:   kdeartwork
#  extras: kdeartwork-extras
#  icons:  kdeartwork-icons 
#define core 1
%define extras 1
#define icons 1

Version: 3.5.4
Release: 5%{?dist}

%if "%{?core}" == "1"
Name:    kdeartwork 
Summary: Additional artwork (themes, sound themes, ...) for KDE 
# For (kde) opengl screensavers, workaround http://bugzilla.redhat.com/193741
#BuildRequires: libGL-devel libGLU-devel
Requires: kdebase
%endif

%if "%{?extras}" == "1"
Name:	 kdeartwork-extras
Summary: Artwork Extras, including xscreensaver-based screensavers
%define _with_xscreensaver --with-xscreensaver
%define xsc xscreensaver-extras xscreensaver-gl-extras
BuildRequires: %{xsc}
Requires:      %{xsc}
# split occured at 3.5.3-6
Conflicts: kdeartwork < 3.5.3-6
Requires: kdebase
%endif

%if "%{?icons}" == "1"
Name:    kdeartwork-icons
Summary: Additional icon themes, including: ikons, kdeclassic, kids, Locolor, slick. 
# included icon themes Inherits= from these
#Requires: %{_datadir}/icons/hicolor/index.theme
Requires: hicolor-icon-theme
Requires: %{_datadir}/icons/default/index.theme
## Consider making .noarch someday...  -- Rex
#BuildArch: noarch
## these speed the build process a wee bit
#define debug_package %{nil}
#define __spec_install_post %{nil}
#AutoReq: no
%endif

License: GPL
Group:   Amusements/Graphics
URL:     http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeartwork-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


# kdeclassic missing Inherits=
Patch1: kdeartwork-3.5.3-inherits.patch

BuildRequires: kdebase-devel >= 6:%{version}

## upstream patches
# fix GL issues, flickering, see http://bugs.kde.org/73813

%description
%{summary}.


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

%patch1 -p1 -b .inherits


%build
unset QTDIR || : ; source /etc/profile.d/qt.sh

%if "%{?icons:1}" != "1"
export DO_NOT_COMPILE="$DO_NOT_COMPILE IconThemes"
%endif

%configure \
  --includedir=%{_includedir}/kde \
  --with-extra-libs=%{_libdir} \
  --disable-rpath \
  --disable-gcc-hidden-visibility \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking --enable-final \
  %{?_with_xscreensaver} %{!?_with_xscreensaver:--without-xscreensaver}

%if "%{?core:1}" == "1"
make %{?_smp_mflags}
%endif

%if "%{?extras:1}" == "1"
make %{?_smp_mflags} -C kscreensaver/kxsconfig
%endif




%install
rm -rf $RPM_BUILD_ROOT

%if "%{?core:1}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT
%endif

%if "%{?extras:1}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT -C kscreensaver/kxsconfig
%endif

%if "%{?icons:1}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT -C IconThemes
%endif

# rpmdocs
for dir in IconThemes/* kscreensaver/kxsconfig kworldclock ; do
  for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do
    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
  done
done

## File lists
# locale's
%find_lang kdeartwork || touch kdeartwork.lang
# 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/*" >> kdeartwork.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  


%if "%{?core:1}" == "1"
%files -f kdeartwork.lang
%defattr(-,root,root,-)
%doc kwin-styles/smooth-blend/COPYING
%doc rpmdocs/kworldclock
%{_bindir}/*
%{_libdir}/kde3/plugins/styles/*
%{_libdir}/kde3/*.so
%{_libdir}/kde3/*.la
%{_datadir}/applnk/System/ScreenSavers/*.desktop
%{_datadir}/apps/kfiresaver/
%{_datadir}/apps/kscreensaver/
%{_datadir}/apps/kstyle/themes/*
%{_datadir}/apps/kwin/*
# note: kworldclock is from kdetoys
%{_datadir}/apps/kworldclock/
%{_datadir}/sounds/*
%{_datadir}/wallpapers/*
%{_datadir}/emoticons/*
%endif

%if "%{?icons:1}" == "1"
%files 
%defattr(-,root,root,-)
%doc kwin-styles/smooth-blend/COPYING
%doc rpmdocs/IconThemes/*
# own until something else sane, like filesystem, does 
# see rh bug http://bugzilla.redhat.com/bugzilla/195911
#dir %{_datadir}/icons
%{_datadir}/icons/ikons/
%{_datadir}/icons/kdeclassic/
%{_datadir}/icons/kids/
%{_datadir}/icons/Locolor/
%{_datadir}/icons/slick/

%post
for icon_theme in ikons kdeclassic kids Locolor slick ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done

%postun
for icon_theme in ikons kdeclassic kids Locolor slick ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%endif

%if "%{?extras:1}" == "1"
%files -f kdeartwork.lang
%defattr(-,root,root,-)
%doc rpmdocs/kscreensaver/kxsconfig
%{_bindir}/kxs*
%{_datadir}/applnk/System/ScreenSavers/*.desktop
%endif


%clean   
rm -rf $RPM_BUILD_ROOT


%changelog
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-5
- %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)

* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-4
- extras: drop (Build)Requires: xscreensaver-base

* Sat Sep 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-3
- use %%_foo style macros in %%changelog

* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-2
- used unversioned Requires: kdebase

* Tue Jul 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-1
- kde-3.5.4

* Mon Jun 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-6
- main(core), -icons, -extras subpkgs.
  -icons so we don't push ~11MB data on every pkg respin, and leave ability 
  to someday make it .noarch
  -extras for xscreensaver bits (see bug #195480)

* Fri Jun 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-5
- patch for kdeclassic missing Inherits=  (even though it *should* already
  implicity Inherits=hicolor ?)

* Wed Jun 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-4
- BR: libGL-devel libGLU-devel (workaround qt bug #193741)
- Group: System Environment/Desktop -> Amusements/Graphics
- drop unused %%?beta macro

* Tue Jun 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-3
- (Build)Requires: xscreensaver-base xscreensaver-extras xscreensaver-gl-extras
- icons: own %%_datadir/icons (until something else sane does, like filesystem)
- icons: drop Requires: kdelibs
- icons: Requires: hicolor-icon-theme, %%_datadir/icons/default/index.theme
- make work on legacy releases too

* Mon Jun 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-2
- cleanup for Extras
- %%doc: README

* Thu Jun 01 2006 Than Ngo <than at redhat.com> 3.5.3-1
- update to 3.5.3

* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-1
- update to 3.5.2

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.2
- bump again for double-long bug on ppc(64)

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

* 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

* Tue Nov 29 2005 Than Ngo <than at redhat.com> 3.5.0-1
- 3.5 final

* Tue Oct 25 2005 Than Ngo <than at redhat.com> 3.4.92-1
- update to 3.5 Beta 2

* Thu Oct 06 2005 Than Ngo <than at redhat.com> 3.4.91-1
- update to 3.5 Beta 1

* 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 
- configure script does not look the right xscreensaver dirs
  apply patch to fix this problem, #161312, thanks to Rex Dieter

* Tue Jun 28 2005 Than Ngo <than at redhat.com> 3.4.1-1
- 3.4.1

* Fri Mar 18 2005 Than Ngo <than at redhat.com> 3.4.0-1
- 3.4.0

* Fri Mar 04 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.2
- rebuilt against gcc-4.0.0-0.31

* Mon Feb 28 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
- KDE-3.4 Beta2

* Wed Dec 15 2004 Than Ngo <than at redhat.com> 3.3.2-0.3
- fix buildreq on xscreensaver-base

* Mon Dec 06 2004 Than Ngo <than at redhat.com> 3.3.2-0.2
- add correct paths for xscreensaver, xscreensaver-4.18-14 stores the
  config files and graphic hacks in %%_libdir/xscreensaver/config/hacks
  and %%_libexecdir/xscreensaver/hacks/

* Fri Dec 03 2004 Than Ngo <than at redhat.com> 3.3.2-0.1
- update to 3.3.2
- remove kdeartwork-3.3.1-kaleidescope.patch, it's included in 3.3.2

* Tue Nov 02 2004 Than Ngo <than at redhat.com> 3.3.1-3
- fix typo in configuration command.

* Mon Oct 18 2004 Than Ngo <than at redhat.com> 3.3.1-2
- rebuilt

* Wed Oct 13 2004 Than Ngo <than at redhat.com> 3.3.1-1
- update to 3.3.1

* Mon Aug 23 2004 Than Ngo <than at redhat.com> 3.3.0-1
- update to 3.3.0 release
- fix file conflict

* Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.3.0-0.1.rc2
- update to 3.3.0 rc2

* Mon Jun 21 2004 Than Ngo <than at redhat.com> 3.2.3-1
- update to 3.2.3

* Mon May 24 2004 Than Ngo <than at redhat.com> 3.2.2-3
- fix file conflict with other kde packages

* Mon May 24 2004 Than Ngo <than at redhat.com> 3.2.2-2
- fix file conflict with other kde packages

* Tue Apr 13 2004 Than Ngo <than at redhat.com> 3.2.2-1
- 3.2.2 release

* Thu Apr 08 2004 Than Ngo <than at redhat.com> 3.2.1-3
- fix file conflict with kdeedu

* Thu Apr 08 2004 Than Ngo <than at redhat.com> 3.2.1-2
- fix icontheme name, bug #119015

* Sun Mar 07 2004 Than Ngo <than at redhat.com> 3.2.1-1
- 3.2.1 release

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

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

* Thu Feb 05 2004 Than Ngo <than at redhat.com> 3.2.0-0.3
- 3.2.0 release
- build against qt 3.3.0

* Mon Jan 19 2004 Than Ngo <than at redhat.com> 3.1.95-0.1
- KDE 3.2 RC1

* Mon Dec 15 2003 Than Ngo <than at redhat.com> 3.1.94-0.2
- subpackage for icon

* Mon Dec 01 2003 Than Ngo <than at redhat.com> 3.1.94-0.1
- KDE 3.2 Beta 2

* Thu Nov 27 2003 Than Ngo <than at redhat.com> 3.1.93-0.2
- get rid of rpath

* Wed Nov 12 2003 Than Ngo <than at redhat.com> 3.1.93-0.1
- KDE 3.2 Beta1
- cleanup

* Tue Sep 30 2003 Than Ngo <than at redhat.com> 3.1.4-1
- 3.1.4

* Mon Sep 01 2003 Than Ngo <than at redhat.com> 3.1.3-3
- add requires xscreensaver

* Tue Aug 12 2003 Than Ngo <than at redhat.com> 3.1.3-2
- rebuilt

* Mon Aug 04 2003 Than Ngo <than at redhat.com> 3.1.3-1
- 3.1.3

* Thu Jun 26 2003 Than Ngo <than at redhat.com> 3.1.2-5
- rebuilt

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

* Thu May 22 2003 Than Ngo <than at redhat.com> 3.1.2-3
- get rid of buildrequires atomake15

* Mon May 19 2003 Than Ngo <than at redhat.com> 3.1.2-2
- 3.1.2

* Wed Mar 19 2003 Than Ngo <than at redhat.com> 3.1.1-1
- 3.1.1

* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
- debuginfo rebuild

* Fri Feb 21 2003 Than Ngo <than at redhat.com> 3.1-2
- get rid of gcc path from dependency_libs

* Tue Jan 28 2003 Than Ngo <than at redhat.com> 3.1-1
- 3.1 final

* Thu Jan 23 2003 Tim Powers <timp at redhat.com> 3.1-0.4
- rebuild

* Tue Jan 14 2003 Thomas Woerner <twoerner at redhat.com> 3.1-0.3
- removed size_t check
- excluded ia64

* Mon Jan 13 2003 Thomas Woerner <twoerner at redhat.com> 3.1-0.2
- rc6

* Wed Nov 27 2002 Than Ngo <than at redhat.com> 3.1-0.1
- update to 3.1 rc4
- get rid of sub packages

* Sun Nov 10 2002 Than Ngo <than at redhat.com> 3.0.5-1
- update to 3.0.5

* Thu Nov  7 2002 Than Ngo <than at redhat.com> 3.0.4-2
- fix some build problems

* Tue Oct 15 2002 Than Ngo <than at redhat.com> 3.0.4-1
- 3.0.4

* Fri Sep 13 2002 Than Ngo <than at redhat.com> 3.0.3-3.1
- Fixed to build on x86_64

* Mon Sep  2 2002 Than Ngo <than at redhat.com> 3.0.3-3
- Add BuildPrereq automake15

* Sun Aug 25 2002 Than Ngo <than at redhat.com> 3.0.3-2
- rebuild against new qt

* Mon Aug 12 2002 Than Ngo <than at redhat.com> 3.0.3-1
- 3.0.3

* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.2-3
- build using gcc-3.2-0.1

* Fri Jul 19 2002 Than Ngo <than at redhat.com> 3.0.2-2
- Fixed screen saver issue

* Tue Jul 09 2002 Than Ngo <than at redhat.com> 3.0.2-1
- 3.0.2
- use desktop-file-install

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

* Tue May 14 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.1-1
- 3.0.1

* Tue Apr 16 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-4
- Rebuild

* Wed Mar 27 2002 Than Ngo <than at redhat.com> 3.0.0-3
- final

* Thu Jan 31 2002 Bernhard Rossenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020129.2
- Remove KBlankscreen, it's in kdebase

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

* Tue Jan  8 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020108.1
- Add missing files

* Mon Jan  7 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020107.1
- Update

* Mon Jul 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010723.1
- Update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 14:53:43 -0000	1.1
+++ .cvsignore	2 Oct 2006 14:54:31 -0000	1.2
@@ -0,0 +1 @@
+kdeartwork-3.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 14:53:43 -0000	1.1
+++ sources	2 Oct 2006 14:54:31 -0000	1.2
@@ -0,0 +1 @@
+c7ff9048b9b68c976de08ed418598e40  kdeartwork-3.5.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 14:57:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:57:16 -0700
Subject: owners owners.list,1.1760,1.1761
Message-ID: <200610021457.k92EvITn025685@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25668

Modified Files:
	owners.list 
Log Message:
+kdeartwork-extras



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1760
retrieving revision 1.1761
diff -u -r1.1760 -r1.1761
--- owners.list	2 Oct 2006 12:20:30 -0000	1.1760
+++ owners.list	2 Oct 2006 14:57:16 -0000	1.1761
@@ -741,6 +741,7 @@
 Fedora Extras|kbackup|Back up your data in a simple, user friendly way|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|
 Fedora Extras|kchmviewer|CHM viewer|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|kdeartwork-extras|Artwork Extras, including xscreensaver-based screensavers|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdegraphics-extras|Extras for KDE graphics applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdemultimedia-extras|Extras for KDE multimedia applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 15:02:03 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  2 Oct 2006 08:02:03 -0700
Subject: rpms/xmlrpc-c/devel 0001-make-cmake-transition.txt, NONE,
	1.1 xmlrpc-c.spec, 1.9, 1.10 0003-make-cmake-transition.txt, 1.3, NONE
Message-ID: <200610021502.k92F2c1M028575@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28550

Modified Files:
	xmlrpc-c.spec 
Added Files:
	0001-make-cmake-transition.txt 
Removed Files:
	0003-make-cmake-transition.txt 
Log Message:
- updated cmake patch
- strip installed libraries



--- NEW FILE 0001-make-cmake-transition.txt ---
>From ca5754cd4b3f3fdf3b8b80bc2264aa4c1f2e76a4 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Mon, 2 Oct 2006 13:37:48 +0200
Subject: [PATCH] make -> cmake transition

---
 CMakeLists.txt                              |  236 +++++++++++++++++++++++++++
 cmake/try-attr.cc                           |    3 
 cmake/va-list-is-array.c                    |    9 +
 examples/CMakeLists.txt                     |   51 ++++++
 examples/config.h                           |    1 
 examples/cpp/CMakeLists.txt                 |   20 ++
 include/CMakeLists.txt                      |    3 
 include/xmlrpc-c/CMakeLists.txt             |   31 ++++
 include/xmlrpc-c/config.h.cmake             |    8 +
 lib/CMakeLists.txt                          |   12 +
 lib/abyss/CMakeLists.txt                    |    3 
 lib/abyss/src/CMakeLists.txt                |   62 +++++++
 lib/abyss/src/xmlrpc_abyss.pc.cmake         |   10 +
 lib/curl_transport/CMakeLists.txt           |    7 +
 lib/expat/CMakeLists.txt                    |    9 +
 lib/expat/gennmtab/CMakeLists.txt           |    3 
 lib/expat/xmlparse/CMakeLists.txt           |    7 +
 lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake |   10 +
 lib/expat/xmltok/CMakeLists.txt             |   20 ++
 lib/expat/xmltok/xmlrpc_xmltok.pc.cmake     |    9 +
 lib/libutil/CMakeLists.txt                  |   22 +++
 lib/libutil/xmlrpc_util.pc.cmake            |   10 +
 lib/libwww_transport/CMakeLists.txt         |    4 
 lib/util/CMakeLists.txt                     |   13 +
 lib/wininet_transport/CMakeLists.txt        |    4 
 src/CMakeLists.txt                          |  106 ++++++++++++
 src/cpp/CMakeLists.txt                      |   48 +++++
 src/cpp/xmlrpc++.pc.cmake                   |   11 +
 src/cpp/xmlrpc_client++.pc.cmake            |   11 +
 src/cpp/xmlrpc_cpp.pc.cmake                 |   11 +
 src/cpp/xmlrpc_server++.pc.cmake            |   11 +
 src/cpp/xmlrpc_server_abyss++.pc.cmake      |   11 +
 src/test/CMakeLists.txt                     |   27 +++
 src/xmlrpc.pc.cmake                         |   11 +
 src/xmlrpc_client.pc.cmake                  |   11 +
 src/xmlrpc_server.pc.cmake                  |   11 +
 src/xmlrpc_server_abyss.pc.cmake            |   11 +
 src/xmlrpc_server_cgi.pc.cmake              |   11 +
 tools/CMakeLists.txt                        |    9 +
 tools/binmode-rpc-kit/CMakeLists.txt        |    2 
 tools/turbocharger/CMakeLists.txt           |    1 
 tools/xml-rpc-api2cpp/CMakeLists.txt        |   15 ++
 tools/xmlrpc/CMakeLists.txt                 |   15 ++
 tools/xmlrpc/config.h                       |    1 
 tools/xmlrpc_transport/CMakeLists.txt       |    9 +
 tools/xmlrpc_transport/config.h             |    1 
 transport_config.h.cmake                    |   16 ++
 version.h.cmake                             |    2 
 xmlrpc-c-config                             |   38 ++++
 xmlrpc_config.h.cmake                       |   21 ++
 50 files changed, 988 insertions(+), 0 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..18b390d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,236 @@
+## -*- cmake -*-
+project(xmlrpc-c)
+include(UsePkgConfig)
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+
+set(XMLRPC_C_VERSION    "1.06.05" CACHE STRING "Version of xmlrpc-c")
+set(XMLRPC_C_LIBVERSION "3.6.4")
+set(XMLRPC_C_SOVERSION  "3")
+
+
+macro(ensc_set_bool NAME VALUE DESC)
+  set(${NAME} ${VALUE} CACHE BOOL ${DESC})
+  if(${NAME})
+    set(_${NAME} 1)
+  else(${NAME})
+    set(_${NAME} 0)
+  endif(${NAME})
+endmacro(ensc_set_bool)
+
+macro(ensc_pkgconfig COMP)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${COMP}.pc.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${COMP}.pc
+    @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${COMP}.pc
+    DESTINATION ${pkgconfdir})
+endmacro(ensc_pkgconfig)
+
+macro(ensc_pkgconfig_lib TARGET LIBS)
+  get_target_property(libtype ${TARGET} TYPE)
+  if("${libtype}" STREQUAL "STATIC_LIBRARY")
+    list(APPEND ${TARGET}_pkgconfig_libs "${LIBS}")
+  endif("${libtype}" STREQUAL "STATIC_LIBRARY")
+endmacro(ensc_pkgconfig_lib)
+
+macro(ensc_set_link_exe_flags)
+  ## HACK: libwww has broken inter-lib dependencies and '-Wl,--as-needed' fails with it
+  if(NOT MUST_BUILD_LIBWWW_CLIENT)
+    set_target_properties(${ARGV}
+      PROPERTIES
+      LINK_FLAGS ${XMLRPC_LINKER_FLAGS})
+  endif(NOT MUST_BUILD_LIBWWW_CLIENT)
+endmacro(ensc_set_link_exe_flags)
+
+
+###########
+if(WIN32)
+  find_program(WININET_CONFIG_EXECUTABLE wininet-config)
+
+  if(DEFINED MUST_BUILD_WININET_CLIENT)
+    set(tmp ${MUST_BUILD_WININET_CLIENT})
+  else(DEFINED MUST_BUILD_WININET_CLIENT)
+    if(WININET_CONFIG_EXECUTABLE)
+      set(tmp 1)
+    else(WININET_CONFIG_EXECUTABLE)
+      set(tmp 0)
+    endif(WININET_CONFIG_EXECUTABLE)
+  endif(DEFINED MUST_BUILD_WININET_CLIENT)
+else(WIN32)
+  set(tmp 0)
+endif(WIN32)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE WININET_VERSION)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --cflags  OUTPUT_VARIABLE WININET_CFLAGS)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --libs    OUTPUT_VARIABLE WININET_LDADD)
+  message(STATUS "Using WinInet ${WININET_VERSION} transport")
+endif(tmp)
+
+ensc_set_bool(MUST_BUILD_WININET_CLIENT ${tmp} "Set iff WinInet client transport shall be built")
+set(wininet_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/wininet_transport)
+
+###########
+pkgconfig(libcurl CURL_INCLUDE_DIR CURL_LINK_DIR CURL_LINK_FLAGS CURL_CFLAGS)
+if(DEFINED MUST_BUILD_CURL_CLIENT)
+  set(tmp ${MUST_BUILD_CURL_CLIENT})
+else(DEFINED MUST_BUILD_CURL_CLIENT)
+  if(CURL_LINK_FLAGS)
+    set(tmp 1)
+  else(CURL_LINK_FLAGS)
+    set(tmp 0)
+  endif(CURL_LINK_FLAGS)
+endif(DEFINED MUST_BUILD_CURL_CLIENT)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  STRING(REGEX REPLACE "\n" "" CURL_CFLAGS ${CURL_CFLAGS})	# HACK!!
+  message(STATUS "Using libcurl transport ${CURL_CFLAGS}")
+endif(tmp)
+ensc_set_bool(MUST_BUILD_CURL_CLIENT ${tmp} "Set iff Curl client transport shall be built")
+set(curl_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/curl_transport)
+
+###########
+find_program(LIBWWW_CONFIG_EXECUTABLE libwww-config)
+if(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+  set(tmp ${MUST_BUILD_LIBWWW_CLIENT})
+else(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+  if(LIBWWW_CONFIG_EXECUTABLE)
+    set(tmp 1)
+  else(LIBWWW_CONFIG_EXECUTABLE)
+    set(tmp 0)
+  endif(LIBWWW_CONFIG_EXECUTABLE)
+endif(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE LIBWWW_VERSION)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --libs    OUTPUT_VARIABLE LIBWWW_LIBS)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --cflags  OUTPUT_VARIABLE LIBWWW_CFLAGS)
+  message(STATUS "Using libwww ${LIBWWW_VERSION} transport")
+endif(tmp)
+ensc_set_bool(MUST_BUILD_LIBWWW_CLIENT ${tmp} "Set iff LibWWW client transport shall be built")
+set(libwww_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/libwww_transport)
+
+############
+
+set(ENABLE_CGI_SERVER      1 CACHE BOOL "Set iff CGI server shall be enabled")
+set(ENABLE_CPLUSPLUS       1 CACHE BOOL "Set iff C++ part shall be enabled")
+set(ENABLE_ABYSS_SERVER    1 CACHE BOOL "Set iff Abyss server shall be enabled")
+set(ENABLE_LIBXML2_BACKEND 1 CACHE BOOL "Set iff libxml2 backend shall be used")
+set(ENABLE_ABYSS_THREADS   1 CACHE BOOL "Use pthread")
+
+if(ENABLE_LIBXML2_BACKEND)
+  foreach(tmp libxml-2.0 libxml2 libxml)
+    if (NOT DEFINED libxml_pkgconfig)
+      pkgconfig(${tmp} LIBXML2_INCLUDE_DIR LIBXML2_LINK_DIR LIBXML2_LINK_FLAGS LIBXML2_CFLAGS)
+      if(LIBXML2_LINK_FLAGS)
+	set(libxml_pkgconfig ${tmp})
+      endif(LIBXML2_LINK_FLAGS)
+    endif(NOT DEFINED libxml_pkgconfig)
+  endforeach(tmp)
+endif(ENABLE_LIBXML2_BACKEND)
+
+
+####  <wchar.h> tests
+check_include_file(wchar.h _have_wchar_h)
+if(_have_wchar_h)
+  set(HAVE_WCHAR_H 1)
+else(_have_wchar_h)
+  set(HAVE_WCHAR_H 1)
+endif(_have_wchar_h)
+set(XMLRPC_HAVE_WCHAR   ${HAVE_WCHAR_H})
+set(HAVE_WCHAR_H_DEFINE ${HAVE_WCHAR_H})
+
+
+#######
+set(LINKER_AS_NEEDED  1 CACHE BOOL "Use the --as-needed linker option")
+if(LINKER_AS_NEEDED)
+  set(XMLRPC_LINKER_FLAGS "-Wl,--as-needed")
+endif(LINKER_AS_NEEDED)
+
+
+try_compile(HAVE_ATTR_UNUSED
+  ${CMAKE_BINARY_DIR}/
+  ${xmlrpc-c_SOURCE_DIR}/cmake/try-attr.cc
+  CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-DCMAKE_TEST_ATTR=__unused__)
+
+try_compile(VA_LIST_IS_NOT_ARRAY
+  ${CMAKE_BINARY_DIR}/
+  ${xmlrpc-c_SOURCE_DIR}/cmake/va-list-is-array.c)
+
+if(VA_LIST_IS_NOT_ARRAY)
+  set(VA_LIST_IS_ARRAY 0)
+  message(STATUS "va_list is not an array")
+else(VA_LIST_IS_NOT_ARRAY)
+  set(VA_LIST_IS_ARRAY 1)
+  message(STATUS "va_list is an array")
+endif(VA_LIST_IS_NOT_ARRAY)
+
+
+if(HAVE_ATTR_UNUSED)
+  set(ATTR_UNUSED "__attribute__((__unused__))")
+endif(HAVE_ATTR_UNUSED)
+
+if(WIN32)
+  set(DIRECTORY_SEPARATOR "\\")
+else(WIN32)
+  set(DIRECTORY_SEPARATOR "/")
+endif(WIN32)
+
+check_include_file(sys/filio.h HAVE_SYS_FILIO_H)
+check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
+check_function_exists(setenv HAVE_SETENV)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/xmlrpc_config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/xmlrpc_config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/version.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/version.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/transport_config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/transport_config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/include/xmlrpc-c/config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/include/xmlrpc-c/config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+
+include_directories(${xmlrpc-c_SOURCE_DIR}/include)
+include_directories(${xmlrpc-c_BINARY_DIR}/include)
+include_directories(${xmlrpc-c_SOURCE_DIR}/lib/util/include)
+include_directories(${xmlrpc-c_BINARY_DIR})
+
+add_custom_target(dist
+  rm -rf _dist && mkdir -p _dist/xmlrpc-c-${XMLRPC_C_VERSION}
+  COMMAND cp -a ${xmlrpc-c_SOURCE_DIR}/* _dist/xmlrpc-c-${XMLRPC_C_VERSION}/
+  COMMAND cd _dist && tar cjf ../xmlrpc-c-${XMLRPC_C_VERSION}.tar.bz2 xmlrpc-c-${XMLRPC_C_VERSION} --exclude=.git --exclude=CVS --exclude=.svn
+  )
+
+set(_lib       lib CACHE STRING "Basename of the library-directory; usually 'lib' or 'lib64' (on multilib archs)")
+set(_bin       bin CACHE STRING "Basename of the bin-directory; usually 'bin'")
+set(prefix     ${CMAKE_INSTALL_PREFIX})
+set(libdir     "${prefix}/${_lib}")
+set(bindir     "${prefix}/${_bin}")
+set(mandir     "${prefix}/share/man")
+set(pkgconfdir "${libdir}/pkgconfig")
+set(includedir "${prefix}/include")
+
+#############
+
+install(PROGRAMS xmlrpc-c-config DESTINATION ${_bin})
+
+enable_testing()
+
+add_subdirectory(lib)
+add_subdirectory(Windows)
+add_subdirectory(conf)
+add_subdirectory(doc)
+add_subdirectory(examples)
+add_subdirectory(include)
+add_subdirectory(src)
+add_subdirectory(tools)
diff --git a/cmake/try-attr.cc b/cmake/try-attr.cc
new file mode 100644
index 0000000..4668c5b
--- /dev/null
+++ b/cmake/try-attr.cc
@@ -0,0 +1,3 @@
+int x __attribute__((CMAKE_TEST_ATTR));
+
+int main() {}
diff --git a/cmake/va-list-is-array.c b/cmake/va-list-is-array.c
new file mode 100644
index 0000000..1ad0bab
--- /dev/null
+++ b/cmake/va-list-is-array.c
@@ -0,0 +1,9 @@
+#include <stdarg.h>
+
+void foo()
+{
+  va_list list1, list2;
+  list1 = list2;
+}
+
+int main() {}
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..9f18b0d
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,51 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+macro(ensc_add_example name ext class)
+  # HACK: avoid name collision of c and c++ program
+  if("${ext}" STREQUAL "cpp")
+    set(_target ${name}++)
+  else("${ext}" STREQUAL "cpp")
+    set(_target ${name})
+  endif("${ext}" STREQUAL "cpp")
+
+  add_executable(${_target} ${name}.${ext})
+  target_link_libraries(${_target} ${${class}_LIBS})
+  list(APPEND ${class}_TARGETS ${_target})
+  list(APPEND example_TARGETS ${_target})
+endmacro(ensc_add_example)
+
+if(ENABLE_CPLUSPLUS)
+  add_subdirectory(cpp)
+endif(ENABLE_CPLUSPLUS)
+
+
+
+if(MUST_BUILD_CLIENT)
+  set(client_LIBS xmlrpc_client)
+
+  ensc_add_example(auth_client              c client)
+  ensc_add_example(query-meerkat            c client)
+  ensc_add_example(synch_client             c client)
+  ensc_add_example(xmlrpc_sample_add_client c client)
+  ensc_add_example(xmlrpc_asynch_client     c client)
+endif(MUST_BUILD_CLIENT)
+
+if(ENABLE_CGI_SERVER)
+  set(cgi_server_LIBS xmlrpc_server_cgi)
+
+  ensc_add_example(xmlrpc_sample_add_server_cgi c cgi_server)
+endif(ENABLE_CGI_SERVER)
+
+if(ENABLE_ABYSS_SERVER)
+  set(abyss_server_LIBS xmlrpc_server_abyss)
+
+  ensc_add_example(xmlrpc_inetd_server      c abyss_server)
+  ensc_add_example(xmlrpc_socket_server     c abyss_server)
+  ensc_add_example(xmlrpc_loop_server       c abyss_server)
+  ensc_add_example(xmlrpc_sample_add_server c abyss_server)
+  ensc_add_example(xmlrpc_server_validatee  c abyss_server)
+endif(ENABLE_ABYSS_SERVER)
+
+ensc_set_link_exe_flags(${example_TARGETS})
diff --git a/examples/config.h b/examples/config.h
new file mode 100644
index 0000000..31d5f9b
--- /dev/null
+++ b/examples/config.h
@@ -0,0 +1 @@
+#include "../xmlrpc_config.h"
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
new file mode 100644
index 0000000..9fbea7e
--- /dev/null
+++ b/examples/cpp/CMakeLists.txt
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+if(ENABLE_ABYSS_SERVER)
+  set(abyss_serverxx_LIBS xmlrpc_server_abyss++)
+
+  ensc_add_example(xmlrpc_inetd_server cpp abyss_serverxx)
+endif(ENABLE_ABYSS_SERVER)
+
+if(MUST_BUILD_CLIENT)
+  set(abyss_clientxx_LIBS        xmlrpc_client++)
+  set(abyss_clientxx_legacy_LIBS xmlrpc_cpp)
+
+  ensc_add_example(xmlrpc_sample_add_client  cpp abyss_clientxx)
+  ensc_add_example(sample_add_client_complex cpp abyss_clientxx)
+
+  ensc_add_example(meerkat-app-list          cpp abyss_clientxx_legacy)
+endif(MUST_BUILD_CLIENT)
+
+
+ensc_set_link_exe_flags(${example_TARGETS})
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 0000000..ebfdba5
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+add_subdirectory(xmlrpc-c)
diff --git a/include/xmlrpc-c/CMakeLists.txt b/include/xmlrpc-c/CMakeLists.txt
new file mode 100644
index 0000000..903f623
--- /dev/null
+++ b/include/xmlrpc-c/CMakeLists.txt
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+list(APPEND headers
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+  util.h base.h abyss.h server.h
+  server_abyss.h server_w32httpsys.h oldxmlrpc.h)
+
+if(ENABLE_CPLUSPLUS)
+  list(APPEND headers
+    oldcppwrapper.hpp girerr.hpp girmem.hpp base.hpp
+    timeout.hpp xml.hpp registry.hpp server_abyss.hpp)
+endif(ENABLE_CPLUSPLUS)
+
+if(MUST_BUILD_CLIENT)
+  list(APPEND headers
+    client.h transport.h client_global.h)
+
+  if(ENABLE_CPLUSPLUS)
+    list(APPEND headers
+      client.hpp client_transport.hpp client_simple.hpp)
+  endif(ENABLE_CPLUSPLUS)
+endif(MUST_BUILD_CLIENT)
+
+if(ENABLE_CGI_SERVER)
+  list(APPEND headers
+    server_cgi.h)
+endif(ENABLE_CGI_SERVER)
+
+install(FILES
+  ${headers}
+  DESTINATION ${includedir}/xmlrpc-c)
diff --git a/include/xmlrpc-c/config.h.cmake b/include/xmlrpc-c/config.h.cmake
new file mode 100644
index 0000000..7b95a1d
--- /dev/null
+++ b/include/xmlrpc-c/config.h.cmake
@@ -0,0 +1,8 @@
+/* This file, part of XML-RPC For C/C++, is meant to
+   define characteristics of this particular installation
+   that the other <xmlrpc-c/...> header files need in order to
+   compile correctly when #included in a Xmlrpc-c user code.
+
+   Those header files #include this one.
+*/
+#define XMLRPC_HAVE_WCHAR		@HAVE_WCHAR_H@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
new file mode 100644
index 0000000..7f8f912
--- /dev/null
+++ b/lib/CMakeLists.txt
@@ -0,0 +1,12 @@
+## -*- cmake -*-
+
+add_subdirectory(abyss)
+add_subdirectory(libutil)
+add_subdirectory(util)
+add_subdirectory(curl_transport)
+add_subdirectory(libwww_transport)
+add_subdirectory(wininet_transport)
+
+if(NOT ENABLE_LIBXML2_BACKEND)
+  add_subdirectory(expat)
+endif(NOT ENABLE_LIBXML2_BACKEND)
diff --git a/lib/abyss/CMakeLists.txt b/lib/abyss/CMakeLists.txt
new file mode 100644
index 0000000..2358061
--- /dev/null
+++ b/lib/abyss/CMakeLists.txt
@@ -0,0 +1,3 @@
+## -*- cmake -*-
+
+SUBDIRS(src)
diff --git a/lib/abyss/src/CMakeLists.txt b/lib/abyss/src/CMakeLists.txt
new file mode 100644
index 0000000..a8fb5a9
--- /dev/null
+++ b/lib/abyss/src/CMakeLists.txt
@@ -0,0 +1,62 @@
+## -*- cmake -*-
+
+set(xmlrpc_abyss_SOURCES
+  abyss_info.h
+  channel.c
+  channel.h
+  chanswitch.c
+  chanswitch.h
+  conf.c
+  conn.c
+  conn.h
+  data.c
+  data.h
+  date.c
+  date.h
+  file.c
+  file.h
+  http.c
+  http.h
+  init.c
+  response.c
+  server.c
+  server.h
+  session.c
+  session.h
+  socket.c
+  socket.h
+  socket_unix.c
+  socket_unix.h
+  thread.h
+  token.c
+  token.h
+  trace.c
+  trace.h)
+
+if(ENABLE_ABYSS_THREADS)
+  list(APPEND xmlrpc_abyss_SOURCES thread_pthread.c)
+else(ENABLE_ABYSS_THREADS)
+  list(APPEND xmlrpc_abyss_SOURCES thread_fork.c)
+endif(ENABLE_ABYSS_THREADS)
+
+add_library(xmlrpc_abyss SHARED ${xmlrpc_abyss_SOURCES})
+target_link_libraries(xmlrpc_abyss xmlrpc_util)
+
+if(ENABLE_ABYSS_THREADS)
+  set_target_properties(xmlrpc_abyss PROPERTIES DEFINE_SYMBOL _THREAD)
+  target_link_libraries(xmlrpc_abyss pthread)
+  ensc_pkgconfig_lib(xmlrpc_abyss "-lpthread")
+endif(ENABLE_ABYSS_THREADS)
+
+install(TARGETS xmlrpc_abyss
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib}
+  ARCHIVE DESTINATION ${_lib})
+
+set_target_properties(xmlrpc_abyss
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+ensc_pkgconfig(xmlrpc_abyss)
diff --git a/lib/abyss/src/xmlrpc_abyss.pc.cmake b/lib/abyss/src/xmlrpc_abyss.pc.cmake
new file mode 100644
index 0000000..2a4f124
--- /dev/null
+++ b/lib/abyss/src/xmlrpc_abyss.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_abyss
+Description: XMLRPC Abyss base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_util
+Libs:   		-L${libdir} -lxmlrpc_abyss @xmlrpc_abyss_pkgconfig_libs@
+Cflags:
diff --git a/lib/curl_transport/CMakeLists.txt b/lib/curl_transport/CMakeLists.txt
new file mode 100644
index 0000000..3814f08
--- /dev/null
+++ b/lib/curl_transport/CMakeLists.txt
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_CURL_CLIENT)
+  list(APPEND transport_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc_curl_transport.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc_curl_transport.h)
+endif(MUST_BUILD_CURL_CLIENT)
diff --git a/lib/expat/CMakeLists.txt b/lib/expat/CMakeLists.txt
new file mode 100644
index 0000000..7397f52
--- /dev/null
+++ b/lib/expat/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/xmltok)
+
+add_subdirectory(gennmtab)
+add_subdirectory(xmlparse)
+add_subdirectory(xmltok)
+add_subdirectory(xmlwf)
diff --git a/lib/expat/gennmtab/CMakeLists.txt b/lib/expat/gennmtab/CMakeLists.txt
new file mode 100644
index 0000000..48a44da
--- /dev/null
+++ b/lib/expat/gennmtab/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+ADD_EXECUTABLE(gennmtab gennmtab.c)
diff --git a/lib/expat/xmlparse/CMakeLists.txt b/lib/expat/xmlparse/CMakeLists.txt
new file mode 100644
index 0000000..f87008a
--- /dev/null
+++ b/lib/expat/xmlparse/CMakeLists.txt
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+add_library(xmlrpc_xmlparse STATIC
+  xmlparse.c)
+target_link_libraries(xmlrpc_xmlparse xmlrpc_xmltok)
+
+ensc_pkgconfig(xmlrpc_xmlparse)
diff --git a/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
new file mode 100644
index 0000000..71d77da
--- /dev/null
+++ b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_xmlparse
+Description: XMLRPC xmlparse library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_xmltok
+Libs:   		-L${libdir} -lxmlrpc_xmlparse
+Cflags:
diff --git a/lib/expat/xmltok/CMakeLists.txt b/lib/expat/xmltok/CMakeLists.txt
new file mode 100644
index 0000000..c3247ad
--- /dev/null
+++ b/lib/expat/xmltok/CMakeLists.txt
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(xmlrpc_xmltok STATIC
+  xmltok.c xmlrole.c ${CMAKE_CURRENT_BINARY_DIR}/nametab.h)
+
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/nametab.h
+  PROPERTIES
+  OBJECT_DEPENDS gennmtab
+  GENERATED true)
+
+
+get_target_property(GENNMTAB_EXECUTABLE gennmtab LOCATION)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nametab.h
+  COMMAND ${GENNMTAB_EXECUTABLE} >nametab.h || { rm -f nametab.h\; false\; }
+  DEPENDS gennmtab)
+
+ensc_pkgconfig(xmlrpc_xmltok)
diff --git a/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake b/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
new file mode 100644
index 0000000..88e7ad8
--- /dev/null
+++ b/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
@@ -0,0 +1,9 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_xmltok
+Description: XMLRPC xmltok library
+Version:     @XMLRPC_C_VERSION@
+
+Libs:   	-L${libdir}
+Cflags:
diff --git a/lib/libutil/CMakeLists.txt b/lib/libutil/CMakeLists.txt
new file mode 100644
index 0000000..5e5d382
--- /dev/null
+++ b/lib/libutil/CMakeLists.txt
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+
+add_library(xmlrpc_util SHARED
+  casprintf.c
+  error.c
+  make_printable.c
+  memblock.c
+  resource.c
+  sleep.c)
+
+set_target_properties(xmlrpc_util
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+install(TARGETS xmlrpc_util
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib}
+  ARCHIVE DESTINATION ${_lib})
+
+ensc_pkgconfig(xmlrpc_util)
diff --git a/lib/libutil/xmlrpc_util.pc.cmake b/lib/libutil/xmlrpc_util.pc.cmake
new file mode 100644
index 0000000..98d24f4
--- /dev/null
+++ b/lib/libutil/xmlrpc_util.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_util
+Description: XMLRPC utility library
+Version:     @XMLRPC_C_VERSION@
+
+Libs:   	-L${libdir} -lxmlrpc_util
+Cflags:
diff --git a/lib/libwww_transport/CMakeLists.txt b/lib/libwww_transport/CMakeLists.txt
new file mode 100644
index 0000000..4744f9c
--- /dev/null
+++ b/lib/libwww_transport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_LIBWWW_CLIENT)
+endif(MUST_BUILD_LIBWWW_CLIENT)
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
new file mode 100644
index 0000000..be6ded2
--- /dev/null
+++ b/lib/util/CMakeLists.txt
@@ -0,0 +1,13 @@
+## -*- cmake -*-
+
+set(util_SOURCES
+  casprintf.c
+  cmdline_parser.c
+  getoptx.c
+  getoptx.h)
+
+if(WIN32)
+  list(APPEND util_SOURCES pthreadx_win32.c)
+endif(WIN32)
+
+add_library(util STATIC ${util_SOURCES})
diff --git a/lib/wininet_transport/CMakeLists.txt b/lib/wininet_transport/CMakeLists.txt
new file mode 100644
index 0000000..4f7408e
--- /dev/null
+++ b/lib/wininet_transport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_WININET_CLIENT)
+endif(MUST_BUILD_WININET_CLIENT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..b201fa1
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,106 @@
+# -*- cmake -*-
+
+if(ENABLE_LIBXML2_BACKEND)
+  set(xmlrpc_xml_parser xmlrpc_libxml2.c)
+  set(libxml_INCLUDES ${LIBXML2_CFLAGS})
+  set(libxml_LIBS     ${LIBXML2_LINK_FLAGS})
+  set(xmlrpc_pkgconfig_req ${libxml_pkgconfig})
+else(ENABLE_LIBXML2_BACKEND)
+  set(xmlrpc_xml_parser xmlrpc_expat.c)
+  set(libxml_INCLUDES -I${xmlrpc-c_SOURCE_DIR}/lib/expat/xmlparse)
+  set(libxml_LIBS xmlrpc_xmlparse)
+  set(xmlrpc_pkgconfig_req xmlrpc_xmlparse)
+endif(ENABLE_LIBXML2_BACKEND)
+
+if(MUST_BUILD_WININET_CLIENT)
+  set(client_wininet_CFLAGS "")
+  set(client_wininet_LIBS   "${WININET_LDADD}")
+  list(APPEND transport_SOURCES
+    ${wininet_srcdir}/xmlrpc_wininet_transport.c ${wininet_srcdir}/xmlrpc_wininet_transport.h)
+endif(MUST_BUILD_WININET_CLIENT)
+
+if(MUST_BUILD_LIBWWW_CLIENT)
+  set(client_libwww_CFLAGS "${LIBWWW_CFLAGS}")
+  set(client_libwww_LIBS   "${LIBWWW_LIBS}")
+  list(APPEND transport_SOURCES ${libwww_srcdir}/xmlrpc_libwww_transport.c ${libwww_srcdir}/xmlrpc_libwww_transport.h)
+endif(MUST_BUILD_LIBWWW_CLIENT)
+
+if(MUST_BUILD_CURL_CLIENT)
+  set(client_curl_CFLAGS ${CURL_CFLAGS})
+  set(client_curl_LIBS   ${CURL_LINK_FLAGS})
+  set(xmlrpc_client_pkgconfig_req libcurl)
+  list(APPEND transport_SOURCES ${curl_srcdir}/xmlrpc_curl_transport.c ${curl_srcdir}/xmlrpc_curl_transport.h)
+endif(MUST_BUILD_CURL_CLIENT)
+
+set(client_CFLAGS "-I${wininet_srcdir} -I${libwww_srcdir} -I${curl_srcdir} ${client_wininet_CFLAGS} ${client_libwww_CFLAGS} ${client_curl_CFLAGS}")
+set(client_LIBS   "${client_wininet_LIBS} ${client_libwww_LIBS} ${client_curl_LIBS}")
+
+
+add_subdirectory(cpp)
+add_subdirectory(test)
+
+
+
+### libxmlrpc.so
+add_library(xmlrpc SHARED
+  trace.c ${xmlrpc_xml_parser}
+  xmlrpc_data.c xmlrpc_datetime.c xmlrpc_array.c xmlrpc_struct.c
+  xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
+  xmlrpc_base64.c xmlrpc_utf8.c xmlrpc_authcookie.c)
+
+set_target_properties(xmlrpc
+  PROPERTIES
+  COMPILE_FLAGS ${libxml_INCLUDES})
+
+ensc_pkgconfig(xmlrpc)
+target_link_libraries(xmlrpc ${libxml_LIBS} xmlrpc_util)
+list(APPEND lib_TARGETS xmlrpc)
+
+### libxmlrpc_client.so
+add_library(xmlrpc_client SHARED
+  xmlrpc_client.c xmlrpc_client_global.c ${transport_SOURCES})
+
+target_link_libraries(xmlrpc_client xmlrpc ${client_LIBS})
+set_target_properties(xmlrpc_client
+  PROPERTIES
+  COMPILE_FLAGS "${client_CFLAGS}")
+list(APPEND lib_TARGETS xmlrpc_client)
+ensc_pkgconfig(xmlrpc_client)
+
+### libxmlrpc_server.so
+add_library(xmlrpc_server SHARED
+  registry.c system_method.c)
+target_link_libraries(xmlrpc_server xmlrpc)
+list(APPEND lib_TARGETS xmlrpc_server)
+ensc_pkgconfig(xmlrpc_server)
+
+
+### libxmlrpc_server_abyss.so
+add_library(xmlrpc_server_abyss SHARED
+  xmlrpc_server_abyss.c)
+target_link_libraries(xmlrpc_server_abyss xmlrpc_abyss xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server_abyss)
+ensc_pkgconfig(xmlrpc_server_abyss)
+
+
+
+### libxmlrpc_server_cgi.so
+add_library(xmlrpc_server_cgi SHARED
+  xmlrpc_server_cgi)
+target_link_libraries(xmlrpc_server_cgi xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server_cgi)
+ensc_pkgconfig(xmlrpc_server_cgi)
+
+
+install(TARGETS ${lib_TARGETS}
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib})
+
+set_target_properties(${lib_TARGETS}
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+
+enable_testing()
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
new file mode 100644
index 0000000..9ab2530
--- /dev/null
+++ b/src/cpp/CMakeLists.txt
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+####### libxmlrpc++.so
+add_library(xmlrpc++ SHARED
+  base64.cpp env_wrap.cpp fault.cpp girerr.cpp girmem.cpp
+  outcome.cpp param_list.cpp value.cpp xml.cpp)
+target_link_libraries(xmlrpc++ xmlrpc)
+list(APPEND lib_TARGETS xmlrpc++)
+ensc_pkgconfig(xmlrpc++)
+
+####### libxmlrpc_cpp.so
+add_library(xmlrpc_cpp            SHARED XmlRpcCpp)
+target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server xmlrpc_client)
+list(APPEND lib_TARGETS xmlrpc_cpp)
+ensc_pkgconfig(xmlrpc_cpp)
+
+####### libxmlrpc_server++.so
+add_library(xmlrpc_server++       SHARED registry.cpp)
+target_link_libraries(xmlrpc_server++ xmlrpc++ xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server++)
+ensc_pkgconfig(xmlrpc_server++)
+
+####### libxmlrpc_server_abyss++.so
+add_library(xmlrpc_server_abyss++ SHARED server_abyss.cpp)
+target_link_libraries(xmlrpc_server_abyss++ xmlrpc_server++ xmlrpc_server_abyss)
+list(APPEND lib_TARGETS xmlrpc_server_abyss++)
+ensc_pkgconfig(xmlrpc_server_abyss++)
+
+####### libxmlrpc_client++.so
+add_library(xmlrpc_client++       SHARED
+  client.cpp client_simple.cpp curl.cpp libwww.cpp wininet.cpp)
+set_target_properties(xmlrpc_client++
+  PROPERTIES
+  COMPILE_FLAGS "-I${wininet_srcdir} -I${libwww_srcdir} -I${curl_srcdir}")
+target_link_libraries(xmlrpc_client++ xmlrpc++ xmlrpc_client)
+list(APPEND lib_TARGETS xmlrpc_client++)
+ensc_pkgconfig(xmlrpc_client++)
+
+
+install(TARGETS ${lib_TARGETS}
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib})
+
+set_target_properties(${lib_TARGETS}
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
diff --git a/src/cpp/xmlrpc++.pc.cmake b/src/cpp/xmlrpc++.pc.cmake
new file mode 100644
index 0000000..cda7f56
--- /dev/null
+++ b/src/cpp/xmlrpc++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc++
+Description: XMLRPC C++ Base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc
+Libs:   		-L${libdir} -lxmlrpc++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_client++.pc.cmake b/src/cpp/xmlrpc_client++.pc.cmake
new file mode 100644
index 0000000..188b3a6
--- /dev/null
+++ b/src/cpp/xmlrpc_client++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_client++
+Description: XMLRPC C++ Client library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc++ xmlrpc_client
+Libs:   		-L${libdir} -lxmlrpc_client++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_cpp.pc.cmake b/src/cpp/xmlrpc_cpp.pc.cmake
new file mode 100644
index 0000000..b8f5af3
--- /dev/null
+++ b/src/cpp/xmlrpc_cpp.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_cpp
+Description: XMLRPC CPP library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc xmlrpc_server xmlrpc_client
+Libs:   		-L${libdir} -lxmlrpc_cpp
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_server++.pc.cmake b/src/cpp/xmlrpc_server++.pc.cmake
new file mode 100644
index 0000000..07b9e7b
--- /dev/null
+++ b/src/cpp/xmlrpc_server++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server++
+Description: XMLRPC C++ Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc++ xmlrpc_server
+Libs:   		-L${libdir} -lxmlrpc_server++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_server_abyss++.pc.cmake b/src/cpp/xmlrpc_server_abyss++.pc.cmake
new file mode 100644
index 0000000..d9eb456
--- /dev/null
+++ b/src/cpp/xmlrpc_server_abyss++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_abyss++
+Description: XMLRPC C++ Abyss-Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server_abyss xmlrpc_server++
+Libs:   		-L${libdir} -lxmlrpc_server_abyss++
+Cflags:		-I${includedir}
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
new file mode 100644
index 0000000..3deb9cb
--- /dev/null
+++ b/src/test/CMakeLists.txt
@@ -0,0 +1,27 @@
+# -*- cmake -*-
+
+set(test_SOURCES
+  test.c abyss.c cgi.c method_registry.c parse_xml.c serialize.c server_abyss.c
+  value.c xml_data.c)
+
+if(MUST_BUILD_CLIENT)
+  list(APPEND test_SOURCES client.c)
+  list(APPEND test_LIBS xmlrpc_client)
+else(MUST_BUILD_CLIENT)
+  list(APPEND test_SOURCES client_dummy.c)
+endif(MUST_BUILD_CLIENT)
+
+
+add_executable(src-test ${test_SOURCES})
+target_link_libraries(src-test xmlrpc_server_abyss util ${test_LIBS})
+
+add_executable(cgitest1 cgitest1.c)
+target_link_libraries(cgitest1 xmlrpc_server_cgi)
+
+add_custom_command(TARGET src-test
+  POST_BUILD
+  COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/data
+  COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR})
+
+enable_testing()
+add_test(runtests src-test)
diff --git a/src/xmlrpc.pc.cmake b/src/xmlrpc.pc.cmake
new file mode 100644
index 0000000..fd0c872
--- /dev/null
+++ b/src/xmlrpc.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc
+Description: XMLRPC base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	@xmlrpc_pkgconfig_req@ xmlrpc_util
+Libs:   		-L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_client.pc.cmake b/src/xmlrpc_client.pc.cmake
new file mode 100644
index 0000000..16bdd22
--- /dev/null
+++ b/src/xmlrpc_client.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_client
+Description: XMLRPC client library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc @xmlrpc_client_pkgconfig_req@
+Libs:   		-L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server.pc.cmake b/src/xmlrpc_server.pc.cmake
new file mode 100644
index 0000000..ca7224c
--- /dev/null
+++ b/src/xmlrpc_server.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server
+Description: XMLRPC Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc
+Libs:   		-L${libdir} -lxmlrpc_server
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server_abyss.pc.cmake b/src/xmlrpc_server_abyss.pc.cmake
new file mode 100644
index 0000000..7fbecc9
--- /dev/null
+++ b/src/xmlrpc_server_abyss.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_abyss
+Description: XMLRPC Server Abyss library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server xmlrpc_abyss
+Libs:   		-L${libdir} -lxmlrpc_server_abyss
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server_cgi.pc.cmake b/src/xmlrpc_server_cgi.pc.cmake
new file mode 100644
index 0000000..8042912
--- /dev/null
+++ b/src/xmlrpc_server_cgi.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_cgi
+Description: XMLRPC CGI-Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server
+Libs:   		-L${libdir} -lxmlrpc_server_cgi
+Cflags:		-I${includedir}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000..14010f4
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+add_subdirectory(binmode-rpc-kit)
+add_subdirectory(turbocharger)
+
+add_subdirectory(xmlrpc)
+add_subdirectory(xmlrpc_transport)
+
+add_subdirectory(xml-rpc-api2cpp )
diff --git a/tools/binmode-rpc-kit/CMakeLists.txt b/tools/binmode-rpc-kit/CMakeLists.txt
new file mode 100644
index 0000000..a707c75
--- /dev/null
+++ b/tools/binmode-rpc-kit/CMakeLists.txt
@@ -0,0 +1,2 @@
+# -*- cmake -*-
+
diff --git a/tools/turbocharger/CMakeLists.txt b/tools/turbocharger/CMakeLists.txt
new file mode 100644
index 0000000..342423d
--- /dev/null
+++ b/tools/turbocharger/CMakeLists.txt
@@ -0,0 +1 @@
+# -*- cmake -*-
diff --git a/tools/xml-rpc-api2cpp/CMakeLists.txt b/tools/xml-rpc-api2cpp/CMakeLists.txt
new file mode 100644
index 0000000..c759dec
--- /dev/null
+++ b/tools/xml-rpc-api2cpp/CMakeLists.txt
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+add_executable(xml-rpc-api2cpp
+  xml-rpc-api2cpp.cpp
+  DataType.cpp
+  XmlRpcFunction.cpp
+  XmlRpcClass.cpp
+  SystemProxy.cpp)
+target_link_libraries(xml-rpc-api2cpp xmlrpc_cpp xmlrpc_client xmlrpc_server)
+
+install(TARGETS xml-rpc-api2cpp
+  RUNTIME DESTINATION bin)
+
+install(FILES xml-rpc-api2cpp.1
+  DESTINATION ${mandir}/man1)
diff --git a/tools/xmlrpc/CMakeLists.txt b/tools/xmlrpc/CMakeLists.txt
new file mode 100644
index 0000000..976df30
--- /dev/null
+++ b/tools/xmlrpc/CMakeLists.txt
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+add_executable(tool-xmlrpc
+  xmlrpc.c
+  dumpvalue.c
+  dumpvalue.h)
+target_link_libraries(tool-xmlrpc xmlrpc_client util)
+
+set_target_properties(tool-xmlrpc
+  PROPERTIES OUTPUT_NAME xmlrpc)
+
+install(TARGETS tool-xmlrpc
+  DESTINATION ${_bin})
+
+ensc_set_link_exe_flags(tool-xmlrpc)
diff --git a/tools/xmlrpc/config.h b/tools/xmlrpc/config.h
new file mode 100644
index 0000000..7409aed
--- /dev/null
+++ b/tools/xmlrpc/config.h
@@ -0,0 +1 @@
+#include <xmlrpc_config.h>
diff --git a/tools/xmlrpc_transport/CMakeLists.txt b/tools/xmlrpc_transport/CMakeLists.txt
new file mode 100644
index 0000000..b73d7c0
--- /dev/null
+++ b/tools/xmlrpc_transport/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+add_executable(xmlrpc_transport xmlrpc_transport.c)
+target_link_libraries(xmlrpc_transport xmlrpc_client util)
+
+install(TARGETS xmlrpc_transport
+  DESTINATION ${_bin})
+
+ensc_set_link_exe_flags(xmlrpc_transport)
diff --git a/tools/xmlrpc_transport/config.h b/tools/xmlrpc_transport/config.h
new file mode 100644
index 0000000..7409aed
--- /dev/null
+++ b/tools/xmlrpc_transport/config.h
@@ -0,0 +1 @@
+#include <xmlrpc_config.h>
diff --git a/transport_config.h.cmake b/transport_config.h.cmake
new file mode 100644
index 0000000..1ec3cf6
--- /dev/null
+++ b/transport_config.h.cmake
@@ -0,0 +1,16 @@
+/* -*- c -*- */
+#define MUST_BUILD_WININET_CLIENT	@_MUST_BUILD_WININET_CLIENT@
+#define MUST_BUILD_LIBWWW_CLIENT	@_MUST_BUILD_LIBWWW_CLIENT@
+#define MUST_BUILD_CURL_CLIENT		@_MUST_BUILD_CURL_CLIENT@
+
+static char const * const XMLRPC_DEFAULT_TRANSPORT =
+#if MUST_BUILD_LIBWWW_CLIENT
+  "libwww"
+#elif MUST_BUILD_CURL_CLIENT
+  "curl"
+#elif MUST_BUILD_WININET_CLIENT
+  "wininet"
+#else
+#  error "no client XML transport configured"
+#endif
+  ;
diff --git a/version.h.cmake b/version.h.cmake
new file mode 100644
index 0000000..35beafc
--- /dev/null
+++ b/version.h.cmake
@@ -0,0 +1,2 @@
+/* This file was generated by a make rule */
+#define XMLRPC_C_VERSION "@XMLRPC_C_VERSION@"
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
index 0000000..e8ba549
--- /dev/null
+++ b/xmlrpc-c-config
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+comp=
+
+need_cxx=
+need_client=
+need_server=
+need_abyss=
+
+while test $# -gt 0; do
+    case $1 in
+      (c++)          		comp="$comp xmlrpc_cpp";;
+      (server-util)  		comp="$comp xmlrpc_server_util";;
+      (cgi-server)   		comp="$comp xmlrpc_server_cgi";;
+      (c++2)         		need_cxx=1;;
+      (abyss-server) 		need_abyss=1;;
+      (client|libwww-client)	need_client=1;;
+      (--) shift; break;;
+      (--*) break;;
+      (*)
+      echo "Unrecognized token '$1'"
+      exit 1
+      ;;
+    esac
+    shift
+done
+
+if test -z "$need_cxx"; then
+    test -z "$need_client" || comp="$comp xmlrpc_client"
+    test -z "$need_abyss"  || comp="$comp xmlrpc_abyss"
+    test -z "$need_server" || comp="$comp xmlrpc_server"
+else
+    test -z "$need_client" || comp="$comp xmlrpc_client++"
+    test -z "$need_abyss"  || comp="$comp xmlrpc_abyss++"
+    test -z "$need_server" || comp="$comp xmlrpc_server++"
+fi
+
+exec pkg-config "$@" $comp
diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake
new file mode 100644
index 0000000..98b37ef
--- /dev/null
+++ b/xmlrpc_config.h.cmake
@@ -0,0 +1,21 @@
+/* -*- c -*- */
+
+#ifndef H_XMLRPC_C_CONFIG_H
+
+#cmakedefine			HAVE_WCHAR_H
+#cmakedefine			HAVE_SETENV
+#define HAVE_SYS_IOCTL_H	0 at HAVE_SYS_IOCTL_H@
+
+#define VA_LIST_IS_ARRAY	@VA_LIST_IS_ARRAY@
+#define XMLRPC_HAVE_WCHAR	@XMLRPC_HAVE_WCHAR@
+#define ATTR_UNUSED		@ATTR_UNUSED@
+#define DIRECTORY_SEPARATOR	"@DIRECTORY_SEPARATOR@"
+
+#ifdef HAVE_WCHAR_H
+#  define HAVE_UNICODE_WCHAR	1
+#else
+#  define HAVE_UNICODE_WCHAR	0
+#endif
+
+
+#endif
-- 
1.4.2.1



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/xmlrpc-c.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmlrpc-c.spec	20 Sep 2006 18:45:55 -0000	1.9
+++ xmlrpc-c.spec	2 Oct 2006 15:02:03 -0000	1.10
@@ -5,14 +5,14 @@
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
 Version:	1.06.05
-Release:	%release_func 1
+Release:	%release_func 2
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
 Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
 Patch3:		xmlrpc-c-1.05-typo.patch
 Patch6:		xmlrpc-c-1.06.04-sizet.patch
-Patch100:	http://ensc.de/xmlrpc-c/0003-make-cmake-transition.txt
+Patch100:	http://ensc.de/xmlrpc-c/0001-make-cmake-transition.txt
 BuildRoot:	%_tmppath/%name-%version-%release-root
 #BuildRequires:	w3c-libwww-devel
 BuildRequires:	cmake
@@ -86,7 +86,9 @@
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-	
+
+chmod +x $RPM_BUILD_ROOT%_libdir/*.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,6 +123,10 @@
 
 
 %changelog
+* Mon Oct  2 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-2
+- updated cmake patch
+- strip installed libraries
+
 * Wed Sep 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-1
 - updated to 1.06.05
 - merged + updated patches


--- 0003-make-cmake-transition.txt DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 15:10:48 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  2 Oct 2006 08:10:48 -0700
Subject: rpms/xmlrpc-c/FC-5 xmlrpc-c-1.06.04-sizet.patch, NONE,
	1.1 0001-make-cmake-transition.txt, NONE, 1.1 xmlrpc-c.spec, 1.3,
	1.4 sources, 1.3, 1.4 xmlrpc-c-1.05-libtool.patch, 1.1,
	NONE xmlrpc-c-1.05-gcc41.patch, 1.1,
	NONE xmlrpc-c-1.05-buildsys.patch, 1.1,
	NONE xmlrpc-c-1.04-libxml2.patch, 1.1, NONE
Message-ID: <200610021510.k92FAoox028795@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28772

Modified Files:
	xmlrpc-c.spec sources 
Added Files:
	xmlrpc-c-1.06.04-sizet.patch 0001-make-cmake-transition.txt 
Removed Files:
	xmlrpc-c-1.05-libtool.patch xmlrpc-c-1.05-gcc41.patch 
	xmlrpc-c-1.05-buildsys.patch xmlrpc-c-1.04-libxml2.patch 
Log Message:
- updated to 1.06.05
- merged + updated patches
- patched the broken buildsystem
- disabled libwww backend explicitely


xmlrpc-c-1.06.04-sizet.patch:

--- NEW FILE xmlrpc-c-1.06.04-sizet.patch ---
2006-06-04  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* fixed a lot of format strings which produce

	  | warning: format '%d' expects type 'int', but argument 6 has type 'size_t'

          style warnings on x86_64 machines else

--- xmlrpc-c-1.05/lib/libutil/memblock.c.sizet	2005-09-23 04:17:23.000000000 +0200
+++ xmlrpc-c-1.05/lib/libutil/memblock.c	2006-06-04 19:02:10.000000000 +0200
@@ -73,7 +73,7 @@ xmlrpc_mem_block_init(xmlrpc_env *      
 
     blockP->_block = (void*) malloc(blockP->_allocated);
     if (!blockP->_block)
-        xmlrpc_faultf(envP, "Can't allocate %u-byte memory block",
+        xmlrpc_faultf(envP, "Can't allocate %zu-byte memory block",
                       blockP->_allocated);
 }
 
--- xmlrpc-c-1.05/src/xmlrpc_data.c.sizet	2006-01-03 07:48:59.000000000 +0100
+++ xmlrpc-c-1.05/src/xmlrpc_data.c	2006-06-04 19:06:02.000000000 +0200
@@ -288,7 +288,7 @@ xmlrpc_read_string(xmlrpc_env *         
         if (stringValue == NULL)
             xmlrpc_env_set_fault_formatted(
                 envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate space "
-                "for %u-character string", length);
+                "for %zu-character string", length);
         else {
             memcpy(stringValue, contents, length);
             stringValue[length] = '\0';
@@ -419,7 +419,7 @@ xmlrpc_read_string_w(xmlrpc_env *     co
         if (stringValue == NULL)
             xmlrpc_env_set_fault_formatted(
                 envP, XMLRPC_INTERNAL_ERROR, 
-                "Unable to allocate space for %u-byte string", 
+                "Unable to allocate space for %zu-byte string", 
                 length);
         else {
             memcpy(stringValue, wcontents, length * sizeof(wchar_t));
@@ -466,7 +466,7 @@ xmlrpc_read_string_w_lp(xmlrpc_env *    
             if (stringValue == NULL)
                 xmlrpc_env_set_fault_formatted(
                     envP, XMLRPC_INTERNAL_ERROR, 
-                    "Unable to allocate space for %u-byte string", 
+                    "Unable to allocate space for %zu-byte string", 
                     size);
             else {
                 memcpy(stringValue, wcontents, size * sizeof(wchar_t));
@@ -523,7 +523,7 @@ xmlrpc_read_base64(xmlrpc_env *         
         byteStringValue = malloc(size);
         if (byteStringValue == NULL)
             xmlrpc_env_set_fault_formatted(
-                envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %u bytes "
+                envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %zu bytes "
                 "for byte string.", size);
         else {
             memcpy(byteStringValue, contents, size);
--- xmlrpc-c-1.05/src/xmlrpc_datetime.c.sizet	2006-01-03 04:39:22.000000000 +0100
+++ xmlrpc-c-1.05/src/xmlrpc_datetime.c	2006-06-04 19:06:37.000000000 +0200
@@ -331,7 +331,7 @@ validateFormat(xmlrpc_env * const envP,
                const char * const t) {
 
     if (strlen(t) != 17)
-        xmlrpc_faultf(envP, "%u characters instead of 15.", strlen(t));
+        xmlrpc_faultf(envP, "%zu characters instead of 15.", strlen(t));
     else if (t[8] != 'T')
         xmlrpc_faultf(envP, "9th character is '%c', not 'T'", t[8]);
     else {
--- xmlrpc-c-1.05/src/xmlrpc_parse.c.sizet	2006-03-23 00:48:31.000000000 +0100
+++ xmlrpc-c-1.05/src/xmlrpc_parse.c	2006-06-04 19:10:00.000000000 +0200
@@ -57,7 +57,7 @@
     do \
         if (xml_element_children_size(elem) != (count)) \
             XMLRPC_FAIL3(env, XMLRPC_PARSE_ERROR, \
-             "Expected <%s> to have %d children, found %d", \
+             "Expected <%s> to have %d children, found %zd", \
                          xml_element_name(elem), (count), \
                          xml_element_children_size(elem)); \
     while (0)
@@ -595,7 +595,7 @@ parseMethodNameElement(xmlrpc_env *  con
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_PARSE_ERROR,
             "A <methodName> element should not have children.  "
-            "This one has %u of them.", xml_element_children_size(nameElemP));
+            "This one has %zu of them.", xml_element_children_size(nameElemP));
     else {
         const char * const cdata = xml_element_cdata(nameElemP);
 
@@ -654,7 +654,7 @@ parseCallChildren(xmlrpc_env *    const 
                     xmlrpc_env_set_fault_formatted(
                         envP, XMLRPC_PARSE_ERROR,
                         "<methodCall> has extraneous children, other than "
-                        "<methodName> and <params>.  Total child count = %u",
+                        "<methodName> and <params>.  Total child count = %zu",
                         callChildCount);
                     
                 if (envP->fault_occurred)
@@ -697,7 +697,7 @@ xmlrpc_parse_call(xmlrpc_env *    const 
     if (xmlLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
-            "XML-RPC request too large.  Max allowed is %u bytes",
+            "XML-RPC request too large.  Max allowed is %zu bytes",
             xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID));
     else {
         xml_element * callElemP;
@@ -773,7 +773,7 @@ parseFaultElement(xmlrpc_env *        co
     if (xml_element_children_size(faultElement) != 1)
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_PARSE_ERROR,
-            "<fault> element should have 1 child, but it has %u.",
+            "<fault> element should have 1 child, but it has %zu.",
             xml_element_children_size(faultElement));
     else {
         xml_element * const faultValueP =
@@ -869,7 +869,7 @@ parseMethodResponseElt(xmlrpc_env *     
     } else
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_PARSE_ERROR,
-            "<methodResponse> has %u children, should have 1.",
+            "<methodResponse> has %zu children, should have 1.",
             xml_element_children_size(methodResponseEltP));
 }
 
@@ -908,8 +908,8 @@ xmlrpc_parse_response2(xmlrpc_env *    c
     if (xmlDataLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
-            "XML-RPC response too large.  Our limit is %u characters.  "
-            "We got %u characters",
+            "XML-RPC response too large.  Our limit is %zu characters.  "
+            "We got %zu characters",
             xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID), xmlDataLen);
     else {
         xml_parse(envP, xmlData, xmlDataLen, &response);
--- xmlrpc-c-1.05/src/xmlrpc_server_abyss.c.sizet	2006-03-25 20:15:31.000000000 +0100
+++ xmlrpc-c-1.05/src/xmlrpc_server_abyss.c	2006-06-04 19:11:24.000000000 +0200
@@ -348,7 +348,7 @@ processCall(TSession *        const abys
     if (contentSize > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
         xmlrpc_env_set_fault_formatted(
             &env, XMLRPC_LIMIT_EXCEEDED_ERROR,
-            "XML-RPC request too large (%d bytes)", contentSize);
+            "XML-RPC request too large (%zd bytes)", contentSize);
     else {
         xmlrpc_mem_block *body;
         /* Read XML data off the wire. */


--- NEW FILE 0001-make-cmake-transition.txt ---
>From ca5754cd4b3f3fdf3b8b80bc2264aa4c1f2e76a4 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Mon, 2 Oct 2006 13:37:48 +0200
Subject: [PATCH] make -> cmake transition

---
 CMakeLists.txt                              |  236 +++++++++++++++++++++++++++
 cmake/try-attr.cc                           |    3 
 cmake/va-list-is-array.c                    |    9 +
 examples/CMakeLists.txt                     |   51 ++++++
 examples/config.h                           |    1 
 examples/cpp/CMakeLists.txt                 |   20 ++
 include/CMakeLists.txt                      |    3 
 include/xmlrpc-c/CMakeLists.txt             |   31 ++++
 include/xmlrpc-c/config.h.cmake             |    8 +
 lib/CMakeLists.txt                          |   12 +
 lib/abyss/CMakeLists.txt                    |    3 
 lib/abyss/src/CMakeLists.txt                |   62 +++++++
 lib/abyss/src/xmlrpc_abyss.pc.cmake         |   10 +
 lib/curl_transport/CMakeLists.txt           |    7 +
 lib/expat/CMakeLists.txt                    |    9 +
 lib/expat/gennmtab/CMakeLists.txt           |    3 
 lib/expat/xmlparse/CMakeLists.txt           |    7 +
 lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake |   10 +
 lib/expat/xmltok/CMakeLists.txt             |   20 ++
 lib/expat/xmltok/xmlrpc_xmltok.pc.cmake     |    9 +
 lib/libutil/CMakeLists.txt                  |   22 +++
 lib/libutil/xmlrpc_util.pc.cmake            |   10 +
 lib/libwww_transport/CMakeLists.txt         |    4 
 lib/util/CMakeLists.txt                     |   13 +
 lib/wininet_transport/CMakeLists.txt        |    4 
 src/CMakeLists.txt                          |  106 ++++++++++++
 src/cpp/CMakeLists.txt                      |   48 +++++
 src/cpp/xmlrpc++.pc.cmake                   |   11 +
 src/cpp/xmlrpc_client++.pc.cmake            |   11 +
 src/cpp/xmlrpc_cpp.pc.cmake                 |   11 +
 src/cpp/xmlrpc_server++.pc.cmake            |   11 +
 src/cpp/xmlrpc_server_abyss++.pc.cmake      |   11 +
 src/test/CMakeLists.txt                     |   27 +++
 src/xmlrpc.pc.cmake                         |   11 +
 src/xmlrpc_client.pc.cmake                  |   11 +
 src/xmlrpc_server.pc.cmake                  |   11 +
 src/xmlrpc_server_abyss.pc.cmake            |   11 +
 src/xmlrpc_server_cgi.pc.cmake              |   11 +
 tools/CMakeLists.txt                        |    9 +
 tools/binmode-rpc-kit/CMakeLists.txt        |    2 
 tools/turbocharger/CMakeLists.txt           |    1 
 tools/xml-rpc-api2cpp/CMakeLists.txt        |   15 ++
 tools/xmlrpc/CMakeLists.txt                 |   15 ++
 tools/xmlrpc/config.h                       |    1 
 tools/xmlrpc_transport/CMakeLists.txt       |    9 +
 tools/xmlrpc_transport/config.h             |    1 
 transport_config.h.cmake                    |   16 ++
 version.h.cmake                             |    2 
 xmlrpc-c-config                             |   38 ++++
 xmlrpc_config.h.cmake                       |   21 ++
 50 files changed, 988 insertions(+), 0 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..18b390d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,236 @@
+## -*- cmake -*-
+project(xmlrpc-c)
+include(UsePkgConfig)
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+
+set(XMLRPC_C_VERSION    "1.06.05" CACHE STRING "Version of xmlrpc-c")
+set(XMLRPC_C_LIBVERSION "3.6.4")
+set(XMLRPC_C_SOVERSION  "3")
+
+
+macro(ensc_set_bool NAME VALUE DESC)
+  set(${NAME} ${VALUE} CACHE BOOL ${DESC})
+  if(${NAME})
+    set(_${NAME} 1)
+  else(${NAME})
+    set(_${NAME} 0)
+  endif(${NAME})
+endmacro(ensc_set_bool)
+
+macro(ensc_pkgconfig COMP)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${COMP}.pc.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${COMP}.pc
+    @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${COMP}.pc
+    DESTINATION ${pkgconfdir})
+endmacro(ensc_pkgconfig)
+
+macro(ensc_pkgconfig_lib TARGET LIBS)
+  get_target_property(libtype ${TARGET} TYPE)
+  if("${libtype}" STREQUAL "STATIC_LIBRARY")
+    list(APPEND ${TARGET}_pkgconfig_libs "${LIBS}")
+  endif("${libtype}" STREQUAL "STATIC_LIBRARY")
+endmacro(ensc_pkgconfig_lib)
+
+macro(ensc_set_link_exe_flags)
+  ## HACK: libwww has broken inter-lib dependencies and '-Wl,--as-needed' fails with it
+  if(NOT MUST_BUILD_LIBWWW_CLIENT)
+    set_target_properties(${ARGV}
+      PROPERTIES
+      LINK_FLAGS ${XMLRPC_LINKER_FLAGS})
+  endif(NOT MUST_BUILD_LIBWWW_CLIENT)
+endmacro(ensc_set_link_exe_flags)
+
+
+###########
+if(WIN32)
+  find_program(WININET_CONFIG_EXECUTABLE wininet-config)
+
+  if(DEFINED MUST_BUILD_WININET_CLIENT)
+    set(tmp ${MUST_BUILD_WININET_CLIENT})
+  else(DEFINED MUST_BUILD_WININET_CLIENT)
+    if(WININET_CONFIG_EXECUTABLE)
+      set(tmp 1)
+    else(WININET_CONFIG_EXECUTABLE)
+      set(tmp 0)
+    endif(WININET_CONFIG_EXECUTABLE)
+  endif(DEFINED MUST_BUILD_WININET_CLIENT)
+else(WIN32)
+  set(tmp 0)
+endif(WIN32)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE WININET_VERSION)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --cflags  OUTPUT_VARIABLE WININET_CFLAGS)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --libs    OUTPUT_VARIABLE WININET_LDADD)
+  message(STATUS "Using WinInet ${WININET_VERSION} transport")
+endif(tmp)
+
+ensc_set_bool(MUST_BUILD_WININET_CLIENT ${tmp} "Set iff WinInet client transport shall be built")
+set(wininet_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/wininet_transport)
+
+###########
+pkgconfig(libcurl CURL_INCLUDE_DIR CURL_LINK_DIR CURL_LINK_FLAGS CURL_CFLAGS)
+if(DEFINED MUST_BUILD_CURL_CLIENT)
+  set(tmp ${MUST_BUILD_CURL_CLIENT})
+else(DEFINED MUST_BUILD_CURL_CLIENT)
+  if(CURL_LINK_FLAGS)
+    set(tmp 1)
+  else(CURL_LINK_FLAGS)
+    set(tmp 0)
+  endif(CURL_LINK_FLAGS)
+endif(DEFINED MUST_BUILD_CURL_CLIENT)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  STRING(REGEX REPLACE "\n" "" CURL_CFLAGS ${CURL_CFLAGS})	# HACK!!
+  message(STATUS "Using libcurl transport ${CURL_CFLAGS}")
+endif(tmp)
+ensc_set_bool(MUST_BUILD_CURL_CLIENT ${tmp} "Set iff Curl client transport shall be built")
+set(curl_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/curl_transport)
+
+###########
+find_program(LIBWWW_CONFIG_EXECUTABLE libwww-config)
+if(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+  set(tmp ${MUST_BUILD_LIBWWW_CLIENT})
+else(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+  if(LIBWWW_CONFIG_EXECUTABLE)
+    set(tmp 1)
+  else(LIBWWW_CONFIG_EXECUTABLE)
+    set(tmp 0)
+  endif(LIBWWW_CONFIG_EXECUTABLE)
+endif(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE LIBWWW_VERSION)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --libs    OUTPUT_VARIABLE LIBWWW_LIBS)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --cflags  OUTPUT_VARIABLE LIBWWW_CFLAGS)
+  message(STATUS "Using libwww ${LIBWWW_VERSION} transport")
+endif(tmp)
+ensc_set_bool(MUST_BUILD_LIBWWW_CLIENT ${tmp} "Set iff LibWWW client transport shall be built")
+set(libwww_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/libwww_transport)
+
+############
+
+set(ENABLE_CGI_SERVER      1 CACHE BOOL "Set iff CGI server shall be enabled")
+set(ENABLE_CPLUSPLUS       1 CACHE BOOL "Set iff C++ part shall be enabled")
+set(ENABLE_ABYSS_SERVER    1 CACHE BOOL "Set iff Abyss server shall be enabled")
+set(ENABLE_LIBXML2_BACKEND 1 CACHE BOOL "Set iff libxml2 backend shall be used")
+set(ENABLE_ABYSS_THREADS   1 CACHE BOOL "Use pthread")
+
+if(ENABLE_LIBXML2_BACKEND)
+  foreach(tmp libxml-2.0 libxml2 libxml)
+    if (NOT DEFINED libxml_pkgconfig)
+      pkgconfig(${tmp} LIBXML2_INCLUDE_DIR LIBXML2_LINK_DIR LIBXML2_LINK_FLAGS LIBXML2_CFLAGS)
+      if(LIBXML2_LINK_FLAGS)
+	set(libxml_pkgconfig ${tmp})
+      endif(LIBXML2_LINK_FLAGS)
+    endif(NOT DEFINED libxml_pkgconfig)
+  endforeach(tmp)
+endif(ENABLE_LIBXML2_BACKEND)
+
+
+####  <wchar.h> tests
+check_include_file(wchar.h _have_wchar_h)
+if(_have_wchar_h)
+  set(HAVE_WCHAR_H 1)
+else(_have_wchar_h)
+  set(HAVE_WCHAR_H 1)
+endif(_have_wchar_h)
+set(XMLRPC_HAVE_WCHAR   ${HAVE_WCHAR_H})
+set(HAVE_WCHAR_H_DEFINE ${HAVE_WCHAR_H})
+
+
+#######
+set(LINKER_AS_NEEDED  1 CACHE BOOL "Use the --as-needed linker option")
+if(LINKER_AS_NEEDED)
+  set(XMLRPC_LINKER_FLAGS "-Wl,--as-needed")
+endif(LINKER_AS_NEEDED)
+
+
+try_compile(HAVE_ATTR_UNUSED
+  ${CMAKE_BINARY_DIR}/
+  ${xmlrpc-c_SOURCE_DIR}/cmake/try-attr.cc
+  CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-DCMAKE_TEST_ATTR=__unused__)
+
+try_compile(VA_LIST_IS_NOT_ARRAY
+  ${CMAKE_BINARY_DIR}/
+  ${xmlrpc-c_SOURCE_DIR}/cmake/va-list-is-array.c)
+
+if(VA_LIST_IS_NOT_ARRAY)
+  set(VA_LIST_IS_ARRAY 0)
+  message(STATUS "va_list is not an array")
+else(VA_LIST_IS_NOT_ARRAY)
+  set(VA_LIST_IS_ARRAY 1)
+  message(STATUS "va_list is an array")
+endif(VA_LIST_IS_NOT_ARRAY)
+
+
+if(HAVE_ATTR_UNUSED)
+  set(ATTR_UNUSED "__attribute__((__unused__))")
+endif(HAVE_ATTR_UNUSED)
+
+if(WIN32)
+  set(DIRECTORY_SEPARATOR "\\")
+else(WIN32)
+  set(DIRECTORY_SEPARATOR "/")
+endif(WIN32)
+
+check_include_file(sys/filio.h HAVE_SYS_FILIO_H)
+check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
+check_function_exists(setenv HAVE_SETENV)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/xmlrpc_config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/xmlrpc_config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/version.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/version.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/transport_config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/transport_config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/include/xmlrpc-c/config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/include/xmlrpc-c/config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+
+include_directories(${xmlrpc-c_SOURCE_DIR}/include)
+include_directories(${xmlrpc-c_BINARY_DIR}/include)
+include_directories(${xmlrpc-c_SOURCE_DIR}/lib/util/include)
+include_directories(${xmlrpc-c_BINARY_DIR})
+
+add_custom_target(dist
+  rm -rf _dist && mkdir -p _dist/xmlrpc-c-${XMLRPC_C_VERSION}
+  COMMAND cp -a ${xmlrpc-c_SOURCE_DIR}/* _dist/xmlrpc-c-${XMLRPC_C_VERSION}/
+  COMMAND cd _dist && tar cjf ../xmlrpc-c-${XMLRPC_C_VERSION}.tar.bz2 xmlrpc-c-${XMLRPC_C_VERSION} --exclude=.git --exclude=CVS --exclude=.svn
+  )
+
+set(_lib       lib CACHE STRING "Basename of the library-directory; usually 'lib' or 'lib64' (on multilib archs)")
+set(_bin       bin CACHE STRING "Basename of the bin-directory; usually 'bin'")
+set(prefix     ${CMAKE_INSTALL_PREFIX})
+set(libdir     "${prefix}/${_lib}")
+set(bindir     "${prefix}/${_bin}")
+set(mandir     "${prefix}/share/man")
+set(pkgconfdir "${libdir}/pkgconfig")
+set(includedir "${prefix}/include")
+
+#############
+
+install(PROGRAMS xmlrpc-c-config DESTINATION ${_bin})
+
+enable_testing()
+
+add_subdirectory(lib)
+add_subdirectory(Windows)
+add_subdirectory(conf)
+add_subdirectory(doc)
+add_subdirectory(examples)
+add_subdirectory(include)
+add_subdirectory(src)
+add_subdirectory(tools)
diff --git a/cmake/try-attr.cc b/cmake/try-attr.cc
new file mode 100644
index 0000000..4668c5b
--- /dev/null
+++ b/cmake/try-attr.cc
@@ -0,0 +1,3 @@
+int x __attribute__((CMAKE_TEST_ATTR));
+
+int main() {}
diff --git a/cmake/va-list-is-array.c b/cmake/va-list-is-array.c
new file mode 100644
index 0000000..1ad0bab
--- /dev/null
+++ b/cmake/va-list-is-array.c
@@ -0,0 +1,9 @@
+#include <stdarg.h>
+
+void foo()
+{
+  va_list list1, list2;
+  list1 = list2;
+}
+
+int main() {}
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..9f18b0d
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,51 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+macro(ensc_add_example name ext class)
+  # HACK: avoid name collision of c and c++ program
+  if("${ext}" STREQUAL "cpp")
+    set(_target ${name}++)
+  else("${ext}" STREQUAL "cpp")
+    set(_target ${name})
+  endif("${ext}" STREQUAL "cpp")
+
+  add_executable(${_target} ${name}.${ext})
+  target_link_libraries(${_target} ${${class}_LIBS})
+  list(APPEND ${class}_TARGETS ${_target})
+  list(APPEND example_TARGETS ${_target})
+endmacro(ensc_add_example)
+
+if(ENABLE_CPLUSPLUS)
+  add_subdirectory(cpp)
+endif(ENABLE_CPLUSPLUS)
+
+
+
+if(MUST_BUILD_CLIENT)
+  set(client_LIBS xmlrpc_client)
+
+  ensc_add_example(auth_client              c client)
+  ensc_add_example(query-meerkat            c client)
+  ensc_add_example(synch_client             c client)
+  ensc_add_example(xmlrpc_sample_add_client c client)
+  ensc_add_example(xmlrpc_asynch_client     c client)
+endif(MUST_BUILD_CLIENT)
+
+if(ENABLE_CGI_SERVER)
+  set(cgi_server_LIBS xmlrpc_server_cgi)
+
+  ensc_add_example(xmlrpc_sample_add_server_cgi c cgi_server)
+endif(ENABLE_CGI_SERVER)
+
+if(ENABLE_ABYSS_SERVER)
+  set(abyss_server_LIBS xmlrpc_server_abyss)
+
+  ensc_add_example(xmlrpc_inetd_server      c abyss_server)
+  ensc_add_example(xmlrpc_socket_server     c abyss_server)
+  ensc_add_example(xmlrpc_loop_server       c abyss_server)
+  ensc_add_example(xmlrpc_sample_add_server c abyss_server)
+  ensc_add_example(xmlrpc_server_validatee  c abyss_server)
+endif(ENABLE_ABYSS_SERVER)
+
+ensc_set_link_exe_flags(${example_TARGETS})
diff --git a/examples/config.h b/examples/config.h
new file mode 100644
index 0000000..31d5f9b
--- /dev/null
+++ b/examples/config.h
@@ -0,0 +1 @@
+#include "../xmlrpc_config.h"
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
new file mode 100644
index 0000000..9fbea7e
--- /dev/null
+++ b/examples/cpp/CMakeLists.txt
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+if(ENABLE_ABYSS_SERVER)
+  set(abyss_serverxx_LIBS xmlrpc_server_abyss++)
+
+  ensc_add_example(xmlrpc_inetd_server cpp abyss_serverxx)
+endif(ENABLE_ABYSS_SERVER)
+
+if(MUST_BUILD_CLIENT)
+  set(abyss_clientxx_LIBS        xmlrpc_client++)
+  set(abyss_clientxx_legacy_LIBS xmlrpc_cpp)
+
+  ensc_add_example(xmlrpc_sample_add_client  cpp abyss_clientxx)
+  ensc_add_example(sample_add_client_complex cpp abyss_clientxx)
+
+  ensc_add_example(meerkat-app-list          cpp abyss_clientxx_legacy)
+endif(MUST_BUILD_CLIENT)
+
+
+ensc_set_link_exe_flags(${example_TARGETS})
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 0000000..ebfdba5
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+add_subdirectory(xmlrpc-c)
diff --git a/include/xmlrpc-c/CMakeLists.txt b/include/xmlrpc-c/CMakeLists.txt
new file mode 100644
index 0000000..903f623
--- /dev/null
+++ b/include/xmlrpc-c/CMakeLists.txt
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+list(APPEND headers
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+  util.h base.h abyss.h server.h
+  server_abyss.h server_w32httpsys.h oldxmlrpc.h)
+
+if(ENABLE_CPLUSPLUS)
+  list(APPEND headers
+    oldcppwrapper.hpp girerr.hpp girmem.hpp base.hpp
+    timeout.hpp xml.hpp registry.hpp server_abyss.hpp)
+endif(ENABLE_CPLUSPLUS)
+
+if(MUST_BUILD_CLIENT)
+  list(APPEND headers
+    client.h transport.h client_global.h)
+
+  if(ENABLE_CPLUSPLUS)
+    list(APPEND headers
+      client.hpp client_transport.hpp client_simple.hpp)
+  endif(ENABLE_CPLUSPLUS)
+endif(MUST_BUILD_CLIENT)
+
+if(ENABLE_CGI_SERVER)
+  list(APPEND headers
+    server_cgi.h)
+endif(ENABLE_CGI_SERVER)
+
+install(FILES
+  ${headers}
+  DESTINATION ${includedir}/xmlrpc-c)
diff --git a/include/xmlrpc-c/config.h.cmake b/include/xmlrpc-c/config.h.cmake
new file mode 100644
index 0000000..7b95a1d
--- /dev/null
+++ b/include/xmlrpc-c/config.h.cmake
@@ -0,0 +1,8 @@
+/* This file, part of XML-RPC For C/C++, is meant to
+   define characteristics of this particular installation
+   that the other <xmlrpc-c/...> header files need in order to
+   compile correctly when #included in a Xmlrpc-c user code.
+
+   Those header files #include this one.
+*/
+#define XMLRPC_HAVE_WCHAR		@HAVE_WCHAR_H@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
new file mode 100644
index 0000000..7f8f912
--- /dev/null
+++ b/lib/CMakeLists.txt
@@ -0,0 +1,12 @@
+## -*- cmake -*-
+
+add_subdirectory(abyss)
+add_subdirectory(libutil)
+add_subdirectory(util)
+add_subdirectory(curl_transport)
+add_subdirectory(libwww_transport)
+add_subdirectory(wininet_transport)
+
+if(NOT ENABLE_LIBXML2_BACKEND)
+  add_subdirectory(expat)
+endif(NOT ENABLE_LIBXML2_BACKEND)
diff --git a/lib/abyss/CMakeLists.txt b/lib/abyss/CMakeLists.txt
new file mode 100644
index 0000000..2358061
--- /dev/null
+++ b/lib/abyss/CMakeLists.txt
@@ -0,0 +1,3 @@
+## -*- cmake -*-
+
+SUBDIRS(src)
diff --git a/lib/abyss/src/CMakeLists.txt b/lib/abyss/src/CMakeLists.txt
new file mode 100644
index 0000000..a8fb5a9
--- /dev/null
+++ b/lib/abyss/src/CMakeLists.txt
@@ -0,0 +1,62 @@
+## -*- cmake -*-
+
+set(xmlrpc_abyss_SOURCES
+  abyss_info.h
+  channel.c
+  channel.h
+  chanswitch.c
+  chanswitch.h
+  conf.c
+  conn.c
+  conn.h
+  data.c
+  data.h
+  date.c
+  date.h
+  file.c
+  file.h
+  http.c
+  http.h
+  init.c
+  response.c
+  server.c
+  server.h
+  session.c
+  session.h
+  socket.c
+  socket.h
+  socket_unix.c
+  socket_unix.h
+  thread.h
+  token.c
+  token.h
+  trace.c
+  trace.h)
+
+if(ENABLE_ABYSS_THREADS)
+  list(APPEND xmlrpc_abyss_SOURCES thread_pthread.c)
+else(ENABLE_ABYSS_THREADS)
+  list(APPEND xmlrpc_abyss_SOURCES thread_fork.c)
+endif(ENABLE_ABYSS_THREADS)
+
+add_library(xmlrpc_abyss SHARED ${xmlrpc_abyss_SOURCES})
+target_link_libraries(xmlrpc_abyss xmlrpc_util)
+
+if(ENABLE_ABYSS_THREADS)
+  set_target_properties(xmlrpc_abyss PROPERTIES DEFINE_SYMBOL _THREAD)
+  target_link_libraries(xmlrpc_abyss pthread)
+  ensc_pkgconfig_lib(xmlrpc_abyss "-lpthread")
+endif(ENABLE_ABYSS_THREADS)
+
+install(TARGETS xmlrpc_abyss
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib}
+  ARCHIVE DESTINATION ${_lib})
+
+set_target_properties(xmlrpc_abyss
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+ensc_pkgconfig(xmlrpc_abyss)
diff --git a/lib/abyss/src/xmlrpc_abyss.pc.cmake b/lib/abyss/src/xmlrpc_abyss.pc.cmake
new file mode 100644
index 0000000..2a4f124
--- /dev/null
+++ b/lib/abyss/src/xmlrpc_abyss.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_abyss
+Description: XMLRPC Abyss base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_util
+Libs:   		-L${libdir} -lxmlrpc_abyss @xmlrpc_abyss_pkgconfig_libs@
+Cflags:
diff --git a/lib/curl_transport/CMakeLists.txt b/lib/curl_transport/CMakeLists.txt
new file mode 100644
index 0000000..3814f08
--- /dev/null
+++ b/lib/curl_transport/CMakeLists.txt
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_CURL_CLIENT)
+  list(APPEND transport_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc_curl_transport.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc_curl_transport.h)
+endif(MUST_BUILD_CURL_CLIENT)
diff --git a/lib/expat/CMakeLists.txt b/lib/expat/CMakeLists.txt
new file mode 100644
index 0000000..7397f52
--- /dev/null
+++ b/lib/expat/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/xmltok)
+
+add_subdirectory(gennmtab)
+add_subdirectory(xmlparse)
+add_subdirectory(xmltok)
+add_subdirectory(xmlwf)
diff --git a/lib/expat/gennmtab/CMakeLists.txt b/lib/expat/gennmtab/CMakeLists.txt
new file mode 100644
index 0000000..48a44da
--- /dev/null
+++ b/lib/expat/gennmtab/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+ADD_EXECUTABLE(gennmtab gennmtab.c)
diff --git a/lib/expat/xmlparse/CMakeLists.txt b/lib/expat/xmlparse/CMakeLists.txt
new file mode 100644
index 0000000..f87008a
--- /dev/null
+++ b/lib/expat/xmlparse/CMakeLists.txt
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+add_library(xmlrpc_xmlparse STATIC
+  xmlparse.c)
+target_link_libraries(xmlrpc_xmlparse xmlrpc_xmltok)
+
+ensc_pkgconfig(xmlrpc_xmlparse)
diff --git a/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
new file mode 100644
index 0000000..71d77da
--- /dev/null
+++ b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_xmlparse
+Description: XMLRPC xmlparse library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_xmltok
+Libs:   		-L${libdir} -lxmlrpc_xmlparse
+Cflags:
diff --git a/lib/expat/xmltok/CMakeLists.txt b/lib/expat/xmltok/CMakeLists.txt
new file mode 100644
index 0000000..c3247ad
--- /dev/null
+++ b/lib/expat/xmltok/CMakeLists.txt
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(xmlrpc_xmltok STATIC
+  xmltok.c xmlrole.c ${CMAKE_CURRENT_BINARY_DIR}/nametab.h)
+
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/nametab.h
+  PROPERTIES
+  OBJECT_DEPENDS gennmtab
+  GENERATED true)
+
+
+get_target_property(GENNMTAB_EXECUTABLE gennmtab LOCATION)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nametab.h
+  COMMAND ${GENNMTAB_EXECUTABLE} >nametab.h || { rm -f nametab.h\; false\; }
+  DEPENDS gennmtab)
+
+ensc_pkgconfig(xmlrpc_xmltok)
diff --git a/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake b/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
new file mode 100644
index 0000000..88e7ad8
--- /dev/null
+++ b/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
@@ -0,0 +1,9 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_xmltok
+Description: XMLRPC xmltok library
+Version:     @XMLRPC_C_VERSION@
+
+Libs:   	-L${libdir}
+Cflags:
diff --git a/lib/libutil/CMakeLists.txt b/lib/libutil/CMakeLists.txt
new file mode 100644
index 0000000..5e5d382
--- /dev/null
+++ b/lib/libutil/CMakeLists.txt
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+
+add_library(xmlrpc_util SHARED
+  casprintf.c
+  error.c
+  make_printable.c
+  memblock.c
+  resource.c
+  sleep.c)
+
+set_target_properties(xmlrpc_util
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+install(TARGETS xmlrpc_util
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib}
+  ARCHIVE DESTINATION ${_lib})
+
+ensc_pkgconfig(xmlrpc_util)
diff --git a/lib/libutil/xmlrpc_util.pc.cmake b/lib/libutil/xmlrpc_util.pc.cmake
new file mode 100644
index 0000000..98d24f4
--- /dev/null
+++ b/lib/libutil/xmlrpc_util.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_util
+Description: XMLRPC utility library
+Version:     @XMLRPC_C_VERSION@
+
+Libs:   	-L${libdir} -lxmlrpc_util
+Cflags:
diff --git a/lib/libwww_transport/CMakeLists.txt b/lib/libwww_transport/CMakeLists.txt
new file mode 100644
index 0000000..4744f9c
--- /dev/null
+++ b/lib/libwww_transport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_LIBWWW_CLIENT)
+endif(MUST_BUILD_LIBWWW_CLIENT)
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
new file mode 100644
index 0000000..be6ded2
--- /dev/null
+++ b/lib/util/CMakeLists.txt
@@ -0,0 +1,13 @@
+## -*- cmake -*-
+
+set(util_SOURCES
+  casprintf.c
+  cmdline_parser.c
+  getoptx.c
+  getoptx.h)
+
+if(WIN32)
+  list(APPEND util_SOURCES pthreadx_win32.c)
+endif(WIN32)
+
+add_library(util STATIC ${util_SOURCES})
diff --git a/lib/wininet_transport/CMakeLists.txt b/lib/wininet_transport/CMakeLists.txt
new file mode 100644
index 0000000..4f7408e
--- /dev/null
+++ b/lib/wininet_transport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_WININET_CLIENT)
+endif(MUST_BUILD_WININET_CLIENT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..b201fa1
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,106 @@
+# -*- cmake -*-
+
+if(ENABLE_LIBXML2_BACKEND)
+  set(xmlrpc_xml_parser xmlrpc_libxml2.c)
+  set(libxml_INCLUDES ${LIBXML2_CFLAGS})
+  set(libxml_LIBS     ${LIBXML2_LINK_FLAGS})
+  set(xmlrpc_pkgconfig_req ${libxml_pkgconfig})
+else(ENABLE_LIBXML2_BACKEND)
+  set(xmlrpc_xml_parser xmlrpc_expat.c)
+  set(libxml_INCLUDES -I${xmlrpc-c_SOURCE_DIR}/lib/expat/xmlparse)
+  set(libxml_LIBS xmlrpc_xmlparse)
+  set(xmlrpc_pkgconfig_req xmlrpc_xmlparse)
+endif(ENABLE_LIBXML2_BACKEND)
+
+if(MUST_BUILD_WININET_CLIENT)
+  set(client_wininet_CFLAGS "")
+  set(client_wininet_LIBS   "${WININET_LDADD}")
+  list(APPEND transport_SOURCES
+    ${wininet_srcdir}/xmlrpc_wininet_transport.c ${wininet_srcdir}/xmlrpc_wininet_transport.h)
+endif(MUST_BUILD_WININET_CLIENT)
+
+if(MUST_BUILD_LIBWWW_CLIENT)
+  set(client_libwww_CFLAGS "${LIBWWW_CFLAGS}")
+  set(client_libwww_LIBS   "${LIBWWW_LIBS}")
+  list(APPEND transport_SOURCES ${libwww_srcdir}/xmlrpc_libwww_transport.c ${libwww_srcdir}/xmlrpc_libwww_transport.h)
+endif(MUST_BUILD_LIBWWW_CLIENT)
+
+if(MUST_BUILD_CURL_CLIENT)
+  set(client_curl_CFLAGS ${CURL_CFLAGS})
+  set(client_curl_LIBS   ${CURL_LINK_FLAGS})
+  set(xmlrpc_client_pkgconfig_req libcurl)
+  list(APPEND transport_SOURCES ${curl_srcdir}/xmlrpc_curl_transport.c ${curl_srcdir}/xmlrpc_curl_transport.h)
+endif(MUST_BUILD_CURL_CLIENT)
+
+set(client_CFLAGS "-I${wininet_srcdir} -I${libwww_srcdir} -I${curl_srcdir} ${client_wininet_CFLAGS} ${client_libwww_CFLAGS} ${client_curl_CFLAGS}")
+set(client_LIBS   "${client_wininet_LIBS} ${client_libwww_LIBS} ${client_curl_LIBS}")
+
+
+add_subdirectory(cpp)
+add_subdirectory(test)
+
+
+
+### libxmlrpc.so
+add_library(xmlrpc SHARED
+  trace.c ${xmlrpc_xml_parser}
+  xmlrpc_data.c xmlrpc_datetime.c xmlrpc_array.c xmlrpc_struct.c
+  xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
+  xmlrpc_base64.c xmlrpc_utf8.c xmlrpc_authcookie.c)
+
+set_target_properties(xmlrpc
+  PROPERTIES
+  COMPILE_FLAGS ${libxml_INCLUDES})
+
+ensc_pkgconfig(xmlrpc)
+target_link_libraries(xmlrpc ${libxml_LIBS} xmlrpc_util)
+list(APPEND lib_TARGETS xmlrpc)
+
+### libxmlrpc_client.so
+add_library(xmlrpc_client SHARED
+  xmlrpc_client.c xmlrpc_client_global.c ${transport_SOURCES})
+
+target_link_libraries(xmlrpc_client xmlrpc ${client_LIBS})
+set_target_properties(xmlrpc_client
+  PROPERTIES
+  COMPILE_FLAGS "${client_CFLAGS}")
+list(APPEND lib_TARGETS xmlrpc_client)
+ensc_pkgconfig(xmlrpc_client)
+
+### libxmlrpc_server.so
+add_library(xmlrpc_server SHARED
+  registry.c system_method.c)
+target_link_libraries(xmlrpc_server xmlrpc)
+list(APPEND lib_TARGETS xmlrpc_server)
+ensc_pkgconfig(xmlrpc_server)
+
+
+### libxmlrpc_server_abyss.so
+add_library(xmlrpc_server_abyss SHARED
+  xmlrpc_server_abyss.c)
+target_link_libraries(xmlrpc_server_abyss xmlrpc_abyss xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server_abyss)
+ensc_pkgconfig(xmlrpc_server_abyss)
+
+
+
+### libxmlrpc_server_cgi.so
+add_library(xmlrpc_server_cgi SHARED
+  xmlrpc_server_cgi)
+target_link_libraries(xmlrpc_server_cgi xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server_cgi)
+ensc_pkgconfig(xmlrpc_server_cgi)
+
+
+install(TARGETS ${lib_TARGETS}
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib})
+
+set_target_properties(${lib_TARGETS}
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+
+enable_testing()
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
new file mode 100644
index 0000000..9ab2530
--- /dev/null
+++ b/src/cpp/CMakeLists.txt
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+####### libxmlrpc++.so
+add_library(xmlrpc++ SHARED
+  base64.cpp env_wrap.cpp fault.cpp girerr.cpp girmem.cpp
+  outcome.cpp param_list.cpp value.cpp xml.cpp)
+target_link_libraries(xmlrpc++ xmlrpc)
+list(APPEND lib_TARGETS xmlrpc++)
+ensc_pkgconfig(xmlrpc++)
+
+####### libxmlrpc_cpp.so
+add_library(xmlrpc_cpp            SHARED XmlRpcCpp)
+target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server xmlrpc_client)
+list(APPEND lib_TARGETS xmlrpc_cpp)
+ensc_pkgconfig(xmlrpc_cpp)
+
+####### libxmlrpc_server++.so
+add_library(xmlrpc_server++       SHARED registry.cpp)
+target_link_libraries(xmlrpc_server++ xmlrpc++ xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server++)
+ensc_pkgconfig(xmlrpc_server++)
+
+####### libxmlrpc_server_abyss++.so
+add_library(xmlrpc_server_abyss++ SHARED server_abyss.cpp)
+target_link_libraries(xmlrpc_server_abyss++ xmlrpc_server++ xmlrpc_server_abyss)
+list(APPEND lib_TARGETS xmlrpc_server_abyss++)
+ensc_pkgconfig(xmlrpc_server_abyss++)
+
+####### libxmlrpc_client++.so
+add_library(xmlrpc_client++       SHARED
+  client.cpp client_simple.cpp curl.cpp libwww.cpp wininet.cpp)
+set_target_properties(xmlrpc_client++
+  PROPERTIES
+  COMPILE_FLAGS "-I${wininet_srcdir} -I${libwww_srcdir} -I${curl_srcdir}")
+target_link_libraries(xmlrpc_client++ xmlrpc++ xmlrpc_client)
+list(APPEND lib_TARGETS xmlrpc_client++)
+ensc_pkgconfig(xmlrpc_client++)
+
+
+install(TARGETS ${lib_TARGETS}
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib})
+
+set_target_properties(${lib_TARGETS}
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
diff --git a/src/cpp/xmlrpc++.pc.cmake b/src/cpp/xmlrpc++.pc.cmake
new file mode 100644
index 0000000..cda7f56
--- /dev/null
+++ b/src/cpp/xmlrpc++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc++
+Description: XMLRPC C++ Base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc
+Libs:   		-L${libdir} -lxmlrpc++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_client++.pc.cmake b/src/cpp/xmlrpc_client++.pc.cmake
new file mode 100644
index 0000000..188b3a6
--- /dev/null
+++ b/src/cpp/xmlrpc_client++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_client++
+Description: XMLRPC C++ Client library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc++ xmlrpc_client
+Libs:   		-L${libdir} -lxmlrpc_client++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_cpp.pc.cmake b/src/cpp/xmlrpc_cpp.pc.cmake
new file mode 100644
index 0000000..b8f5af3
--- /dev/null
+++ b/src/cpp/xmlrpc_cpp.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_cpp
+Description: XMLRPC CPP library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc xmlrpc_server xmlrpc_client
+Libs:   		-L${libdir} -lxmlrpc_cpp
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_server++.pc.cmake b/src/cpp/xmlrpc_server++.pc.cmake
new file mode 100644
index 0000000..07b9e7b
--- /dev/null
+++ b/src/cpp/xmlrpc_server++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server++
+Description: XMLRPC C++ Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc++ xmlrpc_server
+Libs:   		-L${libdir} -lxmlrpc_server++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_server_abyss++.pc.cmake b/src/cpp/xmlrpc_server_abyss++.pc.cmake
new file mode 100644
index 0000000..d9eb456
--- /dev/null
+++ b/src/cpp/xmlrpc_server_abyss++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_abyss++
+Description: XMLRPC C++ Abyss-Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server_abyss xmlrpc_server++
+Libs:   		-L${libdir} -lxmlrpc_server_abyss++
+Cflags:		-I${includedir}
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
new file mode 100644
index 0000000..3deb9cb
--- /dev/null
+++ b/src/test/CMakeLists.txt
@@ -0,0 +1,27 @@
+# -*- cmake -*-
+
+set(test_SOURCES
+  test.c abyss.c cgi.c method_registry.c parse_xml.c serialize.c server_abyss.c
+  value.c xml_data.c)
+
+if(MUST_BUILD_CLIENT)
+  list(APPEND test_SOURCES client.c)
+  list(APPEND test_LIBS xmlrpc_client)
+else(MUST_BUILD_CLIENT)
+  list(APPEND test_SOURCES client_dummy.c)
+endif(MUST_BUILD_CLIENT)
+
+
+add_executable(src-test ${test_SOURCES})
+target_link_libraries(src-test xmlrpc_server_abyss util ${test_LIBS})
+
+add_executable(cgitest1 cgitest1.c)
+target_link_libraries(cgitest1 xmlrpc_server_cgi)
+
+add_custom_command(TARGET src-test
+  POST_BUILD
+  COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/data
+  COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR})
+
+enable_testing()
+add_test(runtests src-test)
diff --git a/src/xmlrpc.pc.cmake b/src/xmlrpc.pc.cmake
new file mode 100644
index 0000000..fd0c872
--- /dev/null
+++ b/src/xmlrpc.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc
+Description: XMLRPC base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	@xmlrpc_pkgconfig_req@ xmlrpc_util
+Libs:   		-L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_client.pc.cmake b/src/xmlrpc_client.pc.cmake
new file mode 100644
index 0000000..16bdd22
--- /dev/null
+++ b/src/xmlrpc_client.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_client
+Description: XMLRPC client library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc @xmlrpc_client_pkgconfig_req@
+Libs:   		-L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server.pc.cmake b/src/xmlrpc_server.pc.cmake
new file mode 100644
index 0000000..ca7224c
--- /dev/null
+++ b/src/xmlrpc_server.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server
+Description: XMLRPC Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc
+Libs:   		-L${libdir} -lxmlrpc_server
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server_abyss.pc.cmake b/src/xmlrpc_server_abyss.pc.cmake
new file mode 100644
index 0000000..7fbecc9
--- /dev/null
+++ b/src/xmlrpc_server_abyss.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_abyss
+Description: XMLRPC Server Abyss library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server xmlrpc_abyss
+Libs:   		-L${libdir} -lxmlrpc_server_abyss
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server_cgi.pc.cmake b/src/xmlrpc_server_cgi.pc.cmake
new file mode 100644
index 0000000..8042912
--- /dev/null
+++ b/src/xmlrpc_server_cgi.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_cgi
+Description: XMLRPC CGI-Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server
+Libs:   		-L${libdir} -lxmlrpc_server_cgi
+Cflags:		-I${includedir}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000..14010f4
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+add_subdirectory(binmode-rpc-kit)
+add_subdirectory(turbocharger)
+
+add_subdirectory(xmlrpc)
+add_subdirectory(xmlrpc_transport)
+
+add_subdirectory(xml-rpc-api2cpp )
diff --git a/tools/binmode-rpc-kit/CMakeLists.txt b/tools/binmode-rpc-kit/CMakeLists.txt
new file mode 100644
index 0000000..a707c75
--- /dev/null
+++ b/tools/binmode-rpc-kit/CMakeLists.txt
@@ -0,0 +1,2 @@
+# -*- cmake -*-
+
diff --git a/tools/turbocharger/CMakeLists.txt b/tools/turbocharger/CMakeLists.txt
new file mode 100644
index 0000000..342423d
--- /dev/null
+++ b/tools/turbocharger/CMakeLists.txt
@@ -0,0 +1 @@
+# -*- cmake -*-
diff --git a/tools/xml-rpc-api2cpp/CMakeLists.txt b/tools/xml-rpc-api2cpp/CMakeLists.txt
new file mode 100644
index 0000000..c759dec
--- /dev/null
+++ b/tools/xml-rpc-api2cpp/CMakeLists.txt
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+add_executable(xml-rpc-api2cpp
+  xml-rpc-api2cpp.cpp
+  DataType.cpp
+  XmlRpcFunction.cpp
+  XmlRpcClass.cpp
+  SystemProxy.cpp)
+target_link_libraries(xml-rpc-api2cpp xmlrpc_cpp xmlrpc_client xmlrpc_server)
+
+install(TARGETS xml-rpc-api2cpp
+  RUNTIME DESTINATION bin)
+
+install(FILES xml-rpc-api2cpp.1
+  DESTINATION ${mandir}/man1)
diff --git a/tools/xmlrpc/CMakeLists.txt b/tools/xmlrpc/CMakeLists.txt
new file mode 100644
index 0000000..976df30
--- /dev/null
+++ b/tools/xmlrpc/CMakeLists.txt
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+add_executable(tool-xmlrpc
+  xmlrpc.c
+  dumpvalue.c
+  dumpvalue.h)
+target_link_libraries(tool-xmlrpc xmlrpc_client util)
+
+set_target_properties(tool-xmlrpc
+  PROPERTIES OUTPUT_NAME xmlrpc)
+
+install(TARGETS tool-xmlrpc
+  DESTINATION ${_bin})
+
+ensc_set_link_exe_flags(tool-xmlrpc)
diff --git a/tools/xmlrpc/config.h b/tools/xmlrpc/config.h
new file mode 100644
index 0000000..7409aed
--- /dev/null
+++ b/tools/xmlrpc/config.h
@@ -0,0 +1 @@
+#include <xmlrpc_config.h>
diff --git a/tools/xmlrpc_transport/CMakeLists.txt b/tools/xmlrpc_transport/CMakeLists.txt
new file mode 100644
index 0000000..b73d7c0
--- /dev/null
+++ b/tools/xmlrpc_transport/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+add_executable(xmlrpc_transport xmlrpc_transport.c)
+target_link_libraries(xmlrpc_transport xmlrpc_client util)
+
+install(TARGETS xmlrpc_transport
+  DESTINATION ${_bin})
+
+ensc_set_link_exe_flags(xmlrpc_transport)
diff --git a/tools/xmlrpc_transport/config.h b/tools/xmlrpc_transport/config.h
new file mode 100644
index 0000000..7409aed
--- /dev/null
+++ b/tools/xmlrpc_transport/config.h
@@ -0,0 +1 @@
+#include <xmlrpc_config.h>
diff --git a/transport_config.h.cmake b/transport_config.h.cmake
new file mode 100644
index 0000000..1ec3cf6
--- /dev/null
+++ b/transport_config.h.cmake
@@ -0,0 +1,16 @@
+/* -*- c -*- */
+#define MUST_BUILD_WININET_CLIENT	@_MUST_BUILD_WININET_CLIENT@
+#define MUST_BUILD_LIBWWW_CLIENT	@_MUST_BUILD_LIBWWW_CLIENT@
+#define MUST_BUILD_CURL_CLIENT		@_MUST_BUILD_CURL_CLIENT@
+
+static char const * const XMLRPC_DEFAULT_TRANSPORT =
+#if MUST_BUILD_LIBWWW_CLIENT
+  "libwww"
+#elif MUST_BUILD_CURL_CLIENT
+  "curl"
+#elif MUST_BUILD_WININET_CLIENT
+  "wininet"
+#else
+#  error "no client XML transport configured"
+#endif
+  ;
diff --git a/version.h.cmake b/version.h.cmake
new file mode 100644
index 0000000..35beafc
--- /dev/null
+++ b/version.h.cmake
@@ -0,0 +1,2 @@
+/* This file was generated by a make rule */
+#define XMLRPC_C_VERSION "@XMLRPC_C_VERSION@"
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
index 0000000..e8ba549
--- /dev/null
+++ b/xmlrpc-c-config
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+comp=
+
+need_cxx=
+need_client=
+need_server=
+need_abyss=
+
+while test $# -gt 0; do
+    case $1 in
+      (c++)          		comp="$comp xmlrpc_cpp";;
+      (server-util)  		comp="$comp xmlrpc_server_util";;
+      (cgi-server)   		comp="$comp xmlrpc_server_cgi";;
+      (c++2)         		need_cxx=1;;
+      (abyss-server) 		need_abyss=1;;
+      (client|libwww-client)	need_client=1;;
+      (--) shift; break;;
+      (--*) break;;
+      (*)
+      echo "Unrecognized token '$1'"
+      exit 1
+      ;;
+    esac
+    shift
+done
+
+if test -z "$need_cxx"; then
+    test -z "$need_client" || comp="$comp xmlrpc_client"
+    test -z "$need_abyss"  || comp="$comp xmlrpc_abyss"
+    test -z "$need_server" || comp="$comp xmlrpc_server"
+else
+    test -z "$need_client" || comp="$comp xmlrpc_client++"
+    test -z "$need_abyss"  || comp="$comp xmlrpc_abyss++"
+    test -z "$need_server" || comp="$comp xmlrpc_server++"
+fi
+
+exec pkg-config "$@" $comp
diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake
new file mode 100644
index 0000000..98b37ef
--- /dev/null
+++ b/xmlrpc_config.h.cmake
@@ -0,0 +1,21 @@
+/* -*- c -*- */
+
+#ifndef H_XMLRPC_C_CONFIG_H
+
+#cmakedefine			HAVE_WCHAR_H
+#cmakedefine			HAVE_SETENV
+#define HAVE_SYS_IOCTL_H	0 at HAVE_SYS_IOCTL_H@
+
+#define VA_LIST_IS_ARRAY	@VA_LIST_IS_ARRAY@
+#define XMLRPC_HAVE_WCHAR	@XMLRPC_HAVE_WCHAR@
+#define ATTR_UNUSED		@ATTR_UNUSED@
+#define DIRECTORY_SEPARATOR	"@DIRECTORY_SEPARATOR@"
+
+#ifdef HAVE_WCHAR_H
+#  define HAVE_UNICODE_WCHAR	1
+#else
+#  define HAVE_UNICODE_WCHAR	0
+#endif
+
+
+#endif
-- 
1.4.2.1



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/xmlrpc-c.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmlrpc-c.spec	4 Jun 2006 16:38:35 -0000	1.3
+++ xmlrpc-c.spec	2 Oct 2006 15:10:48 -0000	1.4
@@ -4,19 +4,18 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.05
-Release:	%release_func 1
+Version:	1.06.05
+Release:	%release_func 2
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
 Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
-Patch0:		xmlrpc-c-1.04-libxml2.patch
-Patch2:		xmlrpc-c-1.05-gcc41.patch
 Patch3:		xmlrpc-c-1.05-typo.patch
-Patch4:		xmlrpc-c-1.05-libtool.patch
-Patch5:		xmlrpc-c-1.05-buildsys.patch
+Patch6:		xmlrpc-c-1.06.04-sizet.patch
+Patch100:	http://ensc.de/xmlrpc-c/0001-make-cmake-transition.txt
 BuildRoot:	%_tmppath/%name-%version-%release-root
 #BuildRequires:	w3c-libwww-devel
+BuildRequires:	cmake
 BuildRequires:	curl-devel libxml2-devel
 
 %package devel
@@ -24,6 +23,7 @@
 Group:		Development/Libraries
 Requires:	%name = %version-%release
 Requires:	libxml2-devel curl-devel
+Requires:	pkgconfig
 
 %package apps
 Summary:	Sample XML-RPC applications
@@ -54,44 +54,40 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .libxml2
-%patch2 -p1 -b .gcc41
 %patch3 -p1 -b .typo
-%patch4 -p1 -b .libtool
-%patch5 -p1 -b .buildsys
+%patch6 -p1 -b .sizet
+
+cat %PATCH100 | patch -p1
+
+sed -i -e '/\(chan\|init\.c\)/d' lib/abyss/src/CMakeLists.txt
+sed -i -e 's!xmlrpc_decompose.c!xmlrpc_builddecomp.c!g;
+           s!xmlrpc_build.c!!g;' src/CMakeLists.txt
+sed -i -e 's! abyss.c!!g;' src/test/CMakeLists.txt
 
 ## not needed...
 rm doc/{INSTALL,configure_doc}
 
 
 %build
-%configure --enable-libxml2-backend --disable-libwww-client
-
-sed -i -e 's!-L/usr/%_lib\s\s*!!g;
-	   s!-L/usr/%_lib"!"!g;
-	   s!\(the_\S*rpath=\)\"..*\"!\1!g' xmlrpc-c-config
-
-%__make \
-	CFLAGS_COMMON="-DNDEBUG -fno-common $RPM_OPT_FLAGS"	\
-	CXXFLAGS_COMMON="-DNDEBUG $RPM_OPT_FLAGS"		\
-	#%{?_smp_mflags}
+mkdir fedora
+cd fedora
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+cmake .. \
+	-D_lib:STRING=%_lib			\
+	-DMUST_BUILD_CURL_CLIENT:BOOL=ON	\
+	-DMUST_BUILD_LIBWWW_CLIENT:BOOL=OFF	\
+        -DCMAKE_INSTALL_PREFIX:PATH=%_prefix	\
+        -DBUILD_SHARED_LIBS:BOOL=ON
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%__make DESTDIR="$RPM_BUILD_ROOT" install
-
-%__install -d -m0755 $RPM_BUILD_ROOT%_mandir/man1
+cd fedora
+make install DESTDIR=$RPM_BUILD_ROOT
 
-F=tools/xml-rpc-api2cpp/xml-rpc-api2cpp
-./libtool --mode=install %__install -p -m755 $F $RPM_BUILD_ROOT/%_bindir/
-%__install -p -m0644 $F.1 $RPM_BUILD_ROOT%_mandir/man1/
-
-for i in $RPM_BUILD_ROOT%_libdir/*.a; do
-	test ! -e "${i%%.a}.so" || rm -f $i
-done
-
-rm -f $RPM_BUILD_ROOT%_libdir/*.la
+chmod +x $RPM_BUILD_ROOT%_libdir/*.so
 
 
 %clean
@@ -112,6 +108,7 @@
 %defattr(-,root,root,-)
 %_bindir/xmlrpc-c-config
 %_includedir
+%_libdir/pkgconfig/*.pc
 %_libdir/*.so
 
 
@@ -126,6 +123,19 @@
 
 
 %changelog
+* Mon Oct  2 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-2
+- updated cmake patch
+- strip installed libraries
+
+* Wed Sep 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-1
+- updated to 1.06.05
+- merged + updated patches
+
+* Sat Sep 16 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.04-1
+- updated to 1.06.04
+- patched the broken buildsystem
+- disabled libwww backend explicitely
+
 * Sun Jun  4 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.05-1
 - updated to 1.05
 - updated patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jun 2006 16:38:35 -0000	1.3
+++ sources	2 Oct 2006 15:10:48 -0000	1.4
@@ -1 +1 @@
-60d59b39f13d21c3db9285274ea23bab  xmlrpc-c-1.05.tgz
+69f3644da7b8e9d13482c82838a4005a  xmlrpc-c-1.06.05.tgz


--- xmlrpc-c-1.05-libtool.patch DELETED ---


--- xmlrpc-c-1.05-gcc41.patch DELETED ---


--- xmlrpc-c-1.05-buildsys.patch DELETED ---


--- xmlrpc-c-1.04-libxml2.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 15:23:35 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 08:23:35 -0700
Subject: rpms/php-pear-PHP-CompatInfo/devel xml2changelog, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 php-pear-PHP-CompatInfo.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610021523.k92FNb97028991@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28969

Modified Files:
	.cvsignore php-pear-PHP-CompatInfo.spec sources 
Added Files:
	xml2changelog 
Log Message:
	upgrade to 1.4.0



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2006 15:30:31 -0000	1.2
+++ .cvsignore	2 Oct 2006 15:23:35 -0000	1.3
@@ -1 +1 @@
-PHP_CompatInfo-1.3.2.tgz
+PHP_CompatInfo-1.4.0.tgz


Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-PHP-CompatInfo.spec	12 Sep 2006 15:30:31 -0000	1.1
+++ php-pear-PHP-CompatInfo.spec	2 Oct 2006 15:23:35 -0000	1.2
@@ -2,7 +2,7 @@
 %define pear_name PHP_CompatInfo
 
 Name:           php-pear-PHP-CompatInfo
-Version:        1.3.2
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions n??cessaires ?? l'ex??cution d'un code
@@ -12,11 +12,12 @@
 URL:            http://pear.php.net/package/PHP_CompatInfo
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  dos2unix php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.3 php-pear(Console_Getopt) >= 1.2 php-pear(Console_Table) >= 1.0.5
+Requires:       php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.1 php-pear(Console_Table) >= 1.0.5
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -36,6 +37,7 @@
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
@@ -85,12 +87,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/tests %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
+%doc CHANGELOG LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/tests %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
 %{pear_phpdir}/PHP
 %{pear_xmldir}/%{pear_name}.xml
 %{_bindir}/pcicmd
 
 %changelog
+* Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
+- upgrade to 1.4.0
+- Change Requires from Console_Getopt to Console_Getargs
+
 * Mon Sep 11 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
 - generated specfile (pear make-rpm-spec) + cleaning
 - add french summary and description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2006 15:30:31 -0000	1.2
+++ sources	2 Oct 2006 15:23:35 -0000	1.3
@@ -1 +1 @@
-1198ca0995f7d75336b90d786253de5e  PHP_CompatInfo-1.3.2.tgz
+0e7da112542fa124f7b523cb09c7624a  PHP_CompatInfo-1.4.0.tgz



From fedora-extras-commits at redhat.com  Mon Oct  2 15:25:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon,  2 Oct 2006 08:25:41 -0700
Subject: rpms/kannel/devel .cvsignore, 1.3, 1.4 kannel.init, 1.1,
	1.2 kannel.spec, 1.11, 1.12 sources, 1.3,
	1.4 kannel-1.4.0-depend.patch, 1.1, NONE
Message-ID: <200610021525.k92FPhS4029057@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29032

Modified Files:
	.cvsignore kannel.init kannel.spec sources 
Removed Files:
	kannel-1.4.0-depend.patch 
Log Message:
Update kannel to 1.4.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 18:06:30 -0000	1.3
+++ .cvsignore	2 Oct 2006 15:25:40 -0000	1.4
@@ -1 +1 @@
-gateway-1.4.0.tar.bz2
+gateway-1.4.1.tar.bz2


Index: kannel.init
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kannel.init	17 Nov 2005 12:25:54 -0000	1.1
+++ kannel.init	2 Oct 2006 15:25:40 -0000	1.2
@@ -34,6 +34,10 @@
 	RETVAL_BEARER=$?
 	echo
 
+	# It seems like the bearerbox may need to settle before accepting
+	# connections from wapbox and smsbox
+	sleep 3s
+
 	# Starting wap and sms only makes sense if bearerbox is running
 	if [ $RETVAL_BEARER -eq 0 ]; then
 	  if grep "^group = wapbox" $config &>/dev/null; then


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kannel.spec	28 Aug 2006 11:24:21 -0000	1.11
+++ kannel.spec	2 Oct 2006 15:25:40 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.0
-Release: 9%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -9,15 +9,16 @@
 Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
-Patch: kannel-1.4.0-depend.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, flex, ImageMagick
-BuildRequires: libxml2-devel, openssl-devel, zlib-devel
-BuildRequires: pcre-devel
+BuildRequires: bison, byacc, flex
+BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
 # DB backends
-BuildRequires: sqlite2-devel
-# For the docs... I think we need transfig too, so disable for now.
-#BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+BuildRequires: sqlite-devel
+%{?_with_mysql:Buildrequires: mysql-devel}
+%{?_with_pgsql:Buildrequires: postgresql-devel}
+# For the docs...
+BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+BuildRequires: ImageMagick, transfig
 
 %description
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -47,15 +48,18 @@
 
 %prep
 %setup -n gateway-%{version}
-%patch -p0 -b .depend
 
 
 %build
 %configure \
-    --enable-start-stop-daemon \
     --enable-pcre \
-    --with-sqlite
-%{__make} %{?_smp_mflags}
+    --enable-docs \
+    --enable-start-stop-daemon \
+    %{?_with_mysql} \
+    --with-sqlite3 \
+    %{?_with_pgsql}
+# Remove %{?_smp_mflags} since the docs fail to build with it
+%{__make}
 
 
 %install
@@ -103,7 +107,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
 %attr(0640, kannel, kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
 %config %{_sysconfdir}/rc.d/init.d/kannel
@@ -121,6 +125,14 @@
 
 
 %changelog
+* Mon Oct  2 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-1
+- Update to 1.4.1.
+- Remove obsolete depend patch.
+- Add 3s sleep sfter bearerbox start to let it settle before connections.
+- Switch sqlite backend from sqlite2 to new sqlite3.
+- Add conditional --with mysql and pgsql rebuild support.
+- Re-enable building the doc since transfig is now available and include PDFs.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.0-9
 - FC6 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jan 2005 18:06:30 -0000	1.3
+++ sources	2 Oct 2006 15:25:40 -0000	1.4
@@ -1 +1 @@
-2ef0544002be48669d7f0f29f9f470de  gateway-1.4.0.tar.bz2
+ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2


--- kannel-1.4.0-depend.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 15:25:49 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 08:25:49 -0700
Subject: rpms/php-pear-PHP-CompatInfo/devel php-pear-PHP-CompatInfo.spec, 1.2,
	1.3
Message-ID: <200610021525.k92FPpH2029078@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29061

Modified Files:
	php-pear-PHP-CompatInfo.spec 
Log Message:
	



Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-PHP-CompatInfo.spec	2 Oct 2006 15:23:35 -0000	1.2
+++ php-pear-PHP-CompatInfo.spec	2 Oct 2006 15:25:49 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           php-pear-PHP-CompatInfo
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions n??cessaires ?? l'ex??cution d'un code
 



From fedora-extras-commits at redhat.com  Mon Oct  2 15:36:45 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 08:36:45 -0700
Subject: rpms/php-pear-PHP-CompatInfo/FC-5 .cvsignore, 1.2,
	1.3 php-pear-PHP-CompatInfo.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610021536.k92FalfQ029217@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29196

Modified Files:
	.cvsignore php-pear-PHP-CompatInfo.spec sources 
Log Message:
	ugrade to 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2006 15:30:31 -0000	1.2
+++ .cvsignore	2 Oct 2006 15:36:45 -0000	1.3
@@ -1 +1 @@
-PHP_CompatInfo-1.3.2.tgz
+PHP_CompatInfo-1.4.0.tgz


Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-PHP-CompatInfo.spec	12 Sep 2006 17:25:54 -0000	1.2
+++ php-pear-PHP-CompatInfo.spec	2 Oct 2006 15:36:45 -0000	1.3
@@ -2,8 +2,8 @@
 %define pear_name PHP_CompatInfo
 
 Name:           php-pear-PHP-CompatInfo
-Version:        1.3.2
-Release:        1%{?dist}.1
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions n??cessaires ?? l'ex??cution d'un code
 
@@ -12,11 +12,12 @@
 URL:            http://pear.php.net/package/PHP_CompatInfo
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  dos2unix php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.3 php-pear(Console_Getopt) >= 1.2 php-pear(Console_Table) >= 1.0.5
+Requires:       php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.1 php-pear(Console_Table) >= 1.0.5
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -36,6 +37,7 @@
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
@@ -85,14 +87,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/tests %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
+%doc CHANGELOG LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/tests %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
 %{pear_phpdir}/PHP
 %{pear_xmldir}/%{pear_name}.xml
 %{_bindir}/pcicmd
 
 %changelog
-* Tue Sep 12 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1.fc5.1
-- FC5 build
+* Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
+- upgrade to 1.4.0
+- Change Requires from Console_Getopt to Console_Getargs
 
 * Mon Sep 11 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
 - generated specfile (pear make-rpm-spec) + cleaning


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2006 15:30:31 -0000	1.2
+++ sources	2 Oct 2006 15:36:45 -0000	1.3
@@ -1 +1 @@
-1198ca0995f7d75336b90d786253de5e  PHP_CompatInfo-1.3.2.tgz
+0e7da112542fa124f7b523cb09c7624a  PHP_CompatInfo-1.4.0.tgz



From fedora-extras-commits at redhat.com  Mon Oct  2 15:38:17 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 08:38:17 -0700
Subject: rpms/php-pear-PHP-CompatInfo/FC-5 xml2changelog,NONE,1.1
Message-ID: <200610021538.k92FcJKf029283@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29267

Added Files:
	xml2changelog 
Log Message:
	



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>



From fedora-extras-commits at redhat.com  Mon Oct  2 15:59:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 08:59:16 -0700
Subject: rpms/maxima/devel maxima-5.10.0-xdg_open.patch, NONE,
	1.1 maxima.spec, 1.39, 1.40 maxima-5.9.2-htmlview.patch, 1.1, NONE
Message-ID: <200610021559.k92FxI98029534@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29514

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.10.0-xdg_open.patch 
Removed Files:
	maxima-5.9.2-htmlview.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-3
- htmlview -> xdg-open


maxima-5.10.0-xdg_open.patch:

--- NEW FILE maxima-5.10.0-xdg_open.patch ---
--- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2004-10-16 10:37:53.000000000 -0500
+++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-08-22 07:27:23.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- maxima.spec	27 Sep 2006 13:42:58 -0000	1.39
+++ maxima.spec	2 Oct 2006 15:59:16 -0000	1.40
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -44,7 +44,7 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.9.2-htmlview.patch
+Patch1: maxima-5.10.0-xdg_open.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
@@ -96,6 +96,8 @@
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
+Requires: xdg-open
+#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -180,7 +182,7 @@
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%patch1 -p1 -b .htmlview
+%patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
 %if "%{?fedora}" > "3"
@@ -384,6 +386,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-3
+- htmlview -> xdg-open
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17
 


--- maxima-5.9.2-htmlview.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 16:00:36 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 09:00:36 -0700
Subject: rpms/piklab/devel piklab.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610021600.k92G0cQB029619@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600

Modified Files:
	piklab.spec sources 
Log Message:
Upstream rebuilt tarball :-(


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- piklab.spec	2 Oct 2006 13:24:47 -0000	1.4
+++ piklab.spec	2 Oct 2006 16:00:36 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -124,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-3
+  - Upstream rebuilt tarball :-(
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-2
   - Add BR gettext since there is now translation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 11:38:45 -0000	1.3
+++ sources	2 Oct 2006 16:00:36 -0000	1.4
@@ -1 +1 @@
-2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2
+04d5aa820fadfe547951e1abfb651a1e  piklab-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 16:01:24 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 09:01:24 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200610021601.k92G1xvA032497@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32456

Modified Files:
	piklab.spec sources 
Log Message:
Upstream rebuilt tarball :-(


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- piklab.spec	2 Oct 2006 13:25:25 -0000	1.3
+++ piklab.spec	2 Oct 2006 16:01:24 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -124,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-3
+  - Upstream rebuilt tarball :-(
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-2
   - Add BR gettext since there is now translation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 11:39:54 -0000	1.3
+++ sources	2 Oct 2006 16:01:24 -0000	1.4
@@ -1 +1 @@
-2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2
+04d5aa820fadfe547951e1abfb651a1e  piklab-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 16:01:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:01:44 -0700
Subject: rpms/maxima/devel maxima.spec,1.40,1.41
Message-ID: <200610021602.k92G2J6Q032539@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32478

Modified Files:
	maxima.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
- -gui: htmlview -> xdg-open,Requires: xdg-utils



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- maxima.spec	2 Oct 2006 15:59:16 -0000	1.40
+++ maxima.spec	2 Oct 2006 16:01:44 -0000	1.41
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -96,7 +96,7 @@
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
-Requires: xdg-open
+Requires: xdg-utils
 #Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
@@ -386,8 +386,8 @@
 
 
 %changelog
-* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-3
-- htmlview -> xdg-open
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
+- -gui: htmlview -> xdg-open,Requires: xdg-utils
 
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17



From fedora-extras-commits at redhat.com  Mon Oct  2 16:03:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:03:25 -0700
Subject: fedora-rpmdevtools rpmdevtools.spec, 1.16, 1.17 rpmdev-rmdevelrpms,
	1.1, 1.2
Message-ID: <200610021603.k92G3PwE032615@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32595

Modified Files:
	rpmdevtools.spec rpmdev-rmdevelrpms 
Log Message:
Treat yasm and *-static as devel packages in rmdevelrpms.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpmdevtools.spec	9 Sep 2006 17:04:18 -0000	1.16
+++ rpmdevtools.spec	2 Oct 2006 16:03:21 -0000	1.17
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.7
 
 Name:           rpmdevtools
-Version:        5.1
+Version:        5.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
+- Treat yasm and *-static as devel packages in rmdevelrpms.
+
 * Sat Sep  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.1-1
 - Re-add PHP PEAR spec template, more improvements to it (#198706,
   Christopher Stone, Remi Collet).


Index: rpmdev-rmdevelrpms
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-rmdevelrpms,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmdev-rmdevelrpms	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-rmdevelrpms	2 Oct 2006 16:03:21 -0000	1.2
@@ -24,10 +24,10 @@
 import getopt, os, re, rpm, stat, sys, types
 
 
-__version__ = "1.2"
+__version__ = "1.3"
 
 
-dev_re  = re.compile("-(?:de(?:buginfo|vel)|sdk)\\b", re.IGNORECASE)
+dev_re  = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE)
 test_re = re.compile("^perl-(?:Devel|ExtUtils|Test)-")
 lib_re1 = re.compile("^lib.+")
 lib_re2 = re.compile("-libs?$")
@@ -45,7 +45,7 @@
  "gcc-objc", "gcc32", "gcc34", "gcc34-c++", "gcc34-java", "gcc35", "gcc35-c++",
  "gcc4", "gcc4-c++", "gcc4-gfortran", "gettext", "glade", "glade2",
  "kernel-source", "kernel-sourcecode", "libtool", "m4", "nasm",
- "perl-Module-Build", "pkgconfig", "qt-designer", "swig", "texinfo",
+ "perl-Module-Build", "pkgconfig", "qt-designer", "swig", "texinfo", "yasm",
  )
 
 # zlib-devel: see #151622
@@ -109,12 +109,12 @@
 
 By default, the following packages are treated as development ones and are
 thus candidates for removal: any package whose name matches "-devel\\b",
-"-debuginfo\\b", or "-sdk\\b" (case insensitively) except gcc requirements;
-any package whose name starts with "perl-(Devel|ExtUtils|Test)-"; any package
-whose name starts with "compat-gcc"; packages in the internal list of known
-development oriented packages (see def_devpkgs in the source code); packages
-determined to be development ones based on some basic heuristic checks on the
-package\'s contents.
+"-debuginfo\\b", "-sdk\\b", or "-static\\b" (case insensitively) except gcc
+requirements; any package whose name starts with "perl-(Devel|ExtUtils|Test)-";
+any package whose name starts with "compat-gcc"; packages in the internal list
+of known development oriented packages (see def_devpkgs in the source code);
+packages determined to be development ones based on some basic heuristic
+checks on the package\'s contents.
 
 The default set of packages above is not intended to not reduce a system into
 a minimal clean build root, but to keep it usable for general purposes while



From fedora-extras-commits at redhat.com  Mon Oct  2 16:16:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:16:05 -0700
Subject: fedora-rpmdevtools check-buildroot, 1.6, 1.7 rpmdevtools.spec, 1.17,
	1.18
Message-ID: <200610021616.k92GG5bU032759@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32737

Modified Files:
	check-buildroot rpmdevtools.spec 
Log Message:
Skip *.jar.so.debug in check-buildroot (#208903).


Index: check-buildroot
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/check-buildroot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- check-buildroot	18 Aug 2005 06:04:06 -0000	1.6
+++ check-buildroot	2 Oct 2006 16:16:03 -0000	1.7
@@ -27,7 +27,7 @@
 
 find "$RPM_BUILD_ROOT" \! \( \
     -name '*.pyo' -o -name '*.pyc' -o -name '*.elc' -o -name '.packlist' \
-    \) -type f -print0 | \
+    -o -name '*.jar.so.debug' \) -type f -print0 | \
     LANG=C xargs -0r grep -F "$RPM_BUILD_ROOT" >$tmp
 
 test -s "$tmp" && {


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmdevtools.spec	2 Oct 2006 16:03:21 -0000	1.17
+++ rpmdevtools.spec	2 Oct 2006 16:16:03 -0000	1.18
@@ -121,6 +121,7 @@
 
 %changelog
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
+- Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.
 
 * Sat Sep  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.1-1



From fedora-extras-commits at redhat.com  Mon Oct  2 16:16:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:16:51 -0700
Subject: fedora-rpmdevtools configure.ac,1.4,1.5
Message-ID: <200610021616.k92GGpUW000343@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv324

Modified Files:
	configure.ac 
Log Message:
5.2.


Index: configure.ac
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.ac	9 Sep 2006 17:04:18 -0000	1.4
+++ configure.ac	2 Oct 2006 16:16:49 -0000	1.5
@@ -1,4 +1,4 @@
-AC_INIT(rpmdevtools, 5.1)
+AC_INIT(rpmdevtools, 5.2)
 AM_INIT_AUTOMAKE
 AC_PATH_PROG(HELP2MAN,help2man)
 AC_PATH_PROG(WGET,wget)



From fedora-extras-commits at redhat.com  Mon Oct  2 16:29:07 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:29:07 -0700
Subject: rpms/rpmdevtools/FC-5 .cvsignore, 1.3, 1.4 rpmdevtools.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610021629.k92GT9j0000494@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv453/FC-5

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
- Skip *.jar.so.debug in check-buildroot (#208903).
- Treat yasm and *-static as devel packages in rmdevelrpms.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2006 21:00:26 -0000	1.3
+++ .cvsignore	2 Oct 2006 16:29:07 -0000	1.4
@@ -1,2 +1,2 @@
 spectool-1.0.7.tar.bz2
-rpmdevtools-5.1.tar.bz2
+rpmdevtools-5.2.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/rpmdevtools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmdevtools.spec	12 Sep 2006 21:00:26 -0000	1.3
+++ rpmdevtools.spec	2 Oct 2006 16:29:07 -0000	1.4
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.7
 
 Name:           rpmdevtools
-Version:        5.1
+Version:        5.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,10 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
+- Skip *.jar.so.debug in check-buildroot (#208903).
+- Treat yasm and *-static as devel packages in rmdevelrpms.
+
 * Sat Sep  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.1-1
 - Re-add PHP PEAR spec template, more improvements to it (#198706,
   Christopher Stone, Remi Collet).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2006 21:00:26 -0000	1.4
+++ sources	2 Oct 2006 16:29:07 -0000	1.5
@@ -1,2 +1,2 @@
 e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-3034a8117ee8533b30f78deb7c06ff46  rpmdevtools-5.1.tar.bz2
+41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 16:29:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:29:08 -0700
Subject: rpms/rpmdevtools/devel .cvsignore, 1.3, 1.4 rpmdevtools.spec, 1.3, 
	1.4 sources, 1.4, 1.5
Message-ID: <200610021629.k92GTAn3000500@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv453/devel

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
- Skip *.jar.so.debug in check-buildroot (#208903).
- Treat yasm and *-static as devel packages in rmdevelrpms.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2006 21:00:26 -0000	1.3
+++ .cvsignore	2 Oct 2006 16:29:08 -0000	1.4
@@ -1,2 +1,2 @@
 spectool-1.0.7.tar.bz2
-rpmdevtools-5.1.tar.bz2
+rpmdevtools-5.2.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmdevtools.spec	12 Sep 2006 21:00:26 -0000	1.3
+++ rpmdevtools.spec	2 Oct 2006 16:29:08 -0000	1.4
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.7
 
 Name:           rpmdevtools
-Version:        5.1
+Version:        5.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,10 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
+- Skip *.jar.so.debug in check-buildroot (#208903).
+- Treat yasm and *-static as devel packages in rmdevelrpms.
+
 * Sat Sep  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.1-1
 - Re-add PHP PEAR spec template, more improvements to it (#198706,
   Christopher Stone, Remi Collet).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2006 21:00:26 -0000	1.4
+++ sources	2 Oct 2006 16:29:08 -0000	1.5
@@ -1,2 +1,2 @@
 e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-3034a8117ee8533b30f78deb7c06ff46  rpmdevtools-5.1.tar.bz2
+41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 16:29:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:29:31 -0700
Subject: rpms/libtunepimp/devel .cvsignore, 1.5, 1.6 libtunepimp.spec, 1.19, 
	1.20 sources, 1.5, 1.6
Message-ID: <200610021629.k92GTXoW000575@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv552

Modified Files:
	.cvsignore libtunepimp.spec sources 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
- 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Sep 2006 18:06:03 -0000	1.5
+++ .cvsignore	2 Oct 2006 16:29:30 -0000	1.6
@@ -1,2 +1,2 @@
 libtunepimp-0.4.3.tar.gz
-libtunepimp-0.5.1.tar.gz
+libtunepimp-0.5.2.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libtunepimp.spec	26 Sep 2006 18:06:03 -0000	1.19
+++ libtunepimp.spec	2 Oct 2006 16:29:30 -0000	1.20
@@ -1,8 +1,8 @@
 
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
-Version: 0.5.1
-Release: 2%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -10,14 +10,12 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://lists.musicbrainz.org/pipermail/musicbrainz-devel/2006-September/001856.html
-%define pkglibdir %{_libdir}/tunepimp-0.5
-Patch1: libtunepimp-0.5.1-PLUGIN_DIR.patch
+%define pkglibdir %{_libdir}/tunepimp
 
+BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: libvorbis-devel
 BuildRequires: flac-devel
-BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: zlib-devel
 BuildRequires: taglib-devel
 BuildRequires: readline-devel ncurses-devel
@@ -56,8 +54,6 @@
 %prep
 %setup -q -n libtunepimp-%{version}
 
-%patch1 -p1 -b .PLUGIN_DIR
-
 
 %build
 %configure \
@@ -111,6 +107,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
+- 0.5.2
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-2
 - drop -tools subpkg
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Sep 2006 18:06:03 -0000	1.5
+++ sources	2 Oct 2006 16:29:30 -0000	1.6
@@ -1 +1 @@
-51809faed41fb8f12be15846214abc3a  libtunepimp-0.5.1.tar.gz
+655b254539013f5e7fe50ac035c26dcb  libtunepimp-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 16:30:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:30:27 -0700
Subject: rpms/maxima/FC-5 maxima-5.10.0-xdg_open.patch, NONE, 1.1 maxima.spec,
	1.29, 1.30 maxima-5.9.2-htmlview.patch, 1.1, NONE
Message-ID: <200610021630.k92GUTl4000695@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv673

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.10.0-xdg_open.patch 
Removed Files:
	maxima-5.9.2-htmlview.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
- -gui: htmlview -> xdg-open,Requires: xdg-utils


maxima-5.10.0-xdg_open.patch:

--- NEW FILE maxima-5.10.0-xdg_open.patch ---
--- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2004-10-16 10:37:53.000000000 -0500
+++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-08-22 07:27:23.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- maxima.spec	27 Sep 2006 14:17:16 -0000	1.29
+++ maxima.spec	2 Oct 2006 16:30:27 -0000	1.30
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -44,7 +44,7 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.9.2-htmlview.patch
+Patch1: maxima-5.10.0-xdg_open.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
@@ -96,6 +96,8 @@
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
+Requires: xdg-utils
+#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -180,7 +182,7 @@
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%patch1 -p1 -b .htmlview
+%patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
 %if "%{?fedora}" > "3"
@@ -384,6 +386,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
+- -gui: htmlview -> xdg-open,Requires: xdg-utils
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17
 


--- maxima-5.9.2-htmlview.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 16:30:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:30:46 -0700
Subject: rpms/maxima/FC-4 maxima-5.10.0-xdg_open.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 maxima.spec, 1.23, 1.24 sources, 1.5,
	1.6 maxima-5.9.2-htmlview.patch, 1.1, NONE
Message-ID: <200610021630.k92GUmIV000766@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv741

Modified Files:
	.cvsignore maxima.spec sources 
Added Files:
	maxima-5.10.0-xdg_open.patch 
Removed Files:
	maxima-5.9.2-htmlview.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
- -gui: htmlview -> xdg-open,Requires: xdg-utils


maxima-5.10.0-xdg_open.patch:

--- NEW FILE maxima-5.10.0-xdg_open.patch ---
--- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2004-10-16 10:37:53.000000000 -0500
+++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-08-22 07:27:23.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Apr 2006 17:32:12 -0000	1.5
+++ .cvsignore	2 Oct 2006 16:30:46 -0000	1.6
@@ -1,3 +1,3 @@
 maximabook-19-Sept-2004.pdf
 macref.pdf
-maxima-5.9.3.tar.gz
+maxima-5.10.0.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- maxima.spec	9 Jul 2006 19:15:27 -0000	1.23
+++ maxima.spec	2 Oct 2006 16:30:46 -0000	1.24
@@ -1,16 +1,21 @@
 
+%define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
+%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.3
+Version: 5.10.0
 
-Release: 5%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
-Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
+Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: %{ix86} x86_64 ppc
 
+%define maxima_ver %{version}%{?beta}
+
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
@@ -24,9 +29,9 @@
 
 %ifarch ppc
 %define default_lisp sbcl
-# clisp: http://bugzilla.redhat.com/bugzilla/166347
+# clisp: http://bugzilla.redhat.com/166347
 #define _enable_clisp --enable-clisp 
-# gcl:   http://bugzilla.redhat.com/bugzilla/167952
+# gcl:   http://bugzilla.redhat.com/167952
 #define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
@@ -39,17 +44,17 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.9.2-htmlview.patch
+Patch1: maxima-5.10.0-xdg_open.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.4-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
-Patch4: maxima-5.9.2-evince.patch
+Patch4: maxima-5.9.4-evince.patch
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
 # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
-Patch6: maxima-5.9.3-gcl-setarch.patch
+Patch6: maxima-5.9.4-gcl_setarch.patch
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -91,6 +96,8 @@
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
+Requires: xdg-utils
+#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -137,7 +144,7 @@
 BuildRequires: gcl
 Requires:  %{name} = %{version}
 %if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
+# See http://bugzilla.redhat.com/187647
 %define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
@@ -153,14 +160,14 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl 
+# almost any sbcl will do, but we want to be sure we're using the latest -- Rex
+BuildRequires: sbcl >= 0.9.17
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
 %if "%{?sbcl_ver}" >= "0.9"
-%define sbcl_ver2 >= %{sbcl_ver}
+Requires: sbcl = %{sbcl_ver}
 %endif
-Requires: sbcl %{?sbcl_ver2} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -170,12 +177,12 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{version}}
+%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
 
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%patch1 -p1 -b .htmlview
+%patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
 %if "%{?fedora}" > "3"
@@ -213,9 +220,9 @@
 
  install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf
 
- pushd info
-  texi2dvi --pdf maxima.texi
- popd
+# pushd info
+#  texi2dvi --pdf maxima.texi
+# popd
 
  pushd intromax
   pdflatex intromax.ltx
@@ -236,39 +243,34 @@
 # app icon
 install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/maxima.png
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" \
+  --add-category "X-Fedora" --vendor="fedora" \
   %{SOURCE2} 
 
-## emaxima
-# LaTeX style
+# emaxima LaTeX style
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/*.sty \
 	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
-# emacs
-install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
-install -D -m644 -p %{SOURCE6} \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
-
-# xemacs
-install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
-	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
-install -D -m644 -p %{SOURCE6} \
-	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
+# (x)emacs
+install -D -m644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el
+
+for dir in %{emacs_sitelisp} %{xemacs_sitelisp} ; do
+  install -d -m755 $RPM_BUILD_ROOT$dir/{,site-start.d}
+  ln -s %{_datadir}/maxima/%{maxima_ver}/emacs $RPM_BUILD_ROOT$dir/maxima
+  for file in $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/*.el ; do
+    touch `dirname $file`/`basename $file .el`.elc
+  done
+  ln -s %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el $RPM_BUILD_ROOT$dir/site-start.d/
+  touch $RPM_BUILD_ROOT$dir/site-start.d/maxima-modes.elc
+done
 
 ## unwanted/unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
 rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
 # _enable_gcl: debuginfo (sometimes?) fails to get auto-created, so we'll help out
 touch debugfiles.list
@@ -292,6 +294,26 @@
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
+%triggerin -- emacs-common
+if [ -d %{emacs_sitelisp} ]; then
+  rm -rf %{emacs_sitelisp}/maxima   
+  ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs  %{emacs_sitelisp}/maxima ||:
+fi
+ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{emacs_sitelisp}/site-start.d/ ||:
+
+%triggerin -- xemacs-common
+if [ -d %{xemacs_sitelisp} ]; then
+  rm -rf %{xemacs_sitelisp}/maxima
+  ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs  %{xemacs_sitelisp}/maxima ||:
+fi
+ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||:
+
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
+
 
 
 %clean
@@ -300,72 +322,104 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README README.lisps
+%doc AUTHORS ChangeLog COPYING README README.lisps
 %doc doc/misc/ doc/implementation/
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %doc macref.pdf
-%doc %{_datadir}/maxima/%{version}/doc
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}
-%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}/demo/
-%{_datadir}/maxima/%{version}/share/
+%dir %{_datadir}/maxima/%{maxima_ver}
+%{_datadir}/maxima/%{maxima_ver}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{maxima_ver}/demo/
+%doc %{_datadir}/maxima/%{maxima_ver}/doc
+%{_datadir}/maxima/%{maxima_ver}/share/
+%dir %{_libdir}/maxima/
+%dir %{_libdir}/maxima/%{maxima_ver}/
 %{_libexecdir}/maxima
 %{_infodir}/*.info*
 %{_mandir}/man1/maxima.*
-# emaxima     
-%{_datadir}/maxima/%{version}/emacs
-%{_datadir}/emacs/site-lisp/*
-%{_datadir}/xemacs/site-packages/*
 %{_datadir}/texmf/tex/latex/emaxima/
+%dir %{_datadir}/maxima/%{maxima_ver}/emacs
+%{_datadir}/maxima/%{maxima_ver}/emacs/emaxima.*
+%{_datadir}/maxima/%{maxima_ver}/emacs/*.el
+%ghost %{_datadir}/maxima/%{maxima_ver}/emacs/*.elc
+%dir %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/
+%{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/*.el
+%ghost %{emacs_sitelisp}
+%ghost %{xemacs_sitelisp}
 
 %files src
 %defattr(-,root,root,-)
-%{_datadir}/maxima/%{version}/src/
+%{_datadir}/maxima/%{maxima_ver}/src/
 
 %files gui
 %defattr(-,root,root,-)
 %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}/xmaxima
+%{_datadir}/maxima/%{maxima_ver}/xmaxima/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-clisp
+%{_libdir}/maxima/%{maxima_ver}/binary-clisp
 %endif
 
 %if "%{?_enable_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-cmucl
+%{_libdir}/maxima/%{maxima_ver}/binary-cmucl
 %endif
 
 %if "%{?_enable_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-gcl
+%{_libdir}/maxima/%{maxima_ver}/binary-gcl
 %endif
 
 %if "%{?_enable_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-sbcl
+%{_libdir}/maxima/%{maxima_ver}/binary-sbcl
 %endif
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
+- -gui: htmlview -> xdg-open,Requires: xdg-utils
+
+* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
+- respin for sbcl-0.9.17
+
+* Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-1
+- 5.10.0
+
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.10.rc4
+- respin for new(er) sbcl (#207063)
+
+* Wed Sep 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.8.rc4
+- 5.9.3.99rc4
+
+* Wed Sep 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.7.rc3
+- 5.9.3.99rc3
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.6.rc2
+- fc6 respin
+
+* Sun Aug 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.5.rc2
+- respin (against newer sbcl)
+
+* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.4.rc2
+- update gcl_setarch patch
+
+* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.3.rc2
+- 5.9.3.99rc2
+
+* Tue Aug 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.1.rc1
+- 5.9.3.99rc1
+- - %ghost (x)emacs site-lisp bits (hint from fedora-rpmdevtools)
+
 * Mon Jun 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-5
 - respin for sbcl-0.9.14 (and relax Requires = to >= )
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Apr 2006 17:32:12 -0000	1.5
+++ sources	2 Oct 2006 16:30:46 -0000	1.6
@@ -1,3 +1,3 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
-e6388632d91722bb0607914bdabc72f6  maxima-5.9.3.tar.gz
+1e7f5ecabf990f350c5f662f106d83b7  maxima-5.10.0.tar.gz


--- maxima-5.9.2-htmlview.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 16:55:41 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:55:41 -0700
Subject: rpms/maxima/devel maxima-5.10.0-xdg-utils.patch, NONE,
	1.1 maxima.spec, 1.41, 1.42 maxima-5.10.0-xdg_open.patch, 1.1,
	NONE maxima-5.9.4-evince.patch, 1.1, NONE
Message-ID: <200610021655.k92GthcO001049@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1029

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.10.0-xdg-utils.patch 
Removed Files:
	maxima-5.10.0-xdg_open.patch maxima-5.9.4-evince.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
- update xdg-utils patch (for .dvi handling too)


maxima-5.10.0-xdg-utils.patch:

--- NEW FILE maxima-5.10.0-xdg-utils.patch ---
--- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.xdg_open	2006-09-11 10:38:01.000000000 -0500
+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-10-02 11:46:43.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }
--- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl.xdg_open	2006-08-03 08:21:57.000000000 -0500
+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-10-02 11:48:30.000000000 -0500
@@ -143,9 +143,9 @@
     image/gif  netmath
     image/png  netmath
     image/jpeg netmath
-    application/postscript "ghostview -safer %s"
-    application/pdf "acroread %s"
-    application/x-dvi "xdvi %s"
+    application/postscript "xdg-open %s"
+    application/pdf "xdg-open %s"
+    application/x-dvi "xdg-open %s"
 }
 set maxima_priv(imagecounter) 0
 
--- maxima-5.10.0/src/plot.lisp.xdg_open	2006-08-26 06:13:40.000000000 -0500
+++ maxima-5.10.0/src/plot.lisp	2006-10-02 11:46:43.000000000 -0500
@@ -75,7 +75,7 @@
                         ((mlist) $plot_realpart nil)
                         ))
 
-(defvar $viewps_command  "(ghostview \"~a\")")
+(defvar $viewps_command  "(xdg-open \"~a\")")
 
 ;; $plot_realpart option is false by default but *plot-realpart* is true because coerce-float-fun
 ;; is used outside of plot package too.


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- maxima.spec	2 Oct 2006 16:01:44 -0000	1.41
+++ maxima.spec	2 Oct 2006 16:55:41 -0000	1.42
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -44,13 +44,11 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.10.0-xdg_open.patch
+Patch1: maxima-5.10.0-xdg-utils.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
 Patch3: maxima-5.9.4-sbcl-disable-debugger.patch
-# ghostview -> evince (ps/pdf viewer)
-Patch4: maxima-5.9.4-evince.patch
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
 # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
@@ -97,7 +95,6 @@
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
 Requires: xdg-utils
-#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -185,9 +182,6 @@
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
-%if "%{?fedora}" > "3"
-%patch4 -p1 -b .evince
-%endif
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -386,8 +380,11 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
+- update xdg-utils patch (for .dvi handling too)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
-- -gui: htmlview -> xdg-open,Requires: xdg-utils
+- -gui: htmlview -> xdg-open, Requires: xdg-utils
 
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17


--- maxima-5.10.0-xdg_open.patch DELETED ---


--- maxima-5.9.4-evince.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 17:04:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 10:04:40 -0700
Subject: rpms/libassuan/devel libassuan.spec,1.16,1.17
Message-ID: <200610021704.k92H4gLQ004185@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4142

Modified Files:
	libassuan.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.ne> - 0.9.0-3
- respin



Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libassuan.spec	26 Sep 2006 16:47:57 -0000	1.16
+++ libassuan.spec	2 Oct 2006 17:04:38 -0000	1.17
@@ -2,7 +2,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
 Version: 0.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPL
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.ne> - 0.9.0-3
+- respin
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net - 0.9.0-2
 - -devel: Provides: %%name-static
 - 0.9.0



From fedora-extras-commits at redhat.com  Mon Oct  2 17:06:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 10:06:27 -0700
Subject: rpms/factory/devel factory.spec,1.16,1.17
Message-ID: <200610021706.k92H6T1w004604@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4579

Modified Files:
	factory.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-10
- respin



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- factory.spec	28 Aug 2006 14:57:44 -0000	1.16
+++ factory.spec	2 Oct 2006 17:06:27 -0000	1.17
@@ -2,7 +2,7 @@
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
 Version: 2.0.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: GPL
 URL:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-10
+- respin
+
 * Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-9
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Mon Oct  2 17:08:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 10:08:37 -0700
Subject: rpms/libksba/devel libksba.spec,1.22,1.23
Message-ID: <200610021708.k92H8dsZ005122@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libksba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5094

Modified Files:
	libksba.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- respin



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libksba.spec	7 Sep 2006 20:01:42 -0000	1.22
+++ libksba.spec	2 Oct 2006 17:08:37 -0000	1.23
@@ -2,7 +2,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 1.0.0 
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.0-1
 - 1.0.0
 



From fedora-extras-commits at redhat.com  Mon Oct  2 17:10:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 10:10:45 -0700
Subject: rpms/libfac/devel libfac.spec,1.13,1.14
Message-ID: <200610021710.k92HAllo005569@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libfac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5544

Modified Files:
	libfac.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-7
- respin



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/devel/libfac.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libfac.spec	29 Aug 2006 17:44:21 -0000	1.13
+++ libfac.spec	2 Oct 2006 17:10:45 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: An extension to Singular-factory
 Name:    libfac
 Version: 2.0.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-7
+- respin
+
 * Tue Jul 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-6
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Mon Oct  2 17:12:46 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Mon,  2 Oct 2006 10:12:46 -0700
Subject: rpms/inotify-tools/devel .cvsignore, 1.4, 1.5 inotify-tools.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200610021712.k92HCmfY006009@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/inotify-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5958

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
Update to 2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2006 10:33:50 -0000	1.4
+++ .cvsignore	2 Oct 2006 17:12:46 -0000	1.5
@@ -1 +1 @@
-inotify-tools-2.4.tar.gz
+inotify-tools-2.5.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/inotify-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- inotify-tools.spec	9 Sep 2006 10:33:50 -0000	1.3
+++ inotify-tools.spec	2 Oct 2006 17:12:46 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.4
+Version:        2.5
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.5-1
+- Update to 2.5
+
 * Sat Sep  9 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.4-1
 - Update to 2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2006 10:33:50 -0000	1.4
+++ sources	2 Oct 2006 17:12:46 -0000	1.5
@@ -1 +1 @@
-dd27bea5289ac78dbd61afc5c2ebc6f3  inotify-tools-2.4.tar.gz
+80994b6637c9a4a94a1eddf2b8885603  inotify-tools-2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 17:14:30 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Mon,  2 Oct 2006 10:14:30 -0700
Subject: rpms/inotify-tools/FC-5 .cvsignore, 1.4, 1.5 inotify-tools.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610021714.k92HEWCQ006417@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/inotify-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6362

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
Update to 2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2006 10:35:07 -0000	1.4
+++ .cvsignore	2 Oct 2006 17:14:30 -0000	1.5
@@ -1 +1 @@
-inotify-tools-2.4.tar.gz
+inotify-tools-2.5.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/inotify-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- inotify-tools.spec	9 Sep 2006 10:35:07 -0000	1.3
+++ inotify-tools.spec	2 Oct 2006 17:14:30 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.4
+Version:        2.5
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.5-1
+- Update to 2.5
+
 * Sat Sep  9 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.4-1
 - Update to 2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2006 10:35:07 -0000	1.4
+++ sources	2 Oct 2006 17:14:30 -0000	1.5
@@ -1 +1 @@
-dd27bea5289ac78dbd61afc5c2ebc6f3  inotify-tools-2.4.tar.gz
+80994b6637c9a4a94a1eddf2b8885603  inotify-tools-2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 17:53:13 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon,  2 Oct 2006 10:53:13 -0700
Subject: comps comps-fe6.xml.in,1.171,1.172
Message-ID: <200610021753.k92HrFGV007989@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7972

Modified Files:
	comps-fe6.xml.in 
Log Message:
add all my packages: emelfm2, gnome-applet-timer, gnome-ppp and xfce4-*-plugins


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- comps-fe6.xml.in	1 Oct 2006 05:00:54 -0000	1.171
+++ comps-fe6.xml.in	2 Oct 2006 17:53:13 -0000	1.172
@@ -177,6 +177,7 @@
       <packagereq type="optional">qgit</packagereq>
       <packagereq type="optional">quilt</packagereq>
       <packagereq type="optional">rapidsvn</packagereq>
+      <packagereq type="optional">regexxer</packagereq>
       <packagereq type="optional">rpmdevtools</packagereq>
       <packagereq type="optional">rpmlint</packagereq>
       <packagereq type="optional">smarteiffel</packagereq>
@@ -447,6 +448,7 @@
       <packagereq type="optional">gnome-applet-netspeed</packagereq>
       <packagereq type="optional">gnome-applet-rhythmbox</packagereq>
       <packagereq type="optional">gnome-applet-sensors</packagereq>
+      <packagereq type="optional">gnome-applet-timer</packagereq>
       <packagereq type="optional">gnome-theme-clearlooks-bigpack</packagereq>
       <packagereq type="optional">gnome-themes-extras</packagereq>
       <packagereq type="optional">gnotime</packagereq>
@@ -527,6 +529,7 @@
       <packagereq type="optional">galeon</packagereq>
       <packagereq type="optional">gg2</packagereq>
       <packagereq type="optional">gnome-blog</packagereq>
+      <packagereq type="optional">gnome-ppp</packagereq>
       <packagereq type="optional">gnome-telnet</packagereq>
       <packagereq type="optional">gnome-translate</packagereq>
       <packagereq type="optional">gnubiff</packagereq>
@@ -888,6 +891,7 @@
       <packagereq type="optional">dkms</packagereq>
       <packagereq type="optional">ebtables</packagereq>
       <packagereq type="optional">ed2k_hash</packagereq>
+      <packagereq type="optional">emelfm2</packagereq>
       <packagereq type="optional">enca</packagereq>
       <packagereq type="optional">environment-modules</packagereq>
       <packagereq type="optional">epylog</packagereq>
@@ -1103,14 +1107,35 @@
       <packagereq type="default">xfce4-appfinder</packagereq>
       <packagereq type="default">xfce4-icon-theme</packagereq>
       <packagereq type="default">xfce4-iconbox</packagereq>
+      <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
       <packagereq type="default">xfce4-mixer</packagereq>
       <packagereq type="default">xfce4-systray</packagereq>
       <packagereq type="default">xfce4-trigger-launcher</packagereq>
       <packagereq type="default">xffm-icons</packagereq>
       <packagereq type="default">xfprint</packagereq>
       <packagereq type="optional">xfcalendar</packagereq>
+      <packagereq type="optional">xfce4-battery-plugin</packagereq>
+      <packagereq type="optional">xfce4-clipman-plugin</packagereq>
+      <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
+      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
+      <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
+      <packagereq type="optional">xfce4-genmon-plugin</packagereq>
+      <packagereq type="optional">xfce4-minicmd-plugin</packagereq>
+      <packagereq type="optional">xfce4-mount-plugin</packagereq>
+      <packagereq type="optional">xfce4-netload-plugin</packagereq>
+      <packagereq type="optional">xfce4-notes-plugin</packagereq>
+      <packagereq type="optional">xfce4-quicklauncher-plugin</packagereq>
+      <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
+      <packagereq type="optional">xfce4-sensors-plugin</packagereq>
+      <packagereq type="optional">xfce4-systemload-plugin</packagereq>
+      <packagereq type="optional">xfce4-taskmanager</packagereq>
       <packagereq type="optional">xfce4-toys</packagereq>
       <packagereq type="optional">xfwm4-themes</packagereq>
+      <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
+      <packagereq type="optional">xfce4-weather-plugin</packagereq>
+      <packagereq type="optional">xfce4-websearch-plugin</packagereq>
+      <packagereq type="optional">xfce4-xkb-plugin</packagereq>
+      <packagereq type="optional">xfce4-xmms-plugin</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Mon Oct  2 18:17:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:17:12 -0700
Subject: rpms/em8300-kmod/FC-5 em8300-oss-default.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 em8300-adv7170-wss.patch, 1.1, 1.2 em8300-kmod.spec,
	1.4, 1.5 sources, 1.2, 1.3 em8300-kmod-2617.patch, 1.1, NONE
Message-ID: <200610021817.k92IHE6d010986@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957

Modified Files:
	.cvsignore em8300-adv7170-wss.patch em8300-kmod.spec sources 
Added Files:
	em8300-oss-default.patch 
Removed Files:
	em8300-kmod-2617.patch 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0
- 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
- Patch to default to OSS for backwards compatibility.
- Drop early FC5 hacks.


em8300-oss-default.patch:

--- NEW FILE em8300-oss-default.patch ---
Default to OSS in 0.16.0-rc1 for backwards compatibility.

Index: modules/em8300_main.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_main.c,v
retrieving revision 1.116
diff -u -r1.116 em8300_main.c
--- modules/em8300_main.c	13 Sep 2006 15:34:37 -0000	1.116
+++ modules/em8300_main.c	15 Sep 2006 18:27:58 -0000
@@ -180,10 +180,10 @@
 	[ AUDIO_DRIVER_ALSA ] = "alsa",
 };
 
-#if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
-audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_ALSA };
-#elif defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
+#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
 audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_OSS };
+#elif defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
+audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_ALSA };
 #else
 audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_OSSLIKE };
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2006 20:16:26 -0000	1.2
+++ .cvsignore	2 Oct 2006 18:17:12 -0000	1.3
@@ -1 +1 @@
-em8300-nofirmware-0.15.3.tar.gz
+em8300-nofirmware-0.16.0-rc1.tar.bz2

em8300-adv7170-wss.patch:

Index: em8300-adv7170-wss.patch
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-adv7170-wss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- em8300-adv7170-wss.patch	22 Jul 2006 20:16:26 -0000	1.1
+++ em8300-adv7170-wss.patch	2 Oct 2006 18:17:12 -0000	1.2
@@ -1,5 +1,5 @@
 http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Updated to apply as of 0.15.3+cvs20060626.
+Updated to apply as of 0.16.0-rc1.
 
 Index: em8300setup/em8300setup.c
 ===================================================================
@@ -7,7 +7,7 @@
 retrieving revision 1.5
 diff -u -r1.5 em8300setup.c
 --- em8300setup/em8300setup.c	19 Oct 2005 22:15:16 -0000	1.5
-+++ em8300setup/em8300setup.c	26 Jun 2006 13:44:47 -0000
++++ em8300setup/em8300setup.c	15 Sep 2006 18:15:00 -0000
 @@ -114,7 +114,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
@@ -79,10 +79,10 @@
 Index: include/linux/em8300.h
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
-retrieving revision 1.41
-diff -u -r1.41 em8300.h
---- include/linux/em8300.h	10 Apr 2006 22:31:14 -0000	1.41
-+++ include/linux/em8300.h	26 Jun 2006 13:44:48 -0000
+retrieving revision 1.42
+diff -u -r1.42 em8300.h
+--- include/linux/em8300.h	13 Sep 2006 15:28:36 -0000	1.42
++++ include/linux/em8300.h	15 Sep 2006 18:15:01 -0000
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -108,7 +108,7 @@
  #define EM8300_VIDEOMODE_PAL	0
  #define EM8300_VIDEOMODE_PAL60	1
  #define EM8300_VIDEOMODE_NTSC	2
-@@ -467,6 +478,7 @@
+@@ -465,6 +476,7 @@
  int em8300_control_ioctl(struct em8300_s *em, int cmd, unsigned long arg);
  int em8300_ioctl_setvideomode(struct em8300_s *em, int mode);
  int em8300_ioctl_setaspectratio(struct em8300_s *em, int ratio);
@@ -122,7 +122,7 @@
 retrieving revision 1.53
 diff -u -r1.53 adv717x.c
 --- modules/adv717x.c	12 May 2006 22:04:56 -0000	1.53
-+++ modules/adv717x.c	26 Jun 2006 13:44:48 -0000
++++ modules/adv717x.c	15 Sep 2006 18:15:01 -0000
 @@ -219,6 +219,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
@@ -249,14 +249,14 @@
 Index: modules/em8300_ioctl.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.50
-diff -u -r1.50 em8300_ioctl.c
---- modules/em8300_ioctl.c	10 Apr 2006 22:31:14 -0000	1.50
-+++ modules/em8300_ioctl.c	26 Jun 2006 13:44:48 -0000
-@@ -203,4 +203,17 @@
- 				return -EFAULT;
+retrieving revision 1.51
+diff -u -r1.51 em8300_ioctl.c
+--- modules/em8300_ioctl.c	13 Sep 2006 15:28:37 -0000	1.51
++++ modules/em8300_ioctl.c	15 Sep 2006 18:15:01 -0000
+@@ -183,6 +183,20 @@
  		}
  		break;
+ 
 +	case _IOC_NR(EM8300_IOCTL_SET_WSS):
 +		em8300_require_ucode(em);
 +
@@ -270,8 +270,11 @@
 +		}
 +
 +		break;
++
+ 	case _IOC_NR(EM8300_IOCTL_SET_PLAYMODE):
+ 		em8300_require_ucode(em);
  
-@@ -604,6 +619,52 @@
+@@ -617,6 +631,52 @@
  	return 0;
  }
  
@@ -330,7 +333,7 @@
 retrieving revision 1.8
 diff -u -r1.8 encoder.h
 --- modules/encoder.h	14 Jan 2002 21:41:31 -0000	1.8
-+++ modules/encoder.h	26 Jun 2006 13:44:48 -0000
++++ modules/encoder.h	15 Sep 2006 18:15:01 -0000
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -353,7 +356,7 @@
 retrieving revision 1.3
 diff -u -r1.3 em8300setup.1
 --- em8300setup/em8300setup.1	19 Oct 2005 22:15:16 -0000	1.3
-+++ em8300setup/em8300setup.1	26 Jun 2006 13:44:47 -0000
++++ em8300setup/em8300setup.1	15 Sep 2006 18:15:00 -0000
 @@ -26,6 +26,33 @@
  \fB-o\fR, \fB-w\fR
  Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- em8300-kmod.spec	15 Sep 2006 06:53:45 -0000	1.4
+++ em8300-kmod.spec	2 Oct 2006 18:17:12 -0000	1.5
@@ -9,32 +9,32 @@
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
 
-%define upvar ""
 %ifarch i686 ppc
-%define smpvar smp
+%define smp smp
 %endif
 %ifarch i686 x86_64
-%define xenvar xen xen0
-%define kdumpvar kdump
+%define xen xen xen0
+%define kdump kdump
 %endif
-%{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?xenvar} %{?kdumpvar}}
+%{!?kvariants: %define kvariants "" %{?smp} %{?xen} %{?kdump}}
 
 
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version:        0.15.3
-Release:        8.%(echo %{kverrel} | tr - _)
+Version:        0.16.0
+Release:        0.0.rc1.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
-Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
+#Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# with modules/em8300.uc removed
+Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
-Patch1:         %{name}-2617.patch
+Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sed >= 3.95
-
 ExclusiveArch:  i586 i686 x86_64 ppc
 
 %description
@@ -44,21 +44,21 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}
-%patch1 -p1
+cd %{kmod_name}-%{version}-rc1
 %patch0 -p0
-sed -i -e s/2,6,16/2,6,15/ modules/*.c # FC5 pre-2.6.16 marked as 2.6.15 hack
+%patch1 -p0
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
 done
 
 
 %build
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
     ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
-    make %{?_smp_mflags} V=1 KERNEL_LOCATION=$ks && \
+    make %{?_smp_mflags} V=1 KERNVER=$kv KERNEL_LOCATION=$ks && \
     cd ../..
 done
 
@@ -66,9 +66,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNEL_LOCATION=$ks MODINST=extra/%{kmod_name}
+        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
 done
 
 
@@ -77,6 +76,11 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0
+- 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
+- Patch to default to OSS for backwards compatibility.
+- Drop early FC5 hacks.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.15.3-8
 - Rebuild for kernel 2.6.17_1.2187_FC5.
 - Build for the xen variant too.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2006 20:16:26 -0000	1.2
+++ sources	2 Oct 2006 18:17:12 -0000	1.3
@@ -1 +1 @@
-7e19428a267f645e7d9023f4d2c24a2c  em8300-nofirmware-0.15.3.tar.gz
+969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2


--- em8300-kmod-2617.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 18:19:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:19:35 -0700
Subject: rpms/em8300/FC-5 em8300.console.perms, NONE, 1.1 .cvsignore, 1.2,
	1.3 em8300-adv7170-wss.patch, 1.1, 1.2 em8300.spec, 1.1,
	1.2 sources, 1.2, 1.3 em8300-README-console.perms, 1.1, NONE
Message-ID: <200610021819.k92IJbQ1011040@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11013

Modified Files:
	.cvsignore em8300-adv7170-wss.patch em8300.spec sources 
Added Files:
	em8300.console.perms 
Removed Files:
	em8300-README-console.perms 
Log Message:
* Sat Sep 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.2.rc1
- Install ALSA config file.
- Clean up no longer needed things from specfile.

* Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
- 0.16.0-rc1.
- Add console.perms snippet, commented out for now due to #206700.



--- NEW FILE em8300.console.perms ---
#<em8300>=/dev/em8300*
#<console>  0660 <em8300>     0660 root.video


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2006 20:14:05 -0000	1.2
+++ .cvsignore	2 Oct 2006 18:19:34 -0000	1.3
@@ -1 +1,2 @@
-em8300-nofirmware-0.15.3.tar.gz
+em8300-nofirmware-0.16.0-rc1.tar.bz2
+EM8300.conf

em8300-adv7170-wss.patch:

Index: em8300-adv7170-wss.patch
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-5/em8300-adv7170-wss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- em8300-adv7170-wss.patch	22 Jul 2006 20:14:05 -0000	1.1
+++ em8300-adv7170-wss.patch	2 Oct 2006 18:19:34 -0000	1.2
@@ -1,5 +1,5 @@
 http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Updated to apply cleanly as of 0.15.2rc1.
+Updated to apply as of 0.16.0-rc1.
 
 Index: em8300setup/em8300setup.c
 ===================================================================
@@ -7,7 +7,7 @@
 retrieving revision 1.5
 diff -u -r1.5 em8300setup.c
 --- em8300setup/em8300setup.c	19 Oct 2005 22:15:16 -0000	1.5
-+++ em8300setup/em8300setup.c	5 Nov 2005 08:32:24 -0000
++++ em8300setup/em8300setup.c	15 Sep 2006 18:15:00 -0000
 @@ -114,7 +114,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
@@ -79,10 +79,10 @@
 Index: include/linux/em8300.h
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
-retrieving revision 1.39
-diff -u -r1.39 em8300.h
---- include/linux/em8300.h	19 Oct 2005 22:15:16 -0000	1.39
-+++ include/linux/em8300.h	5 Nov 2005 08:32:24 -0000
+retrieving revision 1.42
+diff -u -r1.42 em8300.h
+--- include/linux/em8300.h	13 Sep 2006 15:28:36 -0000	1.42
++++ include/linux/em8300.h	15 Sep 2006 18:15:01 -0000
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -108,7 +108,7 @@
  #define EM8300_VIDEOMODE_PAL	0
  #define EM8300_VIDEOMODE_PAL60	1
  #define EM8300_VIDEOMODE_NTSC	2
-@@ -455,6 +466,7 @@
+@@ -465,6 +476,7 @@
  int em8300_control_ioctl(struct em8300_s *em, int cmd, unsigned long arg);
  int em8300_ioctl_setvideomode(struct em8300_s *em, int mode);
  int em8300_ioctl_setaspectratio(struct em8300_s *em, int ratio);
@@ -119,11 +119,11 @@
 Index: modules/adv717x.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/adv717x.c,v
-retrieving revision 1.49
-diff -u -r1.49 adv717x.c
---- modules/adv717x.c	5 Nov 2005 01:12:13 -0000	1.49
-+++ modules/adv717x.c	5 Nov 2005 08:32:25 -0000
-@@ -192,6 +192,7 @@
+retrieving revision 1.53
+diff -u -r1.53 adv717x.c
+--- modules/adv717x.c	12 May 2006 22:04:56 -0000	1.53
++++ modules/adv717x.c	15 Sep 2006 18:15:01 -0000
+@@ -219,6 +219,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
  	int pd_adj_ntsc;
@@ -131,10 +131,10 @@
  
  	unsigned char config[32];
  	int configlen;
-@@ -398,6 +399,63 @@
+@@ -431,6 +432,63 @@
  		/* ADV7170/1 RGB sync: MR42 (register 4, bit 2) */
  		SET_REG(tmpconfig[ADV7170_REG_MR4], 2,
- 				ModeInfo[data->out_mode].sync_all);
+ 				mode_info[data->out_mode].conf.sync_all);
 +
 +		switch (data->wsscode) {
 +		case 0x08:
@@ -195,7 +195,7 @@
  		break;
  	}
  	/* ADV7170/1/5A/6A non-interlace: MR10 (register 1, bit 0) */
-@@ -559,6 +617,7 @@
+@@ -592,6 +650,7 @@
  	data->out_mode = output_mode_nr[em->card_nr];
  	if (data->out_mode < 0 || data->out_mode >= MODE_MAX)
  		data->out_mode = 0;
@@ -203,7 +203,7 @@
  
  	adv717x_setmode(ENCODER_MODE_PAL60, client);
  
-@@ -664,6 +723,42 @@
+@@ -697,6 +756,42 @@
  		data->enableoutput = (long int) arg;
  		adv717x_update(client);
  		break;
@@ -249,11 +249,11 @@
 Index: modules/em8300_ioctl.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.49
-diff -u -r1.49 em8300_ioctl.c
---- modules/em8300_ioctl.c	19 Oct 2005 22:15:16 -0000	1.49
-+++ modules/em8300_ioctl.c	5 Nov 2005 08:32:25 -0000
-@@ -204,6 +204,20 @@
+retrieving revision 1.51
+diff -u -r1.51 em8300_ioctl.c
+--- modules/em8300_ioctl.c	13 Sep 2006 15:28:37 -0000	1.51
++++ modules/em8300_ioctl.c	15 Sep 2006 18:15:01 -0000
+@@ -183,6 +183,20 @@
  		}
  		break;
  
@@ -271,10 +271,10 @@
 +
 +		break;
 +
- 	case _IOC_NR(EM8300_IOCTL_GET_AUDIOMODE):
+ 	case _IOC_NR(EM8300_IOCTL_SET_PLAYMODE):
  		em8300_require_ucode(em);
  
-@@ -590,6 +604,52 @@
+@@ -617,6 +631,52 @@
  	return 0;
  }
  
@@ -333,7 +333,7 @@
 retrieving revision 1.8
 diff -u -r1.8 encoder.h
 --- modules/encoder.h	14 Jan 2002 21:41:31 -0000	1.8
-+++ modules/encoder.h	5 Nov 2005 08:32:25 -0000
++++ modules/encoder.h	15 Sep 2006 18:15:01 -0000
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -356,7 +356,7 @@
 retrieving revision 1.3
 diff -u -r1.3 em8300setup.1
 --- em8300setup/em8300setup.1	19 Oct 2005 22:15:16 -0000	1.3
-+++ em8300setup/em8300setup.1	5 Nov 2005 08:32:24 -0000
++++ em8300setup/em8300setup.1	15 Sep 2006 18:15:00 -0000
 @@ -26,6 +26,33 @@
  \fB-o\fR, \fB-w\fR
  Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).


Index: em8300.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-5/em8300.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- em8300.spec	22 Jul 2006 20:14:05 -0000	1.1
+++ em8300.spec	2 Oct 2006 18:19:34 -0000	1.2
@@ -1,14 +1,18 @@
 Name:           em8300
-Version:        0.15.3
-Release:        4%{?dist}
+Version:        0.16.0
+Release:        0.2.rc1%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
-Source0:        http://download.sourceforge.net/dxr3/%{name}-nofirmware-%{version}.tar.gz
-Source1:        http://cachalot.mine.nu/src/dxr3/em8300-README-console.perms
+#Source0:        http://dl.sf.net/dxr3/%{name}-nofirmware-%{version}.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# with modules/em8300.uc removed
+Source0:        %{name}-nofirmware-%{version}-rc1.tar.bz2
+Source1:        %{name}.console.perms
 Source2:        http://cachalot.mine.nu/src/dxr3/em8300-README-modprobe.conf
+Source3:        http://dxr3.cvs.sourceforge.net/*checkout*/dxr3/em8300/modules/EM8300.conf
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,6 +20,8 @@
 BuildRequires:  desktop-file-utils
 Requires:       em8300-kmod >= %{version}
 Requires:       udev
+Requires:       %{_sysconfdir}/alsa/cards
+Requires:       %{_sysconfdir}/security/console.perms.d
 Requires(pre):  %{_sbindir}/groupadd
 Provides:       em8300-kmod-common = %{version}-%{release}
 
@@ -41,12 +47,11 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 %patch0
-install -pm 644 %{SOURCE1} README-console.perms
 install -pm 644 %{SOURCE2} README-modprobe.conf
+install -pm 644 %{SOURCE3} modules/EM8300.conf
 echo "Icon=redhat-sound_video" >> overlay/dxr3view.desktop
-sed -i -e 's/^install-data-am:.*/install-data-am:/' Makefile.*
 sed -i -e 's/microcode_extract.pl/em8300-mc_ex/' scripts/microcode_extract.pl
 
 
@@ -71,11 +76,14 @@
 install -Dpm 644 dhc/dhc.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/dhc.xpm
 
+install -Dpm 644 modules/EM8300.conf \
+  $RPM_BUILD_ROOT%{_sysconfdir}/alsa/cards/EM8300.conf
+
 install -Dpm 644 modules/em8300-udev.rules \
   $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-%{name}.rules
 
-# Already done by the modules and em8300setup:
-rm -f $RPM_BUILD_ROOT%{_datadir}/em8300/microcode_upload.pl
+install -Dpm 644 %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-%{name}.perms
 
 mv $RPM_BUILD_ROOT%{_datadir}/em8300/microcode_extract.pl \
   $RPM_BUILD_ROOT%{_bindir}/em8300-mc_ex
@@ -98,7 +106,9 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README* modules/README-modoptions
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
+%config(noreplace) %{_sysconfdir}/alsa/cards/EM8300.conf
 %{_bindir}/em8300setup
 %{_mandir}/man1/em8300setup.1*
 
@@ -119,6 +129,14 @@
 
 
 %changelog
+* Sat Sep 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.2.rc1
+- Install ALSA config file.
+- Clean up no longer needed things from specfile.
+
+* Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
+- 0.16.0-rc1.
+- Add console.perms snippet, commented out for now due to #206700.
+
 * Tue Jul 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.15.3-4
 - Require >= em8300-kmod, not = kmod-em8300 (#189400).
 - Move microcode extractor to -utils as em8300-mc_ex (like Debian) (#189400).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2006 20:14:05 -0000	1.2
+++ sources	2 Oct 2006 18:19:34 -0000	1.3
@@ -1 +1,2 @@
-7e19428a267f645e7d9023f4d2c24a2c  em8300-nofirmware-0.15.3.tar.gz
+969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b4936b2535abe48d2e8e866f63102b3c  EM8300.conf


--- em8300-README-console.perms DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 18:35:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:35:33 -0700
Subject: rpms/dvb-apps/devel dvb-apps.spec,1.8,1.9
Message-ID: <200610021835.k92IZZpS011217@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/dvb-apps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11200

Modified Files:
	dvb-apps.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.1-7
- Rebuild.



Index: dvb-apps.spec
===================================================================
RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dvb-apps.spec	23 Sep 2006 18:16:03 -0000	1.8
+++ dvb-apps.spec	2 Oct 2006 18:35:33 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           dvb-apps
 Version:        1.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Utility, demo and test applications using the Linux DVB API
 
 Group:          Applications/Multimedia
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.1-7
+- Rebuild.
+
 * Sat Sep 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.1-6
 - Include updated set of initial tuning data files from upstream hg (#203328).
 



From fedora-extras-commits at redhat.com  Mon Oct  2 18:36:30 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:36:30 -0700
Subject: rpms/em8300/devel em8300.spec,1.4,1.5
Message-ID: <200610021836.k92IaWW7011287@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11270

Modified Files:
	em8300.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
- Rebuild.



Index: em8300.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300/devel/em8300.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- em8300.spec	16 Sep 2006 12:58:06 -0000	1.4
+++ em8300.spec	2 Oct 2006 18:36:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           em8300
 Version:        0.16.0
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc1%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
+- Rebuild.
+
 * Sat Sep 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.2.rc1
 - Install ALSA config file.
 - Clean up no longer needed things from specfile.



From fedora-extras-commits at redhat.com  Mon Oct  2 18:37:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:37:39 -0700
Subject: rpms/kid3/devel kid3.spec,1.12,1.13
Message-ID: <200610021837.k92Ibffs011358@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kid3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11341

Modified Files:
	kid3.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-4
- Rebuild.



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kid3.spec	26 Sep 2006 21:46:49 -0000	1.12
+++ kid3.spec	2 Oct 2006 18:37:39 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           kid3
 Version:        0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-4
+- Rebuild.
+
 * Wed Sep 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-3
 - Disable musicbrainz support by default, not ready for tunepimp 0.5 yet.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 18:40:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:40:01 -0700
Subject: rpms/mach/devel mach.spec,1.9,1.10
Message-ID: <200610021840.k92Ie3bp011431@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11414

Modified Files:
	mach.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.0-3
- Rebuild.



Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/mach.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mach.spec	19 Sep 2006 20:07:12 -0000	1.9
+++ mach.spec	2 Oct 2006 18:40:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           mach
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        make a chroot
 
 Group:          Applications/System
@@ -96,6 +96,9 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.0-3
+- Rebuild.
+
 * Tue Sep 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.0-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 18:41:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:41:06 -0700
Subject: rpms/openct/devel openct.spec,1.17,1.18
Message-ID: <200610021841.k92If8X9011501@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11484

Modified Files:
	openct.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-2
- Rebuild.



Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openct.spec	23 Sep 2006 08:37:52 -0000	1.17
+++ openct.spec	2 Oct 2006 18:41:06 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           openct
 Version:        0.6.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-2
+- Rebuild.
+
 * Fri Sep 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-1
 - 0.6.9.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 18:42:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:42:06 -0700
Subject: rpms/xemacs/devel xemacs.spec,1.29,1.30
Message-ID: <200610021842.k92Ig82a011572@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11555

Modified Files:
	xemacs.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.27-5
- Rebuild.



Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xemacs.spec	20 Sep 2006 16:21:20 -0000	1.29
+++ xemacs.spec	2 Oct 2006 18:42:06 -0000	1.30
@@ -20,7 +20,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -491,6 +491,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.27-5
+- Rebuild.
+
 * Wed Sep 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.27-4
 - Disable graphical progress bar by default (#188973).
 - Make Wnn support optional at build time, disabled by default.



From fedora-extras-commits at redhat.com  Mon Oct  2 18:44:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:44:08 -0700
Subject: rpms/opensc/devel opensc.spec,1.17,1.18
Message-ID: <200610021844.k92IiA8r011643@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626

Modified Files:
	opensc.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-4
- Rebuild.



Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- opensc.spec	26 Sep 2006 20:58:39 -0000	1.17
+++ opensc.spec	2 Oct 2006 18:44:08 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-4
+- Rebuild.
+
 * Tue Sep 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-3
 - Rebuild with new libassuan.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:04:07 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 12:04:07 -0700
Subject: rpms/python-telepathy/FC-5
	python-telepathy-connection-manager.patch, 
	NONE, 1.1 python-telepathy.spec, 1.1, 1.2
Message-ID: <200610021904.k92J4dcT014588@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14566

Modified Files:
	python-telepathy.spec 
Added Files:
	python-telepathy-connection-manager.patch 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
- Patch for connection manager.


python-telepathy-connection-manager.patch:

--- NEW FILE python-telepathy-connection-manager.patch ---
--- telepathy/client/managerregistry.py~	2006-08-17 17:28:49.000000000 +0200
+++ telepathy/client/managerregistry.py	2006-10-02 19:42:47.000000000 +0200
@@ -21,20 +21,19 @@
 The registry of managers takes the form of any number of .manager files, which
 are searched for in /usr/share/telepathy/services or in ~/.telepathy.
 
-.manager files should have an initial stanza of the form:
+The name of a manager is the filename minus the .manager suffix
+For example a file named gabble.manager implies that:
+  The name of the connmgr is 'gabble'
+  The object path is /org/freedesktop/Telepathy/ConnectionManager/gabble
+  The bus name is org.freedesktop.Telepathy.ConnectionManager.gabble
+
+The object path and bus names are formed by replacing $name with the connmgr
+name in the following templates:
+  Object path: /org/freedesktop/Telepathy/ConnectionManager/$name
+  Bus name: org.freedesktop.Telepathy.ConnectionManager.$name
 
-[ConnectionManager]
-Name = value
-BusName = value
-ObjectPath = value
-
-
-where:
-'Name' field sets the name of connection manager.
-'BusName' sets the D-Bus bus name of this connection manager.
-'ObjectPath' sets the D-Bus object path to the ConnectionManager object under this service.
-
-Then any number of proctol support declarators of the form:
+.manager files should contain any number of proctol support declarators
+of the form:
 
 [Protocol (name of supported protocol)]
 param-(parameter name) = signature flags
@@ -86,16 +85,16 @@
     def LoadManager(self, path):
         config = ConfigParser.SafeConfigParser()
         config.read(path)
-        connection_manager = dict(config.items("ConnectionManager"))
-
-        if "name" not in connection_manager.keys():
-            raise ConfigParser.NoOptionError("name", "ConnectionManager")
 
-        cm_name = connection_manager["name"]
-        self.services[cm_name] = connection_manager
+        cm_name = os.path.basename(path)[:-len(".manager")]
+        self.services[cm_name] = {
+            "name": cm_name,
+            "busname": "org.freedesktop.Telepathy.ConnectionManager.%s" % cm_name,
+            "objectpath": "/org/freedesktop/Telepathy/ConnectionManager/%s" % cm_name,
+        }
         protocols = {}
 
-        for section in set(config.sections()) - set(["ConnectionManager"]):
+        for section in set(config.sections()):
             if section.startswith('Protocol '):
                 proto_name = section[len('Protocol '):]
                 protocols[proto_name] = dict(config.items(section))


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/FC-5/python-telepathy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-telepathy.spec	8 Sep 2006 13:08:24 -0000	1.1
+++ python-telepathy.spec	2 Oct 2006 19:04:07 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           python-telepathy
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
+Patch0:		%{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q -n telepathy-python-%{version}
+%patch0 -b .connection-manager
 
 
 %build
@@ -43,6 +45,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
+- Patch for connection manager.
+
 * Sat Sep  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:07:06 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 12:07:06 -0700
Subject: rpms/python-telepathy/devel
	python-telepathy-connection-manager.patch, 
	NONE, 1.1 python-telepathy.spec, 1.1, 1.2
Message-ID: <200610021907.k92J78eW014740@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14720

Modified Files:
	python-telepathy.spec 
Added Files:
	python-telepathy-connection-manager.patch 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
- Patch for connection manager.


python-telepathy-connection-manager.patch:

--- NEW FILE python-telepathy-connection-manager.patch ---
--- telepathy/client/managerregistry.py~	2006-08-17 17:28:49.000000000 +0200
+++ telepathy/client/managerregistry.py	2006-10-02 19:42:47.000000000 +0200
@@ -21,20 +21,19 @@
 The registry of managers takes the form of any number of .manager files, which
 are searched for in /usr/share/telepathy/services or in ~/.telepathy.
 
-.manager files should have an initial stanza of the form:
+The name of a manager is the filename minus the .manager suffix
+For example a file named gabble.manager implies that:
+  The name of the connmgr is 'gabble'
+  The object path is /org/freedesktop/Telepathy/ConnectionManager/gabble
+  The bus name is org.freedesktop.Telepathy.ConnectionManager.gabble
+
+The object path and bus names are formed by replacing $name with the connmgr
+name in the following templates:
+  Object path: /org/freedesktop/Telepathy/ConnectionManager/$name
+  Bus name: org.freedesktop.Telepathy.ConnectionManager.$name
 
-[ConnectionManager]
-Name = value
-BusName = value
-ObjectPath = value
-
-
-where:
-'Name' field sets the name of connection manager.
-'BusName' sets the D-Bus bus name of this connection manager.
-'ObjectPath' sets the D-Bus object path to the ConnectionManager object under this service.
-
-Then any number of proctol support declarators of the form:
+.manager files should contain any number of proctol support declarators
+of the form:
 
 [Protocol (name of supported protocol)]
 param-(parameter name) = signature flags
@@ -86,16 +85,16 @@
     def LoadManager(self, path):
         config = ConfigParser.SafeConfigParser()
         config.read(path)
-        connection_manager = dict(config.items("ConnectionManager"))
-
-        if "name" not in connection_manager.keys():
-            raise ConfigParser.NoOptionError("name", "ConnectionManager")
 
-        cm_name = connection_manager["name"]
-        self.services[cm_name] = connection_manager
+        cm_name = os.path.basename(path)[:-len(".manager")]
+        self.services[cm_name] = {
+            "name": cm_name,
+            "busname": "org.freedesktop.Telepathy.ConnectionManager.%s" % cm_name,
+            "objectpath": "/org/freedesktop/Telepathy/ConnectionManager/%s" % cm_name,
+        }
         protocols = {}
 
-        for section in set(config.sections()) - set(["ConnectionManager"]):
+        for section in set(config.sections()):
             if section.startswith('Protocol '):
                 proto_name = section[len('Protocol '):]
                 protocols[proto_name] = dict(config.items(section))


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-telepathy.spec	8 Sep 2006 13:08:24 -0000	1.1
+++ python-telepathy.spec	2 Oct 2006 19:07:06 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           python-telepathy
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
+Patch0:		{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q -n telepathy-python-%{version}
+%patch0 -b .connection-manager
 
 
 %build
@@ -43,6 +45,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
+- Patch for connection manager.
+
 * Sat Sep  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:10:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 12:10:49 -0700
Subject: rpms/python-telepathy/devel python-telepathy.spec,1.2,1.3
Message-ID: <200610021910.k92JApfD014854@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14835

Modified Files:
	python-telepathy.spec 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-3
- Actually use the name variable for the patch.



Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-telepathy.spec	2 Oct 2006 19:07:06 -0000	1.2
+++ python-telepathy.spec	2 Oct 2006 19:10:49 -0000	1.3
@@ -2,14 +2,14 @@
 
 Name:           python-telepathy
 Version:        0.13.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
-Patch0:		{name}-connection-manager.patch
+Patch0:		%{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-3
+- Actually use the name variable for the patch.
+
 * Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
 - Patch for connection manager.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:10:53 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 12:10:53 -0700
Subject: rpms/clisp/devel clisp.spec,1.18,1.19
Message-ID: <200610021910.k92JAtP7014875@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14858

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- clisp.spec	2 Oct 2006 11:24:26 -0000	1.18
+++ clisp.spec	2 Oct 2006 19:10:53 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.40
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -20,7 +20,8 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	imake
-ExcludeArch:	ppc ppc64
+#ExcludeArch:	ppc ppc64
+ExcludeArch:	x86_64
 
 
 %description



From fedora-extras-commits at redhat.com  Mon Oct  2 19:37:42 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:37:42 -0700
Subject: rpms/cohoba - New directory
Message-ID: <200610021937.k92JbiPs015157@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15136/cohoba

Log Message:
Directory /cvs/extras/rpms/cohoba added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 19:37:43 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:37:43 -0700
Subject: rpms/cohoba/devel - New directory
Message-ID: <200610021937.k92Jbj3W015160@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15136/cohoba/devel

Log Message:
Directory /cvs/extras/rpms/cohoba/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 19:38:31 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:38:31 -0700
Subject: rpms/cohoba Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610021938.k92JcXlZ015219@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15186

Added Files:
	Makefile import.log 
Log Message:
Setup of module cohoba


--- NEW FILE Makefile ---
# Top level Makefile for module cohoba
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 19:38:32 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:38:32 -0700
Subject: rpms/cohoba/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610021938.k92JcYiW015222@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15186/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cohoba


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 19:38:50 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  2 Oct 2006 12:38:50 -0700
Subject: rpms/gai/devel gai.spec,1.20,1.21
Message-ID: <200610021938.k92JcqIv015260@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15240

Modified Files:
	gai.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gai.spec	18 Sep 2006 23:27:11 -0000	1.20
+++ gai.spec	2 Oct 2006 19:38:50 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -73,6 +73,9 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Tue Sep 19 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:39:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  2 Oct 2006 12:39:32 -0700
Subject: rpms/gai-pal/devel gai-pal.spec,1.14,1.15
Message-ID: <200610021939.k92JdY5w015346@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai-pal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15328

Modified Files:
	gai-pal.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gai-pal.spec	18 Sep 2006 23:28:01 -0000	1.14
+++ gai-pal.spec	2 Oct 2006 19:39:32 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:	GAI Pal applet
 Name:		gai-pal
 Version:	0.7
-Release: 10
+Release: 11
 Source0:	%{name}-%{version}.tar.bz2
 Patch0:		gai-pal-0.7-xosd-empty-msg.patch
 Patch1:		gai-pal-0.7-typo.patch
@@ -48,6 +48,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Tue Sep 19 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:39:42 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:39:42 -0700
Subject: rpms/cohoba import.log,1.1,1.2
Message-ID: <200610021939.k92JdiNu015417@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357

Modified Files:
	import.log 
Log Message:
auto-import cohoba-0.0.4-2 on branch devel from cohoba-0.0.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cohoba/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 19:38:31 -0000	1.1
+++ import.log	2 Oct 2006 19:39:42 -0000	1.2
@@ -0,0 +1 @@
+cohoba-0_0_4-2:HEAD:cohoba-0.0.4-2.src.rpm:1159817992



From fedora-extras-commits at redhat.com  Mon Oct  2 19:39:43 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:39:43 -0700
Subject: rpms/cohoba/devel cohoba-non-binary-in-usr-lib.patch, NONE,
	1.1 cohoba.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610021939.k92JdjBf015424@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cohoba-non-binary-in-usr-lib.patch cohoba.spec 
Log Message:
auto-import cohoba-0.0.4-2 on branch devel from cohoba-0.0.4-2.src.rpm

cohoba-non-binary-in-usr-lib.patch:

--- NEW FILE cohoba-non-binary-in-usr-lib.patch ---
--- cohoba/Makefile.in~	2006-09-29 08:33:06.000000000 +0200
+++ cohoba/Makefile.in	2006-09-29 08:33:58.000000000 +0200
@@ -242,7 +242,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SUBDIRS = bigbrother applet contacts common houston technobabble me
-cohobabindir = $(libdir)/cohoba
+cohobabindir = $(datadir)/cohoba
 cohobabin_SCRIPTS = cohoba-applet
 cohobadir = $(pythondir)/cohoba
 cohoba_PYTHON = \
--- data/Makefile.in~	2006-09-29 08:43:56.000000000 +0200
+++ data/Makefile.in	2006-09-29 08:45:19.000000000 +0200
@@ -291,7 +291,7 @@
 	accounts.glade \
 	main.glade
 
-cohobabindir = $(libdir)/cohoba
+cohobabindir = $(datadir)/cohoba
 
 #if GCONF_SCHEMAS_INSTALL
 #install-data-local: install-schemas


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

Name:           cohoba
Version:        0.0.4
Release:        2%{?dist}
Summary:        Cohoba is a GNOME interface for Telepathy. It aims to be innovative and simple

Group:          Applications/Communications
License:        GPL
URL:            http://telepathy.freedesktop.org/wiki/Cohoba
Source0:        http://telepathy.freedesktop.org/releases/cohoba/cohoba-0.0.4.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, perl-XML-Parser, GConf2, pygtk2-devel, glib2-devel, gnome-python2, gnome-python2-applet
Requires:       python-telepathy, gnome-python2-applet, pygtk2, python-ctypes, telepathy-filesystem

Patch1:		cohoba-non-binary-in-usr-lib.patch

%description
Gnome's interfaces for telepathy backend.
The aim of this project is to provide a D-Bus-based framework that unifies 
all forms of real time conversations, including, but not limited to, instant 
messaging, IRC and voice and video over IP. It aims to provide a simple 
interface to client applications allowing them to quickly implement code to 
make use of real time communication over any supported protocol. 

Cohoba is one of the gnome's interfaces for telepathy backend. It aims to be 
innovative and simple to use.

%prep
%setup -q
%patch1 -b .1-non-binary-in-usr-lib

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT 

chmod 644 AUTHORS COPYING README
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{python_sitelib}/cohoba/
%{_libdir}/bonobo/servers/Cohoba.server
%{_datadir}/cohoba/
%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Cohoba.TechnoBabbleChannelHandler.service
%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Houston.MissionControl.service
%{_datadir}/icons/hicolor/48x48/apps/cohoba.png
%{_datadir}/icons/hicolor/scalable/apps/cohoba.svg
%{_datadir}/telepathy/managers/org.freedesktop.Telepathy.Cohoba.BigBrotherChannelHandler.chandler
%{_datadir}/telepathy/managers/org.freedesktop.Telepathy.Cohoba.TechnoBabbleChannelHandler-voip.chandler
%{_datadir}/telepathy/managers/org.freedesktop.Telepathy.Cohoba.TechnoBabbleChannelHandler.chandler

%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 || :

%changelog
* Sun Oct 01 2006 Sander Hoentjen <sander at hoentjen.eu> - 0.0.4-2
- added Require telepathy-filesystem since we have files in %{_datadir}/telepathy/managers/

* Fri Sep 29 2006 Sander Hoentjen <sander at hoentjen.eu> - 0.0.4-1
- update to cohoba 0.0.4
- changed group to Applications/Communications
- added pygtk2, python-ctypes to Requires
- fixed ownership on %{_libdir}/cohoba/
- fixed cohoba only-non-binary-in-usr-lib

* Fri Sep 08 2006 Sander Hoentjen <sander at hoentjen.eu> - 0.0.3-2
- added requires gnome-python2-applet

* Thu Aug 31 2006 Sander Hoentjen <sander at hoentjen.eu> - 0.0.3-1
- created


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cohoba/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 19:38:32 -0000	1.1
+++ .cvsignore	2 Oct 2006 19:39:43 -0000	1.2
@@ -0,0 +1 @@
+cohoba-0.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cohoba/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 19:38:32 -0000	1.1
+++ sources	2 Oct 2006 19:39:43 -0000	1.2
@@ -0,0 +1 @@
+ddf2ae920bb123a0f19f0a404fb0ecae  cohoba-0.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 19:40:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  2 Oct 2006 12:40:12 -0700
Subject: rpms/sylpheed/devel sylpheed.spec,1.40,1.41
Message-ID: <200610021940.k92JeERJ015487@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15470

Modified Files:
	sylpheed.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sylpheed.spec	23 Sep 2006 08:28:36 -0000	1.40
+++ sylpheed.spec	2 Oct 2006 19:40:12 -0000	1.41
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -84,6 +84,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sat Sep 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.2.9-1
 - Update to 2.2.9 (also works around #201949).
 - New upstream URLs.



From fedora-extras-commits at redhat.com  Mon Oct  2 19:41:16 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  2 Oct 2006 12:41:16 -0700
Subject: rpms/aide/devel aide.spec,1.13,1.14
Message-ID: <200610021941.k92JfIWi015563@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15545

Modified Files:
	aide.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- aide.spec	11 Sep 2006 09:11:31 -0000	1.13
+++ aide.spec	2 Oct 2006 19:41:16 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Mon Sep 11 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:43:41 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:43:41 -0700
Subject: owners owners.list,1.1761,1.1762
Message-ID: <200610021943.k92JhhwA015635@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15618

Modified Files:
	owners.list 
Log Message:
added cohoba



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1761
retrieving revision 1.1762
diff -u -r1.1761 -r1.1762
--- owners.list	2 Oct 2006 14:57:16 -0000	1.1761
+++ owners.list	2 Oct 2006 19:43:41 -0000	1.1762
@@ -195,6 +195,7 @@
 Fedora Extras|cobbler|PXE, Xen, and Kickstart Provisioning|mdehaan at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|codeblocks|Code::Blocks C/C++ IDE|dan at danny.cz|extras-qa at fedoraproject.org|
 Fedora Extras|cogito|Cogito SCM based on git|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|cohoba|GNOME interface for Telepathy|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|coldet|3D Collision Detection Library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 19:56:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 12:56:09 -0700
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.10,
	1.11 perl-Config-Tiny.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <200610021956.k92JuB9u015756@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15735

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Update to 2.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Jul 2006 13:16:18 -0000	1.10
+++ .cvsignore	2 Oct 2006 19:56:08 -0000	1.11
@@ -1 +1 @@
-Config-Tiny-2.08.tar.gz
+Config-Tiny-2.10.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Config-Tiny.spec	16 Jul 2006 13:16:18 -0000	1.15
+++ perl-Config-Tiny.spec	2 Oct 2006 19:56:08 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.08
+Version:        2.10
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -39,7 +38,7 @@
 
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 
 %clean
@@ -54,6 +53,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.10-1
+- Updated to 2.10.
+
 * Sun Jul 16 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.08-1
 - Updated to 2.08.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Jul 2006 13:16:18 -0000	1.10
+++ sources	2 Oct 2006 19:56:08 -0000	1.11
@@ -1 +1 @@
-128b2a542923198a5e13b19b6dd6089d  Config-Tiny-2.08.tar.gz
+4db84e5ae2dbcdf7f0a36e64e43965cc  Config-Tiny-2.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 20:08:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 13:08:12 -0700
Subject: rpms/plt-scheme/devel plt-scheme.spec,1.27,1.28
Message-ID: <200610022008.k92K8Ets018793@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18776

Modified Files:
	plt-scheme.spec 
Log Message:



Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- plt-scheme.spec	28 Aug 2006 09:16:35 -0000	1.27
+++ plt-scheme.spec	2 Oct 2006 20:08:12 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        352
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -86,10 +86,13 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
-for i in ../%{_lib}/plt/bin/*
-do
+  for i in ../%{_lib}/plt/bin/*
+  do
     ln -sf $i .
-done
+  done
+  # binary planet conflicts with other packages
+  rm -f planet
+  ln -sf ../%{_lib}/plt/bin/planet plt-planet
 popd
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -135,6 +138,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 352-3
+- rename conflicting binary planet to plt-planet
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 352-2
 - Rebuild for FE6
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:10:46 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 13:10:46 -0700
Subject: rpms/plt-scheme/FC-5 plt-scheme.spec,1.26,1.27
Message-ID: <200610022010.k92KAmhT018858@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18841/FC-5

Modified Files:
	plt-scheme.spec 
Log Message:



Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-5/plt-scheme.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- plt-scheme.spec	28 Jul 2006 12:57:29 -0000	1.26
+++ plt-scheme.spec	2 Oct 2006 20:10:46 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        352
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -86,10 +86,13 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
-for i in ../%{_lib}/plt/bin/*
-do
+  for i in ../%{_lib}/plt/bin/*
+  do
     ln -sf $i .
-done
+  done
+  # binary planet conflicts with other packages
+  rm -f planet
+  ln -sf ../%{_lib}/plt/bin/planet plt-planet
 popd
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -135,6 +138,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 352-3
+- rename conflicting binary planet to plt-planet
+
 * Fri Jul 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 352-1
 - new version 352
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:31:45 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 13:31:45 -0700
Subject: rpms/abcm2ps/devel .cvsignore, 1.23, 1.24 abcm2ps.spec, 1.26,
	1.27 sources, 1.23, 1.24
Message-ID: <200610022031.k92KVlV0019061@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19040

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Aug 2006 10:17:04 -0000	1.23
+++ .cvsignore	2 Oct 2006 20:31:45 -0000	1.24
@@ -1,2 +1,2 @@
-abcm2ps-5.0.5.tar.gz
+abcm2ps-5.1.1.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- abcm2ps.spec	30 Aug 2006 10:17:04 -0000	1.26
+++ abcm2ps.spec	2 Oct 2006 20:31:45 -0000	1.27
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.0.5
+Version:        5.1.1
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.0.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.1.1-1
+- new version 5.1.1
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0.5-1
 - new version 5.0.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Aug 2006 10:17:04 -0000	1.23
+++ sources	2 Oct 2006 20:31:45 -0000	1.24
@@ -1,2 +1,2 @@
-323d89c00d8e82d26f7ad4598f5301c3  abcm2ps-5.0.5.tar.gz
+48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Oct  2 20:32:46 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 13:32:46 -0700
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.22, 1.23 abcm2ps.spec, 1.24,
	1.25 sources, 1.22, 1.23
Message-ID: <200610022032.k92KWmQo019129@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19108/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Aug 2006 10:17:04 -0000	1.22
+++ .cvsignore	2 Oct 2006 20:32:46 -0000	1.23
@@ -1,2 +1,2 @@
-abcm2ps-5.0.5.tar.gz
+abcm2ps-5.1.1.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/abcm2ps.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- abcm2ps.spec	30 Aug 2006 10:17:04 -0000	1.24
+++ abcm2ps.spec	2 Oct 2006 20:32:46 -0000	1.25
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.0.5
+Version:        5.1.1
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.0.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.1.1-1
+- new version 5.1.1
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0.5-1
 - new version 5.0.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Aug 2006 10:17:04 -0000	1.22
+++ sources	2 Oct 2006 20:32:46 -0000	1.23
@@ -1,2 +1,2 @@
-323d89c00d8e82d26f7ad4598f5301c3  abcm2ps-5.0.5.tar.gz
+48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Oct  2 20:40:23 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:40:23 -0700
Subject: rpms/aiccu/devel aiccu.spec,1.3,1.4
Message-ID: <200610022040.k92KePXO019254@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/aiccu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19237

Modified Files:
	aiccu.spec 
Log Message:
rebuild


Index: aiccu.spec
===================================================================
RCS file: /cvs/extras/rpms/aiccu/devel/aiccu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aiccu.spec	24 Sep 2006 04:34:20 -0000	1.3
+++ aiccu.spec	2 Oct 2006 20:40:23 -0000	1.4
@@ -9,7 +9,7 @@
 Summary:   AICCU - SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
 Version:   2006.07.25
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSDish
 Group:	   System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
@@ -73,6 +73,9 @@
 %{_sysconfdir}/init.d/aiccu
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <matt at domsch.com> 2006.07.25-2
+- rebuilt
+
 * Sat Sep 23 2006 Matt Domsch <matt at domsch.com> 2006.07.25-1
 - upgrade to latest upstream, drop all applied patches
 - add BR gnutls-devel now used for obtaining tunnel info



From fedora-extras-commits at redhat.com  Mon Oct  2 20:42:05 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:42:05 -0700
Subject: rpms/gpp/devel gpp.spec,1.4,1.5
Message-ID: <200610022042.k92Kg7vK019343@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19326

Modified Files:
	gpp.spec 
Log Message:
rebuild


Index: gpp.spec
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/gpp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gpp.spec	3 Sep 2006 01:52:02 -0000	1.4
+++ gpp.spec	2 Oct 2006 20:42:05 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:	GNOME Photo Printer
 Name:           gpp
 Version:	0.6.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.fogman.de/?GnomePhotoPrinter
 Source:         http://www.fogman.de/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{longname}.desktop
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <matt at domsch.com> 0.6.6-3
+- rebuilt
+
 * Sat Sep  2 2006 Matt Domsch <matt at domsch.com> 0.6.6-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:43:50 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:43:50 -0700
Subject: rpms/i810switch/devel i810switch.spec,1.8,1.9
Message-ID: <200610022043.k92KhqoW019436@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19416

Modified Files:
	i810switch.spec 
Log Message:
rebuild


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- i810switch.spec	3 Sep 2006 01:36:49 -0000	1.8
+++ i810switch.spec	2 Oct 2006 20:43:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -38,6 +38,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-5
+- rebuild
+
 * Sat Sep  2 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:45:10 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:45:10 -0700
Subject: rpms/perl-GnuPG-Interface/devel perl-GnuPG-Interface.spec,1.5,1.6
Message-ID: <200610022045.k92KjCIa019514@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19497

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:
rebuild


Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GnuPG-Interface.spec	3 Sep 2006 01:56:50 -0000	1.5
+++ perl-GnuPG-Interface.spec	2 Oct 2006 20:45:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        7%{?dist}
+Release:	8%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.33-8
+- rebuild
+
 * Sat Sep  2 2006 Matt Domsch <Matt_Domsch at dell.com> 0.33-7
 - rebuild for FC6
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:46:23 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:46:23 -0700
Subject: rpms/ttywatch/devel ttywatch.spec,1.3,1.4
Message-ID: <200610022046.k92KkPPP019583@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/ttywatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19566

Modified Files:
	ttywatch.spec 
Log Message:
rebuild


Index: ttywatch.spec
===================================================================
RCS file: /cvs/extras/rpms/ttywatch/devel/ttywatch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ttywatch.spec	3 Sep 2006 01:39:14 -0000	1.3
+++ ttywatch.spec	2 Oct 2006 20:46:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name: ttywatch
 Version: 0.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Log output of arbitrarily many devices
 License: GPL
 Group: System Environment/Daemons
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> 0.14-7
+- rebuild
+
 * Sat Sep  2 2006 Matt Domsch <Matt_Domsch at dell.com> 0.14-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:48:47 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  2 Oct 2006 13:48:47 -0700
Subject: rpms/libmodelfile/devel libmodelfile.spec,1.2,1.3
Message-ID: <200610022048.k92Kmnqq019663@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/libmodelfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19646

Modified Files:
	libmodelfile.spec 
Log Message:
Rebuild for FE-6 gcc bug




Index: libmodelfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodelfile/devel/libmodelfile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmodelfile.spec	21 Sep 2006 05:42:02 -0000	1.2
+++ libmodelfile.spec	2 Oct 2006 20:48:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libmodelfile
 Version:        0.1.92
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for accessing various model file formats
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Sep 20 2006 Wart <wart at kobold.org> 0.1.92-4
+- Rebuild for FE-6 gcc bug
+
 * Wed Sep 20 2006 Wart <wart at kobold.org> 0.1.92-3
 - Change license to 'Distributable' until upstream cleans up the license
   text (BZ #198830)



From fedora-extras-commits at redhat.com  Mon Oct  2 20:49:13 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  2 Oct 2006 13:49:13 -0700
Subject: rpms/libmodelfile/devel libmodelfile.spec,1.3,1.4
Message-ID: <200610022049.k92KnF4f019686@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/libmodelfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19669

Modified Files:
	libmodelfile.spec 
Log Message:
Forgot to update the date in the changelog.  Oops!




Index: libmodelfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodelfile/devel/libmodelfile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmodelfile.spec	2 Oct 2006 20:48:47 -0000	1.3
+++ libmodelfile.spec	2 Oct 2006 20:49:13 -0000	1.4
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Wed Sep 20 2006 Wart <wart at kobold.org> 0.1.92-4
+* Mon Oct 2 2006 Wart <wart at kobold.org> 0.1.92-4
 - Rebuild for FE-6 gcc bug
 
 * Wed Sep 20 2006 Wart <wart at kobold.org> 0.1.92-3



From fedora-extras-commits at redhat.com  Mon Oct  2 20:53:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 13:53:56 -0700
Subject: rpms/xdg-utils/devel xdg-utils.spec,1.5,1.6
Message-ID: <200610022053.k92KrwY1019747@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19730

Modified Files:
	xdg-utils.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
- update %description (#208926)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdg-utils.spec	21 Sep 2006 02:05:31 -0000	1.5
+++ xdg-utils.spec	2 Oct 2006 20:53:56 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -35,15 +35,14 @@
 *  Distribution vendors can provide custom versions of these utilities
 
 The following scripts are provided at this time:
-* xdg-menu        Place a menu into the users menu structure
-* xdg-mime        Gather mime information about a file
-* xdg-open        Open a URL in the user's preferred application that
-                  handles the respective URL or file type
-* xdg-email       Open the users preferred email client,
-                  potentially with subject and other info filled in
-* xdg-copy        Copy one URI to another
-* xdg-su          Run a command as a different (usually root) user
-* xdg-screensaver Enable, disable, or suspend the screensaver
+* xdg-desktop-menu      Install desktop menu items
+* xdg-desktop-icon      Install icons to the desktop
+* xdg-icon-resource     Install icon resources
+* xdg-mime              Query information about file type handling and
+                        install descriptions for new file types
+* xdg-open              Open a file or URL in the user's preferred application
+* xdg-email             Send mail using the user's preferred e-mail composer
+* xdg-screensaver       Control the screensaver
 
 
 %prep
@@ -74,6 +73,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
+- update %%description (#208926)
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.8.rc1
 - 1.0rc1
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:54:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 13:54:19 -0700
Subject: rpms/xdg-utils/FC-5 xdg-utils.spec,1.5,1.6
Message-ID: <200610022054.k92KsLNS019808@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19791

Modified Files:
	xdg-utils.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
- update %description (#208926)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdg-utils.spec	21 Sep 2006 02:05:52 -0000	1.5
+++ xdg-utils.spec	2 Oct 2006 20:54:19 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -35,15 +35,14 @@
 *  Distribution vendors can provide custom versions of these utilities
 
 The following scripts are provided at this time:
-* xdg-menu        Place a menu into the users menu structure
-* xdg-mime        Gather mime information about a file
-* xdg-open        Open a URL in the user's preferred application that
-                  handles the respective URL or file type
-* xdg-email       Open the users preferred email client,
-                  potentially with subject and other info filled in
-* xdg-copy        Copy one URI to another
-* xdg-su          Run a command as a different (usually root) user
-* xdg-screensaver Enable, disable, or suspend the screensaver
+* xdg-desktop-menu      Install desktop menu items
+* xdg-desktop-icon      Install icons to the desktop
+* xdg-icon-resource     Install icon resources
+* xdg-mime              Query information about file type handling and
+                        install descriptions for new file types
+* xdg-open              Open a file or URL in the user's preferred application
+* xdg-email             Send mail using the user's preferred e-mail composer
+* xdg-screensaver       Control the screensaver
 
 
 %prep
@@ -74,6 +73,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
+- update %%description (#208926)
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.8.rc1
 - 1.0rc1
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:54:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 13:54:39 -0700
Subject: rpms/xdg-utils/FC-4 xdg-utils.spec,1.5,1.6
Message-ID: <200610022054.k92KsfDd019869@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19852

Modified Files:
	xdg-utils.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
- update %description (#208926)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/xdg-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdg-utils.spec	21 Sep 2006 02:06:13 -0000	1.5
+++ xdg-utils.spec	2 Oct 2006 20:54:38 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -35,15 +35,14 @@
 *  Distribution vendors can provide custom versions of these utilities
 
 The following scripts are provided at this time:
-* xdg-menu        Place a menu into the users menu structure
-* xdg-mime        Gather mime information about a file
-* xdg-open        Open a URL in the user's preferred application that
-                  handles the respective URL or file type
-* xdg-email       Open the users preferred email client,
-                  potentially with subject and other info filled in
-* xdg-copy        Copy one URI to another
-* xdg-su          Run a command as a different (usually root) user
-* xdg-screensaver Enable, disable, or suspend the screensaver
+* xdg-desktop-menu      Install desktop menu items
+* xdg-desktop-icon      Install icons to the desktop
+* xdg-icon-resource     Install icon resources
+* xdg-mime              Query information about file type handling and
+                        install descriptions for new file types
+* xdg-open              Open a file or URL in the user's preferred application
+* xdg-email             Send mail using the user's preferred e-mail composer
+* xdg-screensaver       Control the screensaver
 
 
 %prep
@@ -74,6 +73,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
+- update %%description (#208926)
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.8.rc1
 - 1.0rc1
 



From fedora-extras-commits at redhat.com  Mon Oct  2 21:18:48 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Mon,  2 Oct 2006 14:18:48 -0700
Subject: rpms/libtorrent/devel libtorrent.spec,1.11,1.12
Message-ID: <200610022118.k92LIoh5022874@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22857

Modified Files:
	libtorrent.spec 
Log Message:
Bump EVR to fix broken upgrade path (BZ #208985)


Index: libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libtorrent.spec	29 Sep 2006 09:55:14 -0000	1.11
+++ libtorrent.spec	2 Oct 2006 21:18:48 -0000	1.12
@@ -2,7 +2,7 @@
 License:       GPL
 Group:         System Environment/Libraries
 Version:       0.10.2
-Release:       1%{?dist}
+Release:       3%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Oct 02 2006 Chris Chabot <chabotc at xs4all.nl> - 0.10.2-3
+- Bump EVR to fix broken upgrade path (BZ #208985)
+
 * Fri Sep 29 2006 Chris Chabot <chabotc at xs4all.nl> - 0.10.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Oct  2 21:24:32 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:24:32 -0700
Subject: rpms/wavbreaker - New directory
Message-ID: <200610022124.k92LOYba023012@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22986/wavbreaker

Log Message:
Directory /cvs/extras/rpms/wavbreaker added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 21:24:33 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:24:33 -0700
Subject: rpms/wavbreaker/devel - New directory
Message-ID: <200610022124.k92LOZuO023015@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22986/wavbreaker/devel

Log Message:
Directory /cvs/extras/rpms/wavbreaker/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 21:24:40 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:24:40 -0700
Subject: rpms/wavbreaker Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610022124.k92LOgww023062@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23031

Added Files:
	Makefile import.log 
Log Message:
Setup of module wavbreaker


--- NEW FILE Makefile ---
# Top level Makefile for module wavbreaker
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 21:24:41 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:24:41 -0700
Subject: rpms/wavbreaker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610022124.k92LOhqv023065@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23031/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wavbreaker


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 21:25:05 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:25:05 -0700
Subject: rpms/wavbreaker import.log,1.1,1.2
Message-ID: <200610022125.k92LP7bj023151@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23115

Modified Files:
	import.log 
Log Message:
auto-import wavbreaker-0.7-5 on branch devel from wavbreaker-0.7-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 21:24:40 -0000	1.1
+++ import.log	2 Oct 2006 21:25:05 -0000	1.2
@@ -0,0 +1 @@
+wavbreaker-0_7-5:HEAD:wavbreaker-0.7-5.src.rpm:1159824312



From fedora-extras-commits at redhat.com  Mon Oct  2 21:25:06 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:25:06 -0700
Subject: rpms/wavbreaker/devel
	wavbreaker-0.7-browsedir-set_current_folder-v2.patch, NONE,
	1.1 wavbreaker-icon.png, NONE, 1.1 wavbreaker.desktop, NONE,
	1.1 wavbreaker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610022125.k92LP8B2023158@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23115/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wavbreaker-0.7-browsedir-set_current_folder-v2.patch 
	wavbreaker-icon.png wavbreaker.desktop wavbreaker.spec 
Log Message:
auto-import wavbreaker-0.7-5 on branch devel from wavbreaker-0.7-5.src.rpm

wavbreaker-0.7-browsedir-set_current_folder-v2.patch:

--- NEW FILE wavbreaker-0.7-browsedir-set_current_folder-v2.patch ---
--- wavbreaker-0.7/src/wavbreaker.c.orig	2006-06-01 14:26:31.000000000 -0400
+++ wavbreaker-0.7/src/wavbreaker.c	2006-06-01 14:29:02.000000000 -0400
@@ -1203,11 +1203,15 @@
 
     if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
         char *filename;
+        char *dirname;
 
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 //        printf("filename: \"%s\"\n", filename);
         set_sample_filename(filename);
         g_free(filename);
+        dirname = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
+        saveas_set_dirname(dirname);
+        g_free(dirname);
         open_file();
     }
 
--- wavbreaker-0.7/src/browsedir.c.orig	2006-06-01 14:26:24.000000000 -0400
+++ wavbreaker-0.7/src/browsedir.c	2006-06-01 14:30:03.000000000 -0400
@@ -47,9 +47,9 @@
 
     dialog = gtk_file_chooser_dialog_new("Select Output Directory",
             GTK_WINDOW(parent_window), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN,
+            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK,
             GTK_RESPONSE_ACCEPT, NULL);
-    gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), callback_get_func());
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), callback_get_func());
 
     if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
         char *filename;


--- NEW FILE wavbreaker.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wavbreaker
GenericName=Wave File Splitter
Comment=Break a .wav file into multiple .wav files
Exec=wavbreaker
Icon=wavbreaker-icon.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;
Version=0.6.1
MimeType=audio/x-wav;


--- NEW FILE wavbreaker.spec ---
Summary:	Tool for splitting .wav files
Name:		wavbreaker
Version: 	0.7
Release: 	5%{?dist}
License: 	GPL
Group: 		Applications/Multimedia
URL: 		http://huli.org/wavbreaker/index.html
Source: 	http://huli.org/wavbreaker/%{name}-%{version}.tar.gz
Source1:	wavbreaker-icon.png
Source2:	wavbreaker.desktop
Patch:		wavbreaker-0.7-browsedir-set_current_folder-v2.patch
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gtk2-devel, libxml2-devel, desktop-file-utils, alsa-lib-devel
Requires(post):	desktop-file-utils
Requires(postun): desktop-file-utils

%description
This application's purpose in life is to take a wave file and break it 
up into multiple wave files. It makes a clean break at the correct 
position to burn the files to an audio cd without any dead air between 
the tracks. It will only read wave files, so use an appropriate tool to 
convert ogg, mp3, etc. files and then break them up.

%prep
%setup -q
%patch -p1

%build
%configure
make %{?_smp_mflags}

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

mkdir -p %{buildroot}%{_datadir}/pixmaps
install -p %{SOURCE1} %{buildroot}%{_datadir}/pixmaps

desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE2}

%clean
rm -rf %{buildroot}

%post
update-desktop-database %{_datadir}/applications &> /dev/null ||:

%postun
update-desktop-database %{_datadir}/applications &> /dev/null ||:

%files
%defattr(-,root,root,-)
%{_bindir}/wav*
%{_datadir}/wavbreaker
%{_datadir}/applications/*wavbreaker.desktop
%{_datadir}/pixmaps/wavbreaker-icon.png
%doc ChangeLog CONTRIBUTORS NEWS AUTHORS COPYING README TODO

%changelog
* Thu Jun 1 2006 Homer <dmaley at nc.rr.com> 0.7-5
- replaced wavbreaker-0.7-browsedir-set_current_folder.patch w/ 
  wavbreaker-0.7-browsedir-set_current_folder-v2.patch

* Tue May 30 2006 Homer <dmaley at nc.rr.com> 0.7-4
- added wavbreaker-0.7-browsedir-set_current_folder.patch

* Mon Apr 3 2006 Homer <dmaley at nc.rr.com> 0.7-3
- fixed %doc

* Tue Mar 21 2006 Homer <dmaley at nc.rr.com> 0.7-2
- added %doc

* Mon Feb 27 2006 Homer <dmaley at nc.rr.com> 0.7-1
- initial 0.7 build

* Mon Feb 20 2006 Homer <dmaley at nc.rr.com> 0.7a-1
- initial 0.7a build

* Mon Jan 25 2006 Homer <dmaley at nc.rr.com> 0.6.1-6
- default to ALSA

* Mon Dec 19 2005 Homer <dmaley at nc.rr.com> 0.6.1-5
- more .spec cleanup

* Fri Dec 9 2005 Homer <dmaley at nc.rr.com> 0.6.1-4
- continued .spec cleanup

* Wed Dec 7 2005 Homer <dmaley at nc.rr.com> 0.6.1-3
- cleaned up .spec based on Fedora Extras guidelines

* Mon Sep 12 2005 Homer <homerj at nc.rr.com> 0.6-homer.2
- fixed progress bar for save-as (wavbreaker-saveas-progress.patch)

* Thu Jun 2 2005 Homer <homerj at nc.rr.com> 0.6-homer.1
- rebuilt for 0.6.1 (bugfix release)

* Wed Jun 1 2005 Homer <homerj at nc.rr.com> 0.6-homer.1
- 0.6 released

* Wed May 23 2005 Homer <homerj at nc.rr.com> 0.6c-homer.2
- 0.6c (beta) release

* Wed May 19 2005 Homer <homerj at nc.rr.com> 0.6b-homer.3
- SPEC file clean-up

* Sat Feb 12 2005 Homer <homerj at nc.rr.com> 0.6b-homer.2
- appconfig.c: added remember-driver patch

* Tue Feb 8 2005 Homer <homerj at nc.rr.com> 0.6b-homer.1
- 0.6b (beta) release
- Makefile.am: added -lasound to wavbreaker_LDADD to fix compile error

* Fri Oct 29 2004 Homer <homerj at nc.rr.com> 0.5-homer.2
- attempted fix file closing bug (wavbreaker-fclose.patch)
- added BuildRequires for gtk2-devel

* Tue Jul 13 2004 Homer <homerj at nc.rr.com> 0.5-homer.1
- rebuilt for 0.5 release

* Thu Jul 1 2004 Homer <homerj at nc.rr.com> 0.4-homer.4
- actually fixed icon bug

* Thu Jul 1 2004 Homer <homerj at nc.rr.com> 0.4-homer.2
- (failed) attempt to fix icon bug

* Mon Jun 15 2004 Homer <homerj at nc.rr.com>
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 21:24:41 -0000	1.1
+++ .cvsignore	2 Oct 2006 21:25:06 -0000	1.2
@@ -0,0 +1 @@
+wavbreaker-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 21:24:41 -0000	1.1
+++ sources	2 Oct 2006 21:25:06 -0000	1.2
@@ -0,0 +1 @@
+6e5a776e124b8e02dd184b06bcce5c4a  wavbreaker-0.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 21:29:59 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 14:29:59 -0700
Subject: comps comps-fe6.xml.in,1.172,1.173 comps-fe5.xml.in,1.159,1.160
Message-ID: <200610022130.k92LU2m3023293@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23260

Modified Files:
	comps-fe6.xml.in comps-fe5.xml.in 
Log Message:
Add rawstudio to Graphics group



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- comps-fe6.xml.in	2 Oct 2006 17:53:13 -0000	1.172
+++ comps-fe6.xml.in	2 Oct 2006 21:29:59 -0000	1.173
@@ -588,6 +588,7 @@
       <packagereq type="optional">k3d</packagereq>
       <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">pydot</packagereq>
+      <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">showimg</packagereq>
       <packagereq type="optional">skencil</packagereq>


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- comps-fe5.xml.in	2 Oct 2006 12:32:23 -0000	1.159
+++ comps-fe5.xml.in	2 Oct 2006 21:29:59 -0000	1.160
@@ -511,6 +511,7 @@
       <packagereq type="optional">k3d</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>
+      <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">showimg</packagereq>
       <packagereq type="optional">skencil</packagereq>



From fedora-extras-commits at redhat.com  Mon Oct  2 21:33:27 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:33:27 -0700
Subject: owners owners.list,1.1762,1.1763
Message-ID: <200610022133.k92LXTVc023361@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344

Modified Files:
	owners.list 
Log Message:

Added miau (review BZ#208675)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1762
retrieving revision 1.1763
diff -u -r1.1762 -r1.1763
--- owners.list	2 Oct 2006 19:43:41 -0000	1.1762
+++ owners.list	2 Oct 2006 21:33:26 -0000	1.1763
@@ -1014,6 +1014,7 @@
 Fedora Extras|mgopen-fonts|Truetype greek fonts|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|mhash|Thread-safe hash algorithms library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|mhonarc|A Perl mail-to-HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|miau|Full-featured IRC bouncer|jima at beer.tclug.org|extras-qa at fedoraproject.org|
 Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|milter-regex|Sendmail milter plugin for regular expression filtering|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|mimedefang|E-Mail filtering framework using Sendmail's Milter interface|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 21:34:23 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:34:23 -0700
Subject: rpms/miau/devel - New directory
Message-ID: <200610022134.k92LYPPv023439@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23410/miau/devel

Log Message:
Directory /cvs/extras/rpms/miau/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 21:34:22 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:34:22 -0700
Subject: rpms/miau - New directory
Message-ID: <200610022134.k92LYOS0023436@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23410/miau

Log Message:
Directory /cvs/extras/rpms/miau added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 21:34:34 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:34:34 -0700
Subject: rpms/miau Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610022134.k92LYa59023488@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23455

Added Files:
	Makefile import.log 
Log Message:
Setup of module miau


--- NEW FILE Makefile ---
# Top level Makefile for module miau
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 21:34:34 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:34:34 -0700
Subject: rpms/miau/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610022134.k92LYaFg023491@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23455/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module miau


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 21:35:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:35:02 -0700
Subject: rpms/miau import.log,1.1,1.2
Message-ID: <200610022135.k92LZZm4023559@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23525

Modified Files:
	import.log 
Log Message:
auto-import miau-0.6.2-3 on branch devel from miau-0.6.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/miau/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 21:34:34 -0000	1.1
+++ import.log	2 Oct 2006 21:35:02 -0000	1.2
@@ -0,0 +1 @@
+miau-0_6_2-3:HEAD:miau-0.6.2-3.src.rpm:1159824897



From fedora-extras-commits at redhat.com  Mon Oct  2 21:35:03 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:35:03 -0700
Subject: rpms/miau/devel miau.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610022135.k92LZZDs023563@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23525/devel

Modified Files:
	.cvsignore sources 
Added Files:
	miau.spec 
Log Message:
auto-import miau-0.6.2-3 on branch devel from miau-0.6.2-3.src.rpm


--- NEW FILE miau.spec ---
Name:           miau
Version:        0.6.2
Release:        3%{?dist}
Summary:        Full-featured IRC bouncer

Group:          Applications/Internet
License:        GPL
URL:            http://miau.sourceforge.net/
Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
miau is a smart and versatile IRC-bouncing tool for *NIX. The difference 
between miau and other bouncers is that miau will go on IRC as soon as 
it is launched, guarding or attempting to get your nick. Control over 
the session can be taken as with other bouncers, by simply connecting to 
miau (and providing a password) like you would connect to a normal IRC 
server. On disconnect, miau is able to stay in the channels and to 
reintroduce them to your client on your next connect. Other handy 
features are message logging, flood protection, and DCC bouncing.

%prep
%setup -q


%build
COMMON="--enable-local --enable-dccbounce --enable-automode --enable-releasenick --enable-ctcp-replies --enable-mkpasswd --enable-uptime --enable-chanlog --enable-privlog --enable-onconnect  --enable-empty-awaymsg"
%configure \
    --enable-ipv6 \
    $COMMON
make %{?_smp_mflags}
mv src/%{name} src/%{name}-ipv6
%configure \
    $COMMON
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 \
    $RPM_BUILD_ROOT%{_infodir}
install -m 0755 src/%{name} $RPM_BUILD_ROOT%{_bindir}
install -m 0755 src/%{name}-ipv6 $RPM_BUILD_ROOT%{_bindir}
install -m 0644 doc/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
install -m 0644 doc/%{name}.info $RPM_BUILD_ROOT%{_infodir}


%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 AUTHORS ChangeLog COPYING misc/miaurc NEWS README TODO
%{_bindir}/%{name}
%{_bindir}/%{name}-ipv6
%{_mandir}/man1/%{name}.1*
%{_infodir}/%{name}.info*

%changelog
* Mon Oct 02 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.6.2-3
- Fixed scriptlets, added Reqs for install-info, removed INSTALL from docs

* Fri Sep 29 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.6.2-2
- Initial Fedora Extras RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/miau/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 21:34:34 -0000	1.1
+++ .cvsignore	2 Oct 2006 21:35:03 -0000	1.2
@@ -0,0 +1 @@
+miau-0.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/miau/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 21:34:34 -0000	1.1
+++ sources	2 Oct 2006 21:35:03 -0000	1.2
@@ -0,0 +1 @@
+8a7a8a80250a9a316a3dc9d6fb15ecbe  miau-0.6.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 21:49:43 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:49:43 -0700
Subject: owners owners.list,1.1763,1.1764
Message-ID: <200610022149.k92Lnkpd023703@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23686/owners

Modified Files:
	owners.list 
Log Message:
added owners.list entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1763
retrieving revision 1.1764
diff -u -r1.1763 -r1.1764
--- owners.list	2 Oct 2006 21:33:26 -0000	1.1763
+++ owners.list	2 Oct 2006 21:49:43 -0000	1.1764
@@ -2218,6 +2218,7 @@
 Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wavpack|A completely open audiocodec|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|wcstools|Software utilities to display and manipulate the WCS of a FITS image|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 22:03:09 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:03:09 -0700
Subject: rpms/alleyoop - New directory
Message-ID: <200610022203.k92M3BaC026667@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26646/alleyoop

Log Message:
Directory /cvs/extras/rpms/alleyoop added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 22:03:10 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:03:10 -0700
Subject: rpms/alleyoop/devel - New directory
Message-ID: <200610022203.k92M3Cud026675@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26646/alleyoop/devel

Log Message:
Directory /cvs/extras/rpms/alleyoop/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 22:03:49 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:03:49 -0700
Subject: rpms/alleyoop/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610022203.k92M3pwa026722@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26691/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alleyoop


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 22:03:47 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:03:47 -0700
Subject: rpms/alleyoop Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610022203.k92M3nii026707@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26691

Added Files:
	Makefile import.log 
Log Message:
Setup of module alleyoop


--- NEW FILE Makefile ---
# Top level Makefile for module alleyoop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 22:05:17 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:05:17 -0700
Subject: rpms/alleyoop/devel alleyoop.desktop, NONE, 1.1 alleyoop.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610022205.k92M5JX6026799@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26763/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alleyoop.desktop alleyoop.spec 
Log Message:
auto-import alleyoop-0.9.3-2 on branch devel from alleyoop-0.9.3-2.src.rpm


--- NEW FILE alleyoop.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Alleyoop
GenericName=Memory Checker
Comment=Validate the memory usage of any program
Exec=alleyoop
Icon=gnome-devel.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Application;GNOME;Development;X-Fedora;
Version=0.9.0


--- NEW FILE alleyoop.spec ---
Name:       alleyoop
Version:    0.9.3
Release:    2%{?dist}
License:    GPL
Group:      Development/Tools
Summary:    Graphical front-end to the Valgrind memory checker for x86
URL:        http://alleyoop.sourceforge.net/
Source0:    http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:    alleyoop.desktop
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: valgrind >= 3.1.0
BuildRequires: libgnomeui-devel, gettext, intltool
BuildRequires: desktop-file-utils
BuildRequires: binutils-devel

Requires: valgrind >= 3.1.0
Requires: GConf2, scrollkeeper
# Limited to arches where valgrind exists
ExclusiveArch: %{ix86} x86_64

%description
Alleyoop is a graphical front-end to the increasingly popular Valgrind
memory checker for x86 GNU/ Linux using the Gtk+ widget set and other
GNOME libraries for the X Windows System.

Features include a right-click context menu to intelligently suppress
errors or launch an editor on the source file/jumping to the exact
line of the error condition. A searchbar at the top of the viewer can
be used to limit the viewable errors to those that match the regex
criteria entered. Also included is a fully functional Suppressions
editor.

%prep
%setup -q

%build
%configure --disable-install-schemas
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
make install DESTDIR=${RPM_BUILD_ROOT}
%find_lang %{name}

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

%post
export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
scrollkeeper-update -q

%postun
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
scrollkeeper-update -q

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%config %{_sysconfdir}/gconf/schemas/*.schemas
%{_bindir}/*
%{_datadir}/applications/*.desktop


%changelog
* Mon Oct 2 2006 Gianluca Sforna <giallu gmail com> 0.9.3-2
- address comments from review (BZ# 201417)

* Tue Aug 15 2006 Gianluca Sforna <giallu gmail com> 0.9.3-1
- version update
- add BRs: desktop-file-utils, intlutil

* Thu Aug 3 2006 Gianluca Sforna <giallu gmail com> 0.9.2-1
- version update
- dropped patches
- raised required valgrind version

* Thu Sep  1 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-3
- add BR: gettext
- "X-Desktop-File-Install-Version=0.4" removed from alleyop.desktop
- s/X-Windows/X Window System/ in %%description
- gconftool-2 --makefile-uninstall-rule code added in %%postun
- Requires for GConf2 and scrollkeeper added
- Patch to use --log-fd (new syntax)

* Thu Jul 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-2
- fix stupid typo in ExclusiveArch

* Wed Jul 27 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alleyoop/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 22:03:48 -0000	1.1
+++ .cvsignore	2 Oct 2006 22:05:16 -0000	1.2
@@ -0,0 +1 @@
+alleyoop-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alleyoop/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 22:03:48 -0000	1.1
+++ sources	2 Oct 2006 22:05:16 -0000	1.2
@@ -0,0 +1 @@
+b3a4703f60448c30122ca55fd00d1c0f  alleyoop-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 22:05:15 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:05:15 -0700
Subject: rpms/alleyoop import.log,1.1,1.2
Message-ID: <200610022205.k92M5lXw026857@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26763

Modified Files:
	import.log 
Log Message:
auto-import alleyoop-0.9.3-2 on branch devel from alleyoop-0.9.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alleyoop/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 22:03:45 -0000	1.1
+++ import.log	2 Oct 2006 22:05:15 -0000	1.2
@@ -0,0 +1 @@
+alleyoop-0_9_3-2:HEAD:alleyoop-0.9.3-2.src.rpm:1159826702



From fedora-extras-commits at redhat.com  Mon Oct  2 22:18:59 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:18:59 -0700
Subject: owners owners.list,1.1764,1.1765
Message-ID: <200610022219.k92MJ1v4027024@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26985

Modified Files:
	owners.list 
Log Message:
Add alleyoop package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1764
retrieving revision 1.1765
diff -u -r1.1764 -r1.1765
--- owners.list	2 Oct 2006 21:49:43 -0000	1.1764
+++ owners.list	2 Oct 2006 22:18:59 -0000	1.1765
@@ -38,6 +38,7 @@
 Fedora Extras|alleggl|OpenGL support library for Allegro|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
 Fedora Extras|AllegroOGG|Ogg library for use with the Allegro game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|alleyoop|Graphical front-end to the Valgrind memory checker|giallu at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|alltray|Dock any application in the tray|denis at poolshark.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de



From fedora-extras-commits at redhat.com  Mon Oct  2 22:30:07 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon,  2 Oct 2006 15:30:07 -0700
Subject: rpms/gaim-otr/devel gaim-otr.spec,1.22,1.23
Message-ID: <200610022230.k92MU9V0027210@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27180

Modified Files:
	gaim-otr.spec 
Log Message:
* Mon Oct  2 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.2.20060921cvs
- rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: gaim-otr.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-otr/devel/gaim-otr.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gaim-otr.spec	22 Sep 2006 15:21:07 -0000	1.22
+++ gaim-otr.spec	2 Oct 2006 22:30:06 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Off-The-Record Messaging plugin for GAIM
 Name: gaim-otr
 Version: 3.0.1
-Release: 0.1.20060921cvs%{?dist}
+Release: 0.2.20060921cvs%{?dist}
 #Source: http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
 Source: %{name}-20060712.tar.gz
 Url: http://www.cypherpunks.ca/otr/
@@ -47,6 +47,9 @@
 %{_libdir}/gaim/gaim-otr.so
 
 %changelog
+* Mon Oct  2 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.2.20060921cvs
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.1.20060921cvs
 - Made an error in the cvs version number, breaking the upgrade path.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 22:49:15 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  2 Oct 2006 15:49:15 -0700
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.4,1.5
Message-ID: <200610022249.k92MnHKR027389@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27372

Modified Files:
	qcomicbook.spec 
Log Message:
New version to match FC5



Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qcomicbook.spec	20 Sep 2006 20:26:56 -0000	1.4
+++ qcomicbook.spec	2 Oct 2006 22:49:15 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -9,16 +9,12 @@
 Source: http://linux.bydg.org/~yogin/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
-#BuildArch: i686
 BuildRequires: qt-devel >= 3.3.1
 BuildRequires: imlib2-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXi-devel
 BuildRequires: desktop-file-utils
 
-#Requires: qt >= 3.3.1
-#Requires: imlib2
-
 %description
 QComicBook is a viewer for comic book archives: rar, cbr,
 zip, cbz, ace, cba,tar.gz, cbg, tar.bz2, cbb. QComicBook 
@@ -64,7 +60,7 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-1
+* Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-2
 - Bumped release to 0.3.3
 
 * Sun Sep 03 2006 Scott Baker <scott at perturb.org> - 0.3.2-6



From fedora-extras-commits at redhat.com  Mon Oct  2 22:49:39 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 15:49:39 -0700
Subject: rpms/multitail/devel multitail.spec,1.9,1.10
Message-ID: <200610022249.k92MnfjH027452@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27435

Modified Files:
	multitail.spec 
Log Message:
Rebuild.


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- multitail.spec	18 Sep 2006 18:48:11 -0000	1.9
+++ multitail.spec	2 Oct 2006 22:49:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           multitail
 Version:        4.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        View one or multiple files like tail but with multiple windows
 
 Group:          Applications/Text
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 4.2.0-2
+- Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
+
 * Mon Sep 18 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.2.0-1
 - Updated to release 4.2.0.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 22:51:54 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 15:51:54 -0700
Subject: rpms/perl-Cairo/devel perl-Cairo.spec,1.6,1.7
Message-ID: <200610022251.k92MpuN6027597@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27580

Modified Files:
	perl-Cairo.spec 
Log Message:
Rebuild.


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/perl-Cairo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Cairo.spec	26 Sep 2006 21:48:00 -0000	1.6
+++ perl-Cairo.spec	2 Oct 2006 22:51:54 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           perl-Cairo
 Version:        1.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the cairo library
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-2
+- Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
+
 * Tue Sep 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-1
 - Update to 1.01.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 22:54:46 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  2 Oct 2006 15:54:46 -0700
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.5,1.6
Message-ID: <200610022254.k92MsmxJ027786@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27766

Modified Files:
	qcomicbook.spec 
Log Message:
Build for FC6



Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qcomicbook.spec	2 Oct 2006 22:49:15 -0000	1.5
+++ qcomicbook.spec	2 Oct 2006 22:54:46 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -60,6 +60,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-3
+- Build on FC6
+
 * Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-2
 - Bumped release to 0.3.3
 



From fedora-extras-commits at redhat.com  Mon Oct  2 23:13:54 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  2 Oct 2006 16:13:54 -0700
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.8,
	1.9 NetworkManager-vpnc.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <200610022313.k92NDumh032217@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32183

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Log Message:
Update to CVS snapshot 060929. Some rpmlint cleanup


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 May 2006 05:12:51 -0000	1.8
+++ .cvsignore	2 Oct 2006 23:13:54 -0000	1.9
@@ -1,7 +1 @@
-NetworkManager-vpnc-0.2.tar.gz
-NetworkManager-vpnc-0.3.tar.gz
-NetworkManager-vpnc-0.5.0.tar.gz
-NetworkManager-vpnc-0.6.0.tar.gz
-NetworkManager-vpnc-0.6.2.tar.gz
-NetworkManager-vpnc-0.7.0.cvs20060521.tar.gz
-NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz
+NetworkManager-vpnc-0.7.0.cvs20060929.tar.gz


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NetworkManager-vpnc.spec	28 Sep 2006 23:30:45 -0000	1.16
+++ NetworkManager-vpnc.spec	2 Oct 2006 23:13:54 -0000	1.17
@@ -7,17 +7,19 @@
 %define cvs_snapshot 1
 
 %if %{cvs_snapshot}
-%define nm_vpnc_cvs_version	.cvs20060529
+%define nm_vpnc_cvs_version .cvs20060929
 %endif
 
-Summary: NetworkManager VPN integration for vpnc
-Name: NetworkManager-vpnc
-Version: 0.7.0
-Release: 0%{?nm_vpnc_cvs_version}.4%{?dist}
-License: GPL
-Group: System Environment/Base
-Source: %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
+Summary:   NetworkManager VPN integration for vpnc
+Name:      NetworkManager-vpnc
+Version:   0.7.0
+Release:   0%{?nm_vpnc_cvs_version}.1%{?dist}
+License:   GPL
+Group:     System Environment/Base
+URL:       http://www.gnome.org/projects/NetworkManager/
+Source:    %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
@@ -26,18 +28,18 @@
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: libpng-devel
-BuildRequires: perl(XML::Parser) gettext
-PreReq: /usr/bin/update-desktop-database
-PreReq: /usr/bin/gtk-update-icon-cache
+BuildRequires: intltool gettext
+
 Requires: gtk2             >= %{gtk2_version}
 Requires: dbus             >= %{dbus_version}
 Requires: NetworkManager   >= %{nm_version}
 Requires: vpnc             >= %{vpnc_version}
 Requires: shared-mime-info >= %{shared_mime_version}
 Requires: GConf2
-Requires: libgnomeui
 Requires: gnome-keyring
-Requires: libglade2
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 
 %description
 This package contains software for integrating the vpnc VPN software
@@ -48,19 +50,22 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
+rm -f %{buildroot}%{_libdir}/lib*.so
 
 %find_lang %{name}
 
+
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post
 /sbin/ldconfig
@@ -69,6 +74,7 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
+
 %postun
 /sbin/ldconfig
 /usr/bin/update-desktop-database > /dev/null
@@ -76,14 +82,15 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog
 %{_libdir}/lib*.so*
 %{_libexecdir}/nm-vpnc-auth-dialog
-%{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
-%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
+%config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
 %{_bindir}/nm-vpnc-service
 %{_bindir}/nm-vpnc-service-vpnc-helper
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
@@ -91,7 +98,11 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
-* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.4%{?dist}
+* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.1
+- Update to CVS snapshot 060929
+- Some rpmlint cleanups
+
+* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.4
 - Added XML::Parser BR
 
 * Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 May 2006 05:12:51 -0000	1.8
+++ sources	2 Oct 2006 23:13:54 -0000	1.9
@@ -1 +1 @@
-e49518b7932079ceaf4b358d6b0a727e  NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz
+882293dbed2f8af9c0cd61bc65fdaa3f  NetworkManager-vpnc-0.7.0.cvs20060929.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 23:29:43 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  2 Oct 2006 16:29:43 -0700
Subject: rpms/glibmm24/devel .cvsignore, 1.11, 1.12 glibmm.spec, 1.15,
	1.16 sources, 1.12, 1.13
Message-ID: <200610022329.k92NTjpr002032@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2001

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to 2.12.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Aug 2006 16:09:01 -0000	1.11
+++ .cvsignore	2 Oct 2006 23:29:43 -0000	1.12
@@ -1 +1 @@
-glibmm-2.12.0.tar.bz2
+glibmm-2.12.2.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glibmm.spec	28 Aug 2006 08:37:10 -0000	1.15
+++ glibmm.spec	2 Oct 2006 23:29:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           glibmm24
-Version:        2.12.0
-Release:        2
+Version:        2.12.2
+Release:        1
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Oct  2 2006 Denis Leroy <denis at poolshark.org> - 2.12.2-1
+- Update to 2.12.2
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 2.12.0-2
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Aug 2006 16:09:01 -0000	1.12
+++ sources	2 Oct 2006 23:29:43 -0000	1.13
@@ -1 +1 @@
-5f6c1ced9e2537f512d5b37f7f2f58ce  glibmm-2.12.0.tar.bz2
+a70be72261b19a080b1666e5e04fd43a  glibmm-2.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 23:52:22 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  2 Oct 2006 16:52:22 -0700
Subject: rpms/gtkmm24/devel .cvsignore, 1.9, 1.10 gtkmm.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200610022352.k92NqOYi004837@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to 2.10.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Aug 2006 16:38:55 -0000	1.9
+++ .cvsignore	2 Oct 2006 23:52:21 -0000	1.10
@@ -1 +1 @@
-gtkmm-2.10.0.tar.bz2
+gtkmm-2.10.2.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gtkmm.spec	28 Aug 2006 08:57:13 -0000	1.17
+++ gtkmm.spec	2 Oct 2006 23:52:21 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gtkmm24
-Version:        2.10.0
-Release:        3%{?dist}
+Version:        2.10.2
+Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 2.10.2-1
+- Update to 2.10.2
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 2.10.0-3
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Aug 2006 16:38:55 -0000	1.11
+++ sources	2 Oct 2006 23:52:21 -0000	1.12
@@ -1 +1 @@
-afdb26edc78060cbbb057df25f0416d3  gtkmm-2.10.0.tar.bz2
+b29ec706e544002d312cbefa0a65c446  gtkmm-2.10.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 00:51:54 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon,  2 Oct 2006 17:51:54 -0700
Subject: fedora-vote newelection.py,1.4,1.5 voting.py,1.10,1.11
Message-ID: <200610030051.k930ps7o009709@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/fedora/fedora-vote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9687

Modified Files:
	newelection.py voting.py 
Log Message:
* newelection.py: Set up the Fedora Ambassadors election.
* voting.py: Fix detection of double votes.  The code needed to detect
  votes per person *per election* rather than votes per person in any
  election.



Index: newelection.py
===================================================================
RCS file: /cvs/fedora/fedora-vote/newelection.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- newelection.py	21 Jun 2006 04:53:36 -0000	1.4
+++ newelection.py	3 Oct 2006 00:51:51 -0000	1.5
@@ -14,31 +14,39 @@
 dbHost = 'db1.fedora.phx.redhat.com'
 dbUser = 'electionsuser'
 
-electionName = 'FESCo 2006'
-start = '2006-06-22 00:00:00'
-end = '2006-07-02 23:59:59'
-seats = '13'
-
-votingGroups = ('cvsextras',)
-
-candidates = ('awjb',
-    'jwboyer',
-    'spot',
-    'rdieter',
-    'kevin',
-    'ausil',
-    'c4chris',
-    'katzj',
-    'mjk',
-    'toshio',
-    'thl',
-    'jpo',
-    'bpepple',
-    'mschwendt',
-    'scop',
-    'tibbs',
-    'wtogami',
-    'skvidal')
+electionName = 'Fedora Ambassadors 2006'
+start = '2006-09-21 00:00:00'
+end = '2006-09-27 23:59:59'
+#start = '2006-09-29 00:00:00'
+#end = '2006-10-05 23:59:59'
+seats = '7'
+
+votingGroups = ('ambassadors',)
+
+candidates = (
+    # Alex Maier
+    'amaier',
+    # Charles VINCHON
+    'cvinchon',
+    # Damien Durand
+    'splinux',
+    # David Nalley
+    'ke4qqq',
+    # Francesco Ugolini
+    'wmirror',
+    # Jack Aboutboul
+    'jaboutboul',
+    # Jeffrey Tadlock
+    'jeffreyt',
+    # Patrick W. Barnes
+    'nman64',
+    # Robert Whetsel
+    'rwhetsel',
+    # Rodrigo Padula
+    'rodrigop',
+    # Thomas Chung
+    'tchung'
+    )
 groupList = []
 candList = []
 


Index: voting.py
===================================================================
RCS file: /cvs/fedora/fedora-vote/voting.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- voting.py	22 Jun 2006 02:51:01 -0000	1.10
+++ voting.py	3 Oct 2006 00:51:51 -0000	1.11
@@ -137,7 +137,7 @@
                     ' accounts db' % username
 
         # Ask the voting db whether the userId has already voted
-        self.dbCmd.execute("select id from ballots where voter = '%s'" % userId)
+        self.dbCmd.execute("select id from ballots where voter = '%s' and election_id = '%s'" % (userId, self.electionId))
         if self.dbCmd.fetchall():
             return True
         return False



From fedora-extras-commits at redhat.com  Tue Oct  3 02:55:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:55:14 -0700
Subject: rpms/libmatheval - New directory
Message-ID: <200610030255.k932tGVj015885@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15864/libmatheval

Log Message:
Directory /cvs/extras/rpms/libmatheval added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 02:55:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:55:15 -0700
Subject: rpms/libmatheval/devel - New directory
Message-ID: <200610030255.k932tHlw015888@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15864/libmatheval/devel

Log Message:
Directory /cvs/extras/rpms/libmatheval/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 02:55:31 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:55:31 -0700
Subject: rpms/libmatheval Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610030255.k932tXWC015942@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15909

Added Files:
	Makefile import.log 
Log Message:
Setup of module libmatheval


--- NEW FILE Makefile ---
# Top level Makefile for module libmatheval
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct  3 02:55:32 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:55:32 -0700
Subject: rpms/libmatheval/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610030255.k932tY2G015945@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15909/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libmatheval


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct  3 02:56:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:56:06 -0700
Subject: rpms/libmatheval import.log,1.1,1.2
Message-ID: <200610030256.k932u8qS016012@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15978

Modified Files:
	import.log 
Log Message:
auto-import libmatheval-1.1.3-4 on branch devel from libmatheval-1.1.3-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmatheval/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Oct 2006 02:55:31 -0000	1.1
+++ import.log	3 Oct 2006 02:56:06 -0000	1.2
@@ -0,0 +1 @@
+libmatheval-1_1_3-4:HEAD:libmatheval-1.1.3-4.src.rpm:1159844161



From fedora-extras-commits at redhat.com  Tue Oct  3 02:56:07 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:56:07 -0700
Subject: rpms/libmatheval/devel libmatheval.spec, NONE,
	1.1 libmatheval_doc_add_info_dir.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610030256.k932u9aN016019@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15978/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libmatheval.spec libmatheval_doc_add_info_dir.patch 
Log Message:
auto-import libmatheval-1.1.3-4 on branch devel from libmatheval-1.1.3-4.src.rpm


--- NEW FILE libmatheval.spec ---
Name:           libmatheval
Version:        1.1.3
Release:        4%{?dist}
Summary:        Library for parsing and evaluating symbolic expressions input as text

Group:          System Environment/Libraries
License:        GPL
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


%description
GNU libmatheval is a library (callable from C and Fortran) to parse
and evaluate symbolic expressions input as text.  It supports
expressions in any number of variables of arbitrary names, decimal and
symbolic constants, basic unary and binary operators, and elementary
mathematical functions.  In addition to parsing and evaluation,
libmatheval can also compute symbolic derivatives and output
expressions to strings.

%package devel
Summary:        Development files for libmatheval
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires(post):  /sbin/install-info
Requires(preun): /sbin/install-info

%description devel
This package contains the development files for libmatheval.


%prep
%setup -q
%patch0 -p0

%build
%configure F77=gfortran --disable-static
make %{?_smp_mflags}

%check
make check ||:


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_infodir}/dir


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun devel
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc NEWS 
%{_includedir}/*
%{_libdir}/*.so
%{_infodir}/libmatheval.info*


%changelog
* Sat Sep 23 2006  <ed at eh3.com> - 1.1.3-4
- add BR: texinfo

* Sat Sep 23 2006  <ed at eh3.com> - 1.1.3-3
- disable static libs and add check

* Thu Sep 21 2006  <ed at eh3.com> - 1.1.3-2
- add info dir patch

* Thu Sep 21 2006  <ed at eh3.com> - 1.1.3-1
- initial package creation


libmatheval_doc_add_info_dir.patch:

--- NEW FILE libmatheval_doc_add_info_dir.patch ---
--- doc/libmatheval.texi_ORIG	2006-09-21 10:03:24.000000000 -0400
+++ doc/libmatheval.texi	2006-09-21 10:06:50.000000000 -0400
@@ -9,6 +9,11 @@
 @include version.texi
 @syncodeindex fn cp
 
+ at dircategory Texinfo documentation system
+ at direntry
+* libmatheval: (libmatheval).           library for evaluating symbolic expressions
+ at end direntry
+
 @ifnottex
 This file documents GNU @code{libmatheval} library.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmatheval/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2006 02:55:32 -0000	1.1
+++ .cvsignore	3 Oct 2006 02:56:07 -0000	1.2
@@ -0,0 +1 @@
+libmatheval-1.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmatheval/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2006 02:55:32 -0000	1.1
+++ sources	3 Oct 2006 02:56:07 -0000	1.2
@@ -0,0 +1 @@
+e88b3429da2758c799e6fbc44ac87416  libmatheval-1.1.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 03:08:08 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 20:08:08 -0700
Subject: owners owners.list,1.1765,1.1766
Message-ID: <200610030308.k9338Anx019044@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19023

Modified Files:
	owners.list 
Log Message:
add libmatheval



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1765
retrieving revision 1.1766
diff -u -r1.1765 -r1.1766
--- owners.list	2 Oct 2006 22:18:59 -0000	1.1765
+++ owners.list	3 Oct 2006 03:08:08 -0000	1.1766
@@ -872,6 +872,7 @@
 Fedora Extras|liblrdf|Library for manipulating RDF files describing LADSPA plugins|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libmatheval|Library for parsing and evaluating symbolic expressions input as text|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmatroska|An open Audio/Video container format|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmodelfile|Library for accessing various model file formats|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct  3 03:13:27 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon,  2 Oct 2006 20:13:27 -0700
Subject: rpms/openbox/devel openbox.spec,1.18,1.19
Message-ID: <200610030313.k933DTdE019177@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/openbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19160

Modified Files:
	openbox.spec 
Log Message:
Rebuilding to pick up unwind info generation fixes in new GCC


Index: openbox.spec
===================================================================
RCS file: /cvs/extras/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openbox.spec	20 Sep 2006 19:38:03 -0000	1.18
+++ openbox.spec	3 Oct 2006 03:13:27 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Peter Gordon <peter at thecodergeek.com> - 3.3.1-3
+- Rebuild to pick up unwind info generation fixes in new GCC
+
 * Wed Sep 20 2006 Peter Gordon <peter at thecodergeek.com> - 3.3.1-2
 - Allow building with startup-notification as an rpmbuild option (though it is
   disabled by default as recommended by upstream).



From fedora-extras-commits at redhat.com  Tue Oct  3 04:34:08 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon,  2 Oct 2006 21:34:08 -0700
Subject: rpms/gutenprint/devel gutenprint.spec,1.1,1.2
Message-ID: <200610030434.k934YA7h022370@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/gutenprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353

Modified Files:
	gutenprint.spec 
Log Message:



Index: gutenprint.spec
===================================================================
RCS file: /cvs/extras/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gutenprint.spec	30 Sep 2006 03:16:25 -0000	1.1
+++ gutenprint.spec	3 Oct 2006 04:34:07 -0000	1.2
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.0.0
-Release:        0.14%{?dist}
+Release:        0.15%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -379,6 +379,9 @@
 %{_datadir}/cups/model/gutenprint/5.0/zh_TW
 
 %changelog
+* Thu Oct 03 2006 Parag Nemade <panemade at gmail.com>- 5.0.0-0.15
+- Did some fix for tag issue
+
 * Thu Sep 29 2006 Parag Nemade <panemade at gmail.com>- 5.0.0-0.14
 - Removed unwanted .la files and made following files owned by 
   main package.



From fedora-extras-commits at redhat.com  Tue Oct  3 05:24:43 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:24:43 -0700
Subject: rpms/php-pear-PHPUnit/devel - New directory
Message-ID: <200610030524.k935OjPF025475@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/php-pear-PHPUnit/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-PHPUnit/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 05:24:42 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:24:42 -0700
Subject: rpms/php-pear-PHPUnit - New directory
Message-ID: <200610030524.k935Oi3F025472@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/php-pear-PHPUnit

Log Message:
Directory /cvs/extras/rpms/php-pear-PHPUnit added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 05:25:03 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:25:03 -0700
Subject: rpms/php-pear-PHPUnit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610030525.k935P5rQ025524@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25496

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-PHPUnit


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-PHPUnit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct  3 05:25:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:25:04 -0700
Subject: rpms/php-pear-PHPUnit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610030525.k935P6lp025527@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25496/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-PHPUnit


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct  3 05:25:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:25:48 -0700
Subject: rpms/php-pear-PHPUnit import.log,1.1,1.2
Message-ID: <200610030525.k935PpkA025599@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25565

Modified Files:
	import.log 
Log Message:
auto-import php-pear-PHPUnit-1.3.2-1.fc5 on branch devel from php-pear-PHPUnit-1.3.2-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Oct 2006 05:25:03 -0000	1.1
+++ import.log	3 Oct 2006 05:25:48 -0000	1.2
@@ -0,0 +1 @@
+php-pear-PHPUnit-1_3_2-1_fc5:HEAD:php-pear-PHPUnit-1.3.2-1.fc5.src.rpm:1159853141



From fedora-extras-commits at redhat.com  Tue Oct  3 05:25:49 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:25:49 -0700
Subject: rpms/php-pear-PHPUnit/devel php-pear-PHPUnit.spec, NONE,
	1.1 xml2changelog, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610030525.k935Pp38025604@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25565/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-PHPUnit.spec xml2changelog 
Log Message:
auto-import php-pear-PHPUnit-1.3.2-1.fc5 on branch devel from php-pear-PHPUnit-1.3.2-1.fc5.src.rpm


--- NEW FILE php-pear-PHPUnit.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name PHPUnit

Name:           php-pear-PHPUnit
Version:        1.3.2
Release:        1%{?dist}
Summary:        Regression testing framework for unit tests
Summary(fr):    Outils de test de r??gression pour les tests unitaires

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/PHPUnit
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php >= 4.3.0 php-pear(PEAR)

%description
PHPUnit is a regression testing framework used by the developer who
implements unit tests in PHP. This is the version to be used with PHP 4.

Developers should use PHPUnit2 with PHP5.

%description -l fr
PHPUnit est un outil de test de r??gression utilis?? par les d??veloppeurs
qui construise des tests unitaires en PHP. Cette version ??tait utilis??e
avec PHP4.

Les developpeurs devraient utiliser PHPUnit2 avec PHP5.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}

%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.

%install
rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc CHANGELOG
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/PHPUnit
%{pear_phpdir}/PHPUnit.php

%changelog
* Mon Oct  2 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
- generated specfile (pear make-rpm-spec) + cleaning
- add french summary and description


--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2006 05:25:03 -0000	1.1
+++ .cvsignore	3 Oct 2006 05:25:49 -0000	1.2
@@ -0,0 +1 @@
+PHPUnit-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2006 05:25:03 -0000	1.1
+++ sources	3 Oct 2006 05:25:49 -0000	1.2
@@ -0,0 +1 @@
+4b9dd2158e4035318481c93bbd59aaa5  PHPUnit-1.3.2.tgz



From fedora-extras-commits at redhat.com  Tue Oct  3 05:30:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:30:55 -0700
Subject: owners owners.list,1.1766,1.1767
Message-ID: <200610030530.k935Uvfh025679@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25661

Modified Files:
	owners.list 
Log Message:
	Add php-pear-PHPUnit - Regression testing framework for unit tests



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1766
retrieving revision 1.1767
diff -u -r1.1766 -r1.1767
--- owners.list	3 Oct 2006 03:08:08 -0000	1.1766
+++ owners.list	3 Oct 2006 05:30:55 -0000	1.1767
@@ -1717,6 +1717,7 @@
 Fedora Extras|php-pear-PEAR-Command-Packaging|Create RPM spec files from PEAR modules|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHP-Compat|Provides missing functionality for older versions of PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHP-CompatInfo|Find out version and extensions required for a piece of code to run|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct  3 07:27:48 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 00:27:48 -0700
Subject: rpms/showimg/FC-4 showimg.spec,1.10,1.11
Message-ID: <200610030727.k937Roal031911@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31890

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- showimg.spec	1 Jun 2006 21:58:30 -0000	1.10
+++ showimg.spec	3 Oct 2006 07:27:47 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        7%{?dist}
+Release:        10%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,15 @@
 
 
 %changelog
+* Thu Sep 21 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-10
+- yep, just that
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-9
+- guess what...
+
+* Thu Jun 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-8
+- rebuild (again)
+
 * Thu Jun 01 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-7
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct  3 07:49:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:49:39 -0700
Subject: rpms/ivman/devel - New directory
Message-ID: <200610030749.k937nfhI032609@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32585/ivman/devel

Log Message:
Directory /cvs/extras/rpms/ivman/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 07:49:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:49:38 -0700
Subject: rpms/ivman - New directory
Message-ID: <200610030749.k937nedP032606@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32585/ivman

Log Message:
Directory /cvs/extras/rpms/ivman added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 07:49:59 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:49:59 -0700
Subject: rpms/ivman Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610030750.k937o15Y032658@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32630

Added Files:
	Makefile import.log 
Log Message:
Setup of module ivman


--- NEW FILE Makefile ---
# Top level Makefile for module ivman
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct  3 07:49:59 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:49:59 -0700
Subject: rpms/ivman/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610030750.k937o1FB032661@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32630/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ivman


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct  3 07:51:01 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:51:01 -0700
Subject: rpms/ivman import.log,1.1,1.2
Message-ID: <200610030751.k937p3tV032756@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32717

Modified Files:
	import.log 
Log Message:
auto-import ivman-0.6.12-1 on branch devel from ivman-0.6.12-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ivman/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Oct 2006 07:49:59 -0000	1.1
+++ import.log	3 Oct 2006 07:51:01 -0000	1.2
@@ -0,0 +1 @@
+ivman-0_6_12-1:HEAD:ivman-0.6.12-1.src.rpm:1159861642



From fedora-extras-commits at redhat.com  Tue Oct  3 07:51:01 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:51:01 -0700
Subject: rpms/ivman/devel ivman-0.6.12-daemon.patch, NONE,
	1.1 ivman-0.6.12-gnome-mount.patch, NONE,
	1.1 ivman-0.6.12-new_hal.patch, NONE, 1.1 ivman-initscript, NONE,
	1.1 ivman.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610030751.k937p3Zn032767@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32717/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ivman-0.6.12-daemon.patch ivman-0.6.12-gnome-mount.patch 
	ivman-0.6.12-new_hal.patch ivman-initscript ivman.spec 
Log Message:
auto-import ivman-0.6.12-1 on branch devel from ivman-0.6.12-1.src.rpm

ivman-0.6.12-daemon.patch:

--- NEW FILE ivman-0.6.12-daemon.patch ---
--- ivman-0.6.12/src/IvmConfig/IvmConfigBase.xml.daemon	2006-04-18 09:48:11.000000000 +0200
+++ ivman-0.6.12/src/IvmConfig/IvmConfigBase.xml	2006-09-29 12:36:46.000000000 +0200
@@ -7,7 +7,7 @@
 
     <!-- Whether or not to give debugging output.  Warning, this is very
          verbose! -->
-    <ivm:Option name="debug" value="true" />
+    <ivm:Option name="debug" value="false" />
 
     <!-- whether or not system-wide ivman should sleep a little while before
          mounting volumes.  Default: true. -->
@@ -24,7 +24,7 @@
     <ivm:Option name="user" value="ivman" /> 
 
     <!-- group for Ivman to run as. Should have permissions to run 'pmount'. -->
-    <ivm:Option name="group" value="plugdev" />
+    <ivm:Option name="group" value="daemon" />
 
     <!-- mount command.  default is autodetected.  Must be specified with
          umountcommand. -->

ivman-0.6.12-gnome-mount.patch:

--- NEW FILE ivman-0.6.12-gnome-mount.patch ---
--- ivman-0.6.12/src/manager.c.gnome-mount	2006-04-18 09:48:11.000000000 +0200
+++ ivman-0.6.12/src/manager.c	2006-10-01 09:46:03.000000000 +0200
@@ -11,7 +11,7 @@
  * 
  * See http://www.troll.no/qpl for QPL licensing information.
  *
- * $Id: manager.c,v 1.74 2006/04/18 04:20:23 ro_han Exp $
+ * $Id: manager.c,v 1.76 2006/10/01 07:18:57 ro_han Exp $
  ************************************************************************/
 
 #define _GNU_SOURCE
@@ -266,11 +266,11 @@
 
     // Test if pmount-hal exists
     if ( usermode ) {
-        if ( !command_exists( "pmount-hal &> /dev/null" ) ) {
+        if ( !command_exists( "pmount-hal > /dev/null 2>&1" ) ) {
             DEBUG(_("pmount-hal was not found on your system.\n"));
         }
         else {
-            if ( !command_exists( "pumount &> /dev/null" ) ) {
+            if ( !command_exists( "pumount > /dev/null 2>&1" ) ) {
                 DEBUG(_("pmount-hal was found on your system, but pumount "
                         "wasn't!\n"));
             }
@@ -284,20 +284,33 @@
                 return;
             }
         }
+        // Test if gnome-mount exists
+        if ( !command_exists( "gnome-mount > /dev/null 2>&1" ) ) {
+            DEBUG(_("gnome-mount was not found on your system.\n"));
+        }
+        else {
+            DEBUG(_
+                  ("gnome-mount was found on your system. It will be "
+                   "used for mounting.\n"));
+            known_mount_command = "gnome-mount -h '$hal.info.udi$'";
+            unknown_mount_command = known_mount_command;
+            umount_command = "gnome-mount -u -d '$hal.block.device$'";
+            return;
+        }
     }
     else {
         DEBUG(_
-              ("pmount-hal detection skipped, as we are a root instance "
-               "of Ivman.  pmount-hal is only used for user instances.\n"));
+              ("pmount-hal/gnome-mount detection skipped, as we are a root instance "
+               "of Ivman.  pmount-hal/gnome-mount is only used for user instances.\n"));
     }
 
 
     // Now try looking for regular pmount.
-    if ( !command_exists( "pmount &> /dev/null" ) ) {
+    if ( !command_exists( "pmount > /dev/null 2>&1" ) ) {
         DEBUG(_("pmount was not found on your system.\n"));
     }
     else {
-        if ( !command_exists( "pumount &> /dev/null" ) ) {
+        if ( !command_exists( "pumount > /dev/null 2>&1" ) ) {
             DEBUG(_
                   ("pmount was found on your system, but pumount "
                    "wasn't!\n"));
@@ -323,7 +336,7 @@
                 g_string_append( pmount_umask_check, " --help | " );
             pmount_umask_check =
                 g_string_append( pmount_umask_check, GREP_PATH
-                                " -- '-u <' &> /dev/null");
+                                " -- '-u <' > /dev/null 2>&1");
 
             gboolean umask_accepted =
                 command_succeeds( pmount_umask_check->str );
@@ -366,12 +379,12 @@
 
 
     // At the bottom of the barrel is plain old mount ...
-    if ( !command_exists( "mount &> /dev/null" ) ) {
+    if ( !command_exists( "mount > /dev/null 2>&1" ) ) {
         DEBUG(_("mount was not found on your system.\n"));
     }
 
     else {
-        if ( !command_exists( "umount &> /dev/null" ) ) {
+        if ( !command_exists( "umount > /dev/null 2>&1" ) ) {
             DEBUG(_
                   ("mount was found on your system, but umount was "
                    "not!\n"));

ivman-0.6.12-new_hal.patch:

--- NEW FILE ivman-0.6.12-new_hal.patch ---
--- ivman-0.6.12/src/IvmConfig/IvmConfigCommon.c.hal	2006-10-01 09:42:45.000000000 +0200
+++ ivman-0.6.12/src/IvmConfig/IvmConfigCommon.c	2006-10-01 09:43:14.000000000 +0200
@@ -251,7 +251,6 @@
        of these being true is sufficient)
        1) volume is a disc with no data 
        2) storage.automount_enabled_hint = false on block.storage_device
-       3) volume.is_mounted == true
      */
     if (libhal_device_property_exists
         (hal_ctx, udi, "volume.disc.has_data", &dbus_error)
@@ -301,18 +300,6 @@
         }
         libhal_free_string(new_udi);
     }
-    
-    if (libhal_device_property_exists
-        (hal_ctx, udi, "volume.is_mounted", &dbus_error)
-        && (libhal_device_get_property_bool(hal_ctx, udi,
-                                            "volume.is_mounted",
-                                            &dbus_error)))
-    {
-        DEBUG(_("\
-Won't try to mount device %s, as it is already mounted"), device);
-        libhal_free_string(device);
-        return FALSE;
-    }
 
 
     // yay, we made it!!!


--- NEW FILE ivman-initscript ---
#!/bin/sh
#
# ivman         This script starts ivman deamon
#
# chkconfig: - 26 59
# description: This script starts and stops the ivman deamon
# processname: ivman
# pid /var/run/ivman.pid
# config: /etc/ivman/*
#
### BEGIN INIT INFO
# Provides: ivman
# Required-Start: haldaemon
# Required-Stop: haldaemon
# Default-Stop: 0 1 6
# Short-Description: ivman daemon to handle HAL events
# Description: Ivman is a generic handler for HAL events. \
#              It can be used to automount, run arbitrary commands when \
#              events or conditions occur or properties are modified on your hardware \
#              (e.g., run a command when you close your laptop's lid, run a command when \
#              a particular device is attached or a particular CD is inserted, etc).
### END INIT INFO

. /etc/init.d/functions

processname=ivman
servicename=ivman

# Sanity checks.
[ -x /usr/bin/ivman ] || exit 0

RETVAL=0

function ivman_start() {
	echo -n "Starting ivman daemon: "
	daemon --check $servicename $processname
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
		touch /var/lock/subsys/$servicename
		echo `/sbin/pidof $processname` > /var/run/ivman.pid
	fi
	return $RETVAL
}

function ivman_stop() {
        echo -n "Stopping ivman daemon: "

	killproc $servicename -TERM
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
		rm -f /var/lock/subsys/$servicename
		rm -f /var/run/ivman.pid
	fi
	return $RETVAL
}

function ivman_status() {
	status $processname
	RETVAL=$?
	return $RETVAL
}

case "$1" in
    start)
	ivman_start
	RETVAL=$?
	;;
    stop)
	ivman_stop
	RETVAL=$?
	;;
    restart|reload)
	ivman_stop
	sleep 1
	ivman_start
	RETVAL=$?
	;;
    condrestart)
	if [ -f /var/lock/subsys/$servicename ]; then
	    ivman_stop
	    sleep 1
	    ivman_start
	    RETVAL=$?
	fi
	;;
    status)
	ivman_status
	;;
    *)
	echo "Usage: $0 {start|stop|restart|reload|status|condrestart}"
	exit 1
	;;
esac

exit $RETVAL


--- NEW FILE ivman.spec ---
Name:           ivman
Version:        0.6.12
Release:        1%{?dist}
Summary:        Generic handler for HAL events

Group:          System Environment/Libraries
License:        GPL/QPL
URL:            http://ivman.sourceforge.net/
Source0:        http://ovh.dl.sourceforge.net/sourceforge/ivman/ivman-%{version}.tar.bz2
# taken from mandriva spec and modified
Source1:        ivman-initscript
Patch0:         ivman-0.6.12-daemon.patch
# patches from ivman cvs
# detect gnome-mount and remove bashisms from command calls
Patch1:         ivman-0.6.12-gnome-mount.patch
# fix automount for new hal
Patch2:         ivman-0.6.12-new_hal.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pkgconfig gettext
BuildRequires:  libxml2-devel glib2-devel dbus-glib-devel hal-devel
#Requires:       
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service

%description
Ivman is a generic handler for HAL events. Originally for automounting, 
it can now be used to run arbitrary commands when events or conditions 
occur or properties are modified on your hardware (e.g., run a command 
when you close your laptop's lid, run a command when a particular device 
is attached or a particular CD is inserted, etc).

To be able to mount devices automatically as a user, you should also 
install gnome-mount and/or pmount.

%prep
%setup -q
%patch0 -p1 -b .daemon
%patch1 -p1 -b .gnome-mount
%patch2 -p1 -b .hal


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT

%pre
useradd -r -s /sbin/nologin -d / -M -c 'Ivman user' -g daemon ivman &>/dev/null || :

%post
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ]; then
        /sbin/service %{name} stop >/dev/null 2>&1 || :
        /sbin/chkconfig --del %{name}
fi

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


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING* AUTHORS ChangeLog README TODO
%dir %{_sysconfdir}/ivman
%config(noreplace) %{_sysconfdir}/ivman/IvmConfig*.xml
%{_initrddir}/%{name}
%{_bindir}/ivman*
%{_mandir}/man5/IvmConfig*.5*
%{_mandir}/man8/ivman*.8*


%changelog
* Sun Sep 24 2006 Patrice Dumas <pertusus at free.fr> 0.6.12-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ivman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2006 07:49:59 -0000	1.1
+++ .cvsignore	3 Oct 2006 07:51:01 -0000	1.2
@@ -0,0 +1 @@
+ivman-0.6.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ivman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2006 07:49:59 -0000	1.1
+++ sources	3 Oct 2006 07:51:01 -0000	1.2
@@ -0,0 +1 @@
+031c763d6acc927bf2fefd7c6140247d  ivman-0.6.12.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 08:19:54 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 01:19:54 -0700
Subject: owners owners.list,1.1767,1.1768
Message-ID: <200610030819.k938JuLx003351@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3334

Modified Files:
	owners.list 
Log Message:
add ivman


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1767
retrieving revision 1.1768
diff -u -r1.1767 -r1.1768
--- owners.list	3 Oct 2006 05:30:55 -0000	1.1767
+++ owners.list	3 Oct 2006 08:19:54 -0000	1.1768
@@ -707,6 +707,7 @@
 Fedora Extras|itcl|Object oriented extension to Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|itext|A Free Java-PDF library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|itk|Object oriented extension to Tk|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|ivman|Generic handler for HAL events|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|iwidgets|A set of useful widgets based on itcl and itk|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|jack-audio-connection-kit|The Jack Audio Connection Kit|andy at smile.org.ua|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct  3 08:47:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 01:47:17 -0700
Subject: rpms/gwenview/devel .cvsignore, 1.5, 1.6 gwenview.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200610030847.k938lot7003492@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3446/devel

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
update to 1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Nov 2005 21:41:35 -0000	1.5
+++ .cvsignore	3 Oct 2006 08:47:17 -0000	1.6
@@ -1 +1,2 @@
-gwenview-1.3.1.tar.bz2
+gwenview-1.4.0.tar.bz2
+gwenview-i18n-1.4.0.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gwenview.spec	30 Aug 2006 15:13:29 -0000	1.16
+++ gwenview.spec	3 Oct 2006 08:47:17 -0000	1.17
@@ -1,12 +1,13 @@
 Name:           gwenview
-Version:        1.3.1
-Release:        6%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.3.1.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
+Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
@@ -17,6 +18,10 @@
 BuildRequires:  libXt-devel
 %endif
 
+# Maybe I'll split it in the future
+Provides:       gwenview-i18n = %{version}-%{release}
+
+
 %description
 Gwenview is an image viewer for KDE.
 
@@ -26,7 +31,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 
 
 %build
@@ -37,6 +42,11 @@
 # --enable-final  \
 make %{?_smp_mflags}
 
+cd %{name}-i18n-%{version}
+%configure
+make %{?_smp_mflags}
+cd ..
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,8 +59,13 @@
   --add-category Viewer \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
+cd %{name}-i18n-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
 # Files list
 %find_lang %{name}
+
 # HTML help
 for lang_dir in $RPM_BUILD_ROOT%{_datadir}/doc/HTML/* ; do
   if [ -d $lang_dir ]; then
@@ -77,7 +92,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2005 21:41:35 -0000	1.5
+++ sources	3 Oct 2006 08:47:17 -0000	1.6
@@ -1 +1,2 @@
-0bea3ce1aa2dc704bf61f718d2d4308e  gwenview-1.3.1.tar.bz2
+82f15fca494ffd2aabad9828c5c66d94  gwenview-1.4.0.tar.bz2
+2b978ab4b76cbd4fb857d63100f0d5da  gwenview-i18n-1.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 08:47:15 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 01:47:15 -0700
Subject: rpms/gwenview/FC-5 .cvsignore, 1.5, 1.6 gwenview.spec, 1.15,
	1.16 sources, 1.5, 1.6
Message-ID: <200610030847.k938lmqJ003489@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3446/FC-5

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
update to 1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Nov 2005 21:41:35 -0000	1.5
+++ .cvsignore	3 Oct 2006 08:47:14 -0000	1.6
@@ -1 +1,2 @@
-gwenview-1.3.1.tar.bz2
+gwenview-1.4.0.tar.bz2
+gwenview-i18n-1.4.0.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/gwenview.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gwenview.spec	11 Apr 2006 06:14:30 -0000	1.15
+++ gwenview.spec	3 Oct 2006 08:47:15 -0000	1.16
@@ -1,12 +1,13 @@
 Name:           gwenview
-Version:        1.3.1
-Release:        5%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.3.1.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
+Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
@@ -17,6 +18,10 @@
 BuildRequires:  libXt-devel
 %endif
 
+# Maybe I'll split it in the future
+Provides:       gwenview-i18n = %{version}-%{release}
+
+
 %description
 Gwenview is an image viewer for KDE.
 
@@ -26,7 +31,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 
 
 %build
@@ -37,6 +42,11 @@
 # --enable-final  \
 make %{?_smp_mflags}
 
+cd %{name}-i18n-%{version}
+%configure
+make %{?_smp_mflags}
+cd ..
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,8 +59,13 @@
   --add-category Viewer \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
+cd %{name}-i18n-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
 # Files list
 %find_lang %{name}
+
 # HTML help
 for lang_dir in $RPM_BUILD_ROOT%{_datadir}/doc/HTML/* ; do
   if [ -d $lang_dir ]; then
@@ -77,7 +92,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*
@@ -95,6 +110,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.3.1-6
+- rebuild
+
 * Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-5
 - fix build outside the buildsystem (bug 188486)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2005 21:41:35 -0000	1.5
+++ sources	3 Oct 2006 08:47:15 -0000	1.6
@@ -1 +1,2 @@
-0bea3ce1aa2dc704bf61f718d2d4308e  gwenview-1.3.1.tar.bz2
+82f15fca494ffd2aabad9828c5c66d94  gwenview-1.4.0.tar.bz2
+2b978ab4b76cbd4fb857d63100f0d5da  gwenview-i18n-1.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 09:03:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 02:03:08 -0700
Subject: rpms/gwenview/FC-5 gwenview.spec,1.16,1.17
Message-ID: <200610030903.k9393eeA006462@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6430/FC-5

Modified Files:
	gwenview.spec 
Log Message:
missing BR: libexif-devel


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/gwenview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gwenview.spec	3 Oct 2006 08:47:15 -0000	1.16
+++ gwenview.spec	3 Oct 2006 09:03:07 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
+BuildRequires:  libexif-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
@@ -110,6 +111,12 @@
 
 
 %changelog
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-2
+- missing BR: libexif-devel
+
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-1
+- version 1.4.0
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.3.1-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct  3 09:03:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 02:03:12 -0700
Subject: rpms/gwenview/devel gwenview.spec,1.17,1.18
Message-ID: <200610030903.k9393kM3006465@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6430/devel

Modified Files:
	gwenview.spec 
Log Message:
missing BR: libexif-devel


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gwenview.spec	3 Oct 2006 08:47:17 -0000	1.17
+++ gwenview.spec	3 Oct 2006 09:03:12 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
+BuildRequires:  libexif-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
@@ -110,6 +111,12 @@
 
 
 %changelog
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-2
+- missing BR: libexif-devel
+
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-1
+- version 1.4.0
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.3.1-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct  3 09:06:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Oct 2006 02:06:26 -0700
Subject: rpms/wine/FC-5 .cvsignore, 1.22, 1.23 sources, 1.23, 1.24 wine.spec,
	1.35, 1.36
Message-ID: <200610030906.k9396SHP006642@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6605/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Sep 2006 14:15:05 -0000	1.22
+++ .cvsignore	3 Oct 2006 09:06:26 -0000	1.23
@@ -1 +1 @@
-wine-0.9.21-fe.tar.bz2
+wine-0.9.22-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Sep 2006 14:15:06 -0000	1.23
+++ sources	3 Oct 2006 09:06:26 -0000	1.24
@@ -1 +1 @@
-98232c907314f15b54d7f685ecfb5535  wine-0.9.21-fe.tar.bz2
+955338998d9fe4e0546212b97adbacd2  wine-0.9.22-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wine.spec	17 Sep 2006 14:15:06 -0000	1.35
+++ wine.spec	3 Oct 2006 09:06:26 -0000	1.36
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.21
+Version:	0.9.22
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.21-fe.tar.bz2
+Source0:        wine-0.9.22-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -371,6 +371,7 @@
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
 %{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/clusapi.dll.so
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
@@ -475,6 +476,7 @@
 %{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
@@ -686,6 +688,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.22-1
+- version upgrade
+
 * Sun Sep 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.21-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Oct  3 09:06:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Oct 2006 02:06:27 -0700
Subject: rpms/wine/devel .cvsignore, 1.22, 1.23 sources, 1.23, 1.24 wine.spec,
	1.35, 1.36
Message-ID: <200610030906.k9396TMt006648@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6605/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Sep 2006 14:15:07 -0000	1.22
+++ .cvsignore	3 Oct 2006 09:06:27 -0000	1.23
@@ -1 +1 @@
-wine-0.9.21-fe.tar.bz2
+wine-0.9.22-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Sep 2006 14:15:07 -0000	1.23
+++ sources	3 Oct 2006 09:06:27 -0000	1.24
@@ -1 +1 @@
-98232c907314f15b54d7f685ecfb5535  wine-0.9.21-fe.tar.bz2
+955338998d9fe4e0546212b97adbacd2  wine-0.9.22-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wine.spec	17 Sep 2006 14:15:07 -0000	1.35
+++ wine.spec	3 Oct 2006 09:06:27 -0000	1.36
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.21
+Version:	0.9.22
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.21-fe.tar.bz2
+Source0:        wine-0.9.22-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -371,6 +371,7 @@
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
 %{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/clusapi.dll.so
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
@@ -475,6 +476,7 @@
 %{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
@@ -686,6 +688,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.22-1
+- version upgrade
+
 * Sun Sep 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.21-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Oct  3 09:37:17 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Oct 2006 02:37:17 -0700
Subject: rpms/gtkwave/devel gtkwave.spec,1.23,1.24
Message-ID: <200610030937.k939bKEL006837@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6820

Modified Files:
	gtkwave.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtkwave.spec	22 Sep 2006 13:48:49 -0000	1.23
+++ gtkwave.spec	3 Oct 2006 09:37:17 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
 Version:		3.0.12
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
 URL:			http://home.nc.rr.com/gtkwave/
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 3.0.12-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 3.0.12-1
 - update to 3.0.12
 - create dummy libz/libbz2 Makefile.in files to ensure that config.h gets



From fedora-extras-commits at redhat.com  Tue Oct  3 09:38:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Oct 2006 02:38:56 -0700
Subject: rpms/gtorrentviewer/devel gtorrentviewer.spec,1.8,1.9
Message-ID: <200610030938.k939cwxc006903@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtorrentviewer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6886

Modified Files:
	gtorrentviewer.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: gtorrentviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/gtorrentviewer/devel/gtorrentviewer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtorrentviewer.spec	26 Sep 2006 14:27:38 -0000	1.8
+++ gtorrentviewer.spec	3 Oct 2006 09:38:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gtorrentviewer
 Version:	0.2b
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A GTK2-based viewer and editor for BitTorrent meta files
 Group:		Applications/Internet
 License:	GPL
@@ -59,6 +59,9 @@
 %{_mandir}/man1/gtorrentviewer.1*
 
 %changelog
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 0.2b-12
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Paul Howarth <paul at city-fan.org> 0.2b-11
 - drag and drop works with files but not URIs (#206262);
   apply patch from Denis Leroy to fix desktop file accordingly



From fedora-extras-commits at redhat.com  Tue Oct  3 09:40:17 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Oct 2006 02:40:17 -0700
Subject: rpms/lat/devel lat.spec,1.9,1.10
Message-ID: <200610030940.k939eJtA006973@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/lat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6952

Modified Files:
	lat.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: lat.spec
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/lat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lat.spec	27 Sep 2006 07:32:08 -0000	1.9
+++ lat.spec	3 Oct 2006 09:40:17 -0000	1.10
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.0.1
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPL
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 1.2.0.1-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Paul Howarth <paul at city-fan.org> 1.2.0.1-1
 - Update to 1.2.0.1
 - Update source URL



From fedora-extras-commits at redhat.com  Tue Oct  3 11:02:53 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue,  3 Oct 2006 04:02:53 -0700
Subject: fedora-security/audit fc5,1.342,1.343
Message-ID: <200610031102.k93B2rJH013126@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13108

Modified Files:
	fc5 
Log Message:
Note a gzip update


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- fc5	30 Sep 2006 21:23:03 -0000	1.342
+++ fc5	3 Oct 2006 11:02:47 -0000	1.343
@@ -51,11 +51,11 @@
 CVE-2006-4340 version (nss, fixed 3.11.3) [since FEDORA-2006-979]
 CVE-2006-4339 backport (openssl) [since FEDORA-2006-953]
 CVE-2006-4339 backport (openssl097a) [since FEDORA-2006-953]
-CVE-2006-4338 VULNERABLE (gzip) #207643
-CVE-2006-4337 VULNERABLE (gzip) #207643
-CVE-2006-4336 VULNERABLE (gzip) #207643
-CVE-2006-4335 VULNERABLE (gzip) #207643
-CVE-2006-4334 VULNERABLE (gzip) #207643
+CVE-2006-4338 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4337 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4336 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4335 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4334 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
 CVE-2006-4433 VULNERABLE (php, fixed 5.1.4)
 CVE-2006-4333 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
 CVE-2006-4332 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]



From fedora-extras-commits at redhat.com  Tue Oct  3 11:17:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Oct 2006 04:17:37 -0700
Subject: rpms/dillo/FC-5 dillo.spec,1.14,1.15
Message-ID: <200610031117.k93BHdc8013374@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dillo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13355

Modified Files:
	dillo.spec 
Log Message:
- fix #199852



Index: dillo.spec
===================================================================
RCS file: /cvs/extras/rpms/dillo/FC-5/dillo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dillo.spec	5 Jul 2006 08:11:06 -0000	1.14
+++ dillo.spec	3 Oct 2006 11:17:37 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           dillo
 Version:        0.8.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Very small and fast GUI web browser
 
@@ -24,6 +24,7 @@
 BuildRequires:  openssl-devel
 BuildRequires:  libXft-devel
 BuildRequires:  fltk-devel
+BuildRequires:  gettext
 Requires:       wget
 Provides:       webclient
 
@@ -105,6 +106,10 @@
 %{_libdir}/%{name}
 
 %changelog
+* Tue Oct 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.6-3
+- fix #199852
+
 * Tue Jul 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.6-2
 - fix some more aspects of #187691 (package now contains dillo and dillo-i18n)



From fedora-extras-commits at redhat.com  Tue Oct  3 11:19:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Oct 2006 04:19:08 -0700
Subject: rpms/dillo/devel dillo.spec,1.14,1.15
Message-ID: <200610031119.k93BJAJ7013447@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dillo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13430

Modified Files:
	dillo.spec 
Log Message:
- fix BR



Index: dillo.spec
===================================================================
RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dillo.spec	12 Sep 2006 07:14:16 -0000	1.14
+++ dillo.spec	3 Oct 2006 11:19:08 -0000	1.15
@@ -24,6 +24,7 @@
 BuildRequires:  openssl-devel
 BuildRequires:  libXft-devel
 BuildRequires:  fltk-devel
+BuildRequires:  gettext
 Requires:       wget
 Provides:       webclient
 



From fedora-extras-commits at redhat.com  Tue Oct  3 11:38:27 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 04:38:27 -0700
Subject: rpms/Inventor/FC-4 Inventor-libSoXt.diff,1.1,NONE
Message-ID: <200610031138.k93BcTDg013609@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13593

Removed Files:
	Inventor-libSoXt.diff 
Log Message:
Remove.


--- Inventor-libSoXt.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct  3 11:38:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 04:38:54 -0700
Subject: rpms/Inventor/FC-4 Inventor.spec,1.15,1.16
Message-ID: <200610031138.k93BcuZk013644@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13624

Modified Files:
	Inventor.spec 
Log Message:
* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
- Specfile cosmetics.
- Use %{_datadir}/Inventor instead of %{_datadir}/%{name}
- Fix dep on xmessage for FC4.
- Add %{_datadir}/Inventor/data/materials.
- Add %{_datadir}/Inventor/fonts.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/Inventor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Inventor.spec	2 Oct 2006 04:54:10 -0000	1.15
+++ Inventor.spec	3 Oct 2006 11:38:54 -0000	1.16
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -68,7 +68,7 @@
 Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" >= "5"
 Requires:	%{_bindir}/xmessage
 %else
 Requires:	/usr/X11R6/bin/xmessage
@@ -137,20 +137,20 @@
 -e 's,^_HDRTOP =.*$,_HDRTOP = %{_includedir}/Inventor,' \
 -e 's,^_MAN1DIR =.*$,_MAN1DIR = %{_mandir}/man1,' \
 -e 's,^_MAN3DIR =.*$,_MAN3DIR = %{_mandir}/man3,' \
--e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/%{name}/fonts,' \
--e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/%{name}/help,' \
--e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/%{name}/data/models,' \
--e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/%{name}/data/materials,' \
--e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/%{name}/data/textures,' \
+-e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/Inventor/fonts,' \
+-e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/Inventor/help,' \
+-e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/Inventor/data/models,' \
+-e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/Inventor/data/materials,' \
+-e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/Inventor/data/textures,' \
 -e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_libdir}/Inventor,' \
--e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
+-e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/Inventor/data/demos,' \
 -e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
 -e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
 make/ivcommondefs
 
 for i in apps/demos/*/*.RUNME; do \
   sed -i \
-    -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
+    -e 's,/usr/share/inventor/,%{_datadir}/Inventor/,g' \
     -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
     $i
 done
@@ -216,6 +216,10 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +239,8 @@
 %{_bindir}/ivnorm
 %{_bindir}/ivAddVP
 %{_libdir}/libInventor.so.*
+%dir %{_datadir}/Inventor
+%{_datadir}/Inventor/fonts
 %{_mandir}/man1/inventor.*
 %{_mandir}/man1/iv2toiv1.*
 %{_mandir}/man1/ivcat.*
@@ -264,7 +270,13 @@
 %{_mandir}/man1/SceneViewer.*
 %{_mandir}/man1/ivview.*
 %{_libdir}/libInventorXt.so.*
-%{_datadir}/%{name}
+%dir %{_datadir}/Inventor
+# Used by libInventorXt
+%{_datadir}/Inventor/help
+# Used by SceneViewer
+%dir %{_datadir}/Inventor/data
+%dir %{_datadir}/Inventor/data/materials
+%dir %{_datadir}/Inventor/data/textures
 
 %files -n InventorXt-devel
 %defattr(-,root,root,-)
@@ -276,15 +288,17 @@
 
 %files data
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/models
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/models
+%{_datadir}/Inventor/data/materials
+%{_datadir}/Inventor/data/textures
 
 %files demos
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/demos
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/demos
 %dir %{_libdir}/Inventor
 %{_libdir}/Inventor/[^e]*
 
@@ -294,6 +308,13 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
+- Specfile cosmetics.
+- Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name}
+- Fix dep on xmessage for FC4.
+- Add %%{_datadir}/Inventor/data/materials.
+- Add %%{_datadir}/Inventor/fonts.
+
 * Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
 - Add make-var _PDFVIEWER.
 - Backport to FC4.
@@ -375,7 +396,7 @@
 * Thu Jul 1 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.2
 - Adopt portions of Michael Schwendt's patch.
 - Fix hard-coded paths in apps/demos/*.RUNMEs.
-- Use %{_prefix}/lib instead of %{_libdir} to install the demos into.
+- Use %%{_prefix}/lib instead of %%{_libdir} to install the demos into.
 - Add make/ to devel docs.
 - Hack devel docs to be buildable.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 11:39:41 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 04:39:41 -0700
Subject: rpms/Inventor/devel Inventor.spec,1.34,1.35
Message-ID: <200610031139.k93BdhN6013705@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13688

Modified Files:
	Inventor.spec 
Log Message:
* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
- Specfile cosmetics.
- Use %{_datadir}/Inventor instead of %{_datadir}/%{name}
- Fix dep on xmessage for FC4.
- Add %{_datadir}/Inventor/data/materials.
- Add %{_datadir}/Inventor/fonts.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Inventor.spec	2 Oct 2006 04:05:04 -0000	1.34
+++ Inventor.spec	3 Oct 2006 11:39:41 -0000	1.35
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -68,7 +68,7 @@
 Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" >= "5"
 Requires:	%{_bindir}/xmessage
 %else
 Requires:	/usr/X11R6/bin/xmessage
@@ -137,20 +137,20 @@
 -e 's,^_HDRTOP =.*$,_HDRTOP = %{_includedir}/Inventor,' \
 -e 's,^_MAN1DIR =.*$,_MAN1DIR = %{_mandir}/man1,' \
 -e 's,^_MAN3DIR =.*$,_MAN3DIR = %{_mandir}/man3,' \
--e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/%{name}/fonts,' \
--e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/%{name}/help,' \
--e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/%{name}/data/models,' \
--e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/%{name}/data/materials,' \
--e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/%{name}/data/textures,' \
+-e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/Inventor/fonts,' \
+-e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/Inventor/help,' \
+-e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/Inventor/data/models,' \
+-e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/Inventor/data/materials,' \
+-e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/Inventor/data/textures,' \
 -e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_libdir}/Inventor,' \
--e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
+-e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/Inventor/data/demos,' \
 -e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
 -e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
 make/ivcommondefs
 
 for i in apps/demos/*/*.RUNME; do \
   sed -i \
-    -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
+    -e 's,/usr/share/inventor/,%{_datadir}/Inventor/,g' \
     -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
     $i
 done
@@ -216,6 +216,10 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +239,8 @@
 %{_bindir}/ivnorm
 %{_bindir}/ivAddVP
 %{_libdir}/libInventor.so.*
+%dir %{_datadir}/Inventor
+%{_datadir}/Inventor/fonts
 %{_mandir}/man1/inventor.*
 %{_mandir}/man1/iv2toiv1.*
 %{_mandir}/man1/ivcat.*
@@ -264,7 +270,13 @@
 %{_mandir}/man1/SceneViewer.*
 %{_mandir}/man1/ivview.*
 %{_libdir}/libInventorXt.so.*
-%{_datadir}/%{name}
+%dir %{_datadir}/Inventor
+# Used by libInventorXt
+%{_datadir}/Inventor/help
+# Used by SceneViewer
+%dir %{_datadir}/Inventor/data
+%dir %{_datadir}/Inventor/data/materials
+%dir %{_datadir}/Inventor/data/textures
 
 %files -n InventorXt-devel
 %defattr(-,root,root,-)
@@ -276,15 +288,17 @@
 
 %files data
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/models
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/models
+%{_datadir}/Inventor/data/materials
+%{_datadir}/Inventor/data/textures
 
 %files demos
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/demos
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/demos
 %dir %{_libdir}/Inventor
 %{_libdir}/Inventor/[^e]*
 
@@ -294,6 +308,13 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
+- Specfile cosmetics.
+- Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name}
+- Fix dep on xmessage for FC4.
+- Add %%{_datadir}/Inventor/data/materials.
+- Add %%{_datadir}/Inventor/fonts.
+
 * Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
 - Add make-var _PDFVIEWER.
 - Backport to FC4.
@@ -375,7 +396,7 @@
 * Thu Jul 1 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.2
 - Adopt portions of Michael Schwendt's patch.
 - Fix hard-coded paths in apps/demos/*.RUNMEs.
-- Use %{_prefix}/lib instead of %{_libdir} to install the demos into.
+- Use %%{_prefix}/lib instead of %%{_libdir} to install the demos into.
 - Add make/ to devel docs.
 - Hack devel docs to be buildable.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 11:40:35 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 04:40:35 -0700
Subject: rpms/Inventor/FC-5 Inventor.spec,1.33,1.34
Message-ID: <200610031140.k93BebVr013770@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13753

Modified Files:
	Inventor.spec 
Log Message:
* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
- Specfile cosmetics.
- Use %{_datadir}/Inventor instead of %{_datadir}/%{name}
- Fix dep on xmessage for FC4.
- Add %{_datadir}/Inventor/data/materials.
- Add %{_datadir}/Inventor/fonts.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/Inventor.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Inventor.spec	2 Oct 2006 04:46:03 -0000	1.33
+++ Inventor.spec	3 Oct 2006 11:40:35 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -68,7 +68,7 @@
 Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" >= "5"
 Requires:	%{_bindir}/xmessage
 %else
 Requires:	/usr/X11R6/bin/xmessage
@@ -137,20 +137,20 @@
 -e 's,^_HDRTOP =.*$,_HDRTOP = %{_includedir}/Inventor,' \
 -e 's,^_MAN1DIR =.*$,_MAN1DIR = %{_mandir}/man1,' \
 -e 's,^_MAN3DIR =.*$,_MAN3DIR = %{_mandir}/man3,' \
--e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/%{name}/fonts,' \
--e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/%{name}/help,' \
--e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/%{name}/data/models,' \
--e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/%{name}/data/materials,' \
--e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/%{name}/data/textures,' \
+-e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/Inventor/fonts,' \
+-e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/Inventor/help,' \
+-e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/Inventor/data/models,' \
+-e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/Inventor/data/materials,' \
+-e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/Inventor/data/textures,' \
 -e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_libdir}/Inventor,' \
--e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
+-e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/Inventor/data/demos,' \
 -e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
 -e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
 make/ivcommondefs
 
 for i in apps/demos/*/*.RUNME; do \
   sed -i \
-    -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
+    -e 's,/usr/share/inventor/,%{_datadir}/Inventor/,g' \
     -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
     $i
 done
@@ -216,6 +216,10 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +239,8 @@
 %{_bindir}/ivnorm
 %{_bindir}/ivAddVP
 %{_libdir}/libInventor.so.*
+%dir %{_datadir}/Inventor
+%{_datadir}/Inventor/fonts
 %{_mandir}/man1/inventor.*
 %{_mandir}/man1/iv2toiv1.*
 %{_mandir}/man1/ivcat.*
@@ -264,7 +270,13 @@
 %{_mandir}/man1/SceneViewer.*
 %{_mandir}/man1/ivview.*
 %{_libdir}/libInventorXt.so.*
-%{_datadir}/%{name}
+%dir %{_datadir}/Inventor
+# Used by libInventorXt
+%{_datadir}/Inventor/help
+# Used by SceneViewer
+%dir %{_datadir}/Inventor/data
+%dir %{_datadir}/Inventor/data/materials
+%dir %{_datadir}/Inventor/data/textures
 
 %files -n InventorXt-devel
 %defattr(-,root,root,-)
@@ -276,15 +288,17 @@
 
 %files data
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/models
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/models
+%{_datadir}/Inventor/data/materials
+%{_datadir}/Inventor/data/textures
 
 %files demos
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/demos
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/demos
 %dir %{_libdir}/Inventor
 %{_libdir}/Inventor/[^e]*
 
@@ -294,6 +308,13 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
+- Specfile cosmetics.
+- Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name}
+- Fix dep on xmessage for FC4.
+- Add %%{_datadir}/Inventor/data/materials.
+- Add %%{_datadir}/Inventor/fonts.
+
 * Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
 - Add make-var _PDFVIEWER.
 - Backport to FC4.
@@ -375,7 +396,7 @@
 * Thu Jul 1 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.2
 - Adopt portions of Michael Schwendt's patch.
 - Fix hard-coded paths in apps/demos/*.RUNMEs.
-- Use %{_prefix}/lib instead of %{_libdir} to install the demos into.
+- Use %%{_prefix}/lib instead of %%{_libdir} to install the demos into.
 - Add make/ to devel docs.
 - Hack devel docs to be buildable.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 12:11:29 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  3 Oct 2006 05:11:29 -0700
Subject: rpms/inotify-tools/devel .cvsignore, 1.5, 1.6 inotify-tools.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610031211.k93CBVW7016767@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/inotify-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16746

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
Update to 2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Oct 2006 17:12:46 -0000	1.5
+++ .cvsignore	3 Oct 2006 12:11:29 -0000	1.6
@@ -1 +1 @@
-inotify-tools-2.5.tar.gz
+inotify-tools-2.6.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/inotify-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inotify-tools.spec	2 Oct 2006 17:12:46 -0000	1.4
+++ inotify-tools.spec	3 Oct 2006 12:11:29 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.5
+Version:        2.6
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.6-1
+- Update to 2.6
+
 * Mon Oct  2 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.5-1
 - Update to 2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 17:12:46 -0000	1.5
+++ sources	3 Oct 2006 12:11:29 -0000	1.6
@@ -1 +1 @@
-80994b6637c9a4a94a1eddf2b8885603  inotify-tools-2.5.tar.gz
+4e3f876c4bac9d3cb520d81810832906  inotify-tools-2.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 12:15:33 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  3 Oct 2006 05:15:33 -0700
Subject: rpms/inotify-tools/FC-5 .cvsignore, 1.5, 1.6 inotify-tools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610031215.k93CFZVj016851@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/inotify-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16830

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
Update to 2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Oct 2006 17:14:30 -0000	1.5
+++ .cvsignore	3 Oct 2006 12:15:32 -0000	1.6
@@ -1 +1 @@
-inotify-tools-2.5.tar.gz
+inotify-tools-2.6.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/inotify-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inotify-tools.spec	2 Oct 2006 17:14:30 -0000	1.4
+++ inotify-tools.spec	3 Oct 2006 12:15:32 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.5
+Version:        2.6
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.6-1
+- Update to 2.6
+
 * Mon Oct  2 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.5-1
 - Update to 2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 17:14:30 -0000	1.5
+++ sources	3 Oct 2006 12:15:32 -0000	1.6
@@ -1 +1 @@
-80994b6637c9a4a94a1eddf2b8885603  inotify-tools-2.5.tar.gz
+4e3f876c4bac9d3cb520d81810832906  inotify-tools-2.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 13:11:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 06:11:01 -0700
Subject: rpms/gpgme/devel gpgme.spec,1.19,1.20
Message-ID: <200610031311.k93DB3Cl019888@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19871

Modified Files:
	gpgme.spec 
Log Message:
* Tue Oct 03 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- respin



Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gpgme.spec	18 Sep 2006 19:34:24 -0000	1.19
+++ gpgme.spec	3 Oct 2006 13:11:01 -0000	1.20
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.1.2
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 
 License: LGPL
 Group:   Applications/System
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Tue Oct 03 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-6
 - fix gpgme-config --thread=pthread --cflags
 



From fedora-extras-commits at redhat.com  Tue Oct  3 14:49:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  3 Oct 2006 07:49:19 -0700
Subject: rpms/openvpn/devel .cvsignore, 1.13, 1.14 openvpn.spec, 1.22,
	1.23 sources, 1.13, 1.14
Message-ID: <200610031449.k93EnLKc024941@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24920

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta16.
Drop Paul's patch (in upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Sep 2006 18:55:50 -0000	1.13
+++ .cvsignore	3 Oct 2006 14:49:18 -0000	1.14
@@ -1,2 +1,2 @@
-openvpn-2.1_beta15.tar.gz
-openvpn-2.1_beta15.tar.gz.asc
+openvpn-2.1_beta16.tar.gz
+openvpn-2.1_beta16.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- openvpn.spec	12 Sep 2006 22:53:18 -0000	1.22
+++ openvpn.spec	3 Oct 2006 14:49:18 -0000	1.23
@@ -1,10 +1,10 @@
-%define prerelease beta15
+%define prerelease beta16
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.13%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.14%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 Source0:           http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -15,8 +15,6 @@
 Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
-# Avoid test hang (from Paul Howarth).
-Patch1:            openvpn-2.1_beta15-test-timeout.patch
 License:           GPL
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -45,7 +43,6 @@
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
 %patch0 -p0
-%patch1 -p1
 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 # %%doc items shouldn't be executable.
@@ -135,6 +132,10 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Mon Oct 02 2006 Steven Pritchard <steve at kspei.com> 2.1-0.14.beta16
+- Update to 2.1_beta16
+- Drop Paul's patch (in upstream)
+
 * Tue Sep 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.13.beta15
 - Update to 2.1_beta15
 - Add openvpn-2.1_beta15-test-timeout.patch to avoid test hang


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Sep 2006 18:55:50 -0000	1.13
+++ sources	3 Oct 2006 14:49:18 -0000	1.14
@@ -1,2 +1,2 @@
-2ddc1878c99ea3a9b348275338f7d502  openvpn-2.1_beta15.tar.gz
-7e62c63fb8205613ac8b99a4c788d576  openvpn-2.1_beta15.tar.gz.asc
+3a53f55dafcfa4aab9e408e36326e236  openvpn-2.1_beta16.tar.gz
+4529dc8c27ea67783b333dc586a909ef  openvpn-2.1_beta16.tar.gz.asc



From fedora-extras-commits at redhat.com  Tue Oct  3 15:19:38 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue,  3 Oct 2006 08:19:38 -0700
Subject: rpms/php-pear-PHPUnit/FC-5 php-pear-PHPUnit.spec,1.1,1.2
Message-ID: <200610031519.k93FJecO028167@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28148

Modified Files:
	php-pear-PHPUnit.spec 
Log Message:



Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/FC-5/php-pear-PHPUnit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-PHPUnit.spec	3 Oct 2006 05:25:49 -0000	1.1
+++ php-pear-PHPUnit.spec	3 Oct 2006 15:19:38 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-PHPUnit
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Regression testing framework for unit tests
 Summary(fr):    Outils de test de r??gression pour les tests unitaires
 



From fedora-extras-commits at redhat.com  Tue Oct  3 15:25:01 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 08:25:01 -0700
Subject: rpms/gwenview/devel gwenview-1.4.0-libexif.patch, NONE,
	1.1 gwenview.spec, 1.18, 1.19
Message-ID: <200610031525.k93FP3eu028350@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28330

Modified Files:
	gwenview.spec 
Added Files:
	gwenview-1.4.0-libexif.patch 
Log Message:
add patch for latest libexif

gwenview-1.4.0-libexif.patch:

--- NEW FILE gwenview-1.4.0-libexif.patch ---
--- ./src/imageutils/jpeg-data.h.libexif	2006-10-03 16:55:17.000000000 +0200
+++ ./src/imageutils/jpeg-data.h	2006-10-03 16:55:41.000000000 +0200
@@ -22,7 +22,7 @@
 #define __JPEG_DATA_H__
 
 #include "jpeg-marker.h"
-#include "exif-data.h"
+#include "libexif/exif-data.h"
 
 #ifdef __cplusplus
 extern "C" {
--- ./src/imageutils/jpegcontent.cpp.libexif	2006-10-03 16:55:54.000000000 +0200
+++ ./src/imageutils/jpegcontent.cpp	2006-10-03 16:56:14.000000000 +0200
@@ -39,9 +39,9 @@
 #include <kdebug.h>
 
 // Exif
-#include "exif-data.h"
-#include "exif-ifd.h"
-#include "exif-utils.h"
+#include "libexif/exif-data.h"
+#include "libexif/exif-ifd.h"
+#include "libexif/exif-utils.h"
 
 // Local
 #include "imageutils/imageutils.h"


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gwenview.spec	3 Oct 2006 09:03:12 -0000	1.18
+++ gwenview.spec	3 Oct 2006 15:25:01 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,6 +8,8 @@
 URL:            http://gwenview.sf.net
 Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
 Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
+# Patch for libexif >= 0.6.13
+Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
@@ -33,6 +35,9 @@
 
 %prep
 %setup -q -a 1
+%if "%{fedora}" >= "6"
+%patch0 -p0
+%endif
 
 
 %build
@@ -111,6 +116,9 @@
 
 
 %changelog
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-3
+- patch for latest libexif-devel
+
 * Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-2
 - missing BR: libexif-devel
 



From fedora-extras-commits at redhat.com  Tue Oct  3 16:44:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Oct 2006 09:44:12 -0700
Subject: rpms/clisp/devel clisp-2.40-doc.patch, NONE, 1.1 clisp.spec, 1.19,
	1.20
Message-ID: <200610031644.k93GiED0031747@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31727

Modified Files:
	clisp.spec 
Added Files:
	clisp-2.40-doc.patch 
Log Message:


clisp-2.40-doc.patch:

--- NEW FILE clisp-2.40-doc.patch ---
--- documentation.lisp	02 Oct 2006 06:01:24 -0400	1.26
+++ documentation.lisp	03 Oct 2006 10:47:23 -0400
@@ -4,7 +4,7 @@

 (in-package "CLOS")

-(defun function-documentation (x)
+(defun function-documentation (x &aux name)
   (cond ((typep-class x <standard-generic-function>)
          (std-gf-documentation x))
         ((eq (type-of x) 'FUNCTION) ; interpreted function?
@@ -12,8 +12,7 @@
         #+FFI ((eq (type-of x) 'ffi::foreign-function)
                (getf (sys::%record-ref x 5) :documentation))
         ((sys::closurep x) (sys::closure-documentation x))
-        ((let ((name (sys::subr-info x))) ; subr
-           (and name (get :documentation name))))
+        ((setq name (sys::subr-info x)) (get :documentation name)) ; subr
         (t (get :documentation (sys::%record-ref x 0)))))

 ;;; documentation
@@ -81,7 +80,7 @@
   (:method ((x slot-definition) (doc-type (eql 't)))
     (slot-definition-documentation x)))

-(defun set-function-documentation (x new-value)
+(defun set-function-documentation (x new-value &aux name)
   (cond ((typep-class x <standard-generic-function>)
          (setf (std-gf-documentation x) new-value))
         ((eq (type-of x) 'FUNCTION) ; interpreted function?
@@ -89,8 +88,8 @@
         #+FFI ((eq (type-of x) 'ffi::foreign-function)
                (setf (getf (sys::%record-ref x 5) :documentation) new-value))
         ((sys::closurep x) (sys::closure-set-documentation x new-value))
-        ((let ((name (sys::subr-info x))) ; subr
-           (and name (setf (get :documentation name) new-value))))
+        ((setq name (sys::subr-info x)) ; subr
+         (setf (get :documentation name) new-value))
         (t                      ; fsubr
          (setf (get :documentation (sys::%record-ref x 0)) new-value))))



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- clisp.spec	2 Oct 2006 19:10:53 -0000	1.19
+++ clisp.spec	3 Oct 2006 16:44:12 -0000	1.20
@@ -1,12 +1,13 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.40
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
 Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
+Patch0:		clisp-2.40-doc.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -20,8 +21,7 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	imake
-#ExcludeArch:	ppc ppc64
-ExcludeArch:	x86_64
+ExcludeArch:	ppc ppc64
 
 
 %description
@@ -57,6 +57,8 @@
 
 %prep
 %setup -q
+cd src
+%patch0
 
 
 %build
@@ -130,6 +132,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-3
+- Added patch for x86_64
+
 * Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-1
 - new version 2.40
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:04:25 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Oct 2006 10:04:25 -0700
Subject: rpms/clisp/FC-5 clisp-2.40-doc.patch,NONE,1.1 clisp.spec,1.17,1.18
Message-ID: <200610031704.k93H4RlZ002226@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2206/FC-5

Modified Files:
	clisp.spec 
Added Files:
	clisp-2.40-doc.patch 
Log Message:


clisp-2.40-doc.patch:

--- NEW FILE clisp-2.40-doc.patch ---
--- documentation.lisp	02 Oct 2006 06:01:24 -0400	1.26
+++ documentation.lisp	03 Oct 2006 10:47:23 -0400
@@ -4,7 +4,7 @@

 (in-package "CLOS")

-(defun function-documentation (x)
+(defun function-documentation (x &aux name)
   (cond ((typep-class x <standard-generic-function>)
          (std-gf-documentation x))
         ((eq (type-of x) 'FUNCTION) ; interpreted function?
@@ -12,8 +12,7 @@
         #+FFI ((eq (type-of x) 'ffi::foreign-function)
                (getf (sys::%record-ref x 5) :documentation))
         ((sys::closurep x) (sys::closure-documentation x))
-        ((let ((name (sys::subr-info x))) ; subr
-           (and name (get :documentation name))))
+        ((setq name (sys::subr-info x)) (get :documentation name)) ; subr
         (t (get :documentation (sys::%record-ref x 0)))))

 ;;; documentation
@@ -81,7 +80,7 @@
   (:method ((x slot-definition) (doc-type (eql 't)))
     (slot-definition-documentation x)))

-(defun set-function-documentation (x new-value)
+(defun set-function-documentation (x new-value &aux name)
   (cond ((typep-class x <standard-generic-function>)
          (setf (std-gf-documentation x) new-value))
         ((eq (type-of x) 'FUNCTION) ; interpreted function?
@@ -89,8 +88,8 @@
         #+FFI ((eq (type-of x) 'ffi::foreign-function)
                (setf (getf (sys::%record-ref x 5) :documentation) new-value))
         ((sys::closurep x) (sys::closure-set-documentation x new-value))
-        ((let ((name (sys::subr-info x))) ; subr
-           (and name (setf (get :documentation name) new-value))))
+        ((setq name (sys::subr-info x)) ; subr
+         (setf (get :documentation name) new-value))
         (t                      ; fsubr
          (setf (get :documentation (sys::%record-ref x 0)) new-value))))



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/clisp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- clisp.spec	2 Oct 2006 11:24:25 -0000	1.17
+++ clisp.spec	3 Oct 2006 17:04:24 -0000	1.18
@@ -1,12 +1,13 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.40
-Release: 	1%{?dist}
+Release: 	3%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
 Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
+Patch0:		clisp-2.40-doc.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -56,6 +57,8 @@
 
 %prep
 %setup -q
+cd src
+%patch0
 
 
 %build
@@ -129,6 +132,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-3
+- Added patch for x86_64
+
 * Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-1
 - new version 2.40
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:05:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:05:08 -0700
Subject: rpms/libmodplug/devel libmodplug-0.8-CVE-2006-4192.patch, NONE,
	1.1 libmodplug.spec, 1.10, 1.11
Message-ID: <200610031705.k93H5A7F002381@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmodplug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325/devel

Modified Files:
	libmodplug.spec 
Added Files:
	libmodplug-0.8-CVE-2006-4192.patch 
Log Message:
* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Apply patch for CVE-2006-4192 (from Debian).


libmodplug-0.8-CVE-2006-4192.patch:

--- NEW FILE libmodplug-0.8-CVE-2006-4192.patch ---
--- libmodplug-0.8/src/sndfile.cpp~	2006-03-20 05:22:32.000000000 +0200
+++ libmodplug-0.8/src/sndfile.cpp	2006-10-03 19:21:17.000000000 +0300
@@ -1081,7 +1081,7 @@
 {
 	UINT len = 0, mem = pIns->nLength+6;
 
-	if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0;
+	if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0;
 	if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH;
 	pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO);
 	if (nFlags & RSF_16BIT)


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/devel/libmodplug.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libmodplug.spec	28 Aug 2006 16:08:17 -0000	1.10
+++ libmodplug.spec	3 Oct 2006 17:05:08 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -8,6 +8,7 @@
 License:        Public Domain
 URL:            http://modplug-xmms.sourceforge.net/
 Source0:        http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8-CVE-2006-4192.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
 sed -i -e 's/\r//g' ChangeLog
 
@@ -66,6 +68,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-3
+- Apply patch for CVE-2006-4192 (from Debian).
+
 * Mon Aug 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:05:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:05:02 -0700
Subject: rpms/libmodplug/FC-4 libmodplug-0.8-CVE-2006-4192.patch, NONE,
	1.1 libmodplug.spec, 1.7, 1.8
Message-ID: <200610031705.k93H5Ymo002384@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmodplug/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325/FC-4

Modified Files:
	libmodplug.spec 
Added Files:
	libmodplug-0.8-CVE-2006-4192.patch 
Log Message:
* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Apply patch for CVE-2006-4192 (from Debian).


libmodplug-0.8-CVE-2006-4192.patch:

--- NEW FILE libmodplug-0.8-CVE-2006-4192.patch ---
--- libmodplug-0.8/src/sndfile.cpp~	2006-03-20 05:22:32.000000000 +0200
+++ libmodplug-0.8/src/sndfile.cpp	2006-10-03 19:21:17.000000000 +0300
@@ -1081,7 +1081,7 @@
 {
 	UINT len = 0, mem = pIns->nLength+6;
 
-	if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0;
+	if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0;
 	if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH;
 	pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO);
 	if (nFlags & RSF_16BIT)


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/FC-4/libmodplug.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libmodplug.spec	23 Aug 2005 16:09:03 -0000	1.7
+++ libmodplug.spec	3 Oct 2006 17:05:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -9,6 +9,7 @@
 URL:            http://modplug-xmms.sourceforge.net/
 Source0:        http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz
 Patch0:         %{name}-64bit.patch
+Patch1:         %{name}-0.8-CVE-2006-4192.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.7-4
+- Apply patch for CVE-2006-4192 (from Debian).
+
 * Tue Aug 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.7-3
 - Fix x86_64, thanks to Adam Goode (#166127).
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:05:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:05:03 -0700
Subject: rpms/libmodplug/FC-5 libmodplug-0.8-CVE-2006-4192.patch, NONE,
	1.1 libmodplug.spec, 1.9, 1.10
Message-ID: <200610031705.k93H5ZnL002387@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmodplug/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325/FC-5

Modified Files:
	libmodplug.spec 
Added Files:
	libmodplug-0.8-CVE-2006-4192.patch 
Log Message:
* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Apply patch for CVE-2006-4192 (from Debian).


libmodplug-0.8-CVE-2006-4192.patch:

--- NEW FILE libmodplug-0.8-CVE-2006-4192.patch ---
--- libmodplug-0.8/src/sndfile.cpp~	2006-03-20 05:22:32.000000000 +0200
+++ libmodplug-0.8/src/sndfile.cpp	2006-10-03 19:21:17.000000000 +0300
@@ -1081,7 +1081,7 @@
 {
 	UINT len = 0, mem = pIns->nLength+6;
 
-	if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0;
+	if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0;
 	if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH;
 	pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO);
 	if (nFlags & RSF_16BIT)


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/FC-5/libmodplug.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libmodplug.spec	24 Mar 2006 20:36:37 -0000	1.9
+++ libmodplug.spec	3 Oct 2006 17:05:02 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.8
-Release:        1%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -8,6 +8,7 @@
 License:        Public Domain
 URL:            http://modplug-xmms.sourceforge.net/
 Source0:        http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8-CVE-2006-4192.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
 sed -i -e 's/\r//g' ChangeLog
 
@@ -66,6 +68,12 @@
 
 
 %changelog
+* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-3
+- Apply patch for CVE-2006-4192 (from Debian).
+
+* Mon Aug 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-2
+- Rebuild.
+
 * Fri Mar 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-1
 - 0.8, 64bit patch included upstream.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:15:05 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue,  3 Oct 2006 10:15:05 -0700
Subject: rpms/lighttpd/devel lighttpd-1.4.12-fix.patch, NONE,
	1.1 lighttpd.spec, 1.26, 1.27
Message-ID: <200610031715.k93HF7hI002567@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544

Modified Files:
	lighttpd.spec 
Added Files:
	lighttpd-1.4.12-fix.patch 
Log Message:
Include fix for segfaults (lighttpd bug #876, changeset 1352).


lighttpd-1.4.12-fix.patch:

--- NEW FILE lighttpd-1.4.12-fix.patch ---
Index: /branches/lighttpd-1.4.x/src/connections.c
===================================================================
--- /branches/lighttpd-1.4.x/src/connections.c (revision 1345)
+++ /branches/lighttpd-1.4.x/src/connections.c (revision 1352)
@@ -953,5 +953,5 @@
 
 									last_chunk = lookahead_chunk;
-									last_offset = missing_chars + 1;
+									last_offset = missing_chars;
 
 									break;


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- lighttpd.spec	25 Sep 2006 15:48:21 -0000	1.26
+++ lighttpd.spec	3 Oct 2006 17:15:05 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.12
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -16,6 +16,7 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
+Patch1: lighttpd-1.4.12-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -67,6 +68,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
+%patch1 -p3 -b .fix
 
 
 %build
@@ -173,6 +175,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-3
+- Include fix for segfaults (lighttpd bug #876, changeset 1352).
+
 * Mon Sep 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-1
 - Update to 1.4.12 final.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:20:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:20:12 -0700
Subject: fedora-security/audit fe3,1.18,1.19 fe4,1.74,1.75 fe5,1.80,1.81
Message-ID: <200610031720.k93HKC72002696@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2673

Modified Files:
	fe3 fe4 fe5 
Log Message:
Note CVE-2006-4192, CVE-2006-5111.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fe3	27 Sep 2006 19:05:52 -0000	1.18
+++ fe3	3 Oct 2006 17:20:09 -0000	1.19
@@ -2,7 +2,9 @@
 
 ** are items that need attention
 
+CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
+CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-3) #200545
 CVE-2006-3816 version (krusader, fixed 1.70.1) #200323


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- fe4	27 Sep 2006 19:15:49 -0000	1.74
+++ fe4	3 Oct 2006 17:20:09 -0000	1.75
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4943 ** (moodle) #206516
 CVE-2006-4942 ** (moodle) #206516
@@ -16,6 +17,7 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-4) #200545


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fe5	27 Sep 2006 19:15:49 -0000	1.80
+++ fe5	3 Oct 2006 17:20:09 -0000	1.81
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4943 ** (moodle) #206516
 CVE-2006-4942 ** (moodle) #206516
@@ -16,6 +17,7 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-5) #200545



From fedora-extras-commits at redhat.com  Tue Oct  3 17:41:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:41:15 -0700
Subject: fedora-security/audit fe3,1.19,1.20 fe4,1.75,1.76 fe5,1.81,1.82
Message-ID: <200610031741.k93HfFd8002786@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2764

Modified Files:
	fe3 fe4 fe5 
Log Message:
+CVE-2006-4247


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fe3	3 Oct 2006 17:20:09 -0000	1.19
+++ fe3	3 Oct 2006 17:41:12 -0000	1.20
@@ -4,6 +4,7 @@
 
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
+CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-3) #200545


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- fe4	3 Oct 2006 17:20:09 -0000	1.75
+++ fe4	3 Oct 2006 17:41:12 -0000	1.76
@@ -17,6 +17,7 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fe5	3 Oct 2006 17:20:09 -0000	1.81
+++ fe5	3 Oct 2006 17:41:12 -0000	1.82
@@ -17,6 +17,7 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4247 VULNERABLE (plone) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688



From fedora-extras-commits at redhat.com  Tue Oct  3 17:59:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:59:47 -0700
Subject: fedora-security/audit fe4,1.76,1.77 fe5,1.82,1.83
Message-ID: <200610031759.k93Hxlxl002927@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2907

Modified Files:
	fe4 fe5 
Log Message:
Note seamonkey < 1.0.5 issues.


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- fe4	3 Oct 2006 17:41:12 -0000	1.76
+++ fe4	3 Oct 2006 17:59:44 -0000	1.77
@@ -17,6 +17,13 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4571 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4570 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4568 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4566 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4565 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fe5	3 Oct 2006 17:41:12 -0000	1.82
+++ fe5	3 Oct 2006 17:59:44 -0000	1.83
@@ -17,6 +17,13 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4571 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4570 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 VULNERABLE (plone) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989



From fedora-extras-commits at redhat.com  Tue Oct  3 18:25:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  3 Oct 2006 11:25:04 -0700
Subject: rpms/cpanspec/devel .cvsignore, 1.11, 1.12 cpanspec.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200610031825.k93IP6S0006011@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5990

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.69.
Use _fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Jul 2006 01:10:07 -0000	1.11
+++ .cvsignore	3 Oct 2006 18:25:03 -0000	1.12
@@ -1 +1 @@
-cpanspec-1.68.tar.gz
+cpanspec-1.69.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpanspec.spec	17 Sep 2006 17:33:11 -0000	1.12
+++ cpanspec.spec	3 Oct 2006 18:25:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           cpanspec
-Version:        1.68
-Release:        2%{?dist}
+Version:        1.69
+Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
 Group:          Development/Tools
@@ -36,7 +36,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 # No tests.
 #%check
@@ -52,6 +52,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
+- Update to 1.69.
+- Use _fixperms macro instead of our own chmod incantation.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.68-2
 - Fix find option order.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jul 2006 01:10:07 -0000	1.11
+++ sources	3 Oct 2006 18:25:03 -0000	1.12
@@ -1 +1 @@
-7ba1c9f361fc61d22cbd694bd17fa53d  cpanspec-1.68.tar.gz
+ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 18:27:35 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  3 Oct 2006 11:27:35 -0700
Subject: rpms/cpanspec/FC-5 .cvsignore, 1.11, 1.12 cpanspec.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200610031827.k93IRbKq006138@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6115

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Sync with devel branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Jul 2006 01:12:24 -0000	1.11
+++ .cvsignore	3 Oct 2006 18:27:35 -0000	1.12
@@ -1 +1 @@
-cpanspec-1.68.tar.gz
+cpanspec-1.69.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cpanspec.spec	21 Jul 2006 01:12:24 -0000	1.11
+++ cpanspec.spec	3 Oct 2006 18:27:35 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.68
+Version:        1.69
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -34,9 +34,9 @@
 ./Build install destdir=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 # No tests.
 #%check
@@ -52,6 +52,13 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
+- Update to 1.69.
+- Use _fixperms macro instead of our own chmod incantation.
+
+* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.68-2
+- Fix find option order.
+
 * Thu Jul 20 2006 Steven Pritchard <steve at kspei.com> 1.68-1
 - Update to 1.68.
 - Include Changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jul 2006 01:12:24 -0000	1.11
+++ sources	3 Oct 2006 18:27:35 -0000	1.12
@@ -1 +1 @@
-7ba1c9f361fc61d22cbd694bd17fa53d  cpanspec-1.68.tar.gz
+ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 18:27:45 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 11:27:45 -0700
Subject: rpms/brasero - New directory
Message-ID: <200610031827.k93IRlDu006204@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6151/brasero

Log Message:
Directory /cvs/extras/rpms/brasero added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 18:27:46 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 11:27:46 -0700
Subject: rpms/brasero/devel - New directory
Message-ID: <200610031827.k93IRmRO006207@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6151/brasero/devel

Log Message:
Directory /cvs/extras/rpms/brasero/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 18:28:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 11:28:05 -0700
Subject: rpms/brasero Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610031828.k93IS7Pw006267@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6232

Added Files:
	Makefile import.log 
Log Message:
Setup of module brasero


--- NEW FILE Makefile ---
# Top level Makefile for module brasero
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct  3 18:28:06 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 11:28:06 -0700
Subject: rpms/brasero/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610031828.k93IS8KJ006270@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6232/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module brasero


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct  3 18:28:08 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  3 Oct 2006 11:28:08 -0700
Subject: rpms/cpanspec/FC-4 .cvsignore, 1.11, 1.12 cpanspec.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200610031828.k93ISePT006305@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6266

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Sync with devel branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Jul 2006 01:12:23 -0000	1.11
+++ .cvsignore	3 Oct 2006 18:28:08 -0000	1.12
@@ -1 +1 @@
-cpanspec-1.68.tar.gz
+cpanspec-1.69.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cpanspec.spec	21 Jul 2006 01:12:23 -0000	1.11
+++ cpanspec.spec	3 Oct 2006 18:28:08 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.68
+Version:        1.69
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -34,9 +34,9 @@
 ./Build install destdir=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 # No tests.
 #%check
@@ -52,6 +52,13 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
+- Update to 1.69.
+- Use _fixperms macro instead of our own chmod incantation.
+
+* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.68-2
+- Fix find option order.
+
 * Thu Jul 20 2006 Steven Pritchard <steve at kspei.com> 1.68-1
 - Update to 1.68.
 - Include Changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jul 2006 01:12:23 -0000	1.11
+++ sources	3 Oct 2006 18:28:08 -0000	1.12
@@ -1 +1 @@
-7ba1c9f361fc61d22cbd694bd17fa53d  cpanspec-1.68.tar.gz
+ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 18:32:54 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue,  3 Oct 2006 11:32:54 -0700
Subject: rpms/octave/devel .cvsignore, 1.10, 1.11 octave.spec, 1.47,
	1.48 sources, 1.10, 1.11 octave-2.9.8-misc.patch, 1.1, NONE
Message-ID: <200610031832.k93IWuSw006443@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6422

Modified Files:
	.cvsignore octave.spec sources 
Removed Files:
	octave-2.9.8-misc.patch 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Aug 2006 14:53:00 -0000	1.10
+++ .cvsignore	3 Oct 2006 18:32:54 -0000	1.11
@@ -1 +1 @@
-octave-2.9.8.tar.bz2
+octave-2.9.9.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- octave.spec	15 Sep 2006 15:53:25 -0000	1.47
+++ octave.spec	3 Oct 2006 18:32:54 -0000	1.48
@@ -1,13 +1,12 @@
 Name:           octave
-Version:        2.9.8
-Release:        2%{?dist}
+Version:        2.9.9
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
-Patch0:         octave-2.9.8-misc.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -50,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -125,6 +123,9 @@
 
 
 %changelog
+* Mon Oct  3 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.9-1
+- New release. Remove old patch.
+
 * Fri Sep 15 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.8-2
 - Fix this bug:
   https://www.cae.wisc.edu/pipermail/bug-octave/2006-September/000687.html


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Aug 2006 14:53:00 -0000	1.10
+++ sources	3 Oct 2006 18:32:54 -0000	1.11
@@ -1 +1 @@
-1ccc06e00de7e61cc92e245bd48024a6  octave-2.9.8.tar.bz2
+a76a6d88f414285472896a63e4282b7f  octave-2.9.9.tar.bz2


--- octave-2.9.8-misc.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct  3 19:07:38 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue,  3 Oct 2006 12:07:38 -0700
Subject: rpms/pessulus import.log,1.13,1.14
Message-ID: <200610031907.k93J7etU009592@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/pessulus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9559

Modified Files:
	import.log 
Log Message:
auto-import pessulus-2.16.1-1 on branch devel from pessulus-2.16.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pessulus/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	23 Sep 2006 15:21:17 -0000	1.13
+++ import.log	3 Oct 2006 19:07:38 -0000	1.14
@@ -10,3 +10,4 @@
 pessulus-2_15_91-2_fc6:HEAD:pessulus-2.15.91-2.fc6.src.rpm:1156785336
 pessulus-2_16_0-1_fc6:HEAD:pessulus-2.16.0-1.fc6.src.rpm:1157498558
 pessulus-2_16_0-4_fc6:HEAD:pessulus-2.16.0-4.fc6.src.rpm:1159024941
+pessulus-2_16_1-1:HEAD:pessulus-2.16.1-1.src.rpm:1159902444



From fedora-extras-commits at redhat.com  Tue Oct  3 19:07:39 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue,  3 Oct 2006 12:07:39 -0700
Subject: rpms/pessulus/devel .cvsignore, 1.6, 1.7 pessulus.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200610031907.k93J7fpK009598@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/pessulus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9559/devel

Modified Files:
	.cvsignore pessulus.spec sources 
Log Message:
auto-import pessulus-2.16.1-1 on branch devel from pessulus-2.16.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Sep 2006 23:22:01 -0000	1.6
+++ .cvsignore	3 Oct 2006 19:07:38 -0000	1.7
@@ -1 +1 @@
-pessulus-2.16.0.tar.bz2
+pessulus-2.16.1.tar.bz2


Index: pessulus.spec
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/pessulus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pessulus.spec	23 Sep 2006 15:21:18 -0000	1.12
+++ pessulus.spec	3 Oct 2006 19:07:38 -0000	1.13
@@ -1,9 +1,9 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define debug_package %{nil}
+%{!?python_sitearch: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 
 Name:	pessulus
-Version:	2.16.0
-Release:	4%{?dist}
+Version:	2.16.1
+Release:	1%{?dist}
 Summary:	A lockdown editor for GNOME
 
 Group:	Applications/System
@@ -11,7 +11,7 @@
 URL:	http://live.gnome.org/Pessulus
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildArch:      noarch
 
 BuildRequires:	gtk2-devel, pygtk2-devel, gnome-python2, gnome-python2-gconf, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2-devel, gettext-devel
 Requires: gnome-python2-gconf
@@ -35,7 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{python_sitearch}/Pessulus/*.py
+chmod +x $RPM_BUILD_ROOT%{python_sitelib}/Pessulus/*.py
 
 
 desktop-file-install --vendor fedora --delete-original \
@@ -52,11 +52,15 @@
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING ChangeLog
 %{_bindir}/%{name}
-%{python_sitearch}/Pessulus/
+%{python_sitelib}/Pessulus/
 %{_datadir}/applications/*.desktop
 %{_datadir}/%{name}
 
 %changelog
+* Sat Sep 23 2006 Damien Durand <splinux at fedoraproject.org> - 2.16.1-1
+- Upgrade to 2.16.1
+- Fixed #195819
+
 * Sat Sep 23 2006 Damien Durand <splinux at fedoraproject.org> - 2.16-4
 - Bumped release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Sep 2006 23:22:01 -0000	1.6
+++ sources	3 Oct 2006 19:07:38 -0000	1.7
@@ -1 +1 @@
-a87d325aafc4377d1749575bd6e9b44d  pessulus-2.16.0.tar.bz2
+884031b0ec1d1e6c15c3fd8f110541bb  pessulus-2.16.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 19:17:07 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:17:07 -0700
Subject: rpms/librsync/devel librsync.spec,1.12,1.13
Message-ID: <200610031917.k93JH9FC009763@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/librsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9746

Modified Files:
	librsync.spec 
Log Message:
Rebuilt



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- librsync.spec	25 Sep 2006 19:01:12 -0000	1.12
+++ librsync.spec	3 Oct 2006 19:17:07 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
+- rebuilt
+
 * Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
 - added an upstream patch to solve a lfs overflow (#207940)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:18:07 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:18:07 -0700
Subject: rpms/librsync/FC-5 librsync.spec,1.12,1.13
Message-ID: <200610031918.k93JI92k009793@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/librsync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9776

Modified Files:
	librsync.spec 
Log Message:
Rebuilt



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/FC-5/librsync.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- librsync.spec	25 Sep 2006 19:01:46 -0000	1.12
+++ librsync.spec	3 Oct 2006 19:18:07 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
+- rebuilt
+
 * Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
 - added an upstream patch to solve a lfs overflow (#207940)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:18:29 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:18:29 -0700
Subject: rpms/librsync/FC-4 librsync.spec,1.11,1.12
Message-ID: <200610031918.k93JIVjL009821@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/librsync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9804

Modified Files:
	librsync.spec 
Log Message:
Rebuilt



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/FC-4/librsync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- librsync.spec	25 Sep 2006 19:03:23 -0000	1.11
+++ librsync.spec	3 Oct 2006 19:18:29 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
+- rebuilt
+
 * Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
 - added an upstream patch to solve a lfs overflow (#207940)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:18:49 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:18:49 -0700
Subject: rpms/librsync/FC-3 librsync.spec,1.7,1.8
Message-ID: <200610031918.k93JIpxH009852@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/librsync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835

Modified Files:
	librsync.spec 
Log Message:
Rebuilt



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/FC-3/librsync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- librsync.spec	25 Sep 2006 19:06:32 -0000	1.7
+++ librsync.spec	3 Oct 2006 19:18:49 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
+- rebuilt
+
 * Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
 - added an upstream patch to solve a lfs overflow (#207940)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:23:37 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:23:37 -0700
Subject: rpms/mimedefang/devel mimedefang.spec,1.1,1.2
Message-ID: <200610031923.k93JNd6K010078@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10058

Modified Files:
	mimedefang.spec 
Log Message:
Rebuilt



Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mimedefang.spec	16 Sep 2006 17:19:57 -0000	1.1
+++ mimedefang.spec	3 Oct 2006 19:23:37 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
 Version:           2.57
-Release:           4%{?dist}
+Release:           5%{?dist}
 License:           GPL
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -86,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 2.57-5
+- Rebuilt
+
 * Sat Sep 16 2006 Robert Scheck <robert at fedoraproject.org> 2.57-4
 - Removed two hardcoded versioned requirements (#196101 #c13)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:24:15 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:24:15 -0700
Subject: rpms/mimedefang/FC-5 mimedefang.spec,1.1,1.2
Message-ID: <200610031924.k93JOHIA010148@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10131

Modified Files:
	mimedefang.spec 
Log Message:
Rebuilt



Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-5/mimedefang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mimedefang.spec	16 Sep 2006 17:19:57 -0000	1.1
+++ mimedefang.spec	3 Oct 2006 19:24:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
 Version:           2.57
-Release:           4%{?dist}
+Release:           5%{?dist}
 License:           GPL
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -86,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 2.57-5
+- Rebuilt
+
 * Sat Sep 16 2006 Robert Scheck <robert at fedoraproject.org> 2.57-4
 - Removed two hardcoded versioned requirements (#196101 #c13)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:36:52 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Tue,  3 Oct 2006 12:36:52 -0700
Subject: rpms/wavbreaker/devel wavbreaker-tooltips.patch, NONE,
	1.1 wavbreaker.spec, 1.1, 1.2
Message-ID: <200610031936.k93JastP010302@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10275

Modified Files:
	wavbreaker.spec 
Added Files:
	wavbreaker-tooltips.patch 
Log Message:
added simple tooltips fix


wavbreaker-tooltips.patch:

--- NEW FILE wavbreaker-tooltips.patch ---
--- wavbreaker-0.7/src/wavbreaker.c.orig	2006-10-03 14:57:07.000000000 -0400
+++ wavbreaker-0.7/src/wavbreaker.c	2006-10-03 14:58:37.000000000 -0400
@@ -2107,10 +2107,10 @@
 
 #ifdef HAVE_GTK_2_6
     gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_MEDIA_PLAY,
-                             "Quit wavbreaker", NULL,
+                             "Play Wave File", NULL,
                              G_CALLBACK(menu_play), main_window, -1);
     gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_MEDIA_STOP,
-                             "Quit wavbreaker", NULL,
+                             "Stop Playback", NULL,
                              G_CALLBACK(menu_stop), main_window, -1);
 #else
     icon = gtk_image_new_from_file(play_icon_filename);


Index: wavbreaker.spec
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/devel/wavbreaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wavbreaker.spec	2 Oct 2006 21:25:06 -0000	1.1
+++ wavbreaker.spec	3 Oct 2006 19:36:52 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Tool for splitting .wav files
 Name:		wavbreaker
 Version: 	0.7
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://huli.org/wavbreaker/index.html
@@ -9,6 +9,7 @@
 Source1:	wavbreaker-icon.png
 Source2:	wavbreaker.desktop
 Patch:		wavbreaker-0.7-browsedir-set_current_folder-v2.patch
+Patch1:		wavbreaker-tooltips.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, libxml2-devel, desktop-file-utils, alsa-lib-devel
 Requires(post):	desktop-file-utils
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
 
 %build
 %configure
@@ -59,6 +61,9 @@
 %doc ChangeLog CONTRIBUTORS NEWS AUTHORS COPYING README TODO
 
 %changelog
+* Tue Oct 3 2006 Homer <dmaley at nc.rr.com> 0.7-6
+- added wavbreaker-tooltips.patch
+
 * Thu Jun 1 2006 Homer <dmaley at nc.rr.com> 0.7-5
 - replaced wavbreaker-0.7-browsedir-set_current_folder.patch w/ 
   wavbreaker-0.7-browsedir-set_current_folder-v2.patch



From fedora-extras-commits at redhat.com  Tue Oct  3 19:45:43 2006
From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb))
Date: Tue,  3 Oct 2006 12:45:43 -0700
Subject: rpms/cowbell/devel cowbell.spec,1.5,1.6
Message-ID: <200610031945.k93JjjMM010400@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/cowbell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10383

Modified Files:
	cowbell.spec 
Log Message:
Don't replace %{_libdir}


Index: cowbell.spec
===================================================================
RCS file: /cvs/extras/rpms/cowbell/devel/cowbell.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cowbell.spec	15 Sep 2006 12:32:31 -0000	1.5
+++ cowbell.spec	3 Oct 2006 19:45:43 -0000	1.6
@@ -1,5 +1,3 @@
-%define _libdir /usr/lib
-
 Name:           cowbell
 Version:        0.2.7.1
 Release:        6%{?dist}
@@ -82,6 +80,8 @@
 
 
 %changelog
+* Tue Oct 03 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.7.1-7
+- Don't replace %{_libdir}
 * Fri Sep 15 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.7.1-6
 - Add missing gtk-sharp2-devel Builddep
 * Fri Sep 15 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.7.1-5



From fedora-extras-commits at redhat.com  Tue Oct  3 19:46:47 2006
From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb))
Date: Tue,  3 Oct 2006 12:46:47 -0700
Subject: rpms/cowbell/devel cowbell.spec,1.6,1.7
Message-ID: <200610031946.k93JknnW010453@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/cowbell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10436

Modified Files:
	cowbell.spec 
Log Message:
Don't replace %{_libdir}


Index: cowbell.spec
===================================================================
RCS file: /cvs/extras/rpms/cowbell/devel/cowbell.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cowbell.spec	3 Oct 2006 19:45:43 -0000	1.6
+++ cowbell.spec	3 Oct 2006 19:46:47 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           cowbell
 Version:        0.2.7.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Music organazier
 
 Group:         	Applications/Multimedia 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:52:33 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Tue,  3 Oct 2006 12:52:33 -0700
Subject: rpms/wavbreaker/FC-5 wavbreaker-tooltips.patch, NONE,
	1.1 wavbreaker.spec, 1.1, 1.2
Message-ID: <200610031952.k93JqZj2010624@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10604

Modified Files:
	wavbreaker.spec 
Added Files:
	wavbreaker-tooltips.patch 
Log Message:
added simple tooltips fix


wavbreaker-tooltips.patch:

--- NEW FILE wavbreaker-tooltips.patch ---
--- wavbreaker-0.7/src/wavbreaker.c.orig	2006-10-03 14:57:07.000000000 -0400
+++ wavbreaker-0.7/src/wavbreaker.c	2006-10-03 14:58:37.000000000 -0400
@@ -2107,10 +2107,10 @@
 
 #ifdef HAVE_GTK_2_6
     gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_MEDIA_PLAY,
-                             "Quit wavbreaker", NULL,
+                             "Play Wave File", NULL,
                              G_CALLBACK(menu_play), main_window, -1);
     gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_MEDIA_STOP,
-                             "Quit wavbreaker", NULL,
+                             "Stop Playback", NULL,
                              G_CALLBACK(menu_stop), main_window, -1);
 #else
     icon = gtk_image_new_from_file(play_icon_filename);


Index: wavbreaker.spec
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/FC-5/wavbreaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wavbreaker.spec	2 Oct 2006 21:25:06 -0000	1.1
+++ wavbreaker.spec	3 Oct 2006 19:52:33 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Tool for splitting .wav files
 Name:		wavbreaker
 Version: 	0.7
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://huli.org/wavbreaker/index.html
@@ -9,6 +9,7 @@
 Source1:	wavbreaker-icon.png
 Source2:	wavbreaker.desktop
 Patch:		wavbreaker-0.7-browsedir-set_current_folder-v2.patch
+Patch1:		wavbreaker-tooltips.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, libxml2-devel, desktop-file-utils, alsa-lib-devel
 Requires(post):	desktop-file-utils
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
 
 %build
 %configure
@@ -59,6 +61,9 @@
 %doc ChangeLog CONTRIBUTORS NEWS AUTHORS COPYING README TODO
 
 %changelog
+* Tue Oct 3 2006 Homer <dmaley at nc.rr.com> 0.7-6
+- added wavbreaker-tooltips.patch
+
 * Thu Jun 1 2006 Homer <dmaley at nc.rr.com> 0.7-5
 - replaced wavbreaker-0.7-browsedir-set_current_folder.patch w/ 
   wavbreaker-0.7-browsedir-set_current_folder-v2.patch



From fedora-extras-commits at redhat.com  Tue Oct  3 20:00:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue,  3 Oct 2006 13:00:07 -0700
Subject: rpms/perl-Alien-wxWidgets/devel .cvsignore, 1.2,
	1.3 perl-Alien-wxWidgets.spec, 1.3, 1.4 sources, 1.2,
	1.3 Alien-wxWidgets-0.21-Any_wx_config.pm.patch, 1.1, NONE
Message-ID: <200610032000.k93K09Zg010802@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10755

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Removed Files:
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch 
Log Message:
- Update to 0.22.
- Avoid creation of the debuginfo package (#209180).
- Dropped patch Alien-wxWidgets-0.21-Any_wx_config.pm.patch
  (http://rt.cpan.org/Public/Bug/Display.html?id=21854).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:34:31 -0000	1.2
+++ .cvsignore	3 Oct 2006 20:00:07 -0000	1.3
@@ -1 +1 @@
-Alien-wxWidgets-0.21.tar.gz
+Alien-wxWidgets-0.22.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Alien-wxWidgets.spec	1 Oct 2006 01:32:52 -0000	1.3
+++ perl-Alien-wxWidgets.spec	3 Oct 2006 20:00:07 -0000	1.4
@@ -1,21 +1,23 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.21
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
-Patch0:         Alien-wxWidgets-0.21-Any_wx_config.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::Pluggable)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%define debug_package %{nil}
+
 %description
 "Alien::wxWidgets" can be used to detect and get configuration
 settings from an installed wxWidgets.
@@ -23,7 +25,6 @@
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
-%patch0 -p1
 
 
 %build
@@ -53,6 +54,12 @@
 
 
 %changelog
+* Tue Oct  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
+- Update to 0.22.
+- Avoid creation of the debuginfo package (#209180).
+- Dropped patch Alien-wxWidgets-0.21-Any_wx_config.pm.patch
+  (http://rt.cpan.org/Public/Bug/Display.html?id=21854).
+
 * Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-3
 - Patch to add /usr/lib64 to the library search path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:34:31 -0000	1.2
+++ sources	3 Oct 2006 20:00:07 -0000	1.3
@@ -1 +1 @@
-6975385d6e4d4d58c5d589c2a7077d23  Alien-wxWidgets-0.21.tar.gz
+98de414f8d378170ede6cf96a0e2f73e  Alien-wxWidgets-0.22.tar.gz


--- Alien-wxWidgets-0.21-Any_wx_config.pm.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct  3 20:10:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue,  3 Oct 2006 13:10:34 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-5 .cvsignore, 1.2,
	1.3 perl-Alien-wxWidgets.spec, 1.3, 1.4 sources, 1.2,
	1.3 Alien-wxWidgets-0.21-Any_wx_config.pm.patch, 1.1, NONE
Message-ID: <200610032010.k93KAaKN013806@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13785

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Removed Files:
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch 
Log Message:
- Update to 0.22.
- Avoid creation of the debuginfo package (#209180).
- Dropped patch Alien-wxWidgets-0.21-Any_wx_config.pm.patch
  (http://rt.cpan.org/Public/Bug/Display.html?id=21854).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:34:31 -0000	1.2
+++ .cvsignore	3 Oct 2006 20:10:34 -0000	1.3
@@ -1 +1 @@
-Alien-wxWidgets-0.21.tar.gz
+Alien-wxWidgets-0.22.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/perl-Alien-wxWidgets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Alien-wxWidgets.spec	1 Oct 2006 01:48:42 -0000	1.3
+++ perl-Alien-wxWidgets.spec	3 Oct 2006 20:10:34 -0000	1.4
@@ -1,21 +1,23 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.21
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
-Patch0:         Alien-wxWidgets-0.21-Any_wx_config.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::Pluggable)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%define debug_package %{nil}
+
 %description
 "Alien::wxWidgets" can be used to detect and get configuration
 settings from an installed wxWidgets.
@@ -23,7 +25,6 @@
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
-%patch0 -p1
 
 
 %build
@@ -53,6 +54,12 @@
 
 
 %changelog
+* Tue Oct  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
+- Update to 0.22.
+- Avoid creation of the debuginfo package (#209180).
+- Dropped patch Alien-wxWidgets-0.21-Any_wx_config.pm.patch
+  (http://rt.cpan.org/Public/Bug/Display.html?id=21854).
+
 * Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-3
 - Patch to add /usr/lib64 to the library search path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:34:31 -0000	1.2
+++ sources	3 Oct 2006 20:10:34 -0000	1.3
@@ -1 +1 @@
-6975385d6e4d4d58c5d589c2a7077d23  Alien-wxWidgets-0.21.tar.gz
+98de414f8d378170ede6cf96a0e2f73e  Alien-wxWidgets-0.22.tar.gz


--- Alien-wxWidgets-0.21-Any_wx_config.pm.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct  3 20:34:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 13:34:56 -0700
Subject: rpms/jasper/FC-5 .cvsignore,1.2,1.3 jasper.spec,1.13,1.14
Message-ID: <200610032034.k93KYw0n013963@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13944

Modified Files:
	.cvsignore jasper.spec 
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
- memory leak (#207006)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:40:10 -0000	1.2
+++ .cvsignore	3 Oct 2006 20:34:55 -0000	1.3
@@ -1 +1,2 @@
+geojasper_src.zip
 jasper-1.701.0.zip


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-5/jasper.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jasper.spec	1 Mar 2006 18:16:10 -0000	1.13
+++ jasper.spec	3 Oct 2006 20:34:56 -0000	1.14
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 12%{?dist}
+Release: 15%{?dist}
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"
@@ -29,14 +29,16 @@
 Patch1: jasper-1.701.0-GL.patch
 # autoconf/automake bits of patch1
 Patch2: jasper-1.701.0-GL-ac.patch
+# memory leak, see
+# http://gyachi.sourceforge.net/download.shtml
+# http://ayttm.sourceforge.net/files.shtml
+# http://ayttm.sourceforge.net/jasper-memory-leak-1.701.0.patch.gz
+Patch3: jasper-1.701.0-memory_leak.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -56,6 +58,7 @@
 %setup -q -n %{name}-%{version}%{?geo:.GEO}
 
 %patch1 -p1 -b .GL
+%patch3 -p1 -b .memleak
 
 %if "%{?geo:1}" == "1"
 chmod +x configure configure.ac
@@ -93,7 +96,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/jiv
@@ -102,7 +105,7 @@
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
 %{_libdir}/lib*.so
@@ -118,6 +121,12 @@
 
 
 %changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
+- memory leak (#207006)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-13
+- fc6 respin
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-12
 - fixup build issues introduced by geojasper integration
 



From fedora-extras-commits at redhat.com  Tue Oct  3 20:35:50 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 13:35:50 -0700
Subject: rpms/jasper/FC-4 .cvsignore, 1.2, 1.3 jasper-1.701.0-GL.patch, 1.2, 
	1.3 jasper.spec, 1.7, 1.8
Message-ID: <200610032035.k93KZrdq014041@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14017

Modified Files:
	.cvsignore jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
- memory leak (#207006)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:40:10 -0000	1.2
+++ .cvsignore	3 Oct 2006 20:35:50 -0000	1.3
@@ -1 +1,2 @@
+geojasper_src.zip
 jasper-1.701.0.zip

jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper-1.701.0-GL.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper-1.701.0-GL.patch	31 Jan 2006 17:01:33 -0000	1.2
+++ jasper-1.701.0-GL.patch	3 Oct 2006 20:35:50 -0000	1.3
@@ -1,6 +1,6 @@
---- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
-+++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
-@@ -9465,7 +9465,7 @@
+--- jasper-1.701.0.GEO/configure.GL	2006-02-20 20:01:30.000000000 -0600
++++ jasper-1.701.0.GEO/configure	2006-02-24 07:40:46.000000000 -0600
+@@ -9464,7 +9464,7 @@
  OPENGL_LIBS=""
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jasper.spec	31 Jan 2006 17:01:33 -0000	1.7
+++ jasper.spec	3 Oct 2006 20:35:50 -0000	1.8
@@ -5,25 +5,40 @@
 # koffice
 # 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.701.0
-Release: 9%{?dist}
+Release: 15%{?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
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
+# autoconf/automake bits of patch1
+Patch2: jasper-1.701.0-GL-ac.patch
+# memory leak, see
+# http://gyachi.sourceforge.net/download.shtml
+# http://ayttm.sourceforge.net/files.shtml
+# http://ayttm.sourceforge.net/jasper-memory-leak-1.701.0.patch.gz
+Patch3: jasper-1.701.0-memory_leak.patch
 
+BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -40,12 +55,24 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?geo:.GEO}
 
 %patch1 -p1 -b .GL
+%patch3 -p1 -b .memleak
+
+%if "%{?geo:1}" == "1"
+chmod +x configure configure.ac
+%patch2 -p1 -b .GL-ac
+libtoolize --force
+aclocal
+autoconf
+autoheader
+automake -a
+%endif
 
 
 %build
+
 %configure \
   --enable-shared \
   --disable-static 
@@ -67,24 +94,20 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}*
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-# avoid conflict(s) with tomcat
-# not needed anymore, see bz #176773
-# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
-
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/jiv
 %{_bindir}/imginfo
-%{_bindir}/jasper*
+%{_bindir}/*jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*
-%{_includedir}/*
+%{_includedir}/jasper/
 %{_libdir}/lib*.so
 
 
@@ -98,6 +121,22 @@
 
 
 %changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
+- memory leak (#207006)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-13
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-12
+- fixup build issues introduced by geojasper integration
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-10
+- support/use geojasper (optional, default no)
+- fc5: gcc/glibc respin
+
+* Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
 - workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
   (#179464)



From fedora-extras-commits at redhat.com  Tue Oct  3 20:37:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 13:37:54 -0700
Subject: rpms/jasper/FC-4 jasper-1.701.0-GL-ac.patch, NONE,
	1.1 jasper-1.701.0-memory_leak.patch, NONE, 1.1 jasper.spec, 1.8, 1.9
Message-ID: <200610032037.k93KbuSj014118@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14095

Modified Files:
	jasper.spec 
Added Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-memory_leak.patch 
Log Message:
include patch this time


jasper-1.701.0-GL-ac.patch:

--- NEW FILE jasper-1.701.0-GL-ac.patch ---
--- jasper-1.701.0.GEO/configure.ac.GL	2006-02-20 19:58:02.000000000 -0600
+++ jasper-1.701.0.GEO/configure.ac	2006-02-24 07:40:38.000000000 -0600
@@ -242,7 +242,7 @@
 OPENGL_LIBS=""
 if test $ENABLE_OPENGL = yes; then
 	if test $HAVE_OPENGL = no; then
-		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
+		TMPLIBS="-lglut"
 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
 	fi

jasper-1.701.0-memory_leak.patch:

--- NEW FILE jasper-1.701.0-memory_leak.patch ---
diff -ur jasper-1.701.0/src/libjasper/base/jas_stream.c jasper-1.701.0-local/src/libjasper/base/jas_stream.c
--- jasper-1.701.0/src/libjasper/base/jas_stream.c	2004-02-09 07:04:40.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/base/jas_stream.c	2005-10-23 02:08:06.145589016 +0530
@@ -361,11 +361,11 @@
 	}
 	obj->fd = -1;
 	obj->flags = 0;
-	obj->pathname[0] = '\0';
+	strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	tmpnam(obj->pathname);
+	mkstemp(obj->pathname);
 
 	/* Open the underlying file. */
 	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
diff -ur jasper-1.701.0/src/libjasper/jpg/jpg_enc.c jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c
--- jasper-1.701.0/src/libjasper/jpg/jpg_enc.c	2004-02-09 07:04:41.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c	2005-10-23 02:09:02.526017888 +0530
@@ -331,6 +331,7 @@
 	rewind(output_file);
 	jpg_copyfiletostream(out, output_file);
 	fclose(output_file);
+	jas_matrix_destroy(src_mgr->data);
 	output_file = 0;
 
 	return 0;


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jasper.spec	3 Oct 2006 20:35:50 -0000	1.8
+++ jasper.spec	3 Oct 2006 20:37:54 -0000	1.9
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 15%{?dist}
+Release: 15%{?dist}.1
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"



From fedora-extras-commits at redhat.com  Tue Oct  3 20:38:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 13:38:20 -0700
Subject: rpms/jasper/FC-5 jasper-1.701.0-memory_leak.patch, NONE,
	1.1 jasper.spec, 1.14, 1.15
Message-ID: <200610032038.k93KcMUv014182@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14162

Modified Files:
	jasper.spec 
Added Files:
	jasper-1.701.0-memory_leak.patch 
Log Message:
include patch this time


jasper-1.701.0-memory_leak.patch:

--- NEW FILE jasper-1.701.0-memory_leak.patch ---
diff -ur jasper-1.701.0/src/libjasper/base/jas_stream.c jasper-1.701.0-local/src/libjasper/base/jas_stream.c
--- jasper-1.701.0/src/libjasper/base/jas_stream.c	2004-02-09 07:04:40.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/base/jas_stream.c	2005-10-23 02:08:06.145589016 +0530
@@ -361,11 +361,11 @@
 	}
 	obj->fd = -1;
 	obj->flags = 0;
-	obj->pathname[0] = '\0';
+	strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	tmpnam(obj->pathname);
+	mkstemp(obj->pathname);
 
 	/* Open the underlying file. */
 	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
diff -ur jasper-1.701.0/src/libjasper/jpg/jpg_enc.c jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c
--- jasper-1.701.0/src/libjasper/jpg/jpg_enc.c	2004-02-09 07:04:41.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c	2005-10-23 02:09:02.526017888 +0530
@@ -331,6 +331,7 @@
 	rewind(output_file);
 	jpg_copyfiletostream(out, output_file);
 	fclose(output_file);
+	jas_matrix_destroy(src_mgr->data);
 	output_file = 0;
 
 	return 0;


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-5/jasper.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jasper.spec	3 Oct 2006 20:34:56 -0000	1.14
+++ jasper.spec	3 Oct 2006 20:38:19 -0000	1.15
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 15%{?dist}
+Release: 15%{?dist}.1
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"



From fedora-extras-commits at redhat.com  Tue Oct  3 21:53:44 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 14:53:44 -0700
Subject: rpms/gdl/devel gdl.spec,1.16,1.17
Message-ID: <200610032153.k93LrkZi017452@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17433

Modified Files:
	gdl.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gdl.spec	19 Sep 2006 16:41:52 -0000	1.16
+++ gdl.spec	3 Oct 2006 21:53:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gdl
 Version:        0.9
-Release:        0.pre3%{?dist}
+Release:        0.pre3.1%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}pre2
-%patch -p1
+#%patch -p1
 
 
 %build
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.pre3.1
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 19 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.pre3
 - Rebuild for FC6
 - Add patch for specialization error caught by gcc 4.1.1



From fedora-extras-commits at redhat.com  Tue Oct  3 21:54:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 14:54:43 -0700
Subject: rpms/kdesvn/devel kdesvn.spec,1.20,1.21
Message-ID: <200610032154.k93LsjAL017528@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17508

Modified Files:
	kdesvn.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kdesvn.spec	19 Sep 2006 20:24:18 -0000	1.20
+++ kdesvn.spec	3 Oct 2006 21:54:43 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           kdesvn
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-1
 - Update to 0.9.3
 - Remove patch applied upstream



From fedora-extras-commits at redhat.com  Tue Oct  3 21:55:50 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 14:55:50 -0700
Subject: rpms/ncarg/devel ncarg.spec,1.6,1.7
Message-ID: <200610032155.k93LtqjA017589@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/ncarg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17572

Modified Files:
	ncarg.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: ncarg.spec
===================================================================
RCS file: /cvs/extras/rpms/ncarg/devel/ncarg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ncarg.spec	21 Sep 2006 20:51:51 -0000	1.6
+++ ncarg.spec	3 Oct 2006 21:55:50 -0000	1.7
@@ -1,16 +1,14 @@
 Name:           ncarg
-Version:        4.4.1
-Release:        5%{?dist}
+Version:        4.4.2
+Release:        2%{?dist}
 Summary:        A Fortran and C based software package for scientific visualization
 Group:          Development/Libraries
 License:        GPL
 URL:            http://ngwww.ucar.edu/ng4.4/index.html
-Source0:        http://ngwww.ucar.edu/ngbin/ncarg-4.4.1.src.tar.gz
+Source0:        http://ngwww.ucar.edu/ngbin/ncarg-%{version}.src.tar.gz
 Source1:        Site.local
 Source2:        ncarg.csh
 Source3:        ncarg.sh
-Patch1:         ncarg-4.4.1-config.patch
-Patch2:         ncarg-4.4.1-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran >= 4.1.0, hdf-devel, libjpeg-devel
@@ -30,8 +28,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .config
-%patch2 -p1 -b .include
 cp %{SOURCE1} config
 #Fix up the lib install dir
 sed -i -e s,/LIB/,/%{_lib}/, config/Site.local %{SOURCE2} %{SOURCE3}
@@ -107,6 +103,7 @@
 %{_bindir}/tgks0a
 %{_bindir}/tlocal
 %dir %{_libdir}/ncarg
+%{_libdir}/ncarg/ncarg/data/
 %{_libdir}/ncarg/ncarg/database/
 %{_libdir}/ncarg/ncarg/fontcaps/
 %{_libdir}/ncarg/ncarg/graphcaps/
@@ -127,6 +124,7 @@
 %{_libdir}/ncarg/libncarg_gks.a
 %{_libdir}/ncarg/libncarg_ras.a
 %{_libdir}/ncarg/libngmath.a
+%{_libdir}/ncarg/libsphere3.1_dp.a
 %{_libdir}/ncarg/ncarg/examples/
 %{_libdir}/ncarg/ncarg/tests/
 %{_libdir}/ncarg/ncarg/tutorial/
@@ -134,6 +132,13 @@
 
 
 %changelog
+* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Thu Sep 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-1
+- Update to 4.4.2
+- Use RPM_OPT_FLAGS during compile
+
 * Thu Sep 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-5
 - Add NCARG_LIB to ncarg.sh/ncarg.csh profile so ncargpath points to the right
   place (bug #207498).



From fedora-extras-commits at redhat.com  Tue Oct  3 21:56:47 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue,  3 Oct 2006 14:56:47 -0700
Subject: rpms/ctorrent/devel ctorrent.spec,1.3,1.4
Message-ID: <200610032156.k93LunY1017657@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/ctorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17638

Modified Files:
	ctorrent.spec 
Log Message:
- rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: ctorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/devel/ctorrent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ctorrent.spec	21 Sep 2006 18:18:53 -0000	1.3
+++ ctorrent.spec	3 Oct 2006 21:56:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name: ctorrent
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: BitTorrent Client written in C
 Group: Applications/Internet
 License: GPL
@@ -33,6 +33,9 @@
 %doc AUTHORS README NEWS
 
 %changelog
+* Tue Oct 03 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-1
 - update to 1.3.4
 - mass rebuild



From fedora-extras-commits at redhat.com  Tue Oct  3 21:59:30 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 14:59:30 -0700
Subject: rpms/ncarg/devel Site.local,1.1,1.2
Message-ID: <200610032159.k93LxWHS017736@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/ncarg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17719

Modified Files:
	Site.local 
Log Message:
Build with RPM_OPT_FLAGS



Index: Site.local
===================================================================
RCS file: /cvs/extras/rpms/ncarg/devel/Site.local,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Site.local	3 Feb 2006 17:12:53 -0000	1.1
+++ Site.local	3 Oct 2006 21:59:30 -0000	1.2
@@ -15,6 +15,8 @@
 
 
 
+#define CcOptions $(RPM_OPT_FLAGS)
+#define FcOptions $(RPM_OPT_FLAGS)
 #define BuildWithF90 TRUE
 #define FCompiler gfortran
 #define CtoFLibraries -lgfortran -lm



From fedora-extras-commits at redhat.com  Tue Oct  3 22:00:40 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue,  3 Oct 2006 15:00:40 -0700
Subject: rpms/openbabel/devel openbabel.spec,1.3,1.4
Message-ID: <200610032200.k93M0gGM017842@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/openbabel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17825

Modified Files:
	openbabel.spec 
Log Message:
- rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: openbabel.spec
===================================================================
RCS file: /cvs/extras/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openbabel.spec	20 Sep 2006 07:10:51 -0000	1.3
+++ openbabel.spec	3 Oct 2006 22:00:40 -0000	1.4
@@ -7,7 +7,7 @@
 
 Name: openbabel
 Version: 2.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Chemistry software file format converter
 License: GPL
 Group: Applications/File
@@ -182,6 +182,9 @@
 %{python_sitearch}/openbabel.py*
 
 %changelog
+* Tue Oct 03 2006 Dominik Mierzejewski <rpm at greysector.net> 2.0.2-5
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Dominik Mierzejewski <rpm at greysector.net> 2.0.2-4
 - .pyo files no longer ghosted
 - fix chicken-and-egg problem when building perl and python bindings



From fedora-extras-commits at redhat.com  Tue Oct  3 22:21:24 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 15:21:24 -0700
Subject: rpms/gdl/devel gdl.spec,1.17,1.18
Message-ID: <200610032221.k93MLRnI020837@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20820

Modified Files:
	gdl.spec 
Log Message:
Really apply the patch



Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gdl.spec	3 Oct 2006 21:53:44 -0000	1.17
+++ gdl.spec	3 Oct 2006 22:21:24 -0000	1.18
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}pre2
-#%patch -p1
+%patch -p1
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Oct  3 22:29:00 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 15:29:00 -0700
Subject: rpms/plplot/devel plplot.spec,1.20,1.21
Message-ID: <200610032229.k93MT2pv020953@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20936

Modified Files:
	plplot.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plplot.spec	25 Sep 2006 16:50:18 -0000	1.20
+++ plplot.spec	3 Oct 2006 22:29:00 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -347,6 +347,9 @@
 
 
 %changelog
+* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-6
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-5
 - Add needed Requires for -devel packages (bug #202168)
 - Patch .info rather than .texi, and actually apply



From fedora-extras-commits at redhat.com  Tue Oct  3 22:30:50 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 15:30:50 -0700
Subject: rpms/ruby-mysql/devel ruby-mysql.spec,1.4,1.5
Message-ID: <200610032230.k93MUqw9021050@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/ruby-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21028

Modified Files:
	ruby-mysql.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: ruby-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-mysql/devel/ruby-mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ruby-mysql.spec	20 Sep 2006 17:45:09 -0000	1.4
+++ ruby-mysql.spec	3 Oct 2006 22:30:49 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ruby-mysql
 Version:        2.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Ruby interface to MySQL
 
 Group:          Development/Languages
@@ -39,6 +39,9 @@
 %{ruby_sitearchdir}/mysql.so
 
 %changelog
+* Wed Oct  3 2006 Orion Poplawski <orion at cora.nwra.com> - 2.7.1-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Orion Poplawski <orion at cora.nwra.com> - 2.7.1-1
 - Update to 2.7.1
 



From fedora-extras-commits at redhat.com  Tue Oct  3 22:59:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 15:59:10 -0700
Subject: rpms/brasero import.log,1.1,1.2
Message-ID: <200610032259.k93MxC7n021224@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21191

Modified Files:
	import.log 
Log Message:
auto-import brasero-0.4.4-3 on branch devel from brasero-0.4.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/brasero/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Oct 2006 18:28:05 -0000	1.1
+++ import.log	3 Oct 2006 22:59:09 -0000	1.2
@@ -0,0 +1 @@
+brasero-0_4_4-3:HEAD:brasero-0.4.4-3.src.rpm:1159916284



From fedora-extras-commits at redhat.com  Tue Oct  3 22:59:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 15:59:10 -0700
Subject: rpms/brasero/devel brasero.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610032259.k93MxCFt021229@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21191/devel

Modified Files:
	.cvsignore sources 
Added Files:
	brasero.spec 
Log Message:
auto-import brasero-0.4.4-3 on branch devel from brasero-0.4.4-3.src.rpm


--- NEW FILE brasero.spec ---

Name:      brasero
Version:   0.4.4
Release:   3%{?dist}
Summary:   Gnome CD/DVD burning application
Group:     Applications/Multimedia
License:   GPL
URL:       http://perso.orange.fr/bonfire/
Source0:   http://download.sourceforge.net/bonfire/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext intltool
BuildRequires:  desktop-file-utils
BuildRequires:  libgnomeui-devel >= 2.10.0
BuildRequires:  gstreamer-devel >= 0.10.6
BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
BuildRequires:  nautilus-cd-burner-devel >= 2.14.0
BuildRequires:  libnotify-devel >= 0.3.0
BuildRequires:  libbeagle-devel >= 0.1.1
BuildRequires:  totem-devel >= 1.2.0

Requires:  dvd+rw-tools
Requires:  cdrecord
Requires:  mkisofs
Requires:  cdda2wav
Requires:  cdrdao

Requires(post):    shared-mime-info
Requires(postun):  shared-mime-info


%description
Simple and easy to use CD/DVD burning application for the Gnome
desktop.


%prep
%setup -q


%build
%configure --disable-caches
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-category X-Fedora                        \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/gnome || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
fi
update-desktop-database &> /dev/null ||:


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/gnome || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
fi
update-desktop-database &> /dev/null ||:


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/brasero.desktop
%{_datadir}/pixmaps/*
%{_datadir}/icons/gnome/48x48/mimetypes/*
%{_datadir}/mime/packages/*


%changelog
* Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-3
- fixed homepage URL

* Tue Sep 26 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-2
- BRs cleanup

* Fri Sep 22 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-1
- First version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2006 18:28:05 -0000	1.1
+++ .cvsignore	3 Oct 2006 22:59:10 -0000	1.2
@@ -0,0 +1 @@
+brasero-0.4.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2006 18:28:05 -0000	1.1
+++ sources	3 Oct 2006 22:59:10 -0000	1.2
@@ -0,0 +1 @@
+1ef6ae66677ed9136634692d8bc1cc7a  brasero-0.4.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 23:08:03 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 16:08:03 -0700
Subject: owners owners.list,1.1768,1.1769
Message-ID: <200610032308.k93N85dW024215@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24198

Modified Files:
	owners.list 
Log Message:
Added brasero


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1768
retrieving revision 1.1769
diff -u -r1.1768 -r1.1769
--- owners.list	3 Oct 2006 08:19:54 -0000	1.1768
+++ owners.list	3 Oct 2006 23:08:02 -0000	1.1769
@@ -127,6 +127,7 @@
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|boo|Boo is an OO statically typed language for CLI|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|brandy|Brandy is a GPL implementation of BBC BASIC V|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|brasero|Gnome CD/DVD burning application|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora at leemhuis.info
 Fedora Extras|bsd-games|Collection of classic text-based games|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|bsdiff|Binary diff/patch utility|jnovy at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 03:39:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 20:39:05 -0700
Subject: rpms/perl-Data-Alias/FC-5 perl-Data-Alias.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610040339.k943d73B005494@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Alias/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/FC-5

Modified Files:
	perl-Data-Alias.spec sources 
Log Message:
update to 1.01



Index: perl-Data-Alias.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/FC-5/perl-Data-Alias.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Alias.spec	18 Aug 2006 01:40:05 -0000	1.2
+++ perl-Data-Alias.spec	4 Oct 2006 03:39:05 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Data-Alias
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.01
+Release:        1%{?dist}
 Summary:        Comprehensive set of aliasing operations
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,12 @@
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.01-1
+- update to 1.01
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0-3
+- bump for mass rebuild
+
 * Thu Aug 17 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2
 - bump for build & release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2006 01:38:56 -0000	1.2
+++ sources	4 Oct 2006 03:39:05 -0000	1.3
@@ -1 +1 @@
-390fc2fefbf3fa9bf30d482a46989953  Data-Alias-1.0.tar.gz
+5247906ae963ba3e3e4292b497d0d354  Data-Alias-1.01.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 03:39:06 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 20:39:06 -0700
Subject: rpms/perl-Data-Alias/devel .cvsignore, 1.2, 1.3 perl-Data-Alias.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610040339.k943d8Fa005500@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Alias/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/devel

Modified Files:
	.cvsignore perl-Data-Alias.spec sources 
Log Message:
update to 1.01



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2006 01:38:56 -0000	1.2
+++ .cvsignore	4 Oct 2006 03:39:06 -0000	1.3
@@ -1 +1 @@
-Data-Alias-1.0.tar.gz
+Data-Alias-1.01.tar.gz


Index: perl-Data-Alias.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/perl-Data-Alias.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Data-Alias.spec	1 Sep 2006 04:00:13 -0000	1.3
+++ perl-Data-Alias.spec	4 Oct 2006 03:39:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Data-Alias
-Version:        1.0
-Release:        3%{?dist}
+Version:        1.01
+Release:        1%{?dist}
 Summary:        Comprehensive set of aliasing operations
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -62,7 +62,10 @@
 
 
 %changelog
-* Thu Aug 31 2006 Chris Weyl <cweyl.drew.edu> 1.0-3
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.01-1
+- update to 1.01
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0-3
 - bump for mass rebuild
 
 * Thu Aug 17 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2006 01:38:56 -0000	1.2
+++ sources	4 Oct 2006 03:39:06 -0000	1.3
@@ -1 +1 @@
-390fc2fefbf3fa9bf30d482a46989953  Data-Alias-1.0.tar.gz
+5247906ae963ba3e3e4292b497d0d354  Data-Alias-1.01.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 03:39:04 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 20:39:04 -0700
Subject: rpms/perl-Data-Alias Makefile,1.1,1.2
Message-ID: <200610040339.k943danB005503@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Alias
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444

Modified Files:
	Makefile 
Log Message:
update to 1.01



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	18 Aug 2006 01:38:40 -0000	1.1
+++ Makefile	4 Oct 2006 03:39:04 -0000	1.2
@@ -2,6 +2,13 @@
 all : CVS/Root common-update
 	@cvs update
 
+# tag & build all non-legacy branches...
+build-all :
+	@echo WARNING: building for devel and FC-5
+	@sleep 5s
+	@cd FC-5  && test -f dead.package || ( make tag && make plague )
+	@cd devel && test -f dead.package || ( make tag && make plague )
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:13:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:13:57 -0700
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.2, 1.3 perl-Class-MOP.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610040413.k944DxCB008583@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8531/devel

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
Update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 23:34:55 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:13:57 -0000	1.3
@@ -1 +1 @@
-Class-MOP-0.34.tar.gz
+Class-MOP-0.35.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-MOP.spec	7 Sep 2006 23:35:29 -0000	1.2
+++ perl-Class-MOP.spec	4 Oct 2006 04:13:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Class-MOP
-Version:        0.34
-Release:        3%{?dist}
+Version:        0.35
+Release:        1%{?dist}
 Summary:        Class::MOP Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -52,11 +52,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README examples/
+%doc Changes README examples/ scripts/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
+- update to 0.35
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.34-3
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 23:34:55 -0000	1.2
+++ sources	4 Oct 2006 04:13:57 -0000	1.3
@@ -1 +1 @@
-88ae60fc9fe161598739f3de59d6932e  Class-MOP-0.34.tar.gz
+967208472643a15cfee9704b6ecb03eb  Class-MOP-0.35.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:13:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:13:51 -0700
Subject: rpms/perl-Class-MOP Makefile,1.1,1.2
Message-ID: <200610040414.k944ENcC008586@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8531

Modified Files:
	Makefile 
Log Message:
Update



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 23:34:28 -0000	1.1
+++ Makefile	4 Oct 2006 04:13:51 -0000	1.2
@@ -2,6 +2,13 @@
 all : CVS/Root common-update
 	@cvs update
 
+# tag & build all non-legacy branches...
+build-all :
+	@echo WARNING: building for devel and FC-5
+	@sleep 5s
+	@cd FC-5  && test -f dead.package || ( make tag && make plague )
+	@cd devel && test -f dead.package || ( make tag && make plague )
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:13:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:13:51 -0700
Subject: rpms/perl-Class-MOP/FC-5 perl-Class-MOP.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200610040414.k944ENQm008590@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8531/FC-5

Modified Files:
	perl-Class-MOP.spec sources 
Log Message:
Update



Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-5/perl-Class-MOP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-MOP.spec	7 Sep 2006 23:35:29 -0000	1.2
+++ perl-Class-MOP.spec	4 Oct 2006 04:13:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Class-MOP
-Version:        0.34
-Release:        3%{?dist}
+Version:        0.35
+Release:        1%{?dist}
 Summary:        Class::MOP Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -52,11 +52,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README examples/
+%doc Changes README examples/ scripts/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
+- update to 0.35
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.34-3
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 23:34:55 -0000	1.2
+++ sources	4 Oct 2006 04:13:51 -0000	1.3
@@ -1 +1 @@
-88ae60fc9fe161598739f3de59d6932e  Class-MOP-0.34.tar.gz
+967208472643a15cfee9704b6ecb03eb  Class-MOP-0.35.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:18:40 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:18:40 -0700
Subject: rpms/perl-SUPER Makefile,1.1,1.2
Message-ID: <200610040418.k944IgGO008716@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SUPER
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668

Modified Files:
	Makefile 
Log Message:
update 



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 22:50:31 -0000	1.1
+++ Makefile	4 Oct 2006 04:18:40 -0000	1.2
@@ -2,6 +2,13 @@
 all : CVS/Root common-update
 	@cvs update
 
+# tag & build all non-legacy branches...
+build-all :
+	@echo WARNING: building for devel and FC-5
+	@sleep 5s
+	@cd FC-5  && test -f dead.package || ( make tag && make plague )
+	@cd devel && test -f dead.package || ( make tag && make plague )
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:18:41 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:18:41 -0700
Subject: rpms/perl-SUPER/FC-5 perl-SUPER.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200610040418.k944IhsS008721@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SUPER/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668/FC-5

Modified Files:
	perl-SUPER.spec sources 
Log Message:
update 



Index: perl-SUPER.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/FC-5/perl-SUPER.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SUPER.spec	7 Sep 2006 23:06:00 -0000	1.2
+++ perl-SUPER.spec	4 Oct 2006 04:18:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SUPER
-Version:        1.14
-Release:        4%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Sane superclass method dispatcher
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,9 @@
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Sub::Identify)
 
+# not picked up due to use base
+Requires:       perl(Exporter)
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +55,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.15-1
+- update to 1.15
+- add explict requires on perl(Exporter); missed due to a use base construct
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.14-4
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 22:50:44 -0000	1.2
+++ sources	4 Oct 2006 04:18:40 -0000	1.3
@@ -1 +1 @@
-591389c353df308ee9e70d38f0e3570b  SUPER-1.14.tar.gz
+41e4bb405cfad7efe0da34f08fe5ee91  SUPER-1.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:18:41 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:18:41 -0700
Subject: rpms/perl-SUPER/devel .cvsignore, 1.2, 1.3 perl-SUPER.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610040418.k944Ih4k008727@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SUPER/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668/devel

Modified Files:
	.cvsignore perl-SUPER.spec sources 
Log Message:
update 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 22:50:44 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:18:41 -0000	1.3
@@ -1 +1 @@
-SUPER-1.14.tar.gz
+SUPER-1.15.tar.gz


Index: perl-SUPER.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/perl-SUPER.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SUPER.spec	7 Sep 2006 23:06:00 -0000	1.2
+++ perl-SUPER.spec	4 Oct 2006 04:18:41 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SUPER
-Version:        1.14
-Release:        4%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Sane superclass method dispatcher
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,9 @@
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Sub::Identify)
 
+# not picked up due to use base
+Requires:       perl(Exporter)
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +55,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.15-1
+- update to 1.15
+- add explict requires on perl(Exporter); missed due to a use base construct
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.14-4
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 22:50:44 -0000	1.2
+++ sources	4 Oct 2006 04:18:41 -0000	1.3
@@ -1 +1 @@
-591389c353df308ee9e70d38f0e3570b  SUPER-1.14.tar.gz
+41e4bb405cfad7efe0da34f08fe5ee91  SUPER-1.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:24:22 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:24:22 -0700
Subject: rpms/perl-Moose Makefile,1.1,1.2
Message-ID: <200610040424.k944OOHB008881@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8833

Modified Files:
	Makefile 
Log Message:
Update to 0.13



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	8 Sep 2006 16:30:29 -0000	1.1
+++ Makefile	4 Oct 2006 04:24:22 -0000	1.2
@@ -2,6 +2,13 @@
 all : CVS/Root common-update
 	@cvs update
 
+# tag & build all non-legacy branches...
+build-all :
+	@echo WARNING: building for devel and FC-5
+	@sleep 5s
+	@cd FC-5  && test -f dead.package || ( make tag && make plague )
+	@cd devel && test -f dead.package || ( make tag && make plague )
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:24:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:24:23 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200610040424.k944OPNd008884@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8833/FC-5

Modified Files:
	perl-Moose.spec sources 
Log Message:
Update to 0.13



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Moose.spec	8 Sep 2006 16:31:03 -0000	1.2
+++ perl-Moose.spec	4 Oct 2006 04:24:23 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Moose
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- update to 0.13
+
 * Fri Sep 08 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.12-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2006 16:30:44 -0000	1.2
+++ sources	4 Oct 2006 04:24:23 -0000	1.3
@@ -1 +1 @@
-2357e2a18025f62d9068766298e7bbc6  Moose-0.12.tar.gz
+f3f4edbf510006ea7cc9cb3092eb4883  Moose-0.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:24:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:24:23 -0700
Subject: rpms/perl-Moose/devel .cvsignore, 1.2, 1.3 perl-Moose.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610040424.k944OQOt008890@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8833/devel

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
Update to 0.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2006 16:30:44 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:24:23 -0000	1.3
@@ -1 +1 @@
-Moose-0.12.tar.gz
+Moose-0.13.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Moose.spec	8 Sep 2006 16:31:03 -0000	1.2
+++ perl-Moose.spec	4 Oct 2006 04:24:23 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Moose
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- update to 0.13
+
 * Fri Sep 08 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.12-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2006 16:30:44 -0000	1.2
+++ sources	4 Oct 2006 04:24:23 -0000	1.3
@@ -1 +1 @@
-2357e2a18025f62d9068766298e7bbc6  Moose-0.12.tar.gz
+f3f4edbf510006ea7cc9cb3092eb4883  Moose-0.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:41:27 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:41:27 -0700
Subject: rpms/perl-POE-Component-Client-Keepalive Makefile,1.1,1.2
Message-ID: <200610040441.k944fTRv009132@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9084

Modified Files:
	Makefile 
Log Message:
update



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	26 Jul 2006 06:32:37 -0000	1.1
+++ Makefile	4 Oct 2006 04:41:27 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:41:28 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:41:28 -0700
Subject: rpms/perl-POE-Component-Client-Keepalive/FC-5
	perl-POE-Component-Client-Keepalive.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610040441.k944fUuE009137@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9084/FC-5

Modified Files:
	perl-POE-Component-Client-Keepalive.spec sources 
Log Message:
update



Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/FC-5/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-Client-Keepalive.spec	26 Jul 2006 06:36:00 -0000	1.2
+++ perl-POE-Component-Client-Keepalive.spec	4 Oct 2006 04:41:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-Keepalive
-Version:        0.0801        
-Release:        2%{?dist}
+Version:        0.0901        
+Release:        1%{?dist}
 Summary:        Manages and keeps alive client connections       
 
 Group:          Development/Libraries
@@ -32,10 +32,12 @@
 
 %install
 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 ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -58,6 +60,13 @@
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0901-1
+- update to 0.0901
+- minor spec tweaks
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0801-3
+- bump for mass rebuild
+
 * Tue Jul 25 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0801-2
 - import, bump & build for devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2006 06:32:46 -0000	1.2
+++ sources	4 Oct 2006 04:41:28 -0000	1.3
@@ -1 +1 @@
-79ea0242da708c7a8e190c00efdfccaf  POE-Component-Client-Keepalive-0.0801.tar.gz
+fab1ddd3e307b4ce3890a4708cfd04de  POE-Component-Client-Keepalive-0.0901.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:41:28 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:41:28 -0700
Subject: rpms/perl-POE-Component-Client-Keepalive/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Client-Keepalive.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200610040441.k944fUdV009141@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9084/devel

Modified Files:
	.cvsignore perl-POE-Component-Client-Keepalive.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2006 06:32:46 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:41:28 -0000	1.3
@@ -1 +1 @@
-POE-Component-Client-Keepalive-0.0801.tar.gz
+POE-Component-Client-Keepalive-0.0901.tar.gz


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-POE-Component-Client-Keepalive.spec	1 Sep 2006 04:18:34 -0000	1.3
+++ perl-POE-Component-Client-Keepalive.spec	4 Oct 2006 04:41:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-Keepalive
-Version:        0.0801        
-Release:        3%{?dist}
+Version:        0.0901        
+Release:        1%{?dist}
 Summary:        Manages and keeps alive client connections       
 
 Group:          Development/Libraries
@@ -32,10 +32,12 @@
 
 %install
 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 ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -58,6 +60,10 @@
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0901-1
+- update to 0.0901
+- minor spec tweaks
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0801-3
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2006 06:32:46 -0000	1.2
+++ sources	4 Oct 2006 04:41:28 -0000	1.3
@@ -1 +1 @@
-79ea0242da708c7a8e190c00efdfccaf  POE-Component-Client-Keepalive-0.0801.tar.gz
+fab1ddd3e307b4ce3890a4708cfd04de  POE-Component-Client-Keepalive-0.0901.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:58:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:58:36 -0700
Subject: rpms/perl-POE-Component-Client-HTTP/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Client-HTTP.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200610040459.k944x8ZU009318@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9272/devel

Modified Files:
	.cvsignore perl-POE-Component-Client-HTTP.spec sources 
Log Message:
Updates.  Oof!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jul 2006 03:52:07 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:58:36 -0000	1.3
@@ -1 +1 @@
-POE-Component-Client-HTTP-0.77.tar.gz
+POE-Component-Client-HTTP-0.78.tar.gz


Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-POE-Component-Client-HTTP.spec	1 Sep 2006 04:18:18 -0000	1.4
+++ perl-POE-Component-Client-HTTP.spec	4 Oct 2006 04:58:36 -0000	1.5
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.77
-Release:        3%{?dist}
+Version:        0.78
+Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
 Group:          Development/Libraries
@@ -24,8 +24,14 @@
 BuildRequires:  perl
 BuildRequires:  perl(POE) >= 0.31, perl(HTTP::Request) >= 1.30
 BuildRequires:  perl(HTTP::Response) >= 1.37, perl(URI) >= 1.24
-BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0704
+BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0901
 BuildRequires:  dos2unix, sed
+
+# use base...
+Requires:       perl(POE::Filter), perl(POE::Filter::Stackable)
+# use POE qw{ ... }
+Requires:       perl(POE::Component::Client::Keepalive) >= 0.0901
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -45,10 +51,12 @@
 
 %install
 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 ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 cd examples
 dos2unix pcchget.perl
@@ -70,12 +78,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES* README examples
+%doc CHANGES* README examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
+- update to 0.78
+- minor spec tweaks
+- bump version BR on PoCo::Client::Keepalive to 0.0901 (tests fail otherwise)
+- ...and add explicit requires on the above (the way POE loads its PoCo's irks
+  me sometimes...)
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.77-3
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jul 2006 03:52:07 -0000	1.2
+++ sources	4 Oct 2006 04:58:36 -0000	1.3
@@ -1 +1 @@
-bca2c306d8c63535845b760883a13644  POE-Component-Client-HTTP-0.77.tar.gz
+093521d8c3a2b874fce1c04092e7159a  POE-Component-Client-HTTP-0.78.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:58:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:58:35 -0700
Subject: rpms/perl-POE-Component-Client-HTTP/FC-5
	perl-POE-Component-Client-HTTP.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610040459.k944x7iI009313@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9272/FC-5

Modified Files:
	perl-POE-Component-Client-HTTP.spec sources 
Log Message:
Updates.  Oof!



Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-Client-HTTP.spec	28 Jul 2006 03:58:05 -0000	1.2
+++ perl-POE-Component-Client-HTTP.spec	4 Oct 2006 04:58:35 -0000	1.3
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.77
-Release:        2%{?dist}
+Version:        0.78
+Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
 Group:          Development/Libraries
@@ -24,8 +24,14 @@
 BuildRequires:  perl
 BuildRequires:  perl(POE) >= 0.31, perl(HTTP::Request) >= 1.30
 BuildRequires:  perl(HTTP::Response) >= 1.37, perl(URI) >= 1.24
-BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0704
+BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0901
 BuildRequires:  dos2unix, sed
+
+# use base...
+Requires:       perl(POE::Filter), perl(POE::Filter::Stackable)
+# use POE qw{ ... }
+Requires:       perl(POE::Component::Client::Keepalive) >= 0.0901
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -45,10 +51,12 @@
 
 %install
 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 ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 cd examples
 dos2unix pcchget.perl
@@ -59,7 +67,7 @@
 # we don't have network access during the builds; fortunately these look to be
 # the only tests requiring it.  Failing that, the entire suite can be
 # disabled.
-%{?!_with_network_tests:rm t/01* t/02* t/09* t/11* t/50* t/54*}
+%{?!_with_network_tests:rm t/01* t/02* t/09* t/10* t/11* t/50* t/54*}
 
 make test
 
@@ -70,12 +78,26 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES* README examples
+%doc CHANGES* README examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
+- update to 0.78
+- minor spec tweaks
+- bump version BR on PoCo::Client::Keepalive to 0.0901 (tests fail otherwise)
+- ...and add explicit requires on the above (the way POE loads its PoCo's irks
+  me sometimes...)
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.77-3
+- bump for mass rebuild
+
+* Wed Aug 16 2006 Chris Weyl <cweyl at alumni.drew.edu> 
+- nixed t/10* due to mock build issues with reduced buildroot.  see BZ#202602.
+  This fix does not warrant a rebuild.
+
 * Thu Jul 27 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.77-2
 - bump for build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jul 2006 03:52:07 -0000	1.2
+++ sources	4 Oct 2006 04:58:35 -0000	1.3
@@ -1 +1 @@
-bca2c306d8c63535845b760883a13644  POE-Component-Client-HTTP-0.77.tar.gz
+093521d8c3a2b874fce1c04092e7159a  POE-Component-Client-HTTP-0.78.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:59:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:59:48 -0700
Subject: rpms/perl-POE-Component-Client-HTTP Makefile,1.1,1.2
Message-ID: <200610040459.k944xo3m009407@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9385

Modified Files:
	Makefile 
Log Message:
Add build-all target



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	28 Jul 2006 03:51:53 -0000	1.1
+++ Makefile	4 Oct 2006 04:59:47 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 05:01:03 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue,  3 Oct 2006 22:01:03 -0700
Subject: rpms/sshfp/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610040501.k94515wG011983@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/sshfp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9432

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sshfp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 19:31:04 -0000	1.2
+++ .cvsignore	4 Oct 2006 05:01:03 -0000	1.3
@@ -1 +1,2 @@
 sshfp-1.1.0.tar.gz
+sshfp-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sshfp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 19:31:04 -0000	1.2
+++ sources	4 Oct 2006 05:01:03 -0000	1.3
@@ -1 +1,2 @@
 a96cb60af373ab18c260cb1b202c6240  sshfp-1.1.0.tar.gz
+5424ed55c50d2038934940737680e8da  sshfp-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 05:02:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Oct 2006 22:02:01 -0700
Subject: owners owners.list,1.1769,1.1770
Message-ID: <200610040502.k9452Xod012319@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12276/owners

Modified Files:
	owners.list 
Log Message:
Unorphaning lua and freeglut


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1769
retrieving revision 1.1770
diff -u -r1.1769 -r1.1770
--- owners.list	3 Oct 2006 23:08:02 -0000	1.1769
+++ owners.list	4 Oct 2006 05:02:00 -0000	1.1770
@@ -411,7 +411,7 @@
 Fedora Extras|freedoom-freedm|Deathmatch levels for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|freehdl|A project to develop a free, open source, GPL'ed VHDL simulator for Linux|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|FreeWnn|Japanese input server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|petersen at redhat.com
@@ -978,7 +978,7 @@
 Fedora Extras|lrmi|Library for calling real mode BIOS routines|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|lsscsi|List SCSI devices (or hosts) and associated information|coldwell at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
-Fedora Extras|lua|A powerful light-weight programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|lua|A powerful light-weight programming language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|luks-tools|Utilities for working with LUKS-protected filesystems|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 05:02:30 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue,  3 Oct 2006 22:02:30 -0700
Subject: rpms/sshfp/devel sshfp.spec,1.1,1.2
Message-ID: <200610040503.k94534Yx012322@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/sshfp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12274

Modified Files:
	sshfp.spec 
Log Message:
* Wed Oct  4 2006 Paul Wouters <paul at xelerance.com> - 1.1.1-1
- Upgraded to 1.1.1



Index: sshfp.spec
===================================================================
RCS file: /cvs/extras/rpms/sshfp/devel/sshfp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sshfp.spec	30 Sep 2006 19:31:04 -0000	1.1
+++ sshfp.spec	4 Oct 2006 05:02:30 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Generate SSHFP DNS records from knownhosts files or ssh-keyscan
 Name: sshfp
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?dist}
 License: GPL
 Url:  ftp://ftp.xelerance.com/%{name}/
@@ -40,6 +40,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Wed Oct  4 2006 Paul Wouters <paul at xelerance.com> - 1.1.1-1
+- Upgraded to 1.1.1
+
 * Tue Sep 26 2006 Paul Wouters <paul at xelerance.com> - 1.1.0-1
 - Mistakingly ran the sha1() call on the uuencoded keyblob, which
   generated wrong SSHFP records.



From fedora-extras-commits at redhat.com  Wed Oct  4 05:04:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 22:04:54 -0700
Subject: rpms/perl-POE-Component-Server-SOAP/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Server-SOAP.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610040504.k9454uif012510@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SOAP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12422/devel

Modified Files:
	.cvsignore perl-POE-Component-Server-SOAP.spec sources 
Log Message:
update to 1.10




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Aug 2006 00:50:41 -0000	1.2
+++ .cvsignore	4 Oct 2006 05:04:53 -0000	1.3
@@ -1 +1 @@
-POE-Component-Server-SOAP-1.09.tar.gz
+POE-Component-Server-SOAP-1.10.tar.gz


Index: perl-POE-Component-Server-SOAP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/devel/perl-POE-Component-Server-SOAP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-POE-Component-Server-SOAP.spec	1 Sep 2006 04:20:15 -0000	1.3
+++ perl-POE-Component-Server-SOAP.spec	4 Oct 2006 05:04:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SOAP
-Version:        1.09
-Release:        3%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        Publish POE event handlers via SOAP over HTTP
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -36,7 +36,6 @@
 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 \;
 
@@ -50,11 +49,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README examples/
+%doc README Changes examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.10-1
+- update to 1.10 -- which _finally_ includes a Changes file :)
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.09-3
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Aug 2006 00:50:41 -0000	1.2
+++ sources	4 Oct 2006 05:04:53 -0000	1.3
@@ -1 +1 @@
-dcda3222ea8cf981c2aace003aa33733  POE-Component-Server-SOAP-1.09.tar.gz
+d56d0f94ca2ce45ff336ed43736747db  POE-Component-Server-SOAP-1.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 05:04:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 22:04:52 -0700
Subject: rpms/perl-POE-Component-Server-SOAP Makefile,1.1,1.2
Message-ID: <200610040504.k9454sT9012501@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SOAP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12422

Modified Files:
	Makefile 
Log Message:
update to 1.10




Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	19 Aug 2006 00:50:28 -0000	1.1
+++ Makefile	4 Oct 2006 05:04:52 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 05:04:53 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 22:04:53 -0700
Subject: rpms/perl-POE-Component-Server-SOAP/FC-5
	perl-POE-Component-Server-SOAP.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610040505.k9454tHD012506@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SOAP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12422/FC-5

Modified Files:
	perl-POE-Component-Server-SOAP.spec sources 
Log Message:
update to 1.10




Index: perl-POE-Component-Server-SOAP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/FC-5/perl-POE-Component-Server-SOAP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-Server-SOAP.spec	19 Aug 2006 00:51:37 -0000	1.2
+++ perl-POE-Component-Server-SOAP.spec	4 Oct 2006 05:04:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SOAP
-Version:        1.09
-Release:        2%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        Publish POE event handlers via SOAP over HTTP
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -36,7 +36,6 @@
 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 \;
 
@@ -50,11 +49,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README examples/
+%doc README Changes examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.10-1
+- update to 1.10 -- which _finally_ includes a Changes file :)
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.09-3
+- bump for mass rebuild
+
 * Fri Aug 18 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.09-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Aug 2006 00:50:41 -0000	1.2
+++ sources	4 Oct 2006 05:04:53 -0000	1.3
@@ -1 +1 @@
-dcda3222ea8cf981c2aace003aa33733  POE-Component-Server-SOAP-1.09.tar.gz
+d56d0f94ca2ce45ff336ed43736747db  POE-Component-Server-SOAP-1.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 05:20:43 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 22:20:43 -0700
Subject: rpms/perl-Test-Inline/devel .cvsignore, 1.1,
	1.2 perl-Test-Inline.spec, 1.4, 1.5 sources, 1.1, 1.2
Message-ID: <200610040520.k945Kjet012828@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12807

Modified Files:
	.cvsignore perl-Test-Inline.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2005 14:17:21 -0000	1.1
+++ .cvsignore	4 Oct 2006 05:20:43 -0000	1.2
@@ -1 +1 @@
-Test-Inline-2.103.tar.gz
+Test-Inline-2.105.tar.gz


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/devel/perl-Test-Inline.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Inline.spec	5 Sep 2006 08:56:46 -0000	1.4
+++ perl-Test-Inline.spec	4 Oct 2006 05:20:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Test-Inline
-Version: 	2.103
-Release: 	4%{?dist}
+Version: 	2.105
+Release: 	1%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -14,7 +14,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
-BuildRequires: 	perl(Test::More) >= 0.47
+BuildRequires: 	perl(Test::More) >= 0.42
 BuildRequires: 	perl(Test::ClassAPI) >= 1.02
 BuildRequires: 	perl(File::Spec) >= 0.80
 BuildRequires: 	perl(List::Util) >= 1.11
@@ -68,6 +68,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-4
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2005 14:17:21 -0000	1.1
+++ sources	4 Oct 2006 05:20:43 -0000	1.2
@@ -1 +1 @@
-1d57bc056a0906bdf349700a6899c93e  Test-Inline-2.103.tar.gz
+4da55082abc873d655a94fdffc4b33df  Test-Inline-2.105.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:25:55 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:25:55 -0700
Subject: rpms/perl-Test-Inline/devel perl-Test-Inline.spec,1.5,1.6
Message-ID: <200610040625.k946PvZD015982@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15965

Modified Files:
	perl-Test-Inline.spec 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
- Activate AUTOMATED_TESTING (t/99_author.t).



Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/devel/perl-Test-Inline.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-Inline.spec	4 Oct 2006 05:20:43 -0000	1.5
+++ perl-Test-Inline.spec	4 Oct 2006 06:25:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Test-Inline
 Version: 	2.105
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -57,7 +57,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +68,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
+- Activate AUTOMATED_TESTING (t/99_author.t).
+
 * Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 06:36:05 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:36:05 -0700
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.13,
	1.14 perl-Params-Util.spec, 1.14, 1.15 sources, 1.13, 1.14
Message-ID: <200610040636.k946a75N016114@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16091

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Sep 2006 13:56:52 -0000	1.13
+++ .cvsignore	4 Oct 2006 06:36:05 -0000	1.14
@@ -1 +1 @@
-Params-Util-0.19.tar.gz
+Params-Util-0.20.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Params-Util.spec	18 Sep 2006 13:56:52 -0000	1.14
+++ perl-Params-Util.spec	4 Oct 2006 06:36:05 -0000	1.15
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.19
+Version: 	0.20
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
+- Upstream update.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.19-1
 - Upstream update.
 - Activate AUTOMATED_TESTING (t/99_author.t).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Sep 2006 13:56:52 -0000	1.13
+++ sources	4 Oct 2006 06:36:05 -0000	1.14
@@ -1 +1 @@
-c5d75b97f92fa232b2dadcc44595ca61  Params-Util-0.19.tar.gz
+33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:37:26 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:37:26 -0700
Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.13,
	1.14 perl-Params-Util.spec, 1.13, 1.14 sources, 1.13, 1.14
Message-ID: <200610040637.k946bS9a016183@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16162

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Sep 2006 13:58:43 -0000	1.13
+++ .cvsignore	4 Oct 2006 06:37:26 -0000	1.14
@@ -1 +1 @@
-Params-Util-0.19.tar.gz
+Params-Util-0.20.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Params-Util.spec	18 Sep 2006 13:58:43 -0000	1.13
+++ perl-Params-Util.spec	4 Oct 2006 06:37:26 -0000	1.14
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.19
+Version: 	0.20
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
+- Upstream update.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.19-1
 - Upstream update.
 - Activate AUTOMATED_TESTING (t/99_author.t).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Sep 2006 13:58:43 -0000	1.13
+++ sources	4 Oct 2006 06:37:26 -0000	1.14
@@ -1 +1 @@
-c5d75b97f92fa232b2dadcc44595ca61  Params-Util-0.19.tar.gz
+33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:40:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:40:12 -0700
Subject: rpms/perl-Test-Inline/FC-5 .cvsignore, 1.1,
	1.2 perl-Test-Inline.spec, 1.3, 1.4 sources, 1.1, 1.2
Message-ID: <200610040640.k946eEiL016252@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16230

Modified Files:
	.cvsignore perl-Test-Inline.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
- Activate AUTOMATED_TESTING (t/99_author.t).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2005 14:17:21 -0000	1.1
+++ .cvsignore	4 Oct 2006 06:40:12 -0000	1.2
@@ -1 +1 @@
-Test-Inline-2.103.tar.gz
+Test-Inline-2.105.tar.gz


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-5/perl-Test-Inline.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Test-Inline.spec	28 Feb 2006 23:30:54 -0000	1.3
+++ perl-Test-Inline.spec	4 Oct 2006 06:40:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		perl-Test-Inline
-Version: 	2.103
-Release: 	3%{?dist}
+Version: 	2.105
+Release: 	2%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -14,7 +14,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
-BuildRequires: 	perl(Test::More) >= 0.47
+BuildRequires: 	perl(Test::More) >= 0.42
 BuildRequires: 	perl(Test::ClassAPI) >= 1.02
 BuildRequires: 	perl(File::Spec) >= 0.80
 BuildRequires: 	perl(List::Util) >= 1.11
@@ -57,7 +57,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +68,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
+- Activate AUTOMATED_TESTING (t/99_author.t).
+
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-4
+- Mass rebuild.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2005 14:17:21 -0000	1.1
+++ sources	4 Oct 2006 06:40:12 -0000	1.2
@@ -1 +1 @@
-1d57bc056a0906bdf349700a6899c93e  Test-Inline-2.103.tar.gz
+4da55082abc873d655a94fdffc4b33df  Test-Inline-2.105.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:40:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:40:54 -0700
Subject: rpms/perl-Test-Inline/FC-4 perl-Test-Inline.spec,1.2,1.3
Message-ID: <200610040640.k946euN9016313@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16296

Modified Files:
	perl-Test-Inline.spec 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
- Activate AUTOMATED_TESTING (t/99_author.t).



Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-4/perl-Test-Inline.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-Inline.spec	7 Oct 2005 14:21:18 -0000	1.2
+++ perl-Test-Inline.spec	4 Oct 2006 06:40:54 -0000	1.3
@@ -1,5 +1,5 @@
 Name: 		perl-Test-Inline
-Version: 	2.103
+Version: 	2.105
 Release: 	2%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL or Artistic
@@ -14,7 +14,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
-BuildRequires: 	perl(Test::More) >= 0.47
+BuildRequires: 	perl(Test::More) >= 0.42
 BuildRequires: 	perl(Test::ClassAPI) >= 1.02
 BuildRequires: 	perl(File::Spec) >= 0.80
 BuildRequires: 	perl(List::Util) >= 1.11
@@ -57,7 +57,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +68,18 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
+- Activate AUTOMATED_TESTING (t/99_author.t).
+
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-4
+- Mass rebuild.
+
+* Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-3
+- Rebuild for perl-5.8.8.
+
 * Fri Oct  7 2005 Paul Howarth <paul at city-fan.org> - 2.103-2
 - Minor spec file cleanup
 - Add BR: perl(Test::Pod) for extra test coverage



From fedora-extras-commits at redhat.com  Wed Oct  4 06:48:50 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:48:50 -0700
Subject: rpms/perl-Test-Inline/FC-4 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200610040648.k946mqxf016389@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16370

Modified Files:
	.cvsignore sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2005 14:17:21 -0000	1.1
+++ .cvsignore	4 Oct 2006 06:48:50 -0000	1.2
@@ -1 +1 @@
-Test-Inline-2.103.tar.gz
+Test-Inline-2.105.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2005 14:17:21 -0000	1.1
+++ sources	4 Oct 2006 06:48:50 -0000	1.2
@@ -1 +1 @@
-1d57bc056a0906bdf349700a6899c93e  Test-Inline-2.103.tar.gz
+4da55082abc873d655a94fdffc4b33df  Test-Inline-2.105.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:54:05 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:54:05 -0700
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.13,
	1.14 perl-Params-Util.spec, 1.12, 1.13 sources, 1.13, 1.14
Message-ID: <200610040654.k946s7rO016454@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16433

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Sep 2006 14:12:08 -0000	1.13
+++ .cvsignore	4 Oct 2006 06:54:05 -0000	1.14
@@ -1 +1 @@
-Params-Util-0.19.tar.gz
+Params-Util-0.20.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Params-Util.spec	18 Sep 2006 14:12:08 -0000	1.12
+++ perl-Params-Util.spec	4 Oct 2006 06:54:05 -0000	1.13
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.19
+Version: 	0.20
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
+- Upstream update.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.19-1
 - Upstream update.
 - Activate AUTOMATED_TESTING (t/99_author.t).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Sep 2006 14:12:08 -0000	1.13
+++ sources	4 Oct 2006 06:54:05 -0000	1.14
@@ -1 +1 @@
-c5d75b97f92fa232b2dadcc44595ca61  Params-Util-0.19.tar.gz
+33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 07:15:46 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 00:15:46 -0700
Subject: rpms/alleyoop/FC-5 alleyoop.spec,1.1,1.2
Message-ID: <200610040715.k947FmBK019421@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19404

Modified Files:
	alleyoop.spec 
Log Message:
Fix BRs for FC5



Index: alleyoop.spec
===================================================================
RCS file: /cvs/extras/rpms/alleyoop/FC-5/alleyoop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alleyoop.spec	2 Oct 2006 22:05:16 -0000	1.1
+++ alleyoop.spec	4 Oct 2006 07:15:46 -0000	1.2
@@ -12,7 +12,6 @@
 BuildRequires: valgrind >= 3.1.0
 BuildRequires: libgnomeui-devel, gettext, intltool
 BuildRequires: desktop-file-utils
-BuildRequires: binutils-devel
 
 Requires: valgrind >= 3.1.0
 Requires: GConf2, scrollkeeper



From fedora-extras-commits at redhat.com  Wed Oct  4 07:17:48 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 00:17:48 -0700
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.6,
	1.7 perl-DBIx-SearchBuilder.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200610040717.k947HoSX019511@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19490

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.45-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Apr 2006 03:46:34 -0000	1.6
+++ .cvsignore	4 Oct 2006 07:17:48 -0000	1.7
@@ -1 +1 @@
-DBIx-SearchBuilder-1.43.tar.gz
+DBIx-SearchBuilder-1.45.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-DBIx-SearchBuilder.spec	5 Sep 2006 09:33:45 -0000	1.10
+++ perl-DBIx-SearchBuilder.spec	4 Oct 2006 07:17:48 -0000	1.11
@@ -6,8 +6,8 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.43
-Release: 	2%{?dist}
+Version: 	1.45
+Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -89,6 +89,9 @@
 %endif
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.45-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-2
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Apr 2006 03:46:34 -0000	1.6
+++ sources	4 Oct 2006 07:17:48 -0000	1.7
@@ -1 +1 @@
-3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz
+ee933efdd1e0478a9dea0d9cc997b8d5  DBIx-SearchBuilder-1.45.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 07:20:00 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 00:20:00 -0700
Subject: rpms/perl-DBIx-SearchBuilder/FC-5 .cvsignore, 1.6,
	1.7 perl-DBIx-SearchBuilder.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200610040720.k947K2xa019583@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19562

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.45-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Apr 2006 03:58:06 -0000	1.6
+++ .cvsignore	4 Oct 2006 07:20:00 -0000	1.7
@@ -1 +1 @@
-DBIx-SearchBuilder-1.43.tar.gz
+DBIx-SearchBuilder-1.45.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBIx-SearchBuilder.spec	22 Apr 2006 03:58:06 -0000	1.9
+++ perl-DBIx-SearchBuilder.spec	4 Oct 2006 07:20:00 -0000	1.10
@@ -6,7 +6,7 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.43
+Version: 	1.45
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
@@ -89,6 +89,12 @@
 %endif
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.45-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-2
+- Mass rebuild.
+
 * Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Apr 2006 03:58:06 -0000	1.6
+++ sources	4 Oct 2006 07:20:00 -0000	1.7
@@ -1 +1 @@
-3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz
+ee933efdd1e0478a9dea0d9cc997b8d5  DBIx-SearchBuilder-1.45.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 08:55:11 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed,  4 Oct 2006 01:55:11 -0700
Subject: fedora-security/audit fc5,1.343,1.344 fc6,1.98,1.99
Message-ID: <200610040855.k948tBSS022855@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22819

Modified Files:
	fc5 fc6 
Log Message:
Bring up to date with updates



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- fc5	3 Oct 2006 11:02:47 -0000	1.343
+++ fc5	4 Oct 2006 08:55:08 -0000	1.344
@@ -1,8 +1,11 @@
-p to date CVE as of CVE email 20060928
-Up to date FC5 as of 20060928
+p to date CVE as of CVE email 20061003
+Up to date FC5 as of 20061003
 
 ** are items that need attention
 
+CVE-2006-5160 ignore (firefox) unverified
+CVE-2006-5159 ignore (firefox) unverified
+CVE-2006-5158 ** kernel
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) #208458
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)
@@ -51,11 +54,11 @@
 CVE-2006-4340 version (nss, fixed 3.11.3) [since FEDORA-2006-979]
 CVE-2006-4339 backport (openssl) [since FEDORA-2006-953]
 CVE-2006-4339 backport (openssl097a) [since FEDORA-2006-953]
-CVE-2006-4338 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4337 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4336 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4335 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4334 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4338 version (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4337 version (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4336 version (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4335 version (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4334 version (gzip) #207643 [since FEDORA-2006-993]
 CVE-2006-4433 VULNERABLE (php, fixed 5.1.4)
 CVE-2006-4333 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
 CVE-2006-4332 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fc6	29 Sep 2006 09:24:29 -0000	1.98
+++ fc6	4 Oct 2006 08:55:08 -0000	1.99
@@ -1,9 +1,12 @@
-Up to date CVE as of CVE email 20060928
+Up to date CVE as of CVE email 20061003
 Up to date FC6 as of Test3
 Up to date dist-fc6 rawhide as of 20060929
 
 ** are items that need attention
 
+CVE-2006-5160 ignore (firefox) unverified
+CVE-2006-5159 ignore (firefox) unverified
+CVE-2006-5158 ** kernel
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18) [in rawhide]



From fedora-extras-commits at redhat.com  Wed Oct  4 09:16:41 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Wed,  4 Oct 2006 02:16:41 -0700
Subject: rpms/guichan/devel .cvsignore, 1.2, 1.3 guichan.spec, 1.2,
	1.3 sources, 
	1.2, 1.3 guichan-werror-cxxflag-disable.patch, 1.1, NONE
Message-ID: <200610040916.k949GhU0025816@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/guichan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25795

Modified Files:
	.cvsignore guichan.spec sources 
Removed Files:
	guichan-werror-cxxflag-disable.patch 
Log Message:
* Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
- Upstream update
- Add freeglut-devel BR for the new release
- Removed unusued patches for this new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2006 02:00:02 -0000	1.2
+++ .cvsignore	4 Oct 2006 09:16:41 -0000	1.3
@@ -1 +1 @@
-guichan-0.4.0-src.tar.gz
+guichan-0.5.0-src.tar.gz


Index: guichan.spec
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/guichan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- guichan.spec	13 Sep 2006 19:36:51 -0000	1.2
+++ guichan.spec	4 Oct 2006 09:16:41 -0000	1.3
@@ -1,16 +1,16 @@
 Name:           guichan
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Portable C++ GUI library for games using Allegro, SDL and OpenGL
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://guichan.sourceforge.net
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/guichan/%{name}-%{version}-src.tar.gz
-Patch0:         guichan-werror-cxxflag-disable.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  allegro-devel, SDL-devel, SDL_image-devel, libGL-devel
+BuildRequires:  freeglut-devel
 
 %description
 Guichan is a small, efficient C++ GUI library designed for games. It comes
@@ -28,10 +28,7 @@
 package is needed to build programs written using guichan.
 
 %prep
-%setup -q
-%patch -p1
-touch aclocal.m4 Makefile.in */Makefile.in */*/Makefile.in */*/*/Makefile.in
-touch include/config.hpp.in
+%setup -q -n %{name}-%{version}-src
 
 
 %build
@@ -61,6 +58,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_libdir}/libguichan.so.*
 %{_libdir}/libguichan_allegro.so.*
+%{_libdir}/libguichan_glut.so.*
 %{_libdir}/libguichan_opengl.so.*
 %{_libdir}/libguichan_sdl.so.*
 
@@ -73,6 +71,8 @@
 %{_libdir}/libguichan.so
 %{_libdir}/libguichan_allegro.a
 %{_libdir}/libguichan_allegro.so
+%{_libdir}/libguichan_glut.a
+%{_libdir}/libguichan_glut.so
 %{_libdir}/libguichan_opengl.a
 %{_libdir}/libguichan_opengl.so
 %{_libdir}/libguichan_sdl.a
@@ -80,6 +80,11 @@
 
 
 %changelog
+* Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
+- Upstream update
+- Add freeglut-devel BR for the new release
+- Removed unusued patches for this new version
+
 * Wed Sep 13 2006 Hugo Cisneiros <hugo at devin.com.br> 0.4.0-3
 - Rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2006 02:00:02 -0000	1.2
+++ sources	4 Oct 2006 09:16:41 -0000	1.3
@@ -1 +1 @@
-f68b6c603c4fb3d70a8737f916214a35  guichan-0.4.0-src.tar.gz
+c9fcbcb360105247da06afc5c643e664  guichan-0.5.0-src.tar.gz


--- guichan-werror-cxxflag-disable.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 09:29:55 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Wed,  4 Oct 2006 02:29:55 -0700
Subject: rpms/guichan/FC-5 .cvsignore, 1.2, 1.3 guichan.spec, 1.1,
	1.2 sources, 
	1.2, 1.3 guichan-werror-cxxflag-disable.patch, 1.1, NONE
Message-ID: <200610040929.k949TvMk025970@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/guichan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25947

Modified Files:
	.cvsignore guichan.spec sources 
Removed Files:
	guichan-werror-cxxflag-disable.patch 
Log Message:
* Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
- Upstream update
- Add freeglut-devel BR for the new release
- Removed unusued patches for this new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guichan/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2006 02:00:02 -0000	1.2
+++ .cvsignore	4 Oct 2006 09:29:55 -0000	1.3
@@ -1 +1 @@
-guichan-0.4.0-src.tar.gz
+guichan-0.5.0-src.tar.gz


Index: guichan.spec
===================================================================
RCS file: /cvs/extras/rpms/guichan/FC-5/guichan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- guichan.spec	12 Jun 2006 02:00:02 -0000	1.1
+++ guichan.spec	4 Oct 2006 09:29:55 -0000	1.2
@@ -1,16 +1,16 @@
 Name:           guichan
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Portable C++ GUI library for games using Allegro, SDL and OpenGL
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://guichan.sourceforge.net
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/guichan/%{name}-%{version}-src.tar.gz
-Patch0:         guichan-werror-cxxflag-disable.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  allegro-devel, SDL-devel, SDL_image-devel, libGL-devel
+BuildRequires:  freeglut-devel
 
 %description
 Guichan is a small, efficient C++ GUI library designed for games. It comes
@@ -28,10 +28,7 @@
 package is needed to build programs written using guichan.
 
 %prep
-%setup -q
-%patch -p1
-touch aclocal.m4 Makefile.in */Makefile.in */*/Makefile.in */*/*/Makefile.in
-touch include/config.hpp.in
+%setup -q -n %{name}-%{version}-src
 
 
 %build
@@ -61,6 +58,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_libdir}/libguichan.so.*
 %{_libdir}/libguichan_allegro.so.*
+%{_libdir}/libguichan_glut.so.*
 %{_libdir}/libguichan_opengl.so.*
 %{_libdir}/libguichan_sdl.so.*
 
@@ -73,6 +71,8 @@
 %{_libdir}/libguichan.so
 %{_libdir}/libguichan_allegro.a
 %{_libdir}/libguichan_allegro.so
+%{_libdir}/libguichan_glut.a
+%{_libdir}/libguichan_glut.so
 %{_libdir}/libguichan_opengl.a
 %{_libdir}/libguichan_opengl.so
 %{_libdir}/libguichan_sdl.a
@@ -80,6 +80,14 @@
 
 
 %changelog
+* Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
+- Upstream update
+- Add freeglut-devel BR for the new release
+- Removed unusued patches for this new version
+
+* Wed Sep 13 2006 Hugo Cisneiros <hugo at devin.com.br> 0.4.0-3
+- Rebuilt for FC6
+
 * Sat Jun 10 2006 Hugo Cisneiros <hugo at devin.com.br> 0.4.0-2
 - Using libGL-devel instead of mesa-libGL-devel in BuildRequires
 - Put documentation under -devel instead of a whole -doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guichan/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2006 02:00:02 -0000	1.2
+++ sources	4 Oct 2006 09:29:55 -0000	1.3
@@ -1 +1 @@
-f68b6c603c4fb3d70a8737f916214a35  guichan-0.4.0-src.tar.gz
+c9fcbcb360105247da06afc5c643e664  guichan-0.5.0-src.tar.gz


--- guichan-werror-cxxflag-disable.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 10:11:43 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed,  4 Oct 2006 03:11:43 -0700
Subject: rpms/gnome-python2-gda/FC-5 .cvsignore, 1.2,
	1.3 gnome-python2-gda.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610041011.k94ABjBV029046@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29025

Modified Files:
	.cvsignore gnome-python2-gda.spec sources 
Log Message:
FC-5 version, based on current gnome-python2-extras in FC-5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2006 06:59:01 -0000	1.2
+++ .cvsignore	4 Oct 2006 10:11:43 -0000	1.3
@@ -1 +1 @@
-gnome-python-extras-2.14.2.tar.bz2
+gnome-python-extras-2.14.0.tar.bz2


Index: gnome-python2-gda.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/FC-5/gnome-python2-gda.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-python2-gda.spec	2 Oct 2006 06:59:01 -0000	1.1
+++ gnome-python2-gda.spec	4 Oct 2006 10:11:43 -0000	1.2
@@ -7,8 +7,8 @@
 
 Summary: PyGNOME Python extension module for interacting with gda
 Name: gnome-python2-gda
-Version: 2.14.2
-Release: 2%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: http://developer.gnome.org
@@ -88,12 +88,6 @@
 
 
 %changelog
-* Mon Oct  2 2006 Denis Leroy <denis at poolshark.org> - 2.14.2-2
-- Split for devel package
-
-* Sun Oct  1 2006 Denis Leroy <denis at poolshark.org> - 2.14.2-1
-- Update to upstream version 2.14.2
-
 * Mon Jul 24 2006 Denis Leroy <denis at poolshark.org> - 2.14.0-1
 - First draft, adapted from gnome-python2-extras from core
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 06:59:01 -0000	1.2
+++ sources	4 Oct 2006 10:11:43 -0000	1.3
@@ -1 +1 @@
-039e1300368df17de9867685e9705091  gnome-python-extras-2.14.2.tar.bz2
+e9390569e18a5e71da1ed9476fa750b3  gnome-python-extras-2.14.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 12:33:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:33:51 -0700
Subject: rpms/perl-PPI-Tester/devel - New directory
Message-ID: <200610041233.k94CXr2A003033@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3004/perl-PPI-Tester/devel

Log Message:
Directory /cvs/extras/rpms/perl-PPI-Tester/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 12:33:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:33:50 -0700
Subject: rpms/perl-PPI-Tester - New directory
Message-ID: <200610041233.k94CXqDV003030@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3004/perl-PPI-Tester

Log Message:
Directory /cvs/extras/rpms/perl-PPI-Tester added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 12:34:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:34:07 -0700
Subject: rpms/perl-PPI-Tester Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610041234.k94CY9Wj003083@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3049

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-PPI-Tester


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PPI-Tester
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct  4 12:34:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:34:08 -0700
Subject: rpms/perl-PPI-Tester/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610041234.k94CYAGB003087@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3049/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PPI-Tester


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct  4 12:34:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:34:37 -0700
Subject: rpms/perl-PPI-Tester import.log,1.1,1.2
Message-ID: <200610041235.k94CZ9Zr003161@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3115

Modified Files:
	import.log 
Log Message:
auto-import perl-PPI-Tester-0.06-2 on branch devel from perl-PPI-Tester-0.06-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI-Tester/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Oct 2006 12:34:07 -0000	1.1
+++ import.log	4 Oct 2006 12:34:37 -0000	1.2
@@ -0,0 +1 @@
+perl-PPI-Tester-0_06-2:HEAD:perl-PPI-Tester-0.06-2.src.rpm:1159965269



From fedora-extras-commits at redhat.com  Wed Oct  4 12:34:38 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:34:38 -0700
Subject: rpms/perl-PPI-Tester/devel perl-PPI-Tester.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610041235.k94CZApj003165@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3115/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-PPI-Tester.spec 
Log Message:
auto-import perl-PPI-Tester-0.06-2 on branch devel from perl-PPI-Tester-0.06-2.src.rpm


--- NEW FILE perl-PPI-Tester.spec ---
#
# Rebuild option:
#
#   --with testsuite         - run the test suite (requires X)
#

Name:           perl-PPI-Tester
Version:        0.06
Release:        2%{?dist}
Summary:        A wxPerl-based interactive PPI debugger/tester

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/PPI-Tester/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-Tester-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::AutoInstall)
BuildRequires:  perl(PPI)
BuildRequires:  perl(Wx)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package implements a wxWindows desktop application which provides
the ability to interactively test the PPI perl parser.


%prep
%setup -q -n PPI-Tester-%{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/*


%check
%{?_with_testsuite:make test}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{_bindir}/*
%{perl_vendorlib}/PPI/
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3pm*


%changelog
* Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.06-2
- Added missing BR perl(ExtUtils::AutoInstall).
- Changed the build process: Build.PL -> Makefile.PL
  (Build.PL just requires Makefile.PL).

* Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.06-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI-Tester/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2006 12:34:08 -0000	1.1
+++ .cvsignore	4 Oct 2006 12:34:38 -0000	1.2
@@ -0,0 +1 @@
+PPI-Tester-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI-Tester/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2006 12:34:08 -0000	1.1
+++ sources	4 Oct 2006 12:34:38 -0000	1.2
@@ -0,0 +1 @@
+9fcad41d6b2e33cfdf4025eb29644fae  PPI-Tester-0.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:37:03 -0700
Subject: rpms/digikamimageplugins-doc - New directory
Message-ID: <200610041237.k94Cb5xo003319@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3293/digikamimageplugins-doc

Log Message:
Directory /cvs/extras/rpms/digikamimageplugins-doc added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:37:04 -0700
Subject: rpms/digikamimageplugins-doc/devel - New directory
Message-ID: <200610041237.k94Cb6Rl003322@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3293/digikamimageplugins-doc/devel

Log Message:
Directory /cvs/extras/rpms/digikamimageplugins-doc/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:37:13 -0700
Subject: rpms/digikamimageplugins-doc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610041237.k94CbFDq003366@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3338

Added Files:
	Makefile import.log 
Log Message:
Setup of module digikamimageplugins-doc


--- NEW FILE Makefile ---
# Top level Makefile for module digikamimageplugins-doc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:37:13 -0700
Subject: rpms/digikamimageplugins-doc/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610041237.k94CbGCF003369@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3338/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module digikamimageplugins-doc


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:37:48 -0700
Subject: owners owners.list,1.1770,1.1771
Message-ID: <200610041237.k94CboPk003414@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3397

Modified Files:
	owners.list 
Log Message:
New package: perl-PPI-Tester (#208636)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1770
retrieving revision 1.1771
diff -u -r1.1770 -r1.1771
--- owners.list	4 Oct 2006 05:02:00 -0000	1.1770
+++ owners.list	4 Oct 2006 12:37:48 -0000	1.1771
@@ -1563,6 +1563,7 @@
 Fedora Extras|perl-POE-Wheel-Null|POE Wheel that does puts data nowhere, and sends nothing|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PPI-HTML|Generate syntax-hightlighted HTML for Perl using PPI|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PPI-Tester|A wxPerl-based interactive PPI debugger/tester|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,mpeters at mac.com



From fedora-extras-commits at redhat.com  Wed Oct  4 12:38:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:38:33 -0700
Subject: rpms/digikamimageplugins-doc import.log,1.1,1.2
Message-ID: <200610041238.k94CcZvq003468@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3430

Modified Files:
	import.log 
Log Message:
auto-import digikamimageplugins-doc-0.8.2-2 on branch devel from digikamimageplugins-doc-0.8.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins-doc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Oct 2006 12:37:13 -0000	1.1
+++ import.log	4 Oct 2006 12:38:32 -0000	1.2
@@ -0,0 +1 @@
+digikamimageplugins-doc-0_8_2-2:HEAD:digikamimageplugins-doc-0.8.2-2.src.rpm:1159965507



From fedora-extras-commits at redhat.com  Wed Oct  4 12:38:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:38:33 -0700
Subject: rpms/digikamimageplugins-doc/devel
	digikamimageplugins-doc-0.8.2-noarch.patch, NONE,
	1.1 digikamimageplugins-doc.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610041238.k94CcZkq003475@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3430/devel

Modified Files:
	.cvsignore sources 
Added Files:
	digikamimageplugins-doc-0.8.2-noarch.patch 
	digikamimageplugins-doc.spec 
Log Message:
auto-import digikamimageplugins-doc-0.8.2-2 on branch devel from digikamimageplugins-doc-0.8.2-2.src.rpm

digikamimageplugins-doc-0.8.2-noarch.patch:

--- NEW FILE digikamimageplugins-doc-0.8.2-noarch.patch ---
--- digikam-doc-0.8.2-r1/admin/configure.in.min.CANONICAL	2006-07-12 13:48:29.000000000 -0500
+++ digikam-doc-0.8.2-r1/admin/configure.in.min	2006-08-31 14:56:58.000000000 -0500
@@ -31,7 +31,7 @@
 unset CDPATH
 
 dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM 
+dnl AC_CANONICAL_SYSTEM 
 dnl Perform program name transformation
 AC_ARG_PROGRAM
 


--- NEW FILE digikamimageplugins-doc.spec ---

Name:		digikamimageplugins-doc
Version:	0.8.2
Release:	2%{?dist}	
Summary:	Documentation for digiKamimageplugins

Group:		Documentation
License:	GFDL
URL:		http://www.digikam.org/
Source0:	http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-doc-%{version}-r1.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

# Either use this patch or use ./configure --target below
# to trick this into a .noarch build -- Rex
Patch1:		digikamimageplugins-doc-0.8.2-noarch.patch

#BuildRequires:	automake libtool
BuildRequires:	kdelibs-devel
Requires:	digikamimageplugins = %{version}

%description
%{summary}.


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

#patch1 -p1 -b .noarch
#make -f admin/Makefile.common


%build
%configure --target=%{_build_cpu}

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
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



%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README


%changelog
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
- Release: use %%{?dist}
- Source: include URL that actually works

* Fri Sep 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
- 0.8.2 (first try)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins-doc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2006 12:37:13 -0000	1.1
+++ .cvsignore	4 Oct 2006 12:38:33 -0000	1.2
@@ -0,0 +1 @@
+digikamimageplugins-doc-0.8.2-r1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins-doc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2006 12:37:13 -0000	1.1
+++ sources	4 Oct 2006 12:38:33 -0000	1.2
@@ -0,0 +1 @@
+9735437a0f385e28c2179ea25965d78f  digikamimageplugins-doc-0.8.2-r1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 12:44:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:44:56 -0700
Subject: owners owners.list,1.1771,1.1772
Message-ID: <200610041244.k94CiwOo003565@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3548

Modified Files:
	owners.list 
Log Message:
+digikamimageplugins-doc



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1771
retrieving revision 1.1772
diff -u -r1.1771 -r1.1772
--- owners.list	4 Oct 2006 12:37:48 -0000	1.1771
+++ owners.list	4 Oct 2006 12:44:56 -0000	1.1772
@@ -286,6 +286,7 @@
 Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|digikam-doc|Documentation for the digiKam and Showfoto|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|digikamimageplugins|Plugins for Digikam|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|digikamimageplugins-doc|Documentation for digiKamimageplugins|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dillo|Very small and fast GUI web browser|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dircproxy|Detatchable IRC proxy server|jwilson at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 13:54:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 06:54:11 -0700
Subject: rpms/qt4/devel .cvsignore, 1.9, 1.10 qt4.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200610041354.k94DsD0h006952@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6931

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Sep 2006 15:31:48 -0000	1.9
+++ .cvsignore	4 Oct 2006 13:54:11 -0000	1.10
@@ -1,5 +1,5 @@
 clog
-qt41.spec
+OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
 qt-x11-opensource-src-4.2.0-rc1.tar.gz
-qt-x11-opensource-src-4.2.0-snapshot-20060927.tar.bz2
+qt-x11-opensource-src-4.2.0.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- qt4.spec	28 Sep 2006 15:31:48 -0000	1.23
+++ qt4.spec	4 Oct 2006 13:54:11 -0000	1.24
@@ -6,14 +6,14 @@
 #define preview -preview
 #define rel %{beta}
 
-%define snap 20060927
-%define beta snapshot-%{snap}
-%define rel  %{snap}
+#define snap 20060927
+#define beta snapshot-%{snap}
+#define rel  %{snap}
 
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.0
-Release: 0.9.%{rel}%{?dist}
+Release: 1%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -506,6 +506,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+- 4.2.0(final)
+
 * Thu Sep 28 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-0.9.20060927
 - update to 4.2.0-snapshot-20060927
 - update QDBus executable names


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Sep 2006 15:31:48 -0000	1.7
+++ sources	4 Oct 2006 13:54:11 -0000	1.8
@@ -1 +1 @@
-3b50147f1f6ab2efabd0b47587d67ab0  qt-x11-opensource-src-4.2.0-snapshot-20060927.tar.bz2
+2c062a125d5ca66397e3430ba537fbec  qt-x11-opensource-src-4.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 14:00:51 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed,  4 Oct 2006 07:00:51 -0700
Subject: rpms/rssowl/devel rssowl.script,1.7,1.8 rssowl.spec,1.14,1.15
Message-ID: <200610041400.k94E0rq2007033@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7011

Modified Files:
	rssowl.script rssowl.spec 
Log Message:
Rev -5. Updated for Eclipse update.



Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rssowl.script	4 Aug 2006 18:25:32 -0000	1.7
+++ rssowl.script	4 Oct 2006 14:00:51 -0000	1.8
@@ -10,6 +10,7 @@
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.4.1.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+
 
 


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rssowl.spec	19 Sep 2006 12:18:35 -0000	1.14
+++ rssowl.spec	4 Oct 2006 14:00:51 -0000	1.15
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2.2
-%define release 4%{?dist}
+%define release 5%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -23,14 +23,14 @@
 Requires:       jre >= 1.4.2-
 BuildRequires:  java-sdk >= 1.4.2
 BuildRequires:  ImageMagick
-BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.1.2
+BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
 BuildRequires:  libgconf-java
 BuildRequires:  ant, jpackage-utils >= 1.5
 BuildRequires:	dos2unix
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
+Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
 Requires:       libgconf-java
 Requires:       firefox
 BuildRequires:    desktop-file-utils
@@ -136,6 +136,10 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Oct  4 2006 Anthony Green <green at redhat.com> - 1.2.2-5
+- Update rssowl.script for Eclipse SDK 3.2.1.
+- Tweak Requires and BuildRequires for eclipse-platform.
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> - 1.2.2-4
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 14:20:39 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed,  4 Oct 2006 07:20:39 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 telepathy-gabble.spec, 1.6, 1.7
Message-ID: <200610041420.k94EKgir010083@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10062

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Wed Oct  4 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.9-1
- Update to 0.3.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2006 13:37:34 -0000	1.6
+++ .cvsignore	4 Oct 2006 14:20:39 -0000	1.7
@@ -1 +1 @@
-telepathy-gabble-0.3.7.tar.gz
+telepathy-gabble-0.3.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Oct 2006 13:37:34 -0000	1.6
+++ sources	4 Oct 2006 14:20:39 -0000	1.7
@@ -1 +1 @@
-f47b65038041173885b5dacdc0d9881e  telepathy-gabble-0.3.7.tar.gz
+7c373a8d441802e5b6a211701e894dfb  telepathy-gabble-0.3.9.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- telepathy-gabble.spec	1 Oct 2006 13:37:34 -0000	1.6
+++ telepathy-gabble.spec	4 Oct 2006 14:20:39 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.7
+Version:        0.3.9
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.9-1
+- Update to 0.3.9.
+
 * Sun Oct  1 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
 - Update to 0.3.7.
 - Add requires on telepathy-filesystem.



From fedora-extras-commits at redhat.com  Wed Oct  4 14:21:58 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed,  4 Oct 2006 07:21:58 -0700
Subject: owners owners.list,1.1772,1.1773
Message-ID: <200610041422.k94EM0UZ010140@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10105

Modified Files:
	owners.list 
Log Message:
Taking ownership of orphaned pam_keyring


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1772
retrieving revision 1.1773
diff -u -r1.1772 -r1.1773
--- owners.list	4 Oct 2006 12:44:56 -0000	1.1772
+++ owners.list	4 Oct 2006 14:21:58 -0000	1.1773
@@ -1175,7 +1175,7 @@
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|padevchooser|Control applet for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|alex at dalloz.de|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
-Fedora Extras|pam_keyring|A PAM module that executes gnome-keyring-daemon and unlocks the default keyring|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
+Fedora Extras|pam_keyring|A PAM module that executes gnome-keyring-daemon and unlocks the default keyring|denis at poolshark.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|pam_mount|A PAM module that can mount volumes for a user session|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pam_mysql| PAM module for auth UNIX users using MySQL data base|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pam_pkcs11|PKCS #11 PAM login module|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 14:39:45 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:39:45 -0700
Subject: rpms/sysprof/devel - New directory
Message-ID: <200610041439.k94EdlHc010277@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253/sysprof/devel

Log Message:
Directory /cvs/extras/rpms/sysprof/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 14:39:44 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:39:44 -0700
Subject: rpms/sysprof - New directory
Message-ID: <200610041439.k94EdkN2010274@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253/sysprof

Log Message:
Directory /cvs/extras/rpms/sysprof added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 14:40:06 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:40:06 -0700
Subject: rpms/sysprof Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610041440.k94Ee8LG010331@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10298

Added Files:
	Makefile import.log 
Log Message:
Setup of module sysprof


--- NEW FILE Makefile ---
# Top level Makefile for module sysprof
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct  4 14:40:07 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:40:07 -0700
Subject: rpms/sysprof/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610041440.k94Ee9SY010334@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10298/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sysprof


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct  4 14:40:55 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:40:55 -0700
Subject: rpms/sysprof import.log,1.1,1.2
Message-ID: <200610041440.k94EevHc010405@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371

Modified Files:
	import.log 
Log Message:
auto-import sysprof-1.0.3-4 on branch devel from sysprof-1.0.3-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sysprof/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Oct 2006 14:40:06 -0000	1.1
+++ import.log	4 Oct 2006 14:40:55 -0000	1.2
@@ -0,0 +1 @@
+sysprof-1_0_3-4:HEAD:sysprof-1.0.3-4.src.rpm:1159972846



From fedora-extras-commits at redhat.com  Wed Oct  4 14:40:56 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:40:56 -0700
Subject: rpms/sysprof/devel sysprof.desktop, NONE, 1.1 sysprof.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610041440.k94EewLA010410@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sysprof.desktop sysprof.spec 
Log Message:
auto-import sysprof-1.0.3-4 on branch devel from sysprof-1.0.3-4.src.rpm


--- NEW FILE sysprof.desktop ---
[Desktop Entry]
Version=0.9.4
Encoding=UTF-8
Name=Sysprof
Comment=a sampling CPU profiler
Exec=sysprof
Icon=sysprof-icon.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Development;Profiling;


--- NEW FILE sysprof.spec ---
Name:           sysprof      
Version:        1.0.3
Release:        4%{?dist}
Summary:        Sysprof is a sampling CPU profiler
Group:          Development/System
License:        GPL
URL:            http://www.daimi.au.dk/~sandmann/sysprof/
Source0:        http://www.daimi.au.dk/~sandmann/sysprof/sysprof-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1:        sysprof.desktop

# kmod related stuff
Provides:       sysprof-kmod-common = %{version}
Requires:       kmod-%{name} >= %{version}

BuildRequires:  gtk2-devel => 2.6
BuildRequires:  libglade2-devel
BuildRequires:  binutils-devel
BuildRequires:  desktop-file-utils


%description
Sysprof is a sampling CPU profiler for Linux that uses a kernel module
to profile the entire system, not just a single application.
Sysprof handles shared libraries and applications do not need to be
recompiled. In fact they don't even have to be restarted.

%prep
%setup -q


%build
%configure --disable-kernel-module
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         \
        --add-category X-Fedora                                 \
        %{SOURCE1}


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog
%{_bindir}/sysprof
%{_datadir}/pixmaps/sysprof-icon.png
%dir %{_datadir}/sysprof
%{_datadir}/sysprof/sysprof-icon.png
%{_datadir}/sysprof/sysprof.glade
%{_datadir}/applications/*.desktop

%changelog
* Tue Oct 2 2006 ianluca Sforna <giallu gmail com> 1.0.3-4
- add .desktop file

* Fri Sep 30 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
- versioned Provides
- add BR: binutils-devel

* Fri Sep 29 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
- own sysprof directory

* Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
- version update
- use standard %%configure macro

* Sun May 14 2006 Gianluca Sforna <giallu gmail com> 1.0.2-1
- Initial Version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2006 14:40:06 -0000	1.1
+++ .cvsignore	4 Oct 2006 14:40:56 -0000	1.2
@@ -0,0 +1 @@
+sysprof-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2006 14:40:06 -0000	1.1
+++ sources	4 Oct 2006 14:40:56 -0000	1.2
@@ -0,0 +1 @@
+8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 14:47:06 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed,  4 Oct 2006 07:47:06 -0700
Subject: rpms/mock/FC-5 mock.spec,1.21,1.22 sources,1.12,1.13
Message-ID: <200610041447.k94ElcEF010503@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10465/FC-5

Modified Files:
	mock.spec sources 
Log Message:
New upstream build



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mock.spec	30 Aug 2006 03:53:20 -0000	1.21
+++ mock.spec	4 Oct 2006 14:47:05 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.4
+Version: 0.6.5
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
+- new upstream version to fix #151255
+
 * Tue Aug 29 2006 Jesse Keating <jkeating at redhat.com> - 0.6.4-1
 - new upstream version to fix #204051
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2006 03:53:20 -0000	1.12
+++ sources	4 Oct 2006 14:47:05 -0000	1.13
@@ -1 +1 @@
-636f66c9d6d03e590c79c2d83fcf0b24  mock-0.6.4.tar.gz
+77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 14:47:06 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed,  4 Oct 2006 07:47:06 -0700
Subject: rpms/mock/devel .cvsignore, 1.9, 1.10 mock.spec, 1.22, 1.23 sources,
	1.12, 1.13
Message-ID: <200610041447.k94ElcJL010508@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10465/devel

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
New upstream build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Aug 2006 03:53:20 -0000	1.9
+++ .cvsignore	4 Oct 2006 14:47:06 -0000	1.10
@@ -1 +1 @@
-mock-0.6.4.tar.gz
+mock-0.6.5.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mock.spec	30 Aug 2006 03:53:20 -0000	1.22
+++ mock.spec	4 Oct 2006 14:47:06 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.4
+Version: 0.6.5
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
+- new upstream version to fix #151255
+
 * Tue Aug 29 2006 Jesse Keating <jkeating at redhat.com> - 0.6.4-1
 - new upstream version to fix #204051
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2006 03:53:20 -0000	1.12
+++ sources	4 Oct 2006 14:47:06 -0000	1.13
@@ -1 +1 @@
-636f66c9d6d03e590c79c2d83fcf0b24  mock-0.6.4.tar.gz
+77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 15:04:50 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed,  4 Oct 2006 08:04:50 -0700
Subject: rpms/rssowl/devel rssowl.spec,1.15,1.16
Message-ID: <200610041504.k94F4qvD013556@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13518

Modified Files:
	rssowl.spec 
Log Message:
Revision -6.  Fix build classpath for new eclipse.



Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rssowl.spec	4 Oct 2006 14:00:51 -0000	1.15
+++ rssowl.spec	4 Oct 2006 15:04:50 -0000	1.16
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2.2
-%define release 5%{?dist}
+%define release 6%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -60,7 +60,7 @@
 
 %build
 build-jar-repository -p lib swt-gtk-3.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
-ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.0.I20060605-1400.jar lib
+ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
 ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
 cd src
 ant deploy_linux
@@ -136,6 +136,9 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Oct  4 2006 Anthony Green <green at redhat.com> - 1.2.2-6
+- Fix build classpath.
+
 * Wed Oct  4 2006 Anthony Green <green at redhat.com> - 1.2.2-5
 - Update rssowl.script for Eclipse SDK 3.2.1.
 - Tweak Requires and BuildRequires for eclipse-platform.



From fedora-extras-commits at redhat.com  Wed Oct  4 15:23:23 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Oct 2006 08:23:23 -0700
Subject: rpms/paraview/devel paraview.spec,1.6,1.7
Message-ID: <200610041523.k94FNP5U013751@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13734

Modified Files:
	paraview.spec 
Log Message:
- Re-enable OSMESA support for FC6
- Enable python wrapping



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- paraview.spec	15 Sep 2006 22:08:51 -0000	1.6
+++ paraview.spec	4 Oct 2006 15:23:23 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, lam-devel
-BuildRequires:  libGLU-devel, libXt-devel
+BuildRequires:  libGLU-devel, libXt-devel, mesa-libOSMesa-devel
 BuildRequires:  python-devel, tk-devel, hdf5-devel
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
@@ -120,6 +120,8 @@
         -DTCL_LIBRARY:PATH=tcl \
         -DTK_LIBRARY:PATH=tk \
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
+        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
+        -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
         -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -128,9 +130,6 @@
         -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
-# Broken at the moment
-#        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
-#
 make
 popd
 mkdir fedora-mpi
@@ -151,9 +150,11 @@
         -DTCL_LIBRARY:PATH=tcl \
         -DTK_LIBRARY:PATH=tk \
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
+        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
         -DVTK_USE_MPI:BOOL=ON \
         -DMPI_INCLUDE_PATH:PATH=%{_includedir}/lam \
         -DMPI_LIBRARY:STRING="-L%{_libdir}/lam -llammpio -llammpi++ -llamf77mpi -lmpi -llam -laio -lutil -ldl" \
+        -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
         -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -162,9 +163,6 @@
         -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
-# Broken at the moment
-#        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
-#
 make
 
 
@@ -273,7 +271,7 @@
 %{_bindir}/pvbatch
 %{_bindir}/pvclient
 %{_bindir}/pvdataserver
-#%{_bindir}/pvpython
+%{_bindir}/pvpython
 %{_bindir}/pvrenderserver
 %{_bindir}/pvserver
 %{_datadir}/applications/fedora-paraview.desktop
@@ -287,7 +285,7 @@
 %{_bindir}/pvbatch-mpi
 %{_bindir}/pvclient-mpi
 %{_bindir}/pvdataserver-mpi
-#%{_bindir}/pvpython-mpi
+%{_bindir}/pvpython-mpi
 %{_bindir}/pvrenderserver-mpi
 %{_bindir}/pvserver-mpi
 %{_datadir}/applications/fedora-paraview-mpi.desktop
@@ -308,6 +306,10 @@
 
 
 %changelog
+* Wed Oct  4 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-2
+- Re-enable OSMESA support for FC6
+- Enable python wrapping
+
 * Fri Sep 15 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-1
 - Update to 2.4.4
 



From fedora-extras-commits at redhat.com  Wed Oct  4 15:35:56 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 08:35:56 -0700
Subject: rpms/OpenSceneGraph/devel sources,1.5,1.6 .cvsignore,1.5,1.6
Message-ID: <200610041535.k94FZwti013915@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13896

Modified Files:
	sources .cvsignore 
Log Message:
Reflect having uploaded OSG_OP_OT-1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2006 13:07:04 -0000	1.5
+++ sources	4 Oct 2006 15:35:56 -0000	1.6
@@ -1 +1,2 @@
 c140e0f53f577af6e807108dd1a8f65f  OSG_OP_OT-1.1.zip
+e08e0ef1f250dfc17122926ef00b1559  OSG_OP_OT-1.2.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2006 13:07:04 -0000	1.5
+++ .cvsignore	4 Oct 2006 15:35:56 -0000	1.6
@@ -1 +1,2 @@
 OSG_OP_OT-1.1.zip
+OSG_OP_OT-1.2.zip



From fedora-extras-commits at redhat.com  Wed Oct  4 15:38:32 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 08:38:32 -0700
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-1.2.diff,NONE,1.1
Message-ID: <200610041538.k94FcYIk013956@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938

Added Files:
	OpenSceneGraph-1.2.diff 
Log Message:
New.

OpenSceneGraph-1.2.diff:

--- NEW FILE OpenSceneGraph-1.2.diff ---
? diff
Index: OpenSceneGraph/Make/instexamplesrc
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/instexamplesrc,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/Make/instexamplesrc	4 Oct 2006 08:01:33 -0000	1.1.1.1
+++ OpenSceneGraph/Make/instexamplesrc	4 Oct 2006 10:49:35 -0000	1.1.1.1.2.1
@@ -32,7 +32,7 @@
             cd $TOPDIR/examples/$d
             [ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
             echo "         installing $d"
-            for f in `$MAKE __instfiles | grep -v $MAKE`
+            for f in `$MAKE __instfiles | grep -v $MAKE | grep -v Entering | grep -v Leaving`
            do
                 src=`echo $f | cut -f1 -d"="`
                 dst=`echo $f | cut -f2 -d"="`
Index: OpenSceneGraph/Make/libdefs
===================================================================
RCS file: OpenSceneGraph/Make/libdefs
diff -N OpenSceneGraph/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ OpenSceneGraph/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(VERSION_MAJOR)
+endif
+
Index: OpenSceneGraph/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- OpenSceneGraph/Make/makedefs	4 Oct 2006 10:12:01 -0000	1.1.1.3
+++ OpenSceneGraph/Make/makedefs	4 Oct 2006 11:02:09 -0000	1.1.1.2.2.2
@@ -354,14 +354,6 @@
       ARCHINST        = 
     endif
   else
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.0
-endif
-
-#    LDFLAGS         += `getconf LFS_LDFLAGS`
-#    DEF             += `getconf LFS_CFLAGS`
-
     LIBS            = -lstdc++
 #    DEF             += -W -Wall -fPIC -pipe -Woverloaded-virtual
     DEF             += -W -Wall -fPIC -pipe
Index: OpenSceneGraph/include/osg/Shader
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/include/osg/Shader,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -u -r1.1.1.2 -r1.1.1.2.2.1
--- OpenSceneGraph/include/osg/Shader	4 Oct 2006 08:07:18 -0000	1.1.1.2
+++ OpenSceneGraph/include/osg/Shader	4 Oct 2006 10:49:36 -0000	1.1.1.2.2.1
@@ -39,6 +39,8 @@
   * configuration.
   */
 
+class Program;
+
 class OSG_EXPORT Shader : public osg::Object
 {
     public:
Index: OpenSceneGraph/src/osgPlugins/gif/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	4 Oct 2006 08:01:33 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -5,15 +5,7 @@
 	ReaderWriterGIF.cpp\
 
 
-ifeq ($(OS),HP-UX)
 INC   += $(GIF_INCLUDE)
-else
-INC   += -I/usr/local/include\
-	 -I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-endif
-
 
 LIBS  += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS)
 
Index: OpenSceneGraph/src/osgPlugins/png/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/png/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/png/GNUmakefile	4 Oct 2006 08:01:34 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/png/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -5,14 +5,7 @@
         ReaderWriterPNG.cpp\
 
 LIBS  += $(OSG_LIBS) $(PNG_LIBS) $(OTHER_LIBS)
-ifneq ($(OS),HP-UX)
-INC  += -I/usr/local/include\
-	-I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-else
 INC += $(PNG_INCLUDE)
-endif
 
 TARGET_BASENAME = png
 include $(TOPDIR)/Make/cygwin_plugin_def
Index: OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	4 Oct 2006 08:01:34 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -6,12 +6,7 @@
 
 LIBS  += $(OSG_LIBS) $(TIFF_LIB) $(OTHER_LIBS)
 
-ifeq ($(OS),HP-UX)
 INC     += $(TIFF_INCLUDE)
-else
-INC     += -I/usr/local/include
-LDFLAGS += -L/usr/local/lib
-endif
 
 TARGET_BASENAME = tiff
 include $(TOPDIR)/Make/cygwin_plugin_def
Index: OpenThreads/Make/libdefs
===================================================================
RCS file: OpenThreads/Make/libdefs
diff -N OpenThreads/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ OpenThreads/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,3 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
Index: OpenThreads/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- OpenThreads/Make/makedefs	4 Oct 2006 10:12:04 -0000	1.1.1.3
+++ OpenThreads/Make/makedefs	4 Oct 2006 11:03:13 -0000	1.1.1.2.2.2
@@ -227,12 +227,6 @@
     ifeq (x$(CXX),x)
       CXX               = g++
     endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
-    ###DEF               += -fPIC
     OPTF              = -O2
     DBGF              = -ggdb -gstabs
     ifeq ($(SYSARCH),x86_64)
Index: OpenThreads/pthread_src/PThread.c++
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/pthread_src/PThread.c++,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.2 -r1.1.1.1.2.2
--- OpenThreads/pthread_src/PThread.c++	4 Oct 2006 10:12:04 -0000	1.1.1.2
+++ OpenThreads/pthread_src/PThread.c++	4 Oct 2006 11:03:13 -0000	1.1.1.1.2.2
@@ -572,27 +572,18 @@
 
     PThreadPrivateData *pd = static_cast<PThreadPrivateData *> (_prvData);
 
-    size_t defaultStackSize;
+    size_t defaultStackSize = 0;
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     if(defaultStackSize < pd->stackSize) {
 
 	pthread_attr_setstacksize( &thread_attr, pd->stackSize);
-	if(status != 0) {
-	    return status;
-	}
     }
 
     //-------------------------------------------------------------------------
     // Now get what we actually have...
     //
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     pd->stackSize = defaultStackSize;
 
Index: OpenThreads/pthread_src/PThreadPrivateData.h
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/pthread_src/PThreadPrivateData.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.2 -r1.1.1.1.2.2
--- OpenThreads/pthread_src/PThreadPrivateData.h	4 Oct 2006 10:12:04 -0000	1.1.1.2
+++ OpenThreads/pthread_src/PThreadPrivateData.h	4 Oct 2006 11:03:14 -0000	1.1.1.1.2.2
@@ -43,7 +43,7 @@
 
 private:
 
-    PThreadPrivateData() {};
+    PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {};
 
     virtual ~PThreadPrivateData() {};
 
Index: Producer/Make/libdefs
===================================================================
RCS file: Producer/Make/libdefs
diff -N Producer/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Producer/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
+
Index: Producer/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/Producer/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- Producer/Make/makedefs	4 Oct 2006 10:12:05 -0000	1.1.1.3
+++ Producer/Make/makedefs	4 Oct 2006 11:03:14 -0000	1.1.1.2.2.2
@@ -248,11 +248,6 @@
     ifeq (x$(CXX),x)
       CXX               = g++
     endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
     DEF               += -fPIC -pthread
     OPTF              = -O2
     DBGF              = -ggdb -gstabs
Index: Producer/include/Producer/Keyboard
===================================================================
RCS file: /var/cvs/local/OSG/Producer/include/Producer/Keyboard,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Producer/include/Producer/Keyboard	4 Oct 2006 08:01:36 -0000	1.1.1.1
+++ Producer/include/Producer/Keyboard	4 Oct 2006 10:49:37 -0000	1.1.1.1.2.1
@@ -539,6 +539,7 @@
         KeyboardKey    _key;
 };
 
+class KeyboardMouseImplementation;
 
 class PR_EXPORT Keyboard : public Producer::Referenced
 {
Index: debian/Doxyfile-openscenegraph
===================================================================
RCS file: debian/Doxyfile-openscenegraph
diff -N debian/Doxyfile-openscenegraph
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-openscenegraph	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = OpenSceneGraph
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = OpenSceneGraph/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = OpenSceneGraph/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/Doxyfile-openthreads
===================================================================
RCS file: debian/Doxyfile-openthreads
diff -N debian/Doxyfile-openthreads
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-openthreads	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = OpenThreads
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = OpenThreads/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = OpenThreads/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/Doxyfile-producer
===================================================================
RCS file: debian/Doxyfile-producer
diff -N debian/Doxyfile-producer
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-producer	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = Producer
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = Producer/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = Producer/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/osgexamples.1
===================================================================
RCS file: debian/osgexamples.1
diff -N debian/osgexamples.1
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/osgexamples.1	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,28 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH OpenSceneGraph 1 "2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+OpenSceneGraph examples \- set of examples program
+.SH SYNOPSIS
+.B program
+.RI --help
+.SH DESCRIPTION
+Use --help to figure out what the example does.
+See http://www.openscenegraph.org/ for more information.
+.SH AUTHOR
+This manual page was written by Loic Dachary <loic at gnu.org>
+for the Debian project (but may be used by others).



From fedora-extras-commits at redhat.com  Wed Oct  4 15:50:57 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 08:50:57 -0700
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.18,1.19
Message-ID: <200610041550.k94Fox2c014052@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14032

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
- Upstream update.
- Remove BR: flex bison.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- OpenSceneGraph.spec	5 Sep 2006 10:06:07 -0000	1.18
+++ OpenSceneGraph.spec	4 Oct 2006 15:50:57 -0000	1.19
@@ -5,11 +5,11 @@
 #
 
 %define apivers 1.0
-%define srcvers 1.1
+%define srcvers 1.2
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -21,7 +21,6 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	flex bison
 BuildRequires:  libGL-devel
 BuildRequires: 	libGLU-devel
 BuildRequires:	libXmu-devel
@@ -48,7 +47,7 @@
 
 %prep
 %setup -q -n OSG_OP_OT-%{srcvers}
-%patch0 -p1
+%patch0 -p0
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -392,7 +391,11 @@
 %{_includedir}/Producer
 
 %changelog
-* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - %{srcvers}-2
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
+- Upstream update.
+- Remove BR: flex bison.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.1-2
 - Mass rebuild.
 
 * Thu Aug 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.1-1



From fedora-extras-commits at redhat.com  Wed Oct  4 15:51:22 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 08:51:22 -0700
Subject: rpms/OpenSceneGraph/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <200610041551.k94FpO9k014082@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14063

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
- Upstream update.
- Remove BR: flex bison.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Oct 2006 15:35:56 -0000	1.6
+++ .cvsignore	4 Oct 2006 15:51:22 -0000	1.7
@@ -1,2 +1 @@
-OSG_OP_OT-1.1.zip
 OSG_OP_OT-1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Oct 2006 15:35:56 -0000	1.6
+++ sources	4 Oct 2006 15:51:22 -0000	1.7
@@ -1,2 +1 @@
-c140e0f53f577af6e807108dd1a8f65f  OSG_OP_OT-1.1.zip
 e08e0ef1f250dfc17122926ef00b1559  OSG_OP_OT-1.2.zip



From fedora-extras-commits at redhat.com  Wed Oct  4 16:04:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  4 Oct 2006 09:04:19 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.5,1.6
Message-ID: <200610041604.k94G4LAV017259@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17225

Modified Files:
	em8300-kmod.spec 
Log Message:
* Wed Oct  4 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.18-1.2726.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- em8300-kmod.spec	23 Sep 2006 08:43:18 -0000	1.5
+++ em8300-kmod.spec	4 Oct 2006 16:04:16 -0000	1.6
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2689.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.18-1.2726.fc6.
+
 * Sat Sep 23 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.18-1.2689.fc6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 16:16:27 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 09:16:27 -0700
Subject: rpms/perl-POE-Component-SimpleLog/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-SimpleLog.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610041616.k94GGTnA018130@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-SimpleLog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18078/devel

Modified Files:
	.cvsignore perl-POE-Component-SimpleLog.spec sources 
Log Message:
update to 1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 18:58:36 -0000	1.2
+++ .cvsignore	4 Oct 2006 16:16:27 -0000	1.3
@@ -1 +1 @@
-POE-Component-SimpleLog-1.03.tar.gz
+POE-Component-SimpleLog-1.04.tar.gz


Index: perl-POE-Component-SimpleLog.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/devel/perl-POE-Component-SimpleLog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-POE-Component-SimpleLog.spec	1 Sep 2006 04:20:47 -0000	1.3
+++ perl-POE-Component-SimpleLog.spec	4 Oct 2006 16:16:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-SimpleLog
-Version:        1.03        
-Release:        2%{?dist}
+Version:        1.04
+Release:        1%{?dist}
 Summary:        A simple logging system for POE 
 
 Group:          Development/Libraries
@@ -41,11 +41,12 @@
 
 %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' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -58,12 +59,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc README Changes examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Oct 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
+- update to 1.04
+- misc spec cleanup 
+- add Changes, examples/ to %%doc
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-2
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 18:58:36 -0000	1.2
+++ sources	4 Oct 2006 16:16:27 -0000	1.3
@@ -1 +1 @@
-fc5d648853b82364ba92fccd0326e0bd  POE-Component-SimpleLog-1.03.tar.gz
+56c77a892da0a823b6e9f8d2a13aaa0b  POE-Component-SimpleLog-1.04.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 16:16:21 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 09:16:21 -0700
Subject: rpms/perl-POE-Component-SimpleLog Makefile,1.1,1.2
Message-ID: <200610041616.k94GGrFj018136@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-SimpleLog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18078

Modified Files:
	Makefile 
Log Message:
update to 1.04



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	9 Jul 2006 18:58:28 -0000	1.1
+++ Makefile	4 Oct 2006 16:16:21 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 16:16:21 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 09:16:21 -0700
Subject: rpms/perl-POE-Component-SimpleLog/FC-5
	perl-POE-Component-SimpleLog.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610041616.k94GGreP018140@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-SimpleLog/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18078/FC-5

Modified Files:
	perl-POE-Component-SimpleLog.spec sources 
Log Message:
update to 1.04



Index: perl-POE-Component-SimpleLog.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/FC-5/perl-POE-Component-SimpleLog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-SimpleLog.spec	9 Jul 2006 19:06:59 -0000	1.2
+++ perl-POE-Component-SimpleLog.spec	4 Oct 2006 16:16:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-POE-Component-SimpleLog
-Version:        1.03        
+Version:        1.04
 Release:        1%{?dist}
 Summary:        A simple logging system for POE 
 
@@ -41,11 +41,12 @@
 
 %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' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -58,12 +59,20 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc README Changes examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Oct 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
+- update to 1.04
+- misc spec cleanup 
+- add Changes, examples/ to %%doc
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-2
+- bump for mass rebuild
+
 * Sun Jul  9 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-1
 - bump for build/release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 18:58:36 -0000	1.2
+++ sources	4 Oct 2006 16:16:21 -0000	1.3
@@ -1 +1 @@
-fc5d648853b82364ba92fccd0326e0bd  POE-Component-SimpleLog-1.03.tar.gz
+56c77a892da0a823b6e9f8d2a13aaa0b  POE-Component-SimpleLog-1.04.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 16:26:19 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:26:19 -0700
Subject: rpms/sysprof-kmod - New directory
Message-ID: <200610041626.k94GQLJw018346@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18320/sysprof-kmod

Log Message:
Directory /cvs/extras/rpms/sysprof-kmod added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 16:26:20 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:26:20 -0700
Subject: rpms/sysprof-kmod/devel - New directory
Message-ID: <200610041626.k94GQMbl018349@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18320/sysprof-kmod/devel

Log Message:
Directory /cvs/extras/rpms/sysprof-kmod/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 16:26:37 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:26:37 -0700
Subject: rpms/sysprof-kmod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610041626.k94GQdN6018398@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18365

Added Files:
	Makefile import.log 
Log Message:
Setup of module sysprof-kmod


--- NEW FILE Makefile ---
# Top level Makefile for module sysprof-kmod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct  4 16:26:38 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:26:38 -0700
Subject: rpms/sysprof-kmod/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610041626.k94GQefU018401@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18365/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sysprof-kmod


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct  4 16:27:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:27:26 -0700
Subject: rpms/sysprof-kmod import.log,1.1,1.2
Message-ID: <200610041627.k94GRSVQ018474@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18439

Modified Files:
	import.log 
Log Message:
auto-import sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6 on branch devel from sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Oct 2006 16:26:37 -0000	1.1
+++ import.log	4 Oct 2006 16:27:26 -0000	1.2
@@ -0,0 +1 @@
+sysprof-kmod-1_0_3-1_2_6_18_1_2689_fc6:HEAD:sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6.src.rpm:1159979236



From fedora-extras-commits at redhat.com  Wed Oct  4 16:27:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:27:26 -0700
Subject: rpms/sysprof-kmod/devel kmodtool, NONE,
	1.1 sysprof-avoid_depmod.patch, 
	NONE, 1.1 sysprof-kmod.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610041627.k94GRTsg018481@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18439/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kmodtool sysprof-avoid_depmod.patch sysprof-kmod.spec 
Log Message:
auto-import sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6 on branch devel from sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6.src.rpm


--- NEW FILE kmodtool ---
#!/bin/bash

# kmodtool - Helper script for building kernel module RPMs
# Copyright (c) 2003-2006 Ville Skytt?? <ville.skytta at iki.fi>,
#                         Thorsten Leemhuis <fedora at leemhuis.info>
#
# 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.

shopt -s extglob

myprog="kmodtool"
myver="0.10.11"
knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE))
kmod_name=
kver=
verrel=
variant=

get_verrel ()
{
  verrel=${1:-$(uname -r)}
  verrel=${verrel%%$knownvariants}
}

print_verrel ()
{
  get_verrel $@
  echo "${verrel}"
}

get_variant ()
{
  get_verrel $@
  variant=${1:-$(uname -r)}
  variant=${variant##$verrel}
  variant=${variant:-'""'}
}

print_variant ()
{
  get_variant $@
  echo "${variant}"
}


get_rpmtemplate ()
{
    local variant="${1}"
    local dashvariant="${variant:+-${variant}}"
    case "$verrel" in
        *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
        *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
    esac
    cat <<EOF
%package       -n kmod-${kmod_name}${dashvariant}
Summary:          ${kmod_name} kernel module(s)
Group:            System Environment/Kernel
Provides:         kernel-modules = ${verrel}${variant}
Provides:         ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         ${kdep}
Requires:         ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version}
Requires(post):   /sbin/depmod
Requires(postun): /sbin/depmod
BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
%description   -n kmod-${kmod_name}${dashvariant}
This package provides the ${kmod_name} kernel modules built for the Linux
kernel ${verrel}${variant} for the %{_target_cpu} family of processors.
%post          -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aeF /boot/System.map-${verrel}${variant} ${verrel}${variant} > /dev/null || :
%postun        -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
%files         -n kmod-${kmod_name}${dashvariant}
%defattr(644,root,root,755)
/lib/modules/${verrel}${variant}/extra/${kmod_name}/

EOF
}

print_rpmtemplate ()
{
  kmod_name="${1}"
  shift
  kver="${1}"
  get_verrel "${1}"
  shift
  if [ -z "${kmod_name}" ] ; then
    echo "Please provide the kmodule-name as first parameter." >&2
    exit 2
  elif [ -z "${kver}" ] ; then
    echo "Please provide the kver as second parameter." >&2
    exit 2
  elif [ -z "${verrel}" ] ; then
    echo "Couldn't find out the verrel." >&2
    exit 2
  fi

  for variant in "$@" ; do
    get_rpmtemplate "${variant}"
  done
}

usage ()
{
  cat <<EOF
You called: ${invocation}

Usage: ${myprog} <command> <option>+
 Commands:
  verrel <uname>                               
    - Get "base" version-release.
  variant <uname>                               
    - Get variant from uname.
  rpmtemplate <mainpgkname> <uname> <variants> 
    - Return a template for
  version  
    - Output version number and exit.
EOF
}

invocation="$(basename ${0}) $@"
while [ "${1}" ] ; do
  case "${1}" in
    verrel)
      shift
      print_verrel $@
      exit $?
      ;;
    variant)
      shift
      print_variant $@
      exit $?
      ;;
    rpmtemplate)
      shift
      print_rpmtemplate "$@"
      exit $?
      ;;
    version)
      echo "${myprog} ${myver}"
      exit 0
      ;;
    *)
      echo "Error: Unknown option '${1}'." >&2
      usage >&2
      exit 2
      ;;
  esac
done

# Local variables:
# mode: sh
# sh-indentation: 2
# indent-tabs-mode: nil
# End:
# ex: ts=2 sw=2 et

sysprof-avoid_depmod.patch:

--- NEW FILE sysprof-avoid_depmod.patch ---
Index: sysprof-1.0.2/module/Makefile
===================================================================
--- sysprof-1.0.2.orig/module/Makefile
+++ sysprof-1.0.2/module/Makefile
@@ -43,7 +43,6 @@ distdir:
 
 install:
 	$(KMAKE) modules_install
-	[ -e /sbin/depmod ] && /sbin/depmod
 
 install-data:
 install-exec:


--- NEW FILE sysprof-kmod.spec ---
# stuff to be implemented externally:
Source10: kmodtool
%define   kmodtool bash %{SOURCE10}
# end stuff to be ...

# hardcode for now:
%{!?kversion: %define kversion 2.6.18-1.2689.fc6}
# hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
# --define "kversion 2.6.16-1.2096_FC5"

%define kmod_name sysprof
%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)

%ifarch i686
%define pae PAE
%endif
%ifarch ppc
%define smp smp
%endif
%ifarch i686 x86_64 ia64
%define xen xen
%endif
%ifarch i686 x86_64 ppc64 ppc64iseries
%define kdump kdump
%endif
%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump}}
# hint: this can he overridden with "--define kvariant foo bar" on the rpmbuild command line, e.g.
# --define 'kvariant "" smp' 


Name:           %{kmod_name}-kmod
Version:        1.0.3
Release:        1.%(echo %{kverrel} | tr - _)
Summary:        Sysprof kernel module

Group:          System Environment/Kernel
License:        GPL
URL:            http://www.daimi.au.dk/~sandmann/sysprof/
Source0:        http://www.daimi.au.dk/~sandmann/sysprof/sysprof-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         %{kmod_name}-avoid_depmod.patch

ExclusiveArch:  i586 i686 x86_64 ppc


%description
Sysprof is a sampling CPU profiler for Linux that uses a
kernel module to profile the entire system, not just a 
single application. Sysprof handles shared libraries and 
applications do not need to be recompiled. In fact they 
don't even have to be restarted. 


# magic hidden here:
%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}

%prep
# to understand the magic better or to debug it, uncomment this:
#{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null
#sleep 5

%setup -q -c -T -a 0
pushd %{kmod_name}-%{version}*
%patch0 -p1 -b .patch0
# configure script breaks in mock builds (missing BRs), so we create here 
# a config.h with the needed symbol
echo '#define PACKAGE_VERSION "%{version}"' > config.h
popd

for kvariant in %{kvariants} ; do
    cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
done


%build
for kvariant in %{kvariants}
do
    ksrc=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
    cd _kmod_build_$kvariant/module
    make KDIR="${ksrc}" 
    cd ../..
done


%install
rm -rf $RPM_BUILD_ROOT
for kvariant in %{kvariants}
do
    cd _kmod_build_$kvariant/module
    ksrc=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
    export INSTALL_MOD_DIR=extra/%{kmod_name}
    export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
    make KDIR=${ksrc} install 
    cd ../..
done
# Temporarily executable for stripping, fixed later in %%files.
chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
- version update
- fixed rpmlint warning about summary 

* Sat May 13 2006 Gianluca Sforna <giallu gmail com> 1.0.2-2
- removed some unnecessary diffs from the template spec

* Sat May 13 2006 Gianluca Sforna <giallu gmail com> 1.0.2-1
- Initial Version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2006 16:26:38 -0000	1.1
+++ .cvsignore	4 Oct 2006 16:27:26 -0000	1.2
@@ -0,0 +1 @@
+sysprof-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2006 16:26:38 -0000	1.1
+++ sources	4 Oct 2006 16:27:26 -0000	1.2
@@ -0,0 +1 @@
+8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 16:37:46 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:37:46 -0700
Subject: owners owners.list,1.1773,1.1774
Message-ID: <200610041637.k94GbmuN018636@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18619

Modified Files:
	owners.list 
Log Message:
Add sysprof and sysprof-kmod



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1773
retrieving revision 1.1774
diff -u -r1.1773 -r1.1774
--- owners.list	4 Oct 2006 14:21:58 -0000	1.1773
+++ owners.list	4 Oct 2006 16:37:46 -0000	1.1774
@@ -2089,6 +2089,8 @@
 Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|sysconftool|Macros for aclocal to install configuration files|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|sysprof|A sampling CPU profiler|giallu at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|sysprof-kmod|Sysprof kernel module|giallu at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ankit644 at yahoo.com
 Fedora Extras|t1lib|PostScript Type 1 font rasterizer|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt



From fedora-extras-commits at redhat.com  Wed Oct  4 16:43:00 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed,  4 Oct 2006 09:43:00 -0700
Subject: rpms/php-pear-Console-Getargs/devel .cvsignore, 1.2,
	1.3 php-pear-Console-Getargs.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610041643.k94Gh2rD018762@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18741

Modified Files:
	.cvsignore php-pear-Console-Getargs.spec sources 
Log Message:
	update to 1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2006 12:38:04 -0000	1.2
+++ .cvsignore	4 Oct 2006 16:43:00 -0000	1.3
@@ -1 +1 @@
-Console_Getargs-1.3.1.tgz
+Console_Getargs-1.3.2.tgz


Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/php-pear-Console-Getargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Console-Getargs.spec	1 Oct 2006 12:38:04 -0000	1.1
+++ php-pear-Console-Getargs.spec	4 Oct 2006 16:43:00 -0000	1.2
@@ -2,7 +2,7 @@
 %define pear_name Console_Getargs
 
 Name:           php-pear-Console-Getargs
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
@@ -82,6 +82,9 @@
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Wed Oct  4 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
+- update to 1.3.2
+
 * Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
 - generated specfile (pear make-rpm-spec) + cleaning
 - generated CHANGELOG


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2006 12:38:04 -0000	1.2
+++ sources	4 Oct 2006 16:43:00 -0000	1.3
@@ -1 +1 @@
-67b5918343fa24f3e311d159e168b5dc  Console_Getargs-1.3.1.tgz
+de2421c4d6409d84678d07afa2b59651  Console_Getargs-1.3.2.tgz



From fedora-extras-commits at redhat.com  Wed Oct  4 16:44:39 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed,  4 Oct 2006 09:44:39 -0700
Subject: rpms/php-pear-Console-Getargs/FC-5 .cvsignore, 1.2,
	1.3 php-pear-Console-Getargs.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610041644.k94Gifso018834@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18813

Modified Files:
	.cvsignore php-pear-Console-Getargs.spec sources 
Log Message:
	update to 1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2006 12:38:04 -0000	1.2
+++ .cvsignore	4 Oct 2006 16:44:38 -0000	1.3
@@ -1 +1 @@
-Console_Getargs-1.3.1.tgz
+Console_Getargs-1.3.2.tgz


Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/php-pear-Console-Getargs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Console-Getargs.spec	2 Oct 2006 06:12:12 -0000	1.2
+++ php-pear-Console-Getargs.spec	4 Oct 2006 16:44:38 -0000	1.3
@@ -2,8 +2,8 @@
 %define pear_name Console_Getargs
 
 Name:           php-pear-Console-Getargs
-Version:        1.3.1
-Release:        1%{?dist}.1
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
 
@@ -82,6 +82,9 @@
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Wed Oct  4 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
+- update to 1.3.2
+
 * Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
 - generated specfile (pear make-rpm-spec) + cleaning
 - generated CHANGELOG


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2006 12:38:04 -0000	1.2
+++ sources	4 Oct 2006 16:44:38 -0000	1.3
@@ -1 +1 @@
-67b5918343fa24f3e311d159e168b5dc  Console_Getargs-1.3.1.tgz
+de2421c4d6409d84678d07afa2b59651  Console_Getargs-1.3.2.tgz



From fedora-extras-commits at redhat.com  Wed Oct  4 17:02:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  4 Oct 2006 10:02:30 -0700
Subject: rpms/scribus/devel .cvsignore, 1.11, 1.12 scribus.spec, 1.22,
	1.23 sources, 1.11, 1.12
Message-ID: <200610041703.k94H35EN021780@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21751

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Sep 2006 14:12:03 -0000	1.11
+++ .cvsignore	4 Oct 2006 17:02:30 -0000	1.12
@@ -1 +1 @@
-scribus-1.3.3.3.tar.bz2
+scribus-1.3.3.4.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scribus.spec	15 Sep 2006 14:12:03 -0000	1.22
+++ scribus.spec	4 Oct 2006 17:02:30 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           scribus
-Version:        1.3.3.3
+Version:        1.3.3.4
 Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
@@ -7,7 +7,7 @@
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://dl.sf.net/scribus/scribus-1.3.3.3.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.3.4.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +136,10 @@
 %{_includedir}/scribus/
 
 %changelog
+* Wed Oct 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.4-1
+- version upgrade
+
 * Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.3.3.3-1
 - version upgrade (#205962)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Sep 2006 14:12:03 -0000	1.11
+++ sources	4 Oct 2006 17:02:30 -0000	1.12
@@ -1 +1 @@
-cde9a4342697a69de60b017f59d32488  scribus-1.3.3.3.tar.bz2
+ccd7fb34a77b7e3d83e902fb3f5b731b  scribus-1.3.3.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 17:34:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 10:34:25 -0700
Subject: rpms/perl-Error/FC-5 .cvsignore, 1.9, 1.10 perl-Error.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200610041734.k94HYRqY022055@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22017/FC-5

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17005.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2006 18:40:52 -0000	1.9
+++ .cvsignore	4 Oct 2006 17:34:25 -0000	1.10
@@ -1 +1 @@
-Error-0.17004.tar.gz
+Error-0.17005.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/perl-Error.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Error.spec	4 Sep 2006 18:40:52 -0000	1.13
+++ perl-Error.spec	4 Oct 2006 17:34:25 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17004
+Version:        0.17005
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17005-1
+- Update to 0.17005.
+
 * Mon Sep  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17004-1
 - Update to 0.17004.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 18:40:52 -0000	1.9
+++ sources	4 Oct 2006 17:34:25 -0000	1.10
@@ -1 +1 @@
-4dfca8732331a4f79c6803c3bc6b722f  Error-0.17004.tar.gz
+59579d2eb0c5cae5d102db2b1110f875  Error-0.17005.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 17:34:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 10:34:26 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.9, 1.10 perl-Error.spec, 1.13, 
	1.14 sources, 1.9, 1.10
Message-ID: <200610041734.k94HYSEA022061@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22017/devel

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17005.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2006 18:40:53 -0000	1.9
+++ .cvsignore	4 Oct 2006 17:34:25 -0000	1.10
@@ -1 +1 @@
-Error-0.17004.tar.gz
+Error-0.17005.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Error.spec	4 Sep 2006 18:40:53 -0000	1.13
+++ perl-Error.spec	4 Oct 2006 17:34:25 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17004
+Version:        0.17005
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17005-1
+- Update to 0.17005.
+
 * Mon Sep  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17004-1
 - Update to 0.17004.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 18:40:53 -0000	1.9
+++ sources	4 Oct 2006 17:34:25 -0000	1.10
@@ -1 +1 @@
-4dfca8732331a4f79c6803c3bc6b722f  Error-0.17004.tar.gz
+59579d2eb0c5cae5d102db2b1110f875  Error-0.17005.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 18:03:09 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 11:03:09 -0700
Subject: owners owners.list,1.1774,1.1775
Message-ID: <200610041803.k94I3CBk025146@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25129

Modified Files:
	owners.list 
Log Message:
Orphan xffm 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1774
retrieving revision 1.1775
diff -u -r1.1774 -r1.1775
--- owners.list	4 Oct 2006 16:37:46 -0000	1.1774
+++ owners.list	4 Oct 2006 18:03:09 -0000	1.1775
@@ -2324,7 +2324,7 @@
 Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfdesktop|Desktop Manger for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xffm|Next generation filemanager and SMB network navigator for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xffm|Next generation filemanager and SMB network navigator for Xfce4|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xforms|An X11 toolkit library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|xfprint|Print dialog and printer manager for Xfce 4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfsdump|Backup and restore utilities for XFS filesystems|cattelan at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 18:03:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 11:03:36 -0700
Subject: rpms/uw-imap/devel uw-imap.spec,1.16,1.17
Message-ID: <200610041804.k94I48hC025174@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25152

Modified Files:
	uw-imap.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
- libc-client: move c-client.cf here
- c-client.cf: +set new-folder-format same-as-inbox



Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- uw-imap.spec	26 Sep 2006 20:29:56 -0000	1.16
+++ uw-imap.spec	4 Oct 2006 18:03:36 -0000	1.17
@@ -1,19 +1,15 @@
 
-# Change the default connected directory from the user's home directory
-# to the named subdirectory of the user's home directory
-%define mail_subdirectory      Mail
-
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source:	 ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -25,27 +21,30 @@
 #define imap_libs	imap-libs
 
 # FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs
-%define sslcerts  %{expand:%(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)}
+%global sslcerts  %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)
 
 # imap -> uw-imap rename
 Obsoletes: imap < 1:%{version}
 
+Source10: c-client.cf
+
 # legacy/old pam setup, using pam_stack.so
-Source1: imap-legacy.pam
+Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source2: imap.pam
-Source3: imap-xinetd
-Source4: ipop2-xinetd
-Source5: ipop3-xinetd
-Source6: imaps-xinetd
-Source7: pop3s-xinetd
+Source22: imap.pam
+
+Source31: imap-xinetd
+Source32: ipop2-xinetd
+Source33: ipop3-xinetd
+Source34: imaps-xinetd
+Source35: pop3s-xinetd
+
 
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
 Patch9: imap-2002e-shared.patch
 Patch10: imap-2002e-authmd5.patch
-Patch11: imap-2006-mixproto.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -54,7 +53,6 @@
 # Prereq is shorter than separate Requires, Requires(post), Requires(postun)
 Prereq: xinetd
 Requires(post): openssl
-Requires(triggerpostun): sed >= 4.0
 
 %description
 The %{name} package provides UW server daemons for both the IMAP (Internet
@@ -112,14 +110,11 @@
 
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
-# use mix (instead of unix/mbox) folder format by default
-# its faster, allows (better) locking
-%patch11 -p1 -b .mixproto
 
-%if "%{?fedora}" > "4" || "%{?rhel}" > "5"
-install -p -m644 %{SOURCE2} imap.pam
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+install -p -m644 %{SOURCE21} imap.pam
 %else
-install -p -m644 %{SOURCE1} imap.pam
+install -p -m644 %{SOURCE22} imap.pam
 %endif
 
 
@@ -155,8 +150,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/
+
+%if "%{?_with_static:1}" == "1"
 install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/
 ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a
+%endif
 
 install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/
 ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so
@@ -182,25 +180,17 @@
 install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/imap
 install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pop
 
-install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap
-install -p -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps
-install -p -m644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2
-install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
-install -p -m644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
+install -p -m644 -D %{SOURCE31} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap
+install -p -m644 -D %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps
+install -p -m644 -D %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2
+install -p -m644 -D %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
+install -p -m644 -D %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
 
-# Generate ghost *.pem files
+# %ghost *.pem files
 mkdir -p $RPM_BUILD_ROOT%{sslcerts}/
 touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem
 
-# c-client.cf: mail_subdirectory
-cat > c-client.cf <<EOF
-I accept the risk of using UW-IMAP
-set mail-subdirectory %{mail_subdirectory}
-EOF
-install -p -m644 -D c-client.cf $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
-
-# include/omit static lib?
-%{!?_with_static:rm -f $RPM_BUILD_ROOT%{_libdir}/*.a }
+install -p -m644 -D %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
 
 # FIXME, do this on daemon startup -- Rex
@@ -234,15 +224,6 @@
 
 %postun -n %{imap_libs} -p /sbin/ldconfig
 
-%triggerpostun -- imap < 1:2004
-#if upgrading from old version, don't change/set (default) MailDir
-if [ -f %{_sysconfdir}/c-client.cf ]; then
-  if grep -q "^set mail-subdirectory %{mail_subdirectory}" %{_sysconfdir}/c-client.cf; then
-    sed -i -e 's/^set mail-subdirectory/\#set mail-subdirectory/g' \
-      %{_sysconfdir}/c-client.cf
-  fi
-fi
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -256,12 +237,11 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
-# These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s will fail after an upgrade
+# These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
 %config %{_sysconfdir}/xinetd.d/imaps
 %config %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
-%config(noreplace) %{_sysconfdir}/c-client.cf
 %{_mandir}/man8/*
 %{_sbindir}/ipop2d
 %{_sbindir}/ipop3d
@@ -277,6 +257,7 @@
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
+%config(noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
@@ -293,6 +274,13 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
+- libc-client: move c-client.cf here
+- c-client.cf: +set new-folder-format same-as-inbox
+
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-2
+- omit mixproto patch (lvn bug #1184)
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-1
 - imap-2006a
 - omit static lib (for now, at least)



From fedora-extras-commits at redhat.com  Wed Oct  4 18:04:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 11:04:13 -0700
Subject: rpms/uw-imap/devel c-client.cf,NONE,1.1
Message-ID: <200610041804.k94I4FSS025196@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25180

Added Files:
	c-client.cf 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
- libc-client: move c-client.cf here
- c-client.cf: +set new-folder-format same-as-inbox



--- NEW FILE c-client.cf ---
I accept the risk of using UW-IMAP
set new-folder-format same-as-inbox
set mail-subdirectory Mail 



From fedora-extras-commits at redhat.com  Wed Oct  4 18:11:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 11:11:55 -0700
Subject: rpms/uw-imap/FC-5 c-client.cf,NONE,1.1 uw-imap.spec,1.11,1.12
Message-ID: <200610041811.k94IBvmj025389@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25371

Modified Files:
	uw-imap.spec 
Added Files:
	c-client.cf 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
- libc-client: move c-client.cf here
- c-client.cf: +set new-folder-format same-as-inbox



--- NEW FILE c-client.cf ---
I accept the risk of using UW-IMAP
set new-folder-format same-as-inbox
set mail-subdirectory Mail 


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- uw-imap.spec	29 Sep 2006 18:02:19 -0000	1.11
+++ uw-imap.spec	4 Oct 2006 18:11:55 -0000	1.12
@@ -1,19 +1,15 @@
 
-# Change the default connected directory from the user's home directory
-# to the named subdirectory of the user's home directory
-%define mail_subdirectory      Mail
-
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source:	 ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -25,27 +21,30 @@
 #define imap_libs	imap-libs
 
 # FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs
-%define sslcerts  %{expand:%(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)}
+%global sslcerts  %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)
 
 # imap -> uw-imap rename
 Obsoletes: imap < 1:%{version}
 
+Source10: c-client.cf
+
 # legacy/old pam setup, using pam_stack.so
-Source1: imap-legacy.pam
+Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source2: imap.pam
-Source3: imap-xinetd
-Source4: ipop2-xinetd
-Source5: ipop3-xinetd
-Source6: imaps-xinetd
-Source7: pop3s-xinetd
+Source22: imap.pam
+
+Source31: imap-xinetd
+Source32: ipop2-xinetd
+Source33: ipop3-xinetd
+Source34: imaps-xinetd
+Source35: pop3s-xinetd
+
 
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
 Patch9: imap-2002e-shared.patch
 Patch10: imap-2002e-authmd5.patch
-Patch11: imap-2006-mixproto.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -54,7 +53,6 @@
 # Prereq is shorter than separate Requires, Requires(post), Requires(postun)
 Prereq: xinetd
 Requires(post): openssl
-Requires(triggerpostun): sed >= 4.0
 
 %description
 The %{name} package provides UW server daemons for both the IMAP (Internet
@@ -112,14 +110,11 @@
 
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
-# use mix (instead of unix/mbox) folder format by default
-# its faster, allows (better) locking
-%patch11 -p1 -b .mixproto
 
-%if "%{?fedora}" > "4" || "%{?rhel}" > "5"
-install -p -m644 %{SOURCE2} imap.pam
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+install -p -m644 %{SOURCE21} imap.pam
 %else
-install -p -m644 %{SOURCE1} imap.pam
+install -p -m644 %{SOURCE22} imap.pam
 %endif
 
 
@@ -155,8 +150,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/
+
+%if "%{?_with_static:1}" == "1"
 install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/
 ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a
+%endif
 
 install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/
 ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so
@@ -182,25 +180,17 @@
 install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/imap
 install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pop
 
-install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap
-install -p -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps
-install -p -m644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2
-install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
-install -p -m644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
+install -p -m644 -D %{SOURCE31} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap
+install -p -m644 -D %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps
+install -p -m644 -D %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2
+install -p -m644 -D %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
+install -p -m644 -D %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
 
-# Generate ghost *.pem files
+# %ghost *.pem files
 mkdir -p $RPM_BUILD_ROOT%{sslcerts}/
 touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem
 
-# c-client.cf: mail_subdirectory
-cat > c-client.cf <<EOF
-I accept the risk of using UW-IMAP
-set mail-subdirectory %{mail_subdirectory}
-EOF
-install -p -m644 -D c-client.cf $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
-
-# include/omit static lib?
-%{!?_with_static:rm -f $RPM_BUILD_ROOT%{_libdir}/*.a }
+install -p -m644 -D %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
 
 # FIXME, do this on daemon startup -- Rex
@@ -234,15 +224,6 @@
 
 %postun -n %{imap_libs} -p /sbin/ldconfig
 
-%triggerpostun -- imap < 1:2004
-#if upgrading from old version, don't change/set (default) MailDir
-if [ -f %{_sysconfdir}/c-client.cf ]; then
-  if grep -q "^set mail-subdirectory %{mail_subdirectory}" %{_sysconfdir}/c-client.cf; then
-    sed -i -e 's/^set mail-subdirectory/\#set mail-subdirectory/g' \
-      %{_sysconfdir}/c-client.cf
-  fi
-fi
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -256,12 +237,11 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
-# These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s will fail after an upgrade
+# These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
 %config %{_sysconfdir}/xinetd.d/imaps
 %config %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
-%config(noreplace) %{_sysconfdir}/c-client.cf
 %{_mandir}/man8/*
 %{_sbindir}/ipop2d
 %{_sbindir}/ipop3d
@@ -277,6 +257,7 @@
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
+%config(noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
@@ -293,6 +274,13 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
+- libc-client: move c-client.cf here
+- c-client.cf: +set new-folder-format same-as-inbox
+
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-2
+- omit mixproto patch (lvn bug #1184)
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-1
 - imap-2006a
 - omit static lib (for now, at least)



From fedora-extras-commits at redhat.com  Wed Oct  4 18:17:49 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 11:17:49 -0700
Subject: rpms/xffm/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE sources,
	1.4, NONE xffm-4.0.5-rpath.patch, 1.1,
	NONE xffm-4.2.0-menu.patch, 1.1, NONE xffm-4.2.0-rpath.patch,
	1.1, NONE xffm-4.2.1-static.patch, 1.1,
	NONE xffm-4.2.2-menu.patch, 1.1, NONE xffm-4.2.2-rpath.patch,
	1.1, NONE xffm-4.2.3-menu.patch, 1.1, NONE xffm.spec, 1.14, NONE
Message-ID: <200610041817.k94IHpXj025503@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25485

Added Files:
	dead.package 
Removed Files:
	Makefile sources xffm-4.0.5-rpath.patch xffm-4.2.0-menu.patch 
	xffm-4.2.0-rpath.patch xffm-4.2.1-static.patch 
	xffm-4.2.2-menu.patch xffm-4.2.2-rpath.patch 
	xffm-4.2.3-menu.patch xffm.spec 
Log Message:
Orphan xffm. Current version needs to be removed before Xfce 4.4 landing



--- NEW FILE dead.package ---
No longer in Xfce core. 
Upstream has changed dramatically. 
Package would need to be totally revamped, and perhaps split to the 
17 new packages that upstream produces. 


--- Makefile DELETED ---


--- sources DELETED ---


--- xffm-4.0.5-rpath.patch DELETED ---


--- xffm-4.2.0-menu.patch DELETED ---


--- xffm-4.2.0-rpath.patch DELETED ---


--- xffm-4.2.1-static.patch DELETED ---


--- xffm-4.2.2-menu.patch DELETED ---


--- xffm-4.2.2-rpath.patch DELETED ---


--- xffm-4.2.3-menu.patch DELETED ---


--- xffm.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 19:19:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:19:25 -0700
Subject: rpms/exiv2/devel exiv2-0.11-pkgconfig.patch, 1.1, 1.2 exiv2.spec,
	1.6, 1.7
Message-ID: <200610041919.k94JJRF4028783@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/exiv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28759

Modified Files:
	exiv2-0.11-pkgconfig.patch exiv2.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11-3
- respin


exiv2-0.11-pkgconfig.patch:

Index: exiv2-0.11-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/exiv2-0.11-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exiv2-0.11-pkgconfig.patch	19 Sep 2006 19:06:40 -0000	1.1
+++ exiv2-0.11-pkgconfig.patch	4 Oct 2006 19:19:25 -0000	1.2
@@ -1,12 +1,10 @@
 --- exiv2-0.11/config/exiv2.pc.in.pkgconfig	2006-06-15 02:27:50.000000000 -0500
-+++ exiv2-0.11/config/exiv2.pc.in	2006-09-19 13:54:00.000000000 -0500
-@@ -6,6 +6,7 @@
- Name: exiv2
++++ exiv2-0.11/config/exiv2.pc.in	2006-10-02 09:32:32.000000000 -0500
+@@ -7,5 +7,6 @@
  Description: Exif and IPTC metadata library and tools
  Version: @PACKAGE_VERSION@
--URL: http://www.exiv2.org
+ URL: http://www.exiv2.org
 -Libs: -L${libdir} -lexiv2 @LIBS@
-+#URL: http://www.exiv2.org
 +Libs: -L${libdir} -lexiv2
 +Libs.private: @LIBS@
  Cflags: -I${includedir}


Index: exiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- exiv2.spec	19 Sep 2006 19:21:34 -0000	1.6
+++ exiv2.spec	4 Oct 2006 19:19:25 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
 Version: 0.11
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -14,6 +14,7 @@
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
+# http://dev.robotbattle.com/bugs/view.php?id=489
 Patch3: exiv2-0.11-pkgconfig.patch
 
 
@@ -96,6 +97,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11-3
+- respin
+
 * Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11-2
 - BR: zlib-devel
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:20:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:20:46 -0700
Subject: rpms/libpqxx/devel libpqxx.spec,1.10,1.11
Message-ID: <200610041920.k94JKm7c028855@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28838

Modified Files:
	libpqxx.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-2 
- respin



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libpqxx.spec	20 Sep 2006 19:09:14 -0000	1.10
+++ libpqxx.spec	4 Oct 2006 19:20:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libpqxx
 Version:        2.6.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -36,7 +36,7 @@
 %setup -q
 
 %if "%{?fedora}" > "5"
-%patch1 -p1 -b .visibility
+#patch1 -p1 -b .visibility
 %endif
 
 %build
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-2 
+- respin
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-1
 - fc6+: drop -Werror (for now) 
 - include %%check section (not used, by default)



From fedora-extras-commits at redhat.com  Wed Oct  4 19:21:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:21:43 -0700
Subject: rpms/jasper/devel jasper.spec,1.16,1.17
Message-ID: <200610041921.k94JLjcu028925@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28908

Modified Files:
	jasper.spec 
Log Message:
respin



Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jasper.spec	18 Sep 2006 20:49:57 -0000	1.16
+++ jasper.spec	4 Oct 2006 19:21:42 -0000	1.17
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 15%{?dist}
+Release: 15%{?dist}.2
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"
@@ -37,11 +37,8 @@
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -124,6 +121,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
 - memory leak (#207006)
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:22:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:22:26 -0700
Subject: rpms/wxMaxima/devel wxMaxima.spec,1.3,1.4
Message-ID: <200610041922.k94JMSLp028986@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28969

Modified Files:
	wxMaxima.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- respin



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wxMaxima.spec	25 Sep 2006 16:41:48 -0000	1.3
+++ wxMaxima.spec	4 Oct 2006 19:22:26 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a
 - Requires: maxima >= 5.10



From fedora-extras-commits at redhat.com  Wed Oct  4 19:23:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:23:38 -0700
Subject: rpms/kphotoalbum/devel kphotoalbum.spec,1.5,1.6
Message-ID: <200610041923.k94JNeol029047@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kphotoalbum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29030

Modified Files:
	kphotoalbum.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.2-6
- respin
- drop deprecated Provides: kimdaba



Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kphotoalbum.spec	19 Sep 2006 19:28:07 -0000	1.5
+++ kphotoalbum.spec	4 Oct 2006 19:23:38 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -11,7 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kimdaba < %{version}
-Provides:  kimdaba = %{version}
+#Provides:  kimdaba = %{version}
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -109,6 +109,10 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.2-6
+- respin
+- drop deprecated Provides: kimdaba
+
 * Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.2-5
 - BR: exiv2-devel >= 0.11
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:37:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:37:03 -0700
Subject: rpms/libpqxx/devel libpqxx.spec,1.11,1.12
Message-ID: <200610041937.k94Jb5Tb029165@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29148

Modified Files:
	libpqxx.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-3
- respin



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libpqxx.spec	4 Oct 2006 19:20:46 -0000	1.11
+++ libpqxx.spec	4 Oct 2006 19:37:03 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libpqxx
 Version:        2.6.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -36,7 +36,7 @@
 %setup -q
 
 %if "%{?fedora}" > "5"
-#patch1 -p1 -b .visibility
+%patch1 -p1 -b .visibility
 %endif
 
 %build
@@ -78,7 +78,7 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-2 
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-3
 - respin
 
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-1



From fedora-extras-commits at redhat.com  Wed Oct  4 19:37:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:37:49 -0700
Subject: rpms/PyKDE/devel PyKDE.spec,1.4,1.5
Message-ID: <200610041937.k94Jbp0b029232@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29214

Modified Files:
	PyKDE.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.16.0-2 
- respin



Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PyKDE.spec	26 Sep 2006 20:19:02 -0000	1.4
+++ PyKDE.spec	4 Oct 2006 19:37:49 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.16.0-2 
+- respin
+
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.16.0-1
 - 3.16.0
 - no longer own %%_datadir/sip, sip-devel does now (#206633)



From fedora-extras-commits at redhat.com  Wed Oct  4 19:38:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:38:54 -0700
Subject: rpms/koffice/devel koffice.spec,1.41,1.42
Message-ID: <200610041938.k94Jcv64029306@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29289

Modified Files:
	koffice.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- 1.5.3-3
- respin



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- koffice.spec	20 Sep 2006 19:34:48 -0000	1.41
+++ koffice.spec	4 Oct 2006 19:38:54 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -786,6 +786,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- 1.5.3-3
+- respin
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - 1.5.2-2
 - drop deprecated patches



From fedora-extras-commits at redhat.com  Wed Oct  4 19:42:57 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:42:57 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.11, 1.12 gnupg2.spec, 1.45,
	1.46 sources, 1.12, 1.13
Message-ID: <200610041942.k94Jgxhr029405@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29384

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-8
- respin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 20:16:09 -0000	1.11
+++ .cvsignore	4 Oct 2006 19:42:57 -0000	1.12
@@ -1,2 +1,3 @@
 gnupg-1.9.23.tar.bz2
 gnupg-1.9.23.tar.bz2.sig
+gnupg-1.9.91.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnupg2.spec	26 Sep 2006 20:16:09 -0000	1.45
+++ gnupg2.spec	4 Oct 2006 19:42:57 -0000	1.46
@@ -11,16 +11,13 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.23
-Release: 1%{?dist}
+Version: 1.9.22
+Release: 8%{?dist}
 
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
-#use mirror(s), since the primary site hardly ever works anymore
-#Source0: http://mirrors.rootmode.com/ftp.gnupg.org/alpha/gnupg/gnupg-%{version}.tar.bz2
-#Source1: http://mirrors.rootmode.com/ftp.gnupg.org/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +38,7 @@
 BuildRequires: libksba-devel >= 1.0.0
 
 BuildRequires: gettext
+BuildRequires: readline-devel ncurses-devel
 BuildRequires: openldap-devel
 BuildRequires: libusb-devel
 BuildRequires: pth-devel
@@ -100,7 +98,8 @@
   --disable-dependency-tracking \
   %{?_enable_gpg}
 
-make %{?_smp_mflags}
+# not smp-safe
+make 
 
 
 %check ||:
@@ -167,8 +166,14 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-8
+- respin
+
+* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.90-1
+- 1.9.90 (doesn't build, not released)
+
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.23-1
-- 1.9.23
+- 1.9.23 (doesn't build, not released)
 
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-7
 - gpg-agent-startup.sh: fix case where valid .gpg-agent-info exists


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Sep 2006 20:16:09 -0000	1.12
+++ sources	4 Oct 2006 19:42:57 -0000	1.13
@@ -1,2 +1,3 @@
+ccea28fbab26bcb01890f2687d71f900  gnupg-1.9.22.tar.bz2
+02ef9a70cfa097cfe11b33600adc2b72  gnupg-1.9.22.tar.bz2.sig
 916de7ac125b31c5df517c068ac51ecf  gnupg-1.9.23.tar.bz2.sig
-8d6208943862e4e654d326b24d96e2ae  gnupg-1.9.23.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 19:44:29 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:44:29 -0700
Subject: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec, 1.11,
	1.12
Message-ID: <200610041944.k94JiVYR029477@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29456

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8 
- respin



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdemultimedia-extras.spec	26 Sep 2006 18:58:40 -0000	1.11
+++ kdemultimedia-extras.spec	4 Oct 2006 19:44:29 -0000	1.12
@@ -67,7 +67,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.4
-Release: 7%{?dist}%{?kde}
+Release: 8%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -469,6 +469,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8 
+- respin
+
 * Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
 - -extras: drop --with-musicbrainz (for now)
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:48:21 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 12:48:21 -0700
Subject: rpms/banner/devel banner.spec,1.3,1.4
Message-ID: <200610041948.k94JmNop029556@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/banner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29539

Modified Files:
	banner.spec 
Log Message:

Bump-n-build



Index: banner.spec
===================================================================
RCS file: /cvs/extras/rpms/banner/devel/banner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- banner.spec	19 Sep 2006 11:35:29 -0000	1.3
+++ banner.spec	4 Oct 2006 19:48:21 -0000	1.4
@@ -2,7 +2,7 @@
 Summary:		Prints a short string to the console in very large letters
 
 Version:		1.3.1
-Release:		3%{?dist}
+Release:		4%{?dist}
 
 Group:			Applications/Text
 License:		GPL
@@ -37,6 +37,9 @@
 %{_bindir}/banner
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.3.1-4
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.3.1-3
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:49:24 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 12:49:24 -0700
Subject: rpms/libdnet/devel libdnet.spec,1.3,1.4
Message-ID: <200610041949.k94JnQJ5029622@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/libdnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29602

Modified Files:
	libdnet.spec 
Log Message:

Bump-n-build



Index: libdnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libdnet/devel/libdnet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libdnet.spec	19 Sep 2006 15:01:34 -0000	1.3
+++ libdnet.spec	4 Oct 2006 19:49:24 -0000	1.4
@@ -2,7 +2,7 @@
 Name:		libdnet
 
 Version:	1.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	BSD-like
 Group:		System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.11-2
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.11-1
 - I should have checked for updates first
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:50:08 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 12:50:08 -0700
Subject: rpms/libstatgrab/devel libstatgrab.spec,1.5,1.6
Message-ID: <200610041950.k94JoAMl029645@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/libstatgrab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29628

Modified Files:
	libstatgrab.spec 
Log Message:

Bump-n-build



Index: libstatgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/devel/libstatgrab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libstatgrab.spec	19 Sep 2006 14:21:32 -0000	1.5
+++ libstatgrab.spec	4 Oct 2006 19:50:08 -0000	1.6
@@ -4,7 +4,7 @@
 Name:			libstatgrab
 
 Version:		0.13
-Release:		2%{?dist}
+Release:		3%{?dist}
 
 Source0:		http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}.nochmod.patch
@@ -127,6 +127,9 @@
 %{_bindir}/vm_stats
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.13-3
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 0.13-2
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:53:01 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 12:53:01 -0700
Subject: rpms/ngrep/devel ngrep.spec,1.4,1.5
Message-ID: <200610041953.k94Jr3KG029677@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/ngrep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29660

Modified Files:
	ngrep.spec 
Log Message:

Bump-n-build



Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/ngrep.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ngrep.spec	19 Sep 2006 11:39:55 -0000	1.4
+++ ngrep.spec	4 Oct 2006 19:53:01 -0000	1.5
@@ -5,7 +5,7 @@
 Summary:			Network layer grep tool
 
 Version:			1.44
-Release:			6%{?dist}
+Release:			7%{?dist}
 
 Group:				Applications/Internet
 License:			BSD-like
@@ -56,6 +56,9 @@
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.44-7
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.44-6
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 20:00:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 13:00:19 -0700
Subject: rpms/scanssh/devel scanssh.spec,1.4,1.5
Message-ID: <200610042000.k94K0Lcr029836@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/scanssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29815

Modified Files:
	scanssh.spec 
Log Message:

Bump-n-build



Index: scanssh.spec
===================================================================
RCS file: /cvs/extras/rpms/scanssh/devel/scanssh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scanssh.spec	19 Sep 2006 11:53:14 -0000	1.4
+++ scanssh.spec	4 Oct 2006 20:00:19 -0000	1.5
@@ -2,7 +2,7 @@
 Summary:		Fast SSH server and open proxy scanner
 
 Version:		2.1
-Release:		8%{?dist}
+Release:		9%{?dist}
 
 Group:			Applications/Internet
 License:		BSD
@@ -45,6 +45,9 @@
 %{_mandir}/man1/scanssh*
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.1-9
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 2.1-8
 - I suppose I need to port this one to FC6 now, huh?
 



From fedora-extras-commits at redhat.com  Wed Oct  4 20:01:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 13:01:02 -0700
Subject: rpms/bwm-ng/devel bwm-ng.spec,1.3,1.4
Message-ID: <200610042001.k94K14bn032274@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/bwm-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29842

Modified Files:
	bwm-ng.spec 
Log Message:

Bump-n-build



Index: bwm-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/bwm-ng/devel/bwm-ng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bwm-ng.spec	19 Sep 2006 11:38:32 -0000	1.3
+++ bwm-ng.spec	4 Oct 2006 20:01:02 -0000	1.4
@@ -4,7 +4,7 @@
 Name:			bwm-ng
 
 Version:		0.5
-Release:		7%{?dist}
+Release:		8%{?dist}
 
 License:		GPL
 Group:			Applications/System
@@ -54,6 +54,9 @@
 %{_mandir}/man1/bwm-ng.1*
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.5-8
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 0.5-7
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 20:02:17 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 13:02:17 -0700
Subject: rpms/rblcheck/devel rblcheck.spec,1.4,1.5
Message-ID: <200610042002.k94K2JBm032689@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/rblcheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32670

Modified Files:
	rblcheck.spec 
Log Message:

Bump-n-build



Index: rblcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/rblcheck/devel/rblcheck.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rblcheck.spec	19 Sep 2006 11:41:23 -0000	1.4
+++ rblcheck.spec	4 Oct 2006 20:02:17 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:	Command-line interface to RBL-style listings
 
 Version:	1.5
-Release:	11%{?dist}
+Release:	12%{?dist}
 
 Source0:	http://dl.sf.net/rblcheck/rblcheck-%{version}.tar.gz
 Source1:	rblcheckrc
@@ -69,6 +69,9 @@
 %config(noreplace) %{_sysconfdir}/rblcheckrc
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.5-12
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.5-11
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 20:23:41 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed,  4 Oct 2006 13:23:41 -0700
Subject: rpms/xfce4-taskbar-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-taskbar-plugin.spec, 1.4, NONE
Message-ID: <200610042023.k94KNh34000446@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv430

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-taskbar-plugin.spec 
Log Message:
orphaning taskbar-plugin for Core 6


--- NEW FILE dead.package ---
Functionality of the taskbar-plugin has been integrated into xfce4-panel
in XFCE 4.4, this package ist officially orphanded upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-taskbar-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 20:27:26 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed,  4 Oct 2006 13:27:26 -0700
Subject: rpms/xfce4-windowlist-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-windowlist-plugin.spec, 1.4, NONE
Message-ID: <200610042027.k94KRS4p000514@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv498

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-windowlist-plugin.spec 
Log Message:
orphaning windowlist-plugin for Core 6


--- NEW FILE dead.package ---
Functionality of the windowlist-plugin has been integrated into xfce4-panel
in XFCE 4.4, this package ist officially orphanded upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-windowlist-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 20:30:36 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed,  4 Oct 2006 13:30:36 -0700
Subject: fedora-security/audit fc5,1.344,1.345 fc6,1.99,1.100
Message-ID: <200610042030.k94KUaBx000584@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv564

Modified Files:
	fc5 fc6 
Log Message:
Note a new nss_ldap issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- fc5	4 Oct 2006 08:55:08 -0000	1.344
+++ fc5	4 Oct 2006 20:30:32 -0000	1.345
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fc6	4 Oct 2006 08:55:08 -0000	1.99
+++ fc6	4 Oct 2006 20:30:32 -0000	1.100
@@ -4,6 +4,7 @@
 
 ** are items that need attention
 
+CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel



From fedora-extras-commits at redhat.com  Wed Oct  4 20:34:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed,  4 Oct 2006 13:34:53 -0700
Subject: rpms/xfce4-datetime-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-datetime-plugin.spec, 1.5, NONE
Message-ID: <200610042034.k94KYtOj000627@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv611

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-datetime-plugin.spec 
Log Message:
orphaning datetime-plugin for Core 6


--- NEW FILE dead.package ---
Functionality of the datetime-plugin has been integrated into xfce4-panel
in XFCE 4.4, this package ist officially orphanded upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-datetime-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 21:05:30 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed,  4 Oct 2006 14:05:30 -0700
Subject: rpms/htop/devel .cvsignore, 1.6, 1.7 htop.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <200610042105.k94L5WNB003573@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3552

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
Update to 0.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Jul 2006 16:13:31 -0000	1.6
+++ .cvsignore	4 Oct 2006 21:05:29 -0000	1.7
@@ -1 +1 @@
-htop-0.6.3.tar.gz
+htop-0.6.4.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- htop.spec	16 Sep 2006 18:19:53 -0000	1.9
+++ htop.spec	4 Oct 2006 21:05:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           htop
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.4-1
+- Update to 0.6.4
+
 * Sat Sep 16 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.3-2
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Jul 2006 16:13:31 -0000	1.7
+++ sources	4 Oct 2006 21:05:29 -0000	1.8
@@ -1 +1 @@
-51255f2b3632888e7de511a5a47dd785  htop-0.6.3.tar.gz
+989905bb2559cf6404c1b8e8ffa48b15  htop-0.6.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 21:07:47 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed,  4 Oct 2006 14:07:47 -0700
Subject: rpms/htop/FC-5 .cvsignore, 1.6, 1.7 htop.spec, 1.8, 1.9 sources, 1.7,
	1.8
Message-ID: <200610042107.k94L7n7L003672@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3651

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
Update to 0.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Jul 2006 20:24:31 -0000	1.6
+++ .cvsignore	4 Oct 2006 21:07:46 -0000	1.7
@@ -1 +1 @@
-htop-0.6.3.tar.gz
+htop-0.6.4.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-5/htop.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- htop.spec	30 Jul 2006 20:24:31 -0000	1.8
+++ htop.spec	4 Oct 2006 21:07:46 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           htop
-Version:        0.6.3
+Version:        0.6.4
 Release:        1%{?dist}
 Summary:        Interactive process viewer
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.4-1
+- Update to 0.6.4
+
 * Sun Jul 30 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.3-1
 - Update to 0.6.3
 - Correct e-mail address in ChangeLog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Jul 2006 20:24:31 -0000	1.7
+++ sources	4 Oct 2006 21:07:46 -0000	1.8
@@ -1 +1 @@
-51255f2b3632888e7de511a5a47dd785  htop-0.6.3.tar.gz
+989905bb2559cf6404c1b8e8ffa48b15  htop-0.6.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 21:13:41 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 14:13:41 -0700
Subject: rpms/libdnet/devel libdnet.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610042113.k94LDhv4003825@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/libdnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3805

Modified Files:
	libdnet.spec sources 
Log Message:

Reverting to 1.10; 1.11 has some serious issues
(Epoch bump not needed because 1.11 never successfully built.)



Index: libdnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libdnet/devel/libdnet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libdnet.spec	4 Oct 2006 19:49:24 -0000	1.4
+++ libdnet.spec	4 Oct 2006 21:13:41 -0000	1.5
@@ -1,14 +1,14 @@
 Summary:	Simple portable interface to lowlevel networking routines
 Name:		libdnet
 
-Version:	1.11
-Release:	2%{?dist}
+Version:	1.10
+Release:	4%{?dist}
 
 License:	BSD-like
 Group:		System Environment/Libraries
 URL:		http://libdnet.sf.net/
 
-Source:		http://dl.sf.net/libdnet/libdnet-%{version}.tar.gz
+Source:		http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -75,11 +75,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
-* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.11-2
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.10-4
 - Bump-n-build
-
-* Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.11-1
-- I should have checked for updates first
+- Reverted to 1.10; 1.11 has some serious issues
 
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.10-3
 - Bump for FC6 rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdnet/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2006 15:01:34 -0000	1.3
+++ sources	4 Oct 2006 21:13:41 -0000	1.4
@@ -1 +1 @@
-04c394ed8e1e7fc455456e79e908916d  libdnet-1.11.tar.gz
+416b765e9d9961501ac85e9a366fd219  libdnet-1.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 21:35:44 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 14:35:44 -0700
Subject: rpms/graphviz/devel graphviz.spec,1.27,1.28
Message-ID: <200610042135.k94LZkL8004091@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/graphviz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4072

Modified Files:
	graphviz.spec 
Log Message:

Bump-n-build



Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- graphviz.spec	18 Sep 2006 01:59:11 -0000	1.27
+++ graphviz.spec	4 Oct 2006 21:35:44 -0000	1.28
@@ -1,7 +1,8 @@
 # $Id$ $Revision$
 # graphviz.spec.  Generated from graphviz.spec.in by configure.
 
-# Keeping one conditional because I can't figure out what it's looking for!
+# Io is disabled because it's not (yet?) found in Fedora.
+# http://www.iolanguage.com/about/
 # - Jima
 %define _IO 0
 
@@ -11,7 +12,7 @@
 Summary:	Graph Visualization Tools
 Name:		graphviz
 Version:	2.8
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/Multimedia
 License:	CPL
 URL:		http://www.graphviz.org/
@@ -277,6 +278,9 @@
 if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.8-5
+- Bump-n-build
+
 * Thu Sep 14 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 2.8-4
 - Fixing BZ#188148 & BZ#184171
 - Dropped the unified spec file logic; it complicated matters unnecessarily



From fedora-extras-commits at redhat.com  Wed Oct  4 21:56:00 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 14:56:00 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.1,1.2
Message-ID: <200610042156.k94Lu2HA004258@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4241

Modified Files:
	sysprof-kmod.spec 
Log Message:
fix kernel version string for -devel



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysprof-kmod.spec	4 Oct 2006 16:27:26 -0000	1.1
+++ sysprof-kmod.spec	4 Oct 2006 21:56:00 -0000	1.2
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2689.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:06:18 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 15:06:18 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.2,1.3
Message-ID: <200610042206.k94M6KgW007244@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7216

Modified Files:
	sysprof-kmod.spec 
Log Message:
Remove (not supported) ppc arch



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sysprof-kmod.spec	4 Oct 2006 21:56:00 -0000	1.2
+++ sysprof-kmod.spec	4 Oct 2006 22:06:18 -0000	1.3
@@ -41,7 +41,7 @@
 
 Patch0:         %{kmod_name}-avoid_depmod.patch
 
-ExclusiveArch:  i586 i686 x86_64 ppc
+ExclusiveArch:  i586 i686 x86_64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Oct  4 22:08:01 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 15:08:01 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.3,1.4
Message-ID: <200610042208.k94M83bQ007432@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7415

Modified Files:
	sysprof-kmod.spec 
Log Message:
bump EVR



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sysprof-kmod.spec	4 Oct 2006 22:06:18 -0000	1.3
+++ sysprof-kmod.spec	4 Oct 2006 22:08:01 -0000	1.4
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.3
-Release:        1.%(echo %{kverrel} | tr - _)
+Release:        2.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
+- Remove ppc arch
+
 * Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
 - version update
 - fixed rpmlint warning about summary 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:10:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:10:05 -0700
Subject: rpms/perl-Spreadsheet-ParseExcel/devel
	perl-Spreadsheet-ParseExcel.spec, 1.2, 1.3
Message-ID: <200610042210.k94MA74j007543@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Spreadsheet-ParseExcel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7526

Modified Files:
	perl-Spreadsheet-ParseExcel.spec 
Log Message:
automated bump and rebuild


Index: perl-Spreadsheet-ParseExcel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-ParseExcel/devel/perl-Spreadsheet-ParseExcel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Spreadsheet-ParseExcel.spec	26 Sep 2006 21:54:04 -0000	1.2
+++ perl-Spreadsheet-ParseExcel.spec	4 Oct 2006 22:10:05 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           perl-Spreadsheet-ParseExcel
 Version:        0.2603
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Get information from an Excel file
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.2603-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Steven Pritchard <steve at kspei.com> 0.2603-2
 - Fix find option order.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:12:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:12:48 -0700
Subject: rpms/perl-Imager/devel perl-Imager.spec,1.4,1.5
Message-ID: <200610042212.k94MCo69007609@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Imager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7592

Modified Files:
	perl-Imager.spec 
Log Message:
automated bump and rebuild


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/devel/perl-Imager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Imager.spec	26 Sep 2006 21:43:12 -0000	1.4
+++ perl-Imager.spec	4 Oct 2006 22:12:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Imager
 Version:        0.54
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Imager - Perl extension for Generating 24 bit Images
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.54-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Steven Pritchard <steve at kspei.com> 0.54-1
 - Update to 0.54.
 - Fix find option order.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:13:13 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:13:13 -0700
Subject: rpms/fftw/devel fftw.spec,1.17,1.18
Message-ID: <200610042213.k94MDFFM007673@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fftw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7656

Modified Files:
	fftw.spec 
Log Message:
automated bump and rebuild


Index: fftw.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw/devel/fftw.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fftw.spec	26 Sep 2006 20:04:05 -0000	1.17
+++ fftw.spec	4 Oct 2006 22:13:13 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fftw
 Version:        3.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
@@ -116,6 +116,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.2-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Quentin Spencer <qspencer at users.sf.net> 3.1.2-2
 - BuildRequires: pkgconfig for -devel (bug 206444).
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:13:38 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:13:38 -0700
Subject: rpms/seq24/devel seq24.spec,1.1,1.2
Message-ID: <200610042213.k94MDe1c007737@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/seq24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7720

Modified Files:
	seq24.spec 
Log Message:
automated bump and rebuild


Index: seq24.spec
===================================================================
RCS file: /cvs/extras/rpms/seq24/devel/seq24.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seq24.spec	26 Sep 2006 18:12:59 -0000	1.1
+++ seq24.spec	4 Oct 2006 22:13:38 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:      Real-time midi sequencer
 Name:         seq24
 Version:      0.8.7
-Release:      5%{?dist}
+Release:      6%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 URL:          http://www.filter24.org/seq24/
@@ -65,6 +65,9 @@
 %{_datadir}/icons/hicolor/64x64/apps/seq24.png
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.8.7-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Anthony Green <green at redhat.com> 0.8.7-5
 - Rename "dump" to "seq-dump".
 - Simplify description.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:14:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:14:03 -0700
Subject: rpms/ss5/devel ss5.spec,1.2,1.3
Message-ID: <200610042214.k94ME5IR007801@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ss5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784

Modified Files:
	ss5.spec 
Log Message:
automated bump and rebuild


Index: ss5.spec
===================================================================
RCS file: /cvs/extras/rpms/ss5/devel/ss5.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ss5.spec	26 Sep 2006 17:45:49 -0000	1.2
+++ ss5.spec	4 Oct 2006 22:14:03 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.5.9
-Release: 2 
+Release: 3 
 License: GPL 
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
@@ -69,6 +69,9 @@
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.5.9-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 *Tue Sep  26 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.5.9-2 released
         * Rebuild for FC-6



From fedora-extras-commits at redhat.com  Wed Oct  4 22:14:28 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:14:28 -0700
Subject: rpms/grace/devel grace.spec,1.13,1.14
Message-ID: <200610042214.k94MEUGT007865@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7848

Modified Files:
	grace.spec 
Log Message:
automated bump and rebuild


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- grace.spec	26 Sep 2006 17:28:53 -0000	1.13
+++ grace.spec	4 Oct 2006 22:14:28 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           grace
 Version:        5.1.20
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 5.1.20-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.20-5
 - Fix incomplete change from pixmap to icons.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:14:53 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:14:53 -0700
Subject: rpms/libetpan/devel libetpan.spec,1.12,1.13
Message-ID: <200610042214.k94MEtVi007929@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libetpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7912

Modified Files:
	libetpan.spec 
Log Message:
automated bump and rebuild


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libetpan.spec	26 Sep 2006 16:26:23 -0000	1.12
+++ libetpan.spec	4 Oct 2006 22:14:53 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           libetpan
 Version:        0.46
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
 Group:          System Environment/Libraries
@@ -65,6 +65,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.46-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.46-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct  4 22:15:17 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:15:17 -0700
Subject: rpms/gstreamer-python/devel gstreamer-python.spec,1.13,1.14
Message-ID: <200610042215.k94MFJeo007995@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gstreamer-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7978

Modified Files:
	gstreamer-python.spec 
Log Message:
automated bump and rebuild


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gstreamer-python.spec	26 Sep 2006 14:50:22 -0000	1.13
+++ gstreamer-python.spec	4 Oct 2006 22:15:17 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:           %{gstreamer}-python
 Version:        0.10.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
@@ -68,6 +68,9 @@
 %{_libdir}/pkgconfig/gst-python-%{majorminor}.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.10.5-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Denis Leroy <denis at poolshark.org> - 0.10.5-1
 - Update to 0.10.5
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:15:42 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:15:42 -0700
Subject: rpms/gcin/devel gcin.spec,1.8,1.9
Message-ID: <200610042215.k94MFixG008059@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8042

Modified Files:
	gcin.spec 
Log Message:
automated bump and rebuild


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gcin.spec	26 Sep 2006 14:36:38 -0000	1.8
+++ gcin.spec	4 Oct 2006 22:15:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2.6-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.6-1
 - update to 1.2.6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:16:07 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:16:07 -0700
Subject: rpms/dap-server/devel dap-server.spec,1.18,1.19
Message-ID: <200610042216.k94MG9DW008125@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dap-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8108

Modified Files:
	dap-server.spec 
Log Message:
automated bump and rebuild


Index: dap-server.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dap-server.spec	26 Sep 2006 09:10:02 -0000	1.18
+++ dap-server.spec	4 Oct 2006 22:16:07 -0000	1.19
@@ -8,7 +8,7 @@
 Summary:         Basic request handling for OPeNDAP servers 
 Name:            dap-server
 Version:         3.7.1
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.1-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Patrice Dumas <pertusus at free.fr> 3.7.1-2
 - install cgi files according to the FHS, owned by root
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:16:32 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:16:32 -0700
Subject: rpms/adns/devel adns.spec,1.9,1.10
Message-ID: <200610042216.k94MGYho008189@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8172

Modified Files:
	adns.spec 
Log Message:
automated bump and rebuild


Index: adns.spec
===================================================================
RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- adns.spec	26 Sep 2006 07:05:55 -0000	1.9
+++ adns.spec	4 Oct 2006 22:16:32 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		adns
 Version:	1.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 
 Summary:	Advanced, easy to use, asynchronous-capable DNS client library
 
@@ -110,6 +110,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Radek Vokal <rvokal at redhat.com> 1.2-4
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:16:57 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:16:57 -0700
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.1,1.2
Message-ID: <200610042216.k94MGxjl008253@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gtk-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8236

Modified Files:
	gtk-sharp.spec 
Log Message:
automated bump and rebuild


Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-sharp.spec	25 Sep 2006 21:00:08 -0000	1.1
+++ gtk-sharp.spec	4 Oct 2006 22:16:57 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPL
@@ -109,6 +109,9 @@
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.10-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0.10-10
 - some chmods for executables and text files
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:17:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:17:22 -0700
Subject: rpms/xchm/devel xchm.spec,1.6,1.7
Message-ID: <200610042217.k94MHOrp008317@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/xchm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8300

Modified Files:
	xchm.spec 
Log Message:
automated bump and rebuild


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchm.spec	25 Sep 2006 20:18:59 -0000	1.6
+++ xchm.spec	4 Oct 2006 22:17:22 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
 Version:        1.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPL
 Group:          Applications/Publishing
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
@@ -67,6 +67,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.9-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 Patrice Dumas <pertusus at free.fr> 1.9-5
 - install the icon for the chm file type
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:17:46 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:17:46 -0700
Subject: rpms/monodoc/devel monodoc.spec,1.15,1.16
Message-ID: <200610042217.k94MHmD0008381@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/monodoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8364

Modified Files:
	monodoc.spec 
Log Message:
automated bump and rebuild


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- monodoc.spec	25 Sep 2006 19:57:55 -0000	1.15
+++ monodoc.spec	4 Oct 2006 22:17:46 -0000	1.16
@@ -9,7 +9,7 @@
 Summary: The mono documentation system
 Name: monodoc
 Version: 1.1.17
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -67,6 +67,9 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.1.17-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-5
 - added libdir def to configure line
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:18:11 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:18:11 -0700
Subject: rpms/lash/devel lash.spec,1.6,1.7
Message-ID: <200610042218.k94MIDY5008451@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8434

Modified Files:
	lash.spec 
Log Message:
automated bump and rebuild


Index: lash.spec
===================================================================
RCS file: /cvs/extras/rpms/lash/devel/lash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lash.spec	25 Sep 2006 15:37:50 -0000	1.6
+++ lash.spec	4 Oct 2006 22:18:11 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:      LASH Audio Session Handler
 Name:         lash
 Version:      0.5.1
-Release:      9%{?dist}
+Release:      10%{?dist}
 License:      GPL
 Group:        System Environment/Libraries
 URL:          http://www.nongnu.org/lash/
@@ -135,6 +135,9 @@
 %{_libdir}/pkgconfig/lash*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.1-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 Anthony Green <green at redhat.com> 0.5.1-9
 - Update -texi-dir patch.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:18:36 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:18:36 -0700
Subject: rpms/exim/devel exim.spec,1.31,1.32
Message-ID: <200610042218.k94MIcJq008517@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8500

Modified Files:
	exim.spec 
Log Message:
automated bump and rebuild


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- exim.spec	25 Sep 2006 13:53:35 -0000	1.31
+++ exim.spec	4 Oct 2006 22:18:36 -0000	1.32
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.63
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -394,6 +394,9 @@
 %endif
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 4.63-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 David Woodhouse <dwmw2 at infradead.org> - 4.63-4
 - Set home_directory on lmtp_transport by default
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:19:01 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:19:01 -0700
Subject: rpms/gpsim/devel gpsim.spec,1.10,1.11
Message-ID: <200610042219.k94MJ3ob008581@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gpsim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8564

Modified Files:
	gpsim.spec 
Log Message:
automated bump and rebuild


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gpsim.spec	23 Sep 2006 17:09:55 -0000	1.10
+++ gpsim.spec	4 Oct 2006 22:19:01 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.21.11
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -82,6 +82,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.21.11-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.21.11-8
   - Add patch to fix a ktechlab crash, a ktechlab upstream contribution
     See http://ktechlab.org/download/gpsim.php



From fedora-extras-commits at redhat.com  Wed Oct  4 22:19:26 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:19:26 -0700
Subject: rpms/k3d/devel k3d.spec,1.6,1.7
Message-ID: <200610042219.k94MJSGw008645@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8628

Modified Files:
	k3d.spec 
Log Message:
automated bump and rebuild


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- k3d.spec	24 Sep 2006 22:12:31 -0000	1.6
+++ k3d.spec	4 Oct 2006 22:19:25 -0000	1.7
@@ -1,7 +1,7 @@
 
 Name:           k3d
 Version:        0.6.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.6.2.0-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 24 2006 Denis Leroy <denis at poolshark.org> - 0.6.2.0-1
 - Update to 0.6.2.0
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:19:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:19:50 -0700
Subject: rpms/gossip/devel gossip.spec,1.29,1.30
Message-ID: <200610042219.k94MJqUq008709@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8692

Modified Files:
	gossip.spec 
Log Message:
automated bump and rebuild


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gossip.spec	24 Sep 2006 18:54:23 -0000	1.29
+++ gossip.spec	4 Oct 2006 22:19:50 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           gossip
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.17-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 24 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.17-1
 - Update to 0.17.
 - Drop ChangeLog, since NEWS file is already packaged.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:20:15 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:20:15 -0700
Subject: rpms/nexuiz/devel nexuiz.spec,1.16,1.17
Message-ID: <200610042220.k94MKHTx008777@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/nexuiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8760

Modified Files:
	nexuiz.spec 
Log Message:
automated bump and rebuild


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nexuiz.spec	24 Sep 2006 17:29:26 -0000	1.16
+++ nexuiz.spec	4 Oct 2006 22:20:15 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 24 2006 Adrian Reber <adrian at lisas.de> - 2.1-1
 - updated to 2.1
 - removed basedir patch; now using a environment variable



From fedora-extras-commits at redhat.com  Wed Oct  4 22:20:39 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:20:39 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.1,1.2
Message-ID: <200610042220.k94MKfHN008841@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8824

Modified Files:
	eds-feed.spec 
Log Message:
automated bump and rebuild


Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eds-feed.spec	24 Sep 2006 13:17:21 -0000	1.1
+++ eds-feed.spec	4 Oct 2006 22:20:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -48,5 +48,8 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
 - Intial FE spec.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:21:04 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:21:04 -0700
Subject: rpms/kdiff3/devel kdiff3.spec,1.1,1.2
Message-ID: <200610042221.k94ML6hl008905@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/kdiff3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8888

Modified Files:
	kdiff3.spec 
Log Message:
automated bump and rebuild


Index: kdiff3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdiff3.spec	23 Sep 2006 20:18:56 -0000	1.1
+++ kdiff3.spec	4 Oct 2006 22:21:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           kdiff3
 Version:        0.9.90
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.90-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Aug 27 2006 Neal Becker <ndbecker2 at gmail.com> - 0.9.90-6
 - Untabify
 - --add-category X-Fedora



From fedora-extras-commits at redhat.com  Wed Oct  4 22:21:29 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:21:29 -0700
Subject: rpms/cfengine/devel cfengine.spec,1.21,1.22
Message-ID: <200610042221.k94MLVFJ008979@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8960

Modified Files:
	cfengine.spec 
Log Message:
automated bump and rebuild


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cfengine.spec	24 Sep 2006 12:05:51 -0000	1.21
+++ cfengine.spec	4 Oct 2006 22:21:29 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.1.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.21.tar.gz
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.21-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.21-1
 - update to upstream 2.1.21
 - remove unneeded ipv6 overflow patch (fixed in current version)



From fedora-extras-commits at redhat.com  Wed Oct  4 22:21:40 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 15:21:40 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.4,1.5
Message-ID: <200610042221.k94MLg2Z009044@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8977

Modified Files:
	sysprof-kmod.spec 
Log Message:
bump EVR for rebuild



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof-kmod.spec	4 Oct 2006 22:08:01 -0000	1.4
+++ sysprof-kmod.spec	4 Oct 2006 22:21:40 -0000	1.5
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.3
-Release:        2.%(echo %{kverrel} | tr - _)
+Release:        3.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -103,8 +103,11 @@
 
 
 %changelog
+* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
+- rebuild
+
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
-- Remove ppc arch
+- remove (not supported) ppc arch
 
 * Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
 - version update



From fedora-extras-commits at redhat.com  Wed Oct  4 22:21:54 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:21:54 -0700
Subject: rpms/gnash/devel gnash.spec,1.2,1.3
Message-ID: <200610042221.k94MLu0V009111@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9066

Modified Files:
	gnash.spec 
Log Message:
automated bump and rebuild


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnash.spec	24 Sep 2006 08:22:09 -0000	1.2
+++ gnash.spec	4 Oct 2006 22:21:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.7.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7.1-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 24 2006 Patrice Dumas <pertusus at free.fr> 0.7.1-8
 - plugin requires %{_libdir}/mozilla/plugins. Fix (incompletly and 
   temporarily, but there is no better solution yet) #207613



From fedora-extras-commits at redhat.com  Wed Oct  4 22:22:19 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:22:19 -0700
Subject: rpms/farsight/devel farsight.spec,1.1,1.2
Message-ID: <200610042222.k94MMLUa009206@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/farsight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9189

Modified Files:
	farsight.spec 
Log Message:
automated bump and rebuild


Index: farsight.spec
===================================================================
RCS file: /cvs/extras/rpms/farsight/devel/farsight.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- farsight.spec	24 Sep 2006 02:42:08 -0000	1.1
+++ farsight.spec	4 Oct 2006 22:22:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		farsight
 Version:	0.1.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A audio/video conferencing framework
 
 Group:		System Environment/Libraries
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.1.8-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.8-2
 - Use correct license (LGPL).
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:22:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:22:44 -0700
Subject: rpms/libpaper/devel libpaper.spec,1.3,1.4
Message-ID: <200610042222.k94MMklW009272@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libpaper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9255

Modified Files:
	libpaper.spec 
Log Message:
automated bump and rebuild


Index: libpaper.spec
===================================================================
RCS file: /cvs/extras/rpms/libpaper/devel/libpaper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libpaper.spec	24 Sep 2006 01:32:14 -0000	1.3
+++ libpaper.spec	4 Oct 2006 22:22:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		libpaper
 Version:	1.1.20
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Library and tools for handling papersize
 Group:		System Environment/Libraries
 License:	GPL
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.1.20-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.20-4
 - remove aclocal call
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:23:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:23:12 -0700
Subject: rpms/libcdio/devel libcdio.spec,1.18,1.19
Message-ID: <200610042223.k94MNECP009336@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libcdio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9319

Modified Files:
	libcdio.spec 
Log Message:
automated bump and rebuild


Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libcdio.spec	23 Sep 2006 21:51:39 -0000	1.18
+++ libcdio.spec	4 Oct 2006 22:23:12 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           libcdio
 Version:        0.77
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.77-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Adrian Reber <adrian at lisas.de> - 0.77-1
 - Updated to 0.77
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:23:39 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:23:39 -0700
Subject: rpms/gnokii/devel gnokii.spec,1.8,1.9
Message-ID: <200610042223.k94MNf2R009400@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9383

Modified Files:
	gnokii.spec 
Log Message:
automated bump and rebuild


Index: gnokii.spec
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnokii.spec	23 Sep 2006 21:48:48 -0000	1.8
+++ gnokii.spec	4 Oct 2006 22:23:39 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           gnokii
 Version:        0.6.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -261,6 +261,9 @@
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.6.14-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Linus Walleij <triad at df.lth.se> - 0.6.14-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:24:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:24:05 -0700
Subject: rpms/whatmask/devel whatmask.spec,1.1,1.2
Message-ID: <200610042224.k94MO7k2009465@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/whatmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448

Modified Files:
	whatmask.spec 
Log Message:
automated bump and rebuild


Index: whatmask.spec
===================================================================
RCS file: /cvs/extras/rpms/whatmask/devel/whatmask.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- whatmask.spec	23 Sep 2006 09:04:10 -0000	1.1
+++ whatmask.spec	4 Oct 2006 22:24:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           whatmask
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Convert between different netmask types and show information
 
 Group:          Applications/Internet
@@ -39,6 +39,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Tim Jackson <rpm at timj.co.uk> 1.2-3
 - Initial build for FE. Release number is due to fork of a previous private
   version.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:24:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:24:30 -0700
Subject: rpms/eventlog/devel eventlog.spec,1.2,1.3
Message-ID: <200610042224.k94MOWkT009530@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/eventlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9513

Modified Files:
	eventlog.spec 
Log Message:
automated bump and rebuild


Index: eventlog.spec
===================================================================
RCS file: /cvs/extras/rpms/eventlog/devel/eventlog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eventlog.spec	23 Sep 2006 18:43:33 -0000	1.2
+++ eventlog.spec	4 Oct 2006 22:24:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           eventlog
 Version:        0.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Syslog-ng v2 support library
 
 Group:          System Environment/Libraries
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.2.5-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Jul 16 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.2.5-1
 - Update to 0.25.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:24:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:24:55 -0700
Subject: rpms/gaim-galago/devel gaim-galago.spec,1.1,1.2
Message-ID: <200610042224.k94MOvMe009596@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gaim-galago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9579

Modified Files:
	gaim-galago.spec 
Log Message:
automated bump and rebuild


Index: gaim-galago.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/devel/gaim-galago.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-galago.spec	23 Sep 2006 18:23:53 -0000	1.1
+++ gaim-galago.spec	4 Oct 2006 22:24:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gaim-galago
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Galago feed plugin for Gaim
 
 Group:		System Environment/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Correct URL.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:25:19 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:25:19 -0700
Subject: rpms/octave-forge/devel octave-forge.spec,1.31,1.32
Message-ID: <200610042225.k94MPLQc009660@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9643

Modified Files:
	octave-forge.spec 
Log Message:
automated bump and rebuild


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- octave-forge.spec	23 Sep 2006 17:26:03 -0000	1.31
+++ octave-forge.spec	4 Oct 2006 22:25:19 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.07.09
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2006.07.09-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-6
 - Rebuild for updated libdap.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:25:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:25:44 -0700
Subject: rpms/libgalago-gtk/devel libgalago-gtk.spec,1.1,1.2
Message-ID: <200610042225.k94MPkjS009724@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libgalago-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9707

Modified Files:
	libgalago-gtk.spec 
Log Message:
automated bump and rebuild


Index: libgalago-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago-gtk/devel/libgalago-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgalago-gtk.spec	23 Sep 2006 16:23:38 -0000	1.1
+++ libgalago-gtk.spec	4 Oct 2006 22:25:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libgalago-gtk
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ widgets for the Galago presence framework
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Preserve timestamps of header files.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:26:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:26:08 -0700
Subject: rpms/bochs/devel bochs.spec,1.21,1.22
Message-ID: <200610042226.k94MQAYv009788@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9771

Modified Files:
	bochs.spec 
Log Message:
automated bump and rebuild


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bochs.spec	22 Sep 2006 20:25:58 -0000	1.21
+++ bochs.spec	4 Oct 2006 22:26:08 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           bochs
 Version:        2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPL
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.3-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-2
 - Add -debugger and -gdb sub packages which contain special versions of
   bochs compiled with the buildin debugger resp. the gdb-stub (bz 206508)



From fedora-extras-commits at redhat.com  Wed Oct  4 22:26:33 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:26:33 -0700
Subject: rpms/gkrellm/devel gkrellm.spec,1.3,1.4
Message-ID: <200610042226.k94MQZDW009852@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835

Modified Files:
	gkrellm.spec 
Log Message:
automated bump and rebuild


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gkrellm.spec	22 Sep 2006 20:21:07 -0000	1.3
+++ gkrellm.spec	4 Oct 2006 22:26:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.2.9
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPL
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.9-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.9-9
 - Fixup .desktop so that gkrellm actually gets shown in the menu (bz 206775)
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:26:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:26:58 -0700
Subject: rpms/smarteiffel/devel smarteiffel.spec,1.1,1.2
Message-ID: <200610042227.k94MR0ha009916@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/smarteiffel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9899

Modified Files:
	smarteiffel.spec 
Log Message:
automated bump and rebuild


Index: smarteiffel.spec
===================================================================
RCS file: /cvs/extras/rpms/smarteiffel/devel/smarteiffel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smarteiffel.spec	22 Sep 2006 19:26:55 -0000	1.1
+++ smarteiffel.spec	4 Oct 2006 22:26:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           smarteiffel
 Version:        2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The GNU Eiffel Compiler and Libraries
 
 Group:          Development/Languages
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.2-5
 - split off -doc subpackage
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:27:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:27:22 -0700
Subject: rpms/blktool/devel blktool.spec,1.3,1.4
Message-ID: <200610042227.k94MROap009980@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/blktool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9963

Modified Files:
	blktool.spec 
Log Message:
automated bump and rebuild


Index: blktool.spec
===================================================================
RCS file: /cvs/extras/rpms/blktool/devel/blktool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blktool.spec	22 Sep 2006 19:13:00 -0000	1.3
+++ blktool.spec	4 Oct 2006 22:27:22 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Block device settings tool
 Name: blktool
 Version: 4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://sourceforge.net/projects/gkernel/
@@ -40,6 +40,9 @@
 %{_mandir}/man8/blktool.*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 4-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Jeff Garzik <jgarzik at pobox.com> - 4-5
 - pre-FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:27:47 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:27:47 -0700
Subject: rpms/git/devel git.spec,1.20,1.21
Message-ID: <200610042227.k94MRnmH010042@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10025

Modified Files:
	git.spec 
Log Message:
automated bump and rebuild


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git.spec	22 Sep 2006 18:10:26 -0000	1.20
+++ git.spec	4 Oct 2006 22:27:47 -0000	1.21
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.4.2.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.4.2.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:28:11 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:28:11 -0700
Subject: rpms/autotrace/devel autotrace.spec,1.15,1.16
Message-ID: <200610042228.k94MSDYj010111@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10092

Modified Files:
	autotrace.spec 
Log Message:
automated bump and rebuild


Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- autotrace.spec	22 Sep 2006 16:15:42 -0000	1.15
+++ autotrace.spec	4 Oct 2006 22:28:11 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.31.1-14
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Quentin Spencer <qspencer at users.sourceforge.net> - 0.31.1-13
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:28:36 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:28:36 -0700
Subject: rpms/kicad/devel kicad.spec,1.3,1.4
Message-ID: <200610042228.k94MScNu010175@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/kicad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158

Modified Files:
	kicad.spec 
Log Message:
automated bump and rebuild


Index: kicad.spec
===================================================================
RCS file: /cvs/extras/rpms/kicad/devel/kicad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kicad.spec	22 Sep 2006 13:57:08 -0000	1.3
+++ kicad.spec	4 Oct 2006 22:28:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		kicad
 Version:	2006.08.28
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary: 	Electronic schematic diagrams and printed circuit board artwork
 Summary(fr): 	Saisie de sch??ma ??lectronique et trac?? de cicrcuit imprim??
 
@@ -243,6 +243,9 @@
 %{_datadir}/pixmaps/kicad_icon.png
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2006.08.28-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2006.08.28-1
   - New upstream version
   - Use macro style instead of variable style



From fedora-extras-commits at redhat.com  Wed Oct  4 22:29:01 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:29:01 -0700
Subject: rpms/SDL_gfx/devel SDL_gfx.spec,1.7,1.8
Message-ID: <200610042229.k94MT3jW010239@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SDL_gfx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10222

Modified Files:
	SDL_gfx.spec 
Log Message:
automated bump and rebuild


Index: SDL_gfx.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_gfx/devel/SDL_gfx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SDL_gfx.spec	22 Sep 2006 13:26:31 -0000	1.7
+++ SDL_gfx.spec	4 Oct 2006 22:29:01 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Graphic primitives, rotozoomer, framerate control and image filters
 Name: SDL_gfx
 Version: 2.0.13
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.ferzkopp.net/Software/SDL_gfx-2.0/
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.13-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Matthias Saou <http://freshrpms.net/> 2.0.13-6
 - Fix semicolons in header files (#207665).
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:29:26 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:29:26 -0700
Subject: rpms/ode/devel ode.spec,1.4,1.5
Message-ID: <200610042229.k94MTSPM010303@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10286

Modified Files:
	ode.spec 
Log Message:
automated bump and rebuild


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ode.spec	22 Sep 2006 12:33:04 -0000	1.4
+++ ode.spec	4 Oct 2006 22:29:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ode
 Version:        0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
 License:        BSD LGPL
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7-1
 - New upstream release 0.7
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:29:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:29:50 -0700
Subject: rpms/libifp/devel libifp.spec,1.7,1.8
Message-ID: <200610042229.k94MTqmx010367@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libifp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10350

Modified Files:
	libifp.spec 
Log Message:
automated bump and rebuild


Index: libifp.spec
===================================================================
RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libifp.spec	22 Sep 2006 09:57:04 -0000	1.7
+++ libifp.spec	4 Oct 2006 22:29:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libifp
 Version:        1.0.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A general-purpose library-driver for iRiver's iFP portable audio players
 
 Group:          System Environment/Base
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.0.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.0.2-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:30:15 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:30:15 -0700
Subject: rpms/FreeWnn/devel FreeWnn.spec,1.4,1.5
Message-ID: <200610042230.k94MUH9P010446@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/FreeWnn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10429

Modified Files:
	FreeWnn.spec 
Log Message:
automated bump and rebuild


Index: FreeWnn.spec
===================================================================
RCS file: /cvs/extras/rpms/FreeWnn/devel/FreeWnn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FreeWnn.spec	22 Sep 2006 07:48:42 -0000	1.4
+++ FreeWnn.spec	4 Oct 2006 22:30:15 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: A Japanese character set conversion system.
 Name: FreeWnn
 Version: %{majorversion}_a%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 Group: Applications/System
 License: Distributable
@@ -235,6 +235,9 @@
 %attr(755,root,root) %{_libdir}/libwnn.so.0.0.0
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> %{majorversion}_a%{patchlevel}-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Jens Petersen <petersen at redhat.com> - 2:1.1.1_a021-1
 - update to pl21
 - set version to 1.1.1 to be consistent with upstream number



From fedora-extras-commits at redhat.com  Wed Oct  4 22:30:43 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:30:43 -0700
Subject: rpms/fontforge/devel fontforge.spec,1.19,1.20
Message-ID: <200610042230.k94MUj0j010518@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501

Modified Files:
	fontforge.spec 
Log Message:
automated bump and rebuild


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fontforge.spec	22 Sep 2006 04:58:23 -0000	1.19
+++ fontforge.spec	4 Oct 2006 22:30:43 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:           fontforge
 Version:        20060822
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 20060822-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Kevin Fenzi <kevin at tummy.com> - 20060822-1
 - Update to 20060822
 - Remove unneeded patch



From fedora-extras-commits at redhat.com  Wed Oct  4 22:31:11 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:31:11 -0700
Subject: rpms/oooqs2/devel oooqs2.spec,1.1,1.2
Message-ID: <200610042231.k94MVDgo010584@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/oooqs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567

Modified Files:
	oooqs2.spec 
Log Message:
automated bump and rebuild


Index: oooqs2.spec
===================================================================
RCS file: /cvs/extras/rpms/oooqs2/devel/oooqs2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oooqs2.spec	30 Jul 2006 20:01:23 -0000	1.1
+++ oooqs2.spec	4 Oct 2006 22:31:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           oooqs2
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OpenOffice.org Quickstarter 2
 
 Group:          Applications/Productivity
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Jul 27 2006 Dennis Gilmore <dennis at ausil.us> - 1.0-2
 - Fix BR's  add russian desktop file translation patch
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:31:35 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:31:35 -0700
Subject: rpms/tuxpaint/devel tuxpaint.spec,1.11,1.12
Message-ID: <200610042231.k94MVbc2010648@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10631

Modified Files:
	tuxpaint.spec 
Log Message:
automated bump and rebuild


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tuxpaint.spec	22 Sep 2006 00:48:40 -0000	1.11
+++ tuxpaint.spec	4 Oct 2006 22:31:35 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           tuxpaint
 Version:        0.9.15b
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -71,6 +71,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.15b-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Steven Pritchard <steve at kspei.com> 1:0.9.15b-3
 - Explicitly link libpng.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:32:00 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:32:00 -0700
Subject: rpms/uuid/devel uuid.spec,1.3,1.4
Message-ID: <200610042232.k94MW23J010713@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/uuid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10696

Modified Files:
	uuid.spec 
Log Message:
automated bump and rebuild


Index: uuid.spec
===================================================================
RCS file: /cvs/extras/rpms/uuid/devel/uuid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uuid.spec	21 Sep 2006 21:18:06 -0000	1.3
+++ uuid.spec	4 Oct 2006 22:32:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           uuid
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -233,6 +233,9 @@
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Aug 28 2006 Steven Pritchard <steve at kspei.com> 1.5.1-1
 - Update to 1.5.1.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:32:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:32:25 -0700
Subject: rpms/clamav/devel clamav.spec,1.41,1.42
Message-ID: <200610042232.k94MWRTZ010777@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10760

Modified Files:
	clamav.spec 
Log Message:
automated bump and rebuild


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- clamav.spec	21 Sep 2006 18:27:43 -0000	1.41
+++ clamav.spec	4 Oct 2006 22:32:25 -0000	1.42
@@ -19,7 +19,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.88.4
-Release:	%release_func 3
+Release: %release_func 4
 
 License:	GPL
 Group:		Applications/File
@@ -446,6 +446,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.88.4-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.4-3
 - splitted SysV initscripts of -milter and -server into own subpackages
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:32:52 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:32:52 -0700
Subject: rpms/mysql-connector-java/devel mysql-connector-java.spec,1.2,1.3
Message-ID: <200610042232.k94MWsQm010841@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/mysql-connector-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10824

Modified Files:
	mysql-connector-java.spec 
Log Message:
automated bump and rebuild


Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-connector-java/devel/mysql-connector-java.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-connector-java.spec	21 Sep 2006 19:09:42 -0000	1.2
+++ mysql-connector-java.spec	4 Oct 2006 22:32:51 -0000	1.3
@@ -5,7 +5,7 @@
 Summary:           Official JDBC driver for MySQL
 Name:              mysql-connector-java
 Version:           3.1.12
-Release:           2%{?dist}
+Release:           3%{?dist}
 Epoch:             1 
 License:           GPL
 Group:             System Environment/Libraries
@@ -121,6 +121,9 @@
 %endif
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.12-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Igor Foox <ifoox at redhat.com> 1:3.1.12-2
 - Remove jpp string from release.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:33:16 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:33:16 -0700
Subject: rpms/pikdev/devel pikdev.spec,1.7,1.8
Message-ID: <200610042233.k94MXIwE010905@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pikdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10888

Modified Files:
	pikdev.spec 
Log Message:
automated bump and rebuild


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/pikdev.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pikdev.spec	21 Sep 2006 16:17:22 -0000	1.7
+++ pikdev.spec	4 Oct 2006 22:33:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.9.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	IDE for development of PICmicro based application (under Linux/KDE)
 Summary(fr):	EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC
 
@@ -103,6 +103,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.2-1
   - New upstream version
 * Fri Sep  1 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.1-3



From fedora-extras-commits at redhat.com  Wed Oct  4 22:33:41 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:33:41 -0700
Subject: rpms/perl-Device-SerialPort/devel perl-Device-SerialPort.spec, 1.1, 
	1.2
Message-ID: <200610042233.k94MXh1m010974@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Device-SerialPort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957

Modified Files:
	perl-Device-SerialPort.spec 
Log Message:
automated bump and rebuild


Index: perl-Device-SerialPort.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Device-SerialPort/devel/perl-Device-SerialPort.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Device-SerialPort.spec	21 Sep 2006 16:16:53 -0000	1.1
+++ perl-Device-SerialPort.spec	4 Oct 2006 22:33:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Device-SerialPort
 Version:        1.002
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Linux/POSIX emulation of Win32::SerialPort functions
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.002-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Orion Poplawski 1.002-2
 - Add TESTPORT=/dev/null for mock builds
 - License back to GPL or Artistic



From fedora-extras-commits at redhat.com  Wed Oct  4 22:34:06 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:34:06 -0700
Subject: rpms/opencv/devel opencv.spec,1.10,1.11
Message-ID: <200610042234.k94MY8OY011040@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/opencv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11021

Modified Files:
	opencv.spec 
Log Message:
automated bump and rebuild


Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- opencv.spec	21 Sep 2006 15:52:42 -0000	1.10
+++ opencv.spec	4 Oct 2006 22:34:05 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name:           opencv
 Version:        0.9.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.9-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.9.9-2
 - Stop configure.in from hacking CXXFLAGS.
 - Activate testsuite.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:34:31 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:34:31 -0700
Subject: rpms/gputils/devel gputils.spec,1.9,1.10
Message-ID: <200610042234.k94MYX97011109@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gputils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11087

Modified Files:
	gputils.spec 
Log Message:
automated bump and rebuild


Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/gputils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gputils.spec	21 Sep 2006 15:41:45 -0000	1.9
+++ gputils.spec	4 Oct 2006 22:34:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gputils
 Version:	0.13.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Outils de d??veloppement pour les microcontr??leurs PIC (TM) de Microchip (TM)
 
@@ -54,6 +54,9 @@
 %{_mandir}/fr/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.13.4-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.13.4-1
   - New upstream version
   - Add french summary and description



From fedora-extras-commits at redhat.com  Wed Oct  4 22:34:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:34:55 -0700
Subject: rpms/showimg/devel showimg.spec,1.14,1.15
Message-ID: <200610042234.k94MYvU5011182@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11165

Modified Files:
	showimg.spec 
Log Message:
automated bump and rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- showimg.spec	21 Sep 2006 14:58:17 -0000	1.14
+++ showimg.spec	4 Oct 2006 22:34:55 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-10
 - yep, just that
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:35:15 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed,  4 Oct 2006 15:35:15 -0700
Subject: rpms/qps/devel .cvsignore, 1.11, 1.12 qps.spec, 1.11, 1.12 sources, 
	1.11, 1.12
Message-ID: <200610042235.k94MZHFf011253@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11223

Modified Files:
	.cvsignore qps.spec sources 
Log Message:
Update to 1.9.18.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2006 20:55:28 -0000	1.11
+++ .cvsignore	4 Oct 2006 22:35:15 -0000	1.12
@@ -1 +1 @@
-qps-1.9.18.5.tar.bz2
+qps-1.9.18.6.tar.bz2


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qps.spec	28 Aug 2006 20:55:28 -0000	1.11
+++ qps.spec	4 Oct 2006 22:35:15 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           qps
-Version:        1.9.18.5
+Version:        1.9.18.6
 Release:        1%{?dist}
 Summary:        Visual process status monitor
 
 Group:          Applications/System
 License:        GPL
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/3543/qps-1.9.18.5.tar.bz2
+Source0:        http://kldp.net/frs/download.php/3550/qps-1.9.18.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.6-1
+- Update to 1.9.18.6
+
 * Mon Aug 28 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.5-1
 - Update to 1.9.18.5
 - Fix mixed-use-of-spaces-and-tabs rpmlint warning


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2006 20:55:28 -0000	1.11
+++ sources	4 Oct 2006 22:35:15 -0000	1.12
@@ -1 +1 @@
-15f77d592df8ae5e24ed5a1747e85fdd  qps-1.9.18.5.tar.bz2
+a55fabf362991fd13d43e930209927ea  qps-1.9.18.6.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 22:35:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:35:20 -0700
Subject: rpms/mod_annodex/devel mod_annodex.spec,1.4,1.5
Message-ID: <200610042235.k94MZMRZ011274@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/mod_annodex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11257

Modified Files:
	mod_annodex.spec 
Log Message:
automated bump and rebuild


Index: mod_annodex.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_annodex/devel/mod_annodex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_annodex.spec	20 Sep 2006 18:57:23 -0000	1.4
+++ mod_annodex.spec	4 Oct 2006 22:35:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mod_annodex
 Version:        0.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Apache module for server-side support of annodex media
 
 Group:          System Environment/Daemons
@@ -70,6 +70,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.2.2-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.2-5
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:35:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:35:44 -0700
Subject: rpms/php-pecl-Fileinfo/devel php-pecl-Fileinfo.spec,1.1,1.2
Message-ID: <200610042235.k94MZk44011338@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/php-pecl-Fileinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11321

Modified Files:
	php-pecl-Fileinfo.spec 
Log Message:
automated bump and rebuild


Index: php-pecl-Fileinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-Fileinfo/devel/php-pecl-Fileinfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-Fileinfo.spec	21 Sep 2006 01:05:15 -0000	1.1
+++ php-pecl-Fileinfo.spec	4 Oct 2006 22:35:44 -0000	1.2
@@ -5,7 +5,7 @@
 Summary: 	Fileinfo is a PHP extension that wraps the libmagic library
 Name: 		php-pecl-Fileinfo
 Version: 	1.0.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	PHP License
 Group: 		Development/Languages
 URL: 		http://pecl.php.net/package/Fileinfo
@@ -57,6 +57,9 @@
 %{php_extdir}/fileinfo.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.3-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 17 2006 Brandon Holbrook <fedora AT theholbrooks DOT org> 1.0.3-2
 - Strict Requires: php_api
 - Grammatically correct Summary + Description



From fedora-extras-commits at redhat.com  Wed Oct  4 22:36:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:36:09 -0700
Subject: rpms/gnomesword/devel gnomesword.spec,1.12,1.13
Message-ID: <200610042236.k94MaBrT011440@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421

Modified Files:
	gnomesword.spec 
Log Message:
automated bump and rebuild


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnomesword.spec	20 Sep 2006 21:55:50 -0000	1.12
+++ gnomesword.spec	4 Oct 2006 22:36:09 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.6-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Deji Akingunola <dakingun at gmail.com> - 2.1.6-4
 - Add perl(XML::Parser) to the BRs
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:36:34 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:36:34 -0700
Subject: rpms/sword/devel sword.spec,1.10,1.11
Message-ID: <200610042236.k94MaaDZ011504@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487

Modified Files:
	sword.spec 
Log Message:
automated bump and rebuild


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sword.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sword.spec	20 Sep 2006 21:27:03 -0000	1.10
+++ sword.spec	4 Oct 2006 22:36:34 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           sword           
 Version:        1.5.8
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.8-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Deji Akingunola <dakingun at gmail.com> - 1.5.8-9
 - Take over from Michael A. Peters
 - Rebuild for FC6



From fedora-extras-commits at redhat.com  Wed Oct  4 22:36:59 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:36:59 -0700
Subject: rpms/grads/devel grads.spec,1.16,1.17
Message-ID: <200610042237.k94Mb14x011574@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11557

Modified Files:
	grads.spec 
Log Message:
automated bump and rebuild


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grads.spec	20 Sep 2006 21:25:39 -0000	1.16
+++ grads.spec	4 Oct 2006 22:36:59 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -107,6 +107,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.9b4-17
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 1.9b4-16
 - rebuild against libdap 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:37:23 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:37:23 -0700
Subject: rpms/rafkill/devel rafkill.spec,1.5,1.6
Message-ID: <200610042237.k94MbPoN011645@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/rafkill/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626

Modified Files:
	rafkill.spec 
Log Message:
automated bump and rebuild


Index: rafkill.spec
===================================================================
RCS file: /cvs/extras/rpms/rafkill/devel/rafkill.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rafkill.spec	20 Sep 2006 20:14:03 -0000	1.5
+++ rafkill.spec	4 Oct 2006 22:37:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           rafkill
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Top-down shooter with powerups
 Group:          Amusements/Games
 License:        GPL
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-3
 - Fix a crash when using the shattergun (bug 206823).
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:37:28 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed,  4 Oct 2006 15:37:28 -0700
Subject: rpms/qps/FC-5 .cvsignore, 1.11, 1.12 qps.spec, 1.11, 1.12 sources, 
	1.11, 1.12
Message-ID: <200610042237.k94MbUS7011674@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11651

Modified Files:
	.cvsignore qps.spec sources 
Log Message:
Update to 1.9.18.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2006 20:57:55 -0000	1.11
+++ .cvsignore	4 Oct 2006 22:37:28 -0000	1.12
@@ -1 +1 @@
-qps-1.9.18.5.tar.bz2
+qps-1.9.18.6.tar.bz2


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/qps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qps.spec	28 Aug 2006 20:57:55 -0000	1.11
+++ qps.spec	4 Oct 2006 22:37:28 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           qps
-Version:        1.9.18.5
+Version:        1.9.18.6
 Release:        1%{?dist}
 Summary:        Visual process status monitor
 
 Group:          Applications/System
 License:        GPL
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/3543/qps-1.9.18.5.tar.bz2
+Source0:        http://kldp.net/frs/download.php/3550/qps-1.9.18.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.6-1
+- Update to 1.9.18.6
+
 * Mon Aug 28 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.5-1
 - Update to 1.9.18.5
 - Fix mixed-use-of-spaces-and-tabs rpmlint warning


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2006 20:57:55 -0000	1.11
+++ sources	4 Oct 2006 22:37:28 -0000	1.12
@@ -1 +1 @@
-15f77d592df8ae5e24ed5a1747e85fdd  qps-1.9.18.5.tar.bz2
+a55fabf362991fd13d43e930209927ea  qps-1.9.18.6.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 22:37:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:37:48 -0700
Subject: rpms/libannodex/devel libannodex.spec,1.7,1.8
Message-ID: <200610042237.k94Mbohf011772@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libannodex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11751

Modified Files:
	libannodex.spec 
Log Message:
automated bump and rebuild


Index: libannodex.spec
===================================================================
RCS file: /cvs/extras/rpms/libannodex/devel/libannodex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libannodex.spec	20 Sep 2006 18:56:15 -0000	1.7
+++ libannodex.spec	4 Oct 2006 22:37:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libannodex
 Version:        0.7.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for annotating and indexing networked media
 
 Group:          System Environment/Libraries
@@ -103,6 +103,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7.3-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.7.4-4
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:38:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:38:12 -0700
Subject: rpms/python-twisted/devel python-twisted.spec,1.6,1.7
Message-ID: <200610042238.k94McEC0011836@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/python-twisted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11819

Modified Files:
	python-twisted.spec 
Log Message:
automated bump and rebuild


Index: python-twisted.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted/devel/python-twisted.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-twisted.spec	20 Sep 2006 18:57:47 -0000	1.6
+++ python-twisted.spec	4 Oct 2006 22:38:12 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Event-driven networking framework written in Python
 Name: python-twisted
 Version: 1.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: LGPL
 Group: Applications/Internet
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.0-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 1.3.0-5
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:38:40 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:38:40 -0700
Subject: rpms/libcmml/devel libcmml.spec,1.4,1.5
Message-ID: <200610042238.k94McgKk011900@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libcmml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11883

Modified Files:
	libcmml.spec 
Log Message:
automated bump and rebuild


Index: libcmml.spec
===================================================================
RCS file: /cvs/extras/rpms/libcmml/devel/libcmml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libcmml.spec	20 Sep 2006 18:56:38 -0000	1.4
+++ libcmml.spec	4 Oct 2006 22:38:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libcmml
 Version:        0.9.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for handling Continuous Media Markup Language
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.1-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.1-2
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:39:04 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:39:04 -0700
Subject: rpms/liboggz/devel liboggz.spec,1.8,1.9
Message-ID: <200610042239.k94Md6BB011964@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/liboggz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11947

Modified Files:
	liboggz.spec 
Log Message:
automated bump and rebuild


Index: liboggz.spec
===================================================================
RCS file: /cvs/extras/rpms/liboggz/devel/liboggz.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- liboggz.spec	20 Sep 2006 18:57:01 -0000	1.8
+++ liboggz.spec	4 Oct 2006 22:39:04 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           liboggz
 Version:        0.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple programming interface for Ogg files and streams
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.4-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.4-2
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:39:29 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:39:29 -0700
Subject: rpms/gnet2/devel gnet2.spec,1.9,1.10
Message-ID: <200610042239.k94MdVmL012028@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnet2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011

Modified Files:
	gnet2.spec 
Log Message:
automated bump and rebuild


Index: gnet2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnet2/devel/gnet2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnet2.spec	20 Sep 2006 15:49:54 -0000	1.9
+++ gnet2.spec	4 Oct 2006 22:39:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gnet2
 Version:        2.0.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A simple network library built upon glib
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.7-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Tomas Mraz <tmraz at redhat.com> 2.0.7-8
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:39:54 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:39:54 -0700
Subject: rpms/xfce4-weather-plugin/devel xfce4-weather-plugin.spec,1.6,1.7
Message-ID: <200610042239.k94MdukR012092@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12075

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
automated bump and rebuild


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/xfce4-weather-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-weather-plugin.spec	8 Sep 2006 20:18:30 -0000	1.6
+++ xfce4-weather-plugin.spec	4 Oct 2006 22:39:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -40,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.9-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.9-7
 - Mass rebuild for Fedora Core 6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:40:18 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:40:18 -0700
Subject: rpms/perl-Gnome2-Canvas/devel perl-Gnome2-Canvas.spec,1.2,1.3
Message-ID: <200610042240.k94MeKQ4012160@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Gnome2-Canvas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12143

Modified Files:
	perl-Gnome2-Canvas.spec 
Log Message:
automated bump and rebuild


Index: perl-Gnome2-Canvas.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Canvas/devel/perl-Gnome2-Canvas.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Gnome2-Canvas.spec	20 Sep 2006 03:19:45 -0000	1.2
+++ perl-Gnome2-Canvas.spec	4 Oct 2006 22:40:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-Canvas
 Version:        1.002
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An engine for structured graphics in Gnome2
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.002-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.002-5
 - taking co-maintainership post-non-massrebuild
 - tweak %%files to properly own all directories under perl_vendorarch/auto/



From fedora-extras-commits at redhat.com  Wed Oct  4 22:40:43 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:40:43 -0700
Subject: rpms/python-enchant/devel python-enchant.spec,1.7,1.8
Message-ID: <200610042240.k94MejBA012224@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/python-enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12207

Modified Files:
	python-enchant.spec 
Log Message:
automated bump and rebuild


Index: python-enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-enchant.spec	20 Sep 2006 00:10:35 -0000	1.7
+++ python-enchant.spec	4 Oct 2006 22:40:43 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           python-enchant
 Version:        1.1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python bindings for Enchant spellchecking library
 
 Group:          Development/Languages
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.1.5-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1.5-4
 - Rebuild for FC-6.
 - Unghost .pyo files.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:41:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:41:09 -0700
Subject: rpms/t1utils/devel t1utils.spec,1.12,1.13
Message-ID: <200610042241.k94MfBlG012288@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/t1utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12269

Modified Files:
	t1utils.spec 
Log Message:
automated bump and rebuild


Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- t1utils.spec	20 Sep 2006 00:06:58 -0000	1.12
+++ t1utils.spec	4 Oct 2006 22:41:09 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		t1utils
 Version:	1.32
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.32-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.32-7
 - Rebuild for FC-6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:41:34 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:41:34 -0700
Subject: rpms/t1lib/devel t1lib.spec,1.12,1.13
Message-ID: <200610042241.k94MfaPa012352@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12335

Modified Files:
	t1lib.spec 
Log Message:
automated bump and rebuild


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- t1lib.spec	20 Sep 2006 00:04:22 -0000	1.12
+++ t1lib.spec	4 Oct 2006 22:41:34 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 5.1.0-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.0-7
 - Rebuild for FC-6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:41:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:41:58 -0700
Subject: rpms/rman/devel rman.spec,1.3,1.4
Message-ID: <200610042242.k94Mg0tB012416@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12399

Modified Files:
	rman.spec 
Log Message:
automated bump and rebuild


Index: rman.spec
===================================================================
RCS file: /cvs/extras/rpms/rman/devel/rman.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rman.spec	19 Sep 2006 23:57:55 -0000	1.3
+++ rman.spec	4 Oct 2006 22:41:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rman
 Version:	3.2 
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Converts man pages to various other formats
 
 Group:		System Environment/Base
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.2-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 3.2-4
 - Rebuild for FC-6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:42:23 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:42:23 -0700
Subject: rpms/PyX/devel PyX.spec,1.3,1.4
Message-ID: <200610042242.k94MgPv9012480@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/PyX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12463

Modified Files:
	PyX.spec 
Log Message:
automated bump and rebuild


Index: PyX.spec
===================================================================
RCS file: /cvs/extras/rpms/PyX/devel/PyX.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PyX.spec	19 Sep 2006 23:52:07 -0000	1.3
+++ PyX.spec	4 Oct 2006 22:42:22 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           PyX
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python graphics package
 
 Group:          Applications/Publishing
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.9-2
 - Rebuild for FC-6.
 - Unghost .pyo files.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:42:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:42:50 -0700
Subject: rpms/tellico/devel tellico.spec,1.1,1.2
Message-ID: <200610042242.k94Mgq0V012544@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/tellico/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12527

Modified Files:
	tellico.spec 
Log Message:
automated bump and rebuild


Index: tellico.spec
===================================================================
RCS file: /cvs/extras/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tellico.spec	19 Sep 2006 23:21:06 -0000	1.1
+++ tellico.spec	4 Oct 2006 22:42:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tellico
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.2-1
 - Revert desktop file to original one, and drop vendor.
 - New upstream release.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:43:14 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:43:14 -0700
Subject: rpms/rdiff-backup/devel rdiff-backup.spec,1.12,1.13
Message-ID: <200610042243.k94MhGJq012608@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12591

Modified Files:
	rdiff-backup.spec 
Log Message:
automated bump and rebuild


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rdiff-backup.spec	19 Sep 2006 23:05:37 -0000	1.12
+++ rdiff-backup.spec	4 Oct 2006 22:43:14 -0000	1.13
@@ -3,7 +3,7 @@
 Version: 1.0.4
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
@@ -53,6 +53,9 @@
 %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.4-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> - 1.0.4-2
 - Build for fc6
 - No longer need to ghost pyo files (bug 205431)



From fedora-extras-commits at redhat.com  Wed Oct  4 22:43:40 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:43:40 -0700
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.3,1.4
Message-ID: <200610042243.k94MhglM012672@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12655

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
automated bump and rebuild


Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Readonly-XS.spec	19 Sep 2006 22:57:10 -0000	1.3
+++ perl-Readonly-XS.spec	4 Oct 2006 22:43:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Companion module for Readonly.pm
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.04-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-4
 - bump for mass rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:44:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:44:05 -0700
Subject: rpms/gnome-build/devel gnome-build.spec,1.3,1.4
Message-ID: <200610042244.k94Mi7CB012741@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnome-build/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12724

Modified Files:
	gnome-build.spec 
Log Message:
automated bump and rebuild


Index: gnome-build.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-build/devel/gnome-build.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-build.spec	19 Sep 2006 22:41:32 -0000	1.3
+++ gnome-build.spec	4 Oct 2006 22:44:05 -0000	1.4
@@ -1,7 +1,7 @@
 Name: gnome-build
 Summary: GNOME Build Framework
 Version: 0.1.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-build/0.1/%{name}-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %{_libdir}/libgbf-widgets-1.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.1.3-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-10
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:44:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:44:30 -0700
Subject: rpms/leafnode/devel leafnode.spec,1.9,1.10
Message-ID: <200610042244.k94MiWnm012807@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/leafnode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12790

Modified Files:
	leafnode.spec 
Log Message:
automated bump and rebuild


Index: leafnode.spec
===================================================================
RCS file: /cvs/extras/rpms/leafnode/devel/leafnode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- leafnode.spec	19 Sep 2006 22:41:33 -0000	1.9
+++ leafnode.spec	4 Oct 2006 22:44:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name: leafnode
 Version: 1.11.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: Leaf site offline NNTP server
 License: MIT, GPL, LGPL
@@ -94,6 +94,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.11.5-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> - 1.11.5-1
 - Take over maintainership (see bug 185883)
 - Update to 1.11.5-1



From fedora-extras-commits at redhat.com  Wed Oct  4 22:44:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:44:55 -0700
Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler.spec,1.11,1.12
Message-ID: <200610042244.k94MivL7012876@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dap-hdf4_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12859

Modified Files:
	dap-hdf4_handler.spec 
Log Message:
automated bump and rebuild


Index: dap-hdf4_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dap-hdf4_handler.spec	19 Sep 2006 22:39:03 -0000	1.11
+++ dap-hdf4_handler.spec	4 Oct 2006 22:44:55 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:         HDF4 data handler for the OPeNDAP Data server
 Name:            dap-hdf4_handler
 Version:         3.7.2
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz
@@ -37,6 +37,9 @@
 %doc README
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.2-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-2
 - update to 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:45:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:45:20 -0700
Subject: rpms/libnc-dap/devel libnc-dap.spec,1.10,1.11
Message-ID: <200610042245.k94MjMiO012942@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libnc-dap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12925

Modified Files:
	libnc-dap.spec 
Log Message:
automated bump and rebuild


Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libnc-dap.spec	19 Sep 2006 22:23:24 -0000	1.10
+++ libnc-dap.spec	4 Oct 2006 22:45:20 -0000	1.11
@@ -1,7 +1,7 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
 Version: 3.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
 URL: http://www.opendap.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.6.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-3
 - rebuild against libdap 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:45:46 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:45:46 -0700
Subject: rpms/vorbisgain/devel vorbisgain.spec,1.2,1.3
Message-ID: <200610042245.k94MjmJ2013006@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/vorbisgain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12989

Modified Files:
	vorbisgain.spec 
Log Message:
automated bump and rebuild


Index: vorbisgain.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbisgain/devel/vorbisgain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbisgain.spec	19 Sep 2006 22:22:42 -0000	1.2
+++ vorbisgain.spec	4 Oct 2006 22:45:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           vorbisgain
 Version:        0.34
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Adds tags to Ogg Vorbis files to adjust the volume
 
 Group:          Applications/Multimedia
@@ -42,6 +42,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.34-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.34-2
 - Rebuild for FC6.
 - Minor formatting changes.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:46:13 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:46:13 -0700
Subject: rpms/dap-freeform_handler/devel dap-freeform_handler.spec,1.7,1.8
Message-ID: <200610042246.k94MkFvq013070@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dap-freeform_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13053

Modified Files:
	dap-freeform_handler.spec 
Log Message:
automated bump and rebuild


Index: dap-freeform_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/dap-freeform_handler.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dap-freeform_handler.spec	19 Sep 2006 22:22:09 -0000	1.7
+++ dap-freeform_handler.spec	4 Oct 2006 22:46:12 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:         FreeForm data handler for the OPeNDAP Data server
 Name:            dap-freeform_handler
 Version:         3.7.2
-Release:         1%{?dist}
+Release:         2%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/freeform_handler-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %doc COPYING COPYRIGHT NEWS README
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-1
 - update to 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:46:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Oct 2006 15:46:26 -0700
Subject: rpms/kdesvn/devel .cvsignore, 1.11, 1.12 kdesvn.spec, 1.21,
	1.22 sources, 1.11, 1.12
Message-ID: <200610042246.k94MkS7b013133@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13083

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
Update to 0.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Sep 2006 20:17:30 -0000	1.11
+++ .cvsignore	4 Oct 2006 22:46:26 -0000	1.12
@@ -1 +1 @@
-kdesvn-0.9.3.tar.bz2
+kdesvn-0.10.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kdesvn.spec	3 Oct 2006 21:54:43 -0000	1.21
+++ kdesvn.spec	4 Oct 2006 22:46:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           kdesvn
-Version:        0.9.3
-Release:        2%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -130,7 +130,10 @@
 
 
 %changelog
-* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-2
+* Wed Oct  4 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.10.0-1
+- Update to 0.10.0
+
+* Tue Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Sep 2006 20:17:30 -0000	1.11
+++ sources	4 Oct 2006 22:46:26 -0000	1.12
@@ -1 +1 @@
-542a70a1b158fb99757593cdeb263b2a  kdesvn-0.9.3.tar.bz2
+896d62ac8687236f05e984ba6cd69e6b  kdesvn-0.10.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 22:46:37 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:46:37 -0700
Subject: rpms/dap-netcdf_handler/devel dap-netcdf_handler.spec,1.7,1.8
Message-ID: <200610042246.k94MkdWU013196@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dap-netcdf_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13176

Modified Files:
	dap-netcdf_handler.spec 
Log Message:
automated bump and rebuild


Index: dap-netcdf_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/dap-netcdf_handler.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dap-netcdf_handler.spec	19 Sep 2006 22:11:02 -0000	1.7
+++ dap-netcdf_handler.spec	4 Oct 2006 22:46:37 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:         NetCDF 3 data handler for the OPeNDAP Data server
 Name:            dap-netcdf_handler
 Version:         3.7.3
-Release:         1%{?dist}
+Release:         2%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %doc README
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.3-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.7.3-1
 - update to 3.7.3
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:47:02 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:47:02 -0700
Subject: rpms/z88dk/devel z88dk.spec,1.3,1.4
Message-ID: <200610042247.k94Ml4SC013264@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13247

Modified Files:
	z88dk.spec 
Log Message:
automated bump and rebuild


Index: z88dk.spec
===================================================================
RCS file: /cvs/extras/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- z88dk.spec	19 Sep 2006 21:28:10 -0000	1.3
+++ z88dk.spec	4 Oct 2006 22:47:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Artistic
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.6-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.6-9
 - rebuild
 - minor spec file changes



From fedora-extras-commits at redhat.com  Wed Oct  4 22:47:27 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:47:27 -0700
Subject: rpms/libdap/devel libdap.spec,1.7,1.8
Message-ID: <200610042247.k94MlTs2013331@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libdap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314

Modified Files:
	libdap.spec 
Log Message:
automated bump and rebuild


Index: libdap.spec
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libdap.spec	19 Sep 2006 21:12:00 -0000	1.7
+++ libdap.spec	4 Oct 2006 22:47:27 -0000	1.8
@@ -2,7 +2,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
 Version: 3.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz
@@ -82,6 +82,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-1
 - update to 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:47:51 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:47:51 -0700
Subject: rpms/lsscsi/devel lsscsi.spec,1.2,1.3
Message-ID: <200610042247.k94MlrMK013397@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lsscsi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13380

Modified Files:
	lsscsi.spec 
Log Message:
automated bump and rebuild


Index: lsscsi.spec
===================================================================
RCS file: /cvs/extras/rpms/lsscsi/devel/lsscsi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lsscsi.spec	19 Sep 2006 15:51:11 -0000	1.2
+++ lsscsi.spec	4 Oct 2006 22:47:51 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:        List SCSI devices (or hosts) and associated information
 Name:           lsscsi
 Version:        0.17
-Release:        3
+Release:        4
 License:        GPL
 Group:          Applications/System
 Source0:        http://www.torque.net/scsi/%{name}-%{version}.tgz
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.17-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 - Chip Coldwell <coldwell at redhat.com> 0.17-3
 - bump the EVR for FC6 rebuild
 * Mon Jul 17 2006 - Chip Coldwell <coldwell at redhat.com> 0.17-2



From fedora-extras-commits at redhat.com  Wed Oct  4 22:48:16 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:48:16 -0700
Subject: rpms/basket/devel basket.spec,1.7,1.8
Message-ID: <200610042248.k94MmI4C013463@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/basket/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13446

Modified Files:
	basket.spec 
Log Message:
automated bump and rebuild


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/basket.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- basket.spec	19 Sep 2006 14:45:12 -0000	1.7
+++ basket.spec	4 Oct 2006 22:48:16 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           basket
 Summary:        Notes taker for KDE
 Version:        0.5.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 URL:           	http://basket.kde.org/
 Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
 Patch0:         basket-0.5.0-64bits.patch
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
 - add explicit linking to libfam
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:48:41 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:48:41 -0700
Subject: rpms/liblrdf/devel liblrdf.spec,1.4,1.5
Message-ID: <200610042248.k94MmhRL013535@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/liblrdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13518

Modified Files:
	liblrdf.spec 
Log Message:
automated bump and rebuild


Index: liblrdf.spec
===================================================================
RCS file: /cvs/extras/rpms/liblrdf/devel/liblrdf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- liblrdf.spec	19 Sep 2006 12:19:42 -0000	1.4
+++ liblrdf.spec	4 Oct 2006 22:48:40 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:      Library for manipulating RDF files describing LADSPA plugins
 Name:         liblrdf
 Version:      0.4.0
-Release:      8%{?dist}
+Release:      9%{?dist}
 License:      GPL
 Group:        System Environment/Libraries
 URL:          http://lrdf.sourceforge.net/
@@ -56,6 +56,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.0-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.4.0-8
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:49:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:49:08 -0700
Subject: rpms/azureus/devel azureus.spec,1.36,1.37
Message-ID: <200610042249.k94MnA8T013607@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13590

Modified Files:
	azureus.spec 
Log Message:
automated bump and rebuild


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- azureus.spec	19 Sep 2006 12:22:31 -0000	1.36
+++ azureus.spec	4 Oct 2006 22:49:08 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -206,6 +206,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.5.0.0-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 2.5.0.0-2
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:49:33 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:49:33 -0700
Subject: rpms/dssi/devel dssi.spec,1.4,1.5
Message-ID: <200610042249.k94MnZhr013672@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13655

Modified Files:
	dssi.spec 
Log Message:
automated bump and rebuild


Index: dssi.spec
===================================================================
RCS file: /cvs/extras/rpms/dssi/devel/dssi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dssi.spec	19 Sep 2006 12:22:10 -0000	1.4
+++ dssi.spec	4 Oct 2006 22:49:32 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:      Disposable Soft Synth Interface
 Name:         dssi
 Version:      0.9.1
-Release:      9%{?dist}
+Release:      10%{?dist}
 License:      MIT
 Group:        Applications/Multimedia
 URL:          http://dssi.sourceforge.net/
@@ -90,6 +90,9 @@
 %{_libdir}/pkgconfig/dssi.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.1-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 18 2006 Anthony Green <green at redhat.com> 0.9.1-9
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:49:57 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:49:57 -0700
Subject: rpms/fluidsynth-dssi/devel fluidsynth-dssi.spec,1.3,1.4
Message-ID: <200610042249.k94Mnxtl013736@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fluidsynth-dssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13719

Modified Files:
	fluidsynth-dssi.spec 
Log Message:
automated bump and rebuild


Index: fluidsynth-dssi.spec
===================================================================
RCS file: /cvs/extras/rpms/fluidsynth-dssi/devel/fluidsynth-dssi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fluidsynth-dssi.spec	19 Sep 2006 12:21:48 -0000	1.3
+++ fluidsynth-dssi.spec	4 Oct 2006 22:49:57 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:    DSSI implementation of Fluidsynth
 Name:       fluidsynth-dssi
 Version:    0.9.1
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://dssi.sourceforge.net/download.html#FluidSynth-DSSI
@@ -40,6 +40,9 @@
 %{_libdir}/dssi/fluidsynth-dssi*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.1-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.9.1-6
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:50:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:50:30 -0700
Subject: rpms/hexter-dssi/devel hexter-dssi.spec,1.3,1.4
Message-ID: <200610042250.k94MoWDi013800@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/hexter-dssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13783

Modified Files:
	hexter-dssi.spec 
Log Message:
automated bump and rebuild


Index: hexter-dssi.spec
===================================================================
RCS file: /cvs/extras/rpms/hexter-dssi/devel/hexter-dssi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hexter-dssi.spec	19 Sep 2006 12:21:28 -0000	1.3
+++ hexter-dssi.spec	4 Oct 2006 22:50:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:      DSSI software synthesizer plugin emulating DX7
 Name:         hexter-dssi
 Version:      0.5.9
-Release:      5%{?dist}
+Release:      6%{?dist}
 URL:          http://dssi.sourceforge.net/hexter.html
 Source0:      http://easynews.dl.sourceforge.net/sourceforge/dssi/hexter-0.5.9.tar.gz
 License:      GPL
@@ -49,6 +49,9 @@
 %exclude %{_libdir}/dssi/hexter.la
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.9-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.5.9-5
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:50:54 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:50:54 -0700
Subject: rpms/liblo/devel liblo.spec,1.7,1.8
Message-ID: <200610042250.k94Mounk013864@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/liblo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13847

Modified Files:
	liblo.spec 
Log Message:
automated bump and rebuild


Index: liblo.spec
===================================================================
RCS file: /cvs/extras/rpms/liblo/devel/liblo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liblo.spec	19 Sep 2006 12:20:06 -0000	1.7
+++ liblo.spec	4 Oct 2006 22:50:54 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:      Open Sound Control library
 Name:         liblo
 Version:      0.23
-Release:      10%{?dist}
+Release:      11%{?dist}
 License:      GPL
 Group:        System Environment/Libraries
 URL:          http://liblo.sourceforge.net
@@ -64,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.23-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.23-10
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:51:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:51:20 -0700
Subject: rpms/kawa/devel kawa.spec,1.12,1.13
Message-ID: <200610042251.k94MpMaM013928@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13909

Modified Files:
	kawa.spec 
Log Message:
automated bump and rebuild


Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kawa.spec	19 Sep 2006 12:20:47 -0000	1.12
+++ kawa.spec	4 Oct 2006 22:51:20 -0000	1.13
@@ -5,7 +5,7 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -86,6 +86,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.8-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 1:1.8-9
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:51:53 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:51:53 -0700
Subject: rpms/ardour/devel ardour.spec,1.4,1.5
Message-ID: <200610042251.k94Mptih013992@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ardour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13973

Modified Files:
	ardour.spec 
Log Message:
automated bump and rebuild


Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ardour.spec	19 Sep 2006 12:22:53 -0000	1.4
+++ ardour.spec	4 Oct 2006 22:51:53 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
 Version:       0.99.3
-Release:       6%{?dist}
+Release:       7%{?dist}
 Source:        http://ardour.org/files/releases/ardour-0.99.3.tar.bz2
 Source1:       ardour.png
 Source2:       ardour.desktop
@@ -110,6 +110,9 @@
 %{_datadir}/applications/*ardour.desktop
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.99.3-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.99.3-6
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:52:18 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:52:18 -0700
Subject: rpms/mxml/devel mxml.spec,1.4,1.5
Message-ID: <200610042252.k94MqKHK014056@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/mxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14039

Modified Files:
	mxml.spec 
Log Message:
automated bump and rebuild


Index: mxml.spec
===================================================================
RCS file: /cvs/extras/rpms/mxml/devel/mxml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mxml.spec	19 Sep 2006 12:19:21 -0000	1.4
+++ mxml.spec	4 Oct 2006 22:52:18 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:      Miniature XML development library
 Name:         mxml
 Version:      2.2.2
-Release:      6%{?dist}
+Release:      7%{?dist}
 License:      LGPL
 Group:        System Environment/Libraries
 URL:          http://www.easysw.com/~mike/mxml/
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/mxml.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.2-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 2.2.2-6
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:52:43 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:52:43 -0700
Subject: rpms/raptor/devel raptor.spec,1.5,1.6
Message-ID: <200610042252.k94MqjWM014120@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14103

Modified Files:
	raptor.spec 
Log Message:
automated bump and rebuild


Index: raptor.spec
===================================================================
RCS file: /cvs/extras/rpms/raptor/devel/raptor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- raptor.spec	19 Sep 2006 12:18:59 -0000	1.5
+++ raptor.spec	4 Oct 2006 22:52:43 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.9
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       LGPL or Apache License Version 2.0
 Group:         System Environment/Libraries
 Source:        http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.9.tar.gz
@@ -70,6 +70,9 @@
 %{_bindir}/raptor-config
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.4.9-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 1.4.9-4
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:53:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:53:08 -0700
Subject: rpms/itext/devel itext.spec,1.8,1.9
Message-ID: <200610042253.k94MrAtt014184@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/itext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14167

Modified Files:
	itext.spec 
Log Message:
automated bump and rebuild


Index: itext.spec
===================================================================
RCS file: /cvs/extras/rpms/itext/devel/itext.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- itext.spec	19 Sep 2006 12:21:08 -0000	1.8
+++ itext.spec	4 Oct 2006 22:53:07 -0000	1.9
@@ -3,7 +3,7 @@
 Summary:        A Free Java-PDF library
 Name:           itext
 Version:        1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MPL/LGPL
 URL:            http://www.lowagie.com/iText/
 Group:          Development/Libraries
@@ -113,6 +113,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> - 1.3-2
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:53:32 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:53:32 -0700
Subject: rpms/swh-plugins/devel swh-plugins.spec,1.10,1.11
Message-ID: <200610042253.k94MrYP1014248@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14231

Modified Files:
	swh-plugins.spec 
Log Message:
automated bump and rebuild


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- swh-plugins.spec	19 Sep 2006 12:18:12 -0000	1.10
+++ swh-plugins.spec	4 Oct 2006 22:53:32 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.15
-Release:      3%{?dist}
+Release:      4%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
@@ -38,6 +38,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.15-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.4.15-3
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:53:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:53:58 -0700
Subject: rpms/zynaddsubfx/devel zynaddsubfx.spec,1.7,1.8
Message-ID: <200610042254.k94Ms0Wl014312@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/zynaddsubfx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14295

Modified Files:
	zynaddsubfx.spec 
Log Message:
automated bump and rebuild


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/extras/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zynaddsubfx.spec	19 Sep 2006 12:16:53 -0000	1.7
+++ zynaddsubfx.spec	4 Oct 2006 22:53:57 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.2.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -148,6 +148,9 @@
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.1-13
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com>  2.2.1-12
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:54:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:54:22 -0700
Subject: rpms/sabayon/devel sabayon.spec,1.26,1.27
Message-ID: <200610042254.k94MsOUg014376@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14359

Modified Files:
	sabayon.spec 
Log Message:
automated bump and rebuild


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sabayon.spec	19 Sep 2006 09:50:25 -0000	1.26
+++ sabayon.spec	4 Oct 2006 22:54:22 -0000	1.27
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.12.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -258,6 +258,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.12.4-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Alexander Larsson <alexl at redhat.com> - 2.12.4-3
 - Rebuild with new toolchain
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:55:00 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:55:00 -0700
Subject: rpms/synce-trayicon/devel synce-trayicon.spec,1.6,1.7
Message-ID: <200610042255.k94Mt2S5014440@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14421

Modified Files:
	synce-trayicon.spec 
Log Message:
automated bump and rebuild


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/synce-trayicon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- synce-trayicon.spec	19 Sep 2006 07:11:35 -0000	1.6
+++ synce-trayicon.spec	4 Oct 2006 22:55:00 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
 Version:        0.9.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -55,6 +55,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.0-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.0-7
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 22:55:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:55:25 -0700
Subject: rpms/synce-software-manager/devel synce-software-manager.spec, 1.5, 
	1.6
Message-ID: <200610042255.k94MtRrn014504@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14487

Modified Files:
	synce-software-manager.spec 
Log Message:
automated bump and rebuild


Index: synce-software-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/devel/synce-software-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- synce-software-manager.spec	19 Sep 2006 06:44:46 -0000	1.5
+++ synce-software-manager.spec	4 Oct 2006 22:55:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           synce-software-manager
 Version:        0.9.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Software manager for use with synce
 
 Group:          Applications/Communications
@@ -64,6 +64,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.0-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.9.0-6
 - FE6 rebuild
 - fix BR



From fedora-extras-commits at redhat.com  Wed Oct  4 22:55:49 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:55:49 -0700
Subject: rpms/pengupop/devel pengupop.spec,1.4,1.5
Message-ID: <200610042255.k94MtpmP014568@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pengupop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14551

Modified Files:
	pengupop.spec 
Log Message:
automated bump and rebuild


Index: pengupop.spec
===================================================================
RCS file: /cvs/extras/rpms/pengupop/devel/pengupop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pengupop.spec	19 Sep 2006 00:41:19 -0000	1.4
+++ pengupop.spec	4 Oct 2006 22:55:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           pengupop
 Version:        2.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Networked Game in the vein of Move/Puzzle Bobble
 
 Group:          Amusements/Games
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.4-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 13 2006 Hugo Cisneiros <hugo at devin.com.br> 2.1.4-2
 - Rebuilt for FC6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:56:14 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:56:14 -0700
Subject: rpms/pdsh/devel pdsh.spec,1.8,1.9
Message-ID: <200610042256.k94MuGVl014632@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pdsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14615

Modified Files:
	pdsh.spec 
Log Message:
automated bump and rebuild


Index: pdsh.spec
===================================================================
RCS file: /cvs/extras/rpms/pdsh/devel/pdsh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pdsh.spec	19 Sep 2006 00:25:46 -0000	1.8
+++ pdsh.spec	4 Oct 2006 22:56:14 -0000	1.9
@@ -1,6 +1,6 @@
 Name: pdsh
 Version: 2.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Summary: Parallel remote shell program
 
@@ -433,6 +433,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.11-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Ben Woodard <woodard at redhat.com> 2.11-4
 - bump version for fc6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:56:43 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:56:43 -0700
Subject: rpms/galeon/devel galeon.spec,1.23,1.24
Message-ID: <200610042256.k94Mujb7014696@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14679

Modified Files:
	galeon.spec 
Log Message:
automated bump and rebuild


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- galeon.spec	18 Sep 2006 22:15:18 -0000	1.23
+++ galeon.spec	4 Oct 2006 22:56:43 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.3-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Denis Leroy <denis at poolshark.org> - 2.0.3-1
 - Update to 2.0.3
 - Removed x86_64 autoreconf



From fedora-extras-commits at redhat.com  Wed Oct  4 22:57:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:57:08 -0700
Subject: rpms/fatsort/devel fatsort.spec,1.6,1.7
Message-ID: <200610042257.k94MvAUk014760@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fatsort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14743

Modified Files:
	fatsort.spec 
Log Message:
automated bump and rebuild


Index: fatsort.spec
===================================================================
RCS file: /cvs/extras/rpms/fatsort/devel/fatsort.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fatsort.spec	18 Sep 2006 21:47:39 -0000	1.6
+++ fatsort.spec	4 Oct 2006 22:57:08 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           fatsort
 Version:        0.9.6.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Fatsort sorts the FAT of FAT16 and FAT32 filesystems
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.6.1-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Till Maas <opensource[AT]till.name> - 0.9.6.1-7
 - Fixing typos in changelog
 * Sat Sep 02 2006 Till Maas <opensource[AT]till.name> - 0.9.6.1-6



From fedora-extras-commits at redhat.com  Wed Oct  4 22:57:41 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:57:41 -0700
Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.17,1.18
Message-ID: <200610042257.k94MvhYG014824@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14807

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
automated bump and rebuild


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- R-RScaLAPACK.spec	18 Sep 2006 21:28:42 -0000	1.17
+++ R-RScaLAPACK.spec	4 Oct 2006 22:57:41 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: Freely distributable
 URL: http://cran.r-project.org/contrib
@@ -65,6 +65,9 @@
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.1-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-6
 - BR: lam-devel
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:58:06 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:58:06 -0700
Subject: rpms/gajim/devel gajim.spec,1.14,1.15
Message-ID: <200610042258.k94Mw8Mp014888@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871

Modified Files:
	gajim.spec 
Log Message:
automated bump and rebuild


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gajim.spec	18 Sep 2006 20:20:41 -0000	1.14
+++ gajim.spec	4 Oct 2006 22:58:06 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gajim
 Version:        0.10.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
@@ -80,6 +80,9 @@
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.10.1-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.10.1-2
 - Rebuild for FE6
 - Fix mixed-use-of-spaces-and-tabs rpmlint warning



From fedora-extras-commits at redhat.com  Wed Oct  4 22:58:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:58:30 -0700
Subject: rpms/util-vserver/devel util-vserver.spec,1.19,1.20
Message-ID: <200610042258.k94MwWCf014952@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14935

Modified Files:
	util-vserver.spec 
Log Message:
automated bump and rebuild


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- util-vserver.spec	18 Sep 2006 18:25:20 -0000	1.19
+++ util-vserver.spec	4 Oct 2006 22:58:30 -0000	1.20
@@ -21,7 +21,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.210
-Release:	%release_func 4
+Release: %release_func 5
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -351,6 +351,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.30.210-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-4
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:58:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:58:55 -0700
Subject: rpms/rekall/devel rekall.spec,1.16,1.17
Message-ID: <200610042258.k94MwvMk015018@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15001

Modified Files:
	rekall.spec 
Log Message:
automated bump and rebuild


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rekall.spec	18 Sep 2006 13:45:39 -0000	1.16
+++ rekall.spec	4 Oct 2006 22:58:55 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
@@ -255,6 +255,9 @@
 %{_libdir}/python*/site-packages/rkdcop.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.4.3-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-4
 - fix 64 bit, nuke -common, add new files
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:59:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:59:20 -0700
Subject: rpms/libsynaptics/devel libsynaptics.spec,1.3,1.4
Message-ID: <200610042259.k94MxMp0015085@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libsynaptics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15068

Modified Files:
	libsynaptics.spec 
Log Message:
automated bump and rebuild


Index: libsynaptics.spec
===================================================================
RCS file: /cvs/extras/rpms/libsynaptics/devel/libsynaptics.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsynaptics.spec	30 Aug 2006 03:14:32 -0000	1.3
+++ libsynaptics.spec	4 Oct 2006 22:59:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libsynaptics
 Version:        0.14.6b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Synaptics touchpad driver library
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.14.6b-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Aug 29 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.14.6b-3
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:59:45 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:59:45 -0700
Subject: rpms/liferea/devel liferea.spec,1.50,1.51
Message-ID: <200610042259.k94MxlUo015149@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15132

Modified Files:
	liferea.spec 
Log Message:
automated bump and rebuild


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- liferea.spec	18 Sep 2006 16:33:25 -0000	1.50
+++ liferea.spec	4 Oct 2006 22:59:45 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.23-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-1
 - Update to 1.0.23.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:00:10 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:00:10 -0700
Subject: rpms/cyrus-imapd/devel cyrus-imapd.spec,1.15,1.16
Message-ID: <200610042300.k94N0C8u015225@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15205

Modified Files:
	cyrus-imapd.spec 
Log Message:
automated bump and rebuild


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cyrus-imapd.spec	18 Sep 2006 15:04:32 -0000	1.15
+++ cyrus-imapd.spec	4 Oct 2006 23:00:10 -0000	1.16
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -806,6 +806,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.3.7-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 John Dennis <jdennis at redhat.com> - 2.3.7-3
 - bump rev for rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:00:42 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:00:42 -0700
Subject: rpms/filelight/devel filelight.spec,1.1,1.2
Message-ID: <200610042300.k94N0ijC015289@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/filelight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15272

Modified Files:
	filelight.spec 
Log Message:
automated bump and rebuild


Index: filelight.spec
===================================================================
RCS file: /cvs/extras/rpms/filelight/devel/filelight.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filelight.spec	17 Sep 2006 20:07:14 -0000	1.1
+++ filelight.spec	4 Oct 2006 23:00:42 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Graphical disk usage statistics
 Name: filelight
 Version: 1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 11 2006 Neal Becker <ndbecker2 at gmail.com> - 1.0-8
 - Add --delete-original to desktop-file-install
 - Add gtk-update-icon-cache



From fedora-extras-commits at redhat.com  Wed Oct  4 23:01:07 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:01:07 -0700
Subject: rpms/synce-gnomevfs/devel synce-gnomevfs.spec,1.5,1.6
Message-ID: <200610042301.k94N19Dg018124@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17781

Modified Files:
	synce-gnomevfs.spec 
Log Message:
automated bump and rebuild


Index: synce-gnomevfs.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/devel/synce-gnomevfs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- synce-gnomevfs.spec	18 Sep 2006 13:20:08 -0000	1.5
+++ synce-gnomevfs.spec	4 Oct 2006 23:01:07 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           synce-gnomevfs
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Gnome-vfs module for synce
 
 Group:          Applications/Communications
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.0-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.0-4
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 23:01:36 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:01:36 -0700
Subject: rpms/unshield/devel unshield.spec,1.4,1.5
Message-ID: <200610042301.k94N1cuj018222@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/unshield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18205

Modified Files:
	unshield.spec 
Log Message:
automated bump and rebuild


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/unshield.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unshield.spec	18 Sep 2006 12:56:44 -0000	1.4
+++ unshield.spec	4 Oct 2006 23:01:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           unshield
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
@@ -66,6 +66,9 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.5-4
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 23:02:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:02:09 -0700
Subject: rpms/dynamite/devel dynamite.spec,1.5,1.6
Message-ID: <200610042302.k94N2iwY018292@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dynamite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18271

Modified Files:
	dynamite.spec 
Log Message:
automated bump and rebuild


Index: dynamite.spec
===================================================================
RCS file: /cvs/extras/rpms/dynamite/devel/dynamite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dynamite.spec	18 Sep 2006 12:55:05 -0000	1.5
+++ dynamite.spec	4 Oct 2006 23:02:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           dynamite
 Version:        0.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Extract data compressed with PKWARE Data Compression Library
 
 Group:          Applications/Communications
@@ -55,6 +55,9 @@
 %{_datadir}/aclocal/dynamite.m4
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.1-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.1-5
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 23:03:18 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:03:18 -0700
Subject: rpms/licq/devel licq.spec,1.10,1.11
Message-ID: <200610042303.k94N3KIE018356@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18339

Modified Files:
	licq.spec 
Log Message:
automated bump and rebuild


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- licq.spec	18 Sep 2006 11:58:32 -0000	1.10
+++ licq.spec	4 Oct 2006 23:03:17 -0000	1.11
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 10
+Release: 11
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 Source1: licq-viewurl.sh
@@ -170,6 +170,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.2-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-10
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:03:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:03:50 -0700
Subject: rpms/jhead/devel jhead.spec,1.15,1.16
Message-ID: <200610042304.k94N4Oo6018423@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/jhead/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18403

Modified Files:
	jhead.spec 
Log Message:
automated bump and rebuild


Index: jhead.spec
===================================================================
RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jhead.spec	18 Sep 2006 10:09:29 -0000	1.15
+++ jhead.spec	4 Oct 2006 23:03:50 -0000	1.16
@@ -1,6 +1,6 @@
 Name: jhead
 Version: 2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tool for displaying EXIF data embedded in JPEG images
 Group: Applications/Multimedia
 License: Public Domain
@@ -37,6 +37,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.6-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 2.6-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:05:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:05:05 -0700
Subject: rpms/mtd-utils/devel mtd-utils.spec,1.5,1.6
Message-ID: <200610042305.k94N5cWC018488@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/mtd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18471

Modified Files:
	mtd-utils.spec 
Log Message:
automated bump and rebuild


Index: mtd-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/mtd-utils/devel/mtd-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mtd-utils.spec	18 Sep 2006 07:58:47 -0000	1.5
+++ mtd-utils.spec	4 Oct 2006 23:05:05 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Utilities for dealing with MTD (flash) devices
 Name: mtd-utils
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.linux-mtd.infradead.org/
@@ -37,6 +37,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 David Woodhouse <dwmw2 at infradead.org> - 1.0.1-1
 - Update to 1.0.1
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:06:10 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:06:10 -0700
Subject: rpms/kover/devel kover.spec,1.13,1.14
Message-ID: <200610042306.k94N6C6B018560@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/kover/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18543

Modified Files:
	kover.spec 
Log Message:
automated bump and rebuild


Index: kover.spec
===================================================================
RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kover.spec	18 Sep 2006 07:24:48 -0000	1.13
+++ kover.spec	4 Oct 2006 23:06:10 -0000	1.14
@@ -1,7 +1,7 @@
 Name: kover
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 2.9.6
-Release: 7
+Release: 8
 License: GPL
 Group: Applications/Publishing
 Source0 http://lisas.de/kover/kover-2.9.6.tar.gz
@@ -59,6 +59,9 @@
 %attr(755,root,root)%{_bindir}/cd-text
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.9.6-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 2.9.6-7
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:06:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:06:48 -0700
Subject: rpms/most/devel most.spec,1.12,1.13
Message-ID: <200610042306.k94N6ojk018679@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/most/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18662

Modified Files:
	most.spec 
Log Message:
automated bump and rebuild


Index: most.spec
===================================================================
RCS file: /cvs/extras/rpms/most/devel/most.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- most.spec	18 Sep 2006 07:06:20 -0000	1.12
+++ most.spec	4 Oct 2006 23:06:48 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: more, less, most
 Name: most
 Version: 4.10.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: ftp://space.mit.edu/pub/davis/most/
 Group: Applications/Text
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 4.10.2-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 4.10.2-4
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:07:13 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:07:13 -0700
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.13,1.14
Message-ID: <200610042307.k94N7F6b018743@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18726

Modified Files:
	milter-greylist.spec 
Log Message:
automated bump and rebuild


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- milter-greylist.spec	18 Sep 2006 06:32:54 -0000	1.13
+++ milter-greylist.spec	4 Oct 2006 23:07:13 -0000	1.14
@@ -24,7 +24,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	2.1.12
-Release:	%release_func 2
+Release: %release_func 3
 License:	BSD w/ advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -235,6 +235,9 @@
 %endif
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.12-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.12-2
 - updated to 2.1.12
 - use new fedora-usermgmt stuff



From fedora-extras-commits at redhat.com  Wed Oct  4 23:07:40 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:07:40 -0700
Subject: rpms/ip-sentinel/devel ip-sentinel.spec,1.11,1.12
Message-ID: <200610042307.k94N7gUu018807@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18790

Modified Files:
	ip-sentinel.spec 
Log Message:
automated bump and rebuild


Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ip-sentinel.spec	18 Sep 2006 06:25:59 -0000	1.11
+++ ip-sentinel.spec	4 Oct 2006 23:07:40 -0000	1.12
@@ -41,7 +41,7 @@
 Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
 Version:	0.12
-Release:	%release_func 8
+Release: %release_func 9
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.nongnu.org/ip-sentinel/
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.12-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.12-8
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:08:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:08:05 -0700
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.15,1.16
Message-ID: <200610042308.k94N87va018875@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18858

Modified Files:
	dhcp-forwarder.spec 
Log Message:
automated bump and rebuild


Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dhcp-forwarder.spec	18 Sep 2006 06:24:33 -0000	1.15
+++ dhcp-forwarder.spec	4 Oct 2006 23:08:05 -0000	1.16
@@ -24,7 +24,7 @@
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
-Release:	%release_func 10
+Release: %release_func 11
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-10
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:08:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:08:30 -0700
Subject: rpms/ninja/devel ninja.spec,1.9,1.10
Message-ID: <200610042308.k94N8WTn018948@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ninja/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18931

Modified Files:
	ninja.spec 
Log Message:
automated bump and rebuild


Index: ninja.spec
===================================================================
RCS file: /cvs/extras/rpms/ninja/devel/ninja.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ninja.spec	18 Sep 2006 05:39:45 -0000	1.9
+++ ninja.spec	4 Oct 2006 23:08:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name: ninja
 Version: 1.5.8.1
-Release: 5
+Release: 6
 License: GPL
 Summary: Text based Internet Relay Chat (IRC) client
 Group: Applications/Internet
@@ -58,6 +58,9 @@
 %doc README ChangeLog BUGS+TODO
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.8.1-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 16 2006 Adrian Reber <adrian at lisas.de> - 1.5.8.1-5
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:08:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:08:58 -0700
Subject: rpms/picocom/devel picocom.spec,1.1,1.2
Message-ID: <200610042309.k94N90Be019014@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/picocom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18997

Modified Files:
	picocom.spec 
Log Message:
automated bump and rebuild


Index: picocom.spec
===================================================================
RCS file: /cvs/extras/rpms/picocom/devel/picocom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- picocom.spec	17 Sep 2006 20:42:39 -0000	1.1
+++ picocom.spec	4 Oct 2006 23:08:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           picocom
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Minimal serial communications program
 
 Group:          Applications/Communications
@@ -45,6 +45,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.4-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 14 2006 Sean Reifschneider <jafo at tummy.com> 1.4-2
 - Incorporating changes from Fedora Extras review from denis at poolshark
   dot org and panemade at gmail dot com.



From fedora-extras-commits at redhat.com  Wed Oct  4 23:09:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:09:25 -0700
Subject: rpms/sblim-wbemcli/devel sblim-wbemcli.spec,1.4,1.5
Message-ID: <200610042309.k94N9RRM019079@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sblim-wbemcli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19062

Modified Files:
	sblim-wbemcli.spec 
Log Message:
automated bump and rebuild


Index: sblim-wbemcli.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/devel/sblim-wbemcli.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sblim-wbemcli.spec	17 Sep 2006 22:25:59 -0000	1.4
+++ sblim-wbemcli.spec	4 Oct 2006 23:09:24 -0000	1.5
@@ -9,7 +9,7 @@
 Summary: SBLIM WBEM Command Line Interface
 Name: sblim-wbemcli
 Version: 1.5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL
@@ -47,6 +47,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.1-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 
 * Mon Nov 21 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.5.1-1
   - Upgrade to version 1.5.1 (SSL V3 enforced, default CACERT).



From fedora-extras-commits at redhat.com  Wed Oct  4 23:09:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:09:50 -0700
Subject: rpms/sblim-cmpi-devel/devel sblim-cmpi-devel.spec,1.4,1.5
Message-ID: <200610042309.k94N9qDe019149@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sblim-cmpi-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19132

Modified Files:
	sblim-cmpi-devel.spec 
Log Message:
automated bump and rebuild


Index: sblim-cmpi-devel.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/devel/sblim-cmpi-devel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sblim-cmpi-devel.spec	17 Sep 2006 22:23:59 -0000	1.4
+++ sblim-cmpi-devel.spec	4 Oct 2006 23:09:50 -0000	1.5
@@ -13,7 +13,7 @@
 Summary: SBLIM CMPI Provider Development Support
 Name: sblim-cmpi-devel
 Version: 1.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL
@@ -55,5 +55,8 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.4-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Feb 09 2006 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.0.4-1
   - Initial RH/Fedora version



From fedora-extras-commits at redhat.com  Wed Oct  4 23:10:17 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:10:17 -0700
Subject: rpms/sblim-cmpi-base/devel sblim-cmpi-base.spec,1.4,1.5
Message-ID: <200610042310.k94NAJnC019213@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19194

Modified Files:
	sblim-cmpi-base.spec 
Log Message:
automated bump and rebuild


Index: sblim-cmpi-base.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sblim-cmpi-base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sblim-cmpi-base.spec	17 Sep 2006 22:23:09 -0000	1.4
+++ sblim-cmpi-base.spec	4 Oct 2006 23:10:17 -0000	1.5
@@ -12,7 +12,7 @@
 Summary: SBLIM Base Providers
 Name: sblim-cmpi-base
 Version: 1.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL
@@ -119,6 +119,9 @@
 %{_datadir}/sblim-testsuite
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.4-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 
 * Thu Nov 10 2005  <mihajlov at de.ibm.com> - 1.5.4-3
 - suppress error output in post scriptlets



From fedora-extras-commits at redhat.com  Wed Oct  4 23:14:01 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:14:01 -0700
Subject: rpms/ipe/devel ipe.spec,1.8,1.9
Message-ID: <200610042314.k94NE3UW019287@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ipe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19270

Modified Files:
	ipe.spec 
Log Message:
automated bump and rebuild


Index: ipe.spec
===================================================================
RCS file: /cvs/extras/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ipe.spec	26 Sep 2006 12:58:14 -0000	1.8
+++ ipe.spec	4 Oct 2006 23:14:01 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.13.%{preversion}%{?dist}
+Release:        0.14.%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
@@ -161,6 +161,9 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 6.0-0.14.pre27
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.13.pre27
 - Add BR: pkgconfig.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:17:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:17:30 -0700
Subject: rpms/XaraLX/devel XaraLX.spec,1.5,1.6
Message-ID: <200610042317.k94NHWxs019379@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/XaraLX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19362

Modified Files:
	XaraLX.spec 
Log Message:
automated bump and rebuild


Index: XaraLX.spec
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/devel/XaraLX.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XaraLX.spec	21 Sep 2006 22:21:40 -0000	1.5
+++ XaraLX.spec	4 Oct 2006 23:17:30 -0000	1.6
@@ -3,7 +3,7 @@
 Name:		XaraLX
 Summary: 	Vector/general purpose graphics utility
 Version:	0.7
-Release:	6%{?dist}.%{buildRev}
+Release:	7%{?dist}.%{buildRev}
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://downloads.xara.com/opensource/%{name}-%{version}%{buildRev}.tar.bz2
@@ -90,6 +90,9 @@
 %{_docdir}/XaraLX/examples
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-7.r1759
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-5.r1759
 - bump
 - added two BRs for autoreconf



From fedora-extras-commits at redhat.com  Wed Oct  4 23:19:23 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:19:23 -0700
Subject: rpms/libuninameslist/devel libuninameslist.spec,1.9,1.10
Message-ID: <200610042319.k94NJPgp019454@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libuninameslist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19437

Modified Files:
	libuninameslist.spec 
Log Message:
automated bump and rebuild


Index: libuninameslist.spec
===================================================================
RCS file: /cvs/extras/rpms/libuninameslist/devel/libuninameslist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libuninameslist.spec	21 Sep 2006 04:57:35 -0000	1.9
+++ libuninameslist.spec	4 Oct 2006 23:19:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libuninameslist
 Version:        0.0
-Release:        5.20060907
+Release:        6.20060907
 
 Summary:        Library that provides Unicode names and annotations
 
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.0-6.20060907
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Kevin Fenzi <kevin at tummy.com> - 0.0-5.20060907
 - Take over maintainership. 
 - Update to 20060907



From fedora-extras-commits at redhat.com  Wed Oct  4 23:22:31 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:22:31 -0700
Subject: rpms/gaim-guifications/devel gaim-guifications.spec,1.6,1.7
Message-ID: <200610042322.k94NMXDd019536@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gaim-guifications/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19519

Modified Files:
	gaim-guifications.spec 
Log Message:
automated bump and rebuild


Index: gaim-guifications.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-guifications/devel/gaim-guifications.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-guifications.spec	19 Sep 2006 14:43:47 -0000	1.6
+++ gaim-guifications.spec	4 Oct 2006 23:22:31 -0000	1.7
@@ -13,7 +13,7 @@
 Summary:    Guifications Plugin for Gaim
 Name:       gaim-guifications
 Version:    2.13
-Release:    0.2.beta3%{?dist}
+Release:    0.3.beta3%{?dist}
 License:    GPL
 Group:      Applications/Internet
 Url:        http://guifications.sourceforge.net/Guifications/
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/gaim/guifications
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.13-0.3.beta3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.13-0.2.beta3
 - keep this guy alive, bump to 2.13 beta3
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:25:47 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:25:47 -0700
Subject: rpms/jogl/devel jogl.spec,1.26,1.27
Message-ID: <200610042325.k94NPn47019621@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/jogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19604

Modified Files:
	jogl.spec 
Log Message:
automated bump and rebuild


Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jogl.spec	19 Sep 2006 05:14:22 -0000	1.26
+++ jogl.spec	4 Oct 2006 23:25:47 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           jogl
 Version:        1.0.0
-Release:        5.6.beta5%{?dist}
+Release:        5.7.beta5%{?dist}
 Summary:        Java bindings for the OpenGL API
 Epoch:          1
 
@@ -108,6 +108,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1:1.0.0-5.7.beta5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 1:1.0.0-5.6.beta5
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:28:37 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:28:37 -0700
Subject: rpms/jakarta-commons-cli/devel jakarta-commons-cli.spec,1.5,1.6
Message-ID: <200610042328.k94NSdN5019695@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/jakarta-commons-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19678

Modified Files:
	jakarta-commons-cli.spec 
Log Message:
automated bump and rebuild


Index: jakarta-commons-cli.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-cli/devel/jakarta-commons-cli.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jakarta-commons-cli.spec	19 Sep 2006 05:13:53 -0000	1.5
+++ jakarta-commons-cli.spec	4 Oct 2006 23:28:36 -0000	1.6
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release:        6jpp_9%{?dist}
+Release:        6jpp_10%{?dist}
 Epoch:          0
 Summary:        Command Line Interface Library for Java
 License:        Apache Software License
@@ -87,6 +87,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 0:1.0-6jpp_10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 0:1.0-6jpp_9
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:31:34 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:31:34 -0700
Subject: rpms/fluidsynth/devel fluidsynth.spec,1.3,1.4
Message-ID: <200610042331.k94NVatS019794@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fluidsynth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777

Modified Files:
	fluidsynth.spec 
Log Message:
automated bump and rebuild


Index: fluidsynth.spec
===================================================================
RCS file: /cvs/extras/rpms/fluidsynth/devel/fluidsynth.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fluidsynth.spec	19 Sep 2006 05:11:23 -0000	1.3
+++ fluidsynth.spec	4 Oct 2006 23:31:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
 Version:      1.0.7
-Release:      7.a%{?dist}
+Release:      8.a%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://download.savannah.gnu.org/releases/fluid/fluidsynth-1.0.7a.tar.gz
 License:      LGPL
@@ -85,6 +85,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 1.0.7-8.a
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> 1.0.7-7.a
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:36:24 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:36:24 -0700
Subject: rpms/orange/devel orange.spec,1.7,1.8
Message-ID: <200610042336.k94NaQFW019895@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/orange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19878

Modified Files:
	orange.spec 
Log Message:
automated bump and rebuild


Index: orange.spec
===================================================================
RCS file: /cvs/extras/rpms/orange/devel/orange.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- orange.spec	18 Sep 2006 14:11:58 -0000	1.7
+++ orange.spec	4 Oct 2006 23:36:24 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           orange
 Version:        0.3
-Release:        2.cvs20051118%{?dist}
+Release:        3.cvs20051118%{?dist}
 Summary:        Squeeze out installable Microsoft cabinet files
 
 Group:          Applications/Communications
@@ -73,6 +73,9 @@
 %{_includedir}/liborange.h
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.3-3.cvs20051118
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.3-2.cvs20051118
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 23:38:53 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:38:53 -0700
Subject: rpms/ebtables/devel ebtables.spec,1.13,1.14
Message-ID: <200610042338.k94Nct3i019974@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ebtables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19957

Modified Files:
	ebtables.spec 
Log Message:
automated bump and rebuild


Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ebtables.spec	18 Sep 2006 12:30:10 -0000	1.13
+++ ebtables.spec	4 Oct 2006 23:38:53 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.6.%{prever}%{?dist}
+Release:	0.7.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -80,6 +80,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.8-0.7.rc2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.6.rc2
 - fix versioning
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:40:59 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:40:59 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.1,1.2
Message-ID: <200610042341.k94Nf1ks020052@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20035

Modified Files:
	Thunar.spec 
Log Message:
automated bump and rebuild


Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Thunar.spec	17 Sep 2006 22:55:50 -0000	1.1
+++ Thunar.spec	4 Oct 2006 23:40:59 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.5.rc1%{?dist}
+Release: 0.6.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -163,6 +163,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 0.4.0-0.6.rc1
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 16 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.5.rc1
 - Remove duplicate thunar-sendto-email.desktop entry from files. 
 



From fedora-extras-commits at redhat.com  Thu Oct  5 01:26:19 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 18:26:19 -0700
Subject: rpms/perl-Readonly Makefile,1.1,1.2
Message-ID: <200610050126.k951QLBE026203@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155

Modified Files:
	Makefile 
Log Message:
- rework spec to use macros
- we now require perl(Readonly::XS)



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	8 Dec 2005 18:46:49 -0000	1.1
+++ Makefile	5 Oct 2006 01:26:18 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Thu Oct  5 01:26:19 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 18:26:19 -0700
Subject: rpms/perl-Readonly/FC-5 perl-Readonly.spec,1.1,1.2
Message-ID: <200610050126.k951QL0g026207@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155/FC-5

Modified Files:
	perl-Readonly.spec 
Log Message:
- rework spec to use macros
- we now require perl(Readonly::XS)



Index: perl-Readonly.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/FC-5/perl-Readonly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Readonly.spec	8 Dec 2005 18:48:05 -0000	1.1
+++ perl-Readonly.spec	5 Oct 2006 01:26:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Readonly
 Version:        1.03
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Facility for creating read-only scalars, arrays, hashes
 
 Group:          Development/Libraries
@@ -8,8 +8,12 @@
 URL:            http://search.cpan.org/dist/Readonly/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
+
+# perl-Readonly-XS builds for all current fedora architectures, so let's
+# require it.
+Requires:       perl(Readonly::XS)
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -34,20 +38,24 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{perl_vendorlib}/benchmark.pl .
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
+
+# make sure this goes where it should to be...
+mv %{buildroot}%{perl_vendorlib}/benchmark.pl .
+
 
 %check
 make test
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -58,6 +66,15 @@
 
 
 %changelog
+* Wed Oct 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-6
+- add explict requires on perl(Readonly::XS).  perl(Readonly::XS) is available
+  for all architectures fedora supports, so there's no good reason to not
+  require it.
+- spec file rework
+
+* Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-5
+- bump for mass rebuild
+
 * Thu Dec 08 2005 Michael A. Peters <mpeters at mac.com> - 1.03-3
 - Remove requires on perl-Readonly-XS
 



From fedora-extras-commits at redhat.com  Thu Oct  5 01:26:20 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 18:26:20 -0700
Subject: rpms/perl-Readonly/devel perl-Readonly.spec,1.2,1.3
Message-ID: <200610050126.k951QMSa026211@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155/devel

Modified Files:
	perl-Readonly.spec 
Log Message:
- rework spec to use macros
- we now require perl(Readonly::XS)



Index: perl-Readonly.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/devel/perl-Readonly.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Readonly.spec	19 Sep 2006 22:56:20 -0000	1.2
+++ perl-Readonly.spec	5 Oct 2006 01:26:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Readonly
 Version:        1.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Facility for creating read-only scalars, arrays, hashes
 
 Group:          Development/Libraries
@@ -8,8 +8,12 @@
 URL:            http://search.cpan.org/dist/Readonly/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
+
+# perl-Readonly-XS builds for all current fedora architectures, so let's
+# require it.
+Requires:       perl(Readonly::XS)
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -34,20 +38,24 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{perl_vendorlib}/benchmark.pl .
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
+
+# make sure this goes where it should to be...
+mv %{buildroot}%{perl_vendorlib}/benchmark.pl .
+
 
 %check
 make test
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -58,6 +66,12 @@
 
 
 %changelog
+* Wed Oct 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-6
+- add explict requires on perl(Readonly::XS).  perl(Readonly::XS) is available
+  for all architectures fedora supports, so there's no good reason to not
+  require it.
+- spec file rework
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-5
 - bump for mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Oct  5 01:39:07 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 18:39:07 -0700
Subject: rpms/libxfce4util/devel libxfce4util.spec, 1.11, 1.12 sources, 1.5, 
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200610050139.k951d9mV026382@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26361

Modified Files:
	libxfce4util.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxfce4util.spec	30 Aug 2006 03:24:16 -0000	1.11
+++ libxfce4util.spec	5 Oct 2006 01:39:07 -0000	1.12
@@ -1,13 +1,12 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.2.3.2
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: BSD and LGPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.2/src/libxfce4util-4.2.3.2.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4util-4.3.99.1.tar.bz2
 Group: Development/Libraries
 Requires: glib2 >= 2.0.0
-Prereq: /sbin/ldconfig
 BuildRequires: glib2-devel >= 2.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +46,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog ChangeLog.pre-4.2.0 COPYING NEWS
 %{_libdir}/lib*.so.*
 %{_sbindir}/xfce4-kiosk-query
 
@@ -55,13 +55,25 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4
-%{_datadir}/xfce4/m4/
-%doc %{_datadir}/gtk-doc/html/libxfce4util
 
 %changelog
-* Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-3
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.4rc1/4.3.99.1
+- Remove unneeded PreReq
+- Added doc files
+
+* Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-2
 - Make devel package own includedir/xfce4 (fixes #203644)
 
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- upgrade to 4.3.90.1
+
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-2.fc5
 - Rebuild for fc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 06:12:10 -0000	1.5
+++ sources	5 Oct 2006 01:39:07 -0000	1.6
@@ -1 +1 @@
-2d312ba48da612501d6776f8b4a65797  libxfce4util-4.2.3.2.tar.gz
+5474fda120b0f28f3b86bee268467060  libxfce4util-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 06:12:10 -0000	1.5
+++ .cvsignore	5 Oct 2006 01:39:07 -0000	1.6
@@ -1 +1 @@
-libxfce4util-4.2.3.2.tar.gz
+libxfce4util-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 01:42:24 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 18:42:24 -0700
Subject: rpms/libxfcegui4/devel libxfcegui4.spec, 1.13, 1.14 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050142.k951gQOK026436@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415

Modified Files:
	libxfcegui4.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libxfcegui4.spec	30 Aug 2006 03:30:11 -0000	1.13
+++ libxfcegui4.spec	5 Oct 2006 01:42:24 -0000	1.14
@@ -1,13 +1,12 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.2.3
-Release: 6%{?dist}
+Version: 4.3.99.1
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/libxfcegui4-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Prereq: /sbin/ldconfig
 Requires: gtk2 >= 2.0.6
 Requires: libxfce4util >= %{version}
 BuildRequires: gtk2-devel >= 2.0.6
@@ -27,7 +26,6 @@
 Requires: %{name} = %{version}-%{release}
 Requires: gtk2-devel
 Requires: libxfce4util-devel
-Provides: libxfcegui4-devel
 
 %description devel
 This package includes the static libraries and header files you will need
@@ -58,18 +56,23 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING 
 %{_libdir}/lib*.so.*
-%{_libdir}/xfce4/modules/*.so*
-%{_datadir}/xfce4/*
+%{_datadir}/xfce4/xfce-svg-test.svg
 
 %files devel
 %defattr(-, root, root)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/*
-%{_datadir}/gtk-doc/html/libxfcegui4
 
 %changelog
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Add doc files
+- Remove useless Prereq
+- Remove useless Provides: libxfcegui4-devel
+
 * Sun Aug 27 2006 <kevin at tummy.com> - 4.2.3-6
 - fix .so included in main package instead of devel. (#203629)
 
@@ -101,7 +104,7 @@
 - remove stuff, remove version from dbh-devel buildreq
 
 * Wed Mar 16 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
-- Fixed %files bug that wasn't packaging .so files
+- Fixed %%files bug that wasn't packaging .so files
 
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2005 19:36:55 -0000	1.4
+++ sources	5 Oct 2006 01:42:24 -0000	1.5
@@ -1 +1 @@
-5d2bae78c5ef66e914ae7a930bbdeb57  libxfcegui4-4.2.3.tar.gz
+519bca1ba08e51f03584ce6c007cd10d  libxfcegui4-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Nov 2005 19:36:55 -0000	1.4
+++ .cvsignore	5 Oct 2006 01:42:24 -0000	1.5
@@ -1 +1 @@
-libxfcegui4-4.2.3.tar.gz
+libxfcegui4-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 01:43:59 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 18:43:59 -0700
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.14,1.15
Message-ID: <200610050144.k951i1kL026465@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26447

Modified Files:
	libxfcegui4.spec 
Log Message:
Bump release for upgrade from testing repo



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libxfcegui4.spec	5 Oct 2006 01:42:24 -0000	1.14
+++ libxfcegui4.spec	5 Oct 2006 01:43:59 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.3.99.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
@@ -67,6 +67,9 @@
 %{_includedir}/xfce4/*
 
 %changelog
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel build
+
 * Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
 - Upgrade to 4.3.99.1
 - Add doc files



From fedora-extras-commits at redhat.com  Thu Oct  5 01:48:05 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 18:48:05 -0700
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec, 1.10, 1.11 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050148.k951m7Cm026535@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26514

Modified Files:
	libxfce4mcs.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxfce4mcs.spec	30 Aug 2006 03:33:12 -0000	1.10
+++ libxfce4mcs.spec	5 Oct 2006 01:48:05 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
-Version: 4.2.3
-Release: 6%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3/src/libxfce4mcs-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4mcs-4.3.99.1.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Prereq: /sbin/ldconfig
@@ -53,6 +53,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -60,11 +61,19 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/libxfce4mcs
-%{_datadir}/gtk-doc/html/libxfce4mcs
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-6
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1-1
+
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1.fc6
+- upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5.fc5
 - Rebuild for fc5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 15:57:28 -0000	1.4
+++ sources	5 Oct 2006 01:48:05 -0000	1.5
@@ -1 +1 @@
-b3244024bea7f5756f4c0f541bc24128  libxfce4mcs-4.2.3.tar.gz
+ad70646a4ef699d7adcd409339f78884  libxfce4mcs-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 15:57:28 -0000	1.4
+++ .cvsignore	5 Oct 2006 01:48:05 -0000	1.5
@@ -1 +1 @@
-libxfce4mcs-4.2.3.tar.gz
+libxfce4mcs-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:01:44 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:01:44 -0700
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec, 1.7, 1.8 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050202.k9522HJd029451@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29428

Modified Files:
	xfce-mcs-manager.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce-mcs-manager.spec	30 Aug 2006 03:35:27 -0000	1.7
+++ xfce-mcs-manager.spec	5 Oct 2006 02:01:44 -0000	1.8
@@ -1,10 +1,10 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-mcs-manager-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-manager-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: libxfce4mcs >= %{version}
@@ -46,11 +46,11 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc README TODO COPYING AUTHORS
+%doc ChangeLog COPYING AUTHORS
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/he
+%{_datadir}/xfce4/doc/it
 %{_datadir}/icons/*/*/apps/*.png
 %{_bindir}/*
 %{_datadir}/applications/*
@@ -61,8 +61,17 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Rebuild for fc6 
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1 
+- Update to 4.3.99.1
+
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1.fc6
+- Upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5 
 - Rebuild for fc5 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:12:10 -0000	1.4
+++ sources	5 Oct 2006 02:01:44 -0000	1.5
@@ -1 +1 @@
-029e7cc2b20a3de5f908483b4253f492  xfce-mcs-manager-4.2.3.tar.gz
+1a42226297b3b89f19bd17a6841f5c3a  xfce-mcs-manager-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:12:10 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:01:44 -0000	1.5
@@ -1 +1 @@
-xfce-mcs-manager-4.2.3.tar.gz
+xfce-mcs-manager-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:10:26 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:10:26 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec, 1.12, 1.13 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050210.k952ASP0029577@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29556

Modified Files:
	xfce4-panel.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-panel.spec	30 Aug 2006 04:17:58 -0000	1.12
+++ xfce4-panel.spec	5 Oct 2006 02:10:26 -0000	1.13
@@ -1,19 +1,18 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.2.3
-Release: 7%{?dist}
+Version: 4.3.99.1
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-panel-4.2.3.tar.gz
-# Change default for Fedora
-Patch0: panel-launchmail.patch
-Patch1: panel-htmlview.patch
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= %{version}
 Requires: libxfce4mcs >= %{version}
 Requires: xfce-mcs-manager >= %{version}
 Requires: libxml2 >= 2.4.0
+Requires: Terminal
+Requires: mousepad
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: xfce-mcs-manager-devel >= %{version}
@@ -22,16 +21,40 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
+# xfce4-iconbox isn't in Xfce 4.4
+Provides: xfce4-iconbox = %{version}-%{release}
+Obsoletes: xfce4-iconbox <= 4.2.3-4
+# xfce4-systray isn't in Xfce 4.4
+Provides: xfce4-systray = %{version}-%{release}
+Obsoletes: xfce4-systray <= 4.2.3-3
+# xfce4-toys isn't in Xfce 4.4
+Provides: xfce4-toys = %{version}-%{release}
+Obsoletes: xfce4-toys <= 4.2.3-3
+# xfce4-trigger-launcher isn't in Xfce 4.4
+Provides: xfce4-trigger-launcher = %{version}-%{release}
+Obsoletes: xfce4-trigger-launcher <= 4.2.3-3
+# xfce4-modemlights-plugin isn't in Xfce 4.4
+Provides: xfce4-modemlights-plugin = %{version}-%{release}
+Obsoletes: xfce4-modemlights-plugin <= 4.2.3-3
+# xfce4-showdesktop-plugin isn't in Xfce 4.4
+Provides: xfce4-showdesktop-plugin = %{version}-%{release}
+Obsoletes: xfce4-showdesktop-plugin <= 4.2.3-3
+# xfce4-taskbar-plugin isn't in Xfce 4.4
+Provides: xfce4-taskbar-plugin = %{version}-%{release}
+Obsoletes: xfce4-taskbar-plugin <= 4.2.3-3
+# xfce4-windowlist-plugin isn't in Xfce 4.4
+Provides: xfce4-windowlist-plugin = %{version}-%{release}
+Obsoletes: xfce4-windowlist-plugin <= 4.2.3-3
 
 %description
 This package includes the panel for the Xfce desktop environment
 
 %package devel
-Summary: developpment headers for xfce4-panel
+Summary: Development headers for xfce4-panel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: libxfce4util-devel >= 4.2.3.2-3
+Requires: libxfce4util-devel = %{version}
 
 %description devel
 This package includes the header files you will need to build
@@ -39,8 +62,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .launchmail
-%patch1 -p1 -b .htmlview
 
 %build
 %configure
@@ -51,39 +72,70 @@
 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
+mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins
 %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 README TODO ChangeLog NEWS NOTES COPYING AUTHORS
-/etc/xdg/xfce4
-%{_datadir}/xfce4/doc
+%doc README ChangeLog NEWS COPYING AUTHORS
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-10.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-menu-5.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-9.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/clock-14.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-7.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/systray-4.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-8.rc
+
 %{_libdir}/xfce4
+%{_libdir}/libxfce4panel.so.*
 %{_bindir}/*
-%{_datadir}/applications/*
+%{_libexecdir}/xfce4/panel-plugins
+%{_datadir}/xfce4/panel-plugins/
 %{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/xfce4/doc/C/xfce4-panel.html
+%{_datadir}/applications/xfce4-panel-manager.desktop
 
 %files devel
 %defattr(-, root, root)
 %{_libdir}/pkgconfig/*
-%{_includedir}/xfce4/panel
+%{_libdir}/libxfce4panel.so
+%{_datadir}/gtk-doc/html/libxfce4panel
+%{_includedir}/xfce4/libxfce4panel
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-7
-- Fix devel Requires to correct libxfce4util
-
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-6
-- Add back in correct include dir for devel subpackage
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add Requires for mousepad and Terminal
+- Bump for devel checkin
+
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Obsolete some more plugins who's functionality has been pulled in. 
+- Own the libexecdir/xfce4/panel-plugins for new plugins. 
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+- Add Provides/Obsoletes for xfce4-iconbox, xfce4-systray, xfce4-toys, xfce4-trigger-launcher
+- Fix typo in devel subpackage summary
+- Add post/postun ldconfig calls
+
+* Thu Aug 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-2
+- fix .so in main package
+- add Requires for libxfce4util-devel
+- don't own includedir/xfce4 (libxfce4util-devel should)
 
-* Thu Aug 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Don't own includedir/xfce4
-- Requires: libxfce4util-devel added to devel 
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2
+- Upgrade to 4.3.90.2
 
-* Mon Jun  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Add gettext to BuildRequires (fixes #194139)
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1.fc6
+- Upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
 - Rebuild for fc5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:35:32 -0000	1.4
+++ sources	5 Oct 2006 02:10:26 -0000	1.5
@@ -1 +1 @@
-3027c4601f208d290a988befed66a49f  xfce4-panel-4.2.3.tar.gz
+8647de295987605161c75650e4554fd8  xfce4-panel-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:35:32 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:10:26 -0000	1.5
@@ -1 +1 @@
-xfce4-panel-4.2.3.tar.gz
+xfce4-panel-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:11:56 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 19:11:56 -0700
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.19,1.20
Message-ID: <200610050211.k952BwZ0029605@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29588

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Wed Oct 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
- Upstream update.
- Remove BR: flex bison.
- Drop osgfbo and osgpbuffer.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- OpenSceneGraph.spec	4 Oct 2006 15:50:57 -0000	1.19
+++ OpenSceneGraph.spec	5 Oct 2006 02:11:56 -0000	1.20
@@ -236,7 +236,9 @@
 %{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
+%if "%{version}" < "1.2"
 %{_bindir}/osgfbo
+%endif
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
 %{_bindir}/osggeodemo
@@ -260,7 +262,9 @@
 %{_bindir}/osgparametric
 %{_bindir}/osgparticle
 %{_bindir}/osgparticleeffects
+%if "%{version}" < "1.2"
 %{_bindir}/osgpbuffer
+%endif
 %{_bindir}/osgpick
 %{_bindir}/osgplanets
 %{_bindir}/osgpoints
@@ -391,9 +395,10 @@
 %{_includedir}/Producer
 
 %changelog
-* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
+* Wed Oct 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
 - Upstream update.
 - Remove BR: flex bison.
+- Drop osgfbo and osgpbuffer.
 
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.1-2
 - Mass rebuild.



From fedora-extras-commits at redhat.com  Thu Oct  5 02:13:53 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:13:53 -0700
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec, 1.11, 1.12 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050213.k952Dt7B029678@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29657

Modified Files:
	gtk-xfce-engine.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gtk-xfce-engine.spec	30 Aug 2006 03:40:50 -0000	1.11
+++ gtk-xfce-engine.spec	5 Oct 2006 02:13:53 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
-Version: 2.2.8
-Release: 4%{?dist}
+Version: 2.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/gtk-xfce-engine-2.2.8.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/gtk-xfce-engine-2.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.0
@@ -31,15 +31,21 @@
 %files
 %defattr(-,root,root)
 %doc README COPYING AUTHORS
-%{_libdir}/gtk-2.0/2.*/engines
+%{_libdir}/gtk-2.0/2.10.0/engines
 %{_datadir}/*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 2.2.8-4
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.99.1-2
+- Bump release for devel checkin
 
-* Fri Jul 14 2006 Kevin Fenzi <kevin at tummy.com> - 2.2.8-3
-- Fix to build against the new gtk (fixes #198904)
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.99.1-1
+- Update to 2.3.99.1
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.90.2-1
+- Update to 2.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.90.1-1.fc6
+- update to 2.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 2.2.8-2.fc5
 - Rebuild for fc5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:39:40 -0000	1.4
+++ sources	5 Oct 2006 02:13:53 -0000	1.5
@@ -1 +1 @@
-430251478bc15ca6f4b71bdaf16cce5e  gtk-xfce-engine-2.2.8.tar.gz
+d5e9e9f5113268a1a3662ee420d064f7  gtk-xfce-engine-2.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:39:40 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:13:53 -0000	1.5
@@ -1 +1 @@
-gtk-xfce-engine-2.2.8.tar.gz
+gtk-xfce-engine-2.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:19:43 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:19:43 -0700
Subject: rpms/exo/devel exo.spec,1.16,1.17
Message-ID: <200610050219.k952Jjs2029731@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29714

Modified Files:
	exo.spec 
Log Message:
Bump release for devel checkin



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- exo.spec	7 Sep 2006 22:07:51 -0000	1.16
+++ exo.spec	5 Oct 2006 02:19:43 -0000	1.17
@@ -3,15 +3,13 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.10
-Release: 0.1.rc1%{?dist}
+Release: 0.4.rc1%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: Development/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.0
-BuildRequires: libxfcegui4-devel >= 4.2.0
 Requires: dbus-glib >= 0.22
 BuildRequires: dbus-devel >= 0.22
 BuildRequires: gtk-doc
@@ -21,6 +19,8 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: perl-URI
+BuildRequires: xfce-mcs-manager-devel
+BuildRequires: libxfce4util-devel
 
 %description
 Extension library for Xfce, targeted at application development.
@@ -29,11 +29,18 @@
 Summary: Development tools for exo library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libxfcegui4-devel
 
 %description devel
 Static libraries and header files for the exo library.
 
+%package -n python-exo
+Summary: Python tools for exo library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n python-exo
+Python libraries and header files for the exo library.
+
 %prep
 %setup -q -n %{name}-%{version}rc1
 
@@ -50,6 +57,8 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
+rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.a
 
 %find_lang libexo-0.3
 
@@ -61,7 +70,7 @@
 %postun -p /sbin/ldconfig
 
 %files -f libexo-0.3.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING
 %{_libdir}/lib*.so.*
 %{_datadir}/xfce4/helpers
@@ -83,25 +92,31 @@
 %{_datadir}/pixmaps/exo-0.3/exo-thumbnail-frame.png
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc %{_datadir}/gtk-doc/html/exo/
 %{_includedir}/exo*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/pygtk/*/defs/exo-*/
+
+%files -n python-exo
+%defattr(-, root, root,-)
 %{python_sitearch}/exo-*
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.4.rc1
+- Bump release for devel checkin
+
+* Thu Sep 28 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.3.rc1
+- Remove libxfce4gui/libxfce4gui-devel Requires/BuildRequires
+
 * Sun Sep  7 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.1.rc1
 - Upgrade to 0.3.1.10-0.1.rc1
 
 * Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.8-0.3.beta2
 - Add perl-URI BuildRequires
 
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.8-0.2.beta2
-- Rebuild for fc6
-
 * Wed Aug  2 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.8-0.1.beta2
 - Fix release numbering
 - General cleanup for devel push



From fedora-extras-commits at redhat.com  Thu Oct  5 02:24:48 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:24:48 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.2,1.3
Message-ID: <200610050224.k952Opsi030176@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30152

Modified Files:
	Thunar.spec 
Log Message:
Re-enable trash plugin in Xfce 4.4rc1



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Thunar.spec	4 Oct 2006 23:40:59 -0000	1.2
+++ Thunar.spec	5 Oct 2006 02:24:48 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.6.rc1%{?dist}
+Release: 0.7.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -145,9 +145,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/Thunar.png
 %{_datadir}/icons/hicolor/scalable/apps/Thunar.svg
 %{_datadir}/pixmaps/Thunar
-# disable trash plugin for now because it doesn't build with 4.3.2
-#%{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop
-#%{_libexecdir}/xfce4/panel-plugins/thunar-tpa
+%{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop
+%{_libexecdir}/xfce4/panel-plugins/thunar-tpa
 %{_mandir}/man1/Thunar.1*
 %dir %{_sysconfdir}/xdg/Thunar
 %config(noreplace) %{_sysconfdir}/xdg/Thunar/uca.xml
@@ -163,6 +162,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct 05 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.7.rc1
+- Re-enable trash plugin in Xfce 4.4rc1
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 0.4.0-0.6.rc1
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Oct  5 02:29:30 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:29:30 -0700
Subject: rpms/Terminal/devel Terminal.spec,1.11,1.12
Message-ID: <200610050229.k952TWOV030525@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30504

Modified Files:
	Terminal.spec 
Log Message:
Bump release for devel checkin



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Terminal.spec	7 Sep 2006 22:22:52 -0000	1.11
+++ Terminal.spec	5 Oct 2006 02:29:30 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.2.5.6
-Release: 0.1.rc1%{?dist}
+Release: 0.3.rc1%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Terminal-0.2.5.6rc1.tar.bz2
@@ -52,11 +52,17 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
-* Thu Sep  7 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.1.rc1
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.3.rc1
+- Bump release for devel checkin
+
+* Thu Sep  7 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.2.rc1
+- Bump release for xfce rc repo
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.1.rc1
 - Upgrade to 0.2.5.6-0.1.rc1
 
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.4-0.2.beta2
-- Rebuild for fc6
+* Sun Aug 13 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.4-0.2.beta2
+- Bump release for 4.4 beta repo
 
 * Wed Aug  2 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.4-0.1.beta2
 - Fix release



From fedora-extras-commits at redhat.com  Thu Oct  5 02:34:54 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:34:54 -0700
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec, 1.8, 1.9 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050234.k952YurC030657@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30636

Modified Files:
	xfce4-appfinder.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-appfinder.spec	30 Aug 2006 03:45:30 -0000	1.8
+++ xfce4-appfinder.spec	5 Oct 2006 02:34:54 -0000	1.9
@@ -1,24 +1,22 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.2.3
-Release: 4%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-appfinder-4.2.3.tar.gz
-Patch0: xfce4-appfinder-4.2.3-infocrash.patch
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-appfinder-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.3
-BuildRequires: libxfcegui4-devel >= 4.2.3
+Requires: libxfcegui4 >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: startup-notification-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
 
 %description
 xfce-appfinder shows system wide installed applications
 
 %prep
 %setup -q
-%patch0 -p1 -b .infocrash
 
 %build
 %configure
@@ -35,17 +33,24 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc README TODO ChangeLog NEWS COPYING AUTHORS
+%doc README TODO ChangeLog COPYING AUTHORS
 %{_bindir}/xfce4-appfinder
 %{_datadir}/applications/xfce4-appfinder.desktop
-%{_datadir}/pixmaps/xfce4-appfinder.png
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/he
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Rebuild for fc6 
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Remove 0 length NEWS file
+- Clean up macros in changelog
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Upgrade to 4.3.90.2
 
 * Thu May 18 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
 - Add patch to fix crash in information selection (fixes #192195)
@@ -70,11 +75,11 @@
 
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
-- Fixed %files section to not list lang files twice
+- Fixed %%files section to not list lang files twice
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+- Fixed to use %%find_lang
+- Removed generic INSTALL from %%doc
 - Fixed case on Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:47:58 -0000	1.4
+++ sources	5 Oct 2006 02:34:54 -0000	1.5
@@ -1 +1 @@
-fa6b9dd74114cb28c7352dd0e4592ce2  xfce4-appfinder-4.2.3.tar.gz
+576b6af7ed7223cbdbccf7df509b8c9f  xfce4-appfinder-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:47:58 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:34:54 -0000	1.5
@@ -1 +1 @@
-xfce4-appfinder-4.2.3.tar.gz
+xfce4-appfinder-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:38:13 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:38:13 -0700
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec, 1.9, 1.10 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050238.k952cFkY030707@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30686

Modified Files:
	xfce4-icon-theme.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-icon-theme.spec	30 Aug 2006 03:52:45 -0000	1.9
+++ xfce4-icon-theme.spec	5 Oct 2006 02:38:12 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-icon-theme-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -34,10 +34,21 @@
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %{_datadir}/*
+%exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+- Remove unused pc file
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.3-1
+- Update to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
 - Rebuild for fc5 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:57:23 -0000	1.4
+++ sources	5 Oct 2006 02:38:12 -0000	1.5
@@ -1 +1 @@
-484ff5a740de326d107ca34d16f161d3  xfce4-icon-theme-4.2.3.tar.gz
+ccdcd6aa7e03732347d785a826c81f84  xfce4-icon-theme-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:57:23 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:38:12 -0000	1.5
@@ -1 +1 @@
-xfce4-icon-theme-4.2.3.tar.gz
+xfce4-icon-theme-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:44:00 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:44:00 -0700
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec, 1.9, 1.10 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050244.k952i2Hr030766@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30740

Modified Files:
	xfce4-mixer.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-mixer.spec	30 Aug 2006 03:54:30 -0000	1.9
+++ xfce4-mixer.spec	5 Oct 2006 02:44:00 -0000	1.10
@@ -1,21 +1,21 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: BSD
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-mixer-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-mixer-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xfce4-panel >= 4.2.3
-BuildRequires: xfce4-panel-devel >= 4.2.3
-BuildRequires: libxfce4util-devel >= 4.2.3
-BuildRequires: libxfcegui4-devel >= 4.2.3
-BuildRequires: libxfce4mcs-devel >= 4.2.3
-BuildRequires: xfce-mcs-manager-devel >= 4.2.3
+Requires: xfce4-panel >= 4.3.99.1
+BuildRequires: xfce4-panel-devel >= 4.3.99.1
+BuildRequires: libxfce4util-devel >= 4.3.99.1
+BuildRequires: libxfcegui4-devel >= 4.3.99.1
+BuildRequires: libxfce4mcs-devel >= 4.3.99.1
+BuildRequires: xfce-mcs-manager-devel >= 4.3.99.1
 BuildRequires: libxml2-devel >= 2.4.0
 BuildRequires: startup-notification-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
 
 %description
 Volume control plugin for the Xfce 4 panel
@@ -43,11 +43,23 @@
 %{_bindir}/xfce4-mixer
 %{_libdir}/xfce4/*
 %{_datadir}/applications/xfce-mixer-settings.desktop
+%{_datadir}/xfce4/panel-plugins/xfce4-mixer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
+%{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Fix macros in changelog
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Upgrade to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
 - Rebuild for fc5
@@ -75,8 +87,8 @@
 - Updated to 4.2.1 version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+- Fixed to use %%find_lang
+- Removed generic INSTALL from %%doc
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 17:01:31 -0000	1.4
+++ sources	5 Oct 2006 02:44:00 -0000	1.5
@@ -1 +1 @@
-b57fd602b3612fb84a92b124f3468511  xfce4-mixer-4.2.3.tar.gz
+5836282f9795d10b65d41564a923f677  xfce4-mixer-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 17:01:31 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:44:00 -0000	1.5
@@ -1 +1 @@
-xfce4-mixer-4.2.3.tar.gz
+xfce4-mixer-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:53:42 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:53:42 -0700
Subject: rpms/xfce4-session/devel xfce4-session.spec, 1.10, 1.11 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050253.k952riCX030836@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30815

Modified Files:
	xfce4-session.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-session.spec	30 Aug 2006 03:56:26 -0000	1.10
+++ xfce4-session.spec	5 Oct 2006 02:53:42 -0000	1.11
@@ -1,24 +1,25 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.2.3
-Release: 4%{?dist}
+Version: 4.3.99.1
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-session-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-session-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.3
-Requires: libxfce4mcs >= 4.2.3
-Requires: xfce-mcs-manager >= 4.2.3
+Requires: libxfcegui4 >= 4.3.99.1
+Requires: libxfce4mcs >= 4.3.99.1
+Requires: xfce-mcs-manager >= 4.3.99.1
 Requires: xorg-x11-server-utils
-BuildRequires: libxfcegui4-devel >= 4.2.3
-BuildRequires: libxfce4mcs-devel >= 4.2.3
-BuildRequires: xfce-mcs-manager-devel >= 4.2.3
+BuildRequires: libxfcegui4-devel >= 4.3.99.1
+BuildRequires: libxfce4mcs-devel >= 4.3.99.1
+BuildRequires: xfce-mcs-manager-devel >= 4.3.99.1
 BuildRequires: startup-notification-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
+Requires: fortune-mod
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
@@ -59,19 +60,37 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
-%{_datadir}/icons/*
-%{_datadir}/xfce4/*
+%{_datadir}/icons/hicolor/128x128/apps/xfce4-session.png
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-session.png
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-splash.png
+%{_datadir}/icons/hicolor/48x48/apps/xfsm-logout.png
+%{_datadir}/icons/hicolor/48x48/apps/xfsm-reboot.png
+%{_datadir}/icons/hicolor/48x48/apps/xfsm-shutdown.png
+%{_datadir}/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
+%{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
+%{_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}/xfce4/doc/*/images/*
+%{_datadir}/xfce4/doc/*/*.html
+%{_datadir}/xfce4/tips/tips
+%{_datadir}/xfce4/tips/tips.dat
 %{_libdir}/lib*.so.*
 %{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/splash/engines/libmice.*
 %{_libexecdir}/xfsm-shutdown-helper
 %{_mandir}/man1/*
-%{_sysconfdir}/xdg/xfce4-session/*
+%config(noreplace) %{_sysconfdir}/xdg/xfce4-session/xfce4-session.rc
+%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
 %defattr(-,root,root)
@@ -88,8 +107,25 @@
 %{_libexecdir}/balou-*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Bump release for devel checkin
+
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Don't own doc directories that xfdesktop owns. 
+
+* Sun Sep 17 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Only own icons, not any of the icon dirs. 
+
+* Tue Sep 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Add Requires for fortune-mod, needed for xfce4-tips
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Fix macros in changelog
+- Add post/postun ldconfig
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Upgrade to 4.3.90.2
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
 - Rebuild for fc5
@@ -122,8 +158,8 @@
 - Updated to 4.2.1 version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+- Fixed to use %%find_lang
+- Removed generic INSTALL from %%doc
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 17:45:02 -0000	1.4
+++ sources	5 Oct 2006 02:53:42 -0000	1.5
@@ -1 +1 @@
-e3685ace007f065eadbd7acce6fa61e8  xfce4-session-4.2.3.tar.gz
+98c20381becc6fa84fae40be888b2ac7  xfce4-session-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 17:45:02 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:53:42 -0000	1.5
@@ -1 +1 @@
-xfce4-session-4.2.3.tar.gz
+xfce4-session-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:56:40 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:56:40 -0700
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec, 1.9, 1.10 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050256.k952ugJj030880@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30859

Modified Files:
	xfce-mcs-plugins.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce-mcs-plugins.spec	30 Aug 2006 04:04:25 -0000	1.9
+++ xfce-mcs-plugins.spec	5 Oct 2006 02:56:40 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
-Version: 4.2.3
-Release: 4%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-mcs-plugins-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2
 Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -47,20 +47,24 @@
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/he
+%{_datadir}/xfce4/doc/it
 %{_libdir}/xfce4/mcs-plugins/*
+%{_datadir}/xfce-mcs-plugins/shortcuts/default.xml
 %{_datadir}/applications/*
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
-- Rebuild for fc5
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
 
-* Tue Jan 31 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Added imake and libXt-devel BuildRequires for modular xorg
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:00:16 -0000	1.4
+++ sources	5 Oct 2006 02:56:40 -0000	1.5
@@ -1 +1 @@
-cdd1ca3ff7610a45658aa801b91da8dc  xfce-mcs-plugins-4.2.3.tar.gz
+98b0b149110056b93587c66852fc3194  xfce-mcs-plugins-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:00:16 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:56:40 -0000	1.5
@@ -1 +1 @@
-xfce-mcs-plugins-4.2.3.tar.gz
+xfce-mcs-plugins-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:00:53 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:00:53 -0700
Subject: rpms/xfce-utils/devel xfce-utils.spec, 1.10, 1.11 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050300.k9530tOA030941@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30920

Modified Files:
	xfce-utils.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce-utils.spec	30 Aug 2006 04:28:45 -0000	1.10
+++ xfce-utils.spec	5 Oct 2006 03:00:52 -0000	1.11
@@ -2,11 +2,11 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.2.3
-Release: 5%{?dist}
+Version: 4.3.99.1
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-utils-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-utils-4.3.99.1.tar.bz2
 Source1: xfce4.desktop
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -57,25 +57,47 @@
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %attr(0755,root,root) %{_sysconfdir}/xdg/xfce4
 %{_bindir}/*
-%{_libdir}/xfce4/mcs-plugins/*
 %{_datadir}/apps/switchdesk/*
-%{_datadir}/xfce4
+%{_datadir}/xfce4/AUTHORS
+%{_datadir}/xfce4/BSD
+%{_datadir}/xfce4/COPYING
+%{_datadir}/xfce4/GPL
+%{_datadir}/xfce4/INFO
+%{_datadir}/xfce4/INFO.ca
+%{_datadir}/xfce4/INFO.es
+%{_datadir}/xfce4/INFO.fi
+%{_datadir}/xfce4/INFO.fr
+%{_datadir}/xfce4/INFO.it
+%{_datadir}/xfce4/INFO.ja
+%{_datadir}/xfce4/INFO.ru
+%{_datadir}/xfce4/INFO.uk
+%{_datadir}/xfce4/INFO.vi
+%{_datadir}/xfce4/LGPL
+%{_datadir}/xfce4/doc/*/images/*
+%{_datadir}/xfce4/doc/*/*.html
+%{_datadir}/xfce4/doc/xfce-mouse.png
+%{_datadir}/xfce4/doc/xfce.css
 %{_datadir}/icons/*/*/*
-%{_datadir}/applications/*
 %{xsessiondir}/*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Bump release for devel checkin
 
-* Mon Jun  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Add gettext BuildRequires (fixes #194140)
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Don't own doc dirs (xfdesktop does)
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
-- Rebuild for fc5
+* Sun Sep 17 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Don't own datadir/xfce4 (xfwm4 already does)
 
-* Tue Jan 31 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Added imake and libXt-devel BuildRequires for modular xorg
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:30:23 -0000	1.4
+++ sources	5 Oct 2006 03:00:52 -0000	1.5
@@ -1 +1 @@
-8028266d03c5bae7c7ccbddd6656ea97  xfce-utils-4.2.3.tar.gz
+95448f642ee52cdb5ec20dc3c28dcc3b  xfce-utils-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:30:23 -0000	1.4
+++ .cvsignore	5 Oct 2006 03:00:52 -0000	1.5
@@ -1 +1 @@
-xfce-utils-4.2.3.tar.gz
+xfce-utils-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:04:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:04:47 -0700
Subject: rpms/xfdesktop/devel xfdesktop.spec, 1.12, 1.13 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050304.k9534mhI001385@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1361

Modified Files:
	xfdesktop.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfdesktop.spec	30 Aug 2006 04:09:08 -0000	1.12
+++ xfdesktop.spec	5 Oct 2006 03:04:46 -0000	1.13
@@ -1,13 +1,13 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.2.3
-Release: 5%{?dist}
+Version: 4.3.99.1
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfdesktop-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfdesktop-4.3.99.1.tar.bz2
 
 # Change default for Fedora
-Patch0: xfdesktop-image-4.2.1.patch
+Patch0: xfdesktop-image-4.3.90.1.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +24,10 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
+BuildRequires: exo-devel
+BuildRequires: Thunar-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: dbus-devel
 
 %description
 This package includes a desktop manager for the XFce Desktop Environment
@@ -56,27 +60,36 @@
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_sysconfdir}/xdg/xfce4/*
 %{_bindir}/*
-%{_datadir}/xfce4/*
 %{_libdir}/xfce4/mcs-plugins/*
+%{_libexecdir}/xfce4/panel-plugins/*
 %{_libdir}/xfce4/modules/*
-%{_libdir}/xfce4/panel-plugins/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/pixmaps/*
+%{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
+%{_datadir}/xfce4/doc
+%{_datadir}/xfce4/backdrops
+%{_datadir}/xfce4-menueditor/xfce4-menueditor.ui
 %{_mandir}/man1/*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Bump release for devel checkin
 
-* Mon Jun  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Add gettext BuildRequires. (fixes #194142)
+* Sun Sep 17 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Don't own datadir/xfce4/panel-plugins as thats owned by xfce4-panel
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
-- Rebuild for fc5
+* Sat Sep  9 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Add exo, dbus-glib and Thunar-devel BuildRequires
 
-* Tue Jan 31 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Added imake and libXt-devel BuildRequires for modular xorg
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2
+- Update to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:17:05 -0000	1.4
+++ sources	5 Oct 2006 03:04:46 -0000	1.5
@@ -1 +1 @@
-0be57a574a654625d61281411fb6be55  xfdesktop-4.2.3.tar.gz
+ad4dc2ceeafe10ff69196e287f07090a  xfdesktop-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:17:05 -0000	1.4
+++ .cvsignore	5 Oct 2006 03:04:46 -0000	1.5
@@ -1 +1 @@
-xfdesktop-4.2.3.tar.gz
+xfdesktop-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:07:51 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:07:51 -0700
Subject: rpms/xfprint/devel xfprint.spec, 1.13, 1.14 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050307.k9537s01001484@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1463

Modified Files:
	xfprint.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfprint.spec	30 Aug 2006 04:21:12 -0000	1.13
+++ xfprint.spec	5 Oct 2006 03:07:51 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.2.3
-Release: 5%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: BSD
 URL: http://www.xfce.org
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfprint-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfprint-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -15,12 +15,21 @@
 BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: a2ps
 BuildRequires: cups-devel
+BuildRequires: gnutls-devel
 BuildRequires: gettext
 
 %description
 xfprint contains a print dialog and a printer manager for the
 Xfce 4 Desktop Environment
 
+%package devel
+Summary: Development tools for the Xfce xfprint manager
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Static libraries and header files for the Xfce xfprint library.
+
 %prep
 %setup -q
 
@@ -39,36 +48,47 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/xfprint-plugins/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/xfprint-plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post devel -p /sbin/ldconfig
+
+%postun devel -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc README ChangeLog NEWS COPYING AUTHORS NOTES
+%doc README ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/xfce4/mcs-plugins
 %{_libdir}/xfce4/xfprint-plugins
+%{_libdir}/*.so.*
 %{_datadir}/applications/*
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/he
 %{_datadir}/icons/hicolor/*/*/*
 
+%files devel
+%defattr(-, root, root)
+%{_includedir}/xfce4/libxfprint
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
+
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Rebuild for fc6 
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
 
-* Fri Jun 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Rebuild against new cups-devel to fix gnutls dependency
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
 
-* Wed Jun  7 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Add gettext BuildRequires (fixes #194147)
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Rebuild for fc5
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:25:56 -0000	1.4
+++ sources	5 Oct 2006 03:07:51 -0000	1.5
@@ -1 +1 @@
-64c983a6d7778cbd5d6c93ee1dbbd3f9  xfprint-4.2.3.tar.gz
+13657288cd3ffaaa8d3701bcb3d7740a  xfprint-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:25:56 -0000	1.4
+++ .cvsignore	5 Oct 2006 03:07:51 -0000	1.5
@@ -1 +1 @@
-xfprint-4.2.3.tar.gz
+xfprint-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:11:10 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:11:10 -0700
Subject: rpms/xfwm4/devel xfwm4.spec, 1.14, 1.15 sources, 1.5, 1.6 .cvsignore,
	1.5, 1.6
Message-ID: <200610050311.k953BCRw001560@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1538

Modified Files:
	xfwm4.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfwm4.spec	30 Aug 2006 04:06:08 -0000	1.14
+++ xfwm4.spec	5 Oct 2006 03:11:10 -0000	1.15
@@ -1,29 +1,32 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.2.3.2
-Release: 6%{?dist}
+Version: 4.3.99.1
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.2.3.2/src/xfwm4-4.2.3.2.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2
 
 # Change default for Fedora
-Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch
-Patch1: xfwm4-bluecurve.patch
+#Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch
+#Patch1: xfwm4-bluecurve.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: libxfce4mcs >= 4.2.3
-Requires: libxfcegui4 >= 4.2.3
-Requires: xfce-mcs-manager >= 4.2.3
-BuildRequires: libxfce4mcs-devel >= 4.2.3
-BuildRequires: libxfcegui4-devel >= 4.2.3
-BuildRequires: xfce-mcs-manager-devel >= 4.2.3
+Requires: libxfce4mcs >= 4.3.90.2
+Requires: libxfcegui4 >= 4.3.90.2
+Requires: xfce-mcs-manager >= 4.3.90.2
+BuildRequires: libxfce4mcs-devel >= 4.3.90.2
+BuildRequires: libxfcegui4-devel >= 4.3.90.2
+BuildRequires: xfce-mcs-manager-devel >= 4.3.90.2
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXext-devel
 BuildRequires: gettext intltool
+BuildRequires: libXcomposite-devel
+BuildRequires: libXdamage-devel
+BuildRequires: startup-notification-devel
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -31,8 +34,8 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .bluecurve-prep
-%patch1 -p1 -b .bluecurve
+#%patch0 -p1 -b .bluecurve-prep
+#%patch1 -p1 -b .bluecurve
 
 %build
 %configure
@@ -58,19 +61,35 @@
 %{_libdir}/xfce4/mcs-plugins/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/xfce4
+%dir %{_datadir}/xfce4
+%{_datadir}/xfce4/doc/*/images/*
+%{_datadir}/xfce4/doc/*/*.html
 %{_datadir}/xfwm4
 %{_datadir}/themes
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-6
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Bump release for devel checkin
 
-* Tue Jun  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-5
-- Add gettext and intltool to BuildRequires (fixes #194148)
+* Mon Oct  2 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Own the datadir/xfce4 directory
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-4.fc5
-- Rebuild for fc5
+* Mon Oct  2 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add libXcomposite-devel and libXdamage-devel BuildRequires
+- Add startup-notification-devel BuildRequires
+
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Don't own the xfce4 docdir. (xfdesktop does)
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Fix macro in changelog
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Upgrade to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Upgrade 4.3.90.1
 
 * Thu Nov 17 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-3.fc5
 - Added libXpm-devel and libXext-devel BuildRequires
@@ -108,7 +127,7 @@
 - Updated to version 4.2.1
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Removed generic INSTALL from %doc
+- Removed generic INSTALL from %%doc
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 06:21:54 -0000	1.5
+++ sources	5 Oct 2006 03:11:10 -0000	1.6
@@ -1 +1 @@
-d73e89c50179ccb438c076b3b71d59a4  xfwm4-4.2.3.2.tar.gz
+ab8fcfdf496f093bbe711a7d853deb33  xfwm4-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 06:21:54 -0000	1.5
+++ .cvsignore	5 Oct 2006 03:11:10 -0000	1.6
@@ -1 +1 @@
-xfwm4-4.2.3.2.tar.gz
+xfwm4-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:13:39 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:13:39 -0700
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec, 1.8, 1.9 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050313.k953Dfv8001604@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1583

Modified Files:
	xfwm4-themes.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfwm4-themes.spec	30 Aug 2006 04:07:47 -0000	1.8
+++ xfwm4-themes.spec	5 Oct 2006 03:13:39 -0000	1.9
@@ -1,10 +1,10 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfwm4-themes-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-themes-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfwm4
@@ -35,11 +35,17 @@
 %{_datadir}/themes
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Rebuild for fc5
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:13:22 -0000	1.4
+++ sources	5 Oct 2006 03:13:39 -0000	1.5
@@ -1 +1 @@
-98dbf2f80f30206ca1bcaff9358bedfd  xfwm4-themes-4.2.3.tar.gz
+48f6171c4eed813770e211ccfad8aeaf  xfwm4-themes-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:13:22 -0000	1.4
+++ .cvsignore	5 Oct 2006 03:13:39 -0000	1.5
@@ -1 +1 @@
-xfwm4-themes-4.2.3.tar.gz
+xfwm4-themes-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:16:03 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:16:03 -0700
Subject: rpms/mousepad/devel mousepad.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200610050316.k953G5oa001683@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mousepad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1662

Modified Files:
	mousepad.spec sources .cvsignore 
Log Message:
Update to 0.2.8



Index: mousepad.spec
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/mousepad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mousepad.spec	3 Sep 2006 03:20:14 -0000	1.1
+++ mousepad.spec	5 Oct 2006 03:16:03 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           mousepad
-Version:        0.2.6
-Release:        2%{?dist}
+Version:        0.2.8
+Release:        1%{?dist}
 Summary:        Mousepad - A simple text editor for Xfce
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-4.3.90.2/src/mousepad-0.2.6.tar.bz2
+Source0:        http://www.xfce.org/archive/xfce-4.3.90.2/src/mousepad-0.2.8.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxfcegui4-devel
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/* 
 
 %changelog
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.8-1
+- Update to 0.2.8
+
 * Thu Aug 31 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.6-2
 - Add update-desktop-database
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2006 03:20:14 -0000	1.2
+++ sources	5 Oct 2006 03:16:03 -0000	1.3
@@ -1 +1 @@
-f8c23b1de6d23927729c477689883c38  mousepad-0.2.6.tar.bz2
+ad40c3b610123b7347094464a603e337  mousepad-0.2.8.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2006 03:20:14 -0000	1.2
+++ .cvsignore	5 Oct 2006 03:16:03 -0000	1.3
@@ -1 +1 @@
-mousepad-0.2.6.tar.bz2
+mousepad-0.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:19:31 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:19:31 -0700
Subject: rpms/xfcalendar/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.1, NONE sources, 1.4, NONE xfcalendar.spec, 1.9, NONE
Message-ID: <200610050319.k953JXng001715@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1699

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfcalendar.spec 
Log Message:
xfcalendar has been re-named to 'orage' upstream. 
Marking this package as dead and importing as orage. 



--- NEW FILE dead.package ---
xfcalendar has be re-named to orage. 


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfcalendar.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:21:46 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:21:46 -0700
Subject: rpms/xfce4-iconbox/devel dead.package, NONE, 1.1 xfce4-iconbox.spec,
	1.9, NONE .cvsignore, 1.4, NONE sources, 1.4, NONE Makefile, 1.1, NONE
Message-ID: <200610050321.k953Lm9w001751@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1735

Added Files:
	dead.package 
Removed Files:
	xfce4-iconbox.spec .cvsignore sources Makefile 
Log Message:
xfce4-iconbox has had all it's functionality moved to xfdesktop.



--- NEW FILE dead.package ---
xfce4-iconbox has had all it's functionality moved to xfdesktop. 


--- xfce4-iconbox.spec DELETED ---


--- .cvsignore DELETED ---


--- sources DELETED ---


--- Makefile DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:23:33 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:23:33 -0700
Subject: rpms/xfce4-systray/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.1, NONE sources, 1.4, NONE xfce4-systray.spec,
	1.9, NONE
Message-ID: <200610050323.k953NZQr001783@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1767

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfce4-systray.spec 
Log Message:
xfce4-systray has had all it's functionality moved into xfce4-panel. 



--- NEW FILE dead.package ---
xfce4-systray has had all it's functionality moved to xfce4-panel


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-systray.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:26:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:26:47 -0700
Subject: rpms/xfce4-toys/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.1, NONE sources, 1.4, NONE xfce4-toys.spec, 1.9, NONE
Message-ID: <200610050326.k953Qnta001817@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1801

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfce4-toys.spec 
Log Message:
xfce4-toys has had it's functionality moved into xfce4-panel



--- NEW FILE dead.package ---
xfce4-toys has had it's functionality moved into xfce4-panel


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-toys.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:28:01 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:28:01 -0700
Subject: rpms/xfce4-trigger-launcher/devel dead.package, NONE, 1.1 .cvsignore,
	1.4, NONE Makefile, 1.1, NONE sources, 1.4,
	NONE xfce4-trigger-launcher.spec, 1.9, NONE
Message-ID: <200610050328.k953S39n001849@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1833

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfce4-trigger-launcher.spec 
Log Message:
xfce4-trigger-launcher has had it's functionality moved into xfce4-panel



--- NEW FILE dead.package ---
xfce4-trigger-launcher has had it's functionality moved into xfce4-panel


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-trigger-launcher.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:31:37 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:31:37 -0700
Subject: rpms/orage - New directory
Message-ID: <200610050331.k953VddX001967@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1941/orage

Log Message:
Directory /cvs/extras/rpms/orage added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 03:31:37 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:31:37 -0700
Subject: rpms/orage/devel - New directory
Message-ID: <200610050331.k953Vd8F001970@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1941/orage/devel

Log Message:
Directory /cvs/extras/rpms/orage/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 03:31:48 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:31:48 -0700
Subject: rpms/orage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610050331.k953Voc3002022@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1986/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module orage


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:31:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:31:47 -0700
Subject: rpms/orage Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610050331.k953Vn5E002019@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1986

Added Files:
	Makefile import.log 
Log Message:
Setup of module orage


--- NEW FILE Makefile ---
# Top level Makefile for module orage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:32:29 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:32:29 -0700
Subject: rpms/orage import.log,1.1,1.2
Message-ID: <200610050332.k953WVCe002155@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2118

Modified Files:
	import.log 
Log Message:
auto-import orage-4.3.99.1-3.fc6 on branch devel from orage-4.3.99.1-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/orage/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 03:31:47 -0000	1.1
+++ import.log	5 Oct 2006 03:32:29 -0000	1.2
@@ -0,0 +1 @@
+orage-4_3_99_1-3_fc6:HEAD:orage-4.3.99.1-3.fc6.src.rpm:1160019145



From fedora-extras-commits at redhat.com  Thu Oct  5 03:32:30 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:32:30 -0700
Subject: rpms/orage/devel orage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610050332.k953WW5u002160@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2118/devel

Modified Files:
	.cvsignore sources 
Added Files:
	orage.spec 
Log Message:
auto-import orage-4.3.99.1-3.fc6 on branch devel from orage-4.3.99.1-3.fc6.src.rpm


--- NEW FILE orage.spec ---
Summary: Time-managing application for Xfce4
Name: orage
Version: 4.3.99.1
Release: 3%{?dist}
License: GPL
URL: http://www.xfce.org/
Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xfce-mcs-manager-devel
BuildRequires: libxfce4util-devel
BuildRequires: libxfcegui4-devel
BuildRequires: xfce4-panel-devel
BuildRequires: startup-notification-devel
BuildRequires: gettext
BuildRequires: dbh-devel
BuildRequires: desktop-file-utils

Provides: xfcalendar = %{version}-%{release}
Obsoletes: xfcalendar <= 4.2.3-1
# xfce4-datetime-plugin isn't in Xfce 4.4
Provides: xfce4-datetime-plugin = %{version}-%{release}
Obsoletes: xfce4-datetime-plugin <= 4.2.3-3

%description
Time-managing application for Xfce4

%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/%{_libdir}/xfce4/mcs-plugins/*.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
%find_lang %{name}

rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/xfcalendar.desktop

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        xfcalendar.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%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
%{_libexecdir}/xfce4/panel-plugins/orageclock
%{_datadir}/icons/hicolor/48x48/apps/xfcalendar.png
%{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
%{_datadir}/xfce4/panel-plugins/orageclock.desktop

%changelog
* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
- Bump release for devel checkin

* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
- Obsolete xfce4-datetime-plugin

* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
- Update to 4.3.99.1
- Added desktop files 

* Wed Aug 30 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
- Update to 4.3.90.2 and change name to orage

* Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
- Update to 4.2.3
- Added dist tag

* Tue May 17 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.2-1.fc4
- Update to 4.2.2

* Sat May  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-5.fc3
- Add missing dbh-devel buildrequires

* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
- lowercase Release

* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
- Remove unneeded la/a files

* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
- fix BuildRequires

* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Added BuildRequires for xfce-mcs-manager-devel

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 03:31:48 -0000	1.1
+++ .cvsignore	5 Oct 2006 03:32:29 -0000	1.2
@@ -0,0 +1 @@
+orage-4.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 03:31:48 -0000	1.1
+++ sources	5 Oct 2006 03:32:29 -0000	1.2
@@ -0,0 +1 @@
+511dce3a93aa6e34973989e4441f23ec  orage-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:32:27 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed,  4 Oct 2006 20:32:27 -0700
Subject: rpms/yum-utils import.log,1.3,1.4
Message-ID: <200610050332.k953WxFq002204@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2086

Modified Files:
	import.log 
Log Message:
auto-import yum-utils-1.0-1 on branch devel from yum-utils-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 May 2006 02:10:50 -0000	1.3
+++ import.log	5 Oct 2006 03:32:27 -0000	1.4
@@ -1,2 +1,3 @@
 yum-utils-0_2-2:HEAD:yum-utils-0.2-2.src.rpm:1118518174
 yum-utils-0_6-1_fc5:HEAD:yum-utils-0.6-1.fc5.src.rpm:1146968022
+yum-utils-1_0-1:HEAD:yum-utils-1.0-1.src.rpm:1160019314



From fedora-extras-commits at redhat.com  Thu Oct  5 03:32:28 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed,  4 Oct 2006 20:32:28 -0700
Subject: rpms/yum-utils/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 yum-utils.spec, 1.9,
	1.10 yum-utils-0.6-fastestmirror-newapi.patch, 1.1,
	NONE yum-utils-0.6-repoquery-newapi.patch, 1.1, NONE
Message-ID: <200610050333.k953X0d1002209@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2086/devel

Modified Files:
	.cvsignore sources yum-utils.spec 
Removed Files:
	yum-utils-0.6-fastestmirror-newapi.patch 
	yum-utils-0.6-repoquery-newapi.patch 
Log Message:
auto-import yum-utils-1.0-1 on branch devel from yum-utils-1.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 May 2006 02:10:50 -0000	1.5
+++ .cvsignore	5 Oct 2006 03:32:28 -0000	1.6
@@ -1 +1 @@
-yum-utils-0.6.tar.gz
+yum-utils-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 May 2006 02:10:50 -0000	1.5
+++ sources	5 Oct 2006 03:32:28 -0000	1.6
@@ -1 +1 @@
-3ac019970ed334b530dc130da97e9851  yum-utils-0.6.tar.gz
+e9af7d38f47e5d2cd945790061fa5f8b  yum-utils-1.0.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- yum-utils.spec	1 Aug 2006 21:00:56 -0000	1.9
+++ yum-utils.spec	5 Oct 2006 03:32:28 -0000	1.10
@@ -1,16 +1,14 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 0.6
-Release: 5%{?dist}
+Version: 1.0
+Release: 1
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}-fastestmirror-newapi.patch
-Patch1: yum-utils-0.6-repoquery-newapi.patch
 URL: http://linux.duke.edu/yum/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: python, yum >= 2.5.1
+Requires: python >= 2.4 , yum >= 3.0
 
 %description
 yum-utils is a collection of utilities and examples for the yum package
@@ -20,7 +18,7 @@
 %package -n yum-updateonboot
 Summary: Run yum update on system boot
 Group: System Environment/Base
-Requires: python, yum >= 2.3.2
+Requires: python, yum >= 2.4
 Requires(pre): chkconfig
 Requires(post): chkconfig
 
@@ -32,7 +30,7 @@
 %package -n yum-changelog
 Summary: Yum plugin for viewing package changelogs before/after updating
 Group: System Environment/Base
-Requires: yum >= 2.3.4
+Requires: yum >= 3.0
 
 %description -n yum-changelog
 This plugin adds a command line option to allow viewing package changelog 
@@ -41,7 +39,7 @@
 %package -n yum-fastestmirror
 Summary: Yum plugin which chooses fastest repository from a mirrorlist
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-fastestmirror
 This plugin sorts each repository's mirrorlist by connection speed
@@ -50,7 +48,7 @@
 %package -n yum-fedorakmod
 Summary: Yum plugin to handle fedora kernel modules.
 Group: System Environment/Base
-Requires: yum >= 2.6.0
+Requires: yum >= 3.0
 
 %description -n yum-fedorakmod
 Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions 
@@ -60,7 +58,7 @@
 %package -n yum-protectbase
 Summary: Yum plugin to protect packages from certain repositories.
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-protectbase
 This plugin allows certain repositories to be protected. Packages in the
@@ -70,7 +68,7 @@
 %package -n yum-versionlock
 Summary: Yum plugin to lock specified packages from being updated
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-versionlock
 This plugin allows certain packages specified in a file to be protected from being updated by 
@@ -79,7 +77,7 @@
 %package -n yum-tsflags
 Summary: Yum plugin to add tsflags by a commandline option
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-tsflags
 This plugin allows you to specify optional transaction flags on the yum
@@ -88,7 +86,7 @@
 %package -n yum-kernel-module
 Summary: Yum plugin to handle kernel-module-foo type of kernel module
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-kernel-module
 This plugin handle installation of kernel-module-foo type of kernel modules when new version of 
@@ -98,16 +96,32 @@
 %package -n yum-downloadonly
 Summary: Yum plugin to add downloadonly command option
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-downloadonly
 This plugin adds a --downloadonly flag to yum so that yum will only download
 the packages and not install/update them.
 
+%package -n yum-allowdowngrade
+Summary: Yum plugin to enable manual downgrading of packages
+Group: System Environment/Base
+Requires: yum > 3.0
+
+%description -n yum-allowdowngrade
+This plugin adds a --allow-downgrade flag to yum to make it possible to
+manually downgrade packages to specific versions.
+
+%package -n yum-skip-broken
+Summary: Yum plugin to handle skiping packages with dependency problems
+Group: System Environment/Base
+Requires: yum > 3.0
+
+%description -n yum-skip-broken
+This plugin adds a --ignore-broken to yum to make it possible to
+check packages for dependency problems and skip the one with problems.
+
 %prep
 %setup -q
-%patch0
-%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -115,7 +129,7 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken"
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -140,7 +154,7 @@
 %defattr(-, root, root)
 %doc README 
 %doc COPYING
-%doc plugins/
+%doc plugins/README
 %{_bindir}/package-cleanup
 %{_bindir}/repoclosure
 %{_bindir}/repomanage
@@ -199,12 +213,29 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf
 /usr/lib/yum-plugins/downloadonly.*
 
+%files -n yum-allowdowngrade
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf
+/usr/lib/yum-plugins/allowdowngrade.*
+
+%files -n yum-skip-broken
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf
+/usr/lib/yum-plugins/skip-broken.*
+
 %changelog
-* Tue Aug  1 2006 Bill Nottingham <notting at redhat.com>
-- add patch to fix repoqeury to work with current yum api
+* Wed Oct  4 2006 Seth Vidal <skvidal at linux.duke.edu>
+- mark it as 1.0
+- change requires for the packages to yum 3.0
+
+* Wed Sep 27 2006 Tim Lauridsen <tla at rasmil.dk>
+- added skip-broken plugin
+
+* Tue Sep 05 2006 Panu Matilainen <pmatilai at laiskianen.org>
+- added allowdowngrade plugin
 
-* Thu Jul 28 2006 Luke Macken <lmacken at redhat.com>
-- Add patch to fix fastestmirror to work with new yum api
+* Sun Aug 13 2006 Seth Vidal <skvidal at linux.duke.edu>
+- fix the plugins/ doc issue
 
 * Sat May  6 2006 Seth Vidal <skvidal at linux.duke.edu>
 - bump version number


--- yum-utils-0.6-fastestmirror-newapi.patch DELETED ---


--- yum-utils-0.6-repoquery-newapi.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:34:37 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed,  4 Oct 2006 20:34:37 -0700
Subject: rpms/yum-utils/devel yum-utils.spec,1.10,1.11
Message-ID: <200610050334.k953YdVU002278@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260

Modified Files:
	yum-utils.spec 
Log Message:
dist tag




Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- yum-utils.spec	5 Oct 2006 03:32:28 -0000	1.10
+++ yum-utils.spec	5 Oct 2006 03:34:37 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.0
-Release: 1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 03:35:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:35:15 -0700
Subject: owners owners.list,1.1775,1.1776
Message-ID: <200610050335.k953ZHuq002300@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283

Modified Files:
	owners.list 
Log Message:
Add orage Time-managing application for Xfce4
NOTE: this is just a re-name of the xfcalendar package upstream



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1775
retrieving revision 1.1776
diff -u -r1.1775 -r1.1776
--- owners.list	4 Oct 2006 18:03:09 -0000	1.1775
+++ owners.list	5 Oct 2006 03:35:14 -0000	1.1776
@@ -1160,6 +1160,7 @@
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
+Fedora Extras|orage|Time-managing application for Xfce4|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ORBit|CORBA Object Request Broker library for GNOME-1 compatibility|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|orpie|A fullscreen console-based RPN calculator|lists at forevermore.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct  5 04:58:08 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed,  4 Oct 2006 21:58:08 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.32, 1.33 git.spec, 1.20, 1.21 sources, 
	1.32, 1.33
Message-ID: <200610050458.k954wA2I005441@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5420

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	22 Sep 2006 18:11:40 -0000	1.32
+++ .cvsignore	5 Oct 2006 04:58:08 -0000	1.33
@@ -1 +1 @@
-git-1.4.2.1.tar.gz
+git-1.4.2.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git.spec	22 Sep 2006 18:11:40 -0000	1.20
+++ git.spec	5 Oct 2006 04:58:08 -0000	1.21
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.1
+Version: 	1.4.2.3
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
+- git-1.4.2.3
+
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	22 Sep 2006 18:11:40 -0000	1.32
+++ sources	5 Oct 2006 04:58:08 -0000	1.33
@@ -1 +1 @@
-3077983e34cea955b0f5cacb39b307e7  git-1.4.2.1.tar.gz
+3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 04:59:03 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed,  4 Oct 2006 21:59:03 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.32, 1.33 git.spec, 1.20, 1.21 sources, 
	1.32, 1.33
Message-ID: <200610050459.k954x5Rh005512@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5491

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	22 Sep 2006 18:13:01 -0000	1.32
+++ .cvsignore	5 Oct 2006 04:59:03 -0000	1.33
@@ -1 +1 @@
-git-1.4.2.1.tar.gz
+git-1.4.2.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git.spec	22 Sep 2006 18:13:01 -0000	1.20
+++ git.spec	5 Oct 2006 04:59:03 -0000	1.21
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.1
+Version: 	1.4.2.3
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
+- git-1.4.2.3
+
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	22 Sep 2006 18:13:01 -0000	1.32
+++ sources	5 Oct 2006 04:59:03 -0000	1.33
@@ -1 +1 @@
-3077983e34cea955b0f5cacb39b307e7  git-1.4.2.1.tar.gz
+3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 05:00:11 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed,  4 Oct 2006 22:00:11 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.32, 1.33 git.spec, 1.20, 1.21 sources, 
	1.32, 1.33
Message-ID: <200610050500.k9550Drh005599@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5578

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	22 Sep 2006 18:14:25 -0000	1.32
+++ .cvsignore	5 Oct 2006 05:00:10 -0000	1.33
@@ -1 +1 @@
-git-1.4.2.1.tar.gz
+git-1.4.2.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git.spec	22 Sep 2006 18:14:25 -0000	1.20
+++ git.spec	5 Oct 2006 05:00:10 -0000	1.21
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.1
+Version: 	1.4.2.3
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
+- git-1.4.2.3
+
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	22 Sep 2006 18:14:25 -0000	1.32
+++ sources	5 Oct 2006 05:00:10 -0000	1.33
@@ -1 +1 @@
-3077983e34cea955b0f5cacb39b307e7  git-1.4.2.1.tar.gz
+3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 05:02:54 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed,  4 Oct 2006 22:02:54 -0700
Subject: rpms/git/devel .cvsignore, 1.32, 1.33 git.spec, 1.21, 1.22 sources, 
	1.32, 1.33
Message-ID: <200610050503.k9553Sio008492@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8471

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	22 Sep 2006 18:10:26 -0000	1.32
+++ .cvsignore	5 Oct 2006 05:02:54 -0000	1.33
@@ -1 +1 @@
-git-1.4.2.1.tar.gz
+git-1.4.2.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.spec	4 Oct 2006 22:27:47 -0000	1.21
+++ git.spec	5 Oct 2006 05:02:54 -0000	1.22
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.1
-Release: 	2%{?dist}
+Version: 	1.4.2.3
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -136,8 +136,8 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.4.2.1-2
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
+- git-1.4.2.3
 
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	22 Sep 2006 18:10:26 -0000	1.32
+++ sources	5 Oct 2006 05:02:54 -0000	1.33
@@ -1 +1 @@
-3077983e34cea955b0f5cacb39b307e7  git-1.4.2.1.tar.gz
+3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 06:29:55 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed,  4 Oct 2006 23:29:55 -0700
Subject: rpms/tor/devel .cvsignore,1.2,1.3 sources,1.2,1.3 tor.spec,1.3,1.4
Message-ID: <200610050629.k956TvsF011865@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11844

Modified Files:
	.cvsignore sources tor.spec 
Log Message:
updated to 0.1.1.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 06:27:27 -0000	1.2
+++ .cvsignore	5 Oct 2006 06:29:54 -0000	1.3
@@ -1 +1 @@
-tor-0.1.1.23.tar.gz
+tor-*.tar.*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 06:27:27 -0000	1.2
+++ sources	5 Oct 2006 06:29:54 -0000	1.3
@@ -1 +1,2 @@
-33ce7155f545c4d30cb846d7017cc6c2  tor-0.1.1.23.tar.gz
+28dea6a77a43b6e421e1bd7b2cc3d940  tor-0.1.1.24.tar.gz
+217c02c37858cf6048ba2b0a99d76014  tor-0.1.1.24.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tor.spec	30 Sep 2006 16:25:17 -0000	1.3
+++ tor.spec	5 Oct 2006 06:29:54 -0000	1.4
@@ -10,8 +10,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.1.1.23
-Release:	%release_func 5
+Version:	0.1.1.24
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.24-1
+- updated to 0.1.1.24
+
 * Sat Sep 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.23-5
 - updated to recent fedora-usermgmt
 - minor cleanups



From fedora-extras-commits at redhat.com  Thu Oct  5 06:59:18 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed,  4 Oct 2006 23:59:18 -0700
Subject: rpms/gnome-python2-gda/FC-5 gnome-python2-gda.spec,1.2,1.3
Message-ID: <200610050659.k956xKsP011998@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11981

Modified Files:
	gnome-python2-gda.spec 
Log Message:
Fixed devel Requires for pygtk2


Index: gnome-python2-gda.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/FC-5/gnome-python2-gda.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-python2-gda.spec	4 Oct 2006 10:11:43 -0000	1.2
+++ gnome-python2-gda.spec	5 Oct 2006 06:59:18 -0000	1.3
@@ -8,7 +8,7 @@
 Summary: PyGNOME Python extension module for interacting with gda
 Name: gnome-python2-gda
 Version: 2.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: http://developer.gnome.org
@@ -38,7 +38,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
-Requires:       pygobject2-devel
+Requires:       pygtk2-devel
 Requires:       compat-libgda-devel
 
 
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Denis Leroy <denis at poolshark.org> - 2.14.0-2
+- Fixed devel Requires for pygtk2
+
 * Mon Jul 24 2006 Denis Leroy <denis at poolshark.org> - 2.14.0-1
 - First draft, adapted from gnome-python2-extras from core
 



From fedora-extras-commits at redhat.com  Thu Oct  5 08:34:44 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 01:34:44 -0700
Subject: rpms/xfce4-showdesktop-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-showdesktop-plugin.spec, 1.4, NONE
Message-ID: <200610050834.k958Ykn5018496@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18480

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-showdesktop-plugin.spec 
Log Message:
orphaning taskbar-plugin for Core 6/XFCE 4.4


--- NEW FILE dead.package ---
Functionality of the showdesktop-plugin has been integrated into xfce4-panel
in XFCE 4.4, this package is officially orphanded upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-showdesktop-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 09:41:48 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 02:41:48 -0700
Subject: rpms/ghdl/devel ghdl-svn71.patch,NONE,1.1
Message-ID: <200610050941.k959fo4v021640@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21622

Added Files:
	ghdl-svn71.patch 
Log Message:
add patch for svn rev71


ghdl-svn71.patch:

--- NEW FILE ghdl-svn71.patch ---
diff -urN ghdl-0.25/vhdl/back_end.ads ghdl-0.26dev/vhdl/back_end.ads
--- ghdl-0.25/vhdl/back_end.ads	2005-09-22 23:07:25.000000000 +0200
+++ ghdl-0.26dev/vhdl/back_end.ads	2006-10-05 11:35:25.000000000 +0200
@@ -29,6 +29,14 @@
    Library_To_File_Name : Library_To_File_Name_Acc :=
      Default_Library_To_File_Name'Access;
 
+   --  Back-end options.
+   type Parse_Option_Acc is access function (Opt : String) return Boolean;
+   Parse_Option : Parse_Option_Acc := null;
+
+   --  Disp back-end option help.
+   type Disp_Option_Acc is access procedure;
+   Disp_Option : Disp_Option_Acc := null;
+
    --  UNIT is a design unit from parse.
    --  According to the current back-end, do what is necessary.
    --
@@ -46,8 +54,5 @@
    --  May be NULL for no additionnal checks.
    type Sem_Foreign_Acc is access procedure (Decl : Iir);
    Sem_Foreign : Sem_Foreign_Acc := null;
-
-   --procedure Finish_Compilation
-   --  (Unit : Iir_Design_Unit; Main : Boolean := False);
 end Back_End;
 
diff -urN ghdl-0.25/vhdl/bug.adb ghdl-0.26dev/vhdl/bug.adb
--- ghdl-0.25/vhdl/bug.adb	2005-11-18 02:34:12.000000000 +0100
+++ ghdl-0.26dev/vhdl/bug.adb	2006-10-05 11:35:25.000000000 +0200
@@ -70,7 +70,7 @@
       Put_Line
         (Standard_Error,
          "Please report this bug on http://gna.org/projects/ghdl");
-      Put_Line (Standard_Error, "GHDL version: " & Ghdl_Version);
+      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "In directory: " &
                 GNAT.Directory_Operations.Get_Current_Dir);
diff -urN ghdl-0.25/vhdl/canon.adb ghdl-0.26dev/vhdl/canon.adb
--- ghdl-0.25/vhdl/canon.adb	2006-07-29 06:42:30.000000000 +0200
+++ ghdl-0.26dev/vhdl/canon.adb	2006-10-05 11:35:25.000000000 +0200
@@ -847,22 +847,6 @@
       end loop;
    end Canon_Sequential_Stmts;
 
-   procedure Add_Driver_For_Signal (Driver_List : Iir_List;
-                                    Signal : Iir)
-   is
-      Choice : Iir;
-   begin
-      if Get_Kind (Signal) = Iir_Kind_Aggregate then
-         Choice := Get_Association_Choices_Chain (Signal);
-         while Choice /= Null_Iir loop
-            Add_Driver_For_Signal (Driver_List, Get_Associated (Choice));
-            Choice := Get_Chain (Choice);
-         end loop;
-      else
-         Add_Element (Driver_List, Get_Longuest_Static_Prefix (Signal));
-      end if;
-   end Add_Driver_For_Signal;
-
    -- Create a statement transform from concurrent_signal_assignment
    -- statement STMT (either selected or conditional).
    -- waveform transformation is not done.
@@ -895,9 +879,6 @@
       --      reserved word POSTPONED.
       Set_Postponed_Flag (Proc, Get_Postponed_Flag (Proc));
 
-      Set_Driver_List (Proc, Create_Iir_List);
-      Add_Driver_For_Signal (Get_Driver_List (Proc), Get_Target (Stmt));
-
       Canon_Extract_Sensitivity (Get_Target (Stmt), Sensitivity_List, True);
 
       if Canon_Flag_Expressions then
@@ -966,7 +947,6 @@
       Assoc_Chain : Iir;
       Assoc : Iir;
       Imp : Iir;
-      Driver_List : Iir_Driver_List;
       Inter : Iir;
       Sensitivity_List : Iir_List;
       Is_Sensitized : Boolean;
@@ -1014,7 +994,6 @@
          Get_Parameter_Association_Chain (Call),
          Call);
       Set_Parameter_Association_Chain (Call, Assoc_Chain);
-      Driver_List := Null_Iir_List;
       Assoc := Assoc_Chain;
 
       --  LRM93 9.3
@@ -1034,18 +1013,6 @@
                   Canon_Extract_Sensitivity
                     (Get_Actual (Assoc), Sensitivity_List, False);
                end if;
-               --  LRM 2.1.1.2 Signal Parameters
-               if Get_Kind (Inter) = Iir_Kind_Signal_Interface_Declaration
-                 and then Get_Mode (Inter) in Iir_Out_Modes
-               then
-                  if Driver_List = Null_Iir_List then
-                     Driver_List := Create_Iir_List;
-                     Set_Driver_List (Proc, Driver_List);
-                  end if;
-                  Add_Element
-                    (Driver_List,
-                     Get_Longuest_Static_Prefix (Get_Actual (Assoc)));
-               end if;
             when Iir_Kind_Association_Element_Open
               | Iir_Kind_Association_Element_By_Individual =>
                null;
diff -urN ghdl-0.25/vhdl/disp_tree.adb ghdl-0.26dev/vhdl/disp_tree.adb
--- ghdl-0.25/vhdl/disp_tree.adb	2005-10-26 14:31:21.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_tree.adb	2006-10-05 11:35:25.000000000 +0200
@@ -1023,8 +1023,6 @@
             Disp_Depth (Get_Subprogram_Depth (Tree));
             Header ("subprogram_body:");
             Disp_Tree_Flat (Get_Subprogram_Body (Tree), Ntab);
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("attribute_value_chain:");
             Disp_Tree_Flat_Chain (Get_Attribute_Value_Chain (Tree), Ntab);
          when Iir_Kind_Procedure_Body
@@ -1423,8 +1421,6 @@
                Header ("sensivity list:");
                Disp_Tree_List (Get_Sensitivity_List (Tree), Ntab, True);
             end if;
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("declaration_chain:");
             Disp_Tree_Chain (Get_Declaration_Chain (Tree), Ntab);
             Header ("process statements:");
diff -urN ghdl-0.25/vhdl/disp_vhdl.adb ghdl-0.26dev/vhdl/disp_vhdl.adb
--- ghdl-0.25/vhdl/disp_vhdl.adb	2006-07-09 03:55:28.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_vhdl.adb	2006-10-05 11:35:25.000000000 +0200
@@ -893,25 +893,6 @@
       Put_Line (";");
    end Disp_Object_Declaration;
 
-   procedure Disp_Driver_List (List: Iir_Driver_List; Indent : Count)
-   is
-      El: Iir;
-   begin
-      if List = Null_Iir_List or else Get_Nbr_Elements (List) = 0 then
-         return;
-      end if;
-      Set_Col (Indent);
-      Put_Line ("-- drivers needed for signals:");
-      for I in Natural loop
-         El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
-         Set_Col (Indent);
-         Put ("--   ");
-         Disp_Expression (El);
-         New_Line;
-      end loop;
-   end Disp_Driver_List;
-
    procedure Disp_Subprogram_Declaration (Subprg: Iir)
    is
       Indent: Count;
@@ -943,10 +924,6 @@
          when others =>
             raise Internal_Error;
       end case;
-
-      if Get_Kind (Subprg) = Iir_Kind_Procedure_Declaration then
-         Disp_Driver_List (Get_Driver_List (Subprg), Indent);
-      end if;
    end Disp_Subprogram_Declaration;
 
    procedure Disp_Subprogram_Body (Subprg : Iir)
@@ -1517,7 +1494,6 @@
       else
          New_Line;
       end if;
-      Disp_Driver_List (Get_Driver_List (Process), Start + Indentation);
       Disp_Declaration_Chain (Process, Start + Indentation);
       Set_Col (Start);
       Put_Line ("begin");
@@ -2312,10 +2288,10 @@
             Disp_Concurrent_Conditional_Signal_Assignment (An_Iir);
          when Iir_Kinds_Dyadic_Operator =>
             Disp_Dyadic_Operator (An_Iir);
-         when Iir_Kind_Signal_Interface_Declaration =>
+         when Iir_Kind_Signal_Interface_Declaration
+           | Iir_Kind_Signal_Declaration
+           | Iir_Kind_Object_Alias_Declaration =>
             Disp_Name_Of (An_Iir);
-         when Iir_Kind_Signal_Declaration =>
-            Disp_Identifier (An_Iir);
          when Iir_Kind_Enumeration_Literal =>
             Disp_Identifier (An_Iir);
          when Iir_Kind_Component_Instantiation_Statement =>
@@ -2330,8 +2306,11 @@
             Disp_Package_Declaration (An_Iir);
          when Iir_Kind_Wait_Statement =>
             Disp_Wait_Statement (An_Iir);
-         when Iir_Kind_Selected_Name =>
-            Disp_Name (An_Iir);
[...4096 lines suppressed...]
+         end if;
+         return Create_Var_Identifier_From_Buffer (L);
       end Create_Var_Identifier;
 
       function Create_Uniq_Identifier return Var_Ident_Type
@@ -22728,19 +23323,6 @@
          end case;
       end Translate_Succ_Pred_Attribute;
 
-      --  Read the boolean attribute (active or event) FIELD of simple signal
-      --  SIG.
-      function Read_Bool_Signal_Attribute (Sig : O_Enode; Field : O_Fnode)
-                                          return O_Enode
-      is
-         S : O_Enode;
-      begin
-         S := New_Convert_Ov (Sig, Ghdl_Signal_Ptr);
-         return New_Value
-           (New_Selected_Element (New_Access_Element (S), Field));
-         --Ghdl_Signal_Event_Node));
-      end Read_Bool_Signal_Attribute;
-
       type Bool_Sigattr_Data_Type is record
          Label : O_Snode;
          Field : O_Fnode;
@@ -22752,8 +23334,7 @@
          pragma Unreferenced (Targ_Type);
       begin
          Gen_Exit_When (Data.Label,
-                        Read_Bool_Signal_Attribute (New_Value (M2Lv (Targ)),
-                                                    Data.Field));
+                        New_Value (Get_Signal_Field (Targ, Data.Field)));
       end Bool_Sigattr_Non_Composite_Signal;
 
       function Bool_Sigattr_Prepare_Data_Composite
@@ -22819,7 +23400,7 @@
          if Get_Kind (Prefix_Type) in Iir_Kinds_Scalar_Type_Definition then
             --  Effecient handling for a scalar signal.
             Name := Chap6.Translate_Name (Prefix);
-            return Read_Bool_Signal_Attribute (New_Value (M2Lv (Name)), Field);
+            return New_Value (Get_Signal_Field (Name, Field));
          else
             --  Element per element handling for composite signals.
             Res := Create_Temp (Std_Boolean_Type_Node);
@@ -22839,13 +23420,14 @@
 
       function Translate_Event_Attribute (Attr : Iir) return O_Enode is
       begin
-         return Translate_Bool_Signal_Attribute (Attr, Ghdl_Signal_Event_Node);
+         return Translate_Bool_Signal_Attribute
+           (Attr, Ghdl_Signal_Event_Field);
       end Translate_Event_Attribute;
 
       function Translate_Active_Attribute (Attr : Iir) return O_Enode is
       begin
          return Translate_Bool_Signal_Attribute
-           (Attr, Ghdl_Signal_Active_Node);
+           (Attr, Ghdl_Signal_Active_Field);
       end Translate_Active_Attribute;
 
       --  Read signal value FIELD of signal SIG.
@@ -22862,11 +23444,20 @@
            (New_Unchecked_Address (New_Selected_Element (T, Field), S_Type));
       end Get_Signal_Value_Field;
 
+      function Get_Signal_Field (Sig : Mnode; Field : O_Fnode)
+                                return O_Lnode
+      is
+         S : O_Enode;
+      begin
+         S := New_Convert_Ov (New_Value (M2Lv (Sig)), Ghdl_Signal_Ptr);
+         return New_Selected_Element (New_Access_Element (S), Field);
+      end Get_Signal_Field;
+
       function Read_Last_Value (Sig : O_Enode; Sig_Type : Iir) return O_Enode
       is
       begin
          return New_Value (Get_Signal_Value_Field
-                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Node));
+                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Field));
       end Read_Last_Value;
 
       function Translate_Last_Value is new Chap7.Translate_Signal_Value
@@ -27031,39 +27622,53 @@
         (Chararray_Type, New_Unsigned_Literal (Ghdl_Index_Type, 8));
       New_Type_Decl (Get_Identifier ("__ghdl_scalar_bytes"),
                      Ghdl_Scalar_Bytes);
+
+      Ghdl_Signal_Ptr := New_Access_Type (O_Tnode_Null);
+      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+
       --  Type __signal_signal is record
       Start_Record_Type (Rec);
-      New_Record_Field (Rec, Ghdl_Signal_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Value_Field,
                         Get_Identifier ("value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Field,
                         Get_Identifier ("driving_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Field,
                         Get_Identifier ("last_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Field,
                         Get_Identifier ("last_event"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Field,
                         Get_Identifier ("last_active"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Chain_Field,
+                        Get_Identifier ("active_chain"),
+                        Ghdl_Signal_Ptr);
+      New_Record_Field (Rec, Ghdl_Signal_Event_Field,
                         Get_Identifier ("event"),
                         Std_Boolean_Type_Node);
-      New_Record_Field (Rec, Ghdl_Signal_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Field,
                         Get_Identifier ("active"),
                         Std_Boolean_Type_Node);
+      New_Record_Field (Rec, Ghdl_Signal_Has_Active_Field,
+                        Get_Identifier ("has_active"),
+                        Ghdl_Bool_Type);
       Finish_Record_Type (Rec, Ghdl_Signal_Type);
       New_Type_Decl (Get_Identifier ("__ghdl_signal"), Ghdl_Signal_Type);
 
-      Ghdl_Signal_Ptr := New_Access_Type (Ghdl_Signal_Type);
-      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+      Finish_Access_Type (Ghdl_Signal_Ptr, Ghdl_Signal_Type);
 
       Ghdl_Signal_Ptr_Ptr := New_Access_Type (Ghdl_Signal_Ptr);
       New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr_ptr"),
                      Ghdl_Signal_Ptr_Ptr);
 
+      New_Var_Decl (Ghdl_Signal_Active_Chain,
+                    Get_Identifier ("__ghdl_signal_active_chain"),
+                    O_Storage_External,
+                    Ghdl_Signal_Ptr);
+
       --  procedure __ghdl_signal_merge_rti
       --       (sig : ghdl_signal_ptr; rti : ghdl_rti_access)
       Start_Procedure_Decl
@@ -27305,6 +27910,17 @@
       New_Interface_Decl (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
       Finish_Subprogram_Decl (Interfaces, Ghdl_Process_Add_Driver);
 
+      --  procedure __ghdl_signal_direct_driver (sig : __ghdl_signal_ptr;
+      --                                         Drv : Ghdl_Ptr_type);
+      Start_Procedure_Decl
+        (Interfaces, Get_Identifier ("__ghdl_signal_direct_driver"),
+         O_Storage_External);
+      New_Interface_Decl
+        (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
+      New_Interface_Decl
+        (Interfaces, Param, Get_Identifier ("drv"), Ghdl_Ptr_Type);
+      Finish_Subprogram_Decl (Interfaces, Ghdl_Signal_Direct_Driver);
+
       declare
          procedure Create_Signal_Conversion (Name : String; Res : out O_Dnode)
          is
diff -urN ghdl-0.25/vhdl/translation.ads ghdl-0.26dev/vhdl/translation.ads
--- ghdl-0.25/vhdl/translation.ads	2006-08-02 06:13:50.000000000 +0200
+++ ghdl-0.26dev/vhdl/translation.ads	2006-10-05 11:35:23.000000000 +0200
@@ -61,6 +61,21 @@
    --  If set, do not generate code for unused implicit subprograms.
    Flag_Discard_Unused_Implicit : Boolean := False;
 
+   --  If set, dump drivers per process during compilation.
+   Flag_Dump_Drivers : Boolean := False;
+
+   --  If set, try to create direct drivers.
+   Flag_Direct_Drivers : Boolean := True;
+
+   --  If set, checks ranges (subtype ranges).
+   Flag_Range_Checks : Boolean := True;
+
+   --  If set, checks indexes (arrays index and slice).
+   Flag_Index_Checks : Boolean := True;
+
+   --  If set, do not create identifiers (for in memory compilation).
+   Flag_Discard_Identifiers : Boolean := False;
+
    type Foreign_Kind_Type is (Foreign_Unknown,
                               Foreign_Vhpidirect,
                               Foreign_Intrinsic);
diff -urN ghdl-0.25/vhdl/version.ads ghdl-0.26dev/vhdl/version.ads
--- ghdl-0.25/vhdl/version.ads	2006-08-11 05:15:55.000000000 +0200
+++ ghdl-0.26dev/vhdl/version.ads	2006-10-05 11:35:25.000000000 +0200
@@ -1,4 +1,5 @@
 package Version is
-   Ghdl_Version : constant String :=
-      "GHDL 0.25 (20060811) [Sokcho edition]";
+   Ghdl_Release : constant String :=
+      "GHDL 0.26dev (20060819) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.26dev";
 end Version;



From fedora-extras-commits at redhat.com  Thu Oct  5 09:52:10 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 02:52:10 -0700
Subject: rpms/ghdl/devel ghdl.spec,1.23,1.24
Message-ID: <200610050952.k959qCXU021686@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21669

Modified Files:
	ghdl.spec 
Log Message:
update to svn71



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ghdl.spec	27 Aug 2006 02:52:33 -0000	1.23
+++ ghdl.spec	5 Oct 2006 09:52:10 -0000	1.24
@@ -1,6 +1,6 @@
 %define gccver 4.1.1
 %define ghdlver 0.25
-%define ghdlsvnver 61
+%define ghdlsvnver 71
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.0
+- update to svn71
+
 * Sun Aug 27 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.61svn.0
 - update to svn61
 



From fedora-extras-commits at redhat.com  Thu Oct  5 09:56:34 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 02:56:34 -0700
Subject: rpms/ghdl/devel ghdl-svn71.patch,1.1,1.2
Message-ID: <200610050956.k959uacr021757@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21737

Modified Files:
	ghdl-svn71.patch 
Log Message:
add forgotten new file to the svn71 patch


ghdl-svn71.patch:

Index: ghdl-svn71.patch
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl-svn71.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghdl-svn71.patch	5 Oct 2006 09:41:47 -0000	1.1
+++ ghdl-svn71.patch	5 Oct 2006 09:56:34 -0000	1.2
@@ -2368,7 +2368,7 @@
  Use synthetizer rules for default bindings
 diff -urN ghdl-0.25/vhdl/Makefile.in ghdl-0.26dev/vhdl/Makefile.in
 --- ghdl-0.25/vhdl/Makefile.in	2006-08-11 05:16:14.000000000 +0200
-+++ ghdl-0.26dev/vhdl/Makefile.in	2006-10-05 11:38:11.000000000 +0200
++++ ghdl-0.26dev/vhdl/Makefile.in	2006-10-05 11:55:15.000000000 +0200
 @@ -520,6 +520,9 @@
  i386.o: $(GRTSRCDIR)/config/i386.S
  	$(CC) -c $(GRT_FLAGS) -o $@ $<
@@ -2727,6 +2727,190 @@
 -      Add_Element (Driver_List, Get_Longuest_Static_Prefix (Sig));
     end Sem_Add_Driver;
  end Sem_Stmts;
+diff -urN ghdl-0.25/vhdl/trans_analyzes.adb ghdl-0.26dev/vhdl/trans_analyzes.adb
+--- ghdl-0.25/vhdl/trans_analyzes.adb	1970-01-01 01:00:00.000000000 +0100
++++ ghdl-0.26dev/vhdl/trans_analyzes.adb	2006-10-05 11:35:23.000000000 +0200
+@@ -0,0 +1,163 @@
++with Iirs_Utils; use Iirs_Utils;
++with Iirs_Walk; use Iirs_Walk;
++with Disp_Vhdl;
++with Ada.Text_IO;
++with Errorout;
++
++package body Trans_Analyzes is
++   Driver_List : Iir_List;
++
++   Has_After : Boolean;
++   function Extract_Driver_Target (Target : Iir) return Walk_Status
++   is
++      Base : Iir;
++      Prefix : Iir;
++   begin
++      Base := Get_Object_Prefix (Target);
++      --  Assigment to subprogram interface does not create a driver.
++      if Get_Kind (Base) = Iir_Kind_Signal_Interface_Declaration
++        and then
++        Get_Kind (Get_Parent (Base)) = Iir_Kind_Procedure_Declaration
++      then
++         return Walk_Continue;
++      end if;
++
++      Prefix := Get_Longuest_Static_Prefix (Target);
++      Add_Element (Driver_List, Prefix);
++      if Has_After then
++         Set_After_Drivers_Flag (Base, True);
++      end if;
++      return Walk_Continue;
++   end Extract_Driver_Target;
++
++   function Extract_Driver_Stmt (Stmt : Iir) return Walk_Status
++   is
++      Status : Walk_Status;
++      We : Iir;
++   begin
++      case Get_Kind (Stmt) is
++         when Iir_Kind_Signal_Assignment_Statement =>
++            We := Get_Waveform_Chain (Stmt);
++            if We /= Null_Iir
++              and then Get_Chain (We) = Null_Iir
++              and then Get_Time (We) = Null_Iir
++              and then Get_Kind (Get_We_Value (We)) /= Iir_Kind_Null_Literal
++            then
++               Has_After := False;
++            else
++               Has_After := True;
++            end if;
++            Status := Walk_Assignment_Target
++              (Get_Target (Stmt), Extract_Driver_Target'Access);
++         when Iir_Kind_Procedure_Call_Statement =>
++            declare
++               Call : Iir;
++               Assoc : Iir;
++               Formal : Iir;
++               Inter : Iir;
++            begin
++               --  Very pessimist.
++               Has_After := True;
++
++               Call := Get_Procedure_Call (Stmt);
++               Assoc := Get_Parameter_Association_Chain (Call);
++               Inter := Get_Interface_Declaration_Chain
++                 (Get_Implementation (Call));
++               while Assoc /= Null_Iir loop
++                  Formal := Get_Formal (Assoc);
++                  if Formal = Null_Iir then
++                     Formal := Inter;
++                     Inter := Get_Chain (Inter);
++                  else
++                     Formal := Get_Base_Name (Formal);
++                  end if;
++                  if Get_Kind (Assoc)
++                    = Iir_Kind_Association_Element_By_Expression
++                    and then
++                    Get_Kind (Formal) = Iir_Kind_Signal_Interface_Declaration
++                    and then Get_Mode (Formal) /= Iir_In_Mode
++                  then
++                     Status := Extract_Driver_Target (Get_Actual (Assoc));
++                  end if;
++                  Assoc := Get_Chain (Assoc);
++               end loop;
++            end;
++         when others =>
++            null;
++      end case;
++      return Walk_Continue;
++   end Extract_Driver_Stmt;
++
++   procedure Extract_Drivers_Sequential_Stmt_Chain (Chain : Iir)
++   is
++      Status : Walk_Status;
++   begin
++      Status := Walk_Sequential_Stmt_Chain (Chain, Extract_Driver_Stmt'Access);
++   end Extract_Drivers_Sequential_Stmt_Chain;
++
++   procedure Extract_Drivers_Declaration_Chain (Chain : Iir)
++   is
++      Decl : Iir := Chain;
++   begin
++      while Decl /= Null_Iir loop
++
++         --  Only procedures and impure functions may contain assignment.
++         if Get_Kind (Decl) = Iir_Kind_Procedure_Body
++           or else (Get_Kind (Decl) = Iir_Kind_Function_Body
++                    and then
++                    Get_Pure_Flag (Get_Subprogram_Specification (Decl)))
++         then
++            Extract_Drivers_Declaration_Chain (Get_Declaration_Chain (Decl));
++            Extract_Drivers_Sequential_Stmt_Chain
++              (Get_Sequential_Statement_Chain (Decl));
++         end if;
++
++         Decl := Get_Chain (Decl);
++      end loop;
++   end Extract_Drivers_Declaration_Chain;
++
++   function Extract_Drivers (Proc : Iir) return Iir_List
++   is
++   begin
++      Driver_List := Create_Iir_List;
++      Extract_Drivers_Declaration_Chain (Get_Declaration_Chain (Proc));
++      Extract_Drivers_Sequential_Stmt_Chain
++              (Get_Sequential_Statement_Chain (Proc));
++
++      return Driver_List;
++   end Extract_Drivers;
++
++   procedure Free_Drivers_List (List : in out Iir_List)
++   is
++      El : Iir;
++   begin
++      for I in Natural loop
++         El := Get_Nth_Element (List, I);
++         exit when El = Null_Iir;
++         Set_After_Drivers_Flag (Get_Base_Name (El), False);
++      end loop;
++      Destroy_Iir_List (List);
++   end Free_Drivers_List;
++
++   procedure Dump_Drivers (Proc : Iir; List : Iir_List)
++   is
++      use Ada.Text_IO;
++      use Errorout;
++      El : Iir;
++   begin
++      Put_Line ("List of drivers for " & Disp_Node (Proc) & ":");
++      Put_Line (" (declared at " & Disp_Location (Proc) & ")");
++      for I in Natural loop
++         El := Get_Nth_Element (List, I);
++         exit when El = Null_Iir;
++         if Get_After_Drivers_Flag (Get_Base_Name (El)) then
++            Put ("*  ");
++         else
++            Put ("   ");
++         end if;
++         Disp_Vhdl.Disp_Vhdl (El);
++         New_Line;
++      end loop;
++   end Dump_Drivers;
++
++end Trans_Analyzes;
+diff -urN ghdl-0.25/vhdl/trans_analyzes.ads ghdl-0.26dev/vhdl/trans_analyzes.ads
+--- ghdl-0.25/vhdl/trans_analyzes.ads	1970-01-01 01:00:00.000000000 +0100
++++ ghdl-0.26dev/vhdl/trans_analyzes.ads	2006-10-05 11:35:23.000000000 +0200
+@@ -0,0 +1,13 @@
++with Iirs; use Iirs;
++
++package Trans_Analyzes is
++   --  Extract a list of drivers from PROC.
++   function Extract_Drivers (Proc : Iir) return Iir_List;
++
++   --  Free the list.
++   procedure Free_Drivers_List (List : in out Iir_List);
++
++   --  Dump list of drivers (LIST) for process PROC.
++   procedure Dump_Drivers (Proc : Iir; List : Iir_List);
++
++end Trans_Analyzes;
 diff -urN ghdl-0.25/vhdl/trans_be.adb ghdl-0.26dev/vhdl/trans_be.adb
 --- ghdl-0.25/vhdl/trans_be.adb	2006-08-02 05:57:46.000000000 +0200
 +++ ghdl-0.26dev/vhdl/trans_be.adb	2006-10-05 11:35:23.000000000 +0200



From fedora-extras-commits at redhat.com  Thu Oct  5 10:03:49 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:03:49 -0700
Subject: rpms/guiloader - New directory
Message-ID: <200610051003.k95A3pgp024755@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24732/guiloader

Log Message:
Directory /cvs/extras/rpms/guiloader added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 10:03:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:03:50 -0700
Subject: rpms/guiloader/devel - New directory
Message-ID: <200610051003.k95A3qxB024761@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24732/guiloader/devel

Log Message:
Directory /cvs/extras/rpms/guiloader/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 10:04:00 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:04:00 -0700
Subject: rpms/guiloader Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610051004.k95A427e024805@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24779

Added Files:
	Makefile import.log 
Log Message:
Setup of module guiloader


--- NEW FILE Makefile ---
# Top level Makefile for module guiloader
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 10:04:02 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:04:02 -0700
Subject: rpms/guiloader/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610051004.k95A449d024810@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24779/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module guiloader


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 10:04:35 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:04:35 -0700
Subject: rpms/guiloader/devel guiloader-2.8.0-soversion.patch, NONE,
	1.1 guiloader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610051004.k95A4bIP024886@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24848/devel

Modified Files:
	.cvsignore sources 
Added Files:
	guiloader-2.8.0-soversion.patch guiloader.spec 
Log Message:
auto-import guiloader-2.8.0-2 on branch devel from guiloader-2.8.0-2.src.rpm

guiloader-2.8.0-soversion.patch:

--- NEW FILE guiloader-2.8.0-soversion.patch ---
--- guiloader-2.8.0/guiloader/Makefile.in.orig	2006-09-12 10:54:56.000000000 +0200
+++ guiloader-2.8.0/guiloader/Makefile.in	2006-09-12 10:55:16.000000000 +0200
@@ -202,7 +202,6 @@
 	proxies.c proxies.h
 
 libguiloader_la_LIBADD = $(PKGS_LIBS)
-libguiloader_la_LDFLAGS = -no-undefined -avoid-version
 libguiloader_la_CPPFLAGS = $(PKGS_CFLAGS) $(GUILOADER_CFLAGS)
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guiloader.pc


--- NEW FILE guiloader.spec ---
Name:           guiloader
Version:        2.8.0
Release:        2%{?dist}
Summary:        Gideon GuiXml Loader Library

Group:          System Environment/Libraries
License:        GPL
URL:            http://gideon.sourceforge.net
Source0:        http://dl.sourceforge.net/gideon/%{name}-%{version}.tar.bz2
Patch0:         guiloader-2.8.0-soversion.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel >= 2.10.0
BuildRequires:  gtk2-devel >= 2.8.0


%description
GuiLoader is a high-performance and compact GuiXml loader
library. This library allows GTK+ applications to create GUI widgets
and objects at run-time from GuiXml resource files. GuiLoader is
written in C language as a GObject subclass and has a trivial
language-independent API. GuiLoader was designed to be easily wrapped
for any language that has GTK+ bindings.


%package devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       glib2-devel
Requires:       gtk2-devel
Requires:       pkgconfig


%description devel
This package contains the header files needed for developing %{name}
applications.


%prep
%setup -q
%patch0 -p1 -b .soversion


%build
%configure --disable-static --disable-dependency-tracking
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README
%{_libdir}/*.so.*


%files devel
%defattr(-, root, root, -)
%doc NEWS
%{_includedir}/guiloader
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 2.8.0-1
- Added pkgconfig devel Requires

* Sun Sep  3 2006 Denis Leroy <denis at poolshark.org> - 2.8.0-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guiloader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 10:04:02 -0000	1.1
+++ .cvsignore	5 Oct 2006 10:04:34 -0000	1.2
@@ -0,0 +1 @@
+guiloader-2.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guiloader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 10:04:02 -0000	1.1
+++ sources	5 Oct 2006 10:04:34 -0000	1.2
@@ -0,0 +1 @@
+98980d8c65e53f0f5288d1ebdb652b70  guiloader-2.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 10:04:32 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:04:32 -0700
Subject: rpms/guiloader import.log,1.1,1.2
Message-ID: <200610051005.k95A55XD024889@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24848

Modified Files:
	import.log 
Log Message:
auto-import guiloader-2.8.0-2 on branch devel from guiloader-2.8.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/guiloader/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 10:04:00 -0000	1.1
+++ import.log	5 Oct 2006 10:04:32 -0000	1.2
@@ -0,0 +1 @@
+guiloader-2_8_0-2:HEAD:guiloader-2.8.0-2.src.rpm:1160043671



From fedora-extras-commits at redhat.com  Thu Oct  5 10:14:44 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:14:44 -0700
Subject: owners owners.list,1.1776,1.1777
Message-ID: <200610051014.k95AEkHV025068@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25050

Modified Files:
	owners.list 
Log Message:
Added guiloader


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1776
retrieving revision 1.1777
diff -u -r1.1776 -r1.1777
--- owners.list	5 Oct 2006 03:35:14 -0000	1.1776
+++ owners.list	5 Oct 2006 10:14:44 -0000	1.1777
@@ -626,6 +626,7 @@
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtypist|GNU typing tutor|zing at fastmail.fm|extras-qa at fedoraproject.org|
 Fedora Extras|guichan|Portable C++ GUI library for games using Allegro, SDL and OpenGL|hugo at devin.com.br|extras-qa at fedoraproject.org|
+Fedora Extras|guiloader|Gideon GuiXml Loader Library|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gurlchecker|A GNOME link validity checker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gutenprint|Printer Drivers Package|panemade at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct  5 10:53:26 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 03:53:26 -0700
Subject: rpms/xfce4-battery-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-battery-plugin.spec, 1.5, 1.6
Message-ID: <200610051053.k95ArSnE025419@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25398

Modified Files:
	.cvsignore sources xfce4-battery-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2005 03:10:03 -0000	1.2
+++ .cvsignore	5 Oct 2006 10:53:26 -0000	1.3
@@ -1 +1 @@
-xfce4-battery-plugin-0.3.0.tar.gz
+xfce4-battery-plugin-0.4.90.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2005 03:10:03 -0000	1.2
+++ sources	5 Oct 2006 10:53:26 -0000	1.3
@@ -1 +1 @@
-04e121df1ff264281e56e12a8ff5f155  xfce4-battery-plugin-0.3.0.tar.gz
+4dd103909b3d5bb373c12b69da783a6c  xfce4-battery-plugin-0.4.90.2.tar.bz2


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-battery-plugin.spec	8 Sep 2006 18:36:48 -0000	1.5
+++ xfce4-battery-plugin.spec	5 Oct 2006 10:53:26 -0000	1.6
@@ -1,17 +1,18 @@
 Name:		xfce4-battery-plugin
-Version:	0.3.0
-Release:	7%{?dist}
+Version:	0.4.90.2
+Release:	3%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	LGPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	LGPL
+URL:		http://goodies.xfce.org/
+Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source1:	LGPL.%{name}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+BuildRequires:	xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -26,20 +27,31 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
-# replace wrong BSD license with a copy of LGPL
-%__cp %{SOURCE1} COPYING
+# replace wrong BSD license with a copy of LGPL (#173105)
+cp %{SOURCE1} COPYING
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
+- 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
 - Mass rebuild for Fedora Core 6.
 
@@ -52,10 +64,10 @@
 
 * Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Sat Nov 19 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-3
-- Use %{?_smp_mflags}.
+- Use {?_smp_mflags}.
 - Replace wrong BSD license with a copy of the GPL (#173105).
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-2



From fedora-extras-commits at redhat.com  Thu Oct  5 11:14:13 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 04:14:13 -0700
Subject: rpms/ghdl/devel ghdl.spec,1.24,1.25
Message-ID: <200610051114.k95BEFb6028620@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28603

Modified Files:
	ghdl.spec 
Log Message:
bump release



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ghdl.spec	5 Oct 2006 09:52:10 -0000	1.24
+++ ghdl.spec	5 Oct 2006 11:14:13 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.25
-Release: 0.%{ghdlsvnver}svn.0%{?dist}
+Release: 0.%{ghdlsvnver}svn.1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.1
+- bump release
+
 * Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.0
 - update to svn71
 



From fedora-extras-commits at redhat.com  Thu Oct  5 11:14:51 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  5 Oct 2006 04:14:51 -0700
Subject: rpms/amarok/FC-5 amarok.spec,1.60,1.61
Message-ID: <200610051114.k95BErwf028662@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28631/FC-5

Modified Files:
	amarok.spec 
Log Message:
add support for libmtp


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- amarok.spec	15 Sep 2006 10:56:58 -0000	1.60
+++ amarok.spec	5 Oct 2006 11:14:51 -0000	1.61
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    3%{?dist}
+Release:    5%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -33,6 +33,8 @@
 BuildRequires:  libgpod-devel
 # Creative Nomad Jukebox
 BuildRequires:  libnjb-devel
+# MTP players
+BuildRequires:  libmtp-devel
 ## Gstreamer engine
 #BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
 # Helix engine on archs where it is available
@@ -216,6 +218,9 @@
 # Creative Zen
 %{_datadir}/services/amarok_njb-mediadevice.desktop
 %{_libdir}/kde3/libamarok_njb-mediadevice.*
+# MTP players
+%{_datadir}/services/amarok_mtp-mediadevice.desktop
+%{_libdir}/kde3/libamarok_mtp-mediadevice.*
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
@@ -239,6 +244,12 @@
 
 
 %changelog
+* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-5
+- add libmtp support
+
+* Sun Oct 01 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-4
+- rebuild
+
 * Fri Sep 15 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-3
 - add patch for playlist encoding
 



From fedora-extras-commits at redhat.com  Thu Oct  5 11:14:52 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  5 Oct 2006 04:14:52 -0700
Subject: rpms/amarok/devel amarok.spec,1.61,1.62
Message-ID: <200610051114.k95BEsZ7028666@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28631/devel

Modified Files:
	amarok.spec 
Log Message:
add support for libmtp


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- amarok.spec	1 Oct 2006 19:23:16 -0000	1.61
+++ amarok.spec	5 Oct 2006 11:14:52 -0000	1.62
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    4%{?dist}
+Release:    5%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -33,6 +33,8 @@
 BuildRequires:  libgpod-devel
 # Creative Nomad Jukebox
 BuildRequires:  libnjb-devel
+# MTP players
+BuildRequires:  libmtp-devel
 ## Gstreamer engine
 #BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
 # Helix engine on archs where it is available
@@ -216,6 +218,9 @@
 # Creative Zen
 %{_datadir}/services/amarok_njb-mediadevice.desktop
 %{_libdir}/kde3/libamarok_njb-mediadevice.*
+# MTP players
+%{_datadir}/services/amarok_mtp-mediadevice.desktop
+%{_libdir}/kde3/libamarok_mtp-mediadevice.*
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
@@ -239,6 +244,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-5
+- add libmtp support
+
 * Sun Oct 01 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Oct  5 11:26:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:26:26 -0700
Subject: rpms/perl-Test-MockObject/FC-5 .cvsignore, 1.9,
	1.10 perl-Test-MockObject.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200610051126.k95BQSCB028906@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-MockObject/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28869/FC-5

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.07.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Apr 2006 15:55:23 -0000	1.9
+++ .cvsignore	5 Oct 2006 11:26:25 -0000	1.10
@@ -1 +1 @@
-Test-MockObject-1.06.tar.gz
+Test-MockObject-1.07.tar.gz


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/perl-Test-MockObject.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Test-MockObject.spec	21 Apr 2006 15:55:23 -0000	1.13
+++ perl-Test-MockObject.spec	5 Oct 2006 11:26:25 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.06
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
@@ -43,7 +42,6 @@
 
 
 %check
-mv t/developer/0-signature.t t/developer/0-signature.t.disable
 PERL_RUN_ALL_TESTS=1 ./Build test
 
 
@@ -55,10 +53,13 @@
 %defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/Test/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.07-1
+- Update to 1.07.
+
 * Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Apr 2006 15:55:23 -0000	1.9
+++ sources	5 Oct 2006 11:26:25 -0000	1.10
@@ -1 +1 @@
-3cef7884dd6fc6b15c35dd04697a8853  Test-MockObject-1.06.tar.gz
+197af22ac675405199693ed68f0959e1  Test-MockObject-1.07.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:26:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:26:26 -0700
Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.9,
	1.10 perl-Test-MockObject.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200610051126.k95BQSRo028912@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-MockObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28869/devel

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.07.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Apr 2006 15:42:13 -0000	1.9
+++ .cvsignore	5 Oct 2006 11:26:26 -0000	1.10
@@ -1 +1 @@
-Test-MockObject-1.06.tar.gz
+Test-MockObject-1.07.tar.gz


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Test-MockObject.spec	21 Apr 2006 15:42:13 -0000	1.13
+++ perl-Test-MockObject.spec	5 Oct 2006 11:26:26 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.06
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
@@ -43,7 +42,6 @@
 
 
 %check
-mv t/developer/0-signature.t t/developer/0-signature.t.disable
 PERL_RUN_ALL_TESTS=1 ./Build test
 
 
@@ -55,10 +53,13 @@
 %defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/Test/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.07-1
+- Update to 1.07.
+
 * Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Apr 2006 15:42:13 -0000	1.9
+++ sources	5 Oct 2006 11:26:26 -0000	1.10
@@ -1 +1 @@
-3cef7884dd6fc6b15c35dd04697a8853  Test-MockObject-1.06.tar.gz
+197af22ac675405199693ed68f0959e1  Test-MockObject-1.07.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:32:24 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  5 Oct 2006 04:32:24 -0700
Subject: rpms/plone/devel .cvsignore, 1.10, 1.11 plone.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200610051132.k95BWQmv029138@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100/devel

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 209163, CVE-2006-4247


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jul 2006 16:19:31 -0000	1.10
+++ .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
@@ -1 +1,2 @@
 Plone-2.5.tar.gz
+PasswordResetTool-0.4.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plone.spec	30 Aug 2006 12:02:41 -0000	1.16
+++ plone.spec	5 Oct 2006 11:32:21 -0000	1.17
@@ -6,12 +6,13 @@
 
 Name:           plone
 Version:        2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
+Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 Patch0:         Plone-2.5-atxmlperms.patch
 
@@ -50,6 +51,10 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
+# Fixed version of PasswordResetTool
+rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +72,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
+- Update PasswordResetTool to fix CVE-2006-4247
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-3
 - Zope 2.9.4 went back to zope/lib/python on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jul 2006 16:19:31 -0000	1.10
+++ sources	5 Oct 2006 11:32:21 -0000	1.11
@@ -1 +1,2 @@
 0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
+df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:32:21 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  5 Oct 2006 04:32:21 -0700
Subject: rpms/plone/FC-5 .cvsignore, 1.10, 1.11 plone.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200610051132.k95BWsWJ029143@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100/FC-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 209163, CVE-2006-4247


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jul 2006 16:19:31 -0000	1.10
+++ .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
@@ -1 +1,2 @@
 Plone-2.5.tar.gz
+PasswordResetTool-0.4.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plone.spec	30 Aug 2006 12:02:37 -0000	1.16
+++ plone.spec	5 Oct 2006 11:32:21 -0000	1.17
@@ -6,12 +6,13 @@
 
 Name:           plone
 Version:        2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
+Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 Patch0:         Plone-2.5-atxmlperms.patch
 
@@ -50,6 +51,10 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
+# Fixed version of PasswordResetTool
+rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +72,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
+- Update PasswordResetTool to fix CVE-2006-4247
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-3
 - Zope 2.9.4 went back to zope/lib/python on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jul 2006 16:19:31 -0000	1.10
+++ sources	5 Oct 2006 11:32:21 -0000	1.11
@@ -1 +1,2 @@
 0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
+df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:42:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:42:59 -0700
Subject: rpms/perl-Module-CoreList/devel .cvsignore, 1.11,
	1.12 perl-Module-CoreList.spec, 1.14, 1.15 sources, 1.11, 1.12
Message-ID: <200610051143.k95Bh1xN029376@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-CoreList/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321/devel

Modified Files:
	.cvsignore perl-Module-CoreList.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2006 10:16:54 -0000	1.11
+++ .cvsignore	5 Oct 2006 11:42:59 -0000	1.12
@@ -1 +1 @@
-Module-CoreList-2.08.tar.gz
+Module-CoreList-2.09.tar.gz


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/perl-Module-CoreList.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Module-CoreList.spec	7 Sep 2006 10:16:54 -0000	1.14
+++ perl-Module-CoreList.spec	5 Oct 2006 11:42:59 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-Module-CoreList
-Version:        2.08
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Perl core modules indexed by perl versions
 
@@ -10,10 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(version)
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(version)
 
 %description
 Module::CoreList contains the hash of hashes %Module::CoreList::version,
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Thu Sep  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.08-1
 - Update to 2.08.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2006 10:16:54 -0000	1.11
+++ sources	5 Oct 2006 11:42:59 -0000	1.12
@@ -1 +1 @@
-d239fa54b06afda6e2a8e9db555493ad  Module-CoreList-2.08.tar.gz
+3a295781238521a100587748945506a5  Module-CoreList-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:42:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:42:52 -0700
Subject: rpms/perl-Module-CoreList/FC-4 .cvsignore, 1.11,
	1.12 perl-Module-CoreList.spec, 1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200610051143.k95BhP9p029381@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-CoreList/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321/FC-4

Modified Files:
	.cvsignore perl-Module-CoreList.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2006 10:16:52 -0000	1.11
+++ .cvsignore	5 Oct 2006 11:42:52 -0000	1.12
@@ -1 +1 @@
-Module-CoreList-2.08.tar.gz
+Module-CoreList-2.09.tar.gz


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/perl-Module-CoreList.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Module-CoreList.spec	7 Sep 2006 10:16:52 -0000	1.13
+++ perl-Module-CoreList.spec	5 Oct 2006 11:42:52 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Module-CoreList
-Version:        2.08
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Perl core modules indexed by perl versions
 
@@ -10,10 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(version)
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(version)
 
 %description
 Module::CoreList contains the hash of hashes %Module::CoreList::version,
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Thu Sep  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.08-1
 - Update to 2.08.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2006 10:16:52 -0000	1.11
+++ sources	5 Oct 2006 11:42:52 -0000	1.12
@@ -1 +1 @@
-d239fa54b06afda6e2a8e9db555493ad  Module-CoreList-2.08.tar.gz
+3a295781238521a100587748945506a5  Module-CoreList-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:42:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:42:53 -0700
Subject: rpms/perl-Module-CoreList/FC-5 .cvsignore, 1.11,
	1.12 perl-Module-CoreList.spec, 1.14, 1.15 sources, 1.11, 1.12
Message-ID: <200610051143.k95BhPi2029386@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-CoreList/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321/FC-5

Modified Files:
	.cvsignore perl-Module-CoreList.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2006 10:16:53 -0000	1.11
+++ .cvsignore	5 Oct 2006 11:42:53 -0000	1.12
@@ -1 +1 @@
-Module-CoreList-2.08.tar.gz
+Module-CoreList-2.09.tar.gz


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-5/perl-Module-CoreList.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Module-CoreList.spec	7 Sep 2006 10:16:53 -0000	1.14
+++ perl-Module-CoreList.spec	5 Oct 2006 11:42:53 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-Module-CoreList
-Version:        2.08
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Perl core modules indexed by perl versions
 
@@ -10,10 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(version)
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(version)
 
 %description
 Module::CoreList contains the hash of hashes %Module::CoreList::version,
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Thu Sep  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.08-1
 - Update to 2.08.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2006 10:16:53 -0000	1.11
+++ sources	5 Oct 2006 11:42:53 -0000	1.12
@@ -1 +1 @@
-d239fa54b06afda6e2a8e9db555493ad  Module-CoreList-2.08.tar.gz
+3a295781238521a100587748945506a5  Module-CoreList-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:47:13 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu,  5 Oct 2006 04:47:13 -0700
Subject: rpms/yum-utils/devel yum-utils.spec,1.11,1.12
Message-ID: <200610051147.k95BlFm6029527@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29510

Modified Files:
	yum-utils.spec 
Log Message:

fix requires



Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yum-utils.spec	5 Oct 2006 03:34:37 -0000	1.11
+++ yum-utils.spec	5 Oct 2006 11:47:13 -0000	1.12
@@ -105,7 +105,7 @@
 %package -n yum-allowdowngrade
 Summary: Yum plugin to enable manual downgrading of packages
 Group: System Environment/Base
-Requires: yum > 3.0
+Requires: yum >= 3.0
 
 %description -n yum-allowdowngrade
 This plugin adds a --allow-downgrade flag to yum to make it possible to
@@ -114,7 +114,7 @@
 %package -n yum-skip-broken
 Summary: Yum plugin to handle skiping packages with dependency problems
 Group: System Environment/Base
-Requires: yum > 3.0
+Requires: yum >= 3.0
 
 %description -n yum-skip-broken
 This plugin adds a --ignore-broken to yum to make it possible to



From fedora-extras-commits at redhat.com  Thu Oct  5 11:47:29 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu,  5 Oct 2006 04:47:29 -0700
Subject: rpms/yum-utils/devel yum-utils.spec,1.12,1.13
Message-ID: <200610051147.k95BlVv3029550@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29533

Modified Files:
	yum-utils.spec 
Log Message:
bump release




Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yum-utils.spec	5 Oct 2006 11:47:13 -0000	1.12
+++ yum-utils.spec	5 Oct 2006 11:47:29 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 12:04:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Oct 2006 05:04:37 -0700
Subject: rpms/uw-imap/devel uw-imap.spec, 1.17, 1.18 imap-2006-mixproto.patch,
	1.1, NONE
Message-ID: <200610051204.k95C4dsr032576@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32559

Modified Files:
	uw-imap.spec 
Removed Files:
	imap-2006-mixproto.patch 
Log Message:
* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
- eek, pam.d/xinet.d bits were all mixed up, fixed.



Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- uw-imap.spec	4 Oct 2006 18:03:36 -0000	1.17
+++ uw-imap.spec	5 Oct 2006 12:04:36 -0000	1.18
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -28,18 +28,17 @@
 
 Source10: c-client.cf
 
-# legacy/old pam setup, using pam_stack.so
-Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source22: imap.pam
+Source21: imap.pam
+# legacy/old pam setup, using pam_stack.so
+Source22: imap-legacy.pam
 
 Source31: imap-xinetd
-Source32: ipop2-xinetd
-Source33: ipop3-xinetd
-Source34: imaps-xinetd
+Source32: imaps-xinetd
+Source33: ipop2-xinetd
+Source34: ipop3-xinetd
 Source35: pop3s-xinetd
 
-
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
@@ -274,6 +273,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
+- eek, pam.d/xinet.d bits were all mixed up, fixed.
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
 - libc-client: move c-client.cf here
 - c-client.cf: +set new-folder-format same-as-inbox


--- imap-2006-mixproto.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 12:06:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Oct 2006 05:06:19 -0700
Subject: rpms/uw-imap/FC-5 uw-imap.spec,1.12,1.13
Message-ID: <200610051206.k95C6L74032665@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32648

Modified Files:
	uw-imap.spec 
Log Message:
* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
- eek, pam.d/xinet.d bits were all mixed up, fixed.



Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- uw-imap.spec	4 Oct 2006 18:11:55 -0000	1.12
+++ uw-imap.spec	5 Oct 2006 12:06:19 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -28,18 +28,17 @@
 
 Source10: c-client.cf
 
-# legacy/old pam setup, using pam_stack.so
-Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source22: imap.pam
+Source21: imap.pam
+# legacy/old pam setup, using pam_stack.so
+Source22: imap-legacy.pam
 
 Source31: imap-xinetd
-Source32: ipop2-xinetd
-Source33: ipop3-xinetd
-Source34: imaps-xinetd
+Source32: imaps-xinetd
+Source33: ipop2-xinetd
+Source34: ipop3-xinetd
 Source35: pop3s-xinetd
 
-
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
@@ -274,6 +273,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
+- eek, pam.d/xinet.d bits were all mixed up, fixed.
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
 - libc-client: move c-client.cf here
 - c-client.cf: +set new-folder-format same-as-inbox



From fedora-extras-commits at redhat.com  Thu Oct  5 12:08:55 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:08:55 -0700
Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-clipman-plugin.spec, 1.4, 1.5
Message-ID: <200610051208.k95C8vi2000367@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv346

Modified Files:
	.cvsignore sources xfce4-clipman-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2005 04:32:10 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:08:55 -0000	1.3
@@ -1 +1 @@
-xfce4-clipman-plugin-0.4.1.tar.gz
+xfce4-clipman-plugin-0.5.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2005 04:32:10 -0000	1.2
+++ sources	5 Oct 2006 12:08:55 -0000	1.3
@@ -1 +1 @@
-664f6ca8500d8f240289c27d7bf4f419  xfce4-clipman-plugin-0.4.1.tar.gz
+039401e332277bd41d0cd51a0ec18d8a  xfce4-clipman-plugin-0.5.99.1.tar.bz2


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-clipman-plugin.spec	8 Sep 2006 18:38:52 -0000	1.4
+++ xfce4-clipman-plugin.spec	5 Oct 2006 12:08:55 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-clipman-plugin
-Version:	0.4.1
-Release:	7%{?dist}
+Version:	0.5.99.1
+Release:	3%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.1, libxfcegui4-devel >= 4.3.99.1, libxml2-devel
+BuildRequires:	libXt-devel, gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -26,17 +27,31 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%doc AUTHORS COPYING ChangeLog README THANKS
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
+- Update to 0.5.99.1.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Mass rebuild for Fedora Core 6.
 
@@ -48,7 +63,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:11:40 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:11:40 -0700
Subject: rpms/xfce4-cpugraph-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-cpugraph-plugin.spec, 1.5, 1.6
Message-ID: <200610051211.k95CBgIq000412@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391

Modified Files:
	.cvsignore sources xfce4-cpugraph-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:52:48 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:11:40 -0000	1.3
@@ -1 +1 @@
-xfce4-cpugraph-plugin-0.2.2.tar.gz
+xfce4-cpugraph-plugin-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Dec 2005 22:52:48 -0000	1.2
+++ sources	5 Oct 2006 12:11:40 -0000	1.3
@@ -1 +1 @@
-bde4c578ef469aade3f6b58a9bde8ec6  xfce4-cpugraph-plugin-0.2.2.tar.gz
+b2ff93a62845289c4a8ed7d45faa7a1f  xfce4-cpugraph-plugin-0.3.0.tar.bz2


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-cpugraph-plugin.spec	8 Sep 2006 18:40:22 -0000	1.5
+++ xfce4-cpugraph-plugin.spec	5 Oct 2006 12:11:40 -0000	1.6
@@ -1,16 +1,17 @@
 Name:		xfce4-cpugraph-plugin
-Version:	0.2.2
-Release:	7%{?dist}
+Version:	0.3
+Release:	3%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel  >= 4.3.20, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -18,7 +19,7 @@
 colors and the size of the plugin are customizable.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 %build
 %configure --disable-static
@@ -27,17 +28,27 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/xfce4/panel-plugins/*.so
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog README NEWS TODO
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-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
 - Mass rebuild for Fedora Core 6.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 12:13:39 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:13:39 -0700
Subject: rpms/xfce4-diskperf-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-diskperf-plugin.spec, 1.5, 1.6
Message-ID: <200610051213.k95CDfQE000465@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv443

Modified Files:
	.cvsignore sources xfce4-diskperf-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jan 2006 00:21:04 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:13:39 -0000	1.3
@@ -1 +1 @@
-xfce4-diskperf-plugin-1.5.tar.gz
+xfce4-diskperf-plugin-2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jan 2006 00:21:04 -0000	1.2
+++ sources	5 Oct 2006 12:13:39 -0000	1.3
@@ -1 +1 @@
-cb1b2637166b8a4355b3df85e593640f  xfce4-diskperf-plugin-1.5.tar.gz
+be819b14db68369f541a02f9a27e9dc5  xfce4-diskperf-plugin-2.0.tar.bz2


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-diskperf-plugin.spec	8 Sep 2006 18:44:42 -0000	1.5
+++ xfce4-diskperf-plugin.spec	5 Oct 2006 12:13:39 -0000	1.6
@@ -1,16 +1,17 @@
 Name:		xfce4-diskperf-plugin
-Version:	1.5
-Release:	7%{?dist}
+Version:	2.0
+Release:	3%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -26,7 +27,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,9 +34,20 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 2.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.5-7
 - Mass rebuild for Fedora Core 6.
 
@@ -48,7 +59,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:15:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:15:24 -0700
Subject: rpms/xfce4-fsguard-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-fsguard-plugin.spec, 1.4, 1.5
Message-ID: <200610051215.k95CFQSi000509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv488

Modified Files:
	.cvsignore sources xfce4-fsguard-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jan 2006 23:36:42 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:15:24 -0000	1.3
@@ -1 +1 @@
-xfce4-fsguard-plugin-0.2.1.tar.gz
+xfce4-fsguard-plugin-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jan 2006 23:36:42 -0000	1.2
+++ sources	5 Oct 2006 12:15:24 -0000	1.3
@@ -1 +1 @@
-6fa6c2b734ee8d4c0a5901f6d704b6c9  xfce4-fsguard-plugin-0.2.1.tar.gz
+27770ad4c4b737bfb0f3fb2457b33729  xfce4-fsguard-plugin-0.3.0.tar.bz2


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/xfce4-fsguard-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-fsguard-plugin.spec	8 Sep 2006 18:48:25 -0000	1.4
+++ xfce4-fsguard-plugin.spec	5 Oct 2006 12:15:24 -0000	1.5
@@ -1,17 +1,17 @@
 Name:		xfce4-fsguard-plugin
-Version:	0.2.1
-Release:	5%{?dist}
+Version:	0.3.0
+Release:	3%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -29,18 +29,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang xfce4-fsguard
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f xfce4-fsguard.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
+- Update to 0.3.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.2.1-5
 - Mass rebuild for Fedora Core 6.
 
@@ -52,7 +62,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-2
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:18:37 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:18:37 -0700
Subject: rpms/xfce4-genmon-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-genmon-plugin.spec, 1.4, 1.5
Message-ID: <200610051218.k95CIdcZ000554@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv533

Modified Files:
	.cvsignore sources xfce4-genmon-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:38:04 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-xfce4-genmon-plugin-1.1.tar.gz
+xfce4-genmon-plugin-2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Dec 2005 22:38:04 -0000	1.2
+++ sources	5 Oct 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-130be5e17d4ae41f86bbb952adb6a95d  xfce4-genmon-plugin-1.1.tar.gz
+c859720637f943032545d7b1428aa0b4  xfce4-genmon-plugin-2.0.tar.bz2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-genmon-plugin.spec	8 Sep 2006 18:50:18 -0000	1.4
+++ xfce4-genmon-plugin.spec	5 Oct 2006 12:18:36 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-genmon-plugin
-Version:	1.1
-Release:	7%{?dist}
+Version:	2.0
+Release:	3%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	LGPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -26,7 +27,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,9 +34,20 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 2.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.1-7
 - Mass rebuild for Fedora Core 6.
 
@@ -48,7 +59,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.1-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 1.1-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:20:45 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:20:45 -0700
Subject: rpms/xfce4-mailwatch-plugin/devel xfce4-mailwatch-plugin.spec, 1.3, 
	1.4
Message-ID: <200610051220.k95CKlEk000599@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mailwatch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv582

Modified Files:
	xfce4-mailwatch-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: xfce4-mailwatch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mailwatch-plugin/devel/xfce4-mailwatch-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mailwatch-plugin.spec	8 Sep 2006 18:53:57 -0000	1.3
+++ xfce4-mailwatch-plugin.spec	5 Oct 2006 12:20:44 -0000	1.4
@@ -1,13 +1,13 @@
 Name:		xfce4-mailwatch-plugin
 Version:	1.0.1
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	Mail Watcher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://spuriousinterrupt.org/projects/mailwatch
 Source0:	http://spuriousinterrupt.org/files/mailwatch/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
@@ -16,7 +16,7 @@
 %if "%fedora" > "4"
 BuildRequires:	gnutls-devel >= 1.2.0, libXt-devel
 %endif
-Requires:	xfce4-panel >= 4.2
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 Mailwatch is a plugin for the Xfce 4 panel. It is intended to replace the 
@@ -33,19 +33,18 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %clean
@@ -54,15 +53,20 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/icons/hicolor/48x48/apps/xfce-newmail.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce-nomail.png
-%{_datadir}/icons/hicolor/scalable/apps/xfce-newmail.svg
-%{_datadir}/icons/hicolor/scalable/apps/xfce-nomail.svg
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce-*mail.png
+%{_datadir}/icons/hicolor/scalable/apps/xfce-*mail.svg
 %{_datadir}/xfce4/doc/C/xfce4-mailwatch-plugin.html
 %{_datadir}/xfce4/doc/C/images/mailwatch-*.png
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-4
+- Bump release for devel checkin.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Mass rebuild for Fedora Core 6.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 12:23:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:23:23 -0700
Subject: rpms/xfce4-minicmd-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-minicmd-plugin.spec, 1.4, 1.5
Message-ID: <200610051223.k95CNQfE000677@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656

Modified Files:
	.cvsignore sources xfce4-minicmd-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2005 03:53:18 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:23:23 -0000	1.3
@@ -1 +1 @@
-xfce4-minicmd-plugin-0.3.0.tar.gz
+xfce4-minicmd-plugin-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2005 03:53:18 -0000	1.2
+++ sources	5 Oct 2006 12:23:23 -0000	1.3
@@ -1 +1 @@
-fe52a8ed8451ed41366d5b4abb2dbf9e  xfce4-minicmd-plugin-0.3.0.tar.gz
+8739e1b25432b2866efa078551c444fc  xfce4-minicmd-plugin-0.4.tar.bz2


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/xfce4-minicmd-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-minicmd-plugin.spec	8 Sep 2006 18:55:36 -0000	1.4
+++ xfce4-minicmd-plugin.spec	5 Oct 2006 12:23:23 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-minicmd-plugin
-Version:	0.3.0
-Release:	7%{?dist}
+Version:	0.4
+Release:	3%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -37,8 +38,19 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/xfce4/panel-plugins/*.so
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4-1
+- Update to 0.4 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-7
 - Mass rebuild for Fedora Core 6.
 
@@ -50,7 +62,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:29:38 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:29:38 -0700
Subject: rpms/xfce4-mount-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-mount-plugin.spec, 1.7, 1.8
Message-ID: <200610051229.k95CTe3l000719@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv698

Modified Files:
	.cvsignore sources xfce4-mount-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jan 2006 22:24:09 -0000	1.3
+++ .cvsignore	5 Oct 2006 12:29:38 -0000	1.4
@@ -1 +1 @@
-xfce4-mount-plugin-0.3.3.tar.bz2
+xfce4-mount-plugin-0.4.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jan 2006 22:24:09 -0000	1.3
+++ sources	5 Oct 2006 12:29:38 -0000	1.4
@@ -1 +1 @@
-94e0f1e0b5501d5a5ba7d137ca7e5be9  xfce4-mount-plugin-0.3.3.tar.bz2
+1333adf1c76d8f8b4c6f58bbcf43b6c6  xfce4-mount-plugin-0.4.8.tar.bz2


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-mount-plugin.spec	8 Sep 2006 18:59:41 -0000	1.7
+++ xfce4-mount-plugin.spec	5 Oct 2006 12:29:38 -0000	1.8
@@ -1,17 +1,17 @@
 Name:		xfce4-mount-plugin
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.8
+Release:	1%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext, intltool
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -26,18 +26,43 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce-mount.png
+%{_datadir}/icons/hicolor/scalable/apps/xfce-mount.svg
+
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.8-1
+- Update to 0.4.8.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
 - Mass rebuild for Fedora Core 6.
 
@@ -55,7 +80,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-2
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:36:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:36:53 -0700
Subject: rpms/xfce4-netload-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-netload-plugin.spec, 1.5,
	1.6 xfce4-netload-plugin-bufsize.patch, 1.2, NONE
Message-ID: <200610051236.k95Catwp000852@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831

Modified Files:
	.cvsignore sources xfce4-netload-plugin.spec 
Removed Files:
	xfce4-netload-plugin-bufsize.patch 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jan 2006 23:40:16 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:36:53 -0000	1.3
@@ -1 +1 @@
-xfce4-netload-plugin-0.3.3.tar.bz2
+xfce4-netload-plugin-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jan 2006 23:40:16 -0000	1.2
+++ sources	5 Oct 2006 12:36:53 -0000	1.3
@@ -1 +1 @@
-7a0483c77240200f1a918a1a3c5e0b33  xfce4-netload-plugin-0.3.3.tar.bz2
+a15ee479089ba7703c5dde33ff439573  xfce4-netload-plugin-0.4.0.tar.bz2


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-netload-plugin.spec	8 Sep 2006 20:11:45 -0000	1.5
+++ xfce4-netload-plugin.spec	5 Oct 2006 12:36:53 -0000	1.6
@@ -1,25 +1,23 @@
 Name:		xfce4-netload-plugin
-Version:	0.3.3
-Release:	7%{?dist}
+Version:	0.4.0
+Release:	3%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-Patch0:		xfce4-netload-plugin-bufsize.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A network-load monitor plugin for the Xfce panel.
 
 %prep
 %setup -q
-%patch0 -p0 -b .orig
 
 %build
 %configure --disable-static
@@ -28,18 +26,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang xfce4-netload
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f xfce4-netload.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-2
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Mass rebuild for Fedora Core 6.
 
@@ -55,7 +63,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-3
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
 - Initial Fedora Extras version.


--- xfce4-netload-plugin-bufsize.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 12:43:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:43:10 -0700
Subject: rpms/xfce4-notes-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-notes-plugin.spec, 1.4, 1.5
Message-ID: <200610051243.k95ChCER000908@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv887

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2005 03:46:11 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:43:10 -0000	1.3
@@ -1 +1 @@
-xfce4-notes-plugin-0.11.1.tar.gz
+xfce4-notes-plugin-1.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2005 03:46:11 -0000	1.2
+++ sources	5 Oct 2006 12:43:10 -0000	1.3
@@ -1 +1 @@
-bc663b4be052ba184898b553141f08e3  xfce4-notes-plugin-0.11.1.tar.gz
+e77f1150459d8ab6a1ae0d86af09f44c  xfce4-notes-plugin-1.3.99.1.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-notes-plugin.spec	8 Sep 2006 19:02:18 -0000	1.4
+++ xfce4-notes-plugin.spec	5 Oct 2006 12:43:10 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-notes-plugin
-Version:	0.11.1
-Release:	5%{?dist}
+Version:	1.3.99.1
+Release:	3%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.90.1, libxfcegui4-devel >= 4.3.90.1, libxml2-devel
+BuildRequires:	libXt-devel, gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -28,18 +29,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/*
+%doc AUTHORS COPYING ChangeLog README TODO
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_bindir}/xfce4-popup-notes
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.99.1-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.99.1-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Thu Sep 07 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.99.1-1
+- Update to 1.3.99.1.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.90.2-1
+- Update to 1.3.90.2 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.11.1-5
 - Mass rebuild for Fedora Core 6.
 
@@ -51,7 +66,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-2
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:48:13 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:48:13 -0700
Subject: rpms/xfce4-quicklauncher-plugin/devel .cvsignore, 1.2, 1.3 sources, 
	1.2, 1.3 xfce4-quicklauncher-plugin.spec, 1.4, 1.5
Message-ID: <200610051248.k95CmF2X000955@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv934

Modified Files:
	.cvsignore sources xfce4-quicklauncher-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jan 2006 17:57:59 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:48:12 -0000	1.3
@@ -1 +1 @@
-xfce4-quicklauncher-plugin-0.81.tar.gz
+xfce4-quicklauncher-plugin-1.9.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jan 2006 17:57:59 -0000	1.2
+++ sources	5 Oct 2006 12:48:12 -0000	1.3
@@ -1 +1 @@
-98231ea7afe226ca7cbdc5c51ea3d16e  xfce4-quicklauncher-plugin-0.81.tar.gz
+64353ee9f32f891f198297937454307b  xfce4-quicklauncher-plugin-1.9.2.tar.bz2


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-quicklauncher-plugin.spec	8 Sep 2006 19:04:03 -0000	1.4
+++ xfce4-quicklauncher-plugin.spec	5 Oct 2006 12:48:12 -0000	1.5
@@ -1,17 +1,17 @@
 Name:		xfce4-quicklauncher-plugin
-Version:	0.81
-Release:	5%{?dist}
+Version:	1.9.2
+Release:	1%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -19,8 +19,6 @@
 
 %prep
 %setup -q
-# fix permission of AUTHORS and COPYING
-%__chmod 0664 {AUTHORS,COPYING}
 
 %build
 %configure --disable-static
@@ -39,8 +37,19 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog TODO
 %{_libdir}/xfce4/panel-plugins/*.so
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-1
+- Update to 1.9.2.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 1.9.1 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.81-5
 - Mass rebuild for Fedora Core 6.
 
@@ -52,7 +61,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-2
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Fri Nov 18 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-1
 - Initial Fedora Extras release.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:53:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:53:53 -0700
Subject: rpms/xfce4-screenshooter-plugin/devel .cvsignore, 1.2, 1.3 sources, 
	1.2, 1.3 xfce4-screenshooter-plugin.spec, 1.4, 1.5
Message-ID: <200610051253.k95Crtv2001006@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv985

Modified Files:
	.cvsignore sources xfce4-screenshooter-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jan 2006 23:57:30 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:53:52 -0000	1.3
@@ -1 +1 @@
-xfce4-screenshooter-plugin-0.0.8.tar.gz
+xfce4-screenshooter-plugin-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jan 2006 23:57:30 -0000	1.2
+++ sources	5 Oct 2006 12:53:52 -0000	1.3
@@ -1 +1 @@
-b9195d25ae587ae3f48cd2b215cd45d3  xfce4-screenshooter-plugin-0.0.8.tar.gz
+d12746c635eb28207161a3da1585aa75  xfce4-screenshooter-plugin-1.0.0.tar.bz2


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-screenshooter-plugin.spec	8 Sep 2006 19:05:52 -0000	1.4
+++ xfce4-screenshooter-plugin.spec	5 Oct 2006 12:53:52 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-screenshooter-plugin
-Version:	0.0.8
-Release:	4%{?dist}
+Version:	1.0.0
+Release:	3%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -25,17 +26,27 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/xfce4/panel-plugins/*.so
+%doc AUTHORS COPYING ChangeLog README
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.0-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.0-1
+- Update to 1.0.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.0.8-4
 - Mass rebuild for Fedora Core 6.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 12:58:03 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:58:03 -0700
Subject: rpms/xfce4-sensors-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-sensors-plugin.spec, 1.5, 1.6
Message-ID: <200610051258.k95Cw6os001049@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1028

Modified Files:
	.cvsignore sources xfce4-sensors-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2006 20:48:34 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:58:03 -0000	1.3
@@ -1 +1 @@
-xfce4-sensors-plugin-0.7.0.tar.bz2
+xfce4-sensors-plugin-0.10.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2006 20:48:34 -0000	1.2
+++ sources	5 Oct 2006 12:58:03 -0000	1.3
@@ -1 +1 @@
-10399ab7351c60e9e46e4d4375250157  xfce4-sensors-plugin-0.7.0.tar.bz2
+fa431e2b6bb0dd151047e05f7383a844  xfce4-sensors-plugin-0.10.0.tar.bz2


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/xfce4-sensors-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-sensors-plugin.spec	8 Sep 2006 19:08:19 -0000	1.5
+++ xfce4-sensors-plugin.spec	5 Oct 2006 12:58:03 -0000	1.6
@@ -1,17 +1,17 @@
 Name: 		xfce4-sensors-plugin
-Version: 	0.7.0
-Release: 	6%{?dist}
+Version: 	0.10.0
+Release: 	1%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
 License:	GPL
-URL: 		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser), lm_sensors-devel >= 2.8
+Requires:	xfce4-panel >= 4.3.99.1, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -27,18 +27,41 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce-sensors.png
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.10.0-1
+- Update to 0.10.0.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.9.0-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.9.0-1
+- Update to 0.9.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.7.0-6
 - Mass rebuild for Fedora Core 6.
 
@@ -53,7 +76,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:59:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 05:59:45 -0700
Subject: rpms/spandsp - New directory
Message-ID: <200610051259.k95Cxln4001129@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1103/spandsp

Log Message:
Directory /cvs/extras/rpms/spandsp added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 12:59:46 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 05:59:46 -0700
Subject: rpms/spandsp/devel - New directory
Message-ID: <200610051259.k95CxmeK001132@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1103/spandsp/devel

Log Message:
Directory /cvs/extras/rpms/spandsp/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 13:00:04 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:00:04 -0700
Subject: rpms/spandsp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610051300.k95D06iI001189@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148

Added Files:
	Makefile import.log 
Log Message:
Setup of module spandsp


--- NEW FILE Makefile ---
# Top level Makefile for module spandsp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 13:00:04 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:00:04 -0700
Subject: rpms/spandsp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610051300.k95D06fY001192@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module spandsp


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 13:00:41 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:00:41 -0700
Subject: rpms/spandsp import.log,1.1,1.2
Message-ID: <200610051300.k95D0h4K001257@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1224

Modified Files:
	import.log 
Log Message:
auto-import spandsp-0.0.2-1.pre26 on branch devel from spandsp-0.0.2-1.pre26.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/spandsp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 13:00:04 -0000	1.1
+++ import.log	5 Oct 2006 13:00:41 -0000	1.2
@@ -0,0 +1 @@
+spandsp-0_0_2-1_pre26:HEAD:spandsp-0.0.2-1.pre26.src.rpm:1160053232



From fedora-extras-commits at redhat.com  Thu Oct  5 13:00:42 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:00:42 -0700
Subject: rpms/spandsp/devel spandsp.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610051300.k95D0ihk001262@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1224/devel

Modified Files:
	.cvsignore sources 
Added Files:
	spandsp.spec 
Log Message:
auto-import spandsp-0.0.2-1.pre26 on branch devel from spandsp-0.0.2-1.pre26.src.rpm


--- NEW FILE spandsp.spec ---
%define pre 26

Summary: A DSP library for telephony
Name: spandsp
Version: 0.0.2
Release: 1%{?pre:.pre%{pre}}
License: GPL
Group: System Environment/Libraries
URL: http://www.soft-switch.org/
Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}/spandsp-%{version}%{?pre:pre%{pre}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: audiofile-devel
BuildRequires: doxygen

%description
SpanDSP is a library of DSP functions for telephony, in the 8000
sample per second world of E1s, T1s, and higher order PCM channels. It
contains low level functions, such as basic filters. It also contains
higher level functions, such as cadenced supervisory tone detection,
and a complete software FAX machine. The software has been designed to
avoid intellectual property issues, using mature techniques where all
relevant patents have expired. See the file DueDiligence for important
information about these intellectual property issues.

%package devel
Summary: SpanDSP development files
Group: Development/Libraries
Requires: spandsp = %{version}-%{release}
Requires: libtiff-devel

%description devel
SpanDSP development files.

%prep
%setup -q

%{__sed} -i 's/\r//' ChangeLog
%{__sed} -i 's/\r//' AUTHORS
%{__sed} -i 's/\r//' DueDiligence

%build
%configure --enable-doc --disable-static --disable-rpath
make

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm %{buildroot}%{_libdir}/libspandsp.la

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc DueDiligence ChangeLog AUTHORS COPYING NEWS README 

%{_libdir}/libspandsp.so.*

%{_datadir}/spandsp

%files devel
%defattr(-,root,root,-)
%doc doc/api
%{_includedir}/spandsp.h
%{_includedir}/spandsp
%{_libdir}/libspandsp.so

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> - 0.0.2-1.pre26
- Update to 0.0.2pre26

* Mon Mar  6 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.2-1.pre25
- "Downgrade" to 0.0.2pre25 - 0.0.3 does not work with Asterisk.
- Don't use dos2unix, use sed.

* Mon Nov 14 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 0.0.3-0.3.pre6
- Update to 0.0.3pre6

* Mon Oct 24 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 0.0.3-0.2.pre4
- Changed Source0 to Source
- Changed setup0 to setup
- Added COPYING to doc in main package.
- Removed html API docs from main package.

* Tue Oct 18 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 0.0.3-0.1.pre4
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 13:00:04 -0000	1.1
+++ .cvsignore	5 Oct 2006 13:00:42 -0000	1.2
@@ -0,0 +1 @@
+spandsp-0.0.2pre26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 13:00:04 -0000	1.1
+++ sources	5 Oct 2006 13:00:42 -0000	1.2
@@ -0,0 +1 @@
+2b28a75b1d7c49616534bd7264317241  spandsp-0.0.2pre26.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 13:05:22 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:05:22 -0700
Subject: rpms/xfce4-systemload-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-systemload-plugin.spec, 1.4, 1.5
Message-ID: <200610051305.k95D5PnN004263@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4242

Modified Files:
	.cvsignore sources xfce4-systemload-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2005 22:34:40 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:05:22 -0000	1.3
@@ -1 +1 @@
-xfce4-systemload-plugin-0.3.6.tar.gz
+xfce4-systemload-plugin-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2005 22:34:40 -0000	1.2
+++ sources	5 Oct 2006 13:05:22 -0000	1.3
@@ -1 +1 @@
-fd73efa3bd7a73e3f5fdf8d4ed848c1f  xfce4-systemload-plugin-0.3.6.tar.gz
+70d4b15f0745adc34703272449fcef93  xfce4-systemload-plugin-0.4.0.tar.bz2


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/xfce4-systemload-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-systemload-plugin.spec	8 Sep 2006 19:11:39 -0000	1.4
+++ xfce4-systemload-plugin.spec	5 Oct 2006 13:05:22 -0000	1.5
@@ -1,17 +1,17 @@
 Name:		xfce4-systemload-plugin
-Version:	0.3.6
-Release:	7%{?dist}
+Version:	0.4.0
+Release:	3%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -27,18 +27,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang xfce4-systemload
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f xfce4-systemload.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
 - Mass rebuild for Fedora Core 6.
 
@@ -50,7 +60,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:08:22 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:08:22 -0700
Subject: rpms/xfce4-taskmanager/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-taskmanager.spec, 1.5, 1.6
Message-ID: <200610051308.k95D8OAk004346@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4325

Modified Files:
	.cvsignore sources xfce4-taskmanager.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2006 20:17:12 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:08:22 -0000	1.3
@@ -1 +1 @@
-xfce4-taskmanager-0.3.1.tar.gz
+xfce4-taskmanager-0.4.0-rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2006 20:17:12 -0000	1.2
+++ sources	5 Oct 2006 13:08:22 -0000	1.3
@@ -1 +1 @@
-f8b0370c6aa6046720b039fad932084d  xfce4-taskmanager-0.3.1.tar.gz
+6111d36a743ecef817b5589f90a3f869  xfce4-taskmanager-0.4.0-rc2.tar.bz2


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/xfce4-taskmanager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-taskmanager.spec	8 Sep 2006 19:29:10 -0000	1.5
+++ xfce4-taskmanager.spec	5 Oct 2006 13:08:22 -0000	1.6
@@ -1,24 +1,26 @@
 Name:		xfce4-taskmanager
-Version:	0.3.1
-Release:	5%{?dist}
+Version:	0.4.0
+Release:	0.1.rc2%{?dist}
 Summary:	Taskmanager for the Xfce desktop environment
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
+URL:		http://xfce4-taskmanager.nebulon.de
+Source0:	http://xfce4-taskmanager.nebulon.de/xfce4-taskmanager-0.4.0-rc2.tar.bz2
 Source1:	xfce4-taskmanager.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils, intltool
+BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils, perl(XML::Parser)
 
 %description
 A simple taskmanager for the Xfce desktop environment.
 
 %prep
-%setup -q
-# fix permissions of a file in the debug package
-%__chmod 0644 src/functions.c
+%setup -qn %{name}-%{version}-rc2
+# fix some permissons...
+chmod 0644 src/*.c
+chmod 0644 src/*.h
+chmod 0644 AUTHORS ChangeLog COPYING README TODO
 
 %build
 %configure
@@ -29,9 +31,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
-        --add-category X-Fedora					\
+desktop-file-install --vendor fedora				\
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
+	--add-category X-Fedora					\
 	--add-category Application				\
 	--add-category System					\
 	%{SOURCE1}
@@ -41,14 +43,21 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-0.1.rc2
+- Update to 0.4-rc2.
+- Add BR on perl(XML::Parser), drop intltool.
+
+* Mon Oct 02 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-6
+- Rebuild for XFCE 4.4.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-5
 - Mass rebuild for Fedora Core 6.
-- Fix defattr.
+- Fix %%defattr.
 
 * Sat Jun 03 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-4
 - Add intltool BR (#193444).
@@ -59,7 +68,7 @@
 * Thu Dec 15 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2
 - Initial Fedora Extras version.
 - Add xfce4-taskmanager.desktop.
-- Remove useless NEWS from %DOC.
+- Remove useless NEWS from %%doc.
 - Clean up specfile.
 
 * Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc4.cw



From fedora-extras-commits at redhat.com  Thu Oct  5 13:10:32 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:10:32 -0700
Subject: rpms/xfce4-taskmanager/devel xfce4-taskmanager.spec,1.6,1.7
Message-ID: <200610051310.k95DAYuq004388@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4371

Modified Files:
	xfce4-taskmanager.spec 
Log Message:
Bump release for devel checkin


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/xfce4-taskmanager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-taskmanager.spec	5 Oct 2006 13:08:22 -0000	1.6
+++ xfce4-taskmanager.spec	5 Oct 2006 13:10:32 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-taskmanager
 Version:	0.4.0
-Release:	0.1.rc2%{?dist}
+Release:	0.2.rc2%{?dist}
 Summary:	Taskmanager for the Xfce desktop environment
 
 Group:		User Interface/Desktops
@@ -48,6 +48,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-0.2.rc2
+- Bump release for devel checkin.
+
 * Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-0.1.rc2
 - Update to 0.4-rc2.
 - Add BR on perl(XML::Parser), drop intltool.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:13:00 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:13:00 -0700
Subject: rpms/xfce4-wavelan-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-wavelan-plugin.spec, 1.4, 1.5
Message-ID: <200610051313.k95DD2bZ004429@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4408

Modified Files:
	.cvsignore sources xfce4-wavelan-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2005 04:40:53 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:13:00 -0000	1.3
@@ -1 +1 @@
-xfce4-wavelan-plugin-0.4.1.tar.bz2
+xfce4-wavelan-plugin-0.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2005 04:40:53 -0000	1.2
+++ sources	5 Oct 2006 13:13:00 -0000	1.3
@@ -1 +1 @@
-5ca7df0f3bfe3ee67e2a1fd6c7b60eb0  xfce4-wavelan-plugin-0.4.1.tar.bz2
+7fb068184b08d6b5bd7bc6d7e4369971  xfce4-wavelan-plugin-0.5.3.tar.bz2


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/xfce4-wavelan-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-wavelan-plugin.spec	8 Sep 2006 20:15:54 -0000	1.4
+++ xfce4-wavelan-plugin.spec	5 Oct 2006 13:13:00 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-wavelan-plugin
-Version:	0.4.1
-Release:	7%{?dist}
+Version:	0.5.3
+Release:	3%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -26,17 +27,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.3-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 0.5.3.1 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-7
 - Mass rebuild for Fedora Core 6.
 
@@ -48,7 +60,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:17:52 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu,  5 Oct 2006 06:17:52 -0700
Subject: rpms/libcdio/devel libcdio.spec,1.19,1.20
Message-ID: <200610051317.k95DHs11004488@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libcdio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4469

Modified Files:
	libcdio.spec 
Log Message:
* Thu Oct 05 2006 Adrian Reber <adrian at lisas.de> - 0.77-3
- disabled iso9660 test case (fails for some reason with date problems)
  this seems to be a known problem according to the ChangeLog



Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libcdio.spec	4 Oct 2006 22:23:12 -0000	1.19
+++ libcdio.spec	5 Oct 2006 13:17:52 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           libcdio
 Version:        0.77
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
@@ -66,7 +66,8 @@
 
 %check || :
 # disable test using local CDROM
-%{__sed} -i -e  "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" test/Makefile
+%{__sed} -i -e  "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" \
+            -e  "s,testiso9660\$(EXEEXT) \\\,\\\,g" test/Makefile
 make check
 
 
@@ -108,6 +109,10 @@
 
 
 %changelog
+* Thu Oct 05 2006 Adrian Reber <adrian at lisas.de> - 0.77-3
+- disabled iso9660 test case (fails for some reason with date problems)
+  this seems to be a known problem according to the ChangeLog
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.77-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Oct  5 13:21:40 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:21:40 -0700
Subject: rpms/xfce4-weather-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-weather-plugin.spec, 1.7, 1.8
Message-ID: <200610051321.k95DLgo5004568@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4547

Modified Files:
	.cvsignore sources xfce4-weather-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:42:43 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:21:40 -0000	1.3
@@ -1 +1 @@
-xfce4-weather-plugin-0.4.9.tar.gz
+xfce4-weather-plugin-0.5.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Dec 2005 22:42:43 -0000	1.2
+++ sources	5 Oct 2006 13:21:40 -0000	1.3
@@ -1 +1 @@
-1d5ba253c8eae5a9ad5e3d7002a0dae0  xfce4-weather-plugin-0.4.9.tar.gz
+dfc5b89a173b7da6fabe56bf73d41321  xfce4-weather-plugin-0.5.99.1.tar.bz2


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/xfce4-weather-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-weather-plugin.spec	4 Oct 2006 22:39:53 -0000	1.7
+++ xfce4-weather-plugin.spec	5 Oct 2006 13:21:40 -0000	1.8
@@ -1,17 +1,17 @@
 Name:		xfce4-weather-plugin
-Version:	0.4.9
-Release:	8%{?dist}
+Version:	0.5.99.1
+Release:	3%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -27,26 +27,49 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang xfce4-weather
+%find_lang %{name}
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f xfce4-weather.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/*
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-weather.png
+%{_datadir}/xfce4/weather
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.9-8
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
+- Update to 0.5.99.1.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Mass rebuild for Fedora Core 6.
 
-* Sat Jul 29 2006 Christoph Wickert <fedora at christoph-wickert de> - 0.4.9-6
+* Sat Jul 29 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.9-6
 - BuildRequire gettext (#193444)
 - Require xfce4-panel.
 
@@ -55,7 +78,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:24:47 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:24:47 -0700
Subject: rpms/xfce4-websearch-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-websearch-plugin.spec, 1.5, 1.6
Message-ID: <200610051324.k95DOnkO004612@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4591

Modified Files:
	.cvsignore sources xfce4-websearch-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2006 20:42:55 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:24:47 -0000	1.3
@@ -1 +1 @@
-xfce4-websearch-plugin-0.1.0.tar.gz
+xfce4-websearch-plugin-20060923svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2006 20:42:55 -0000	1.2
+++ sources	5 Oct 2006 13:24:47 -0000	1.3
@@ -1 +1 @@
-352ddd859ecd6649db34682a25012638  xfce4-websearch-plugin-0.1.0.tar.gz
+69931a7b4f4181bb80e2eca6c080649a  xfce4-websearch-plugin-20060923svn.tar.bz2


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/xfce4-websearch-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-websearch-plugin.spec	8 Sep 2006 19:18:19 -0000	1.5
+++ xfce4-websearch-plugin.spec	5 Oct 2006 13:24:47 -0000	1.6
@@ -1,25 +1,31 @@
-Name: 		xfce4-websearch-plugin
-Version: 	0.1.0
-Release: 	7%{?dist}
-Summary: 	Websearch plugin from the XFCE panel
+Name:		xfce4-websearch-plugin
+Version:	0.1.1
+Release:	0.2.20060923svn%{?dist}
+Summary:	Websearch plugin from the XFCE panel
 
-Group: 		User Interface/Desktops
+Group:		User Interface/Desktops
 License:	GPL
-URL: 		http://www.xfce.org/
-Source0: 	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:  gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+# Source0 was generated with the following commands:
+# svn co http://svn.xfce.org/svn/goodies/xfce4-websearch-plugin/trunk xfce4-websearch-plugin
+# tar -cjf xfce4-websearch-plugin-`date +%G%m%d`svn.tar.bz2 xfce4-websearch-plugin
+Source0:	%{name}-20060923svn.tar.bz2
+#Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	xfce4-panel-devel >= 4.3.0, libxfcegui4-devel >= 4.3.0, libxml2-devel
+BuildRequires:	gettext
+BuildRequires:	xfce4-dev-tools >= 4.3.90.2
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 Access searchengines from the XFCE panel.
 
 %prep
-%setup -q
+%setup -qn %{name}
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -36,8 +42,19 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_libdir}/xfce4/panel-plugins/*.so
+#%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
+- Mass rebuild for Fedora Core 6.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-7
 - Mass rebuild for Fedora Core 6.
 
@@ -49,7 +66,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:26:40 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:26:40 -0700
Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xfce4-xkb-plugin.spec, 1.8, 1.9
Message-ID: <200610051326.k95DQhUg004667@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4646

Modified Files:
	.cvsignore sources xfce4-xkb-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2006 21:57:54 -0000	1.5
+++ .cvsignore	5 Oct 2006 13:26:40 -0000	1.6
@@ -1 +1 @@
-xfce4-xkb-plugin-0.3.5.tar.gz
+xfce4-xkb-plugin-20060923svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2006 21:57:54 -0000	1.5
+++ sources	5 Oct 2006 13:26:40 -0000	1.6
@@ -1 +1 @@
-0c92dd17579e102b40289c4bc83c5505  xfce4-xkb-plugin-0.3.5.tar.gz
+788a0a93b62fcdd33985a0a4fc5a1b64  xfce4-xkb-plugin-20060923svn.tar.bz2


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-xkb-plugin.spec	8 Sep 2006 19:21:34 -0000	1.8
+++ xfce4-xkb-plugin.spec	5 Oct 2006 13:26:40 -0000	1.9
@@ -1,20 +1,26 @@
 Name:		xfce4-xkb-plugin
-Version:	0.3.5
-Release:	3%{?dist}
+Version:	0.3.6
+Release:	0.2.20060923svn%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
+# Source0 was generated with the following commands:
+# svn co http://svn.xfce.org/svn/goodies/xfce4-websearch-plugin/trunk xfce4-websearch-plugin
+# tar -cjf xfce4-xkb-plugin-`date +%G%m%d`svn.tar.bz2 xfce4-xkb-plugin
+Source0:	%{name}-20060923svn.tar.bz2
+#Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext
+BuildRequires:	xfce4-dev-tools >= 4.3.90.2
 # for modular X
 %if "%{?fedora}" > "4"
-BuildRequires:  libXext-devel, libXpm-devel
+BuildRequires:	libXt-devel
 %endif
-Requires:	xfce4-panel >= 4.2
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -24,29 +30,37 @@
 XF86Config file or some other way (e.g. setxkbmap).
 
 %prep
-%setup -q
+%setup -qn %{name}
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 %dir %{_datadir}/xfce4/xkb/
 %dir %{_datadir}/xfce4/xkb/flags
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.6-0.2.20060923svn
+- Bump release for devel checkin.
+
+* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.6-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.3.5-3
 - Mass rebuild for Fedora Core 6.
 
@@ -70,7 +84,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:28:11 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:28:11 -0700
Subject: rpms/xfce4-xmms-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-xmms-plugin.spec, 1.4, 1.5
Message-ID: <200610051328.k95DSDtu004720@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4697

Modified Files:
	.cvsignore sources xfce4-xmms-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:48:01 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:28:11 -0000	1.3
@@ -1 +1 @@
-xfce4-xmms-plugin-0.3.1.tar.bz2
+xfce4-xmms-plugin-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Dec 2005 22:48:01 -0000	1.2
+++ sources	5 Oct 2006 13:28:11 -0000	1.3
@@ -1 +1 @@
-0dac8795b192383c13b1d5cd072b754a  xfce4-xmms-plugin-0.3.1.tar.bz2
+d621fa744d534c17590848dc34884824  xfce4-xmms-plugin-0.4.2.tar.bz2


Index: xfce4-xmms-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/xfce4-xmms-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-xmms-plugin.spec	8 Sep 2006 19:25:03 -0000	1.4
+++ xfce4-xmms-plugin.spec	5 Oct 2006 13:28:11 -0000	1.5
@@ -1,17 +1,17 @@
 Name:		xfce4-xmms-plugin
-Version:	0.3.1
-Release:	7%{?dist}
+Version:	0.4.2
+Release:	2%{?dist}
 Summary:	XMMS plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext, xmms-devel >= 1.2
-Requires:	xfce4-panel >= 4.2, xmms >= 1.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.2.0, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser), xmms-devel >= 1.2
+Requires:	xfce4-panel >= 4.3.99.1, xmms >= 1.2
 
 %description
 Control XMMS from the Xfce panel.
@@ -26,7 +26,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
 %clean
@@ -35,10 +34,24 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/*
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/xfce4/xfce4-xmms-plugin
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-2
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-1
+- Update to 0.4.2.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 0.4.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-7
 - Mass rebuild for Fedora Core 6.
 
@@ -50,7 +63,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:29:55 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:29:55 -0700
Subject: rpms/xfce4-dev-tools - New directory
Message-ID: <200610051329.k95DTvBx004799@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4771/xfce4-dev-tools

Log Message:
Directory /cvs/extras/rpms/xfce4-dev-tools added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 13:29:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:29:56 -0700
Subject: rpms/xfce4-dev-tools/devel - New directory
Message-ID: <200610051330.k95DTwkh004802@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4771/xfce4-dev-tools/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-dev-tools/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 13:30:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:30:20 -0700
Subject: rpms/xfce4-dev-tools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610051330.k95DUM3t004869@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4834

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-dev-tools


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-dev-tools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 13:30:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:30:20 -0700
Subject: rpms/xfce4-dev-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610051330.k95DUMLk004872@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4834/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-dev-tools


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 13:31:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:31:04 -0700
Subject: rpms/xfce4-dev-tools import.log,1.1,1.2
Message-ID: <200610051331.k95DV69O004938@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4903

Modified Files:
	import.log 
Log Message:
auto-import xfce4-dev-tools-4.3.99.1-3.fc5 on branch devel from xfce4-dev-tools-4.3.99.1-3.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 13:30:19 -0000	1.1
+++ import.log	5 Oct 2006 13:31:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-dev-tools-4_3_99_1-3_fc5:HEAD:xfce4-dev-tools-4.3.99.1-3.fc5.src.rpm:1160055055



From fedora-extras-commits at redhat.com  Thu Oct  5 13:31:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:31:04 -0700
Subject: rpms/xfce4-dev-tools/devel xfce4-dev-tools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610051331.k95DV7RH004943@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4903/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-dev-tools.spec 
Log Message:
auto-import xfce4-dev-tools-4.3.99.1-3.fc5 on branch devel from xfce4-dev-tools-4.3.99.1-3.fc5.src.rpm


--- NEW FILE xfce4-dev-tools.spec ---
Name:		xfce4-dev-tools
Version:	4.3.99.1
Release:	3%{?dist}
Summary:	Xfce developer tools

Group:		Development/Tools
License:	GPL
URL:		http://xfce.org/~benny/projects/xfce4-dev-tools/
Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	glib2-devel, gettext-devel, gtk-doc, libtool, intltool, make
BuildArch:	noarch

%description
This package contains common tools required by Xfce developers and people
that want to build Xfce from SVN. In addition, this package contains the
Xfce developer's handbook.

%prep
%setup -q

%build
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

mkdir $RPM_BUILD_ROOT%{_datadir}/aclocal/
install -m 644 m4macros/xdt*.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/ 

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog HACKING NEWS README
%{_bindir}/xdt-autogen
%dir %{_datadir}/xfce4
%{_datadir}/xfce4/dev-tools
%{_datadir}/aclocal/*

%changelog
* Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-3
- Require gettext-devel.
- Install m4 macros also to /usr/share/aclocal.

* Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-2
- Some more requires: glib2-devel, make and gtk-doc.
- Own %%{_datadir}/xfce4

* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-1
- Initial Fedora Extras release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 13:30:20 -0000	1.1
+++ .cvsignore	5 Oct 2006 13:31:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-dev-tools-4.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 13:30:20 -0000	1.1
+++ sources	5 Oct 2006 13:31:04 -0000	1.2
@@ -0,0 +1 @@
+dc6403caf82edfb896eb3878385b439a  xfce4-dev-tools-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 13:50:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:50:29 -0700
Subject: owners owners.list,1.1777,1.1778
Message-ID: <200610051350.k95DoVn9005049@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5027

Modified Files:
	owners.list 
Log Message:
Adding spandsp.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1777
retrieving revision 1.1778
diff -u -r1.1777 -r1.1778
--- owners.list	5 Oct 2006 10:14:44 -0000	1.1777
+++ owners.list	5 Oct 2006 13:50:29 -0000	1.1778
@@ -2047,6 +2047,7 @@
 Fedora Extras|soundtracker|Sound module composer/player|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|source-highlight|Produces a document with syntax highlighting|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
+Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ghenry at suretecsystems.com



From fedora-extras-commits at redhat.com  Thu Oct  5 13:52:00 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:52:00 -0700
Subject: rpms/xfce4-dev-tools/devel xfce4-dev-tools.spec,1.1,1.2
Message-ID: <200610051352.k95Dq21I005088@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5069

Modified Files:
	xfce4-dev-tools.spec 
Log Message:
Some minor changes suggested in #209025


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-dev-tools.spec	5 Oct 2006 13:31:04 -0000	1.1
+++ xfce4-dev-tools.spec	5 Oct 2006 13:51:59 -0000	1.2
@@ -14,8 +14,7 @@
 
 %description
 This package contains common tools required by Xfce developers and people
-that want to build Xfce from SVN. In addition, this package contains the
-Xfce developer's handbook.
+that want to build Xfce from SVN.
 
 %prep
 %setup -q
@@ -29,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 
 mkdir $RPM_BUILD_ROOT%{_datadir}/aclocal/
-install -m 644 m4macros/xdt*.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/ 
+install -p -m 644 m4macros/xdt*.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/ 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,7 +38,7 @@
 %doc AUTHORS COPYING ChangeLog HACKING NEWS README
 %{_bindir}/xdt-autogen
 %dir %{_datadir}/xfce4
-%{_datadir}/xfce4/dev-tools
+%{_datadir}/xfce4/dev-tools/
 %{_datadir}/aclocal/*
 
 %changelog



From fedora-extras-commits at redhat.com  Thu Oct  5 14:36:13 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu,  5 Oct 2006 07:36:13 -0700
Subject: fedora-security/audit fc5,1.345,1.346 fc6,1.100,1.101
Message-ID: <200610051436.k95EaDrt008933@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8913

Modified Files:
	fc5 fc6 
Log Message:
Note a new mono issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- fc5	4 Oct 2006 20:30:32 -0000	1.345
+++ fc5	5 Oct 2006 14:36:11 -0000	1.346
@@ -7,6 +7,7 @@
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel
+CVE-2006-5072 VULNERABLE (mono) #209464
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) #208458
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fc6	4 Oct 2006 20:30:32 -0000	1.100
+++ fc6	5 Oct 2006 14:36:11 -0000	1.101
@@ -8,6 +8,7 @@
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel
+CVE-2006-5072 VULNERABLE (mono) bz#209467
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18) [in rawhide]



From fedora-extras-commits at redhat.com  Thu Oct  5 15:07:42 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu,  5 Oct 2006 08:07:42 -0700
Subject: fedora-release eula.txt, 1.2, 1.3 fedora-core.repo, 1.6,
	1.7 fedora-development.repo, 1.9,
	1.10 fedora-extras-development.repo, 1.7,
	1.8 fedora-extras.repo, 1.8, 1.9 fedora-release.spec, 1.30, 1.31
Message-ID: <200610051507.k95F7ghh012006@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11978

Modified Files:
	eula.txt fedora-core.repo fedora-development.repo 
	fedora-extras-development.repo fedora-extras.repo 
	fedora-release.spec 
Log Message:
Update for FC6 release



Index: eula.txt
===================================================================
RCS file: /cvs/fedora/fedora-release/eula.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eula.txt	8 Mar 2006 21:29:45 -0000	1.2
+++ eula.txt	5 Oct 2006 15:07:40 -0000	1.3
@@ -1,5 +1,5 @@
 			LICENSE AGREEMENT 
-			FEDORA(TM) CORE 5
+			FEDORA(TM) CORE 6
 
 This agreement governs the download, installation or use of the
 Software (as defined below) and any updates to the Software,


Index: fedora-core.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-core.repo	23 Jul 2006 19:12:05 -0000	1.6
+++ fedora-core.repo	5 Oct 2006 15:07:40 -0000	1.7
@@ -2,7 +2,7 @@
 name=Fedora Core $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-$releasever&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
 


Index: fedora-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-development.repo	23 Jul 2006 19:12:05 -0000	1.9
+++ fedora-development.repo	5 Oct 2006 15:07:40 -0000	1.10
@@ -27,7 +27,7 @@
 name=Fedora Core - Development
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-enabled=1
+enabled=0
 gpgcheck=0
 
 [development-debuginfo]


Index: fedora-extras-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-extras-development.repo	23 Jul 2006 19:12:05 -0000	1.7
+++ fedora-extras-development.repo	5 Oct 2006 15:07:40 -0000	1.8
@@ -13,7 +13,7 @@
 name=Fedora Extras - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=$basearch
-enabled=1
+enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
 


Index: fedora-extras.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-extras.repo	23 Jul 2006 19:12:05 -0000	1.8
+++ fedora-extras.repo	5 Oct 2006 15:07:40 -0000	1.9
@@ -2,7 +2,7 @@
 name=Fedora Extras $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-$releasever&arch=$basearch
-enabled=0
+enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
 


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fedora-release.spec	5 Sep 2006 16:22:48 -0000	1.30
+++ fedora-release.spec	5 Oct 2006 15:07:40 -0000	1.31
@@ -1,9 +1,9 @@
-%define release_name FC6 Test3
-%define release_version 5.92
+%define release_name Zod
+%define release_version 6
 
 Summary:	Fedora Core release files
 Name:		fedora-release
-Version:	5.92
+Version:	6
 Release:	1
 License:	GFDL
 Group:		System Environment/Base
@@ -64,6 +64,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Oct  5 2006 Jesse Keating <jkeating at redhat.com> - 6-1
+- Rebuild for Fedora Core 6 release
+
 * Tue Sep  5 2006 Jesse Keating <jkeating at redhat.com> - 5.92-1
 - Bump for FC6 Test3
 



From fedora-extras-commits at redhat.com  Thu Oct  5 16:12:08 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 09:12:08 -0700
Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.17,1.18
Message-ID: <200610051612.k95GCAUE015181@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15164

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
Fix for 209369, leave .so link alone


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NetworkManager-vpnc.spec	2 Oct 2006 23:13:54 -0000	1.17
+++ NetworkManager-vpnc.spec	5 Oct 2006 16:12:07 -0000	1.18
@@ -13,7 +13,7 @@
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
 Version:   0.7.0
-Release:   0%{?nm_vpnc_cvs_version}.1%{?dist}
+Release:   0%{?nm_vpnc_cvs_version}.2%{?dist}
 License:   GPL
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -58,7 +58,6 @@
 
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
-rm -f %{buildroot}%{_libdir}/lib*.so
 
 %find_lang %{name}
 
@@ -98,6 +97,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.2
+- Leave .so link alone, needed by nm
+
 * Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.1
 - Update to CVS snapshot 060929
 - Some rpmlint cleanups



From fedora-extras-commits at redhat.com  Thu Oct  5 17:03:38 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu,  5 Oct 2006 10:03:38 -0700
Subject: fedora-release fedora-legacy.repo, 1.2, 1.3 fedora-release.spec,
	1.31, 1.32 fedora-updates-testing.repo, 1.6,
	1.7 fedora-updates.repo, 1.10, 1.11
Message-ID: <200610051703.k95H3cdc018397@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18373

Modified Files:
	fedora-legacy.repo fedora-release.spec 
	fedora-updates-testing.repo fedora-updates.repo 
Log Message:
use new mirrorlist cgi


Index: fedora-legacy.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-legacy.repo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-legacy.repo	20 Mar 2006 17:33:14 -0000	1.2
+++ fedora-legacy.repo	5 Oct 2006 17:03:31 -0000	1.3
@@ -1,13 +1,13 @@
 [legacy-updates]
 name=Fedora Legacy $releasever - $basearch - Updates
-mirrorlist=http://fedora.redhat.com/Download/mirrors/legacy-updates-released-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=legacy-updates-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy
 
 [legacy-testing]
 name=Fedora Legacy $releasever - $basearch - Updates Testing
-mirrorlist=http://fedora.redhat.com/Download/mirrors/legacy-updates-testing-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=legacy-updates-testing-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fedora-release.spec	5 Oct 2006 15:07:40 -0000	1.31
+++ fedora-release.spec	5 Oct 2006 17:03:31 -0000	1.32
@@ -4,7 +4,7 @@
 Summary:	Fedora Core release files
 Name:		fedora-release
 Version:	6
-Release:	1
+Release:	2
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -64,6 +64,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Oct  5 2006 Jesse Keating <jkeating at redhat.com> - 6-2
+- replace old mirror files with new mirrorlist cgi system
+
 * Thu Oct  5 2006 Jesse Keating <jkeating at redhat.com> - 6-1
 - Rebuild for Fedora Core 6 release
 


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-updates-testing.repo	29 Mar 2006 22:15:35 -0000	1.6
+++ fedora-updates-testing.repo	5 Oct 2006 17:03:31 -0000	1.7
@@ -1,7 +1,7 @@
 [updates-testing]
 name=Fedora Core $releasever - $basearch - Test Updates
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
@@ -9,7 +9,7 @@
 [updates-testing-debuginfo]
 name=Fedora Core $releasever - $basearch - Test Updates Debug
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/debug/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-debug-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
@@ -17,7 +17,7 @@
 [updates-testing-source]
 name=Fedora Core $releasever - Test Updates Source
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-source-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-updates.repo	29 Mar 2006 23:31:22 -0000	1.10
+++ fedora-updates.repo	5 Oct 2006 17:03:31 -0000	1.11
@@ -1,7 +1,7 @@
 [updates]
 name=Fedora Core $releasever - $basearch - Updates
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -9,7 +9,7 @@
 [updates-debuginfo]
 name=Fedora Core $releasever - $basearch - Updates - Debug
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/debug/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-debug-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -17,7 +17,7 @@
 [updates-source]
 name=Fedora Core $releasever - Updates Source
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/SRPMS/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-source-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora



From fedora-extras-commits at redhat.com  Thu Oct  5 17:18:30 2006
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Thu,  5 Oct 2006 10:18:30 -0700
Subject: owners owners.list,1.1778,1.1779
Message-ID: <200610051718.k95HIWc8018560@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18543/owners

Modified Files:
	owners.list 
Log Message:
Changed my email address



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1778
retrieving revision 1.1779
diff -u -r1.1778 -r1.1779
--- owners.list	5 Oct 2006 13:50:29 -0000	1.1778
+++ owners.list	5 Oct 2006 17:18:29 -0000	1.1779
@@ -688,8 +688,8 @@
 Fedora Extras|imlib|An image loading and rendering library for X11R6|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
-Fedora Extras|initng|Programs which control basic system processes|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|initng-ifiles|Scripts for initng|daner964 at student.liu.se|extras-qa at fedoraproject.org|
+Fedora Extras|initng|Programs which control basic system processes|dm at mensa.se|extras-qa at fedoraproject.org|
+Fedora Extras|initng-ifiles|Scripts for initng|dm at mensa.se|extras-qa at fedoraproject.org|
 Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inotify-tools|Command line utilities for inotify|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct  5 17:53:08 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  5 Oct 2006 10:53:08 -0700
Subject: rpms/kawa/devel kawa.spec,1.13,1.14
Message-ID: <200610051753.k95HrAg3018831@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18805

Modified Files:
	kawa.spec 
Log Message:
Revision -11.  Add antlr to classpath for build.



Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kawa.spec	4 Oct 2006 22:51:20 -0000	1.13
+++ kawa.spec	5 Oct 2006 17:53:08 -0000	1.14
@@ -5,7 +5,7 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -18,6 +18,7 @@
 BuildRequires:    readline-devel
 BuildRequires:    ant >= 1.6
 BuildRequires:    ncurses-devel
+BuildRequires:    antlr
 BuildRequires:    servletapi5
 Requires:         servletapi5
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -43,7 +44,7 @@
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --enable-kawa-frontend
-export CLASSPATH=$(build-classpath servletapi5)
+export CLASSPATH=$(build-classpath servletapi5 antlr)
 ant
 
 # Override the Makefile for generating kawa.1, since it should be
@@ -86,8 +87,11 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 05 2006 Anthony Green <green at redhat.com> - 1:1.8-11
+- Add antlr to classpath for gjdoc.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.8-10
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 1:1.8-9
 - Fix release tag.



From fedora-extras-commits at redhat.com  Thu Oct  5 18:02:10 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  5 Oct 2006 11:02:10 -0700
Subject: rpms/liblrdf/devel liblrdf.spec,1.5,1.6
Message-ID: <200610051802.k95I2C7i021744@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/liblrdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21727

Modified Files:
	liblrdf.spec 
Log Message:
Revision -11.  Delete .la instead of %exclude it.



Index: liblrdf.spec
===================================================================
RCS file: /cvs/extras/rpms/liblrdf/devel/liblrdf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- liblrdf.spec	4 Oct 2006 22:48:40 -0000	1.5
+++ liblrdf.spec	5 Oct 2006 18:02:10 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:      Library for manipulating RDF files describing LADSPA plugins
 Name:         liblrdf
 Version:      0.4.0
-Release:      9%{?dist}
+Release:      10%{?dist}
 License:      GPL
 Group:        System Environment/Libraries
 URL:          http://lrdf.sourceforge.net/
@@ -33,7 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,12 +53,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/liblrdf.so
-%exclude %{_libdir}/liblrdf.la
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 05 2006 Anthony Green <green at redhat.com> 0.4.0-10
+- Delete .la file after installing it instead of using %%exclude.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.0-9
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.4.0-8
 - Fix release tag.



From fedora-extras-commits at redhat.com  Thu Oct  5 19:31:50 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu,  5 Oct 2006 12:31:50 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 telepathy-gabble.spec, 1.7, 1.8
Message-ID: <200610051931.k95JVq3m025713@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25692

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Oct  5 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-1
- Update to 0.3.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Oct 2006 14:20:39 -0000	1.7
+++ .cvsignore	5 Oct 2006 19:31:49 -0000	1.8
@@ -1 +1 @@
-telepathy-gabble-0.3.9.tar.gz
+telepathy-gabble-0.3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Oct 2006 14:20:39 -0000	1.7
+++ sources	5 Oct 2006 19:31:49 -0000	1.8
@@ -1 +1 @@
-7c373a8d441802e5b6a211701e894dfb  telepathy-gabble-0.3.9.tar.gz
+2d68597d5624d687ae0f67a8bd40be98  telepathy-gabble-0.3.10.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- telepathy-gabble.spec	4 Oct 2006 14:20:39 -0000	1.7
+++ telepathy-gabble.spec	5 Oct 2006 19:31:49 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.9
+Version:        0.3.10
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-1
+- Update to 0.3.10.
+
 * Wed Oct  4 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.9-1
 - Update to 0.3.9.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 19:54:02 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu,  5 Oct 2006 12:54:02 -0700
Subject: rpms/octave/FC-5 .cvsignore, 1.10, 1.11 octave.spec, 1.42,
	1.43 sources, 1.10, 1.11 octave-2.9.8-misc.patch, 1.1, NONE
Message-ID: <200610051954.k95Js4fo025861@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25840

Modified Files:
	.cvsignore octave.spec sources 
Removed Files:
	octave-2.9.8-misc.patch 
Log Message:
New release. New BuildRequires.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Aug 2006 16:19:20 -0000	1.10
+++ .cvsignore	5 Oct 2006 19:54:02 -0000	1.11
@@ -1 +1 @@
-octave-2.9.8.tar.bz2
+octave-2.9.9.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- octave.spec	15 Sep 2006 15:50:55 -0000	1.42
+++ octave.spec	5 Oct 2006 19:54:02 -0000	1.43
@@ -1,13 +1,12 @@
 Name:           octave
-Version:        2.9.8
-Release:        2%{?dist}
+Version:        2.9.9
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
-Patch0:         octave-2.9.8-misc.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -15,9 +14,9 @@
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/install-info
 BuildRequires:  bison flex less tetex gcc-gfortran lapack-devel blas-devel
-BuildRequires:  ncurses-devel zlib-devel libtermcap-devel hdf5-devel
+BuildRequires:  ncurses-devel zlib-devel libtermcap-devel hdf5-devel 
 BuildRequires:  readline-devel glibc-devel fftw-devel gperf ghostscript
-BuildRequires:  ufsparse-devel glpk-devel gnuplot desktop-file-utils
+BuildRequires:  ufsparse-devel glpk-devel gnuplot desktop-file-utils pcre-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -50,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -125,6 +123,10 @@
 
 
 %changelog
+* Thu Oct  5 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.9-1
+- New release.
+- BuildRequires: pcre-devel
+
 * Mon Sep 11 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.8-2
 - Fix this bug:
   https://www.cae.wisc.edu/pipermail/bug-octave/2006-September/000687.html


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Aug 2006 16:19:20 -0000	1.10
+++ sources	5 Oct 2006 19:54:02 -0000	1.11
@@ -1 +1 @@
-1ccc06e00de7e61cc92e245bd48024a6  octave-2.9.8.tar.bz2
+a76a6d88f414285472896a63e4282b7f  octave-2.9.9.tar.bz2


--- octave-2.9.8-misc.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:37 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel - New directory
Message-ID: <200610052046.k95Kkd5i029085@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29056/perl-POE-Component-DBIAgent/devel

Log Message:
Directory /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:36 -0700
Subject: rpms/perl-POE-Component-DBIAgent - New directory
Message-ID: <200610052046.k95Kkcwj029082@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29056/perl-POE-Component-DBIAgent

Log Message:
Directory /cvs/extras/rpms/perl-POE-Component-DBIAgent added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:41 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:41 -0700
Subject: rpms/perl-POE-Component-DBIAgent Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200610052046.k95KkhV5029125@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29092

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-POE-Component-DBIAgent


--- NEW FILE Makefile ---
# Top level Makefile for module perl-POE-Component-DBIAgent
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:42 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:42 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610052046.k95KkiOm029128@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29092/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-POE-Component-DBIAgent


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:50 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:50 -0700
Subject: rpms/perl-POE-Component-DBIAgent import.log,1.1,1.2
Message-ID: <200610052046.k95KkqQf029174@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141

Modified Files:
	import.log 
Log Message:
auto-import perl-POE-Component-DBIAgent-0.26-1.fc5 on branch devel from perl-POE-Component-DBIAgent-0.26-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 20:46:41 -0000	1.1
+++ import.log	5 Oct 2006 20:46:50 -0000	1.2
@@ -0,0 +1 @@
+perl-POE-Component-DBIAgent-0_26-1_fc5:HEAD:perl-POE-Component-DBIAgent-0.26-1.fc5.src.rpm:1160081209



From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:50 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:50 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel
	perl-POE-Component-DBIAgent.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610052046.k95Kkq3l029179@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-POE-Component-DBIAgent.spec 
Log Message:
auto-import perl-POE-Component-DBIAgent-0.26-1.fc5 on branch devel from perl-POE-Component-DBIAgent-0.26-1.fc5.src.rpm


--- NEW FILE perl-POE-Component-DBIAgent.spec ---
Name:           perl-POE-Component-DBIAgent
Version:        0.26
Release:        1%{?dist}
Summary:        POE Component for running asynchronous DBI calls
# see tail of DBIAgent.pm
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/POE-Component-DBIAgent/
Source0:        http://www.cpan.org/authors/id/R/RD/RDB/POE-Component-DBIAgent-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(Class::MethodMaker), perl(DBI), perl(POE) >= 0.17

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
DBIAgent is your answer to non-blocking DBI in POE.

%prep
%setup -q -n POE-Component-DBIAgent-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Oct 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.26-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 20:46:41 -0000	1.1
+++ .cvsignore	5 Oct 2006 20:46:50 -0000	1.2
@@ -0,0 +1 @@
+POE-Component-DBIAgent-0.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 20:46:41 -0000	1.1
+++ sources	5 Oct 2006 20:46:50 -0000	1.2
@@ -0,0 +1 @@
+be7797ba7eb147c8a2f19c89806e1d4b  POE-Component-DBIAgent-0.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 20:47:08 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:47:08 -0700
Subject: owners owners.list,1.1779,1.1780
Message-ID: <200610052047.k95KlA1t029226@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29209

Modified Files:
	owners.list 
Log Message:
added perl-POE-Component-DBIAgent


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1779
retrieving revision 1.1780
diff -u -r1.1779 -r1.1780
--- owners.list	5 Oct 2006 17:18:29 -0000	1.1779
+++ owners.list	5 Oct 2006 20:47:08 -0000	1.1780
@@ -1550,6 +1550,7 @@
 Fedora Extras|perl-POE-Component-Client-HTTP|A non-blocking/parallel web requests engine for POE|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-Client-Keepalive|Manages and keeps alive client connections|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-Client-LDAP|Async LDAP access for POE|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-POE-Component-DBIAgent|POE Component for running asynchronous DBI calls|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-IRC|A POE component for building IRC clients|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-JobQueue|Process a large number of tasks with a finite number of workers|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-Logger|A POE logger|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -2112,8 +2113,8 @@
 Fedora Extras|tcpick|A tcp stream sniffer, tracker and capturer|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-butterfly|MSN connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-filesystem|Telepathy filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tellico|A collection manager|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|terminus-font|Clean fixed width font|rhbugs at n-dimensional.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct  5 20:47:39 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:47:39 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel
	perl-POE-Component-DBIAgent.spec, 1.1, 1.2
Message-ID: <200610052047.k95Klf4w029254@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29237

Modified Files:
	perl-POE-Component-DBIAgent.spec 
Log Message:
release bump


Index: perl-POE-Component-DBIAgent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel/perl-POE-Component-DBIAgent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-POE-Component-DBIAgent.spec	5 Oct 2006 20:46:50 -0000	1.1
+++ perl-POE-Component-DBIAgent.spec	5 Oct 2006 20:47:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-DBIAgent
 Version:        0.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        POE Component for running asynchronous DBI calls
 # see tail of DBIAgent.pm
 License:        GPL or Artistic
@@ -47,5 +47,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.26-2
+- bump
+
 * Thu Oct 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.26-1
 - Specfile autogenerated by cpanspec 1.69.



From fedora-extras-commits at redhat.com  Thu Oct  5 20:50:49 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:50:49 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel
	perl-POE-Component-DBIAgent.spec, 1.2, 1.3
Message-ID: <200610052050.k95KopBv029322@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29305

Modified Files:
	perl-POE-Component-DBIAgent.spec 
Log Message:
additional verbage in %descriptionwq


Index: perl-POE-Component-DBIAgent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel/perl-POE-Component-DBIAgent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-DBIAgent.spec	5 Oct 2006 20:47:39 -0000	1.2
+++ perl-POE-Component-DBIAgent.spec	5 Oct 2006 20:50:49 -0000	1.3
@@ -17,6 +17,15 @@
 %description
 DBIAgent is your answer to non-blocking DBI in POE.
 
+DBIAgent forks off a configurable number of helper processes for
+running DBI queries.  The states that depend on the output of the
+queries only get called when there is data for them to process.  No
+more agonizing about query optimization in terms of milliseconds
+because the rest of your program will suffer.  Leave that to the
+operating system!  POE is designed for doing a lot of things
+concurrently.  Waiting isn't doing, it's waiting... :-)
+
+
 %prep
 %setup -q -n POE-Component-DBIAgent-%{version}
 



From fedora-extras-commits at redhat.com  Thu Oct  5 20:55:06 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu,  5 Oct 2006 13:55:06 -0700
Subject: fedora-security/audit fc5,1.346,1.347 fc6,1.101,1.102
Message-ID: <200610052055.k95Kt6vs029383@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29363/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-5174



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- fc5	5 Oct 2006 14:36:11 -0000	1.346
+++ fc5	5 Oct 2006 20:55:04 -0000	1.347
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fc6	5 Oct 2006 14:36:11 -0000	1.101
+++ fc6	5 Oct 2006 20:55:04 -0000	1.102
@@ -4,6 +4,7 @@
 
 ** are items that need attention
 
+CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified



From fedora-extras-commits at redhat.com  Thu Oct  5 21:08:47 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu,  5 Oct 2006 14:08:47 -0700
Subject: rpms/octave-forge/FC-5 octave-forge.spec,1.29,1.30
Message-ID: <200610052108.k95L8n8h032392@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32375

Modified Files:
	octave-forge.spec 
Log Message:
Rebuild for octave 2.9.9.


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- octave-forge.spec	28 Aug 2006 19:03:52 -0000	1.29
+++ octave-forge.spec	5 Oct 2006 21:08:47 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.07.09
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -20,7 +20,7 @@
 Patch2:         octave-forge-2006.07.09-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave >= 2.9.8 ImageMagick
+Requires:	octave >= 2.9.9 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-6
+- Rebuild for octave 2.9.9. 
+
 * Mon Aug 28 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-5
 - Rebuild. Previous build was inadvertently done against octave 2.9.7.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 23:30:43 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 16:30:43 -0700
Subject: rpms/ghdl/devel ghdl-svn73.patch, NONE, 1.1 ghdl.spec, 1.25,
	1.26 ghdl-svn61.patch, 1.1, NONE ghdl-svn71.patch, 1.2, NONE
Message-ID: <200610052330.k95NUkLN006714@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6690

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn73.patch 
Removed Files:
	ghdl-svn61.patch ghdl-svn71.patch 
Log Message:
update to svn73


ghdl-svn73.patch:

--- NEW FILE ghdl-svn73.patch ---
diff -urN ghdl-0.25/vhdl/back_end.ads ghdl-0.26dev/vhdl/back_end.ads
--- ghdl-0.25/vhdl/back_end.ads	2005-09-22 23:07:25.000000000 +0200
+++ ghdl-0.26dev/vhdl/back_end.ads	2006-10-05 11:35:25.000000000 +0200
@@ -29,6 +29,14 @@
    Library_To_File_Name : Library_To_File_Name_Acc :=
      Default_Library_To_File_Name'Access;
 
+   --  Back-end options.
+   type Parse_Option_Acc is access function (Opt : String) return Boolean;
+   Parse_Option : Parse_Option_Acc := null;
+
+   --  Disp back-end option help.
+   type Disp_Option_Acc is access procedure;
+   Disp_Option : Disp_Option_Acc := null;
+
    --  UNIT is a design unit from parse.
    --  According to the current back-end, do what is necessary.
    --
@@ -46,8 +54,5 @@
    --  May be NULL for no additionnal checks.
    type Sem_Foreign_Acc is access procedure (Decl : Iir);
    Sem_Foreign : Sem_Foreign_Acc := null;
-
-   --procedure Finish_Compilation
-   --  (Unit : Iir_Design_Unit; Main : Boolean := False);
 end Back_End;
 
diff -urN ghdl-0.25/vhdl/bug.adb ghdl-0.26dev/vhdl/bug.adb
--- ghdl-0.25/vhdl/bug.adb	2005-11-18 02:34:12.000000000 +0100
+++ ghdl-0.26dev/vhdl/bug.adb	2006-10-05 11:35:25.000000000 +0200
@@ -70,7 +70,7 @@
       Put_Line
         (Standard_Error,
          "Please report this bug on http://gna.org/projects/ghdl");
-      Put_Line (Standard_Error, "GHDL version: " & Ghdl_Version);
+      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "In directory: " &
                 GNAT.Directory_Operations.Get_Current_Dir);
diff -urN ghdl-0.25/vhdl/canon.adb ghdl-0.26dev/vhdl/canon.adb
--- ghdl-0.25/vhdl/canon.adb	2006-07-29 06:42:30.000000000 +0200
+++ ghdl-0.26dev/vhdl/canon.adb	2006-10-05 11:35:25.000000000 +0200
@@ -847,22 +847,6 @@
       end loop;
    end Canon_Sequential_Stmts;
 
-   procedure Add_Driver_For_Signal (Driver_List : Iir_List;
-                                    Signal : Iir)
-   is
-      Choice : Iir;
-   begin
-      if Get_Kind (Signal) = Iir_Kind_Aggregate then
-         Choice := Get_Association_Choices_Chain (Signal);
-         while Choice /= Null_Iir loop
-            Add_Driver_For_Signal (Driver_List, Get_Associated (Choice));
-            Choice := Get_Chain (Choice);
-         end loop;
-      else
-         Add_Element (Driver_List, Get_Longuest_Static_Prefix (Signal));
-      end if;
-   end Add_Driver_For_Signal;
-
    -- Create a statement transform from concurrent_signal_assignment
    -- statement STMT (either selected or conditional).
    -- waveform transformation is not done.
@@ -895,9 +879,6 @@
       --      reserved word POSTPONED.
       Set_Postponed_Flag (Proc, Get_Postponed_Flag (Proc));
 
-      Set_Driver_List (Proc, Create_Iir_List);
-      Add_Driver_For_Signal (Get_Driver_List (Proc), Get_Target (Stmt));
-
       Canon_Extract_Sensitivity (Get_Target (Stmt), Sensitivity_List, True);
 
       if Canon_Flag_Expressions then
@@ -966,7 +947,6 @@
       Assoc_Chain : Iir;
       Assoc : Iir;
       Imp : Iir;
-      Driver_List : Iir_Driver_List;
       Inter : Iir;
       Sensitivity_List : Iir_List;
       Is_Sensitized : Boolean;
@@ -1014,7 +994,6 @@
          Get_Parameter_Association_Chain (Call),
          Call);
       Set_Parameter_Association_Chain (Call, Assoc_Chain);
-      Driver_List := Null_Iir_List;
       Assoc := Assoc_Chain;
 
       --  LRM93 9.3
@@ -1034,18 +1013,6 @@
                   Canon_Extract_Sensitivity
                     (Get_Actual (Assoc), Sensitivity_List, False);
                end if;
-               --  LRM 2.1.1.2 Signal Parameters
-               if Get_Kind (Inter) = Iir_Kind_Signal_Interface_Declaration
-                 and then Get_Mode (Inter) in Iir_Out_Modes
-               then
-                  if Driver_List = Null_Iir_List then
-                     Driver_List := Create_Iir_List;
-                     Set_Driver_List (Proc, Driver_List);
-                  end if;
-                  Add_Element
-                    (Driver_List,
-                     Get_Longuest_Static_Prefix (Get_Actual (Assoc)));
-               end if;
             when Iir_Kind_Association_Element_Open
               | Iir_Kind_Association_Element_By_Individual =>
                null;
diff -urN ghdl-0.25/vhdl/disp_tree.adb ghdl-0.26dev/vhdl/disp_tree.adb
--- ghdl-0.25/vhdl/disp_tree.adb	2005-10-26 14:31:21.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_tree.adb	2006-10-05 11:35:25.000000000 +0200
@@ -1023,8 +1023,6 @@
             Disp_Depth (Get_Subprogram_Depth (Tree));
             Header ("subprogram_body:");
             Disp_Tree_Flat (Get_Subprogram_Body (Tree), Ntab);
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("attribute_value_chain:");
             Disp_Tree_Flat_Chain (Get_Attribute_Value_Chain (Tree), Ntab);
          when Iir_Kind_Procedure_Body
@@ -1423,8 +1421,6 @@
                Header ("sensivity list:");
                Disp_Tree_List (Get_Sensitivity_List (Tree), Ntab, True);
             end if;
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("declaration_chain:");
             Disp_Tree_Chain (Get_Declaration_Chain (Tree), Ntab);
             Header ("process statements:");
diff -urN ghdl-0.25/vhdl/disp_vhdl.adb ghdl-0.26dev/vhdl/disp_vhdl.adb
--- ghdl-0.25/vhdl/disp_vhdl.adb	2006-07-09 03:55:28.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_vhdl.adb	2006-10-05 11:35:25.000000000 +0200
@@ -893,25 +893,6 @@
       Put_Line (";");
    end Disp_Object_Declaration;
 
-   procedure Disp_Driver_List (List: Iir_Driver_List; Indent : Count)
-   is
-      El: Iir;
-   begin
-      if List = Null_Iir_List or else Get_Nbr_Elements (List) = 0 then
-         return;
-      end if;
-      Set_Col (Indent);
-      Put_Line ("-- drivers needed for signals:");
-      for I in Natural loop
-         El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
-         Set_Col (Indent);
-         Put ("--   ");
-         Disp_Expression (El);
-         New_Line;
-      end loop;
-   end Disp_Driver_List;
-
    procedure Disp_Subprogram_Declaration (Subprg: Iir)
    is
       Indent: Count;
@@ -943,10 +924,6 @@
          when others =>
             raise Internal_Error;
       end case;
-
-      if Get_Kind (Subprg) = Iir_Kind_Procedure_Declaration then
-         Disp_Driver_List (Get_Driver_List (Subprg), Indent);
-      end if;
    end Disp_Subprogram_Declaration;
 
    procedure Disp_Subprogram_Body (Subprg : Iir)
@@ -1517,7 +1494,6 @@
       else
          New_Line;
       end if;
-      Disp_Driver_List (Get_Driver_List (Process), Start + Indentation);
       Disp_Declaration_Chain (Process, Start + Indentation);
       Set_Col (Start);
       Put_Line ("begin");
@@ -2312,10 +2288,10 @@
             Disp_Concurrent_Conditional_Signal_Assignment (An_Iir);
          when Iir_Kinds_Dyadic_Operator =>
             Disp_Dyadic_Operator (An_Iir);
-         when Iir_Kind_Signal_Interface_Declaration =>
+         when Iir_Kind_Signal_Interface_Declaration
+           | Iir_Kind_Signal_Declaration
+           | Iir_Kind_Object_Alias_Declaration =>
             Disp_Name_Of (An_Iir);
-         when Iir_Kind_Signal_Declaration =>
-            Disp_Identifier (An_Iir);
          when Iir_Kind_Enumeration_Literal =>
             Disp_Identifier (An_Iir);
          when Iir_Kind_Component_Instantiation_Statement =>
@@ -2330,8 +2306,11 @@
             Disp_Package_Declaration (An_Iir);
          when Iir_Kind_Wait_Statement =>
             Disp_Wait_Statement (An_Iir);
-         when Iir_Kind_Selected_Name =>
-            Disp_Name (An_Iir);
[...4286 lines suppressed...]
+         end if;
+         return Create_Var_Identifier_From_Buffer (L);
       end Create_Var_Identifier;
 
       function Create_Uniq_Identifier return Var_Ident_Type
@@ -22728,19 +23323,6 @@
          end case;
       end Translate_Succ_Pred_Attribute;
 
-      --  Read the boolean attribute (active or event) FIELD of simple signal
-      --  SIG.
-      function Read_Bool_Signal_Attribute (Sig : O_Enode; Field : O_Fnode)
-                                          return O_Enode
-      is
-         S : O_Enode;
-      begin
-         S := New_Convert_Ov (Sig, Ghdl_Signal_Ptr);
-         return New_Value
-           (New_Selected_Element (New_Access_Element (S), Field));
-         --Ghdl_Signal_Event_Node));
-      end Read_Bool_Signal_Attribute;
-
       type Bool_Sigattr_Data_Type is record
          Label : O_Snode;
          Field : O_Fnode;
@@ -22752,8 +23334,7 @@
          pragma Unreferenced (Targ_Type);
       begin
          Gen_Exit_When (Data.Label,
-                        Read_Bool_Signal_Attribute (New_Value (M2Lv (Targ)),
-                                                    Data.Field));
+                        New_Value (Get_Signal_Field (Targ, Data.Field)));
       end Bool_Sigattr_Non_Composite_Signal;
 
       function Bool_Sigattr_Prepare_Data_Composite
@@ -22819,7 +23400,7 @@
          if Get_Kind (Prefix_Type) in Iir_Kinds_Scalar_Type_Definition then
             --  Effecient handling for a scalar signal.
             Name := Chap6.Translate_Name (Prefix);
-            return Read_Bool_Signal_Attribute (New_Value (M2Lv (Name)), Field);
+            return New_Value (Get_Signal_Field (Name, Field));
          else
             --  Element per element handling for composite signals.
             Res := Create_Temp (Std_Boolean_Type_Node);
@@ -22839,13 +23420,14 @@
 
       function Translate_Event_Attribute (Attr : Iir) return O_Enode is
       begin
-         return Translate_Bool_Signal_Attribute (Attr, Ghdl_Signal_Event_Node);
+         return Translate_Bool_Signal_Attribute
+           (Attr, Ghdl_Signal_Event_Field);
       end Translate_Event_Attribute;
 
       function Translate_Active_Attribute (Attr : Iir) return O_Enode is
       begin
          return Translate_Bool_Signal_Attribute
-           (Attr, Ghdl_Signal_Active_Node);
+           (Attr, Ghdl_Signal_Active_Field);
       end Translate_Active_Attribute;
 
       --  Read signal value FIELD of signal SIG.
@@ -22862,11 +23444,20 @@
            (New_Unchecked_Address (New_Selected_Element (T, Field), S_Type));
       end Get_Signal_Value_Field;
 
+      function Get_Signal_Field (Sig : Mnode; Field : O_Fnode)
+                                return O_Lnode
+      is
+         S : O_Enode;
+      begin
+         S := New_Convert_Ov (New_Value (M2Lv (Sig)), Ghdl_Signal_Ptr);
+         return New_Selected_Element (New_Access_Element (S), Field);
+      end Get_Signal_Field;
+
       function Read_Last_Value (Sig : O_Enode; Sig_Type : Iir) return O_Enode
       is
       begin
          return New_Value (Get_Signal_Value_Field
-                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Node));
+                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Field));
       end Read_Last_Value;
 
       function Translate_Last_Value is new Chap7.Translate_Signal_Value
@@ -27031,39 +27622,53 @@
         (Chararray_Type, New_Unsigned_Literal (Ghdl_Index_Type, 8));
       New_Type_Decl (Get_Identifier ("__ghdl_scalar_bytes"),
                      Ghdl_Scalar_Bytes);
+
+      Ghdl_Signal_Ptr := New_Access_Type (O_Tnode_Null);
+      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+
       --  Type __signal_signal is record
       Start_Record_Type (Rec);
-      New_Record_Field (Rec, Ghdl_Signal_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Value_Field,
                         Get_Identifier ("value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Field,
                         Get_Identifier ("driving_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Field,
                         Get_Identifier ("last_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Field,
                         Get_Identifier ("last_event"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Field,
                         Get_Identifier ("last_active"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Chain_Field,
+                        Get_Identifier ("active_chain"),
+                        Ghdl_Signal_Ptr);
+      New_Record_Field (Rec, Ghdl_Signal_Event_Field,
                         Get_Identifier ("event"),
                         Std_Boolean_Type_Node);
-      New_Record_Field (Rec, Ghdl_Signal_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Field,
                         Get_Identifier ("active"),
                         Std_Boolean_Type_Node);
+      New_Record_Field (Rec, Ghdl_Signal_Has_Active_Field,
+                        Get_Identifier ("has_active"),
+                        Ghdl_Bool_Type);
       Finish_Record_Type (Rec, Ghdl_Signal_Type);
       New_Type_Decl (Get_Identifier ("__ghdl_signal"), Ghdl_Signal_Type);
 
-      Ghdl_Signal_Ptr := New_Access_Type (Ghdl_Signal_Type);
-      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+      Finish_Access_Type (Ghdl_Signal_Ptr, Ghdl_Signal_Type);
 
       Ghdl_Signal_Ptr_Ptr := New_Access_Type (Ghdl_Signal_Ptr);
       New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr_ptr"),
                      Ghdl_Signal_Ptr_Ptr);
 
+      New_Var_Decl (Ghdl_Signal_Active_Chain,
+                    Get_Identifier ("__ghdl_signal_active_chain"),
+                    O_Storage_External,
+                    Ghdl_Signal_Ptr);
+
       --  procedure __ghdl_signal_merge_rti
       --       (sig : ghdl_signal_ptr; rti : ghdl_rti_access)
       Start_Procedure_Decl
@@ -27305,6 +27910,17 @@
       New_Interface_Decl (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
       Finish_Subprogram_Decl (Interfaces, Ghdl_Process_Add_Driver);
 
+      --  procedure __ghdl_signal_direct_driver (sig : __ghdl_signal_ptr;
+      --                                         Drv : Ghdl_Ptr_type);
+      Start_Procedure_Decl
+        (Interfaces, Get_Identifier ("__ghdl_signal_direct_driver"),
+         O_Storage_External);
+      New_Interface_Decl
+        (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
+      New_Interface_Decl
+        (Interfaces, Param, Get_Identifier ("drv"), Ghdl_Ptr_Type);
+      Finish_Subprogram_Decl (Interfaces, Ghdl_Signal_Direct_Driver);
+
       declare
          procedure Create_Signal_Conversion (Name : String; Res : out O_Dnode)
          is
diff -urN ghdl-0.25/vhdl/translation.ads ghdl-0.26dev/vhdl/translation.ads
--- ghdl-0.25/vhdl/translation.ads	2006-08-02 06:13:50.000000000 +0200
+++ ghdl-0.26dev/vhdl/translation.ads	2006-10-05 11:35:23.000000000 +0200
@@ -61,6 +61,21 @@
    --  If set, do not generate code for unused implicit subprograms.
    Flag_Discard_Unused_Implicit : Boolean := False;
 
+   --  If set, dump drivers per process during compilation.
+   Flag_Dump_Drivers : Boolean := False;
+
+   --  If set, try to create direct drivers.
+   Flag_Direct_Drivers : Boolean := True;
+
+   --  If set, checks ranges (subtype ranges).
+   Flag_Range_Checks : Boolean := True;
+
+   --  If set, checks indexes (arrays index and slice).
+   Flag_Index_Checks : Boolean := True;
+
+   --  If set, do not create identifiers (for in memory compilation).
+   Flag_Discard_Identifiers : Boolean := False;
+
    type Foreign_Kind_Type is (Foreign_Unknown,
                               Foreign_Vhpidirect,
                               Foreign_Intrinsic);
diff -urN ghdl-0.25/vhdl/version.ads ghdl-0.26dev/vhdl/version.ads
--- ghdl-0.25/vhdl/version.ads	2006-08-11 05:15:55.000000000 +0200
+++ ghdl-0.26dev/vhdl/version.ads	2006-10-05 11:35:25.000000000 +0200
@@ -1,4 +1,5 @@
 package Version is
-   Ghdl_Version : constant String :=
-      "GHDL 0.25 (20060811) [Sokcho edition]";
+   Ghdl_Release : constant String :=
+      "GHDL 0.26dev (20060819) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.26dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ghdl.spec	5 Oct 2006 11:14:13 -0000	1.25
+++ ghdl.spec	5 Oct 2006 23:30:43 -0000	1.26
@@ -1,11 +1,11 @@
 %define gccver 4.1.1
 %define ghdlver 0.25
-%define ghdlsvnver 71
+%define ghdlsvnver 73
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.25
-Release: 0.%{ghdlsvnver}svn.1%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Fri Oct  6 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.73svn.0
+- update to svn73
+
 * Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.1
 - bump release
 


--- ghdl-svn61.patch DELETED ---


--- ghdl-svn71.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 01:01:31 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:01:31 -0700
Subject: rpms/dirvish - New directory
Message-ID: <200610060101.k9611XMA012793@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12767/dirvish

Log Message:
Directory /cvs/extras/rpms/dirvish added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 01:01:32 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:01:32 -0700
Subject: rpms/dirvish/devel - New directory
Message-ID: <200610060101.k9611YGQ012796@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12767/dirvish/devel

Log Message:
Directory /cvs/extras/rpms/dirvish/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 01:02:12 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:02:12 -0700
Subject: rpms/dirvish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610060102.k9612EYj012848@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12814/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dirvish


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 01:02:11 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:02:11 -0700
Subject: rpms/dirvish Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610060102.k9612D2Y012842@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12814

Added Files:
	Makefile import.log 
Log Message:
Setup of module dirvish


--- NEW FILE Makefile ---
# Top level Makefile for module dirvish
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 01:03:39 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:03:39 -0700
Subject: rpms/dirvish/devel dirvish-1.2.1-install.patch, NONE,
	1.1 dirvish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610060103.k9613fqg012925@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12887/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dirvish-1.2.1-install.patch dirvish.spec 
Log Message:
auto-import dirvish-1.2.1-2 on branch devel from dirvish-1.2.1-2.src.rpm

dirvish-1.2.1-install.patch:

--- NEW FILE dirvish-1.2.1-install.patch ---
diff -Naur dirvish-1.2.1.original/install.sh dirvish-1.2.1/install.sh
--- dirvish-1.2.1.original/install.sh	2005-02-18 20:56:13.000000000 -0400
+++ dirvish-1.2.1/install.sh	2006-09-22 22:56:04.000000000 -0400
@@ -20,12 +20,12 @@
 	then
 		PERL=/usr/bin/perl
 	fi
-	echo $ECHO_N "perl to use ($PERL) $ECHO_C"
-	read ans
-	if [ -n "$ans" ] 
-	then
-		PERL="$ans"
-	fi
+#	echo $ECHO_N "perl to use ($PERL) $ECHO_C"
+#	read ans
+#	if [ -n "$ans" ] 
+#	then
+#		PERL="$ans"
+#	fi
 
 	until [ -n "$PREFIX_OK" ]
 	do
@@ -33,101 +33,101 @@
 		CONFDIR="/etc/dirvish"
 		MANDIR="/usr/share/man"
 
-		echo $ECHO_N "What installation prefix should be used? ($PREFIX) $ECHO_C"
-		read ans
-		if [ -n "$ans" ] 
-		then
-			PREFIX="$ans"
-                        # KHL 2005-02-18  == changed to = in "if" below
-			if [ "$PREFIX" = "/" ]
-			then
-				PREFIX=""
-			fi
-		fi
-		if [ -n "$PREFIX" -a  ! -d "$PREFIX" ]
-		then
-			echo $ECHO_N "$PREFIX doesn't exist, create it? (n) $ECHO_C"
-			read ans
-			if [ `expr "$ans" : '[yY]'` -ne 0 ]
-			then
+#		echo $ECHO_N "What installation prefix should be used? ($PREFIX) $ECHO_C"
+#		read ans
+#		if [ -n "$ans" ] 
+#		then
+#			PREFIX="$ans"
+#                        # KHL 2005-02-18  == changed to = in "if" below
+#			if [ "$PREFIX" = "/" ]
+#			then
+#				PREFIX=""
+#			fi
+#		fi
+#		if [ -n "$PREFIX" -a  ! -d "$PREFIX" ]
+#		then
+#			echo $ECHO_N "$PREFIX doesn't exist, create it? (n) $ECHO_C"
+#			read ans
+#			if [ `expr "$ans" : '[yY]'` -ne 0 ]
+#			then
 				CREATE_PREFIX="$PREFIX directory will be created"
 				PREFIX_OK="yes"
-			else
-				continue
-			fi
-		else
-			PREFIX_OK="yes"
-		fi
-
-		if [ -d "$PREFIX/sbin" ]
-		then
-			BINDIR=$PREFIX/sbin
-		else
+#			else
+#				continue
+#			fi
+#		else
+#			PREFIX_OK="yes"
+#		fi
+
+#		if [ -d "$PREFIX/sbin" ]
+#		then
+#			BINDIR=$PREFIX/sbin
+#		else
 			BINDIR=$PREFIX/bin
-		fi
+#		fi
 
-		if [ -d "$PREFIX/share/man" ]
-		then
+#		if [ -d "$PREFIX/share/man" ]
+#		then
 			MANDIR=$PREFIX/share/man
-		elif [ -d "$PREFIX/usr/share/man" ]
-		then
-			MANDIR=$PREFIX/usr/share/man
-		elif [ -d "$PREFIX/usr/man" ]
-		then
-			MANDIR="$PREFIX/usr/man" ]
-		else
-			MANDIR=$PREFIX/man
-		fi
-		if [ `expr "$PREFIX" : '.*dirvish.*'` -gt 0 ]
-		then
-			CONFDIR="$PREFIX/etc"
-		else
+#		elif [ -d "$PREFIX/usr/share/man" ]
+#		then
+#			MANDIR=$PREFIX/usr/share/man
+#		elif [ -d "$PREFIX/usr/man" ]
+#		then
+#			MANDIR="$PREFIX/usr/man" ]
+#		else
+#			MANDIR=$PREFIX/man
+#		fi
+#		if [ `expr "$PREFIX" : '.*dirvish.*'` -gt 0 ]
+#		then
+#			CONFDIR="$PREFIX/etc"
+#		else
 			CONFDIR="/etc/dirvish"
-		fi
+#		fi
 	done
 
 
-	echo $ECHO_N "Directory to install executables? ($BINDIR) $ECHO_C"
-	read ans
-	if [ -n "$ans" ] 
-	then
-		BINDIR="$ans"
-	fi
-
-	echo $ECHO_N "Directory to install MANPAGES? ($MANDIR) $ECHO_C"
-	read ans
-	if [ -n "$ans" ] 
-	then
-		MANDIR="$ans"
-	fi
-
-	echo $ECHO_N "Configuration directory ($CONFDIR) $ECHO_C"
-	read ans
-	if [ -n "$ans" ] 
-	then
-		CONFDIR="$ans"
-	fi
-
-	cat <<EOSTAT
-
-Perl executable to use is $PERL
-Dirvish executables to be installed in $BINDIR
-Dirvish manpages to be installed in $MANDIR
-Dirvish will expect its configuration files in $CONFDIR
-
-$CREATE_PREFIX
-
-EOSTAT
-
-	echo $ECHO_N "Is this correct? (no/yes/quit) $ECHO_C"
-	read ans
-	if [ `expr "$ans" : '[qQ]'` -ne 0 ]
-	then
-		exit
-	elif [ `expr "$ans" : '[yY]'` -ne 0 ]
-	then
+#	echo $ECHO_N "Directory to install executables? ($BINDIR) $ECHO_C"
+#	read ans
+#	if [ -n "$ans" ] 
+#	then
+#		BINDIR="$ans"
+#	fi
+#
+#	echo $ECHO_N "Directory to install MANPAGES? ($MANDIR) $ECHO_C"
+#	read ans
+#	if [ -n "$ans" ] 
+#	then
+#		MANDIR="$ans"
+#	fi
+#
+#	echo $ECHO_N "Configuration directory ($CONFDIR) $ECHO_C"
+#	read ans
+#	if [ -n "$ans" ] 
+#	then
+#		CONFDIR="$ans"
+#	fi
+#
+#	cat <<EOSTAT
+#
+#Perl executable to use is $PERL
+#Dirvish executables to be installed in $BINDIR
+#Dirvish manpages to be installed in $MANDIR
+#Dirvish will expect its configuration files in $CONFDIR
+#
+#$CREATE_PREFIX
+#
+#EOSTAT
+#
+#	echo $ECHO_N "Is this correct? (no/yes/quit) $ECHO_C"
+#	read ans
+#	if [ `expr "$ans" : '[qQ]'` -ne 0 ]
+#	then
+#		exit
+#	elif [ `expr "$ans" : '[yY]'` -ne 0 ]
+#	then
 		break
-	fi
+#	fi
 done
 
 HEADER="#!$PERL
@@ -148,10 +148,10 @@
 echo "Executables created."
 echo
 
-echo $ECHO_N "Install executables and manpages? (no/yes) $ECHO_C"
-read ans
-if [ `expr "$ans" : '[yY]'` -ne 0 ]
-then
+#echo $ECHO_N "Install executables and manpages? (no/yes) $ECHO_C"
+#read ans
+#if [ `expr "$ans" : '[yY]'` -ne 0 ]
+#then
 	echo
 	if [ -n "$CREATE_PREFIX" ]
 	then
@@ -174,10 +174,10 @@
 		mkdir -p "$MANDIR"
 	fi
 
-	if [ ! -d "$CONFDIR" ]
-	then
-		mkdir -p "$CONFDIR"
-	fi
+#	if [ ! -d "$CONFDIR" ]
+#	then
+#		mkdir -p "$CONFDIR"
+#	fi
 
 	for f in $EXECUTABLES
 	do
@@ -198,15 +198,15 @@
 	done
 	echo
 	echo "Installation complete"
-fi
+#fi
 
-echo $ECHO_N "Clean installation directory? (no/yes) $ECHO_C"
-read ans
-if [ `expr "$ans" : '[yY]'` -ne 0 ]
-then
+#echo $ECHO_N "Clean installation directory? (no/yes) $ECHO_C"
+#read ans
+#if [ `expr "$ans" : '[yY]'` -ne 0 ]
+#then
 	for f in $EXECUTABLES
 	do
 		rm $f
 	done
 	echo "Install directory cleaned."
-fi
+#fi


--- NEW FILE dirvish.spec ---
Name:           dirvish
Version:        1.2.1
Release:        2%{?dist}
Summary:        Fast, disk based, rotating network backup system

Group:          Applications/Archiving
License:        OSL
URL:            http://www.dirvish.org/
Source0:        http://www.dirvish.org/dirvish-%{version}.tgz
# converts the installer to work in unattended mode
Patch0:         dirvish-1.2.1-install.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       rsync

%description
Dirvish is a fast, disk based, rotating network backup system. With dirvish you
can maintain a set of complete images of your filesystems with unattended
creation and expiration. A dirvish backup vault is like a time machine for your
data. 


%prep
%setup -q
%patch0 -p1


%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/dirvish
PREFIX=$RPM_BUILD_ROOT%{_prefix} ./install.sh


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/dirvish
%{_bindir}/*
%{_mandir}/man5/*
%{_mandir}/man8/*
%doc CHANGELOG FAQ.html RELEASE.html TODO.html COPYING


%changelog
* Thu Oct 05 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-2
- Fix License field
- Add licence text
- Removed perl from BuildRequires

* Sat Sep 25 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-1
- Initial package release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dirvish/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 01:02:12 -0000	1.1
+++ .cvsignore	6 Oct 2006 01:03:38 -0000	1.2
@@ -0,0 +1 @@
+dirvish-1.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dirvish/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 01:02:12 -0000	1.1
+++ sources	6 Oct 2006 01:03:38 -0000	1.2
@@ -0,0 +1 @@
+892ec9333b19e623880cdb499443c11b  dirvish-1.2.1.tgz



From fedora-extras-commits at redhat.com  Fri Oct  6 01:03:37 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:03:37 -0700
Subject: rpms/dirvish import.log,1.1,1.2
Message-ID: <200610060104.k96149IJ012930@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12887

Modified Files:
	import.log 
Log Message:
auto-import dirvish-1.2.1-2 on branch devel from dirvish-1.2.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dirvish/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 01:02:11 -0000	1.1
+++ import.log	6 Oct 2006 01:03:37 -0000	1.2
@@ -0,0 +1 @@
+dirvish-1_2_1-2:HEAD:dirvish-1.2.1-2.src.rpm:1160096784



From fedora-extras-commits at redhat.com  Fri Oct  6 01:13:05 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:13:05 -0700
Subject: owners owners.list,1.1780,1.1781
Message-ID: <200610060113.k961D7RB013097@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13080

Modified Files:
	owners.list 
Log Message:
dirvish imported



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1780
retrieving revision 1.1781
diff -u -r1.1780 -r1.1781
--- owners.list	5 Oct 2006 20:47:08 -0000	1.1780
+++ owners.list	6 Oct 2006 01:13:05 -0000	1.1781
@@ -292,6 +292,7 @@
 Fedora Extras|dircproxy|Detatchable IRC proxy server|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dirmngr|Client for Managing/Downloading CRLs|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|dirvish|Fast, disk based, rotating network backup system|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com
 Fedora Extras|dnsmasq|A lightweight DHCP/caching DNS server|jima at beer.tclug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 01:26:13 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:26:13 -0700
Subject: rpms/dirvish/devel dirvish.spec,1.1,1.2
Message-ID: <200610060126.k961QFJv013207@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13141

Modified Files:
	dirvish.spec 
Log Message:
Fix typo



Index: dirvish.spec
===================================================================
RCS file: /cvs/extras/rpms/dirvish/devel/dirvish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dirvish.spec	6 Oct 2006 01:03:38 -0000	1.1
+++ dirvish.spec	6 Oct 2006 01:26:13 -0000	1.2
@@ -48,7 +48,7 @@
 %changelog
 * Thu Oct 05 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-2
 - Fix License field
-- Add licence text
+- Add license text
 - Removed perl from BuildRequires
 
 * Sat Sep 25 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-1



From fedora-extras-commits at redhat.com  Fri Oct  6 01:37:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 18:37:15 -0700
Subject: rpms/libxfce4util/devel libxfce4util.spec,1.12,1.13
Message-ID: <200610060137.k961bH0p013331@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314

Modified Files:
	libxfce4util.spec 
Log Message:
Fix defattr



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libxfce4util.spec	5 Oct 2006 01:39:07 -0000	1.12
+++ libxfce4util.spec	6 Oct 2006 01:37:15 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD and LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4util-4.3.99.1.tar.bz2
@@ -45,18 +45,21 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog ChangeLog.pre-4.2.0 COPYING NEWS
 %{_libdir}/lib*.so.*
 %{_sbindir}/xfce4-kiosk-query
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 01:38:33 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 18:38:33 -0700
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.15,1.16
Message-ID: <200610060138.k961cZOH013401@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13384

Modified Files:
	libxfcegui4.spec 
Log Message:
Fix defattr



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libxfcegui4.spec	5 Oct 2006 01:43:59 -0000	1.15
+++ libxfcegui4.spec	6 Oct 2006 01:38:33 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
@@ -55,18 +55,21 @@
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING 
 %{_libdir}/lib*.so.*
 %{_datadir}/xfce4/xfce-svg-test.svg
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel build
 



From fedora-extras-commits at redhat.com  Fri Oct  6 01:55:58 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 18:55:58 -0700
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec,1.11,1.12
Message-ID: <200610060156.k961u0oL013538@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13521

Modified Files:
	libxfce4mcs.spec 
Log Message:
Fix defattr
remove unneeded prereq



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxfce4mcs.spec	5 Oct 2006 01:48:05 -0000	1.11
+++ libxfce4mcs.spec	6 Oct 2006 01:55:58 -0000	1.12
@@ -7,7 +7,6 @@
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4mcs-4.3.99.1.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Prereq: /sbin/ldconfig
 
 Requires: libxfce4util >= %{version}
 Requires: libxfcegui4 >= %{version}
@@ -52,17 +51,21 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/libxfce4mcs
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+- remove unneeded prereq
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 02:06:08 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:06:08 -0700
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec,1.8,1.9
Message-ID: <200610060206.k9626AwN016532@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16515

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
Add period to description
Fix defattr



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce-mcs-manager.spec	5 Oct 2006 02:01:44 -0000	1.8
+++ xfce-mcs-manager.spec	6 Oct 2006 02:06:08 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-manager-4.3.99.1.tar.bz2
@@ -15,7 +15,7 @@
 BuildRequires: libxfcegui4-devel >= %{version}
 
 %description
-This package includes a multi channel settings manager for Xfce4
+This package includes a multi channel settings manager for Xfce4.
 
 %package devel
 Summary: Header file to build xfce-mcs-manager plugins
@@ -45,7 +45,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc ChangeLog COPYING AUTHORS
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
@@ -56,11 +56,15 @@
 %{_datadir}/applications/*
 
 %files devel
-%defattr(-, root, root,0755)
+%defattr(-, root, root,-)
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add period to description
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 02:15:59 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:15:59 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.13,1.14
Message-ID: <200610060216.k962G17r016793@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16776

Modified Files:
	xfce4-panel.spec 
Log Message:
Add period to description
Fix defattr
Add gtk-update-icon-cache in post/postun



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-panel.spec	5 Oct 2006 02:10:26 -0000	1.13
+++ xfce4-panel.spec	6 Oct 2006 02:15:59 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.3.99.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
@@ -47,7 +47,7 @@
 Obsoletes: xfce4-windowlist-plugin <= 4.2.3-3
 
 %description
-This package includes the panel for the Xfce desktop environment
+This package includes the panel for the Xfce desktop environment.
 
 %package devel
 Summary: Development headers for xfce4-panel
@@ -79,12 +79,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
                                                                                           
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-10.rc
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
@@ -105,13 +111,18 @@
 %{_datadir}/applications/xfce4-panel-manager.desktop
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root,root,-)
 %{_libdir}/pkgconfig/*
 %{_libdir}/libxfce4panel.so
 %{_datadir}/gtk-doc/html/libxfce4panel
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Add period to description
+- Fix defattr
+- Add gtk-update-icon-cache in post/postun
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
 - Add Requires for mousepad and Terminal
 - Bump for devel checkin



From fedora-extras-commits at redhat.com  Fri Oct  6 02:27:27 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:27:27 -0700
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.12,1.13
Message-ID: <200610060227.k962RTuJ016967@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16943

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
Fix defattr



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gtk-xfce-engine.spec	5 Oct 2006 02:13:53 -0000	1.12
+++ gtk-xfce-engine.spec	6 Oct 2006 02:27:27 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/gtk-xfce-engine-2.3.99.1.tar.bz2
@@ -29,12 +29,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README COPYING AUTHORS
 %{_libdir}/gtk-2.0/2.10.0/engines
 %{_datadir}/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 02:27:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:27:51 -0700
Subject: rpms/libsmi - New directory
Message-ID: <200610060227.k962RrgF017061@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17035/libsmi

Log Message:
Directory /cvs/extras/rpms/libsmi added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 02:27:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:27:51 -0700
Subject: rpms/libsmi/devel - New directory
Message-ID: <200610060227.k962Rrcw017064@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17035/libsmi/devel

Log Message:
Directory /cvs/extras/rpms/libsmi/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 02:28:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:28:06 -0700
Subject: rpms/libsmi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610060228.k962S88g017113@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17080

Added Files:
	Makefile import.log 
Log Message:
Setup of module libsmi


--- NEW FILE Makefile ---
# Top level Makefile for module libsmi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 02:28:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:28:07 -0700
Subject: rpms/libsmi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610060228.k962S9WM017116@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17080/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libsmi


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 02:28:55 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:28:55 -0700
Subject: rpms/libsmi import.log,1.1,1.2
Message-ID: <200610060228.k962Sv6f017184@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17150

Modified Files:
	import.log 
Log Message:
auto-import libsmi-0.4.5-2 on branch devel from libsmi-0.4.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsmi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 02:28:06 -0000	1.1
+++ import.log	6 Oct 2006 02:28:55 -0000	1.2
@@ -0,0 +1 @@
+libsmi-0_4_5-2:HEAD:libsmi-0.4.5-2.src.rpm:1160101728



From fedora-extras-commits at redhat.com  Fri Oct  6 02:28:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:28:56 -0700
Subject: rpms/libsmi/devel libsmi.spec, NONE, 1.1 smi.conf, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610060228.k962SwOc017189@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17150/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libsmi.spec smi.conf 
Log Message:
auto-import libsmi-0.4.5-2 on branch devel from libsmi-0.4.5-2.src.rpm


--- NEW FILE libsmi.spec ---
Name:           libsmi
Version:        0.4.5
Release:        2%{?dist}
Summary:        A library to access SMI MIB information

Group:          System Environment/Libraries
License:        BSD
URL:            http://www.ibr.cs.tu-bs.de/projects/libsmi/index.html
Source0:        ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/%{name}-%{version}.tar.gz
Source1:        smi.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtool
BuildRequires:  flex, bison
Requires:       gawk, wget

%description
Libsmi is a C library to access MIB module information through
a well defined API that hides the nasty details of locating
and parsing SMIv1/v2 MIB modules.

This package contains tools to check, dump, and convert MIB
definitions and a steadily maintained and revised archive
of all IETF and IANA maintained standard MIB modules.


%package devel
Summary:        Development environment for libsmi library
Group:          Development/Libraries
Requires:       %name = %version-%release
Requires:       automake
Requires:       pkgconfig

%description devel
Libsmi is a C library to access MIB module information through
a well defined API that hides the nasty details of locating
and parsing SMIv1/v2 MIB modules.

This package contains development files needed to develop
libsmi-based applications.


%prep
%setup -q


%build
%configure \
    --enable-smi \
    --enable-sming \
    --enable-shared \
    --disable-static
LIBTOOL=/usr/bin/libtool make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/smi.conf

rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la


%check
# fails a couple of tests (2 in {0.4.4, 0.4.5})
make check ||:


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%doc ANNOUNCE ChangeLog COPYING README THANKS TODO
%doc doc/draft-irtf-nmrg-sming-02.txt smi.conf-example
%config(noreplace) %{_sysconfdir}/smi.conf
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/mibs/
%{_datadir}/pibs/
%{_mandir}/man1/*.1*

%files devel
%{_datadir}/aclocal/libsmi.m4
%{_libdir}/pkgconfig/libsmi.pc
%{_libdir}/*.so
%{_includedir}/*
%{_mandir}/man3/*.3*


%changelog
* Fri Oct  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.4.5-2
- Handle rpath problems in 64-bit systems (#209522).

* Mon May 29 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.4.5-1
- Update to 0.4.5.

* Wed May 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.4.4-1
- Update to 0.4.4.

* Fri Apr  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.4.3-1
- First build.

# vim:set ai ts=4 sw=4 sts=4 et:


--- NEW FILE smi.conf ---
#
# smi.conf - Global/User SMI configuration file.
#
# See smi_config(3) for detailed information on configuration files.
#

# Extend (note the semicolon) the libsmi default module search path.
#path :/usr/local/share/mibs/sun
#path :/usr/local/share/mibs/cisco

# Add a private directory.
#path :/home/strauss/lib/mibs

# EXPERIMENTAL: Add a caching method (works only on UNIX systems). 
# NOTE: the cache directory must exist and permissions must be
# handled appropriately. A simple but insecure way is to apply
# a tmp flag to the directory (chmod 1777 /usr/local/share/mibs/cache).
#cache /usr/local/share/mibs/cache /usr/local/bin/smicache -d /usr/local/share/mibs/cache -p http://www.ibr.cs.tu-bs.de/projects/libsmi/smicache/

# Don't show any errors by default.
level 0

# Preload some basic SMIv2 modules.
load SNMPv2-SMI
load SNMPv2-TC
load SNMPv2-CONF

# Make smilint shout loud to report all errors and warnings.
smilint: level 9

# But please don't claim about any names longer than 32 chars.
# (note: this is the prefix of errors `namelength-32-module,
#  -type, -object, -enumeration, and -bit)
smilint: hide namelength-32

# Preloading some more modules for special applications.
tcpdump: load DISMAN-SCRIPT-MIB
tcpdump: load IF-MIB
smiquery: load IF-MIB



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsmi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 02:28:07 -0000	1.1
+++ .cvsignore	6 Oct 2006 02:28:56 -0000	1.2
@@ -0,0 +1 @@
+libsmi-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsmi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 02:28:07 -0000	1.1
+++ sources	6 Oct 2006 02:28:56 -0000	1.2
@@ -0,0 +1 @@
+c904b124bcaad692e04fdf2f0cff38bb  libsmi-0.4.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 02:30:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:30:59 -0700
Subject: owners owners.list,1.1781,1.1782
Message-ID: <200610060231.k962V1PZ017298@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17281

Modified Files:
	owners.list 
Log Message:
New package: libsmi (#209522)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1781
retrieving revision 1.1782
diff -u -r1.1781 -r1.1782
--- owners.list	6 Oct 2006 01:13:05 -0000	1.1781
+++ owners.list	6 Oct 2006 02:30:59 -0000	1.1782
@@ -926,6 +926,7 @@
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|libsmi|A library to access SMI MIB information|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|libspectrum|The ZX Spectrum library required for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at



From fedora-extras-commits at redhat.com  Fri Oct  6 02:31:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:31:49 -0700
Subject: rpms/libsmi/devel libsmi.spec,1.1,1.2
Message-ID: <200610060231.k962Vp3i017327@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17310

Modified Files:
	libsmi.spec 
Log Message:
LIBTOOL is a make variable


Index: libsmi.spec
===================================================================
RCS file: /cvs/extras/rpms/libsmi/devel/libsmi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsmi.spec	6 Oct 2006 02:28:56 -0000	1.1
+++ libsmi.spec	6 Oct 2006 02:31:49 -0000	1.2
@@ -50,7 +50,7 @@
     --enable-sming \
     --enable-shared \
     --disable-static
-LIBTOOL=/usr/bin/libtool make %{?_smp_mflags}
+make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 
 
 %install



From fedora-extras-commits at redhat.com  Fri Oct  6 02:36:53 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:36:53 -0700
Subject: rpms/exo/devel exo.spec,1.17,1.18
Message-ID: <200610060236.k962atRm017402@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17385

Modified Files:
	exo.spec 
Log Message:
Added gtk-update-icon-cache



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- exo.spec	5 Oct 2006 02:19:43 -0000	1.17
+++ exo.spec	6 Oct 2006 02:36:53 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.10
-Release: 0.4.rc1%{?dist}
+Release: 0.5.rc1%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
@@ -65,9 +65,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
 
 %files -f libexo-0.3.lang
 %defattr(-,root,root,-)
@@ -105,6 +111,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.5.rc1
+- Added gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.4.rc1
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 02:50:50 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:50:50 -0700
Subject: rpms/Terminal/devel Terminal.spec,1.12,1.13
Message-ID: <200610060250.k962oq70017535@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17518

Modified Files:
	Terminal.spec 
Log Message:
Added gtk-update-icon-cache to post/postun



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Terminal.spec	5 Oct 2006 02:29:30 -0000	1.12
+++ Terminal.spec	6 Oct 2006 02:50:50 -0000	1.13
@@ -32,6 +32,14 @@
 %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 -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS HACKING THANKS
@@ -52,6 +60,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.4.rc1
+- Added gtk-update-icon-cache to post/postun
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.3.rc1
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 03:00:43 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 20:00:43 -0700
Subject: rpms/mousepad/devel mousepad.spec,1.2,1.3
Message-ID: <200610060300.k9630j1b017649@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mousepad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17632

Modified Files:
	mousepad.spec 
Log Message:
Fix typo in description



Index: mousepad.spec
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/mousepad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mousepad.spec	5 Oct 2006 03:16:03 -0000	1.2
+++ mousepad.spec	6 Oct 2006 03:00:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mousepad
 Version:        0.2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mousepad - A simple text editor for Xfce
 
 Group:          Applications/Editors
@@ -19,7 +19,7 @@
 Mousepad was to provide printing support, which would have been difficult
 for Leafpad for various reasons.
 
-Although some features are under development, currently Mousepad has folowing
+Although some features are under development, currently Mousepad has following
 features:
 
     * Complete support for UTF-8 text
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/* 
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.8-2
+- Fix typo in description 
+
 * Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.8-1
 - Update to 0.2.8
 



From fedora-extras-commits at redhat.com  Fri Oct  6 03:08:33 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 20:08:33 -0700
Subject: rpms/spandsp/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 spandsp.spec, 1.1, 1.2
Message-ID: <200610060308.k9638Zhq020675@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20653

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre23


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 13:00:42 -0000	1.2
+++ .cvsignore	6 Oct 2006 03:08:33 -0000	1.3
@@ -1 +1 @@
-spandsp-0.0.2pre26.tar.gz
+spandsp-0.0.3pre23.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 13:00:42 -0000	1.2
+++ sources	6 Oct 2006 03:08:33 -0000	1.3
@@ -1 +1 @@
-2b28a75b1d7c49616534bd7264317241  spandsp-0.0.2pre26.tar.gz
+09a2b0b8c53923fd7351a2026fa0c2ff  spandsp-0.0.3pre23.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spandsp.spec	5 Oct 2006 13:00:42 -0000	1.1
+++ spandsp.spec	6 Oct 2006 03:08:33 -0000	1.2
@@ -1,13 +1,13 @@
-%define pre 26
+%define pre 23
 
 Summary: A DSP library for telephony
 Name: spandsp
-Version: 0.0.2
+Version: 0.0.3
 Release: 1%{?pre:.pre%{pre}}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
-Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}/spandsp-%{version}%{?pre:pre%{pre}}.tar.gz
+Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtiff-devel
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.0.3-1.pre23
+- Update to 0.0.3pre23
+
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> - 0.0.2-1.pre26
 - Update to 0.0.2pre26
 



From fedora-extras-commits at redhat.com  Fri Oct  6 03:51:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 20:51:32 -0700
Subject: rpms/exo/devel exo.spec,1.18,1.19
Message-ID: <200610060351.k963pYiN020908@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20888

Modified Files:
	exo.spec 
Log Message:
Added libxfce4util-devel Requires for the devel package



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- exo.spec	6 Oct 2006 02:36:53 -0000	1.18
+++ exo.spec	6 Oct 2006 03:51:31 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.10
-Release: 0.5.rc1%{?dist}
+Release: 0.6.rc1%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
@@ -29,6 +29,7 @@
 Summary: Development tools for exo library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: libxfce4util-devel
 
 %description devel
 Static libraries and header files for the exo library.
@@ -111,6 +112,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.6.rc1
+- Added libxfce4util-devel Requires for the devel package
+
 * Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.5.rc1
 - Added gtk-update-icon-cache
 



From fedora-extras-commits at redhat.com  Fri Oct  6 05:29:21 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 22:29:21 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.14,1.15
Message-ID: <200610060529.k965TNln027819@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27802

Modified Files:
	xfce4-panel.spec 
Log Message:
Add Requires libxfcegui4-devel to devel package



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfce4-panel.spec	6 Oct 2006 02:15:59 -0000	1.14
+++ xfce4-panel.spec	6 Oct 2006 05:29:20 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
@@ -55,6 +55,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: libxfce4util-devel = %{version}
+Requires: libxfcegui4-devel = %{version}
 
 %description devel
 This package includes the header files you will need to build
@@ -118,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Add Requires libxfcegui4-devel to devel package
+
 * Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
 - Add period to description
 - Fix defattr



From fedora-extras-commits at redhat.com  Fri Oct  6 05:49:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 22:49:18 -0700
Subject: rpms/xfce4-battery-plugin/devel LGPL.xfce4-battery-plugin, NONE,
	1.1 LGPL, 1.1, NONE
Message-ID: <200610060549.k965nKvV028101@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28085

Added Files:
	LGPL.xfce4-battery-plugin 
Removed Files:
	LGPL 
Log Message:
rename LGPL to LGPL.xfce4-battery-plugin


--- NEW FILE LGPL.xfce4-battery-plugin ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS


--- LGPL DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 05:56:08 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 22:56:08 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.3,1.4
Message-ID: <200610060556.k965uApK028251@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28234

Modified Files:
	Thunar.spec 
Log Message:
Really re-enable the trash plugin.



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Thunar.spec	5 Oct 2006 02:24:48 -0000	1.3
+++ Thunar.spec	6 Oct 2006 05:56:08 -0000	1.4
@@ -63,10 +63,6 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/thunarx-1/*.la
 
-# remove the tpa plugin and desktop if it's present. 
-rm -f $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins/thunar-tpa
-rm -f $RPM_BUILD_ROOT/%{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop
-
 %find_lang Thunar
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-bulk-rename.desktop
@@ -162,6 +158,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct 05 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.8.rc1
+- Really re-enable the trash plugin. 
+
 * Thu Oct 05 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.7.rc1
 - Re-enable trash plugin in Xfce 4.4rc1
 



From fedora-extras-commits at redhat.com  Fri Oct  6 05:57:08 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 22:57:08 -0700
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec,1.9,1.10
Message-ID: <200610060557.k965vAE4028317@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28300

Modified Files:
	xfce4-appfinder.spec 
Log Message:
Add period to description
Fix defattr
Add gtk-update-icon-cache



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-appfinder.spec	5 Oct 2006 02:34:54 -0000	1.9
+++ xfce4-appfinder.spec	6 Oct 2006 05:57:08 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-appfinder-4.3.99.1.tar.bz2
@@ -13,7 +13,7 @@
 BuildRequires: gettext intltool
 
 %description
-xfce-appfinder shows system wide installed applications
+xfce-appfinder shows system wide installed applications.
 
 %prep
 %setup -q
@@ -31,8 +31,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO ChangeLog COPYING AUTHORS
 %{_bindir}/xfce4-appfinder
 %{_datadir}/applications/xfce4-appfinder.desktop
@@ -41,6 +49,11 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add period to description
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 05:59:03 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 22:59:03 -0700
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.10,1.11
Message-ID: <200610060559.k965x5ru028383@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28366

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
Fix defattr



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-icon-theme.spec	5 Oct 2006 02:38:12 -0000	1.10
+++ xfce4-icon-theme.spec	6 Oct 2006 05:59:03 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2
@@ -31,12 +31,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %{_datadir}/*
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr 
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:03:30 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:03:30 -0700
Subject: rpms/python-turbojson/devel - New directory
Message-ID: <200610060603.k9663WNF031413@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31382/python-turbojson/devel

Log Message:
Directory /cvs/extras/rpms/python-turbojson/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 06:03:29 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:03:29 -0700
Subject: rpms/python-turbojson - New directory
Message-ID: <200610060603.k9663VLY031405@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31382/python-turbojson

Log Message:
Directory /cvs/extras/rpms/python-turbojson added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 06:03:50 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:03:50 -0700
Subject: rpms/python-turbojson/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610060603.k9663qvY031499@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31464/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-turbojson


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 06:03:48 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:03:48 -0700
Subject: rpms/python-turbojson Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610060603.k9663oao031493@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31464

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-turbojson


--- NEW FILE Makefile ---
# Top level Makefile for module python-turbojson
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 06:04:15 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:04:15 -0700
Subject: rpms/python-turbojson/devel python-turbojson.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610060604.k9664HG3031602@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-turbojson.spec 
Log Message:
auto-import python-turbojson-0.9.9-2 on branch devel from python-turbojson-0.9.9-2.src.rpm


--- NEW FILE python-turbojson.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%define module turbojson

Name:           python-turbojson
Version:        0.9.9
Release:        2%{?dist}
Summary:        Python template plugin that supports json

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org/docs/plugins/template.html
Source0:        http://files.turbogears.org/eggs/TurboJson-%{version}-py2.4.egg
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

%description
This package provides a template engine plugin, allowing you
to easily use Json with TurboGears, Buffet or other systems
that support python.templating.engines.


%prep
%setup -q -c


%build


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/%{module}
mkdir -p %{buildroot}%{python_sitelib}/%{module}/tests
install -p -m 0644 %{module}/*.py %{buildroot}%{python_sitelib}/%{module}
install -p -m 0644 %{module}/tests/*.py %{buildroot}%{python_sitelib}/%{module}/tests
mkdir -p %{buildroot}%{python_sitelib}/TurboJson-%{version}-py%{pyver}.egg-info
install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TurboJson-%{version}-py%{pyver}.egg-info

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{python_sitelib}/%{module}/
%{python_sitelib}/TurboJson-%{version}-py%{pyver}.egg-info


%changelog
* Fri Oct  6 2006 Luke Macken <lmacken at redhat.com> 0.9.9-2
- Update source url

* Mon Sep 25 2006 Luke Macken <lmacken at redhat.com> 0.9.9-1
- 0.9.9
- Rename to python-turbojson
- Own the %%{python_sitelib/turbojson directory
- Install the EGG-INFO

* Sat Sep 16 2006 Luke Macken <lmacken at redhat.com> 0.9.8-1
- Initial creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-turbojson/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 06:03:49 -0000	1.1
+++ .cvsignore	6 Oct 2006 06:04:14 -0000	1.2
@@ -0,0 +1 @@
+TurboJson-0.9.9-py2.4.egg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-turbojson/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 06:03:49 -0000	1.1
+++ sources	6 Oct 2006 06:04:14 -0000	1.2
@@ -0,0 +1 @@
+d8053e4b4e7920305bb6a96bfba23164  TurboJson-0.9.9-py2.4.egg



From fedora-extras-commits at redhat.com  Fri Oct  6 06:04:13 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:04:13 -0700
Subject: rpms/python-turbojson import.log,1.1,1.2
Message-ID: <200610060604.k9664jdX031610@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567

Modified Files:
	import.log 
Log Message:
auto-import python-turbojson-0.9.9-2 on branch devel from python-turbojson-0.9.9-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-turbojson/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 06:03:48 -0000	1.1
+++ import.log	6 Oct 2006 06:04:13 -0000	1.2
@@ -0,0 +1 @@
+python-turbojson-0_9_9-2:HEAD:python-turbojson-0.9.9-2.src.rpm:1160114771



From fedora-extras-commits at redhat.com  Fri Oct  6 06:04:58 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:04:58 -0700
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.10,1.11
Message-ID: <200610060605.k9665U7n031664@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31642

Modified Files:
	xfce4-mixer.spec 
Log Message:
Fix defattr
Add period to the end of description
Add gtk-update-icon-cache



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-mixer.spec	5 Oct 2006 02:44:00 -0000	1.10
+++ xfce4-mixer.spec	6 Oct 2006 06:04:58 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-mixer-4.3.99.1.tar.bz2
@@ -18,7 +18,7 @@
 BuildRequires: gettext intltool
 
 %description
-Volume control plugin for the Xfce 4 panel
+Volume control plugin for the Xfce 4 panel.
 
 %prep
 %setup -q
@@ -37,8 +37,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO ChangeLog NOTES COPYING AUTHORS NEWS
 %{_bindir}/xfce4-mixer
 %{_libdir}/xfce4/*
@@ -48,6 +56,11 @@
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+- Add period to the end of description
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:06:12 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:06:12 -0700
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.11,1.12
Message-ID: <200610060606.k9666EtO031728@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31711

Modified Files:
	xfce4-session.spec 
Log Message:
Fix defattr
Add gtk-update-icon-cache



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-session.spec	5 Oct 2006 02:53:42 -0000	1.11
+++ xfce4-session.spec	6 Oct 2006 06:06:11 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.3.99.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-session-4.3.99.1.tar.bz2
@@ -60,12 +60,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
@@ -93,20 +99,24 @@
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/xfce4/xfce4-session-4.2/libxfsm/*.h
 %{_libdir}/lib*.so
 %{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
 
 %files engines
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/themes/Default/balou/*
 %{_libdir}/xfce4/splash/engines/libbalou.*
 %{_libdir}/xfce4/splash/engines/libsimple.*
 %{_libexecdir}/balou-*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:08:29 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 23:08:29 -0700
Subject: rpms/xfce4-cpugraph-plugin/devel xfce4-cpugraph-plugin.spec, 1.6,
	1.7
Message-ID: <200610060608.k9668VFu031853@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31836

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
correct sources version mismatch 0.3 -> 0.3.0


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-cpugraph-plugin.spec	5 Oct 2006 12:11:40 -0000	1.6
+++ xfce4-cpugraph-plugin.spec	6 Oct 2006 06:08:29 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		xfce4-cpugraph-plugin
-Version:	0.3
+Version:	0.3.0
 Release:	3%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
@@ -39,14 +39,14 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-3
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-2
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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-1
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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



From fedora-extras-commits at redhat.com  Fri Oct  6 06:08:38 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:08:38 -0700
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.10,1.11
Message-ID: <200610060608.k9668exM031876@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31859

Modified Files:
	xfce-mcs-plugins.spec 
Log Message:
Fix defattr



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce-mcs-plugins.spec	5 Oct 2006 02:56:40 -0000	1.10
+++ xfce-mcs-plugins.spec	6 Oct 2006 06:08:38 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2
@@ -42,7 +42,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc README COPYING AUTHORS
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
@@ -54,6 +54,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:12:21 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:12:21 -0700
Subject: owners owners.list,1.1782,1.1783
Message-ID: <200610060612.k966CNgT032056@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32039

Modified Files:
	owners.list 
Log Message:
own python-turbojson


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1782
retrieving revision 1.1783
diff -u -r1.1782 -r1.1783
--- owners.list	6 Oct 2006 02:30:59 -0000	1.1782
+++ owners.list	6 Oct 2006 06:12:21 -0000	1.1783
@@ -1880,6 +1880,7 @@
 Fedora Extras|python-telepathy|Python libraries for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-TestGears|Unit testing for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 06:16:57 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:16:57 -0700
Subject: rpms/xfce-utils/devel xfce-utils.spec,1.11,1.12
Message-ID: <200610060616.k966Gx43032124@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32107

Modified Files:
	xfce-utils.spec 
Log Message:
Fix defattr



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce-utils.spec	5 Oct 2006 03:00:52 -0000	1.11
+++ xfce-utils.spec	6 Oct 2006 06:16:57 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-utils-4.3.99.1.tar.bz2
@@ -53,7 +53,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %attr(0755,root,root) %{_sysconfdir}/xdg/xfce4
 %{_bindir}/*
@@ -81,6 +81,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:20:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:20:34 -0700
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.13,1.14
Message-ID: <200610060620.k966KalF032282@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32258

Modified Files:
	xfdesktop.spec 
Log Message:
Fix defattr
Add period to the end of description
Add gtk-update-icon-cache



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfdesktop.spec	5 Oct 2006 03:04:46 -0000	1.13
+++ xfdesktop.spec	6 Oct 2006 06:20:34 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfdesktop-4.3.99.1.tar.bz2
@@ -30,7 +30,7 @@
 BuildRequires: dbus-devel
 
 %description
-This package includes a desktop manager for the XFce Desktop Environment
+This package includes a desktop manager for the XFce Desktop Environment.
 
 %prep
 %setup -q
@@ -55,8 +55,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_sysconfdir}/xdg/xfce4/*
 %{_bindir}/*
@@ -73,6 +81,11 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Fix defattr
+- Add period to the end of description
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:25:42 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:25:42 -0700
Subject: rpms/xfdesktop/devel xfdesktop-image-4.3.90.1.patch,NONE,1.1
Message-ID: <200610060625.k966PiO5032548@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32530

Added Files:
	xfdesktop-image-4.3.90.1.patch 
Log Message:
Change default backdrop patch


xfdesktop-image-4.3.90.1.patch:

--- NEW FILE xfdesktop-image-4.3.90.1.patch ---
diff -Nur xfdesktop-4.3.90.1.orig/common/xfdesktop-common.h xfdesktop-4.3.90.1/common/xfdesktop-common.h
--- xfdesktop-4.3.90.1.orig/common/xfdesktop-common.h	2006-04-16 08:47:24.000000000 -0600
+++ xfdesktop-4.3.90.1/common/xfdesktop-common.h	2006-05-08 22:24:56.000000000 -0600
@@ -31,7 +31,8 @@
 #include <X11/Xlib.h>
 
 #define BACKDROP_CHANNEL         "BACKDROP"
-#define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-smoke.png"
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP         DATADIR "/backgrounds/images/default.png"
 #define LIST_TEXT                "# xfce backdrop list"
 #define XFDESKTOP_SELECTION_FMT  "XFDESKTOP_SELECTION_%d"
 #define XFDESKTOP_IMAGE_FILE_FMT "XFDESKTOP_IMAGE_FILE_%d"



From fedora-extras-commits at redhat.com  Fri Oct  6 06:31:05 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:31:05 -0700
Subject: rpms/xfprint/devel xfprint.spec,1.14,1.15
Message-ID: <200610060631.k966V7dv000312@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32763

Modified Files:
	xfprint.spec 
Log Message:
Fix defattr
Add gtk-update-icon-cache



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfprint.spec	5 Oct 2006 03:07:51 -0000	1.14
+++ xfprint.spec	6 Oct 2006 06:31:05 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://www.xfce.org
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfprint-4.3.99.1.tar.bz2
@@ -55,12 +55,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/xfce4/mcs-plugins
@@ -78,6 +84,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:33:27 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:33:27 -0700
Subject: rpms/xfwm4/devel xfwm4.spec,1.15,1.16
Message-ID: <200610060633.k966XTu1000380@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv362

Modified Files:
	xfwm4.spec 
Log Message:
Fix defattr
Add gtk-update-icon-cache



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfwm4.spec	5 Oct 2006 03:11:10 -0000	1.15
+++ xfwm4.spec	6 Oct 2006 06:33:27 -0000	1.16
@@ -1,15 +1,11 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2
 
-# Change default for Fedora
-#Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch
-#Patch1: xfwm4-bluecurve.patch
-
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,9 +30,6 @@
 %prep
 %setup -q
 
-#%patch0 -p1 -b .bluecurve-prep
-#%patch1 -p1 -b .bluecurve
-
 %build
 %configure
 
@@ -54,8 +47,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
 %{_bindir}/xfwm4
 %{_libdir}/xfce4/mcs-plugins/*
@@ -68,6 +69,10 @@
 %{_datadir}/themes
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:35:01 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:35:01 -0700
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec,1.9,1.10
Message-ID: <200610060635.k966Z3jb000447@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv430

Modified Files:
	xfwm4-themes.spec 
Log Message:
Fix defattr



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfwm4-themes.spec	5 Oct 2006 03:13:39 -0000	1.9
+++ xfwm4-themes.spec	6 Oct 2006 06:35:01 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-themes-4.3.99.1.tar.bz2
@@ -30,11 +30,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO COPYING AUTHORS
 %{_datadir}/themes
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:37:23 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:37:23 -0700
Subject: rpms/orage/devel orage.spec,1.1,1.2
Message-ID: <200610060637.k966bP6k000522@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv505

Modified Files:
	orage.spec 
Log Message:
Add period at the end of description. 
Fix defattr
Add gtk-update-icon-cache



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- orage.spec	5 Oct 2006 03:32:29 -0000	1.1
+++ orage.spec	6 Oct 2006 06:37:23 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: orage
 Version: 4.3.99.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
@@ -23,7 +23,7 @@
 Obsoletes: xfce4-datetime-plugin <= 4.2.3-3
 
 %description
-Time-managing application for Xfce4
+Time-managing application for Xfce4.
 
 %prep
 %setup -q
@@ -50,8 +50,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog COPYING AUTHORS
 %{_bindir}/orage
 %{_libdir}/xfce4/mcs-plugins/orage_plugin.so
@@ -64,6 +72,11 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Add period at the end of description. 
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 07:25:09 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  6 Oct 2006 00:25:09 -0700
Subject: rpms/acpitool/FC-5 acpitool.spec,1.9,1.10
Message-ID: <200610060725.k967PBbp003956@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/acpitool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3910/FC-5

Modified Files:
	acpitool.spec 
Log Message:
* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
- set Group to Applications/System (fix #209230)



Index: acpitool.spec
===================================================================
RCS file: /cvs/extras/rpms/acpitool/FC-5/acpitool.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- acpitool.spec	28 Aug 2006 09:40:07 -0000	1.9
+++ acpitool.spec	6 Oct 2006 07:25:09 -0000	1.10
@@ -1,10 +1,10 @@
 Name: acpitool
 Version: 0.4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml
 Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz
 Summary: A command line ACPI client for Linux
-Group: Applications/Internet
+Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,20 +38,23 @@
 %{_mandir}/man1/acpitool*
 
 %changelog
-* Mon Aug 28 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.6-1
+* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
+- set Group to Applications/System (fix #209230)
+
+* Mon Aug 28 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-1
 - update to 0.4.6
 
-* Sun May 21 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.5-1
+* Sun May 21 2006 Patrice Dumas <pertusus at free.fr> 0.4.5-1
 - update to 0.4.5
 
-* Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.4-1.1
+* Thu Feb 16 2006 Patrice Dumas <pertusus at free.fr> 0.4.4-1.1
 - new version
 - remove now unneeded patch
 
-* Thu Nov 10 2005 Patrice Dumas <dumas at centre-cired.fr> - 0.3.0-3
+* Thu Nov 10 2005 Patrice Dumas <pertusus at free.fr> 0.3.0-3
 - add patch to avoid ignoring CXXFLAGS
 
-* Fri Nov  4 2005 Patrice Dumas <dumas at centre-cired.fr> - 0.3.0-2
+* Fri Nov  4 2005 Patrice Dumas <pertusus at free.fr> 0.3.0-2
 - update using fedora core conventions, some cleanings
 
 * Tue Aug 24 2004 Robert Ambrose <rna at muttsoft.com>



From fedora-extras-commits at redhat.com  Fri Oct  6 07:25:10 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  6 Oct 2006 00:25:10 -0700
Subject: rpms/acpitool/devel acpitool.spec,1.7,1.8
Message-ID: <200610060725.k967PCeA003960@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/acpitool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3910/devel

Modified Files:
	acpitool.spec 
Log Message:
* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
- set Group to Applications/System (fix #209230)



Index: acpitool.spec
===================================================================
RCS file: /cvs/extras/rpms/acpitool/devel/acpitool.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- acpitool.spec	28 Aug 2006 09:38:48 -0000	1.7
+++ acpitool.spec	6 Oct 2006 07:25:10 -0000	1.8
@@ -1,10 +1,10 @@
 Name: acpitool
 Version: 0.4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml
 Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz
 Summary: A command line ACPI client for Linux
-Group: Applications/Internet
+Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,20 +38,23 @@
 %{_mandir}/man1/acpitool*
 
 %changelog
-* Mon Aug 28 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.6-1
+* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
+- set Group to Applications/System (fix #209230)
+
+* Mon Aug 28 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-1
 - update to 0.4.6
 
-* Sun May 21 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.5-1
+* Sun May 21 2006 Patrice Dumas <pertusus at free.fr> 0.4.5-1
 - update to 0.4.5
 
-* Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.4-1.1
+* Thu Feb 16 2006 Patrice Dumas <pertusus at free.fr> 0.4.4-1.1
 - new version
 - remove now unneeded patch
 
-* Thu Nov 10 2005 Patrice Dumas <dumas at centre-cired.fr> - 0.3.0-3
+* Thu Nov 10 2005 Patrice Dumas <pertusus at free.fr> 0.3.0-3
 - add patch to avoid ignoring CXXFLAGS
 
-* Fri Nov  4 2005 Patrice Dumas <dumas at centre-cired.fr> - 0.3.0-2
+* Fri Nov  4 2005 Patrice Dumas <pertusus at free.fr> 0.3.0-2
 - update using fedora core conventions, some cleanings
 
 * Tue Aug 24 2004 Robert Ambrose <rna at muttsoft.com>



From fedora-extras-commits at redhat.com  Fri Oct  6 07:25:08 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  6 Oct 2006 00:25:08 -0700
Subject: rpms/acpitool/FC-3 acpitool.spec,1.4,1.5
Message-ID: <200610060725.k967PeuH003963@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/acpitool/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3910/FC-3

Modified Files:
	acpitool.spec 
Log Message:
* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
- set Group to Applications/System (fix #209230)



Index: acpitool.spec
===================================================================
RCS file: /cvs/extras/rpms/acpitool/FC-3/acpitool.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- acpitool.spec	21 May 2006 14:18:16 -0000	1.4
+++ acpitool.spec	6 Oct 2006 07:25:08 -0000	1.5
@@ -38,7 +38,7 @@
 %{_mandir}/man1/acpitool*
 
 %changelog
-* Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.5-1
+* Sun May 21 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.5-1
 - update to 0.4.5
 
 * Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.4-1.1



From fedora-extras-commits at redhat.com  Fri Oct  6 07:27:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  6 Oct 2006 00:27:53 -0700
Subject: rpms/xfce4-modemlights-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-modemlights-plugin.spec, 1.8, NONE
Message-ID: <200610060727.k967Ruwg004076@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4059

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-modemlights-plugin.spec 
Log Message:
orphaning modemlights-plugin for XFCE 4.4


--- NEW FILE dead.package ---
modemlighst plugin is not ported to XFCE 4.4 and seems to be orphande upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-modemlights-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 07:30:40 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri,  6 Oct 2006 00:30:40 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.4,1.5
Message-ID: <200610060730.k967UgSH004150@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4126

Modified Files:
	Thunar.spec 
Log Message:
Obsolete xffm for now.



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Thunar.spec	6 Oct 2006 05:56:08 -0000	1.4
+++ Thunar.spec	6 Oct 2006 07:30:40 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.7.rc1%{?dist}
+Release: 0.9.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -25,6 +25,10 @@
 BuildRequires: GConf2-devel
 BuildRequires: gtk-doc
 
+# obsolete xffm to allow for smooth upgrades
+Provides: xffm = 4.2.4-1
+Obsoletes: xffm <= 4.2.3-5
+
 %description
 Thunar is a new modern file manager for the Xfce Desktop Environment. 
 It has been designed from the ground up to be fast and easy-to-use. 
@@ -158,6 +162,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct 06 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.9.rc1
+- Obsolete xffm for now. 
+
 * Thu Oct 05 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.8.rc1
 - Really re-enable the trash plugin. 
 



From fedora-extras-commits at redhat.com  Fri Oct  6 07:55:41 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri,  6 Oct 2006 00:55:41 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.15,1.16
Message-ID: <200610060755.k967thGt004371@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4354

Modified Files:
	xfce4-panel.spec 
Log Message:
Tweak Obsolete versions



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfce4-panel.spec	6 Oct 2006 05:29:20 -0000	1.15
+++ xfce4-panel.spec	6 Oct 2006 07:55:41 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.3.99.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
@@ -23,28 +23,28 @@
 BuildRequires: gettext
 # xfce4-iconbox isn't in Xfce 4.4
 Provides: xfce4-iconbox = %{version}-%{release}
-Obsoletes: xfce4-iconbox <= 4.2.3-4
+Obsoletes: xfce4-iconbox <= 4.2.3
 # xfce4-systray isn't in Xfce 4.4
 Provides: xfce4-systray = %{version}-%{release}
-Obsoletes: xfce4-systray <= 4.2.3-3
+Obsoletes: xfce4-systray <= 4.2.3
 # xfce4-toys isn't in Xfce 4.4
 Provides: xfce4-toys = %{version}-%{release}
-Obsoletes: xfce4-toys <= 4.2.3-3
+Obsoletes: xfce4-toys <= 4.2.3
 # xfce4-trigger-launcher isn't in Xfce 4.4
 Provides: xfce4-trigger-launcher = %{version}-%{release}
-Obsoletes: xfce4-trigger-launcher <= 4.2.3-3
+Obsoletes: xfce4-trigger-launcher <= 4.2.3
 # xfce4-modemlights-plugin isn't in Xfce 4.4
 Provides: xfce4-modemlights-plugin = %{version}-%{release}
-Obsoletes: xfce4-modemlights-plugin <= 4.2.3-3
+Obsoletes: xfce4-modemlights-plugin <= 0.1.1
 # xfce4-showdesktop-plugin isn't in Xfce 4.4
 Provides: xfce4-showdesktop-plugin = %{version}-%{release}
-Obsoletes: xfce4-showdesktop-plugin <= 4.2.3-3
+Obsoletes: xfce4-showdesktop-plugin <= 0.4.0
 # xfce4-taskbar-plugin isn't in Xfce 4.4
 Provides: xfce4-taskbar-plugin = %{version}-%{release}
-Obsoletes: xfce4-taskbar-plugin <= 4.2.3-3
+Obsoletes: xfce4-taskbar-plugin <= 0.2.2
 # xfce4-windowlist-plugin isn't in Xfce 4.4
 Provides: xfce4-windowlist-plugin = %{version}-%{release}
-Obsoletes: xfce4-windowlist-plugin <= 4.2.3-3
+Obsoletes: xfce4-windowlist-plugin <= 0.1.0
 
 %description
 This package includes the panel for the Xfce desktop environment.
@@ -119,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Fri Oct  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
+- Tweak Obsolete versions
+
 * Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
 - Add Requires libxfcegui4-devel to devel package
 



From fedora-extras-commits at redhat.com  Fri Oct  6 08:03:44 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  6 Oct 2006 01:03:44 -0700
Subject: fedora-security/audit fc6,1.102,1.103
Message-ID: <200610060803.k9683iEN007294@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7264

Modified Files:
	fc6 
Log Message:
Deal with mysql; this is waiting for an upstream release of 5.0.26 and
therefore will be dealt with after fc6 ships



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fc6	5 Oct 2006 20:55:04 -0000	1.102
+++ fc6	6 Oct 2006 08:03:40 -0000	1.103
@@ -67,8 +67,8 @@
 CVE-2006-4262 backport (cscope) 
 CVE-2006-4253 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
 CVE-2006-4253 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.25,5.1.12) bz#203428 [FC6Blocker]
-CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.25,5.1.12) bz#203434 [FC6Blocker]
+CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203428
+CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203434
 CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
 CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4146 backport (gdb)
@@ -77,7 +77,7 @@
 CVE-2006-4096 backport (bind)
 CVE-2006-4095 backport (bind)
 CVE-2006-4093 version (kernel, fixed 2.6.17.9, fixed 2.6.18-rc5)
-CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) bz#202675 [FC6Blocker]
+CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) bz#202675
 CVE-2006-4020 version (php, fixed 5.1.5)
 CVE-2006-4019 version (squirrelmail, fixed 1.4.8)
 CVE-2006-3918 version (httpd, fixed 2.2.2)



From fedora-extras-commits at redhat.com  Fri Oct  6 08:13:22 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri,  6 Oct 2006 01:13:22 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.16,1.17
Message-ID: <200610060813.k968DOeE007447@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7430

Modified Files:
	xfce4-panel.spec 
Log Message:
List full old versions in Obsoletes



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfce4-panel.spec	6 Oct 2006 07:55:41 -0000	1.16
+++ xfce4-panel.spec	6 Oct 2006 08:13:22 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.3.99.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
@@ -23,28 +23,28 @@
 BuildRequires: gettext
 # xfce4-iconbox isn't in Xfce 4.4
 Provides: xfce4-iconbox = %{version}-%{release}
-Obsoletes: xfce4-iconbox <= 4.2.3
+Obsoletes: xfce4-iconbox <= 4.2.3-4.fc6
 # xfce4-systray isn't in Xfce 4.4
 Provides: xfce4-systray = %{version}-%{release}
-Obsoletes: xfce4-systray <= 4.2.3
+Obsoletes: xfce4-systray <= 4.2.3-3.fc6
 # xfce4-toys isn't in Xfce 4.4
 Provides: xfce4-toys = %{version}-%{release}
-Obsoletes: xfce4-toys <= 4.2.3
+Obsoletes: xfce4-toys <= 4.2.3-3.fc6
 # xfce4-trigger-launcher isn't in Xfce 4.4
 Provides: xfce4-trigger-launcher = %{version}-%{release}
-Obsoletes: xfce4-trigger-launcher <= 4.2.3
+Obsoletes: xfce4-trigger-launcher <= 4.2.3-3.fc6
 # xfce4-modemlights-plugin isn't in Xfce 4.4
 Provides: xfce4-modemlights-plugin = %{version}-%{release}
-Obsoletes: xfce4-modemlights-plugin <= 0.1.1
+Obsoletes: xfce4-modemlights-plugin <= 0.1.1-9.fc6
 # xfce4-showdesktop-plugin isn't in Xfce 4.4
 Provides: xfce4-showdesktop-plugin = %{version}-%{release}
-Obsoletes: xfce4-showdesktop-plugin <= 0.4.0
+Obsoletes: xfce4-showdesktop-plugin <= 0.4.0-7.fc6
 # xfce4-taskbar-plugin isn't in Xfce 4.4
 Provides: xfce4-taskbar-plugin = %{version}-%{release}
-Obsoletes: xfce4-taskbar-plugin <= 0.2.2
+Obsoletes: xfce4-taskbar-plugin <= 0.2.2-7.fc6
 # xfce4-windowlist-plugin isn't in Xfce 4.4
 Provides: xfce4-windowlist-plugin = %{version}-%{release}
-Obsoletes: xfce4-windowlist-plugin <= 0.1.0
+Obsoletes: xfce4-windowlist-plugin <= 0.1.0-7.fc6
 
 %description
 This package includes the panel for the Xfce desktop environment.
@@ -119,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Fri Oct  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-7
+- List full old versions in Obsoletes
+
 * Fri Oct  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
 - Tweak Obsolete versions
 



From fedora-extras-commits at redhat.com  Fri Oct  6 08:23:13 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  6 Oct 2006 01:23:13 -0700
Subject: fedora-security/audit fc5,1.347,1.348 fc6,1.103,1.104
Message-ID: <200610060823.k968ND0F007541@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7520

Modified Files:
	fc5 fc6 
Log Message:
A couple of days of updates



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- fc5	5 Oct 2006 20:55:04 -0000	1.347
+++ fc5	6 Oct 2006 08:23:10 -0000	1.348
@@ -1,8 +1,9 @@
-p to date CVE as of CVE email 20061003
-Up to date FC5 as of 20061003
+p to date CVE as of CVE email 20061005
+Up to date FC5 as of 20061005
 
 ** are items that need attention
 
+CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
@@ -10,11 +11,11 @@
 CVE-2006-5158 ** kernel
 CVE-2006-5072 VULNERABLE (mono) #209464
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
-CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) #208458
+CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)
 CVE-2006-4980 VULNERABLE (python) #208166
 CVE-2006-4925 ** openssh
-CVE-2006-4924 VULNERABLE (openssh) #207957
+CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fc6	6 Oct 2006 08:03:40 -0000	1.103
+++ fc6	6 Oct 2006 08:23:10 -0000	1.104
@@ -1,9 +1,10 @@
-Up to date CVE as of CVE email 20061003
+Up to date CVE as of CVE email 20061005
 Up to date FC6 as of Test3
 Up to date dist-fc6 rawhide as of 20060929
 
 ** are items that need attention
 
+CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified



From fedora-extras-commits at redhat.com  Fri Oct  6 08:24:42 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri,  6 Oct 2006 01:24:42 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.5,1.6
Message-ID: <200610060824.k968OiNM007567@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7550

Modified Files:
	Thunar.spec 
Log Message:
Tweak Obsoletes versions



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Thunar.spec	6 Oct 2006 07:30:40 -0000	1.5
+++ Thunar.spec	6 Oct 2006 08:24:42 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.9.rc1%{?dist}
+Release: 0.10.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -26,8 +26,8 @@
 BuildRequires: gtk-doc
 
 # obsolete xffm to allow for smooth upgrades
-Provides: xffm = 4.2.4-1
-Obsoletes: xffm <= 4.2.3-5
+Provides: xffm = 4.2.4
+Obsoletes: xffm <= 4.2.3-5.fc6
 
 %description
 Thunar is a new modern file manager for the Xfce Desktop Environment. 
@@ -162,6 +162,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct 06 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.10.rc1
+- Tweak Obsoletes versions
+
 * Fri Oct 06 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.9.rc1
 - Obsolete xffm for now. 
 



From fedora-extras-commits at redhat.com  Fri Oct  6 09:28:27 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:28:27 -0700
Subject: rpms/guiloader-c++ - New directory
Message-ID: <200610060928.k969STEL016194@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16173/guiloader-c++

Log Message:
Directory /cvs/extras/rpms/guiloader-c++ added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 09:28:27 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:28:27 -0700
Subject: rpms/guiloader-c++/devel - New directory
Message-ID: <200610060928.k969STZH016197@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16173/guiloader-c++/devel

Log Message:
Directory /cvs/extras/rpms/guiloader-c++/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 09:28:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:28:50 -0700
Subject: rpms/guiloader-c++ Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610060928.k969Sqiu016251@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16218

Added Files:
	Makefile import.log 
Log Message:
Setup of module guiloader-c++


--- NEW FILE Makefile ---
# Top level Makefile for module guiloader-c++
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 09:28:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:28:50 -0700
Subject: rpms/guiloader-c++/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610060928.k969Sqte016254@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16218/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module guiloader-c++


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 09:29:58 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:29:58 -0700
Subject: rpms/guiloader-c++ import.log,1.1,1.2
Message-ID: <200610060930.k969U041016325@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290

Modified Files:
	import.log 
Log Message:
auto-import guiloader-c++-2.8.0-2 on branch devel from guiloader-c++-2.8.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 09:28:49 -0000	1.1
+++ import.log	6 Oct 2006 09:29:58 -0000	1.2
@@ -0,0 +1 @@
+guiloader-c++-2_8_0-2:HEAD:guiloader-c++-2.8.0-2.src.rpm:1160126895



From fedora-extras-commits at redhat.com  Fri Oct  6 09:29:59 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:29:59 -0700
Subject: rpms/guiloader-c++/devel guiloader-c++-2.8.0-soversion.patch, NONE, 
	1.1 guiloader-c++.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610060930.k969U1F3016332@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290/devel

Modified Files:
	.cvsignore sources 
Added Files:
	guiloader-c++-2.8.0-soversion.patch guiloader-c++.spec 
Log Message:
auto-import guiloader-c++-2.8.0-2 on branch devel from guiloader-c++-2.8.0-2.src.rpm

guiloader-c++-2.8.0-soversion.patch:

--- NEW FILE guiloader-c++-2.8.0-soversion.patch ---
--- guiloader-c++-2.8.0/guiloader-c++/Makefile.in.orig	2006-09-12 11:01:54.000000000 +0200
+++ guiloader-c++-2.8.0/guiloader-c++/Makefile.in	2006-09-12 11:02:12.000000000 +0200
@@ -208,7 +208,6 @@
 	guiloader-c++_impl.cpp guiloader-c++_impl.h
 
 libguiloader_c___la_LIBADD = $(PKGS_LIBS)
-libguiloader_c___la_LDFLAGS = -no-undefined -avoid-version
 libguiloader_c___la_CPPFLAGS = $(PKGS_CFLAGS) $(GUILOADER_CPP_CFLAGS)
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guiloader-c++.pc


--- NEW FILE guiloader-c++.spec ---
Name:           guiloader-c++
Version:        2.8.0
Release:        2%{?dist}
Summary:        C++ Binding to GuiLoader Library

Group:          System Environment/Libraries
License:        GPL
URL:            http://gideon.sourceforge.net
Source0:        http://dl.sourceforge.net/gideon/%{name}-%{version}.tar.bz2
Patch0:         guiloader-c++-2.8.0-soversion.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  guiloader-devel >= 2.8.0
BuildRequires:  gtkmm24-devel >= 2.8.0


%description
GuiLoader/C++ is a C++ binding to GuiLoader library. It is a
convenience layer that simplifies development of GuiLoader based
applications written in C++ language by introducing exception safety,
binding GTK+ objects defined in GuiXml to C++ variables and type-safe
dynamic connection to signals.


%package devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       guiloader-devel
Requires:       gtkmm24-devel
Requires:       pkgconfig


%description devel
This package contains the header files needed for developing %{name}
applications.


%prep
%setup -q
%patch0 -p1 -b .soversion


%build
%configure --disable-static --disable-dependency-tracking
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README
%{_libdir}/libguiloader*.so.*


%files devel
%defattr(-, root, root, -)
%doc NEWS
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Fri Oct  6 2006 Denis Leroy <denis at poolshark.org> - 2.8.0-2
- Added pkgconfig devel Requires

* Sun Sep  3 2006 Denis Leroy <denis at poolshark.org> - 2.8.0-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 09:28:50 -0000	1.1
+++ .cvsignore	6 Oct 2006 09:29:59 -0000	1.2
@@ -0,0 +1 @@
+guiloader-c++-2.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 09:28:50 -0000	1.1
+++ sources	6 Oct 2006 09:29:59 -0000	1.2
@@ -0,0 +1 @@
+c66f7ef235cbc82f1a0b1dd5cdb14848  guiloader-c++-2.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct  6 09:41:30 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:41:30 -0700
Subject: owners owners.list,1.1783,1.1784
Message-ID: <200610060941.k969fWdF016430@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16413

Modified Files:
	owners.list 
Log Message:
Added guiloader-c++


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1783
retrieving revision 1.1784
diff -u -r1.1783 -r1.1784
--- owners.list	6 Oct 2006 06:12:21 -0000	1.1783
+++ owners.list	6 Oct 2006 09:41:30 -0000	1.1784
@@ -628,6 +628,7 @@
 Fedora Extras|gtypist|GNU typing tutor|zing at fastmail.fm|extras-qa at fedoraproject.org|
 Fedora Extras|guichan|Portable C++ GUI library for games using Allegro, SDL and OpenGL|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|guiloader|Gideon GuiXml Loader Library|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|guiloader-c++|C++ Binding to GuiLoader Library|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gurlchecker|A GNOME link validity checker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gutenprint|Printer Drivers Package|panemade at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 10:38:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 03:38:48 -0700
Subject: rebuild-scripts - Imported sources
Message-ID: <200610061038.k96AcmwE019666@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19649

Log Message:
Import mass rebuild scripts.

Status:

Vendor Tag:	fedora
Release Tags:	start
		
N rebuild-scripts/nfswatch.spec
N rebuild-scripts/crack/Makefile
N rebuild-scripts/crack/import.log
N rebuild-scripts/crack/devel/crack-chris.patch
N rebuild-scripts/crack/devel/Makefile
N rebuild-scripts/crack/devel/.cvsignore
N rebuild-scripts/crack/devel/sources
N rebuild-scripts/crack/devel/crack.spec
N rebuild-scripts/crack/FC-4/branch
N rebuild-scripts/crack/FC-4/crack-chris.patch
N rebuild-scripts/crack/FC-4/Makefile
N rebuild-scripts/crack/FC-4/.cvsignore
N rebuild-scripts/crack/FC-4/sources
N rebuild-scripts/crack/FC-4/crack.spec
N rebuild-scripts/crack/FC-5/branch
N rebuild-scripts/crack/FC-5/crack-chris.patch
N rebuild-scripts/crack/FC-5/Makefile
N rebuild-scripts/crack/FC-5/.cvsignore
N rebuild-scripts/crack/FC-5/sources
N rebuild-scripts/crack/FC-5/crack.spec
N rebuild-scripts/crack/common/branches
N rebuild-scripts/crack/common/cvs-import.sh
N rebuild-scripts/crack/common/Makefile
N rebuild-scripts/crack/common/Makefile.common
N rebuild-scripts/crack/FC-3/branch
N rebuild-scripts/crack/FC-3/crack-chris.patch
N rebuild-scripts/crack/FC-3/Makefile
N rebuild-scripts/crack/FC-3/.cvsignore
N rebuild-scripts/crack/FC-3/sources
N rebuild-scripts/crack/FC-3/crack.spec
N rebuild-scripts/fedora-security/tools/package-release
N rebuild-scripts/fedora-security/audit/README
N rebuild-scripts/fedora-security/audit/fc5
N rebuild-scripts/fedora-security/audit/fe4
N rebuild-scripts/fedora-security/audit/fc4
N rebuild-scripts/fedora-security/audit/fe5
N rebuild-scripts/gambas/Makefile
N rebuild-scripts/gambas/import.log
N rebuild-scripts/gambas/devel/gambas-1.0.6-gcc4.patch
N rebuild-scripts/gambas/devel/gambas-1.0.6-dont-make-links.patch
N rebuild-scripts/gambas/devel/Makefile
N rebuild-scripts/gambas/devel/.cvsignore
N rebuild-scripts/gambas/devel/gambas.spec
N rebuild-scripts/gambas/devel/sources
N rebuild-scripts/gambas/devel/gambas-1.0.6-noopt.patch
N rebuild-scripts/gambas/common/branches
N rebuild-scripts/gambas/common/cvs-import.sh
N rebuild-scripts/gambas/common/Makefile
N rebuild-scripts/gambas/common/tobuild
N rebuild-scripts/gambas/common/Makefile.common
N rebuild-scripts/SIBsim4/Makefile
N rebuild-scripts/SIBsim4/import.log
N rebuild-scripts/SIBsim4/devel/Makefile
N rebuild-scripts/SIBsim4/devel/.cvsignore
N rebuild-scripts/SIBsim4/devel/sources
N rebuild-scripts/SIBsim4/devel/SIBsim4.spec
N rebuild-scripts/SIBsim4/FC-4/branch
N rebuild-scripts/SIBsim4/FC-4/Makefile
N rebuild-scripts/SIBsim4/FC-4/.cvsignore
N rebuild-scripts/SIBsim4/FC-4/sources
N rebuild-scripts/SIBsim4/FC-4/SIBsim4.spec
N rebuild-scripts/SIBsim4/FC-5/branch
N rebuild-scripts/SIBsim4/FC-5/Makefile
N rebuild-scripts/SIBsim4/FC-5/.cvsignore
N rebuild-scripts/SIBsim4/FC-5/sources
N rebuild-scripts/SIBsim4/FC-5/SIBsim4.spec
N rebuild-scripts/SIBsim4/common/branches
N rebuild-scripts/SIBsim4/common/cvs-import.sh
N rebuild-scripts/SIBsim4/common/Makefile
N rebuild-scripts/SIBsim4/common/Makefile.common
N rebuild-scripts/extras-CVSROOT/modules
N rebuild-scripts/extras-CVSROOT/checkoutlist
N rebuild-scripts/extras-CVSROOT/commit_prep2
N rebuild-scripts/extras-CVSROOT/config
N rebuild-scripts/extras-CVSROOT/Makefile
N rebuild-scripts/extras-CVSROOT/commitinfo
N rebuild-scripts/extras-CVSROOT/cvswrappers
N rebuild-scripts/extras-CVSROOT/taginfo
N rebuild-scripts/extras-CVSROOT/rcsinfo
N rebuild-scripts/extras-CVSROOT/superlog.pl
N rebuild-scripts/extras-CVSROOT/loginfo
N rebuild-scripts/extras-CVSROOT/verifymsg
N rebuild-scripts/extras-CVSROOT/editinfo
N rebuild-scripts/extras-CVSROOT/notify
N rebuild-scripts/rebuild_nag/pkg_nb.txt
N rebuild-scripts/rebuild_nag/lst4.txt
N rebuild-scripts/rebuild_nag/pkg_nb2.txt
N rebuild-scripts/rebuild_nag/pkg3.txt
N rebuild-scripts/rebuild_nag/pkg_nonag.txt
N rebuild-scripts/rebuild_nag/hist.txt
N rebuild-scripts/rebuild_nag/lst3.txt
N rebuild-scripts/rebuild_nag/lst.txt
N rebuild-scripts/rebuild_nag/pkg_sort.txt
N rebuild-scripts/rebuild_nag/not_rebuilt.txt
N rebuild-scripts/rebuild_nag/lst_auto.txt
N rebuild-scripts/rebuild_nag/pkg.txt
N rebuild-scripts/rebuild_nag/rebuildrpms.py
N rebuild-scripts/rebuild_nag/recent.txt
N rebuild-scripts/rebuild_nag/lst5.txt
N rebuild-scripts/rebuild_nag/pkg2.txt
N rebuild-scripts/rebuild_nag/pkg_nag.txt
N rebuild-scripts/rebuild_nag/pkg_noarch.txt
N rebuild-scripts/rebuild_nag/lst2.txt
N rebuild-scripts/nfswatch/Makefile
N rebuild-scripts/nfswatch/import.log
N rebuild-scripts/nfswatch/devel/nfswatch.spec
N rebuild-scripts/nfswatch/devel/Makefile
N rebuild-scripts/nfswatch/devel/.cvsignore
N rebuild-scripts/nfswatch/devel/sources
N rebuild-scripts/nfswatch/FC-4/branch
N rebuild-scripts/nfswatch/FC-4/nfswatch.spec
N rebuild-scripts/nfswatch/FC-4/Makefile
N rebuild-scripts/nfswatch/FC-4/.cvsignore
N rebuild-scripts/nfswatch/FC-4/sources
N rebuild-scripts/nfswatch/FC-5/branch
N rebuild-scripts/nfswatch/FC-5/nfswatch.spec
N rebuild-scripts/nfswatch/FC-5/Makefile
N rebuild-scripts/nfswatch/FC-5/.cvsignore
N rebuild-scripts/nfswatch/FC-5/sources
N rebuild-scripts/nfswatch/common/branches
N rebuild-scripts/nfswatch/common/cvs-import.sh
N rebuild-scripts/nfswatch/common/Makefile
N rebuild-scripts/nfswatch/common/Makefile.common
N rebuild-scripts/nfswatch/FC-3/branch
N rebuild-scripts/nfswatch/FC-3/nfswatch.spec
N rebuild-scripts/nfswatch/FC-3/Makefile
N rebuild-scripts/nfswatch/FC-3/.cvsignore
N rebuild-scripts/nfswatch/FC-3/sources
N rebuild-scripts/hmmer/Makefile
N rebuild-scripts/hmmer/import.log
N rebuild-scripts/hmmer/devel/Makefile
N rebuild-scripts/hmmer/devel/.cvsignore
N rebuild-scripts/hmmer/devel/sources
N rebuild-scripts/hmmer/devel/hmmer.spec
N rebuild-scripts/hmmer/FC-4/branch
N rebuild-scripts/hmmer/FC-4/Makefile
N rebuild-scripts/hmmer/FC-4/.cvsignore
N rebuild-scripts/hmmer/FC-4/sources
N rebuild-scripts/hmmer/FC-4/hmmer.spec
N rebuild-scripts/hmmer/common/branches
N rebuild-scripts/hmmer/common/cvs-import.sh
N rebuild-scripts/hmmer/common/Makefile
N rebuild-scripts/hmmer/common/Makefile.common
N rebuild-scripts/hmmer/FC-3/branch
N rebuild-scripts/hmmer/FC-3/Makefile
N rebuild-scripts/hmmer/FC-3/.cvsignore
N rebuild-scripts/hmmer/FC-3/sources
N rebuild-scripts/hmmer/FC-3/hmmer.spec
N rebuild-scripts/mock/Makefile
N rebuild-scripts/mock/import.log
N rebuild-scripts/mock/devel/Makefile
N rebuild-scripts/mock/devel/.cvsignore
N rebuild-scripts/mock/devel/sources
N rebuild-scripts/mock/devel/mock.spec
N rebuild-scripts/mock/FC-4/branch
N rebuild-scripts/mock/FC-4/Makefile
N rebuild-scripts/mock/FC-4/.cvsignore
N rebuild-scripts/mock/FC-4/sources
N rebuild-scripts/mock/FC-4/mock.spec
N rebuild-scripts/mock/common/branches
N rebuild-scripts/mock/common/cvs-import.sh
N rebuild-scripts/mock/common/Makefile
N rebuild-scripts/mock/common/tobuild
N rebuild-scripts/mock/common/Makefile.common
N rebuild-scripts/mock/FC-3/branch
N rebuild-scripts/mock/FC-3/Makefile
N rebuild-scripts/mock/FC-3/.cvsignore
N rebuild-scripts/mock/FC-3/sources
N rebuild-scripts/mock/FC-3/mock.spec
N rebuild-scripts/common/branches
N rebuild-scripts/common/cvs-import.sh
N rebuild-scripts/common/Makefile
N rebuild-scripts/common/Makefile.common
N rebuild-scripts/lagan/Makefile
N rebuild-scripts/lagan/import.log
N rebuild-scripts/lagan/devel/lagan12-chris.patch
N rebuild-scripts/lagan/devel/lagan.spec
N rebuild-scripts/lagan/devel/Makefile
N rebuild-scripts/lagan/devel/.cvsignore
N rebuild-scripts/lagan/devel/sources
N rebuild-scripts/lagan/FC-4/branch
N rebuild-scripts/lagan/FC-4/lagan12-chris.patch
N rebuild-scripts/lagan/FC-4/lagan.spec
N rebuild-scripts/lagan/FC-4/Makefile
N rebuild-scripts/lagan/FC-4/.cvsignore
N rebuild-scripts/lagan/FC-4/sources
N rebuild-scripts/lagan/common/branches
N rebuild-scripts/lagan/common/cvs-import.sh
N rebuild-scripts/lagan/common/Makefile
N rebuild-scripts/lagan/common/Makefile.common
N rebuild-scripts/dist-CVSROOT/modules
N rebuild-scripts/dist-CVSROOT/checkoutlist
N rebuild-scripts/dist-CVSROOT/config
N rebuild-scripts/dist-CVSROOT/commitinfo
N rebuild-scripts/dist-CVSROOT/cvswrappers
N rebuild-scripts/dist-CVSROOT/taginfo
N rebuild-scripts/dist-CVSROOT/rcsinfo
N rebuild-scripts/dist-CVSROOT/loginfo
N rebuild-scripts/dist-CVSROOT/verifymsg
N rebuild-scripts/dist-CVSROOT/editinfo
N rebuild-scripts/dist-CVSROOT/notify
N rebuild-scripts/comps/comps-fe6.xml
N rebuild-scripts/comps/comps-fe6.xml.in
N rebuild-scripts/comps/Makefile
N rebuild-scripts/comps/update-comps
N rebuild-scripts/comps/comps-cleanup.xsl
N rebuild-scripts/comps/comps-fe5.xml
N rebuild-scripts/comps/comps-fe5.xml.in
N rebuild-scripts/comps/po/POTFILES.in
N rebuild-scripts/comps/po/Makefile
N rebuild-scripts/comps/po/comps.pot
N rebuild-scripts/rebuild-scripts/check_rebuild2
N rebuild-scripts/rebuild-scripts/gen_rebuild_lst
N rebuild-scripts/rebuild-scripts/add_owner
N rebuild-scripts/rebuild-scripts/check_rebuild
N rebuild-scripts/rebuild-scripts/check_release
N rebuild-scripts/rebuild-scripts/rm_noarch
N rebuild-scripts/rebuild-scripts/buildcheck-extras-development.repo
N rebuild-scripts/rebuild-scripts/gen_nr_2
N rebuild-scripts/rebuild-scripts/bumpspecfile.py
N rebuild-scripts/rebuild-scripts/semi_auto_rebuild.txt
N rebuild-scripts/rebuild-scripts/buildcheck
N rebuild-scripts/owners/owners.list
N rebuild-scripts/status-report-scripts/log
N rebuild-scripts/status-report-scripts/tem
N rebuild-scripts/status-report-scripts/grabBZstats
N rebuild-scripts/status-report-scripts/out
N rebuild-scripts/status-report-scripts/parseBZbugList
N rebuild-scripts/status-report-scripts/check_owners
N rebuild-scripts/status-report-scripts/bzstat.gp
N rebuild-scripts/status-report-scripts/fileBZ
N rebuild-scripts/status-report-scripts/nagmail

No conflicts created by this import




From fedora-extras-commits at redhat.com  Fri Oct  6 12:37:18 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 05:37:18 -0700
Subject: rpms/renrot/devel .cvsignore, 1.7, 1.8 renrot.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <200610061237.k96CbKXs026340@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26319

Modified Files:
	.cvsignore renrot.spec sources 
Log Message:
update to last release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2006 03:55:43 -0000	1.7
+++ .cvsignore	6 Oct 2006 12:37:18 -0000	1.8
@@ -1 +1 @@
-renrot-0.24.tar.gz
+renrot-0.25.tar.gz


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/renrot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- renrot.spec	3 Sep 2006 03:55:43 -0000	1.8
+++ renrot.spec	6 Oct 2006 12:37:18 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		renrot
-Version:	0.24
+Version:	0.25
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -72,6 +72,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-1
+- update to 0.25
+
 * Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
 - update to 0.24
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2006 03:55:43 -0000	1.7
+++ sources	6 Oct 2006 12:37:18 -0000	1.8
@@ -1 +1 @@
-b7ac294ea36bcdcf989ee7718ace781b  renrot-0.24.tar.gz
+9fcf315764b92c8e11810e95d1f19c13  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 12:57:10 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 05:57:10 -0700
Subject: rpms/gnupg2/devel gnupg-1.9.91-readline.patch, NONE, 1.1 gnupg2.spec,
	1.46, 1.47 sources, 1.13, 1.14
Message-ID: <200610061257.k96CvCh9026472@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26450

Modified Files:
	gnupg2.spec sources 
Added Files:
	gnupg-1.9.91-readline.patch 
Log Message:
* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-1
- 1.9.91


gnupg-1.9.91-readline.patch:

--- NEW FILE gnupg-1.9.91-readline.patch ---
--- gnupg-1.9.91/common/gpgrlhelp.c.readline	2006-09-22 03:01:00.000000000 -0500
+++ gnupg-1.9.91/common/gpgrlhelp.c	2006-10-05 07:40:43.000000000 -0500
@@ -31,6 +31,7 @@
 
 #ifdef HAVE_LIBREADLINE
 #define GNUPG_LIBREADLINE_H_INCLUDED
+#include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #endif


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnupg2.spec	4 Oct 2006 19:42:57 -0000	1.46
+++ gnupg2.spec	6 Oct 2006 12:57:10 -0000	1.47
@@ -11,8 +11,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.22
-Release: 8%{?dist}
+Version: 1.9.91
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -25,6 +25,8 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
+# http://lists.gnupg.org/pipermail/gnupg-devel/2006-October/023237.html
+Patch1: gnupg-1.9.91-readline.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 
 Obsoletes: newpg < 0.9.5
@@ -32,7 +34,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 0.9.0
+BuildRequires: libassuan-devel >= 0.9.2
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -77,6 +79,7 @@
 %prep
 %setup -q -n gnupg-%{version}
 
+%patch1 -p1 -b .readline
 %patch2 -p1 -b .testverbose
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
@@ -149,6 +152,8 @@
 %{_bindir}/gpgkey2ssh
 %{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
+%{_bindir}/gpgsplit
+%{_bindir}/gpg-zip
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
@@ -157,6 +162,7 @@
 %{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
+%{_mandir}/man?/*
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
@@ -166,6 +172,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-1
+- 1.9.91
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-8
 - respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Oct 2006 19:42:57 -0000	1.13
+++ sources	6 Oct 2006 12:57:10 -0000	1.14
@@ -1,3 +1,2 @@
-ccea28fbab26bcb01890f2687d71f900  gnupg-1.9.22.tar.bz2
-02ef9a70cfa097cfe11b33600adc2b72  gnupg-1.9.22.tar.bz2.sig
-916de7ac125b31c5df517c068ac51ecf  gnupg-1.9.23.tar.bz2.sig
+1f79e05ebbda709234a6488cc8f02d82  gnupg-1.9.91.tar.bz2.sig
+fb6838f6e2e26e5f00271ce588fd080b  gnupg-1.9.91.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct  6 13:04:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 06:04:37 -0700
Subject: rpms/libassuan/devel .cvsignore, 1.5, 1.6 libassuan.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <200610061305.k96D59IQ029485@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29389

Modified Files:
	.cvsignore libassuan.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-1
- 0.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Sep 2006 16:47:57 -0000	1.5
+++ .cvsignore	6 Oct 2006 13:04:36 -0000	1.6
@@ -2,3 +2,4 @@
 libassuan-0.6.10.tar.gz.sig
 libassuan-0.9.0.tar.bz2
 libassuan-0.9.0.tar.bz2.sig
+libassuan-0.9.2.tar.bz2.sig


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libassuan.spec	2 Oct 2006 17:04:38 -0000	1.17
+++ libassuan.spec	6 Oct 2006 13:04:36 -0000	1.18
@@ -1,8 +1,8 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 0.9.0
-Release: 3%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 
 License: LGPL
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
@@ -33,9 +33,9 @@
 
 
 %build
-%ifarch x86_64
+#ifarch x86_64
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-%endif
+#endif
 %configure
 
 make %{?_smp_mflags}
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-1
+- 0.9.2
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.ne> - 0.9.0-3
 - respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Sep 2006 16:47:57 -0000	1.5
+++ sources	6 Oct 2006 13:04:36 -0000	1.6
@@ -1,2 +1,2 @@
-75e621bcc49ad6726e20facf3c214394  libassuan-0.9.0.tar.bz2
-4cd66a7d4c98950a78d53f2203a3dc37  libassuan-0.9.0.tar.bz2.sig
+727926633709ba7ce9bc721c3d4c0cbc  libassuan-0.9.2.tar.bz2.sig
+dfcfa3f26d49a38534c4a9e10e3bd770  libassuan-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct  6 13:05:20 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 06:05:20 -0700
Subject: rpms/renrot/FC-5 .cvsignore, 1.7, 1.8 renrot.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610061305.k96D5M1Q029550@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29528

Modified Files:
	.cvsignore renrot.spec sources 
Log Message:
updated


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2006 03:58:50 -0000	1.7
+++ .cvsignore	6 Oct 2006 13:05:20 -0000	1.8
@@ -1 +1 @@
-renrot-0.24.tar.gz
+renrot-0.25.tar.gz


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/renrot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- renrot.spec	3 Sep 2006 03:58:50 -0000	1.7
+++ renrot.spec	6 Oct 2006 13:05:20 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		renrot
-Version:	0.24
+Version:	0.25
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -72,6 +72,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-1
+- update to 0.25
+
 * Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
 - update to 0.24
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2006 03:58:50 -0000	1.7
+++ sources	6 Oct 2006 13:05:20 -0000	1.8
@@ -1 +1 @@
-b7ac294ea36bcdcf989ee7718ace781b  renrot-0.24.tar.gz
+9fcf315764b92c8e11810e95d1f19c13  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 13:22:18 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 06:22:18 -0700
Subject: rpms/renrot/devel renrot.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <200610061322.k96DMKgw029822@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29803

Modified Files:
	renrot.spec sources 
Log Message:
fix tarball upload


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/renrot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- renrot.spec	6 Oct 2006 12:37:18 -0000	1.9
+++ renrot.spec	6 Oct 2006 13:22:17 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		renrot
 Version:	0.25
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
 Summary:	A program to rename and rotate files according to EXIF tags
@@ -72,8 +72,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
-* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-1
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-2
 - update to 0.25
+- fix tarball
 
 * Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
 - update to 0.24


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Oct 2006 12:37:18 -0000	1.8
+++ sources	6 Oct 2006 13:22:17 -0000	1.9
@@ -1 +1 @@
-9fcf315764b92c8e11810e95d1f19c13  renrot-0.25.tar.gz
+a8cc96c9ebea8ecbf76c83d2d1b2dcbe  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 13:25:26 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 06:25:26 -0700
Subject: rpms/renrot/FC-5 renrot.spec,1.8,1.9 sources,1.8,1.9
Message-ID: <200610061325.k96DPSu0029897@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29878

Modified Files:
	renrot.spec sources 
Log Message:
fix tarball upload


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/renrot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- renrot.spec	6 Oct 2006 13:05:20 -0000	1.8
+++ renrot.spec	6 Oct 2006 13:25:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		renrot
 Version:	0.25
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
 Summary:	A program to rename and rotate files according to EXIF tags
@@ -72,8 +72,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
-* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-1
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-2
 - update to 0.25
+- fix tarball
 
 * Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
 - update to 0.24


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Oct 2006 13:05:20 -0000	1.8
+++ sources	6 Oct 2006 13:25:25 -0000	1.9
@@ -1 +1 @@
-9fcf315764b92c8e11810e95d1f19c13  renrot-0.25.tar.gz
+a8cc96c9ebea8ecbf76c83d2d1b2dcbe  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 13:27:54 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 06:27:54 -0700
Subject: rpms/renrot/FC-4 .cvsignore, 1.5, 1.6 renrot.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200610061327.k96DRuB3029973@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29952

Modified Files:
	.cvsignore renrot.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Jul 2006 06:00:39 -0000	1.5
+++ .cvsignore	6 Oct 2006 13:27:54 -0000	1.6
@@ -1 +1 @@
-renrot-0.22.tar.gz
+renrot-0.25.tar.gz


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-4/renrot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- renrot.spec	18 Jul 2006 06:00:39 -0000	1.5
+++ renrot.spec	6 Oct 2006 13:27:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		renrot
-Version:	0.22
-Release:	1.0%{?dist}
+Version:	0.25
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
 Summary:	A program to rename and rotate files according to EXIF tags
@@ -41,6 +41,7 @@
 
 # install sample confuration files
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install -m644 etc/colors.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -m644 etc/copyright.tag $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -m644 etc/renrot.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -m644 etc/tags.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -65,11 +66,25 @@
 %{_bindir}/renrot
 %{_mandir}/man1/*.1*
 %dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/colors.conf
 %config(noreplace) %{_sysconfdir}/%{name}/copyright.tag
 %config(noreplace) %{_sysconfdir}/%{name}/renrot.conf
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-2
+- update to 0.25
+- fix tarball
+
+* Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
+- update to 0.24
+
+* Tue Aug 22 2006 Andy Shevchenko <andy at smile.org.ua>
+- add colors.conf
+
+* Sat Aug 19 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.23-1
+- update to 0.23
+
 * Tue Jul 18 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.22-1.0
 - update to 0.22
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jul 2006 06:00:39 -0000	1.5
+++ sources	6 Oct 2006 13:27:54 -0000	1.6
@@ -1 +1 @@
-1df68b01b59f9150aaaebb71091cbc4d  renrot-0.22.tar.gz
+a8cc96c9ebea8ecbf76c83d2d1b2dcbe  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 13:40:48 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 06:40:48 -0700
Subject: owners owners.list,1.1784,1.1785
Message-ID: <200610061340.k96DeooI030089@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30072

Modified Files:
	owners.list 
Log Message:

Added alsa-oss (BZ#209144)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1784
retrieving revision 1.1785
diff -u -r1.1784 -r1.1785
--- owners.list	6 Oct 2006 09:41:30 -0000	1.1784
+++ owners.list	6 Oct 2006 13:40:48 -0000	1.1785
@@ -41,6 +41,7 @@
 Fedora Extras|alleyoop|Graphical front-end to the Valgrind memory checker|giallu at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|alltray|Dock any application in the tray|denis at poolshark.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|alsa-oss|Advanced Linux Sound Architecture (ALSA) wrapper for OSS|jima at beer.tclug.org|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de
 Fedora Extras|alsamixergui|GUI mixer for ALSA sound devices|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|altermime|Alter MIME-encoded mailpacks|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 13:50:40 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 06:50:40 -0700
Subject: rpms/alsa-oss/devel - New directory
Message-ID: <200610061350.k96DogRC030234@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30220/devel

Log Message:
Directory /cvs/extras/rpms/alsa-oss/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 14:10:31 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 07:10:31 -0700
Subject: rpms/alsa-oss/devel Makefile,NONE,1.1
Message-ID: <200610061410.k96EAXBJ000926@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv910/devel

Added Files:
	Makefile 
Log Message:

Weird b0rkage



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Fri Oct  6 14:11:15 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 07:11:15 -0700
Subject: rpms/alsa-oss/devel alsa-oss-1.0.12-aoss.patch, NONE,
	1.1 alsa-oss.spec, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610061411.k96EBH28001006@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv976/devel

Added Files:
	alsa-oss-1.0.12-aoss.patch alsa-oss.spec sources 
Log Message:
auto-import alsa-oss-1.0.12-3.fc6 on branch devel from alsa-oss-1.0.12-3.fc6.src.rpm

alsa-oss-1.0.12-aoss.patch:

--- NEW FILE alsa-oss-1.0.12-aoss.patch ---
--- alsa/aoss.in.orig	2005-10-27 14:34:18.000000000 -0400
+++ alsa/aoss.in	2006-04-02 15:53:53.000000000 -0400
@@ -5,9 +5,7 @@
 #	aoss <command> <command options and arguments>
 
 if [ -d /proc/asound ]; then
-  prefix=@prefix@
-  exec_prefix=@exec_prefix@
-  LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
+  LD_PRELOAD=@libdir@/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
 else
   exec "$@"
 fi


--- NEW FILE alsa-oss.spec ---
Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
Name:		alsa-oss
Version:	1.0.12
Release:	3%{?dist}
License:	GPL
Group:		Applications/Multimedia
URL:		http://www.alsa-project.org/
Source:		ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2
Patch:		%{name}-%{version}-aoss.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	alsa-lib-devel >= %{version}
%ifarch x86_64
BuildRequires:	automake, libtool
%endif

%description
This package contains the compatibility library and wrapper script for
running legacy OSS applications through ALSA. Unlike the kernel
driver, this has the advantage of supporting DMIX software mixing.

%package devel
Summary:	Headers for ALSA wrapper for OSS
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
%description devel
Header files for alsa-oss.

%prep
%setup -q
%patch0

%build
%ifarch x86_64
autoreconf -f -i
%endif
%configure \
%ifarch x86_64
	--disable-rpath \
%endif
	--disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/aoss
%{_libdir}/*.so.*
%{_mandir}/man?/*

%files devel
%defattr(-,root,root,-)
%doc oss-redir/README
%{_includedir}/*
%{_libdir}/*.a
%{_libdir}/*.so


%changelog
* Fri Oct 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-3
- Added conditionalized rpath fixes for x86_64 (thanks Denis!)
- Re-added *.a to -devel package
- Added %%defattr for -devel, added oss-redir/README as %%doc

* Thu Oct 05 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-2
- Adding --disable-static to configure
- Removing *.a from -devel package
- Adding name and version to patch
- Removing commented-out autoreconf line
- Forcibly deleting *.a files in %%install (why didn't it believe me?)

* Tue Oct 03 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-1
- Hijacked from stalled review (BZ#187706)
- Bumped to 1.0.12 for devel branch
- Removed Req for /sbin/ldconfig (unnecessary when using -p in scriptlets)
- Added dist tag!
- Made macros slightly more consistent
- Deleted .la files in %%install

* Sun Apr  2 2006 Michel Salim <michel.salim at gmail.com> 1.0.11-1.rc3
- Initial build.


--- NEW FILE sources ---
d4d18bbf63a866d6e065b90e16acd676  alsa-oss-1.0.12.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct  6 14:11:15 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 07:11:15 -0700
Subject: rpms/alsa-oss import.log,1.2,1.3
Message-ID: <200610061411.k96EBlvu001014@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv976

Modified Files:
	import.log 
Log Message:
auto-import alsa-oss-1.0.12-3.fc6 on branch devel from alsa-oss-1.0.12-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alsa-oss/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Nov 2004 04:01:49 -0000	1.2
+++ import.log	6 Oct 2006 14:11:14 -0000	1.3
@@ -1 +1,2 @@
 alsa-oss-1_0_4-0_fdr_1_1:HEAD:alsa-oss-1.0.4-0.fdr.1.1.src.rpm:1099886509
+alsa-oss-1_0_12-3_fc6:HEAD:alsa-oss-1.0.12-3.fc6.src.rpm:1160143869



From fedora-extras-commits at redhat.com  Fri Oct  6 14:23:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:23:17 -0700
Subject: rpms/plib/devel plib-1.8.4-autorepeat.patch, NONE, 1.1 plib.spec,
	1.15, 1.16
Message-ID: <200610061423.k96ENJ2c001161@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/plib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1141

Modified Files:
	plib.spec 
Added Files:
	plib-1.8.4-autorepeat.patch 
Log Message:
* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-8
- Fix keypresses sometimes getting lost by alternative (better) keyboard
  autorepeat support
- Cleanup specfile


plib-1.8.4-autorepeat.patch:

--- NEW FILE plib-1.8.4-autorepeat.patch ---
--- plib-1.8.4/src/pw/pwX11.cxx.key	2006-10-05 19:56:42.000000000 +0200
+++ plib-1.8.4/src/pw/pwX11.cxx	2006-10-05 20:04:19.000000000 +0200
@@ -117,11 +117,19 @@
 static XTextProperty *titlePropertyPtr = NULL;
 
 static bool autoRepeat = false ;
+static bool haveFocus = false ;
 
 static void getEvents ();
 
 void pwSetAutoRepeatKey ( bool enable )
 {
+  if ( (autoRepeat != enable) && haveFocus )
+  {
+    if ( enable )
+      XAutoRepeatOn ( currDisplay ) ;
+    else
+      XAutoRepeatOff ( currDisplay ) ;
+  }
   autoRepeat = enable ;
 }
 
@@ -351,7 +359,7 @@
                        KeyPressMask        | KeyReleaseMask       |
 		       EnterWindowMask     | LeaveWindowMask      |
                        PointerMotionMask   | ButtonMotionMask     |
-                       VisibilityChangeMask ;
+                       VisibilityChangeMask| FocusChangeMask;
 
   attribs.background_pixmap = None ;
   attribs.background_pixel  = 0    ;
@@ -405,6 +413,10 @@
   XMapWindow       ( currDisplay, wmWindow ) ;
   glXMakeCurrent   ( currDisplay, currHandle, currContext ) ;
 
+  haveFocus = true;
+  if (!autoRepeat)
+    XAutoRepeatOff ( currDisplay ) ;
+
   pwSetCursor ( PW_CURSOR_LEFT ) ;
 
 #ifdef GL_MULTISAMPLE_FILTER_HINT_NV
@@ -717,8 +729,6 @@
 
 static void getEvents ()
 {
-  bool repeating = false ;
-  char keyflags [ 32 ] ;
   XEvent event ;
 
   insideCallback = true ;
@@ -770,6 +780,18 @@
           (*mpCB) ( event.xmotion.x, event.xmotion.y ) ;
         break ;
 
+      case FocusIn:
+        if ( !haveFocus && !autoRepeat )
+          XAutoRepeatOff ( currDisplay ) ;
+        haveFocus = true;
+        break;
+
+      case FocusOut:
+        if ( haveFocus && !autoRepeat )
+          XAutoRepeatOn ( currDisplay ) ;
+        haveFocus = false;
+        break;
+
       case ButtonRelease   :
         updown = PW_UP ;
         /* FALLTHROUGH */
@@ -792,23 +814,9 @@
 
       case KeyRelease      :
         updown = PW_UP ;
-
-        XQueryKeymap ( currDisplay, keyflags ) ;
-
-        repeating = ( ( keyflags [ event.xkey.keycode >> 3 ] &
-                          ( 1 << ( event.xkey.keycode & 7 ) ) ) != 0 ) ;
-
         /* FALLTHROUGH */
 
       case KeyPress        :
-        /*
-          Only generate a key up callback if the key is actually up
-          and not repeating.
-        */
-
-        if ( ! autoRepeat && repeating )
-          break ;
-
         XComposeStatus composeStatus ;
         char           asciiCode [ 32 ] ;
         KeySym         keySym ;
@@ -1021,10 +1029,14 @@
   if ( fsWindow != None )
     pwSetWindowed ( ) ;
 
+  if ( haveFocus && !autoRepeat )
+    XAutoRepeatOn ( currDisplay ) ;
+
   glXDestroyContext ( currDisplay, currContext ) ;
   XDestroyWindow    ( currDisplay, currHandle  ) ;
   XDestroyWindow    ( currDisplay, wmWindow    ) ;
   XCloseDisplay     ( currDisplay ) ;
+  haveFocus = false;
   currDisplay = NULL;
 }
 


Index: plib.spec
===================================================================
RCS file: /cvs/extras/rpms/plib/devel/plib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plib.spec	29 Aug 2006 05:58:00 -0000	1.15
+++ plib.spec	6 Oct 2006 14:23:16 -0000	1.16
@@ -1,18 +1,18 @@
-Summary: Set of portable libraries especially useful for games
-Name: plib
-Version: 1.8.4
-Release: 7%{?dist}
-License: LGPL
-Group: System Environment/Libraries
-URL: http://plib.sourceforge.net/
-Source: http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
-Patch0: plib-1.8.4-extraqualif.patch
-Patch1: plib-1.8.4-fullscreen.patch
-Patch2: plib-1.8.4-js.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, freeglut-devel, libpng-devel
-BuildRequires: libXext-devel, libXi-devel, libXmu-devel, libSM-devel
-Buildrequires: libXxf86vm-devel libXt-devel
+Name:           plib
+Version:        1.8.4
+Release:        8%{?dist}
+Summary:        Set of portable libraries especially useful for games
+Group:          System Environment/Libraries
+License:        LGPL
+URL:            http://plib.sourceforge.net/
+Source:         http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
+Patch0:         plib-1.8.4-extraqualif.patch
+Patch1:         plib-1.8.4-fullscreen.patch
+Patch2:         plib-1.8.4-js.patch
+Patch3:         plib-1.8.4-autorepeat.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  freeglut-devel libpng-devel libXext-devel libXi-devel
+Buildrequires:  libXmu-devel libSM-devel libXxf86vm-devel
 
 %description
 This is a set of OpenSource (LGPL) libraries that will permit programmers
@@ -23,10 +23,10 @@
 
 
 %package devel
-Summary: Set of portable libraries especially useful for games
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libGL-devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libGL-devel
 
 %description devel
 This package contains the header files and libraries needed to write
@@ -38,13 +38,14 @@
 %patch0 -p1 -b .extraqualif
 %patch1 -p1 -b .fs
 %patch2 -p1 -b .js
+%patch3 -p1 -b .autorepeat
 # for some reason this file has its x permission sets, which makes rpmlint cry
 chmod -x src/sg/sgdIsect.cxx
 
 
 %build
-%configure CXXFLAGS="%{optflags} -fPIC -DXF86VIDMODE"
-%{__make} %{?_smp_mflags} 
+%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DXF86VIDMODE"
+make %{?_smp_mflags} 
 # and below is a somewhat dirty hack inspired by debian to build shared libs
 # instead of static. Notice that the adding of -fPIC to CXXFLAGS above is part
 # of the hack.
@@ -75,16 +76,16 @@
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 # we don't want the static libs
-%{__rm} %{buildroot}%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 # instead do a DIY install of the shared libs we created
-%{__cp} -a `find . -name "libplib*.so*"` %{buildroot}%{_libdir}
+cp -a `find . -name "libplib*.so*"` $RPM_BUILD_ROOT%{_libdir}
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -93,17 +94,22 @@
 
 
 %files
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NOTICE README
 %{_libdir}/libplib*.so.%{version}
 
 %files devel
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libplib*.so
 
 
 %changelog
+* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-8
+- Fix keypresses sometimes getting lost by alternative (better) keyboard
+  autorepeat support
+- Cleanup specfile
+
 * Tue Aug 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-7
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Fri Oct  6 14:24:04 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:24:04 -0700
Subject: rpms/plib/FC-5 plib-1.8.4-autorepeat.patch, NONE, 1.1 plib.spec,
	1.12, 1.13
Message-ID: <200610061424.k96EO6uA001234@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/plib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1214

Modified Files:
	plib.spec 
Added Files:
	plib-1.8.4-autorepeat.patch 
Log Message:
* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-8
- Fix keypresses sometimes getting lost by alternative (better) keyboard
  autorepeat support
- Cleanup specfile


plib-1.8.4-autorepeat.patch:

--- NEW FILE plib-1.8.4-autorepeat.patch ---
--- plib-1.8.4/src/pw/pwX11.cxx.key	2006-10-05 19:56:42.000000000 +0200
+++ plib-1.8.4/src/pw/pwX11.cxx	2006-10-05 20:04:19.000000000 +0200
@@ -117,11 +117,19 @@
 static XTextProperty *titlePropertyPtr = NULL;
 
 static bool autoRepeat = false ;
+static bool haveFocus = false ;
 
 static void getEvents ();
 
 void pwSetAutoRepeatKey ( bool enable )
 {
+  if ( (autoRepeat != enable) && haveFocus )
+  {
+    if ( enable )
+      XAutoRepeatOn ( currDisplay ) ;
+    else
+      XAutoRepeatOff ( currDisplay ) ;
+  }
   autoRepeat = enable ;
 }
 
@@ -351,7 +359,7 @@
                        KeyPressMask        | KeyReleaseMask       |
 		       EnterWindowMask     | LeaveWindowMask      |
                        PointerMotionMask   | ButtonMotionMask     |
-                       VisibilityChangeMask ;
+                       VisibilityChangeMask| FocusChangeMask;
 
   attribs.background_pixmap = None ;
   attribs.background_pixel  = 0    ;
@@ -405,6 +413,10 @@
   XMapWindow       ( currDisplay, wmWindow ) ;
   glXMakeCurrent   ( currDisplay, currHandle, currContext ) ;
 
+  haveFocus = true;
+  if (!autoRepeat)
+    XAutoRepeatOff ( currDisplay ) ;
+
   pwSetCursor ( PW_CURSOR_LEFT ) ;
 
 #ifdef GL_MULTISAMPLE_FILTER_HINT_NV
@@ -717,8 +729,6 @@
 
 static void getEvents ()
 {
-  bool repeating = false ;
-  char keyflags [ 32 ] ;
   XEvent event ;
 
   insideCallback = true ;
@@ -770,6 +780,18 @@
           (*mpCB) ( event.xmotion.x, event.xmotion.y ) ;
         break ;
 
+      case FocusIn:
+        if ( !haveFocus && !autoRepeat )
+          XAutoRepeatOff ( currDisplay ) ;
+        haveFocus = true;
+        break;
+
+      case FocusOut:
+        if ( haveFocus && !autoRepeat )
+          XAutoRepeatOn ( currDisplay ) ;
+        haveFocus = false;
+        break;
+
       case ButtonRelease   :
         updown = PW_UP ;
         /* FALLTHROUGH */
@@ -792,23 +814,9 @@
 
       case KeyRelease      :
         updown = PW_UP ;
-
-        XQueryKeymap ( currDisplay, keyflags ) ;
-
-        repeating = ( ( keyflags [ event.xkey.keycode >> 3 ] &
-                          ( 1 << ( event.xkey.keycode & 7 ) ) ) != 0 ) ;
-
         /* FALLTHROUGH */
 
       case KeyPress        :
-        /*
-          Only generate a key up callback if the key is actually up
-          and not repeating.
-        */
-
-        if ( ! autoRepeat && repeating )
-          break ;
-
         XComposeStatus composeStatus ;
         char           asciiCode [ 32 ] ;
         KeySym         keySym ;
@@ -1021,10 +1029,14 @@
   if ( fsWindow != None )
     pwSetWindowed ( ) ;
 
+  if ( haveFocus && !autoRepeat )
+    XAutoRepeatOn ( currDisplay ) ;
+
   glXDestroyContext ( currDisplay, currContext ) ;
   XDestroyWindow    ( currDisplay, currHandle  ) ;
   XDestroyWindow    ( currDisplay, wmWindow    ) ;
   XCloseDisplay     ( currDisplay ) ;
+  haveFocus = false;
   currDisplay = NULL;
 }
 


Index: plib.spec
===================================================================
RCS file: /cvs/extras/rpms/plib/FC-5/plib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plib.spec	10 Jun 2006 13:27:39 -0000	1.12
+++ plib.spec	6 Oct 2006 14:24:04 -0000	1.13
@@ -1,18 +1,18 @@
-Summary: Set of portable libraries especially useful for games
-Name: plib
-Version: 1.8.4
-Release: 6%{?dist}
-License: LGPL
-Group: System Environment/Libraries
-URL: http://plib.sourceforge.net/
-Source: http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
-Patch0: plib-1.8.4-extraqualif.patch
-Patch1: plib-1.8.4-fullscreen.patch
-Patch2: plib-1.8.4-js.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, freeglut-devel, libpng-devel
-BuildRequires: libXext-devel, libXi-devel, libXmu-devel, libSM-devel
-Buildrequires: libXxf86vm-devel libXt-devel
+Name:           plib
+Version:        1.8.4
+Release:        8%{?dist}
+Summary:        Set of portable libraries especially useful for games
+Group:          System Environment/Libraries
+License:        LGPL
+URL:            http://plib.sourceforge.net/
+Source:         http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
+Patch0:         plib-1.8.4-extraqualif.patch
+Patch1:         plib-1.8.4-fullscreen.patch
+Patch2:         plib-1.8.4-js.patch
+Patch3:         plib-1.8.4-autorepeat.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  freeglut-devel libpng-devel libXext-devel libXi-devel
+Buildrequires:  libXmu-devel libSM-devel libXxf86vm-devel
 
 %description
 This is a set of OpenSource (LGPL) libraries that will permit programmers
@@ -23,10 +23,10 @@
 
 
 %package devel
-Summary: Set of portable libraries especially useful for games
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libGL-devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libGL-devel
 
 %description devel
 This package contains the header files and libraries needed to write
@@ -38,13 +38,14 @@
 %patch0 -p1 -b .extraqualif
 %patch1 -p1 -b .fs
 %patch2 -p1 -b .js
+%patch3 -p1 -b .autorepeat
 # for some reason this file has its x permission sets, which makes rpmlint cry
 chmod -x src/sg/sgdIsect.cxx
 
 
 %build
-%configure CXXFLAGS="%{optflags} -fPIC -DXF86VIDMODE"
-%{__make} %{?_smp_mflags} 
+%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DXF86VIDMODE"
+make %{?_smp_mflags} 
 # and below is a somewhat dirty hack inspired by debian to build shared libs
 # instead of static. Notice that the adding of -fPIC to CXXFLAGS above is part
 # of the hack.
@@ -75,16 +76,16 @@
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 # we don't want the static libs
-%{__rm} %{buildroot}%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 # instead do a DIY install of the shared libs we created
-%{__cp} -a `find . -name "libplib*.so*"` %{buildroot}%{_libdir}
+cp -a `find . -name "libplib*.so*"` $RPM_BUILD_ROOT%{_libdir}
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -93,17 +94,25 @@
 
 
 %files
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NOTICE README
 %{_libdir}/libplib*.so.%{version}
 
 %files devel
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libplib*.so
 
 
 %changelog
+* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-8
+- Fix keypresses sometimes getting lost by alternative (better) keyboard
+  autorepeat support
+- Cleanup specfile
+
+* Tue Aug 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-7
+- FE6 Rebuild
+
 * Sat Jun 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-6
 - Remove use of conditional BuildReqs dependent on %%fedora, this breaks
   when people try to rebuild the SRPM and don't have %fedora defined.



From fedora-extras-commits at redhat.com  Fri Oct  6 14:34:37 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:34:37 -0700
Subject: rpms/supertuxkart - New directory
Message-ID: <200610061434.k96EYdxu001400@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1379/supertuxkart

Log Message:
Directory /cvs/extras/rpms/supertuxkart added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 14:34:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:34:38 -0700
Subject: rpms/supertuxkart/devel - New directory
Message-ID: <200610061434.k96EYetb001403@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1379/supertuxkart/devel

Log Message:
Directory /cvs/extras/rpms/supertuxkart/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 14:34:57 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:34:57 -0700
Subject: rpms/supertuxkart Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610061434.k96EYxJn001459@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1426

Added Files:
	Makefile import.log 
Log Message:
Setup of module supertuxkart


--- NEW FILE Makefile ---
# Top level Makefile for module supertuxkart
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 14:34:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:34:58 -0700
Subject: rpms/supertuxkart/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610061435.k96EZ0A4001462@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1426/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module supertuxkart


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 14:36:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:36:10 -0700
Subject: owners owners.list,1.1785,1.1786
Message-ID: <200610061436.k96EaCeL001567@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1550

Modified Files:
	owners.list 
Log Message:
added supertuxkart


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1785
retrieving revision 1.1786
diff -u -r1.1785 -r1.1786
--- owners.list	6 Oct 2006 13:40:48 -0000	1.1785
+++ owners.list	6 Oct 2006 14:36:10 -0000	1.1786
@@ -2078,6 +2078,7 @@
 Fedora Extras|sunifdef|A commandline tool for simplifying the preprocessor conditionals in source code|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|superkaramba|Custom content on the desktop|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
+Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 14:37:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:37:01 -0700
Subject: rpms/supertuxkart import.log,1.1,1.2
Message-ID: <200610061437.k96Eb357001630@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586

Modified Files:
	import.log 
Log Message:
auto-import supertuxkart-0.2-3.fc6 on branch devel from supertuxkart-0.2-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 14:34:57 -0000	1.1
+++ import.log	6 Oct 2006 14:37:01 -0000	1.2
@@ -0,0 +1 @@
+supertuxkart-0_2-3_fc6:HEAD:supertuxkart-0.2-3.fc6.src.rpm:1160145502



From fedora-extras-commits at redhat.com  Fri Oct  6 14:37:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:37:02 -0700
Subject: rpms/supertuxkart/devel supertuxkart-0.2-gpmenu.patch, NONE,
	1.1 supertuxkart-0.2-joy1.patch, NONE,
	1.1 supertuxkart-0.2-joy2.patch, NONE,
	1.1 supertuxkart-0.2-joy3.patch, NONE,
	1.1 supertuxkart-fhs.patch, NONE,
	1.1 supertuxkart-fullscreen.patch, NONE,
	1.1 supertuxkart-images-legal.txt, NONE,
	1.1 supertuxkart-nomnm.patch, NONE, 1.1 supertuxkart.6, NONE,
	1.1 supertuxkart.desktop, NONE, 1.1 supertuxkart.png, NONE,
	1.1 supertuxkart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610061437.k96Eb4A4001649@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586/devel

Modified Files:
	.cvsignore sources 
Added Files:
	supertuxkart-0.2-gpmenu.patch supertuxkart-0.2-joy1.patch 
	supertuxkart-0.2-joy2.patch supertuxkart-0.2-joy3.patch 
	supertuxkart-fhs.patch supertuxkart-fullscreen.patch 
	supertuxkart-images-legal.txt supertuxkart-nomnm.patch 
	supertuxkart.6 supertuxkart.desktop supertuxkart.png 
	supertuxkart.spec 
Log Message:
auto-import supertuxkart-0.2-3.fc6 on branch devel from supertuxkart-0.2-3.fc6.src.rpm

supertuxkart-0.2-gpmenu.patch:

--- NEW FILE supertuxkart-0.2-gpmenu.patch ---
--- supertuxkart-0.2/src/gui/grand_prix_select.cpp~	2006-10-06 14:52:51.000000000 +0200
+++ supertuxkart-0.2/src/gui/grand_prix_select.cpp	2006-10-06 14:52:51.000000000 +0200
@@ -43,13 +43,15 @@
       std::string fullPath= "data/" + (std::string)*i;
       CupData *cup = new CupData(fullPath.c_str());
       allCups.push_back(cup);
-      int tmp=widgetSet -> state(menu_id, cup->getName().c_str(), GUI_SML, nId, 0);
-      if(nId==0) widgetSet->set_active(tmp);
+      if(nId==0)
+        widgetSet -> start(menu_id, cup->getName().c_str(), GUI_SML, nId, 0);
+      else
+        widgetSet -> state(menu_id, cup->getName().c_str(), GUI_SML, nId, 0);
       nId++;
     }   // if
   }   // for i
   widgetSet -> space(menu_id);
-  widgetSet -> start(menu_id,"Press <ESC> to go back", GUI_SML, -1);
+  widgetSet -> state(menu_id,"Press <ESC> to go back", GUI_SML, -1);
   widgetSet -> layout(menu_id, 0, 0);
   rect = widgetSet->rect(10, 10, config->width-20, 34, GUI_ALL, 10);
 }   // GrandPrixSelect

supertuxkart-0.2-joy1.patch:

--- NEW FILE supertuxkart-0.2-joy1.patch ---
--- supertuxkart-0.2/src/gui/race_gui.cpp.joy1	2006-10-06 11:25:23.000000000 +0200
+++ supertuxkart-0.2/src/gui/race_gui.cpp	2006-10-06 11:25:23.000000000 +0200
@@ -144,24 +144,6 @@
 } // keybd
 
 // -----------------------------------------------------------------------------
-void RaceGUI::stick(const int &whichAxis, const float &value){
-  KartControl controls;
-  controls.data[whichAxis] = value;
-  assert(world != NULL);
-  world -> getPlayerKart(0) -> incomingJoystick ( controls );
-}   // stick
-
-// -----------------------------------------------------------------------------
-void RaceGUI::joybuttons( int whichJoy, int hold, int presses, int releases ) {
-  KartControl controls;
-  controls.buttons = hold;
-  controls.presses = presses;
-  controls.releases = releases;
-  assert(world != NULL);
-  world -> getPlayerKart(whichJoy) -> incomingJoystick ( controls );
-}   // joybuttons
-
-// -----------------------------------------------------------------------------
 void RaceGUI::drawFPS () {
   if (++fpsCounter>=50) {
     fpsTimer.update();
--- supertuxkart-0.2/src/gui/race_gui.hpp.joy1	2006-09-07 12:08:13.000000000 +0200
+++ supertuxkart-0.2/src/gui/race_gui.hpp	2006-10-06 11:25:23.000000000 +0200
@@ -42,8 +42,6 @@
   void select() {}
   void keybd(int key);
   void point(int x, int y) { (void)x; (void)y; }
-  void stick     (const int &whichAxis, const float &value) ;
-  void joybuttons(int whichJoy, int hold, int presses, int releases ) ;
 
 private:
     ulClock   fpsTimer;
--- supertuxkart-0.2/src/plibdrv.cpp.joy1	2006-10-06 11:25:23.000000000 +0200
+++ supertuxkart-0.2/src/plibdrv.cpp	2006-10-06 11:30:25.000000000 +0200
@@ -27,6 +27,7 @@
 
 #include "gui/menu_manager.hpp"
 #include "kart_control.hpp"
+#include "world.hpp"
 
 /*********************************\
 *                                 *
@@ -79,13 +80,21 @@
       static KartControl controls;
       int prev_buttons = controls.buttons;
       joystick->read ( &controls.buttons, controls.data) ;
-      menu->stick( 0, controls.data[0]);
-      menu->stick( 1, controls.data[1]);
 
       int changed_states = prev_buttons ^ controls.buttons;
       controls.presses = controls.buttons & changed_states;
       controls.releases = !controls.buttons & changed_states;
-      menu->joybuttons(0, controls.buttons, controls.presses, controls.releases);
+      
+      if ( menu_manager->isCurrentMenu( MENUID_RACE ) )
+      {
+        world -> getPlayerKart(0) -> incomingJoystick ( controls );
+      }
+      else
+      {
+        menu->stick( 0, controls.data[0]);
+        menu->stick( 1, controls.data[1]);
+        menu->joybuttons(0, controls.buttons, controls.presses, controls.releases);
+      }
     }
   }
 }

supertuxkart-0.2-joy2.patch:

--- NEW FILE supertuxkart-0.2-joy2.patch ---
--- supertuxkart-0.2/src/player_kart.cpp~	2006-10-06 11:34:44.000000000 +0200
+++ supertuxkart-0.2/src/player_kart.cpp	2006-10-06 13:48:28.000000000 +0200
@@ -30,13 +30,16 @@
 // -----------------------------------------------------------------------------
 void PlayerKart::incomingJoystick  (const KartControl &ctrl) {
   //Steering keys(hold)
-  controls.lr      = -ctrl.data[0];
-  joystickWasMoved = fabsf(controls.lr)>0.01;
-  controls.accel   = -ctrl.data[1];
-  controls.brake   = player->getButton(KC_BRAKE)   & ctrl.buttons;
-  controls.wheelie = player->getButton(KC_WHEELIE) & ctrl.buttons;
+  joystickWasMoved = fabsf(ctrl.data[0])>0.01;
+  if ( joystickWasMoved )
+    controls.lr      = -ctrl.data[0];
+
+  if (fabsf(ctrl.data[1])>0.01)
+    controls.accel   = -ctrl.data[1];
 
   //One time press keys; these are cleared each frame so we don't have to
+  if (player->getButton(KC_BRAKE)  & ctrl.presses) controls.brake  = true;
+  if (player->getButton(KC_WHEELIE)& ctrl.presses) controls.wheelie= true;
   if (player->getButton(KC_RESCUE) & ctrl.presses) controls.rescue = true;
   if (player->getButton(KC_FIRE)   & ctrl.presses) controls.fire   = true;
   if (player->getButton(KC_JUMP)   & ctrl.presses) controls.jump   = true;
@@ -46,7 +49,9 @@
 // Only keys which must keep on working when still being pressed
 // are handled here, not 'one time action' keys like fire, ...
 void PlayerKart::handleKeyboard(float dt) {
-
+// Joystick steering values take precedence over keyboard, only
+// do the keyboard handling if joystick wasn't moved.
+if ( !joystickWasMoved ) {
   if(!config->newKeyboardStyle) {
     controls.lr = isKeyDown(player->getKey(KC_LEFT))  ?  1.0f 
                 : isKeyDown(player->getKey(KC_RIGHT)) ? -1.0f : 0.0f;
@@ -66,6 +71,7 @@
   }   // not old steering
     // clamp control value to be within  [-1,1]
   controls.lr = std::min(1.0f, std::max(-1.0f, controls.lr));
+}
 
   if(isKeyDown(player->getKey(KC_ACCEL)))   controls.accel   =  1.0f;
   if(isKeyDown(player->getKey(KC_BRAKE)))   controls.brake   =  true;
@@ -88,9 +94,7 @@
 
 // -----------------------------------------------------------------------------
 void PlayerKart::update(float dt) {
-  // Joystick values takes precedence over keyboard, only
-  // do the keyboard handling if joystick wasn't moved.
-  if(!joystickWasMoved) handleKeyboard(dt);
+  handleKeyboard(dt);
 
   if(world->getPhase()==World::START_PHASE) {
     if(controls.lr!=0.0 || controls.accel!=0.0 || controls.brake!=false ||

supertuxkart-0.2-joy3.patch:

--- NEW FILE supertuxkart-0.2-joy3.patch ---
--- supertuxkart-0.2/src/gui/main_menu.cpp~	2006-10-06 13:57:17.000000000 +0200
+++ supertuxkart-0.2/src/gui/main_menu.cpp	2006-10-06 13:57:17.000000000 +0200
@@ -99,4 +99,16 @@
 	}
 }
 
+void MainMenu::joybuttons( int whichJoy, int hold, int presses, int releases ) {
+  (void)whichJoy; (void)hold; (void)releases;
+
+  if( presses & 2 ) {
+    select();
+  }
+
+  if (presses & 1) {
+    menu_manager->pushMenu(MENUID_EXITGAME);
+  }
+}
+
 /* EOF */
--- supertuxkart-0.2/src/gui/main_menu.hpp~	2006-10-06 13:57:13.000000000 +0200
+++ supertuxkart-0.2/src/gui/main_menu.hpp	2006-10-06 13:57:13.000000000 +0200
@@ -30,6 +30,7 @@
 
 	void select();
 	void keybd(int key);
+	void joybuttons( int whichJoy, int hold, int presses, int releases );
 };
 
 #endif

supertuxkart-fhs.patch:

--- NEW FILE supertuxkart-fhs.patch ---
--- supertuxkart-0.2/src/Makefile.am.aap	2006-09-24 21:20:17.000000000 +0200
+++ supertuxkart-0.2/src/Makefile.am	2006-09-24 21:20:21.000000000 +0200
@@ -23,7 +23,7 @@
 libstatic_ssg_a_SOURCES  = static_ssg.cpp static_ssg.hpp
 libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
 
-AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
+AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
 supertuxkart_SOURCES =             main.cpp  			\
 	material.cpp		   material.hpp           	\
 	material_manager.cpp	   material_manager.hpp    	\
--- supertuxkart-0.2/src/Makefile.in.aap	2006-09-24 21:20:26.000000000 +0200
+++ supertuxkart-0.2/src/Makefile.in	2006-09-24 21:20:37.000000000 +0200
@@ -220,7 +220,7 @@
 noinst_LIBRARIES = libstatic_ssg.a
 libstatic_ssg_a_SOURCES = static_ssg.cpp static_ssg.hpp
 libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
+AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
 supertuxkart_SOURCES = main.cpp  			\
 	material.cpp		   material.hpp           	\
 	material_manager.cpp	   material_manager.hpp    	\

supertuxkart-fullscreen.patch:

--- NEW FILE supertuxkart-fullscreen.patch ---
--- supertuxkart-0.2/src/plibdrv.cpp.aap	2006-09-24 20:57:17.000000000 +0200
+++ supertuxkart-0.2/src/plibdrv.cpp	2006-09-24 21:06:54.000000000 +0200
@@ -37,6 +37,11 @@
 \*********************************/
 
 void keyfn ( int key, int updown, int, int ) {
+  if ( (updown == PW_DOWN) && (key == '\r') && (pwGetModifiers() & PW_ALT) )
+  {
+    pwToggleFullscreen () ;
+    return;
+  }
   puKeyboard ( key, updown ) ;
 }
 
@@ -91,7 +96,13 @@
 
 void keystroke ( int key, int updown, int, int ) {
   if ( updown == PW_DOWN )
+  {
+    if ( (key == '\r') && (pwGetModifiers() & PW_ALT) ) {
+      pwToggleFullscreen () ;
+      return;
+    }
     lastKeystroke = key ;
+  }
 
   keyIsDown [ key ] = (updown == PW_DOWN) ;
 }
@@ -122,6 +133,8 @@
 void InitPlib() {
   pwInit ( 0, 0, config->width, config->height,
 	   FALSE, "Super Tux Kart", TRUE, 0 ) ;
+  pwSetResizable ( FALSE );
+  pwSetFullscreen () ;
 
   puInit () ;
   ssgInit () ;
--- supertuxkart-0.2/src/gui/race_gui.cpp.noot	2006-09-24 22:01:07.000000000 +0200
+++ supertuxkart-0.2/src/gui/race_gui.cpp	2006-09-24 22:01:13.000000000 +0200
@@ -55,12 +55,16 @@
   fpsTimer.reset();
   fpsTimer.update();
   fpsTimer.setMaxDelta(1000);
-  
+
+  // Don't show the mouse in fullscreen mode during the race
+  pwSetCursorEx ( PW_CURSOR_LEFT, PW_CURSOR_NONE ) ;
 }   // RaceGUI
 
 // -----------------------------------------------------------------------------
 RaceGUI::~RaceGUI() {
 	//FIXME: does all that material stuff need freeing somehow?
+  // Show the mouse in fullscreen mode again
+  pwSetCursorEx ( PW_CURSOR_LEFT, PW_CURSOR_LEFT ) ;
 }   // ~Racegui
 
 // -----------------------------------------------------------------------------


--- NEW FILE supertuxkart-images-legal.txt ---
The following images where taken from: http://www.wpclipart.com/ a Public
Domain clipart collection and thus are in the publicdomain:
images/bananawrap.rgb
images/lunchbox.rgb
images/lunchbox2.rgb
"The cartoon-ish character" in images/adverts.rgb

---

Supertuxkart contains some images which are trademarkish or trademarked as
described below:

---

The tuxpaint logo (http://www.newbreedsoftware.com/tuxpaint/) in
images/adverts.rgb is copyrighted (GPL) and used with the permission of the
tuxpaint author:

Return-Path: <nbs at sonic.net>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 47893342 for j.w.r.degoede at hhs.nl; Thu, 01 Jun 2006 21:03:14 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62)
	(envelope-from <nbs at sonic.net>)
	id 1FlsRt-00011S-0a
	for j.w.r.degoede at hhs.nl; Thu, 01 Jun 2006 21:03:14 +0200
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham 
	version=3.1.0
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <nbs at sonic.net>)
	id 1FlsRs-00011O-Sl
	for j.w.r.degoede at hhs.nl; Thu, 01 Jun 2006 21:03:12 +0200
Received: from [64.142.19.5] (port=35242 helo=b.mail.sonic.net)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <nbs at sonic.net>)
	id 1FlsRs-00011C-83
	for j.w.r.degoede at hhs.nl; Thu, 01 Jun 2006 21:03:12 +0200
Received: from newshell.sonic.net (bolt.sonic.net [208.201.242.19])
	by b.mail.sonic.net (8.13.6/8.13.3) with ESMTP id k51J3BrW028314
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <j.w.r.degoede at hhs.nl>; Thu, 1 Jun 2006 12:03:11 -0700
Received: from bolt.sonic.net (IDENT:lshZbY61PF19/2FQrpB8Un0NwLi5Usne at localhost.localdomain [127.0.0.1])
	by newshell.sonic.net (8.13.6/8.12.1) with ESMTP id k51J3Bxf024586
	for <j.w.r.degoede at hhs.nl>; Thu, 1 Jun 2006 12:03:11 -0700
Received: (from nbs at localhost)
	by bolt.sonic.net (8.13.6/8.12.1/Submit) id k51J3ASY024585
	for j.w.r.degoede at hhs.nl; Thu, 1 Jun 2006 12:03:10 -0700
Date: Thu, 1 Jun 2006 12:03:10 -0700
From: Bill Kendrick <nbs at sonic.net>
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Subject: Re: Tuxpaint logo usage
Message-ID: <20060601190310.GA23533 at sonic.net>
References: <447F3547.2080802 at hhs.nl>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <447F3547.2080802 at hhs.nl>
User-Agent: Mutt/1.4.2.1i
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 01062006 #185874, status: clean


Hi Hans!  Yes, go for it!  Thanks! :)

-bill!


On Thu, Jun 01, 2006 at 08:43:19PM +0200, Hans de Goede wrote:
> Hi,
> 
> First a short intro. I'm a Linux enthousiast / programmer and a packager
> for Fedora Extras which is an online community that packages software in
> the native package format for Fedora Core a (well known) Linux distribution.
> 
> As such I'm currently in the progress of packaging tuxkart an opensource
> racing game, which is hosted and distributed from sf.net. One of the
> tracks on which you can race is an ordinary racing track with
> advertisement boards along the side. Currently these advertisements are
> a bit of a problem as they show logo's of big companies without their
> permission. Hence I'm currently busy replacing these logo's with
> something more suitable. I would like to use the tuxpaint logo as one of
> the advertisements. Because of this I'm here by asking your permission
> for the use of the tuxpaint logo.
> 
> The logo is in no way used to promote the game, it is shown as
> an add, so if they promote anything it is tuxpaint.
> 
> Thanks & Regards,
> 
> Hans de Goede
> 
> 
> 

-- 
-bill!
bill at newbreedsoftware.com
http://www.newbreedsoftware.com/

---

The Fedora images in images/adverts.rgb incorporate the Fedora
trademark. The Fedora trademark is a trademark or registered trademark of Red
Hat, Inc. in the United States and other countries and are used by
permission.

For more info see the COPYING file of the fedora-logos package:
/usr/share/doc/fedora-logos-<version>/COPYING on any Fedora system with the
fedora-logos package installed.

Below the usage permission notice as received by mail:

Return-Path: <gdk at redhat.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 47843849 for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:51:45 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTv7-0006MP-0j
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:51:45 +0200
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,
	SPF_PASS autolearn=ham version=3.1.0
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTv6-0006MM-TF
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:51:44 +0200
Received: from [66.187.233.31] (port=56045 helo=mx1.redhat.com)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTv6-0006Lj-EE
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:51:44 +0200
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGph8g001950
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:43 -0400
Received: from devserv.devel.redhat.com (devserv.devel.redhat.com [172.16.58.1])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGpha5026590
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:43 -0400
Received: from gdk.devel.redhat.com (gdk.devel.redhat.com [172.16.62.88])
	by devserv.devel.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGphwX015818
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:43 -0400
Received: from gdk.devel.redhat.com (localhost.localdomain [127.0.0.1])
	by gdk.devel.redhat.com (8.12.11/8.12.11) with ESMTP id k4VGp6vE007024
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:06 -0400
Received: from localhost (gdk at localhost)
	by gdk.devel.redhat.com (8.12.11/8.12.11/Submit) with ESMTP id k4VGp6jt007020
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:06 -0400
X-Authentication-Warning: gdk.devel.redhat.com: gdk owned process doing -bs
Date: Wed, 31 May 2006 12:51:06 -0400 (EDT)
From: Greg DeKoenigsberg <gdk at redhat.com>
X-X-Sender: gdk at gdk.devel.redhat.com
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Subject: Re: Usage of Fedora logo inside FE package
In-Reply-To: <4479F694.2010604 at hhs.nl>
Message-ID: <Pine.LNX.4.58.0605311250480.6876 at gdk.devel.redhat.com>
References: <4479F694.2010604 at hhs.nl>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 31052006 #185572, status: clean


Very cool, Hans.  I'll send your logo and agreement shortly.

--g

-------------------------------------------------------------
Greg DeKoenigsberg || Fedora Project || fedoraproject.org
Be an Ambassador || http://fedoraproject.org/wiki/Ambassadors
-------------------------------------------------------------

On Sun, 28 May 2006, Hans de Goede wrote:

> Hi,
> 
> I'm currently in the progress of packaging tuxkart a racing game. One of
> the tracks on which you can race is an ordinary racing track with
> advertisement boards along the side.
> 
> As shipped by upstream these advertisementboards contain advertisments
> for real product which clearly violates trademarks for those products.
> 
> As such I'm in the progress of replacing these advertisement and some
> other troublish artwork. I've currently (in my private copy) replaced a
> few of the advertisements with the fedora logo, which seems appropriate
> for a Fedora package. Because of this I would like to have your
> permission for using the logo in this way. Notice that I've copy and
> pasted the logo, I cannot just use the image-file from Fedora-logo's
> because that is not in the .rgb format, which tuxkart needs.
> 
> Thanks & Regards,
> 
> Hans
> 

Return-Path: <gdk at redhat.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 47843851 for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:52:52 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTwC-0006cu-3l
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:52:52 +0200
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTwB-0006cr-NX
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:52:52 +0200
Received: from [66.187.233.31] (port=56334 helo=mx1.redhat.com)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTw4-0006ae-5Y
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:52:50 +0200
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGqgMn002593
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:42 -0400
Received: from devserv.devel.redhat.com (devserv.devel.redhat.com [172.16.58.1])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGqgkf026872
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:42 -0400
Received: from gdk.devel.redhat.com (gdk.devel.redhat.com [172.16.62.88])
	by devserv.devel.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGqelD015899
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:40 -0400
Received: from gdk.devel.redhat.com (localhost.localdomain [127.0.0.1])
	by gdk.devel.redhat.com (8.12.11/8.12.11) with ESMTP id k4VGq3G7007042
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:03 -0400
Received: from localhost (gdk at localhost)
	by gdk.devel.redhat.com (8.12.11/8.12.11/Submit) with ESMTP id k4VGq2pj007038
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:03 -0400
X-Authentication-Warning: gdk.devel.redhat.com: gdk owned process doing -bs
Date: Wed, 31 May 2006 12:52:02 -0400 (EDT)
From: Greg DeKoenigsberg <gdk at redhat.com>
X-X-Sender: gdk at gdk.devel.redhat.com
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Subject: Logo approval 
Message-ID: <Pine.LNX.4.58.0605311251430.6876 at gdk.devel.redhat.com>
MIME-Version: 1.0
Content-Type: MULTIPART/Mixed; BOUNDARY="279730238-1135091034-1148579299=:2501"
Content-ID: <Pine.LNX.4.58.0605311251431.6876 at gdk.devel.redhat.com>
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 31052006 #185572, status: clean

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime at docserver.cac.washington.edu for more info.

--279730238-1135091034-1148579299=:2501
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
Content-ID: <Pine.LNX.4.58.0605311251432.6876 at gdk.devel.redhat.com>


Here are your logo files, in SVG format.  Convert them to whatever formats
you wish to use.  By using these logos, you're agreeing to the following
simple rules:
                                                                                
1. You won't alter the logos, and you'll adhere to the style guide.

2. You'll only use the logos to describe Fedora stuff.  (i.e. you won't 
take the logo and slap it on Debian stuff.  Common sense.)

3. You won't use the logo for anything hateful or stupid.

4. We reserve the right to disallow your use of the logo.

Thanks for all your help supporting Fedora.

--g

---------------------------------------------------------------
Greg DeKoenigsberg || Fedora Foundation || fedoraproject.org
Be an Ambassador || http://fedoraproject.org/wiki/Ambassadors

---

The PlanetPenguin Racer logo (http://projects.planetpenguin.de/racer/) in
images/adverts.rgb is copyrighted (GPL) and used with the permission of the
ppracer authors:

Return-Path: <volker at planetpenguin.de>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 47974844 for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:54 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62)
	(envelope-from <volker at planetpenguin.de>)
	id 1FnXgB-00060S-GG
	for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:54 +0200
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham 
	version=3.1.0
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <volker at planetpenguin.de>)
	id 1FnXgB-00060K-99
	for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:51 +0200
Received: from [217.160.131.21] (port=37440 helo=p15104914.pureserver.info)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <volker at planetpenguin.de>)
	id 1FnXgA-0005zz-NE
	for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:50 +0200
Received: from [192.168.0.242] (p5493D342.dip.t-dialin.net [84.147.211.66])
	(authenticated (0 bits))
	by p15104914.pureserver.info (8.11.3/8.11.3/SuSE Linux 8.11.1-0.5) with ESMTP id k569GoU14013
	for <j.w.r.degoede at hhs.nl>; Tue, 6 Jun 2006 11:16:50 +0200
Subject: Re: PPracer "logo" usage
From: Volker =?ISO-8859-1?Q?Str=F6bel?= <volker at planetpenguin.de>
To: Hans de Goede <j.w.r.degoede at hhs.nl>
In-Reply-To: <4482F398.8000306 at hhs.nl>
References: <4482F398.8000306 at hhs.nl>
Content-Type: text/plain
Date: Tue, 06 Jun 2006 11:14:08 +0200
Message-Id: <1149585248.6996.2.camel at localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.6.1 
Content-Transfer-Encoding: 7bit
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 06062006 #186743, status: clean

Hi,
sorry for the late reply.

It's ok with me to include the logo.
And nice to see, that someone finally replaces this old stuff with logos
from FOSS projects.

Regards,
Volker


Am Sonntag, den 04.06.2006, 16:52 +0200 schrieb Hans de Goede:
> Hi,
> 
> Did you receive my mail below? This is currently the last thing keeping
> me from releasing a tuxkart package for Fedora. If you don't want the
> ppracer logo included thats fine too, then I'll dig up some other
> graphics to put in there as "advertisements"
> 
> Regards,
> 
> Hans
> 
> p.s.
> 
> I've attached the "logo" as it will be included I did some gimp-ing to
> get it to be a little bit more square. Feel free to use it.
> 
> 
> ---
> 
> 
> Hi,
> 
> First a short intro. I'm a Linux enthousiast / programmer and a packager
> for Fedora Extras which is an online community that packages software in
> the native package format for Fedora Core a (well known) Linux distribution.
> 
> As such I'm currently in the progress of packaging tuxkart an opensource
> racing game, which is hosted and distributed from sf.net. One of the
> tracks on which you can race is an ordinary racing track with
> advertisement boards along the side. Currently these advertisements are
> a bit of a problem as they show logo's of big companies without their
> permission. Hence I'm currently busy replacing these logo's with
> something more suitable. I would like to use the ppracer "logo" *  as
> one of the advertisements. Because of this I'm here by asking your
> permission for the use of the ppracer logo.
> 
> The logo is in no way used to promote the game, it is shown as
> an add, so if it promotes anything it is ppracer.
> 
> Thanks & Regards,
> 
> Hans de Goede
> 
> * The yellow "planet penguin racer" text above the menu where the
> tuxracer logo used to be
> 

supertuxkart-nomnm.patch:

--- NEW FILE supertuxkart-nomnm.patch ---
--- supertuxkart-0.2/models/mnm.ac.nomnm	2006-05-04 00:14:38.000000000 +0200
+++ supertuxkart-0.2/models/mnm.ac	2006-09-24 21:11:28.000000000 +0200
@@ -5,7 +5,7 @@
 OBJECT poly
 name "rect"
 loc 0.0261096 0.0456918 0
-texture "../images/mnm.rgb"
+texture "../images/bananawrap.rgb"
 numvert 4
 -1 0 -0.6
 1 0 -0.6
--- supertuxkart-0.2/data/olivermath.loc.nomnm	2006-09-02 11:59:16.000000000 +0200
+++ supertuxkart-0.2/data/olivermath.loc	2006-09-24 21:10:00.000000000 +0200
@@ -20,8 +20,8 @@
 "backpack.ac",-12,5,{},0,{},{}
 "ruler_bridge.ac",60,20,{},0,{},{}
 "ruler_jump.ac",-20,20,{},160,{},{}
-"mnm.ac",50,10,{},0,{},{}
-"mnm.ac",-30,70,{},0,{},{}
+"bananawrap.ac",50,10,{},0,{},{}
+"bananawrap.ac",-30,70,{},0,{},{}
 "paperairplane.ac",0,80,{},-40,{},{}
 "teachersdesk.ac",40,75,{},0,{},{}
 "teachersdesk.ac",63,95,{},90,{},{}
--- supertuxkart-0.2/data/materials.dat.nomnm	2006-09-24 21:11:00.000000000 +0200
+++ supertuxkart-0.2/data/materials.dat	2006-09-24 21:11:07.000000000 +0200
@@ -45,7 +45,7 @@
 "grass.rgb"            N N     N      0.0     Y     N   0.1     N   N    N    N
 "track2.rgb"           N N     N      0.0     Y     N   1.0     N   N    N    N
 "zipper.rgb"           N N     N      0.0     N     N   1.0     N   Y    N    N
-"mnm.rgb"              Y Y     Y      0.5     N     N   1.0     N   Y    N    N
+"bananawrap.rgb"       Y Y     Y      0.5     N     N   1.0     N   Y    N    N
 "fuzzy.rgb"            Y Y     Y      0.2     N     N   0.5     Y   N    N    N
 "mriceblockshadow.rgb" Y Y     Y      0.0     N     N   1.0     Y   N    N    N
 "mriceblockicon.rgb"   Y Y     Y      0.0     N     N   1.0     Y   N    N    N
--- supertuxkart-0.2/src/sound.cpp~	2006-10-06 16:18:21.000000000 +0200
+++ supertuxkart-0.2/src/sound.cpp	2006-10-06 16:18:21.000000000 +0200
@@ -74,7 +74,8 @@
 
   //FIXME: The following 3 sounds are not used in the game yet.
   sfx[SOUND_BACK_MENU     ].fname = "wavs/tintagel/deselect_option.wav";
-  sfx[SOUND_SELECT_MENU   ].fname = "wavs/tintagel/select_option.wav";
+  //FIXME removed because copyrighted
+  //sfx[SOUND_SELECT_MENU   ].fname = "wavs/tintagel/select_option.wav";
   sfx[SOUND_MOVE_MENU     ].fname = "wavs/tintagel/move_option.wav";
 
   sfx[SOUND_FULL          ].fname = "wavs/tintagel/energy_bar_full.wav";
--- supertuxkart-0.2/src/sound.hpp~	2006-10-06 16:18:29.000000000 +0200
+++ supertuxkart-0.2/src/sound.hpp	2006-10-06 16:18:29.000000000 +0200
@@ -28,7 +28,7 @@
 		    SOUND_SHOT, SOUND_OW,     SOUND_WEE,   SOUND_EXPLOSION,
 		    SOUND_BZZT, SOUND_BEEP,
             SOUND_BACK_MENU, SOUND_USE_ANVIL, SOUND_USE_PARACHUTE,
-		    SOUND_SELECT_MENU, SOUND_MOVE_MENU, SOUND_FULL,
+		    SOUND_MOVE_MENU, SOUND_FULL,
 		    SOUND_PRESTART, SOUND_START, SOUND_MISSILE_LOCK,
 		    SOUND_TRAFFIC_JAM, NUM_SOUNDS};
 


--- NEW FILE supertuxkart.6 ---
.\" SuperTuxKart -- 3D GoKart racing game
.\" Copyright (c) 2001 Steve Baker, Daniel Kobras
.\" Copyright (c) 2006 The SuperTuxKart Team (See AUTHORS file)
.\"
.\" This manual page 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.
.\"
.\" This manual page was written especially for Debian Linux. It is based
.\" on information available from tuxkart's website at
.\" http://tuxkart.sourceforge.net
.\"
.TH SUPERTUXKART 6 "November 15, 2001"
.SH NAME
SuperTuxKart \- 3D GoKart racing game
.SH SYNOPSIS
.B supertuxkart
.SH DESCRIPTION
\fBsupertuxkart\fP is an arcade-style game where driving faster than your
opponents will do the trick. You're taking the role of Tux, the Linux mascot,
steering its go-kart around various courses, racing against computer-controlled
vehicles.
.PP
The main window that opens on startup provides a menu to select the racemode,
track to race on, the number of laps to go, etc. In the race, you can either
use a joystick, or the keyboard for steering.
.PP
During the race, several goodies can make your life easier while other gadgets
shall give you a really tough ride. Go for the arrow shaped red and black
zipper patches on the track, as they boost your cart onwards. The question mark
cubes hide some nice powerups. Beware of the big spinning banana's though, they
are yucky and slow you down. The herring coins on the other hand make for a
fine appetizer. Eat enough of them, and the next question mark cube might yield
not only one, but up to five powerups at once. Note that bad things happen at
once, while the good things (well, good for you...) need to be activated.
Here's the list of available extras:
.PP
.TP
.B Goodies
.TP
.I Missiles
Unguided but fast. If they hit anything, they explode impressively. The effect
on a cart is to stop it dead, so it has to accelerate again.
.TP
.I Homing missiles
Slower than the regular kind, but they track the nearest kart and are quite
hard to shake off.
.TP
.I Fuzzy blobs
Even slower still - a kart can outrun them quite easily. They ricochet off the
sides of the track and only explode when they hit a cart.
.TP
.I Magnets
If you activate a magnet then it hangs around for about 15 seconds. If anyone
comes within about 20 meters, you'll be pulled towards them and end up glued to
their tail until the magnet 'expires'. Great for catching up with someone -
hopeless for passing them.
.TP
.I Portable Zippers
These are just like the zipper patches on the track itself. They give you 
sudden acceleration and temporarily increase the top speed of your cart.
.TP
.B Badies
.TP
.I Parachute
This pops out the back of your cart and slows you down a little for a few
seconds only. Enough to drop you back one place if it's a close race though.
.TP
.I Anvil
Gets dragged behind your cart on a rope for an even shorter amount of time than
the parachute, but the drag effect is much stronger. Your cart hardly moves at
all.
.PP
.SH CONTROLS
.TP
.B \fRJoystick\fB Left/Right \fRor Key\fB Left/Right
Steer.
.TP
.B \fRJoystick\fB Button 1 \fRor Key\fB Up
Accelerate.
.TP
.B \fRJoystick\fB Button 2 \fRor Key\fB Down
Brake.
.TP
.B \fRJoystick\fB Button 3 \fRor Key\fB f
Use a special item (if you've collected one).
.TP
.B \fRJoystick\fB Button 4 \fRor Key\fB d
Ask to be rescued by Tinytux.
.TP
.B \fRJoystick\fB Button 5 \fRor Key\fB a
Pop a wheelie--makes you go really fast, but you'll be unable to steer.
.TP
.B \fRKey\fB Esc
Pop up or hide the menu.
.PP
.SH KNOWN BUGS
.PP
No drive-with-the-mouse support.
.PP
Slow performance on CPUs less than ~450MHz.
.PP
If you (or one of the computer players) goes off the edge of the
track, or calls for rescue then Tinytux doesn't always manage to
put you back onto the track correctly. If this happens, you may
need to goto the menu to restart the race.
.PP
Sometimes you can be pushed through a solid object if you are hit
by another player when in contact with the surface.
.PP
.SH ENVIRONMENT
.TP
.B MESA_GLX_FX
If this environment variable is set, the game's resolution
will switch from the default 640x480 to 320x240. This is mostly of interest
if you have a Voodoo-1/2 graphics card and usually set this variable to
fullscreen.
.TP
.B TUXKART_DATADIR
Path to the location of game data. Usually you don't have to mess with this
variable.
.TP
.B TUXKART_TRACKLIST
Path to the location of track data. Usually you don't have to mess with this
variable.
.PP
.SH AUTHOR
This manual page was written by Daniel Kobras <kobras at debian.org>,
for the Debian GNU/Linux system (but may be used by others). It was updated
for supertuxkart by Hans de Goede <j.w.r.degoede at hhs.nl> for the Fedora
GNU/Linux distribution.


--- NEW FILE supertuxkart.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Supertuxkart
Comment=3D go-kart racing game
Exec=supertuxkart
Icon=supertuxkart.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;


--- NEW FILE supertuxkart.spec ---
Name:           supertuxkart
Version:        0.2
Release:        3%{?dist}
Summary:        Kids 3D go-kart racing game featuring Tux
Group:          Amusements/Games
License:        GPL
URL:            http://supertuxkart.berlios.de/
# This is not the official upstream tarbal which can be found here:
# http://download.berlios.de/supertuxkart/SuperTuxKart-0.2.tar.bz2
# This version has some copyrighted / trademarked images and sounds removed,
# these are replaced with new ones from supertuxkart-alt-images.tar.gz
# see supertuxkart-images-legal.txt for the copyright/trademark info on the
# new ones. The following images and sounds where replaced:
# adverts.rgb, lunchbox.rgb, lunchbox2.rgb, mnm.rgb (with bananawrap.rgb),
# brick.rgb, explode.rgb, mathclasswest.rgb (pokemon poster removed),
# explode2.rgb (unused, removed), select_option.wav (unused, removed).
Source0:        %{name}-%{version}.tar.gz
Source1:        %{name}-alt-images.tar.gz
Source2:        %{name}.desktop
Source3:        %{name}.png
Source4:        %{name}.6
Source5:        %{name}-images-legal.txt
Patch0:         supertuxkart-fhs.patch
Patch1:         supertuxkart-fullscreen.patch
Patch2:         supertuxkart-nomnm.patch
Patch3:         supertuxkart-0.2-joy1.patch
Patch4:         supertuxkart-0.2-joy2.patch
Patch5:         supertuxkart-0.2-joy3.patch
Patch6:         supertuxkart-0.2-gpmenu.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  plib-devel libXt-devel desktop-file-utils
# Provide so that yum install tuxkart will work, obsolete for auto upgrade
Provides:       tuxkart = 0.4.0-6
Obsoletes:      tuxkart < 0.4.0-6

%description
3D go-kart racing game for kids with several famous OpenSource mascots
participating. Race as Tux against 3 computer players in many different fun
race courses (Standard race track, Dessert, Mathclass, etc). Full information
on how to add your own race courses is included. During the race you can pick
up powerups such as: (homing) missiles, magnets and portable zippers.


%prep
%setup -q
%patch0 -p1 -z .fhs
%patch1 -p1 -z .fs
%patch2 -p1 -z .nomnm
mv models/mnm.ac models/bananawrap.ac
%patch3 -p1 -z .joy1
%patch4 -p1 -z .joy2
%patch5 -p1 -z .joy3
%patch6 -p1 -z .gpmenu
tar xf %{SOURCE1}
cp %{SOURCE5} .
chmod -x AUTHORS CHANGES COPYING README TODO
# stop automake from rerunning because of our patches above
touch src/Makefile.in


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# easier then patching all the Makefile's
mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE3} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps

# add the manpage (courtesy of Debian)
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man6


%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 CHANGES COPYING README TODO %{name}-images-legal.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2-3
- replace some more coprighted images and sounds
- fix a bunch of joystick related bugs

* Mon Sep 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2-2
- rename images-legal.txt to supertuxkart-images-legal.txt
- add a changelog entry for the previous release (and this one)

* Mon Sep 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2-1
- initial Fedora Extras package (replacing regular tuxkart)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 14:34:57 -0000	1.1
+++ .cvsignore	6 Oct 2006 14:37:01 -0000	1.2
@@ -0,0 +1,2 @@
+supertuxkart-0.2.tar.gz
+supertuxkart-alt-images.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 14:34:57 -0000	1.1
+++ sources	6 Oct 2006 14:37:01 -0000	1.2
@@ -0,0 +1,2 @@
+2371aa8b3d9201c97fee901accbe7280  supertuxkart-0.2.tar.gz
+c0d4c9b055d2a95a006f60bff2058f37  supertuxkart-alt-images.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 14:47:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:47:25 -0700
Subject: rpms/tuxkart/devel dead.package, NONE, 1.1 images-legal.txt, 1.1,
	NONE sources, 1.2, NONE tuxkart-0.4.0-debian.patch, 1.1,
	NONE tuxkart-0.4.0-fhs.patch, 1.1,
	NONE tuxkart-0.4.0-fullscreen.patch, 1.1,
	NONE tuxkart-0.4.0-nomnm.patch, 1.1,
	NONE tuxkart-0.4.0-nounnecesarry-libs.patch, 1.1, NONE tuxkart.6,
	1.1, NONE tuxkart.desktop, 1.1, NONE tuxkart.png, 1.1,
	NONE tuxkart.spec, 1.3, NONE
Message-ID: <200610061447.k96ElR0w001793@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/tuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1777

Added Files:
	dead.package 
Removed Files:
	images-legal.txt sources tuxkart-0.4.0-debian.patch 
	tuxkart-0.4.0-fhs.patch tuxkart-0.4.0-fullscreen.patch 
	tuxkart-0.4.0-nomnm.patch 
	tuxkart-0.4.0-nounnecesarry-libs.patch tuxkart.6 
	tuxkart.desktop tuxkart.png tuxkart.spec 
Log Message:
Upstream is dead (or barely alive) project has been forked to
Supertuxkart. Supertuxkart is in FE now and tuxkart will automaticaly be
updated to Supertuxkart by yum.



--- NEW FILE dead.package ---
Upstream is dead (or barely alive) project has been forked to
Supertuxkart. Supertuxkart is in FE now and tuxkart will automaticaly be
updated to Supertuxkart by yum.


--- images-legal.txt DELETED ---


--- sources DELETED ---


--- tuxkart-0.4.0-debian.patch DELETED ---


--- tuxkart-0.4.0-fhs.patch DELETED ---


--- tuxkart-0.4.0-fullscreen.patch DELETED ---


--- tuxkart-0.4.0-nomnm.patch DELETED ---


--- tuxkart-0.4.0-nounnecesarry-libs.patch DELETED ---


--- tuxkart.6 DELETED ---


--- tuxkart.desktop DELETED ---


--- tuxkart.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 15:34:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 08:34:49 -0700
Subject: rpms/uw-imap/devel c-client.cf,1.1,1.2 uw-imap.spec,1.18,1.19
Message-ID: <200610061534.k96FYpaw004940@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4921

Modified Files:
	c-client.cf uw-imap.spec 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
- omit EOL whitespace from c-client.cf



Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/c-client.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- c-client.cf	4 Oct 2006 18:04:13 -0000	1.1
+++ c-client.cf	6 Oct 2006 15:34:48 -0000	1.2
@@ -1,3 +1,3 @@
 I accept the risk of using UW-IMAP
 set new-folder-format same-as-inbox
-set mail-subdirectory Mail 
+set mail-subdirectory Mail


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- uw-imap.spec	5 Oct 2006 12:04:36 -0000	1.18
+++ uw-imap.spec	6 Oct 2006 15:34:48 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -231,14 +231,15 @@
 %files
 %defattr(-,root,root,-)
 %doc docs/SSLBUILD
-%config %{_sysconfdir}/pam.d/imap
-%config %{_sysconfdir}/pam.d/pop
+%config(noreplace) %{_sysconfdir}/pam.d/imap
+%config(noreplace) %{_sysconfdir}/pam.d/pop
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
 # These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
-%config %{_sysconfdir}/xinetd.d/imaps
-%config %{_sysconfdir}/xinetd.d/pop3s
+# do this in a %trigger or something not here... -- Rex
+%config(noreplace) %{_sysconfdir}/xinetd.d/imaps
+%config(noreplace) %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
 %{_mandir}/man8/*
@@ -273,6 +274,12 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
+- omit EOL whitespace from c-client.cf
+
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-5
+- %%config(noreplace) all xinetd.d/pam.d bits
+
 * Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
 - eek, pam.d/xinet.d bits were all mixed up, fixed.
 



From fedora-extras-commits at redhat.com  Fri Oct  6 15:35:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 08:35:26 -0700
Subject: rpms/uw-imap/FC-5 c-client.cf, 1.1, 1.2 uw-imap.spec, 1.13,
	1.14 imap-2006-mixproto.patch, 1.1, NONE
Message-ID: <200610061535.k96FZSr8005008@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4989

Modified Files:
	c-client.cf uw-imap.spec 
Removed Files:
	imap-2006-mixproto.patch 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
- omit EOL whitespace from c-client.cf



Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/c-client.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- c-client.cf	4 Oct 2006 18:11:55 -0000	1.1
+++ c-client.cf	6 Oct 2006 15:35:26 -0000	1.2
@@ -1,3 +1,3 @@
 I accept the risk of using UW-IMAP
 set new-folder-format same-as-inbox
-set mail-subdirectory Mail 
+set mail-subdirectory Mail


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- uw-imap.spec	5 Oct 2006 12:06:19 -0000	1.13
+++ uw-imap.spec	6 Oct 2006 15:35:26 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -231,14 +231,15 @@
 %files
 %defattr(-,root,root,-)
 %doc docs/SSLBUILD
-%config %{_sysconfdir}/pam.d/imap
-%config %{_sysconfdir}/pam.d/pop
+%config(noreplace) %{_sysconfdir}/pam.d/imap
+%config(noreplace) %{_sysconfdir}/pam.d/pop
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
 # These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
-%config %{_sysconfdir}/xinetd.d/imaps
-%config %{_sysconfdir}/xinetd.d/pop3s
+# do this in a %trigger or something not here... -- Rex
+%config(noreplace) %{_sysconfdir}/xinetd.d/imaps
+%config(noreplace) %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
 %{_mandir}/man8/*
@@ -273,6 +274,12 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
+- omit EOL whitespace from c-client.cf
+
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-5
+- %%config(noreplace) all xinetd.d/pam.d bits
+
 * Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
 - eek, pam.d/xinet.d bits were all mixed up, fixed.
 


--- imap-2006-mixproto.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 15:46:11 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  6 Oct 2006 08:46:11 -0700
Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.11,1.12
Message-ID: <200610061546.k96FkDf4005100@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5083

Modified Files:
	scim-tomoe.spec 
Log Message:
Fix the release number.



Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-tomoe.spec	15 Sep 2006 15:40:20 -0000	1.11
+++ scim-tomoe.spec	6 Oct 2006 15:46:11 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           scim-tomoe
 Version:        0.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Oct 7 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2.0-6
+- fix the release number for upgrading install from FE5 to FE6.
+
 * Sat Sep 15 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2.0-5
 - mass rebuilding.
 



From fedora-extras-commits at redhat.com  Fri Oct  6 15:50:54 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri,  6 Oct 2006 08:50:54 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.3, 1.4 cobbler.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610061550.k96FouQq005191@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5170

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream bugfixes, updated to 0.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Sep 2006 18:27:15 -0000	1.3
+++ .cvsignore	6 Oct 2006 15:50:54 -0000	1.4
@@ -1,2 +1,3 @@
 cobbler-0.1.1.tar.gz
 cobbler-0.2.1.tar.gz
+cobbler-0.2.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cobbler.spec	29 Sep 2006 18:26:26 -0000	1.2
+++ cobbler.spec	6 Oct 2006 15:50:54 -0000	1.3
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.1
+Version: 0.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/page/Cobbler_%26_Koan_Provisioning_Tools
+Url: http://et.redhat.com/~mdehaan/cobbler
 
 %description
 
@@ -54,6 +54,12 @@
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
+* Fri Oct 6 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
+- Upstream bugfixes
+
+* Fri Sep 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.1-2
+- URL update
+
 * Thu Sep 28 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
 - Upstream pull of bugfixes and new remote system "enchant" feature
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Sep 2006 18:26:26 -0000	1.3
+++ sources	6 Oct 2006 15:50:54 -0000	1.4
@@ -1 +1 @@
-eacc7153af9e5deb81bbc11b49f663f6  cobbler-0.2.1.tar.gz
+63e4550219de15865d197a47ac00ecfd  cobbler-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 16:20:16 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:20:16 -0700
Subject: rpms/perl-Readonly-XS/FC-5 perl-Readonly-XS.spec,1.2,1.3
Message-ID: <200610061620.k96GKIEQ008339@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284/FC-5

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
Drop buildrequires on perl(Readonly); patch Makefile.PL to keep it from
complaining.  This should resolve the rather involved little loop I
inadvertently introduced some moments ago.



Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/FC-5/perl-Readonly-XS.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Readonly-XS.spec	9 Dec 2005 05:53:13 -0000	1.2
+++ perl-Readonly-XS.spec	6 Oct 2006 16:20:16 -0000	1.3
@@ -1,38 +1,43 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        3%{?dist}
-Summary:        Companion module for Readonly.pm
+Release:        6%{?dist}
+Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Readonly-XS/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-XS-%{version}.tar.gz
+Patch0:         makefile.pl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl(Readonly) >= 1.02
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Readonly) >= 1.02
 
+
 %description
-Readonly-XS is a companion module for Readonly.pm, to speed up read-only
-scalar variables
+Readonly::XS is a companion module for Readonly, to speed up read-only
+scalar variables.
+
 
 %prep
 %setup -q -n Readonly-XS-%{version}
+%patch0
 
 
 %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 f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -40,7 +45,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -52,6 +57,16 @@
 
 
 %changelog
+* Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-6
+- drop br on perl(Readonly), patch Makefile.PL as well
+- rework spec to use macros
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.04-5
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-4
+- bump for mass rebuild
+
 * Thu Dec 08 2005 Michael A. Peters <mpeters at mac.com> - 1.04-3
 - proper version on perl(Readonly) BuildRequires & Requires
 



From fedora-extras-commits at redhat.com  Fri Oct  6 16:20:15 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:20:15 -0700
Subject: rpms/perl-Readonly-XS Makefile,1.1,1.2
Message-ID: <200610061620.k96GKHNn008335@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284

Modified Files:
	Makefile 
Log Message:
Drop buildrequires on perl(Readonly); patch Makefile.PL to keep it from
complaining.  This should resolve the rather involved little loop I
inadvertently introduced some moments ago.



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	8 Dec 2005 19:12:28 -0000	1.1
+++ Makefile	6 Oct 2006 16:20:15 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Fri Oct  6 16:20:17 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:20:17 -0700
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.4,1.5
Message-ID: <200610061620.k96GKJJ2008343@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284/devel

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
Drop buildrequires on perl(Readonly); patch Makefile.PL to keep it from
complaining.  This should resolve the rather involved little loop I
inadvertently introduced some moments ago.



Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Readonly-XS.spec	4 Oct 2006 22:43:40 -0000	1.4
+++ perl-Readonly-XS.spec	6 Oct 2006 16:20:16 -0000	1.5
@@ -1,38 +1,43 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        5%{?dist}
-Summary:        Companion module for Readonly.pm
+Release:        6%{?dist}
+Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Readonly-XS/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-XS-%{version}.tar.gz
+Patch0:         makefile.pl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl(Readonly) >= 1.02
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Readonly) >= 1.02
 
+
 %description
-Readonly-XS is a companion module for Readonly.pm, to speed up read-only
-scalar variables
+Readonly::XS is a companion module for Readonly, to speed up read-only
+scalar variables.
+
 
 %prep
 %setup -q -n Readonly-XS-%{version}
+%patch0
 
 
 %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 f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -40,7 +45,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -52,8 +57,12 @@
 
 
 %changelog
+* Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-6
+- drop br on perl(Readonly), patch Makefile.PL as well
+- rework spec to use macros
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.04-5
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-4
 - bump for mass rebuild



From fedora-extras-commits at redhat.com  Fri Oct  6 16:21:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:21:51 -0700
Subject: rpms/perl-Readonly-XS/devel makefile.pl.patch,NONE,1.1
Message-ID: <200610061621.k96GLrVd008439@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8421

Added Files:
	makefile.pl.patch 
Log Message:
there's always something...

makefile.pl.patch:

--- NEW FILE makefile.pl.patch ---
--- Makefile.PL.orig	2006-10-06 08:44:30.403840967 -0700
+++ Makefile.PL	2006-10-06 08:44:42.180431002 -0700
@@ -5,7 +5,7 @@
 WriteMakefile(
     'NAME'		=> 'Readonly::XS',
     'VERSION_FROM'	=> 'XS.pm', # finds $VERSION
-    'PREREQ_PM'		=> {Readonly => 1.02}, # e.g., Module::Name => 1.1
+    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
       (AUTHOR     => 'Eric Roode <roode at cpan.org>') : ()),
     'LIBS'		=> [''], # e.g., '-lm'



From fedora-extras-commits at redhat.com  Fri Oct  6 16:23:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:23:45 -0700
Subject: rpms/perl-Readonly-XS/FC-5 makefile.pl.patch,NONE,1.1
Message-ID: <200610061623.k96GNlMc008551@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8533

Added Files:
	makefile.pl.patch 
Log Message:
there's always something...

makefile.pl.patch:

--- NEW FILE makefile.pl.patch ---
--- Makefile.PL.orig	2006-10-06 08:44:30.403840967 -0700
+++ Makefile.PL	2006-10-06 08:44:42.180431002 -0700
@@ -5,7 +5,7 @@
 WriteMakefile(
     'NAME'		=> 'Readonly::XS',
     'VERSION_FROM'	=> 'XS.pm', # finds $VERSION
-    'PREREQ_PM'		=> {Readonly => 1.02}, # e.g., Module::Name => 1.1
+    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
       (AUTHOR     => 'Eric Roode <roode at cpan.org>') : ()),
     'LIBS'		=> [''], # e.g., '-lm'



From fedora-extras-commits at redhat.com  Fri Oct  6 16:27:20 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:27:20 -0700
Subject: rpms/perl-Readonly-XS/FC-5 perl-Readonly-XS.spec,1.3,1.4
Message-ID: <200610061627.k96GRMhG008639@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8608/FC-5

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
there's always something...


Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/FC-5/perl-Readonly-XS.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Readonly-XS.spec	6 Oct 2006 16:20:16 -0000	1.3
+++ perl-Readonly-XS.spec	6 Oct 2006 16:27:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-7
+- bump for missing patch...
+
 * Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-6
 - drop br on perl(Readonly), patch Makefile.PL as well
 - rework spec to use macros



From fedora-extras-commits at redhat.com  Fri Oct  6 16:27:21 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:27:21 -0700
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.5,1.6
Message-ID: <200610061627.k96GRNfg008643@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8608/devel

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
there's always something...


Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Readonly-XS.spec	6 Oct 2006 16:20:16 -0000	1.5
+++ perl-Readonly-XS.spec	6 Oct 2006 16:27:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-7
+- bump for missing patch...
+
 * Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-6
 - drop br on perl(Readonly), patch Makefile.PL as well
 - rework spec to use macros



From fedora-extras-commits at redhat.com  Fri Oct  6 17:26:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 10:26:02 -0700
Subject: rpms/libtunepimp/FC-5 .cvsignore, 1.5, 1.6 libtunepimp.spec, 1.14, 
	1.15 sources, 1.4, 1.5 libtunepimp-0.4.3-PLUGIN_DIR.patch, 1.1, NONE
Message-ID: <200610061726.k96HQ4lF012001@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11980

Modified Files:
	.cvsignore libtunepimp.spec sources 
Removed Files:
	libtunepimp-0.4.3-PLUGIN_DIR.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
- 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Sep 2006 18:08:14 -0000	1.5
+++ .cvsignore	6 Oct 2006 17:26:02 -0000	1.6
@@ -1,2 +1,2 @@
-libtunepimp-0.4.3.tar.gz
-libtunepimp-0.5.1.tar.gz
+clog
+libtunepimp-0.5.2.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/libtunepimp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libtunepimp.spec	26 Sep 2006 18:08:14 -0000	1.14
+++ libtunepimp.spec	6 Oct 2006 17:26:02 -0000	1.15
@@ -1,8 +1,8 @@
 
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
-Version: 0.4.3
-Release: 7%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -10,25 +10,30 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://lists.musicbrainz.org/pipermail/musicbrainz-devel/2006-September/001856.html
 %define pkglibdir %{_libdir}/tunepimp
-Patch1: libtunepimp-0.4.3-PLUGIN_DIR.patch
 
-BuildRequires: readline-devel ncurses-devel
-BuildRequires: zlib-devel
 BuildRequires: libmusicbrainz-devel >= 2.1.0
-BuildRequires: flac-devel
+BuildRequires: readline-devel ncurses-devel
 BuildRequires: libvorbis-devel
+BuildRequires: flac-devel
+BuildRequires: zlib-devel
 BuildRequires: taglib-devel
+BuildRequires: readline-devel ncurses-devel
+BuildRequires: libmpcdec-devel
 
-%if "%{name}" == "libtunepimp"
-Obsoletes: libtunepimp3 < %{version}-%{release}
-Provides:  libtunepimp3 = %{version}-%{release}
-%endif
+BuildRequires: libofa-devel
+# These two are likely bogus (used just in examples/ ) -- Rex
+BuildRequires: curl-devel
+BuildRequires: expat-devel
 
 Obsoletes: libtunepimp-tools < %{version}-%{release}
 Provides:  libtunepimp-tools = %{version}-%{release}
 
+%if "%{name}" == "libtunepimp"
+Obsoletes: libtunepimp5 < %{version}-%{release}
+Provides:  libtunepimp5 = %{version}-%{release}
+%endif
+
 %description
 The TunePimp library is a development library geared towards developers 
 who wish to create MusicBrainz enabled tagging applications.
@@ -38,7 +43,7 @@
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 %if "%{name}" == "libtunepimp"
-Provides:  libtunepimp3-devel = %{version}-%{release}
+Provides:  libtunepimp5-devel = %{version}-%{release}
 %else
 Conflicts: libtunepimp-devel
 %endif
@@ -49,7 +54,6 @@
 %prep
 %setup -q -n libtunepimp-%{version}
 
-%patch1 -p1 -b .PLUGIN_DIR
 
 %build
 %configure \
@@ -83,16 +87,18 @@
 %doc AUTHORS COPYING ChangeLog TODO 
 # README omitted, it's mostly useless
 %doc README.LGPL
-%{_bindir}/tp_tagger
-%{_bindir}/trm
+%{_bindir}/puid
 %{_libdir}/lib*.so.*
-%dir %{pkglibdir}
+%dir %{pkglibdir}/
 %dir %{pkglibdir}/plugins/
 %{pkglibdir}/plugins/flac.tpp
 %{pkglibdir}/plugins/mpc.tpp
+%{pkglibdir}/plugins/speex.tpp
 %{pkglibdir}/plugins/vorbis.tpp
+%{pkglibdir}/plugins/tta.tpp
 %{pkglibdir}/plugins/wav.tpp
 %{pkglibdir}/plugins/wma.tpp
+%{pkglibdir}/plugins/wv.tpp
 
 %files devel
 %defattr(-,root,root,-)
@@ -101,12 +107,15 @@
 
 
 %changelog
-* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-7
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
+- 0.5.2
+
+* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-2
 - drop -tools subpkg
-- compat pkg-ready (libtunepimp3)
 
-* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-6
-- PLUGIN_DIR patch, fix lib64 issues
+* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-1
+- PLUGIN_DIR patch, fix lib64 issues, make parallel-installable
+  with libtunepimp-0.4
 
 * Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-3
 - BR: taglib-devel, readline-devel, ncurses-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2006 17:12:47 -0000	1.4
+++ sources	6 Oct 2006 17:26:02 -0000	1.5
@@ -1 +1 @@
-3b6ea2f378a81a39b4b64c1aaf4b6d51  libtunepimp-0.4.3.tar.gz
+655b254539013f5e7fe50ac035c26dcb  libtunepimp-0.5.2.tar.gz


--- libtunepimp-0.4.3-PLUGIN_DIR.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 17:32:25 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri,  6 Oct 2006 10:32:25 -0700
Subject: rpms/python-matplotlib/devel .cvsignore, 1.12,
	1.13 python-matplotlib.spec, 1.19, 1.20 sources, 1.12, 1.13
Message-ID: <200610061732.k96HWRmr012100@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12079

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Log Message:
Update to 0.87.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Sep 2006 21:34:02 -0000	1.12
+++ .cvsignore	6 Oct 2006 17:32:24 -0000	1.13
@@ -1 +1 @@
-matplotlib-0.87.5.tar.gz
+matplotlib-0.87.6.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-matplotlib.spec	15 Sep 2006 21:34:02 -0000	1.19
+++ python-matplotlib.spec	6 Oct 2006 17:32:24 -0000	1.20
@@ -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-matplotlib
-Version:        0.87.5
+Version:        0.87.6
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Fri Oct  6 2006 Orion Poplawski <orion at cora.nwra.com> 0.87.6-1
+- Update to 0.87.6
+
 * Thu Sep  7 2006 Orion Poplawski <orion at cora.nwra.com> 0.87.5-1
 - Update to 0.87.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Sep 2006 21:34:02 -0000	1.12
+++ sources	6 Oct 2006 17:32:24 -0000	1.13
@@ -1 +1 @@
-af3015ceae28ab385dbe9f30c6d2f83e  matplotlib-0.87.5.tar.gz
+30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 18:02:02 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Fri,  6 Oct 2006 11:02:02 -0700
Subject: rpms/kadu/devel kadu.spec,1.6,1.7
Message-ID: <200610061802.k96I24gb015079@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15056

Modified Files:
	kadu.spec 
Log Message:
* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.10.20060915svn
- Not rebuilding kadu-amarok on some archs



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kadu.spec	16 Sep 2006 10:14:41 -0000	1.6
+++ kadu.spec	6 Oct 2006 18:02:02 -0000	1.7
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.9.%{cvs_date}svn%{?dist}
+Release:	0.10.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -406,7 +406,9 @@
 
 %mod_files2 xmms
 
+%ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
+%endif
 
 %mod_files2 filedesc
 
@@ -448,6 +450,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.10.20060915svn
+- Not rebuilding kadu-amarok on some archs
+
 * Sat Sep 16 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.9.20060915svn
 - Update upstream to 20060915
 - Move themes to external spec file



From fedora-extras-commits at redhat.com  Fri Oct  6 18:45:48 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Fri,  6 Oct 2006 11:45:48 -0700
Subject: rpms/kadu/devel kadu.spec,1.7,1.8
Message-ID: <200610061845.k96IjoPM015351@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15334

Modified Files:
	kadu.spec 
Log Message:
* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.11.20060915svn
- Rpmbuild build error workaround.



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kadu.spec	6 Oct 2006 18:02:02 -0000	1.7
+++ kadu.spec	6 Oct 2006 18:45:48 -0000	1.8
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.10.%{cvs_date}svn%{?dist}
+Release:	0.11.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -284,6 +284,14 @@
 done
 #+
 
+%ifnarch ppc64 x86_64 s390 s390x ia64
+rm -rf %{_moddata}/amarok.desc
+rm -rf %{_modlib}/amarok.so
+rm -rf %{_modtrans}/amarok*.qm
+rm -rf %{_moddata}/data/amarok
+%endif
+
+
 desktop-file-install --vendor fedora				\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	--add-category X-Fedora					\
@@ -450,6 +458,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.11.20060915svn
+- Rpmbuild build error workaround.
+
 * Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.10.20060915svn
 - Not rebuilding kadu-amarok on some archs
 



From fedora-extras-commits at redhat.com  Fri Oct  6 19:08:52 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Fri,  6 Oct 2006 12:08:52 -0700
Subject: rpms/kadu/devel kadu.spec,1.8,1.9
Message-ID: <200610061908.k96J8sXH018410@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18389

Modified Files:
	kadu.spec 
Log Message:
* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.12.20060915svn
- Yet another fix...



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kadu.spec	6 Oct 2006 18:45:48 -0000	1.8
+++ kadu.spec	6 Oct 2006 19:08:52 -0000	1.9
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.11.%{cvs_date}svn%{?dist}
+Release:	0.12.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -285,10 +285,10 @@
 #+
 
 %ifnarch ppc64 x86_64 s390 s390x ia64
-rm -rf %{_moddata}/amarok.desc
-rm -rf %{_modlib}/amarok.so
-rm -rf %{_modtrans}/amarok*.qm
-rm -rf %{_moddata}/data/amarok
+rm -rf $RPM_BUILD_ROOT%{_moddata}/amarok.desc
+rm -rf $RPM_BUILD_ROOT%{_modlib}/amarok.so
+rm -rf $RPM_BUILD_ROOT%{_modtrans}/amarok*.qm
+rm -rf $RPM_BUILD_ROOT%{_moddata}/data/amarok
 %endif
 
 
@@ -458,6 +458,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.12.20060915svn
+- Yet another fix...
+
 * Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.11.20060915svn
 - Rpmbuild build error workaround.
 



From fedora-extras-commits at redhat.com  Fri Oct  6 19:35:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 12:35:26 -0700
Subject: rpms/uw-imap/devel .cvsignore, 1.4, 1.5 c-client.cf, 1.2,
	1.3 sources, 1.5, 1.6 uw-imap.spec, 1.19, 1.20
Message-ID: <200610061935.k96JZSXZ018561@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18538

Modified Files:
	.cvsignore c-client.cf sources uw-imap.spec 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
- imap-2006b
- %ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2006 20:29:56 -0000	1.4
+++ .cvsignore	6 Oct 2006 19:35:26 -0000	1.5
@@ -1,2 +1,3 @@
 imap-2006.tar.Z
 imap-2006a.tar.Z
+imap-2006b.tar.Z


Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/c-client.cf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- c-client.cf	6 Oct 2006 15:34:48 -0000	1.2
+++ c-client.cf	6 Oct 2006 19:35:26 -0000	1.3
@@ -1,3 +1 @@
-I accept the risk of using UW-IMAP
-set new-folder-format same-as-inbox
-set mail-subdirectory Mail
+# see imaprc.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Sep 2006 20:29:56 -0000	1.5
+++ sources	6 Oct 2006 19:35:26 -0000	1.6
@@ -1 +1 @@
-70b98056744f44aa52ccf4f668872b8e  imap-2006a.tar.Z
+6ba2c67118b7432d91999bcb5b227288  imap-2006b.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- uw-imap.spec	6 Oct 2006 15:34:48 -0000	1.19
+++ uw-imap.spec	6 Oct 2006 19:35:26 -0000	1.20
@@ -1,8 +1,8 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006a
-Release: 6%{?dist}
+Version: 2006b
+Release: 1%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -257,7 +257,7 @@
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
-%config(noreplace) %{_sysconfdir}/c-client.cf
+%ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
@@ -274,6 +274,10 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
+- imap-2006b
+- %%ghost %%config(missingok,noreplace) %%{_sysconfdir}/c-client.cf
+
 * Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
 - omit EOL whitespace from c-client.cf
 



From fedora-extras-commits at redhat.com  Fri Oct  6 19:36:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 12:36:16 -0700
Subject: rpms/uw-imap/FC-5 .cvsignore, 1.4, 1.5 c-client.cf, 1.2, 1.3 sources,
	1.4, 1.5 uw-imap.spec, 1.14, 1.15
Message-ID: <200610061936.k96JaIbZ018628@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18605

Modified Files:
	.cvsignore c-client.cf sources uw-imap.spec 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
- imap-2006b
- %ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Sep 2006 18:02:19 -0000	1.4
+++ .cvsignore	6 Oct 2006 19:36:15 -0000	1.5
@@ -1,2 +1,3 @@
 imap-2006.tar.Z
 imap-2006a.tar.Z
+imap-2006b.tar.Z


Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/c-client.cf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- c-client.cf	6 Oct 2006 15:35:26 -0000	1.2
+++ c-client.cf	6 Oct 2006 19:36:15 -0000	1.3
@@ -1,3 +1 @@
-I accept the risk of using UW-IMAP
-set new-folder-format same-as-inbox
-set mail-subdirectory Mail
+# see imaprc.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Sep 2006 18:02:19 -0000	1.4
+++ sources	6 Oct 2006 19:36:15 -0000	1.5
@@ -1 +1 @@
-70b98056744f44aa52ccf4f668872b8e  imap-2006a.tar.Z
+6ba2c67118b7432d91999bcb5b227288  imap-2006b.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- uw-imap.spec	6 Oct 2006 15:35:26 -0000	1.14
+++ uw-imap.spec	6 Oct 2006 19:36:15 -0000	1.15
@@ -1,8 +1,8 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006a
-Release: 6%{?dist}
+Version: 2006b
+Release: 1%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -257,7 +257,7 @@
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
-%config(noreplace) %{_sysconfdir}/c-client.cf
+%ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
@@ -274,6 +274,10 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
+- imap-2006b
+- %%ghost %%config(missingok,noreplace) %%{_sysconfdir}/c-client.cf
+
 * Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
 - omit EOL whitespace from c-client.cf
 



From fedora-extras-commits at redhat.com  Fri Oct  6 20:06:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:06:58 -0700
Subject: rpms/mirrormagic - New directory
Message-ID: <200610062007.k96K70AI021676@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21655/mirrormagic

Log Message:
Directory /cvs/extras/rpms/mirrormagic added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 20:06:59 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:06:59 -0700
Subject: rpms/mirrormagic/devel - New directory
Message-ID: <200610062007.k96K717W021679@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21655/mirrormagic/devel

Log Message:
Directory /cvs/extras/rpms/mirrormagic/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 20:07:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:07:18 -0700
Subject: rpms/mirrormagic/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610062007.k96K7K0j021736@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21700/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mirrormagic


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 20:07:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:07:18 -0700
Subject: rpms/mirrormagic Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610062007.k96K7K76021733@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21700

Added Files:
	Makefile import.log 
Log Message:
Setup of module mirrormagic


--- NEW FILE Makefile ---
# Top level Makefile for module mirrormagic
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 20:08:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:08:42 -0700
Subject: rpms/mirrormagic import.log,1.1,1.2
Message-ID: <200610062009.k96K9EHl021838@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788

Modified Files:
	import.log 
Log Message:
auto-import mirrormagic-2.0.2-2.fc6 on branch devel from mirrormagic-2.0.2-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 20:07:17 -0000	1.1
+++ import.log	6 Oct 2006 20:08:42 -0000	1.2
@@ -0,0 +1 @@
+mirrormagic-2_0_2-2_fc6:HEAD:mirrormagic-2.0.2-2.fc6.src.rpm:1160165890



From fedora-extras-commits at redhat.com  Fri Oct  6 20:08:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:08:43 -0700
Subject: rpms/mirrormagic/devel mirrormagic-2.0.2-64bit.patch, NONE,
	1.1 mirrormagic-2.0.2-fixes.patch, NONE, 1.1 mirrormagic.desktop,
	NONE, 1.1 mirrormagic.png, NONE, 1.1 mirrormagic.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610062009.k96K9FFU021842@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mirrormagic-2.0.2-64bit.patch mirrormagic-2.0.2-fixes.patch 
	mirrormagic.desktop mirrormagic.png mirrormagic.spec 
Log Message:
auto-import mirrormagic-2.0.2-2.fc6 on branch devel from mirrormagic-2.0.2-2.fc6.src.rpm

mirrormagic-2.0.2-64bit.patch:

--- NEW FILE mirrormagic-2.0.2-64bit.patch ---
--- mirrormagic-2.0.2/src/libgame/gadgets.c~	2006-09-30 03:21:56.000000000 +0200
+++ mirrormagic-2.0.2/src/libgame/gadgets.c	2006-09-30 03:21:56.000000000 +0200
@@ -301,11 +301,11 @@
 	break;
 
       case GDI_TYPE:
-	gi->type = va_arg(ap, unsigned long);
+	gi->type = va_arg(ap, int);
 	break;
 
       case GDI_STATE:
-	gi->state = va_arg(ap, unsigned long);
+	gi->state = va_arg(ap, int);
 	break;
 
       case GDI_CHECKED:

mirrormagic-2.0.2-fixes.patch:

--- NEW FILE mirrormagic-2.0.2-fixes.patch ---
diff -ur mirrormagic-2.0.2.orig/src/editor.c mirrormagic-2.0.2/src/editor.c
--- mirrormagic-2.0.2.orig/src/editor.c	2001-01-14 17:14:33.000000000 +0100
+++ mirrormagic-2.0.2/src/editor.c	2006-09-29 12:14:21.000000000 +0200
@@ -2751,7 +2751,7 @@
 	break;
       }
 
-      if (!LevelContainsPlayer)
+      if (!LevelContainsPlayer())
 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
@@ -2766,7 +2766,7 @@
       break;
 
     case GADGET_ID_TEST:
-      if (!LevelContainsPlayer)
+      if (!LevelContainsPlayer())
 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
diff -ur mirrormagic-2.0.2.orig/src/events.c mirrormagic-2.0.2/src/events.c
--- mirrormagic-2.0.2.orig/src/events.c	2001-01-14 17:14:33.000000000 +0100
+++ mirrormagic-2.0.2/src/events.c	2006-09-29 14:44:13.000000000 +0200
@@ -134,6 +134,13 @@
     case EVENT_CLIENTMESSAGE:
       HandleClientMessageEvent((ClientMessageEvent *) event);
       break;
+    
+#ifdef TARGET_SDL // hack SDL returns this when toggling fullscreen
+    case (Uint8)-1:
+      if (game_status == SETUP) // redraw the setup screen to update fs status
+        DrawSetupScreen();
+      break;
+#endif
 
     default:
       break;
diff -ur mirrormagic-2.0.2.orig/src/files.c mirrormagic-2.0.2/src/files.c
--- mirrormagic-2.0.2.orig/src/files.c	2002-03-18 04:09:16.000000000 +0100
+++ mirrormagic-2.0.2/src/files.c	2006-09-29 12:09:17.000000000 +0200
@@ -183,7 +183,7 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
-  char *data_dir = options.rw_base_directory;
+  char *data_dir = getUserDataDir();
   char *score_subdir = SCORES_DIRECTORY;
 
   if (score_dir)
diff -ur mirrormagic-2.0.2.orig/src/libgame/misc.c mirrormagic-2.0.2/src/libgame/misc.c
--- mirrormagic-2.0.2.orig/src/libgame/misc.c	2002-03-19 02:57:15.000000000 +0100
+++ mirrormagic-2.0.2/src/libgame/misc.c	2006-09-29 12:13:03.000000000 +0200
@@ -423,7 +423,6 @@
   options.server_host = NULL;
   options.server_port = 0;
   options.ro_base_directory = RO_BASE_PATH;
-  options.rw_base_directory = RW_BASE_PATH;
   options.level_directory = RO_BASE_PATH "/" LEVELS_DIRECTORY;
   options.serveronly = FALSE;
   options.network = FALSE;
@@ -492,9 +491,7 @@
       if (option_arg == NULL)
 	Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str);
 
-      /* this should be extended to separate options for ro and rw data */
       options.ro_base_directory = option_arg;
-      options.rw_base_directory = option_arg;
       if (option_arg == next_option)
 	options_left++;
 
diff -ur mirrormagic-2.0.2.orig/src/libgame/sdl.c mirrormagic-2.0.2/src/libgame/sdl.c
--- mirrormagic-2.0.2.orig/src/libgame/sdl.c	2002-03-19 04:10:37.000000000 +0100
+++ mirrormagic-2.0.2/src/libgame/sdl.c	2006-09-29 13:48:10.000000000 +0200
@@ -14,7 +14,7 @@
 #include "system.h"
 #include "sound.h"
 #include "misc.h"
-
+#include "../main.h"
 
 #if defined(TARGET_SDL)
 
@@ -930,6 +930,21 @@
       ((ButtonEvent *)event)->y = 0;
   }
 #endif
+  if (event->type == EVENT_KEYPRESS)
+  {
+    /* make alt + enter toggle fullscreen */
+    if ( (((KeyEvent *)event)->keysym.sym == KSYM_Return) &&
+         (((KeyEvent *)event)->keysym.mod == KMOD_LALT) )
+    {
+      if(SDL_WM_ToggleFullScreen(SDL_GetVideoSurface()))
+      {
+        video.fullscreen_enabled = !video.fullscreen_enabled;  
+        setup.fullscreen = video.fullscreen_enabled;
+      }
+      /* make this an invalid event so the enter has no further results */
+      event->type = -1;
+    }
+  }
 }
 
 #endif /* TARGET_SDL */
diff -ur mirrormagic-2.0.2.orig/src/libgame/system.h mirrormagic-2.0.2/src/libgame/system.h
--- mirrormagic-2.0.2.orig/src/libgame/system.h	2002-03-19 03:42:52.000000000 +0100
+++ mirrormagic-2.0.2/src/libgame/system.h	2006-09-29 12:13:06.000000000 +0200
@@ -154,7 +154,6 @@
   char *server_host;
   int server_port;
   char *ro_base_directory;
-  char *rw_base_directory;
   char *level_directory;
   boolean serveronly;
   boolean network;
diff -ur mirrormagic-2.0.2.orig/src/main.h mirrormagic-2.0.2/src/main.h
--- mirrormagic-2.0.2.orig/src/main.h	2003-06-07 18:04:37.000000000 +0200
+++ mirrormagic-2.0.2/src/main.h	2006-09-29 11:36:39.000000000 +0200
@@ -459,7 +459,6 @@
 #endif
 extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;
-extern struct JoystickInfo	joystick[];
 extern struct SetupInfo		setup;
 extern struct GameInfo		game;
 extern struct LaserInfo		laser;
diff -ur mirrormagic-2.0.2.orig/src/tools.c mirrormagic-2.0.2/src/tools.c
--- mirrormagic-2.0.2.orig/src/tools.c	2002-03-19 03:53:26.000000000 +0100
+++ mirrormagic-2.0.2/src/tools.c	2006-09-29 14:01:07.000000000 +0200
@@ -1310,6 +1310,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;


--- NEW FILE mirrormagic.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mirror Magic
Comment=Puzzle game where you steer a beam of light using mirrors
Exec=mirrormagic
Icon=mirrormagic.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;


--- NEW FILE mirrormagic.spec ---
Name:           mirrormagic
Version:        2.0.2
Release:        2%{?dist}
Summary:        Puzzle game where you steer a beam of light using mirrors
Group:          Amusements/Games
License:        GPL
URL:            http://www.artsoft.org/mirrormagic/
Source0:        http://www.artsoft.org/RELEASES/unix/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         %{name}-%{version}-fixes.patch
Patch1:         %{name}-%{version}-64bit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_image-devel SDL_mixer-devel desktop-file-utils

%description
MirrorMagic is a game where you shoot around obstacles to collect energy using
your beam. It is similar to "Mindbender" (Amiga) from the same author. The goal
is to work out how to get around obstacles to shoot energy containers with your
beam, thereby opening the path to the next level. Included are many levels
familiar from the games "Deflektor" and "Mindbender".


%prep
%setup -q
%patch0 -p1 -z .fixes
%patch1 -p1 -z .64bit


%build
make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name} \
  OPTIONS="$RPM_OPT_FLAGS" sdl


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
cp -a graphics levels music sounds $RPM_BUILD_ROOT%{_datadir}/%{name}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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 CHANGES COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sat Sep 30 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-2
- Add a patch which fixes running (startup) on 64 bit archs

* Fri Sep 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 20:07:18 -0000	1.1
+++ .cvsignore	6 Oct 2006 20:08:42 -0000	1.2
@@ -0,0 +1 @@
+mirrormagic-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 20:07:18 -0000	1.1
+++ sources	6 Oct 2006 20:08:42 -0000	1.2
@@ -0,0 +1 @@
+32fd3909c1e27f493d89bc2276da6744  mirrormagic-2.0.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 20:09:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:09:48 -0700
Subject: owners owners.list,1.1786,1.1787
Message-ID: <200610062009.k96K9oSg021903@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21886

Modified Files:
	owners.list 
Log Message:
added mirrormagic


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1786
retrieving revision 1.1787
diff -u -r1.1786 -r1.1787
--- owners.list	6 Oct 2006 14:36:10 -0000	1.1786
+++ owners.list	6 Oct 2006 20:09:47 -0000	1.1787
@@ -1030,6 +1030,7 @@
 Fedora Extras|mimedefang|E-Mail filtering framework using Sendmail's Milter interface|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|mirrormagic|Puzzle game where you steer a beam of light using mirrors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mlton|Optimizing compiler for Standard ML|adam at spicenitz.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 20:13:18 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri,  6 Oct 2006 13:13:18 -0700
Subject: rpms/plplot/devel plplot.spec,1.21,1.22
Message-ID: <200610062013.k96KDKpa021950@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21933

Modified Files:
	plplot.spec 
Log Message:
- Rebuild for new octave API version



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plplot.spec	3 Oct 2006 22:29:00 -0000	1.21
+++ plplot.spec	6 Oct 2006 20:13:17 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -347,7 +347,10 @@
 
 
 %changelog
-* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-6
+* Fri Oct  6 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-7
+- Rebuild for new octave API version
+
+* Tue Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-6
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Mon Sep 25 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-5



From fedora-extras-commits at redhat.com  Fri Oct  6 20:14:58 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri,  6 Oct 2006 13:14:58 -0700
Subject: rpms/plplot/FC-5 plplot.spec,1.18,1.19
Message-ID: <200610062015.k96KF0Wl022011@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21994

Modified Files:
	plplot.spec 
Log Message:
- Rebuild for new octave API version



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plplot.spec	25 Sep 2006 16:46:54 -0000	1.18
+++ plplot.spec	6 Oct 2006 20:14:58 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -347,6 +347,9 @@
 
 
 %changelog
+* Fri Oct  6 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-5
+- Rebuild for new octave API version
+
 * Mon Sep 25 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-4
 - Add needed Requires for -devel packages (bug #202168)
 - Add patch for info file to fix category



From fedora-extras-commits at redhat.com  Fri Oct  6 21:38:40 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 14:38:40 -0700
Subject: rpms/adns/devel needs.rebuild,1.1,NONE
Message-ID: <200610062138.k96Lcgvm025284@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25269

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 21:42:59 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 14:42:59 -0700
Subject: rpms/gcin/FC-4 needs.rebuild,1.1,NONE
Message-ID: <200610062143.k96Lh1x7025315@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25300

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 21:43:28 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 14:43:28 -0700
Subject: rpms/gcin/FC-3 needs.rebuild,1.1,NONE
Message-ID: <200610062143.k96LhUtH025341@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25326

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 22:15:06 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri,  6 Oct 2006 15:15:06 -0700
Subject: rpms/sysprof-kmod/FC-5 sysprof-kmod.spec,1.5,1.6
Message-ID: <200610062215.k96MF8UN028553@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28339

Modified Files:
	sysprof-kmod.spec 
Log Message:
Prepare for FC5 build



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sysprof-kmod.spec	4 Oct 2006 22:21:40 -0000	1.5
+++ sysprof-kmod.spec	6 Oct 2006 22:15:06 -0000	1.6
@@ -4,23 +4,18 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
+%{!?kversion: %define kversion 2.6.17-1.2187_FC5}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 
 %define kmod_name sysprof
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
 
-%ifarch i686
-%define pae PAE
-%endif
-%ifarch ppc
+%ifarch i686 ppc
 %define smp smp
 %endif
-%ifarch i686 x86_64 ia64
-%define xen xen
-%endif
-%ifarch i686 x86_64 ppc64 ppc64iseries
+%ifarch i686 x86_64
+%define xen xen xen0
 %define kdump kdump
 %endif
 %{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump}}



From fedora-extras-commits at redhat.com  Fri Oct  6 22:16:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri,  6 Oct 2006 15:16:26 -0700
Subject: rpms/sysprof/FC-5 sysprof.spec,1.1,1.2
Message-ID: <200610062216.k96MGSTO028576@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28559

Modified Files:
	sysprof.spec 
Log Message:
Prepare for FC5 build



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysprof.spec	4 Oct 2006 14:40:56 -0000	1.1
+++ sysprof.spec	6 Oct 2006 22:16:26 -0000	1.2
@@ -16,7 +16,6 @@
 
 BuildRequires:  gtk2-devel => 2.6
 BuildRequires:  libglade2-devel
-BuildRequires:  binutils-devel
 BuildRequires:  desktop-file-utils
 
 
@@ -60,7 +59,7 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Tue Oct 2 2006 ianluca Sforna <giallu gmail com> 1.0.3-4
+* Tue Oct 2 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
 - add .desktop file
 
 * Fri Sep 30 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3



From fedora-extras-commits at redhat.com  Fri Oct  6 22:22:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:22:05 -0700
Subject: rebuild-scripts - Imported sources
Message-ID: <200610062222.k96MM5X4028683@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644

Log Message:
Import rebuild-scripts (second try...)

Status:

Vendor Tag:	fedora
Release Tags:	start
		
N rebuild-scripts/check_rebuild2
N rebuild-scripts/gen_rebuild_lst
N rebuild-scripts/add_owner
N rebuild-scripts/check_rebuild
N rebuild-scripts/check_release
N rebuild-scripts/rm_noarch
N rebuild-scripts/buildcheck-extras-development.repo
N rebuild-scripts/gen_nr_2
N rebuild-scripts/bumpspecfile.py
N rebuild-scripts/semi_auto_rebuild.txt
N rebuild-scripts/buildcheck

No conflicts created by this import




From fedora-extras-commits at redhat.com  Fri Oct  6 22:45:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:45:20 -0700
Subject: rpms/daap-sharp/devel needs.rebuild,1.1,NONE
Message-ID: <200610062245.k96MjM0e029029@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/daap-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29014

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 22:47:00 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:47:00 -0700
Subject: rpms/pan/devel needs.rebuild,1.1,NONE
Message-ID: <200610062247.k96Ml235029060@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29045

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 22:48:45 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:48:45 -0700
Subject: rpms/python-adns/devel needs.rebuild,1.1,NONE
Message-ID: <200610062248.k96MmljD029088@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/python-adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29073

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 22:49:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:49:50 -0700
Subject: rpms/ss5/devel needs.rebuild,1.1,NONE
Message-ID: <200610062249.k96Mnqqo029114@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ss5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29099

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 23:49:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri,  6 Oct 2006 16:49:48 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.9,1.10
Message-ID: <200610062349.k96Nnoma032237@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32217

Modified Files:
	gdeskcal.spec 
Log Message:

Rebuild 
	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdeskcal.spec	10 Apr 2006 10:40:41 -0000	1.9
+++ gdeskcal.spec	6 Oct 2006 23:49:47 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        0.57.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sat Oct 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-6
+- rebuild
+
 * Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
 - rebuilt
 - minor spec changes



From fedora-extras-commits at redhat.com  Sat Oct  7 00:58:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri,  6 Oct 2006 17:58:46 -0700
Subject: owners owners.list,1.1787,1.1788
Message-ID: <200610070058.k970wmrV002893@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2876

Modified Files:
	owners.list 
Log Message:
fix supertuxkart entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1787
retrieving revision 1.1788
diff -u -r1.1787 -r1.1788
--- owners.list	6 Oct 2006 20:09:47 -0000	1.1787
+++ owners.list	7 Oct 2006 00:58:45 -0000	1.1788
@@ -2079,7 +2079,7 @@
 Fedora Extras|sunifdef|A commandline tool for simplifying the preprocessor conditionals in source code|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|superkaramba|Custom content on the desktop|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
-Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 01:46:59 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri,  6 Oct 2006 18:46:59 -0700
Subject: comps comps-fe6.xml.in,1.173,1.174
Message-ID: <200610070147.k971l1Z8006025@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6008

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add mirrormagic.


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- comps-fe6.xml.in	2 Oct 2006 21:29:59 -0000	1.173
+++ comps-fe6.xml.in	7 Oct 2006 01:46:58 -0000	1.174
@@ -371,6 +371,7 @@
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
       <packagereq type="optional">manaworld</packagereq>
+      <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>
       <packagereq type="optional">monsterz</packagereq>
       <packagereq type="optional">nazghul</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct  7 01:54:28 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri,  6 Oct 2006 18:54:28 -0700
Subject: rpms/konversation/devel .cvsignore, 1.4, 1.5 konversation.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200610070154.k971sUso006067@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6046

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
update to 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2006 12:00:11 -0000	1.4
+++ .cvsignore	7 Oct 2006 01:54:28 -0000	1.5
@@ -1 +1 @@
-konversation-1.0.tar.bz2
+konversation-1.0.1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- konversation.spec	14 Sep 2006 12:00:11 -0000	1.9
+++ konversation.spec	7 Oct 2006 01:54:28 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           konversation
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Fri Oct 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1
+- Upgrade to 1.0.1
+
 * Thu Sep 14 2006 Dennis Gilmore <dennis at ausil.us> - 1.0-1
 - Upgrade to 1.0 :)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2006 12:00:11 -0000	1.4
+++ sources	7 Oct 2006 01:54:28 -0000	1.5
@@ -1 +1 @@
-824bd7d2ac6a4164625dbae03d6d481e  konversation-1.0.tar.bz2
+60c2c5f94d4a916055db09728304b19f  konversation-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct  7 01:55:41 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri,  6 Oct 2006 18:55:41 -0700
Subject: rpms/konversation/FC-5 .cvsignore, 1.4, 1.5 konversation.spec, 1.8, 
	1.9 sources, 1.4, 1.5
Message-ID: <200610070155.k971thx8006138@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
update to 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2006 12:01:54 -0000	1.4
+++ .cvsignore	7 Oct 2006 01:55:41 -0000	1.5
@@ -1 +1 @@
-konversation-1.0.tar.bz2
+konversation-1.0.1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-5/konversation.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- konversation.spec	14 Sep 2006 12:01:54 -0000	1.8
+++ konversation.spec	7 Oct 2006 01:55:41 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           konversation
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Fri Oct 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1
+- Upgrade to 1.0.1
+
 * Thu Sep 14 2006 Dennis Gilmore <dennis at ausil.us> - 1.0-1
 - Upgrade to 1.0 :)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2006 12:01:54 -0000	1.4
+++ sources	7 Oct 2006 01:55:41 -0000	1.5
@@ -1 +1 @@
-824bd7d2ac6a4164625dbae03d6d481e  konversation-1.0.tar.bz2
+60c2c5f94d4a916055db09728304b19f  konversation-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct  7 02:18:56 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri,  6 Oct 2006 19:18:56 -0700
Subject: comps comps-fe5.xml.in,1.160,1.161 comps-fe6.xml.in,1.174,1.175
Message-ID: <200610070218.k972Iwws009137@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9111

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add some of my packages



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- comps-fe5.xml.in	2 Oct 2006 21:29:59 -0000	1.160
+++ comps-fe5.xml.in	7 Oct 2006 02:18:55 -0000	1.161
@@ -597,15 +597,19 @@
       <packagereq type="optional">kickpim</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>
+      <packagereq type="optional">kmobiletools</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">knemo</packagereq>
+      <packagereq type="optional">knetworkmanager</packagereq>
       <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kooldock</packagereq>
+      <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">krusader</packagereq>
       <packagereq type="optional">ksynaptics</packagereq>
       <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
+      <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- comps-fe6.xml.in	7 Oct 2006 01:46:58 -0000	1.174
+++ comps-fe6.xml.in	7 Oct 2006 02:18:55 -0000	1.175
@@ -684,10 +684,13 @@
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmenu-gnome</packagereq>
+      <packagereq type="optional">kmobiletools</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">knemo</packagereq>
+      <packagereq type="optional">knetworkmanager</packagereq>
       <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kooldock</packagereq>
+      <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">krusader</packagereq>
       <packagereq type="optional">ksensors</packagereq>
       <packagereq type="optional">kshutdown</packagereq>
@@ -695,6 +698,7 @@
       <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
+      <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct  7 03:39:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:39:50 -0700
Subject: rpms/comix - New directory
Message-ID: <200610070339.k973dq5d012473@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12452/comix

Log Message:
Directory /cvs/extras/rpms/comix added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 03:39:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:39:50 -0700
Subject: rpms/comix/devel - New directory
Message-ID: <200610070339.k973dqk2012476@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12452/comix/devel

Log Message:
Directory /cvs/extras/rpms/comix/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 03:40:07 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:40:07 -0700
Subject: rpms/comix Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610070340.k973eAP0012530@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12497

Added Files:
	Makefile import.log 
Log Message:
Setup of module comix


--- NEW FILE Makefile ---
# Top level Makefile for module comix
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 03:40:08 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:40:08 -0700
Subject: rpms/comix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610070340.k973eAjv012533@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12497/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module comix


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 03:40:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:40:40 -0700
Subject: rpms/comix import.log,1.1,1.2
Message-ID: <200610070341.k973fCgR012599@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12565

Modified Files:
	import.log 
Log Message:
auto-import comix-3.6-2 on branch devel from comix-3.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/comix/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 03:40:07 -0000	1.1
+++ import.log	7 Oct 2006 03:40:39 -0000	1.2
@@ -0,0 +1 @@
+comix-3_6-2:HEAD:comix-3.6-2.src.rpm:1160192433



From fedora-extras-commits at redhat.com  Sat Oct  7 03:40:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:40:40 -0700
Subject: rpms/comix/devel comix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610070341.k973fCE9012603@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12565/devel

Modified Files:
	.cvsignore sources 
Added Files:
	comix.spec 
Log Message:
auto-import comix-3.6-2 on branch devel from comix-3.6-2.src.rpm


--- NEW FILE comix.spec ---
Name:		comix
Version:	3.6
Release:	2%{?dist}
Summary:	A user-friendly, customizable image viewer

Group:		Amusements/Graphics
License:	GPL
URL:		http://comix.sourceforge.net/
Source0:	http://optusnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	pygtk2
BuildRequires:	python-imaging
BuildRequires:	desktop-file-utils
BuildRequires:	%{_bindir}/jpegtran
Requires:	pygtk2
Requires:	python-imaging
Requires:	%{_bindir}/jpegtran
Requires(pre):	GConf2
Requires(preun):	GConf2
Requires(post):	GConf2

%description
Comix is a user-friendly, customizable image viewer. 
It is specifically designed to handle comic books, but 
also serves as a generic viewer. It reads images in ZIP, 
RAR or tar archives (also gzip or bzip2 compressed) as 
well as plain image files. It is written in Python and 
uses GTK+ through the PyGTK bindings.

%prep
%setup -q

%build
%{__sed} -i -e 's|shutil.copy|shutil.copy2|' install.py

%{__sed} -e 's|\r||g' COPYING > COPYING.tmp && \
	( touch -r COPYING COPYING.tmp ; %{__mv} -f COPYING.tmp COPYING )
%{__rm} -f COPYING.tmp
	
iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp && \
	( touch -r ChangeLog ChangeLog.tmp ; %{__mv} -f ChangeLog.tmp ChangeLog )
%{__rm} -f ChangeLog.tmp

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}

export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%{__python} install.py --installdir $RPM_BUILD_ROOT%{_prefix} install

desktop-file-install \
	--vendor fedora \
	--delete-original \
	--add-category X-Fedora \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/mime/
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mime/packages
%{__install} -c -p -m644 mime/comix.xml \
	$RPM_BUILD_ROOT%{_datadir}/mime/packages/%{name}.xml

%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
%{__install} -c -p -m644 mime/comicbook.schemas \
	$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/%{name}.schemas

%find_lang %{name}

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%pre
[ "$1" -gt 1 ] || exit 0

export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`	
gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :

# If the schema file has ever been renamed::
# gconftool-2 --makefile-uninstall-rule \
# 	%{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :

killall -HUP gconfd-2 || :

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
killall -HUP gconfd-2 || :

touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :

%preun
[ "$1" -eq 0 ] || exit 0

export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
killall -HUP gconfd-2 || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING ChangeLog README

# Hey!! No package (required by this package) owns
# /etc/gconf /etc/gconf/schemas?
%dir %{_sysconfdir}/gconf
%dir %{_sysconfdir}/gconf/schemas
%{_sysconfdir}/gconf/schemas/%{name}.schemas

%{_bindir}/*

%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml

%{_mandir}/man1/*

%{_datadir}/icons/hicolor/*/apps/%{name}*
%{_datadir}/pixmaps/%{name}.png
%dir %{_datadir}/pixmaps/%{name}
%{_datadir}/pixmaps/%{name}/*.png


%changelog
* Fri Oct 06 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6-2
- Specify URL.

* Fri Oct 06 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6-1
- Initial packaging, importing to Fedora extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 03:40:08 -0000	1.1
+++ .cvsignore	7 Oct 2006 03:40:40 -0000	1.2
@@ -0,0 +1 @@
+comix-3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 03:40:08 -0000	1.1
+++ sources	7 Oct 2006 03:40:40 -0000	1.2
@@ -0,0 +1 @@
+2d6034c5c032fcb5fe257048d64364a8  comix-3.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 04:00:59 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 21:00:59 -0700
Subject: owners owners.list,1.1788,1.1789
Message-ID: <200610070401.k97411s0012793@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12762

Modified Files:
	owners.list 
Log Message:
add comix to owners.list


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1788
retrieving revision 1.1789
diff -u -r1.1788 -r1.1789
--- owners.list	7 Oct 2006 00:58:45 -0000	1.1788
+++ owners.list	7 Oct 2006 04:00:59 -0000	1.1789
@@ -204,6 +204,7 @@
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|comix|A user-friendly, customizable image viewer|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|commoncpp2|GNU Common C++ class framework|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|compat-erlang|Compatibility version of Erlang|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|compat-libgda|Library for writing gnome database programs|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 04:42:31 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri,  6 Oct 2006 21:42:31 -0700
Subject: rpms/paraview/devel paraview.spec,1.7,1.8
Message-ID: <200610070442.k974gXjg015780@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15761

Modified Files:
	paraview.spec 
Log Message:
- Install needed python libraries to get around make install bug



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- paraview.spec	4 Oct 2006 15:23:23 -0000	1.7
+++ paraview.spec	7 Oct 2006 04:42:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -183,6 +183,8 @@
 pushd fedora-mpi
 make install DESTDIR=$RPM_BUILD_ROOT
 #Get rid of useless man and cmake files
+install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/
+install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/*ICET*cmake
 cat > paraview-mpi.desktop <<EOF
@@ -217,6 +219,8 @@
 #Install the normal version
 pushd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
+install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4/
+install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4/
 cat > paraview.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
@@ -306,6 +310,9 @@
 
 
 %changelog
+* Fri Oct  6 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-3
+- Install needed python libraries to get around make install bug
+
 * Wed Oct  4 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-2
 - Re-enable OSMESA support for FC6
 - Enable python wrapping



From fedora-extras-commits at redhat.com  Sat Oct  7 04:57:52 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  6 Oct 2006 21:57:52 -0700
Subject: rpms/perl-Calendar-Simple/devel perl-Calendar-Simple.spec,1.4,1.5
Message-ID: <200610070457.k974vseu015873@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15856

Modified Files:
	perl-Calendar-Simple.spec 
Log Message:
* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
- chmod -x files with broken permissions.



Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/devel/perl-Calendar-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Calendar-Simple.spec	18 Sep 2006 13:33:52 -0000	1.4
+++ perl-Calendar-Simple.spec	7 Oct 2006 04:57:52 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
 Version:	1.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,6 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
+chmod -x COPYING lib/*/*.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
+- chmod -x files with broken permissions.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 04:58:43 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  6 Oct 2006 21:58:43 -0700
Subject: rpms/perl-Calendar-Simple/FC-5 perl-Calendar-Simple.spec,1.3,1.4
Message-ID: <200610070458.k974wjQa015934@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15917

Modified Files:
	perl-Calendar-Simple.spec 
Log Message:
* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
- chmod -x files with broken permissions.



Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-5/perl-Calendar-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Calendar-Simple.spec	18 Sep 2006 13:38:39 -0000	1.3
+++ perl-Calendar-Simple.spec	7 Oct 2006 04:58:43 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
 Version:	1.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,6 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
+chmod -x COPYING lib/*/*.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
+- chmod -x files with broken permissions.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 04:59:36 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  6 Oct 2006 21:59:36 -0700
Subject: rpms/perl-Calendar-Simple/FC-4 perl-Calendar-Simple.spec,1.3,1.4
Message-ID: <200610070459.k974xcWF015995@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15978

Modified Files:
	perl-Calendar-Simple.spec 
Log Message:
* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
- chmod -x files with broken permissions.



Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-4/perl-Calendar-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Calendar-Simple.spec	18 Sep 2006 13:39:00 -0000	1.3
+++ perl-Calendar-Simple.spec	7 Oct 2006 04:59:36 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
 Version:	1.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,6 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
+chmod -x COPYING lib/*/*.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
+- chmod -x files with broken permissions.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 05:15:30 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:15:30 -0700
Subject: rpms/wmctrl - New directory
Message-ID: <200610070515.k975FWlY019040@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19019/wmctrl

Log Message:
Directory /cvs/extras/rpms/wmctrl added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 05:15:30 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:15:30 -0700
Subject: rpms/wmctrl/devel - New directory
Message-ID: <200610070515.k975FWuO019043@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19019/wmctrl/devel

Log Message:
Directory /cvs/extras/rpms/wmctrl/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 05:15:43 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:15:43 -0700
Subject: rpms/wmctrl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610070515.k975FjNb019097@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19064

Added Files:
	Makefile import.log 
Log Message:
Setup of module wmctrl


--- NEW FILE Makefile ---
# Top level Makefile for module wmctrl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 05:15:44 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:15:44 -0700
Subject: rpms/wmctrl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610070515.k975Fk2F019100@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19064/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wmctrl


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 05:16:02 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:16:02 -0700
Subject: rpms/wmctrl import.log,1.1,1.2
Message-ID: <200610070516.k975G4pJ019161@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19128

Modified Files:
	import.log 
Log Message:
auto-import wmctrl-1.07-2.fc5 on branch devel from wmctrl-1.07-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 05:15:43 -0000	1.1
+++ import.log	7 Oct 2006 05:16:02 -0000	1.2
@@ -0,0 +1 @@
+wmctrl-1_07-2_fc5:HEAD:wmctrl-1.07-2.fc5.src.rpm:1160198158



From fedora-extras-commits at redhat.com  Sat Oct  7 05:16:02 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:16:02 -0700
Subject: rpms/wmctrl/devel wmctrl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610070516.k975G4SE019166@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19128/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wmctrl.spec 
Log Message:
auto-import wmctrl-1.07-2.fc5 on branch devel from wmctrl-1.07-2.fc5.src.rpm


--- NEW FILE wmctrl.spec ---
Name:           wmctrl
Version:        1.07
Release:        2%{?dist}
Summary:        A command line tool to interact with an X Window Manager

Group:          User Interface/X
License:        GPL
URL:            http://sweb.cz/tripie/utils/wmctrl
Source0:        http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xorg-x11-proto-devel, libXmu-devel, glib2-devel

%description
 The wmctrl program is a UNIX/Linux command line tool to interact with an 
 EWMH/NetWM compatible X Window Manager. The tool provides command line access 
 to almost all the features defined in the EWMH specification. It can be used, 
 for example, to obtain information about the window manager, to get a detailed 
 list of desktops and managed windows, to switch and resize desktops, to make 
 windows full-screen, always-above or sticky, and to activate, close, move, 
 resize, maximize and minimize them. The command line access to these window 
 management functions makes it easy to automate and execute them from any 
 application that is able to run a command in response to an event. 


%prep
%setup -q 

%build
%configure 
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Wed Oct 04 2006 Michael Rice <errr[AT]errr-online.com> - 1.07-2
- Fix Summary per rpmlint warning
- Fix description per rpmlint warning
- Remove unneeded line from setup
- Remove NEWS from docs since it was empty
- Reformat Changlelog entrys in spec file due to bad formatting
- Changed Group to User Interface/X

* Wed Sep 27 2006 Michael Rice <errr[AT]errr-online.com> - 1.07-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 05:15:43 -0000	1.1
+++ .cvsignore	7 Oct 2006 05:16:02 -0000	1.2
@@ -0,0 +1 @@
+wmctrl-1.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 05:15:43 -0000	1.1
+++ sources	7 Oct 2006 05:16:02 -0000	1.2
@@ -0,0 +1 @@
+1fe3c7a2caa6071e071ba34f587e1555  wmctrl-1.07.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 05:25:23 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 22:25:23 -0700
Subject: rpms/jd/devel jd.spec,1.3,1.4
Message-ID: <200610070525.k975PPKS019274@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19257

Modified Files:
	jd.spec 
Log Message:
* Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
- Add libSM-devel to BuildRequires.



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jd.spec	27 Sep 2006 14:43:24 -0000	1.3
+++ jd.spec	7 Oct 2006 05:25:22 -0000	1.4
@@ -15,7 +15,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         vendor        fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
@@ -49,6 +49,7 @@
 BuildRequires:  libtool automake
 BuildRequires:  openssl-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  libSM-devel
 Requires:       fonts-japanese
 
 
@@ -99,12 +100,12 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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
 
-* Tue Sep 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060926
-- cvs 2006-09-26
-
 * Mon Sep 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060921
 - Import to Fedora Extras.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 05:26:11 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 22:26:11 -0700
Subject: rpms/jd/FC-5 jd.spec,1.2,1.3
Message-ID: <200610070526.k975QD1X019340@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19323

Modified Files:
	jd.spec 
Log Message:
* Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
- Add libSM-devel to BuildRequires.



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jd.spec	27 Sep 2006 14:44:48 -0000	1.2
+++ jd.spec	7 Oct 2006 05:26:11 -0000	1.3
@@ -15,7 +15,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         vendor        fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
@@ -49,6 +49,7 @@
 BuildRequires:  libtool automake
 BuildRequires:  openssl-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  libSM-devel
 Requires:       fonts-japanese
 
 
@@ -99,12 +100,12 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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
 
-* Tue Sep 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060926
-- cvs 2006-09-26
-
 * Mon Sep 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060921
 - Import to Fedora Extras.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 05:28:34 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:28:34 -0700
Subject: owners owners.list,1.1789,1.1790
Message-ID: <200610070528.k975SacS019419@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19384

Modified Files:
	owners.list 
Log Message:
adding my name as maintainer of wmctl  bug: 208422



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1789
retrieving revision 1.1790
diff -u -r1.1789 -r1.1790
--- owners.list	7 Oct 2006 04:00:59 -0000	1.1789
+++ owners.list	7 Oct 2006 05:28:34 -0000	1.1790
@@ -2258,6 +2258,7 @@
 Fedora Extras|wmacpi|Dockapp for laptop acpi/apm information|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wmctrl|A command line tool to interact with an X Window Manager|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|wmix|Dockapp mixer|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmx|A really simple window manager for X|somlo at cmu.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 06:40:06 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:40:06 -0700
Subject: owners owners.list,1.1790,1.1791
Message-ID: <200610070640.k976e8je022627@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22608/owners

Modified Files:
	owners.list 
Log Message:
Prepare to upload new package: sipsak


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1790
retrieving revision 1.1791
diff -u -r1.1790 -r1.1791
--- owners.list	7 Oct 2006 05:28:34 -0000	1.1790
+++ owners.list	7 Oct 2006 06:40:05 -0000	1.1791
@@ -2031,6 +2031,7 @@
 Fedora Extras|SIBsim4|Align expressed RNA sequences on a DNA template|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org|
+Fedora Extras|sipsak|SIP swiss army knife|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|sjasm|A z80 cross assembler|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 06:47:05 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:47:05 -0700
Subject: rpms/fuse/devel fuse-udev_rules.patch,1.4,1.5 fuse.spec,1.11,1.12
Message-ID: <200610070647.k976l8R8022727@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22667/fuse/devel

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule for FUSE

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse-udev_rules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-udev_rules.patch	13 Feb 2006 11:10:30 -0000	1.4
+++ fuse-udev_rules.patch	7 Oct 2006 06:47:05 -0000	1.5
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fuse.spec	12 Sep 2006 05:08:34 -0000	1.11
+++ fuse.spec	7 Oct 2006 06:47:05 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
+- Fixed udev-rule
+
 * Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-3%{?dist}
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Sat Oct  7 06:46:59 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:46:59 -0700
Subject: rpms/fuse/FC-4 fuse-udev_rules.patch,1.2,1.3 fuse.spec,1.6,1.7
Message-ID: <200610070647.k976lVma022731@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22667/fuse/FC-4

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule for FUSE

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse-udev_rules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fuse-udev_rules.patch	13 Feb 2006 12:23:49 -0000	1.2
+++ fuse-udev_rules.patch	7 Oct 2006 06:46:59 -0000	1.3
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse.spec	3 May 2006 08:56:04 -0000	1.6
+++ fuse.spec	7 Oct 2006 06:46:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,12 @@
 
 %changelog
 
+* Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
+- Fixed udev-rule
+
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-3%{?dist}
+- Rebuild for FC6
+
 * Wed May 03 2006 Peter Lemenkov <lemenkov at newmail.ru> 2.5.3-1%{?dist}
 - Update to 2.5.3
 



From fedora-extras-commits at redhat.com  Sat Oct  7 06:47:00 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:47:00 -0700
Subject: rpms/fuse/FC-5 fuse-udev_rules.patch,1.4,1.5 fuse.spec,1.10,1.11
Message-ID: <200610070647.k976lWn6022735@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22667/fuse/FC-5

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule for FUSE

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse-udev_rules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-udev_rules.patch	13 Feb 2006 11:10:30 -0000	1.4
+++ fuse-udev_rules.patch	7 Oct 2006 06:47:00 -0000	1.5
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fuse.spec	3 May 2006 08:58:07 -0000	1.10
+++ fuse.spec	7 Oct 2006 06:47:00 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,12 @@
 
 %changelog
 
+* Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
+- Fixed udev-rule
+
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-3%{?dist}
+- Rebuild for FC6
+
 * Wed May 03 2006 Peter Lemenkov <lemenkov at newmail.ru> 2.5.3-1%{?dist}
 - Update to 2.5.3
 



From fedora-extras-commits at redhat.com  Sat Oct  7 06:55:19 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:55:19 -0700
Subject: rpms/sipsak - New directory
Message-ID: <200610070655.k976tLG4022926@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22900/sipsak

Log Message:
Directory /cvs/extras/rpms/sipsak added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 06:55:20 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:55:20 -0700
Subject: rpms/sipsak/devel - New directory
Message-ID: <200610070655.k976tM8o022929@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22900/sipsak/devel

Log Message:
Directory /cvs/extras/rpms/sipsak/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 06:55:53 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:55:53 -0700
Subject: rpms/sipsak Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610070655.k976ttaN022973@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22945

Added Files:
	Makefile import.log 
Log Message:
Setup of module sipsak


--- NEW FILE Makefile ---
# Top level Makefile for module sipsak
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 06:55:53 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:55:53 -0700
Subject: rpms/sipsak/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610070655.k976ttfO022976@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22945/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sipsak


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 06:56:48 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:56:48 -0700
Subject: rpms/sipsak import.log,1.1,1.2
Message-ID: <200610070657.k976vKYn023043@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23009

Modified Files:
	import.log 
Log Message:
auto-import sipsak-0.9.6-1 on branch devel from sipsak-0.9.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sipsak/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 06:55:52 -0000	1.1
+++ import.log	7 Oct 2006 06:56:48 -0000	1.2
@@ -0,0 +1 @@
+sipsak-0_9_6-1:HEAD:sipsak-0.9.6-1.src.rpm:1160204185



From fedora-extras-commits at redhat.com  Sat Oct  7 06:56:49 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:56:49 -0700
Subject: rpms/sipsak/devel sipsak.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610070657.k976vLko023047@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23009/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sipsak.spec 
Log Message:
auto-import sipsak-0.9.6-1 on branch devel from sipsak-0.9.6-1.src.rpm


--- NEW FILE sipsak.spec ---
Summary:	SIP swiss army knife
Name:		sipsak
Version:	0.9.6
Release: 	1%{?dist}
License:	GPL
Group:		Applications/Communications
URL:		http://sipsak.org/
Source0:	http://download.berlios.de/sipsak/%{name}-%{version}-1.tar.gz
BuildRequires:	openssl-devel
#BuildRequires:	gnutls-devel
#BuildRequires:	ruli-devel
BuildRequires:	c-ares-devel
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
sipsak is a small command line tool for developers and
administrators of Session Initiation Protocol (SIP) applications.
It can be used for some simple tests on SIP applications and
devices.

%prep

%setup -q

%build
%configure --disable-gnutls
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
%{__rm} -f %{buildroot}/%{_libdir}/*.la

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

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Sun Sep 17 2006 Peter Lemenkov <lemenkov at gmail.com> 0.9.6-1
- Initial build for FE

* Wed Feb 08 2006 Oden Eriksson <oeriksson at mandriva.com> 0.9.6-1mdk
- 0.9.6
- disable gnutls support
- fix deps

* Sun Apr 24 2005 Oden Eriksson <oeriksson at mandriva.com> 0.8.12-1mdk
- initial Mandriva package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sipsak/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 06:55:53 -0000	1.1
+++ .cvsignore	7 Oct 2006 06:56:49 -0000	1.2
@@ -0,0 +1 @@
+sipsak-0.9.6-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sipsak/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 06:55:53 -0000	1.1
+++ sources	7 Oct 2006 06:56:49 -0000	1.2
@@ -0,0 +1 @@
+c4eb8e282902e75f4f040f09ea9d99d5  sipsak-0.9.6-1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 08:08:37 2006
From: fedora-extras-commits at redhat.com (Kushal Das (kushal))
Date: Sat,  7 Oct 2006 01:08:37 -0700
Subject: rpms/kphotobymail/devel .cvsignore, 1.2, 1.3 kphotobymail.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610070808.k9788dvT029053@cvs-int.fedora.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/kphotobymail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29032

Modified Files:
	.cvsignore kphotobymail.spec sources 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2006 20:01:59 -0000	1.2
+++ .cvsignore	7 Oct 2006 08:08:37 -0000	1.3
@@ -1 +1,2 @@
 kphotobymail-0.3.2.tar.gz
+kphotobymail-0.4.tar.gz


Index: kphotobymail.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/devel/kphotobymail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kphotobymail.spec	29 Sep 2006 20:01:59 -0000	1.1
+++ kphotobymail.spec	7 Oct 2006 08:08:37 -0000	1.2
@@ -2,9 +2,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		kphotobymail
-Version: 	0.3.2
-Release:	4%{?dist}
-Summary:	A PyQT based application for uploading photos to flickr account
+Version: 	0.4
+Release:	1%{?dist}
+Summary:	A PyQt based application for uploading photos to flickr account
 Group:		Applications/Internet
 License:	GPL
 URL:		http://kphotobymail.sourceforge.net/
@@ -16,7 +16,7 @@
 Requires:	python >= 2.4, PyQt >= 3.15
 
 %description
-Kphotobymail is a PyQT based application for uploading photos 
+Kphotobymail is a PyQt based application for uploading photos 
 to flickr account.You can also use it to send emails with photo 
 attachment on the fly.
 
@@ -57,6 +57,9 @@
 %{_datadir}/applications/fedora-kphotobymail.desktop
 
 %changelog
+* Sat Oct 07 2006 Kushal Das <kushal at fedoraproject.org> 0.4-1
+- new release
+
 * Fri Sep 29 2006 Kushal Das <kushal at fedoraproject.org> 0.3.2-4
 - spaces fixed, now having Tabs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 20:01:59 -0000	1.2
+++ sources	7 Oct 2006 08:08:37 -0000	1.3
@@ -1 +1,2 @@
 ea1faf6bc1e4a2ad7b381df34e0e8200  kphotobymail-0.3.2.tar.gz
+ee42c81260f329b3c90f0653af9014a8  kphotobymail-0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 08:28:20 2006
From: fedora-extras-commits at redhat.com (Kushal Das (kushal))
Date: Sat,  7 Oct 2006 01:28:20 -0700
Subject: rpms/kphotobymail/FC-5 kphotobymail.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200610070828.k978SMT8029159@cvs-int.fedora.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/kphotobymail/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29136

Modified Files:
	kphotobymail.spec sources 
Log Message:
New Release




Index: kphotobymail.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/FC-5/kphotobymail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kphotobymail.spec	29 Sep 2006 20:01:59 -0000	1.1
+++ kphotobymail.spec	7 Oct 2006 08:28:20 -0000	1.2
@@ -2,9 +2,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		kphotobymail
-Version: 	0.3.2
-Release:	4%{?dist}
-Summary:	A PyQT based application for uploading photos to flickr account
+Version: 	0.4
+Release:	1%{?dist}
+Summary:	A PyQt based application for uploading photos to flickr account
 Group:		Applications/Internet
 License:	GPL
 URL:		http://kphotobymail.sourceforge.net/
@@ -16,7 +16,7 @@
 Requires:	python >= 2.4, PyQt >= 3.15
 
 %description
-Kphotobymail is a PyQT based application for uploading photos 
+Kphotobymail is a PyQt based application for uploading photos 
 to flickr account.You can also use it to send emails with photo 
 attachment on the fly.
 
@@ -57,6 +57,9 @@
 %{_datadir}/applications/fedora-kphotobymail.desktop
 
 %changelog
+* Sat Oct 07 2006 Kushal Das <kushal at fedoraproject.org> 0.4-1
+- new release
+
 * Fri Sep 29 2006 Kushal Das <kushal at fedoraproject.org> 0.3.2-4
 - spaces fixed, now having Tabs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 20:01:59 -0000	1.2
+++ sources	7 Oct 2006 08:28:20 -0000	1.3
@@ -1 +1,2 @@
 ea1faf6bc1e4a2ad7b381df34e0e8200  kphotobymail-0.3.2.tar.gz
+ee42c81260f329b3c90f0653af9014a8  kphotobymail-0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 09:00:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  7 Oct 2006 02:00:09 -0700
Subject: rpms/agave/FC-5 .cvsignore, 1.2, 1.3 agave.spec, 1.2, 1.3 sources,
	1.2, 1.3 agave-0.4.0-gcc41.patch, 1.1, NONE
Message-ID: <200610070900.k9790BFh029370@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/agave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29329/FC-5

Modified Files:
	.cvsignore agave.spec sources 
Removed Files:
	agave-0.4.0-gcc41.patch 
Log Message:
update to 0.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/agave/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jul 2006 15:43:07 -0000	1.2
+++ .cvsignore	7 Oct 2006 09:00:09 -0000	1.3
@@ -1 +1 @@
-agave-0.4.0.tar.bz2
+agave-0.4.1.tar.bz2


Index: agave.spec
===================================================================
RCS file: /cvs/extras/rpms/agave/FC-5/agave.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- agave.spec	23 Jul 2006 16:33:19 -0000	1.2
+++ agave.spec	7 Oct 2006 09:00:09 -0000	1.3
@@ -1,13 +1,12 @@
 Name:           agave
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Generate a variety of colorschemes from a single starting color
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://home.gna.org/colorscheme/
-Source0:        http://download.gna.org/colorscheme/releases/agave-0.4.0.tar.bz2
-Patch0:         agave-0.4.0-gcc41.patch
+Source0:        http://download.gna.org/colorscheme/releases/agave-0.4.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # see http://home.gna.org/colorscheme/downloads.shtml for buildreqs
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc41
 
 
 %build
@@ -86,6 +84,13 @@
 
 
 %changelog
+* Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.1-1
+- version 0.4.1
+- drop patch (applied upstream)
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
+- rebuild
+
 * Sun Jul 23 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-1
 - version 0.4.0
 - renamed to Agave


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/agave/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jul 2006 15:43:07 -0000	1.2
+++ sources	7 Oct 2006 09:00:09 -0000	1.3
@@ -1 +1 @@
-88a4f89acb62eab906b26803a760d7de  agave-0.4.0.tar.bz2
+e038138eff31a5286e1e41ac0e3b0f04  agave-0.4.1.tar.bz2


--- agave-0.4.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 09:00:10 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  7 Oct 2006 02:00:10 -0700
Subject: rpms/agave/devel .cvsignore, 1.2, 1.3 agave.spec, 1.3, 1.4 sources, 
	1.2, 1.3 agave-0.4.0-gcc41.patch, 1.1, NONE
Message-ID: <200610070900.k9790CNI029376@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/agave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29329/devel

Modified Files:
	.cvsignore agave.spec sources 
Removed Files:
	agave-0.4.0-gcc41.patch 
Log Message:
update to 0.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jul 2006 15:43:07 -0000	1.2
+++ .cvsignore	7 Oct 2006 09:00:09 -0000	1.3
@@ -1 +1 @@
-agave-0.4.0.tar.bz2
+agave-0.4.1.tar.bz2


Index: agave.spec
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/agave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- agave.spec	30 Aug 2006 14:22:34 -0000	1.3
+++ agave.spec	7 Oct 2006 09:00:09 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           agave
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Generate a variety of colorschemes from a single starting color
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://home.gna.org/colorscheme/
-Source0:        http://download.gna.org/colorscheme/releases/agave-0.4.0.tar.bz2
-Patch0:         agave-0.4.0-gcc41.patch
+Source0:        http://download.gna.org/colorscheme/releases/agave-0.4.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # see http://home.gna.org/colorscheme/downloads.shtml for buildreqs
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc41
 
 
 %build
@@ -86,6 +84,10 @@
 
 
 %changelog
+* Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.1-1
+- version 0.4.1
+- drop patch (applied upstream)
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jul 2006 15:43:07 -0000	1.2
+++ sources	7 Oct 2006 09:00:09 -0000	1.3
@@ -1 +1 @@
-88a4f89acb62eab906b26803a760d7de  agave-0.4.0.tar.bz2
+e038138eff31a5286e1e41ac0e3b0f04  agave-0.4.1.tar.bz2


--- agave-0.4.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  7 Oct 2006 02:01:08 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 sylpheed-claws.spec, 1.50, 1.51
Message-ID: <200610070901.k9791AU8032331@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29626/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	27 Sep 2006 15:21:50 -0000	1.25
+++ .cvsignore	7 Oct 2006 09:01:07 -0000	1.26
@@ -1 +1 @@
-sylpheed-claws-2.5.2.tar.bz2
+sylpheed-claws-2.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Sep 2006 15:21:50 -0000	1.26
+++ sources	7 Oct 2006 09:01:07 -0000	1.27
@@ -1 +1 @@
-a28001e212c0b536e7e8c4907243a3a2  sylpheed-claws-2.5.2.tar.bz2
+3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sylpheed-claws.spec	27 Sep 2006 15:21:50 -0000	1.50
+++ sylpheed-claws.spec	7 Oct 2006 09:01:07 -0000	1.51
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.2
+Version:        2.5.3
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.2.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -24,7 +24,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.45
+BuildRequires:  libetpan-devel >= 0.46
 BuildRequires:  libgnomeprintui22-devel
 
 %description
@@ -168,6 +168,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.3-1
+- version upgrade
+
 * Wed Sep 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  7 Oct 2006 02:01:08 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 sylpheed-claws.spec, 1.51, 1.52
Message-ID: <200610070901.k9791AHJ032335@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29626/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	27 Sep 2006 15:21:51 -0000	1.25
+++ .cvsignore	7 Oct 2006 09:01:08 -0000	1.26
@@ -1 +1 @@
-sylpheed-claws-2.5.2.tar.bz2
+sylpheed-claws-2.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Sep 2006 15:21:51 -0000	1.26
+++ sources	7 Oct 2006 09:01:08 -0000	1.27
@@ -1 +1 @@
-a28001e212c0b536e7e8c4907243a3a2  sylpheed-claws-2.5.2.tar.bz2
+3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sylpheed-claws.spec	27 Sep 2006 15:21:51 -0000	1.51
+++ sylpheed-claws.spec	7 Oct 2006 09:01:08 -0000	1.52
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.2
+Version:        2.5.3
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.2.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -24,7 +24,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.45
+BuildRequires:  libetpan-devel >= 0.46
 BuildRequires:  libgnomeprintui22-devel
 
 %description
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.3-1
+- version upgrade
+
 * Wed Sep 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  7 Oct 2006 02:01:07 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.21, 1.22 sources, 1.22,
	1.23 sylpheed-claws.spec, 1.45, 1.46
Message-ID: <200610070901.k9791dEo032359@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29626/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 Sep 2006 09:51:55 -0000	1.21
+++ .cvsignore	7 Oct 2006 09:01:06 -0000	1.22
@@ -1 +1 @@
-sylpheed-claws-2.5.2.tar.bz2
+sylpheed-claws-2.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Sep 2006 09:51:55 -0000	1.22
+++ sources	7 Oct 2006 09:01:06 -0000	1.23
@@ -1 +1 @@
-a28001e212c0b536e7e8c4907243a3a2  sylpheed-claws-2.5.2.tar.bz2
+3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sylpheed-claws.spec	30 Sep 2006 09:51:55 -0000	1.45
+++ sylpheed-claws.spec	7 Oct 2006 09:01:06 -0000	1.46
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        2.5.2
+Version:        2.5.3
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.2.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -179,6 +179,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.3-1
+- version upgrade
+
 * Wed Sep 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  7 Oct 2006 02:01:54 -0700
Subject: rpms/amarok/devel amarok.spec,1.62,1.63
Message-ID: <200610070901.k9791wZY032404@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32371/devel

Modified Files:
	amarok.spec 
Log Message:
rebuild for new libtunepimp


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- amarok.spec	5 Oct 2006 11:14:52 -0000	1.62
+++ amarok.spec	7 Oct 2006 09:01:54 -0000	1.63
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -244,6 +244,9 @@
 
 
 %changelog
+* Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
+- rebuild for new libtunepimp
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-5
 - add libmtp support
 



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:51 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  7 Oct 2006 02:01:51 -0700
Subject: rpms/amarok/FC-5 amarok.spec,1.61,1.62
Message-ID: <200610070902.k9792O3d032414@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32371/FC-5

Modified Files:
	amarok.spec 
Log Message:
rebuild for new libtunepimp


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- amarok.spec	5 Oct 2006 11:14:51 -0000	1.61
+++ amarok.spec	7 Oct 2006 09:01:50 -0000	1.62
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -244,6 +244,9 @@
 
 
 %changelog
+* Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
+- rebuild for new libtunepimp
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-5
 - add libmtp support
 



From fedora-extras-commits at redhat.com  Sat Oct  7 09:22:21 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  7 Oct 2006 02:22:21 -0700
Subject: rpms/gdeskcal/devel needs.rebuild,1.1,NONE
Message-ID: <200610070922.k979MNcS032733@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32718

Removed Files:
	needs.rebuild 
Log Message:

removed needs.rebuild 
 	needs.rebuild 



--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 12:01:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 05:01:33 -0700
Subject: rpms/kdemultimedia-extras/FC-5 kdemultimedia-extras.spec,1.5,1.6
Message-ID: <200610071201.k97C1Zu1009737@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9719

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8
- -extras: own %_datadir/apps/juk/pics



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdemultimedia-extras.spec	28 Sep 2006 20:25:28 -0000	1.5
+++ kdemultimedia-extras.spec	7 Oct 2006 12:01:32 -0000	1.6
@@ -450,6 +450,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %dir %{_datadir}/apps/juk/
+%dir %{_datadir}/apps/juk/pics
 %endif
 
 %if "%{?nonfree}" == "1"
@@ -469,6 +470,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8
+- -extras: own %%_datadir/apps/juk/pics
+
 * Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
 - -extras: drop --with-musicbrainz (for now)
 



From fedora-extras-commits at redhat.com  Sat Oct  7 12:04:46 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat,  7 Oct 2006 05:04:46 -0700
Subject: rpms/tor/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 tor.spec,1.2,1.3
Message-ID: <200610071204.k97C4mP9009808@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9788

Modified Files:
	.cvsignore sources tor.spec 
Log Message:
updated to 0.1.1.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 06:27:27 -0000	1.2
+++ .cvsignore	7 Oct 2006 12:04:45 -0000	1.3
@@ -1 +1 @@
-tor-0.1.1.23.tar.gz
+tor-*.tar.*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 06:27:27 -0000	1.2
+++ sources	7 Oct 2006 12:04:45 -0000	1.3
@@ -1 +1,2 @@
-33ce7155f545c4d30cb846d7017cc6c2  tor-0.1.1.23.tar.gz
+28dea6a77a43b6e421e1bd7b2cc3d940  tor-0.1.1.24.tar.gz
+217c02c37858cf6048ba2b0a99d76014  tor-0.1.1.24.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/tor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tor.spec	26 Sep 2006 06:32:21 -0000	1.2
+++ tor.spec	7 Oct 2006 12:04:45 -0000	1.3
@@ -9,8 +9,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.1.1.23
-Release:	%release_func 4
+Version:	0.1.1.24
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.24-1
+- updated to 0.1.1.24
+
 * Tue Sep 26 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.23-4
 - first FE release (review #175433)
 



From fedora-extras-commits at redhat.com  Sat Oct  7 12:06:15 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat,  7 Oct 2006 05:06:15 -0700
Subject: rpms/tor/FC-5 tor-0.1.1.23.tar.gz.asc,1.1,NONE
Message-ID: <200610071206.k97C6HQZ009860@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837/FC-5

Removed Files:
	tor-0.1.1.23.tar.gz.asc 
Log Message:
cleanups; removed old *.asc file


--- tor-0.1.1.23.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 12:06:16 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat,  7 Oct 2006 05:06:16 -0700
Subject: rpms/tor/devel tor-0.1.1.23.tar.gz.asc,1.1,NONE
Message-ID: <200610071206.k97C6Iq4009863@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837/devel

Removed Files:
	tor-0.1.1.23.tar.gz.asc 
Log Message:
cleanups; removed old *.asc file


--- tor-0.1.1.23.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 12:07:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 05:07:27 -0700
Subject: rpms/kdemultimedia-extras/FC-5 kdemultimedia-extras.spec,1.6,1.7
Message-ID: <200610071207.k97C7Tq8009988@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9971

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
Release++



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdemultimedia-extras.spec	7 Oct 2006 12:01:32 -0000	1.6
+++ kdemultimedia-extras.spec	7 Oct 2006 12:07:27 -0000	1.7
@@ -67,7 +67,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.4
-Release: 7%{?dist}%{?kde}
+Release: 8%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"



From fedora-extras-commits at redhat.com  Sat Oct  7 14:38:32 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:38:32 -0700
Subject: rpms/spandsp/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 spandsp.spec, 1.2, 1.3
Message-ID: <200610071438.k97EcYsp016460@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16439

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2006 03:08:33 -0000	1.3
+++ .cvsignore	7 Oct 2006 14:38:32 -0000	1.4
@@ -1 +1 @@
-spandsp-0.0.3pre23.tgz
+spandsp-0.0.3pre24.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2006 03:08:33 -0000	1.3
+++ sources	7 Oct 2006 14:38:32 -0000	1.4
@@ -1 +1 @@
-09a2b0b8c53923fd7351a2026fa0c2ff  spandsp-0.0.3pre23.tgz
+1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spandsp.spec	6 Oct 2006 03:08:33 -0000	1.2
+++ spandsp.spec	7 Oct 2006 14:38:32 -0000	1.3
@@ -1,9 +1,9 @@
-%define pre 23
+%define pre 24
 
 Summary: A DSP library for telephony
 Name: spandsp
 Version: 0.0.3
-Release: 1%{?pre:.pre%{pre}}
+Release: 1%{?pre:.pre%{pre}}%{dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
@@ -73,7 +73,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.0.3-1.pre23
+* Sat Oct  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1.pre24
+- Update to 0.0.3pre24
+- Add dist tag.
+
+* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1.pre23
 - Update to 0.0.3pre23
 
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> - 0.0.2-1.pre26



From fedora-extras-commits at redhat.com  Sat Oct  7 14:41:22 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:41:22 -0700
Subject: rpms/spandsp/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 spandsp.spec, 1.2, 1.3
Message-ID: <200610071441.k97EfOHn016544@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16523

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2006 03:08:33 -0000	1.3
+++ .cvsignore	7 Oct 2006 14:41:22 -0000	1.4
@@ -1 +1 @@
-spandsp-0.0.3pre23.tgz
+spandsp-0.0.3pre24.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2006 03:08:33 -0000	1.3
+++ sources	7 Oct 2006 14:41:22 -0000	1.4
@@ -1 +1 @@
-09a2b0b8c53923fd7351a2026fa0c2ff  spandsp-0.0.3pre23.tgz
+1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/spandsp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spandsp.spec	6 Oct 2006 03:08:33 -0000	1.2
+++ spandsp.spec	7 Oct 2006 14:41:22 -0000	1.3
@@ -1,9 +1,9 @@
-%define pre 23
+%define pre 24
 
 Summary: A DSP library for telephony
 Name: spandsp
 Version: 0.0.3
-Release: 1%{?pre:.pre%{pre}}
+Release: 1%{?pre:.pre%{pre}}%{dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
@@ -73,7 +73,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.0.3-1.pre23
+* Sat Oct  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1.pre24
+- Update to 0.0.3pre24
+- Add dist tag.
+
+* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1.pre23
 - Update to 0.0.3pre23
 
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> - 0.0.2-1.pre26



From fedora-extras-commits at redhat.com  Sat Oct  7 14:47:06 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:47:06 -0700
Subject: rpms/quodlibet/devel - New directory
Message-ID: <200610071447.k97El8a7016670@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16646/quodlibet/devel

Log Message:
Directory /cvs/extras/rpms/quodlibet/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 14:47:06 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:47:06 -0700
Subject: rpms/quodlibet - New directory
Message-ID: <200610071447.k97El8P0016667@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16646/quodlibet

Log Message:
Directory /cvs/extras/rpms/quodlibet added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 14:47:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:47:21 -0700
Subject: rpms/quodlibet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610071447.k97ElNY0016722@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16691/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module quodlibet


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 14:47:20 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:47:20 -0700
Subject: rpms/quodlibet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610071447.k97ElMSt016719@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16691

Added Files:
	Makefile import.log 
Log Message:
Setup of module quodlibet


--- NEW FILE Makefile ---
# Top level Makefile for module quodlibet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 14:48:12 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:48:12 -0700
Subject: rpms/quodlibet import.log,1.1,1.2
Message-ID: <200610071448.k97EmiVM016821@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16782

Modified Files:
	import.log 
Log Message:
auto-import quodlibet-0.23.1-1.fc6 on branch devel from quodlibet-0.23.1-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 14:47:20 -0000	1.1
+++ import.log	7 Oct 2006 14:48:12 -0000	1.2
@@ -0,0 +1 @@
+quodlibet-0_23_1-1_fc6:HEAD:quodlibet-0.23.1-1.fc6.src.rpm:1160232474



From fedora-extras-commits at redhat.com  Sat Oct  7 14:48:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:48:13 -0700
Subject: rpms/quodlibet/devel README.fedora, NONE,
	1.1 dl-quodlibet-plugins.sh, 
	NONE, 1.1 google.py, NONE, 1.1 quodlibet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610071448.k97Emj8i016825@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16782/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora dl-quodlibet-plugins.sh google.py quodlibet.spec 
Log Message:
auto-import quodlibet-0.23.1-1.fc6 on branch devel from quodlibet-0.23.1-1.fc6.src.rpm


--- NEW FILE README.fedora ---
There are a number of plugins packaged with the Fedora Extras Quod
Libet package that are not a part of the upstream Quod Libet release.
Some of them may have dependencies that are not available in Fedora
Core or Extras.  Some plugins may have bugs that prevent them from
working at all.  The plugins have been included to make the task of
getting all of the plugins downloaded and installed easier for the end
user.



--- NEW FILE dl-quodlibet-plugins.sh ---
#!/bin/bash

curdir=$(pwd)

pushd /var/tmp

#
# Set up directory structure
#

mkdir quodlibet-plugins-$$

pushd quodlibet-plugins-$$

#
# download plugins from Quod Libet SVN
#
plugin_revision=3702
plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"

svn -q export -r$plugin_revision $plugin_url

curl -o plugins/songsmenu/shell.2.py "http://www.sacredchao.net/quodlibet/attachment/wiki/Plugins/OpenInShell/shell.2.py?format=raw"

# get rid of any shebang lines

for plugin in `find plugins -name \*.py`
do
  sed -e '/^#!/,1d' $plugin > $plugin.tmp
  mv $plugin.tmp $plugin
done

tar cjf $curdir/quodlibet-plugins.tar.bz2 plugins

popd

rm -rf quodlibet-plugins-$$

popd


--- NEW FILE google.py ---
# Copyright 2006 Jeffrey C. Ollie <jeff at ocjtech.us>
#
# 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

GOOGLE_MUSICSEARCH_URL = "http://www.google.com/musicsearch?q=%s&res=%s"

from util import website
from urllib import quote
import gtk

from plugins.songsmenu import SongsMenuPlugin

class GoogleSearch(object):
    PLUGIN_ICON = gtk.STOCK_OPEN
    PLUGIN_VERSION = '0.0.1'

    def plugin_songs(self, songs):
        l = dict.fromkeys([song(self.k) for song in songs]).keys()
        for a in l:
            a = quote(str(a))
            website(GOOGLE_MUSICSEARCH_URL % (a, self.g))

class GoogleArtist(GoogleSearch, SongsMenuPlugin):
    PLUGIN_ID = 'Search for artist in Google'
    PLUGIN_NAME = _('Search for artist in Google')
    k = 'artist'
    g = k
    
class GoogleAlbum(GoogleSearch, SongsMenuPlugin):
    PLUGIN_ID = 'Search for album in Google'
    PLUGIN_NAME = _('Search for album in Google')
    k = 'album'
    g = k
    
class GoogleTitle(GoogleSearch, SongsMenuPlugin):
    PLUGIN_ID = 'Search for title in Google'
    PLUGIN_NAME = _('Search for title in Google')
    k = 'title'
    g = 'song'


--- NEW FILE quodlibet.spec ---
Name:           quodlibet
Version:        0.23.1
Release:        1%{?dist}
Summary:        A music management program

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.sacredchao.net/quodlibet
Source0:        http://www.sacredchao.net/~piman/software/quodlibet-%{version}.tar.gz
Source1:        dl-quodlibet-plugins.sh
Source2:        quodlibet-plugins.tar.bz2

# There is no upstream currently, as this plugin is the product of the Quod Libet packager
Source3:        google.py

Source4:        README.fedora

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  pygtk2-devel
BuildRequires:  python-ctypes
BuildRequires:  glib2-devel
BuildRequires:  gtk2-devel
BuildRequires:  gettext
BuildRequires:  intltool
BuildRequires:  desktop-file-utils
BuildRequires:  pkgconfig

Requires:       python-mutagen >= 1.5
Requires:       python >= 2.4
Requires:       pygtk2 >= 2.8
Requires:       gstreamer-python >= 0.10

# For tray icon plugin
Requires:       gnome-python2-libegg

# for Replay Gain plugin
Requires:       vorbisgain

%description
Quod Libet is a music management program. It provides several different ways
to view your audio library, as well as support for Internet radio and
audio feeds. It has extremely flexible metadata tag editing and searching
capabilities.

Ex Falso is a tag editor with the same tag editing interface as Quod Libet,
but it does not play files.

Supported file formats include Ogg Vorbis, MP3, FLAC, MOD/XM/IT, Musepack,
Wavpack, and MPEG-4 AAC.

%prep
%setup -q
cp %{S:4} .

%build

# we don't need _trayicon.so because the python libegg bindings are available
#pushd trayicon
#make trayicon.c
#CFLAGS="%{optflags}" %{__python} setup.py build
#cp build/lib*/trayicon.so ../_trayicon.so
#popd

pushd mmkeys
make mmkeyspy.c
CFLAGS="%{optflags}" %{__python} setup.py build
cp build/lib*/mmkeys.so ../_mmkeys.so
popd

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/quodlibet/

tar xfC %{S:2} %{buildroot}%{_datadir}/quodlibet/

cp %{S:3} %{buildroot}%{_datadir}/quodlibet/plugins/songsmenu

%ifarch x86_64 ppc64
make install PREFIX=/usr TODEP=lib64/quodlibet DESTDIR=%{buildroot}
%else
make install PREFIX=/usr TODEP=lib/quodlibet DESTDIR=%{buildroot}
%endif

rm -f %{buildroot}%{_datadir}/applications/*.desktop
make exfalso.desktop quodlibet.desktop
desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications              \
        --add-category X-Fedora                                 \
        exfalso.desktop
desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications              \
        --add-category X-Fedora                                 \
        quodlibet.desktop


%{find_lang} quodlibet

%clean
rm -rf %{buildroot}

%files -f quodlibet.lang
%defattr(-,root,root,-)
%doc COPYING HACKING NEWS README README.fedora

%{_bindir}/exfalso
%{_bindir}/quodlibet

%{_libdir}/quodlibet

%{_datadir}/applications/fedora-exfalso.desktop
%{_datadir}/applications/fedora-quodlibet.desktop

%{_datadir}/pixmaps/exfalso.png
%{_datadir}/pixmaps/quodlibet.png

%{_datadir}/quodlibet

%{_mandir}/man1/exfalso.1*
%{_mandir}/man1/quodlibet.1*

%changelog
* Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23.1-1
- Update to 0.23.1

* Thu Aug 24 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-5
- Include a README.fedora

* Thu Aug 17 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-4
- Instead of manually copying all of the plugins, pack them into a
  tarball and include a script for generating the tarball

* Wed Aug 16 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-3
- Make sure that %%{_libdir}/quodlibet/ is owned

* Tue Aug 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-2
- Convert tabs to spaces.
- Add shell plugin
- Get rid of some shebang lines.
- Add Google search plugin

* Fri Aug 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-1
- First version for Fedora Extras



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 14:47:21 -0000	1.1
+++ .cvsignore	7 Oct 2006 14:48:13 -0000	1.2
@@ -0,0 +1,2 @@
+quodlibet-0.23.1.tar.gz
+quodlibet-plugins.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 14:47:21 -0000	1.1
+++ sources	7 Oct 2006 14:48:13 -0000	1.2
@@ -0,0 +1,2 @@
+8b9d4f4dc0850b48cfe9b4b390722ef4  quodlibet-0.23.1.tar.gz
+4defba03c3f4b5f12b4c35331f4409fc  quodlibet-plugins.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct  7 14:55:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:55:26 -0700
Subject: owners owners.list,1.1791,1.1792
Message-ID: <200610071455.k97EtSI4016896@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16879

Modified Files:
	owners.list 
Log Message:
Adding quodlibet.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1791
retrieving revision 1.1792
diff -u -r1.1791 -r1.1792
--- owners.list	7 Oct 2006 06:40:05 -0000	1.1791
+++ owners.list	7 Oct 2006 14:55:26 -0000	1.1792
@@ -1923,6 +1923,7 @@
 Fedora Extras|quarry|A multi-purpose board-game GUI|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
 Fedora Extras|qucs|Circuit simulator|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
+Fedora Extras|quodlibet|A music management program|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|R|A language and environment for statistical computing and graphics|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|R-gnomeGUI|GNOME Console for R|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 14:59:19 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat,  7 Oct 2006 07:59:19 -0700
Subject: comps comps-fe6.xml.in,1.175,1.176
Message-ID: <200610071459.k97ExLUa016929@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16912

Modified Files:
	comps-fe6.xml.in 
Log Message:
add comix (currently for fc6)


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- comps-fe6.xml.in	7 Oct 2006 02:18:55 -0000	1.175
+++ comps-fe6.xml.in	7 Oct 2006 14:59:19 -0000	1.176
@@ -576,6 +576,7 @@
     <packagelist>
       <packagereq type="optional">agave</packagereq>
       <packagereq type="optional">blender</packagereq>
+      <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">digikam</packagereq>
       <packagereq type="optional">fontforge</packagereq>
       <packagereq type="optional">fyre</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct  7 15:11:20 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat,  7 Oct 2006 08:11:20 -0700
Subject: rpms/orage/devel orage.spec,1.2,1.3
Message-ID: <200610071511.k97FBM8Q019961@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19944

Modified Files:
	orage.spec 
Log Message:
Fix Obsoletes



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- orage.spec	6 Oct 2006 06:37:23 -0000	1.2
+++ orage.spec	7 Oct 2006 15:11:20 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: orage
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
@@ -17,10 +17,10 @@
 BuildRequires: desktop-file-utils
 
 Provides: xfcalendar = %{version}-%{release}
-Obsoletes: xfcalendar <= 4.2.3-1
+Obsoletes: xfcalendar <= 4.2.3-3.fc6
 # xfce4-datetime-plugin isn't in Xfce 4.4
 Provides: xfce4-datetime-plugin = %{version}-%{release}
-Obsoletes: xfce4-datetime-plugin <= 4.2.3-3
+Obsoletes: xfce4-datetime-plugin <= 0.3.1-8.fc6
 
 %description
 Time-managing application for Xfce4.
@@ -72,6 +72,9 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Sat Oct  7 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Fix Obsoletes
+
 * Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
 - Add period at the end of description. 
 - Fix defattr



From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:17 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:17 -0700
Subject: rpms/root-tail - New directory
Message-ID: <200610071525.k97FPJne020265@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20239/root-tail

Log Message:
Directory /cvs/extras/rpms/root-tail added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:17 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:17 -0700
Subject: rpms/root-tail/devel - New directory
Message-ID: <200610071525.k97FPJWS020268@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20239/root-tail/devel

Log Message:
Directory /cvs/extras/rpms/root-tail/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:27 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:27 -0700
Subject: rpms/root-tail Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610071525.k97FPTOS020317@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20284

Added Files:
	Makefile import.log 
Log Message:
Setup of module root-tail


--- NEW FILE Makefile ---
# Top level Makefile for module root-tail
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:27 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:27 -0700
Subject: rpms/root-tail/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610071525.k97FPT3n020320@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20284/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module root-tail


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:50 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:50 -0700
Subject: rpms/root-tail import.log,1.1,1.2
Message-ID: <200610071525.k97FPqlK020381@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20348

Modified Files:
	import.log 
Log Message:
auto-import root-tail-1.2-2.fc5 on branch devel from root-tail-1.2-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/root-tail/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 15:25:27 -0000	1.1
+++ import.log	7 Oct 2006 15:25:49 -0000	1.2
@@ -0,0 +1 @@
+root-tail-1_2-2_fc5:HEAD:root-tail-1.2-2.fc5.src.rpm:1160234745



From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:50 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:50 -0700
Subject: rpms/root-tail/devel root-tail.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610071525.k97FPq7Y020386@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20348/devel

Modified Files:
	.cvsignore sources 
Added Files:
	root-tail.spec 
Log Message:
auto-import root-tail-1.2-2.fc5 on branch devel from root-tail-1.2-2.fc5.src.rpm


--- NEW FILE root-tail.spec ---
Name:           root-tail
Version:        1.2
Release:        2%{?dist}
Summary:        Displays a given file anywhere on your X11 root window

Group:          User Interface/X
License:        GPL
URL:            http://www.goof.com/pcg/marc/root-tail.html
Source0:        http://www.goof.com/pcg/marc/data/root-tail-1.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  imake, xorg-x11-proto-devel, libXext-devel

%description
Displays a given file anywhere on your X11 root window, i.e. it is kind of 
tail -f for multiple files using your desktop background as output window.

%prep
%setup -q


%build
xmkmf -a
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
make install.man DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README 
%{_bindir}/*
%{_mandir}/man1/*



%changelog
* Thu Oct 05 2006 Michael Rice <errr[AT]errr-online.com> - 1.2-2
- Add rpm_opt_flags to make line for debug build

* Wed Oct 04 2006 Michael Rice <errr[AT]errr-online.com> - 1.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/root-tail/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 15:25:27 -0000	1.1
+++ .cvsignore	7 Oct 2006 15:25:50 -0000	1.2
@@ -0,0 +1 @@
+root-tail-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/root-tail/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 15:25:27 -0000	1.1
+++ sources	7 Oct 2006 15:25:50 -0000	1.2
@@ -0,0 +1 @@
+5a4b3c4c7ab3bed1f4575e9688aac5de  root-tail-1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 15:30:45 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:30:45 -0700
Subject: owners owners.list,1.1792,1.1793
Message-ID: <200610071530.k97FUlBX020466@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20430

Modified Files:
	owners.list 
Log Message:
Adding my self as maintainer bug: 209399



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1792
retrieving revision 1.1793
diff -u -r1.1792 -r1.1793
--- owners.list	7 Oct 2006 14:55:26 -0000	1.1792
+++ owners.list	7 Oct 2006 15:30:44 -0000	1.1793
@@ -1957,6 +1957,7 @@
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rogue|The original roguelike game|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|root-tail|An app to show log files on the root window|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|rosegarden4|MIDI, audio and notation editor|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 15:37:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sat,  7 Oct 2006 08:37:26 -0700
Subject: rpms/sysprof/FC-5 sysprof.spec,1.2,1.3
Message-ID: <200610071537.k97FbSDp020520@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20472/FC-5

Modified Files:
	sysprof.spec 
Log Message:
Do not build for ppc (the kmod does not support it)



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sysprof.spec	6 Oct 2006 22:16:26 -0000	1.2
+++ sysprof.spec	7 Oct 2006 15:37:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           sysprof      
 Version:        1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -18,6 +18,7 @@
 BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils
 
+ExclusiveArch:  i386 x86_64
 
 %description
 Sysprof is a sampling CPU profiler for Linux that uses a kernel module
@@ -59,6 +60,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
+- add ExclusiveArch to match sysprof-kmod supported archs
+
 * Tue Oct 2 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
 - add .desktop file
 



From fedora-extras-commits at redhat.com  Sat Oct  7 15:37:27 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sat,  7 Oct 2006 08:37:27 -0700
Subject: rpms/sysprof/devel sysprof.spec,1.1,1.2
Message-ID: <200610071537.k97FbT6c020524@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20472/devel

Modified Files:
	sysprof.spec 
Log Message:
Do not build for ppc (the kmod does not support it)



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysprof.spec	4 Oct 2006 14:40:56 -0000	1.1
+++ sysprof.spec	7 Oct 2006 15:37:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           sysprof      
 Version:        1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -19,6 +19,7 @@
 BuildRequires:  binutils-devel
 BuildRequires:  desktop-file-utils
 
+ExclusiveArch:  i386 x86_64
 
 %description
 Sysprof is a sampling CPU profiler for Linux that uses a kernel module
@@ -60,7 +61,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Tue Oct 2 2006 ianluca Sforna <giallu gmail com> 1.0.3-4
+* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
+- add ExclusiveArch to match sysprof-kmod supported archs
+
+* Tue Oct 2 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
 - add .desktop file
 
 * Fri Sep 30 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3



From fedora-extras-commits at redhat.com  Sat Oct  7 16:12:34 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat,  7 Oct 2006 09:12:34 -0700
Subject: comps comps-fe5.xml.in,1.161,1.162
Message-ID: <200610071612.k97GCaCF024419@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24402

Modified Files:
	comps-fe5.xml.in 
Log Message:
add comix also to FE5 comps


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- comps-fe5.xml.in	7 Oct 2006 02:18:55 -0000	1.161
+++ comps-fe5.xml.in	7 Oct 2006 16:12:33 -0000	1.162
@@ -499,6 +499,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">blender</packagereq>
+      <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">digikam</packagereq>
       <packagereq type="optional">fontforge</packagereq>
       <packagereq type="optional">fyre</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct  7 16:49:45 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Sat,  7 Oct 2006 09:49:45 -0700
Subject: rpms/kadu/devel kadu.spec,1.9,1.10
Message-ID: <200610071649.k97Gnl4f024623@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24606

Modified Files:
	kadu.spec 
Log Message:
* Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.13.20060915svn
- It should work now



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kadu.spec	6 Oct 2006 19:08:52 -0000	1.9
+++ kadu.spec	7 Oct 2006 16:49:44 -0000	1.10
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.12.%{cvs_date}svn%{?dist}
+Release:	0.13.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -283,15 +283,6 @@
 chmod a+x $binary
 done
 #+
-
-%ifnarch ppc64 x86_64 s390 s390x ia64
-rm -rf $RPM_BUILD_ROOT%{_moddata}/amarok.desc
-rm -rf $RPM_BUILD_ROOT%{_modlib}/amarok.so
-rm -rf $RPM_BUILD_ROOT%{_modtrans}/amarok*.qm
-rm -rf $RPM_BUILD_ROOT%{_moddata}/data/amarok
-%endif
-
-
 desktop-file-install --vendor fedora				\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	--add-category X-Fedora					\
@@ -414,8 +405,13 @@
 
 %mod_files2 xmms
 
+
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
+%ghost %{_modlib}/amarok.so
+%ghost %{_moddata}/amarok.desc
+%ghost %{_moddata}/data/amarok
+%ghost %{_modtrans}/amarok*
 %endif
 
 %mod_files2 filedesc
@@ -458,6 +454,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.13.20060915svn
+- It should work now
+
 * Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.12.20060915svn
 - Yet another fix...
 



From fedora-extras-commits at redhat.com  Sat Oct  7 17:05:30 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Sat,  7 Oct 2006 10:05:30 -0700
Subject: rpms/kadu/devel kadu.spec,1.10,1.11
Message-ID: <200610071705.k97H5WW2027683@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27666

Modified Files:
	kadu.spec 
Log Message:
* Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.14.20060915svn
- It really shoud work now



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kadu.spec	7 Oct 2006 16:49:44 -0000	1.10
+++ kadu.spec	7 Oct 2006 17:05:30 -0000	1.11
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.13.%{cvs_date}svn%{?dist}
+Release:	0.14.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -408,10 +408,14 @@
 
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
+
+%else
+
 %ghost %{_modlib}/amarok.so
 %ghost %{_moddata}/amarok.desc
 %ghost %{_moddata}/data/amarok
 %ghost %{_modtrans}/amarok*
+
 %endif
 
 %mod_files2 filedesc
@@ -454,6 +458,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.14.20060915svn
+- It really shoud work now
+
 * Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.13.20060915svn
 - It should work now
 



From fedora-extras-commits at redhat.com  Sat Oct  7 17:32:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat,  7 Oct 2006 10:32:27 -0700
Subject: rpms/perl-Email-Simple/FC-5 .cvsignore, 1.6,
	1.7 perl-Email-Simple.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200610071732.k97HWxBZ028150@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28112/FC-5

Modified Files:
	.cvsignore perl-Email-Simple.spec sources 
Log Message:
Update to 1.992.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Sep 2006 15:56:46 -0000	1.6
+++ .cvsignore	7 Oct 2006 17:32:26 -0000	1.7
@@ -1 +1 @@
-Email-Simple-1.990.tar.gz
+Email-Simple-1.992.tar.gz


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/perl-Email-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-Simple.spec	6 Sep 2006 15:56:46 -0000	1.5
+++ perl-Email-Simple.spec	7 Oct 2006 17:32:26 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-Simple
-Version:        1.990
+Version:        1.992
 Release:        1%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.992-1
+- Update to 1.992.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.990-1
 - Update to 1.990.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2006 15:56:46 -0000	1.6
+++ sources	7 Oct 2006 17:32:26 -0000	1.7
@@ -1 +1 @@
-c06d7b75862a8c20ea9b14116e17a5e3  Email-Simple-1.990.tar.gz
+901b2c7d2b978a0b31ca6b274282b852  Email-Simple-1.992.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 17:32:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat,  7 Oct 2006 10:32:27 -0700
Subject: rpms/perl-Email-Simple/devel .cvsignore, 1.7,
	1.8 perl-Email-Simple.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200610071732.k97HWxG7028155@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28112/devel

Modified Files:
	.cvsignore perl-Email-Simple.spec sources 
Log Message:
Update to 1.992.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Sep 2006 15:56:46 -0000	1.7
+++ .cvsignore	7 Oct 2006 17:32:27 -0000	1.8
@@ -1 +1 @@
-Email-Simple-1.990.tar.gz
+Email-Simple-1.992.tar.gz


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/perl-Email-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Simple.spec	6 Sep 2006 15:56:46 -0000	1.6
+++ perl-Email-Simple.spec	7 Oct 2006 17:32:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Simple
-Version:        1.990
+Version:        1.992
 Release:        1%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.992-1
+- Update to 1.992.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.990-1
 - Update to 1.990.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Sep 2006 15:56:46 -0000	1.7
+++ sources	7 Oct 2006 17:32:27 -0000	1.8
@@ -1 +1 @@
-c06d7b75862a8c20ea9b14116e17a5e3  Email-Simple-1.990.tar.gz
+901b2c7d2b978a0b31ca6b274282b852  Email-Simple-1.992.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 17:41:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat,  7 Oct 2006 10:41:50 -0700
Subject: rpms/perl-Error/FC-5 .cvsignore, 1.10, 1.11 perl-Error.spec, 1.14, 
	1.15 sources, 1.10, 1.11
Message-ID: <200610071741.k97Hfq8u028328@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28291/FC-5

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17006.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Oct 2006 17:34:25 -0000	1.10
+++ .cvsignore	7 Oct 2006 17:41:50 -0000	1.11
@@ -1 +1 @@
-Error-0.17005.tar.gz
+Error-0.17006.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/perl-Error.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Error.spec	4 Oct 2006 17:34:25 -0000	1.14
+++ perl-Error.spec	7 Oct 2006 17:41:50 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17005
+Version:        0.17006
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -11,6 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -49,6 +51,10 @@
 
 
 %changelog
+* Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17006-1
+- Update to 0.17006.
+- New build requirements: Test::Pod and Test::Pod::Coverage.
+
 * Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17005-1
 - Update to 0.17005.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Oct 2006 17:34:25 -0000	1.10
+++ sources	7 Oct 2006 17:41:50 -0000	1.11
@@ -1 +1 @@
-59579d2eb0c5cae5d102db2b1110f875  Error-0.17005.tar.gz
+fc9f7e5000d5607359e2ed03f6a9cf1c  Error-0.17006.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 17:41:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat,  7 Oct 2006 10:41:51 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.10, 1.11 perl-Error.spec, 1.14, 
	1.15 sources, 1.10, 1.11
Message-ID: <200610071741.k97HfrIm028334@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28291/devel

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17006.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Oct 2006 17:34:25 -0000	1.10
+++ .cvsignore	7 Oct 2006 17:41:51 -0000	1.11
@@ -1 +1 @@
-Error-0.17005.tar.gz
+Error-0.17006.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Error.spec	4 Oct 2006 17:34:25 -0000	1.14
+++ perl-Error.spec	7 Oct 2006 17:41:51 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17005
+Version:        0.17006
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -11,6 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -49,6 +51,10 @@
 
 
 %changelog
+* Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17006-1
+- Update to 0.17006.
+- New build requirements: Test::Pod and Test::Pod::Coverage.
+
 * Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17005-1
 - Update to 0.17005.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Oct 2006 17:34:25 -0000	1.10
+++ sources	7 Oct 2006 17:41:51 -0000	1.11
@@ -1 +1 @@
-59579d2eb0c5cae5d102db2b1110f875  Error-0.17005.tar.gz
+fc9f7e5000d5607359e2ed03f6a9cf1c  Error-0.17006.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 18:02:15 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:02:15 -0700
Subject: rpms/python-eyed3 - New directory
Message-ID: <200610071802.k97I2JEv031428@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31419/python-eyed3

Log Message:
Directory /cvs/extras/rpms/python-eyed3 added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 18:02:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:02:20 -0700
Subject: rpms/python-eyed3/devel - New directory
Message-ID: <200610071802.k97I2OO8031449@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31419/python-eyed3/devel

Log Message:
Directory /cvs/extras/rpms/python-eyed3/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 18:02:38 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:02:38 -0700
Subject: rpms/python-eyed3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610071802.k97I2faP031481@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31468

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-eyed3


--- NEW FILE Makefile ---
# Top level Makefile for module python-eyed3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 18:02:41 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:02:41 -0700
Subject: rpms/python-eyed3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610071802.k97I2h9j031499@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31468/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-eyed3


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 18:03:35 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:03:35 -0700
Subject: rpms/python-eyed3/devel python-eyed3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610071803.k97I3bd2031567@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31532/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-eyed3.spec 
Log Message:
auto-import python-eyed3-0.6.10-2 on branch devel from python-eyed3-0.6.10-2.src.rpm


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

Name:           python-eyed3
Version:        0.6.10
Release:        2%{?dist}
Summary:        Python module for processing ID3 tags

Group:          Development/Languages
License:        GPL
URL:            http://eyed3.nicfit.net/
Source0:        http://eyed3.nicfit.net/releases/eyeD3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python


%description
Aa Python module and program for processing ID3 tags. Information about
mp3 files(i.e bit rate, sample frequency, play time, etc.) is also
provided. The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.


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


%build
%configure
# Make isn't necessary.

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove dup & unnecessary docs
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/AUTHORS
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/COPYING.gz
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/ChangeLog.gz
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/README
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/THANKS

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/eyeD3
%{_mandir}/man1/*.1.gz
%{python_sitelib}/*


%changelog
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.6.10-2
- Change BR to python.
- Remove unnecessary make in build section.

* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.6.10-1
- Initial FE spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 18:02:41 -0000	1.1
+++ .cvsignore	7 Oct 2006 18:03:35 -0000	1.2
@@ -0,0 +1 @@
+eyeD3-0.6.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 18:02:41 -0000	1.1
+++ sources	7 Oct 2006 18:03:35 -0000	1.2
@@ -0,0 +1 @@
+2f7ee6749b993faba3b5d10d9621d314  eyeD3-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 18:03:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:03:34 -0700
Subject: rpms/python-eyed3 import.log,1.1,1.2
Message-ID: <200610071804.k97I47Ij031570@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31532

Modified Files:
	import.log 
Log Message:
auto-import python-eyed3-0.6.10-2 on branch devel from python-eyed3-0.6.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 18:02:38 -0000	1.1
+++ import.log	7 Oct 2006 18:03:34 -0000	1.2
@@ -0,0 +1 @@
+python-eyed3-0_6_10-2:HEAD:python-eyed3-0.6.10-2.src.rpm:1160244230



From fedora-extras-commits at redhat.com  Sat Oct  7 18:06:28 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:06:28 -0700
Subject: owners owners.list,1.1793,1.1794
Message-ID: <200610071806.k97I6URf031693@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31676

Modified Files:
	owners.list 
Log Message:
Add python-eyed3


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1793
retrieving revision 1.1794
diff -u -r1.1793 -r1.1794
--- owners.list	7 Oct 2006 15:30:44 -0000	1.1793
+++ owners.list	7 Oct 2006 18:06:28 -0000	1.1794
@@ -1831,6 +1831,7 @@
 Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-elementtree|Fast XML parser and writer|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt
+Fedora Extras|python-eyed3|Python module for processing ID3 tags|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-feedparser|Parse RSS and Atom feeds in Python|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-formencode|FormEncode is a validation and form generation package.|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-fpconst|A Python module for handling IEEE 754 floating point special values|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 18:49:10 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:49:10 -0700
Subject: rpms/libgalago/devel .cvsignore, 1.3, 1.4 libgalago.spec, 1.8,
	1.9 sources, 1.3, 1.4 libgalago-gettext.patch, 1.1, NONE
Message-ID: <200610071849.k97InCVu031946@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31925

Modified Files:
	.cvsignore libgalago.spec sources 
Removed Files:
	libgalago-gettext.patch 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
- Update to 0.5.2.
- Drop gettext patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 May 2006 23:53:22 -0000	1.3
+++ .cvsignore	7 Oct 2006 18:49:10 -0000	1.4
@@ -1 +1 @@
-libgalago-0.5.1.tar.bz2
+libgalago-0.5.2.tar.bz2


Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgalago.spec	29 Aug 2006 20:58:19 -0000	1.8
+++ libgalago.spec	7 Oct 2006 18:49:10 -0000	1.9
@@ -1,22 +1,18 @@
 Name:		libgalago
-Version:	0.5.1
-Release:	7%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.galago-project.org/
 Source0:	http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-gettext.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	check-devel
 BuildRequires:	gtk-doc
-BuildRequires:	autoconf
-BuildRequires:	libtool
-BuildRequires:	automake
 BuildRequires:	gettext-devel
 
 
@@ -43,8 +39,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gettext
-./autogen.sh
+
 
 %build
 %configure --enable-static=no --enable-gtk-doc
@@ -86,6 +81,10 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
+- Update to 0.5.2.
+- Drop gettext patch.
+
 * Tue Aug 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-7
 - Rebuild for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 May 2006 23:53:22 -0000	1.3
+++ sources	7 Oct 2006 18:49:10 -0000	1.4
@@ -1 +1 @@
-9ace3f93505626773b852d2ebbc7d5d6  libgalago-0.5.1.tar.bz2
+47f27f58dd8b0e46d9d2e037c51063ed  libgalago-0.5.2.tar.bz2


--- libgalago-gettext.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 18:56:56 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:56:56 -0700
Subject: rpms/gaim-galago/devel .cvsignore, 1.2, 1.3 gaim-galago.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200610071856.k97IuwNx032044@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gaim-galago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32023

Modified Files:
	.cvsignore gaim-galago.spec sources 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.
- Add version required for libgalago.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 18:23:53 -0000	1.2
+++ .cvsignore	7 Oct 2006 18:56:56 -0000	1.3
@@ -1 +1 @@
-gaim-galago-0.5.0.tar.bz2
+gaim-galago-0.5.1.tar.bz2


Index: gaim-galago.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/devel/gaim-galago.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaim-galago.spec	4 Oct 2006 22:24:55 -0000	1.2
+++ gaim-galago.spec	7 Oct 2006 18:56:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gaim-galago
-Version:        0.5.0
-Release:        3%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Galago feed plugin for Gaim
 
 Group:		System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim-devel
-BuildRequires:	libgalago-devel
+BuildRequires:	libgalago-devel >= 0.5.2
 
 Requires:	gaim
 Requires:	galago-daemon
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+- Add version required for libgalago.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 18:23:53 -0000	1.2
+++ sources	7 Oct 2006 18:56:56 -0000	1.3
@@ -1 +1 @@
-58788373f86dd9f4cdf1f4ee8c7045f0  gaim-galago-0.5.0.tar.bz2
+00f58de5aa7850cceac766757add921a  gaim-galago-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct  7 19:20:36 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 12:20:36 -0700
Subject: rpms/galago-daemon/devel .cvsignore, 1.2, 1.3 galago-daemon.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200610071920.k97JKcBp002619@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2597

Modified Files:
	.cvsignore galago-daemon.spec sources 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:35:03 -0000	1.2
+++ .cvsignore	7 Oct 2006 19:20:36 -0000	1.3
@@ -1 +1 @@
-galago-daemon-0.5.0.tar.bz2
+galago-daemon-0.5.1.tar.gz


Index: galago-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/devel/galago-daemon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- galago-daemon.spec	29 Aug 2006 21:12:16 -0000	1.5
+++ galago-daemon.spec	7 Oct 2006 19:20:36 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           galago-daemon
-Version:        0.5.0
-Release:        6%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Galago presence daemon
 
 Group:		System Environment/Daemons
 License:        GPL
 URL:		http://galago.sourceforge.net/
-Source0:        http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgalago-devel 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+
 * Tue Aug 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
 - Rebuilt for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2006 19:35:03 -0000	1.2
+++ sources	7 Oct 2006 19:20:36 -0000	1.3
@@ -1 +1 @@
-bc74c3ac8c18f4c1a44e43504c59a08f  galago-daemon-0.5.0.tar.bz2
+fdb81f938f86f380b127158ebb542279  galago-daemon-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 19:24:14 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  7 Oct 2006 12:24:14 -0700
Subject: rpms/python-vobject/devel .cvsignore, 1.3, 1.4 python-vobject.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610071924.k97JOGB5002702@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2681

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
0.4.3-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Aug 2006 17:02:21 -0000	1.3
+++ .cvsignore	7 Oct 2006 19:24:14 -0000	1.4
@@ -1 +1 @@
-vobject-0.4.1.tar.gz
+vobject-0.4.3.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/python-vobject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-vobject.spec	10 Sep 2006 19:03:06 -0000	1.3
+++ python-vobject.spec	7 Oct 2006 19:24:14 -0000	1.4
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.4.1 
-Release:        2%{?dist}
+Version:        0.4.3 
+Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
 Group:          Development/Languages
 License:        Apache Software License
 URL:            http://vobject.skyhouseconsulting.com/ 
-Source0:        http://vobject.skyhouseconsulting.com/vobject-0.4.1.tar.gz
+Source0:        http://vobject.skyhouseconsulting.com/vobject-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -73,6 +73,9 @@
 %{python_sitelib}/vobject*egg-info
 
 %changelog
+* Sat Oct 07 2006 James Bowes <jbowes at redhat.com> - 0.4.3-1
+- New version released.
+
 * Sun Sep 10 2006 James Bowes <jbowes at redhat.com> 0.4.1-2
 - Stop ghosting pyo files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2006 17:02:21 -0000	1.3
+++ sources	7 Oct 2006 19:24:14 -0000	1.4
@@ -1 +1 @@
-b12fbec4abd87c826b4627364bd1474d  vobject-0.4.1.tar.gz
+f6405e4620dfcc403f53b825d2eee529  vobject-0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 19:25:16 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  7 Oct 2006 12:25:16 -0700
Subject: rpms/python-vobject/FC-5 .cvsignore, 1.2, 1.3 python-vobject.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610071925.k97JPItC002773@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2752

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
0.4.3-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jun 2006 18:42:44 -0000	1.2
+++ .cvsignore	7 Oct 2006 19:25:16 -0000	1.3
@@ -1 +1 @@
-vobject-0.3.0.tar.gz
+vobject-0.4.3.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-5/python-vobject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-vobject.spec	10 Sep 2006 19:04:46 -0000	1.3
+++ python-vobject.spec	7 Oct 2006 19:25:16 -0000	1.4
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.4.1 
-Release:        2%{?dist}
+Version:        0.4.3 
+Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
 Group:          Development/Languages
 License:        Apache Software License
 URL:            http://vobject.skyhouseconsulting.com/ 
-Source0:        http://vobject.skyhouseconsulting.com/vobject-0.4.1.tar.gz
+Source0:        http://vobject.skyhouseconsulting.com/vobject-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -73,6 +73,9 @@
 %{python_sitelib}/vobject*egg-info
 
 %changelog
+* Sat Oct 07 2006 James Bowes <jbowes at redhat.com> - 0.4.3-1
+- New version released.
+
 * Sun Sep 10 2006 James Bowes <jbowes at redhat.com> 0.4.1-2
 - Stop ghosting pyo files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2006 17:04:54 -0000	1.3
+++ sources	7 Oct 2006 19:25:16 -0000	1.4
@@ -1 +1 @@
-b12fbec4abd87c826b4627364bd1474d  vobject-0.4.1.tar.gz
+f6405e4620dfcc403f53b825d2eee529  vobject-0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 20:22:06 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sat,  7 Oct 2006 13:22:06 -0700
Subject: rpms/dogtail/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE dogtail-skip-None-children.patch, 1.1,
	NONE dogtail.spec, 1.4, NONE needs.rebuild, 1.1, NONE sources,
	1.2, NONE
Message-ID: <200610072022.k97KM8WR006004@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5988

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile dogtail-skip-None-children.patch 
	dogtail.spec needs.rebuild sources 
Log Message:
dogtail moved to core


--- NEW FILE dead.package ---
Moved to core


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- dogtail-skip-None-children.patch DELETED ---


--- dogtail.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 20:23:10 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sat,  7 Oct 2006 13:23:10 -0700
Subject: rpms/pyspi/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE pyspi-NULL-children.patch, 1.1, NONE pyspi.spec, 1.2,
	NONE sources, 1.2, NONE
Message-ID: <200610072023.k97KNCcI006036@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pyspi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6020

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild pyspi-NULL-children.patch 
	pyspi.spec sources 
Log Message:
pyspi moved to core


--- NEW FILE dead.package ---
Moved to core


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- pyspi-NULL-children.patch DELETED ---


--- pyspi.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 20:27:06 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sat,  7 Oct 2006 13:27:06 -0700
Subject: rpms/gnome-applet-netmon/devel dead.package, NONE, 1.1 .cvsignore,
	1.1, NONE Makefile, 1.1, NONE gnome-applet-netmon.spec, 1.2,
	NONE needs.rebuild, 1.1,
	NONE netmon.schemas.in.vertical_layout.to.false.patch, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200610072027.k97KR83C006068@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6052

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gnome-applet-netmon.spec needs.rebuild 
	netmon.schemas.in.vertical_layout.to.false.patch sources 
Log Message:
gnome-applet-netmon is dead upstream


--- NEW FILE dead.package ---
Upstream is dead


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gnome-applet-netmon.spec DELETED ---


--- needs.rebuild DELETED ---


--- netmon.schemas.in.vertical_layout.to.false.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 23:36:09 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sat,  7 Oct 2006 16:36:09 -0700
Subject: comps comps-cleanup.xsl,1.1,1.2
Message-ID: <200610072336.k97NaBKm015779@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15762

Modified Files:
	comps-cleanup.xsl 
Log Message:
beautify warnings


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comps-cleanup.xsl	3 Sep 2006 10:41:57 -0000	1.1
+++ comps-cleanup.xsl	7 Oct 2006 23:36:09 -0000	1.2
@@ -6,7 +6,7 @@
      - keep a single package reference per group,
 
      Typical usage is:
-     $ xsltproc -o output-file comps.cleanup.xsl original-file
+     $ xsltproc -o output-file comps-cleanup.xsl original-file
 
      You can use the "novalid" xsltproc switch to kill the warning about
      Fedora not installing the comps DTD anywhere xsltproc can find it.
@@ -50,11 +50,13 @@
   </xsl:template>
 <!-- Warn about duplicate groups being merged -->
   <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="2">
-    <xsl:message>! Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+    <xsl:message>?????? Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+    <xsl:message>??</xsl:message>
   </xsl:template>
 <!-- Warn about duplicate categories being merged -->
   <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="2">
-    <xsl:message>! Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+    <xsl:message>?????? Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+    <xsl:message>??</xsl:message>
   </xsl:template>
 <!-- Sort packages within a group by class then name -->
   <xsl:template match="packagelist" priority="1">
@@ -83,20 +85,22 @@
   </xsl:template>
 <!-- Kill duplicate package entries -->
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
-    <xsl:message>! Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
+    <xsl:message>????????? Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
     <xsl:message>  Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
+    <xsl:message>??</xsl:message>
   </xsl:template>
 <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">
-    <xsl:message>! Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
+    <xsl:message>??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
+    <xsl:message>??</xsl:message>
   </xsl:template>
-<!-- Warn about packages referenced several times -->
-  <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-packages',text())[1])]" priority="1">
-    <xsl:message>o Package <xsl:value-of select="text()"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>
-  was referenced before:</xsl:message>
-    <xsl:for-each select="key('unique-packages',text())[generate-id(.) != generate-id(current())]">
-      <xsl:message> - <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
+<!-- Warn about packages referenced several times (at least twice;)) -->
+  <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
+    <xsl:message>??? Package <xsl:value-of select="text()"/> is referenced several times:</xsl:message>
+    <xsl:for-each select="key('unique-packages',text())">
+      <xsl:message> ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
+    <xsl:message>??</xsl:message>
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
       <xsl:apply-templates select="*|text()|comment()"/>



From fedora-extras-commits at redhat.com  Sun Oct  8 01:00:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 18:00:27 -0700
Subject: rpms/kid3/FC-5 kid3.spec,1.10,1.11
Message-ID: <200610080100.k9810U7O018949@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kid3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18932

Modified Files:
	kid3.spec 
Log Message:
* Sat Oct 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7-2
- Disable musicbrainz support by default, not ready for tunepimp 0.5 yet.



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-5/kid3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kid3.spec	29 Jun 2006 18:48:38 -0000	1.10
+++ kid3.spec	8 Oct 2006 01:00:27 -0000	1.11
@@ -1,6 +1,8 @@
+%bcond_with     tunepimp
+
 Name:           kid3
 Version:        0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
@@ -13,7 +15,9 @@
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
 BuildRequires:  flac-devel
+%if %{with tunepimp}
 BuildRequires:  libtunepimp-devel
+%endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  perl(File::Spec)
 
@@ -32,7 +36,11 @@
 
 %build
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-rpath --disable-dependency-tracking
+%configure \
+%if ! %{with tunepimp}
+  --disable-musicbrainz \
+%endif
+  --disable-rpath --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -81,6 +89,9 @@
 
 
 %changelog
+* Sat Oct 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7-2
+- Disable musicbrainz support by default, not ready for tunepimp 0.5 yet.
+
 * Thu Jun 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-1
 - 0.7, build with libtunepimp.
 - Patch to register as a handler for more media types.



From fedora-extras-commits at redhat.com  Sun Oct  8 01:02:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 18:02:47 -0700
Subject: rpms/kid3/FC-5 kid3.spec,1.11,1.12
Message-ID: <200610080103.k9813Mvm021829@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kid3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21810

Modified Files:
	kid3.spec 
Log Message:
hmm... bcond_with choked up 'make tag', do it manually.



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-5/kid3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kid3.spec	8 Oct 2006 01:00:27 -0000	1.11
+++ kid3.spec	8 Oct 2006 01:02:47 -0000	1.12
@@ -1,4 +1,5 @@
-%bcond_with     tunepimp
+#bcond_with     tunepimp
+%define with_tunepimp 0
 
 Name:           kid3
 Version:        0.7



From fedora-extras-commits at redhat.com  Sun Oct  8 01:06:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 18:06:02 -0700
Subject: rpms/kid3/FC-5 kid3.spec,1.12,1.13
Message-ID: <200610080106.k981640G021930@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kid3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21913

Modified Files:
	kid3.spec 
Log Message:
s/with tunepimp/with_tunepimp/



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-5/kid3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kid3.spec	8 Oct 2006 01:02:47 -0000	1.12
+++ kid3.spec	8 Oct 2006 01:06:02 -0000	1.13
@@ -16,7 +16,7 @@
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
 BuildRequires:  flac-devel
-%if %{with tunepimp}
+%if %{with_tunepimp}
 BuildRequires:  libtunepimp-devel
 %endif
 BuildRequires:  desktop-file-utils
@@ -38,7 +38,7 @@
 %build
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
 %configure \
-%if ! %{with tunepimp}
+%if ! %{with_tunepimp}
   --disable-musicbrainz \
 %endif
   --disable-rpath --disable-dependency-tracking



From fedora-extras-commits at redhat.com  Sun Oct  8 02:55:11 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 19:55:11 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.2,1.3
Message-ID: <200610080255.k982tDgm025470@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25453

Modified Files:
	eds-feed.spec 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
- Rebuild for new libgalago.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eds-feed.spec	4 Oct 2006 22:20:39 -0000	1.2
+++ eds-feed.spec	8 Oct 2006 02:55:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
+- Rebuild for new libgalago.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sun Oct  8 02:55:54 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 19:55:54 -0700
Subject: rpms/libgalago-gtk/devel libgalago-gtk.spec,1.2,1.3
Message-ID: <200610080255.k982tuOr025536@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25519

Modified Files:
	libgalago-gtk.spec 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
- Rebuild for new libgalago.



Index: libgalago-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago-gtk/devel/libgalago-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgalago-gtk.spec	4 Oct 2006 22:25:44 -0000	1.2
+++ libgalago-gtk.spec	8 Oct 2006 02:55:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libgalago-gtk
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widgets for the Galago presence framework
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
+- Rebuild for new libgalago.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sun Oct  8 03:24:23 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat,  7 Oct 2006 20:24:23 -0700
Subject: rpms/pgp-tools/devel .cvsignore, 1.5, 1.6 pgp-tools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610080324.k983OtSN028624@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28603

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to 0.4.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jul 2006 17:31:21 -0000	1.5
+++ .cvsignore	8 Oct 2006 03:24:23 -0000	1.6
@@ -1 +1 @@
-signing-party_0.4.7.orig.tar.gz
+signing-party_0.4.8.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgp-tools.spec	10 Jul 2006 17:31:21 -0000	1.4
+++ pgp-tools.spec	8 Oct 2006 03:24:23 -0000	1.5
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -8,7 +8,11 @@
 URL:            http://pgp-tools.alioth.debian.org/
 # To check out the source tree from subversion, use this:
 # svn co svn://svn.debian.org/pgp-tools/trunk/ pgp-tools
-# You can also find source tarballs posted at
+# or to get a particular revision:
+# svn co svn://svn.debian.org/pgp-tools/tags/release-%{version} signing-party-%{version}
+# Then to make the tarball, use:
+# tar cvzf signing-party_%{version}.orig.tar.gz --exclude=.svn --exclude=debian signing-party-%{version}/
+# For some releases you may also find source tarballs posted at
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 Source0:	http://alioth.debian.org/download.php/1688/%{tarballname}_%{version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
@@ -48,12 +52,12 @@
 
 for file in `find $DIRS -type f -perm +0111 -print`
 do
-    install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
 done
 
 for man in `find $DIRS -type f -name "*.[0-9]" -print`
 do
-    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
 #  cleanup to leave docs only...
@@ -73,6 +77,13 @@
 
 
 %changelog
+* Sat Oct 07 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.8-1
+- upgrade to 0.4.8
+  - gpglist: do not die with with-fingerprint (Closes: debian #382019).
+  - gpg-key2ps: add --list-key to gpg call (works around debian #382794).
+  - caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
+    Gerfried Fuchs.
+
 * Mon Jul 10 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.7-1
 - upgrade to latest upstream
   - gpg-mailkeys: use right content-type for attached key,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jul 2006 17:31:21 -0000	1.5
+++ sources	8 Oct 2006 03:24:23 -0000	1.6
@@ -1 +1 @@
-b277efb28ae0b794d6e53a84f753682a  signing-party_0.4.7.orig.tar.gz
+61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 03:27:26 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat,  7 Oct 2006 20:27:26 -0700
Subject: rpms/pgp-tools/FC-5 .cvsignore, 1.5, 1.6 pgp-tools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610080327.k983RS9J028709@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28688

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to 0.4.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jul 2006 17:33:47 -0000	1.5
+++ .cvsignore	8 Oct 2006 03:27:26 -0000	1.6
@@ -1 +1 @@
-signing-party_0.4.7.orig.tar.gz
+signing-party_0.4.8.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/pgp-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgp-tools.spec	10 Jul 2006 17:33:47 -0000	1.4
+++ pgp-tools.spec	8 Oct 2006 03:27:26 -0000	1.5
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -8,7 +8,11 @@
 URL:            http://pgp-tools.alioth.debian.org/
 # To check out the source tree from subversion, use this:
 # svn co svn://svn.debian.org/pgp-tools/trunk/ pgp-tools
-# You can also find source tarballs posted at
+# or to get a particular revision:
+# svn co svn://svn.debian.org/pgp-tools/tags/release-%{version} signing-party-%{version}
+# Then to make the tarball, use:
+# tar cvzf signing-party_%{version}.orig.tar.gz --exclude=.svn --exclude=debian signing-party-%{version}/
+# For some releases you may also find source tarballs posted at
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 Source0:	http://alioth.debian.org/download.php/1688/%{tarballname}_%{version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
@@ -48,12 +52,12 @@
 
 for file in `find $DIRS -type f -perm +0111 -print`
 do
-    install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
 done
 
 for man in `find $DIRS -type f -name "*.[0-9]" -print`
 do
-    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
 #  cleanup to leave docs only...
@@ -73,6 +77,13 @@
 
 
 %changelog
+* Sat Oct 07 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.8-1
+- upgrade to 0.4.8
+  - gpglist: do not die with with-fingerprint (Closes: debian #382019).
+  - gpg-key2ps: add --list-key to gpg call (works around debian #382794).
+  - caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
+    Gerfried Fuchs.
+
 * Mon Jul 10 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.7-1
 - upgrade to latest upstream
   - gpg-mailkeys: use right content-type for attached key,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jul 2006 17:33:47 -0000	1.5
+++ sources	8 Oct 2006 03:27:26 -0000	1.6
@@ -1 +1 @@
-b277efb28ae0b794d6e53a84f753682a  signing-party_0.4.7.orig.tar.gz
+61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 03:28:34 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat,  7 Oct 2006 20:28:34 -0700
Subject: rpms/pgp-tools/FC-4 .cvsignore, 1.4, 1.5 pgp-tools.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610080328.k983SaTe028780@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28759

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to 0.4.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jul 2006 17:46:34 -0000	1.4
+++ .cvsignore	8 Oct 2006 03:28:34 -0000	1.5
@@ -1 +1 @@
-signing-party_0.4.7.orig.tar.gz
+signing-party_0.4.8.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/pgp-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pgp-tools.spec	10 Jul 2006 17:46:34 -0000	1.3
+++ pgp-tools.spec	8 Oct 2006 03:28:34 -0000	1.4
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -8,7 +8,11 @@
 URL:            http://pgp-tools.alioth.debian.org/
 # To check out the source tree from subversion, use this:
 # svn co svn://svn.debian.org/pgp-tools/trunk/ pgp-tools
-# You can also find source tarballs posted at
+# or to get a particular revision:
+# svn co svn://svn.debian.org/pgp-tools/tags/release-%{version} signing-party-%{version}
+# Then to make the tarball, use:
+# tar cvzf signing-party_%{version}.orig.tar.gz --exclude=.svn --exclude=debian signing-party-%{version}/
+# For some releases you may also find source tarballs posted at
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 Source0:	http://alioth.debian.org/download.php/1688/%{tarballname}_%{version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
@@ -48,12 +52,12 @@
 
 for file in `find $DIRS -type f -perm +0111 -print`
 do
-    install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
 done
 
 for man in `find $DIRS -type f -name "*.[0-9]" -print`
 do
-    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
 #  cleanup to leave docs only...
@@ -73,6 +77,13 @@
 
 
 %changelog
+* Sat Oct 07 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.8-1
+- upgrade to 0.4.8
+  - gpglist: do not die with with-fingerprint (Closes: debian #382019).
+  - gpg-key2ps: add --list-key to gpg call (works around debian #382794).
+  - caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
+    Gerfried Fuchs.
+
 * Mon Jul 10 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.7-1
 - upgrade to latest upstream
   - gpg-mailkeys: use right content-type for attached key,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jul 2006 17:46:34 -0000	1.4
+++ sources	8 Oct 2006 03:28:34 -0000	1.5
@@ -1 +1 @@
-b277efb28ae0b794d6e53a84f753682a  signing-party_0.4.7.orig.tar.gz
+61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 04:22:55 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 21:22:55 -0700
Subject: rpms/ejabberd/devel .cvsignore, 1.2, 1.3 ejabberd.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200610080422.k984Mv1D031844@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823

Modified Files:
	.cvsignore ejabberd.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2006 12:40:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 04:22:54 -0000	1.3
@@ -1 +1 @@
-ejabberd-1.1.1.tar.gz
+ejabberd-1.1.2.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejabberd.spec	29 Aug 2006 00:46:57 -0000	1.4
+++ ejabberd.spec	8 Oct 2006 04:22:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.1
-Release:        10%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 12:40:03 -0000	1.2
+++ sources	8 Oct 2006 04:22:54 -0000	1.3
@@ -1 +1 @@
-ef6fae4a3f9c7f807f21e9cd3dae195b  ejabberd-1.1.1.tar.gz
+5b947e19e18a6b554bf31d1c95176eb6  ejabberd-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 04:24:03 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 21:24:03 -0700
Subject: rpms/ejabberd/FC-5 .cvsignore, 1.2, 1.3 ejabberd.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610080424.k984O5KO031916@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31893

Modified Files:
	.cvsignore ejabberd.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2006 12:40:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 04:24:02 -0000	1.3
@@ -1 +1 @@
-ejabberd-1.1.1.tar.gz
+ejabberd-1.1.2.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejabberd.spec	3 Jul 2006 15:00:37 -0000	1.3
+++ ejabberd.spec	8 Oct 2006 04:24:02 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
+- Bump release and rebuild.
+
 * Mon Jul 3 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-9
 - Updated init script - should hopefully fix some problems with status & stop commands.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 12:40:03 -0000	1.2
+++ sources	8 Oct 2006 04:24:02 -0000	1.3
@@ -1 +1 @@
-ef6fae4a3f9c7f807f21e9cd3dae195b  ejabberd-1.1.1.tar.gz
+5b947e19e18a6b554bf31d1c95176eb6  ejabberd-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 04:24:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 21:24:45 -0700
Subject: rpms/ejabberd/FC-4 .cvsignore, 1.2, 1.3 ejabberd.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610080424.k984OlH3032002@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31981

Modified Files:
	.cvsignore ejabberd.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2006 12:40:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 04:24:45 -0000	1.3
@@ -1 +1 @@
-ejabberd-1.1.1.tar.gz
+ejabberd-1.1.2.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/ejabberd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejabberd.spec	3 Jul 2006 15:02:46 -0000	1.3
+++ ejabberd.spec	8 Oct 2006 04:24:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
+- Bump release and rebuild.
+
 * Mon Jul 3 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-9
 - Updated init script - should hopefully fix some problems with status & stop commands.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 12:40:03 -0000	1.2
+++ sources	8 Oct 2006 04:24:45 -0000	1.3
@@ -1 +1 @@
-ef6fae4a3f9c7f807f21e9cd3dae195b  ejabberd-1.1.1.tar.gz
+5b947e19e18a6b554bf31d1c95176eb6  ejabberd-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 05:31:41 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat,  7 Oct 2006 22:31:41 -0700
Subject: rpms/zeroinstall-injector/FC-5 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 zeroinstall-injector.spec, 1.1,
	1.2 zeroinstall-injector-0.18.tar.gz.gpg, 1.1, NONE
Message-ID: <200610080531.k985Vix1002803@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2732/FC-5

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	zeroinstall-injector-0.18.tar.gz.gpg 
Log Message:
- Update to 0.23
- Rebuild for all releases



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Mar 2006 20:01:32 -0000	1.1
+++ .cvsignore	8 Oct 2006 05:31:41 -0000	1.2
@@ -0,0 +1 @@
+zeroinstall-injector-0.23.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Mar 2006 20:01:32 -0000	1.1
+++ sources	8 Oct 2006 05:31:41 -0000	1.2
@@ -0,0 +1 @@
+52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/zeroinstall-injector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zeroinstall-injector.spec	6 Mar 2006 20:02:53 -0000	1.1
+++ zeroinstall-injector.spec	8 Oct 2006 05:31:41 -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:    zeroinstall-injector
-Version: 0.18
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -54,13 +54,16 @@
 %ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml
+%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
 %{python_sitelib}/zeroinstall/*/*.py
 %{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> 0.23-1
+- Update to 0.23
+
 * Sun Mar  5 2006 Michel Salim <michel.salim at gmail.com> 0.18-4
 - Removed left-behind pushd and popd
 


--- zeroinstall-injector-0.18.tar.gz.gpg DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 05:31:42 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat,  7 Oct 2006 22:31:42 -0700
Subject: rpms/zeroinstall-injector/devel .cvsignore, 1.1, 1.2 sources, 1.1, 
	1.2 zeroinstall-injector.spec, 1.1, 1.2 needs.rebuild, 1.1,
	NONE zeroinstall-injector-0.18.tar.gz.gpg, 1.1, NONE
Message-ID: <200610080531.k985Vipo002809@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2732/devel

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	needs.rebuild zeroinstall-injector-0.18.tar.gz.gpg 
Log Message:
- Update to 0.23
- Rebuild for all releases



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Mar 2006 20:01:32 -0000	1.1
+++ .cvsignore	8 Oct 2006 05:31:42 -0000	1.2
@@ -0,0 +1 @@
+zeroinstall-injector-0.23.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Mar 2006 20:01:32 -0000	1.1
+++ sources	8 Oct 2006 05:31:42 -0000	1.2
@@ -0,0 +1 @@
+52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zeroinstall-injector.spec	6 Mar 2006 20:02:53 -0000	1.1
+++ zeroinstall-injector.spec	8 Oct 2006 05:31:42 -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:    zeroinstall-injector
-Version: 0.18
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -54,13 +54,16 @@
 %ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml
+%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
 %{python_sitelib}/zeroinstall/*/*.py
 %{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> 0.23-1
+- Update to 0.23
+
 * Sun Mar  5 2006 Michel Salim <michel.salim at gmail.com> 0.18-4
 - Removed left-behind pushd and popd
 


--- needs.rebuild DELETED ---


--- zeroinstall-injector-0.18.tar.gz.gpg DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 05:31:40 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat,  7 Oct 2006 22:31:40 -0700
Subject: rpms/zeroinstall-injector/FC-3 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 zeroinstall-injector.spec, 1.1,
	1.2 zeroinstall-injector-0.18.tar.gz.gpg, 1.1, NONE
Message-ID: <200610080532.k985WC2x002815@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2732/FC-3

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	zeroinstall-injector-0.18.tar.gz.gpg 
Log Message:
- Update to 0.23
- Rebuild for all releases



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Mar 2006 20:01:32 -0000	1.1
+++ .cvsignore	8 Oct 2006 05:31:39 -0000	1.2
@@ -0,0 +1 @@
+zeroinstall-injector-0.23.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Mar 2006 20:01:32 -0000	1.1
+++ sources	8 Oct 2006 05:31:39 -0000	1.2
@@ -0,0 +1 @@
+52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/zeroinstall-injector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zeroinstall-injector.spec	6 Mar 2006 20:02:53 -0000	1.1
+++ zeroinstall-injector.spec	8 Oct 2006 05:31:39 -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:    zeroinstall-injector
-Version: 0.18
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -54,13 +54,16 @@
 %ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml
+%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
 %{python_sitelib}/zeroinstall/*/*.py
 %{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> 0.23-1
+- Update to 0.23
+
 * Sun Mar  5 2006 Michel Salim <michel.salim at gmail.com> 0.18-4
 - Removed left-behind pushd and popd
 


--- zeroinstall-injector-0.18.tar.gz.gpg DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 05:31:41 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat,  7 Oct 2006 22:31:41 -0700
Subject: rpms/zeroinstall-injector/FC-4 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 zeroinstall-injector.spec, 1.1,
	1.2 zeroinstall-injector-0.18.tar.gz.gpg, 1.1, NONE
Message-ID: <200610080532.k985WDZk002820@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2732/FC-4

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	zeroinstall-injector-0.18.tar.gz.gpg 
Log Message:
- Update to 0.23
- Rebuild for all releases



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Mar 2006 20:01:32 -0000	1.1
+++ .cvsignore	8 Oct 2006 05:31:40 -0000	1.2
@@ -0,0 +1 @@
+zeroinstall-injector-0.23.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Mar 2006 20:01:32 -0000	1.1
+++ sources	8 Oct 2006 05:31:40 -0000	1.2
@@ -0,0 +1 @@
+52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/zeroinstall-injector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zeroinstall-injector.spec	6 Mar 2006 20:02:53 -0000	1.1
+++ zeroinstall-injector.spec	8 Oct 2006 05:31: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:    zeroinstall-injector
-Version: 0.18
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -54,13 +54,16 @@
 %ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml
+%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
 %{python_sitelib}/zeroinstall/*/*.py
 %{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> 0.23-1
+- Update to 0.23
+
 * Sun Mar  5 2006 Michel Salim <michel.salim at gmail.com> 0.18-4
 - Removed left-behind pushd and popd
 


--- zeroinstall-injector-0.18.tar.gz.gpg DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 06:07:47 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:07:47 -0700
Subject: rpms/scrot/devel - New directory
Message-ID: <200610080607.k9867nlc005966@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5937/scrot/devel

Log Message:
Directory /cvs/extras/rpms/scrot/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  8 06:07:46 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:07:46 -0700
Subject: rpms/scrot - New directory
Message-ID: <200610080607.k9867mku005958@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5937/scrot

Log Message:
Directory /cvs/extras/rpms/scrot added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  8 06:07:58 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:07:58 -0700
Subject: rpms/scrot/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610080608.k98680th006022@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5982/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scrot


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  8 06:07:57 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:07:57 -0700
Subject: rpms/scrot Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610080607.k9867xs7006015@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5982

Added Files:
	Makefile import.log 
Log Message:
Setup of module scrot


--- NEW FILE Makefile ---
# Top level Makefile for module scrot
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  8 06:08:20 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:08:20 -0700
Subject: rpms/scrot import.log,1.1,1.2
Message-ID: <200610080608.k9868q6S006147@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6075

Modified Files:
	import.log 
Log Message:
auto-import scrot-0.8-2.fc5 on branch devel from scrot-0.8-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scrot/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Oct 2006 06:07:56 -0000	1.1
+++ import.log	8 Oct 2006 06:08:20 -0000	1.2
@@ -0,0 +1 @@
+scrot-0_8-2_fc5:HEAD:scrot-0.8-2.fc5.src.rpm:1160287695



From fedora-extras-commits at redhat.com  Sun Oct  8 06:08:21 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:08:21 -0700
Subject: rpms/scrot/devel scrot.spec, NONE, 1.1 scrot_Makefile_in.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610080608.k9868rn7006151@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6075/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scrot.spec scrot_Makefile_in.patch 
Log Message:
auto-import scrot-0.8-2.fc5 on branch devel from scrot-0.8-2.fc5.src.rpm


--- NEW FILE scrot.spec ---
Name:           scrot 
Version:        0.8
Release:        2%{?dist}
Summary:        Screen-shot capture using Imlib 2

Group:          User Interface/X
License:        MIT
URL:            http://www.linuxbrit.co.uk/scrot/
Source0:        http://linuxbrit.co.uk/downloads/%{name}-%{version}.tar.gz
Patch1:         scrot_Makefile_in.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  imlib2-devel,libX11-devel,giblib-devel

%description
A nice and straightforward screen capture utility implementing the dynamic
loaders of imlib2.


%prep
%setup -q
%patch1

%build
%configure 
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/*
%{_mandir}/man1/*



%changelog
* Wed Oct 04 2006 Michael Rice <errr[AT]errr-online.com> - 0.8-2
- Fix project home page link
- Fix license from BSD to MIT
- Fix version info for Changelog entrys
- Remove datadir/name to fix dup doc entrys
- Fix patch for docs:
  removed the data docs from being installed by src

* Mon Sep 25 2006 Michael Rice <errr[AT]errr-online.com> - 0.8-1
- Initial RPM release

scrot_Makefile_in.patch:

--- NEW FILE scrot_Makefile_in.patch ---
--- Makefile.in	2003-06-23 07:13:33.000000000 -0500
+++ errr.Makefile.in	2006-10-04 12:31:00.000000000 -0500
@@ -81,11 +81,8 @@
 
 man_MANS = scrot.1
 
-docs_DATA = README AUTHORS ChangeLog TODO
-docsdir = $(prefix)/doc/scrot
-
-EXTRA_DIST =  scrot.spec scrot.1 $(docs_DATA)
 
+EXTRA_DIST =  scrot.spec scrot.1 
 
 SUBDIRS = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -194,25 +191,6 @@
 	@$(NORMAL_UNINSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
 
-install-docsDATA: $(docs_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(docsdir)
-	@list='$(docs_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docsdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docsdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-docsDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(docs_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(docsdir)/$$p; \
-	done
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scrot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Oct 2006 06:07:58 -0000	1.1
+++ .cvsignore	8 Oct 2006 06:08:21 -0000	1.2
@@ -0,0 +1 @@
+scrot-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scrot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Oct 2006 06:07:58 -0000	1.1
+++ sources	8 Oct 2006 06:08:21 -0000	1.2
@@ -0,0 +1 @@
+ccae904d225609571bdd3b03445c1e88  scrot-0.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 06:11:53 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:11:53 -0700
Subject: owners owners.list,1.1794,1.1795
Message-ID: <200610080611.k986Btoj006231@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6214

Modified Files:
	owners.list 
Log Message:
Adding my self as mainatiner  bug: 208424



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1794
retrieving revision 1.1795
diff -u -r1.1794 -r1.1795
--- owners.list	7 Oct 2006 18:06:28 -0000	1.1794
+++ owners.list	8 Oct 2006 06:11:53 -0000	1.1795
@@ -2013,6 +2013,7 @@
 Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|scribus-templates|This package includes additional templates for Scribus|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de
 Fedora Extras|scrip|Spherical Coordinate Remapping and Interpolation Package|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|scrot|Screen-shot capture using Imlib2|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 07:24:22 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Sun,  8 Oct 2006 00:24:22 -0700
Subject: rpms/yumex/devel .cvsignore, 1.23, 1.24 sources, 1.31,
	1.32 yumex.spec, 1.35, 1.36
Message-ID: <200610080724.k987OOm9009454@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9433

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Development Release 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Sep 2006 17:27:24 -0000	1.23
+++ .cvsignore	8 Oct 2006 07:24:22 -0000	1.24
@@ -1 +1 @@
-yumex-1.1.3.tar.gz
+yumex-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	6 Sep 2006 17:27:24 -0000	1.31
+++ sources	8 Oct 2006 07:24:22 -0000	1.32
@@ -1 +1 @@
-ad65af5a6f9459a1f3b2cd7c4b686c41  yumex-1.1.3.tar.gz
+7c6d3ec4d113ca897f5889ebd3112757  yumex-1.1.4.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- yumex.spec	6 Sep 2006 17:27:24 -0000	1.35
+++ yumex.spec	8 Oct 2006 07:24:22 -0000	1.36
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.3
+Version:  1.1.4
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -16,7 +16,7 @@
 BuildRequires: intltool
 
 
-Requires: yum >= 2.9.6
+Requires: yum >= 3.0.0
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -67,6 +67,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 7 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-1.0
+- Development Release 1.1.4-1.0
+- Updated Requires: yum >= 2.9.6 to yum >= 3.0.0
 * Wed Sep 6 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.3-1.0
 - Development Release 1.1.3-1.0
 - Updated Requires: yum >= 2.9.5 to yum >= 2.9.6



From fedora-extras-commits at redhat.com  Sun Oct  8 08:25:44 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 01:25:44 -0700
Subject: comps comps-fe5.xml.in,1.162,1.163 comps-fe6.xml.in,1.176,1.177
Message-ID: <200610080825.k988Pk3r012543@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12524

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add alleyoop and sysprof to development-tools



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- comps-fe5.xml.in	7 Oct 2006 16:12:33 -0000	1.162
+++ comps-fe5.xml.in	8 Oct 2006 08:25:44 -0000	1.163
@@ -87,6 +87,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">abicheck</packagereq>
+      <packagereq type="optional">alleyoop</packagereq>
       <packagereq type="optional">aplus-fsf</packagereq>
       <packagereq type="optional">archmage</packagereq>
       <packagereq type="optional">asa</packagereq>
@@ -152,6 +153,7 @@
       <packagereq type="optional">srecord</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
+      <packagereq type="optional">sysprof</packagereq>
       <packagereq type="optional">tkcvs</packagereq>
       <packagereq type="optional">tla</packagereq>
       <packagereq type="optional">tolua++</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- comps-fe6.xml.in	7 Oct 2006 14:59:19 -0000	1.176
+++ comps-fe6.xml.in	8 Oct 2006 08:25:44 -0000	1.177
@@ -107,6 +107,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">abicheck</packagereq>
+      <packagereq type="optional">alleyoop</packagereq>
       <packagereq type="optional">aplus-fsf</packagereq>
       <packagereq type="optional">archmage</packagereq>
       <packagereq type="optional">asa</packagereq>
@@ -187,6 +188,7 @@
       <packagereq type="optional">svn2cl</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
+      <packagereq type="optional">sysprof</packagereq>
       <packagereq type="optional">tkcvs</packagereq>
       <packagereq type="optional">tla</packagereq>
       <packagereq type="optional">tolua++</packagereq>



From fedora-extras-commits at redhat.com  Sun Oct  8 09:04:25 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 02:04:25 -0700
Subject: comps comps-cleanup.xsl,1.2,1.3
Message-ID: <200610080904.k9894SuX015494@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15476

Modified Files:
	comps-cleanup.xsl 
Log Message:
work harder at preserving comments


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comps-cleanup.xsl	7 Oct 2006 23:36:09 -0000	1.2
+++ comps-cleanup.xsl	8 Oct 2006 09:04:25 -0000	1.3
@@ -13,7 +13,6 @@
      However without DTD there is no way to check the files completely.
 
      ?? Nicolas Mailhot <nim at fedoraproject dot org> 2006 -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="comps.dtd" doctype-public="-//Red Hat, Inc.//DTD Comps info//EN"/>
@@ -28,13 +27,20 @@
   <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
 <!-- Preserve most nodes -->
   <xsl:template match="*" priority="0">
+<!-- Group comments with the logically-following element -->
+    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="*|text()|comment()"/>
+      <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
   </xsl:template>
-<!-- Preserve attributes and comments -->
-  <xsl:template match="@*|comment()">
+<!-- Preserve attributes and text nodes -->
+  <xsl:template match="comment()|text()">
+    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
+    <xsl:copy/>
+  </xsl:template>
+<!-- Preserve attributes -->
+  <xsl:template match="@*">
     <xsl:copy/>
   </xsl:template>
 <!-- Sort groups by id -->
@@ -50,13 +56,11 @@
   </xsl:template>
 <!-- Warn about duplicate groups being merged -->
   <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="2">
-    <xsl:message>?????? Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
-    <xsl:message>??</xsl:message>
+    <xsl:message> ?????? Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
 <!-- Warn about duplicate categories being merged -->
   <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="2">
-    <xsl:message>?????? Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
-    <xsl:message>??</xsl:message>
+    <xsl:message> ?????? Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
 <!-- Sort packages within a group by class then name -->
   <xsl:template match="packagelist" priority="1">
@@ -87,23 +91,21 @@
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
     <xsl:message>????????? Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
     <xsl:message>  Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
-    <xsl:message>??</xsl:message>
   </xsl:template>
 <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">
-    <xsl:message>??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
-    <xsl:message>??</xsl:message>
+    <xsl:message>  ??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
   </xsl:template>
 <!-- Warn about packages referenced several times (at least twice;)) -->
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
-    <xsl:message>??? Package <xsl:value-of select="text()"/> is referenced several times:</xsl:message>
+    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in multiple groups:</xsl:message>
     <xsl:for-each select="key('unique-packages',text())">
-      <xsl:message> ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
+      <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
-    <xsl:message>??</xsl:message>
+    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="*|text()|comment()"/>
+      <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>



From fedora-extras-commits at redhat.com  Sun Oct  8 09:16:19 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun,  8 Oct 2006 02:16:19 -0700
Subject: rpms/codeblocks/devel .cvsignore, 1.2, 1.3 codeblocks-plugins.patch,
	1.1, 1.2 codeblocks.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610080916.k989GLhT015643@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15614

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3030
- change the install paths for plugins in the spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2006 20:21:13 -0000	1.2
+++ .cvsignore	8 Oct 2006 09:16:19 -0000	1.3
@@ -1 +1 @@
-codeblocks-svn2965.tar.bz2
+codeblocks-svn3030.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-plugins.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-plugins.patch	8 Oct 2006 09:16:19 -0000	1.2
@@ -1,255 +1,3 @@
-diff -Nru --exclude .svn codeblocks/src/plugins/astyle/Makefile.am codeblocks-devel/src/plugins/astyle/Makefile.am
---- codeblocks/src/plugins/astyle/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/astyle/Makefile.am	2006-07-23 09:41:41.000000000 +0200
-@@ -5,7 +5,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libastyle.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/autosave/Makefile.am codeblocks-devel/src/plugins/autosave/Makefile.am
---- codeblocks/src/plugins/autosave/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/autosave/Makefile.am	2006-07-23 09:42:45.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libautosave.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/classwizard/Makefile.am codeblocks-devel/src/plugins/classwizard/Makefile.am
---- codeblocks/src/plugins/classwizard/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/classwizard/Makefile.am	2006-07-23 09:42:59.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libclasswizard.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/codecompletion/Makefile.am codeblocks-devel/src/plugins/codecompletion/Makefile.am
---- codeblocks/src/plugins/codecompletion/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/codecompletion/Makefile.am	2006-07-23 09:43:20.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodecompletion.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/compilergcc/Makefile.am codeblocks-devel/src/plugins/compilergcc/Makefile.am
---- codeblocks/src/plugins/compilergcc/Makefile.am	2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/compilergcc/Makefile.am	2006-07-23 09:43:33.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- AM_CXXFLAGS = -DDEPSLIB_UNIX
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcompiler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/byogames/Makefile.am codeblocks-devel/src/plugins/contrib/byogames/Makefile.am
---- codeblocks/src/plugins/contrib/byogames/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/byogames/Makefile.am	2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libbyogames.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/cb_koders/Makefile.am codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am
---- codeblocks/src/plugins/contrib/cb_koders/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am	2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcb_koders.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codesnippets/Makefile.am codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am
---- codeblocks/src/plugins/contrib/codesnippets/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am	2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodesnippets.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codestat/Makefile.am codeblocks-devel/src/plugins/contrib/codestat/Makefile.am
---- codeblocks/src/plugins/contrib/codestat/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codestat/Makefile.am	2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodestat.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/dragscroll/Makefile.am codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am
---- codeblocks/src/plugins/contrib/dragscroll/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am	2006-07-23 09:45:14.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdragscroll.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/envvars/Makefile.am codeblocks-devel/src/plugins/contrib/envvars/Makefile.am
---- codeblocks/src/plugins/contrib/envvars/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/envvars/Makefile.am	2006-07-23 09:45:25.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- pkgdata_DATA = envvars.zip
- 
- lib_LTLIBRARIES = libenvvars.la
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/help_plugin/Makefile.am codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am
---- codeblocks/src/plugins/contrib/help_plugin/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am	2006-07-23 09:45:35.000000000 +0200
-@@ -3,7 +3,7 @@
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 		-include "sdk.h"
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libhelp_plugin.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/keybinder/Makefile.am codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am
---- codeblocks/src/plugins/contrib/keybinder/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am	2006-07-23 09:45:43.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libkeybinder.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/profiler/Makefile.am codeblocks-devel/src/plugins/contrib/profiler/Makefile.am
---- codeblocks/src/plugins/contrib/profiler/Makefile.am	2006-07-11 14:09:05.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/profiler/Makefile.am	2006-07-23 09:45:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libprofiler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/source_exporter/Makefile.am codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am
---- codeblocks/src/plugins/contrib/source_exporter/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am	2006-07-23 09:46:06.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/plugins/contrib/source_exporter/wxPdfDocument/include \
- 		-include "sdk.h"
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libexporter.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/wxSmith/Makefile.am codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am
---- codeblocks/src/plugins/contrib/wxSmith/Makefile.am	2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am	2006-07-23 09:46:17.000000000 +0200
-@@ -11,7 +11,7 @@
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 		-I$(top_srcdir)/src/sdk/propgrid/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libwxsmith.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/debuggergdb/Makefile.am codeblocks-devel/src/plugins/debuggergdb/Makefile.am
---- codeblocks/src/plugins/debuggergdb/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/debuggergdb/Makefile.am	2006-07-23 09:43:50.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/sdk/scripting/include \
-     	-I$(top_srcdir)/src/sdk/scripting/sqplus
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdebuggergdb.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/defaultmimehandler/Makefile.am codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am
---- codeblocks/src/plugins/defaultmimehandler/Makefile.am	2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am	2006-07-23 09:44:03.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdefaultmimehandler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/scriptedwizard/Makefile.am codeblocks-devel/src/plugins/scriptedwizard/Makefile.am
---- codeblocks/src/plugins/scriptedwizard/Makefile.am	2006-07-14 14:02:13.000000000 +0200
-+++ codeblocks-devel/src/plugins/scriptedwizard/Makefile.am	2006-07-23 09:44:14.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/sdk/scripting/include \
- 		-I$(top_srcdir)/src/sdk/scripting/sqplus
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libscriptedwizard.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/todo/Makefile.am codeblocks-devel/src/plugins/todo/Makefile.am
---- codeblocks/src/plugins/todo/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/todo/Makefile.am	2006-07-23 09:44:23.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libtodo.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/xpmanifest/Makefile.am codeblocks-devel/src/plugins/xpmanifest/Makefile.am
---- codeblocks/src/plugins/xpmanifest/Makefile.am	2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/xpmanifest/Makefile.am	2006-07-23 09:44:33.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libxpmanifest.la
- 
 diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
 --- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
 +++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks.spec	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks.spec	8 Oct 2006 09:16:19 -0000	1.2
@@ -1,9 +1,9 @@
-%define		rev	2965
-%define		date	20060909
+%define		rev	3030
+%define		date	20061007
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.9.%{date}svn%{rev}%{?dist}
+Release:	0.10.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -62,6 +62,17 @@
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null
 chmod a+x bootstrap src/update
 
+# fix the dir, where plugins are installed
+for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler scriptedwizard todo xpmanifest
+do
+	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
+done
+
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+do
+	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
+done
+
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -138,7 +149,7 @@
 %{plugindir}/libclasswizard.so
 %{plugindir}/libcodecompletion.so
 %{plugindir}/libcompiler.so
-%{plugindir}/libdebuggergdb.so
+%{plugindir}/libdebugger.so
 %{plugindir}/libdefaultmimehandler.so
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
@@ -161,13 +172,14 @@
 %{pkgdatadir}/templates/*
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
-%{pkgdatadir}/class_wizard.zip
-%{pkgdatadir}/code_completion.zip
-%{pkgdatadir}/compiler_gcc.zip
-%{pkgdatadir}/debugger_gdb.zip
+%{pkgdatadir}/classwizard.zip
+%{pkgdatadir}/codecompletion.zip
+%{pkgdatadir}/compiler.zip
+%{pkgdatadir}/debugger.zip
 %{pkgdatadir}/defaultmimehandler.zip
 %{pkgdatadir}/manager_resources.zip
 %{pkgdatadir}/resources.zip
+%{pkgdatadir}/scriptedwizard.zip
 %{pkgdatadir}/start_here.zip
 %{pkgdatadir}/todo.zip
 %{pkgdatadir}/tips.txt
@@ -180,10 +192,16 @@
 
 %files contrib
 %defattr(-,root,root)
+%{pkgdatadir}/byogames.zip
+%{pkgdatadir}/cb_koders.zip
+%{pkgdatadir}/codesnippets.zip
 %{pkgdatadir}/codestat.zip
+%{pkgdatadir}/dragscroll.zip
 %{pkgdatadir}/envvars.zip
+%{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
-%{pkgdatadir}/profiler.zip
+%{pkgdatadir}/keybinder.zip
+%{pkgdatadir}/CBProfiler.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -202,6 +220,10 @@
 
 
 %changelog
+* Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
+- update to revision 3030
+- change the install paths for plugins in the spec file
+
 * Wed Sep 13 2006 Dan Horak <dan[at]danny.cz> 1.0-0.9.20060909svn2965
 - do not require .svn directories for building
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2006 20:21:13 -0000	1.2
+++ sources	8 Oct 2006 09:16:19 -0000	1.3
@@ -1 +1 @@
-3d5cadadd3b22098966213dc21ff1515  codeblocks-svn2965.tar.bz2
+5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 09:16:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 02:16:44 -0700
Subject: comps comps-cleanup.xsl,1.3,1.4
Message-ID: <200610080916.k989GkGX015670@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15651

Modified Files:
	comps-cleanup.xsl 
Log Message:
sort groups in duplicate warnings


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comps-cleanup.xsl	8 Oct 2006 09:04:25 -0000	1.3
+++ comps-cleanup.xsl	8 Oct 2006 09:16:44 -0000	1.4
@@ -100,6 +100,7 @@
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
     <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in multiple groups:</xsl:message>
     <xsl:for-each select="key('unique-packages',text())">
+      <xsl:sort select="../../id/text()"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>



From fedora-extras-commits at redhat.com  Sun Oct  8 09:17:23 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  8 Oct 2006 02:17:23 -0700
Subject: owners owners.list,1.1795,1.1796
Message-ID: <200610080917.k989HPuW015729@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15708

Modified Files:
	owners.list 
Log Message:

Added mysql-connector-net 
 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1795
retrieving revision 1.1796
diff -u -r1.1795 -r1.1796
--- owners.list	8 Oct 2006 06:11:53 -0000	1.1795
+++ owners.list	8 Oct 2006 09:17:23 -0000	1.1796
@@ -1072,6 +1072,7 @@
 Fedora Extras|mxml|Miniature XML development library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|mysql-connector-java|Official JDBC driver for MySQL|ifoox at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|mysql-connector-net|Official dot net driver for MySQL|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|mysql-query-browser|A graphical tool for handling MySQL queries|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|nagios|Host/service/network monitoring program|imlinux at gmail.com|extras-qa at fedoraproject.org|wtogami at redhat.com



From fedora-extras-commits at redhat.com  Sun Oct  8 09:18:38 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun,  8 Oct 2006 02:18:38 -0700
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.2, 1.3 codeblocks-plugins.patch, 
	1.1, 1.2 codeblocks.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610080918.k989Ifoq015778@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15749

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3030
- change the install paths for plugins in the spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2006 20:21:13 -0000	1.2
+++ .cvsignore	8 Oct 2006 09:18:38 -0000	1.3
@@ -1 +1 @@
-codeblocks-svn2965.tar.bz2
+codeblocks-svn3030.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-plugins.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-plugins.patch	8 Oct 2006 09:18:38 -0000	1.2
@@ -1,255 +1,3 @@
-diff -Nru --exclude .svn codeblocks/src/plugins/astyle/Makefile.am codeblocks-devel/src/plugins/astyle/Makefile.am
---- codeblocks/src/plugins/astyle/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/astyle/Makefile.am	2006-07-23 09:41:41.000000000 +0200
-@@ -5,7 +5,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libastyle.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/autosave/Makefile.am codeblocks-devel/src/plugins/autosave/Makefile.am
---- codeblocks/src/plugins/autosave/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/autosave/Makefile.am	2006-07-23 09:42:45.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libautosave.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/classwizard/Makefile.am codeblocks-devel/src/plugins/classwizard/Makefile.am
---- codeblocks/src/plugins/classwizard/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/classwizard/Makefile.am	2006-07-23 09:42:59.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libclasswizard.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/codecompletion/Makefile.am codeblocks-devel/src/plugins/codecompletion/Makefile.am
---- codeblocks/src/plugins/codecompletion/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/codecompletion/Makefile.am	2006-07-23 09:43:20.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodecompletion.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/compilergcc/Makefile.am codeblocks-devel/src/plugins/compilergcc/Makefile.am
---- codeblocks/src/plugins/compilergcc/Makefile.am	2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/compilergcc/Makefile.am	2006-07-23 09:43:33.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- AM_CXXFLAGS = -DDEPSLIB_UNIX
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcompiler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/byogames/Makefile.am codeblocks-devel/src/plugins/contrib/byogames/Makefile.am
---- codeblocks/src/plugins/contrib/byogames/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/byogames/Makefile.am	2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libbyogames.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/cb_koders/Makefile.am codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am
---- codeblocks/src/plugins/contrib/cb_koders/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am	2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcb_koders.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codesnippets/Makefile.am codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am
---- codeblocks/src/plugins/contrib/codesnippets/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am	2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodesnippets.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codestat/Makefile.am codeblocks-devel/src/plugins/contrib/codestat/Makefile.am
---- codeblocks/src/plugins/contrib/codestat/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codestat/Makefile.am	2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodestat.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/dragscroll/Makefile.am codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am
---- codeblocks/src/plugins/contrib/dragscroll/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am	2006-07-23 09:45:14.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdragscroll.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/envvars/Makefile.am codeblocks-devel/src/plugins/contrib/envvars/Makefile.am
---- codeblocks/src/plugins/contrib/envvars/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/envvars/Makefile.am	2006-07-23 09:45:25.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- pkgdata_DATA = envvars.zip
- 
- lib_LTLIBRARIES = libenvvars.la
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/help_plugin/Makefile.am codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am
---- codeblocks/src/plugins/contrib/help_plugin/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am	2006-07-23 09:45:35.000000000 +0200
-@@ -3,7 +3,7 @@
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 		-include "sdk.h"
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libhelp_plugin.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/keybinder/Makefile.am codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am
---- codeblocks/src/plugins/contrib/keybinder/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am	2006-07-23 09:45:43.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libkeybinder.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/profiler/Makefile.am codeblocks-devel/src/plugins/contrib/profiler/Makefile.am
---- codeblocks/src/plugins/contrib/profiler/Makefile.am	2006-07-11 14:09:05.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/profiler/Makefile.am	2006-07-23 09:45:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libprofiler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/source_exporter/Makefile.am codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am
---- codeblocks/src/plugins/contrib/source_exporter/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am	2006-07-23 09:46:06.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/plugins/contrib/source_exporter/wxPdfDocument/include \
- 		-include "sdk.h"
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libexporter.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/wxSmith/Makefile.am codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am
---- codeblocks/src/plugins/contrib/wxSmith/Makefile.am	2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am	2006-07-23 09:46:17.000000000 +0200
-@@ -11,7 +11,7 @@
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 		-I$(top_srcdir)/src/sdk/propgrid/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libwxsmith.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/debuggergdb/Makefile.am codeblocks-devel/src/plugins/debuggergdb/Makefile.am
---- codeblocks/src/plugins/debuggergdb/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/debuggergdb/Makefile.am	2006-07-23 09:43:50.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/sdk/scripting/include \
-     	-I$(top_srcdir)/src/sdk/scripting/sqplus
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdebuggergdb.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/defaultmimehandler/Makefile.am codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am
---- codeblocks/src/plugins/defaultmimehandler/Makefile.am	2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am	2006-07-23 09:44:03.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdefaultmimehandler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/scriptedwizard/Makefile.am codeblocks-devel/src/plugins/scriptedwizard/Makefile.am
---- codeblocks/src/plugins/scriptedwizard/Makefile.am	2006-07-14 14:02:13.000000000 +0200
-+++ codeblocks-devel/src/plugins/scriptedwizard/Makefile.am	2006-07-23 09:44:14.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/sdk/scripting/include \
- 		-I$(top_srcdir)/src/sdk/scripting/sqplus
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libscriptedwizard.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/todo/Makefile.am codeblocks-devel/src/plugins/todo/Makefile.am
---- codeblocks/src/plugins/todo/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/todo/Makefile.am	2006-07-23 09:44:23.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libtodo.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/xpmanifest/Makefile.am codeblocks-devel/src/plugins/xpmanifest/Makefile.am
---- codeblocks/src/plugins/xpmanifest/Makefile.am	2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/xpmanifest/Makefile.am	2006-07-23 09:44:33.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libxpmanifest.la
- 
 diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
 --- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
 +++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks.spec	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks.spec	8 Oct 2006 09:18:38 -0000	1.2
@@ -1,9 +1,9 @@
-%define		rev	2965
-%define		date	20060909
+%define		rev	3030
+%define		date	20061007
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.9.%{date}svn%{rev}%{?dist}
+Release:	0.10.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -62,6 +62,17 @@
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null
 chmod a+x bootstrap src/update
 
+# fix the dir, where plugins are installed
+for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler scriptedwizard todo xpmanifest
+do
+	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
+done
+
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+do
+	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
+done
+
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -138,7 +149,7 @@
 %{plugindir}/libclasswizard.so
 %{plugindir}/libcodecompletion.so
 %{plugindir}/libcompiler.so
-%{plugindir}/libdebuggergdb.so
+%{plugindir}/libdebugger.so
 %{plugindir}/libdefaultmimehandler.so
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
@@ -161,13 +172,14 @@
 %{pkgdatadir}/templates/*
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
-%{pkgdatadir}/class_wizard.zip
-%{pkgdatadir}/code_completion.zip
-%{pkgdatadir}/compiler_gcc.zip
-%{pkgdatadir}/debugger_gdb.zip
+%{pkgdatadir}/classwizard.zip
+%{pkgdatadir}/codecompletion.zip
+%{pkgdatadir}/compiler.zip
+%{pkgdatadir}/debugger.zip
 %{pkgdatadir}/defaultmimehandler.zip
 %{pkgdatadir}/manager_resources.zip
 %{pkgdatadir}/resources.zip
+%{pkgdatadir}/scriptedwizard.zip
 %{pkgdatadir}/start_here.zip
 %{pkgdatadir}/todo.zip
 %{pkgdatadir}/tips.txt
@@ -180,10 +192,16 @@
 
 %files contrib
 %defattr(-,root,root)
+%{pkgdatadir}/byogames.zip
+%{pkgdatadir}/cb_koders.zip
+%{pkgdatadir}/codesnippets.zip
 %{pkgdatadir}/codestat.zip
+%{pkgdatadir}/dragscroll.zip
 %{pkgdatadir}/envvars.zip
+%{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
-%{pkgdatadir}/profiler.zip
+%{pkgdatadir}/keybinder.zip
+%{pkgdatadir}/CBProfiler.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -202,6 +220,10 @@
 
 
 %changelog
+* Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
+- update to revision 3030
+- change the install paths for plugins in the spec file
+
 * Wed Sep 13 2006 Dan Horak <dan[at]danny.cz> 1.0-0.9.20060909svn2965
 - do not require .svn directories for building
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2006 20:21:13 -0000	1.2
+++ sources	8 Oct 2006 09:18:38 -0000	1.3
@@ -1 +1 @@
-3d5cadadd3b22098966213dc21ff1515  codeblocks-svn2965.tar.bz2
+5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 09:44:18 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 02:44:18 -0700
Subject: comps comps-cleanup.xsl,1.4,1.5
Message-ID: <200610080944.k989iKhC015933@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15916

Modified Files:
	comps-cleanup.xsl 
Log Message:
learn to count packages


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comps-cleanup.xsl	8 Oct 2006 09:16:44 -0000	1.4
+++ comps-cleanup.xsl	8 Oct 2006 09:44:18 -0000	1.5
@@ -98,8 +98,9 @@
   </xsl:template>
 <!-- Warn about packages referenced several times (at least twice;)) -->
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
-    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in multiple groups:</xsl:message>
-    <xsl:for-each select="key('unique-packages',text())">
+    <xsl:variable name="dupes" select="key('unique-packages',text())"/>
+    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced by <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
+    <xsl:for-each select="$dupes">
       <xsl:sort select="../../id/text()"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:26:08 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 03:26:08 -0700
Subject: comps comps-cleanup.xsl,1.5,1.6
Message-ID: <200610081026.k98AQAoQ019100@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19056

Modified Files:
	comps-cleanup.xsl 
Log Message:
smarter sort


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comps-cleanup.xsl	8 Oct 2006 09:44:18 -0000	1.5
+++ comps-cleanup.xsl	8 Oct 2006 10:26:07 -0000	1.6
@@ -101,7 +101,7 @@
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
     <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced by <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
     <xsl:for-each select="$dupes">
-      <xsl:sort select="../../id/text()"/>
+      <xsl:sort select="translate(../../id/text(),$lcletters,$ucletters)"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:26:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Oct 2006 03:26:09 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.14, 
	1.15
Message-ID: <200610081026.k98AQBeB019118@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19052/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sylpheed-claws-plugins.spec	30 Sep 2006 09:38:23 -0000	1.14
+++ sylpheed-claws-plugins.spec	8 Oct 2006 10:26:08 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,7 +510,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-2
+- rebuild
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-1
 - version upgrade
 
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:26:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Oct 2006 03:26:09 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.19, 
	1.20
Message-ID: <200610081026.k98AQBba019122@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19052/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sylpheed-claws-plugins.spec	30 Sep 2006 09:38:23 -0000	1.19
+++ sylpheed-claws-plugins.spec	8 Oct 2006 10:26:09 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,7 +510,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-2
+- rebuild
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-1
 - version upgrade
 
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:26:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Oct 2006 03:26:10 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.20,
	1.21
Message-ID: <200610081026.k98AQCaa019126@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19052/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sylpheed-claws-plugins.spec	30 Sep 2006 09:38:29 -0000	1.20
+++ sylpheed-claws-plugins.spec	8 Oct 2006 10:26:10 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,7 +510,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-2
+- rebuild
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-1
 - version upgrade
 
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:29:36 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 03:29:36 -0700
Subject: comps comps-cleanup.xsl,1.6,1.7
Message-ID: <200610081029.k98ATcu6019196@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19179

Modified Files:
	comps-cleanup.xsl 
Log Message:
more message beautification


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- comps-cleanup.xsl	8 Oct 2006 10:26:07 -0000	1.6
+++ comps-cleanup.xsl	8 Oct 2006 10:29:36 -0000	1.7
@@ -90,7 +90,7 @@
 <!-- Kill duplicate package entries -->
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
     <xsl:message>????????? Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
-    <xsl:message>  Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
+    <xsl:message>    ??? Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
   </xsl:template>
 <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">



From fedora-extras-commits at redhat.com  Sun Oct  8 10:39:31 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 03:39:31 -0700
Subject: comps comps-cleanup.xsl,1.7,1.8
Message-ID: <200610081039.k98AdXJV019330@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19313

Modified Files:
	comps-cleanup.xsl 
Log Message:
more message beautification


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comps-cleanup.xsl	8 Oct 2006 10:29:36 -0000	1.7
+++ comps-cleanup.xsl	8 Oct 2006 10:39:31 -0000	1.8
@@ -90,7 +90,7 @@
 <!-- Kill duplicate package entries -->
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
     <xsl:message>????????? Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
-    <xsl:message>    ??? Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
+    <xsl:message>     ??? Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
   </xsl:template>
 <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">



From fedora-extras-commits at redhat.com  Sun Oct  8 10:51:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun,  8 Oct 2006 03:51:27 -0700
Subject: owners owners.list,1.1796,1.1797
Message-ID: <200610081051.k98ApTLN019436@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419

Modified Files:
	owners.list 
Log Message:
added xfce4-dev-tools


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1796
retrieving revision 1.1797
diff -u -r1.1796 -r1.1797
--- owners.list	8 Oct 2006 09:17:23 -0000	1.1796
+++ owners.list	8 Oct 2006 10:51:27 -0000	1.1797
@@ -2312,6 +2312,7 @@
 Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-dev-tools|Xfce developer tools|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 10:59:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun,  8 Oct 2006 03:59:04 -0700
Subject: comps comps-fe6.xml.in,1.177,1.178
Message-ID: <200610081059.k98Ax6PA019476@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19459

Modified Files:
	comps-fe6.xml.in 
Log Message:
added xfce4-dev-tools


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- comps-fe6.xml.in	8 Oct 2006 08:25:44 -0000	1.177
+++ comps-fe6.xml.in	8 Oct 2006 10:59:04 -0000	1.178
@@ -195,6 +195,7 @@
       <packagereq type="optional">ucblogo</packagereq>
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">xbsql</packagereq>
+      <packagereq type="optional">xfce4-dev-tools</packagereq>
       <packagereq type="optional">yap</packagereq>
       <packagereq type="optional">yasm</packagereq>
     </packagelist>



From fedora-extras-commits at redhat.com  Sun Oct  8 11:14:57 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 04:14:57 -0700
Subject: comps comps-cleanup.xsl,1.8,1.9
Message-ID: <200610081114.k98BExAq022751@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22734

Modified Files:
	comps-cleanup.xsl 
Log Message:
sort attributes too


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- comps-cleanup.xsl	8 Oct 2006 10:39:31 -0000	1.8
+++ comps-cleanup.xsl	8 Oct 2006 11:14:57 -0000	1.9
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This stylesheet will:
-     - reorder and indent a comps file,
+     - reorder, indent and normalize a comps file,
      - merge duplicate groups and categories,
-     - warn about packages referenced multiple times,
-     - keep a single package reference per group,
+     - warn about packages referenced by multiple groups,
+     - kill multiple references to the same package within a group,
 
      Typical usage is:
      $ xsltproc -o output-file comps-cleanup.xsl original-file
 
-     You can use the "novalid" xsltproc switch to kill the warning about
+     You can use the ??????novalid xsltproc switch to kill the warning about
      Fedora not installing the comps DTD anywhere xsltproc can find it.
      However without DTD there is no way to check the files completely.
 
@@ -27,10 +27,15 @@
   <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
 <!-- Preserve most nodes -->
   <xsl:template match="*" priority="0">
+    <xsl:apply-templates select="." mode="normalize"/>
+  </xsl:template>
+  <xsl:template match="*" mode="normalize">
 <!-- Group comments with the logically-following element -->
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
-      <xsl:apply-templates select="@*"/>
+      <xsl:apply-templates select="@*">
+        <xsl:sort select="translate(name(),$lcletters,$ucletters)"/>
+      </xsl:apply-templates>
       <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
   </xsl:template>
@@ -104,10 +109,6 @@
       <xsl:sort select="translate(../../id/text(),$lcletters,$ucletters)"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
-    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="*|text()"/>
-    </xsl:copy>
+    <xsl:apply-templates select="." mode="normalize"/>
   </xsl:template>
 </xsl:stylesheet>



From fedora-extras-commits at redhat.com  Sun Oct  8 12:26:13 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 05:26:13 -0700
Subject: comps comps-cleanup.xsl,1.9,1.10
Message-ID: <200610081226.k98CQFUX031881@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864

Modified Files:
	comps-cleanup.xsl 
Log Message:
more normalization goodness


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- comps-cleanup.xsl	8 Oct 2006 11:14:57 -0000	1.9
+++ comps-cleanup.xsl	8 Oct 2006 12:26:12 -0000	1.10
@@ -13,7 +13,7 @@
      However without DTD there is no way to check the files completely.
 
      ?? Nicolas Mailhot <nim at fedoraproject dot org> 2006 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" extension-element-prefixes="exsl">
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="comps.dtd" doctype-public="-//Red Hat, Inc.//DTD Comps info//EN"/>
   <xsl:key name="unique-groups" match="/comps/group" use="id/text()"/>
@@ -25,6 +25,19 @@
   <xsl:key name="unique-group-entries" match="/comps/category/grouplist/groupid" use="concat(../../id/text(),'/',text())"/>
   <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz</xsl:variable>
   <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
+  <xsl:variable name="type-sort-order">
+    <unknown/>
+    <mandatory/>
+    <conditional/>
+    <default/>
+    <optional/>
+  </xsl:variable>
+  <xsl:variable name="attribute-sort-order">
+    <unknown/>
+    <type/>
+    <requires/>
+    <basearch/>
+  </xsl:variable>
 <!-- Preserve most nodes -->
   <xsl:template match="*" priority="0">
     <xsl:apply-templates select="." mode="normalize"/>
@@ -34,7 +47,7 @@
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="@*">
-        <xsl:sort select="translate(name(),$lcletters,$ucletters)"/>
+        <xsl:sort select="count(exsl:node-set($attribute-sort-order)/*[name() = name(current())]/preceding-sibling::*)" data-type="number"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
@@ -70,16 +83,8 @@
 <!-- Sort packages within a group by class then name -->
   <xsl:template match="packagelist" priority="1">
     <xsl:copy>
-      <xsl:apply-templates select="key('packages-by-group',../id/text())[@type = 'mandatory']">
-        <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="key('packages-by-group',../id/text())[@type = 'conditional']">
-        <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="key('packages-by-group',../id/text())[@type = 'default']">
-        <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="key('packages-by-group',../id/text())[@type = 'optional']">
+      <xsl:apply-templates select="key('packages-by-group',../id/text())">
+        <xsl:sort select="count(exsl:node-set($type-sort-order)/*[name() = current()/@type]/preceding-sibling::*)+1" data-type="number"/>
         <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
     </xsl:copy>



From fedora-extras-commits at redhat.com  Sun Oct  8 12:28:37 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 05:28:37 -0700
Subject: comps comps-fe6.xml.in,1.178,1.179
Message-ID: <200610081228.k98CSdre031917@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31900

Modified Files:
	comps-fe6.xml.in 
Log Message:
sort


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- comps-fe6.xml.in	8 Oct 2006 10:59:04 -0000	1.178
+++ comps-fe6.xml.in	8 Oct 2006 12:28:37 -0000	1.179
@@ -591,8 +591,8 @@
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>
-      <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">pydot</packagereq>
+      <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">showimg</packagereq>
@@ -1140,12 +1140,12 @@
       <packagereq type="optional">xfce4-systemload-plugin</packagereq>
       <packagereq type="optional">xfce4-taskmanager</packagereq>
       <packagereq type="optional">xfce4-toys</packagereq>
-      <packagereq type="optional">xfwm4-themes</packagereq>
       <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>
       <packagereq type="optional">xfce4-xkb-plugin</packagereq>
       <packagereq type="optional">xfce4-xmms-plugin</packagereq>
+      <packagereq type="optional">xfwm4-themes</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Sun Oct  8 12:29:52 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 05:29:52 -0700
Subject: comps comps-fe5.xml.in,1.163,1.164
Message-ID: <200610081229.k98CTsQD031943@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31924

Modified Files:
	comps-fe5.xml.in 
Log Message:
sort


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- comps-fe5.xml.in	8 Oct 2006 08:25:44 -0000	1.163
+++ comps-fe5.xml.in	8 Oct 2006 12:29:52 -0000	1.164
@@ -570,8 +570,7 @@
     <_description>Support for running programs written in the Java programming language.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
-    <packagelist>
-    </packagelist>
+    <packagelist/>
   </group>
   <group>
     <id>java-development</id>
@@ -839,8 +838,8 @@
       <packagereq type="optional">unison</packagereq>
       <packagereq type="optional">vnstat</packagereq>
       <packagereq type="optional">vpnc</packagereq>
-      <packagereq type="optional">wlassistant</packagereq>
       <packagereq type="optional">wine</packagereq>
+      <packagereq type="optional">wlassistant</packagereq>
       <packagereq type="optional">xsupplicant</packagereq>
       <packagereq type="optional">zidrav</packagereq>
     </packagelist>



From fedora-extras-commits at redhat.com  Sun Oct  8 12:43:46 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 05:43:46 -0700
Subject: comps comps-cleanup.xsl,1.10,1.11
Message-ID: <200610081243.k98Chm08031995@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31978

Modified Files:
	comps-cleanup.xsl 
Log Message:
warn about empty groups or categories


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- comps-cleanup.xsl	8 Oct 2006 12:26:12 -0000	1.10
+++ comps-cleanup.xsl	8 Oct 2006 12:43:46 -0000	1.11
@@ -61,23 +61,35 @@
   <xsl:template match="@*">
     <xsl:copy/>
   </xsl:template>
-<!-- Sort groups by id -->
+<!-- Sort groups by id, and categories by display order -->
   <xsl:template match="comps" priority="1">
+    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="group">
         <xsl:sort select="translate(id/text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="category">
         <xsl:sort select="display_order/text()"/>
+        <xsl:sort select="translate(id/text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
     </xsl:copy>
   </xsl:template>
+<!-- Warn about empty groups -->
+  <xsl:template match="group[count(key('packages-by-group',id/text()))=0]" priority="2">
+    <xsl:message>????????? Empty group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/>!</xsl:message>
+    <xsl:apply-templates select="." mode="normalize"/>
+  </xsl:template>
 <!-- Warn about duplicate groups being merged -->
-  <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="2">
+  <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="3">
     <xsl:message> ?????? Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
+<!-- Warn about empty categories -->
+  <xsl:template match="category[count(key('groups-by-category',id/text()))=0]" priority="2">
+    <xsl:message>????????? Empty category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/>!</xsl:message>
+    <xsl:apply-templates select="." mode="normalize"/>
+  </xsl:template>
 <!-- Warn about duplicate categories being merged -->
-  <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="2">
+  <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="3">
     <xsl:message> ?????? Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
 <!-- Sort packages within a group by class then name -->



From fedora-extras-commits at redhat.com  Sun Oct  8 12:49:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun,  8 Oct 2006 05:49:03 -0700
Subject: rpms/perl-GD/devel perl-GD.spec,1.16,1.17
Message-ID: <200610081249.k98Cn5Ma032064@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GD/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32047

Modified Files:
	perl-GD.spec 
Log Message:
Removed a duplicate file (bdf_scripts/bdf2gdfont.PLS).


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-GD.spec	5 Sep 2006 13:22:39 -0000	1.16
+++ perl-GD.spec	8 Oct 2006 12:49:03 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-GD
 Version:        2.35
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -9,7 +9,6 @@
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
 BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel
@@ -27,8 +26,8 @@
 %setup -q -n GD-%{version}
 %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
   qd.pl demos/{*.{pl,cgi},truetype_test}
-chmod -v 644 bdf_scripts/* demos/*
-chmod -v 755 qd.pl
+chmod -c 644 bdf_scripts/* demos/*
+chmod -c 755 qd.pl
 
 
 %build
@@ -48,6 +47,9 @@
 %check
 make test
 
+# Remove duplicate file
+rm bdf_scripts/bdf2gdfont.PLS
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.35-2
+- Removed a duplicate file (bdf_scripts/bdf2gdfont.PLS).
+
 * Tue Sep  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.35-1
 - Update to 2.35.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 12:55:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun,  8 Oct 2006 05:55:08 -0700
Subject: rpms/perl-AppConfig/devel perl-AppConfig.spec,1.10,1.11
Message-ID: <200610081255.k98CtA4Y032161@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-AppConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32144

Modified Files:
	perl-AppConfig.spec 
Log Message:
Excluded the unversioned perl(AppConfig::State) provide.


Index: perl-AppConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig/devel/perl-AppConfig.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-AppConfig.spec	14 Aug 2006 01:07:33 -0000	1.10
+++ perl-AppConfig.spec	8 Oct 2006 12:55:08 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-AppConfig
 Version:        1.63
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for reading configuration files
 
 Group:          Development/Libraries
@@ -27,6 +27,14 @@
 %prep
 %setup -q -n AppConfig-%{version}
 
+# Provides: exclude perl(AppConfig::State)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(AppConfig::State)$'
+__EOF__
+%define __perl_provides %{_builddir}/AppConfig-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -57,6 +65,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.63-2
+- Excluded the unversioned perl(AppConfig::State) provide.
+
 * Thu Aug  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.63-1
 - Update to 1.63.
 - New upstream maintainer.



From fedora-extras-commits at redhat.com  Sun Oct  8 13:19:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  8 Oct 2006 06:19:06 -0700
Subject: rpms/libmcrypt/devel libmcrypt-2.5.7-aclocal_underquoted.patch, NONE,
	1.1 libmcrypt.spec, 1.4, 1.5
Message-ID: <200610081319.k98DJ8O5002729@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmcrypt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2709

Modified Files:
	libmcrypt.spec 
Added Files:
	libmcrypt-2.5.7-aclocal_underquoted.patch 
Log Message:
bz 209913 : libmcrypt.m4 in -devel and properly quote it


libmcrypt-2.5.7-aclocal_underquoted.patch:

--- NEW FILE libmcrypt-2.5.7-aclocal_underquoted.patch ---
--- libmcrypt-2.5.7/lib/libmcrypt.m4	2006-10-08 09:04:36.000000000 -0400
+++ libmcrypt-2.5.7/lib/libmcrypt.m4_ORIG	2006-10-08 08:57:00.000000000 -0400
@@ -14,7 +14,7 @@
 dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBMCRYPT,
+AC_DEFUN([AM_PATH_LIBMCRYPT],
 [dnl
 dnl Get the cflags and libraries from the libmcrypt-config script
 dnl
@@ -164,7 +164,7 @@
         printf("*** of LIBMCRYPT, but you can also set the LIBMCRYPT_CONFIG environment to point to the\n");
         printf("*** correct copy of libmcrypt-config. (In this case, you will have to\n");
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
+        printf("*** so that the correct libraries are found at run-time)\n");
       }
     }
   return 1;


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/devel/libmcrypt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmcrypt.spec	12 Sep 2006 23:11:17 -0000	1.4
+++ libmcrypt.spec	8 Oct 2006 13:19:06 -0000	1.5
@@ -1,12 +1,13 @@
 Name:		libmcrypt
 Version:	2.5.7
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz
 Patch0:		libmcrypt-2.5.7-nolibltdl.patch
+Patch1:		libmcrypt-2.5.7-aclocal_underquoted.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-static=yes
@@ -46,7 +48,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO
 %{_libdir}/*.so.*
-%{_datadir}/aclocal/libmcrypt.m4
 %{_mandir}/man3/*
 
 %files devel
@@ -56,8 +57,12 @@
 %{_includedir}/mcrypt.h
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Sun Oct  8 2006 Ed Hill <ed at eh3.com> 2.5.7-5
+- bz 209913 : libmcrypt.m4 in -devel and properly quote it
+
 * Tue Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.7-4
 - bump for FC-6
 



From fedora-extras-commits at redhat.com  Sun Oct  8 13:34:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 06:34:18 -0700
Subject: rpms/quarry/FC-5 .cvsignore, 1.2, 1.3 quarry.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610081334.k98DYKUH002928@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2857/FC-5

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
Update to 0.1.19


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 03:14:16 -0000	1.2
+++ .cvsignore	8 Oct 2006 13:34:17 -0000	1.3
@@ -1 +1 @@
-quarry-0.1.16.tar.bz2
+quarry-0.1.19.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/quarry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quarry.spec	2 Mar 2006 14:48:08 -0000	1.2
+++ quarry.spec	8 Oct 2006 13:34:17 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           quarry
-Version:        0.1.16
-Release:        2%{?dist}
+Version:        0.1.19
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
-#Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Source0:	quarry-%{version}.tar.bz2
+Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+#Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,12 +64,17 @@
 %doc AUTHORS ChangeLog COPYING COPYING-DOC NEWS README THANKS TODO
 %{_bindir}/quarry
 %{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/quarry.xml
+%{_datadir}/pixmaps/quarry.png
 #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
+- Update to 0.1.19
+
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.1.16-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2005 03:14:16 -0000	1.2
+++ sources	8 Oct 2006 13:34:17 -0000	1.3
@@ -1 +1 @@
-753a6d9aff05069fbd5a2c802cef5e19  quarry-0.1.16.tar.bz2
+15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 13:34:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 06:34:18 -0700
Subject: rpms/quarry/devel .cvsignore, 1.2, 1.3 quarry.spec, 1.2, 1.3 sources,
	1.2, 1.3 needs.rebuild, 1.1, NONE
Message-ID: <200610081334.k98DYK9s002934@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2857/devel

Modified Files:
	.cvsignore quarry.spec sources 
Removed Files:
	needs.rebuild 
Log Message:
Update to 0.1.19


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 03:14:16 -0000	1.2
+++ .cvsignore	8 Oct 2006 13:34:18 -0000	1.3
@@ -1 +1 @@
-quarry-0.1.16.tar.bz2
+quarry-0.1.19.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quarry.spec	2 Mar 2006 14:48:08 -0000	1.2
+++ quarry.spec	8 Oct 2006 13:34:18 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           quarry
-Version:        0.1.16
-Release:        2%{?dist}
+Version:        0.1.19
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
-#Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Source0:	quarry-%{version}.tar.bz2
+Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+#Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,12 +64,17 @@
 %doc AUTHORS ChangeLog COPYING COPYING-DOC NEWS README THANKS TODO
 %{_bindir}/quarry
 %{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/quarry.xml
+%{_datadir}/pixmaps/quarry.png
 #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
+- Update to 0.1.19
+
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.1.16-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2005 03:14:16 -0000	1.2
+++ sources	8 Oct 2006 13:34:18 -0000	1.3
@@ -1 +1 @@
-753a6d9aff05069fbd5a2c802cef5e19  quarry-0.1.16.tar.bz2
+15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 13:34:12 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 06:34:12 -0700
Subject: rpms/quarry/FC-4 .cvsignore, 1.2, 1.3 quarry.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610081334.k98DYiwb002945@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2857/FC-4

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
Update to 0.1.19


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 03:14:16 -0000	1.2
+++ .cvsignore	8 Oct 2006 13:34:12 -0000	1.3
@@ -1 +1 @@
-quarry-0.1.16.tar.bz2
+quarry-0.1.19.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/quarry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quarry.spec	17 Nov 2005 03:14:16 -0000	1.1
+++ quarry.spec	8 Oct 2006 13:34:12 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           quarry
-Version:        0.1.16
+Version:        0.1.19
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
-#Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Source0:	quarry-%{version}.tar.bz2
+Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+#Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,13 +64,21 @@
 %doc AUTHORS ChangeLog COPYING COPYING-DOC NEWS README THANKS TODO
 %{_bindir}/quarry
 %{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/quarry.xml
+%{_datadir}/pixmaps/quarry.png
 #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
-* Sun Nov 13 2005 Michel Salim <mcihel.salim[AT]gmail.com> - 0.1.16-1
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
+- Update to 0.1.19
+
+* Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.1.16-2
+- Rebuild for Fedora Extras 5
+
+* Sun Nov 13 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.1.16-1
 - New upstream version
 
 * Sun Sep  4 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.1.15-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2005 03:14:16 -0000	1.2
+++ sources	8 Oct 2006 13:34:12 -0000	1.3
@@ -1 +1 @@
-753a6d9aff05069fbd5a2c802cef5e19  quarry-0.1.16.tar.bz2
+15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 13:34:11 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 06:34:11 -0700
Subject: rpms/quarry/FC-3 .cvsignore, 1.2, 1.3 quarry.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610081334.k98DYhUU002940@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2857/FC-3

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
Update to 0.1.19


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 03:14:16 -0000	1.2
+++ .cvsignore	8 Oct 2006 13:34:11 -0000	1.3
@@ -1 +1 @@
-quarry-0.1.16.tar.bz2
+quarry-0.1.19.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/quarry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quarry.spec	17 Nov 2005 03:14:16 -0000	1.1
+++ quarry.spec	8 Oct 2006 13:34:11 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           quarry
-Version:        0.1.16
+Version:        0.1.19
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
-#Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Source0:	quarry-%{version}.tar.bz2
+Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+#Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,13 +64,21 @@
 %doc AUTHORS ChangeLog COPYING COPYING-DOC NEWS README THANKS TODO
 %{_bindir}/quarry
 %{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/quarry.xml
+%{_datadir}/pixmaps/quarry.png
 #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
-* Sun Nov 13 2005 Michel Salim <mcihel.salim[AT]gmail.com> - 0.1.16-1
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
+- Update to 0.1.19
+
+* Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.1.16-2
+- Rebuild for Fedora Extras 5
+
+* Sun Nov 13 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.1.16-1
 - New upstream version
 
 * Sun Sep  4 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.1.15-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2005 03:14:16 -0000	1.2
+++ sources	8 Oct 2006 13:34:11 -0000	1.3
@@ -1 +1 @@
-753a6d9aff05069fbd5a2c802cef5e19  quarry-0.1.16.tar.bz2
+15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 13:54:42 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 06:54:42 -0700
Subject: comps comps-cleanup.xsl,1.11,1.12
Message-ID: <200610081354.k98DsiTp003194@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3177

Modified Files:
	comps-cleanup.xsl 
Log Message:
remove useless leftover


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- comps-cleanup.xsl	8 Oct 2006 12:43:46 -0000	1.11
+++ comps-cleanup.xsl	8 Oct 2006 13:54:42 -0000	1.12
@@ -96,7 +96,7 @@
   <xsl:template match="packagelist" priority="1">
     <xsl:copy>
       <xsl:apply-templates select="key('packages-by-group',../id/text())">
-        <xsl:sort select="count(exsl:node-set($type-sort-order)/*[name() = current()/@type]/preceding-sibling::*)+1" data-type="number"/>
+        <xsl:sort select="count(exsl:node-set($type-sort-order)/*[name() = current()/@type]/preceding-sibling::*)" data-type="number"/>
         <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
     </xsl:copy>



From fedora-extras-commits at redhat.com  Sun Oct  8 14:04:24 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  8 Oct 2006 07:04:24 -0700
Subject: rpms/gdeskcal/devel .cvsignore, 1.3, 1.4 gdeskcal.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200610081404.k98E4QL7006172@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6136/devel

Modified Files:
	.cvsignore gdeskcal.spec sources 
Log Message:
auto-import gdeskcal-1.0-2 on branch devel from gdeskcal-1.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:22:43 -0000	1.3
+++ .cvsignore	8 Oct 2006 14:04:24 -0000	1.4
@@ -1 +1 @@
-gDeskCal-0_57_1.tar.gz
+gDeskCal-1.0.tar.gz


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdeskcal.spec	6 Oct 2006 23:49:47 -0000	1.10
+++ gdeskcal.spec	8 Oct 2006 14:04:24 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           gdeskcal
-Version:        0.57.1
-Release:        6%{?dist}
+Version:        1.0
+Release:        2%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.pycage.de/software_gdeskcal.html
-Source0:        http://www.pycage.de/download/gDeskCal-0_57_1.tar.gz
+Source0:        http://www.pycage.de/download/gDeskCal-1.0.tar.gz
 Source1:        gdeskcal.png
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,42 +27,41 @@
 %setup -q -n gDeskCal-%{version}
 
 %build
-
+%configure
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p  ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/
-mkdir -p  ${RPM_BUILD_ROOT}/%{_datadir}
-cp -a code data po skins ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/
-cp -a locale ${RPM_BUILD_ROOT}/%{_datadir}/
-cp -a gdeskcal ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}
-mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}/
-ln -sf %{_libdir}/%{name}-%{version}/gdeskcal ${RPM_BUILD_ROOT}/%{_bindir}/
-install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gdeskcal.png
-%find_lang %{name}
-
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_bindir}
+cp -a code data ical skins %{buildroot}/%{_libdir}/%{name}/
+install -m0755 gdeskcal %{buildroot}/%{_libdir}/%{name}/gdeskcal-bin
+ln -sf %{_libdir}/%{name}/gdeskcal-bin %{buildroot}/%{_bindir}/%{name}
+install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   %{SOURCE2}
 
-
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README README.i18n README.skins
+%doc AUTHORS NEWS README 
 %{_bindir}/gdeskcal
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}
 
 
 %changelog
-* Sat Oct 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-6
-- rebuild
+* Sun Oct 08 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-2
+- Remove using the real makeinstall as it's broken
+
+* Sat Oct 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-1
+- bump to new version
 
 * Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:22:43 -0000	1.3
+++ sources	8 Oct 2006 14:04:24 -0000	1.4
@@ -1 +1 @@
-c2c1de1046e9026558c51e90fe6f8a9e  gDeskCal-0_57_1.tar.gz
+eddbf6387b9937c067e9c437f1abfacf  gDeskCal-1.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 14:04:21 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  8 Oct 2006 07:04:21 -0700
Subject: rpms/gdeskcal import.log,1.6,1.7
Message-ID: <200610081404.k98E4sSQ006175@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6136

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-1.0-2 on branch devel from gdeskcal-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	10 Apr 2006 10:42:39 -0000	1.6
+++ import.log	8 Oct 2006 14:04:20 -0000	1.7
@@ -3,3 +3,4 @@
 gdeskcal-0_57_1-0_fdr_2_2:HEAD:gdeskcal-0.57.1-0.fdr.2.2.src.rpm:1099887779
 gdeskcal-0_57_1-5:HEAD:gdeskcal-0.57.1-5.src.rpm:1144665627
 gdeskcal-0_57_1-5:FC-5:gdeskcal-0.57.1-5.src.rpm:1144665747
+gdeskcal-1_0-2:HEAD:gdeskcal-1.0-2.src.rpm:1160316248



From fedora-extras-commits at redhat.com  Sun Oct  8 14:05:02 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 07:05:02 -0700
Subject: comps comps-cleanup.xsl,1.12,1.13
Message-ID: <200610081405.k98E54Jc006227@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6184

Modified Files:
	comps-cleanup.xsl 
Log Message:
referenced by hurts my eyes


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- comps-cleanup.xsl	8 Oct 2006 13:54:42 -0000	1.12
+++ comps-cleanup.xsl	8 Oct 2006 14:05:02 -0000	1.13
@@ -121,7 +121,7 @@
 <!-- Warn about packages referenced several times (at least twice;)) -->
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
-    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced by <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
+    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
     <xsl:for-each select="$dupes">
       <xsl:sort select="translate(../../id/text(),$lcletters,$ucletters)"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>



From fedora-extras-commits at redhat.com  Sun Oct  8 14:11:35 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 07:11:35 -0700
Subject: rpms/grhino/FC-4 .cvsignore, 1.4, 1.5 grhino.spec, 1.4, 1.5 sources,
	1.4, 1.5 grhino-Makefile-in.patch, 1.1, NONE
Message-ID: <200610081411.k98EBb1e006466@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396/FC-4

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 04:03:42 -0000	1.4
+++ .cvsignore	8 Oct 2006 14:11:35 -0000	1.5
@@ -1 +1 @@
-grhino-0.15.0-patched.tar.bz2
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grhino.spec	17 Nov 2005 04:03:42 -0000	1.4
+++ grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           grhino
-Version:        0.15.0
-Release:        4%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+#Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 
@@ -85,6 +85,12 @@
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
+
+* Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
+- Rebuild for Fedora Extras 5
+
 * Sun Nov 13 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.15.0-4
 - Reverted game name used in GTP protocol
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 04:03:42 -0000	1.4
+++ sources	8 Oct 2006 14:11:35 -0000	1.5
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 14:11:36 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 07:11:36 -0700
Subject: rpms/grhino/FC-5 .cvsignore, 1.4, 1.5 grhino.spec, 1.4, 1.5 sources,
	1.4, 1.5 grhino-Makefile-in.patch, 1.1, NONE
Message-ID: <200610081411.k98EBceg006470@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396/FC-5

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 03:27:43 -0000	1.4
+++ .cvsignore	8 Oct 2006 14:11:35 -0000	1.5
@@ -1 +1 @@
-grhino-0.15.0-patched.tar.bz2
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grhino.spec	2 Mar 2006 15:16:57 -0000	1.4
+++ grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           grhino
-Version:        0.15.0
-Release:        5%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+#Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
+
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 03:27:43 -0000	1.4
+++ sources	8 Oct 2006 14:11:35 -0000	1.5
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 14:11:36 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 07:11:36 -0700
Subject: rpms/grhino/devel .cvsignore, 1.4, 1.5 grhino.spec, 1.4, 1.5 sources,
	1.4, 1.5 grhino-Makefile-in.patch, 1.1, NONE needs.rebuild, 1.1, NONE
Message-ID: <200610081411.k98EBciT006476@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396/devel

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-Makefile-in.patch needs.rebuild 
Log Message:
Update to 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 03:27:43 -0000	1.4
+++ .cvsignore	8 Oct 2006 14:11:36 -0000	1.5
@@ -1 +1 @@
-grhino-0.15.0-patched.tar.bz2
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grhino.spec	2 Mar 2006 15:16:57 -0000	1.4
+++ grhino.spec	8 Oct 2006 14:11:36 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           grhino
-Version:        0.15.0
-Release:        5%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+#Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
+
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 03:27:43 -0000	1.4
+++ sources	8 Oct 2006 14:11:36 -0000	1.5
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 14:11:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 07:11:34 -0700
Subject: rpms/grhino/FC-3 .cvsignore, 1.4, 1.5 grhino.spec, 1.3, 1.4 sources,
	1.4, 1.5 grhino-Makefile-in.patch, 1.1, NONE
Message-ID: <200610081412.k98EC6rG006483@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396/FC-3

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 03:37:15 -0000	1.4
+++ .cvsignore	8 Oct 2006 14:11:34 -0000	1.5
@@ -1 +1 @@
-grhino-0.15.0-patched.tar.bz2
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grhino.spec	17 Nov 2005 03:37:15 -0000	1.3
+++ grhino.spec	8 Oct 2006 14:11:34 -0000	1.4
@@ -1,15 +1,15 @@
 Name:           grhino
-Version:        0.15.0
-Release:        4%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+#Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 
@@ -85,6 +85,12 @@
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
+
+* Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
+- Rebuild for Fedora Extras 5
+
 * Sun Nov 13 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.15.0-4
 - Reverted game name used in GTP protocol
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 03:37:15 -0000	1.4
+++ sources	8 Oct 2006 14:11:34 -0000	1.5
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 14:24:12 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  8 Oct 2006 07:24:12 -0700
Subject: rpms/libmcrypt/FC-4 libmcrypt-2.5.7-aclocal_underquoted.patch, NONE,
	1.1 libmcrypt.spec, 1.3, 1.4
Message-ID: <200610081424.k98EOEdH006633@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmcrypt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598/FC-4

Modified Files:
	libmcrypt.spec 
Added Files:
	libmcrypt-2.5.7-aclocal_underquoted.patch 
Log Message:
bz 209913 : libmcrypt.m4 in -devel and properly quote it


libmcrypt-2.5.7-aclocal_underquoted.patch:

--- NEW FILE libmcrypt-2.5.7-aclocal_underquoted.patch ---
--- libmcrypt-2.5.7/lib/libmcrypt.m4	2006-10-08 09:04:36.000000000 -0400
+++ libmcrypt-2.5.7/lib/libmcrypt.m4_ORIG	2006-10-08 08:57:00.000000000 -0400
@@ -14,7 +14,7 @@
 dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBMCRYPT,
+AC_DEFUN([AM_PATH_LIBMCRYPT],
 [dnl
 dnl Get the cflags and libraries from the libmcrypt-config script
 dnl
@@ -164,7 +164,7 @@
         printf("*** of LIBMCRYPT, but you can also set the LIBMCRYPT_CONFIG environment to point to the\n");
         printf("*** correct copy of libmcrypt-config. (In this case, you will have to\n");
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
+        printf("*** so that the correct libraries are found at run-time)\n");
       }
     }
   return 1;


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/FC-4/libmcrypt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmcrypt.spec	28 Feb 2006 22:43:47 -0000	1.3
+++ libmcrypt.spec	8 Oct 2006 14:24:12 -0000	1.4
@@ -1,12 +1,13 @@
 Name:		libmcrypt
 Version:	2.5.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz
 Patch0:		libmcrypt-2.5.7-nolibltdl.patch
+Patch1:		libmcrypt-2.5.7-aclocal_underquoted.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-static=yes
@@ -46,7 +48,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO
 %{_libdir}/*.so.*
-%{_datadir}/aclocal/libmcrypt.m4
 %{_mandir}/man3/*
 
 %files devel
@@ -56,8 +57,12 @@
 %{_includedir}/mcrypt.h
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Sun Oct  8 2006 Ed Hill <ed at eh3.com> 2.5.7-4
+- bz 209913 : libmcrypt.m4 in -devel and properly quote it
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.7-3
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Sun Oct  8 14:24:13 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  8 Oct 2006 07:24:13 -0700
Subject: rpms/libmcrypt/FC-5 libmcrypt-2.5.7-aclocal_underquoted.patch, NONE,
	1.1 libmcrypt.spec, 1.3, 1.4
Message-ID: <200610081424.k98EOFiZ006639@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmcrypt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598/FC-5

Modified Files:
	libmcrypt.spec 
Added Files:
	libmcrypt-2.5.7-aclocal_underquoted.patch 
Log Message:
bz 209913 : libmcrypt.m4 in -devel and properly quote it


libmcrypt-2.5.7-aclocal_underquoted.patch:

--- NEW FILE libmcrypt-2.5.7-aclocal_underquoted.patch ---
--- libmcrypt-2.5.7/lib/libmcrypt.m4	2006-10-08 09:04:36.000000000 -0400
+++ libmcrypt-2.5.7/lib/libmcrypt.m4_ORIG	2006-10-08 08:57:00.000000000 -0400
@@ -14,7 +14,7 @@
 dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBMCRYPT,
+AC_DEFUN([AM_PATH_LIBMCRYPT],
 [dnl
 dnl Get the cflags and libraries from the libmcrypt-config script
 dnl
@@ -164,7 +164,7 @@
         printf("*** of LIBMCRYPT, but you can also set the LIBMCRYPT_CONFIG environment to point to the\n");
         printf("*** correct copy of libmcrypt-config. (In this case, you will have to\n");
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
+        printf("*** so that the correct libraries are found at run-time)\n");
       }
     }
   return 1;


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/FC-5/libmcrypt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmcrypt.spec	28 Feb 2006 22:43:53 -0000	1.3
+++ libmcrypt.spec	8 Oct 2006 14:24:13 -0000	1.4
@@ -1,12 +1,13 @@
 Name:		libmcrypt
 Version:	2.5.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz
 Patch0:		libmcrypt-2.5.7-nolibltdl.patch
+Patch1:		libmcrypt-2.5.7-aclocal_underquoted.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-static=yes
@@ -46,7 +48,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO
 %{_libdir}/*.so.*
-%{_datadir}/aclocal/libmcrypt.m4
 %{_mandir}/man3/*
 
 %files devel
@@ -56,8 +57,12 @@
 %{_includedir}/mcrypt.h
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Sun Oct  8 2006 Ed Hill <ed at eh3.com> 2.5.7-4
+- bz 209913 : libmcrypt.m4 in -devel and properly quote it
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.7-3
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Sun Oct  8 15:13:09 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun,  8 Oct 2006 08:13:09 -0700
Subject: rpms/dietlibc/devel dietlibc.spec,1.22,1.23
Message-ID: <200610081513.k98FDBDb009854@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837

Modified Files:
	dietlibc.spec 
Log Message:
reenabled PPC


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dietlibc.spec	15 Sep 2006 06:23:01 -0000	1.22
+++ dietlibc.spec	8 Oct 2006 15:13:09 -0000	1.23
@@ -27,7 +27,7 @@
 Summary:	Small libc implementation
 Name:		dietlibc
 Version:	0.30
-Release:	%release_func 2
+Release:	%release_func 3
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -39,14 +39,11 @@
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182118
-ExcludeArch:	ppc
-
-
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
 
+
 %description
 The diet libc is a libc that is optimized for small size. It can be
 used to create small statically linked binaries for Linux on alpha,
@@ -116,6 +113,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-3
+- reenabled PPC
+
 * Fri Sep 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Oct  8 15:35:58 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun,  8 Oct 2006 08:35:58 -0700
Subject: rpms/dietlibc/devel dietlibc.spec,1.23,1.24
Message-ID: <200610081536.k98Fa0oT010039@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10022

Modified Files:
	dietlibc.spec 
Log Message:
reverted last commit; PPC builds are still broken


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dietlibc.spec	8 Oct 2006 15:13:09 -0000	1.23
+++ dietlibc.spec	8 Oct 2006 15:35:58 -0000	1.24
@@ -27,7 +27,7 @@
 Summary:	Small libc implementation
 Name:		dietlibc
 Version:	0.30
-Release:	%release_func 3
+Release:	%release_func 2
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -39,11 +39,14 @@
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182118
+ExcludeArch:	ppc
+
+
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
 
-
 %description
 The diet libc is a libc that is optimized for small size. It can be
 used to create small statically linked binaries for Linux on alpha,
@@ -113,9 +116,6 @@
 
 
 %changelog
-* Sun Oct  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-3
-- reenabled PPC
-
 * Fri Sep 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Oct  8 15:56:43 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 08:56:43 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.6,1.7
Message-ID: <200610081556.k98FukSt010184@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10167

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.18-1.2747.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- em8300-kmod.spec	4 Oct 2006 16:04:16 -0000	1.6
+++ em8300-kmod.spec	8 Oct 2006 15:56:43 -0000	1.7
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2747.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.18-1.2747.fc6.
+
 * Wed Oct  4 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.18-1.2726.fc6.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 16:04:44 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sun,  8 Oct 2006 09:04:44 -0700
Subject: owners owners.list,1.1797,1.1798
Message-ID: <200610081604.k98G4k1Q013341@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322

Modified Files:
	owners.list 
Log Message:
Deorphan mediawiki (take 2) ...


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1797
retrieving revision 1.1798
diff -u -r1.1797 -r1.1798
--- owners.list	8 Oct 2006 10:51:27 -0000	1.1797
+++ owners.list	8 Oct 2006 16:04:43 -0000	1.1798
@@ -1011,7 +1011,7 @@
 Fedora Extras|mbuffer|Measuring Buffer is an enhanced version of buffer|alex at dalloz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
-Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|mercator|Terrain library for WorldForge client/server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 16:04:46 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Oct 2006 09:04:46 -0700
Subject: comps comps-fe6.xml.in,1.179,1.180
Message-ID: <200610081605.k98G5J5p013361@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13324

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add trac package to Development



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- comps-fe6.xml.in	8 Oct 2006 12:28:37 -0000	1.179
+++ comps-fe6.xml.in	8 Oct 2006 16:04:46 -0000	1.180
@@ -192,6 +192,7 @@
       <packagereq type="optional">tkcvs</packagereq>
       <packagereq type="optional">tla</packagereq>
       <packagereq type="optional">tolua++</packagereq>
+      <packagereq type="optional">trac</packagereq>
       <packagereq type="optional">ucblogo</packagereq>
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">xbsql</packagereq>



From fedora-extras-commits at redhat.com  Sun Oct  8 16:27:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 09:27:18 -0700
Subject: rpms/pcsc-tools/devel .cvsignore, 1.7, 1.8 pcsc-tools.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200610081627.k98GRK4o013518@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13497

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.7-1
- 1.4.7, Oct 8 smartcard_list.txt.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Sep 2006 22:13:13 -0000	1.7
+++ .cvsignore	8 Oct 2006 16:27:18 -0000	1.8
@@ -1,2 +1,2 @@
-pcsc-tools-1.4.6.tar.gz
+pcsc-tools-1.4.7.tar.gz
 smartcard_list.txt


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pcsc-tools.spec	1 Sep 2006 22:13:13 -0000	1.8
+++ pcsc-tools.spec	8 Oct 2006 16:27:18 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           pcsc-tools
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.7-1
+- 1.4.7, Oct 8 smartcard_list.txt.
+
 * Sat Sep  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.6-1
 - 1.4.6, Aug 30 smartcard_list.txt.
 - Drop pcsc-lite < 1.2.9 support.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Sep 2006 22:13:13 -0000	1.7
+++ sources	8 Oct 2006 16:27:18 -0000	1.8
@@ -1,2 +1,2 @@
-8210a13a6fbe320620cd4281f5d0531d  pcsc-tools-1.4.6.tar.gz
-1ad2ef2a200b0c7234ca4d4b1a1bd264  smartcard_list.txt
+fb4129779df83a0eb57e8bdf7fec1535  pcsc-tools-1.4.7.tar.gz
+371764708e8690d67f23af02c44320bb  smartcard_list.txt



From fedora-extras-commits at redhat.com  Sun Oct  8 16:29:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 09:29:02 -0700
Subject: rpms/pcsc-tools/FC-5 .cvsignore, 1.6, 1.7 pcsc-tools.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200610081629.k98GT4ZB013595@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13574

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.7-1
- 1.4.7, Oct 8 smartcard_list.txt.

* Sat Sep  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.6-1
- 1.4.6, Aug 30 smartcard_list.txt.
- Drop pcsc-lite < 1.2.9 support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 May 2006 17:48:38 -0000	1.6
+++ .cvsignore	8 Oct 2006 16:29:02 -0000	1.7
@@ -1 +1,2 @@
-pcsc-tools-1.4.5.tar.gz
+pcsc-tools-1.4.7.tar.gz
+smartcard_list.txt


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/pcsc-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pcsc-tools.spec	8 May 2006 17:48:38 -0000	1.7
+++ pcsc-tools.spec	8 Oct 2006 16:29:02 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           pcsc-tools
-Version:        1.4.5
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
@@ -7,11 +7,11 @@
 License:        GPL
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
-#Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
+Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  pcsc-lite-devel
+BuildRequires:  pcsc-lite-devel >= 1.2.9
 Requires:       pcsc-lite
 
 %description
@@ -25,13 +25,8 @@
 %prep
 %setup -q
 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
-if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then
-    sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c
-fi
-# cp %{SOURCE1} .
-for f in Changelog README smartcard_list.txt ; do
-    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
+cp %{SOURCE1} .
+f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
@@ -64,6 +59,13 @@
 
 
 %changelog
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.7-1
+- 1.4.7, Oct 8 smartcard_list.txt.
+
+* Sat Sep  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.6-1
+- 1.4.6, Aug 30 smartcard_list.txt.
+- Drop pcsc-lite < 1.2.9 support.
+
 * Mon May  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.5-1
 - 1.4.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 May 2006 17:48:38 -0000	1.6
+++ sources	8 Oct 2006 16:29:02 -0000	1.7
@@ -1 +1,2 @@
-706a6e3bcac08d62c44fb2cd1d561969  pcsc-tools-1.4.5.tar.gz
+fb4129779df83a0eb57e8bdf7fec1535  pcsc-tools-1.4.7.tar.gz
+371764708e8690d67f23af02c44320bb  smartcard_list.txt



From fedora-extras-commits at redhat.com  Sun Oct  8 16:29:57 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 09:29:57 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.7,1.8
Message-ID: <200610081629.k98GTxIg013665@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13646

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
- Don't use <linux/config.h>.
- Build for kernel 2.6.18-1.2747.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- em8300-kmod.spec	8 Oct 2006 15:56:43 -0000	1.7
+++ em8300-kmod.spec	8 Oct 2006 16:29:57 -0000	1.8
@@ -27,7 +27,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.2.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.3.rc1.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -52,6 +52,7 @@
 cd %{kmod_name}-%{version}-rc1
 %patch0 -p0
 %patch1 -p0
+sed -i -e 's|<linux/config\.h>|<linux/autoconf.h>|' modules/*.[hc]
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
@@ -81,8 +82,9 @@
 
 
 %changelog
-* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi>
-- Rebuild for kernel 2.6.18-1.2747.fc6.
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
+- Don't use <linux/config.h>.
+- Build for kernel 2.6.18-1.2747.fc6.
 
 * Wed Oct  4 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.18-1.2726.fc6.



From fedora-extras-commits at redhat.com  Sun Oct  8 16:34:58 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 09:34:58 -0700
Subject: comps comps-cleanup.xsl,1.13,1.14
Message-ID: <200610081635.k98GZ0vx013760@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13743

Modified Files:
	comps-cleanup.xsl 
Log Message:
be smarter if a package is both referenced in several groups and several times in a single group


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- comps-cleanup.xsl	8 Oct 2006 14:05:02 -0000	1.13
+++ comps-cleanup.xsl	8 Oct 2006 16:34:58 -0000	1.14
@@ -19,8 +19,8 @@
   <xsl:key name="unique-groups" match="/comps/group" use="id/text()"/>
   <xsl:key name="unique-categories" match="/comps/category" use="id/text()"/>
   <xsl:key name="packages-by-group" match="/comps/group/packagelist/packagereq" use="../../id/text()"/>
-  <xsl:key name="unique-packages" match="/comps/group/packagelist/packagereq" use="text()"/>
   <xsl:key name="unique-package-entries" match="/comps/group/packagelist/packagereq" use="concat(../../id/text(),'/',text())"/>
+  <xsl:key name="unique-packages" match="/comps/group/packagelist/packagereq[generate-id(.) = generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" use="text()"/>
   <xsl:key name="groups-by-category" match="/comps/category/grouplist/groupid" use="../../id/text()"/>
   <xsl:key name="unique-group-entries" match="/comps/category/grouplist/groupid" use="concat(../../id/text(),'/',text())"/>
   <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz</xsl:variable>
@@ -118,8 +118,8 @@
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">
     <xsl:message>  ??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
   </xsl:template>
-<!-- Warn about packages referenced several times (at least twice;)) -->
-  <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
+<!-- Warn about packages referenced several times -->
+  <xsl:template match="packagereq[count(key('unique-packages',text())) > 1 and generate-id(.) = generate-id(key('unique-packages',text())[1])]" priority="1">
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
     <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
     <xsl:for-each select="$dupes">



From fedora-extras-commits at redhat.com  Sun Oct  8 16:48:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 09:48:05 -0700
Subject: comps comps-cleanup.xsl,1.14,1.15
Message-ID: <200610081648.k98Gm7nR013816@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13799

Modified Files:
	comps-cleanup.xsl 
Log Message:
simplify a test


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- comps-cleanup.xsl	8 Oct 2006 16:34:58 -0000	1.14
+++ comps-cleanup.xsl	8 Oct 2006 16:48:05 -0000	1.15
@@ -119,7 +119,7 @@
     <xsl:message>  ??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
   </xsl:template>
 <!-- Warn about packages referenced several times -->
-  <xsl:template match="packagereq[count(key('unique-packages',text())) > 1 and generate-id(.) = generate-id(key('unique-packages',text())[1])]" priority="1">
+  <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
     <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
     <xsl:for-each select="$dupes">



From fedora-extras-commits at redhat.com  Sun Oct  8 17:07:50 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  8 Oct 2006 10:07:50 -0700
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 telepathy-butterfly.spec, 1.2, 1.3
Message-ID: <200610081707.k98H7q0s016771@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16750

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
- Update to 0.1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 14:51:26 -0000	1.3
+++ .cvsignore	8 Oct 2006 17:07:49 -0000	1.4
@@ -1 +1 @@
-telepathy-butterfly-0.1.1.tar.gz
+telepathy-butterfly-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 14:51:26 -0000	1.3
+++ sources	8 Oct 2006 17:07:49 -0000	1.4
@@ -1 +1 @@
-05fa11dc4221d456e068e77c3aecb897  telepathy-butterfly-0.1.1.tar.gz
+e52f238d9716b45961d28b424a9c0e6e  telepathy-butterfly-0.1.2.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- telepathy-butterfly.spec	2 Oct 2006 14:51:26 -0000	1.2
+++ telepathy-butterfly.spec	8 Oct 2006 17:07:49 -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:           telepathy-butterfly
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2.
+
 * Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
 - Update to 0.1.1.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 17:25:59 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  8 Oct 2006 10:25:59 -0700
Subject: rpms/telepathy-butterfly/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 telepathy-butterfly.spec, 1.2, 1.3
Message-ID: <200610081726.k98HQ1wY016911@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16890

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
- Update to 0.1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 14:49:58 -0000	1.3
+++ .cvsignore	8 Oct 2006 17:25:59 -0000	1.4
@@ -1 +1 @@
-telepathy-butterfly-0.1.1.tar.gz
+telepathy-butterfly-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 14:49:59 -0000	1.3
+++ sources	8 Oct 2006 17:25:59 -0000	1.4
@@ -1 +1 @@
-05fa11dc4221d456e068e77c3aecb897  telepathy-butterfly-0.1.1.tar.gz
+e52f238d9716b45961d28b424a9c0e6e  telepathy-butterfly-0.1.2.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/telepathy-butterfly.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- telepathy-butterfly.spec	2 Oct 2006 14:49:59 -0000	1.2
+++ telepathy-butterfly.spec	8 Oct 2006 17:25:59 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2.
+
 * Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
 - Update to 0.1.1.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 19:45:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 12:45:24 -0700
Subject: owners owners.list,1.1798,1.1799
Message-ID: <200610081945.k98JjQOs023293@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23276

Modified Files:
	owners.list 
Log Message:
gdeskcal -> pfj


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1798
retrieving revision 1.1799
diff -u -r1.1798 -r1.1799
--- owners.list	8 Oct 2006 16:04:43 -0000	1.1798
+++ owners.list	8 Oct 2006 19:45:23 -0000	1.1799
@@ -464,7 +464,7 @@
 Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gconvert|A desktop unit converter|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|gdeskcal|Eye-candy calendar for your desktop|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|paul at all-the-johnsons.co.uk
+Fedora Extras|gdeskcal|Eye-candy calendar for your desktop|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 20:00:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 13:00:34 -0700
Subject: fedora-security/audit fe5,1.83,1.84
Message-ID: <200610082000.k98K0YKi023367@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23349

Modified Files:
	fe5 
Log Message:
CVE-2006-4247 fixed in plone 2.5-4


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fe5	3 Oct 2006 17:59:44 -0000	1.83
+++ fe5	8 Oct 2006 20:00:31 -0000	1.84
@@ -24,7 +24,7 @@
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
-CVE-2006-4247 VULNERABLE (plone) #209163
+CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688



From fedora-extras-commits at redhat.com  Sun Oct  8 20:19:18 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun,  8 Oct 2006 13:19:18 -0700
Subject: fedora-accounts export-aliases.py,1.7,1.8
Message-ID: <200610082019.k98KJIe4026364@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26339

Modified Files:
	export-aliases.py 
Log Message:
Basic email alias checking provided by Ahmed Kamal



Index: export-aliases.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/export-aliases.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- export-aliases.py	21 Jun 2005 22:28:38 -0000	1.7
+++ export-aliases.py	8 Oct 2006 20:19:15 -0000	1.8
@@ -3,6 +3,7 @@
 import sys, os, errno
 import website
 import getopt
+import re
 
 opts, args = getopt.getopt(sys.argv[1:], '', ('usage', 'help'))
 if len(args) != 3 or ('--usage','') in opts or ('--help','') in opts:



From fedora-extras-commits at redhat.com  Sun Oct  8 20:26:41 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun,  8 Oct 2006 13:26:41 -0700
Subject: fedora-accounts export-aliases.py,1.8,1.9
Message-ID: <200610082026.k98KQfPx026393@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26375

Modified Files:
	export-aliases.py 
Log Message:
Changes made by Ahmed Kamal



Index: export-aliases.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/export-aliases.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- export-aliases.py	8 Oct 2006 20:19:15 -0000	1.8
+++ export-aliases.py	8 Oct 2006 20:26:39 -0000	1.9
@@ -36,8 +36,7 @@
 while 1:
     arow = dbc.fetchone()
     if not arow: break
-    x = arow[1].find('@')
-    if x >= 0 and arow[1][x:] != ('@' + local_domain):
+    if re.compile("^[A-Z0-9._-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$", re.IGNORECASE).match(arow[1]):
 	fh_aliases_new.write('%s: %s\n' % (arow[0], arow[1]))
 	fh_aliases_new.write('%s: %s\n' % (arow[2].replace(' ', '.').lower(), arow[0]))
 



From fedora-extras-commits at redhat.com  Sun Oct  8 20:33:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 13:33:47 -0700
Subject: rpms/opensc/devel opensc.spec,1.18,1.19
Message-ID: <200610082033.k98KXnYx026451@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26434

Modified Files:
	opensc.spec 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-5
- Rebuild with new libassuan.



Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- opensc.spec	2 Oct 2006 18:44:08 -0000	1.18
+++ opensc.spec	8 Oct 2006 20:33:47 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-5
+- Rebuild with new libassuan.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 20:50:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 13:50:20 -0700
Subject: owners owners.list,1.1799,1.1800
Message-ID: <200610082050.k98KoMND026562@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26545

Modified Files:
	owners.list 
Log Message:
quarry, zeroinstall-injector reclaimed by michel.salim at gmail.com


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1799
retrieving revision 1.1800
diff -u -r1.1799 -r1.1800
--- owners.list	8 Oct 2006 19:45:23 -0000	1.1799
+++ owners.list	8 Oct 2006 20:50:20 -0000	1.1800
@@ -1922,7 +1922,7 @@
 Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|quadkonsole|Embeds Konsole kparts in a grid layout|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|quarry|A multi-purpose board-game GUI|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|quarry|A multi-purpose board-game GUI|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|qucs|Circuit simulator|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|quodlibet|A music management program|jeff at ocjtech.us|extras-qa at fedoraproject.org|
@@ -2398,7 +2398,7 @@
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 Fedora Extras|z88dk|Z80 cross compiler|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|zasx|Asteroid like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 21:11:48 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:11:48 -0700
Subject: rpms/glom - New directory
Message-ID: <200610082111.k98LBoli029603@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29575/glom

Log Message:
Directory /cvs/extras/rpms/glom added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  8 21:11:49 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:11:49 -0700
Subject: rpms/glom/devel - New directory
Message-ID: <200610082111.k98LBpsh029606@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29575/glom/devel

Log Message:
Directory /cvs/extras/rpms/glom/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  8 21:16:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:16:50 -0700
Subject: rpms/glom import.log,1.1,1.2
Message-ID: <200610082116.k98LGqnJ029730@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29696

Modified Files:
	import.log 
Log Message:
auto-import glom-1.0.5-4 on branch devel from glom-1.0.5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glom/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Oct 2006 21:12:07 -0000	1.1
+++ import.log	8 Oct 2006 21:16:50 -0000	1.2
@@ -0,0 +1 @@
+glom-1_0_5-4:HEAD:glom-1.0.5-4.src.rpm:1160342110



From fedora-extras-commits at redhat.com  Sun Oct  8 21:16:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:16:50 -0700
Subject: rpms/glom/devel glom-1.0.5-poconfig.patch, NONE, 1.1 glom.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610082116.k98LGqsp029737@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29696/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glom-1.0.5-poconfig.patch glom.spec 
Log Message:
auto-import glom-1.0.5-4 on branch devel from glom-1.0.5-4.src.rpm

glom-1.0.5-poconfig.patch:

--- NEW FILE glom-1.0.5-poconfig.patch ---
--- glom-1.0.5/configure.in.orig	2006-10-04 19:32:11.000000000 -0700
+++ glom-1.0.5/configure.in	2006-10-04 19:32:24.000000000 -0700
@@ -21,6 +21,7 @@
 		   [The domain name to use with gettext.])
 
 ALL_LINGUAS="ca cs de en_CA en_GB es fi fr gu hu it nb ne nl pa pt pt_BR rw sq sv tr vi zh_CN"
+AC_SUBST(ALL_LINGUAS)
 
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])


--- NEW FILE glom.spec ---
%define major_version  1.0
%define minor_version  5

Name:           glom
Version:        %{major_version}.%{minor_version}
Release:        4%{?dist}
Summary:        Easy-to-use database designer and user interface

Group:          Applications/Databases
License:        GPL
URL:            http://www.glom.org/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2
Patch0:         glom-1.0.5-poconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  bakery-devel >= 2.4
BuildRequires:  desktop-file-utils gettext intltool
BuildRequires:  libgdamm-devel >= 1.3.7
BuildRequires:  python-devel
BuildRequires:  gnome-python2-gda-devel
BuildRequires:  libgnomecanvasmm26-devel >= 2.10
BuildRequires:  libgnome-devel >= 2.6.0
BuildRequires:  libxslt-devel >= 1.1.10
BuildRequires:  pygtk2-devel >= 2.6
BuildRequires:  iso-codes-devel
BuildRequires:  gnome-doc-utils
BuildRequires:  scrollkeeper
%ifarch x86_64
BuildRequires:  automake libtool
%endif

Requires:       compat-gda-postgres

Requires(post):   shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires(post):   scrollkeeper
Requires(postun): scrollkeeper


%description
Glom lets you design database systems - the database and the user
interface. Glom has high-level features such as relationships,
lookups, related fields, related records, calculated fields, drop-down
choices, searching, reports, users and groups. It has Numeric, Text,
Date, Time, Boolean, and Image field types. Glom systems require
almost no programming, but you may use Python for calculated fields or
buttons. Glom uses the PostgreSQL database backend.


%prep
%setup -q
%patch0 -p1 -b .poconfig


%build
%ifarch x86_64
autoreconf -f -i
%endif
%configure \
        --disable-dependency-tracking \
        --disable-static \
        --disable-update-mime-database \
        --disable-scrollkeeper \
        --disable-rpath
make %{?_smp_mflags}


%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}%{_libdir}/libglom.so

cat << EOF >> ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
MimeType=application/x-glom;
EOF

desktop-file-install --vendor fedora --delete-original     \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
  --add-category X-Fedora                                  \
  ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop


%clean
rm -rf ${RPM_BUILD_ROOT}


%post
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
/sbin/ldconfig


%postun
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
scrollkeeper-update -q || :
/sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_libdir}/lib%{name}.so.*
%{_libdir}/python2.4/site-packages/%{name}.so
%{_datadir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/gnome/help/%{name}
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/mime-info/*


%changelog
* Fri Oct  6 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-4
- fixed x86_64 spec, vfsmm patch no longer needed

* Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-3
- Added scrollkeeper db updates
- Added mime-type key to desktop file
- Added autoreconf and patch to fix rpath problem

* Wed Oct  4 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-2
- Fixed BRs
- Enabled scrollkeeper

* Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-1
- Update to 1.0.5

* Thu Aug  3 2006 Denis Leroy <denis at poolshark.org> - 1.0.4-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Oct 2006 21:12:08 -0000	1.1
+++ .cvsignore	8 Oct 2006 21:16:50 -0000	1.2
@@ -0,0 +1 @@
+glom-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Oct 2006 21:12:08 -0000	1.1
+++ sources	8 Oct 2006 21:16:50 -0000	1.2
@@ -0,0 +1 @@
+55e5b35d268e342ed5305e9c798856a4  glom-1.0.5.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 21:31:17 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 14:31:17 -0700
Subject: rpms/sysprof/devel sysprof.spec,1.2,1.3
Message-ID: <200610082131.k98LVJNL029935@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29896/devel

Modified Files:
	sysprof.spec 
Log Message:
ExclusiveArch: i386 -> %{ix86}



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sysprof.spec	7 Oct 2006 15:37:27 -0000	1.2
+++ sysprof.spec	8 Oct 2006 21:31:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           sysprof      
 Version:        1.0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -19,7 +19,7 @@
 BuildRequires:  binutils-devel
 BuildRequires:  desktop-file-utils
 
-ExclusiveArch:  i386 x86_64
+ExclusiveArch:  %{ix86} x86_64
 
 %description
 Sysprof is a sampling CPU profiler for Linux that uses a kernel module
@@ -61,6 +61,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-6
+- better to use ExclusiveArch %{ix86} (thanks Ville)
+
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
 - add ExclusiveArch to match sysprof-kmod supported archs
 



From fedora-extras-commits at redhat.com  Sun Oct  8 21:31:18 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 14:31:18 -0700
Subject: rpms/sysprof/FC-5 sysprof.spec,1.3,1.4
Message-ID: <200610082131.k98LVKXE029939@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29896/FC-5

Modified Files:
	sysprof.spec 
Log Message:
ExclusiveArch: i386 -> %{ix86}



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sysprof.spec	7 Oct 2006 15:37:26 -0000	1.3
+++ sysprof.spec	8 Oct 2006 21:31:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sysprof      
 Version:        1.0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -18,7 +18,7 @@
 BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils
 
-ExclusiveArch:  i386 x86_64
+ExclusiveArch:  %{ix86} x86_64
 
 %description
 Sysprof is a sampling CPU profiler for Linux that uses a kernel module
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-6
+- better to use ExclusiveArch %{ix86} (thanks Ville)
+
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
 - add ExclusiveArch to match sysprof-kmod supported archs
 



From fedora-extras-commits at redhat.com  Sun Oct  8 21:34:48 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:34:48 -0700
Subject: owners owners.list,1.1800,1.1801
Message-ID: <200610082134.k98LYo46030065@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30042

Modified Files:
	owners.list 
Log Message:
Added glom


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1800
retrieving revision 1.1801
diff -u -r1.1800 -r1.1801
--- owners.list	8 Oct 2006 20:50:20 -0000	1.1800
+++ owners.list	8 Oct 2006 21:34:47 -0000	1.1801
@@ -518,6 +518,7 @@
 Fedora Extras|glipper|Glipper is a simple Clipboardmanager for the GNOME Desktop Environment|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|glitz|OpenGL image compositing library|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|glom|Database Designer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|glyph-keeper|Library for text rendering|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 21:35:19 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 14:35:19 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.5,1.6
Message-ID: <200610082135.k98LZLEa030093@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30075

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild fo newer kernel



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sysprof-kmod.spec	4 Oct 2006 22:21:40 -0000	1.5
+++ sysprof-kmod.spec	8 Oct 2006 21:35:19 -0000	1.6
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2747.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.3
-Release:        3.%(echo %{kverrel} | tr - _)
+Release:        4.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
+- rebuild for kernel 2.6.18-1.2747
+
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Sun Oct  8 21:39:48 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:39:48 -0700
Subject: rpms/glom/devel .cvsignore, 1.2, 1.3 glom.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610082139.k98Ldo2K030228@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30207

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2006 21:16:50 -0000	1.2
+++ .cvsignore	8 Oct 2006 21:39:47 -0000	1.3
@@ -1 +1 @@
-glom-1.0.5.tar.bz2
+glom-1.0.7.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glom.spec	8 Oct 2006 21:16:50 -0000	1.1
+++ glom.spec	8 Oct 2006 21:39:47 -0000	1.2
@@ -1,9 +1,9 @@
 %define major_version  1.0
-%define minor_version  5
+%define minor_version  7
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Denis Leroy <denis at poolshark.org> - 1.0.7-1
+- Update to 1.0.7
+
 * Fri Oct  6 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-4
 - fixed x86_64 spec, vfsmm patch no longer needed
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2006 21:16:50 -0000	1.2
+++ sources	8 Oct 2006 21:39:47 -0000	1.3
@@ -1 +1 @@
-55e5b35d268e342ed5305e9c798856a4  glom-1.0.5.tar.bz2
+64a8e0a8214c7a3267b7d97caec65817  glom-1.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 21:39:57 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:39:57 -0700
Subject: rpms/gnome-phone-manager/devel .cvsignore, 1.2,
	1.3 gnome-phone-manager.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610082139.k98Ldx3d030251@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30203

Modified Files:
	.cvsignore gnome-phone-manager.spec sources 
Log Message:
Bump to 0.8 from upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2006 22:20:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 21:39:57 -0000	1.3
@@ -1 +1 @@
-gnome-phone-manager-0.7.tar.bz2
+gnome-phone-manager-0.8.tar.bz2


Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-phone-manager.spec	6 Sep 2006 05:51:08 -0000	1.2
+++ gnome-phone-manager.spec	8 Oct 2006 21:39:57 -0000	1.3
@@ -1,11 +1,10 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
-Version: 	0.7
-Release: 	5%{?dist}
+Version: 	0.8
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
-Patch0:		gnome-phone-manager-econtact.patch
 URL: 		http://usefulinc.com/software/phonemgr/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel
@@ -26,6 +25,9 @@
 BuildRequires:	desktop-file-utils
 # Included with source
 # BuildRequires:	gsmlib-devel
+# In 0.8 some ancient autotoolset was used in packaging :(
+BuildRequires:	autoconf
+BuildRequires:	automake
 
 
 %description
@@ -38,19 +40,25 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
+%{__rm} -f aclocal.m4
+aclocal
+automake --add-missing
+%{__rm} -f configure
+%{__rm} -rf autom4te*.cache/
+autoconf
 %configure
-# OK ugly hack but will go when we have g-p-m 0.8 or so...
-make %{?_smp_mflags} CPPFLAGS=-DHAVE_ECONTACTPHOTOTYPE
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang %{name}
-cp $RPM_BUILD_ROOT%{_datadir}/pixmaps/cellphone.png \
-  $RPM_BUILD_ROOT%{_datadir}/gnome-phone-manager/
+# This is fixing some bug..
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mv $RPM_BUILD_ROOT%{_datadir}/cellphone.png \
+   $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install \
   --delete-original \
   --vendor fedora \
@@ -71,6 +79,11 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1
+- New upstream version including patch.
+- The icon is an an even weirder place now!
+- Have to run som autotools on this one to get it working.
+
 * Tue Sep 5 2006 Linus Walleij <triad at df.lth.se> 0.7-5
 - Patch to compile with new version of E-D-S.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2006 22:20:03 -0000	1.2
+++ sources	8 Oct 2006 21:39:57 -0000	1.3
@@ -1 +1 @@
-951471bf5d6fe93fe550c60b6bdf58f9  gnome-phone-manager-0.7.tar.bz2
+1a645a23d8851e554b3809b71e2162f0  gnome-phone-manager-0.8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 21:41:29 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:41:29 -0700
Subject: rpms/gnome-phone-manager/FC-5 .cvsignore, 1.2,
	1.3 gnome-phone-manager.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610082141.k98LfVlU030369@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30348

Modified Files:
	.cvsignore gnome-phone-manager.spec sources 
Log Message:
Bump to new upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2006 22:20:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 21:41:29 -0000	1.3
@@ -1 +1 @@
-gnome-phone-manager-0.7.tar.bz2
+gnome-phone-manager-0.8.tar.bz2


Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/gnome-phone-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-phone-manager.spec	11 Aug 2006 22:20:03 -0000	1.1
+++ gnome-phone-manager.spec	8 Oct 2006 21:41:29 -0000	1.2
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
-Version: 	0.7
-Release: 	4%{?dist}
+Version: 	0.8
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -25,6 +25,9 @@
 BuildRequires:	desktop-file-utils
 # Included with source
 # BuildRequires:	gsmlib-devel
+# In 0.8 some ancient autotoolset was used in packaging :(
+BuildRequires:	autoconf
+BuildRequires:	automake
 
 
 %description
@@ -39,6 +42,12 @@
 %setup -q
 
 %build
+%{__rm} -f aclocal.m4
+aclocal
+automake --add-missing
+%{__rm} -f configure
+%{__rm} -rf autom4te*.cache/
+autoconf
 %configure
 make %{?_smp_mflags}
 
@@ -46,8 +55,10 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang %{name}
-cp $RPM_BUILD_ROOT%{_datadir}/pixmaps/cellphone.png \
-  $RPM_BUILD_ROOT%{_datadir}/gnome-phone-manager/
+# This is fixing some bug..
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mv $RPM_BUILD_ROOT%{_datadir}/cellphone.png \
+   $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install \
   --delete-original \
   --vendor fedora \
@@ -68,6 +79,14 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1
+- New upstream version including patch.
+- The icon is an an even weirder place now!
+- Have to run som autotools on this one to get it working.
+
+* Tue Sep 5 2006 Linus Walleij <triad at df.lth.se> 0.7-5
+- Patch to compile with new version of E-D-S.
+
 * Thu Aug 10 2006 Linus Walleij <triad at df.lth.se> 0.7-4
 - Missing BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2006 22:20:03 -0000	1.2
+++ sources	8 Oct 2006 21:41:29 -0000	1.3
@@ -1 +1 @@
-951471bf5d6fe93fe550c60b6bdf58f9  gnome-phone-manager-0.7.tar.bz2
+1a645a23d8851e554b3809b71e2162f0  gnome-phone-manager-0.8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 21:48:37 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:48:37 -0700
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.3,1.4
Message-ID: <200610082148.k98Lmd19030440@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30423

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Libtool slip.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-phone-manager.spec	8 Oct 2006 21:39:57 -0000	1.3
+++ gnome-phone-manager.spec	8 Oct 2006 21:48:37 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 # In 0.8 some ancient autotoolset was used in packaging :(
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libtool
 
 
 %description
@@ -79,6 +80,9 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+- Pick up libtool.
+
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1
 - New upstream version including patch.
 - The icon is an an even weirder place now!



From fedora-extras-commits at redhat.com  Sun Oct  8 21:49:34 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:49:34 -0700
Subject: rpms/gnome-phone-manager/FC-5 gnome-phone-manager.spec,1.2,1.3
Message-ID: <200610082149.k98LnaaL030501@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Libtool slip.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/gnome-phone-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-phone-manager.spec	8 Oct 2006 21:41:29 -0000	1.2
+++ gnome-phone-manager.spec	8 Oct 2006 21:49:34 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 # In 0.8 some ancient autotoolset was used in packaging :(
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libtool
 
 
 %description
@@ -79,6 +80,9 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+- Pick up libtool.
+
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1
 - New upstream version including patch.
 - The icon is an an even weirder place now!



From fedora-extras-commits at redhat.com  Sun Oct  8 21:57:42 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:57:42 -0700
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.4,1.5
Message-ID: <200610082157.k98Lviq2030576@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30559

Modified Files:
	gnome-phone-manager.spec 
Log Message:
intltool missed.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-phone-manager.spec	8 Oct 2006 21:48:37 -0000	1.4
+++ gnome-phone-manager.spec	8 Oct 2006 21:57:41 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
+BuildRequires:	intltool
 
 
 %description
@@ -81,6 +82,9 @@
 
 %changelog
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+- Pick up intltool.
+
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
 - Pick up libtool.
 
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1



From fedora-extras-commits at redhat.com  Sun Oct  8 21:58:32 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:58:32 -0700
Subject: rpms/gnome-phone-manager/FC-5 gnome-phone-manager.spec,1.3,1.4
Message-ID: <200610082158.k98LwY9H030637@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30620

Modified Files:
	gnome-phone-manager.spec 
Log Message:
intltool missed.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/gnome-phone-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-phone-manager.spec	8 Oct 2006 21:49:34 -0000	1.3
+++ gnome-phone-manager.spec	8 Oct 2006 21:58:32 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
+BuildRequires:	intltool
 
 
 %description
@@ -81,6 +82,9 @@
 
 %changelog
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+- Pick up intltool.
+
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
 - Pick up libtool.
 
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1



From fedora-extras-commits at redhat.com  Sun Oct  8 22:08:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 15:08:26 -0700
Subject: rpms/sysprof-kmod/devel sysprof-config.patch, NONE,
	1.1 sysprof-kmod.spec, 1.6, 1.7
Message-ID: <200610082208.k98M8SIU001316@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1274

Modified Files:
	sysprof-kmod.spec 
Added Files:
	sysprof-config.patch 
Log Message:
patch out linux/config.h


sysprof-config.patch:

--- NEW FILE sysprof-config.patch ---
Index: sysprof-1.0.3/module/sysprof-module.c
===================================================================
--- sysprof-1.0.3/module/sysprof-module.c
+++ sysprof-1.0.3/module/sysprof-module.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <linux/config.h>
 #if !CONFIG_PROFILING
 # error Sysprof needs a kernel with profiling support compiled in.
 #endif


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sysprof-kmod.spec	8 Oct 2006 21:35:19 -0000	1.6
+++ sysprof-kmod.spec	8 Oct 2006 22:08:25 -0000	1.7
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.3
-Release:        4.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -40,6 +40,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         %{kmod_name}-avoid_depmod.patch
+Patch1:         %{kmod_name}-config.patch
 
 ExclusiveArch:  i586 i686 x86_64
 
@@ -63,6 +64,7 @@
 %setup -q -c -T -a 0
 pushd %{kmod_name}-%{version}*
 %patch0 -p1 -b .patch0
+%patch0 -p1 -b .patch1
 # configure script breaks in mock builds (missing BRs), so we create here 
 # a config.h with the needed symbol
 echo '#define PACKAGE_VERSION "%{version}"' > config.h
@@ -103,8 +105,9 @@
 
 
 %changelog
-* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
+* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
 - rebuild for kernel 2.6.18-1.2747
+- add patch for linux/config.h include
 
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
 - rebuild



From fedora-extras-commits at redhat.com  Sun Oct  8 22:24:10 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 15:24:10 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.7,1.8
Message-ID: <200610082224.k98MOCVo001553@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1535

Modified Files:
	sysprof-kmod.spec 
Log Message:
cut&paste is bad...



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sysprof-kmod.spec	8 Oct 2006 22:08:25 -0000	1.7
+++ sysprof-kmod.spec	8 Oct 2006 22:24:10 -0000	1.8
@@ -64,7 +64,7 @@
 %setup -q -c -T -a 0
 pushd %{kmod_name}-%{version}*
 %patch0 -p1 -b .patch0
-%patch0 -p1 -b .patch1
+%patch1 -p1 -b .patch1
 # configure script breaks in mock builds (missing BRs), so we create here 
 # a config.h with the needed symbol
 echo '#define PACKAGE_VERSION "%{version}"' > config.h



From fedora-extras-commits at redhat.com  Mon Oct  9 01:13:47 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun,  8 Oct 2006 18:13:47 -0700
Subject: rpms/gcin/devel .cvsignore, 1.6, 1.7 gcin.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <200610090113.k991DnOY010954@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10933

Modified Files:
	.cvsignore gcin.spec sources 
Log Message:
update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Sep 2006 14:36:38 -0000	1.6
+++ .cvsignore	9 Oct 2006 01:13:47 -0000	1.7
@@ -1 +1 @@
-gcin-1.2.6.tar.bz2
+gcin-1.2.7.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcin.spec	4 Oct 2006 22:15:42 -0000	1.9
+++ gcin.spec	9 Oct 2006 01:13:47 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gcin
-Version:        1.2.6
-Release:        2%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
+ - update to 1.2.7
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2.6-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Sep 2006 14:36:38 -0000	1.6
+++ sources	9 Oct 2006 01:13:47 -0000	1.7
@@ -1 +1 @@
-c3ac7d5114c27ea20e60263890f05b13  gcin-1.2.6.tar.bz2
+ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 01:15:50 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun,  8 Oct 2006 18:15:50 -0700
Subject: rpms/gcin/FC-5 .cvsignore, 1.6, 1.7 gcin.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <200610090115.k991Fqvc011026@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005

Modified Files:
	.cvsignore gcin.spec sources 
Log Message:
update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Sep 2006 14:40:37 -0000	1.6
+++ .cvsignore	9 Oct 2006 01:15:50 -0000	1.7
@@ -1 +1 @@
-gcin-1.2.6.tar.bz2
+gcin-1.2.7.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcin.spec	26 Sep 2006 14:40:37 -0000	1.9
+++ gcin.spec	9 Oct 2006 01:15:50 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.6
+Version:        1.2.7
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
+- update to 1.2.7
+
 * Tue Sep 26 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.6-1
 - update to 1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Sep 2006 14:40:37 -0000	1.6
+++ sources	9 Oct 2006 01:15:50 -0000	1.7
@@ -1 +1 @@
-c3ac7d5114c27ea20e60263890f05b13  gcin-1.2.6.tar.bz2
+ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 01:17:28 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun,  8 Oct 2006 18:17:28 -0700
Subject: rpms/gcin/FC-4 .cvsignore, 1.6, 1.7 gcin.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200610090117.k991HV9a011094@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11073

Modified Files:
	.cvsignore gcin.spec sources 
Log Message:
update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Sep 2006 14:43:00 -0000	1.6
+++ .cvsignore	9 Oct 2006 01:17:28 -0000	1.7
@@ -1 +1 @@
-gcin-1.2.6.tar.bz2
+gcin-1.2.7.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	26 Sep 2006 14:43:00 -0000	1.10
+++ gcin.spec	9 Oct 2006 01:17:28 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.6
+Version:        1.2.7
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
+- update to 1.2.7
+
 * Tue Sep 26 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.6-1
 - update to 1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Sep 2006 14:43:00 -0000	1.6
+++ sources	9 Oct 2006 01:17:28 -0000	1.7
@@ -1 +1 @@
-c3ac7d5114c27ea20e60263890f05b13  gcin-1.2.6.tar.bz2
+ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 01:18:27 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun,  8 Oct 2006 18:18:27 -0700
Subject: rpms/gcin/FC-3 .cvsignore, 1.6, 1.7 gcin.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <200610090118.k991IT0e011164@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11143

Modified Files:
	.cvsignore gcin.spec sources 
Log Message:
update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Sep 2006 14:45:09 -0000	1.6
+++ .cvsignore	9 Oct 2006 01:18:27 -0000	1.7
@@ -1 +1 @@
-gcin-1.2.6.tar.bz2
+gcin-1.2.7.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcin.spec	26 Sep 2006 14:45:09 -0000	1.9
+++ gcin.spec	9 Oct 2006 01:18:27 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.6
+Version:        1.2.7
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
+- update to 1.2.7
+
 * Tue Sep 26 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.6-1
 - update to 1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Sep 2006 14:45:09 -0000	1.6
+++ sources	9 Oct 2006 01:18:27 -0000	1.7
@@ -1 +1 @@
-c3ac7d5114c27ea20e60263890f05b13  gcin-1.2.6.tar.bz2
+ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 04:22:09 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun,  8 Oct 2006 21:22:09 -0700
Subject: rpms/bzr/devel .cvsignore, 1.6, 1.7 bzr.spec, 1.9, 1.10 sources, 1.6,
	1.7
Message-ID: <200610090422.k994MBvf020503@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20482

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
- Update to 0.11
- New download location.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Sep 2006 16:13:07 -0000	1.6
+++ .cvsignore	9 Oct 2006 04:22:09 -0000	1.7
@@ -1 +1 @@
-bzr-0.10.tar.gz
+bzr-0.11.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzr.spec	17 Sep 2006 16:13:07 -0000	1.9
+++ bzr.spec	9 Oct 2006 04:22:09 -0000	1.10
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr
-Version:        0.10
+Version:        0.11
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.bazaar-ng.org/
-Source0:        http://www.bazaar-ng.org/pkg/%{name}-%{version}.tar.gz
+URL:            http://www.bazaar-vcs.org/
+Source0:        http://bazaar-vcs.org/releases/src/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -150,10 +150,18 @@
 %{python_sitelib}/bzrlib/util/effbot/org/*.pyc
 %{python_sitelib}/bzrlib/util/effbot/org/*.pyo
 
+%dir %{python_sitelib}/bzrlib/version_info_formats/
+%{python_sitelib}/bzrlib/version_info_formats/*.py
+%{python_sitelib}/bzrlib/version_info_formats/*.py?
+
 %dir %{python_sitelib}/bzrlib/tests
 %{python_sitelib}/bzrlib/tests/*
 
 %changelog
+* Thu Oct 08 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.11-1
+- Update to 0.11
+- New download location.
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10-1
 - 0.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Sep 2006 16:13:07 -0000	1.6
+++ sources	9 Oct 2006 04:22:09 -0000	1.7
@@ -1 +1 @@
-8a21693efe9b06bed04fa4e8a74b7e83  bzr-0.10.tar.gz
+94fced266d6da6ed298e4738ca7414e0  bzr-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 04:34:22 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun,  8 Oct 2006 21:34:22 -0700
Subject: rpms/bzr/FC-5 .cvsignore,1.6,1.7 bzr.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <200610090434.k994YOuW020627@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzr/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20606

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
- Update to 0.11
- New download location.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Sep 2006 02:35:12 -0000	1.6
+++ .cvsignore	9 Oct 2006 04:34:22 -0000	1.7
@@ -1 +1 @@
-bzr-0.10.tar.gz
+bzr-0.11.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/bzr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzr.spec	20 Sep 2006 02:35:12 -0000	1.9
+++ bzr.spec	9 Oct 2006 04:34:22 -0000	1.10
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr
-Version:        0.10
+Version:        0.11
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.bazaar-ng.org/
-Source0:        http://www.bazaar-ng.org/pkg/%{name}-%{version}.tar.gz
+URL:            http://www.bazaar-vcs.org/
+Source0:        http://bazaar-vcs.org/releases/src/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -150,10 +150,18 @@
 %{python_sitelib}/bzrlib/util/effbot/org/*.pyc
 %{python_sitelib}/bzrlib/util/effbot/org/*.pyo
 
+%dir %{python_sitelib}/bzrlib/version_info_formats/
+%{python_sitelib}/bzrlib/version_info_formats/*.py
+%{python_sitelib}/bzrlib/version_info_formats/*.py?
+
 %dir %{python_sitelib}/bzrlib/tests
 %{python_sitelib}/bzrlib/tests/*
 
 %changelog
+* Thu Oct 08 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.11-1
+- Update to 0.11
+- New download location.
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10-1
 - 0.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Sep 2006 02:35:12 -0000	1.6
+++ sources	9 Oct 2006 04:34:22 -0000	1.7
@@ -1 +1 @@
-8a21693efe9b06bed04fa4e8a74b7e83  bzr-0.10.tar.gz
+94fced266d6da6ed298e4738ca7414e0  bzr-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 04:36:30 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun,  8 Oct 2006 21:36:30 -0700
Subject: rpms/bzrtools/devel .cvsignore, 1.5, 1.6 bzrtools.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200610090436.k994aWl2020706@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20685

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
- Update to 0.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Sep 2006 16:20:20 -0000	1.5
+++ .cvsignore	9 Oct 2006 04:36:29 -0000	1.6
@@ -1 +1 @@
-bzrtools-0.10.0.tar.gz
+bzrtools-0.11.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzrtools.spec	17 Sep 2006 16:22:34 -0000	1.9
+++ bzrtools.spec	9 Oct 2006 04:36:29 -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:           bzrtools
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.11.0
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -14,7 +14,7 @@
 BuildArch:      noarch
 BuildRequires:  python
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:   bzr >= 0.10
+Requires:   bzr >= 0.11
 
 %description
 BzrTools is a collection of plugins for Bazaar-NG (bzr).  Among the included
@@ -57,6 +57,9 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.11.0-1
+- Update to 0.11.0
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10.0-2
 - 0.10.0
 
@@ -82,7 +85,7 @@
 - Fix rpmlint non-executable-script errors
 
 * Fri May 12 2006 Shahms E. King <shahms at shahms.com> 0.8.1-1
-- Add COPYING to %doc
+- Add COPYING to %%doc
 - Update to new upstream version
 - Require bzr 0.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Sep 2006 16:20:20 -0000	1.5
+++ sources	9 Oct 2006 04:36:29 -0000	1.6
@@ -1 +1 @@
-2d0aaadded251dc17678034e77f122d6  bzrtools-0.10.0.tar.gz
+8d34615bafbd40518e75509e7d3a8c04  bzrtools-0.11.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 04:38:17 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun,  8 Oct 2006 21:38:17 -0700
Subject: rpms/bzrtools/FC-5 .cvsignore, 1.5, 1.6 bzrtools.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200610090438.k994cJO7020777@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20756

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
- Update to 0.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2006 04:27:08 -0000	1.5
+++ .cvsignore	9 Oct 2006 04:38:16 -0000	1.6
@@ -1 +1 @@
-bzrtools-0.10.0.tar.gz
+bzrtools-0.11.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/bzrtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bzrtools.spec	20 Sep 2006 04:27:08 -0000	1.7
+++ bzrtools.spec	9 Oct 2006 04:38:16 -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:           bzrtools
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.11.0
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -14,7 +14,7 @@
 BuildArch:      noarch
 BuildRequires:  python
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:   bzr >= 0.10
+Requires:   bzr >= 0.11
 
 %description
 BzrTools is a collection of plugins for Bazaar-NG (bzr).  Among the included
@@ -57,6 +57,9 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.11.0-1
+- Update to 0.11.0
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10.0-2
 - 0.10.0
 
@@ -82,7 +85,7 @@
 - Fix rpmlint non-executable-script errors
 
 * Fri May 12 2006 Shahms E. King <shahms at shahms.com> 0.8.1-1
-- Add COPYING to %doc
+- Add COPYING to %%doc
 - Update to new upstream version
 - Require bzr 0.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2006 04:27:08 -0000	1.5
+++ sources	9 Oct 2006 04:38:16 -0000	1.6
@@ -1 +1 @@
-2d0aaadded251dc17678034e77f122d6  bzrtools-0.10.0.tar.gz
+8d34615bafbd40518e75509e7d3a8c04  bzrtools-0.11.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 07:06:21 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon,  9 Oct 2006 00:06:21 -0700
Subject: rpms/yumex/devel yumex.spec,1.36,1.37
Message-ID: <200610090706.k9976NN0030078@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061

Modified Files:
	yumex.spec 
Log Message:
Release 1.1.4-2.0


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- yumex.spec	8 Oct 2006 07:24:22 -0000	1.36
+++ yumex.spec	9 Oct 2006 07:06:21 -0000	1.37
@@ -1,6 +1,6 @@
 Name:     yumex
 Version:  1.1.4
-Release:  1.0%{?dist}
+Release:  2.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -16,7 +16,7 @@
 BuildRequires: intltool
 
 
-Requires: yum >= 3.0.0
+Requires: yum >= 3.0
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -67,7 +67,10 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Wed Oct 7 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-1.0
+* Mon Oct 9 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-2.0
+- Development Release 1.1.4-2.0
+- Updated Requires: yum >= 3.0.0 to yum >= 3.0
+* Sat Oct 7 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-1.0
 - Development Release 1.1.4-1.0
 - Updated Requires: yum >= 2.9.6 to yum >= 3.0.0
 * Wed Sep 6 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.3-1.0



From fedora-extras-commits at redhat.com  Mon Oct  9 07:35:58 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 00:35:58 -0700
Subject: rpms/k3d/devel k3d.spec,1.7,1.8
Message-ID: <200610090736.k997a0OP030212@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195

Modified Files:
	k3d.spec 
Log Message:
Update to 0.6.3.0


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- k3d.spec	4 Oct 2006 22:19:25 -0000	1.7
+++ k3d.spec	9 Oct 2006 07:35:58 -0000	1.8
@@ -1,7 +1,7 @@
 
 Name:           k3d
-Version:        0.6.2.0
-Release:        2%{?dist}
+Version:        0.6.3.0
+Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 0.6.3.0-1
+- Update to 0.6.3.0
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.6.2.0-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Mon Oct  9 07:36:40 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 00:36:40 -0700
Subject: rpms/k3d/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200610090736.k997agbD030249@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30230

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.6.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Sep 2006 22:12:31 -0000	1.5
+++ .cvsignore	9 Oct 2006 07:36:40 -0000	1.6
@@ -1 +1 @@
-k3d-0.6.2.0-src.tar.bz2
+k3d-0.6.3.0-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Sep 2006 22:12:31 -0000	1.5
+++ sources	9 Oct 2006 07:36:40 -0000	1.6
@@ -1 +1 @@
-a896cb31a0077805654ef8485f410e5c  k3d-0.6.2.0-src.tar.bz2
+6c96db4ee5fba3f9e8ccc37aca37d595  k3d-0.6.3.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 08:15:57 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:15:57 -0700
Subject: rpms/cpan2rpm/devel cpan2rpm.spec,1.5,1.6
Message-ID: <200610090815.k998FxoQ000878@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/cpan2rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv861

Modified Files:
	cpan2rpm.spec 
Log Message:
FC6 Rebuild.


Index: cpan2rpm.spec
===================================================================
RCS file: /cvs/extras/rpms/cpan2rpm/devel/cpan2rpm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpan2rpm.spec	24 Feb 2006 10:37:53 -0000	1.5
+++ cpan2rpm.spec	9 Oct 2006 08:15:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           cpan2rpm
 Version:        2.028
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Perl module packager
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 2.028-2
+- FC6 Rebuild
+
 * Fri Feb 24 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 2.028-1
 - New version
 



From fedora-extras-commits at redhat.com  Mon Oct  9 08:17:42 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:17:42 -0700
Subject: rpms/cpan2rpm/devel needs.rebuild,1.1,NONE
Message-ID: <200610090817.k998HiMn000966@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/cpan2rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv951

Removed Files:
	needs.rebuild 
Log Message:
removed needs.rebuild.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:24:35 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:24:35 -0700
Subject: rpms/listen - New directory
Message-ID: <200610090824.k998Ob5q001046@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1020/listen

Log Message:
Directory /cvs/extras/rpms/listen added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 08:24:35 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:24:35 -0700
Subject: rpms/listen/devel - New directory
Message-ID: <200610090824.k998ObQg001049@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1020/listen/devel

Log Message:
Directory /cvs/extras/rpms/listen/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 08:24:55 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:24:55 -0700
Subject: rpms/listen Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610090824.k998OvI1001095@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1066

Added Files:
	Makefile import.log 
Log Message:
Setup of module listen


--- NEW FILE Makefile ---
# Top level Makefile for module listen
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:24:55 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:24:55 -0700
Subject: rpms/listen/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610090824.k998OvdD001098@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1066/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module listen


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:26:18 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:26:18 -0700
Subject: rpms/listen import.log,1.1,1.2
Message-ID: <200610090826.k998QKYW001174@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1141

Modified Files:
	import.log 
Log Message:
auto-import listen-0.5-3.beta1.fc5 on branch devel from listen-0.5-3.beta1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/listen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Oct 2006 08:24:54 -0000	1.1
+++ import.log	9 Oct 2006 08:26:18 -0000	1.2
@@ -0,0 +1 @@
+listen-0_5-3_beta1_fc5:HEAD:listen-0.5-3.beta1.fc5.src.rpm:1160382389



From fedora-extras-commits at redhat.com  Mon Oct  9 08:26:18 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:26:18 -0700
Subject: rpms/listen/devel listen.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610090826.k998QKcc001179@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1141/devel

Modified Files:
	.cvsignore sources 
Added Files:
	listen.spec 
Log Message:
auto-import listen-0.5-3.beta1.fc5 on branch devel from listen-0.5-3.beta1.fc5.src.rpm


--- NEW FILE listen.spec ---
Name:           listen
Version:        0.5
Release:        3.beta1%{?dist}
Summary:        A music manager and player for GNOME

Group:          Applications/Multimedia
License:        GPL
URL:            http://listengnome.free.fr
Source0:        %name-%{version}b1.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}b1-%{release}-root-%(%{__id_u} -n)


Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig  
Buildrequires: python-devel
BuildRequires: pygtk2-devel 
BuildRequires: gtk2-devel
Buildrequires: pkgconfig
Buildrequires: docbook2X
BuildRequires: gettext
Buildrequires: xorg-x11-server-Xvfb
Buildrequires: xorg-x11-xauth
Buildrequires: xorg-x11-fonts-base
Buildrequires: xorg-x11-fonts-misc
BuildRequires: gstreamer-python
BuildRequires: dbus-python
BuildRequires: python-sqlite2
BuildRequires: python-ctypes
BuildRequires: gnome-python2
BuildRequires: gnome-python2-extras
BuildRequires: gnome-python2-libegg
BuildRequires: python-ogg-devel
BuildRequires: python-vorbis
BuildRequires: python-sexy
BuildRequires: python-mutagen >= 1.6
BuildRequires: desktop-file-utils
# MusicBrainz support
BuildRequires: python-musicbrainz2 
BuildRequires: libtunepimp 
# optional requires an updated libgpod package from Core
#Requires: python-libgpod

%description
Listen is a music manager and player for GNOME
With listen you can:
* Play your favorite songs
* Manage your library
* Manage your ipod
* Make playlists
* Automatically or manually download album covers
* Automatically synchronize album covers with iPod
* Easily burn an audio CD
* Directly get informations from wikipedia when you play a song
* See the lyrics of a song
* Have statistics about your favorite songs, albums or artists
* Listen to web radio
* Submit your songs to Audioscrobbler
* Quick access to last.fm related file
With listen you will be able to:
 * Listen And Rip Audio CDs
 * Browse and listen songs on a DAAP share
 * Share you library via a DAAP share
 * Fill metadata with musicbrainz
 * Make smart playlists


%prep
%setup -q -n %{name}-%{version}b1
# the path is hardcoded in the Makefile
%{__sed} -i 's/local//' Makefile
# Under Fedora dockbook2x-man is renamed db2x_docbook2man
%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile

%build
# (misc) for import gtk, as gtk requires a X server to be imported
XDISPLAY=$(i=2; while [ -f /tmp/.X$i-lock ]; do i=$(($i+1)); done; echo $i)
# added - nolisten tcp -ac -terminate to fix build issue with mock
%{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
export DISPLAY=:$XDISPLAY
xauth add $DISPLAY . EE
make %{?_smp_mflags}



%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
# fixed rights of trackedit.glade thanks to Martin Sourada
chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
desktop-file-install --vendor fedora --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications      \
  --add-category X-Fedora                              \
  --remove-mime-type audio/mp3 \
  --remove-mime-type audio/x-mp3 \
  --remove-mime-type audio/mpeg \
  --remove-mime-type audio/x-mpeg \
  --remove-mime-type audio/mpeg3 \
  --remove-mime-type audio/x-mpeg-3 \
  --remove-mime-type application/x-id3 \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root,-)
%doc gpl.txt
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/%{name}/trackedit.glade
%{_datadir}/%{name}/img/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*.desktop

%changelog
* Sun Nov 08 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-3.beta1
- Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
 some enhancements to the spec (thanks M. Sourada), 

* Thu Nov 05 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5b1-2
- Added gettext and gtk2-devel as BR, fixed build issue with mock

* Fri Sep 08 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5b1-1
- Updated to 0.5 beta 1

* Sun Aug 20 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5.svn20060825-1
- Updated to 0.5.svn20060825 (0.5pre1)

* Thu May 25 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.4.3-4
- Added licence/copyright files and fixed some issues with rpmlint

* Thu May 25 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.4.3-3
- Add some patches to remove the dependency against libmad

* Thu May 25 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.4.3-2
- Some cleaning to the spec

* Thu May 11 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.4.3-1
- First packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Oct 2006 08:24:55 -0000	1.1
+++ .cvsignore	9 Oct 2006 08:26:18 -0000	1.2
@@ -0,0 +1 @@
+listen-0.5b1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Oct 2006 08:24:55 -0000	1.1
+++ sources	9 Oct 2006 08:26:18 -0000	1.2
@@ -0,0 +1 @@
+9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 08:26:33 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:26:33 -0700
Subject: rpms/html-xml-utils/devel html-xml-utils.spec, 1.1,
	1.2 needs.rebuild, 1.1, NONE
Message-ID: <200610090826.k998QZNg001228@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/html-xml-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1211

Modified Files:
	html-xml-utils.spec 
Removed Files:
	needs.rebuild 
Log Message:
FC6 Rebuild.


Index: html-xml-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/html-xml-utils/devel/html-xml-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- html-xml-utils.spec	14 Oct 2005 19:44:33 -0000	1.1
+++ html-xml-utils.spec	9 Oct 2006 08:26:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           html-xml-utils
 Version:        3.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A number of simple utilities for manipulating HTML and XML files
 
 Group:          Development/Tools
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 3.7-4
+- FC6 Rebuild
+
 * Mon Sep 26 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 3.7-3
 - Added README again, removed NEWS by mistake.
 


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:32:32 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:32:32 -0700
Subject: rpms/john/devel john.spec,1.8,1.9 needs.rebuild,1.1,NONE
Message-ID: <200610090832.k998WYwh001336@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/john/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1319

Modified Files:
	john.spec 
Removed Files:
	needs.rebuild 
Log Message:
FC6 Rebuild.


Index: john.spec
===================================================================
RCS file: /cvs/extras/rpms/john/devel/john.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- john.spec	22 May 2005 23:45:04 -0000	1.8
+++ john.spec	9 Oct 2006 08:32:32 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:          John the Ripper password cracker
 Name:             john
 Version:          1.6
-Release: 4
+Release:          5%{?dist} 
 
 URL:              http://www.openwall.com/john
 License:          GPL
@@ -55,6 +55,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Mon Oct 09 2006 Jeremy Katz <katzj at redhat.com> - 1.6-5
+- FC6 Rebuild
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.6-4
 - rebuild on all arches
 


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:34:24 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:34:24 -0700
Subject: owners owners.list,1.1801,1.1802
Message-ID: <200610090834.k998YQgt001402@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1385

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1801
retrieving revision 1.1802
diff -u -r1.1801 -r1.1802
--- owners.list	8 Oct 2006 21:34:47 -0000	1.1801
+++ owners.list	9 Oct 2006 08:34:24 -0000	1.1802
@@ -977,6 +977,7 @@
 Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 08:38:40 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:38:40 -0700
Subject: rpms/librsync/devel librsync.spec,1.13,1.14
Message-ID: <200610090838.k998cgbT001490@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/librsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1473

Modified Files:
	librsync.spec 
Log Message:
Another rebuild.


Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- librsync.spec	3 Oct 2006 19:17:07 -0000	1.13
+++ librsync.spec	9 Oct 2006 08:38:40 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry at suretecsystems.com> 0.9.7-8
+- rebuilt
+
 * Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Oct  9 08:45:49 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:45:49 -0700
Subject: rpms/pgadmin3/devel pgadmin3.spec,1.11,1.12
Message-ID: <200610090845.k998jpIi001588@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/pgadmin3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1571

Modified Files:
	pgadmin3.spec 
Log Message:
Rebuild.


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pgadmin3.spec	30 Aug 2006 07:06:19 -0000	1.11
+++ pgadmin3.spec	9 Oct 2006 08:45:49 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
 Version:	1.4.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 License:	Artistic
 Group:		Applications/Databases
@@ -47,6 +47,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry at suretecsystems.com> - 1.4.3-6
+- Rebuild for FC6
+
 * Tue Aug 29 2006 Gavin Henry <ghenry at suretecsystems.com> - 1.4.3-5
 - Should have Developement and keeping this version one ahead for
   upgrading in FC-6



From fedora-extras-commits at redhat.com  Mon Oct  9 08:48:35 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:48:35 -0700
Subject: rpms/Sprog/devel Sprog.spec,1.7,1.8 needs.rebuild,1.1,NONE
Message-ID: <200610090848.k998mbOa001674@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/Sprog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1657

Modified Files:
	Sprog.spec 
Removed Files:
	needs.rebuild 
Log Message:
Rebuild for FC6


Index: Sprog.spec
===================================================================
RCS file: /cvs/extras/rpms/Sprog/devel/Sprog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Sprog.spec	1 Mar 2006 10:57:55 -0000	1.7
+++ Sprog.spec	9 Oct 2006 08:48:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -78,6 +78,9 @@
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry at suretecsystems.com> - 0.14-12
+- Rebuild for FC6  
+
 * Wed Mar 01 2006 Gavin Henry <ghenry at suretecsystems.com> - 0.14-11
 - Added perl(Imager)  
 


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 09:02:02 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:02:02 -0700
Subject: rpms/listen/devel listen.spec,1.1,1.2
Message-ID: <200610090902.k9992YoE004643@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4619

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listen.spec	9 Oct 2006 08:26:18 -0000	1.1
+++ listen.spec	9 Oct 2006 09:02:02 -0000	1.2
@@ -85,8 +85,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \



From fedora-extras-commits at redhat.com  Mon Oct  9 09:10:54 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:10:54 -0700
Subject: rpms/listen/devel listen.spec,1.2,1.3
Message-ID: <200610090910.k999Aus7004839@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- listen.spec	9 Oct 2006 09:02:02 -0000	1.2
+++ listen.spec	9 Oct 2006 09:10:54 -0000	1.3
@@ -85,8 +85,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT/lib/%{name}/mmkeys.so
+chmod +x $RPM_BUILD_ROOT/lib/%{name}/listen.py
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \



From fedora-extras-commits at redhat.com  Mon Oct  9 09:18:13 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:18:13 -0700
Subject: rpms/listen/devel listen.spec,1.3,1.4
Message-ID: <200610090918.k999IF87004914@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4893

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- listen.spec	9 Oct 2006 09:10:54 -0000	1.3
+++ listen.spec	9 Oct 2006 09:18:13 -0000	1.4
@@ -85,8 +85,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT/lib/%{name}/mmkeys.so
-chmod +x $RPM_BUILD_ROOT/lib/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \



From fedora-extras-commits at redhat.com  Mon Oct  9 09:30:51 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:30:51 -0700
Subject: rpms/listen/devel listen.spec,1.4,1.5
Message-ID: <200610090930.k999Urgd005007@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4990

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- listen.spec	9 Oct 2006 09:18:13 -0000	1.4
+++ listen.spec	9 Oct 2006 09:30:51 -0000	1.5
@@ -85,8 +85,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
+chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \



From fedora-extras-commits at redhat.com  Mon Oct  9 09:39:42 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:39:42 -0700
Subject: rpms/listen/devel listen.spec,1.5,1.6
Message-ID: <200610090939.k999diLE005079@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5062

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- listen.spec	9 Oct 2006 09:30:51 -0000	1.5
+++ listen.spec	9 Oct 2006 09:39:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        3.beta1%{?dist}
+Release:        4.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -114,13 +114,16 @@
 %defattr(-,root,root,-)
 %doc gpl.txt
 %{_bindir}/%{name}
-%{_libdir}/%{name}/
+%{_prefix}/lib/%{name}/
 %{_datadir}/%{name}/trackedit.glade
 %{_datadir}/%{name}/img/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-4.beta1
+- fixed build issue on x86_64
+
 * Sun Nov 08 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 



From fedora-extras-commits at redhat.com  Mon Oct  9 10:09:01 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  9 Oct 2006 03:09:01 -0700
Subject: fedora-security/audit fc5,1.348,1.349
Message-ID: <200610091009.k99A91fi008142@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8124

Modified Files:
	fc5 
Log Message:
Weekend updates (only mono)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- fc5	6 Oct 2006 08:23:10 -0000	1.348
+++ fc5	9 Oct 2006 10:08:58 -0000	1.349
@@ -1,5 +1,5 @@
-p to date CVE as of CVE email 20061005
-Up to date FC5 as of 20061005
+p to date CVE as of CVE email 20061008
+Up to date FC5 as of 20061008
 
 ** are items that need attention
 
@@ -9,7 +9,7 @@
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel
-CVE-2006-5072 VULNERABLE (mono) #209464
+CVE-2006-5072 backport (mono) #209464 [since FEDORA-2006-1012]
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)



From fedora-extras-commits at redhat.com  Mon Oct  9 10:31:30 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 03:31:30 -0700
Subject: rpms/listen/devel listen.spec,1.6,1.7
Message-ID: <200610091031.k99AVW2Q009002@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8972

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- listen.spec	9 Oct 2006 09:39:41 -0000	1.6
+++ listen.spec	9 Oct 2006 10:31:30 -0000	1.7
@@ -85,8 +85,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/listen.py
-chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/mmkeys.so
+%ifarch x86_64
+mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}
+%endif
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \
@@ -114,7 +117,7 @@
 %defattr(-,root,root,-)
 %doc gpl.txt
 %{_bindir}/%{name}
-%{_prefix}/lib/%{name}/
+%{_libdir}/%{name}/
 %{_datadir}/%{name}/trackedit.glade
 %{_datadir}/%{name}/img/
 %{_datadir}/pixmaps/%{name}.png



From fedora-extras-commits at redhat.com  Mon Oct  9 10:40:21 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 03:40:21 -0700
Subject: rpms/listen/devel listen.spec,1.7,1.8
Message-ID: <200610091040.k99AeNJ3010296@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10262

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- listen.spec	9 Oct 2006 10:31:30 -0000	1.7
+++ listen.spec	9 Oct 2006 10:40:20 -0000	1.8
@@ -86,7 +86,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %ifarch x86_64
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}
+mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
 %endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so



From fedora-extras-commits at redhat.com  Mon Oct  9 10:54:55 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 03:54:55 -0700
Subject: rpms/listen/devel listen.spec,1.8,1.9
Message-ID: <200610091054.k99AsvIm012428@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12399

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- listen.spec	9 Oct 2006 10:40:20 -0000	1.8
+++ listen.spec	9 Oct 2006 10:54:55 -0000	1.9
@@ -86,6 +86,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %ifarch x86_64
+mkdir $RPM_BUILD_ROOT%{_libdir}/
 mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
 %endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py



From fedora-extras-commits at redhat.com  Mon Oct  9 11:03:28 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 04:03:28 -0700
Subject: rpms/listen/devel listen.spec,1.9,1.10
Message-ID: <200610091103.k99B3wjF016635@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16535

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- listen.spec	9 Oct 2006 10:54:55 -0000	1.9
+++ listen.spec	9 Oct 2006 11:03:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        4.beta1%{?dist}
+Release:        5.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -125,8 +125,11 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-5.beta1
+- Moved /usr/lib/listen to /usr/lib64 on x86_64
+
 * Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-4.beta1
-- fixed build issue on x86_64
+- Fixed build issue on x86_64
 
 * Sun Nov 08 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,



From fedora-extras-commits at redhat.com  Mon Oct  9 11:18:54 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  9 Oct 2006 04:18:54 -0700
Subject: owners owners.list,1.1802,1.1803
Message-ID: <200610091118.k99BIuvT018938@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18877

Modified Files:
	owners.list 
Log Message:
sysprof - add upstream to initial CC list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1802
retrieving revision 1.1803
diff -u -r1.1802 -r1.1803
--- owners.list	9 Oct 2006 08:34:24 -0000	1.1802
+++ owners.list	9 Oct 2006 11:18:54 -0000	1.1803
@@ -2109,8 +2109,8 @@
 Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|sysconftool|Macros for aclocal to install configuration files|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
-Fedora Extras|sysprof|A sampling CPU profiler|giallu at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|sysprof-kmod|Sysprof kernel module|giallu at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|sysprof|A sampling CPU profiler|giallu at gmail.com|extras-qa at fedoraproject.org|sandmann at daimi.au.dk
+Fedora Extras|sysprof-kmod|Sysprof kernel module|giallu at gmail.com|extras-qa at fedoraproject.org|sandmann at daimi.au.dk
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ankit644 at yahoo.com
 Fedora Extras|t1lib|PostScript Type 1 font rasterizer|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt



From fedora-extras-commits at redhat.com  Mon Oct  9 11:21:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  9 Oct 2006 04:21:51 -0700
Subject: rpms/ClanLib/devel ClanLib-0.8.0-fullscreen.patch, NONE,
	1.1 ClanLib.spec, 1.7, 1.8
Message-ID: <200610091121.k99BLrbT019444@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19416

Modified Files:
	ClanLib.spec 
Added Files:
	ClanLib-0.8.0-fullscreen.patch 
Log Message:
* Sun Oct  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-3
- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
  window decoration show in fullscreen mode on certain videocards


ClanLib-0.8.0-fullscreen.patch:

--- NEW FILE ClanLib-0.8.0-fullscreen.patch ---
--- ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.h.fs	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.h	2006-10-08 21:45:19.000000000 +0200
@@ -195,20 +195,9 @@
 
 	//: X Event handler for the window
 	void on_xevent(XEvent &event);
-
-	//: True if currently in full screen mode.
-	bool fullscreen;
-
-	//: Width and height, if in full screen mode.
-	int fullscreen_width, fullscreen_height;
-
-	//: Bits per pixel in the openGL Context.
-	//: May not correspond to bit depth on screen
-	int glx_bpp;
-
-	//: Saved position of window when going fullscreen. This is the
-	//: position the window receives when leaving fullscreen again.
-	CL_Rect saved_position;
+	
+	//: Change resolution for fullscreen mode
+	void set_resolution();
 
 	// OpenGL compatible gc.
 	CL_GraphicContext gc;
@@ -221,19 +210,39 @@
 
 	static int disp_ref_count;
 
-	//: Handle to X11 window.
+	// We use 3 windows:
+	// -fs_window (for fullscreen)
+	// -wm_window (window managed)
+	// -window    (the real window)
+	// 2 of which will be created in create_window: wm_window and window.
+	// The fullscreen window gets (re)created when needed, because reusing
+	// it causes trouble.
+	// The real window uses wm_window as parent initially and will be
+	// reparened to the (freshly created) fullscreen window when requested
+	// and reparented back again when going back to windowed mode.
+	// Idea / concept of 3 windows borrowed from SDL. But somehow SDL
+	// manages to reuse the fullscreen window too.
 	Window window;
-
-	//: Attributes used to create window.
-	XSetWindowAttributes attributes;
+	Window wm_window;
+	Window fs_window;
 	
+	// width and height of the drawing window as specified by
+	// the caller, or as reported after a resize by the windowmanager
+	int width;
+	int height;
+
 	//: Whether we have window focus or not
 	bool focus;
+	
+	//: Is resizing allowed?
+	bool allow_resize;
 
 	//: Attributes to switch between windowed and fullscreen
 	int dotclock;
 	XF86VidModeModeInfo old_mode;
 	int old_x, old_y;
+	XVisualInfo *vi;
+	Colormap cmap;
 
 	//: X Event slot
 	CL_Slot slot_xevent;
--- ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.cpp.fs	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.cpp	2006-10-08 22:15:27.000000000 +0200
@@ -65,18 +65,15 @@
 CL_DisplayWindow_OpenGL::CL_DisplayWindow_OpenGL() :
 	left_ctrl_down(false), left_alt_down(false), left_shift_down(false),
 	right_ctrl_down(false), right_alt_down(false), right_shift_down(false),
-	fullscreen(false), fullscreen_width(0), fullscreen_height(0),
-	saved_position(0, 0, 0, 0),
 	context(0),
-	window(0)
+	window(None), wm_window(None), fs_window(None), width(0), height(0),
+	old_x(-1), old_y(-1)
 {
 	gc = CL_GraphicContext(new CL_GraphicContext_OpenGL(this));
 }
 
 CL_DisplayWindow_OpenGL::~CL_DisplayWindow_OpenGL()
 {
-	if(fullscreen)
-		set_windowed();
 	destroy_window();
 }
 
@@ -85,23 +82,17 @@
 
 int CL_DisplayWindow_OpenGL::get_width() const
 {
-	XWindowAttributes attr;
-	XGetWindowAttributes(disp, window, &attr);
-
-	return attr.width;
+	return width;
 }
 
 int CL_DisplayWindow_OpenGL::get_height() const
 {
-	XWindowAttributes attr;
-	XGetWindowAttributes(disp, window, &attr);
-
-	return attr.height;
+	return height;
 }
 
 bool CL_DisplayWindow_OpenGL::is_fullscreen() const
 {
-	return fullscreen;
+	return fs_window != None;
 }
 
 bool CL_DisplayWindow_OpenGL::has_focus() const
@@ -151,11 +142,9 @@
 	const CL_OpenGLWindowDescription_Generic *gl_desc = 0;
 	gl_desc = dynamic_cast<const CL_OpenGLWindowDescription_Generic*>(desc.impl.get());
 
-	fullscreen_width  = desc.get_size().width;
-	fullscreen_height = desc.get_size().height;
-
-	XVisualInfo *vi;
-	Colormap cmap;
+	width  = desc.get_size().width;
+	height = desc.get_size().height;
+	allow_resize = desc.get_allow_resize();
 
 	if (disp == 0)
 	{
@@ -230,7 +219,7 @@
 	
 	if (vi == NULL)
 	{
-		vi = glXChooseVisual(disp, window, gl_attribs_single);
+		vi = glXChooseVisual(disp, DefaultScreen(disp), gl_attribs_single);
 		printf("Requested visual not supported by your OpenGL implementation. Falling back on singlebuffered Visual!\n");
 	}
 
@@ -240,16 +229,17 @@
 	if( share_context == NULL )
 		share_context = context;
 
-	glXGetConfig(disp, vi, GLX_BUFFER_SIZE, &glx_bpp);
-
 	// create a color map
 	cmap = XCreateColormap( disp, RootWindow(disp, vi->screen), vi->visual, AllocNone);
 
+	XSetWindowAttributes attributes;
+
 	attributes.colormap = cmap;
+	attributes.background_pixel = XBlackPixel(disp, vi->screen);
 	attributes.border_pixel = 0;
 	attributes.override_redirect = False;
 
-	// create a window in window mode
+	// create a managed window
 	attributes.event_mask =
 		ExposureMask |
 		KeyPressMask |
@@ -258,18 +248,20 @@
 		ButtonReleaseMask |
 		StructureNotifyMask |
 		PointerMotionMask |
-		EnterWindowMask |
-		LeaveWindowMask |
+		PropertyChangeMask |
+		KeymapStateMask |
 		FocusChangeMask;
 
-	window = XCreateWindow(disp, RootWindow(disp, vi->screen),
-		0, 0, desc.get_size().width, desc.get_size().height, 0, vi->depth, InputOutput, vi->visual,
-		CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
-	
-	XSelectInput(disp, window,
-		FocusChangeMask | KeyPressMask | KeyReleaseMask
-		| PropertyChangeMask | StructureNotifyMask |
-		KeymapStateMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask);
+	wm_window = XCreateWindow(disp, RootWindow(disp, vi->screen),
+		0, 0, width, height, 0, vi->depth, InputOutput, vi->visual,
+		CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
+	
+	window = XCreateWindow(disp, wm_window,
+		0, 0, width, height, 0, vi->depth, InputOutput, vi->visual,
+		CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
+	
+	// Map the real / drawing window it won't appear untill the parent does
+	XMapWindow(disp, window);
 
 	// set title of window:
 	set_title(desc.get_title());
@@ -277,24 +269,24 @@
 	// setup size hints:
 	XSizeHints size_hints;
 	memset(&size_hints, 0, sizeof(XSizeHints));
-	size_hints.width       = desc.get_size().width;
-	size_hints.height      = desc.get_size().height;
-	size_hints.base_width  = desc.get_size().width;
-	size_hints.base_height = desc.get_size().height;
-	size_hints.min_width   = size_hints.width;
-	size_hints.min_height  = size_hints.height;
-	size_hints.max_width   = size_hints.width;
-	size_hints.max_height  = size_hints.height;
+	size_hints.width       = width;
+	size_hints.height      = height;
+	size_hints.base_width  = width;
+	size_hints.base_height = height;
+	size_hints.min_width   = width;
+	size_hints.min_height  = height;
+	size_hints.max_width   = width;
+	size_hints.max_height  = height;
 	size_hints.flags       = PSize|PBaseSize;
-	if (!desc.get_allow_resize()) size_hints.flags |= PMinSize | PMaxSize;
-	XSetWMNormalHints(disp, window, &size_hints);
+	if (!allow_resize) size_hints.flags |= PMinSize | PMaxSize;
+	XSetWMNormalHints(disp, wm_window, &size_hints);
 
 	// handle wm_delete_events if in windowed mode:
 	Atom wm_delete = XInternAtom(disp, "WM_DELETE_WINDOW", True);
-	XSetWMProtocols(disp, window, &wm_delete, 1);
+	XSetWMProtocols(disp, wm_window, &wm_delete, 1);
 
-	// make window visible:
-	XMapRaised(disp, window);
+	// make the managed window visible (and thus the real one too):
+	XMapRaised(disp, wm_window);
 
 	if (!glXIsDirect(disp, context))
 		printf("No hardware acceleration available. I hope you got a really fast machine..\n");
@@ -327,7 +319,7 @@
 	hidden_cursor = XCreatePixmapCursor(disp, cursor_bitmap, cursor_bitmap, &black_color, &black_color, 0,0 );
 	
 	if (desc.is_fullscreen())
-		set_fullscreen(desc.get_size().width, desc.get_size().height, desc.get_bpp(), desc.get_refresh_rate());
+		set_fullscreen(width, height, desc.get_bpp(), desc.get_refresh_rate());
 }
 
 void
@@ -476,7 +468,8 @@
 
 void CL_DisplayWindow_OpenGL::destroy_window()
 {
-	set_windowed();
+	if(fs_window != None)
+		set_windowed();
 
 	if (context)
 	{
@@ -493,8 +486,16 @@
 	mouse = CL_InputDevice();
 	get_ic()->clear();
 
-	if (window) XDestroyWindow(disp, window);
-	window = 0;
+	if (window != None)
+	{
+		XDestroyWindow(disp, window);
+		window = None;
+	}
+	if (wm_window != None)
+	{
+		XDestroyWindow(disp, wm_window);
+		wm_window = None;
+	}
 	
 	if (disp_ref_count > 0)
 	{
@@ -502,7 +503,7 @@
 		if (disp_ref_count == 0)
 		{
 			XCloseDisplay(disp);
-			disp = 0;
+			disp = NULL;
 		}
 	}
 }
@@ -530,180 +531,234 @@
 	glXSwapBuffers(disp, window);
 }
 
-void CL_DisplayWindow_OpenGL::set_fullscreen(int width, int height, int bpp, int refresh_rate)
+/* qsort comparison function for sorting the modes */
+static int cmpmodes(const void *va, const void *vb)
 {
-	if(fullscreen)
-		return;
-
-	// Vid-mode Switching
-	XF86VidModeModeLine cur_mode;
-
-	XF86VidModeGetModeLine(disp, 0, &dotclock, &cur_mode);
-
-	old_mode.dotclock   = dotclock;
-	old_mode.hdisplay   = cur_mode.hdisplay;
-	old_mode.hsyncstart = cur_mode.hsyncstart;
-	old_mode.hsyncend   = cur_mode.hsyncend;
-	old_mode.htotal     = cur_mode.htotal;
-	old_mode.vdisplay   = cur_mode.vdisplay;
-	old_mode.vsyncstart = cur_mode.vsyncstart;
-	old_mode.vsyncend   = cur_mode.vsyncend;
-	old_mode.vtotal     = cur_mode.vtotal;
-	old_mode.flags      = cur_mode.flags;
-	old_mode.privsize   = 0;
+	const XF86VidModeModeInfo *a = *(const XF86VidModeModeInfo **)va;
+	const XF86VidModeModeInfo *b = *(const XF86VidModeModeInfo **)vb;
+	if ( a->hdisplay == b->hdisplay )
+		return b->vdisplay - a->vdisplay;  
+	else
+		return b->hdisplay - a->hdisplay;
+}
 
-	int num_modes;
+void CL_DisplayWindow_OpenGL::set_resolution(void)
+{
+	int i, dotclock, mode_count, fs_width, fs_height;
 	XF86VidModeModeInfo **modes;
-	XF86VidModeGetAllModeLines(disp, 0, &num_modes, &modes);
+	XF86VidModeModeLine current_mode;
 
-	std::list<XF86VidModeModeInfo *> usable_modes;
-	for(int i = 0; i < num_modes; i++)
-	{
-		if(modes[i]->hdisplay == width && modes[i]->vdisplay == height)
-		{
-			CL_Log::log("debug", "Useable fullscreen mode found: %1x%2", width, height);
-			usable_modes.push_back(modes[i]);
-		}
-	}
-	
-	if (usable_modes.empty())
-	{
-		CL_Log::log("debug", "No useable fullscreen modes available!");
+	current_mode.privsize = 0;
+	XF86VidModeGetModeLine(disp, vi->screen, &dotclock, &current_mode);
+	if (!XF86VidModeGetAllModeLines(disp, 0, &mode_count, &modes))
+		mode_count = 0;
+
+	/* Search for an exact matching video mode.  */
+	for (i = 0; i < mode_count; i++) {
+		if ((modes[i]->hdisplay == width) && 
+		    (modes[i]->vdisplay == height))
+			break;
 	}
-	else 
-	{	
-		if(!width)
-			width = get_width();
-
-		if(!height)
-			height = get_height();
-	
-		if(!bpp)
-			bpp = glx_bpp;
-
-		//Hide Window
-		if (0)
-		{  // FIXME: allow_override doesn't play together with
-			// GrabPointer, not sure what is wrong but it simply doesn't
-			// work.
-			//
-			// The code outside the 'if(0)' as it is now, works mostly,
-			// however it doesn't work when the window or a part of it is
-			// outside of the screen, since the window isn't moved
-			// fullscreen will only show half the window, shouldn't be a
-			// problem for most of the time, but will be tricky if the
-			// window has equal size as the desktop.
 
-			// Move the window into the right position, this must happen
-			// BEFORE we remove control from the window manager
-			XMoveResizeWindow(disp, window, 0, 0, width, height);
-
-			// Move the mouse and switch moves
-			XWarpPointer(disp, None, None, 0, 0, 0, 0, width/2, height/2);
-
-			XUnmapWindow(disp, window);
-			{ // Wait for window to disapear
-				XEvent event;
-				do {
-					XMaskEvent(disp, StructureNotifyMask, &event);
-				} while ( (event.type != UnmapNotify) || (event.xunmap.event != window) );
+	/* Search for a non exact match (smallest bigger res). */
+	if (i == mode_count) {
+		int best_width = 0, best_height = 0;
+		qsort(modes, mode_count, sizeof(void *), cmpmodes);
+		for (i = mode_count-1; i > 0; i--) {
+			if ( ! best_width ) {
+				if ( (modes[i]->hdisplay >= width) &&
+				     (modes[i]->vdisplay >= height) ) {
+					best_width = modes[i]->hdisplay;
+					best_height = modes[i]->vdisplay;
+				}
+			} else {
+				if ( (modes[i]->hdisplay != best_width) ||
+				     (modes[i]->vdisplay != best_height) ) {
+					i++;
+					break;
+				}
 			}
-			// Turn off WM control
-			attributes.override_redirect = True;
-			XChangeWindowAttributes(disp, window, CWBorderPixel | CWColormap | CWOverrideRedirect, &attributes);
-
-			// Re-appear window
-			XMapRaised(disp, window);
 		}
+	}
 
-		// Get input focus
-		//XSetInputFocus(disp,window, RevertToNone, CurrentTime);
-		while (1) 
+	/* Switch video mode */
+	if (i >= 0)
+	{
+		if ((modes[i]->hdisplay != current_mode.hdisplay) ||
+		    (modes[i]->vdisplay != current_mode.vdisplay))
 		{
-			int result = XGrabPointer(disp, window, True, 0, 
-											  GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
-			if ( result == GrabSuccess ) {
-				break;
+			if (old_x == -1 && old_y == -1)
+			{
+				XF86VidModeModeLine *l =
+					(XF86VidModeModeLine *)((char *)
+						&old_mode +
+						sizeof(old_mode.dotclock));
+				*l = current_mode;
+				old_mode.dotclock = dotclock;
+				XF86VidModeGetViewPort(disp, vi->screen,
+					&old_x, &old_y);
 			}
-			CL_System::sleep(100);
+			XF86VidModeSwitchToMode(disp, vi->screen,
+				modes[i]);
 		}
+		fs_width  = modes[i]->hdisplay;
+		fs_height = modes[i]->vdisplay;
+	}
+	else
+	{
+		fs_width  = DisplayWidth(disp, vi->screen);
+		fs_height = DisplayHeight(disp, vi->screen);
+	}
 
-		XF86VidModeGetViewPort(disp, DefaultScreen(disp), &old_x, &old_y);
-
-		XF86VidModeSwitchToMode(disp, 0, *(usable_modes.begin()));
-		Window child_window;
-		int x, y;
-		// Get the windows absolute position (aka relative to
-		// the root window)
-		XTranslateCoordinates(disp, window, DefaultRootWindow(disp), 
-									 0, 0, &x, &y, &child_window);
-	
-		XF86VidModeSetViewPort(disp, DefaultScreen(disp), x, y);
-		
-		XSync(disp, True);
-
-		fullscreen = true;
+	/* center window */
+	XMoveWindow(disp, window, (fs_width - width) / 2,
+		(fs_height - height) / 2);
+
+	/* Lock mode switching.  */
+	XF86VidModeLockModeSwitch(disp, vi->screen, True);
+	       
+	/* Set viewport. */
+	XF86VidModeSetViewPort(disp, vi->screen, 0, 0);
+
+	/* clean up */
+	if (current_mode.privsize)
+	  XFree(current_mode.c_private);
+
+	if (mode_count)
+	{
+	  for (i = 0; i < mode_count; i++)
+	    if (modes[i]->privsize)
+	      XFree(modes[i]->c_private);
+	  XFree(modes);
 	}
 }
 
-void CL_DisplayWindow_OpenGL::set_windowed()
+void CL_DisplayWindow_OpenGL::set_fullscreen(int width, int height, int bpp, int refresh_rate)
 {
-	if(!fullscreen)
+	if(!width)
+		width = this->width;
+	if(!height)
+		height = this->height;
+		
+	set_size(width, height);
+	
+	if(fs_window != None)
+	{
+		set_resolution();
 		return;
+	}
 
-	if (0)
-	{ // FIXME: See FIXME in set_fullscreen
-		// Hide window
-		XUnmapWindow(disp, window);
-		XSync(disp, True);
-
-		// Turn on WM control 
-		attributes.override_redirect = False;
-		XChangeWindowAttributes(disp, window, CWBorderPixel | CWColormap | CWOverrideRedirect, &attributes);
-
-		XMoveResizeWindow(disp, window, 0, 0, fullscreen_width, fullscreen_height);
+	/* Create the fullscreen window */
+	XSetWindowAttributes attributes;
+	XEvent event;
+
+	attributes.override_redirect = True;
+	attributes.background_pixel = XBlackPixel(disp, vi->screen);
+	attributes.border_pixel = XBlackPixel(disp, vi->screen);
+	attributes.event_mask = StructureNotifyMask;
+	attributes.colormap = cmap;
 
-		XMapRaised(disp, window);
-		XSync(disp, True);
+	fs_window = XCreateWindow(disp, RootWindow(disp, vi->screen),
+	                             0, 0,
+	                             DisplayWidth(disp, vi->screen),
+	                             DisplayHeight(disp, vi->screen), 0,
+	                             vi->depth, InputOutput,
+	                             vi->visual, CWOverrideRedirect |
+	                             CWBackPixel | CWColormap | CWBorderPixel |
+	                             CWEventMask, &attributes);
+
+	/* Map the fullscreen window */
+	XMapRaised(disp, fs_window);
+	/* wait until we are mapped. (shamelessly borrowed from SDL) */
+	do {
+	  XMaskEvent(disp, StructureNotifyMask, &event); 
+	} while ( (event.type != MapNotify) || 
+	          (event.xmap.event != fs_window) );
+	/* Make sure we got to the top of the window stack */
+	XRaiseWindow(disp, fs_window);
+	
+	/* Reparent the real window */
+	XReparentWindow(disp, window, fs_window, 0, 0);
+
+	// Get input focus
+	//XSetInputFocus(disp,window, RevertToNone, CurrentTime);
+	while (1) 
+	{
+		int result = XGrabPointer(disp, window, True, 0, 
+										  GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
+		if ( result == GrabSuccess ) {
+			break;
+		}
+		CL_System::sleep(100);
 	}
 
-	fullscreen = false;
+	set_resolution();
+}
+
+void CL_DisplayWindow_OpenGL::set_windowed()
+{
+	if(fs_window == None)
+		return;
 
 	// Only restore mode if we ever switched mode.
 	if (old_x != -1 || old_y != -1)
 	{
-		XF86VidModeSwitchToMode(disp, 0, &old_mode);
-		XF86VidModeSetViewPort(disp, 0, old_x, old_y);
+		XF86VidModeSwitchToMode(disp, vi->screen, &old_mode);
+		XF86VidModeSetViewPort(disp, vi->screen, old_x, old_y);
+		old_x = old_y = -1;
 	}
 
 	XUngrabPointer(disp, CurrentTime);
 
-	XSync(disp, True);
+	/* Reparent the real window! */
+	XReparentWindow(disp, window, wm_window, 0, 0);
+	XUnmapWindow(disp, fs_window);
+	XDestroyWindow(disp, fs_window);
+	fs_window = None;
 }
 
 void CL_DisplayWindow_OpenGL::set_title(const std::string &title)
 {
-	XSetStandardProperties(disp, window, title.c_str(), title.c_str(), None, NULL, 0, NULL);
+	XSetStandardProperties(disp, wm_window, title.c_str(), title.c_str(), None, NULL, 0, NULL);
 }
 
 void CL_DisplayWindow_OpenGL::set_position(const CL_Rect &pos)
 {
 	set_position(pos.left, pos.top);
-	XResizeWindow(disp, window, pos.get_width(), pos.get_height());
 	set_size(pos.get_width(), pos.get_height());
 }
 
 void CL_DisplayWindow_OpenGL::set_position(int x, int y)
 {
-	XMoveWindow(disp, window, x, y);
+	XMoveWindow(disp, wm_window, x, y);
 }
 
 void CL_DisplayWindow_OpenGL::set_size(int width, int height)
 {
-	fullscreen_width = width;
-	fullscreen_height = height;
+	if((width == this->width) && (height == this->height))
+		return;
 
-	sig_resize(width, height);
+	// in order to resize a non resizable window we must change the hints
+	// as the window manager won't allow the resize otherwise.
+	if (!allow_resize)
+	{
+		XSizeHints size_hints;
+		memset(&size_hints, 0, sizeof(XSizeHints));
+		size_hints.width       = width;
+		size_hints.height      = height;
+		size_hints.base_width  = width;
+		size_hints.base_height = height;
+		size_hints.min_width   = width;
+		size_hints.min_height  = height;
+		size_hints.max_width   = width;
+		size_hints.max_height  = height;
+		size_hints.flags       = PSize|PBaseSize|PMinSize|PMaxSize;
+		XSetWMNormalHints(disp, wm_window, &size_hints);
+	}
+	XResizeWindow(disp, wm_window, width, height);
+	XResizeWindow(disp, window, width, height);
+	this->width  = width;
+	this->height = height;
 }
 
 void CL_DisplayWindow_OpenGL::set_buffer_count(int flipping_buffers)
@@ -772,7 +827,16 @@
 				#ifdef DEBUG
 					CL_Log::log("debug", "ConfigureNotify Event received");
 				#endif
-				set_size(event.xconfigure.width,event.xconfigure.height);
+				if (event.xconfigure.window == wm_window &&
+				    (event.xconfigure.width  != width ||
+				     event.xconfigure.height != height))
+				{
+					width  = event.xconfigure.width;
+					height = event.xconfigure.height;
+					XResizeWindow(disp, window, width,
+						 height);
+					sig_resize(event.xconfigure.width, event.xconfigure.height);
+				}
 				break;
 			case ClientMessage:
 				#ifdef DEBUG



Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClanLib.spec	28 Aug 2006 05:00:40 -0000	1.7
+++ ClanLib.spec	9 Oct 2006 11:21:51 -0000	1.8
@@ -1,11 +1,12 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          System Environment/Libraries
 License:        zlib License
 URL:            http://www.clanlib.org/
 Source0:        http://www.clanlib.org/download/releases-0.8/%{name}-%{version}.tgz
+Patch0:         ClanLib-0.8.0-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .fs 
 # fixup pc files
 sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in
 sed -i 's|Libs:   -L${libdir}|Libs:   -L${libdir}/%{name}-0.8|' \
@@ -80,6 +82,10 @@
 
 
 %changelog
+* Sun Oct  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-3
+- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
+  window decoration show in fullscreen mode on certain videocards
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-2
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  9 11:49:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  9 Oct 2006 04:49:54 -0700
Subject: rpms/ClanLib/FC-5 ClanLib-0.8.0-fullscreen.patch, NONE,
	1.1 ClanLib.spec, 1.6, 1.7
Message-ID: <200610091149.k99Bnuja024202@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24174

Modified Files:
	ClanLib.spec 
Added Files:
	ClanLib-0.8.0-fullscreen.patch 
Log Message:
* Mon Oct  9 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.7.RC2
- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
  window decoration is shown in fullscreen mode on certain videocards


ClanLib-0.8.0-fullscreen.patch:

--- NEW FILE ClanLib-0.8.0-fullscreen.patch ---
--- ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.h.fs	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.h	2006-10-08 21:45:19.000000000 +0200
@@ -195,20 +195,9 @@
 
 	//: X Event handler for the window
 	void on_xevent(XEvent &event);
-
-	//: True if currently in full screen mode.
-	bool fullscreen;
-
-	//: Width and height, if in full screen mode.
-	int fullscreen_width, fullscreen_height;
-
-	//: Bits per pixel in the openGL Context.
-	//: May not correspond to bit depth on screen
-	int glx_bpp;
-
-	//: Saved position of window when going fullscreen. This is the
-	//: position the window receives when leaving fullscreen again.
-	CL_Rect saved_position;
+	
+	//: Change resolution for fullscreen mode
+	void set_resolution();
 
 	// OpenGL compatible gc.
 	CL_GraphicContext gc;
@@ -221,19 +210,39 @@
 
 	static int disp_ref_count;
 
-	//: Handle to X11 window.
+	// We use 3 windows:
+	// -fs_window (for fullscreen)
+	// -wm_window (window managed)
+	// -window    (the real window)
+	// 2 of which will be created in create_window: wm_window and window.
+	// The fullscreen window gets (re)created when needed, because reusing
+	// it causes trouble.
+	// The real window uses wm_window as parent initially and will be
+	// reparened to the (freshly created) fullscreen window when requested
+	// and reparented back again when going back to windowed mode.
+	// Idea / concept of 3 windows borrowed from SDL. But somehow SDL
+	// manages to reuse the fullscreen window too.
 	Window window;
-
-	//: Attributes used to create window.
-	XSetWindowAttributes attributes;
+	Window wm_window;
+	Window fs_window;
 	
+	// width and height of the drawing window as specified by
+	// the caller, or as reported after a resize by the windowmanager
+	int width;
+	int height;
+
 	//: Whether we have window focus or not
 	bool focus;
+	
+	//: Is resizing allowed?
+	bool allow_resize;
 
 	//: Attributes to switch between windowed and fullscreen
 	int dotclock;
 	XF86VidModeModeInfo old_mode;
 	int old_x, old_y;
+	XVisualInfo *vi;
+	Colormap cmap;
 
 	//: X Event slot
 	CL_Slot slot_xevent;
--- ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.cpp.fs	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.cpp	2006-10-08 22:15:27.000000000 +0200
@@ -65,18 +65,15 @@
 CL_DisplayWindow_OpenGL::CL_DisplayWindow_OpenGL() :
 	left_ctrl_down(false), left_alt_down(false), left_shift_down(false),
 	right_ctrl_down(false), right_alt_down(false), right_shift_down(false),
-	fullscreen(false), fullscreen_width(0), fullscreen_height(0),
-	saved_position(0, 0, 0, 0),
 	context(0),
-	window(0)
+	window(None), wm_window(None), fs_window(None), width(0), height(0),
+	old_x(-1), old_y(-1)
 {
 	gc = CL_GraphicContext(new CL_GraphicContext_OpenGL(this));
 }
 
 CL_DisplayWindow_OpenGL::~CL_DisplayWindow_OpenGL()
 {
-	if(fullscreen)
-		set_windowed();
 	destroy_window();
 }
 
@@ -85,23 +82,17 @@
 
 int CL_DisplayWindow_OpenGL::get_width() const
 {
-	XWindowAttributes attr;
-	XGetWindowAttributes(disp, window, &attr);
-
-	return attr.width;
+	return width;
 }
 
 int CL_DisplayWindow_OpenGL::get_height() const
 {
-	XWindowAttributes attr;
-	XGetWindowAttributes(disp, window, &attr);
-
-	return attr.height;
+	return height;
 }
 
 bool CL_DisplayWindow_OpenGL::is_fullscreen() const
 {
-	return fullscreen;
+	return fs_window != None;
 }
 
 bool CL_DisplayWindow_OpenGL::has_focus() const
@@ -151,11 +142,9 @@
 	const CL_OpenGLWindowDescription_Generic *gl_desc = 0;
 	gl_desc = dynamic_cast<const CL_OpenGLWindowDescription_Generic*>(desc.impl.get());
 
-	fullscreen_width  = desc.get_size().width;
-	fullscreen_height = desc.get_size().height;
-
-	XVisualInfo *vi;
-	Colormap cmap;
+	width  = desc.get_size().width;
+	height = desc.get_size().height;
+	allow_resize = desc.get_allow_resize();
 
 	if (disp == 0)
 	{
@@ -230,7 +219,7 @@
 	
 	if (vi == NULL)
 	{
-		vi = glXChooseVisual(disp, window, gl_attribs_single);
+		vi = glXChooseVisual(disp, DefaultScreen(disp), gl_attribs_single);
 		printf("Requested visual not supported by your OpenGL implementation. Falling back on singlebuffered Visual!\n");
 	}
 
@@ -240,16 +229,17 @@
 	if( share_context == NULL )
 		share_context = context;
 
-	glXGetConfig(disp, vi, GLX_BUFFER_SIZE, &glx_bpp);
-
 	// create a color map
 	cmap = XCreateColormap( disp, RootWindow(disp, vi->screen), vi->visual, AllocNone);
 
+	XSetWindowAttributes attributes;
+
 	attributes.colormap = cmap;
+	attributes.background_pixel = XBlackPixel(disp, vi->screen);
 	attributes.border_pixel = 0;
 	attributes.override_redirect = False;
 
-	// create a window in window mode
+	// create a managed window
 	attributes.event_mask =
 		ExposureMask |
 		KeyPressMask |
@@ -258,18 +248,20 @@
 		ButtonReleaseMask |
 		StructureNotifyMask |
 		PointerMotionMask |
-		EnterWindowMask |
-		LeaveWindowMask |
+		PropertyChangeMask |
+		KeymapStateMask |
 		FocusChangeMask;
 
-	window = XCreateWindow(disp, RootWindow(disp, vi->screen),
-		0, 0, desc.get_size().width, desc.get_size().height, 0, vi->depth, InputOutput, vi->visual,
-		CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
-	
-	XSelectInput(disp, window,
-		FocusChangeMask | KeyPressMask | KeyReleaseMask
-		| PropertyChangeMask | StructureNotifyMask |
-		KeymapStateMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask);
+	wm_window = XCreateWindow(disp, RootWindow(disp, vi->screen),
+		0, 0, width, height, 0, vi->depth, InputOutput, vi->visual,
+		CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
+	
+	window = XCreateWindow(disp, wm_window,
+		0, 0, width, height, 0, vi->depth, InputOutput, vi->visual,
+		CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
+	
+	// Map the real / drawing window it won't appear untill the parent does
+	XMapWindow(disp, window);
 
 	// set title of window:
 	set_title(desc.get_title());
@@ -277,24 +269,24 @@
 	// setup size hints:
 	XSizeHints size_hints;
 	memset(&size_hints, 0, sizeof(XSizeHints));
-	size_hints.width       = desc.get_size().width;
-	size_hints.height      = desc.get_size().height;
-	size_hints.base_width  = desc.get_size().width;
-	size_hints.base_height = desc.get_size().height;
-	size_hints.min_width   = size_hints.width;
-	size_hints.min_height  = size_hints.height;
-	size_hints.max_width   = size_hints.width;
-	size_hints.max_height  = size_hints.height;
+	size_hints.width       = width;
+	size_hints.height      = height;
+	size_hints.base_width  = width;
+	size_hints.base_height = height;
+	size_hints.min_width   = width;
+	size_hints.min_height  = height;
+	size_hints.max_width   = width;
+	size_hints.max_height  = height;
 	size_hints.flags       = PSize|PBaseSize;
-	if (!desc.get_allow_resize()) size_hints.flags |= PMinSize | PMaxSize;
-	XSetWMNormalHints(disp, window, &size_hints);
+	if (!allow_resize) size_hints.flags |= PMinSize | PMaxSize;
+	XSetWMNormalHints(disp, wm_window, &size_hints);
 
 	// handle wm_delete_events if in windowed mode:
 	Atom wm_delete = XInternAtom(disp, "WM_DELETE_WINDOW", True);
-	XSetWMProtocols(disp, window, &wm_delete, 1);
+	XSetWMProtocols(disp, wm_window, &wm_delete, 1);
 
-	// make window visible:
-	XMapRaised(disp, window);
+	// make the managed window visible (and thus the real one too):
+	XMapRaised(disp, wm_window);
 
 	if (!glXIsDirect(disp, context))
 		printf("No hardware acceleration available. I hope you got a really fast machine..\n");
@@ -327,7 +319,7 @@
 	hidden_cursor = XCreatePixmapCursor(disp, cursor_bitmap, cursor_bitmap, &black_color, &black_color, 0,0 );
 	
 	if (desc.is_fullscreen())
-		set_fullscreen(desc.get_size().width, desc.get_size().height, desc.get_bpp(), desc.get_refresh_rate());
+		set_fullscreen(width, height, desc.get_bpp(), desc.get_refresh_rate());
 }
 
 void
@@ -476,7 +468,8 @@
 
 void CL_DisplayWindow_OpenGL::destroy_window()
 {
-	set_windowed();
+	if(fs_window != None)
+		set_windowed();
 
 	if (context)
 	{
@@ -493,8 +486,16 @@
 	mouse = CL_InputDevice();
 	get_ic()->clear();
 
-	if (window) XDestroyWindow(disp, window);
-	window = 0;
+	if (window != None)
+	{
+		XDestroyWindow(disp, window);
+		window = None;
+	}
+	if (wm_window != None)
+	{
+		XDestroyWindow(disp, wm_window);
+		wm_window = None;
+	}
 	
 	if (disp_ref_count > 0)
 	{
@@ -502,7 +503,7 @@
 		if (disp_ref_count == 0)
 		{
 			XCloseDisplay(disp);
-			disp = 0;
+			disp = NULL;
 		}
 	}
 }
@@ -530,180 +531,234 @@
 	glXSwapBuffers(disp, window);
 }
 
-void CL_DisplayWindow_OpenGL::set_fullscreen(int width, int height, int bpp, int refresh_rate)
+/* qsort comparison function for sorting the modes */
+static int cmpmodes(const void *va, const void *vb)
 {
-	if(fullscreen)
-		return;
-
-	// Vid-mode Switching
-	XF86VidModeModeLine cur_mode;
-
-	XF86VidModeGetModeLine(disp, 0, &dotclock, &cur_mode);
-
-	old_mode.dotclock   = dotclock;
-	old_mode.hdisplay   = cur_mode.hdisplay;
-	old_mode.hsyncstart = cur_mode.hsyncstart;
-	old_mode.hsyncend   = cur_mode.hsyncend;
-	old_mode.htotal     = cur_mode.htotal;
-	old_mode.vdisplay   = cur_mode.vdisplay;
-	old_mode.vsyncstart = cur_mode.vsyncstart;
-	old_mode.vsyncend   = cur_mode.vsyncend;
-	old_mode.vtotal     = cur_mode.vtotal;
-	old_mode.flags      = cur_mode.flags;
-	old_mode.privsize   = 0;
+	const XF86VidModeModeInfo *a = *(const XF86VidModeModeInfo **)va;
+	const XF86VidModeModeInfo *b = *(const XF86VidModeModeInfo **)vb;
+	if ( a->hdisplay == b->hdisplay )
+		return b->vdisplay - a->vdisplay;  
+	else
+		return b->hdisplay - a->hdisplay;
+}
 
-	int num_modes;
+void CL_DisplayWindow_OpenGL::set_resolution(void)
+{
+	int i, dotclock, mode_count, fs_width, fs_height;
 	XF86VidModeModeInfo **modes;
-	XF86VidModeGetAllModeLines(disp, 0, &num_modes, &modes);
+	XF86VidModeModeLine current_mode;
 
-	std::list<XF86VidModeModeInfo *> usable_modes;
-	for(int i = 0; i < num_modes; i++)
-	{
-		if(modes[i]->hdisplay == width && modes[i]->vdisplay == height)
-		{
-			CL_Log::log("debug", "Useable fullscreen mode found: %1x%2", width, height);
-			usable_modes.push_back(modes[i]);
-		}
-	}
-	
-	if (usable_modes.empty())
-	{
-		CL_Log::log("debug", "No useable fullscreen modes available!");
+	current_mode.privsize = 0;
+	XF86VidModeGetModeLine(disp, vi->screen, &dotclock, &current_mode);
+	if (!XF86VidModeGetAllModeLines(disp, 0, &mode_count, &modes))
+		mode_count = 0;
+
+	/* Search for an exact matching video mode.  */
+	for (i = 0; i < mode_count; i++) {
+		if ((modes[i]->hdisplay == width) && 
+		    (modes[i]->vdisplay == height))
+			break;
 	}
-	else 
-	{	
-		if(!width)
-			width = get_width();
-
-		if(!height)
-			height = get_height();
-	
-		if(!bpp)
-			bpp = glx_bpp;
-
-		//Hide Window
-		if (0)
-		{  // FIXME: allow_override doesn't play together with
-			// GrabPointer, not sure what is wrong but it simply doesn't
-			// work.
-			//
-			// The code outside the 'if(0)' as it is now, works mostly,
-			// however it doesn't work when the window or a part of it is
-			// outside of the screen, since the window isn't moved
-			// fullscreen will only show half the window, shouldn't be a
-			// problem for most of the time, but will be tricky if the
-			// window has equal size as the desktop.
 
-			// Move the window into the right position, this must happen
-			// BEFORE we remove control from the window manager
-			XMoveResizeWindow(disp, window, 0, 0, width, height);
-
-			// Move the mouse and switch moves
-			XWarpPointer(disp, None, None, 0, 0, 0, 0, width/2, height/2);
-
-			XUnmapWindow(disp, window);
-			{ // Wait for window to disapear
-				XEvent event;
-				do {
-					XMaskEvent(disp, StructureNotifyMask, &event);
-				} while ( (event.type != UnmapNotify) || (event.xunmap.event != window) );
+	/* Search for a non exact match (smallest bigger res). */
+	if (i == mode_count) {
+		int best_width = 0, best_height = 0;
+		qsort(modes, mode_count, sizeof(void *), cmpmodes);
+		for (i = mode_count-1; i > 0; i--) {
+			if ( ! best_width ) {
+				if ( (modes[i]->hdisplay >= width) &&
+				     (modes[i]->vdisplay >= height) ) {
+					best_width = modes[i]->hdisplay;
+					best_height = modes[i]->vdisplay;
+				}
+			} else {
+				if ( (modes[i]->hdisplay != best_width) ||
+				     (modes[i]->vdisplay != best_height) ) {
+					i++;
+					break;
+				}
 			}
-			// Turn off WM control
-			attributes.override_redirect = True;
-			XChangeWindowAttributes(disp, window, CWBorderPixel | CWColormap | CWOverrideRedirect, &attributes);
-
-			// Re-appear window
-			XMapRaised(disp, window);
 		}
+	}
 
-		// Get input focus
-		//XSetInputFocus(disp,window, RevertToNone, CurrentTime);
-		while (1) 
+	/* Switch video mode */
+	if (i >= 0)
+	{
+		if ((modes[i]->hdisplay != current_mode.hdisplay) ||
+		    (modes[i]->vdisplay != current_mode.vdisplay))
 		{
-			int result = XGrabPointer(disp, window, True, 0, 
-											  GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
-			if ( result == GrabSuccess ) {
-				break;
+			if (old_x == -1 && old_y == -1)
+			{
+				XF86VidModeModeLine *l =
+					(XF86VidModeModeLine *)((char *)
+						&old_mode +
+						sizeof(old_mode.dotclock));
+				*l = current_mode;
+				old_mode.dotclock = dotclock;
+				XF86VidModeGetViewPort(disp, vi->screen,
+					&old_x, &old_y);
 			}
-			CL_System::sleep(100);
+			XF86VidModeSwitchToMode(disp, vi->screen,
+				modes[i]);
 		}
+		fs_width  = modes[i]->hdisplay;
+		fs_height = modes[i]->vdisplay;
+	}
+	else
+	{
+		fs_width  = DisplayWidth(disp, vi->screen);
+		fs_height = DisplayHeight(disp, vi->screen);
+	}
 
-		XF86VidModeGetViewPort(disp, DefaultScreen(disp), &old_x, &old_y);
-
-		XF86VidModeSwitchToMode(disp, 0, *(usable_modes.begin()));
-		Window child_window;
-		int x, y;
-		// Get the windows absolute position (aka relative to
-		// the root window)
-		XTranslateCoordinates(disp, window, DefaultRootWindow(disp), 
-									 0, 0, &x, &y, &child_window);
-	
-		XF86VidModeSetViewPort(disp, DefaultScreen(disp), x, y);
-		
-		XSync(disp, True);
-
-		fullscreen = true;
+	/* center window */
+	XMoveWindow(disp, window, (fs_width - width) / 2,
+		(fs_height - height) / 2);
+
+	/* Lock mode switching.  */
+	XF86VidModeLockModeSwitch(disp, vi->screen, True);
+	       
+	/* Set viewport. */
+	XF86VidModeSetViewPort(disp, vi->screen, 0, 0);
+
+	/* clean up */
+	if (current_mode.privsize)
+	  XFree(current_mode.c_private);
+
+	if (mode_count)
+	{
+	  for (i = 0; i < mode_count; i++)
+	    if (modes[i]->privsize)
+	      XFree(modes[i]->c_private);
+	  XFree(modes);
 	}
 }
 
-void CL_DisplayWindow_OpenGL::set_windowed()
+void CL_DisplayWindow_OpenGL::set_fullscreen(int width, int height, int bpp, int refresh_rate)
 {
-	if(!fullscreen)
+	if(!width)
+		width = this->width;
+	if(!height)
+		height = this->height;
+		
+	set_size(width, height);
+	
+	if(fs_window != None)
+	{
+		set_resolution();
 		return;
+	}
 
-	if (0)
-	{ // FIXME: See FIXME in set_fullscreen
-		// Hide window
-		XUnmapWindow(disp, window);
-		XSync(disp, True);
-
-		// Turn on WM control 
-		attributes.override_redirect = False;
-		XChangeWindowAttributes(disp, window, CWBorderPixel | CWColormap | CWOverrideRedirect, &attributes);
-
-		XMoveResizeWindow(disp, window, 0, 0, fullscreen_width, fullscreen_height);
+	/* Create the fullscreen window */
+	XSetWindowAttributes attributes;
+	XEvent event;
+
+	attributes.override_redirect = True;
+	attributes.background_pixel = XBlackPixel(disp, vi->screen);
+	attributes.border_pixel = XBlackPixel(disp, vi->screen);
+	attributes.event_mask = StructureNotifyMask;
+	attributes.colormap = cmap;
 
-		XMapRaised(disp, window);
-		XSync(disp, True);
+	fs_window = XCreateWindow(disp, RootWindow(disp, vi->screen),
+	                             0, 0,
+	                             DisplayWidth(disp, vi->screen),
+	                             DisplayHeight(disp, vi->screen), 0,
+	                             vi->depth, InputOutput,
+	                             vi->visual, CWOverrideRedirect |
+	                             CWBackPixel | CWColormap | CWBorderPixel |
+	                             CWEventMask, &attributes);
+
+	/* Map the fullscreen window */
+	XMapRaised(disp, fs_window);
+	/* wait until we are mapped. (shamelessly borrowed from SDL) */
+	do {
+	  XMaskEvent(disp, StructureNotifyMask, &event); 
+	} while ( (event.type != MapNotify) || 
+	          (event.xmap.event != fs_window) );
+	/* Make sure we got to the top of the window stack */
+	XRaiseWindow(disp, fs_window);
+	
+	/* Reparent the real window */
+	XReparentWindow(disp, window, fs_window, 0, 0);
+
+	// Get input focus
+	//XSetInputFocus(disp,window, RevertToNone, CurrentTime);
+	while (1) 
+	{
+		int result = XGrabPointer(disp, window, True, 0, 
+										  GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
+		if ( result == GrabSuccess ) {
+			break;
+		}
+		CL_System::sleep(100);
 	}
 
-	fullscreen = false;
+	set_resolution();
+}
+
+void CL_DisplayWindow_OpenGL::set_windowed()
+{
+	if(fs_window == None)
+		return;
 
 	// Only restore mode if we ever switched mode.
 	if (old_x != -1 || old_y != -1)
 	{
-		XF86VidModeSwitchToMode(disp, 0, &old_mode);
-		XF86VidModeSetViewPort(disp, 0, old_x, old_y);
+		XF86VidModeSwitchToMode(disp, vi->screen, &old_mode);
+		XF86VidModeSetViewPort(disp, vi->screen, old_x, old_y);
+		old_x = old_y = -1;
 	}
 
 	XUngrabPointer(disp, CurrentTime);
 
-	XSync(disp, True);
+	/* Reparent the real window! */
+	XReparentWindow(disp, window, wm_window, 0, 0);
+	XUnmapWindow(disp, fs_window);
+	XDestroyWindow(disp, fs_window);
+	fs_window = None;
 }
 
 void CL_DisplayWindow_OpenGL::set_title(const std::string &title)
 {
-	XSetStandardProperties(disp, window, title.c_str(), title.c_str(), None, NULL, 0, NULL);
+	XSetStandardProperties(disp, wm_window, title.c_str(), title.c_str(), None, NULL, 0, NULL);
 }
 
 void CL_DisplayWindow_OpenGL::set_position(const CL_Rect &pos)
 {
 	set_position(pos.left, pos.top);
-	XResizeWindow(disp, window, pos.get_width(), pos.get_height());
 	set_size(pos.get_width(), pos.get_height());
 }
 
 void CL_DisplayWindow_OpenGL::set_position(int x, int y)
 {
-	XMoveWindow(disp, window, x, y);
+	XMoveWindow(disp, wm_window, x, y);
 }
 
 void CL_DisplayWindow_OpenGL::set_size(int width, int height)
 {
-	fullscreen_width = width;
-	fullscreen_height = height;
+	if((width == this->width) && (height == this->height))
+		return;
 
-	sig_resize(width, height);
+	// in order to resize a non resizable window we must change the hints
+	// as the window manager won't allow the resize otherwise.
+	if (!allow_resize)
+	{
+		XSizeHints size_hints;
+		memset(&size_hints, 0, sizeof(XSizeHints));
+		size_hints.width       = width;
+		size_hints.height      = height;
+		size_hints.base_width  = width;
+		size_hints.base_height = height;
+		size_hints.min_width   = width;
+		size_hints.min_height  = height;
+		size_hints.max_width   = width;
+		size_hints.max_height  = height;
+		size_hints.flags       = PSize|PBaseSize|PMinSize|PMaxSize;
+		XSetWMNormalHints(disp, wm_window, &size_hints);
+	}
+	XResizeWindow(disp, wm_window, width, height);
+	XResizeWindow(disp, window, width, height);
+	this->width  = width;
+	this->height = height;
 }
 
 void CL_DisplayWindow_OpenGL::set_buffer_count(int flipping_buffers)
@@ -772,7 +827,16 @@
 				#ifdef DEBUG
 					CL_Log::log("debug", "ConfigureNotify Event received");
 				#endif
-				set_size(event.xconfigure.width,event.xconfigure.height);
+				if (event.xconfigure.window == wm_window &&
+				    (event.xconfigure.width  != width ||
+				     event.xconfigure.height != height))
+				{
+					width  = event.xconfigure.width;
+					height = event.xconfigure.height;
+					XResizeWindow(disp, window, width,
+						 height);
+					sig_resize(event.xconfigure.width, event.xconfigure.height);
+				}
 				break;
 			case ClientMessage:
 				#ifdef DEBUG



Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/FC-5/ClanLib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClanLib.spec	26 Jul 2006 11:24:34 -0000	1.6
+++ ClanLib.spec	9 Oct 2006 11:49:54 -0000	1.7
@@ -3,13 +3,14 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
 Version:        0.8.0
-Release:        0.6.%{pre_version}%{?dist}
+Release:        0.7.%{pre_version}%{?dist}
 Group:          System Environment/Libraries
 License:        zlib License
 URL:            http://www.clanlib.org/
 Source0:        http://www.clanlib.org/download/releases-0.8/%{name}-%{version}-%{pre_version}.tgz
 Patch0:         ClanLib-0.8.0-gcc41.patch
 Patch1:         ClanLib-0.8.0-grave_key.patch
+Patch2:         ClanLib-0.8.0-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
@@ -36,6 +37,7 @@
 %setup -q -n %{name}-%{version}-%{pre_version}
 %patch0 -p1 -z .gcc41
 %patch1 -p1 -z .grave
+%patch2 -p1 -z .fs 
 # fixup pc files
 sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in
 sed -i 's|Libs:   -L${libdir}|Libs:   -L${libdir}/%{name}-0.8|' \
@@ -86,6 +88,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.7.RC2
+- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
+  window decoration is shown in fullscreen mode on certain videocards
+
 * Wed Jul 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.6.RC2
 - Add missing Requires: pkgconfig to -devel package
 



From fedora-extras-commits at redhat.com  Mon Oct  9 12:21:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon,  9 Oct 2006 05:21:28 -0700
Subject: rpms/jd/devel .cvsignore,1.4,1.5 jd.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <200610091221.k99CLUE7031863@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31842

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
- 1.8.0 beta a061009



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2006 14:43:24 -0000	1.4
+++ .cvsignore	9 Oct 2006 12:21:27 -0000	1.5
@@ -1 +1 @@
-jd-1.7.0-060927.tgz
+jd-1.8.0-beta061009.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jd.spec	7 Oct 2006 05:25:22 -0000	1.4
+++ jd.spec	9 Oct 2006 12:21:27 -0000	1.5
@@ -8,21 +8,21 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      1.7.0
-%define         strtag        060927
-%define         repoid        21934
+%define         main_ver      1.8.0
+%define         strtag        beta061009
+%define         repoid        22118
 
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    1
 %define         vendor        fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
 
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 
 %if %{pre_release}
 %define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
@@ -100,6 +100,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
+- 1.8.0 beta a061009
+
 * Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
 - Add libSM-devel to BuildRequires.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2006 14:43:24 -0000	1.4
+++ sources	9 Oct 2006 12:21:27 -0000	1.5
@@ -1 +1 @@
-ef051b189a3fa482e6527552e13b084c  jd-1.7.0-060927.tgz
+b71195e64e520b745885120b2d77c5c2  jd-1.8.0-beta061009.tgz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:07:35 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon,  9 Oct 2006 06:07:35 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.3,1.4 jd.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200610091307.k99D7bZL002778@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2757

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
- 1.8.0 beta a061009



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Sep 2006 14:44:48 -0000	1.3
+++ .cvsignore	9 Oct 2006 13:07:35 -0000	1.4
@@ -1 +1 @@
-jd-1.7.0-060927.tgz
+jd-1.8.0-beta061009.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jd.spec	7 Oct 2006 05:26:11 -0000	1.3
+++ jd.spec	9 Oct 2006 13:07:35 -0000	1.4
@@ -8,21 +8,21 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      1.7.0
-%define         strtag        060927
-%define         repoid        21934
+%define         main_ver      1.8.0
+%define         strtag        beta061009
+%define         repoid        22118
 
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    1
 %define         vendor        fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
 
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 
 %if %{pre_release}
 %define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
@@ -100,6 +100,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
+- 1.8.0 beta a061009
+
 * Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
 - Add libSM-devel to BuildRequires.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Sep 2006 14:44:48 -0000	1.3
+++ sources	9 Oct 2006 13:07:35 -0000	1.4
@@ -1 +1 @@
-ef051b189a3fa482e6527552e13b084c  jd-1.7.0-060927.tgz
+b71195e64e520b745885120b2d77c5c2  jd-1.8.0-beta061009.tgz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:16:53 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 06:16:53 -0700
Subject: rpms/ortp/devel .cvsignore, 1.4, 1.5 ortp.spec, 1.9, 1.10 sources,
	1.4, 1.5 ortp-0.8.1-Werror.patch, 1.1, NONE
Message-ID: <200610091316.k99DGt2v002882@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2860

Modified Files:
	.cvsignore ortp.spec sources 
Removed Files:
	ortp-0.8.1-Werror.patch 
Log Message:
Update to 0.11.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2006 07:32:41 -0000	1.4
+++ .cvsignore	9 Oct 2006 13:16:53 -0000	1.5
@@ -1 +1 @@
-ortp-0.8.1.tar.gz
+ortp-0.11.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ortp.spec	30 Aug 2006 14:46:53 -0000	1.9
+++ ortp.spec	9 Oct 2006 13:16:53 -0000	1.10
@@ -1,18 +1,14 @@
 Name:           ortp
-Version:        0.8.1
-Release:        3%{?dist}
+Version:        0.11.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://www.linphone.org/ortp/
-Source0:        http://www.linphone.org/ortp/sources/%{name}-%{version}.tar.gz
-Patch0:         ortp-0.8.1-Werror.patch
+URL:            http://www.linphone.org/index.php/v2/code_review/ortp
+Source0:        http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glib2-devel >= 2.0.0
-#Requires:       
-
 %description
 oRTP is a C library that implements RTP (RFC3550).
 
@@ -26,7 +22,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .Werror
 
 %build
 %configure --disable-static
@@ -53,6 +48,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.0-1
+- Update to 0.11.0
+- Remove ortp-0.8.1-Werror.patch
+
 * Wed Aug 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8.1-3
 - Bump release and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jan 2006 07:32:41 -0000	1.4
+++ sources	9 Oct 2006 13:16:53 -0000	1.5
@@ -1 +1 @@
-5d8a8da638aec3a80214d64e0c7929af  ortp-0.8.1.tar.gz
+c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz


--- ortp-0.8.1-Werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 13:27:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  9 Oct 2006 06:27:50 -0700
Subject: rpms/gtkwave/devel .cvsignore, 1.22, 1.23 gtkwave.spec, 1.24,
	1.25 sources, 1.22, 1.23
Message-ID: <200610091327.k99DRqAJ002981@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2960

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Sep 2006 13:48:49 -0000	1.22
+++ .cvsignore	9 Oct 2006 13:27:49 -0000	1.23
@@ -1 +1 @@
-gtkwave-3.0.12.tar.gz
+gtkwave-3.0.13.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtkwave.spec	3 Oct 2006 09:37:17 -0000	1.24
+++ gtkwave.spec	9 Oct 2006 13:27:49 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.12
-Release:		2%{?dist}
+Version:		3.0.13
+Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
 URL:			http://home.nc.rr.com/gtkwave/
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
+- update to 3.0.13
+
 * Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 3.0.12-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Sep 2006 13:48:49 -0000	1.22
+++ sources	9 Oct 2006 13:27:49 -0000	1.23
@@ -1 +1 @@
-6508795d132dd7efa8a720fd30d86659  gtkwave-3.0.12.tar.gz
+e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:29:00 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  9 Oct 2006 06:29:00 -0700
Subject: rpms/gtkwave/FC-5 .cvsignore, 1.22, 1.23 gtkwave.spec, 1.22,
	1.23 sources, 1.22, 1.23
Message-ID: <200610091329.k99DT2Ex003046@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3025

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Sep 2006 14:12:50 -0000	1.22
+++ .cvsignore	9 Oct 2006 13:29:00 -0000	1.23
@@ -1 +1 @@
-gtkwave-3.0.12.tar.gz
+gtkwave-3.0.13.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtkwave.spec	22 Sep 2006 14:12:50 -0000	1.22
+++ gtkwave.spec	9 Oct 2006 13:29:00 -0000	1.23
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.12
+Version:		3.0.13
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,12 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
+- update to 3.0.13
+
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 3.0.12-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 3.0.12-1
 - update to 3.0.12
 - create dummy libz/libbz2 Makefile.in files to ensure that config.h gets


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Sep 2006 14:12:50 -0000	1.22
+++ sources	9 Oct 2006 13:29:00 -0000	1.23
@@ -1 +1 @@
-6508795d132dd7efa8a720fd30d86659  gtkwave-3.0.12.tar.gz
+e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:29:40 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  9 Oct 2006 06:29:40 -0700
Subject: rpms/gtkwave/FC-4 .cvsignore, 1.22, 1.23 gtkwave.spec, 1.21,
	1.22 sources, 1.22, 1.23
Message-ID: <200610091329.k99DTg0E003111@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3090

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Sep 2006 14:13:29 -0000	1.22
+++ .cvsignore	9 Oct 2006 13:29:40 -0000	1.23
@@ -1 +1 @@
-gtkwave-3.0.12.tar.gz
+gtkwave-3.0.13.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtkwave.spec	22 Sep 2006 14:13:29 -0000	1.21
+++ gtkwave.spec	9 Oct 2006 13:29:40 -0000	1.22
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.12
+Version:		3.0.13
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,12 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
+- update to 3.0.13
+
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 3.0.12-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 3.0.12-1
 - update to 3.0.12
 - create dummy libz/libbz2 Makefile.in files to ensure that config.h gets


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Sep 2006 14:13:29 -0000	1.22
+++ sources	9 Oct 2006 13:29:40 -0000	1.23
@@ -1 +1 @@
-6508795d132dd7efa8a720fd30d86659  gtkwave-3.0.12.tar.gz
+e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:46:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  9 Oct 2006 06:46:34 -0700
Subject: rpms/wxMaxima/devel wxMaxima-0.7.0a-mp.patch, NONE,
	1.1 wxMaxima.spec, 1.4, 1.5
Message-ID: <200610091346.k99DkaL2003244@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3224

Modified Files:
	wxMaxima.spec 
Added Files:
	wxMaxima-0.7.0a-mp.patch 
Log Message:
* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-2
- patch for proper maxima= entry in ~/.wxMaxima (#209992)


wxMaxima-0.7.0a-mp.patch:

--- NEW FILE wxMaxima-0.7.0a-mp.patch ---
--- wxMaxima-0.7.0a/src/wxMaxima.cpp.mp	2006-09-21 09:23:22.000000000 -0500
+++ wxMaxima-0.7.0a/src/wxMaxima.cpp	2006-10-09 08:35:10.000000000 -0500
@@ -1025,7 +1025,7 @@
   if (!have_config)
   {
     command = wxT("maxima");
-    config->Write(wxT("maxima"), &command);
+    config->Write(wxT("maxima"), command);
   }
 
   config->Read(wxT("parameters"), &parameters);


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wxMaxima.spec	4 Oct 2006 19:22:26 -0000	1.4
+++ wxMaxima.spec	9 Oct 2006 13:46:34 -0000	1.5
@@ -1,17 +1,16 @@
 
-# Fedora review
-# http://bugzilla.redhat.com/204832
-
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: wxMaxima-0.7.0a-mp.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
 BuildRequires: libxml2-devel
@@ -21,12 +20,14 @@
 Requires: maxima >= 5.10
 
 %description
-A Graphical user interface for the computer algebra system
+A Graphical user interface for the the computer algebra system
 Maxima using wxWidgets.
 
 %prep
 %setup -q
 
+%patch1 -p1 -b .mp
+
 sed -i -e "s|^Icon=.*|Icon=wxmaxima|" wxmaxima.desktop
 
 
@@ -88,15 +89,11 @@
 
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-- respin
+* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-2
+- patch for proper maxima= entry in ~/.wxMaxima (#209992)
 
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a
-- Requires: maxima >= 5.10
-
-* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-3
-- fix %%description typo
 
 * Tue Sep 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-2
 - update %%description, %%summary



From fedora-extras-commits at redhat.com  Mon Oct  9 13:47:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  9 Oct 2006 06:47:11 -0700
Subject: rpms/wxMaxima/FC-5 wxMaxima-0.7.0a-mp.patch, NONE, 1.1 wxMaxima.spec,
	1.3, 1.4
Message-ID: <200610091347.k99DlDDX003313@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3293

Modified Files:
	wxMaxima.spec 
Added Files:
	wxMaxima-0.7.0a-mp.patch 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- respin


wxMaxima-0.7.0a-mp.patch:

--- NEW FILE wxMaxima-0.7.0a-mp.patch ---
--- wxMaxima-0.7.0a/src/wxMaxima.cpp.mp	2006-09-21 09:23:22.000000000 -0500
+++ wxMaxima-0.7.0a/src/wxMaxima.cpp	2006-10-09 08:35:10.000000000 -0500
@@ -1025,7 +1025,7 @@
   if (!have_config)
   {
     command = wxT("maxima");
-    config->Write(wxT("maxima"), &command);
+    config->Write(wxT("maxima"), command);
   }
 
   config->Read(wxT("parameters"), &parameters);


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/FC-5/wxMaxima.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wxMaxima.spec	26 Sep 2006 14:09:29 -0000	1.3
+++ wxMaxima.spec	9 Oct 2006 13:47:11 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a
 - Requires: maxima >= 5.10



From fedora-extras-commits at redhat.com  Mon Oct  9 14:02:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  9 Oct 2006 07:02:24 -0700
Subject: rpms/wxMaxima/devel wxMaxima.spec,1.5,1.6
Message-ID: <200610091402.k99E2Qic006450@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6433

Modified Files:
	wxMaxima.spec 
Log Message:
* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
- (re)fix typo in %description



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wxMaxima.spec	9 Oct 2006 13:46:34 -0000	1.5
+++ wxMaxima.spec	9 Oct 2006 14:02:24 -0000	1.6
@@ -1,8 +1,11 @@
 
+# Fedora review
+# http://bugzilla.redhat.com/204832
+
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -20,7 +23,7 @@
 Requires: maxima >= 5.10
 
 %description
-A Graphical user interface for the the computer algebra system
+A Graphical user interface for the computer algebra system
 Maxima using wxWidgets.
 
 %prep
@@ -89,11 +92,18 @@
 
 
 %changelog
+* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
+- (re)fix typo in %%description
+
 * Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-2
 - patch for proper maxima= entry in ~/.wxMaxima (#209992)
 
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a
+- Requires: maxima >= 5.10
+
+* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-3
+- fix %%description typo
 
 * Tue Sep 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-2
 - update %%description, %%summary



From fedora-extras-commits at redhat.com  Mon Oct  9 14:02:50 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  9 Oct 2006 07:02:50 -0700
Subject: rpms/wxMaxima/FC-5 wxMaxima.spec,1.4,1.5
Message-ID: <200610091403.k99E3OfC006515@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6498

Modified Files:
	wxMaxima.spec 
Log Message:
* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
- (re)fix typo in %description



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/FC-5/wxMaxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wxMaxima.spec	9 Oct 2006 13:47:11 -0000	1.4
+++ wxMaxima.spec	9 Oct 2006 14:02:50 -0000	1.5
@@ -5,13 +5,15 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 1%{?dist}.1
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: wxMaxima-0.7.0a-mp.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
 BuildRequires: libxml2-devel
@@ -27,6 +29,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .mp
+
 sed -i -e "s|^Icon=.*|Icon=wxmaxima|" wxmaxima.desktop
 
 
@@ -88,8 +92,11 @@
 
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-- respin
+* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
+- (re)fix typo in %%description
+
+* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-2
+- patch for proper maxima= entry in ~/.wxMaxima (#209992)
 
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a



From fedora-extras-commits at redhat.com  Mon Oct  9 14:07:19 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 07:07:19 -0700
Subject: rpms/ortp/FC-5 .cvsignore, 1.4, 1.5 ortp.spec, 1.8, 1.9 sources, 1.4,
	1.5 ortp-0.8.1-Werror.patch, 1.1, NONE
Message-ID: <200610091407.k99E7Loo006698@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6677

Modified Files:
	.cvsignore ortp.spec sources 
Removed Files:
	ortp-0.8.1-Werror.patch 
Log Message:
Update to 0.11.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2006 07:32:41 -0000	1.4
+++ .cvsignore	9 Oct 2006 14:07:19 -0000	1.5
@@ -1 +1 @@
-ortp-0.8.1.tar.gz
+ortp-0.11.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/ortp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ortp.spec	14 Feb 2006 05:02:43 -0000	1.8
+++ ortp.spec	9 Oct 2006 14:07:19 -0000	1.9
@@ -1,18 +1,14 @@
 Name:           ortp
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.11.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://www.linphone.org/ortp/
-Source0:        http://www.linphone.org/ortp/sources/%{name}-%{version}.tar.gz
-Patch0:         ortp-0.8.1-Werror.patch
+URL:            http://www.linphone.org/index.php/v2/code_review/ortp
+Source0:        http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glib2-devel >= 2.0.0
-#Requires:       
-
 %description
 oRTP is a C library that implements RTP (RFC3550).
 
@@ -26,7 +22,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .Werror
 
 %build
 %configure --disable-static
@@ -53,6 +48,13 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.0-1
+- Update to 0.11.0
+- Remove ortp-0.8.1-Werror.patch
+
+* Wed Aug 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8.1-3
+- Bump release and rebuild
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.1-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jan 2006 07:32:41 -0000	1.4
+++ sources	9 Oct 2006 14:07:19 -0000	1.5
@@ -1 +1 @@
-5d8a8da638aec3a80214d64e0c7929af  ortp-0.8.1.tar.gz
+c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz


--- ortp-0.8.1-Werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 14:33:46 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 07:33:46 -0700
Subject: rpms/ortp/devel ortp-0.11.0-Werror.patch, NONE, 1.1 ortp.spec, 1.10,
	1.11
Message-ID: <200610091433.k99EXmxY006929@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6909

Modified Files:
	ortp.spec 
Added Files:
	ortp-0.11.0-Werror.patch 
Log Message:
Adding -Werror patch back

ortp-0.11.0-Werror.patch:

--- NEW FILE ortp-0.11.0-Werror.patch ---
--- configure.orig	2006-10-09 09:20:54.000000000 -0500
+++ configure	2006-10-09 09:21:27.000000000 -0500
@@ -21285,10 +21285,6 @@
 _ACEOF
 
 
-if test $GCC = yes && test $wall_werror = yes;  then
-	CFLAGS="$CFLAGS -Werror "
-fi
-
 ORTPDEPS_LIBS="$ORTPDEPS_LIBS $PTHREAD_LIBS $PTHREAD_LDFLAGS"
 ORTPDEPS_CFLAGS="$ORTPDEPS_CFLAGS $PTHREAD_CFLAGS $ORTP_DEFS"
 CFLAGS="$CFLAGS $ORTP_DEFS"


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ortp.spec	9 Oct 2006 13:16:53 -0000	1.10
+++ ortp.spec	9 Oct 2006 14:33:45 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           ortp
 Version:        0.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.linphone.org/index.php/v2/code_review/ortp
 Source0:        http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-%{version}.tar.gz
+Patch0:		ortp-0.11.0-Werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-static
@@ -48,6 +50,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.11.0
+- Bring back -Werror patch (needed for building on PPC)
+
 * Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.0-1
 - Update to 0.11.0
 - Remove ortp-0.8.1-Werror.patch



From fedora-extras-commits at redhat.com  Mon Oct  9 14:50:27 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 07:50:27 -0700
Subject: rpms/gcdmaster/devel .cvsignore, 1.2, 1.3 gcdmaster.spec, 1.5,
	1.6 sources, 1.2, 1.3 gcdmaster-1.2.1-qualification.patch, 1.1, NONE
Message-ID: <200610091450.k99EoT1Q007267@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7246

Modified Files:
	.cvsignore gcdmaster.spec sources 
Removed Files:
	gcdmaster-1.2.1-qualification.patch 
Log Message:
- Update to 1.2.2, g++4 patch integrated upstream
- Removed makeinstall macro
- Added mime types to desktop file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2005 20:12:52 -0000	1.2
+++ .cvsignore	9 Oct 2006 14:50:27 -0000	1.3
@@ -1 +1 @@
-cdrdao-1.2.1.tar.bz2
+cdrdao-1.2.2.tar.bz2


Index: gcdmaster.spec
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/gcdmaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcdmaster.spec	28 Aug 2006 15:08:16 -0000	1.5
+++ gcdmaster.spec	9 Oct 2006 14:50:27 -0000	1.6
@@ -1,17 +1,16 @@
-Name:		gcdmaster
-Version:	1.2.1
-Release:        7%{?dist}
-Summary:	A Gnome2 Disk-At-Once (DAO) Audio CD writer
+Name:           gcdmaster
+Version:        1.2.2
+Release:        1%{?dist}
+Summary:        A Gnome2 Disk-At-Once (DAO) Audio CD writer
 
-Group:		Applications/Multimedia
-License:	GPL
+Group:          Applications/Multimedia
+License:        GPL
 URL:            http://cdrdao.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
-Patch0:         gcdmaster-1.2.1-qualification.patch
+Source0:        http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
 Requires:       cdrdao
-BuildRequires:	gtkmm24-devel
-BuildRequires:	libgnomeuimm26-devel
+BuildRequires:  gtkmm24-devel
+BuildRequires:  libgnomeuimm26-devel
 BuildRequires:  libsigc++20-devel
 BuildRequires:  libvorbis-devel >= 1.0
 BuildRequires:  desktop-file-utils
@@ -29,7 +28,7 @@
 
 %prep
 %setup -q -n cdrdao-%{version}
-%patch0 -p1 -b .qualification
+
 
 %build
 %configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support}
@@ -38,7 +37,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/cdrdao
 rm -f $RPM_BUILD_ROOT%{_bindir}/*toc*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrdao*
@@ -46,6 +45,10 @@
 rm -fr $RPM_BUILD_ROOT%{_datadir}/cdrdao 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+cat << EOF >> ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;
+EOF
+
 desktop-file-install \
   --vendor fedora \
   --mode 644 \
@@ -82,6 +85,11 @@
 %{_mandir}/man1/gcdmaster*
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.2-1
+- Update to 1.2.2, g++4 patch integrated upstream
+- Removed makeinstall macro
+- Added mime types to desktop file
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 1.2.1-7
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2005 20:12:52 -0000	1.2
+++ sources	9 Oct 2006 14:50:27 -0000	1.3
@@ -1 +1 @@
-f93f3e68ec5b53ec1a776df73a1def60  cdrdao-1.2.1.tar.bz2
+f0cbf36907406cb4f4c568f9e6669a34  cdrdao-1.2.2.tar.bz2


--- gcdmaster-1.2.1-qualification.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 14:52:53 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 07:52:53 -0700
Subject: rpms/ortp/FC-5 ortp-0.11.0-Werror.patch, NONE, 1.1 ortp.spec, 1.9,
	1.10
Message-ID: <200610091452.k99Eqthk007346@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326

Modified Files:
	ortp.spec 
Added Files:
	ortp-0.11.0-Werror.patch 
Log Message:
Add -Werror patch back

ortp-0.11.0-Werror.patch:

--- NEW FILE ortp-0.11.0-Werror.patch ---
--- configure.orig	2006-10-09 09:20:54.000000000 -0500
+++ configure	2006-10-09 09:21:27.000000000 -0500
@@ -21285,10 +21285,6 @@
 _ACEOF
 
 
-if test $GCC = yes && test $wall_werror = yes;  then
-	CFLAGS="$CFLAGS -Werror "
-fi
-
 ORTPDEPS_LIBS="$ORTPDEPS_LIBS $PTHREAD_LIBS $PTHREAD_LDFLAGS"
 ORTPDEPS_CFLAGS="$ORTPDEPS_CFLAGS $PTHREAD_CFLAGS $ORTP_DEFS"
 CFLAGS="$CFLAGS $ORTP_DEFS"


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/ortp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ortp.spec	9 Oct 2006 14:07:19 -0000	1.9
+++ ortp.spec	9 Oct 2006 14:52:52 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           ortp
 Version:        0.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.linphone.org/index.php/v2/code_review/ortp
 Source0:        http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-%{version}.tar.gz
+Patch0:		ortp-0.11.0-Werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-static
@@ -48,6 +50,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.11.0
+- Bring back -Werror patch (needed for building on PPC)
+
 * Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.0-1
 - Update to 0.11.0
 - Remove ortp-0.8.1-Werror.patch



From fedora-extras-commits at redhat.com  Mon Oct  9 15:06:03 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 08:06:03 -0700
Subject: rpms/gcdmaster/FC-5 .cvsignore, 1.2, 1.3 gcdmaster.spec, 1.3,
	1.4 sources, 1.2, 1.3 gcdmaster-1.2.1-qualification.patch, 1.1, NONE
Message-ID: <200610091506.k99F65Jf010396@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10373

Modified Files:
	.cvsignore gcdmaster.spec sources 
Removed Files:
	gcdmaster-1.2.1-qualification.patch 
Log Message:
- Update to 1.2.2
- g++4 patch removed, integrated upstream
- Added mime types to desktop file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2005 20:12:52 -0000	1.2
+++ .cvsignore	9 Oct 2006 15:06:03 -0000	1.3
@@ -1 +1 @@
-cdrdao-1.2.1.tar.bz2
+cdrdao-1.2.2.tar.bz2


Index: gcdmaster.spec
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/FC-5/gcdmaster.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcdmaster.spec	9 Aug 2006 06:29:32 -0000	1.3
+++ gcdmaster.spec	9 Oct 2006 15:06:03 -0000	1.4
@@ -1,17 +1,16 @@
-Name:		gcdmaster
-Version:	1.2.1
-Release:        5%{?dist}
-Summary:	A Gnome2 Disk-At-Once (DAO) Audio CD writer
+Name:           gcdmaster
+Version:        1.2.2
+Release:        1%{?dist}
+Summary:        A Gnome2 Disk-At-Once (DAO) Audio CD writer
 
-Group:		Applications/Multimedia
-License:	GPL
+Group:          Applications/Multimedia
+License:        GPL
 URL:            http://cdrdao.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
-Patch0:         gcdmaster-1.2.1-qualification.patch
+Source0:        http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
 Requires:       cdrdao
-BuildRequires:	gtkmm24-devel
-BuildRequires:	libgnomeuimm26-devel
+BuildRequires:  gtkmm24-devel
+BuildRequires:  libgnomeuimm26-devel
 BuildRequires:  libsigc++20-devel
 BuildRequires:  libvorbis-devel >= 1.0
 BuildRequires:  desktop-file-utils
@@ -29,7 +28,7 @@
 
 %prep
 %setup -q -n cdrdao-%{version}
-%patch0 -p1 -b .qualification
+
 
 %build
 %configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support}
@@ -38,7 +37,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/cdrdao
 rm -f $RPM_BUILD_ROOT%{_bindir}/*toc*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrdao*
@@ -46,6 +45,10 @@
 rm -fr $RPM_BUILD_ROOT%{_datadir}/cdrdao 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+cat << EOF >> ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;
+EOF
+
 desktop-file-install \
   --vendor fedora \
   --mode 644 \
@@ -82,6 +85,11 @@
 %{_mandir}/man1/gcdmaster*
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.2-1
+- Update to 1.2.2
+- g++4 patch removed, integrated upstream
+- Added mime types to desktop file
+
 * Wed Aug  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.1-5
 - Bumping up release to fix upgrade path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2005 20:12:52 -0000	1.2
+++ sources	9 Oct 2006 15:06:03 -0000	1.3
@@ -1 +1 @@
-f93f3e68ec5b53ec1a776df73a1def60  cdrdao-1.2.1.tar.bz2
+f0cbf36907406cb4f4c568f9e6669a34  cdrdao-1.2.2.tar.bz2


--- gcdmaster-1.2.1-qualification.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 15:34:12 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  9 Oct 2006 08:34:12 -0700
Subject: owners owners.list,1.1803,1.1804
Message-ID: <200610091534.k99FYEEI010870@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10853

Modified Files:
	owners.list 
Log Message:

Unorphaning putty



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1803
retrieving revision 1.1804
diff -u -r1.1803 -r1.1804
--- owners.list	9 Oct 2006 11:18:54 -0000	1.1803
+++ owners.list	9 Oct 2006 15:34:11 -0000	1.1804
@@ -1794,7 +1794,7 @@
 Fedora Extras|pulseaudio|Improved Linux sound server|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|puppet|A configuration management tool|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pure-ftpd|Lightweight, fast and secure FTP server|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|jima at beer.tclug.org|extras-qa at fedoraproject.org|
 Fedora Extras|pwgen|Automatic password generation|jbowes at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pybliographer|A framework for working with bibliographic databases|z.kota at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 16:01:26 2006
From: fedora-extras-commits at redhat.com (Kushal Das (kushal))
Date: Mon,  9 Oct 2006 09:01:26 -0700
Subject: owners owners.list,1.1804,1.1805
Message-ID: <200610091601.k99G1Sjv013910@cvs-int.fedora.redhat.com>

Author: kushal

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11063

Modified Files:
	owners.list 
Log Message:
update owner's name for prozilla




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1804
retrieving revision 1.1805
diff -u -r1.1804 -r1.1805
--- owners.list	9 Oct 2006 15:34:11 -0000	1.1804
+++ owners.list	9 Oct 2006 16:01:25 -0000	1.1805
@@ -1786,7 +1786,7 @@
 Fedora Extras|prboom|GPL Doom game engine|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|prozilla|An advanced Linux download manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|prozilla|An advanced Linux download manager|kushaldas at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pstoedit|Translates PostScript into other vector formats|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 16:21:19 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  9 Oct 2006 09:21:19 -0700
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.6,1.7
Message-ID: <200610091621.k99GLLBN014140@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14107

Modified Files:
	qcomicbook.spec 
Log Message:
Update to build in FC6



Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qcomicbook.spec	2 Oct 2006 22:54:46 -0000	1.6
+++ qcomicbook.spec	9 Oct 2006 16:21:19 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -60,7 +60,7 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-3
+* Mon Oct 09 2006 Scott Baker <scott at perturb.org> - 0.3.3-4
 - Build on FC6
 
 * Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-2



From fedora-extras-commits at redhat.com  Mon Oct  9 16:29:41 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  9 Oct 2006 09:29:41 -0700
Subject: rpms/qcomicbook/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610091629.k99GThNj014221@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14202

Modified Files:
	.cvsignore sources 
Log Message:
Add the new .tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2006 17:57:06 -0000	1.2
+++ .cvsignore	9 Oct 2006 16:29:41 -0000	1.3
@@ -1 +1 @@
-qcomicbook-0.3.2.tar.gz
+qcomicbook-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2006 17:57:06 -0000	1.2
+++ sources	9 Oct 2006 16:29:41 -0000	1.3
@@ -1 +1 @@
-ab191878d0694c77c4e5dd1d22f3d14c  qcomicbook-0.3.2.tar.gz
+a52b768ccca632a820094739e6aaec36  qcomicbook-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 16:43:27 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  9 Oct 2006 09:43:27 -0700
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.7,1.8
Message-ID: <200610091643.k99GhTKW014365@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14348

Modified Files:
	qcomicbook.spec 
Log Message:
Foo



Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qcomicbook.spec	9 Oct 2006 16:21:19 -0000	1.7
+++ qcomicbook.spec	9 Oct 2006 16:43:27 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -60,7 +60,7 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Mon Oct 09 2006 Scott Baker <scott at perturb.org> - 0.3.3-4
+* Mon Oct 09 2006 Scott Baker <scott at perturb.org> - 0.3.3-5
 - Build on FC6
 
 * Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-2



From fedora-extras-commits at redhat.com  Mon Oct  9 16:47:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon,  9 Oct 2006 09:47:43 -0700
Subject: rpms/apcupsd/devel apcupsd-httpd.conf, 1.1, 1.2 apcupsd.spec, 1.10,
	1.11
Message-ID: <200610091647.k99Gljcl014479@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420/devel

Modified Files:
	apcupsd-httpd.conf apcupsd.spec 
Log Message:
- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
  Patch from Clive Messer (clive at vacuumtube.org.uk)



Index: apcupsd-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-httpd.conf	4 Nov 2005 23:42:56 -0000	1.1
+++ apcupsd-httpd.conf	9 Oct 2006 16:47:43 -0000	1.2
@@ -10,10 +10,10 @@
 # Change the ".example.com" to match your domain or modify
 # access rights to your needs to enable remote access also.
 #
-<Directory "/var/www/apcupsd/">
+<Directory "/var/www/apcupsd">
     DirectoryIndex upsstats.cgi
     AllowOverride None
-    Options ExecCGI
+    Options ExecCGI Indexes
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apcupsd.spec	30 Aug 2006 02:23:37 -0000	1.10
+++ apcupsd.spec	9 Oct 2006 16:47:43 -0000	1.11
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.12.4
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -143,6 +143,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-3
+- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
+  Patch from Clive Messer (clive at vacuumtube.org.uk)
+
 * Tue Aug 29 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-2
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Mon Oct  9 16:47:42 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon,  9 Oct 2006 09:47:42 -0700
Subject: rpms/apcupsd/FC-5 apcupsd-httpd.conf,1.1,1.2 apcupsd.spec,1.9,1.10
Message-ID: <200610091647.k99GliqT014474@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420/FC-5

Modified Files:
	apcupsd-httpd.conf apcupsd.spec 
Log Message:
- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
  Patch from Clive Messer (clive at vacuumtube.org.uk)



Index: apcupsd-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-5/apcupsd-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-httpd.conf	4 Nov 2005 23:42:56 -0000	1.1
+++ apcupsd-httpd.conf	9 Oct 2006 16:47:42 -0000	1.2
@@ -10,10 +10,10 @@
 # Change the ".example.com" to match your domain or modify
 # access rights to your needs to enable remote access also.
 #
-<Directory "/var/www/apcupsd/">
+<Directory "/var/www/apcupsd">
     DirectoryIndex upsstats.cgi
     AllowOverride None
-    Options ExecCGI
+    Options ExecCGI Indexes
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-5/apcupsd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apcupsd.spec	21 Aug 2006 16:43:00 -0000	1.9
+++ apcupsd.spec	9 Oct 2006 16:47:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.12.4
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -143,6 +143,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-2
+- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
+  Patch from Clive Messer (clive at vacuumtube.org.uk)  
+
 * Mon Aug 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-1
 - Update to 3.12.4
 



From fedora-extras-commits at redhat.com  Mon Oct  9 16:47:42 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon,  9 Oct 2006 09:47:42 -0700
Subject: rpms/apcupsd/FC-4 apcupsd-httpd.conf,1.1,1.2 apcupsd.spec,1.6,1.7
Message-ID: <200610091648.k99GmEgW014486@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420/FC-4

Modified Files:
	apcupsd-httpd.conf apcupsd.spec 
Log Message:
- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
  Patch from Clive Messer (clive at vacuumtube.org.uk)



Index: apcupsd-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/apcupsd-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-httpd.conf	4 Nov 2005 23:28:17 -0000	1.1
+++ apcupsd-httpd.conf	9 Oct 2006 16:47:41 -0000	1.2
@@ -10,10 +10,10 @@
 # Change the ".example.com" to match your domain or modify
 # access rights to your needs to enable remote access also.
 #
-<Directory "/var/www/apcupsd/">
+<Directory "/var/www/apcupsd">
     DirectoryIndex upsstats.cgi
     AllowOverride None
-    Options ExecCGI
+    Options ExecCGI Indexes
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/apcupsd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apcupsd.spec	21 Aug 2006 16:42:59 -0000	1.6
+++ apcupsd.spec	9 Oct 2006 16:47:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.12.4
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -143,6 +143,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-2
+- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
+  Patch from Clive Messer (clive at vacuumtube.org.uk)
+
 * Mon Aug 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-1
 - Update to 3.12.4
 



From fedora-extras-commits at redhat.com  Mon Oct  9 17:38:28 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  9 Oct 2006 10:38:28 -0700
Subject: rpms/snort/devel .cvsignore, 1.5, 1.6 snort.spec, 1.16, 1.17 sources,
	1.5, 1.6
Message-ID: <200610091738.k99HcU2U017783@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17754

Modified Files:
	.cvsignore snort.spec sources 
Log Message:
update to 2.6.0.2  and clean thing up somewhat.  make dynamic plugin saner 
actually have some plugins  not only the engine



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2006 02:32:27 -0000	1.5
+++ .cvsignore	9 Oct 2006 17:38:28 -0000	1.6
@@ -1 +1 @@
-snort-2.6.0.tar.gz
+snort-2.6.0.2.tar.gz


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- snort.spec	3 Sep 2006 03:40:21 -0000	1.16
+++ snort.spec	9 Oct 2006 17:38:28 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.6.0
-Release:        3%{?dist}
+Version:        2.6.0.2
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -159,7 +159,8 @@
 
 SNORT_BASE_CONFIG="--prefix=%{_prefix} \
                    --sysconfdir=%{_sysconfdir} \
-                   --with-libpcap-includes=/usr/include/pcap"
+                   --with-libpcap-includes=/usr/include/pcap \
+                   --enable-dynamicplugin"
 export LDFLAGS=-L/usr/lib64/mysql
 # there are some strange configure errors
 # when not doing a distclean between major builds.
@@ -173,6 +174,7 @@
 make %{?_smp_mflags}
 mv src/snort snort-plain
 mv src/dynamic-plugins/sf_engine/.libs/libsf_engine.so* .
+mv src/dynamic-preprocessors/build/usr/lib/snort_dynamicpreprocessor .
 make clean
 }
 
@@ -292,7 +294,7 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/etc/rc.d/init.d
 mkdir -p %{buildroot}%{_mandir}/man8
-mkdir -p %{buildroot}%{_libdir}/snort
+mkdir -p %{buildroot}%{_libdir}/snort/dynamicpreprocessor/
 
 {
 install snort-plain %{buildroot}%{_sbindir}/snort-plain
@@ -304,15 +306,33 @@
 install snort-snmp %{buildroot}%{_sbindir}/snort-snmp
 install snort-snmp+flexresp %{buildroot}%{_sbindir}/snort-snmp+flexresp
 install snort-bloat %{buildroot}%{_sbindir}/snort-bloat
+
+install libsf_engine.so %{buildroot}%{_libdir}/snort/dynamicengine
+install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine
+install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine
+
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
+
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
+install snort_dynamicpreprocessor/libsf_dns_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_dns_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
 }
 
-install libsf_engine.so %{buildroot}%{_libdir}/snort
 install snort.8 %{buildroot}%{_mandir}/man8
-install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
+install etc/generators  etc/gen-msg.map  etc/sid etc/sid-msg.map  etc/threshold.conf  etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
 install %{SOURCE1} %{buildroot}/etc/rc.d/init.d
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort/snort.conf
-
+perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf
+perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf
 
 %clean
 if [ -d %{buildroot} ]; then
@@ -324,6 +344,7 @@
 # make a symlink if there is no link
 ln -sf %{_sbindir}/snort-plain %{_sbindir}/snort
 /sbin/chkconfig --add snortd
+/sbin/ldconfig
 
 
 %preun
@@ -368,7 +389,7 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/* 
+%doc doc/* schemas/create_mysql schemas/create_postgresql 
 
 %attr(755,root,root) %{_sbindir}/snort-plain
 # handle compressed man pages.
@@ -404,6 +425,12 @@
 
 
 %changelog
+* Sun Oct 08 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-1
+- Update to 2.6.0.2
+- Realy add dynamic plugin
+- Make config know where the dynamic plugin is installed
+- add sql schema files to doc
+
 * Thu Jul 27 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0-3
 - add dynamic plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2006 02:32:27 -0000	1.5
+++ sources	9 Oct 2006 17:38:28 -0000	1.6
@@ -1 +1 @@
-88bb7f628e5bf1edc6409fbb126eaed0  snort-2.6.0.tar.gz
+5c094ff6d82db845a5f023e4a492103e  snort-2.6.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 18:00:34 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:00:34 -0700
Subject: rpms/gtkmm24/devel gtkmm.spec,1.18,1.19
Message-ID: <200610091801.k99I16NT020504@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17913/devel

Modified Files:
	gtkmm.spec 
Log Message:
simplified post and postun


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtkmm.spec	2 Oct 2006 23:52:21 -0000	1.18
+++ gtkmm.spec	9 Oct 2006 18:00:34 -0000	1.19
@@ -10,8 +10,6 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 BuildRequires:  glibmm24-devel >= 2.11.3
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel >= 1.5.2
@@ -70,12 +68,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files



From fedora-extras-commits at redhat.com  Mon Oct  9 18:00:34 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:00:34 -0700
Subject: rpms/gtkmm24/FC-5 gtkmm.spec,1.13,1.14
Message-ID: <200610091801.k99I17w1020527@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17913/FC-5

Modified Files:
	gtkmm.spec 
Log Message:
simplified post and postun


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-5/gtkmm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtkmm.spec	25 Jun 2006 23:50:05 -0000	1.13
+++ gtkmm.spec	9 Oct 2006 18:00:34 -0000	1.14
@@ -10,8 +10,6 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 BuildRequires:  glibmm24-devel >= 2.8.0
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel >= 1.10.0
@@ -68,12 +66,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files



From fedora-extras-commits at redhat.com  Mon Oct  9 18:21:18 2006
From: fedora-extras-commits at redhat.com (Matteo Ricchetti (mricchet))
Date: Mon,  9 Oct 2006 11:21:18 -0700
Subject: rpms/ss5/devel ss5.spec,1.3,1.4
Message-ID: <200610091821.k99ILKZ8021100@cvs-int.fedora.redhat.com>

Author: mricchet

Update of /cvs/extras/rpms/ss5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21083

Modified Files:
	ss5.spec 
Log Message:
Fix bug 209929


Index: ss5.spec
===================================================================
RCS file: /cvs/extras/rpms/ss5/devel/ss5.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ss5.spec	4 Oct 2006 22:14:03 -0000	1.3
+++ ss5.spec	9 Oct 2006 18:21:18 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.5.9
-Release: 3 
+Release: 4 
 License: GPL 
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
@@ -63,14 +63,18 @@
 %defattr(755,root,root)
 %{_localstatedir}/log/ss5
 
-%defattr(644,root,root)
+%defattr(0640,root,root)
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.conf
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.passwd
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
 
 %changelog
+*Mon Oct  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
+        * SS5-v3.5.9-4 released
+        * Fix security bug into spec file
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.5.9-3
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+        - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 *Tue Sep  26 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.5.9-2 released



From fedora-extras-commits at redhat.com  Mon Oct  9 18:24:47 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon,  9 Oct 2006 11:24:47 -0700
Subject: rpms/lincvs/devel crossvc.spec,1.1,1.2
Message-ID: <200610091824.k99IOnWD021229@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21212

Modified Files:
	crossvc.spec 
Log Message:
crossvc obsoletes lincvs


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/crossvc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crossvc.spec	27 Sep 2006 19:18:56 -0000	1.1
+++ crossvc.spec	9 Oct 2006 18:24:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.0
-Release:          1%{?dist}
+Release:          3%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -16,6 +16,9 @@
 BuildRequires:    desktop-file-utils
 Requires:         cvs >= 0:1.9.0
 
+Provides:         lincvs = %{version}-%{release}
+Obsoletes:        lincvs < 1.5.0
+
 %description
 CrossVC is a graphical Interface for the cvs client commandline tool 
 on the Unix and Windows platform. It allows ato load modules from a 
@@ -78,6 +81,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
+- Add Provides and Obsolete tag (#209917)
+
 * Wed Sep 27 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Oct  9 18:25:11 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:25:11 -0700
Subject: rpms/libglademm24/FC-5 .cvsignore, 1.5, 1.6 libglademm.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200610091825.k99IPDLE021295@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21272

Modified Files:
	.cvsignore libglademm.spec sources 
Log Message:
Update to 2.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Mar 2006 01:04:32 -0000	1.5
+++ .cvsignore	9 Oct 2006 18:25:11 -0000	1.6
@@ -1 +1 @@
-libglademm-2.6.2.tar.bz2
+libglademm-2.6.3.tar.bz2


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-5/libglademm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libglademm.spec	1 Mar 2006 01:04:32 -0000	1.9
+++ libglademm.spec	9 Oct 2006 18:25:11 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           libglademm24
-Version:        2.6.2
+Version:        2.6.3
 Release:        1
 
 Summary:        C++ wrapper for libglade
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-1
+- Update to 2.6.3
+
 * Tue Feb 28 2006 Denis Leroy <denis at poolshark.org> - 2.6.2-1
 - Update to version 2.6.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Mar 2006 01:04:32 -0000	1.5
+++ sources	9 Oct 2006 18:25:11 -0000	1.6
@@ -1 +1 @@
-431a7d04514cabe26fcaedd7767b6a93  libglademm-2.6.2.tar.bz2
+3dd3c3777c4407b8a330bd79089ddbfc  libglademm-2.6.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 18:25:36 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon,  9 Oct 2006 11:25:36 -0700
Subject: rpms/lincvs/FC-5 crossvc.spec,1.1,1.2
Message-ID: <200610091825.k99IPcNC021322@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21305

Modified Files:
	crossvc.spec 
Log Message:
crossvc obsoletes lincvs


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-5/crossvc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crossvc.spec	27 Sep 2006 19:16:17 -0000	1.1
+++ crossvc.spec	9 Oct 2006 18:25:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.0
-Release:          1%{?dist}
+Release:          3%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -16,6 +16,9 @@
 BuildRequires:    desktop-file-utils
 Requires:         cvs >= 0:1.9.0
 
+Provides:         lincvs = %{version}-%{release}
+Obsoletes:        lincvs < 1.5.0
+
 %description
 CrossVC is a graphical Interface for the cvs client commandline tool 
 on the Unix and Windows platform. It allows ato load modules from a 
@@ -78,6 +81,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
+- Add Provides and Obsolete tag (#209917)
+
 * Wed Sep 27 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Oct  9 18:27:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:27:05 -0700
Subject: rpms/glibmm24/FC-5 .cvsignore, 1.8, 1.9 glibmm.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200610091827.k99IR7pg021407@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glibmm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21386

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to 2.8.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Jun 2006 23:24:25 -0000	1.8
+++ .cvsignore	9 Oct 2006 18:27:05 -0000	1.9
@@ -1 +1 @@
-glibmm-2.8.9.tar.bz2
+glibmm-2.8.12.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/FC-5/glibmm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- glibmm.spec	25 Jun 2006 23:24:25 -0000	1.11
+++ glibmm.spec	9 Oct 2006 18:27:05 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           glibmm24
-Version:        2.8.9
+Version:        2.8.12
 Release:        1
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -77,6 +77,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.8.12-1
+- Update to 2.8.12
+
 * Sun Jun 25 2006 Denis Leroy <denis at poolshark.org> - 2.8.9-1
 - Update to 2.8.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jun 2006 23:24:25 -0000	1.9
+++ sources	9 Oct 2006 18:27:05 -0000	1.10
@@ -1 +1 @@
-6d23ba91546f51530421de5a1dc81fa8  glibmm-2.8.9.tar.bz2
+b414082d73c3bf08cafe4931565e10c0  glibmm-2.8.12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 18:27:52 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:27:52 -0700
Subject: rpms/gtkmm24/FC-5 .cvsignore, 1.7, 1.8 gtkmm.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <200610091827.k99IRsUa021454@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21432

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to 2.8.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Jun 2006 23:30:29 -0000	1.7
+++ .cvsignore	9 Oct 2006 18:27:51 -0000	1.8
@@ -1 +1 @@
-gtkmm-2.8.8.tar.bz2
+gtkmm-2.8.9.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-5/gtkmm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gtkmm.spec	9 Oct 2006 18:00:34 -0000	1.14
+++ gtkmm.spec	9 Oct 2006 18:27:51 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           gtkmm24
-Version:        2.8.8
+Version:        2.8.9
 Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.8.9
+- Update to 2.8.9
+
 * Sun Jun 25 2006 Denis Leroy <denis at poolshark.org> - 2.8.8-1
 - Update to 2.8.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jun 2006 23:30:29 -0000	1.9
+++ sources	9 Oct 2006 18:27:51 -0000	1.10
@@ -1 +1 @@
-319a7847f67c5099a78afb495e148143  gtkmm-2.8.8.tar.bz2
+8462178accaf7a909eae0db53d181c32  gtkmm-2.8.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 18:40:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  9 Oct 2006 11:40:06 -0700
Subject: owners owners.list,1.1805,1.1806
Message-ID: <200610091840.k99Ie89N021926@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21909

Modified Files:
	owners.list 
Log Message:
cpan2rpm, html-xml-utils, john, Sprog back to Gavin Henry (Till Maas added as co-maintainer of john due to info in Wiki).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1805
retrieving revision 1.1806
diff -u -r1.1805 -r1.1806
--- owners.list	9 Oct 2006 16:01:25 -0000	1.1805
+++ owners.list	9 Oct 2006 18:40:06 -0000	1.1806
@@ -226,7 +226,7 @@
 Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cowbell|Music Organizer|foolish at guezz.net|extras-qa at fedoraproject.org|
-Fedora Extras|cpan2rpm|Perl module packager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
+Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|cpanspec|RPM spec file generation utility|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org|
@@ -663,7 +663,7 @@
 Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|ht2html|The www.python.org Web site generator|ifoox at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|htb-util|Another tool to make your life easier with HTB|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ghenry at suretecsystems.com
+Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htmldoc|A tool for converting HTML source files into HTML, PostScript, or PDF|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -731,7 +731,7 @@
 Fedora Extras|jikes|A Java source file to bytecode compiler|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|jlint|Java program checker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|jogl|Java bindings for the OpenGL API|green at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|john|John the Ripper password cracker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ghenry at suretecsystems.com
+Fedora Extras|john|John the Ripper password cracker|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|opensource at till.name
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|jrtplib|JRTPLIB is an object-oriented RTP library written in C++|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -2066,7 +2066,7 @@
 Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ghenry at suretecsystems.com
+Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|imlinux at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|sqlite2|Embeddable SQL engine in a C library|imlinux at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|squidGuard|Filter, redirector and access controller plugin for squid|jwb at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 18:59:53 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  9 Oct 2006 11:59:53 -0700
Subject: rpms/snort/devel snort.spec,1.17,1.18
Message-ID: <200610091859.k99IxtFN022013@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21996

Modified Files:
	snort.spec 
Log Message:
disable smp



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- snort.spec	9 Oct 2006 17:38:28 -0000	1.17
+++ snort.spec	9 Oct 2006 18:59:52 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.6.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -171,7 +171,7 @@
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no 
-make %{?_smp_mflags}
+make
 mv src/snort snort-plain
 mv src/dynamic-plugins/sf_engine/.libs/libsf_engine.so* .
 mv src/dynamic-preprocessors/build/usr/lib/snort_dynamicpreprocessor .
@@ -185,7 +185,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-plain+flexresp
 make clean
 }
@@ -197,7 +197,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-mysql+flexresp
 make clean
 }
@@ -208,7 +208,7 @@
                               --with-postgresql=no \
                               --with-oracle=no \
                               --with-odbc=no
-make %{?_smp_mflags}
+make
 mv src/snort snort-mysql
 make clean
 }
@@ -222,7 +222,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-postgresql+flexresp
 make clean
 }
@@ -233,7 +233,7 @@
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no
-make %{?_smp_mflags}
+make
 mv src/snort snort-postgresql
 make clean
 }
@@ -247,7 +247,7 @@
                                     --with-snmp=/usr \
                                    --with-openssl
 
-make %{?_smp_mflags}
+make
 mv src/snort snort-snmp
 make clean
 }
@@ -262,7 +262,7 @@
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make %{?_smp_mflags}
+make
 mv src/snort snort-snmp+flexresp
  make clean
 }
@@ -276,7 +276,7 @@
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make %{?_smp_mflags}
+make
 mv src/snort snort-bloat
 make clean
 }
@@ -425,6 +425,9 @@
 
 
 %changelog
+* Mon Oct 09 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-2
+- disable smp  as it breaks build on the buildsys
+
 * Sun Oct 08 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-1
 - Update to 2.6.0.2
 - Realy add dynamic plugin



From fedora-extras-commits at redhat.com  Mon Oct  9 19:13:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon,  9 Oct 2006 12:13:47 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.6,1.7
Message-ID: <200610091913.k99JDnrN025029@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25012

Modified Files:
	Thunar.spec 
Log Message:
Add shared-mime-info and xfce4-icon-theme as Requires (fixes #209592)



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Thunar.spec	6 Oct 2006 08:24:42 -0000	1.6
+++ Thunar.spec	9 Oct 2006 19:13:47 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.10.rc1%{?dist}
+Release: 0.11.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -24,6 +24,8 @@
 BuildRequires: libxslt
 BuildRequires: GConf2-devel
 BuildRequires: gtk-doc
+Requires: shared-mime-info
+Requires: xfce4-icon-theme
 
 # obsolete xffm to allow for smooth upgrades
 Provides: xffm = 4.2.4
@@ -162,6 +164,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Oct 09 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.11.rc1
+- Add shared-mime-info and xfce4-icon-theme as Requires (fixes #209592)
+
 * Fri Oct 06 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.10.rc1
 - Tweak Obsoletes versions
 



From fedora-extras-commits at redhat.com  Mon Oct  9 19:39:42 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  9 Oct 2006 12:39:42 -0700
Subject: rpms/snort/FC-5 snort.spec,1.11,1.12
Message-ID: <200610091939.k99JdiGr025269@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25252

Modified Files:
	snort.spec 
Log Message:
 update to 2.6.0.2



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/FC-5/snort.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- snort.spec	3 Sep 2006 03:44:46 -0000	1.11
+++ snort.spec	9 Oct 2006 19:39:42 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.6.0
-Release:        3%{?dist}
+Version:        2.6.0.2
+Release:        2%{?dist}
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -159,7 +159,8 @@
 
 SNORT_BASE_CONFIG="--prefix=%{_prefix} \
                    --sysconfdir=%{_sysconfdir} \
-                   --with-libpcap-includes=/usr/include/pcap"
+                   --with-libpcap-includes=/usr/include/pcap \
+                   --enable-dynamicplugin"
 export LDFLAGS=-L/usr/lib64/mysql
 # there are some strange configure errors
 # when not doing a distclean between major builds.
@@ -170,9 +171,10 @@
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no 
-make %{?_smp_mflags}
+make
 mv src/snort snort-plain
 mv src/dynamic-plugins/sf_engine/.libs/libsf_engine.so* .
+mv src/dynamic-preprocessors/build/usr/lib/snort_dynamicpreprocessor .
 make clean
 }
 
@@ -183,7 +185,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-plain+flexresp
 make clean
 }
@@ -195,7 +197,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-mysql+flexresp
 make clean
 }
@@ -206,7 +208,7 @@
                               --with-postgresql=no \
                               --with-oracle=no \
                               --with-odbc=no
-make %{?_smp_mflags}
+make
 mv src/snort snort-mysql
 make clean
 }
@@ -220,7 +222,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-postgresql+flexresp
 make clean
 }
@@ -231,7 +233,7 @@
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no
-make %{?_smp_mflags}
+make
 mv src/snort snort-postgresql
 make clean
 }
@@ -245,7 +247,7 @@
                                     --with-snmp=/usr \
                                    --with-openssl
 
-make %{?_smp_mflags}
+make
 mv src/snort snort-snmp
 make clean
 }
@@ -260,7 +262,7 @@
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make %{?_smp_mflags}
+make
 mv src/snort snort-snmp+flexresp
  make clean
 }
@@ -274,7 +276,7 @@
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make %{?_smp_mflags}
+make
 mv src/snort snort-bloat
 make clean
 }
@@ -292,7 +294,7 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/etc/rc.d/init.d
 mkdir -p %{buildroot}%{_mandir}/man8
-mkdir -p %{buildroot}%{_libdir}/snort
+mkdir -p %{buildroot}%{_libdir}/snort/dynamicpreprocessor/
 
 {
 install snort-plain %{buildroot}%{_sbindir}/snort-plain
@@ -304,15 +306,33 @@
 install snort-snmp %{buildroot}%{_sbindir}/snort-snmp
 install snort-snmp+flexresp %{buildroot}%{_sbindir}/snort-snmp+flexresp
 install snort-bloat %{buildroot}%{_sbindir}/snort-bloat
+
+install libsf_engine.so %{buildroot}%{_libdir}/snort/dynamicengine
+install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine
+install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine
+
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
+
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
+install snort_dynamicpreprocessor/libsf_dns_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_dns_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
 }
 
-install libsf_engine.so %{buildroot}%{_libdir}/snort
 install snort.8 %{buildroot}%{_mandir}/man8
-install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
+install etc/generators  etc/gen-msg.map  etc/sid etc/sid-msg.map  etc/threshold.conf  etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
 install %{SOURCE1} %{buildroot}/etc/rc.d/init.d
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort/snort.conf
-
+perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf
+perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf
 
 %clean
 if [ -d %{buildroot} ]; then
@@ -324,6 +344,7 @@
 # make a symlink if there is no link
 ln -sf %{_sbindir}/snort-plain %{_sbindir}/snort
 /sbin/chkconfig --add snortd
+/sbin/ldconfig
 
 
 %preun
@@ -368,7 +389,7 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/* 
+%doc doc/* schemas/create_mysql schemas/create_postgresql 
 
 %attr(755,root,root) %{_sbindir}/snort-plain
 # handle compressed man pages.
@@ -404,6 +425,15 @@
 
 
 %changelog
+* Mon Oct 09 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-2
+- disable smp  as it breaks build on the buildsys
+
+* Sun Oct 08 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-1
+- Update to 2.6.0.2
+- Realy add dynamic plugin
+- Make config know where the dynamic plugin is installed
+- add sql schema files to doc
+
 * Thu Jul 27 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0-3
 - add dynamic plugin
 



From fedora-extras-commits at redhat.com  Mon Oct  9 19:48:05 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  9 Oct 2006 12:48:05 -0700
Subject: rpms/snort/FC-5 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200610091948.k99Jm7AT025370@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25351

Modified Files:
	.cvsignore sources 
Log Message:
add the new source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snort/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2006 02:31:59 -0000	1.5
+++ .cvsignore	9 Oct 2006 19:48:05 -0000	1.6
@@ -1 +1 @@
-snort-2.6.0.tar.gz
+snort-2.6.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snort/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2006 02:31:59 -0000	1.5
+++ sources	9 Oct 2006 19:48:05 -0000	1.6
@@ -1 +1 @@
-88bb7f628e5bf1edc6409fbb126eaed0  snort-2.6.0.tar.gz
+5c094ff6d82db845a5f023e4a492103e  snort-2.6.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 20:24:04 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:24:04 -0700
Subject: rpms/oorexx - New directory
Message-ID: <200610092024.k99KO6Av028631@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28605/oorexx

Log Message:
Directory /cvs/extras/rpms/oorexx added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 20:24:05 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:24:05 -0700
Subject: rpms/oorexx/devel - New directory
Message-ID: <200610092024.k99KO7jh028634@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28605/oorexx/devel

Log Message:
Directory /cvs/extras/rpms/oorexx/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 20:24:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:24:20 -0700
Subject: rpms/oorexx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610092024.k99KOMdK028688@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28655

Added Files:
	Makefile import.log 
Log Message:
Setup of module oorexx


--- NEW FILE Makefile ---
# Top level Makefile for module oorexx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  9 20:24:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:24:21 -0700
Subject: rpms/oorexx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610092024.k99KON8r028691@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28655/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oorexx


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  9 20:33:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:33:12 -0700
Subject: rpms/oorexx import.log,1.1,1.2
Message-ID: <200610092033.k99KXEL8028869@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833

Modified Files:
	import.log 
Log Message:
auto-import oorexx-3.1.0-1 on branch devel from oorexx-3.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oorexx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Oct 2006 20:24:20 -0000	1.1
+++ import.log	9 Oct 2006 20:33:12 -0000	1.2
@@ -0,0 +1 @@
+oorexx-3_1_0-1:HEAD:oorexx-3.1.0-1.src.rpm:1160425985



From fedora-extras-commits at redhat.com  Mon Oct  9 20:33:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:33:13 -0700
Subject: rpms/oorexx/devel oorexx-paths.patch, NONE, 1.1 oorexx.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610092033.k99KXFGA028876@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	oorexx-paths.patch oorexx.spec 
Log Message:
auto-import oorexx-3.1.0-1 on branch devel from oorexx-3.1.0-1.src.rpm

oorexx-paths.patch:

--- NEW FILE oorexx-paths.patch ---
--- ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp.paths	2006-09-25 19:11:07.000000000 +0200
+++ ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp	2006-09-25 19:12:09.000000000 +0200
@@ -427,6 +427,9 @@
 //  fullname = (PSZ)string_data(imgpath);
 
 //if ( imgpath && fullname )                         /* seg faultn          */
+  if (fullname == 0) {
+    fullname = SearchFileName((PCHAR)"/usr/share/ooRexx/" BASEIMAGE, 'P');
+  }
   if ( fullname != OREF_NULL )
     image = fopen((PSZ)fullname, "rb");/* try to open the file              */
   else
--- ooRexx-3.1.0/Makefile.in.paths	2006-09-25 19:12:21.000000000 +0200
+++ ooRexx-3.1.0/Makefile.in	2006-09-25 19:14:15.000000000 +0200
@@ -60,7 +60,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -415,7 +415,7 @@
 			compile @REXXCAT@ rexx.img \
 			stamp-h.in cscope.files cscope.out $(distdir).tar.gz
 
-SUBDIRS = samples
+SUBDIRS =
 DIST_SUBDIRS = samples
 
 # This defines the current version of ooRexx
@@ -462,7 +462,7 @@
 samples_dir = $(top_srcdir)/samples
 samples_windows_dir = $(top_srcdir)/samples/windows
 samples_unix_dir = $(top_srcdir)/samples/unix
-catdir = $(prefix)/bin
+catdir = $(datadir)/ooRexx
 COMMON_CPPFLAGS = -DORX_VER=$(ORX_MAJOR) -DORX_REL=$(ORX_MINOR) -DORX_MOD=$(ORX_MOD_LVL) -DORX_FIX=0 \
                   -DORX_SYS_STR=\"@ORX_SYS_STR@\" \
                   -DORX_CATDIR=\"$(catdir)\" \
@@ -3170,7 +3170,7 @@
 	echo $(DESTDIR) is destdir
 	echo $(prefix) is prefix
 	echo $(install_sh_PROGRAM)
-	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(prefix)/bin/rexx.img
+	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(datadir)/ooRexx/rexx.img
 	if test -z "$(GENCAT)"; then \
 		echo "No rexx.cat to install"; \
 	else \
@@ -3181,9 +3181,9 @@
 	$(install_sh_SCRIPT) $(rexutils_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
 	for a in $(samples_dir)/*.rex; do \
 		bn=`basename $$a`; \
-		$(install_sh_SCRIPT) $$a $(DESTDIR)$(prefix)/share/ooRexx/$$bn; \
+		$(install_sh_SCRIPT) $$a $(DESTDIR)$(datadir)/ooRexx/$$bn; \
 	done;
-	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(prefix)/share/ooRexx/readme
+	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(datadir)/ooRexx/readme
 
 package:
 	./rexx $(top_srcdir)/platform/unix/makepkg.rex @PACKAGETYPE@ $(ORX_MAJOR).$(ORX_MINOR).$(ORX_MOD_LVL) $(target) $(prefix) $(DESTDIR)


--- NEW FILE oorexx.spec ---
Name:           oorexx
Version:        3.1.0
Release:        1%{?dist}
Summary:        Open Object Rexx

Group:          Development/Languages
License:        CPL
URL:            http://www.oorexx.org
Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-1.src.tar.gz
Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
Patch0:         oorexx-paths.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
Open Object Rexx is an object-oriented scripting language. The
language is designed for "non-programmer" type users, so it is easy to
learn and easy to use, and provides an excellent vehicle to enter the
world of object-oriented programming without much effort.

It extends the procedural way of programming with object-oriented
features that allow you to gradually change your programming style as
you learn more about objects.

%package libs
Summary:        Libraries for ooRexx
Group:          System Environment/Libraries

%description libs
Libraries for ooRexx.


%package docs
Summary:        Documentation for ooRexx
Group:          Development/Languages
Requires:       %{name} = %{version}-%{release}

%description docs
Documentation for ooRexx.


%package devel
Summary:        Header files and libraries for ooRexx
Group:          Development/Languages
Requires:       %{name} = %{version}-%{release}
Requires:       %{name}-libs = %{version}-%{release}

%description devel
Header files and libraries for ooRexx.


%prep
%setup -q -n ooRexx-%{version}
%setup1 -q -n ooRexx-%{version} -a1
%patch0 -p1 -b .paths


%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 '{}' ';'
rm -fr samples/**/.deps
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.csh
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.sh
mv $RPM_BUILD_ROOT%{_bindir}/rxftp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
mv $RPM_BUILD_ROOT%{_bindir}/rxregexp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
chmod 0644 $RPM_BUILD_ROOT%{_datadir}/ooRexx/*

# remove cruft
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/{*.rex,readme}
find . -name .deps | xargs rm -fr
rm -fr samples/windows

%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc CPLv1.0.txt README.txt readme.pdf
%{_bindir}/rexx
%{_bindir}/rexxc
%{_bindir}/rxdelipc
%{_bindir}/rxmigrate
%{_bindir}/rxqueue
%{_bindir}/rxsubcom
%{_datadir}/ooRexx
%{_mandir}/man*/*


%files docs
%defattr(-,root,root,-)
%doc rexxpg.pdf rexxref.pdf rxftp.pdf rxmath.pdf rxsock.pdf
%doc samples


%files devel
%defattr(-,root,root,-)
%{_includedir}/rexx.h
%{_libdir}/lib*.so
%{_bindir}/oorexx-config


%files libs
%defattr(-,root,root,-)
%doc CPLv1.0.txt
%{_libdir}/lib*.so.*


%changelog
* Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
- new version 3.1.0

* Tue May  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.0.0-1
- First Fedora release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Oct 2006 20:24:21 -0000	1.1
+++ .cvsignore	9 Oct 2006 20:33:13 -0000	1.2
@@ -0,0 +1,2 @@
+ooRexx-3.1.0-1.src.tar.gz
+ooRexx-docs-3.1.0-pdf.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Oct 2006 20:24:21 -0000	1.1
+++ sources	9 Oct 2006 20:33:13 -0000	1.2
@@ -0,0 +1,2 @@
+136ae4eb8df72557e10f193b980f9e9f  ooRexx-3.1.0-1.src.tar.gz
+17bc9188b858aedc579f57b7ded73260  ooRexx-docs-3.1.0-pdf.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 20:48:06 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:48:06 -0700
Subject: rpms/oorexx/devel oorexx.spec,1.1,1.2
Message-ID: <200610092048.k99Km8uc029418@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29400

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oorexx.spec	9 Oct 2006 20:33:13 -0000	1.1
+++ oorexx.spec	9 Oct 2006 20:48:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  sed
 
 
 %description
@@ -53,7 +54,7 @@
 %setup -q -n ooRexx-%{version}
 %setup1 -q -n ooRexx-%{version} -a1
 %patch0 -p1 -b .paths
-
+sed -i 's|-m32||' configure
 
 %build
 %configure --disable-static
@@ -119,6 +120,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-2
+- remove -m32 flag for compiling on 64-bit systems
+
 * Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
 - new version 3.1.0
 



From fedora-extras-commits at redhat.com  Mon Oct  9 20:55:01 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:55:01 -0700
Subject: owners owners.list,1.1806,1.1807
Message-ID: <200610092055.k99Kt3aq029555@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29535

Modified Files:
	owners.list 
Log Message:
added oorexx


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1806
retrieving revision 1.1807
diff -u -r1.1806 -r1.1807
--- owners.list	9 Oct 2006 18:40:06 -0000	1.1806
+++ owners.list	9 Oct 2006 20:55:01 -0000	1.1807
@@ -1154,6 +1154,7 @@
 Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ooo2txt|Convert OpenOffice documents to simple text|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|oooqs2|OpenOffice.org Quickstarter 2|dennis at ausil.us|extras-qa at fedoraproject.org|
+Fedora Extras|oorexx|Open Object Rexx|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|openalpp|Object Oriented version of OpenAL|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
 Fedora Extras|openbabel|Chemistry software file format converter|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 21:11:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:11:18 -0700
Subject: rpms/oorexx/devel oorexx.spec,1.2,1.3
Message-ID: <200610092111.k99LBKsO032613@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32596

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oorexx.spec	9 Oct 2006 20:48:06 -0000	1.2
+++ oorexx.spec	9 Oct 2006 21:11:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -11,6 +11,7 @@
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  sed
+BuildRequires:  /usr/include/gnu/stubs-32.h
 
 
 %description
@@ -54,7 +55,7 @@
 %setup -q -n ooRexx-%{version}
 %setup1 -q -n ooRexx-%{version} -a1
 %patch0 -p1 -b .paths
-sed -i 's|-m32||' configure
+
 
 %build
 %configure --disable-static
@@ -120,8 +121,10 @@
 
 
 %changelog
-* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-2
-- remove -m32 flag for compiling on 64-bit systems
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-3
+- Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
+  glibc32 correctly
+
 
 * Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
 - new version 3.1.0



From fedora-extras-commits at redhat.com  Mon Oct  9 21:15:14 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:15:14 -0700
Subject: rpms/abcMIDI/devel abcMIDI.spec,1.8,1.9
Message-ID: <200610092115.k99LFGvY032688@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32671

Modified Files:
	abcMIDI.spec 
Log Message:
new version 20061005


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcMIDI.spec	11 Sep 2006 14:58:07 -0000	1.8
+++ abcMIDI.spec	9 Oct 2006 21:15:14 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20060910
+Version:        20061005
 Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-09-10.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-05.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061005-1
+- new version 20061005
+
 * Mon Sep 11 2006 Gerard Milmeister <gemi at bluewin.ch> - 20060910-1
 - new version 20060910
 



From fedora-extras-commits at redhat.com  Mon Oct  9 21:17:50 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:17:50 -0700
Subject: rpms/abcMIDI/devel .cvsignore, 1.8, 1.9 abcMIDI.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200610092118.k99LIMj3000320@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32745/devel

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061005


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Sep 2006 14:58:07 -0000	1.8
+++ .cvsignore	9 Oct 2006 21:17:50 -0000	1.9
@@ -1 +1 @@
-abcMIDI-2006-09-10.zip
+abcMIDI-2006-10-05.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcMIDI.spec	9 Oct 2006 21:15:14 -0000	1.9
+++ abcMIDI.spec	9 Oct 2006 21:17:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           abcMIDI
 Version:        20061005
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Sep 2006 14:58:07 -0000	1.8
+++ sources	9 Oct 2006 21:17:50 -0000	1.9
@@ -1 +1 @@
-4adbe3b6ab3493c22592084ad96087a8  abcMIDI-2006-09-10.zip
+ddcee30163fecd9fbc4fbb72a934b4fa  abcMIDI-2006-10-05.zip



From fedora-extras-commits at redhat.com  Mon Oct  9 21:17:49 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:17:49 -0700
Subject: rpms/abcMIDI/FC-5 .cvsignore, 1.8, 1.9 abcMIDI.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200610092118.k99LILsK000315@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32745/FC-5

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061005


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Sep 2006 14:58:06 -0000	1.8
+++ .cvsignore	9 Oct 2006 21:17:49 -0000	1.9
@@ -1 +1 @@
-abcMIDI-2006-09-10.zip
+abcMIDI-2006-10-05.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcMIDI.spec	11 Sep 2006 14:58:06 -0000	1.7
+++ abcMIDI.spec	9 Oct 2006 21:17:49 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20060910
-Release:        1%{?dist}
+Version:        20061005
+Release:        2%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-09-10.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-05.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061005-1
+- new version 20061005
+
 * Mon Sep 11 2006 Gerard Milmeister <gemi at bluewin.ch> - 20060910-1
 - new version 20060910
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Sep 2006 14:58:06 -0000	1.8
+++ sources	9 Oct 2006 21:17:49 -0000	1.9
@@ -1 +1 @@
-4adbe3b6ab3493c22592084ad96087a8  abcMIDI-2006-09-10.zip
+ddcee30163fecd9fbc4fbb72a934b4fa  abcMIDI-2006-10-05.zip



From fedora-extras-commits at redhat.com  Mon Oct  9 21:24:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:24:55 -0700
Subject: rpms/oorexx/devel oorexx.spec,1.3,1.4
Message-ID: <200610092124.k99LOvdd000439@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv422

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oorexx.spec	9 Oct 2006 21:11:18 -0000	1.3
+++ oorexx.spec	9 Oct 2006 21:24:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,8 +10,7 @@
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  sed
-BuildRequires:  /usr/include/gnu/stubs-32.h
+ExclusiveArch:  i386
 
 
 %description
@@ -121,10 +120,8 @@
 
 
 %changelog
-* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-3
-- Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
-  glibc32 correctly
-
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-4
+- Build exclusively on i386 for now
 
 * Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
 - new version 3.1.0



From fedora-extras-commits at redhat.com  Mon Oct  9 21:40:53 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:40:53 -0700
Subject: rpms/ruby-racc/devel - New directory
Message-ID: <200610092140.k99LetWe000718@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv689/ruby-racc/devel

Log Message:
Directory /cvs/extras/rpms/ruby-racc/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 21:40:52 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:40:52 -0700
Subject: rpms/ruby-racc - New directory
Message-ID: <200610092140.k99LesEH000715@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv689/ruby-racc

Log Message:
Directory /cvs/extras/rpms/ruby-racc added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 21:41:11 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:41:11 -0700
Subject: rpms/ruby-racc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610092141.k99LfDex000767@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734

Added Files:
	Makefile import.log 
Log Message:
Setup of module ruby-racc


--- NEW FILE Makefile ---
# Top level Makefile for module ruby-racc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  9 21:41:12 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:41:12 -0700
Subject: rpms/ruby-racc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610092141.k99LfEpf000770@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ruby-racc


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  9 21:41:51 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:41:51 -0700
Subject: rpms/ruby-racc import.log,1.1,1.2
Message-ID: <200610092141.k99LfrkM000831@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv798

Modified Files:
	import.log 
Log Message:
auto-import ruby-racc-1.4.5-2 on branch devel from ruby-racc-1.4.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ruby-racc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Oct 2006 21:41:11 -0000	1.1
+++ import.log	9 Oct 2006 21:41:51 -0000	1.2
@@ -0,0 +1 @@
+ruby-racc-1_4_5-2:HEAD:ruby-racc-1.4.5-2.src.rpm:1160430101



From fedora-extras-commits at redhat.com  Mon Oct  9 21:41:52 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:41:52 -0700
Subject: rpms/ruby-racc/devel ruby-racc.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610092141.k99LfsVu000836@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv798/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ruby-racc.spec 
Log Message:
auto-import ruby-racc-1.4.5-2 on branch devel from ruby-racc-1.4.5-2.src.rpm


--- NEW FILE ruby-racc.spec ---
%define rname racc
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}


Summary: LALR(1) Parser Generator
Name: ruby-%{rname}
Version: 1.4.5
Release: 2%{?dist}
URL: http://i.loveruby.net/en/racc.html
Source0: http://i.loveruby.net/archive/racc/%{rname}-%{version}-all.tar.gz
License: LGPL
Group: Development/Tools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(abi) = 1.8
BuildRequires: ruby
BuildRequires: ruby(abi) = 1.8
Provides: ruby(racc) = 1.4.5
BuildArch: noarch 

%description
Racc is Ruby yACC. It is written in Ruby and generates ruby code.
Now almost all functions of yacc are implemented.

%prep
%setup -q -n %{rname}-%{version}-all 

%build
ruby setup.rb config --bin-dir=%{_bindir} --rb-dir=%{ruby_sitelib} --with=racc
ruby setup.rb setup

%install
rm -rf %buildroot
ruby setup.rb install --prefix=%buildroot

%check
cd packages/racc/test
ruby test.rb

%clean
rm -rf %buildroot

%files
%defattr(-,root,root)
%{ruby_sitelib}/racc
%{_bindir}/racc
%{_bindir}/racc2y
%{_bindir}/y2racc
%doc packages/racc/COPYING README.* packages/racc/NEWS.* packages/racc/doc.*

%changelog
* Fri Aug 11 2006 David Lutterkort <dlutter at redhat.com> - 1.4.5-2
- Brought in accordance with packaging guidelines
- Add %%check to run the tests

* Mon Feb  6 2006 David Lutterkort <dlutter at redhat.com> - 1.4.5-1
- Adapted for Fedora

* Sun Nov 21 2005 Pascal Terjan <pterjan at mandriva.org> 1.4.5-1mdk
- 1.4.5
- mkrel

* Sun Apr 17 2005 Pascal Terjan <pterjan at mandrake.org> 1.4.4-3mdk
- fix lib64

* Fri Oct 22 2004 Pascal Terjan <pterjan at mandrake.org> 1.4.4-2mdk
- rebuild

* Thu Dec 25 2003 Pascal Terjan <CMoi at tuxfamily.org> 1.4.4-1mdk 
- first mdk release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-racc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Oct 2006 21:41:12 -0000	1.1
+++ .cvsignore	9 Oct 2006 21:41:52 -0000	1.2
@@ -0,0 +1 @@
+racc-1.4.5-all.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-racc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Oct 2006 21:41:12 -0000	1.1
+++ sources	9 Oct 2006 21:41:52 -0000	1.2
@@ -0,0 +1 @@
+c23ee98abe79f051243adf04d4a82900  racc-1.4.5-all.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 21:43:52 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:43:52 -0700
Subject: owners owners.list,1.1807,1.1808
Message-ID: <200610092143.k99Lhs8j000923@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv906

Modified Files:
	owners.list 
Log Message:
Added entry for ruby-racc


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1807
retrieving revision 1.1808
diff -u -r1.1807 -r1.1808
--- owners.list	9 Oct 2006 20:55:01 -0000	1.1807
+++ owners.list	9 Oct 2006 21:43:52 -0000	1.1808
@@ -1980,6 +1980,7 @@
 Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-mysql|A Ruby interface to MySQL|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-postgres|A Ruby interface to Postgres|dlutter at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ruby-racc|A Ruby LALR(1) Parser Generator|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-sqlite3|A Ruby interface to SQLite|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 21:47:49 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon,  9 Oct 2006 14:47:49 -0700
Subject: rpms/lilypond/devel .cvsignore, 1.4, 1.5 lilypond.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200610092147.k99Llpgd001017@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv996

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Aug 2006 21:33:01 -0000	1.4
+++ .cvsignore	9 Oct 2006 21:47:48 -0000	1.5
@@ -1 +1 @@
-lilypond-2.8.6.tar.gz
+lilypond-2.8.7.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lilypond.spec	6 Sep 2006 19:38:51 -0000	1.4
+++ lilypond.spec	9 Oct 2006 21:47:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.8.6
-Release:	2%{?dist}
+Version:	2.8.7
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.7-1
+- New release.
+
 * Wed Sep  6 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.6-2
 - Rebuild for FC6
 - Update directory for vim.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Aug 2006 21:33:01 -0000	1.4
+++ sources	9 Oct 2006 21:47:48 -0000	1.5
@@ -1 +1 @@
-e1c2e8c337e7b46e8f4210882597deac  lilypond-2.8.6.tar.gz
+f2513f545adb211a256c21cc6b28ab3a  lilypond-2.8.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 21:50:10 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon,  9 Oct 2006 14:50:10 -0700
Subject: rpms/lilypond/FC-5 .cvsignore, 1.4, 1.5 lilypond.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200610092150.k99LoCZk001110@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1089

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Aug 2006 15:53:42 -0000	1.4
+++ .cvsignore	9 Oct 2006 21:50:10 -0000	1.5
@@ -1 +1 @@
-lilypond-2.8.6.tar.gz
+lilypond-2.8.7.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/lilypond.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lilypond.spec	6 Sep 2006 19:37:26 -0000	1.6
+++ lilypond.spec	9 Oct 2006 21:50:10 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.8.6
-Release:	2%{?dist}
+Version:	2.8.7
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.7-1
+- New release.
+
 * Wed Sep  6 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.6-2
 - Update directory for vim.
 - Don't ghost .pyo files, as per changes in packaging guidelines (bug 205387).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2006 15:53:42 -0000	1.4
+++ sources	9 Oct 2006 21:50:10 -0000	1.5
@@ -1 +1 @@
-e1c2e8c337e7b46e8f4210882597deac  lilypond-2.8.6.tar.gz
+f2513f545adb211a256c21cc6b28ab3a  lilypond-2.8.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 22:28:36 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  9 Oct 2006 15:28:36 -0700
Subject: owners owners.list,1.1808,1.1809
Message-ID: <200610092228.k99MScE2004386@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4364

Modified Files:
	owners.list 
Log Message:
unorphaning mantis



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1808
retrieving revision 1.1809
diff -u -r1.1808 -r1.1809
--- owners.list	9 Oct 2006 21:43:52 -0000	1.1808
+++ owners.list	9 Oct 2006 22:28:35 -0000	1.1809
@@ -1006,7 +1006,7 @@
 Fedora Extras|manaworld|2D mmorpg game|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|manaworld-music|Music files for manaworld|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|manedit|GUI editor for creating man pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|mantis|A web-based bugtracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
+Fedora Extras|mantis|A web-based bugtracking system|giallu at gmail.com|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|mboxgrep|Displays e-mail messages matching a pattern|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 00:35:01 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:35:01 -0700
Subject: rpms/quarry/FC-3 gtp-client.diff,NONE,1.1 quarry.spec,1.2,1.3
Message-ID: <200610100035.k9A0ZYLY010894@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10820/FC-3

Modified Files:
	quarry.spec 
Added Files:
	gtp-client.diff 
Log Message:
Upstream patch for bug in string handling manifested in x86_64 build


gtp-client.diff:

--- NEW FILE gtp-client.diff ---
--- quarry-0.1.19/src/gtp/gtp-client.c.orig	2006-02-24 15:47:39.000000000 -0500
+++ quarry-0.1.19/src/gtp/gtp-client.c	2006-10-09 20:25:54.000000000 -0400
@@ -536,7 +536,7 @@
   game_format_position_list (GAME_GO, client->board_size, client->board_size,
 			     &buffer, handicap_stones);
   send_command (client, response_callback, user_data,
-		"set_free_handicap %s", buffer);
+		"set_free_handicap %s", buffer.string);
 
   string_buffer_dispose (&buffer);
 }
@@ -612,7 +612,7 @@
 
   send_command (client, response_callback, user_data,
 		client->protocol_version != 1 ? "play %s %s" : "%s %s",
-		COLOR_STRING (color), move_buffer);
+		COLOR_STRING (color), move_buffer.string);
 
   string_buffer_dispose (&move_buffer);
 }


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/quarry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quarry.spec	8 Oct 2006 13:34:11 -0000	1.2
+++ quarry.spec	10 Oct 2006 00:35:01 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           quarry
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+Patch0:		gtp-client.diff
 #Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-2
+- Incorporated upstream patch to fix gtp-client string handling
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
 - Update to 0.1.19
 



From fedora-extras-commits at redhat.com  Tue Oct 10 00:35:02 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:35:02 -0700
Subject: rpms/quarry/FC-4 gtp-client.diff,NONE,1.1 quarry.spec,1.2,1.3
Message-ID: <200610100035.k9A0ZY7L010897@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10820/FC-4

Modified Files:
	quarry.spec 
Added Files:
	gtp-client.diff 
Log Message:
Upstream patch for bug in string handling manifested in x86_64 build


gtp-client.diff:

--- NEW FILE gtp-client.diff ---
--- quarry-0.1.19/src/gtp/gtp-client.c.orig	2006-02-24 15:47:39.000000000 -0500
+++ quarry-0.1.19/src/gtp/gtp-client.c	2006-10-09 20:25:54.000000000 -0400
@@ -536,7 +536,7 @@
   game_format_position_list (GAME_GO, client->board_size, client->board_size,
 			     &buffer, handicap_stones);
   send_command (client, response_callback, user_data,
-		"set_free_handicap %s", buffer);
+		"set_free_handicap %s", buffer.string);
 
   string_buffer_dispose (&buffer);
 }
@@ -612,7 +612,7 @@
 
   send_command (client, response_callback, user_data,
 		client->protocol_version != 1 ? "play %s %s" : "%s %s",
-		COLOR_STRING (color), move_buffer);
+		COLOR_STRING (color), move_buffer.string);
 
   string_buffer_dispose (&move_buffer);
 }


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/quarry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quarry.spec	8 Oct 2006 13:34:12 -0000	1.2
+++ quarry.spec	10 Oct 2006 00:35:02 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           quarry
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+Patch0:		gtp-client.diff
 #Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-2
+- Incorporated upstream patch to fix gtp-client string handling
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
 - Update to 0.1.19
 



From fedora-extras-commits at redhat.com  Tue Oct 10 00:35:03 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:35:03 -0700
Subject: rpms/quarry/FC-5 gtp-client.diff,NONE,1.1 quarry.spec,1.3,1.4
Message-ID: <200610100035.k9A0ZZ18010900@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10820/FC-5

Modified Files:
	quarry.spec 
Added Files:
	gtp-client.diff 
Log Message:
Upstream patch for bug in string handling manifested in x86_64 build


gtp-client.diff:

--- NEW FILE gtp-client.diff ---
--- quarry-0.1.19/src/gtp/gtp-client.c.orig	2006-02-24 15:47:39.000000000 -0500
+++ quarry-0.1.19/src/gtp/gtp-client.c	2006-10-09 20:25:54.000000000 -0400
@@ -536,7 +536,7 @@
   game_format_position_list (GAME_GO, client->board_size, client->board_size,
 			     &buffer, handicap_stones);
   send_command (client, response_callback, user_data,
-		"set_free_handicap %s", buffer);
+		"set_free_handicap %s", buffer.string);
 
   string_buffer_dispose (&buffer);
 }
@@ -612,7 +612,7 @@
 
   send_command (client, response_callback, user_data,
 		client->protocol_version != 1 ? "play %s %s" : "%s %s",
-		COLOR_STRING (color), move_buffer);
+		COLOR_STRING (color), move_buffer.string);
 
   string_buffer_dispose (&move_buffer);
 }


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/quarry.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quarry.spec	8 Oct 2006 13:34:17 -0000	1.3
+++ quarry.spec	10 Oct 2006 00:35:03 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           quarry
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+Patch0:		gtp-client.diff
 #Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-2
+- Incorporated upstream patch to fix gtp-client string handling
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
 - Update to 0.1.19
 



From fedora-extras-commits at redhat.com  Tue Oct 10 00:35:04 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:35:04 -0700
Subject: rpms/quarry/devel gtp-client.diff,NONE,1.1 quarry.spec,1.3,1.4
Message-ID: <200610100035.k9A0ZamT010903@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10820/devel

Modified Files:
	quarry.spec 
Added Files:
	gtp-client.diff 
Log Message:
Upstream patch for bug in string handling manifested in x86_64 build


gtp-client.diff:

--- NEW FILE gtp-client.diff ---
--- quarry-0.1.19/src/gtp/gtp-client.c.orig	2006-02-24 15:47:39.000000000 -0500
+++ quarry-0.1.19/src/gtp/gtp-client.c	2006-10-09 20:25:54.000000000 -0400
@@ -536,7 +536,7 @@
   game_format_position_list (GAME_GO, client->board_size, client->board_size,
 			     &buffer, handicap_stones);
   send_command (client, response_callback, user_data,
-		"set_free_handicap %s", buffer);
+		"set_free_handicap %s", buffer.string);
 
   string_buffer_dispose (&buffer);
 }
@@ -612,7 +612,7 @@
 
   send_command (client, response_callback, user_data,
 		client->protocol_version != 1 ? "play %s %s" : "%s %s",
-		COLOR_STRING (color), move_buffer);
+		COLOR_STRING (color), move_buffer.string);
 
   string_buffer_dispose (&move_buffer);
 }


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quarry.spec	8 Oct 2006 13:34:18 -0000	1.3
+++ quarry.spec	10 Oct 2006 00:35:03 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           quarry
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+Patch0:		gtp-client.diff
 #Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-2
+- Incorporated upstream patch to fix gtp-client string handling
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
 - Update to 0.1.19
 



From fedora-extras-commits at redhat.com  Tue Oct 10 00:42:07 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:42:07 -0700
Subject: owners owners.list,1.1809,1.1810
Message-ID: <200610100042.k9A0g9U6011140@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11123

Modified Files:
	owners.list 
Log Message:
Taking back my orphaned packages



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1809
retrieving revision 1.1810
diff -u -r1.1809 -r1.1810
--- owners.list	9 Oct 2006 22:28:35 -0000	1.1809
+++ owners.list	10 Oct 2006 00:42:07 -0000	1.1810
@@ -563,7 +563,7 @@
 Fedora Extras|gnubiff|A mail notification program|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnucap|The Gnu Circuit Analysis Package|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
-Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|gnugo|Text based go program|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gnustep-make|GNUstep makefile package|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
@@ -593,7 +593,7 @@
 Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|grepmail|Search mailboxes for a particular email|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|gresistor|Gnome resistor color code calculator|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|grhino|Reversi game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|grhino|Reversi game|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gstm|A front-end to ssh tunneling|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -1858,7 +1858,7 @@
 Fedora Extras|python-musicbrainz2|Library which provides access to the MusicBrainz Database|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-mutagen|Python module to handle audio metadata|mr.ecik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-myghty|A Python-based templating system derived from HTML::Mason|lmacken at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-nltk|Python-based Natural Language Toolkit|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|python-nltk|Python-based Natural Language Toolkit|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-nose|A discovery-based unittest extension for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numarray|Python array manipulation and computational library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 00:45:00 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:45:00 -0700
Subject: rpms/python-nltk/devel python-nltk.spec, 1.1, 1.2 needs.rebuild, 1.1,
	NONE
Message-ID: <200610100045.k9A0j2BU011173@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11151

Modified Files:
	python-nltk.spec 
Removed Files:
	needs.rebuild 
Log Message:
Release bump for FE6



Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/devel/python-nltk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-nltk.spec	17 Nov 2005 05:22:25 -0000	1.1
+++ python-nltk.spec	10 Oct 2006 00:45:00 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-nltk
 Version:        1.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -64,5 +64,8 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 1.4.4-2
+- Rebuild for FE6
+
 * Sun Sep 11 2005 Michel Salim <michel.salim[AT]gmail.com> - 1.4.4-1
 - Initial package


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 00:55:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:55:34 -0700
Subject: rpms/gnugo/devel gnugo.spec,1.10,1.11 needs.rebuild,1.1,NONE
Message-ID: <200610100055.k9A0taIA011446@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gnugo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11429

Modified Files:
	gnugo.spec 
Removed Files:
	needs.rebuild 
Log Message:
Release bump for FE6



Index: gnugo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnugo/devel/gnugo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnugo.spec	2 Mar 2006 02:48:54 -0000	1.10
+++ gnugo.spec	10 Oct 2006 00:55:34 -0000	1.11
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> 3.6-5
+- Rebuild for FE6
+
 * Wed Mar  1 2006 Chris Ricker <kaboom at oobleck.net> 3.6-4
 - rebuild for FE 5
 - add dist tag


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 00:56:19 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:56:19 -0700
Subject: rpms/gnugo/devel gnugo.spec,1.11,1.12
Message-ID: <200610100056.k9A0uLWm011474@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gnugo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11457

Modified Files:
	gnugo.spec 
Log Message:
Actually bump revision number



Index: gnugo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnugo/devel/gnugo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnugo.spec	10 Oct 2006 00:55:34 -0000	1.11
+++ gnugo.spec	10 Oct 2006 00:56:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gnugo
 Version:        3.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Text based go program
 



From fedora-extras-commits at redhat.com  Tue Oct 10 01:06:57 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 18:06:57 -0700
Subject: rpms/grhino/devel grhino.spec,1.5,1.6
Message-ID: <200610100106.k9A16xJ5014445@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14428

Modified Files:
	grhino.spec 
Log Message:
Add BuildRequire on gettext



Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	8 Oct 2006 14:11:36 -0000	1.5
+++ grhino.spec	10 Oct 2006 01:06:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -85,6 +86,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2
 



From fedora-extras-commits at redhat.com  Tue Oct 10 03:10:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 20:10:29 -0700
Subject: rpms/python-paramiko/devel .cvsignore, 1.5, 1.6 python-paramiko.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610100310.k9A3AVwD021087@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-paramiko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21066

Modified Files:
	.cvsignore python-paramiko.spec sources 
Log Message:
Update to 1.6.2. (Re: #207412)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2006 15:53:31 -0000	1.5
+++ .cvsignore	10 Oct 2006 03:10:29 -0000	1.6
@@ -1 +1 @@
-paramiko-1.6.1.zip
+paramiko-1.6.2.zip


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/python-paramiko.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paramiko.spec	16 Sep 2006 18:39:32 -0000	1.7
+++ python-paramiko.spec	10 Oct 2006 03:10:29 -0000	1.8
@@ -4,8 +4,8 @@
 %define srcname paramiko
 
 Name:           python-paramiko
-Version:        1.6.1
-Release:        3%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{python_sitelib}/paramiko/*.pyo
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
+- Update to 1.6.2
+
 * Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 1.6.1-3
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2006 15:53:31 -0000	1.5
+++ sources	10 Oct 2006 03:10:29 -0000	1.6
@@ -1 +1 @@
-8dbd556c0f6c8bb8bf8b97f0e05a910e  paramiko-1.6.1.zip
+d43879c86fcc100d199df425a3fcaf05  paramiko-1.6.2.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 03:11:19 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 20:11:19 -0700
Subject: rpms/python-paramiko/FC-5 .cvsignore, 1.5, 1.6 python-paramiko.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610100311.k9A3BLan021152@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-paramiko/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21131

Modified Files:
	.cvsignore python-paramiko.spec sources 
Log Message:
Update to 1.6.2. (Re: #207412)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2006 15:53:30 -0000	1.5
+++ .cvsignore	10 Oct 2006 03:11:18 -0000	1.6
@@ -1 +1 @@
-paramiko-1.6.1.zip
+paramiko-1.6.2.zip


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-5/python-paramiko.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paramiko.spec	16 Sep 2006 18:39:32 -0000	1.7
+++ python-paramiko.spec	10 Oct 2006 03:11:18 -0000	1.8
@@ -4,8 +4,8 @@
 %define srcname paramiko
 
 Name:           python-paramiko
-Version:        1.6.1
-Release:        3%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{python_sitelib}/paramiko/*.pyo
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
+- Update to 1.6.2
+
 * Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 1.6.1-3
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2006 15:53:30 -0000	1.5
+++ sources	10 Oct 2006 03:11:18 -0000	1.6
@@ -1 +1 @@
-8dbd556c0f6c8bb8bf8b97f0e05a910e  paramiko-1.6.1.zip
+d43879c86fcc100d199df425a3fcaf05  paramiko-1.6.2.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 03:12:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 20:12:26 -0700
Subject: rpms/python-paramiko/FC-4 .cvsignore, 1.5, 1.6 python-paramiko.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610100312.k9A3CSwN021217@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-paramiko/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21196

Modified Files:
	.cvsignore python-paramiko.spec sources 
Log Message:
Update to 1.6.2. (Re: #207412)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2006 15:53:30 -0000	1.5
+++ .cvsignore	10 Oct 2006 03:12:26 -0000	1.6
@@ -1 +1 @@
-paramiko-1.6.1.zip
+paramiko-1.6.2.zip


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-4/python-paramiko.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paramiko.spec	16 Sep 2006 18:39:31 -0000	1.7
+++ python-paramiko.spec	10 Oct 2006 03:12:26 -0000	1.8
@@ -4,8 +4,8 @@
 %define srcname paramiko
 
 Name:           python-paramiko
-Version:        1.6.1
-Release:        3%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{python_sitelib}/paramiko/*.pyo
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
+- Update to 1.6.2
+
 * Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 1.6.1-3
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2006 15:53:30 -0000	1.5
+++ sources	10 Oct 2006 03:12:26 -0000	1.6
@@ -1 +1 @@
-8dbd556c0f6c8bb8bf8b97f0e05a910e  paramiko-1.6.1.zip
+d43879c86fcc100d199df425a3fcaf05  paramiko-1.6.2.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 06:19:04 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:19:04 -0700
Subject: rpms/cogito/devel .cvsignore, 1.11, 1.12 cogito.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <200610100619.k9A6J63T030606@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30585

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 04:52:09 -0000	1.11
+++ .cvsignore	10 Oct 2006 06:19:04 -0000	1.12
@@ -1 +1 @@
-cogito-0.17.4.tar.gz
+cogito-0.18.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cogito.spec	26 Sep 2006 04:52:09 -0000	1.15
+++ cogito.spec	10 Oct 2006 06:19:04 -0000	1.16
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.17.4
+Version: 	0.18
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,7 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 1.1.0
+Requires: 	git-core >= 1.4.2
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
@@ -44,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
+- 0.18
+
 * Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.3-1
 - 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Sep 2006 04:52:09 -0000	1.11
+++ sources	10 Oct 2006 06:19:04 -0000	1.12
@@ -1 +1 @@
-7b8f7ba566770a147fcf367025883ed6  cogito-0.17.4.tar.gz
+d4c05b40b88265b0c5d0708ed2338787  cogito-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 06:21:48 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:21:48 -0700
Subject: rpms/cogito/FC-5 .cvsignore, 1.11, 1.12 cogito.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <200610100621.k9A6Lom5030752@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30726

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 04:54:03 -0000	1.11
+++ .cvsignore	10 Oct 2006 06:21:47 -0000	1.12
@@ -1 +1 @@
-cogito-0.17.4.tar.gz
+cogito-0.18.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/cogito.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cogito.spec	26 Sep 2006 04:54:03 -0000	1.14
+++ cogito.spec	10 Oct 2006 06:21:47 -0000	1.15
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.17.4
+Version: 	0.18
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,7 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 1.1.0
+Requires: 	git-core >= 1.4.2
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
@@ -44,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
+- 0.18
+
 * Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.4-1
 - 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Sep 2006 04:54:03 -0000	1.11
+++ sources	10 Oct 2006 06:21:47 -0000	1.12
@@ -1 +1 @@
-7b8f7ba566770a147fcf367025883ed6  cogito-0.17.4.tar.gz
+d4c05b40b88265b0c5d0708ed2338787  cogito-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 06:22:53 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:22:53 -0700
Subject: rpms/cogito/FC-4 .cvsignore, 1.11, 1.12 cogito.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <200610100622.k9A6Mtij030843@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30821

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 04:55:30 -0000	1.11
+++ .cvsignore	10 Oct 2006 06:22:53 -0000	1.12
@@ -1 +1 @@
-cogito-0.17.4.tar.gz
+cogito-0.18.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cogito.spec	26 Sep 2006 04:55:30 -0000	1.13
+++ cogito.spec	10 Oct 2006 06:22:53 -0000	1.14
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.17.4
+Version: 	0.18
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,7 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 1.1.0
+Requires: 	git-core >= 1.4.2
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
@@ -44,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
+- 0.18
+
 * Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.4-1
 - 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Sep 2006 04:55:30 -0000	1.11
+++ sources	10 Oct 2006 06:22:53 -0000	1.12
@@ -1 +1 @@
-7b8f7ba566770a147fcf367025883ed6  cogito-0.17.4.tar.gz
+d4c05b40b88265b0c5d0708ed2338787  cogito-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 06:24:21 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:24:21 -0700
Subject: rpms/cogito/FC-3 .cvsignore, 1.11, 1.12 cogito.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <200610100624.k9A6ON8g030926@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30905

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 04:56:56 -0000	1.11
+++ .cvsignore	10 Oct 2006 06:24:21 -0000	1.12
@@ -1 +1 @@
-cogito-0.17.4.tar.gz
+cogito-0.18.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cogito.spec	26 Sep 2006 04:56:56 -0000	1.13
+++ cogito.spec	10 Oct 2006 06:24:21 -0000	1.14
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.17.4
+Version: 	0.18
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,7 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 1.1.0
+Requires: 	git-core >= 1.4.2
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
@@ -44,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
+- 0.18
+
 * Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.4-1
 - 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Sep 2006 04:56:56 -0000	1.11
+++ sources	10 Oct 2006 06:24:21 -0000	1.12
@@ -1 +1 @@
-7b8f7ba566770a147fcf367025883ed6  cogito-0.17.4.tar.gz
+d4c05b40b88265b0c5d0708ed2338787  cogito-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 06:32:02 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:32:02 -0700
Subject: rpms/cogito/devel cogito.spec,1.16,1.17
Message-ID: <200610100632.k9A6W4EB031034@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31015

Modified Files:
	cogito.spec 
Log Message:
minor specfile cleanup



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cogito.spec	10 Oct 2006 06:19:04 -0000	1.16
+++ cogito.spec	10 Oct 2006 06:32:02 -0000	1.17
@@ -47,13 +47,9 @@
 * Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
 - 0.18
 
-* Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.3-1
+* Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.4-1
 - 0.17.4
 
-* Thu Sep 14 2006 Chris Wright <chrisw at redhat.com> 0.17.3-2
-- rebuild for Fedora Extras 6
-
-%changelog
 * Wed Jun 28 2006 Chris Wright <chrisw at redhat.com> 0.17.3-1
 - 0.17.3
 



From fedora-extras-commits at redhat.com  Tue Oct 10 08:49:04 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 10 Oct 2006 01:49:04 -0700
Subject: rpms/oorexx/devel oorexx.spec,1.4,1.5
Message-ID: <200610100849.k9A8n6L4005081@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5064

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oorexx.spec	9 Oct 2006 21:24:54 -0000	1.4
+++ oorexx.spec	10 Oct 2006 08:49:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,7 +10,7 @@
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:  i386
+ExcludeArch:    x86_64
 
 
 %description
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-5
+- Exclude x86_64
+
 * Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-4
 - Build exclusively on i386 for now
 



From fedora-extras-commits at redhat.com  Tue Oct 10 09:11:13 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 02:11:13 -0700
Subject: rpms/k3d/devel .cvsignore,1.6,1.7 k3d.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <200610100911.k9A9BFek008100@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8079

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Oct 2006 07:36:40 -0000	1.6
+++ .cvsignore	10 Oct 2006 09:11:12 -0000	1.7
@@ -1 +1 @@
-k3d-0.6.3.0-src.tar.bz2
+k3d-0.6.3.1-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- k3d.spec	9 Oct 2006 07:35:58 -0000	1.8
+++ k3d.spec	10 Oct 2006 09:11:12 -0000	1.9
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.3.0
+Version:        0.6.3.1
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 0.6.3.1
+- Update to 0.6.3.1
+
 * Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 0.6.3.0-1
 - Update to 0.6.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Oct 2006 07:36:40 -0000	1.6
+++ sources	10 Oct 2006 09:11:12 -0000	1.7
@@ -1 +1 @@
-6c96db4ee5fba3f9e8ccc37aca37d595  k3d-0.6.3.0-src.tar.bz2
+7f5b53711a02779e3f9c036bcc21483a  k3d-0.6.3.1-src.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 10:05:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:05:12 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc - New directory
Message-ID: <200610101005.k9AA5Er0011292@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11262/nagios-plugins-snmp-disk-proc

Log Message:
Directory /cvs/extras/rpms/nagios-plugins-snmp-disk-proc added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 10:05:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:05:13 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc/devel - New directory
Message-ID: <200610101005.k9AA5Fjt011293@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11262/nagios-plugins-snmp-disk-proc/devel

Log Message:
Directory /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 10:05:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:05:32 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc Makefile, NONE, 1.1 import.log, 
	NONE, 1.1
Message-ID: <200610101005.k9AA5Yrs011395@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11335

Added Files:
	Makefile import.log 
Log Message:
Setup of module nagios-plugins-snmp-disk-proc


--- NEW FILE Makefile ---
# Top level Makefile for module nagios-plugins-snmp-disk-proc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 10:05:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:05:34 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610101005.k9AA5a7N011398@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11335/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nagios-plugins-snmp-disk-proc


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 10:06:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:06:08 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc import.log,1.1,1.2
Message-ID: <200610101006.k9AA6evq011468@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11431

Modified Files:
	import.log 
Log Message:
auto-import nagios-plugins-snmp-disk-proc-1.0-1 on branch devel from nagios-plugins-snmp-disk-proc-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 10:05:32 -0000	1.1
+++ import.log	10 Oct 2006 10:06:07 -0000	1.2
@@ -0,0 +1 @@
+nagios-plugins-snmp-disk-proc-1_0-1:HEAD:nagios-plugins-snmp-disk-proc-1.0-1.src.rpm:1160474760



From fedora-extras-commits at redhat.com  Tue Oct 10 10:06:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:06:08 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc/devel
	nagios-plugins-snmp-disk-proc.spec, NONE,
	1.1 nagios-snmp-plugins-1.0-snmp_common.c.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610101006.k9AA6eBp011472@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11431/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nagios-plugins-snmp-disk-proc.spec 
	nagios-snmp-plugins-1.0-snmp_common.c.patch 
Log Message:
auto-import nagios-plugins-snmp-disk-proc-1.0-1 on branch devel from nagios-plugins-snmp-disk-proc-1.0-1.src.rpm


--- NEW FILE nagios-plugins-snmp-disk-proc.spec ---
%define nagios_plugins_dir %{_libdir}/nagios/plugins

Name:           nagios-plugins-snmp-disk-proc
Version:        1.0
Release:        1%{?dist}
Summary:        Nagios SNMP plugins to monitor remote disk and processes

Group:          Applications/System
License:        GPL
URL:            ftp://ftp.hometree.net/pub/nagios-snmp-plugins/index.html
Source:         ftp://ftp.hometree.net/pub/nagios-snmp-plugins/nagios-snmp-plugins-%{version}.tar.gz
Patch:          nagios-snmp-plugins-1.0-snmp_common.c.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf, automake
BuildRequires:  net-snmp-devel
BuildRequires:  openssl-devel
Requires:       nagios-plugins

%description
These plugins allow you to monitor disk space and running processes on
a remote machine via SNMP.


%prep
%setup -q -n nagios-snmp-plugins-%{version}
%patch -p1

%build
aclocal
autoheader
automake --add-missing
autoconf
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT/%{nagios_plugins_dir}
install -p -m 755 check_snmp_disk $RPM_BUILD_ROOT/%{nagios_plugins_dir}
install -p -m 755 check_snmp_proc $RPM_BUILD_ROOT/%{nagios_plugins_dir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING AUTHORS NEWS
%{nagios_plugins_dir}/check_snmp_disk
%{nagios_plugins_dir}/check_snmp_proc


%changelog
* Sat Aug 12 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-1
- Initial build.

nagios-snmp-plugins-1.0-snmp_common.c.patch:

--- NEW FILE nagios-snmp-plugins-1.0-snmp_common.c.patch ---
diff -ruN nagios-snmp-plugins-1.0-orig/snmp_common.c nagios-snmp-plugins-1.0/snmp_common.c
--- nagios-snmp-plugins-1.0-orig/snmp_common.c	2004-03-29 15:03:07.000000000 +0100
+++ nagios-snmp-plugins-1.0/snmp_common.c	2006-08-12 21:40:27.000000000 +0100
@@ -229,12 +229,14 @@
 
 void integer_callback(struct variable_list *vars, void **pnt)
 {
-  long *data = ((long *)(*pnt))++;
+  long *data = (long *)(*pnt);
 
   if(verbose)
     printf("%s: Found Integer Value %ld into %lx\n", bn, *vars->val.integer, data);
 
   *data = *vars->val.integer;
+
+  *pnt = ++data;
 }
 
 /**
@@ -245,7 +247,7 @@
 
 void string_callback(struct variable_list *vars, void **pnt)
 {
-  char **data = ((char **)(*pnt))++;
+  char **data = (char **)(*pnt);
   
   if(verbose)
     printf("%s: Putting String into %lx\n", bn, data);
@@ -258,5 +260,7 @@
   {
     *data = "";
   }
+
+  *pnt = ++data;
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 10:05:33 -0000	1.1
+++ .cvsignore	10 Oct 2006 10:06:08 -0000	1.2
@@ -0,0 +1 @@
+nagios-snmp-plugins-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 10:05:33 -0000	1.1
+++ sources	10 Oct 2006 10:06:08 -0000	1.2
@@ -0,0 +1 @@
+cf70e405718d016debe206d01f54262c  nagios-snmp-plugins-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 10:10:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:10:08 -0700
Subject: owners owners.list,1.1810,1.1811
Message-ID: <200610101010.k9AAAAmt011589@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572

Modified Files:
	owners.list 
Log Message:
New package: nagios-plugins-snmp-disk-proc (#202324)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1810
retrieving revision 1.1811
diff -u -r1.1810 -r1.1811
--- owners.list	10 Oct 2006 00:42:07 -0000	1.1810
+++ owners.list	10 Oct 2006 10:10:07 -0000	1.1811
@@ -1079,6 +1079,7 @@
 Fedora Extras|nabi|Simple Hangul X Input Method|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|nagios|Host/service/network monitoring program|imlinux at gmail.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nagios-plugins|Host/service/network monitoring program plugins for Nagios|imlinux at gmail.com|extras-qa at fedoraproject.org|jpo at di.uminho.pt
+Fedora Extras|nagios-plugins-snmp-disk-proc|Nagios SNMP plugins to monitor remote disk and processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 10:29:18 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 10 Oct 2006 03:29:18 -0700
Subject: fedora-security/audit fc5,1.349,1.350 fc6,1.104,1.105
Message-ID: <200610101029.k9AATIUu013873@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13827/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-5158



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- fc5	9 Oct 2006 10:08:58 -0000	1.349
+++ fc5	10 Oct 2006 10:29:16 -0000	1.350
@@ -8,7 +8,7 @@
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
-CVE-2006-5158 ** kernel
+CVE-2006-5158 version (kernel, fixed 2.6.15)
 CVE-2006-5072 backport (mono) #209464 [since FEDORA-2006-1012]
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fc6	6 Oct 2006 08:23:10 -0000	1.104
+++ fc6	10 Oct 2006 10:29:16 -0000	1.105
@@ -9,7 +9,7 @@
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
-CVE-2006-5158 ** kernel
+CVE-2006-5158 version (kernel, fixed 2.6.15)
 CVE-2006-5072 VULNERABLE (mono) bz#209467
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]



From fedora-extras-commits at redhat.com  Tue Oct 10 11:28:25 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 10 Oct 2006 04:28:25 -0700
Subject: rpms/wcstools/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wcstools.spec, 1.3, 1.4 wcstools3-codewarn.patch, 1.1,
	1.2 wcstools3-tmpfile.patch, 1.1, NONE
Message-ID: <200610101128.k9ABSRlF018843@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18817

Modified Files:
	.cvsignore sources wcstools.spec wcstools3-codewarn.patch 
Removed Files:
	wcstools3-tmpfile.patch 
Log Message:
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 17:27:53 -0000	1.2
+++ .cvsignore	10 Oct 2006 11:28:24 -0000	1.3
@@ -1 +1 @@
-wcstools-3.6.5.tar.gz
+wcstools-3.6.6beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 17:27:53 -0000	1.2
+++ sources	10 Oct 2006 11:28:24 -0000	1.3
@@ -1 +1 @@
-9cd9bbbe1408c2d92728d8f039291fb3  wcstools-3.6.5.tar.gz
+cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/wcstools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wcstools.spec	4 Sep 2006 14:22:40 -0000	1.3
+++ wcstools.spec	10 Oct 2006 11:28:24 -0000	1.4
@@ -1,18 +1,16 @@
 Name: wcstools
-Version: 3.6.5
-Release: 3%{?dist}
+Version: 3.6.6
+Release: 0.1.beta%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
-Patch2: wcstools3-tmpfile.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 Wcstools is a set of software utilities, written in C, which create,
 display and manipulate the world coordinate system of a FITS or IRAF
@@ -35,7 +33,7 @@
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
 License: LGPL
-Requires: %{name} = %{version}-%{release}
+Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
 
@@ -43,7 +41,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all
@@ -74,6 +71,7 @@
 
 %files -n libwcs
 %defattr(-,root,root)
+%doc libwcs/COPYING
 %{_libdir}/*.so.*
 
 %files -n libwcs-devel
@@ -84,6 +82,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
+- New upstream source 3.6.6beta
 * Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
 - Rebuild.
 * Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/wcstools3-codewarn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wcstools3-codewarn.patch	26 Jun 2006 17:27:53 -0000	1.1
+++ wcstools3-codewarn.patch	10 Oct 2006 11:28:24 -0000	1.2
@@ -1,18 +1,17 @@
-diff -ur wcstools-3.6.5.orig/getdate.c wcstools-3.6.5/getdate.c
---- wcstools-3.6.5.orig/getdate.c	2006-06-22 01:46:49.000000000 +0200
-+++ wcstools-3.6.5/getdate.c	2006-06-23 10:23:36.000000000 +0200
-@@ -382,7 +382,7 @@
-     char outform[16];
-     char *fitsdate, *newfdate;
++++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
+--- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
+@@ -413,7 +413,7 @@
+     char *fitsdate, *newfdate, *stdate;
      char temp[64];
+     char fyear[16];
 -    char ts0[8];
 +    char ts0[9];
      char *tchar;
      int its, its1;
      time_t lts;
-diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c
---- wcstools-3.6.5.orig/libwcs/binread.c	2006-06-20 22:07:37.000000000 +0200
-+++ wcstools-3.6.5/libwcs/binread.c	2006-06-23 10:24:39.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
+--- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
 @@ -1358,7 +1358,7 @@
  	for (i = 0; i < nmag; i++) {
  	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
@@ -22,9 +21,9 @@
  	    st->xmag[i] = 0.01 * (double) st->mag[i];
  	    }
  	}
-diff -ur wcstools-3.6.5.orig/libwcs/catutil.c wcstools-3.6.5/libwcs/catutil.c
---- wcstools-3.6.5.orig/libwcs/catutil.c	2006-06-20 21:05:14.000000000 +0200
-+++ wcstools-3.6.5/libwcs/catutil.c	2006-06-23 10:29:31.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
+--- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
 @@ -722,7 +722,7 @@
  	    lname = 0;
  	else


--- wcstools3-tmpfile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 11:50:36 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 10 Oct 2006 04:50:36 -0700
Subject: rpms/mantis/devel mantis.spec, 1.11, 1.12 .cvsignore, 1.3,
	1.4 sources, 1.8, 1.9 needs.rebuild, 1.1, NONE
Message-ID: <200610101150.k9ABocix018977@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18956

Modified Files:
	mantis.spec .cvsignore sources 
Removed Files:
	needs.rebuild 
Log Message:
Update to 1.0.5



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mantis.spec	22 May 2006 06:31:09 -0000	1.11
+++ mantis.spec	10 Oct 2006 11:50:35 -0000	1.12
@@ -4,21 +4,20 @@
 %global cfgdir		%_sysconfdir/%name
 %global httpconfdir	%_sysconfdir/httpd/conf.d
 
-%{!?release_func:%global release_func() %1%{?dist}}
-
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	1.0.3
-Release:	%release_func 1
+Version:	1.0.5
+Release:	1%{dist}
 License:	GPL
 Group:		Applications/Internet
-URL:		http://mantisbt.sourceforge.net/
+URL:		http://www.mantisbugtracker.com/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%name-%version.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-1.0.0rc2-noadmin.patch
-BuildRoot:	%_tmppath/%name-%version-%release-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	diffutils
 Requires:	php
 Requires:	mantis-config
@@ -28,17 +27,15 @@
 Group:		Applications/Internet
 Source10:	mantis-httpd.conf
 Provides:	mantis-config = httpd
-Requires:	mantis = %version-%release
-Requires:	%httpconfdir
+Requires:	mantis = %{version}-%{release}
+Requires:	%{httpconfdir}
 Requires:	mod_ssl
 Requires(post):		httpd
 Requires(postun):	httpd
 
 
 %description
-Mantis is a web-based bugtracking system. It is in active development
-and is considered beta.
-
+Mantis is a web-based bugtracking system. 
 It is written in the PHP scripting language and requires the MySQL
 database and a webserver. Mantis has been installed on Windows, MacOS,
 OS/2, and a variety of Unix operating systems. Any web browser should
@@ -46,14 +43,12 @@
 GNU General Public License (GPL).
 
 %description config-httpd
-Mantis is a web-based bugtracking system. It is in active development
-and is considered beta.
-
+Mantis is a web-based bugtracking system.
 This package contains configuration-files for Apache httpd 2.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
@@ -63,25 +58,25 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "${RPM_BUILD_ROOT}"
 
-%__install -d -m755 $RPM_BUILD_ROOT%pkgdir
-%__install -d -m750 $RPM_BUILD_ROOT%cfgdir
+%{__install} -d -m755 ${RPM_BUILD_ROOT}%{pkgdir}
+%{__install} -d -m750 ${RPM_BUILD_ROOT}%{cfgdir}
 
-tar cf - . | tar xf - -C $RPM_BUILD_ROOT%pkgdir
+tar cf - . | tar xf - -C ${RPM_BUILD_ROOT}%{pkgdir}
 
 
-find $RPM_BUILD_ROOT \( \
+find ${RPM_BUILD_ROOT} \( \
 	-name '*.noexamplecom' -o -name '*.iis' -o -name '*.noadmin' -o -name '*.#.*' -o \
 	-name '.cvsignore' \
 	\) -print0 | xargs -0 rm -f
 
 ## Do not rename; the *existence* of this file will be checked to
 ## determine if mantis is offline
-mv $RPM_BUILD_ROOT%pkgdir/mantis_offline.php.sample $RPM_BUILD_ROOT%cfgdir/
-mv $RPM_BUILD_ROOT%pkgdir/config_inc.php.sample     $RPM_BUILD_ROOT%cfgdir/config_inc.php
+mv ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php.sample ${RPM_BUILD_ROOT}%{cfgdir}/
+mv ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php.sample     ${RPM_BUILD_ROOT}%{cfgdir}/config_inc.php
 
-for i in $(find $RPM_BUILD_ROOT -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
+for i in $(find ${RPM_BUILD_ROOT} -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
 	case $i in
 		(*.php)
 			if ! sed '1p;d' "$i" | grep -q '^#!'; then
@@ -95,27 +90,27 @@
 	esac
 done
 
-chmod -x $RPM_BUILD_ROOT%pkgdir/{doc/*,core/phpmailer/{README,LICENSE}}
+chmod -x ${RPM_BUILD_ROOT}%{pkgdir}/{doc/*,core/phpmailer/{README,LICENSE}}
 
-ln -s %cfgdir/config_inc.php	 $RPM_BUILD_ROOT%pkgdir/config_inc.php
-ln -s %cfgdir/mantis_offline.php $RPM_BUILD_ROOT%pkgdir/mantis_offline.php
+ln -s %{cfgdir}/config_inc.php	 ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php
+ln -s %{cfgdir}/mantis_offline.php ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php
 
 
 ## The httpd config-files
 function subst() {
-	f=$RPM_BUILD_ROOT$1
-	sed -e 's!/usr/share/mantis!%pkgdir!g' "$f" >"$f".tmp
+	f=${RPM_BUILD_ROOT}$1
+	sed -e 's!/usr/share/mantis!%{pkgdir}!g' "$f" >"$f".tmp
 	cmp -s "$f" "$f.tmp" || cat "$f.tmp" >"$f"
 	rm -f "$f.tmp"
 }
 
-%__install -d $RPM_BUILD_ROOT%httpconfdir
-%__install -p -m644 %SOURCE10 $RPM_BUILD_ROOT%httpconfdir/mantis.conf
-subst %httpconfdir/mantis.conf
+%{__install} -d ${RPM_BUILD_ROOT}%{httpconfdir}
+%{__install} -p -m644 %{SOURCE10} ${RPM_BUILD_ROOT}%{httpconfdir}/mantis.conf
+subst %{httpconfdir}/mantis.conf
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "${RPM_BUILD_ROOT}"
 
 
 %post config-httpd
@@ -127,17 +122,20 @@
 
 %files
 %defattr(-,root,root,-)
-%pkgdir
-%attr(-,root,apache) %dir %cfgdir
-%attr(0640,root,apache) %config(noreplace) %cfgdir/*
+%{pkgdir}
+%attr(-,root,apache) %dir %{cfgdir}
+%attr(0640,root,apache) %config(noreplace) %{cfgdir}/*
 
 
 %files config-httpd
 %defattr(-,root,root,-)
-%config(noreplace) %httpconfdir/*
+%config(noreplace) %{httpconfdir}/*
 
 
 %changelog
+* Tue Oct 10 2006 Gianluca Sforna <giallu gmail com> - 1.0.5-1
+- updated to 1.0.5
+
 * Sat May 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.0.3-1
 - updated to 1.0.3 (SECURITY)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Mar 2005 18:21:20 -0000	1.3
+++ .cvsignore	10 Oct 2006 11:50:35 -0000	1.4
@@ -1,2 +1 @@
-mantis-*.tar.gz
-mantis-*.*.rpm
+mantis_1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 May 2006 06:31:09 -0000	1.8
+++ sources	10 Oct 2006 11:50:35 -0000	1.9
@@ -1 +1 @@
-6c70d00da4cad5da2e0df387f474d3e4  mantis-1.0.3.tar.gz
+01c5fb87e5ac161a681471573711bcf6  mantis_1.0.5.tar.gz


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 12:01:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:01:50 -0700
Subject: rpms/libsigc++/FC-4 .cvsignore, 1.3, 1.4 libsigc++.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200610101201.k9AC1rJk022031@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22010

Modified Files:
	.cvsignore libsigc++.spec sources 
Log Message:
Update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Apr 2005 13:41:13 -0000	1.3
+++ .cvsignore	10 Oct 2006 12:01:50 -0000	1.4
@@ -1,2 +1 @@
-libsigc++-1.2.5.tar.gz
-libsigc++-1.2.5-autoregen.patch.bz2
+libsigc++-1.2.7.tar.bz2


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-4/libsigc++.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libsigc++.spec	12 Apr 2005 13:59:50 -0000	1.8
+++ libsigc++.spec	10 Oct 2006 12:01:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libsigc++
-Version:        1.2.5
-Release:        8
+Version:        1.2.7
+Release:        1
 Summary:        Typesafe signal framework for C++
 Group:          System Environment/Libraries
 License:        LGPL
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-1
+- Update to 1.2.7
+
 * Tue Apr 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.5-8
 - Add BR docbook-style-xsl and patch doc/manual to use it instead of
   an external http stylesheet.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Apr 2005 13:41:13 -0000	1.3
+++ sources	10 Oct 2006 12:01:50 -0000	1.4
@@ -1,2 +1 @@
-d0d1ffcae0eced97ef4f17ce0ba81352  libsigc++-1.2.5.tar.gz
-19a5d1a582805fd8c2dddfe6d3752a52  libsigc++-1.2.5-autoregen.patch.bz2
+212f48536019e1f003d2509b4c9b36df  libsigc++-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 12:05:58 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:05:58 -0700
Subject: rpms/libglademm24/FC-5 libglademm.spec,1.10,1.11
Message-ID: <200610101206.k9AC60oh022141@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22124

Modified Files:
	libglademm.spec 
Log Message:
Added dist tag


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-5/libglademm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libglademm.spec	9 Oct 2006 18:25:11 -0000	1.10
+++ libglademm.spec	10 Oct 2006 12:05:58 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libglademm24
 Version:        2.6.3
-Release:        1
+Release:        2%{?dist}
 
 Summary:        C++ wrapper for libglade
 
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-2
+- Added dist tag
+
 * Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-1
 - Update to 2.6.3
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:07:03 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:07:03 -0700
Subject: rpms/libglademm24/devel libglademm.spec,1.10,1.11
Message-ID: <200610101207.k9AC75E8022224@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22198

Modified Files:
	libglademm.spec 
Log Message:
Added dist tag


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libglademm.spec	28 Aug 2006 11:22:52 -0000	1.10
+++ libglademm.spec	10 Oct 2006 12:07:03 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libglademm24
 Version:        2.6.3
-Release:        1
+Release:        2%{?dist}
 
 Summary:        C++ wrapper for libglade
 
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-2
+- Added dist tag
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-1
 - Update to version 2.6.3
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:22:04 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:22:04 -0700
Subject: rpms/libsigc++/FC-4 libsigc++.spec, 1.9,
	1.10 libsigc++-1.2.5-pc-cflags.patch, 1.1, NONE
Message-ID: <200610101222.k9ACM6tU022407@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22390

Modified Files:
	libsigc++.spec 
Removed Files:
	libsigc++-1.2.5-pc-cflags.patch 
Log Message:
fixed source url, removed integrated patches, added dist tag


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-4/libsigc++.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsigc++.spec	10 Oct 2006 12:01:50 -0000	1.9
+++ libsigc++.spec	10 Oct 2006 12:22:03 -0000	1.10
@@ -1,21 +1,18 @@
 Name:           libsigc++
 Version:        1.2.7
-Release:        1
+Release:        2%{?dist}
 Summary:        Typesafe signal framework for C++
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://libsigc.sourceforge.net/
-Source0:        http://dl.sourceforge.net/libsigc/libsigc++-1.2.5.tar.gz
+Source0:        http://dl.sourceforge.net/libsigc/libsigc++-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
 BuildRequires:  doxygen
 BuildRequires:  libxslt docbook-style-xsl
 # for multilib fix
-Patch1:         libsigc++-1.2.5-pc-cflags.patch
-Patch2:         libsigc++-1.2.5-stylesheet.patch
-# patch created with: aclocal -I scripts ; libtoolize -c -f 
-# automake -a -c -f ; autoconf ; rm -rf autom4te.cache
-Patch3:         libsigc++-1.2.5-autoregen.patch.bz2
+Patch1:         libsigc++-1.2.5-stylesheet.patch
+
 
 %description
 This library implements a full callback system for use in widget libraries,
@@ -43,9 +40,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .pc-cflags
-%patch2 -p1 -b .stylesheet
-%patch3 -p1 -b .autoregen
+%patch1 -p1 -b .stylesheet
 
 
 
@@ -101,6 +96,11 @@
 
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-2
+- Fixed Source URL
+- Patches integrated upstream
+- Added dist tag
+
 * Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-1
 - Update to 1.2.7
 


--- libsigc++-1.2.5-pc-cflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 12:27:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:27:59 -0700
Subject: rpms/gift/FC-4 gift-0.11.8.1-fhs.patch,NONE,1.1 gift.spec,1.2,1.3
Message-ID: <200610101228.k9ACS13b022629@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609

Modified Files:
	gift.spec 
Added Files:
	gift-0.11.8.1-fhs.patch 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)


gift-0.11.8.1-fhs.patch:

--- NEW FILE gift-0.11.8.1-fhs.patch ---
--- gift-0.11.8.1/configure.ac.fhs	2004-11-26 14:31:05.000000000 -0600
+++ gift-0.11.8.1/configure.ac	2006-10-10 07:00:04.000000000 -0500
@@ -342,22 +342,22 @@
     AC_SUBST(prefix)
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 AC_SUBST(libgiftincdir)
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 AC_SUBST(plugindir)
 
-LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${prefix}/lib/giFT")
+LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${libdir}/giFT")
 
 giftdatadir=${prefix}/share/giFT
 AC_SUBST(giftdatadir)
 
 if test x$WIN32 != xyes; then
-    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/share/giFT")
+    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${datadir}/giFT")
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 AC_SUBST(giftperldir)
 
 dnl ###########################################################################
--- gift-0.11.8.1/configure.fhs	2004-11-27 15:12:59.000000000 -0600
+++ gift-0.11.8.1/configure	2006-10-10 07:01:03.000000000 -0500
@@ -25262,30 +25262,30 @@
 
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 
 
 cat >>gconfdefs.h <<_ACEOF
 #ifndef PLUGIN_DIR
-#define PLUGIN_DIR "${prefix}/lib/giFT"
+#define PLUGIN_DIR "${libdir}/giFT"
 #endif
 _ACEOF
 
-giftdatadir=${prefix}/share/giFT
+giftdatadir=${datadir}/giFT
 
 
 if test x$WIN32 != xyes; then
     cat >>gconfdefs.h <<_ACEOF
 #ifndef DATA_DIR
-#define DATA_DIR "${prefix}/share/giFT"
+#define DATA_DIR "${datadir}/giFT"
 #endif
 _ACEOF
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 
 
 


Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-4/gift.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gift.spec	6 Jan 2006 13:14:44 -0000	1.2
+++ gift.spec	10 Oct 2006 12:27:59 -0000	1.3
@@ -1,16 +1,12 @@
 
-%if "%{?fedora}" > "2"
+#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
 %define _enable_libmagic --enable-libmagic
-%endif
-
-%if "%{?rhel}" > "3"
-%define _enable_libmagic --enable-libmagic
-%endif
+#endif
 
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 4%{?dist} 
+Release: 6%{?dist}
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -19,12 +15,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gift-0.11.8.1-gcc4.patch
+# respect %_bindir,%_datadir,%_includedir,%_libdir
+# http://bugzilla.redhat.com/210114
+Patch2: gift-0.11.8.1-fhs.patch
 
 # Wrapper for auto-launch gift-setup for first-time users 
 Source1: giftd.sh
 
 BuildRequires: libtool
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
 BuildRequires: libtool-ltdl-devel
 %endif
 BuildRequires: libvorbis-devel
@@ -48,6 +47,7 @@
 %setup -q
 
 %patch1 -p1 -b .gcc4
+%patch2 -p1 -b .fhs
 
 
 %build
@@ -85,7 +85,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
+%doc AUTHORS COPYING HACKING QUICKSTART README TODO
 %{_bindir}/gift*
 %{_sbindir}/giftd
 %{_datadir}/giFT/
@@ -101,6 +101,15 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
+- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-5
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4.1
+- fc5: gcc/glibc respin
+
 * Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
 - giftd.sh (wrapper): pass on command-line params/options
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:34:23 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:34:23 -0700
Subject: rpms/libsigc++/FC-5 libsigc++.spec,1.11,1.12
Message-ID: <200610101234.k9ACYP4i022735@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22717

Modified Files:
	libsigc++.spec 
Log Message:
Added dist tag


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-5/libsigc++.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsigc++.spec	28 Feb 2006 21:03:11 -0000	1.11
+++ libsigc++.spec	10 Oct 2006 12:34:23 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libsigc++
 Version:        1.2.7
-Release:        2
+Release:        3%{?dist} 
 Summary:        Typesafe signal framework for C++
 Group:          System Environment/Libraries
 License:        LGPL
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 1.2.7
+- Added dist tag
+
 * Tue Feb 28 2006 Denis Leroy <denis at poolshark.org> 1.2.7-2
 - Fixed sources file
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:34:57 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:34:57 -0700
Subject: rpms/libglademm24/FC-4 .cvsignore, 1.3, 1.4 libglademm.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200610101234.k9ACYxhq022810@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22789

Modified Files:
	.cvsignore libglademm.spec sources 
Log Message:
Update to 2.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Apr 2005 22:42:43 -0000	1.3
+++ .cvsignore	10 Oct 2006 12:34:56 -0000	1.4
@@ -1 +1 @@
-libglademm-2.6.0.tar.bz2
+libglademm-2.6.3.tar.bz2


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-4/libglademm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libglademm.spec	23 Jul 2006 12:07:45 -0000	1.8
+++ libglademm.spec	10 Oct 2006 12:34:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libglademm24
-Version:        2.6.0
-Release:        3
+Version:        2.6.3
+Release:        1{?dist}
 
 Summary:        C++ wrapper for libglade
 
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-1
+- Update to 2.6.3
+
 * Sun Jul 23 2006 Denis Leroy <denis at poolshark.org> - 2.6.0-3
 - Rebuild with gtkmm 2.6.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Apr 2005 22:42:43 -0000	1.3
+++ sources	10 Oct 2006 12:34:56 -0000	1.4
@@ -1 +1 @@
-be10dcaca106d4381dc339a39e2fe776  libglademm-2.6.0.tar.bz2
+3dd3c3777c4407b8a330bd79089ddbfc  libglademm-2.6.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 12:39:14 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:39:14 -0700
Subject: rpms/libglademm24/FC-4 libglademm.spec,1.9,1.10
Message-ID: <200610101239.k9ACdGGs022898@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22881

Modified Files:
	libglademm.spec 
Log Message:
Fixed dist tag


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-4/libglademm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libglademm.spec	10 Oct 2006 12:34:56 -0000	1.9
+++ libglademm.spec	10 Oct 2006 12:39:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libglademm24
 Version:        2.6.3
-Release:        1{?dist}
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for libglade
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:42:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:42:11 -0700
Subject: rpms/gift/FC-5 gift-0.11.8.1-fhs.patch,NONE,1.1 gift.spec,1.4,1.5
Message-ID: <200610101242.k9ACgDJR023097@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23077

Modified Files:
	gift.spec 
Added Files:
	gift-0.11.8.1-fhs.patch 
Log Message:
* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- fc5: gcc/glibc respin


gift-0.11.8.1-fhs.patch:

--- NEW FILE gift-0.11.8.1-fhs.patch ---
--- gift-0.11.8.1/configure.ac.fhs	2004-11-26 14:31:05.000000000 -0600
+++ gift-0.11.8.1/configure.ac	2006-10-10 07:00:04.000000000 -0500
@@ -342,22 +342,22 @@
     AC_SUBST(prefix)
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 AC_SUBST(libgiftincdir)
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 AC_SUBST(plugindir)
 
-LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${prefix}/lib/giFT")
+LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${libdir}/giFT")
 
 giftdatadir=${prefix}/share/giFT
 AC_SUBST(giftdatadir)
 
 if test x$WIN32 != xyes; then
-    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/share/giFT")
+    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${datadir}/giFT")
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 AC_SUBST(giftperldir)
 
 dnl ###########################################################################
--- gift-0.11.8.1/configure.fhs	2004-11-27 15:12:59.000000000 -0600
+++ gift-0.11.8.1/configure	2006-10-10 07:01:03.000000000 -0500
@@ -25262,30 +25262,30 @@
 
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 
 
 cat >>gconfdefs.h <<_ACEOF
 #ifndef PLUGIN_DIR
-#define PLUGIN_DIR "${prefix}/lib/giFT"
+#define PLUGIN_DIR "${libdir}/giFT"
 #endif
 _ACEOF
 
-giftdatadir=${prefix}/share/giFT
+giftdatadir=${datadir}/giFT
 
 
 if test x$WIN32 != xyes; then
     cat >>gconfdefs.h <<_ACEOF
 #ifndef DATA_DIR
-#define DATA_DIR "${prefix}/share/giFT"
+#define DATA_DIR "${datadir}/giFT"
 #endif
 _ACEOF
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 
 
 


Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-5/gift.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gift.spec	1 Mar 2006 16:40:36 -0000	1.4
+++ gift.spec	10 Oct 2006 12:42:11 -0000	1.5
@@ -1,16 +1,12 @@
 
-%if "%{?fedora}" > "2"
+#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
 %define _enable_libmagic --enable-libmagic
-%endif
-
-%if "%{?rhel}" > "3"
-%define _enable_libmagic --enable-libmagic
-%endif
+#endif
 
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 4%{?dist}.2
+Release: 6%{?dist}
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -19,12 +15,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gift-0.11.8.1-gcc4.patch
+# respect %_bindir,%_datadir,%_includedir,%_libdir
+# http://bugzilla.redhat.com/210114
+Patch2: gift-0.11.8.1-fhs.patch
 
 # Wrapper for auto-launch gift-setup for first-time users 
 Source1: giftd.sh
 
 BuildRequires: libtool
-%if "%{?fedora}" > "3"
+%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
 BuildRequires: libtool-ltdl-devel
 %endif
 BuildRequires: libvorbis-devel
@@ -48,6 +47,7 @@
 %setup -q
 
 %patch1 -p1 -b .gcc4
+%patch2 -p1 -b .fhs
 
 
 %build
@@ -85,7 +85,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
+%doc AUTHORS COPYING HACKING QUICKSTART README TODO
 %{_bindir}/gift*
 %{_sbindir}/giftd
 %{_datadir}/giFT/
@@ -101,7 +101,13 @@
 
 
 %changelog
-* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
+- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-5
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4.1
 - fc5: gcc/glibc respin
 
 * Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4



From fedora-extras-commits at redhat.com  Tue Oct 10 12:44:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:44:23 -0700
Subject: rpms/gift/devel gift.spec,1.5,1.6
Message-ID: <200610101244.k9ACiPJq023158@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23141

Modified Files:
	gift.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gift.spec	29 Aug 2006 17:35:06 -0000	1.5
+++ gift.spec	10 Oct 2006 12:44:23 -0000	1.6
@@ -6,7 +6,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -15,6 +15,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gift-0.11.8.1-gcc4.patch
+# respect %_bindir,%_datadir,%_includedir,%_libdir
+# http://bugzilla.redhat.com/210114
+Patch2: gift-0.11.8.1-fhs.patch
 
 # Wrapper for auto-launch gift-setup for first-time users 
 Source1: giftd.sh
@@ -44,6 +47,7 @@
 %setup -q
 
 %patch1 -p1 -b .gcc4
+%patch2 -p1 -b .fhs
 
 
 %build
@@ -81,7 +85,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
+%doc AUTHORS COPYING HACKING QUICKSTART README TODO
 %{_bindir}/gift*
 %{_sbindir}/giftd
 %{_datadir}/giFT/
@@ -97,10 +101,13 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
+- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-5
 - fc6 respin
 
-* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4.1
 - fc5: gcc/glibc respin
 
 * Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4



From fedora-extras-commits at redhat.com  Tue Oct 10 12:46:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:46:05 -0700
Subject: rpms/gift/devel gift-0.11.8.1-fhs.patch,NONE,1.1 gift.spec,1.6,1.7
Message-ID: <200610101246.k9ACk7pE023236@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216

Modified Files:
	gift.spec 
Added Files:
	gift-0.11.8.1-fhs.patch 
Log Message:
add missing patch


gift-0.11.8.1-fhs.patch:

--- NEW FILE gift-0.11.8.1-fhs.patch ---
--- gift-0.11.8.1/configure.ac.fhs	2004-11-26 14:31:05.000000000 -0600
+++ gift-0.11.8.1/configure.ac	2006-10-10 07:00:04.000000000 -0500
@@ -342,22 +342,22 @@
     AC_SUBST(prefix)
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 AC_SUBST(libgiftincdir)
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 AC_SUBST(plugindir)
 
-LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${prefix}/lib/giFT")
+LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${libdir}/giFT")
 
 giftdatadir=${prefix}/share/giFT
 AC_SUBST(giftdatadir)
 
 if test x$WIN32 != xyes; then
-    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/share/giFT")
+    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${datadir}/giFT")
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 AC_SUBST(giftperldir)
 
 dnl ###########################################################################
--- gift-0.11.8.1/configure.fhs	2004-11-27 15:12:59.000000000 -0600
+++ gift-0.11.8.1/configure	2006-10-10 07:01:03.000000000 -0500
@@ -25262,30 +25262,30 @@
 
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 
 
 cat >>gconfdefs.h <<_ACEOF
 #ifndef PLUGIN_DIR
-#define PLUGIN_DIR "${prefix}/lib/giFT"
+#define PLUGIN_DIR "${libdir}/giFT"
 #endif
 _ACEOF
 
-giftdatadir=${prefix}/share/giFT
+giftdatadir=${datadir}/giFT
 
 
 if test x$WIN32 != xyes; then
     cat >>gconfdefs.h <<_ACEOF
 #ifndef DATA_DIR
-#define DATA_DIR "${prefix}/share/giFT"
+#define DATA_DIR "${datadir}/giFT"
 #endif
 _ACEOF
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 
 
 


Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gift.spec	10 Oct 2006 12:44:23 -0000	1.6
+++ gift.spec	10 Oct 2006 12:46:05 -0000	1.7
@@ -6,7 +6,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 
 License: GPL
 Group:	 System Environment/Daemons



From fedora-extras-commits at redhat.com  Tue Oct 10 12:48:28 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:48:28 -0700
Subject: rpms/xdg-utils/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xdg-utils.spec, 1.6, 1.7
Message-ID: <200610101248.k9ACmU8g023397@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23376

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
- 1.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 02:05:31 -0000	1.5
+++ .cvsignore	10 Oct 2006 12:48:28 -0000	1.6
@@ -1 +1,3 @@
+clog
 xdg-utils-1.0rc1.tgz
+xdg-utils-1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 02:05:31 -0000	1.5
+++ sources	10 Oct 2006 12:48:28 -0000	1.6
@@ -1 +1 @@
-db93227b8ccde3e7cb0ccd522b0167a6  xdg-utils-1.0rc1.tgz
+69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdg-utils.spec	2 Oct 2006 20:53:56 -0000	1.6
+++ xdg-utils.spec	10 Oct 2006 12:48:28 -0000	1.7
@@ -1,10 +1,8 @@
 
-%define beta rc1 
-
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.9.%{beta}%{?dist}
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -73,6 +71,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
+- 1.0(final)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
 - update %%description (#208926)
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:50:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:50:54 -0700
Subject: rpms/xdg-utils/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xdg-utils.spec, 1.6, 1.7
Message-ID: <200610101250.k9ACouJC023511@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23490

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
- 1.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 02:06:13 -0000	1.5
+++ .cvsignore	10 Oct 2006 12:50:53 -0000	1.6
@@ -1 +1,3 @@
+clog
 xdg-utils-1.0rc1.tgz
+xdg-utils-1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 02:06:13 -0000	1.5
+++ sources	10 Oct 2006 12:50:53 -0000	1.6
@@ -1 +1 @@
-db93227b8ccde3e7cb0ccd522b0167a6  xdg-utils-1.0rc1.tgz
+69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/xdg-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdg-utils.spec	2 Oct 2006 20:54:38 -0000	1.6
+++ xdg-utils.spec	10 Oct 2006 12:50:53 -0000	1.7
@@ -1,10 +1,8 @@
 
-%define beta rc1 
-
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.9.%{beta}%{?dist}
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -73,6 +71,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
+- 1.0(final)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
 - update %%description (#208926)
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:51:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:51:19 -0700
Subject: rpms/xdg-utils/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xdg-utils.spec, 1.6, 1.7
Message-ID: <200610101251.k9ACpLWI023580@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23559

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
- 1.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 02:05:52 -0000	1.5
+++ .cvsignore	10 Oct 2006 12:51:18 -0000	1.6
@@ -1 +1,3 @@
+clog
 xdg-utils-1.0rc1.tgz
+xdg-utils-1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 02:05:52 -0000	1.5
+++ sources	10 Oct 2006 12:51:18 -0000	1.6
@@ -1 +1 @@
-db93227b8ccde3e7cb0ccd522b0167a6  xdg-utils-1.0rc1.tgz
+69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdg-utils.spec	2 Oct 2006 20:54:19 -0000	1.6
+++ xdg-utils.spec	10 Oct 2006 12:51:18 -0000	1.7
@@ -1,10 +1,8 @@
 
-%define beta rc1 
-
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.9.%{beta}%{?dist}
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -73,6 +71,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
+- 1.0(final)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
 - update %%description (#208926)
 



From fedora-extras-commits at redhat.com  Tue Oct 10 13:05:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 06:05:05 -0700
Subject: rpms/libsigc++/devel libsigc++.spec,1.12,1.13
Message-ID: <200610101305.k9AD57cT026593@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26568

Modified Files:
	libsigc++.spec 
Log Message:
Added dist tag


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/devel/libsigc++.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libsigc++.spec	28 Aug 2006 09:53:35 -0000	1.12
+++ libsigc++.spec	10 Oct 2006 13:05:04 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           libsigc++
 Version:        1.2.7
-Release:        3
+Release:        4%{?dist}
 Summary:        Typesafe signal framework for C++
 Group:          System Environment/Libraries
 License:        LGPL
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-4
+- Added dist tag
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct 10 13:19:09 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 10 Oct 2006 06:19:09 -0700
Subject: fedora-security/audit fc5,1.350,1.351 fc6,1.105,1.106
Message-ID: <200610101319.k9ADJ9mp026792@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26771

Modified Files:
	fc5 fc6 
Log Message:
X.org issues need looking at



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- fc5	10 Oct 2006 10:29:16 -0000	1.350
+++ fc5	10 Oct 2006 13:19:06 -0000	1.351
@@ -1,8 +1,10 @@
-p to date CVE as of CVE email 20061008
-Up to date FC5 as of 20061008
+Up to date CVE as of CVE email 20061009
+Up to date FC5 as of 20061009
 
 ** are items that need attention
 
+CVE-2006-5215 ** (X.org, fixed 20060225?)
+CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
@@ -16,6 +18,7 @@
 CVE-2006-4980 VULNERABLE (python) #208166
 CVE-2006-4925 ** openssh
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
+CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- fc6	10 Oct 2006 10:29:16 -0000	1.105
+++ fc6	10 Oct 2006 13:19:06 -0000	1.106
@@ -1,9 +1,11 @@
-Up to date CVE as of CVE email 20061005
+p to date CVE as of CVE email 20061009
 Up to date FC6 as of Test3
 Up to date dist-fc6 rawhide as of 20060929
 
 ** are items that need attention
 
+CVE-2006-5215 ** (X.org, fixed 20060225?)
+CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap)
@@ -17,6 +19,7 @@
 CVE-2006-4980 VULNERABLE (python) [backport in rawhide]
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
+CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Tue Oct 10 13:31:46 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 10 Oct 2006 06:31:46 -0700
Subject: rpms/lilypond-doc/devel .cvsignore, 1.4, 1.5 lilypond-doc.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610101331.k9ADVmuY026966@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26945

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Aug 2006 21:43:05 -0000	1.4
+++ .cvsignore	10 Oct 2006 13:31:46 -0000	1.5
@@ -1 +1 @@
-lilypond-2.8.6-1.documentation.tar.bz2
+lilypond-2.8.7-1.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/lilypond-doc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lilypond-doc.spec	10 Aug 2006 21:43:05 -0000	1.3
+++ lilypond-doc.spec	10 Oct 2006 13:31:46 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           lilypond-doc
-Version:        2.8.6
+Version:        2.8.7
 Release:	1%{?dist}
 Summary:        HTML documentation for LilyPond
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.7-1
+- New release.
+
 * Thu Aug 10 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.6-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Aug 2006 21:43:05 -0000	1.4
+++ sources	10 Oct 2006 13:31:46 -0000	1.5
@@ -1 +1 @@
-1e460125fcf9a7c2223e0282c99d32ac  lilypond-2.8.6-1.documentation.tar.bz2
+492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 13:35:34 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 10 Oct 2006 06:35:34 -0700
Subject: rpms/lilypond-doc/FC-5 .cvsignore, 1.4, 1.5 lilypond-doc.spec, 1.3, 
	1.4 sources, 1.4, 1.5
Message-ID: <200610101335.k9ADZaNl027054@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27033

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Aug 2006 15:56:56 -0000	1.4
+++ .cvsignore	10 Oct 2006 13:35:34 -0000	1.5
@@ -1 +1 @@
-lilypond-2.8.6-1.documentation.tar.bz2
+lilypond-2.8.7-1.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-5/lilypond-doc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lilypond-doc.spec	11 Aug 2006 15:56:56 -0000	1.3
+++ lilypond-doc.spec	10 Oct 2006 13:35:34 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           lilypond-doc
-Version:        2.8.6
+Version:        2.8.7
 Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.7-1
+- New release.
+
 * Fri Aug 11 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.6-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2006 15:56:56 -0000	1.4
+++ sources	10 Oct 2006 13:35:34 -0000	1.5
@@ -1 +1 @@
-1e460125fcf9a7c2223e0282c99d32ac  lilypond-2.8.6-1.documentation.tar.bz2
+492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 13:59:59 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 10 Oct 2006 06:59:59 -0700
Subject: rpms/ganymed-ssh2/devel .cvsignore, 1.2, 1.3 ganymed-ssh2.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610101400.k9AE01Cp027252@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230

Modified Files:
	.cvsignore ganymed-ssh2.spec sources 
Log Message:
Update to upstream release 210



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2006 01:48:12 -0000	1.2
+++ .cvsignore	10 Oct 2006 13:59:59 -0000	1.3
@@ -1 +1 @@
-ganymed-ssh2-build209.zip
+ganymed-ssh2-build210.zip


Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/devel/ganymed-ssh2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ganymed-ssh2.spec	28 Aug 2006 03:30:24 -0000	1.3
+++ ganymed-ssh2.spec	10 Oct 2006 13:59:59 -0000	1.4
@@ -2,8 +2,8 @@
 
 
 Name:           ganymed-ssh2
-Version:        209
-Release:        6%{?dist}
+Version:        210
+Release:        2%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
+- Update to upstream release 210
+
 * Sun Aug 27 2006 Robert Marcano <robert at marcanoonline.com> 209-6
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 01:48:12 -0000	1.2
+++ sources	10 Oct 2006 13:59:59 -0000	1.3
@@ -1 +1 @@
-b0ee2f0feeb5f4ae02c2d5269fe6e1e0  ganymed-ssh2-build209.zip
+abd0fb2acbfb5885e1ae3af8f1f6b31e  ganymed-ssh2-build210.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 14:15:42 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 10 Oct 2006 07:15:42 -0700
Subject: rpms/ganymed-ssh2/FC-5 .cvsignore, 1.2, 1.3 ganymed-ssh2.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200610101415.k9AEFiJQ030306@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30285

Modified Files:
	.cvsignore ganymed-ssh2.spec sources 
Log Message:
Update to upstream release 210



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2006 01:48:12 -0000	1.2
+++ .cvsignore	10 Oct 2006 14:15:42 -0000	1.3
@@ -1 +1 @@
-ganymed-ssh2-build209.zip
+ganymed-ssh2-build210.zip


Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/FC-5/ganymed-ssh2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ganymed-ssh2.spec	28 Jul 2006 10:59:45 -0000	1.2
+++ ganymed-ssh2.spec	10 Oct 2006 14:15:42 -0000	1.3
@@ -2,8 +2,8 @@
 
 
 Name:           ganymed-ssh2
-Version:        209
-Release:        5%{?dist}
+Version:        210
+Release:        2%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
+- Update to upstream release 210
+
+* Sun Aug 27 2006 Robert Marcano <robert at marcanoonline.com> 209-6
+- Rebuild
+
 * Fri Jul 28 2006 Robert Marcano <robert at marcanoonline.com> 209-5
 - Rebuilt to pick up the changes in GCJ (bug #200480)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 01:48:12 -0000	1.2
+++ sources	10 Oct 2006 14:15:42 -0000	1.3
@@ -1 +1 @@
-b0ee2f0feeb5f4ae02c2d5269fe6e1e0  ganymed-ssh2-build209.zip
+abd0fb2acbfb5885e1ae3af8f1f6b31e  ganymed-ssh2-build210.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 14:17:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 10 Oct 2006 07:17:18 -0700
Subject: comps comps-fe5.xml.in,1.164,1.165 comps-fe6.xml.in,1.180,1.181
Message-ID: <200610101417.k9AEHKEa030372@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30353

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added oorexx


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- comps-fe5.xml.in	8 Oct 2006 12:29:52 -0000	1.164
+++ comps-fe5.xml.in	10 Oct 2006 14:17:18 -0000	1.165
@@ -138,6 +138,7 @@
       <packagereq type="optional">monotone</packagereq>
       <packagereq type="optional">nqc</packagereq>
       <packagereq type="optional">ocaml</packagereq>
+      <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">patchy</packagereq>
       <packagereq type="optional">pikdev</packagereq>
       <packagereq type="optional">pl</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- comps-fe6.xml.in	8 Oct 2006 16:04:46 -0000	1.180
+++ comps-fe6.xml.in	10 Oct 2006 14:17:18 -0000	1.181
@@ -166,6 +166,7 @@
       <packagereq type="optional">monotone</packagereq>
       <packagereq type="optional">nqc</packagereq>
       <packagereq type="optional">ocaml</packagereq>
+      <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">patchy</packagereq>
       <packagereq type="optional">perltidy</packagereq>
       <packagereq type="optional">pgadmin3</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 10 15:18:38 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:18:38 -0700
Subject: rpms/python-turbocheetah - New directory
Message-ID: <200610101518.k9AFIeP7001534@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1511/python-turbocheetah

Log Message:
Directory /cvs/extras/rpms/python-turbocheetah added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 15:18:39 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:18:39 -0700
Subject: rpms/python-turbocheetah/devel - New directory
Message-ID: <200610101518.k9AFIfK4001537@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1511/python-turbocheetah/devel

Log Message:
Directory /cvs/extras/rpms/python-turbocheetah/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 15:18:51 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:18:51 -0700
Subject: rpms/python-turbocheetah/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610101518.k9AFIrQx001599@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1561/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-turbocheetah


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 15:18:50 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:18:50 -0700
Subject: rpms/python-turbocheetah Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610101518.k9AFIqSg001596@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1561

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-turbocheetah


--- NEW FILE Makefile ---
# Top level Makefile for module python-turbocheetah
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 15:19:08 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:19:08 -0700
Subject: rpms/python-turbocheetah import.log,1.1,1.2
Message-ID: <200610101519.k9AFJACr001665@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1632

Modified Files:
	import.log 
Log Message:
auto-import python-turbocheetah-0.9.5-4 on branch devel from python-turbocheetah-0.9.5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-turbocheetah/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 15:18:50 -0000	1.1
+++ import.log	10 Oct 2006 15:19:08 -0000	1.2
@@ -0,0 +1 @@
+python-turbocheetah-0_9_5-4:HEAD:python-turbocheetah-0.9.5-4.src.rpm:1160493674



From fedora-extras-commits at redhat.com  Tue Oct 10 15:19:09 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:19:09 -0700
Subject: rpms/python-turbocheetah/devel python-turbocheetah.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610101519.k9AFJBIG001671@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1632/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-turbocheetah.spec 
Log Message:
auto-import python-turbocheetah-0.9.5-4 on branch devel from python-turbocheetah-0.9.5-4.src.rpm


--- NEW FILE python-turbocheetah.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%define module turbocheetah

Name:           python-turbocheetah
Version:        0.9.5
Release:        4%{?dist}
Summary:        TurboGears plugin to support use of Cheetah templates

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org/docs/plugins/template.html
Source0:        http://cheeseshop.python.org/packages/source/T/TurboCheetah/TurboCheetah-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools
Requires:       python-cheetah >= 1.0

%description
This package provides a template engine plugin, allowing you
to easily use Cheetah with TurboGears, Buffet and other tools that
support the python.templating.engines entry point.


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


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
rm -fr %{buildroot}/%{python_sitelib}/%{module}/tests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/%{module}/
%{python_sitelib}/TurboCheetah-%{version}-py%{pyver}.egg-info


%changelog
* Tue Oct 10 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-4
- Fix Source0
- Own %%{python_sitelib}/turbocheetah

* Fri Oct  6 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-3
- Add python-setuptools to BuildRequires
- Remove tests directory

* Sat Sep 30 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-2
- Rename to python-turbocheetah
- Install egg-info
- Add README

* Sat Sep 16 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-1
- Initial creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-turbocheetah/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 15:18:50 -0000	1.1
+++ .cvsignore	10 Oct 2006 15:19:09 -0000	1.2
@@ -0,0 +1 @@
+TurboCheetah-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-turbocheetah/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 15:18:50 -0000	1.1
+++ sources	10 Oct 2006 15:19:09 -0000	1.2
@@ -0,0 +1 @@
+52e12130302a218a8e3b925447041be4  TurboCheetah-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 15:19:22 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:19:22 -0700
Subject: owners owners.list,1.1811,1.1812
Message-ID: <200610101519.k9AFJONW001726@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1707

Modified Files:
	owners.list 
Log Message:
Add python-turbocheetah to owners list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1811
retrieving revision 1.1812
diff -u -r1.1811 -r1.1812
--- owners.list	10 Oct 2006 10:10:07 -0000	1.1811
+++ owners.list	10 Oct 2006 15:19:22 -0000	1.1812
@@ -1890,6 +1890,7 @@
 Fedora Extras|python-telepathy|Python libraries for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-TestGears|Unit testing for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-turbocheetah|TurboGears plugin to support use of Cheetah templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 15:40:07 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 10 Oct 2006 08:40:07 -0700
Subject: owners owners.list,1.1812,1.1813
Message-ID: <200610101540.k9AFe95H002098@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2081

Modified Files:
	owners.list 
Log Message:
Take ownership of fyre


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1812
retrieving revision 1.1813
diff -u -r1.1812 -r1.1813
--- owners.list	10 Oct 2006 15:19:22 -0000	1.1812
+++ owners.list	10 Oct 2006 15:40:07 -0000	1.1813
@@ -432,7 +432,7 @@
 Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|fyre|A tool for creating artwork from chaotic functions|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|fyre|A tool for creating artwork from chaotic functions|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 15:42:39 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 10 Oct 2006 08:42:39 -0700
Subject: rpms/fyre/devel .cvsignore, 1.2, 1.3 fyre.spec, 1.15, 1.16 sources, 
	1.2, 1.3 fyre-1.0.0-apps.patch, 1.1, NONE
Message-ID: <200610101542.k9AFgfSL002185@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2164

Modified Files:
	.cvsignore fyre.spec sources 
Removed Files:
	fyre-1.0.0-apps.patch 
Log Message:
* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.1-1
- Update to 1.0.1.
- Scriptlet cleanup.
- Drop app patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Mar 2005 16:33:15 -0000	1.2
+++ .cvsignore	10 Oct 2006 15:42:39 -0000	1.3
@@ -1 +1 @@
-fyre-1.0.0.tar.bz2
+fyre-1.0.1.tar.bz2


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fyre.spec	17 Sep 2006 20:45:05 -0000	1.15
+++ fyre.spec	10 Oct 2006 15:42:39 -0000	1.16
@@ -1,21 +1,31 @@
 Name:           fyre
-Version:        1.0.0
-Release:        15%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
+Summary:        Tool for creating artwork from chaotic functions
 
-Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://fyre.navi.cx/
-Source0:        http://flapjack.navi.cx/releases/fyre/fyre-1.0.0.tar.bz2
-Source1:        fyre-cluster.init
-Source2:        fyre.config
-Patch:          fyre-1.0.0-apps.patch
+Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
+Source1:        %{name}-cluster.init
+Source2:        %{name}.config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
-Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(preun): initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info
+BuildRequires:  libglade2-devel
+BuildRequires:	gnet2-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	shared-mime-info
+
+Requires(post): desktop-file-utils
+Requires(post):	shared-mime-info
+Requires(post):	/sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
+
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -24,60 +34,79 @@
 line interface for easy and efficient rendering of high-resolution, high
 quality images.
 
+
 %prep
 %setup -q
-%patch -p 1 -b .apps
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-desktop-file-install --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --add-category=GTK \
-  --delete-original \
+make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install --vendor fedora --delete-original	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
+  --add-category X-Fedora			        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/fyre-cluster
 install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/fyre
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null ||:
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
+
 %preun
 if [ $1 = 0 ]; then
- /sbin/chkconfig --del fyre-cluster
- /sbin/service fyre-cluster stop >> /dev/null
+	/sbin/service fyre-cluster stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del fyre-cluster
 fi
 
+
 %postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/*
+%{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/mimetypes/*
-%{_datadir}/mime/packages/*
-%{_datadir}/pixmaps/*
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-%{name}-animation.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/mime/packages/%{name}.xml
 %{_initrddir}/fyre-cluster
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1.
+- Scriptlet cleanup.
+- Drop app patch.
+
 * Mon Sep 18 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.0.0-15
 - rebuilt due to broken depends.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Mar 2005 16:33:15 -0000	1.2
+++ sources	10 Oct 2006 15:42:39 -0000	1.3
@@ -1 +1 @@
-5da821b3166d3de187cc7d84bb1dc4d3  fyre-1.0.0.tar.bz2
+3058bb171f76ced74f79d876f296ac6f  fyre-1.0.1.tar.bz2


--- fyre-1.0.0-apps.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 15:46:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:46:56 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200610101547.k9AFlSox002247@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2193/FC-5

Modified Files:
	perl-Moose.spec sources 
Log Message:
update to 0.14



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Moose.spec	4 Oct 2006 04:24:23 -0000	1.3
+++ perl-Moose.spec	10 Oct 2006 15:46:56 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -28,13 +28,6 @@
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
 
-# cpanspec autogenerated requires...
-#Requires:       perl(Class::MOP) >= 0.34
-#Requires:       perl(Sub::Exporter) >= 0.954
-#Requires:       perl(Sub::Install) >= 0.92
-#Requires:       perl(Sub::Name) >= 0.02
-#Requires:       perl(UNIVERSAL::require) >= 0.10
-
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -68,6 +61,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+- drop some cruft from the specfile
+
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update to 0.13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:24:23 -0000	1.3
+++ sources	10 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-f3f4edbf510006ea7cc9cb3092eb4883  Moose-0.13.tar.gz
+78839b212fb9712c37e60588042fc829  Moose-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 15:46:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:46:55 -0700
Subject: rpms/perl-Moose Makefile,1.2,1.3
Message-ID: <200610101547.k9AFlRHU002243@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2193

Modified Files:
	Makefile 
Log Message:
update to 0.14



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	4 Oct 2006 04:24:22 -0000	1.2
+++ Makefile	10 Oct 2006 15:46:55 -0000	1.3
@@ -2,12 +2,14 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
 # tag & build all non-legacy branches...
 build-all :
-	@echo WARNING: building for devel and FC-5
+	@echo NOTICE: building for ${BRANCHES}
 	@sleep 5s
-	@cd FC-5  && test -f dead.package || ( make tag && make plague )
-	@cd devel && test -f dead.package || ( make tag && make plague )
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
 
 common-update : common
 	@cd common && cvs update



From fedora-extras-commits at redhat.com  Tue Oct 10 15:46:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:46:57 -0700
Subject: rpms/perl-Moose/devel .cvsignore, 1.3, 1.4 perl-Moose.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200610101547.k9AFlTEH002252@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2193/devel

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
update to 0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 04:24:23 -0000	1.3
+++ .cvsignore	10 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-Moose-0.13.tar.gz
+Moose-0.14.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Moose.spec	4 Oct 2006 04:24:23 -0000	1.3
+++ perl-Moose.spec	10 Oct 2006 15:46:56 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -28,13 +28,6 @@
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
 
-# cpanspec autogenerated requires...
-#Requires:       perl(Class::MOP) >= 0.34
-#Requires:       perl(Sub::Exporter) >= 0.954
-#Requires:       perl(Sub::Install) >= 0.92
-#Requires:       perl(Sub::Name) >= 0.02
-#Requires:       perl(UNIVERSAL::require) >= 0.10
-
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -68,6 +61,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+- drop some cruft from the specfile
+
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update to 0.13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:24:23 -0000	1.3
+++ sources	10 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-f3f4edbf510006ea7cc9cb3092eb4883  Moose-0.13.tar.gz
+78839b212fb9712c37e60588042fc829  Moose-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 15:53:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:53:45 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.4,1.5
Message-ID: <200610101553.k9AFrl1J002353@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2322/FC-5

Modified Files:
	perl-Moose.spec 
Log Message:
update %%dscription


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Moose.spec	10 Oct 2006 15:46:56 -0000	1.4
+++ perl-Moose.spec	10 Oct 2006 15:53:45 -0000	1.5
@@ -33,6 +33,20 @@
 %description
 Moose is an extension of the Perl 5 object system.
 
+Yes, I know there has been an explosion recently of new ways to build
+objects in Perl 5, most of them based on inside-out objects and other
+such things. Moose is different because it is not a new object system
+for Perl 5, but instead an extension of the existing object system.
+
+Moose is built on top of Class::MOP, which is a metaclass system for
+Perl 5. This means that Moose not only makes building normal Perl 5
+objects better, but it also provides the power of metaclass programming.
+
+While Moose is very much inspired by Perl 6, it is not itself Perl
+6.  Instead, it is an OO system for Perl 5. I built Moose because I was
+tired or writing the same old boring Perl 5 OO code, and drooling over
+Perl 6 OO. So instead of switching to Ruby, I wrote Moose :)
+
 %prep
 %setup -q -n Moose-%{version}
 
@@ -64,6 +78,7 @@
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
 - update to 0.14
 - drop some cruft from the specfile
+- make %%description a touch more verbose :)
 
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update to 0.13



From fedora-extras-commits at redhat.com  Tue Oct 10 15:53:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:53:46 -0700
Subject: rpms/perl-Moose/devel perl-Moose.spec,1.4,1.5
Message-ID: <200610101553.k9AFrmAr002357@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2322/devel

Modified Files:
	perl-Moose.spec 
Log Message:
update %%dscription


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Moose.spec	10 Oct 2006 15:46:56 -0000	1.4
+++ perl-Moose.spec	10 Oct 2006 15:53:46 -0000	1.5
@@ -33,6 +33,20 @@
 %description
 Moose is an extension of the Perl 5 object system.
 
+Yes, I know there has been an explosion recently of new ways to build
+objects in Perl 5, most of them based on inside-out objects and other
+such things. Moose is different because it is not a new object system
+for Perl 5, but instead an extension of the existing object system.
+
+Moose is built on top of Class::MOP, which is a metaclass system for
+Perl 5. This means that Moose not only makes building normal Perl 5
+objects better, but it also provides the power of metaclass programming.
+
+While Moose is very much inspired by Perl 6, it is not itself Perl
+6.  Instead, it is an OO system for Perl 5. I built Moose because I was
+tired or writing the same old boring Perl 5 OO code, and drooling over
+Perl 6 OO. So instead of switching to Ruby, I wrote Moose :)
+
 %prep
 %setup -q -n Moose-%{version}
 
@@ -64,6 +78,7 @@
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
 - update to 0.14
 - drop some cruft from the specfile
+- make %%description a touch more verbose :)
 
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update to 0.13



From fedora-extras-commits at redhat.com  Tue Oct 10 15:54:32 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 10 Oct 2006 08:54:32 -0700
Subject: rpms/python-telepathy/devel .cvsignore, 1.2,
	1.3 python-telepathy.spec, 1.3, 1.4 sources, 1.2,
	1.3 python-telepathy-connection-manager.patch, 1.1, NONE
Message-ID: <200610101554.k9AFsZEr002467@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2446

Modified Files:
	.cvsignore python-telepathy.spec sources 
Removed Files:
	python-telepathy-connection-manager.patch 
Log Message:
* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.3-1
- Update to 0.13.3.
- Drop connection-manager patch, fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2006 13:08:24 -0000	1.2
+++ .cvsignore	10 Oct 2006 15:54:32 -0000	1.3
@@ -1 +1 @@
-telepathy-python-0.13.2.tar.gz
+telepathy-python-0.13.3.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-telepathy.spec	2 Oct 2006 19:10:49 -0000	1.3
+++ python-telepathy.spec	10 Oct 2006 15:54:32 -0000	1.4
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.13.2
-Release:        3%{?dist}
+Version:        0.13.3
+Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
-Patch0:		%{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q -n telepathy-python-%{version}
-%patch0 -b .connection-manager
 
 
 %build
@@ -45,6 +43,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.3-1
+- Update to 0.13.3.
+- Drop connection-manager patch, fixed upstream.
+
 * Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-3
 - Actually use the name variable for the patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2006 13:08:24 -0000	1.2
+++ sources	10 Oct 2006 15:54:32 -0000	1.3
@@ -1 +1 @@
-4edb4167934be3fec5c27240aa8da28b  telepathy-python-0.13.2.tar.gz
+1ca0c6670d0feb827b45ecbfe46f1e8d  telepathy-python-0.13.3.tar.gz


--- python-telepathy-connection-manager.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 16:12:24 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Tue, 10 Oct 2006 09:12:24 -0700
Subject: rpms/kadu/devel kadu.spec,1.11,1.12
Message-ID: <200610101612.k9AGCQRk005577@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5560

Modified Files:
	kadu.spec 
Log Message:
* Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.15.20060915svn
- Another fix to not rebuilding kadu-amarok



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kadu.spec	7 Oct 2006 17:05:30 -0000	1.11
+++ kadu.spec	10 Oct 2006 16:12:24 -0000	1.12
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.14.%{cvs_date}svn%{?dist}
+Release:	0.15.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -244,7 +244,9 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
+%ifnarch ppc64 x86_64 s390 s390x ia64
 	module_amarok \
+%endif
 	module_filedesc \
 	module_spellchecker \
 	module_weather \
@@ -409,13 +411,6 @@
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
 
-%else
-
-%ghost %{_modlib}/amarok.so
-%ghost %{_moddata}/amarok.desc
-%ghost %{_moddata}/data/amarok
-%ghost %{_modtrans}/amarok*
-
 %endif
 
 %mod_files2 filedesc
@@ -458,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.15.20060915svn
+- Another fix to not rebuilding kadu-amarok
+
 * Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.14.20060915svn
 - It really shoud work now
 



From fedora-extras-commits at redhat.com  Tue Oct 10 16:21:29 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 10 Oct 2006 09:21:29 -0700
Subject: rpms/wcstools/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wcstools.spec, 1.2, 1.3 wcstools3-codewarn.patch, 1.1,
	1.2 wcstools3-tmpfile.patch, 1.1, NONE
Message-ID: <200610101621.k9AGLVf8005694@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5668

Modified Files:
	.cvsignore sources wcstools.spec wcstools3-codewarn.patch 
Removed Files:
	wcstools3-tmpfile.patch 
Log Message:
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 17:27:53 -0000	1.2
+++ .cvsignore	10 Oct 2006 16:21:29 -0000	1.3
@@ -1 +1 @@
-wcstools-3.6.5.tar.gz
+wcstools-3.6.6beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 17:27:53 -0000	1.2
+++ sources	10 Oct 2006 16:21:29 -0000	1.3
@@ -1 +1 @@
-9cd9bbbe1408c2d92728d8f039291fb3  wcstools-3.6.5.tar.gz
+cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/wcstools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wcstools.spec	4 Sep 2006 11:21:18 -0000	1.2
+++ wcstools.spec	10 Oct 2006 16:21:29 -0000	1.3
@@ -1,18 +1,16 @@
 Name: wcstools
-Version: 3.6.5
-Release: 2%{?dist}
+Version: 3.6.6
+Release: 0.1.beta%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
-Patch2: wcstools3-tmpfile.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 Wcstools is a set of software utilities, written in C, which create,
 display and manipulate the world coordinate system of a FITS or IRAF
@@ -35,7 +33,7 @@
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
 License: LGPL
-Requires: %{name} = %{version}-%{release}
+Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
 
@@ -43,7 +41,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all
@@ -74,6 +71,7 @@
 
 %files -n libwcs
 %defattr(-,root,root)
+%doc libwcs/COPYING
 %{_libdir}/*.so.*
 
 %files -n libwcs-devel
@@ -84,6 +82,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
+- New upstream source 3.6.6beta
 * Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
 - Corrected bug in edhead (patch2) (bug #204642).
 * Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/wcstools3-codewarn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wcstools3-codewarn.patch	26 Jun 2006 17:27:53 -0000	1.1
+++ wcstools3-codewarn.patch	10 Oct 2006 16:21:29 -0000	1.2
@@ -1,18 +1,17 @@
-diff -ur wcstools-3.6.5.orig/getdate.c wcstools-3.6.5/getdate.c
---- wcstools-3.6.5.orig/getdate.c	2006-06-22 01:46:49.000000000 +0200
-+++ wcstools-3.6.5/getdate.c	2006-06-23 10:23:36.000000000 +0200
-@@ -382,7 +382,7 @@
-     char outform[16];
-     char *fitsdate, *newfdate;
++++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
+--- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
+@@ -413,7 +413,7 @@
+     char *fitsdate, *newfdate, *stdate;
      char temp[64];
+     char fyear[16];
 -    char ts0[8];
 +    char ts0[9];
      char *tchar;
      int its, its1;
      time_t lts;
-diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c
---- wcstools-3.6.5.orig/libwcs/binread.c	2006-06-20 22:07:37.000000000 +0200
-+++ wcstools-3.6.5/libwcs/binread.c	2006-06-23 10:24:39.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
+--- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
 @@ -1358,7 +1358,7 @@
  	for (i = 0; i < nmag; i++) {
  	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
@@ -22,9 +21,9 @@
  	    st->xmag[i] = 0.01 * (double) st->mag[i];
  	    }
  	}
-diff -ur wcstools-3.6.5.orig/libwcs/catutil.c wcstools-3.6.5/libwcs/catutil.c
---- wcstools-3.6.5.orig/libwcs/catutil.c	2006-06-20 21:05:14.000000000 +0200
-+++ wcstools-3.6.5/libwcs/catutil.c	2006-06-23 10:29:31.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
+--- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
 @@ -722,7 +722,7 @@
  	    lname = 0;
  	else


--- wcstools3-tmpfile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 16:26:32 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 10 Oct 2006 09:26:32 -0700
Subject: rpms/wcstools/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wcstools.spec, 1.2, 1.3 wcstools3-codewarn.patch, 1.1,
	1.2 wcstools3-tmpfile.patch, 1.1, NONE
Message-ID: <200610101626.k9AGQY0M005804@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778

Modified Files:
	.cvsignore sources wcstools.spec wcstools3-codewarn.patch 
Removed Files:
	wcstools3-tmpfile.patch 
Log Message:
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 17:27:53 -0000	1.2
+++ .cvsignore	10 Oct 2006 16:26:31 -0000	1.3
@@ -1 +1 @@
-wcstools-3.6.5.tar.gz
+wcstools-3.6.6beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 17:27:53 -0000	1.2
+++ sources	10 Oct 2006 16:26:31 -0000	1.3
@@ -1 +1 @@
-9cd9bbbe1408c2d92728d8f039291fb3  wcstools-3.6.5.tar.gz
+cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-4/wcstools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wcstools.spec	4 Sep 2006 11:22:52 -0000	1.2
+++ wcstools.spec	10 Oct 2006 16:26:31 -0000	1.3
@@ -1,18 +1,16 @@
 Name: wcstools
-Version: 3.6.5
-Release: 2%{?dist}
+Version: 3.6.6
+Release: 0.1.beta%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
-Patch2: wcstools3-tmpfile.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 Wcstools is a set of software utilities, written in C, which create,
 display and manipulate the world coordinate system of a FITS or IRAF
@@ -35,7 +33,7 @@
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
 License: LGPL
-Requires: %{name} = %{version}-%{release}
+Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
 
@@ -43,7 +41,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all
@@ -74,6 +71,7 @@
 
 %files -n libwcs
 %defattr(-,root,root)
+%doc libwcs/COPYING
 %{_libdir}/*.so.*
 
 %files -n libwcs-devel
@@ -84,6 +82,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
+- New upstream source 3.6.6beta
 * Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
 - Corrected bug in edhead (patch2) (bug #204642).
 * Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-4/wcstools3-codewarn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wcstools3-codewarn.patch	26 Jun 2006 17:27:53 -0000	1.1
+++ wcstools3-codewarn.patch	10 Oct 2006 16:26:31 -0000	1.2
@@ -1,18 +1,17 @@
-diff -ur wcstools-3.6.5.orig/getdate.c wcstools-3.6.5/getdate.c
---- wcstools-3.6.5.orig/getdate.c	2006-06-22 01:46:49.000000000 +0200
-+++ wcstools-3.6.5/getdate.c	2006-06-23 10:23:36.000000000 +0200
-@@ -382,7 +382,7 @@
-     char outform[16];
-     char *fitsdate, *newfdate;
++++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
+--- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
+@@ -413,7 +413,7 @@
+     char *fitsdate, *newfdate, *stdate;
      char temp[64];
+     char fyear[16];
 -    char ts0[8];
 +    char ts0[9];
      char *tchar;
      int its, its1;
      time_t lts;
-diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c
---- wcstools-3.6.5.orig/libwcs/binread.c	2006-06-20 22:07:37.000000000 +0200
-+++ wcstools-3.6.5/libwcs/binread.c	2006-06-23 10:24:39.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
+--- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
 @@ -1358,7 +1358,7 @@
  	for (i = 0; i < nmag; i++) {
  	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
@@ -22,9 +21,9 @@
  	    st->xmag[i] = 0.01 * (double) st->mag[i];
  	    }
  	}
-diff -ur wcstools-3.6.5.orig/libwcs/catutil.c wcstools-3.6.5/libwcs/catutil.c
---- wcstools-3.6.5.orig/libwcs/catutil.c	2006-06-20 21:05:14.000000000 +0200
-+++ wcstools-3.6.5/libwcs/catutil.c	2006-06-23 10:29:31.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
+--- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
 @@ -722,7 +722,7 @@
  	    lname = 0;
  	else


--- wcstools3-tmpfile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 17:01:31 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Tue, 10 Oct 2006 10:01:31 -0700
Subject: rpms/kadu/FC-5 kadu.spec,1.5,1.6
Message-ID: <200610101701.k9AH1XGt008970@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8941

Modified Files:
	kadu.spec 
Log Message:
* Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.9.20060915svn
- Not rebuilding kadu-amarok on some archs



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kadu.spec	16 Sep 2006 10:20:48 -0000	1.5
+++ kadu.spec	10 Oct 2006 17:01:31 -0000	1.6
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.8.%{cvs_date}svn%{?dist}
+Release:	0.9.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -244,7 +244,9 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
+%ifnarch ppc64 x86_64 s390 s390x ia64
 	module_amarok \
+%endif
 	module_filedesc \
 	module_spellchecker \
 	module_weather \
@@ -406,8 +408,11 @@
 
 %mod_files2 xmms
 
+%ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
 
+%endif
+
 %mod_files2 filedesc
 
 %mod_files2 spellchecker
@@ -448,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.9.20060915svn
+- Not rebuilding kadu-amarok on some archs
+
 * Sat Sep 16 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.8.20060915svn
 - Update upstream to 20060915
 - Move themes to external spec file



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:17 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:17 -0700
Subject: rpms/perl-SQL-Library - New directory
Message-ID: <200610101815.k9AIFJUT012350@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324/perl-SQL-Library

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Library added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:22 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:22 -0700
Subject: rpms/perl-SQL-Library Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610101815.k9AIFOCU012393@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12360

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-SQL-Library


--- NEW FILE Makefile ---
# Top level Makefile for module perl-SQL-Library
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:18 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:18 -0700
Subject: rpms/perl-SQL-Library/devel - New directory
Message-ID: <200610101815.k9AIFKuJ012353@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324/perl-SQL-Library/devel

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Library/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:23 -0700
Subject: rpms/perl-SQL-Library/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610101815.k9AIFPGa012396@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12360/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-SQL-Library


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:31 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:31 -0700
Subject: rpms/perl-SQL-Library import.log,1.1,1.2
Message-ID: <200610101815.k9AIFXun012442@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409

Modified Files:
	import.log 
Log Message:
auto-import perl-SQL-Library-0.0.3-1.fc5 on branch devel from perl-SQL-Library-0.0.3-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 18:15:22 -0000	1.1
+++ import.log	10 Oct 2006 18:15:30 -0000	1.2
@@ -0,0 +1 @@
+perl-SQL-Library-0_0_3-1_fc5:HEAD:perl-SQL-Library-0.0.3-1.fc5.src.rpm:1160504130



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:31 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:31 -0700
Subject: rpms/perl-SQL-Library/devel perl-SQL-Library.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610101815.k9AIFXcx012447@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-SQL-Library.spec 
Log Message:
auto-import perl-SQL-Library-0.0.3-1.fc5 on branch devel from perl-SQL-Library-0.0.3-1.fc5.src.rpm


--- NEW FILE perl-SQL-Library.spec ---
Name:           perl-SQL-Library
Version:        0.0.3
Release:        1%{?dist}
Summary:        Manage libraries of SQL easily 
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/SQL-Library/
Source0:        http://www.cpan.org/authors/id/D/DG/DGORLEY/SQL-Library-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a perl module for managing simple SQL libraries stored in
INI-like files.  It allows developers to maintain the SQL they require 
OUTSIDE of their perl code.

%prep
%setup -q -n SQL-Library-%{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}/*

# the better to doc it later...
cp t/sqltest.lib example.lib

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README example.lib
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0.3-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 18:15:23 -0000	1.1
+++ .cvsignore	10 Oct 2006 18:15:31 -0000	1.2
@@ -0,0 +1 @@
+SQL-Library-0.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 18:15:23 -0000	1.1
+++ sources	10 Oct 2006 18:15:31 -0000	1.2
@@ -0,0 +1 @@
+75b80cb27775bb61f90fbd5b835032ec  SQL-Library-0.0.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:51 -0700
Subject: owners owners.list,1.1813,1.1814
Message-ID: <200610101815.k9AIFrJ4012494@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12477

Modified Files:
	owners.list 
Log Message:
added perl-SQL-Library


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1813
retrieving revision 1.1814
diff -u -r1.1813 -r1.1814
--- owners.list	10 Oct 2006 15:40:07 -0000	1.1813
+++ owners.list	10 Oct 2006 18:15:51 -0000	1.1814
@@ -1601,6 +1601,7 @@
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract-Limit|Portable LIMIT Emulation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-SQL-Library|Manage libraries of SQL easily|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Statistics-Descriptive|Perl module of basic descriptive statistical functions|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1963,8 +1964,8 @@
 Fedora Extras|rman|Converts man pages to various other formats|mpeters at mac.com|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rogue|The original roguelike game|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|root-tail|An app to show log files on the root window|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
+Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rosegarden4|MIDI, audio and notation editor|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 18:16:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:16:11 -0700
Subject: rpms/perl-SQL-Library/devel perl-SQL-Library.spec,1.1,1.2
Message-ID: <200610101816.k9AIGDCh012522@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12505

Modified Files:
	perl-SQL-Library.spec 
Log Message:
release bump


Index: perl-SQL-Library.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/devel/perl-SQL-Library.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SQL-Library.spec	10 Oct 2006 18:15:31 -0000	1.1
+++ perl-SQL-Library.spec	10 Oct 2006 18:16:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Library
 Version:        0.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manage libraries of SQL easily 
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -48,5 +48,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0.3-2
+- bump
+
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0.3-1
 - Specfile autogenerated by cpanspec 1.69.



From fedora-extras-commits at redhat.com  Tue Oct 10 18:17:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:17:48 -0700
Subject: rpms/perl-SQL-Library Makefile,1.1,1.2
Message-ID: <200610101817.k9AIHoKO012592@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12573

Modified Files:
	Makefile 
Log Message:
Add build-all target



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	10 Oct 2006 18:15:22 -0000	1.1
+++ Makefile	10 Oct 2006 18:17:48 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Tue Oct 10 18:24:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 10 Oct 2006 11:24:28 -0700
Subject: fedora-security/audit fe4,1.77,1.78 fe5,1.84,1.85
Message-ID: <200610101824.k9AIOS9u012730@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12705

Modified Files:
	fe4 fe5 
Log Message:
CVE-2006-5129 ** (moodle) #206516


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- fe4	3 Oct 2006 17:59:44 -0000	1.77
+++ fe4	10 Oct 2006 18:24:25 -0000	1.78
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4943 ** (moodle) #206516


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fe5	8 Oct 2006 20:00:31 -0000	1.84
+++ fe5	10 Oct 2006 18:24:25 -0000	1.85
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4943 ** (moodle) #206516



From fedora-extras-commits at redhat.com  Tue Oct 10 18:32:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 11:32:18 -0700
Subject: comps comps-fe5.xml.in,1.165,1.166 comps-fe6.xml.in,1.181,1.182
Message-ID: <200610101832.k9AIWKGw012857@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12838/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add mirrormagic, supertuxkart


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- comps-fe5.xml.in	10 Oct 2006 14:17:18 -0000	1.165
+++ comps-fe5.xml.in	10 Oct 2006 18:32:17 -0000	1.166
@@ -311,6 +311,7 @@
       <packagereq type="optional">lmarbles</packagereq>
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
+      <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>
       <packagereq type="optional">monsterz</packagereq>
       <packagereq type="optional">nazghul</packagereq>
@@ -342,12 +343,12 @@
       <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">sturmbahnfahrer</packagereq>
       <packagereq type="optional">supertux</packagereq>
+      <packagereq type="optional">supertuxkart</packagereq>
       <packagereq type="optional">tong</packagereq>
       <packagereq type="optional">torcs</packagereq>
       <packagereq type="optional">trackballs</packagereq>
       <packagereq type="optional">trackballs-music</packagereq>
       <packagereq type="optional">tremulous</packagereq>
-      <packagereq type="optional">tuxkart</packagereq>
       <packagereq type="optional">tuxpuck</packagereq>
       <packagereq type="optional">ularn</packagereq>
       <packagereq type="optional">uqm</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- comps-fe6.xml.in	10 Oct 2006 14:17:18 -0000	1.181
+++ comps-fe6.xml.in	10 Oct 2006 18:32:17 -0000	1.182
@@ -409,12 +409,12 @@
       <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">sturmbahnfahrer</packagereq>
       <packagereq type="optional">supertux</packagereq>
+      <packagereq type="optional">supertuxkart</packagereq>
       <packagereq type="optional">tong</packagereq>
       <packagereq type="optional">torcs</packagereq>
       <packagereq type="optional">trackballs</packagereq>
       <packagereq type="optional">trackballs-music</packagereq>
       <packagereq type="optional">tremulous</packagereq>
-      <packagereq type="optional">tuxkart</packagereq>
       <packagereq type="optional">tuxpuck</packagereq>
       <packagereq type="optional">ularn</packagereq>
       <packagereq type="optional">uqm</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 10 18:37:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 11:37:20 -0700
Subject: rpms/libassuan/devel libassuan-0.9.3-m4.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 libassuan.spec, 1.18, 1.19 sources, 1.6, 1.7
Message-ID: <200610101837.k9AIbMlR012910@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12886

Modified Files:
	.cvsignore libassuan.spec sources 
Added Files:
	libassuan-0.9.3-m4.patch 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-1
- 0.9.3
- BR: pth-devel, -devel: Requires: pth-devel


libassuan-0.9.3-m4.patch:

--- NEW FILE libassuan-0.9.3-m4.patch ---
--- libassuan-0.9.3/src/libassuan.m4.m4patch	2006-10-06 10:28:15.000000000 -0500
+++ libassuan-0.9.3/src/libassuan.m4	2006-10-10 08:33:12.000000000 -0500
@@ -125,8 +125,8 @@
 AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
 [ _AM_PATH_LIBASSUAN_COMMON($1,pth)
   if test $ok = yes; then
-    LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
-    LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+    LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags`
+    LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs`
     ifelse([$2], , :, [$2])
   else
     LIBASSUAN_PTH_CFLAGS=""
@@ -146,8 +146,8 @@
 AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
 [ _AM_PATH_LIBASSUAN_COMMON($1,pth)
   if test $ok = yes; then
-    LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
-    LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+    LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
+    LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
     ifelse([$2], , :, [$2])
   else
     LIBASSUAN_PTHREAD_CFLAGS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Oct 2006 13:04:36 -0000	1.6
+++ .cvsignore	10 Oct 2006 18:37:19 -0000	1.7
@@ -1,5 +1,5 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-0.9.0.tar.bz2
-libassuan-0.9.0.tar.bz2.sig
 libassuan-0.9.2.tar.bz2.sig
+libassuan-0.9.2.tar.bz2
+libassuan-0.9.3.tar.bz2.sig


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libassuan.spec	6 Oct 2006 13:04:36 -0000	1.18
+++ libassuan.spec	10 Oct 2006 18:37:19 -0000	1.19
@@ -1,7 +1,7 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 0.9.2
+Version: 0.9.3
 Release: 1%{?dist}
 
 License: LGPL
@@ -11,6 +11,10 @@
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: libassuan-0.9.3-m4.patch
+
+BuildRequires: pth-devel
+
 %description
 This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
 packages.
@@ -18,6 +22,7 @@
 %package devel
 Summary: GnuPG IPC library 
 Group: Development/Libraries
+Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 Provides: %{name}-static = %{version}-%{release}
@@ -31,6 +36,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .m4patch
+
 
 %build
 #ifarch x86_64
@@ -67,7 +74,7 @@
 
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_includedir}/*
@@ -77,6 +84,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-1
+- 0.9.3
+- BR: pth-devel, -devel: Requires: pth-devel
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-1
 - 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Oct 2006 13:04:36 -0000	1.6
+++ sources	10 Oct 2006 18:37:19 -0000	1.7
@@ -1,2 +1,2 @@
-727926633709ba7ce9bc721c3d4c0cbc  libassuan-0.9.2.tar.bz2.sig
-dfcfa3f26d49a38534c4a9e10e3bd770  libassuan-0.9.2.tar.bz2
+a2e3cb948de5159728e73d53529ae7ad  libassuan-0.9.3.tar.bz2.sig
+60add4aebf1961436da3a470d6ac833c  libassuan-0.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 18:40:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 11:40:19 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.47,1.48
Message-ID: <200610101840.k9AIeLIN013003@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986

Modified Files:
	gnupg2.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-2
- --enable-selinux-support
- x86_64: --disable-optimization (to avoid gpg2 segfaults), for now



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnupg2.spec	6 Oct 2006 12:57:10 -0000	1.47
+++ gnupg2.spec	10 Oct 2006 18:40:19 -0000	1.48
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -28,13 +28,14 @@
 # http://lists.gnupg.org/pipermail/gnupg-devel/2006-October/023237.html
 Patch1: gnupg-1.9.91-readline.patch
 Patch2: gnupg-1.9.16-testverbose.patch
+Patch3: gnupg-1.9.91-dearmor.patch
 
 Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 0.9.2
+BuildRequires: libassuan-devel >= 0.9.3
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -81,6 +82,7 @@
 
 %patch1 -p1 -b .readline
 %patch2 -p1 -b .testverbose
+%patch3 -p1 -b .dearmor
 
 # 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,
@@ -98,8 +100,11 @@
 
 %configure \
   --disable-rpath \
-  --disable-dependency-tracking \
-  %{?_enable_gpg}
+  --enable-selinux-support \
+  %{?_enable_gpg} \
+%ifarch x86_64
+  --disable-optimization 
+%endif
 
 # not smp-safe
 make 
@@ -109,7 +114,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-make check ||:
+make -k check
 
 
 %install
@@ -172,6 +177,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-2
+- --enable-selinux-support
+- x86_64: --disable-optimization (to avoid gpg2 segfaults), for now
+
 * Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-1
 - 1.9.91
 



From fedora-extras-commits at redhat.com  Tue Oct 10 19:23:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 10 Oct 2006 12:23:19 -0700
Subject: rpms/alsa-oss/FC-5 .cvsignore, NONE, 1.1 alsa-oss-1.0.11-aoss.patch,
	NONE, 1.1 alsa-oss.spec, 1.1, 1.2 sources, 1.1,
	1.2 alsa-oss-1.0.12-aoss.patch, 1.1, NONE
Message-ID: <200610101923.k9AJNLGj016169@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16146

Modified Files:
	alsa-oss.spec sources 
Added Files:
	.cvsignore alsa-oss-1.0.11-aoss.patch 
Removed Files:
	alsa-oss-1.0.12-aoss.patch 
Log Message:

Rolled back to 1.0.11 to kinda-sorta match alsa-lib 1.0.11rc2 in FC-5



--- NEW FILE .cvsignore ---
alsa-oss-1.0.11.tar.bz2

alsa-oss-1.0.11-aoss.patch:

--- NEW FILE alsa-oss-1.0.11-aoss.patch ---
--- alsa/aoss.in.orig	2005-10-27 14:34:18.000000000 -0400
+++ alsa/aoss.in	2006-04-02 15:53:53.000000000 -0400
@@ -5,9 +5,7 @@
 #	aoss <command> <command options and arguments>
 
 if [ -d /proc/asound ]; then
-  prefix=@prefix@
-  exec_prefix=@exec_prefix@
-  LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
+  LD_PRELOAD=@libdir@/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
 else
   exec "$@"
 fi


Index: alsa-oss.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-oss/FC-5/alsa-oss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-oss.spec	6 Oct 2006 14:11:15 -0000	1.1
+++ alsa-oss.spec	10 Oct 2006 19:23:19 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
 Name:		alsa-oss
-Version:	1.0.12
-Release:	3%{?dist}
+Version:	1.0.11
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.alsa-project.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.11-1
+- Initial FC-5 SRPM, backported from devel (to kinda-sorta match alsa-lib)
+
 * Fri Oct 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-3
 - Added conditionalized rpath fixes for x86_64 (thanks Denis!)
 - Re-added *.a to -devel package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-oss/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 14:11:15 -0000	1.1
+++ sources	10 Oct 2006 19:23:19 -0000	1.2
@@ -1 +1 @@
-d4d18bbf63a866d6e065b90e16acd676  alsa-oss-1.0.12.tar.bz2
+3106c2d59a329263867fa3dd44133dda  alsa-oss-1.0.11.tar.bz2


--- alsa-oss-1.0.12-aoss.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 19:37:03 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 10 Oct 2006 12:37:03 -0700
Subject: rpms/stellarium/FC-5 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 stellarium.spec, 1.20, 1.21
Message-ID: <200610101937.k9AJb5CH016274@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253

Modified Files:
	.cvsignore sources stellarium.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Jul 2006 18:32:36 -0000	1.10
+++ .cvsignore	10 Oct 2006 19:37:03 -0000	1.11
@@ -1,2 +1,3 @@
 stellarium-0.8.1.tar.gz
 stellarium_user_guide-0.8.1-1.pdf
+stellarium-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Jul 2006 18:32:36 -0000	1.10
+++ sources	10 Oct 2006 19:37:03 -0000	1.11
@@ -1,2 +1,2 @@
-1a17e3dca472214e0863ea8621de321d  stellarium-0.8.1.tar.gz
 e83ca79bf904e03db869b314d72fd2a8  stellarium_user_guide-0.8.1-1.pdf
+8f4bcfcf6ad74ab57f1a9fc4f3927527  stellarium-0.8.2.tar.gz


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- stellarium.spec	4 Jul 2006 18:32:36 -0000	1.20
+++ stellarium.spec	10 Oct 2006 19:37:03 -0000	1.21
@@ -1,14 +1,14 @@
 Name:           stellarium
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://stellarium.free.fr/
-Source0:        http://prdownloads.sf.net/stellarium/stellarium-%{version}.tar.gz
+Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
-Source2:        http://prdownloads.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
+Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -83,6 +83,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1
+- New upstream release
+
 * Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.1-1
 - New upstream release
 - Fix demaged PDF (#197301)



From fedora-extras-commits at redhat.com  Tue Oct 10 19:38:15 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 10 Oct 2006 12:38:15 -0700
Subject: rpms/stellarium/devel sources,1.10,1.11 stellarium.spec,1.22,1.23
Message-ID: <200610101938.k9AJcH96016338@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16319

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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Jul 2006 18:34:12 -0000	1.10
+++ sources	10 Oct 2006 19:38:15 -0000	1.11
@@ -1,2 +1,2 @@
-1a17e3dca472214e0863ea8621de321d  stellarium-0.8.1.tar.gz
 e83ca79bf904e03db869b314d72fd2a8  stellarium_user_guide-0.8.1-1.pdf
+8f4bcfcf6ad74ab57f1a9fc4f3927527  stellarium-0.8.2.tar.gz


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- stellarium.spec	3 Sep 2006 19:44:00 -0000	1.22
+++ stellarium.spec	10 Oct 2006 19:38:15 -0000	1.23
@@ -1,14 +1,14 @@
 Name:           stellarium
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://stellarium.free.fr/
-Source0:        http://prdownloads.sf.net/stellarium/stellarium-%{version}.tar.gz
+Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
-Source2:        http://prdownloads.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
+Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -83,8 +83,8 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
-* Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.1-2
-- Rebuild for FC-6
+* Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1
+- New upstream release
 
 * Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.1-1
 - New upstream release



From fedora-extras-commits at redhat.com  Tue Oct 10 20:18:48 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 10 Oct 2006 13:18:48 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.4, 1.5 cobbler.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610102018.k9AKIosO019601@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19573

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream updates




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Oct 2006 15:50:54 -0000	1.4
+++ .cvsignore	10 Oct 2006 20:18:47 -0000	1.5
@@ -1,3 +1,4 @@
 cobbler-0.1.1.tar.gz
 cobbler-0.2.1.tar.gz
 cobbler-0.2.2.tar.gz
+cobbler-0.2.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cobbler.spec	6 Oct 2006 15:50:54 -0000	1.3
+++ cobbler.spec	10 Oct 2006 20:18:47 -0000	1.4
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.2
+Version: 0.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/~mdehaan/cobbler
+Url: http://cobbler.et.redhat.com
 
 %description
 
@@ -54,6 +54,9 @@
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
+* Mon Oct 9 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
+- Upstream features (see CHANGELOG) & URL update
+
 * Fri Oct 6 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
 - Upstream bugfixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Oct 2006 15:50:54 -0000	1.4
+++ sources	10 Oct 2006 20:18:47 -0000	1.5
@@ -1 +1 @@
-63e4550219de15865d197a47ac00ecfd  cobbler-0.2.2.tar.gz
+90596f95025ec8180e1907cb2f768fa7  cobbler-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 20:19:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 13:19:15 -0700
Subject: rpms/gnupg2/devel gnupg-1.9.91-dearmor.patch, NONE, 1.1 gnupg2.spec,
	1.48, 1.49
Message-ID: <200610102019.k9AKJHAZ019663@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19605

Modified Files:
	gnupg2.spec 
Added Files:
	gnupg-1.9.91-dearmor.patch 
Log Message:
forgot patch


gnupg-1.9.91-dearmor.patch:

--- NEW FILE gnupg-1.9.91-dearmor.patch ---
--- gnupg-1.9.91/tests/openpgp/Makefile.am.dearmor	2006-09-27 09:09:43.000000000 -0500
+++ gnupg-1.9.91/tests/openpgp/Makefile.am	2006-10-10 13:24:13.000000000 -0500
@@ -63,7 +63,7 @@
 
 ./gpg_dearmor:
 	echo '#!/bin/sh' >./gpg_dearmor
-	echo "../../g10/gpg2 --no-options --no-greeting \
+	echo "../../g10/gpg2 --homedir . --no-options --no-greeting \
              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
 	chmod 755 ./gpg_dearmor
 
--- gnupg-1.9.91/tests/openpgp/Makefile.in.dearmor	2006-10-04 11:54:18.000000000 -0500
+++ gnupg-1.9.91/tests/openpgp/Makefile.in	2006-10-10 13:24:23.000000000 -0500
@@ -580,7 +580,7 @@
 
 ./gpg_dearmor:
 	echo '#!/bin/sh' >./gpg_dearmor
-	echo "../../g10/gpg2 --no-options --no-greeting \
+	echo "../../g10/gpg2 --homedir . --no-options --no-greeting \
              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
 	chmod 755 ./gpg_dearmor
 


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnupg2.spec	10 Oct 2006 18:40:19 -0000	1.48
+++ gnupg2.spec	10 Oct 2006 20:19:15 -0000	1.49
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -177,7 +177,7 @@
 
 
 %changelog
-* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-2
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-3
 - --enable-selinux-support
 - x86_64: --disable-optimization (to avoid gpg2 segfaults), for now
 



From fedora-extras-commits at redhat.com  Tue Oct 10 20:20:02 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 10 Oct 2006 13:20:02 -0700
Subject: rpms/koan/devel .cvsignore, 1.2, 1.3 koan.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200610102020.k9AKK4Wv019736@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19715

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream updates




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 20:15:39 -0000	1.2
+++ .cvsignore	10 Oct 2006 20:20:02 -0000	1.3
@@ -1 +1,2 @@
 koan-0.1.1.tar.gz
+koan-0.2.1.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- koan.spec	28 Sep 2006 21:29:17 -0000	1.4
+++ koan.spec	10 Oct 2006 20:20:02 -0000	1.5
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.1.1
-Release: 10%{?dist}
+Version: 0.2.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/page/Cobbler_%26_Koan_Provisioning_Tools
+Url: http://et.redhat.com/~mdehaan/cobbler
 
 %description
 
@@ -47,23 +47,35 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
-* Thu Sep 28 2006 - 0.1.1-10
-- Building build rev to keep FC-E happy
-* Thu Sep 28 2006 - 0.1.1-9
+* Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
+- Upstream features (see CHANGELOG)
+
+* Thu Sep 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-10
+- Bumping build rev for FC-E
+
+* Thu Sep 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-9
 - Excluding PPC since syslinux (gethostip) isn't available for ppc
-* Thu Sep 21 2006 - 0.1.1-8
+
+* Thu Sep 21 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-8
 - Added doc files to %doc, removed INSTALLED_FILES code
-* Wed Sep 20 2006 - 0.1.1-7
+
+* Wed Sep 20 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-7
 - Upstream updates
-* Fri Sep 15 2006 - 0.1.1-6
+
+* Fri Sep 15 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-6
 - Make koan own it's directory, add GPL "COPYING" file.
-* Wed Aug 16 2006 - 0.1.1-5
+
+* Wed Aug 16 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-5
 - Spec-file only changes for FC-Extras submission
-* Thu Jul 20 2006 - 0.1.1-4
+
+* Thu Jul 20 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-4
 - Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module.
-* Fri Jul 12 2006 - 0.1.1-3
+
+* Fri Jul 12 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-3
 - allow installing with per-system cobbler data in addition to per-profile
-* Thu Jul 09 2006 - 0.1.0-2
+
+* Thu Jul 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.0-2
 - rpm tweaks for Fedora Extras
-* Wed Jun 28 2006 - 0.1.0-1
+
+* Wed Jun 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.0-1
 - rpm genesis


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 21:26:18 -0000	1.3
+++ sources	10 Oct 2006 20:20:02 -0000	1.4
@@ -1 +1 @@
-d1b7df4a1fb022d345d79f3b182d769b  koan-0.1.1.tar.gz
+79137117f164586f4d7fd19f837bec33  koan-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 20:24:10 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:24:10 -0700
Subject: rpms/optipng - New directory
Message-ID: <200610102024.k9AKOCci019860@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19839/optipng

Log Message:
Directory /cvs/extras/rpms/optipng added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 20:24:10 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:24:10 -0700
Subject: rpms/optipng/devel - New directory
Message-ID: <200610102024.k9AKOCcM019863@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19839/optipng/devel

Log Message:
Directory /cvs/extras/rpms/optipng/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 20:24:32 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:24:32 -0700
Subject: rpms/optipng Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610102024.k9AKOYI8019917@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19884

Added Files:
	Makefile import.log 
Log Message:
Setup of module optipng


--- NEW FILE Makefile ---
# Top level Makefile for module optipng
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 20:24:32 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:24:32 -0700
Subject: rpms/optipng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610102024.k9AKOYS9019920@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19884/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module optipng


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 20:25:14 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:25:14 -0700
Subject: rpms/optipng/devel optipng-0.5.4-makefile.patch, NONE,
	1.1 optipng.spec, NONE, 1.1
Message-ID: <200610102025.k9AKPG5t019982@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19953/devel

Added Files:
	optipng-0.5.4-makefile.patch optipng.spec 
Log Message:
auto-import optipng-0.5.4-1 on branch devel from optipng-0.5.4-1.src.rpm

optipng-0.5.4-makefile.patch:

--- NEW FILE optipng-0.5.4-makefile.patch ---
diff -ru optipng-0.5.4.orig/lib/pngxtern/scripts/gcc.mak optipng-0.5.4/lib/pngxtern/scripts/gcc.mak
--- optipng-0.5.4.orig/lib/pngxtern/scripts/gcc.mak	2006-05-10 21:15:00.000000000 +0200
+++ optipng-0.5.4/lib/pngxtern/scripts/gcc.mak	2006-09-14 22:17:47.528801620 +0200
@@ -17,7 +17,9 @@
 CDEBUG = -g
 LDDEBUG =
 CRELEASE = -O2
-LDRELEASE = -s
+
+# remove -s from LDRELEASE to prevent stripping
+LDRELEASE = 
 CFLAGS = -Wall $(CRELEASE)
 LDFLAGS = $(LDRELEASE)
 LIBS = -lpng -lz -lm
@@ -37,7 +39,7 @@
 all: pngxtern$(A)
 
 .c$(O):
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) $<
+	$(CC) -c $(CFLAGS)  $<
 
 pngxtern$(A): $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff -ru optipng-0.5.4.orig/src/scripts/gcc.mak optipng-0.5.4/src/scripts/gcc.mak
--- optipng-0.5.4.orig/src/scripts/gcc.mak	2006-07-15 16:25:00.000000000 +0200
+++ optipng-0.5.4/src/scripts/gcc.mak	2006-09-14 22:17:06.910263120 +0200
@@ -13,30 +13,27 @@
 CC = gcc
 LD = $(CC)
 CFLAGS  = -O2 -Wall
-LDFLAGS = -s
+# remove -s from LDFLAGS to prevent stripping
+LDFLAGS = 
 
 OPTIPNG  = optipng$(EXE)
 ZLIB     = libz.a
 PNGLIB   = libpng.a
 PNGXLIB  = pngxtern.a
-ZMAK     = Makefile
-PNGMAK   = scripts/makefile.gcc
 PNGXMAK  = scripts/gcc.mak
-ZDIR     = ../lib/zlib
-PNGDIR   = ../lib/libpng
 PNGXDIR  = ../lib/pngxtern
 BACKHERE = ../../src
 
 OBJS = optipng.o opngio.o opngreduc.o cbitset.o osys.o strutil.o
-LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
+LIBS = $(PNGXDIR)/$(PNGXLIB)
 
 
 $(OPTIPNG): $(OBJS) $(LIBS)
-	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) $*.c
+	$(CC) -c $(CFLAGS) -I$(PNGXDIR) $*.c
 
 optipng.o  : optipng.c proginfo.h opng.h cexcept.h cbitset.h osys.h strutil.h
 opngio.o   : opngio.c opng.h
@@ -46,35 +43,23 @@
 strutil.o  : strutil.c strutil.h
 
 
-$(PNGXDIR)/$(PNGXLIB): $(ZDIR)/$(ZLIB) $(PNGDIR)/$(PNGLIB)
+$(PNGXDIR)/$(PNGXLIB):
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) $(PNGXLIB); \
 	cd $(BACKHERE)
 
-$(PNGDIR)/$(PNGLIB): $(ZDIR)/$(ZLIB)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) $(PNGLIB); \
-	cd $(BACKHERE)
-
-$(ZDIR)/$(ZLIB):
-	cd $(ZDIR); \
-	./configure; \
-	$(MAKE) -f $(ZMAK) $(ZLIB); \
-	cd $(BACKHERE)
-
-
 install: $(OPTIPNG)
-	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
-	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
-	- at rm -f ${bindir}/$(OPTIPNG)
-	- at rm -f ${man1dir}/optipng.1
-	cp -p $(OPTIPNG) ${bindir}
-	cp -p ../man/optipng.1 ${man1dir}
+	- at if [ ! -d ${DESTDIR}/${bindir} ]; then mkdir -p ${DESTDIR}/${bindir}; fi
+	- at if [ ! -d ${DESTDIR}/${man1dir} ]; then mkdir -p ${DESTDIR}/${man1dir}; fi
+	- at rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	- at rm -f ${DESTDIR}/${man1dir}/optipng.1
+	cp -p $(OPTIPNG) ${DESTDIR}/${bindir}
+	cp -p ../man/optipng.1 ${DESTDIR}/${man1dir}
 
 
 uninstall:
-	rm -f ${bindir}/$(OPTIPNG)
-	rm -f ${man1dir}/optipng.1
+	rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	rm -f ${DESTDIR}/${man1dir}/optipng.1
 
 
 clean:
@@ -82,9 +67,3 @@
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) clean; \
 	cd $(BACKHERE)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) clean; \
-	cd $(BACKHERE)
-	cd $(ZDIR); \
-	$(MAKE) -f $(ZMAK) clean; \
-	cd $(BACKHERE)


--- NEW FILE optipng.spec ---
Name:           optipng
Version:        0.5.4
Release:        1%{?dist}
Summary:        OptiPNG is a PNG optimizer and converter

Group:          Applications/Multimedia
License:        zlib/libpng
URL:            http://optipng.sourceforge.net/
Source0:        http://surfnet.dl.sourceforge.net/sourceforge/optipng/optipng-%{version}.tar.gz
Patch0:         optipng-0.5.4-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel libpng-devel

%description
OptiPNG is a PNG optimizer that recompresses image files to a smaller size,
without losing any information. This program also converts external formats
(BMP, GIF, PNM; TIFF support is coming up) to optimized PNG, and performs PNG
integrity checks and corrections. 


%prep
%setup -q
%patch0 -p1

%build
cd src/
make -f scripts/gcc.mak %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
cd src/
make -f scripts/gcc.mak install DESTDIR="$RPM_BUILD_ROOT"\
                                prefix="%{_prefix}" \
                                man1dir="%{_mandir}/man1"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt doc/*
%{_bindir}/optipng
%{_mandir}/man1/optipng.1.gz


%changelog
* Thu Sep 14 2006 Till Maas <opensource[AT]till.name> - 0.5.4-1
- version bump
- use system zlib and libpng
- link without "-s" flag for non-empty debuginfo
- use DESTDIR
* Fri Jul 28 2006 Till Maas <opensource[AT]till.name> - 0.5.3-1
- version bump
- Changed license tag back to zlib/libpng (#198616 rpmlint) 
- use $RPM_OPT_FLAGS instead of %%{optflags}
* Thu Jul 06 2006 Till Maas <opensource[AT]till.name> - 0.5.2-2
- Changed license tag from zlib/libpng to zlib
* Tue Jul 04 2006 Till Maas <opensource[AT]till.name> - 0.5.2-1
- Created from scratch for fedora extras



From fedora-extras-commits at redhat.com  Tue Oct 10 20:25:13 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:25:13 -0700
Subject: rpms/optipng import.log,1.1,1.2
Message-ID: <200610102025.k9AKPjG9019990@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19953

Modified Files:
	import.log 
Log Message:
auto-import optipng-0.5.4-1 on branch devel from optipng-0.5.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/optipng/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 20:24:31 -0000	1.1
+++ import.log	10 Oct 2006 20:25:13 -0000	1.2
@@ -0,0 +1 @@
+optipng-0_5_4-1:HEAD:optipng-0.5.4-1.src.rpm:1160511875



From fedora-extras-commits at redhat.com  Tue Oct 10 20:28:13 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:28:13 -0700
Subject: owners owners.list,1.1814,1.1815
Message-ID: <200610102028.k9AKSFo6020054@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20037

Modified Files:
	owners.list 
Log Message:
adding optipng



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1814
retrieving revision 1.1815
diff -u -r1.1814 -r1.1815
--- owners.list	10 Oct 2006 18:15:51 -0000	1.1814
+++ owners.list	10 Oct 2006 20:28:13 -0000	1.1815
@@ -1172,6 +1172,7 @@
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
+Fedora Extras|optipng|A PNG optimizer and converter|opensource at till.name|extras-qa at fedoraproject.org|
 Fedora Extras|orage|Time-managing application for Xfce4|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ORBit|CORBA Object Request Broker library for GNOME-1 compatibility|paul at city-fan.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 20:30:10 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:30:10 -0700
Subject: rpms/optipng/devel optipng.spec,1.1,1.2
Message-ID: <200610102030.k9AKUC5k020097@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20068

Modified Files:
	optipng.spec 
Log Message:
shorter summary



Index: optipng.spec
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/optipng.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- optipng.spec	10 Oct 2006 20:25:14 -0000	1.1
+++ optipng.spec	10 Oct 2006 20:30:10 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           optipng
 Version:        0.5.4
-Release:        1%{?dist}
-Summary:        OptiPNG is a PNG optimizer and converter
+Release:        2%{?dist}
+Summary:        A PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib/libpng
@@ -48,6 +48,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Till Maas <opensource[AT]till.name> - 0.5.4-2
+- shortening Summary
 * Thu Sep 14 2006 Till Maas <opensource[AT]till.name> - 0.5.4-1
 - version bump
 - use system zlib and libpng



From fedora-extras-commits at redhat.com  Tue Oct 10 20:33:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 13:33:06 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.49,1.50
Message-ID: <200610102033.k9AKX8xS020174@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20157

Modified Files:
	gnupg2.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-4
- make check ||: (apparently checks return err even on success?)



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnupg2.spec	10 Oct 2006 20:19:15 -0000	1.49
+++ gnupg2.spec	10 Oct 2006 20:33:05 -0000	1.50
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.91
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -114,7 +114,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-make -k check
+make -k check ||:
 
 
 %install
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-4
+- make check ||: (apparently checks return err even on success?)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-3
 - --enable-selinux-support
 - x86_64: --disable-optimization (to avoid gpg2 segfaults), for now



From fedora-extras-commits at redhat.com  Tue Oct 10 20:33:59 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:33:59 -0700
Subject: comps comps-fe6.xml.in,1.182,1.183
Message-ID: <200610102034.k9AKY1Ei020235@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218

Modified Files:
	comps-fe6.xml.in 
Log Message:
adding optipng




Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- comps-fe6.xml.in	10 Oct 2006 18:32:17 -0000	1.182
+++ comps-fe6.xml.in	10 Oct 2006 20:33:59 -0000	1.183
@@ -593,6 +593,7 @@
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>
+      <packagereq type="optional">optipng</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">rawstudio</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 10 21:01:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:01:32 -0700
Subject: rpms/ballbuster/devel - New directory
Message-ID: <200610102101.k9AL1YPf023366@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23331/ballbuster/devel

Log Message:
Directory /cvs/extras/rpms/ballbuster/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 21:01:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:01:31 -0700
Subject: rpms/ballbuster - New directory
Message-ID: <200610102101.k9AL1X0C023360@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23331/ballbuster

Log Message:
Directory /cvs/extras/rpms/ballbuster added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 21:01:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:01:53 -0700
Subject: rpms/ballbuster Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610102101.k9AL1uvV023407@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393

Added Files:
	Makefile import.log 
Log Message:
Setup of module ballbuster


--- NEW FILE Makefile ---
# Top level Makefile for module ballbuster
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 21:01:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:01:56 -0700
Subject: rpms/ballbuster/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610102101.k9AL1wnI023428@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ballbuster


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 21:03:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:03:58 -0700
Subject: owners owners.list,1.1815,1.1816
Message-ID: <200610102104.k9AL40U4023535@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23493

Modified Files:
	owners.list 
Log Message:
added ballbuster


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1815
retrieving revision 1.1816
diff -u -r1.1815 -r1.1816
--- owners.list	10 Oct 2006 20:28:13 -0000	1.1815
+++ owners.list	10 Oct 2006 21:03:58 -0000	1.1816
@@ -92,6 +92,7 @@
 Fedora Extras|azureus|A BitTorrent Client|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BackupPC|High-performance backup system|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|bakery|C++ framework for creating Gnome apps|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|ballbuster|Move the paddle to bounce the ball and break all the bricks|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|banshee|Music tool to easily import, manage, and play selections from your iPod|caillon at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 21:03:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:03:55 -0700
Subject: rpms/ballbuster import.log,1.1,1.2
Message-ID: <200610102104.k9AL4Sd0023538@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23482

Modified Files:
	import.log 
Log Message:
auto-import ballbuster-1.0-1 on branch devel from ballbuster-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 21:01:53 -0000	1.1
+++ import.log	10 Oct 2006 21:03:54 -0000	1.2
@@ -0,0 +1 @@
+ballbuster-1_0-1:HEAD:ballbuster-1.0-1.src.rpm:1160514817



From fedora-extras-commits at redhat.com  Tue Oct 10 21:03:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:03:56 -0700
Subject: rpms/ballbuster/devel ballbuster.desktop, NONE, 1.1 ballbuster.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610102104.k9AL4Swr023540@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23482/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ballbuster.desktop ballbuster.spec 
Log Message:
auto-import ballbuster-1.0-1 on branch devel from ballbuster-1.0-1.src.rpm


--- NEW FILE ballbuster.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Ball: Buster
Comment=Move the paddle to bounce the ball and break all the bricks
Exec=ballbuster
Icon=ballbuster.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;


--- NEW FILE ballbuster.spec ---
Name:           ballbuster
Version:        1.0
Release:        1%{?dist}
Summary:        Move the paddle to bounce the ball and break all the bricks
Group:          Amusements/Games
License:        LGPL
URL:            http://www.patrickavella.com/ballbuster.shtml
Source0:        http://www.patrickavella.com/BallBusterX.zip
Source1:        %{name}.desktop
Patch0:         ballbuster-unix.patch.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ClanLib-devel desktop-file-utils ImageMagick
Requires:       hicolor-icon-theme

%description
Game inspired by one of the great classics. The purpose of the game is to
remove all the bricks on the screen, by hitting them with a ball. You can
control the ball by bouncing it back at the bricks with a paddle which you
control with your mouse. The game features: A built in level editor, 20 power
ups and special effects (particle, alpha, rotating, and zooming).


%prep
%setup -q -c
%patch0 -p1 -z .unix
sed -i 's/\r//g' COPYING credits.txt ExtremeUpdates.txt manual.html html/*


%build
make %{?_smp_mflags} PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags clanCore-0.8`"
convert -transparent black icon1.ico %{name}.png


%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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 COPYING credits.txt ExtremeUpdates.txt manual.html html
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Tue Oct 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 21:01:56 -0000	1.1
+++ .cvsignore	10 Oct 2006 21:03:56 -0000	1.2
@@ -0,0 +1,2 @@
+BallBusterX.zip
+ballbuster-unix.patch.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 21:01:56 -0000	1.1
+++ sources	10 Oct 2006 21:03:56 -0000	1.2
@@ -0,0 +1,2 @@
+792c7ed1b8c62177ed043eb4955491fe  BallBusterX.zip
+3963c05ed48a7408c086f76bb9bf73e7  ballbuster-unix.patch.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 21:08:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:08:09 -0700
Subject: comps comps-fe5.xml.in,1.166,1.167 comps-fe6.xml.in,1.183,1.184
Message-ID: <200610102108.k9AL8BYP023708@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23689

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add ballbuster


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- comps-fe5.xml.in	10 Oct 2006 18:32:17 -0000	1.166
+++ comps-fe5.xml.in	10 Oct 2006 21:08:09 -0000	1.167
@@ -277,6 +277,7 @@
       <packagereq type="optional">abuse</packagereq>
       <packagereq type="optional">atomix</packagereq>
       <packagereq type="optional">auriferous</packagereq>
+      <packagereq type="optional">ballbuster</packagereq>
       <packagereq type="optional">blobwars</packagereq>
       <packagereq type="optional">bsd-games</packagereq>
       <packagereq type="optional">bygfoot</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- comps-fe6.xml.in	10 Oct 2006 20:33:59 -0000	1.183
+++ comps-fe6.xml.in	10 Oct 2006 21:08:09 -0000	1.184
@@ -339,6 +339,7 @@
       <packagereq type="optional">abuse</packagereq>
       <packagereq type="optional">atomix</packagereq>
       <packagereq type="optional">auriferous</packagereq>
+      <packagereq type="optional">ballbuster</packagereq>
       <packagereq type="optional">blobwars</packagereq>
       <packagereq type="optional">bsd-games</packagereq>
       <packagereq type="optional">bygfoot</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 10 22:09:55 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Tue, 10 Oct 2006 15:09:55 -0700
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.32,1.33
Message-ID: <200610102209.k9AM9wg2026899@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Randomly occurring graphics startup bug that has been dogging this package
is patched up.

Symptoms: Sometimes, but not always, when people installed nethack-vultures,
either vultureseye or vulturesclaw, but never both, would complain about a
graphics mismatch.  Reproducing this was sporadic.

Problem: To save space, the package symlinks directories that are a
duplicate on both the slashem and nethack branches.  Graphics used to be a
duplicate, but isn't any more.  This was known and was accounted for in the
specfile build process.  What wasn't accounted for was the behavior of RPM. 
Instead of removing the old directories on upgrade, it tries to overwrite
files with a simple copy of sorts.  Whatever mechanism it uses follows
symlinks, so if there was an old version of nethack-vultures on their
system, the installation of the different copies of slashem and nethack
graphics would overwrite each other in a single directory.  If it was a new
install, or an install over a version that had been corrected, there no
longer was a symlink, and thus two graphics directories were created and
used.

Solution: A pre tag removes the old graphics directory, symlink or not.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nethack-vultures.spec	15 Sep 2006 15:11:26 -0000	1.32
+++ nethack-vultures.spec	10 Oct 2006 22:09:55 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -119,6 +119,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
 [ $1 -eq 1 ] && \
@@ -127,7 +129,6 @@
 %postun
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
@@ -171,6 +172,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
+- Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.
+
 * Fri Sep 15 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-7
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct 10 22:09:50 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Tue, 10 Oct 2006 15:09:50 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.30,1.31
Message-ID: <200610102210.k9AMAOVJ026917@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Randomly occurring graphics startup bug that has been dogging this package
is patched up.

Symptoms: Sometimes, but not always, when people installed nethack-vultures,
either vultureseye or vulturesclaw, but never both, would complain about a
graphics mismatch.  Reproducing this was sporadic.

Problem: To save space, the package symlinks directories that are a
duplicate on both the slashem and nethack branches.  Graphics used to be a
duplicate, but isn't any more.  This was known and was accounted for in the
specfile build process.  What wasn't accounted for was the behavior of RPM. 
Instead of removing the old directories on upgrade, it tries to overwrite
files with a simple copy of sorts.  Whatever mechanism it uses follows
symlinks, so if there was an old version of nethack-vultures on their
system, the installation of the different copies of slashem and nethack
graphics would overwrite each other in a single directory.  If it was a new
install, or an install over a version that had been corrected, there no
longer was a symlink, and thus two graphics directories were created and
used.

Solution: A pre tag removes the old graphics directory, symlink or not.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nethack-vultures.spec	30 Aug 2006 04:46:54 -0000	1.30
+++ nethack-vultures.spec	10 Oct 2006 22:09:50 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -119,6 +119,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
 [ $1 -eq 1 ] && \
@@ -171,6 +173,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
+- Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.
+
 * Tue Aug 29 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-6
 - Attempting to stop graphics duplication.
 



From fedora-extras-commits at redhat.com  Tue Oct 10 22:09:47 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Tue, 10 Oct 2006 15:09:47 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.29,1.30
Message-ID: <200610102210.k9AMAKDZ026914@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Randomly occurring graphics startup bug that has been dogging this package
is patched up.

Symptoms: Sometimes, but not always, when people installed nethack-vultures,
either vultureseye or vulturesclaw, but never both, would complain about a
graphics mismatch.  Reproducing this was sporadic.

Problem: To save space, the package symlinks directories that are a
duplicate on both the slashem and nethack branches.  Graphics used to be a
duplicate, but isn't any more.  This was known and was accounted for in the
specfile build process.  What wasn't accounted for was the behavior of RPM. 
Instead of removing the old directories on upgrade, it tries to overwrite
files with a simple copy of sorts.  Whatever mechanism it uses follows
symlinks, so if there was an old version of nethack-vultures on their
system, the installation of the different copies of slashem and nethack
graphics would overwrite each other in a single directory.  If it was a new
install, or an install over a version that had been corrected, there no
longer was a symlink, and thus two graphics directories were created and
used.

Solution: A pre tag removes the old graphics directory, symlink or not.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nethack-vultures.spec	30 Aug 2006 04:46:48 -0000	1.29
+++ nethack-vultures.spec	10 Oct 2006 22:09:43 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -120,6 +120,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
 [ $1 -eq 1 ] && \
@@ -172,6 +174,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
+- Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.
+
 * Tue Aug 29 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-6
 - Attempting to stop graphics duplication.
 



From fedora-extras-commits at redhat.com  Tue Oct 10 22:09:52 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Tue, 10 Oct 2006 15:09:52 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures.spec,1.31,1.32
Message-ID: <200610102210.k9AMAPWF026920@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/FC-5

Modified Files:
	nethack-vultures.spec 
Log Message:
Randomly occurring graphics startup bug that has been dogging this package
is patched up.

Symptoms: Sometimes, but not always, when people installed nethack-vultures,
either vultureseye or vulturesclaw, but never both, would complain about a
graphics mismatch.  Reproducing this was sporadic.

Problem: To save space, the package symlinks directories that are a
duplicate on both the slashem and nethack branches.  Graphics used to be a
duplicate, but isn't any more.  This was known and was accounted for in the
specfile build process.  What wasn't accounted for was the behavior of RPM. 
Instead of removing the old directories on upgrade, it tries to overwrite
files with a simple copy of sorts.  Whatever mechanism it uses follows
symlinks, so if there was an old version of nethack-vultures on their
system, the installation of the different copies of slashem and nethack
graphics would overwrite each other in a single directory.  If it was a new
install, or an install over a version that had been corrected, there no
longer was a symlink, and thus two graphics directories were created and
used.

Solution: A pre tag removes the old graphics directory, symlink or not.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nethack-vultures.spec	30 Aug 2006 04:46:54 -0000	1.31
+++ nethack-vultures.spec	10 Oct 2006 22:09:51 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -119,6 +119,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
 [ $1 -eq 1 ] && \
@@ -171,6 +173,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
+- Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.
+
 * Tue Aug 29 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-6
 - Attempting to stop graphics duplication.
 



From fedora-extras-commits at redhat.com  Tue Oct 10 22:47:44 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Oct 2006 15:47:44 -0700
Subject: rpms/amavisd-new/devel README.quarantine, NONE, 1.1 amavisd.cron,
	NONE, 1.1 .cvsignore, 1.5, 1.6 amavisd-conf.patch, 1.3,
	1.4 amavisd-new.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200610102247.k9AMlkhc027384@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27356

Modified Files:
	.cvsignore amavisd-conf.patch amavisd-new.spec sources 
Added Files:
	README.quarantine amavisd.cron 
Log Message:
Update to 2.4.3.
Add quarantine directory and instructions for enabling it.
Add tmpwatch cron script.



--- NEW FILE README.quarantine ---
To enable quarantine support simply change the following line in
/etc/amavisd/amavisd.conf:

  $QUARANTINEDIR = undef;      # -Q

to

  $QUARANTINEDIR = "$MYHOME/quarantine";      # -Q

then restart amavisd.

The following will make the change for you:

  sed -i.orig -e '/\$QUARANTINEDIR =/s,undef,"$MYHOME/quarantine",' \
      /etc/amavisd/amavisd.conf

PLEASE NOTE:  This is intentionally a manual step.  Before turning on
the quarantine feature of amavisd-new, be sure that there is a
sufficient amount of free space on /var/spool/amavisd/quarantine.
"Sufficient" depends entirely on your environment.

In the default configuration, files in the quarantine directory will
be automatically deleted by tmpwatch after 30 days.  See
/etc/cron.daily/amavisd to adjust this behavior for your environment.


--- NEW FILE amavisd.cron ---
/usr/sbin/tmpwatch 24 /var/spool/amavisd/tmp
/usr/sbin/tmpwatch -d 720 /var/spool/amavisd/quarantine


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2006 00:03:29 -0000	1.5
+++ .cvsignore	10 Oct 2006 22:47:43 -0000	1.6
@@ -1 +1 @@
-amavisd-new-2.4.2.tar.gz
+amavisd-new-2.4.3.tar.gz

amavisd-conf.patch:

Index: amavisd-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amavisd-conf.patch	2 Aug 2006 16:43:17 -0000	1.3
+++ amavisd-conf.patch	10 Oct 2006 22:47:43 -0000	1.4
@@ -1,13 +1,13 @@
---- amavisd-new-2.4.2/amavisd.conf.orig	2006-06-27 06:31:50.000000000 -0500
-+++ amavisd-new-2.4.2/amavisd.conf	2006-07-31 17:31:00.000000000 -0500
+--- amavisd-new-2.4.3/amavisd.conf.orig	2006-10-01 19:02:13.000000000 -0500
++++ amavisd-new-2.4.3/amavisd.conf	2006-10-10 17:46:45.000000000 -0500
 @@ -14,23 +14,23 @@
  # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
  
  $max_servers = 2;            # num of pre-forked children (2..15 is common), -m
 -$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
 -$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
-+$daemon_user  = 'amavis';    # (no default;  customary: vscan or amavis), -u
-+$daemon_group = 'amavis';    # (no default;  customary: vscan or amavis), -g
++$daemon_user  = 'amavis';     # (no default;  customary: vscan or amavis), -u
++$daemon_group = 'amavis';     # (no default;  customary: vscan or amavis), -g
  
  $mydomain = 'example.com';   # a convenient default for other settings
  
@@ -46,7 +46,7 @@
  $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
  
  @addr_extension_virus_maps      = ('virus');
-@@ -111,10 +111,10 @@
+@@ -115,10 +115,10 @@
  # $notify_method  = 'smtp:[127.0.0.1]:10025';
  # $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
  
@@ -61,7 +61,7 @@
  
  # $os_fingerprint_method = 'p0f:127.0.0.1:2345';  # to query p0f-analyzer.pl
  
-@@ -306,10 +306,10 @@
+@@ -318,10 +318,10 @@
  # ['Sophos SAVI', \&sophos_savi ],
  
  # ### http://www.clamav.net/
@@ -73,6 +73,6 @@
 +  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
 +  qr/\bOK$/, qr/\bFOUND$/,
 +  qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
- # # NOTE: the easiest is to run clamd under the same user as amavisd; match the
- # # socket name (LocalSocket) in clamav.conf to the socket name in this entry
- # # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
+ # # NOTE: run clamd under the same user as amavisd, or run it under its own
+ # #   uid such as clamav, add user clamav to the amavis group, and then add
+ # #   AllowSupplementaryGroups to clamd.conf;


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amavisd-new.spec	29 Sep 2006 00:30:26 -0000	1.8
+++ amavisd-new.spec	10 Oct 2006 22:47:43 -0000	1.9
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.4.2
-Release:        4%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.4.3
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -12,6 +12,8 @@
 Source2:        amavis-clamd.conf
 Source3:        amavis-clamd.sysconfig
 Source4:        README.fedora
+Source5:        README.quarantine
+Source6:        amavisd.cron
 Patch0:         amavisd-conf.patch
 Patch1:         amavisd-init.patch
 Patch2:         amavisd-condrestart.patch
@@ -19,7 +21,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root/
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
-Requires:       tmpwatch
+Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
 Requires:       bzip2
 Requires:       gzip
 Requires:       arj
@@ -65,7 +67,7 @@
 (MTA) and one or more content checkers: virus scanners, and/or
 Mail::SpamAssassin Perl module. It is written in Perl, assuring high
 reliability, portability and maintainability. It talks to MTA via (E)SMTP
-or LMTP, or by using helper programs. No timing gaps exist in the design,
+or LMTP, or by using helper programs. No timing gaps exist in the design
 which could cause a mail loss.
 
 %prep
@@ -74,7 +76,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p0
-install -m644 %{SOURCE4} README_FILES/
+install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
 
 %build
 
@@ -101,7 +103,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd
 
-mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
+install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
+
+mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db,quarantine}
 touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
 mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/
 
@@ -135,16 +140,23 @@
 %config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
 %config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/clamd.amavisd
+%config(noreplace) %{_sysconfdir}/cron.daily/amavisd
 %{_sbindir}/amavisd
 %{_sbindir}/clamd.amavisd
 %{_bindir}/amavisd-*
 %dir %attr(700,amavis,amavis) /var/spool/amavisd
 %dir %attr(700,amavis,amavis) /var/spool/amavisd/tmp
 %dir %attr(700,amavis,amavis) /var/spool/amavisd/db
+%dir %attr(700,amavis,amavis) /var/spool/amavisd/quarantine
 %dir %attr(755,amavis,amavis) /var/run/amavisd
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Oct 10 2006 Steven Pritchard <steve at kspei.com> 2.4.3-1
+- Update to 2.4.3.
+- Add quarantine directory and instructions for enabling it.
+- Add tmpwatch cron script.
+
 * Thu Sep 28 2006 Steven Pritchard <steve at kspei.com> 2.4.2-4
 - Drop lha dependency and add arj.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2006 00:03:29 -0000	1.5
+++ sources	10 Oct 2006 22:47:43 -0000	1.6
@@ -1 +1 @@
-d750176de7481498ebd1011e08a488da  amavisd-new-2.4.2.tar.gz
+7c5f23b1cd523df31d10cf38150e8cea  amavisd-new-2.4.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 02:28:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:28:43 -0700
Subject: rpms/perl-Object-InsideOut/FC-5 perl-Object-InsideOut.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200610110228.k9B2Sk0V007329@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Object-InsideOut/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7279/FC-5

Modified Files:
	perl-Object-InsideOut.spec sources 
Log Message:
update to 2.06



Index: perl-Object-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/FC-5/perl-Object-InsideOut.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Object-InsideOut.spec	25 Sep 2006 19:35:04 -0000	1.6
+++ perl-Object-InsideOut.spec	11 Oct 2006 02:28:43 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Object-InsideOut
-Version:        2.02 
+Version:        2.06 
 Release:        1%{?dist}
 Summary:        Comprehensive inside-out object support module 
 
@@ -16,6 +16,7 @@
 BuildRequires:  perl
 BuildRequires:  perl(Exception::Class) >= 1.22
 BuildRequires:  perl(Want) >= 0.12
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 2.06-1
+- update to 2.06
+- add additional BRs: perl(Test::Pod[::Coverage])
+
 * Mon Sep 25 2006 Chris Weyl <cweyl at alumni.drew.edu> 2.02-1
 - update to 2.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Sep 2006 19:35:04 -0000	1.6
+++ sources	11 Oct 2006 02:28:43 -0000	1.7
@@ -1 +1 @@
-bc28852c041d0d14233f38d88aa2c3e9  Object-InsideOut-2.02.tar.gz
+e2d461cf6248f8b934e7b0d50ee403e9  Object-InsideOut-2.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 02:28:44 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:28:44 -0700
Subject: rpms/perl-Object-InsideOut/devel .cvsignore, 1.6,
	1.7 perl-Object-InsideOut.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200610110228.k9B2Skl4007335@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Object-InsideOut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7279/devel

Modified Files:
	.cvsignore perl-Object-InsideOut.spec sources 
Log Message:
update to 2.06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Sep 2006 19:35:05 -0000	1.6
+++ .cvsignore	11 Oct 2006 02:28:44 -0000	1.7
@@ -1 +1 @@
-Object-InsideOut-2.02.tar.gz
+Object-InsideOut-2.06.tar.gz


Index: perl-Object-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/perl-Object-InsideOut.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Object-InsideOut.spec	25 Sep 2006 19:35:05 -0000	1.6
+++ perl-Object-InsideOut.spec	11 Oct 2006 02:28:44 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Object-InsideOut
-Version:        2.02 
+Version:        2.06 
 Release:        1%{?dist}
 Summary:        Comprehensive inside-out object support module 
 
@@ -16,6 +16,7 @@
 BuildRequires:  perl
 BuildRequires:  perl(Exception::Class) >= 1.22
 BuildRequires:  perl(Want) >= 0.12
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 2.06-1
+- update to 2.06
+- add additional BRs: perl(Test::Pod[::Coverage])
+
 * Mon Sep 25 2006 Chris Weyl <cweyl at alumni.drew.edu> 2.02-1
 - update to 2.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Sep 2006 19:35:05 -0000	1.6
+++ sources	11 Oct 2006 02:28:44 -0000	1.7
@@ -1 +1 @@
-bc28852c041d0d14233f38d88aa2c3e9  Object-InsideOut-2.02.tar.gz
+e2d461cf6248f8b934e7b0d50ee403e9  Object-InsideOut-2.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 02:28:42 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:28:42 -0700
Subject: rpms/perl-Object-InsideOut Makefile,1.2,1.3
Message-ID: <200610110229.k9B2TGxS007338@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Object-InsideOut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7279

Modified Files:
	Makefile 
Log Message:
update to 2.06



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	25 Sep 2006 19:35:04 -0000	1.2
+++ Makefile	11 Oct 2006 02:28:42 -0000	1.3
@@ -2,17 +2,21 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 
 common : CVS/Root
 	@cvs checkout common
 
-# tag & build all non-legacy branches...
-build-all :
-	@cd FC-5 && make tag && make plague
-	@cd devel && test -f dead.package || ( make tag && make plague )
-
 CVS/Root :
 	@echo "ERROR: This does not look like a CVS checkout" && exit 1
 



From fedora-extras-commits at redhat.com  Wed Oct 11 02:40:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:40:36 -0700
Subject: rpms/perl-POE-Component-IRC/devel .cvsignore, 1.9,
	1.10 perl-POE-Component-IRC.spec, 1.10, 1.11 sources, 1.9, 1.10
Message-ID: <200610110240.k9B2ec9l007511@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459/devel

Modified Files:
	.cvsignore perl-POE-Component-IRC.spec sources 
Log Message:
update to 5.05



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 00:42:54 -0000	1.9
+++ .cvsignore	11 Oct 2006 02:40:36 -0000	1.10
@@ -1 +1 @@
-POE-Component-IRC-5.04.tar.gz
+POE-Component-IRC-5.05.tar.gz


Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/perl-POE-Component-IRC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-POE-Component-IRC.spec	30 Sep 2006 00:42:54 -0000	1.10
+++ perl-POE-Component-IRC.spec	11 Oct 2006 02:40:36 -0000	1.11
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        5.04 
+Version:        5.05
 Release:        1%{?dist}
 Summary:        A POE component for building IRC clients        
 
@@ -72,12 +72,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README* docs examples
+%doc Changes README* docs/ examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.05-1
+- update to 5.05
+- scratched head in confusion at versions in the last few changelogs
+
 * Fri Sep 29 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.54-1
 - update to 0.54
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 00:42:54 -0000	1.9
+++ sources	11 Oct 2006 02:40:36 -0000	1.10
@@ -1 +1 @@
-a79ef45b9163934497c74721ff8b5a7e  POE-Component-IRC-5.04.tar.gz
+ce082865e2c21e01a870c0b792649d5a  POE-Component-IRC-5.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 02:40:33 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:40:33 -0700
Subject: rpms/perl-POE-Component-IRC Makefile,1.2,1.3
Message-ID: <200610110241.k9B2f6OF007515@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459

Modified Files:
	Makefile 
Log Message:
update to 5.05



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	30 Sep 2006 00:42:52 -0000	1.2
+++ Makefile	11 Oct 2006 02:40:33 -0000	1.3
@@ -2,15 +2,14 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
 # tag & build all non-legacy branches...
-# this is clearly a non-optimal solution; to my knowledge there is no way to
-# currently determine if a branch is legacy or not (and this module is
-# frequently updated).  Correction on this point welcomed :)
 build-all :
-	@echo WARNING: building for devel and FC-5
+	@echo NOTICE: building for ${BRANCHES}
 	@sleep 5s
-	@cd FC-5  && test -f dead.package || ( make tag && make plague )
-	@cd devel && test -f dead.package || ( make tag && make plague )
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
 
 common-update : common
 	@cd common && cvs update



From fedora-extras-commits at redhat.com  Wed Oct 11 02:40:34 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:40:34 -0700
Subject: rpms/perl-POE-Component-IRC/FC-5 perl-POE-Component-IRC.spec, 1.10, 
	1.11 sources, 1.9, 1.10
Message-ID: <200610110241.k9B2f6A0007516@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459/FC-5

Modified Files:
	perl-POE-Component-IRC.spec sources 
Log Message:
update to 5.05



Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/FC-5/perl-POE-Component-IRC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-POE-Component-IRC.spec	30 Sep 2006 00:42:53 -0000	1.10
+++ perl-POE-Component-IRC.spec	11 Oct 2006 02:40:34 -0000	1.11
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        5.04 
+Version:        5.05
 Release:        1%{?dist}
 Summary:        A POE component for building IRC clients        
 
@@ -72,12 +72,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README* docs examples
+%doc Changes README* docs/ examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.05-1
+- update to 5.05
+- scratched head in confusion at versions in the last few changelogs
+
 * Fri Sep 29 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.54-1
 - update to 0.54
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 00:42:53 -0000	1.9
+++ sources	11 Oct 2006 02:40:34 -0000	1.10
@@ -1 +1 @@
-a79ef45b9163934497c74721ff8b5a7e  POE-Component-IRC-5.04.tar.gz
+ce082865e2c21e01a870c0b792649d5a  POE-Component-IRC-5.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 03:08:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 20:08:23 -0700
Subject: rpms/perl-POE-API-Peek Makefile,1.1,1.2
Message-ID: <200610110308.k9B38uiv010599@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-API-Peek
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545

Modified Files:
	Makefile 
Log Message:
 update to 1.0801



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	20 Sep 2006 00:10:01 -0000	1.1
+++ Makefile	11 Oct 2006 03:08:23 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct 11 03:08:27 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 20:08:27 -0700
Subject: rpms/perl-POE-API-Peek/FC-5 perl-POE-API-Peek.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610110309.k9B390Qg010605@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-API-Peek/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/FC-5

Modified Files:
	perl-POE-API-Peek.spec sources 
Log Message:
 update to 1.0801



Index: perl-POE-API-Peek.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/FC-5/perl-POE-API-Peek.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-API-Peek.spec	20 Sep 2006 00:10:57 -0000	1.2
+++ perl-POE-API-Peek.spec	11 Oct 2006 03:08:27 -0000	1.3
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-API-Peek
-Version:        1.06
-Release:        2%{?dist}
+Version:        1.0801
+Release:        1%{?dist}
 Summary:        Peek into the internals of a running POE environment
 License:        BSD
 Group:          Development/Libraries
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0801-1
+- update to 1.0801
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Sep 2006 00:10:10 -0000	1.2
+++ sources	11 Oct 2006 03:08:27 -0000	1.3
@@ -1 +1 @@
-2655a284b329ad8036ab4de3bbdd7f14  POE-API-Peek-1.06.tar.gz
+0199c4bffaa846886c1ea0cacb004f8b  POE-API-Peek-1.0801.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 03:08:28 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 20:08:28 -0700
Subject: rpms/perl-POE-API-Peek/devel .cvsignore, 1.2,
	1.3 perl-POE-API-Peek.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610110309.k9B390KR010606@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-API-Peek/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/devel

Modified Files:
	.cvsignore perl-POE-API-Peek.spec sources 
Log Message:
 update to 1.0801



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Sep 2006 00:10:10 -0000	1.2
+++ .cvsignore	11 Oct 2006 03:08:27 -0000	1.3
@@ -1 +1 @@
-POE-API-Peek-1.06.tar.gz
+POE-API-Peek-1.0801.tar.gz


Index: perl-POE-API-Peek.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/perl-POE-API-Peek.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-API-Peek.spec	20 Sep 2006 00:10:57 -0000	1.2
+++ perl-POE-API-Peek.spec	11 Oct 2006 03:08:27 -0000	1.3
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-API-Peek
-Version:        1.06
-Release:        2%{?dist}
+Version:        1.0801
+Release:        1%{?dist}
 Summary:        Peek into the internals of a running POE environment
 License:        BSD
 Group:          Development/Libraries
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0801-1
+- update to 1.0801
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Sep 2006 00:10:10 -0000	1.2
+++ sources	11 Oct 2006 03:08:27 -0000	1.3
@@ -1 +1 @@
-2655a284b329ad8036ab4de3bbdd7f14  POE-API-Peek-1.06.tar.gz
+0199c4bffaa846886c1ea0cacb004f8b  POE-API-Peek-1.0801.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 03:48:00 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:48:00 -0700
Subject: rpms/tenr-de-styles-pkg - New directory
Message-ID: <200610110348.k9B3m2j6011088@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11065/tenr-de-styles-pkg

Log Message:
Directory /cvs/extras/rpms/tenr-de-styles-pkg added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 03:48:00 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:48:00 -0700
Subject: rpms/tenr-de-styles-pkg/devel - New directory
Message-ID: <200610110348.k9B3m2Uv011091@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11065/tenr-de-styles-pkg/devel

Log Message:
Directory /cvs/extras/rpms/tenr-de-styles-pkg/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 03:48:16 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:48:16 -0700
Subject: rpms/tenr-de-styles-pkg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610110348.k9B3mI6Q011147@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11114

Added Files:
	Makefile import.log 
Log Message:
Setup of module tenr-de-styles-pkg


--- NEW FILE Makefile ---
# Top level Makefile for module tenr-de-styles-pkg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 11 03:48:17 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:48:17 -0700
Subject: rpms/tenr-de-styles-pkg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610110348.k9B3mJ6w011150@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11114/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tenr-de-styles-pkg


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 11 03:49:54 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:49:54 -0700
Subject: rpms/tenr-de-styles-pkg/devel tenr-de-styles-pkg.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610110349.k9B3nuSA011215@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11180/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tenr-de-styles-pkg.spec 
Log Message:
auto-import tenr-de-styles-pkg-1.0-2 on branch devel from tenr-de-styles-pkg-1.0-2.src.rpm


--- NEW FILE tenr-de-styles-pkg.spec ---
Name:           tenr-de-styles-pkg
Version:        1.0
Release:        2%{?dist}
Summary:        A collection of styles for fluxbox

Group:          Amusements/Graphics
License:        Creative Commons Attribution-ShareAlike 2.5
URL:            http://tenr.de
Source0:        http://tenr.de/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch:      noarch
Requires:       fluxbox 

%define  _styledir %{_datadir}/%{name}-%{version}

%description
A collection of styles/themes for use with Fluxbox. All styles/themes are 
compatible with fluxStyle.

%prep
%setup -q
chmod -x styles/monochrom2..3/theme.cfg

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_styledir}/
cp -a styles $RPM_BUILD_ROOT%{_styledir}/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README NEWS License
%dir %{_styledir}
%{_styledir}/*



%changelog
* Mon Oct 09 2006 Michael Rice <errr[AT]errr-online.com> - 1.0-2
- Fix name to remove the dot
- remove unneeded r from cp line
- resolved ownership of _styledir
- new source package from upstream with version

* Sun Oct 08 2006 Michael Rice <errr[AT]errr-online.com> - 1.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tenr-de-styles-pkg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Oct 2006 03:48:17 -0000	1.1
+++ .cvsignore	11 Oct 2006 03:49:54 -0000	1.2
@@ -0,0 +1 @@
+tenr-de-styles-pkg-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tenr-de-styles-pkg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Oct 2006 03:48:17 -0000	1.1
+++ sources	11 Oct 2006 03:49:54 -0000	1.2
@@ -0,0 +1 @@
+758323157d8a8fb98cb80d989342fd9c  tenr-de-styles-pkg-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 11 03:49:52 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:49:52 -0700
Subject: rpms/tenr-de-styles-pkg import.log,1.1,1.2
Message-ID: <200610110350.k9B3oOwU011218@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11180

Modified Files:
	import.log 
Log Message:
auto-import tenr-de-styles-pkg-1.0-2 on branch devel from tenr-de-styles-pkg-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tenr-de-styles-pkg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Oct 2006 03:48:16 -0000	1.1
+++ import.log	11 Oct 2006 03:49:52 -0000	1.2
@@ -0,0 +1 @@
+tenr-de-styles-pkg-1_0-2:HEAD:tenr-de-styles-pkg-1.0-2.src.rpm:1160538588



From fedora-extras-commits at redhat.com  Wed Oct 11 03:54:41 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:54:41 -0700
Subject: owners owners.list,1.1816,1.1817
Message-ID: <200610110354.k9B3shRG011317@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11300

Modified Files:
	owners.list 
Log Message:
Adding my self as mainter of tenr-de-styles-pkg bug: 209959



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1816
retrieving revision 1.1817
diff -u -r1.1816 -r1.1817
--- owners.list	10 Oct 2006 21:03:58 -0000	1.1816
+++ owners.list	11 Oct 2006 03:54:41 -0000	1.1817
@@ -2139,6 +2139,7 @@
 Fedora Extras|telepathy-filesystem|Telepathy filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tellico|A collection manager|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
+Fedora Extras|tenr-de-styles-pkg|A collection of styles for fluxbox|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|terminus-font|Clean fixed width font|rhbugs at n-dimensional.de|extras-qa at fedoraproject.org|
 Fedora Extras|testdisk|Tool to check and undelete partition|grenier at cgsecurity.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 07:26:49 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:26:49 -0700
Subject: rpms/bitmap - New directory
Message-ID: <200610110726.k9B7QpBF023504@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23478/bitmap

Log Message:
Directory /cvs/extras/rpms/bitmap added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 07:26:49 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:26:49 -0700
Subject: rpms/bitmap/devel - New directory
Message-ID: <200610110726.k9B7QpsG023507@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23478/bitmap/devel

Log Message:
Directory /cvs/extras/rpms/bitmap/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 07:27:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:27:13 -0700
Subject: rpms/bitmap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610110727.k9B7RFR1023557@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23523

Added Files:
	Makefile import.log 
Log Message:
Setup of module bitmap


--- NEW FILE Makefile ---
# Top level Makefile for module bitmap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 11 07:27:14 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:27:14 -0700
Subject: rpms/bitmap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610110727.k9B7RGsY023560@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23523/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bitmap


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 11 07:28:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:28:00 -0700
Subject: rpms/bitmap import.log,1.1,1.2
Message-ID: <200610110728.k9B7S2ZX023633@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23598

Modified Files:
	import.log 
Log Message:
auto-import bitmap-1.0.2-3 on branch devel from bitmap-1.0.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bitmap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Oct 2006 07:27:13 -0000	1.1
+++ import.log	11 Oct 2006 07:28:00 -0000	1.2
@@ -0,0 +1 @@
+bitmap-1_0_2-3:HEAD:bitmap-1.0.2-3.src.rpm:1160551448



From fedora-extras-commits at redhat.com  Wed Oct 11 07:28:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:28:00 -0700
Subject: rpms/bitmap/devel bitmap.desktop, NONE, 1.1 bitmap.png, NONE,
	1.1 bitmap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610110728.k9B7S2WT023638@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23598/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bitmap.desktop bitmap.png bitmap.spec 
Log Message:
auto-import bitmap-1.0.2-3 on branch devel from bitmap-1.0.2-3.src.rpm


--- NEW FILE bitmap.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Bitmap
GenericName=X Window Bitmaps Editor
Comment=xBitmap editor for the X Window System
Exec=bitmap
Icon=bitmap.png
Terminal=false
Type=Application
Categories=Application;Utility;


--- NEW FILE bitmap.spec ---
Name: bitmap
Version: 1.0.2
Release: 3%{?dist}
Summary: Bitmap editor and converter utilities for the X Window System
Group: User Interface/X
Url: http://www.x.org
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Source1: bitmap.desktop
Source2: bitmap.png
License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# the bitmap-devel corresponds only with bitmap files. They are needed
# by the base package, so this Provides is added
Provides: %{name}-devel = %{version}-%{release}
# other xorg apps are called like that
Provides: xorg-x11-%{name} = %{version}-%{release}
Provides: xorg-x11-%{name}-devel = %{version}-%{release}

# libXaw-devel requires libXmu-devel 
# libXmu-devel requires libX11-devel, libXt-devel, xorg-x11-util-macros
BuildRequires: xbitmaps-devel libXaw-devel libXext-devel
BuildRequires: desktop-file-utils pkgconfig
# also needed at runtime
Requires: xbitmaps

%description
Bitmap provides a bitmap editor and misc converter utilities for the X
Window System.

The package also includes files defining bitmaps associated with the 
Bitmap x11 editor.

%prep
%setup -q


%build
%configure --disable-dependency-tracking
make %{?_smp_mflags}


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

desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/


%clean
rm -rf %{buildroot}


%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,-)
# COPYING is a stub!
%doc ChangeLog
%{_bindir}/atobm
%{_bindir}/bmtoa
%{_bindir}/bitmap
%{_includedir}/X11/bitmaps/*
%{_datadir}/X11/app-defaults/Bitmap*
%{_datadir}/applications/*bitmap*
%{_datadir}/icons/hicolor/32x32/apps/bitmap.png
%{_mandir}/man1/*.1*

%changelog
* Tue Oct 10 2006 Patrice Dumas <pertusus at free.fr> 1.0.2-3
- use consistently %%{buildroot}
- provides xorg-x11-%%{name}-devel

* Mon Oct  9 2006 Patrice Dumas <pertusus at free.fr> 1.0.2-2
- buildrequires pkgconfig, libXext-devel

* Sun Sep  3 2006 Patrice Dumas <pertusus at free.fr> 1.0.2-1
- Packaged for fedora extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitmap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Oct 2006 07:27:14 -0000	1.1
+++ .cvsignore	11 Oct 2006 07:28:00 -0000	1.2
@@ -0,0 +1 @@
+bitmap-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitmap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Oct 2006 07:27:14 -0000	1.1
+++ sources	11 Oct 2006 07:28:00 -0000	1.2
@@ -0,0 +1 @@
+78e8ab5c1830e2cdfbff7a952162a5a7  bitmap-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 11 07:33:15 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:33:15 -0700
Subject: owners owners.list,1.1817,1.1818
Message-ID: <200610110733.k9B7XHoq023766@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23749

Modified Files:
	owners.list 
Log Message:
add bitmap


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1817
retrieving revision 1.1818
diff -u -r1.1817 -r1.1818
--- owners.list	11 Oct 2006 03:54:41 -0000	1.1817
+++ owners.list	11 Oct 2006 07:33:15 -0000	1.1818
@@ -111,6 +111,7 @@
 Fedora Extras|bit|C++ classes for bit manipulations|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|bitbake|BitBake build tool|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|bitgtkmm|Gtkmm widgets for bit|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
+Fedora Extras|bitmap|Bitmap editor and converter utilities for the X Window System|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 09:42:18 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 11 Oct 2006 02:42:18 -0700
Subject: rpms/jack-audio-connection-kit/devel .cvsignore, 1.2,
	1.3 jack-audio-connection-kit.spec, 1.6, 1.7 sources, 1.2,
	1.3 jack-clock3.patch, 1.1, NONE
Message-ID: <200610110942.k9B9gKJ2029987@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29966

Modified Files:
	.cvsignore jack-audio-connection-kit.spec sources 
Removed Files:
	jack-clock3.patch 
Log Message:
update to 0.102.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2006 17:15:12 -0000	1.2
+++ .cvsignore	11 Oct 2006 09:42:17 -0000	1.3
@@ -1 +1 @@
-jack-audio-connection-kit-0.101.1.tar.gz
+jack-audio-connection-kit-0.102.20.tar.gz


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jack-audio-connection-kit.spec	29 Aug 2006 13:00:40 -0000	1.6
+++ jack-audio-connection-kit.spec	11 Oct 2006 09:42:17 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
-Version: 0.101.1
-Release: 13%{?dist}
+Version: 0.102.20
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
 Source1: %{name}-README.Fedora
-Patch0: http://lalists.stanford.edu/lad/2006/01/att-0167/jack-clock3.patch
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -48,11 +47,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .clock3
 
 %build
 # x86_64 issue reported by Rudolf Kastl (not checked, but not bad).
-# Also patch0 touches configure.ac.
 autoreconf --force --install
 
 %configure \
@@ -120,6 +117,10 @@
 %{_bindir}/jack_simple_client
 
 %changelog
+* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-1
+- update to 0.102.20
+- drop patch0 (already in mainstream)
+
 * Tue Aug 29 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.101.1-13
 - http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2006 17:15:12 -0000	1.2
+++ sources	11 Oct 2006 09:42:17 -0000	1.3
@@ -1 +1 @@
-bb25f7c1da5d488b70edcf39ff5a39b2  jack-audio-connection-kit-0.101.1.tar.gz
+d6881555a8b4c923b4ec706832f0d776  jack-audio-connection-kit-0.102.20.tar.gz


--- jack-clock3.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 09:56:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 11 Oct 2006 02:56:22 -0700
Subject: rpms/gentoo/FC-5 gentoo-0.11.56-lang.patch, NONE, 1.1 gentoo.spec,
	1.6, 1.7 gentoo-0.11.52-pomkinstalldirs.patch, 1.1, NONE
Message-ID: <200610110956.k9B9uOA0030106@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gentoo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30071/FC-5

Modified Files:
	gentoo.spec 
Added Files:
	gentoo-0.11.56-lang.patch 
Removed Files:
	gentoo-0.11.52-pomkinstalldirs.patch 
Log Message:
Fix translations (#210205).


gentoo-0.11.56-lang.patch:

--- NEW FILE gentoo-0.11.56-lang.patch ---
diff -Naupr gentoo-0.11.56.orig/po/LINGUAS gentoo-0.11.56/po/LINGUAS
--- gentoo-0.11.56.orig/po/LINGUAS	2004-12-27 09:08:49.000000000 +0100
+++ gentoo-0.11.56/po/LINGUAS	2006-10-11 11:49:53.000000000 +0200
@@ -1,2 +1,2 @@
 # Set of available languages for gentoo.
-de fr it ja_JP.UTF-8 pl ru_RU.cp1251 ru_RU.CP1251 ru_RU.KOI8-R ru_RU.koi8r ru_RU.UTF-8 ru_RU.utf8 sv
+de fr it ja pl ru sv


Index: gentoo.spec
===================================================================
RCS file: /cvs/extras/rpms/gentoo/FC-5/gentoo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gentoo.spec	6 Mar 2006 15:39:49 -0000	1.6
+++ gentoo.spec	11 Oct 2006 09:56:22 -0000	1.7
@@ -1,12 +1,12 @@
 Summary: Graphical file management program in GTK+ for Linux
 Name: gentoo
-Version: 0.11.55
-Release: 3%{?dist}
+Version: 0.11.56
+Release: 2%{?dist}
 License: GPL
 Group: Applications/File
 URL: http://www.obsession.se/gentoo/
 Source: http://dl.sf.net/gentoo/gentoo-%{version}.tar.gz
-Patch: gentoo-0.11.52-pomkinstalldirs.patch
+Patch0: gentoo-0.11.56-lang.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk+-devel, gamin-devel, desktop-file-utils
 
@@ -23,7 +23,13 @@
 
 %prep
 %setup
-%patch -p1 -b .pomkinstalldirs
+%patch0 -p1 -b .lang
+# Keep only UTF-8 translations. This requires the patch above and is easier
+# like this since it would bloat the patch for nothing.
+for lang in ja ru; do
+    %{__mv} po/${lang}_*.UTF-8.gmo po/${lang}.gmo
+    %{__mv} po/${lang}_*.UTF-8.po po/${lang}.po
+done
 
 
 %build
@@ -74,6 +80,14 @@
 
 
 %changelog
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-2
+- Fix translations (#210205).
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-1
+- Update to 0.11.56.
+- FC6 rebuild.
+- Drop pomkinstalldirs patch, this release fixes the problem.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.11.55-3
 - FC5 rebuild.
 


--- gentoo-0.11.52-pomkinstalldirs.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 09:56:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 11 Oct 2006 02:56:22 -0700
Subject: rpms/gentoo/devel gentoo-0.11.56-lang.patch, NONE, 1.1 gentoo.spec, 
	1.7, 1.8
Message-ID: <200610110956.k9B9uOUm030112@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gentoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30071/devel

Modified Files:
	gentoo.spec 
Added Files:
	gentoo-0.11.56-lang.patch 
Log Message:
Fix translations (#210205).


gentoo-0.11.56-lang.patch:

--- NEW FILE gentoo-0.11.56-lang.patch ---
diff -Naupr gentoo-0.11.56.orig/po/LINGUAS gentoo-0.11.56/po/LINGUAS
--- gentoo-0.11.56.orig/po/LINGUAS	2004-12-27 09:08:49.000000000 +0100
+++ gentoo-0.11.56/po/LINGUAS	2006-10-11 11:49:53.000000000 +0200
@@ -1,2 +1,2 @@
 # Set of available languages for gentoo.
-de fr it ja_JP.UTF-8 pl ru_RU.cp1251 ru_RU.CP1251 ru_RU.KOI8-R ru_RU.koi8r ru_RU.UTF-8 ru_RU.utf8 sv
+de fr it ja pl ru sv


Index: gentoo.spec
===================================================================
RCS file: /cvs/extras/rpms/gentoo/devel/gentoo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gentoo.spec	28 Aug 2006 09:43:39 -0000	1.7
+++ gentoo.spec	11 Oct 2006 09:56:22 -0000	1.8
@@ -1,11 +1,12 @@
 Summary: Graphical file management program in GTK+ for Linux
 Name: gentoo
 Version: 0.11.56
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/File
 URL: http://www.obsession.se/gentoo/
 Source: http://dl.sf.net/gentoo/gentoo-%{version}.tar.gz
+Patch0: gentoo-0.11.56-lang.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk+-devel, gamin-devel, desktop-file-utils
 
@@ -22,6 +23,13 @@
 
 %prep
 %setup
+%patch0 -p1 -b .lang
+# Keep only UTF-8 translations. This requires the patch above and is easier
+# like this since it would bloat the patch for nothing.
+for lang in ja ru; do
+    %{__mv} po/${lang}_*.UTF-8.gmo po/${lang}.gmo
+    %{__mv} po/${lang}_*.UTF-8.po po/${lang}.po
+done
 
 
 %build
@@ -72,6 +80,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-2
+- Fix translations (#210205).
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-1
 - Update to 0.11.56.
 - FC6 rebuild.



From fedora-extras-commits at redhat.com  Wed Oct 11 09:59:56 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 11 Oct 2006 02:59:56 -0700
Subject: rpms/gentoo/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610110959.k9B9xwcx030213@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gentoo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30194

Modified Files:
	.cvsignore sources 
Log Message:
Commit missing changes for the 0.11.55 -> 0.11.56 update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gentoo/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jun 2005 09:06:45 -0000	1.4
+++ .cvsignore	11 Oct 2006 09:59:56 -0000	1.5
@@ -1 +1 @@
-gentoo-0.11.55.tar.gz
+gentoo-0.11.56.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gentoo/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jun 2005 09:06:45 -0000	1.4
+++ sources	11 Oct 2006 09:59:56 -0000	1.5
@@ -1 +1 @@
-9f831c487168612a877ece90b9287c96  gentoo-0.11.55.tar.gz
+c28b003a29527813f47908d69d3f44d0  gentoo-0.11.56.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 10:05:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 11 Oct 2006 03:05:03 -0700
Subject: rpms/lighttpd/devel .cvsignore, 1.17, 1.18 lighttpd.spec, 1.27,
	1.28 sources, 1.17, 1.18 lighttpd-1.4.12-fix.patch, 1.1, NONE
Message-ID: <200610111005.k9BA5boE000770@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv710

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.4.12-fix.patch 
Log Message:
Update to 1.4.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 Sep 2006 15:48:21 -0000	1.17
+++ .cvsignore	11 Oct 2006 10:05:03 -0000	1.18
@@ -1 +1 @@
-lighttpd-1.4.12.tar.gz
+lighttpd-1.4.13.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- lighttpd.spec	3 Oct 2006 17:15:05 -0000	1.27
+++ lighttpd.spec	11 Oct 2006 10:05:03 -0000	1.28
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.12
-Release: 3%{?dist}
+Version: 1.4.13
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -16,7 +16,6 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
-Patch1: lighttpd-1.4.12-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -68,7 +67,6 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -p3 -b .fix
 
 
 %build
@@ -175,6 +173,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-1
+- Update to 1.4.13, which contains the previous fix.
+
 * Tue Oct  3 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-3
 - Include fix for segfaults (lighttpd bug #876, changeset 1352).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Sep 2006 15:48:21 -0000	1.17
+++ sources	11 Oct 2006 10:05:03 -0000	1.18
@@ -1 +1 @@
-8f6756452138f5da384251f849b329f2  lighttpd-1.4.12.tar.gz
+d775d6478391b95d841a1018c8db0b95  lighttpd-1.4.13.tar.gz


--- lighttpd-1.4.12-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 10:14:11 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 11 Oct 2006 03:14:11 -0700
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.7, 1.8
Message-ID: <200610111014.k9BAEDY4000929@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv911

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Possible fix build break


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jack-audio-connection-kit.spec	11 Oct 2006 09:42:17 -0000	1.7
+++ jack-audio-connection-kit.spec	11 Oct 2006 10:14:10 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -92,7 +92,6 @@
 %{_bindir}/jack_unload
 %{_bindir}/jack_bufsize
 %{_bindir}/jack_freewheel
-%{_bindir}/jack_transport
 %{_libdir}/jack/
 %{_mandir}/man1/jack*.1*
 %{_libdir}/libjack.so.*
@@ -117,9 +116,10 @@
 %{_bindir}/jack_simple_client
 
 %changelog
-* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-1
+* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2
 - update to 0.102.20
 - drop patch0 (already in mainstream)
+- no pack jack_transport (build error)
 
 * Tue Aug 29 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.101.1-13
 - http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



From fedora-extras-commits at redhat.com  Wed Oct 11 11:33:41 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 11 Oct 2006 04:33:41 -0700
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.8, 1.9
Message-ID: <200610111133.k9BBXhkv005291@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5265

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Another build break fix.


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jack-audio-connection-kit.spec	11 Oct 2006 10:14:10 -0000	1.8
+++ jack-audio-connection-kit.spec	11 Oct 2006 11:33:41 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2%{?dist}
+Release: 2.0%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
+#BuildRequires: libfreebob >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -114,12 +115,15 @@
 %{_bindir}/jack_showtime
 %{_bindir}/jack_monitor_client
 %{_bindir}/jack_simple_client
+%{_bindir}/jack_midiseq
+%{_bindir}/jack_midisine
 
 %changelog
-* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2
+* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.0
 - update to 0.102.20
 - drop patch0 (already in mainstream)
 - no pack jack_transport (build error)
+- pack new JACK MIDI files
 
 * Tue Aug 29 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.101.1-13
 - http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



From fedora-extras-commits at redhat.com  Wed Oct 11 11:36:27 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 11 Oct 2006 04:36:27 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.11,1.12
Message-ID: <200610111136.k9BBaTIV005844@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5787

Modified Files:
	gdeskcal.spec 
Log Message:

Fix missing dep 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdeskcal.spec	8 Oct 2006 14:04:24 -0000	1.11
+++ gdeskcal.spec	11 Oct 2006 11:36:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils perl(XML::Parser)
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 



From fedora-extras-commits at redhat.com  Wed Oct 11 12:23:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 05:23:06 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.12, 1.13 gnupg2.spec, 1.50,
	1.51 sources, 1.14, 1.15
Message-ID: <200610111223.k9BCN8du016885@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-1
- 1.9.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Oct 2006 19:42:57 -0000	1.12
+++ .cvsignore	11 Oct 2006 12:23:06 -0000	1.13
@@ -1,3 +1,4 @@
 gnupg-1.9.23.tar.bz2
 gnupg-1.9.23.tar.bz2.sig
 gnupg-1.9.91.tar.bz2.sig
+gnupg-1.9.92.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnupg2.spec	10 Oct 2006 20:33:05 -0000	1.50
+++ gnupg2.spec	11 Oct 2006 12:23:06 -0000	1.51
@@ -11,8 +11,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.91
-Release: 4%{?dist}
+Version: 1.9.92
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -25,8 +25,6 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
-# http://lists.gnupg.org/pipermail/gnupg-devel/2006-October/023237.html
-Patch1: gnupg-1.9.91-readline.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 Patch3: gnupg-1.9.91-dearmor.patch
 
@@ -80,8 +78,7 @@
 %prep
 %setup -q -n gnupg-%{version}
 
-%patch1 -p1 -b .readline
-%patch2 -p1 -b .testverbose
+#patch2 -p1 -b .testverbose
 %patch3 -p1 -b .dearmor
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
@@ -177,6 +174,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-1
+- 1.9.92
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-4
 - make check ||: (apparently checks return err even on success?)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	6 Oct 2006 12:57:10 -0000	1.14
+++ sources	11 Oct 2006 12:23:06 -0000	1.15
@@ -1,2 +1,2 @@
-1f79e05ebbda709234a6488cc8f02d82  gnupg-1.9.91.tar.bz2.sig
-fb6838f6e2e26e5f00271ce588fd080b  gnupg-1.9.91.tar.bz2
+1d0b7ce8c5ff98976253e78a3e20c3a7  gnupg-1.9.92.tar.bz2.sig
+46fc473680ff5586184ddb53e7e18277  gnupg-1.9.92.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 11 13:14:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 06:14:00 -0700
Subject: rpms/nas/devel nas.spec,1.5,1.6
Message-ID: <200610111314.k9BDE2C4028702@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/nas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28678

Modified Files:
	nas.spec 
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
- don't rely-on/use potentially broken %_libdir/X11 symlink (#207180)



Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/devel/nas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nas.spec	11 Sep 2006 08:03:28 -0000	1.5
+++ nas.spec	11 Oct 2006 13:14:00 -0000	1.6
@@ -1,12 +1,16 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.8
-Release:	9%{?dist}
-#for FC>4
-BuildRequires:	imake bison flex libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
-#for FC4
-#BuildRequires: bison flex xorg-x11-devel 
-#ExcludeArch: x86_64
+Release:	10%{?dist}
+BuildRequires:	bison flex
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
+%define libdir_x11 %{_libdir}/X11
+%else
+BuildRequires: xorg-x11-devel 
+# don't rely on (potentially broken) /usr/lib/X11 symlink anyway
+%define libdir_x11 %{_prefix}/X11R6/lib/X11
+%endif
 
 URL:		http://nas.codebrilliance.com		
 
@@ -45,19 +49,24 @@
 %description devel
 Development files and the documentation
 
+
 %prep
 %setup -q -n nas-%{version}
 %patch0 -p1
 
+
 %build
 xmkmf
 make %{?_smp_mflags} World
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
-LIBDIR=%{_libdir}/X11  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
-install install.man
+
+make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
+  LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
+  install install.man
+
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
 install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nasd
 
@@ -93,7 +102,7 @@
 %{_mandir}/man5/*
 %{_libdir}/libaudio.so.2
 %{_libdir}/libaudio.so.2.4
-%{_libdir}/X11/AuErrorDB
+%{libdir_x11}/AuErrorDB
 %doc README BUGS FAQ HISTORY TODO
 
 %files devel
@@ -102,7 +111,11 @@
 %{_libdir}/libaudio.so
 %{_mandir}/man3/*
 
+
 %changelog 
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
+- don't rely-on/use potentially broken %%_libdir/X11 symlink (#207180)
+
 * Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-9%{?dist}
 - second rebuild for FC6
 



From fedora-extras-commits at redhat.com  Wed Oct 11 13:20:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 06:20:02 -0700
Subject: rpms/nas/FC-4 nas.spec,1.6,1.7
Message-ID: <200610111320.k9BDK4JM029625@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/nas/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29608

Modified Files:
	nas.spec 
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
- don't rely-on/use (potentially broken) %_libdir/X11 symlink (#207180)



Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/FC-4/nas.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nas.spec	24 Jul 2006 11:15:47 -0000	1.6
+++ nas.spec	11 Oct 2006 13:20:01 -0000	1.7
@@ -1,12 +1,16 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.8
-Release:	8%{?dist}
-#for FC>4
-#BuildRequires:	imake bison flex libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
-#for FC4
-BuildRequires: bison flex xorg-x11-devel 
-ExcludeArch: x86_64
+Release:	10%{?dist}
+BuildRequires:	bison flex
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
+%define libdir_x11 %{_libdir}/X11
+%else
+BuildRequires: xorg-x11-devel 
+# don't rely on (potentially broken) /usr/lib/X11 symlink anyway
+%define libdir_x11 %{_prefix}/X11R6/lib/X11
+%endif
 
 URL:		http://nas.codebrilliance.com		
 
@@ -45,19 +49,24 @@
 %description devel
 Development files and the documentation
 
+
 %prep
 %setup -q -n nas-%{version}
 %patch0 -p1
 
+
 %build
 xmkmf
 make %{?_smp_mflags} World
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
-LIBDIR=%{_libdir}/X11  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
-install install.man
+
+make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
+  LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
+  install install.man
+
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
 install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nasd
 
@@ -93,7 +102,7 @@
 %{_mandir}/man5/*
 %{_libdir}/libaudio.so.2
 %{_libdir}/libaudio.so.2.4
-%{_libdir}/X11/AuErrorDB
+%{libdir_x11}/AuErrorDB
 %doc README BUGS FAQ HISTORY TODO
 
 %files devel
@@ -102,7 +111,14 @@
 %{_libdir}/libaudio.so
 %{_mandir}/man3/*
 
+
 %changelog 
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
+- don't rely-on/use (potentially broken) %%_libdir/X11 symlink (#207180)
+
+* Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-9%{?dist}
+- second rebuild for FC6
+
 * Mon Jul 24 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-8%{?dist}
 - fix ugly output when starting the daemon
 



From fedora-extras-commits at redhat.com  Wed Oct 11 13:20:28 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 06:20:28 -0700
Subject: rpms/nas/FC-5 nas.spec,1.4,1.5
Message-ID: <200610111320.k9BDKUPv029693@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/nas/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29674

Modified Files:
	nas.spec 
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
- don't rely-on/use (potentially broken) %_libdir/X11 symlink (#207180)



Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/FC-5/nas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nas.spec	24 Jul 2006 11:00:31 -0000	1.4
+++ nas.spec	11 Oct 2006 13:20:28 -0000	1.5
@@ -1,12 +1,16 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.8
-Release:	8%{?dist}
-#for FC>4
-BuildRequires:	imake bison flex libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
-#for FC4
-#BuildRequires: bison flex xorg-x11-devel 
-#ExcludeArch: x86_64
+Release:	10%{?dist}
+BuildRequires:	bison flex
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
+%define libdir_x11 %{_libdir}/X11
+%else
+BuildRequires: xorg-x11-devel 
+# don't rely on (potentially broken) /usr/lib/X11 symlink anyway
+%define libdir_x11 %{_prefix}/X11R6/lib/X11
+%endif
 
 URL:		http://nas.codebrilliance.com		
 
@@ -45,19 +49,24 @@
 %description devel
 Development files and the documentation
 
+
 %prep
 %setup -q -n nas-%{version}
 %patch0 -p1
 
+
 %build
 xmkmf
 make %{?_smp_mflags} World
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
-LIBDIR=%{_libdir}/X11  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
-install install.man
+
+make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
+  LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
+  install install.man
+
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
 install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nasd
 
@@ -93,7 +102,7 @@
 %{_mandir}/man5/*
 %{_libdir}/libaudio.so.2
 %{_libdir}/libaudio.so.2.4
-%{_libdir}/X11/AuErrorDB
+%{libdir_x11}/AuErrorDB
 %doc README BUGS FAQ HISTORY TODO
 
 %files devel
@@ -102,7 +111,14 @@
 %{_libdir}/libaudio.so
 %{_mandir}/man3/*
 
+
 %changelog 
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
+- don't rely-on/use (potentially broken) %%_libdir/X11 symlink (#207180)
+
+* Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-9%{?dist}
+- second rebuild for FC6
+
 * Mon Jul 24 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-8%{?dist}
 - fix ugly output when starting the daemon
 



From fedora-extras-commits at redhat.com  Wed Oct 11 14:04:05 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Wed, 11 Oct 2006 07:04:05 -0700
Subject: rpms/mediawiki/devel .cvsignore, 1.4, 1.5 mediawiki.spec, 1.5,
	1.6 sources, 1.4, 1.5 needs.rebuild, 1.1, NONE
Message-ID: <200610111404.k9BE47Zv000371@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350

Modified Files:
	.cvsignore mediawiki.spec sources 
Removed Files:
	needs.rebuild 
Log Message:
Update mediawiki to 1.8.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Apr 2006 13:19:56 -0000	1.4
+++ .cvsignore	11 Oct 2006 14:04:05 -0000	1.5
@@ -1 +1 @@
-mediawiki-1.5.8.tar.gz
+mediawiki-1.8.0.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mediawiki.spec	3 Apr 2006 13:19:56 -0000	1.5
+++ mediawiki.spec	11 Oct 2006 14:04:05 -0000	1.6
@@ -1,8 +1,8 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.5.8
-Release:        1%{?dist}
+Version:        1.8.0
+Release:        2%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@
 Requires:       httpd
 Requires:       php >= 4.1.2
 Requires:	php-mysql
+Requires:	php-gd, diffutils, ImageMagick
 # to make sure the "apache" group is created before mediawiki is installed
 Requires(pre):  httpd
 
@@ -89,6 +90,10 @@
 
 
 %changelog
+* Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.0-2
+- Update to 1.8.0.
+- And php-gd, diffutils, ImageMagick as dependencies
+
 * Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
 - Update to upstream 1.5.8 (contains security fixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Apr 2006 13:19:56 -0000	1.4
+++ sources	11 Oct 2006 14:04:05 -0000	1.5
@@ -1 +1 @@
-1eef94157377fa8c3d049877a27c0163  mediawiki-1.5.8.tar.gz
+9141eba6b8faf17fe80edeb7699cfca4  mediawiki-1.8.0.tar.gz


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:16:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 07:16:26 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.51,1.52
Message-ID: <200610111416.k9BEGScV000615@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv595

Modified Files:
	gnupg2.spec 
Log Message:
* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-2
- fix file conflicts with gnupg



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnupg2.spec	11 Oct 2006 12:23:06 -0000	1.51
+++ gnupg2.spec	11 Oct 2006 14:16:26 -0000	1.52
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -95,6 +95,10 @@
 
 %build
 
+%ifarch x86_64
+#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O1|')"
+%endif
+
 %configure \
   --disable-rpath \
   --enable-selinux-support \
@@ -126,6 +130,15 @@
 
 %find_lang %{name}
 
+## NOTE:
+#file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+#file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+#file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+
+rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
+mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
+
+
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -138,7 +151,6 @@
   /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir ||:
 fi
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
@@ -154,8 +166,8 @@
 %{_bindir}/gpgkey2ssh
 %{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
-%{_bindir}/gpgsplit
-%{_bindir}/gpg-zip
+#{_bindir}/gpgsplit
+#{_bindir}/gpg-zip
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
@@ -168,12 +180,14 @@
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-2
+- fix file conflicts with gnupg
+
 * Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-1
 - 1.9.92
 



From fedora-extras-commits at redhat.com  Wed Oct 11 14:25:24 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:25:24 -0700
Subject: rpms/galago-filesystem - New directory
Message-ID: <200610111425.k9BEPQdi000833@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv807/galago-filesystem

Log Message:
Directory /cvs/extras/rpms/galago-filesystem added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 14:25:24 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:25:24 -0700
Subject: rpms/galago-filesystem/devel - New directory
Message-ID: <200610111425.k9BEPQ0G000836@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv807/galago-filesystem/devel

Log Message:
Directory /cvs/extras/rpms/galago-filesystem/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 14:25:44 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:25:44 -0700
Subject: rpms/galago-filesystem Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610111425.k9BEPkYx000885@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv852

Added Files:
	Makefile import.log 
Log Message:
Setup of module galago-filesystem


--- NEW FILE Makefile ---
# Top level Makefile for module galago-filesystem
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:25:45 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:25:45 -0700
Subject: rpms/galago-filesystem/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610111425.k9BEPlNJ000888@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv852/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module galago-filesystem


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:26:01 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:26:01 -0700
Subject: rpms/galago-filesystem/devel galago-filesystem.spec,NONE,1.1
Message-ID: <200610111426.k9BEQ3Nr000935@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv909/devel

Added Files:
	galago-filesystem.spec 
Log Message:
auto-import galago-filesystem-0.0.1-2 on branch devel from galago-filesystem-0.0.1-2.src.rpm


--- NEW FILE galago-filesystem.spec ---
Name:           galago-filesystem
Version:        0.0.1
Release:        2%{?dist}
Summary:        Galago filesystem layout

Group:          System Environment/Base
License:        Public Domain
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       filesystem

%description
This package provides some directories which are required by other
packages which comprise the Galago release.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/galago


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_libdir}/galago


%changelog
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.1-2
- Add build section to quiet rpmlint.

* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.1-1
- Initial FE spec.




From fedora-extras-commits at redhat.com  Wed Oct 11 14:26:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:26:00 -0700
Subject: rpms/galago-filesystem import.log,1.1,1.2
Message-ID: <200610111426.k9BEQXGG000943@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv909

Modified Files:
	import.log 
Log Message:
auto-import galago-filesystem-0.0.1-2 on branch devel from galago-filesystem-0.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/galago-filesystem/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Oct 2006 14:25:44 -0000	1.1
+++ import.log	11 Oct 2006 14:26:00 -0000	1.2
@@ -0,0 +1 @@
+galago-filesystem-0_0_1-2:HEAD:galago-filesystem-0.0.1-2.src.rpm:1160576789



From fedora-extras-commits at redhat.com  Wed Oct 11 14:27:29 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:27:29 -0700
Subject: rpms/telepathy-feed/devel - New directory
Message-ID: <200610111427.k9BERVLP001047@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1018/telepathy-feed/devel

Log Message:
Directory /cvs/extras/rpms/telepathy-feed/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 14:27:28 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:27:28 -0700
Subject: rpms/telepathy-feed - New directory
Message-ID: <200610111427.k9BERUfo001044@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1018/telepathy-feed

Log Message:
Directory /cvs/extras/rpms/telepathy-feed added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 14:27:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:27:40 -0700
Subject: rpms/telepathy-feed Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610111427.k9BERgji001096@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1063

Added Files:
	Makefile import.log 
Log Message:
Setup of module telepathy-feed


--- NEW FILE Makefile ---
# Top level Makefile for module telepathy-feed
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:27:41 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:27:41 -0700
Subject: rpms/telepathy-feed/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610111427.k9BERhpx001099@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1063/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module telepathy-feed


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:28:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:28:14 -0700
Subject: rpms/telepathy-feed import.log,1.1,1.2
Message-ID: <200610111428.k9BESG6f001162@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1127

Modified Files:
	import.log 
Log Message:
auto-import telepathy-feed-0.13-1 on branch devel from telepathy-feed-0.13-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/telepathy-feed/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Oct 2006 14:27:40 -0000	1.1
+++ import.log	11 Oct 2006 14:28:14 -0000	1.2
@@ -0,0 +1 @@
+telepathy-feed-0_13-1:HEAD:telepathy-feed-0.13-1.src.rpm:1160576922



From fedora-extras-commits at redhat.com  Wed Oct 11 14:28:15 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:28:15 -0700
Subject: rpms/telepathy-feed/devel telepathy-feed.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610111428.k9BESHu3001167@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1127/devel

Modified Files:
	.cvsignore sources 
Added Files:
	telepathy-feed.spec 
Log Message:
auto-import telepathy-feed-0.13-1 on branch devel from telepathy-feed-0.13-1.src.rpm


--- NEW FILE telepathy-feed.spec ---
Name:           telepathy-feed
Version:        0.13
Release:        1%{?dist}
Summary:        A Galago feed for Telepathy

Group:          Applications/Communications
License:        LGPL
URL:            http://telepathy.freedesktop.org/wiki
Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtelepathy-devel
BuildRequires:  libgalago-devel

Requires:       galago-filesystem


%description
A Galago feed for Telepathy


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_libdir}/galago/%{name}


%changelog
* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-1
- Initial FE spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-feed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Oct 2006 14:27:40 -0000	1.1
+++ .cvsignore	11 Oct 2006 14:28:14 -0000	1.2
@@ -0,0 +1 @@
+telepathy-feed-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-feed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Oct 2006 14:27:40 -0000	1.1
+++ sources	11 Oct 2006 14:28:14 -0000	1.2
@@ -0,0 +1 @@
+ff6273a82c96db813526ea599ac3b6ff  telepathy-feed-0.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 14:31:22 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:31:22 -0700
Subject: owners owners.list,1.1818,1.1819
Message-ID: <200610111431.k9BEVOGs001280@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1257

Modified Files:
	owners.list 
Log Message:
Add telepathy-feed & galago-filesystem


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1818
retrieving revision 1.1819
diff -u -r1.1818 -r1.1819
--- owners.list	11 Oct 2006 07:33:15 -0000	1.1818
+++ owners.list	11 Oct 2006 14:31:22 -0000	1.1819
@@ -446,6 +446,7 @@
 Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|galago-daemon|Galago presence daemon|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|galago-filesystem|Galago filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|galculator|GTK 2 based scientific calculator|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gallery2|Database-backed web photo gallery application|jwb at redhat.com|extras-qa at fedoraproject.org|
@@ -2137,6 +2138,7 @@
 Fedora Extras|tcpick|A tcp stream sniffer, tracker and capturer|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-butterfly|MSN connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|telepathy-feed|Galago feed for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-filesystem|Telepathy filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tellico|A collection manager|jamatos at fc.up.pt|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 14:34:55 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:34:55 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.3,1.4
Message-ID: <200610111434.k9BEYvKt001501@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1483

Modified Files:
	eds-feed.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
- Require galago-filesystem.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eds-feed.spec	8 Oct 2006 02:55:11 -0000	1.3
+++ eds-feed.spec	11 Oct 2006 14:34:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -15,6 +15,7 @@
 BuildRequires:	libxml2-devel
 
 Requires:	galago-daemon
+Requires:	galago-filesystem
 
 
 %description
@@ -43,11 +44,13 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS
-%dir %{_libdir}/galago
 %{_libdir}/galago/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
+- Require galago-filesystem.
+
 * Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
 - Rebuild for new libgalago.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 14:47:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 07:47:31 -0700
Subject: rpms/qt4/FC-4 .cvsignore, 1.6, 1.7 qt4.spec, 1.12,
	1.13 qtconfig.desktop, 1.2, 1.3
Message-ID: <200610111447.k9BElXNu001894@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1873

Modified Files:
	.cvsignore qt4.spec qtconfig.desktop 
Log Message:
* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.1
- (re)enable -system-nas-sound on FC-4/x86_64



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Jul 2006 03:23:28 -0000	1.6
+++ .cvsignore	11 Oct 2006 14:47:31 -0000	1.7
@@ -1,5 +1,4 @@
 clog
+OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
-qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
-qt42.spec
-
+qt-x11-opensource-src-4.2.0.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qt4.spec	26 Jul 2006 03:23:28 -0000	1.12
+++ qt4.spec	11 Oct 2006 14:47:31 -0000	1.13
@@ -1,11 +1,11 @@
 
 # Fedora Review
-# http://bugzilla.redhat.com/bugzilla/188180
+# http://bugzilla.redhat.com/188180
 
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 8%{?dist}
+Release: 11%{?dist}.1
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -13,7 +13,7 @@
 Source0:  ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# search for assistant4 instead of (qt3's) assistant in $PATH 
+# search for assistant-qt4 instead of (qt3's) assistant in $PATH 
 Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
 
 Source10: qt4-wrapper.sh
@@ -27,26 +27,16 @@
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
-%define mysql  -no-sql-mysql 
-%if "%{?fedora}" > "3"
+#if "%{?fedora}" > "3" || "%{?rhel}" > "3"
 %define mysql  -plugin-sql-mysql
-%endif
-%if "%{?rhel}" > "3"
-%define mysql  -plugin-sql-mysql
-%endif
+#endif
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
 # 
-%if "%{?fedora}" > "4"
+#if "%{?fedora}" > "4"
 %define nas     -system-nas-sound
-%endif
-%if "%{?fedora}" == "4"
-# nas unavailable on fc4/x86_64
-%ifnarch x86_64
-%define nas     -system-nas-sound
-%endif
-%endif
+#endif
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -310,12 +300,12 @@
 pushd %{buildroot}%{qtdir}/bin 
 for i in *; do
   case "$i" in
-    qt3to4|uic3|rcc)
-      LINK=$i
+    assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
+      LINK=${i}-qt4
       ;;
     *)
-      LINK=${i}-qt4
-      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}	
+      LINK=${i}
+      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
       ;;
   esac
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -472,6 +462,16 @@
 
 
 %changelog
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.1
+- (re)enable -system-nas-sound on FC-4/x86_64
+
+* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11
+- backout xfixes mod(s), only applicable to 4.2 branch
+- cleanup bindir renames
+
+* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-9
+- ./configure -xfixes, BR: libXfixes-devel
+
 * Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
 - strip -laudio, -lglib-2.0 from .pc files
 


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qtconfig.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtconfig.desktop	5 Jul 2006 11:38:56 -0000	1.2
+++ qtconfig.desktop	11 Oct 2006 14:47:31 -0000	1.3
@@ -5,4 +5,4 @@
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Application;AdvancedSettings;Settings;



From fedora-extras-commits at redhat.com  Wed Oct 11 15:20:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 08:20:40 -0700
Subject: rpms/libgalago/FC-5 .cvsignore, 1.3, 1.4 libgalago.spec, 1.4,
	1.5 sources, 1.3, 1.4 libgalago-gettext.patch, 1.1, NONE
Message-ID: <200610111520.k9BFKgse005013@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4992

Modified Files:
	.cvsignore libgalago.spec sources 
Removed Files:
	libgalago-gettext.patch 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
- Update to 0.5.2.
- Drop gettext patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 May 2006 23:58:40 -0000	1.3
+++ .cvsignore	11 Oct 2006 15:20:40 -0000	1.4
@@ -1 +1 @@
-libgalago-0.5.1.tar.bz2
+libgalago-0.5.2.tar.bz2


Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgalago.spec	23 Jun 2006 15:07:36 -0000	1.4
+++ libgalago.spec	11 Oct 2006 15:20:40 -0000	1.5
@@ -1,22 +1,18 @@
 Name:		libgalago
-Version:	0.5.1
-Release:	3%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.galago-project.org/
 Source0:	http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-gettext.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-glib
 BuildRequires:	check-devel
 BuildRequires:	gtk-doc
-BuildRequires:	autoconf
-BuildRequires:	libtool
-BuildRequires:	automake
 BuildRequires:	gettext-devel
 
 
@@ -28,21 +24,21 @@
 
 
 %package devel
-Summary:	Development libraries and headers for libgalago
+Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	dbus-devel
 Requires:	dbus-glib
+Requires:	pkgconfig
 Requires:	%{name} = %{version}-%{release}
 
 
 %description devel
-Libararies and header file for developing against libgalago.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .gettext
-./autogen.sh
 
 
 %build
@@ -53,10 +49,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %find_lang %{name}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_datadir}/autopackage/skeletons/@galago.info/%{name}/skeleton.1
 
 
@@ -85,6 +81,10 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
+- Update to 0.5.2.
+- Drop gettext patch.
+
 * Fri Jun 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-3
 - Add BR for autoconf, libtool, & automake.
 - Add devel requires on pkgconfig.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 May 2006 23:58:40 -0000	1.3
+++ sources	11 Oct 2006 15:20:40 -0000	1.4
@@ -1 +1 @@
-9ace3f93505626773b852d2ebbc7d5d6  libgalago-0.5.1.tar.bz2
+47f27f58dd8b0e46d9d2e037c51063ed  libgalago-0.5.2.tar.bz2


--- libgalago-gettext.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 15:24:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 08:24:31 -0700
Subject: rpms/galago-daemon/FC-5 .cvsignore, 1.2, 1.3 galago-daemon.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610111524.k9BFOXiK005103@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-daemon/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5082

Modified Files:
	.cvsignore galago-daemon.spec sources 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:35:03 -0000	1.2
+++ .cvsignore	11 Oct 2006 15:24:31 -0000	1.3
@@ -1 +1 @@
-galago-daemon-0.5.0.tar.bz2
+galago-daemon-0.5.1.tar.gz


Index: galago-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/FC-5/galago-daemon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- galago-daemon.spec	26 May 2006 00:34:53 -0000	1.2
+++ galago-daemon.spec	11 Oct 2006 15:24:31 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           galago-daemon
-Version:        0.5.0
-Release:        3%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Galago presence daemon
 
 Group:		System Environment/Daemons
 License:        GPL
 URL:		http://galago.sourceforge.net/
-Source0:        http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgalago-devel 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+
 * Thu May 25 2006 Brian Pepple <bdpepple at ameritech.net> - 0.5.0-3
 - Rebuild for new libgalago.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2006 19:35:03 -0000	1.2
+++ sources	11 Oct 2006 15:24:31 -0000	1.3
@@ -1 +1 @@
-bc74c3ac8c18f4c1a44e43504c59a08f  galago-daemon-0.5.0.tar.bz2
+fdb81f938f86f380b127158ebb542279  galago-daemon-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 15:30:51 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 08:30:51 -0700
Subject: rpms/gaim-galago/FC-5 .cvsignore, 1.2, 1.3 gaim-galago.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610111530.k9BFUr2g005278@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gaim-galago/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5257

Modified Files:
	.cvsignore gaim-galago.spec sources 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.
- Add version required for libgalago.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 18:23:53 -0000	1.2
+++ .cvsignore	11 Oct 2006 15:30:51 -0000	1.3
@@ -1 +1 @@
-gaim-galago-0.5.0.tar.bz2
+gaim-galago-0.5.1.tar.bz2


Index: gaim-galago.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/FC-5/gaim-galago.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaim-galago.spec	24 Sep 2006 05:07:54 -0000	1.2
+++ gaim-galago.spec	11 Oct 2006 15:30:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gaim-galago
-Version:        0.5.0
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Galago feed plugin for Gaim
 
 Group:		System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim
-BuildRequires:	libgalago-devel
+BuildRequires:	libgalago-devel >= 0.5.2
 
 Requires:	gaim
 Requires:	galago-daemon
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+- Add version required for libgalago.
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Correct URL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 18:23:53 -0000	1.2
+++ sources	11 Oct 2006 15:30:51 -0000	1.3
@@ -1 +1 @@
-58788373f86dd9f4cdf1f4ee8c7045f0  gaim-galago-0.5.0.tar.bz2
+00f58de5aa7850cceac766757add921a  gaim-galago-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 11 15:58:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 08:58:34 -0700
Subject: rpms/libgalago/devel libgalago.spec,1.9,1.10
Message-ID: <200610111558.k9BFwaII005449@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5432

Modified Files:
	libgalago.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
- Have package own %libdir/galago.



Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgalago.spec	7 Oct 2006 18:49:10 -0000	1.9
+++ libgalago.spec	11 Oct 2006 15:58:34 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -53,6 +53,7 @@
 
 %find_lang %{name}
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/galago
 rm -f $RPM_BUILD_ROOT%{_datadir}/autopackage/skeletons/@galago.info/%{name}/skeleton.1
 
 
@@ -75,12 +76,16 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so
+%dir %{_libdir}/galago
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
+- Have package own %%libdir/galago.
+
 * Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2.
 - Drop gettext patch.



From fedora-extras-commits at redhat.com  Wed Oct 11 16:00:39 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 11 Oct 2006 09:00:39 -0700
Subject: rpms/gv/devel .cvsignore, 1.2, 1.3 gv.spec, 1.8, 1.9 sources, 1.2, 
	1.3 gv-3.6.1-resource.patch, 1.1, NONE
Message-ID: <200610111600.k9BG0fqD005550@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5527

Modified Files:
	.cvsignore gv.spec sources 
Removed Files:
	gv-3.6.1-resource.patch 
Log Message:
Update to 3.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 19:16:38 -0000	1.2
+++ .cvsignore	11 Oct 2006 16:00:39 -0000	1.3
@@ -1 +1 @@
-gv-3.6.1.tar.gz
+gv-3.6.2.tar.gz


Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/gv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gv.spec	30 Aug 2006 02:34:04 -0000	1.8
+++ gv.spec	11 Oct 2006 16:00:39 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
-Version: 3.6.1
-Release: 8%{?dist}
+Version: 3.6.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
 Requires: ghostscript
@@ -9,7 +9,6 @@
 Source0: ftp://ftp.gnu.org/gnu/gv/gv-%{version}.tar.gz
 Patch0: gv-3.5.8-buffer.patch
 Patch1: gv-3.6.1-pkglibdir.patch
-Patch2: gv-3.6.1-resource.patch
 BuildRequires: /usr/bin/makeinfo
 BuildRequires: Xaw3d-devel, /usr/bin/desktop-file-install
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,7 +28,6 @@
 %setup -q
 %patch0 -p1 -b .buffer
 %patch1 -p1 -b .pkglibdir
-%patch2 -p1 -b .resource
 
 
 %build
@@ -103,6 +101,9 @@
 %{_mandir}/man1/gv.*
 
 %changelog
+* Wed Oct 11 2006 Orion Poplawski <orion at cora.nwra.com> 3.6.2-1
+- Update to 3.6.2
+
 * Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> 3.6.1-8
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 19:16:38 -0000	1.2
+++ sources	11 Oct 2006 16:00:39 -0000	1.3
@@ -1 +1 @@
-ace080d647b70f46fca7946e9543b79e  gv-3.6.1.tar.gz
+dcdb2205cf0c61394419e015c7548df1  gv-3.6.2.tar.gz


--- gv-3.6.1-resource.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 16:00:44 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 09:00:44 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.4,1.5
Message-ID: <200610111600.k9BG0ka4005571@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5554

Modified Files:
	eds-feed.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-5
- Remove requires on galago-filesystem, libgalago owns directory.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eds-feed.spec	11 Oct 2006 14:34:54 -0000	1.4
+++ eds-feed.spec	11 Oct 2006 16:00:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -15,7 +15,6 @@
 BuildRequires:	libxml2-devel
 
 Requires:	galago-daemon
-Requires:	galago-filesystem
 
 
 %description
@@ -48,6 +47,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-5
+- Remove requires on galago-filesystem, libgalago owns directory.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
 - Require galago-filesystem.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 16:02:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 11 Oct 2006 09:02:43 -0700
Subject: rpms/gv/FC-5 .cvsignore, 1.2, 1.3 gv.spec, 1.7, 1.8 sources, 1.2,
	1.3 gv-3.6.1-resource.patch, 1.1, NONE
Message-ID: <200610111602.k9BG2jMQ008551@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8529

Modified Files:
	.cvsignore gv.spec sources 
Removed Files:
	gv-3.6.1-resource.patch 
Log Message:
Update to 3.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gv/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 19:16:38 -0000	1.2
+++ .cvsignore	11 Oct 2006 16:02:43 -0000	1.3
@@ -1 +1 @@
-gv-3.6.1.tar.gz
+gv-3.6.2.tar.gz


Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/FC-5/gv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gv.spec	13 Feb 2006 18:46:40 -0000	1.7
+++ gv.spec	11 Oct 2006 16:02:43 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
-Version: 3.6.1
-Release: 7%{?dist}
+Version: 3.6.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
 Requires: ghostscript
@@ -9,7 +9,6 @@
 Source0: ftp://ftp.gnu.org/gnu/gv/gv-%{version}.tar.gz
 Patch0: gv-3.5.8-buffer.patch
 Patch1: gv-3.6.1-pkglibdir.patch
-Patch2: gv-3.6.1-resource.patch
 BuildRequires: /usr/bin/makeinfo
 BuildRequires: Xaw3d-devel, /usr/bin/desktop-file-install
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -103,6 +102,9 @@
 %{_mandir}/man1/gv.*
 
 %changelog
+* Wed Oct 11 2006 Orion Poplawski <orion at cora.nwra.com> 3.6.2-1
+- Update to 3.6.2
+
 * Mon Feb 13 2006 Orion Poplawski <orion at cora.nwra.com> 3.6.1-7
 - Rebuild for gcc/glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gv/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 19:16:38 -0000	1.2
+++ sources	11 Oct 2006 16:02:43 -0000	1.3
@@ -1 +1 @@
-ace080d647b70f46fca7946e9543b79e  gv-3.6.1.tar.gz
+dcdb2205cf0c61394419e015c7548df1  gv-3.6.2.tar.gz


--- gv-3.6.1-resource.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 16:03:16 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 11 Oct 2006 09:03:16 -0700
Subject: rpms/gv/FC-5 gv.spec,1.8,1.9
Message-ID: <200610111603.k9BG3mDR008578@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8561

Modified Files:
	gv.spec 
Log Message:
Remove patch2



Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/FC-5/gv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gv.spec	11 Oct 2006 16:02:43 -0000	1.8
+++ gv.spec	11 Oct 2006 16:03:16 -0000	1.9
@@ -28,7 +28,6 @@
 %setup -q
 %patch0 -p1 -b .buffer
 %patch1 -p1 -b .pkglibdir
-%patch2 -p1 -b .resource
 
 
 %build



From fedora-extras-commits at redhat.com  Wed Oct 11 16:07:04 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 09:07:04 -0700
Subject: rpms/libgalago/FC-5 libgalago.spec,1.5,1.6
Message-ID: <200610111607.k9BG7631008712@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8695

Modified Files:
	libgalago.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
- Have package own %libdir/galago.



Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgalago.spec	11 Oct 2006 15:20:40 -0000	1.5
+++ libgalago.spec	11 Oct 2006 16:07:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -53,6 +53,7 @@
 
 %find_lang %{name}
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/galago
 rm -f $RPM_BUILD_ROOT%{_datadir}/autopackage/skeletons/@galago.info/%{name}/skeleton.1
 
 
@@ -75,12 +76,16 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so
+%dir %{_libdir}/galago
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
+- Have package own %%libdir/galago.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2.
 - Drop gettext patch.



From fedora-extras-commits at redhat.com  Wed Oct 11 16:13:01 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 09:13:01 -0700
Subject: rpms/telepathy-feed/devel telepathy-feed.spec,1.1,1.2
Message-ID: <200610111613.k9BGD3Hv008881@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8864

Modified Files:
	telepathy-feed.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-2
- Drop requires on galago-filesystem, libgalago will own directory.



Index: telepathy-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-feed/devel/telepathy-feed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telepathy-feed.spec	11 Oct 2006 14:28:14 -0000	1.1
+++ telepathy-feed.spec	11 Oct 2006 16:13:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           telepathy-feed
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Galago feed for Telepathy
 
 Group:          Applications/Communications
@@ -12,8 +12,6 @@
 BuildRequires:  libtelepathy-devel
 BuildRequires:  libgalago-devel
 
-Requires:       galago-filesystem
-
 
 %description
 A Galago feed for Telepathy
@@ -44,6 +42,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-2
+- Drop requires on galago-filesystem, libgalago will own directory.
+
 * Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 16:41:18 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 09:41:18 -0700
Subject: rpms/eds-feed/FC-5 eds-feed.spec,1.2,1.3
Message-ID: <200610111641.k9BGfKqi009192@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9175

Modified Files:
	eds-feed.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
- Don't own %libdir/galago.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/FC-5/eds-feed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eds-feed.spec	26 Sep 2006 13:58:59 -0000	1.2
+++ eds-feed.spec	11 Oct 2006 16:41:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -41,10 +41,12 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS
-%dir %{_libdir}/galago
 %{_libdir}/galago/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
+- Don't own %%libdir/galago.
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
 - Intial FE spec.



From fedora-extras-commits at redhat.com  Wed Oct 11 17:17:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 10:17:42 -0700
Subject: rpms/qt4/FC-4 qt4.spec,1.13,1.14
Message-ID: <200610111717.k9BHHiGP012278@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12261

Modified Files:
	qt4.spec 
Log Message:
fix symlink handling



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qt4.spec	11 Oct 2006 14:47:31 -0000	1.13
+++ qt4.spec	11 Oct 2006 17:17:42 -0000	1.14
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 11%{?dist}.1
+Release: 11%{?dist}.2
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -297,15 +297,15 @@
 
 ## Make symlinks in %%_bindir
 mkdir -p %{buildroot}%{_bindir}
-pushd %{buildroot}%{qtdir}/bin 
+pushd %{buildroot}%{qtdir}/bin
 for i in *; do
-  case "$i" in
+  case "${i}" in
     assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
-      LINK=${i}-qt4
+      LINK="${i}-qt4"
+      ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
       ;;
     *)
-      LINK=${i}
-      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
+      LINK="${i}"
       ;;
   esac
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -462,7 +462,7 @@
 
 
 %changelog
-* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.1
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.2
 - (re)enable -system-nas-sound on FC-4/x86_64
 
 * Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11



From fedora-extras-commits at redhat.com  Wed Oct 11 17:32:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 10:32:06 -0700
Subject: rpms/libevent/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE libevent.spec, 1.2, NONE needs.rebuild,
	1.1, NONE sources, 1.2, NONE
Message-ID: <200610111732.k9BHW8Vr012403@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libevent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12387

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile libevent.spec needs.rebuild sources 
Log Message:
Moved to Core in FC6.



--- NEW FILE dead.package ---
Moved to Core in FC6.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- libevent.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 18:38:11 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 11:38:11 -0700
Subject: rpms/monotone/FC-5 .cvsignore, 1.9, 1.10 monotone.init, 1.6,
	1.7 monotone.spec, 1.16, 1.17 sources, 1.9, 1.10
Message-ID: <200610111838.k9BIcDZi015719@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15696

Modified Files:
	.cvsignore monotone.init monotone.spec sources 
Log Message:
0.30 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2006 20:25:17 -0000	1.9
+++ .cvsignore	11 Oct 2006 18:38:11 -0000	1.10
@@ -1 +1 @@
-monotone-0.28.tar.gz
+monotone-0.30.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monotone.init	3 Aug 2006 20:25:17 -0000	1.6
+++ monotone.init	11 Oct 2006 18:38:11 -0000	1.7
@@ -80,6 +80,7 @@
         echo -n $"Stopping monotone server: "
         killproc -p $MONOTONE_PIDFILE $MTSERVER
         RETVAL=$?
+	rm -f $MONOTONE_PIDFILE
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
         echo
         ;;
@@ -153,6 +154,7 @@
 	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
 	(umask 027
 	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db regenerate_rosters &&
 	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
 		success $"database check" ||
 		failure $"database check"


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- monotone.spec	3 Aug 2006 21:19:35 -0000	1.16
+++ monotone.spec	11 Oct 2006 18:38:11 -0000	1.17
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.28
-Release: 2%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -164,6 +164,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Roland McGrath <roland at redhat.com> - 0.30-1
+- Updated for 0.30 release.
+- Fix service script to work around buggy init.d/functions. (#198761)
+
 * Thu Aug  3 2006 Roland McGrath <roland at redhat.com> - 0.28-2
 - Updated for 0.28 release. (#198652)
 - Move server PID file into /var/run/monotone subdirectory. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2006 20:25:17 -0000	1.9
+++ sources	11 Oct 2006 18:38:11 -0000	1.10
@@ -1 +1 @@
-8c2e81152e12fed543a8702792232ed3  monotone-0.28.tar.gz
+94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 19:19:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 12:19:15 -0700
Subject: rpms/qt4/FC-5 .cvsignore, 1.6, 1.7 qt4.spec, 1.17,
	1.18 qtconfig.desktop, 1.2, 1.3 sources, 1.4, 1.5
Message-ID: <200610111919.k9BJJHgY019054@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19031

Modified Files:
	.cvsignore qt4.spec qtconfig.desktop sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Aug 2006 12:16:49 -0000	1.6
+++ .cvsignore	11 Oct 2006 19:19:15 -0000	1.7
@@ -1,5 +1,4 @@
 clog
-qt41.spec
+OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
-qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
-qt-x11-opensource-src-4.2.0-snapshot-20060821.tar.bz2
+qt-x11-opensource-src-4.2.0.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qt4.spec	28 Aug 2006 13:38:15 -0000	1.17
+++ qt4.spec	11 Oct 2006 19:19:15 -0000	1.18
@@ -2,15 +2,27 @@
 # Fedora Review
 # http://bugzilla.redhat.com/188180
 
+#define beta rc1
+#define preview -preview
+#define rel %{beta}
+
+#define snap 20060927
+#define beta snapshot-%{snap}
+#define rel  %{snap}
+
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.1.4
-Release: 11%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
 Url:   	 http://www.trolltech.com/products/qt/
-Source0:  ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz
+%if "%{?snap:1}" == "1"
+Source0: ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}%{?beta:-%{beta}}.tar.bz2
+%else
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.gz
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -27,27 +39,24 @@
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
-%define mysql  -no-sql-mysql 
-%if "%{?fedora}" > "3" || "%{?rhel}" > "3"
+#if "%{?fedora}" > "3" || "%{?rhel}" > "3"
 %define mysql  -plugin-sql-mysql
-%endif
+#endif
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
-# 
-%if "%{?fedora}" > "4"
-%define nas     -system-nas-sound
-%endif
-%if "%{?fedora}" == "4"
-# nas unavailable on fc4/x86_64
-%ifnarch x86_64
+
+# undefine to disable these
 %define nas     -system-nas-sound
-%endif
+# watch http://bugzilla.redhat.com/207923 so we may be able to include this on FC-5 someday
+%if "%{?fedora}" > "5"
+%define qdbus	-qdbus
+BuildRequires: dbus-devel >= 0.62
 %endif
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
-# See bug #196901
+# See http://bugzilla.redhat.com/196901
 %define qt_datadir %{_datadir}/%{qt_dirname}
 %define qt_docdir %{_docdir}/%{qt_dirname}
 %define qt_headerdir %{_includedir} 
@@ -73,10 +82,11 @@
 BuildRequires: libungif-devel
 BuildRequires: freetype-devel
 BuildRequires: zlib-devel
+BuildRequires: glib2-devel
 
 %define x_deps libGL-devel libGLU-devel
 %if "%{?fedora}" > "4"
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -106,6 +116,8 @@
 #BuildRequires: sqlite-devel
 %endif
 
+BuildConflicts: qt4-devel
+
 Obsoletes: %{name}-config < %{version}-%{release}
 Provides:  %{name}-config = %{version}-%{release}
 
@@ -190,16 +202,19 @@
 
 
 %prep
-%setup -q -n qt-x11-opensource-src-%{version}
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}
 
 %patch1 -p1 -b .assistant4
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-# add -fno-strict-aliasing, for now
-%if "%{?fedora}" > "4"
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%endif
+
+## Looks like we don't need this anymore -- Rex
+# add -fno-strict-aliasing, for now (fc6+)
+#if "%{?fedora}" > "5"
+#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+#endif
+
 # use $RPM_OPT_FLAGS for our platform
 %if "%{_lib}" == "lib64"
 %define platform linux-g++-64
@@ -207,10 +222,11 @@
 %define platform linux-g++
 %endif
 sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf
+sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/common/*.conf ||:
 
 # undefine QMAKE_STRIP, so we get useful -debuginfo pkgs
 sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|" mkspecs/linux-g++*/qmake.conf
-#sed -i  -e "s|= strip$|= |g" mkspecs/linux-g++*/qmake.conf
+sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|" mkspecs/common/*.conf ||:
 
 # set correct lib path
 if [ "%{_lib}" == "lib64" ] ; then
@@ -221,6 +237,11 @@
 
 %build
 
+# There's a bug in the qdbus build somewhere, but we'll hack around it here for now -- Rex
+%if "%{?qdbus}" == "-qdbus"
+LD_RUN_PATH=$(pwd)/lib;export LD_RUN_PATH
+%endif
+
 # build shared, threaded (default) libraries
 echo yes | ./configure -v \
   -prefix %{qtdir} \
@@ -240,6 +261,7 @@
   -qt-gif \
   -no-reduce-exports \
   -no-rpath \
+  -no-separate-debug-info \
   -sm \
   -stl \
   -system-libmng \
@@ -248,15 +270,18 @@
   -system-zlib \
   -tablet \
   -xcursor \
+  -xfixes \
   -xinerama \
   -xshape \
   -xrandr \
   -xrender \
   -xkb \
+  -glib \
+  %{?qdbus} %{!?qdbus:-no-qdbus} \
   %{?nas} %{!?nas:-no-nas-sound} \
-  %{?mysql}  %{?mysql_include} %{?mysql_ldflags} \
-  %{?psql}   \
-  %{?odbc}   \
+  %{?mysql} %{?mysql_include} %{?mysql_ldflags} \
+  %{?psql} \
+  %{?odbc} \
   %{?sqlite} 
 
 make %{?_smp_mflags}
@@ -277,7 +302,7 @@
 ## pkg-config
 # strip extraneous dirs/libraries -- Rex
 # safe ones
-for dep in -laudio -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
+for dep in -laudio -ldbus-1 -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
   -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
@@ -306,13 +331,13 @@
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{qtdir}/bin 
 for i in *; do
-  case "$i" in
+  case "${i}" in
     assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
-      LINK=${i}-qt4
+      LINK="${i}-qt4"
+      ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
       ;;
     *)
-      LINK=${i}
-      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
+      LINK="${i}"
       ;;
   esac
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -349,7 +374,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README* changes*
+%doc README* 
 %{!?beta:%doc OPENSOURCE-NOTICE.TXT}
 %{qtdir}/LICENSE.*
 %if "%{qt_libdir}" != "%{_libdir}"
@@ -360,6 +385,9 @@
 %dir %{qtdir}/bin/
 %dir %{qt_datadir}
 %{qt_libdir}/libQtCore.so.*
+%if "%{?qdbus}" == "-qdbus"
+%{qt_libdir}/libQtDBus.so.*
+%endif
 %{qt_libdir}/libQtNetwork.so.*
 %{qt_libdir}/libQtSql.so.*
 %{qt_libdir}/libQtTest.so.*
@@ -374,9 +402,12 @@
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%{qtdir}/plugins/accessible/
-%{qtdir}/plugins/imageformats/
-%{qtdir}/plugins/inputmethods/
+%if "%{version}" >= "4.2.0"
+%{qt_libdir}/libQtAssistantClient.so.*
+%endif
+%{qtdir}/plugins/*
+%exclude %{qtdir}/plugins/designer
+%exclude %{qtdir}/plugins/sqldrivers
 #-config bits
 %{qtdir}/bin/qt*config*
 %{_bindir}/qt*config*
@@ -391,12 +422,18 @@
 %{qtdir}/bin/qm2ts*
 %{_bindir}/qm2ts*
 %endif
+%if "%{?qdbus}" == "-qdbus"
+%{qtdir}/bin/qdbus*
+%{_bindir}/qdbus*
+%endif
+%{qtdir}/bin/pixeltool*
 %{qtdir}/bin/qmake*
 %{qtdir}/bin/qt3to4
 %{qtdir}/bin/rcc*
 %{qtdir}/bin/uic*
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
+%{_bindir}/pixeltool*
 %{_bindir}/moc*
 %{_bindir}/qmake*
 %{_bindir}/qt3to4
@@ -412,7 +449,7 @@
 %{qt_libdir}/libQtDesigner.so.*
 %{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
-# 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
+# remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
 %{qt_libdir}/libQt*.prl
 %{_libdir}/pkgconfig/*.pc
@@ -469,23 +506,45 @@
 
 
 %changelog
-* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11
-- backout xfixes mod(s), only applicable to 4.2 branch
-- cleanup bindir renames
+* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+- 4.2.0(final)
 
-* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-9
-- ./configure -xfixes, BR: libXfixes-devel
+* Thu Sep 28 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-0.9.20060927
+- update to 4.2.0-snapshot-20060927
+- update QDBus executable names
+- -x11: exclude plugins/designer (which belong to -devel)
+- BuildConflicts: qt4-devel
+- drop -fno-strict-aliasing hack (fc5+)
+
+* Wed Sep 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.8.rc1
+- qtconfig.desktop: Categories=+AdvancedSettings;Settings
+
+* Fri Sep 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.7.rc1
+- 4.2.0-rc1
+
+* Fri Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.6.20060821
+- update to 4.2.0-snapshot-20060821 (same as today's qt-copy)
+- -no-separate-debug-info
+- - ./configure -xfixes, BR: libXfixes-devel
+
+* Mon Aug 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.5.tp1
+- fix empty -debuginfo
+- use $RPM_OPT_FLAGS
 
-* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
-- strip -laudio, -lglib-2.0 from .pc files
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.4.tp1
+- strip -laudio, -ldbus-1, -lglib-2.0 from .pc files
 
-* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-7
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.3.tp1
 - -no-reduce-exports (for now)
 - -fno-strict-aliasing (fc5+)
 
-* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-6
-- make buildable on legacy releases
-- -system-nas-sound (bug #197937) 
+* Fri Jul 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.2.tp1
+- -system-nas-sound, BR: nas-devel (bug # 197937)
+- -qdbus (fc6+, BR: dbus-devel >= 0.62)
+- -glib (BR: glib2-devel)
+
+* Fri Jun 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.1.tp1
+- 4.2.0-tp1 (technology preview 1)
 
 * Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-5
 - make FHS-friendly (bug #196901)


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qtconfig.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtconfig.desktop	5 Jul 2006 11:38:23 -0000	1.2
+++ qtconfig.desktop	11 Oct 2006 19:19:15 -0000	1.3
@@ -5,4 +5,4 @@
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Application;AdvancedSettings;Settings;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2006 12:16:49 -0000	1.4
+++ sources	11 Oct 2006 19:19:15 -0000	1.5
@@ -1,2 +1 @@
-88f8c9c4622108baca2950baac3c02d6  qt-x11-opensource-src-4.1.4.tar.gz
-099a99d1b72b4be752fe0e211bc32dcf  qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
+2c062a125d5ca66397e3430ba537fbec  qt-x11-opensource-src-4.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 19:27:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:27:54 -0700
Subject: owners owners.list,1.1819,1.1820
Message-ID: <200610111927.k9BJRuJp019165@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19148

Modified Files:
	owners.list 
Log Message:
gtk2hs has been unorphaned for a while.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1819
retrieving revision 1.1820
diff -u -r1.1819 -r1.1820
--- owners.list	11 Oct 2006 14:31:22 -0000	1.1819
+++ owners.list	11 Oct 2006 19:27:54 -0000	1.1820
@@ -611,7 +611,7 @@
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|gtk2hs|A Haskell binding of Gtk+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|petersen at redhat.com
+Fedora Extras|gtk2hs|A Haskell binding of Gtk+|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtkdatabox|GTK+ widget for fast data display|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglarea2|An OpenGL GTK widget|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 19:32:12 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 12:32:12 -0700
Subject: rpms/monotone/FC-4 .cvsignore, 1.9, 1.10 monotone.init, 1.9,
	1.10 monotone.spec, 1.19, 1.20 sources, 1.9, 1.10
Message-ID: <200610111932.k9BJWipN019242@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19219

Modified Files:
	.cvsignore monotone.init monotone.spec sources 
Log Message:
0.30 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2006 20:28:04 -0000	1.9
+++ .cvsignore	11 Oct 2006 19:32:12 -0000	1.10
@@ -1 +1 @@
-monotone-0.28.tar.gz
+monotone-0.30.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- monotone.init	3 Aug 2006 20:28:04 -0000	1.9
+++ monotone.init	11 Oct 2006 19:32:12 -0000	1.10
@@ -80,6 +80,7 @@
         echo -n $"Stopping monotone server: "
         killproc -p $MONOTONE_PIDFILE $MTSERVER
         RETVAL=$?
+	rm -f $MONOTONE_PIDFILE
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
         echo
         ;;
@@ -153,6 +154,7 @@
 	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
 	(umask 027
 	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db regenerate_rosters &&
 	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
 		success $"database check" ||
 		failure $"database check"


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- monotone.spec	3 Aug 2006 22:23:54 -0000	1.19
+++ monotone.spec	11 Oct 2006 19:32:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.28
-Release: 2%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -164,6 +164,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Roland McGrath <roland at redhat.com> - 0.30-1
+- Updated for 0.30 release.
+- Fix service script to work around buggy init.d/functions. (#198761)
+
 * Thu Aug  3 2006 Roland McGrath <roland at redhat.com> - 0.28-2
 - Updated for 0.28 release. (#198652)
 - Move server PID file into /var/run/monotone subdirectory. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2006 20:28:04 -0000	1.9
+++ sources	11 Oct 2006 19:32:12 -0000	1.10
@@ -1 +1 @@
-8c2e81152e12fed543a8702792232ed3  monotone-0.28.tar.gz
+94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 19:33:15 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 12:33:15 -0700
Subject: rpms/monotone/devel .cvsignore, 1.9, 1.10 monotone.init, 1.6,
	1.7 monotone.spec, 1.16, 1.17 sources, 1.9, 1.10
Message-ID: <200610111933.k9BJXHTx019307@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19282

Modified Files:
	.cvsignore monotone.init monotone.spec sources 
Log Message:
0.30 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2006 20:28:49 -0000	1.9
+++ .cvsignore	11 Oct 2006 19:33:15 -0000	1.10
@@ -1 +1 @@
-monotone-0.28.tar.gz
+monotone-0.30.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monotone.init	3 Aug 2006 20:28:49 -0000	1.6
+++ monotone.init	11 Oct 2006 19:33:15 -0000	1.7
@@ -80,6 +80,7 @@
         echo -n $"Stopping monotone server: "
         killproc -p $MONOTONE_PIDFILE $MTSERVER
         RETVAL=$?
+	rm -f $MONOTONE_PIDFILE
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
         echo
         ;;
@@ -153,6 +154,7 @@
 	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
 	(umask 027
 	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db regenerate_rosters &&
 	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
 		success $"database check" ||
 		failure $"database check"


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- monotone.spec	8 Sep 2006 20:52:46 -0000	1.16
+++ monotone.spec	11 Oct 2006 19:33:15 -0000	1.17
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.28
-Release: 3%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -164,8 +164,9 @@
 
 
 %changelog
-* Fri Sep  8 2006 Roland McGrath <roland at redhat.com> - 0.28-3
-- FC6 mass rebuild
+* Tue Oct 10 2006 Roland McGrath <roland at redhat.com> - 0.30-1
+- Updated for 0.30 release.
+- Fix service script to work around buggy init.d/functions. (#198761)
 
 * Thu Aug  3 2006 Roland McGrath <roland at redhat.com> - 0.28-2
 - Updated for 0.28 release. (#198652)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2006 20:28:49 -0000	1.9
+++ sources	11 Oct 2006 19:33:15 -0000	1.10
@@ -1 +1 @@
-8c2e81152e12fed543a8702792232ed3  monotone-0.28.tar.gz
+94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 19:43:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:43:47 -0700
Subject: owners owners.list,1.1820,1.1821
Message-ID: <200610111943.k9BJhn09019411@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19394

Modified Files:
	owners.list 
Log Message:
libmatchbox, silky orphaned in http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1820
retrieving revision 1.1821
diff -u -r1.1820 -r1.1821
--- owners.list	11 Oct 2006 19:27:54 -0000	1.1820
+++ owners.list	11 Oct 2006 19:43:47 -0000	1.1821
@@ -883,7 +883,7 @@
 Fedora Extras|liblo|Open Sound Control library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|liblrdf|Library for manipulating RDF files describing LADSPA plugins|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmatheval|Library for parsing and evaluating symbolic expressions input as text|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmatroska|An open Audio/Video container format|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -2045,7 +2045,7 @@
 Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|SIBsim4|Align expressed RNA sequences on a DNA template|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
-Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|sipsak|SIP swiss army knife|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 19:52:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:52:03 -0700
Subject: rpms/silky/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1,
	NONE silky-0.5.4-desktop.patch, 1.1, NONE silky.spec, 1.6,
	NONE sources, 1.4, NONE
Message-ID: <200610111952.k9BJq5mS019538@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/silky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19505/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild silky-0.5.4-desktop.patch 
	silky.spec sources 
Log Message:
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html



--- NEW FILE dead.package ---
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- silky-0.5.4-desktop.patch DELETED ---


--- silky.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 19:52:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:52:02 -0700
Subject: rpms/silky/FC-5 dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 
	1.2, NONE branch, 1.1, NONE silky-0.5.4-desktop.patch, 1.1,
	NONE silky.spec, 1.6, NONE sources, 1.4, NONE
Message-ID: <200610111952.k9BJq4vd019535@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/silky/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19505/FC-5

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch silky-0.5.4-desktop.patch 
	silky.spec sources 
Log Message:
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html



--- NEW FILE dead.package ---
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- silky-0.5.4-desktop.patch DELETED ---


--- silky.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 19:54:19 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 12:54:19 -0700
Subject: rpms/monotone/FC-5 monotone.spec,1.17,1.18
Message-ID: <200610111954.k9BJsLaR019629@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19598/FC-5

Modified Files:
	monotone.spec 
Log Message:
update boost buildreq


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- monotone.spec	11 Oct 2006 18:38:11 -0000	1.17
+++ monotone.spec	11 Oct 2006 19:54:19 -0000	1.18
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
-BuildRequires: boost-devel >= 1.32.0
+BuildRequires: boost-devel >= 1.33.1
 %if 1
 %define bundled_sqlite yes
 %else



From fedora-extras-commits at redhat.com  Wed Oct 11 19:54:20 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 12:54:20 -0700
Subject: rpms/monotone/devel monotone.spec,1.17,1.18
Message-ID: <200610111954.k9BJsMw1019633@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19598/devel

Modified Files:
	monotone.spec 
Log Message:
update boost buildreq


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- monotone.spec	11 Oct 2006 19:33:15 -0000	1.17
+++ monotone.spec	11 Oct 2006 19:54:20 -0000	1.18
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
-BuildRequires: boost-devel >= 1.32.0
+BuildRequires: boost-devel >= 1.33.1
 %if 1
 %define bundled_sqlite yes
 %else



From fedora-extras-commits at redhat.com  Wed Oct 11 19:54:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:54:26 -0700
Subject: rpms/libmatchbox/FC-5 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE libmatchbox.spec, 1.2,
	NONE sources, 1.2, NONE
Message-ID: <200610111954.k9BJsSLm019669@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmatchbox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19639/FC-5

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch libmatchbox.spec sources 
Log Message:
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html
(and never actually shipped in any FE repo?)



--- NEW FILE dead.package ---
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html
(and never actually shipped in any FE repo?)


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- libmatchbox.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 19:54:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:54:27 -0700
Subject: rpms/libmatchbox/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE libmatchbox.spec, 1.2,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610111954.k9BJsTuO019672@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmatchbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19639/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile libmatchbox.spec needs.rebuild sources 
Log Message:
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html
(and never actually shipped in any FE repo?)



--- NEW FILE dead.package ---
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html
(and never actually shipped in any FE repo?)


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- libmatchbox.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 20:04:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 13:04:23 -0700
Subject: rpms/icmpdn/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE icmpdn.spec, 1.1, NONE needs.rebuild,
	1.1, NONE sources, 1.2, NONE
Message-ID: <200610112004.k9BK4PmJ022640@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/icmpdn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22607/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile icmpdn.spec needs.rebuild sources 
Log Message:
Not shipped since FE4.



--- NEW FILE dead.package ---
Not shipped since FE4.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- icmpdn.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 20:04:22 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 13:04:22 -0700
Subject: rpms/icmpdn/FC-5 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE icmpdn.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200610112004.k9BK4OCc022637@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/icmpdn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22607/FC-5

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch icmpdn.spec sources 
Log Message:
Not shipped since FE4.



--- NEW FILE dead.package ---
Not shipped since FE4.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- icmpdn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 20:05:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 13:05:35 -0700
Subject: owners owners.list,1.1821,1.1822
Message-ID: <200610112005.k9BK5ba2022733@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22716

Modified Files:
	owners.list 
Log Message:
icmpdn has not been around since FE4.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1821
retrieving revision 1.1822
diff -u -r1.1821 -r1.1822
--- owners.list	11 Oct 2006 19:43:47 -0000	1.1821
+++ owners.list	11 Oct 2006 20:05:35 -0000	1.1822
@@ -681,7 +681,7 @@
 Fedora Extras|ibmonitor|Interactive bandwidth monitor|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|icecast|ShoutCast compatible streaming media server|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ices|Source streaming for Icecast|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|icmpdn|ICMP host name utilities|fredrik at dolda2000.com|extras-qa at fedoraproject.org|
+Fedora Extras|icmpdn|ICMP host name utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 20:06:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 13:06:20 -0700
Subject: rpms/libgalago-gtk/FC-5 libgalago-gtk.spec,1.1,1.2
Message-ID: <200610112006.k9BK6MZ6022761@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago-gtk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22744

Modified Files:
	libgalago-gtk.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
- Rebuild for new libgalago.



Index: libgalago-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago-gtk/FC-5/libgalago-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgalago-gtk.spec	23 Sep 2006 16:23:38 -0000	1.1
+++ libgalago-gtk.spec	11 Oct 2006 20:06:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libgalago-gtk
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ widgets for the Galago presence framework
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
+- Rebuild for new libgalago.
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Preserve timestamps of header files.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:24:23 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 11 Oct 2006 13:24:23 -0700
Subject: rpms/blender/FC-5 blender.spec,1.29,1.30
Message-ID: <200610112024.k9BKOPpd022895@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22878

Modified Files:
	blender.spec 
Log Message:
Fix wrote paths for locale


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-5/blender.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- blender.spec	17 Sep 2006 19:00:01 -0000	1.29
+++ blender.spec	11 Oct 2006 20:24:23 -0000	1.30
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	2%{?dist}.1
+Release: 	3%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -97,6 +97,12 @@
 
 cp -a release/scripts/bpydata ${RPM_BUILD_ROOT}/%{blenderlib}
 cp -a release/scripts ${RPM_BUILD_ROOT}/%{blenderlib}
+
+pushd bin/.blender/locale
+mv pt_br pt_BR
+mv zh_cn zh_CN
+popd
+
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
 
 install -p -D -m 644 release/scripts/*.py ${RPM_BUILD_ROOT}/%{blenderlib}
@@ -154,6 +160,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-3
+- Correct invalid locale paths (#210209)
+
 * Sun Sep 17 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-2.1
 - Rebuilt to solve broken update deps
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:27:26 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 11 Oct 2006 13:27:26 -0700
Subject: rpms/blender/devel blender.spec,1.30,1.31
Message-ID: <200610112027.k9BKRSnI022958@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22941

Modified Files:
	blender.spec 
Log Message:
Fix wrote paths for locale


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- blender.spec	13 Sep 2006 17:23:00 -0000	1.30
+++ blender.spec	11 Oct 2006 20:27:26 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -97,6 +97,12 @@
 
 cp -a release/scripts/bpydata ${RPM_BUILD_ROOT}/%{blenderlib}
 cp -a release/scripts ${RPM_BUILD_ROOT}/%{blenderlib}
+
+pushd bin/.blender/locale
+mv pt_br pt_BR
+mv zh_cn uh_CN
+popd
+
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
 
 install -p -D -m 644 release/scripts/*.py ${RPM_BUILD_ROOT}/%{blenderlib}
@@ -154,6 +160,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-3
+- Correct invalid locale paths (#210209)
+
 * Wed Sep 13 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-2
 - Update to new upstream release
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:33:04 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 11 Oct 2006 13:33:04 -0700
Subject: rpms/optipng/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200610112033.k9BKX6iE023082@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23058

Modified Files:
	.cvsignore sources 
Log Message:
fixing sources?



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 20:24:32 -0000	1.1
+++ .cvsignore	11 Oct 2006 20:33:03 -0000	1.2
@@ -0,0 +1 @@
+optipng-0.5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 20:24:32 -0000	1.1
+++ sources	11 Oct 2006 20:33:03 -0000	1.2
@@ -0,0 +1 @@
+8d989971e674a06b55e17fc5b70c41aa  optipng-0.5.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 20:33:59 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 11 Oct 2006 13:33:59 -0700
Subject: rpms/ejabberd/devel ejabberd.logrotate, 1.1, 1.2 ejabberd.spec, 1.5,
	1.6
Message-ID: <200610112034.k9BKY26Y023137@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23118

Modified Files:
	ejabberd.logrotate ejabberd.spec 
Log Message:
Fix logrotate script.


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd.logrotate	23 Jun 2006 12:40:03 -0000	1.1
+++ ejabberd.logrotate	11 Oct 2006 20:33:59 -0000	1.2
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log >/dev/null 2>/dev/null || true
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ejabberd.spec	8 Oct 2006 04:22:54 -0000	1.5
+++ ejabberd.spec	11 Oct 2006 20:33:59 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.2-2
+- Fix logrotate script (BZ#210366)
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:35:19 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 11 Oct 2006 13:35:19 -0700
Subject: rpms/ejabberd/FC-5 ejabberd.logrotate, 1.1, 1.2 ejabberd.spec, 1.4,
	1.5
Message-ID: <200610112035.k9BKZLuX023205@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23186

Modified Files:
	ejabberd.logrotate ejabberd.spec 
Log Message:
Fix logrotate script.


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd.logrotate	23 Jun 2006 12:40:03 -0000	1.1
+++ ejabberd.logrotate	11 Oct 2006 20:35:18 -0000	1.2
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log >/dev/null 2>/dev/null || true
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejabberd.spec	8 Oct 2006 04:24:02 -0000	1.4
+++ ejabberd.spec	11 Oct 2006 20:35:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.2-2
+- Fix logrotate script (BZ#210366)
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:36:08 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 11 Oct 2006 13:36:08 -0700
Subject: rpms/ejabberd/FC-4 ejabberd.logrotate, 1.1, 1.2 ejabberd.spec, 1.4,
	1.5
Message-ID: <200610112036.k9BKaAIL023275@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23256

Modified Files:
	ejabberd.logrotate ejabberd.spec 
Log Message:
Fix logrotate script.


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/ejabberd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd.logrotate	23 Jun 2006 12:40:03 -0000	1.1
+++ ejabberd.logrotate	11 Oct 2006 20:36:08 -0000	1.2
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log >/dev/null 2>/dev/null || true
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/ejabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejabberd.spec	8 Oct 2006 04:24:45 -0000	1.4
+++ ejabberd.spec	11 Oct 2006 20:36:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.2-2
+- Fix logrotate script (BZ#210366)
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:38:24 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 11 Oct 2006 13:38:24 -0700
Subject: rpms/optipng/devel optipng.spec,1.2,1.3
Message-ID: <200610112038.k9BKcQe3023345@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23328

Modified Files:
	optipng.spec 
Log Message:
bumping release to retag and build because source was not added correctly by import script



Index: optipng.spec
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/optipng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- optipng.spec	10 Oct 2006 20:30:10 -0000	1.2
+++ optipng.spec	11 Oct 2006 20:38:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           optipng
 Version:        0.5.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A PNG optimizer and converter
 
 Group:          Applications/Multimedia
@@ -48,6 +48,8 @@
 
 
 %changelog
+* Wed Oct 11 2006 Till Maas <opensource[AT]till.name> - 0.5.4-3
+- bumping release because of errors while importing to extras
 * Tue Oct 10 2006 Till Maas <opensource[AT]till.name> - 0.5.4-2
 - shortening Summary
 * Thu Sep 14 2006 Till Maas <opensource[AT]till.name> - 0.5.4-1



From fedora-extras-commits at redhat.com  Wed Oct 11 20:57:43 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 11 Oct 2006 13:57:43 -0700
Subject: rpms/lincvs/FC-5 crossvc.spec,1.2,1.3
Message-ID: <200610112057.k9BKvjqg023532@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23515

Modified Files:
	crossvc.spec 
Log Message:
Fix broken startup script


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-5/crossvc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crossvc.spec	9 Oct 2006 18:25:36 -0000	1.2
+++ crossvc.spec	11 Oct 2006 20:57:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -9,7 +9,7 @@
 URL:              http://www.lincvs.org
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cvs >= 0:1.9.0
 BuildRequires:    qt-devel >= 1:3.3
@@ -41,7 +41,7 @@
 
 cat <<'EOF' >lincvs.sh
 #!/bin/sh
-exec %{_libdir}/LinCVS/AppRun $@
+exec %{_libdir}/CrossVC/AppRun $@
 EOF
 
 %build
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-4
+- Fix startup script (#210309)
+
 * Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
 - Add Provides and Obsolete tag (#209917)
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:58:29 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 11 Oct 2006 13:58:29 -0700
Subject: rpms/lincvs/devel crossvc.spec,1.2,1.3
Message-ID: <200610112058.k9BKwVZ6023597@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23580

Modified Files:
	crossvc.spec 
Log Message:
Fix broken startup script


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/crossvc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crossvc.spec	9 Oct 2006 18:24:47 -0000	1.2
+++ crossvc.spec	11 Oct 2006 20:58:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -9,7 +9,7 @@
 URL:              http://www.lincvs.org
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cvs >= 0:1.9.0
 BuildRequires:    qt-devel >= 1:3.3
@@ -41,7 +41,7 @@
 
 cat <<'EOF' >lincvs.sh
 #!/bin/sh
-exec %{_libdir}/LinCVS/AppRun $@
+exec %{_libdir}/CrossVC/AppRun $@
 EOF
 
 %build
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-4
+- Fix startup script (#210309)
+
 * Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
 - Add Provides and Obsolete tag (#209917)
 



From fedora-extras-commits at redhat.com  Wed Oct 11 21:00:37 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:00:37 -0700
Subject: rpms/netmask/devel .cvsignore, 1.3, 1.4 netmask.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200610112100.k9BL0dv3023688@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23667

Modified Files:
	.cvsignore netmask.spec sources 
Log Message:
* Wed Oct 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.8-1
- 2.3.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netmask/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:53:47 -0000	1.3
+++ .cvsignore	11 Oct 2006 21:00:37 -0000	1.4
@@ -1 +1 @@
-netmask_2.3.7.tar.gz
+netmask_2.3.8.tar.gz


Index: netmask.spec
===================================================================
RCS file: /cvs/extras/rpms/netmask/devel/netmask.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- netmask.spec	2 Sep 2006 09:51:57 -0000	1.10
+++ netmask.spec	11 Oct 2006 21:00:37 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           netmask
-Version:        2.3.7
-Release:        6%{?dist}
+Version:        2.3.8
+Release:        1%{?dist}
 Summary:        Utility for determining network masks
 
 Group:          Applications/Internet
@@ -53,7 +53,7 @@
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 -eq 0 ]; then
+if [ $1 -eq 0 ] ; then
   /sbin/install-info --delete %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 fi
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.8-1
+- 2.3.8.
+
 * Sat Sep  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.7-6
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netmask/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:53:47 -0000	1.3
+++ sources	11 Oct 2006 21:00:37 -0000	1.4
@@ -1 +1 @@
-6e1b1c0694296bbe37ba8cb6a4902436  netmask_2.3.7.tar.gz
+78e627fd1c014851ad144c31b2d882b0  netmask_2.3.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 21:06:59 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Wed, 11 Oct 2006 14:06:59 -0700
Subject: rpms/mediawiki/devel .cvsignore, 1.5, 1.6 mediawiki.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200610112107.k9BL71CU026761@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26740

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
Update mediawiki to 1.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Oct 2006 14:04:05 -0000	1.5
+++ .cvsignore	11 Oct 2006 21:06:58 -0000	1.6
@@ -1 +1 @@
-mediawiki-1.8.0.tar.gz
+mediawiki-1.8.1.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mediawiki.spec	11 Oct 2006 14:04:05 -0000	1.6
+++ mediawiki.spec	11 Oct 2006 21:06:58 -0000	1.7
@@ -1,8 +1,8 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        3%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
 Group:          Applications/Internet
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.1-3
+- Update to 1.8.1.
+
 * Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.0-2
 - Update to 1.8.0.
 - And php-gd, diffutils, ImageMagick as dependencies


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Oct 2006 14:04:05 -0000	1.5
+++ sources	11 Oct 2006 21:06:58 -0000	1.6
@@ -1 +1 @@
-9141eba6b8faf17fe80edeb7699cfca4  mediawiki-1.8.0.tar.gz
+9693c36a139715c9984495cb6ebc5646  mediawiki-1.8.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 21:30:57 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:30:57 -0700
Subject: rpms/alsa-firmware/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE alsa-firmware.spec, 1.5,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112130.k9BLUxdE027363@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/alsa-firmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/alsa-firmware/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile alsa-firmware.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- alsa-firmware.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:03 -0700
Subject: rpms/amaya/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.2, NONE amaya-9.1-64bits.patch, 1.6,
	NONE amaya-9.1-configure.diff, 1.2, NONE amaya.png, 1.1,
	NONE amaya.spec, 1.30, NONE needs.rebuild, 1.1, NONE sources,
	1.4, NONE
Message-ID: <200610112131.k9BLV5IR027395@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/amaya/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile amaya-9.1-64bits.patch 
	amaya-9.1-configure.diff amaya.png amaya.spec needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- amaya-9.1-64bits.patch DELETED ---


--- amaya-9.1-configure.diff DELETED ---


--- amaya.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:04 -0700
Subject: rpms/blam/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE blam-aclocal.m4-ngettext.patch, 1.1,
	NONE blam-gtk-sharp2-gecko-sharp2.patch, 1.1, NONE blam.spec,
	1.2, NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLV6Kv027398@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/blam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/blam/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile blam-aclocal.m4-ngettext.patch 
	blam-gtk-sharp2-gecko-sharp2.patch blam.spec needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- blam-aclocal.m4-ngettext.patch DELETED ---


--- blam-gtk-sharp2-gecko-sharp2.patch DELETED ---


--- blam.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:30:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:30:58 -0700
Subject: rpms/alsa-tools/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.2, NONE alsa-tools.spec, 1.10,
	NONE needs.rebuild, 1.1, NONE sources, 1.6, NONE
Message-ID: <200610112131.k9BLV0HX027366@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/alsa-tools/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile alsa-tools.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- alsa-tools.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:10 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:10 -0700
Subject: rpms/cfs/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 
	1.2, NONE cfs-1.4.1-rpm.patch, 1.1, NONE cfs-INSTALL, 1.2,
	NONE cfs-blowfish.patch, 1.1, NONE cfs-root.patch, 1.1,
	NONE cfs.spec, 1.12, NONE cfs_1.4.1-cfix.patch, 1.5,
	NONE cfs_1.4.1-opt.patch, 1.1, NONE cfs_1.4.1-ret.patch, 1.1,
	NONE cfsd.init, 1.1, NONE cfsd.sysconfig, 1.1, NONE mcrypt, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVChR027456@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/cfs/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile cfs-1.4.1-rpm.patch cfs-INSTALL 
	cfs-blowfish.patch cfs-root.patch cfs.spec 
	cfs_1.4.1-cfix.patch cfs_1.4.1-opt.patch cfs_1.4.1-ret.patch 
	cfsd.init cfsd.sysconfig mcrypt needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- cfs-1.4.1-rpm.patch DELETED ---


--- cfs-INSTALL DELETED ---


--- cfs-blowfish.patch DELETED ---


--- cfs-root.patch DELETED ---


--- cfs.spec DELETED ---


--- cfs_1.4.1-cfix.patch DELETED ---


--- cfs_1.4.1-opt.patch DELETED ---


--- cfs_1.4.1-ret.patch DELETED ---


--- cfsd.init DELETED ---


--- cfsd.sysconfig DELETED ---


--- mcrypt DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:12 -0700
Subject: rpms/ecore/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE ecore-0.9.9.023-noex.patch, 1.1,
	NONE ecore-0.9.9.023-novera.patch, 1.1, NONE ecore.spec, 1.5,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVE0V027460@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ecore/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/ecore/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile ecore-0.9.9.023-noex.patch 
	ecore-0.9.9.023-novera.patch ecore.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- ecore-0.9.9.023-noex.patch DELETED ---


--- ecore-0.9.9.023-novera.patch DELETED ---


--- ecore.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:10 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:10 -0700
Subject: rpms/camstream/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.2, NONE camstream-0.26.3-x86_64-asm.patch, 1.1,
	NONE camstream-makefiles.patch, 1.1, NONE camstream.desktop, 1.1,
	NONE camstream.png, 1.1, NONE camstream.spec, 1.11,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVC4r027451@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/camstream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/camstream/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile camstream-0.26.3-x86_64-asm.patch 
	camstream-makefiles.patch camstream.desktop camstream.png 
	camstream.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- camstream-0.26.3-x86_64-asm.patch DELETED ---


--- camstream-makefiles.patch DELETED ---


--- camstream.desktop DELETED ---


--- camstream.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:11 -0700
Subject: rpms/doulos-fonts/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE doulos-fonts.spec, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVDnx027459@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/doulos-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/doulos-fonts/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile doulos-fonts.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- doulos-fonts.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:17 -0700
Subject: rpms/edb/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 
	1.1, NONE edb.spec, 1.14, NONE needs.rebuild, 1.1, NONE sources,
	1.6, NONE
Message-ID: <200610112131.k9BLVKfq027491@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/edb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/edb/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile edb.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- edb.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:18 -0700
Subject: rpms/edje/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 
	1.1, NONE edje-0.5.0.023-novera.patch, 1.1, NONE edje.spec, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVKV5027494@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/edje/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/edje/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile edje-0.5.0.023-novera.patch edje.spec 
	needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- edje-0.5.0.023-novera.patch DELETED ---


--- edje.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:24 -0700
Subject: rpms/embryo/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE embryo.spec, 1.2, NONE needs.rebuild,
	1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVQ0B027552@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/embryo/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile embryo.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- embryo.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:26 -0700
Subject: rpms/fonttools/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE fonttools-20050315-20050624.patch, 1.1,
	NONE fonttools-unsigned-ranges.patch, 1.1, NONE fonttools.spec,
	1.4, NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVSDB027558@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fonttools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/fonttools/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile fonttools-20050315-20050624.patch 
	fonttools-unsigned-ranges.patch fonttools.spec needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- fonttools-20050315-20050624.patch DELETED ---


--- fonttools-unsigned-ranges.patch DELETED ---


--- fonttools.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:24 -0700
Subject: rpms/eet/devel dead.package, NONE, 1.1 .cvsignore, 1.5,
	NONE Makefile, 
	1.1, NONE eet-0.9.10.023-gcc4.patch, 1.1, NONE eet.spec, 1.8,
	NONE needs.rebuild, 1.1, NONE sources, 1.5, NONE
Message-ID: <200610112131.k9BLVQGl027547@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/eet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/eet/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile eet-0.9.10.023-gcc4.patch eet.spec 
	needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- eet-0.9.10.023-gcc4.patch DELETED ---


--- eet.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:25 -0700
Subject: rpms/evas/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 
	1.1, NONE evas-0.9.9.023-novera.patch, 1.1, NONE evas.spec, 1.5,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVRb9027555@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/evas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/evas/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile evas-0.9.9.023-novera.patch evas.spec 
	needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- evas-0.9.9.023-novera.patch DELETED ---


--- evas.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:32 -0700
Subject: rpms/gfontview/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE gfontview-0.5.0-gcc4.patch, 1.1,
	NONE gfontview-0.5.0-makefile.patch, 1.1, NONE gfontview.spec,
	1.3, NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVYOb027600@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gfontview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/gfontview/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gfontview-0.5.0-gcc4.patch 
	gfontview-0.5.0-makefile.patch gfontview.spec needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gfontview-0.5.0-gcc4.patch DELETED ---


--- gfontview-0.5.0-makefile.patch DELETED ---


--- gfontview.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:33 -0700
Subject: rpms/gourmet/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.1, NONE gourmet-0.10.1-hu.po.patch, 1.1,
	NONE gourmet-0.10.1-pt_BR.po.patch, 1.1, NONE gourmet.spec, 1.6,
	NONE needs.rebuild, 1.1, NONE nutritionDruid.glade, 1.1,
	NONE sources, 1.5, NONE
Message-ID: <200610112131.k9BLVZ8H027616@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gourmet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/gourmet/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gourmet-0.10.1-hu.po.patch 
	gourmet-0.10.1-pt_BR.po.patch gourmet.spec needs.rebuild 
	nutritionDruid.glade sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gourmet-0.10.1-hu.po.patch DELETED ---


--- gourmet-0.10.1-pt_BR.po.patch DELETED ---


--- gourmet.spec DELETED ---


--- needs.rebuild DELETED ---


--- nutritionDruid.glade DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:33 -0700
Subject: rpms/gtkhtml36/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE gtkhtml-3.3.0-crash.patch, 1.1,
	NONE gtkhtml36.spec, 1.3, NONE needs.rebuild, 1.1, NONE sources,
	1.2, NONE
Message-ID: <200610112131.k9BLVZgd027619@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/gtkhtml36/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gtkhtml-3.3.0-crash.patch gtkhtml36.spec 
	needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gtkhtml-3.3.0-crash.patch DELETED ---


--- gtkhtml36.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:34 -0700
Subject: rpms/gtranslator/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.2, NONE gtranslator.spec, 1.9,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVaKM027622@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gtranslator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/gtranslator/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gtranslator.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gtranslator.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:40 -0700
Subject: rpms/lcdf-typetools/devel dead.package, NONE, 1.1 .cvsignore, 1.5, 
	NONE Makefile, 1.1, NONE lcdf-typetools.spec, 1.6,
	NONE needs.rebuild, 1.1, NONE sources, 1.5, NONE
Message-ID: <200610112131.k9BLVgYO027651@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lcdf-typetools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/lcdf-typetools/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile lcdf-typetools.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- lcdf-typetools.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:47 -0700
Subject: rpms/nucleo/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE nucleo-0.5-64bit.patch, 1.1, NONE nucleo-0.5-gcc.patch, 1.1,
	NONE nucleo.spec, 1.7, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVna7027704@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/nucleo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/nucleo/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild nucleo-0.5-64bit.patch 
	nucleo-0.5-gcc.patch nucleo.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- nucleo-0.5-64bit.patch DELETED ---


--- nucleo-0.5-gcc.patch DELETED ---


--- nucleo.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:40 -0700
Subject: rpms/lcov/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE lcov-1.4-gcda-suffix.patch, 1.1,
	NONE lcov-1.4-lcovrc.patch, 1.1, NONE lcov.spec, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVgNX027655@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lcov/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/lcov/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile lcov-1.4-gcda-suffix.patch 
	lcov-1.4-lcovrc.patch lcov.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- lcov-1.4-gcda-suffix.patch DELETED ---


--- lcov-1.4-lcovrc.patch DELETED ---


--- lcov.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:46 -0700
Subject: rpms/MagicPoint/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE MagicPoint.spec, 1.3, NONE Makefile, 1.1,
	NONE magicpoint-1.08a-redhat.patch, 1.1,
	NONE magicpoint-1.09a-rpath.patch, 1.1,
	NONE magicpoint-1.10a-fix-gcc34.patch, 1.1,
	NONE magicpoint-1.10a-fix-usleep.patch, 1.1,
	NONE magicpoint-1.10a-longline.patch, 1.1,
	NONE magicpoint-1.11a-fix-gcc-warnings.patch, 1.1,
	NONE magicpoint-1.11b-fix-undefined-operation.patch, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVmEr027701@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/MagicPoint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/MagicPoint/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore MagicPoint.spec Makefile 
	magicpoint-1.08a-redhat.patch magicpoint-1.09a-rpath.patch 
	magicpoint-1.10a-fix-gcc34.patch 
	magicpoint-1.10a-fix-usleep.patch 
	magicpoint-1.10a-longline.patch 
	magicpoint-1.11a-fix-gcc-warnings.patch 
	magicpoint-1.11b-fix-undefined-operation.patch needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- MagicPoint.spec DELETED ---


--- Makefile DELETED ---


--- magicpoint-1.08a-redhat.patch DELETED ---


--- magicpoint-1.09a-rpath.patch DELETED ---


--- magicpoint-1.10a-fix-gcc34.patch DELETED ---


--- magicpoint-1.10a-fix-usleep.patch DELETED ---


--- magicpoint-1.10a-longline.patch DELETED ---


--- magicpoint-1.11a-fix-gcc-warnings.patch DELETED ---


--- magicpoint-1.11b-fix-undefined-operation.patch DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:48 -0700
Subject: rpms/polyxmass-common/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE polyxmass-common.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVohu027707@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/polyxmass-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/polyxmass-common/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild polyxmass-common.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- polyxmass-common.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:55 -0700
Subject: rpms/repoml/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE repoml.spec,
	1.3, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVvTk027782@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/repoml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/repoml/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild repoml.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- repoml.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:54 -0700
Subject: rpms/polyxmass-doc/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE polyxmass-doc.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVuPM027772@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/polyxmass-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/polyxmass-doc/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild polyxmass-doc.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- polyxmass-doc.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:55 -0700
Subject: rpms/quadkonsole/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE quadkonsole.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVv9r027779@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/quadkonsole/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/quadkonsole/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild quadkonsole.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- quadkonsole.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:56 -0700
Subject: rpms/rkhunter/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1,
	NONE rkhunter-1.1.8-showfiles.patch, 1.1,
	NONE rkhunter-1.1.9-shared_man_search.patch, 1.1,
	NONE rkhunter-1.2.7-append_log.patch, 1.1,
	NONE rkhunter-1.2.7-datestamp.patch, 1.1,
	NONE rkhunter-1.2.7-group_log.patch, 1.1,
	NONE rkhunter-1.2.7-manpage.patch, 1.1,
	NONE rkhunter-1.2.8-app_check_default.patch, 1.1,
	NONE rkhunter-1.2.8-default_settings-conf.patch, 1.1,
	NONE rkhunter.spec, 1.9, NONE sources, 1.6, NONE
Message-ID: <200610112131.k9BLVwCa027785@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rkhunter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/rkhunter/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild 
	rkhunter-1.1.8-showfiles.patch 
	rkhunter-1.1.9-shared_man_search.patch 
	rkhunter-1.2.7-append_log.patch rkhunter-1.2.7-datestamp.patch 
	rkhunter-1.2.7-group_log.patch rkhunter-1.2.7-manpage.patch 
	rkhunter-1.2.8-app_check_default.patch 
	rkhunter-1.2.8-default_settings-conf.patch rkhunter.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- rkhunter-1.1.8-showfiles.patch DELETED ---


--- rkhunter-1.1.9-shared_man_search.patch DELETED ---


--- rkhunter-1.2.7-append_log.patch DELETED ---


--- rkhunter-1.2.7-datestamp.patch DELETED ---


--- rkhunter-1.2.7-group_log.patch DELETED ---


--- rkhunter-1.2.7-manpage.patch DELETED ---


--- rkhunter-1.2.8-app_check_default.patch DELETED ---


--- rkhunter-1.2.8-default_settings-conf.patch DELETED ---


--- rkhunter.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:53 -0700
Subject: rpms/polyxmass-data/devel dead.package, NONE, 1.1 .cvsignore, 1.2, 
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE polyxmass-data.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200610112132.k9BLVtir027762@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/polyxmass-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/polyxmass-data/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild polyxmass-data.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- polyxmass-data.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:02 -0700
Subject: rpms/rpmDirectoryCheck/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1,
	NONE rpmDirectoryCheck.spec, 1.7, NONE sources, 1.2, NONE
Message-ID: <200610112132.k9BLW4sB027843@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmDirectoryCheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/rpmDirectoryCheck/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild rpmDirectoryCheck.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- rpmDirectoryCheck.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:04 -0700
Subject: rpms/straw/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE straw-desktop.patch, 1.1, NONE straw.spec, 1.7, NONE
Message-ID: <200610112132.k9BLW63l027862@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/straw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/straw/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources straw-desktop.patch 
	straw.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- straw-desktop.patch DELETED ---


--- straw.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:02 -0700
Subject: rpms/scim-chinese-standard/devel dead.package, NONE, 1.1 .cvsignore,
	1.2, NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE scim-chinese-standard.spec, 1.6, NONE sources, 1.5, NONE
Message-ID: <200610112132.k9BLW4Oq027851@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/scim-chinese-standard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/scim-chinese-standard/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild scim-chinese-standard.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- scim-chinese-standard.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:18 -0700
Subject: rpms/system-config-control/devel dead.package, NONE, 1.1 .cvsignore,
	1.2, NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources,
	1.6, NONE system-config-control.spec, 1.7, NONE
Message-ID: <200610112132.k9BLWLPv027889@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/system-config-control/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources 
	system-config-control.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- system-config-control.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:04 -0700
Subject: rpms/spicctrl/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE spicctrl.spec, 1.3, NONE
Message-ID: <200610112132.k9BLW6JL027859@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/spicctrl/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources spicctrl.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- spicctrl.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:21 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:21 -0700
Subject: rpms/tetex-fontools/devel dead.package, NONE, 1.1 .cvsignore, 1.2, 
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE tetex-fontools.spec, 1.1, NONE
Message-ID: <200610112132.k9BLWN9G027900@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/tetex-fontools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/tetex-fontools/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources tetex-fontools.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- tetex-fontools.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:27 -0700
Subject: rpms/translate-toolkit/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources, 1.4,
	NONE translate-toolkit.spec, 1.7, NONE
Message-ID: <200610112132.k9BLWTNj027953@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/translate-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/translate-toolkit/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources 
	translate-toolkit.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- translate-toolkit.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:27 -0700
Subject: rpms/ttf2pt1/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE ttf2pt1-3.4.3-makefile.patch, 1.1,
	NONE ttf2pt1-3.4.3-manpages.patch, 1.1,
	NONE ttf2pt1-3.4.4-ft2.patch, 1.1, NONE ttf2pt1.spec, 1.8, NONE
Message-ID: <200610112132.k9BLWTaL027958@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ttf2pt1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/ttf2pt1/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources 
	ttf2pt1-3.4.3-makefile.patch ttf2pt1-3.4.3-manpages.patch 
	ttf2pt1-3.4.4-ft2.patch ttf2pt1.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- ttf2pt1-3.4.3-makefile.patch DELETED ---


--- ttf2pt1-3.4.3-manpages.patch DELETED ---


--- ttf2pt1-3.4.4-ft2.patch DELETED ---


--- ttf2pt1.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:28 -0700
Subject: rpms/v2strip/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE v2strip.spec, 1.1, NONE
Message-ID: <200610112132.k9BLWU84027961@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/v2strip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/v2strip/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources v2strip.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- v2strip.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:29 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:29 -0700
Subject: rpms/zoo/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1, NONE sources, 1.3,
	NONE zoo-2.10-CAN-2005-2349.patch, 1.1,
	NONE zoo-2.10-febz-183426.patch, 1.1,
	NONE zoo-2.10-tempfile.patch, 1.1, NONE zoo-gcc.patch, 1.1,
	NONE zoo-return.patch, 1.1, NONE zoo-security_pathsize.patch,
	1.1, NONE zoo.patch, 1.1, NONE zoo.spec, 1.11, NONE
Message-ID: <200610112132.k9BLWV7h027964@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/zoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/zoo/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources 
	zoo-2.10-CAN-2005-2349.patch zoo-2.10-febz-183426.patch 
	zoo-2.10-tempfile.patch zoo-gcc.patch zoo-return.patch 
	zoo-security_pathsize.patch zoo.patch zoo.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- zoo-2.10-CAN-2005-2349.patch DELETED ---


--- zoo-2.10-febz-183426.patch DELETED ---


--- zoo-2.10-tempfile.patch DELETED ---


--- zoo-gcc.patch DELETED ---


--- zoo-return.patch DELETED ---


--- zoo-security_pathsize.patch DELETED ---


--- zoo.patch DELETED ---


--- zoo.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:46:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:46:05 -0700
Subject: comps comps-fe6.xml.in,1.184,1.185
Message-ID: <200610112146.k9BLk7JY028044@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28025

Modified Files:
	comps-fe6.xml.in 
Log Message:
Remove no longer available packages: amaya, camstream, cfs, fonttools,
gfontview, gourmet, lcov, MagicPoint, silky, straw, system-config-control



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- comps-fe6.xml.in	10 Oct 2006 21:08:09 -0000	1.184
+++ comps-fe6.xml.in	11 Oct 2006 21:46:05 -0000	1.185
@@ -13,7 +13,6 @@
       <packagereq type="optional">lat</packagereq>
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
-      <packagereq type="optional">system-config-control</packagereq>
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
   </group>
@@ -74,7 +73,6 @@
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">efont-unicode-bdf</packagereq>
-      <packagereq type="optional">fonttools</packagereq>
       <packagereq type="optional">FreeWnn</packagereq>
       <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">rss-glx</packagereq>
@@ -154,7 +152,6 @@
       <packagereq type="optional">ipython</packagereq>
       <packagereq type="optional">jam</packagereq>
       <packagereq type="optional">kuipc</packagereq>
-      <packagereq type="optional">lcov</packagereq>
       <packagereq type="optional">lightning</packagereq>
       <packagereq type="optional">lincvs</packagereq>
       <packagereq type="optional">lua</packagereq>
@@ -447,7 +444,6 @@
       <packagereq type="optional">byzanz</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">gdesklets</packagereq>
-      <packagereq type="optional">gfontview</packagereq>
       <packagereq type="optional">glipper</packagereq>
       <packagereq type="optional">glunarclock</packagereq>
       <packagereq type="optional">gmpc</packagereq>
@@ -517,7 +513,6 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="optional">amaya</packagereq>
       <packagereq type="optional">amsn</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">azureus</packagereq>
@@ -563,8 +558,6 @@
       <packagereq type="optional">putty</packagereq>
       <packagereq type="optional">rssowl</packagereq>
       <packagereq type="optional">screem</packagereq>
-      <packagereq type="optional">silky</packagereq>
-      <packagereq type="optional">straw</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
@@ -807,7 +800,6 @@
       <packagereq type="optional">glabels</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gnumeric</packagereq>
-      <packagereq type="optional">gourmet</packagereq>
       <packagereq type="optional">gramps</packagereq>
       <packagereq type="optional">grisbi</packagereq>
       <packagereq type="optional">gsview</packagereq>
@@ -815,7 +807,6 @@
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">lyx</packagereq>
-      <packagereq type="optional">MagicPoint</packagereq>
       <packagereq type="optional">notecase</packagereq>
       <packagereq type="optional">notemeister</packagereq>
       <packagereq type="optional">pybliographer</packagereq>
@@ -845,7 +836,6 @@
       <packagereq type="optional">bin2iso</packagereq>
       <packagereq type="optional">bmp</packagereq>
       <packagereq type="optional">camE</packagereq>
-      <packagereq type="optional">camstream</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
       <packagereq type="optional">easytag</packagereq>
@@ -895,7 +885,6 @@
       <packagereq type="optional">bochs</packagereq>
       <packagereq type="optional">cabextract</packagereq>
       <packagereq type="optional">cfengine</packagereq>
-      <packagereq type="optional">cfs</packagereq>
       <packagereq type="optional">chrpath</packagereq>
       <packagereq type="optional">conman</packagereq>
       <packagereq type="optional">connect-proxy</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:03 -0700
Subject: rpms/scribus-templates/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1,
	NONE scribus-templates.spec, 1.7, NONE sources, 1.3, NONE
Message-ID: <200610112132.k9BLW5tg027858@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/scribus-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/scribus-templates/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild scribus-templates.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- scribus-templates.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 22:35:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 15:35:37 -0700
Subject: rpms/libgalago/FC-5 libgalago.spec,1.6,1.7
Message-ID: <200610112235.k9BMZd42031217@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31200

Modified Files:
	libgalago.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-3
- Actually put the libdir in the correct package.



Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libgalago.spec	11 Oct 2006 16:07:04 -0000	1.6
+++ libgalago.spec	11 Oct 2006 22:35:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -71,18 +71,21 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_libdir}/%{name}.so.*
+%dir %{_libdir}/galago
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so
-%dir %{_libdir}/galago
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-3
+- Actually put the libdir in the correct package.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
 - Have package own %%libdir/galago.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 22:37:47 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 15:37:47 -0700
Subject: rpms/libgalago/devel libgalago.spec,1.10,1.11
Message-ID: <200610112237.k9BMbn8U031288@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31271

Modified Files:
	libgalago.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-3
- Actually put the libdir in the correct package.



Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgalago.spec	11 Oct 2006 15:58:34 -0000	1.10
+++ libgalago.spec	11 Oct 2006 22:37:47 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -71,18 +71,21 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_libdir}/%{name}.so.*
+%dir %{_libdir}/galago
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so
-%dir %{_libdir}/galago
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-3
+- Actually put the libdir in the correct package.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
 - Have package own %%libdir/galago.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 22:46:54 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 15:46:54 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 telepathy-gabble.spec, 1.8, 1.9
Message-ID: <200610112246.k9BMkuDh031412@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31391

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.11-1
- Update to 0.3.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Oct 2006 19:31:49 -0000	1.8
+++ .cvsignore	11 Oct 2006 22:46:54 -0000	1.9
@@ -1 +1 @@
-telepathy-gabble-0.3.10.tar.gz
+telepathy-gabble-0.3.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Oct 2006 19:31:49 -0000	1.8
+++ sources	11 Oct 2006 22:46:54 -0000	1.9
@@ -1 +1 @@
-2d68597d5624d687ae0f67a8bd40be98  telepathy-gabble-0.3.10.tar.gz
+a76a36d33374e339a25760678e4baae9  telepathy-gabble-0.3.11.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- telepathy-gabble.spec	5 Oct 2006 19:31:49 -0000	1.8
+++ telepathy-gabble.spec	11 Oct 2006 22:46:54 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.10
+Version:        0.3.11
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.11-1
+- Update to 0.3.11.
+
 * Thu Oct  5 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-1
 - Update to 0.3.10.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 23:00:58 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 11 Oct 2006 16:00:58 -0700
Subject: rpms/tclabc/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tclabc.spec,
	1.1, 1.2
Message-ID: <200610112301.k9BN10HU031753@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tclabc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31714/FC-5

Modified Files:
	.cvsignore sources tclabc.spec 
Log Message:
new version 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclabc/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Sep 2006 19:01:19 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:00:58 -0000	1.3
@@ -1 +1 @@
-tclabc-1.0.7.tar.gz
+tclabc-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclabc/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2006 19:01:19 -0000	1.2
+++ sources	11 Oct 2006 23:00:58 -0000	1.3
@@ -1 +1 @@
-34dbcb0177e11888d23ca7fa2304fb17  tclabc-1.0.7.tar.gz
+492cf4af7db7631204abfc70e43cb395  tclabc-1.0.8.tar.gz


Index: tclabc.spec
===================================================================
RCS file: /cvs/extras/rpms/tclabc/FC-5/tclabc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclabc.spec	28 Sep 2006 19:01:19 -0000	1.1
+++ tclabc.spec	11 Oct 2006 23:00:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tclabc
-Version:        1.0.7
-Release:        3%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        A Tcl interface and a Tk GUI to the ABC notation
 
 Group:          Applications/Multimedia
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.8-1
+- new version 1.0.8
+
 * Thu Sep 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-3
 - added BR alsa-lib-devel
 - converted files from iso-8859-1 to utf-8



From fedora-extras-commits at redhat.com  Wed Oct 11 23:00:59 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 11 Oct 2006 16:00:59 -0700
Subject: rpms/tclabc/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tclabc.spec,
	1.1, 1.2
Message-ID: <200610112301.k9BN11bw031761@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tclabc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31714/devel

Modified Files:
	.cvsignore sources tclabc.spec 
Log Message:
new version 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclabc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Sep 2006 19:01:19 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:00:59 -0000	1.3
@@ -1 +1 @@
-tclabc-1.0.7.tar.gz
+tclabc-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclabc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2006 19:01:19 -0000	1.2
+++ sources	11 Oct 2006 23:00:59 -0000	1.3
@@ -1 +1 @@
-34dbcb0177e11888d23ca7fa2304fb17  tclabc-1.0.7.tar.gz
+492cf4af7db7631204abfc70e43cb395  tclabc-1.0.8.tar.gz


Index: tclabc.spec
===================================================================
RCS file: /cvs/extras/rpms/tclabc/devel/tclabc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclabc.spec	28 Sep 2006 19:01:19 -0000	1.1
+++ tclabc.spec	11 Oct 2006 23:00:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tclabc
-Version:        1.0.7
-Release:        3%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        A Tcl interface and a Tk GUI to the ABC notation
 
 Group:          Applications/Multimedia
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.8-1
+- new version 1.0.8
+
 * Thu Sep 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-3
 - added BR alsa-lib-devel
 - converted files from iso-8859-1 to utf-8



From fedora-extras-commits at redhat.com  Wed Oct 11 23:15:20 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 11 Oct 2006 16:15:20 -0700
Subject: rpms/util-vserver/devel sources, 1.8, 1.9 util-vserver.spec, 1.20,
	1.21
Message-ID: <200610112315.k9BNFMse002381@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2362

Modified Files:
	sources util-vserver.spec 
Log Message:
updated to 0.30.211


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Jan 2006 20:08:43 -0000	1.8
+++ sources	11 Oct 2006 23:15:20 -0000	1.9
@@ -1,2 +1,2 @@
-1e8fff7cb6246d21ed029f082123019b  util-vserver-0.30.210.tar.bz2
-46625942d7064edeaa167ae5525694b7  util-vserver-0.30.210.tar.bz2.asc
+b0e8d503ba1cf5a7014eb41a72ec8fe2  util-vserver-0.30.211.tar.bz2
+400c5fad81a029dc88fb03485a9a503e  util-vserver-0.30.211.tar.bz2.asc


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- util-vserver.spec	4 Oct 2006 22:58:30 -0000	1.20
+++ util-vserver.spec	11 Oct 2006 23:15:20 -0000	1.21
@@ -20,8 +20,8 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.210
-Release: %release_func 5
+Version:	0.30.211
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -351,8 +351,11 @@
 
 
 %changelog
+* Thu Oct 12 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.211-1
+- updated to 0.30.211
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.30.210-5
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-4
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct 11 23:34:26 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Wed, 11 Oct 2006 16:34:26 -0700
Subject: rpms/facter/devel .cvsignore, 1.2, 1.3 facter.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610112334.k9BNYSaj002538@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2517

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jul 2006 00:51:59 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:34:26 -0000	1.3
@@ -1 +1 @@
-facter-1.3.3.tgz
+facter-1.3.5.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- facter.spec	13 Sep 2006 09:32:14 -0000	1.2
+++ facter.spec	11 Oct 2006 23:34:26 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.3
-Release: 2%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
@@ -52,6 +52,12 @@
 
 
 %changelog
+* Tue Oct 10 2006 David Lutterkort <dlutter at redhat.com> - 1.3.5-1
+- New version
+
+* Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 1.3.4-1
+- New version
+
 * Wed Sep 13 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-2
 - Rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jul 2006 00:51:59 -0000	1.2
+++ sources	11 Oct 2006 23:34:26 -0000	1.3
@@ -1 +1 @@
-49c5e1a293138cb5b93667f82ae28e89  facter-1.3.3.tgz
+e7a6abaee07603cbd79a30cb9b55b484  facter-1.3.5.tgz



From fedora-extras-commits at redhat.com  Wed Oct 11 23:34:42 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 11 Oct 2006 16:34:42 -0700
Subject: rpms/util-vserver/FC-5 sources,1.8,1.9 util-vserver.spec,1.17,1.18
Message-ID: <200610112334.k9BNYiEY002598@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2575

Modified Files:
	sources util-vserver.spec 
Log Message:
updated to 0.30.211; added graphviz BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Jan 2006 20:08:43 -0000	1.8
+++ sources	11 Oct 2006 23:34:42 -0000	1.9
@@ -1,2 +1,2 @@
-1e8fff7cb6246d21ed029f082123019b  util-vserver-0.30.210.tar.bz2
-46625942d7064edeaa167ae5525694b7  util-vserver-0.30.210.tar.bz2.asc
+b0e8d503ba1cf5a7014eb41a72ec8fe2  util-vserver-0.30.211.tar.bz2
+400c5fad81a029dc88fb03485a9a503e  util-vserver-0.30.211.tar.bz2.asc


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-5/util-vserver.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- util-vserver.spec	20 Feb 2006 18:02:01 -0000	1.17
+++ util-vserver.spec	11 Oct 2006 23:34:42 -0000	1.18
@@ -19,8 +19,8 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.210
-Release:	%release_func 2
+Version:	0.30.211
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -36,7 +36,7 @@
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
-BuildRequires:	doxygen tetex-latex
+BuildRequires:	doxygen tetex-latex graphviz
 ## HACK; 'make check' fails there due to a kernel bug
 ## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389
 ExcludeArch:	ppc
@@ -350,6 +350,10 @@
 
 
 %changelog
+* Thu Oct 12 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.211-1
+- updated to 0.30.211
+- added graphviz BR
+
 * Mon Feb 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-2
 - rebuilt for FC5
 



From fedora-extras-commits at redhat.com  Wed Oct 11 23:35:58 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Wed, 11 Oct 2006 16:35:58 -0700
Subject: rpms/facter/FC-5 .cvsignore, 1.2, 1.3 facter.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610112336.k9BNa0Md002641@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2620

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jul 2006 00:51:59 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:35:58 -0000	1.3
@@ -1 +1 @@
-facter-1.3.3.tgz
+facter-1.3.5.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-5/facter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- facter.spec	12 Jul 2006 00:51:59 -0000	1.1
+++ facter.spec	11 Oct 2006 23:35:58 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.3
+Version: 1.3.5
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -52,6 +52,15 @@
 
 
 %changelog
+* Tue Oct 10 2006 David Lutterkort <dlutter at redhat.com> - 1.3.5-1
+- New version
+
+* Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 1.3.4-1
+- New version
+
+* Wed Sep 13 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-2
+- Rebuilt for FC6
+
 * Wed Jun 28 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-1
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jul 2006 00:51:59 -0000	1.2
+++ sources	11 Oct 2006 23:35:58 -0000	1.3
@@ -1 +1 @@
-49c5e1a293138cb5b93667f82ae28e89  facter-1.3.3.tgz
+e7a6abaee07603cbd79a30cb9b55b484  facter-1.3.5.tgz



From fedora-extras-commits at redhat.com  Wed Oct 11 23:38:17 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Wed, 11 Oct 2006 16:38:17 -0700
Subject: rpms/facter/FC-4 .cvsignore, 1.2, 1.3 facter.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610112338.k9BNcJEN002717@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2696

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jul 2006 00:51:59 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:38:17 -0000	1.3
@@ -1 +1 @@
-facter-1.3.3.tgz
+facter-1.3.5.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-4/facter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- facter.spec	12 Jul 2006 00:51:59 -0000	1.1
+++ facter.spec	11 Oct 2006 23:38:17 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.3
+Version: 1.3.5
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -52,6 +52,15 @@
 
 
 %changelog
+* Tue Oct 10 2006 David Lutterkort <dlutter at redhat.com> - 1.3.5-1
+- New version
+
+* Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 1.3.4-1
+- New version
+
+* Wed Sep 13 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-2
+- Rebuilt for FC6
+
 * Wed Jun 28 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-1
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jul 2006 00:51:59 -0000	1.2
+++ sources	11 Oct 2006 23:38:17 -0000	1.3
@@ -1 +1 @@
-49c5e1a293138cb5b93667f82ae28e89  facter-1.3.3.tgz
+e7a6abaee07603cbd79a30cb9b55b484  facter-1.3.5.tgz



From fedora-extras-commits at redhat.com  Thu Oct 12 00:18:39 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Wed, 11 Oct 2006 17:18:39 -0700
Subject: accounts2 fedoraGroup.schema, 1.1, 1.2 fedoraMembership.schema, 1.1,
	1.2 fedoraPerson.schema, 1.2, 1.3
Message-ID: <200610120018.k9C0Idfb005841@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5819

Modified Files:
	fedoraGroup.schema fedoraMembership.schema fedoraPerson.schema 
Log Message:
it actually loads in openldap now



Index: fedoraGroup.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraGroup.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedoraGroup.schema	27 Sep 2006 01:17:49 -0000	1.1
+++ fedoraGroup.schema	12 Oct 2006 00:18:37 -0000	1.2
@@ -7,29 +7,41 @@
 #joinmsg 
 
 
-attributeType ( 2.5.4.41 NAME 'owner'
+attributeType ( 2.5.444.10 NAME 'groupowner'
                 DESC 'group owner'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
 
-attributeType ( 2.5.4.41 NAME 'group_type'
+attributeType ( 2.5.444.11 NAME 'grouptype'
                 DESC 'the type of group'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'needs_sponsor'
+attributeType ( 2.5.444.12 NAME 'needssponsor'
                 DESC 'boolean indicating whether or not the group needs a sponsor'
-                EQUALITY caseIgnoreMatch
+                EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.4.41 NAME 'user_can_remove'
+attributeType ( 2.5.444.13 NAME 'usercanremove'
                 DESC 'boolean indicating whether or not the user can remove the group'
-                EQUALITY caseIgnoreMatch
+                EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.4.41 NAME 'joing_msg'
-                DESC message received upon joining the group'
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
\ No newline at end of file
+attributeType ( 2.5.444.14 NAME 'joinmsg'
+                DESC 'message received upon joining the group'
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
+
+
+objectclass	( 2.5.555.3
+    NAME 'fedoraGroup'
+	DESC 'A object describing a group entry'
+    STRUCTURAL
+	MAY (
+		joinmsg $ usercanremove $ grouptype $ needssponsor $ 
+		usercanremove )
+	)
+	MUST ( 
+		cn $ groupowner )


Index: fedoraMembership.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraMembership.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedoraMembership.schema	27 Sep 2006 01:17:49 -0000	1.1
+++ fedoraMembership.schema	12 Oct 2006 00:18:37 -0000	1.2
@@ -9,46 +9,61 @@
 #sponsor (points to the sponsor's DN) 
 #creation (date) 
 #approval (date) 
+#don't have a name use cn instead
+#attributeType ( 2.5.444.1 NAME 'name'
+#                DESC 'group name'
+#                EQUALITY caseIgnoreMatch
+#                SUBSTR caseIgnoreSubstringsMatch
+#                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'name'
-                DESC 'group name'
-                EQUALITY caseIgnoreMatch
-                SUBSTR caseIgnoreSubstringsMatch
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
-
-attributeType ( 2.5.4.41 NAME 'role_type'
+attributeType ( 2.5.444.2 NAME 'roletype'
                 DESC 'the type of membership role'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
 
 
-attributeType ( 2.5.4.41 NAME 'role_status'
+attributeType ( 2.5.444.15 NAME 'roledomain'
+                DESC 'the domain of this role'
+                EQUALITY caseIgnoreMatch
+                SUBSTR caseIgnoreSubstringsMatch
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
+
+attributeType ( 2.5.444.3 NAME 'rolestatus'
                 DESC 'the approval status of this role'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
 
 
-attributeType ( 2.5.4.41 NAME 'internal_comments'
+attributeType ( 2.5.444.4 NAME 'internalcomments'
                  DESC 'group membership comments'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
 
 
-attributeType ( 2.5.4.41 NAME 'sponsor'
+attributeType ( 2.5.444.5 NAME 'sponsor'
                 DESC 'membership sponsor'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
 
-attributeType ( 2.5.4.41 NAME 'creation_date'
-                DESC 'membership creation_date'
+attributeType ( 2.5.444.6 NAME 'creationdate'
+                DESC 'membership creation date'
                 EQUALITY integerMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
-attributeType ( 2.5.4.41 NAME 'approval_date'
-                DESC 'membership creation_date'
+attributeType ( 2.5.444.7 NAME 'approvaldate'
+                DESC 'membership approval date'
                 EQUALITY integerMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 	
 
 
-
+objectclass	( 2.5.555.2
+    NAME 'fedoraMembership'
+	DESC 'An object describing a persons memebership'
+    STRUCTURAL
+	MAY (
+		approvaldate $ creationdate $ approvaldate $ roletype $
+		rolestatus $ roledomain $ internalcomments $ sponsor )
+	)
+	MUST ( 
+		cn  )


Index: fedoraPerson.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraPerson.schema,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedoraPerson.schema	2 Oct 2006 02:46:31 -0000	1.2
+++ fedoraPerson.schema	12 Oct 2006 00:18:37 -0000	1.3
@@ -2,24 +2,24 @@
 #it is based on the inetOrgPerson shema, but has some spicific
 #attribues added onto it for use by the Account system
 #for now this is the contents
-#ssh_key
-attributeType ( 2.5.4.41 NAME 'ssh_key'
+#sshkey bugzillaemail
+attributeType ( 2.5.444.8 NAME 'sshkey'
                 DESC 'ssh key for this memeber'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'bugzilla_email'
-                DESC 'members preferred bugzilla email address'
-		EQUALITY caseIgnoreIA5Match
-		SUBSTR caseIgnoreIA5SubstringsMatch
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
+attributeType ( 2.5.444.9 NAME 'bugzillaemail'
+        DESC 'members preferred bugzilla email address'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # fedoraPerson
 # The fedoraPerson represents people who are a member of the fedora project
 # in some way.  It is a structural class and inherits
 # from the inetOrgPerson class
-objectclass	( 2.16.840.1.113730.3.2.2
+objectclass	( 2.5.555.1
     NAME 'fedoraPerson'
 	DESC 'A member of the fedoraproject group'
     SUP inetOrgPerson
@@ -34,5 +34,5 @@
 		userSMIMECertificate $ userPKCS12 )
 	)
 	MUST (
-		ssh_key $ bugzilla_email 
+		sshkey $ bugzillaemail 
 	)



From fedora-extras-commits at redhat.com  Thu Oct 12 00:26:49 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 11 Oct 2006 17:26:49 -0700
Subject: devel/qgo .cvsignore,1.5,1.6 qgo.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <200610120026.k9C0Qp5R005912@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/qgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5889

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/qgo/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Apr 2006 14:42:38 -0000	1.5
+++ .cvsignore	12 Oct 2006 00:26:48 -0000	1.6
@@ -1 +1 @@
-qgo-1.5-r1.tar.gz
+qgo-1.5.2.tar.gz


Index: qgo.spec
===================================================================
RCS file: /cvs/extras/devel/qgo/qgo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qgo.spec	11 Sep 2006 20:59:46 -0000	1.10
+++ qgo.spec	12 Oct 2006 00:26:48 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: Graphical Go client and SGF editor
 Name: qgo
-Version: 1.5r1
-Release: 2%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://qgo.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.5-r1.tar.gz
+Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.5.2.tar.gz
 Source1: qgo.desktop
 BuildRequires: libjpeg-devel libpng-devel qt-devel
 BuildRequires: desktop-file-utils
@@ -20,7 +20,7 @@
 qGo supports loading MGT and Jago XML format Go games.
 
 %prep
-%setup -q -n %{name}-1.5
+%setup -q -n %{name}-1.5.2
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
@@ -58,6 +58,9 @@
 %{_datadir}/mimelnk/text/sgf.desktop
 
 %changelog
+* Wed Oct 11 2006 Chris Ricker <kaboom at oobleck.net> 1.5.2-1
+- New upstream release
+
 * Mon Sep 11 2006 Chris Ricker <kaboom at oobleck.net> 1.5r1-2
 - Bump and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/qgo/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Apr 2006 14:42:38 -0000	1.5
+++ sources	12 Oct 2006 00:26:48 -0000	1.6
@@ -1 +1 @@
-1051f540aa4e1a83a29ec6be3896c2c2  qgo-1.5-r1.tar.gz
+a9767f2572fc8d8c5653726bbce402e0  qgo-1.5.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 03:21:53 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 11 Oct 2006 20:21:53 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/devel
	gnome-theme-clearlooks-bigpack.spec, 1.3, 1.4
Message-ID: <200610120321.k9C3LtPq016148@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16131

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Bump EVR, and rebuild for dist tag update along with some spacing cleanups


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-theme-clearlooks-bigpack.spec	23 Dec 2005 06:05:17 -0000	1.3
+++ gnome-theme-clearlooks-bigpack.spec	12 Oct 2006 03:21:53 -0000	1.4
@@ -1,16 +1,16 @@
-Name:           gnome-theme-clearlooks-bigpack
-Version:        0.6
-Release:        1%{?dist}
+Name:		gnome-theme-clearlooks-bigpack
+Version:	0.6
+Release:	2%{?dist}
 Summary:        Additional Clearlooks color schemes
 
-Group:          User Interface/Desktops
-License:        GPL
-URL:            http://www.gnome-look.org/content/show.php?content=25557
-Source0:        http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+Group:		User Interface/Desktops
+License:	GPL
+URL:		http://www.gnome-look.org/content/show.php?content=25557
+Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
-Requires:       gtk2-engines
+Requires:	gtk2-engines
 
 %description
 Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine.
@@ -33,6 +33,10 @@
 %{_datadir}/themes/*
 
 %changelog
+* Wed Oct 11 2006 Peter Gordon <peter at thecodergeek.com> 0.6-2
+- Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel)
+- Use hard tabs instead of spaces for the tags for simplicity
+
 * Fri Dec 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Thu Oct 12 06:37:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 23:37:53 -0700
Subject: rpms/perl-PAR-Dist/FC-5 .cvsignore, 1.10, 1.11 perl-PAR-Dist.spec, 
	1.14, 1.15 sources, 1.10, 1.11
Message-ID: <200610120638.k9C6cP0L025649@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-PAR-Dist/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25611/FC-5

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
* Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
- 0.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Sep 2006 13:42:56 -0000	1.10
+++ .cvsignore	12 Oct 2006 06:37:52 -0000	1.11
@@ -1 +1 @@
-PAR-Dist-0.19.tar.gz
+PAR-Dist-0.20.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/perl-PAR-Dist.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-PAR-Dist.spec	17 Sep 2006 13:42:56 -0000	1.14
+++ perl-PAR-Dist.spec	12 Oct 2006 06:37:52 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.19
+Version:        0.20
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
+- 0.20.
+
 * Sun Sep 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.19-1
 - 0.19.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Sep 2006 13:42:56 -0000	1.10
+++ sources	12 Oct 2006 06:37:52 -0000	1.11
@@ -1 +1 @@
-becaeb761fa8a576413b8aba429c742b  PAR-Dist-0.19.tar.gz
+471da0751f63f8f4ea609b8ea08de964  PAR-Dist-0.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 06:37:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 23:37:53 -0700
Subject: rpms/perl-PAR-Dist/devel .cvsignore, 1.10, 1.11 perl-PAR-Dist.spec, 
	1.14, 1.15 sources, 1.10, 1.11
Message-ID: <200610120638.k9C6cQ6t025654@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-PAR-Dist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25611/devel

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
* Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
- 0.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Sep 2006 13:42:56 -0000	1.10
+++ .cvsignore	12 Oct 2006 06:37:53 -0000	1.11
@@ -1 +1 @@
-PAR-Dist-0.19.tar.gz
+PAR-Dist-0.20.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-PAR-Dist.spec	17 Sep 2006 13:42:56 -0000	1.14
+++ perl-PAR-Dist.spec	12 Oct 2006 06:37:53 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.19
+Version:        0.20
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
+- 0.20.
+
 * Sun Sep 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.19-1
 - 0.19.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Sep 2006 13:42:56 -0000	1.10
+++ sources	12 Oct 2006 06:37:53 -0000	1.11
@@ -1 +1 @@
-becaeb761fa8a576413b8aba429c742b  PAR-Dist-0.19.tar.gz
+471da0751f63f8f4ea609b8ea08de964  PAR-Dist-0.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 07:46:24 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 12 Oct 2006 00:46:24 -0700
Subject: rpms/fcron/devel fcron.README, 1.1, 1.2 fcron.LISEZMOI, 1.1,
	1.2 fcron.spec, 1.6, 1.7
Message-ID: <200610120746.k9C7kQVl028823@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/fcron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28802

Modified Files:
	fcron.README fcron.LISEZMOI fcron.spec 
Log Message:
Don't remove fcron user when erasing package.


Index: fcron.README
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.README	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.README	12 Oct 2006 07:46:24 -0000	1.2
@@ -7,4 +7,8 @@
 
   fcrontab /etc/crontab
 
-This should be done everytime the file is modified.
\ No newline at end of file
+This should be done everytime the file is modified.
+
+To remove definitively the fcron package, you'll have to remove the fcron
+user by hand, and the /var/spool/fcron directory which contains the
+binary fcrontabs.


Index: fcron.LISEZMOI
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.LISEZMOI,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.LISEZMOI	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.LISEZMOI	12 Oct 2006 07:46:24 -0000	1.2
@@ -9,4 +9,8 @@
 
   fcrontab /etc/crontab
 
-et de recommencer chaque fois que vous modifiez ce fichier.
\ No newline at end of file
+et de recommencer chaque fois que vous modifiez ce fichier.
+
+Enfin, si l'administrateur souhaite d??sintaller d??finitivement ce paquet,
+il devra supprimer ?? la main l'utilisateur fcron et le r??pertoire
+/var/spool/fcron qui contient entre autres les tables fcrontab binaires.


Index: fcron.spec
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fcron.spec	1 Sep 2006 23:22:09 -0000	1.6
+++ fcron.spec	12 Oct 2006 07:46:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		fcron
 Version:	3.0.1
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	A task scheduler
 Summary(fr):	Un ordonnanceur de t??ches
 Summary(it):	Uno schedulatore di processi
@@ -30,7 +30,6 @@
 Requires(pre):    /usr/sbin/useradd
 Requires(post):   /sbin/chkconfig, /sbin/service
 Requires(preun):  /sbin/chkconfig, /sbin/service
-Requires(postun): /usr/sbin/userdel
 
 %description
 Fcron is a scheduler. It aims at replacing Vixie Cron, so it implements most
@@ -130,16 +129,15 @@
   %{__mv} tmp $i
 done
 
-# rpmbuild insist that %ghost files exist?
+# rpmbuild insist that %ghost files exist
 %{__install} -d %{buildroot}%{_localstatedir}/run/
 touch %{buildroot}%{_localstatedir}/run/fcron.pid
-touch %{buildroot}%{_localstatedir}/run/fcron.fifo
 
 
 %pre
 if [ "$1" = "1" ]
 then
-  /usr/sbin/useradd -c "Fcron system user" -r fcron -d %{_localstatedir}/spool/fcron -s /bin/true
+  /usr/sbin/useradd -c "Fcron system user" -r fcron -d %{_localstatedir}/spool/fcron -s /bin/true &>/dev/null || :
 fi
 
 %post
@@ -153,13 +151,6 @@
   fi
 fi
 
-%postun
-if [ "$1" = "0" ]
-  then
-  # Remove user fcron
-  /usr/sbin/userdel fcron
-fi
-
 %preun
 if [ "$1" = "0" ]
 then
@@ -193,9 +184,13 @@
 %{_sbindir}/fcron-update-crontabs
 %dir %attr(770,fcron,fcron) %{_localstatedir}/spool/fcron
 %ghost %{_localstatedir}/run/fcron.pid
-%ghost %{_localstatedir}/run/fcron.fifo
 
 %changelog
+* Fri Oct 12 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 3.0.1-17
+  - Don't remove frcon user when erasing package
+  - Update doc accordingly
+  - Don't ghost fcron.fifo
+
 * Fri Sep  1 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 3.0.1-16
   - FE6 rebuild
 



From fedora-extras-commits at redhat.com  Thu Oct 12 07:46:55 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 12 Oct 2006 00:46:55 -0700
Subject: rpms/fcron/FC-4 fcron.README, 1.1, 1.2 fcron.LISEZMOI, 1.1,
	1.2 fcron.spec, 1.5, 1.6
Message-ID: <200610120746.k9C7kvZn028890@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/fcron/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28867

Modified Files:
	fcron.README fcron.LISEZMOI fcron.spec 
Log Message:
Don't remove fcron user when erasing package.


Index: fcron.README
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-4/fcron.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.README	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.README	12 Oct 2006 07:46:55 -0000	1.2
@@ -7,4 +7,8 @@
 
   fcrontab /etc/crontab
 
-This should be done everytime the file is modified.
\ No newline at end of file
+This should be done everytime the file is modified.
+
+To remove definitively the fcron package, you'll have to remove the fcron
+user by hand, and the /var/spool/fcron directory which contains the
+binary fcrontabs.


Index: fcron.LISEZMOI
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-4/fcron.LISEZMOI,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.LISEZMOI	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.LISEZMOI	12 Oct 2006 07:46:55 -0000	1.2
@@ -9,4 +9,8 @@
 
   fcrontab /etc/crontab
 
-et de recommencer chaque fois que vous modifiez ce fichier.
\ No newline at end of file
+et de recommencer chaque fois que vous modifiez ce fichier.
+
+Enfin, si l'administrateur souhaite d??sintaller d??finitivement ce paquet,
+il devra supprimer ?? la main l'utilisateur fcron et le r??pertoire
+/var/spool/fcron qui contient entre autres les tables fcrontab binaires.


Index: fcron.spec
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-4/fcron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fcron.spec	24 Aug 2006 18:23:52 -0000	1.5
+++ fcron.spec	12 Oct 2006 07:46:55 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		fcron
 Version:	3.0.1
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A task scheduler
 Summary(fr):	Un ordonnanceur de t??ches
 Summary(it):	Uno schedulatore di processi
@@ -30,7 +30,6 @@
 Requires(pre):    /usr/sbin/useradd
 Requires(post):   /sbin/chkconfig, /sbin/service
 Requires(preun):  /sbin/chkconfig, /sbin/service
-Requires(postun): /usr/sbin/userdel
 
 %description
 Fcron is a scheduler. It aims at replacing Vixie Cron, so it implements most
@@ -133,7 +132,6 @@
 # rpmbuild insist that %ghost files exist?
 %{__install} -d %{buildroot}%{_localstatedir}/run/
 touch %{buildroot}%{_localstatedir}/run/fcron.pid
-touch %{buildroot}%{_localstatedir}/run/fcron.fifo
 
 
 %pre
@@ -153,13 +151,6 @@
   fi
 fi
 
-%postun
-if [ "$1" = "0" ]
-  then
-  # Remove user fcron
-  /usr/sbin/userdel fcron
-fi
-
 %preun
 if [ "$1" = "0" ]
 then
@@ -193,9 +184,13 @@
 %{_sbindir}/fcron-update-crontabs
 %dir %attr(770,fcron,fcron) %{_localstatedir}/spool/fcron
 %ghost %{_localstatedir}/run/fcron.pid
-%ghost %{_localstatedir}/run/fcron.fifo
 
 %changelog
+* Fri Oct 12 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 3.0.1-16
+  - Don't remove frcon user when erasing package
+  - Update doc accordingly
+  - Don't ghost fcron.fifo
+
 * Thu Aug 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.1-15
   - Fix doc permissions (#200834).
 



From fedora-extras-commits at redhat.com  Thu Oct 12 07:47:22 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 12 Oct 2006 00:47:22 -0700
Subject: rpms/fcron/FC-5 fcron.README, 1.1, 1.2 fcron.LISEZMOI, 1.1,
	1.2 fcron.spec, 1.5, 1.6
Message-ID: <200610120747.k9C7lOAJ028957@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/fcron/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28936

Modified Files:
	fcron.README fcron.LISEZMOI fcron.spec 
Log Message:
Don't remove fcron user when erasing package.


Index: fcron.README
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-5/fcron.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.README	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.README	12 Oct 2006 07:47:21 -0000	1.2
@@ -7,4 +7,8 @@
 
   fcrontab /etc/crontab
 
-This should be done everytime the file is modified.
\ No newline at end of file
+This should be done everytime the file is modified.
+
+To remove definitively the fcron package, you'll have to remove the fcron
+user by hand, and the /var/spool/fcron directory which contains the
+binary fcrontabs.


Index: fcron.LISEZMOI
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-5/fcron.LISEZMOI,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.LISEZMOI	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.LISEZMOI	12 Oct 2006 07:47:21 -0000	1.2
@@ -9,4 +9,8 @@
 
   fcrontab /etc/crontab
 
-et de recommencer chaque fois que vous modifiez ce fichier.
\ No newline at end of file
+et de recommencer chaque fois que vous modifiez ce fichier.
+
+Enfin, si l'administrateur souhaite d??sintaller d??finitivement ce paquet,
+il devra supprimer ?? la main l'utilisateur fcron et le r??pertoire
+/var/spool/fcron qui contient entre autres les tables fcrontab binaires.


Index: fcron.spec
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-5/fcron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fcron.spec	24 Aug 2006 18:23:53 -0000	1.5
+++ fcron.spec	12 Oct 2006 07:47:21 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		fcron
 Version:	3.0.1
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A task scheduler
 Summary(fr):	Un ordonnanceur de t??ches
 Summary(it):	Uno schedulatore di processi
@@ -30,7 +30,6 @@
 Requires(pre):    /usr/sbin/useradd
 Requires(post):   /sbin/chkconfig, /sbin/service
 Requires(preun):  /sbin/chkconfig, /sbin/service
-Requires(postun): /usr/sbin/userdel
 
 %description
 Fcron is a scheduler. It aims at replacing Vixie Cron, so it implements most
@@ -133,7 +132,6 @@
 # rpmbuild insist that %ghost files exist?
 %{__install} -d %{buildroot}%{_localstatedir}/run/
 touch %{buildroot}%{_localstatedir}/run/fcron.pid
-touch %{buildroot}%{_localstatedir}/run/fcron.fifo
 
 
 %pre
@@ -153,13 +151,6 @@
   fi
 fi
 
-%postun
-if [ "$1" = "0" ]
-  then
-  # Remove user fcron
-  /usr/sbin/userdel fcron
-fi
-
 %preun
 if [ "$1" = "0" ]
 then
@@ -193,9 +184,13 @@
 %{_sbindir}/fcron-update-crontabs
 %dir %attr(770,fcron,fcron) %{_localstatedir}/spool/fcron
 %ghost %{_localstatedir}/run/fcron.pid
-%ghost %{_localstatedir}/run/fcron.fifo
 
 %changelog
+* Fri Oct 12 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 3.0.1-16
+  - Don't remove frcon user when erasing package
+  - Update doc accordingly
+  - Don't ghost fcron.fifo
+
 * Thu Aug 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.1-15
   - Fix doc permissions (#200834).
 



From fedora-extras-commits at redhat.com  Thu Oct 12 08:23:17 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Thu, 12 Oct 2006 01:23:17 -0700
Subject: rpms/lcov/devel .cvsignore, 1.3, 1.4 Makefile, 1.2,
	1.3 lcov-1.4-gcda-suffix.patch, 1.2, 1.3 lcov-1.4-lcovrc.patch,
	1.2, 1.3 lcov.spec, 1.2, 1.3 sources, 1.3, 1.4 dead.package, 1.1, NONE
Message-ID: <200610120823.k9C8NKJJ032089@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/lcov/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32056

Added Files:
	.cvsignore Makefile lcov-1.4-gcda-suffix.patch 
	lcov-1.4-lcovrc.patch lcov.spec sources 
Removed Files:
	dead.package 
Log Message:
Resurrect wrongly removed package.


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	12 Oct 2006 08:23:17 -0000	1.4
@@ -0,0 +1 @@
+lcov-1.4.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	12 Oct 2006 08:23:17 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: lcov
+# $Id$
+NAME := lcov
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

lcov-1.4-gcda-suffix.patch:

Index: lcov-1.4-gcda-suffix.patch
===================================================================
RCS file: lcov-1.4-gcda-suffix.patch
diff -N lcov-1.4-gcda-suffix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lcov-1.4-gcda-suffix.patch	12 Oct 2006 08:23:17 -0000	1.3
@@ -0,0 +1,34 @@
+--- lcov-1.4/bin/lcov.~1~	2005-03-02 08:24:50.000000000 -0800
++++ lcov-1.4/bin/lcov	2006-02-15 10:24:41.000000000 -0800
+@@ -331,8 +331,8 @@ get coverage data for a user space progr
+   -c, --capture                   Capture coverage data
+   -t, --test-name NAME            Specify test name to be stored with data
+   -o, --output-file FILENAME      Write data to FILENAME instead of stdout
+-  -d, --directory DIR             Use .da files in DIR instead of kernel
+-  -f, --follow                    Follow links when searching .da files
++  -d, --directory DIR             Use .da/.gcda files in DIR instead of kernel
++  -f, --follow                    Follow links when searching .da/.gcda files
+   -k, --kernel-directory KDIR     Capture kernel coverage data only from KDIR
+   -a, --add-tracefile FILE        Add contents of tracefiles
+   -e, --extract FILE PATTERN      Extract files matching PATTERN from FILE
+@@ -399,17 +399,17 @@ sub userspace_reset()
+ 
+ 	foreach $current_dir (@directory)
+ 	{
+-		info("Deleting all .da files in $current_dir and ".
++		info("Deleting all .da and .gcda files in $current_dir and ".
+ 		     "subdirectories\n");
+ 		if ($follow)
+ 		{
+ 			@file_list =
+-				`find $current_dir -follow -name \\*.da -type f 2>/dev/null`;
++				`find $current_dir -follow \\( -name \\*.gcda -o -name \\*.da \\) -type f 2>/dev/null`;
+ 		}
+ 		else
+ 		{
+ 			@file_list =
+-				`find $current_dir -name \\*.da -type f 2>/dev/null`;
++				`find $current_dir \\( -name \\*.gcda -o -name \\*.da \\) -type f 2>/dev/null`;
+ 		}
+ 		chomp(@file_list);
+ 		foreach (@file_list)

lcov-1.4-lcovrc.patch:

Index: lcov-1.4-lcovrc.patch
===================================================================
RCS file: lcov-1.4-lcovrc.patch
diff -N lcov-1.4-lcovrc.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lcov-1.4-lcovrc.patch	12 Oct 2006 08:23:17 -0000	1.3
@@ -0,0 +1,18 @@
+--- lcov-1.4/lcovrc.~1~	2005-03-02 08:24:47.000000000 -0800
++++ lcov-1.4/lcovrc	2006-02-13 19:09:02.000000000 -0800
+@@ -22,13 +22,13 @@ genhtml_overview_width = 80
+ # difference in lines between the position a user selected from the overview
+ # and the position the source code window is scrolled to (used by --frames
+ # option of genhtml)
+-genhtml_nav_resolution = 4;
++genhtml_nav_resolution = 4
+ 
+ # Clicking a line in the overview image should show the source code view at
+ # a position a bit further up so that the requested line is not the first
+ # line in the window. This number specifies that offset in lines (used by
+ # --frames option of genhtml)
+-genhtml_nav_offset = 10;
++genhtml_nav_offset = 10
+ 
+ # Do not remove unused test descriptions if non-zero (same as
+ # --keep-descriptions option of genhtml)


Index: lcov.spec
===================================================================
RCS file: lcov.spec
diff -N lcov.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lcov.spec	12 Oct 2006 08:23:17 -0000	1.3
@@ -0,0 +1,54 @@
+Name: lcov
+Version: 1.4
+Release: 2%{?dist}
+
+Summary: LTP GCOV extension code coverage tool
+Group: Development/Tools
+License: GPL
+
+URL: http://ltp.sourceforge.net/coverage/lcov.php
+Source0: http://dl.sourceforge.net/ltp/lcov-%{version}.tar.gz
+Patch1: lcov-1.4-lcovrc.patch
+Patch2: lcov-1.4-gcda-suffix.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+Requires: /usr/bin/gcov
+Requires: perl(GD::Image)
+
+%description
+LCOV is an extension of GCOV, a GNU tool which provides information
+about what parts of a program are actually executed (i.e. "covered")
+while running a particular test case. The extension consists of a set
+of PERL scripts which build on the textual GCOV output to implement
+HTML output and support for large projects.
+
+%prep
+%setup -q
+
+%patch1 -p1
+%patch2 -p1
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install PREFIX=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%config(noreplace) %attr(0644,root,root) /etc/lcovrc
+
+%changelog
+* Mon Feb 20 2006 Roland McGrath <roland at redhat.com> - 1.4-2
+- Fix lcov -z to look for .gcda (GCC >= 3.4) suffix as well as .da (old GCC).
+- Remove empty %%build from spec.
+- Fix URL for source tarball.
+
+* Mon Feb 13 2006 Roland McGrath <roland at redhat.com> - 1.4-1
+- Initial build, some spec bits snarfed from upstream.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	12 Oct 2006 08:23:17 -0000	1.4
@@ -0,0 +1 @@
+9ae93c6619ee60a9e89bd2da0e49ae4a  lcov-1.4.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 12 08:24:20 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Thu, 12 Oct 2006 01:24:20 -0700
Subject: owners owners.list,1.1822,1.1823
Message-ID: <200610120824.k9C8OMvB032122@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32105

Modified Files:
	owners.list 
Log Message:
Fix lcov wrongly marked as orphaned


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1822
retrieving revision 1.1823
diff -u -r1.1822 -r1.1823
--- owners.list	11 Oct 2006 20:05:35 -0000	1.1822
+++ owners.list	12 Oct 2006 08:24:20 -0000	1.1823
@@ -820,7 +820,7 @@
 Fedora Extras|lat|LDAP Administration Tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|mpeters at mac.com
 Fedora Extras|lcms|Color Management System|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|lcov|LTP GCOV extension code coverage tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roland at redhat.com
+Fedora Extras|lcov|LTP GCOV extension code coverage tool|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct 12 14:55:56 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 12 Oct 2006 07:55:56 -0700
Subject: rpms/abiword/devel abiword-2.4.5-fontconfig.patch, NONE,
	1.1 abiword.spec, 1.38, 1.39
Message-ID: <200610121455.k9CEtwDU018991@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18971

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.5-fontconfig.patch 
Log Message:
Fix 207294: abiword crashes at exit



abiword-2.4.5-fontconfig.patch:

--- NEW FILE abiword-2.4.5-fontconfig.patch ---
diff -r -u abiword-2.4.5.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.5/abi/src/af/xap/unix/xap_UnixApp.cpp
--- abiword-2.4.5.orig/abi/src/af/xap/unix/xap_UnixApp.cpp	2006-05-12 22:40:11.000000000 +0200
+++ abiword-2.4.5/abi/src/af/xap/unix/xap_UnixApp.cpp	2006-10-12 15:12:34.000000000 +0200
@@ -134,10 +134,6 @@
 	DELETEP(m_pUnixToolbarIcons);
 	
 	delete m_fontManager;
-
-#if FC_MINOR > 2
-	FcFini();
-#endif
 }
 
 bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue)


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- abiword.spec	11 Sep 2006 17:38:58 -0000	1.38
+++ abiword.spec	12 Oct 2006 14:55:56 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -45,6 +45,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.5-fontconfig.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -54,6 +55,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .fontconfig
 
 %build
 cd abi
@@ -135,6 +137,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.5-4.fc6
+- Fix bug 207294
+
 * Mon Sep 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.5-3.fc6
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Thu Oct 12 15:30:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 08:30:13 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.26, 1.27 sources, 1.27,
	1.28 sylpheed-claws.spec, 1.51, 1.52
Message-ID: <200610121530.k9CFUFts022181@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22112/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Oct 2006 09:01:07 -0000	1.26
+++ .cvsignore	12 Oct 2006 15:30:13 -0000	1.27
@@ -1 +1 @@
-sylpheed-claws-2.5.3.tar.bz2
+sylpheed-claws-2.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	7 Oct 2006 09:01:07 -0000	1.27
+++ sources	12 Oct 2006 15:30:13 -0000	1.28
@@ -1 +1 @@
-3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2
+ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sylpheed-claws.spec	7 Oct 2006 09:01:07 -0000	1.51
+++ sylpheed-claws.spec	12 Oct 2006 15:30:13 -0000	1.52
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.3
+Version:        2.5.5
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -168,6 +168,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.5-1
+- version upgrade
+
 * Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.3-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Oct 12 15:30:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 08:30:12 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.22, 1.23 sources, 1.23,
	1.24 sylpheed-claws.spec, 1.46, 1.47
Message-ID: <200610121530.k9CFUEkj022174@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22112/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	7 Oct 2006 09:01:06 -0000	1.22
+++ .cvsignore	12 Oct 2006 15:30:12 -0000	1.23
@@ -1 +1 @@
-sylpheed-claws-2.5.3.tar.bz2
+sylpheed-claws-2.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Oct 2006 09:01:06 -0000	1.23
+++ sources	12 Oct 2006 15:30:12 -0000	1.24
@@ -1 +1 @@
-3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2
+ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sylpheed-claws.spec	7 Oct 2006 09:01:06 -0000	1.46
+++ sylpheed-claws.spec	12 Oct 2006 15:30:12 -0000	1.47
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        2.5.3
+Version:        2.5.5
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -179,6 +179,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.5-1
+- version upgrade
+
 * Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.3-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Oct 12 15:30:14 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 08:30:14 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.26, 1.27 sources, 1.27,
	1.28 sylpheed-claws.spec, 1.52, 1.53
Message-ID: <200610121530.k9CFUG0p022187@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22112/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Oct 2006 09:01:08 -0000	1.26
+++ .cvsignore	12 Oct 2006 15:30:14 -0000	1.27
@@ -1 +1 @@
-sylpheed-claws-2.5.3.tar.bz2
+sylpheed-claws-2.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	7 Oct 2006 09:01:08 -0000	1.27
+++ sources	12 Oct 2006 15:30:14 -0000	1.28
@@ -1 +1 @@
-3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2
+ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sylpheed-claws.spec	7 Oct 2006 09:01:08 -0000	1.52
+++ sylpheed-claws.spec	12 Oct 2006 15:30:14 -0000	1.53
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.3
+Version:        2.5.5
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.5-1
+- version upgrade
+
 * Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.3-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Oct 12 16:05:32 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Thu, 12 Oct 2006 09:05:32 -0700
Subject: rpms/listen/FC-5 listen.spec,1.10,1.11
Message-ID: <200610121605.k9CG5Y1i025400@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25324

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- listen.spec	9 Oct 2006 11:03:25 -0000	1.10
+++ listen.spec	12 Oct 2006 16:05:32 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        5.beta1%{?dist}
+Release:        6.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -28,15 +28,29 @@
 BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
-BuildRequires: python-ogg-devel
-BuildRequires: python-vorbis
 BuildRequires: python-sexy
 BuildRequires: python-mutagen >= 1.6
 BuildRequires: desktop-file-utils
+
+
+# added explicit Requires
+Requires: python-mutagen >= 1.6
+Requires: python 
+Requires: pygtk2 
+Requires: gstreamer-python 
+Requires: dbus-python
+Requires: python-sqlite2
+Requires: python-ctypes
+Requires: gnome-python2
+Requires: gnome-python2-extras
+Requires: gnome-python2-gtkmozembed
+Requires: gnome-python2-libegg
+Requires: python-sexy
 # MusicBrainz support
-BuildRequires: python-musicbrainz2 
-BuildRequires: libtunepimp 
+Requires: python-musicbrainz2 
+Requires: /usr/lib/libtunepimp.so.5
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
@@ -70,6 +84,8 @@
 %{__sed} -i 's/local//' Makefile
 # Under Fedora dockbook2x-man is renamed db2x_docbook2man
 %{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
+# enable the use of %{find_lang} macros
+%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -104,7 +120,7 @@
   --remove-mime-type audio/x-mpeg-3 \
   --remove-mime-type application/x-id3 \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +130,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc gpl.txt
 %{_bindir}/%{name}
@@ -125,6 +141,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Nov 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-6.beta1
+- Updated R & BR, now use the %{find_lang} macros
+
 * Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 



From fedora-extras-commits at redhat.com  Thu Oct 12 16:07:46 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Thu, 12 Oct 2006 09:07:46 -0700
Subject: rpms/listen/devel listen.spec,1.10,1.11
Message-ID: <200610121607.k9CG7mpP025486@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25465/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- listen.spec	9 Oct 2006 11:03:25 -0000	1.10
+++ listen.spec	12 Oct 2006 16:07:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        5.beta1%{?dist}
+Release:        6.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -28,15 +28,29 @@
 BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
-BuildRequires: python-ogg-devel
-BuildRequires: python-vorbis
 BuildRequires: python-sexy
 BuildRequires: python-mutagen >= 1.6
 BuildRequires: desktop-file-utils
+
+
+# added explicit Requires
+Requires: python-mutagen >= 1.6
+Requires: python 
+Requires: pygtk2 
+Requires: gstreamer-python 
+Requires: dbus-python
+Requires: python-sqlite2
+Requires: python-ctypes
+Requires: gnome-python2
+Requires: gnome-python2-extras
+Requires: gnome-python2-gtkmozembed
+Requires: gnome-python2-libegg
+Requires: python-sexy
 # MusicBrainz support
-BuildRequires: python-musicbrainz2 
-BuildRequires: libtunepimp 
+Requires: python-musicbrainz2 
+Requires: /usr/lib/libtunepimp.so.5
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
@@ -70,6 +84,8 @@
 %{__sed} -i 's/local//' Makefile
 # Under Fedora dockbook2x-man is renamed db2x_docbook2man
 %{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
+# enable the use of %{find_lang} macros
+%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -104,7 +120,7 @@
   --remove-mime-type audio/x-mpeg-3 \
   --remove-mime-type application/x-id3 \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +130,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc gpl.txt
 %{_bindir}/%{name}
@@ -125,6 +141,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Nov 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-6.beta1
+- Updated R & BR, now use the %{find_lang} macros
+
 * Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 



From fedora-extras-commits at redhat.com  Thu Oct 12 16:13:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 12 Oct 2006 09:13:56 -0700
Subject: comps comps-fe6.xml.in,1.185,1.186
Message-ID: <200610121613.k9CGDwTf025687@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25670

Modified Files:
	comps-fe6.xml.in 
Log Message:
lcov is back


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- comps-fe6.xml.in	11 Oct 2006 21:46:05 -0000	1.185
+++ comps-fe6.xml.in	12 Oct 2006 16:13:56 -0000	1.186
@@ -152,6 +152,7 @@
       <packagereq type="optional">ipython</packagereq>
       <packagereq type="optional">jam</packagereq>
       <packagereq type="optional">kuipc</packagereq>
+      <packagereq type="optional">lcov</packagereq>
       <packagereq type="optional">lightning</packagereq>
       <packagereq type="optional">lincvs</packagereq>
       <packagereq type="optional">lua</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 12 16:28:40 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Thu, 12 Oct 2006 09:28:40 -0700
Subject: rpms/bygfoot/devel .cvsignore, 1.2, 1.3 bygfoot.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610121628.k9CGSgZg025760@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/bygfoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25739

Modified Files:
	.cvsignore bygfoot.spec sources 
Log Message:
* Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
- Bump release to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 22:42:23 -0000	1.2
+++ .cvsignore	12 Oct 2006 16:28:40 -0000	1.3
@@ -1 +1 @@
-bygfoot-2.0.0.tar.bz2
+bygfoot-2.0.1.tar.bz2


Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/bygfoot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bygfoot.spec	4 Sep 2006 11:20:57 -0000	1.2
+++ bygfoot.spec	12 Oct 2006 16:28:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bygfoot
-Version:        2.0.0
-Release:        3%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Bygfoot Football Manager
 Group:          Amusements/Games
 License:        GPL
@@ -9,7 +9,7 @@
 Source3:        bygfoot.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
-BuildRequires:  pkgconfig gtk2-devel gettext
+BuildRequires:  gtk2-devel gettext
 
 %description
 Bygfoot is a small and simple graphical football
@@ -20,7 +20,7 @@
 of course try to be successful.
 
 %prep
-%setup -q -n %{name}-2.0
+%setup -q
 
 
 %build
@@ -49,8 +49,8 @@
 %{_datadir}/bygfoot
 %{_datadir}/applications/fedora-bygfoot.desktop
 %changelog
-* Mon Sep 04 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-3
-- FC6 rebuild
+* Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
+- Bump release to 2.0.1
 
 * Thu Aug 17 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-2
 - Small fix in %%files section


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 22:42:23 -0000	1.2
+++ sources	12 Oct 2006 16:28:40 -0000	1.3
@@ -1 +1 @@
-e5b7935c733cd39953256a0634e17784  bygfoot-2.0.0.tar.bz2
+c303ef5aff2c9d3f4e9d11dae1da685c  bygfoot-2.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 12 16:31:54 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Thu, 12 Oct 2006 09:31:54 -0700
Subject: rpms/bygfoot/devel bygfoot.spec,1.3,1.4
Message-ID: <200610121631.k9CGVulj025831@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/bygfoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25810

Modified Files:
	bygfoot.spec 
Log Message:
Accidentally I have removed FC-6 rebuild changelog entry



Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/bygfoot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bygfoot.spec	12 Oct 2006 16:28:40 -0000	1.3
+++ bygfoot.spec	12 Oct 2006 16:31:53 -0000	1.4
@@ -52,6 +52,9 @@
 * Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
 - Bump release to 2.0.1
 
+* Mon Sep 04 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-3
+- FC6 rebuild
+
 * Thu Aug 17 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-2
 - Small fix in %%files section
 



From fedora-extras-commits at redhat.com  Thu Oct 12 16:34:18 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Thu, 12 Oct 2006 09:34:18 -0700
Subject: rpms/bygfoot/FC-5 .cvsignore, 1.2, 1.3 bygfoot.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610121634.k9CGYK59025864@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/bygfoot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25843

Modified Files:
	.cvsignore bygfoot.spec sources 
Log Message:
* Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
- Bump release to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 22:42:23 -0000	1.2
+++ .cvsignore	12 Oct 2006 16:34:18 -0000	1.3
@@ -1 +1 @@
-bygfoot-2.0.0.tar.bz2
+bygfoot-2.0.1.tar.bz2


Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/FC-5/bygfoot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bygfoot.spec	17 Aug 2006 22:42:23 -0000	1.1
+++ bygfoot.spec	12 Oct 2006 16:34:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           bygfoot
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Bygfoot Football Manager
 Group:          Amusements/Games
 License:        GPL
@@ -9,7 +9,7 @@
 Source3:        bygfoot.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
-BuildRequires:  pkgconfig gtk2-devel gettext
+BuildRequires:  gtk2-devel gettext
 
 %description
 Bygfoot is a small and simple graphical football
@@ -20,7 +20,7 @@
 of course try to be successful.
 
 %prep
-%setup -q -n %{name}-2.0
+%setup -q
 
 
 %build
@@ -49,6 +49,9 @@
 %{_datadir}/bygfoot
 %{_datadir}/applications/fedora-bygfoot.desktop
 %changelog
+* Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
+- Bump release to 2.0.1
+
 * Thu Aug 17 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-2
 - Small fix in %%files section
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 22:42:23 -0000	1.2
+++ sources	12 Oct 2006 16:34:18 -0000	1.3
@@ -1 +1 @@
-e5b7935c733cd39953256a0634e17784  bygfoot-2.0.0.tar.bz2
+c303ef5aff2c9d3f4e9d11dae1da685c  bygfoot-2.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 12 16:39:22 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 12 Oct 2006 09:39:22 -0700
Subject: rpms/gtkmathview/devel gtkmathview.spec,1.7,1.8
Message-ID: <200610121639.k9CGdOo8025969@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/gtkmathview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25952

Modified Files:
	gtkmathview.spec 
Log Message:
Fix 206451




Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkmathview.spec	11 Sep 2006 08:59:38 -0000	1.7
+++ gtkmathview.spec	12 Oct 2006 16:39:22 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A MathML rendering library
 Name: gtkmathview
 Version: 0.7.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Libraries
 License: GPL
 Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Requires: gtk2-devel >= 2.2.1
 Requires: libxml2-devel >= 2.6.7
 Requires: popt >= 1.7.0 
+Requires: pkgconfig
 
 %description devel
 Libraries, headers, and support files needed for using gtkmathview.
@@ -74,6 +75,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> 0.7.6-5.fc6
+- Add pkgconfig to the -devel requires (bug 206451)
+
 * Mon Sep 16 2006 Marc Maurer <uwog at abisource.com> 0.7.6-4.fc6
 - Rebuild for FC 6
 



From fedora-extras-commits at redhat.com  Thu Oct 12 16:43:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 12 Oct 2006 09:43:00 -0700
Subject: rpms/libtelepathy/devel .cvsignore, 1.2, 1.3 libtelepathy.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610121643.k9CGh22h026069@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libtelepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26048

Modified Files:
	.cvsignore libtelepathy.spec sources 
Log Message:
* Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.38-1
- Update to 0.0.38.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2006 14:26:01 -0000	1.2
+++ .cvsignore	12 Oct 2006 16:43:00 -0000	1.3
@@ -1 +1 @@
-libtelepathy-0.0.37.tar.gz
+libtelepathy-0.0.38.tar.gz


Index: libtelepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/libtelepathy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtelepathy.spec	16 Sep 2006 14:26:01 -0000	1.1
+++ libtelepathy.spec	12 Oct 2006 16:43:00 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           libtelepathy
-Version:        0.0.37
+Version:        0.0.38
 Release:        1%{?dist}
 Summary:        A GLib library to ease writing telepathy clients
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.38-1
+- Update to 0.0.38.
+
 * Tue Sep 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.37-1
 - Update to 0.0.37.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2006 14:26:01 -0000	1.2
+++ sources	12 Oct 2006 16:43:00 -0000	1.3
@@ -1 +1 @@
-98cd5963b02396a7698b064cf5097dcd  libtelepathy-0.0.37.tar.gz
+145358f6275acf1ce3d7633f7865b7b9  libtelepathy-0.0.38.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 16:58:10 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 12 Oct 2006 09:58:10 -0700
Subject: rpms/util-vserver/FC-5 util-vserver.spec,1.18,1.19
Message-ID: <200610121658.k9CGwCwb026197@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26180

Modified Files:
	util-vserver.spec 
Log Message:
added ghostscript BR


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-5/util-vserver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- util-vserver.spec	11 Oct 2006 23:34:42 -0000	1.18
+++ util-vserver.spec	12 Oct 2006 16:58:09 -0000	1.19
@@ -36,7 +36,7 @@
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
-BuildRequires:	doxygen tetex-latex graphviz
+BuildRequires:	doxygen tetex-latex graphviz ghostscript
 ## HACK; 'make check' fails there due to a kernel bug
 ## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389
 ExcludeArch:	ppc
@@ -352,7 +352,7 @@
 %changelog
 * Thu Oct 12 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.211-1
 - updated to 0.30.211
-- added graphviz BR
+- added graphviz + ghostscript BR
 
 * Mon Feb 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-2
 - rebuilt for FC5



From fedora-extras-commits at redhat.com  Thu Oct 12 17:09:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 10:09:52 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.15, 
	1.16
Message-ID: <200610121709.k9CH9s1U029229@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sylpheed-claws-plugins.spec	8 Oct 2006 10:26:08 -0000	1.15
+++ sylpheed-claws-plugins.spec	12 Oct 2006 17:09:52 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-3
+- rebuild
+
 * Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-2
 - rebuild



From fedora-extras-commits at redhat.com  Thu Oct 12 17:09:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 10:09:53 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.20, 
	1.21
Message-ID: <200610121709.k9CH9tnH029231@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sylpheed-claws-plugins.spec	8 Oct 2006 10:26:09 -0000	1.20
+++ sylpheed-claws-plugins.spec	12 Oct 2006 17:09:53 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-3
+- rebuild
+
 * Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-2
 - rebuild



From fedora-extras-commits at redhat.com  Thu Oct 12 17:09:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 10:09:54 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.21,
	1.22
Message-ID: <200610121709.k9CH9udw029235@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sylpheed-claws-plugins.spec	8 Oct 2006 10:26:10 -0000	1.21
+++ sylpheed-claws-plugins.spec	12 Oct 2006 17:09:54 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-3
+- rebuild
+
 * Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-2
 - rebuild



From fedora-extras-commits at redhat.com  Thu Oct 12 17:29:33 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:29:33 -0700
Subject: rpms/toped - New directory
Message-ID: <200610121729.k9CHTZbm029630@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29604/toped

Log Message:
Directory /cvs/extras/rpms/toped added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 12 17:29:33 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:29:33 -0700
Subject: rpms/toped/devel - New directory
Message-ID: <200610121729.k9CHTZMq029633@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29604/toped/devel

Log Message:
Directory /cvs/extras/rpms/toped/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 12 17:30:16 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:30:16 -0700
Subject: rpms/toped Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610121730.k9CHUIFS029700@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29670

Added Files:
	Makefile import.log 
Log Message:
Setup of module toped


--- NEW FILE Makefile ---
# Top level Makefile for module toped
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct 12 17:30:17 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:30:17 -0700
Subject: rpms/toped/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610121730.k9CHUJVW029703@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29670/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module toped


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct 12 17:32:46 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:32:46 -0700
Subject: rpms/toped import.log,1.1,1.2
Message-ID: <200610121732.k9CHWmF6029819@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29783

Modified Files:
	import.log 
Log Message:
auto-import toped-0.8.2-1 on branch devel from toped-0.8.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/toped/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Oct 2006 17:30:16 -0000	1.1
+++ import.log	12 Oct 2006 17:32:45 -0000	1.2
@@ -0,0 +1 @@
+toped-0_8_2-1:HEAD:toped-0.8.2-1.src.rpm:1160674545



From fedora-extras-commits at redhat.com  Thu Oct 12 17:32:46 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:32:46 -0700
Subject: rpms/toped/devel toped.desktop, NONE, 1.1 toped.spec, NONE,
	1.1 toped_32x32.png, NONE, 1.1 toped_64x64.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610121732.k9CHWmfG029824@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29783/devel

Modified Files:
	.cvsignore sources 
Added Files:
	toped.desktop toped.spec toped_32x32.png toped_64x64.png 
Log Message:
auto-import toped-0.8.2-1 on branch devel from toped-0.8.2-1.src.rpm


--- NEW FILE toped.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Toped
Exec=toped
Icon=toped
Type=Application
Terminal=false
GenericName=Toped, IC Layout Editor
Categories=Education;Science;Engineering;
X-Desktop-File-Install-Version=0.10

--- NEW FILE toped.spec ---
Name:           toped
Version:        0.8.2
Release:        1%{?dist}
Summary:        IC Layout Editor

License:        GPL
Group:          Applications/Engineering
URL:            http://www.toped.org.uk

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2

Source1:        %{name}.desktop
Source2:        toped_32x32.png
Source3:        toped_64x64.png

BuildRequires:  freeglut-devel wxGTK-devel desktop-file-utils


%description
Toped is an open source cross-platform IC layout editor,
based on openGL and wxWidgets.

#%package devel
#Summary:        Development files for toped
#Group:          Development/Libraries
#Requires:       %{name} = %{version}-%{release}

#%description devel
#Development files for toped, IC Layout Editor

%prep
%setup -q

%build
%configure       \
   --with-gtk    \
   --with-opengl \
   --with-regex  \
   --enable-threads
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}

%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install

%{__rm} -f %{buildroot}%{_libdir}/libtpd*.{a,la}

desktop-file-install --vendor fedora             \
  --add-category "Engineering"                   \
  --add-category "X-Fedora"                      \
  --dir %{buildroot}%{_datadir}/applications/    \
  %{SOURCE1}

%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/toped.png
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
%{__cp} -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/toped.png


#No translations
#%find_lang %{name}

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

%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_libdir}/libtpd*.so.0*
%{_datadir}/tll/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*x*/apps/toped.png

#%files devel
#%defattr(-,root,root,-)
#%doc NEWS TODO
%{_libdir}/libtpd_common.so
%{_libdir}/libtpd_DB.so
%{_libdir}/libtpd_parser.so

%Changelog
* Mon Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.2-1
- New upstream release 0.8.2
* Wed Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.1-2
- Icons received by upstream (by mail)

* Mon Sep 18 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.1-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Oct 2006 17:30:17 -0000	1.1
+++ .cvsignore	12 Oct 2006 17:32:46 -0000	1.2
@@ -0,0 +1 @@
+toped-0.8.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Oct 2006 17:30:17 -0000	1.1
+++ sources	12 Oct 2006 17:32:46 -0000	1.2
@@ -0,0 +1 @@
+31f6711a9b76f785a91a70167b0c6fab  toped-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 12 17:37:24 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 12 Oct 2006 10:37:24 -0700
Subject: fedora-release fedora-release.spec,1.32,1.33
Message-ID: <200610121737.k9CHbODt029921@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29903

Modified Files:
	fedora-release.spec 
Log Message:
fix up the release a bit


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fedora-release.spec	5 Oct 2006 17:03:31 -0000	1.32
+++ fedora-release.spec	12 Oct 2006 17:37:21 -0000	1.33
@@ -1,17 +1,16 @@
 %define release_name Zod
-%define release_version 6
 
 Summary:	Fedora Core release files
 Name:		fedora-release
 Version:	6
-Release:	2
+Release:	3
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
 Source:		fedora-release-%{version}.tar.gz
 Obsoletes:	redhat-release
 Provides:	redhat-release
-Requires:	fedora-release-notes >= %{release_version}
+Requires:	fedora-release-notes >= %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -26,7 +25,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc
-echo "Fedora Core release %{release_version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
+echo "Fedora Core release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
 cp $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
 echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue
 cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
@@ -64,6 +63,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Oct 12 2006 Jesse Keating <jkeating at redhat.com> - 6-3
+- version has to stay the same, safe to use.
+
 * Thu Oct  5 2006 Jesse Keating <jkeating at redhat.com> - 6-2
 - replace old mirror files with new mirrorlist cgi system
 



From fedora-extras-commits at redhat.com  Thu Oct 12 17:53:31 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:53:31 -0700
Subject: rpms/toped import.log,1.2,1.3
Message-ID: <200610121753.k9CHrX6m030100@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30067

Modified Files:
	import.log 
Log Message:
auto-import toped-0.8.2-2 on branch devel from toped-0.8.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/toped/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Oct 2006 17:32:45 -0000	1.2
+++ import.log	12 Oct 2006 17:53:30 -0000	1.3
@@ -1 +1,2 @@
 toped-0_8_2-1:HEAD:toped-0.8.2-1.src.rpm:1160674545
+toped-0_8_2-2:HEAD:toped-0.8.2-2.src.rpm:1160675810



From fedora-extras-commits at redhat.com  Thu Oct 12 17:53:31 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:53:31 -0700
Subject: rpms/toped/devel toped.spec,1.1,1.2
Message-ID: <200610121753.k9CHrXlm030104@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30067/devel

Modified Files:
	toped.spec 
Log Message:
auto-import toped-0.8.2-2 on branch devel from toped-0.8.2-2.src.rpm


Index: toped.spec
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/toped.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- toped.spec	12 Oct 2006 17:32:46 -0000	1.1
+++ toped.spec	12 Oct 2006 17:53:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           toped
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        IC Layout Editor
 
 License:        GPL
@@ -22,14 +22,6 @@
 Toped is an open source cross-platform IC layout editor,
 based on openGL and wxWidgets.
 
-#%package devel
-#Summary:        Development files for toped
-#Group:          Development/Libraries
-#Requires:       %{name} = %{version}-%{release}
-
-#%description devel
-#Development files for toped, IC Layout Editor
-
 %prep
 %setup -q
 
@@ -59,10 +51,13 @@
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
 %{__cp} -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/toped.png
 
-
 #No translations
 #%find_lang %{name}
 
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -71,32 +66,27 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-
 %postun
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README NEWS TODO
 %{_bindir}/%{name}
 %{_libdir}/libtpd*.so.0*
 %{_datadir}/tll/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
-#%files devel
-#%defattr(-,root,root,-)
-#%doc NEWS TODO
-%{_libdir}/libtpd_common.so
-%{_libdir}/libtpd_DB.so
-%{_libdir}/libtpd_parser.so
-
 %Changelog
+* Mon Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.2-2
+- Removed the devel package
+
 * Mon Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.2-1
 - New upstream release 0.8.2
+
 * Wed Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.1-2
 - Icons received by upstream (by mail)
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:23:18 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 12 Oct 2006 11:23:18 -0700
Subject: rpms/enchant/devel .cvsignore, 1.8, 1.9 enchant.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200610121823.k9CINK4X000804@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv783

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
Update to 1.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 21:23:52 -0000	1.8
+++ .cvsignore	12 Oct 2006 18:23:18 -0000	1.9
@@ -1 +1 @@
-enchant-1.2.5.tar.gz
+enchant-1.3.0.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- enchant.spec	11 Sep 2006 12:35:21 -0000	1.12
+++ enchant.spec	12 Oct 2006 18:23:18 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.5
-Release: 3%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -63,6 +63,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> 1:1.3.0-1.fc6
+- Update to 1.3.0
+
 * Mon Sep 11 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-3.fc6
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 21:23:52 -0000	1.8
+++ sources	12 Oct 2006 18:23:18 -0000	1.9
@@ -1 +1 @@
-e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz
+f7edafae875616b83e7a17a7e5c2d585  enchant-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 18:25:43 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 12 Oct 2006 11:25:43 -0700
Subject: rpms/liferea/devel liferea-1.0.23-fedorafeed.patch, NONE,
	1.1 liferea.spec, 1.51, 1.52
Message-ID: <200610121825.k9CIPjEC000893@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv873

Modified Files:
	liferea.spec 
Added Files:
	liferea-1.0.23-fedorafeed.patch 
Log Message:
* Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-3
- Add patch to add Fedora default feeds. (#209301)


liferea-1.0.23-fedorafeed.patch:

--- NEW FILE liferea-1.0.23-fedorafeed.patch ---
diff -ur liferea-1.0.23.OLD/opml/feedlist.opml liferea-1.0.23/opml/feedlist.opml
--- liferea-1.0.23.OLD/opml/feedlist.opml	2006-02-04 20:10:05.000000000 -0500
+++ liferea-1.0.23/opml/feedlist.opml	2006-10-06 13:18:08.000000000 -0400
@@ -18,7 +18,13 @@
         <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
         <outline text="Slashdot" htmlUrl="http://slashdot.org"  xmlUrl="http://slashdot.org/slashdot.rss" />
         <outline text="TuxMobil" htmlUrl="http://tuxmobil.org" xmlUrl="http://tuxmobil.org/tuxmobil_rss.rdf" />      
-      </outline>	
+      </outline>
+      <outline text="Fedora">
+	<outline text="FedoraNews.org" htmlUrl="http://fedoranews.org/" xmlUrl="http://fedoranews.org/cms/taxonomy/term/15/0/feed" />
+	<outline text="Red Hat Magazine" htmlUrl="http://www.redhat.com/magazine/" xmlUrl="http://www.redhat.com/magazine/rss20.xml" />
+	<outline text="Fedora People" htmlUrl="http://fedoraproject.org/people/" xmlUrl="http://fedoraproject.org/people/rss20.xml" />
+	<outline text="Fedora Info" htmlUrl="http://fedoraproject.org/infofeed/" xmlUrl="http://fedoraproject.org/infofeed/rss20.xml" />
+      </outline>
     </outline>
     <outline text="Unread" title="Unread" description="Unread" type="vfolder" htmlUrl="" xmlUrl="vfolder">
       <outline type="rule" text="Read status" rule="unread" value="" additive="true"/>


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- liferea.spec	4 Oct 2006 22:59:45 -0000	1.51
+++ liferea.spec	12 Oct 2006 18:25:43 -0000	1.52
@@ -2,13 +2,14 @@
 
 Name:           liferea
 Version:        1.0.23
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-%{version}-fedorafeed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml2-devel
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .fedorafeed
 
 
 %build
@@ -108,6 +110,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-3
+- Add patch to add Fedora default feeds. (#209301)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.23-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:35:31 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 12 Oct 2006 11:35:31 -0700
Subject: rpms/enchant/FC-5 .cvsignore, 1.8, 1.9 enchant.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200610121835.k9CIZXq0001022@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv996

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
Update to 1.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 21:39:17 -0000	1.8
+++ .cvsignore	12 Oct 2006 18:35:31 -0000	1.9
@@ -1 +1 @@
-enchant-1.2.5.tar.gz
+enchant-1.3.0.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/enchant.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- enchant.spec	10 Apr 2006 21:43:15 -0000	1.12
+++ enchant.spec	12 Oct 2006 18:35:31 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.5
-Release: 2%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -63,6 +63,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> 1:1.3.0-1.fc5
+- Update to 1.3.0
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-2.fc5
 - Really add hspell support :X
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 21:39:17 -0000	1.8
+++ sources	12 Oct 2006 18:35:31 -0000	1.9
@@ -1 +1 @@
-e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz
+f7edafae875616b83e7a17a7e5c2d585  enchant-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 18:40:01 2006
From: fedora-extras-commits at redhat.com (Frank Büttner (frankb))
Date: Thu, 12 Oct 2006 11:40:01 -0700
Subject: rpms/qt4-qsa/FC-5 qsa-1.2.1-Qt4.2-preview.patch, NONE,
	1.1 qt4-qsa.spec, 1.3, 1.4
Message-ID: <200610121840.k9CIe34n001128@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1106

Modified Files:
	qt4-qsa.spec 
Added Files:
	qsa-1.2.1-Qt4.2-preview.patch 
Log Message:
- fix build for EMT64
- Try to bypass the broken paths in the Qt4 package.
  Not nice, but no other way until the Qt4 package will be corrected.
- compile QSA with Qt 4.2


qsa-1.2.1-Qt4.2-preview.patch:

--- NEW FILE qsa-1.2.1-Qt4.2-preview.patch ---
--- qsa-x11-opensource-1.2.1/configure2/configutils.cpp.preview	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configutils.cpp	2006-08-01 06:34:07.000000000 -0500
@@ -372,6 +372,8 @@
         qtLicense = Universal;
     } else if (qtEdition == QLatin1String("OpenSource")) {
         qtLicense = GPL;
+    } else if (qtEdition == QLatin1String("Preview")) {
+        qtLicense = GPL;
     } else {
         message(QLatin1String("\nQSA is not compatible with your Qt edition\n"));
         return false;


Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/FC-5/qt4-qsa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt4-qsa.spec	30 Jul 2006 00:56:35 -0000	1.3
+++ qt4-qsa.spec	12 Oct 2006 18:40:01 -0000	1.4
@@ -1,19 +1,28 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	14%{?dist}
-BuildRequires:	qt4-devel < 4.2 qt4-devel => 4.1.3-8
-Requires:	qt4 < 4.2
+Release:	16%{?dist}
+BuildRequires:	qt4-devel => 4.2
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
 License: 	GPL
 Group: 		Development/Libraries
 Source: 	ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz
+Patch0:		qsa-1.2.1-Qt4.2-preview.patch
 Buildroot: 	%{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) 
-%define qtinc %(qmake-qt4 -query QT_INSTALL_HEADERS)
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
+
+# fix the the broken include path
+%define qtinc %{qtdir}/include
+%ifarch x86_64
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64
+%else
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
+%endif
+
+#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS)
+#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
 
 %package devel
 Summary:	Development and doc files for qsa 
@@ -29,6 +38,7 @@
 
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
+%patch0 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -38,6 +48,7 @@
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
 ./configure -release -prefix %{qtdir}
+#./configure -release 
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -87,8 +98,18 @@
 %doc doc/html
 
 %changelog 
+* Mon Aug 07 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-16%{?dist}
+- fix build for EMT64
+
+* Mon Aug 07 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-15%{?dist}
+- Try to bypass the broken paths in the Qt4 package.
+  Not nice, but no other way until the Qt4 package will be corrected.
+
+* Wed Aug 02 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-14%{?dist}
+- try to compile QSA with Qt 4.2
+
 * Mon Jun 12 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-13%{?dist}
-- try again to fix the x86_64 build 
+- try agin to fix the x86_64 build 
 
 * Mon Jun 12 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-12%{?dist}
 - fix build for x86_64



From fedora-extras-commits at redhat.com  Thu Oct 12 18:43:15 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:43:15 -0700
Subject: rpms/libgeda import.log,1.6,1.7
Message-ID: <200610121843.k9CIhH3q001232@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1201

Modified Files:
	import.log 
Log Message:
auto-import libgeda-20060906-3 on branch FC-5 from libgeda-20060906-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgeda/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	10 Sep 2006 21:22:00 -0000	1.6
+++ import.log	12 Oct 2006 18:43:14 -0000	1.7
@@ -3,3 +3,4 @@
 libgeda-20060824-1:HEAD:libgeda-20060824-1.src.rpm:1157393328
 libgeda-20060906-1:FC-5:libgeda-20060906-1.src.rpm:1157923450
 libgeda-20060906-2:HEAD:libgeda-20060906-2.src.rpm:1157923568
+libgeda-20060906-3:FC-5:libgeda-20060906-3.src.rpm:1160678794



From fedora-extras-commits at redhat.com  Thu Oct 12 18:43:15 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:43:15 -0700
Subject: rpms/libgeda/FC-5 libgeda.spec,1.3,1.4
Message-ID: <200610121843.k9CIhHVf001236@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1201/FC-5

Modified Files:
	libgeda.spec 
Log Message:
auto-import libgeda-20060906-3 on branch FC-5 from libgeda-20060906-3.src.rpm


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/libgeda.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgeda.spec	10 Sep 2006 21:20:03 -0000	1.3
+++ libgeda.spec	12 Oct 2006 18:43:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:            libgeda
 Version:         20060906
-Release:         1%{?dist}
+Release:         3%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
@@ -59,7 +59,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 %{__rm} -f %{buildroot}%{_infodir}/dir
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %{__rm} -rf docs/Makefile*
@@ -75,7 +75,7 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_libdir}/libgeda.so.*
-
+%{_datadir}/gEDA/prolog.ps
 
 %files devel
 %defattr(-,root,root,-)
@@ -88,11 +88,16 @@
 %files doc
 %defattr(-, root, root, -)
 %doc docs/*
-%{_datadir}/gEDA/prolog.ps
-
 
 
 %Changelog
+* Wed Oct 11 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
+- Fixes Bug 210121 Printing does not produce correct post-script
+- Changed ownership of prolog.ps from libgeda-doc to libgeda
+
+* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
+- Rebuild for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
 - Upstream release 20060906
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:44:00 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:44:00 -0700
Subject: rpms/libgeda import.log,1.7,1.8
Message-ID: <200610121844.k9CIi2bZ001322@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1291

Modified Files:
	import.log 
Log Message:
auto-import libgeda-20060906-3 on branch devel from libgeda-20060906-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgeda/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	12 Oct 2006 18:43:14 -0000	1.7
+++ import.log	12 Oct 2006 18:44:00 -0000	1.8
@@ -4,3 +4,4 @@
 libgeda-20060906-1:FC-5:libgeda-20060906-1.src.rpm:1157923450
 libgeda-20060906-2:HEAD:libgeda-20060906-2.src.rpm:1157923568
 libgeda-20060906-3:FC-5:libgeda-20060906-3.src.rpm:1160678794
+libgeda-20060906-3:HEAD:libgeda-20060906-3.src.rpm:1160678840



From fedora-extras-commits at redhat.com  Thu Oct 12 18:44:01 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:44:01 -0700
Subject: rpms/libgeda/devel libgeda.spec,1.3,1.4
Message-ID: <200610121844.k9CIi3cA001326@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1291/devel

Modified Files:
	libgeda.spec 
Log Message:
auto-import libgeda-20060906-3 on branch devel from libgeda-20060906-3.src.rpm


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgeda.spec	10 Sep 2006 21:22:00 -0000	1.3
+++ libgeda.spec	12 Oct 2006 18:44:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:            libgeda
 Version:         20060906
-Release:         2%{?dist}
+Release:         3%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
@@ -59,7 +59,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 %{__rm} -f %{buildroot}%{_infodir}/dir
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %{__rm} -rf docs/Makefile*
@@ -75,7 +75,7 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_libdir}/libgeda.so.*
-
+%{_datadir}/gEDA/prolog.ps
 
 %files devel
 %defattr(-,root,root,-)
@@ -88,11 +88,13 @@
 %files doc
 %defattr(-, root, root, -)
 %doc docs/*
-%{_datadir}/gEDA/prolog.ps
-
 
 
 %Changelog
+* Wed Oct 11 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
+- Fixes Bug 210121 Printing does not produce correct post-script
+- Changed ownership of prolog.ps from libgeda-doc to libgeda
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
 - Rebuild for FC-6 devel
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:45:07 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:45:07 -0700
Subject: rpms/ngspice import.log,1.4,1.5
Message-ID: <200610121845.k9CIj9Fs001426@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1394

Modified Files:
	import.log 
Log Message:
auto-import ngspice-17-6 on branch FC-5 from ngspice-17-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ngspice/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	4 Sep 2006 08:56:44 -0000	1.4
+++ import.log	12 Oct 2006 18:45:07 -0000	1.5
@@ -1,3 +1,4 @@
 ngspice-17-4:HEAD:ngspice-17-4.src.rpm:1156958904
 ngspice-17-5:FC-5:ngspice-17-5.src.rpm:1157360280
 ngspice-17-5:HEAD:ngspice-17-5.src.rpm:1157360430
+ngspice-17-6:FC-5:ngspice-17-6.src.rpm:1160678907



From fedora-extras-commits at redhat.com  Thu Oct 12 18:45:08 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:45:08 -0700
Subject: rpms/ngspice/FC-5 ngspice-rework-17-spinit.patch, NONE,
	1.1 ngspice.spec, 1.2, 1.3
Message-ID: <200610121845.k9CIjAa8001432@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1394/FC-5

Modified Files:
	ngspice.spec 
Added Files:
	ngspice-rework-17-spinit.patch 
Log Message:
auto-import ngspice-17-6 on branch FC-5 from ngspice-17-6.src.rpm

ngspice-rework-17-spinit.patch:

--- NEW FILE ngspice-rework-17-spinit.patch ---
--- src/spinit.in	2005-05-10 23:52:58.000000000 +0200
+++ spinit.in	2006-09-19 21:35:14.000000000 +0200
@@ -10,13 +10,13 @@
 
 * For SPICE2 POLYs, edit the below line to point to the location 
 * of your codemode.
- at XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm
 
 * The other codemodels
- at XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm
 
 end
 unset __flag


Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/FC-5/ngspice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ngspice.spec	4 Sep 2006 08:54:15 -0000	1.2
+++ ngspice.spec	12 Oct 2006 18:45:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           5%{?dist}
+Release:           6%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,6 +10,8 @@
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:            ngspice-rework-17-spinit.patch
+
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -49,6 +51,17 @@
 %setup -q -n ng-spice-rework-%{version}
 
 %build
+%ifarch x86_64 sparc64 ppc64 amd64
+%{__cp} -p src/spinit.in src/spinit.in.ngspice
+cat src/spinit.in.ngspice | \
+sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+> src/spinit.in
+%endif
+
 %configure              \
     --enable-cider      \
     --enable-dot-global \
@@ -57,7 +70,10 @@
     --enable-xgraph     \
     --enable-xspice     \
     --with-x=yes        \
-    --with-readline=yes
+    --with-readline=yes \
+%ifarch x86_64 sparc64 ppc64 amd64
+  --enable-libsuffix=64 \
+%endif
 
 # make in xgraph with another flag first so
 # that we can correctly use Fedora compiler flags.
@@ -73,7 +89,7 @@
 chmod 644 src/frontend/*.{c,h}
 chmod 644 src/include/*.h
 
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 %{__rm} -f doc/Makefile*
 %{__rm} -f doc/ngspice.info*
 
@@ -81,7 +97,7 @@
 rm -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %post doc
 /sbin/install-info --quiet --info-dir=%{_infodir}/dir %{_infodir}/%{name}.info.gz >/dev/null 2>&1
@@ -104,15 +120,9 @@
 %{_bindir}/ngsconvert
 %{_bindir}/%{name}
 %{_bindir}/xgraph
-%dir %{_datadir}/ng-spice-rework
-%{_datadir}/ng-spice-rework/helpdir
-%{_datadir}/ng-spice-rework/scripts
-%dir %{_libdir}/spice/
-%{_libdir}/spice/analog.cm
-%{_libdir}/spice/digital.cm
-%{_libdir}/spice/spice2poly.cm
-%{_libdir}/spice/xtradev.cm
-%{_libdir}/spice/xtraevt.cm
+%{_datadir}/ng-spice-rework
+%{_libdir}/spice/
+
 
 
 %files doc
@@ -126,6 +136,9 @@
 
 
 %Changelog
+* Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
+- Testing on 64 bit arch 
+
 * Mon Sep 04 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-5
 - Added libXt-devel to include X headers
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:45:59 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:45:59 -0700
Subject: rpms/ngspice import.log,1.5,1.6
Message-ID: <200610121846.k9CIk1P6001524@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492

Modified Files:
	import.log 
Log Message:
auto-import ngspice-17-6 on branch devel from ngspice-17-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ngspice/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	12 Oct 2006 18:45:07 -0000	1.5
+++ import.log	12 Oct 2006 18:45:59 -0000	1.6
@@ -2,3 +2,4 @@
 ngspice-17-5:FC-5:ngspice-17-5.src.rpm:1157360280
 ngspice-17-5:HEAD:ngspice-17-5.src.rpm:1157360430
 ngspice-17-6:FC-5:ngspice-17-6.src.rpm:1160678907
+ngspice-17-6:HEAD:ngspice-17-6.src.rpm:1160678959



From fedora-extras-commits at redhat.com  Thu Oct 12 18:46:00 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:46:00 -0700
Subject: rpms/ngspice/devel ngspice-rework-17-spinit.patch, NONE,
	1.1 ngspice.spec, 1.2, 1.3
Message-ID: <200610121846.k9CIk2lW001530@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492/devel

Modified Files:
	ngspice.spec 
Added Files:
	ngspice-rework-17-spinit.patch 
Log Message:
auto-import ngspice-17-6 on branch devel from ngspice-17-6.src.rpm

ngspice-rework-17-spinit.patch:

--- NEW FILE ngspice-rework-17-spinit.patch ---
--- src/spinit.in	2005-05-10 23:52:58.000000000 +0200
+++ spinit.in	2006-09-19 21:35:14.000000000 +0200
@@ -10,13 +10,13 @@
 
 * For SPICE2 POLYs, edit the below line to point to the location 
 * of your codemode.
- at XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm
 
 * The other codemodels
- at XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm
 
 end
 unset __flag


Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ngspice.spec	4 Sep 2006 08:56:45 -0000	1.2
+++ ngspice.spec	12 Oct 2006 18:46:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           5%{?dist}
+Release:           6%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,6 +10,8 @@
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:            ngspice-rework-17-spinit.patch
+
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -49,6 +51,17 @@
 %setup -q -n ng-spice-rework-%{version}
 
 %build
+%ifarch x86_64 sparc64 ppc64 amd64
+%{__cp} -p src/spinit.in src/spinit.in.ngspice
+cat src/spinit.in.ngspice | \
+sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+> src/spinit.in
+%endif
+
 %configure              \
     --enable-cider      \
     --enable-dot-global \
@@ -57,7 +70,10 @@
     --enable-xgraph     \
     --enable-xspice     \
     --with-x=yes        \
-    --with-readline=yes
+    --with-readline=yes \
+%ifarch x86_64 sparc64 ppc64 amd64
+  --enable-libsuffix=64 \
+%endif
 
 # make in xgraph with another flag first so
 # that we can correctly use Fedora compiler flags.
@@ -73,7 +89,7 @@
 chmod 644 src/frontend/*.{c,h}
 chmod 644 src/include/*.h
 
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 %{__rm} -f doc/Makefile*
 %{__rm} -f doc/ngspice.info*
 
@@ -81,7 +97,7 @@
 rm -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %post doc
 /sbin/install-info --quiet --info-dir=%{_infodir}/dir %{_infodir}/%{name}.info.gz >/dev/null 2>&1
@@ -104,15 +120,9 @@
 %{_bindir}/ngsconvert
 %{_bindir}/%{name}
 %{_bindir}/xgraph
-%dir %{_datadir}/ng-spice-rework
-%{_datadir}/ng-spice-rework/helpdir
-%{_datadir}/ng-spice-rework/scripts
-%dir %{_libdir}/spice/
-%{_libdir}/spice/analog.cm
-%{_libdir}/spice/digital.cm
-%{_libdir}/spice/spice2poly.cm
-%{_libdir}/spice/xtradev.cm
-%{_libdir}/spice/xtraevt.cm
+%{_datadir}/ng-spice-rework
+%{_libdir}/spice/
+
 
 
 %files doc
@@ -126,6 +136,9 @@
 
 
 %Changelog
+* Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
+- Testing on 64 bit arch 
+
 * Mon Sep 04 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-5
 - Added libXt-devel to include X headers
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:47:09 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 12 Oct 2006 11:47:09 -0700
Subject: rpms/php-pear-Mail/devel .cvsignore, 1.3, 1.4 php-pear-Mail.spec,
	1.6, 1.7 sources, 1.3, 1.4 xml2changelog, 1.1, 1.2
Message-ID: <200610121847.k9CIlBUD001665@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1600

Modified Files:
	.cvsignore php-pear-Mail.spec sources xml2changelog 
Log Message:
	update to 1.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2006 10:24:23 -0000	1.3
+++ .cvsignore	12 Oct 2006 18:47:09 -0000	1.4
@@ -1 +1 @@
-Mail-1.1.13.tgz
+Mail-1.1.14.tgz


Index: php-pear-Mail.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/php-pear-Mail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-Mail.spec	16 Sep 2006 10:24:23 -0000	1.6
+++ php-pear-Mail.spec	12 Oct 2006 18:47:09 -0000	1.7
@@ -2,7 +2,7 @@
 %define pear_name Mail
 
 Name:           php-pear-Mail
-Version:        1.1.13
+Version:        1.1.14
 Release:        1%{?dist}
 Summary:        Class that provides multiple interfaces for sending emails
 Summary(fr):    Une Classe fournissant des interfaces pour envoyer des emails
@@ -50,8 +50,8 @@
 # Empty build section, most likely nothing required.
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Clean up unnecessary files
@@ -83,6 +83,9 @@
 %{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Thu Oct 12 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.14-1
+- update to 1.1.14
+
 * Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.13-1
 - regenerate SPEC with pear make-rpm-spec
 - remove PEAR from sumnary


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2006 10:24:23 -0000	1.3
+++ sources	12 Oct 2006 18:47:09 -0000	1.4
@@ -1 +1 @@
-087f63a04d95670fadc9e39948b09f8c  Mail-1.1.13.tgz
+e50da58b6b787b3903ce4d07dc791bb2  Mail-1.1.14.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	16 Sep 2006 10:24:23 -0000	1.1
+++ xml2changelog	12 Oct 2006 18:47:09 -0000	1.2
@@ -1,13 +1,28 @@
 <?php
 $prog=array_shift($_SERVER['argv']);
-if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml\n");
+if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
 $file=array_shift($_SERVER['argv']);
 
 ($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
-printf("* Version %s (%s) - %s\n\n%s\n\n",
-	$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
-foreach($xml->changelog->release as $rel)
+if ($xml['version'] >= "2"){ // Package.xml V 2.0
+	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);
+
+	foreach($xml->changelog->release as $rel)
+		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",
-		$rel->version, $rel->state, $rel->date, $rel->notes);
+		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+
+	foreach($xml->changelog->release as $rel)
+		printf("* Version %s (%s) - %s\n\n%s\n\n",
+			$rel->version, $rel->state, $rel->date, $rel->notes);
+}
 ?>



From fedora-extras-commits at redhat.com  Thu Oct 12 18:47:07 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:47:07 -0700
Subject: rpms/geda-gschem import.log,1.4,1.5
Message-ID: <200610121847.k9CIl9jA001649@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1604

Modified Files:
	import.log 
Log Message:
auto-import geda-gschem-20060906-3 on branch FC-5 from geda-gschem-20060906-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	10 Sep 2006 21:47:13 -0000	1.4
+++ import.log	12 Oct 2006 18:47:07 -0000	1.5
@@ -1,3 +1,4 @@
 geda-gschem-20060824-1:HEAD:geda-gschem-20060824-1.src.rpm:1157440721
 geda-gschem-20060906-1:FC-5:geda-gschem-20060906-1.src.rpm:1157924854
 geda-gschem-20060906-2:HEAD:geda-gschem-20060906-2.src.rpm:1157925079
+geda-gschem-20060906-3:FC-5:geda-gschem-20060906-3.src.rpm:1160679025



From fedora-extras-commits at redhat.com  Thu Oct 12 18:47:08 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:47:08 -0700
Subject: rpms/geda-gschem/FC-5 geda-gschem-ru.po.diff, NONE,
	1.1 geda-gschem.spec, 1.2, 1.3
Message-ID: <200610121847.k9CIlAmS001658@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1604/FC-5

Modified Files:
	geda-gschem.spec 
Added Files:
	geda-gschem-ru.po.diff 
Log Message:
auto-import geda-gschem-20060906-3 on branch FC-5 from geda-gschem-20060906-3.src.rpm

geda-gschem-ru.po.diff:

--- NEW FILE geda-gschem-ru.po.diff ---
--- po/ru.po	2006-09-07 05:05:17.000000000 +0200
+++ ru.po	2006-09-15 09:42:47.000000000 +0200
@@ -1,20 +1,21 @@
 # translation of ru.po to Russian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR Alexandre Pereira Nunes
-# Andy Shevchenko <andy at smile.org.ua>, 2003
 #
+# Andy Shevchenko <andy at smile.org.ua>, 2003, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-09-06 23:05-0400\n"
-"PO-Revision-Date: 2003-01-21 17:49+0200\n"
+"PO-Revision-Date: 2006-09-13 16:59+0300\n"
 "Last-Translator: Andy Shevchenko <andy at smile.org.ua>\n"
 "Language-Team: Russian <ru 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.0\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/rcstrings.c:2 src/x_print.c:342
 msgid "File"
@@ -145,14 +146,12 @@
 msgstr "?????????????? ??????????????..."
 
 #: src/rcstrings.c:35
-#, fuzzy
 msgid "Embed Component/Picture"
-msgstr "???????????????? ??????????????????"
+msgstr "???????????????? ??????????????????/??????????????????????"
 
 #: src/rcstrings.c:36
-#, fuzzy
 msgid "Unembed Component/Picture"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????/??????????????????????"
 
 #: src/rcstrings.c:37
 msgid "Update Component"
@@ -340,9 +339,8 @@
 msgstr "??????????????"
 
 #: src/rcstrings.c:87
-#, fuzzy
 msgid "Picture..."
-msgstr "????????????..."
+msgstr "??????????????????????..."
 
 #: src/rcstrings.c:89
 msgid "Hierarchy"
@@ -429,9 +427,8 @@
 msgstr "?????? ?????????? ????????????????..."
 
 #: src/rcstrings.c:112
-#, fuzzy
 msgid "Toggle Outline/Box"
-msgstr "???????????????????????? ?????????????? ????????????/????????"
+msgstr "?????????????????????? ?????????????? ????????????/????????"
 
 #: src/rcstrings.c:113
 msgid "Toggle Net Rubberband"
@@ -476,18 +473,17 @@
 msgstr "???????????? ???????????? ????????????????.\n"
 
 #: src/g_rc.c:106
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Found a version [%s%s] gschemrc file:\n"
 "[%s]\n"
 msgstr ""
-"?????????????? ???????????? [%s] ?????????? gschemrc:\n"
+"?????????????? ???????????? [%s%s] ?????????? gschemrc:\n"
 "[%s]\n"
 
 #: src/g_rc.c:109
 #, c-format
-msgid ""
-"While gschem is in ALPHA, please be sure that you have the latest rc file.\n"
+msgid "While gschem is in ALPHA, please be sure that you have the latest rc file.\n"
 msgstr ""
 "gschem ?????????????????? ?? ???????????? ALPHA, ?????????????????? ?????????????? ?????????????????? ???????????? rc-"
 "??????????.\n"
@@ -549,52 +545,50 @@
 msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? bus-ripper-size\n"
 
 #: src/g_rc.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ???????????? ?????????? [%d] ?????? ?????????????????? grid-dot-size\n"
 
 #: src/g_rc.c:1572
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ?????????????? [%d] ?????? ?????????????????? grid-fixed-threshold\n"
 
 #: src/g_rc.c:1616
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ???????????????? [%d] ?????? ?????????????????? add-attribute-offset\n"
 
 #: src/g_rc.c:1640
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
-msgstr "???????????????? ???????????????????? ?????????????? [%d] ?????? ?????????????????? undo-levels\n"
+msgstr "???????????????? ?????????? ???????????? [%d] ?????? ?????????????????? auto-save-interval\n"
 
 #: src/g_rc.c:1681
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? snap-size\n"
+msgstr "???????????????? ?????????????????? [%d] ?????? ?????????????????? mousepan-gain\n"
 
 #: src/g_rc.c:1704
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? snap-size\n"
+msgstr "???????????????? ?????????????????? [%d] ?????? ?????????????????? keyboardpan-gain\n"
 
 #: src/gschem.c:141 src/gschem.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "gEDA/gschem version %s%s\n"
-msgstr "???????????? gEDA/gschem %s\n"
+msgstr "???????????? gEDA/gschem %s%s\n"
 
 #: src/gschem.c:143 src/gschem.c:153
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
 "details.\n"
-msgstr ""
-"gEDA/gschem ???????????????????????? ?????? ????????????????; ???????????????? COPYING ?????? ????????????????????????.\n"
+msgstr "gEDA/gschem ???????????????????????? ?????? ????????????????; ???????????????? COPYING ?????? ????????????????????????.\n"
 
 #: src/gschem.c:145 src/gschem.c:155
 #, c-format
-msgid ""
-"This is free software, and you are welcome to redistribute it under certain\n"
+msgid "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 "?????? ?????????????????? ?????????????????????? ??????????????????????, ?? ?????? ?????????? ???????????????????????????? ?????? "
 "??????????????????\n"
@@ -690,9 +684,8 @@
 msgstr "?????????? ????????????????????????????"
 
 #: src/i_basic.c:144
-#, fuzzy
 msgid "Picture Mode"
-msgstr "?????????? ??????????????????"
+msgstr "?????????? ??????????????????????"
 
 #: src/i_basic.c:147
 msgid "Circle Mode"
@@ -715,14 +708,12 @@
 msgstr "??????????????????????"
 
 #: src/i_basic.c:159 src/i_callbacks.c:735 src/i_callbacks.c:754
-#, fuzzy
 msgid "Multiple Copy"
-msgstr "?????????????????????????? ??????????????????"
+msgstr "?????????????????????????? ??????????????????????"
 
 #: src/i_basic.c:162
-#, fuzzy
 msgid "Multiple Copy Mode"
-msgstr "?????????? ??????????????????????"
+msgstr "?????????? ???????????????????????????? ??????????????????????"
 
 #: src/i_basic.c:197
 msgid "Snap Off"
@@ -765,12 +756,12 @@
 
 #: src/i_callbacks.c:150
 msgid "Documentation commands not supported under MinGW.\n"
-msgstr ""
+msgstr "?????????????? ???????????????????????? ???? ???????????????????????????? ?? MinGW.\n"
 
 #: src/i_callbacks.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "New page created [%s]\n"
-msgstr "?????????? ???????????????? ?????????????? [%s]\n"
+msgstr "?????????????? ?????????? ???????????????? [%s]\n"
 
 #: src/i_callbacks.c:264
 msgid "New Window created\n"
@@ -795,9 +786,8 @@
 msgstr "???????????? ?????? ?????????????? ????????????????????"
 
 #: src/i_callbacks.c:408
-#, fuzzy
 msgid "Failed to Save All"
-msgstr "?????????????????? ??????"
+msgstr "???????????? ?????? ???????????????????? ??????????"
 
 #: src/i_callbacks.c:410
 msgid "Saved All"
@@ -904,9 +894,8 @@
 msgstr "???????????????? [%s]\n"
 
 #: src/i_callbacks.c:1909
-#, fuzzy
 msgid "Really revert page?"
-msgstr "???????????????????? ????????????????"
+msgstr "?????????????????????????? ???????????????????? ?????????????????"
 
 #: src/i_callbacks.c:1995 src/i_callbacks.c:2015 src/i_callbacks.c:2041
 #, c-format
@@ -1199,36 +1188,36 @@
 msgstr "????????????: ???????????? NULL ?? o_rotate_90!\n"
 
 #: src/o_misc.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "Component [%s] has been embedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? [%s] ?????? ?????? ??????????????\n"
 
 #: src/o_misc.c:600
-#, fuzzy, c-format
+#, c-format
 msgid "Picture [%s] has been embedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????????? [%s] ?????? ?????? ????????????????\n"
 
 #: src/o_misc.c:632
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
 "embedded\n"
-msgstr "???????????????????? ?????????? ?????????????????? [%s], ???? ?????????? ?????????????? ????????????????????.\n"
+msgstr "???????????????????? ?????????? ?????????????????? [%s], ???? ?????????? ?????????????? ????????????????????. ?????????????????? ?????? ?????? ??????????????\n"
 
 #: src/o_misc.c:643 src/o_misc.c:1608
 #, c-format
 msgid "More than one component found with name [%s]\n"
-msgstr ""
+msgstr "?????????????? ?????????? ???????????? ???????????????????? ?? ???????????? [%s]\n"
 
 #: src/o_misc.c:651
-#, fuzzy, c-format
+#, c-format
 msgid "Component [%s] has been successfully unembedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? [%s] ?????????????? ????????????????\n"
 
 #: src/o_misc.c:666
-#, fuzzy, c-format
+#, c-format
 msgid "Picture [%s] has been unembedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????????? [%s] ??????????????????\n"
 
 #: src/o_misc.c:702
 #, c-format
@@ -1245,32 +1234,31 @@
 
 #: src/o_misc.c:1603
 msgid "Could not unembedded component, could not find appropriate .sym file\n"
-msgstr ""
+msgstr "???????????????????? ?????????????????? ??????????????????, ???????????????????? ?????????? ?????????????????????????????? .sym-????????\n"
 
 #: src/o_misc.c:1604
-#, fuzzy
 msgid "Component still embedded and not updated\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? ?????? ?????? ?????????????? ?? ???? ????????????????\n"
 
 #: src/o_misc.c:1745
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
-msgstr ""
+msgstr "o_autosave_backups: ???????????????????? ???????????????? ?????????????? ?????? ?????????? ?????? %s."
 
 #: src/o_misc.c:1789
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ?????????? ????????????-???????????? ?????? ???????????????????? ?????????????????? ?????????? ?????????? [%s]\n"
 
 #: src/o_misc.c:1807
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ?????????? ???????????? ???????????? ?????? ???????????????????? ?????????? [%s]\n"
 
 #: src/o_misc.c:1812
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT save backup file [%s]\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ?????????????????? ?????????????????? ???????? [%s]\n"
 
 #: src/o_move.c:220
 #, c-format
@@ -1280,7 +1268,7 @@
 #: src/o_move.c:334
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
-msgstr ""
+msgstr "????! ?????????????? ?????????? ??????-????????, ???? ???????????? ???? ????????????????????!\n"
 
 #: src/o_move.c:355
 #, c-format
@@ -1304,16 +1292,16 @@
 
 #: src/o_picture.c:174 src/o_picture.c:838
 msgid "Please select a picture file."
-msgstr ""
+msgstr "????????????????????, ???????????????? ???????? ??????????????????????."
 
 #: src/o_picture.c:241 src/o_picture.c:750
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load picture: %s"
-msgstr "???????????????????? ?????????????????? ?????????????????? scm-???????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ??????????????????????: [%s]"
 
 #: src/o_picture.c:260
 msgid "Picture"
-msgstr ""
+msgstr "??????????????????????"
 
 #: src/o_picture.c:776 src/x_attribedit.c:153
 #, c-format
@@ -1342,9 +1330,9 @@
 msgstr "???? ?????????????????? ?????????????? ???????? ????????-???? ??????????????????????????????!\n"
 
 #: src/o_text.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "Tried to render text with an invalid angle: %d\n"
-msgstr "?????????????? ?????????????????? ?????????????????? ??????????: %d\n"
+msgstr "?????????????? ?????????????????? ???????????? ?? ???????????????? ??????????: %d\n"
 
 #: src/o_undo.c:320
 msgid "Undo/Redo disabled in rc file\n"
@@ -1364,11 +1352,21 @@
 "  -h            Help; this message\n"
 "\n"
 msgstr ""
+"??????????????????????????: %s [??????????] ????????_??????????1 ... ????????_??????????N\n"
+"  -q            ???????????? ???? ????????????????\n"
+"  -v            ???????????????? ?????????? ???????????????????? ??????????????????\n"
+"  -r ????????       ???????????????????????? ?? ???????????????? ?????????????????????????????????? ???????? ????????\n"
+"  -s ????????       ?????? ?????????? ?????????????? (guile)\n"
+"  -o ????????       ?????? ?????????????????? ?????????? (?????? ????????????)\n"
+"  -p            ?????????????????????????? ?????????????????????? ????????\n"
+"  -t            ???????????????? ?????????????????? ????????????????????\n"
+"  -h            ????????????; ?????? ??????????????????\n"
+"\n"
 
 #: src/x_attribedit.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Got invalid show option; defaulting to show both\n"
-msgstr "???????????????? ???????????????? ?????????? ??????????????????, ???????????????????????? ??????????"
+msgstr "???????????????? ???????????????? ?????????? ??????????????????, ?????????????????????????????? ???????????????? ??????????\n"
 
 #: src/x_attribedit.c:363
 msgid "Single Attribute Editor"
@@ -1498,9 +1496,8 @@
 msgstr "?????????????? ????????????"
 
 #: src/x_dialog.c:607
-#, fuzzy
 msgid "Edit Text Color"
-msgstr "???????????? ????????????"
+msgstr "???????????? ?????????? ????????????"
 
 #: src/x_dialog.c:619
 msgid "Edit Text Size"
@@ -1537,7 +1534,7 @@
 #: src/x_dialog.c:1498 src/x_dialog.c:1499 src/x_dialog.c:1500
 #: src/x_dialog.c:1501 src/x_dialog.c:1502 src/x_dialog.c:1510
 msgid "*unchanged*"
-msgstr ""
+msgstr "*????????????????????*"
 
 #: src/x_dialog.c:958
 msgid "Edit Line Width & Type"
@@ -1564,9 +1561,8 @@
 msgstr "??????????????"
 
 #: src/x_dialog.c:1103
-#, fuzzy
 msgid "Filled"
-msgstr "????????"
+msgstr "??????????????????"
 
 #: src/x_dialog.c:1104
 msgid "Mesh"
@@ -1597,14 +1593,13 @@
 msgstr "????????????2"
 
 #: src/x_dialog.c:1637
-#, fuzzy
 msgid ""
 "There are unsaved schematics!\n"
 "\n"
 "Are you sure?\n"
 "OK will discard ALL changes!"
 msgstr ""
-"?????????? ???? ??????????????????!\n"
+"?????????? ???? ???????? ??????????????????!\n"
 "\n"
 "???? ???????????????\n"
 "???? ?????????????? ?????? ??????????????????!"
@@ -1656,13 +1651,12 @@
 
 #: src/x_dialog.c:2515
 msgid "gEDA : GPL Electronic Design Automation"
-msgstr ""
-"gEDA: ?????????????? ?????????????????????????????????????? ???????????????????????????? ?????????????????????? ???????? (GPL)"
+msgstr "gEDA: ?????????????? ?????????????????????????????????????? ???????????????????????????? ?????????????????????? ???????? (GPL)"
 
 #: src/x_dialog.c:2523
-#, fuzzy, c-format
+#, c-format
 msgid "gschem version %s%s"
-msgstr "???????????? gschem %s"
+msgstr "???????????? gschem %s%s"
 
 #: src/x_dialog.c:2531
 msgid ""
@@ -1701,12 +1695,11 @@
 #: src/x_dialog.c:3097
 #, c-format
 msgid "Ran out of space in the hotkey buffer...\n"
-msgstr ""
+msgstr "???????????????????? ???????????????????????? ???????????? ?????????????? ????????????...\n"
 
 #: src/x_dialog.c:3174
-#, fuzzy
 msgid "Function : keystroke(s)"
-msgstr "?????????????? : "
+msgstr "?????????????? : ???????????????????? ????????????"
 
 #: src/x_dialog.c:3519
 msgid "Generic String"
@@ -1747,86 +1740,76 @@
 #: src/x_dialog.c:4011
 #, c-format
 msgid "Warning: negative numbers not allowed in the autonumber_text dialog\n"
-msgstr ""
+msgstr "????????????????????????????: ?????????????????????????? ???????????????? ???? ?????????????????????? ?? ?????????????? autonumber_text\n"
 
 #: src/x_dialog.c:4095
 msgid "Autonumber text"
 msgstr "???????????????????????????? ??????????"
 
 #: src/x_dialog.c:4101
-#, fuzzy
 msgid "selection"
-msgstr "??????????????"
+msgstr "??????????"
 
 #: src/x_dialog.c:4110
-#, fuzzy
 msgid "search text"
-msgstr "???????????????? ??????????"
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4138
 msgid "search focus"
-msgstr ""
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4151
-#, fuzzy
 msgid "selected objects"
-msgstr "???????????? ???????????????????????????? ????????????!\n"
+msgstr "?????????????? ??????????????"
 
 #: src/x_dialog.c:4154
-#, fuzzy
 msgid "current sheet"
-msgstr "???????????????? ????????"
+msgstr "?????????????? ????????"
 
 #: src/x_dialog.c:4157
 msgid "hierarchical sheets"
-msgstr ""
+msgstr "???????????????? ????????????"
 
 #: src/x_dialog.c:4169
-#, fuzzy
 msgid "unnumbered"
-msgstr "???????????????????????????? ??????????"
+msgstr "???? ??????????????????????????"
 
 #: src/x_dialog.c:4173
-#, fuzzy
 msgid "all"
-msgstr "??????"
+msgstr "??????"
 
 #: src/x_dialog.c:4182
-#, fuzzy
 msgid "options"
-msgstr "??????????????????"
+msgstr "??????????"
 
 #: src/x_dialog.c:4189
-#, fuzzy
 msgid "start number"
-msgstr "???????????? ???????????? ??????????"
+msgstr "?????????????????? ??????????"
 
 #: src/x_dialog.c:4202
 msgid "sort order"
-msgstr ""
+msgstr "?????????????? ????????????????????"
 
 #: src/x_dialog.c:4214
-#, fuzzy
 msgid "file order"
-msgstr "?????????? ????????????????????"
+msgstr "?????????????? ????????????"
 
 #: src/x_dialog.c:4217
 msgid "top down"
-msgstr ""
+msgstr "???????? ??????"
 
 #: src/x_dialog.c:4220
-#, fuzzy
 msgid "left right"
-msgstr "?????????????? ????????????"
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4223
 msgid "diagonal"
-msgstr ""
+msgstr "????????????????????????"
 
 #: src/x_fileselect.c:300
-#, fuzzy, c-format
+#, c-format
 msgid "Agg, could not open directory: %s\n"
-msgstr "???????????????????? ?????????????? ??????????????: %s\n"
+msgstr "????, ???????????????????? ?????????????? ??????????????: %s\n"
 
 #: src/x_fileselect.c:327
 #, c-format
@@ -1937,33 +1920,28 @@
 msgstr "?????? ??????????"
 
 #: src/x_fileselect.c:2261
-#, fuzzy
 msgid "Schematics"
-msgstr "sch - ??????????"
+msgstr "??????????"
 
 #: src/x_fileselect.c:2264
-#, fuzzy
 msgid "Symbols"
-msgstr "sym - ??????????????"
+msgstr "??????????????"
 
 #: src/x_fileselect.c:2267
-#, fuzzy
 msgid "Schematics and symbols"
-msgstr "sym/sch - ?????????? ?? ??????????????"
+msgstr "?????????? ?? ??????????????"
 
 #: src/x_fileselect.c:2271
-#, fuzzy
 msgid "All files"
-msgstr "* - ?????? ??????????"
+msgstr "?????? ??????????"
 
 #: src/x_fileselect.c:2343
-#, fuzzy
 msgid "Discard changes"
-msgstr "???????????????????? ???????????????????"
+msgstr "???????????????????? ??????????????????"
 
 #: src/x_image.c:291
 msgid "x_image_lowlevel: Unable to write PNG file.\n"
-msgstr ""
+msgstr "x_image_lowlevel: ???????????????????? ???????????????? PNG-????????.\n"
 
 #: src/x_image.c:295 src/x_image.c:326
 #, c-format
@@ -1977,7 +1955,7 @@
 
 #: src/x_image.c:307
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
-msgstr ""
+msgstr "x_image_lowlevel: ???????????????????? ???????????????? ?????????? ?????????????????????? ???? ???????? gschem.\n"
 
 #: src/x_image.c:415
 msgid "Write Image..."
@@ -2000,105 +1978,88 @@
 msgstr "????????????"
 
 #: src/x_menus.c:35
-#, fuzzy
 msgid "/Add Net"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ????????????????????"
 
 #: src/x_menus.c:36
-#, fuzzy
 msgid "/Add Attribute..."
-msgstr "????????????????/???????????????????????????? ??????????????"
+msgstr "/???????????????? ??????????????"
 
 #: src/x_menus.c:37
-#, fuzzy
 msgid "/Add Component..."
-msgstr "??????????????????..."
+msgstr "/???????????????? ??????????????????..."
 
 #: src/x_menus.c:38
-#, fuzzy
 msgid "/Add Bus"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ????????"
 
 #: src/x_menus.c:39
-#, fuzzy
 msgid "/Add Text"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ??????????"
 
 #: src/x_menus.c:41
-#, fuzzy
 msgid "/Zoom In"
-msgstr "??????????????????"
+msgstr "/??????????????????"
 
 #: src/x_menus.c:42
-#, fuzzy
 msgid "/Zoom Out"
-msgstr "??????????????????"
+msgstr "/??????????????????"
 
 #: src/x_menus.c:43
-#, fuzzy
 msgid "/Zoom Box"
-msgstr "?????????????? ?????? ??????????????????????????????"
+msgstr "/?????????????? ?????? ??????????????????????????????"
 
 #: src/x_menus.c:44
-#, fuzzy
 msgid "/Zoom Extents"
-msgstr "?????????????? ???? ??????????"
+msgstr "/?????????????? ???? ??????????"
 
 #: src/x_menus.c:46
-#, fuzzy
 msgid "/Select"
-msgstr "??????????????"
+msgstr "/??????????????"
 
 #: src/x_menus.c:47
-#, fuzzy
 msgid "/Edit..."
-msgstr "????????????..."
+msgstr "/????????????..."
 
 #: src/x_menus.c:48
-#, fuzzy
 msgid "/Copy"
-msgstr "????????????????????"
+msgstr "/????????????????????"
 
 #: src/x_menus.c:49
-#, fuzzy
 msgid "/Move"
-msgstr "??????????????????????"
+msgstr "/??????????????????????"
 
 #: src/x_menus.c:50
-#, fuzzy
 msgid "/Delete"
-msgstr "??????????????"
+msgstr "/??????????????"
 
 #: src/x_menus.c:53
-#, fuzzy
 msgid "/Down Schematic"
-msgstr "???????????? ??????????"
+msgstr "/???????????? ??????????"
 
 #: src/x_menus.c:54
-#, fuzzy
 msgid "/Down Symbol"
-msgstr "???????????? ??????????????"
+msgstr "/???????????? ??????????????"
 
 #: src/x_menus.c:55
-#, fuzzy
 msgid "/Up"
-msgstr "????????????"
+msgstr "/????????????"
 
 #: src/x_menus.c:329
 msgid "Tried to set the sensitivity on a non-existent menu item\n"
-msgstr ""
+msgstr "?????????????? ?????????????????? ???????????????????????????????? ?????? ?????????????????????????????? ???????????? ????????\n"
 
 #: src/x_menus.c:353
 msgid "Popup_menu_item_factory doesn't exist!\n"
-msgstr ""
+msgstr "Popup_menu_item_factory ???? ????????????????????!\n"
 
 #: src/x_menus.c:366
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
-msgstr ""
+msgstr "?????????????? ?????????????????? ???????????????????????????????? ?????? ?????????????????????????????? ???????????????????????????? menu_item\n"
 
 #: src/x_multiattrib.c:625
 msgid "Attributes with empty name are not allowed. Please set a name."
-msgstr ""
+msgstr "???????????????? ?? ???????????? ???????????? ??????????????????????. ????????????????????, ???????????????????? ??????."
 
 #: src/x_multiattrib.c:1131
 msgid "Show Value only"
@@ -2110,7 +2071,7 @@
 
 #: src/x_multiattrib.c:1159
 msgid "Duplicate"
-msgstr ""
+msgstr "??????????????????????"
 
 #: src/x_multiattrib.c:1276
 msgid "Edit Attributes"
@@ -2137,9 +2098,8 @@
 msgstr ""
 
 #: src/x_multiattrib.c:1464
-#, fuzzy
 msgid "Add Attribute"
-msgstr "????????????????/???????????????????????????? ??????????????"
+msgstr "???????????????? ??????????????"
 
 #: src/x_pagesel.c:267
 msgid "Discard Page"
@@ -2150,30 +2110,28 @@
 msgstr "???????????????? ??????????????"
 
 #: src/x_pagesel.c:448
-#, fuzzy
 msgid "Changed"
-msgstr "????????????????"
+msgstr "????????????????"
 
 #: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
-msgstr ""
+msgstr "???????????????? ???????????? ?????????????? ???? ?????????? ?????????? ?????? ???????????????????????????? ??????????..."
 
 #: src/x_preview.c:127
 msgid "x_preview_update_gtk24: Can't get pixbuf from preview struct.\n"
-msgstr ""
+msgstr "x_preview_update_gtk24: ???????????????????? ???????????????? ?????????? ?????????????????????? ???? ???????????????????? ??????????????????.\n"
 
 #: src/x_print.c:91
-#, fuzzy
 msgid "Save PostScript As..."
-msgstr "?????????????????? ???????????????? ??????..."
+msgstr "?????????????????? PostScript ??????..."
 
 #: src/x_print.c:188
 msgid "Extents with margins"
-msgstr ""
+msgstr "?????????????????? ?? ????????????"
 
 #: src/x_print.c:191
 msgid "Extents no margins"
-msgstr ""
+msgstr "?????????????????? ?????? ??????????"
 
 #: src/x_print.c:195
 msgid "Current Window"
@@ -2189,7 +2147,7 @@
 
 #: src/x_print.c:283
 msgid "Settings"
-msgstr ""
+msgstr "??????????????????"
 
 #: src/x_print.c:295
 msgid "Output paper size"
@@ -2204,17 +2162,16 @@
 msgstr "????????????????????"
 
 #: src/x_print.c:329
-#, fuzzy
 msgid "Destination"
-msgstr "????????????????????????"
+msgstr "????????????????????"
 
 #: src/x_print.c:368
 msgid "Command"
-msgstr ""
+msgstr "??????????????"
 
 #: src/x_print.c:690
 msgid "No print destination specified\n"
-msgstr ""
+msgstr "???? ?????????????? ???????????????????? ?????? ????????????\n"
 
 #: src/x_print.c:697
 #, c-format
@@ -2351,175 +2308,54 @@
 msgid "Pan/Cancel"
 msgstr "??????????/????????????"
 
-#~ msgid "OK"
-#~ msgstr "????"
-
-#~ msgid "Cancel"
-#~ msgstr "????????????"
-
-#~ msgid "Apply"
-#~ msgstr "??????????????????"
-
-#~ msgid "Find"
-#~ msgstr "??????????"
-
-#~ msgid "Done"
-#~ msgstr "????????????"
-
-#~ msgid "SaveAs"
-#~ msgstr "?????????????????? ??????"
+msgid "Image"
+msgstr "??????????????????????"
 
-#~ msgid "Write"
-#~ msgstr "????????????????"
-
-#~ msgid "Print"
-#~ msgstr "????????????"
-
-#~ msgid "Edit mode"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Move mode"
-#~ msgstr "?????????? ??????????????????????"
-
-#~ msgid "Copy mode"
-#~ msgstr "?????????? ??????????????????????"
-
-#~ msgid "Delete mode"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Rotate mode"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Mirror mode"
-#~ msgstr "?????????? ????????????????????????????"
-
-#, fuzzy
-#~ msgid "Invalid number of lines [%d] passed to output-vector-threshold\n"
-#~ msgstr "???????????????? ???????????????????? ?????????????? [%d] ?????? ?????????????????? undo-levels\n"
-
-#~ msgid "Comps"
-#~ msgstr "????????????????????"
-
-#~ msgid "Both"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "Image"
-#~ msgstr "????????????????"
-
-#~ msgid "Deattach"
-#~ msgstr "????????????????"
-
-#~ msgid "%s requires a string as a parameter\n"
-#~ msgstr "%s ?????????????? ???????????? ?? ???????????????? ??????????????????\n"
-
-#~ msgid "Invalid parameters to paper-sizes\n"
-#~ msgstr "???????????????? ?????????????????? ?? paper-sizes\n"
-
-#~ msgid "Cannot obtain the current directory!\n"
-#~ msgstr "???????????????????? ?????????? ?? ?????????????? ??????????????!\n"
-
-#~ msgid "Cannot get cwd!\n"
-#~ msgstr "???????????????????? ???????????????? ?????? ???????????????? ????????????????!\n"
-
-#~ msgid "ERROR: NULL object in o_embed!\n"
-#~ msgstr "????????????: ???????????? NULL ?? o_embed!\n"
-
-#~ msgid "Warning: two components with same refdes: %d\n"
-#~ msgstr "????????????????????????????: ?????? ???????????????????? ?? ???????????????????? refdes: %d\n"
-
-#~ msgid "Got an unexpected NULL in o_update_component\n"
-#~ msgstr "?????????????????????? NULL ?? o_update_component\n"
-
-#~ msgid "Invalid space specified, setting to 100\n"
-#~ msgstr "?????????????????? ???????????????? ????????????, ?????????????????????????????? ?? 100\n"
-
-#~ msgid "Invalid length specified, setting to 100\n"
-#~ msgstr "???????????????????? ???????????????? ??????????, ?????????????????????????????? ?? 100\n"
-
-#~ msgid "Autonumber text starting with:"
-#~ msgstr "???????????????????????????? ??????????, ???????????????????????? ??:"
-
-#~ msgid "Yes"
-#~ msgstr "????"
-
-#~ msgid "No"
-#~ msgstr "??????"
-
-#~ msgid "Add/Edit"
-#~ msgstr "????????????????/??????????????????????????"
-
-#~ msgid "Clear"
-#~ msgstr "????????????????"
-
-#~ msgid "Open Page"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Update Manager"
-#~ msgstr "???????????????? ????????????????"
-
-#~ msgid "Close Manager"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Read system-gschemrc file [%s]\n"
-#~ msgstr "???????????? ?????????? system-gschemrc [%s]\n"
-
-#, fuzzy
-#~ msgid "Did not find required system-gschemrc file [%s]\n"
-#~ msgstr "???????? system-gschemrc ???? ?????? ???????????? [%s]\n"
-
-#~ msgid "Read ~/.gEDA/gschemrc file [%s]\n"
-#~ msgstr "???????????? ?????????? ~/.gEDA/gschemrc [%s]\n"
-
-#, fuzzy
-#~ msgid "Did not find optional ~/.gEDA/gschemrc file [%s]\n"
-#~ msgstr "???????? ~/.gEDA/gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "Comps"
+msgstr "????????????????????"
 
-#~ msgid "Read local gschemrc file [%s]\n"
-#~ msgstr "???????????? ???????????????????? ?????????? gschemrc [%s]\n"
+msgid "Both"
+msgstr "??????"
 
-#, fuzzy
-#~ msgid "Did not find optional local gschemrc file [%s]\n"
-#~ msgstr "?????????????????? ???????? gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "OK"
+msgstr "????"
 
-#~ msgid "Read specified rc file [%s]\n"
-#~ msgstr "???????????? ???????????????????????? rc-?????????? [%s]\n"
+msgid "Apply"
+msgstr "??????????????????"
 
-#~ msgid "Did not find specified gschemrc file [%s]\n"
-#~ msgstr "?????????????????? ???????? gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "Cancel"
+msgstr "????????????"
 
-#~ msgid "Could not find any gschemrc file!\n"
-#~ msgstr "???????????????????? ?????????? ???? ???????????? ?????????? gschemrc!\n"
+msgid "Find"
+msgstr "??????????"
 
-#~ msgid "Could not find a gschemrc file\n"
-#~ msgstr "???????????????????? ?????????? ???????? gschemrc\n"
+msgid "Done"
+msgstr "????????????"
 
-#~ msgid "Invalid path [%s] passed to component-library\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? component-library\n"
+msgid "SaveAs"
+msgstr "?????????????????? ??????"
 
-#~ msgid "Invalid path [%s] passed to component-library-search\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? component-library-search\n"
+msgid "Write"
+msgstr "????????????????"
 
-#~ msgid "Invalid path [%s] passed to %s\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? %s\n"
+msgid "Print"
+msgstr "????????????"
 
-#~ msgid "Invalid path [%s] passed to source-library-search\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? source-library-search\n"
+msgid "Edit mode"
+msgstr "?????????? ????????????"
 
-#~ msgid "Invalid path [%s] passed to scheme-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? scheme-directory\n"
+msgid "Move mode"
+msgstr "?????????? ??????????????????????"
 
-#~ msgid "Invalid path [%s] passed to bitmap-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? bitmap-directory\n"
+msgid "Copy mode"
+msgstr "?????????? ??????????????????????"
 
-#~ msgid "Invalid path [%s] passed to font-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? font-directory\n"
+msgid "Delete mode"
+msgstr "?????????? ????????????????"
 
-#~ msgid "Ok"
-#~ msgstr "????"
+msgid "Rotate mode"
+msgstr "?????????? ????????????????"
 
-#~ msgid "Edit Component"
-#~ msgstr "?????????????????????????? ??????????????????"
+msgid "Mirror mode"
+msgstr "?????????? ????????????????????????????"
 
-#~ msgid "Limits"
-#~ msgstr "????????????????????????"


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-5/geda-gschem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-gschem.spec	10 Sep 2006 21:43:33 -0000	1.2
+++ geda-gschem.spec	12 Oct 2006 18:47:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             geda-gschem
 Version:          20060906
-Release:          1%{?dist}
+Release:          3%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
@@ -12,6 +12,9 @@
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
+# by Andy Shevchenko #206280
+Patch0:           geda-gschem-ru.po.diff
+
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
@@ -23,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b ru.po
 
 %build
 %{__cp} -p configure.ac configure.ac.gdgeda
@@ -130,11 +134,16 @@
 %{_datadir}/gEDA/gschem-lightbg
 %{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
-#%{_infodir}/gschemdoc.info*
 %{_mandir}/man1/gschem.*
-#%{_datadir}/gEDA/docs/man/gschem.html
+
 
 %Changelog
+* Fri Sep 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
+- patch for russian translation by Andy Shevchenko #206280
+
+* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
+- Rebuilt for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
 - Upstream release 20060906
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:48:13 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:48:13 -0700
Subject: rpms/geda-gschem import.log,1.5,1.6
Message-ID: <200610121848.k9CImFaQ001809@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1773

Modified Files:
	import.log 
Log Message:
auto-import geda-gschem-20060906-3 on branch devel from geda-gschem-20060906-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	12 Oct 2006 18:47:07 -0000	1.5
+++ import.log	12 Oct 2006 18:48:13 -0000	1.6
@@ -2,3 +2,4 @@
 geda-gschem-20060906-1:FC-5:geda-gschem-20060906-1.src.rpm:1157924854
 geda-gschem-20060906-2:HEAD:geda-gschem-20060906-2.src.rpm:1157925079
 geda-gschem-20060906-3:FC-5:geda-gschem-20060906-3.src.rpm:1160679025
+geda-gschem-20060906-3:HEAD:geda-gschem-20060906-3.src.rpm:1160679092



From fedora-extras-commits at redhat.com  Thu Oct 12 18:48:14 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:48:14 -0700
Subject: rpms/geda-gschem/devel geda-gschem-ru.po.diff, NONE,
	1.1 geda-gschem.spec, 1.2, 1.3
Message-ID: <200610121848.k9CImGBM001816@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1773/devel

Modified Files:
	geda-gschem.spec 
Added Files:
	geda-gschem-ru.po.diff 
Log Message:
auto-import geda-gschem-20060906-3 on branch devel from geda-gschem-20060906-3.src.rpm

geda-gschem-ru.po.diff:

--- NEW FILE geda-gschem-ru.po.diff ---
--- po/ru.po	2006-09-07 05:05:17.000000000 +0200
+++ ru.po	2006-09-15 09:42:47.000000000 +0200
@@ -1,20 +1,21 @@
 # translation of ru.po to Russian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR Alexandre Pereira Nunes
-# Andy Shevchenko <andy at smile.org.ua>, 2003
 #
+# Andy Shevchenko <andy at smile.org.ua>, 2003, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-09-06 23:05-0400\n"
-"PO-Revision-Date: 2003-01-21 17:49+0200\n"
+"PO-Revision-Date: 2006-09-13 16:59+0300\n"
 "Last-Translator: Andy Shevchenko <andy at smile.org.ua>\n"
 "Language-Team: Russian <ru 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.0\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/rcstrings.c:2 src/x_print.c:342
 msgid "File"
@@ -145,14 +146,12 @@
 msgstr "?????????????? ??????????????..."
 
 #: src/rcstrings.c:35
-#, fuzzy
 msgid "Embed Component/Picture"
-msgstr "???????????????? ??????????????????"
+msgstr "???????????????? ??????????????????/??????????????????????"
 
 #: src/rcstrings.c:36
-#, fuzzy
 msgid "Unembed Component/Picture"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????/??????????????????????"
 
 #: src/rcstrings.c:37
 msgid "Update Component"
@@ -340,9 +339,8 @@
 msgstr "??????????????"
 
 #: src/rcstrings.c:87
-#, fuzzy
 msgid "Picture..."
-msgstr "????????????..."
+msgstr "??????????????????????..."
 
 #: src/rcstrings.c:89
 msgid "Hierarchy"
@@ -429,9 +427,8 @@
 msgstr "?????? ?????????? ????????????????..."
 
 #: src/rcstrings.c:112
-#, fuzzy
 msgid "Toggle Outline/Box"
-msgstr "???????????????????????? ?????????????? ????????????/????????"
+msgstr "?????????????????????? ?????????????? ????????????/????????"
 
 #: src/rcstrings.c:113
 msgid "Toggle Net Rubberband"
@@ -476,18 +473,17 @@
 msgstr "???????????? ???????????? ????????????????.\n"
 
 #: src/g_rc.c:106
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Found a version [%s%s] gschemrc file:\n"
 "[%s]\n"
 msgstr ""
-"?????????????? ???????????? [%s] ?????????? gschemrc:\n"
+"?????????????? ???????????? [%s%s] ?????????? gschemrc:\n"
 "[%s]\n"
 
 #: src/g_rc.c:109
 #, c-format
-msgid ""
-"While gschem is in ALPHA, please be sure that you have the latest rc file.\n"
+msgid "While gschem is in ALPHA, please be sure that you have the latest rc file.\n"
 msgstr ""
 "gschem ?????????????????? ?? ???????????? ALPHA, ?????????????????? ?????????????? ?????????????????? ???????????? rc-"
 "??????????.\n"
@@ -549,52 +545,50 @@
 msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? bus-ripper-size\n"
 
 #: src/g_rc.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ???????????? ?????????? [%d] ?????? ?????????????????? grid-dot-size\n"
 
 #: src/g_rc.c:1572
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ?????????????? [%d] ?????? ?????????????????? grid-fixed-threshold\n"
 
 #: src/g_rc.c:1616
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ???????????????? [%d] ?????? ?????????????????? add-attribute-offset\n"
 
 #: src/g_rc.c:1640
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
-msgstr "???????????????? ???????????????????? ?????????????? [%d] ?????? ?????????????????? undo-levels\n"
+msgstr "???????????????? ?????????? ???????????? [%d] ?????? ?????????????????? auto-save-interval\n"
 
 #: src/g_rc.c:1681
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? snap-size\n"
+msgstr "???????????????? ?????????????????? [%d] ?????? ?????????????????? mousepan-gain\n"
 
 #: src/g_rc.c:1704
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? snap-size\n"
+msgstr "???????????????? ?????????????????? [%d] ?????? ?????????????????? keyboardpan-gain\n"
 
 #: src/gschem.c:141 src/gschem.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "gEDA/gschem version %s%s\n"
-msgstr "???????????? gEDA/gschem %s\n"
+msgstr "???????????? gEDA/gschem %s%s\n"
 
 #: src/gschem.c:143 src/gschem.c:153
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
 "details.\n"
-msgstr ""
-"gEDA/gschem ???????????????????????? ?????? ????????????????; ???????????????? COPYING ?????? ????????????????????????.\n"
+msgstr "gEDA/gschem ???????????????????????? ?????? ????????????????; ???????????????? COPYING ?????? ????????????????????????.\n"
 
 #: src/gschem.c:145 src/gschem.c:155
 #, c-format
-msgid ""
-"This is free software, and you are welcome to redistribute it under certain\n"
+msgid "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 "?????? ?????????????????? ?????????????????????? ??????????????????????, ?? ?????? ?????????? ???????????????????????????? ?????? "
 "??????????????????\n"
@@ -690,9 +684,8 @@
 msgstr "?????????? ????????????????????????????"
 
 #: src/i_basic.c:144
-#, fuzzy
 msgid "Picture Mode"
-msgstr "?????????? ??????????????????"
+msgstr "?????????? ??????????????????????"
 
 #: src/i_basic.c:147
 msgid "Circle Mode"
@@ -715,14 +708,12 @@
 msgstr "??????????????????????"
 
 #: src/i_basic.c:159 src/i_callbacks.c:735 src/i_callbacks.c:754
-#, fuzzy
 msgid "Multiple Copy"
-msgstr "?????????????????????????? ??????????????????"
+msgstr "?????????????????????????? ??????????????????????"
 
 #: src/i_basic.c:162
-#, fuzzy
 msgid "Multiple Copy Mode"
-msgstr "?????????? ??????????????????????"
+msgstr "?????????? ???????????????????????????? ??????????????????????"
 
 #: src/i_basic.c:197
 msgid "Snap Off"
@@ -765,12 +756,12 @@
 
 #: src/i_callbacks.c:150
 msgid "Documentation commands not supported under MinGW.\n"
-msgstr ""
+msgstr "?????????????? ???????????????????????? ???? ???????????????????????????? ?? MinGW.\n"
 
 #: src/i_callbacks.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "New page created [%s]\n"
-msgstr "?????????? ???????????????? ?????????????? [%s]\n"
+msgstr "?????????????? ?????????? ???????????????? [%s]\n"
 
 #: src/i_callbacks.c:264
 msgid "New Window created\n"
@@ -795,9 +786,8 @@
 msgstr "???????????? ?????? ?????????????? ????????????????????"
 
 #: src/i_callbacks.c:408
-#, fuzzy
 msgid "Failed to Save All"
-msgstr "?????????????????? ??????"
+msgstr "???????????? ?????? ???????????????????? ??????????"
 
 #: src/i_callbacks.c:410
 msgid "Saved All"
@@ -904,9 +894,8 @@
 msgstr "???????????????? [%s]\n"
 
 #: src/i_callbacks.c:1909
-#, fuzzy
 msgid "Really revert page?"
-msgstr "???????????????????? ????????????????"
+msgstr "?????????????????????????? ???????????????????? ?????????????????"
 
 #: src/i_callbacks.c:1995 src/i_callbacks.c:2015 src/i_callbacks.c:2041
 #, c-format
@@ -1199,36 +1188,36 @@
 msgstr "????????????: ???????????? NULL ?? o_rotate_90!\n"
 
 #: src/o_misc.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "Component [%s] has been embedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? [%s] ?????? ?????? ??????????????\n"
 
 #: src/o_misc.c:600
-#, fuzzy, c-format
+#, c-format
 msgid "Picture [%s] has been embedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????????? [%s] ?????? ?????? ????????????????\n"
 
 #: src/o_misc.c:632
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
 "embedded\n"
-msgstr "???????????????????? ?????????? ?????????????????? [%s], ???? ?????????? ?????????????? ????????????????????.\n"
+msgstr "???????????????????? ?????????? ?????????????????? [%s], ???? ?????????? ?????????????? ????????????????????. ?????????????????? ?????? ?????? ??????????????\n"
 
 #: src/o_misc.c:643 src/o_misc.c:1608
 #, c-format
 msgid "More than one component found with name [%s]\n"
-msgstr ""
+msgstr "?????????????? ?????????? ???????????? ???????????????????? ?? ???????????? [%s]\n"
 
 #: src/o_misc.c:651
-#, fuzzy, c-format
+#, c-format
 msgid "Component [%s] has been successfully unembedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? [%s] ?????????????? ????????????????\n"
 
 #: src/o_misc.c:666
-#, fuzzy, c-format
+#, c-format
 msgid "Picture [%s] has been unembedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????????? [%s] ??????????????????\n"
 
 #: src/o_misc.c:702
 #, c-format
@@ -1245,32 +1234,31 @@
 
 #: src/o_misc.c:1603
 msgid "Could not unembedded component, could not find appropriate .sym file\n"
-msgstr ""
+msgstr "???????????????????? ?????????????????? ??????????????????, ???????????????????? ?????????? ?????????????????????????????? .sym-????????\n"
 
 #: src/o_misc.c:1604
-#, fuzzy
 msgid "Component still embedded and not updated\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? ?????? ?????? ?????????????? ?? ???? ????????????????\n"
 
 #: src/o_misc.c:1745
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
-msgstr ""
+msgstr "o_autosave_backups: ???????????????????? ???????????????? ?????????????? ?????? ?????????? ?????? %s."
 
 #: src/o_misc.c:1789
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ?????????? ????????????-???????????? ?????? ???????????????????? ?????????????????? ?????????? ?????????? [%s]\n"
 
 #: src/o_misc.c:1807
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ?????????? ???????????? ???????????? ?????? ???????????????????? ?????????? [%s]\n"
 
 #: src/o_misc.c:1812
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT save backup file [%s]\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ?????????????????? ?????????????????? ???????? [%s]\n"
 
 #: src/o_move.c:220
 #, c-format
@@ -1280,7 +1268,7 @@
 #: src/o_move.c:334
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
-msgstr ""
+msgstr "????! ?????????????? ?????????? ??????-????????, ???? ???????????? ???? ????????????????????!\n"
 
 #: src/o_move.c:355
 #, c-format
@@ -1304,16 +1292,16 @@
 
 #: src/o_picture.c:174 src/o_picture.c:838
 msgid "Please select a picture file."
-msgstr ""
+msgstr "????????????????????, ???????????????? ???????? ??????????????????????."
 
 #: src/o_picture.c:241 src/o_picture.c:750
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load picture: %s"
-msgstr "???????????????????? ?????????????????? ?????????????????? scm-???????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ??????????????????????: [%s]"
 
 #: src/o_picture.c:260
 msgid "Picture"
-msgstr ""
+msgstr "??????????????????????"
 
 #: src/o_picture.c:776 src/x_attribedit.c:153
 #, c-format
@@ -1342,9 +1330,9 @@
 msgstr "???? ?????????????????? ?????????????? ???????? ????????-???? ??????????????????????????????!\n"
 
 #: src/o_text.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "Tried to render text with an invalid angle: %d\n"
-msgstr "?????????????? ?????????????????? ?????????????????? ??????????: %d\n"
+msgstr "?????????????? ?????????????????? ???????????? ?? ???????????????? ??????????: %d\n"
 
 #: src/o_undo.c:320
 msgid "Undo/Redo disabled in rc file\n"
@@ -1364,11 +1352,21 @@
 "  -h            Help; this message\n"
 "\n"
 msgstr ""
+"??????????????????????????: %s [??????????] ????????_??????????1 ... ????????_??????????N\n"
+"  -q            ???????????? ???? ????????????????\n"
+"  -v            ???????????????? ?????????? ???????????????????? ??????????????????\n"
+"  -r ????????       ???????????????????????? ?? ???????????????? ?????????????????????????????????? ???????? ????????\n"
+"  -s ????????       ?????? ?????????? ?????????????? (guile)\n"
+"  -o ????????       ?????? ?????????????????? ?????????? (?????? ????????????)\n"
+"  -p            ?????????????????????????? ?????????????????????? ????????\n"
+"  -t            ???????????????? ?????????????????? ????????????????????\n"
+"  -h            ????????????; ?????? ??????????????????\n"
+"\n"
 
 #: src/x_attribedit.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Got invalid show option; defaulting to show both\n"
-msgstr "???????????????? ???????????????? ?????????? ??????????????????, ???????????????????????? ??????????"
+msgstr "???????????????? ???????????????? ?????????? ??????????????????, ?????????????????????????????? ???????????????? ??????????\n"
 
 #: src/x_attribedit.c:363
 msgid "Single Attribute Editor"
@@ -1498,9 +1496,8 @@
 msgstr "?????????????? ????????????"
 
 #: src/x_dialog.c:607
-#, fuzzy
 msgid "Edit Text Color"
-msgstr "???????????? ????????????"
+msgstr "???????????? ?????????? ????????????"
 
 #: src/x_dialog.c:619
 msgid "Edit Text Size"
@@ -1537,7 +1534,7 @@
 #: src/x_dialog.c:1498 src/x_dialog.c:1499 src/x_dialog.c:1500
 #: src/x_dialog.c:1501 src/x_dialog.c:1502 src/x_dialog.c:1510
 msgid "*unchanged*"
-msgstr ""
+msgstr "*????????????????????*"
 
 #: src/x_dialog.c:958
 msgid "Edit Line Width & Type"
@@ -1564,9 +1561,8 @@
 msgstr "??????????????"
 
 #: src/x_dialog.c:1103
-#, fuzzy
 msgid "Filled"
-msgstr "????????"
+msgstr "??????????????????"
 
 #: src/x_dialog.c:1104
 msgid "Mesh"
@@ -1597,14 +1593,13 @@
 msgstr "????????????2"
 
 #: src/x_dialog.c:1637
-#, fuzzy
 msgid ""
 "There are unsaved schematics!\n"
 "\n"
 "Are you sure?\n"
 "OK will discard ALL changes!"
 msgstr ""
-"?????????? ???? ??????????????????!\n"
+"?????????? ???? ???????? ??????????????????!\n"
 "\n"
 "???? ???????????????\n"
 "???? ?????????????? ?????? ??????????????????!"
@@ -1656,13 +1651,12 @@
 
 #: src/x_dialog.c:2515
 msgid "gEDA : GPL Electronic Design Automation"
-msgstr ""
-"gEDA: ?????????????? ?????????????????????????????????????? ???????????????????????????? ?????????????????????? ???????? (GPL)"
+msgstr "gEDA: ?????????????? ?????????????????????????????????????? ???????????????????????????? ?????????????????????? ???????? (GPL)"
 
 #: src/x_dialog.c:2523
-#, fuzzy, c-format
+#, c-format
 msgid "gschem version %s%s"
-msgstr "???????????? gschem %s"
+msgstr "???????????? gschem %s%s"
 
 #: src/x_dialog.c:2531
 msgid ""
@@ -1701,12 +1695,11 @@
 #: src/x_dialog.c:3097
 #, c-format
 msgid "Ran out of space in the hotkey buffer...\n"
-msgstr ""
+msgstr "???????????????????? ???????????????????????? ???????????? ?????????????? ????????????...\n"
 
 #: src/x_dialog.c:3174
-#, fuzzy
 msgid "Function : keystroke(s)"
-msgstr "?????????????? : "
+msgstr "?????????????? : ???????????????????? ????????????"
 
 #: src/x_dialog.c:3519
 msgid "Generic String"
@@ -1747,86 +1740,76 @@
 #: src/x_dialog.c:4011
 #, c-format
 msgid "Warning: negative numbers not allowed in the autonumber_text dialog\n"
-msgstr ""
+msgstr "????????????????????????????: ?????????????????????????? ???????????????? ???? ?????????????????????? ?? ?????????????? autonumber_text\n"
 
 #: src/x_dialog.c:4095
 msgid "Autonumber text"
 msgstr "???????????????????????????? ??????????"
 
 #: src/x_dialog.c:4101
-#, fuzzy
 msgid "selection"
-msgstr "??????????????"
+msgstr "??????????"
 
 #: src/x_dialog.c:4110
-#, fuzzy
 msgid "search text"
-msgstr "???????????????? ??????????"
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4138
 msgid "search focus"
-msgstr ""
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4151
-#, fuzzy
 msgid "selected objects"
-msgstr "???????????? ???????????????????????????? ????????????!\n"
+msgstr "?????????????? ??????????????"
 
 #: src/x_dialog.c:4154
-#, fuzzy
 msgid "current sheet"
-msgstr "???????????????? ????????"
+msgstr "?????????????? ????????"
 
 #: src/x_dialog.c:4157
 msgid "hierarchical sheets"
-msgstr ""
+msgstr "???????????????? ????????????"
 
 #: src/x_dialog.c:4169
-#, fuzzy
 msgid "unnumbered"
-msgstr "???????????????????????????? ??????????"
+msgstr "???? ??????????????????????????"
 
 #: src/x_dialog.c:4173
-#, fuzzy
 msgid "all"
-msgstr "??????"
+msgstr "??????"
 
 #: src/x_dialog.c:4182
-#, fuzzy
 msgid "options"
-msgstr "??????????????????"
+msgstr "??????????"
 
 #: src/x_dialog.c:4189
-#, fuzzy
 msgid "start number"
-msgstr "???????????? ???????????? ??????????"
+msgstr "?????????????????? ??????????"
 
 #: src/x_dialog.c:4202
 msgid "sort order"
-msgstr ""
+msgstr "?????????????? ????????????????????"
 
 #: src/x_dialog.c:4214
-#, fuzzy
 msgid "file order"
-msgstr "?????????? ????????????????????"
+msgstr "?????????????? ????????????"
 
 #: src/x_dialog.c:4217
 msgid "top down"
-msgstr ""
+msgstr "???????? ??????"
 
 #: src/x_dialog.c:4220
-#, fuzzy
 msgid "left right"
-msgstr "?????????????? ????????????"
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4223
 msgid "diagonal"
-msgstr ""
+msgstr "????????????????????????"
 
 #: src/x_fileselect.c:300
-#, fuzzy, c-format
+#, c-format
 msgid "Agg, could not open directory: %s\n"
-msgstr "???????????????????? ?????????????? ??????????????: %s\n"
+msgstr "????, ???????????????????? ?????????????? ??????????????: %s\n"
 
 #: src/x_fileselect.c:327
 #, c-format
@@ -1937,33 +1920,28 @@
 msgstr "?????? ??????????"
 
 #: src/x_fileselect.c:2261
-#, fuzzy
 msgid "Schematics"
-msgstr "sch - ??????????"
+msgstr "??????????"
 
 #: src/x_fileselect.c:2264
-#, fuzzy
 msgid "Symbols"
-msgstr "sym - ??????????????"
+msgstr "??????????????"
 
 #: src/x_fileselect.c:2267
-#, fuzzy
 msgid "Schematics and symbols"
-msgstr "sym/sch - ?????????? ?? ??????????????"
+msgstr "?????????? ?? ??????????????"
 
 #: src/x_fileselect.c:2271
-#, fuzzy
 msgid "All files"
-msgstr "* - ?????? ??????????"
+msgstr "?????? ??????????"
 
 #: src/x_fileselect.c:2343
-#, fuzzy
 msgid "Discard changes"
-msgstr "???????????????????? ???????????????????"
+msgstr "???????????????????? ??????????????????"
 
 #: src/x_image.c:291
 msgid "x_image_lowlevel: Unable to write PNG file.\n"
-msgstr ""
+msgstr "x_image_lowlevel: ???????????????????? ???????????????? PNG-????????.\n"
 
 #: src/x_image.c:295 src/x_image.c:326
 #, c-format
@@ -1977,7 +1955,7 @@
 
 #: src/x_image.c:307
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
-msgstr ""
+msgstr "x_image_lowlevel: ???????????????????? ???????????????? ?????????? ?????????????????????? ???? ???????? gschem.\n"
 
 #: src/x_image.c:415
 msgid "Write Image..."
@@ -2000,105 +1978,88 @@
 msgstr "????????????"
 
 #: src/x_menus.c:35
-#, fuzzy
 msgid "/Add Net"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ????????????????????"
 
 #: src/x_menus.c:36
-#, fuzzy
 msgid "/Add Attribute..."
-msgstr "????????????????/???????????????????????????? ??????????????"
+msgstr "/???????????????? ??????????????"
 
 #: src/x_menus.c:37
-#, fuzzy
 msgid "/Add Component..."
-msgstr "??????????????????..."
+msgstr "/???????????????? ??????????????????..."
 
 #: src/x_menus.c:38
-#, fuzzy
 msgid "/Add Bus"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ????????"
 
 #: src/x_menus.c:39
-#, fuzzy
 msgid "/Add Text"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ??????????"
 
 #: src/x_menus.c:41
-#, fuzzy
 msgid "/Zoom In"
-msgstr "??????????????????"
+msgstr "/??????????????????"
 
 #: src/x_menus.c:42
-#, fuzzy
 msgid "/Zoom Out"
-msgstr "??????????????????"
+msgstr "/??????????????????"
 
 #: src/x_menus.c:43
-#, fuzzy
 msgid "/Zoom Box"
-msgstr "?????????????? ?????? ??????????????????????????????"
+msgstr "/?????????????? ?????? ??????????????????????????????"
 
 #: src/x_menus.c:44
-#, fuzzy
 msgid "/Zoom Extents"
-msgstr "?????????????? ???? ??????????"
+msgstr "/?????????????? ???? ??????????"
 
 #: src/x_menus.c:46
-#, fuzzy
 msgid "/Select"
-msgstr "??????????????"
+msgstr "/??????????????"
 
 #: src/x_menus.c:47
-#, fuzzy
 msgid "/Edit..."
-msgstr "????????????..."
+msgstr "/????????????..."
 
 #: src/x_menus.c:48
-#, fuzzy
 msgid "/Copy"
-msgstr "????????????????????"
+msgstr "/????????????????????"
 
 #: src/x_menus.c:49
-#, fuzzy
 msgid "/Move"
-msgstr "??????????????????????"
+msgstr "/??????????????????????"
 
 #: src/x_menus.c:50
-#, fuzzy
 msgid "/Delete"
-msgstr "??????????????"
+msgstr "/??????????????"
 
 #: src/x_menus.c:53
-#, fuzzy
 msgid "/Down Schematic"
-msgstr "???????????? ??????????"
+msgstr "/???????????? ??????????"
 
 #: src/x_menus.c:54
-#, fuzzy
 msgid "/Down Symbol"
-msgstr "???????????? ??????????????"
+msgstr "/???????????? ??????????????"
 
 #: src/x_menus.c:55
-#, fuzzy
 msgid "/Up"
-msgstr "????????????"
+msgstr "/????????????"
 
 #: src/x_menus.c:329
 msgid "Tried to set the sensitivity on a non-existent menu item\n"
-msgstr ""
+msgstr "?????????????? ?????????????????? ???????????????????????????????? ?????? ?????????????????????????????? ???????????? ????????\n"
 
 #: src/x_menus.c:353
 msgid "Popup_menu_item_factory doesn't exist!\n"
-msgstr ""
+msgstr "Popup_menu_item_factory ???? ????????????????????!\n"
 
 #: src/x_menus.c:366
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
-msgstr ""
+msgstr "?????????????? ?????????????????? ???????????????????????????????? ?????? ?????????????????????????????? ???????????????????????????? menu_item\n"
 
 #: src/x_multiattrib.c:625
 msgid "Attributes with empty name are not allowed. Please set a name."
-msgstr ""
+msgstr "???????????????? ?? ???????????? ???????????? ??????????????????????. ????????????????????, ???????????????????? ??????."
 
 #: src/x_multiattrib.c:1131
 msgid "Show Value only"
@@ -2110,7 +2071,7 @@
 
 #: src/x_multiattrib.c:1159
 msgid "Duplicate"
-msgstr ""
+msgstr "??????????????????????"
 
 #: src/x_multiattrib.c:1276
 msgid "Edit Attributes"
@@ -2137,9 +2098,8 @@
 msgstr ""
 
 #: src/x_multiattrib.c:1464
-#, fuzzy
 msgid "Add Attribute"
-msgstr "????????????????/???????????????????????????? ??????????????"
+msgstr "???????????????? ??????????????"
 
 #: src/x_pagesel.c:267
 msgid "Discard Page"
@@ -2150,30 +2110,28 @@
 msgstr "???????????????? ??????????????"
 
 #: src/x_pagesel.c:448
-#, fuzzy
 msgid "Changed"
-msgstr "????????????????"
+msgstr "????????????????"
 
 #: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
-msgstr ""
+msgstr "???????????????? ???????????? ?????????????? ???? ?????????? ?????????? ?????? ???????????????????????????? ??????????..."
 
 #: src/x_preview.c:127
 msgid "x_preview_update_gtk24: Can't get pixbuf from preview struct.\n"
-msgstr ""
+msgstr "x_preview_update_gtk24: ???????????????????? ???????????????? ?????????? ?????????????????????? ???? ???????????????????? ??????????????????.\n"
 
 #: src/x_print.c:91
-#, fuzzy
 msgid "Save PostScript As..."
-msgstr "?????????????????? ???????????????? ??????..."
+msgstr "?????????????????? PostScript ??????..."
 
 #: src/x_print.c:188
 msgid "Extents with margins"
-msgstr ""
+msgstr "?????????????????? ?? ????????????"
 
 #: src/x_print.c:191
 msgid "Extents no margins"
-msgstr ""
+msgstr "?????????????????? ?????? ??????????"
 
 #: src/x_print.c:195
 msgid "Current Window"
@@ -2189,7 +2147,7 @@
 
 #: src/x_print.c:283
 msgid "Settings"
-msgstr ""
+msgstr "??????????????????"
 
 #: src/x_print.c:295
 msgid "Output paper size"
@@ -2204,17 +2162,16 @@
 msgstr "????????????????????"
 
 #: src/x_print.c:329
-#, fuzzy
 msgid "Destination"
-msgstr "????????????????????????"
+msgstr "????????????????????"
 
 #: src/x_print.c:368
 msgid "Command"
-msgstr ""
+msgstr "??????????????"
 
 #: src/x_print.c:690
 msgid "No print destination specified\n"
-msgstr ""
+msgstr "???? ?????????????? ???????????????????? ?????? ????????????\n"
 
 #: src/x_print.c:697
 #, c-format
@@ -2351,175 +2308,54 @@
 msgid "Pan/Cancel"
 msgstr "??????????/????????????"
 
-#~ msgid "OK"
-#~ msgstr "????"
-
-#~ msgid "Cancel"
-#~ msgstr "????????????"
-
-#~ msgid "Apply"
-#~ msgstr "??????????????????"
-
-#~ msgid "Find"
-#~ msgstr "??????????"
-
-#~ msgid "Done"
-#~ msgstr "????????????"
-
-#~ msgid "SaveAs"
-#~ msgstr "?????????????????? ??????"
+msgid "Image"
+msgstr "??????????????????????"
 
-#~ msgid "Write"
-#~ msgstr "????????????????"
-
-#~ msgid "Print"
-#~ msgstr "????????????"
-
-#~ msgid "Edit mode"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Move mode"
-#~ msgstr "?????????? ??????????????????????"
-
-#~ msgid "Copy mode"
-#~ msgstr "?????????? ??????????????????????"
-
-#~ msgid "Delete mode"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Rotate mode"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Mirror mode"
-#~ msgstr "?????????? ????????????????????????????"
-
-#, fuzzy
-#~ msgid "Invalid number of lines [%d] passed to output-vector-threshold\n"
-#~ msgstr "???????????????? ???????????????????? ?????????????? [%d] ?????? ?????????????????? undo-levels\n"
-
-#~ msgid "Comps"
-#~ msgstr "????????????????????"
-
-#~ msgid "Both"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "Image"
-#~ msgstr "????????????????"
-
-#~ msgid "Deattach"
-#~ msgstr "????????????????"
-
-#~ msgid "%s requires a string as a parameter\n"
-#~ msgstr "%s ?????????????? ???????????? ?? ???????????????? ??????????????????\n"
-
-#~ msgid "Invalid parameters to paper-sizes\n"
-#~ msgstr "???????????????? ?????????????????? ?? paper-sizes\n"
-
-#~ msgid "Cannot obtain the current directory!\n"
-#~ msgstr "???????????????????? ?????????? ?? ?????????????? ??????????????!\n"
-
-#~ msgid "Cannot get cwd!\n"
-#~ msgstr "???????????????????? ???????????????? ?????? ???????????????? ????????????????!\n"
-
-#~ msgid "ERROR: NULL object in o_embed!\n"
-#~ msgstr "????????????: ???????????? NULL ?? o_embed!\n"
-
-#~ msgid "Warning: two components with same refdes: %d\n"
-#~ msgstr "????????????????????????????: ?????? ???????????????????? ?? ???????????????????? refdes: %d\n"
-
-#~ msgid "Got an unexpected NULL in o_update_component\n"
-#~ msgstr "?????????????????????? NULL ?? o_update_component\n"
-
-#~ msgid "Invalid space specified, setting to 100\n"
-#~ msgstr "?????????????????? ???????????????? ????????????, ?????????????????????????????? ?? 100\n"
-
-#~ msgid "Invalid length specified, setting to 100\n"
-#~ msgstr "???????????????????? ???????????????? ??????????, ?????????????????????????????? ?? 100\n"
-
-#~ msgid "Autonumber text starting with:"
-#~ msgstr "???????????????????????????? ??????????, ???????????????????????? ??:"
-
-#~ msgid "Yes"
-#~ msgstr "????"
-
-#~ msgid "No"
-#~ msgstr "??????"
-
-#~ msgid "Add/Edit"
-#~ msgstr "????????????????/??????????????????????????"
-
-#~ msgid "Clear"
-#~ msgstr "????????????????"
-
-#~ msgid "Open Page"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Update Manager"
-#~ msgstr "???????????????? ????????????????"
-
-#~ msgid "Close Manager"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Read system-gschemrc file [%s]\n"
-#~ msgstr "???????????? ?????????? system-gschemrc [%s]\n"
-
-#, fuzzy
-#~ msgid "Did not find required system-gschemrc file [%s]\n"
-#~ msgstr "???????? system-gschemrc ???? ?????? ???????????? [%s]\n"
-
-#~ msgid "Read ~/.gEDA/gschemrc file [%s]\n"
-#~ msgstr "???????????? ?????????? ~/.gEDA/gschemrc [%s]\n"
-
-#, fuzzy
-#~ msgid "Did not find optional ~/.gEDA/gschemrc file [%s]\n"
-#~ msgstr "???????? ~/.gEDA/gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "Comps"
+msgstr "????????????????????"
 
-#~ msgid "Read local gschemrc file [%s]\n"
-#~ msgstr "???????????? ???????????????????? ?????????? gschemrc [%s]\n"
+msgid "Both"
+msgstr "??????"
 
-#, fuzzy
-#~ msgid "Did not find optional local gschemrc file [%s]\n"
-#~ msgstr "?????????????????? ???????? gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "OK"
+msgstr "????"
 
-#~ msgid "Read specified rc file [%s]\n"
-#~ msgstr "???????????? ???????????????????????? rc-?????????? [%s]\n"
+msgid "Apply"
+msgstr "??????????????????"
 
-#~ msgid "Did not find specified gschemrc file [%s]\n"
-#~ msgstr "?????????????????? ???????? gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "Cancel"
+msgstr "????????????"
 
-#~ msgid "Could not find any gschemrc file!\n"
-#~ msgstr "???????????????????? ?????????? ???? ???????????? ?????????? gschemrc!\n"
+msgid "Find"
+msgstr "??????????"
 
-#~ msgid "Could not find a gschemrc file\n"
-#~ msgstr "???????????????????? ?????????? ???????? gschemrc\n"
+msgid "Done"
+msgstr "????????????"
 
-#~ msgid "Invalid path [%s] passed to component-library\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? component-library\n"
+msgid "SaveAs"
+msgstr "?????????????????? ??????"
 
-#~ msgid "Invalid path [%s] passed to component-library-search\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? component-library-search\n"
+msgid "Write"
+msgstr "????????????????"
 
-#~ msgid "Invalid path [%s] passed to %s\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? %s\n"
+msgid "Print"
+msgstr "????????????"
 
-#~ msgid "Invalid path [%s] passed to source-library-search\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? source-library-search\n"
+msgid "Edit mode"
+msgstr "?????????? ????????????"
 
-#~ msgid "Invalid path [%s] passed to scheme-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? scheme-directory\n"
+msgid "Move mode"
+msgstr "?????????? ??????????????????????"
 
-#~ msgid "Invalid path [%s] passed to bitmap-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? bitmap-directory\n"
+msgid "Copy mode"
+msgstr "?????????? ??????????????????????"
 
-#~ msgid "Invalid path [%s] passed to font-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? font-directory\n"
+msgid "Delete mode"
+msgstr "?????????? ????????????????"
 
-#~ msgid "Ok"
-#~ msgstr "????"
+msgid "Rotate mode"
+msgstr "?????????? ????????????????"
 
-#~ msgid "Edit Component"
-#~ msgstr "?????????????????????????? ??????????????????"
+msgid "Mirror mode"
+msgstr "?????????? ????????????????????????????"
 
-#~ msgid "Limits"
-#~ msgstr "????????????????????????"


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/geda-gschem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-gschem.spec	10 Sep 2006 21:47:14 -0000	1.2
+++ geda-gschem.spec	12 Oct 2006 18:48:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             geda-gschem
 Version:          20060906
-Release:          2%{?dist}
+Release:          3%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
@@ -12,6 +12,9 @@
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
+# by Andy Shevchenko #206280
+Patch0:           geda-gschem-ru.po.diff
+
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
@@ -23,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b ru.po
 
 %build
 %{__cp} -p configure.ac configure.ac.gdgeda
@@ -130,11 +134,13 @@
 %{_datadir}/gEDA/gschem-lightbg
 %{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
-#%{_infodir}/gschemdoc.info*
 %{_mandir}/man1/gschem.*
-#%{_datadir}/gEDA/docs/man/gschem.html
+
 
 %Changelog
+* Fri Sep 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
+- patch for russian translation by Andy Shevchenko #206280
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
 - Rebuilt for FC-6 devel
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:48:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 12 Oct 2006 11:48:51 -0700
Subject: rpms/php-pear-Mail/FC-5 .cvsignore, 1.3, 1.4 php-pear-Mail.spec, 1.6,
	1.7 sources, 1.3, 1.4 xml2changelog, 1.1, 1.2
Message-ID: <200610121848.k9CImrmw001884@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1857

Modified Files:
	.cvsignore php-pear-Mail.spec sources xml2changelog 
Log Message:
	update to 1.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2006 14:07:55 -0000	1.3
+++ .cvsignore	12 Oct 2006 18:48:51 -0000	1.4
@@ -1 +1 @@
-Mail-1.1.13.tgz
+Mail-1.1.14.tgz


Index: php-pear-Mail.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/FC-5/php-pear-Mail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-Mail.spec	16 Sep 2006 14:07:55 -0000	1.6
+++ php-pear-Mail.spec	12 Oct 2006 18:48:51 -0000	1.7
@@ -2,7 +2,7 @@
 %define pear_name Mail
 
 Name:           php-pear-Mail
-Version:        1.1.13
+Version:        1.1.14
 Release:        1%{?dist}
 Summary:        Class that provides multiple interfaces for sending emails
 Summary(fr):    Une Classe fournissant des interfaces pour envoyer des emails
@@ -50,8 +50,8 @@
 # Empty build section, most likely nothing required.
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Clean up unnecessary files
@@ -83,6 +83,9 @@
 %{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Thu Oct 12 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.14-1
+- update to 1.1.14
+
 * Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.13-1
 - regenerate SPEC with pear make-rpm-spec
 - remove PEAR from sumnary


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2006 14:07:55 -0000	1.3
+++ sources	12 Oct 2006 18:48:51 -0000	1.4
@@ -1 +1 @@
-087f63a04d95670fadc9e39948b09f8c  Mail-1.1.13.tgz
+e50da58b6b787b3903ce4d07dc791bb2  Mail-1.1.14.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/FC-5/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	16 Sep 2006 14:07:55 -0000	1.1
+++ xml2changelog	12 Oct 2006 18:48:51 -0000	1.2
@@ -1,13 +1,28 @@
 <?php
 $prog=array_shift($_SERVER['argv']);
-if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml\n");
+if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
 $file=array_shift($_SERVER['argv']);
 
 ($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
-printf("* Version %s (%s) - %s\n\n%s\n\n",
-	$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
-foreach($xml->changelog->release as $rel)
+if ($xml['version'] >= "2"){ // Package.xml V 2.0
+	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);
+
+	foreach($xml->changelog->release as $rel)
+		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",
-		$rel->version, $rel->state, $rel->date, $rel->notes);
+		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+
+	foreach($xml->changelog->release as $rel)
+		printf("* Version %s (%s) - %s\n\n%s\n\n",
+			$rel->version, $rel->state, $rel->date, $rel->notes);
+}
 ?>



From fedora-extras-commits at redhat.com  Thu Oct 12 19:08:56 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Thu, 12 Oct 2006 12:08:56 -0700
Subject: rpms/smeg/devel dead.package,NONE,1.1
Message-ID: <200610121908.k9CJ8xU5005247@cvs-int.fedora.redhat.com>

Author: jpmahowa

Update of /cvs/extras/rpms/smeg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5231

Added Files:
	dead.package 
Log Message:
Renamed to alacarte


--- NEW FILE dead.package ---



From fedora-extras-commits at redhat.com  Thu Oct 12 19:11:15 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 12 Oct 2006 12:11:15 -0700
Subject: rpms/torque/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 torque.spec,
	1.12, 1.13 torque-2.1.0p0-mom_sync_jobs-fixes.patch, 1.1,
	NONE torque-2.1.0p0-sched-offbyone.patch, 1.1,
	NONE torque-2.1.2-pam-getpwnam.patch, 1.1, NONE
Message-ID: <200610121911.k9CJBHVp005304@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5283

Modified Files:
	.cvsignore sources torque.spec 
Removed Files:
	torque-2.1.0p0-mom_sync_jobs-fixes.patch 
	torque-2.1.0p0-sched-offbyone.patch 
	torque-2.1.2-pam-getpwnam.patch 
Log Message:
update to 2.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2006 23:22:12 -0000	1.7
+++ .cvsignore	12 Oct 2006 19:11:15 -0000	1.8
@@ -1 +1 @@
-torque-2.1.2.tar.gz
+torque-2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2006 23:22:12 -0000	1.7
+++ sources	12 Oct 2006 19:11:15 -0000	1.8
@@ -1 +1 @@
-f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
+0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- torque.spec	27 Aug 2006 22:11:44 -0000	1.12
+++ torque.spec	12 Oct 2006 19:11:15 -0000	1.13
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.2
+%define version 2.1.3
 #%%define snap 200604251602
-%define release 3
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -92,7 +92,6 @@
 Source5: xpbsmon.png
 Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.2-pam-getpwnam.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -122,7 +121,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
@@ -389,7 +387,7 @@
 %{_bindir}/pbs-config
 
 %package pam
-Summary: PAM module for PBS MOM nodes.
+Summary: PAM module for TORQUE MOM nodes
 Group: System Environment/Base
 
 %description pam
@@ -403,6 +401,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
+- bump to 2.1.3
+
 * Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 2.1.2-3
 - FC6 mass rebuild
 


--- torque-2.1.0p0-mom_sync_jobs-fixes.patch DELETED ---


--- torque-2.1.0p0-sched-offbyone.patch DELETED ---


--- torque-2.1.2-pam-getpwnam.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 12 19:43:29 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 12:43:29 -0700
Subject: rpms/nsd/devel .cvsignore, 1.4, 1.5 nsd.init, 1.3, 1.4 nsd.spec,
	1.13, 1.14 sources, 1.4, 1.5
Message-ID: <200610121943.k9CJhVjC005558@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5530

Modified Files:
	.cvsignore nsd.init nsd.spec sources 
Log Message:
* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
- Upgraded to 2.3.6
- Removed obsolete workaround in nsd.init
- Fixed spec file so daemon gets properly restarted on upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Jun 2006 23:29:56 -0000	1.4
+++ .cvsignore	12 Oct 2006 19:43:29 -0000	1.5
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.init	26 Jun 2006 23:36:14 -0000	1.3
+++ nsd.init	12 Oct 2006 19:43:29 -0000	1.4
@@ -26,11 +26,12 @@
 #ZONEC_VERBOSE=-v
 OTHER_NSD_OPTS=""
 
+#fixed in 2.3.6
 #work around for bug in nsd-2.3.x when no ipv6 is available
-if [ ! -d /proc/sys/net/ipv6/ ]
-then
-        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
-fi
+#if [ ! -d /proc/sys/net/ipv6/ ]
+#then
+#        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
+#fi
 
 # Source function library.
 . /etc/init.d/functions


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nsd.spec	12 Sep 2006 00:00:18 -0000	1.13
+++ nsd.spec	12 Oct 2006 19:43:29 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
-Release: 4%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -55,9 +55,6 @@
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -66,16 +63,22 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1
+  echo " preun "
+        /sbin/service %{name} stop 
         /sbin/chkconfig --del %{name} 
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-  /sbin/service %{name} condrestart 2>&1 >/dev/null
+  /sbin/service %{name} condrestart 
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Removed obsolete workaround in nsd.init
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Sep 11 2006 Paul Wouters <paul at xelerance.com> 2.3.5-4
 - Rebuild requested for PT_GNU_HASH support from gcc
 - Removed dbaccess.c from doc section


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jun 2006 23:27:34 -0000	1.4
+++ sources	12 Oct 2006 19:43:29 -0000	1.5
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 19:43:52 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Thu, 12 Oct 2006 12:43:52 -0700
Subject: rpms/musicbox import.log,1.3,1.4
Message-ID: <200610121944.k9CJiOuP005653@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/musicbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5610

Modified Files:
	import.log 
Log Message:
auto-import musicbox-0.2.3-5 on branch devel from musicbox-0.2.3-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/musicbox/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	28 Aug 2006 18:50:21 -0000	1.3
+++ import.log	12 Oct 2006 19:43:52 -0000	1.4
@@ -1,2 +1,3 @@
 musicbox-0_2_3-3_fc6:HEAD:musicbox-0.2.3-3.fc6.src.rpm:1148242931
 musicbox-0_2_3-4_fc6:HEAD:musicbox-0.2.3-4.fc6.src.rpm:1156791042
+musicbox-0_2_3-5:HEAD:musicbox-0.2.3-5.src.rpm:1160682228



From fedora-extras-commits at redhat.com  Thu Oct 12 19:43:53 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Thu, 12 Oct 2006 12:43:53 -0700
Subject: rpms/musicbox/devel musicbox.spec,1.2,1.3
Message-ID: <200610121944.k9CJiP60005656@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/musicbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5610/devel

Modified Files:
	musicbox.spec 
Log Message:
auto-import musicbox-0.2.3-5 on branch devel from musicbox-0.2.3-5.src.rpm


Index: musicbox.spec
===================================================================
RCS file: /cvs/extras/rpms/musicbox/devel/musicbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- musicbox.spec	28 Aug 2006 18:50:22 -0000	1.2
+++ musicbox.spec	12 Oct 2006 19:43:53 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           musicbox
 Version:	0.2.3        
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A simple one-file-at-a-time audio tag editor
 
 Group:          Applications/Multimedia
 License:        GPL
-URL:            http://subpop.net/?q=node/102
+URL:            http://link.stikipad.com/wiki/show/Musicbox
 Source0:        http://superb-east.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,6 +47,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 0.2.3-5
+- Fix URL and bump release
+
 * Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 0.2.3-4
 - Bump release
 



From fedora-extras-commits at redhat.com  Thu Oct 12 19:50:11 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 12 Oct 2006 12:50:11 -0700
Subject: rpms/torque/devel torque.spec,1.13,1.14
Message-ID: <200610121950.k9CJoDsT005793@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5776

Modified Files:
	torque.spec 
Log Message:
* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
- missing BR ncurses-devel and readline-devel



Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- torque.spec	12 Oct 2006 19:11:15 -0000	1.13
+++ torque.spec	12 Oct 2006 19:50:10 -0000	1.14
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.3
 #%%define snap 200604251602
-%define release 1
+%define release 2
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -97,7 +97,7 @@
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel, xauth
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -401,6 +401,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
+- missing BR ncurses-devel and readline-devel
+
 * Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
 - bump to 2.1.3
 



From fedora-extras-commits at redhat.com  Thu Oct 12 20:07:05 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 12 Oct 2006 13:07:05 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 torque.spec,
	1.11, 1.12 torque-2.1.0p0-mom_sync_jobs-fixes.patch, 1.1,
	NONE torque-2.1.0p0-sched-offbyone.patch, 1.1,
	NONE torque-2.1.2-pam-getpwnam.patch, 1.1, NONE
Message-ID: <200610122007.k9CK77kH008840@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8819

Modified Files:
	.cvsignore sources torque.spec 
Removed Files:
	torque-2.1.0p0-mom_sync_jobs-fixes.patch 
	torque-2.1.0p0-sched-offbyone.patch 
	torque-2.1.2-pam-getpwnam.patch 
Log Message:
bump to 2.1.3 and missing BR ncurses-devel and readline-devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2006 23:40:13 -0000	1.7
+++ .cvsignore	12 Oct 2006 20:07:05 -0000	1.8
@@ -1 +1 @@
-torque-2.1.2.tar.gz
+torque-2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2006 23:40:13 -0000	1.7
+++ sources	12 Oct 2006 20:07:05 -0000	1.8
@@ -1 +1 @@
-f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
+0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- torque.spec	3 Aug 2006 05:51:13 -0000	1.11
+++ torque.spec	12 Oct 2006 20:07:05 -0000	1.12
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.2
+%define version 2.1.3
 #%%define snap 200604251602
 %define release 2
 
@@ -92,13 +92,12 @@
 Source5: xpbsmon.png
 Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.2-pam-getpwnam.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -122,7 +121,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
@@ -389,7 +387,7 @@
 %{_bindir}/pbs-config
 
 %package pam
-Summary: PAM module for PBS MOM nodes.
+Summary: PAM module for TORQUE MOM nodes
 Group: System Environment/Base
 
 %description pam
@@ -403,6 +401,15 @@
 
 
 %changelog
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
+- missing BR ncurses-devel and readline-devel
+
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
+- bump to 2.1.3
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 2.1.2-3
+- FC6 mass rebuild
+
 * Wed Aug  2 2006 Garrick Staples <garrick at usc.edu> 2.1.2-2
 - fix incorrect _pam_getpwnam_r usage in pam module
 


--- torque-2.1.0p0-mom_sync_jobs-fixes.patch DELETED ---


--- torque-2.1.0p0-sched-offbyone.patch DELETED ---


--- torque-2.1.2-pam-getpwnam.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 12 20:28:45 2006
From: fedora-extras-commits at redhat.com (Frank Büttner (frankb))
Date: Thu, 12 Oct 2006 13:28:45 -0700
Subject: rpms/qt4-qsa/devel qsa-1.2.1-QT_INSTALL.patch, NONE,
	1.1 qt4-qsa.spec, 1.7, 1.8
Message-ID: <200610122028.k9CKSlxd009191@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9171

Modified Files:
	qt4-qsa.spec 
Added Files:
	qsa-1.2.1-QT_INSTALL.patch 
Log Message:
fix bug 210544


qsa-1.2.1-QT_INSTALL.patch:

--- NEW FILE qsa-1.2.1-QT_INSTALL.patch ---
--- qsa-x11-opensource-1.2.1/configure2/configutils.cpp.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configutils.cpp	2006-08-07 12:23:12.000000000 -0500
@@ -178,9 +178,13 @@
 
 void copyQSAHeaders()
 {
+    QString *qtData = 0;
+    QString *qtHeaders = 0;
+    qtData = new QString(QT_INSTALL_DATA);
+    qtHeaders = new QString(QT_INSTALL_HEADERS);
     // install qmake feature file
-    mkDir(*qtDir + QLatin1String("mkspecs/features"));
-    copy(QLatin1String("src/qsa/qsa.prf"), *qtDir + QLatin1String("mkspecs/features/qsa.prf"));
+    mkDir(*qtData + QLatin1String("/mkspecs/features"));
+    copy(QLatin1String("src/qsa/qsa.prf"), *qtData + QLatin1String("/mkspecs/features/qsa.prf"));
 
     // install header files
     static const char *headers[11] = {
@@ -199,7 +203,7 @@
     for (int j = 0; j < int(sizeof(headers) / sizeof(char*)); ++j) {
         QString header = QLatin1String(headers[j]);
         QString target = header.mid(header.indexOf(QLatin1Char('/')) + 1);
-        symLink(QLatin1String("src/") + header, *qtDir + QLatin1String("include/") + target);
+        symLink(QLatin1String("src/") + header, *qtHeaders + QLatin1String("/") + target);
     }
 }
 
--- qsa-x11-opensource-1.2.1/configure2/configure2.pro.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configure2.pro	2006-08-07 12:11:53.000000000 -0500
@@ -3,6 +3,9 @@
 CONFIG += console
 INCLUDEPATH += .
 
+#QMAKE_CFLAGS   += -DQT_INSTALL_DATA=$$[QT_INSTALL_DATA] -DQT_INSTALL_HEADERS=$$[QT_INSTALL_HEADERS] -DQT_INSTALL_PREFIX=$$[QT_INSTALL_PREFIX]
+QMAKE_CXXFLAGS += -DQT_INSTALL_DATA=\\\"$$[QT_INSTALL_DATA]\\\" -DQT_INSTALL_HEADERS=\\\"$$[QT_INSTALL_HEADERS]\\\" -DQT_INSTALL_PREFIX=\\\"$$[QT_INSTALL_PREFIX]\\\"
+
 # Input
 SOURCES += main.cpp configutils.cpp
 HEADERS += configutils.h
--- qsa-x11-opensource-1.2.1/configure.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure	2006-08-07 12:02:05.000000000 -0500
@@ -31,6 +31,12 @@
 
 if [ -z $QTDIR ]
 then
+  QTDIR=`qmake -query QT_INSTALL_PREFIX`
+  export QTDIR
+fi
+
+if [ -z $QTDIR ]
+then
     echo "Can't find Qt library. No QTDIR set."
     exit 1
 else
@@ -55,7 +61,7 @@
 # build 2nd stage configure tool
 echo "Building 2nd stage configure"
 cd configure2
-qmake && make > /dev/null
+qmake && make 
 if [ $? -gt 0 -o ! -x configure2 ]; then
     exit 1
 fi
--- qsa-x11-opensource-1.2.1/src/qsa/qsa.pro.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/src/qsa/qsa.pro	2006-08-07 11:32:49.000000000 -0500
@@ -5,12 +5,25 @@
 TARGET = qsa
 
 isEmpty(QSA_INSTALL_PREFIX) {
-  QSA_BUILD_PREFIX=$$(QTDIR)
+  QSA_BUILD_PREFIX=$$[QT_INSTALL_PREFIX]
+  DESTDIR=$$[QT_INSTALL_LIBS]
+  headers.path = $$[QT_INSTALL_HEADERS]
+  target.path = $$[QT_INSTALL_LIBS]
+  prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
+  documentation.path = $$[QT_INSTALL_DOCS]/html
 } else {
   QSA_BUILD_PREFIX=../..
+  DESTDIR  	= $$QSA_BUILD_PREFIX/lib
+  headers.path = $$QSA_INSTALL_PREFIX/include
+  win32 {
+    target.path = $$QSA_INSTALL_PREFIX/bin
+  } else {
+    target.path = $$QSA_INSTALL_PREFIX/lib
+  }
+  prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features
+  documentation.path = $$QSA_INSTALL_PREFIX/doc/html
 }
 
-DESTDIR         = $$QSA_BUILD_PREFIX/lib
 DLLDESTDIR      = $$QSA_BUILD_PREFIX/bin
 
 HEADERS		= \
@@ -65,7 +78,7 @@
 DEFINES += QT_INTERNAL_ICONVIEW
 DEFINES += QT_INTERNAL_TABLE
 
-LIBS += -L$${QT_INSTALL_PREFIX}/lib
+LIBS += -L$$[QT_INSTALL_LIBS]
 
 mac:QMAKE_LFLAGS_PREBIND    = -prebind -seg1addr 0xBC000000
 
@@ -81,19 +94,9 @@
 		qsinputdialogfactory.h \
 		qsscript.h
 
-!isEmpty(QSA_INSTALL_PREFIX) {
-  headers.path = $$QSA_INSTALL_PREFIX/include
-  win32 {
-    target.path = $$QSA_INSTALL_PREFIX/bin
-  } else {
-    target.path = $$QSA_INSTALL_PREFIX/lib
-  }
-  prf.files = qsa.prf
-  prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features
-  documentation.files = ../../doc/html/*
-  documentation.path = $$QSA_INSTALL_PREFIX/doc/html
-  INSTALLS += headers target prf documentation
-}
+prf.files = qsa.prf
+documentation.files = ../../doc/HTML/*
+INSTALLS += headers target prf documentation
 
 KERNELDIR = ../kernel
 !noeditor {


Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt4-qsa.spec	11 Sep 2006 08:06:14 -0000	1.7
+++ qt4-qsa.spec	12 Oct 2006 20:28:45 -0000	1.8
@@ -2,31 +2,24 @@
 Summary:	Qt Script for Applications
 Version:	1.2.1
 Release:	17%{?dist}
-BuildRequires:	qt4-devel => 4.2
+BuildRequires:	qt4-devel 
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
 License: 	GPL
 Group: 		Development/Libraries
 Source: 	ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz
 Patch0:		qsa-1.2.1-Qt4.2-preview.patch
+Patch1:		qsa-1.2.1-QT_INSTALL.patch
 Buildroot: 	%{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) 
-
-# fix the the broken include path
-%define qtinc %{qtdir}/include
-%ifarch x86_64
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64
-%else
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
-%endif
-
-#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS)
-#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
+%define qtdir  %(qmake-qt4 -query QT_INSTALL_PREFIX)
+%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA)
+%define qtinc  %(qmake-qt4 -query QT_INSTALL_HEADERS)
+%define qtlib  %(qmake-qt4 -query QT_INSTALL_LIBS)
 
 %package devel
 Summary:	Development and doc files for qsa 
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Group:		Development/Libraries
 
 %description
@@ -39,6 +32,7 @@
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -47,8 +41,7 @@
 export QTLIB=%{qtlib}
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
-./configure -release -prefix %{qtdir}
-#./configure -release 
+./configure -release 
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -70,12 +63,6 @@
 install -p -m 644 src/ide/qsworkbench.h $RPM_BUILD_ROOT%{qtinc}/
 install -p -m 644 src/qsa/qsutilfactory.h  $RPM_BUILD_ROOT%{qtinc}/
 
-%if "%{_lib}" != "lib"
-test -d $RPM_BUILD_ROOT%{qtdir}/lib && \
-mkdir -p $RPM_BUILD_ROOT%{qtlib} && \
-mv $RPM_BUILD_ROOT%{qtdir}/lib/* $RPM_BUILD_ROOT%{qtlib}/
-%endif 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -93,13 +80,13 @@
 %defattr(0644,root,root)   
 %{qtinc}/*
 %{qtlib}/libqsa.so
-%{qtdir}/mkspecs/features/qsa.prf
+%{qtdata}/mkspecs/features/qsa.prf
 %doc examples
 %doc doc/html
 
 %changelog 
-* Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
-- second rebuild for FC6
+* Thu Oct 12 2006 Frank B??ttner <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
+- fix for bug 210544
 
 * Mon Aug 07 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-16%{?dist}
 - fix build for EMT64



From fedora-extras-commits at redhat.com  Thu Oct 12 20:35:08 2006
From: fedora-extras-commits at redhat.com (Frank Büttner (frankb))
Date: Thu, 12 Oct 2006 13:35:08 -0700
Subject: rpms/qt4-qsa/devel qt4-qsa.spec,1.8,1.9
Message-ID: <200610122035.k9CKZAAu009287@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9270

Modified Files:
	qt4-qsa.spec 
Log Message:
now the right file



Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt4-qsa.spec	12 Oct 2006 20:28:45 -0000	1.8
+++ qt4-qsa.spec	12 Oct 2006 20:35:08 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	17%{?dist}
+Release:	18%{?dist}
 BuildRequires:	qt4-devel 
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
@@ -85,9 +85,12 @@
 %doc doc/html
 
 %changelog 
-* Thu Oct 12 2006 Frank B??ttner <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
+* Thu Oct 12 2006 Frank B??ttner <frank-buettner at gmx.net> - 1.2.1-18%{?dist}
 - fix for bug 210544
 
+* Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
+- second rebuild for FC6
+
 * Mon Aug 07 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-16%{?dist}
 - fix build for EMT64
 



From fedora-extras-commits at redhat.com  Thu Oct 12 21:02:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 12 Oct 2006 14:02:38 -0700
Subject: rpms/libtunepimp/devel .cvsignore, 1.6, 1.7 libtunepimp.spec, 1.20,
	1.21
Message-ID: <200610122103.k9CL3BSA012617@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12576

Modified Files:
	.cvsignore libtunepimp.spec 
Log Message:
* Mon Oct 09 2006 Alex Lancaster <alexl[AT]users.sf.net> 0.5.2-2
- build python-libtunepimp subpackage (#209961)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Oct 2006 16:29:30 -0000	1.6
+++ .cvsignore	12 Oct 2006 21:02:35 -0000	1.7
@@ -1,2 +1,2 @@
-libtunepimp-0.4.3.tar.gz
+clog
 libtunepimp-0.5.2.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libtunepimp.spec	2 Oct 2006 16:29:30 -0000	1.20
+++ libtunepimp.spec	12 Oct 2006 21:02:35 -0000	1.21
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -26,6 +26,8 @@
 BuildRequires: curl-devel
 BuildRequires: expat-devel
 
+BuildRequires: python-devel
+
 Obsoletes: libtunepimp-tools < %{version}-%{release}
 Provides:  libtunepimp-tools = %{version}-%{release}
 
@@ -50,6 +52,20 @@
 %description devel
 %{summary}.
 
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%package -n python-%{name}
+Summary: Python bindings for developing programs that will use %{name} 
+Group:   Development/Libraries
+License: GPL
+#define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+#if "%{?python_ver}" > "2"
+#Requires: python-abi = %{python_ver}
+#endif
+%description -n python-%{name}
+%{summary}.
+
 
 %prep
 %setup -q -n libtunepimp-%{version}
@@ -63,12 +79,20 @@
 
 make %{?_smp_mflags} PLUGIN_DIR=%{pkglibdir}/plugins
 
+pushd python
+%{__python} setup.py build 
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
 
+pushd python
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+popd
+
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -105,8 +129,16 @@
 %{_includedir}/*
 %{_libdir}/lib*.so
 
+%files -n python-%{name}
+%defattr(-,root,root,-)
+%doc python/examples/trm.py
+%{python_sitelib}/tunepimp/
+
 
 %changelog
+* Mon Oct 09 2006 Alex Lancaster <alexl[AT]users.sf.net> 0.5.2-2
+- build python-libtunepimp subpackage (#209961)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
 - 0.5.2
 



From fedora-extras-commits at redhat.com  Thu Oct 12 21:02:49 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 12 Oct 2006 14:02:49 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 torque.spec,
	1.9, 1.10 torque-2.1.0p0-mom_sync_jobs-fixes.patch, 1.1,
	NONE torque-2.1.0p0-sched-offbyone.patch, 1.1,
	NONE torque-2.1.2-pam-getpwnam.patch, 1.1, NONE
Message-ID: <200610122103.k9CL3LMa012623@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12597

Modified Files:
	.cvsignore sources torque.spec 
Removed Files:
	torque-2.1.0p0-mom_sync_jobs-fixes.patch 
	torque-2.1.0p0-sched-offbyone.patch 
	torque-2.1.2-pam-getpwnam.patch 
Log Message:
bump to 2.1.3 and missing BR ncurses-devel and readline-devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2006 23:41:01 -0000	1.7
+++ .cvsignore	12 Oct 2006 21:02:48 -0000	1.8
@@ -1 +1 @@
-torque-2.1.2.tar.gz
+torque-2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2006 23:41:01 -0000	1.7
+++ sources	12 Oct 2006 21:02:48 -0000	1.8
@@ -1 +1 @@
-f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
+0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- torque.spec	3 Aug 2006 05:51:43 -0000	1.9
+++ torque.spec	12 Oct 2006 21:02:48 -0000	1.10
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.2
+%define version 2.1.3
 #%%define snap 200604251602
 %define release 2
 
@@ -92,13 +92,12 @@
 Source5: xpbsmon.png
 Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.2-pam-getpwnam.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -122,7 +121,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
@@ -389,7 +387,7 @@
 %{_bindir}/pbs-config
 
 %package pam
-Summary: PAM module for PBS MOM nodes.
+Summary: PAM module for TORQUE MOM nodes
 Group: System Environment/Base
 
 %description pam
@@ -403,6 +401,15 @@
 
 
 %changelog
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
+- missing BR ncurses-devel and readline-devel
+
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
+- bump to 2.1.3
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 2.1.2-3
+- FC6 mass rebuild
+
 * Wed Aug  2 2006 Garrick Staples <garrick at usc.edu> 2.1.2-2
 - fix incorrect _pam_getpwnam_r usage in pam module
 


--- torque-2.1.0p0-mom_sync_jobs-fixes.patch DELETED ---


--- torque-2.1.0p0-sched-offbyone.patch DELETED ---


--- torque-2.1.2-pam-getpwnam.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 12 21:05:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 12 Oct 2006 14:05:46 -0700
Subject: rpms/libtunepimp/devel libtunepimp.spec,1.21,1.22
Message-ID: <200610122105.k9CL5mqY012782@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12765

Modified Files:
	libtunepimp.spec 
Log Message:
* Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
- rename python-libtunepimp -> python-tunepimp (to match python
  module name)



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libtunepimp.spec	12 Oct 2006 21:02:35 -0000	1.21
+++ libtunepimp.spec	12 Oct 2006 21:05:45 -0000	1.22
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -52,10 +52,8 @@
 %description devel
 %{summary}.
 
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%package -n python-%{name}
+%package -n python-tunepimp
 Summary: Python bindings for developing programs that will use %{name} 
 Group:   Development/Libraries
 License: GPL
@@ -63,7 +61,7 @@
 #if "%{?python_ver}" > "2"
 #Requires: python-abi = %{python_ver}
 #endif
-%description -n python-%{name}
+%description -n python-tunepimp
 %{summary}.
 
 
@@ -129,13 +127,17 @@
 %{_includedir}/*
 %{_libdir}/lib*.so
 
-%files -n python-%{name}
+%files -n python-tunepimp
 %defattr(-,root,root,-)
 %doc python/examples/trm.py
 %{python_sitelib}/tunepimp/
 
 
 %changelog
+* Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
+- rename python-libtunepimp -> python-tunepimp (to match python
+  module name)
+
 * Mon Oct 09 2006 Alex Lancaster <alexl[AT]users.sf.net> 0.5.2-2
 - build python-libtunepimp subpackage (#209961)
 



From fedora-extras-commits at redhat.com  Thu Oct 12 21:07:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 12 Oct 2006 14:07:00 -0700
Subject: rpms/libtunepimp/FC-5 libtunepimp.spec,1.15,1.16
Message-ID: <200610122107.k9CL720Q012852@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12833

Modified Files:
	libtunepimp.spec 
Log Message:
* Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
- rename python-libtunepimp -> python-tunepimp (to match python
  module name)



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/libtunepimp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libtunepimp.spec	6 Oct 2006 17:26:02 -0000	1.15
+++ libtunepimp.spec	12 Oct 2006 21:07:00 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -26,6 +26,8 @@
 BuildRequires: curl-devel
 BuildRequires: expat-devel
 
+BuildRequires: python-devel
+
 Obsoletes: libtunepimp-tools < %{version}-%{release}
 Provides:  libtunepimp-tools = %{version}-%{release}
 
@@ -50,6 +52,18 @@
 %description devel
 %{summary}.
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%package -n python-tunepimp
+Summary: Python bindings for developing programs that will use %{name} 
+Group:   Development/Libraries
+License: GPL
+#define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+#if "%{?python_ver}" > "2"
+#Requires: python-abi = %{python_ver}
+#endif
+%description -n python-tunepimp
+%{summary}.
+
 
 %prep
 %setup -q -n libtunepimp-%{version}
@@ -63,12 +77,20 @@
 
 make %{?_smp_mflags} PLUGIN_DIR=%{pkglibdir}/plugins
 
+pushd python
+%{__python} setup.py build 
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
 
+pushd python
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+popd
+
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -105,8 +127,20 @@
 %{_includedir}/*
 %{_libdir}/lib*.so
 
+%files -n python-tunepimp
+%defattr(-,root,root,-)
+%doc python/examples/trm.py
+%{python_sitelib}/tunepimp/
+
 
 %changelog
+* Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
+- rename python-libtunepimp -> python-tunepimp (to match python
+  module name)
+
+* Mon Oct 09 2006 Alex Lancaster <alexl[AT]users.sf.net> 0.5.2-2
+- build python-libtunepimp subpackage (#209961)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
 - 0.5.2
 



From fedora-extras-commits at redhat.com  Thu Oct 12 21:09:05 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu, 12 Oct 2006 14:09:05 -0700
Subject: fedora-security/audit fc5,1.351,1.352 fc6,1.106,1.107
Message-ID: <200610122109.k9CL95Bx012926@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12906

Modified Files:
	fc5 fc6 
Log Message:
Note a new nspr CVE id


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- fc5	10 Oct 2006 13:19:06 -0000	1.351
+++ fc5	12 Oct 2006 21:09:03 -0000	1.352
@@ -18,6 +18,7 @@
 CVE-2006-4980 VULNERABLE (python) #208166
 CVE-2006-4925 ** openssh
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
+CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- fc6	10 Oct 2006 13:19:06 -0000	1.106
+++ fc6	12 Oct 2006 21:09:03 -0000	1.107
@@ -19,6 +19,7 @@
 CVE-2006-4980 VULNERABLE (python) [backport in rawhide]
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
+CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability



From fedora-extras-commits at redhat.com  Thu Oct 12 21:32:04 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Thu, 12 Oct 2006 14:32:04 -0700
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.11,
	1.12 epiphany-extensions.spec, 1.12, 1.13 sources, 1.11, 1.12
Message-ID: <200610122132.k9CLW7Zm013120@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Update to 2.16.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2006 20:20:33 -0000	1.11
+++ .cvsignore	12 Oct 2006 21:32:04 -0000	1.12
@@ -1 +1 @@
-epiphany-extensions-2.15.2.tar.bz2
+epiphany-extensions-2.16.0.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- epiphany-extensions.spec	29 Aug 2006 20:34:07 -0000	1.12
+++ epiphany-extensions.spec	12 Oct 2006 21:32:04 -0000	1.13
@@ -1,13 +1,13 @@
-%define ephy_major 2.15.92
+%define ephy_major 2.16.0
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 2.15.2
+Version: 2.16.0
 Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
-Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.14/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.16/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: epiphany-devel >= %{ephy_major}
@@ -51,6 +51,9 @@
 %{_libdir}/epiphany
 
 %changelog
+* Thu Oct 12 2006 Zack Cerza <zcerza at redhat.com> 2.16.0-1
+- Update to 2.16.0
+
 * Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 2.15.2-1
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2006 20:20:33 -0000	1.11
+++ sources	12 Oct 2006 21:32:04 -0000	1.12
@@ -1 +1 @@
-2ec568adefdec0b59d42153d38b9357b  epiphany-extensions-2.15.2.tar.bz2
+bbc9c67750380d31ad068dbd7335875a  epiphany-extensions-2.16.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 12 21:39:01 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 14:39:01 -0700
Subject: fedora-security/audit fc5,1.352,1.353 fc6,1.107,1.108
Message-ID: <200610122139.k9CLd1cF013198@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13176/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-4813



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- fc5	12 Oct 2006 21:09:03 -0000	1.352
+++ fc5	12 Oct 2006 21:38:59 -0000	1.353
@@ -19,6 +19,7 @@
 CVE-2006-4925 ** openssh
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
+CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fc6	12 Oct 2006 21:09:03 -0000	1.107
+++ fc6	12 Oct 2006 21:38:59 -0000	1.108
@@ -20,6 +20,7 @@
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
+CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability



From fedora-extras-commits at redhat.com  Thu Oct 12 21:42:15 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 14:42:15 -0700
Subject: fedora-security/audit fc5,1.353,1.354 fc6,1.108,1.109
Message-ID: <200610122142.k9CLgFh0013243@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13223/audit

Modified Files:
	fc5 fc6 
Log Message:
Sort CVE-2006-4808 and CVE-2006-4809 properly



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- fc5	12 Oct 2006 21:38:59 -0000	1.353
+++ fc5	12 Oct 2006 21:42:13 -0000	1.354
@@ -21,6 +21,8 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
+CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)
@@ -79,8 +81,6 @@
 CVE-2006-4253 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.25,5.1.12) #203427
 CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.25,5.1.12) #203432
-CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
-CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4146 backport (gdb) [since FEDORA-2006-975]
 CVE-2006-4145 version (kernel, fixed 2.6.17.10) [since FEDORA-2006-967] needs a better upstream fix
 CVE-2006-4144 backport (ImageMagick, fixed 6.2.9) #202773 [since FEDORA-2006-929]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fc6	12 Oct 2006 21:38:59 -0000	1.108
+++ fc6	12 Oct 2006 21:42:13 -0000	1.109
@@ -22,6 +22,8 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
+CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
@@ -75,8 +77,6 @@
 CVE-2006-4253 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
 CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203428
 CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203434
-CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
-CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4146 backport (gdb)
 CVE-2006-4145 version (kernel, fixed 2.6.17.10, fixed 2.6.18-rc5) needs a better upstream fix
 CVE-2006-4144 backport (ImageMagick, fixed 6.2.9)



From fedora-extras-commits at redhat.com  Thu Oct 12 21:43:48 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 14:43:48 -0700
Subject: fedora-security/audit fc5,1.354,1.355 fc6,1.109,1.110
Message-ID: <200610122143.k9CLhmAj013269@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-5174



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- fc5	12 Oct 2006 21:42:13 -0000	1.354
+++ fc5	12 Oct 2006 21:43:46 -0000	1.355
@@ -6,7 +6,7 @@
 CVE-2006-5215 ** (X.org, fixed 20060225?)
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
-CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
+CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fc6	12 Oct 2006 21:42:13 -0000	1.109
+++ fc6	12 Oct 2006 21:43:46 -0000	1.110
@@ -7,7 +7,7 @@
 CVE-2006-5215 ** (X.org, fixed 20060225?)
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
-CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
+CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified



From fedora-extras-commits at redhat.com  Thu Oct 12 21:52:51 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 14:52:51 -0700
Subject: fedora-security/audit fc5,1.355,1.356 fc6,1.110,1.111
Message-ID: <200610122152.k9CLqpxp013310@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13285/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-5173



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- fc5	12 Oct 2006 21:43:46 -0000	1.355
+++ fc5	12 Oct 2006 21:52:49 -0000	1.356
@@ -7,6 +7,7 @@
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
+CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fc6	12 Oct 2006 21:43:46 -0000	1.110
+++ fc6	12 Oct 2006 21:52:49 -0000	1.111
@@ -8,6 +8,7 @@
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
+CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified



From fedora-extras-commits at redhat.com  Thu Oct 12 22:07:29 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 15:07:29 -0700
Subject: fedora-security/audit fc5,1.356,1.357 fc6,1.111,1.112
Message-ID: <200610122207.k9CM7TDr016269@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16249/audit

Modified Files:
	fc5 fc6 
Log Message:
The CVE-2006-4808/CVE-2006-4807 are actually CVE-2006-4808/CVE-2005-4807



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- fc5	12 Oct 2006 21:52:49 -0000	1.356
+++ fc5	12 Oct 2006 22:07:26 -0000	1.357
@@ -22,8 +22,6 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
-CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)
@@ -525,6 +523,8 @@
 CVE-2005-4811 version (kernel, fixed 2.6.13)
 CVE-2005-4809 ** firefox
 CVE-2005-4809 ** seamonkey
+CVE-2005-4808 ignore (binutils, gas fixed 20050714) this is a bug
+CVE-2005-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2005-4798 version (kernel, not 2.6)
 CVE-2005-4784 ignore (glibc) struct dirent is big enough
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fc6	12 Oct 2006 21:52:49 -0000	1.111
+++ fc6	12 Oct 2006 22:07:26 -0000	1.112
@@ -23,8 +23,6 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
-CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
@@ -462,6 +460,8 @@
 CVE-2006-0019 version (kdelibs, fixed 3.5.1)
 CVE-2005-4811 version (kernel, fixed 2.6.13)
 CVE-2005-4809 VULNERABLE (firefox)
+CVE-2005-4808 ignore (binutils, gas fixed 20050714) this is a bug
+CVE-2005-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2005-4798 version (kernel, not 2.6)
 CVE-2005-4784 ignore (glibc) struct dirent is big enough
 CVE-2005-4746 version (freeradius, fixed 1.0.5)



From fedora-extras-commits at redhat.com  Thu Oct 12 22:36:36 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:36:36 -0700
Subject: rpms/nsd/FC-4 nsd.spec,1.10,1.11
Message-ID: <200610122236.k9CMacOd016465@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16448

Modified Files:
	nsd.spec 
Log Message:
* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
- Upgraded to 2.3.6
- Fixed spec file so daemon gets properly restarted on upgrade



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsd.spec	27 Jun 2006 02:23:13 -0000	1.10
+++ nsd.spec	12 Oct 2006 22:36:35 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
-Release: 2%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -44,7 +44,7 @@
 
 %files 
 %defattr(-,root,root,-)
-%doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
+%doc README LICENSE NSD-DATABASE DIFFERENCES TODO RELNOTES REQUIREMENTS
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
@@ -55,9 +55,6 @@
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -76,6 +73,10 @@
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Jun 26 2006 Paul Wouters <paul at xelerance.com> - 2.3.5-2
 - Bump version for FC-x upgrade path
 



From fedora-extras-commits at redhat.com  Thu Oct 12 22:38:11 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:38:11 -0700
Subject: rpms/nsd/FC-3 nsd.spec,1.9,1.10
Message-ID: <200610122238.k9CMcDOB016533@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16516

Modified Files:
	nsd.spec 
Log Message:
* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
- Upgraded to 2.3.6
- Fixed spec file so daemon gets properly restarted on upgrade



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsd.spec	27 Jun 2006 01:01:15 -0000	1.9
+++ nsd.spec	12 Oct 2006 22:38:10 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
+Version: 2.3.6
 Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
@@ -55,9 +55,6 @@
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -76,6 +73,10 @@
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Jun 26 2006 Paul Wouters <paul at xelerance.com> - 2.3.5-1
 - Upgraded to nsd-2.3.5
 



From fedora-extras-commits at redhat.com  Thu Oct 12 22:39:18 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:39:18 -0700
Subject: rpms/nsd/FC-5 nsd.spec,1.9,1.10
Message-ID: <200610122239.k9CMdKHW016599@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16582

Modified Files:
	nsd.spec 
Log Message:
* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
- Upgraded to 2.3.6
- Fixed spec file so daemon gets properly restarted on upgrade



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/nsd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsd.spec	27 Jun 2006 03:38:26 -0000	1.9
+++ nsd.spec	12 Oct 2006 22:39:18 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
-Release: 2%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -55,9 +55,6 @@
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -76,6 +73,10 @@
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Jun 26 2006 Paul Wouters <paul at xelerance.com> - 2.3.5-2
 - Bump version for FC-x upgrade path
 



From fedora-extras-commits at redhat.com  Thu Oct 12 22:41:29 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:41:29 -0700
Subject: rpms/nsd/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610122241.k9CMfVj5016739@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16720

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2006 00:00:14 -0000	1.4
+++ .cvsignore	12 Oct 2006 22:41:28 -0000	1.5
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2006 00:00:14 -0000	1.4
+++ sources	12 Oct 2006 22:41:28 -0000	1.5
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:42:10 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:42:10 -0700
Subject: rpms/nsd/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200610122242.k9CMgCX6016779@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16760

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2006 00:52:44 -0000	1.5
+++ .cvsignore	12 Oct 2006 22:42:09 -0000	1.6
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2006 00:52:44 -0000	1.5
+++ sources	12 Oct 2006 22:42:09 -0000	1.6
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:42:52 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:42:52 -0700
Subject: rpms/nsd/FC-3 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200610122242.k9CMgs4J016819@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16800

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2006 01:01:15 -0000	1.5
+++ .cvsignore	12 Oct 2006 22:42:52 -0000	1.6
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2006 01:01:15 -0000	1.5
+++ sources	12 Oct 2006 22:42:52 -0000	1.6
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:45:16 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:45:16 -0700
Subject: rpms/nsd/FC-3 sources,1.6,1.7
Message-ID: <200610122245.k9CMjIlF016855@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16838

Modified Files:
	sources 
Log Message:
remote old source line



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Oct 2006 22:42:52 -0000	1.6
+++ sources	12 Oct 2006 22:45:16 -0000	1.7
@@ -1,2 +1 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:46:55 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:46:55 -0700
Subject: rpms/nsd/FC-3 nsd.spec,1.10,1.11
Message-ID: <200610122246.k9CMkvcP016892@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16875

Modified Files:
	nsd.spec 
Log Message:
bump version



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsd.spec	12 Oct 2006 22:38:10 -0000	1.10
+++ nsd.spec	12 Oct 2006 22:46:55 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -74,6 +74,9 @@
 
 %changelog
 * Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Bump version
+
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Fixed spec file so daemon gets properly restarted on upgrade
 



From fedora-extras-commits at redhat.com  Thu Oct 12 22:56:11 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:56:11 -0700
Subject: rpms/nsd/FC-4 nsd.spec,1.11,1.12 sources,1.6,1.7
Message-ID: <200610122256.k9CMuD1i017013@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16994

Modified Files:
	nsd.spec sources 
Log Message:
bump version.



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nsd.spec	12 Oct 2006 22:36:35 -0000	1.11
+++ nsd.spec	12 Oct 2006 22:56:11 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -74,6 +74,9 @@
 
 %changelog
 * Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Bump version
+
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Fixed spec file so daemon gets properly restarted on upgrade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Oct 2006 22:42:09 -0000	1.6
+++ sources	12 Oct 2006 22:56:11 -0000	1.7
@@ -1,2 +1 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:57:11 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:57:11 -0700
Subject: rpms/nsd/FC-5 nsd.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <200610122257.k9CMvDSl017076@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17057

Modified Files:
	nsd.spec sources 
Log Message:
bump version



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/nsd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsd.spec	12 Oct 2006 22:39:18 -0000	1.10
+++ nsd.spec	12 Oct 2006 22:57:11 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -74,6 +74,9 @@
 
 %changelog
 * Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Bump version
+
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Fixed spec file so daemon gets properly restarted on upgrade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2006 22:41:28 -0000	1.5
+++ sources	12 Oct 2006 22:57:11 -0000	1.6
@@ -1,2 +1 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 00:29:35 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 12 Oct 2006 17:29:35 -0700
Subject: rpms/epiphany-extensions/FC-5 .cvsignore, 1.10,
	1.11 epiphany-extensions.spec, 1.9, 1.10 sources, 1.10, 1.11
Message-ID: <200610130029.k9D0Tbij023434@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23413

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Updating to 2.14.1.1 to fix a long-standing issue with the scroller extensions and recent GTK releases. (This resolves bug #193430.)
I've attempted to contact Chris via email twice and pinged him on Bugzilla multiple times so far with no success. :|




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Apr 2006 16:26:54 -0000	1.10
+++ .cvsignore	13 Oct 2006 00:29:35 -0000	1.11
@@ -1 +1 @@
-epiphany-extensions-2.14.0.1.tar.bz2
+epiphany-extensions-2.14.1.1.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/epiphany-extensions.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- epiphany-extensions.spec	16 Apr 2006 16:26:54 -0000	1.9
+++ epiphany-extensions.spec	13 Oct 2006 00:29:35 -0000	1.10
@@ -2,7 +2,7 @@
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 2.14.0.1
+Version: 2.14.1.1
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -21,7 +21,7 @@
 %setup -q
 
 %build
-%configure --disable-compiler-warnings
+%configure --disable-compiler-warnings --disable-scrollkeeper
 %{__make} %{?_smp_mflags}
 
 %install
@@ -32,13 +32,26 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun
+scrollkeeper-update -q || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog README NEWS
 %{_datadir}/epiphany-extensions
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/omf/%{name}
 %{_libdir}/epiphany
 
 %changelog
+* Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com> 2.14.1.1-1
+- Update to 2.14.1.1 (fixes bug #193430: Update to 2.14.1 to fix some
+  issues with the scroller extensions and newer gtk2 releases)
+
 * Sun Apr 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.0.1-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Apr 2006 16:26:54 -0000	1.10
+++ sources	13 Oct 2006 00:29:35 -0000	1.11
@@ -1 +1 @@
-1b8ec450167010b25bba48295b5808cf  epiphany-extensions-2.14.0.1.tar.bz2
+3e807a83f068e41ce34c3c653a3353b6  epiphany-extensions-2.14.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 01:44:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:44:14 -0700
Subject: rpms/itpp - New directory
Message-ID: <200610130144.k9D1iGQ9027011@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26984/itpp

Log Message:
Directory /cvs/extras/rpms/itpp added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 01:44:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:44:14 -0700
Subject: rpms/itpp/devel - New directory
Message-ID: <200610130144.k9D1iGII027014@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26984/itpp/devel

Log Message:
Directory /cvs/extras/rpms/itpp/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 01:44:30 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:44:30 -0700
Subject: rpms/itpp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610130144.k9D1iWPG027063@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035

Added Files:
	Makefile import.log 
Log Message:
Setup of module itpp


--- NEW FILE Makefile ---
# Top level Makefile for module itpp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 13 01:44:30 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:44:30 -0700
Subject: rpms/itpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610130144.k9D1iW5c027066@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module itpp


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 13 01:45:10 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:45:10 -0700
Subject: rpms/itpp import.log,1.1,1.2
Message-ID: <200610130145.k9D1jDUC027134@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27101

Modified Files:
	import.log 
Log Message:
auto-import itpp-3.10.5-7 on branch devel from itpp-3.10.5-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/itpp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Oct 2006 01:44:30 -0000	1.1
+++ import.log	13 Oct 2006 01:45:10 -0000	1.2
@@ -0,0 +1 @@
+itpp-3_10_5-7:HEAD:itpp-3.10.5-7.src.rpm:1160703907



From fedora-extras-commits at redhat.com  Fri Oct 13 01:45:11 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:45:11 -0700
Subject: rpms/itpp/devel itpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610130145.k9D1jDm5027139@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27101/devel

Modified Files:
	.cvsignore sources 
Added Files:
	itpp.spec 
Log Message:
auto-import itpp-3.10.5-7 on branch devel from itpp-3.10.5-7.src.rpm


--- NEW FILE itpp.spec ---
Name:           itpp
Version:        3.10.5
Release:        7%{?dist}
Summary:        C++ library for math, signal/speech processing, and communications

Group:          System Environment/Libraries
License:        GPL
URL:            http://itpp.sourceforge.net/
Source0:        http://download.sourceforge.net/itpp/itpp-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-gfortran, atlas-devel, fftw-devel
BuildRequires:  tetex-latex
BuildRequires:  doxygen, ghostscript

%description
IT++ is a C++ library of mathematical, signal processing, speech
processing, and communications classes and functions.  The kernel of
the IT++ library is built upon templated vector and matrix classes
with many functions for their manipulation.  Such a kernel makes IT++
similar to Octave.  IT++ makes extensive use of existing open-source
libraries (but not only) for increased functionality, speed, and
accuracy.


%package devel
Summary:        Development files for itpp
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       fftw-devel, atlas-devel, gcc-gfortran

%description devel
This package contains the itpp header files, libs, and man pages.


%package doc
Summary:        Documentation for itpp
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description doc
This package contains the documentation for itpp.


%prep
%setup -q


%build
chmod 644 itpp/base/itpp_version.h
export LDFLAGS="-L/usr/lib/atlas -lstdc++"
export CPPFLAGS="-I/usr/include/atlas"
export F77=gfortran
%configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
  --with-docdir=%{_docdir}/%{name}-%{version} --disable-static
make %{?_smp_mflags}
#
#  remove unnecessary bits from itpp-config and itpp.pc
cat itpp-config | sed -e 's|-L[^ ]*gcc[^ ]*||g' |  \
    sed -e 's|-I[^ ]*||g' > itpp-config_new
mv -f itpp-config_new itpp-config
cat itpp.pc | sed -e 's|-L[^ ]*gcc[^ ]*||g' |  \
    sed -e 's|-I[^ ]*||g' > itpp.pc_new
mv -f itpp.pc_new itpp.pc


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
cp -p COPYING AUTHORS ChangeLog NEWS README TODO \
  $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT/


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/[A-Z]*
%{_libdir}/*.so.*
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_bindir}/%{name}-config

%files doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/html


%changelog
* Wed Oct 11 2006  Ed Hill <ed at eh3.com> - 3.10.5-7
- explicitly link with -lstdc++

* Tue Oct 10 2006  Ed Hill <ed at eh3.com> - 3.10.5-6
- fix unowned dir

* Sun Oct  8 2006  Ed Hill <ed at eh3.com> - 3.10.5-5
- fix permissions for itpp/base/itpp_version.h
- make sure we ship the license
- remove redundant BRs and add -devel BRs
- remove only the gcc bits from itpp-config and itpp.pc

* Sat Oct  7 2006  Ed Hill <ed at eh3.com> - 3.10.5-4
- disable dependency tracking to speed build, sanitize itpp.pc,
  and de-macro-ize an earlier changelog entry

* Sat Sep 23 2006  Ed Hill <ed at eh3.com> - 3.10.5-3
- disable static libs, add pkgconfig, and sanitize itpp-config

* Tue Sep 13 2006  Ed Hill <ed at eh3.com> - 3.10.5-2
- fix the html docs and add BuildRequires

* Tue Sep 12 2006  Ed Hill <ed at eh3.com> - 3.10.5-1
- initial version for Fedora Extras

* Mon Feb 13 2006  Adam Piatyszek  <ediap at users.sourceforge.net>
- Created subpackage `itpp-html-doc' with HTML documentation

* Fri Feb 10 2006  Adam Piatyszek  <ediap at users.sourceforge.net>
- Added missing *.a and *.m files

* Thu Feb 09 2006  Adam Piatyszek  <ediap at users.sourceforge.net>
- Changes in `Name', `Version' and `Release' definitions
- Removed distribution dependent release settings
- Added DESTDIR to make install command

* Wed Dec 28 2005  Adam Piatyszek  <ediap at users.sourceforge.net>
- Fixed `name' and `version' definitions
- Added `itpp-config' in files section

* Fri Dec 23 2005  Adam Piatyszek  <ediap at users.sourceforge.net>
- Initial spec file prepared


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Oct 2006 01:44:30 -0000	1.1
+++ .cvsignore	13 Oct 2006 01:45:11 -0000	1.2
@@ -0,0 +1 @@
+itpp-3.10.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Oct 2006 01:44:30 -0000	1.1
+++ sources	13 Oct 2006 01:45:11 -0000	1.2
@@ -0,0 +1 @@
+a4c9a13ff457ee168cec5edade272ff8  itpp-3.10.5.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 02:54:47 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 12 Oct 2006 19:54:47 -0700
Subject: owners owners.list,1.1823,1.1824
Message-ID: <200610130254.k9D2snSH030529@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30508

Modified Files:
	owners.list 
Log Message:
Adding myself as a co-maintainer for epiphany-extensions; received an OK for this from Chris via email. Thanks, Chris! :)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1823
retrieving revision 1.1824
diff -u -r1.1823 -r1.1824
--- owners.list	12 Oct 2006 08:24:20 -0000	1.1823
+++ owners.list	13 Oct 2006 02:54:46 -0000	1.1824
@@ -349,7 +349,7 @@
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|enigma|Clone of the ATARI game Oxyd|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|environment-modules|Provides dynamic modification of a user's environment|orion at cora.nwra.com|extras-qa at fedoraproject.org|
-Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org|peter at thecodergeek.com
 Fedora Extras|epydoc|Edward Loper's Python API documentation generation tool|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|epylog|New logs analyzer and parser|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|eric|Python IDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 13 03:22:54 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 12 Oct 2006 20:22:54 -0700
Subject: rpms/epiphany-extensions/FC-5 epiphany-extensions.spec,1.10,1.11
Message-ID: <200610130322.k9D3Mu7G001187@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1169

Modified Files:
	epiphany-extensions.spec 
Log Message:
A bunch of build and requirement fixes


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/epiphany-extensions.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- epiphany-extensions.spec	13 Oct 2006 00:29:35 -0000	1.10
+++ epiphany-extensions.spec	13 Oct 2006 03:22:54 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
 Version: 2.14.1.1
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
@@ -11,7 +11,11 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: epiphany-devel >= %{ephy_major}
+BuildRequires: gettext
+BuildRequires: perl(XML::Parser)
 Requires: epiphany >= %{ephy_major}
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Epiphany Extensions is a collection of extensions for Epiphany, the
@@ -26,7 +30,7 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT make install
+make DESTDIR=$RPM_BUILD_ROOT install
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %{name} --all-name
 
 %clean
@@ -38,7 +42,6 @@
 %postun
 scrollkeeper-update -q || :
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog README NEWS
@@ -48,6 +51,12 @@
 %{_libdir}/epiphany
 
 %changelog
+* Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com> 2.14.1.1-2
+- Add proper post/postun Requires: scrollkeeper
+- Add proper gettext requirements for build-time translations support 
+- Fix up %%files for the version update
+- DESTDIR is a make variable, not an external one
+
 * Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com> 2.14.1.1-1
 - Update to 2.14.1.1 (fixes bug #193430: Update to 2.14.1 to fix some
   issues with the scroller extensions and newer gtk2 releases)



From fedora-extras-commits at redhat.com  Fri Oct 13 03:50:02 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 12 Oct 2006 20:50:02 -0700
Subject: rpms/epiphany-extensions/devel epiphany-extensions.spec,1.13,1.14
Message-ID: <200610130350.k9D3o4Kr001328@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1311

Modified Files:
	epiphany-extensions.spec 
Log Message:
A couple of minor spec-only fixes; not worthy of an EVR bump and build though.


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- epiphany-extensions.spec	12 Oct 2006 21:32:04 -0000	1.13
+++ epiphany-extensions.spec	13 Oct 2006 03:50:02 -0000	1.14
@@ -11,7 +11,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: epiphany-devel >= %{ephy_major}
-BuildRequires: perl-XML-Parser
+BuildRequires: perl(XML::Parser)
 BuildRequires: gettext
 Requires: epiphany >= %{ephy_major}
 Requires(post): scrollkeeper
@@ -30,7 +30,7 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT make install
+make DESTDIR=$RPM_BUILD_ROOT install
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %{name} --all-name
 
 %clean
@@ -51,6 +51,10 @@
 %{_libdir}/epiphany
 
 %changelog
+* Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com>
+- Change perl-XML-Parser BR to perl(XML::Parser)
+- DESTDIR is a make variable, not an external one
+
 * Thu Oct 12 2006 Zack Cerza <zcerza at redhat.com> 2.16.0-1
 - Update to 2.16.0
 



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:17 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:17 -0700
Subject: rpms/perl-aliased - New directory
Message-ID: <200610130540.k9D5eJXb007842@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816/perl-aliased

Log Message:
Directory /cvs/extras/rpms/perl-aliased added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:22 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:22 -0700
Subject: rpms/perl-aliased Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610130540.k9D5eOCA007889@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7854

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-aliased


--- NEW FILE Makefile ---
# Top level Makefile for module perl-aliased
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:18 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:18 -0700
Subject: rpms/perl-aliased/devel - New directory
Message-ID: <200610130540.k9D5eKQV007845@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816/perl-aliased/devel

Log Message:
Directory /cvs/extras/rpms/perl-aliased/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:23 -0700
Subject: rpms/perl-aliased/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610130540.k9D5eP2N007892@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7854/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-aliased


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:37 -0700
Subject: rpms/perl-aliased import.log,1.1,1.2
Message-ID: <200610130540.k9D5edCt007959@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7924

Modified Files:
	import.log 
Log Message:
auto-import perl-aliased-0.20-1.fc5 on branch devel from perl-aliased-0.20-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Oct 2006 05:40:22 -0000	1.1
+++ import.log	13 Oct 2006 05:40:37 -0000	1.2
@@ -0,0 +1 @@
+perl-aliased-0_20-1_fc5:HEAD:perl-aliased-0.20-1.fc5.src.rpm:1160718036



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:35 -0700
Subject: owners owners.list,1.1824,1.1825
Message-ID: <200610130540.k9D5ebi2007939@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7899

Modified Files:
	owners.list 
Log Message:
added perl-aliased


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1824
retrieving revision 1.1825
diff -u -r1.1824 -r1.1825
--- owners.list	13 Oct 2006 02:54:46 -0000	1.1824
+++ owners.list	13 Oct 2006 05:40:35 -0000	1.1825
@@ -1223,6 +1223,7 @@
 Fedora Extras|perl-Algorithm-C3|Module for merging hierarchies using the C3 algorithm|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Algorithm-Dependency|Algorithmic framework for implementing dependency trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-aliased|Use shorter versions of class names|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Alien-wxWidgets|Building, finding and using wxWidgets binaries|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AnyData|Easy access to data in many formats|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:38 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:38 -0700
Subject: rpms/perl-aliased/devel perl-aliased.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610130540.k9D5eeBr007964@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7924/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-aliased.spec 
Log Message:
auto-import perl-aliased-0.20-1.fc5 on branch devel from perl-aliased-0.20-1.fc5.src.rpm


--- NEW FILE perl-aliased.spec ---
Name:           perl-aliased
Version:        0.20
Release:        1%{?dist}
Summary:        Use shorter versions of class names
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/aliased/
Source0:        http://www.cpan.org/authors/id/O/OV/OVID/aliased-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Pod::Coverage), perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
aliased is simple in concept but is a rather handy module. It loads the
class you specify and exports into your namespace a subroutine that returns
the class name. You can explicitly alias the class to another name or, if
you prefer, you can do so implicitly. In the latter case, the name of the
subroutine is the last part of the class name. 

%prep
%setup -q -n aliased-%{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 README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Oct 09 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Oct 2006 05:40:23 -0000	1.1
+++ .cvsignore	13 Oct 2006 05:40:37 -0000	1.2
@@ -0,0 +1 @@
+aliased-0.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Oct 2006 05:40:23 -0000	1.1
+++ sources	13 Oct 2006 05:40:37 -0000	1.2
@@ -0,0 +1 @@
+0bfab0c5dcff5a4903e04feb22d37b9b  aliased-0.20.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 05:41:40 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:41:40 -0700
Subject: rpms/perl-aliased/devel perl-aliased.spec,1.1,1.2
Message-ID: <200610130541.k9D5fg2q008029@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8012

Modified Files:
	perl-aliased.spec 
Log Message:
release bump


Index: perl-aliased.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/perl-aliased.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-aliased.spec	13 Oct 2006 05:40:37 -0000	1.1
+++ perl-aliased.spec	13 Oct 2006 05:41:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-aliased
 Version:        0.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Use shorter versions of class names
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -47,5 +47,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 12 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.20-2
+- bump
+
 * Mon Oct 09 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
 - Specfile autogenerated by cpanspec 1.69.



From fedora-extras-commits at redhat.com  Fri Oct 13 09:54:57 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri, 13 Oct 2006 02:54:57 -0700
Subject: rpms/mantis/FC-5 mantis.spec,1.11,1.12
Message-ID: <200610130954.k9D9sxWB021599@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21582

Modified Files:
	mantis.spec 
Log Message:
Update to 1.0.5



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/mantis.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mantis.spec	22 May 2006 06:32:40 -0000	1.11
+++ mantis.spec	13 Oct 2006 09:54:57 -0000	1.12
@@ -1,24 +1,23 @@
 # $Id$
 
-%global pkgdir		%_datadir/%name
-%global cfgdir		%_sysconfdir/%name
-%global httpconfdir	%_sysconfdir/httpd/conf.d
-
-%{!?release_func:%global release_func() %1%{?dist}}
+%global pkgdir		%{_datadir}/%{name}
+%global cfgdir		%{_sysconfdir}/%{name}
+%global httpconfdir	%{_sysconfdir}/httpd/conf.d
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	1.0.3
-Release:	%release_func 1
+Version:	1.0.5
+Release:	1%{dist}
 License:	GPL
 Group:		Applications/Internet
-URL:		http://mantisbt.sourceforge.net/
+URL:		http://www.mantisbugtracker.com/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%name-%version.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-1.0.0rc2-noadmin.patch
-BuildRoot:	%_tmppath/%name-%version-%release-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	diffutils
 Requires:	php
 Requires:	mantis-config
@@ -28,17 +27,15 @@
 Group:		Applications/Internet
 Source10:	mantis-httpd.conf
 Provides:	mantis-config = httpd
-Requires:	mantis = %version-%release
-Requires:	%httpconfdir
+Requires:	mantis = %{version}-%{release}
+Requires:	%{httpconfdir}
 Requires:	mod_ssl
 Requires(post):		httpd
 Requires(postun):	httpd
 
 
 %description
-Mantis is a web-based bugtracking system. It is in active development
-and is considered beta.
-
+Mantis is a web-based bugtracking system. 
 It is written in the PHP scripting language and requires the MySQL
 database and a webserver. Mantis has been installed on Windows, MacOS,
 OS/2, and a variety of Unix operating systems. Any web browser should
@@ -46,14 +43,12 @@
 GNU General Public License (GPL).
 
 %description config-httpd
-Mantis is a web-based bugtracking system. It is in active development
-and is considered beta.
-
+Mantis is a web-based bugtracking system.
 This package contains configuration-files for Apache httpd 2.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
@@ -63,25 +58,25 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "${RPM_BUILD_ROOT}"
 
-%__install -d -m755 $RPM_BUILD_ROOT%pkgdir
-%__install -d -m750 $RPM_BUILD_ROOT%cfgdir
+%{__install} -d -m755 ${RPM_BUILD_ROOT}%{pkgdir}
+%{__install} -d -m750 ${RPM_BUILD_ROOT}%{cfgdir}
 
-tar cf - . | tar xf - -C $RPM_BUILD_ROOT%pkgdir
+tar cf - . | tar xf - -C ${RPM_BUILD_ROOT}%{pkgdir}
 
 
-find $RPM_BUILD_ROOT \( \
+find ${RPM_BUILD_ROOT} \( \
 	-name '*.noexamplecom' -o -name '*.iis' -o -name '*.noadmin' -o -name '*.#.*' -o \
 	-name '.cvsignore' \
 	\) -print0 | xargs -0 rm -f
 
 ## Do not rename; the *existence* of this file will be checked to
 ## determine if mantis is offline
-mv $RPM_BUILD_ROOT%pkgdir/mantis_offline.php.sample $RPM_BUILD_ROOT%cfgdir/
-mv $RPM_BUILD_ROOT%pkgdir/config_inc.php.sample     $RPM_BUILD_ROOT%cfgdir/config_inc.php
+mv ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php.sample ${RPM_BUILD_ROOT}%{cfgdir}/
+mv ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php.sample     ${RPM_BUILD_ROOT}%{cfgdir}/config_inc.php
 
-for i in $(find $RPM_BUILD_ROOT -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
+for i in $(find ${RPM_BUILD_ROOT} -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
 	case $i in
 		(*.php)
 			if ! sed '1p;d' "$i" | grep -q '^#!'; then
@@ -95,27 +90,27 @@
 	esac
 done
 
-chmod -x $RPM_BUILD_ROOT%pkgdir/{doc/*,core/phpmailer/{README,LICENSE}}
+chmod -x ${RPM_BUILD_ROOT}%{pkgdir}/{doc/*,core/phpmailer/{README,LICENSE}}
 
-ln -s %cfgdir/config_inc.php	 $RPM_BUILD_ROOT%pkgdir/config_inc.php
-ln -s %cfgdir/mantis_offline.php $RPM_BUILD_ROOT%pkgdir/mantis_offline.php
+ln -s %{cfgdir}/config_inc.php	 ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php
+ln -s %{cfgdir}/mantis_offline.php ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php
 
 
 ## The httpd config-files
 function subst() {
-	f=$RPM_BUILD_ROOT$1
-	sed -e 's!/usr/share/mantis!%pkgdir!g' "$f" >"$f".tmp
+	f=${RPM_BUILD_ROOT}$1
+	sed -e 's!/usr/share/mantis!%{pkgdir}!g' "$f" >"$f".tmp
 	cmp -s "$f" "$f.tmp" || cat "$f.tmp" >"$f"
 	rm -f "$f.tmp"
 }
 
-%__install -d $RPM_BUILD_ROOT%httpconfdir
-%__install -p -m644 %SOURCE10 $RPM_BUILD_ROOT%httpconfdir/mantis.conf
-subst %httpconfdir/mantis.conf
+%{__install} -d ${RPM_BUILD_ROOT}%{httpconfdir}
+%{__install} -p -m644 %{SOURCE10} ${RPM_BUILD_ROOT}%{httpconfdir}/mantis.conf
+subst %{httpconfdir}/mantis.conf
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "${RPM_BUILD_ROOT}"
 
 
 %post config-httpd
@@ -127,17 +122,20 @@
 
 %files
 %defattr(-,root,root,-)
-%pkgdir
-%attr(-,root,apache) %dir %cfgdir
-%attr(0640,root,apache) %config(noreplace) %cfgdir/*
+%{pkgdir}
+%attr(-,root,apache) %dir %{cfgdir}
+%attr(0640,root,apache) %config(noreplace) %{cfgdir}/*
 
 
 %files config-httpd
 %defattr(-,root,root,-)
-%config(noreplace) %httpconfdir/*
+%config(noreplace) %{httpconfdir}/*
 
 
 %changelog
+* Tue Oct 10 2006 Gianluca Sforna <giallu gmail com> - 1.0.5-1
+- updated to 1.0.5
+
 * Sat May 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.0.3-1
 - updated to 1.0.3 (SECURITY)
 



From fedora-extras-commits at redhat.com  Fri Oct 13 09:59:11 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri, 13 Oct 2006 02:59:11 -0700
Subject: rpms/mantis/FC-5 sources,1.8,1.9
Message-ID: <200610130959.k9D9xD25021628@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21611

Modified Files:
	sources 
Log Message:
Update sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 May 2006 06:32:40 -0000	1.8
+++ sources	13 Oct 2006 09:59:10 -0000	1.9
@@ -1 +1 @@
-6c70d00da4cad5da2e0df387f474d3e4  mantis-1.0.3.tar.gz
+01c5fb87e5ac161a681471573711bcf6  mantis_1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 10:17:30 2006
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 13 Oct 2006 03:17:30 -0700
Subject: owners owners.list,1.1825,1.1826
Message-ID: <200610131017.k9DAHW0q024742@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24721

Modified Files:
	owners.list 
Log Message:
give sabayon to alex



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1825
retrieving revision 1.1826
diff -u -r1.1825 -r1.1826
--- owners.list	13 Oct 2006 05:40:35 -0000	1.1825
+++ owners.list	13 Oct 2006 10:17:30 -0000	1.1826
@@ -1994,7 +1994,7 @@
 Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|s3switch|Manage the output device on S3 Savage chips|paul at xelerance.com|extras-qa at fedoraproject.org|
-Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|alexl at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sage|OpenGL extensions library using SDL|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-cmpi-base|Standards Based Linux Instrumentation Base CMPI Providers for System-related CIM classes|hamzy at us.ibm.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 13 10:54:48 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 13 Oct 2006 03:54:48 -0700
Subject: rpms/clisp/devel .cvsignore, 1.7, 1.8 clisp.spec, 1.20, 1.21 sources,
	1.8, 1.9
Message-ID: <200610131054.k9DAsohf024879@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24858

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.41


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Oct 2006 11:24:26 -0000	1.7
+++ .cvsignore	13 Oct 2006 10:54:48 -0000	1.8
@@ -1 +1 @@
-clisp-2.40.tar.bz2
+clisp-2.41.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- clisp.spec	3 Oct 2006 16:44:12 -0000	1.20
+++ clisp.spec	13 Oct 2006 10:54:48 -0000	1.21
@@ -1,13 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.40
-Release: 	3%{?dist}
+Version:	2.41
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
-Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
-Patch0:		clisp-2.40-doc.patch
+Source:		http://download.sourceforge.net/clisp/clisp-2.41.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -57,8 +56,6 @@
 
 %prep
 %setup -q
-cd src
-%patch0
 
 
 %build
@@ -132,6 +129,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.41-1
+- new version 2.41
+
 * Tue Oct  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-3
 - Added patch for x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Oct 2006 11:24:26 -0000	1.8
+++ sources	13 Oct 2006 10:54:48 -0000	1.9
@@ -1 +1 @@
-87e9c4807a8fa3a9b6f7bc25e9e368a4  clisp-2.40.tar.bz2
+3a7a00e82ebeeb72a75a032f84c36c6c  clisp-2.41.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 10:57:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 13 Oct 2006 03:57:20 -0700
Subject: rpms/clisp/FC-5 .cvsignore, 1.7, 1.8 clisp.spec, 1.18, 1.19 sources,
	1.8, 1.9
Message-ID: <200610131057.k9DAvMa5024951@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24930/FC-5

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.41


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Oct 2006 11:24:25 -0000	1.7
+++ .cvsignore	13 Oct 2006 10:57:20 -0000	1.8
@@ -1 +1 @@
-clisp-2.40.tar.bz2
+clisp-2.41.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/clisp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- clisp.spec	3 Oct 2006 17:04:24 -0000	1.18
+++ clisp.spec	13 Oct 2006 10:57:20 -0000	1.19
@@ -1,13 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.40
-Release: 	3%{?dist}
+Version:	2.41
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
-Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
-Patch0:		clisp-2.40-doc.patch
+Source:		http://download.sourceforge.net/clisp/clisp-2.41.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -57,8 +56,6 @@
 
 %prep
 %setup -q
-cd src
-%patch0
 
 
 %build
@@ -132,6 +129,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.41-1
+- new version 2.41
+
 * Tue Oct  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-3
 - Added patch for x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Oct 2006 11:24:25 -0000	1.8
+++ sources	13 Oct 2006 10:57:20 -0000	1.9
@@ -1 +1 @@
-87e9c4807a8fa3a9b6f7bc25e9e368a4  clisp-2.40.tar.bz2
+3a7a00e82ebeeb72a75a032f84c36c6c  clisp-2.41.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 14:27:48 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 13 Oct 2006 07:27:48 -0700
Subject: rpms/ktechlab/devel ktechlab-0.3-ppc-includes.patch, NONE,
	1.1 ktechlab.spec, 1.1, 1.2
Message-ID: <200610131427.k9DERoXD005681@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659

Modified Files:
	ktechlab.spec 
Added Files:
	ktechlab-0.3-ppc-includes.patch 
Log Message:
try to fix compilation on ppc

ktechlab-0.3-ppc-includes.patch:

--- NEW FILE ktechlab-0.3-ppc-includes.patch ---
--- ktechlab-0.3/src/electronics/port.cpp.headers	2006-01-01 22:51:37.000000000 +0900
+++ ktechlab-0.3/src/electronics/port.cpp	2006-10-13 23:17:27.000000000 +0900
@@ -13,10 +13,9 @@
 #include <kdebug.h>
 
 #include <errno.h>
-#include <fcntl.h>
+#include <linux/fcntl.h>
 #include <linux/ppdev.h>
-#include <sys/ioctl.h>
-#include <sys/io.h>
+#include <linux/ioctl.h>
 #include <unistd.h>
 
 //BEGIN class Port


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktechlab.spec	27 Sep 2006 17:22:50 -0000	1.1
+++ ktechlab.spec	13 Oct 2006 14:27:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -11,6 +11,7 @@
 
 Patch0:           ktechlab-0.3-pic.patch
 Patch1:           ktechlab-0.3.desktop.patch
+Patch2:           ktechlab-0.3-ppc-includes.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +43,9 @@
 
 %patch0 -p0 -b pic14.h
 %patch1 -p0 -b ktechlab.desktop
+%ifarch ppc
+%patch2 -p1 -b .ppc-includes
+%endif
 
 %build
 %configure --disable-rpath
@@ -93,6 +97,9 @@
 
 
 %Changelog
+* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4
+- Try to fix compilation on ppc.
+
 * Mon Sep 25 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3-3
 - Added gputils as requires
 



From fedora-extras-commits at redhat.com  Fri Oct 13 15:13:13 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 13 Oct 2006 08:13:13 -0700
Subject: rpms/ktechlab/devel ktechlab-0.3-ppc-includes.patch, 1.1,
	1.2 ktechlab.spec, 1.2, 1.3
Message-ID: <200610131513.k9DFDGdD008901@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8879

Modified Files:
	ktechlab-0.3-ppc-includes.patch ktechlab.spec 
Log Message:
again try ppc

ktechlab-0.3-ppc-includes.patch:

Index: ktechlab-0.3-ppc-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab-0.3-ppc-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktechlab-0.3-ppc-includes.patch	13 Oct 2006 14:27:48 -0000	1.1
+++ ktechlab-0.3-ppc-includes.patch	13 Oct 2006 15:13:13 -0000	1.2
@@ -1,15 +1,16 @@
 --- ktechlab-0.3/src/electronics/port.cpp.headers	2006-01-01 22:51:37.000000000 +0900
-+++ ktechlab-0.3/src/electronics/port.cpp	2006-10-13 23:17:27.000000000 +0900
-@@ -13,10 +13,9 @@
++++ ktechlab-0.3/src/electronics/port.cpp	2006-10-14 00:10:59.000000000 +0900
+@@ -13,11 +13,11 @@
  #include <kdebug.h>
  
  #include <errno.h>
 -#include <fcntl.h>
 +#include <linux/fcntl.h>
  #include <linux/ppdev.h>
--#include <sys/ioctl.h>
+ #include <sys/ioctl.h>
 -#include <sys/io.h>
-+#include <linux/ioctl.h>
  #include <unistd.h>
++#include <asm/ioctls.h>
  
  //BEGIN class Port
+ Port::Port()


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ktechlab.spec	13 Oct 2006 14:27:48 -0000	1.2
+++ ktechlab.spec	13 Oct 2006 15:13:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          4%{?dist}
+Release:          4.2%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -97,6 +97,9 @@
 
 
 %Changelog
+* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4.2
+- Again.
+
 * Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4
 - Try to fix compilation on ppc.
 



From fedora-extras-commits at redhat.com  Fri Oct 13 15:29:20 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 13 Oct 2006 08:29:20 -0700
Subject: rpms/ktechlab/devel ktechlab-0.3-ppc-includes.patch, 1.2,
	1.3 ktechlab.spec, 1.3, 1.4
Message-ID: <200610131529.k9DFTMkS009092@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9070

Modified Files:
	ktechlab-0.3-ppc-includes.patch ktechlab.spec 
Log Message:
again try ppcmake clog

ktechlab-0.3-ppc-includes.patch:

Index: ktechlab-0.3-ppc-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab-0.3-ppc-includes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ktechlab-0.3-ppc-includes.patch	13 Oct 2006 15:13:13 -0000	1.2
+++ ktechlab-0.3-ppc-includes.patch	13 Oct 2006 15:29:20 -0000	1.3
@@ -1,16 +1,10 @@
 --- ktechlab-0.3/src/electronics/port.cpp.headers	2006-01-01 22:51:37.000000000 +0900
-+++ ktechlab-0.3/src/electronics/port.cpp	2006-10-14 00:10:59.000000000 +0900
-@@ -13,11 +13,11 @@
- #include <kdebug.h>
- 
- #include <errno.h>
--#include <fcntl.h>
-+#include <linux/fcntl.h>
++++ ktechlab-0.3/src/electronics/port.cpp	2006-10-14 00:28:12.000000000 +0900
+@@ -16,7 +16,6 @@
+ #include <fcntl.h>
  #include <linux/ppdev.h>
  #include <sys/ioctl.h>
 -#include <sys/io.h>
  #include <unistd.h>
-+#include <asm/ioctls.h>
  
  //BEGIN class Port
- Port::Port()


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ktechlab.spec	13 Oct 2006 15:13:13 -0000	1.3
+++ ktechlab.spec	13 Oct 2006 15:29:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          4.2%{?dist}
+Release:          5%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -97,10 +97,7 @@
 
 
 %Changelog
-* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4.2
-- Again.
-
-* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4
+* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-5
 - Try to fix compilation on ppc.
 
 * Mon Sep 25 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3-3



From fedora-extras-commits at redhat.com  Fri Oct 13 15:42:06 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 13 Oct 2006 08:42:06 -0700
Subject: rpms/ktechlab/FC-5 ktechlab-0.3-ppc-includes.patch, NONE,
	1.1 ktechlab.spec, 1.1, 1.2
Message-ID: <200610131542.k9DFg8bD009214@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ktechlab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9194

Modified Files:
	ktechlab.spec 
Added Files:
	ktechlab-0.3-ppc-includes.patch 
Log Message:
fix compilation on ppc

ktechlab-0.3-ppc-includes.patch:

--- NEW FILE ktechlab-0.3-ppc-includes.patch ---
--- ktechlab-0.3/src/electronics/port.cpp.headers	2006-01-01 22:51:37.000000000 +0900
+++ ktechlab-0.3/src/electronics/port.cpp	2006-10-14 00:28:12.000000000 +0900
@@ -16,7 +16,6 @@
 #include <fcntl.h>
 #include <linux/ppdev.h>
 #include <sys/ioctl.h>
-#include <sys/io.h>
 #include <unistd.h>
 
 //BEGIN class Port


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/FC-5/ktechlab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktechlab.spec	27 Sep 2006 17:22:50 -0000	1.1
+++ ktechlab.spec	13 Oct 2006 15:42:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          3%{?dist}
+Release:          5%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -11,6 +11,7 @@
 
 Patch0:           ktechlab-0.3-pic.patch
 Patch1:           ktechlab-0.3.desktop.patch
+Patch2:           ktechlab-0.3-ppc-includes.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +43,9 @@
 
 %patch0 -p0 -b pic14.h
 %patch1 -p0 -b ktechlab.desktop
+%ifarch ppc
+%patch2 -p1 -b .ppc-includes
+%endif
 
 %build
 %configure --disable-rpath
@@ -93,6 +97,9 @@
 
 
 %Changelog
+* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-5
+- Try to fix compilation on ppc.
+
 * Mon Sep 25 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3-3
 - Added gputils as requires
 



From fedora-extras-commits at redhat.com  Fri Oct 13 17:27:40 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 10:27:40 -0700
Subject: rpms/ktorrent/devel .cvsignore, 1.5, 1.6 ktorrent.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200610131727.k9DHRgr2016152@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16131

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Update to version 2.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Aug 2006 18:34:47 -0000	1.5
+++ .cvsignore	13 Oct 2006 17:27:40 -0000	1.6
@@ -1 +1 @@
-ktorrent-2.0.2.tar.gz
+ktorrent-2.0.3.tar.gz


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ktorrent.spec	7 Sep 2006 18:10:30 -0000	1.13
+++ ktorrent.spec	13 Oct 2006 17:27:40 -0000	1.14
@@ -1,13 +1,13 @@
 %define desktopvendor fedora
 
 Name:           ktorrent
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
-Source0:        http://ktorrent.org/downloads/2.0.2/ktorrent-2.0.2.tar.gz
+Source0:        http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel
@@ -125,6 +125,9 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-1
+- Update to upstream version 2.0.3
+
 * Thu Sep 07 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.2-3
 - mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Aug 2006 18:34:47 -0000	1.5
+++ sources	13 Oct 2006 17:27:40 -0000	1.6
@@ -1 +1 @@
-6e6233e8f7104639f2929abeb7320333  ktorrent-2.0.2.tar.gz
+f0297ab9ead77ee11f9f46cffa904b89  ktorrent-2.0.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 17:28:38 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 10:28:38 -0700
Subject: rpms/ktorrent/FC-5 .cvsignore, 1.5, 1.6 ktorrent.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200610131728.k9DHSeAh016224@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16203

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Update to version 2.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Aug 2006 18:47:02 -0000	1.5
+++ .cvsignore	13 Oct 2006 17:28:38 -0000	1.6
@@ -1 +1 @@
-ktorrent-2.0.2.tar.gz
+ktorrent-2.0.3.tar.gz


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ktorrent.spec	7 Sep 2006 18:11:43 -0000	1.8
+++ ktorrent.spec	13 Oct 2006 17:28:38 -0000	1.9
@@ -1,13 +1,13 @@
 %define desktopvendor fedora
 
 Name:           ktorrent
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
-Source0:        http://ktorrent.org/downloads/2.0.2/ktorrent-2.0.2.tar.gz
+Source0:        http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel
@@ -125,6 +125,9 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-1
+- Update to upstream version 2.0.3
+
 * Thu Sep 07 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.2-3
 - mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Aug 2006 18:47:02 -0000	1.5
+++ sources	13 Oct 2006 17:28:38 -0000	1.6
@@ -1 +1 @@
-6e6233e8f7104639f2929abeb7320333  ktorrent-2.0.2.tar.gz
+f0297ab9ead77ee11f9f46cffa904b89  ktorrent-2.0.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 17:56:17 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 13 Oct 2006 10:56:17 -0700
Subject: rpms/vorbisgain/devel vorbisgain-spelling.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 sources, 1.2, 1.3 vorbisgain.spec, 1.3, 1.4
Message-ID: <200610131756.k9DHuJae016403@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/vorbisgain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16379

Modified Files:
	.cvsignore sources vorbisgain.spec 
Added Files:
	vorbisgain-spelling.patch 
Log Message:
* Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.36-1
- Update to 0.36.
- Add patch to fix spelling errors in manpage.


vorbisgain-spelling.patch:

--- NEW FILE vorbisgain-spelling.patch ---
diff -ur vorbisgain-0.36.OLD/vorbisgain.1 vorbisgain-0.36/vorbisgain.1
--- vorbisgain-0.36.OLD/vorbisgain.1	2005-02-06 12:40:19.000000000 -0500
+++ vorbisgain-0.36/vorbisgain.1	2006-10-13 13:42:01.000000000 -0400
@@ -70,7 +70,7 @@
 needed for a conversion, the file is not modified. The album peak tag is
 only created if
 .I -a
-is specified, and the album gain value is then checked for concistency.
+is specified, and the album gain value is then checked for consistency.
 Otherwise any album gain is converted without any checks.
 
 .IP "-d, --display-only"
@@ -100,7 +100,7 @@
 was configured with --enable-recursive.
 
 .IP "-s, --silent"
-Sliently skip any non-Vorbis files found. Vorbis files that can't be processed
+Silently skip any non-Vorbis files found. Vorbis files that can't be processed
 for some reason are skipped as well, though not silently. Default is to stop
 when such files are encountered.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vorbisgain/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 May 2006 16:12:55 -0000	1.2
+++ .cvsignore	13 Oct 2006 17:56:17 -0000	1.3
@@ -1 +1 @@
-vorbisgain-0.34.zip
+vorbisgain-0.36.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vorbisgain/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 May 2006 16:12:55 -0000	1.2
+++ sources	13 Oct 2006 17:56:17 -0000	1.3
@@ -1 +1 @@
-ee62352b74c610bb3eeddda038819fc8  vorbisgain-0.34.zip
+3c9df5028fa395aa98fdf0f58a5187b0  vorbisgain-0.36.zip


Index: vorbisgain.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbisgain/devel/vorbisgain.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vorbisgain.spec	4 Oct 2006 22:45:45 -0000	1.3
+++ vorbisgain.spec	13 Oct 2006 17:56:17 -0000	1.4
@@ -1,15 +1,18 @@
 Name:           vorbisgain
-Version:        0.34
-Release:        3%{?dist}
+Version:        0.36
+Release:        1%{?dist}
 Summary:        Adds tags to Ogg Vorbis files to adjust the volume
 
 Group:          Applications/Multimedia
 License:        LGPL
 URL:            http://sjeng.org/vorbisgain.html
 Source0:	http://sjeng.org/ftp/vorbis/%{name}-%{version}.zip
+Patch0:		%{name}-spelling.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Buildrequires:  libvorbis-devel libogg-devel
+BuildRequires:	libvorbis-devel
+BuildRequires:	libogg-devel
+
 
 %description
 VorbisGain is a utility that uses a psychoacoustic method to correct the
@@ -20,28 +23,39 @@
 Nowadays most good players such as ogg123, xmms and mplayer are already
 compatible. 
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .spelling
+
 
 %build
 chmod 755 configure
 %configure --enable-recursive
 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 NEWS README
 %{_bindir}/%{name}
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.36-1
+- Update to 0.36.
+- Add patch to fix spelling errors in manpage.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.34-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Fri Oct 13 18:25:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 13 Oct 2006 11:25:14 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 telepathy-gabble.spec, 1.9, 1.10
Message-ID: <200610131825.k9DIPGku019579@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19558

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.13-1
- Update to 0.3.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Oct 2006 22:46:54 -0000	1.9
+++ .cvsignore	13 Oct 2006 18:25:13 -0000	1.10
@@ -1 +1 @@
-telepathy-gabble-0.3.11.tar.gz
+telepathy-gabble-0.3.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Oct 2006 22:46:54 -0000	1.9
+++ sources	13 Oct 2006 18:25:13 -0000	1.10
@@ -1 +1 @@
-a76a36d33374e339a25760678e4baae9  telepathy-gabble-0.3.11.tar.gz
+5c450c77155aec13d4762b38b3ccb980  telepathy-gabble-0.3.13.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- telepathy-gabble.spec	11 Oct 2006 22:46:54 -0000	1.9
+++ telepathy-gabble.spec	13 Oct 2006 18:25:13 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.11
+Version:        0.3.13
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.13-1
+- Update to 0.3.13.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.11-1
 - Update to 0.3.11.
 



From fedora-extras-commits at redhat.com  Fri Oct 13 18:56:55 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Fri, 13 Oct 2006 11:56:55 -0700
Subject: kadischi kadischi.spec,1.44,1.45
Message-ID: <200610131856.k9DIutHS020132@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20113/kadischi

Modified Files:
	kadischi.spec 
Log Message:
Re-add glib2-devel for BuildRequires


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kadischi.spec	22 Sep 2006 14:05:03 -0000	1.44
+++ kadischi.spec	13 Oct 2006 18:56:53 -0000	1.45
@@ -2,7 +2,7 @@
 
 Name:           kadischi
 Version:        3.4
-Release:        3.%{alphatag}
+Release:        4.%{alphatag}
 Summary:        LiveCD generation utility 
 
 Group:          Applications/System
@@ -11,7 +11,7 @@
 Source0:        kadischi.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kudzu-devel intltool automake desktop-file-utils
+BuildRequires:  kudzu-devel intltool automake desktop-file-utils glib2-devel
 Requires:       anaconda busybox-anaconda syslinux mkisofs squashfs-tools
 Requires:       usermode gnome-python2-gtkhtml2
 AutoReqProv:    on
@@ -91,6 +91,10 @@
 %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo
 
 %changelog
+* Fri Oct 13 2006 <jasperhartline at adelphia.net> 3.4-3.20061013cvs
+- Add glib2-devel as BuildRequires.
+
+
 * Fri Sep 22 2006 <jasperhartline at adelphia.net> 3.4-3.20060922cvs
 - Remove glib2-devel and autoconf as BuildRequires.
 - Remove Python, PERL and e2fsprogs as Requires.



From fedora-extras-commits at redhat.com  Fri Oct 13 18:57:47 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Fri, 13 Oct 2006 11:57:47 -0700
Subject: rpms/sword/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610131857.k9DIvn0p020202@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20183

Modified Files:
	.cvsignore sources 
Log Message:
New Release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2005 11:54:45 -0000	1.2
+++ .cvsignore	13 Oct 2006 18:57:47 -0000	1.3
@@ -1 +1 @@
-sword-1.5.8.tar.gz
+sword-1.5.9-1.src.rpm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 11:54:45 -0000	1.2
+++ sources	13 Oct 2006 18:57:47 -0000	1.3
@@ -1 +1 @@
-c36398c84bfb044c0c66ef3ffcf29400  sword-1.5.8.tar.gz
+2718a640384bf378fc8d229514f8abbd  sword-1.5.9-1.src.rpm



From fedora-extras-commits at redhat.com  Fri Oct 13 19:32:36 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 13 Oct 2006 12:32:36 -0700
Subject: rpms/tinyerp/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tinyerp-client.patch, 1.6, 1.7 tinyerp-server.patch, 1.7,
	1.8 tinyerp.spec, 1.21, 1.22
Message-ID: <200610131932.k9DJWdJR023494@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23463

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream version 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Sep 2006 15:00:44 -0000	1.8
+++ .cvsignore	13 Oct 2006 19:32:36 -0000	1.9
@@ -1,2 +1,2 @@
-tinyerp-client-3.4.1.tar.gz
-tinyerp-server-3.4.1.tar.gz
+tinyerp-client-3.4.2.tar.gz
+tinyerp-server-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 15:00:44 -0000	1.8
+++ sources	13 Oct 2006 19:32:36 -0000	1.9
@@ -1,2 +1,2 @@
-dc81fc8d1e73f16570fd2ab42445f2f7  tinyerp-client-3.4.1.tar.gz
-7d4233217a6c34efa42e0afaa5a10d34  tinyerp-server-3.4.1.tar.gz
+962bb88bc7019d6dc3e8863889524e0f  tinyerp-client-3.4.2.tar.gz
+f360588ac94887c6fdf13c448c35fdc1  tinyerp-server-3.4.2.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp-client.patch	27 Sep 2006 15:00:44 -0000	1.6
+++ tinyerp-client.patch	13 Oct 2006 19:32:36 -0000	1.7
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.4.1.orig/bin/tinyerp-client.py tinyerp-client-3.4.1/bin/tinyerp-client.py
---- tinyerp-client-3.4.1.orig/bin/tinyerp-client.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-client-3.4.1/bin/tinyerp-client.py	2006-09-13 15:58:36.000000000 +0200
+diff -Nru tinyerp-client-3.4.2.orig/bin/tinyerp-client.py tinyerp-client-3.4.2/bin/tinyerp-client.py
+--- tinyerp-client-3.4.2.orig/bin/tinyerp-client.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-client-3.4.2/bin/tinyerp-client.py	2006-10-13 14:18:37.000000000 +0200
 @@ -73,14 +73,13 @@
  import pango
  

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp-server.patch	27 Sep 2006 15:00:44 -0000	1.7
+++ tinyerp-server.patch	13 Oct 2006 19:32:36 -0000	1.8
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-server-3.4.1.orig/setup.py tinyerp-server-3.4.1/setup.py
---- tinyerp-server-3.4.1.orig/setup.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-server-3.4.1/setup.py	2006-09-26 22:20:45.000000000 +0200
+diff -Nru tinyerp-server-3.4.2.orig/setup.py tinyerp-server-3.4.2/setup.py
+--- tinyerp-server-3.4.2.orig/setup.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-server-3.4.2/setup.py	2006-10-13 15:39:00.000000000 +0200
 @@ -28,11 +28,21 @@
  
  included_addons = [


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tinyerp.spec	27 Sep 2006 15:00:44 -0000	1.21
+++ tinyerp.spec	13 Oct 2006 19:32:36 -0000	1.22
@@ -20,7 +20,7 @@
 
 
 Name:		tinyerp
-Version:	3.4.1
+Version:	3.4.2
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Dan Horak <dan[at]danny.cz> 3.4.2-1
+- update to upstream version 3.4.2
+
 * Wed Sep 27 2006 Dan Horak <dan[at]danny.cz> 3.4.1-1
 - removed workaround for font path problems on devel
 - update to upstream version 3.4.1



From fedora-extras-commits at redhat.com  Fri Oct 13 19:34:56 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Fri, 13 Oct 2006 12:34:56 -0700
Subject: rpms/gnubiff import.log,1.4,1.5
Message-ID: <200610131934.k9DJYwu9023601@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23570

Modified Files:
	import.log 
Log Message:
auto-import gnubiff-2.2.2-3 on branch devel from gnubiff-2.2.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	28 Aug 2006 17:31:05 -0000	1.4
+++ import.log	13 Oct 2006 19:34:56 -0000	1.5
@@ -1,3 +1,4 @@
 gnubiff-2_2_1-2_fc6:HEAD:gnubiff-2.2.1-2.fc6.src.rpm:1148444627
 gnubiff-2_2_2-1:HEAD:gnubiff-2.2.2-1.src.rpm:1155081764
 gnubiff-2_2_2-2_fc6:HEAD:gnubiff-2.2.2-2.fc6.src.rpm:1156786285
+gnubiff-2_2_2-3:HEAD:gnubiff-2.2.2-3.src.rpm:1160768093



From fedora-extras-commits at redhat.com  Fri Oct 13 19:34:57 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Fri, 13 Oct 2006 12:34:57 -0700
Subject: rpms/gnubiff/devel gnubiff.spec,1.3,1.4
Message-ID: <200610131934.k9DJYxLL023605@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23570/devel

Modified Files:
	gnubiff.spec 
Log Message:
auto-import gnubiff-2.2.2-3 on branch devel from gnubiff-2.2.2-3.src.rpm


Index: gnubiff.spec
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/devel/gnubiff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnubiff.spec	28 Aug 2006 17:31:05 -0000	1.3
+++ gnubiff.spec	13 Oct 2006 19:34:56 -0000	1.4
@@ -1,6 +1,6 @@
 Name:	gnubiff
 Version:	2.2.2        
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A mail notification program
 
 Group:	Applications/Internet
@@ -64,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 13 2006 Damien Durand <splinux at fedoraproject.org> - 2.2.2-3
+- Bump Release
+
 * Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 2.2.2-2
 - Bump Release
 



From fedora-extras-commits at redhat.com  Fri Oct 13 19:37:12 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 13 Oct 2006 12:37:12 -0700
Subject: rpms/tinyerp/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tinyerp-client.patch, 1.6, 1.7 tinyerp-server.patch, 1.7,
	1.8 tinyerp.spec, 1.20, 1.21
Message-ID: <200610131937.k9DJbE9M023726@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23695

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream version 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Sep 2006 15:19:35 -0000	1.8
+++ .cvsignore	13 Oct 2006 19:37:12 -0000	1.9
@@ -1,2 +1,2 @@
-tinyerp-client-3.4.1.tar.gz
-tinyerp-server-3.4.1.tar.gz
+tinyerp-client-3.4.2.tar.gz
+tinyerp-server-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 15:19:35 -0000	1.8
+++ sources	13 Oct 2006 19:37:12 -0000	1.9
@@ -1,2 +1,2 @@
-dc81fc8d1e73f16570fd2ab42445f2f7  tinyerp-client-3.4.1.tar.gz
-7d4233217a6c34efa42e0afaa5a10d34  tinyerp-server-3.4.1.tar.gz
+962bb88bc7019d6dc3e8863889524e0f  tinyerp-client-3.4.2.tar.gz
+f360588ac94887c6fdf13c448c35fdc1  tinyerp-server-3.4.2.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-client.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp-client.patch	27 Sep 2006 15:19:35 -0000	1.6
+++ tinyerp-client.patch	13 Oct 2006 19:37:12 -0000	1.7
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.4.1.orig/bin/tinyerp-client.py tinyerp-client-3.4.1/bin/tinyerp-client.py
---- tinyerp-client-3.4.1.orig/bin/tinyerp-client.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-client-3.4.1/bin/tinyerp-client.py	2006-09-13 15:58:36.000000000 +0200
+diff -Nru tinyerp-client-3.4.2.orig/bin/tinyerp-client.py tinyerp-client-3.4.2/bin/tinyerp-client.py
+--- tinyerp-client-3.4.2.orig/bin/tinyerp-client.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-client-3.4.2/bin/tinyerp-client.py	2006-10-13 14:18:37.000000000 +0200
 @@ -73,14 +73,13 @@
  import pango
  

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp-server.patch	27 Sep 2006 15:19:35 -0000	1.7
+++ tinyerp-server.patch	13 Oct 2006 19:37:12 -0000	1.8
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-server-3.4.1.orig/setup.py tinyerp-server-3.4.1/setup.py
---- tinyerp-server-3.4.1.orig/setup.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-server-3.4.1/setup.py	2006-09-26 22:20:45.000000000 +0200
+diff -Nru tinyerp-server-3.4.2.orig/setup.py tinyerp-server-3.4.2/setup.py
+--- tinyerp-server-3.4.2.orig/setup.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-server-3.4.2/setup.py	2006-10-13 15:39:00.000000000 +0200
 @@ -28,11 +28,21 @@
  
  included_addons = [


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tinyerp.spec	27 Sep 2006 15:19:35 -0000	1.20
+++ tinyerp.spec	13 Oct 2006 19:37:12 -0000	1.21
@@ -20,7 +20,7 @@
 
 
 Name:		tinyerp
-Version:	3.4.1
+Version:	3.4.2
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Dan Horak <dan[at]danny.cz> 3.4.2-1
+- update to upstream version 3.4.2
+
 * Wed Sep 27 2006 Dan Horak <dan[at]danny.cz> 3.4.1-1
 - removed workaround for font path problems on devel
 - update to upstream version 3.4.1



From fedora-extras-commits at redhat.com  Fri Oct 13 19:41:04 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 13 Oct 2006 12:41:04 -0700
Subject: rpms/tinyerp/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tinyerp-client.patch, 1.6, 1.7 tinyerp-server.patch, 1.8,
	1.9 tinyerp.spec, 1.18, 1.19
Message-ID: <200610131941.k9DJf6bx023832@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23801

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream version 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Sep 2006 15:41:01 -0000	1.8
+++ .cvsignore	13 Oct 2006 19:41:04 -0000	1.9
@@ -1,2 +1,2 @@
-tinyerp-client-3.4.1.tar.gz
-tinyerp-server-3.4.1.tar.gz
+tinyerp-client-3.4.2.tar.gz
+tinyerp-server-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 15:41:01 -0000	1.8
+++ sources	13 Oct 2006 19:41:04 -0000	1.9
@@ -1,2 +1,2 @@
-dc81fc8d1e73f16570fd2ab42445f2f7  tinyerp-client-3.4.1.tar.gz
-7d4233217a6c34efa42e0afaa5a10d34  tinyerp-server-3.4.1.tar.gz
+962bb88bc7019d6dc3e8863889524e0f  tinyerp-client-3.4.2.tar.gz
+f360588ac94887c6fdf13c448c35fdc1  tinyerp-server-3.4.2.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp-client.patch	27 Sep 2006 15:41:01 -0000	1.6
+++ tinyerp-client.patch	13 Oct 2006 19:41:04 -0000	1.7
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.4.1.orig/bin/tinyerp-client.py tinyerp-client-3.4.1/bin/tinyerp-client.py
---- tinyerp-client-3.4.1.orig/bin/tinyerp-client.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-client-3.4.1/bin/tinyerp-client.py	2006-09-13 15:58:36.000000000 +0200
+diff -Nru tinyerp-client-3.4.2.orig/bin/tinyerp-client.py tinyerp-client-3.4.2/bin/tinyerp-client.py
+--- tinyerp-client-3.4.2.orig/bin/tinyerp-client.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-client-3.4.2/bin/tinyerp-client.py	2006-10-13 14:18:37.000000000 +0200
 @@ -73,14 +73,13 @@
  import pango
  

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyerp-server.patch	27 Sep 2006 15:41:01 -0000	1.8
+++ tinyerp-server.patch	13 Oct 2006 19:41:04 -0000	1.9
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-server-3.4.1.orig/setup.py tinyerp-server-3.4.1/setup.py
---- tinyerp-server-3.4.1.orig/setup.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-server-3.4.1/setup.py	2006-09-26 22:20:45.000000000 +0200
+diff -Nru tinyerp-server-3.4.2.orig/setup.py tinyerp-server-3.4.2/setup.py
+--- tinyerp-server-3.4.2.orig/setup.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-server-3.4.2/setup.py	2006-10-13 15:39:00.000000000 +0200
 @@ -28,11 +28,21 @@
  
  included_addons = [


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tinyerp.spec	27 Sep 2006 15:41:01 -0000	1.18
+++ tinyerp.spec	13 Oct 2006 19:41:04 -0000	1.19
@@ -20,7 +20,7 @@
 
 
 Name:		tinyerp
-Version:	3.4.1
+Version:	3.4.2
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Dan Horak <dan[at]danny.cz> 3.4.2-1
+- update to upstream version 3.4.2
+
 * Wed Sep 27 2006 Dan Horak <dan[at]danny.cz> 3.4.1-1
 - removed workaround for font path problems on devel
 - update to upstream version 3.4.1



From fedora-extras-commits at redhat.com  Fri Oct 13 19:47:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 13 Oct 2006 12:47:23 -0700
Subject: rpms/perl-Email-Address/FC-5 .cvsignore, 1.5,
	1.6 perl-Email-Address.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610131947.k9DJlPTs024006@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23969/FC-5

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.871.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Aug 2006 16:16:48 -0000	1.5
+++ .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
@@ -1 +1 @@
-Email-Address-1.870.tar.gz
+Email-Address-1.871.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/perl-Email-Address.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Email-Address.spec	12 Aug 2006 16:16:49 -0000	1.4
+++ perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.870
+Version:        1.871
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.871-1
+- Update to 1.871.
+
 * Sat Aug 12 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.870-1
 - Update to 1.870.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Aug 2006 16:16:49 -0000	1.5
+++ sources	13 Oct 2006 19:47:23 -0000	1.6
@@ -1 +1 @@
-eaa85cdfc4184f8a13c1fbdbea56f579  Email-Address-1.870.tar.gz
+1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 19:47:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 13 Oct 2006 12:47:24 -0700
Subject: rpms/perl-Email-Address/devel .cvsignore, 1.5,
	1.6 perl-Email-Address.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610131947.k9DJlQmT024013@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23969/devel

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.871.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Aug 2006 16:16:49 -0000	1.5
+++ .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
@@ -1 +1 @@
-Email-Address-1.870.tar.gz
+Email-Address-1.871.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Email-Address.spec	12 Aug 2006 16:16:49 -0000	1.4
+++ perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.870
+Version:        1.871
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.871-1
+- Update to 1.871.
+
 * Sat Aug 12 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.870-1
 - Update to 1.870.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Aug 2006 16:16:49 -0000	1.5
+++ sources	13 Oct 2006 19:47:23 -0000	1.6
@@ -1 +1 @@
-eaa85cdfc4184f8a13c1fbdbea56f579  Email-Address-1.870.tar.gz
+1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 19:52:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 13 Oct 2006 12:52:32 -0700
Subject: rpms/perl-Email-MIME-ContentType/FC-5 .cvsignore, 1.2,
	1.3 perl-Email-MIME-ContentType.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610131953.k9DJr4uW024171@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24133/FC-5

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.011.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Apr 2006 03:13:32 -0000	1.2
+++ .cvsignore	13 Oct 2006 19:52:32 -0000	1.3
@@ -1 +1 @@
-Email-MIME-ContentType-1.01.tar.gz
+Email-MIME-ContentType-1.011.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Email-MIME-ContentType.spec	29 Apr 2006 03:13:32 -0000	1.1
+++ perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:32 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.01
+Version:        1.011
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.011-1
+- Update to 1.011.
+
 * Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Apr 2006 03:13:32 -0000	1.2
+++ sources	13 Oct 2006 19:52:32 -0000	1.3
@@ -1 +1 @@
-1aa682d2841f5d568416772bbaede1c9  Email-MIME-ContentType-1.01.tar.gz
+b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 19:52:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 13 Oct 2006 12:52:33 -0700
Subject: rpms/perl-Email-MIME-ContentType/devel .cvsignore, 1.2,
	1.3 perl-Email-MIME-ContentType.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610131953.k9DJr5tv024176@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24133/devel

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.011.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Apr 2006 03:13:32 -0000	1.2
+++ .cvsignore	13 Oct 2006 19:52:33 -0000	1.3
@@ -1 +1 @@
-Email-MIME-ContentType-1.01.tar.gz
+Email-MIME-ContentType-1.011.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Email-MIME-ContentType.spec	29 Apr 2006 03:13:32 -0000	1.1
+++ perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:33 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.01
+Version:        1.011
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.011-1
+- Update to 1.011.
+
 * Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Apr 2006 03:13:32 -0000	1.2
+++ sources	13 Oct 2006 19:52:33 -0000	1.3
@@ -1 +1 @@
-1aa682d2841f5d568416772bbaede1c9  Email-MIME-ContentType-1.01.tar.gz
+b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 19:56:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:56:33 -0700
Subject: rpms/libFoundation - New directory
Message-ID: <200610131956.k9DJuZQn024334@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24308/libFoundation

Log Message:
Directory /cvs/extras/rpms/libFoundation added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 19:56:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:56:33 -0700
Subject: rpms/libFoundation/devel - New directory
Message-ID: <200610131956.k9DJuZgI024337@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24308/libFoundation/devel

Log Message:
Directory /cvs/extras/rpms/libFoundation/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 19:56:59 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:56:59 -0700
Subject: rpms/libFoundation Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610131957.k9DJv1lI024386@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24353

Added Files:
	Makefile import.log 
Log Message:
Setup of module libFoundation


--- NEW FILE Makefile ---
# Top level Makefile for module libFoundation
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 13 19:57:00 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:57:00 -0700
Subject: rpms/libFoundation/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610131957.k9DJv2Ax024389@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24353/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libFoundation


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 13 19:58:44 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:58:44 -0700
Subject: rpms/libFoundation import.log,1.1,1.2
Message-ID: <200610131958.k9DJwk7I024467@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24434

Modified Files:
	import.log 
Log Message:
auto-import libFoundation-1.1.3-10.at on branch devel from libFoundation-1.1.3-10.at.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libFoundation/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Oct 2006 19:56:59 -0000	1.1
+++ import.log	13 Oct 2006 19:58:44 -0000	1.2
@@ -0,0 +1 @@
+libFoundation-1_1_3-10_at:HEAD:libFoundation-1.1.3-10.at.src.rpm:1160769513



From fedora-extras-commits at redhat.com  Fri Oct 13 19:58:45 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:58:45 -0700
Subject: rpms/libFoundation/devel libFoundation.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610131958.k9DJwlCO024472@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24434/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libFoundation.spec 
Log Message:
auto-import libFoundation-1.1.3-10.at on branch devel from libFoundation-1.1.3-10.at.src.rpm


--- NEW FILE libFoundation.spec ---
Summary: A free implementation of OpenStep's Foundation Kit
Name: libFoundation
Version: 1.1.3
Release: 10%{?dist}
License: libFoundation license
Group: Development/Libraries
URL: http://www.opengroupware.org/
Source0: http://download.opengroupware.org/nightly/sources/releases/%{name}-%{version}-r155.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gnustep-make, gcc-objc

%description
libFoundation is a free and almost complete implementation of
Foundation Kit as defined by the OpenStep specifications, plus more
classes that come with the newest releases of OPENSTEP 4.x and
Rhapsody.

%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gnustep-make, gcc-objc

%description devel
This package contains the development files for %{name}.

%prep
%setup -q -n libfoundation

%build
LIBRARY_COMBO=fd source %{_datadir}/gnustep/makefiles/GNUstep.sh
CFLAGS="%{optflags}"; export CFLAGS
./configure
make

%install
rm -rf %{buildroot}
LIBRARY_COMBO=fd source %{_datadir}/gnustep/makefiles/GNUstep.sh
mkdir -p %{buildroot}$GNUSTEP_MAKEFILES/Additional %{buildroot}%{_libdir}
make install \
     GNUSTEP_INSTALLATION_DIR=%{buildroot}$GNUSTEP_SYSTEM_ROOT \
     INSTALL_ROOT_DIR=%{buildroot} \
     FHS_INSTALL_ROOT=%{buildroot}%{_prefix} \
     FHS_LIB_DIR=%{buildroot}%{_libdir}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS COPYING NEWS README* TODO
%{_bindir}/Defaults
%{_libdir}/libFoundation.so.*
%{_datadir}/libFoundation

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_datadir}/gnustep/makefiles/Additional/libFoundation.make
%{_libdir}/libFoundation.so

%changelog
* Wed Sep 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.3-10
- With the FHS changes some %%_includedir entries appeared as duplicates.

* Wed Aug  2 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.3-8
- Build against FHS'd gnustep-make.

* Wed Jul 19 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.3-6
- Split off a real libFoundation subpackage.

* Fri Jul 14 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.3-5
- Update to 1.1.3.

* Tue Jul 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.2-4
- Remove -lobjc-lf2 patches.

* Sun Mar 12 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libFoundation/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Oct 2006 19:57:00 -0000	1.1
+++ .cvsignore	13 Oct 2006 19:58:45 -0000	1.2
@@ -0,0 +1 @@
+libFoundation-1.1.3-r155.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libFoundation/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Oct 2006 19:57:00 -0000	1.1
+++ sources	13 Oct 2006 19:58:45 -0000	1.2
@@ -0,0 +1 @@
+7df921ab5705af28a75e62a3a8744cb6  libFoundation-1.1.3-r155.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 20:20:05 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 13:20:05 -0700
Subject: owners owners.list,1.1826,1.1827
Message-ID: <200610132020.k9DKK7ep027540@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27523

Modified Files:
	owners.list 
Log Message:
Add libFoundation.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1826
retrieving revision 1.1827
diff -u -r1.1826 -r1.1827
--- owners.list	13 Oct 2006 10:17:30 -0000	1.1826
+++ owners.list	13 Oct 2006 20:20:05 -0000	1.1827
@@ -853,6 +853,7 @@
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libeXosip2|A library that hides the complexity of using the SIP protocol|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|libFoundation|A free implementation of OpenStep's Foundation Kit|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
 Fedora Extras|libfwbuilder|Firewall Builder API|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libgadu|Gadu-gadu protocol support library|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgalago|Galago presence library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 13 20:34:10 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 13 Oct 2006 13:34:10 -0700
Subject: rpms/moodle/devel .cvsignore, 1.3, 1.4 moodle.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200610132034.k9DKYDNF027696@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27670

Modified Files:
	.cvsignore moodle.spec sources 
Log Message:
Updated to release 1.6.3.  Added new source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Aug 2006 01:11:04 -0000	1.3
+++ .cvsignore	13 Oct 2006 20:34:10 -0000	1.4
@@ -1 +1,2 @@
 moodle-1.5.4.tgz
+moodle-1.6.3.tgz


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- moodle.spec	7 Sep 2006 20:35:41 -0000	1.5
+++ moodle.spec	13 Oct 2006 20:34:10 -0000	1.6
@@ -8,8 +8,8 @@
 %define with_spellcheck 0
 
 Name:           moodle
-Version:        1.5.4
-Release:        2%{?dist}
+Version:        1.6.3
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -22,8 +22,8 @@
 Source4:        moodle-cron
 Source5:        moodle.init
 Source6:        moodle-README-rpm
-Patch0:         moodle-1.5.2-mimetex-linux.patch
-Patch1:         moodle-1.5.2-mimetex-fedora.patch
+#Patch0:         moodle-1.5.2-mimetex-linux.patch
+#Patch1:         moodle-1.5.2-mimetex-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -640,15 +640,15 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .mimetex-linux
-%patch1 -p1 -b .mimetex-fedora
+#%patch0 -p1 -b .mimetex-linux
+#%patch1 -p1 -b .mimetex-fedora
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.pl -exec chmod a+x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.cgi -exec chmod a+x {} \;
 sed -i 's/\r//' README.txt
-sed -i 's/\r//' lib/editor/plugins/SpellChecker/spell-check-logic.cgi
+sed -i 's/\r//' lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -658,6 +658,7 @@
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
 mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
 cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
+cp -ad install/lang/* $RPM_BUILD_ROOT%{moodlewebdir}/lang/
 rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
 install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
 install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
@@ -688,11 +689,12 @@
 %{moodlewebdir}/[a-ce-km-z]*
 %doc %{moodlewebdir}/doc
 %{moodlewebdir}/lib
-%exclude %{moodlewebdir}/lib/editor/plugins/SpellChecker
+%exclude %{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %{moodlewebdir}/login
 %dir %{moodlewebdir}/lang
 %{moodlewebdir}/lang/en*
-%doc %{moodlewebdir}/lang/README
+%{moodlewebdir}/lang/[^e]*_utf8
+%doc %{moodlewebdir}/lang/README.txt
 %attr(-,apache,apache) %{moodledatadir}
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
@@ -702,11 +704,16 @@
 %if %{with_spellcheck}
 %files editor-spellcheck
 %defattr(-,root,root,-)
-%{moodlewebdir}/lib/editor/plugins/SpellChecker
+%{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %endif
 
 %changelog
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com - 1.5.4-2
+* Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
+- Major changes, update to 1.6.3
+- SpellChecker moved
+- Language install method has been changed (added a cp)
+
+* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> - 1.5.4-2
 - Release bump
 
 * Thu Aug 24 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.5.4-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Aug 2006 01:11:04 -0000	1.3
+++ sources	13 Oct 2006 20:34:10 -0000	1.4
@@ -1 +1,2 @@
 86cddfda2b6d9a08b37cc3a16bda1090  moodle-1.5.4.tgz
+2f9f3fcf83ab0f18c409f3a48e07eae2  moodle-1.6.3.tgz



From fedora-extras-commits at redhat.com  Fri Oct 13 21:36:45 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 14:36:45 -0700
Subject: rpms/ktorrent/devel ktorrent-2.0.3-znow.patch, NONE,
	1.1 ktorrent.spec, 1.14, 1.15
Message-ID: <200610132136.k9DLals9030951@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30931

Modified Files:
	ktorrent.spec 
Added Files:
	ktorrent-2.0.3-znow.patch 
Log Message:
patch for ppc build

ktorrent-2.0.3-znow.patch:

--- NEW FILE ktorrent-2.0.3-znow.patch ---
--- configure.origin	2006-10-13 23:22:00.394480000 +0200
+++ configure	2006-10-13 23:25:33.143776000 +0200
@@ -31299,7 +31299,7 @@
 
 #MIN_CONFIG(3.3)
 CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS $USE_EXCEPTIONS $USE_RTTI"
-LDFLAGS="$LDFLAGS -Wl -z now"
+LDFLAGS="$LDFLAGS -Wl,-z,now"
 
 
 # Check whether --enable-largefile or --disable-largefile was given.


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ktorrent.spec	13 Oct 2006 17:27:40 -0000	1.14
+++ ktorrent.spec	13 Oct 2006 21:36:44 -0000	1.15
@@ -2,12 +2,13 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
 Source0:        http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz
+Patch0:         ktorrent-2.0.3-znow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .znow
 
 %build
 %configure	--disable-rpath
@@ -125,8 +127,9 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-1
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-2
 - Update to upstream version 2.0.3
+- added znow patch for ppc
 
 * Thu Sep 07 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.2-3
 - mass rebuild



From fedora-extras-commits at redhat.com  Fri Oct 13 21:45:33 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 14:45:33 -0700
Subject: rpms/rsibreak/devel .cvsignore, 1.2, 1.3 rsibreak.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610132145.k9DLjZWr031060@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31039

Modified Files:
	.cvsignore rsibreak.spec sources 
Log Message:
update to version 0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 16:56:16 -0000	1.2
+++ .cvsignore	13 Oct 2006 21:45:32 -0000	1.3
@@ -1 +1 @@
-Rsibreak-0.7.1.tar.bz2
+Rsibreak-0.8.0.tar.bz2


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/rsibreak.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rsibreak.spec	7 Sep 2006 18:12:57 -0000	1.3
+++ rsibreak.spec	13 Oct 2006 21:45:32 -0000	1.4
@@ -1,13 +1,13 @@
 %define desktopvendor fedora
 
 Name:           rsibreak
-Version:        0.7.1
-Release:        3%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://www.rsibreak.org
-Source0:        http://www.rsibreak.org/images/e/e2/Rsibreak-0.7.1.tar.bz2
+Source0:        http://www.rsibreak.org/images/e/e0/Rsibreak-0.8.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel libXScrnSaver-devel desktop-file-utils gettext
@@ -24,8 +24,7 @@
 
 %build
 %configure	--disable-rpath
-#it does not work with the usual %{?_smp_mflags} on my machine!
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,27 +56,18 @@
 %doc AUTHORS ChangeLog COPYING NEWS TODO
 %{_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
-%{_datadir}/icons/hicolor/128x128/apps/rsibreak.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak0.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak1.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak2.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak3.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak4.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreakx.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/dcop.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/duringbreaks.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak0.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak1.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak2.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak3.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak4.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreakx.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/timings.png
+%{_docdir}/HTML/*/rsibreak
 
 %changelog
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 0.8.0-1
+- update to version 0.8
+
 * Tue Jun 20 2006 Roland Wolters <wolters.liste at gmx.net> 0.7.1-3
 - mass rebuild of devel branch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 16:56:16 -0000	1.2
+++ sources	13 Oct 2006 21:45:32 -0000	1.3
@@ -1 +1 @@
-7846a2122805b6da3cc050d4664a52df  Rsibreak-0.7.1.tar.bz2
+62a62ff2f405461cfbf978484fb2d62c  Rsibreak-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 21:48:57 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 14:48:57 -0700
Subject: rpms/ktorrent/devel ktorrent-2.0.3-znow.patch, 1.1,
	1.2 ktorrent.spec, 1.15, 1.16
Message-ID: <200610132148.k9DLmxjY031137@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31115

Modified Files:
	ktorrent-2.0.3-znow.patch ktorrent.spec 
Log Message:
a fixed patch

ktorrent-2.0.3-znow.patch:

Index: ktorrent-2.0.3-znow.patch
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent-2.0.3-znow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktorrent-2.0.3-znow.patch	13 Oct 2006 21:36:44 -0000	1.1
+++ ktorrent-2.0.3-znow.patch	13 Oct 2006 21:48:57 -0000	1.2
@@ -1,5 +1,5 @@
---- configure.origin	2006-10-13 23:22:00.394480000 +0200
-+++ configure	2006-10-13 23:25:33.143776000 +0200
+--- ktorrent-2.0.3/configure.origin	2006-10-13 23:22:00.394480000 +0200
++++ ktorrent-2.0.3/configure	2006-10-13 23:25:33.143776000 +0200
 @@ -31299,7 +31299,7 @@
  
  #MIN_CONFIG(3.3)


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ktorrent.spec	13 Oct 2006 21:36:44 -0000	1.15
+++ ktorrent.spec	13 Oct 2006 21:48:57 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
@@ -127,7 +127,7 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-2
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-3
 - Update to upstream version 2.0.3
 - added znow patch for ppc
 



From fedora-extras-commits at redhat.com  Fri Oct 13 21:58:29 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 14:58:29 -0700
Subject: rpms/rsibreak/FC-5 .cvsignore, 1.2, 1.3 rsibreak.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610132158.k9DLwVcS031235@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31214

Modified Files:
	.cvsignore rsibreak.spec sources 
Log Message:
update to version 0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 16:56:16 -0000	1.2
+++ .cvsignore	13 Oct 2006 21:58:29 -0000	1.3
@@ -1 +1 @@
-Rsibreak-0.7.1.tar.bz2
+Rsibreak-0.8.0.tar.bz2


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/FC-5/rsibreak.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rsibreak.spec	7 Sep 2006 18:13:48 -0000	1.3
+++ rsibreak.spec	13 Oct 2006 21:58:29 -0000	1.4
@@ -1,13 +1,13 @@
 %define desktopvendor fedora
 
 Name:           rsibreak
-Version:        0.7.1
-Release:        3%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://www.rsibreak.org
-Source0:        http://www.rsibreak.org/images/e/e2/Rsibreak-0.7.1.tar.bz2
+Source0:        http://www.rsibreak.org/images/e/e0/Rsibreak-0.8.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel libXScrnSaver-devel desktop-file-utils gettext
@@ -24,8 +24,7 @@
 
 %build
 %configure	--disable-rpath
-#it does not work with the usual %{?_smp_mflags} on my machine!
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,27 +56,18 @@
 %doc AUTHORS ChangeLog COPYING NEWS TODO
 %{_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
-%{_datadir}/icons/hicolor/128x128/apps/rsibreak.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak0.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak1.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak2.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak3.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak4.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreakx.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/dcop.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/duringbreaks.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak0.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak1.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak2.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak3.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak4.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreakx.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/timings.png
+%{_docdir}/HTML/*/rsibreak
 
 %changelog
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 0.8.0-1
+- update to version 0.8
+
 * Tue Jun 20 2006 Roland Wolters <wolters.liste at gmx.net> 0.7.1-3
 - mass rebuild of devel branch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 16:56:16 -0000	1.2
+++ sources	13 Oct 2006 21:58:29 -0000	1.3
@@ -1 +1 @@
-7846a2122805b6da3cc050d4664a52df  Rsibreak-0.7.1.tar.bz2
+62a62ff2f405461cfbf978484fb2d62c  Rsibreak-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 21:59:49 2006
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Fri, 13 Oct 2006 14:59:49 -0700
Subject: CVSROOT avail,1.36,1.37
Message-ID: <200610132159.k9DLxnBc031297@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279

Modified Files:
	avail 
Log Message:
Adding web editing privileges for glezos



Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- avail	21 Sep 2006 12:14:34 -0000	1.36
+++ avail	13 Oct 2006 21:59:46 -0000	1.37
@@ -21,7 +21,7 @@
 # Fedora Web site
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade,bjensen | web
-avail | havill,hp,nman64,ivazquez,jkeating | web
+avail | havill,hp,nman64,ivazquez,jkeating,glezos | web
 avail | katzj | web/html/About/Projects/anaconda-installer
 avail | blizzard,krh | web/html/About/Projects/desktop
 avail | sopwith,dwalsh,kwade | web/html/About/Projects



From fedora-extras-commits at redhat.com  Fri Oct 13 22:06:27 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 15:06:27 -0700
Subject: rpms/ktorrent/FC-5 ktorrent.spec,1.9,1.10
Message-ID: <200610132206.k9DM6T6w001806@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1789

Modified Files:
	ktorrent.spec 
Log Message:
Patch for ppc architecture


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ktorrent.spec	13 Oct 2006 17:28:38 -0000	1.9
+++ ktorrent.spec	13 Oct 2006 22:06:27 -0000	1.10
@@ -2,12 +2,13 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
 Source0:        http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz
+Patch0:         ktorrent-2.0.3-znow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .znow
 
 %build
 %configure	--disable-rpath
@@ -125,8 +127,9 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-1
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-3
 - Update to upstream version 2.0.3
+- added znow patch for ppc
 
 * Thu Sep 07 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.2-3
 - mass rebuild



From fedora-extras-commits at redhat.com  Fri Oct 13 22:13:20 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 15:13:20 -0700
Subject: rpms/ktorrent/FC-5 ktorrent-2.0.3-znow.patch, NONE,
	1.1 ktorrent.spec, 1.10, 1.11
Message-ID: <200610132213.k9DMDMiA002228@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2200

Modified Files:
	ktorrent.spec 
Added Files:
	ktorrent-2.0.3-znow.patch 
Log Message:
actually added the patch

ktorrent-2.0.3-znow.patch:

--- NEW FILE ktorrent-2.0.3-znow.patch ---
--- ktorrent-2.0.3/configure.origin	2006-10-13 23:22:00.394480000 +0200
+++ ktorrent-2.0.3/configure	2006-10-13 23:25:33.143776000 +0200
@@ -31299,7 +31299,7 @@
 
 #MIN_CONFIG(3.3)
 CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS $USE_EXCEPTIONS $USE_RTTI"
-LDFLAGS="$LDFLAGS -Wl -z now"
+LDFLAGS="$LDFLAGS -Wl,-z,now"
 
 
 # Check whether --enable-largefile or --disable-largefile was given.


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ktorrent.spec	13 Oct 2006 22:06:27 -0000	1.10
+++ ktorrent.spec	13 Oct 2006 22:13:20 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
@@ -127,7 +127,7 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-3
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-4
 - Update to upstream version 2.0.3
 - added znow patch for ppc
 



From fedora-extras-commits at redhat.com  Sat Oct 14 09:35:59 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 14 Oct 2006 02:35:59 -0700
Subject: rpms/mediawiki/devel .cvsignore, 1.6, 1.7 mediawiki.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200610140936.k9E9a1wJ009732@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9711

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
Update to 1.8.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Oct 2006 21:06:58 -0000	1.6
+++ .cvsignore	14 Oct 2006 09:35:59 -0000	1.7
@@ -1 +1 @@
-mediawiki-1.8.1.tar.gz
+mediawiki-1.8.2.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mediawiki.spec	11 Oct 2006 21:06:58 -0000	1.7
+++ mediawiki.spec	14 Oct 2006 09:35:59 -0000	1.8
@@ -1,8 +1,8 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.8.1
-Release:        3%{?dist}
+Version:        1.8.2
+Release:        4%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
 Group:          Applications/Internet
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.2-4
+- Update to 1.8.2.
+
 * Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.1-3
 - Update to 1.8.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Oct 2006 21:06:58 -0000	1.6
+++ sources	14 Oct 2006 09:35:59 -0000	1.7
@@ -1 +1 @@
-9693c36a139715c9984495cb6ebc5646  mediawiki-1.8.1.tar.gz
+79113e7ea8d7e7c5437e633259af4a11  mediawiki-1.8.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 11:14:34 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Sat, 14 Oct 2006 04:14:34 -0700
Subject: rpms/ktorrent/devel ktorrent.spec,1.16,1.17
Message-ID: <200610141114.k9EBEafJ016303@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16286

Modified Files:
	ktorrent.spec 
Log Message:
update minor number for fc5 -> devel update


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ktorrent.spec	13 Oct 2006 21:48:57 -0000	1.16
+++ ktorrent.spec	14 Oct 2006 11:14:34 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
@@ -127,7 +127,7 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-3
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-4
 - Update to upstream version 2.0.3
 - added znow patch for ppc
 



From fedora-extras-commits at redhat.com  Sat Oct 14 11:20:43 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sat, 14 Oct 2006 04:20:43 -0700
Subject: rpms/bcm43xx-fwcutter/devel .cvsignore, 1.3,
	1.4 bcm43xx-fwcutter.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610141120.k9EBKjK6016394@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373

Modified Files:
	.cvsignore bcm43xx-fwcutter.spec sources 
Log Message:
update to 005


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2006 06:42:40 -0000	1.3
+++ .cvsignore	14 Oct 2006 11:20:43 -0000	1.4
@@ -1 +1 @@
-bcm43xx-fwcutter-004.tar.bz2
+bcm43xx-fwcutter-005.tar.bz2


Index: bcm43xx-fwcutter.spec
===================================================================
RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/bcm43xx-fwcutter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bcm43xx-fwcutter.spec	11 Sep 2006 06:31:06 -0000	1.3
+++ bcm43xx-fwcutter.spec	14 Oct 2006 11:20:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bcm43xx-fwcutter
-Version:        004
-Release:        2%{?dist}
+Version:        005
+Release:        1%{?dist}
 Summary:        Firmware extraction tool for Broadcom wireless driver
 
 Group:          System Environment/Base
@@ -47,6 +47,9 @@
 %doc README README.Fedora modprobe.bcm43xx
 
 %changelog
+* Sat Oct 14 2006 David Woodhouse <dwmw2 at infradead.org> 005-1
+- Update to 005
+
 * Mon Sep 11 2006 David Woodhouse <dwmw2 at infradead.org> 004-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2006 06:42:40 -0000	1.3
+++ sources	14 Oct 2006 11:20:43 -0000	1.4
@@ -1 +1 @@
-6a6ab01b56b1e191fa54d60a015fecd9  bcm43xx-fwcutter-004.tar.bz2
+af9d7ce9794b00f0ee73d3a6bfb321ac  bcm43xx-fwcutter-005.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 14 11:38:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:38:07 -0700
Subject: rpms/fbg - New directory
Message-ID: <200610141138.k9EBc9Q7016588@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16562/fbg

Log Message:
Directory /cvs/extras/rpms/fbg added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 11:38:08 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:38:08 -0700
Subject: rpms/fbg/devel - New directory
Message-ID: <200610141138.k9EBcANU016593@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16562/fbg/devel

Log Message:
Directory /cvs/extras/rpms/fbg/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 11:38:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:38:23 -0700
Subject: rpms/fbg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610141138.k9EBcPnl016639@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611

Added Files:
	Makefile import.log 
Log Message:
Setup of module fbg


--- NEW FILE Makefile ---
# Top level Makefile for module fbg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 14 11:38:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:38:24 -0700
Subject: rpms/fbg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610141138.k9EBcQAN016642@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fbg


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 14 11:39:37 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:39:37 -0700
Subject: rpms/fbg import.log,1.1,1.2
Message-ID: <200610141140.k9EBe9Io016734@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16695

Modified Files:
	import.log 
Log Message:
auto-import fbg-0.9-2.fc6 on branch devel from fbg-0.9-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fbg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2006 11:38:23 -0000	1.1
+++ import.log	14 Oct 2006 11:39:37 -0000	1.2
@@ -0,0 +1 @@
+fbg-0_9-2_fc6:HEAD:fbg-0.9-2.fc6.src.rpm:1160826575



From fedora-extras-commits at redhat.com  Sat Oct 14 11:39:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:39:38 -0700
Subject: rpms/fbg/devel fbg-fixes.patch, NONE, 1.1 fbg.desktop, NONE,
	1.1 fbg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610141140.k9EBeA0n016740@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16695/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fbg-fixes.patch fbg.desktop fbg.spec 
Log Message:
auto-import fbg-0.9-2.fc6 on branch devel from fbg-0.9-2.fc6.src.rpm

fbg-fixes.patch:

--- NEW FILE fbg-fixes.patch ---
diff -ur fbg-0.9/configure fbg-0.9.new/configure
--- fbg-0.9/configure	2002-12-27 05:42:50.000000000 +0100
+++ fbg-0.9.new/configure	2006-10-11 21:51:32.000000000 +0200
@@ -6761,13 +6761,13 @@
 test "$prefix" = "NONE" && prefix=/usr/local
 test "$exec_prefix" = "NONE" && exec_prefix=$prefix
 
-eval FBGDATADIR="$prefix/games/$PACKAGE"
+eval FBGDATADIR="$prefix/share/$PACKAGE"
 cat >>confdefs.h <<_ACEOF
 #define FBGDATADIR "$FBGDATADIR"
 _ACEOF
 
 
-datadir="\$(prefix)/games"
+datadir="\$(prefix)/share"
 
 
           ac_config_files="$ac_config_files Makefile"
diff -ur fbg-0.9/configure.in fbg-0.9.new/configure.in
--- fbg-0.9/configure.in	2002-12-27 05:42:44.000000000 +0100
+++ fbg-0.9.new/configure.in	2006-10-11 21:51:32.000000000 +0200
@@ -125,11 +125,11 @@
 test "$prefix" = "NONE" && prefix=/usr/local
 test "$exec_prefix" = "NONE" && exec_prefix=$prefix
 
-eval FBGDATADIR="$prefix/games/$PACKAGE"
+eval FBGDATADIR="$prefix/share/$PACKAGE"
 AC_DEFINE_UNQUOTED(FBGDATADIR, "$FBGDATADIR")
 
-dnl Put data in $(prefix)/games/
-AC_SUBST(datadir, "\$(prefix)/games")
+dnl Put data in $(prefix)/share/
+AC_SUBST(datadir, "\$(prefix)/share")
 
 dnl Output Makefiles
 AC_OUTPUT(Makefile)
diff -ur fbg-0.9/src/fbgGame.cc fbg-0.9.new/src/fbgGame.cc
--- fbg-0.9/src/fbgGame.cc	2002-12-23 23:50:38.000000000 +0100
+++ fbg-0.9.new/src/fbgGame.cc	2006-10-13 15:33:21.000000000 +0200
@@ -217,8 +217,8 @@
 	else {
 		lastLine = SDL_GetTicks();
 		setPaused(true);
-		SDL_CreateThread(&fbgGame::removeLineGain, NULL);
-		if (light) SDL_CreateThread(&fbgGame::lightLineGainRedraw, NULL);
+		removeLineGainID = SDL_CreateThread(&fbgGame::removeLineGain, NULL);
+		if (light) lightLineGainRedrawID = SDL_CreateThread(&fbgGame::lightLineGainRedraw, NULL);
 	}
 
 	// Check for Game Over
@@ -381,6 +381,8 @@
 						setWantsToMove(false);
 					}
 				break;
+				default:
+				break;
 			}
 		break;
 		case SDL_KEYDOWN:
@@ -431,6 +433,8 @@
 						fbgGame::issue(EVT_REDRAW);
 					}
 				break;
+				default:
+				break;
 			}
 		break;
 		case SDL_QUIT:
@@ -438,6 +442,64 @@
 		break;
 		}
 	break;
+	case GAMEOVER:
+		switch (event.type) {
+		case SDL_USEREVENT:
+			switch (event.user.code) {
+			case EVT_REDRAW:
+				if (light) renderer.draw();	// Draw Scene (only necessary with the light renderer)
+			break;
+			}
+		break;
+		case SDL_KEYUP:
+			switch (event.key.keysym.sym) {
+				case SDLK_ESCAPE:
+					setState(QUIT);
+				break;
+				case SDLK_SPACE:
+				case SDLK_RETURN:
+					// restart the game on a key press
+					if (removeLineGainID) {
+						SDL_WaitThread(removeLineGainID, NULL);
+						removeLineGainID = NULL;
+					}
+					if (lightLineGainRedrawID) {
+						SDL_WaitThread(lightLineGainRedrawID, NULL);
+						lightLineGainRedrawID = NULL;
+					}
+
+					nextBlockIndex = rand()%blockSet.size();
+					cycleBlocks();
+
+					downHeld = false;leftHeld = false;rightHeld = false;
+					wantsToMove = false;
+
+					downStart = -1;lines = 0;level = 1; /*startLevel*/;score = 0;
+					curBlockAdjust = 40.0f;
+					setState(GAMEPLAY);
+
+					if (btype >= 0) lines = 25;
+					for (int row=0; row < 18; row++) {
+						for (int col=0; col < 10; col++)  {
+							if (btype >= 0 && row >= 18-btype*2) matrix[row][col] = rand()%2 ? 0 : rand()%(blockSet.size());
+							else matrix[row][col] = 0;
+						}
+					}
+					setLastDrop(SDL_GetTicks());
+					renderer.draw();
+				break;
+				default:
+				break;
+			}
+		break;
+		case SDL_VIDEOEXPOSE:
+			renderer.draw();
+		break;
+		case SDL_QUIT:
+			setState(QUIT);
+		break;
+		}
+	break;
 	default:
 		switch (event.type) {
 		case SDL_USEREVENT:
@@ -452,6 +514,8 @@
 			case SDLK_ESCAPE:
 				setState(QUIT);
 			break;
+			default:
+			break;
 			}
 		break;
 		case SDL_VIDEOEXPOSE:
@@ -489,6 +553,7 @@
 			while (SDL_PollEvent(&event)) {
 				processEvent(event);
 			}
+			SDL_Delay(1);
 		}
 	}
 }
diff -ur fbg-0.9/src/fbgMain.cc fbg-0.9.new/src/fbgMain.cc
--- fbg-0.9/src/fbgMain.cc	2002-12-23 23:50:38.000000000 +0100
+++ fbg-0.9.new/src/fbgMain.cc	2006-10-13 15:40:50.000000000 +0200
@@ -139,10 +139,11 @@
 	bool quit=false;
 	// Wait for a key press to start the game
 	bool keyPressed=false;
-	game.setLastDrop(SDL_GetTicks());
-	game.setState(BEGINWAIT);
+	// We want to begin straight away
+	//game.setState(BEGINWAIT);
 	game.getRenderer()->draw();
 	game.getRenderer()->draw();	// Draw twice for double buffering
+	game.setLastDrop(SDL_GetTicks());
 	
 	game.gameplayLoop();
 }
diff -ur fbg-0.9/src/fbgOpenGLRenderer.cc fbg-0.9.new/src/fbgOpenGLRenderer.cc
--- fbg-0.9/src/fbgOpenGLRenderer.cc	2002-12-23 23:50:38.000000000 +0100
+++ fbg-0.9.new/src/fbgOpenGLRenderer.cc	2006-10-13 12:20:45.000000000 +0200
@@ -645,18 +645,18 @@
 	glDisable(GL_LIGHTING);
 	glBindTexture(GL_TEXTURE_2D, gameover[0].getID());
 		glBegin(GL_TRIANGLE_STRIP);
-			glTexCoord2f(0.0f, 1.0f); glVertex3f(0.0f, -256.0f, 0.0f);
-			glTexCoord2f(0.0f, 0.0f); glVertex3f(0.0f, -512.0f, 0.0f);
-			glTexCoord2f(1.0f, 1.0f); glVertex3f(256.0f, -256.0f, 0.0f);
-			glTexCoord2f(1.0f, 0.0f); glVertex3f(256.0f, -512.0f, 0.0f);
-		glEnd();
-	glBindTexture(GL_TEXTURE_2D, gameover[1].getID());
-		glBegin(GL_TRIANGLE_STRIP);
 			glTexCoord2f(0.0f, 1.0f); glVertex3f(256.0f, -256.0f, 0.0f);
 			glTexCoord2f(0.0f, 0.0f); glVertex3f(256.0f, -512.0f, 0.0f);
 			glTexCoord2f(1.0f, 1.0f); glVertex3f(512.0f, -256.0f, 0.0f);
 			glTexCoord2f(1.0f, 0.0f); glVertex3f(512.0f, -512.0f, 0.0f);
 		glEnd();
+	glBindTexture(GL_TEXTURE_2D, gameover[1].getID());
+		glBegin(GL_TRIANGLE_STRIP);
+			glTexCoord2f(0.0f, 1.0f); glVertex3f(512.0f, -256.0f, 0.0f);
+			glTexCoord2f(0.0f, 0.0f); glVertex3f(512.0f, -512.0f, 0.0f);
+			glTexCoord2f(1.0f, 1.0f); glVertex3f(768.0f, -256.0f, 0.0f);
+			glTexCoord2f(1.0f, 0.0f); glVertex3f(768.0f, -512.0f, 0.0f);
+		glEnd();
 }
 void fbgOpenGLRenderer::drawGameplay() {
 	// Draw Matrix
diff -ur fbg-0.9/startfbg/startfbg.cc fbg-0.9.new/startfbg/startfbg.cc
--- fbg-0.9/startfbg/startfbg.cc	2002-12-23 23:50:38.000000000 +0100
+++ fbg-0.9.new/startfbg/startfbg.cc	2006-10-13 15:32:49.000000000 +0200
@@ -36,16 +36,23 @@
 
 IMPLEMENT_APP(fbglaunch)
 
-fbglaunchFrame::fbglaunchFrame(const char* argv0, const fbglaunch* newParent, const wxString& title, int w, int h) : wxFrame(NULL, -1, title, wxDefaultPosition, wxSize(w,h), wxSYSTEM_MENU | wxMINIMIZE_BOX | wxCAPTION) {
+static char *strconcat(const char *str1, const char *str2)
+{
+	static char buf[512];
+	snprintf(buf, sizeof(buf), "%s%s", str1, str2);
+	return buf;
+}
+
+fbglaunchFrame::fbglaunchFrame(const char* argv0, const fbglaunch* newParent, const wxString& title, int w, int h) : wxFrame(NULL, -1, title, wxDefaultPosition, wxSize(w,h), wxSYSTEM_MENU | wxCLOSE_BOX | wxMINIMIZE_BOX | wxCAPTION) {
 	// Set up PhysicsFS
 	PHYSFS_init(argv0);
 #ifdef WIN32
 	PHYSFS_addToSearchPath((wxString(PHYSFS_getBaseDir())+"data\\").c_str(), 1);
 	PHYSFS_addToSearchPath((wxString(PHYSFS_getUserDir())+"fbg\\data\\").c_str(), 1);
 #else
-	PHYSFS_addToSearchPath((wxString(PHYSFS_getUserDir())+".fbg/data/").c_str(), 1);
+	PHYSFS_addToSearchPath(strconcat(PHYSFS_getUserDir(), ".fbg/data/"), 1);
 	PHYSFS_addToSearchPath(FBGDATADIR "/data/", 1);
-	PHYSFS_addToSearchPath((wxString(PHYSFS_getBaseDir())+"data/").c_str(), 1);
+	PHYSFS_addToSearchPath(strconcat(PHYSFS_getBaseDir(), "data/"), 1);
 	PHYSFS_addToSearchPath("/usr/local/games/fbg/data/", 1);
 	PHYSFS_addToSearchPath("/usr/games/fbg/data/", 1);
 #endif
@@ -56,7 +63,7 @@
 		int end;
 		for (end=0; pk3list[i][end] != '\0'; end++);
 		if (pk3list[i][end-1] == '3' && pk3list[i][end-2] == 'k' && pk3list[i][end-3] == 'p' && pk3list[i][end-4] == '.') {
-			PHYSFS_addToSearchPath((wxString(PHYSFS_getRealDir(pk3list[i]))+pk3list[i]).c_str(), 1);
+			PHYSFS_addToSearchPath(strconcat(PHYSFS_getRealDir(pk3list[i]), pk3list[i]), 1);
 		}
 	}
 	PHYSFS_freeList(pk3list);
@@ -67,46 +74,46 @@
 	wxPanel* pan = new wxPanel(this, -1);
 	wxBoxSizer* top = new wxBoxSizer(wxVERTICAL);
 
-	wxStaticBoxSizer* graphBox = new wxStaticBoxSizer(new wxStaticBox(pan, -1, "Graphics Options"), wxVERTICAL);
+	wxStaticBoxSizer* graphBox = new wxStaticBoxSizer(new wxStaticBox(pan, -1, wxT("Graphics Options")), wxVERTICAL);
 		wxBoxSizer* themeBox = new wxBoxSizer(wxHORIZONTAL);
-			themeBox->Add(new wxStaticText(pan, ID_RES, "Theme:"), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
+			themeBox->Add(new wxStaticText(pan, ID_RES, wxT("Theme:")), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
 				int themeCount = 0;
 				int defaultThemeIndex = 0;
 				char** list = PHYSFS_enumerateFiles("themes");
 				for (int i=0; list[i] != NULL; i++) {
-					if (PHYSFS_isDirectory(wxString("themes/")+list[i])) themeCount++;
-					if (wxString(list[i]) == wxT("default")) defaultThemeIndex = themeCount-1;
+					if (PHYSFS_isDirectory(strconcat("themes/", list[i]))) themeCount++;
+					if (wxString(list[i], wxConvUTF8) == wxT("default")) defaultThemeIndex = themeCount-1;
 				}
-				wxString* themeChoices;
+				wxString* themeChoices = NULL;
 				if (themeCount > 0) {
 					themeChoices = new wxString[themeCount];
 					int currentTheme = 0;
 					for (int i=0; list[i] != NULL; i++) {
-						if (PHYSFS_isDirectory(wxString("themes/")+list[i])) themeChoices[currentTheme++] = wxString(list[i]);
+						if (PHYSFS_isDirectory(strconcat("themes/", list[i]))) themeChoices[currentTheme++] = wxString(list[i], wxConvUTF8);
 					}
 				}
 				PHYSFS_freeList(list);
 			themeMenu = new wxChoice(pan, ID_THEME, wxDefaultPosition, wxDefaultSize, themeCount, themeChoices);
-			delete themeChoices;
+			delete[] themeChoices;
 			themeMenu->SetSelection(defaultThemeIndex);
 			themeBox->Add(themeMenu, 0, wxALIGN_RIGHT);
 #ifdef ENABLE_SOUND
 		wxBoxSizer* musicBox = new wxBoxSizer(wxHORIZONTAL);
-			musicCheck = new wxCheckBox(pan, ID_MUSIC_CHECK, "Music");
+			musicCheck = new wxCheckBox(pan, ID_MUSIC_CHECK, wxT("Music"));
 			musicBox->Add(musicCheck, 1, wxALIGN_LEFT);
-			musicBox->Add(new wxStaticText(pan, -1, "File: ", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 1, wxALIGN_CENTER_VERTICAL);
+			musicBox->Add(new wxStaticText(pan, -1, wxT("File: "), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 1, wxALIGN_CENTER_VERTICAL);
 			int musicCount = 0;
 			int defaultMusicIndex = 0;
 			char** mList = PHYSFS_enumerateFiles("music");
 			for (int i=0; mList[i] != NULL; i++) {
 				musicCount++;
-				if (wxString(mList[i]) == wxT("typea.it")) defaultMusicIndex = musicCount-1;
+				if (wxString(mList[i], wxConvUTF8) == wxT("typea.it")) defaultMusicIndex = musicCount-1;
 			}
 			wxString* musicChoices;
 			if (musicCount > 0) {
 				musicChoices = new wxString[musicCount];
 				int currentMusic = 0;
-				for (int i=0; mList[i] != NULL; i++) musicChoices[currentMusic] = wxString(mList[i]);
+				for (int i=0; mList[i] != NULL; i++) musicChoices[currentMusic] = wxString(mList[i], wxConvUTF8);
 			}
 			PHYSFS_freeList(mList);
 			musicMenu = new wxChoice(pan, ID_MUSIC, wxDefaultPosition, wxDefaultSize, musicCount, musicChoices);
@@ -115,19 +122,19 @@
 			musicBox->Add(musicMenu, 0, wxALIGN_RIGHT);
 #endif
 		wxBoxSizer* resBox = new wxBoxSizer(wxHORIZONTAL);
-			resBox->Add(new wxStaticText(pan, ID_RES, "Resolution:"), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
-			wxString resChoices[4] = {"320x240", "640x480", "800x600", "1024x768"};
+			resBox->Add(new wxStaticText(pan, ID_RES, wxT("Resolution:")), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
+			wxString resChoices[4] = { wxT("320x240"), wxT("640x480"), wxT("800x600"), wxT("1024x768")};
 			resMenu = new wxChoice(pan, ID_RES, wxDefaultPosition, wxDefaultSize, 4, resChoices);
 			resMenu->SetSelection(1);
 			resBox->Add(resMenu, 0, wxALIGN_RIGHT);
 		wxBoxSizer* bppBox = new wxBoxSizer(wxHORIZONTAL);
-			bppBox->Add(new wxStaticText(pan, ID_BPP, "Color Depth:"), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
-			wxString bppChoices[3] = {"16", "24", "32"};
+			bppBox->Add(new wxStaticText(pan, ID_BPP, wxT("Color Depth:")), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
+			wxString bppChoices[3] = {wxT("16"), wxT("24"), wxT("32")};
 			bppMenu = new wxChoice(pan, ID_BPP, wxDefaultPosition, wxDefaultSize, 3, bppChoices);
 			bppMenu->SetSelection(2);
 			bppBox->Add(bppMenu, 0, wxALIGN_RIGHT);
 		wxBoxSizer* fsBox = new wxBoxSizer(wxHORIZONTAL);
-			fsCheck = new wxCheckBox(pan, ID_FS, "Run Fullscreen");
+			fsCheck = new wxCheckBox(pan, ID_FS, wxT("Run Fullscreen"));
 			fsBox->Add(fsCheck, 0, wxALIGN_LEFT);
 #ifdef WIN32
 			fsCheck->SetValue(true);
@@ -135,7 +142,7 @@
 			fsCheck->SetValue(false);
 #endif
 		wxBoxSizer* lightBox = new wxBoxSizer(wxHORIZONTAL);
-			lightCheck = new wxCheckBox(pan, ID_LIGHT, "\"Light\" Mode (uses less CPU)");
+			lightCheck = new wxCheckBox(pan, ID_LIGHT, wxT("\"Light\" Mode (uses less CPU)"));
 			lightBox->Add(lightCheck, 0, wxALIGN_LEFT);
 		graphBox->Add(themeBox, 0, wxEXPAND);
 #ifdef ENABLE_SOUND
@@ -145,19 +152,19 @@
 		graphBox->Add(bppBox, 0, wxEXPAND);
 		graphBox->Add(fsBox, 0, wxALIGN_LEFT);
 		graphBox->Add(lightBox, 0, wxALIGN_LEFT);
-	wxStaticBoxSizer* gameBox = new wxStaticBoxSizer(new wxStaticBox(pan, -1, "Gameplay Options"), wxVERTICAL);
+	wxStaticBoxSizer* gameBox = new wxStaticBoxSizer(new wxStaticBox(pan, -1, wxT("Gameplay Options")), wxVERTICAL);
 		wxBoxSizer* levelBox = new wxBoxSizer(wxHORIZONTAL);
-			levelBox->Add(new wxStaticText(pan, -1, "Starting Level:"), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
-			wxString levelChoices[10] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
+			levelBox->Add(new wxStaticText(pan, -1, wxT("Starting Level:")), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
+			wxString levelChoices[10] = {wxT("0"), wxT("1"), wxT("2"), wxT("3"), wxT("4"), wxT("5"), wxT("6"), wxT("7"), wxT("8"), wxT("9")};
 			levelMenu = new wxChoice(pan, ID_LEVEL, wxDefaultPosition, wxDefaultSize, 10, levelChoices);
 			levelMenu->SetSelection(0);
 			levelBox->Add(levelMenu, 0, wxALIGN_RIGHT);
 		gameBox->Add(levelBox, 0, wxEXPAND);
 		wxBoxSizer* btypeBox = new wxBoxSizer(wxHORIZONTAL);
-			btypeCheck = new wxCheckBox(pan, ID_BTYPE_CHECK, "B-Type");
+			btypeCheck = new wxCheckBox(pan, ID_BTYPE_CHECK, wxT("B-Type"));
 			btypeBox->Add(btypeCheck, 1, wxALIGN_LEFT);
-			btypeBox->Add(new wxStaticText(pan, -1, "Height: ", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 1, wxALIGN_CENTER_VERTICAL);
-			wxString btypeChoices[9] = {"0", "1", "2", "3", "4", "5"};
+			btypeBox->Add(new wxStaticText(pan, -1, wxT("Height: "), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 1, wxALIGN_CENTER_VERTICAL);
+			wxString btypeChoices[9] = {wxT("0"), wxT("1"), wxT("2"), wxT("3"), wxT("4"), wxT("5")};
 			btypeMenu = new wxChoice(pan, ID_BTYPE, wxDefaultPosition, wxDefaultSize, 6, btypeChoices);
 			btypeMenu->Enable(false);
 			btypeMenu->SetSelection(0);
@@ -171,7 +178,7 @@
 #endif
 	top->Add(graphBox, 0, wxEXPAND|wxALL, 2);
 	top->Add(gameBox, 0, wxEXPAND|wxALL, 2);
-		playButton = new wxButton(pan, ID_PLAY, "Play Falling Block Game");
+		playButton = new wxButton(pan, ID_PLAY, wxT("Play Falling Block Game"));
 		pan->SetDefaultItem(playButton);
 	top->Add(playButton, 0, wxEXPAND|wxALL, 1);
 	pan->SetAutoLayout(true);
@@ -195,16 +202,16 @@
 END_EVENT_TABLE()
 
 bool fbglaunch::OnInit() {
-	frame = new fbglaunchFrame(argv[0], this, "Falling Block Game"/* " v" VERSION*/, 400, 400);
+	frame = new fbglaunchFrame((const char *)argv[0], this, wxT("Falling Block Game")/* " v" VERSION*/, 400, 400);
 	frame->Show(true);
 	SetTopWindow(frame);
 	return true;
 }
 
 void fbglaunchFrame::clickPlay(wxCommandEvent& evt) {
-	parent->launchFBG(wxString(PHYSFS_getBaseDir())+"fbg" FBG_EXTENSION, fsCheck->GetValue(), lightCheck->GetValue(), themeMenu->GetStringSelection(),
+	parent->launchFBG(wxT("fbg" FBG_EXTENSION), fsCheck->GetValue(), lightCheck->GetValue(), themeMenu->GetStringSelection(),
 #ifdef ENABLE_SOUND
-		(musicCheck->GetValue() ? musicMenu->GetStringSelection() : wxString("")),
+		(musicCheck->GetValue() ? musicMenu->GetStringSelection() : wxString(wxT(""))),
 #endif
 		bppMenu->GetStringSelection(), resMenu->GetStringSelection(), levelMenu->GetStringSelection(), (btypeMenu->IsEnabled() ? btypeMenu->GetStringSelection() : wxString(wxT("-1"))));
 }
@@ -223,19 +230,27 @@
 const wxString& music,
 #endif
 const wxString& bpp, const wxString& res, const wxString& level, const wxString& btype) const {
-	wxString cmd = "\""+fbgBin+"\"";
-	cmd += (fs ? " -f" : " -w");
-	if (light) cmd += " --light";
-	cmd += " -t " + theme;
-#ifdef ENABLE_SOUND
-	if (music != "") cmd += " -m " + music;
-	else cmd += " --no-music ";
-#endif
-	cmd += " -d " + bpp;
-	cmd += " -r " + res;
-	cmd += " -l " + level;
-	if (btype != "-1") cmd += " -b " + btype;
-	system(cmd);
+	const char *argv[16];
+	int argc = 0;
+	argv[argc++] = strdup(fbgBin.mb_str(wxConvUTF8));
+	argv[argc++] = fs ? "-f" : "-w";
+	if (light) argv[argc++] = "--light";
+	argv[argc++] = "-t"; argv[argc++] = strdup(theme.mb_str(wxConvUTF8));
+#ifdef ENABLE_SOUND
+	if (music != wxT("")) {
+		argv[argc++] = "-m"; argv[argc++] = strdup(music.mb_str(wxConvUTF8));
+	} else argv[argc++] = "--no-music";
+#endif
+	argv[argc++] = "-d"; argv[argc++] = strdup(bpp.mb_str(wxConvUTF8));
+	argv[argc++] = "-r"; argv[argc++] = strdup(res.mb_str(wxConvUTF8));
+	argv[argc++] = "-l"; argv[argc++] = strdup(level.mb_str(wxConvUTF8));
+	if (btype != wxT("-1")) {
+		argv[argc++] = "-b";
+		argv[argc++] = strdup(btype.mb_str(wxConvUTF8));
+	}
+	argv[argc++] = NULL; 
+	  
+	execvp(argv[0], (char * const*)argv);
 }
 
 int fbglaunch::OnExit() {


--- NEW FILE fbg.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Falling Block Game
Comment=Move falling blocks to make them form a complete row
Exec=fbglaunch
Icon=fbg.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;BlocksGame;


--- NEW FILE fbg.spec ---
Name:           fbg
Version:        0.9
Release:        2%{?dist}
Summary:        Falling Block Game
Group:          Amusements/Games
License:        GPL
URL:            http://fbg.sourceforge.net/
Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
Patch0:         fbg-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel physfs-devel mikmod-devel wxGTK-devel
BuildRequires:  desktop-file-utils ImageMagick
Requires:       hicolor-icon-theme

%description
Move and rotate variously shaped falling blocks to make them form a complete
row. Once a complete row has formed it will disappear. If you make incomplete
rows the screen will fill up and when it reaches the top the game is over.


%prep
%setup -q
%patch0 -p1 -z .fix
# sigh stop autoxxx from rerunning because of our patches above.
touch aclocal.m4
touch configure
touch `find -name Makefile.in`


%build
%configure
make %{?_smp_mflags}
convert startfbg/icon.xpm %{name}.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# rm make install installed docs as we install them with %doc
rm $RPM_BUILD_ROOT/usr/doc/fbg/COPYING $RPM_BUILD_ROOT/usr/doc/fbg/README

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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 ChangeLog COPYING README TODO
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_mandir}/man6/%{name}*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-2
- Correct license from LGPL to GPL

* Fri Oct 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fbg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2006 11:38:24 -0000	1.1
+++ .cvsignore	14 Oct 2006 11:39:38 -0000	1.2
@@ -0,0 +1 @@
+fbg-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fbg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Oct 2006 11:38:24 -0000	1.1
+++ sources	14 Oct 2006 11:39:38 -0000	1.2
@@ -0,0 +1 @@
+82db64d84b6172f5676fcff69d533881  fbg-0.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 11:52:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:52:09 -0700
Subject: comps comps-fe5.xml.in,1.167,1.168 comps-fe6.xml.in,1.186,1.187
Message-ID: <200610141152.k9EBqBRQ016874@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16855/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add fbg


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- comps-fe5.xml.in	10 Oct 2006 21:08:09 -0000	1.167
+++ comps-fe5.xml.in	14 Oct 2006 11:52:09 -0000	1.168
@@ -291,6 +291,7 @@
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
       <packagereq type="optional">enigma</packagereq>
+      <packagereq type="optional">fbg</packagereq>
       <packagereq type="optional">fillets-ng</packagereq>
       <packagereq type="optional">foobillard</packagereq>
       <packagereq type="optional">fortune-mod</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- comps-fe6.xml.in	12 Oct 2006 16:13:56 -0000	1.186
+++ comps-fe6.xml.in	14 Oct 2006 11:52:09 -0000	1.187
@@ -352,6 +352,7 @@
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
       <packagereq type="optional">enigma</packagereq>
+      <packagereq type="optional">fbg</packagereq>
       <packagereq type="optional">fillets-ng</packagereq>
       <packagereq type="optional">foobillard</packagereq>
       <packagereq type="optional">fortune-mod</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct 14 11:52:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:52:43 -0700
Subject: owners owners.list,1.1827,1.1828
Message-ID: <200610141152.k9EBqj6x016909@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16892

Modified Files:
	owners.list 
Log Message:
added fbg


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1827
retrieving revision 1.1828
diff -u -r1.1827 -r1.1828
--- owners.list	13 Oct 2006 20:20:05 -0000	1.1827
+++ owners.list	14 Oct 2006 11:52:43 -0000	1.1828
@@ -371,6 +371,7 @@
 Fedora Extras|farsight|A audio/video conferencing framework|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|fatsort|Fatsort sorts the FAT of FAT16 and FAT32 filesystems|opensource at till.name|extras-qa at fedoraproject.org|
 Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|fbg|Falling Block Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|fcron|A task scheduler|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 14 14:01:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 14 Oct 2006 07:01:16 -0700
Subject: rpms/perl-Email-MIME/devel .cvsignore, 1.5, 1.6 perl-Email-MIME.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610141401.k9EE1mMS026152@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26095/devel

Modified Files:
	.cvsignore perl-Email-MIME.spec sources 
Log Message:
Update to 1.853.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2006 15:48:57 -0000	1.5
+++ .cvsignore	14 Oct 2006 14:01:16 -0000	1.6
@@ -1 +1 @@
-Email-MIME-1.852.tar.gz
+Email-MIME-1.853.tar.gz


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/perl-Email-MIME.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Email-MIME.spec	6 Sep 2006 15:48:58 -0000	1.4
+++ perl-Email-MIME.spec	14 Oct 2006 14:01:16 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME
-Version:        1.852
+Version:        1.853
 Release:        1%{?dist}
 Summary:        Easy MIME message parsing
 
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Email::MIME::ContentType) >= 1.0
+BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
 BuildRequires:  perl(Email::Simple) >= 1.91
 BuildRequires:  perl(MIME::Types) >= 1.13
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.853-1
+- Update to 1.853.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.852-1
 - Update to 1.852.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2006 15:48:58 -0000	1.5
+++ sources	14 Oct 2006 14:01:16 -0000	1.6
@@ -1 +1 @@
-d22fb9a5442e4c8b759ad86b773d5114  Email-MIME-1.852.tar.gz
+ff4f3f7c3aefbd74cb56cb513797c9fd  Email-MIME-1.853.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 14:01:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 14 Oct 2006 07:01:12 -0700
Subject: rpms/perl-Email-MIME/FC-5 .cvsignore, 1.5, 1.6 perl-Email-MIME.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610141401.k9EE1jrH026147@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26095/FC-5

Modified Files:
	.cvsignore perl-Email-MIME.spec sources 
Log Message:
Update to 1.853.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2006 15:48:57 -0000	1.5
+++ .cvsignore	14 Oct 2006 14:01:10 -0000	1.6
@@ -1 +1 @@
-Email-MIME-1.852.tar.gz
+Email-MIME-1.853.tar.gz


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/perl-Email-MIME.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Email-MIME.spec	6 Sep 2006 15:48:57 -0000	1.4
+++ perl-Email-MIME.spec	14 Oct 2006 14:01:10 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME
-Version:        1.852
+Version:        1.853
 Release:        1%{?dist}
 Summary:        Easy MIME message parsing
 
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Email::MIME::ContentType) >= 1.0
+BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
 BuildRequires:  perl(Email::Simple) >= 1.91
 BuildRequires:  perl(MIME::Types) >= 1.13
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.853-1
+- Update to 1.853.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.852-1
 - Update to 1.852.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2006 15:48:57 -0000	1.5
+++ sources	14 Oct 2006 14:01:10 -0000	1.6
@@ -1 +1 @@
-d22fb9a5442e4c8b759ad86b773d5114  Email-MIME-1.852.tar.gz
+ff4f3f7c3aefbd74cb56cb513797c9fd  Email-MIME-1.853.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 14:21:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 14 Oct 2006 07:21:31 -0700
Subject: rpms/perl-Email-MIME-Modifier/FC-5 .cvsignore, 1.3,
	1.4 perl-Email-MIME-Modifier.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200610141422.k9EEM3kK026520@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444/FC-5

Modified Files:
	.cvsignore perl-Email-MIME-Modifier.spec sources 
Log Message:
Update to 1.440.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jul 2006 14:41:39 -0000	1.3
+++ .cvsignore	14 Oct 2006 14:21:31 -0000	1.4
@@ -1 +1 @@
-Email-MIME-Modifier-1.43.tar.gz
+Email-MIME-Modifier-1.440.tar.gz


Index: perl-Email-MIME-Modifier.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/FC-5/perl-Email-MIME-Modifier.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-Modifier.spec	14 Jul 2006 14:41:39 -0000	1.2
+++ perl-Email-MIME-Modifier.spec	14 Oct 2006 14:21:31 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME-Modifier
-Version:        1.43
+Version:        1.440
 Release:        1%{?dist}
 Summary:        Modify Email::MIME Objects Easily
 
@@ -13,7 +13,7 @@
 BuildRequires:  perl(Email::MessageID) >= 1.2
 BuildRequires:  perl(Email::MIME) >= 1.82
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
-BuildRequires:  perl(Email::MIME::ContentType) >= 1.0
+BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::Simple) >= 1.92
 BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.440-1
+- Update to 1.440.
+
 * Fri Jul 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.43-1
 - Update to 1.43.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jul 2006 14:41:39 -0000	1.3
+++ sources	14 Oct 2006 14:21:31 -0000	1.4
@@ -1 +1 @@
-63abff1a4c9d70bb3f0c521b6ff1a331  Email-MIME-Modifier-1.43.tar.gz
+28eec7eeac53007243a2055bf37a4c2c  Email-MIME-Modifier-1.440.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 14:21:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 14 Oct 2006 07:21:32 -0700
Subject: rpms/perl-Email-MIME-Modifier/devel .cvsignore, 1.3,
	1.4 perl-Email-MIME-Modifier.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200610141422.k9EEM41p026525@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444/devel

Modified Files:
	.cvsignore perl-Email-MIME-Modifier.spec sources 
Log Message:
Update to 1.440.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jul 2006 14:41:45 -0000	1.3
+++ .cvsignore	14 Oct 2006 14:21:31 -0000	1.4
@@ -1 +1 @@
-Email-MIME-Modifier-1.43.tar.gz
+Email-MIME-Modifier-1.440.tar.gz


Index: perl-Email-MIME-Modifier.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/perl-Email-MIME-Modifier.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-Modifier.spec	14 Jul 2006 14:41:45 -0000	1.2
+++ perl-Email-MIME-Modifier.spec	14 Oct 2006 14:21:31 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME-Modifier
-Version:        1.43
+Version:        1.440
 Release:        1%{?dist}
 Summary:        Modify Email::MIME Objects Easily
 
@@ -13,7 +13,7 @@
 BuildRequires:  perl(Email::MessageID) >= 1.2
 BuildRequires:  perl(Email::MIME) >= 1.82
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
-BuildRequires:  perl(Email::MIME::ContentType) >= 1.0
+BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::Simple) >= 1.92
 BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.440-1
+- Update to 1.440.
+
 * Fri Jul 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.43-1
 - Update to 1.43.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jul 2006 14:41:45 -0000	1.3
+++ sources	14 Oct 2006 14:21:31 -0000	1.4
@@ -1 +1 @@
-63abff1a4c9d70bb3f0c521b6ff1a331  Email-MIME-Modifier-1.43.tar.gz
+28eec7eeac53007243a2055bf37a4c2c  Email-MIME-Modifier-1.440.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 16:04:15 2006
From: fedora-extras-commits at redhat.com (Frank Büttner (frankb))
Date: Sat, 14 Oct 2006 09:04:15 -0700
Subject: rpms/qt4-qsa/devel qt4-qsa.spec,1.9,1.10
Message-ID: <200610141604.k9EG4mLx001153@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1120

Modified Files:
	qt4-qsa.spec 
Log Message:
back to old one because the patch for bug 210544 fails



Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt4-qsa.spec	12 Oct 2006 20:35:08 -0000	1.9
+++ qt4-qsa.spec	14 Oct 2006 16:04:15 -0000	1.10
@@ -1,21 +1,29 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	18%{?dist}
-BuildRequires:	qt4-devel 
+Release:	19%{?dist}
+BuildRequires:	qt4-devel
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
 License: 	GPL
 Group: 		Development/Libraries
 Source: 	ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz
 Patch0:		qsa-1.2.1-Qt4.2-preview.patch
-Patch1:		qsa-1.2.1-QT_INSTALL.patch
 Buildroot: 	%{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define qtdir  %(qmake-qt4 -query QT_INSTALL_PREFIX)
-%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA)
-%define qtinc  %(qmake-qt4 -query QT_INSTALL_HEADERS)
-%define qtlib  %(qmake-qt4 -query QT_INSTALL_LIBS)
+
+# fix the the broken include path
+%define qtinc %{qtdir}/include
+%ifarch x86_64
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64
+%else
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
+%endif
+
+#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS)
+#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
+
 
 %package devel
 Summary:	Development and doc files for qsa 
@@ -32,7 +40,6 @@
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -41,7 +48,8 @@
 export QTLIB=%{qtlib}
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
-./configure -release 
+./configure -release -prefix %{qtdir} 
+#./configure -release
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -63,6 +71,12 @@
 install -p -m 644 src/ide/qsworkbench.h $RPM_BUILD_ROOT%{qtinc}/
 install -p -m 644 src/qsa/qsutilfactory.h  $RPM_BUILD_ROOT%{qtinc}/
 
+%if "%{_lib}" != "lib"
+test -d $RPM_BUILD_ROOT%{qtdir}/lib && \
+mkdir -p $RPM_BUILD_ROOT%{qtlib} && \
+mv $RPM_BUILD_ROOT%{qtdir}/lib/* $RPM_BUILD_ROOT%{qtlib}/
+%endif
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -80,11 +94,14 @@
 %defattr(0644,root,root)   
 %{qtinc}/*
 %{qtlib}/libqsa.so
-%{qtdata}/mkspecs/features/qsa.prf
+%{qtdir}/mkspecs/features/qsa.prf
 %doc examples
 %doc doc/html
 
 %changelog 
+* Sat Oct 14 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-19%{?dist}
+- back to old one because the patch for bug 210544 fails
+
 * Thu Oct 12 2006 Frank B??ttner <frank-buettner at gmx.net> - 1.2.1-18%{?dist}
 - fix for bug 210544
 



From fedora-extras-commits at redhat.com  Sat Oct 14 16:09:53 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Sat, 14 Oct 2006 09:09:53 -0700
Subject: rpms/listen/FC-5 listen.spec,1.11,1.12
Message-ID: <200610141609.k9EG9t6Y001305@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1272/FC-5

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- listen.spec	12 Oct 2006 16:05:32 -0000	1.11
+++ listen.spec	14 Oct 2006 16:09:53 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        6.beta1%{?dist}
+Release:        7.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -46,11 +46,13 @@
 Requires: gnome-python2
 Requires: gnome-python2-extras
 Requires: gnome-python2-gtkmozembed
+Requires: gnome-python2-gtkhtml2
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
 Requires: python-musicbrainz2 
 Requires: /usr/lib/libtunepimp.so.5
+Requires: /usr/bin/puid
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
@@ -141,6 +143,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Nov 14 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-7.beta1
+- Updated R with gnome-python2-gtkhtml2
+
 * Thu Nov 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 



From fedora-extras-commits at redhat.com  Sat Oct 14 16:09:54 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Sat, 14 Oct 2006 09:09:54 -0700
Subject: rpms/listen/devel listen.spec,1.11,1.12
Message-ID: <200610141609.k9EG9uHb001309@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1272/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- listen.spec	12 Oct 2006 16:07:46 -0000	1.11
+++ listen.spec	14 Oct 2006 16:09:54 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        6.beta1%{?dist}
+Release:        7.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -46,11 +46,13 @@
 Requires: gnome-python2
 Requires: gnome-python2-extras
 Requires: gnome-python2-gtkmozembed
+Requires: gnome-python2-gtkhtml2
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
 Requires: python-musicbrainz2 
 Requires: /usr/lib/libtunepimp.so.5
+Requires: /usr/bin/puid
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
@@ -141,6 +143,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Nov 14 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-7.beta1
+- Updated R with gnome-python2-gtkhtml2
+
 * Thu Nov 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 



From fedora-extras-commits at redhat.com  Sat Oct 14 16:13:52 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 14 Oct 2006 09:13:52 -0700
Subject: rpms/gqview/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 gqview.spec,
	1.9, 1.10
Message-ID: <200610141613.k9EGDskB001365@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344

Modified Files:
	.cvsignore sources gqview.spec 
Log Message:
* Sat Oct 14 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.2-1
- update to 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 May 2005 21:23:33 -0000	1.5
+++ .cvsignore	14 Oct 2006 16:13:51 -0000	1.6
@@ -1 +1 @@
-gqview-2.0.1.tar.gz
+gqview-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 May 2005 21:23:33 -0000	1.6
+++ sources	14 Oct 2006 16:13:51 -0000	1.7
@@ -1 +1 @@
-acd8f1dad2b04389c1936adac1512e32  gqview-2.0.1.tar.gz
+0bb325001b3cea88c2487c84e06ba738  gqview-2.0.2.tar.gz


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gqview.spec	28 Aug 2006 10:35:14 -0000	1.9
+++ gqview.spec	14 Oct 2006 16:13:51 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Image browser and viewer
 Name:		gqview
-Version:	2.0.1
-Release: 4
+Version:	2.0.2
+Release: 1%{?dist}
 License:	GPL
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
@@ -76,7 +76,10 @@
 
 
 %changelog
-* Mon Aug 28 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sat Oct 14 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.2-1
+- update to 2.0.2
+
+* Mon Aug 28 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.1-4
 - rebuilt
 
 * Wed Feb 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.1-3



From fedora-extras-commits at redhat.com  Sat Oct 14 16:16:00 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Sat, 14 Oct 2006 09:16:00 -0700
Subject: rpms/listen/FC-5 listen.spec,1.12,1.13
Message-ID: <200610141616.k9EGG2n1001455@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1424/FC-5

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- listen.spec	14 Oct 2006 16:09:53 -0000	1.12
+++ listen.spec	14 Oct 2006 16:16:00 -0000	1.13
@@ -51,7 +51,8 @@
 Requires: python-sexy
 # MusicBrainz support
 Requires: python-musicbrainz2 
-Requires: /usr/lib/libtunepimp.so.5
+# broken and useless dependency
+#Requires: /usr/lib/libtunepimp.so.5
 Requires: /usr/bin/puid
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod



From fedora-extras-commits at redhat.com  Sat Oct 14 16:16:00 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Sat, 14 Oct 2006 09:16:00 -0700
Subject: rpms/listen/devel listen.spec,1.12,1.13
Message-ID: <200610141616.k9EGG3AU001459@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1424/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- listen.spec	14 Oct 2006 16:09:54 -0000	1.12
+++ listen.spec	14 Oct 2006 16:16:00 -0000	1.13
@@ -51,7 +51,8 @@
 Requires: python-sexy
 # MusicBrainz support
 Requires: python-musicbrainz2 
-Requires: /usr/lib/libtunepimp.so.5
+# broken and useless dependency
+#Requires: /usr/lib/libtunepimp.so.5
 Requires: /usr/bin/puid
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod



From fedora-extras-commits at redhat.com  Sat Oct 14 17:04:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 14 Oct 2006 10:04:12 -0700
Subject: rpms/amavisd-new/devel amavisd-new.spec,1.9,1.10
Message-ID: <200610141704.k9EH4jPa004623@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4582

Modified Files:
	amavisd-new.spec 
Log Message:
Fix permissions on the cron.daily script.


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amavisd-new.spec	10 Oct 2006 22:47:43 -0000	1.9
+++ amavisd-new.spec	14 Oct 2006 17:04:11 -0000	1.10
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        1%{?prerelease:.%{prerelease}}%{?dist}
+Release:        2%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -104,7 +104,7 @@
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
-install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
+install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
 
 mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db,quarantine}
 touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
@@ -152,6 +152,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Sat Oct 14 2006 Steven Pritchard <steve at kspei.com> 2.4.3-2
+- Fix permissions on the cron.daily script.
+
 * Tue Oct 10 2006 Steven Pritchard <steve at kspei.com> 2.4.3-1
 - Update to 2.4.3.
 - Add quarantine directory and instructions for enabling it.



From fedora-extras-commits at redhat.com  Sat Oct 14 17:54:00 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sat, 14 Oct 2006 10:54:00 -0700
Subject: rpms/newsx/devel newsx.spec,1.3,1.4
Message-ID: <200610141754.k9EHs2Y7004860@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4843

Modified Files:
	newsx.spec 
Log Message:
- rename newsq to avoid conflict with leafnode
- simplify autotools invocation



Index: newsx.spec
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/newsx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newsx.spec	1 Oct 2006 12:27:49 -0000	1.3
+++ newsx.spec	14 Oct 2006 17:54:00 -0000	1.4
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 Name:		newsx
 Version:	1.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz??dzie do wymiany news??w po NNTP
@@ -31,10 +31,7 @@
 %patch0 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+autoreconf -f -i
 %configure --without-history
 
 %{__make} %{?_smp_mflags}
@@ -45,6 +42,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# avoid conflict with leafnode
+pushd $RPM_BUILD_ROOT
+mv .%{_bindir}/newsq .%{_bindir}/newsx-newsq
+mv .%{_mandir}/man1/newsq.1 .%{_mandir}/man1/newsx-newsq.1
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,6 +59,10 @@
 %{_mandir}/man[158]/*
 
 %changelog
+* Sat Oct 14 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-6
+- rename newsq to avoid conflict with leafnode
+- simplify autotools invocation
+
 * Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-5
 - fix build on devel
 



From fedora-extras-commits at redhat.com  Sat Oct 14 17:56:17 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sat, 14 Oct 2006 10:56:17 -0700
Subject: rpms/newsx/FC-5 newsx.spec,1.3,1.4
Message-ID: <200610141756.k9EHuJHL004936@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4919

Modified Files:
	newsx.spec 
Log Message:
- rename newsq to avoid conflict with leafnode
- simplify autotools invocation



Index: newsx.spec
===================================================================
RCS file: /cvs/extras/rpms/newsx/FC-5/newsx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newsx.spec	1 Oct 2006 12:27:49 -0000	1.3
+++ newsx.spec	14 Oct 2006 17:56:17 -0000	1.4
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 Name:		newsx
 Version:	1.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz??dzie do wymiany news??w po NNTP
@@ -31,10 +31,7 @@
 %patch0 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+autoreconf -f -i
 %configure --without-history
 
 %{__make} %{?_smp_mflags}
@@ -45,6 +42,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# avoid conflict with leafnode
+pushd $RPM_BUILD_ROOT
+mv .%{_bindir}/newsq .%{_bindir}/newsx-newsq
+mv .%{_mandir}/man1/newsq.1 .%{_mandir}/man1/newsx-newsq.1
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,6 +59,10 @@
 %{_mandir}/man[158]/*
 
 %changelog
+* Sat Oct 14 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-6
+- rename newsq to avoid conflict with leafnode
+- simplify autotools invocation
+
 * Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-5
 - fix build on devel
 



From fedora-extras-commits at redhat.com  Sat Oct 14 20:32:36 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 13:32:36 -0700
Subject: rpms/lua/devel .cvsignore, 1.4, 1.5 lua.spec, 1.18, 1.19 sources,
	1.6, 1.7
Message-ID: <200610142032.k9EKWcSC014321@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lua/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14300

Modified Files:
	.cvsignore lua.spec sources 
Log Message:
* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-1
- New upstream release 5.1.1
- Fix detection of readline during compile (iow add readline support back)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 May 2006 07:01:54 -0000	1.4
+++ .cvsignore	14 Oct 2006 20:32:35 -0000	1.5
@@ -1 +1,2 @@
-lua-5.1-autotoolize-r1.patch.bz2
+lua-5.1.1.tar.gz
+lua-5.1.1-autotoolize.patch.gz


Index: lua.spec
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lua.spec	28 Aug 2006 04:24:13 -0000	1.18
+++ lua.spec	14 Oct 2006 20:32:35 -0000	1.19
@@ -1,16 +1,14 @@
 Name:           lua
-Version:        5.1
-Release:        7%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        Powerful light-weight programming language
-
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.lua.org/
 Source0:        http://www.lua.org/ftp/lua-%{version}.tar.gz
-Patch0:		lua-5.1-autotoolize-r1.patch.bz2
+Patch0:         lua-5.1.1-autotoolize.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  readline-devel, ncurses-devel
+BuildRequires:  readline-devel ncurses-devel
 
 %description
 Lua is a powerful light-weight programming language designed for
@@ -22,6 +20,7 @@
 memory management with garbage collection, making it ideal for
 configuration, scripting, and rapid prototyping.
 
+
 %package	devel
 Summary:	Development files for %{name}
 Group:		System Environment/Libraries
@@ -31,28 +30,27 @@
 %description	devel
 This package contains development files for %{name}.
 
+
 %prep
 %setup -q
-%patch0 -p1
-
-%build
+%patch0 -p1 -E
 # fix perms on auto files
 chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
 
-./autogen.sh
 
+%build
 %configure --with-readline
-
 make %{?_smp_mflags} 
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall 
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
 
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -67,11 +65,14 @@
 %{_includedir}/l*.h
 %{_includedir}/l*.hpp
 %{_libdir}/liblua.so
-%{_libdir}/*.a
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-1
+- New upstream release 5.1.1
+- Fix detection of readline during compile (iow add readline support back)
+
 * Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-7
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 May 2006 07:04:13 -0000	1.6
+++ sources	14 Oct 2006 20:32:35 -0000	1.7
@@ -1,2 +1,2 @@
-3e8dfe8be00a744cec2f9e766b2f2aee  lua-5.1.tar.gz
-9e6a9655694450e26aa4e01220dd3636  lua-5.1-autotoolize-r1.patch.bz2
+22f4f912f20802c11006fe9b84d5c461  lua-5.1.1.tar.gz
+d4116caee10a37951b413436f9e2a119  lua-5.1.1-autotoolize.patch.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 20:41:22 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 14 Oct 2006 13:41:22 -0700
Subject: rpms/aide/devel aide-0.12-getopt.patch, NONE, 1.1 .cvsignore, 1.7, 
	1.8 aide.spec, 1.14, 1.15 sources, 1.7, 1.8
Message-ID: <200610142041.k9EKfO53014412@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14388

Modified Files:
	.cvsignore aide.spec sources 
Added Files:
	aide-0.12-getopt.patch 
Log Message:
* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
- Update to 0.12 release.
- now offers --disable-static, so -no-static patch is obsolete
- fill last element of getopt struct array with zeroes


aide-0.12-getopt.patch:

--- NEW FILE aide-0.12-getopt.patch ---
Do what the manual says.

diff -Nur aide-0.12-orig/src/aide.c aide-0.12/src/aide.c
--- aide-0.12-orig/src/aide.c	2006-10-04 12:20:25.000000000 +0200
+++ aide-0.12/src/aide.c	2006-10-14 22:35:47.000000000 +0200
@@ -109,7 +109,7 @@
     { "update", no_argument, NULL, 'u'},
     { "config-check", no_argument, NULL, 'D'},
     { "compare", no_argument, NULL, 'E'},
-    { NULL }
+    { NULL, 0, NULL, 0 }
   };
 
   while(1){


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Sep 2006 09:11:31 -0000	1.7
+++ .cvsignore	14 Oct 2006 20:41:21 -0000	1.8
@@ -1 +1 @@
-aide-0.11.tar.gz
+aide-0.12.tar.gz


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aide.spec	2 Oct 2006 19:41:16 -0000	1.14
+++ aide.spec	14 Oct 2006 20:41:21 -0000	1.15
@@ -1,20 +1,26 @@
-%{?_with_static: %define nostatic 0}
-%{!?_with_static: %define nostatic 1}
+%{?_with_static: %define nostatic %nil }
+%{!?_with_static: %define nostatic --disable-static }
+
+# segfaults
+%{!?_with_curl: %{!?_without_curl: %define _without_curl --without-curl}}
 
 Summary: Intrusion detection environment
 Name: aide
-Version: 0.11
-Release: 3%{?dist}
+Version: 0.12
+Release: 1%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
 Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz
 Source1: aide.conf
 Source2: README.quickstart
-Patch0: aide-0.11-no-static.patch
+Patch0: aide-0.12-getopt.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
+%if "%{?_with_curl}x" != "x"
+Buildrequires: curl-devel
+%endif
 #Buildrequires: postgresql-devel libgcrypt-devel
 #(needs --with-psql and -lgcrypt in src/Makefile.in)
 
@@ -25,15 +31,15 @@
 
 %prep
 %setup -q
-%if 0%{nostatic}
-%patch0 -p1 -b .no-static
-%endif
+%patch0 -p1 -b .getopt
 
 
 %build
 %configure --with-config_file=%{_sysconfdir}/aide.conf \
            --with-zlib \
-           --with-mhash --enable-mhash
+           --with-mhash --enable-mhash \
+           %{?_with_curl} %{?_without_curl} \
+           %{?nostatic}
 
 # Adjust default database paths.
 perl -pi -e 's!%{_sysconfdir}/aide.db!%{_localstatedir}/lib/aide.db!' config.h
@@ -51,7 +57,6 @@
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide
 install -p %{SOURCE2} README.quickstart
-mkdir -p -m0755 $RPM_BUILD_ROOT%{_mandir}/ru/man{1,5}
 
 
 %clean
@@ -70,7 +75,12 @@
 
 
 %changelog
-* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
+- Update to 0.12 release.
+- now offers --disable-static, so -no-static patch is obsolete
+- fill last element of getopt struct array with zeroes
+
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-3
 - rebuilt
 
 * Mon Sep 11 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Sep 2006 09:11:31 -0000	1.7
+++ sources	14 Oct 2006 20:41:21 -0000	1.8
@@ -1 +1 @@
-9a44e5386b0355ef57c60f627ff4d085  aide-0.11.tar.gz
+fee8da9fe8ac4f78de1a237290ed3204  aide-0.12.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 20:41:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 14 Oct 2006 13:41:46 -0700
Subject: rpms/aide/devel aide-0.11-no-static.patch,1.3,NONE
Message-ID: <200610142041.k9EKfmiP014439@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14424

Removed Files:
	aide-0.11-no-static.patch 
Log Message:
* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
- Update to 0.12 release.
- now offers --disable-static, so -no-static patch is obsolete
- fill last element of getopt struct array with zeroes



--- aide-0.11-no-static.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 14 20:42:22 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 14 Oct 2006 13:42:22 -0700
Subject: rpms/aide/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200610142042.k9EKgOaq014483@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14464

Modified Files:
	.cvsignore sources 
Log Message:
* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
- Update to 0.12 release.
- now offers --disable-static, so -no-static patch is obsolete
- fill last element of getopt struct array with zeroes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Oct 2006 20:41:21 -0000	1.8
+++ .cvsignore	14 Oct 2006 20:42:22 -0000	1.9
@@ -1 +1,2 @@
 aide-0.12.tar.gz
+aide-0.12.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Oct 2006 20:41:21 -0000	1.8
+++ sources	14 Oct 2006 20:42:22 -0000	1.9
@@ -1 +1,2 @@
 fee8da9fe8ac4f78de1a237290ed3204  aide-0.12.tar.gz
+1073f8839dc68c6e0ae1251dd2371584  aide-0.12.tar.gz.asc



From fedora-extras-commits at redhat.com  Sat Oct 14 20:55:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 14 Oct 2006 13:55:35 -0700
Subject: rpms/opensc/devel opensc.spec,1.19,1.20
Message-ID: <200610142055.k9EKtb0K014598@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14581

Modified Files:
	opensc.spec 
Log Message:
* Sat Oct 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-6
- Rebuild with new libassuan.



Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- opensc.spec	8 Oct 2006 20:33:47 -0000	1.19
+++ opensc.spec	14 Oct 2006 20:55:35 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-6
+- Rebuild with new libassuan.
+
 * Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-5
 - Rebuild with new libassuan.
 



From fedora-extras-commits at redhat.com  Sat Oct 14 21:18:11 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:18:11 -0700
Subject: rpms/XaraLX import.log,1.8,1.9
Message-ID: <200610142118.k9ELID2p017667@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/XaraLX
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17634

Modified Files:
	import.log 
Log Message:
auto-import XaraLX-0.7-8.r1763 on branch devel from XaraLX-0.7-8.r1763.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	21 Sep 2006 22:28:19 -0000	1.8
+++ import.log	14 Oct 2006 21:18:10 -0000	1.9
@@ -5,3 +5,4 @@
 XaraLX-0_7-5_r1742:HEAD:XaraLX-0.7-5.r1742.src.rpm:1157571588
 XaraLX-0_7-6_r1759:HEAD:XaraLX-0.7-6.r1759.src.rpm:1158877287
 XaraLX-0_7-6_r1759:FC-5:XaraLX-0.7-6.r1759.src.rpm:1158877686
+XaraLX-0_7-8_r1763:HEAD:XaraLX-0.7-8.r1763.src.rpm:1160860676



From fedora-extras-commits at redhat.com  Sat Oct 14 21:18:11 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:18:11 -0700
Subject: rpms/XaraLX/devel .cvsignore, 1.5, 1.6 XaraLX.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200610142118.k9ELIDqe017673@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/XaraLX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17634/devel

Modified Files:
	.cvsignore XaraLX.spec sources 
Log Message:
auto-import XaraLX-0.7-8.r1763 on branch devel from XaraLX-0.7-8.r1763.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 22:21:40 -0000	1.5
+++ .cvsignore	14 Oct 2006 21:18:11 -0000	1.6
@@ -1 +1 @@
-XaraLX-0.7r1759.tar.bz2
+XaraLX-0.7r1763.tar.bz2


Index: XaraLX.spec
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/devel/XaraLX.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XaraLX.spec	4 Oct 2006 23:17:30 -0000	1.6
+++ XaraLX.spec	14 Oct 2006 21:18:11 -0000	1.7
@@ -1,9 +1,9 @@
-%define buildRev r1759
+%define buildRev r1763
 
 Name:		XaraLX
 Summary: 	Vector/general purpose graphics utility
 Version:	0.7
-Release:	7%{?dist}.%{buildRev}
+Release:	8%{?dist}.%{buildRev}
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://downloads.xara.com/opensource/%{name}-%{version}%{buildRev}.tar.bz2
@@ -90,6 +90,9 @@
 %{_docdir}/XaraLX/examples
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-8.r1763
+- bump
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-7.r1759
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 22:21:40 -0000	1.5
+++ sources	14 Oct 2006 21:18:11 -0000	1.6
@@ -1 +1 @@
-7298bf9d3b8882f41d8290e5f030af27  XaraLX-0.7r1759.tar.bz2
+b9cbc4716601101956e0fe50b5717980  XaraLX-0.7r1763.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 14 21:19:27 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:19:27 -0700
Subject: rpms/XaraLX import.log,1.9,1.10
Message-ID: <200610142119.k9ELJTR9017768@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/XaraLX
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17735

Modified Files:
	import.log 
Log Message:
auto-import XaraLX-0.7-8.r1763 on branch FC-5 from XaraLX-0.7-8.r1763.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	14 Oct 2006 21:18:10 -0000	1.9
+++ import.log	14 Oct 2006 21:19:27 -0000	1.10
@@ -6,3 +6,4 @@
 XaraLX-0_7-6_r1759:HEAD:XaraLX-0.7-6.r1759.src.rpm:1158877287
 XaraLX-0_7-6_r1759:FC-5:XaraLX-0.7-6.r1759.src.rpm:1158877686
 XaraLX-0_7-8_r1763:HEAD:XaraLX-0.7-8.r1763.src.rpm:1160860676
+XaraLX-0_7-8_r1763:FC-5:XaraLX-0.7-8.r1763.src.rpm:1160860750



From fedora-extras-commits at redhat.com  Sat Oct 14 21:19:28 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:19:28 -0700
Subject: rpms/XaraLX/FC-5 .cvsignore, 1.5, 1.6 XaraLX.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200610142119.k9ELJUgv017774@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/XaraLX/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17735/FC-5

Modified Files:
	.cvsignore XaraLX.spec sources 
Log Message:
auto-import XaraLX-0.7-8.r1763 on branch FC-5 from XaraLX-0.7-8.r1763.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 22:28:20 -0000	1.5
+++ .cvsignore	14 Oct 2006 21:19:27 -0000	1.6
@@ -1 +1 @@
-XaraLX-0.7r1759.tar.bz2
+XaraLX-0.7r1763.tar.bz2


Index: XaraLX.spec
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/FC-5/XaraLX.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XaraLX.spec	21 Sep 2006 22:28:20 -0000	1.5
+++ XaraLX.spec	14 Oct 2006 21:19:27 -0000	1.6
@@ -1,9 +1,9 @@
-%define buildRev r1759
+%define buildRev r1763
 
 Name:		XaraLX
 Summary: 	Vector/general purpose graphics utility
 Version:	0.7
-Release:	6%{?dist}.%{buildRev}
+Release:	8%{?dist}.%{buildRev}
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://downloads.xara.com/opensource/%{name}-%{version}%{buildRev}.tar.bz2
@@ -90,6 +90,12 @@
 %{_docdir}/XaraLX/examples
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-8.r1763
+- bump
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-7.r1759
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-5.r1759
 - bump
 - added two BRs for autoreconf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 22:28:20 -0000	1.5
+++ sources	14 Oct 2006 21:19:27 -0000	1.6
@@ -1 +1 @@
-7298bf9d3b8882f41d8290e5f030af27  XaraLX-0.7r1759.tar.bz2
+b9cbc4716601101956e0fe50b5717980  XaraLX-0.7r1763.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 14 21:28:24 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:28:24 -0700
Subject: rpms/perl-File-DesktopEntry - New directory
Message-ID: <200610142128.k9ELSQEc017927@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17901/perl-File-DesktopEntry

Log Message:
Directory /cvs/extras/rpms/perl-File-DesktopEntry added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:28:25 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:28:25 -0700
Subject: rpms/perl-File-DesktopEntry/devel - New directory
Message-ID: <200610142128.k9ELSRlN017930@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17901/perl-File-DesktopEntry/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-DesktopEntry/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:28:43 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:28:43 -0700
Subject: rpms/perl-File-DesktopEntry Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610142128.k9ELSjvR017977@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17948

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-DesktopEntry


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-DesktopEntry
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:28:44 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:28:44 -0700
Subject: rpms/perl-File-DesktopEntry/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610142128.k9ELSkNZ017980@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17948/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-DesktopEntry


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:29:24 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:29:24 -0700
Subject: rpms/perl-File-DesktopEntry import.log,1.1,1.2
Message-ID: <200610142129.k9ELTQPi018050@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18017

Modified Files:
	import.log 
Log Message:
auto-import perl-File-DesktopEntry-0.02-1 on branch devel from perl-File-DesktopEntry-0.02-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-DesktopEntry/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2006 21:28:43 -0000	1.1
+++ import.log	14 Oct 2006 21:29:24 -0000	1.2
@@ -0,0 +1 @@
+perl-File-DesktopEntry-0_02-1:HEAD:perl-File-DesktopEntry-0.02-1.src.rpm:1160861125



From fedora-extras-commits at redhat.com  Sat Oct 14 21:29:25 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:29:25 -0700
Subject: rpms/perl-File-DesktopEntry/devel perl-File-DesktopEntry.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610142129.k9ELTRVs018055@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18017/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-DesktopEntry.spec 
Log Message:
auto-import perl-File-DesktopEntry-0.02-1 on branch devel from perl-File-DesktopEntry-0.02-1.src.rpm


--- NEW FILE perl-File-DesktopEntry.spec ---
Name:           perl-File-DesktopEntry
Version:        0.02
Release:        1%{?dist}
Summary:        Object to handle .desktop files
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-DesktopEntry/
Source0:        http://www.cpan.org/authors/id/P/PA/PARDUS/File-DesktopEntry/File-DesktopEntry-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is used to work with .desktop files. The format of these files
is specified by the freedesktop "Desktp Entry" specification. See
http://freedesktop.org/wiki/Standards_2fdesktop_2dentry_2dspec. For this
module version 0.9.4 of the specification was used.

%prep
%setup -q -n File-DesktopEntry-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Oct 11 2006 Patrice Dumas <pertusus at free.fr> 0.02-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-DesktopEntry/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2006 21:28:44 -0000	1.1
+++ .cvsignore	14 Oct 2006 21:29:25 -0000	1.2
@@ -0,0 +1 @@
+File-DesktopEntry-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-DesktopEntry/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Oct 2006 21:28:44 -0000	1.1
+++ sources	14 Oct 2006 21:29:25 -0000	1.2
@@ -0,0 +1 @@
+9c97efa062c04bcb86a0a6a3707355d1  File-DesktopEntry-0.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:30:55 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:30:55 -0700
Subject: rpms/monodoc import.log,1.23,1.24
Message-ID: <200610142131.k9ELVRSC018208@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18136

Modified Files:
	import.log 
Log Message:
auto-import monodoc-1.1.18-1 on branch FC-5 from monodoc-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/monodoc/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- import.log	6 Sep 2006 23:10:55 -0000	1.23
+++ import.log	14 Oct 2006 21:30:55 -0000	1.24
@@ -20,3 +20,4 @@
 monodoc-1_1_17-2:FC-5:monodoc-1.1.17-2.src.rpm:1157406088
 monodoc-1_1_17-3:HEAD:monodoc-1.1.17-3.src.rpm:1157584224
 monodoc-1_1_17-3:FC-5:monodoc-1.1.17-3.src.rpm:1157584285
+monodoc-1_1_18-1:FC-5:monodoc-1.1.18-1.src.rpm:1160861442



From fedora-extras-commits at redhat.com  Sat Oct 14 21:30:56 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:30:56 -0700
Subject: rpms/monodoc/FC-5 .cvsignore, 1.4, 1.5 monodoc.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <200610142131.k9ELVSvw018213@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18136/FC-5

Modified Files:
	.cvsignore monodoc.spec sources 
Log Message:
auto-import monodoc-1.1.18-1 on branch FC-5 from monodoc-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Aug 2006 21:58:19 -0000	1.4
+++ .cvsignore	14 Oct 2006 21:30:56 -0000	1.5
@@ -1 +1 @@
-monodoc-1.1.17.zip
+monodoc-1.1.18.zip


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/monodoc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- monodoc.spec	7 Sep 2006 20:32:02 -0000	1.14
+++ monodoc.spec	14 Oct 2006 21:30:56 -0000	1.15
@@ -8,8 +8,8 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.1.17
-Release: 5%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -43,7 +43,7 @@
 %endif
 
 %build
-%configure --libdir=%{monodir}
+%configure
 make 
 
 %install
@@ -67,7 +67,10 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
-* Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-5
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
+* Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-4
 - D'oh
 
 * Wed Sep 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Aug 2006 21:58:19 -0000	1.4
+++ sources	14 Oct 2006 21:30:56 -0000	1.5
@@ -1 +1 @@
-e4f904f23a0c7ca514403fb8ad86ff3e  monodoc-1.1.17.zip
+71981a3ed2c1eadd9ec0493c4b9f1bf1  monodoc-1.1.18.zip



From fedora-extras-commits at redhat.com  Sat Oct 14 21:32:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:32:40 -0700
Subject: rpms/monodoc import.log,1.24,1.25
Message-ID: <200610142133.k9ELXCcD018317@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18283

Modified Files:
	import.log 
Log Message:
auto-import monodoc-1.1.18-1 on branch devel from monodoc-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/monodoc/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- import.log	14 Oct 2006 21:30:55 -0000	1.24
+++ import.log	14 Oct 2006 21:32:39 -0000	1.25
@@ -21,3 +21,4 @@
 monodoc-1_1_17-3:HEAD:monodoc-1.1.17-3.src.rpm:1157584224
 monodoc-1_1_17-3:FC-5:monodoc-1.1.17-3.src.rpm:1157584285
 monodoc-1_1_18-1:FC-5:monodoc-1.1.18-1.src.rpm:1160861442
+monodoc-1_1_18-1:HEAD:monodoc-1.1.18-1.src.rpm:1160861543



From fedora-extras-commits at redhat.com  Sat Oct 14 21:32:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:32:40 -0700
Subject: rpms/monodoc/devel .cvsignore, 1.4, 1.5 monodoc.spec, 1.16,
	1.17 sources, 1.4, 1.5
Message-ID: <200610142133.k9ELXCCo018322@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18283/devel

Modified Files:
	.cvsignore monodoc.spec sources 
Log Message:
auto-import monodoc-1.1.18-1 on branch devel from monodoc-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Aug 2006 21:56:38 -0000	1.4
+++ .cvsignore	14 Oct 2006 21:32:40 -0000	1.5
@@ -1 +1 @@
-monodoc-1.1.17.zip
+monodoc-1.1.18.zip


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- monodoc.spec	4 Oct 2006 22:17:46 -0000	1.16
+++ monodoc.spec	14 Oct 2006 21:32:40 -0000	1.17
@@ -8,8 +8,8 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.1.17
-Release: 6%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -43,7 +43,7 @@
 %endif
 
 %build
-%configure --libdir=%{monodir}
+%configure
 make 
 
 %install
@@ -67,11 +67,8 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.1.17-6
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Mon Sep 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-5
-- added libdir def to configure line
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
 
 * Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-4
 - D'oh


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Aug 2006 21:56:38 -0000	1.4
+++ sources	14 Oct 2006 21:32:40 -0000	1.5
@@ -1 +1 @@
-e4f904f23a0c7ca514403fb8ad86ff3e  monodoc-1.1.17.zip
+71981a3ed2c1eadd9ec0493c4b9f1bf1  monodoc-1.1.18.zip



From fedora-extras-commits at redhat.com  Sat Oct 14 21:34:31 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:34:31 -0700
Subject: rpms/mod_mono import.log,1.3,1.4
Message-ID: <200610142135.k9ELZ3v1018421@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18385

Modified Files:
	import.log 
Log Message:
auto-import mod_mono-1.1.18-1 on branch devel from mod_mono-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Sep 2006 21:46:15 -0000	1.3
+++ import.log	14 Oct 2006 21:34:31 -0000	1.4
@@ -1,2 +1,3 @@
 mod_mono-1_1_17-3:HEAD:mod_mono-1.1.17-3.src.rpm:1157881161
 mod_mono-1_1_17-3:FC-5:mod_mono-1.1.17-3.src.rpm:1157924766
+mod_mono-1_1_18-1:HEAD:mod_mono-1.1.18-1.src.rpm:1160861659



From fedora-extras-commits at redhat.com  Sat Oct 14 21:34:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:34:32 -0700
Subject: rpms/mod_mono/devel .cvsignore, 1.2, 1.3 mod_mono.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610142135.k9ELZ4ea018426@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18385/devel

Modified Files:
	.cvsignore mod_mono.spec sources 
Log Message:
auto-import mod_mono-1.1.18-1 on branch devel from mod_mono-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 09:38:18 -0000	1.2
+++ .cvsignore	14 Oct 2006 21:34:31 -0000	1.3
@@ -1 +1 @@
-mod_mono-1.1.17.tar.gz
+mod_mono-1.1.18.tar.gz


Index: mod_mono.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_mono.spec	10 Sep 2006 09:38:18 -0000	1.1
+++ mod_mono.spec	14 Oct 2006 21:34:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name: mod_mono
-Version: 1.1.17
-Release: 3%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
 License: Apache Software License
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://go-mono.com/sources-latest/
@@ -46,6 +46,9 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
 * Fri Sep 08 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-3
 - Spec file fixes
 - Modified SOURCE0 and URL tags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 09:38:18 -0000	1.2
+++ sources	14 Oct 2006 21:34:31 -0000	1.3
@@ -1 +1 @@
-3f0408a350f6f55029b75f4332be171f  mod_mono-1.1.17.tar.gz
+4b4eaee10dc1a0231a81f64a19d59555  mod_mono-1.1.18.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:07 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:36:07 -0700
Subject: rpms/mod_mono import.log,1.4,1.5
Message-ID: <200610142136.k9ELa9Hh018562@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18527

Modified Files:
	import.log 
Log Message:
auto-import mod_mono-1.1.18-1 on branch FC-5 from mod_mono-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	14 Oct 2006 21:34:31 -0000	1.4
+++ import.log	14 Oct 2006 21:36:07 -0000	1.5
@@ -1,3 +1,4 @@
 mod_mono-1_1_17-3:HEAD:mod_mono-1.1.17-3.src.rpm:1157881161
 mod_mono-1_1_17-3:FC-5:mod_mono-1.1.17-3.src.rpm:1157924766
 mod_mono-1_1_18-1:HEAD:mod_mono-1.1.18-1.src.rpm:1160861659
+mod_mono-1_1_18-1:FC-5:mod_mono-1.1.18-1.src.rpm:1160861755



From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:08 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:36:08 -0700
Subject: rpms/mod_mono/FC-5 .cvsignore, 1.2, 1.3 mod_mono.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610142136.k9ELaAaQ018569@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18527/FC-5

Modified Files:
	.cvsignore mod_mono.spec sources 
Log Message:
auto-import mod_mono-1.1.18-1 on branch FC-5 from mod_mono-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 09:38:18 -0000	1.2
+++ .cvsignore	14 Oct 2006 21:36:07 -0000	1.3
@@ -1 +1 @@
-mod_mono-1.1.17.tar.gz
+mod_mono-1.1.18.tar.gz


Index: mod_mono.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/FC-5/mod_mono.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_mono.spec	10 Sep 2006 09:38:18 -0000	1.1
+++ mod_mono.spec	14 Oct 2006 21:36:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name: mod_mono
-Version: 1.1.17
-Release: 3%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
 License: Apache Software License
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://go-mono.com/sources-latest/
@@ -46,6 +46,9 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
 * Fri Sep 08 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-3
 - Spec file fixes
 - Modified SOURCE0 and URL tags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 09:38:18 -0000	1.2
+++ sources	14 Oct 2006 21:36:07 -0000	1.3
@@ -1 +1 @@
-3f0408a350f6f55029b75f4332be171f  mod_mono-1.1.17.tar.gz
+4b4eaee10dc1a0231a81f64a19d59555  mod_mono-1.1.18.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:15 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:36:15 -0700
Subject: rpms/perl-File-BaseDir - New directory
Message-ID: <200610142136.k9ELaHau018631@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18577/perl-File-BaseDir

Log Message:
Directory /cvs/extras/rpms/perl-File-BaseDir added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:16 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:36:16 -0700
Subject: rpms/perl-File-BaseDir/devel - New directory
Message-ID: <200610142136.k9ELaI9j018634@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18577/perl-File-BaseDir/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-BaseDir/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:33 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:36:33 -0700
Subject: rpms/perl-File-BaseDir Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610142136.k9ELaZCu018686@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18653

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-BaseDir


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-BaseDir
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:34 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:36:34 -0700
Subject: rpms/perl-File-BaseDir/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610142136.k9ELaato018689@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18653/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-BaseDir


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:37:08 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:37:08 -0700
Subject: rpms/perl-File-BaseDir/devel perl-File-BaseDir.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610142137.k9ELbArR018773@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18735/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-BaseDir.spec 
Log Message:
auto-import perl-File-BaseDir-0.02-1 on branch devel from perl-File-BaseDir-0.02-1.src.rpm


--- NEW FILE perl-File-BaseDir.spec ---
Name:           perl-File-BaseDir
Version:        0.02
Release:        1%{?dist}
Summary:        Use the freedesktop basedir spec
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-BaseDir/
Source0:        http://www.cpan.org/authors/id/P/PA/PARDUS/File-BaseDir/File-BaseDir-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::DesktopEntry)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module can be used to find directories and files as specified by the
XDG Base Directory Specification. It takes care of defaults and uses
File::Spec to make the output platform specific.

%prep
%setup -q -n File-BaseDir-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Oct 11 2006 Patrice Dumas <pertusus at free.fr> 0.02-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BaseDir/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2006 21:36:34 -0000	1.1
+++ .cvsignore	14 Oct 2006 21:37:08 -0000	1.2
@@ -0,0 +1 @@
+File-BaseDir-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BaseDir/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Oct 2006 21:36:34 -0000	1.1
+++ sources	14 Oct 2006 21:37:08 -0000	1.2
@@ -0,0 +1 @@
+00e2729f364d430350355250cb9007e0  File-BaseDir-0.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:37:07 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:37:07 -0700
Subject: rpms/perl-File-BaseDir import.log,1.1,1.2
Message-ID: <200610142137.k9ELb9Xg018768@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18735

Modified Files:
	import.log 
Log Message:
auto-import perl-File-BaseDir-0.02-1 on branch devel from perl-File-BaseDir-0.02-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BaseDir/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2006 21:36:33 -0000	1.1
+++ import.log	14 Oct 2006 21:37:07 -0000	1.2
@@ -0,0 +1 @@
+perl-File-BaseDir-0_02-1:HEAD:perl-File-BaseDir-0.02-1.src.rpm:1160861588



From fedora-extras-commits at redhat.com  Sat Oct 14 21:37:37 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:37:37 -0700
Subject: rpms/xsp/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xsp.spec, 1.11,
	1.12
Message-ID: <200610142137.k9ELbdll018859@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18820/FC-5

Modified Files:
	.cvsignore sources xsp.spec 
Log Message:
auto-import xsp-1.1.18-1 on branch FC-5 from xsp-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Aug 2006 21:59:36 -0000	1.6
+++ .cvsignore	14 Oct 2006 21:37:36 -0000	1.7
@@ -1 +1 @@
-xsp-1.1.17.tar.gz
+xsp-1.1.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2006 21:59:36 -0000	1.6
+++ sources	14 Oct 2006 21:37:36 -0000	1.7
@@ -1 +1 @@
-48988812f6bd57971f65a47d0f491412  xsp-1.1.17.tar.gz
+6c39f7cbdc2f7c59f25bedaf5495721a  xsp-1.1.18.tar.gz


Index: xsp.spec
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/xsp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xsp.spec	31 Aug 2006 21:59:36 -0000	1.11
+++ xsp.spec	14 Oct 2006 21:37:36 -0000	1.12
@@ -1,5 +1,5 @@
 Name:     	xsp
-Version: 	1.1.17
+Version: 	1.1.18
 Release:	1%{?dist}
 License:	BSD
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/xsp*
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
 * Thu Aug 31 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-1
 - bump to new version
 - added patches for architecture independance



From fedora-extras-commits at redhat.com  Sat Oct 14 21:37:36 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:37:36 -0700
Subject: rpms/xsp import.log,1.18,1.19
Message-ID: <200610142137.k9ELbc9N018853@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18820

Modified Files:
	import.log 
Log Message:
auto-import xsp-1.1.18-1 on branch FC-5 from xsp-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xsp/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- import.log	31 Aug 2006 22:01:30 -0000	1.18
+++ import.log	14 Oct 2006 21:37:36 -0000	1.19
@@ -15,3 +15,4 @@
 xsp-1_1_16_1-1:FC-5:xsp-1.1.16.1-1.src.rpm:1155503169
 xsp-1_1_17-1:FC-5:xsp-1.1.17-1.src.rpm:1157061563
 xsp-1_1_17-1:HEAD:xsp-1.1.17-1.src.rpm:1157061679
+xsp-1_1_18-1:FC-5:xsp-1.1.18-1.src.rpm:1160861838



From fedora-extras-commits at redhat.com  Sat Oct 14 21:41:47 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:41:47 -0700
Subject: rpms/perl-File-MimeInfo - New directory
Message-ID: <200610142141.k9ELfnuE020232@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20195/perl-File-MimeInfo

Log Message:
Directory /cvs/extras/rpms/perl-File-MimeInfo added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:41:48 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:41:48 -0700
Subject: rpms/perl-File-MimeInfo/devel - New directory
Message-ID: <200610142141.k9ELfoD2020238@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20195/perl-File-MimeInfo/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-MimeInfo/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:42:11 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:42:11 -0700
Subject: rpms/perl-File-MimeInfo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610142142.k9ELgDpV020412@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20364

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-MimeInfo


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-MimeInfo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:42:11 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:42:11 -0700
Subject: rpms/perl-File-MimeInfo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610142142.k9ELgD2i020419@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20364/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-MimeInfo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:42:51 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:42:51 -0700
Subject: rpms/perl-File-MimeInfo import.log,1.1,1.2
Message-ID: <200610142142.k9ELgrk6020688@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20640

Modified Files:
	import.log 
Log Message:
auto-import perl-File-MimeInfo-0.13-2 on branch devel from perl-File-MimeInfo-0.13-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2006 21:42:11 -0000	1.1
+++ import.log	14 Oct 2006 21:42:50 -0000	1.2
@@ -0,0 +1 @@
+perl-File-MimeInfo-0_13-2:HEAD:perl-File-MimeInfo-0.13-2.src.rpm:1160861931



From fedora-extras-commits at redhat.com  Sat Oct 14 21:42:51 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:42:51 -0700
Subject: rpms/perl-File-MimeInfo/devel
	perl-File-MimeInfo-0.13-no-ask-option.diff, NONE,
	1.1 perl-File-MimeInfo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610142142.k9ELgrTL020699@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20640/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-MimeInfo-0.13-no-ask-option.diff 
	perl-File-MimeInfo.spec 
Log Message:
auto-import perl-File-MimeInfo-0.13-2 on branch devel from perl-File-MimeInfo-0.13-2.src.rpm

perl-File-MimeInfo-0.13-no-ask-option.diff:

--- NEW FILE perl-File-MimeInfo-0.13-no-ask-option.diff ---
--- /usr/bin/mimeopen	2006-10-11 16:57:53.000000000 +0200
+++ mimeopen	2006-10-11 21:27:45.000000000 +0200
@@ -24,6 +24,7 @@
 	'magic-only'	=> ['M'],
 	'ask'		=> ['a'],
 	'ask-default'	=> ['d'],
+	'no-ask'	=> ['n'],
 );
 
 while ((@ARGV) && ($ARGV[0] =~ /^-/)) {
@@ -153,7 +154,10 @@
 	exit 6;
 }
 
-if ($args{ask}) {
+if ($args{'no-ask'}) {
+	$default = defined($default) ? $default : $other[0];
+}
+elsif ($args{ask}) {
 	$default = choose($mimetype, 0, grep defined($_), $default, @other);
 }
 elsif ($args{'ask-default'}) {
@@ -305,6 +309,12 @@
 
 Print the version of the program and exit.
 
+=item B<-n>, B<--no-ask>
+
+Don't ask the user which program to use. Choose the default program or the 
+first program known to handle the file mimetype. This does not set the 
+default application.
+
 =back
 
 =head1 BUGS


--- NEW FILE perl-File-MimeInfo.spec ---
Name:           perl-File-MimeInfo
Version:        0.13
Release:        2%{?dist}
Summary:        Determine file type and open application
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-MimeInfo/
Source0:        http://www.cpan.org/authors/id/P/PA/PARDUS/File-MimeInfo/File-MimeInfo-%{version}.tar.gz
Patch0:         perl-File-MimeInfo-0.13-no-ask-option.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::BaseDir) perl(File::DesktopEntry)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module can be used to determine the mime type of a file. It tries to
implement the freedesktop specification for a shared MIME database.

%prep
%setup -q -n File-MimeInfo-%{version}
%patch0

%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
%{_bindir}/mimeopen
%{_bindir}/mimetype
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Oct 11 2006 Patrice Dumas <pertusus at free.fr> 0.13-2
- add an option to launch mimeopen non interactively

* Wed Oct 11 2006 Patrice Dumas <pertusus at free.fr> 0.13-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2006 21:42:11 -0000	1.1
+++ .cvsignore	14 Oct 2006 21:42:51 -0000	1.2
@@ -0,0 +1 @@
+File-MimeInfo-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Oct 2006 21:42:11 -0000	1.1
+++ sources	14 Oct 2006 21:42:51 -0000	1.2
@@ -0,0 +1 @@
+f87b07e1608f4380bb3f53154ac671bb  File-MimeInfo-0.13.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:43:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:43:48 -0700
Subject: rpms/xsp import.log,1.19,1.20
Message-ID: <200610142144.k9ELiKhJ021240@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21038

Modified Files:
	import.log 
Log Message:
auto-import xsp-1.1.18-1 on branch devel from xsp-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xsp/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	14 Oct 2006 21:37:36 -0000	1.19
+++ import.log	14 Oct 2006 21:43:48 -0000	1.20
@@ -16,3 +16,4 @@
 xsp-1_1_17-1:FC-5:xsp-1.1.17-1.src.rpm:1157061563
 xsp-1_1_17-1:HEAD:xsp-1.1.17-1.src.rpm:1157061679
 xsp-1_1_18-1:FC-5:xsp-1.1.18-1.src.rpm:1160861838
+xsp-1_1_18-1:HEAD:xsp-1.1.18-1.src.rpm:1160862214



From fedora-extras-commits at redhat.com  Sat Oct 14 21:43:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:43:49 -0700
Subject: rpms/xsp/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xsp.spec, 1.11,
	1.12
Message-ID: <200610142144.k9ELiLNo021249@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21038/devel

Modified Files:
	.cvsignore sources xsp.spec 
Log Message:
auto-import xsp-1.1.18-1 on branch devel from xsp-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Aug 2006 22:01:31 -0000	1.6
+++ .cvsignore	14 Oct 2006 21:43:49 -0000	1.7
@@ -1 +1 @@
-xsp-1.1.17.tar.gz
+xsp-1.1.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2006 22:01:31 -0000	1.6
+++ sources	14 Oct 2006 21:43:49 -0000	1.7
@@ -1 +1 @@
-48988812f6bd57971f65a47d0f491412  xsp-1.1.17.tar.gz
+6c39f7cbdc2f7c59f25bedaf5495721a  xsp-1.1.18.tar.gz


Index: xsp.spec
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xsp.spec	31 Aug 2006 22:01:31 -0000	1.11
+++ xsp.spec	14 Oct 2006 21:43:49 -0000	1.12
@@ -1,5 +1,5 @@
 Name:     	xsp
-Version: 	1.1.17
+Version: 	1.1.18
 Release:	1%{?dist}
 License:	BSD
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/xsp*
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
 * Thu Aug 31 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-1
 - bump to new version
 - added patches for architecture independance



From fedora-extras-commits at redhat.com  Sat Oct 14 22:01:46 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 15:01:46 -0700
Subject: owners owners.list,1.1828,1.1829
Message-ID: <200610142202.k9EM2IJ5026067@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26048

Modified Files:
	owners.list 
Log Message:
add perl-File-DesktopEntry perl-File-BaseDir perl-File-MimeInfo


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1828
retrieving revision 1.1829
diff -u -r1.1828 -r1.1829
--- owners.list	14 Oct 2006 11:52:43 -0000	1.1828
+++ owners.list	14 Oct 2006 22:01:44 -0000	1.1829
@@ -1374,14 +1374,17 @@
 Fedora Extras|perl-ExtUtils-PkgConfig|Simplistic interface to pkg-config|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Feed-Find|Syndication feed auto-discovery|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-BaseDir|Use the freedesktop basedir spec|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,mpeters at mac.com
 Fedora Extras|perl-File-chdir|A more sensible way to change directories|ianburrell at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-DesktopEntry|Object to handle .desktop files|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Fetch|A generic file fetching mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule-PPI|Add support for PPI queries to File::Find::Rule|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-HomeDir|Get the home directory for yourself or other users|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-MMagic-XS|Guess file type with XS|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-MimeInfo|Determine file type and open application|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NFSLock|Perl module to do NFS (or not) locking|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-ReadBackwards|File::ReadBackwards Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Oct 14 22:16:03 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 15:16:03 -0700
Subject: rpms/monodoc/FC-5 monodoc.spec,1.15,1.16
Message-ID: <200610142216.k9EMG5mT026213@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26196

Modified Files:
	monodoc.spec 
Log Message:

FC5 fix 
 	monodoc.spec 



Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/monodoc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- monodoc.spec	14 Oct 2006 21:30:56 -0000	1.15
+++ monodoc.spec	14 Oct 2006 22:16:03 -0000	1.16
@@ -9,7 +9,7 @@
 Summary: The mono documentation system
 Name: monodoc
 Version: 1.1.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -43,7 +43,7 @@
 %endif
 
 %build
-%configure
+%configure --libdir=%{monodir}
 make 
 
 %install
@@ -67,6 +67,9 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-2
+- fc5 fix for pkgconfig
+
 * Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
 - bump
 



From fedora-extras-commits at redhat.com  Sat Oct 14 22:16:45 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 15:16:45 -0700
Subject: rpms/monodoc/devel monodoc.spec,1.17,1.18
Message-ID: <200610142216.k9EMGlih026274@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26257

Modified Files:
	monodoc.spec 
Log Message:

FC5 fix 
 	monodoc.spec 



Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- monodoc.spec	14 Oct 2006 21:32:40 -0000	1.17
+++ monodoc.spec	14 Oct 2006 22:16:45 -0000	1.18
@@ -9,7 +9,7 @@
 Summary: The mono documentation system
 Name: monodoc
 Version: 1.1.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -43,7 +43,7 @@
 %endif
 
 %build
-%configure
+%configure --libdir=%{monodir}
 make 
 
 %install
@@ -67,6 +67,9 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-2
+- fc5 fix for pkgconfig
+
 * Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
 - bump
 



From fedora-extras-commits at redhat.com  Sun Oct 15 00:23:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 14 Oct 2006 17:23:28 -0700
Subject: rpms/amavisd-new/FC-5 README.quarantine, NONE, 1.1 amavisd.cron,
	NONE, 1.1 .cvsignore, 1.5, 1.6 amavisd-conf.patch, 1.3,
	1.4 amavisd-new.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200610150023.k9F0NULD032528@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32500

Modified Files:
	.cvsignore amavisd-conf.patch amavisd-new.spec sources 
Added Files:
	README.quarantine amavisd.cron 
Log Message:
Sync with devel.


--- NEW FILE README.quarantine ---
To enable quarantine support simply change the following line in
/etc/amavisd/amavisd.conf:

  $QUARANTINEDIR = undef;      # -Q

to

  $QUARANTINEDIR = "$MYHOME/quarantine";      # -Q

then restart amavisd.

The following will make the change for you:

  sed -i.orig -e '/\$QUARANTINEDIR =/s,undef,"$MYHOME/quarantine",' \
      /etc/amavisd/amavisd.conf

PLEASE NOTE:  This is intentionally a manual step.  Before turning on
the quarantine feature of amavisd-new, be sure that there is a
sufficient amount of free space on /var/spool/amavisd/quarantine.
"Sufficient" depends entirely on your environment.

In the default configuration, files in the quarantine directory will
be automatically deleted by tmpwatch after 30 days.  See
/etc/cron.daily/amavisd to adjust this behavior for your environment.


--- NEW FILE amavisd.cron ---
/usr/sbin/tmpwatch 24 /var/spool/amavisd/tmp
/usr/sbin/tmpwatch -d 720 /var/spool/amavisd/quarantine


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2006 00:05:20 -0000	1.5
+++ .cvsignore	15 Oct 2006 00:23:28 -0000	1.6
@@ -1 +1 @@
-amavisd-new-2.4.2.tar.gz
+amavisd-new-2.4.3.tar.gz

amavisd-conf.patch:

Index: amavisd-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amavisd-conf.patch	2 Aug 2006 16:44:07 -0000	1.3
+++ amavisd-conf.patch	15 Oct 2006 00:23:28 -0000	1.4
@@ -1,13 +1,13 @@
---- amavisd-new-2.4.2/amavisd.conf.orig	2006-06-27 06:31:50.000000000 -0500
-+++ amavisd-new-2.4.2/amavisd.conf	2006-07-31 17:31:00.000000000 -0500
+--- amavisd-new-2.4.3/amavisd.conf.orig	2006-10-01 19:02:13.000000000 -0500
++++ amavisd-new-2.4.3/amavisd.conf	2006-10-10 17:46:45.000000000 -0500
 @@ -14,23 +14,23 @@
  # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
  
  $max_servers = 2;            # num of pre-forked children (2..15 is common), -m
 -$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
 -$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
-+$daemon_user  = 'amavis';    # (no default;  customary: vscan or amavis), -u
-+$daemon_group = 'amavis';    # (no default;  customary: vscan or amavis), -g
++$daemon_user  = 'amavis';     # (no default;  customary: vscan or amavis), -u
++$daemon_group = 'amavis';     # (no default;  customary: vscan or amavis), -g
  
  $mydomain = 'example.com';   # a convenient default for other settings
  
@@ -46,7 +46,7 @@
  $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
  
  @addr_extension_virus_maps      = ('virus');
-@@ -111,10 +111,10 @@
+@@ -115,10 +115,10 @@
  # $notify_method  = 'smtp:[127.0.0.1]:10025';
  # $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
  
@@ -61,7 +61,7 @@
  
  # $os_fingerprint_method = 'p0f:127.0.0.1:2345';  # to query p0f-analyzer.pl
  
-@@ -306,10 +306,10 @@
+@@ -318,10 +318,10 @@
  # ['Sophos SAVI', \&sophos_savi ],
  
  # ### http://www.clamav.net/
@@ -73,6 +73,6 @@
 +  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
 +  qr/\bOK$/, qr/\bFOUND$/,
 +  qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
- # # NOTE: the easiest is to run clamd under the same user as amavisd; match the
- # # socket name (LocalSocket) in clamav.conf to the socket name in this entry
- # # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
+ # # NOTE: run clamd under the same user as amavisd, or run it under its own
+ # #   uid such as clamav, add user clamav to the amavis group, and then add
+ # #   AllowSupplementaryGroups to clamd.conf;


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-new.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amavisd-new.spec	2 Aug 2006 16:44:07 -0000	1.6
+++ amavisd-new.spec	15 Oct 2006 00:23:28 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.4.2
+Version:        2.4.3
 Release:        2%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
@@ -12,6 +12,8 @@
 Source2:        amavis-clamd.conf
 Source3:        amavis-clamd.sysconfig
 Source4:        README.fedora
+Source5:        README.quarantine
+Source6:        amavisd.cron
 Patch0:         amavisd-conf.patch
 Patch1:         amavisd-init.patch
 Patch2:         amavisd-condrestart.patch
@@ -19,10 +21,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root/
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
-Requires:       tmpwatch
+Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
 Requires:       bzip2
 Requires:       gzip
-Requires:       lha
+Requires:       arj
 Requires:       cpio
 Requires:       freeze
 Requires:       lzop
@@ -65,7 +67,7 @@
 (MTA) and one or more content checkers: virus scanners, and/or
 Mail::SpamAssassin Perl module. It is written in Perl, assuring high
 reliability, portability and maintainability. It talks to MTA via (E)SMTP
-or LMTP, or by using helper programs. No timing gaps exist in the design,
+or LMTP, or by using helper programs. No timing gaps exist in the design
 which could cause a mail loss.
 
 %prep
@@ -74,7 +76,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p0
-install -m644 %{SOURCE4} README_FILES/
+install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
 
 %build
 
@@ -101,7 +103,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd
 
-mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
+install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
+
+mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db,quarantine}
 touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
 mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/
 
@@ -135,16 +140,32 @@
 %config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
 %config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/clamd.amavisd
+%config(noreplace) %{_sysconfdir}/cron.daily/amavisd
 %{_sbindir}/amavisd
 %{_sbindir}/clamd.amavisd
 %{_bindir}/amavisd-*
 %dir %attr(700,amavis,amavis) /var/spool/amavisd
 %dir %attr(700,amavis,amavis) /var/spool/amavisd/tmp
 %dir %attr(700,amavis,amavis) /var/spool/amavisd/db
+%dir %attr(700,amavis,amavis) /var/spool/amavisd/quarantine
 %dir %attr(755,amavis,amavis) /var/run/amavisd
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Sat Oct 14 2006 Steven Pritchard <steve at kspei.com> 2.4.3-2
+- Fix permissions on the cron.daily script.
+
+* Tue Oct 10 2006 Steven Pritchard <steve at kspei.com> 2.4.3-1
+- Update to 2.4.3.
+- Add quarantine directory and instructions for enabling it.
+- Add tmpwatch cron script.
+
+* Thu Sep 28 2006 Steven Pritchard <steve at kspei.com> 2.4.2-4
+- Drop lha dependency and add arj.
+
+* Sun Sep 17 2006 Steven Pritchard <steve at kspei.com> 2.4.2-3
+- Rebuild.
+
 * Wed Aug 02 2006 Steven Pritchard <steve at kspei.com> 2.4.2-2
 - Fix path to clamd socket in amavisd-conf.patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2006 00:05:20 -0000	1.5
+++ sources	15 Oct 2006 00:23:28 -0000	1.6
@@ -1 +1 @@
-d750176de7481498ebd1011e08a488da  amavisd-new-2.4.2.tar.gz
+7c5f23b1cd523df31d10cf38150e8cea  amavisd-new-2.4.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 01:44:25 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 18:44:25 -0700
Subject: rpms/libpri - New directory
Message-ID: <200610150144.k9F1iRme019802@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19776/libpri

Log Message:
Directory /cvs/extras/rpms/libpri added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 01:44:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 18:44:26 -0700
Subject: rpms/libpri/devel - New directory
Message-ID: <200610150144.k9F1iSKv019805@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19776/libpri/devel

Log Message:
Directory /cvs/extras/rpms/libpri/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 01:44:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 18:44:37 -0700
Subject: rpms/libpri Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610150144.k9F1idkD019854@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19821

Added Files:
	Makefile import.log 
Log Message:
Setup of module libpri


--- NEW FILE Makefile ---
# Top level Makefile for module libpri
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 15 01:44:38 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 18:44:38 -0700
Subject: rpms/libpri/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610150144.k9F1ieim019857@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19821/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libpri


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 15 03:08:34 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Sat, 14 Oct 2006 20:08:34 -0700
Subject: comps comps-fe5.xml.in,1.168,1.169 comps-fe6.xml.in,1.187,1.188
Message-ID: <200610150308.k9F38aT7026145@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26126

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
adding most of my packages to comps.xml, as requested


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- comps-fe5.xml.in	14 Oct 2006 11:52:09 -0000	1.168
+++ comps-fe5.xml.in	15 Oct 2006 03:08:34 -0000	1.169
@@ -242,6 +242,7 @@
       <packagereq type="optional">octave</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">openbabel</packagereq>
+      <packagereq type="optional">orpie</packagereq>
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
@@ -829,8 +830,10 @@
       <packagereq type="optional">qstat</packagereq>
       <packagereq type="optional">rdiff-backup</packagereq>
       <packagereq type="optional">rootsh</packagereq>
+      <packagereq type="optional">rsnapshot</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scrub</packagereq>
+      <packagereq type="optional">sec</packagereq>
       <packagereq type="optional">shorewall</packagereq>
       <packagereq type="optional">snort</packagereq>
       <packagereq type="optional">stripesnoop</packagereq>
@@ -876,6 +879,7 @@
       <packagereq type="optional">rtorrent</packagereq>
       <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">tin</packagereq>
+      <packagereq type="optional">yafc</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- comps-fe6.xml.in	14 Oct 2006 11:52:09 -0000	1.187
+++ comps-fe6.xml.in	15 Oct 2006 03:08:34 -0000	1.188
@@ -296,6 +296,7 @@
       <packagereq type="optional">octave</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">openbabel</packagereq>
+      <packagereq type="optional">orpie</packagereq>
       <packagereq type="optional">osiv</packagereq>
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
@@ -948,8 +949,10 @@
       <packagereq type="optional">qstat</packagereq>
       <packagereq type="optional">rdiff-backup</packagereq>
       <packagereq type="optional">rootsh</packagereq>
+      <packagereq type="optional">rsnapshot</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scrub</packagereq>
+      <packagereq type="optional">sec</packagereq>
       <packagereq type="optional">shorewall</packagereq>
       <packagereq type="optional">smart</packagereq>
       <packagereq type="optional">smart-gui</packagereq>
@@ -1006,6 +1009,7 @@
       <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">tin</packagereq>
       <packagereq type="optional">xprobe2</packagereq>
+      <packagereq type="optional">yafc</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Sun Oct 15 03:22:09 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 20:22:09 -0700
Subject: rpms/manaworld/devel .cvsignore, 1.3, 1.4 manaworld.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200610150322.k9F3MBJ3026201@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26180

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.21




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Jul 2006 02:21:33 -0000	1.3
+++ .cvsignore	15 Oct 2006 03:22:08 -0000	1.4
@@ -1 +1 @@
-tmw-0.0.20.tar.gz
+tmw-0.0.21.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/manaworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- manaworld.spec	2 Sep 2006 03:02:38 -0000	1.3
+++ manaworld.spec	15 Oct 2006 03:22:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           manaworld
-Version:        0.0.20
-Release:        2%{?dist}
+Version:        0.0.21
+Release:        1%{?dist}
 Summary:        2D MMORPG world
 
 Group:          Amusements/Games
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 0.0.21
+- Update to 0.0.21
+
 * Fri Sep 1 2006 Wart <wart at kobold.org> 0.0.20-2
 - Rebuild for Fedora Extras
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2006 02:21:33 -0000	1.3
+++ sources	15 Oct 2006 03:22:08 -0000	1.4
@@ -1 +1 @@
-fa6af4284774d12c98efd6d77bdd4bd7  tmw-0.0.20.tar.gz
+e13a748b8e279fa694db5eb14ac4a8a9  tmw-0.0.21.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 03:23:19 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 20:23:19 -0700
Subject: rpms/manaworld/FC-5 .cvsignore, 1.3, 1.4 manaworld.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610150323.k9F3NLmN026272@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26251

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.21




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Jul 2006 02:23:24 -0000	1.3
+++ .cvsignore	15 Oct 2006 03:23:19 -0000	1.4
@@ -1 +1 @@
-tmw-0.0.20.tar.gz
+tmw-0.0.21.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-5/manaworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- manaworld.spec	28 Jul 2006 02:23:24 -0000	1.2
+++ manaworld.spec	15 Oct 2006 03:23:19 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           manaworld
-Version:        0.0.20
+Version:        0.0.21
 Release:        1%{?dist}
 Summary:        2D MMORPG world
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 0.0.21
+- Update to 0.0.21
+
 * Thu Jul 27 2006 Wart <wart at kobold.org> 0.0.20-1
 - Update to 0.0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2006 02:23:24 -0000	1.3
+++ sources	15 Oct 2006 03:23:19 -0000	1.4
@@ -1 +1 @@
-fa6af4284774d12c98efd6d77bdd4bd7  tmw-0.0.20.tar.gz
+e13a748b8e279fa694db5eb14ac4a8a9  tmw-0.0.21.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 03:51:12 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 20:51:12 -0700
Subject: rpms/libpri import.log,1.1,1.2
Message-ID: <200610150351.k9F3pEKX027234@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27196

Modified Files:
	import.log 
Log Message:
auto-import libpri-1.4.0-0.fc5.beta1 on branch devel from libpri-1.4.0-0.fc5.beta1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libpri/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2006 01:44:37 -0000	1.1
+++ import.log	15 Oct 2006 03:51:11 -0000	1.2
@@ -0,0 +1 @@
+libpri-1_4_0-0_fc5_beta1:HEAD:libpri-1.4.0-0.fc5.beta1.src.rpm:1160884263



From fedora-extras-commits at redhat.com  Sun Oct 15 03:51:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 20:51:13 -0700
Subject: rpms/libpri/devel libpri-optflags.patch, NONE, 1.1 libpri.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610150351.k9F3pFsL027241@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27196/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libpri-optflags.patch libpri.spec 
Log Message:
auto-import libpri-1.4.0-0.fc5.beta1 on branch devel from libpri-1.4.0-0.fc5.beta1.src.rpm

libpri-optflags.patch:

--- NEW FILE libpri-optflags.patch ---
Index: Makefile
===================================================================
--- Makefile	(revision 344)
+++ Makefile	(working copy)
@@ -38,7 +38,7 @@
 DYNAMIC_LIBRARY=libpri.so.1.0
 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
 DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes $(ALERTING) $(LIBPRI_COUNTERS) $(RPM_OPT_FLAGS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
 SOFLAGS = -Wl,-hlibpri.so.1.0


--- NEW FILE libpri.spec ---
Summary: An implementation of Primary Rate ISDN
Name: libpri
Version: 1.4.0
Release: 0%{?dist}.beta1
License: GPL
Group: System Environment/Libraries
URL: http://www.asterisk.org/

Source0: http://ftp.digium.com/pub/telephony/libpri/releases/libpri-%{version}-beta1.tar.gz
Patch0: libpri-optflags.patch

BuildRoot:  %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)

%description
libpri is a C implementation of the Primary Rate ISDN specification.
It was based on the Bellcore specification SR-NWT-002343 for National
ISDN.  As of May 12, 2001, it has been tested work with NI-2, Nortel
DMS-100, and Lucent 5E Custom protocols on switches from Nortel and
Lucent.

%package devel
Summary: Development files for libpri.
Group: Development/Libraries
Requires: libpri = %{version}-%{release}

%description devel
Development files for libpri.

%prep
%setup0 -q -n %{name}-%{version}-beta1
%patch0 -p0

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make INSTALL_PREFIX=%{buildroot} install
rm %{buildroot}%{_libdir}/libpri.a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files 
%defattr(-,root,root,-)
%doc LICENSE README
%{_libdir}/libpri.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/libpri.h
%{_libdir}/libpri.so

%changelog
* Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
- devel package needs to Require: main package

* Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-0.beta1
- Update to 1.4.0-beta1

* Fri Jun  2 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.3
- Update to 1.2.3
- Add dist tag to release
- Update source URL

* Wed Jan 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-1
- Update to 1.2.2.
- Fix the spelling of Paul Komkoff Jr.'s name.

* Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-4
- Eliminate the libpri-install.patch and other improvements based on suggestions from Paul Komkoff Jr.

* Thu Jan 12 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-3
- Fix building on 64 bit systems.

* Thu Jan 12 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-2
- Changed buildroot to meet FE packaging guidelines
- Don't forget docs
- Modify %%post so that ldconfig dep will be picked up automatically
- Add %%postun so that ldconfig gets run on uninstall
- Don't package the static library
- Changed $RPM_BUILD_ROOT to %%{buildroot} (yes, I know I was consistent before, but I prefer %%{buildroot})

* Wed Jan 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-1
- First version for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpri/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2006 01:44:38 -0000	1.1
+++ .cvsignore	15 Oct 2006 03:51:13 -0000	1.2
@@ -0,0 +1 @@
+libpri-1.4.0-beta1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpri/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2006 01:44:38 -0000	1.1
+++ sources	15 Oct 2006 03:51:13 -0000	1.2
@@ -0,0 +1 @@
+0df4aab74517ff425392cfafc6b97eab  libpri-1.4.0-beta1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 03:57:10 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 20:57:10 -0700
Subject: rpms/libpri/devel libpri.spec,1.1,1.2
Message-ID: <200610150357.k9F3vCEd027712@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27692

Modified Files:
	libpri.spec 
Log Message:
Fix a couple of oopses.


Index: libpri.spec
===================================================================
RCS file: /cvs/extras/rpms/libpri/devel/libpri.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libpri.spec	15 Oct 2006 03:51:13 -0000	1.1
+++ libpri.spec	15 Oct 2006 03:57:10 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: An implementation of Primary Rate ISDN
 Name: libpri
 Version: 1.4.0
-Release: 0%{?dist}.beta1
+Release: 1%{?dist}.beta1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.asterisk.org/
@@ -19,7 +19,7 @@
 Lucent.
 
 %package devel
-Summary: Development files for libpri.
+Summary: Development files for libpri
 Group: Development/Libraries
 Requires: libpri = %{version}-%{release}
 
@@ -56,6 +56,10 @@
 %{_libdir}/libpri.so
 
 %changelog
+* Sat Oct 14 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
+- Get rid of pesky "." in -devel summary.
+- Remove zaptel-devel BR
+
 * Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
 - devel package needs to Require: main package
 



From fedora-extras-commits at redhat.com  Sun Oct 15 04:02:27 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 14 Oct 2006 21:02:27 -0700
Subject: check-mirrors return-mirrorlist.py,1.16,1.17
Message-ID: <200610150402.k9F42Ri9030706@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30677

Modified Files:
	return-mirrorlist.py 
Log Message:
Fixed an issue where when defaulting to global lists a python trace would result



Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- return-mirrorlist.py	30 Aug 2006 02:21:16 -0000	1.16
+++ return-mirrorlist.py	15 Oct 2006 04:02:23 -0000	1.17
@@ -21,7 +21,7 @@
 # - Note, this script does have some dependancies on the file list
 #    This should be removed in later versions
 # - Top has SQL Injection issues. needs an isint()
-debug = False
+debug = True
 
 import os
 import sys
@@ -90,7 +90,10 @@
         if results == 0:
             if self.country != 'global':
                 print '# No results found for country: %s\n# Defaulting to global' % self.country
-                self.printMirrors(repo, arch, 'global')
+		#self.country='global'
+                self.countrySQL=''
+                self.printMirrors()
+                #self.printMirrors(self.repo, self.arch, 'global')
             else:
                 print '# no mirrors found, using default'
                 return False



From fedora-extras-commits at redhat.com  Sun Oct 15 04:05:51 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 14 Oct 2006 21:05:51 -0700
Subject: rpms/cairomm/devel .cvsignore, 1.4, 1.5 cairomm.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200610150405.k9F45rWn030753@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30730

Modified Files:
	.cvsignore cairomm.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Aug 2006 19:51:06 -0000	1.4
+++ .cvsignore	15 Oct 2006 04:05:50 -0000	1.5
@@ -1 +1 @@
-cairomm-1.2.0.tar.gz
+cairomm-1.2.2.tar.gz


Index: cairomm.spec
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/cairomm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cairomm.spec	28 Aug 2006 02:11:02 -0000	1.5
+++ cairomm.spec	15 Oct 2006 04:05:50 -0000	1.6
@@ -1,11 +1,11 @@
 Summary:          Cairomm is the C++ API for the cairo graphics library
 Name:             cairomm
-Version:          1.2.0
-Release:          4%{?dist}
-URL:		  http://www.cairographics.org
-License:	  LGPL
+Version:          1.2.2
+Release:          1%{?dist}
+URL:              http://www.cairographics.org
+License:          LGPL
 Group:            System Environment/Libraries
-Source:		  http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
+Source:           http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cairo-devel >= 1.2.0 pkgconfig
 
@@ -18,7 +18,7 @@
 Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       cairo-devel >= 1.0.4 pkgconfig
+Requires:       cairo-devel >= 1.2.0 pkgconfig
 
 %description    devel
 This package contains the libraries and header files needed for
@@ -57,6 +57,9 @@
 %doc ChangeLog reference
 
 %changelog
+* Sat Oct 14 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.2.2-1
+- New upstream release
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.2.0-4
 - Bumped release for make tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Aug 2006 19:51:06 -0000	1.4
+++ sources	15 Oct 2006 04:05:50 -0000	1.5
@@ -1 +1 @@
-ee326b8e7cb7eeb843fa56412eb162de  cairomm-1.2.0.tar.gz
+fabb040a5ff2cf0529af55ff46d22d2d  cairomm-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 04:08:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 14 Oct 2006 21:08:56 -0700
Subject: rpms/osgal/devel .cvsignore, 1.3, 1.4 osgal.spec, 1.4, 1.5 sources, 
	1.3, 1.4 osgal-20060714-link.patch, 1.1, NONE
Message-ID: <200610150408.k9F48wkS030844@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817

Modified Files:
	.cvsignore osgal.spec sources 
Removed Files:
	osgal-20060714-link.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Sep 2006 22:04:13 -0000	1.3
+++ .cvsignore	15 Oct 2006 04:08:56 -0000	1.4
@@ -1 +1 @@
-osgal-cvs-20060714.tar.gz
+osgal-cvs-20060903.tar.gz


Index: osgal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/osgal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- osgal.spec	3 Sep 2006 21:08:38 -0000	1.4
+++ osgal.spec	15 Oct 2006 04:08:56 -0000	1.5
@@ -1,12 +1,11 @@
 Name:           osgal
-Version:        20060714
-Release:        2%{?dist}
+Version:        20060903
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.vrlab.umu.se/research/osgAL
 Source0:        http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz
-Patch0:         %{name}-%{version}-link.patch
 BuildRoot:      %{_tmppath}/%{name}-cvs-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  OpenSceneGraph-devel openalpp-devel freealut-devel libvorbis-devel
 BuildRequires:  libGL-devel autoconf automake libtool
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n %{name}-cvs-%{version}
-%patch0 -p0 -b .link~
 autoreconf --force --install
 
 # Fix rpmlint errors
@@ -64,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sat Oct 14 2006 Christopher Stone <chris.stone at gmail.com> 20060903-1
+- Upstream sync
+
 * Sun Sep 03 2006 Christopher Stone <chris.stone at gmail.com> 20060714-2
 - Add patch for better linking
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Sep 2006 22:04:13 -0000	1.3
+++ sources	15 Oct 2006 04:08:56 -0000	1.4
@@ -1 +1 @@
-5226c8db9159fe60dcf10829f91d1941  osgal-cvs-20060714.tar.gz
+92e67bc580900b9a98ba31e18b47c5f3  osgal-cvs-20060903.tar.gz


--- osgal-20060714-link.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 04:15:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 14 Oct 2006 21:15:10 -0700
Subject: rpms/osgal/FC-5 .cvsignore, 1.3, 1.4 osgal.spec, 1.4, 1.5 sources,
	1.3, 1.4 osgal-20060714-link.patch, 1.1, NONE
Message-ID: <200610150415.k9F4FCIX030984@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30963

Modified Files:
	.cvsignore osgal.spec sources 
Removed Files:
	osgal-20060714-link.patch 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgal/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Sep 2006 22:20:19 -0000	1.3
+++ .cvsignore	15 Oct 2006 04:15:09 -0000	1.4
@@ -1 +1 @@
-osgal-cvs-20060714.tar.gz
+osgal-cvs-20060903.tar.gz


Index: osgal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgal/FC-5/osgal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- osgal.spec	3 Sep 2006 21:22:36 -0000	1.4
+++ osgal.spec	15 Oct 2006 04:15:09 -0000	1.5
@@ -1,12 +1,11 @@
 Name:           osgal
-Version:        20060714
-Release:        2%{?dist}
+Version:        20060903
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.vrlab.umu.se/research/osgAL
 Source0:        http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz
-Patch0:         %{name}-%{version}-link.patch
 BuildRoot:      %{_tmppath}/%{name}-cvs-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  OpenSceneGraph-devel openalpp-devel freealut-devel libvorbis-devel
 BuildRequires:  libGL-devel autoconf automake libtool
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n %{name}-cvs-%{version}
-%patch0 -p0 -b .link~
 autoreconf --force --install
 
 # Fix rpmlint errors
@@ -64,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sat Oct 14 2006 Christopher Stone <chris.stone at gmail.com> 20060903-1
+- Upstream sync
+
 * Sun Sep 03 2006 Christopher Stone <chris.stone at gmail.com> 20060714-2
 - Add patch for better linking
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgal/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Sep 2006 22:20:19 -0000	1.3
+++ sources	15 Oct 2006 04:15:09 -0000	1.4
@@ -1 +1 @@
-5226c8db9159fe60dcf10829f91d1941  osgal-cvs-20060714.tar.gz
+92e67bc580900b9a98ba31e18b47c5f3  osgal-cvs-20060903.tar.gz


--- osgal-20060714-link.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 04:33:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 21:33:13 -0700
Subject: rpms/libpri/devel libpri.spec,1.2,1.3
Message-ID: <200610150433.k9F4XjxX031093@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31076

Modified Files:
	libpri.spec 
Log Message:
Fix lib paths for 64 bit systems.


Index: libpri.spec
===================================================================
RCS file: /cvs/extras/rpms/libpri/devel/libpri.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libpri.spec	15 Oct 2006 03:57:10 -0000	1.2
+++ libpri.spec	15 Oct 2006 04:33:12 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: An implementation of Primary Rate ISDN
 Name: libpri
 Version: 1.4.0
-Release: 1%{?dist}.beta1
+Release: 2%{?dist}.beta1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.asterisk.org/
@@ -29,6 +29,7 @@
 %prep
 %setup0 -q -n %{name}-%{version}-beta1
 %patch0 -p0
+%{__perl} -pi -e 's|\$\(INSTALL_BASE\)/lib|%{_libdir}|g' Makefile
 
 %build
 make %{?_smp_mflags}
@@ -56,6 +57,9 @@
 %{_libdir}/libpri.so
 
 %changelog
+* Sat Oct 14 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
+- Fix lib paths for 64 bit systems.
+
 * Sat Oct 14 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
 - Get rid of pesky "." in -devel summary.
 - Remove zaptel-devel BR



From fedora-extras-commits at redhat.com  Sun Oct 15 04:34:39 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 14 Oct 2006 21:34:39 -0700
Subject: check-mirrors mirrorStats.py,NONE,1.1
Message-ID: <200610150434.k9F4Yd90031159@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31142

Added Files:
	mirrorStats.py 
Log Message:
extracts specific information from the mirror logs for archive



--- NEW FILE mirrorStats.py ---
#!/usr/bin/python

# TODO: Determine if adding this to the returnmirrors script will impact
#       performance

import md5
import sqlite
import sys

debug = 0

def errorprint(error):
    print >> sys.stderr, error

def debugprint(debugmsg):
    if debug:
        print debugmsg
try:
	fp = open(sys.argv[1], 'r')
except:
	print 'please specify a valid filename'
	sys.exit(1)

try:
    for line in fp:
        ip = md5.new(line.split(' ')[0]).hexdigest()
        url = line.split(' ')[6]
	date = line.split(' ')[3]
        try: 
            args = url.split('?')[1].split('&')
        except:
            pass
        else:
            # Get our repo and arch flags
            for arg in args:
                if arg.split('=')[0].lower() == 'repo' and arg.split('=')[-1].lower() != 'repo':
                    repo = arg.split('=')[1].lower()
                if arg.split('=')[0].lower() == 'arch' and arg.split('=')[-1].lower() != 'arch':
                    arch = arg.split('=')[1].lower()
            print "%s %s %s %s" % (date, ip, repo, arch)
finally:
    fp.close()



From fedora-extras-commits at redhat.com  Sun Oct 15 05:17:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 22:17:23 -0700
Subject: rpms/bsd-games/devel bsd-games-2.17-banner-rename.patch, NONE,
	1.1 bsd-games.spec, 1.7, 1.8 config.params, 1.2, 1.3
Message-ID: <200610150517.k9F5HPiv001723@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1701

Modified Files:
	bsd-games.spec config.params 
Added Files:
	bsd-games-2.17-banner-rename.patch 
Log Message:
Add back the 'banner' program as 'vert-banner'



bsd-games-2.17-banner-rename.patch:

--- NEW FILE bsd-games-2.17-banner-rename.patch ---
--- banner/banner.6.orig	2006-10-14 21:24:31.000000000 -0700
+++ banner/banner.6	2006-10-14 21:25:12.000000000 -0700
@@ -30,10 +30,10 @@
 .\"	@(#)banner.6	8.2 (Berkeley) 4/29/95
 .\"
 .Dd April 29, 1995
-.Dt BANNER 6
+.Dt VERT-BANNER 6
 .Os
 .Sh NAME
-.Nm banner
+.Nm vert-banner
 .Nd print large banner on printer
 .Sh SYNOPSIS
 .Nm


Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bsd-games.spec	28 Aug 2006 13:46:53 -0000	1.7
+++ bsd-games.spec	15 Oct 2006 05:17:22 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -18,8 +18,9 @@
 Patch5: bsd-games-2.17-tetrisgid.patch
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
-# Add patch for monop->mpoly man page
+# Add patches for man page renames
 Patch8: bsd-games-2.17-monop-rename.patch
+Patch9: bsd-games-2.17-banner-rename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libtermcap-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
@@ -43,6 +44,7 @@
 %patch6 -p1 -b .hackgid
 %patch7 -p1 -b .phantasiagid
 %patch8 -p1 -b .monop.rename
+%patch9 -p0 -b .banner.rename
 
 %build
 # We include a templatized configuration settings file to set
@@ -76,6 +78,11 @@
 mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly
 mv $RPM_BUILD_ROOT/%{_mandir}/man6/monop.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/mpoly.6.gz
 
+# Change the binary name for banner to prevent a conflict with a Fedora
+# package with the same name
+mv $RPM_BUILD_ROOT/%{_bindir}/banner $RPM_BUILD_ROOT/%{_bindir}/vert-banner
+mv $RPM_BUILD_ROOT/%{_mandir}/man6/banner.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/vert-banner.6.gz
+
 # Remove this doc file.  We're copying it to a different location for Fedora.
 rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me
 
@@ -126,6 +133,7 @@
 %{_bindir}/snscore
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
+%{_bindir}/vert-banner
 %{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
@@ -153,6 +161,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 2.17-15
+- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> 2.17-14
 - Rebuild for Fedora Extras
 


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/config.params,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.params	1 May 2006 23:59:29 -0000	1.2
+++ config.params	15 Oct 2006 05:17:22 -0000	1.3
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@



From fedora-extras-commits at redhat.com  Sun Oct 15 05:35:21 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 22:35:21 -0700
Subject: rpms/bsd-games/FC-5 bsd-games.spec,1.4,1.5 config.params,1.2,1.3
Message-ID: <200610150535.k9F5ZN6g001839@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1820

Modified Files:
	bsd-games.spec config.params 
Log Message:
- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-5/bsd-games.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsd-games.spec	20 Jun 2006 21:54:34 -0000	1.4
+++ bsd-games.spec	15 Oct 2006 05:35:20 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -18,8 +18,9 @@
 Patch5: bsd-games-2.17-tetrisgid.patch
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
-# Add patch for monop->mpoly man page
+# Add patches for man page renames
 Patch8: bsd-games-2.17-monop-rename.patch
+Patch9: bsd-games-2.17-banner-rename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libtermcap-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
@@ -43,6 +44,7 @@
 %patch6 -p1 -b .hackgid
 %patch7 -p1 -b .phantasiagid
 %patch8 -p1 -b .monop.rename
+%patch9 -p0 -b .banner.rename
 
 %build
 # We include a templatized configuration settings file to set
@@ -76,6 +78,11 @@
 mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly
 mv $RPM_BUILD_ROOT/%{_mandir}/man6/monop.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/mpoly.6.gz
 
+# Change the binary name for banner to prevent a conflict with a Fedora
+# package with the same name
+mv $RPM_BUILD_ROOT/%{_bindir}/banner $RPM_BUILD_ROOT/%{_bindir}/vert-banner
+mv $RPM_BUILD_ROOT/%{_mandir}/man6/banner.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/vert-banner.6.gz
+
 # Remove this doc file.  We're copying it to a different location for Fedora.
 rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me
 
@@ -126,6 +133,7 @@
 %{_bindir}/snscore
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
+%{_bindir}/vert-banner
 %{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
@@ -153,6 +161,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 2.17-12
+- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
+
 * Tue Jun 20 2006 Wart <wart at kobold.org> 2.17-11
 - Added missing BR: flex, bison
 - Rename monop man page to match the renamed executable.


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-5/config.params,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.params	2 May 2006 00:12:02 -0000	1.2
+++ config.params	15 Oct 2006 05:35:20 -0000	1.3
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@



From fedora-extras-commits at redhat.com  Sun Oct 15 05:37:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 22:37:48 -0700
Subject: rpms/bsd-games/FC-5 bsd-games-2.17-banner-rename.patch,NONE,1.1
Message-ID: <200610150537.k9F5boD7001913@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1895

Added Files:
	bsd-games-2.17-banner-rename.patch 
Log Message:
Patch to rename the banner executable name in the man page.



bsd-games-2.17-banner-rename.patch:

--- NEW FILE bsd-games-2.17-banner-rename.patch ---
--- banner/banner.6.orig	2006-10-14 21:24:31.000000000 -0700
+++ banner/banner.6	2006-10-14 21:25:12.000000000 -0700
@@ -30,10 +30,10 @@
 .\"	@(#)banner.6	8.2 (Berkeley) 4/29/95
 .\"
 .Dd April 29, 1995
-.Dt BANNER 6
+.Dt VERT-BANNER 6
 .Os
 .Sh NAME
-.Nm banner
+.Nm vert-banner
 .Nd print large banner on printer
 .Sh SYNOPSIS
 .Nm



From fedora-extras-commits at redhat.com  Sun Oct 15 07:44:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 00:44:53 -0700
Subject: rpms/lua/devel lua.spec,1.19,1.20
Message-ID: <200610150744.k9F7itsC008260@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lua/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8243

Modified Files:
	lua.spec 
Log Message:
* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-2
- Only link /usr/bin/lua with readline / do not link %{_libdir}/liblua-5.1.so
  with readline so that we don't cause any License troubles for packages
  linking against liblua-5.1.so, otherwise lua could drag the GPL only readline
  lib into the linking of non GPL apps.



Index: lua.spec
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lua.spec	14 Oct 2006 20:32:35 -0000	1.19
+++ lua.spec	15 Oct 2006 07:44:53 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           lua
 Version:        5.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Powerful light-weight programming language
 Group:          Development/Languages
 License:        MIT
@@ -40,7 +40,9 @@
 
 %build
 %configure --with-readline
-make %{?_smp_mflags} 
+# hack so that only /usr/bin/lua gets linked with readline as it is the
+# only one which needs this and otherwise we get License troubles
+make %{?_smp_mflags} LIBS="-ldl" luac_LDADD="liblua.la -lm -ldl"
 
 
 %install
@@ -69,6 +71,12 @@
 
 
 %changelog
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-2
+- Only link /usr/bin/lua with readline / do not link %%{_libdir}/liblua-5.1.so
+  with readline so that we don't cause any License troubles for packages
+  linking against liblua-5.1.so, otherwise lua could drag the GPL only readline
+  lib into the linking of non GPL apps.
+
 * Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-1
 - New upstream release 5.1.1
 - Fix detection of readline during compile (iow add readline support back)



From fedora-extras-commits at redhat.com  Sun Oct 15 07:59:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 00:59:27 -0700
Subject: rpms/perl-PAR-Dist/FC-5 .cvsignore, 1.11, 1.12 perl-PAR-Dist.spec, 
	1.15, 1.16 sources, 1.11, 1.12
Message-ID: <200610150759.k9F7xTbv008467@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-PAR-Dist/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8430/FC-5

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.21-1
- 0.21.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Oct 2006 06:37:52 -0000	1.11
+++ .cvsignore	15 Oct 2006 07:59:27 -0000	1.12
@@ -1 +1 @@
-PAR-Dist-0.20.tar.gz
+PAR-Dist-0.21.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/perl-PAR-Dist.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-PAR-Dist.spec	12 Oct 2006 06:37:52 -0000	1.15
+++ perl-PAR-Dist.spec	15 Oct 2006 07:59:27 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.20
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.21-1
+- 0.21.
+
 * Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
 - 0.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Oct 2006 06:37:52 -0000	1.11
+++ sources	15 Oct 2006 07:59:27 -0000	1.12
@@ -1 +1 @@
-471da0751f63f8f4ea609b8ea08de964  PAR-Dist-0.20.tar.gz
+0cd2f70204c234905c8906057ae84e21  PAR-Dist-0.21.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 07:59:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 00:59:28 -0700
Subject: rpms/perl-PAR-Dist/devel .cvsignore, 1.11, 1.12 perl-PAR-Dist.spec, 
	1.15, 1.16 sources, 1.11, 1.12
Message-ID: <200610150759.k9F7xUxO008473@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-PAR-Dist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8430/devel

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.21-1
- 0.21.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Oct 2006 06:37:53 -0000	1.11
+++ .cvsignore	15 Oct 2006 07:59:28 -0000	1.12
@@ -1 +1 @@
-PAR-Dist-0.20.tar.gz
+PAR-Dist-0.21.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-PAR-Dist.spec	12 Oct 2006 06:37:53 -0000	1.15
+++ perl-PAR-Dist.spec	15 Oct 2006 07:59:28 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.20
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.21-1
+- 0.21.
+
 * Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
 - 0.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Oct 2006 06:37:53 -0000	1.11
+++ sources	15 Oct 2006 07:59:28 -0000	1.12
@@ -1 +1 @@
-471da0751f63f8f4ea609b8ea08de964  PAR-Dist-0.20.tar.gz
+0cd2f70204c234905c8906057ae84e21  PAR-Dist-0.21.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 08:22:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 01:22:26 -0700
Subject: rpms/rpmlint/FC-5 rpmlint-0.78-svn-fixes.patch, NONE,
	1.1 rpmlint.config, 1.1, 1.2 rpmlint.spec, 1.25, 1.26
Message-ID: <200610150822.k9F8Mw39011595@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11554/FC-5

Modified Files:
	rpmlint.config rpmlint.spec 
Added Files:
	rpmlint-0.78-svn-fixes.patch 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-2
- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
- Filter messages about gpg-pubkeys for now.


rpmlint-0.78-svn-fixes.patch:

--- NEW FILE rpmlint-0.78-svn-fixes.patch ---
Index: TagsCheck.py
===================================================================
--- TagsCheck.py	(revision 1282)
+++ TagsCheck.py	(revision 1289)
@@ -595,7 +595,7 @@
                 if not ret:
                     printWarning(pkg, 'no-version-in-last-changelog')
                 elif version and release:
-                    srpm=pkg[rpm.RPMTAG_SOURCERPM]
+                    srpm = pkg[rpm.RPMTAG_SOURCERPM] or ''
                     # only check when source name correspond to name
                     if srpm[0:-8] == '%s-%s-%s' % (name, version, release):
                         expected=version + '-' + release
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1282)
+++ FilesCheck.py	(revision 1289)
@@ -228,8 +228,12 @@
 text_characters = "".join(map(chr, range(32, 127)) + list("\n\r\t\b"))
 _null_trans = string.maketrans("", "")
 
-def istextfile(f):
-    s=open(f).read(512)
+def istextfile(f, pkg):
+    try:
+        s = open(f).read(512)
+    except Exception, e: # eg. https://bugzilla.redhat.com/209876
+        printWarning(pkg, 'read-error', e)
+        return 0
 
     if "\0" in s:
         return 0
@@ -589,7 +593,7 @@
             if stat.S_ISREG(mode):
                 path=pkg.dirName() + '/' + f
                 if os.access(path, os.R_OK):
-                    if istextfile(path):
+                    if istextfile(path, pkg):
                         line=open(path).readline()
                         res=None
                         # ignore perl module shebang -- TODO: disputed...
@@ -917,6 +921,12 @@
 packaged as arch dependent, or something else.  Verify what the case is, and
 if there's no way to produce useful debuginfo out of it, disable creation of
 the debuginfo package.''',
+
+'read-error',
+'''This file could not be read.  A reason for this could be that the info about
+it in the rpm header indicates that it is supposed to be a readable normal file
+but it actually is not in the filesystem.  Because of this, some checks will
+be skipped.''',
 )
 
 # FilesCheck.py ends here
Index: Pkg.py
===================================================================
--- Pkg.py	(revision 1282)
+++ Pkg.py	(revision 1289)
@@ -58,17 +58,21 @@
 
 # utilities
 
+var_regex=re.compile('^(.*)\${?(\w+)}?(.*)$')
+
 def shell_var_value(var, script):
-    assign_regex=re.compile(re.escape(var) + '\s*=\s*(.+)\s*(#.*)*$',
+    assign_regex=re.compile('\\b' + re.escape(var) + '\s*=\s*(.+)\s*(#.*)*$',
                             re.MULTILINE)
     res=assign_regex.search(script)
     if res:
+        res2 = var_regex.search(res.group(1))
+        if res2:
+            if res2.group(2) == var: # infinite loop
+                return None
         return substitute_shell_vars(res.group(1), script)
     else:
         return None
 
-var_regex=re.compile('^(.*)\${?([^}]+)}?(.*)$')
-
 def substitute_shell_vars(val, script):
     res=var_regex.search(val)
     if res:
Index: rpmlint.py
===================================================================
--- rpmlint.py	(revision 1282)
+++ rpmlint.py	(revision 1289)
@@ -98,6 +98,8 @@
                     f=os.path.abspath(os.path.join(d, i))
                     st=os.stat(f)
                     if stat.S_ISREG(st[stat.ST_MODE]):
+                        if f[-4:] != '.rpm' and f[-4:] != '.spm':
+                            continue
                         try:
                             pkg=Pkg.Pkg(f, extract_dir)
                             runChecks(pkg)
Index: BinariesCheck.py
===================================================================
--- BinariesCheck.py	(revision 1282)
+++ BinariesCheck.py	(revision 1289)
@@ -32,7 +32,7 @@
     undef_regex=re.compile('^undefined symbol:\s+(\S+)')
     debug_file_regex=re.compile('\.debug$')
 
-    def __init__(self, pkg, path, file):
+    def __init__(self, pkg, path, file, is_ar):
         self.objdump_error=0
         self.needed=[]
         self.rpath=[]
@@ -75,7 +75,7 @@
 
         # undefined symbol check makes sense only for installed packages
         # skip debuginfo: https://bugzilla.redhat.com/190599
-        if not is_debug and isinstance(pkg, Pkg.InstalledPkg):
+        if not is_ar and not is_debug and isinstance(pkg, Pkg.InstalledPkg):
             # We could do this with objdump, but it's _much_ simpler with ldd.
             res = Pkg.getstatusoutput(('env', 'LC_ALL=C', 'ldd', '-d', '-r', path))
             if not res[0]:
@@ -89,7 +89,6 @@
 path_regex=re.compile('(.*/)([^/]+)')
 numeric_dir_regex=re.compile('/usr(?:/share)/man/man./(.*)\.[0-9](?:\.gz|\.bz2)')
 versioned_dir_regex=re.compile('[^.][0-9]')
-binary_regex=re.compile('ELF|current ar archive')
 usr_share=re.compile('^/usr/share/')
 etc=re.compile('^/etc/')
 not_stripped=re.compile('not stripped')
@@ -137,7 +136,7 @@
         binary_in_usr_lib=0
         has_usr_lib_file=0
 
-        res=srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM])
+        res = srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM] or '')
         if res:
             multi_pkg=(pkg.name != res.group(1))
         else:
@@ -149,7 +148,9 @@
                 break
 
         for i in info:
-            is_binary=binary_regex.search(i[1])
+            is_elf = string.find(i[1], 'ELF') != -1
+            is_ar = string.find(i[1], 'current ar archive') != -1
+            is_binary = is_elf or is_ar
 
             if is_binary:
                 binary=binary+1
@@ -175,7 +176,7 @@
                             printWarning(pkg, 'unstripped-binary-or-object', i[0])
 
                         # inspect binary file
-                        bin_info=BinaryInfo(pkg, pkg.dirName()+i[0], i[0])
+                        bin_info=BinaryInfo(pkg, pkg.dirName()+i[0], i[0], is_ar)
 
                         # so name in library
                         if so_regex.search(i[0]):
Index: I18NCheck.py
===================================================================
--- I18NCheck.py	(revision 1282)
+++ I18NCheck.py	(revision 1289)
@@ -99,7 +99,7 @@
         locales=[]                      # list of locales for this packages
         webapp=False
 
-        i18n_tags = pkg[HEADER_I18NTABLE]
+        i18n_tags = pkg[HEADER_I18NTABLE] or ()
         #i18n_files = pkg.langFiles()
 
         for i in i18n_tags:
Index: InitScriptCheck.py
===================================================================
--- InitScriptCheck.py	(revision 1282)
+++ InitScriptCheck.py	(revision 1289)
@@ -71,7 +71,10 @@
                 lsb_tags = {}
                 # check common error in file content
                 fd=open(pkg.dirName() + '/' + f, 'r')
-                for line in fd.readlines():
+                content = fd.readlines()
+                fd.close()
+                content_str = "".join(content)
+                for line in content:
                     line = line[:-1] # chomp
                     # TODO check if there is only one line like this
                     if line.startswith('### BEGIN INIT INFO'):
@@ -131,7 +134,7 @@
                         if name != basename:
                             error=1
                             if name[0] == '$':
-                                value=Pkg.substitute_shell_vars(name, line)
+                                value = Pkg.substitute_shell_vars(name, content_str)
                                 if value == basename:
                                     error=0
                             if error:


Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmlint.config	29 Jun 2006 20:29:39 -0000	1.1
+++ rpmlint.config	15 Oct 2006 08:22:26 -0000	1.2
@@ -55,3 +55,4 @@
 addFilter("-debuginfo no-documentation")
 addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
+addFilter(" gpg-pubkey ")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rpmlint.spec	23 Sep 2006 21:37:34 -0000	1.25
+++ rpmlint.spec	15 Oct 2006 08:22:26 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.78
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -10,6 +10,7 @@
 Source1:        %{name}.config
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
+Patch2:         %{name}-0.78-svn-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +32,7 @@
 %setup -q
 %patch0
 %patch1
+%patch2
 sed -i -e /MenuCheck/d Config.py
 
 
@@ -65,6 +67,10 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-2
+- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
+- Filter messages about gpg-pubkeys for now.
+
 * Sun Sep 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-1
 - 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
 - /etc/profile.d/* filtering no longer needed.



From fedora-extras-commits at redhat.com  Sun Oct 15 08:22:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 01:22:26 -0700
Subject: rpms/rpmlint/devel rpmlint-0.78-svn-fixes.patch, NONE,
	1.1 rpmlint.config, 1.3, 1.4 rpmlint.spec, 1.26, 1.27
Message-ID: <200610150822.k9F8Mwo9011599@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11554/devel

Modified Files:
	rpmlint.config rpmlint.spec 
Added Files:
	rpmlint-0.78-svn-fixes.patch 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-2
- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
- Filter messages about gpg-pubkeys for now.


rpmlint-0.78-svn-fixes.patch:

--- NEW FILE rpmlint-0.78-svn-fixes.patch ---
Index: TagsCheck.py
===================================================================
--- TagsCheck.py	(revision 1282)
+++ TagsCheck.py	(revision 1289)
@@ -595,7 +595,7 @@
                 if not ret:
                     printWarning(pkg, 'no-version-in-last-changelog')
                 elif version and release:
-                    srpm=pkg[rpm.RPMTAG_SOURCERPM]
+                    srpm = pkg[rpm.RPMTAG_SOURCERPM] or ''
                     # only check when source name correspond to name
                     if srpm[0:-8] == '%s-%s-%s' % (name, version, release):
                         expected=version + '-' + release
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1282)
+++ FilesCheck.py	(revision 1289)
@@ -228,8 +228,12 @@
 text_characters = "".join(map(chr, range(32, 127)) + list("\n\r\t\b"))
 _null_trans = string.maketrans("", "")
 
-def istextfile(f):
-    s=open(f).read(512)
+def istextfile(f, pkg):
+    try:
+        s = open(f).read(512)
+    except Exception, e: # eg. https://bugzilla.redhat.com/209876
+        printWarning(pkg, 'read-error', e)
+        return 0
 
     if "\0" in s:
         return 0
@@ -589,7 +593,7 @@
             if stat.S_ISREG(mode):
                 path=pkg.dirName() + '/' + f
                 if os.access(path, os.R_OK):
-                    if istextfile(path):
+                    if istextfile(path, pkg):
                         line=open(path).readline()
                         res=None
                         # ignore perl module shebang -- TODO: disputed...
@@ -917,6 +921,12 @@
 packaged as arch dependent, or something else.  Verify what the case is, and
 if there's no way to produce useful debuginfo out of it, disable creation of
 the debuginfo package.''',
+
+'read-error',
+'''This file could not be read.  A reason for this could be that the info about
+it in the rpm header indicates that it is supposed to be a readable normal file
+but it actually is not in the filesystem.  Because of this, some checks will
+be skipped.''',
 )
 
 # FilesCheck.py ends here
Index: Pkg.py
===================================================================
--- Pkg.py	(revision 1282)
+++ Pkg.py	(revision 1289)
@@ -58,17 +58,21 @@
 
 # utilities
 
+var_regex=re.compile('^(.*)\${?(\w+)}?(.*)$')
+
 def shell_var_value(var, script):
-    assign_regex=re.compile(re.escape(var) + '\s*=\s*(.+)\s*(#.*)*$',
+    assign_regex=re.compile('\\b' + re.escape(var) + '\s*=\s*(.+)\s*(#.*)*$',
                             re.MULTILINE)
     res=assign_regex.search(script)
     if res:
+        res2 = var_regex.search(res.group(1))
+        if res2:
+            if res2.group(2) == var: # infinite loop
+                return None
         return substitute_shell_vars(res.group(1), script)
     else:
         return None
 
-var_regex=re.compile('^(.*)\${?([^}]+)}?(.*)$')
-
 def substitute_shell_vars(val, script):
     res=var_regex.search(val)
     if res:
Index: rpmlint.py
===================================================================
--- rpmlint.py	(revision 1282)
+++ rpmlint.py	(revision 1289)
@@ -98,6 +98,8 @@
                     f=os.path.abspath(os.path.join(d, i))
                     st=os.stat(f)
                     if stat.S_ISREG(st[stat.ST_MODE]):
+                        if f[-4:] != '.rpm' and f[-4:] != '.spm':
+                            continue
                         try:
                             pkg=Pkg.Pkg(f, extract_dir)
                             runChecks(pkg)
Index: BinariesCheck.py
===================================================================
--- BinariesCheck.py	(revision 1282)
+++ BinariesCheck.py	(revision 1289)
@@ -32,7 +32,7 @@
     undef_regex=re.compile('^undefined symbol:\s+(\S+)')
     debug_file_regex=re.compile('\.debug$')
 
-    def __init__(self, pkg, path, file):
+    def __init__(self, pkg, path, file, is_ar):
         self.objdump_error=0
         self.needed=[]
         self.rpath=[]
@@ -75,7 +75,7 @@
 
         # undefined symbol check makes sense only for installed packages
         # skip debuginfo: https://bugzilla.redhat.com/190599
-        if not is_debug and isinstance(pkg, Pkg.InstalledPkg):
+        if not is_ar and not is_debug and isinstance(pkg, Pkg.InstalledPkg):
             # We could do this with objdump, but it's _much_ simpler with ldd.
             res = Pkg.getstatusoutput(('env', 'LC_ALL=C', 'ldd', '-d', '-r', path))
             if not res[0]:
@@ -89,7 +89,6 @@
 path_regex=re.compile('(.*/)([^/]+)')
 numeric_dir_regex=re.compile('/usr(?:/share)/man/man./(.*)\.[0-9](?:\.gz|\.bz2)')
 versioned_dir_regex=re.compile('[^.][0-9]')
-binary_regex=re.compile('ELF|current ar archive')
 usr_share=re.compile('^/usr/share/')
 etc=re.compile('^/etc/')
 not_stripped=re.compile('not stripped')
@@ -137,7 +136,7 @@
         binary_in_usr_lib=0
         has_usr_lib_file=0
 
-        res=srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM])
+        res = srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM] or '')
         if res:
             multi_pkg=(pkg.name != res.group(1))
         else:
@@ -149,7 +148,9 @@
                 break
 
         for i in info:
-            is_binary=binary_regex.search(i[1])
+            is_elf = string.find(i[1], 'ELF') != -1
+            is_ar = string.find(i[1], 'current ar archive') != -1
+            is_binary = is_elf or is_ar
 
             if is_binary:
                 binary=binary+1
@@ -175,7 +176,7 @@
                             printWarning(pkg, 'unstripped-binary-or-object', i[0])
 
                         # inspect binary file
-                        bin_info=BinaryInfo(pkg, pkg.dirName()+i[0], i[0])
+                        bin_info=BinaryInfo(pkg, pkg.dirName()+i[0], i[0], is_ar)
 
                         # so name in library
                         if so_regex.search(i[0]):
Index: I18NCheck.py
===================================================================
--- I18NCheck.py	(revision 1282)
+++ I18NCheck.py	(revision 1289)
@@ -99,7 +99,7 @@
         locales=[]                      # list of locales for this packages
         webapp=False
 
-        i18n_tags = pkg[HEADER_I18NTABLE]
+        i18n_tags = pkg[HEADER_I18NTABLE] or ()
         #i18n_files = pkg.langFiles()
 
         for i in i18n_tags:
Index: InitScriptCheck.py
===================================================================
--- InitScriptCheck.py	(revision 1282)
+++ InitScriptCheck.py	(revision 1289)
@@ -71,7 +71,10 @@
                 lsb_tags = {}
                 # check common error in file content
                 fd=open(pkg.dirName() + '/' + f, 'r')
-                for line in fd.readlines():
+                content = fd.readlines()
+                fd.close()
+                content_str = "".join(content)
+                for line in content:
                     line = line[:-1] # chomp
                     # TODO check if there is only one line like this
                     if line.startswith('### BEGIN INIT INFO'):
@@ -131,7 +134,7 @@
                         if name != basename:
                             error=1
                             if name[0] == '$':
-                                value=Pkg.substitute_shell_vars(name, line)
+                                value = Pkg.substitute_shell_vars(name, content_str)
                                 if value == basename:
                                     error=0
                             if error:


Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmlint.config	23 Sep 2006 21:37:35 -0000	1.3
+++ rpmlint.config	15 Oct 2006 08:22:26 -0000	1.4
@@ -55,3 +55,4 @@
 addFilter("-debuginfo no-documentation")
 addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
+addFilter(" gpg-pubkey ")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rpmlint.spec	23 Sep 2006 21:37:35 -0000	1.26
+++ rpmlint.spec	15 Oct 2006 08:22:26 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.78
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -10,6 +10,7 @@
 Source1:        %{name}.config
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
+Patch2:         %{name}-0.78-svn-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +32,7 @@
 %setup -q
 %patch0
 %patch1
+%patch2
 sed -i -e /MenuCheck/d Config.py
 
 
@@ -65,6 +67,10 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-2
+- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
+- Filter messages about gpg-pubkeys for now.
+
 * Sun Sep 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-1
 - 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
 - /etc/profile.d/* filtering no longer needed.



From fedora-extras-commits at redhat.com  Sun Oct 15 11:01:27 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sun, 15 Oct 2006 04:01:27 -0700
Subject: rpms/pan/devel .cvsignore, 1.11, 1.12 pan.spec, 1.20, 1.21 sources, 
	1.11, 1.12
Message-ID: <200610151102.k9FB24AO021257@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18311

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
Update to current upstream version 0.116 (beta tree)
Fixes build problem on x86_64: http://bugzilla.gnome.org/show_bug.cgi?id=358654




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Oct 2006 10:29:08 -0000	1.11
+++ .cvsignore	15 Oct 2006 11:01:27 -0000	1.12
@@ -1 +1 @@
-pan-0.115.tar.bz2
+pan-0.116.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pan.spec	2 Oct 2006 10:29:08 -0000	1.20
+++ pan.spec	15 Oct 2006 11:01:27 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.115
+Version:	0.116
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 15 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.116-1
+- Update to 0.116
+
 * Mon Oct 02 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.115-1
 - Update to 0.115 (last `big change' release before 1.0)
 - removed unnecessary Patch0 pan-0.99-gi18n.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Oct 2006 10:29:08 -0000	1.11
+++ sources	15 Oct 2006 11:01:27 -0000	1.12
@@ -1 +1 @@
-45174cd93f9b1b9e3466cd8a74436c23  pan-0.115.tar.bz2
+590587dea07f23f5e87562fdddd67d4a  pan-0.116.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 15 12:28:14 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:28:14 -0700
Subject: extras-buildsys/utils/pushscript/yum - New directory
Message-ID: <200610151228.k9FCSEZS030738@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30719/yum

Log Message:
Directory /cvs/fedora/extras-buildsys/utils/pushscript/yum added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 12:28:19 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:28:19 -0700
Subject: extras-buildsys/utils/pushscript/repomd - New directory
Message-ID: <200610151228.k9FCSJ8O030761@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/repomd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30719/repomd

Log Message:
Directory /cvs/fedora/extras-buildsys/utils/pushscript/repomd added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 12:28:20 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:28:20 -0700
Subject: extras-buildsys/utils/pushscript/rpmUtils - New directory
Message-ID: <200610151228.k9FCSKBw030766@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/rpmUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30719/rpmUtils

Log Message:
Directory /cvs/fedora/extras-buildsys/utils/pushscript/rpmUtils added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 12:30:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:30:46 -0700
Subject: extras-buildsys/utils/pushscript/repomd __init__.py, NONE,
	1.1 mdErrors.py, NONE, 1.1 mdUtils.py, NONE,
	1.1 packageObject.py, NONE, 1.1 packageSack.py, NONE,
	1.1 repoMDObject.py, NONE, 1.1 test.py, NONE, 1.1
Message-ID: <200610151230.k9FCUkkj030926@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/repomd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805/repomd

Added Files:
	__init__.py mdErrors.py mdUtils.py packageObject.py 
	packageSack.py repoMDObject.py test.py 
Log Message:
Add the patched yum 2.6.1 here, so we remove the dependency on the
system-installed one.




--- NEW FILE __init__.py ---


--- NEW FILE mdErrors.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University


import exceptions

class RepoMDError(exceptions.Exception):
    def __init__(self, args=None):
        exceptions.Exception.__init__(self)    
        self.args = args
        

class PackageSackError(exceptions.Exception):
    def __init__(self, args=None):
        exceptions.Exception.__init__(self)
        self.args = args


--- NEW FILE mdUtils.py ---
#!/usr/bin/python -tt

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

import rpm
import types

def rpmOutToStr(arg):
    if type(arg) != types.StringType:
    # and arg is not None:
        arg = str(arg)
        
    return arg
    

def compareEVR((e1, v1, r1), (e2, v2, r2)):
    # return 1: a is newer than b
    # 0: a and b are the same version
    # -1: b is newer than a
    e1 = rpmOutToStr(e1)
    v1 = rpmOutToStr(v1)
    r1 = rpmOutToStr(r1)
    e2 = rpmOutToStr(e2)
    v2 = rpmOutToStr(v2)
    r2 = rpmOutToStr(r2)
    #print '%s, %s, %s vs %s, %s, %s' % (e1, v1, r1, e2, v2, r2)
    rc = rpm.labelCompare((e1, v1, r1), (e2, v2, r2))
    #print '%s, %s, %s vs %s, %s, %s = %s' % (e1, v1, r1, e2, v2, r2, rc)
    return rc

def newestInList(pkgs):
    # return the newest in the list of packages
    ret = [ pkgs.pop() ]
    newest = ret[0].returnEVR()
    for pkg in pkgs:
        rc = compareEVR(pkg.returnEVR(), newest)
        if rc > 0:
            ret = [ pkg ]
            newest = pkg.returnEVR()
        elif rc == 0:
            ret.append(pkg)
    return ret

###########
# Title: Remove duplicates from a sequence
# Submitter: Tim Peters 
# From: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560                      
    
def unique(s):
    """Return a list of the elements in s, but without duplicates.

    For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3],
    unique("abcabc") some permutation of ["a", "b", "c"], and
    unique(([1, 2], [2, 3], [1, 2])) some permutation of
    [[2, 3], [1, 2]].

    For best speed, all sequence elements should be hashable.  Then
    unique() will usually work in linear time.

    If not possible, the sequence elements should enjoy a total
    ordering, and if list(s).sort() doesn't raise TypeError it's
    assumed that they do enjoy a total ordering.  Then unique() will
    usually work in O(N*log2(N)) time.

    If that's not possible either, the sequence elements must support
    equality-testing.  Then unique() will usually work in quadratic
    time.
    """

    n = len(s)
    if n == 0:
        return []

    # Try using a dict first, as that's the fastest and will usually
    # work.  If it doesn't work, it will usually fail quickly, so it
    # usually doesn't cost much to *try* it.  It requires that all the
    # sequence elements be hashable, and support equality comparison.
    u = {}
    try:
        for x in s:
            u[x] = 1
    except TypeError:
        del u  # move on to the next method
    else:
        return u.keys()

    # We can't hash all the elements.  Second fastest is to sort,
    # which brings the equal elements together; then duplicates are
    # easy to weed out in a single pass.
    # NOTE:  Python's list.sort() was designed to be efficient in the
    # presence of many duplicate elements.  This isn't true of all
    # sort functions in all languages or libraries, so this approach
    # is more effective in Python than it may be elsewhere.
    try:
        t = list(s)
        t.sort()
    except TypeError:
        del t  # move on to the next method
    else:
        assert n > 0
        last = t[0]
        lasti = i = 1
        while i < n:
            if t[i] != last:
                t[lasti] = last = t[i]
                lasti += 1
            i += 1
        return t[:lasti]

    # Brute force is all that's left.
    u = []
    for x in s:
        if x not in u:
            u.append(x)
    return u


--- NEW FILE packageObject.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

import mdUtils

# consider making an XMLPackageObject
# BasePackageObject - with just methods and the init'd storage dicts
# XMLPackageobject will be used to build the rpmXMLPAckageObject - which is 
# formatnode stuff for rpm.


class PackageObject:
    """Base Package Object - sets up the default storage dicts and the
       most common returns"""
       
    def __init__(self):
        self.simple = {} # simple things, name, arch, e,v,r, size, etc
        self.checksums = [] # (type, checksum, id(0,1)

    def __str__(self):
        return self.returnNevraPrintable()

    def returnSimple(self, varname):
        return self.simple[varname]

    def simpleItems(self):
        return self.simple.keys()            

    def returnID(self):
        return self.returnSimple('id')

    def returnPackageTuple(self):
        return (self.returnSimple('name'), self.returnSimple('arch'), 
                self.returnSimple('epoch'),self.returnSimple('version'), 
                self.returnSimple('release'))
        
    def returnNevraTuple(self):
        return (self.returnSimple('name'), self.returnSimple('epoch'), 
                self.returnSimple('version'),self.returnSimple('release'), 
                self.returnSimple('arch'))
    
    def returnNevraPrintable(self):
        """return printable string for the pkgname/object
           name - epoch:ver-rel.arch"""
        if self.returnSimple('epoch') == '0':
            string = '%s - %s-%s.%s' % (self.returnSimple('name'), 
                                        self.returnSimple('version'),
                                        self.returnSimple('release'), 
                                        self.returnSimple('arch'))
        else:
            string = '%s - %s:%s-%s.%s' % (self.returnSimple('name'), 
                                           self.returnSimple('epoch'), 
                                           self.returnSimple('version'), 
                                           self.returnSimple('release'), 
                                           self.returnSimple('arch'))
        return string                                           

    def returnEVR(self):
        """returns a tuple of epoch, ver, rel"""
        return (self.returnSimple('epoch'), self.returnSimple('version'), self.returnSimple('release'))
        
        return                            

    def returnChangelog(self):
        """return changelog entries"""
        return self.changelog

class XMLPackageObject(PackageObject):
    """inherits from PackageObject, does the functions to parse an xml package format
       file to pull packages in"""

    def __init__(self):
        PackageObject.__init__(self)
        
    def parseVersion(self, node):
        """takes a version element, returns a tuple of (epoch, ver, rel)"""
        epoch = node.GetAttribute('epoch')
        ver = node.GetAttribute('ver')
        rel = node.GetAttribute('rel')
        return (epoch, ver, rel)
        
    def parseChecksum(self, node):
        """takes a checksum element, returns a tuple of (type, checksum, 
           if it is the checksum to be used for the the package id)"""
           
        csumtype = node.GetAttribute('type')
        csumid = node.GetAttribute('pkgid')
        if csumid is None or csumid.upper() == 'NO':
            csumid = 0
        elif csumid.upper() == 'YES':
            csumid = 1
        else:
            #FIXME - raise an exception
            print 'broken csumid - invalid document'
            csumid = 0
        node.Read()
        csum = node.Value()
        return (csumtype, csum, csumid)
        
    def parseSize(self, node):
        """takes a size element, returns  package, 
           installed and archive size"""
           
        pkg = node.GetAttribute('package')
        installed = node.GetAttribute('installed')
        archive = node.GetAttribute('archive')
        return pkg, installed, archive

    def parseTime(self, node):
        """takes a time element, returns buildtime, filetime(mtime)"""
         
        build = node.GetAttribute('build')
        mtime = node.GetAttribute('file')
        return build, mtime

    def parseLocation(self, node):
        """takes a location element, returnsbase url path, relative path to package"""
        
        base = node.GetAttribute('base')
        relative = node.GetAttribute('href')
        return base, relative
        
    def parseSimple(self, node):
        """takes a simple unattributed CDATA element and returns its value"""
        if node.IsEmptyElement():
            return ''
        node.Read() # get the next node
        return node.Value()
        
    def readPkgNode(self, reader):
        """primary package node reading and dumping"""
        
        mydepth = reader.Depth()
        ret = reader.Read()        
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue

            if reader.NodeType() == 15 and reader.Depth() == mydepth:
                return
                
            if reader.NodeType() == 1:
                if reader.Depth() == mydepth:
                    #print 'oh crap - we are outside - how did that happen??'
                    return

                nodeName = reader.LocalName()

                if nodeName in ['name', 'arch', 'summary', 'description', 
                                'url', 'packager', 'buildtime', 'filetime']:
                                     
                    self.simple[nodeName] = self.parseSimple(reader)

                elif nodeName == 'version': 
                    (self.simple['epoch'], self.simple['version'], 
                     self.simple['release']) = self.parseVersion(reader)
            
                elif nodeName == 'size':
                    self.simple['packagesize'], self.simple['installedsize'], \
                     self.simple['archivesize'] = self.parseSize(reader)
            
                elif nodeName == 'time':
                    self.simple['buildtime'], self.simple['filetime'], = \
                     self.parseTime(reader)
                     
                
                elif nodeName == 'location':
                    self.simple['basepath'], self.simple['relativepath'] = \
                     self.parseLocation(reader)
    
                elif nodeName == 'checksum':
                    (sumtype, sumdata, sumid) = self.parseChecksum(reader)
                    self.checksums.append((sumtype, sumdata, sumid))
                    if sumid:
                        self.simple['id'] = sumdata
                    
                elif nodeName == 'format':
                    try:
                        self.readFormatNode(reader)
                    except AttributeError:
                        # FIXME - should raise an exception
                        print 'No method to handle format element'
                else:
                    pass
                    # FIXME - should raise an exception
                    print 'unknown element in package: %s' % nodeName
    
            ret = reader.Read()
            continue
    

class RpmBase:
    """return functions and storage for rpm-specific data"""

    def __init__(self):
        self.prco = {}
        self.prco['obsoletes'] = [] # (name, flag, (e,v,r))
        self.prco['conflicts'] = [] # (name, flag, (e,v,r))
        self.prco['requires'] = [] # (name, flag, (e,v,r))
        self.prco['provides'] = [] # (name, flag, (e,v,r))
        self.files = {}
        self.files['file'] = []
        self.files['dir'] = []
        self.files['ghost'] = []
        self.changelog = [] # (ctime, cname, ctext)
        self.licenses = []
    
    def returnPrco(self, prcotype):
        """return list of provides, requires, conflicts or obsoletes"""
        if self.prco.has_key(prcotype):
            return self.prco[prcotype]
        else:
            return []

    def checkPrco(self, prcotype, prcotuple):
        """returns 1 or 0 if the pkg contains the requested tuple/tuple range"""
        # get rid of simple cases - nothing
        if not self.prco.has_key(prcotype):
            return 0
        # exact match    
        if prcotuple in self.prco[prcotype]:
            return 1
        else:
            # make us look it up and compare
            (reqn, reqf, (reqe, reqv ,reqr)) = prcotuple
            if reqf is not None:
                if self.inPrcoRange(prcotype, prcotuple):
                    return 1
                else:
                    return 0
            else:
                for (n, f, (e, v, r)) in self.returnPrco(prcotype):
                    if reqn == n:
                        return 1

        return 0
                
    def inPrcoRange(self, prcotype, reqtuple):
        """returns true if the package has a the prco that satisfies 
           the reqtuple range, assume false.
           Takes: prcotype, requested prco tuple"""
        # we only ever get here if we have a versioned prco
        # nameonly shouldn't ever raise it
        (reqn, reqf, (reqe, reqv, reqr)) = reqtuple
        # find the named entry in pkgobj, do the comparsion
        for (n, f, (e, v, r)) in self.returnPrco(prcotype):
            if reqn == n:
                # found it
                if f != 'EQ':
                    # isn't this odd, it's not 'EQ' - it really should be
                    # use the pkgobj's evr for the comparison
                    (e, v, r) = self.returnEVR()
                # and you thought we were done having fun
                # if the requested release is left out then we have
                # to remove release from the package prco to make sure the match
                # is a success - ie: if the request is EQ foo 1:3.0.0 and we have 
                # foo 1:3.0.0-15 then we have to drop the 15 so we can match
                if reqr is None:
                    r = None
                if reqe is None:
                    e = None
                if reqv is None: # just for the record if ver is None then we're going to segfault
                    v = None
                rc = mdUtils.compareEVR((e, v, r), (reqe, reqv, reqr))
                
                if rc >= 1:
                    if reqf in ['GT', 'GE', 4, 12]:
                        return 1
                if rc == 0:
                    if reqf in ['GE', 'LE', 'EQ', 8, 10, 12]:
                        return 1
                if rc <= -1:
                    if reqf in ['LT', 'LE', 2, 10]:
                        return 1
        return 0
        
    def returnChangelog(self):
        """return changelog entries"""
        return self.changelog
        
    def returnFileEntries(self, ftype='file'):
        """return list of files based on type"""
        if self.files.has_key(ftype):
            return self.files[ftype]
        else:
            return []
            
    def returnFileTypes(self):
        """return list of types of files in the package"""
        return self.files.keys()
    
    
    
class RpmXMLPackageObject(XMLPackageObject, RpmBase):
    """used class - inherits from XMLPackageObject, which inherits from 
       Package Object also inherits from RpmBase for return functions"""
       
    def __init__(self, node, repoid):
        XMLPackageObject.__init__(self)
        RpmBase.__init__(self)

        self.simple['repoid'] = repoid

        self.readPkgNode(node)
        self.repoid = repoid

    def dumpPkg(self):
        fconv = { 'EQ':'=', 'LT':'<', 'LE':'<=',
                  'GT':'>', 'GE':'>='} 
        for item in self.simpleItems():
            print '%s = %s' % (item, self.returnSimple(item))
        for csum in self.checksums:
            print csum
        for thing in ['requires', 'provides', 'obsoletes', 'conflicts']:
            if len(self.prco[thing]) > 0:
                print '%s:' % thing
                for (n,f,(e,v,r)) in self.prco[thing]:
                    if f is None:
                        print '\t%s ' % n
                    else:
                        print '\t',
                        print n,
                        print fconv[f],
                        print '%s:%s-%s' %(e,v,r)
                print ''
                    
                    
    
    def readFormatNode(self, reader):
        """reads the <format> element and hands off the elements to be 
           parsed elsewhere"""
           
        mydepth = reader.Depth()
        ret = reader.Read()        
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue

            if reader.NodeType() == 15 and reader.Depth() == mydepth:
                return
                
            if reader.NodeType() == 1:
                if reader.Depth() == mydepth:
                    #print 'oh crap - we are outside - how did that happen??'
                    return

                nodeName = reader.LocalName()

                if nodeName in ['vendor', 'group', 'buildhost', 'sourcerpm']:
                    self.simple[nodeName] = self.parseSimple(reader)
                    
                elif nodeName == 'license':
                    self.licenses.append(self.parseSimple(reader))
                
                elif nodeName == 'header-range':
                    self.simple['hdrstart'], self.simple['hdrend'] = \
                     self.parseHdrRange(reader)
                
                elif nodeName in ['obsoletes', 'provides', 'requires', 'conflicts']:
                    objlist = self.parsePrco(reader)
                    self.prco[nodeName].extend(objlist)
                    
                elif nodeName == 'file':
                    self.loadFileEntry(reader)
                    
                    
                else:
                    # FIXME - should raise an exception
                    print 'unknown element in format: %s' % nodeName
                    #pass

            ret = reader.Read()
            continue

    
    def parseHdrRange(self, node):
        """parse header-range, returns (start, end) tuple"""
        
        start = node.GetAttribute('start')
        end = node.GetAttribute('end')
        return start, end
        
    def parsePrco(self, reader):
        """parse a provides,requires,obsoletes,conflicts element"""
        objlist = []
        mydepth = reader.Depth()
        ret = reader.Read()        
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue

            if reader.NodeType() == 15 and reader.Depth() == mydepth:
                return objlist
                
            if reader.NodeType() == 1:
                if reader.Depth() == mydepth:
                    #print 'oh crap - we are outside - how did that happen??'
                    return objlist

                prcoName = reader.LocalName()
                
                if prcoName == 'entry':
                    name = reader.GetAttribute('name')
                    flag = reader.GetAttribute('flags')
                    e = reader.GetAttribute('epoch')
                    v = reader.GetAttribute('ver')
                    r = reader.GetAttribute('rel')
                    pre = reader.GetAttribte('pre')
                    objlist.append((name, flag, (e, v, r), pre))

            ret = reader.Read()
            continue
            
        return objlist

    def loadFileEntry(self, node):
        """load a file/dir entry"""
        ftype = node.GetAttribute('type')
        node.Read() # content is file
        file = node.Value()
        if not ftype:
            ftype = 'file'
        if not self.files.has_key(ftype):
            self.files[ftype] = []
        #if file not in self.files[ftype]:
        self.files[ftype].append(file)

        return (ftype, file)
            
    def loadChangeLogEntry(self, node):
        """load changelog data"""
        time = node.GetAttribute('date')
        author = node.GetAttribute('author')
        node.Read()
        content = node.Value()
        self.changelog.append((time, author, content))
        


--- NEW FILE packageSack.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

import libxml2
from mdErrors import PackageSackError
import mdUtils

class PackageSack:
    """represents sets (sacks) of Package Objects"""
    def __init__(self):
        self.nevra = {} #nevra[(Name, Epoch, Version, Release, Arch)] = []
        self.obsoletes = {} #obs[obsoletename] = [pkg1, pkg2, pkg3] 
                 #the package lists are packages that obsolete the key name
        self.requires = {} #req[reqname] = [pkg1, pkg2, pkg3]
                 #the package lists are packages that require the key name
        self.provides = {} #ditto of above but for provides
        self.conflicts = {} #ditto of above but for conflicts
        self.filenames = {} # duh
        self.pkgsByRepo = {} #pkgsByRepo['repoid']= [pkg1, pkg2, pkg3]
        self.pkgsByID = {} #pkgsById[pkgid] = [pkg1, pkg2] (should really only ever be one value but
                           #you might have repos with the same package in them
        self.compatarchs = None # dict of compatible archs for addPackage
        self.indexesBuilt = 0
        
        
    def __len__(self):
        return len(self.simplePkgList())
    
    def __iter__(self):
        if hasattr(self.returnPackages(), '__iter__'):
            return self.returnPackages().__iter__()
        else:
            return iter(self.returnPackages())

    def _checkIndexes(self, failure='error'):
        """check to see if the indexes are built, if not do what failure demands
           either error out or build the indexes, default is to error out"""
           
        if not self.indexesBuilt:
            if failure == 'error':
                raise PackageSackError, 'Indexes not yet built, cannot search'
            elif failure == 'build':
                self.buildIndexes()

    def packagesByTuple(self, pkgtup):
        """return a list of package objects by (n,a,e,v,r) tuple"""
        (n,a,e,v,r) = pkgtup
        return self.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)
        
    def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
        """return list of pkgobjects matching the nevra requested"""
        self._checkIndexes(failure='build')
        if self.nevra.has_key((name, epoch, ver, rel, arch)):
            return self.nevra[(name, epoch, ver, rel, arch)]
        else:
            return []
           
        
    def searchID(self, pkgid):
        """return list of packages based on pkgid"""
        self._checkIndexes(failure='build')        
        if self.pkgsByID.has_key(pkgid):
            return self.pkgsByID[pkgid]
        else:
            return []
            
    def searchRequires(self, name):
        """return list of package requiring the name (any evr and flag)"""
        self._checkIndexes(failure='build')        
        if self.requires.has_key(name):
            return self.requires[name]
        else:
            return []

    def searchProvides(self, name):
        """return list of package providing the name (any evr and flag)"""
        # FIXME - should this do a pkgobj.checkPrco((name, flag, (e,v,r,))??
        # has to do a searchFiles and a searchProvides for things starting with /
        self._checkIndexes(failure='build')        
        returnList = []
        if name[0] == '/':
             returnList.extend(self.searchFiles(name))
        if self.provides.has_key(name):
            returnList.extend(self.provides[name])
        return returnList

    def searchConflicts(self, name):
        """return list of package conflicting with the name (any evr and flag)"""
        self._checkIndexes(failure='build')        
        if self.conflicts.has_key(name):
            return self.conflicts[name]
        else:
            return []

    def searchObsoletes(self, name):
        """return list of package obsoleting the name (any evr and flag)"""
        self._checkIndexes(failure='build')        
        if self.obsoletes.has_key(name):
            return self.obsoletes[name]
        else:
            return []

    def returnObsoletes(self):
        """returns a dict of obsoletes dict[obsoleting pkgtuple] = [list of obs]"""
        obs = {}
        for po in self.returnPackages():
            pkgtuple = po.returnPackageTuple()
            if len(po.returnPrco('obsoletes')) == 0:
                continue

            if not obs.has_key(pkgtuple):
                obs[pkgtuple] = po.returnPrco('obsoletes')
            else:
                obs[pkgtuple].extend(po.returnPrco('obsoletes'))
        
        return obs
        
    def searchFiles(self, file):
        """return list of packages by filename
           FIXME - need to add regex match against keys in file list
        """
        self._checkIndexes(failure='build')
        if self.filenames.has_key(file):
            return self.filenames[file]
        else:
            return []

    def _addToDictAsList(self, dict, key, data):
        if not dict.has_key(key):
            dict[key] = []
        #if data not in dict[key]: - if I enable this the whole world grinds to a halt
        # need a faster way of looking for the object in any particular list
        dict[key].append(data)

    def _delFromListOfDict(self, dict, key, data):
        if not dict.has_key(key):
            dict[key] = []
        try:
            dict[key].remove(data)
        except ValueError:
            pass
            
        if len(dict[key]) == 0: # if it's an empty list of the dict, then kill it
            del dict[key]
            
            
    def addPackage(self, obj):
        """add a pkgobject to the packageSack"""

        repoid = obj.returnSimple('repoid')
        (name, epoch, ver, rel, arch) = obj.returnNevraTuple()
        
        if self.compatarchs:
            if self.compatarchs.has_key(arch):
                self._addToDictAsList(self.pkgsByRepo, repoid, obj)
        else:
            self._addToDictAsList(self.pkgsByRepo, repoid, obj)


    def buildIndexes(self):
        """builds the useful indexes for searching/querying the packageSack
           This should be called after all the necessary packages have been 
           added/deleted"""
        
        # blank out the indexes
        self.obsoletes = {}
        self.requires = {}
        self.provides = {}
        self.conflicts = {}
        self.filenames = {}
        self.nevra = {}
        self.pkgsByID = {}
        
        for repoid in self.pkgsByRepo.keys():
            for obj in self.pkgsByRepo[repoid]:
            # store the things provided just on name, not the whole require+version
            # this lets us reduce the set of pkgs to search when we're trying to depSolve
                for (n, fl, (e,v,r)) in obj.returnPrco('obsoletes'):
                    self._addToDictAsList(self.obsoletes, n, obj)
                for (n, fl, (e,v,r)) in obj.returnPrco('requires'):
                    self._addToDictAsList(self.requires, n, obj)
                for (n, fl, (e,v,r)) in obj.returnPrco('provides'):
                    self._addToDictAsList(self.provides, n, obj)
                for (n, fl, (e,v,r)) in obj.returnPrco('conflicts'):
                    self._addToDictAsList(self.conflicts, n, obj)
                for ftype in obj.returnFileTypes():
                    for file in obj.returnFileEntries(ftype):
                        self._addToDictAsList(self.filenames, file, obj)
                self._addToDictAsList(self.pkgsByID, obj.returnSimple('id'), obj)
                (name, epoch, ver, rel, arch) = obj.returnNevraTuple()
                self._addToDictAsList(self.nevra, (name, epoch, ver, rel, arch), obj)
                self._addToDictAsList(self.nevra, (name, None, None, None, None), obj)
        
        self.indexesBuilt = 1
        

        
    def delPackage(self, obj):
        """delete a pkgobject"""
        self._delFromListOfDict(self.pkgsByRepo, obj.returnSimple('repoid'), obj)
        if self.indexesBuilt: # if we've built indexes, delete it b/c we've just deleted something
            self.indexesBuilt = 0
        
    def returnPackages(self, repoid=None):
        """return list of all packages, takes optional repoid"""
        returnList = []
        if repoid is None:
            for repo in self.pkgsByRepo.keys():
                returnList.extend(self.pkgsByRepo[repo])
        else:
            try:
                returnList = self.pkgsByRepo[repoid]
            except KeyError:
                # nothing to return
                pass
        
        return returnList

    def returnNewestByNameArch(self, naTup=None):
        """return list of newest packages based on name, arch matching
           this means(in name.arch form): foo.i386 and foo.noarch are not 
           compared to each other for highest version only foo.i386 and 
           foo.i386 will be compared"""
        highdict = {}
        # If naTup is set, only iterate through packages that match that
        # name
        if (naTup):
            where = self.nevra.get((naTup[0],None,None,None,None))
            if (not where):
                raise PackageSackError, 'No Package Matching %s.%s' % naTup
        else:
            where = self.returnPackages()

        for pkg in where:
            (n, e, v ,r, a) = pkg.returnNevraTuple()
            if not highdict.has_key((n, a)):
                highdict[(n, a)] = pkg
            else:
                pkg2 = highdict[(n, a)]
                (e2, v2, r2) = pkg2.returnEVR()
                rc = mdUtils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[(n, a)] = pkg
        
        if naTup:
            if highdict.has_key(naTup):
                return highdict[naTup]
            else:
                raise PackageSackError, 'No Package Matching %s.%s' % naTup
        
        return highdict.values()
        
    def returnNewestByName(self, name=None):
        """return list of newest packages based on name matching
           this means(in name.arch form): foo.i386 and foo.noarch will
           be compared to each other for highest version"""
        highdict = {}
        for pkg in self.returnPackages():
            (n, e, v ,r, a) = pkg.returnNevraTuple()
            if not highdict.has_key(n):
                highdict[n] = []
                highdict[n].append(pkg)
            else:
                pkg2 = highdict[n][0]
                (e2, v2, r2) = pkg2.returnEVR()
                rc = mdUtils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[n] = [pkg]
                elif rc == 0:
                    highdict[n].append(pkg)
                
        if name:
            if highdict.has_key(name):
                return highdict[name]
            else:
                raise PackageSackError, 'No Package Matching  %s' % name
                
        return highdict.values()
           
    def simplePkgList(self, repoid=None):
        """returns a list of pkg tuples (n, a, e, v, r) optionally from a single repoid"""
        simplelist = []
        for pkg in self.returnPackages(repoid):
            simplelist.append(pkg.returnPackageTuple())
        return simplelist
                       
    def printPackages(self):
        for pkg in self.returnPackages():
            print pkg.returnNevraPrintable()

    def excludeArchs(self, archlist):
        """exclude incompatible arches. archlist is a list of compatible arches"""
        
        for pkg in self.returnPackages():
            if pkg.arch not in archlist:
                self.delPackage(pkg)



# packageSack should be a base class
# two derived classes could be DBPackageSack and XMLPackageSack
# one for importing this data from the localdb 
# another from XML metadata files

class XMLPackageSack(PackageSack):
    """Derived class from PackageSack to build list from XML metadata file. 
       Needs the Package Object Class passed to it for the Sack"""
    def __init__(self, pkgObjectClass):
        PackageSack.__init__(self)
        self.repoStatus = {} #[repoid]= [primary, filelist, other] (so you can tell 
                             #what things have been loaded or not - b/c w/o primary, 
                             #filelist and other really can't be loaded
        self.pkgObjectClass = pkgObjectClass                           

                
    def addFile(self, repoid, file, callback=None):
        """takes a repository id and an xml file. It populates whatever it can, 
           if you try to populate with a filelist or other metadata file 
           before the primary metadata you'll not like the results"""
        try:
            reader = libxml2.newTextReaderFilename(file)
        except libxml2.treeError:
            raise PackageSackError, "Invalid or non-existent file: %s" % (file)

        else:
            reader.Read()
            xmlfiletype=reader.Name() # - first node should be the type
            if xmlfiletype == 'metadata':
                if not self._checkRepoStatus(repoid, itemcheck='primary'):
                    self.loadPrimaryMD(reader, repoid, callback)

            elif xmlfiletype == 'filelists':
                if not self._checkRepoStatus(repoid, itemcheck='filelists'):
                    self.loadFileMD(reader, repoid, callback)

            elif xmlfiletype == 'otherdata':
                if not self._checkRepoStatus(repoid, itemcheck='other'):
                    self.loadOtherMD(reader, repoid, callback)

            else:
                print 'Error: other unknown root element %s' % xmlfiletype 


    def _checkRepoStatus(self, repoid, itemcheck='primary'):
        """return 1 if itemcheck is in repo"""
        if self.repoStatus.has_key(repoid):
            if itemcheck in self.repoStatus[repoid]:
                return 1
        return 0
            
    def loadPrimaryMD(self, reader, repoid, callback=None):
        """load all the data from the primary metadata xml file"""
        
        pkgcount = 9999 # big number
        current = 1
        if reader.HasAttributes():
            pkgcount = int(reader.GetAttribute('packages'))
            

        
        ret = reader.Read()
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue
            
            if reader.NodeType() == 1 and reader.Name() == 'package':
                if reader.HasAttributes():
                    if reader.GetAttribute('type') == 'rpm':
                        current+=1
                        po = self.pkgObjectClass(reader, repoid)
                        self.addPackage(po)
            if callback: callback(current, pkgcount, name=repoid)
            ret = reader.Read()
            continue

        # update the repoStatus                
        if not self.repoStatus.has_key(repoid):
            self.repoStatus[repoid] = []
        if not 'primary' in self.repoStatus[repoid]:
            self.repoStatus[repoid].append('primary')


    def loadFileMD(self, reader, repoid, callback=None):
        """load all the filelist metadata from the file"""

        pkgcount = 9999 # big number
        current = 1
        if reader.HasAttributes():
            pkgcount = int(reader.GetAttribute('packages'))

        ret = reader.Read()
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue
            
            if reader.NodeType() == 1 and reader.Name() == 'package':
                if reader.HasAttributes():
                    pkgid = reader.GetAttribute('pkgid')
                    pkgs = self.searchID(pkgid)
                    pkgmatch = 0
                    mydepth = reader.Depth()
                    current+=1

                    for pkg in pkgs:
                        if pkg.returnSimple('repoid') == repoid: # check for matching repo
                            reader.Read()
                            pkgmatch+=1
                            
                            while 1:
                                if reader.NodeType() == 15 and reader.Depth() == mydepth:
                                    break
                                    
                                elif reader.NodeType() == 14:
                                    ret = reader.Read()
                                    continue

                                elif reader.NodeType() == 1:
                                    if reader.LocalName() == 'file':
                                        (ftype, file) = pkg.loadFileEntry(reader)
                                        #self._addToDictAsList(self.filenames, file, pkg)

                                ret = reader.Read()
                                continue        

                    if pkgmatch < 1:
                        # FIXME - raise a warning? Emit error? bitch? moan?
                        pass

                               
            ret = reader.Read()
            if callback: callback(current, pkgcount, name=repoid) # give us some pretty output
            continue

        # update the repostatus
        if not 'filelist' in self.repoStatus[repoid]:
            self.repoStatus[repoid].append('filelist')
        # we've just added file items - build up the indexes again
        self.buildIndexes()
        
            
    def loadOtherMD(self, reader, repoid, callback=None):
        """load the changelog, etc data from the other.xml file"""

        pkgcount = 9999 # big number
        current = 1
        if reader.HasAttributes():
            pkgcount = int(reader.GetAttribute('packages'))

        ret = reader.Read()
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue
            
            if reader.NodeType() == 1 and reader.Name() == 'package':
                current+=1
                if reader.HasAttributes():
                    pkgid = reader.GetAttribute('pkgid')
                    pkgs = self.searchID(pkgid)
                    pkgmatch = 0
                    mydepth = reader.Depth()
                    #current+=1
                    

                    for pkg in pkgs:
                        if pkg.returnSimple('repoid') == repoid: # check for matching repo
                            reader.Read()
                            pkgmatch+=1
                            
                            while 1:
                                if reader.NodeType() == 15 and reader.Depth() == mydepth:
                                    break
                                    
                                elif reader.NodeType() == 14:
                                    ret = reader.Read()                                                        
                                    continue

                                elif reader.NodeType() == 1:
                                    if reader.LocalName() == 'changelog':
                                        pkg.loadChangeLogEntry(reader)

                                ret = reader.Read()
                                continue        

                    if pkgmatch < 1:
                        # FIXME - raise a warning? Emit error? bitch? moan?
                        pass
            if callback: callback(current, pkgcount, name=repoid)
            ret = reader.Read()
            continue
                                        
        if not 'other' in self.repoStatus[repoid]:
            self.repoStatus[repoid].append('other')
        # we've just added file items - build up the indexes again
        self.buildIndexes()
        

class ListPackageSack(PackageSack):
    """Derived class from PackageSack to build new Sack from list of
       pkgObjects - like one returned from self.returnNewestByNameArch()
       or self.returnNewestByName()"""
       
    def __init__(self, Objlist=None):
        PackageSack.__init__(self)
        if Objlist is not None:
            self.addList(Objlist)
    
    def addList(self, ObjList):
        for pkgobj in ObjList:
            self.addPackage(pkgobj)
    


--- NEW FILE repoMDObject.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University


import libxml2
from mdErrors import RepoMDError


class RepoMD:
    """represents the repomd xml file"""
    def __init__(self, repoid, file):
        """takes a repoid and a filename for the repomd.xml"""
        
        self.repoid = repoid
        self.repoData = {}
        try:
            doc = libxml2.parseFile(file)
        except libxml2.parserError:
            raise RepoMDError, 'Error: could not parse file %s' % file
        root = doc.getRootElement()
        xmlfiletype = root.name
        node = root.children
        if xmlfiletype == 'repomd':
            self.loadRepoMD(node)
        else:
            raise RepoMDError, 'Error: other unknown root element %s' % xmlfiletype 
        doc.freeDoc()

    def _returnData(self, mdtype, request):
        """ return the data from the repository Data"""
        if self.repoData.has_key(mdtype):
            ds = self.repoData[mdtype]
            if ds.has_key(request):
                return ds[request]
            else:
                raise RepoMDError, "Error: request %s not in %s data" % (request, mdtype)
        else:
            raise RepoMDError, "Error: odd MDtype requested: %s" % mdtype
            
            
            
    
    def _storeRepoData(self, mdtype, dataname, data):
        """stores repository data
           mdtype = primary, filelists, other, group
           dataname = checksum, timestamp, basepath, relativepath
        """
        if self.repoData.has_key(mdtype):
            ds = self.repoData[mdtype]
            if not ds.has_key(dataname):
                ds[dataname] = data
            else:
                raise RepoMDError, "Warning: duplicate data of %s description inputted" % dataname
        else:
            raise RepoMDError, "Warning: odd mdtype being put in %s" % mdtype
            
                
                
                
    def loadRepoDataNode(self, node):
        """loads a repository data node into the class"""
        mdtype = node.prop('type') # get the 'type' property for the datanode
        if not self.repoData.has_key(mdtype):
            self.repoData[mdtype] = {}
            
        datanode = node.children            
        while datanode is not None:
            if datanode.type != 'element':
                datanode = datanode.next
                continue
            
            if datanode.name  == 'location':
                base = datanode.prop('base')
                relative = datanode.prop('href')    
                self._storeRepoData(mdtype, 'basepath', base)
                self._storeRepoData(mdtype, 'relativepath', relative)
            elif datanode.name == 'checksum':
                csumType = datanode.prop('type')
                csum = datanode.content
                self._storeRepoData(mdtype, 'checksum', (csumType, csum))
            elif datanode.name == 'timestamp':
                timestamp = datanode.content
                self._storeRepoData(mdtype, 'timestamp', timestamp)

            datanode = datanode.next    
            continue

    def loadRepoMD(self, node):
        """iterates through the data nodes and populates some simple data areas"""
                
        while node is not None:
            if node.type != 'element':
                node = node.next
                continue
            
            if node.name == 'data':
                self.loadRepoDataNode(node)
                    
            node = node.next
            continue
                
    def _checksum(self, mdtype):
        """returns a tuple of (checksum type, checksum) for the specified Metadata
           file"""
        return self._returnData(mdtype, 'checksum')
        
        
    def _location(self, mdtype):
        """returns location to specified metadata file, (base, relative)"""
        base = self._returnData(mdtype, 'basepath')
        relative = self._returnData(mdtype, 'relativepath')
        
        return (base, relative)
        
    def _timestamp(self, mdtype):
        """returns timestamp for specified metadata file"""
        return self._returnData(mdtype, 'timestamp')
        
    def otherChecksum(self):
        """returns a tuple of (checksum type, checksum) for the other Metadata file"""
        return self._checksum('other')
        
    def otherLocation(self):
        """returns location to other metadata file, (base, relative)"""
        return self._location('other')
        
    def otherTimestamp(self):
        """returns timestamp for other metadata file"""
        return self._timestamp('other')
        
    def primaryChecksum(self):
        """returns a tuple of (checksum type, checksum) for the primary Metadata file"""
        return self._checksum('primary')
        
    def primaryLocation(self):
        """returns location to primary metadata file, (base, relative)"""
        return self._location('primary')
        
    def primaryTimestamp(self):
        """returns timestamp for primary metadata file"""
        return self._timestamp('primary')

    def filelistsChecksum(self):
        """returns a tuple of (checksum type, checksum) for the filelists Metadata file"""
        return self._checksum('filelists')
        
    def filelistsLocation(self):
        """returns location to filelists metadata file, (base, relative)"""
        return self._location('filelists')
        
    def filelistsTimestamp(self):
        """returns timestamp for filelists metadata file"""
        return self._timestamp('filelists')

    def groupChecksum(self):
        """returns a tuple of (checksum type, checksum) for the group Metadata file"""
        return self._checksum('group')
        
    def groupLocation(self):
        """returns location to group metadata file, (base, relative)"""
        return self._location('group')
        
    def groupTimestamp(self):
        """returns timestamp for group metadata file"""
        return self._timestamp('group')

    def fileTypes(self):
        """return list of metadata file types available"""
        return self.repoData.keys()


--- NEW FILE test.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

# classes for parsing the metadata files for the new metadata format


# used with python -i :)
import sys
import os
import time
import rpm
import packageSack
import packageObject
import repoMDObject
import mdUtils
import mdErrors


def process(current, total, name=None):
    sys.stdout.write('\r' + ' ' * 80)
    sys.stdout.write('\rNode %d of %d' % (current, total))
    sys.stdout.flush()

if len(sys.argv) < 4:
    print 'test.py: /path/to/repo /other/repo somepackagename'
    sys.exit(1)
   
print time.time()
repos = sys.argv[1:3]
pkgSack = packageSack.XMLPackageSack(packageObject.RpmXMLPackageObject)
numid = 0
for repo in repos:
    numid+=1
    basepath = repo
    repomdxmlfile = os.path.join(basepath, 'repodata/repomd.xml')
    repoid = repo

    try:
        repodata = repoMDObject.RepoMD(repoid, repomdxmlfile)
    except mdErrors.RepoMDError, e:
        print >> sys.stderr, e
        sys.exit(1)
    
    (pbase, phref) = repodata.primaryLocation()
    (fbase, fhref) = repodata.filelistsLocation()
    (obase, ohref) = repodata.otherLocation()
    
    
    processlist = [phref]
    for file in processlist:
        print time.time()
        print 'importing %s from %s' % (file, repoid)
        complete = basepath + '/' + file
        try:
            pkgSack.addFile(repoid, complete, process)
        except mdErrors.PackageSackError, e:
            print >> sys.stderr, e
            sys.exit(1)
            
    print ' '
    print time.time()

for pkg in pkgSack.searchNevra(sys.argv[3]):
    print pkg
    for reqtup in pkg.returnPrco('requires'):
        (reqn, reqf, (reqe,reqv,reqr)) = reqtup
        # rpmlib deps should be handled on their own
        if reqn[:6] == 'rpmlib':
            continue
        # kill self providers, too
        if pkg.checkPrco('provides', reqtup):
            continue
            
        # get a list of all pkgs that match the reqn
        providers = pkgSack.searchProvides(reqn)
        if len(providers) == 0:
            print 'unresolved: %s  %s %s:%s-%s' % (reqn, reqf, reqe, reqv, reqr)
            continue

        if len(providers) == 1:
            if reqf is None:
                print '%s: %s from %s' % (reqn, providers[0], providers[0].returnSimple('relativepath'))
                continue

            # only one entry but we need to match out it out
            if providers[0].checkPrco('provides', reqtup):
                print '%s: %s from %s' % (reqn, providers[0], providers[0].returnSimple('relativepath'))
                continue

        
        output = '%s:' % reqn
        for prov in providers:
            if reqf is not None:
                if prov.checkPrco('provides', reqtup):
                    output = output + '||' + prov.__str__()
                else:
                    print '%s does not provide %s %s %s %s %s' % (prov, reqn, reqf, reqe, reqv, reqr)                
            else:
                output = output + '||' + prov.__str__()
                
        print output
print time.time()




From fedora-extras-commits at redhat.com  Sun Oct 15 12:30:47 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:30:47 -0700
Subject: extras-buildsys/utils/pushscript/yum Errors.py, NONE,
	1.1 __init__.py, NONE, 1.1 comps.py, NONE, 1.1 config.py, NONE,
	1.1 constants.py, NONE, 1.1 depsolve.py, NONE, 1.1 failover.py,
	NONE, 1.1 logger.py, NONE, 1.1 mdcache.py, NONE,
	1.1 mdparser.py, NONE, 1.1 misc.py, NONE, 1.1 packages.py,
	NONE, 1.1 parser.py, NONE, 1.1 pgpmsg.py, NONE, 1.1 plugins.py,
	NONE, 1.1 repos.py, NONE, 1.1 sqlitecache.py, NONE,
	1.1 sqlitesack.py, NONE, 1.1 transactioninfo.py, NONE,
	1.1 update_md.py, NONE, 1.1
Message-ID: <200610151230.k9FCUl0D030934@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805/yum

Added Files:
	Errors.py __init__.py comps.py config.py constants.py 
	depsolve.py failover.py logger.py mdcache.py mdparser.py 
	misc.py packages.py parser.py pgpmsg.py plugins.py repos.py 
	sqlitecache.py sqlitesack.py transactioninfo.py update_md.py 
Log Message:
Add the patched yum 2.6.1 here, so we remove the dependency on the
system-installed one.




--- NEW FILE Errors.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University



import exceptions


class YumBaseError(exceptions.Exception):
    def __init__(self, args=None):
        exceptions.Exception.__init__(self)    
        self.args = args

class LockError(YumBaseError):
    def __init__(self, errno, msg):
        YumBaseError.__init__(self)
        self.errno = errno
        self.msg = msg
        
class DepError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class RepoError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class ConfigError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args
    
class MiscError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class GroupsError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class InstallError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class UpdateError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class RemoveError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args


--- NEW FILE __init__.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University


import os
import sys
import os.path
import rpm
import re
import fnmatch
import types
import errno
import time
import sre_constants
import glob


import Errors
import rpmUtils
import rpmUtils.updates
import rpmUtils.arch
import comps
import config
import parser
import repos
import misc
import transactioninfo
from urlgrabber.grabber import URLGrabError
import depsolve
import plugins


from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage
from repomd import mdErrors
from constants import *
from repomd.packageSack import ListPackageSack

__version__ = '2.6.1'

class YumBase(depsolve.Depsolve):
    """This is a primary structure and base class. It houses the objects and
       methods needed to perform most things in yum. It is almost an abstract
       class in that you will need to add your own class above it for most
       real use."""
    
    def __init__(self):
        depsolve.Depsolve.__init__(self)
        self.localdbimported = 0
        self.repos = repos.RepoStorage() # class of repositories
        if (not self.repos.sqlite):
            self.log(1,"Warning, could not load sqlite, falling back to pickle")

        # Start with plugins disabled
        self.disablePlugins()

        self.localPackages = [] # for local package handling 

    def _transactionDataFactory(self):
        """Factory method returning TransactionData object"""
        if self.conf.enable_group_conditionals:
            return transactioninfo.ConditionalTransactionData()
        return transactioninfo.TransactionData()

    def log(self, value, msg):
        """dummy log stub"""
        print msg

    def errorlog(self, value, msg):
        """dummy errorlog stub"""
        print >> sys.stderr, msg

    def filelog(self, value, msg):
        print msg
   
    def doGenericSetup(self, cache=0):
        """do a default setup for all the normal/necessary yum components,
           really just a shorthand for testing"""
        
        self.doConfigSetup()
        self.conf.cache = cache
        self.doTsSetup()
        self.doRpmDBSetup()
        self.doRepoSetup()
        self.doSackSetup()
        
    def doConfigSetup(self, fn='/etc/yum.conf', root='/'):
        """basic stub function for doing configuration setup"""
       
        self.conf = config.readMainConfig(fn, root)
        self.yumvar = self.conf.yumvar
        self.getReposFromConfig()

    def getReposFromConfig(self):
        """read in repositories from config main and .repo files"""

        reposlist = []

        # Check yum.conf for repositories
        for section in self.conf.cfg.sections():
            # All sections except [main] are repositories
            if section == 'main': 
                continue

            try:
                thisrepo = config.readRepoConfig(self.conf.cfg, section, self.conf)
            except (Errors.RepoError, Errors.ConfigError), e:
                self.errorlog(2, e)
            else:
                reposlist.append(thisrepo)

        # Read .repo files from directories specified by the reposdir option
        # (typically /etc/yum.repos.d and /etc/yum/repos.d)
        parser = config.IncludedDirConfigParser(vars=self.yumvar)
        for reposdir in self.conf.reposdir:
            if os.path.exists(self.conf.installroot+'/'+reposdir):
                reposdir = self.conf.installroot + '/' + reposdir

            if os.path.isdir(reposdir):
                #XXX: why can't we just pass the list of files?
                files = ' '.join(glob.glob('%s/*.repo' % reposdir))
                #XXX: error catching here
                parser.read(files)

        # Check sections in the .repo files that were just slurped up
        for section in parser.sections():
            try:
                thisrepo = config.readRepoConfig(parser, section, self.conf)
            except (Errors.RepoError, Errors.ConfigError), e:
                self.errorlog(2, e)
            else:
                reposlist.append(thisrepo)

        # Got our list of repo objects, add them to the repos collection
        for thisrepo in reposlist:
            try:
                self.repos.add(thisrepo)
            except Errors.RepoError, e: 
                self.errorlog(2, e)
                continue

    def disablePlugins(self):
        '''Disable yum plugins
        '''
        self.plugins = plugins.DummyYumPlugins()
    
    def doPluginSetup(self, optparser=None, types=None):
        '''Initialise and enable yum plugins. 

        If plugins are going to be used, this should be called soon after
        doConfigSetup() has been called.

        @param optparser: The OptionParser instance for this run (optional)
        @param types: A sequence specifying the types of plugins to load.
            This should be sequnce containing one or more of the
            yum.plugins.TYPE_...  constants. If None (the default), all plugins
            will be loaded.
        '''
        # Load plugins first as they make affect available config options
        self.plugins = plugins.YumPlugins(self, self.conf.pluginpath,
                optparser, types)

        # Process options registered by plugins
        self.plugins.parseopts(self.conf, self.repos.findRepos('*'))

        # Initialise plugins
        self.plugins.run('init')

    def doTsSetup(self):
        """setup all the transaction set storage items we'll need
           This can't happen in __init__ b/c we don't know our installroot
           yet"""
        
        if hasattr(self, 'read_ts'):
            return
            
        if not self.conf.installroot:
            raise Errors.YumBaseError, 'Setting up TransactionSets before config class is up'
        
        installroot = self.conf.installroot
        self.read_ts = rpmUtils.transaction.initReadOnlyTransaction(root=installroot)
        self.tsInfo = self._transactionDataFactory()
        self.rpmdb = rpmUtils.RpmDBHolder()
        self.initActionTs()
        
    def doRpmDBSetup(self):
        """sets up a holder object for important information from the rpmdb"""
        
        if not self.localdbimported:
            self.log(3, 'Reading Local RPMDB')
            self.rpmdb.addDB(self.read_ts)
            self.localdbimported = 1

    def closeRpmDB(self):
        """closes down the instances of the rpmdb we have wangling around"""
        if hasattr(self, 'rpmdb'):
            del self.rpmdb
            self.localdbimported = 0
        if hasattr(self, 'ts'):
            del self.ts.ts
            del self.ts
        if hasattr(self, 'read_ts'):
            del self.read_ts.ts
            del self.read_ts
        if hasattr(self, 'up'):
            del self.up
        if hasattr(self, 'comps'):
            self.comps.compiled = False
            

    def doRepoSetup(self, thisrepo=None):
        """grabs the repomd.xml for each enabled repository and sets up 
           the basics of the repository"""

        self.plugins.run('prereposetup')
        
        if thisrepo is None:
            repos = self.repos.listEnabled()
        else:
            repos = self.repos.findRepos(thisrepo)

        if len(repos) < 1:
            self.errorlog(0, 'No Repositories Available to Set Up')

        num = 1
        for repo in repos:
            if repo.repoXML is not None and len(repo.urls) > 0:
                num += 1
                continue
            if self.repos.callback:
                self.repos.callback.log(2, '%-68s [%d/%d]' % 
                                        (repo.id, num, len(repos)))
                
            try:
                repo.cache = self.conf.cache
                repo.baseurlSetup()
                repo.dirSetup()
                self.log(3, 'Baseurl(s) for repo: %s' % repo.urls)
            except Errors.RepoError, e:
                self.errorlog(0, '%s' % e)
                raise
                
            try:
                repo.getRepoXML(text=repo)
            except Errors.RepoError, e:
                self.errorlog(0, 'Cannot open/read repomd.xml file for repository: %s' % repo)
                self.errorlog(0, str(e))
                raise
            num += 1
            
            
        if self.repos.callback and len(repos) > 0:
            self.repos.callback.progressbar(num, len(repos), repo.id)
            
        self.plugins.run('postreposetup')

    def doSackSetup(self, archlist=None, thisrepo=None):
        """populates the package sacks for information from our repositories,
           takes optional archlist for archs to include"""
           
        if hasattr(self, 'pkgSack') and thisrepo is None:
            self.log(7, 'skipping reposetup, pkgsack exists')
            return
            
        if thisrepo is None:
            repos = self.repos.listEnabled()
        else:
            repos = self.repos.findRepos(thisrepo)
            
        self.log(3, 'Setting up Package Sacks')
        if not archlist:
            archlist = rpmUtils.arch.getArchList()

        archdict = {}
        for arch in archlist:
            archdict[arch] = 1

        self.repos.pkgSack.compatarchs = archdict
        self.repos.populateSack(which=repos)
        self.pkgSack = self.repos.pkgSack
        self.excludePackages()
        self.pkgSack.excludeArchs(archlist)

        for repo in repos:
            self.excludePackages(repo)
            self.includePackages(repo)
        self.plugins.run('exclude')
        self.pkgSack.buildIndexes()
        
    def doUpdateSetup(self):
        """setups up the update object in the base class and fills out the
           updates, obsoletes and others lists"""
        
        if hasattr(self, 'up'):
            return
            
        self.log(3, 'Building updates object')
        #FIXME - add checks for the other pkglists to see if we should
        # raise an error
        if not hasattr(self, 'pkgSack'):
            self.doRepoSetup()
            self.doSackSetup()
        
        self.up = rpmUtils.updates.Updates(self.rpmdb.getPkgList(),
                                           self.pkgSack.simplePkgList())
        if self.conf.debuglevel >= 6:
            self.up.debug = 1
            
        if self.conf.obsoletes:
            self.up.rawobsoletes = self.pkgSack.returnObsoletes()
            
        self.up.exactarch = self.conf.exactarch
        self.up.exactarchlist = self.conf.exactarchlist
        self.up.doUpdates()

        if self.conf.obsoletes:
            self.up.doObsoletes()

        self.up.condenseUpdates()
        
    
    def doGroupSetup(self):
        """create the groups object that will store the comps metadata
           finds the repos with groups, gets their comps data and merge it
           into the group object"""
        
        self.log(3, 'Getting group metadata')
        reposWithGroups = []
        for repo in self.repos.listGroupsEnabled():
            if repo.groups_added: # already added the groups from this repo
                reposWithGroups.append(repo)
                continue
                
            if repo.repoXML is None:
                raise Errors.RepoError, "Repository '%s' not yet setup" % repo
            try:
                groupremote = repo.repoXML.groupLocation()
            except mdErrors.RepoMDError, e:
                pass
            else:
                reposWithGroups.append(repo)
                
        # now we know which repos actually have groups files.
        overwrite = self.conf.overwrite_groups
        if not hasattr(self, 'comps'):
            self.comps = comps.Comps(overwrite_groups = overwrite)

        for repo in reposWithGroups:
            if repo.groups_added: # already added the groups from this repo
                continue
                
            self.log(4, 'Adding group file from repository: %s' % repo)
            groupfile = repo.getGroups()
            try:
                self.comps.add(groupfile)
            except Errors.GroupsError, e:
                self.errorlog(0, 'Failed to add groups file for repository: %s' % repo)
            else:
                repo.groups_added = True

        if self.comps.compscount == 0:
            raise Errors.GroupsError, 'No Groups Available in any repository'
        
        self.doRpmDBSetup()
        pkglist = self.rpmdb.getPkgList()
        self.comps.compile(pkglist)
        

    def doSackFilelistPopulate(self):
        """convenience function to populate the repos with the filelist metadata
           it also is simply to only emit a log if anything actually gets populated"""
        
        necessary = False
        for repo in self.repos.listEnabled():
            if 'filelists' in self.pkgSack.added[repo.id]:
                continue
            else:
                necessary = True
        
        if necessary:
            msg = 'Importing additional filelist information'
            self.log(2, msg)
            self.repos.populateSack(with='filelists')
           
    def buildTransaction(self):
        """go through the packages in the transaction set, find them in the
           packageSack or rpmdb, and pack up the ts accordingly"""
        self.plugins.run('preresolve')
        (rescode, restring) = self.resolveDeps()
        self.plugins.run('postresolve', rescode=rescode, restring=restring)

        if self.tsInfo.changed:
            (rescode, restring) = self.resolveDeps()
            
        return rescode, restring

    def runTransaction(self, cb):
        """takes an rpm callback object, performs the transaction"""

        self.plugins.run('pretrans')

        errors = self.ts.run(cb.callback, '')
        if errors:
            raise Errors.YumBaseError, errors

        if not self.conf.keepcache:
            self.cleanHeaders()
            self.cleanPackages()

        self.plugins.run('posttrans')
        
    def excludePackages(self, repo=None):
        """removes packages from packageSacks based on global exclude lists,
           command line excludes and per-repository excludes, takes optional 
           repo object to use."""
        
        # if not repo: then assume global excludes, only
        # if repo: then do only that repos' packages and excludes
        
        if not repo: # global only
            excludelist = self.conf.exclude
            repoid = None
        else:
            excludelist = repo.exclude
            repoid = repo.id

        if len(excludelist) == 0:
            return
        
        if not repo:
            self.log(2, 'Excluding Packages in global exclude list')
        else:
            self.log(2, 'Excluding Packages from %s' % repo.name)
            
        exactmatch, matched, unmatched = \
           parsePackages(self.pkgSack.returnPackages(repoid), excludelist, casematch=1)
        
        for po in exactmatch + matched:
            self.log(3, 'Excluding %s' % po)
            self.pkgSack.delPackage(po)
      
        self.log(2, 'Finished')

    def includePackages(self, repo):
        """removes packages from packageSacks based on list of packages, to include.
           takes repoid as a mandatory argument."""
        
        includelist = repo.includepkgs
        
        if len(includelist) == 0:
            return
        
        pkglist = self.pkgSack.returnPackages(repo.id)
        exactmatch, matched, unmatched = \
           parsePackages(pkglist, includelist, casematch=1)
        
        self.log(2, 'Reducing %s to included packages only' % repo.name)
        rmlist = []
        
        for po in pkglist:
            if po in exactmatch + matched:
                self.log(3, 'Keeping included package %s' % po)
                continue
            else:
                rmlist.append(po)
        
        for po in rmlist:
            self.log(3, 'Removing unmatched package %s' % po)
            self.pkgSack.delPackage(po)
            
        self.log(2, 'Finished')
        
    def doLock(self, lockfile):
        """perform the yum locking, raise yum-based exceptions, not OSErrors"""
        
        # if we're not root then we don't lock - just return nicely
        if self.conf.uid != 0:
            return
            
        root = self.conf.installroot
        lockfile = root + '/' + lockfile # lock in the chroot
        lockfile = os.path.normpath(lockfile) # get rid of silly preceding extra /
        
        mypid=str(os.getpid())    
        while not self._lock(lockfile, mypid, 0644):
            fd = open(lockfile, 'r')
            try: oldpid = int(fd.readline())
            except ValueError:
                # bogus data in the pid file. Throw away.
                self._unlock(lockfile)
            else:
                try: os.kill(oldpid, 0)
                except OSError, e:
                    if e[0] == errno.ESRCH:
                        # The pid doesn't exist
                        self._unlock(lockfile)
                    else:
                        # Whoa. What the heck happened?
                        msg = 'Unable to check if PID %s is active' % oldpid
                        raise Errors.LockError(1, msg)
                else:
                    # Another copy seems to be running.
                    msg = 'Existing lock %s: another copy is running. Aborting.' % lockfile
                    raise Errors.LockError(0, msg)
    
    def doUnlock(self, lockfile):
        """do the unlock for yum"""
        
        # if we're not root then we don't lock - just return nicely
        if self.conf.uid != 0:
            return
        
        root = self.conf.installroot
        lockfile = root + '/' + lockfile # lock in the chroot
        
        self._unlock(lockfile)
        
    def _lock(self, filename, contents='', mode=0777):
        lockdir = os.path.dirname(filename)
        try:
            if not os.path.exists(lockdir):
                os.makedirs(lockdir, mode=0755)
            fd = os.open(filename, os.O_EXCL|os.O_CREAT|os.O_WRONLY, mode)    
        except OSError, msg:
            if not msg.errno == errno.EEXIST: raise msg
            return 0
        else:
            os.write(fd, contents)
            os.close(fd)
            return 1
    
    def _unlock(self, filename):
        try:
            os.unlink(filename)
        except OSError, msg:
            pass


    def verifyPkg(self, fo, po, raiseError):
        """verifies the package is what we expect it to be
           raiseError  = defaults to 0 - if 1 then will raise
           a URLGrabError if the file does not check out.
           otherwise it returns false for a failure, true for success"""

        if type(fo) is types.InstanceType:
            fo = fo.filename

        for (csumtype, csum, csumid) in po.checksums:
            if csumid:
                checksum = csum
                checksumType = csumtype
                break
        try:
            self.verifyChecksum(fo, checksumType, checksum)
        except URLGrabError, e:
            if raiseError:
                raise
            else:
                return 0

        ylp = YumLocalPackage(self.read_ts, fo)
        if ylp.pkgtup != po.pkgtup:
            if raiseError:
                raise URLGrabError(-1, 'Package does not match intended download')
            else:
                return 0
        
        return 1
        
        
    def verifyChecksum(self, fo, checksumType, csum):
        """Verify the checksum of the file versus the 
           provided checksum"""

        try:
            filesum = misc.checksum(checksumType, fo)
        except Errors.MiscError, e:
            raise URLGrabError(-3, 'Could not perform checksum')
            
        if filesum != csum:
            raise URLGrabError(-1, 'Package does not match checksum')
        
        return 0
            
           
    def downloadPkgs(self, pkglist, callback=None):
        """download list of package objects handed to you, output based on
           callback, raise yum.Errors.YumBaseError on problems"""

        errors = {}
        self.plugins.run('predownload', pkglist=pkglist)
        repo_cached = False
        remote_pkgs = []
        for po in pkglist:
            if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
                continue
                    
            local = po.localPkg()
            if os.path.exists(local):
                cursize = os.stat(local)[6]
                totsize = int(po.size())
                try:
                    result = self.verifyPkg(local, po, raiseError=1)
                except URLGrabError, e: # fails the check
                    
                    repo = self.repos.getRepo(po.repoid)
                    if repo.cache:
                        repo_cached = True
                        msg = 'package fails checksum but caching is enabled for %s' % repo.id
                        if not errors.has_key(po): errors[po] = []
                        errors[po].append(msg)
                        
                    if cursize >= totsize: # keep it around for regetting
                        os.unlink(local)
                        
                else:
                    if result:
                        continue
                    else:
                        if cursize >= totsize: # keep it around for regetting
                            os.unlink(local)
            remote_pkgs.append(po)
            
            # caching is enabled and the package 
            # just failed to check out there's no 
            # way to save this, report the error and return
            if (self.conf.cache or repo_cached) and errors:
                return errors
                

        i = 0
        for po in remote_pkgs:
            i += 1
            repo = self.repos.getRepo(po.repoid)
            remote = po.returnSimple('relativepath')
            checkfunc = (self.verifyPkg, (po, 1), {})


            # FIXME - add check here to make sure we have the disk space
            # available to download the package. If we don't then politely
            # bail out with an informative message.
            # os.statvfs(repo's local path)[4]*[2] >= po.size
            try:
                text = '(%s/%s): %s' % (i, len(remote_pkgs),
                                        os.path.basename(remote))
                local = po.localPkg()
                mylocal = repo.get(relative=remote,
                                   local=local,
                                   checkfunc=checkfunc,
                                   text=text,
                                   cache=repo.http_caching != 'none',
                                   )
            except Errors.RepoError, e:
                if not errors.has_key(po):
                    errors[po] = []
                errors[po].append(str(e))
            else:
                po.localpath = mylocal
                if errors.has_key(po):
                    del errors[po]

        self.plugins.run('postdownload', pkglist=pkglist, errors=errors)

        return errors

    def verifyHeader(self, fo, po, raiseError):
        """check the header out via it's naevr, internally"""
        if type(fo) is types.InstanceType:
            fo = fo.filename
            
        try:
            hlist = rpm.readHeaderListFromFile(fo)
            hdr = hlist[0]
        except (rpm.error, IndexError):
            if raiseError:
                raise URLGrabError(-1, 'Header is not complete.')
            else:
                return 0
                
        yip = YumInstalledPackage(hdr) # we're using YumInstalledPackage b/c
                                       # it takes headers <shrug>
        if yip.pkgtup != po.pkgtup:
            if raiseError:
                raise URLGrabError(-1, 'Header does not match intended download')
            else:
                return 0
        
        return 1
        
    def downloadHeader(self, po):
        """download a header from a package object.
           output based on callback, raise yum.Errors.YumBaseError on problems"""

        if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
            return
                
        errors = {}
        local =  po.localHdr()
        start = po.returnSimple('hdrstart')
        end = po.returnSimple('hdrend')
        repo = self.repos.getRepo(po.repoid)
        remote = po.returnSimple('relativepath')
        if os.path.exists(local):
            try:
                result = self.verifyHeader(local, po, raiseError=1)
            except URLGrabError, e:
                # might add a check for length of file - if it is < 
                # required doing a reget
                try:
                    os.unlink(local)
                except OSError, e:
                    pass
            else:
                po.hdrpath = local
                return
        else:
            if self.conf.cache:
                raise Errors.RepoError, \
                'Header not in local cache and caching-only mode enabled. Cannot download %s' % remote
        
        if self.dsCallback: self.dsCallback.downloadHeader(po.name)
        
        try:
            checkfunc = (self.verifyHeader, (po, 1), {})
            hdrpath = repo.get(relative=remote, local=local, start=start,
                    reget=None, end=end, checkfunc=checkfunc, copy_local=1,
                    cache=repo.http_caching != 'none',
                    )
        except Errors.RepoError, e:
            saved_repo_error = e
            try:
                os.unlink(local)
            except OSError, e:
                raise Errors.RepoError, saved_repo_error
            else:
                raise
        else:
            po.hdrpath = hdrpath
            return

    def sigCheckPkg(self, po):
        '''Take a package object and attempt to verify GPG signature if required

        Returns (result, error_string) where result is
            0 - GPG signature verifies ok or verification is not required
            1 - GPG verification failed but installation of the right GPG key might help
            2 - Fatal GPG verifcation error, give up
        '''
        if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
            check = self.conf.gpgcheck
            hasgpgkey = 0
        else:
            repo = self.repos.getRepo(po.repoid)
            check = repo.gpgcheck
            hasgpgkey = not not repo.gpgkey 
        
        if check:
            sigresult = rpmUtils.miscutils.checkSig(self.read_ts, po.localPkg())
            localfn = os.path.basename(po.localPkg())
            
            if sigresult == 0:
                result = 0
                msg = ''

            elif sigresult == 1:
                if hasgpgkey:
                    result = 1
                else:
                    result = 2
                msg = 'Public key for %s is not installed' % localfn

            elif sigresult == 2:
                result = 2
                msg = 'Problem opening package %s' % localfn

            elif sigresult == 3:
                if hasgpgkey:
                    result = 1
                else:
                    result = 2
                result = 1
                msg = 'Public key for %s is not trusted' % localfn

            elif sigresult == 4:
                result = 2 
                msg = 'Package %s is not signed' % localfn
            
        else:
            result =0
            msg = ''

        return result, msg
        
    def cleanHeaders(self):
        filelist = []
        ext = 'hdr'
        removed = 0
        for repo in self.repos.listEnabled():
            repo.dirSetup()
            path = repo.hdrdir
            filelist = misc.getFileList(path, ext, filelist)
            
        for hdr in filelist:
            try:
                os.unlink(hdr)
            except OSError, e:
                self.errorlog(0, 'Cannot remove header %s' % hdr)
                continue
            else:
                self.log(7, 'Header %s removed' % hdr)
                removed+=1
        msg = '%d headers removed' % removed
        return 0, [msg]

            
    def cleanPackages(self):
        filelist = []
        ext = 'rpm'
        removed = 0
        for repo in self.repos.listEnabled():
            repo.dirSetup()
            path = repo.pkgdir
            filelist = misc.getFileList(path, ext, filelist)
            
        for pkg in filelist:
            try:
                os.unlink(pkg)
            except OSError, e:
                self.errorlog(0, 'Cannot remove package %s' % pkg)
                continue
            else:
                self.log(7, 'Package %s removed' % pkg)
                removed+=1
        
        msg = '%d packages removed' % removed
        return 0, [msg]

    def cleanPickles(self):
        filelist = []
        ext = 'pickle'
        removed = 0
        for repo in self.repos.listEnabled():
            repo.dirSetup()
            path = repo.cachedir
            filelist = misc.getFileList(path, ext, filelist)
            
        for item in filelist:
            try:
                os.unlink(item)
            except OSError, e:
                self.errorlog(0, 'Cannot remove cache file %s' % item)
                continue
            else:
                self.log(7, 'Cache file %s removed' % item)
                removed+=1
        msg = '%d cache files removed' % removed
        return 0, [msg]
    
    def cleanSqlite(self):
        filelist = []
        ext = 'sqlite'
        removed = 0
        for repo in self.repos.listEnabled():
            repo.dirSetup()
            path = repo.cachedir
            filelist = misc.getFileList(path, ext, filelist)
            
        for item in filelist:
            try:
                os.unlink(item)
            except OSError, e:
                self.errorlog(0, 'Cannot remove sqlite cache file %s' % item)
                continue
            else:
                self.log(7, 'Cache file %s removed' % item)
                removed+=1
        msg = '%d cache files removed' % removed
        return 0, [msg]

    def cleanMetadata(self):
        filelist = []
        exts = ['xml.gz', 'xml', 'cachecookie']
        
        removed = 0
        for ext in exts:
            for repo in self.repos.listEnabled():
                repo.dirSetup()
                path = repo.cachedir
                filelist = misc.getFileList(path, ext, filelist)
            
        for item in filelist:
            try:
                os.unlink(item)
            except OSError, e:
                self.errorlog(0, 'Cannot remove metadata file %s' % item)
                continue
            else:
                self.log(7, 'metadata file %s removed' % item)
                removed+=1
        msg = '%d metadata files removed' % removed
        return 0, [msg]

    def doPackageLists(self, pkgnarrow='all'):
        """generates lists of packages, un-reduced, based on pkgnarrow option"""
        
        ygh = misc.GenericHolder()
        
        installed = []
        available = []
        updates = []
        obsoletes = []
        obsoletesTuples = []
        recent = []
        extras = []

        # list all packages - those installed and available, don't 'think about it'
        if pkgnarrow == 'all': 
            self.doRepoSetup()
            self.doRpmDBSetup()
            inst = self.rpmdb.getPkgList()
            for hdr in self.rpmdb.getHdrList():
                po = YumInstalledPackage(hdr)
                installed.append(po)

            if self.conf.showdupesfromrepos:
                avail = self.pkgSack.returnPackages()
            else:
                avail = self.pkgSack.returnNewestByNameArch()

            for pkg in avail:
                pkgtup = (pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)
                if pkgtup not in inst:
                    available.append(pkg)

        # produce the updates list of tuples
        elif pkgnarrow == 'updates':
            self.doRepoSetup()
            self.doRpmDBSetup()
            self.doUpdateSetup()
            for (n,a,e,v,r) in self.up.getUpdatesList():
                matches = self.pkgSack.searchNevra(name=n, arch=a, epoch=e, 
                                                   ver=v, rel=r)
                if len(matches) > 1:
                    updates.append(matches[0])
                    self.log(4, 'More than one identical match in sack for %s' % matches[0])
                elif len(matches) == 1:
                    updates.append(matches[0])
                else:
                    self.log(4, 'Nothing matches %s.%s %s:%s-%s from update' % (n,a,e,v,r))

        # installed only
        elif pkgnarrow == 'installed':
            self.doRpmDBSetup()
            for hdr in self.rpmdb.getHdrList():
                po = YumInstalledPackage(hdr)
                installed.append(po)
        
        # available in a repository
        elif pkgnarrow == 'available':
            self.doRepoSetup()
            self.doRpmDBSetup()
            inst = self.rpmdb.getPkgList()
            if self.conf.showdupesfromrepos:
                avail = self.pkgSack.returnPackages()
            else:
                avail = self.pkgSack.returnNewestByNameArch()

            for pkg in avail:
                pkgtup = (pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)
                if pkgtup not in inst:
                    available.append(pkg)

        # not in a repo but installed
        elif pkgnarrow == 'extras':
            # we must compare the installed set versus the repo set
            # anything installed but not in a repo is an extra
            self.doRepoSetup()
            self.doRpmDBSetup()
            avail = self.pkgSack.simplePkgList()
            for hdr in self.rpmdb.getHdrList():
                po = YumInstalledPackage(hdr)
                if po.pkgtup not in avail:
                    extras.append(po)

        # obsoleting packages (and what they obsolete)
        elif pkgnarrow == 'obsoletes':
            self.doRepoSetup()
            self.doRpmDBSetup()
            self.conf.obsoletes = 1
            self.doUpdateSetup()

            for (pkgtup, instTup) in self.up.getObsoletesTuples():
                (n,a,e,v,r) = pkgtup
                pkgs = self.pkgSack.searchNevra(name=n, arch=a, ver=v, rel=r, epoch=e)
                hdr = self.rpmdb.returnHeaderByTuple(instTup)[0] # the first one
                instpo = YumInstalledPackage(hdr)
                for po in pkgs:
                    obsoletes.append(po)
                    obsoletesTuples.append((po, instpo))
        
        # packages recently added to the repositories
        elif pkgnarrow == 'recent':
            now = time.time()
            recentlimit = now-(self.conf.recent*86400)
            ftimehash = {}
            self.doRepoSetup()
            if self.conf.showdupesfromrepos:
                avail = self.pkgSack.returnPackages()
            else:
                avail = self.pkgSack.returnNewestByNameArch()
            
            for po in avail:
                ftime = int(po.returnSimple('filetime'))
                if ftime > recentlimit:
                    if not ftimehash.has_key(ftime):
                        ftimehash[ftime] = [po]
                    else:
                        ftimehash[ftime].append(po)

            for sometime in ftimehash.keys():
                for po in ftimehash[sometime]:
                    recent.append(po)
        
        
        ygh.installed = installed
        ygh.available = available
        ygh.updates = updates
        ygh.obsoletes = obsoletes
        ygh.obsoletesTuples = obsoletesTuples
        ygh.recent = recent
        ygh.extras = extras

        
        return ygh

    def _refineSearchPattern(self, arg):
        """Takes a search string from the cli for Search or Provides
           and cleans it up so it doesn't make us vomit"""
        
        if re.match('.*[\*,\[,\],\{,\},\?,\+].*', arg):
            restring = fnmatch.translate(arg)
        else:
            restring = re.escape(arg)
            
        return restring
        
    def findDeps(self, pkgs):
        """Return the dependencies for a given package, as well
           possible solutions for those dependencies.
           
           Returns the deps as a dict  of:
             packageobject = [reqs] = [list of satisfying pkgs]"""
        
        results = {}
        self.doRepoSetup()
        self.doRpmDBSetup()

        avail = self.pkgSack.returnPackages()
        exactmatch, matched, unmatched = parsePackages(avail, pkgs)

        if len(unmatched) > 0:
            self.errorlog(0, 'No Match for arguments: %s' % unmatched)

        pkgs = misc.unique(exactmatch + matched)
        
        for pkg in pkgs:
            results[pkg] = {} 
            reqs = pkg.returnPrco('requires');
            reqs.sort()
            pkgresults = results[pkg] # shorthand so we don't have to do the
                                      # double bracket thing
            
            for req in reqs:
                (r,f,v) = req
                if r.startswith('rpmlib('):
                    continue
                
                satisfiers = []

                for po in self.whatProvides(r, f, v):
                    satisfiers.append(po)

                pkgresults[req] = satisfiers
        
        return results
    
    def searchGenerator(self, fields, criteria):
        """Generator method to lighten memory load for some searches.
           This is the preferred search function to use."""
        self.doRepoSetup()


        for string in criteria:
            restring = self._refineSearchPattern(string)
            try: crit_re = re.compile(restring, flags=re.I)
            except sre_constants.error, e:
                raise Errors.MiscError, \
                 'Search Expression: %s is an invalid Regular Expression.\n' % string
                  
            for po in self.pkgSack:
                tmpvalues = []
                for field in fields:
                    value = po.returnSimple(field)
                    if value and crit_re.search(value):
                        tmpvalues.append(value)
                
                if len(tmpvalues) > 0:
                    yield (po, tmpvalues)
        
        # do the same for installed pkgs
        
        self.doRpmDBSetup()        
        for hdr in self.rpmdb.getHdrList(): # this is more expensive so this is the  top op
            po = YumInstalledPackage(hdr)
            tmpvalues = []
            for string in criteria:
                restring = self._refineSearchPattern(string)
                
                try: crit_re = re.compile(restring, flags=re.I)
                except sre_constants.error, e:
                    raise Errors.MiscError, \
                     'Search Expression: %s is an invalid Regular Expression.\n' % string

                for field in fields:
                    value = po.returnSimple(field)
                    if type(value) is types.ListType: # this is annoying
                        value = str(value)
                    if value and crit_re.search(value):
                        tmpvalues.append(value)
                        
            if len(tmpvalues) > 0:
                yield (po, tmpvalues)        
        
    def searchPackages(self, fields, criteria, callback=None):
        """Search specified fields for matches to criteria
           optional callback specified to print out results
           as you go. Callback is a simple function of:
           callback(po, matched values list). It will 
           just return a dict of dict[po]=matched values list"""
        
        matches = {}
        match_gen = self.searchGenerator(fields, criteria)
        
        for (po, matched_strings) in match_gen:
            if callback:
                callback(po, matched_strings)
            if not matches.has_key(po):
                matches[po] = []
            
            matches[po].extend(matched_strings)
        
        return matches
    
    def searchPackageProvides(self, args, callback=None):
        
        self.doRepoSetup()
        matches = {}
        
        # search deps the simple way first
        for arg in args:
            self.log(4, 'searching the simple way')
            pkgs = self.returnPackagesByDep(arg)
            for po in pkgs:
                # if the match is already in the list, just skip it
                if matches.has_key(po):
                    continue
                
                matches[po] = [arg]
                if callback:
                    callback(po, [arg])
                

        # search pkgSack - fully populate the worthwhile metadata to search
        # if it even vaguely matches
        self.log(4, 'fully populating the necessary data')
        for arg in args:
            matched = 0
            globs = ['.*bin\/.*', '.*\/etc\/.*', '^\/usr\/lib\/sendmail$']
            for glob in globs:
                globc = re.compile(glob)
                if globc.match(arg):
                    matched = 1
            if not matched:
                self.doSackFilelistPopulate()

        for arg in args:
            # assume we have to search every package, unless we can refine the search set
            where = self.pkgSack
            
            # this is annoying. If the user doesn't use any glob or regex-like
            # or regexes then we can use the where 'like' search in sqlite
            # if they do use globs or regexes then we can't b/c the string
            # will no longer have much meaning to use it for matches
            
            if hasattr(self.pkgSack, 'searchAll'):
                if not re.match('.*[\*,\[,\],\{,\},\?,\+,\%].*', arg):
                    self.log(4, 'Using the like search on %s' % arg)
                    where = self.pkgSack.searchAll(arg, query_type='like')
            
            self.log(4, 'Searching %d packages' % len(where))
            self.log(4, 'refining the search expression of %s' % arg) 
            restring = self._refineSearchPattern(arg)
            self.log(4, 'refined search: %s' % restring)
            try: 
                arg_re = re.compile(restring, flags=re.I)
            except sre_constants.error, e:
                raise Errors.MiscError, \
                  'Search Expression: %s is an invalid Regular Expression.\n' % arg

            for po in where:
                self.log(5, 'searching package %s' % po)
                tmpvalues = []
                
                self.log(5, 'searching in file entries')
                for filetype in po.returnFileTypes():
                    for fn in po.returnFileEntries(ftype=filetype):
                        if arg_re.search(fn):
                            tmpvalues.append(fn)
                
                self.log(5, 'searching in provides entries')
                for (p_name, p_flag, (p_e, p_v, p_r)) in po.returnPrco('provides'):
                    if arg_re.search(p_name):
                        prov = po.prcoPrintable((p_name, p_flag, (p_e, p_v, p_r)))
                        tmpvalues.append(prov)

                if len(tmpvalues) > 0:
                    if not matches.has_key(po):
                        matches[po] = tmpvalues
                        if callback:
                            callback(po, tmpvalues)
                
        
        self.doRpmDBSetup()
        # installed rpms, too
        taglist = ['filenames', 'dirnames', 'provides']
        arg_re = []
        for arg in args:
            restring = self._refineSearchPattern(arg)

            try: reg = re.compile(restring, flags=re.I)
            except sre_constants.error, e:
                raise Errors.MiscError, \
                 'Search Expression: %s is an invalid Regular Expression.\n' % arg
            
            arg_re.append(reg)

        for hdr in self.rpmdb.getHdrList():
            po = YumInstalledPackage(hdr)
            tmpvalues = []
            searchlist = []
            for tag in taglist:
                tagdata = po.returnSimple(tag)
                if tagdata is None:
                    continue
                if type(tagdata) is types.ListType:
                    searchlist.extend(tagdata)
                else:
                    searchlist.append(tagdata)
            
            for reg in arg_re:
                for item in searchlist:
                    if reg.search(item):
                        tmpvalues.append(item)

            del searchlist

            if len(tmpvalues) > 0:
                if callback:
                    callback(po, tmpvalues)
                matches[po] = tmpvalues
            
            
        return matches

    def doGroupLists(self, uservisible=0):
        """returns two lists of groups, installed groups and available groups
           optional 'uservisible' bool to tell it whether or not to return
           only groups marked as uservisible"""
        
        
        installed = []
        available = []
        
        for grp in self.comps.groups:
            if grp.installed:
                if uservisible:
                    if grp.user_visible:
                        installed.append(grp)
                else:
                    installed.append(grp)
            else:
                if uservisible:
                    if grp.user_visible:
                        available.append(grp)
                else:
                    available.append(grp)
            
        return installed, available
    
    
    def groupRemove(self, grpid):
        """mark all the packages in this group to be removed"""
        
        txmbrs_used = []
        self.doGroupSetup()
        
        thisgroup = self.comps.return_group(grpid)
        if not thisgroup:
            raise Errors.GroupsError, "No Group named %s exists" % grpid

        thisgroup.toremove = True
        pkgs = thisgroup.packages
        for pkg in thisgroup.packages:
            txmbrs = self.remove(name=pkg)
            txmbrs_used.extend(txmbrs)
            for txmbr in txmbrs:
                txmbr.groups.append(thisgroup.groupid)
        
        return txmbrs_used

    def groupUnremove(self, grpid):
        """unmark any packages in the group from being removed"""
        
        self.doGroupSetup()

        thisgroup = self.comps.return_group(grpid)
        if not thisgroup:
            raise Errors.GroupsError, "No Group named %s exists" % grpid

        thisgroup.toremove = False
        pkgs = thisgroup.packages
        for pkg in thisgroup.packages:
            for txmbr in self.tsInfo:
                if txmbr.po.name == pkg and txmbr.po.state in TS_INSTALL_STATES:
                    try:
                        txmbr.groups.remove(grpid)
                    except ValueError:
                        self.log(4, "package %s was not marked in group %s" % (txmbr.po, grpid))
                        continue
                    
                    # if there aren't any other groups mentioned then remove the pkg
                    if len(txmbr.groups) == 0:
                        self.tsInfo.remove(txmbr.po.pkgtup)
        
        
    def selectGroup(self, grpid):
        """mark all the packages in the group to be installed
           returns a list of transaction members it added to the transaction 
           set"""
        
        txmbrs_used = []
        if not self.comps:
            self.doGroupSetup()
        
        if not self.comps.has_group(grpid):
            raise Errors.GroupsError, "No Group named %s exists" % grpid
            
        thisgroup = self.comps.return_group(grpid)
        
        if not thisgroup:
            raise Errors.GroupsError, "No Group named %s exists" % grpid
        
        if thisgroup.selected:
            return txmbrs_used
        
        thisgroup.selected = True
        
        pkgs = thisgroup.mandatory_packages.keys() + thisgroup.default_packages.keys()
        for pkg in pkgs:
            self.log(5, 'Adding package %s from group %s' % (pkg, thisgroup.groupid))
            try:
                txmbrs = self.install(name = pkg)
            except Errors.InstallError, e:
                self.log(3, 'No package named %s available to be installed' % pkg)
            else:
                txmbrs_used.extend(txmbrs)
                for txmbr in txmbrs:
                    txmbr.groups.append(thisgroup.groupid)
        
        if self.conf.enable_group_conditionals:
            for condreq, cond in thisgroup.conditional_packages.iteritems():
                if self._isPackageInstalled(cond):
                    try:
                        txmbrs = self.install(name = condreq)
                    except Errors.InstallError:
                        # we don't care if the package doesn't exist
                        continue
                    txmbrs_used.extend(txmbrs)
                    for txmbr in txmbrs:
                        txmbr.groups.append(thisgroup.groupid)
                    continue
                # Otherwise we hook into tsInfo.add
                pkgs = self.pkgSack.searchNevra(name=condreq)
                if pkgs:
                    pkgs = self.bestPackagesFromList(pkgs)
                if self.tsInfo.conditionals.has_key(cond):
                    self.tsInfo.conditionals[cond].extend(pkgs)
                else:
                    self.tsInfo.conditionals[cond] = pkgs

        return txmbrs_used

    def deselectGroup(self, grpid):
        """de-mark all the packages in the group for install"""
        if not self.comps:
            self.doGroupSetup()
        
        if not self.comps.has_group(grpid):
            raise Errors.GroupsError, "No Group named %s exists" % grpid
            
        thisgroup = self.comps.return_group(grpid)
        if not thisgroup:
            raise Errors.GroupsError, "No Group named %s exists" % grpid
        
        thisgroup.selected = False
        
        for pkgname in thisgroup.packages:
        
            for txmbr in self.tsInfo:
                if txmbr.po.name == pkgname and txmbr.po.state in TS_INSTALL_STATES:
                    try: 
                        txmbr.groups.remove(grpid)
                    except ValueError:
                        self.log(4, "package %s was not marked in group %s" % (txmbr.po, grpid))
                        continue
                    
                    # if there aren't any other groups mentioned then remove the pkg
                    if len(txmbr.groups) == 0:
                        self.tsInfo.remove(txmbr.po.pkgtup)

                    
        
    def getPackageObject(self, pkgtup):
        """retrieves a packageObject from a pkgtuple - if we need
           to pick and choose which one is best we better call out
           to some method from here to pick the best pkgobj if there are
           more than one response - right now it's more rudimentary."""
           
        
        (n,a,e,v,r) = pkgtup
        
        # look it up in the self.localPackages first:
        for po in self.localPackages:
            if po.pkgtup == pkgtup:
                return po
                
        pkgs = self.pkgSack.packagesByTuple(pkgtup)

        if len(pkgs) == 0:
            raise Errors.DepError, 'Package tuple %s could not be found in packagesack' % str(pkgtup)
            return None
            
        if len(pkgs) > 1: # boy it'd be nice to do something smarter here FIXME
            result = pkgs[0]
        else:
            result = pkgs[0] # which should be the only
        
            # this is where we could do something to figure out which repository
            # is the best one to pull from
        
        return result

    def getInstalledPackageObject(self, pkgtup):
        """returns a YumInstallPackage object for the pkgtup specified"""
        
        hdrs = self.rpmdb.returnHeaderByTuple(pkgtup)
        hdr = hdrs[0]
        po = YumInstalledPackage(hdr)
        return po
        
    def gpgKeyCheck(self):
        """checks for the presence of gpg keys in the rpmdb
           returns 0 if no keys returns 1 if keys"""

        gpgkeyschecked = self.conf.cachedir + '/.gpgkeyschecked.yum'
        if os.path.exists(gpgkeyschecked):
            return 1
            
        myts = rpmUtils.transaction.initReadOnlyTransaction(root=self.conf.installroot)
        myts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
        idx = myts.dbMatch('name', 'gpg-pubkey')
        keys = idx.count()
        del idx
        del myts
        
        if keys == 0:
            return 0
        else:
            mydir = os.path.dirname(gpgkeyschecked)
            if not os.path.exists(mydir):
                os.makedirs(mydir)
                
            fo = open(gpgkeyschecked, 'w')
            fo.close()
            del fo
            return 1

    def returnPackagesByDep(self, depstring):
        """Pass in a generic [build]require string and this function will 
           pass back the packages it finds providing that dep."""
        
        results = []
        self.doRepoSetup()
        # parse the string out
        #  either it is 'dep (some operator) e:v-r'
        #  or /file/dep
        #  or packagename
        depname = depstring
        depflags = None
        depver = None
        
        if depstring[0] != '/':
            # not a file dep - look at it for being versioned
            if re.search('[>=<]', depstring):  # versioned
                try:
                    depname, flagsymbol, depver = depstring.split()
                except ValueError, e:
                    raise Errors.YumBaseError, 'Invalid versioned dependency string, try quoting it.'
                if not SYMBOLFLAGS.has_key(flagsymbol):
                    raise Errors.YumBaseError, 'Invalid version flag'
                depflags = SYMBOLFLAGS[flagsymbol]
                
        sack = self.whatProvides(depname, depflags, depver)
        results = sack.returnPackages()
        return results
        

    def returnPackageByDep(self, depstring):
        """Pass in a generic [build]require string and this function will 
           pass back the best(or first) package it finds providing that dep."""
        
        try:
            pkglist = self.returnPackagesByDep(depstring)
        except Errors.YumBaseError, e:
            raise Errors.YumBaseError, 'No Package found for %s' % depstring
        
        result = self._bestPackageFromList(pkglist)
        if result is None:
            raise Errors.YumBaseError, 'No Package found for %s' % depstring
        
        return result

    def returnInstalledPackagesByDep(self, depstring):
        """Pass in a generic [build]require string and this function will 
           pass back the installed packages it finds providing that dep."""
        
        results = []
        self.doRpmDBSetup()
        # parse the string out
        #  either it is 'dep (some operator) e:v-r'
        #  or /file/dep
        #  or packagename
        depname = depstring
        depflags = None
        depver = None
        
        if depstring[0] != '/':
            # not a file dep - look at it for being versioned
            if re.search('[>=<]', depstring):  # versioned
                try:
                    depname, flagsymbol, depver = depstring.split()
                except ValueError, e:
                    raise Errors.YumBaseError, 'Invalid versioned dependency string, try quoting it.'
                if not SYMBOLFLAGS.has_key(flagsymbol):
                    raise Errors.YumBaseError, 'Invalid version flag'
                depflags = SYMBOLFLAGS[flagsymbol]
                
        pkglist = self.rpmdb.whatProvides(depname, depflags, depver)
        
        for pkgtup in pkglist:
            results.append(self.getInstalledPackageObject(pkgtup))
        
        return results


    def _bestPackageFromList(self, pkglist):
        """take list of package objects and return the best package object.
           If the list is empty, return None. 
           
           Note: this is not aware of multilib so make sure you're only
           passing it packages of a single arch group."""
        
        
        if len(pkglist) == 0:
            return None
            
        if len(pkglist) == 1:
            return pkglist[0]
        
        mysack = ListPackageSack()
        mysack.addList(pkglist)
        bestlist = mysack.returnNewestByNameArch() # get rid of all lesser vers
        
        best = bestlist[0]
        for pkg in bestlist[1:]:
            if len(pkg.name) < len(best.name): # shortest name silliness
                best = pkg
                continue
            elif len(pkg.name) > len(best.name):
                continue

            # compare arch
            arch = rpmUtils.arch.getBestArchFromList([pkg.arch, best.arch])
            if arch == pkg.arch:
                best = pkg
                continue

        return best

    def bestPackagesFromList(self, pkglist, arch=None):
        """Takes a list of packages, returns the best packages.
           This function is multilib aware so that it will not compare
           multilib to singlelib packages""" 
    
        returnlist = []
        compatArchList = rpmUtils.arch.getArchList(arch)
        multiLib = []
        singleLib = []
        for po in pkglist:
            if po.arch not in compatArchList:
                continue
            elif rpmUtils.arch.isMultiLibArch(arch=po.arch):
                multiLib.append(po)
            else:
                singleLib.append(po)
                
        # we should have two lists now - one of singleLib packages
        # one of multilib packages
        # go through each one and find the best package(s)
        for pkglist in [multiLib, singleLib]:
            best = self._bestPackageFromList(pkglist)
            if best is not None:
                returnlist.append(best)
        
        return returnlist


    def install(self, po=None, **kwargs):
        """try to mark for install the item specified. Uses provided package 
           object, if available. If not it uses the kwargs and gets the best
           packages from the keyword options provided 
           returns the list of txmbr of the items it installs
           
           """
        
        self.doRepoSetup()
        self.doSackSetup()
        self.doRpmDBSetup()
        self.doUpdateSetup()
        
        pkgs = []
        if po:
            if isinstance(po, YumAvailablePackage) or isinstance(po, YumLocalPackage):
                pkgs.append(po)
            else:
                raise Errors.InstallError, 'Package Object was not a package object instance'
            
        else:
            if not kwargs.keys():
                raise Errors.InstallError, 'Nothing specified to install'

            if kwargs.has_key('pattern'):
                exactmatch, matched, unmatched = \
                    parsePackages(self.pkgSack.returnPackages(),[kwargs['pattern']] , casematch=1)
                pkgs.extend(exactmatch)
                pkgs.extend(matched)

            else:
                nevra_dict = self._nevra_kwarg_parse(kwargs)

                pkgs = self.pkgSack.searchNevra(name=nevra_dict['name'],
                     epoch=nevra_dict['epoch'], arch=nevra_dict['arch'],
                     ver=nevra_dict['version'], rel=nevra_dict['release'])
                
                if pkgs:
                    pkgs = self.bestPackagesFromList(pkgs)

        if len(pkgs) == 0:
            #FIXME - this is where we could check to see if it already installed
            # for returning better errors
            raise Errors.InstallError, 'No package(s) available to install'
        
        # FIXME - lots more checking here
        #  - install instead of erase
        #  - better error handling/reporting
        
        tx_return = []
        for po in pkgs:
            if self.tsInfo.exists(pkgtup=po.pkgtup):
                self.log(4, 'Package: %s  - already in transaction set' % po)
                tx_return.extend(self.tsInfo.getMembers(pkgtup=po.pkgtup))
                continue
            
            # make sure this shouldn't be passed to update:
            if self.up.updating_dict.has_key(po.pkgtup):
                txmbrs = self.update(po=po)
                tx_return.extend(txmbrs)
                continue
            
            # make sure it's not already installed
            if self.rpmdb.installed(name=po.name, arch=po.arch, epoch=po.epoch,
                    rel=po.rel, ver=po.ver):
                self.errorlog(2, 'Package %s already installed and latest version' % po)
                continue
            
            # make sure we're not installing a package which is obsoleted by something
            # else in the repo
            thispkgobsdict = self.up.checkForObsolete([po.pkgtup])
            if thispkgobsdict.has_key(po.pkgtup):
                obsoleting = thispkgobsdict[po.pkgtup][0]
                obsoleting_pkg = self.getPackageObject(obsoleting)
                self.install(po=obsoleting_pkg)
                continue
                
            txmbr = self.tsInfo.addInstall(po)
            tx_return.append(txmbr)
        
        return tx_return

    
    def update(self, po=None, **kwargs):
        """try to mark for update the item(s) specified. 
            po is a package object - if that is there, mark it for update,
            if possible
            else use **kwargs to match the package needing update
            if nothing is specified at all then attempt to update everything
            
            returns the list of txmbr of the items it marked for update"""
        
        # do updates list
        # do obsoletes list
        
        # check for args - if no po nor kwargs, do them all
        # if po, do it, ignore all else
        # if no po do kwargs
        # uninstalled pkgs called for update get returned with errors in a list, maybe?

        self.doRepoSetup()
        self.doSackSetup()
        self.doRpmDBSetup()
        self.doUpdateSetup()
        updates = self.up.getUpdatesTuples()
        if self.conf.obsoletes:
            obsoletes = self.up.getObsoletesTuples(newest=1)
        else:
            obsoletes = []


        tx_return = []
        if not po and not kwargs.keys(): # update everything (the easy case)
            self.log(5, 'Updating Everything')
            for (obsoleting, installed) in obsoletes:
                obsoleting_pkg = self.getPackageObject(obsoleting)
                hdr = self.rpmdb.returnHeaderByTuple(installed)[0]
                installed_pkg =  YumInstalledPackage(hdr)
                txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
                self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
                tx_return.append(txmbr)
                
            for (new, old) in updates:
                if self.tsInfo.isObsoleted(pkgtup=old):
                    self.log(5, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s' % old)
                else:
                    updating_pkg = self.getPackageObject(new)
                    hdr = self.rpmdb.returnHeaderByTuple(old)[0]
                    updated_pkg = YumInstalledPackage(hdr)
                    txmbr = self.tsInfo.addUpdate(updating_pkg, updated_pkg)
                    tx_return.append(txmbr)
            
            return tx_return

        else:
            instpkgs = []
            availpkgs = []
            if po: # just a po
                if po.repoid == 'installed':
                    instpkgs.append(po)
                else:
                    availpkgs.append(po)
                
            else: # we have kwargs, sort them out.
                nevra_dict = self._nevra_kwarg_parse(kwargs)

                availpkgs = self.pkgSack.searchNevra(name=nevra_dict['name'],
                          epoch=nevra_dict['epoch'], arch=nevra_dict['arch'],
                        ver=nevra_dict['version'], rel=nevra_dict['release'])
                
                installed_tuples = self.rpmdb.returnTupleByKeyword(
                                name=nevra_dict['name'], epoch=nevra_dict['epoch'],
                                arch=nevra_dict['arch'], ver=nevra_dict['version'],
                                rel=nevra_dict['release'])
            
                for tup in installed_tuples:
                    hdr = self.rpmdb.returnHeaderByTuple(tup)[0]
                    installed_pkg =  YumInstalledPackage(hdr)
                    instpkgs.append(installed_pkg)
            
            # for any thing specified
            # get the list of available pkgs matching it (or take the po)
            # get the list of installed pkgs matching it (or take the po)
            # go through each list and look for:
               # things obsoleting it if it is an installed pkg
               # things it updates if it is an available pkg
               # things updating it if it is an installed pkg
               # in that order
               # all along checking to make sure we:
                # don't update something that's already been obsoleted
            
            # TODO: we should search the updates and obsoletes list and
            # mark the package being updated or obsoleted away appropriately
            # and the package relationship in the tsInfo
            
            for installed_pkg in instpkgs:
                if self.up.obsoleted_dict.has_key(installed_pkg.pkgtup) and self.conf.obsoletes:
                    obsoleting = self.up.obsoleted_dict[installed_pkg.pkgtup][0]
                    obsoleting_pkg = self.getPackageObject(obsoleting)
                    # FIXME check for what might be in there here
                    txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
                    self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
                    tx_return.append(txmbr)
            
            for available_pkg in availpkgs:
                if self.up.updating_dict.has_key(available_pkg.pkgtup):
                    updated = self.up.updating_dict[available_pkg.pkgtup][0]
                    if self.tsInfo.isObsoleted(updated):
                        self.log(5, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s' % updated)
                    else:
                        hdr = self.rpmdb.returnHeaderByTuple(updated)[0]
                        updated_pkg =  YumInstalledPackage(hdr)
                        txmbr = self.tsInfo.addUpdate(available_pkg, updated_pkg)
                        tx_return.append(txmbr)
                    
            for installed_pkg in instpkgs:
                if self.up.updatesdict.has_key(installed_pkg.pkgtup):
                    updating = self.up.updatesdict[installed_pkg.pkgtup][0]
                    updating_pkg = self.getPackageObject(updating)
                    if self.tsInfo.isObsoleted(installed_pkg.pkgtup):
                        self.log(5, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s' % installed_pkg.pkgtup)
                    else:
                        txmbr = self.tsInfo.addUpdate(updating_pkg, installed_pkg)
                        tx_return.append(txmbr)

        return tx_return
        
        
    def remove(self, po=None, **kwargs):
        """try to find and mark for remove the specified package(s) -
            if po is specified then that package object (if it is installed) 
            will be marked for removal.
            if no po then look at kwargs, if neither then raise an exception"""

        if not po and not kwargs.keys():
            raise Errors.RemoveError, 'Nothing specified to remove'
        
        self.doRpmDBSetup()
        tx_return = []
        pkgs = []
        
        if po:
            pkgs = [po]
        else:
            nevra_dict = self._nevra_kwarg_parse(kwargs)

            installed_tuples = self.rpmdb.returnTupleByKeyword(
                            name=nevra_dict['name'], epoch=nevra_dict['epoch'],
                            arch=nevra_dict['arch'], ver=nevra_dict['version'],
                            rel=nevra_dict['release'])

            for tup in installed_tuples:
                hdr = self.rpmdb.returnHeaderByTuple(tup)[0]
                installed_pkg =  YumInstalledPackage(hdr)
                pkgs.append(installed_pkg)

        
        if len(pkgs) == 0: # should this even be happening?
            self.errorlog(3, "No package matched to remove")

        for po in pkgs:
            txmbr = self.tsInfo.addErase(po)
            tx_return.append(txmbr)
        
        return tx_return

    def _nevra_kwarg_parse(self, kwargs):
            
        returndict = {}
        
        try: returndict['name'] = kwargs['name']
        except KeyError:  returndict['name'] = None

        try: returndict['epoch'] = kwargs['epoch']
        except KeyError: returndict['epoch'] = None

        try: returndict['arch'] = kwargs['arch']
        except KeyError: returndict['arch'] = None
        
        # get them as ver, version and rel, release - if someone
        # specifies one of each then that's kinda silly.
        try: returndict['version'] = kwargs['version']
        except KeyError: returndict['version'] = None
        if returndict['version'] is None:
            try: returndict['version'] = kwargs['ver']
            except KeyError: returndict['version'] = None

        try: returndict['release'] = kwargs['release']
        except KeyError: returndict['release'] = None
        if returndict['release'] is None:
            try: release = kwargs['rel']
            except KeyError: returndict['release'] = None
        
        return returndict

    def _isPackageInstalled(self, pkgname):
        # FIXME: Taken from anaconda/pirut 
        # clean up and make public
        installed = False
        if self.rpmdb.installed(name = pkgname):
            installed = True

        lst = self.tsInfo.matchNaevr(name = pkgname)
        for txmbr in lst:
            if txmbr.output_state in TS_INSTALL_STATES:
                return True
        if installed and len(lst) > 0:
            # if we get here, then it was installed, but it's in the tsInfo
            # for an erase or obsoleted --> not going to be installed at end
            return False
        return installed


--- NEW FILE comps.py ---
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University

import sys
from constants import *
from cElementTree import iterparse
import exceptions


lang_attr = '{http://www.w3.org/XML/1998/namespace}lang'

def parse_boolean(strng):
    if BOOLEAN_STATES.has_key(strng.lower()):
        return BOOLEAN_STATES[strng.lower()]
    else:
        return False

def parse_number(strng):
    return int(strng)

class CompsException(exceptions.Exception):
    pass
        
class Group(object):
    def __init__(self, elem=None):
        self.user_visible = True
        self.default = False
        self.selected = False
        self.name = ""
        self.description = ""
        self.translated_name = {}
        self.translated_description = {}
        self.mandatory_packages = {}
        self.optional_packages = {}
        self.default_packages = {}
        self.conditional_packages = {}
        self.langonly = None ## what the hell is this?
        self.groupid = None
        self.display_order = 1024
        self.installed = False
        self.toremove = False
        

        if elem:
            self.parse(elem)
        
    def __str__(self):
        return self.name
    
    def _packageiter(self):
        lst = self.mandatory_packages.keys() + \
              self.optional_packages.keys() + \
              self.default_packages.keys() + \
              self.conditional_packages.keys() 
        
        return lst
    
    packages = property(_packageiter)
    
    def nameByLang(self, lang):
        if self.translated_name.has_key[lang]:
            return self.translated_name[lang]
        else:
            return self.name


    def descriptionByLang(self, lang):
        if self.translated_description.has_key[lang]:
            return self.translated_description[lang]
        else:
            return self.description

    def parse(self, elem):
        for child in elem:

            if child.tag == 'id':
                id = child.text
                if self.groupid is not None:
                    raise CompsException
                self.groupid = id
            
            elif child.tag == 'name':
                text = child.text
                if text:
                    text = text.encode('utf8')
                
                lang = child.attrib.get(lang_attr)
                if lang:
                    self.translated_name[lang] = text
                else:
                    self.name = text
    
    
            elif child.tag == 'description':
                text = child.text
                if text:
                    text = text.encode('utf8')
                    
                lang = child.attrib.get(lang_attr)
                if lang:
                    self.translated_description[lang] = text
                else:
                    self.description = text
    
            elif child.tag == 'uservisible':
                self.user_visible = parse_boolean(child.text)
    
            elif child.tag == 'display_order':
                self.display_order = parse_number(child.text)

            elif child.tag == 'default':
                self.default = parse_boolean(child.text)
    
            elif child.tag == 'langonly': ## FIXME - what the hell is langonly?
                text = child.text
                if self.langonly is not None:
                    raise CompsException
                self.langonly = text
    
            elif child.tag == 'packagelist':
                self.parse_package_list(child)
    
    def parse_package_list(self, packagelist_elem):
        for child in packagelist_elem:
            if child.tag == 'packagereq':
                type = child.attrib.get('type')
                if not type:
                    type = u'mandatory'

                if type not in ('mandatory', 'default', 'optional', 'conditional'):
                    raise CompsException

                package = child.text
                if type == 'mandatory':
                    self.mandatory_packages[package] = 1
                elif type == 'default':
                    self.default_packages[package] = 1
                elif type == 'optional':
                    self.optional_packages[package] = 1
                elif type == 'conditional':
                    self.conditional_packages[package] = child.attrib.get('requires')



    def add(self, obj):
        """Add another group object to this object"""
    
        # we only need package lists and any translation that we don't already
        # have
        
        for pkg in obj.mandatory_packages.keys():
            self.mandatory_packages[pkg] = 1
        for pkg in obj.default_packages.keys():
            self.default_packages[pkg] = 1
        for pkg in obj.optional_packages.keys():
            self.optional_packages[pkg] = 1
        for pkg in obj.conditional_packages.keys():
            self.conditional_packages[pkg] = obj.conditional_packages[pkg]
        
        # name and description translations
        for lang in obj.translated_name.keys():
            if not self.translated_name.has_key(lang):
                self.translated_name[lang] = obj.translated_name[lang]
        
        for lang in obj.translated_description.keys():
            if not self.translated_description.has_key(lang):
                self.translated_description[lang] = obj.translated_description[lang]
        
        
        


class Category(object):
    def __init__(self, elem=None):
        self.name = ""
        self.categoryid = None
        self.description = ""
        self.translated_name = {}
        self.translated_description = {}
        self.display_order = 1024
        self._groups = {}        

        if elem:
            self.parse(elem)
            
    def __str__(self):
        return self.name
    
    def _groupiter(self):
        return self._groups.keys()
    
    groups = property(_groupiter)
    
    def parse(self, elem):
        for child in elem:
            if child.tag == 'id':
                id = child.text
                if self.categoryid is not None:
                    raise CompsException
                self.categoryid = id

            elif child.tag == 'name':
                text = child.text
                if text:
                    text = text.encode('utf8')
                    
                lang = child.attrib.get(lang_attr)
                if lang:
                    self.translated_name[lang] = text
                else:
                    self.name = text
    
            elif child.tag == 'description':
                text = child.text
                if text:
                    text = text.encode('utf8')
                    
                lang = child.attrib.get(lang_attr)
                if lang:
                    self.translated_description[lang] = text
                else:
                    self.description = text
            
            elif child.tag == 'grouplist':
                self.parse_group_list(child)

            elif child.tag == 'display_order':
                self.display_order = parse_number(child.text)

    def parse_group_list(self, grouplist_elem):
        for child in grouplist_elem:
            if child.tag == 'groupid':
                groupid = child.text
                self._groups[groupid] = 1

    def add(self, obj):
        """Add another category object to this object"""
    
        for grp in obj.groups:
            self._groups[grp] = 1
        
        # name and description translations
        for lang in obj.translated_name.keys():
            if not self.translated_name.has_key(lang):
                self.translated_name[lang] = obj.translated_name[lang]
        
        for lang in obj.translated_description.keys():
            if not self.translated_description.has_key(lang):
                self.translated_description[lang] = obj.translated_description[lang]

        
class Comps:
    def __init__(self, overwrite_groups=False):
        self._groups = {}
        self._categories = {}
        self.compscount = 0
        self.overwrite_groups = overwrite_groups
        self.compiled = False # have groups been compiled into avail/installed 
                              # lists, yet.


    def __sort_order(self, item1, item2):
        if item1.display_order > item2.display_order:
            return 1
        elif item1.display_order == item2.display_order:
            return 0
        else:
            return -1
    
    def get_groups(self):
        grps = self._groups.values()
        grps.sort(self.__sort_order)
        return grps
        
    def get_categories(self):
        cats = self._categories.values()
        cats.sort(self.__sort_order)
        return cats
        
    
    groups = property(get_groups)
    categories = property(get_categories)
    
    
    
    def has_group(self, grpid):
        exists = self.return_group(grpid)
            
        if exists:
            return True
            
        return False
    
    def return_group(self, grpid):
        if self._groups.has_key(grpid):
            return self._groups[grpid]
        
        # do matches against group names and ids, too
        for group in self.groups:
            names = [ group.name, group.groupid ]
            names.extend(group.translated_name.values())
            if grpid in names:
                return group

        
        return None


    def add(self, srcfile = None):
        if not srcfile:
            raise CompsException
            
        if type(srcfile) == type('str'):
            # srcfile is a filename string
            infile = open(srcfile, 'rt')
        else:
            # srcfile is a file object
            infile = srcfile
        
        self.compscount += 1
        self.compiled = False
        
        parser = iterparse(infile)

        for event, elem in parser:
            if elem.tag == "group":
                group = Group(elem)
                if self._groups.has_key(group.groupid):
                    thatgroup = self._groups[group.groupid]
                    thatgroup.add(group)
                else:
                    self._groups[group.groupid] = group

            if elem.tag == "category":
                category = Category(elem)
                if self._categories.has_key(category.categoryid):
                    thatcat = self._categories[category.categoryid]
                    thatcat.add(category)
                else:
                    self._categories[category.categoryid] = category
        
        del parser
        
    def compile(self, pkgtuplist):
        """ compile the groups into installed/available groups """
        
        # convert the tuple list to a simple dict of pkgnames
        inst_pkg_names = {}
        for (n,a,e,v,r) in pkgtuplist:
            inst_pkg_names[n] = 1
        

        for group in self.groups:
            # if there are mandatory packages in the group, then make sure
            # they're all installed.  if any are missing, then the group
            # isn't installed.
            if len(group.mandatory_packages.keys()) > 0:
                check_pkgs = group.mandatory_packages.keys()
                group.installed = True
                for pkgname in check_pkgs:
                    if not inst_pkg_names.has_key(pkgname):
                        group.installed = False
                        break
            # if it doesn't have any of those then see if it has ANY of the
            # optional/default packages installed.
            # If so - then the group is installed
            else:
                check_pkgs = group.optional_packages.keys() + group.default_packages.keys() + group.conditional_packages.keys()
                group.installed = False
                for pkgname in check_pkgs:
                    if inst_pkg_names.has_key(pkgname):
                        group.installed = True
                        break
        
        self.compiled = True

def main():

    try:
        print sys.argv[1]
        p = Comps()
        for srcfile in sys.argv[1:]:
            p.add(srcfile)

        for group in p.groups:
            print group
            for pkg in group.packages:
                print '  ' + pkg
        
        for category in p.categories:
            print category.name
            for group in category.groups:
                print '  ' + group
                
    except IOError:
        print >> sys.stderr, "newcomps.py: No such file:\'%s\'" % sys.argv[1]
        sys.exit(1)
        
if __name__ == '__main__':
    main()



--- NEW FILE config.py ---
#!/usr/bin/python -t

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2002 Duke University 

import os
import warnings
import rpm
import copy
import urlparse
import sys
from parser import IncludingConfigParser, IncludedDirConfigParser
from ConfigParser import NoSectionError, NoOptionError
import rpmUtils.transaction
import rpmUtils.arch
import Errors
from repos import Repository

class OptionData(object):
    '''
    Simple class to track state for a single option instance.
    '''
    def __init__(self, name, initial_value):
        self.name = name
        self.value = initial_value
        self.parser = None
        self.section = None

class Option(object):
    '''
    This class handles a single Yum configuration file option. Create
    subclasses for each type of supported configuration option.
    
    Python descriptor foo (__get__ and __set__) is used to make option
    definition easy and consise.
    '''

    def __init__(self, default=None):
        self._setattrname()
        self.inherit = False
        self.default = default

    def _setattrname(self):
        '''Calculate the internal attribute name used to store option state in
        configuration instances.
        '''
        self._attrname = '__opt%d' % id(self)

    def __get__(self, obj, objtype):
        '''Called when the option is read (via the descriptor protocol). 

        @param obj: The configuration instance to modify.
        @param objtype: The type of the config instance (not used).
        @return: The parsed option value or the default value if the value
            wasn't set in the configuration file.
        '''
        if obj is None:
            return self
        optdata = getattr(obj, self._attrname, None)
        if optdata == None:
            return None
        else:
            return optdata.value

    def __set__(self, obj, value):
        '''Called when the option is set (via the descriptor protocol). 

        @param obj: The configuration instance to modify.
        @param value: The value to set the option to.
        @return: Nothing.
        '''
        optdata = getattr(obj, self._attrname)
       
        # Only try to parse if its a string
        if isinstance(value, basestring):
            try:
                value = self.parse(value)
            except ValueError, e:
                # Add the field name onto the error
                raise ValueError('Error parsing %r: %s' % (optdata.name,
                    str(e)))

        optdata.value = value

        # Write string value back to parser instance if possible
        if optdata.parser != None:
            strvalue = self.tostring(value)
            optdata.parser.set(optdata.section, optdata.name, strvalue)

    def setup(self, obj, name):
        '''Initialise the option for a config instance. 
        This must be called before the option can be set or retrieved. 

        @param obj: BaseConfig (or subclass) instance.
        @param name: Name of the option.
        '''
        setattr(obj, self._attrname, OptionData(name, self.default))

    def setparser(self, obj, parser, section):
        '''Set the configuration parser for this option. This is required so
        that options can be written back to a configuration file.

        @param obj: BaseConfig (or subclass) instance.
        @param parser: ConfigParser (or subclass) where the option is read from.
        @param section: config file section where the option is from.
        '''
        optdata = getattr(obj, self._attrname)
        optdata.parser = parser
        optdata.section = section

    def clone(self):
        '''Return a safe copy of this Option instance
        '''
        new = copy.copy(self)
        new._setattrname()
        return new

    def parse(self, s):
        '''Parse the string value to the Option's native value.

        @param s: Raw string value to parse.
        @return: Validated native value.
    
        Will raise ValueError if there was a problem parsing the string.
        Subclasses should override this.
        '''
        return s

    def tostring(self, value):
        '''Convert the Option's native value to a string value.

        @param value: Native option value.
        @return: String representation of input.

        This does the opposite of the parse() method above.
        Subclasses should override this.
        '''
        return str(value)

def Inherit(option_obj):
    '''Clone an Option instance for the purposes of inheritance. The returned
    instance has all the same properties as the input Option and shares items
    such as the default value. Use this to avoid redefinition of reused
    options.

    @param option_obj: Option instance to inherit.
    @return: New Option instance inherited from the input.
    '''
    new_option = option_obj.clone()
    new_option.inherit = True
    return new_option

class ListOption(Option):

    def __init__(self, default=None):
        if default is None:
            default = []
        super(ListOption, self).__init__(default)

    def parse(self, s):
        """Converts a string from the config file to a workable list

        Commas and spaces are used as separators for the list
        """
        # we need to allow for the '\n[whitespace]' continuation - easier
        # to sub the \n with a space and then read the lines
        s = s.replace('\n', ' ')
        s = s.replace(',', ' ')
        return s.split()

    def tostring(self, value):
        return '\n '.join(value)

class UrlOption(Option):
    '''
    This option handles lists of URLs with validation of the URL scheme.
    '''

    def __init__(self, default=None, schemes=('http', 'ftp', 'file', 'https'), 
            allow_none=False):
        super(UrlOption, self).__init__(default)
        self.schemes = schemes
        self.allow_none = allow_none

    def parse(self, url):
        url = url.strip()

        # Handle the "_none_" special case
        if url.lower() == '_none_':
            if self.allow_none:
                return None
            else:
                raise ValueError('"_none_" is not a valid value')

        # Check that scheme is valid
        (s,b,p,q,f,o) = urlparse.urlparse(url)
        if s not in self.schemes:
            raise ValueError('URL must be %s not "%s"' % (self._schemelist(), s))

        return url

    def _schemelist(self):
        '''Return a user friendly list of the allowed schemes
        '''
        if len(self.schemes) < 1:
            return 'empty'
        elif len(self.schemes) == 1:
            return self.schemes[0]
        else:
            return '%s or %s' % (', '.join(self.schemes[:-1]), self.schemes[-1])

class UrlListOption(ListOption):
    '''
    Option for handling lists of URLs with validation of the URL scheme.
    '''

    def __init__(self, default=None, schemes=('http', 'ftp', 'file', 'https')):
        super(UrlListOption, self).__init__(default)

        # Hold a UrlOption instance to assist with parsing
        self._urloption = UrlOption(schemes=schemes)
        
    def parse(self, s):
        out = []
        for url in super(UrlListOption, self).parse(s):
            out.append(self._urloption.parse(url))
        return out


class IntOption(Option):
    def parse(self, s):
        try:
            return int(s)
        except (ValueError, TypeError), e:
            raise ValueError('invalid integer value')

class BoolOption(Option):
    def parse(self, s):
        s = s.lower()
        if s in ('0', 'no', 'false'):
            return False
        elif s in ('1', 'yes', 'true'):
            return True
        else:
            raise ValueError('invalid boolean value')

    def tostring(self, value):
        if value:
            return "yes"
        else:
            return "no"

class FloatOption(Option):
    def parse(self, s):
        try:
            return float(s.strip())
        except (ValueError, TypeError):
            raise ValueError('invalid float value')

class SelectionOption(Option):
    '''Handles string values where only specific values are allowed
    '''
    def __init__(self, default=None, allowed=()):
        super(SelectionOption, self).__init__(default)
        self._allowed = allowed
        
    def parse(self, s):
        if s not in self._allowed:
            raise ValueError('"%s" is not an allowed value' % s)
        return s

class BytesOption(Option):

    # Multipliers for unit symbols
    MULTS = {
        'k': 1024,
        'm': 1024*1024,
        'g': 1024*1024*1024,
    }

    def parse(self, s):
        """Parse a friendly bandwidth option to bytes

        The input should be a string containing a (possibly floating point)
        number followed by an optional single character unit. Valid units are
        'k', 'M', 'G'. Case is ignored.
       
        Valid inputs: 100, 123M, 45.6k, 12.4G, 100K, 786.3, 0
        Invalid inputs: -10, -0.1, 45.6L, 123Mb

        Return value will always be an integer

        1k = 1024 bytes.

        ValueError will be raised if the option couldn't be parsed.
        """
        if len(s) < 1:
            raise ValueError("no value specified")

        if s[-1].isalpha():
            n = s[:-1]
            unit = s[-1].lower()
            mult = self.MULTS.get(unit, None)
            if not mult:
                raise ValueError("unknown unit '%s'" % unit)
        else:
            n = s
            mult = 1
             
        try:
            n = float(n)
        except ValueError:
            raise ValueError("couldn't convert '%s' to number" % n)

        if n < 0:
            raise ValueError("bytes value may not be negative")

        return int(n * mult)

class ThrottleOption(BytesOption):

    def parse(self, s):
        """Get a throttle option. 

        Input may either be a percentage or a "friendly bandwidth value" as
        accepted by the BytesOption.

        Valid inputs: 100, 50%, 80.5%, 123M, 45.6k, 12.4G, 100K, 786.0, 0
        Invalid inputs: 100.1%, -4%, -500

        Return value will be a int if a bandwidth value was specified or a
        float if a percentage was given.

        ValueError will be raised if input couldn't be parsed.
        """
        if len(s) < 1:
            raise ValueError("no value specified")

        if s[-1] == '%':
            n = s[:-1]
            try:
                n = float(n)
            except ValueError:
                raise ValueError("couldn't convert '%s' to number" % n)
            if n < 0 or n > 100:
                raise ValueError("percentage is out of range")
            return n / 100.0
        else:
            return BytesOption.parse(self, s)


class BaseConfig(object):
    '''
    Base class for storing configuration definitions. Subclass when creating
    your own definitons.
    '''

    def __init__(self):
        self._section = None

        for name in self.iterkeys():
            option = self.optionobj(name)
            option.setup(self, name)

    def __str__(self):
        out = []
        out.append('[%s]' % self._section)
        for name, value in self.iteritems():
            out.append('%s: %r' % (name, value))
        return '\n'.join(out)

    def populate(self, parser, section, parent=None):
        '''Set option values from a INI file section.

        @param parser: ConfParser instance (or subclass)
        @param section: INI file section to read use.
        @param parent: Optional parent BaseConfig (or subclass) instance to use
            when doing option value inheritance.
        '''
        self._section = section
        self.cfg = parser           # Keep a reference to the parser

        for name in self.iterkeys():
            option = self.optionobj(name)
            value = None
            try:
                value = parser.get(section, name)
            except (NoSectionError, NoOptionError):
                # No matching option in this section, try inheriting
                if parent and option.inherit:
                    value = getattr(parent, name)
               
            option.setparser(self, parser, section)
            if value is not None:
                setattr(self, name, value)

    def optionobj(cls, name):
        '''Return the Option instance for the given name
        '''
        # Look for Option instances in this class and base classes so that
        # option inheritance works
        for klass in (cls,) + cls.__bases__:
            obj = klass.__dict__.get(name, None)
            if obj is not None:
                break

        if obj is not None and isinstance(obj, Option):
            return obj
        else:
            raise KeyError
    optionobj = classmethod(optionobj)

    def isoption(cls, name):
        '''Return True if the given name refers to a defined option 
        '''
        try:
            cls.optionobj(name)
            return True
        except KeyError:
            return False
    isoption = classmethod(isoption)

    def iterkeys(self):
        '''Yield the names of all defined options in the instance.
        '''
        for name, item in self.iteritems():
            yield name

    def iteritems(self):
        '''Yield (name, value) pairs for every option in the instance.

        The value returned is the parsed, validated option value.
        '''
        # Use dir() so that we see inherited options too
        for name in dir(self):
            if self.isoption(name):
                yield (name, getattr(self, name))

    def getConfigOption(self, option, default=None):
        warnings.warn('getConfigOption() will go away in a future version of Yum.\n'
                'Please access option values as attributes or using getattr().',
                DeprecationWarning)
        if hasattr(self, option):
            return getattr(self, option)
        return default

    def setConfigOption(self, option, value):
        warnings.warn('setConfigOption() will go away in a future version of Yum.\n'
                'Please set option values as attributes or using setattr().',
                DeprecationWarning)
        if hasattr(self, option):
            setattr(self, option, value)
        else:
            raise Errors.ConfigError, 'No such option %s' % option

class EarlyConf(BaseConfig):
    '''
    Configuration option definitions for yum.conf's [main] section that are
    required before the other [main] options can be parsed (mainly due to
    variable substitution).
    '''
    distroverpkg = Option('fedora-release')
    installroot = Option('/')

class YumConf(EarlyConf):
    '''
    Configuration option definitions for yum.conf\'s [main] section.

    Note: inherits options from EarlyConf too.
    '''

    debuglevel = IntOption(2)
    errorlevel = IntOption(2)
    retries = IntOption(10)
    recent = IntOption(7)

    cachedir = Option('/var/cache/yum')
    keepcache = BoolOption(True)
    logfile = Option('/var/log/yum.log')
    reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
    syslog_ident = Option()
    syslog_facility = Option('LOG_DAEMON')

    commands = ListOption()
    exclude = ListOption()
    failovermethod = Option('roundrobin')
    yumversion = Option('unversioned')
    proxy = UrlOption(schemes=('http', 'ftp', 'https'), allow_none=True)
    proxy_username = Option()
    proxy_password = Option()
    pluginpath = ListOption(['/usr/lib/yum-plugins'])
    installonlypkgs = ListOption(['kernel', 'kernel-bigmem',
            'kernel-enterprise','kernel-smp', 'kernel-modules', 'kernel-debug',
            'kernel-unsupported', 'kernel-source', 'kernel-devel'])
    kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
            'kernel-bigmem', 'kernel-BOOT'])
    exactarchlist = ListOption(['kernel', 'kernel-smp', 'glibc',
            'kernel-hugemem', 'kernel-enterprise', 'kernel-bigmem',
            'kernel-devel'])
    tsflags = ListOption()

    assumeyes = BoolOption(False)
    alwaysprompt = BoolOption(True)
    exactarch = BoolOption(True)
    tolerant = BoolOption(True)
    diskspacecheck = BoolOption(True)
    overwrite_groups = BoolOption(False)
    keepalive = BoolOption(True)
    gpgcheck = BoolOption(False)
    obsoletes = BoolOption(False)
    showdupesfromrepos = BoolOption(False)
    enabled = BoolOption(True)
    plugins = BoolOption(False)
    enablegroups = BoolOption(True)
    enable_group_conditionals = BoolOption(True)

    timeout = FloatOption(30.0)

    bandwidth = BytesOption(0)
    throttle = ThrottleOption(0)

    http_caching = SelectionOption('all', ('none', 'packages', 'all'))
    metadata_expire = IntOption(1800)   # time in seconds

class RepoConf(BaseConfig):
    '''
    Option definitions for repository INI file sections.
    '''
    name = Option()
    enabled = Inherit(YumConf.enabled)
    baseurl = UrlListOption()
    mirrorlist = UrlOption()
    gpgkey = UrlListOption()
    exclude = ListOption() 
    includepkgs = ListOption() 

    proxy = Inherit(YumConf.proxy)
    proxy_username = Inherit(YumConf.proxy_username)
    proxy_password = Inherit(YumConf.proxy_password)
    retries = Inherit(YumConf.retries)
    failovermethod = Inherit(YumConf.failovermethod)

    gpgcheck = Inherit(YumConf.gpgcheck)
    keepalive = Inherit(YumConf.keepalive)
    enablegroups = Inherit(YumConf.enablegroups)

    bandwidth = Inherit(YumConf.bandwidth)
    throttle = Inherit(YumConf.throttle)
    timeout = Inherit(YumConf.timeout)
    http_caching = Inherit(YumConf.http_caching)
    metadata_expire = Inherit(YumConf.metadata_expire)

def readMainConfig(configfile, root):
    '''Parse Yum's main configuration file

    @param configfile: Path to the configuration file to parse (typically
        '/etc/yum.conf').
    @param root: The base path to use for installation (typically '/')
    @return: Populated YumConf instance.
    '''

    # Read up config variables that are needed early to calculate substitution
    # variables
    EarlyConf.installroot.default = root
    earlyconf = EarlyConf()
    confparser = IncludingConfigParser()
    if not os.path.exists(configfile):
        raise Errors.ConfigError, 'No such config file %s' % configfile

    confparser.read(configfile)
    earlyconf.populate(confparser, 'main')

    # Set up substitution vars
    vars = _getEnvVar()
    vars['basearch'] = rpmUtils.arch.getBaseArch()          # FIXME make this configurable??
    vars['arch'] = rpmUtils.arch.getCanonArch()             # FIXME make this configurable??
    vars['releasever'] = _getsysver(earlyconf.installroot, earlyconf.distroverpkg)

    # Read [main] section
    yumconf = YumConf()
    confparser = IncludingConfigParser(vars=vars)
    confparser.read(configfile)
    yumconf.populate(confparser, 'main')

    # Apply the installroot to directory options
    for option in ('cachedir', 'logfile'):
        path = getattr(yumconf, option)
        setattr(yumconf, option, yumconf.installroot + path)
    
    # Check that plugin paths are all absolute
    for path in yumconf.pluginpath:
        if not path.startswith('/'):
            raise Errors.ConfigError("All plugin search paths must be absolute")

    # Add in some extra attributes which aren't actually configuration values 
    yumconf.yumvar = vars
    yumconf.uid = 0
    yumconf.cache = 0
    yumconf.progess_obj = None

    return yumconf

def readRepoConfig(parser, section, mainconf):
    '''Parse an INI file section for a repository.

    @param parser: ConfParser or similar to read INI file values from.
    @param section: INI file section to read.
    @param mainconf: ConfParser or similar for yum.conf.
    @return: Repository instance.
    '''

    conf = RepoConf()
    conf.populate(parser, section, mainconf)

    # Ensure that the repo name is set
    if not conf.name:
        conf.name = section
        print >> sys.stderr, \
            'Repository %r is missing name in configuration, using id' % section

    thisrepo = Repository(section)

    # Transfer attributes across
    #TODO: merge RepoConf and Repository 
    for k, v in conf.iteritems():
        if v or not hasattr(thisrepo, k):
            thisrepo.set(k, v)

    # Set attributes not from the config file
    thisrepo.basecachedir = mainconf.cachedir
    thisrepo.yumvar.update(mainconf.yumvar)
    thisrepo.cfg = parser

    return thisrepo

def getOption(conf, section, name, default, option):
    '''Convenience function to retrieve a parsed and converted value from a
    ConfigParser.

    @param conf: ConfigParser instance or similar
    @param section: Section name
    @param name: Option name
    @param default: Value to use if option is missing
    @param option: Option instance to use for conversion.
    @return: The parsed value or default if value was not present.

    Will raise ValueError if the option could not be parsed.
    '''
    try: 
        val = conf.get(section, name)
    except (NoSectionError, NoOptionError):
        return default
    return option.parse(val)

def _getEnvVar():
    '''Return variable replacements from the environment variables YUM0 to YUM9

    The result is intended to be used with parser.varReplace()
    '''
    yumvar = {}
    for num in range(0, 10):
        env = 'YUM%d' % num
        val = os.environ.get(env, '')
        if val:
            yumvar[env.lower()] = val
    return yumvar

def _getsysver(installroot, distroverpkg):
    '''Calculate the release version for the system.

    @param installroot: The value of the installroot option.
    @param distroverpkg: The value of the distroverpkg option.
    @return: The release version as a string (eg. '4' for FC4)
    '''
    ts = rpmUtils.transaction.initReadOnlyTransaction(root=installroot)
    ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
    idx = ts.dbMatch('provides', distroverpkg)
    # we're going to take the first one - if there is more than one of these
    # then the user needs a beating
    if idx.count() == 0:
        releasever = 'Null'
    else:
        hdr = idx.next()
        releasever = hdr['version']
        del hdr
    del idx
    del ts
    return releasever


#def main():
#    mainconf = readMainConfig('/etc/yum.conf', '/') 
#    repoconf = readRepoConfig(mainconf.cfg, 'core', mainconf)
#
#    print `repoconf.name`
#
#if __name__ == '__main__':
#    main()


--- NEW FILE constants.py ---
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


#Constants
#transaction set states
TS_UPDATE = 10
TS_INSTALL = 20
TS_TRUEINSTALL = 30
TS_ERASE = 40
TS_OBSOLETED = 50
TS_OBSOLETING = 60
TS_AVAILABLE = 70


TS_INSTALL_STATES = [TS_INSTALL, TS_TRUEINSTALL, TS_UPDATE, TS_OBSOLETING]
TS_REMOVE_STATES = [TS_ERASE, TS_OBSOLETED]

# Transaction Relationships
TR_UPDATES = 1
TR_UPDATEDBY = 2
TR_OBSOLETES = 3
TR_OBSOLETEDBY = 4
TR_DEPENDS = 5
TR_DEPENDSON = 6

# Transaction Member Sort Colors
# Each node in a topological sort is colored
# White nodes are unseen, black nodes are seen
# grey nodes are in progress
TX_WHITE = 0
TX_GREY = 1
TX_BLACK = 2

# package object file types
PO_FILE = 1
PO_DIR = 2
PO_GHOST = 3
PO_CONFIG = 4
PO_DOC = 5

# package object package types
PO_REMOTEPKG = 1
PO_LOCALPKG = 2
PO_INSTALLEDPKG = 3

# FLAGS
SYMBOLFLAGS = {'>':'GT', '<':'LT', '=': 'EQ', '==': 'EQ', '>=':'GE', '<=':'LE'}
LETTERFLAGS = {'GT':'>', 'LT':'<', 'EQ':'=', 'GE': '>=', 'LE': '<='}

# Constants for plugin config option registration
PLUG_OPT_STRING = 0
PLUG_OPT_INT = 1
PLUG_OPT_FLOAT = 2
PLUG_OPT_BOOL = 3

PLUG_OPT_WHERE_MAIN = 0
PLUG_OPT_WHERE_REPO = 1
PLUG_OPT_WHERE_ALL = 2

# boolean dict:
BOOLEAN_STATES = {'1': True, 'yes': True, 'true': True, 'on': True,
                  '0': False, 'no': False, 'false': False, 'off': False}


--- NEW FILE depsolve.py ---
#!/usr/bin/python -t
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 

import os
import os.path
import re
import types

import rpmUtils.transaction
import rpmUtils.miscutils
import rpmUtils.arch
from misc import unique
import rpm

from repomd.packageSack import ListPackageSack
from repomd.mdErrors import PackageSackError
from Errors import DepError, RepoError
from constants import *
import packages

class Depsolve(object):
    def __init__(self):
        packages.base = self
        self.dsCallback = None
    
    def initActionTs(self):
        """sets up the ts we'll use for all the work"""
        
        self.ts = rpmUtils.transaction.TransactionWrapper(self.conf.installroot)
        ts_flags_to_rpm = { 'noscripts': rpm.RPMTRANS_FLAG_NOSCRIPTS,
                            'notriggers': rpm.RPMTRANS_FLAG_NOTRIGGERS,
                            'nodocs': rpm.RPMTRANS_FLAG_NODOCS,
                            'test': rpm.RPMTRANS_FLAG_TEST,
                            'repackage': rpm.RPMTRANS_FLAG_REPACKAGE}
        
        self.ts.setFlags(0) # reset everything.
        
        for flag in self.conf.tsflags:
            if ts_flags_to_rpm.has_key(flag):
                self.ts.addTsFlag(ts_flags_to_rpm[flag])
            else:
                self.errorlog(0, 'Invalid tsflag in config file: %s' % flag)

    def whatProvides(self, name, flags, version):
        """searches the packageSacks for what provides the arguments
           returns a ListPackageSack of providing packages, possibly empty"""

        self.log(4, 'Searching pkgSack for dep: %s' % name)
        # we need to check the name - if it doesn't match:
        # /etc/* bin/* or /usr/lib/sendmail then we should fetch the 
        # filelists.xml for all repos to make the searchProvides more complete.
        if name[0] == '/':
            matched = 0
            globs = ['.*bin\/.*', '^\/etc\/.*', '^\/usr\/lib\/sendmail$']
            for glob in globs:
                globc = re.compile(glob)
                if globc.match(name):
                    matched = 1
            if not matched:
                self.doSackFilelistPopulate()
            
        pkgs = self.pkgSack.searchProvides(name)
        if flags == 0:
            flags = None
        

        if type(version) in (types.StringType, types.NoneType):
            (r_e, r_v, r_r) = rpmUtils.miscutils.stringToVersion(version)
        elif type(version) in (types.TupleType, types.ListType): # would this ever be a ListType?
            (r_e, r_v, r_r) = version
        
        defSack = ListPackageSack() # holder for items definitely providing this dep
        
        for po in pkgs:
            self.log(5, 'Potential match for %s from %s' % (name, po))
            if name[0] == '/' and r_v is None:
                # file dep add all matches to the defSack
                defSack.addPackage(po)
                continue

            if po.checkPrco('provides', (name, flags, (r_e, r_v, r_r))):
                defSack.addPackage(po)
                self.log(3, 'Matched %s to require for %s' % (po, name))
        
        return defSack
        
    def allowedMultipleInstalls(self, po):
        """takes a packageObject, returns 1 or 0 depending on if the package 
           should/can be installed multiple times with different vers
           like kernels and kernel modules, for example"""
           
        if po.name in self.conf.installonlypkgs:
            return 1
        
        provides = po.getProvidesNames()
        if filter (lambda prov: prov in self.conf.installonlypkgs, provides):
            return 1
        
        return 0

    def populateTs(self, test=0, keepold=1):
        """take transactionData class and populate transaction set"""

        if self.dsCallback: self.dsCallback.transactionPopulation()
        ts_elem = {}
        if keepold:
            for te in self.ts:
                epoch = te.E()
                if epoch is None:
                    epoch = '0'
                pkginfo = (te.N(), te.A(), epoch, te.V(), te.R())
                if te.Type() == 1:
                    mode = 'i'
                elif te.Type() == 2:
                    mode = 'e'
                
                ts_elem[(pkginfo, mode)] = 1
                
        for txmbr in self.tsInfo.getMembers():
            self.log(6, 'Member: %s' % txmbr)
            if txmbr.ts_state in ['u', 'i']:
                if ts_elem.has_key((txmbr.pkgtup, 'i')):
                    continue
                self.downloadHeader(txmbr.po)
                hdr = txmbr.po.returnLocalHeader()
                rpmfile = txmbr.po.localPkg()
                
                if txmbr.ts_state == 'u':
                    if self.allowedMultipleInstalls(txmbr.po):
                        self.log(5, '%s converted to install' % (txmbr.po))
                        txmbr.ts_state = 'i'
                        txmbr.output_state = TS_INSTALL

                
                self.ts.addInstall(hdr, (hdr, rpmfile), txmbr.ts_state)
                self.log(4, 'Adding Package %s in mode %s' % (txmbr.po, txmbr.ts_state))
                if self.dsCallback: 
                    self.dsCallback.pkgAdded(txmbr.pkgtup, txmbr.ts_state)
            
            elif txmbr.ts_state in ['e']:
                if ts_elem.has_key((txmbr.pkgtup, txmbr.ts_state)):
                    continue
                indexes = self.rpmdb.returnIndexByTuple(txmbr.pkgtup)
                for idx in indexes:
                    self.ts.addErase(idx)
                    if self.dsCallback: self.dsCallback.pkgAdded(txmbr.pkgtup, 'e')
                    self.log(4, 'Removing Package %s' % txmbr.po)
        

    def resolveDeps(self):

        CheckDeps = 1
        conflicts = 0
        missingdep = 0
        depscopy = []
        unresolveableloop = 0

        errors = []
        if self.dsCallback: self.dsCallback.start()

        while CheckDeps > 0:
            self.cheaterlookup = {} # short cache for some information we'd resolve
                                    # (needname, needversion) = pkgtup
            self.populateTs(test=1)
            if self.dsCallback: self.dsCallback.tscheck()
            deps = self.ts.check()

            
            if not deps:
                self.tsInfo.changed = False
                return (2, ['Success - deps resolved'])

            deps = unique(deps) # get rid of duplicate deps            
            if deps == depscopy:
                unresolveableloop += 1
                self.log(5, 'Identical Loop count = %d' % unresolveableloop)
                if unresolveableloop >= 2:
                    errors.append('Unable to satisfy dependencies')
                    for deptuple in deps:
                        ((name, version, release), (needname, needversion), flags, 
                          suggest, sense) = deptuple
                        if sense == rpm.RPMDEP_SENSE_REQUIRES:
                            msg = 'Package %s needs %s, this is not available.' % \
                                  (name, rpmUtils.miscutils.formatRequire(needname, 
                                                                          needversion, flags))
                        elif sense == rpm.RPMDEP_SENSE_CONFLICTS:
                            msg = 'Package %s conflicts with %s.' % \
                                  (name, rpmUtils.miscutils.formatRequire(needname, 
                                                                          needversion, flags))

                        errors.append(msg)
                    CheckDeps = 0
                    break
            else:
                unresolveableloop = 0

            depscopy = deps
            CheckDeps = 0


            # things to resolve
            self.log (3, '# of Deps = %d' % len(deps))
            depcount = 0
            for dep in deps:
                ((name, version, release), (needname, needversion), flags, suggest, sense) = dep
                depcount += 1
                self.log(5, '\nDep Number: %d/%d\n' % (depcount, len(deps)))
                if sense == rpm.RPMDEP_SENSE_REQUIRES: # requires
                    # if our packageSacks aren't here, then set them up
                    if not hasattr(self, 'pkgSack'):
                        self.doRepoSetup()
                        self.doSackSetup()
                    (checkdep, missing, conflict, errormsgs) = self._processReq(dep)
                    
                elif sense == rpm.RPMDEP_SENSE_CONFLICTS: # conflicts - this is gonna be short :)
                    (checkdep, missing, conflict, errormsgs) = self._processConflict(dep)
                    
                else: # wtf?
                    self.errorlog(0, 'Unknown Sense: %d' (sense))
                    continue

                missingdep += missing
                conflicts += conflict
                CheckDeps += checkdep
                for error in errormsgs:
                    if error not in errors:
                        errors.append(error)

            self.log(4, 'miss = %d' % missingdep)
            self.log(4, 'conf = %d' % conflicts)
            self.log(4, 'CheckDeps = %d' % CheckDeps)

            if CheckDeps > 0:
                if self.dsCallback: self.dsCallback.restartLoop()
                self.log(4, 'Restarting Loop')
            else:
                if self.dsCallback: self.dsCallback.end()
                self.log(4, 'Dependency Process ending')

            del deps

        self.tsInfo.changed = False
        if len(errors) > 0:
            return (1, errors)
        if len(self.tsInfo) > 0:
            return (2, ['Run Callback'])

    def _processReq(self, dep):
        """processes a Requires dep from the resolveDeps functions, returns a tuple
           of (CheckDeps, missingdep, conflicts, errors) the last item is an array
           of error messages"""
        
        CheckDeps = 0
        missingdep = 0
        conflicts = 0
        errormsgs = []
        
        ((name, version, release), (needname, needversion), flags, suggest, sense) = dep
        
        niceformatneed = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
        self.log(4, '%s requires: %s' % (name, niceformatneed))
        
        if self.dsCallback: self.dsCallback.procReq(name, niceformatneed)
        
        # is the requiring tuple (name, version, release) from an installed package?
        pkgs = []
        dumbmatchpkgs = self.rpmdb.returnTupleByKeyword(name=name, ver=version, rel=release)
        for pkgtuple in dumbmatchpkgs:
            self.log(6, 'Calling rpmdb.returnHeaderByTuple on %s.%s %s:%s-%s' % pkgtuple)
            hdrs = self.rpmdb.returnHeaderByTuple(pkgtuple)
            for hdr in hdrs:
                po = packages.YumInstalledPackage(hdr)
                if self.tsInfo.exists(po.pkgtup):
                    self.log(7, 'Skipping package already in Transaction Set: %s' % po)
                    continue
                if niceformatneed in po.requiresList():
                    pkgs.append(po)

        if len(pkgs) < 1: # requiring tuple is not in the rpmdb
            txmbrs = self.tsInfo.matchNaevr(name=name, ver=version, rel=release)
            if len(txmbrs) < 1:
                msg = 'Requiring package %s-%s-%s not in transaction set \
                                  nor in rpmdb' % (name, version, release)
                self.log(4, msg)
                errormsgs.append(msg)
                missingdep = 1
                CheckDeps = 0

            else:
                txmbr = txmbrs[0]
                self.log(4, 'Requiring package is from transaction set')
                if txmbr.ts_state == 'e':
                    msg = 'Requiring package %s is set to be erased,' % txmbr.name +\
                           'probably processing an old dep, restarting loop early.'
                    self.log(5, msg)
                    CheckDeps=1
                    missingdep=0
                    return (CheckDeps, missingdep, conflicts, errormsgs)
                    
                else:
                    self.log(4, 'Resolving for requiring package: %s-%s-%s in state %s' %
                                (name, version, release, txmbr.ts_state))
                    self.log(4, 'Resolving for requirement: %s' % 
                        rpmUtils.miscutils.formatRequire(needname, needversion, flags))
                    requirementTuple = (needname, flags, needversion)
                    # should we figure out which is pkg it is from the tsInfo?
                    requiringPkg = (name, version, release, txmbr.ts_state) 
                    CheckDeps, missingdep = self._requiringFromTransaction(requiringPkg, requirementTuple, errormsgs)
            
        if len(pkgs) > 0:  # requring tuple is in the rpmdb
            if len(pkgs) > 1:
                self.log(5, 'Multiple Packages match. %s-%s-%s' % (name, version, release))
                for po in pkgs:
                    # if one of them is (name, arch) already in the tsInfo somewhere, 
                    # pop it out of the list
                    (n,a,e,v,r) = po.pkgtup
                    thismode = self.tsInfo.getMode(name=n, arch=a)
                    if thismode is not None:
                        self.log(5, '   %s already in ts %s, skipping' % (po, thismode))
                        pkgs.remove(po)
                        continue
                    else:
                        self.log(5, '   %s' % po)
                    
            if len(pkgs) == 1:
                po = pkgs[0]
                self.log(5, 'Requiring package is installed: %s' % po)
            
            if len(pkgs) > 0:
                requiringPkg = pkgs[0] # take the first one, deal with the others (if there is one)
                                   # on another dep.
            else:
                self.errorlog(1, 'All pkgs in depset are also in tsInfo, this is wrong and bad')
                CheckDeps = 1
                return (CheckDeps, missingdep, conflicts, errormsgs)
            
            self.log(4, 'Resolving for installed requiring package: %s' % requiringPkg)
            self.log(4, 'Resolving for requirement: %s' % 
                rpmUtils.miscutils.formatRequire(needname, needversion, flags))
            
            requirementTuple = (needname, flags, needversion)
            
            CheckDeps, missingdep = self._requiringFromInstalled(requiringPkg.pkgtup,
                                                    requirementTuple, errormsgs)


        return (CheckDeps, missingdep, conflicts, errormsgs)


    def _requiringFromInstalled(self, requiringPkg, requirement, errorlist):
        """processes the dependency resolution for a dep where the requiring 
           package is installed"""
        
        # FIXME - should we think about dealing exclusively in package objects?
           
        (name, arch, epoch, ver, rel) = requiringPkg
        requiringPo = self.getInstalledPackageObject(requiringPkg)
        
        (needname, needflags, needversion) = requirement
        niceformatneed = rpmUtils.miscutils.formatRequire(needname, needversion, needflags)
        checkdeps = 0
        missingdep = 0
        
        # we must first find out why the requirement is no longer there
        # we must find out what provides/provided it from the rpmdb (if anything)
        # then check to see if that thing is being acted upon by the transaction set
        # if it is then we need to find out what is being done to it and act accordingly
        rpmdbNames = self.rpmdb.getNamePkgList()
        needmode = None # mode in the transaction of the needed pkg (if any)
        needpo = None
        providers = []
        
        if self.cheaterlookup.has_key((needname, needflags, needversion)):
            self.log(5, 'Needed Require has already been looked up, cheating')
            cheater_tup = self.cheaterlookup[(needname, needflags, needversion)]
            providers = [cheater_tup]
        
        elif needname in rpmdbNames:
            txmbrs = self.tsInfo.matchNaevr(name=needname)
            for txmbr in txmbrs:
                providers.append(txmbr.pkgtup)

        else:
            self.log(5, 'Needed Require is not a package name. Looking up: %s' % niceformatneed)
            providers = self.rpmdb.whatProvides(needname, needflags, needversion)
            
        for insttuple in providers:
            inst_str = '%s.%s %s:%s-%s' % insttuple
            (i_n, i_a, i_e, i_v, i_r) = insttuple
            self.log(5, 'Potential Provider: %s' % inst_str)
            thismode = self.tsInfo.getMode(name=i_n, arch=i_a, 
                            epoch=i_e, ver=i_v, rel=i_r)
                        
            if thismode is None and i_n in self.conf.exactarchlist:
                # check for mode by the same name+arch
                thismode = self.tsInfo.getMode(name=i_n, arch=i_a)
            
            if thismode is None and i_n not in self.conf.exactarchlist:
                # check for mode by just the name
                thismode = self.tsInfo.getMode(name=i_n)
            
            if thismode is not None:
                needmode = thismode
                try:
                    needpo = self.getInstalledPackageObject(insttuple)
                except KeyError:
                    needpo = self.getPackageObject(insttuple)
                self.cheaterlookup[(needname, needflags, needversion)] = insttuple
                self.log(5, 'Mode is %s for provider of %s: %s' % 
                            (needmode, niceformatneed, inst_str))
                break
                    
        self.log(5, 'Mode for pkg providing %s: %s' % (niceformatneed, needmode))
        
        if needmode in ['e']:
            self.log(5, 'TSINFO: %s package requiring %s marked as erase' %
                            (requiringPo, needname))
            txmbr = self.tsInfo.addErase(requiringPo)
            txmbr.setAsDep(po=needpo)
            checkdeps = 1
        
        if needmode in ['i', 'u']:
            self.doUpdateSetup()
            obslist = []
            # check obsoletes first
            if self.conf.obsoletes:
                if self.up.obsoleted_dict.has_key(requiringPo.pkgtup):
                    obslist = self.up.obsoleted_dict[requiringPo.pkgtup]
                    self.log(4, 'Looking for Obsoletes for %s' % requiringPo)
                
            if len(obslist) > 0:
                po = None
                for pkgtup in obslist:
                    po = self.getPackageObject(pkgtup)
                if po:
                    for (new, old) in self.up.getObsoletesTuples(): # FIXME query the obsoleting_list now?
                        if po.pkgtup == new:
                            txmbr = self.tsInfo.addObsoleting(po, requiringPo)
                            self.tsInfo.addObsoleted(requiringPo, po)
                            txmbr.setAsDep(po=needpo)
                            self.log(5, 'TSINFO: Obsoleting %s with %s to resolve dep.' % (requiringPo, po))
                            checkdeps = 1
                            return checkdeps, missingdep 
                
            
            # check updates second
            uplist = []                
            uplist = self.up.getUpdatesList(name=name)
            # if there's an update for the reqpkg, then update it
            
            po = None
            if len(uplist) > 0:
                if name not in self.conf.exactarchlist:
                    pkgs = self.pkgSack.returnNewestByName(name)
                    archs = {}
                    for pkg in pkgs:
                        (n,a,e,v,r) = pkg.pkgtup
                        archs[a] = pkg
                    a = rpmUtils.arch.getBestArchFromList(archs.keys())
                    po = archs[a]
                else:
                    po = self.pkgSack.returnNewestByNameArch((name,arch))[0]
                if po.pkgtup not in uplist:
                    po = None

            if po:
                for (new, old) in self.up.getUpdatesTuples():
                    if po.pkgtup == new:
                        txmbr = self.tsInfo.addUpdate(po, requiringPo)
                        txmbr.setAsDep(po=needpo)
                        self.log(5, 'TSINFO: Updating %s to resolve dep.' % po)
                checkdeps = 1
                
            else: # if there's no update then pass this over to requringFromTransaction()
                self.log(5, 'Cannot find an update path for dep for: %s' % niceformatneed)
                
                reqpkg = (name, ver, rel, None)
                return self._requiringFromTransaction(reqpkg, requirement, errorlist)
            

        if needmode is None:
            reqpkg = (name, ver, rel, None)
            if hasattr(self, 'pkgSack'):
                return self._requiringFromTransaction(reqpkg, requirement, errorlist)
            else:
                self.log(5, 'Unresolveable requirement %s for %s' % (niceformatneed, reqpkg_print))
                checkdeps = 0
                missingdep = 1


        return checkdeps, missingdep
        

    def _requiringFromTransaction(self, requiringPkg, requirement, errorlist):
        """processes the dependency resolution for a dep where requiring 
           package is in the transaction set"""
        
        (name, version, release, tsState) = requiringPkg
        (needname, needflags, needversion) = requirement
        checkdeps = 0
        missingdep = 0
        
        #~ - if it's not available from some repository:
        #~     - mark as unresolveable.
        #
        #~ - if it's available from some repo:
        #~    - if there is an another version of the package currently installed then
        #        - if the other version is marked in the transaction set
        #           - if it's marked as erase
        #              - mark the dep as unresolveable
         
        #           - if it's marked as update or install
        #              - check if the version for this requirement:
        #                  - if it is higher 
        #                       - mark this version to be updated/installed
        #                       - remove the other version from the transaction set
        #                       - tell the transaction set to be rebuilt
        #                  - if it is lower
        #                       - mark the dep as unresolveable
        #                   - if they are the same
        #                       - be confused but continue

        provSack = self.whatProvides(needname, needflags, needversion)

        # get rid of things that are already in the rpmdb - b/c it's pointless to use them here

        for pkg in provSack.returnPackages():
            if pkg.pkgtup in self.rpmdb.getPkgList(): # is it already installed?
                self.log(5, '%s is in providing packages but it is already installed, removing.' % pkg)
                provSack.delPackage(pkg)
                continue

            # we need to check to see, if we have anything similar to it (name-wise)
            # installed or in the ts, and this isn't a package that allows multiple installs
            # then if it's newer, fine - continue on, if not, then we're unresolveable
            # cite it and exit
        
            tspkgs = []
            if not self.allowedMultipleInstalls(pkg):
                (n, a, e, v, r) = pkg.pkgtup
                
                # from ts
                tspkgs = self.tsInfo.matchNaevr(name=pkg.name, arch=pkg.arch)
                for tspkg in tspkgs:
                    (tn, ta, te, tv, tr) = tspkg.pkgtup
                    rc = rpmUtils.miscutils.compareEVR((e, v, r), (te, tv, tr))
                    if rc < 0:
                        msg = 'Potential resolving package %s has newer instance in ts.' % pkg
                        self.log(5, msg)
                        provSack.delPackage(pkg)
                        continue
                
                # from rpmdb
                dbpkgs = self.rpmdb.returnTupleByKeyword(name=pkg.name, arch=pkg.arch)
                for dbpkgtup in dbpkgs:
                    (dn, da, de, dv, dr) = dbpkgtup
                    rc = rpmUtils.miscutils.compareEVR((e, v, r), (de, dv, dr))
                    if rc < 0:
                        msg = 'Potential resolving package %s has newer instance installed.' % pkg
                        self.log(5, msg)
                        provSack.delPackage(pkg)
                        continue

        if len(provSack) == 0: # unresolveable
            missingdep = 1
            msg = 'Missing Dependency: %s is needed by package %s' % \
            (rpmUtils.miscutils.formatRequire(needname, needversion, needflags),
                                                                   name)
            errorlist.append(msg)
            return checkdeps, missingdep
        
        # iterate the provSack briefly, if we find the package is already in the 
        # tsInfo then just skip this run
        for pkg in provSack.returnPackages():
            (n,a,e,v,r) = pkg.pkgtup
            pkgmode = self.tsInfo.getMode(name=n, arch=a, epoch=e, ver=v, rel=r)
            if pkgmode in ['i', 'u']:
                self.doUpdateSetup()
                self.log(5, '%s already in ts, skipping this one' % (n))
                checkdeps = 1
                return checkdeps, missingdep
        

        # find the best one 
        newest = provSack.returnNewestByNameArch()
        if len(newest) > 1: # there's no way this can be zero
            best = newest[0]
            for po in newest[1:]:
                if len(po.name) < len(best.name):
                    best = po
                elif len(po.name) == len(best.name):
                    # compare arch
                    arch = rpmUtils.arch.getBestArchFromList([po.arch, best.arch])
                    if arch == po.arch:
                        best = po
        elif len(newest) == 1:
            best = newest[0]
        
        if best.pkgtup in self.rpmdb.getPkgList(): # is it already installed?
            missingdep = 1
            checkdeps = 0
            msg = 'Missing Dependency: %s is needed by package %s' % (needname, name)
            errorlist.append(msg)
            return checkdeps, missingdep
        
                
            
        # FIXME - why can't we look up in the transaction set for the requiringPkg
        # and know what needs it that way and provide a more sensible dep structure in the txmbr
        if (best.name, best.arch) in self.rpmdb.getNameArchPkgList():
            self.log(3, 'TSINFO: Marking %s as update for %s' % (best, name))
            txmbr = self.tsInfo.addUpdate(best)
            txmbr.setAsDep()
        else:
            self.log(3, 'TSINFO: Marking %s as install for %s' % (best, name))
            txmbr = self.tsInfo.addInstall(best)
            txmbr.setAsDep()

        checkdeps = 1
        
        return checkdeps, missingdep


    def _processConflict(self, dep):
        """processes a Conflict dep from the resolveDeps() method"""
                
        CheckDeps = 0
        missingdep = 0
        conflicts = 0
        errormsgs = []
        

        ((name, version, release), (needname, needversion), flags, suggest, sense) = dep
        
        niceformatneed = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
        if self.dsCallback: self.dsCallback.procConflict(name, niceformatneed)
        
        # we should try to update out of the dep, if possible        
        # see which side of the conflict is installed and which is in the transaction Set
        needmode = self.tsInfo.getMode(name=needname)
        confmode = self.tsInfo.getMode(name=name, ver=version, rel=release)
        if confmode is None:
            confname = name
        elif needmode is None:
            confname = needname
        else:
            confname = name
            
        po = None        
        self.doUpdateSetup()
        uplist = self.up.getUpdatesList(name=confname)
        
        conftuple = self.rpmdb.returnTupleByKeyword(name=confname)
        if conftuple:
            (confname, confarch, confepoch, confver, confrel) = conftuple[0] # take the first one, probably the only one
                

            # if there's an update for the reqpkg, then update it
            if len(uplist) > 0:
                if confname not in self.conf.exactarchlist:
                    pkgs = self.pkgSack.returnNewestByName(confname)
                    archs = {}
                    for pkg in pkgs:
                        (n,a,e,v,r) = pkg.pkgtup
                        archs[a] = pkg
                    a = rpmUtils.arch.getBestArchFromList(archs.keys())
                    po = archs[a]
                else:
                    po = self.pkgSack.returnNewestByNameArch((confname,confarch))[0]
                if po.pkgtup not in uplist:
                    po = None

        if po:
            self.log(5, 'TSINFO: Updating %s to resolve conflict.' % po)
            txmbr = self.tsInfo.addUpdate(po)
            txmbr.setAsDep()
            CheckDeps = 1
            
        else:
            conf = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
            CheckDeps, conflicts = self._unresolveableConflict(conf, name, errormsgs)
            self.log(4, '%s conflicts: %s' % (name, conf))
        
        return (CheckDeps, missingdep, conflicts, errormsgs)

    def _unresolveableReq(self, req, name, namestate, errors):
        CheckDeps = 0
        missingdep = 1
        msg = 'Missing Dependency: %s needed for package %s (%s)' % (req, name, namestate)
        errors.append(msg)
        if self.dsCallback: self.dsCallback.unresolved(msg)
        return CheckDeps, missingdep

    def _unresolveableConflict(self, conf, name, errors):
        CheckDeps = 0
        conflicts = 1
        msg = '%s conflicts with %s' % (name, conf)
        errors.append(msg)
        return CheckDeps, conflicts


--- NEW FILE failover.py ---
#!/usr/bin/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
# (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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Jack Neely, NC State University

# Here we define a base class for failover methods.  The idea here is that each
# failover method uses a class derived from the base class so yum only has to
# worry about calling get_serverurl() and server_failed() and these classes will 
# figure out which URL to cough up based on the failover method.

import random

class baseFailOverMethod:

    def __init__(self, repo):
        self.repo = repo
        self.failures = 0
    
    def get_serverurl(self, i=None):
        """Returns a serverurl based on this failover method or None 
           if complete failure.  If i is given it is a direct index
           to pull a server URL from instead of using the failures 
           counter."""
        return None
        
    def server_failed(self):
        "Tells the failover method that the current server is failed."
        self.failures = self.failures + 1
        
    def reset(self, i=0):
        "Reset the failures counter to a given index."
        self.failures = i

    def get_index(self):
        """Returns the current number of failures which is also the
           index into the list this object represents.  ger_serverurl()
           should always be used to translate an index into a URL
           as this object may change how indexs map.  (See RoundRobin)"""

        return self.failures
   
    def len(self):
        """Returns the how many URLs we've got to cycle through."""

        return len(self.repo.urls)
        
            

class priority(baseFailOverMethod):

    """Chooses server based on the first success in the list."""
    
    def get_serverurl(self, i=None):
        "Returns a serverurl based on this failover method or None if complete failure."
        
        if i == None:
            index = self.failures
        else:
            index = i
        
        if index >= len(self.repo.urls):
            return None
        
        return self.repos.urls[index]
        
        
    
class roundRobin(baseFailOverMethod):

    """Chooses server based on a round robin."""
    
    def __init__(self, repo):
        baseFailOverMethod.__init__(self, repo)
        random.seed()
        self.offset = random.randint(0, 37)
    
    def get_serverurl(self, i=None):
        "Returns a serverurl based on this failover method or None if complete failure."

        if i == None:
            index = self.failures
        else:
            index = i
        
        if index >= len(self.repo.urls):
            return None
        
        rr = (index + self.offset) % len(self.repo.urls)
        return self.repo.urls[rr]   

# SDG


--- NEW FILE logger.py ---
"""
A module for convenient yet powerful file, console, and syslog logging

BASIC USAGE

  from logger import Logger

  log = Logger(threshold=0)    # create the log object and give it
                               # a threshold of 0
  log.log(2, 'all done')       # send a log of priority 2 (not printed)
  log(0, 'error: bandits!')    # send a log of priority 0 (printed)
  log.write(0, stringvar)      # do a raw write on the file object

DESCRIPTION

  Each logging object is given a threshold.  Any messages that are
  then sent to that object are logged only if their priority meets or
  exceeds the threshold.  Lower numerical priority means that a
  message is more important.  For example: if a log object has
  threshold 2, then all messages of priority 2, 1, 0, -1, etc will be
  logged, while those of priority 3, 4, etc. will not.  I suggest the
  following scale:
  
     LOG PRIORITY    MEANING
              -1     failure - cannot be ignored
               0     important message - printed in default mode
               1     informational message - printed with -v
               2     debugging information

        THRESHOLD    MEANING
              -1     quiet mode (-q) only failures are printed
               0     normal operation
               1     verbose mode (-v)
               2     debug mode (-vv or -d)

  It can be extended farther in both directions, but that is rarely
  useful.  It can also be shifted in either direction.  This might be
  useful if you want to supply the threshold directly on the command
  line but have trouble passing in negative numbers.  In that case,
  add 1 to all thresholds and priorities listed above.

CLASSES

  There are three primary classes defined in this module:

    Logger        Class for basic file and console logging
    SysLogger     Class for syslog logging
    LogContainer  Class for wrapping multiple other loggers together
                  for convenient use

  Instances of all of these support the same basic methods:

    obj.log(priority, message)   # log a message with smart formatting
    obj.write(priority, message) # log a string in a ver raw way
    obj(priority, message)       # shorthand for obj.log(...)

  Different classes support other methods as well, but this is what you
  will mostly use.


ADVANCED

  There are a number of options available for these classes.  These are
  documented below in the respective classes and methods.  Here is a
  list of some of the things you can do:

    * make a prefix contain a string which gets repeated for more
      important logs.  (prefix)
    * directly test if a log object WOULD log, so you can do
      complicated stuff, like efficient for loops. (test)
    * make the priority, threshold arbitrary objects, with a
      home-rolled test to see if it should log. (test)
    * give log containers a "master threshold" and define arbitrary
      behavior based on it.  Examples include:
      - only pass on messages of sufficient priority (ragardless of
        the thresholds of the log ojects).
      - only pass on messages to objects whose thresholds are
        (numerically) lower than the master threshold.

SEE ALSO

  Take a look at the examples at the end of this file in the test &
  demo section.

COMMENTS

  I welcome comments, questions, bug reports and requests... I'm very
  lonely. :)
"""

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

# Copyright 2001-2003 Michael D. Stenner

import sys
import string
# syslog is imported from within SysLogger.__init__

AUTHOR  = "Michael D. Stenner <mstenner at phy.duke.edu>"
VERSION = "0.7"
DATE    = "2003/09/20"
URL     = "http://linux.duke.edu/projects/mini/logger/"

class Logger:
    """A class for file-object logging
    
    USAGE:
      from logger import Logger

      log_obj = Logger(THRESHOLD)     # create the instance

      log_obj.log(3, 'message')       # log a message with priority 3
      log_obj(3, 'message')           # same thing
      log_obj(3, ['message'])         # same thing

      log_obj.test(3)                 # boolean - would a message of
                                      # this priority be printed?

      # a raw write call after the priority test, for writing
      # arbitrary text -- (this will not be followed by \\n)
      log_obj.write(3, 'thing\\nto\\nwrite')  

      # generate the prefix used for priority 3
      pr = log_obj.gen_prefix(3)

      # see the examples in the test section for more

    BASIC OPTIONS:

      There are a couple of basic options that are commonly needed.
      These are attribues of instances of class Logger.

        preprefix

          Text that will be printed at the start of each line of
          output (for log()ged, not write()en messages).  This might
          be your program's name, for example.

            log.preprefix = 'myprog'

          If preprefix is callable, then it will be called for each
          log and the returned value will be used.  This is useful for
          printing the current time.

            import time
            def printtime():
                return time.strftime('%m/%d/%y %H:%M:%S ',
                         time.localtime(time.time()))
            log.preprefix = printtime
      
        file_object

          This is the file object to which output is directed.  If it
          is None, then the logs are quietly dropped.

      There are other options described in the next section, but these
      are the most commonly used.

    ATTRIBUTES:
      (all of these are settable as keyword args to __init__)

      ATTRIBUTES   DEFAULT      DESCRIPTION
      ----------------------------------------------------------
      threshold    = 0          how verbose the program should be
      file_object  = sys.stderr file object to which output goes
      prefix       = ''         prefix string - repeated for more
                                important logs
      prefix_depth = 5          times prefix is repeated for logs
                                of priority 0.  Basically, set this
                                one larger than your highest log
                                priority.
      preprefix    = ''         string printed before the prefix
                                if callable, returned string will
                                be used (useful for printing time)
      postprefix   = ''         string printed after the prefix
      default      = 1          default priority to log at

    """

    def __init__(self,
                 threshold    = 0,
                 file_object  = sys.stderr,
                 prefix       = '',
                 prefix_depth = 5,
                 preprefix    = '',
                 postprefix   = '',
                 default      = 1):
        self.threshold    = threshold
        self.file_object  = file_object
        self.prefix       = prefix
        self.prefix_depth = prefix_depth
        self.preprefix    = preprefix
        self.postprefix   = postprefix
        self.default      = default

    def test(self, priority):

        """
        Return true if a log of the given priority would be printed.
        
        This can be overridden to do any test you like.  Specifically,
        priority and threshold need not be integers.  They can be
        arbitrary objects.  You need only override this method, and
        possibly gen_prefix.
        """

        return int(self.threshold) >= int(priority)
        
    def gen_prefix(self, priority):

        """
        Return the full prefix (including pre and post) for the
        given priority.

        If you use prefix and use a more complicated priority and
        verbosity (non-numerical), then you should either give the
        chosen object a __int__ method, or override this function.
        """
        
        if callable(self.preprefix): prefix = self.preprefix()
        else: prefix = self.preprefix

        if self.prefix:
            depth  = self.prefix_depth - int(priority)
            if depth < 1: depth = 1
            for i in range(0, depth):
                prefix = prefix + self.prefix

        return prefix + self.postprefix

    def log(self, priority, message=None):
        """
        Print a log message.  This prepends the prefix to each line
        and does some basic formatting.
        """
        p, m = self._use_default(priority, message)
        if self.test(p):
            if self.file_object is None: return
            if type(m) == type(''): # message is a string
                mlist = string.split(m, '\n')
                if mlist[-1] == '': del mlist[-1] # string ends in \n
            elif type(m) == type([]): # message is a list
                mlist = map(string.rstrip, m)
            else: mlist = [str(m)] # message is other type

            prefix = self.gen_prefix(p)
            for line in mlist:
                self.file_object.write(prefix + line + '\n')

    # make the objects callable
    __call__ = log

    def write(self, priority, message=None):
        """
        Print a log message.  In this case, 'message' must be a string
        as it will be passed directly to the file object's write method.
        """
        p, m = self._use_default(priority, message)
        if self.test(p):
            if self.file_object is None: return
            self.file_object.write(m)

    def _use_default(self, priority, message):
        """Substitute default priority if none was provided"""
        if message == None: return self.default, priority
        else: return priority, message

class SysLogger:
    """A class for file-object logging
    
    USAGE:
      For the most part, SysLogger instances are used just like Logger
      instances.  Notable exceptions:

        * prefixes aren't used (at least not as they are for Logger)
        * map_priority is pretty important because it controls
          conversion between Logger priorities and syslog priorities
        * although priority/threshold/test works the same, there is
          also maskpri and your syslog config which will limit what
          gets logged.  Keep this in mind if you see strange behavior.

      The most sensible use of this class will be will a LogContainer.
      You can create one Logger instance for writing to (say) stderr,
      a second for writing to a verbose log file, and a SysLogger
      instance for writing important things to syslog so your automated
      log-readers can see them.  Then you put them all in a log container
      for convenient access.  That would go something like this:

        from logger import Logger, SysLogger, LogContainer
        
        fo = open(file_log, 'w')
        file_logger    = Logger(4, file_object=fo) # print 4 and lower
        console_logger = Logger(1)                 # print 1 and lower
        syslog_logger  = SysLogger(0)              # print 0 and lower
        log = LogContainer([file_logger, console_logger, syslog_logger])

        log(3,  'some debugging message') # printed to file only
        log(1,  'some warning message')   # printed to file and console
        log(0,  'some error message')     # printed to all (ERR level)
        log(-1, 'major problem')          # printed to all (CRIT level)
      
    ATTRIBUTES:
      (all of these are settable as keyword args to __init__)

      ARGUMENT     DEFAULT      DESCRIPTION
      ----------------------------------------------------------
      threshold    = 0          identical to Logger threshold
      ident        = None       string prepended to each log, if None,
                                it will be taken from the program name
                                as it appears in sys.argv[0]
      logopt       = 0          syslog log options
      facility     = 'LOG_USER' syslog facility (it can be a string)
      maskpri      = 0          syslog priority bitmask
      default      = 1          default priority to log at

    """

    def __init__(self,
                 threshold    = 0,
                 ident        = None,
                 logopt       = 0,
                 facility     = 'LOG_USER',
                 maskpri      = 0,
                 default      = 1):
        # putting imports here is kinda icky, but I don't want to import
        # it if no SysLogger's are ever used.
        global syslog
        import syslog

        self.threshold    = threshold
        self.default      = default

        if ident is None:
            ind = string.rfind(sys.argv[0], '/')
            if ind == -1: ident = sys.argv[0]
            else: ident = sys.argv[0][ind+1:]

        if type(facility) == type(''):
            facility = getattr(syslog, facility)

        syslog.openlog(ident, logopt, facility)
        if maskpri: syslog.setlogmask(maskpri)
        
    def setlogmask(self, maskpri):
        """a (very) thin wrapper over the syslog setlogmask function"""
        return syslog.setlogmask(maskpri)

    def map_priority(self, priority):
        """Take a logger priority and return a syslog priority

        Here are the syslog priorities (from syslog.h):
          LOG_EMERG       0       /* system is unusable */
          LOG_ALERT       1       /* action must be taken immediately */
          LOG_CRIT        2       /* critical conditions */
          LOG_ERR         3       /* error conditions */
          LOG_WARNING     4       /* warning conditions */
          LOG_NOTICE      5       /* normal but significant condition */
          LOG_INFO        6       /* informational */
          LOG_DEBUG       7       /* debug-level messages */

        The syslog priority is simply equal to the logger priority plus 3.

           0 ->  0 + 3 =  3
          -5 -> -5 + 3 = -2  (which will be treated as 0)

        You can override this very simply.  Just do:

        def log_everything_emerg(priority): return 0
        log_obj.map_priority = log_everything_emerg

        The return value of this function does not need to be an integer or
        within the allowed syslog range (0 to 7).  It will be converted to
        an int and forced into this range if it lies outside it.
        """
        return priority + 3

    def test(self, priority):
        """
        Return true if a log of the given priority would be printed.
        
        This can be overridden to do any test you like.  Specifically,
        threshold and threshold need not be integers.  They can be
        arbitrary objects.  If you override this and use non-integer
        priorities, you will also need to override map_priority.
        """
        return int(self.threshold) >= int(priority)

    def log(self, priority, message=None):
        """
        Print a log message with some simple formatting.
        """
        p, m = self._use_default(priority, message)
        if self.test(p):
            if type(m) == type(''): # message is a string
                mlist = string.split(m, '\n')
                if mlist[-1] == '': del mlist[-1] # string ends in \n
            elif type(m) == type([]): # message is a list
                mlist = map(string.rstrip, m)
            else: mlist = [str(m)] # message is other type

            sp = int(self.map_priority(p))
            if sp < 0: sp = 0
            if sp > 7: sp = 7
            for line in mlist: syslog.syslog(sp, line)

    # make the objects callable
    __call__ = log

    def write(self, priority, message=None):
        """
        Print a log message.
        """
        p, m = self._use_default(priority, message)
        if self.test(p):
            sp = int(self.map_priority(p))
            if sp < 0: sp = 0
            if sp > 7: sp = 7
            
            # we must split based on newlines for syslog because
            # it doesn't deal with them well
            mlist = string.split(m, '\n')
            if mlist[-1] == '': del mlist[-1] # string ends in \n
            for message in mlist: syslog.syslog(sp, message)

    def _use_default(self, priority, message):
        """Substitute default priority if none was provided"""
        if message == None: return self.default, priority
        else: return priority, message

class LogContainer:
    """A class for consolidating calls to multiple sub-objects

    SUMMARY:
      If you want a program to log to multiple destinations, it might
      be convenient to use log containers.  A log container is an
      object which can hold several sub-log-objects (including other
      log containers).  When you log to a log container it passes the
      message on (with optional tests) to each of the log objects it
      contains.

    USAGE:

      The basic usage is very simple.  LogContainer's simply pass on
      logs to the contained Logger, SysLogger, or LogContainer
      objects.

        from logger import Logger, LogContainer

        log_1 = Logger(threshold=1, file_object=sys.stdout)
        log_2 = Logger(threshold=2, preprefix='LOG2')

        log = LogContainer([log_1, log_2])

        log(1, 'message')               # printed by log_1 and log_2
        log(2, 'message')               # only printed by log_2

      A more common example would be something like this:
      
        from logger import Logger, LogContainer

        system = Logger(threshold=1, file_object=logfile)
        debug  = Logger(threshold=5, file_object=sys.stdout)
        log = LogContainer([system, debug])

        log(3, 'sent to system and debug, but only debug will print it')
        log(0, 'very important, both will print it')

      In this mode, log containers are just shorthand for calling all
      contained objects with the same priority and message.

      When a log object is held in a container, it can still be used
      directly.  For example, you can still do

        debug(3, ['this will not be sent to the system log, even if its',
                  ' threshold is set very high'])

      (Yes, you can send lists of strings and they will be formatted
      on different lines.  The log methods are pretty smart.)

      There are more examples in the SysLogger docs.

    ATTRIBUTES:
      (all of these are settable as keyword args to __init__)

      ATTRIBUTES   DEFAULT      DESCRIPTION
      ----------------------------------------------------------
      list         = []         list of contained objects
      threshold    = None       meaning depends on test - by default
                                threshold has no effect
      default      = 1          default priority to log at

    """


    def __init__(self, list=[], threshold=None, default=1):
        self.list = list
        self.threshold = threshold
        self.default = default

    def add(self, log_obj):
        """Add a log object to the container."""
        self.list.append(log_obj)

    def log(self, priority, message=None):
        """Log a message to all contained log objects, depending on
        the results of test()
        """
        p, m = self._use_default(priority, message)
        for log_obj in self.list:
            if self.test(p, m, self.threshold, log_obj):
                log_obj.log(p, m)

    __call__ = log
    
    def write(self, priority, message=None):
        p, m = self._use_default(priority, message)
        for log_obj in self.list:
            if self.test(p, m, self.threshold, log_obj):
                log_obj.write(p, m)

    def _use_default(self, priority, message):
        """Substitute default priority if none was provided"""
        if message == None: return self.default, priority
        else: return priority, message

    def test(self, priority, message, threshold, log_obj):
        """Test which log objects should be passed a given message.

        This method is used to determine if a given message (and
        priority) should be passed on to a given log_obj.  The
        container's threshold is also provided.

        This method always returns 1, and is the default, meaning that
        all messages will get passed to all objects.  It is intended
        to be overridden if you want more complex behavior.  To
        override with your own function, just do something like:

          def hell_no(p, m, t, object): return 0
          container.test = hell_no
        """
        return 1

    def test_limit_priority(self, priority, message, threshold, log_obj):
        """Only pass on messages with sufficient priority compared to
        the master threshold.

          container = LogContainer([system, debug], threshold = 2)
          container.test = container.test_limit_priority
        """
        return priority <= threshold
    
    def test_limit_threshold(self, priority, message, threshold, log_obj):
        """Only pass on messages to log objects whose threshold is
        (numerically) lower than the master threshold.

          container = LogContainer([system, debug], threshold = 2)
          container.test = container.test_limit_threshold
        """
        return log_obj.threshold <= threshold
    
if __name__ == '__main__':
    ###### TESTING AND DEMONSTRATION

    threshold = 3
    print 'THRESHOLD = %s' % (threshold)
    log   = Logger(threshold,   preprefix = 'TEST  ')

    print " Lets log a few things!"
    for i in range(-2, 10): log(i, 'log priority %s' % (i))

    print "\n Now make it print the time for each log..."
    import time
    def printtime():
        return time.strftime('%m/%d/%y %H:%M:%S ',time.localtime(time.time()))
    log.preprefix = printtime

    print " and log a few more things"
    for i in range(-2, 10): log(i, 'log priority %s' % (i))
 
    print "\n now create another with a different prefix and priority..."
    print " and put them in a container..."
    log2 = Logger(threshold-2, preprefix = 'LOG2 ')
    cont = LogContainer([log, log2], threshold=0)
    cont.test = cont.test_limit_priority
    
    print " and log a bit more"
    for i in range(-2, 10): cont(i, 'log priority %s' % (i))

    print "\n OK, enough of the container... lets play with formatting"

    stuff = 'abcd\nefgh\nijkl'

    print "\n no trailing newline"
    log(stuff)

    print "\n with trailing newline"
    log(stuff + '\n') # should be the same because the log method
                      # takes care of the newline for you

    print "\n two trailing newlines"
    log(stuff + '\n\n') # should create a "blank" line.  If you use two
                        # newlines, it knows you really wanted one :)
    
    print "\n log JUST a newline"
    log('\n') # should create only a single "blank" line

    print "\n use the write method, with a trailing newline"
    log.write(stuff + '\n') # should just write with no prefix crap
                            # it will _NOT_ quietly tack on a newline

    print "\n print some complex object"
    log(1, {'key': 'value'}) # non-strings should be no trouble

    print "\n now set the file object to None (nothing should be printed)"
    log.file_object = None
    log("THIS SHOULD NOT BE PRINTED")
    log.write("THIS SHOULD NOT BE PRINTED")

    if not (sys.argv[1:] and sys.argv[1] == 'syslog'):
        print '\n skipping syslog test (because they would annoy your admin)'
        print ' add "syslog" to the command line to enable syslog tests'
        sys.exit(0)

    print '\n performing syslog tests'
    print ' creating logger with threshold: 3'
    slog = SysLogger(3, 'logger-test')

    print ' logging at (logger) priorities from -2 to 9 (but only'
    print ' priorities <= 3 should show up'
    for i in range(-2, 10): slog(i, 'log priority %s' % (i))

    print '\n now test the write() method'
    slog.write(0, 'first line\nsecond line\nthird line')


--- NEW FILE mdcache.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University 

import os
import sys
import libxml2
import cPickle

import Errors


class RepodataParser:
    def __init__(self, storedir, callback=None):
        self.storedir = storedir
        self.callback = callback
        self.repodata = {
            'metadata': {}, 
            'filelists': {},
            'otherdata': {}
        }
        self.debug = 0
    
        
    def debugprint(self, msg):
        if self.debug:
            print msg
        
    def _piklFileName(self, location, checksum):
        filename = os.path.basename(location)
        piklfile = os.path.join(self.storedir, filename)
        piklfile = '%s.%s.pickle' % (piklfile, checksum)
        self.debugprint('piklfile=%s' % piklfile)
        return piklfile

    def _pickle(self, outfile, obj):
        self.debugprint('Trying to pickle into %s' % outfile)
        try: outfh = open(outfile, 'w')
        except IOError, e: 
            raise cPickle.PicklingError(e)
        try: cPickle.dump(obj, outfh, cPickle.HIGHEST_PROTOCOL)
        except AttributeError: cPickle.dump(obj, outfh, 1)
        self.debugprint('Pickle successful!')
        outfh.close()

    def _unpickle(self, infile):
        self.debugprint('Trying to unpickle from %s' % infile)
        try: infh = open(infile)
        except IOError, e: raise cPickle.UnpicklingError(e)
        obj = cPickle.load(infh)
        infh.close()
        self.debugprint('Unpickle successful!')
        return obj

    def _killold(self, location):
        filename = os.path.basename(location)
        dirfiles = os.listdir(self.storedir)
        for dirfile in dirfiles:
            if dirfile[-7:] == '.pickle':
                if dirfile[:len(filename)] == filename:
                    oldpickle = os.path.join(self.storedir, dirfile)
                    self.debugprint('removing old pickle file %s' % oldpickle)
                    try: os.unlink(oldpickle)
                    except OSError:
                        ## Give an error or something
                        pass
        
    def _getGeneric(self, ident, location, checksum):
        databank = self.repodata[ident]
        if databank: return databank
        if checksum is None:
            ##
            # Pass checksum as None to ignore pickling. This will
            # Go straight to xml files.
            return self.parseDataFromXml(location)
        piklfile = self._piklFileName(location, checksum)
        try: 
            databank = self._unpickle(piklfile)
            self.repodata[ident] = databank
            return databank
        except cPickle.UnpicklingError, e: 
            self.debugprint('Could not unpickle: %s!' % e)
            databank = self.parseDataFromXml(location)
            self._killold(location)
            try: self._pickle(piklfile, databank)
            except cPickle.PicklingError:
                self.debugprint('Could not pickle %s data in %s' % (ident, piklfile))
            return databank
        
    def getPrimary(self, location, checksum):
        return self._getGeneric('metadata', location, checksum)

    def getFilelists(self, location, checksum):
        return self._getGeneric('filelists', location, checksum)

    def getOtherdata(self, location, checksum):
        return self._getGeneric('otherdata', location, checksum)

    def parseDataFromXml(self, fileloc):
        ## TODO: Fail sanely.
        self.debugprint('Parsing data from %s' % fileloc)
        reader = libxml2.newTextReaderFilename(fileloc)
        count = 0
        total = 9999
        mode = None
        databank = None
        while reader.Read():
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name in ('metadata', 'filelists', 'otherdata'):
                mode = name
                databank = self.repodata[mode]
                try: total = int(reader.GetAttribute('packages'))
                except ValueError: pass
            elif name == 'package':
                count += 1
                if mode == 'metadata':
                    obj = PrimaryEntry(reader)
                    pkgid = obj.checksum['value']
                    #if pkgid in databank.keys():
                    #    print 'double detected!'
                    #    print databank[pkgid].nevra, 'vs', obj.nevra
                    if pkgid: databank[pkgid] = obj
                elif mode == 'filelists':
                    pkgid = reader.GetAttribute('pkgid')
                    if pkgid:
                        obj = FilelistsEntry(reader)
                        databank[pkgid] = obj
                elif mode == 'otherdata':
                    pkgid = reader.GetAttribute('pkgid')
                    if pkgid:
                        obj = OtherEntry(reader)
                        databank[pkgid] = obj
                if self.callback: 
                    self.callback.progressbar(count, total, 'MD Read')
        self.debugprint('Parsed %s packages' % count)
        reader.Close()
        del reader
        return databank

class BaseEntry:
    def _props(self, reader):
        if not reader.HasAttributes(): return {}
        propdict = {}
        reader.MoveToFirstAttribute()
        while 1:
            propdict[reader.LocalName()] = reader.Value()
            if not reader.MoveToNextAttribute(): break
        reader.MoveToElement()
        return propdict
        
    def _value(self, reader):
        if reader.IsEmptyElement(): return ''
        val = ''
        while reader.Read():
            if reader.NodeType() == 3: val += reader.Value()
            else: break
        return val

    def _getFileEntry(self, reader):
        type = 'file'
        props = self._props(reader)
        if props.has_key('type'): type = props['type']
        value = self._value(reader)
        return (type, value)

class PrimaryEntry(BaseEntry):
    def __init__(self, reader):
        self.nevra = (None, None, None, None, None)
        self.checksum = {'type': None, 'pkgid': None, 'value': None}
        self.info = {
            'summary': None,
            'description': None,
            'packager': None,
            'url': None,
            'license': None,
            'vendor': None,
            'group': None,
            'buildhost': None,
            'sourcerpm': None
        }
        self.time = {'file': None, 'build': None}
        self.size = {'package': None, 'installed': None, 'archive': None}
        self.location = {'href': None, 'value': None, 'base': None}
        self.hdrange = {'start': None, 'end': None}
        self.prco = {}
        self.files = {}

        n = e = v = r = a = None
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == 'package':
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name == 'name': n = self._value(reader)
            elif name == 'arch': a = self._value(reader)
            elif name == 'version': 
                evr = self._props(reader)
                (e, v, r) = (evr['epoch'], evr['ver'], evr['rel'])
            elif name in ('summary', 'description', 'packager', 'url'): 
                self.info[name] = self._value(reader)
            elif name == 'checksum': 
                self.checksum = self._props(reader)
                self.checksum['value'] = self._value(reader)
            elif name == 'location': 
                self.location = self._props(reader)
                self.location['value'] = self._value(reader)
            elif name == 'time':
                self.time = self._props(reader)
            elif name == 'size':
                self.size = self._props(reader)
            elif name == 'format': self.setFormat(reader)
        self.nevra = (n, e, v, r, a)

    def dump(self):
        print 'nevra=%s,%s,%s,%s,%s' % self.nevra
        print 'checksum=%s' % self.checksum
        print 'info=%s' % self.info
        print 'time=%s' % self.time
        print 'size=%s' % self.size
        print 'location=%s' % self.location
        print 'hdrange=%s' % self.hdrange
        print 'prco=%s' % self.prco
        print 'files=%s' % self.files

    def setFormat(self, reader):
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == 'format':
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name in ('license', 'vendor', 'group', 'buildhost',
                        'sourcerpm'):
                self.info[name] = self._value(reader)
            elif name in ('provides', 'requires', 'conflicts', 
                          'obsoletes'):
                self.setPrco(reader)
            elif name == 'header-range':
                self.hdrange = self._props(reader)
            elif name == 'file':
                (type, value) = self._getFileEntry(reader)
                self.files[value] = type

    def setPrco(self, reader):
        members = []
        myname = reader.LocalName()
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == myname:
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            members.append(self._props(reader))
        self.prco[myname] = members

class FilelistsEntry(BaseEntry):
    def __init__(self, reader):
        self.files = {}
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == 'package':
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name == 'file':
                (type, value) = self._getFileEntry(reader)
                self.files[value] = type
                
    def dump(self):
        print 'files=%s' % self.files

class OtherEntry(BaseEntry):
    def __init__(self, reader):
        self.changelog = []
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == 'package':
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name == 'changelog':
                entry = self._props(reader)
                entry['value'] = self._value(reader)
                self.changelog.append(entry)

    def dump(self):
        print 'changelog=%s' % self.changelog

def test(level, repodir, storedir, checksum):
    import time
    primary = os.path.join(repodir, 'primary.xml')
    filelists = os.path.join(repodir, 'filelists.xml')
    otherdata = os.path.join(repodir, 'other.xml')
    tick = time.time()
    bigtick = tick
    rp = RepodataParser(storedir)
    rp.getPrimary(primary, checksum)
    print 'operation took: %d seconds' % (time.time() - tick)
    print 'primary has %s entries' % len(rp.repodata['metadata'].keys())
    tick = time.time()
    if level == 'filelists' or level == 'other':
        rp.getFilelists(filelists, checksum)
        print 'operation took: %d seconds' % (time.time() - tick)
        print 'filelists has %s entries' % len(rp.repodata['filelists'].keys())
        tick = time.time()
    if level == 'other':
        rp.getOtherdata(otherdata, checksum)
        print 'operation took: %d seconds' % (time.time() - tick)
        print 'otherdata has %s entries' % len(rp.repodata['otherdata'].keys())
    print
    print 'total operation time: %d seconds' % (time.time() - bigtick)

def testusage():
    print 'Usage: %s level repodir storedir checksum' % sys.argv[0]
    print 'level can be primary, filelists, other'
    print 'repodir is the location of .xml files'
    print 'storedir is where pickles will be saved'
    print 'checksum can be anything you want it to be'
    sys.exit(1)
    
if __name__ == '__main__':
    try: (level, repodir, storedir, checksum) = sys.argv[1:]
    except ValueError: testusage()
    if level not in ('primary', 'filelists', 'other'): testusage()
    if checksum == 'None': checksum = None
    test(level, repodir, storedir, checksum)


--- NEW FILE mdparser.py ---

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 

import gzip
from cElementTree import iterparse

try:
    from cStringIO import StringIO
except ImportError:
    from StringIO import StringIO

#TODO: document everything here

class MDParser:

    def __init__(self, filename):

        # Set up mapping of meta types to handler classes 
        handlers = {
            '{http://linux.duke.edu/metadata/common}metadata': PrimaryEntry,
            '{http://linux.duke.edu/metadata/filelists}filelists': FilelistsEntry,
            '{http://linux.duke.edu/metadata/other}otherdata': OtherEntry,
        }
            
        self.total = None
        self.count = 0
        self._handlercls = None

        # Read in type, set package node handler and get total number of
        # packages
        if filename[-3:] == '.gz': fh = gzip.open(filename, 'r')
        else: fh = open(filename, 'r')
        parser = iterparse(fh, events=('start', 'end'))
        self.reader = parser.__iter__()
        event, elem = self.reader.next()
        self._handlercls = handlers.get(elem.tag, None)
        if not self._handlercls:
            raise ValueError('Unknown repodata type "%s" in %s' % (
                elem.tag, filename))
        # Get the total number of packages
        total = elem.get('packages', None)
        self.total = total is None and None or int(total)

    def __iter__(self):
        return self

    def next(self):
        for event, elem in self.reader:
            if event == 'end' and elem.tag[-7:] == 'package':
                self.count += 1
                return self._handlercls(elem)
        raise StopIteration


class BaseEntry:
    def __init__(self, elem):
        self._p = {} 

    def __getitem__(self, k):
        return self._p[k]

    def keys(self):
        return self._p.keys()

    def values(self):
        return self._p.values()

    def has_key(self, k):
        return self._p.has_key(k)

    def __str__(self):
        out = StringIO()
        keys = self.keys()
        keys.sort()
        for k in keys:
            line = u'%s=%s\n' % (k, self[k])
            out.write(line.encode('utf8'))
        return out.getvalue()

    def _bn(self, qn):
        if qn.find('}') == -1: return qn 
        return qn.split('}')[1]
        
    def _prefixprops(self, elem, prefix):
        ret = {}
        for key in elem.attrib.keys():
            ret[prefix + '_' + self._bn(key)] = elem.attrib[key]
        return ret

class PrimaryEntry(BaseEntry):
    def __init__(self, elem):
        BaseEntry.__init__(self, elem)
        # Avoid excess typing :)
        p = self._p

        self.prco = {}
        self.files = {}

        for child in elem:
            name = self._bn(child.tag)
            if name in ('name', 'arch', 'summary', 'description', 'url', 
                    'packager'): 
                p[name] = child.text

            elif name == 'version': 
                p.update(child.attrib)

            elif name in ('time', 'size'):
                p.update(self._prefixprops(child, name))

            elif name in ('checksum', 'location'): 
                p.update(self._prefixprops(child, name))
                p[name + '_value'] = child.text
                if name == 'location' and not p.has_key("location_base"):
                    p["location_base"] = None
            
            elif name == 'format': 
                self.setFormat(child)

        p['pkgId'] = p['checksum_value']
        elem.clear()

    def setFormat(self, elem):

        # Avoid excessive typing :)
        p = self._p

        for child in elem:
            name = self._bn(child.tag)

            if name in ('license', 'vendor', 'group', 'buildhost',
                        'sourcerpm'):
                p[name] = child.text

            elif name in ('provides', 'requires', 'conflicts', 
                          'obsoletes'):
                self.prco[name] = self.getPrco(child)

            elif name == 'header-range':
                p.update(self._prefixprops(child, 'rpm_header'))

            elif name == 'file':
                type = child.get('type', 'file')
                path = child.text
                self.files[path] = type

    def getPrco(self, elem):
        members = []
        for child in elem:
            name = self._bn(child.tag)
            members.append(child.attrib)
        return members
        
        
class FilelistsEntry(BaseEntry):
    def __init__(self, elem):
        BaseEntry.__init__(self, elem)
        self._p['pkgId'] = elem.attrib['pkgid']
        self.files = {}
        for child in elem:
            name = self._bn(child.tag)
            if name == 'file':
                type = child.get('type', 'file')
                path = child.text
                self.files[path] = type
        elem.clear()
                
class OtherEntry(BaseEntry):
    def __init__(self, elem):
        BaseEntry.__init__(self, elem)
        self._p['pkgId'] = elem.attrib['pkgid']
        self._p['changelog'] = []
        for child in elem:
            name = self._bn(child.tag)
            if name == 'changelog':
                entry = child.attrib
                entry['value'] = child.text
                self._p['changelog'].append(entry)
        elem.clear()



def test():
    import sys

    parser = MDParser(sys.argv[1])

    for pkg in parser:
        print '-' * 40
        print pkg
        pass

    print 'read: %s packages (%s suggested)' % (parser.count, parser.total)

if __name__ == '__main__':
    test()


--- NEW FILE misc.py ---
import types
import string
import os
import os.path
from cStringIO import StringIO
import base64
import struct
import re
import pgpmsg
import tempfile
import glob
import rpm
import pwd
from stat import *

import rpmUtils
from Errors import MiscError

###########
# Title: Remove duplicates from a sequence
# Submitter: Tim Peters 
# From: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560                      
    
def unique(s):
    """Return a list of the elements in s, but without duplicates.

    For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3],
    unique("abcabc") some permutation of ["a", "b", "c"], and
    unique(([1, 2], [2, 3], [1, 2])) some permutation of
    [[2, 3], [1, 2]].

    For best speed, all sequence elements should be hashable.  Then
    unique() will usually work in linear time.

    If not possible, the sequence elements should enjoy a total
    ordering, and if list(s).sort() doesn't raise TypeError it's
    assumed that they do enjoy a total ordering.  Then unique() will
    usually work in O(N*log2(N)) time.

    If that's not possible either, the sequence elements must support
    equality-testing.  Then unique() will usually work in quadratic
    time.
    """

    n = len(s)
    if n == 0:
        return []

    # Try using a dict first, as that's the fastest and will usually
    # work.  If it doesn't work, it will usually fail quickly, so it
    # usually doesn't cost much to *try* it.  It requires that all the
    # sequence elements be hashable, and support equality comparison.
    u = {}
    try:
        for x in s:
            u[x] = 1
    except TypeError:
        del u  # move on to the next method
    else:
        return u.keys()

    # We can't hash all the elements.  Second fastest is to sort,
    # which brings the equal elements together; then duplicates are
    # easy to weed out in a single pass.
    # NOTE:  Python's list.sort() was designed to be efficient in the
    # presence of many duplicate elements.  This isn't true of all
    # sort functions in all languages or libraries, so this approach
    # is more effective in Python than it may be elsewhere.
    try:
        t = list(s)
        t.sort()
    except TypeError:
        del t  # move on to the next method
    else:
        assert n > 0
        last = t[0]
        lasti = i = 1
        while i < n:
            if t[i] != last:
                t[lasti] = last = t[i]
                lasti += 1
            i += 1
        return t[:lasti]

    # Brute force is all that's left.
    u = []
    for x in s:
        if x not in u:
            u.append(x)
    return u

def checksum(sumtype, file, CHUNK=2**16):
    """takes filename, hand back Checksum of it
       sumtype = md5 or sha
       filename = /path/to/file
       CHUNK=65536 by default"""
       
    # chunking brazenly lifted from Ryan Tomayko
    try:
        if type(file) is not types.StringType:
            fo = file # assume it's a file-like-object
        else:           
            fo = open(file, 'r', CHUNK)
            
        if sumtype == 'md5':
            import md5
            sum = md5.new()
        elif sumtype == 'sha':
            import sha
            sum = sha.new()
        else:
            raise MiscError, 'Error Checksumming file, bad checksum type %s' % sumtype
        chunk = fo.read
        while chunk: 
            chunk = fo.read(CHUNK)
            sum.update(chunk)

        if type(file) is types.StringType:
            fo.close()
            del fo
            
        return sum.hexdigest()
    except (IOError, OSError), e:
        raise MiscError, 'Error opening file for checksum: %s' % file

def getFileList(path, ext, filelist):
    """Return all files in path matching ext, store them in filelist, 
       recurse dirs return list object"""
    
    extlen = len(ext)
    try:
        dir_list = os.listdir(path)
    except OSError, e:
        raise MiscError, ('Error accessing directory %s, %s') % (path, e)
        
    for d in dir_list:
        if os.path.isdir(path + '/' + d):
            filelist = getFileList(path + '/' + d, ext, filelist)
        else:
            if string.lower(d[-extlen:]) == '%s' % (ext):
               newpath = os.path.normpath(path + '/' + d)
               filelist.append(newpath)
                    
    return filelist

class GenericHolder:
    """Generic Holder class used to hold other objects of known types
       It exists purely to be able to do object.somestuff, object.someotherstuff
       or object[key] and pass object to another function that will 
       understand it"""
       
    def __getitem__(self, item):
        if hasattr(self, item):
            return getattr(self, item)
        else:
            raise KeyError, item

def procgpgkey(rawkey):
    '''Convert ASCII armoured GPG key to binary
    '''
    # TODO: CRC checking? (will RPM do this anyway?)
    
    # Normalise newlines
    rawkey = re.compile('(\n|\r\n|\r)').sub('\n', rawkey)

    # Extract block
    block = StringIO()
    inblock = 0
    pastheaders = 0
    for line in rawkey.split('\n'):
        if line.startswith('-----BEGIN PGP PUBLIC KEY BLOCK-----'):
            inblock = 1
        elif inblock and line.strip() == '':
            pastheaders = 1
        elif inblock and line.startswith('-----END PGP PUBLIC KEY BLOCK-----'):
            # Hit the end of the block, get out
            break
        elif pastheaders and line.startswith('='):
            # Hit the CRC line, don't include this and stop
            break
        elif pastheaders:
            block.write(line+'\n')
  
    # Decode and return
    return base64.decodestring(block.getvalue())

def getgpgkeyinfo(rawkey):
    '''Return a dict of info for the given ASCII armoured key text

    Returned dict will have the following keys: 'userid', 'keyid', 'timestamp'

    Will raise ValueError if there was a problem decoding the key.
    '''
    # Catch all exceptions as there can be quite a variety raised by this call
    try:
        key = pgpmsg.decode_msg(rawkey)
    except Exception, e:
        raise ValueError(str(e))
    if key is None:
        raise ValueError('No key found in given key data')

    keyid_blob = key.public_key.key_id()

    info = {
        'userid': key.user_id,
        'keyid': struct.unpack('>Q', keyid_blob)[0],
        'timestamp': key.public_key.timestamp,
    }

    # Retrieve the timestamp from the matching signature packet 
    # (this is what RPM appears to do) 
    for userid in key.user_ids[0]:
        if not isinstance(userid, pgpmsg.signature):
            continue

        if userid.key_id() == keyid_blob:
            # Get the creation time sub-packet if available
            if hasattr(userid, 'hashed_subpaks'):
                tspkt = \
                    userid.get_hashed_subpak(pgpmsg.SIG_SUB_TYPE_CREATE_TIME)
                if tspkt != None:
                    info['timestamp'] = int(tspkt[1])
                    break
        
    return info

def keyIdToRPMVer(keyid):
    '''Convert an integer representing a GPG key ID to the hex version string
    used by RPM
    '''
    return "%08x" % (keyid & 0xffffffffL)


def keyInstalled(ts, keyid, timestamp):
    '''Return if the GPG key described by the given keyid and timestamp are
    installed in the rpmdb.  

    The keyid and timestamp should both be passed as integers.
    The ts is an rpm transaction set object

    Return values:
        -1      key is not installed
        0       key with matching ID and timestamp is installed
        1       key with matching ID is installed but has a older timestamp
        2       key with matching ID is installed but has a newer timestamp

    No effort is made to handle duplicates. The first matching keyid is used to 
    calculate the return result.
    '''
    # Convert key id to 'RPM' form
    keyid = keyIdToRPMVer(keyid)

    # Search
    for hdr in ts.dbMatch('name', 'gpg-pubkey'):
        if hdr['version'] == keyid:
            installedts = int(hdr['release'], 16)
            if installedts == timestamp:
                return 0
            elif installedts < timestamp:
                return 1    
            else:
                return 2

    return -1

def getCacheDir(tmpdir='/var/tmp'):
    """return a path to a valid and safe cachedir - only used when not running
       as root or when --tempcache is set"""
    
    uid = os.geteuid()
    try:
        usertup = pwd.getpwuid(uid)
        username = usertup[0]
    except KeyError:
        return None # if it returns None then, well, it's bollocksed

    # check for /var/tmp/yum-username-* - 
    prefix = 'yum-%s-' % username    
    dirpath = '%s/%s*' % (tmpdir, prefix)
    cachedirs = glob.glob(dirpath)
    
    for thisdir in cachedirs:
        stats = os.lstat(thisdir)
        if S_ISDIR(stats[0]) and S_IMODE(stats[0]) == 448 and stats[4] == uid:
            return thisdir

    # make the dir (tempfile.mkdtemp())
    cachedir = tempfile.mkdtemp(prefix=prefix, dir=tmpdir)
    return cachedir

def sortPkgObj(pkg1 ,pkg2):
    """sorts a list of yum package objects by name"""
    if pkg1.name > pkg2.name:
        return 1
    elif pkg1.name == pkg2.name:
        return 0
    else:
        return -1
        


--- NEW FILE packages.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University 
# Written by Seth Vidal <skvidal at phy.duke.edu>

import rpm
import os
import os.path
import misc
import re
import types
import fnmatch
import rpmUtils
import rpmUtils.arch
import rpmUtils.miscutils
import Errors

import repomd.packageObject

base=None

def buildPkgRefDict(pkgs):
    """take a list of pkg objects and return a dict the contains all the possible
       naming conventions for them eg: for (name,i386,0,1,1)
       dict[name] = (name, i386, 0, 1, 1)
       dict[name.i386] = (name, i386, 0, 1, 1)
       dict[name-1-1.i386] = (name, i386, 0, 1, 1)       
       dict[name-1] = (name, i386, 0, 1, 1)       
       dict[name-1-1] = (name, i386, 0, 1, 1)
       dict[0:name-1-1.i386] = (name, i386, 0, 1, 1)
       dict[name-0:1-1.i386] = (name, i386, 0, 1, 1)
       """
    pkgdict = {}
    for pkg in pkgs:
        pkgtup = (pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)
        (n, a, e, v, r) = pkgtup
        name = n
        nameArch = '%s.%s' % (n, a)
        nameVerRelArch = '%s-%s-%s.%s' % (n, v, r, a)
        nameVer = '%s-%s' % (n, v)
        nameVerRel = '%s-%s-%s' % (n, v, r)
        envra = '%s:%s-%s-%s.%s' % (e, n, v, r, a)
        nevra = '%s-%s:%s-%s.%s' % (n, e, v, r, a)
        for item in [name, nameArch, nameVerRelArch, nameVer, nameVerRel, envra, nevra]:
            if not pkgdict.has_key(item):
                pkgdict[item] = []
            pkgdict[item].append(pkg)
            
    return pkgdict
       
def parsePackages(pkgs, usercommands, casematch=0):
    """matches up the user request versus a pkg list:
       for installs/updates available pkgs should be the 'others list' 
       for removes it should be the installed list of pkgs
       takes an optional casematch option to determine if case should be matched
       exactly. Defaults to not matching."""

    pkgdict = buildPkgRefDict(pkgs)
    exactmatch = []
    matched = []
    unmatched = []
    for command in usercommands:
        if pkgdict.has_key(command):
            exactmatch.extend(pkgdict[command])
            del pkgdict[command]
        else:
            # anything we couldn't find a match for
            # could mean it's not there, could mean it's a wildcard
            if re.match('.*[\*,\[,\],\{,\},\?].*', command):
                trylist = pkgdict.keys()
                restring = fnmatch.translate(command)
                if casematch:
                    regex = re.compile(restring) # case sensitive
                else:
                    regex = re.compile(restring, flags=re.I) # case insensitive
                foundit = 0
                for item in trylist:
                    if regex.match(item):
                        matched.extend(pkgdict[item])
                        del pkgdict[item]
                        foundit = 1
 
                if not foundit:    
                    unmatched.append(command)
                    
            else:
                # we got nada
                unmatched.append(command)

    matched = misc.unique(matched)
    unmatched = misc.unique(unmatched)
    exactmatch = misc.unique(exactmatch)
    return exactmatch, matched, unmatched


# goal for the below is to have a packageobject that can be used by generic
# functions independent of the type of package - ie: installed or available
class YumAvailablePackage(repomd.packageObject.PackageObject, repomd.packageObject.RpmBase):
    """derived class for the repomd packageobject and RpmBase packageobject yum
       uses this for dealing with packages in a repository"""

    def __init__(self, pkgdict, repoid):
        repomd.packageObject.PackageObject.__init__(self)
        repomd.packageObject.RpmBase.__init__(self)
        
        self.importFromDict(pkgdict, repoid)
        # quick, common definitions
        self.name = self.returnSimple('name')
        self.epoch = self.returnSimple('epoch')
        self.version = self.returnSimple('version')
        self.release = self.returnSimple('release')
        self.ver = self.returnSimple('version')
        self.rel = self.returnSimple('release')
        self.arch = self.returnSimple('arch')
        self.repoid = self.returnSimple('repoid')
        self.pkgtup = self._pkgtup()
        self.state = None
        
    def size(self):
        return self.returnSimple('packagesize')

    def _pkgtup(self):
        return self.returnPackageTuple()

    def printVer(self):
        """returns a printable version string - including epoch, if it's set"""
        if self.epoch != '0':
            ver = '%s:%s-%s' % (self.epoch, self.version, self.release)
        else:
            ver = '%s-%s' % (self.version, self.release)
        
        return ver
    
    def compactPrint(self):
        ver = self.printVer()
        return "%s.%s %s" % (self.name, self.arch, ver)

    def returnLocalHeader(self):
        """returns an rpm header object from the package object's local
           header cache"""
        
        if os.path.exists(self.localHdr()):
            try: 
                hlist = rpm.readHeaderListFromFile(self.localHdr())
                hdr = hlist[0]
            except (rpm.error, IndexError):
                raise Errors.RepoError, 'Cannot open package header'
        else:
            raise Errors.RepoError, 'Package Header Not Available'

        return hdr

    def getProvidesNames(self):
        """returns a list of providesNames"""
        
        provnames = []
        prov = self.returnPrco('provides')
        
        for (name, flag, vertup) in prov:
            provnames.append(name)

        return provnames
       
    def localPkg(self):
        """return path to local package (whether it is present there, or not)"""
        if not hasattr(self, 'localpath'):
            repo = base.repos.getRepo(self.repoid)
            remote = self.returnSimple('relativepath')
            rpmfn = os.path.basename(remote)
            self.localpath = repo.pkgdir + '/' + rpmfn
        return self.localpath

    def localHdr(self):
        """return path to local cached Header file downloaded from package 
           byte ranges"""
           
        if not hasattr(self, 'hdrpath'):
            repo = base.repos.getRepo(self.repoid)
            pkgpath = self.returnSimple('relativepath')
            pkgname = os.path.basename(pkgpath)
            hdrname = pkgname[:-4] + '.hdr'
            self.hdrpath = repo.hdrdir + '/' + hdrname

        return self.hdrpath
    
    def prcoPrintable(self, prcoTuple):
        """convert the prco tuples into a nicer human string"""
        (name, flag, (e, v, r)) = prcoTuple
        flags = {'GT':'>', 'GE':'>=', 'EQ':'=', 'LT':'<', 'LE':'<='}
        if flag is None:
            return name
        
        base = '%s %s ' % (name, flags[flag])
        if e not in [0, '0', None]:
            base += '%s:' % e
        if v is not None:
            base += '%s' % v
        if r is not None:
            base += '-%s' % r
        
        return base
    
    def requiresList(self):
        """return a list of requires in normal rpm format"""
        
        reqlist = []
        
        for prcoTuple in self.returnPrco('requires'):
            prcostr = self.prcoPrintable(prcoTuple)
            reqlist.append(prcostr)
        
        return reqlist
        
    def importFromDict(self, pkgdict, repoid):
        """handles an mdCache package dictionary item to populate out 
           the package information"""
        
        self.simple['repoid'] = repoid
        # translates from the pkgdict, populating out the information for the
        # packageObject
        
        if hasattr(pkgdict, 'nevra'):
            (n, e, v, r, a) = pkgdict.nevra
            self.simple['name'] = n
            self.simple['epoch'] = e
            self.simple['version'] = v
            self.simple['arch'] = a
            self.simple['release'] = r
        
        if hasattr(pkgdict, 'time'):
            self.simple['buildtime'] = pkgdict.time['build']
            self.simple['filetime'] = pkgdict.time['file']
        
        if hasattr(pkgdict, 'size'):
            self.simple['packagesize'] = pkgdict.size['package']
            self.simple['archivesize'] = pkgdict.size['archive']
            self.simple['installedsize'] = pkgdict.size['installed']
        
        if hasattr(pkgdict, 'location'):
            if not pkgdict.location.has_key('base'):
                url = None
            elif pkgdict.location['base'] == '':
                url = None
            else:
                url = pkgdict.location['base']

            self.simple['basepath'] = url
            self.simple['relativepath'] = pkgdict.location['href']
        
        if hasattr(pkgdict, 'hdrange'):
            self.simple['hdrstart'] = pkgdict.hdrange['start']
            self.simple['hdrend'] = pkgdict.hdrange['end']
        
        if hasattr(pkgdict, 'info'):
            infodict = pkgdict.info
            for item in ['summary', 'description', 'packager', 'group',
                         'buildhost', 'sourcerpm', 'url', 'vendor']:
                self.simple[item] = infodict[item]
            
            self.licenses.append(infodict['license'])
        
        if hasattr(pkgdict, 'files'):
            for file in pkgdict.files.keys():
                ftype = pkgdict.files[file]
                if not self.files.has_key(ftype):
                    self.files[ftype] = []
                self.files[ftype].append(file)
        
        if hasattr(pkgdict, 'prco'):
            for rtype in pkgdict.prco.keys():
                for rdict in pkgdict.prco[rtype]:
                    name = rdict['name']
                    f = e = v = r  = None
                    if rdict.has_key('flags'): f = rdict['flags']
                    if rdict.has_key('epoch'): e = rdict['epoch']
                    if rdict.has_key('ver'): v = rdict['ver']
                    if rdict.has_key('rel'): r = rdict['rel']
                    self.prco[rtype].append((name, f, (e,v,r)))

        if hasattr(pkgdict, 'changelog'):
            for cdict in pkgdict.changelog:
                date = text = author = None
                if cdict.has_key('date'): date = cdict['date']
                if cdict.has_key('value'): text = cdict['value']
                if cdict.has_key('author'): author = cdict['author']
                self.changelog.append((date, author, text))
        
        if hasattr(pkgdict, 'checksum'):
            ctype = pkgdict.checksum['type']
            csum = pkgdict.checksum['value']
            csumid = pkgdict.checksum['pkgid']
            if csumid is None or csumid.upper() == 'NO':
                csumid = 0
            elif csumid.upper() == 'YES':
                csumid = 1
            else:
                csumid = 0
            self.checksums.append((ctype, csum, csumid))
            


class YumInstalledPackage(YumAvailablePackage):
    """super class for dealing with packages in the rpmdb"""
    def __init__(self, hdr):
        """hand in an rpm header, we'll assume it's installed and query from there"""
        self.hdr = hdr
        self.name = self.tagByName('name')
        self.arch = self.tagByName('arch')
        self.epoch = self.doepoch()
        self.version = self.tagByName('version')
        self.release = self.tagByName('release')
        self.ver = self.tagByName('version')
        self.rel = self.tagByName('release')
        self.pkgtup = self._pkgtup()
        self.repoid = 'installed'
        self.summary = self.tagByName('summary')
        self.description = self.tagByName('description')
        self.pkgid = self.tagByName(rpm.RPMTAG_SHA1HEADER)
        self.state = None
        
    def __str__(self):
        if self.epoch == '0':
            val = '%s - %s-%s.%s' % (self.name, self.version, self.release, 
                                        self.arch)
        else:
            val = '%s - %s:%s-%s.%s' % (self.name, self.epoch, self.version,
                                           self.release, self.arch)
        return val

    def tagByName(self, tag):
        data = self.hdr[tag]
        return data
    
    def doepoch(self):
        tmpepoch = self.hdr['epoch']
        if tmpepoch is None:
            epoch = '0'
        else:
            epoch = str(tmpepoch)
        
        return epoch
    
    def returnSimple(self, thing):
        if hasattr(self, thing):
            return getattr(self, thing)
        else:
            return self.tagByName(thing)

    def returnLocalHeader(self):
        return self.hdr


    def getProvidesNames(self):
        """returns a list of providesNames"""
        
        provnames = self.tagByName('providename')
        if type(provnames) is not types.ListType():
            if type(provnames) is types.StringType():
                provnames = [provnames]
            else:
                provnames = []

        return provnames

    def requiresList(self):
        """return a list of all of the strings of the package requirements"""
        reqlist = []
        names = self.hdr[rpm.RPMTAG_REQUIRENAME]
        flags = self.hdr[rpm.RPMTAG_REQUIREFLAGS]
        ver = self.hdr[rpm.RPMTAG_REQUIREVERSION]
        if names is not None:
            tmplst = zip(names, flags, ver)
        
        for (n, f, v) in tmplst:
            req = rpmUtils.miscutils.formatRequire(n, v, f)
            reqlist.append(req)
        
        return reqlist

    def _pkgtup(self):
        return (self.name, self.arch, self.epoch, self.version, self.release)
    
    def size(self):
        return self.tagByName('size')

    def printVer(self):
        """returns a printable version string - including epoch, if it's set"""
        if self.epoch != '0':
            ver = '%s:%s-%s' % (self.epoch, self.version, self.release)
        else:
            ver = '%s-%s' % (self.version, self.release)
        
        return ver
    
    def compactPrint(self):
        ver = self.printVer()
        return "%s.%s %s" % (self.name, self.arch, ver)
    

class YumLocalPackage(YumInstalledPackage):
    """Class to handle an arbitrary package from a file path
       this inherits most things from YumInstalledPackage because
       installed packages and an arbitrary package on disk act very
       much alike. init takes a ts instance and a filename/path 
       to the package."""

    def __init__(self, ts=None, filename=None):
        if ts is None:
            raise Errors.MiscError, \
                 'No Transaction Set Instance for YumLocalPackage instance creation'
        if filename is None:
            raise Errors.MiscError, \
                 'No Filename specified for YumLocalPackage instance creation'
                 
        self.pkgtype = 'local'
        self.localpath = filename
        self.repoid = filename
        try:
            self.hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.localpath)
        except rpmUtils.RpmUtilsError, e:
            raise Errors.MiscError, \
                'Could not open local rpm file: %s' % self.localpath
        self.name = self.tagByName('name')
        self.arch = self.tagByName('arch')
        self.epoch = self.doepoch()
        self.version = self.tagByName('version')
        self.release = self.tagByName('release')
        self.ver = self.tagByName('version')
        self.rel = self.tagByName('release')
        self.summary = self.tagByName('summary')
        self.description = self.tagByName('description')
        self.pkgtup = self._pkgtup()
        self.state = None
    
    def _pkgtup(self):
        return (self.name, self.arch, self.epoch, self.version, self.release)
    
    def localPkg(self):
        return self.localpath
    
        


            
        
    
    


--- NEW FILE parser.py ---
import re
import glob
import shlex
import string
import urlparse
import urlgrabber
import os.path
from ConfigParser import ConfigParser, NoSectionError, NoOptionError

#TODO: better handling of recursion
#TODO: ability to handle bare includes (ie. before first [section])
#TODO: avoid include line reordering on write

# The above 3 items are probably handled best by more separation between
# include functionality and ConfigParser. Delegate instead of subclass. See how
# this was done in the previous implementation.

#TODO: problem: interpolation tokens are lost when config files are rewritten
#       - workaround is to not set vars, not sure if this is ok
#       - maybe we should do interpolation at the Option level after all?
#       - preserve original uninterpolated value?
#TODO: separate $var interpolation into YumParser?

class IncludingConfigParser(ConfigParser):

    def __init__(self, vars=None, include="include"):
        """
        @param vars: A dictionary of subsitution variables.
        @param include: Name of option that lists files for inclusion
        """
        self.include = include

        # Dictionary of filenames -> included configparser objects
        self._fns = {}

        # Dictionary of sections -> filenames
        self._included = {}

        self.cwd = None
        ConfigParser.__init__(self, vars)

    def defaults(self):
        """Return a dictionary containing the instance-wide defaults."""
        return self._defaults

    def sections(self):
        """Return a list of the sections available in file and includes."""
        s = self.__sections()
        for included in self._included.keys():
            s.append(included)
        return s

    def has_section(self, section): 
        """Indicates whether the named section is present in 
        the configuration and includes."""
        if section in self.__sections() or section in self._included.keys():
            return True
        else:
            return False

    def has_option(self, section, option):
        if not self.has_section(section):
            raise NoSectionError(section)
        if section in self._included.keys():
            fn = self._included[section]
            return self._fns[fn].has_option(section, option)
        else:
            return ConfigParser.has_option(self,  section, option)
        
    def options(self, section):
        """Return a list of option names for the given section name"""
        if not self.has_section(section):
            raise NoSectionError(section)
        if section in self._included.keys():
            fn = self._included[section]
            return self._fns[fn].options(section)
        else:
            return ConfigParser.options(self,  section)

    def items(self, section):
        if not self.has_section(section):
            raise NoSectionError(section)
        if section in self._included.keys():
            fn = self._included[section]
            return self._fns[fn].items(section)
        else:
            return ConfigParser.items(self, section)

    def remove_section(self, section):
        if not self.has_section(section):
            raise NoSectionError(section)
        if section in self._included.keys():
            fn = self._included[section]
            return self._fns[fn].remove_section(section)
        else:
            return ConfigParser.remove_section(self, section)

    def add_include(self, section, fn):
        """Add a included file to config section"""
        if not self.has_section(section):
            raise NoSectionError(section)
        if not self.has_option(section, self.include):
            raise NoOptionError(self.include, section)
        inc = self.get(section, self.include)
        if fn in shlex.split(inc):
            return
        self._add_include(section, fn)

        
    def remove_include(self, section, fn):
        """Remove an included config parser"""
        if not self.has_section(section):
            raise NoSectionError(section)
        if not self.has_option(section, self.include):
            raise NoOptionError(self.include, section)
        #XXX: raise NoIncludeError???
        if not self._included.has_key(fn):
            return

    def __sections(self):
        return ConfigParser.sections(self) 

    def read(self, filenames):
        for filename in shlex.split(filenames):
            self.cwd = os.path.dirname(os.path.realpath(filename))
            ConfigParser.read(self,filename)
            self._readincludes()

    def readfp(self, fp, filename=None):
        ConfigParser.readfp(self, fp, filename)
        self._readincludes()

    def _add_include(self, section, filename):
        print '_add_include', section, filename
        c = IncludingConfigParser(self._defaults)

        # Be aware of URL style includes
        scheme, loc, path, params, qry, frag = urlparse.urlparse(filename, 'file')

        # Normalise file URLs
        if scheme == 'file':
            filename = path

        # Prepend current directory if absolute path wasn't given
        if scheme == 'file':
            if not filename.startswith(os.path.sep):
                filename = os.path.join(self.cwd, filename)

        c.readfp(urlgrabber.urlopen(filename), filename)

        # Keep track of included sections
        for includesection in c.sections():
            self._included[includesection] = filename
        self._fns[filename] = c

    def _remove_include(self, section, filename):
        inc = self.get(section, self.include)
        filenames = shlex.split(inc)
        if filename in filenames:
            filenames.remove(filename)
        self.set(section, self.include, string.join(filenames, ' '))
        self._included.pop(filename)

    def _readincludes(self):
        for section in ConfigParser.sections(self):
            if self.has_option(section, self.include):
                for filename in shlex.split(self.get(section, self.include)):
                    self._add_include(section, filename)
            
    def get(self, section, option, raw=False, vars=None):
        """Return section from file or included files"""
        if section in self._included:
            fn = self._included[section]
            return self._fns[fn].get(section, option, raw, vars)
        return ConfigParser.get(self, section, option, raw, vars)

    def set(self, section, option, value):
        if section in self._included:
            fn = self._included[section]
            return self._fns[fn].set(section, option, value)
        return ConfigParser.set(self, section, option, value)

    def write(self, fp):
        """Take a file object and write it"""

        # Don't call the parent write() method because it dumps out
        # self._defaults as its own section which isn't desirable here.

        # Write out the items for this file
        for section in self._sections:
            fp.write("[%s]\n" % section)
            for (key, value) in self._sections[section].items():
                if key == '__name__':
                    continue
                fp.write("%s = %s\n" % (key, str(value).replace('\n', '\n\t')))
            fp.write("\n")

        # Write out any included files
        for fn in self._fns.keys():
            # Only bother for files since we can't easily write back to much else.
            scheme = urlparse.urlparse(fn, 'file')[0]
            if scheme == 'file':
                inc = open(fn, 'w')
                self._fns[fn].write(inc)

    def _interpolate(self, section, option, rawval, vars):
        '''Perform $var subsitution (this overides the default %(..)s subsitution)

        Only the rawval and vars arguments are used. The rest are present for
        compatibility with the parent class.
        '''
        return varReplace(rawval, vars)


class IncludedDirConfigParser(IncludingConfigParser):
    """A conf.d recursive parser - supporting one level of included dirs"""

    def __init__(self, vars=None, includedir=None, includeglob="*.conf", include="include"):
        self.includeglob = includeglob
        self.includedir = includedir
        IncludingConfigParser.__init__(self, vars=vars, include=include)

    def read(self, filenames):
        for filename in shlex.split(filenames):
            IncludingConfigParser.read(self,filename)
            self._includedir()

    def _includedir(self):
        for section in ConfigParser.sections(self):
            if self.includedir:
                matches = glob.glob("%s/%s" % (self.includedir, self.includeglob))
                # glob dir, open files, include
                for match in matches:
                    if os.path.exists(match):
                        self._add_include(section, match)

    def add_include(self, section, filename):
        """Add a included file to config section"""
        if not self.has_section(section):
            raise NoSectionError(section)
        self._add_include(section, filename)


_KEYCRE = re.compile(r"\$(\w+)")

def varReplace(raw, vars):
    '''Perform variable replacement

    @param raw: String to perform substitution on.  
    @param vars: Dictionary of variables to replace. Key is variable name
        (without $ prefix). Value is replacement string.
    @return: Input raw string with substituted values.
    '''

    done = []                      # Completed chunks to return

    while raw:
        m = _KEYCRE.search(raw)
        if not m:
            done.append(raw)
            break

        # Determine replacement value (if unknown variable then preserve original)
        varname = m.group(1).lower()
        replacement = vars.get(varname, m.group())

        start, end = m.span()
        done.append(raw[:start])    # Keep stuff leading up to token
        done.append(replacement)    # Append replacement value
        raw = raw[end:]             # Continue with remainder of string

    return ''.join(done)


def _test():
    import sys

    p = IncludingConfigParser()
    p.read(sys.argv[1])

    p.set('one', 'a', '111')
    p.set('three', 'foo', 'bar')

    for section in p.sections():
        print '***', section
        for k, v in p.items(section):
            print '%s = %r' % (k, v)

    p.write(open(sys.argv[1], 'wt'))

if __name__ == '__main__':
    _test()



--- NEW FILE pgpmsg.py ---
##Copyright (C) 2003,2005  Jens B. Jorgensen <jbj1 at ultraemail.net>
##
##This program is free software; you can redistribute it and/or
##modify it under the terms of the GNU General Public License
##as published by the Free Software Foundation; either version 2
##of the License, or (at your option) any later version.
##
##This program is distributed in the hope that it will be useful,
##but WITHOUT ANY WARRANTY; without even the implied warranty of
##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
##GNU General Public License for more details.
##
##You should have received a copy of the GNU General Public License
##along with this program; if not, write to the Free Software
##Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
import string, struct, time, cStringIO, base64, types, md5, sha

debug = None

# Cypher Type Byte
# bits 7,6 of the CTB say what kind it is
# we only have reserved defined
CTB_76_NORMAL = 0x80
CTB_76_NEW = 0xc0
CTB_76_MASK = 0xc0

# CTB packet type, bits 5,4,3,2
CTB_PKTV2_MASK = 0x3c    # 1111 - mask for this field
CTB_PKT_MASK = 0x3f      # 111111 - all the lower bits

CTB_PKT_PK_ENC = 1       # 0001 - public-key encrypted session packet
CTB_PKT_SIG = 2          # 0010 - signature packet
CTB_PKT_SK_ENC = 3       # 0011 - symmetric-key encrypted session packet
CTB_PKT_OP_SIG = 4       # 0100 - one-pass signature packet
CTB_PKT_SK_CERT = 5      # 0101 - secret-key certificate packet
CTB_PKT_PK_CERT = 6      # 0110 - public-key certificate packet
CTB_PKT_SK_SUB = 7       # 0111 - secret-key subkey packet
CTB_PKT_COMPRESSED = 8   # 1000 - compressed data packet
CTB_PKT_ENC = 9          # 1001 - symmetric-key encrypted data packet
CTB_PKT_MARKER = 10      # 1010 - marker packet
CTB_PKT_LIT = 11         # 1011 - literal data packet
CTB_PKT_TRUST = 12       # 1100 - trust packet
CTB_PKT_USER_ID = 13     # 1101 - user id packet
CTB_PKT_PK_SUB = 14      # 1110 - public subkey packet

ctb_pkt_to_str = {
    CTB_PKT_PK_ENC : 'public-key encrypted session packet',
    CTB_PKT_SIG : 'signature packet',
    CTB_PKT_SK_ENC : 'symmetric-key encrypted session packet',
    CTB_PKT_OP_SIG : 'one-pass signature packet',
    CTB_PKT_SK_CERT : 'secret-key certificate packet',
    CTB_PKT_PK_CERT : 'public-key certificate packet',
    CTB_PKT_SK_SUB : 'secret-key subkey packet',
    CTB_PKT_COMPRESSED : 'compressed data packet',
    CTB_PKT_ENC : 'symmetric-key encrypted data packet',
    CTB_PKT_MARKER : 'marker packet',
    CTB_PKT_LIT : 'literal data packet',
    CTB_PKT_TRUST : 'trust packet',
    CTB_PKT_USER_ID : 'user id packet',
    CTB_PKT_PK_SUB : 'public subkey packet'
}


# CTB packet-length
CTB_PKT_LEN_MASK = 0x3   # 11 - mask

CTB_PKT_LEN_1 = 0        # 00 - 1 byte
CTB_PKT_LEN_2 = 1        # 01 - 2 bytes
CTB_PKT_LEN_4 = 2        # 10 - 4 bytes
CTB_PKT_LEN_UNDEF = 3    # 11 - no packet length supplied

# Algorithms

# Public Key Algorithms
ALGO_PK_RSA_ENC_OR_SIGN = 1        # RSA (Encrypt or Sign)
ALGO_PK_RSA_ENC_ONLY = 2           # RSA Encrypt-Only
ALGO_PK_RSA_SIGN_ONLY = 3          # RSA Sign-Only
ALGO_PK_ELGAMAL_ENC_ONLY = 16      # Elgamal (Encrypt-Only)
ALGO_PK_DSA = 17                   # DSA (Digital Signature Standard)
ALGO_PK_ELLIPTIC_CURVE = 18        # Elliptic Curve
ALGO_PK_ECDSA = 19                 # ECDSA
ALGO_PK_ELGAMAL_ENC_OR_SIGN = 20   # Elgamal (Encrypt or Sign)
ALGO_PK_DH = 21                    # Diffie-Hellman

algo_pk_to_str = {
    ALGO_PK_RSA_ENC_OR_SIGN : 'RSA (Encrypt or Sign)',
    ALGO_PK_RSA_ENC_ONLY : 'RSA Encrypt-Only',
    ALGO_PK_RSA_SIGN_ONLY : 'RSA Sign-Only',
    ALGO_PK_ELGAMAL_ENC_ONLY : 'Elgamal Encrypt-Only',
    ALGO_PK_DSA : 'DSA (Digital Signature Standard)',
    ALGO_PK_ELLIPTIC_CURVE : 'Elliptic Curve',
    ALGO_PK_ECDSA : 'ECDSA',
    ALGO_PK_ELGAMAL_ENC_OR_SIGN : 'Elgamal (Encrypt or Sign)',
    ALGO_PK_DH : 'Diffie-Hellman'
}    

# Symmetric Key Algorithms
ALGO_SK_PLAIN = 0 # Plaintext or unencrypted data
ALGO_SK_IDEA = 1 # IDEA
ALGO_SK_3DES = 2 # Triple-DES
ALGO_SK_CAST5 = 3 # CAST5
ALGO_SK_BLOWFISH = 4 # Blowfish
ALGO_SK_SAFER_SK128 = 5 # SAFER-SK128
ALGO_SK_DES_SK = 6 # DES/SK
ALGO_SK_AES_128 = 7 # AES 128-bit
ALGO_SK_AES_192 = 8 # AES 192-bit
ALGO_SK_AES_256 = 9 # AES 256-bit

algo_sk_to_str = {
    ALGO_SK_PLAIN : 'Plaintext or unencrypted data',
    ALGO_SK_IDEA : 'IDEA',
    ALGO_SK_3DES : 'Triple-DES',
    ALGO_SK_CAST5 : 'CAST5',
    ALGO_SK_BLOWFISH : 'Blowfish',
    ALGO_SK_SAFER_SK128 : 'SAFER-SK128',
    ALGO_SK_DES_SK : 'DES/SK',
    ALGO_SK_AES_128 : 'AES 128-bit',
    ALGO_SK_AES_192 : 'AES 192-bit',
    ALGO_SK_AES_256 : 'AES 256-bit'
}

# Compression Algorithms
ALGO_COMP_UNCOMP = 0 # Uncompressed
ALGO_COMP_ZIP = 1 # ZIP
ALGO_COMP_ZLIB = 2 # ZLIB

algo_comp_to_str = {
    ALGO_COMP_UNCOMP : 'Uncompressed',
    ALGO_COMP_ZIP : 'ZIP',
    ALGO_COMP_ZLIB : 'ZLIB'
}

# Hash Algorithms
ALGO_HASH_MD5 = 1                  # MD5
ALGO_HASH_SHA1 = 2                 # SHA1
ALGO_HASH_RIPEMD160 = 3            # RIPEMD160
ALGO_HASH_SHA_DBL = 4              # double-width SHA
ALGO_HASH_MD2 = 5                  # MD2
ALGO_HASH_TIGER192 = 6             # TIGER192
ALGO_HASH_HAVAL_5_160 = 7          # HAVAL-5-160

algo_hash_to_str = {
    ALGO_HASH_MD5 : 'MD5',
    ALGO_HASH_SHA1 : 'SHA1',
    ALGO_HASH_RIPEMD160 : 'RIPEMD160',
    ALGO_HASH_SHA_DBL : 'double-width SHA',
    ALGO_HASH_MD2 : 'MD2',
    ALGO_HASH_TIGER192 : 'TIGER192',
    ALGO_HASH_HAVAL_5_160 : 'HAVAL-5-160'
}

# Signature types
SIG_TYPE_DOCUMENT = 0x00           # document signature, binary image
SIG_TYPE_DOCUMENT_CANON = 0x01     # document signature, canonical text
SIG_TYPE_STANDALONE = 0x02         # signature over just subpackets
SIG_TYPE_PK_USER_GEN = 0x10        # public key packet and user ID packet, generic certification
SIG_TYPE_PK_USER_PER = 0x11        # public key packet and user ID packet, persona
SIG_TYPE_PK_USER_CAS = 0x12        # public key packet and user ID packet, casual certification
SIG_TYPE_PK_USER_POS = 0x13        # public key packet and user ID packet, positive certification
SIG_TYPE_SUBKEY_BIND = 0x18        # subkey binding
SIG_TYPE_KEY = 0x1F                # key signature
SIG_TYPE_KEY_REVOKE = 0x20      # key revocation
SIG_TYPE_SUBKEY_REVOKE = 0x28   # subkey revocation
SIG_TYPE_CERT_REVOKE = 0x30     # certificate revocation
SIG_TYPE_TIMESTAMP = 0x40       # timestamp

sig_type_to_str = {
    SIG_TYPE_DOCUMENT : 'document signature, binary image',
    SIG_TYPE_DOCUMENT_CANON : 'document signature, canonical text',
    SIG_TYPE_STANDALONE : 'signature over just subpackets',
    SIG_TYPE_PK_USER_GEN : 'public key packet and user ID packet, generic certification',
    SIG_TYPE_PK_USER_PER : 'public key packet and user ID packet, persona',
    SIG_TYPE_PK_USER_CAS : 'public key packet and user ID packet, casual certification',
    SIG_TYPE_PK_USER_POS : 'public key packet and user ID packet, positive certification',
    SIG_TYPE_SUBKEY_BIND : 'subkey binding',
    SIG_TYPE_KEY : 'key signature',
    SIG_TYPE_KEY_REVOKE : 'key revocation',
    SIG_TYPE_SUBKEY_REVOKE : 'subkey revocation',
    SIG_TYPE_CERT_REVOKE : 'certificate revocation',
    SIG_TYPE_TIMESTAMP : 'timestamp'
}

# Signature sub-packet types
SIG_SUB_TYPE_CREATE_TIME = 2        # signature creation time
SIG_SUB_TYPE_EXPIRE_TIME = 3        # signature expiration time
SIG_SUB_TYPE_EXPORT_CERT = 4        # exportable certification
SIG_SUB_TYPE_TRUST_SIG = 5          # trust signature
SIG_SUB_TYPE_REGEXP = 6             # regular expression
SIG_SUB_TYPE_REVOCABLE = 7          # revocable
SIG_SUB_TYPE_KEY_EXPIRE = 9         # key expiration time
SIG_SUB_TYPE_PLACEHOLDER = 10       # placeholder for backward compatibility
SIG_SUB_TYPE_PREF_SYMM_ALGO = 11    # preferred symmetric algorithms
SIG_SUB_TYPE_REVOKE_KEY = 12        # revocation key
SIG_SUB_TYPE_ISSUER_KEY_ID = 16     # issuer key ID
SIG_SUB_TYPE_NOTATION = 20          # notation data
SIG_SUB_TYPE_PREF_HASH_ALGO = 21    # preferred hash algorithms
SIG_SUB_TYPE_PREF_COMP_ALGO = 22    # preferred compression algorithms
SIG_SUB_TYPE_KEY_SRV_PREF = 23      # key server preferences
SIG_SUB_TYPE_PREF_KEY_SRVR = 24     # preferred key server
SIG_SUB_TYPE_PRIM_USER_ID = 25      # primary user id
SIG_SUB_TYPE_POLICY_URL = 26        # policy URL
SIG_SUB_TYPE_KEY_FLAGS = 27         # key flags
SIG_SUB_TYPE_SGNR_USER_ID = 28      # signer's user id
SIG_SUB_TYPE_REVOKE_REASON = 29     # reason for revocation

sig_sub_type_to_str = {
    SIG_SUB_TYPE_CREATE_TIME : 'signature creation time',
    SIG_SUB_TYPE_EXPIRE_TIME : 'signature expiration time',
    SIG_SUB_TYPE_EXPORT_CERT : 'exportable certification',
    SIG_SUB_TYPE_TRUST_SIG : 'trust signature',
    SIG_SUB_TYPE_REGEXP : 'regular expression',
    SIG_SUB_TYPE_REVOCABLE : 'revocable',
    SIG_SUB_TYPE_KEY_EXPIRE : 'key expiration time',
    SIG_SUB_TYPE_PLACEHOLDER : 'placeholder for backward compatibility',
    SIG_SUB_TYPE_PREF_SYMM_ALGO : 'preferred symmetric algorithms',
    SIG_SUB_TYPE_REVOKE_KEY : 'revocation key',
    SIG_SUB_TYPE_ISSUER_KEY_ID : 'issuer key ID',
    SIG_SUB_TYPE_NOTATION : 'notation data',
    SIG_SUB_TYPE_PREF_HASH_ALGO : 'preferred hash algorithms',
    SIG_SUB_TYPE_PREF_COMP_ALGO : 'preferred compression algorithms',
    SIG_SUB_TYPE_KEY_SRV_PREF : 'key server preferences',
    SIG_SUB_TYPE_PREF_KEY_SRVR : 'preferred key server',
    SIG_SUB_TYPE_PRIM_USER_ID : 'primary user id',
    SIG_SUB_TYPE_POLICY_URL : 'policy URL',
    SIG_SUB_TYPE_KEY_FLAGS : 'key flags',
    SIG_SUB_TYPE_SGNR_USER_ID : "signer's user id",
    SIG_SUB_TYPE_REVOKE_REASON : 'reason for revocation'
}

# in a signature subpacket there may be a revocation reason, these codes indicate
# the reason
REVOKE_REASON_NONE = 0              # No reason specified
REVOKE_REASON_SUPER = 0x01          # Key is superceded
REVOKE_REASON_COMPR = 0x02          # Key has been compromised
REVOKE_REASON_NOT_USED = 0x03       # Key is no longer used
REVOKE_REASON_ID_INVALID = 0x20     # user id information is no longer valid

revoke_reason_to_str = {
    REVOKE_REASON_NONE : 'No reason specified',
    REVOKE_REASON_SUPER : 'Key is superceded',
    REVOKE_REASON_COMPR : 'Key has been compromised',
    REVOKE_REASON_NOT_USED : 'Key is no longer used',
    REVOKE_REASON_ID_INVALID : 'user id information is no longer valid'
}

# These flags are used in a 'key flags' signature subpacket
KEY_FLAGS1_MAY_CERTIFY = 0x01 # This key may be used to certify other keys
KEY_FLAGS1_MAY_SIGN = 0x02 # This key may be used to sign data
KEY_FLAGS1_MAY_ENC_COMM = 0x04 # This key may be used to encrypt communications
KEY_FLAGS1_MAY_ENC_STRG = 0x08 # This key may be used to encrypt storage
KEY_FLAGS1_PRIV_MAYBE_SPLIT = 0x10 # Private component have be split through secret-sharing mech.
KEY_FLAGS1_GROUP = 0x80 # Private component may be among group

# A revocation key subpacket has these class values
REVOKE_KEY_CLASS_MAND = 0x80 # this bit must always be set
REVOKE_KEY_CLASS_SENS = 0x40 # sensitive

def get_whole_number(msg, idx, numlen) :
    """get_whole_number(msg, idx, numlen)
extracts a "whole number" field of length numlen from msg at index idx
returns (<whole number>, new_idx) where the whole number is a long integer
and new_idx is the index of the next element in the message"""
    n = 0L 
    while numlen > 0 :
        b = (struct.unpack("B", msg[idx:idx+1]))[0]
        n = n * 256L + long(b)
        idx = idx + 1
        numlen = numlen - 1
    return (n, idx)

def get_whole_int(msg, idx, numlen) :
    """get_whole_int(msg, idx, numlen)
same as get_whole_number but returns the number as an int for convenience"""
    n, idx = get_whole_number(msg, idx, numlen)
    return int(n), idx

def pack_long(l) :
    """pack_long(l)
    returns big-endian representation of unsigned long integer"""
    arr = []
    while l > 0 :
        arr.insert(0, struct.pack("B", l & 0xff))
        l >>= 8
    return ''.join(arr)
    
def pack_mpi(l) :
    """pack_mpi(l)
    returns the PGP Multi-Precision Integer representation of unsigned long integer"""
    s = pack_long(l)
    # the len is the number of bits, counting only from the MSB,
    # so we need to account for that
    bits = (len(s) - 1) * 8
    if len(s) > 0 :
        n = ord(s[0])
        while n != 0 :
            bits += 1
            n >>= 1
    else :
        bits = 0 # otherwise bits == -8
    return struct.pack(">H", bits) + s

def get_sig_subpak_len(msg, idx) :
    """get_sig_subpak_len(msg, idx)
extracts a signature subpacket length field
returns (subpak_len, new_idx)"""
    plen, idx = get_whole_int(msg, idx, 1)
    if plen < 192 :
        return plen, idx
    if plen < 255 :
        plen2, idx = get_whole_int(msg, idx, 1)
        return ((plen - 192) << 8) + plen2 + 192, idx
    return get_whole_int(msg, idx, 4)

def get_n_mpi(msg, idx) :
    """get_mpi(msg, idx)
    extracts a multi-precision integer field from the message msg at index idx
    returns (n, <mpi>, new_idx) where the mpi is a long integer and new_idx is
    the index of the next element in the message and n is the number of bits of
    precision in <mpi>"""
    ln, idx = get_whole_int(msg, idx, 2)
    return (ln,) + get_whole_number(msg, idx, (ln+7)/8)

def get_mpi(msg, idx) :
    """get_mpi(msg, idx)
extracts a multi-precision integer field from the message msg at index idx
returns (<mpi>, new_idx) where the mpi is a long integer and new_idx is
the index of the next element in the message"""
    l = get_n_mpi(msg, idx)
    return (l[1], l[2])

def str_to_hex(s) :
    return string.join(map(lambda x : string.zfill(hex(ord(x))[2:], 2), list(s)), '')

def duration_to_str(s) :
    if s == 0 :
        return 'never'
    secs = s % 60
    s = s / 60
    mins = s % 60
    s = s / 60
    hrs = s % 60
    s = s / 24
    days = s
    return '%d days %02d:%02d:%02d' % (days, hrs, mins, secs)

def map_to_str(m, vals) :
    slist = []
    # change to a list if it's a single value
    if type(vals) != types.ListType and type(vals) != types.TupleType :
        vals = list((vals,))
    for i in vals :
        if m.has_key(i) :
            slist.append(m[i])
        else :
            slist.append('unknown(' + str(i) + ')')
    return string.join(slist, ', ')

class pgp_packet :
    def __init__(self) :
        self.pkt_typ = None

    def __str__(self) :
        return map_to_str(ctb_pkt_to_str, self.pkt_typ)

class public_key(pgp_packet) :
    def __init__(self) :
        # just initialize the fields
        self.version = None
        self.pk_algo = None
        self.key_size = 0
        self.fingerprint_ = None # we cache this upon calculation

    def fingerprint(self) :
        # return cached value if we have it
        if self.fingerprint_ :
            return self.fingerprint_
        
        # otherwise calculate it now and cache it
        # v3 and v4 are calculated differently
        if self.version == 3 :
            h = md5.new()
            h.update(pack_long(self.pk_rsa_mod))
            h.update(pack_long(self.pk_rsa_exp))
            self.fingerprint_ = h.digest()
        elif self.version == 4 :
            # we hash what would be the whole PGP message containing
            # the pgp certificate
            h = sha.new()
            h.update('\x99')
            # we need to has the length of the packet as well
            buf = self.serialize()
            h.update(struct.pack(">H", len(buf)))
            h.update(buf)
            self.fingerprint_ = h.digest()
        else :
            raise RuntimeError("unknown public key version %d" % self.version)
        return self.fingerprint_

    def key_id(self) :
        if self.version == 3 :
            return pack_long(self.pk_rsa_mod & 0xffffffffffffffffL)
        elif self.version == 4 :
            return self.fingerprint()[-8:]

    def serialize(self) :
        chunks = []
        if self.version == 3 :
            chunks.append(struct.pack('>BIHB', self.version, int(self.timestamp), self.validity, self.pk_algo))
            chunks.append(pack_mpi(self.pk_rsa_mod))
            chunks.append(pack_mpi(self.pk_rsa_exp))
        elif self.version == 4 :
            chunks.append(struct.pack('>BIB', self.version, int(self.timestamp), self.pk_algo))
            if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
                chunks.append(pack_mpi(self.pk_rsa_mod))
                chunks.append(pack_mpi(self.pk_rsa_exp))
            elif self.pk_algo == ALGO_PK_DSA :
                chunks.append(pack_mpi(self.pk_dsa_prime_p))
                chunks.append(pack_mpi(self.pk_dsa_grp_ord_q))
                chunks.append(pack_mpi(self.pk_dsa_grp_gen_g))
                chunks.append(pack_mpi(self.pk_dsa_pub_key))
            elif self.pk_algo == ALGO_PK_ELGAMAL_ENC_OR_SIGN or self.pk_algo == ALGO_PK_ELGAMAL_ENC_ONLY :
                chunks.append(pack_mpi(self.pk_elgamal_prime_p))
                chunks.append(pack_mpi(self.pk_elgamal_grp_gen_g))
                chunks.append(pack_mpi(self.pk_elgamal_pub_key))
            else :
                raise RuntimeError("unknown public key algorithm %d" % (self.pk_algo))
        return ''.join(chunks)
    
    def deserialize(self, msg, idx, pkt_len) :
        idx_save = idx
        self.version, idx = get_whole_int(msg, idx, 1)
        if self.version != 2 and self.version != 3 and self.version != 4 :
            raise 'unknown public key packet version %d at %d' % (self.version, idx_save)
        if self.version == 2 : # map v2 into v3 for coding simplicity since they're structurally the same
            self.version = 3
        self.timestamp, idx = get_whole_number(msg, idx, 4)
        self.timestamp = float(self.timestamp)
        if self.version == 3 :
            self.validity, idx = get_whole_number(msg, idx, 2)
        self.pk_algo, idx = get_whole_int(msg, idx, 1)
        if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
            self.key_size, self.pk_rsa_mod, idx = get_n_mpi(msg, idx)
            self.pk_rsa_exp, idx = get_mpi(msg, idx)
        elif self.pk_algo == ALGO_PK_DSA :
            l1, self.pk_dsa_prime_p, idx = get_n_mpi(msg, idx)
            self.pk_dsa_grp_ord_q, idx = get_mpi(msg, idx)
            self.pk_dsa_grp_gen_g, idx = get_mpi(msg, idx)
            l2, self.pk_dsa_pub_key, idx = get_n_mpi(msg, idx)
            self.key_size = l1 + l2
        elif self.pk_algo == ALGO_PK_ELGAMAL_ENC_OR_SIGN or self.pk_algo == ALGO_PK_ELGAMAL_ENC_ONLY :
            self.key_size, self.pk_elgamal_prime_p, idx = get_n_mpi(msg, idx)
            self.pk_elgamal_grp_gen_g, idx = get_mpi(msg, idx)
            self.pk_elgamal_pub_key, idx = get_mpi(msg, idx)
        else :
            raise "unknown public key algorithm %d at %d" % (self.pk_algo, idx_save)

    def __str__(self) :
        sio = cStringIO.StringIO()
        sio.write(pgp_packet.__str__(self) + "\n")
        sio.write("version: " + str(self.version) + "\n")
        sio.write("timestamp: " + time.ctime(self.timestamp) + "\n")
        if self.version == 3 :
            sio.write("validity: " + time.ctime(self.timestamp + self.validity * 24 * 60 * 60) + "\n")
        sio.write("pubkey algo: " + algo_pk_to_str[self.pk_algo] + "\n")
        if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
            sio.write("pk_rsa_mod: " + hex(self.pk_rsa_mod) + "\n")
            sio.write("pk_rsa_exp: " + hex(self.pk_rsa_exp) + "\n")
        elif self.pk_algo == ALGO_PK_DSA :
            sio.write("pk_dsa_prime_p: " + hex(self.pk_dsa_prime_p) + "\n")
            sio.write("pk_dsa_grp_ord_q: " + hex(self.pk_dsa_grp_ord_q) + "\n")
            sio.write("pk_dsa_grp_gen_g: " + hex(self.pk_dsa_grp_gen_g) + "\n")
            sio.write("pk_dsa_pub_key: " + hex(self.pk_dsa_pub_key) + "\n")
        elif self.pk_algo == ALGO_PK_ELGAMAL_ENC_OR_SIGN or self.pk_algo == ALGO_PK_ELGAMAL_ENC_ONLY :
            sio.write("pk_elgamal_prime_p: " + hex(self.pk_elgamal_prime_p) + "\n")
            sio.write("pk_elgamal_grp_gen_g: " + hex(self.pk_elgamal_grp_gen_g) + "\n")
            sio.write("pk_elgamal_pub_key: " + hex(self.pk_elgamal_pub_key) + "\n")
        return sio.getvalue()

class user_id(pgp_packet) :
    def __init__(self) :
        # just initialize the fields
        id = None

    def deserialize(self, msg, idx, pkt_len) :
        self.id = msg[idx:idx + pkt_len]

    def __str__(self) :
        return pgp_packet.__str__(self) + "\n" + "id: " + self.id + "\n"

class signature(pgp_packet) :
    def __init__(self) :
        # just initialize the fields
        self.version = None
        self.sig_type = None
        self.pk_algo = None
        self.hash_algo = None
        self.hash_frag = None

    def key_id(self) :
        if self.version == 3 :
            return self.key_id_
        else :
            i = self.get_hashed_subpak(SIG_SUB_TYPE_ISSUER_KEY_ID)
            if i :
                return i[1]
            i = self.get_unhashed_subpak(SIG_SUB_TYPE_ISSUER_KEY_ID)
            if i :
                return i[1]
            return None

    def expiration(self) :
        if self.version != 4 :
            raise ValueError('v3 signatures don\'t have expirations')
        i = self.get_hashed_subpak(SIG_SUB_TYPE_KEY_EXPIRE)
        if i :
            return i[1]
        return 0 # if not present then it never expires

    def get_hashed_subpak(self, typ) :
        for i in self.hashed_subpaks :
            if i[0] == typ :
                return i
        return None
    
    def get_unhashed_subpak(self, typ) :
        for i in self.unhashed_subpaks :
            if i[0] == typ :
                return i
        return None
    
    def deserialize_subpacket(self, msg, idx) :
        sublen, idx = get_sig_subpak_len(msg, idx)
        subtype, idx = get_whole_int(msg, idx, 1)
        if subtype == SIG_SUB_TYPE_CREATE_TIME : # key creation time
            tm, idx = get_whole_number(msg, idx, 4)
            return (subtype, float(tm)), idx
        if subtype == SIG_SUB_TYPE_EXPIRE_TIME or subtype == SIG_SUB_TYPE_KEY_EXPIRE :
            s, idx = get_whole_int(msg, idx, 4)
            return (subtype, s), idx
        if subtype == SIG_SUB_TYPE_EXPORT_CERT or subtype == SIG_SUB_TYPE_REVOCABLE :
            bool, idx = get_whole_int(msg, idx, 1)
            return (subtype, bool), idx
        if subtype == SIG_SUB_TYPE_TRUST_SIG : # trust signature
            trust_lvl, idx = get_whole_int(msg, idx, 1)
            trust_amt, idx = get_whole_int(msg, idx, 1)
            return (subtype, trust_lvl, trust_amt), idx
        if subtype == SIG_SUB_TYPE_REGEXP : # regular expression
            expr = msg[idx:idx+sublen-1]
            idx = idx + sublen - 1
            return (subtype, expr), idx
        if subtype == SIG_SUB_TYPE_PREF_SYMM_ALGO or subtype == SIG_SUB_TYPE_PREF_HASH_ALGO or subtype == SIG_SUB_TYPE_PREF_COMP_ALGO or subtype == SIG_SUB_TYPE_KEY_FLAGS :
            algo_list = map(lambda x : ord(x), list(msg[idx:idx+sublen-1]))
            idx = idx + sublen - 1
            return (subtype, algo_list), idx
        if subtype == SIG_SUB_TYPE_REVOKE_KEY : # revocation key
            cls, idx = get_whole_int(msg, idx, 1)
            algo, idx = get_whole_int(msg, idx, 1)
            fprint = msg[idx:idx+20]
            idx = idx + 20
            return (subtype, cls, algo, fprint), idx
        if subtype == SIG_SUB_TYPE_ISSUER_KEY_ID : # issuer key ID
            k_id = msg[idx:idx+8]
            idx = idx + 8
            return (subtype, k_id), idx
        if subtype == SIG_SUB_TYPE_NOTATION : # notation data
            flg1, idx = get_whole_int(msg, idx, 1)
            flg2, idx = get_whole_int(msg, idx, 1)
            flg3, idx = get_whole_int(msg, idx, 1)
            flg4, idx = get_whole_int(msg, idx, 1)
            name_len, idx = get_whole_int(msg, idx, 2)
            val_len, idx = get_whole_int(msg, idx, 2)
            nam = msg[idx:idx+name_len]
            idx = idx + name_len
            val = msg[idx:idx+val_len]
            idx = idx + val_len
            return (subtype, flg1, flg2, flg3, flg4, nam, val), idx
        if subtype == SIG_SUB_TYPE_KEY_SRV_PREF : # key server preferences
            prefs = [ ord(x) for x in msg[idx:idx+sublen-1] ]
            idx = idx + sublen - 1
            return (subtype, prefs), idx
        if subtype == SIG_SUB_TYPE_PREF_KEY_SRVR : # preferred key server
            url = msg[idx:idx+sublen-1]
            idx = idx + sublen - 1
            return (subtype, url), idx
        if subtype == SIG_SUB_TYPE_PRIM_USER_ID : # primary user id
            bool, idx = get_whole_int(msg, idx, 1)
            return (subtype, bool), idx
        if subtype == SIG_SUB_TYPE_POLICY_URL : # policy URL
            url = msg[idx:idx+sublen-1]
            idx = idx + sublen - 1
            return (subtype, url), idx
        if subtype == SIG_SUB_TYPE_SGNR_USER_ID : # signer's user id
            signer_id = msg[idx:idx+sublen-1]
            idx = idx + sublen - 1
            return (subtype, signer_id), idx
        if subtype == SIG_SUB_TYPE_REVOKE_REASON : # reason for revocation
            rev_code, idx = get_whole_int(msg, idx, 1)
            reas_len = sublen - 2
            reas = msg[idx:idx+reas_len]
            idx = idx + reas_len
            return (subtype, rev_code, reas), idx
        # otherwise the subpacket is an unknown type, so we just pack the data in it
        dat = msg[idx:idx+sublen-1]
        idx = idx + sublen - 1
        return (subtype, dat), idx

    def is_primary_user_id(self) :
        """is_primary_user_id()
        returns true if this signature contains a primary user id subpacket with value true"""
        for i in self.hashed_subpaks :
            if i[0] == SIG_SUB_TYPE_PRIM_USER_ID :
                return i[1]
        return 0
    
    def subpacket_to_str(self, sp) :
        if sp[0] == SIG_SUB_TYPE_CREATE_TIME : # signature creation time
            return 'creation time: ' + time.ctime(sp[1])
        if sp[0] == SIG_SUB_TYPE_EXPIRE_TIME : # signature expiration time
            return 'signature expires: ' + duration_to_str(sp[1])
        if sp[0] == SIG_SUB_TYPE_EXPORT_CERT : # exportable certification
            if sp[1] :
                return 'signature exportable: TRUE'
            else :
                return 'signature exportable: FALSE'
        if sp[0] == SIG_SUB_TYPE_TRUST_SIG : # trust signature
            if sp[1] == 0 :
                return 'trust: ordinary'
            if sp[1] == 1 :
                return 'trust: introducer (%d)' % sp[2]
            if sp[1] == 2 :
                return 'trust: meta-introducer (%d)' % sp[2]
            return 'trust: %d %d' % (sp[1], sp[2])
        if sp[0] == SIG_SUB_TYPE_REGEXP : # regular expression
            return 'regexp: ' + sp[1]
        if sp[0] == SIG_SUB_TYPE_REVOCABLE : # revocable
            if sp[1] :
                return 'signature revocable: TRUE'
            else :
                return 'signature revocable: FALSE'
        if sp[0] == SIG_SUB_TYPE_KEY_EXPIRE : # key expiration time
            return 'key expires: ' + duration_to_str(sp[1])
        if sp[0] == SIG_SUB_TYPE_PREF_SYMM_ALGO : # preferred symmetric algorithms
            return 'preferred symmetric algorithms: ' + map_to_str(algo_sk_to_str, sp[1])
        if sp[0] == SIG_SUB_TYPE_REVOKE_KEY : # revocation key
            s = 'revocation key: '
            if sp[1] & REVOKE_KEY_CLASS_SEN :
                s = s + '(sensitive) '
            return s + map_to_str(algo_pk_to_str, sp[2]) + ' ' + str_to_hex(sp[3])
        if sp[0] == SIG_SUB_TYPE_ISSUER_KEY_ID : # issuer key ID
            return 'issuer key id: ' + str_to_hex(sp[1])
        if sp[0] == SIG_SUB_TYPE_NOTATION : # notation data
            return 'notation: flags(%d, %d, %d, %d) name(%s) value(%s)' % sp[1:]
        if sp[0] == SIG_SUB_TYPE_PREF_HASH_ALGO : # preferred hash algorithms
            return 'preferred hash algorithms: ' + map_to_str(algo_hash_to_str, sp[1])
        if sp[0] == SIG_SUB_TYPE_PREF_COMP_ALGO : # preferred compression algorithms
            return 'preferred compression algorithms: ' + map_to_str(algo_comp_to_str, sp[1])
        if sp[0] == SIG_SUB_TYPE_KEY_SRV_PREF : # key server preferences
            s = 'key server preferences: '
            prefs = []
            if sp[1][0] & 0x80 :
                prefs.append('No-modify')
            return s + string.join(prefs, ', ')
        if sp[0] == SIG_SUB_TYPE_PREF_KEY_SRVR : # preferred key server
            return 'preferred key server: %s' % sp[1]
        if sp[0] == SIG_SUB_TYPE_PRIM_USER_ID : # primary user id
            if sp[1] :
                return 'is primary user id'
            else :
                return 'is not primary user id'
        if sp[0] == SIG_SUB_TYPE_POLICY_URL : # policy URL
            return 'policy url: %s' % sp[1]
        if sp[0] == SIG_SUB_TYPE_KEY_FLAGS : # key flags
            flags = []
            flgs1 = 0
            if len(sp[1]) >= 1 :
                flgs1 = sp[1][0]
            if flgs1 & KEY_FLAGS1_MAY_CERTIFY :
                flags.append('may certify other keys')
            if flgs1 & KEY_FLAGS1_MAY_SIGN :
                flags.append('may sign data')
            if flgs1 & KEY_FLAGS1_MAY_ENC_COMM :
                flags.append('may encrypt communications')
            if flgs1 & KEY_FLAGS1_MAY_ENC_STRG :
                flags.append('may encrypt storage')
            if flgs1 & KEY_FLAGS1_PRIV_MAYBE_SPLIT :
                flags.append('private component may have been secret-sharing split')
            if flgs1 & KEY_FLAGS1_GROUP :
                flags.append('group key')
            return 'key flags: ' + string.join(flags, ', ')
        if sp[0] == SIG_SUB_TYPE_SGNR_USER_ID : # signer's user id
            return 'signer id: ' + sp[1]
        if sp[0] == SIG_SUB_TYPE_REVOKE_REASON : # reason for revocation
            reas = ''
            if revoke_reason_to_str.has_key(sp[1]) :
                reas = revoke_reason_to_str[sp[1]]
            return 'reason for revocation: %s, %s' % (reas, sp[2])
        # this means we don't know what the thing is so we just have raw data
        return 'unknown(%d): %s' % (sp[0], str_to_hex(sp[1]))

    def deserialize(self, msg, idx, pkt_len) :
        self.version, idx = get_whole_int(msg, idx, 1)
        if self.version == 2 :
            self.version = 3
        if self.version == 3 :
            hash_len, idx = get_whole_number(msg, idx, 1)
            self.sig_type, idx = get_whole_int(msg, idx, 1)
            self.timestamp, idx = get_whole_number(msg, idx, 4)
            self.timestamp = float(self.timestamp)
            self.key_id_ = msg[idx:idx+8]
            idx = idx + 8
            self.pk_algo, idx = get_whole_int(msg, idx, 1)
            self.hash_algo, idx = get_whole_int(msg, idx, 1)
        elif self.version == 4:
            self.sig_type, idx = get_whole_int(msg, idx, 1)
            self.pk_algo, idx = get_whole_int(msg, idx, 1)
            self.hash_algo, idx = get_whole_int(msg, idx, 1)
            sub_paks_len, idx = get_whole_int(msg, idx, 2)
            sub_paks_end = idx + sub_paks_len
            self.hashed_subpaks = []
            while idx < sub_paks_end :
                sp, idx = self.deserialize_subpacket(msg, idx)
                self.hashed_subpaks.append(sp)
            sub_paks_len, idx = get_whole_int(msg, idx, 2)
            sub_paks_end = idx + sub_paks_len
            self.unhashed_subpaks = []
            while idx < sub_paks_end :
                sp, idx = self.deserialize_subpacket(msg, idx)
                self.unhashed_subpaks.append(sp)
        else :
            raise 'unknown signature packet version %d at %d' % (self.version, idx)
        self.hash_frag, idx = get_whole_number(msg, idx, 2)
        if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
            self.rsa_sig, idx = get_mpi(msg, idx)
        elif self.pk_algo == ALGO_PK_DSA :
            self.dsa_sig_r, idx = get_mpi(msg, idx)
            self.dsa_sig_s, idx = get_mpi(msg, idx)
        else :
            raise 'unknown public-key algorithm (%d) in signature at %d' % (self.pk_algo, idx)
        return idx

    def __str__(self) :
        sio = cStringIO.StringIO()
        sio.write(pgp_packet.__str__(self) + "\n")
        sio.write("version: " + str(self.version) + "\n")
        sio.write("type: " + sig_type_to_str[self.sig_type] + "\n")
        if self.version == 3 :
            sio.write("timestamp: " + time.ctime(self.timestamp) + "\n")
            sio.write("key_id: " + str_to_hex(self.key_id_) + "\n")
        elif self.version == 4 :
            sio.write("hashed subpackets:\n")
            for i in self.hashed_subpaks :
                sio.write("    " + self.subpacket_to_str(i) + "\n")
            sio.write("unhashed subpackets:\n")
            for i in self.unhashed_subpaks :
                sio.write("    " + self.subpacket_to_str(i) + "\n")
        sio.write("hash_algo: " + algo_hash_to_str[self.hash_algo] + "\n")
        sio.write("hash_frag: " + hex(self.hash_frag) + "\n")
        if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
            sio.write("pk_algo: RSA\n")
            sio.write("rsa_sig: " + hex(self.rsa_sig) + "\n")
        elif self.pk_algo == ALGO_PK_DSA :
            sio.write("pk_algo: DSA\n")
            sio.write("dsa_sig_r: " + hex(self.dsa_sig_r) + "\n")
            sio.write("dsa_sig_s: " + hex(self.dsa_sig_s) + "\n")
        return sio.getvalue()

#
# This class encapsulates an openpgp public "certificate", which is formed in a message as
# a series of PGP packets of certain types in certain orders
#

class pgp_certificate :
    def __init__(self) :
        self.version = None
        self.public_key = None
        self.revocation = None
        #self.user_id = None
        self.user_ids = []
        self.rvkd_user_ids = []

    def __str__(self) :
        sio = cStringIO.StringIO()
        sio.write("PGP Public Key Certificate v%d\n" % self.version)
        sio.write("Primary ID: %s\n" % self.user_id)
        sio.write(str(self.public_key))
        for uid in self.user_ids :
            sio.write(str(uid[0]))
            for sig in uid[1:] :
                sio.write("   " + str(sig))
        return sio.getvalue()
    
    def get_user_id(self):
        # take the LAST one in the list, not first
        # they appear to be ordered FIFO from the key and that means if you
        # added a key later then it won't show the one you expect
        return self.user_ids[-1][0].id
        
    user_id = property(get_user_id)
    
    def expiration(self) :
        if self.version == 3 :
            if self.public_key.validity == 0 :
                return 0
            return self.public_key.timestamp + self.public_key.validity * 24 * 60 * 60
        else : # self.version == 4
            # this is a bit more complex, we need to find the signature on the
            # key and get its expiration
            u_id = self.user_ids[0]
            for i in u_id[1:] :
                if i.sig_type == SIG_TYPE_PK_USER_GEN :
                    exp = i.expiration()
                    if exp == 0 :
                        return 0
                    return self.public_key.timestamp + exp
            return 0

    def key_size(self) :
        return 0
    
    def load(self, pkts) :
        """load(pkts)
Initialize the pgp_certificate with a list of OpenPGP packets. The list of packets will
be scanned to make sure they are valid for a pgp certificate."""
        
        # each certificate should begin with a public key packet
        if pkts[0].pkt_typ != CTB_PKT_PK_CERT :
            raise ValueError('first PGP packet should be a public-key packet, not %s' % map_to_str(ctb_pkt_to_str, pkts[0].pkt_typ))

        # all versions have a public key although in a v4 cert the main key is only
        # used for signing, never encryption
        self.public_key = pkts[0]

        # ok, then what's the version
        self.version = self.public_key.version

        # now the behavior splits a little depending on the version
        if self.version == 3 :
            pkt_idx = 1

            # second packet could be a revocation
            if pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                if pkts[pkt_idx].version != 3 :
                    raise ValueError('version 3 cert has version %d signature' % pkts[pkt_idx].version)
                if pkts[pkt_idx].sig_type != SIG_TYPE_KEY_REVOKE :
                    raise ValueError('v3 cert revocation sig has type %s' % map_to_str(sig_type_to_str, pkts[pkt_idx].sig_type))

                # ok, well at least the type is good, we'll assume the cert is
                # revoked
                self.revocation = pkts[pkt_idx]

                # increment the pkt_idx to go to the next one
                pkt_idx = pkt_idx + 1

            # the following packets are User ID, Signature pairs
            while pkt_idx < len(pkts) :
                # this packet is supposed to be a user id
                if pkts[pkt_idx].pkt_typ != CTB_PKT_USER_ID :
                    raise ValueError('pgp packet %d is not user id, is %s' % (pkt_idx, map_to_str(ctb_pkt_to_str, pkts[pkt_idx].pkt_typ)))

                user_id = [pkts[pkt_idx]]
                pkt_idx = pkt_idx + 1
                is_revoked = 0
                is_primary_user_id = 0

                # there may be a sequence of signatures following the user id which
                # bind it to the key
                while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                    if pkts[pkt_idx].sig_type not in (SIG_TYPE_PK_USER_GEN, SIG_TYPE_PK_USER_PER, SIG_TYPE_PK_USER_CAS, SIG_TYPE_PK_USER_POS, SIG_TYPE_CERT_REVOKE) :
                        raise ValueError('signature %d doesn\'t bind user_id to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))

                    if pkts[pkt_idx].version != 3 :
                        raise ValueError('version 3 cert has version %d signature' % pkts[pkt_idx].version)

                    user_id.append(pkts[pkt_idx])

                    # was the a revocation?
                    if pkts[pkt_idx].sig_type == SIG_TYPE_CERT_REVOKE :
                        is_revoked = 1

                    # is this a primary user id?
                    if not self.cert_id and pkts[pkt_idx].sig_type == SIG_TYPE_PK_USER_GEN :
                        is_primary_user_id = pkt_idx
                    pkt_idx = pkt_idx + 1

                # we get the cert id from the first sig that's a candidate for being
                # the primary user id
                if not self.cert_id and is_primary_user_id and not is_revoked :
                    # the cert type must be generic pubkey and user id
                    self.user_id = user_id[0].id

                # append the user ID and signature(s) onto a list
                if is_revoked :
                    self.rvkd_user_ids.append(user_id)
                else :
                    self.user_ids.append(user_id)

        else : # self.version == 4
            pkt_idx = 1
            self.direct_key_sigs = []
            self.subkeys = []
            self.rvkd_subkeys = []

            # second packet could be a revocation (or a direct key self signature)
            if pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                if pkts[pkt_idx].version != 4 :
                    raise ValueError('version 4 cert has version %d signature' % pkts[pkt_idx].version)
                if pkts[pkt_idx].sig_type == SIG_TYPE_KEY_REVOKE :
                    # ok, well at least the type is good, we'll assume the cert is
                    # revoked
                    self.revocation = pkts[pkt_idx]

                    # increment the pkt_idx to go to the next one
                    pkt_idx = pkt_idx + 1

            # there can then be a sequence of direct key signatures
            while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                if pkts[pkt_idx].sig_type != SIG_TYPE_KEY :
                    raise ValueError('v4 cert signature has type %s, supposed to be direct key' % map_to_str(sig_type_to_str, pkts[pkt_idx].sig_type))
                self.direct_key_sigs.append(pkts[pkt_idx])
                pkt_idx = pkt_idx + 1
                
            # the following packets are User ID, Signature... sets or subkey, signature... sets
            while pkt_idx < len(pkts) :
                
                # this packet is supposed to be a user id
                if pkts[pkt_idx].pkt_typ == CTB_PKT_USER_ID :
                    user_id = [pkts[pkt_idx]]
                    is_revoked = 0
                    is_primary_user_id = 0

                    pkt_idx = pkt_idx + 1

                    # there may be a sequence of signatures following the user id which
                    # bind it to the key
                    while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                        if pkts[pkt_idx].sig_type not in (SIG_TYPE_PK_USER_GEN, SIG_TYPE_PK_USER_PER, SIG_TYPE_PK_USER_CAS, SIG_TYPE_PK_USER_POS, SIG_TYPE_CERT_REVOKE) :
                            raise ValueError('signature %d doesn\'t bind user_id to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))
                        user_id.append(pkts[pkt_idx])

                        # was the a revocation?
                        if pkts[pkt_idx].sig_type == SIG_TYPE_CERT_REVOKE :
                            is_revoked = 1

                        # is this the primary user id?
                        if pkts[pkt_idx].version == 4 and pkts[pkt_idx].is_primary_user_id() :
                            is_primary_user_id = 1
                        pkt_idx = pkt_idx + 1

                    # append the user ID and signature(s) onto the list
                    if is_revoked :
                        self.rvkd_user_ids.append(user_id)
                    else :
                        if is_primary_user_id :
                            self.user_id = user_id[0].id
                        self.user_ids.append(user_id)

                elif pkts[pkt_idx].pkt_typ == CTB_PKT_PK_SUB :
                    # collect this list of subkey + signatures
                    subkey = [pkts[pkt_idx]]
                    pkt_idx = pkt_idx + 1
                    is_revoked = 0

                    # there may be a sequence of signatures following the user id which
                    # bind it to the key
                    while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                        if pkts[pkt_idx].sig_type not in (SIG_TYPE_SUBKEY_BIND, SIG_TYPE_SUBKEY_REVOKE) :
                            raise ValueError('signature %d doesn\'t bind subkey to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))
                        subkey.append(pkts[pkt_idx])

                        # was this a revocation?
                        if pkts[pkt_idx].sig_type == SIG_TYPE_SUBKEY_REVOKE :
                            is_revoked = 1

                        pkt_idx = pkt_idx + 1

                    # append the user ID and signature(s) onto the list
                    if is_revoked :
                        self.rvkd_subkeys.append(subkey)
                    else :
                        self.subkeys.append(subkey)
                else :
                    raise ValueError('pgp packet %d is not user id or subkey, is %s' % (pkt_idx, map_to_str(ctb_pkt_to_str, pkts[pkt_idx].pkt_typ)))

        # did we get all the things we needed?
        #if not self.user_id :
        # just take the first valid user id we encountered then
        if len(self.user_ids) == 0 :
            raise ValueError('no user id packet was present in the cert')



def get_ctb(msg, idx) :
    """get_ctb(msg, idx)
extracts a the "cypher type bit" information from message msg at index idx
returns (type, len, new_idx) where type is the enumerated type of the packet,
len is the length of the packet, and new_idx is the index of the next element
in the message"""
    b, idx = get_whole_int(msg, idx, 1)
    if (b & CTB_76_MASK) == CTB_76_NORMAL :
        n_len = 0 # undefined length
        if (b & CTB_PKT_LEN_MASK) == CTB_PKT_LEN_1 :
            n_len = 1
        if (b & CTB_PKT_LEN_MASK) == CTB_PKT_LEN_2 :
            n_len = 2
        if (b & CTB_PKT_LEN_MASK) == CTB_PKT_LEN_4 :
            n_len = 4
        if (b & CTB_PKT_LEN_MASK) == CTB_PKT_LEN_UNDEF :
            n_len = 0
        pkt_len = 0
        if n_len > 0 :
            pkt_len, idx = get_whole_int(msg, idx, n_len)
        return (b & CTB_PKTV2_MASK) >> 2, pkt_len, idx
    elif (b & CTB_76_MASK) == CTB_76_NEW :
        plen, idx = get_whole_int(msg, idx, 1)
        if plen < 192 :
            return b & CTB_PKT_MASK, plen, idx
        if plen < 224 :
            plen2, idx = get_whole_int(msg, idx, 1)
            return b & CTB_PKT_MASK, ((plen - 192) << 8) + plen2 + 192, idx
        if plen == 255 :
            plen, idx = get_whole_int(msg, idx, 4)
            return b & CTB_PKT_MASK, plen, idx
        else :
            raise 'partial message bodies are not supported by this version (%d)', b
    else :
        raise "unknown (not \"normal\") cypher type bit %d at byte %d" % (b, idx)

def crc24(msg) :
    crc24_init = 0xb704ce
    crc24_poly = 0x1864cfb

    crc = crc24_init
    for i in list(msg) :
        crc = crc ^ (ord(i) << 16)
        for j in range(0, 8) :
            crc = crc << 1
            if crc & 0x1000000 :
                crc = crc ^ crc24_poly
    return crc & 0xffffff

def decode(msg) :
    # each message is a sequence of packets so we go through the message
    # and generate a list of packets and return that
    pkt_list = []
    idx = 0
    msg_len = len(msg)
    while idx < msg_len :
        pkt_typ, pkt_len, idx = get_ctb(msg, idx)
        pkt = None
        if pkt_typ == CTB_PKT_PK_CERT or pkt_typ == CTB_PKT_PK_SUB :
            pkt = public_key()

        elif pkt_typ == CTB_PKT_USER_ID :
            pkt = user_id()

        elif pkt_typ == CTB_PKT_SIG :
            pkt = signature()

        if pkt :
            pkt.pkt_typ = pkt_typ
            pkt.deserialize(msg, idx, pkt_len)
            if debug :
                debug.write(pkt.__str__() + "\n")
        else :
            raise 'unknown pgp packet type %d at %d' % (pkt_typ, idx)

        pkt_list.append(pkt)

        idx = idx + pkt_len
    return pkt_list

def decode_msg(msg) :
    # first we'll break the block up into lines and trim each line of any 
    # carriage return chars
    pgpkey_lines = map(lambda x : string.rstrip(x), string.split(msg, '\n'))

    # check out block
    in_block = 0
    in_data = 0
    
    block_buf = cStringIO.StringIO()
    for l in pgpkey_lines :
        if not in_block :
            if l == '-----BEGIN PGP PUBLIC KEY BLOCK-----' :
                in_block = 1
            continue

        # are we at the actual data yet?
        if not in_data :
            if len(l) == 0 :
                in_data = 1
            continue
        
        # are we at the checksum line?
        if l[0] == '=' :
            # get the checksum number
            csum = base64.decodestring(l[1:5])
            i = 0
            csum, i = get_whole_number(csum, i, 3)

            # convert the base64 cert data to binary data
            cert_msg = base64.decodestring(block_buf.getvalue())
            block_buf.close()

            # check the checksum
            if csum != crc24(cert_msg) :
                raise 'bad checksum on pgp message'

            # ok, the sum looks ok so we'll actually decode the thing
            pkt_list = decode(cert_msg)

            # turn it into a real cert
            cert = pgp_certificate()
            cert.load(pkt_list)
            return cert
        
        # add the data to our buffer then
        block_buf.write(l)

    return None


--- NEW FILE plugins.py ---
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University

import os
import glob
import imp
import atexit
from constants import *
import ConfigParser
import config 
import Errors

# XXX: break the API for how plugins define config file options
#   - they should just be able to manipulate the YumConf and RepoConf classes
#     directly, adding Option instances as required
#   - cleaner, more flexible and 
#   - update PLUGINS document
#   - will take care of the following existing TODOs:
# TODO: detect conflicts between builtin yum options and registered plugin
# options (will require refactoring of config.py)
# TODO: plugins should be able to specify convertor functions for config vars

# TODO: should plugin searchpath be affected by installroot option?

# TODO: cleaner method to query installed packages rather than exposing RpmDB
# (Panu?)

# TODO: consistent case of YumPlugins methods

# TODO: expose progress bar interface

# TODO: allow plugins to define new repository types

# TODO: check for *_hook methods that aren't supported

# TODO "log" slot? To allow plugins to do customised logging/history (say to a
# SQL db)

# TODO: multiversion plugin support

# TODO: config vars marked as PLUG_OPT_WHERE_ALL should inherit defaults from
#   the [main] setting if the user doesn't specify them

# TODO: allow plugins to extend shell commands

# TODO: allow plugins to extend commands (on the command line)

# TODO: More developer docs:  use epydoc as API begins to stablise

# TODO: test the API by implementing some crack from bugzilla
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=181 
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=270
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=310
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=431
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=88 (?)
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=396 (DONE)


# The API_VERSION constant defines the current plugin API version. It is used
# to decided whether or not plugins can be loaded. It is compared against the
# 'requires_api_version' attribute of each plugin. The version number has the
# format: "major_version.minor_version".
# 
# For a plugin to be loaded the major version required by the plugin must match
# the major version in API_VERSION. Additionally, the minor version in
# API_VERSION must be greater than or equal the minor version required by the
# plugin.
# 
# If a change to yum is made that break backwards compatibility wrt the plugin
# API, the major version number must be incremented and the minor version number
# reset to 0. If a change is made that doesn't break backwards compatibility,
# then the minor number must be incremented.
API_VERSION = '2.2'

# Plugin types
TYPE_CORE = 0
TYPE_INTERFACE = 1
ALL_TYPES = (TYPE_CORE, TYPE_INTERFACE)

# Mapping of slots to conduit classes
SLOT_TO_CONDUIT = {
    'config': 'ConfigPluginConduit',
    'init': 'InitPluginConduit',
    'predownload': 'DownloadPluginConduit',
    'postdownload': 'DownloadPluginConduit',
    'prereposetup': 'PreRepoSetupPluginConduit',
    'postreposetup': 'PostRepoSetupPluginConduit',
    'close': 'PluginConduit',
    'pretrans': 'MainPluginConduit',
    'posttrans': 'MainPluginConduit',
    'exclude': 'MainPluginConduit',
    'preresolve': 'DepsolvePluginConduit',
    'postresolve': 'DepsolvePluginConduit',
    }

# Enumerate all slot names
SLOTS = SLOT_TO_CONDUIT.keys()

class PluginYumExit(Exception):
    '''Used by plugins to signal that yum should stop
    '''

class YumPlugins:
    '''
    Manager class for Yum plugins.
    '''

    def __init__(self, base, searchpath, optparser=None, types=None):
        '''Initialise the instance.

        @param base: The
        @param searchpath: A list of paths to look for plugin modules.
        @param optparser: The OptionParser instance for this run (optional).
            Use to allow plugins to extend command line options.
        @param types: A sequence specifying the types of plugins to load.
            This should be sequnce containing one or more of the TYPE_...
            constants. If None (the default), all plugins will be loaded.
        '''

        self.searchpath = searchpath
        self.base = base
        self.optparser = optparser
        self.cmdline = (None, None)
        if not types:
            types = ALL_TYPES

        self._importplugins(types)

        self.opts = {}
        self.cmdlines = {}

        # Call close handlers when yum exit's
        atexit.register(self.run, 'close')

        # Let plugins register custom config file options
        self.run('config')

    def run(self, slotname, **kwargs):
        '''Run all plugin functions for the given slot.
        '''
        # Determine handler class to use
        conduitcls = SLOT_TO_CONDUIT.get(slotname, None)
        if conduitcls is None:
            raise ValueError('unknown slot name "%s"' % slotname)
        conduitcls = eval(conduitcls)       # Convert name to class object

        for modname, func in self._pluginfuncs[slotname]:
            self.base.log(3, 'Running "%s" handler for "%s" plugin' % (
                slotname, modname))
    
            _, conf = self._plugins[modname]
            func(conduitcls(self, self.base, conf, **kwargs))

    def _importplugins(self, types):
        '''Load plugins matching the given types.
        '''

        # Initialise plugin dict
        self._plugins = {}
        self._pluginfuncs = {}
        for slot in SLOTS:
            self._pluginfuncs[slot] = []

        # Import plugins 
        for dir in self.searchpath:
            if not os.path.isdir(dir):
                continue
            for modulefile in glob.glob('%s/*.py' % dir):
                self._loadplugin(modulefile, types)

    def _loadplugin(self, modulefile, types):
        '''Attempt to import a plugin module and register the hook methods it
        uses.
        '''
        dir, modname = os.path.split(modulefile)
        modname = modname.split('.py')[0]

        conf = self._getpluginconf(modname)
        if not conf or not config.getOption(conf, 'main', 'enabled', False,
                config.BoolOption()):
            self.base.log(3, '"%s" plugin is disabled' % modname)
            return

        fp, pathname, description = imp.find_module(modname, [dir])
        module = imp.load_module(modname, fp, pathname, description)

        # Check API version required by the plugin
        if not hasattr(module, 'requires_api_version'):
             raise Errors.ConfigError(
                'Plugin "%s" doesn\'t specify required API version' % modname
                )
        if not apiverok(API_VERSION, module.requires_api_version):
            raise Errors.ConfigError(
                'Plugin "%s" requires API %s. Supported API is %s.' % (
                    modname,
                    module.requires_api_version,
                    API_VERSION,
                    ))

        # Check plugin type against filter
        plugintypes = getattr(module, 'plugin_type', ALL_TYPES)
        if not isinstance(plugintypes, (list, tuple)):
            plugintypes = (plugintypes,)

        if len(plugintypes) < 1:
            return
        for plugintype in plugintypes:
            if plugintype not in types:
                return

        self.base.log(2, 'Loading "%s" plugin' % modname)

        # Store the plugin module and its configuration file
        if not self._plugins.has_key(modname):
            self._plugins[modname] = (module, conf)
        else:
            raise Errors.ConfigError('Two or more plugins with the name "%s" ' \
                    'exist in the plugin search path' % modname)
        
        for slot in SLOTS:
            funcname = slot+'_hook'
            if hasattr(module, funcname):
                self._pluginfuncs[slot].append(
                        (modname, getattr(module, funcname))
                        )

    def _getpluginconf(self, modname):
        '''Parse the plugin specific configuration file and return a
        IncludingConfigParser instance representing it. Returns None if there
        was an error reading or parsing the configuration file.
        '''
        #XXX: should this use installroot?
        conffilename = os.path.join('/etc/yum/pluginconf.d', modname+'.conf')

        try:
            parser = config.IncludingConfigParser()
            parser.read(conffilename)
        except ConfigParser.Error, e:
            raise Errors.ConfigError("Couldn't parse %s: %s" % (conffilename,
                str(e)))
        except IOError, e:
            self.base.log(2, str(e))
            return None

        return parser

    def registeropt(self, name, valuetype, where, default):
        '''Called from plugins to register a new config file option.

        @param name: Name of the new option.
        @param valuetype: Option type (PLUG_OPT_BOOL, PLUG_OPT_STRING ...)
        @param where: Where the option should be available in the config file.
            (PLUG_OPT_WHERE_MAIN, PLUG_OPT_WHERE_REPO, ...)
        @param default: Default value for the option if not set by the user.
        '''
        if self.opts.has_key(name):
            raise Errors.ConfigError('Plugin option conflict: ' \
                    'an option named "%s" has already been registered' % name
                    )
        self.opts[name] = (valuetype, where, default)

    def parseopts(self, conf, repos):
        '''Parse any configuration options registered by plugins

        @param conf: the yumconf instance holding Yum's global options
        @param repos: a list of all repository objects
        '''
        #XXX: with the new config stuff this is an ugly hack!
        # See first TODO at top of this file

        type2opt =  {
            PLUG_OPT_STRING: config.Option(),
            PLUG_OPT_INT: config.IntOption(),
            PLUG_OPT_BOOL: config.BoolOption(),
            PLUG_OPT_FLOAT: config.FloatOption(),
            }

        # Process [main] options first
        for name, (vtype, where, default) in self.opts.iteritems(): 
            if where in (PLUG_OPT_WHERE_MAIN, PLUG_OPT_WHERE_ALL):
                val = config.getOption(conf.cfg, 'main', name, default,
                        type2opt[vtype])
                setattr(conf, name, val)

        # Process repository level options
        for repo in repos:
            for name, (vtype, where, default) in self.opts.iteritems(): 
                if where in (PLUG_OPT_WHERE_REPO, PLUG_OPT_WHERE_ALL):
                    val = config.getOption(conf.cfg, repo.id, name, default,
                            type2opt[vtype])
                    repo.set(name, val)

    def setCmdLine(self, opts, commands):
        '''Set the parsed command line options so that plugins can access them
        '''
        self.cmdline = (opts, commands)


class DummyYumPlugins:
    '''
    This class provides basic emulation of the YumPlugins class. It exists so
    that calls to plugins.run() don't fail if plugins aren't in use.
    '''
    def run(self, *args, **kwargs):
        pass

    def setCmdLine(self, *args, **kwargs):
        pass

class PluginConduit:
    def __init__(self, parent, base, conf):
        self._parent = parent
        self._base = base
        self._conf = conf

    def info(self, level, msg):
        self._base.log(level, msg)

    def error(self, level, msg):
        self._base.errorlog(level, msg)

    def promptYN(self, msg):
        self.info(2, msg)
        if self._base.conf.assumeyes:
            return 1
        else:
            return self._base.userconfirm()

    def getYumVersion(self):
        import yum
        return yum.__version__

    def getOptParser(self):
        '''Return the optparse.OptionParser instance for this execution of Yum

        In the "config" and "init" slots a plugin may add extra options to this
        instance to extend the command line options that Yum exposes.

        In all other slots a plugin may only read the OptionParser instance.
        Any modification of the instance at this point will have no effect. 
        
        See the getCmdLine() method for details on how to retrieve the parsed
        values of command line options.

        @return: the global optparse.OptionParser instance used by Yum. May be
            None if an OptionParser isn't in use.
        '''
        return self._parent.optparser

    def confString(self, section, opt, default=None):
        '''Read a string value from the plugin's own configuration file

        @param section: Configuration file section to read.
        @param opt: Option name to read.
        @param default: Value to read if option is missing.
        @return: String option value read, or default if option was missing.
        '''
        return config.getOption(self._conf, section, opt, default,
                config.Option())

    def confInt(self, section, opt, default=None):
        '''Read an integer value from the plugin's own configuration file

        @param section: Configuration file section to read.
        @param opt: Option name to read.
        @param default: Value to read if option is missing.
        @return: Integer option value read, or default if option was missing or
            could not be parsed.
        '''
        return config.getOption(self._conf, section, opt, default,
                config.IntOption())

    def confFloat(self, section, opt, default=None):
        '''Read a float value from the plugin's own configuration file

        @param section: Configuration file section to read.
        @param opt: Option name to read.
        @param default: Value to read if option is missing.
        @return: Float option value read, or default if option was missing or
            could not be parsed.
        '''
        return config.getOption(self._conf, section, opt, default,
                config.FloatOption())

    def confBool(self, section, opt, default=None):
        '''Read a boolean value from the plugin's own configuration file

        @param section: Configuration file section to read.
        @param opt: Option name to read.
        @param default: Value to read if option is missing.
        @return: Boolean option value read, or default if option was missing or
            could not be parsed.
        '''
        return config.getOption(self._conf, section, opt, default,
                config.BoolOption())

class ConfigPluginConduit(PluginConduit):

    def registerOpt(self, *args, **kwargs):
        '''Register a yum configuration file option.

        Arguments are as for YumPlugins.registeropt().
        '''
        self._parent.registeropt(*args, **kwargs)


class InitPluginConduit(PluginConduit):

    def getConf(self):
        return self._base.conf

    def getRepos(self):
        '''Return Yum's container object for all configured repositories.

        @return: Yum's RepoStorage instance
        '''
        return self._base.repos

class PreRepoSetupPluginConduit(InitPluginConduit):

    def getCmdLine(self):
        '''Return parsed command line options.

        @return: (options, commands) as returned by OptionParser.parse_args()
        '''
        return self._parent.cmdline

    def getRpmDB(self):
        '''Return a representation of local RPM database. This allows querying
        of installed packages.

        @return: rpmUtils.RpmDBHolder instance
        '''
        self._base.doTsSetup()
        self._base.doRpmDBSetup()
        return self._base.rpmdb

class PostRepoSetupPluginConduit(PreRepoSetupPluginConduit):

    def getGroups(self):
        '''Return group information.

        @return: yum.comps.Comps instance
        '''
        self._base.doGroupSetup()
        return self._base.comps

class DownloadPluginConduit(PostRepoSetupPluginConduit):

    def __init__(self, parent, base, conf, pkglist, errors=None):
        PostRepoSetupPluginConduit.__init__(self, parent, base, conf)
        self._pkglist = pkglist
        self._errors = errors

    def getDownloadPackages(self):
        '''Return a list of package objects representing packages to be
        downloaded.
        '''
        return self._pkglist

    def getErrors(self):
        '''Return a dictionary of download errors. 
        
        The returned dictionary is indexed by package object. Each element is a
        list of strings describing the error.
        '''
        if not self._errors:
            return {}
        return self._errors

class MainPluginConduit(PostRepoSetupPluginConduit):

    def getPackages(self, repo=None):
        if repo:
            arg = repo.id
        else:
            arg = None
        return self._base.pkgSack.returnPackages(arg)

    def getPackageByNevra(self, nevra):
        '''Retrieve a package object from the packages loaded by Yum using
        nevra information 
        
        @param nevra: A tuple holding (name, epoch, version, release, arch)
            for a package
        @return: A PackageObject instance (or subclass)
        '''
        return self._base.getPackageObject(nevra)

    def delPackage(self, po):
        self._base.pkgSack.delPackage(po)

    def getTsInfo(self):
        return self._base.tsInfo

class DepsolvePluginConduit(MainPluginConduit):
    def __init__(self, parent, base, conf, rescode=None, restring=[]):
        MainPluginConduit.__init__(self, parent, base, conf)
        self.resultcode = rescode
        self.resultstring = restring

def parsever(apiver):
    maj, min = apiver.split('.')
    return int(maj), int(min)

def apiverok(a, b):
    '''Return true if API version "a" supports API version "b"
    '''
    a = parsever(a)
    b = parsever(b)

    if a[0] != b[0]:
        return 0

    if a[1] >= b[1]:
        return 1

    return 0


--- NEW FILE repos.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University 

import os
import os.path
import re
import fnmatch
import urlparse
import types
import time

import Errors
from urlgrabber.grabber import URLGrabber
import urlgrabber.mirror
from urlgrabber.grabber import URLGrabError
from repomd import repoMDObject
from repomd import mdErrors
from repomd import packageSack
from packages import YumAvailablePackage
import mdcache
import parser

_is_fnmatch_pattern = re.compile(r"[*?[]").search

class YumPackageSack(packageSack.PackageSack):
    """imports/handles package objects from an mdcache dict object"""
    def __init__(self, packageClass):
        packageSack.PackageSack.__init__(self)
        self.pc = packageClass
        self.added = {}
        
    def addDict(self, repoid, datatype, dataobj, callback=None):
        if self.added.has_key(repoid):
            if datatype in self.added[repoid]:
                return

        total = len(dataobj.keys())
        if datatype == 'metadata':
            current = 0        
            for pkgid in dataobj.keys():
                current += 1
                if callback: callback.progressbar(current, total, repoid)
                pkgdict = dataobj[pkgid]
                po = self.pc(pkgdict, repoid)
                po.simple['id'] = pkgid
                self._addToDictAsList(self.pkgsByID, pkgid, po)
                self.addPackage(po)
            
            if not self.added.has_key(repoid):
                self.added[repoid] = []
            self.added[repoid].append('metadata')
            # indexes will need to be rebuilt
            self.indexesBuilt = 0
            
        elif datatype in ['filelists', 'otherdata']:
            if self.added.has_key(repoid):
                if 'metadata' not in self.added[repoid]:
                    raise Errors.RepoError, '%s md for %s imported before primary' \
                           % (datatype, repoid)
            current = 0
            for pkgid in dataobj.keys():
                current += 1
                if callback: callback.progressbar(current, total, repoid)
                pkgdict = dataobj[pkgid]
                if self.pkgsByID.has_key(pkgid):
                    for po in self.pkgsByID[pkgid]:
                        po.importFromDict(pkgdict, repoid)

            self.added[repoid].append(datatype)
            # indexes will need to be rebuilt
            self.indexesBuilt = 0
        else:
            # umm, wtf?
            pass
            
class RepoStorage:
    """This class contains multiple repositories and core configuration data
       about them."""
       
    def __init__(self):
        self.repos = {} # list of repos by repoid pointing a repo object 
                        # of repo options/misc data
        self.callback = None # progress callback used for populateSack() for importing the xml files
        self.cache = 0
        # Check to see if we can import sqlite stuff
        try:
            import sqlitecache
            import sqlitesack
        except ImportError:
            self.sqlite = False
        else:
            self.sqlite = True
            self.sqlitecache = sqlitecache
            
        self._selectSackType()
    
    def _selectSackType(self):

        if (self.sqlite):
            import sqlitecache
            import sqlitesack
            self.pkgSack = sqlitesack.YumSqlitePackageSack(sqlitesack.YumAvailablePackageSqlite)
        else:
            self.pkgSack = YumPackageSack(YumAvailablePackage)
        
    def __str__(self):
        return str(self.repos.keys())
    

    def add(self, repoobj):
        if self.repos.has_key(repoobj.id):
            raise Errors.RepoError, 'Repository %s is listed more than once in the configuration' % (repoobj.id)
        self.repos[repoobj.id] = repoobj
        

    def delete(self, repoid):
        if self.repos.has_key(repoid):
            del self.repos[repoid]
            
    def sort(self):
        repolist = self.repos.values()
        repolist.sort()
        return repolist
        
    def getRepo(self, repoid):
        try:
            return self.repos[repoid]
        except KeyError, e:
            raise Errors.RepoError, \
                'Error getting repository data for %s, repository not found' % (repoid)

    def findRepos(self,pattern):
        """find all repositories matching fnmatch `pattern`"""

        result = []
        
        for item in pattern.split(','):
            item = item.strip()
            match = re.compile(fnmatch.translate(item)).match
            for name,repo in self.repos.items():
                if match(name):
                    result.append(repo)
        return result
        
    def disableRepo(self, repoid):
        """disable a repository from use
        
        fnmatch wildcards may be used to disable a group of repositories.
        returns repoid of disabled repos as list
        """
        repos = []
        if _is_fnmatch_pattern(repoid) or repoid.find(',') != -1:
            for repo in self.findRepos(repoid):
                repos.append(repo.id)
                repo.disable()
        else:
            thisrepo = self.getRepo(repoid)
            repos.append(thisrepo.id)
            thisrepo.disable()
        
        return repos
        
    def enableRepo(self, repoid):
        """enable a repository for use
        
        fnmatch wildcards may be used to enable a group of repositories.
        returns repoid of enables repos as list
        """
        repos = []
        if _is_fnmatch_pattern(repoid) or repoid.find(',') != -1:
            for repo in self.findRepos(repoid):
                repos.append(repo.id)
                repo.enable()
        else:
            thisrepo = self.getRepo(repoid)
            repos.append(thisrepo.id)
            thisrepo.enable()
        
        return repos
        
    def listEnabled(self):
        """return list of enabled repo objects"""
        returnlist = []
        for repo in self.repos.values():
            if repo.enabled:
                returnlist.append(repo)

        return returnlist

    def listGroupsEnabled(self):
        """return a list of repo objects that have groups enabled"""
        returnlist = []
        for repo in self.listEnabled():
            if repo.enablegroups:
                returnlist.append(repo)

        return returnlist

    def setCache(self, cacheval):
        """sets cache value in all repos"""
        self.cache = cacheval
        for repo in self.repos.values():
            repo.cache = cacheval

    def setCacheDir(self, cachedir):
        """sets the cachedir value in all repos"""

        for repo in self.repos.values():
            repo.basecachedir = cachedir

    def setProgressBar(self, obj):
        """set's the progress bar for downloading files from repos"""
        
        for repo in self.repos.values():
            repo.callback = obj
            repo.setupGrab()

    def setFailureCallback(self, obj):
        """set's the failure callback for all repos"""
        
        for repo in self.repos.values():
            repo.failure_obj = obj
            repo.setupGrab()
            
                
    def populateSack(self, which='enabled', with='metadata', callback=None, pickleonly=0):
        """This populates the package sack from the repositories, two optional 
           arguments: which='repoid, enabled, all'
                      with='metadata, filelists, otherdata, all'"""

        if not callback:
            callback = self.callback
        myrepos = []
        if which == 'enabled':
            myrepos = self.listEnabled()
        elif which == 'all':
            myrepos = self.repos.values()
        else:
            if type(which) == types.ListType:
                for repo in which:
                    if isinstance(repo, Repository):
                        myrepos.append(repo)
                    else:
                        repobj = self.getRepo(repo)
                        myrepos.append(repobj)
            elif type(which) == types.StringType:
                repobj = self.getRepo(which)
                myrepos.append(repobj)

        if with == 'all':
            data = ['metadata', 'filelists', 'otherdata']
        else:
            data = [ with ]
         
        for repo in myrepos:
            if not hasattr(repo, 'cacheHandler'):
                if (self.sqlite):
                    repo.cacheHandler = self.sqlitecache.RepodataParserSqlite(
                            storedir=repo.cachedir, 
                            repoid=repo.id,
                            callback=callback,
                            )
                else:
                    repo.cacheHandler = mdcache.RepodataParser(
                            storedir=repo.cachedir, 
                            callback=callback
                            )
            for item in data:
                if self.pkgSack.added.has_key(repo.id):
                    if item in self.pkgSack.added[repo.id]:
                        continue
                        
                if item == 'metadata':
                    xml = repo.getPrimaryXML()
                    (ctype, csum) = repo.repoXML.primaryChecksum()
                    dobj = repo.cacheHandler.getPrimary(xml, csum)
                    if not pickleonly:
                        self.pkgSack.addDict(repo.id, item, dobj, callback) 
                    del dobj
                        
                elif item == 'filelists':
                    xml = repo.getFileListsXML()
                    (ctype, csum) = repo.repoXML.filelistsChecksum()
                    dobj = repo.cacheHandler.getFilelists(xml, csum)
                    if not pickleonly:
                        self.pkgSack.addDict(repo.id, item, dobj, callback) 
                    del dobj
                        
                        
                elif item == 'otherdata':
                    xml = repo.getOtherXML()
                    (ctype, csum) = repo.repoXML.otherChecksum()
                    dobj = repo.cacheHandler.getOtherdata(xml, csum)
                    if not pickleonly:
                        self.pkgSack.addDict(repo.id, item, dobj, callback)
                    del dobj
                    
                        
                else:
                    # how odd, just move along
                    continue
            # get rid of all this stuff we don't need now
            del repo.cacheHandler
        
        
class Repository:
    """this is an actual repository object"""       

    def __init__(self, repoid):
        self.id = repoid
        self.name = repoid # name is repoid until someone sets it to a real name
        # some default (ish) things
        self.urls = []
        self.gpgcheck = 0
        self.enabled = 0
        self.enablegroups = 0
        self.groupsfilename = 'yumgroups.xml' # something some freaks might 
                                              # eventually want
        self.setkeys = []
        self.repoMDFile = 'repodata/repomd.xml'
        self.repoXML = None
        self.cache = 0
        self.callback = None # callback for the grabber
        self.failure_obj = None
        self.mirrorlist = None # filename/url of mirrorlist file
        self.mirrorlistparsed = 0
        self.baseurl = [] # baseurls from the config file
        self.yumvar = {} # empty dict of yumvariables for $string replacement
        self.proxy_password = None
        self.proxy_username = None
        self.proxy = None
        self._proxy_dict = {}
        self.metadata_cookie_fn = 'cachecookie'
        self.groups_added = False
        
        # throw in some stubs for things that will be set by the config class
        self.basecachedir = ""
        self.cachedir = ""
        self.pkgdir = ""
        self.hdrdir = ""

        # holder for stuff we've grabbed
        self.retrieved = { 'primary':0, 'filelists':0, 'other':0, 'groups':0 }

        
    def __cmp__(self, other):
        if self.id > other.id:
            return 1
        elif self.id < other.id:
            return -1
        else:
            return 0

    def __str__(self):
        return self.id

    def _checksum(self, sumtype, file, CHUNK=2**16):
        """takes filename, hand back Checksum of it
           sumtype = md5 or sha
           filename = /path/to/file
           CHUNK=65536 by default"""
           
        # chunking brazenly lifted from Ryan Tomayko
        try:
            if type(file) is not types.StringType:
                fo = file # assume it's a file-like-object
            else:           
                fo = open(file, 'r', CHUNK)
                
            if sumtype == 'md5':
                import md5
                sum = md5.new()
            elif sumtype == 'sha':
                import sha
                sum = sha.new()
            else:
                raise Errors.RepoError, 'Error Checksumming file, wrong \
                                         checksum type %s' % sumtype
            chunk = fo.read
            while chunk: 
                chunk = fo.read(CHUNK)
                sum.update(chunk)
    
            if type(file) is types.StringType:
                fo.close()
                del fo
                
            return sum.hexdigest()
        except (EnvironmentError, IOError, OSError):
            raise Errors.RepoError, 'Error opening file for checksum'
        
    def dump(self):
        output = '[%s]\n' % self.id
        vars = ['name', 'bandwidth', 'enabled', 'enablegroups', 
                 'gpgcheck', 'includepkgs', 'keepalive', 'proxy',
                 'proxy_password', 'proxy_username', 'exclude', 
                 'retries', 'throttle', 'timeout', 'mirrorlist', 
                 'cachedir', 'gpgkey', 'pkgdir', 'hdrdir']
        vars.sort()
        for attr in vars:
            output = output + '%s = %s\n' % (attr, getattr(self, attr))
        output = output + 'baseurl ='
        for url in self.urls:
            output = output + ' %s\n' % url
        
        return output
    
    def enable(self):
        self.baseurlSetup()
        self.set('enabled', 1)
    
    def disable(self):
        self.set('enabled', 0)
    
    def check(self):
        """self-check the repo information  - if we don't have enough to move
           on then raise a repo error"""
        if len(self.urls) < 1:
            raise Errors.RepoError, \
             'Cannot find a valid baseurl for repo: %s' % self.id
           
                
    def set(self, key, value):
        """sets a generic attribute of this repository"""
        self.setkeys.append(key)
        setattr(self, key, value)
        
    def unset(self, key):
        """delete an attribute of this repository"""
        self.setkeys.remove(key)
        delattr(self, key)
   
    def listSetKeys(self):
        return self.setkeys
    
    def doProxyDict(self):
        if self._proxy_dict:
            return
        
        self._proxy_dict = {} # zap it
        proxy_string = None
        if self.proxy not in [None, '_none_']:
            proxy_string = '%s' % self.proxy
            if self.proxy_username is not None:
                proxy_parsed = urlparse.urlsplit(self.proxy, allow_fragments=0)
                proxy_proto = proxy_parsed[0]
                proxy_host = proxy_parsed[1]
                proxy_rest = proxy_parsed[2] + '?' + proxy_parsed[3]
                proxy_string = '%s://%s@%s%s' % (proxy_proto,
                        self.proxy_username, proxy_host, proxy_rest)
                        
                if self.proxy_password is not None:
                    proxy_string = '%s://%s:%s@%s%s' % (proxy_proto,
                              self.proxy_username, self.proxy_password,
                              proxy_host, proxy_rest)
                                                 
        if proxy_string is not None:
            self._proxy_dict['http'] = proxy_string
            self._proxy_dict['https'] = proxy_string
            self._proxy_dict['ftp'] = proxy_string

    def setupGrab(self):
        """sets up the grabber functions with the already stocked in urls for
           the mirror groups"""

        if self.failovermethod == 'roundrobin':
            mgclass = urlgrabber.mirror.MGRandomOrder
        else:
            mgclass = urlgrabber.mirror.MirrorGroup
        
        
        self.grabfunc = URLGrabber(keepalive=self.keepalive, 
                                   bandwidth=self.bandwidth,
                                   retry=self.retries,
                                   throttle=self.throttle,
                                   progress_obj=self.callback,
                                   proxies = self.proxy_dict,
                                   failure_callback=self.failure_obj,
                                   timeout=self.timeout,
                                   reget='simple')
                                   
        self.grab = mgclass(self.grabfunc, self.urls)

    def dirSetup(self):
        """make the necessary dirs, if possible, raise on failure"""

        cachedir = os.path.join(self.basecachedir, self.id)
        pkgdir = os.path.join(cachedir, 'packages')
        hdrdir = os.path.join(cachedir, 'headers')
        self.set('cachedir', cachedir)
        self.set('pkgdir', pkgdir)
        self.set('hdrdir', hdrdir)
        cookie = self.cachedir + '/' + self.metadata_cookie_fn
        self.set('metadata_cookie', cookie)

        for dir in [self.cachedir, self.hdrdir, self.pkgdir]:
            if self.cache == 0:
                if os.path.exists(dir) and os.path.isdir(dir):
                    continue
                else:
                    try:
                        os.makedirs(dir, mode=0755)
                    except OSError, e:
                        raise Errors.RepoError, \
                            "Error making cache directory: %s error was: %s" % (dir, e)
            else:
                if not os.path.exists(dir):
                    raise Errors.RepoError, \
                        "Cannot access repository dir %s" % dir
 
    def baseurlSetup(self):
        """go through the baseurls and mirrorlists and populate self.urls 
           with valid ones, run  self.check() at the end to make sure it worked"""

        goodurls = []
        if self.mirrorlist and not self.mirrorlistparsed:
            mirrorurls = getMirrorList(self.mirrorlist, self.proxy_dict)
            self.mirrorlistparsed = 1
            for url in mirrorurls:
                url = parser.varReplace(url, self.yumvar)
                self.baseurl.append(url)

        for url in self.baseurl:
            url = parser.varReplace(url, self.yumvar)
            (s,b,p,q,f,o) = urlparse.urlparse(url)
            if s not in ['http', 'ftp', 'file', 'https']:
                print 'not using ftp, http[s], or file for repos, skipping - %s' % (url)
                continue
            else:
                goodurls.append(url)
                
        self.set('urls', goodurls)
        self.check()
        self.setupGrab() # update the grabber for the urls

    def get(self, url=None, relative=None, local=None, start=None, end=None,
            copy_local=0, checkfunc=None, text=None, reget='simple', cache=True):
        """retrieve file from the mirrorgroup for the repo
           relative to local, optionally get range from
           start to end, also optionally retrieve from a specific baseurl"""
           
        # if local or relative is None: raise an exception b/c that shouldn't happen
        # if url is not None - then do a grab from the complete url - not through
        # the mirror, raise errors as need be
        # if url is None do a grab via the mirror group/grab for the repo
        # return the path to the local file

        if cache:
            headers = None
        else:
            headers = (('Pragma', 'no-cache'),)

        if local is None or relative is None:
            raise Errors.RepoError, \
                  "get request for Repo %s, gave no source or dest" % self.id
                  
        if self.failure_obj:
            (f_func, f_args, f_kwargs) = self.failure_obj
            self.failure_obj = (f_func, f_args, f_kwargs)
        
        if self.cache == 1:
            if os.path.exists(local): # FIXME - we should figure out a way
                return local          # to run the checkfunc from here
                
            else: # ain't there - raise
                raise Errors.RepoError, \
                    "Caching enabled but no local cache of %s from %s" % (local,
                           self)

        if url is not None:
            ug = URLGrabber(keepalive = self.keepalive, 
                            bandwidth = self.bandwidth,
                            retry = self.retries,
                            throttle = self.throttle,
                            progres_obj = self.callback,
                            copy_local = copy_local,
                            reget = reget,
                            proxies = self.proxy_dict,
                            failure_callback = self.failure_obj,
                            timeout=self.timeout,
                            checkfunc=checkfunc,
                            http_headers=headers,
                            )
            
            remote = url + '/' + relative

            try:
                result = ug.urlgrab(remote, local,
                                    text=text,
                                    range=(start, end), 
                                    )
            except URLGrabError, e:
                raise Errors.RepoError, \
                    "failed to retrieve %s from %s\nerror was %s" % (relative, self.id, e)
              
        else:
            try:
                result = self.grab.urlgrab(relative, local,
                                           text = text,
                                           range = (start, end),
                                           copy_local=copy_local,
                                           reget = reget,
                                           checkfunc=checkfunc,
                                           http_headers=headers,
                                           )
            except URLGrabError, e:
                raise Errors.RepoError, "failure: %s from %s: %s" % (relative, self.id, e)
                
        return result
           
        
    def metadataCurrent(self):
        """Check if there is a metadata_cookie and check its age. If the 
        age of the cookie is less than metadata_expire time then return true
        else return False"""
        
        val = False
        if os.path.exists(self.metadata_cookie):
            cookie_info = os.stat(self.metadata_cookie)
            if cookie_info[8] + self.metadata_expire > time.time():
                val = True
        
        return val

    
    def setMetadataCookie(self):
        """if possible, set touch the metadata_cookie file"""
        
        check = self.metadata_cookie
        if not os.path.exists(self.metadata_cookie):
            check = self.cachedir
        
        if os.access(check, os.W_OK):
            fo = open(self.metadata_cookie, 'w+')
            fo.close()
            del fo
            
    def getRepoXML(self, text=None):
        """retrieve/check/read in repomd.xml from the repository"""

        remote = self.repoMDFile
        local = self.cachedir + '/repomd.xml'
        if self.repoXML is not None:
            return

        if self.cache or self.metadataCurrent():
            if not os.path.exists(local):
                raise Errors.RepoError, 'Cannot find repomd.xml file for %s' % (self)
            else:
                result = local
        else:
            checkfunc = (self._checkRepoXML, (), {})
            try:
                result = self.get(relative=remote,
                                  local=local,
                                  copy_local=1,
                                  text=text,
                                  reget=None,
                                  checkfunc=checkfunc,
                                  cache=self.http_caching == 'all')

            except URLGrabError, e:
                raise Errors.RepoError, 'Error downloading file %s: %s' % (local, e)
            
            # if we have a 'fresh' repomd.xml then update the cookie
            self.setMetadataCookie()

        try:
            self.repoXML = repoMDObject.RepoMD(self.id, result)
        except mdErrors.RepoMDError, e:
            raise Errors.RepoError, 'Error importing repomd.xml from %s: %s' % (self, e)
    
    def _checkRepoXML(self, fo):
        if type(fo) is types.InstanceType:
            filepath = fo.filename
        else:
            filepath = fo
        
        try:
            foo = repoMDObject.RepoMD(self.id, filepath)
        except mdErrors.RepoMDError, e:
            raise URLGrabError(-1, 'Error importing repomd.xml for %s: %s' % (self, e))


    def __getProxyDict(self):
        self.doProxyDict()
        if self._proxy_dict:
            return self._proxy_dict
        return None

    # consistent access to how proxy information should look (and ensuring
    # that it's actually determined for the repo)
    proxy_dict = property(__getProxyDict)

    def _checkMD(self, fn, mdtype):
        """check the metadata type against its checksum"""
        
        csumDict = { 'primary' : self.repoXML.primaryChecksum,
                     'filelists' : self.repoXML.filelistsChecksum,
                     'other' : self.repoXML.otherChecksum,
                     'group' : self.repoXML.groupChecksum }
                     
        csumMethod = csumDict[mdtype]
        
        (r_ctype, r_csum) = csumMethod() # get the remote checksum
        
        if type(fn) == types.InstanceType: # this is an urlgrabber check
            file = fn.filename
        else:
            file = fn
            
        try:
            l_csum = self._checksum(r_ctype, file) # get the local checksum
        except Errors.RepoError, e:
            raise URLGrabError(-3, 'Error performing checksum')
            
        if l_csum == r_csum: 
            return 1
        else:
            raise URLGrabError(-1, 'Metadata file does not match checksum')
        

        
    def _retrieveMD(self, mdtype):
        """base function to retrieve metadata files from the remote url
           returns the path to the local metadata file of a 'mdtype'
           mdtype can be 'primary', 'filelists', 'other' or 'group'."""
        locDict = { 'primary' : self.repoXML.primaryLocation,
                    'filelists' : self.repoXML.filelistsLocation,
                    'other' : self.repoXML.otherLocation,
                    'group' : self.repoXML.groupLocation }
        
        locMethod = locDict[mdtype]
        
        (r_base, remote) = locMethod()
        fname = os.path.basename(remote)
        local = self.cachedir + '/' + fname

        if self.retrieved.has_key(mdtype):
            if self.retrieved[mdtype]: # got it, move along
                return local

        if self.cache == 1:
            if os.path.exists(local):
                try:
                    self._checkMD(local, mdtype)
                except URLGrabError, e:
                    raise Errors.RepoError, \
                        "Caching enabled and local cache: %s does not match checksum" % local
                else:
                    return local
                    
            else: # ain't there - raise
                raise Errors.RepoError, \
                    "Caching enabled but no local cache of %s from %s" % (local,
                           self)
                           
        if os.path.exists(local):
            try:
                self._checkMD(local, mdtype)
            except URLGrabError, e:
                pass
            else:
                self.retrieved[mdtype] = 1
                return local # it's the same return the local one

        try:
            checkfunc = (self._checkMD, (mdtype,), {})
            local = self.get(relative=remote, local=local, copy_local=1,
                             checkfunc=checkfunc, reget=None, 
                             cache=self.http_caching == 'all')
        except URLGrabError, e:
            raise Errors.RepoError, \
                "Could not retrieve %s matching remote checksum from %s" % (local, self)
        else:
            self.retrieved[mdtype] = 1
            return local

    
    def getPrimaryXML(self):
        """this gets you the path to the primary.xml file, retrieving it if we 
           need a new one"""

        return self._retrieveMD('primary')
        
    
    def getFileListsXML(self):
        """this gets you the path to the filelists.xml file, retrieving it if we 
           need a new one"""

        return self._retrieveMD('filelists')

    def getOtherXML(self):
        return self._retrieveMD('other')

    def getGroups(self):
        """gets groups and returns group file path for the repository, if there 
           is none it returns None"""
        try:
            file = self._retrieveMD('group')
        except URLGrabError:
            file = None
        
        return file
        
        

def getMirrorList(mirrorlist, pdict = None):
    """retrieve an up2date-style mirrorlist file from a url, 
       we also s/$ARCH/$BASEARCH/ and move along
       returns a list of the urls from that file"""
       
    returnlist = []
    if hasattr(urlgrabber.grabber, 'urlopen'):
        urlresolver = urlgrabber.grabber
    else: 
        urlresolver = urllib
    
    scheme = urlparse.urlparse(mirrorlist)[0]
    if scheme == '':
        url = 'file://' + mirrorlist
    else:
        url = mirrorlist

    try:
        fo = urlresolver.urlopen(url, proxies=pdict)
    except urlgrabber.grabber.URLGrabError, e:
        fo = None

    if fo is not None: 
        content = fo.readlines()
        for line in content:
            if re.match('^\s*\#.*', line) or re.match('^\s*$', line):
                continue
            mirror = re.sub('\n$', '', line) # no more trailing \n's
            (mirror, count) = re.subn('\$ARCH', '$BASEARCH', mirror)
            returnlist.append(mirror)
    
    return returnlist



--- NEW FILE sqlitecache.py ---
#!/usr/bin/python -tt

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 

# TODO
# - Add support for multiple checksums per rpm (not required)

import os
import sqlite
import time
import mdparser
from sqlitesack import encodefiletypelist,encodefilenamelist

# This version refers to the internal structure of the sqlite cache files
# increasing this number forces all caches of a lower version number
# to be re-generated
dbversion = '7'

class RepodataParserSqlite:
    def __init__(self, storedir, repoid, callback=None):
        self.storedir = storedir
        self.callback = callback
        self.repodata = {
            'metadata': {},
            'filelists': {},
            'otherdata': {}
        }
        self.repoid = repoid
        self.debug = 0

    def loadCache(self,filename):
        """Load cache from filename, check if it is valid and that dbversion 
        matches the required dbversion"""
        db = sqlite.connect(filename)
        cur = db.cursor()
        cur.execute("select * from db_info")
        info = cur.fetchone()
        # If info is not in there this is an incompelete cache file
        # (this could happen when the user hits ctrl-c or kills yum
        # when the cache is being generated or updated)
        if (not info):
            raise sqlite.DatabaseError, "Incomplete database cache file"

        # Now check the database version
        if (info['dbversion'] != dbversion):
            self.log(2, "Warning: cache file is version %s, we need %s, will regenerate" % (
                info['dbversion'], dbversion))
            raise sqlite.DatabaseError, "Older version of yum sqlite"

        # This appears to be a valid database, return checksum value and 
        # database object
        return (info['checksum'],db)
        
    def getFilename(self,location):
        return location + '.sqlite'
            
    def getDatabase(self, location, cachetype):
        filename = self.getFilename(location)
        dbchecksum = ''
        # First try to open an existing database
        try:
            f = open(filename)
            (dbchecksum,db) = self.loadCache(filename)
        except (IOError,sqlite.DatabaseError,KeyError):
            # If it doesn't exist, create it
            db = self.makeSqliteCacheFile(filename,cachetype)
        return (db,dbchecksum)

    def _getbase(self, location, checksum, metadatatype):
        (db, dbchecksum) = self.getDatabase(location, metadatatype)
        # db should now contain a valid database object, check if it is
        # up to date
        if (checksum != dbchecksum):
            self.log(3, "%s sqlite cache needs updating, reading in metadata" % (metadatatype))
            parser = mdparser.MDParser(location)
            self.updateSqliteCache(db, parser, checksum, metadatatype)
        db.commit()
        return db

    def getPrimary(self, location, checksum):
        """Load primary.xml.gz from an sqlite cache and update it 
           if required"""
        return self._getbase(location, checksum, 'primary')

    def getFilelists(self, location, checksum):
        """Load filelist.xml.gz from an sqlite cache and update it if 
           required"""
        return self._getbase(location, checksum, 'filelists')

    def getOtherdata(self, location, checksum):
        """Load other.xml.gz from an sqlite cache and update it if required"""
        return self._getbase(location, checksum, 'other')
         
    def createTablesFilelists(self,db):
        """Create the required tables for filelists metadata in the sqlite 
           database"""
        cur = db.cursor()
        self.createDbInfo(cur)
        # This table is needed to match pkgKeys to pkgIds
        cur.execute("""CREATE TABLE packages(
            pkgKey INTEGER PRIMARY KEY,
            pkgId TEXT)
        """)
        cur.execute("""CREATE TABLE filelist(
            pkgKey INTEGER,
            dirname TEXT,
            filenames TEXT,
            filetypes TEXT)
        """)
        cur.execute("CREATE INDEX keyfile ON filelist (pkgKey)")
        cur.execute("CREATE INDEX pkgId ON packages (pkgId)")
    
    def createTablesOther(self,db):
        """Create the required tables for other.xml.gz metadata in the sqlite 
           database"""
        cur = db.cursor()
        self.createDbInfo(cur)
        # This table is needed to match pkgKeys to pkgIds
        cur.execute("""CREATE TABLE packages(
            pkgKey INTEGER PRIMARY KEY,
            pkgId TEXT)
        """)
        cur.execute("""CREATE TABLE changelog(
            pkgKey INTEGER,
            author TEXT,
            date TEXT,
            changelog TEXT)
        """)
        cur.execute("CREATE INDEX keychange ON changelog (pkgKey)")
        cur.execute("CREATE INDEX pkgId ON packages (pkgId)")
        
    def createTablesPrimary(self,db):
        """Create the required tables for primary metadata in the sqlite 
           database"""

        cur = db.cursor()
        self.createDbInfo(cur)
        # The packages table contains most of the information in primary.xml.gz

        q = 'CREATE TABLE packages(\n' \
            'pkgKey INTEGER PRIMARY KEY,\n'

        cols = []
        for col in PackageToDBAdapter.COLUMNS:
            cols.append('%s TEXT' % col)
        q += ',\n'.join(cols) + ')'

        cur.execute(q)

        # Create requires, provides, conflicts and obsoletes tables
        # to store prco data
        for t in ('requires','provides','conflicts','obsoletes'):
            cur.execute("""CREATE TABLE %s (
              name TEXT,
              flags TEXT,
              epoch TEXT,
              version TEXT,
              release TEXT,
              pkgKey TEXT)
            """ % (t))
        # Create the files table to hold all the file information
        cur.execute("""CREATE TABLE files (
            name TEXT,
            type TEXT,
            pkgKey TEXT)
        """)
        # Create indexes for faster searching
        cur.execute("CREATE INDEX packagename ON packages (name)")
        cur.execute("CREATE INDEX providesname ON provides (name)")
        cur.execute("CREATE INDEX packageId ON packages (pkgId)")
        db.commit()
    
    def createDbInfo(self,cur):
        # Create the db_info table, this contains sqlite cache metadata
        cur.execute("""CREATE TABLE db_info (
            dbversion TEXT,
            checksum TEXT)
        """)

    def insertHash(self,table,hash,cursor):
        """Insert the key value pairs in hash into a database table"""

        keys = hash.keys()
        values = hash.values()
        query = "INSERT INTO %s (" % (table)
        query += ",".join(keys)
        query += ") VALUES ("
        # Quote all values by replacing None with NULL and ' by ''
        for x in values:
            if (x == None):
              query += "NULL,"
            else:
              try:
                query += "'%s'," % (x.replace("'","''"))
              except AttributeError:
                query += "'%s'," % x
        # Remove the last , from query
        query = query[:-1]
        # And replace it with )
        query += ")"
        cursor.execute(query.encode('utf8'))
        return cursor.lastrowid
             
    def makeSqliteCacheFile(self, filename, cachetype):
        """Create an initial database in the given filename"""

        # If it exists, remove it as we were asked to create a new one
        if (os.path.exists(filename)):
            self.log(3, "Warning: cache already exists, removing old version")
            try:
                os.unlink(filename)
            except OSError:
                pass

        # Try to create the databse in filename, or use in memory when
        # this fails
        try:
            f = open(filename,'w')
            db = sqlite.connect(filename) 
        except IOError:
            self.log(1, "Warning could not create sqlite cache file, using in memory cache instead")
            db = sqlite.connect(":memory:")

        # The file has been created, now create the tables and indexes
        if (cachetype == 'primary'):
            self.createTablesPrimary(db)
        elif (cachetype == 'filelists'):
            self.createTablesFilelists(db)
        elif (cachetype == 'other'):
            self.createTablesOther(db)
        else:
            raise sqlite.DatabaseError, "Sorry don't know how to store %s" % (cachetype)
        return db

    def addPrimary(self, pkgId, package, cur):
        """Add a package to the primary cache"""
        # Store the package info into the packages table
        pkgKey = self.insertHash('packages', PackageToDBAdapter(package), cur)

        # Now store all prco data
        for ptype in package.prco:
            for entry in package.prco[ptype]:
                data = {
                    'pkgKey': pkgKey,
                    'name': entry.get('name'),
                    'flags': entry.get('flags'),
                    'epoch': entry.get('epoch'),
                    'version': entry.get('ver'),
                    'release': entry.get('rel'),
                }
                self.insertHash(ptype,data,cur)
        
        # Now store all file information
        for f in package.files:
            data = {
                'name': f,
                'type': package.files[f],
                'pkgKey': pkgKey,
            }
            self.insertHash('files',data,cur)

    def addFilelists(self, pkgId, package,cur):
        """Add a package to the filelists cache"""
        pkginfo = {'pkgId': pkgId}
        pkgKey = self.insertHash('packages',pkginfo, cur)
        dirs = {}
        for (filename,filetype) in package.files.iteritems():
            (dirname,filename) = (os.path.split(filename))
            if (dirs.has_key(dirname)):
                dirs[dirname]['files'].append(filename)
                dirs[dirname]['types'].append(filetype)
            else:
                dirs[dirname] = {}
                dirs[dirname]['files'] = [filename]
                dirs[dirname]['types'] = [filetype]

        for (dirname,dir) in dirs.items():
            data = {
                'pkgKey': pkgKey,
                'dirname': dirname,
                'filenames': encodefilenamelist(dir['files']),
                'filetypes': encodefiletypelist(dir['types'])
            }
            self.insertHash('filelist',data,cur)

    def addOther(self, pkgId, package,cur):
        pkginfo = {'pkgId': pkgId}
        pkgKey = self.insertHash('packages', pkginfo, cur)
        for entry in package['changelog']:
            data = {
                'pkgKey': pkgKey,
                'author': entry.get('author'),
                'date': entry.get('date'),
                'changelog': entry.get('value'),
            }
            self.insertHash('changelog', data, cur)

    def updateSqliteCache(self, db, parser, checksum, cachetype):
        """Update the sqlite cache by making it fit the packages described
        in dobj (info that has been read from primary.xml metadata) afterwards
        update the checksum of the database to checksum"""
       
        t = time.time()
        delcount = 0
        newcount = 0

        # We start be removing the old db_info, as it is no longer valid
        cur = db.cursor()
        cur.execute("DELETE FROM db_info") 

        # First create a list of all pkgIds that are in the database now
        cur.execute("SELECT pkgId, pkgKey from packages")
        currentpkgs = {}
        for pkg in cur.fetchall():
            currentpkgs[pkg['pkgId']] = pkg['pkgKey']

        if (cachetype == 'primary'):
            deltables = ("packages","files","provides","requires", 
                        "conflicts","obsoletes")
        elif (cachetype == 'filelists'):
            deltables = ("packages","filelist")
        elif (cachetype == 'other'):
            deltables = ("packages","changelog")
        else:
            raise sqlite.DatabaseError,"Unknown type %s" % (cachetype)
        
        # Add packages that are not in the database yet and build up a list of
        # all pkgids in the current metadata

        all_pkgIds = {}
        for package in parser:

            if self.callback is not None:
                self.callback.progressbar(parser.count, parser.total, self.repoid)

            pkgId = package['pkgId']
            all_pkgIds[pkgId] = 1

            # This package is already in the database, skip it now
            if (currentpkgs.has_key(pkgId)):
                continue

            # This is a new package, lets insert it
            newcount += 1
            if cachetype == 'primary':
                self.addPrimary(pkgId, package, cur)
            elif cachetype == 'filelists':
                self.addFilelists(pkgId, package, cur)
            elif cachetype == 'other':
                self.addOther(pkgId, package, cur)

        # Remove those which are not in dobj
        delpkgs = []
        for (pkgId, pkgKey) in currentpkgs.items():
            if not all_pkgIds.has_key(pkgId):
                delcount += 1
                delpkgs.append(str(pkgKey))
        delpkgs = "("+",".join(delpkgs)+")"
        for table in deltables:
            cur.execute("DELETE FROM "+table+ " where pkgKey in %s" % delpkgs)

        cur.execute("INSERT into db_info (dbversion,checksum) VALUES (%s,%s)",
                (dbversion,checksum))
        db.commit()
        self.log(2, "Added %s new packages, deleted %s old in %.2f seconds" % (
                newcount, delcount, time.time()-t))
        return db

    def log(self, level, msg):
        '''Log to callback (if set)
        '''
        if self.callback:
            self.callback.log(level, msg)

class PackageToDBAdapter:

    '''
    Adapt a PrimaryEntry instance to suit the sqlite database. 

    This hides certain attributes and converts some column names in order to
    decouple the parser implementation from the sqlite database schema.
    '''

    NAME_MAPS = {
        'rpm_package': 'package',
        'version': 'ver',
        'release': 'rel',
        'rpm_license': 'license',
        'rpm_vendor': 'vendor',
        'rpm_group': 'group',
        'rpm_buildhost': 'buildhost',
        'rpm_sourcerpm': 'sourcerpm',
        'rpm_packager': 'packager',
        }
    
    COLUMNS = (
            'pkgId',
            'name',
            'arch',
            'version',
            'epoch',
            'release',
            'summary',
            'description',
            'url',
            'time_file',
            'time_build',
            'rpm_license',
            'rpm_vendor',
            'rpm_group',
            'rpm_buildhost',
            'rpm_sourcerpm',
            'rpm_header_start',
            'rpm_header_end',
            'rpm_packager',
            'size_package',
            'size_installed',
            'size_archive',
            'location_href',
            'location_base',
            'checksum_type',
            'checksum_value',
            )

    def __init__(self, package):
        self._pkg = package

    def __getitem__(self, k):
        return self._pkg[self.NAME_MAPS.get(k, k)]

    def keys(self):
        return self.COLUMNS

    def values(self):
        out = []
        for k in self.keys():
            out.append(self[k])
        return out



--- NEW FILE sqlitesack.py ---
#!/usr/bin/python -tt

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 

#
# Implementation of the YumPackageSack class that uses an sqlite backend
#

import os
import os.path
import types
import repos
from packages import YumAvailablePackage
from repomd import mdUtils, mdErrors

# Simple subclass of YumAvailablePackage that can load 'simple headers' from
# the database when they are requested
class YumAvailablePackageSqlite(YumAvailablePackage):
    def __init__(self, pkgdict, repoid):
        YumAvailablePackage.__init__(self,pkgdict,repoid)
        self.sack = pkgdict.sack
        self.pkgId = pkgdict.pkgId
        self.simple['id'] = self.pkgId
        self.changelog = None
    
    def loadChangelog(self):
        if hasattr(self, 'dbusedother'):
            return
        self.dbusedother = 1
        self.changelog = self.sack.getChangelog(self.pkgId)

    def returnSimple(self, varname):
        if (not self.simple.has_key(varname) and not hasattr(self,'dbusedsimple')):
            # Make sure we only try once to get the stuff from the database
            self.dbusedsimple = 1
            details = self.sack.getPackageDetails(self.pkgId)
            self.importFromDict(details,self.simple['repoid'])

        return YumAvailablePackage.returnSimple(self,varname)

    def loadFiles(self):
        if (hasattr(self,'dbusedfiles')):
            return
        self.dbusedfiles = 1
        self.files = self.sack.getFiles(self.pkgId)

    def returnChangelog(self):
        self.loadChangelog()
        return YumAvailablePackage.returnChangelog(self)
            
    def returnFileEntries(self, ftype='file'):
        self.loadFiles()
        return YumAvailablePackage.returnFileEntries(self,ftype)
    
    def returnFileTypes(self):
        self.loadFiles()
        return YumAvailablePackage.returnFileTypes(self)

    def returnPrco(self, prcotype):
        if not self.prco[prcotype]:
           self.prco = self.sack.getPrco(self.pkgId, prcotype)
        return self.prco[prcotype]

class YumSqlitePackageSack(repos.YumPackageSack):
    """ Implementation of a PackageSack that uses sqlite cache instead of fully
    expanded metadata objects to provide information """

    def __init__(self, packageClass):
        # Just init as usual and create a dict to hold the databases
        repos.YumPackageSack.__init__(self,packageClass)
        self.primarydb = {}
        self.filelistsdb = {}
        self.otherdb = {}
        self.excludes = {}
        
    def buildIndexes(self):
        # We don't need these
        return

    def _checkIndexes(self, failure='error'):
        return

    # Remove a package
    # Because we don't want to remove a package from the database we just
    # add it to the exclude list
    def delPackage(self, obj):
        repoid = obj.repoid
        self.excludes[repoid][obj.pkgId] = 1

    def addDict(self, repoid, datatype, dataobj, callback=None):
        if (not self.excludes.has_key(repoid)): 
            self.excludes[repoid] = {}
        if datatype == 'metadata':
            if (self.primarydb.has_key(repoid)):
              return
            self.added[repoid] = ['primary']
            self.primarydb[repoid] = dataobj
        elif datatype == 'filelists':
            if (self.filelistsdb.has_key(repoid)):
              return
            self.added[repoid] = ['filelists']
            self.filelistsdb[repoid] = dataobj
        elif datatype == 'otherdata':
            if (self.otherdb.has_key(repoid)):
              return
            self.added[repoid] = ['otherdata']
            self.otherdb[repoid] = dataobj
        else:
            # We can not handle this yet...
            raise "Sorry sqlite does not support %s" % (datatype)
    
    def getChangelog(self,pkgId):
        result = []
        for (rep,cache) in self.otherdb.items():
            cur = cache.cursor()
            cur.execute("select changelog.date as date,\
                changelog.author as author,\
                changelog.changelog as changelog from packages,changelog where packages.pkgId = %s and packages.pkgKey = changelog.pkgKey",pkgId)
            for ob in cur.fetchall():
                result.append(( ob['date'],
                                ob['author'],
                                ob['changelog']
                              ))
        return result

    def getPrco(self,pkgId, prcotype=None):
        if prcotype is not None:
            result = {'requires': [], 'provides': [], 'obsoletes': [], 'conflicts': []}
        else:
            result = { prcotype: [] }
        for (rep, cache) in self.primarydb.items():
            cur = cache.cursor()
            for prco in result.keys():
                cur.execute("select %s.name as name, %s.version as version,\
                    %s.release as release, %s.epoch as epoch, %s.flags as flags\
                    from packages,%s\
                    where packages.pkgId = %s and packages.pkgKey = %s.pkgKey", prco, prco, prco, prco, prco, prco, pkgId, prco)
                for ob in cur.fetchall():
                    name = ob['name']
                    version = ob['version']
                    release = ob['release']
                    epoch = ob['epoch']
                    flags = ob['flags']
                    result[prco].append((name, flags, (epoch, version, release)))
        return result

    # Get all files for a certain pkgId from the filelists.xml metadata
    def getFiles(self,pkgId):
        for (rep,cache) in self.filelistsdb.items():
            found = False
            result = {}
            cur = cache.cursor()
            cur.execute("select filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames from packages,filelist\
                where packages.pkgId = %s and packages.pkgKey = filelist.pkgKey", pkgId)
            for ob in cur.fetchall():
                found = True
                dirname = ob['dirname']
                filetypes = decodefiletypelist(ob['filetypes'])
                filenames = decodefilenamelist(ob['filenames'])
                while(filenames):
                    if dirname:
                        filename = dirname+'/'+filenames.pop()
                    else:
                        filename = filenames.pop()
                    filetype = filetypes.pop()
                    result.setdefault(filetype,[]).append(filename)
            if (found):
                return result    
        return {}
            
    # Search packages that either provide something containing name
    # or provide a file containing name 
    def searchAll(self, name, query_type='like'):
        
        # This should never be called with a name containing a %
        assert(name.find('%') == -1)
        result = {}
        quotename = name.replace("'","''")
        (dirname,filename) = os.path.split(name)
        
        # check provides
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select DISTINCT packages.pkgId as pkgId from provides,packages where provides.name LIKE '%%%s%%' AND provides.pkgKey = packages.pkgKey" % quotename)
            for ob in cur.fetchall():
                if (self.excludes[rep].has_key(ob['pkgId'])):
                    continue

                pkgid = ob['pkgId']
                if not result.has_key(pkgid):
                    pkg = self.getPackageDetails(ob['pkgId'])
                    result[pkgid] = (self.pc(pkg,rep))
        
        # check filelists/dirlists
        for (rep,cache) in self.filelistsdb.items():
            querystrings = []
            # dirnames
            # just the dirname
            if dirname != '':
                tmp = "select packages.pkgId as pkgId,\
                filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames \
                from packages,filelist where \
                filelist.dirname LIKE '%%%s%%' \
                AND (filelist.pkgKey = packages.pkgKey)" % (dirname)
                querystrings.append(tmp)
                
            # look at full quotename
            tmp = "select packages.pkgId as pkgId,\
                filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames \
                from packages,filelist where \
                filelist.dirname LIKE '%%%s%%' \
                AND (filelist.pkgKey = packages.pkgKey)" % (quotename)
            querystrings.append(tmp)

            # filenames
            tmp = "select packages.pkgId as pkgId,\
                filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames \
                from packages,filelist where \
                filelist.filenames LIKE '%%%s%%'\
                AND (filelist.pkgKey = packages.pkgKey)" % (filename)
            
            querystrings.append(tmp)
        
            for querystring in querystrings:
                cur = cache.cursor()
                cur.execute("%s" % querystring)

                # cull the results for false positives
                for ob in cur.fetchall():
                    # Check if it is an actual match
                    # The query above can give false positives, when
                    # a package provides /foo/aaabar it will also match /foo/bar
                    if (self.excludes[rep].has_key(ob['pkgId'])):
                        continue
                    real = False
        
                    for filename in decodefilenamelist(ob['filenames']):
                        if (ob['dirname'] + '/' + filename).find(name) != -1:
                            real = True
                    if (not real):
                        continue

                    pkgid = ob['pkgId']
                    if not result.has_key(pkgid):
                        pkg = self.getPackageDetails(ob['pkgId'])
                        result[pkgid] = (self.pc(pkg,rep))

        return result.values()
    
    def returnObsoletes(self):
        obsoletes = {}
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select packages.name as name,\
                packages.pkgId as pkgId,\
                packages.arch as arch, packages.epoch as epoch,\
                packages.release as release, packages.version as version,\
                obsoletes.name as oname, obsoletes.epoch as oepoch,\
                obsoletes.release as orelease, obsoletes.version as oversion,\
                obsoletes.flags as oflags\
                from obsoletes,packages where obsoletes.pkgKey = packages.pkgKey")
            for ob in cur.fetchall():
                # If the package that is causing the obsoletes is excluded
                # continue without processing the obsoletes
                if (self.excludes[rep].has_key(ob['pkgId'])):
                    continue
                key = ( ob['name'],ob['arch'],
                        ob['epoch'],ob['version'],
                        ob['release'])
                (n,f,e,v,r) = ( ob['oname'],ob['oflags'],
                                ob['oepoch'],ob['oversion'],
                                ob['orelease'])

                obsoletes.setdefault(key,[]).append((n,f,(e,v,r)))

        return obsoletes

    def getPackageDetails(self,pkgId):
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select * from packages where pkgId = %s",pkgId)
            for ob in cur.fetchall():
                pkg = self.db2class(ob)
                return pkg

    def searchPrco(self, name, prcotype):
        """return list of packages having prcotype name (any evr and flag)"""
        results = []
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select * from %s where name = %s" , (prcotype, name))
            prcos = cur.fetchall()
            for res in prcos:
                cur.execute("select * from packages where pkgKey = %s" , (res['pkgKey']))
                for x in cur.fetchall():
                    pkg = self.db2class(x)
                    if (self.excludes[rep].has_key(pkg.pkgId)):
                        continue
                                            
                    # Add this provides to prco otherwise yum doesn't understand
                    # that it matches
                    pkg.prco = {prcotype: 
                      [
                      { 'name': res.name,
                        'flags': res.flags,
                        'rel': res.release,
                        'ver': res.version,
                        'epoch': res.epoch
                      }
                      ]
                    }
                    results.append(self.pc(pkg,rep))


        # If it's not a provides or a filename, we are done
        if (prcotype != "provides" or name.find('/') != 0):
            return results

        # If it is a filename, search the primary.xml file info
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select * from files where name = %s" , (name))
            files = cur.fetchall()
            for res in files:
                cur.execute("select * from packages where pkgKey = %s" , (res['pkgKey']))
                for x in cur.fetchall():
                    pkg = self.db2class(x)
                    if (self.excludes[rep].has_key(pkg.pkgId)):
                        continue
                                            
                    pkg.files = {name: res['type']}
                    results.append(self.pc(pkg,rep))

        # If it is a filename, search the files.xml file info
        for (rep,cache) in self.filelistsdb.items():
            cur = cache.cursor()
            (dirname,filename) = os.path.split(name)
            cur.execute("select packages.pkgId as pkgId,\
                filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames \
                from filelist,packages where dirname = %s AND filelist.pkgKey = packages.pkgKey" , (dirname))
            files = cur.fetchall()
            for res in files:
                if (self.excludes[rep].has_key(res['pkgId'])):
                    continue
                                        
                # If it matches the dirname, that doesnt mean it matches
                # the filename, check if it does
                if filename and \
                  not filename in res['filenames'].split('/'):
                    continue
                # If it matches we only know the packageId
                pkg = self.getPackageDetails(res['pkgId'])
                results.append(self.pc(pkg,rep))
        return results

    def searchProvides(self, name):
        """return list of packages providing name (any evr and flag)"""
        return self.searchPrco(name, "provides")
                
    def searchRequires(self, name):
        """return list of packages requiring name (any evr and flag)"""
        return self.searchPrco(name, "requires")

    def searchObsoletes(self, name):
        """return list of packages obsoleting name (any evr and flag)"""
        return self.searchPrco(name, "obsoletes")

    def searchConflicts(self, name):
        """return list of packages conflicting with name (any evr and flag)"""
        return self.searchPrco(name, "conflicts")

    # TODO this seems a bit ugly and hackish
    def db2class(self,db,nevra_only=False):
      class tmpObject:
        pass
      y = tmpObject()
      y.nevra = (db.name,db.epoch,db.version,db.release,db.arch)
      y.sack = self
      y.pkgId = db.pkgId
      if (nevra_only):
        return y
      y.hdrange = {'start': db.rpm_header_start,'end': db.rpm_header_end}
      y.location = {'href': db.location_href,'value': '', 'base': db.location_base}
      y.checksum = {'pkgid': 'YES','type': db.checksum_type, 
                    'value': db.checksum_value }
      y.time = {'build': db.time_build, 'file': db.time_file }
      y.size = {'package': db.size_package, 'archive': db.size_archive, 'installed': db.size_installed }
      y.info = {'summary': db.summary, 'description': db['description'],
                'packager': db.rpm_packager, 'group': db.rpm_group,
                'buildhost': db.rpm_buildhost, 'sourcerpm': db.rpm_sourcerpm,
                'url': db.url, 'vendor': db.rpm_vendor, 'license': db.rpm_license }
      return y

    def simplePkgList(self, repoid=None):
        """returns a list of pkg tuples (n, a, e, v, r) optionally from a single repoid"""
        simplelist = []
        for (rep,cache) in self.primarydb.items():
            if (repoid == None or repoid == rep):
                cur = cache.cursor()
                cur.execute("select pkgId,name,epoch,version,release,arch from packages")
                for pkg in cur.fetchall():
                    if (self.excludes[rep].has_key(pkg.pkgId)):
                        continue                        
                    simplelist.append((pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)) 
                    
        return simplelist

    def returnNewestByNameArch(self, naTup=None):
        # If naTup is set do it from the database otherwise use our parent's
        # returnNewestByNameArch
        if (not naTup):
            # TODO process excludes here
            return repos.YumPackageSack.returnNewestByNameArch(self, naTup)

        # First find all packages that fulfill naTup
        allpkg = []
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select pkgId,name,epoch,version,release,arch from packages where name=%s and arch=%s",naTup)
            for x in cur.fetchall():
                if (self.excludes[rep].has_key(x.pkgId)):
                    continue                    
                allpkg.append(self.pc(self.db2class(x,True),rep))
        
        # if we've got zilch then raise
        if not allpkg:
            raise mdErrors.PackageSackError, 'No Package Matching %s.%s' % naTup
        return mdUtils.newestInList(allpkg)

    def returnNewestByName(self, name=None):
        # If name is set do it from the database otherwise use our parent's
        # returnNewestByName
        if (not name):
            return repos.YumPackageSack.returnNewestByName(self, name)

        # First find all packages that fulfill name
        allpkg = []
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select pkgId,name,epoch,version,release,arch from packages where name=%s", name)
            for x in cur.fetchall():
                if (self.excludes[rep].has_key(x.pkgId)):
                    continue                    
                allpkg.append(self.pc(self.db2class(x,True),rep))
        
        # if we've got zilch then raise
        if not allpkg:
            raise mdErrors.PackageSackError, 'No Package Matching %s' % name
        return mdUtils.newestInList(allpkg)

    def returnPackages(self, repoid=None):
        """Returns a list of packages, only containing nevra information """
        returnList = []
        for (rep,cache) in self.primarydb.items():
            if (repoid == None or repoid == rep):
                cur = cache.cursor()
                cur.execute("select pkgId,name,epoch,version,release,arch from packages")
                for x in cur.fetchall():
                    if (self.excludes[rep].has_key(x.pkgId)):
                        continue                    
                    returnList.append(self.pc(self.db2class(x,True),rep))
        return returnList

    def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):        
        """return list of pkgobjects matching the nevra requested"""
        returnList = []
        
        # make sure some dumbass didn't pass us NOTHING to search on
        empty = True
        for arg in (name, epoch, ver, rel, arch):
            if arg:
                empty = False
        if empty:
            return returnList
        
        # make up our execute string
        q = "select * from packages WHERE"
        for (col, var) in [('name', name), ('epoch', epoch), ('version', ver),
                           ('arch', arch), ('release', rel)]:
            if var:
                if q[-5:] != 'WHERE':
                    q = q + ' AND %s = "%s"' % (col, var)
                else:
                    q = q + ' %s = "%s"' % (col, var)
            
        # Search all repositories            
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            #cur.execute("select * from packages WHERE name = %s AND epoch = %s AND version = %s AND release = %s AND arch = %s" , (name,epoch,ver,rel,arch))
            cur.execute(q)
            for x in cur.fetchall():
                if (self.excludes[rep].has_key(x.pkgId)):
                    continue
                returnList.append(self.pc(self.db2class(x),rep))
        return returnList
    
    def excludeArchs(self, archlist):
        """excludes incompatible arches - archlist is a list of compat arches"""
        tmpstring = "select * from packages WHERE "
        for arch in archlist:
            tmpstring = tmpstring + 'arch != "%s" AND ' % arch
        
        last = tmpstring.rfind('AND') # clip that last AND
        querystring = tmpstring[:last]
        for (rep, cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute(querystring)
            for x in cur.fetchall():
                obj = self.pc(self.db2class(x), rep)
                self.delPackage(obj)

# Simple helper functions

# Return a string representing filenamelist (filenames can not contain /)
def encodefilenamelist(filenamelist):
    return '/'.join(filenamelist)

# Return a list representing filestring (filenames can not contain /)
def decodefilenamelist(filenamestring):
    return filenamestring.split('/')

# Return a string representing filetypeslist
# filetypes should be file, dir or ghost
def encodefiletypelist(filetypelist):
    result = ''
    ft2string = {'file': 'f','dir': 'd','ghost': 'g'}
    for x in filetypelist:
        result += ft2string[x]
    return result

# Return a list representing filetypestring
# filetypes should be file, dir or ghost
def decodefiletypelist(filetypestring):
    string2ft = {'f':'file','d': 'dir','g': 'ghost'}
    return [string2ft[x] for x in filetypestring]



--- NEW FILE transactioninfo.py ---
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University
# Written by Seth Vidal

# TODOS: make all the package relationships deal with package objects
# search by package object for TransactionData, etc.
# provide a real TransactionData.remove(txmbr) method, It should 
# remove the given txmbr and iterate to remove all those in depedent relationships
# with the given txmbr. 

from constants import *

class TransactionData:
    """Data Structure designed to hold information on a yum Transaction Set"""
    def __init__(self):
        self.flags = []
        self.vsflags = []
        self.probFilterFlags = []
        self.root = '/'
        self.pkgdict = {} # key = pkgtup, val = list of TransactionMember obj
        self.debug = 0
        self.changed = False

    def __len__(self):
        return len(self.pkgdict.values())
        
    def __iter__(self):
        if hasattr(self.getMembers(), '__iter__'):
            return self.getMembers().__iter__()
        else:
            return iter(self.getMembers())

    def debugprint(self, msg):
        if self.debug:
            print msg


    def getMembers(self, pkgtup=None):
        """takes an optional package tuple and returns all transaction members 
           matching, no pkgtup means it returns all transaction members"""
        
        if pkgtup is None:
            returnlist = []
            for key in self.pkgdict.keys():
                returnlist.extend(self.pkgdict[key])
                
            return returnlist

        if self.pkgdict.has_key(pkgtup):
            return self.pkgdict[pkgtup]
        else:
            return []
            
    def getMode(self, name=None, arch=None, epoch=None, ver=None, rel=None):
        """returns the mode of the first match from the transaction set, 
           otherwise, returns None"""

        txmbrs = self.matchNaevr(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel)
        if len(txmbrs):
            return txmbrs[0].ts_state
        else:
            return None

    
    def matchNaevr(self, name=None, arch=None, epoch=None, ver=None, rel=None):
        """returns the list of packages matching the args above"""
        completelist = self.pkgdict.keys()
        removedict = {}
        returnlist = []
        returnmembers = []
        
        for pkgtup in completelist:
            (n, a, e, v, r) = pkgtup
            if name is not None:
                if name != n:
                    removedict[pkgtup] = 1
                    continue
            if arch is not None:
                if arch != a:
                    removedict[pkgtup] = 1
                    continue
            if epoch is not None:
                if epoch != e:
                    removedict[pkgtup] = 1
                    continue
            if ver is not None:
                if ver != v:
                    removedict[pkgtup] = 1
                    continue
            if rel is not None:
                if rel != r:
                    removedict[pkgtup] = 1
                    continue
        
        for pkgtup in completelist:
            if not removedict.has_key(pkgtup):
                returnlist.append(pkgtup)
        
        for matched in returnlist:
            returnmembers.extend(self.pkgdict[matched])

        return returnmembers

    def add(self, txmember):
        """add a package to the transaction"""
        
        if not self.pkgdict.has_key(txmember.pkgtup):
            self.pkgdict[txmember.pkgtup] = []
        else:
            self.debugprint("Package: %s.%s - %s:%s-%s already in ts" % txmember.pkgtup)
            for member in self.pkgdict[txmember.pkgtup]:
                if member.ts_state == txmember.ts_state:
                    self.debugprint("Package in same mode, skipping.")
                    return
        self.pkgdict[txmember.pkgtup].append(txmember)
        self.changed = True

    def remove(self, pkgtup):
        """remove a package from the transaction"""
        if not self.pkgdict.has_key(pkgtup):
            self.debugprint("Package: %s not in ts" %(pkgtup,))
            return
        for txmbr in self.pkgdict[pkgtup]:
            txmbr.po.state = None
        
        del self.pkgdict[pkgtup]
        self.changed = True        
    
    def exists(self, pkgtup):
        """tells if the pkg is in the class"""
        if self.pkgdict.has_key(pkgtup):
            if len(self.pkgdict[pkgtup]) != 0:
                return 1
        
        return 0

    def isObsoleted(self, pkgtup):
        """true if the pkgtup is marked to be obsoleted"""
        if self.exists(pkgtup):
            for txmbr in self.getMembers(pkgtup=pkgtup):
                if txmbr.output_state == TS_OBSOLETED:
                    return True
        
        return False
                
    def makelists(self):
        """returns lists of transaction Member objects based on mode:
           updated, installed, erased, obsoleted, depupdated, depinstalled
           deperased"""
           
        self.instgroups = []
        self.removedgroups = []
        self.removed = []
        self.installed = []
        self.updated = []
        self.obsoleted = []
        self.depremoved = []
        self.depinstalled = []
        self.depupdated = []
        
        for txmbr in self.getMembers():
            if txmbr.output_state == TS_UPDATE:
                if txmbr.isDep:
                    self.depupdated.append(txmbr)
                else:
                    self.updated.append(txmbr)
                    
            elif txmbr.output_state == TS_INSTALL or txmbr.output_state == TS_TRUEINSTALL:
                if txmbr.groups:
                    for g in txmbr.groups:
                        if g not in self.instgroups:
                            self.instgroups.append(g)
                if txmbr.isDep:
                    self.depinstalled.append(txmbr)
                else:
                    self.installed.append(txmbr)
            
            elif txmbr.output_state == TS_ERASE:
                for g in txmbr.groups:
                    if g not in self.instgroups:
                        self.removedgroups.append(g)
                if txmbr.isDep:
                    self.depremoved.append(txmbr)
                else:
                    self.removed.append(txmbr)
                    
            elif txmbr.output_state == TS_OBSOLETED:
                self.obsoleted.append(txmbr)
                
            elif txmbr.output_state == TS_OBSOLETING:
                self.installed.append(txmbr)
                
            else:
                pass
    
            self.updated.sort()
            self.installed.sort()
            self.removed.sort()
            self.obsoleted.sort()
            self.depupdated.sort()
            self.depinstalled.sort()
            self.depremoved.sort()
            self.instgroups.sort()
            self.removedgroups.sort()

    
    def addInstall(self, po):
        """adds a package as an install but in mode 'u' to the ts
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_AVAILABLE
        txmbr.output_state = TS_INSTALL
        txmbr.po.state = TS_INSTALL        
        txmbr.ts_state = 'u'
        txmbr.reason = 'user'
        self.add(txmbr)
        return txmbr

    def addTrueInstall(self, po):
        """adds a package as an install
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_AVAILABLE
        txmbr.output_state = TS_TRUEINSTALL
        txmbr.po.state = TS_INSTALL        
        txmbr.ts_state = 'i'
        txmbr.reason = 'user'
        self.add(txmbr)
        return txmbr
    

    def addErase(self, po):
        """adds a package as an erasure
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_INSTALL
        txmbr.output_state = TS_ERASE
        txmbr.po.state = TS_INSTALL
        txmbr.ts_state = 'e'
        self.add(txmbr)
        return txmbr

    def addUpdate(self, po, oldpo=None):
        """adds a package as an update
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_AVAILABLE
        txmbr.output_state = TS_UPDATE
        txmbr.po.state = TS_UPDATE        
        txmbr.ts_state = 'u'
        if oldpo:
            txmbr.relatedto.append((oldpo.pkgtup, 'updates'))
            txmbr.updates.append(oldpo)
        self.add(txmbr)
        return txmbr

    def addObsoleting(self, po, oldpo):
        """adds a package as an obsolete over another pkg
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_AVAILABLE
        txmbr.output_state = TS_OBSOLETING
        txmbr.po.state = TS_OBSOLETING
        txmbr.ts_state = 'u'
        txmbr.relatedto.append((oldpo, 'obsoletes'))
        txmbr.obsoletes.append(oldpo)
        self.add(txmbr)
        return txmbr

    def addObsoleted(self, po, obsoleting_po):
        """adds a package as being obsoleted by another pkg
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_INSTALL
        txmbr.output_state =  TS_OBSOLETED
        txmbr.po.state = TS_OBSOLETED
        txmbr.ts_state = None
        txmbr.relatedto.append((obsoleting_po, 'obsoletedby'))
        txmbr.obsoleted_by.append(obsoleting_po)
        self.add(txmbr)
        return txmbr

class ConditionalTransactionData(TransactionData):
    """A transaction data implementing conditional package addition"""
    def __init__(self):
        # Key: package name to trigger condition
        # Value: list of package objects to add
        self.conditionals = {}
        TransactionData.__init__(self)

    def add(self, txmember):
        TransactionData.add(self, txmember)
        if self.conditionals.has_key(txmember.name):
            for po in self.conditionals[txmember.name]:
                condtxmbr = self.addInstall(po)
                condtxmbr.setAsDep(po=txmember.po)

class SortableTransactionData(ConditionalTransactionData):
    """A transaction data implementing topological sort on it's members"""
    def __init__(self):
        # Cache of sort
        self._sorted = []
        # Current dependency path
        self.path = []
        # List of loops
        self.loops = []
        ConditionalTransactionData.__init__(self)

    def _visit(self, txmbr):
        self.path.append(txmbr.name)
        txmbr.sortColour = TX_GREY
        for po in txmbr.depends_on:
            vertex = self.getMembers(pkgtup=po.pkgtup)[0]
            if vertex.sortColour == TX_GREY:
                self._doLoop(vertex.name)
            if vertex.sortColour == TX_WHITE:
                self._visit(vertex)
        txmbr.sortColour = TX_BLACK
        self._sorted.insert(0, txmbr.pkgtup)

    def _doLoop(self, name):
        self.path.append(name)
        loop = self.path[self.path.index(self.path[-1]):]
        if len(loop) > 2:
            self.loops.append(loop)

    def add(self, txmember):
        txmember.sortColour = TX_WHITE
        ConditionalTransactionData.add(self, txmember)
        self._sorted = []

    def remove(self, pkgtup):
        ConditionalTransactionData.remove(self, pkgtup)
        self._sorted = []

    def sort(self):
        if self._sorted:
            return self._sorted
        self._sorted = []
        # loop over all members
        for txmbr in self.getMembers():
            if txmbr.sortColour == TX_WHITE:
                self.path = [ ]
                self._visit(txmbr)
        self._sorted.reverse()
        return self._sorted

class TransactionMember:
    """Class to describe a Transaction Member (a pkg to be installed/
       updated/erased)."""
    
    def __init__(self, po):
        # holders for data
        self.po = po # package object
        self.current_state = None # where the package currently is (repo, installed)
        self.ts_state = None # what state to put it into in the transaction set
        self.output_state = None # what state to list if printing it
        self.isDep = 0
        self.reason = 'user' # reason for it to be in the transaction set
        self.process = None # 
        self.relatedto = [] # ([relatedpkgtup, relationship)]
        self.depends_on = []
        self.obsoletes = []
        self.obsoleted_by = []
        self.updates = []
        self.updated_by = []
        self.groups = [] # groups it's in
        self._poattr = ['pkgtup', 'repoid', 'name', 'arch', 'epoch', 'version',
                        'release']

        for attr in self._poattr:
            val = getattr(self.po, attr)
            setattr(self, attr, val)

    def setAsDep(self, po=None):
        """sets the transaction member as a dependency and maps the dep into the
           relationship list attribute"""
        
        self.isDep = 1
        if po:
            self.relatedto.append((po.pkgtup, 'dependson'))
            self.depends_on.append(po)

    def __cmp__(self, other):
        if self.name > other.name:
            return 1
        if self.name < other.name:
            return -1
        if self.name == other.name:
            return 0

    def __hash__(self):
        return hash(self.po.pkgtup)
            
    def __str__(self):
        return "%s.%s %s-%s-%s - %s" % (self.name, self.arch, self.epoch,
                                        self.version, self.release, self.ts_state)
        
    # This is the tricky part - how do we nicely setup all this data w/o going insane
    # we could make the txmember object be created from a YumPackage base object
    # we still may need to pass in 'groups', 'ts_state', 'output_state', 'reason', 'current_state'
    # and any related packages. A world of fun that will be, you betcha
    
    
    # definitions
    # current and output states are defined in constants
    # relationships are defined in constants
    # ts states are: u, i, e
    


--- NEW FILE update_md.py ---
#!/usr/bin/python -t

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 


import sys
from cElementTree import iterparse
import exceptions



class UpdateNoticeException(exceptions.Exception):
    pass
    
    
class UpdateNotice(object):
    def __init__(self, elem=None):
        self.cves = []
        self.urls = []
        self.packages = []
        self.description = ''
        self.update_id = None
        self.distribution = None
        self.release_date = None
        self.status = None
        self.classification = None
        self.title = ''
        
        if elem:
            self.parse(elem)
    
    def __str__(self):
        cveinfo = pkglist = related = ''
        
        head = """
Class: %s
Status: %s
Distribution: %s
ID: %s
Release date: %s
Description: 
%s
        """ % (self.classification, self.status, self.distribution, 
               self.update_id, self.release_date, self.description)

        if self.urls:
            related = '\nRelated URLS:\n'
            for url in self.urls:
                related = related + '  %s\n' % url
        
        if self.cves:
            cveinfo = '\nResolves CVES:\n'
            for cve in self.cves:
                cveinfo = cveinfo + '  %s\n' % cve
        
        if self.packages:
            pkglist = '\nPackages: \n'
            for pkg in self.packages:
                pkgstring = '%s-%s-%s.%s\t\t%s\n' % (pkg['name'], pkg['ver'],
                                                    pkg['rel'], pkg['arch'],
                                                    pkg['pkgid'])
                pkglist = pkglist + pkgstring
        
        msg = head + related + cveinfo + pkglist
        
        return msg

    def parse(self, elem):
        if elem.tag == 'update':
            id = elem.attrib.get('id')
            if not id:
                raise UpdateNoticeException
            self.update_id = id
            
            self.release_date = elem.attrib.get('release_date')
            self.status = elem.attrib.get('status')
            c = elem.attrib.get('class')
            if not c:
                self.classification = 'update'
            else:
                self.classification = c

        for child in elem:

            if child.tag == 'cve':
                self.cves.append(child.text)

            elif child.tag == 'url':
                self.urls.append(child.text)
            
            elif child.tag == 'description':
                self.description = child.text
            
            elif child.tag == 'distribution':
                self.distribution = child.text
            
            elif child.tag == 'title':
                self.title = child.text

            elif child.tag == 'package':
                self.parse_package(child)
        
    def parse_package(self, elem):
        
        pkg = {}
        pkg['pkgid'] = elem.attrib.get('pkgid')
        pkg['name']  = elem.attrib.get('name')
        pkg['arch'] = elem.attrib.get('arch')
        for child in elem:
            if child.tag == 'version':
                pkg['ver'] = child.attrib.get('ver')
                pkg['rel'] = child.attrib.get('rel')
                pkg['epoch'] = child.attrib.get('epoch')
        
        self.packages.append(pkg)




class UpdateMetadata(object):
    def __init__(self):
        self._notices = {}
        
    def get_notices(self):
        return self._notices.values()

    notices = property(get_notices)
    
    def add(self, srcfile):
        if not srcfile:
            raise UpdateNoticeException
            
        if type(srcfile) == type('str'):
            infile = open(srcfile, 'rt')
        else:   # srcfile is a file object
            infile = srcfile
        
        parser = iterparse(infile)

        for event, elem in parser:
            if elem.tag == 'update':
                un = UpdateNotice(elem)
                if not self._notices.has_key(un.update_id):
                    self._notices[un.update_id] = un
                
            
        del parser
    
    def dump(self):
        for notice in self.notices:
            print notice


def main():

    try:
        print sys.argv[1]
        um = UpdateMetadata()
        for srcfile in sys.argv[1:]:
            um.add(srcfile)

        um.dump()
        
    except IOError:
        print >> sys.stderr, "update_md.py: No such file:\'%s\'" % sys.argv[1:]
        sys.exit(1)
        
if __name__ == '__main__':
    main()



From fedora-extras-commits at redhat.com  Sun Oct 15 12:30:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:30:46 -0700
Subject: extras-buildsys/utils/pushscript/rpmUtils __init__.py, NONE,
	1.1 arch.py, NONE, 1.1 miscutils.py, NONE, 1.1 oldUtils.py,
	NONE, 1.1 transaction.py, NONE, 1.1 updates.py, NONE, 1.1
Message-ID: <200610151230.k9FCUkUT030931@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/rpmUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805/rpmUtils

Added Files:
	__init__.py arch.py miscutils.py oldUtils.py transaction.py 
	updates.py 
Log Message:
Add the patched yum 2.6.1 here, so we remove the dependency on the
system-installed one.




--- NEW FILE __init__.py ---
#!/usr/bin/python -tt

import rpm
import miscutils
import exceptions
import oldUtils


class RpmUtilsError(exceptions.Exception):
    def __init__(self, args=None):
        exceptions.Exception.__init__(self)
        self.args = args

    

# useful functions
def getHeadersByKeyword(ts, **kwargs):
    """return list of headers from the rpmdb matching a keyword
        ex: getHeadersByKeyword(name='foo', version='1', release='1')
    """
    lst = []
    # lifted from up2date - way to easy and useful NOT to steal - thanks adrian
    mi = ts.dbMatch()
    if kwargs.has_key('epoch'):
        del(kwargs['epoch']) # epochs don't work here for None/0/'0' reasons
        
    keywords = len(kwargs.keys())
    for hdr in mi:
        match = 0
        for keyword in kwargs.keys():
            if hdr[keyword] == kwargs[keyword]:
                match += 1
        if match == keywords:
            lst.append(hdr)
    del mi
    return lst
        
def getIndexesByKeyword(ts, **kwargs):
    """return list of headers Indexes from the rpmdb matching a keyword
        ex: getHeadersByKeyword(name='foo', version='1', release='1')
    """
    # THIS IS EXCRUCIATINGLY SLOW
    lst = []
    mi = ts.dbMatch()
    for keyword in kwargs.keys():
        mi.pattern(keyword, rpm.RPMMIRE_GLOB, kwargs[keyword])

    # we really shouldnt be getting multiples here, but what the heck
    for h in mi:
        instance = mi.instance()
        lst.append(instance)
    del mi
    return lst

class RpmDBHolder:
    def __init__(self):
        self.pkglists = []
        
    def addDB(self, ts):
        self.ts = ts
        self.match_on_index = 1
        
        try:
            # we need the find a known index so we can test if
            # rpm/rpm-python allows us to grab packages by db index.
            mi = self.ts.dbMatch()
            hdr = mi.next()
            known_index = mi.instance()
            mi = self.ts.dbMatch(0, known_index)
            hdr = mi.next()
        except (TypeError, StopIteration), e:
            self.match_on_index = 0
        else:
            self.match_on_index = 1
            
        self.indexdict = {}
        
        mi = self.ts.dbMatch()
        for hdr in mi:
            pkgtuple = self._hdr2pkgTuple(hdr)
            if not self.indexdict.has_key(pkgtuple):
                self.indexdict[pkgtuple] = []
            else:
                continue
            self.indexdict[pkgtuple].append(mi.instance())
            self.pkglists.append(pkgtuple)
        del mi
        
    def _hdr2pkgTuple(self, hdr):
        name = hdr['name']
        arch = hdr['arch']
        ver = str(hdr['version']) # convert these to strings to be sure
        rel = str(hdr['release'])
        epoch = hdr['epoch']
        if epoch is None:
            epoch = '0'
        else:
            epoch = str(epoch)
    
        return (name, arch, epoch, ver, rel)
    
    def getPkgList(self):
        return self.pkglists
    
    def getHdrList(self):
        hdrlist = []
        mi = self.ts.dbMatch()
        if mi:
            for hdr in mi:
                hdrlist.append(hdr)

        del mi
        return hdrlist
            
    def getNameArchPkgList(self):
        lst = []
        for (name, arch, epoch, ver, rel) in self.pkglists:
            lst.append((name, arch))
        
        return miscutils.unique(lst)
        
        
    def getNamePkgList(self):
        lst = []
        for (name, arch, epoch, ver, rel) in self.pkglists:
            lst.append(name)
            
        return miscutils.unique(lst)

    def returnNewestbyNameArch(self):
        """returns the newest set of pkgs based on 'name and arch'"""
        highdict = {}
        for (n, a, e, v, r) in self.pkglists:
            if not highdict.has_key((n, a)):
                highdict[(n, a)] = (e, v, r)
            else:
                (e2, v2, r2) = highdict[(n, a)]
                rc = miscutils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[(n, a)] = (e, v, r)
                    
        returns = []
        for (n, a) in highdict.keys():
            (e, v, r) = highdict[(n, a)]
            returns.append((n, a, e, v ,r))
            
        return returns
        
    def returnNewestbyName(self):
        """returns the newest set of pkgs based on name"""
        highdict = {}
        for (n, a, e, v, r) in self.pkglists:
            if not highdict.has_key(n):
                highdict[n] = (a, e, v, r)
            else:
                (a2, e2, v2, r2) = highdict[n]
                rc = miscutils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[n] = (a, e, v, r)
                    
        returns = []
        for n in highdict.keys():
            (a, e, v, r) = highdict[n]
            returns.append((n, a, e, v ,r))
            
        return returns
    
    def installed(self, name=None, arch=None, epoch=None, ver=None, rel=None):
        if len(self.returnTupleByKeyword(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel)) > 0:
            return 1
        return 0

    
    def returnTupleByKeyword(self, name=None, arch=None, epoch=None, ver=None, rel=None):
        """return a list of pkgtuples based on name, arch, epoch, ver and/or rel 
           matches."""
        
        completelist = self.getPkgList()
        removedict = {}
        returnlist = []
        
        for pkgtup in completelist:
            (n, a, e, v, r) = pkgtup
            if name is not None:
                if name != n:
                    removedict[pkgtup] = 1
                    continue
            if arch is not None:
                if arch != a:
                    removedict[pkgtup] = 1
                    continue
            if epoch is not None:
                if epoch != e:
                    removedict[pkgtup] = 1
                    continue
            if ver is not None:
                if ver != v:
                    removedict[pkgtup] = 1
                    continue
            if rel is not None:
                if rel != r:
                    removedict[pkgtup] = 1
                    continue
                    
        for pkgtup in completelist:
            if not removedict.has_key(pkgtup):
                returnlist.append(pkgtup)
        
        return returnlist

    def returnHeaderByTuple(self, pkgtuple):
        """returns a list of header(s) based on the pkgtuple provided"""
        (n, a, e, v, r) = pkgtuple
        
        if not self.match_on_index:
            lst = getHeadersByKeyword(self.ts, name=n, arch=a, epoch=e, version=v, 
                                  release=r)
            return lst
        else:
            idxs = self.returnIndexByTuple(pkgtuple)
            idx = idxs[0]
            mi = self.ts.dbMatch(0, idx)
            hdr = mi.next()
            return [hdr]

        
    def returnIndexByTuple(self, pkgtuple):
        return self.indexdict[pkgtuple]
    
    def whatProvides(self, provname, provflag, provver):
        """uses the ts in this class to return a list of pkgtuples that match
           the provide"""
        
        matches = []
        checkfileprov = 0
        
        if provname[0] == '/':
            checkfileprov = 1
            matchingFileHdrs = self.ts.dbMatch('basenames', provname)
            matchingHdrs = self.ts.dbMatch('provides', provname)            
        else:
            matchingHdrs = self.ts.dbMatch('provides', provname)

        # now we have the list of pkgs installed in the rpmdb that
        # have a the provname matching, now we need to find out
        # if any/all of them match the flag/ver set
        
        if checkfileprov and matchingFileHdrs.count() > 0:
            for matchhdr in matchingFileHdrs:
                pkgtuple = self._hdr2pkgTuple(matchhdr)
                matches.append(pkgtuple)
            del matchingFileHdrs
            return miscutils.unique(matches)

        if provflag in [0, None] or provver is None: # if we've got no ver or flag
                                                     # for comparison then they all match
            for matchhdr in matchingHdrs:
                pkgtuple = self._hdr2pkgTuple(matchhdr)
                matches.append(pkgtuple)
            del matchingHdrs
            return miscutils.unique(matches)
        
        for matchhdr in matchingHdrs:
            (pkg_n, pkg_a, pkg_e, pkg_v, pkg_r) = self._hdr2pkgTuple(matchhdr)
            pkgtuple = (pkg_n, pkg_a, pkg_e, pkg_v, pkg_r)
            # break the provver up into e-v-r (e:v-r)
            (prov_e, prov_v, prov_r) = miscutils.stringToVersion(provver)
            provtuple = (provname, provflag, (prov_e, prov_v, prov_r))
            # find the provide in the header 
            providelist = self._providesList(matchhdr)
            for (name, flag, ver) in providelist:
                if name != provname: # definitely not
                    continue

                match_n = name
                match_a = pkg_a # you got a better idea?
                if ver is not None:
                    (match_e, match_v, match_r) = miscutils.stringToVersion(ver)
                else:
                    match_e = pkg_e
                    match_v = pkg_v
                    match_r = pkg_r
                    
                matchtuple = (match_n, match_a, match_e, match_v, match_r)
                # This provides matches if the version is in the requested
                # range or the providing package provides the resource
                # without a version (meaning that it matches all EVR) 
                if miscutils.rangeCheck(provtuple, matchtuple) or (match_v == None):
                    matches.append(pkgtuple)
        del matchingHdrs
        return miscutils.unique(matches)
            
    def _providesList(self, hdr):
        lst = []
        names = hdr[rpm.RPMTAG_PROVIDENAME]
        flags = hdr[rpm.RPMTAG_PROVIDEFLAGS]
        vers = hdr[rpm.RPMTAG_PROVIDEVERSION]
        if names is not None:
            lst = zip(names, flags, vers)
        return miscutils.unique(lst)



--- NEW FILE arch.py ---
#!/usr/bin/python
#

import os

# dict mapping arch -> ( multicompat, best personality, biarch personality )
multilibArches = { "x86_64":  ( "athlon", "x86_64", "athlon" ),
                   "sparc64": ( "sparc", "sparc", "sparc64" ),
                   "ppc64":   ( "ppc", "ppc", "ppc64" ),
                   "s390x":   ( "s390", "s390x", "s390" ),
                   "ia64":    ( "i686", "ia64", "i686" )
                   }

arches = {
    # ia32
    "athlon": "i686",
    "i686": "i586",
    "i586": "i486",
    "i486": "i386",
    "i386": "noarch",
    
    # amd64
    "x86_64": "athlon",
    "amd64": "x86_64",
    "ia32e": "x86_64",
    
    # itanium
    "ia64": "i686",
    
    # ppc
    "ppc64pseries": "ppc64",
    "ppc64iseries": "ppc64",    
    "ppc64": "ppc",
    "ppc": "noarch",
    
    # s390{,x}
    "s390x": "s390",
    "s390": "noarch",
    
    # sparc
    "sparc64": "sparcv9",
    "sparcv9": "sparcv8",
    "sparcv8": "sparc",
    "sparc": "noarch",

    # alpha
    "alphaev6": "alphaev56",
    "alphaev56": "alphaev5",
    "alphaev5": "alpha",
    "alpha": "noarch",
    }

# this computes the difference between myarch and targetarch
def archDifference(myarch, targetarch):
    if myarch == targetarch:
        return 1
    if arches.has_key(myarch):
        ret = archDifference(arches[myarch], targetarch)
        if ret != 0:
            return ret + 1
        return 0
    return 0

def score(arch):
    return archDifference(canonArch, arch)

def isMultiLibArch(arch=None):
    """returns true if arch is a multilib arch, false if not"""
    if arch is None:
        arch = getCanonArch()

    if not arches.has_key(arch): # or we could check if it is noarch
        return 0
    
    if multilibArches.has_key(arch):
        return 1
        
    if multilibArches.has_key(arches[arch]):
        return 1
    
    return 0
    
def getBestArchFromList(archlist, myarch=None):
    """ 
        return the best arch from the list for myarch if - myarch is not given,
        then return the best arch from the list for the canonArch.
    """
    
    if myarch is None:
        myarch = getCanonArch()

    if len(archlist) == 0:
        return None
    
    thisarch = archlist[0]
    for arch in archlist[1:]:
        val1 = archDifference(myarch, thisarch)
        val2 = archDifference(myarch, arch)
        if val1 == 0 and val2 == 0:
           continue
        if val1 < val2:
            if val1 == 0:
                thisarch = arch                
        if val2 < val1:
            if val2 != 0:
                thisarch = arch
        if val1 == val2:
            pass
    
    # thisarch should now be our bestarch
    # one final check to make sure we're not returning a bad arch
    val = archDifference(myarch, thisarch)
    if val == 0:
        return None

    return thisarch
        
          
def getArchList(thisarch=None):
    # this returns a list of archs that are compatible with arch given
    if not thisarch:
        thisarch = getCanonArch()
    
    archlist = [thisarch]
    while arches.has_key(thisarch):
        thisarch = arches[thisarch]
        archlist.append(thisarch)
    
    return archlist
    
        

def getCanonX86Arch(arch):
    # only athlon vs i686 isn't handled with uname currently
    if arch != "i686":
        return arch

    # if we're i686 and AuthenticAMD, then we should be an athlon
    f = open("/proc/cpuinfo", "r")
    lines = f.readlines()
    f.close()
    for line in lines:
        if line.startswith("vendor") and line.find("AuthenticAMD") != -1:
            return "athlon"
        # i686 doesn't guarantee cmov, but we depend on it
        elif line.startswith("flags") and line.find("cmov") == -1:
            return "i586"

    return arch

def getCanonPPCArch(arch):
    # FIXME: should I do better handling for mac, etc?
    if arch != "ppc64":
        return arch

    machine = None
    f = open("/proc/cpuinfo", "r")
    lines = f.readlines()
    f.close()
    for line in lines:
        if line.find("machine") != -1:
            machine = line.split(':')[1]
            break
    if machine is None:
        return arch

    if machine.find("CHRP IBM") != -1:
        return "ppc64pseries"
    if machine.find("iSeries") != -1:
        return "ppc64iseries"
    return arch

def getCanonX86_64Arch(arch):
    if arch != "x86_64":
        return arch

    vendor = None
    f = open("/proc/cpuinfo", "r")
    lines = f.readlines()
    f.close()
    for line in lines:
        if line.startswith("vendor_id"):
            vendor = line.split(':')[1]
            break
    if vendor is None:
        return arch

    if vendor.find("Authentic AMD") != -1:
        return "amd64"
    if vendor.find("GenuineIntel") != -1:
        return "ia32e"
    return arch
        
def getCanonArch(skipRpmPlatform = 0):
    if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
        try:
            f = open("/etc/rpm/platform", "r")
            line = f.readline()
            f.close()
            (arch, vendor, opersys) = line.split("-", 2)
            return arch
        except:
            pass
        
    arch = os.uname()[4]

    if (len(arch) == 4 and arch[0] == "i" and arch[2:4] == "86"):
        return getCanonX86Arch(arch)

    if arch.startswith("ppc"):
        return getCanonPPCArch(arch)
    if arch == "x86_64":
        return getCanonX86_64Arch(arch)

    return arch

# this gets you the "compat" arch of a biarch pair
def getMultiArchInfo(arch = getCanonArch()):
    if multilibArches.has_key(arch):
        return multilibArches[arch]
    if arches.has_key(arch) and arches[arch] != "noarch":
        return getMultiArchInfo(arch = arches[arch])
    return None

# get the best usual userspace arch for the arch we're on.  this is
# our arch unless we're on an arch that uses the secondary as its
# userspace (eg ppc64, sparc64)
def getBestArch():
    arch = canonArch

    if arch == "sparc64":
        arch = "sparc"

    if arch.startswith("ppc64"):
        arch = "ppc"

    return arch

def getBaseArch(myarch=None):
    """returns 'base' arch for myarch, if specified, or canonArch if not.
       base arch is the arch before noarch in the arches dict if myarch is not
       a key in the multilibArches."""

    if not myarch:
        myarch = getCanonArch()

    if not arches.has_key(myarch): # this is dumb, but <shrug>
        return myarch

    if myarch == "sparc64":
        return "sparc"
    elif myarch.startswith("ppc64"):
        return "ppc"
        
    if isMultiLibArch(arch=myarch):
        if multilibArches.has_key(myarch):
            return myarch
        else:
            return arches[myarch]
    
    if arches.has_key(myarch):
        basearch = myarch
        value = arches[basearch]
        while value != 'noarch':
            basearch = value
            value = arches[basearch]
    
        return basearch
        
canonArch = getCanonArch()


--- NEW FILE miscutils.py ---
#!/usr/bin/python -tt

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

import string
import rpm
import types
import gzip
import os
import sys
import locale

import rpmUtils.transaction

def rpmOutToStr(arg):
    if type(arg) != types.StringType:
    # and arg is not None:
        arg = str(arg)
        
    return arg
    

def compareEVR((e1, v1, r1), (e2, v2, r2)):
    # return 1: a is newer than b
    # 0: a and b are the same version
    # -1: b is newer than a
    e1 = rpmOutToStr(e1)
    v1 = rpmOutToStr(v1)
    r1 = rpmOutToStr(r1)
    e2 = rpmOutToStr(e2)
    v2 = rpmOutToStr(v2)
    r2 = rpmOutToStr(r2)
    #print '%s, %s, %s vs %s, %s, %s' % (e1, v1, r1, e2, v2, r2)
    rc = rpm.labelCompare((e1, v1, r1), (e2, v2, r2))
    #print '%s, %s, %s vs %s, %s, %s = %s' % (e1, v1, r1, e2, v2, r2, rc)
    return rc

def checkSig(ts, package):
    """Takes a transaction set and a package, check it's sigs, 
    return 0 if they are all fine
    return 1 if the gpg key can't be found
    return 2 if the header is in someway damaged
    return 3 if the key is not trusted 
    return 4 if the pkg is not gpg or pgp signed"""
    
    value = 0
    currentflags = ts.setVSFlags(0)
    fdno = os.open(package, os.O_RDONLY)
    try:
        hdr = ts.hdrFromFdno(fdno)
    except rpm.error, e:
        if str(e) == "public key not availaiable":
            value = 1
        if str(e) == "public key not available":
            value = 1
        if str(e) == "public key not trusted":
            value = 3
        if str(e) == "error reading package header":
            value = 2
    else:
        error, siginfo = getSigInfo(hdr)
        if error == 101:
            os.close(fdno)
            del hdr
            value = 4
        else:
            del hdr

    try:
        os.close(fdno)
    except OSError, e: # if we're not opened, don't scream about it
        pass

    ts.setVSFlags(currentflags) # put things back like they were before
    return value

def getSigInfo(hdr):
    """checks signature from an hdr hand back signature information and/or
       an error code"""
       
    locale.setlocale(locale.LC_ALL, 'C')
    string = '%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|'
    siginfo = hdr.sprintf(string)
    if siginfo != '(none)':
        error = 0 
        sigtype, sigdate, sigid = siginfo.split(',')
    else:
        error = 101
        sigtype = 'MD5'
        sigdate = 'None'
        sigid = 'None'
        
    infotuple = (sigtype, sigdate, sigid)
    return error, infotuple

def pkgTupleFromHeader(hdr):
    """return a pkgtuple (n, a, e, v, r) from a hdr object, converts
       None epoch to 0, as well."""
   
    name = hdr['name']
    arch = hdr['arch']
    ver = hdr['version']
    rel = hdr['release']
    epoch = hdr['epoch']
    if epoch is None:
        epoch = '0'
    pkgtuple = (name, arch, epoch, ver, rel)
    return pkgtuple
    
    
def rangeCheck(reqtuple, pkgtuple):
    """returns true if the package epoch-ver-rel satisfy the range
       requested in the reqtuple:
       ex: foo >= 2.1-1"""
    # we only ever get here if we have a versioned prco
    # nameonly shouldn't ever raise it
    (reqn, reqf, (reqe, reqv, reqr)) = reqtuple
    (n, a, e, v, r) = pkgtuple
    #simple failures
    if reqn != n: return 0
    # and you thought we were done having fun
    # if the requested release is left out then we have
    # to remove release from the package prco to make sure the match
    # is a success - ie: if the request is EQ foo 1:3.0.0 and we have 
    # foo 1:3.0.0-15 then we have to drop the 15 so we can match
    if reqr is None:
        r = None
    if reqe is None:
        e = None
    if reqv is None: # just for the record if ver is None then we're going to segfault
        v = None
        
    rc = compareEVR((e, v, r), (reqe, reqv, reqr))
            
    if rc >= 1:
        if reqf in ['GT', 'GE', 4, 12]:
            return 1
    if rc == 0:
        if reqf in ['GE', 'LE', 'EQ', 8, 10, 12]:
            return 1
    if rc <= -1:
        if reqf in ['LT', 'LE', 2, 10]:
            return 1
    return 0

###########
# Title: Remove duplicates from a sequence
# Submitter: Tim Peters 
# From: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560                      
    
def unique(s):
    """Return a list of the elements in s, but without duplicates.

    For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3],
    unique("abcabc") some permutation of ["a", "b", "c"], and
    unique(([1, 2], [2, 3], [1, 2])) some permutation of
    [[2, 3], [1, 2]].

    For best speed, all sequence elements should be hashable.  Then
    unique() will usually work in linear time.

    If not possible, the sequence elements should enjoy a total
    ordering, and if list(s).sort() doesn't raise TypeError it's
    assumed that they do enjoy a total ordering.  Then unique() will
    usually work in O(N*log2(N)) time.

    If that's not possible either, the sequence elements must support
    equality-testing.  Then unique() will usually work in quadratic
    time.
    """

    n = len(s)
    if n == 0:
        return []

    # Try using a dict first, as that's the fastest and will usually
    # work.  If it doesn't work, it will usually fail quickly, so it
    # usually doesn't cost much to *try* it.  It requires that all the
    # sequence elements be hashable, and support equality comparison.
    u = {}
    try:
        for x in s:
            u[x] = 1
    except TypeError:
        del u  # move on to the next method
    else:
        return u.keys()

    # We can't hash all the elements.  Second fastest is to sort,
    # which brings the equal elements together; then duplicates are
    # easy to weed out in a single pass.
    # NOTE:  Python's list.sort() was designed to be efficient in the
    # presence of many duplicate elements.  This isn't true of all
    # sort functions in all languages or libraries, so this approach
    # is more effective in Python than it may be elsewhere.
    try:
        t = list(s)
        t.sort()
    except TypeError:
        del t  # move on to the next method
    else:
        assert n > 0
        last = t[0]
        lasti = i = 1
        while i < n:
            if t[i] != last:
                t[lasti] = last = t[i]
                lasti += 1
            i += 1
        return t[:lasti]

    # Brute force is all that's left.
    u = []
    for x in s:
        if x not in u:
            u.append(x)
    return u


def splitFilename(filename):
    """pass in a standard style rpm fullname and it returns
    a name, version, release, epoch, arch
    aka  foo-1.0-1.i386.rpm returns foo, 1.0, 1, i386
         1:bar-9-123a.ia64.rpm returns bar, 9, 123a, 1, ia64
    """

    if filename[-4:] == '.rpm':
        filename = filename[:-4]
       
    archIndex = string.rfind(filename, '.')
    arch = filename[archIndex+1:]

    relIndex = string.rfind(filename[:archIndex], '-')
    rel = filename[relIndex+1:archIndex]

    verIndex = string.rfind(filename[:relIndex], '-')
    ver = filename[verIndex+1:relIndex]

    epochIndex = string.find(filename, ':')
    if epochIndex == -1:
        epoch = ''
    else:
        epoch = filename[:epochIndex]
        
    name = filename[epochIndex + 1:verIndex]
    return name, ver, rel, epoch, arch


def rpm2cpio(fdno, out=sys.stdout, bufsize=2048):
    """Performs roughly the equivalent of rpm2cpio(8).
       Reads the package from fdno, and dumps the cpio payload to out,
       using bufsize as the buffer size."""
    ts = rpmUtils.transaction.initReadOnlyTransaction()
    hdr = ts.hdrFromFdno(fdno)
    del ts
    
    compr = hdr[rpm.RPMTAG_PAYLOADCOMPRESSOR] or 'gzip'
    #XXX FIXME
    #if compr == 'bzip2':
        # TODO: someone implement me!
    #el
    if compr != 'gzip':
        raise rpmUtils.RpmUtilsError, \
              'Unsupported payload compressor: "%s"' % compr
    f = gzip.GzipFile(None, 'rb', None, os.fdopen(fdno, 'rb', bufsize))
    while 1:
        tmp = f.read(bufsize)
        if tmp == "": break
        out.write(tmp)
    f.close()
                                                                                
def formatRequire (name, version, flags):
    s = name
    
    if flags:
        if flags & (rpm.RPMSENSE_LESS | rpm.RPMSENSE_GREATER |
                    rpm.RPMSENSE_EQUAL):
            s = s + " "
            if flags & rpm.RPMSENSE_LESS:
                s = s + "<"
            if flags & rpm.RPMSENSE_GREATER:
                s = s + ">"
            if flags & rpm.RPMSENSE_EQUAL:
                s = s + "="
            if version:
                s = "%s %s" %(s, version)
    return s
    
def stringToVersion(verstring):
    if verstring is None:
        return (None, None, None)
    i = string.find(verstring, ':')
    if i != -1:
        try:
            epoch = string.atol(verstring[:i])
        except ValueError:
            # look, garbage in the epoch field, how fun, kill it
            epoch = '0' # this is our fallback, deal
    else:
        epoch = '0'
    j = string.find(verstring, '-')
    if j != -1:
        if verstring[i + 1:j] == '':
            version = None
        else:
            version = verstring[i + 1:j]
        release = verstring[j + 1:]
    else:
        if verstring[i + 1:] == '':
            version = None
        else:
            version = verstring[i + 1:]
        release = None
    return (epoch, version, release)

def hdrFromPackage(ts, package):
    """hand back the rpm header or raise an Error if the pkg is fubar"""
    try:
        fdno = os.open(package, os.O_RDONLY)
    except OSError, e:
        raise rpmUtils.RpmUtilsError, 'Unable to open file'
    
    try:
        hdr = ts.hdrFromFdno(fdno)
    except rpm.error, e:
        os.close(fdno)
        raise rpmUtils.RpmUtilsError, "RPM Error opening Package"
    if type(hdr) != rpm.hdr:
        os.close(fdno)
        raise rpmUtils.RpmUtilsError, "RPM Error opening Package"
    
    os.close(fdno)
    return hdr


--- NEW FILE oldUtils.py ---
#!/usr/bin/python -tt

import rpm
import types
import os
import gzip
import sys
from gzip import write32u, FNAME


def _(msg):
    return msg
    

def checkheader(headerfile, name, arch):
    """check a header by opening it and comparing the results to the name and arch
       we believe it to be for. if it fails raise URLGrabError(-1)"""
    h = Header_Work(headerfile)
    fail = 0
    if h.hdr is None:
        fail = 1
    else:
        if name != h.name() or arch != h.arch():
            fail = 1
    if fail:
        raise URLGrabError(-1, _('Header cannot be opened or does not match %s, %s.') % (name, arch))
    return
    

def checkRpmMD5(package, urlgraberror=0):
    """take a package, check it out by trying to open it, return 1 if its good
       return 0 if it's not"""
    ts.sigChecking('md5')
    fdno = os.open(package, os.O_RDONLY)
    try:
        ts.hdrFromFdno(fdno)
    except rpm.error, e:
        good = 0
    else:
        good = 1
    os.close(fdno)
    ts.sigChecking('default')

    if urlgraberror:
        if not good:
            raise URLGrabError(-1, _('RPM %s fails md5 check') % (package)) 
        else:
            return
    else:
        return good

def checkSig(package):
    """ take a package, check it's sigs, return 0 if they are all fine, return 
    1 if the gpg key can't be found,  2 if the header is in someway damaged,
    3 if the key is not trusted, 4 if the pkg is not gpg or pgp signed"""
    ts.sigChecking('default')
    fdno = os.open(package, os.O_RDONLY)
    try:
        hdr = ts.hdrFromFdno(fdno)
    except rpm.error, e:
        if str(e) == "public key not availaiable":
            return 1
        if str(e) == "public key not available":
            return 1
        if str(e) == "public key not trusted":
            return 3
        if str(e) == "error reading package header":
            return 2
    else:
        error, siginfo = getSigInfo(hdr)
        if error == 101:
            os.close(fdno)
            del hdr
            return 4
        else:
            del hdr
    os.close(fdno)
    return 0

def getSigInfo(hdr):
    """checks if a computerhand back signature information and an error code"""
    string = '%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|'
    siginfo = hdr.sprintf(string)
    if siginfo != '(none)':
        error = 0 
        sigtype, sigdate, sigid = siginfo.split(',')
    else:
        error = 101
        sigtype = 'MD5'
        sigdate = 'None'
        sigid = 'None'
        
    infotuple = (sigtype, sigdate, sigid)
    return error, infotuple

def getProvides(header):
    provnames = []
    provides = header[rpm.RPMTAG_PROVIDENAME]
    if provides is None:
        pass
    elif type(provides) is types.ListType:
        provnames.extend(provides)
    else:
        provnames.append(provides)
    return provnames
    
def compareEVR((e1, v1, r1), (e2, v2, r2)):
    # return 1: a is newer than b 
    # 0: a and b are the same version 
    # -1: b is newer than a 
    def rpmOutToStr(arg):
        if type(arg) != types.StringType and arg != None:
            arg = str(arg)
        return arg
    e1 = rpmOutToStr(e1)
    v1 = rpmOutToStr(v1)
    r1 = rpmOutToStr(r1)
    e2 = rpmOutToStr(e2)
    v2 = rpmOutToStr(v2)
    r2 = rpmOutToStr(r2)
    rc = rpm.labelCompare((e1, v1, r1), (e2, v2, r2))
    log(6, '%s, %s, %s vs %s, %s, %s = %s' % (e1, v1, r1, e2, v2, r2, rc))
    return rc
    

def formatRequire (name, version, flags):
    if flags:
        if flags & (rpm.RPMSENSE_LESS | rpm.RPMSENSE_GREATER | rpm.RPMSENSE_EQUAL):
            name = name + ' '
        if flags & rpm.RPMSENSE_LESS:
            name = name + '<'
        if flags & rpm.RPMSENSE_GREATER:
            name = name + '>'
        if flags & rpm.RPMSENSE_EQUAL:
            name = name + '='
            name = name + ' %s' % version
    return name


def openrpmdb():
    try:
        db = rpm.TransactionSet(conf.installroot)
    except rpm.error, e:
        errorlog(0, _("Could not open RPM database for reading. Perhaps it is already in use?"))
    return db


# this is done to make the hdr writing _more_ sane for rsync users especially
__all__ = ["GzipFile","open"]

class GzipFile(gzip.GzipFile):
    def _write_gzip_header(self):
        self.fileobj.write('\037\213')             # magic header
        self.fileobj.write('\010')                 # compression method
        fname = self.filename[:-3]
        flags = 0
        if fname:
            flags = FNAME
        self.fileobj.write(chr(flags))
        write32u(self.fileobj, long(0))
        self.fileobj.write('\002')
        self.fileobj.write('\377')
        if fname:
            self.fileobj.write(fname + '\000')


def _gzipOpen(filename, mode="rb", compresslevel=9):
    return GzipFile(filename, mode, compresslevel)

class RPM_Base_Work:

    def _getTag(self, tag):
        if self.hdr is None:
            errorlog(0, _('Got an empty Header, something has gone wrong'))
            #FIXME should raise a yum error here
            sys.exit(1)
        return self.hdr[tag]
    
    def isSource(self):
        if self._getTag('sourcepackage') == 1:
            return 1
        else:
            return 0
        
    def name(self):
        return self._getTag('name')
        
    def arch(self):
        return self._getTag('arch')
        
    def epoch(self):
        return self._getTag('epoch')
    
    def version(self):
        return self._getTag('version')
        
    def release(self):
        return self._getTag('release')
        
    def evr(self):
        e = self._getTag('epoch')
        v = self._getTag('version')
        r = self._getTag('release')
        return (e, v, r)
        
    def nevra(self):
        n = self._getTag('name')
        e = self._getTag('epoch')
        v = self._getTag('version')
        r = self._getTag('release')
        a = self._getTag('arch')
        return (n, e, v, r, a)
    
    def writeHeader(self, headerdir, compress):
    # write the header out to a file with the format: name-epoch-ver-rel.arch.hdr
    # return the name of the file it just made - no real reason :)
        (name, epoch, ver, rel, arch) = self.nevra()
        if epoch is None:
            epoch = '0'
        if self.isSource():
            headerfn = "%s/%s-%s-%s-%s.src.hdr" % (headerdir, name, epoch, ver, rel)
        else:
            headerfn = "%s/%s-%s-%s-%s.%s.hdr" % (headerdir, name, epoch, ver, rel, arch)

        if compress:
            headerout = _gzipOpen(headerfn, "w")
        else:
            headerout = open(headerfn, "w")
        headerout.write(self.hdr.unload(1))
        headerout.close()
        return(headerfn)

class Header_Work(RPM_Base_Work):
    """for operating on hdrs in and out of the rpmdb
       if the first arg is a string then it's a filename
       otherwise it's an rpm hdr"""
    def __init__(self, header):
        if type(header) is types.StringType:
            try:
                fd = gzip.open(header, 'r')
                try: 
                    h = rpm.headerLoad(fd.read())
                except rpm.error, e:
                    errorlog(0,_('Damaged Header %s') % header)
                    h = None
            except IOError,e:
                fd = open(header, 'r')
                try:
                    h = rpm.headerLoad(fd.read())
                except rpm.error, e:
                    errorlog(0,_('Damaged Header %s') % header)
                    h = None
            except ValueError, e:
                errorlog(0,_('Damaged Header %s') % header)
                h = None
            except zlibError, e:
                errorlog(0,_('Damaged Header %s') % header)
                h = None
            fd.close()
        else:
            h = header
        self.hdr = h


class RPM_Work(RPM_Base_Work):
    def __init__(self, rpmfn):
        ts.setVSFlags(~(rpm._RPMVSF_NOSIGNATURES))
        fd = os.open(rpmfn, os.O_RDONLY)
        try:
            self.hdr = ts.hdrFromFdno(fd)
        except rpm.error, e:
            errorlog(0, _('Error opening rpm %s - error %s') % (rpmfn, e))
            self.hdr = None
        os.close(fd)
    
class Rpm_Ts_Work:
    """This should operate on groups of headers/matches/etc in the rpmdb - ideally it will 
    operate with a list of the Base objects above, so I can refer to any one object there
    not sure the best way to do this yet, more thinking involved"""
    def __init__(self, dbPath='/'):
        try:
            if conf.installroot:
                if conf.installroot != '/':
                    dbPath = conf.installroot
        except NameError, e:
            pass

        self.ts = rpm.TransactionSet(dbPath)
        
        self.methods = ['addInstall', 'addErase', 'run', 'check', 'order', 'hdrFromFdno',
                   'closeDB', 'dbMatch', 'setFlags', 'setVSFlags', 'setProbFilter']
                   
    def __getattr__(self, attribute):
        if attribute in self.methods:
            return getattr(self.ts, attribute)
        else:
            raise AttributeError, attribute
            
    def match(self, tag = None, search = None, mire = None):
        """hands back a list of Header_Work objects"""
        hwlist = []
        # hand back the whole list of hdrs
        if mire is None and tag is None and search is None:
            hdrlist = self.ts.dbMatch()
            
        else:
            #just do a non-mire'd search
            if mire == None:
                hdrlist = self.ts.dbMatch(tag, search)
            else:
                # mire search
                if mire == 'glob':
                    hdrlist = self.ts.dbMatch()
                    hdrlist.pattern(tag, rpm.RPMMIRE_GLOB, search)
                elif mire == 'regex':
                    hdrlist = self.ts.dbMatch()
                    hdrlist.pattern(tag, rpm.RPMMIRE_REGEX, search)
                elif mire == 'strcmp':
                    hdrlist = self.ts.dbMatch()
                    hdrlist.pattern(tag, rpm.RPMMIRE_STRCMP, search)
                else:
                    hdrlist = self.ts.dbMatch()
                    hdrlist.pattern(tag, rpm.RPMMIRE_DEFAULT, search)
        
        for hdr in hdrlist:
            hdrobj = Header_Work(hdr)
            hwlist.append(hdrobj)
        return hwlist
    
    def sigChecking(self, sig):
        """pass type of check you want to occur, default is to have them off"""
        if sig == 'md5':
            #turn off everything but md5 - and we need to the check the payload
            self.ts.setVSFlags(~(rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD))
        elif sig == 'none':
            # turn off everything - period
            self.ts.setVSFlags(~(rpm._RPMVSF_NOSIGNATURES))
        elif sig == 'default':
            # set it back to the default
            self.ts.setVSFlags(rpm.RPMVSF_DEFAULT)
        else:
            raise AttributeError, sig


--- NEW FILE transaction.py ---
#!/usr/bin/python

#
# Client code for Update Agent
# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
#
#         Adrian Likins <alikins at redhat.com>
# Some Edits by Seth Vidal <skvidal at phy.duke.edu>
#
# a couple of classes wrapping up transactions so that we  
#    can share transactions instead of creating new ones all over
#

import rpm
import miscutils
from sets import Set

read_ts = None
ts = None

# wrapper/proxy class for rpm.Transaction so we can
# instrument it, etc easily
class TransactionWrapper:
    def __init__(self, root='/'):
        self.ts = rpm.TransactionSet(root)
        self._methods = ['dbMatch',
                         'check',
                         'order',
                         'addErase',
                         'addInstall',
                         'run',
                         'IDTXload',
                         'IDTXglob',
                         'rollback',
                         'pgpImportPubkey',
                         'pgpPrtPkts',
                         'Debug',
                         'setFlags',
                         'setVSFlags',
                         'setProbFilter',
                         'hdrFromFdno',
                         'next',
                         'clean']
        self.tsflags = []

    def __getattr__(self, attr):
        if attr in self._methods:
            return self.getMethod(attr)
        else:
            raise AttributeError, attr

    def __iter__(self):
        return self.ts
        
    def getMethod(self, method):
        # in theory, we can override this with
        # profile/etc info
        return getattr(self.ts, method)

    # push/pop methods so we dont lose the previous
    # set value, and we can potentiall debug a bit
    # easier
    def pushVSFlags(self, flags):
        self.tsflags.append(flags)
        self.ts.setVSFlags(self.tsflags[-1])

    def popVSFlags(self):
        del self.tsflags[-1]
        self.ts.setVSFlags(self.tsflags[-1])

    def addTsFlag(self, flag):
        curflags = self.ts.setFlags(0)
        self.ts.setFlags(curflags | flag)
        
    def test(self, cb, conf={}):
        """tests the ts we've setup, takes a callback function and a conf dict 
           for flags and what not"""
        #FIXME
        # I don't like this function - it should test, sure - but not
        # with this conf dict, we should be doing that beforehand and
        # we should be packing this information away elsewhere.
        self.addTsFlag(rpm.RPMTRANS_FLAG_TEST)
        if conf.has_key('diskspacecheck'):
            if conf['diskspacecheck'] == 0:
                self.ts.setProbFilter(rpm.RPMPROB_FILTER_DISKSPACE)
    
        tserrors = self.ts.run(cb.callback, '')
    
        reserrors = []
        if tserrors:
            for (descr, (etype, mount, need)) in tserrors:
                reserrors.append(descr)
        
        return reserrors
            
        
    def returnLeafNodes(self):
        """returns a list of package tuples (n,a,e,v,r) that are not required by
           any other package on the system"""
        
        req = {}
        orphan = []
    
        mi = self.dbMatch()
        if mi is None: # this is REALLY unlikely but let's just say it for the moment
            return orphan    
            
        for h in mi:
            tup = miscutils.pkgTupleFromHeader(h)    
            if not h[rpm.RPMTAG_REQUIRENAME]:
                continue
            for r in h[rpm.RPMTAG_REQUIRENAME]:
                if not req.has_key(r):
                    req[r] = Set()
                req[r].add(tup)
     
     
        mi = self.dbMatch()
        if mi is None:
            return orphan
     
        for h in mi:
            preq = 0
            tup = miscutils.pkgTupleFromHeader(h)
            for p in h[rpm.RPMTAG_PROVIDES] + h[rpm.RPMTAG_FILENAMES]:
                if req.has_key(p):
                    # Don't count a package that provides its require
                    s = req[p]
                    if len(s) > 1 or tup not in s:
                        preq = preq + 1
        
            if preq == 0:
                orphan.append(tup)
        
        return orphan

        
def initReadOnlyTransaction(root='/'):
    read_ts =  TransactionWrapper(root=root)
    read_ts.pushVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
    return read_ts



--- NEW FILE updates.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University

import rpmUtils.miscutils
import rpmUtils.arch
import rpmUtils

class Updates:
    """This class computes and keeps track of updates and obsoletes.
       initialize, add installed packages, add available packages (both as
       unique lists of name, epoch, ver, rel, arch tuples), add an optional dict
       of obsoleting packages with obsoletes and what they obsolete ie:
        foo, i386, 0, 1.1, 1: bar >= 1.1."""

    def __init__(self, instlist, availlist):
        self.changeTup = [] # storage list tuple of updates or obsoletes
                            # (oldpkg, newpkg, ['update'|'obsolete'])

        self.installed = instlist # list of installed pkgs (n, a, e, v, r)
        self.available = availlist # list of available pkgs (n, a, e, v, r)
        self.rawobsoletes = {} # dict of obsoleting package->[what it obsoletes]
        self.exactarch = 1 # don't change archs by default
        self.exactarchlist = ['kernel', 'kernel-smp', 'glibc', 'kernel-hugemem',
                              'kernel-enterprise', 'kernel-bigmem', 'kernel-BOOT']
                              
        self.myarch = rpmUtils.arch.getCanonArch() # this is for debugging only 
                                                   # set this if you want to 
                                                   # test on some other arch
                                                   # otherwise leave it alone
        
        # make some dicts from installed and available
        self.installdict = self.makeNADict(self.installed, 1)
        self.availdict = self.makeNADict(self.available, 1)

        # holder for our updates dict
        self.updatesdict = {}
        #debug, ignore me
        self.debug = 0

    def debugprint(self, msg):
        if self.debug:
            print msg
        
    def makeNADict(self, pkglist, Nonelists):
        """return lists of (e,v,r) tuples as value of a dict keyed on (n, a)
            optionally will return a (n, None) entry with all the a for that
            n in tuples of (a,e,v,r)"""
            
        returndict = {}
        for (n, a, e, v, r) in pkglist:
            if not returndict.has_key((n, a)):
                returndict[(n, a)] = []
            returndict[(n, a)].append((e,v,r))

            if Nonelists:
                if not returndict.has_key((n, None)):
                    returndict[(n, None)] = []
                returndict[(n, None)].append((a, e, v, r))
            
        return returndict
                    

    def returnNewest(self, evrlist):
        """takes a list of (e, v, r) tuples and returns the newest one"""
        if len(evrlist)==0:
            raise rpmUtils.RpmUtilsError, "Zero Length List in returnNewest call"
            
        if len(evrlist)==1:
            return evrlist[0]
        
        (new_e, new_v, new_r) = evrlist[0] # we'll call the first ones 'newest'
        
        for (e, v, r) in evrlist[1:]:
            rc = rpmUtils.miscutils.compareEVR((e, v, r), (new_e, new_v, new_r))
            if rc > 0:
                new_e = e
                new_v = v
                new_r = r
        return (new_e, new_v, new_r)
         

    def returnHighestVerFromAllArchsByName(self, name, archlist, pkglist):
        """returns a list of package tuples in a list (n, a, e, v, r)
           takes a package name, a list of archs, and a list of pkgs in
           (n, a, e, v, r) form."""
        # go through list and throw out all pkgs not in archlist
        matchlist = []
        for (n, a, e, v, r) in pkglist:
            if name == n:
                if a in archlist:
                    matchlist.append((n, a, e, v, r))

        if len(matchlist) == 0:
            return []
            
        # get all the evr's in a tuple list for returning the highest
        verlist = []
        for (n, a, e, v, r) in matchlist:
            verlist.append((e,v,r))

        (high_e, high_v, high_r) = self.returnNewest(verlist)
            
        returnlist = []
        for (n, a, e, v, r) in matchlist:
            if (high_e, high_v, high_r) == (e, v, r):
                returnlist.append((n,a,e,v,r))
                
        return returnlist
           
    def condenseUpdates(self):
        """remove any accidental duplicates in updates"""
        
        for tup in self.updatesdict.keys():
            if len(self.updatesdict[tup]) > 1:
                mylist = self.updatesdict[tup]
                self.updatesdict[tup] = rpmUtils.miscutils.unique(mylist)
    
    
    def checkForObsolete(self, pkglist, newest=1):
        """accept a list of packages to check to see if anything obsoletes them
           return an obsoleted_dict in the format of makeObsoletedDict"""
           
        obsdict = {} # obseleting package > [obsoleted package]
        pkgdict = self.makeNADict(pkglist, 1)
        
        # this needs to keep arch in mind
        # if foo.i386 obsoletes bar
        # it needs to obsoletes bar.i386 preferentially, not bar.x86_64
        # if there is only one bar and only one foo then obsolete it, but try to
        # match the arch.
        
        # look through all the obsoleting packages look for multiple archs per name
        # if you find it look for the packages they obsolete
        # 
        for pkgtup in self.rawobsoletes.keys():
            (name, arch, epoch, ver, rel) = pkgtup
            for (obs_n, flag, (obs_e, obs_v, obs_r)) in self.rawobsoletes[(pkgtup)]:
                if flag in [None, 0]: # unversioned obsolete
                    if pkgdict.has_key((obs_n, None)):
                        for (rpm_a, rpm_e, rpm_v, rpm_r) in pkgdict[(obs_n, None)]:
                            if not obsdict.has_key(pkgtup):
                                obsdict[pkgtup] = []
                            obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))

                else: # versioned obsolete
                    if pkgdict.has_key((obs_n, None)):
                        for (rpm_a, rpm_e, rpm_v, rpm_r) in pkgdict[(obs_n, None)]:
                            if rpmUtils.miscutils.rangeCheck((obs_n, flag, (obs_e, \
                                                        obs_v, obs_r)), (obs_n,\
                                                        rpm_a, rpm_e, rpm_v, rpm_r)):
                                # make sure the obsoleting pkg is not already installed
                                if not obsdict.has_key(pkgtup):
                                    obsdict[pkgtup] = []
                                obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))
        
        obslist = obsdict.keys()
        if newest:
            obslist = self._reduceListNewestByNameArch(obslist)

        returndict = {}
        for new in obslist:
            for old in obsdict[new]:
                if not returndict.has_key(old):
                    returndict[old] = []
                returndict[old].append(new)
        
        return returndict
        
    def doObsoletes(self):
        """figures out what things available obsolete things installed, returns
           them in a dict attribute of the class."""

        obsdict = {} # obseleting package -> [obsoleted package]
        # this needs to keep arch in mind
        # if foo.i386 obsoletes bar
        # it needs to obsoletes bar.i386 preferentially, not bar.x86_64
        # if there is only one bar and only one foo then obsolete it, but try to
        # match the arch.
        
        # look through all the obsoleting packages look for multiple archs per name
        # if you find it look for the packages they obsolete
        # 
        for pkgtup in self.rawobsoletes.keys():
            (name, arch, epoch, ver, rel) = pkgtup
            for (obs_n, flag, (obs_e, obs_v, obs_r)) in self.rawobsoletes[(pkgtup)]:
                if flag in [None, 0]: # unversioned obsolete
                    if self.installdict.has_key((obs_n, None)):
                        for (rpm_a, rpm_e, rpm_v, rpm_r) in self.installdict[(obs_n, None)]:
                            # make sure the obsoleting pkg is not already installed
                            willInstall = 1
                            if self.installdict.has_key((name, None)):
                                for (ins_a, ins_e, ins_v, ins_r) in self.installdict[(name, None)]:
                                    pkgver = (epoch, ver, rel)
                                    installedver = (ins_e, ins_v, ins_r)
                                    if self.returnNewest((pkgver, installedver)) == installedver:
                                        willInstall = 0
                                        break
                            if willInstall:
                                if not obsdict.has_key(pkgtup):
                                    obsdict[pkgtup] = []
                                obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))

                else: # versioned obsolete
                    if self.installdict.has_key((obs_n, None)):
                        for (rpm_a, rpm_e, rpm_v, rpm_r) in self.installdict[(obs_n, None)]:
                            if rpmUtils.miscutils.rangeCheck((obs_n, flag, (obs_e, \
                                                        obs_v, obs_r)), (obs_n,\
                                                        rpm_a, rpm_e, rpm_v, rpm_r)):
                                # make sure the obsoleting pkg is not already installed
                                willInstall = 1
                                if self.installdict.has_key((name, None)):
                                    for (ins_a, ins_e, ins_v, ins_r) in self.installdict[(name, None)]:
                                        pkgver = (epoch, ver, rel)
                                        installedver = (ins_e, ins_v, ins_r)
                                        if self.returnNewest((pkgver, installedver)) == installedver:
                                            willInstall = 0
                                            break
                                if willInstall:
                                    if not obsdict.has_key(pkgtup):
                                        obsdict[pkgtup] = []
                                    obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))
           
        self.obsoletes = obsdict
        self.makeObsoletedDict()

    def makeObsoletedDict(self):
        """creates a dict of obsoleted packages -> [obsoleting package], this
           is to make it easier to look up what package obsoletes what item in 
           the rpmdb"""
        self.obsoleted_dict = {}
        for new in self.obsoletes.keys():
            for old in self.obsoletes[new]:
                if not self.obsoleted_dict.has_key(old):
                    self.obsoleted_dict[old] = []
                self.obsoleted_dict[old].append(new)
    
    def doUpdates(self):
        """check for key lists as populated then commit acts of evil to
           determine what is updated and/or obsoleted, populate self.updatesdict
        """
        
        
        # best bet is to chew through the pkgs and throw out the new ones early
        # then deal with the ones where there are a single pkg installed and a 
        # single pkg available
        # then deal with the multiples

        # we should take the whole list as a 'newlist' and remove those entries
        # which are clearly:
        #   1. updates 
        #   2. identical to the ones in ourdb
        #   3. not in our archdict at all
        
        simpleupdate = []
        complexupdate = []
        
        updatedict = {} # (old n, a, e, v, r) : [(new n, a, e, v, r)]
                        # make the new ones a list b/c while we _shouldn't_
                        # have multiple updaters, we might and well, it needs
                        # to be solved one way or the other <sigh>
        newpkgs = []
        newpkgs = self.availdict
        
        archlist = rpmUtils.arch.getArchList(self.myarch)
                
        for (n, a) in newpkgs.keys():
            # remove stuff not in our archdict
            # high log here
            if a is None:
                for (arch, e,v,r) in newpkgs[(n, a)]:
                    if arch not in archlist:
                        newpkgs[(n, a)].remove((arch, e,v,r))
                continue
                
            if a not in archlist:
                # high log here
                del newpkgs[(n, a)]
                continue

        # remove the older stuff - if we're doing an update we only want the
        # newest evrs                
        for (n, a) in newpkgs.keys():
            if a is None:
                continue

            (new_e,new_v,new_r) = self.returnNewest(newpkgs[(n, a)])
            for (e, v, r) in newpkgs[(n, a)]:
                if (new_e, new_v, new_r) != (e, v, r):
                    newpkgs[(n, a)].remove((e, v, r))

                
        for (n, a) in newpkgs.keys():
            if a is None: # the None archs are only for lookups
                continue
           
            # simple ones - look for exact matches or older stuff
            if self.installdict.has_key((n, a)):
                for (rpm_e, rpm_v, rpm_r) in self.installdict[(n, a)]:
                    try:
                        (e, v, r) = self.returnNewest(newpkgs[(n,a)])
                    except rpmUtils.RpmUtilsError:
                        continue
                    else:
                        rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
                        if rc <= 0:
                            try:
                                newpkgs[(n, a)].remove((e, v, r))
                            except ValueError:
                               pass

        # get rid of all the empty dict entries:
        for nakey in newpkgs.keys():
            if len(newpkgs[nakey]) == 0:
                del newpkgs[nakey]


        # ok at this point our newpkgs list should be thinned, we should have only
        # the newest e,v,r's and only archs we can actually use
        for (n, a) in newpkgs.keys():
            if a is None: # the None archs are only for lookups
                continue
    
            if self.installdict.has_key((n, None)):
                installarchs = []
                availarchs = []
                for (a, e, v ,r) in newpkgs[(n, None)]:
                    availarchs.append(a)
                for (a, e, v, r) in self.installdict[(n, None)]:
                    installarchs.append(a)

                if len(availarchs) > 1 or len(installarchs) > 1:
                    self.debugprint('putting %s in complex update' % n)
                    complexupdate.append(n)
                else:
                    #log(4, 'putting %s in simple update list' % name)
                    self.debugprint('putting %s in simple update' % n)
                    simpleupdate.append((n, a))

        # we have our lists to work with now
    
        # simple cases
        for (n, a) in simpleupdate:
            # try to be as precise as possible
            if n in self.exactarchlist:
                if self.installdict.has_key((n, a)):
                    (rpm_e, rpm_v, rpm_r) = self.returnNewest(self.installdict[(n, a)])
                    if newpkgs.has_key((n,a)):
                        (e, v, r) = self.returnNewest(newpkgs[(n, a)])
                        rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
                        if rc > 0:
                            # this is definitely an update - put it in the dict
                            if not updatedict.has_key((n, a, rpm_e, rpm_v, rpm_r)):
                                updatedict[(n, a, rpm_e, rpm_v, rpm_r)] = []
                            updatedict[(n, a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
    
            else:
                # we could only have 1 arch in our rpmdb and 1 arch of pkg 
                # available - so we shouldn't have to worry about the lists, here
                # we just need to find the arch of the installed pkg so we can 
                # check it's (e, v, r)
                (rpm_a, rpm_e, rpm_v, rpm_r) = self.installdict[(n, None)][0]
                if newpkgs.has_key((n, None)):
                    for (a, e, v, r) in newpkgs[(n, None)]:
                        rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
                        if rc > 0:
                            # this is definitely an update - put it in the dict
                            if not updatedict.has_key((n, rpm_a, rpm_e, rpm_v, rpm_r)):
                                updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)] = []
                            updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))


        # complex cases

        # we're multilib/biarch
        # we need to check the name.arch in two different trees
        # one for the multiarch itself and one for the compat arch
        # ie: x86_64 and athlon(i686-i386) - we don't want to descend
        # x86_64->i686 
        archlists = []
        if rpmUtils.arch.isMultiLibArch(arch=self.myarch):
            if rpmUtils.arch.multilibArches.has_key(self.myarch):
                biarches = [self.myarch]
            else:
                biarches = [self.myarch, rpmUtils.arch.arches[self.myarch]]

            multicompat = rpmUtils.arch.getMultiArchInfo(self.myarch)[0]
            multiarchlist = rpmUtils.arch.getArchList(multicompat)
            archlists = [ biarches, multiarchlist ]
        else:
            archlists = [ archlist ]
            
        for n in complexupdate:
            for thisarchlist in archlists:
                # we need to get the highest version and the archs that have it
                # of the installed pkgs            
                tmplist = []
                for (a, e, v, r) in self.installdict[(n, None)]:
                    tmplist.append((n, a, e, v, r))

                highestinstalledpkgs = self.returnHighestVerFromAllArchsByName(n,
                                         thisarchlist, tmplist)
                                         
                
                tmplist = []
                for (a, e, v, r) in newpkgs[(n, None)]:
                    tmplist.append((n, a, e, v, r))                        
                
                highestavailablepkgs = self.returnHighestVerFromAllArchsByName(n,
                                         thisarchlist, tmplist)

                hapdict = self.makeNADict(highestavailablepkgs, 0)
                hipdict = self.makeNADict(highestinstalledpkgs, 0)

                # now we have the two sets of pkgs
                if n in self.exactarchlist:
                    for (n, a) in hipdict:
                        if hapdict.has_key((n, a)):
                            self.debugprint('processing %s.%s' % (n, a))
                            # we've got a match - get our versions and compare
                            (rpm_e, rpm_v, rpm_r) = hipdict[(n, a)][0] # only ever going to be first one
                            (e, v, r) = hapdict[(n, a)][0] # there can be only one
                            rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
                            if rc > 0:
                                # this is definitely an update - put it in the dict
                                if not updatedict.has_key((n, a, rpm_e, rpm_v, rpm_r)):
                                    updatedict[(n, a, rpm_e, rpm_v, rpm_r)] = []
                                updatedict[(n, a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
                else:
                    self.debugprint('processing %s' % n)
                    # this is where we have to have an arch contest if there
                    # is more than one arch updating with the highest ver
                    instarchs = []
                    availarchs = []
                    for (n,a) in hipdict.keys():
                        instarchs.append(a)
                    for (n,a) in hapdict.keys():
                        availarchs.append(a)
                    
                    rpm_a = rpmUtils.arch.getBestArchFromList(instarchs, myarch=self.myarch)
                    a = rpmUtils.arch.getBestArchFromList(availarchs, myarch=self.myarch)

                    if rpm_a is None or a is None:
                        continue
                        
                    (rpm_e, rpm_v, rpm_r) = hipdict[(n, rpm_a)][0] # there can be just one
                    (e, v, r) = hapdict[(n, a)][0] # just one, I'm sure, I swear!

                    rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))

                    if rc > 0:
                        # this is definitely an update - put it in the dict
                        if not updatedict.has_key((n, rpm_a, rpm_e, rpm_v, rpm_r)):
                            updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)] = []
                        updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
                   
                   
        self.updatesdict = updatedict                    
        self.makeUpdatingDict()
        
    def makeUpdatingDict(self):
        """creates a dict of available packages -> [installed package], this
           is to make it easier to look up what package  will be updating what
           in the rpmdb"""
        self.updating_dict = {}
        for old in self.updatesdict.keys():
            for new in self.updatesdict[old]:
                if not self.updating_dict.has_key(new):
                    self.updating_dict[new] = []
                self.updating_dict[new].append(old)

    def reduceListByNameArch(self, pkglist, name=None, arch=None):
        """returns a set of pkg naevr tuples reduced based on name or arch"""
        returnlist = []
       
        if name or arch:
            for (n, a, e, v, r) in pkglist:
                if name:
                    if name == n:
                        returnlist.append((n, a, e, v, r))
                        continue
                if arch:
                    if arch == a:
                        returnlist.append((n, a, e, v, r))
                        continue
        else:
            returnlist = pkglist

        return returnlist
        
        
    def getUpdatesTuples(self, name=None, arch=None):
        """returns updates for packages in a list of tuples of:
          (updating naevr, installed naevr)"""
        returnlist = []
        for oldtup in self.updatesdict.keys():
            (old_n, old_a, old_e, old_v, old_r) = oldtup
            for newtup in self.updatesdict[oldtup]:
                returnlist.append((newtup, oldtup))
        
        tmplist = []
        if name:
            for ((n, a, e, v, r), oldtup) in returnlist:
                if name != n:
                    tmplist.append(((n, a, e, v, r), oldtup))
        if arch:
            for ((n, a, e, v, r), oldtup) in returnlist:
                if arch != a:
                    tmplist.append(((n, a, e, v, r), oldtup))

        for item in tmplist:
            try:
                returnlist.remove(item)
            except ValueError:
                pass
                
        return returnlist            

    def getUpdatesList(self, name=None, arch=None):
        """returns updating packages in a list of (naevr) tuples"""
        returnlist = []

        for oldtup in self.updatesdict.keys():
            for newtup in self.updatesdict[oldtup]:
                returnlist.append(newtup)
        
        returnlist = self.reduceListByNameArch(returnlist, name, arch)
        
        return returnlist
                
    def getObsoletesTuples(self, newest=0, name=None, arch=None):
        """returns obsoletes for packages in a list of tuples of:
           (obsoleting naevr, installed naevr). You can specify name and/or
           arch of the installed package to narrow the results.
           You can also specify newest=1 to get the set of newest pkgs (name, arch)
           sorted, that obsolete something"""
           
        tmplist = []
        obslist = self.obsoletes.keys()
        if newest:
            obslist = self._reduceListNewestByNameArch(obslist)
            
        for obstup in obslist:
            for rpmtup in self.obsoletes[obstup]:
                tmplist.append((obstup, rpmtup))
        
        returnlist = []
        if name or arch:
            for (obstup, (n, a, e, v, r)) in tmplist:
                if name:
                    if name == n:
                        returnlist.append((obstup, (n, a, e, v, r)))
                        continue
                if arch:
                    if arch == a:
                        returnlist.append((obstup, (n, a, e, v, r)))
                        continue
        else:
            returnlist = tmplist

        return returnlist
                        
           
           
    def getObsoletesList(self, newest=0, name=None, arch=None):
        """returns obsoleting packages in a list of naevr tuples of just the
           packages that obsolete something that is installed. You can specify
           name and/or arch of the obsoleting packaging to narrow the results.
           You can also specify newest=1 to get the set of newest pkgs (name, arch)
           sorted, that obsolete something"""
           
        tmplist = self.obsoletes.keys()
        if newest:
            tmplist = self._reduceListNewestByNameArch(tmplist)

        returnlist = self.reduceListByNameArch(tmplist, name, arch)
        
        return returnlist
    
    def getObsoletedList(self, newest=0, name=None):
        """returns a list of pkgtuples obsoleting the package in name"""
        returnlist = []
        for new in self.obsoletes.keys():
            for obstup in self.obsoletes[new]:
                (n, a, e, v, r) = obstup
                if n == name:
                    returnlist.append(new)
                    continue
        return returnlist


        
    def getOthersList(self, name=None, arch=None):
        """returns a naevr tuple of the packages that are neither installed
           nor an update - this may include something that obsoletes an installed
           package"""
        updates = {}
        inst = {}
        tmplist = []
        
        for pkgtup in self.getUpdatesList():
            updates[pkgtup] = 1
            
        for pkgtup in self.installed:
            inst[pkgtup] = 1
            
        for pkgtup in self.available:
            if not updates.has_key(pkgtup) and not inst.has_key(pkgtup):
                tmplist.append(pkgtup)

        returnlist = self.reduceListByNameArch(tmplist, name, arch)
        
        return returnlist
         


    def _reduceListNewestByNameArch(self, tuplelist):
        """return list of newest packages based on name, arch matching
           this means(in name.arch form): foo.i386 and foo.noarch are not 
           compared to each other for highest version only foo.i386 and 
           foo.i386 will be compared"""
        highdict = {}
        for pkgtup in tuplelist:
            (n, a, e, v, r) = pkgtup
            if not highdict.has_key((n, a)):
                highdict[(n, a)] = pkgtup
            else:
                pkgtup2 = highdict[(n, a)]
                (n2, a2, e2, v2, r2) = pkgtup2
                rc = rpmUtils.miscutils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[(n, a)] = pkgtup
        
        return highdict.values()

            
#    def getProblems(self):
#        """return list of problems:
#           - Packages that are both obsoleted and updated.
#           - Packages that have multiple obsoletes.
#           - Packages that _still_ have multiple updates
#        """

             



From fedora-extras-commits at redhat.com  Sun Oct 15 12:30:40 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:30:40 -0700
Subject: extras-buildsys/utils/pushscript README,1.3,1.4
Message-ID: <200610151231.k9FCVATT030939@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805

Modified Files:
	README 
Log Message:
Add the patched yum 2.6.1 here, so we remove the dependency on the
system-installed one.




Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README	30 Sep 2006 19:00:16 -0000	1.3
+++ README	15 Oct 2006 12:30:38 -0000	1.4
@@ -5,9 +5,10 @@
 repodata dirs, we rmtree the dir in Utils.create_repository before running
 createrepo -> https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=595
 
-old yum Python modules : we use a newer/patched local copy (in the Extras
-repoclosure tree), so we have more recent code for Extras repoclosure and
-metadata things
+old yum Python modules : we use a newer/patched local copy (post yum 2.6.1
+with a patched "rpmUtils" and "yum" module), so we have more recent code
+for Extras repoclosure and metadata things and don't depend on a system-
+installed version which may break the API
 
 [...]
 



From fedora-extras-commits at redhat.com  Sun Oct 15 12:34:27 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:34:27 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.3,1.4
Message-ID: <200610151234.k9FCYRIU030969@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30951

Modified Files:
	MultiLib.py 
Log Message:
-



Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultiLib.py	30 Sep 2006 18:34:14 -0000	1.3
+++ MultiLib.py	15 Oct 2006 12:34:25 -0000	1.4
@@ -21,8 +21,6 @@
 
 import Utils, RepoSupport
 
-# TODO
-sys.path.insert(0,'/srv/extras-push/work/extras-repoclosure')
 import yum, yum.Errors
 from yum.packages import YumLocalPackage
 try:



From fedora-extras-commits at redhat.com  Sun Oct 15 12:37:22 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:37:22 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.4,1.5
Message-ID: <200610151237.k9FCbMQq031021@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31003

Modified Files:
	Push.py 
Log Message:
-



Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Push.py	29 Sep 2006 19:14:04 -0000	1.4
+++ Push.py	15 Oct 2006 12:37:20 -0000	1.5
@@ -27,7 +27,7 @@
 import Utils, MultiLib
 import RepoBuild, RepoManage, RepoView
 
-DEBUG = True
+DEBUG = False
 Utils.setdebug(DEBUG)
 
 # Lockfile name supported by plague for mutual exclusion during



From fedora-extras-commits at redhat.com  Sun Oct 15 13:16:50 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 15 Oct 2006 06:16:50 -0700
Subject: rpms/xfce4-datetime-plugin/devel Makefile, 1.2, 1.3 sources, 1.3,
	1.4 xfce4-datetime-plugin.spec, 1.6, 1.7 .cvsignore, 1.2,
	1.3 dead.package, 1.1, NONE
Message-ID: <200610151316.k9FDGqtR001706@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1683

Modified Files:
	.cvsignore 
Added Files:
	Makefile sources xfce4-datetime-plugin.spec 
Removed Files:
	dead.package 
Log Message:
unorphaning datetime-plugin, new upstream has ported it to Xfce 4.4


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	15 Oct 2006 13:16:50 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: xfce4-datetime-plugin
+# $Id$
+NAME := xfce4-datetime-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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	15 Oct 2006 13:16:50 -0000	1.4
@@ -0,0 +1 @@
+8a688b1add5615f581e82015de89a4bb  xfce4-datetime-plugin-0.4.0.tar.gz


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: xfce4-datetime-plugin.spec
diff -N xfce4-datetime-plugin.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xfce4-datetime-plugin.spec	15 Oct 2006 13:16:50 -0000	1.7
@@ -0,0 +1,74 @@
+Name:		xfce4-datetime-plugin
+Version:	0.4.0
+Release:	1%{?dist}
+Summary:	Date/time plugin for the Xfce panel
+
+Group:		User Interface/Desktops
+License:	GPL
+URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
+Source0:	http://xs4all.nl/~stacium/xfce/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel  >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser), dbus-devel >= 0.22
+Requires:	xfce4-panel >= 4.3.99.1
+
+%description
+An alternative clock plugin for the Xfce panel. A calendar appears when you 
+left-click on it.
+
+%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 -type f -name "*.la" -exec rm -f {} ';'
+%find_lang datetime
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f datetime.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog
+%{_libdir}/xfce4/panel-plugins/*.so
+%{_datadir}/xfce4/panel-plugins/*.desktop
+
+%changelog
+* Sun Oct 15 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+- Update to 0.4.0 on Xfce 4.4. RC1.
+- Fix %%defattr.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-8
+- Mass rebuild for Fedora Core 6.
+
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-7
+- Require xfce4-panel.
+
+* Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Rebuild for Fedora Extras 5.
+
+* Tue Nov 29 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
+- Add libxfcegui4-devel BuildReqs.
+
+* Fri Nov 25 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-4
+- Rebuild with new source because of md5sum mismatch.
+
+* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
+- Initial Fedora Extras version.
+- Rebuild for XFCE 4.2.3.
+- disable-static instead of removing .a files.
+
+* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2.fc4.cw
+- Add libxml2 BuildReqs.
+
+* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc4.cw
+- Rebuild for Core 4.
+
+* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc3.cw
+- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:33:25 -0000	1.2
+++ .cvsignore	15 Oct 2006 13:16:50 -0000	1.3
@@ -1 +1 @@
-xfce4-datetime-plugin-0.3.1.tar.gz
+xfce4-datetime-plugin-0.4.0.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 13:17:54 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 06:17:54 -0700
Subject: rpms/ngspice import.log,1.6,1.7
Message-ID: <200610151317.k9FDHuYS001759@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1727

Modified Files:
	import.log 
Log Message:
auto-import ngspice-17-7 on branch FC-5 from ngspice-17-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ngspice/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	12 Oct 2006 18:45:59 -0000	1.6
+++ import.log	15 Oct 2006 13:17:54 -0000	1.7
@@ -3,3 +3,4 @@
 ngspice-17-5:HEAD:ngspice-17-5.src.rpm:1157360430
 ngspice-17-6:FC-5:ngspice-17-6.src.rpm:1160678907
 ngspice-17-6:HEAD:ngspice-17-6.src.rpm:1160678959
+ngspice-17-7:FC-5:ngspice-17-7.src.rpm:1160918447



From fedora-extras-commits at redhat.com  Sun Oct 15 13:17:55 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 06:17:55 -0700
Subject: rpms/ngspice/FC-5 ngspice.spec, 1.3,
	1.4 ngspice-rework-17-spinit.patch, 1.1, NONE
Message-ID: <200610151318.k9FDHvcj001764@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1727/FC-5

Modified Files:
	ngspice.spec 
Removed Files:
	ngspice-rework-17-spinit.patch 
Log Message:
auto-import ngspice-17-7 on branch FC-5 from ngspice-17-7.src.rpm


Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/FC-5/ngspice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ngspice.spec	12 Oct 2006 18:45:08 -0000	1.3
+++ ngspice.spec	15 Oct 2006 13:17:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           6%{?dist}
+Release:           7%{?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:            ngspice-rework-17-spinit.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -53,12 +51,12 @@
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
 %{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | \
-sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+cat src/spinit.in.ngspice | sed \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
 > src/spinit.in
 %endif
 
@@ -124,7 +122,6 @@
 %{_libdir}/spice/
 
 
-
 %files doc
 %defattr(-, root, root, -)
 %doc doc/ examples/ Stuarts_Poly_Notes FAQ
@@ -136,6 +133,9 @@
 
 
 %Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-7
+- Fixed src/spinit.in for 64 bit
+
 * Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
 - Testing on 64 bit arch 
 


--- ngspice-rework-17-spinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 13:19:21 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 15 Oct 2006 06:19:21 -0700
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.7,
	1.8
Message-ID: <200610151319.k9FDJNX2001860@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1816

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
cosmetical fix to make rpmlint happy


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-datetime-plugin.spec	15 Oct 2006 13:16:50 -0000	1.7
+++ xfce4-datetime-plugin.spec	15 Oct 2006 13:19:21 -0000	1.8
@@ -7,7 +7,7 @@
 License:	GPL
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://xs4all.nl/~stacium/xfce/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel  >= 4.3.20, libxml2-devel
 BuildRequires:	gettext, perl(XML::Parser), dbus-devel >= 0.22



From fedora-extras-commits at redhat.com  Sun Oct 15 13:32:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 06:32:48 -0700
Subject: rpms/libassetml/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE libassetml-gcompris.patch, 1.1, NONE libassetml.spec, 1.4,
	NONE sources, 1.2, NONE
Message-ID: <200610151332.k9FDWosZ002006@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1990

Added Files:
	dead.package 
Removed Files:
	Makefile libassetml-gcompris.patch libassetml.spec sources 
Log Message:
libassetml was only used by one package: gcompris. And gcompris has just
been updated to 8.1 which no longer uses libassetml. Hence I'm hereby
retiring libassetml. (Note that gcompris and libassetml have the same
upstream, so libassetml is retired upstream too).



--- NEW FILE dead.package ---
libassetml was only used by one package: gcompris. And gcompris has just
been updated to 8.1 which no longer uses libassetml. Hence I'm hereby
retiring libassetml. (Note that gcompris and libassetml have the same
upstream, so libassetml is retired upstream too).


--- Makefile DELETED ---


--- libassetml-gcompris.patch DELETED ---


--- libassetml.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 13:41:52 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 06:41:52 -0700
Subject: rpms/ngspice import.log,1.7,1.8
Message-ID: <200610151341.k9FDfscC002079@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2048

Modified Files:
	import.log 
Log Message:
auto-import ngspice-17-7 on branch devel from ngspice-17-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ngspice/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	15 Oct 2006 13:17:54 -0000	1.7
+++ import.log	15 Oct 2006 13:41:52 -0000	1.8
@@ -4,3 +4,4 @@
 ngspice-17-6:FC-5:ngspice-17-6.src.rpm:1160678907
 ngspice-17-6:HEAD:ngspice-17-6.src.rpm:1160678959
 ngspice-17-7:FC-5:ngspice-17-7.src.rpm:1160918447
+ngspice-17-7:HEAD:ngspice-17-7.src.rpm:1160919932



From fedora-extras-commits at redhat.com  Sun Oct 15 13:41:53 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 06:41:53 -0700
Subject: rpms/ngspice/devel ngspice.spec, 1.3,
	1.4 ngspice-rework-17-spinit.patch, 1.1, NONE
Message-ID: <200610151341.k9FDftxN002083@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2048/devel

Modified Files:
	ngspice.spec 
Removed Files:
	ngspice-rework-17-spinit.patch 
Log Message:
auto-import ngspice-17-7 on branch devel from ngspice-17-7.src.rpm


Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ngspice.spec	12 Oct 2006 18:46:00 -0000	1.3
+++ ngspice.spec	15 Oct 2006 13:41:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           6%{?dist}
+Release:           7%{?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:            ngspice-rework-17-spinit.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -53,12 +51,12 @@
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
 %{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | \
-sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+cat src/spinit.in.ngspice | sed \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
 > src/spinit.in
 %endif
 
@@ -124,7 +122,6 @@
 %{_libdir}/spice/
 
 
-
 %files doc
 %defattr(-, root, root, -)
 %doc doc/ examples/ Stuarts_Poly_Notes FAQ
@@ -136,6 +133,9 @@
 
 
 %Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-7
+- Fixed src/spinit.in for 64 bit
+
 * Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
 - Testing on 64 bit arch 
 


--- ngspice-rework-17-spinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 13:50:04 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Sun, 15 Oct 2006 06:50:04 -0700
Subject: fedora-security/audit fc6,1.112,1.113
Message-ID: <200610151350.k9FDo5jS002152@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2130

Modified Files:
	fc6 
Log Message:
Bring up to date with latest rawhide spin; xpdf, openmotif, lha, kon2 have
all been removed.  A couple of bits left to investigate and then make sure
we sync with FC6 final package list



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fc6	12 Oct 2006 22:07:26 -0000	1.112
+++ fc6	15 Oct 2006 13:50:02 -0000	1.113
@@ -1,47 +1,47 @@
-p to date CVE as of CVE email 20061009
-Up to date FC6 as of Test3
-Up to date dist-fc6 rawhide as of 20060929
+Up to date CVE as of CVE email 20061014
+Up to date FC6 as of re20061014.0
 
 ** are items that need attention
 
+CVE-2006-5229 ** openssh
 CVE-2006-5215 ** (X.org, fixed 20060225?)
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
-CVE-2006-5170 VULNERABLE (nss_ldap)
+CVE-2006-5170 VULNERABLE (nss_ldap) **check rawhide version
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 version (kernel, fixed 2.6.15)
-CVE-2006-5072 VULNERABLE (mono) bz#209467
-CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
-CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
-CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18) [in rawhide]
-CVE-2006-4980 VULNERABLE (python) [backport in rawhide]
+CVE-2006-5072 backport (mono)
+CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
+CVE-2006-5051 backport (openssh, fixed 4.4)
+CVE-2006-4997 version (kernel, fixed 2.6.18)
+CVE-2006-4980 backport (python)
 CVE-2006-4925 ignore (openssh) client crash only
-CVE-2006-4924 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
+CVE-2006-4924 backport (openssh, fixed 4.4)
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
+CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
-CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) bz#206607 [in rawhide]
+CVE-2006-4624 version (mailman, fixed 2.1.9rc1)
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1)
 CVE-2006-4600 version (openldap, fixed 2.3.25)
-CVE-2006-4571 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4571 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4570 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4569 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4568 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4567 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4567 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4566 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4566 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4565 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4565 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
+CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
+CVE-2006-4571 version (firefox, fixed 1.5.0.7)
+CVE-2006-4570 version (thunderbird, fixed 1.5.0.7)
+CVE-2006-4569 version (firefox, fixed 1.5.0.7)
+CVE-2006-4568 version (firefox, fixed 1.5.0.7)
+CVE-2006-4567 version (firefox, fixed 1.5.0.7)
+CVE-2006-4567 version (thunderbird, fixed 1.5.0.7)
+CVE-2006-4566 version (firefox, fixed 1.5.0.7)
+CVE-2006-4566 version (thunderbird, fixed 1.5.0.7)
+CVE-2006-4565 version (firefox, fixed 1.5.0.7)
+CVE-2006-4565 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4561 VULNERABLE (firefox)
-CVE-2006-4538 VULNERABLE (kernel, fixed after 2.6.18-rc6) [in rawhide]
+CVE-2006-4538 version (kernel, fixed after 2.6.18-rc6)
 CVE-2006-4535 version (kernel, fixed 2.6.18-rc6)
 CVE-2006-4507 ignore (libtiff) can't reproduce
 CVE-2006-4486 version (php, fixed 5.1.6)
@@ -56,15 +56,15 @@
 CVE-2006-4434 ignore (sendmail, fixed 8.13.8) not exploitable
 CVE-2006-4433 version (php, fixed 5.1.4)
 CVE-2006-4380 version (mysql, fixed 4.1.13)
-CVE-2006-4343 VULNERABLE (openssl, fixed 0.9.8d) [rawhide]
-CVE-2006-4340 VULNERABLE (nss, fixed 3.11.3) bz#206608 [in rawhide]
+CVE-2006-4343 backport (openssl, fixed 0.9.8d)
+CVE-2006-4340 version (nss, fixed 3.11.3)
 CVE-2006-4339 backport (openssl, fixed 0.9.8c)
 CVE-2006-4339 backport (openssl097)
-CVE-2006-4338 VULNERABLE (gzip) [in rawhide]
-CVE-2006-4337 VULNERABLE (gzip) [in rawhide]
-CVE-2006-4336 VULNERABLE (gzip) [in rawhide]
-CVE-2006-4335 VULNERABLE (gzip) [in rawhide]
-CVE-2006-4334 VULNERABLE (gzip) [in rawhide]
+CVE-2006-4338 backport (gzip)
+CVE-2006-4337 backport (gzip)
+CVE-2006-4336 backport (gzip)
+CVE-2006-4335 backport (gzip)
+CVE-2006-4334 backport (gzip)
 CVE-2006-4433 version (php, fixed 5.1.4)
 CVE-2006-4333 version (wireshark, fixed 0.99.3)
 CVE-2006-4332 version (wireshark, fixed 0.99.3)
@@ -72,8 +72,8 @@
 CVE-2006-4330 version (wireshark, fixed 0.99.3)
 CVE-2006-4310 ignore (firefox) crash only
 CVE-2006-4262 backport (cscope) 
-CVE-2006-4253 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4253 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
+CVE-2006-4253 version (firefox, fixed 1.5.0.7)
+CVE-2006-4253 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203428
 CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203434
 CVE-2006-4146 backport (gdb)
@@ -120,16 +120,16 @@
 CVE-2006-3743 backport (ImageMagick)
 CVE-2006-3742 backport (kdebase) inside kdebase-3.5.4-2-redhat.patch
 CVE-2006-3741 ignore (kernel, fixed 2.6.18-rc7) ia64 only
-CVE-2006-3740 VULNERABLE (libXfont, fixed 1.2.2) bz#206609 [in rawhide]
-CVE-2006-3739 VULNERABLE (libXfont, fixed 1.2.2) bz#206609 [in rawhide]
-CVE-2006-3738 VULNERABLE (openssl, fixed 0.9.8d) [in rawhide]
+CVE-2006-3740 version (libXfont, fixed 1.2.2)
+CVE-2006-3739 version (libXfont, fixed 1.2.2)
+CVE-2006-3738 backport (openssl, fixed 0.9.8d)
 CVE-2006-3731 ignore (firefox) just a user complicit crash
 CVE-2006-3694 version (ruby, fixed 1.8.5)
 CVE-2006-3677 version (firefox, fixed 1.5.0.5)
 CVE-2006-3677 version (thunderbird, fixed 1.5.0.5)
 CVE-2006-3672 ignore (konqueror) just a crash
 CVE-2006-3665 ignore (squirrelmail) don't enable register_globals!
-CVE-2006-3636 VULNERABLE (mailman, fixed 2.1.9) bz#206607 [in rawhide]
+CVE-2006-3636 version (mailman, fixed 2.1.9)
 CVE-2006-3634 ignore (kernel, fixed 2.6.17.8) s390 only
 CVE-2006-3632 version (wireshark, fixed 0.99.2)
 CVE-2006-3631 version (wireshark, fixed 0.99.2)
@@ -177,9 +177,9 @@
 CVE-2006-3016 version (php, fixed 5.1.3)
 CVE-2006-3011 ignore (php) safe mode isn't safe
 CVE-2006-3005 ignore (libjpeg) not a vuln
-CVE-2006-2941 VULNERABLE (mailman, fixed 2.1.9) bz#206607 [in rawhide]
-CVE-2006-2940 VULNERABLE (openssl, fixed 0.9.8d) [in rawhide]
-CVE-2006-2937 VULNERABLE (openssl, fixed 0.9.8d) [in rawhide]
+CVE-2006-2941 version (mailman, fixed 2.1.9)
+CVE-2006-2940 backport (openssl, fixed 0.9.8d)
+CVE-2006-2937 backport (openssl, fixed 0.9.8d)
 CVE-2006-2936 version (kernel, fixed 2.6.17.7)
 CVE-2006-2935 version (kernel, fixed 2.6.17.7)
 CVE-2006-2934 version (kernel, fixed 2.6.17.3)
@@ -359,7 +359,6 @@
 CVE-2006-1335 version (gnome-screensaver, fixed 2.14)
 CVE-2006-1296 version (beagle, fixed 0.2.4)
 CVE-2006-1273 ignore (firefox) this issue only affects IE
-CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues
 CVE-2006-1242 version (kernel, fixed 2.6.16.1)
 CVE-2006-1174 version (shadow-utils, fixed 4.0.3)
 CVE-2006-1173 version (sendmail, fixed 8.13.7)
@@ -417,7 +416,6 @@
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 version (fetchmail, fixed 6.3.2)
 CVE-2006-0301 version (poppler, fixed 0.4.5)
-CVE-2006-0301 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2006-0301 version (kdegraphics, fixed 3.5.2)
 CVE-2006-0300 version (tar, fixed 1.15.90 at least)
 CVE-2006-0299 version (thunderbird, fixed 1.5)
@@ -487,7 +485,6 @@
 CVE-2005-4153 version (mailman)
 CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html
 CVE-2005-4077 version (curl, fixed 7.15.1)
-CVE-2005-3964 backport (openmotif) from changelog
 CVE-2005-3962 version (perl, fixed 5.8.8)
 CVE-2005-3883 version (php, fixed 5.1.1 at least)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
@@ -515,27 +512,22 @@
 CVE-2005-3629 version (initscripts, fixed 8.29 at least)
 CVE-2005-3628 version (poppler, fixed 0.4.4)
 CVE-2005-3628 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3628 version (cups, fixed 1.2.0)
 CVE-2005-3627 version (poppler, fixed 0.4.4)
 CVE-2005-3627 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3627 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3627 backport (tetex)
 CVE-2005-3627 version (cups, fixed 1.2.0)
 CVE-2005-3626 version (poppler, fixed 0.4.4)
 CVE-2005-3626 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3626 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3626 backport (tetex)
 CVE-2005-3626 version (cups, fixed 1.2.0)
 CVE-2005-3625 version (poppler, fixed 0.4.4)
 CVE-2005-3625 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3625 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3625 backport (tetex)
 CVE-2005-3625 version (cups, fixed 1.2.0)
 CVE-2005-3624 version (poppler, fixed 0.4.4)
 CVE-2005-3624 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3624 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3624 backport (tetex)
 CVE-2005-3624 version (cups, fixed 1.2.0)
 CVE-2005-3623 version (kernel, fixed 2.6.14.5)
@@ -577,17 +569,14 @@
 CVE-2005-3241 version (wireshark, fixed 0.10.13)
 CVE-2005-3193 version (poppler, fixed 0.4.4)
 CVE-2005-3193 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3193 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3193 version (cups, fixed 1.2.0)
 CVE-2005-3192 version (poppler, fixed 0.4.4)
 CVE-2005-3192 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3192 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3192 version (cups, fixed 1.2.0)
 CVE-2005-3191 version (poppler, fixed 0.4.4)
 CVE-2005-3191 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3191 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3191 version (cups, fixed 1.2.0)
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
@@ -736,7 +725,6 @@
 CVE-2005-2100 version (kernel, not 2.6) not upstream only RHEL4
 CVE-2005-2099 version (kernel, fixed 2.6.12.5)
 CVE-2005-2098 version (kernel, fixed 2.6.12.5)
-CVE-2005-2097 version (xpdf, fixed 3.0.1)
 CVE-2005-2097 version (cups)
 CVE-2005-2096 version (rpm, fixed 4.4.2)
 CVE-2005-2096 backport (zlib, fixed 1.2.2.4)
@@ -901,7 +889,6 @@
 CVE-2005-0627 version (qt, fixed 3.3.4)
 CVE-2005-0626 version (squid, fixed 2.5.STABLE10)
 CVE-2005-0605 version (libXpm, fixed 3.5.4 at least)
-CVE-2005-0605 backport (openmotif)
 CVE-2005-0602 ignore (unzip, fixed 5.52) this is really expected behaviour
 CVE-2005-0596 version (php, fixed 5.0)
 CVE-2005-0593 version (firefox)
@@ -974,7 +961,6 @@
 CVE-2005-0209 version (kernel, fixed 2.6.11)
 CVE-2005-0208 version (gaim, fixed 1.1.4)
 CVE-2005-0207 version (kernel, fixed 2.6.11)
-CVE-2005-0206 version (xpdf) only bad patch for 2004-0888
 CVE-2005-0205 version (kdenetwork, not 3.3+)
 CVE-2005-0204 version (kernel) didn't affect upstream
 CVE-2005-0202 version (mailman, fixed 2.1.6)
@@ -1030,7 +1016,6 @@
 CVE-2005-0077 version (perl-DBI, fixed 1.48 at least)
 CVE-2005-0075 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0069 version (vim, fixed 7.0 at least)
-CVE-2005-0064 version (xpdf, fixed 3.0.1)
 CVE-2005-0064 version (tetex, fixed 3.0)
 CVE-2005-0064 version (kdegraphics, not 3.4)
 CVE-2005-0064 version (cups, fixed 1.2.2)
@@ -1152,7 +1137,6 @@
 CVE-2004-1139 version (wireshark, fixed 0.10.8)
 CVE-2004-1138 version (vim, fixed 6.3)
 CVE-2004-1137 version (kernel, fixed 2.6.10)
-CVE-2004-1125 version (xpdf, fixed 3.0.1)
 CVE-2004-1125 version (tetex, at least 3.0)
 CVE-2004-1125 version (kdegraphics, not 3.4)
 CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)
@@ -1223,7 +1207,6 @@
 CVE-2004-0923 version (cups, fixed 1.2.22)
 CVE-2004-0918 version (squid, fixed 2.4.STABLE7)
 CVE-2004-0914 version (xorg-x11, fixed after 6.8.1)
-CVE-2004-0914 backport (openmotif)
 CVE-2004-0909 version (thunderbird)
 CVE-2004-0909 version (firefox)
 CVE-2004-0907 version (thunderbird)
@@ -1231,8 +1214,6 @@
 CVE-2004-0906 version (thunderbird)
 CVE-2004-0906 version (firefox)
 CVE-2004-0891 version (gaim, fixed 1.0.2)
-CVE-2004-0889 version (xpdf, fixed 3.0.1)
-CVE-2004-0888 version (xpdf, fixed 3.0.1)
 CVE-2004-0888 version (tetex, fixed 3.0)
 CVE-2004-0888 version (kdegraphics, not 3.4)
 CVE-2004-0888 version (cups)
@@ -1285,8 +1266,6 @@
 CVE-2004-0779 version (firefox)
 CVE-2004-0778 version (cvs, fixed 1.11.17)
 CVE-2004-0772 version (krb5, fixed after 1.2.8)
-CVE-2004-0771 backport (lha) changelog
-CVE-2004-0769 backport (lha) changelog
 CVE-2004-0768 version (libpng, fixed 1.2.6)
 CVE-2004-0755 version (ruby, fixed 1.8.1)
 CVE-2004-0754 version (gaim, fixed 0.82)
@@ -1298,17 +1277,13 @@
 CVE-2004-0748 version (httpd, not 2.2)
 CVE-2004-0747 version (httpd, not 2.2)
 CVE-2004-0746 version (kde, fixed 3.3)
-CVE-2004-0745 backport (lha) changelog
 CVE-2004-0721 version (kdelibs, fixed 3.3)
 CVE-2004-0700 version (httpd, not 2.2)
-CVE-2004-0694 backport (lha) changelog
 CVE-2004-0693 version (qt, fixed 3.3.3)
 CVE-2004-0692 version (qt, fixed 3.3.3)
 CVE-2004-0691 version (qt, fixed 3.3.3)
 CVE-2004-0690 version (kdelibs, fixed after 3.2.3)
 CVE-2004-0689 version (kdelibs, fixed 3.3.0)
-CVE-2004-0688 version (openmotif)
-CVE-2004-0687 version (openmotif)
 CVE-2004-0686 version (samba, fixed 3.0.6)
 CVE-2004-0685 version (kernel, not 2.6)
 CVE-2004-0658 ignore (kernel) not a security issue
@@ -1392,8 +1367,6 @@
 CVE-2004-0365 version (wireshark, fixed 0.10.3)
 CVE-2004-0263 version (php, fixed 4.3.5)
 CVE-2004-0256 version (libtool, fixed 1.5.2)
-CVE-2004-0235 backport (lha) changelog
-CVE-2004-0234 backport (lha) changelog
 CVE-2004-0233 version (libutempter, fixed 0.5.5)
 CVE-2004-0232 version (mc, fixed 4.6.0)
 CVE-2004-0231 version (mc, fixed 4.6.0)
@@ -1577,7 +1550,6 @@
 CVE-2003-0459 version (kdelibs, not 3.2)
 CVE-2003-0455 version (ImageMagick)
 CVE-2003-0442 version (php, fixed 4.3.2)
-CVE-2003-0434 version (xpdf, fixed 2.02pl1)
 CVE-2003-0432 version (wireshark, fixed after 0.9.12)
 CVE-2003-0431 version (wireshark, fixed after 0.9.12)
 CVE-2003-0430 version (wireshark, fixed after 0.9.12)
@@ -1740,7 +1712,6 @@
 CVE-2002-1393 version (kde, fixed 3.0.5a)
 CVE-2002-1392 version (mgetty, fixed 1.1.29)
 CVE-2002-1391 version (mgetty, fixed 1.1.29)
-CVE-2002-1384 version (xpdf, fixed 2.02)
 CVE-2002-1384 version (cups, fixed 1.1.18)
 CVE-2002-1383 version (cups, fixed 1.1.18)
 CVE-2002-1380 version (kernel, not 2.6)
@@ -1794,7 +1765,6 @@
 CVE-2002-1160 version (pam) was our config
 CVE-2002-1157 version (httpd, not 2.0)
 CVE-2002-1156 version (httpd, fixed 2.0.43)
-CVE-2002-1155 backport (kon2) kon2-0.3.9b-bufover-fix.patch
 CVE-2002-1152 version (kdenetwork, fixed 3.0.3)
 CVE-2002-1151 version (kdenetwork, fixed 3.0.3a)
 CVE-2002-1148 version (tomcat, fixed 4.0.5)



From fedora-extras-commits at redhat.com  Sun Oct 15 14:05:51 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Sun, 15 Oct 2006 07:05:51 -0700
Subject: fedora-security/audit fc5,1.357,1.358 fc6,1.113,1.114
Message-ID: <200610151405.k9FE5qme005146@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5126

Modified Files:
	fc5 fc6 
Log Message:
Deal with the outstanding fc6 issues



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- fc5	12 Oct 2006 22:07:26 -0000	1.357
+++ fc5	15 Oct 2006 14:05:49 -0000	1.358
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5229 ** openssh
 CVE-2006-5215 ** (X.org, fixed 20060225?)
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fc6	15 Oct 2006 13:50:02 -0000	1.113
+++ fc6	15 Oct 2006 14:05:49 -0000	1.114
@@ -3,13 +3,17 @@
 
 ** are items that need attention
 
-CVE-2006-5229 ** openssh
-CVE-2006-5215 ** (X.org, fixed 20060225?)
-CVE-2006-5214 ** (X.org, fixed 20060225?)
+CVE-2006-5229 ignore (openssh) not reproduced
+CVE-2006-5215 version (xorg-x11-xdm)
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
+CVE-2006-5215 VULNERABLE (kdebase)
+CVE-2006-5214 version (xorg-x11-xdm)
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit)
+CVE-2006-5214 VULNERABLE (kdebase)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
-CVE-2006-5170 VULNERABLE (nss_ldap) **check rawhide version
+CVE-2006-5170 VULNERABLE (nss_ldap, fixed 183)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 version (kernel, fixed 2.6.15)



From fedora-extras-commits at redhat.com  Sun Oct 15 14:36:32 2006
From: fedora-extras-commits at redhat.com (Ahmed Kamal ElDin (ahmed))
Date: Sun, 15 Oct 2006 07:36:32 -0700
Subject: common - Imported sources
Message-ID: <200610151436.k9FEaWxH005320@cvs-int.fedora.redhat.com>

Author: ahmed

Update of /cvs/fedora/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5305

Log Message:
Importing syncmail with utf8 support

Status:

Vendor Tag:	AhmedKamal
Release Tags:	start
		
N common/syncmail_utf8.py
N common/common/syncmail_utf8.py

No conflicts created by this import




From fedora-extras-commits at redhat.com  Sun Oct 15 14:41:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 07:41:12 -0700
Subject: rpms/gcompris/devel gcompris-8.0-fullscreen.patch, NONE,
	1.1 gcompris-8.0-silence.patch, NONE,
	1.1 gcompris-8.0-warn.patch, NONE, 1.1 gcompris-8.1-icon.patch,
	NONE, 1.1 .cvsignore, 1.3, 1.4 gcompris.spec, 1.14, 1.15 sources,
	1.3, 1.4 U006A.ogg, 1.1, NONE gcompris-7.4-xf86vidmode.patch,
	1.4, NONE gcompris-7.4-xf86vidmode2.patch, 1.1,
	NONE gcompris-7.4-xf86vidmode3.patch, 1.1,
	NONE gcompris-click_on_letter.patch, 1.1,
	NONE gcompris-electric.patch, 1.1, NONE gcompris-nl.patch, 1.1,
	NONE gcompris-sys-assetml.patch, 1.1, NONE
Message-ID: <200610151441.k9FEfEUx005386@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.0-fullscreen.patch gcompris-8.0-silence.patch 
	gcompris-8.0-warn.patch gcompris-8.1-icon.patch 
Removed Files:
	U006A.ogg gcompris-7.4-xf86vidmode.patch 
	gcompris-7.4-xf86vidmode2.patch 
	gcompris-7.4-xf86vidmode3.patch gcompris-click_on_letter.patch 
	gcompris-electric.patch gcompris-nl.patch 
	gcompris-sys-assetml.patch 
Log Message:
* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.1-1
- New upstream release 8.1
- Drop most patches (integrated upstream)


gcompris-8.0-fullscreen.patch:

--- NEW FILE gcompris-8.0-fullscreen.patch ---
--- gcompris-8.0/src/gcompris/board_config.c~	2006-10-15 12:49:27.000000000 +0200
+++ gcompris-8.0/src/gcompris/board_config.c	2006-10-15 12:49:27.000000000 +0200
@@ -161,6 +161,11 @@
   /* init static values or callbacks */
   Confcallback = callback;
   hash_conf = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+  
+  /* Creating a config window will cause our main window to loose focus,
+     this tells the main window to ignore the next focus out event (and thus
+     stay in fullscreen mode if we're fullscreen). */
+  gc_ignore_next_focus_out();
 
   /* main configuration window */
   conf_window = \
--- gcompris-8.0/src/gcompris/gcompris.h~	2006-10-15 12:47:22.000000000 +0200
+++ gcompris-8.0/src/gcompris/gcompris.h	2006-10-15 12:47:22.000000000 +0200
@@ -114,6 +114,7 @@
 /* General */
 GnomeCanvas     *gc_get_canvas(void);
 GtkWidget	*gc_get_window(void);
+void		gc_ignore_next_focus_out(void);
 
 const gchar	*gc_locale_get(void);
 void		 gc_locale_set(gchar *locale);
--- gcompris-8.0/src/gcompris/gcompris.c~	2006-10-15 12:47:24.000000000 +0200
+++ gcompris-8.0/src/gcompris/gcompris.c	2006-10-15 12:47:24.000000000 +0200
@@ -247,7 +247,8 @@
   int window_x;
   int window_y;
   gboolean fullscreen_active;
-} XF86VidModeData = { { 0 }, { 0 }, 0, 0, 0, 0, FALSE };
+  int ignore_focus_out;
+} XF86VidModeData = { { 0 }, { 0 }, 0, 0, 0, 0, FALSE, 0 };
 
 static void xf86_vidmode_init( void );
 static void xf86_vidmode_set_fullscreen( int state );
@@ -394,6 +395,12 @@
   return window;
 }
 
+void gc_ignore_next_focus_out()
+{
+#ifdef XF86_VIDMODE
+  XF86VidModeData.ignore_focus_out++;
+#endif
+}
 
 GnomeCanvasItem *gc_set_background(GnomeCanvasGroup *parent, gchar *file)
 {
@@ -1325,8 +1332,11 @@
 static gint xf86_focus_changed(GtkWindow *window,
   GdkEventFocus *event, gpointer param)
 {
-  printf("focus change %d\n", (int)event->in);
-  if (properties->fullscreen)
+  printf("focus change %d, ignore: %d\n", (int)event->in,
+    XF86VidModeData.ignore_focus_out);
+  if (!event->in && XF86VidModeData.ignore_focus_out)
+    XF86VidModeData.ignore_focus_out--;
+  else if (properties->fullscreen)
     xf86_vidmode_set_fullscreen(event->in);
   /* Act as if we aren't there / aren't hooked up */
   return FALSE;

gcompris-8.0-silence.patch:

--- NEW FILE gcompris-8.0-silence.patch ---
--- gcompris-8.0/src/gcompris/gcompris.c~	2006-10-15 13:13:02.000000000 +0200
+++ gcompris-8.0/src/gcompris/gcompris.c	2006-10-15 13:13:02.000000000 +0200
@@ -1265,8 +1265,6 @@
   if (properties->noxf86vm || XF86VidModeData.fullscreen_active == state)
     return;
 
-  printf("setfullscreen %d\n", state);
-
   if (state)
     {
       if (!XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER(
@@ -1314,9 +1312,6 @@
   XF86VidModeData.window_x = event->x;
   XF86VidModeData.window_y = event->y;
 
-  printf("configure: %dx%d, fullscreen_active: %d\n", event->x, event->y,
-    (int)XF86VidModeData.fullscreen_active);
-
   if(XF86VidModeData.fullscreen_active) {
     if (gdk_pointer_grab(event->window, TRUE, 0, event->window, NULL,
           GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS)
@@ -1332,8 +1327,6 @@
 static gint xf86_focus_changed(GtkWindow *window,
   GdkEventFocus *event, gpointer param)
 {
-  printf("focus change %d, ignore: %d\n", (int)event->in,
-    XF86VidModeData.ignore_focus_out);
   if (!event->in && XF86VidModeData.ignore_focus_out)
     XF86VidModeData.ignore_focus_out--;
   else if (properties->fullscreen)

gcompris-8.0-warn.patch:

--- NEW FILE gcompris-8.0-warn.patch ---
--- gcompris-8.0/src/boards/chess.c~	2006-10-15 10:27:49.000000000 +0200
+++ gcompris-8.0/src/boards/chess.c	2006-10-15 10:27:49.000000000 +0200
@@ -1001,7 +1001,7 @@
 				   &len,
 				   &err);
 
-  g_warning("g_io_channel_read_line len=%d", len);
+  g_warning("g_io_channel_read_line len=%d", (int)len);
   if(status == G_IO_STATUS_ERROR)
     {
       g_warning("g_io_channel_read_chars error=%s",
--- gcompris-8.0/src/gcompris/board_config.c~	2006-10-15 12:00:50.000000000 +0200
+++ gcompris-8.0/src/gcompris/board_config.c	2006-10-15 12:00:50.000000000 +0200
@@ -194,7 +194,7 @@
   GcomprisProperties *properties = gc_prop_get();
   if (properties->fullscreen && !properties->noxf86vm)
     if (gdk_pointer_grab(gc_get_window()->window, TRUE, 0,
-			 GDK_WINDOW(gc_get_window()), NULL, GDK_CURRENT_TIME) !=
+			 gc_get_window()->window, NULL, GDK_CURRENT_TIME) !=
 	GDK_GRAB_SUCCESS)
       g_warning("Pointer grab failed");
 

gcompris-8.1-icon.patch:

--- NEW FILE gcompris-8.1-icon.patch ---
--- gcompris-8.1/src/gcompris/gcompris.c~	2006-10-15 14:44:14.000000000 +0200
+++ gcompris-8.1/src/gcompris/gcompris.c	2006-10-15 14:44:14.000000000 +0200
@@ -625,7 +625,7 @@
    * Set an icon for gcompris
    * ------------------------
    */
-  icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
+  icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL);
   if (!g_file_test (icon_file, G_FILE_TEST_EXISTS)) {
       /* Now check if this file is on the net */
       icon_file = gc_net_get_url_from_file("gcompris.png", NULL);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2006 10:32:43 -0000	1.3
+++ .cvsignore	15 Oct 2006 14:41:12 -0000	1.4
@@ -1,2 +1 @@
-gcompris-7.4.tar.gz
-gcompris-africa-patch.tar.gz
+gcompris-8.1.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gcompris.spec	28 Aug 2006 11:26:56 -0000	1.14
+++ gcompris.spec	15 Oct 2006 14:41:12 -0000	1.15
@@ -1,29 +1,23 @@
 Name:           gcompris
-Version:        7.4
-Release:        14%{?dist}
+Version:        8.1
+Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        gcompris.6
-Source2:        U006A.ogg
-Source3:        gcompris-africa-patch.tar.gz
-Patch1:         gcompris-sys-assetml.patch
-Patch2:         gcompris-nl.patch
-Patch3:         gcompris-electric.patch
-Patch4:         gcompris-click_on_letter.patch
-Patch5:         gcompris-7.4-xf86vidmode.patch
-Patch6:         gcompris-7.4-xf86vidmode2.patch
-Patch7:         gcompris-7.4-xf86vidmode3.patch
+Patch0:         gcompris-8.0-warn.patch
+Patch1:         gcompris-8.0-fullscreen.patch
+Patch2:         gcompris-8.0-silence.patch
+Patch3:         gcompris-8.1-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:  libgnomeui-devel sqlite-devel libassetml-devel python-devel
+Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
-Buildrequires:  xorg-x11-proto-devel
-Buildrequires:  gnome-python2-canvas python-sqlite2 texinfo texi2html
+Buildrequires:  xorg-x11-proto-devel python-sqlite2 texinfo texi2html
 Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
-Requires:       gnuchess gnucap tuxpaint gcompris-flags
-Requires:       gnome-python2-canvas python-sqlite2
+Requires:       gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
+Requires:       pygtk2 python-sqlite2
 Requires:       %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -82,114 +76,108 @@
 Developmental files for the core-engine library of GCompris
 
 
+%package sound-cs
+Summary:        GCompris voices in Tsjech
+Group:          Amusements/Games
+
+%description sound-cs
+Voice samples for the GCompris games in Tsjech.
+
+
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-da
-Voice samples for the GCompris games in Danish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Danish.
 
 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-de
-Voice samples for the GCompris games in German, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in German.
 
 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-en
-Voice samples for the GCompris games in English, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in English.
 
 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-es
-Voice samples for the GCompris games in Spanish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Spanish.
 
 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-fi
-Voice samples for the GCompris games in Finish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Finish.
 
 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-fr
-Voice samples for the GCompris games in French, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in French.
 
 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-hu
-Voice samples for the GCompris games in Hungarian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Hungarian.
 
 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-it
-Voice samples for the GCompris games in Italian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Italian.
+
+
+%package sound-mr
+Summary:        GCompris voices in Indian Marathi
+Group:          Amusements/Games
+
+%description sound-mr
+Voice samples for the GCompris games in Indian Marathi.
 
 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-nl
-Voice samples for the GCompris games in Dutch, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Dutch.
 
 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-pt
-Voice samples for the GCompris games in Portuguese, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Portuguese.
 
 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-ru
-Voice samples for the GCompris games in Russian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Russian.
 
 
 %package sound-sv
@@ -197,8 +185,15 @@
 Group:          Amusements/Games
 
 %description sound-sv
-Voice samples for the GCompris games in Swedish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Swedish.
+
+
+%package sound-tr
+Summary:        GCompris voices in Turk
+Group:          Amusements/Games
+
+%description sound-tr
+Voice samples for the GCompris games in Turk.
 
 
 %package sound-eu
@@ -206,8 +201,7 @@
 Group:          Amusements/Games
 
 %description sound-eu
-Voice samples for the GCompris games in Basque, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Basque.
 
 
 %package flags
@@ -215,56 +209,23 @@
 Group:          Amusements/Games
 
 %description flags
-Country flags for use with GCompris (60x40 PNG), these come with an assetml
-description so they could potentially be used by other packages.
+Country flags for use with GCompris (60x40 PNG).
 
 
 %prep
 %setup -q
-%patch1 -p1 -z .sysassetml -E
-# no backup files for this patch, otherwise they get installed under /usr/share
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1 -z .electric
-%patch4 -p1 -z .click_on_letter
-%patch5 -p1 -z .xf86vm
-%patch6 -p1 -z .xf86vm2
-%patch7 -p1 -z .xf86vm3
+%patch3 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
-# fix gnome.canvas deprecation warnings
-for i in src/boards/python.c `find src/boards/python -name "*.py"`; do
-   %{__sed} -i 's/gnome\.canvas/gnomecanvas/g' $i
-done
-# fix up broken dutch alphabet sounds
-pushd boards/sounds/nl/alphabet
-for i in U007{B..F}.ogg; do
-  mv $i `echo $i|%{__sed} s/7/6/`
-done
-cp %{SOURCE2} .
-popd
-# fix up missing dutch "ok zo" sound
-pushd boards/sounds/nl/misc
-cp ok.ogg check_answer.ogg
-popd
-# fixup african maps with files from CVS (BZ 197758)
-tar xfz %{SOURCE3}
-# these are no longer used
-rm boards/geography/africa/north_africa.xcf \
-  boards/geography/afrique/burundi.png \
-  boards/geography/afrique/djibouti.png \
-  boards/geography/afrique/equatorial_guinea.png \
-  boards/geography/afrique/gambia.png \
-  boards/geography/afrique/guinea_bissau.png \
-  boards/geography/afrique/lesotho.png \
-  boards/geography/afrique/rwanda.png \
-  boards/geography/afrique/sierra_leone.png \
-  boards/geography/afrique/swaziland.png
 
 
 %build
 # The configure check for python-gnome.canvas fails without X running,
 # --enable-py-build-only works around this
-%configure --enable-py-build-only
+%configure --enable-py-build-only --enable-gnet
 # we can't use %%{?_smp_mflags} because that breaks compilation!
 make 
 # Fixup the desktop files a bit, we don't use a patch because that breaks
@@ -353,6 +314,7 @@
 %{_datadir}/gcompris/boards/l*
 %{_datadir}/gcompris/boards/m*
 %{_datadir}/gcompris/boards/n*
+%{_datadir}/gcompris/boards/o*
 %{_datadir}/gcompris/boards/p*
 %{_datadir}/gcompris/boards/r*
 %{_datadir}/gcompris/boards/s*.xml
@@ -365,6 +327,7 @@
 %{_datadir}/gcompris/boards/sounds/chronos
 %{_datadir}/gcompris/boards/sounds/LuneRouge
 %{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE
+%{_datadir}/gcompris/boards/sounds/README
 %{_datadir}/gcompris/boards/submarine
 %{_datadir}/gcompris/boards/t*
 %{_datadir}/gcompris/boards/w*
@@ -385,9 +348,15 @@
 %{_libdir}/libgcompris-1.so
 %{_libdir}/pkgconfig/libgcompris-1.0.pc
 
+%files sound-cs
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/cs
+
 %files sound-da
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_da.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -395,7 +364,6 @@
 
 %files sound-de
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_de.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -403,7 +371,6 @@
 
 %files sound-en
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_en.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -411,7 +378,6 @@
 
 %files sound-es
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_es.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -419,7 +385,6 @@
 
 %files sound-fi
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_fi.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -427,7 +392,6 @@
 
 %files sound-fr
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_fr.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -435,7 +399,6 @@
 
 %files sound-hu
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_hu.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -443,15 +406,20 @@
 
 %files sound-it
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_it.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/it
 
+%files sound-mr
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/mr
+
 %files sound-nl
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_nl.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -459,15 +427,14 @@
 
 %files sound-pt
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_pt.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/pt
+%{_datadir}/gcompris/boards/sounds/pt_BR
 
 %files sound-ru
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_ru.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -475,15 +442,20 @@
 
 %files sound-sv
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_sv.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/sv
 
+%files sound-tr
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/tr
+
 %files sound-eu
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_eu.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -491,13 +463,16 @@
 
 %files flags
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_flags.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %{_datadir}/gcompris/boards/flags
 
 
 %changelog
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.1-1
+- New upstream release 8.1
+- Drop most patches (integrated upstream)
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-14
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2006 10:32:43 -0000	1.3
+++ sources	15 Oct 2006 14:41:12 -0000	1.4
@@ -1,2 +1 @@
-d80e55da21170a98d671c98b3e582cc3  gcompris-7.4.tar.gz
-bc3d9ba72b4dd9742859ec6b90d12056  gcompris-africa-patch.tar.gz
+439b70411ccdbd99c6391d6bfb5e6fb6  gcompris-8.1.tar.gz


--- U006A.ogg DELETED ---


--- gcompris-7.4-xf86vidmode.patch DELETED ---


--- gcompris-7.4-xf86vidmode2.patch DELETED ---


--- gcompris-7.4-xf86vidmode3.patch DELETED ---


--- gcompris-click_on_letter.patch DELETED ---


--- gcompris-electric.patch DELETED ---


--- gcompris-nl.patch DELETED ---


--- gcompris-sys-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 14:52:07 2006
From: fedora-extras-commits at redhat.com (Ahmed Kamal ElDin (ahmed))
Date: Sun, 15 Oct 2006 07:52:07 -0700
Subject: common/common syncmail_utf8.py,1.1.1.1,NONE
Message-ID: <200610151452.k9FEq74W005547@cvs-int.fedora.redhat.com>

Author: ahmed

Update of /cvs/fedora/common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5531

Removed Files:
	syncmail_utf8.py 
Log Message:
Cleaning unneeded files



--- syncmail_utf8.py DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 15:08:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 08:08:23 -0700
Subject: rpms/gcompris/devel gcompris.spec,1.15,1.16
Message-ID: <200610151508.k9FF8POq008543@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8526

Modified Files:
	gcompris.spec 
Log Message:
sigh, gcompris no longer uses gnome-python, but the stupid configure script still checks for it, so BR it for now


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcompris.spec	15 Oct 2006 14:41:12 -0000	1.15
+++ gcompris.spec	15 Oct 2006 15:08:23 -0000	1.16
@@ -14,8 +14,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
-Buildrequires:  xorg-x11-proto-devel python-sqlite2 texinfo texi2html
-Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
+Buildrequires:  gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html
+Buildrequires:  texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
 Requires:       gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
 Requires:       pygtk2 python-sqlite2
 Requires:       %{name}-libs = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sun Oct 15 15:48:17 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:48:17 -0700
Subject: rpms/crystal import.log,1.6,1.7
Message-ID: <200610151548.k9FFmJn0008960@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/crystal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8925

Modified Files:
	import.log 
Log Message:
auto-import crystal-1.0.2-1 on branch FC-5 from crystal-1.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crystal/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	2 Sep 2006 10:27:19 -0000	1.6
+++ import.log	15 Oct 2006 15:48:17 -0000	1.7
@@ -3,3 +3,4 @@
 crystal-1_0_1-2:FC-4:crystal-1.0.1-2.src.rpm:1151412331
 crystal-1_0_1-2:FC-5:crystal-1.0.1-2.src.rpm:1151412584
 crystal-1_0_1-3:HEAD:crystal-1.0.1-3.src.rpm:1157193059
+crystal-1_0_2-1:FC-5:crystal-1.0.2-1.src.rpm:1160927517



From fedora-extras-commits at redhat.com  Sun Oct 15 15:48:18 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:48:18 -0700
Subject: rpms/crystal/FC-5 .cvsignore, 1.2, 1.3 crystal.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610151548.k9FFmKAk008967@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/crystal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8925/FC-5

Modified Files:
	.cvsignore crystal.spec sources 
Log Message:
auto-import crystal-1.0.2-1 on branch FC-5 from crystal-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crystal/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 15:26:44 -0000	1.2
+++ .cvsignore	15 Oct 2006 15:48:18 -0000	1.3
@@ -1 +1 @@
-13969-crystal-1.0.1.tar.bz2
+13969-crystal-1.0.2.tar.bz2


Index: crystal.spec
===================================================================
RCS file: /cvs/extras/rpms/crystal/FC-5/crystal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crystal.spec	27 Jun 2006 12:48:40 -0000	1.2
+++ crystal.spec	15 Oct 2006 15:48:18 -0000	1.3
@@ -1,23 +1,23 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 %{?!theme:%define theme %{name}}
 
-Name:  	 crystal
-Version: 1.0.1
-Release: 2%{?dist}
-Summary: KDE window decoration
-
-License: GPL
-URL:	 http://www.kde-look.org/content/show.php?content=13969
-Source:	 http://www.kde-look.org/content/files/13969-%{name}-%{version}.tar.bz2
-Group: 	 User Interface/Desktops
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdebase-devel >= 6:3.5, qt-devel >= 3.3
-Requires: kdebase
+Name:          crystal
+Version:       1.0.2
+Release:       1%{?dist}
+Summary:       KDE window decoration
+
+License:       GPL
+URL:           http://www.kde-look.org/content/show.php?content=13969
+Source:        http://www.kde-look.org/content/files/13969-%{name}-%{version}.tar.bz2
+Group:         User Interface/Desktops
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: kdebase-devel >= 6:3.5
+Requires:      kdebase
 
 %description
-Crystal is a kwin window decoration theme, which offers you (pseudo) 
-TRANSPARENT titlebar, buttons and borders. It also has some little 
+Crystal is a kwin window decoration theme, which offers you (pseudo)
+TRANSPARENT titlebar, buttons and borders. It also has some little
 usuability enhancements.
 
 %prep
@@ -25,14 +25,14 @@
 
 %build
 %configure --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -45,7 +45,13 @@
 %{_libdir}/kde3/kwin*_%{theme}*.*
 
 
-%changelog
+%Changelog
+* Mon Oct 09 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.2-1
+- New upstream release 1.0.2
+
+* Sat Sep 02 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.1-3
+- Rebuild for FC6-devel
+
 * Tue Jun 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.1-2
 - added qt-devel as BR
 - dropping QTINC, QTLIB from %%build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crystal/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 15:26:44 -0000	1.2
+++ sources	15 Oct 2006 15:48:18 -0000	1.3
@@ -1 +1 @@
-a7205899e406285604adcd2727cd1d4c  13969-crystal-1.0.1.tar.bz2
+4979a4cbf74ca7f300bdfb2aaddc3e77  13969-crystal-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 15 15:48:48 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:48:48 -0700
Subject: rpms/crystal import.log,1.7,1.8
Message-ID: <200610151548.k9FFmoBw009058@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/crystal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9025

Modified Files:
	import.log 
Log Message:
auto-import crystal-1.0.2-1 on branch devel from crystal-1.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crystal/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	15 Oct 2006 15:48:17 -0000	1.7
+++ import.log	15 Oct 2006 15:48:48 -0000	1.8
@@ -4,3 +4,4 @@
 crystal-1_0_1-2:FC-5:crystal-1.0.1-2.src.rpm:1151412584
 crystal-1_0_1-3:HEAD:crystal-1.0.1-3.src.rpm:1157193059
 crystal-1_0_2-1:FC-5:crystal-1.0.2-1.src.rpm:1160927517
+crystal-1_0_2-1:HEAD:crystal-1.0.2-1.src.rpm:1160927548



From fedora-extras-commits at redhat.com  Sun Oct 15 15:48:49 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:48:49 -0700
Subject: rpms/crystal/devel .cvsignore, 1.2, 1.3 crystal.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610151548.k9FFmpPt009064@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/crystal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9025/devel

Modified Files:
	.cvsignore crystal.spec sources 
Log Message:
auto-import crystal-1.0.2-1 on branch devel from crystal-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crystal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 15:26:44 -0000	1.2
+++ .cvsignore	15 Oct 2006 15:48:49 -0000	1.3
@@ -1 +1 @@
-13969-crystal-1.0.1.tar.bz2
+13969-crystal-1.0.2.tar.bz2


Index: crystal.spec
===================================================================
RCS file: /cvs/extras/rpms/crystal/devel/crystal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crystal.spec	2 Sep 2006 10:27:20 -0000	1.3
+++ crystal.spec	15 Oct 2006 15:48:49 -0000	1.4
@@ -2,8 +2,8 @@
 %{?!theme:%define theme %{name}}
 
 Name:          crystal
-Version:       1.0.1
-Release:       3%{?dist}
+Version:       1.0.2
+Release:       1%{?dist}
 Summary:       KDE window decoration
 
 License:       GPL
@@ -12,7 +12,7 @@
 Group:         User Interface/Desktops
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdebase-devel >= 6:3.5, qt-devel >= 3.3
+BuildRequires: kdebase-devel >= 6:3.5
 Requires:      kdebase
 
 %description
@@ -25,11 +25,11 @@
 
 %build
 %configure --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -46,6 +46,9 @@
 
 
 %Changelog
+* Mon Oct 09 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.2-1
+- New upstream release 1.0.2
+
 * Sat Sep 02 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.1-3
 - Rebuild for FC6-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crystal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 15:26:44 -0000	1.2
+++ sources	15 Oct 2006 15:48:49 -0000	1.3
@@ -1 +1 @@
-a7205899e406285604adcd2727cd1d4c  13969-crystal-1.0.1.tar.bz2
+4979a4cbf74ca7f300bdfb2aaddc3e77  13969-crystal-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 15 15:51:06 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:51:06 -0700
Subject: rpms/kmenu-gnome import.log,1.3,1.4
Message-ID: <200610151551.k9FFpc0F009359@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9244

Modified Files:
	import.log 
Log Message:
auto-import kmenu-gnome-0.6.0.1-2 on branch FC-5 from kmenu-gnome-0.6.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	4 Sep 2006 22:10:21 -0000	1.3
+++ import.log	15 Oct 2006 15:51:06 -0000	1.4
@@ -1,2 +1,3 @@
 kmenu-gnome-0_6-3:HEAD:kmenu-gnome-0.6-3.src.rpm:1156174493
 kmenu-gnome-0_6-4:HEAD:kmenu-gnome-0.6-4.src.rpm:1157408049
+kmenu-gnome-0_6_0_1-2:FC-5:kmenu-gnome-0.6.0.1-2.src.rpm:1160927686



From fedora-extras-commits at redhat.com  Sun Oct 15 15:51:07 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:51:07 -0700
Subject: rpms/kmenu-gnome/FC-5 .cvsignore, 1.2, 1.3 kmenu-gnome.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610151551.k9FFpd5Y009364@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9244/FC-5

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Log Message:
auto-import kmenu-gnome-0.6.0.1-2 on branch FC-5 from kmenu-gnome-0.6.0.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2006 15:31:58 -0000	1.2
+++ .cvsignore	15 Oct 2006 15:51:07 -0000	1.3
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.tar.gz
+kmenu-gnome-0.6.0.1.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/kmenu-gnome.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmenu-gnome.spec	21 Aug 2006 15:31:58 -0000	1.1
+++ kmenu-gnome.spec	15 Oct 2006 15:51:07 -0000	1.2
@@ -1,14 +1,16 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6
-Release:    3%{?dist}
+Version:    0.6.0.1
+Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
-Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+#Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+#Use local tarball until new release to fix #208788:
+Source:     %{name}-%{version}.tar.gz
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,12 +32,10 @@
 mv %{name}/fc5-hide-bug196275.menu \
 %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275
-cp -r desktop-directories icons %{name} %{buildroot}%{_datadir}
+cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
 #Ignore dangling-relative-symlink warnings
 #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings
-( cd %{buildroot}%{_datadir}/desktop-directories
-ln -s kde-games-kidsgames.directory kde-games-kids.directory )
 ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps
 ln -s icon-office.png ooomain.png )
 ( cd %{buildroot}%{_icondir}/Bluecurve/24x24/apps
@@ -56,7 +56,7 @@
 ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
 ln -s ../../../gnome/48x48/apps/accessibility-directory.png .
-ln -s ../../../gnome/48x48/apps/gnome-system.png .
+#ln -s ../../../gnome/48x48/apps/gnome-system.png .
 ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/48x48/stock/net/stock_contact.png .
 ln -s ../../../gnome/48x48/stock/io/stock_print.png . )
@@ -82,14 +82,23 @@
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/%{name}.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/fc5-hide-bug196275.menu
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
 %{_datadir}/desktop-directories/*.directory
 %{_icondir}/Bluecurve/*/*/*.png
 %{_icondir}/crystalsvg/*/*/*.png
 %doc ChangeLog COPYING GPL LGPL README
 
-%changelog
+%Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6.0.1-2
+- Removed duplicate gnome-system.png
+
+* Thu Oct 05 2006 Ariszlo <ariszlo at gmail.com> - 0.6.0.1-1
+- Removed kde-games-kids.directory link to fix Fedora bug 208788
+- Preparing release 0.6.1
+
+* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6-4
+- Rebuild for FC6-devel
+
 * Sun Aug 13 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6-3
 - Added redhat-artwork as %%Requires and %%build
 - touching Bluecurve and crystalsvg folders


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2006 15:31:58 -0000	1.2
+++ sources	15 Oct 2006 15:51:07 -0000	1.3
@@ -1 +1 @@
-9b36e22fc02f022e35fae3241ec9d622  31025-kmenu-gnome-0.6.tar.gz
+b0759e688cafd1dcfbe6c34e9e533e33  kmenu-gnome-0.6.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 15:53:14 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:53:14 -0700
Subject: rpms/kmenu-gnome import.log,1.4,1.5
Message-ID: <200610151553.k9FFrGkt009546@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9513

Modified Files:
	import.log 
Log Message:
auto-import kmenu-gnome-0.6.0.1-2 on branch devel from kmenu-gnome-0.6.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	15 Oct 2006 15:51:06 -0000	1.4
+++ import.log	15 Oct 2006 15:53:14 -0000	1.5
@@ -1,3 +1,4 @@
 kmenu-gnome-0_6-3:HEAD:kmenu-gnome-0.6-3.src.rpm:1156174493
 kmenu-gnome-0_6-4:HEAD:kmenu-gnome-0.6-4.src.rpm:1157408049
 kmenu-gnome-0_6_0_1-2:FC-5:kmenu-gnome-0.6.0.1-2.src.rpm:1160927686
+kmenu-gnome-0_6_0_1-2:HEAD:kmenu-gnome-0.6.0.1-2.src.rpm:1160927814



From fedora-extras-commits at redhat.com  Sun Oct 15 15:53:15 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:53:15 -0700
Subject: rpms/kmenu-gnome/devel .cvsignore, 1.2, 1.3 kmenu-gnome.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200610151553.k9FFrHsK009552@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9513/devel

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Log Message:
auto-import kmenu-gnome-0.6.0.1-2 on branch devel from kmenu-gnome-0.6.0.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2006 15:31:58 -0000	1.2
+++ .cvsignore	15 Oct 2006 15:53:15 -0000	1.3
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.tar.gz
+kmenu-gnome-0.6.0.1.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmenu-gnome.spec	4 Sep 2006 22:10:21 -0000	1.2
+++ kmenu-gnome.spec	15 Oct 2006 15:53:15 -0000	1.3
@@ -1,14 +1,16 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6
-Release:    4%{?dist}
+Version:    0.6.0.1
+Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
-Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+#Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+#Use local tarball until new release to fix #208788:
+Source:     %{name}-%{version}.tar.gz
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,8 +36,6 @@
 
 #Ignore dangling-relative-symlink warnings
 #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings
-( cd %{buildroot}%{_datadir}/desktop-directories
-ln -s kde-games-kidsgames.directory kde-games-kids.directory )
 ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps
 ln -s icon-office.png ooomain.png )
 ( cd %{buildroot}%{_icondir}/Bluecurve/24x24/apps
@@ -56,7 +56,7 @@
 ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
 ln -s ../../../gnome/48x48/apps/accessibility-directory.png .
-ln -s ../../../gnome/48x48/apps/gnome-system.png .
+#ln -s ../../../gnome/48x48/apps/gnome-system.png .
 ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/48x48/stock/net/stock_contact.png .
 ln -s ../../../gnome/48x48/stock/io/stock_print.png . )
@@ -89,6 +89,13 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6.0.1-2
+- Removed duplicate gnome-system.png
+
+* Thu Oct 05 2006 Ariszlo <ariszlo at gmail.com> - 0.6.0.1-1
+- Removed kde-games-kids.directory link to fix Fedora bug 208788
+- Preparing release 0.6.1
+
 * Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6-4
 - Rebuild for FC6-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2006 15:31:58 -0000	1.2
+++ sources	15 Oct 2006 15:53:15 -0000	1.3
@@ -1 +1 @@
-9b36e22fc02f022e35fae3241ec9d622  31025-kmenu-gnome-0.6.tar.gz
+b0759e688cafd1dcfbe6c34e9e533e33  kmenu-gnome-0.6.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 17:13:04 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 10:13:04 -0700
Subject: rpms/allegro/devel allegro-4.2.0-multilib.patch, NONE,
	1.1 allegro-4.0.3-libdir.patch, 1.1, 1.2 allegro.spec, 1.36, 1.37
Message-ID: <200610151713.k9FHD7kx016522@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16497

Modified Files:
	allegro-4.0.3-libdir.patch allegro.spec 
Added Files:
	allegro-4.2.0-multilib.patch 
Log Message:
* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-18
- Multilib devel goodness (make allegro-devel i386 and x86_64 parallel
  installable)


allegro-4.2.0-multilib.patch:

--- NEW FILE allegro-4.2.0-multilib.patch ---
--- allegro-4.2.0/include/allegro/platform/alunixac.hin~	2006-10-15 18:45:00.000000000 +0200
+++ allegro-4.2.0/include/allegro/platform/alunixac.hin	2006-10-15 18:45:00.000000000 +0200
@@ -49,19 +49,25 @@
 #undef ALLEGRO_LINUX_VBEAF
 
 /* Define to enable Linux console VGA driver. */
-#undef ALLEGRO_LINUX_VGA
+#ifdef __i386__
+#define ALLEGRO_LINUX_VGA
+#endif
 
 /* Define if target machine is little endian. */
 #undef ALLEGRO_LITTLE_ENDIAN
 
 /* Define if assembler supports MMX. */
-#undef ALLEGRO_MMX
+#ifdef __i386__
+#define ALLEGRO_MMX
+#endif
 
 /* Define for Unix platforms, to use C convention for bank switching. */
 #undef ALLEGRO_NO_ASM
 
 /* Define if assembler supports SSE. */
-#undef ALLEGRO_SSE
+#ifdef __i386__
+#define ALLEGRO_SSE
+#endif
 
 /* Define if constructor attribute is supported. */
 #undef ALLEGRO_USE_CONSTRUCTOR

allegro-4.0.3-libdir.patch:

Index: allegro-4.0.3-libdir.patch
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro-4.0.3-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- allegro-4.0.3-libdir.patch	13 Feb 2005 22:10:46 -0000	1.1
+++ allegro-4.0.3-libdir.patch	15 Oct 2006 17:13:04 -0000	1.2
@@ -1,14 +1,29 @@
---- misc/allegro-config.in~	2003-04-19 10:08:10.000000000 +0300
-+++ misc/allegro-config.in	2005-02-13 23:31:31.602523235 +0200
-@@ -15,6 +15,7 @@
+--- allegro-4.2.0/misc/allegro-config.in.libdir	2005-11-05 17:40:11.000000000 +0100
++++ allegro-4.2.0/misc/allegro-config.in	2006-10-15 18:38:46.000000000 +0200
+@@ -15,13 +15,21 @@
  exec_prefix=$prefix
  exec_prefix_set=no
  include_prefix=@INCLUDE_PREFIX@
-+libdir=@libdir@
++arch=$(/bin/arch)
++if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \
++    -o "$arch" = "ia64" ];
++then
++    libdir="/usr/lib64"
++else
++    libdir="/usr/lib"
++fi
  
  static_libs=@LINK_WITH_STATIC_LIBS@
  lib_type=@LIB_TO_LINK@
-@@ -162,7 +163,7 @@
+ 
+ accepts_frameworks=no
+ 
+-allegro_ldflags="@LDFLAGS@"
++allegro_ldflags="-Wl,--export-dynamic "
+ allegro_libs="@LIBS@"
+ allegro_frameworks="@FRAMEWORKS@"
+ allegro_cflags=""
+@@ -178,7 +186,7 @@
  fi
  
  if test "$echo_libs" = "yes"; then
@@ -17,7 +32,7 @@
     if test "$static_libs" = "yes"; then
        echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
     else
-@@ -172,8 +173,8 @@
+@@ -192,8 +200,8 @@
  
  if test "$echo_env" = "yes"; then
     echo "export PATH=\$PATH:$prefix/bin"


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- allegro.spec	2 Sep 2006 06:36:24 -0000	1.36
+++ allegro.spec	15 Oct 2006 17:13:04 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -23,6 +23,7 @@
 Patch9:         allegro-4.2.0-no-execheap.patch
 Patch10:        allegro-4.2.0-nicevsync.patch
 Patch11:        allegro-4.2.0-noexecstack.patch
+Patch12:        allegro-4.2.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -127,7 +128,7 @@
 
 %prep
 %setup -q
-%patch1 -p0 -b .libdir
+%patch1 -p1 -b .libdir
 %patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
 %patch4 -p1 -z .digmid
@@ -138,6 +139,7 @@
 %patch9 -p1 -z .execheap
 %patch10 -p1 -z .nicevsync
 %patch11 -p1 -z .noexecstack
+%patch12 -p1 -z .multilib
 
 
 %build
@@ -228,6 +230,10 @@
 
 
 %changelog
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-18
+- Multilib devel goodness (make allegro-devel i386 and x86_64 parallel
+  installable)
+
 * Sat Sep  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-17
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Sun Oct 15 17:34:44 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:34:44 -0700
Subject: rpms/python-tgfastdata - New directory
Message-ID: <200610151734.k9FHYkfo016734@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/python-tgfastdata

Log Message:
Directory /cvs/extras/rpms/python-tgfastdata added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 17:34:44 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:34:44 -0700
Subject: rpms/python-tgfastdata/devel - New directory
Message-ID: <200610151734.k9FHYkxE016737@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/python-tgfastdata/devel

Log Message:
Directory /cvs/extras/rpms/python-tgfastdata/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 17:34:58 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:34:58 -0700
Subject: rpms/python-tgfastdata Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610151735.k9FHZ0Qo016781@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16753

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-tgfastdata


--- NEW FILE Makefile ---
# Top level Makefile for module python-tgfastdata
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 15 17:34:58 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:34:58 -0700
Subject: rpms/python-tgfastdata/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610151735.k9FHZ0cP016784@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16753/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-tgfastdata


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 15 17:35:19 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:35:19 -0700
Subject: rpms/python-tgfastdata import.log,1.1,1.2
Message-ID: <200610151735.k9FHZpcN016853@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16817

Modified Files:
	import.log 
Log Message:
auto-import python-tgfastdata-0.9a6-4 on branch devel from python-tgfastdata-0.9a6-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2006 17:34:57 -0000	1.1
+++ import.log	15 Oct 2006 17:35:18 -0000	1.2
@@ -0,0 +1 @@
+python-tgfastdata-0_9a6-4:HEAD:python-tgfastdata-0.9a6-4.src.rpm:1160933854



From fedora-extras-commits at redhat.com  Sun Oct 15 17:35:19 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:35:19 -0700
Subject: rpms/python-tgfastdata/devel python-tgfastdata.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610151735.k9FHZp8p016857@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16817/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-tgfastdata.spec 
Log Message:
auto-import python-tgfastdata-0.9a6-4 on branch devel from python-tgfastdata-0.9a6-4.src.rpm


--- NEW FILE python-tgfastdata.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%define module tgfastdata

Name:           python-tgfastdata
Version:        0.9a6
Release:        4%{?dist}
Summary:        Automatic user interface generation for TurboGears

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org/docs/plugins/template.html
Source0:        http://files.turbogears.org/eggs/TGFastData-%{version}-py2.4.egg
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch


%description
FastData is an extension to TurboGears which can provide automatic user
interface generation based upon an application's model objects.


%prep
%setup -q -c


%build


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/%{module}{,/templates}
install -p -m 0644 %{module}/*.py %{buildroot}%{python_sitelib}/%{module}
install -p -m 0644 %{module}/templates/* %{buildroot}%{python_sitelib}/%{module}/templates

# Install the egg-info directory
mkdir -p %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{python_sitelib}/%{module}/
%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info

%changelog
* Tue Oct 14 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-4
- Fix Source0
- Own %%{python_sitelib}/%{module}
- Don't install unusable tests

* Tue Oct 10 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-3
- Remove TurboGears requirement

* Sat Sep 30 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-2
- Rename to python-tgfastdata
- Install egg-info

* Sun Sep 17 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-1
- Initial creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2006 17:34:58 -0000	1.1
+++ .cvsignore	15 Oct 2006 17:35:19 -0000	1.2
@@ -0,0 +1 @@
+TGFastData-0.9a6-py2.4.egg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2006 17:34:58 -0000	1.1
+++ sources	15 Oct 2006 17:35:19 -0000	1.2
@@ -0,0 +1 @@
+523bdd96bda2f505c2626051a95565d4  TGFastData-0.9a6-py2.4.egg



From fedora-extras-commits at redhat.com  Sun Oct 15 17:37:01 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:37:01 -0700
Subject: owners owners.list,1.1829,1.1830
Message-ID: <200610151737.k9FHb3Yl016917@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16900

Modified Files:
	owners.list 
Log Message:
add python-tgfastdata to owners list


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1829
retrieving revision 1.1830
diff -u -r1.1829 -r1.1830
--- owners.list	14 Oct 2006 22:01:44 -0000	1.1829
+++ owners.list	15 Oct 2006 17:37:00 -0000	1.1830
@@ -1900,6 +1900,7 @@
 Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-telepathy|Python libraries for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-TestGears|Unit testing for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-tgfastdata|Automatic user interface generation for TurboGears|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbocheetah|TurboGears plugin to support use of Cheetah templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 15 17:50:26 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sun, 15 Oct 2006 10:50:26 -0700
Subject: fedora-release fedora-core.repo, 1.7, 1.8 fedora-development.repo,
	1.10, 1.11 fedora-extras-development.repo, 1.8,
	1.9 fedora-extras.repo, 1.9, 1.10 fedora-release.spec, 1.33, 1.34
Message-ID: <200610151750.k9FHoQw1017092@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17066

Modified Files:
	fedora-core.repo fedora-development.repo 
	fedora-extras-development.repo fedora-extras.repo 
	fedora-release.spec 
Log Message:
Build for next rawhide, fiddle the repos again



Index: fedora-core.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-core.repo	5 Oct 2006 15:07:40 -0000	1.7
+++ fedora-core.repo	15 Oct 2006 17:50:24 -0000	1.8
@@ -2,7 +2,7 @@
 name=Fedora Core $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-$releasever&arch=$basearch
-enabled=1
+enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
 


Index: fedora-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-development.repo	5 Oct 2006 15:07:40 -0000	1.10
+++ fedora-development.repo	15 Oct 2006 17:50:24 -0000	1.11
@@ -27,7 +27,7 @@
 name=Fedora Core - Development
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=0
 
 [development-debuginfo]


Index: fedora-extras-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-extras-development.repo	5 Oct 2006 15:07:40 -0000	1.8
+++ fedora-extras-development.repo	15 Oct 2006 17:50:24 -0000	1.9
@@ -13,7 +13,7 @@
 name=Fedora Extras - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=$basearch
-enabled=0
+enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
 


Index: fedora-extras.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-extras.repo	5 Oct 2006 15:07:40 -0000	1.9
+++ fedora-extras.repo	15 Oct 2006 17:50:24 -0000	1.10
@@ -2,7 +2,7 @@
 name=Fedora Extras $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-$releasever&arch=$basearch
-enabled=1
+enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
 


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fedora-release.spec	12 Oct 2006 17:37:21 -0000	1.33
+++ fedora-release.spec	15 Oct 2006 17:50:24 -0000	1.34
@@ -1,9 +1,9 @@
-%define release_name Zod
+%define release_name Rawhide
 
 Summary:	Fedora Core release files
 Name:		fedora-release
-Version:	6
-Release:	3
+Version:	6.89
+Release:	1
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -63,6 +63,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Sun Oct 15 2006 Jesse Keating <jkeating at redhat.com> - 6.89-1
+- Rebuild for rawhide
+
 * Thu Oct 12 2006 Jesse Keating <jkeating at redhat.com> - 6-3
 - version has to stay the same, safe to use.
 



From fedora-extras-commits at redhat.com  Sun Oct 15 18:11:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 15 Oct 2006 11:11:32 -0700
Subject: rpms/orage/devel orage.spec,1.3,1.4
Message-ID: <200610151811.k9FIBYTH020402@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20380

Modified Files:
	orage.spec 
Log Message:
xfce4-datetime-plugin is back, remove obsoletes and provides



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- orage.spec	7 Oct 2006 15:11:20 -0000	1.3
+++ orage.spec	15 Oct 2006 18:11:32 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: orage
 Version: 4.3.99.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
@@ -18,9 +18,6 @@
 
 Provides: xfcalendar = %{version}-%{release}
 Obsoletes: xfcalendar <= 4.2.3-3.fc6
-# xfce4-datetime-plugin isn't in Xfce 4.4
-Provides: xfce4-datetime-plugin = %{version}-%{release}
-Obsoletes: xfce4-datetime-plugin <= 0.3.1-8.fc6
 
 %description
 Time-managing application for Xfce4.
@@ -72,6 +69,9 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Sun Oct 15 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
+- xfce4-datetime-plugin is back, remove obsoletes and provides
+
 * Sat Oct  7 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
 - Fix Obsoletes
 



From fedora-extras-commits at redhat.com  Sun Oct 15 18:57:19 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 15 Oct 2006 11:57:19 -0700
Subject: comps comps-fe6.xml.in,1.188,1.189
Message-ID: <200610151857.k9FIvLlG020745@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20728

Modified Files:
	comps-fe6.xml.in 
Log Message:
remove obsolete xfce packages and add the new ones


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- comps-fe6.xml.in	15 Oct 2006 03:08:34 -0000	1.188
+++ comps-fe6.xml.in	15 Oct 2006 18:57:19 -0000	1.189
@@ -1115,18 +1115,17 @@
       <packagereq type="default">xfce-mcs-plugins</packagereq>
       <packagereq type="default">xfce4-appfinder</packagereq>
       <packagereq type="default">xfce4-icon-theme</packagereq>
-      <packagereq type="default">xfce4-iconbox</packagereq>
       <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
       <packagereq type="default">xfce4-mixer</packagereq>
-      <packagereq type="default">xfce4-systray</packagereq>
-      <packagereq type="default">xfce4-trigger-launcher</packagereq>
       <packagereq type="default">xffm-icons</packagereq>
       <packagereq type="default">xfprint</packagereq>
-      <packagereq type="optional">xfcalendar</packagereq>
+      <packagereq type="optional">mousepad</packagereq>
+      <packagereq type="optional">orage</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>
       <packagereq type="optional">xfce4-clipman-plugin</packagereq>
       <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
       <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
+      <packagereq type="optional">xfce4-datetime-plugin</packagereq>
       <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
       <packagereq type="optional">xfce4-genmon-plugin</packagereq>
       <packagereq type="optional">xfce4-minicmd-plugin</packagereq>



From fedora-extras-commits at redhat.com  Sun Oct 15 19:28:29 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 15 Oct 2006 12:28:29 -0700
Subject: rpms/stellarium/FC-5 stellarium.spec,1.21,1.22
Message-ID: <200610151928.k9FJSVp7023797@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23780

Modified Files:
	stellarium.spec 
Log Message:
Fix segfault on x64 systems


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- stellarium.spec	10 Oct 2006 19:37:03 -0000	1.21
+++ stellarium.spec	15 Oct 2006 19:28:29 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
+Patch1:	        stellarium-0.8.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -83,6 +85,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1.1
+- Fix segfault on x64 systems (#210525)
+
 * Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Oct 15 19:33:14 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 12:33:14 -0700
Subject: rpms/perl-Params-Coerce/FC-5 perl-Params-Coerce.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610151933.k9FJXG1D023928@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Params-Coerce/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23875/FC-5

Modified Files:
	perl-Params-Coerce.spec sources 
Log Message:
update to 0.14



Index: perl-Params-Coerce.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/FC-5/perl-Params-Coerce.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Params-Coerce.spec	7 Sep 2006 16:39:53 -0000	1.2
+++ perl-Params-Coerce.spec	15 Oct 2006 19:33:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Params-Coerce
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Allows your classes to do coercion of parameters
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -35,7 +35,6 @@
 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 \;
 
@@ -54,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-2
 - add additional verbosity to %%description 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 16:37:43 -0000	1.2
+++ sources	15 Oct 2006 19:33:14 -0000	1.3
@@ -1 +1 @@
-b87babce7c8c5869045fff7d1fc9958f  Params-Coerce-0.13.tar.gz
+a8439ea6777c9156424ef6dd74c83945  Params-Coerce-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 19:33:15 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 12:33:15 -0700
Subject: rpms/perl-Params-Coerce/devel .cvsignore, 1.2,
	1.3 perl-Params-Coerce.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610151933.k9FJXHrO023934@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Params-Coerce/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23875/devel

Modified Files:
	.cvsignore perl-Params-Coerce.spec sources 
Log Message:
update to 0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 16:37:43 -0000	1.2
+++ .cvsignore	15 Oct 2006 19:33:15 -0000	1.3
@@ -1 +1 @@
-Params-Coerce-0.13.tar.gz
+Params-Coerce-0.14.tar.gz


Index: perl-Params-Coerce.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/devel/perl-Params-Coerce.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Params-Coerce.spec	7 Sep 2006 16:39:53 -0000	1.2
+++ perl-Params-Coerce.spec	15 Oct 2006 19:33:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Params-Coerce
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Allows your classes to do coercion of parameters
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -35,7 +35,6 @@
 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 \;
 
@@ -54,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-2
 - add additional verbosity to %%description 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 16:37:43 -0000	1.2
+++ sources	15 Oct 2006 19:33:15 -0000	1.3
@@ -1 +1 @@
-b87babce7c8c5869045fff7d1fc9958f  Params-Coerce-0.13.tar.gz
+a8439ea6777c9156424ef6dd74c83945  Params-Coerce-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 19:33:13 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 12:33:13 -0700
Subject: rpms/perl-Params-Coerce Makefile,1.1,1.2
Message-ID: <200610151933.k9FJXF9f023923@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Params-Coerce
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23875

Modified Files:
	Makefile 
Log Message:
update to 0.14



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 16:37:32 -0000	1.1
+++ Makefile	15 Oct 2006 19:33:13 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Sun Oct 15 19:41:38 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 15 Oct 2006 12:41:38 -0700
Subject: rpms/stellarium/FC-5 stellarium-0.8.2-x64.patch, NONE,
	1.1 stellarium.spec, 1.22, 1.23
Message-ID: <200610151941.k9FJfeD3024038@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24018

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64.patch 
Log Message:
Added forgotten file to cvs

stellarium-0.8.2-x64.patch:

--- NEW FILE stellarium-0.8.2-x64.patch ---
--- stellarium-0.8.2/src/translator.cpp.org	2006-10-15 21:14:08.000000000 +0200
+++ stellarium-0.8.2/src/translator.cpp	2006-10-15 21:15:42.000000000 +0200
@@ -73,9 +73,9 @@
 	//change systemLangName to ISO 639 / ISO 3166.
 	unsigned int pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
-	       Translator::systemLangName.resize(pos);
+	       Translator::systemLangName.resize(pos+1);
 	pos = Translator::systemLangName.find('.', 0);
-	if(pos == 5) Translator::systemLangName.resize(pos);
+	if(pos == 5) Translator::systemLangName.resize(pos+1);
 }
 
 void Translator::reload()


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- stellarium.spec	15 Oct 2006 19:28:29 -0000	1.22
+++ stellarium.spec	15 Oct 2006 19:41:38 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -85,7 +85,7 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
-* Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1.1
+* Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1.2
 - Fix segfault on x64 systems (#210525)
 
 * Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1



From fedora-extras-commits at redhat.com  Sun Oct 15 20:23:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 13:23:20 -0700
Subject: rpms/lirc/devel lirc.spec, 1.17, 1.18 lirc-0.8.0-rpath64.patch, 1.1,
	NONE lirc-optflags.patch, 1.1, NONE
Message-ID: <200610152023.k9FKNMLV027201@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27184

Modified Files:
	lirc.spec 
Removed Files:
	lirc-0.8.0-rpath64.patch lirc-optflags.patch 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
- 0.8.1pre2, optflags patch no longer needed.



Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lirc.spec	28 Aug 2006 16:36:47 -0000	1.17
+++ lirc.spec	15 Oct 2006 20:23:20 -0000	1.18
@@ -1,6 +1,7 @@
 # TODO:
 # - caraca driver (req: caraca, http://caraca.sf.net/)
 # - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
+# - iguanaIR driver (req: http://iguanaworks.net/ir/usb/installation.shtml)
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
@@ -15,18 +16,16 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre1%{?dist}
+Release:        0.2.pre2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre1.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         %{name}-optflags.patch
-Patch1:         %{name}-0.8.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -82,13 +81,16 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-%{version}pre2
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
+for f in remotes/chronos/lircd.conf.chronos \
+    remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb ; do
+    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
+sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
 # *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
 %if ! %{with alsa}
 sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure*
@@ -198,6 +200,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
+- 0.8.1pre2, optflags patch no longer needed.
+
 * Mon Aug 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2.pre1
 - Rebuild.
 


--- lirc-0.8.0-rpath64.patch DELETED ---


--- lirc-optflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 20:24:14 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 13:24:14 -0700
Subject: rpms/lirc/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <200610152024.k9FKOG2x027238@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27219

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
- 0.8.1pre2, optflags patch no longer needed.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Jul 2006 09:02:42 -0000	1.11
+++ .cvsignore	15 Oct 2006 20:24:14 -0000	1.12
@@ -1 +1 @@
-lirc-0.8.1pre1.tar.bz2
+lirc-0.8.1pre2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Jul 2006 09:02:42 -0000	1.11
+++ sources	15 Oct 2006 20:24:14 -0000	1.12
@@ -1 +1 @@
-acb6340078bde9628f5ae848fec0583c  lirc-0.8.1pre1.tar.bz2
+c8c1f5f692222050bcbafbf1ba6a1217  lirc-0.8.1pre2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 15 21:08:51 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:08:51 -0700
Subject: rpms/libctl - New directory
Message-ID: <200610152108.k9FL8rCP030677@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30656/libctl

Log Message:
Directory /cvs/extras/rpms/libctl added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 21:08:52 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:08:52 -0700
Subject: rpms/libctl/devel - New directory
Message-ID: <200610152108.k9FL8ssu030680@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30656/libctl/devel

Log Message:
Directory /cvs/extras/rpms/libctl/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 21:09:05 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:09:05 -0700
Subject: rpms/libctl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610152109.k9FL97tw030737@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30704

Added Files:
	Makefile import.log 
Log Message:
Setup of module libctl


--- NEW FILE Makefile ---
# Top level Makefile for module libctl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 15 21:09:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:09:06 -0700
Subject: rpms/libctl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610152109.k9FL987H030740@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30704/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libctl


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 15 21:09:36 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:09:36 -0700
Subject: rpms/libctl import.log,1.1,1.2
Message-ID: <200610152109.k9FL9cvD030817@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30783

Modified Files:
	import.log 
Log Message:
auto-import libctl-3.0.2-4 on branch devel from libctl-3.0.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libctl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2006 21:09:05 -0000	1.1
+++ import.log	15 Oct 2006 21:09:36 -0000	1.2
@@ -0,0 +1 @@
+libctl-3_0_2-4:HEAD:libctl-3.0.2-4.src.rpm:1160946572



From fedora-extras-commits at redhat.com  Sun Oct 15 21:09:37 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:09:37 -0700
Subject: rpms/libctl/devel libctl-3.0.2-undefined_nonweak_symbs.patch, NONE, 
	1.1 libctl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610152109.k9FL9dkH030824@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30783/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libctl-3.0.2-undefined_nonweak_symbs.patch libctl.spec 
Log Message:
auto-import libctl-3.0.2-4 on branch devel from libctl-3.0.2-4.src.rpm

libctl-3.0.2-undefined_nonweak_symbs.patch:

--- NEW FILE libctl-3.0.2-undefined_nonweak_symbs.patch ---
--- libctl-3.0.2/utils/Makefile.am	2006-04-01 23:04:47.000000000 -0500
+++ libctl-3.0.2_patched/utils/Makefile.am	2006-10-14 12:14:41.000000000 -0400
@@ -10,7 +10,7 @@
 
 libctlgeom_la_SOURCES = geom.c 
 nodist_libctlgeom_la_SOURCES = geom-ctl-io.c ctl-io.h
-libctlgeom_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
+libctlgeom_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ $(top_builddir)/src/libctl.la
 
 geomtst_SOURCES = geomtst.c
 geomtst_LDADD = libctlgeom.la $(top_builddir)/src/libctl.la


--- NEW FILE libctl.spec ---
Name:           libctl
Version:        3.0.2
Release:        4%{?dist}
Summary:        Guile-based support for flexible control files

Group:          System Environment/Libraries
License:        GPL
URL:            http://ab-initio.mit.edu/wiki/index.php/Libctl
Source0:        http://ab-initio.mit.edu/libctl/libctl-%{version}.tar.gz
Patch0:         libctl-3.0.2-undefined_nonweak_symbs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf, automake, libtool
BuildRequires:  gcc-gfortran, guile-devel
Requires:       guile

%description
The libctl package is a Guile-based library that provides support for
flexible control files in scientific simulations.

%package devel
Summary:        Development files for libctl
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package contains the development files for libctl.

%prep
%setup -q
%patch0 -p1

%build
autoreconf
%configure F77=gfortran --enable-shared --disable-static \
  --includedir=%{_includedir}/ctl
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS NEWS 
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc ChangeLog
%{_bindir}/gen-ctl-io
%{_includedir}/ctl
%{_libdir}/*.so
%{_mandir}/man1/*
%{_datadir}/libctl

%changelog
* Sat Oct 15 2006  Ed Hill <ed at eh3.com> - 3.0.2-4
- put headers in a subdir to avoid possible name collisions

* Sat Oct 14 2006  Ed Hill <ed at eh3.com> - 3.0.2-3
- disable static libs

* Sat Oct 14 2006  Ed Hill <ed at eh3.com> - 3.0.2-2
- fix undefined non-weak symbols in libctlgeom

* Wed Sep 20 2006  Ed Hill <ed at eh3.com> - 3.0.2-1
- initial package creation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libctl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2006 21:09:06 -0000	1.1
+++ .cvsignore	15 Oct 2006 21:09:36 -0000	1.2
@@ -0,0 +1 @@
+libctl-3.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libctl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2006 21:09:06 -0000	1.1
+++ sources	15 Oct 2006 21:09:36 -0000	1.2
@@ -0,0 +1 @@
+dff367aa94e68a507678f0f3d48b1165  libctl-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 21:55:04 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:55:04 -0700
Subject: rpms/xeuphoric - New directory
Message-ID: <200610152155.k9FLt6RX031300@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31274/xeuphoric

Log Message:
Directory /cvs/extras/rpms/xeuphoric added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 21:55:05 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:55:05 -0700
Subject: rpms/xeuphoric/devel - New directory
Message-ID: <200610152155.k9FLt7r5031303@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31274/xeuphoric/devel

Log Message:
Directory /cvs/extras/rpms/xeuphoric/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 21:55:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:55:32 -0700
Subject: rpms/xeuphoric/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610152155.k9FLtYf3031361@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31325/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xeuphoric


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 15 21:55:31 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:55:31 -0700
Subject: rpms/xeuphoric Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610152155.k9FLtXBD031358@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31325

Added Files:
	Makefile import.log 
Log Message:
Setup of module xeuphoric


--- NEW FILE Makefile ---
# Top level Makefile for module xeuphoric
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 15 21:57:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:57:01 -0700
Subject: rpms/xeuphoric/devel xeuphoric-config.patch, NONE,
	1.1 xeuphoric.desktop, NONE, 1.1 xeuphoric.png, NONE,
	1.1 xeuphoric.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610152157.k9FLv3WM031460@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31417/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xeuphoric-config.patch xeuphoric.desktop xeuphoric.png 
	xeuphoric.spec 
Log Message:
auto-import xeuphoric-0.18.2-5 on branch devel from xeuphoric-0.18.2-5.src.rpm

xeuphoric-config.patch:

--- NEW FILE xeuphoric-config.patch ---
--- xeuphoric-0.18.2/configure	2006-08-19 21:47:44.000000000 +0100
+++ xeuphoric-0.18.2/configure	2006-08-25 23:04:42.000000000 +0100
@@ -21,7 +21,7 @@
 
 set -e
 
-PREFIX=/usr/local
+PREFIX=/usr
 APPNAME=xeuphoric
 
 while [ "$#" -ne 0 ]


--- NEW FILE xeuphoric.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=xeuphoric
Comment=An ORIC home computer emulator
Icon=xeuphoric.png
Terminal=false
Type=Application
Categories=Application;Emulators;
Exec=xeuphoric



--- NEW FILE xeuphoric.spec ---
Summary: An X based ORIC emulator
Name: xeuphoric
Version: 0.18.2
Release: 5%{?dist}
License: GPL
Group: Applications/Emulators
Source0: http://www.teaser.fr/~amajorel/%{name}/%{name}-%{version}.tar.gz
URL: http://www.treaser.fr/~amajorel/%{name}
Source1: xeuphoric.desktop
Source2: xeuphoric.png
Patch0: xeuphoric-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: arts-devel libXext-devel desktop-file-utils
Requires: %{name}-roms
ExcludeArch: x86_64 ia64 ppc64
# excluded due to compilation problems - upstream developer changing RSN (me!)

%description
xeuphoric is an X based ORIC emulator which has full support for sound,
HIRES graphics, saving, loading and emulation of the original ORIC-1, Oric
Atmos (default) and the Telestat (which would have come next had Oric not
vanished under the waves!)

%package roms
Summary : ROMS required for %{name}
Group: Applications/Emulators
Requires: %{name} = %{version}-%{release}

%description roms
ROMS required to run %{name}

%prep
%setup -q 
%patch0 -p1
sed -i 's/\r//' doc/euphoric-0.99b/*
%{_bindir}/iconv -t UTF-8 docsrc/xeuphoric.1 -o docsrc/xeuphoric.1

%build
./configure
make CFLAGS="-DX11 %{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}/%{version}
mkdir -p %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/%{version}
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/pixmaps

install -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
cp docsrc/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
cp *.rom %{buildroot}%{_datadir}/%{name}/%{version}
cp %{SOURCE1} %{buildroot}%{_datadir}/applications
install -m 0644 .xeuphoricrc %{buildroot}%{_sysconfdir}/%{name}/%{version}/xeuphoricrc
install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png

desktop-file-install --vendor fedora \
    --dir %{buildroot}%{_datadir}/applications \
    --add-category X-Fedora \
    --delete-original \
    %{buildroot}%{_datadir}/applications/xeuphoric.desktop

%clean
rm -rf %{buildroot}

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

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

%files
%defattr(-,root,root)
%doc doc/euphoric-0.99b/* COPYING
%{_bindir}/%{name}
%{_mandir}/man1/*
%config (noreplace) %{_sysconfdir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png

%files roms
%{_datadir}/%{name}/

%changelog
* Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-5
- corrected iconv

* Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-4
- fixed sysconfdir issue
- added desktop file and desktop icon
- added post and postun
- added CFLAGS to the make line

* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-3
- created new ROM subpackage

* Sat Aug 26 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-2
- fixed sysconfdir problem

* Mon Aug 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-1
- Initial import into FE
- created datapath patch
- added own makeinstall as the provided one is broken



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xeuphoric/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2006 21:55:31 -0000	1.1
+++ .cvsignore	15 Oct 2006 21:57:01 -0000	1.2
@@ -0,0 +1 @@
+xeuphoric-0.18.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xeuphoric/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2006 21:55:31 -0000	1.1
+++ sources	15 Oct 2006 21:57:01 -0000	1.2
@@ -0,0 +1 @@
+4a2469ee45d6476350ffc0a92d165990  xeuphoric-0.18.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 21:57:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:57:01 -0700
Subject: rpms/xeuphoric import.log,1.1,1.2
Message-ID: <200610152157.k9FLv31X031453@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31417

Modified Files:
	import.log 
Log Message:
auto-import xeuphoric-0.18.2-5 on branch devel from xeuphoric-0.18.2-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xeuphoric/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2006 21:55:31 -0000	1.1
+++ import.log	15 Oct 2006 21:57:01 -0000	1.2
@@ -0,0 +1 @@
+xeuphoric-0_18_2-5:HEAD:xeuphoric-0.18.2-5.src.rpm:1160949409



From fedora-extras-commits at redhat.com  Sun Oct 15 22:00:32 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Sun, 15 Oct 2006 15:00:32 -0700
Subject: devel/common Makefile.common,1.36,1.37
Message-ID: <200610152200.k9FM0YaP031604@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31585

Modified Files:
	Makefile.common 
Log Message:
make plague-client check the path (otrs#227)


Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.common	12 Jun 2006 15:59:26 -0000	1.36
+++ Makefile.common	15 Oct 2006 22:00:32 -0000	1.37
@@ -88,7 +88,7 @@
 CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
-PLAGUE_CLIENT ?= /usr/bin/plague-client
+PLAGUE_CLIENT ?= $(which plague-client)
 
 # RPM with all the overrides in place; you can override this in your
 # .cvsextrasrc also, to use a default rpm setup



From fedora-extras-commits at redhat.com  Sun Oct 15 22:00:56 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 15:00:56 -0700
Subject: owners owners.list,1.1830,1.1831
Message-ID: <200610152200.k9FM0wEC031625@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31608

Modified Files:
	owners.list 
Log Message:

Added xeuphoric to the list 
 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1830
retrieving revision 1.1831
diff -u -r1.1830 -r1.1831
--- owners.list	15 Oct 2006 17:37:00 -0000	1.1830
+++ owners.list	15 Oct 2006 22:00:56 -0000	1.1831
@@ -2323,6 +2323,7 @@
 Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xeuphoric|An oric emulator capable of emulating the full family|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 15 22:03:48 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Sun, 15 Oct 2006 15:03:48 -0700
Subject: devel/common Makefile.common,1.37,1.38
Message-ID: <200610152203.k9FM3oXF002062@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045

Modified Files:
	Makefile.common 
Log Message:
allow setting MOCKCFG (patch from Anthony Seward <seward AT mza DOT com> via otra)



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.common	15 Oct 2006 22:00:32 -0000	1.37
+++ Makefile.common	15 Oct 2006 22:03:48 -0000	1.38
@@ -39,6 +39,7 @@
 BUILDDIR ?= $(WORKDIR)
 RPMDIR ?= $(WORKDIR)
 MOCKDIR ?= $(WORKDIR)
+MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
 ## SOURCEDIR is special; it has to match the CVS checkout directory, 
 ## because the CVS checkout directory contains the patch files. So it basically 
 ## can't be overridden without breaking things. But we leave it a variable
@@ -240,7 +241,7 @@
 
 # test build in mock
 mockbuild : srpm
-	mock $(MOCKARGS) -r fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg --resultdir=$(MOCKDIR)/$(TAG) $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
+	mock $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(MOCKDIR)/$(TAG) $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
 
 # build for a particular arch
 $(ARCHES) : sources $(TARGETS)



From fedora-extras-commits at redhat.com  Sun Oct 15 22:10:38 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Sun, 15 Oct 2006 15:10:38 -0700
Subject: devel/mercurial mercurial.spec,1.12,1.13
Message-ID: <200610152210.k9FMAcCp002310@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/mercurial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2294

Modified Files:
	mercurial.spec 
Log Message:
dumb commit just to test syncmail still works


Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/devel/mercurial/mercurial.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mercurial.spec	29 Aug 2006 03:06:29 -0000	1.12
+++ mercurial.spec	15 Oct 2006 22:10:08 -0000	1.13
@@ -12,7 +12,7 @@
 %description
 Mercurial is a fast, lightweight source control management system designed 
 for efficient handling of very large distributed projects.
-
+ 
 %prep
 %setup -q
 



From fedora-extras-commits at redhat.com  Sun Oct 15 22:12:51 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Sun, 15 Oct 2006 15:12:51 -0700
Subject: devel/common cvs-import.sh,1.11,1.12
Message-ID: <200610152212.k9FMCpcb002342@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2321

Modified Files:
	cvs-import.sh 
Log Message:
eggs should be source files (lmacken)


Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/devel/common/cvs-import.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cvs-import.sh	19 Jun 2006 20:43:15 -0000	1.11
+++ cvs-import.sh	15 Oct 2006 22:12:21 -0000	1.12
@@ -320,7 +320,7 @@
 	case $f in 
 	    *.tar | *gz | *.bz2 | *.Z | *.zip | *.ZIP | \
 	    *.ttf | *.bin | *.tbz | *.pdf | *.rpm | \
-	    *.jar | *.war | *.db | *.cpio | *.jisp )
+	    *.jar | *.war | *.db | *.cpio | *.jisp | *.egg )
 		UPLOADFILES="$UPLOADFILES $f"
 		if [ -n "$(grep $f sources 2>/dev/null)" ] ; then
 		    # this file existed before with a different md5sum



From fedora-extras-commits at redhat.com  Sun Oct 15 23:24:46 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 16:24:46 -0700
Subject: rpms/scribes/devel scribes-configure.ac-no-python-depcheck.patch,
	NONE, 1.1 .cvsignore, 1.3, 1.4 scribes.spec, 1.7, 1.8 sources, 1.3,
	1.4 scribes-setup-install-gconf-schemas.patch, 1.1,
	NONE scribes-setup-no-dep-check.patch, 1.1,
	NONE scribes-setup-no-manual-gconf.patch, 1.1, NONE
Message-ID: <200610152324.k9FNOksW005774@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5750

Modified Files:
	.cvsignore scribes.spec sources 
Added Files:
	scribes-configure.ac-no-python-depcheck.patch 
Removed Files:
	scribes-setup-install-gconf-schemas.patch 
	scribes-setup-no-dep-check.patch 
	scribes-setup-no-manual-gconf.patch 
Log Message:
Update to new upstream version (0.2.9.87)

scribes-configure.ac-no-python-depcheck.patch:

--- NEW FILE scribes-configure.ac-no-python-depcheck.patch ---
--- configure.ac.orig	2006-10-15 14:04:26.000000000 -0700
+++ configure.ac	2006-10-15 14:06:14.000000000 -0700
@@ -3,8 +3,6 @@
 
 AC_INIT([scribes], [0.2.9.87], [<mystilleef at gmail.com>])
 
-AC_PREREQ(2.60)
-
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip])
@@ -22,9 +20,6 @@
 AM_GNU_GETTEXT_VERSION
 
 AM_PATH_PYTHON([2.4])
-AC_LANG([C])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [AC_MSG_RESULT([It worked])], [AC_MSG_ERROR([It failed])])
-
 AC_CONFIG_FILES([
 intl/Makefile
 po/Makefile.in


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jun 2006 04:28:55 -0000	1.3
+++ .cvsignore	15 Oct 2006 23:24:16 -0000	1.4
@@ -1 +1 @@
-scribes-0.2.5.tar.gz
+scribes-0.2.9.87.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scribes.spec	27 Aug 2006 22:41:05 -0000	1.7
+++ scribes.spec	15 Oct 2006 23:24:16 -0000	1.8
@@ -1,30 +1,43 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define python_module_name	Scribes
+%define python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.5
-Release:	5%{?dist}
+Version:	0.2.9.87
+Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
 URL:		http://scribes.sourceforge.net/           
 
-Source0:	http://openusability.org/download.php/93/%{name}-%{version}.tar.gz
-Patch0:		%{name}-setup-no-dep-check.patch
-Patch1:		%{name}-setup-install-gconf-schemas.patch
-Patch2:		%{name}-setup-no-manual-gconf.patch
-BuildArch:	noarch
+Source0:	http://heanet.dl.sourceforge.net/scribes/scribes-%{version}.tar.bz2
+Patch0:		%{name}-configure.ac-no-python-depcheck.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:	desktop-file-utils
-Requires:	gnome-python2-gtkspell >= 2.12
-Requires:	gnome-python2-gtksourceview >= 2.12
-Requires:	pygtk2 >= 2.8
+BuildRequires:	pkgconfig >= 0.9.0
+BuildRequires:	scrollkeeper
+BuildRequires:	autoconf
+BuildRequires:	gnome-doc-utils
+BuildRequires:	GConf2
+
+Requires:	dbus-python >= 0.60
+Requires:	pygobject2
+Requires:	pygtk2 >= 2.10
+Requires:	python >= 2.4
 Requires:	gnome-python2-gconf >= 2.12
-Requires(pre):		GConf2
-Requires(post):		GConf2
-Requires(post):		scrollkeeper
+Requires:	gnome-python2-gnomeprint >= 2.12
+Requires:	gnome-python2-gnomevfs >= 2.12
+Requires:	gnome-python2-gtksourceview >= 2.12
+Requires:	gnome-python2-gtkspell >= 2.12
+Requires:	PyXML
+Requires:	python-psyco
+
+Requires(pre):	GConf2
+Requires(post):	GConf2
+Requires(post):	scrollkeeper
 Requires(preun):	GConf2
 Requires(postun):	scrollkeeper
 
@@ -49,15 +62,22 @@
 In order to make use of its runtime documentation facilities, you will need to
 install Yelp.
 
+
 %prep
 %setup -q
+# Patch out the configure script's call to depcheck.py, since I've ensured
+# that the deps are satisfied and the depcheck.py script is happy on its own,
+# though fails when run through rpmbuild...
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
+# ..then recreate the configure script from the new configure.ac file...
+%{__autoconf}
+# ...and now configure it. Scrollkeeper and GConf schema stuff are disabled
+# since they'll be installed with the scriptlets.
+%configure --disable-scrollkeeper --disable-schemas-install
 
 
 %build
-%{__python} setup.py build
+make %{?_smp_mflags}
 
 
 %pre
@@ -70,15 +90,12 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%find_lang %{name}
+make DESTDIR=%{buildroot} install
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
-chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/findbar.py
-chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
 
 
 %post
@@ -87,6 +104,10 @@
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
 
 
 %clean
@@ -103,26 +124,38 @@
 
 %postun
 update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+scrollkeeper-update -q ||:
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG README TODO TRANSLATORS COPYING
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{python_sitelib}/%{python_module_name}
 %{_bindir}/%{name}
-%dir %{python_sitelib}/%{python_module_name}
-%{python_sitelib}/%{python_module_name}/*.py
-%{python_sitelib}/%{python_module_name}/*.pyc
-%{python_sitelib}/%{python_module_name}/*.pyo
+%{_bindir}/.scribesclient
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.svg
-%{_datadir}/application-registry/%{name}.application
 %{_datadir}/gnome/help/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
+- Update to new upstream version
+- Add patch to bypass failure in depcheck.py call:
+  + configure.ac-no-python-depcheck.patch
+- Drop old patches, no longer needed:
+  - setup-no-manual-gconf.patch
+  - setup-install-gconf-schemas.patch
+  - setup-no-dep-check.patch
+
 * Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.5-5
 - Mass FC6 rebuild
 
@@ -150,7 +183,8 @@
 - Thanks to Brian Pepple (Bug #189727).
 
 * Tue Apr 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.4.3-2
-- Added patch to remove unnecessary gconf foo in the setup.py script.
+- Added patch to remove unnecessary gconf foo in the setup.py script:
+  + setup-no-manual-gconf.patch
 - Fix a few spacing inconsistencies in the .spec file.
 
 * Sat Apr 22 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.4.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2006 04:28:55 -0000	1.3
+++ sources	15 Oct 2006 23:24:16 -0000	1.4
@@ -1 +1 @@
-5e9d0b7cda17069042e5d8e8c4f32692  scribes-0.2.5.tar.gz
+428458fd6f6a457b6e2d693f8cd1c6d3  scribes-0.2.9.87.tar.bz2


--- scribes-setup-install-gconf-schemas.patch DELETED ---


--- scribes-setup-no-dep-check.patch DELETED ---


--- scribes-setup-no-manual-gconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 23:49:32 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 16:49:32 -0700
Subject: rpms/scribes/devel scribes.spec,1.8,1.9
Message-ID: <200610152349.k9FNnWit005903@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5887

Modified Files:
	scribes.spec 
Log Message:
Silence a few rpmlint issues, reenable NLS build detection which was accidentally dropped in the 0.2.9.87-1 update.


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scribes.spec	15 Oct 2006 23:24:16 -0000	1.8
+++ scribes.spec	15 Oct 2006 23:49:02 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.87
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -18,6 +18,8 @@
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	pkgconfig >= 0.9.0
+BuildRequires:	gettext
+BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
 BuildRequires:	autoconf
 BuildRequires:	gnome-doc-utils
@@ -73,7 +75,7 @@
 %{__autoconf}
 # ...and now configure it. Scrollkeeper and GConf schema stuff are disabled
 # since they'll be installed with the scriptlets.
-%configure --disable-scrollkeeper --disable-schemas-install
+%configure --disable-scrollkeeper --disable-schemas-install --enable-nls
 
 
 %build
@@ -96,6 +98,9 @@
 	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
+chmod +x %{python_sitelib}/%{python_module_name}/syntax.py
+chmod +x %{python_sitelib}/%{python_module_name}/error.py
+chmod +x %{python_sitelib}/%{python_module_name}/license.py
 
 
 %post
@@ -147,6 +152,10 @@
 
 
 %changelog
+* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
+- Reenable NLS build detection (accidentally dropped in the 0.2.9.87-1 update)
+- Fix a few "non-executable file" rpmlint issues
+
 * Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
 - Update to new upstream version
 - Add patch to bypass failure in depcheck.py call:



From fedora-extras-commits at redhat.com  Mon Oct 16 00:08:32 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 17:08:32 -0700
Subject: rpms/scribes/devel scribes.spec,1.9,1.10
Message-ID: <200610160008.k9G08WvB008959@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8939

Modified Files:
	scribes.spec 
Log Message:
Fix the rpmlint issue fixing; tweak %files a bit


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scribes.spec	15 Oct 2006 23:49:02 -0000	1.9
+++ scribes.spec	16 Oct 2006 00:08:02 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.87
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -98,9 +98,9 @@
 	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
-chmod +x %{python_sitelib}/%{python_module_name}/syntax.py
-chmod +x %{python_sitelib}/%{python_module_name}/error.py
-chmod +x %{python_sitelib}/%{python_module_name}/license.py
+chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
+chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/error.py
+chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
 
 
 %post
@@ -139,7 +139,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitelib}/%{python_module_name}
+%{python_sitelib}/%{python_module_name}/
 %{_bindir}/%{name}
 %{_bindir}/.scribesclient
 %{_datadir}/%{name}/
@@ -152,6 +152,10 @@
 
 
 %changelog
+* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-3
+- Actually fix the rpmlint issues (adding the proper %%buildroot prefix)
+- Minor aesthetic change (add trailing slash to the python directory in the %%files section)
+
 * Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
 - Reenable NLS build detection (accidentally dropped in the 0.2.9.87-1 update)
 - Fix a few "non-executable file" rpmlint issues



From fedora-extras-commits at redhat.com  Mon Oct 16 01:55:38 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 18:55:38 -0700
Subject: rpms/scribes/devel scribes.spec,1.10,1.11
Message-ID: <200610160155.k9G1tcJU012294@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12278/scribes/devel

Modified Files:
	scribes.spec 
Log Message:
Fix dates in %changelog


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scribes.spec	16 Oct 2006 00:08:02 -0000	1.10
+++ scribes.spec	16 Oct 2006 01:55:08 -0000	1.11
@@ -152,15 +152,15 @@
 
 
 %changelog
-* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-3
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-3
 - Actually fix the rpmlint issues (adding the proper %%buildroot prefix)
 - Minor aesthetic change (add trailing slash to the python directory in the %%files section)
 
-* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
 - Reenable NLS build detection (accidentally dropped in the 0.2.9.87-1 update)
 - Fix a few "non-executable file" rpmlint issues
 
-* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
 - Update to new upstream version
 - Add patch to bypass failure in depcheck.py call:
   + configure.ac-no-python-depcheck.patch



From fedora-extras-commits at redhat.com  Mon Oct 16 02:06:29 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 19:06:29 -0700
Subject: rpms/obmenu/devel obmenu-copy-default-xdg-menu.patch, NONE,
	1.1 obmenu.spec, 1.2, 1.3 obmenu-README.Fedora, 1.2, NONE
Message-ID: <200610160206.k9G26TTp015292@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/obmenu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15273

Modified Files:
	obmenu.spec 
Added Files:
	obmenu-copy-default-xdg-menu.patch 
Removed Files:
	obmenu-README.Fedora 
Log Message:
Add a patch from upstream to copy a default menu from /etc/xdg if one does not exist on the first run; remove README.Fedora file which explained that in the earlier release (1.0-2).

obmenu-copy-default-xdg-menu.patch:

--- NEW FILE obmenu-copy-default-xdg-menu.patch ---
--- obmenu.orig	2006-02-02 04:03:38.000000000 -0800
+++ obmenu	2006-10-15 18:49:44.000000000 -0700
@@ -470,6 +470,38 @@
 		if len(sys.argv) == 2:
 			# must be a path to a menu
 			self.menu_path = sys.argv[1]
+		elif len(sys.argv) == 1:
+			self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
+			##### HERE'S THE NEW CODE ######
+			if not os.path.isfile("%s/.config/openbox/menu.xml" % (os.getenv("HOME"))):				
+				if not os.path.isdir("%s/.config/" % (os.getenv("HOME"))):
+					try:
+						os.mkdir("%s/.config/" % (os.getenv("HOME")))
+					except:
+						print "Error: Can't create ~/.config directory!"
+						return
+					
+				if not os.path.isdir("%s/.config/openbox" % (os.getenv("HOME"))):
+					try:
+						os.mkdir("%s/.config/openbox" % (os.getenv("HOME")))
+					except:
+						print "Error: Can't create ~/.config/openbox directory!"
+						return
+			
+				if not os.path.isfile("/etc/xdg/openbox/menu.xml"):
+					print "Error: Couldn't find default menu file!"
+					return
+				
+				try:
+					orig = open("/etc/xdg/openbox/menu.xml", "r")
+					dest = open("%s/.config/openbox/menu.xml" % (os.getenv("HOME")), "w")
+					dest.write(orig.read())
+					orig.close()
+					dest.close()
+				except:
+					print "Error: Couldn't create default menu file!"
+					return
+			##### END OF NEW CODE ######
 		elif len(sys.argv) == 1:
 			self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
 		else:


Index: obmenu.spec
===================================================================
RCS file: /cvs/extras/rpms/obmenu/devel/obmenu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- obmenu.spec	4 Sep 2006 17:43:13 -0000	1.2
+++ obmenu.spec	16 Oct 2006 02:05:59 -0000	1.3
@@ -2,18 +2,21 @@
 
 Name:		obmenu
 Version:	1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A graphical menu editor for Openbox
-
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://obmenu.sourceforge.net/
+
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	%{name}-README.Fedora
 Source2:	%{name}.desktop
+Patch0:		%{name}-copy-default-xdg-menu.patch 
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
+
 Requires:	pygtk2-libglade
+
 BuildRequires:	desktop-file-utils
 
 %description
@@ -30,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -40,7 +44,6 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 chmod +x %{buildroot}%{python_sitelib}/obxml.py
-install -p -m 0644 %{SOURCE1} README.Fedora
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category	X-Fedora	\
@@ -52,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README README.Fedora
+%doc COPYING README
 %{_bindir}/%{name}
 %{_bindir}/obm-*
 %{_datadir}/%{name}/
@@ -63,11 +66,21 @@
 
 
 %changelog
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-3
+- Some minor aesthetic spec cleanups
+- Add a patch from upstream to copy the default /etx/xdg menu stuff if one
+  does not exist on the first run:
+  + copy-default-xdg-menu.patch
+- Drop unneeded README.Fedora file:
+  - README.Fedora
+
+
 * Fri Sep 01 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-2
 - Don't %%ghost the .pyo file(s) to comply with the new Extras Python
   packaging guidelines
-- Package a README.Fedora file
-- Package a .desktop file  
+- Package a README.Fedora file and a .desktop file:
+  + README.Fedora
+  + %{name}.desktop
 
 * Sun Jun 14 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-1
-- Initial packaging
\ No newline at end of file
+- Initial packaging


--- obmenu-README.Fedora DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 02:08:59 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 19:08:59 -0700
Subject: rpms/obmenu/FC-5 obmenu-copy-default-xdg-menu.patch, NONE,
	1.1 obmenu.spec, 1.1, 1.2 obmenu-README.Fedora, 1.2, NONE
Message-ID: <200610160208.k9G28xbh015382@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/obmenu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15317

Modified Files:
	obmenu.spec 
Added Files:
	obmenu-copy-default-xdg-menu.patch 
Removed Files:
	obmenu-README.Fedora 
Log Message:
Add a patch from upstream to copy a default menu from /etc/xdg if one does not exist on the first run; remove README.Fedora file which explained that in the earlier release (1.0-2).

obmenu-copy-default-xdg-menu.patch:

--- NEW FILE obmenu-copy-default-xdg-menu.patch ---
--- obmenu.orig	2006-02-02 04:03:38.000000000 -0800
+++ obmenu	2006-10-15 18:49:44.000000000 -0700
@@ -470,6 +470,38 @@
 		if len(sys.argv) == 2:
 			# must be a path to a menu
 			self.menu_path = sys.argv[1]
+		elif len(sys.argv) == 1:
+			self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
+			##### HERE'S THE NEW CODE ######
+			if not os.path.isfile("%s/.config/openbox/menu.xml" % (os.getenv("HOME"))):				
+				if not os.path.isdir("%s/.config/" % (os.getenv("HOME"))):
+					try:
+						os.mkdir("%s/.config/" % (os.getenv("HOME")))
+					except:
+						print "Error: Can't create ~/.config directory!"
+						return
+					
+				if not os.path.isdir("%s/.config/openbox" % (os.getenv("HOME"))):
+					try:
+						os.mkdir("%s/.config/openbox" % (os.getenv("HOME")))
+					except:
+						print "Error: Can't create ~/.config/openbox directory!"
+						return
+			
+				if not os.path.isfile("/etc/xdg/openbox/menu.xml"):
+					print "Error: Couldn't find default menu file!"
+					return
+				
+				try:
+					orig = open("/etc/xdg/openbox/menu.xml", "r")
+					dest = open("%s/.config/openbox/menu.xml" % (os.getenv("HOME")), "w")
+					dest.write(orig.read())
+					orig.close()
+					dest.close()
+				except:
+					print "Error: Couldn't create default menu file!"
+					return
+			##### END OF NEW CODE ######
 		elif len(sys.argv) == 1:
 			self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
 		else:


Index: obmenu.spec
===================================================================
RCS file: /cvs/extras/rpms/obmenu/FC-5/obmenu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obmenu.spec	2 Sep 2006 17:37:07 -0000	1.1
+++ obmenu.spec	16 Oct 2006 02:08:29 -0000	1.2
@@ -2,18 +2,21 @@
 
 Name:		obmenu
 Version:	1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A graphical menu editor for Openbox
-
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://obmenu.sourceforge.net/
+
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	%{name}-README.Fedora
 Source2:	%{name}.desktop
+Patch0:		%{name}-copy-default-xdg-menu.patch 
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
+
 Requires:	pygtk2-libglade
+
 BuildRequires:	desktop-file-utils
 
 %description
@@ -30,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -40,7 +44,6 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 chmod +x %{buildroot}%{python_sitelib}/obxml.py
-cp %{SOURCE1} README.Fedora
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category	X-Fedora	\
@@ -52,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README README.Fedora
+%doc COPYING README
 %{_bindir}/%{name}
 %{_bindir}/obm-*
 %{_datadir}/%{name}/
@@ -63,11 +66,21 @@
 
 
 %changelog
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-3
+- Some minor aesthetic spec cleanups
+- Add a patch from upstream to copy the default /etx/xdg menu stuff if one
+  does not exist on the first run:
+  + copy-default-xdg-menu.patch
+- Drop unneeded README.Fedora file:
+  - README.Fedora
+
+
 * Fri Sep 01 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-2
 - Don't %%ghost the .pyo file(s) to comply with the new Extras Python
   packaging guidelines
-- Package a README.Fedora file
-- Package a .desktop file  
+- Package a README.Fedora file and a .desktop file:
+  + README.Fedora
+  + %{name}.desktop
 
 * Sun Jun 14 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-1
-- Initial packaging
\ No newline at end of file
+- Initial packaging


--- obmenu-README.Fedora DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 04:18:00 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:18:00 -0700
Subject: rpms/perl-Gnome2-GConf Makefile,1.1,1.2
Message-ID: <200610160418.k9G4I036021965@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-GConf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21911

Modified Files:
	Makefile 
Log Message:
update to 1.043



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	23 Aug 2006 03:28:36 -0000	1.1
+++ Makefile	16 Oct 2006 04:17:29 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Mon Oct 16 04:18:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:18:01 -0700
Subject: rpms/perl-Gnome2-GConf/FC-5 perl-Gnome2-GConf.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200610160418.k9G4I1Ed021967@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-GConf/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21911/FC-5

Modified Files:
	perl-Gnome2-GConf.spec sources 
Log Message:
update to 1.043



Index: perl-Gnome2-GConf.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/FC-5/perl-Gnome2-GConf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Gnome2-GConf.spec	5 Sep 2006 05:37:42 -0000	1.3
+++ perl-Gnome2-GConf.spec	16 Oct 2006 04:17:30 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Gnome2-GConf
-Version:        1.040
+Version:        1.043
 Release:        1%{?dist}
 Summary:        Perl wrappers for the GConf configuration engine
 License:        LGPL
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.043-1
+- update to 1.043
+
 * Mon Sep 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.040-1
 - update to 1.040
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2006 05:37:42 -0000	1.3
+++ sources	16 Oct 2006 04:17:30 -0000	1.4
@@ -1 +1 @@
-75c1c076f33ea84ea9281cd49b390a9f  Gnome2-GConf-1.040.tar.gz
+bc3fe822c5dc3324f42bd02a3d6933b7  Gnome2-GConf-1.043.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 04:18:06 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:18:06 -0700
Subject: rpms/perl-Gnome2-GConf/devel .cvsignore, 1.3,
	1.4 perl-Gnome2-GConf.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610160418.k9G4I6h7021974@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-GConf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21911/devel

Modified Files:
	.cvsignore perl-Gnome2-GConf.spec sources 
Log Message:
update to 1.043



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2006 05:37:42 -0000	1.3
+++ .cvsignore	16 Oct 2006 04:17:36 -0000	1.4
@@ -1 +1 @@
-Gnome2-GConf-1.040.tar.gz
+Gnome2-GConf-1.043.tar.gz


Index: perl-Gnome2-GConf.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/devel/perl-Gnome2-GConf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gnome2-GConf.spec	5 Sep 2006 05:37:42 -0000	1.4
+++ perl-Gnome2-GConf.spec	16 Oct 2006 04:17:36 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Gnome2-GConf
-Version:        1.040
+Version:        1.043
 Release:        1%{?dist}
 Summary:        Perl wrappers for the GConf configuration engine
 License:        LGPL
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.043-1
+- update to 1.043
+
 * Mon Sep 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.040-1
 - update to 1.040
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2006 05:37:42 -0000	1.3
+++ sources	16 Oct 2006 04:17:36 -0000	1.4
@@ -1 +1 @@
-75c1c076f33ea84ea9281cd49b390a9f  Gnome2-GConf-1.040.tar.gz
+bc3fe822c5dc3324f42bd02a3d6933b7  Gnome2-GConf-1.043.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 04:37:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:37:56 -0700
Subject: rpms/perl-Event/devel .cvsignore, 1.2, 1.3 perl-Event.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610160437.k9G4buQD022191@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22133/devel

Modified Files:
	.cvsignore perl-Event.spec sources 
Log Message:
update to 1.07



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jun 2006 19:13:59 -0000	1.2
+++ .cvsignore	16 Oct 2006 04:37:26 -0000	1.3
@@ -1 +1 @@
-Event-1.06.tar.gz
+Event-1.07.tar.gz


Index: perl-Event.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/perl-Event.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Event.spec	1 Sep 2006 04:13:38 -0000	1.3
+++ perl-Event.spec	16 Oct 2006 04:37:26 -0000	1.4
@@ -1,8 +1,6 @@
-# $Id$
-
 Name:           perl-Event
-Version:        1.06 
-Release:        2%{?dist}
+Version:        1.07
+Release:        1%{?dist}
 Summary:        Event loop processing
 
 Group:          Development/Libraries
@@ -58,11 +56,13 @@
 
 %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' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -75,13 +75,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo util LICENSE.* INSTALL
+%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo/ util/ LICENSE.* INSTALL
 %{perl_vendorarch}/auto/Event
 %{perl_vendorarch}/Event*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
+- update to 1.07
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-2
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jun 2006 19:13:59 -0000	1.2
+++ sources	16 Oct 2006 04:37:26 -0000	1.3
@@ -1 +1 @@
-789cc8f0b011653cac6451cfef3053a8  Event-1.06.tar.gz
+34b6eaf0b3658cd800b7d8727be7e9c4  Event-1.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 04:37:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:37:55 -0700
Subject: rpms/perl-Event Makefile,1.1,1.2
Message-ID: <200610160437.k9G4btxU022182@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22133

Modified Files:
	Makefile 
Log Message:
update to 1.07



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	14 Jun 2006 19:13:41 -0000	1.1
+++ Makefile	16 Oct 2006 04:37:24 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Mon Oct 16 04:37:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:37:55 -0700
Subject: rpms/perl-Event/FC-5 perl-Event.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200610160437.k9G4btdn022186@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22133/FC-5

Modified Files:
	perl-Event.spec sources 
Log Message:
update to 1.07



Index: perl-Event.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/FC-5/perl-Event.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Event.spec	14 Jun 2006 19:19:06 -0000	1.2
+++ perl-Event.spec	16 Oct 2006 04:37:25 -0000	1.3
@@ -1,7 +1,5 @@
-# $Id$
-
 Name:           perl-Event
-Version:        1.06 
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Event loop processing
 
@@ -58,11 +56,13 @@
 
 %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' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -75,13 +75,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo util LICENSE.* INSTALL
+%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo/ util/ LICENSE.* INSTALL
 %{perl_vendorarch}/auto/Event
 %{perl_vendorarch}/Event*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
+- update to 1.07
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-2
+- bump for mass rebuild
+
 * Wed Jun 14 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
 - add explicit provides: perl(Event) = version...  wasn't being picked up
   automagically for some reason


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jun 2006 19:13:59 -0000	1.2
+++ sources	16 Oct 2006 04:37:25 -0000	1.3
@@ -1 +1 @@
-789cc8f0b011653cac6451cfef3053a8  Event-1.06.tar.gz
+34b6eaf0b3658cd800b7d8727be7e9c4  Event-1.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 08:20:53 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon, 16 Oct 2006 01:20:53 -0700
Subject: rpms/piklab/devel piklab-0.12.1.desktop.typo-fr.patch, NONE,
	1.1 piklab-0.12.1.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610160820.k9G8KrpY002568@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544

Modified Files:
	.cvsignore sources 
Added Files:
	piklab-0.12.1.desktop.typo-fr.patch 
	piklab-0.12.1.x-desktop-fr.patch 
Log Message:
New upstream version

piklab-0.12.1.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.1.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 DocPath=piklab/index.html
 Categories=QT;KDE;Development;IDE;Electronics;
-Comment=Integrated development environment for applications based on PIC microcontrollers.
-Comment[fr]=Environnement de d?velopement int?gr? pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de d??velopement int??gr?? pour applications ?? base de microcontr??leurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.1.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.1.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 11:38:45 -0000	1.3
+++ .cvsignore	16 Oct 2006 08:20:22 -0000	1.4
@@ -1 +1 @@
-piklab-0.12.0.tar.bz2
+piklab-0.12.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Oct 2006 16:00:36 -0000	1.4
+++ sources	16 Oct 2006 08:20:22 -0000	1.5
@@ -1 +1 @@
-04d5aa820fadfe547951e1abfb651a1e  piklab-0.12.0.tar.bz2
+b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 08:22:45 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon, 16 Oct 2006 01:22:45 -0700
Subject: rpms/piklab/devel piklab.spec,1.5,1.6
Message-ID: <200610160822.k9G8MjEt002621@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2604

Modified Files:
	piklab.spec 
Log Message:
New upstream version


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- piklab.spec	2 Oct 2006 16:00:36 -0000	1.5
+++ piklab.spec	16 Oct 2006 08:22:14 -0000	1.6
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.0
-Release:	3%{?dist}
+Version:	0.12.1
+Release:	1%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -16,10 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-#Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
-Patch2:		%{name}-%{version}.desktop.typo-fr.patch
-Patch3:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-%{version}.desktop.typo-fr.patch
+Patch1:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -48,10 +46,8 @@
 %prep
 %setup -q
 
-#%patch0 -p0
-#%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%patch0 -p0
+%patch1 -p0
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -124,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct 16 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.1-1
+  - New upstream version
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-3
   - Upstream rebuilt tarball :-(
 



From fedora-extras-commits at redhat.com  Mon Oct 16 08:24:28 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon, 16 Oct 2006 01:24:28 -0700
Subject: rpms/piklab/FC-5 piklab-0.12.1.desktop.typo-fr.patch, NONE,
	1.1 piklab-0.12.1.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 piklab.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200610160824.k9G8OSbg002706@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2680

Modified Files:
	.cvsignore piklab.spec sources 
Added Files:
	piklab-0.12.1.desktop.typo-fr.patch 
	piklab-0.12.1.x-desktop-fr.patch 
Log Message:
New upstream version

piklab-0.12.1.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.1.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 DocPath=piklab/index.html
 Categories=QT;KDE;Development;IDE;Electronics;
-Comment=Integrated development environment for applications based on PIC microcontrollers.
-Comment[fr]=Environnement de d?velopement int?gr? pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de d??velopement int??gr?? pour applications ?? base de microcontr??leurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.1.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.1.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 11:39:54 -0000	1.3
+++ .cvsignore	16 Oct 2006 08:23:57 -0000	1.4
@@ -1 +1 @@
-piklab-0.12.0.tar.bz2
+piklab-0.12.1.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- piklab.spec	2 Oct 2006 16:01:24 -0000	1.4
+++ piklab.spec	16 Oct 2006 08:23:57 -0000	1.5
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.0
-Release:	3%{?dist}
+Version:	0.12.1
+Release:	1%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -16,10 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-#Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
-Patch2:		%{name}-%{version}.desktop.typo-fr.patch
-Patch3:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-%{version}.desktop.typo-fr.patch
+Patch1:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -48,10 +46,8 @@
 %prep
 %setup -q
 
-#%patch0 -p0
-#%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%patch0 -p0
+%patch1 -p0
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -124,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct 16 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.1-1
+  - New upstream version
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-3
   - Upstream rebuilt tarball :-(
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Oct 2006 16:01:24 -0000	1.4
+++ sources	16 Oct 2006 08:23:57 -0000	1.5
@@ -1 +1 @@
-04d5aa820fadfe547951e1abfb651a1e  piklab-0.12.0.tar.bz2
+b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 11:27:34 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 16 Oct 2006 04:27:34 -0700
Subject: rpms/ibmonitor/devel .cvsignore, 1.4, 1.5 ibmonitor.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200610161127.k9GBRY9D012789@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/ibmonitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12769

Modified Files:
	.cvsignore ibmonitor.spec sources 
Log Message:
* Mon Oct 16 2006 Adrian Reber <adrian at lisas.de> - 1.4-1
- updated to 1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Feb 2005 12:42:46 -0000	1.4
+++ .cvsignore	16 Oct 2006 11:27:04 -0000	1.5
@@ -1 +1 @@
-ibmonitor-1.3.tar.gz
+ibmonitor-1.4.tar.gz


Index: ibmonitor.spec
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/ibmonitor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ibmonitor.spec	18 Sep 2006 10:18:02 -0000	1.10
+++ ibmonitor.spec	16 Oct 2006 11:27:04 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           ibmonitor
-Version:        1.3
-Release:        4
+Version:        1.4
+Release:        1
 
 Summary:        Interactive bandwidth monitor
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ibmonitor.sourceforge.net/
-Source0:        http://dl.sf.net/ibmonitor/ibmonitor-1.3.tar.gz
+Source0:        http://dl.sf.net/ibmonitor/ibmonitor-1.4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Adrian Reber <adrian at lisas.de> - 1.4-1
+- updated to 1.4
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 1.3-4
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Feb 2005 12:42:46 -0000	1.4
+++ sources	16 Oct 2006 11:27:04 -0000	1.5
@@ -1 +1 @@
-6f37ee0b00b62822823cdbabc9d7419e  ibmonitor-1.3.tar.gz
+b8522eda27381b4e65eed12bffd8adcd  ibmonitor-1.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 11:51:46 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:51:46 -0700
Subject: rpms/zaptel - New directory
Message-ID: <200610161151.k9GBpkNJ012959@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12955/zaptel

Log Message:
Directory /cvs/extras/rpms/zaptel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 11:51:51 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:51:51 -0700
Subject: rpms/zaptel/devel - New directory
Message-ID: <200610161151.k9GBppcQ012974@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12955/zaptel/devel

Log Message:
Directory /cvs/extras/rpms/zaptel/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 11:52:06 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:52:06 -0700
Subject: rpms/zaptel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610161152.k9GBq6LY013006@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13000

Added Files:
	Makefile import.log 
Log Message:
Setup of module zaptel


--- NEW FILE Makefile ---
# Top level Makefile for module zaptel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 16 11:52:12 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:52:12 -0700
Subject: rpms/zaptel/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610161152.k9GBqCI8013022@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13000/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zaptel


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 16 11:53:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:53:37 -0700
Subject: rpms/zaptel import.log,1.1,1.2
Message-ID: <200610161153.k9GBrbrl013128@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13087

Modified Files:
	import.log 
Log Message:
auto-import zaptel-1.4.0-2.beta1 on branch devel from zaptel-1.4.0-2.beta1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zaptel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Oct 2006 11:52:06 -0000	1.1
+++ import.log	16 Oct 2006 11:53:06 -0000	1.2
@@ -0,0 +1 @@
+zaptel-1_4_0-2_beta1:HEAD:zaptel-1.4.0-2.beta1.src.rpm:1160999578



From fedora-extras-commits at redhat.com  Mon Oct 16 11:53:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:53:37 -0700
Subject: rpms/zaptel/devel menuselect.makedeps, NONE, 1.1 menuselect.makeopts,
	NONE, 1.1 zaptel-1.4.0-beta1-makefile.patch, NONE,
	1.1 zaptel-1.4.0-beta1-udevzaptelowner.patch, NONE,
	1.1 zaptel.init, NONE, 1.1 zaptel.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610161153.k9GBrb4c013132@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13087/devel

Modified Files:
	.cvsignore sources 
Added Files:
	menuselect.makedeps menuselect.makeopts 
	zaptel-1.4.0-beta1-makefile.patch 
	zaptel-1.4.0-beta1-udevzaptelowner.patch zaptel.init 
	zaptel.spec 
Log Message:
auto-import zaptel-1.4.0-2.beta1 on branch devel from zaptel-1.4.0-2.beta1.src.rpm


--- NEW FILE menuselect.makedeps ---
MENUSELECT_DEPENDS_zttool=LIBNEWT 


--- NEW FILE menuselect.makeopts ---
MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb xpp_usb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode 
MENUSELECT_UTILS=sethdlc-new

zaptel-1.4.0-beta1-makefile.patch:

--- NEW FILE zaptel-1.4.0-beta1-makefile.patch ---
--- Makefile.orig	2006-10-11 20:26:26.000000000 -0500
+++ Makefile	2006-10-11 20:26:41.000000000 -0500
@@ -409,7 +409,7 @@
 		$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
 	$(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
 		$(LIB_DIR)/$(LTZ_SO)
-	if [ -z "$(INSTALL_PREFIX)" && -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
+	if [ -z "$(INSTALL_PREFIX)" -a -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled" ) ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
 
 install-include:
 	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h

zaptel-1.4.0-beta1-udevzaptelowner.patch:

--- NEW FILE zaptel-1.4.0-beta1-udevzaptelowner.patch ---
Index: build_tools/genudevrules
===================================================================
--- build_tools/genudevrules	(revision 1503)
+++ build_tools/genudevrules	(working copy)
@@ -22,10 +22,10 @@
 
 cat <<EOF
 # zaptel devices with ownership/permissions for running as non-root
-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="zaptel", GROUP="zaptel", MODE="0660"
 EOF


--- NEW FILE zaptel.init ---
#!/bin/sh
#
# zaptel        This shell script takes care of loading and unloading \
#               Zapata Telephony interfaces
# chkconfig: - 9 92
# description: The zapata telephony drivers allow you to use your linux \
# computer to accept incoming data and voice interfaces
#
# config: /etc/sysconfig/zaptel

initdir=/etc/rc.d/init.d

# Source function library.
. $initdir/functions || exit 0

# Source zaptel configuration.
[ -f /etc/sysconfig/zaptel ] && . /etc/sysconfig/zaptel

# Check that telephony is up.
[ "${TELEPHONY}" = "yes" ] || exit 0

[ -f /sbin/ztcfg ] || exit 0

[ -f /etc/zaptel.conf ] || exit 0

RETVAL=0

# See how we were called.
case "$1" in
    start)
	if [ ! -e /proc/zaptel/1 ]; then
		echo "No functioning zap hardware found in /proc/zaptel, loading ztdummy"
		action "Loading ztdummy:" modprobe ztdummy
	fi
	action "Running ztcfg: " /sbin/ztcfg
	RETVAL=$?

        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zaptel
        ;;
  stop)
	RETVAL=0

        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zaptel
        ;;
  restart)
	$0 stop
	$0 start
	;;
  reload)
	action "Reloading ztcfg: " /sbin/ztcfg
	RETVAL=$?
	;;
  status)
	echo "Status option unimplemented."
	RETVAL=$?
	;;
  *)
        echo "Usage: zaptel {start|stop|status|restart|reload}"
        exit 1
esac

exit $RETVAL



--- NEW FILE zaptel.spec ---
Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
Name: zaptel
Version: 1.4.0
Release: 2%{?dist}.beta1
License: GPL
Group: Applications/System
URL: http://www.digium.com/
Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta1.tar.gz
Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
Patch1:  zaptel-1.4.0-beta1-makefile.patch

Source1: menuselect.makedeps
Source2: menuselect.makeopts
Source3: zaptel.init

BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)

BuildRequires: newt-devel

Requires(pre): fedora-usermgmt

Requires(preun): /sbin/service
Requires(preun): /sbin/chkconfig

Requires(post): /sbin/chkconfig

Requires(postun): fedora-usermgmt

%description
Tools and libraries for using/configuring/monitoring Zapata telephony
interfaces.

%package lib
Summary:Library for using Zapata telephony interfaces
Group: Development/Libraries

%description lib
Library for using Zapata telephony interfaces.

%package utils
Summary: Tools for monitoring and testing Zapata telephony interfaces
Group: Development/Libraries
Requires: zaptel-lib = %{version}-%{release}

%description utils
Tools for monitoring and testing Zapata telephony interfaces.

%package devel
Summary: Development files for Zapata telephony interfaces
Group: Development/Libraries
Requires: zaptel-lib = %{version}-%{release}

%description devel
Development files for Zapata telephony interfaces.

%prep
%setup0 -q -n zaptel-%{version}-beta1

%patch0 -p0
%patch1 -p0

cp %{S:1} .
cp %{S:2} .
cp %{S:3} .

# convert some files to UTF-8
pushd doc
for f in zttool.8 ztcfg.8 ztmonitor.8
do
  iconv -f iso8859-1 -t utf-8 $f -o $f.tmp
  mv $f.tmp $f
done
popd

%build
pushd menuselect/mxml
%configure
popd

pushd menuselect
%configure
popd

%configure

make %{?_smp_mflags}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_initrddir}
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
mkdir -p %{buildroot}%{_sysconfdir}/udev/permissions.d
mkdir -p %{buildroot}%{_mandir}/man8
#mkdir -p %{buildroot}/lib/firmware

make install DYNFS=yes DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot} LIB_DIR=%{buildroot}%{_libdir}
make config DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot}  LIB_DIR=%{buildroot}%{_libdir}
make install-programs DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot}  LIB_DIR=%{buildroot}%{_libdir}

for f in fxotune fxstest ztdiag ztmonitor ztspeed zttest zttool
do
  mv %{buildroot}/sbin/$f %{buildroot}%{_sbindir}/$f
done

cp doc/fxotune.8 %{buildroot}%{_mandir}/man8
cp doc/ztmonitor.8 %{buildroot}%{_mandir}/man8
cp doc/ztspeed.8 %{buildroot}%{_mandir}/man8
cp doc/zttest.8 %{buildroot}%{_mandir}/man8

rm -f %{buildroot}%{_libdir}/libtonezone.a

%clean
rm -rf %{buildroot}

%post 
/usr/sbin/fedora-groupadd 29 -r zaptel &>/dev/null || :
/usr/sbin/fedora-useradd  29 -r -s /sbin/nologin -d / -M          \
                               -c 'Zapata Telephony' -g zaptel zaptel &>/dev/null || :
/sbin/chkconfig --add zaptel

%preun
if [ $1 -eq 0 ]; then
    /sbin/service zaptel stop >/dev/null 2>&1
    /sbin/chkconfig --del zaptel
fi

%post lib -p /sbin/ldconfig

%postun lib -p /sbin/ldconfig

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

%doc ChangeLog
%doc LICENSE
%doc README
%doc README.Astribank
%doc README.b410p
%doc README.fxotune
%doc README.fxsusb
%doc README.Linux26
%doc zaptel.conf.sample

%config(noreplace) %{_sysconfdir}/zaptel.conf
%config(noreplace) %{_sysconfdir}/sysconfig/zaptel
%config(noreplace) %{_sysconfdir}/modprobe.d/zaptel
%config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules

/sbin/ztcfg

%{_initrddir}/zaptel
%{_mandir}/man8/ztcfg.8*

%files lib
%defattr(-,root,root,-)
%{_libdir}/libtonezone.so.1
%{_libdir}/libtonezone.so.1.0

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

%{_sbindir}/fxotune
%{_sbindir}/fxstest
%{_sbindir}/ztdiag
%{_sbindir}/ztmonitor
%{_sbindir}/ztspeed
%{_sbindir}/zttest
%{_sbindir}/zttool

%{_mandir}/man8/fxotune.8*
%{_mandir}/man8/ztmonitor.8*
%{_mandir}/man8/ztspeed.8*
%{_mandir}/man8/zttest.8*
%{_mandir}/man8/zttool.8*

%files devel
%defattr(-,root,root,-)
%doc LICENSE
%{_includedir}/zaptel/tonezone.h
%{_includedir}/zaptel/zaptel.h
%{_libdir}/libtonezone.so

%changelog
* Sun Oct 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
- Don't package firmware until license can be figured out.

* Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
- Remove "Provides: zaptel-kmod-common"
- Don't load modules in initscript (except for possibly ztdummy) - leave that up to udev/hotplug.
- Drop ifup-hdlc - it requires sethdlc which isn't available.
- Move utilities to %%{_sbindir} rather than /sbin.
- Split libtonezone off into a separate lib package.
- Use 'zaptel' user/group to own device files.
- Add patch to fix minor makefile bug.

* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-0.beta1
- Update to 1.4.0-beta1

* Fri Jun  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.6-3
- Bump release and rebuild.

* Thu Apr 27 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.5-2
- Changed ownership of device nodes to "root" in udev rules file.
- Don't build sethdlc.

* Mon Mar 27 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.5-1
- Update to 1.2.5

* Wed Feb 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.4-1
- Update to 1.2.4

* Tue Jan 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.3-1
- Preserve timestamps when we install.
- Use custom init.d file that does all the fancy RH stuff.

* Mon Jan 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.3-1
- Update to 1.2.3.

* Mon Jan 23 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-3
- provide zaptel-kmod-common

* Wed Jan 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-2
- Bump release number.

* Wed Jan 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-1
- Update to 1.2.2.

* Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-2
- Devel subpackage needs to require main package.

* Wed Jan 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-1
- Initial version for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Oct 2006 11:52:12 -0000	1.1
+++ .cvsignore	16 Oct 2006 11:53:07 -0000	1.2
@@ -0,0 +1 @@
+zaptel-1.4.0-beta1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Oct 2006 11:52:12 -0000	1.1
+++ sources	16 Oct 2006 11:53:07 -0000	1.2
@@ -0,0 +1 @@
+6d2bae038c85770fd09a323f192cd682  zaptel-1.4.0-beta1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 13:18:11 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 06:18:11 -0700
Subject: rpms/scanbuttond - New directory
Message-ID: <200610161318.k9GDIB05019485@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481/scanbuttond

Log Message:
Directory /cvs/extras/rpms/scanbuttond added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 13:18:17 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 06:18:17 -0700
Subject: rpms/scanbuttond/devel - New directory
Message-ID: <200610161318.k9GDIHbl019499@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481/scanbuttond/devel

Log Message:
Directory /cvs/extras/rpms/scanbuttond/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 13:32:01 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 06:32:01 -0700
Subject: owners owners.list,1.1831,1.1832
Message-ID: <200610161332.k9GDW13F019749@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19557

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1831
retrieving revision 1.1832
diff -u -r1.1831 -r1.1832
--- owners.list	15 Oct 2006 22:00:56 -0000	1.1831
+++ owners.list	16 Oct 2006 13:31:31 -0000	1.1832
@@ -2008,6 +2008,7 @@
 Fedora Extras|sblim-testsuite|SBLIM automated testsuite scripts|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-wbemcli|WBEM Command Line Interface is a standalone, command line WBEM client|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scanbuttond|Scanner Button tools to SANE|panemade at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|scanssh|Fast SSH server and open proxy scanner|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 16 13:46:27 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 06:46:27 -0700
Subject: rpms/lighttpd/FC-5 .cvsignore, 1.15, 1.16 lighttpd.spec, 1.23,
	1.24 powered_by_fedora.png, 1.1, 1.2 sources, 1.15, 1.16
Message-ID: <200610161346.k9GDkRpL019871@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19841

Modified Files:
	.cvsignore lighttpd.spec powered_by_fedora.png sources 
Log Message:
Backport 1.4.13 bugfix update from devel to FC-5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	12 Jul 2006 17:39:10 -0000	1.15
+++ .cvsignore	16 Oct 2006 13:45:56 -0000	1.16
@@ -1 +1 @@
-lighttpd-1.4.11.tar.gz
+lighttpd-1.4.13.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/lighttpd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- lighttpd.spec	12 Jul 2006 17:39:10 -0000	1.23
+++ lighttpd.spec	16 Oct 2006 13:45:57 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.11
+Version: 1.4.13
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -173,6 +173,22 @@
 
 
 %changelog
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-1
+- Update to 1.4.13, which contains the previous fix.
+
+* Tue Oct  3 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-3
+- Include fix for segfaults (lighttpd bug #876, changeset 1352).
+
+* Mon Sep 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-1
+- Update to 1.4.12 final.
+
+* Fri Sep 22 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-0.1.r1332
+- Update to latest 1.4.12 pre-release, fixes SSL issues and other bugs.
+- Update powered_by_fedora.png to the new logo.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.11-2
+- FC6 rebuild.
+
 * Thu Mar  9 2006 Matthias Saou <http://freshrpms.net/> 1.4.11-1
 - Update to 1.4.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Jul 2006 17:39:10 -0000	1.15
+++ sources	16 Oct 2006 13:45:57 -0000	1.16
@@ -1 +1 @@
-f55eebb9815c94a7de35906bb557ecd3  lighttpd-1.4.11.tar.gz
+d775d6478391b95d841a1018c8db0b95  lighttpd-1.4.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 13:53:22 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 16 Oct 2006 06:53:22 -0700
Subject: rpms/nsd/devel nsd.spec,1.14,1.15
Message-ID: <200610161353.k9GDrMgY020056@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19464

Modified Files:
	nsd.spec 
Log Message:
bump for EVR



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nsd.spec	12 Oct 2006 19:43:29 -0000	1.14
+++ nsd.spec	16 Oct 2006 13:52:51 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -63,7 +63,6 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-  echo " preun "
         /sbin/service %{name} stop 
         /sbin/chkconfig --del %{name} 
 fi
@@ -74,6 +73,9 @@
 fi
 
 %changelog
+* Mon Oct 16 2006  Paul Wouters <paul at xelerance.com> 2.3.6-2
+- Bump version for upgrade path
+
 * Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Removed obsolete workaround in nsd.init



From fedora-extras-commits at redhat.com  Mon Oct 16 13:59:23 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Oct 2006 06:59:23 -0700
Subject: rpms/ufsparse/devel .cvsignore, 1.2, 1.3 sources, 1.8,
	1.9 ufsparse.spec, 1.15, 1.16
Message-ID: <200610161359.k9GDxNro020185@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20154

Modified Files:
	.cvsignore sources ufsparse.spec 
Log Message:
New version. Closes bug 210846.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 06:33:48 -0000	1.2
+++ .cvsignore	16 Oct 2006 13:58:52 -0000	1.3
@@ -1 +1 @@
-UFsparse.tar.gz
+SuiteSparse.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Sep 2006 14:00:08 -0000	1.8
+++ sources	16 Oct 2006 13:58:52 -0000	1.9
@@ -1 +1 @@
-1d36222397ceff76c92e4c870196011c  UFsparse.tar.gz
+bc01ef2f26e6ad3eed83b4ad62e46a68  SuiteSparse.tar.gz


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ufsparse.spec	8 Sep 2006 14:00:08 -0000	1.15
+++ ufsparse.spec	16 Oct 2006 13:58:52 -0000	1.16
@@ -1,12 +1,12 @@
 Name:           ufsparse
-Version:        2.1.0
+Version:        2.1.1
 Release:        1%{?dist}
-Summary:        University of Florida sparse matrix libraries
+Summary:        A collection of sparse matrix libraries
 
 Group:          System Environment/Libraries
 License:        Distributable
-URL:            http://www.cise.ufl.edu/research/sparse/UFsparse
-Source0:        http://www.cise.ufl.edu/research/sparse/UFsparse/v%{version}/UFsparse.tar.gz
+URL:            http://www.cise.ufl.edu/research/sparse/SuiteSparse
+Source0:        http://www.cise.ufl.edu/research/sparse/SuiteSparse/v%{version}/SuiteSparse.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -41,7 +41,7 @@
 
 
 %prep
-%setup -q -n UFsparse
+%setup -q -n SuiteSparse
 
 %build
 %define amd_version 2.0
@@ -54,7 +54,7 @@
 %define ccolamd_version_major 2
 %define cholmod_version 1.2
 %define cholmod_version_major 1
-%define colamd_version 2.5
+%define colamd_version 2.5.1
 %define colamd_version_major 2
 %define csparse_version 2.0.2
 %define csparse_version_major 2
@@ -62,7 +62,7 @@
 %define cxsparse_version_major 2
 %define klu_version 0.9
 %define klu_version_major 0
-%define ldl_version 1.3
+%define ldl_version 1.3.1
 %define ldl_version_major 1
 %define umfpack_version 5.0.1
 %define umfpack_version_major 5
@@ -272,6 +272,10 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Oct 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.1-1
+- New release, and package name change from UFsparse to SuiteSparse. Fixes
+  bug #210846. Keep the ufsparse package name for now.
+
 * Thu Sep  7 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.0-1
 - New release. Increment versions of some libraries.
 - Rearrange and clean up spec file so all definitions are in one place.



From fedora-extras-commits at redhat.com  Mon Oct 16 14:09:35 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon, 16 Oct 2006 07:09:35 -0700
Subject: rpms/moodle/FC-4 moodle.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610161409.k9GE9ZT9023338@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/FC-4

Modified Files:
	moodle.spec sources 
Log Message:
Upstream released new version





Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodle.spec	25 Aug 2006 03:24:56 -0000	1.4
+++ moodle.spec	16 Oct 2006 14:09:05 -0000	1.5
@@ -8,7 +8,7 @@
 %define with_spellcheck 0
 
 Name:           moodle
-Version:        1.5.4
+Version:        1.6.3
 Release:        1%{?dist}
 Summary:        A Course Management System
 
@@ -22,8 +22,8 @@
 Source4:        moodle-cron
 Source5:        moodle.init
 Source6:        moodle-README-rpm
-Patch0:         moodle-1.5.2-mimetex-linux.patch
-Patch1:         moodle-1.5.2-mimetex-fedora.patch
+#Patch0:         moodle-1.5.2-mimetex-linux.patch
+#Patch1:         moodle-1.5.2-mimetex-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -640,15 +640,15 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .mimetex-linux
-%patch1 -p1 -b .mimetex-fedora
+#%patch0 -p1 -b .mimetex-linux
+#%patch1 -p1 -b .mimetex-fedora
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.pl -exec chmod a+x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.cgi -exec chmod a+x {} \;
 sed -i 's/\r//' README.txt
-sed -i 's/\r//' lib/editor/plugins/SpellChecker/spell-check-logic.cgi
+sed -i 's/\r//' lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -658,6 +658,7 @@
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
 mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
 cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
+cp -ad install/lang/* $RPM_BUILD_ROOT%{moodlewebdir}/lang/
 rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
 install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
 install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
@@ -688,11 +689,12 @@
 %{moodlewebdir}/[a-ce-km-z]*
 %doc %{moodlewebdir}/doc
 %{moodlewebdir}/lib
-%exclude %{moodlewebdir}/lib/editor/plugins/SpellChecker
+%exclude %{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %{moodlewebdir}/login
 %dir %{moodlewebdir}/lang
 %{moodlewebdir}/lang/en*
-%doc %{moodlewebdir}/lang/README
+%{moodlewebdir}/lang/[^e]*_utf8
+%doc %{moodlewebdir}/lang/README.txt
 %attr(-,apache,apache) %{moodledatadir}
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
@@ -702,10 +704,18 @@
 %if %{with_spellcheck}
 %files editor-spellcheck
 %defattr(-,root,root,-)
-%{moodlewebdir}/lib/editor/plugins/SpellChecker
+%{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %endif
 
 %changelog
+* Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
+- Major changes, update to 1.6.3
+- SpellChecker moved
+- Language install method has been changed (added a cp)
+
+* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> - 1.5.4-2
+- Release bump
+
 * Thu Aug 24 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.5.4-1
 - Update to 1.5.4.
 - Remove SA18267.patch; not needed in 1.5.4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Aug 2006 03:24:56 -0000	1.3
+++ sources	16 Oct 2006 14:09:05 -0000	1.4
@@ -1 +1,2 @@
 86cddfda2b6d9a08b37cc3a16bda1090  moodle-1.5.4.tgz
+2f9f3fcf83ab0f18c409f3a48e07eae2  moodle-1.6.3.tgz



From fedora-extras-commits at redhat.com  Mon Oct 16 14:09:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon, 16 Oct 2006 07:09:36 -0700
Subject: rpms/moodle/FC-5 moodle.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610161409.k9GE9aUt023342@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/FC-5

Modified Files:
	moodle.spec sources 
Log Message:
Upstream released new version





Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/moodle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodle.spec	25 Aug 2006 03:24:05 -0000	1.4
+++ moodle.spec	16 Oct 2006 14:09:05 -0000	1.5
@@ -8,7 +8,7 @@
 %define with_spellcheck 0
 
 Name:           moodle
-Version:        1.5.4
+Version:        1.6.3
 Release:        1%{?dist}
 Summary:        A Course Management System
 
@@ -22,8 +22,8 @@
 Source4:        moodle-cron
 Source5:        moodle.init
 Source6:        moodle-README-rpm
-Patch0:         moodle-1.5.2-mimetex-linux.patch
-Patch1:         moodle-1.5.2-mimetex-fedora.patch
+#Patch0:         moodle-1.5.2-mimetex-linux.patch
+#Patch1:         moodle-1.5.2-mimetex-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -640,15 +640,15 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .mimetex-linux
-%patch1 -p1 -b .mimetex-fedora
+#%patch0 -p1 -b .mimetex-linux
+#%patch1 -p1 -b .mimetex-fedora
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.pl -exec chmod a+x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.cgi -exec chmod a+x {} \;
 sed -i 's/\r//' README.txt
-sed -i 's/\r//' lib/editor/plugins/SpellChecker/spell-check-logic.cgi
+sed -i 's/\r//' lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -658,6 +658,7 @@
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
 mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
 cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
+cp -ad install/lang/* $RPM_BUILD_ROOT%{moodlewebdir}/lang/
 rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
 install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
 install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
@@ -688,11 +689,12 @@
 %{moodlewebdir}/[a-ce-km-z]*
 %doc %{moodlewebdir}/doc
 %{moodlewebdir}/lib
-%exclude %{moodlewebdir}/lib/editor/plugins/SpellChecker
+%exclude %{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %{moodlewebdir}/login
 %dir %{moodlewebdir}/lang
 %{moodlewebdir}/lang/en*
-%doc %{moodlewebdir}/lang/README
+%{moodlewebdir}/lang/[^e]*_utf8
+%doc %{moodlewebdir}/lang/README.txt
 %attr(-,apache,apache) %{moodledatadir}
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
@@ -702,10 +704,18 @@
 %if %{with_spellcheck}
 %files editor-spellcheck
 %defattr(-,root,root,-)
-%{moodlewebdir}/lib/editor/plugins/SpellChecker
+%{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %endif
 
 %changelog
+* Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
+- Major changes, update to 1.6.3
+- SpellChecker moved
+- Language install method has been changed (added a cp)
+
+* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> - 1.5.4-2
+- Release bump
+
 * Thu Aug 24 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.5.4-1
 - Update to 1.5.4.
 - Remove SA18267.patch; not needed in 1.5.4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Aug 2006 03:24:05 -0000	1.3
+++ sources	16 Oct 2006 14:09:05 -0000	1.4
@@ -1 +1,2 @@
 86cddfda2b6d9a08b37cc3a16bda1090  moodle-1.5.4.tgz
+2f9f3fcf83ab0f18c409f3a48e07eae2  moodle-1.6.3.tgz



From fedora-extras-commits at redhat.com  Mon Oct 16 14:27:58 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 16 Oct 2006 07:27:58 -0700
Subject: fedora-release fedora-release.spec,1.34,1.35
Message-ID: <200610161427.k9GERwOg023572@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23554

Modified Files:
	fedora-release.spec 
Log Message:
Just bump release, not version



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fedora-release.spec	15 Oct 2006 17:50:24 -0000	1.34
+++ fedora-release.spec	16 Oct 2006 14:27:55 -0000	1.35
@@ -2,8 +2,8 @@
 
 Summary:	Fedora Core release files
 Name:		fedora-release
-Version:	6.89
-Release:	1
+Version:	6
+Release:	89
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -63,6 +63,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Mon Oct 16 2006 Jesse Keating <jkeating at redhat.com> - 6-89
+- Keep version 6, bump release.  Saves from having to rebuild
+  release notes all the time
+
 * Sun Oct 15 2006 Jesse Keating <jkeating at redhat.com> - 6.89-1
 - Rebuild for rawhide
 



From fedora-extras-commits at redhat.com  Mon Oct 16 14:31:33 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 16 Oct 2006 07:31:33 -0700
Subject: devel/common Makefile.common,1.38,1.39
Message-ID: <200610161431.k9GEVXrB023648@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632

Modified Files:
	Makefile.common 
Log Message:
fix this (patch from mmcgrath)


Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.common	15 Oct 2006 22:03:48 -0000	1.38
+++ Makefile.common	16 Oct 2006 14:31:02 -0000	1.39
@@ -89,7 +89,7 @@
 CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
-PLAGUE_CLIENT ?= $(which plague-client)
+PLAGUE_CLIENT ?= $(shell which plague-client)
 
 # RPM with all the overrides in place; you can override this in your
 # .cvsextrasrc also, to use a default rpm setup



From fedora-extras-commits at redhat.com  Mon Oct 16 14:39:21 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 07:39:21 -0700
Subject: rpms/kannel/FC-5 .cvsignore, 1.3, 1.4 kannel.init, 1.1,
	1.2 kannel.spec, 1.10, 1.11 sources, 1.3,
	1.4 kannel-1.4.0-depend.patch, 1.1, NONE
Message-ID: <200610161439.k9GEdLxt023716@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23673/FC-5

Modified Files:
	.cvsignore kannel.init kannel.spec sources 
Removed Files:
	kannel-1.4.0-depend.patch 
Log Message:
Update FC5 kannel to 1.4.1 and make sure we keep sqlite2 support for FC5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 18:06:30 -0000	1.3
+++ .cvsignore	16 Oct 2006 14:38:51 -0000	1.4
@@ -1 +1 @@
-gateway-1.4.0.tar.bz2
+gateway-1.4.1.tar.bz2


Index: kannel.init
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/kannel.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kannel.init	17 Nov 2005 12:25:54 -0000	1.1
+++ kannel.init	16 Oct 2006 14:38:51 -0000	1.2
@@ -34,6 +34,10 @@
 	RETVAL_BEARER=$?
 	echo
 
+	# It seems like the bearerbox may need to settle before accepting
+	# connections from wapbox and smsbox
+	sleep 3s
+
 	# Starting wap and sms only makes sense if bearerbox is running
 	if [ $RETVAL_BEARER -eq 0 ]; then
 	  if grep "^group = wapbox" $config &>/dev/null; then


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/kannel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kannel.spec	6 Mar 2006 15:30:21 -0000	1.10
+++ kannel.spec	16 Oct 2006 14:38:51 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.0
-Release: 8%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -9,15 +9,20 @@
 Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
-Patch: kannel-1.4.0-depend.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, flex, ImageMagick
-BuildRequires: libxml2-devel, openssl-devel, zlib-devel
-BuildRequires: pcre-devel
-# DB backends
+BuildRequires: bison, byacc, flex
+BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
+# DB backends - Use sqlite2 up to FC5 and sqlite3 for FC6+ and non-Fedora
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: sqlite-devel
+%else
 BuildRequires: sqlite2-devel
-# For the docs... I think we need transfig too, so disable for now.
-#BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+%endif
+%{?_with_mysql:Buildrequires: mysql-devel}
+%{?_with_pgsql:Buildrequires: postgresql-devel}
+# For the docs...
+BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+BuildRequires: ImageMagick, transfig
 
 %description
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -47,15 +52,22 @@
 
 %prep
 %setup -n gateway-%{version}
-%patch -p0 -b .depend
 
 
 %build
 %configure \
-    --enable-start-stop-daemon \
     --enable-pcre \
-    --with-sqlite
-%{__make} %{?_smp_mflags}
+    --enable-docs \
+    --enable-start-stop-daemon \
+%if %{!?fedora:6}%{?fedora} >= 6
+    --with-sqlite3 \
+%else
+    --with-sqlite \
+%endif
+    %{?_with_mysql} \
+    %{?_with_pgsql}
+# Remove %{?_smp_mflags} since the docs fail to build with it
+%{__make}
 
 
 %install
@@ -103,7 +115,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
 %attr(0640, kannel, kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
 %config %{_sysconfdir}/rc.d/init.d/kannel
@@ -121,6 +133,20 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-2
+- Make sure we keep sqlite2 support for FC5 and below.
+
+* Mon Oct  2 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-1
+- Update to 1.4.1.
+- Remove obsolete depend patch.
+- Add 3s sleep sfter bearerbox start to let it settle before connections.
+- Switch sqlite backend from sqlite2 to new sqlite3.
+- Add conditional --with mysql and pgsql rebuild support.
+- Re-enable building the doc since transfig is now available and include PDFs.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.0-9
+- FC6 rebuild.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.4.0-8
 - FC5 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jan 2005 18:06:30 -0000	1.3
+++ sources	16 Oct 2006 14:38:51 -0000	1.4
@@ -1 +1 @@
-2ef0544002be48669d7f0f29f9f470de  gateway-1.4.0.tar.bz2
+ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2


--- kannel-1.4.0-depend.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 14:39:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 07:39:22 -0700
Subject: rpms/kannel/devel kannel.spec,1.12,1.13
Message-ID: <200610161439.k9GEdMKG023719@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23673/devel

Modified Files:
	kannel.spec 
Log Message:
Update FC5 kannel to 1.4.1 and make sure we keep sqlite2 support for FC5.



Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kannel.spec	2 Oct 2006 15:25:40 -0000	1.12
+++ kannel.spec	16 Oct 2006 14:38:52 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -12,8 +12,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, byacc, flex
 BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
-# DB backends
+# DB backends - Use sqlite2 up to FC5 and sqlite3 for FC6+ and non-Fedora
+%if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: sqlite-devel
+%else
+BuildRequires: sqlite2-devel
+%endif
 %{?_with_mysql:Buildrequires: mysql-devel}
 %{?_with_pgsql:Buildrequires: postgresql-devel}
 # For the docs...
@@ -55,8 +59,12 @@
     --enable-pcre \
     --enable-docs \
     --enable-start-stop-daemon \
-    %{?_with_mysql} \
+%if %{!?fedora:6}%{?fedora} >= 6
     --with-sqlite3 \
+%else
+    --with-sqlite \
+%endif
+    %{?_with_mysql} \
     %{?_with_pgsql}
 # Remove %{?_smp_mflags} since the docs fail to build with it
 %{__make}
@@ -125,6 +133,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-2
+- Make sure we keep sqlite2 support for FC5 and below.
+
 * Mon Oct  2 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-1
 - Update to 1.4.1.
 - Remove obsolete depend patch.



From fedora-extras-commits at redhat.com  Mon Oct 16 14:57:54 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Oct 2006 07:57:54 -0700
Subject: owners owners.list,1.1832,1.1833
Message-ID: <200610161457.k9GEvseY024027@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24011

Modified Files:
	owners.list 
Log Message:
Take ownership of gnonlin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1832
retrieving revision 1.1833
diff -u -r1.1832 -r1.1833
--- owners.list	16 Oct 2006 13:31:31 -0000	1.1832
+++ owners.list	16 Oct 2006 14:57:23 -0000	1.1833
@@ -561,7 +561,7 @@
 Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnomeradio|Graphical FM-Tuner program|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnomesword|GNOME-based Bible research tool|dakingun at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
+Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|bdpepple at ameritech.net|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnubg|A backgammon game and analyser|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnubiff|A mail notification program|splinux at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 16 15:13:36 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Oct 2006 08:13:36 -0700
Subject: rpms/ufsparse/FC-5 .cvsignore, 1.2, 1.3 sources, 1.7,
	1.8 ufsparse.spec, 1.14, 1.15
Message-ID: <200610161513.k9GFDatu027209@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27159

Modified Files:
	.cvsignore sources ufsparse.spec 
Log Message:
New version. URL change. Source tarball name change. Fix bug 210846. Rearrange spec file so all definitions are in one place.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 06:33:48 -0000	1.2
+++ .cvsignore	16 Oct 2006 15:13:05 -0000	1.3
@@ -1 +1 @@
-UFsparse.tar.gz
+SuiteSparse.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2006 14:06:45 -0000	1.7
+++ sources	16 Oct 2006 15:13:05 -0000	1.8
@@ -1 +1 @@
-7e635c3c6f6224439c96ca1ac9bb21e2  UFsparse.tar.gz
+bc01ef2f26e6ad3eed83b4ad62e46a68  SuiteSparse.tar.gz


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/FC-5/ufsparse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ufsparse.spec	16 Aug 2006 14:06:45 -0000	1.14
+++ ufsparse.spec	16 Oct 2006 15:13:05 -0000	1.15
@@ -1,12 +1,12 @@
 Name:           ufsparse
-Version:        2.0.0
+Version:        2.1.1
 Release:        1%{?dist}
-Summary:        University of Florida sparse matrix libraries
+Summary:        A collection of sparse matrix libraries
 
 Group:          System Environment/Libraries
 License:        Distributable
-URL:            http://www.cise.ufl.edu/research/sparse/UFsparse
-Source0:        http://www.cise.ufl.edu/research/sparse/UFsparse/v%{version}/UFsparse.tar.gz
+URL:            http://www.cise.ufl.edu/research/sparse/SuiteSparse
+Source0:        http://www.cise.ufl.edu/research/sparse/SuiteSparse/v%{version}/SuiteSparse.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -41,15 +41,45 @@
 
 
 %prep
-%setup -q -n UFsparse
+%setup -q -n SuiteSparse
 
 %build
 %define amd_version 2.0
 %define amd_version_major 2
-mkdir Devel
-mkdir Doc
-mkdir Lib
-mkdir Include
+%define btf_version 0.9
+%define btf_version_major 0
+%define camd_version 2.1
+%define camd_version_major 2
+%define ccolamd_version 2.5.1
+%define ccolamd_version_major 2
+%define cholmod_version 1.2
+%define cholmod_version_major 1
+%define colamd_version 2.5.1
+%define colamd_version_major 2
+%define csparse_version 2.0.2
+%define csparse_version_major 2
+%define cxsparse_version 2.0.2
+%define cxsparse_version_major 2
+%define klu_version 0.9
+%define klu_version_major 0
+%define ldl_version 1.3.1
+%define ldl_version_major 1
+%define umfpack_version 5.0.1
+%define umfpack_version_major 5
+### CHOLMOD can also be compiled to use the METIS library, but it is not
+### used here because its licensing terms exclude it from Fedora Extras.
+### To compile with METIS, define enable_metis as 1 below.
+%define enable_metis 0
+### CXSparse is a superset of CSparse, and the two share common header
+### names, so it does not make sense to build both. CXSparse is built
+### by default, but CSparse can be built instead by defining
+### enable_csparse as 1 below.
+%define enable_csparse 0
+
+mkdir Devel Devel/AMD Devel/CHOLMOD Devel/KLU Devel/LDL Devel/UMFPACK \
+	Doc Doc/AMD Doc/BTF Doc/CAMD Doc/CCOLAMD Doc/CHOLMOD Doc/COLAMD \
+	Doc/KLU Doc/LDL Doc/UMFPACK Lib Include
+
 pushd AMD
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
@@ -57,18 +87,10 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/AMD/
-  cp README.txt Doc/License Doc/ChangeLog ../Doc/AMD/
-  mkdir ../Devel/AMD/
+  cp README.txt Doc/License Doc/ChangeLog ../Doc/AMD
   cp Doc/*.pdf ../Devel/AMD/
 popd
-pushd Lib
-  ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
-  ln -sf libamd.so.%{amd_version} libamd.so
-popd
 
-%define btf_version 0.9
-%define btf_version_major 0
 pushd BTF
   pushd Lib
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" libbtf.a
@@ -76,16 +98,9 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/BTF/
-  cp README.txt Doc/lesser.txt ../Doc/BTF/
-popd
-pushd Lib
-  ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major}
-  ln -sf libbtf.so.%{btf_version} libbtf.so
+  cp README.txt Doc/lesser.txt ../Doc/BTF
 popd
 
-%define camd_version 2.1
-%define camd_version_major 2
 pushd CAMD
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
@@ -93,35 +108,19 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/CAMD/
   cp README.txt Doc/License Doc/ChangeLog ../Doc/CAMD
 popd
-pushd Lib
-  ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major}
-  ln -sf libcamd.so.%{camd_version} libcamd.so
-popd
 
-%define ccolamd_version 2.5
-%define ccolamd_version_major 2
 pushd CCOLAMD
   make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
   gcc -shared -Wl,-soname,libccolamd.so.%{ccolamd_version_major} -o libccolamd.so.%{ccolamd_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
-  mkdir ../Doc/CCOLAMD/
   cp README.txt lesser.txt ChangeLog ../Doc/CCOLAMD
 popd
 pushd Lib
-  ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major}
-  ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
 popd
 
-%define cholmod_version 1.1.1
-%define cholmod_version_major 1
-### CHOLMOD can also be compiled to use the METIS library, but it is not
-### used here because its licensing terms exclude it from Fedora Extras.
-### To compile with METIS, define enable_metis as 1 below.
-%define enable_metis 0
 %if "%{?enable_metis}" == "1"
 CHOLMOD_FLAGS="$RPM_OPT_FLAGS -I%{_includedir}/metis -fPIC"
 %else
@@ -129,49 +128,29 @@
 %endif
 pushd CHOLMOD
   pushd Lib
-    make  CFLAGS="$CHOLMOD_FLAGS"
+    make CFLAGS="$CHOLMOD_FLAGS"
     gcc -shared -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o ../Lib/libcholmod.so.%{cholmod_version} `ls *.o`
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/CHOLMOD
-  cp README.txt ../Doc/CHOLMOD/
+  cp README.txt ../Doc/CHOLMOD
   cp Cholesky/License.txt ../Doc/CHOLMOD/Cholesky_License.txt
   cp Core/License.txt ../Doc/CHOLMOD/Core_License.txt
   cp MatrixOps/License.txt ../Doc/CHOLMOD/MatrixOps_License.txt
   cp Partition/License.txt ../Doc/CHOLMOD/Partition_License.txt
   cp Supernodal/License.txt ../Doc/CHOLMOD/Supernodal_License.txt
-  mkdir ../Devel/CHOLMOD/
-  cp Doc/*.pdf ../Devel/CHOLMOD/
-popd
-pushd Lib
-  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
-  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so
+  cp Doc/*.pdf ../Devel/CHOLMOD
 popd
 
-%define colamd_version 2.5
-%define colamd_version_major 2
 pushd COLAMD
   make CFLAGS="$RPM_OPT_FLAGS -fPIC" library
   gcc -shared -Wl,-soname,libcolamd.so.%{colamd_version_major} -o libcolamd.so.%{colamd_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
-  mkdir ../Doc/COLAMD/
   cp README.txt ChangeLog ../Doc/COLAMD
 popd
-pushd Lib
-  ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major}
-  ln -sf libcolamd.so.%{colamd_version} libcolamd.so
-popd
 
-### CXSparse is a superset of CSparse, and the two share common header
-### names, so it does not make sense to build both. CXSparse is built
-### by default, but CSparse can be built instead by defining
-### enable_csparse as 1 below.
-%define enable_csparse 0
 %if "%{?enable_csparse}" == "1"
-%define csparse_version 2.0.1
-%define csparse_version_major 2
 pushd CSparse
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a
@@ -182,14 +161,8 @@
   mkdir ../Doc/CSparse/
   cp README.txt License.txt lesser.txt ../Doc/CSparse
 popd
-pushd Lib
-  ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major}
-  ln -sf libcsparse.so.%{csparse_version} libcsparse.so
-popd
 
 %else
-%define cxsparse_version 2.0.1
-%define cxsparse_version_major 2
 pushd CXSparse
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" libcxsparse.a
@@ -200,14 +173,8 @@
   mkdir ../Doc/CXSparse/
   cp README.txt License.txt lesser.txt ../Doc/CXSparse
 popd
-pushd Lib
-  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major}
-  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so
-popd
 %endif
 
-%define klu_version 0.9
-%define klu_version_major 0
 pushd KLU
   pushd Lib
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" libklu.a
@@ -215,34 +182,18 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/KLU/
-  cp README.txt Doc/lesser.txt ../Doc/KLU/
-  mkdir ../Devel/KLU/
-popd
-pushd Lib
-  ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
-  ln -sf libklu.so.%{klu_version} libklu.so
+  cp README.txt Doc/lesser.txt ../Doc/KLU
 popd
 
-%define ldl_version 1.3
-%define ldl_version_major 1
 pushd LDL
   make CFLAGS="$RPM_OPT_FLAGS -fPIC" libldl.a
   gcc -shared -Wl,-soname,libldl.so.%{ldl_version_major} -o libldl.so.%{ldl_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
-  mkdir ../Doc/LDL/
-  cp README.txt ChangeLog lesser.txt ../Doc/LDL/
-  mkdir ../Devel/LDL/
-  cp *.pdf *.ps ../Devel/LDL/
-popd
-pushd Lib
-  ln -sf libldl.so.%{ldl_version} libldl.so.%{ldl_version_major}
-  ln -sf libldl.so.%{ldl_version} libldl.so
+  cp README.txt ChangeLog lesser.txt ../Doc/LDL
+  cp *.pdf *.ps ../Devel/LDL
 popd
 
-%define umfpack_version 5.0
-%define umfpack_version_major 5
 pushd UMFPACK
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
@@ -250,12 +201,34 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/UMFPACK
   cp Doc/License Doc/ChangeLog Doc/lesser.txt README.txt ../Doc/UMFPACK
-  mkdir ../Devel/UMFPACK/
-  cp Doc/*.pdf ../Devel/UMFPACK/
+  cp Doc/*.pdf ../Devel/UMFPACK
 popd
+
 pushd Lib
+  ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
+  ln -sf libamd.so.%{amd_version} libamd.so
+  ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major}
+  ln -sf libbtf.so.%{btf_version} libbtf.so
+  ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major}
+  ln -sf libcamd.so.%{camd_version} libcamd.so
+  ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major}
+  ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
+  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
+  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so
+  ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major}
+  ln -sf libcolamd.so.%{colamd_version} libcolamd.so
+%if "%{?enable_csparse}" == "1"
+  ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major}
+  ln -sf libcsparse.so.%{csparse_version} libcsparse.so
+%else
+  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major}
+  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so
+%endif
+  ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
+  ln -sf libklu.so.%{klu_version} libklu.so
+  ln -sf libldl.so.%{ldl_version} libldl.so.%{ldl_version_major}
+  ln -sf libldl.so.%{ldl_version} libldl.so
   ln -sf libumfpack.so.%{umfpack_version} libumfpack.so.%{umfpack_version_major}
   ln -sf libumfpack.so.%{umfpack_version} libumfpack.so
 popd
@@ -299,6 +272,12 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Oct 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.1-1
+- New release, and package name change from UFsparse to SuiteSparse. Fixes
+  bug #210846. Keep the ufsparse package name for now.
+- Increment versions of some libraries.
+- Rearrange and clean up spec file so all definitions are in one place.
+
 * Wed Aug 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.0.0-1
 - New release.
 - Build newly added CAMD library.



From fedora-extras-commits at redhat.com  Mon Oct 16 15:28:55 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 16 Oct 2006 08:28:55 -0700
Subject: rpms/scanbuttond/devel Makefile,NONE,1.1
Message-ID: <200610161528.k9GFStOZ028125@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28120/devel

Added Files:
	Makefile 
Log Message:

Weird b0rkage.



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Mon Oct 16 15:32:15 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 08:32:15 -0700
Subject: owners owners.list,1.1833,1.1834
Message-ID: <200610161532.k9GFWF56028230@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28196

Modified Files:
	owners.list 
Log Message:
Adding zaptel.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1833
retrieving revision 1.1834
diff -u -r1.1833 -r1.1834
--- owners.list	16 Oct 2006 14:57:23 -0000	1.1833
+++ owners.list	16 Oct 2006 15:31:45 -0000	1.1834
@@ -2419,6 +2419,7 @@
 Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 Fedora Extras|z88dk|Z80 cross compiler|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|zaptel|Tools and libraries for using/configuring/monitoring Zapata telephony interfaces|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|zasx|Asteroid like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 16 15:38:58 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Oct 2006 08:38:58 -0700
Subject: rpms/ginac/FC-5 .cvsignore, 1.4, 1.5 ginac.spec, 1.8, 1.9 sources,
	1.4, 1.5
Message-ID: <200610161538.k9GFcwca028343@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318

Modified Files:
	.cvsignore ginac.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Apr 2006 15:37:06 -0000	1.4
+++ .cvsignore	16 Oct 2006 15:38:28 -0000	1.5
@@ -1 +1 @@
-ginac-1.3.4.tar.bz2
+ginac-1.3.5.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/ginac.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ginac.spec	14 Apr 2006 15:37:06 -0000	1.8
+++ ginac.spec	16 Oct 2006 15:38:28 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           ginac
-Version:        1.3.4
+Version:        1.3.5
 Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
@@ -104,6 +104,9 @@
 %{_mandir}/man?/viewgar.1*
 
 %changelog
+* Mon Oct 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.5-1
+- New release.
+
 * Fri Apr 14 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.4-1
 - New release. Old patch removed.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Apr 2006 15:37:06 -0000	1.4
+++ sources	16 Oct 2006 15:38:28 -0000	1.5
@@ -1 +1 @@
-ed887e80cc119eeb07c0329990576446  ginac-1.3.4.tar.bz2
+2187bd0f79baf78514b5cbf737d67b01  ginac-1.3.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 15:44:03 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon, 16 Oct 2006 08:44:03 -0700
Subject: rpms/sysprof-kmod/FC-5 sysprof-kmod.spec,1.6,1.7
Message-ID: <200610161544.k9GFi3rb028498@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28481

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.18-1.2200.fc5



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sysprof-kmod.spec	6 Oct 2006 22:15:06 -0000	1.6
+++ sysprof-kmod.spec	16 Oct 2006 15:43:33 -0000	1.7
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.17-1.2187_FC5}
+%{!?kversion: %define kversion kernel-2.6.18-1.2200.fc5}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 
@@ -98,10 +98,13 @@
 
 
 %changelog
-* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
+* Mon Oct 16 2006 Gianluca Sforna <giallu gmail com>
+- rebuild for new kernel 2.6.18-1.2200.fc5
+
+* Thu Oct  5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
 - rebuild
 
-* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
+* Thu Oct  5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
 - remove (not supported) ppc arch
 
 * Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1



From fedora-extras-commits at redhat.com  Mon Oct 16 15:47:09 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 08:47:09 -0700
Subject: rpms/scanbuttond/devel buttonpressed.sh, NONE, 1.1 initscanner.sh, 
	NONE, 1.1 scanbuttond-0.2.3.diff, NONE, 1.1 scanbuttond.init,
	NONE, 1.1 scanbuttond.spec, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610161547.k9GFl99C028572@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28565/devel

Added Files:
	buttonpressed.sh initscanner.sh scanbuttond-0.2.3.diff 
	scanbuttond.init scanbuttond.spec sources 
Log Message:
auto-import scanbuttond-0.2.3-7 on branch devel from scanbuttond-0.2.3-7.src.rpm


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

# This script is started by scanbuttond whenever a scanner button has been pressed.
# Scanbuttond passes the following parameters to us:
# $1 ... the button number
# $2 ... the scanner's SANE device name, which comes in handy if there are two or 
#        more scanners. In this case we can pass the device name to SANE programs 
#        like scanimage.

TMPFILE="/tmp/scan.tiff"
LOCKFILE="/tmp/copy.lock"

case $1 in
	1)
		echo "button 1 has been pressed on $2"
		
		# This example turns your scanner+printer into a photocopier.
		# Fine-tuned for the Epson Perfection 2400, the HP LaserJet 1200 and
		# ISO A4 paper size so that the scanned document matches the printer
		# output as closely as possible.
		#
		# if [ -f $LOCKFILE ]; then
		#   echo "Error: Another scanning operation is currently in progress"
		#   exit
		# fi
		# touch $LOCKFILE
		# rm -f $TMPFILE
		 scanimage --device-name $2 -x 215 -y 297 1> /tmp/image.pnm
		 gimp /tmp/image.pnm
		# tiff2ps -z -w 8.27 -h 11.69 $TMPFILE | lpr
		# rm -f $LOCKFILE
		#
		;;
	2)
		echo "button 2 has been pressed on $2"
                 scanimage --device-name $2 -x 215 -y 297 1> /tmp/image.pnm
		 lpr /tmp/image.pnm	
		;;
	3)
		echo "button 3 has been pressed on $2"
                 scanimage --device-name $2 -x 215 -y 297 1> /tmp/image.pnm
	          evolution mailto:?attach=/tmp/image.pnm	
		;;
	4)
		echo "button 4 has been pressed on $2"
		;;
esac



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

# This script is executed whenever scanbuttond
# finds new devices.
# If your scanner needs a firmware upload or any other kind
# of special action to be taken on initialization, put
# the apropriate command here.

# Example:
 scanimage -n
# or
# sane-find-scanners


scanbuttond-0.2.3.diff:

--- NEW FILE scanbuttond-0.2.3.diff ---
diff -uNr scanbuttond-0.2.3.orig/backends/meta.conf scanbuttond-0.2.3/backends/meta.conf
--- scanbuttond-0.2.3.orig/backends/meta.conf	2006-02-15 17:43:54.000000000 +0100
+++ scanbuttond-0.2.3/backends/meta.conf	2006-10-10 10:11:05.000000000 +0200
@@ -1,6 +1,6 @@
-libscanbtnd-backend_epson.so
-libscanbtnd-backend_plustek.so
-libscanbtnd-backend_plustek_umax.so
-libscanbtnd-backend_snapscan.so
-libscanbtnd-backend_niash.so
-libscanbtnd-backend_mustek.so
+libscanbtnd-backend_epson.so.1
+libscanbtnd-backend_plustek.so.1
+libscanbtnd-backend_plustek_umax.so.1
+libscanbtnd-backend_snapscan.so.1
+libscanbtnd-backend_niash.so.1
+libscanbtnd-backend_mustek.so.1
diff -uNr scanbuttond-0.2.3.orig/scanbuttond.c scanbuttond-0.2.3/scanbuttond.c
--- scanbuttond-0.2.3.orig/scanbuttond.c	2006-02-17 00:23:53.000000000 +0100
+++ scanbuttond-0.2.3/scanbuttond.c	2006-10-10 10:14:23.000000000 +0200
@@ -32,7 +32,7 @@
 #include "scanbuttond/scanbuttond.h"
 #include "scanbuttond/loader.h"
 
-#define DEF_BACKEND_FILENAME		STRINGIFY(LIB_DIR) "/libscanbtnd-backend_meta.so"
+#define DEF_BACKEND_FILENAME		STRINGIFY(LIB_DIR) "/libscanbtnd-backend_meta.so.1"
 #define DEF_BUTTONPRESSED_SCRIPT	STRINGIFY(CFG_DIR) "/buttonpressed.sh"
 #define DEF_INITSCANNER_SCRIPT		STRINGIFY(CFG_DIR) "/initscanner.sh"
 #define DEF_POLL_DELAY			333000L


--- NEW FILE scanbuttond.init ---
#!/bin/bash
#
# Startup script for Scanbuttond
#
# chkconfig: - 98 54
# description: LISa is a small daemon which is intended to run on \
#              end user systems. It provides something like a \
#              "network neighbourhood", but only relying on the TCP/IP \
#              protocol stack, no smb or whatever.\
#              The information about the hosts in your "neighbourhood" \
#              is provided via TCP port 7741.
# processname: scanbuttond
# config: /etc/scanbuttond

# Source function library.
. /etc/rc.d/init.d/functions

# Source function library.
if [ -f /etc/init.d/functions ] ; then
  . /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ] ; then
  . /etc/rc.d/init.d/functions
else
  exit 0
fi

# Some definitions.
scanbuttond=/usr/bin/scanbuttond
prog=scanbuttond
RETVAL=0

#
start() {
        echo -n $"Starting $prog: "
        daemon $scanbuttond $OPTIONS
        RETVAL=$?
        echo
        if [ $RETVAL = 0 ] ; then
           touch /var/lock/subsys/scanbuttond
        else
           RETVAL=1
        fi
        return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $scanbuttond
	RETVAL=$?
	echo
	if [ $RETVAL = 0 ] ; then
           rm -f /var/lock/subsys/scanbuttond
        else
           RETVAL=1
        fi
        return $RETVAL
}

reload() {
	echo -n $"Reloading $prog: "
	killproc $scanbuttond -HUP
	RETVAL=$?
	echo
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        status $scanbuttond
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
        [ -f /var/lock/subsys/scanbuttond ] && restart
        ;;
  *)
	echo $"Usage: $prog {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


--- NEW FILE scanbuttond.spec ---
Name:            scanbuttond
Version:         0.2.3
Release:         7%{?dist}
Summary:         Scanner Button tools to SANE

Group:           System Environment/Libraries
License:         GPL
URL:             http://scanbuttond.sf.net
Source0:         http://easynews.dl.sourceforge.net/sourceforge/scanbuttond/%{name}-%{version}.tar.gz
Source1:         scanbuttond.init
Source2:         initscanner.sh
Source3:         buttonpressed.sh
Patch0:          scanbuttond-0.2.3.diff
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post):  /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun):/sbin/service
Requires(post):  /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires:   libusb-devel
#Requires:       sane-backends evolution cups

%description
Modern scanners usually have several front panel buttons which are intended to
trigger certain actions like copying, faxing or mailing the scanned document.
This daemon monitors the scanner's buttons and runs a shell script whenever one
of these buttons has been pressed. Because it is accessing the scanner directly
via libusb, there should be no conflicts with SANE or other scanner drivers:
scanbuttond simply won't touch the scanner hardware while you are using SANE.

%prep
%setup -q
%patch0 -p1

%build
%configure --libdir=%{_libdir}/scanbuttond
make  %{?_smp_mflags}

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

rm -rf %{buildroot}%{_libdir}/scanbuttond/*.{la,so}
mkdir -p -m 755 %{buildroot}%{_initrddir}
install -c -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/scanbuttond
rm -rf %{buildroot}%{_sysconfdir}/scanbuttond/*.sh
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/scanbuttond/
install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/scanbuttond/

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add scanbuttond


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

%preun
if [ $1 = 0 ]; then
 /sbin/service scanbuttond stop > /dev/null 2>&1 || :
 /sbin/chkconfig --del scanbuttond
fi

%files
%defattr(-,root,root)
%doc README COPYING AUTHORS ChangeLog
%{_bindir}/scanbuttond
%{_libdir}/scanbuttond
%config(noreplace) %{_sysconfdir}/scanbuttond/meta.conf
%{_sysconfdir}/scanbuttond
%{_initrddir}/scanbuttond


%changelog
* Tue Oct 12 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-7
- missing directory ownership Fixed

* Tue Oct 11 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-6
- Move libscanbtnd*so to %%{_libdir}/scanbuttond.
- Let the app dlopen *.so.1 instead of *.so.

* Tue Oct 10 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-5
- wrong preun call for ldconfig fix to postun

* Tue Oct 05 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-4
- Some SPEC file Fixes

* Tue Oct 03 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-3
- Chmod'd Source1-3 644, to avoid rpmlint error on SRPM
- Fixed error that installs Source1 *in* %%{_initrddir}/scannerbuttond/
- Renamed Source1 to scanbuttond.init

* Tue Oct 03 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-2
- Initial Release


--- NEW FILE sources ---
548e6451b398bd95d14f008b4d39ca79  scanbuttond-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 16:03:38 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 09:03:38 -0700
Subject: rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.5,1.6
Message-ID: <200610161603.k9GG3c50031714@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31685

Modified Files:
	em8300-kmod.spec 
Log Message:
* Mon Oct 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0.rc1
- Build for kernel 2.6.18-1.2200.fc5.
- Don't use <linux/config.h>.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- em8300-kmod.spec	2 Oct 2006 18:17:12 -0000	1.5
+++ em8300-kmod.spec	16 Oct 2006 16:03:07 -0000	1.6
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.17-1.2187_FC5}
+%{!?kversion: %define kversion 2.6.18-1.2200.fc5}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -47,6 +47,7 @@
 cd %{kmod_name}-%{version}-rc1
 %patch0 -p0
 %patch1 -p0
+sed -i -e 's|<linux/config\.h>|<linux/autoconf.h>|' modules/*.[hc]
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
@@ -76,7 +77,11 @@
 
 
 %changelog
-* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0
+* Mon Oct 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0.rc1
+- Build for kernel 2.6.18-1.2200.fc5.
+- Don't use <linux/config.h>.
+
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
 - Patch to default to OSS for backwards compatibility.
 - Drop early FC5 hacks.



From fedora-extras-commits at redhat.com  Mon Oct 16 16:08:25 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 09:08:25 -0700
Subject: rpms/scanbuttond/devel scanbuttond.init, 1.1, 1.2 scanbuttond.spec, 
	1.1, 1.2
Message-ID: <200610161608.k9GG8Pd5031924@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31901/devel

Modified Files:
	scanbuttond.init scanbuttond.spec 
Log Message:



Index: scanbuttond.init
===================================================================
RCS file: /cvs/extras/rpms/scanbuttond/devel/scanbuttond.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scanbuttond.init	16 Oct 2006 15:47:09 -0000	1.1
+++ scanbuttond.init	16 Oct 2006 16:07:55 -0000	1.2
@@ -3,12 +3,9 @@
 # Startup script for Scanbuttond
 #
 # chkconfig: - 98 54
-# description: LISa is a small daemon which is intended to run on \
-#              end user systems. It provides something like a \
-#              "network neighbourhood", but only relying on the TCP/IP \
-#              protocol stack, no smb or whatever.\
-#              The information about the hosts in your "neighbourhood" \
-#              is provided via TCP port 7741.
+# description: scanbuttond is a small daemon which checks for supported scanners \
+#              when attached to system, it loads that respective backend so that \
+#              buttons on that scanners gets activated for their functionings.
 # processname: scanbuttond
 # config: /etc/scanbuttond
 


Index: scanbuttond.spec
===================================================================
RCS file: /cvs/extras/rpms/scanbuttond/devel/scanbuttond.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scanbuttond.spec	16 Oct 2006 15:47:09 -0000	1.1
+++ scanbuttond.spec	16 Oct 2006 16:07:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:            scanbuttond
 Version:         0.2.3
-Release:         7%{?dist}
+Release:         8%{?dist}
 Summary:         Scanner Button tools to SANE
 
 Group:           System Environment/Libraries
@@ -77,10 +77,13 @@
 
 
 %changelog
-* Tue Oct 12 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-7
+* Mon Oct 16 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-8
+- corrected scanbuttond.init which i hacked from lisa daemon 
+
+* Thu Oct 12 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-7
 - missing directory ownership Fixed
 
-* Tue Oct 11 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-6
+* Wed Oct 11 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-6
 - Move libscanbtnd*so to %%{_libdir}/scanbuttond.
 - Let the app dlopen *.so.1 instead of *.so.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 16:14:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 09:14:03 -0700
Subject: rpms/lighttpd/devel lighttpd.spec,1.28,1.29
Message-ID: <200610161614.k9GGE3ku032058@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32031

Modified Files:
	lighttpd.spec 
Log Message:
Minor build requirement changes.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- lighttpd.spec	11 Oct 2006 10:05:03 -0000	1.28
+++ lighttpd.spec	16 Oct 2006 16:13:33 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -21,7 +21,8 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++
+BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: readline-devel
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -173,6 +174,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-2
+- Remove gcc-c++ build req, it's part of the defaults.
+- Add readline-devel build req, needed on RHEL4.
+
 * Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-1
 - Update to 1.4.13, which contains the previous fix.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 16:20:11 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Oct 2006 09:20:11 -0700
Subject: rpms/gnonlin/devel gnonlin.spec,1.9,1.10
Message-ID: <200610161620.k9GGKB1W032148@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnonlin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32130

Modified Files:
	gnonlin.spec 
Log Message:
* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.10.5-3
- Unorphan & rebuild.
- Require gstreamer-plugins-base.
- Don't build static libraries.
- Bump minimum requirement for gst-plugins-base.



Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnonlin.spec	7 Sep 2006 21:25:17 -0000	1.9
+++ gnonlin.spec	16 Oct 2006 16:19:41 -0000	1.10
@@ -1,47 +1,62 @@
 %define		gst_req			0.10.8.1
-%define		gst_plugins_base_req	0.10.2
+%define		gst_plugins_base_req	0.10.4
 
 Name: 		gnonlin
 Version: 	0.10.5
-Release:	2
+Release:	3
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
 License: 	LGPL
 URL:		http://gnonlin.sourceforge.net/
-Source:		http://prdownloads.sourceforge.net/gnonlin/%{name}-%{version}.tar.gz
+Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: 	gstreamer-devel >= %{gst_req} gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
-Obsoletes: gnonlin-devel
+BuildRequires: 	gstreamer-devel >= %{gst_req}
+BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
+
+Requires:	gstreamer-plugins-base >= %{gst_plugins_base_req}
+Obsoletes:	gnonlin-devel
+
 
 %description
 Gnonlin is a library built on top of GStreamer (http://gstreamer.net)
 which provides support for writing non-linear audio and video editing
 applications. It introduces the concept of a timeline.
 
+
 %prep
 %setup -q
 
+
 %build
-%configure
+%configure --enable-static=no
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-%makeinstall
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_majorminor}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB README
-%{_libdir}/gstreamer-0.10/libgnl*
+%{_libdir}/gstreamer-0.10/libgnl.so
+
 
 %changelog
+* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.10.5-3
+- Unorphan & rebuild.
+- Require gstreamer-plugins-base.
+- Don't build static libraries.
+- Bump minimum requirement for gst-plugins-base.
+
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.5-2
 - rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 16:26:04 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon, 16 Oct 2006 09:26:04 -0700
Subject: rpms/sysprof-kmod/FC-5 sysprof-kmod.spec,1.7,1.8
Message-ID: <200610161626.k9GGQ4LA032375@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32332

Modified Files:
	sysprof-kmod.spec 
Log Message:
Damn cut&paste...



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sysprof-kmod.spec	16 Oct 2006 15:43:33 -0000	1.7
+++ sysprof-kmod.spec	16 Oct 2006 16:25:34 -0000	1.8
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion kernel-2.6.18-1.2200.fc5}
+%{!?kversion: %define kversion 2.6.18-1.2200.fc5}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Mon Oct 16 16:44:50 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 09:44:50 -0700
Subject: rpms/php-eaccelerator/FC-5 .cvsignore, 1.7,
	1.8 php-eaccelerator.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <200610161644.k9GGio8U032552@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/FC-5

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Log Message:
Update to 0.9.5 final.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Aug 2006 10:42:21 -0000	1.7
+++ .cvsignore	16 Oct 2006 16:44:19 -0000	1.8
@@ -1 +1 @@
-eaccelerator-0.9.5-rc1.tar.bz2
+eaccelerator-0.9.5.tar.bz2


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/php-eaccelerator.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- php-eaccelerator.spec	24 Aug 2006 10:42:21 -0000	1.12
+++ php-eaccelerator.spec	16 Oct 2006 16:44:19 -0000	1.13
@@ -1,10 +1,9 @@
 # Useful defaults when building in chroots on systems where PHP is unavailable
 %define default_extdir  %{_libdir}/php4
 %define default_apiver  20041225
-%define default_version 5.1.4
+%define default_version 5.1.6
 
 %define module_version 0.9.5
-%define prever         rc1
 
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir})
 %define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -17,14 +16,15 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 0.3.%{prever}%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.sourceforge.net/
-Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2
+Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2
 Patch0: eaccelerator-0.9.5-rc1-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: php-api = %{php_apiver}
+Requires: php = %{php_version}
 Provides: php-zend_extension
 Conflicts: php-mmcache
 BuildRequires: php, php-devel
@@ -38,7 +38,7 @@
 
 
 %prep
-%setup -n eaccelerator-%{module_version}-%{prever}
+%setup -n eaccelerator-%{module_version}
 %patch0 -p1 -b .config
 # Change paths in the example config, other values are changed by a patch
 %{__perl} -pi -e 's|/usr/lib/php4/|%{php_extdir}/|g;
@@ -75,6 +75,13 @@
 %{__rm} -rf %{buildroot}
 
 
+%preun
+# Upon last removal (not update), clean all cache files
+if [ $1 -eq 0 ]; then
+    rm -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
+fi
+
+
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING NEWS README*
@@ -85,6 +92,18 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-1
+- Update to 0.9.5 final.
+- Add cleanup of the cache directory upon package removal.
+
+* Thu Sep  7 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-0.4.rc1
+- Rebuild for PHP 5.1.6, eA still checks the exact PHP version it seems :-(
+- Put "Requires: php = %%{php_version}" back to avoid broken setups if/when
+  PHP gets updated.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 5.1.4_0.9.5-0.4.rc1
+- FC6 rebuild.
+
 * Tue Aug 22 2006 Matthias Saou <http://freshrpms.net/> 5.1.4_0.9.5-0.3.rc1
 - Update to 0.9.5-rc1.
 - Enable shared-memory, sessions and content-caching (#201319).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Aug 2006 10:42:21 -0000	1.7
+++ sources	16 Oct 2006 16:44:19 -0000	1.8
@@ -1 +1 @@
-5d03deb399f8f857d92dd092a2c69a87  eaccelerator-0.9.5-rc1.tar.bz2
+dad54af67488b83a2af6e30f661f613b  eaccelerator-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 16:44:50 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 09:44:50 -0700
Subject: rpms/php-eaccelerator/devel .cvsignore, 1.7,
	1.8 php-eaccelerator.spec, 1.22, 1.23 sources, 1.7, 1.8
Message-ID: <200610161644.k9GGiohO032555@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/devel

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Log Message:
Update to 0.9.5 final.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Aug 2006 12:34:56 -0000	1.7
+++ .cvsignore	16 Oct 2006 16:44:20 -0000	1.8
@@ -1 +1 @@
-eaccelerator-0.9.5-rc1.tar.bz2
+eaccelerator-0.9.5.tar.bz2


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- php-eaccelerator.spec	7 Sep 2006 12:21:59 -0000	1.22
+++ php-eaccelerator.spec	16 Oct 2006 16:44:20 -0000	1.23
@@ -4,7 +4,6 @@
 %define default_version 5.1.6
 
 %define module_version 0.9.5
-%define prever         rc1
 
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir})
 %define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -17,11 +16,11 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 0.4.%{prever}%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.sourceforge.net/
-Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2
+Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2
 Patch0: eaccelerator-0.9.5-rc1-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: php-api = %{php_apiver}
@@ -39,7 +38,7 @@
 
 
 %prep
-%setup -n eaccelerator-%{module_version}-%{prever}
+%setup -n eaccelerator-%{module_version}
 %patch0 -p1 -b .config
 # Change paths in the example config, other values are changed by a patch
 %{__perl} -pi -e 's|/usr/lib/php4/|%{php_extdir}/|g;
@@ -76,6 +75,13 @@
 %{__rm} -rf %{buildroot}
 
 
+%preun
+# Upon last removal (not update), clean all cache files
+if [ $1 -eq 0 ]; then
+    rm -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
+fi
+
+
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING NEWS README*
@@ -86,6 +92,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-1
+- Update to 0.9.5 final.
+- Add cleanup of the cache directory upon package removal.
+
 * Thu Sep  7 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-0.4.rc1
 - Rebuild for PHP 5.1.6, eA still checks the exact PHP version it seems :-(
 - Put "Requires: php = %%{php_version}" back to avoid broken setups if/when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Aug 2006 12:34:56 -0000	1.7
+++ sources	16 Oct 2006 16:44:20 -0000	1.8
@@ -1 +1 @@
-5d03deb399f8f857d92dd092a2c69a87  eaccelerator-0.9.5-rc1.tar.bz2
+dad54af67488b83a2af6e30f661f613b  eaccelerator-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 18:14:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:14:46 -0700
Subject: fedora-security/audit fe3,1.20,1.21 fe4,1.78,1.79 fe5,1.85,1.86
Message-ID: <200610161814.k9GIEkq9019520@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19498

Modified Files:
	fe3 fe4 fe5 
Log Message:
+CVE-????-???? VULNERABLE (clamav) #210973


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fe3	3 Oct 2006 17:41:12 -0000	1.20
+++ fe3	16 Oct 2006 18:14:43 -0000	1.21
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-????-???? VULNERABLE (clamav) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- fe4	10 Oct 2006 18:24:25 -0000	1.78
+++ fe4	16 Oct 2006 18:14:43 -0000	1.79
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-????-???? VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- fe5	10 Oct 2006 18:24:25 -0000	1.85
+++ fe5	16 Oct 2006 18:14:43 -0000	1.86
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-????-???? VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299



From fedora-extras-commits at redhat.com  Mon Oct 16 18:25:21 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:25:21 -0700
Subject: rpms/openct/devel openct.spec,1.18,1.19
Message-ID: <200610161825.k9GIPL7f019767@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19742

Modified Files:
	openct.spec 
Log Message:
* Mon Oct 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-3
- Fix udev rules for newer udev versions (#210868).



Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openct.spec	2 Oct 2006 18:41:06 -0000	1.18
+++ openct.spec	16 Oct 2006 18:24:51 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           openct
 Version:        0.6.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -57,6 +57,7 @@
 %setup -q
 sh bootstrap # avoid standard rpaths on lib64 archs
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
+sed -i -e 's|^BUS="|BUS=="|' etc/openct.udev
 
 
 %build
@@ -159,6 +160,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-3
+- Fix udev rules for newer udev versions (#210868).
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 18:29:17 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:29:17 -0700
Subject: rpms/pygpgme - New directory
Message-ID: <200610161829.k9GITHdV020091@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087/pygpgme

Log Message:
Directory /cvs/extras/rpms/pygpgme added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 18:29:23 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:29:23 -0700
Subject: rpms/pygpgme/devel - New directory
Message-ID: <200610161829.k9GITNQS020109@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087/pygpgme/devel

Log Message:
Directory /cvs/extras/rpms/pygpgme/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 18:29:35 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:29:35 -0700
Subject: rpms/pygpgme Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610161829.k9GITZDq020144@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20138

Added Files:
	Makefile import.log 
Log Message:
Setup of module pygpgme


--- NEW FILE Makefile ---
# Top level Makefile for module pygpgme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 16 18:29:41 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:29:41 -0700
Subject: rpms/pygpgme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610161829.k9GITfZ2020162@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20138/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pygpgme


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 16 18:30:31 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:30:31 -0700
Subject: rpms/pygpgme import.log,1.1,1.2
Message-ID: <200610161830.k9GIUVtN020280@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20216

Modified Files:
	import.log 
Log Message:
auto-import pygpgme-0.1-2 on branch devel from pygpgme-0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Oct 2006 18:29:35 -0000	1.1
+++ import.log	16 Oct 2006 18:30:01 -0000	1.2
@@ -0,0 +1 @@
+pygpgme-0_1-2:HEAD:pygpgme-0.1-2.src.rpm:1161023398



From fedora-extras-commits at redhat.com  Mon Oct 16 18:30:32 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:30:32 -0700
Subject: rpms/pygpgme/devel pygpgme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610161830.k9GIUWog020282@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20216/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pygpgme.spec 
Log Message:
auto-import pygpgme-0.1-2 on branch devel from pygpgme-0.1-2.src.rpm


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

Name:           pygpgme
Version:        0.1
Release:        2%{?dist}
Summary:        Python module for working with OpenPGP messages

Group:          Development/Languages
License:        LGPL
URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel
BuildRequires:  gpgme-devel

%description
PyGPGME is a Python module that lets you sign, verify, encrypt and decrypt
files using the OpenPGP format.  It is built on top of GNU Privacy Guard and
the GPGME library.

%prep
%setup -q

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README PKG-INFO
%{python_sitearch}/gpgme/

%changelog
* Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
- Change URL to cheeseshop

* Sun Oct 08 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial build for Fedora Extras. 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Oct 2006 18:29:41 -0000	1.1
+++ .cvsignore	16 Oct 2006 18:30:02 -0000	1.2
@@ -0,0 +1 @@
+pygpgme-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Oct 2006 18:29:41 -0000	1.1
+++ sources	16 Oct 2006 18:30:02 -0000	1.2
@@ -0,0 +1 @@
+0878d866b6ee8a98a9003a81934ecee3  pygpgme-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 18:42:12 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 11:42:12 -0700
Subject: rpms/gnubiff/devel gnubiff.spec,1.4,1.5
Message-ID: <200610161842.k9GIgCYq020398@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20366/devel

Modified Files:
	gnubiff.spec 
Log Message:
auto-import gnubiff-2.2.2-4 on branch devel from gnubiff-2.2.2-4.src.rpm


Index: gnubiff.spec
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/devel/gnubiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnubiff.spec	13 Oct 2006 19:34:56 -0000	1.4
+++ gnubiff.spec	16 Oct 2006 18:41:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:	gnubiff
 Version:	2.2.2        
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A mail notification program
 
 Group:	Applications/Internet
@@ -10,7 +10,7 @@
 Source1:	%{name}.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gamin-devel, libglade2-devel, desktop-file-utils, gnome-panel-devel, openssl-devel  
+BuildRequires: gamin-devel, libglade2-devel, desktop-file-utils, gnome-panel-devel, openssl-devel, perl-XML-Parser  
 Requires(post): /sbin/install-info    
 Requires(preun): /sbin/install-info
 
@@ -64,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Oct 15 2006 Damien Durand <splinux at fedoraproject.org> - 2.2.2-4
+- Add perl-XML-Parser in BR
+
 * Thu Oct 13 2006 Damien Durand <splinux at fedoraproject.org> - 2.2.2-3
 - Bump Release
 



From fedora-extras-commits at redhat.com  Mon Oct 16 18:42:11 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 11:42:11 -0700
Subject: rpms/gnubiff import.log,1.5,1.6
Message-ID: <200610161842.k9GIgBfI020397@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20366

Modified Files:
	import.log 
Log Message:
auto-import gnubiff-2.2.2-4 on branch devel from gnubiff-2.2.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	13 Oct 2006 19:34:56 -0000	1.5
+++ import.log	16 Oct 2006 18:41:40 -0000	1.6
@@ -2,3 +2,4 @@
 gnubiff-2_2_2-1:HEAD:gnubiff-2.2.2-1.src.rpm:1155081764
 gnubiff-2_2_2-2_fc6:HEAD:gnubiff-2.2.2-2.fc6.src.rpm:1156786285
 gnubiff-2_2_2-3:HEAD:gnubiff-2.2.2-3.src.rpm:1160768093
+gnubiff-2_2_2-4:HEAD:gnubiff-2.2.2-4.src.rpm:1161024092



From fedora-extras-commits at redhat.com  Mon Oct 16 18:47:57 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:47:57 -0700
Subject: rpms/vdr - New directory
Message-ID: <200610161847.k9GIlvIm020504@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20500/vdr

Log Message:
Directory /cvs/extras/rpms/vdr added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 18:48:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:48:03 -0700
Subject: rpms/vdr/devel - New directory
Message-ID: <200610161848.k9GIm3h1020519@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20500/vdr/devel

Log Message:
Directory /cvs/extras/rpms/vdr/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 18:48:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:48:17 -0700
Subject: rpms/vdr Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610161848.k9GImHGb020552@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20546

Added Files:
	Makefile import.log 
Log Message:
Setup of module vdr


--- NEW FILE Makefile ---
# Top level Makefile for module vdr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 16 18:48:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:48:23 -0700
Subject: rpms/vdr/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610161848.k9GImNOM020575@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20546/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdr


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 16 18:48:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:48:55 -0700
Subject: owners owners.list,1.1834,1.1835
Message-ID: <200610161848.k9GImtbf020625@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20562

Modified Files:
	owners.list 
Log Message:
Add vdr (#190343).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1834
retrieving revision 1.1835
diff -u -r1.1834 -r1.1835
--- owners.list	16 Oct 2006 15:31:45 -0000	1.1834
+++ owners.list	16 Oct 2006 18:48:25 -0000	1.1835
@@ -2252,6 +2252,7 @@
 Fedora Extras|v2strip|ID3v2 tags remover|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at beer.tclug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 16 18:51:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:51:05 -0700
Subject: rpms/vdr import.log,1.1,1.2
Message-ID: <200610161851.k9GIp5sg020770@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714

Modified Files:
	import.log 
Log Message:
auto-import vdr-1.4.3-3 on branch devel from vdr-1.4.3-3.src.rpm
Initial import (#190343).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vdr/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Oct 2006 18:48:17 -0000	1.1
+++ import.log	16 Oct 2006 18:50:34 -0000	1.2
@@ -0,0 +1 @@
+vdr-1_4_3-3:HEAD:vdr-1.4.3-3.src.rpm:1161024623



From fedora-extras-commits at redhat.com  Mon Oct 16 18:51:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:51:05 -0700
Subject: rpms/vdr/devel vdr-1.4.1-dumpable.patch, NONE,
	1.1 vdr-1.4.1-paths.patch, NONE, 1.1 vdr-1.4.3-1.diff, NONE,
	1.1 vdr-README.package, NONE, 1.1 vdr-channel+epg.patch, NONE,
	1.1 vdr-commands.conf, NONE, 1.1 vdr-config.sh, NONE,
	1.1 vdr-reccmds.conf, NONE, 1.1 vdr-runvdr.sh, NONE,
	1.1 vdr-skincurses.conf, NONE, 1.1 vdr-sky.conf, NONE,
	1.1 vdr-udev.rules, NONE, 1.1 vdr.consoleperms, NONE,
	1.1 vdr.init, NONE, 1.1 vdr.spec, NONE, 1.1 vdr.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610161851.k9GIp5U2020774@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vdr-1.4.1-dumpable.patch vdr-1.4.1-paths.patch 
	vdr-1.4.3-1.diff vdr-README.package vdr-channel+epg.patch 
	vdr-commands.conf vdr-config.sh vdr-reccmds.conf vdr-runvdr.sh 
	vdr-skincurses.conf vdr-sky.conf vdr-udev.rules 
	vdr.consoleperms vdr.init vdr.spec vdr.sysconfig 
Log Message:
auto-import vdr-1.4.3-3 on branch devel from vdr-1.4.3-3.src.rpm
Initial import (#190343).

vdr-1.4.1-dumpable.patch:

--- NEW FILE vdr-1.4.1-dumpable.patch ---
--- vdr-1.4.1/vdr.c~	2006-06-04 12:04:47.000000000 +0300
+++ vdr-1.4.1/vdr.c	2006-07-16 18:15:11.000000000 +0300
@@ -102,9 +102,9 @@
         fprintf(stderr, "vdr: cannot set user id %u: %s\n", (unsigned int)user->pw_uid, strerror(errno));
         return false;
         }
-     if (prctl(PR_SET_DUMPABLE, 2, 0, 0, 0) < 0) {
+     if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) {
         fprintf(stderr, "vdr: warning - cannot set dumpable: %s\n", strerror(errno));
-        // always non-fatal, and will not work with kernel < 2.6.13
+        // non-fatal
         }
      }
   return true;

vdr-1.4.1-paths.patch:

--- NEW FILE vdr-1.4.1-paths.patch ---
--- vdr-1.4.1/epg2html.pl.orig	2006-04-17 15:19:08.000000000 +0300
+++ vdr-1.4.1/epg2html.pl	2006-07-01 13:30:16.000000000 +0300
@@ -2,12 +2,12 @@
 
 # A simple EPG to HTML converter
 #
-# Converts the EPG data written by 'vdr' into the file /video/epg.data
+# Converts the EPG data written by 'vdr' into the file __CACHEDIR__/epg.data
 # into a simple HTML programme listing, consisting of one file per channel
 # plus an 'index.htm' file. All output files are written into the current
 # directory.
 #
-# Usage: epg2html.pl < /video/epg.data
+# Usage: epg2html.pl < __CACHEDIR__/epg.data
 #
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
--- vdr-1.4.1/PLUGINS/src/sky/README.orig	2004-02-15 14:39:19.000000000 +0200
+++ vdr-1.4.1/PLUGINS/src/sky/README	2006-07-01 13:32:17.000000000 +0300
@@ -33,7 +33,7 @@
 data for each channel can be found (see below). Copy this file to your
 plugins config directory, in a subdirectory named 'sky', as in
 
-/video/plugins/sky/channels.conf.sky
+__CONFIGDIR__/plugins/sky/channels.conf.sky
 
 The Sky EPG is available on the Internet at http://www.bleb.org.
 The Perl script getskyepg.pl extracts the EPG data from these pages
--- vdr-1.4.1/vdr.c.orig	2006-06-04 12:04:47.000000000 +0300
+++ vdr-1.4.1/vdr.c	2006-07-01 13:30:16.000000000 +0300
@@ -379,7 +379,7 @@
                "                           there may be several -D options (default: all DVB\n"
                "                           devices will be used)\n"
                "  -E FILE,  --epgfile=FILE write the EPG data into the given FILE (default is\n"
-               "                           '%s' in the video directory)\n"
+               "                           __CACHEDIR__/%s)\n"
                "                           '-E-' disables this\n"
                "                           if FILE is a directory, the default EPG file will be\n"
                "                           created in that directory\n"
@@ -549,7 +549,7 @@
         EpgDataFileName = DEFAULTEPGDATAFILENAME;
         }
      else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
-        EpgDirectory = VideoDirectory;
+        EpgDirectory = "__CACHEDIR__";
      if (EpgDirectory)
         cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
      else
--- vdr-1.4.1/newplugin.orig	2006-04-24 20:18:41.000000000 +0300
+++ vdr-1.4.1/newplugin	2006-07-01 13:30:16.000000000 +0300
@@ -24,7 +24,7 @@
 $PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
 $PLUGIN_MAINENTRY = $PLUGIN_CLASS;
 
-$PLUGINS_SRC = "PLUGINS/src";
+$PLUGINS_SRC = ".";
 
 $README = qq
 {This is a "plugin" for the Video Disk Recorder (VDR).
--- vdr-1.4.1/vdr.1.orig	2006-04-30 11:55:12.000000000 +0300
+++ vdr-1.4.1/vdr.1	2006-07-01 13:30:16.000000000 +0300
@@ -45,7 +45,7 @@
 .TP
 .BI \-c\  dir ,\ \-\-config= dir
 Read config files from directory \fIdir\fR
-(default is to read them from the video directory).
+(default is to read them from __CONFIGDIR__).
 .TP
 .B \-d, \-\-daemon
 Run in daemon mode (implies \-\-no\-kbd).
@@ -56,7 +56,7 @@
 .TP
 .BI \-E\  file ,\ \-\-epgfile= file
 Write the EPG data into the given \fIfile\fR
-(default is \fI/video/epg.data\fR).
+(default is \fI__CACHEDIR__/epg.data\fR).
 Use \fB\-E\-\fR to disable this.
 If \fIfile\fR is a directory, the file \fIepg.data\fR
 will be created in that directory.
@@ -80,7 +80,7 @@
 LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7).
 .TP
 .BI \-L\  dir ,\ \-\-lib= dir
-Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).
+Search for plugins in directory \fIdir\fR (default is __PLUGINDIR__).
 There can be several \fB\-L\fR options with different \fIdir\fR values.
 Each of them will apply to the \fB\-P\fR options following it.
 .TP
@@ -139,7 +139,7 @@
 .TP
 .BI \-v\  dir ,\ \-\-video= dir
 Use \fIdir\fR as video directory.
-The default is \fI/video\fR.
+The default is \fI__VIDEODIR__\fR.
 .TP
 .B \-V, \-\-version
 Print version information and exit.

vdr-1.4.3-1.diff:

--- NEW FILE vdr-1.4.3-1.diff ---
diff -ruN vdr-1.4.3/CONTRIBUTORS vdr-1.4.3-1/CONTRIBUTORS
--- vdr-1.4.3/CONTRIBUTORS	2006-09-16 14:14:06.000000000 +0200
+++ vdr-1.4.3-1/CONTRIBUTORS	2006-10-07 15:59:21.000000000 +0200
@@ -1468,6 +1468,8 @@
  for reporting a problem with cPlugin::ConfigDirectory() in case a plugin calls it
  from a separate thread
  for reporting that an assignment in svdrp.c didn't use the cTimer::operator=())
+ for suggesting that the function cThread::Cancel() should only set 'running' to
+ false and not actually kill the thread if the special value -1 is given
 
 Sven Kreiensen <svenk at kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1821,6 +1823,8 @@
  the Makefile to avoid a crash in case a new version is installed on a running system
  for fixing handling video directory updates in case the timestamp of the .update
  file is in the future
+ for fixing handling video directory updates in case an other process has touched the
+ .update file after the last NeedsUpdate() check
 
 Marcel Schaeben <mts280 at gmx.de>
  for his "Easy Input" patch
@@ -2003,3 +2007,11 @@
 
 Martin Ostermann <martin at familie-ostermann.de>
  for fixing processing the PDCDescriptor in 'libsi' on big endian systems
+
+Boguslaw Juza <bogdan at uci.agh.edu.pl>
+ for reporting that there are stations that use blanks in the language codes
+ for reporting that events without an ExtendedEventDescriptor may get duplicate
+ information in their ShortText through the EPG bugfixes in case they are received
+ again
+ for reporting a problem with language codes of recorded audio tracks on channels with
+ multiple tracks
diff -ruN vdr-1.4.3/HISTORY vdr-1.4.3-1/HISTORY
--- vdr-1.4.3/HISTORY	2006-09-23 15:57:19.000000000 +0200
+++ vdr-1.4.3-1/HISTORY	2006-10-08 13:28:15.000000000 +0200
@@ -4930,3 +4930,23 @@
 2006-09-23: Version 1.4.3
 
 - Official release.
+
+2006-10-08: Version 1.4.3-1
+
+- The function cThread::Cancel() now only sets 'running' to false and does not
+  actually kill the thread if the special value -1 is given (suggested by Udo Richter).
+- Changed the I18nNormalizeLanguageCode() check to also allow blanks (and all other
+  printable characters) in the language codes (thanks to Boguslaw Juza for reporting
+  that there are stations that use blanks in these codes). Blanks are replaced with
+  underlines, so that all parts of VDR that rely on language codes to be one word
+  (without blanks) work as expected.
+- Now clearing an event's Title, ShortText and Description if there is no
+  ShortEventDescriptor or ExtendedEventDescriptor, respectively (thanks to Boguslaw
+  Juza for reporting that events without an ExtendedEventDescriptor may get
+  duplicate information in their ShortText through the EPG bugfixes in case they
+  are received again).
+- Fixed handling video directory updates in case an other process has touched the
+  .update file after the last NeedsUpdate() check (thanks to Petri Hintukainen).
+- Fixed handling language codes and descriptions of recorded audio tracks on channels
+  with multiple tracks where not all of them appear in the event data (reported by
+  Boguslaw Juza).
diff -ruN vdr-1.4.3/config.h vdr-1.4.3-1/config.h
--- vdr-1.4.3/config.h	2006-09-23 15:56:08.000000000 +0200
+++ vdr-1.4.3-1/config.h	2006-09-24 12:09:25.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.271 2006/09/23 13:56:08 kls Exp $
+ * $Id: config.h 1.272 2006/09/24 10:09:25 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.3"
+#define VDRVERSION  "1.4.3-1"
 #define VDRVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff -ruN vdr-1.4.3/eit.c vdr-1.4.3-1/eit.c
--- vdr-1.4.3/eit.c	2006-08-05 12:01:21.000000000 +0200
+++ vdr-1.4.3-1/eit.c	2006-10-07 14:32:24.000000000 +0200
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider at web.de> and Rolf Hakenes <hakenes at hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg at gmx.de>.
  *
- * $Id: eit.c 1.120 2006/08/05 10:01:21 kls Exp $
+ * $Id: eit.c 1.121 2006/10/07 12:32:24 kls Exp $
  */
 
 #include "eit.h"
@@ -234,10 +234,16 @@
             pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
             pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
+         else {
+            pEvent->SetTitle(NULL);
+            pEvent->SetShortText(NULL);
+            }
          if (ExtendedEventDescriptors) {
             char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
             pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
+         else
+            pEvent->SetDescription(NULL);
          }
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
diff -ruN vdr-1.4.3/epg.c vdr-1.4.3-1/epg.c
--- vdr-1.4.3/epg.c	2006-08-05 12:04:17.000000000 +0200
+++ vdr-1.4.3-1/epg.c	2006-10-07 15:47:28.000000000 +0200
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider at web.de> and Rolf Hakenes <hakenes at hippomi.de>.
  *
- * $Id: epg.c 1.79 2006/08/05 10:04:17 kls Exp $
+ * $Id: epg.c 1.80 2006/10/07 13:47:28 kls Exp $
  */
 
 #include "epg.h"
@@ -87,7 +87,8 @@
 tComponent *cComponents::GetComponent(int Index, uchar Stream, uchar Type)
 {
   for (int i = 0; i < numComponents; i++) {
-      if (components[i].stream == Stream && components[i].type == Type) {
+      // In case of an audio stream the 'type' check actually just distinguishes between "normal" and "Dolby Digital":
+      if (components[i].stream == Stream && (Stream != 2 || (components[i].type < 5) == (Type < 5))) {
          if (!Index--)
             return &components[i];
          }
diff -ruN vdr-1.4.3/epg.h vdr-1.4.3-1/epg.h
--- vdr-1.4.3/epg.h	2006-03-25 13:39:39.000000000 +0100
+++ vdr-1.4.3-1/epg.h	2006-10-07 15:47:19.000000000 +0200
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider at web.de> and Rolf Hakenes <hakenes at hippomi.de>.
  *
- * $Id: epg.h 1.34 2006/03/25 12:39:39 kls Exp $
+ * $Id: epg.h 1.35 2006/10/07 13:47:19 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -43,6 +43,7 @@
   void SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description);
   tComponent *Component(int Index) const { return (Index < numComponents) ? &components[Index] : NULL; }
   tComponent *GetComponent(int Index, uchar Stream, uchar Type); // Gets the Index'th component of Stream and Type, skipping other components
+                                                                 // In case of an audio stream the 'type' check actually just distinguishes between "normal" and "Dolby Digital"
   };
 
 class cSchedule;
diff -ruN vdr-1.4.3/i18n.c vdr-1.4.3-1/i18n.c
--- vdr-1.4.3/i18n.c	2006-09-16 11:08:30.000000000 +0200
+++ vdr-1.4.3-1/i18n.c	2006-10-08 10:50:30.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.282 2006/09/16 09:08:30 kls Exp $
+ * $Id: i18n.c 1.284 2006/10/08 08:50:30 kls Exp $
  *
  * Translations provided by:
  *
@@ -6243,12 +6243,31 @@
 
 const char *I18nNormalizeLanguageCode(const char *Code)
 {
-  if (Code[0] && !isalnum(Code[0]) || Code[1] && !isalnum(Code[1]) || Code[2] && !isalnum(Code[2])) {
-     // ISO 639 language codes are defined as alphabetical characters, but digits are apparently
-     // also used, for instance for "2ch"
-     //dsyslog("invalid language code: '%s'", Code);
-     return "???";
-     }
+  for (int i = 0; i < 3; i++) {
+      if (Code[i]) {
+         // ETSI EN 300 468 defines language codes as consisting of three letters
+         // according to ISO 639-2. This means that they are supposed to always consist
+         // of exactly three letters in the range a-z - no digits, UTF-8 or other
+         // funny characters. However, some broadcasters apparently don't have a
+         // copy of the DVB standard (or they do, but are perhaps unable to read it),
+         // so they put all sorts of non-standard stuff into the language codes,
+         // like nonsense as "2ch" or "A 1" (yes, they even go as far as using
+         // blanks!). Such things should go into the description of the EPG event's
+         // ComponentDescriptor.
+         // So, as a workaround for this broadcaster stupidity, let's ignore
+         // language codes with unprintable characters...
+         if (!isprint(Code[i])) {
+            //dsyslog("invalid language code: '%s'", Code);
+            return "???";
+            }
+         // ...and replace blanks with underlines (ok, this breaks the 'const'
+         // of the Code parameter - but hey, it's them who started this):
+         if (Code[i] == ' ')
+            *((char *)&Code[i]) = '_';
+         }
+      else
+         break;
+      }
   int n = I18nLanguageIndex(Code);
   return n >= 0 ? I18nLanguageCode(n) : Code;
 }
diff -ruN vdr-1.4.3/recording.c vdr-1.4.3-1/recording.c
--- vdr-1.4.3/recording.c	2006-09-16 14:12:34.000000000 +0200
+++ vdr-1.4.3-1/recording.c	2006-10-07 14:46:22.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.150 2006/09/16 12:12:34 kls Exp $
+ * $Id: recording.c 1.151 2006/10/07 12:46:22 kls Exp $
  */
 
 #include "recording.h"
@@ -941,8 +941,10 @@
 
 void cRecordings::TouchUpdate(void)
 {
+  bool needsUpdate = NeedsUpdate();
   TouchFile(UpdateFileName());
-  lastUpdate = time(NULL); // make sure we don't tigger ourselves
+  if (!needsUpdate)
+     lastUpdate = time(NULL); // make sure we don't tigger ourselves
 }
 
 bool cRecordings::NeedsUpdate(void)
diff -ruN vdr-1.4.3/thread.c vdr-1.4.3-1/thread.c
--- vdr-1.4.3/thread.c	2006-08-20 12:20:44.000000000 +0200
+++ vdr-1.4.3-1/thread.c	2006-09-24 14:54:47.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.57 2006/08/20 10:20:44 kls Exp $
+ * $Id: thread.c 1.58 2006/09/24 12:54:47 kls Exp $
  */
 
 #include "thread.h"
@@ -293,7 +293,7 @@
 void cThread::Cancel(int WaitSeconds)
 {
   running = false;
-  if (active) {
+  if (active && WaitSeconds > -1) {
      if (WaitSeconds > 0) {
         for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
             if (!Active())
diff -ruN vdr-1.4.3/thread.h vdr-1.4.3-1/thread.h
--- vdr-1.4.3/thread.h	2006-01-08 12:40:23.000000000 +0100
+++ vdr-1.4.3-1/thread.h	2006-09-24 12:10:37.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.36 2006/01/08 11:40:23 kls Exp $
+ * $Id: thread.h 1.37 2006/09/24 10:10:37 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -103,6 +103,8 @@
        ///< the Action() loop can finish in an orderly fashion and then waiting
        ///< up to WaitSeconds seconds for the thread to actually end. If the
        ///< thread doesn't end by itself, it is killed.
+       ///< If WaitSeconds is -1, only 'running' is set to false and Cancel()
+       ///< returns immediately, without killing the thread.
 public:
   cThread(const char *Description = NULL);
        ///< Creates a new thread.


--- NEW FILE vdr-README.package ---
This file describes various things about the VDR contained in this
package.

Installation layout
-------------------

As usual, "rpm -ql vdr" should give a fairly good picture where things
are installed.  The goal in this package is to make file locations be
natural to people who are used to packaged software, which causes
quite a bit of deviation from the upstream layout as of 1.4.x.  Also,
as usual, "rpm -qc vdr" lists configuration files.

Configuration
-------------

First, refer to "man 5 vdr" for general upstream VDR configuration
stuff.  Then, have a look at /etc/sysconfig/vdr.  The file is fairly
well documented, and among other things, is where one should specify
command line options to VDR itself.  The standard "vdr" init script
invokes /usr/sbin/runvdr, which reads /etc/sysconfig/vdr.

The init script and the runner load per-plugin configuration files
from the /etc/sysconfig/vdr-plugins.d directory for each found plugin.
Those files are sourced shell (bash) scripts, named like
<pluginname>.conf (so eg. for plugin libvdr-foo.*,
/etc/sysconfig/vdr-plugins.d/foo.conf is loaded).  Configure command
line options for each plugin in their respective config snippets, in
the PLUGIN_OPTIONS environment variable.

Additional plugins
------------------

While there's a bunch of pre-packaged plugins available, not
everything obviously is.  The plugin rpm specfiles are pretty simple
and very close to each other, so it is recommended to use them as
examples and roll packages of extra plugins.

If you wish to compile unpackaged local plugins, first make sure that
the vdr-devel package is installed.  Then, edit the plugin's Makefile
in the dir you extracted it into, changing VDRDIR to /usr/lib/vdr, or
/usr/lib64/vdr if you have a 64-bit system.  That's about it, the rest
should be set up automatically.  "make all" (or "make all
VDRDIR=/usr/lib*/vdr" if you don't want to edit the Makefile) in the
same dir will usually build the plugin and try to copy it into VDR's
plugin directory.  You'll probably need root access for the copy to
succeed.

If the plugin needs command line options, add them to
/etc/sysconfig/vdr-plugins.d/<pluginname>.conf into PLUGIN_OPTIONS
(see previous chapter).

vdr-channel+epg.patch:

--- NEW FILE vdr-channel+epg.patch ---
--- vdr-1.3.15/menu.c.old	2004-11-19 20:54:29.000000000 +0100
+++ vdr-1.3.15/menu.c	2004-11-19 20:58:47.000000000 +0100
@@ -368,11 +368,21 @@
 void cMenuChannelItem::Set(void)
 {
   char *buffer = NULL;
+  const cEvent *Event = NULL;
   if (!channel->GroupSep()) {
+     cSchedulesLock SchedulesLock;
+     const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
+     const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+     if (Schedule) {
+       Event = Schedule->GetPresentEvent();
+     }
+
      if (sortMode == csmProvider)
-        asprintf(&buffer, "%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
+        asprintf(&buffer, "%d\t%s - %s %c%s%c", channel->Number(), channel->Provider(), channel->Name(),
+			  Event ? '(' : ' ',Event ? Event->Title() : "", Event ? ')' : ' ');
      else
-        asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
+        asprintf(&buffer, "%d\t%s %c%s%c", channel->Number(), channel->Name(),
+			  Event ? '(' : ' ',Event ? Event->Title() : "", Event ? ')' : ' ');
      }
   else
      asprintf(&buffer, "---\t%s ----------------------------------------------------------------", channel->Name());


--- NEW FILE vdr-commands.conf ---
# Main menu commands for VDR.  See the vdr(5) manual page.

# To rip audio CD's with abcde, uncomment this.  See /etc/abcde.conf (or the
# -o option) for output format and other settings, and CDDA_TRANSPORT at
# https://bugzilla.redhat.com/166141
#
#Rip audio CD?: cd /srv/audio ; env CDDA_TRANSPORT=cooked abcde -Np


--- NEW FILE vdr-config.sh ---
#!/bin/bash

case "$1" in
    --version)
        pkg-config vdr --modversion
        ;;
    --*dir|--apiversion|--user|--group)
        pkg-config vdr --variable=${1#--}
        ;;
    *)
        echo "Error: unknown option '$1'." >&2
        exit 1
        ;;
esac


--- NEW FILE vdr-reccmds.conf ---
# Recording commands for VDR.  See the vdr(5) manual page.



--- NEW FILE vdr-runvdr.sh ---
#!/bin/bash

# runvdr - VDR launcher
#
# runvdr [VDROPTION]...

VDR=/usr/sbin/vdr
PLUGINDIR=/usr/lib/vdr
PLUGINVER=VDR_PLUGIN_VERSION

prog=$(basename $0)
log()
{
    [ -x /usr/bin/logger ] && \
        /usr/bin/logger -s -pdaemon.info -t"$prog" "$1" || echo "INFO: $1"
}

plugconf()
{
    local plugin="$1" PLUGIN_OPTIONS=
    if [ -e "/etc/sysconfig/vdr-plugins.d/$plugin.conf" ] ; then
        . "/etc/sysconfig/vdr-plugins.d/$plugin.conf"
    fi
    VDR_OPTIONS[${#VDR_OPTIONS[@]}]=-P
    if [ -z "$PLUGIN_OPTIONS" ] ; then
        VDR_OPTIONS[${#VDR_OPTIONS[@]}]="$plugin"
    else
        VDR_OPTIONS[${#VDR_OPTIONS[@]}]="$plugin $PLUGIN_OPTIONS"
    fi
}

build_cmdline()
{
    local file= plugin= p= libsuf=$1
    # Add "priority" plugins.
    if [ -n "$VDR_PLUGIN_ORDER" ] ; then
        for plugin in $VDR_PLUGIN_ORDER ; do
            if [ -e $PLUGINDIR/libvdr-${plugin}.so$libsuf ] ; then
                plugconf $plugin
            fi
        done
    fi
    # Add the rest available.
    for file in $PLUGINDIR/libvdr-*.so$libsuf ; do
        plugin=`basename $file | sed -e 's/^libvdr-\(.*\)\.so.*$/\1/'`
        if [ -n "$VDR_PLUGIN_ORDER" ] ; then
            for p in $VDR_PLUGIN_ORDER ; do
                if [ "$plugin" = "$p" ] ; then
                    # Already added.
                    continue 2
                fi
            done
        fi
        if [ -e "$file" ] ; then
            plugconf "$plugin"
        fi
    done
}

reload_dvb()
{
    modules=$(/sbin/lsmod | grep ^dvb_core | awk '{ print $4 }' | tr , ' ')
    /sbin/modprobe -r $modules dvb_core
    for module in $modules ; do
        /sbin/modprobe $module
    done
}

rc=
while true ; do

    VDR_OPTIONS=()
    if [ -n "$VDR_INIT" ] ; then
        [ -f /etc/sysconfig/vdr ] && . /etc/sysconfig/vdr
        if [ -n "$DAEMON_COREFILE_LIMIT" ] ; then
            ulimit -S -c $DAEMON_COREFILE_LIMIT >/dev/null 2>&1 && cd /tmp
        fi
        build_cmdline ${PLUGINVER:+.$PLUGINVER}
    fi

    $VDR "$@" "${VDR_OPTIONS[@]}"
    rc=$?

    # 137: "kill -KILL" eg in killproc(), others: "man vdr"
    case $rc in
        0|2|137)
            log "VDR exited with status $rc, exiting"
            break
            ;;
        *)
            log "VDR exited with status $rc, attempting restart"
            reload_dvb
            ;;
    esac

done

exit $rc


--- NEW FILE vdr-skincurses.conf ---
# Configuration snippet for vdr-skincurses                           -*- sh -*-
#
# Add command line options to pass to the skincurses plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-sky.conf ---
# Configuration snippet for vdr-sky                                  -*- sh -*-
#
# Add command line options to pass to the sky plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-udev.rules ---
# VDR friendly udev rules for DVB and other devices

# See also /etc/security/console.perms.d/*-vdr.perms and
# https://bugzilla.redhat.com/202132

# DVB devices
KERNEL=="dvb*", GROUP="VDR_GROUP", MODE="0660"

# Remote controller, serial port 1 (eg. vdr --rcu=/dev/ttyS0):
#KERNEL=="ttyS0", GROUP="VDR_GROUP", MODE="0660"

# Remote controller, /dev/input/event2 (using the remote plugin):
#KERNEL=="event2", GROUP="VDR_GROUP", MODE="0660"

# Example rule for predictable event device name (/dev/input/event-remote;
# reported to work with a Hauppauge Nexus-S, "name" needs to be adjusted to
# match the device name for other remote controllers):
#SUBSYSTEM=="input", SYSFS{../name}=="DVB on-card IR receiver", SYMLINK+="input/event-remote"


--- NEW FILE vdr.consoleperms ---
# VDR friendly permissions and ownerships for various devices.  These take
# effect at boot time as well as on console logins and logouts.  See also
# /etc/udev/rules.d/*-vdr.rules and https://bugzilla.redhat.com/202132

# DVB devices:
<vdrdvb>=/dev/dvb/adapter*/*
<console>  0660 <vdrdvb>     0660 root.VDR_GROUP

# Optical drives; uncomment/adjust if you want to use them with VDR:
#<vdroptical>=/dev/cdrom* /dev/cdrw* /dev/cdwriter* /dev/dvd*
#<console>  0660 <vdroptical> 0660 root.VDR_GROUP

# Remote controller, serial port 1 (eg. vdr --rcu=/dev/ttyS0):
#<vdrremote>=/dev/ttyS0
# Remote controller, /dev/input/event2 (using the remote plugin):
#<vdrremote>=/dev/input/event2
# Remote controller using the example in /etc/udev/rules.d/*-vdr.rules:
#<vdrremote>=/dev/input/event-remote
# Uncomment this if you have any <vdrremote>s above uncommented:
#<console>  0660 <vdrremote>    0660 root.VDR_GROUP


--- NEW FILE vdr.init ---
#!/bin/bash
#
# vdr          Video Disk Recorder
#
# chkconfig:   - 30 70
# description: Video Disk Recorder (VDR) implements a complete digital \
#              set-top-box and video recorder.  It can work with signals \
#              received from satellites (DVB-S) as well as cable (DVB-C) \
#              and terrestrial (DVB-T) signals.  At least one DVB card \
#              is required to run VDR.
# processname: vdr

# Source function library.
. /etc/rc.d/init.d/functions

prog=vdr
runner=/usr/sbin/runvdr

log()
{
    [ -x /usr/bin/logger ] && \
        /usr/bin/logger -s -pdaemon.error -t"$prog" "$1" || echo "$1"
}

checkconf()
{
    cfg=/etc/vdr/channels.conf
    if [ ! -s "$cfg" ] ; then
        failure
        echo
        log $"Error: no valid $cfg found."
        log $"Use \"scandvb -o vdr\" from the dvb-apps package to create one."
        return 6
    else
        chown VDR_USER:VDR_GROUP "$cfg" && chmod 644 "$cfg"
    fi
}

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting Video Disk Recorder ($prog): "
    checkconf || return $?
    VDR_INIT=1 daemon --check=$prog "$runner >/dev/null 2>&1 &"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping Video Disk Recorder ($prog): "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart)
        $1
        ;;
    reload|force-reload)
        restart
        ;;
    status)
        status $prog
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE vdr.spec ---
# TODO, maybe some day:
# - livebuffer patch, http://www.vdr-portal.de/board/thread.php?threadid=37309
# - channelfilter patch, http://www.u32.de/vdr.html#patches
# - UTF-8 patch

%define videodir  /srv/vdr
%define audiodir  /srv/audio
%define plugindir %{_libdir}/vdr
%define configdir %{_sysconfdir}/vdr
%define datadir   %{_datadir}/vdr
%define cachedir  %{_var}/cache/vdr
%define rundir    %{_var}/run/vdr
%define vardir    %{_var}/lib/vdr
%define vdr_user  vdr
%define vdr_group video
# From APIVERSION in config.h
%define apiver    1.4.3

Name:           vdr
Version:        1.4.3
Release:        3%{?dist}
Summary:        Video Disk Recorder

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.cadsoft.de/vdr/
Source0:        ftp://ftp.cadsoft.de/vdr/%{name}-%{version}.tar.bz2
Source1:        %{name}.init
Source2:        %{name}.sysconfig
Source4:        %{name}-udev.rules
Source5:        %{name}-reccmds.conf
Source6:        %{name}-commands.conf
Source7:        %{name}-runvdr.sh
Source8:        %{name}.consoleperms
Source9:        %{name}-config.sh
Source10:       %{name}-README.package
Source11:       %{name}-skincurses.conf
Source12:       %{name}-sky.conf
Patch0:         %{name}-channel+epg.patch
Patch1:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.3-1.ds.diff.gz
Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.3-liemikuutio-1.13.diff.gz
Patch3:         %{name}-1.4.1-paths.patch
Patch4:         %{name}-1.4.1-dumpable.patch
Patch10:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.3-1.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libjpeg-devel
BuildRequires:  libcap-devel
BuildRequires:  pkgconfig
BuildRequires:  perl(File::Spec)
Requires:       udev
Requires(pre):  %{_sbindir}/groupadd
Requires(pre):  %{_sbindir}/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Provides:       vdr(abi) = %{apiver}

%description
VDR implements a complete digital set-top-box and video recorder.
It can work with signals received from satellites (DVB-S) as well as
cable (DVB-C) and terrestrial (DVB-T) signals.  At least one DVB card
is required to run VDR.

%package        devel
Summary:        Development files for VDR
Group:          Development/Libraries
Requires:       pkgconfig
Provides:       vdr-devel(api) = %{apiver}

%description    devel
%{summary}.

%package        skincurses
Summary:        Shell window skin plugin for VDR
Group:          Applications/Multimedia
%if 0%{?_with_plugins:1}
BuildRequires:  ncurses-devel
%endif
Requires:       vdr(abi) = %{apiver}

%description    skincurses
The skincurses plugin implements a VDR skin that works in a shell
window, using only plain text output.

%package        sky
Summary:        Sky Digibox plugin for VDR
Group:          Applications/Multimedia
Requires:       vdr(abi) = %{apiver}

%description    sky
The sky plugin implements a new device for VDR, which is based on the
MPEG2 encoder card described at linuxtv.org/mpeg2/kfir.xml.  It allows
you to connect the analog a/v output of your Sky Digibox to VDR, so
that you can enjoy the full recording flexibility of VDR with your Sky
subscription.  You will need a Sky Digibox and a valid subscription in
order to use this plugin.


%prep
%setup -q
%patch0 -p1
%patch1 -p1
#patch -i debian/patches/02_latin-1.dpatch
patch -i debian/patches/02_plugin_missing.dpatch
patch -i debian/patches/02_reload.dpatch
# sort_options would be nice, but it conflicts with channel+epg which is nicer
#patch -i debian/patches/02_sort_options.dpatch
#patch -i debian/patches/03_no-data_timeout.dpatch
#patch -i debian/patches/03_settime_segfault.dpatch
#patch -i debian/patches/04_cmdsubmenu.dpatch
#patch -i debian/patches/05_nissl_dvbplayer.dpatch
#patch -i debian/patches/06_recording_readonly.dpatch
patch -i debian/patches/06_recording_scan_speedup.dpatch
patch -i debian/patches/07_blockify_define.dpatch
#patch -i debian/patches/09_increase_epgscan_timeout.dpatch
patch -i debian/patches/10_livelock.dpatch
patch -i debian/patches/11_atsc.dpatch
echo "DEFINES += -DHAVE_ATSC" >> Makefile
#patch -i debian/patches/12_skinclassic_icons.dpatch
#patch -i debian/patches/15_cut_compensate_start_time.dpatch
patch -i debian/patches/19_debian_osdbase_maxitems.dpatch
#patch -i debian/patches/opt-20_epgsearch.dpatch
#patch -i debian/patches/opt-20_liemikuutio.dpatch
patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch
patch -i debian/patches/opt-20_suspend.dpatch
#patch -i debian/patches/opt-20_vdr-timer-info.dpatch
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch10 -p1

# Fix up paths
sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c
sed -i \
  -e 's|__CACHEDIR__|%{cachedir}|'   \
  -e 's|__CONFIGDIR__|%{configdir}|' \
  -e 's|__PLUGINDIR__|%{plugindir}|' \
  -e 's|__VIDEODIR__|%{videodir}|'   \
  epg2html.pl vdr.1 vdr.c PLUGINS/src/sky/README

# Fix up man page section
sed -i -e 's/\bvdr\(\s*\)(1)/vdr\1(8)/' HISTORY UPDATE-1.2.0 vdr.5
sed -i -e 's/\bvdr\([\. ]\)1\b/vdr\18/' HISTORY vdr.1

for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 ; do
  iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
done

sed -i -e 's/epg2html.pl/epg2html/' CONTRIBUTORS HISTORY epg2html.pl
sed -i -e 's/svdrpsend.pl/svdrpsend/' HISTORY
sed -i -e 's/getskyepg.pl/getskyepg/' \
  PLUGINS/src/sky/{getskyepg.pl,README,HISTORY}

cp -p %{SOURCE5} reccmds.conf
sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf
# Unfortunately these can't have comments in them, so ship 'em empty.
cat /dev/null > channels.conf
cat /dev/null > remote.conf
cat /dev/null > setup.conf
cat /dev/null > timers.conf

install -pm 644 %{SOURCE10} README.package


%build

# Intentionally not using %{version} or %{apiver} here, see %check
vdrver=$(sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$/\1/p' config.h)
apiver=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' config.h)

cat << EOF > vdr.pc
videodir=%{videodir}
audiodir=%{audiodir}
plugindir=%{plugindir}
configdir=%{configdir}
datadir=%{datadir}
cachedir=%{cachedir}
rundir=%{rundir}
vardir=%{vardir}
user=%{vdr_user}
group=%{vdr_group}
apiversion=$apiver

Name: VDR
Description: Video Disk Recorder
Version: $vdrver
EOF

cat << EOF > Make.config
CC           = %{__cc}
CXX          = %{__cxx}

ifeq (\$(RPM_OPT_FLAGS),)
  CFLAGS     = $RPM_OPT_FLAGS
  CXXFLAGS   = $RPM_OPT_FLAGS -Wall -Woverloaded-virtual
else
  CFLAGS     = \$(RPM_OPT_FLAGS)
  CXXFLAGS   = \$(RPM_OPT_FLAGS) -Wall -Woverloaded-virtual
endif
ifdef PLUGIN
  CFLAGS    += -fPIC
  CXXFLAGS  += -fPIC
endif

PLUGINLIBDIR = \$(DESTDIR)\$(shell pkg-config vdr --variable=plugindir)
VIDEODIR     = \$(DESTDIR)\$(shell pkg-config vdr --variable=videodir)
LIBDIR       = \$(PLUGINLIBDIR)

VDR_USER     = %{vdr_user}
EOF

export PKG_CONFIG_PATH=$(pwd)
make %{?_smp_mflags} all include-dir
%if 0%{?_with_plugins:1}
make %{?_smp_mflags} -C PLUGINS/src/skincurses LIBDIR=. all
make %{?_smp_mflags} -C PLUGINS/src/sky        LIBDIR=. all
%endif


%install
rm -rf $RPM_BUILD_ROOT

abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }

install -Dpm 755 vdr $RPM_BUILD_ROOT%{_sbindir}/vdr

install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -pm 755 svdrpsend.pl $RPM_BUILD_ROOT%{_bindir}/svdrpsend
install -pm 755 epg2html.pl $RPM_BUILD_ROOT%{_bindir}/epg2html

install -Dpm 644 vdr.1 $RPM_BUILD_ROOT%{_mandir}/man8/vdr.8
install -Dpm 644 vdr.5 $RPM_BUILD_ROOT%{_mandir}/man5/vdr.5

install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 644 *.conf $RPM_BUILD_ROOT%{configdir}

install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d

install -dm 755 $RPM_BUILD_ROOT%{configdir}/themes
touch $RPM_BUILD_ROOT%{configdir}/themes/{classic,sttng}-default.theme

install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/vdr
sed -i \
  -e 's|/usr/sbin/|%{_sbindir}/|'  \
  -e 's|/etc/vdr/|%{configdir}/|g' \
  -e 's|VDR_USER|%{vdr_user}|'     \
  -e 's|VDR_GROUP|%{vdr_group}|'   \
  $RPM_BUILD_ROOT%{_initrddir}/vdr

install -pm 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/runvdr
sed -i \
  -e 's|/usr/sbin/|%{_sbindir}/|'                    \
  -e 's|/etc/sysconfig/|%{_sysconfdir}/sysconfig/|g' \
  -e 's|/usr/lib/vdr\b|%{plugindir}|'                \
  -e 's|VDR_PLUGIN_VERSION|%{apiver}|'               \
  $RPM_BUILD_ROOT%{_sbindir}/runvdr

install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
sed -e 's|/usr/lib/vdr/|%{plugindir}/|' < %{SOURCE2} \
  > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr

install -dm 755 $RPM_BUILD_ROOT%{videodir}
install -dm 755 $RPM_BUILD_ROOT%{audiodir}

install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
install -dm 755 $RPM_BUILD_ROOT%{cachedir}
touch $RPM_BUILD_ROOT%{cachedir}/epg.data
install -dm 755 $RPM_BUILD_ROOT%{datadir}/logos
install -dm 755 $RPM_BUILD_ROOT%{rundir}
install -dm 755 $RPM_BUILD_ROOT%{vardir}

install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE4} \
  > $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-%{name}.rules
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules

install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d
sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE8} \
  > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/95-%{name}.perms
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/*%{name}.perms

# devel
install -Dpm 644 vdr.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vdr.pc
install -pm 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vdr-config
install -pm 755 newplugin $RPM_BUILD_ROOT%{_bindir}/vdr-newplugin
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/vdr/include/vdr
install -pm 644 Make.config $RPM_BUILD_ROOT%{_libdir}/vdr
ln -s $(abs2rel %{_includedir}/vdr/config.h %{_libdir}/vdr) \
  $RPM_BUILD_ROOT%{_libdir}/vdr
install -dm 755 $RPM_BUILD_ROOT%{_includedir}/{vdr,libsi}
install -pm 644 *.h $RPM_BUILD_ROOT%{_includedir}/vdr
install -pm 644 libsi/*.h $RPM_BUILD_ROOT%{_includedir}/libsi

# plugins
%if 0%{?_with_plugins:1}
install -pm 755 PLUGINS/src/skincurses/libvdr-skincurses.so.%{apiver} \
  $RPM_BUILD_ROOT%{plugindir}
install -pm 644 %{SOURCE11} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/skincurses.conf
install -pm 755 PLUGINS/src/sky/libvdr-sky.so.%{apiver} \
  $RPM_BUILD_ROOT%{plugindir}
install -pm 644 %{SOURCE12} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/sky.conf
install -pm 755 PLUGINS/src/sky/getskyepg.pl \
  $RPM_BUILD_ROOT%{_bindir}/getskyepg
install -Dpm 644 PLUGINS/src/sky/channels.conf.sky \
  $RPM_BUILD_ROOT%{configdir}/plugins/sky/channels.conf.sky
%endif


%check
export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_libdir}/pkgconfig
if [ "$(pkg-config vdr --variable=apiversion)" != "%{apiver}" ] ; then
    echo "ERROR: API version mismatch in vdr.pc / package / config.h" ; exit 1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%pre
%{_sbindir}/groupadd -r video 2>/dev/null || :
%{_sbindir}/useradd -c "Video Disk Recorder" -d %{videodir} \
  -g %{vdr_group} -M -n -r -s /sbin/nologin %{vdr_user} 2>/dev/null || :

%post
/sbin/chkconfig --add vdr

%preun
if [ $1 -eq 0 ] ; then
    %{_initrddir}/vdr stop >/dev/null 2>&1 || :
    /sbin/chkconfig --del vdr
fi

%postun
[ $1 -gt 0 ] && %{_initrddir}/vdr try-restart >/dev/null || :


%files
%defattr(-,root,root,-)
%doc CONTRIBUTORS COPYING HISTORY* MANUAL README* UPDATE-1.[24].0
%config(noreplace) %{_sysconfdir}/sysconfig/vdr
%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
# Temporarily not noreplace for upgrade from 1.4.1-8 due to #202132
%config %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
%config %{_sysconfdir}/sysconfig/vdr-plugins.d/
%{_initrddir}/vdr
%{_bindir}/epg2html
%{_bindir}/svdrpsend
%{_sbindir}/runvdr
%{_sbindir}/vdr
%dir %{plugindir}/
%dir %{plugindir}/bin/
%{datadir}/
%{_mandir}/man[58]/vdr.[58]*
%defattr(-,%{vdr_user},%{vdr_group},-)
%dir %{rundir}/
%dir %{vardir}/
# TODO: tighten this (root:root ownership to some files/dirs)?
%dir %{configdir}/
%dir %{configdir}/plugins/
%dir %{configdir}/themes/
%ghost %{configdir}/themes/*.theme
%config(noreplace) %{configdir}/*.conf
%dir %{videodir}/
%dir %{audiodir}/
%dir %{cachedir}/
%ghost %{cachedir}/epg.data

%files devel
%defattr(-,root,root,-)
%doc COPYING PLUGINS.html
%{_bindir}/vdr-config
%{_bindir}/vdr-newplugin
%{_includedir}/libsi/
%{_includedir}/vdr/
%{_libdir}/pkgconfig/vdr.pc
%dir %{_libdir}/vdr/
%{_libdir}/vdr/Make.config
%{_libdir}/vdr/config.h

%if 0%{?_with_plugins:1}
%files skincurses
%defattr(-,root,root,-)
%doc PLUGINS/src/skincurses/COPYING PLUGINS/src/skincurses/HISTORY
%doc PLUGINS/src/skincurses/README
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/skincurses.conf
%{plugindir}/libvdr-skincurses.so.%{apiver}

%files sky
%defattr(-,root,root,-)
%doc PLUGINS/src/sky/COPYING PLUGINS/src/sky/HISTORY
%doc PLUGINS/src/sky/README PLUGINS/src/sky/lircd.conf.sky
%{_bindir}/getskyepg
%config(noreplace) %{configdir}/plugins/sky/channels.conf.sky
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/sky.conf
%{plugindir}/libvdr-sky.so.%{apiver}
%endif

%changelog
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.3-3
- Apply upstream 1.4.3-1 maintenance patch.
- Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13.
- Drop no longer needed README.plugins.d, README.package is enough (#190343).

* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.4.3-2
- rebuilt for unwind info generation, broken in gcc-4.1.1-21

* Sat Sep 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.3-1
- 1.4.3, 1.4.2-1.ds, liemikuutio 1.12.

* Sun Sep  3 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.2-2
- 1.4.2-1, liemikuutio 1.10.

* Sun Aug 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.2-1
- 1.4.2, syscall and maintenance patches applied upstream.

* Mon Aug 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-11
- Set device permissions in both console.perms and udev (#202132).
- Implement restart and DVB module reload functionality roughly like
  upstream runvdr does it.

* Fri Aug 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-10
- Fix build with recent kernel headers where _syscallX are no longer visible.
- Drop ia64 patch (superseded by the above) and the thread poison patch.

* Fri Aug 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-9
- Set device permissions using console.perms instead of udev rules
  to work around new pam trumping udev config (#202132).

* Sun Aug  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-8
- Apply upstream 1.4.1-3 maintenance patch.

* Sun Jul 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-7
- Apply upstream 1.4.1-2 maintenance patch.
- Use VFAT compatible recording names by default.

* Sun Jul 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-6
- Don't use %%bcond_with to appease buildsys.

* Sat Jul 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-5
- Update liemikuutio patch to 1.8.
- Patch dumpability to work with PR_SET_DUMPABLE changes in recent kernels,
  add corresponding warning to sysconfig snippet comment.

* Sat Jul  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-4
- Update liemikuutio patch to 1.7.
- Conditionally build the skincurses and sky plugins; disabled by default,
  rebuild with "--with plugins" to enable.
- Make symlinks relative.

* Fri Jun 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-3
- Move headers to %%{_includedir}.
- Add README.package to docs, describing some aspects of the package (#1063).
- Add LIBDIR to Make.config to ease local plugin builds (#1063).
- Update VDR_PLUGIN_ORDER in sysconfig snippet, loading potential output
  plugins before others.  See commentary in the file for details.
- Add example how to affect OSD time/date formats to sysconfig snippet.

* Sun Jun 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-2
- 1.4.1-1 + 1.4.1-1.ds.
- Drop glibc-kernheaders dependency from -devel too.
- Make -devel multilib friendly, add pkgconfig file.

* Sun Jun 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-1
- 1.4.1, liemikuutio 1.6.

* Mon May 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-5
- Address some review notes in #190343 comment 2:
- Add example udev rule for predictable remote control device naming.
- Drop glibc-kernheaders build dependency.
- Specfile cleanups.

* Sun May 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-4
- Apply upstream 1.4.0-2 maintenance patch.

* Sun May 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-3
- Apply upstream 1.4.0-1 maintenance patch.
- Drop unneeded version check from %%check.

* Mon May  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-2
- Sync with 1.4.0-1.ds.

* Sun Apr 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-1
- 1.4.0 + 1.3.48-1.ds, re-enable reload patch.

* Sun Apr 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.48-1
- 1.3.48, no need to rebuild plugins, woo-hoo!

* Mon Apr 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.47-1
- 1.3.47 + the usual patchwork.
- Trim pre-RLO %%changelog entries.
- Add vdr(abi) and vdr-devel(api) versioned Provides for plugin versioning
  and --version and --apiversion to vdr-config, see HISTORY.
- Use sed instead of perl for edits during the build.
- Temporarily disable reload/SIGUSR1 patch.

* Sun Apr  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.46-1
- 1.3.46 + the usual patchwork.

* Sun Mar 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.45-1
- 1.3.45 + 1.3.44-2.ds + Rofa's mute fix.

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Sun Mar  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.44-0.lvn.2
- Sync with 1.3.44-1.ds, apply Rolf Ahrenberg's readline fix.

* Wed Mar  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.44-0.lvn.1
- 1.3.44, include Marko M??kel??'s suspend patch.
- Move runvdr to %%{_sbindir} and make it option-compatible with the
  upstream one.  If VDR_INIT is non-empty in the environment, automatic
  command line building is enabled.  The init script still does that.
  Also makes the init script and runvdr easier to adapt to alternative
  init systems such as initng (#781).

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Tue Feb 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.43-0.lvn.2
- Sync with 1.3.43-1.ds.

* Sun Feb 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.43-0.lvn.1
- 1.3.43 + 1.3.42-2.ds + Rolf Ahrenberg's audiotracks patch.
- Drop Reinhard Ni??l's dvbplayer patch at least for now.

* Sun Feb  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.42-0.lvn.1
- 1.3.42; dumpable, menu-in-replay and constness patches applied upstream.
- Make udev rules work as expected with later udev versions.

* Sun Jan 29 2006 Ville Skytt?? <ville.skytta at iki.fi>
- 1.3.41; Finnish, EPG null title and LIRC reconnect patches
  applied/obsoleted upstream.
- Revert back to Udo Richter's more general purpose "menu in replay" patch.

* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.40-0.lvn.3
- Patch LIRC support to try to reconnect if lircd connection is lost.
- Update liemikuutio patch to 1.2.

* Mon Jan 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.40-0.lvn.2
- Replace EPG null title crash fix with upstream one.

* Sun Jan 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.40-0.lvn.1
- 1.3.40, key macro and SVDRP CLRE crash patches applied upstream.
- Replace menu tweak patch with one from Luca Olivetti.

* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.39-0.lvn.3
- Fix sysconfig stupidity introduced in 0.lvn.2, _only_ DAEMON_COREFILE_LIMIT
  was taken into account :P

* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.39-0.lvn.2
- Apply upstream key macro and SVDRP CLRE crash patches.
- Source sysconfig snippet again in init script (so that eg.
  DAEMON_COREFILE_LIMIT etc works as expected).

* Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.39-0.lvn.1
- 1.3.39 + the usual patch shuffling, kudos to Rolf Ahrenberg and Udo
  Richter.

* Wed Jan 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.38-0.lvn.4
- Apply upstream menu fix patch.
- Add some comments to sysconfig file.

* Tue Jan 10 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.38-0.lvn.3
- Sync with 1.3.38-2.ds.

* Mon Jan  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.38-0.lvn.2
- Sync with 1.3.38-1.ds.
- Remove references to the removed ca.conf from the manpage.

* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.38-0.lvn.1
- 1.3.38, su/capabilities stuff, low disk space crash, CAN-2005-0071,
  audio pids and timed recording deletion patches applied upstream.
- Patch to allow core dumps and startup script simplifications with the
  newly introduced set[ug]id functionality.
- Patch to fix gettid usage (includes).
- enAIO patchset replaced by liemikuutio 1.0.
- Updated Finnish translations.

* Wed Jan  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.37-0.lvn.3
- Fix syntax error in sysconfig file (#714, Scott Tsai).
- Change built-in default of epg.data location to %%{cachedir}, drop it
  from the sysconfig file and update docs.

* Sat Dec 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.37-0.lvn.2
- Apply "low disk space" message crash from Andreas Brachold.
- Apply upstream fix for 2nd audio pid and live DD on encrypted channels.
- Add (commented out) sysconfig and console.perms.d samples for setting and
  retaining VDR-friendly CD/DVD drive permissions.
- Sync with 1.3.37-1.ds.

* Mon Nov 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.37-0.lvn.1
- 1.3.37.

* Sat Nov 12 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.36-0.lvn.2
- Default config improvements.
- Sync with 1.3.36-1.ds.

* Sun Nov  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.36-0.lvn.1
- 1.3.36, recording end crash fix applied upstream.
- Don't load LIRC unconditionally, pass --lirc by default in sysconfig/vdr.

* Tue Nov  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.35-0.lvn.1
- 1.3.35 + Joachim Wilke's recording end crash fix; Finnish, daemon and
  infloop patches applied upstream.

* Sun Oct 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.34-0.lvn.2
- Update enAIO patch to 2.7.
- Apply daemon and menu infinite loop patches from Enrico Scholz.

* Fri Oct  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.34-0.lvn.1
- 1.3.34 + 1.3.34-1.ds + Rolf Ahrenberg's Finnish i18n fixes.

* Sun Sep 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.33-0.lvn.1
- 1.3.33.
- Sync with 1.3.32-1.ds.
- Apply enAIO patch.

* Fri Sep 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.32-0.lvn.2
- Fix init script on multilib archs (#596, Jussi Lehtola).

* Sun Sep 11 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.32-0.lvn.1
- 1.3.32, bunch of patches applied upstream.
- Drop main package dependency from -devel.

* Sun Aug 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.31-0.lvn.1
- 1.3.31 + upstream warnings fix + Reinhard Ni??l's patch bomb.
- Ship plugin creator script in -devel.

* Mon Aug 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.30-0.lvn.2
- Don't use stuff from the su/capabilities patch by default, it causes
  problems with getting core dumps if plugins crash.
- Simplify things by splitting stuff from init script to separate launcher.
- Sync with 1.3.30-1.ds, fix a warning in the svdrp grab patch.
- Add audio CD ripping example to commands.conf.

* Sun Aug 21 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.30-0.lvn.1
- 1.3.30, PPC/unaligned patch no longer needed.
- Tune default plugin load order, add muggle.
- Minor init script improvements.

* Wed Aug 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.29-0.lvn.2
- Sync with Darren Salt's 1.3.29-1.ds.
- Drop dvbplayer patch; no longer needed for recent recordings.
- Patch/hack (from reiserfsprogs) to fix PPC build (asm/unaligned.h).
- Start up earlier/shut down later by default at boot/shutdown.
- Add vardir for storing non-cache, non-video data; and audiodir for
  audio plugins.

* Mon Aug 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.29-0.lvn.1
- 1.3.29, Finnish patch applied upstream.

* Sat Aug 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.28-1.lvn.2
- Apply Rolf Ahrenberg's newest Finnish patch.
- Drop historical conflict with an old vdr-dxr3 snapshot.

* Thu Aug 11 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.28-1.lvn.1
- Truncate config files in more portable manner during build.


--- NEW FILE vdr.sysconfig ---
# System configuration for VDR                                       -*- sh -*-

# The "master" options.  Some examples of options you may want to set
# here are -r, -s, -t, and --rcu.  See the vdr(8) man page for more info.
#
VDR_OPTIONS=(--lirc --vfat)

# VDR_PLUGIN_ORDER is a space separated list of plugins that should be
# loaded in a specific order.  This affects eg. the order the plugins'
# menu entries are displayed OSD menus by default.  The plugins in this
# list don't need to be installed, but if they are, they will be loaded
# before other possibly installed plugins.  Note that it is recommended
# to load output plugins before others so that all necessary features are
# present when needed by other plugins at startup/shutdown.
#
VDR_PLUGIN_ORDER="
dxr3
softdevice
streamdev-client
xine
xinelibout
tvonscreen
osdteletext
subtitles
osdpip
femon
sudoku
dvd
externalplayer
mplayer
mp3
muggle
burn
"

# I18N settings; VDR doesn't work with UTF-8.
#
. /etc/sysconfig/i18n 2>/dev/null || :
LANG=${LANG%.UTF-8}
LC_ALL=${LC_ALL%.UTF-8}
LC_CTYPE=${LC_CTYPE%.UTF-8}
# LC_TIME affects how dates and times are displayed.
#export LC_TIME=fi_FI

# PATH where to find the internally used executables.
#
PATH="/usr/lib/vdr/bin:$PATH"

# For debugging: allow vdr to dump core.  Note that depending on the operating
# environment, core dumps from setuid processes may be a security issue.
#DAEMON_COREFILE_LIMIT="unlimited"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Oct 2006 18:48:23 -0000	1.1
+++ .cvsignore	16 Oct 2006 18:50:35 -0000	1.2
@@ -0,0 +1,3 @@
+vdr-1.4.3-liemikuutio-1.13.diff.gz
+vdr-1.4.3.tar.bz2
+vdr_1.4.3-1.ds.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Oct 2006 18:48:23 -0000	1.1
+++ sources	16 Oct 2006 18:50:35 -0000	1.2
@@ -0,0 +1,3 @@
+ed95f0e5844816d313edcb7f7231e06a  vdr-1.4.3-liemikuutio-1.13.diff.gz
+9bb82d1f090dad746d784d147dbb0126  vdr-1.4.3.tar.bz2
+a0f1441e534715a190e4507c2f58268f  vdr_1.4.3-1.ds.diff.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 19:11:07 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 12:11:07 -0700
Subject: comps comps-fe6.xml.in,1.189,1.190
Message-ID: <200610161911.k9GJB7m6023919@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23889

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add vdr (#190343).


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- comps-fe6.xml.in	15 Oct 2006 18:57:19 -0000	1.189
+++ comps-fe6.xml.in	16 Oct 2006 19:10:36 -0000	1.190
@@ -865,6 +865,7 @@
       <packagereq type="optional">tagtool</packagereq>
       <packagereq type="optional">tclabc</packagereq>
       <packagereq type="optional">ushare</packagereq>
+      <packagereq type="optional">vdr</packagereq>
       <packagereq type="optional">wmix</packagereq>
       <packagereq type="optional">xmms</packagereq>
       <packagereq type="optional">xmms-adplug</packagereq>



From fedora-extras-commits at redhat.com  Mon Oct 16 19:14:56 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 16 Oct 2006 12:14:56 -0700
Subject: rpms/eggdrop/devel eggdrop.spec,1.3,1.4
Message-ID: <200610161914.k9GJEuTP023981@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23965

Modified Files:
	eggdrop.spec 
Log Message:
Bumped because of libdns.so



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/devel/eggdrop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eggdrop.spec	3 Sep 2006 20:42:47 -0000	1.3
+++ eggdrop.spec	16 Oct 2006 19:14:26 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
+- Rebuild
+
 * Sun Sep 03 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-2
 - Rebuild for Fedora Core 6
 



From fedora-extras-commits at redhat.com  Mon Oct 16 19:16:03 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 16 Oct 2006 12:16:03 -0700
Subject: rpms/eggdrop/FC-5 eggdrop.spec,1.3,1.4
Message-ID: <200610161916.k9GJG369024022@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24001

Modified Files:
	eggdrop.spec 
Log Message:
Bumped because of libdns.so



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-5/eggdrop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eggdrop.spec	3 Sep 2006 20:52:20 -0000	1.3
+++ eggdrop.spec	16 Oct 2006 19:15:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
+- Rebuild
+
 * Sun Sep 03 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-2
 - Rebuild for Fedora Core 6
 



From fedora-extras-commits at redhat.com  Mon Oct 16 19:16:59 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 16 Oct 2006 12:16:59 -0700
Subject: rpms/eggdrop/FC-4 eggdrop.spec,1.3,1.4
Message-ID: <200610161916.k9GJGxhK024054@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24038

Modified Files:
	eggdrop.spec 
Log Message:
Bumped because of libdns.so



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-4/eggdrop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eggdrop.spec	3 Sep 2006 20:53:08 -0000	1.3
+++ eggdrop.spec	16 Oct 2006 19:16:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
+- Rebuild
+
 * Sun Sep 03 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-2
 - Rebuild for Fedora Core 6
 



From fedora-extras-commits at redhat.com  Mon Oct 16 19:22:17 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon, 16 Oct 2006 12:22:17 -0700
Subject: rpms/scribes/devel scribes.spec,1.11,1.12
Message-ID: <200610161922.k9GJMHEA024251@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24226

Modified Files:
	scribes.spec 
Log Message:
Say it with me now: Psyco is x86-only. Pysco is x86 only. Pysco is x86-only...


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scribes.spec	16 Oct 2006 01:55:08 -0000	1.11
+++ scribes.spec	16 Oct 2006 19:21:47 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.87
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -35,7 +35,9 @@
 Requires:	gnome-python2-gtksourceview >= 2.12
 Requires:	gnome-python2-gtkspell >= 2.12
 Requires:	PyXML
+%ifarch %ix86
 Requires:	python-psyco
+%endif
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -152,9 +154,14 @@
 
 
 %changelog
+* Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-4
+- Make the python-psyco requirement an %%ifarch conditional, as it's x86-only
+- Fix line length of earlier %%changelog entry
+
 * Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-3
 - Actually fix the rpmlint issues (adding the proper %%buildroot prefix)
-- Minor aesthetic change (add trailing slash to the python directory in the %%files section)
+- Minor aesthetic change (add trailing slash to the python directory in the
+  %%files section)
 
 * Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
 - Reenable NLS build detection (accidentally dropped in the 0.2.9.87-1 update)



From fedora-extras-commits at redhat.com  Mon Oct 16 20:00:06 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 13:00:06 -0700
Subject: rpms/gdmap import.log,1.4,1.5
Message-ID: <200610162000.k9GK06PF025267@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gdmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25228

Modified Files:
	import.log 
Log Message:
auto-import gdmap-0.7.5-6 on branch devel from gdmap-0.7.5-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdmap/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	28 Aug 2006 18:37:24 -0000	1.4
+++ import.log	16 Oct 2006 19:59:36 -0000	1.5
@@ -1,3 +1,4 @@
 gdmap-0_7_5-3:HEAD:gdmap-0.7.5-3.src.rpm:1152279556
 gdmap-0_7_5-4_fc6:HEAD:gdmap-0.7.5-4.fc6.src.rpm:1154110377
 gdmap-0_7_5-5_fc6:HEAD:gdmap-0.7.5-5.fc6.src.rpm:1156790265
+gdmap-0_7_5-6:HEAD:gdmap-0.7.5-6.src.rpm:1161028768



From fedora-extras-commits at redhat.com  Mon Oct 16 20:00:07 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 13:00:07 -0700
Subject: rpms/gdmap/devel gdmap.spec,1.3,1.4
Message-ID: <200610162000.k9GK07eE025270@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gdmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25228/devel

Modified Files:
	gdmap.spec 
Log Message:
auto-import gdmap-0.7.5-6 on branch devel from gdmap-0.7.5-6.src.rpm


Index: gdmap.spec
===================================================================
RCS file: /cvs/extras/rpms/gdmap/devel/gdmap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdmap.spec	28 Aug 2006 18:37:25 -0000	1.3
+++ gdmap.spec	16 Oct 2006 19:59:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:	gdmap
 Version:	0.7.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-6
+- Bumped
+
 * Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-5
 - Bump Release
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:06:48 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 13:06:48 -0700
Subject: rpms/glipper import.log,1.4,1.5
Message-ID: <200610162006.k9GK6mBG028332@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.89-5 on branch devel from glipper-0.89-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	28 Aug 2006 18:59:57 -0000	1.4
+++ import.log	16 Oct 2006 20:06:18 -0000	1.5
@@ -1,3 +1,4 @@
 glipper-0_89-2:HEAD:glipper-0.89-2.src.rpm:1152350750
 glipper-0_89-3_fc6:HEAD:glipper-0.89-3.fc6.src.rpm:1154108800
 glipper-0_89-4_fc6:HEAD:glipper-0.89-4.fc6.src.rpm:1156791617
+glipper-0_89-5:HEAD:glipper-0.89-5.src.rpm:1161029170



From fedora-extras-commits at redhat.com  Mon Oct 16 20:06:49 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 13:06:49 -0700
Subject: rpms/glipper/devel glipper.spec,1.3,1.4
Message-ID: <200610162006.k9GK6nQt028335@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302/devel

Modified Files:
	glipper.spec 
Log Message:
auto-import glipper-0.89-5 on branch devel from glipper-0.89-5.src.rpm


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glipper.spec	28 Aug 2006 18:59:57 -0000	1.3
+++ glipper.spec	16 Oct 2006 20:06:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.89
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.89-5
+- Bumped
+
 * Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 0.89-4
 - Bump release
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:38:02 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 16 Oct 2006 13:38:02 -0700
Subject: rpms/netlabel_tools/devel netlabel, NONE, 1.1 netlabel.rules, NONE, 
	1.1 netlabel_tools.spec, 1.3, 1.4
Message-ID: <200610162038.k9GKc2Lb028561@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28543

Modified Files:
	netlabel_tools.spec 
Added Files:
	netlabel netlabel.rules 
Log Message:
* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
- Add upstream patch.



--- NEW FILE netlabel ---
#!/bin/sh
#
# netlabel	Start CIPSO labeled networking
#
# chkconfig: - 09 91
# description:	Starts and stops CIPSO labeled networking
#
# config: /etc/netlabel.rules
#
# Return values according to LSB for all commands but status:
# 0 - success
# 1 - generic or unspecified error
# 2 - invalid or excess argument(s)
# 3 - unimplemented feature (e.g. "reload")
# 4 - insufficient privilege
# 5 - program is not installed
# 6 - program is not configured
# 7 - program is not running

PATH=/sbin:/bin:/usr/bin:/usr/sbin
VAR_SUBSYS_NETLABEL=/var/lock/subsys/netlabel
RULES=/etc/netlabel.rules

# Source function library.
. /etc/init.d/functions

# Check that we are root ... so non-root users stop here
test `id -u` = 0  || exit 4
test -x /sbin/netlabelctl || exit 5
test -f $RULES || exit 6

start() {
    ret_val="0"

    # Loop through rules
    while read LINE
    do
	# Skip comments and blank lines
	if echo $LINE | egrep '^#|^$' >/dev/null ; then
		continue
	fi
	/sbin/netlabelctl $LINE >/dev/null 2>&1
	ret="$?"
	if [ "$ret" != "0" ] ; then
		ret_val="$ret"
	fi
    done < $RULES
    touch $VAR_SUBSYS_NETLABEL
    return $ret_val
}

stop() {
    rm -f $VAR_SUBSYS_NETLABEL

    # Delete rules
    list=`/sbin/netlabelctl cipsov4 list 2>/dev/null`
    ret="$?"
    if [ x"$list" != "x" ] ; then
	for line in "$list"
	do
		/sbin/netlabelctl cipsov4 del "doi:$line" 2>/dev/null
    		ret="$?"
	done
    fi
    return $ret
}

status() {
    # Do not print status if lockfile is missing 
    if [ ! -f "$VAR_SUBSYS_NETLABEL" ]; then
	echo $"Netlabel is stopped."
	return 7
    fi

    # List rules
    /sbin/netlabelctl -p cipsov4 list 2>/dev/null
    ret1="$?"
    /sbin/netlabelctl -p mgmt list 2>/dev/null
    ret2="$?"

    if [ "$ret1" != "0" -o "$ret2" != "0" ] ; then
	return 1
    fi
    return 0
}

restart() {
    stop
    start
}

case "$1" in
    start)
	stop
	start
	RETVAL="$?"
	;;
    stop)
	stop
	RETVAL="$?"
	;;
    restart)
	restart
	RETVAL="$?"
	;;
    condrestart)
	[ -e "$VAR_SUBSYS_NETLABEL" ] && restart
	;;
    status)
	status
	RETVAL="$?"
	;;
    *)
	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	exit 3
	;;
esac

exit $RETVAL


--- NEW FILE netlabel.rules ---
# This file contains the rules for the Netlabel subsystem
# Each line contains just the arguments to the netlabel command

# creates a CIPSO/IPv4 definition using a DOI value of 1
cipsov4 add std doi:1 tags:1 levels:0=0,1=1,2=2 categories:0=0,1=1,2=2

# tell the NetLabel system to use this CIPSO/IPv4 defintion by default
mgmt add default protocol:cipsov4,1



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netlabel_tools.spec	2 Oct 2006 00:28:43 -0000	1.3
+++ netlabel_tools.spec	16 Oct 2006 20:37:32 -0000	1.4
@@ -4,14 +4,18 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}
 Source0: %{home_base_url}/%{name}-%{version}.tar.gz
-Patch: netlabel_tools-0.17-new-hdrs.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kernel-headers, libnl-devel
+Source1: netlabel
+Source2: netlabel.rules
+Patch1: netlabel_tools-0.17-new-hdrs.patch
+Patch2: netlabel_tools-27_28.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRequires: kernel-headers >= 2.6.18
+BuildRequires: libnl-devel
 
 %description
 NetLabel is a kernel subsystem which implements explicit packet labeling
@@ -23,7 +27,10 @@
 %prep 
 %setup -q -n %{name}-%{version}
 
-%patch -p1
+# Build fixes.
+%patch1 -p1
+# Upstream patch.
+%patch2 -p1
 
 %build
 # Don't use _smp_mflags, it's small and a hand crafted Makefile
@@ -34,6 +41,9 @@
 make INSTALL_PREFIX=${RPM_BUILD_ROOT} \
      INSTALL_MAN_DIR=${RPM_BUILD_ROOT}/usr/share/man \
      install
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
+install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/
+install -m 0640 %{SOURCE2} $RPM_BUILD_ROOT/etc/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,9 +52,17 @@
 %defattr(-,root,root)
 %doc docs/*.txt
 %attr(0755,root,root) /sbin/*
+%attr(0755,root,root) /etc/rc.d/init.d/netlabel
+%config(noreplace) %attr(640,root,root) /etc/netlabel.rules
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
+- Add upstream patch.
+
+* Sat Oct 14 2006 Steve Grubb <sgrubb at redhat.com> - 0.17-3
+- Add init scripts and default rules
+
 * Sun Oct  1 2006 James Antill <james at and.org> - 0.17-2
 - Upgrade to latest upstream.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:43:21 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 16 Oct 2006 13:43:21 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools-27_28.patch,NONE,1.1
Message-ID: <200610162043.k9GKhLUJ028627@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28620

Added Files:
	netlabel_tools-27_28.patch 
Log Message:
* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
- Add upstream patch.


netlabel_tools-27_28.patch:

--- NEW FILE netlabel_tools-27_28.patch ---
Index: netlabelctl/cipsov4.c
===================================================================
--- netlabelctl/cipsov4.c	(revision 27)
+++ netlabelctl/cipsov4.c	(revision 28)
@@ -236,7 +236,7 @@
 	printf("STANDARD");
 	break;
       case CIPSO_V4_MAP_PASS:
-	printf("PASS_THROUGH\n");
+	printf("PASS_THROUGH");
 	break;
       default:
 	printf("UNKNOWN(%u)", mtype_list[iter]);
Index: netlabelctl/map.c
===================================================================
--- netlabelctl/map.c	(revision 27)
+++ netlabelctl/map.c	(revision 28)
@@ -224,8 +224,10 @@
         printf("UNKNOWN(%u)", domain_p[iter].proto_type);
         break;
       }
-      printf(" ");
+      if (iter + 1 < count)
+	printf(" ");
     }
+    printf("\n");
   }
 
  list_return:



From fedora-extras-commits at redhat.com  Mon Oct 16 20:45:14 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 16 Oct 2006 13:45:14 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools.spec,1.4,1.5
Message-ID: <200610162045.k9GKjEm8028697@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28676

Modified Files:
	netlabel_tools.spec 
Log Message:
* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
- Add upstream patch.



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netlabel_tools.spec	16 Oct 2006 20:37:32 -0000	1.4
+++ netlabel_tools.spec	16 Oct 2006 20:44:43 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}



From fedora-extras-commits at redhat.com  Mon Oct 16 20:49:50 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 16 Oct 2006 13:49:50 -0700
Subject: rpms/blender/devel blender.spec,1.31,1.32
Message-ID: <200610162049.k9GKnoCw028777@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28761

Modified Files:
	blender.spec 
Log Message:
/usr/lib/blender should own by blender


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- blender.spec	11 Oct 2006 20:27:26 -0000	1.31
+++ blender.spec	16 Oct 2006 20:49:20 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -156,10 +156,13 @@
 %{_datadir}/applications/fedora-blender.desktop
 %{_datadir}/pixmaps/*.png
 %{blenderlib}/
-%{plugins}/
+%{_libdir}/blender/
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-4
+- /usr/lib/blender should own by the package
+
 * Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-3
 - Correct invalid locale paths (#210209)
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:51:52 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 16 Oct 2006 13:51:52 -0700
Subject: rpms/blender/FC-5 blender.spec,1.30,1.31
Message-ID: <200610162051.k9GKpqSK028839@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28823

Modified Files:
	blender.spec 
Log Message:
/usr/lib/blender should own by blender


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-5/blender.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- blender.spec	11 Oct 2006 20:24:23 -0000	1.30
+++ blender.spec	16 Oct 2006 20:51:22 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -26,7 +26,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  esound-devel
 BuildRequires:  freeglut-devel
-BuildRequires:  gettext
+BuildRequires:  gettext-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libogg-devel
 BuildRequires:  libpng-devel
@@ -69,7 +69,7 @@
 # Don't use $RPM_OPT_FLAGS (see #199418)
 #
 
-scons %{?_smp_mflags} blenderplayer BF_QUIET=0 
+scons %{?_smp_mflags} blenderplayer BF_QUIET=0
 
 install -d release/plugins/include
 install -m 644 source/blender/blenpluginapi/*.h release/plugins/include
@@ -100,7 +100,7 @@
 
 pushd bin/.blender/locale
 mv pt_br pt_BR
-mv zh_cn zh_CN
+mv zh_cn uh_CN
 popd
 
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
@@ -156,22 +156,31 @@
 %{_datadir}/applications/fedora-blender.desktop
 %{_datadir}/pixmaps/*.png
 %{blenderlib}/
-%{plugins}/
+%{_libdir}/blender/
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-4
+- /usr/lib/blender should own by the package
+
 * Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-3
 - Correct invalid locale paths (#210209)
 
-* Sun Sep 17 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-2.1
-- Rebuilt to solve broken update deps
-
 * Wed Sep 13 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-2
-- Update to new upstream version
+- Update to new upstream release
 
-* Thu Aug 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-6
+* Tue Sep 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-10
+- Rebuild to solve broken deps
+
+* Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-9
+- Rebuild for FC-6
+
+* Thu Aug 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-7
 - Remove %%ghost for pyo files for fullfilling new packaging guidelines
 
+* Thu Aug 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-6
+- Rebuilt to solve broken deps
+
 * Wed Jul 26 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-5
 - Fix symlink in blender-wrapper to locale
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:55:29 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 16 Oct 2006 13:55:29 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools.spec,1.5,1.6
Message-ID: <200610162055.k9GKtTQh028914@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28860

Modified Files:
	netlabel_tools.spec 
Log Message:
* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
- Add upstream patch.
- s/p1/p0/ for upstream patch.



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netlabel_tools.spec	16 Oct 2006 20:44:43 -0000	1.5
+++ netlabel_tools.spec	16 Oct 2006 20:54:59 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}
@@ -30,7 +30,7 @@
 # Build fixes.
 %patch1 -p1
 # Upstream patch.
-%patch2 -p1
+%patch2 -p0
 
 %build
 # Don't use _smp_mflags, it's small and a hand crafted Makefile
@@ -59,6 +59,7 @@
 %changelog
 * Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
 - Add upstream patch.
+- s/p1/p0/ for upstream patch.
 
 * Sat Oct 14 2006 Steve Grubb <sgrubb at redhat.com> - 0.17-3
 - Add init scripts and default rules



From fedora-extras-commits at redhat.com  Mon Oct 16 21:06:02 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 16 Oct 2006 14:06:02 -0700
Subject: rpms/gpgme03/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE gpgme-0.3.16-macro.patch, 1.1,
	NONE gpgme-0.3.16-relocate.patch, 1.1,
	NONE gpgme-0.3.16-select.patch, 1.1,
	NONE gpgme-0.3.16-underquoted.patch, 1.1, NONE gpgme03.spec,
	1.15, NONE sources, 1.2, NONE
Message-ID: <200610162106.k9GL6296031904@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gpgme03/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31898/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gpgme-0.3.16-macro.patch 
	gpgme-0.3.16-relocate.patch gpgme-0.3.16-select.patch 
	gpgme-0.3.16-underquoted.patch gpgme03.spec sources 
Log Message:
mark dead


--- NEW FILE dead.package ---
2006-10-16 : no other package in FE needs this anymore


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gpgme-0.3.16-macro.patch DELETED ---


--- gpgme-0.3.16-relocate.patch DELETED ---


--- gpgme-0.3.16-select.patch DELETED ---


--- gpgme-0.3.16-underquoted.patch DELETED ---


--- gpgme03.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 21:09:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Oct 2006 14:09:56 -0700
Subject: rpms/R/FC-5 R.spec,1.16,1.17 sources,1.9,1.10
Message-ID: <200610162109.k9GL9uPK032045@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31980/FC-5

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.4.0



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/R.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- R.spec	3 Jun 2006 22:47:01 -0000	1.16
+++ R.spec	16 Oct 2006 21:09:26 -0000	1.17
@@ -1,5 +1,5 @@
 Name: R
-Version: 2.3.1
+Version: 2.4.0
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -8,7 +8,7 @@
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gfortran
-BuildRequires: gcc-c++, tetex-latex, texinfo 
+BuildRequires: gcc-c++, tetex-latex, texinfo
 BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel
 BuildRequires: tcl-devel, tk-devel
 BuildRequires: blas >= 3.0, pcre-devel, zlib-devel
@@ -22,14 +22,14 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = %{version}
-Provides: R-cluster = 1.11.0
+Provides: R-cluster = 1.11.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
-Provides: R-lattice = 0.13
+Provides: R-lattice = 0.14
 Provides: R-MASS = %{version}
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
@@ -40,7 +40,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.26
+Provides: R-survival = 2.29
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -219,7 +219,13 @@
 /sbin/ldconfig
 
 %changelog
-* Sat Jun  3 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-1
+* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump for 2.4.0
+
+* Wed Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-2
+- bump for FC-6
+
+* Fri Jun  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-1
 - bump to 2.3.1
 
 * Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
@@ -228,6 +234,9 @@
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-5
+- now BR is texinfo-tex, not texinfo in rawhide
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-4
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jun 2006 22:47:01 -0000	1.9
+++ sources	16 Oct 2006 21:09:26 -0000	1.10
@@ -1 +1 @@
-a1d6d8081af4c71006a6e5a3ed54e4da  R-2.3.1.tar.gz
+f32379469d8712e9f5dd6435d30127d3  R-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 21:09:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Oct 2006 14:09:57 -0700
Subject: rpms/R/devel .cvsignore,1.8,1.9 R.spec,1.18,1.19 sources,1.9,1.10
Message-ID: <200610162109.k9GL9vsD032050@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31980/devel

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

Bump to 2.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/R/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jun 2006 22:47:02 -0000	1.8
+++ .cvsignore	16 Oct 2006 21:09:27 -0000	1.9
@@ -5,3 +5,4 @@
 R-2.2.1.tar.gz
 R-2.3.0.tar.gz
 R-2.3.1.tar.gz
+R-2.4.0.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- R.spec	13 Sep 2006 21:45:09 -0000	1.18
+++ R.spec	16 Oct 2006 21:09:27 -0000	1.19
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.3.1
-Release: 2%{?dist}
+Version: 2.4.0
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -22,14 +22,14 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = %{version}
-Provides: R-cluster = 1.11.0
+Provides: R-cluster = 1.11.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
-Provides: R-lattice = 0.13
+Provides: R-lattice = 0.14
 Provides: R-MASS = %{version}
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
@@ -40,7 +40,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.26
+Provides: R-survival = 2.29
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump for 2.4.0
+
 * Wed Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-2
 - bump for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jun 2006 22:47:02 -0000	1.9
+++ sources	16 Oct 2006 21:09:27 -0000	1.10
@@ -1 +1 @@
-a1d6d8081af4c71006a6e5a3ed54e4da  R-2.3.1.tar.gz
+f32379469d8712e9f5dd6435d30127d3  R-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 21:26:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 16 Oct 2006 14:26:26 -0700
Subject: rpms/abcMIDI/devel .cvsignore, 1.9, 1.10 abcMIDI.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610162126.k9GLQQZo032282@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32245/devel

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061015


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Oct 2006 21:17:50 -0000	1.9
+++ .cvsignore	16 Oct 2006 21:25:56 -0000	1.10
@@ -1 +1 @@
-abcMIDI-2006-10-05.zip
+abcMIDI-2006-10-15.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcMIDI.spec	9 Oct 2006 21:17:50 -0000	1.10
+++ abcMIDI.spec	16 Oct 2006 21:25:56 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061005
-Release:        2%{?dist}
+Version:        20061015
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-05.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
+- new version 20061015
+
 * Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061005-1
 - new version 20061005
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Oct 2006 21:17:50 -0000	1.9
+++ sources	16 Oct 2006 21:25:56 -0000	1.10
@@ -1 +1 @@
-ddcee30163fecd9fbc4fbb72a934b4fa  abcMIDI-2006-10-05.zip
+747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip



From fedora-extras-commits at redhat.com  Mon Oct 16 21:26:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 16 Oct 2006 14:26:26 -0700
Subject: rpms/abcMIDI/FC-5 abcMIDI.spec,1.8,1.9
Message-ID: <200610162126.k9GLQQfm032277@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32245/FC-5

Modified Files:
	abcMIDI.spec 
Log Message:
new version 20061015


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcMIDI.spec	9 Oct 2006 21:17:49 -0000	1.8
+++ abcMIDI.spec	16 Oct 2006 21:25:55 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061005
-Release:        2%{?dist}
+Version:        20061015
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-05.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
+- new version 20061015
+
 * Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061005-1
 - new version 20061005
 



From fedora-extras-commits at redhat.com  Mon Oct 16 21:44:55 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 16 Oct 2006 14:44:55 -0700
Subject: rpms/abcMIDI/FC-5 .cvsignore, 1.9, 1.10 abcMIDI.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200610162144.k9GLitIB032486@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32466/FC-5

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061015


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Oct 2006 21:17:49 -0000	1.9
+++ .cvsignore	16 Oct 2006 21:44:25 -0000	1.10
@@ -1 +1 @@
-abcMIDI-2006-10-05.zip
+abcMIDI-2006-10-15.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcMIDI.spec	16 Oct 2006 21:25:55 -0000	1.9
+++ abcMIDI.spec	16 Oct 2006 21:44:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           abcMIDI
 Version:        20061015
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Oct 2006 21:17:49 -0000	1.9
+++ sources	16 Oct 2006 21:44:25 -0000	1.10
@@ -1 +1 @@
-ddcee30163fecd9fbc4fbb72a934b4fa  abcMIDI-2006-10-05.zip
+747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip



From fedora-extras-commits at redhat.com  Mon Oct 16 21:09:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Oct 2006 14:09:55 -0700
Subject: rpms/R/FC-4 R.spec,1.16,1.17 sources,1.9,1.10
Message-ID: <200610162109.k9GL9tGY032041@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31980/FC-4

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.4.0



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- R.spec	3 Jun 2006 22:47:01 -0000	1.16
+++ R.spec	16 Oct 2006 21:09:25 -0000	1.17
@@ -1,5 +1,5 @@
 Name: R
-Version: 2.3.1
+Version: 2.4.0
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -22,14 +22,14 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = %{version}
-Provides: R-cluster = 1.11.0
+Provides: R-cluster = 1.11.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
-Provides: R-lattice = 0.13
+Provides: R-lattice = 0.14
 Provides: R-MASS = %{version}
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
@@ -40,7 +40,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.26
+Provides: R-survival = 2.29
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -226,6 +226,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump for 2.4.0
+
 * Sat Jun  3 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-1
 - bump to 2.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jun 2006 22:47:01 -0000	1.9
+++ sources	16 Oct 2006 21:09:25 -0000	1.10
@@ -1 +1 @@
-a1d6d8081af4c71006a6e5a3ed54e4da  R-2.3.1.tar.gz
+f32379469d8712e9f5dd6435d30127d3  R-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 22:36:31 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 16 Oct 2006 15:36:31 -0700
Subject: rpms/torque/devel torque.spec,1.14,1.15
Message-ID: <200610162236.k9GMaUV0003246@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3229

Modified Files:
	torque.spec 
Log Message:
correct unowned directories


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- torque.spec	12 Oct 2006 19:50:10 -0000	1.14
+++ torque.spec	16 Oct 2006 22:36:00 -0000	1.15
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.3
 #%%define snap 200604251602
-%define release 2
+%define release 3
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -199,6 +199,7 @@
 %doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
 %{torquehomedir}/aux
 %{torquehomedir}/spool
 
@@ -288,7 +289,7 @@
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
 %endif
-%{torquehomedir}/mom_priv/*
+%{torquehomedir}/mom_priv
 %{torquehomedir}/mom_logs
 %{torquehomedir}/checkpoint
 %{torquehomedir}/undelivered
@@ -401,6 +402,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
+- correct unowned directories
+
 * Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
 - missing BR ncurses-devel and readline-devel
 



From fedora-extras-commits at redhat.com  Mon Oct 16 22:39:18 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 16 Oct 2006 15:39:18 -0700
Subject: rpms/nethack/devel nethack.spec,1.15,1.16
Message-ID: <200610162239.k9GMdIfD003329@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3309

Modified Files:
	nethack.spec 
Log Message:
* Mon Oct 16 2006 Luke Macken <lmacken at redhat.com> 3.4.3-12
- Own /usr/games/nethack-3.4.3




Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nethack.spec	3 Sep 2006 18:56:59 -0000	1.15
+++ nethack.spec	16 Oct 2006 22:38:48 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -118,12 +118,7 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
-%{nhgamedir}/NetHack.ad
-%{nhgamedir}/pet_mark.xbm
-%{nhgamedir}/rip.xpm
-%{nhgamedir}/x11tiles
-%{nhgamedir}/fonts/
-%{nhgamedir}/license
+%{nhgamedir}
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -134,6 +129,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Luke Macken <lmacken at redhat.com> 3.4.3-12
+- Own /usr/games/nethack-3.4.3
+
 * Sun Sep  3 2006 Luke Macken <lmacken at redhat.com> 3.4.3-11
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Mon Oct 16 22:40:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 15:40:31 -0700
Subject: rpms/cpanspec/devel .cvsignore, 1.12, 1.13 cpanspec.spec, 1.13,
	1.14 sources, 1.12, 1.13
Message-ID: <200610162240.k9GMeVQr003400@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3374

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Oct 2006 18:25:03 -0000	1.12
+++ .cvsignore	16 Oct 2006 22:40:01 -0000	1.13
@@ -1 +1 @@
-cpanspec-1.69.tar.gz
+cpanspec-1.69.1.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cpanspec.spec	3 Oct 2006 18:25:03 -0000	1.13
+++ cpanspec.spec	16 Oct 2006 22:40:01 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.69
+Version:        1.69.1
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -52,6 +52,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1.69.1-1
+- Update to 1.69.1.
+
 * Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
 - Update to 1.69.
 - Use _fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Oct 2006 18:25:03 -0000	1.12
+++ sources	16 Oct 2006 22:40:01 -0000	1.13
@@ -1 +1 @@
-ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz
+55ee5ad9c67feb428a86c57b495c5f1e  cpanspec-1.69.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 22:42:35 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 15:42:35 -0700
Subject: rpms/cpanspec/FC-5 .cvsignore, 1.12, 1.13 cpanspec.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <200610162242.k9GMgZ2l003481@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3454

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Oct 2006 18:27:35 -0000	1.12
+++ .cvsignore	16 Oct 2006 22:42:05 -0000	1.13
@@ -1 +1 @@
-cpanspec-1.69.tar.gz
+cpanspec-1.69.1.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpanspec.spec	3 Oct 2006 18:27:35 -0000	1.12
+++ cpanspec.spec	16 Oct 2006 22:42:05 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.69
+Version:        1.69.1
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -52,6 +52,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1.69.1-1
+- Update to 1.69.1.
+
 * Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
 - Update to 1.69.
 - Use _fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Oct 2006 18:27:35 -0000	1.12
+++ sources	16 Oct 2006 22:42:05 -0000	1.13
@@ -1 +1 @@
-ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz
+55ee5ad9c67feb428a86c57b495c5f1e  cpanspec-1.69.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 22:44:02 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 16 Oct 2006 15:44:02 -0700
Subject: rpms/nethack/FC-5 nethack.spec,1.13,1.14
Message-ID: <200610162244.k9GMi2Hq003575@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3538

Modified Files:
	nethack.spec 
Log Message:
* Mon Oct 16 2006 Luke Macken <lmacken at redhat.com> 3.4.3-12
- Own /usr/games/nethack-3.4.3
- Remove $RPM_BUILD_ROOT from %post (Bug #188008)




Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/FC-5/nethack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nethack.spec	15 Feb 2006 21:54:07 -0000	1.13
+++ nethack.spec	16 Oct 2006 22:43:31 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -101,7 +101,7 @@
         $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
 
 %post
-mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
+mkfontdir %{nhgamedir}/fonts
 
 
 %clean
@@ -118,12 +118,7 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
-%{nhgamedir}/NetHack.ad
-%{nhgamedir}/pet_mark.xbm
-%{nhgamedir}/rip.xpm
-%{nhgamedir}/x11tiles
-%{nhgamedir}/fonts/
-%{nhgamedir}/license
+%{nhgamedir}
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -134,6 +129,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Luke Macken <lmacken at redhat.com> 3.4.3-12
+- Own /usr/games/nethack-3.4.3
+- Remove $RPM_BUILD_ROOT from %post (Bug #188008)
+
 * Wed Feb 15 2006 Luke Macken <lmacken at redhat.com> 3.4.3-9
 - Add nethack-3.4.3-guidebook.patch to fix issues with generating the Guidebook
   (this patch also removes the need for our groff dep)



From fedora-extras-commits at redhat.com  Mon Oct 16 22:44:30 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 15:44:30 -0700
Subject: rpms/cpanspec/FC-4 .cvsignore, 1.12, 1.13 cpanspec.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <200610162244.k9GMiUVo003619@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3557

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Oct 2006 18:28:08 -0000	1.12
+++ .cvsignore	16 Oct 2006 22:44:00 -0000	1.13
@@ -1 +1 @@
-cpanspec-1.69.tar.gz
+cpanspec-1.69.1.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpanspec.spec	3 Oct 2006 18:28:08 -0000	1.12
+++ cpanspec.spec	16 Oct 2006 22:44:00 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.69
+Version:        1.69.1
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -52,6 +52,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1.69.1-1
+- Update to 1.69.1.
+
 * Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
 - Update to 1.69.
 - Use _fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Oct 2006 18:28:08 -0000	1.12
+++ sources	16 Oct 2006 22:44:00 -0000	1.13
@@ -1 +1 @@
-ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz
+55ee5ad9c67feb428a86c57b495c5f1e  cpanspec-1.69.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 22:51:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 15:51:20 -0700
Subject: rpms/perl-BerkeleyDB/devel .cvsignore, 1.6, 1.7 perl-BerkeleyDB.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200610162251.k9GMpKh2003705@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-BerkeleyDB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685

Modified Files:
	.cvsignore perl-BerkeleyDB.spec sources 
Log Message:
Update to 0.31.
Use fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Sep 2006 19:46:04 -0000	1.6
+++ .cvsignore	16 Oct 2006 22:50:50 -0000	1.7
@@ -1 +0,0 @@
-BerkeleyDB-0.30.tar.gz


Index: perl-BerkeleyDB.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-BerkeleyDB.spec	13 Sep 2006 19:46:04 -0000	1.12
+++ perl-BerkeleyDB.spec	16 Oct 2006 22:50:50 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-BerkeleyDB
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Perl extension for Berkeley DB version 2, 3 or 4
 License:        GPL or Artistic
@@ -39,7 +39,7 @@
 find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -56,6 +56,10 @@
 %{_bindir}/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.31-1
+- Update to 0.31.
+- Use fixperms macro instead of our own chmod incantation.
+
 * Wed Sep 13 2006 Steven Pritchard <steve at kspei.com> 0.30-1
 - Update to 0.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Sep 2006 19:46:04 -0000	1.6
+++ sources	16 Oct 2006 22:50:50 -0000	1.7
@@ -1 +0,0 @@
-031fd10471a8f2bf9ba84a4571ecd2fe  BerkeleyDB-0.30.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 23:20:42 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Oct 2006 16:20:42 -0700
Subject: rpms/contact-lookup-applet/devel .cvsignore, 1.8,
	1.9 contact-lookup-applet.spec, 1.19, 1.20 sources, 1.8,
	1.9 contact-lookup-applet-0.14-api.patch, 1.1, NONE
Message-ID: <200610162320.k9GNKgsV006993@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6972

Modified Files:
	.cvsignore contact-lookup-applet.spec sources 
Removed Files:
	contact-lookup-applet-0.14-api.patch 
Log Message:
* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
- Update to 0.15.
- Drop evolution api change patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 May 2006 18:46:32 -0000	1.8
+++ .cvsignore	16 Oct 2006 23:20:11 -0000	1.9
@@ -1 +1 @@
-contact-lookup-applet-0.14.tar.gz
+contact-lookup-applet-0.15.tar.gz


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- contact-lookup-applet.spec	17 Sep 2006 18:11:50 -0000	1.19
+++ contact-lookup-applet.spec	16 Oct 2006 23:20:11 -0000	1.20
@@ -1,13 +1,12 @@
 Name:		contact-lookup-applet
-Version:	0.14
-Release:	4%{?dist}
+Version:	0.15
+Release:	1%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
 License:	GPL
 URL:		http://www.burtonini.com/blog//computers/contact-lookup-applet-0.13
 Source0:	http://www.burtonini.com/computing/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}-api.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnome-panel-devel >= 2.9.4
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .photo
 
 
 %build
@@ -53,6 +51,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
+- Update to 0.15.
+- Drop evolution api change patch.
+
 * Sun Sep 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-4
 - Rebuild for FC6.
 - Add patch to fix build due to EContactPhoto API change.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 May 2006 18:46:32 -0000	1.8
+++ sources	16 Oct 2006 23:20:11 -0000	1.9
@@ -1 +1 @@
-53b7d3a55ce7f50dae06f2c896cb1677  contact-lookup-applet-0.14.tar.gz
+752272faae5f2e24be554627b1e95a8c  contact-lookup-applet-0.15.tar.gz


--- contact-lookup-applet-0.14-api.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 23:27:32 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 16 Oct 2006 16:27:32 -0700
Subject: status-report-scripts dircheck,NONE,1.1
Message-ID: <200610162327.k9GNRWaJ007114@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7089

Added Files:
	dircheck 
Log Message:
Add first-pass hack to find multiply-owned and unowned directories.



--- NEW FILE dircheck ---
#!/usr/bin/perl -w
#use strict 'vars';
use Getopt::Long;
use XML::Simple;
use XML::Twig;
use Data::Dumper;

my @checkfiles;
my @loadfiles;
our($verbose, $multiply, $unowned);

our %dirs;
our %files;

GetOptions('check=s' => \@checkfiles,
#       'load=s' => \@loadfiles,
       'verbose' => \$verbose,
       'multiplyowned' => \$multiply,
       'unowned' => \$unowned,
);
$|=1 if $verbose;
if (!$multiply && !$unowned) {
	$multiply = $unowned = 1;
}

#TODO:
# Parse filelists.xml.gz directly
# Accept command line args:
#   accept an rpm, get a listing of its files, and check those
#   auto-gzcat files ending in .gz
#   allow a filelists file to be loaded in but have no warnings generated
#   against it.
#     since we know the base distro will always be screwed but we may
#     still want to generate a report against a single package or against
#     another repo.

# Suck in data from the various files
$count = 1;
for $i (@checkfiles) {
	if ($i =~ /(.*):(.*)/) {
		$i = $1; $source = $2;
	}
	else {
		$source = $count if $count > 1;
	}
	print "Loading $i\n" if $verbose;
	open $fp, $i or die "Can't open $i: $!";
	read_xml_regexp($fp, $source);
	close $fp;
	$count++;
}

find_multiply_owned() if $multiply;
find_unowned() if $unowned;

exit 0;

sub find_multiply_owned {
	print "Finding multiply owned directories.\n" if $verbose;
	for $i (keys %dirs) {
		next if $i =~ m!/usr/lib/perl5/vendor_perl/5\..*/!;
		@d = uniq(@{$dirs{$i}});
		if (@d > 1) {
			print "$i is multiply owned:\n";
			for $j (@d) {
				print "\t$j\n";
			}
		}
	}
}

sub find_unowned {
	my($i, $j, $p);
	print "Finding unowned directories.\n" if $verbose;
	for $i (sort(keys %dirs, keys %files)) {
		next if $i eq '/';
		($parent) = $i =~ m!^(.*)/[^/]+$!;
		if (length($parent) && !$dirs{$parent}) {
			if ($files{$parent}) {
				print "Odd, parent directory of $i is a file (maybe a symlink).\n" if $verbose;
				next;
			}
			$unowned{$parent} ||= [];
			push @{$unowned{$parent}}, [$i, (@{$files{$i} || $dirs{$i}})];
		}
	}
	for $i (sort keys %unowned) {
		print "$i is unowned, occupied by:\n";
		for $j (@{$unowned{$i}}) {
			print "\t$j->[0], in package $j->[1]\n";
		}
	}
}

sub read_file_list {
	my ($fp, $source, $package) = @_;
	my (@l, $l);
	while (defined($l = <$fp>)) {
		@l = split(/\s+/, $l);
		if ($l[0] =~ /^d/) {
			print "dir: $l[8]\n";
		}
		else {
			print "file: $l[8]\n";
		}
	}
}

sub read_xml_simple {
	my ($fp, $source) = @_;
	my $kernelseen = 0;
	my ($l, $package, $xml);

	$xml = XMLin($fp, ForceArray => 1);

	for $package (@{$xml->{package}}) {
		print Dumper $package;
		$p = $package->{name}[0];
		$kernelseen++ if $p eq 'kernel';
		$p .= " ($source)" if $source;
	}
}

sub read_xml_twig {
	my ($fp, $source) = @_;
	my $kernelseen = 0;
	my ($l, $package, $xml);

	my $t = XML::Twig->new(twig_roots => { package => \&parse_package });
	print "Parsing." if $verbose;
	$t->parse($fp);
	$t->flush;

	sub parse_package {
		my ($t, $elt) = @_;
		print ".";# if $verbose;
		$p = $elt->att('name');
		$kernelseen++ if $p eq 'kernel';
		$p .= " ($source)" if $source;
		for $i ($elt->children) {
			next unless $i->tag eq 'file';
			$type = $i->att('type') || '';
			if ($type eq 'dir') {
				push @{$dirs{$i->text}}, "$p";
			}
#			else {
#				push @{$files{$i->text}}, $p;
#			}
		}
		$t->purge;
		1;
	};

}

sub read_xml_regexp {
	my ($fp, $source) = @_;
	my $kernelseen = 0;
	my ($l, $p);
	while (defined($l = <$fp>)) {
		@l = split(/(?<=>)\s*(?=<)/, $l);
		for $l (@l) {
			next unless length($l);
			if ($l =~ /package.*name=\"([^\"]+)/) {
				$p = $1;
				$p .= " ($source)" if $source;
				next;
			}
			elsif ($l =~ /file type=\"dir\">([^<]+)/) {
				$dirs{$1} ||= [];
				push @{$dirs{$1}}, $p;
			}
			elsif ($l =~ m!^\s*<file>(.*)</file>$!) {
				$files{$1} ||= [];
				push @{$files{$1}}, $p;
			}
		}
	}
}

sub uniq {
	my %seen;
	grep {!$seen{$_}++} @_;
}



From fedora-extras-commits at redhat.com  Mon Oct 16 23:33:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 16:33:57 -0700
Subject: rpms/perl-BerkeleyDB/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200610162333.k9GNXvMO007183@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-BerkeleyDB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7165

Modified Files:
	.cvsignore sources 
Log Message:
Fix broken sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Oct 2006 22:50:50 -0000	1.7
+++ .cvsignore	16 Oct 2006 23:33:26 -0000	1.8
@@ -0,0 +1 @@
+BerkeleyDB-0.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Oct 2006 22:50:50 -0000	1.7
+++ sources	16 Oct 2006 23:33:26 -0000	1.8
@@ -0,0 +1 @@
+48e2cf29d37f457a35eedc3104c41eac  BerkeleyDB-0.31.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 23:49:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 16:49:07 -0700
Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.13,1.14
Message-ID: <200610162349.k9GNn7S4007241@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-BerkeleyDB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7225

Modified Files:
	perl-BerkeleyDB.spec 
Log Message:
Rebuild.


Index: perl-BerkeleyDB.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-BerkeleyDB.spec	16 Oct 2006 22:50:50 -0000	1.13
+++ perl-BerkeleyDB.spec	16 Oct 2006 23:48:37 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-BerkeleyDB
 Version:        0.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for Berkeley DB version 2, 3 or 4
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.31-2
+- Rebuild.
+
 * Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.31-1
 - Update to 0.31.
 - Use fixperms macro instead of our own chmod incantation.



From fedora-extras-commits at redhat.com  Mon Oct 16 23:56:02 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Mon, 16 Oct 2006 16:56:02 -0700
Subject: comps comps-fe5.xml.in,1.169,1.170 comps-fe6.xml.in,1.190,1.191
Message-ID: <200610162356.k9GNu2jK007386@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7364

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add lineakd and associated plugin packages to comps.xml


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- comps-fe5.xml.in	15 Oct 2006 03:08:34 -0000	1.169
+++ comps-fe5.xml.in	16 Oct 2006 23:55:32 -0000	1.170
@@ -71,6 +71,9 @@
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">efont-unicode-bdf</packagereq>
       <packagereq type="optional">fonttools</packagereq>
+      <packagereq type="optional">lineak-defaultplugin</packagereq>
+      <packagereq type="optional">lineak-xosdplugin</packagereq>
+      <packagereq type="optional">lineakd</packagereq>
       <packagereq type="optional">rss-glx</packagereq>
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
@@ -615,6 +618,7 @@
       <packagereq type="optional">ksynaptics</packagereq>
       <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
+      <packagereq type="optional">lineak-kdeplugins</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">rekall</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- comps-fe6.xml.in	16 Oct 2006 19:10:36 -0000	1.190
+++ comps-fe6.xml.in	16 Oct 2006 23:55:32 -0000	1.191
@@ -75,6 +75,9 @@
       <packagereq type="optional">efont-unicode-bdf</packagereq>
       <packagereq type="optional">FreeWnn</packagereq>
       <packagereq type="optional">kinput2</packagereq>
+      <packagereq type="optional">lineak-defaultplugin</packagereq>
+      <packagereq type="optional">lineak-xosdplugin</packagereq>
+      <packagereq type="optional">lineakd</packagereq>
       <packagereq type="optional">rss-glx</packagereq>
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
@@ -701,6 +704,7 @@
       <packagereq type="optional">ksynaptics</packagereq>
       <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
+      <packagereq type="optional">lineak-kdeplugins</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">rekall</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 17 00:07:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 17:07:57 -0700
Subject: rpms/perl-CPANPLUS/devel .cvsignore, 1.4, 1.5 perl-CPANPLUS.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200610170007.k9H07vBe010375@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPANPLUS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10355

Modified Files:
	.cvsignore perl-CPANPLUS.spec sources 
Log Message:
Update to 0.076.
Fix find option order.
Use fixperms macro instead of our own chmod incantation.
Add #! line to cpanp-run-perl.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2006 00:50:48 -0000	1.4
+++ .cvsignore	17 Oct 2006 00:07:26 -0000	1.5
@@ -1 +1 @@
-CPANPLUS-0.074.tar.gz
+CPANPLUS-0.076.tar.gz


Index: perl-CPANPLUS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/perl-CPANPLUS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-CPANPLUS.spec	14 Sep 2006 00:50:48 -0000	1.4
+++ perl-CPANPLUS.spec	17 Oct 2006 00:07:26 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-CPANPLUS
-Version:        0.074
+Version:        0.076
 Release:        1%{?dist}
 Summary:        API & CLI access to the CPAN mirrors
 License:        GPL or Artistic
@@ -37,6 +37,8 @@
 sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
 chmod +x %{__perl_requires}
 
+perl -pi -e 'print "#!/usr/bin/perl\n\n" if ($. == 1)' bin/cpanp-run-perl
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor AUTOINSTALL=1
 make %{?_smp_mflags}
@@ -48,9 +50,9 @@
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -type f -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 %{?_with_check:make test}
@@ -67,6 +69,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.076-1
+- Update to 0.076.
+- Fix find option order.
+- Use fixperms macro instead of our own chmod incantation.
+- Add #! line to cpanp-run-perl.
+
 * Wed Sep 13 2006 Steven Pritchard <steve at kspei.com> 0.074-1
 - Update to 0.074.
 - Minor cleanup.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2006 00:50:48 -0000	1.4
+++ sources	17 Oct 2006 00:07:26 -0000	1.5
@@ -1 +1 @@
-d98bbb9229d4ee20017101bf1b6eb704  CPANPLUS-0.074.tar.gz
+a301bb6240ded8eea9f33ce7c8f969fb  CPANPLUS-0.076.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 00:32:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Oct 2006 17:32:20 -0700
Subject: rpms/gossip/devel .cvsignore, 1.15, 1.16 gossip.spec, 1.30,
	1.31 sources, 1.15, 1.16
Message-ID: <200610170032.k9H0WK4A010563@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10538

Modified Files:
	.cvsignore gossip.spec sources 
Log Message:
* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.18-1
- Update to 0.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Sep 2006 18:54:23 -0000	1.15
+++ .cvsignore	17 Oct 2006 00:31:50 -0000	1.16
@@ -1 +1 @@
-gossip-0.17.tar.bz2
+gossip-0.18.tar.bz2


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gossip.spec	4 Oct 2006 22:19:50 -0000	1.30
+++ gossip.spec	17 Oct 2006 00:31:50 -0000	1.31
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           gossip
-Version:        0.17
-Release:        2%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.18-1
+- Update to 0.18.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.17-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Sep 2006 18:54:23 -0000	1.15
+++ sources	17 Oct 2006 00:31:50 -0000	1.16
@@ -1 +1 @@
-7050f4b3ac281aa13f1a55fe41f28cb1  gossip-0.17.tar.bz2
+bb5be4bcb259c36c64e1809b665f7de6  gossip-0.18.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 17 00:39:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 17:39:28 -0700
Subject: rpms/perl-File-BOM/devel .cvsignore, 1.4, 1.5 perl-File-BOM.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200610170039.k9H0dSM2010653@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-BOM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10628

Modified Files:
	.cvsignore perl-File-BOM.spec sources 
Log Message:
Update to 0.14.
Reformat to match cpanspec output.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2006 21:35:51 -0000	1.4
+++ .cvsignore	17 Oct 2006 00:38:58 -0000	1.5
@@ -1 +1 @@
-File-BOM-0.12.tar.gz
+File-BOM-0.14.tar.gz


Index: perl-File-BOM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/perl-File-BOM.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-File-BOM.spec	26 Sep 2006 21:35:51 -0000	1.3
+++ perl-File-BOM.spec	17 Oct 2006 00:38:58 -0000	1.4
@@ -1,56 +1,54 @@
 Name:           perl-File-BOM
-Version:        0.12
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Utilities for handling Byte Order Marks
-
-Group:          Development/Libraries
 License:        GPL or Artistic
+Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/File-BOM/
 Source0:        http://www.cpan.org/authors/id/M/MA/MATTLAW/File-BOM-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Readonly) >= 0.06
 BuildRequires:  perl(Test::Exception) >= 0.20
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module provides functions for handling unicode byte order marks, which
 are to be found at the beginning of some files and streams.
 
-
 %prep
 %setup -q -n File-BOM-%{version}
 
-
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
 
-chmod -R u+w $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 README TODO Changes
+%doc Changes README TODO
 %{perl_vendorlib}/*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.14-1
+- Update to 0.14.
+- Reformat to match cpanspec output.
+
 * Tue Sep 26 2006 Steven Pritchard <steve at kspei.com> 0.12-1
 - Update to 0.12.
 - Canonicalize Source0 URL.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2006 21:35:51 -0000	1.4
+++ sources	17 Oct 2006 00:38:58 -0000	1.5
@@ -1 +1 @@
-9292b9b01d7924ee593dca7b813363ec  File-BOM-0.12.tar.gz
+e55642294d8ab369b4dda4e9d57c8e41  File-BOM-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 00:58:58 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 17:58:58 -0700
Subject: rpms/perl-HTML-Mason/devel HTML-Mason-filter-provides.sh, NONE,
	1.1 HTML-Mason-filter-requires.sh, NONE, 1.1 .cvsignore, 1.4,
	1.5 perl-HTML-Mason.spec, 1.7, 1.8 sources, 1.4,
	1.5 filter-provides.sh, 1.1, NONE filter-requires.sh, 1.1, NONE
Message-ID: <200610170058.k9H0wwgK010808@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10786

Modified Files:
	.cvsignore perl-HTML-Mason.spec sources 
Added Files:
	HTML-Mason-filter-provides.sh HTML-Mason-filter-requires.sh 
Removed Files:
	filter-provides.sh filter-requires.sh 
Log Message:
Update to 1.34.
Use fixperms macro instead of our own chmod incantation.
Reformat a bit to more closely resemble current cpanspec output.
Rename filter-*.sh to HTML-Mason-filter-*.sh.



--- NEW FILE HTML-Mason-filter-provides.sh ---
#!/bin/sh

@@PERL_PROV@@ "$@" | sed -e '/^perl(MyApp::/d'


--- NEW FILE HTML-Mason-filter-requires.sh ---
#!/bin/sh

@@PERL_REQ@@ "$@" | sed -e '/^perl(MasonX::Request::PlusApacheSession)$/d'


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2006 22:15:39 -0000	1.4
+++ .cvsignore	17 Oct 2006 00:58:27 -0000	1.5
@@ -1 +1 @@
-HTML-Mason-1.33.tar.gz
+HTML-Mason-1.34.tar.gz


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-HTML-Mason.spec	17 Sep 2006 19:13:54 -0000	1.7
+++ perl-HTML-Mason.spec	17 Oct 2006 00:58:27 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Mason
-Version:        1.33
-Release:        3%{?dist}
+Version:        1.34
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
@@ -9,21 +9,13 @@
 Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/HTML-Mason-%{version}.tar.gz
 Source1:        perl-HTML-Mason.conf
 
-# Filter perl(MasonX::Request::PlusApacheSession).
-Source2:        filter-requires.sh
-%define __perl_requires %{SOURCE2}
-
-# Filter perl(MyApp::Mason) and perl(MyApp::MasonPlusSession).
-Source3:        filter-provides.sh
-%define __perl_provides %{SOURCE3}
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Cache::Cache) >= 1
 BuildRequires:  perl(Class::Container) >= 0.07
 BuildRequires:  perl(Exception::Class) >= 1.15
-BuildRequires:  perl(Params::Validate) >= 0.7
 BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Params::Validate) >= 0.7
 BuildRequires:  perl(mod_perl2)
 BuildRequires:  perl(HTML::Entities)
 Requires:       perl(Cache::Cache) >= 1
@@ -35,6 +27,16 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       %{_sysconfdir}/httpd/conf.d
 
+# Filter perl(MasonX::Request::PlusApacheSession).
+Source98:       HTML-Mason-filter-requires.sh
+%global real_perl_requires %{__perl_requires}
+%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
+
+# Filter perl(MyApp::Mason) and perl(MyApp::MasonPlusSession).
+Source99:       HTML-Mason-filter-provides.sh
+%global real_perl_provides %{__perl_provides}
+%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides
+
 %description
 Mason is a powerful Perl-based web site development and delivery
 engine. With Mason you can embed Perl code in your HTML and construct
@@ -45,6 +47,12 @@
 %prep
 %setup -q -n HTML-Mason-%{version}
 
+sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
+chmod +x %{__perl_requires}
+
+sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides}
+chmod +x %{__perl_provides}
+
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
@@ -55,7 +63,7 @@
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/*.README
 for file in $RPM_BUILD_ROOT%{_bindir}/convert*.pl ; do
@@ -73,11 +81,11 @@
 ./Build test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides}
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS Changes LICENSE README UPGRADE
+%doc Changes CREDITS LICENSE README UPGRADE
 %doc htdocs/ eg/ samples/
 %{_bindir}/mason*
 %{perl_vendorlib}/*
@@ -87,7 +95,13 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
-* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.33-3
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1:1.34-1
+- Update to 1.34.
+- Use fixperms macro instead of our own chmod incantation.
+- Reformat a bit to more closely resemble current cpanspec output.
+- Rename filter-*.sh to HTML-Mason-filter-*.sh.
+
+* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1:1.33-3
 - Fix find option order.
 
 * Thu Jun 08 2006 Steven Pritchard <steve at kspei.com> 1:1.33-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2006 22:15:39 -0000	1.4
+++ sources	17 Oct 2006 00:58:27 -0000	1.5
@@ -1 +1 @@
-22c2cd76ed068630708175d570f97277  HTML-Mason-1.33.tar.gz
+a41b0fc3890f07a1b701950537f7543e  HTML-Mason-1.34.tar.gz


--- filter-provides.sh DELETED ---


--- filter-requires.sh DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 02:43:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:43:02 -0700
Subject: rpms/php-pear-DB-QueryTool - New directory
Message-ID: <200610170243.k9H2h2l5017371@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17367/php-pear-DB-QueryTool

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-QueryTool added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 02:43:08 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:43:08 -0700
Subject: rpms/php-pear-DB-QueryTool/devel - New directory
Message-ID: <200610170243.k9H2h8pG017387@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17367/php-pear-DB-QueryTool/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-QueryTool/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 02:43:20 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:43:20 -0700
Subject: rpms/php-pear-DB-QueryTool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170243.k9H2hKxA017422@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17416

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-DB-QueryTool


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-DB-QueryTool
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 02:43:26 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:43:26 -0700
Subject: rpms/php-pear-DB-QueryTool/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610170243.k9H2hQRN017440@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17416/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-DB-QueryTool


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 02:44:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:44:16 -0700
Subject: rpms/php-pear-DB-QueryTool import.log,1.1,1.2
Message-ID: <200610170244.k9H2iGIE017528@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17486

Modified Files:
	import.log 
Log Message:
auto-import php-pear-DB-QueryTool-1.0.3-1 on branch devel from php-pear-DB-QueryTool-1.0.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-QueryTool/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 02:43:20 -0000	1.1
+++ import.log	17 Oct 2006 02:43:46 -0000	1.2
@@ -0,0 +1 @@
+php-pear-DB-QueryTool-1_0_3-1:HEAD:php-pear-DB-QueryTool-1.0.3-1.src.rpm:1161053022



From fedora-extras-commits at redhat.com  Tue Oct 17 02:44:17 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:44:17 -0700
Subject: rpms/php-pear-DB-QueryTool/devel php-pear-DB-QueryTool.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610170244.k9H2iHL7017532@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17486/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-DB-QueryTool.spec 
Log Message:
auto-import php-pear-DB-QueryTool-1.0.3-1 on branch devel from php-pear-DB-QueryTool-1.0.3-1.src.rpm


--- NEW FILE php-pear-DB-QueryTool.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name DB_QueryTool

Name:           php-pear-DB-QueryTool
Version:        1.0.3
Release:        1%{?dist}
Summary:        An OO-interface for easily retrieving and modifying data in a DB

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/DB_QueryTool
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(DB) php-pear(Log)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This package is an OO-abstraction to the SQL-Query language, it provides
methods such as setWhere, setOrder, setGroup, setJoin, etc. to easily
build queries.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/DB/QueryTool*


%changelog
* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 1.0.3-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-QueryTool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 02:43:26 -0000	1.1
+++ .cvsignore	17 Oct 2006 02:43:47 -0000	1.2
@@ -0,0 +1 @@
+DB_QueryTool-1.0.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-QueryTool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 02:43:26 -0000	1.1
+++ sources	17 Oct 2006 02:43:47 -0000	1.2
@@ -0,0 +1 @@
+6b93afe58f4e5bdd2f198b2b6d7acefa  DB_QueryTool-1.0.3.tgz



From fedora-extras-commits at redhat.com  Tue Oct 17 02:46:32 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:46:32 -0700
Subject: owners owners.list,1.1835,1.1836
Message-ID: <200610170246.k9H2kWp4017623@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17592

Modified Files:
	owners.list 
Log Message:
php-pear-DB-QueryTool


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1835
retrieving revision 1.1836
diff -u -r1.1835 -r1.1836
--- owners.list	16 Oct 2006 18:48:25 -0000	1.1835
+++ owners.list	17 Oct 2006 02:46:02 -0000	1.1836
@@ -1733,6 +1733,7 @@
 Fedora Extras|php-pear-Console-Table|Class that makes it easy to build console style tables|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Log|Abstracted logging facility for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 03:01:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:01:30 -0700
Subject: rpms/php-pear-XML-Util - New directory
Message-ID: <200610170301.k9H31U4j020675@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20671/php-pear-XML-Util

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Util added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 03:01:33 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:01:33 -0700
Subject: rpms/php-pear-XML-Util/devel - New directory
Message-ID: <200610170301.k9H31XRR020688@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20671/php-pear-XML-Util/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Util/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 03:01:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:01:47 -0700
Subject: rpms/php-pear-XML-Util Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170301.k9H31lHF020760@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20754

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-XML-Util


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-XML-Util
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 03:01:55 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:01:55 -0700
Subject: rpms/php-pear-XML-Util/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610170301.k9H31tCf020777@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20754/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-XML-Util


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 03:02:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:02:56 -0700
Subject: rpms/php-pear-XML-Util import.log,1.1,1.2
Message-ID: <200610170302.k9H32uOk020852@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20820

Modified Files:
	import.log 
Log Message:
auto-import php-pear-XML-Util-1.1.1-1 on branch devel from php-pear-XML-Util-1.1.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 03:01:47 -0000	1.1
+++ import.log	17 Oct 2006 03:02:26 -0000	1.2
@@ -0,0 +1 @@
+php-pear-XML-Util-1_1_1-1:HEAD:php-pear-XML-Util-1.1.1-1.src.rpm:1161054141



From fedora-extras-commits at redhat.com  Tue Oct 17 03:02:57 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:02:57 -0700
Subject: rpms/php-pear-XML-Util/devel php-pear-XML-Util.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610170302.k9H32vdM020854@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20820/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-XML-Util.spec 
Log Message:
auto-import php-pear-XML-Util-1.1.1-1 on branch devel from php-pear-XML-Util-1.1.1-1.src.rpm


--- NEW FILE php-pear-XML-Util.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name XML_Util

Name:           php-pear-XML-Util
Version:        1.1.1
Release:        1%{?dist}
Summary:        XML utility class

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/XML_Util
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
Requires:       php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
XML_Util is a utility class that helps you working with (and especially
creating) XML documents.

All methods of XML_Util can be called statically, that means you do not have
to instantiate an XML_Util object to use the provided methods.

The funcionality of XML_Util ranges from validating an XML tag name (as there
are strict rules for tag and attribute names) to the creation of namespaced
XML tags. 


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Fix end of line encoding
dos2unix docdir/%{pear_name}/examples/example*.php

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/XML/Util.php


%changelog
* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 1.1.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 03:01:54 -0000	1.1
+++ .cvsignore	17 Oct 2006 03:02:27 -0000	1.2
@@ -0,0 +1 @@
+XML_Util-1.1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 03:01:54 -0000	1.1
+++ sources	17 Oct 2006 03:02:27 -0000	1.2
@@ -0,0 +1 @@
+528278996240d47a07e4273fb7bde841  XML_Util-1.1.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 17 03:05:07 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:05:07 -0700
Subject: owners owners.list,1.1836,1.1837
Message-ID: <200610170305.k9H357YR020904@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20888

Modified Files:
	owners.list 
Log Message:
php-pear-XML-Util


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1836
retrieving revision 1.1837
diff -u -r1.1836 -r1.1837
--- owners.list	17 Oct 2006 02:46:02 -0000	1.1836
+++ owners.list	17 Oct 2006 03:04:37 -0000	1.1837
@@ -1752,6 +1752,7 @@
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Parser|XML parsing class based on PHP's bundled expat|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-XML-Util|XML utility class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-apc|APC caches and optimizes PHP intermediate code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 03:15:46 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 16 Oct 2006 20:15:46 -0700
Subject: rpms/perl-Curses/devel .cvsignore, 1.3, 1.4 perl-Curses.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200610170315.k9H3FkcX021094@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21072

Modified Files:
	.cvsignore perl-Curses.spec sources 
Log Message:
bump to 1.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Aug 2006 22:23:37 -0000	1.3
+++ .cvsignore	17 Oct 2006 03:15:15 -0000	1.4
@@ -1 +1 @@
-Curses-1.14.tgz
+Curses-1.15.tgz


Index: perl-Curses.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/perl-Curses.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Curses.spec	27 Aug 2006 22:29:53 -0000	1.3
+++ perl-Curses.spec	17 Oct 2006 03:15:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Curses
-Version:        1.14
-Release:        2%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Perl bindings for ncurses
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 1.15-1
+- bump to 1.15
+
 * Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 1.14-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Aug 2006 22:23:37 -0000	1.3
+++ sources	17 Oct 2006 03:15:15 -0000	1.4
@@ -1 +1 @@
-d446947a39025e1a61512fd99ff8ff25  Curses-1.14.tgz
+6f3c5ea61cbbfabe15b0004febcb3a4d  Curses-1.15.tgz



From fedora-extras-commits at redhat.com  Tue Oct 17 03:18:39 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:18:39 -0700
Subject: rpms/php-pear-XML-Beautifier - New directory
Message-ID: <200610170318.k9H3IdHV021214@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21210/php-pear-XML-Beautifier

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Beautifier added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 03:18:45 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:18:45 -0700
Subject: rpms/php-pear-XML-Beautifier/devel - New directory
Message-ID: <200610170318.k9H3IjFL021228@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21210/php-pear-XML-Beautifier/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Beautifier/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 03:18:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:18:56 -0700
Subject: rpms/php-pear-XML-Beautifier Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170318.k9H3IuNq021259@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-XML-Beautifier


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-XML-Beautifier
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 03:19:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:19:02 -0700
Subject: rpms/php-pear-XML-Beautifier/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610170319.k9H3J2Dq021275@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-XML-Beautifier


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 03:19:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:19:51 -0700
Subject: rpms/php-pear-XML-Beautifier import.log,1.1,1.2
Message-ID: <200610170319.k9H3JpDM021348@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21315

Modified Files:
	import.log 
Log Message:
auto-import php-pear-XML-Beautifier-1.1-1 on branch devel from php-pear-XML-Beautifier-1.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Beautifier/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 03:18:56 -0000	1.1
+++ import.log	17 Oct 2006 03:19:21 -0000	1.2
@@ -0,0 +1 @@
+php-pear-XML-Beautifier-1_1-1:HEAD:php-pear-XML-Beautifier-1.1-1.src.rpm:1161055158



From fedora-extras-commits at redhat.com  Tue Oct 17 03:19:52 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:19:52 -0700
Subject: rpms/php-pear-XML-Beautifier/devel php-pear-XML-Beautifier.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610170319.k9H3JqRr021352@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21315/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-XML-Beautifier.spec 
Log Message:
auto-import php-pear-XML-Beautifier-1.1-1 on branch devel from php-pear-XML-Beautifier-1.1-1.src.rpm


--- NEW FILE php-pear-XML-Beautifier.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name XML_Beautifier

Name:           php-pear-XML-Beautifier
Version:        1.1
Release:        1%{?dist}
Summary:        Class to format XML documents

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/XML_Beautifier
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(XML_Util) php-pear(XML_Parser)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
XML_Beautifier is a package, that helps you making XML documents easier to
read for human beings.

It is able to add line-breaks, indentation, sorts attributes, convert tag
cases and wraps long comments. It recognizes tags, character data, comments,
XML declarations, processing instructions and external entities and is able
to format these tokens nicely.

The document is split into these tokens using the XML_Beautifier_Tokenizer
class and the expat parser. Then a renderer is used to create the string
representation of the document and formats it using the specified options.

Currently only one renderer is available, but as XML_Beautifier uses a
driver-based architecture, other renderers (like syntax-highlighting)
will follow soon. 


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/XML/Beautifier*


%changelog
* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 1.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Beautifier/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 03:19:02 -0000	1.1
+++ .cvsignore	17 Oct 2006 03:19:22 -0000	1.2
@@ -0,0 +1 @@
+XML_Beautifier-1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Beautifier/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 03:19:02 -0000	1.1
+++ sources	17 Oct 2006 03:19:22 -0000	1.2
@@ -0,0 +1 @@
+d121758edb840d9107debb26bb5837d7  XML_Beautifier-1.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 17 03:22:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:22:02 -0700
Subject: owners owners.list,1.1837,1.1838
Message-ID: <200610170322.k9H3M2qd021405@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21389

Modified Files:
	owners.list 
Log Message:
php-pear-XML-Beautifier


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1837
retrieving revision 1.1838
diff -u -r1.1837 -r1.1838
--- owners.list	17 Oct 2006 03:04:37 -0000	1.1837
+++ owners.list	17 Oct 2006 03:21:31 -0000	1.1838
@@ -1751,6 +1751,7 @@
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Parser|XML parsing class based on PHP's bundled expat|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Util|XML utility class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-apc|APC caches and optimizes PHP intermediate code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 03:47:14 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon, 16 Oct 2006 20:47:14 -0700
Subject: rpms/scribes/devel .cvsignore, 1.4,
	1.5 scribes-configure.ac-no-python-depcheck.patch, 1.1,
	1.2 scribes.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <200610170347.k9H3lE2d021584@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21545

Modified Files:
	.cvsignore scribes-configure.ac-no-python-depcheck.patch 
	scribes.spec sources 
Log Message:
New upstream version (0.2.9.88); don't hardcode a Pysco requirement (though note it in the %description)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 23:24:16 -0000	1.4
+++ .cvsignore	17 Oct 2006 03:46:43 -0000	1.5
@@ -1 +1 @@
-scribes-0.2.9.87.tar.bz2
+scribes-0.2.9.88.tar.bz2

scribes-configure.ac-no-python-depcheck.patch:

Index: scribes-configure.ac-no-python-depcheck.patch
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes-configure.ac-no-python-depcheck.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scribes-configure.ac-no-python-depcheck.patch	15 Oct 2006 23:24:16 -0000	1.1
+++ scribes-configure.ac-no-python-depcheck.patch	17 Oct 2006 03:46:43 -0000	1.2
@@ -1,21 +1,19 @@
---- configure.ac.orig	2006-10-15 14:04:26.000000000 -0700
-+++ configure.ac	2006-10-15 14:06:14.000000000 -0700
-@@ -3,8 +3,6 @@
- 
- AC_INIT([scribes], [0.2.9.87], [<mystilleef at gmail.com>])
+--- configure.ac.orig	2006-10-16 20:29:29.000000000 -0700
++++ configure.ac	2006-10-16 20:30:22.000000000 -0700
+@@ -3,7 +3,6 @@
  
+ AC_INIT([scribes], [0.2.9.88], [<mystilleef at gmail.com>])
+ GNOME_COMMON_INIT
 -AC_PREREQ(2.60)
--
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR([configure.ac])
  AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip])
-@@ -22,9 +20,6 @@
- AM_GNU_GETTEXT_VERSION
+ AM_MAINTAINER_MODE
+ 
+@@ -29,8 +28,6 @@
+ AM_GCONF_SOURCE_2
  
  AM_PATH_PYTHON([2.4])
 -AC_LANG([C])
--AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [AC_MSG_RESULT([It worked])], [AC_MSG_ERROR([It failed])])
--
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [], [AC_MSG_ERROR([Error: Dependency check failed])])
+ 
  AC_CONFIG_FILES([
- intl/Makefile
  po/Makefile.in


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scribes.spec	16 Oct 2006 19:21:47 -0000	1.12
+++ scribes.spec	17 Oct 2006 03:46:43 -0000	1.13
@@ -3,8 +3,8 @@
 %define python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.87
-Release:	4%{?dist}
+Version:	0.2.9.88
+Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -35,9 +35,6 @@
 Requires:	gnome-python2-gtksourceview >= 2.12
 Requires:	gnome-python2-gtkspell >= 2.12
 Requires:	PyXML
-%ifarch %ix86
-Requires:	python-psyco
-%endif
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -64,7 +61,8 @@
 ...and more are in development!
 
 In order to make use of its runtime documentation facilities, you will need to
-install Yelp.
+install Yelp. Also, you may install the python-psyco package (x86-only) for a
+boost in startup speed.
 
 
 %prep
@@ -103,6 +101,7 @@
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/error.py
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
+%find_lang %{name}
 
 
 %post
@@ -138,7 +137,7 @@
 scrollkeeper-update -q ||:
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{python_sitelib}/%{python_module_name}/
@@ -154,6 +153,14 @@
 
 
 %changelog
+* Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
+- Don't hardcode a Pysco requirement at all; but note that option in the
+  %%description for those on x86 who want it, since the %ifarch conditional
+  is done at build time, and a noarch package depending on an arch-specific
+  package which isn't available on all arches is a Bad Idea(TM)
+- Update to upstream version 0.2.9.88
+
+
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-4
 - Make the python-psyco requirement an %%ifarch conditional, as it's x86-only
 - Fix line length of earlier %%changelog entry


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 23:24:16 -0000	1.4
+++ sources	17 Oct 2006 03:46:43 -0000	1.5
@@ -1 +1 @@
-428458fd6f6a457b6e2d693f8cd1c6d3  scribes-0.2.9.87.tar.bz2
+cfcd7e4627b5ff4d77bf20bcd4b39535  scribes-0.2.9.88.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 17 03:50:10 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon, 16 Oct 2006 20:50:10 -0700
Subject: rpms/scribes/devel scribes.spec,1.13,1.14
Message-ID: <200610170350.k9H3oAAV021631@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21611

Modified Files:
	scribes.spec 
Log Message:
Very minor aesthetic fix


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scribes.spec	17 Oct 2006 03:46:43 -0000	1.13
+++ scribes.spec	17 Oct 2006 03:49:39 -0000	1.14
@@ -160,7 +160,6 @@
   package which isn't available on all arches is a Bad Idea(TM)
 - Update to upstream version 0.2.9.88
 
-
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-4
 - Make the python-psyco requirement an %%ifarch conditional, as it's x86-only
 - Fix line length of earlier %%changelog entry



From fedora-extras-commits at redhat.com  Tue Oct 17 05:10:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 22:10:02 -0700
Subject: rpms/poker-engine/devel .cvsignore, 1.5, 1.6 poker-engine.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200610170510.k9H5A2qU028200@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28178

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 17:06:08 -0000	1.5
+++ .cvsignore	17 Oct 2006 05:09:32 -0000	1.6
@@ -1 +1 @@
-poker-engine-1.0.18.tar.gz
+poker-engine-1.0.19.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/devel/poker-engine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- poker-engine.spec	12 Sep 2006 21:45:34 -0000	1.11
+++ poker-engine.spec	17 Oct 2006 05:09:32 -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:           poker-engine
-Version:        1.0.18
-Release:        2%{?dist}
+Version:        1.0.19
+Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 Group:          Development/Libraries
 License:        GPL
@@ -51,10 +51,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %doc %{_mandir}/man8/*.8.gz
 %{_sbindir}/pokerconfigupgrade
-%{_datadir}/%{name}/conf/*.xml
-%{python_sitelib}/pokerengine/*.py
-%{python_sitelib}/pokerengine/*.pyc
-%{python_sitelib}/pokerengine/*.pyo
+%{_datadir}/%{name}
+%{python_sitelib}/pokerengine
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %files devel
@@ -62,6 +61,10 @@
 %{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 1.0.19-1
+- Upstream sync
+- Own all directories created
+
 * Tue Sep 12 2006 Christopher Stone <chris.stone at gmail.com> 1.0.18-2
 - Reduce verbosity in %%check section
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 17:06:08 -0000	1.5
+++ sources	17 Oct 2006 05:09:32 -0000	1.6
@@ -1 +1 @@
-6b97b4421948cf1d8e1b123e22469832  poker-engine-1.0.18.tar.gz
+466024b92115f595ac7e4954edacefee  poker-engine-1.0.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 05:14:33 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 22:14:33 -0700
Subject: rpms/poker-engine/FC-5 .cvsignore, 1.5, 1.6 poker-engine.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200610170514.k9H5EXoK028270@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-engine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28250

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 17:21:29 -0000	1.5
+++ .cvsignore	17 Oct 2006 05:14:03 -0000	1.6
@@ -1 +1 @@
-poker-engine-1.0.18.tar.gz
+poker-engine-1.0.19.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/FC-5/poker-engine.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- poker-engine.spec	12 Sep 2006 21:45:33 -0000	1.10
+++ poker-engine.spec	17 Oct 2006 05:14:03 -0000	1.11
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           poker-engine
-Version:        1.0.18
-Release:        2%{?dist}
+Version:        1.0.19
+Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 Group:          Development/Libraries
 License:        GPL
@@ -51,10 +51,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %doc %{_mandir}/man8/*.8.gz
 %{_sbindir}/pokerconfigupgrade
-%{_datadir}/%{name}/conf/*.xml
-%{python_sitelib}/pokerengine/*.py
-%{python_sitelib}/pokerengine/*.pyc
-%{python_sitelib}/pokerengine/*.pyo
+%{_datadir}/%{name}
+%{python_sitelib}/pokerengine
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %files devel
@@ -62,6 +61,10 @@
 %{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 1.0.19-1
+- Upstream sync
+- Own all directories created
+
 * Tue Sep 12 2006 Christopher Stone <chris.stone at gmail.com> 1.0.18-2
 - Reduce verbosity in %%check section
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 17:21:29 -0000	1.5
+++ sources	17 Oct 2006 05:14:03 -0000	1.6
@@ -1 +1 @@
-6b97b4421948cf1d8e1b123e22469832  poker-engine-1.0.18.tar.gz
+466024b92115f595ac7e4954edacefee  poker-engine-1.0.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 05:29:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 22:29:02 -0700
Subject: rpms/poker-eval/devel .cvsignore, 1.4, 1.5 poker-eval.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <200610170529.k9H5T2cl028364@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28344

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2006 17:02:29 -0000	1.4
+++ .cvsignore	17 Oct 2006 05:28:32 -0000	1.5
@@ -1 +1 @@
-poker-eval-132.0.tar.gz
+poker-eval-133.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- poker-eval.spec	29 Aug 2006 17:10:54 -0000	1.14
+++ poker-eval.spec	17 Oct 2006 05:28:32 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        132.0
-Release:        3%{?dist}
+Version:        133.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
@@ -26,22 +26,22 @@
 %setup -q
 
 # use examples/ directory for devel package %doc section
-%{__mkdir_p} tmp/examples && %{__cp} examples/*.c tmp/examples
-%{__rm} -f tmp/examples/getopt_w32.c
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
+rm -f tmp/examples/getopt_w32.c
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %check
-%{__make} %{?_smp_mflags} check
+make %{?_smp_mflags} check
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -60,6 +60,10 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 133.0-1
+- Upstream sync
+- Remove system macros
+
 * Tue Aug 29 2006 Christopher Stone <chris.stone at gmail.com> 132.0-3
 - Somehow the package name got messed up
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2006 17:02:29 -0000	1.4
+++ sources	17 Oct 2006 05:28:32 -0000	1.5
@@ -1 +1 @@
-03c2046b5bd6b1f116623b8bba067df8  poker-eval-132.0.tar.gz
+a0495760b99d224ac85f9f80e58c4fb5  poker-eval-133.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 05:30:37 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 22:30:37 -0700
Subject: rpms/poker-eval/FC-5 .cvsignore, 1.4, 1.5 poker-eval.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200610170530.k9H5Ubsf028460@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28431

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2006 17:05:40 -0000	1.4
+++ .cvsignore	17 Oct 2006 05:30:07 -0000	1.5
@@ -1 +1 @@
-poker-eval-132.0.tar.gz
+poker-eval-133.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/poker-eval.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- poker-eval.spec	29 Aug 2006 17:05:40 -0000	1.11
+++ poker-eval.spec	17 Oct 2006 05:30:07 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           poker-eval
-Version:        132.0
+Version:        133.0
 Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
@@ -26,22 +26,22 @@
 %setup -q
 
 # use examples/ directory for devel package %doc section
-%{__mkdir_p} tmp/examples && %{__cp} examples/*.c tmp/examples
-%{__rm} -f tmp/examples/getopt_w32.c
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
+rm -f tmp/examples/getopt_w32.c
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %check
-%{__make} %{?_smp_mflags} check
+make %{?_smp_mflags} check
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -60,6 +60,16 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 133.0-1
+- Upstream sync
+- Remove system macros
+
+* Tue Aug 29 2006 Christopher Stone <chris.stone at gmail.com> 132.0-3
+- Somehow the package name got messed up
+
+* Tue Aug 29 2006 Christopher Stone <chris.stone at gmail.com> 132.0-2
+- Attempted a make tag before committing new sources
+
 * Tue Aug 29 2006 Christopher Stone <chris.stone at gmail.com> 132.0-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2006 17:05:40 -0000	1.4
+++ sources	17 Oct 2006 05:30:07 -0000	1.5
@@ -1 +1 @@
-03c2046b5bd6b1f116623b8bba067df8  poker-eval-132.0.tar.gz
+a0495760b99d224ac85f9f80e58c4fb5  poker-eval-133.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 06:39:44 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:39:44 -0700
Subject: rpms/openpbx - New directory
Message-ID: <200610170639.k9H6diAp031827@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823/openpbx

Log Message:
Directory /cvs/extras/rpms/openpbx added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 06:39:50 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:39:50 -0700
Subject: rpms/openpbx/devel - New directory
Message-ID: <200610170639.k9H6doRD031846@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823/openpbx/devel

Log Message:
Directory /cvs/extras/rpms/openpbx/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 06:40:01 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:40:01 -0700
Subject: rpms/openpbx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170640.k9H6e1t6031868@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31862

Added Files:
	Makefile import.log 
Log Message:
Setup of module openpbx


--- NEW FILE Makefile ---
# Top level Makefile for module openpbx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 06:40:06 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:40:06 -0700
Subject: rpms/openpbx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610170640.k9H6e6Xb031884@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31862/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openpbx


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 06:42:50 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 16 Oct 2006 23:42:50 -0700
Subject: rpms/python-turbocheetah/devel
	python-turbocheetah-0.9.5-setuptools.patch, NONE,
	1.1 python-turbocheetah.spec, 1.1, 1.2
Message-ID: <200610170642.k9H6go3a031953@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31934

Modified Files:
	python-turbocheetah.spec 
Added Files:
	python-turbocheetah-0.9.5-setuptools.patch 
Log Message:
python-turbocheetah-0.9.5-setuptools.patch

python-turbocheetah-0.9.5-setuptools.patch:

--- NEW FILE python-turbocheetah-0.9.5-setuptools.patch ---
--- setup.py.orig	2006-10-17 02:35:28.000000000 -0400
+++ setup.py	2006-10-17 02:35:38.000000000 -0400
@@ -13,7 +13,7 @@
     download_url="http://www.turbogears.org/download/",
     keywords=["python.templating.engines", "turbogears"],
     license="MIT",
-    install_requires = ["Cheetah >= 1.0"],
+    install_requires = [],
     zip_safe=False,
     packages=find_packages(),
     classifiers = [


Index: python-turbocheetah.spec
===================================================================
RCS file: /cvs/extras/rpms/python-turbocheetah/devel/python-turbocheetah.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-turbocheetah.spec	10 Oct 2006 15:19:09 -0000	1.1
+++ python-turbocheetah.spec	17 Oct 2006 06:42:20 -0000	1.2
@@ -5,13 +5,14 @@
 
 Name:           python-turbocheetah
 Version:        0.9.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        TurboGears plugin to support use of Cheetah templates
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org/docs/plugins/template.html
 Source0:        http://cheeseshop.python.org/packages/source/T/TurboCheetah/TurboCheetah-%{version}.tar.gz
+Patch0:         %{name}-%{version}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q -n TurboCheetah-%{version}
+%patch0
 
 
 %build
@@ -50,6 +52,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-5
+- python-turbocheetah-0.9.5-setuptools.patch
+
 * Tue Oct 10 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-4
 - Fix Source0
 - Own %%{python_sitelib}/turbocheetah



From fedora-extras-commits at redhat.com  Tue Oct 17 06:43:40 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:43:40 -0700
Subject: rpms/openpbx import.log,1.1,1.2
Message-ID: <200610170643.k9H6heu1032030@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31998

Modified Files:
	import.log 
Log Message:
auto-import openpbx-1.2-1.rc1.svn1979.fc6 on branch devel from openpbx-1.2-1.rc1.svn1979.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/openpbx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 06:40:00 -0000	1.1
+++ import.log	17 Oct 2006 06:43:10 -0000	1.2
@@ -0,0 +1 @@
+openpbx-1_2-1_rc1_svn1979_fc6:HEAD:openpbx-1.2-1.rc1.svn1979.fc6.src.rpm:1161067387



From fedora-extras-commits at redhat.com  Tue Oct 17 06:43:41 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:43:41 -0700
Subject: rpms/openpbx/devel openpbx.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610170643.k9H6hfwB032034@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31998/devel

Modified Files:
	.cvsignore sources 
Added Files:
	openpbx.spec 
Log Message:
auto-import openpbx-1.2-1.rc1.svn1979.fc6 on branch devel from openpbx-1.2-1.rc1.svn1979.fc6.src.rpm


--- NEW FILE openpbx.spec ---
%define snap 1979

%bcond_with misdn
%bcond_without zaptel

%bcond_without	fedora

Name:		openpbx
Version:	1.2
Release:	1.rc1.svn%{snap}%{?dist}
Summary:	The Truly Open Source PBX

Group:		Applications/Internet
License:	GPL
URL:		http://www.openpbx.org/
# svn co -r %{snap} svn://svn.openpbx.org/openpbx/trunk openpbx
# tar cvfz openpbx-r%{snap}.tar.gz openpbx
Source0:	openpbx-r%{snap}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	spandsp-devel >= 0.0.3-1.pre24
BuildRequires:	%{?snap:libtool automake autoconf} zlib-devel
BuildRequires:	fedora-usermgmt-devel bluez-libs-devel openldap-devel
BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel
BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN}
BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel}

Requires:	/sbin/chkconfig
%{?FE_USERADD_REQ}

%description
OpenPBX is an Open Source PBX and telephony development platform that
can both replace a conventional PBX and act as a platform for developing
custom telephony applications for delivering dynamic content over a
telephone similarly to how one can deliver dynamic content through a
web browser using CGI and a web server.

OpenPBX talks to a variety of telephony hardware including BRI, PRI,
POTS, Bluetooth headsets and IP telephony clients using SIP and IAX
protocols protocol (e.g. ekiga or kphone).  For more information and a
current list of supported hardware, see www.openpbx.org.


%package devel
Group:		Applications/Internet
Summary:	Development package for %{name}
Requires:	%{name} = %{version}-%{release}

%description devel
Use this package for developing and building modules for OpenPBX


%package postgresql
Group:		Applications/Internet
Summary:	PostgreSQL support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description postgresql
This package contains modules for OpenPBX which make use of PostgreSQL.

%package odbc
Group:		Applications/Internet
Summary:	ODBC support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description odbc
This package contains modules for OpenPBX which make use of ODBC.

%package ldap
Group:		Applications/Internet
Summary:	LDAP support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description ldap
This package contains modules for OpenPBX which make use of LDAP.

%package bluetooth
Group:		Applications/Internet
Summary:	Bluetooth channel driver for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description bluetooth
This package contains a Bluetooth channel driver for OpenPBX, which
allows Bluetooth headsets and telephones to be used for communication.

%package capi
Group:		Applications/Internet
Summary:	CAPI channel driver for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description capi
This package contains a CAPI (Common ISDN API) channel driver for
OpenPBX, allowing CAPI devices to be used for making and receiving calls.

%package misdn
Group:		Applications/Internet
Summary:	mISDN channel driver for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description misdn
This package contains the mISDN channel driver for OpenPBX. mISDN is
the replacement modular ISDN stack for Linux, intended to be merged
into the 2.6 kernel.

%package zaptel
Group:		Applications/Internet
Summary:	Zaptel modules for OpenPBX
Requires:	%{name} = %{version}-%{release}
Requires:	zaptel >= 1.4.0-1

%description zaptel
This package contains the Zap channel driver and MeetMe application
for OpenPBX. Zaptel is Digium's telephony driver package.

%package jabber
Group:		Applications/Internet
Summary:	Jabber support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description jabber
This package contains Jabber protocol support for OpenPBX.

%package javascript
Group:		Applications/Internet
Summary:	JavaScript support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description javascript
This package contains JavaScript support for OpenPBX.

%package alsa
Group:		Applications/Internet
Summary:	ALSA channel driver for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description alsa
This package contains an ALSA console driver for OpenPBX, which allows
the local sound devices to be used for making and receiving calls.

%package ogi
Group:		Applications/Internet
Summary:	OpenPBX Gateway Interface
Requires:	%{name} = %{version}-%{release}

%description ogi
This package contains files support for the OpenPBX Gateway Interface; a
convenient interface between OpenPBX and external scripts or programs.


%prep
%setup -q -n openpbx

%build
%if 0%{?snap}
./bootstrap.sh
%endif
# res_sqlite seems to use internal functions of sqlite3 which don't 
# even _exist_ in current versions. Disable it until it's fixed.

%configure --with-directory-layout=lsb --with-chan_bluetooth \
	   --with-chan_fax --with-chan_capi --with-chan_alsa --with-app_ldap \
	   --disable-zaptel --enable-t38 --enable-postgresql --with-cdr-pgsql \
	   --with-res_config_pqsql --with-cdr-odbc --with-res_config_odbc \
	   --with-perl-shebang='#! /usr/bin/perl' --disable-builtin-sqlite3 \
	   --enable-javascript --with-res_js --enable-fast-install \
	   %{?with_misdn:--with-chan_misdn} \
	   %{?with_zaptel:--enable-zaptel} \
	   --enable-jabber --with-res_jabber # --with-res_sqlite

# Poxy fscking libtool is _such_ a pile of crap...
sed -i 's/^CC="gcc"/CC="gcc -Wl,--as-needed"/' libtool

# Poxy fscking autocrap isn't much better
sed -i 's:^/usr/bin/perl:#! /usr/bin/perl:' ogi/fastogi-test ogi/ogi-test.ogi

make %{?_smp_mflags} CCLD="gcc -Wl,--as-needed"

mkdir doc2
mv doc/README.{misdn,chan_capi,res_jabber,odbcstorage} doc2

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/openpbx.org/modules/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/openpbx.org/*.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/openpbx.org/*.la
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m0755 contrib/fedora/openpbx $RPM_BUILD_ROOT%{_initrddir}/openpbx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m0644 contrib/fedora/openpbx.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/openpbx

mv $RPM_BUILD_ROOT/%{_datadir}/openpbx.org/ogi/eogi-*test $RPM_BUILD_ROOT/%{_sbindir}

# More autocrap insanity. We can't just move confdefs.h into the openpbx/ subdir
# because then autocrap will add that subdir to the compiler's include path and
# many things break. So let's just clean up after it.
sed -i 's:"confdefs.h":<openpbx/confdefs.h>:' $RPM_BUILD_ROOT/%{_includedir}/openpbx/*.h
install -m0644 include/confdefs.h $RPM_BUILD_ROOT/%{_includedir}/openpbx/confdefs.h

%clean
rm -rf $RPM_BUILD_ROOT

%pre
%__fe_groupadd 30 -r openpbx &>/dev/null || :
%__fe_useradd  30 -r -s /sbin/nologin -d %{_sysconfdir}/openpbx.org -M \
                    -c 'OpenPBX user' -g openpbx openpbx &>/dev/null || :
%post
/sbin/chkconfig --add openpbx

%preun
test "$1" != 0 || /sbin/chkconfig --del openpbx

%postun
%__fe_userdel  openpbx &>/dev/null || :
%__fe_groupdel openpbx &>/dev/null || :

%pre zaptel
%{_sbindir}/usermod -G `id -G openpbx | tr " " , `,zaptel openpbx

%files
%defattr(-,root,root,-)
%doc COPYING CREDITS LICENSE BUGS AUTHORS SECURITY README HARDWARE
%doc doc/README.* doc/*.txt doc/*.html sample.call ChangeLog
%doc BUGS InstallGuide.txt
%config(noreplace) %{_sysconfdir}/logrotate.d/openpbx
%{_initrddir}/openpbx
%{_sbindir}/openpbx
%{_bindir}/smsq
%{_bindir}/streamplayer
%dir %{_libdir}/openpbx.org
%{_libdir}/openpbx.org/lib*.so.*
%dir %{_libdir}/openpbx.org/modules
%{_libdir}/openpbx.org/modules/*.so
%{_mandir}/man8/openpbx.8.gz
%dir %{_datadir}/openpbx.org
%dir %attr(0755,openpbx,openpbx) %{_sysconfdir}/openpbx.org
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/*
%attr(2755,openpbx,openpbx) %{_localstatedir}/spool/openpbx.org
%attr(0755,openpbx,openpbx) %{_localstatedir}/log/openpbx.org
%attr(0755,openpbx,openpbx) %{_localstatedir}/run/openpbx.org
# Unneeded
%exclude %{_sysconfdir}/openpbx.org/cdr_tds.conf
# Separately packaged
%exclude %{_libdir}/openpbx.org/modules/*pgsql.so
%exclude %{_libdir}/openpbx.org/modules/app_sql_postgres.so
%exclude %{_libdir}/openpbx.org/modules/app_ldap.so
%exclude %{_libdir}/openpbx.org/modules/cdr_odbc.so
%exclude %{_libdir}/openpbx.org/modules/chan_bluetooth.so
%exclude %{_libdir}/openpbx.org/modules/res_jabber.so
%exclude %{_libdir}/openpbx.org/modules/res_js.so
%exclude %{_libdir}/openpbx.org/modules/chan_alsa.so
%exclude %{_libdir}/openpbx.org/modules/res_ogi.so
%exclude %{_libdir}/openpbx.org/modules/chan_capi.so
%exclude %{_sysconfdir}/openpbx.org/cdr_pgsql.conf
%exclude %{_sysconfdir}/openpbx.org/cdr_odbc.conf
%exclude %{_sysconfdir}/openpbx.org/chan_bluetooth.conf
%exclude %{_sysconfdir}/openpbx.org/res_jabber.conf
%exclude %{_sysconfdir}/openpbx.org/alsa.conf
%exclude %{_sysconfdir}/openpbx.org/capi.conf
%if 0%{?with_misdn:1}
%exclude %{_libdir}/openpbx.org/modules/chan_misdn.so
%exclude %{_sysconfdir}/openpbx.org/misdn.conf
%endif
%if 0%{?with_zaptel:1}
%exclude %{_libdir}/openpbx.org/modules/chan_zap.so
%exclude %{_libdir}/openpbx.org/modules/app_meetme.so
%exclude %{_libdir}/openpbx.org/modules/app_flash.so
%exclude %{_sysconfdir}/openpbx.org/zapata.conf
%exclude %{_sysconfdir}/openpbx.org/meetme.conf
%endif

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/openpbx
%{_includedir}/openpbx/*.h
%{_libdir}/openpbx.org/lib*.so

%files postgresql
%{_libdir}/openpbx.org/modules/*pgsql.so
%{_libdir}/openpbx.org/modules/app_sql_postgres.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_pgsql.conf

%files odbc
%{_libdir}/openpbx.org/modules/cdr_odbc.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_odbc.conf
%doc doc2/README.odbcstorage

%files ldap
%{_libdir}/openpbx.org/modules/app_ldap.so

%files bluetooth
%{_libdir}/openpbx.org/modules/chan_bluetooth.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/chan_bluetooth.conf

%files capi
%{_libdir}/openpbx.org/modules/chan_capi.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/capi.conf
%doc doc2/README.chan_capi

%if 0%{?with_misdn:1}
%files misdn
%{_libdir}/openpbx.org/modules/chan_misdn.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/misdn.conf
%doc doc2/README.misdn
%endif

%if 0%{?with_zaptel:1}
%files zaptel
%{_libdir}/openpbx.org/modules/chan_zap.so
%{_libdir}/openpbx.org/modules/app_meetme.so
%{_libdir}/openpbx.org/modules/app_flash.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/zapata.conf
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/meetme.conf
%endif

%files jabber
%{_libdir}/openpbx.org/modules/res_jabber.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/res_jabber.conf
%doc doc2/README.res_jabber

%files javascript
%{_libdir}/openpbx.org/modules/res_js.so

%files alsa
%{_libdir}/openpbx.org/modules/chan_alsa.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/alsa.conf

%files ogi
%{_libdir}/openpbx.org/modules/res_ogi.so
%dir %attr(0755,root,root) %{_datadir}/openpbx.org/ogi
%{_datadir}/openpbx.org/ogi/*
%{_sbindir}/eogi*

%changelog
* Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-1.rc1.svn1979
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 06:40:06 -0000	1.1
+++ .cvsignore	17 Oct 2006 06:43:10 -0000	1.2
@@ -0,0 +1 @@
+openpbx-r1979.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 06:40:06 -0000	1.1
+++ sources	17 Oct 2006 06:43:10 -0000	1.2
@@ -0,0 +1 @@
+b863cbd1e90338b05439267be3eccb44  openpbx-r1979.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 08:30:45 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:30:45 -0700
Subject: rpms/rpld - New directory
Message-ID: <200610170830.k9H8UjeA005967@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963/rpld

Log Message:
Directory /cvs/extras/rpms/rpld added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 08:30:50 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:30:50 -0700
Subject: rpms/rpld/devel - New directory
Message-ID: <200610170830.k9H8UoKh005981@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963/rpld/devel

Log Message:
Directory /cvs/extras/rpms/rpld/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 08:31:16 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:31:16 -0700
Subject: rpms/rpld Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170831.k9H8VGYR006012@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6006

Added Files:
	Makefile import.log 
Log Message:
Setup of module rpld


--- NEW FILE Makefile ---
# Top level Makefile for module rpld
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 08:31:16 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:31:16 -0700
Subject: rpms/rpld/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610170831.k9H8VG5j006028@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6006/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rpld


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 08:32:48 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:32:48 -0700
Subject: rpms/rpld import.log,1.1,1.2
Message-ID: <200610170832.k9H8WmtO006111@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6076

Modified Files:
	import.log 
Log Message:
auto-import rpld-1.8-0.1.beta1 on branch devel from rpld-1.8-0.1.beta1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rpld/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 08:31:15 -0000	1.1
+++ import.log	17 Oct 2006 08:32:18 -0000	1.2
@@ -0,0 +1 @@
+rpld-1_8-0_1_beta1:HEAD:rpld-1.8-0.1.beta1.src.rpm:1161073922



From fedora-extras-commits at redhat.com  Tue Oct 17 08:32:51 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:32:51 -0700
Subject: rpms/rpld/devel rpld-1.8-makefile.patch, NONE, 1.1 rpld.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610170832.k9H8WpZk006113@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6076/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rpld-1.8-makefile.patch rpld.spec 
Log Message:
auto-import rpld-1.8-0.1.beta1 on branch devel from rpld-1.8-0.1.beta1.src.rpm

rpld-1.8-makefile.patch:

--- NEW FILE rpld-1.8-makefile.patch ---
--- rpld-1.8/Makefile.orig	2001-11-01 09:30:36.000000000 -0600
+++ rpld-1.8/Makefile	2006-09-16 09:45:12.627495010 -0500
@@ -109,7 +109,7 @@
 # Stuff
 CC	 = gcc
 INCLUDES = 
-OPT	 = -O
+#OPT	 = -O
 CFLAGS   = ${OPT} ${INCLUDES} ${DEFINES}
 LIBS     = 
 LDFLAGS  =
@@ -212,11 +212,11 @@
 	cp $< $@
 
 install-prog:${PROG}
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${PROG} ${BINDIR}
+	${INSTALL} -c -m ${BINMODE} ${PROG} ${BINDIR}
 
 install-docs: doc
-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} rpld.${MAN8EXT} ${MAN8}/rpld.${MAN8EXT}
-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} rpld.conf.${MAN5EXT} ${MAN5}/rpld.conf.${MAN5EXT}
+	${INSTALL} -c -m ${MANMODE} rpld.${MAN8EXT} ${MAN8}/rpld.${MAN8EXT}
+	${INSTALL} -c -m ${MANMODE} rpld.conf.${MAN5EXT} ${MAN5}/rpld.conf.${MAN5EXT}
 
 ana:ana.c ${NIT}
 #linux-old-nit.c


--- NEW FILE rpld.spec ---
Name:           rpld
Version:        1.8
Release:        0.1.beta1%{?dist}
Summary:        RPL/RIPL remote boot daemon
Group:          System Environment/Daemons
License:        GPL
URL:            http://gimel.esc.cam.ac.uk/james/rpld/index.html
Source0:        http://gimel.esc.cam.ac.uk/james/rpld/src/rpld-1.8-beta-1.tar.gz
Patch0:         rpld_1.8beta1-6.diff.gz
Patch1:         rpld-1.8-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  byacc flex

%description
Daemon to net-boot IBM style RPL boot ROMs (this is not the
same as the Novell IPX-style RPL protocol, despite the
name).

%prep
%setup -q
%patch0 -p1

for I in debian/patches/* ;
do
  patch -p1 -i ${I}
done

%patch1 -p1

%build
make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
mv LICENCE LICENSE

%install
rm -rf $RPM_BUILD_ROOT
# mkdir -p $RPM_BUILD_ROOT/usr/{sbin,share/man/man{8,5}}
mkdir -p $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{8,5}}
make install DESTDIR=$RPM_BUILD_ROOT BINMODE=755 MANMODE=644

find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE INSTALL rpld.conf.sample
%{_sbindir}/*
%{_mandir}/man[^3]/*

%changelog
* Sat Oct 14 2006 Paul P Komkoff Jr <i at stingr.net> - 1.8-0.1.beta1
- Preparing for submission to fedora extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpld/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 08:31:16 -0000	1.1
+++ .cvsignore	17 Oct 2006 08:32:18 -0000	1.2
@@ -0,0 +1,2 @@
+rpld-1.8-beta-1.tar.gz
+rpld_1.8beta1-6.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpld/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 08:31:16 -0000	1.1
+++ sources	17 Oct 2006 08:32:18 -0000	1.2
@@ -0,0 +1,2 @@
+08a020c08a466378a99edb88ea98ba35  rpld-1.8-beta-1.tar.gz
+209d3079e933dd78b1cc04bf7b321c52  rpld_1.8beta1-6.diff.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 08:46:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 17 Oct 2006 01:46:10 -0700
Subject: rpms/soundconverter/devel .cvsignore, 1.5, 1.6 soundconverter.spec, 
	1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200610170846.k9H8kAXA006244@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6224

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 08:57:41 -0000	1.5
+++ .cvsignore	17 Oct 2006 08:45:39 -0000	1.6
@@ -1 +1 @@
-soundconverter-0.9.1.tar.gz
+soundconverter-0.9.2.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/soundconverter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- soundconverter.spec	8 Sep 2006 12:10:54 -0000	1.9
+++ soundconverter.spec	17 Oct 2006 08:45:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           soundconverter
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Denis Leroy <denis at poolshark.org> - 0.9.2-1
+- Update to 0.9.2
+
 * Fri Sep  8 2006 Denis Leroy <denis at poolshark.org> - 0.9.1-3
 - Fixed desktop install
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 08:57:41 -0000	1.5
+++ sources	17 Oct 2006 08:45:39 -0000	1.6
@@ -1 +1 @@
-2f261057fd07727454abe626722c4976  soundconverter-0.9.1.tar.gz
+ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 08:47:50 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:47:50 -0700
Subject: owners owners.list,1.1838,1.1839
Message-ID: <200610170847.k9H8lojk006316@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6292

Modified Files:
	owners.list 
Log Message:
rpld - RPL/RIPL remote boot daemon



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1838
retrieving revision 1.1839
diff -u -r1.1838 -r1.1839
--- owners.list	17 Oct 2006 03:21:31 -0000	1.1838
+++ owners.list	17 Oct 2006 08:47:19 -0000	1.1839
@@ -1983,6 +1983,7 @@
 Fedora Extras|rosegarden4|MIDI, audio and notation editor|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|rpld|RPL/RIPL remote boot daemon|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|rpmdevtools|RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
 Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 08:49:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 17 Oct 2006 01:49:05 -0700
Subject: rpms/soundconverter/FC-5 .cvsignore, 1.5, 1.6 soundconverter.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200610170849.k9H8n5fm006350@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6330

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 09:43:48 -0000	1.5
+++ .cvsignore	17 Oct 2006 08:48:35 -0000	1.6
@@ -1 +1 @@
-soundconverter-0.9.1.tar.gz
+soundconverter-0.9.2.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/soundconverter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- soundconverter.spec	8 Sep 2006 09:43:48 -0000	1.6
+++ soundconverter.spec	17 Oct 2006 08:48:35 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           soundconverter
-Version:        0.9.1
+Version:        0.9.2
 Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Denis Leroy <denis at poolshark.org> - 0.9.2-1
+- Update to 0.9.2
+
 * Fri Sep  8 2006 Denis Leroy <denis at poolshark.org> - 0.9.1-1
 - Update to 0.9.1
 - Uses gstreamer 1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 09:43:48 -0000	1.5
+++ sources	17 Oct 2006 08:48:35 -0000	1.6
@@ -1 +1 @@
-2f261057fd07727454abe626722c4976  soundconverter-0.9.1.tar.gz
+ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 09:22:29 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 17 Oct 2006 02:22:29 -0700
Subject: rpms/mantis/FC-5 mantis.spec,1.12,1.13
Message-ID: <200610170922.k9H9MTAK009592@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9576

Modified Files:
	mantis.spec 
Log Message:
rebuild



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/mantis.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mantis.spec	13 Oct 2006 09:54:57 -0000	1.12
+++ mantis.spec	17 Oct 2006 09:21:59 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:	Web-based bugtracking system
 Name:		mantis
 Version:	1.0.5
-Release:	1%{dist}
+Release:	1%{dist}.1
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.mantisbugtracker.com/
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Gianluca Sforna <giallu gmail com> - 1.0.5-1.1
+- rebuild
+
 * Tue Oct 10 2006 Gianluca Sforna <giallu gmail com> - 1.0.5-1
 - updated to 1.0.5
 



From fedora-extras-commits at redhat.com  Tue Oct 17 09:28:07 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 17 Oct 2006 02:28:07 -0700
Subject: rpms/soundconverter/FC-4 .cvsignore, 1.3, 1.4 soundconverter.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610170928.k9H9S7YU009737@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9715

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2005 09:19:57 -0000	1.3
+++ .cvsignore	17 Oct 2006 09:27:37 -0000	1.4
@@ -1 +1 @@
-soundconverter-0.8.1.tar.gz
+soundconverter-0.9.2.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/soundconverter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- soundconverter.spec	16 Nov 2005 04:49:54 -0000	1.4
+++ soundconverter.spec	17 Oct 2006 09:27:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           soundconverter
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -11,7 +11,14 @@
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
-Requires:       pygtk2 gstreamer-python gstreamer-plugins gnome-python2-gconf
+BuildRequires:  pygtk2
+BuildRequires:  intltool gettext
+
+Requires:       pygtk2
+Requires:       gstreamer-python
+Requires:       gstreamer-plugins
+Requires:       gnome-python2-gconf
+
 
 %description
 A simple sound converter application for the GNOME environment. It reads and
@@ -21,43 +28,40 @@
 %setup -q
 
 %build
-sed -i 's#^GLADE *=.*#GLADE="%{_datadir}/%{name}/%{name}.glade"#' soundconverter.py
-cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=SoundConverter
-Comment=Convert audio using GStreamer
-Exec=%{name}
-Terminal=false
-Type=Application
-Icon=%{name}.png
-Categories=AudioVideo;GTK;
-EOF
+%configure --disable-dependency-tracking
+make %{?_smp_mflags}
+sed -i 's#Icon=#Icon=%{_datadir}/%{name}/%{name}-logo.png#' data/%{name}.desktop
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0644 %{name}.glade $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.glade
-install -p -m 0644 logo.png $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -D -p -m 0755 soundconverter.py $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -D -p -m 0644 logo.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+make install DESTDIR=${RPM_BUILD_ROOT}
+%find_lang %{name}
+
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
-  %{name}.desktop
+  --delete-original \
+  ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
+%doc %{_mandir}/man1/%{name}*
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+
 
 %changelog
+* Tue Oct 17 2006 Denis Leroy <denis at poolshark.org> - 0.9.2-1
+- Update to 0.9.2
+
 * Tue Nov 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.1-2
 - Added gnome-python2-gconf to Requires (#173290)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2005 09:19:57 -0000	1.3
+++ sources	17 Oct 2006 09:27:37 -0000	1.4
@@ -1 +1 @@
-6bea010a5869d65e47d2506b2526087e  soundconverter-0.8.1.tar.gz
+ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 09:38:27 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 17 Oct 2006 02:38:27 -0700
Subject: fedora-security/audit fc5,1.358,1.359
Message-ID: <200610170938.k9H9cRpL009906@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9888/audit

Modified Files:
	fc5 
Log Message:
Update with FEDORA-2006-1022 (kernel)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- fc5	15 Oct 2006 14:05:49 -0000	1.358
+++ fc5	17 Oct 2006 09:38:25 -0000	1.359
@@ -8,7 +8,7 @@
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
-CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
+CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
@@ -16,7 +16,7 @@
 CVE-2006-5072 backport (mono) #209464 [since FEDORA-2006-1012]
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
-CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)
+CVE-2006-4997 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022]
 CVE-2006-4980 VULNERABLE (python) #208166
 CVE-2006-4925 ** openssh
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
@@ -27,7 +27,7 @@
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)
 CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) #205652
-CVE-2006-4623 VULNERABLE (kernel, fixed 2.6.18-rc1)
+CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)
@@ -47,7 +47,7 @@
 CVE-2006-4565 VULNERABLE (mozilla)
 CVE-2006-4565 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4561 VULNERABLE (firefox)
-CVE-2006-4538 VULNERABLE (kernel)
+CVE-2006-4538 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] ia64 and sparc only
 CVE-2006-4535 version (kernel, fixed 2.6.17.12, fixed 2.6.18-rc6) [since FEDORA-2006-967]
 CVE-2006-4507 ignore (libtiff) can't reproduce
 CVE-2006-4486 VULNERABLE (php, fixed 5.1.6)
@@ -136,7 +136,7 @@
 CVE-2006-3744 backport (ImageMagick) #202193 [since FEDORA-2006-929]
 CVE-2006-3743 backport (ImageMagick) #202193 [since FEDORA-2006-929]
 CVE-2006-3742 backport (kdebase) #201507 [since FEDORA-2006-942]
-CVE-2006-3741 ignore (kernel, fixed 2.6.18-rc7) ia64 only
+CVE-2006-3741 version (kernel, fixed 2.6.18-rc7) [since FEDORA-2006-1022] ia64 only
 CVE-2006-3740 VULNERABLE (libXfont, fixed 1.2.2)
 CVE-2006-3739 VULNERABLE (libXfont, fixed 1.2.2)
 CVE-2006-3738 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
@@ -148,7 +148,7 @@
 CVE-2006-3672 ignore (konqueror) just a crash
 CVE-2006-3665 ignore (squirrelmail) don't enable register_globals!
 CVE-2006-3636 VULNERABLE (mailman, fixed 2.1.9)
-CVE-2006-3634 ignore (kernel, fixed 2.6.17.8) s390 only
+CVE-2006-3634 version (kernel, fixed 2.6.17.8) [since FEDORA-2006-906] s390 only
 CVE-2006-3632 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]
 CVE-2006-3631 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]
 CVE-2006-3630 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]



From fedora-extras-commits at redhat.com  Tue Oct 17 12:13:04 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 17 Oct 2006 05:13:04 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.8,1.9
Message-ID: <200610171213.k9HCD4om021484@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21466

Modified Files:
	sysprof-kmod.spec 
Log Message:
rebuild



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sysprof-kmod.spec	8 Oct 2006 22:24:10 -0000	1.8
+++ sysprof-kmod.spec	17 Oct 2006 12:12:34 -0000	1.9
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2747.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Gianluca Sforna <giallu gmail com>
+- rebuild for kernel 2.6.18-1.2798
+
 * Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
 - rebuild for kernel 2.6.18-1.2747
 - add patch for linux/config.h include



From fedora-extras-commits at redhat.com  Tue Oct 17 12:23:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 17 Oct 2006 05:23:08 -0700
Subject: rpms/OpenEXR/FC-5 OpenEXR-1.2.2-zlib.patch, 1.2, 1.3 OpenEXR.spec,
	1.8, 1.9
Message-ID: <200610171223.k9HCN8Vb021589@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21568

Modified Files:
	OpenEXR-1.2.2-zlib.patch OpenEXR.spec 
Log Message:
* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
- own %_docdir/OpenEXR-devel-%version (#210997)
- devel: Requires: pkgconfig
- update zlib patch (use Libs.private)


OpenEXR-1.2.2-zlib.patch:

Index: OpenEXR-1.2.2-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-5/OpenEXR-1.2.2-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenEXR-1.2.2-zlib.patch	19 Feb 2006 04:23:12 -0000	1.2
+++ OpenEXR-1.2.2-zlib.patch	17 Oct 2006 12:22:37 -0000	1.3
@@ -1,11 +1,12 @@
---- OpenEXR-1.2.2/OpenEXR.pc.in.zlib	2005-08-13 10:33:18.000000000 -0400
-+++ OpenEXR-1.2.2/OpenEXR.pc.in	2005-08-13 10:33:30.000000000 -0400
-@@ -7,5 +7,5 @@
+--- OpenEXR-1.2.2/OpenEXR.pc.in.zlib    2005-03-09 13:37:46.000000000 -0600
++++ OpenEXR-1.2.2/OpenEXR.pc.in 2006-10-17 07:07:17.000000000 -0500
+@@ -7,5 +7,6 @@
  Name: OpenEXR
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
 +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
++Libs.private: -lz
  Cflags: -I${OpenEXR_includedir}
 --- OpenEXR-1.2.2/Half/Makefile.am.165729	2004-02-05 23:22:01.000000000 -0600
 +++ OpenEXR-1.2.2/Half/Makefile.am	2006-02-09 22:42:18.000000000 -0600


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-5/OpenEXR.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OpenEXR.spec	19 Feb 2006 04:23:12 -0000	1.8
+++ OpenEXR.spec	17 Oct 2006 12:22:37 -0000	1.9
@@ -1,17 +1,21 @@
+
 Name:           OpenEXR
 Version:        1.2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.openexr.com/
-Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz
-Patch:          %{name}-1.2.2-zlib.patch
-Patch1:         %{name}-1.2.2-forwardfriend.patch
+Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fltk-devel >= 1.1 zlib-devel automake libtool autoconf
+Patch0:         OpenEXR-1.2.2-zlib.patch
+Patch1:         OpenEXR-1.2.2-forwardfriend.patch
+
+BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  zlib-devel
+BuildRequires:  automake libtool
 
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -21,52 +25,75 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 %description    devel
 This package contains headers and libraries required to build applications that
 use the OpenEXR format.
 
+
 %prep
 %setup -q
-%patch -p1 -b .zlib
+
+%patch0 -p1 -b .zlib
 %patch1 -p1 -b .forwardfriend
 ./bootstrap
 
+
 %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 \{\} \;
-install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-cp -a IlmImfExamples $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples/.deps
+
+# unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
+
+
+%check
+# Not enabled, by default, takes a *very* long time. -- Rex
+%{?_with_check:make check}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples
+%doc rpmdocs/examples 
 %{_datadir}/aclocal/*
-%{_includedir}/OpenEXR
-%{_libdir}/*.so
+%{_includedir}/OpenEXR/
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
+* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
+- own %%_docdir/OpenEXR-devel-%%version (#210997)
+- devel: Requires: pkgconfig
+- update zlib patch (use Libs.private)
+
 * Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-7
 - Further zlib fixes (#165729)
 



From fedora-extras-commits at redhat.com  Tue Oct 17 12:31:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 17 Oct 2006 05:31:22 -0700
Subject: rpms/OpenEXR/FC-4 OpenEXR-1.2.2-zlib.patch, 1.2, 1.3 OpenEXR.spec,
	1.7, 1.8
Message-ID: <200610171231.k9HCVMrO021683@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21662

Modified Files:
	OpenEXR-1.2.2-zlib.patch OpenEXR.spec 
Log Message:
* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
- own %_docdir/OpenEXR-devel-%version (#210997)
- devel: Requires: pkgconfig
- update zlib patch (use Libs.private)


OpenEXR-1.2.2-zlib.patch:

Index: OpenEXR-1.2.2-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR-1.2.2-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenEXR-1.2.2-zlib.patch	19 Feb 2006 04:23:06 -0000	1.2
+++ OpenEXR-1.2.2-zlib.patch	17 Oct 2006 12:30:52 -0000	1.3
@@ -1,11 +1,12 @@
---- OpenEXR-1.2.2/OpenEXR.pc.in.zlib	2005-08-13 10:33:18.000000000 -0400
-+++ OpenEXR-1.2.2/OpenEXR.pc.in	2005-08-13 10:33:30.000000000 -0400
-@@ -7,5 +7,5 @@
+--- OpenEXR-1.2.2/OpenEXR.pc.in.zlib    2005-03-09 13:37:46.000000000 -0600
++++ OpenEXR-1.2.2/OpenEXR.pc.in 2006-10-17 07:07:17.000000000 -0500
+@@ -7,5 +7,6 @@
  Name: OpenEXR
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
 +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
++Libs.private: -lz
  Cflags: -I${OpenEXR_includedir}
 --- OpenEXR-1.2.2/Half/Makefile.am.165729	2004-02-05 23:22:01.000000000 -0600
 +++ OpenEXR-1.2.2/Half/Makefile.am	2006-02-09 22:42:18.000000000 -0600


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OpenEXR.spec	19 Feb 2006 04:23:06 -0000	1.7
+++ OpenEXR.spec	17 Oct 2006 12:30:52 -0000	1.8
@@ -1,17 +1,21 @@
+
 Name:           OpenEXR
 Version:        1.2.2
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.openexr.com/
-Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz
-Patch:          %{name}-1.2.2-zlib.patch
-Patch1:         %{name}-1.2.2-forwardfriend.patch
+Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fltk-devel >= 1.1 zlib-devel automake libtool autoconf
+Patch0:         OpenEXR-1.2.2-zlib.patch
+Patch1:         OpenEXR-1.2.2-forwardfriend.patch
+
+BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  zlib-devel
+BuildRequires:  automake libtool
 
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -21,55 +25,81 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 %description    devel
 This package contains headers and libraries required to build applications that
 use the OpenEXR format.
 
+
 %prep
 %setup -q
-%patch -p1 -b .zlib
+
+%patch0 -p1 -b .zlib
 %patch1 -p1 -b .forwardfriend
 ./bootstrap
 
+
 %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 \{\} \;
-install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-cp -a IlmImfExamples $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples/.deps
+
+# unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
+
+
+%check
+# Not enabled, by default, takes a *very* long time. -- Rex
+%{?_with_check:make check}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples
+%doc rpmdocs/examples 
 %{_datadir}/aclocal/*
-%{_includedir}/OpenEXR
-%{_libdir}/*.so
+%{_includedir}/OpenEXR/
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
-* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
+- own %%_docdir/OpenEXR-devel-%%version (#210997)
+- devel: Requires: pkgconfig
+- update zlib patch (use Libs.private)
+
+* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-7
 - Further zlib fixes (#165729)
 
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+- Rebuild for Fedora Extras 5
+
 * Wed Aug 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-5
 - Remove *.a from %%files devel
 



From fedora-extras-commits at redhat.com  Tue Oct 17 12:35:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 17 Oct 2006 05:35:52 -0700
Subject: rpms/OpenEXR/FC-3 OpenEXR-1.2.2-zlib.patch, 1.2, 1.3 OpenEXR.spec,
	1.9, 1.10
Message-ID: <200610171235.k9HCZqYe021752@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21728

Modified Files:
	OpenEXR-1.2.2-zlib.patch OpenEXR.spec 
Log Message:
* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
- own %_docdir/OpenEXR-devel-%version (#210997)
- devel: Requires: pkgconfig
- update zlib patch (use Libs.private)


OpenEXR-1.2.2-zlib.patch:

Index: OpenEXR-1.2.2-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR-1.2.2-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenEXR-1.2.2-zlib.patch	19 Feb 2006 04:23:00 -0000	1.2
+++ OpenEXR-1.2.2-zlib.patch	17 Oct 2006 12:35:22 -0000	1.3
@@ -1,11 +1,12 @@
---- OpenEXR-1.2.2/OpenEXR.pc.in.zlib	2005-08-13 10:33:18.000000000 -0400
-+++ OpenEXR-1.2.2/OpenEXR.pc.in	2005-08-13 10:33:30.000000000 -0400
-@@ -7,5 +7,5 @@
+--- OpenEXR-1.2.2/OpenEXR.pc.in.zlib    2005-03-09 13:37:46.000000000 -0600
++++ OpenEXR-1.2.2/OpenEXR.pc.in 2006-10-17 07:07:17.000000000 -0500
+@@ -7,5 +7,6 @@
  Name: OpenEXR
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
 +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
++Libs.private: -lz
  Cflags: -I${OpenEXR_includedir}
 --- OpenEXR-1.2.2/Half/Makefile.am.165729	2004-02-05 23:22:01.000000000 -0600
 +++ OpenEXR-1.2.2/Half/Makefile.am	2006-02-09 22:42:18.000000000 -0600


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OpenEXR.spec	19 Feb 2006 04:23:00 -0000	1.9
+++ OpenEXR.spec	17 Oct 2006 12:35:22 -0000	1.10
@@ -1,16 +1,21 @@
+
 Name:           OpenEXR
 Version:        1.2.2
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.openexr.com/
-Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz
-Patch:          %{name}-1.2.2-zlib.patch
+Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fltk-devel >= 1.1 zlib-devel automake libtool autoconf
+Patch0:         OpenEXR-1.2.2-zlib.patch
+Patch1:         OpenEXR-1.2.2-forwardfriend.patch
+
+BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  zlib-devel
+BuildRequires:  automake libtool
 
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -20,60 +25,88 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 %description    devel
 This package contains headers and libraries required to build applications that
 use the OpenEXR format.
 
+
 %prep
 %setup -q
-%patch -p1 -b .zlib
+
+%patch0 -p1 -b .zlib
+%patch1 -p1 -b .forwardfriend
 ./bootstrap
 
+
 %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 \{\} \;
-install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-cp -a IlmImfExamples $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples/.deps
+
+# unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
+
+
+%check
+# Not enabled, by default, takes a *very* long time. -- Rex
+%{?_with_check:make check}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples
+%doc rpmdocs/examples 
 %{_datadir}/aclocal/*
-%{_includedir}/OpenEXR
-%{_libdir}/*.so
+%{_includedir}/OpenEXR/
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
-* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
+- own %%_docdir/OpenEXR-devel-%%version (#210997)
+- devel: Requires: pkgconfig
+- update zlib patch (use Libs.private)
+
+* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-7
 - Further zlib fixes (#165729)
 
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+- Rebuild for Fedora Extras 5
+
 * Wed Aug 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-5
 - Remove *.a from %%files devel
 
 * Tue Aug 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-4
 - Removed -devel dep on zlib-devel (#165729)
 - Added --disable-static to %%configure
+- Fixed build with GCC 4.0.1
 - Added .so links to -devel
 
 * Wed May 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-3



From fedora-extras-commits at redhat.com  Tue Oct 17 12:39:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 17 Oct 2006 05:39:18 -0700
Subject: rpms/tetex-unicode/devel tetex-unicode.spec,1.9,1.10
Message-ID: <200610171239.k9HCdIju021835@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/tetex-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21802/devel

Modified Files:
	tetex-unicode.spec 
Log Message:
use the same scriptlets as tetex


Index: tetex-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-unicode/devel/tetex-unicode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tetex-unicode.spec	31 Aug 2006 15:57:13 -0000	1.9
+++ tetex-unicode.spec	17 Oct 2006 12:38:47 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           tetex-unicode
 Version:        0
-Release:        6.20041017%{?dist}
+Release:        7.20041017%{?dist}
 
 Summary:        Unicode support for LaTeX
 
@@ -45,10 +45,10 @@
 
 
 %post
-texhash %{_datadir}/texmf >/dev/null 2>&1
+[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash >/dev/null 2>&1 || :
 
 %postun
-texhash %{_datadir}/texmf >/dev/null 2>&1
+[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash >/dev/null 2>&1 || :
 
 
 %files
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Aurelien Bompard <abompard at fedoraproject.org> 0-7.20041017
+- use the same scriptlets as the main tetex package
+
 * Thu Aug 31 2006 Aurelien Bompard <abompard at fedoraproject.org> 0-6.20041017
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct 17 12:39:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 17 Oct 2006 05:39:17 -0700
Subject: rpms/tetex-unicode/FC-5 tetex-unicode.spec,1.8,1.9
Message-ID: <200610171239.k9HCdHSj021832@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/tetex-unicode/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21802/FC-5

Modified Files:
	tetex-unicode.spec 
Log Message:
use the same scriptlets as tetex


Index: tetex-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-unicode/FC-5/tetex-unicode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tetex-unicode.spec	22 Feb 2006 16:14:35 -0000	1.8
+++ tetex-unicode.spec	17 Oct 2006 12:38:47 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           tetex-unicode
 Version:        0
-Release:        5.20041017%{?dist}
+Release:        7.20041017%{?dist}
 
 Summary:        Unicode support for LaTeX
 
@@ -45,10 +45,10 @@
 
 
 %post
-texhash %{_datadir}/texmf >/dev/null 2>&1
+[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash >/dev/null 2>&1 || :
 
 %postun
-texhash %{_datadir}/texmf >/dev/null 2>&1
+[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash >/dev/null 2>&1 || :
 
 
 %files
@@ -58,6 +58,12 @@
 
 
 %changelog
+* Tue Oct 17 2006 Aurelien Bompard <abompard at fedoraproject.org> 0-7.20041017
+- use the same scriptlets as the main tetex package
+
+* Thu Aug 31 2006 Aurelien Bompard <abompard at fedoraproject.org> 0-6.20041017
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0-5.20041017
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Oct 17 12:43:44 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 05:43:44 -0700
Subject: rpms/openpbx/devel openpbx.spec,1.1,1.2
Message-ID: <200610171243.k9HChiIv021946@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21923

Modified Files:
	openpbx.spec 
Log Message:
HAndle new mISDN package nicely


Index: openpbx.spec
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/openpbx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openpbx.spec	17 Oct 2006 06:43:10 -0000	1.1
+++ openpbx.spec	17 Oct 2006 12:43:14 -0000	1.2
@@ -24,7 +24,7 @@
 BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
 BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
 BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel
-BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN}
+BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN-devel}
 BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel}
 
 Requires:	/sbin/chkconfig
@@ -219,6 +219,9 @@
 %pre zaptel
 %{_sbindir}/usermod -G `id -G openpbx | tr " " , `,zaptel openpbx
 
+%pre misdn
+%{_sbindir}/usermod -G `id -G openpbx | tr " " , `,misdn openpbx
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING CREDITS LICENSE BUGS AUTHORS SECURITY README HARDWARE



From fedora-extras-commits at redhat.com  Tue Oct 17 12:44:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 17 Oct 2006 05:44:25 -0700
Subject: rpms/OpenEXR/FC-3 OpenEXR-1.2.2-forwardfriend.patch, NONE,
	1.1 OpenEXR.spec, 1.10, 1.11
Message-ID: <200610171244.k9HCiPdD021974@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21952

Modified Files:
	OpenEXR.spec 
Added Files:
	OpenEXR-1.2.2-forwardfriend.patch 
Log Message:
missed patch, respin


OpenEXR-1.2.2-forwardfriend.patch:

--- NEW FILE OpenEXR-1.2.2-forwardfriend.patch ---
--- OpenEXR-1.2.2/exrmaketiled/Image.h.gcc401	2005-08-14 15:36:02.000000000 -0400
+++ OpenEXR-1.2.2/exrmaketiled/Image.h	2005-08-14 15:36:14.000000000 -0400
@@ -49,6 +49,7 @@
 #include <string>
 #include <map>
 
+class Image;
 
 class ImageChannel
 {


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OpenEXR.spec	17 Oct 2006 12:35:22 -0000	1.10
+++ OpenEXR.spec	17 Oct 2006 12:43:55 -0000	1.11
@@ -1,7 +1,7 @@
 
 Name:           OpenEXR
 Version:        1.2.2
-Release:        8%{?dist}
+Release:        8%{?dist}.1
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries



From fedora-extras-commits at redhat.com  Tue Oct 17 13:47:16 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:47:16 -0700
Subject: rpms/mISDN - New directory
Message-ID: <200610171347.k9HDlGZ0025139@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25135/mISDN

Log Message:
Directory /cvs/extras/rpms/mISDN added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 13:47:22 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:47:22 -0700
Subject: rpms/mISDN/devel - New directory
Message-ID: <200610171347.k9HDlMQM025153@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25135/mISDN/devel

Log Message:
Directory /cvs/extras/rpms/mISDN/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 13:47:28 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:47:28 -0700
Subject: rpms/mISDN Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610171347.k9HDlS32025180@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25173

Added Files:
	Makefile import.log 
Log Message:
Setup of module mISDN


--- NEW FILE Makefile ---
# Top level Makefile for module mISDN
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 13:47:33 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:47:33 -0700
Subject: rpms/mISDN/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610171347.k9HDlXYd025199@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25173/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mISDN


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 13:48:36 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:48:36 -0700
Subject: rpms/mISDN import.log,1.1,1.2
Message-ID: <200610171348.k9HDmaVx025283@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25241

Modified Files:
	import.log 
Log Message:
auto-import mISDN-0-1.cvs20061010.fc6 on branch devel from mISDN-0-1.cvs20061010.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mISDN/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 13:47:28 -0000	1.1
+++ import.log	17 Oct 2006 13:48:05 -0000	1.2
@@ -0,0 +1 @@
+mISDN-0-1_cvs20061010_fc6:HEAD:mISDN-0-1.cvs20061010.fc6.src.rpm:1161092882



From fedora-extras-commits at redhat.com  Tue Oct 17 13:48:36 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:48:36 -0700
Subject: rpms/mISDN/devel mISDN-libdir.patch, NONE, 1.1 mISDN-soname.patch, 
	NONE, 1.1 mISDN.rules, NONE, 1.1 mISDN.spec, NONE, 1.1 mISDNif.h,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610171348.k9HDma3d025287@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25241/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mISDN-libdir.patch mISDN-soname.patch mISDN.rules mISDN.spec 
	mISDNif.h 
Log Message:
auto-import mISDN-0-1.cvs20061010.fc6 on branch devel from mISDN-0-1.cvs20061010.fc6.src.rpm

mISDN-libdir.patch:

--- NEW FILE mISDN-libdir.patch ---
? debugfiles.list
? debugsources.list
? example/misdnportinfo
? example/testlayer1
? include/linux
? tenovis/testlib
? tenovis/tstlib
Index: Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile	15 Aug 2006 18:57:31 -0000	1.6
+++ Makefile	17 Oct 2006 09:29:48 -0000
@@ -21,6 +21,9 @@ export mISDN_DIR
 INCLUDEDIR := $(mISDN_DIR)/include
 export INCLUDEDIR
 
+LIBDIR=/usr/lib
+export LIBDIR
+
 CFLAGS:= -g -Wall -O2 -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
 CFLAGS+= -D CLOSE_REPORT=1
 ifeq ($(shell uname -m),x86_64)
@@ -49,7 +52,7 @@ all: test_misdn_includes
 install_path:
 	mkdir -p $(INSTALL_PREFIX)/usr/bin/
 	mkdir -p $(INSTALL_PREFIX)/usr/include/mISDNuser/
-	mkdir -p $(INSTALL_PREFIX)/usr/lib/
+	mkdir -p $(INSTALL_PREFIX)/$(LIBDIR)
 
 
 install: install_path all
Index: i4lnet/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/i4lnet/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- i4lnet/Makefile	16 Aug 2006 21:37:11 -0000	1.2
+++ i4lnet/Makefile	17 Oct 2006 09:29:48 -0000
@@ -1,8 +1,8 @@
 all: libisdnnet.a libisdnnet.so
 
 install:
-	install -m 644 libisdnnet.so $(INSTALL_PREFIX)/usr/lib
-	install -m 644 libisdnnet.a $(INSTALL_PREFIX)/usr/lib
+	install -m 644 libisdnnet.so $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 644 libisdnnet.a $(INSTALL_PREFIX)/$(LIBDIR)
 	cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
 ISDNNETOBJ = net_if.o isdn_debug.o isdn_msg.o fsm.o net_l2.o tei.o net_l3.o \
Index: lib/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/lib/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- lib/Makefile	16 Aug 2006 21:37:12 -0000	1.4
+++ lib/Makefile	17 Oct 2006 09:29:48 -0000
@@ -2,8 +2,8 @@
 all: libmISDN.a libmISDN.so
 
 install:
-	install -m 644 libmISDN.so $(INSTALL_PREFIX)/usr/lib
-	install -m 644 libmISDN.a $(INSTALL_PREFIX)/usr/lib
+	install -m 644 libmISDN.so $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 644 libmISDN.a $(INSTALL_PREFIX)/$(LIBDIR)
 
 LIBMISDN_OBJS = device.o layer.o stack.o status.o
 
Index: suppserv/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/suppserv/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- suppserv/Makefile	16 Aug 2006 21:37:12 -0000	1.2
+++ suppserv/Makefile	17 Oct 2006 09:29:48 -0000
@@ -8,8 +8,8 @@ all: libsuppserv.a libsuppserv.so
 main: $(SUPPSERVOBJ)
 
 install:
-	install -m 644 libsuppserv.so $(INSTALL_PREFIX)/usr/lib
-	install -m 644 libsuppserv.a $(INSTALL_PREFIX)/usr/lib
+	install -m 644 libsuppserv.so $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 644 libsuppserv.a $(INSTALL_PREFIX)/$(LIBDIR)
 	cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
 libsuppserv.so: $(SUPPSERVOBJ)

mISDN-soname.patch:

--- NEW FILE mISDN-soname.patch ---
Index: i4lnet/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/i4lnet/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- i4lnet/Makefile	16 Aug 2006 21:37:11 -0000	1.2
+++ i4lnet/Makefile	17 Oct 2006 09:37:22 -0000
@@ -1,16 +1,21 @@
+SOMAJOR=0
+SOMINOR=0.0
+SOVERSION=$(SOMAJOR).$(SOMINOR)
 
-all: libisdnnet.a libisdnnet.so
+all: libisdnnet.a libisdnnet.so.$(SOVERSION)
 
 install:
-	install -m 644 libisdnnet.so $(INSTALL_PREFIX)/$(LIBDIR)
-	install -m 644 libisdnnet.a $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 755 libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
+	ln -sf libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libisdnnet.so.$(SOMAJOR)
+	ln -sf libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libisdnnet.so
+	install -m 644 libisdnnet.a $(INSTALL_PREFIX)/$(LIBDIR)
 	cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
 ISDNNETOBJ = net_if.o isdn_debug.o isdn_msg.o fsm.o net_l2.o tei.o net_l3.o \
 		manager.o tone.o bchannel.o g711.o
 
-libisdnnet.so: $(ISDNNETOBJ)
-	$(CC) -shared -Xlinker -x -o $@ $^
+libisdnnet.so.$(SOVERSION): $(ISDNNETOBJ)
+	$(CC) -shared -Xlinker -x -Wl,-soname,libisdnnet.so.$(SOMAJOR) -o $@ $^
 
 libisdnnet.a: $(ISDNNETOBJ)
 	ar cr $@ $^
Index: lib/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/lib/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- lib/Makefile	16 Aug 2006 21:37:12 -0000	1.4
+++ lib/Makefile	17 Oct 2006 09:37:22 -0000
@@ -1,14 +1,19 @@
+SOMAJOR=0
+SOMINOR=0.0
+SOVERSION=$(SOMAJOR).$(SOMINOR)
 
-all: libmISDN.a libmISDN.so
+all: libmISDN.a libmISDN.so.$(SOVERSION)
 
 install:
-	install -m 644 libmISDN.so $(INSTALL_PREFIX)/$(LIBDIR)
-	install -m 644 libmISDN.a $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 755 libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
+	ln -sf libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libmISDN.so.$(SOMAJOR)
+	ln -sf libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libmISDN.so
+	install -m 644 libmISDN.a $(INSTALL_PREFIX)/$(LIBDIR)
 
 LIBMISDN_OBJS = device.o layer.o stack.o status.o
 
-libmISDN.so: $(LIBMISDN_OBJS)
-	$(CC) -shared -Xlinker -x -o $@ $^
+libmISDN.so.$(SOVERSION): $(LIBMISDN_OBJS)
+	$(CC) -shared -Xlinker -x -Wl,-soname,libmISDN.so.$(SOMAJOR) -o $@ $^
 
 libmISDN.a: $(LIBMISDN_OBJS)
 	ar cr $@ $^
Index: suppserv/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/suppserv/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- suppserv/Makefile	16 Aug 2006 21:37:12 -0000	1.2
+++ suppserv/Makefile	17 Oct 2006 09:37:22 -0000
@@ -1,19 +1,24 @@
+SOMAJOR=0
+SOMINOR=0.0
+SOVERSION=$(SOMAJOR).$(SOMINOR)
 
 #CFLAGS += -DASN1_DEBUG
 
 SUPPSERVOBJ = asn1.o asn1_enc.o asn1_generic.o asn1_aoc.o asn1_basic_service.o asn1_comp.o asn1_diversion.o asn1_address.o fac.o
 
-all: libsuppserv.a libsuppserv.so
+all: libsuppserv.a libsuppserv.so.$(SOVERSION)
 
 main: $(SUPPSERVOBJ)
 
 install:
-	install -m 644 libsuppserv.so $(INSTALL_PREFIX)/$(LIBDIR)
-	install -m 644 libsuppserv.a $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 755 libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
+	ln -sf libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libsuppserv.so.$(SOMAJOR)
+	ln -sf libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libsuppserv.so
+	install -m 644 libsuppserv.a $(INSTALL_PREFIX)/$(LIBDIR)
 	cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
-libsuppserv.so: $(SUPPSERVOBJ)
-	$(CC) -shared -Xlinker -x -o $@ $^
+libsuppserv.so.$(SOVERSION): $(SUPPSERVOBJ)
+	$(CC) -shared -Xlinker -x -Wl,-soname,libsuppserv.so.$(SOMAJOR) -o $@ $^
 
 libsuppserv.a: $(SUPPSERVOBJ)
 	ar cr $@ $^


--- NEW FILE mISDN.rules ---
SUBSYSTEM=="mISDN-objects", KERNEL=="obj-0", NAME="mISDN", OWNER="misdn", GROUP="misdn", MODE="0660"


--- NEW FILE mISDN.spec ---
%define snap 20061010

# Don't build the debugging utils by default.
%bcond_with utils

Name:		mISDN
Version:	0
Release:	1.cvs%{snap}%{?dist}
Summary:	Userspace part of Modular ISDN stack

Group:		System Environment/Libraries
License:	LGPL
URL:		http://www.isdn4linux.de/mISDN/
# export CVSROOT=:pserver:anonymous:readonly at cvs.isdn4linux.de:/i4ldev
# cvs co -D%{snap} mISDNuser
Source0:	mISDNuser-20061010.tar.gz
# cvs co -D%{snap}  mISDN/include/linux/mISDNif.h
Source1:	mISDNif.h
Source2:	mISDN.rules
Patch0:		mISDN-libdir.patch
Patch1:		mISDN-soname.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(pre): fedora-usermgmt
Requires(postun): fedora-usermgmt

Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%package devel
Summary:	Development files Modular ISDN stack
Group:		System Environment/Libraries
Requires:	mISDN = %{version}-%{release}

%package utils
Summary:	Debugging utilities for Modular ISDN stack
Group:		Applications/System

%description
mISDN (modular ISDN) is intended to be the new ISDN stack for the
Linux 2.6 kernel, from the maintainer of the existing isdn4linux
code. This package contains the userspace libraries required to
interface directly to mISDN.

%description devel
mISDN (modular ISDN) is intended to be the new ISDN stack for the
Linux 2.6 kernel, from the maintainer of the existing isdn4linux
code. This package contains the development files for userspace
libraries required to interface to mISDN, needed for compiling
applications which use mISDN directly such as OpenPBX.

%description utils
mISDN (modular ISDN) is intended to be the new ISDN stack for the
Linux 2.6 kernel, from the maintainer of the existing isdn4linux
code. This package contains test utilities for mISDN.

%prep
%setup -q -n mISDNuser
%patch0 -p0
%patch1 -p0
mkdir include/linux
cp %SOURCE1 include/linux
rm -rf voip

%build
make %{?_smp_mflags} CFLAGS="-I`pwd`/include $RPM_OPT_FLAGS -fPIC" MISDNDIR=`pwd`


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL_PREFIX=$RPM_BUILD_ROOT MISDNDIR=`pwd` LIBDIR=%_libdir
mkdir $RPM_BUILD_ROOT/%{_includedir}/mISDNuser/linux
install -m0644 %SOURCE1 $RPM_BUILD_ROOT/%{_includedir}/mISDNuser/linux/mISDNif.h
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d
install -m0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/mISDN.rules

%clean
rm -rf $RPM_BUILD_ROOT

%post 
/sbin/ldconfig
/usr/sbin/fedora-groupadd 31 -r misdn &>/dev/null || :
/usr/sbin/fedora-useradd  31 -r -s /sbin/nologin -d / -M \
		-c 'Modular ISDN' -g misdn misdn &>/dev/null || :

%postun
/sbin/ldconfig
test "$1" != 0 || /usr/sbin/fedora-userdel  misdn &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel misdn &>/dev/null || :

%files 
%defattr(-,root,root,-)
%_libdir/*.so.*
%doc COPYING.LIB LICENSE
%config(noreplace) %{_sysconfdir}/udev/rules.d/mISDN.rules
%exclude %_bindir/*

%files devel
%defattr(-,root,root,-)
%_includedir/mISDNuser
%_libdir/*.so
%exclude %_libdir/*.a

%if 0%{?with_utils}
%files utils
%defattr(-,root,root,-)
%_bindir/*
%endif

%changelog
* Tue Oct 17 2006 David Woodhouse <dwmw2 at infradead.org> 0-1.cvs20061010
- Initial import


--- NEW FILE mISDNif.h ---
/* $Id: mISDNif.h,v 1.41 2006/10/09 12:51:33 crich Exp $
 *
 */

#ifndef mISDNIF_H
#define mISDNIF_H

#include <stdarg.h>
#include <linux/types.h>
#include <linux/errno.h>

/*
 * ABI Version 32 bit
 *
 * <16 bit> Major version
 *		- changed if any interface become backwards incompatible
 *
 * <16 bit> Minor version
 *              - changed if any interface is extended but backwards compatible
 *
 */
#define	MISDN_MAJOR_VERSION	5
#define	MISDN_MINOR_VERSION	0
#define	MISDN_VERSION		((MISDN_MAJOR_VERSION<<16) | MISDN_MINOR_VERSION)

#define MISDN_REVISION		"$Revision: 1.41 $"
#define MISDN_DATE		"$Date: 2006/10/09 12:51:33 $"

/* collect some statistics about the message queues */
//#define MISDN_MSG_STATS

/* primitives for information exchange
 * generell format
 * <8 bit reserved>
 * <4 bit flags>
 * <4 bit layer>
 * <8 bit command>
 * <8 bit subcommand>
 *
 */

#define MISDN_CMD_MASK	0xffffff00
#define MISDN_SUB_MASK	0x000000ff

/* SUBCOMMANDS */
#define REQUEST		0x80
#define CONFIRM		0x81
#define INDICATION	0x82
#define RESPONSE	0x83
#define SUB_ERROR	0xff

/* management */
#define MGR_FUNCTION	0x0f0000
#define MGR_GETOBJECT	0x0f0100
#define MGR_NEWOBJECT	0x0f0200
#define MGR_DELOBJECT	0x0f0300
#define MGR_NEWENTITY	0x0f0600
#define MGR_DELENTITY	0x0f0700
#define MGR_GETSTACK	0x0f1100
#define MGR_NEWSTACK	0x0f1200
#define MGR_DELSTACK	0x0f1300
#define MGR_SETSTACK	0x0f1400
#define MGR_CLEARSTACK	0x0f1500
#define MGR_REGLAYER	0x0f1600
#define MGR_UNREGLAYER	0x0f1700
#define MGR_SELCHANNEL	0x0f1800
#define MGR_SETSTACK_NW	0x0f1900
#define MGR_ADDSTPARA	0x0f1A00
#define MGR_CLRSTPARA	0x0f1B00
#define MGR_ADDLAYER	0x0f1C00
#define MGR_GETLAYER	0x0f2100
#define MGR_GETLAYERID	0x0f2200
#define MGR_NEWLAYER	0x0f2300
#define MGR_DELLAYER	0x0f2400
//#define MGR_CLONELAYER	0x0f2500
//#define MGR_GETIF	0x0f3100
//#define MGR_CONNECT	0x0f3200
//#define MGR_DISCONNECT	0x0f3300
//#define MGR_SETIF	0x0f3400
//#define MGR_ADDIF	0x0f3500
//#define MGR_QUEUEIF	0x0f3600
#define MGR_CTRLREADY	0x0f4100
#define MGR_STACKREADY	0x0f4200
#define MGR_STOPSTACK	0x0f4300
#define MGR_STARTSTACK	0x0f4400
#define MGR_RELEASE	0x0f4500
#define MGR_GETDEVICE	0x0f5100
#define MGR_DELDEVICE	0x0f5200
#define MGR_SETDEVOPT	0x0f5300
#define MGR_GETDEVOPT	0x0f5400
#define MGR_INITTIMER	0x0f8100
#define MGR_ADDTIMER	0x0f8200
#define MGR_DELTIMER	0x0f8300
#define MGR_REMOVETIMER	0x0f8400
#define MGR_TIMER	0x0f8800
#define MGR_CONTROL	0x0fe100
#define MGR_STATUS	0x0fe200
#define MGR_HASPROTOCOL	0x0fe300
#define MGR_EVALSTACK	0x0fe400
#define MGR_GLOBALOPT	0x0fe500
#define MGR_SHORTSTATUS	0x0fe600
#define MGR_LOADFIRM	0x0ff000
#define MGR_LOGDATA	0x0ff100
#define MGR_DEBUGDATA	0x0ff200
#define MGR_VERSION	0x0fff00

/* layer 1 <-> hardware */
#define PH_SIGNAL	0x000100
#define PH_CONTROL	0x000200
#define PH_STATUS	0x000300

/* PH_SIGNAL parameter */
#define INFO0		0x1000
#define INFO1		0x1100
#define INFO2		0x1200
#define INFO3_P8	0x1308
#define INFO3_P10	0x130a
#define INFO4_P8	0x1408
#define INFO4_P10	0x140a
#define D_RX_MON0	0x1800
#define D_TX_MON0	0x1801
#define D_RX_MON1	0x1810
#define D_TX_MON1	0x1811
#define LOSTFRAMING	0x1f00
#define ANYSIGNAL	0x1f01

/* PH_CONTROL parameter */
#define HW_RESET	0x0001
#define HW_POWERDOWN	0x0100
#define HW_POWERUP	0x0101
#define HW_DEACTIVATE	0x0200
#define HW_ACTIVATE	0x0201
#define HW_MOD_FRM	0x0400
#define HW_MOD_FRH	0x0401
#define HW_MOD_FTM	0x0402
#define HW_MOD_FTH	0x0403
#define HW_MOD_FTS	0x0404
#define HW_MOD_CONNECT	0x0410
#define HW_MOD_OK	0x0411
#define HW_MOD_NOCARR	0x0412
#define HW_MOD_FCERROR	0x0413
#define HW_MOD_READY	0x0414
#define HW_MOD_LASTDATA	0x0415
#define HW_MOD_SILENCE	0x0416
#define HW_FEATURES	0x04ff
#define HW_HFC_COEFF	0x0500
#define HW_LOS		0x0501
#define HW_LOS_OFF	0x0502
#define HW_AIS		0x0503
#define HW_AIS_OFF	0x0504
#define HW_SLIP_TX	0x0505
#define HW_SLIP_RX	0x0506
#define HW_PCM_CONN	0x0580
#define HW_PCM_DISC	0x0581
#define HW_CONF_JOIN	0x0582
#define HW_CONF_SPLIT	0x0583
#define HW_RECEIVE_OFF	0x0584
#define HW_RECEIVE_ON	0x0585
#define HW_SPL_LOOP_ON	0x0586
#define HW_SPL_LOOP_OFF	0x0587
#define HW_ECHOCAN_ON 	0x0588
#define HW_ECHOCAN_OFF 	0x0589
#define HW_TESTLOOP	0xFF00
#define HW_FIRM_START	0xFF10
#define HW_FIRM_DATA	0xFF11
#define HW_FIRM_END	0xFF12
#define HW_D_BLOCKED	0xFF20
#define HW_D_NOBLOCKED	0xFF21
#define HW_TESTRX_RAW	0xFF40
#define HW_TESTRX_HDLC	0xFF41
#define HW_TESTRX_OFF	0xFF4f
/* TOUCH TONE IS 0x20XX  XX "0"..."9", "A","B","C","D","*","#" */
#define DTMF_TONE_VAL	0x2000
#define DTMF_TONE_MASK	0x007F
#define DTMF_TONE_START	0x2100
#define DTMF_TONE_STOP	0x2200
#define CMX_CONF_JOIN	0x2300
#define CMX_CONF_SPLIT	0x2301
#define CMX_ECHO_ON	0x2302
#define CMX_ECHO_OFF	0x2303
#define CMX_RECEIVE_OFF	0x2304
#define CMX_RECEIVE_ON	0x2305
#define CMX_MIX_ON	0x2306
#define CMX_MIX_OFF	0x2307
#define TONE_PATT_ON	0x2310
#define TONE_PATT_OFF	0x2311
#define VOL_CHANGE_TX	0x2312
#define VOL_CHANGE_RX	0x2313
#define BF_ENABLE_KEY	0x2314
#define BF_DISABLE	0x2315
#define BF_ACCEPT	0x2316
#define BF_REJECT	0x2317
#define ECHOCAN_ON	0x2318
#define ECHOCAN_OFF	0x2319
#define HW_POTS_ON		0x1001
#define HW_POTS_OFF		0x1002
#define HW_POTS_SETMICVOL	0x1100
#define HW_POTS_SETSPKVOL	0x1101
#define HW_POTS_GETMICVOL	0x1110
#define HW_POTS_GETSPKVOL	0x1111

/* TONE_PATT_ON parameter */
#define TONE_OFF			0x0000
#define TONE_GERMAN_DIALTONE		0x0001
#define TONE_GERMAN_OLDDIALTONE		0x0002
#define TONE_AMERICAN_DIALTONE		0x0003
#define TONE_GERMAN_DIALPBX		0x0004
#define TONE_GERMAN_OLDDIALPBX		0x0005
#define TONE_AMERICAN_DIALPBX		0x0006
#define TONE_GERMAN_RINGING		0x0007
#define TONE_GERMAN_OLDRINGING		0x0008
#define TONE_AMERICAN_RINGPBX		0x000b
#define TONE_GERMAN_RINGPBX		0x000c
#define TONE_GERMAN_OLDRINGPBX		0x000d
#define TONE_AMERICAN_RINGING		0x000e
#define TONE_GERMAN_BUSY		0x000f
#define TONE_GERMAN_OLDBUSY		0x0010
#define TONE_AMERICAN_BUSY		0x0011
#define TONE_GERMAN_HANGUP		0x0012
#define TONE_GERMAN_OLDHANGUP		0x0013
#define TONE_AMERICAN_HANGUP		0x0014
#define TONE_SPECIAL_INFO		0x0015
#define TONE_GERMAN_GASSENBESETZT	0x0016
#define TONE_GERMAN_AUFSCHALTTON	0x0016

#define GLOBALOPT_INTERNAL_CTRL		0x0001
#define GLOBALOPT_EXTERNAL_EQUIPMENT	0x0002
#define GLOBALOPT_HANDSET		0x0004
#define GLOBALOPT_DTMF			0x0008
#define GLOBALOPT_SUPPLEMENTARY_SERVICE	0x0010
#define GLOBALOPT_CHANNEL_ALLOCATION	0x0020
#define GLOBALOPT_PARAMETER_B_CHANNEL	0x0040
#define GLOBALOPT_LINE_INTERCONNECT	0x0080


/* layer 1 */
#define PH_ACTIVATE	0x010100
#define PH_DEACTIVATE	0x010000
#define PH_DATA		0x110200
#define MPH_DEACTIVATE	0x011000
#define MPH_ACTIVATE	0x011100
#define MPH_INFORMATION	0x012000

/* layer 2 */
#define DL_ESTABLISH	0x020100
#define DL_RELEASE	0x020000
#define DL_DATA		0x120200
#define DL_UNITDATA	0x120300
#define MDL_UNITDATA	0x121200
#define MDL_ASSIGN	0x022100
#define MDL_REMOVE	0x022000
#define MDL_ERROR	0x023000
#define MDL_INFORMATION	0x024000
#define MDL_STATUS	0x028100
#define MDL_FINDTEI	0x028200

/* layer 3 */
#define CC_ALERTING		0x030100
#define CC_PROCEEDING		0x030200
#define CC_PROGRESS		0x030300
#define CC_SETUP		0x030500
#define CC_CONNECT		0x030700
#define CC_SETUP_ACKNOWLEDGE	0x030d00
#define CC_CONNECT_ACKNOWLEDGE	0x030f00
#define CC_USER_INFORMATION	0x032000
#define CC_SUSPEND_REJECT	0x032100
#define CC_RESUME_REJECT	0x032200
#define CC_HOLD			0x032400
#define CC_SUSPEND		0x032500
#define CC_RESUME		0x032600
#define CC_HOLD_ACKNOWLEDGE	0x032800
#define CC_SUSPEND_ACKNOWLEDGE	0x032d00
#define CC_RESUME_ACKNOWLEDGE	0x032e00
#define CC_HOLD_REJECT		0x033000
#define CC_RETRIEVE		0x033100
#define CC_RETRIEVE_ACKNOWLEDGE	0x033300
#define CC_RETRIEVE_REJECT	0x033700
#define CC_DISCONNECT		0x034500
#define CC_RESTART		0x034600
#define CC_RELEASE		0x034d00
#define CC_RELEASE_COMPLETE	0x035a00
#define CC_FACILITY		0x036200
#define CC_NOTIFY		0x036e00
#define CC_STATUS_ENQUIRY	0x037500
#define CC_INFORMATION		0x037b00
#define CC_STATUS		0x037d00

#define CC_NEW_CR		0x03f000
#define CC_RELEASE_CR		0x03f100
#define CC_TIMEOUT		0x03ff00

#define CC_B3_DATA		0x138600

#define CAPI_MESSAGE_REQUEST	0x040080

#define LAYER_MASK	0x0F0000
#define COMMAND_MASK	0x00FF00
#define SUBCOMMAND_MASK	0x0000FF
#define DATA_COMMAND	0x100000
#define CMD_IS_DATA(p)	(p & DATA_COMMAND)

/* short cuts layer 1 */
#define PH_ACTIVATE_REQ		(PH_ACTIVATE | REQUEST)
#define PH_ACTIVATE_IND		(PH_ACTIVATE | INDICATION)
#define PH_DEACTIVATE_IND	(PH_DEACTIVATE | INDICATION)
#define PH_DATA_REQ		(PH_DATA | REQUEST)
#define PH_DATA_IND		(PH_DATA | INDICATION)
#define PH_DATA_CNF		(PH_DATA | CONFIRM)
#define PH_DATA_RSP		(PH_DATA | RESPONSE)
#define MPH_ACTIVATE_REQ	(MPH_ACTIVATE | REQUEST)
#define MPH_DEACTIVATE_REQ	(MPH_DEACTIVATE | REQUEST)
#define MPH_INFORMATION_IND	(MPH_INFORMATION | INDICATION)

/* short cuts layer 2 */
#define DL_ESTABLISH_REQ	(DL_ESTABLISH | REQUEST)
#define DL_ESTABLISH_IND	(DL_ESTABLISH | INDICATION)
#define DL_ESTABLISH_CNF	(DL_ESTABLISH | CONFIRM)
#define DL_RELEASE_REQ		(DL_RELEASE | REQUEST)
#define DL_RELEASE_IND		(DL_RELEASE | INDICATION)
#define DL_RELEASE_CNF		(DL_RELEASE | CONFIRM)
#define DL_DATA_REQ		(DL_DATA | REQUEST)
#define DL_DATA_IND		(DL_DATA | INDICATION)
#define DL_UNITDATA_REQ		(DL_UNITDATA | REQUEST)
#define DL_UNITDATA_IND		(DL_UNITDATA | INDICATION)
#define MDL_ASSIGN_REQ		(MDL_ASSIGN | REQUEST)
#define MDL_ASSIGN_IND		(MDL_ASSIGN | INDICATION)
#define MDL_REMOVE_REQ		(MDL_REMOVE | REQUEST)
#define MDL_ERROR_IND		(MDL_ERROR | INDICATION)
#define MDL_ERROR_RSP		(MDL_ERROR | RESPONSE)
#define MDL_INFORMATION_IND	(MDL_INFORMATION | INDICATION)

/* protocol id */
#define ISDN_PID_NONE			0
#define ISDN_PID_ANY			0xffffffff
#define ISDN_PID_L0_TE_S0		0x00000001
#define ISDN_PID_L0_NT_S0		0x00000100
#define ISDN_PID_L0_TE_U		0x00000002
#define ISDN_PID_L0_NT_U		0x00000200
#define ISDN_PID_L0_TE_UP2		0x00000004
#define ISDN_PID_L0_NT_UP2		0x00000400
#define ISDN_PID_L0_TE_E1		0x00000008
#define ISDN_PID_L0_NT_E1		0x00000800
#define ISDN_PID_L0_IP_S0		0x00000010
#define ISDN_PID_L0_IP_E1		0x00000020
#define ISDN_PID_L0_LOOP		0x00000030
#define ISDN_PID_L1_TE_S0		0x01000001
#define ISDN_PID_L1_NT_S0		0x01000100
#define ISDN_PID_L1_TE_U		0x01000002
#define ISDN_PID_L1_NT_U		0x01000200
#define ISDN_PID_L1_TE_UP2		0x01000004
#define ISDN_PID_L1_NT_UP2		0x01000400
#define ISDN_PID_L1_TE_E1		0x01000008
#define ISDN_PID_L1_NT_E1		0x01000800
#define ISDN_PID_L2_LAPD		0x02000001
#define ISDN_PID_L2_LAPD_NET		0x02000002
/* Bit 15-0  reserved for CAPI defined protocols */
#define ISDN_PID_L0_B_IP		0x40000001
#define ISDN_PID_L1_B_64HDLC		0x41000001
#define ISDN_PID_L1_B_64TRANS		0x41000002
#define ISDN_PID_L1_B_V110_ASYNC	0x41000004
#define ISDN_PID_L1_B_V110_HDLC		0x41000008
#define ISDN_PID_L1_B_T30FAX		0x41000010
#define ISDN_PID_L1_B_64HDLC_INV	0x41000020
#define ISDN_PID_L1_B_56TRANS		0x41000040
#define ISDN_PID_L1_B_MODEM_ALL		0x41000080
#define ISDN_PID_L1_B_MODEM_ASYNC	0x41000100
#define ISDN_PID_L1_B_MODEM_HDLC	0x41000200
/* Bit 15-0  reserved for CAPI defined protocols */
#define ISDN_PID_L2_B_X75SLP		0x42000001
#define ISDN_PID_L2_B_TRANS		0x42000002
#define ISDN_PID_L2_B_TRANSDTMF		0x42300002
#define ISDN_PID_L2_B_RAWDEV		0x42400002
#define ISDN_PID_L2_B_SDLC		0x42000004
#define ISDN_PID_L2_B_LAPD		0x42000008
#define ISDN_PID_L2_B_T30		0x42000010
#define ISDN_PID_L2_B_PPP		0x42000020
#define ISDN_PID_L2_B_TRANSNOERR	0x42000040
#define ISDN_PID_L2_B_MODEM		0x42000080
#define ISDN_PID_L2_B_X75SLPV42BIS	0x42000100
#define ISDN_PID_L2_B_V120ASYNC		0x42000200
#define ISDN_PID_L2_B_V120ASYNCV42BIS	0x42000400
#define ISDN_PID_L2_B_V120TRANS		0x42000800
#define ISDN_PID_L2_B_LAPDFREESAPI	0x42001000
#define ISDN_PID_L3_B_TRANS		0x43000001
#define ISDN_PID_L3_B_T90NL		0x43000002
#define ISDN_PID_L3_B_X25DTE		0x43000004
#define ISDN_PID_L3_B_X25DCE		0x43000008
#define ISDN_PID_L3_B_T30		0x43000010
#define ISDN_PID_L3_B_T30EXT		0x43000020
#define ISDN_PID_L3_B_MODEM		0x43000080
/* Bit 15-0  reserved for CAPI defined protocols */
#define ISDN_PID_L3_B_DSP		0x43010000
#define ISDN_PID_L3_DSS1USER		0x03000001
#define ISDN_PID_L3_DSS1NET		0x03000100
#define ISDN_PID_L4_CAPI20		0x04000001
#define ISDN_PID_L4_B_CAPI20		0x44000001

#define ISDN_PID_BCHANNEL_BIT		0x40000000
#define ISDN_PID_LAYER_MASK		0x0f000000
#define ISDN_PID_LAYER(n)		(n<<24)
#define ISDN_PID_FEATURE_MASK		0x00F00000
#define ISDN_PID_IDX_MAX		23

#define ISDN_PID_L2_DF_PTP		0x00100000
#define ISDN_PID_L2_DF_MULT_TEI		0x00200000
#define	ISDN_PID_L3_DF_PTP		0x00100000
#define ISDN_PID_L3_DF_EXTCID		0x00200000
#define ISDN_PID_L3_DF_CRLEN2		0x00400000


// short message status
#define SSTATUS_ALL		0x0fffffff
#define SSTATUS_BROADCAST_BIT	0x10000000
#define SSTATUS_L1		0x01ffffff
#define SSTATUS_L2		0x02ffffff
#define SSTATUS_L1_DEACTIVATED	0x01000000
#define SSTATUS_L1_ACTIVATED	0x01000001
#define SSTATUS_L2_RELEASED	0x02000000
#define SSTATUS_L2_ESTABLISHED	0x02000001


#define mISDN_CORE_DEVICE	0
#define mISDN_RAW_DEVICE	128

#define FLG_mISDNPORT_BUSY	1
#define FLG_mISDNPORT_ENABLED	2
#define FLG_mISDNPORT_BLOCK	3
#define FLG_mISDNPORT_OPEN	4
#define FLG_mISDNPORT_ONEFRAME	5


/*
 * A "ENTITY" is a instance which assign id's with a none local
 * scope. A id has a local part (a range of ids which the instance
 * maintains) and the global ENTITY ID.
 * A instance which wan't to assign IDs have to request a unique
 * ENTITY ID with MGR_NEWENTITY | REQUEST.
 * If the instance is deleted or don't need this feature anymore
 * it has to delete the ENTITY with MGR_DELENTITY | REQUEST.
 * ENTITY ID 0xFFFF is a special one.
 * One example for using this is the L3/L4 process ID.
 */

#define MISDN_MAX_ENTITY	2048
#define MISDN_ENTITY_NONE	0x0000ffff
#define MISDN_ID_ENTITYMASK	0xffff0000
#define MISDN_ID_LOCALMASK	0x0000FFFF
#define MISDN_ID_ANY		0xffffffff
#define MISDN_ID_NONE		0xfffffffe
#define MISDN_ID_DUMMY		0xffff0001
#define MISDN_ID_GLOBAL		0xffff0002

#define MAX_LAYER_NR		7
#define ISDN_LAYER(n)		(1<<n)
#define LAYER_OUTRANGE(layer)	((layer<0) || (layer>MAX_LAYER_NR))

/* should be in sync with linux/kobject.h:KOBJ_NAME_LEN */
#define mISDN_MAX_IDLEN		20

#ifdef OBSOLETE
#define IF_NOACTIV	0x00000000
#define IF_DOWN		0x01000000
#define IF_UP		0x02000000
#define IF_CHAIN	0x04000000
#define IF_HANDSHAKE	0x08000000
#define IF_TYPEMASK	0x07000000
#define IF_ADDRMASK	0xF0FFFFFF
#define IF_IADDRMASK	0xF0FFFFFF
#define IF_CONTRMASK	0x000000FF
#define IF_CHILDMASK	0x1000FF00
#define IF_CLONEMASK	0x2000FF00
#define IF_INSTMASK	0x400F0000
#define IF_LAYERMASK	0x00F00000
#define IF_TYPE(i)	((i)->stat & IF_TYPEMASK)
#endif

/*
 * general ID layout for instance and stack id's
 * 3322 2222 2222 1111 1111 1100 0000 0000
 * 1098 7654 3210 9876 5432 1098 7654 3210
 * FFFF FFFF CCCC CCCC SSSS SSSS RRRR LLLL
 *
 * L (bit 03-00) Layer ID
 * R (bit 06-04) reserved (0)
 * U (bit 07)    user device id
 * S (bit 15-08) Stack ID/controller number
 * C (bit 23-16) Child/Clone ID
 * F (bit 31-24) Flags as defined below
 *
 */

#define FLG_MSG_DOWN	0x01000000
#define FLG_MSG_UP	0x02000000
#define FLG_MSG_TARGET	0x04000000
#define FLG_MSG_CLONED	0x08000000
#define FLG_CHILD_STACK	0x10000000
#define FLG_CLONE_STACK	0x20000000
#define FLG_INSTANCE	0x40000000
#define FLG_MSG_TAGGED	0x80000000
#define MSG_DIR_MASK	0x03000000
#define MSG_BROADCAST	0x03000000
#define MSG_TO_OWNER	0x00000000

#define CHILD_ID_INC	0x00010000
#define CHILD_ID_MAX	0x10FF0000
#define CHILD_ID_MASK	0x00FF0000
#define CLONE_ID_INC	0x00010000
#define CLONE_ID_MAX	0x20FF0000
#define CLONE_ID_MASK	0x00FF0000
#define STACK_ID_INC	0x00000100
#define STACK_ID_MAX	0x00007F00
#define STACK_ID_MASK	0x30FFFF00
#define MASTER_ID_MASK	0x0000FF00
#define LAYER_ID_INC	0x00000001
#define LAYER_ID_MAX	MAX_LAYER_NR
#define LAYER_ID_MASK	0x0000000F
#define FLG_ID_USER	0x00000080
#define INST_ID_MASK	0x70FFFFFF

#define DUMMY_CR_FLAG	0x7FFFFF00
// #define CONTROLER_MASK	0x0000FF

/* stack channel values */
#define CHANNEL_NUMBER	0x000000FF
#define CHANNEL_RXSLOT	0x0000FF00
#define CHANNEL_TXSLOT	0x00FF0000
#define CHANNEL_EXTINFO	0xFF000000
#define CHANNEL_NR_D	0x00000000
#define CHANNEL_NR_B1	0x00000001
#define CHANNEL_NR_B2	0x00000002
#define CHANNEL_EXT_PCM	0x01000000
#define CHANNEL_EXT_REV	0x02000000

/* instance/stack extentions */
#define EXT_STACK_CLONE 0x00000001
#define EXT_INST_CLONE	0x00000100
#define EXT_INST_MGR	0x00000200
#define EXT_INST_MIDDLE	0x00000400
#define EXT_INST_UNUSED 0x00000800
//#define EXT_IF_CHAIN	0x00010000
//#define EXT_IF_EXCLUSIV	0x00020000
//#define EXT_IF_CREATE	0x00040000
//#define EXT_IF_SPLIT	0x00080000

/* stack status flag */
#define mISDN_STACK_ACTION_MASK		0x0000ffff
#define mISDN_STACK_COMMAND_MASK	0x000f0000
#define mISDN_STACK_STATUS_MASK		0xfff00000
/* action bits 0-15 */
#define mISDN_STACK_WORK	0
#define mISDN_STACK_SETUP	1
#define mISDN_STACK_CLEARING	2
#define mISDN_STACK_RESTART	3
#define mISDN_STACK_WAKEUP	4
#define mISDN_STACK_ABORT	15
/* status bits 16-31 */
#define mISDN_STACK_STOPPED	16
#define mISDN_STACK_INIT	17
#define mISDN_STACK_THREADSTART	18
#define mISDN_STACK_ACTIVE	29
#define mISDN_STACK_RUNNING	30
#define mISDN_STACK_KILLED	31

/* special packet type */
#define PACKET_NOACK	250

/* limits for buffers */

#define MAX_PHONE_DIGIT		31
#define MAX_DFRAME_LEN		260
#define MAX_DATA_SIZE		2048
#define MAX_DATA_MEM		2080
#define MAX_HEADER_LEN		4
#define	DEFAULT_PORT_QUEUELEN	256
#define PORT_SKB_RESERVE	L3_EXTRA_SIZE
#define PORT_SKB_MINIMUM	128

/* structure for information exchange between layer/entity boundaries */

#define STATUS_INFO_L1	1
#define STATUS_INFO_L2	2

typedef struct _mISDN_head {
	u_int	addr;
	u_int	prim;
	int	dinfo;
	int	len;
}  __attribute__((packed)) mISDN_head_t;

#define mISDN_HEADER_LEN	sizeof(mISDN_head_t)

typedef struct _status_info {
	int	len;
	int	typ;
	u_char	info[120];
} status_info_t;

typedef struct _logdata {
	char    *head;
	char	*fmt;
	va_list args;
} logdata_t;

typedef struct _moditem {
	char	*name;
	int	protocol;
} moditem_t;

typedef struct _mISDN_pid {
	int	protocol[MAX_LAYER_NR +1];
	int	layermask;
	int	maxplen;
	/* 0 is defined as no prameter, all other values are offsets into pbuf
	 * so pbuf[0] is always unused */
	u16	param[MAX_LAYER_NR +1];
	u16	global;
	u16	pidx;
	u_char	*pbuf;
} mISDN_pid_t;

typedef struct _mISDN_stPara {
	int	maxdatalen;
	int	up_headerlen;
	int	down_headerlen;
} mISDN_stPara_t;

typedef struct _stack_info {
	u_int		id;
	mISDN_pid_t	pid;
	mISDN_stPara_t	para;
	u_int		extentions;
	u_int		mgr;
	u_int		master;
	u_int		clone;
	int		instcnt;
	int		inst[MAX_LAYER_NR +1];
	int		childcnt;
	u_int		child[2]; /* this is correct handled for PRI see get_stack_info() */
} stack_info_t;

typedef struct _layer_info {
	char		name[mISDN_MAX_IDLEN];
	int		object_id;
	int		extentions;
	u_int		id;
	u_int		st;
	u_int		clone;
	u_int		parent;
	mISDN_pid_t	pid;
} layer_info_t;

#ifdef OBSOLETE
typedef struct _interface_info {
	int		extentions;
	u_int		owner;
	u_int		peer;
	int		stat;
} interface_info_t;
#endif

typedef struct _channel_info {
	u_int		channel;
	union {
		u_int	id;
		void	*p;
	} st;
} channel_info_t;

/* l3 pointer arrays */

typedef struct _ie_info {
	u16	off	: 10,
		ridx	: 3,
		res1	: 1,
		cs_flg	: 1,
		repeated: 1;
} __attribute__((packed)) ie_info_t;

typedef struct _ie_val {
	u16	codeset	: 3,
		res1	: 5,
		val	: 8;
} __attribute__((packed)) ie_val_t;;

typedef struct _cs_info {
	u16	codeset	: 3,
		locked	: 1,
		res1	: 2,
		len	: 10;
} __attribute__((packed)) cs_info_t;

typedef struct _ie_info_ext {
	ie_info_t	ie;
	union {
		ie_val_t	v;
		cs_info_t	cs;
	};
} __attribute__((packed)) ie_info_ext_t;

typedef struct _Q931_info {
	u_char		type;
	u_char		crlen;
	u16		cr;
	ie_info_t	bearer_capability;
	ie_info_t	cause;
	ie_info_t	call_id;
	ie_info_t	call_state;
	ie_info_t	channel_id;
	ie_info_t	facility;
	ie_info_t	progress;
	ie_info_t	net_fac;
	ie_info_t	notify;
	ie_info_t	display;
	ie_info_t	date;
	ie_info_t	keypad;
	ie_info_t	signal;
	ie_info_t	info_rate;
	ie_info_t	end2end_transit;
	ie_info_t	transit_delay_sel;
	ie_info_t	pktl_bin_para;
	ie_info_t	pktl_window;
	ie_info_t	pkt_size;
	ie_info_t	closed_userg;
	ie_info_t	connected_nr;
	ie_info_t	connected_sub;
	ie_info_t	calling_nr;
	ie_info_t	calling_sub;
	ie_info_t	called_nr;
	ie_info_t	called_sub;
	ie_info_t	redirect_nr;
	ie_info_t	transit_net_sel;
	ie_info_t	restart_ind;
	ie_info_t	llc;
	ie_info_t	hlc;
	ie_info_t	useruser;
	ie_info_t	more_data;
	ie_info_t	sending_complete;
	ie_info_t	congestion_level;
	ie_info_t	comprehension_required;
	ie_info_ext_t	ext[8];
}  __attribute__((packed)) Q931_info_t;

#define L3_EXTRA_SIZE	sizeof(Q931_info_t)

#ifdef __KERNEL__
#include <linux/isdn_compat.h>
#include <linux/list.h>
#include <linux/skbuff.h>

typedef struct _mISDNobject	mISDNobject_t;
typedef struct _mISDNinstance	mISDNinstance_t;
typedef struct _mISDNstack	mISDNstack_t;
typedef struct _mISDNport	mISDNport_t;
typedef struct _mISDNdevice	mISDNdevice_t;
typedef int	(ctrl_func_t)(void *, u_int, void *);
typedef int	(if_func_t)(mISDNinstance_t *, struct sk_buff *);

#define mISDN_HEAD_P(s)		((mISDN_head_t *)&s->cb[0])
#define mISDN_HEAD_PRIM(s)	((mISDN_head_t *)&s->cb[0])->prim
#define mISDN_HEAD_DINFO(s)	((mISDN_head_t *)&s->cb[0])->dinfo

typedef struct _mISDN_headext {
	u_int	addr;
	u_int	prim;
	int	dinfo;
	void	*data[3];
	union {
		ctrl_func_t	*ctrl;
		if_func_t	*iff;
		void		*func;
	} func;
}  __attribute__((packed)) mISDN_headext_t;

#define mISDN_HEADEXT_P(s) ((mISDN_headext_t *)&s->cb[0])

/* Basic struct of a mISDN component */
struct _mISDNobject {
	struct list_head	list;
	char			*name;
	u_int			id;
	int			refcnt;
	mISDN_pid_t		DPROTO;
	mISDN_pid_t		BPROTO;
	ctrl_func_t		*own_ctrl;
	struct list_head	ilist;
	spinlock_t		lock;
	struct module		*owner;
	struct class_device	class_dev;
};

#ifdef OBSOLETE
/* the interface between two mISDNinstances */
struct _mISDNif {
	if_func_t		*func;
	void			*fdata;
	mISDNif_t		*clone;
	mISDNif_t		*predecessor;
	int			extentions;
	int			stat;
	mISDNstack_t		*st;
	mISDNinstance_t		*owner;
	mISDNinstance_t		*peer;
};
#endif

/* a instance of a mISDNobject */
struct _mISDNinstance {
	struct list_head	list;
	char			name[mISDN_MAX_IDLEN];
	int			extentions;
	u_int			id;
	int			regcnt;
	mISDN_pid_t		pid;
	mISDNstack_t		*st;
	mISDNobject_t		*obj;
	void			*privat;
	mISDNinstance_t		*clone;
	mISDNinstance_t		*parent;
	if_func_t		*function;
	spinlock_t		*hwlock;
	struct class_device	class_dev;
};

#ifdef OBSOLETE
/* a list of parallel (horizontal) mISDNinstances in the same layer
 * normally here is only one instance per layer only if the information
 * will be splitted here are more instances */
struct _mISDNlayer {
	struct list_head	list;
	mISDNinstance_t		*inst;
};
#endif
/* the STACK; a (vertical) chain of layers */
 
struct _mISDNstack {
	struct list_head	list;
	u_int			id;
	u_int			extentions;
	mISDN_pid_t		pid;
	mISDN_stPara_t		para;
	u_long			status;
	struct task_struct	*thread;
	struct semaphore	*notify;
	wait_queue_head_t	workq;
	struct sk_buff_head	msgq;
#ifdef MISDN_MSG_STATS
	u_int			msg_cnt;
	u_int			sleep_cnt;
	u_int			clone_cnt;
	u_int			stopped_cnt;
#endif
	mISDNinstance_t		*i_array[MAX_LAYER_NR + 1];
	struct list_head	prereg;
	mISDNinstance_t		*mgr;
	mISDNstack_t		*master;
	mISDNstack_t		*clone;
	mISDNstack_t		*parent;
	struct list_head	childlist;
	struct class_device	class_dev;
	/* temporary use */
	mISDN_pid_t		new_pid;
};

/* lowlevel read/write struct for the mISDNdevice */
struct _mISDNport {
	wait_queue_head_t	procq;
	spinlock_t		lock;
//	mISDNif_t		pif;
	u_long			Flag;
	struct sk_buff_head	queue;
	u_int			maxqlen;
};

/* the user interface to handle /dev/mISDN */
struct _mISDNdevice {
	struct list_head	list;
	int			minor;
	struct semaphore	io_sema;
	int			open_mode;
	mISDNport_t		rport;
	mISDNport_t		wport;
	struct list_head	layerlist;
	struct list_head	stacklist;
	struct list_head	timerlist;
	struct list_head	entitylist;
};

/* common helper functions */
extern int	mISDN_bprotocol2pid(void *, mISDN_pid_t *);
// extern int	mISDN_SetIF(mISDNinstance_t *, mISDNif_t *, u_int, void *, void *, void *);
// extern int	mISDN_ConnectIF(mISDNinstance_t *, mISDNinstance_t *);
// extern int	mISDN_DisConnectIF(mISDNinstance_t *, mISDNif_t *);
extern int	mISDN_queue_message(mISDNinstance_t *, u_int, struct sk_buff *);


/* global register/unregister functions */

extern int	mISDN_register(mISDNobject_t *obj);
extern int	mISDN_unregister(mISDNobject_t *obj);
extern int	mISDN_ctrl(void *, u_int, void *);

#endif /* __KERNEL__ */
#endif /* mISDNIF_H */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mISDN/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 13:47:33 -0000	1.1
+++ .cvsignore	17 Oct 2006 13:48:06 -0000	1.2
@@ -0,0 +1 @@
+mISDNuser-20061010.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mISDN/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 13:47:33 -0000	1.1
+++ sources	17 Oct 2006 13:48:06 -0000	1.2
@@ -0,0 +1 @@
+4a4f27ef94d36ca547bf047fa81dc766  mISDNuser-20061010.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 14:02:49 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 17 Oct 2006 07:02:49 -0700
Subject: rpms/konversation/devel konversation.spec,1.10,1.11
Message-ID: <200610171402.k9HE2nSq028365@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28338

Modified Files:
	konversation.spec 
Log Message:
add gettext as BR



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- konversation.spec	7 Oct 2006 01:54:28 -0000	1.10
+++ konversation.spec	17 Oct 2006 14:02:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           konversation
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils, gettext
 Requires:       kdebase >= 3.4
 
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-2
+- add gettext  as br  so translations get built correctly
+
 * Fri Oct 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1
 - Upgrade to 1.0.1
 



From fedora-extras-commits at redhat.com  Tue Oct 17 14:05:00 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 17 Oct 2006 07:05:00 -0700
Subject: rpms/konversation/FC-5 konversation.spec,1.9,1.10
Message-ID: <200610171405.k9HE50Xd028444@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28424

Modified Files:
	konversation.spec 
Log Message:
add gettext as BR



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-5/konversation.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- konversation.spec	7 Oct 2006 01:55:41 -0000	1.9
+++ konversation.spec	17 Oct 2006 14:04:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           konversation
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils, gettext
 Requires:       kdebase >= 3.4
 
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-2
+- add gettext  as br  so translations get built correctly
+
 * Fri Oct 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1
 - Upgrade to 1.0.1
 



From fedora-extras-commits at redhat.com  Tue Oct 17 14:44:59 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 07:44:59 -0700
Subject: rpms/rpy/devel rpy.spec,1.12,1.13
Message-ID: <200610171444.k9HEixG3029741@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29724

Modified Files:
	rpy.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
- Rebuild for new R-version.



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rpy.spec	14 Sep 2006 12:49:48 -0000	1.12
+++ rpy.spec	17 Oct 2006 14:44:29 -0000	1.13
@@ -1,21 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name: 		rpy
-Summary: 	Python interface to the R language
-Version:	0.4.6
-Release:	12%{?dist}
-Url:		http://rpy.sourceforge.net
-Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Patch1:         rpy-install-info.patch
-Patch2:		rpy-rversion.patch
-License:	GPL
-Group:		Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: rpy
+Summary: Python interface to the R language
+Version: 0.4.6
+Release: 13%{?dist}
+Url: http://rpy.sourceforge.net
+Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: rpy-install-info.patch
+Patch2: rpy-rversion.patch
+License: GPL
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
+BuildRequires: R, python-numeric, python-devel, texinfo, tetex
 
-Requires:	python-numeric
-Requires:	R = 2.3.1
+Requires: python-numeric
+Requires: R = 2.4.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
+- Rebuild for new R-version.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-12
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 14:49:37 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 17 Oct 2006 07:49:37 -0700
Subject: fedora-security/audit fc5,1.359,1.360
Message-ID: <200610171449.k9HEnb0P029816@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29793

Modified Files:
	fc5 
Log Message:
Catchup on fc5 issues; including bind rebase and Xsession issues (low)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- fc5	17 Oct 2006 09:38:25 -0000	1.359
+++ fc5	17 Oct 2006 14:49:34 -0000	1.360
@@ -1,11 +1,19 @@
-Up to date CVE as of CVE email 20061009
-Up to date FC5 as of 20061009
+Up to date CVE as of CVE email 20061016
+Up to date FC5 as of 20061016
 
 ** are items that need attention
 
-CVE-2006-5229 ** openssh
-CVE-2006-5215 ** (X.org, fixed 20060225?)
-CVE-2006-5214 ** (X.org, fixed 20060225?)
+CVE-2006-5298 ** mutt
+CVE-2006-5297 ** mutt
+CVE-2006-5229 ignore (openssh) reported not an issue
+CVE-2006-5215 VULNERABLE (xorg-x11-xdm)
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
+CVE-2006-5215 VULNERABLE (gdm)
+CVE-2006-5215 VULNERABLE (kdebase)
+CVE-2006-5214 VULNERABLE (xorg-x11-xdm)
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit)
+CVE-2006-5214 VULNERABLE (gdm)
+CVE-2006-5214 VULNERABLE (kdebase)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield
@@ -84,8 +92,8 @@
 CVE-2006-4146 backport (gdb) [since FEDORA-2006-975]
 CVE-2006-4145 version (kernel, fixed 2.6.17.10) [since FEDORA-2006-967] needs a better upstream fix
 CVE-2006-4144 backport (ImageMagick, fixed 6.2.9) #202773 [since FEDORA-2006-929]
-CVE-2006-4096 backport (bind) [since FEDORA-2006-966] bind-9.3.2-rrsig.patch 
-CVE-2006-4095 backport (bind) [since FEDORA-2006-418] bind-9.3.2-bz173961.patch
+CVE-2006-4096 version (bind) [since FEDORA-2006-1024] was backport since FEDORA-2006-966
+CVE-2006-4095 version (bind) [since FEDORA-2006-418] was backport since FEDORA-2006-966
 CVE-2006-4093 version (kernel, fixed 2.6.17.9) [since FEDORA-2006-967]
 CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) #202247
 CVE-2006-4020 VULNERABLE (php) #201767



From fedora-extras-commits at redhat.com  Tue Oct 17 14:50:53 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 07:50:53 -0700
Subject: rpms/rpy/FC-5 rpy.spec,1.11,1.12
Message-ID: <200610171450.k9HEor3i029848@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29826

Modified Files:
	rpy.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
- Rebuild for new R-version.



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-5/rpy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpy.spec	4 Jun 2006 21:40:10 -0000	1.11
+++ rpy.spec	17 Oct 2006 14:50:23 -0000	1.12
@@ -1,21 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name: 		rpy
-Summary: 	Python interface to the R language
-Version:	0.4.6
-Release:	11%{?dist}
-Url:		http://rpy.sourceforge.net
-Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Patch1:         rpy-install-info.patch
-Patch2:		rpy-rversion.patch
-License:	GPL
-Group:		Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: rpy
+Summary: Python interface to the R language
+Version: 0.4.6
+Release: 13%{?dist}
+Url: http://rpy.sourceforge.net
+Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: rpy-install-info.patch
+Patch2: rpy-rversion.patch
+License: GPL
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
+BuildRequires: R, python-numeric, python-devel, texinfo, tetex
 
-Requires:	python-numeric
-Requires:	R = 2.3.1
+Requires: python-numeric
+Requires: R = 2.4.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -67,36 +67,42 @@
 
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-11
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
+- Rebuild for new R-version.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-12
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-11
 - Rebuild for R-2.3.1
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-10
 - BuildRequires tetex for "make pdf" (pdftex).
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-9
 - Fix detection of R version.
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-8
 - Rebuild for R-2.3.0
 
-* Fri Feb 17 2006 Alex Lancaster <alexl at users.sourceforge.net> - 0.4.6-7
+* Fri Feb 17 2006 Alex Lancaster <alexl[AT]users.sourceforge.net> - 0.4.6-7
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)
 
-* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-6
+* Thu Feb 16 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-6
 - Use a fixed value for R version.
 
-* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-5
+* Thu Feb 16 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-5
 - Set explicit dependency on exact version of R used to build the package. (bz#177078)
 
-* Tue Jan  3 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-4
+* Tue Jan  3 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-4
 - Update for R-2.2.1
 
-* Tue Oct 11 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-3
+* Tue Oct 11 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 
-* Mon Oct 10 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-2
+* Mon Oct 10 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-2
 - Rebuild for R-2.2.0
 
-* Thu Sep 15 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-1
+* Thu Sep 15 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Tue Oct 17 15:01:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 08:01:21 -0700
Subject: rpms/rpy/FC-4 rpy.spec,1.11,1.12
Message-ID: <200610171501.k9HF1LI0000384@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29979

Modified Files:
	rpy.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
- Rebuild for new R-version.



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpy.spec	4 Jun 2006 21:40:56 -0000	1.11
+++ rpy.spec	17 Oct 2006 15:00:51 -0000	1.12
@@ -1,21 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name: 		rpy
-Summary: 	Python interface to the R language
-Version:	0.4.6
-Release:	11%{?dist}
-Url:		http://rpy.sourceforge.net
-Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Patch1:         rpy-install-info.patch
-Patch2:		rpy-rversion.patch
-License:	GPL
-Group:		Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: rpy
+Summary: Python interface to the R language
+Version: 0.4.6
+Release: 13%{?dist}
+Url: http://rpy.sourceforge.net
+Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: rpy-install-info.patch
+Patch2: rpy-rversion.patch
+License: GPL
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
+BuildRequires: R, python-numeric, python-devel, texinfo, tetex
 
-Requires:	python-numeric
-Requires:	R = 2.3.1
+Requires: python-numeric
+Requires: R = 2.4.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -67,36 +67,42 @@
 
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-11
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
+- Rebuild for new R-version.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-12
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-11
 - Rebuild for R-2.3.1
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-10
 - BuildRequires tetex for "make pdf" (pdftex).
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-9
 - Fix detection of R version.
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-8
 - Rebuild for R-2.3.0
 
-* Fri Feb 17 2006 Alex Lancaster <alexl at users.sourceforge.net> - 0.4.6-7
+* Fri Feb 17 2006 Alex Lancaster <alexl[AT]users.sourceforge.net> - 0.4.6-7
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)
 
-* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-6
+* Thu Feb 16 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-6
 - Use a fixed value for R version.
 
-* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-5
+* Thu Feb 16 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-5
 - Set explicit dependency on exact version of R used to build the package. (bz#177078)
 
-* Tue Jan  3 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-4
+* Tue Jan  3 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-4
 - Update for R-2.2.1
 
-* Tue Oct 11 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-3
+* Tue Oct 11 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 
-* Mon Oct 10 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-2
+* Mon Oct 10 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-2
 - Rebuild for R-2.2.0
 
-* Thu Sep 15 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-1
+* Thu Sep 15 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Tue Oct 17 15:08:09 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 17 Oct 2006 08:08:09 -0700
Subject: rpms/python-sexy/devel .cvsignore, 1.2, 1.3 python-sexy.spec, 1.2, 
	1.3 sources, 1.2, 1.3 python-sexy-license.patch, 1.1, NONE
Message-ID: <200610171508.k9HF89vl000560@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv537

Modified Files:
	.cvsignore python-sexy.spec sources 
Removed Files:
	python-sexy-license.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2006 18:59:15 -0000	1.2
+++ .cvsignore	17 Oct 2006 15:07:39 -0000	1.3
@@ -1 +1 @@
-sexy-python-0.1.8.tar.gz
+sexy-python-0.1.9.tar.gz


Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-sexy.spec	12 Sep 2006 19:21:03 -0000	1.2
+++ python-sexy.spec	17 Oct 2006 15:07:39 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define real_name sexy-python
 Name:           python-sexy
-Version:        0.1.8
-Release:        5%{?dist}
+Version:        0.1.9
+Release:        1%{?dist}
 
 Summary:        Python bindings to libsexy
 
@@ -14,10 +14,11 @@
 Patch0:		%{name}-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsexy-devel >= 0.1.8
+BuildRequires:  libsexy-devel >= 0.1.9
 BuildRequires:  python-devel >= 2
 BuildRequires:  pygtk2-devel >= 2.8.0
 BuildRequires:  libxml2-devel
+Requires:  libsexy-devel >= 0.1.9
 
 %description
 sexy-python is a set of Python bindings around libsexy.
@@ -25,7 +26,6 @@
 
 %prep
 %setup -q -n  %{real_name}-%{version}
-%patch0 -p0
 
 %build
 %configure --enable-docs
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Nov 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
+- updated to 0.1.9, license file issue has been fixed upstream
+
 * Tue Sep 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8-5
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2006 18:59:15 -0000	1.2
+++ sources	17 Oct 2006 15:07:39 -0000	1.3
@@ -1 +1 @@
-94273fc16a35123f1d3003f1080bf2c0  sexy-python-0.1.8.tar.gz
+313f11e98555b0e9eea28219564e5063  sexy-python-0.1.9.tar.gz


--- python-sexy-license.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 15:13:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 08:13:43 -0700
Subject: rpms/R-mAr/devel R-mAr.spec,1.5,1.6
Message-ID: <200610171513.k9HFDhOF000649@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-mAr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv633

Modified Files:
	R-mAr.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
- Rebuild for R 2.4.0.



Index: R-mAr.spec
===================================================================
RCS file: /cvs/extras/rpms/R-mAr/devel/R-mAr.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- R-mAr.spec	14 Sep 2006 12:52:16 -0000	1.5
+++ R-mAr.spec	17 Oct 2006 15:13:13 -0000	1.6
@@ -1,17 +1,19 @@
 %define packname mAr
 
-Summary:	 R module to evaluate functions for multivariate AutoRegressive analysis
-Name:		 R-%{packname}
-Version:	 1.1
-Release:	 6%{?dist}
-License:	 GPL version 2 or newer
-Group:		 Applications/Engineering
-Source0:	 ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-Source1:	 COPYING
-URL:		 http://cran.r-project.org/contrib
-Requires:	 R
-BuildRequires:	 R, tetex-latex
-BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: R module to evaluate functions for multivariate AutoRegressive analysis
+Name: R-%{packname}
+Version: 1.1
+Release: 7%{?dist}
+License: GPL version 2 or newer
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+Source1: COPYING
+URL: http://cran.r-project.org/contrib
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: R, tetex-latex
+
+Requires: R
 
 %define 	 debug_package %{nil}
 
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
+- Rebuild for R 2.4.0.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-6
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 15:15:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 08:15:43 -0700
Subject: rpms/R-mAr/FC-5 R-mAr.spec,1.4,1.5
Message-ID: <200610171515.k9HFFhoZ000729@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-mAr/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv713

Modified Files:
	R-mAr.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
- Rebuild for R 2.4.0.



Index: R-mAr.spec
===================================================================
RCS file: /cvs/extras/rpms/R-mAr/FC-5/R-mAr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-mAr.spec	4 Jun 2006 22:04:57 -0000	1.4
+++ R-mAr.spec	17 Oct 2006 15:15:13 -0000	1.5
@@ -1,17 +1,19 @@
 %define packname mAr
 
-Summary:	 R module to evaluate functions for multivariate AutoRegressive analysis
-Name:		 R-%{packname}
-Version:	 1.1
-Release:	 5%{?dist}
-License:	 GPL version 2 or newer
-Group:		 Applications/Engineering
-Source0:	 ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-Source1:	 COPYING
-URL:		 http://cran.r-project.org/contrib
-Requires:	 R
-BuildRequires:	 R, tetex-latex
-BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: R module to evaluate functions for multivariate AutoRegressive analysis
+Name: R-%{packname}
+Version: 1.1
+Release: 7%{?dist}
+License: GPL version 2 or newer
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+Source1: COPYING
+URL: http://cran.r-project.org/contrib
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: R, tetex-latex
+
+Requires: R
 
 %define 	 debug_package %{nil}
 
@@ -53,18 +55,24 @@
 
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-5
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-6
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-5
 - Rebuild for R-2.3.x
 
-* Thu Mar  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-4
+* Thu Mar  2 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-4
 - Disable building of debugging package.
 
-* Tue Oct 11 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-3
+* Tue Oct 11 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-3
 - Remove html index generation as it is now automatic.
 
-* Thu Oct  6 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-2
+* Thu Oct  6 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-2
 - Add check section, add tetex-latex to BulidRequires, and remove docs
   as they are packaged already.
 
-* Sun Aug 21 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-1
+* Sun Aug 21 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-1
 - Prepare for FE inclusion.



From fedora-extras-commits at redhat.com  Tue Oct 17 15:16:58 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 08:16:58 -0700
Subject: rpms/R-mAr/FC-4 R-mAr.spec,1.4,1.5
Message-ID: <200610171516.k9HFGw43000790@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-mAr/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv774

Modified Files:
	R-mAr.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
- Rebuild for R 2.4.0.



Index: R-mAr.spec
===================================================================
RCS file: /cvs/extras/rpms/R-mAr/FC-4/R-mAr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-mAr.spec	4 Jun 2006 22:05:41 -0000	1.4
+++ R-mAr.spec	17 Oct 2006 15:16:28 -0000	1.5
@@ -1,17 +1,19 @@
 %define packname mAr
 
-Summary:	 R module to evaluate functions for multivariate AutoRegressive analysis
-Name:		 R-%{packname}
-Version:	 1.1
-Release:	 5%{?dist}
-License:	 GPL version 2 or newer
-Group:		 Applications/Engineering
-Source0:	 ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-Source1:	 COPYING
-URL:		 http://cran.r-project.org/contrib
-Requires:	 R
-BuildRequires:	 R, tetex-latex
-BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: R module to evaluate functions for multivariate AutoRegressive analysis
+Name: R-%{packname}
+Version: 1.1
+Release: 7%{?dist}
+License: GPL version 2 or newer
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+Source1: COPYING
+URL: http://cran.r-project.org/contrib
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: R, tetex-latex
+
+Requires: R
 
 %define 	 debug_package %{nil}
 
@@ -53,18 +55,24 @@
 
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-5
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-6
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-5
 - Rebuild for R-2.3.x
 
-* Thu Mar  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-4
+* Thu Mar  2 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-4
 - Disable building of debugging package.
 
-* Tue Oct 11 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-3
+* Tue Oct 11 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-3
 - Remove html index generation as it is now automatic.
 
-* Thu Oct  6 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-2
+* Thu Oct  6 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-2
 - Add check section, add tetex-latex to BulidRequires, and remove docs
   as they are packaged already.
 
-* Sun Aug 21 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-1
+* Sun Aug 21 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-1
 - Prepare for FE inclusion.



From fedora-extras-commits at redhat.com  Tue Oct 17 15:18:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 17 Oct 2006 08:18:26 -0700
Subject: rpms/python-sexy/devel python-sexy.spec,1.3,1.4
Message-ID: <200610171518.k9HFIQE1000858@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv840

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-sexy.spec	17 Oct 2006 15:07:39 -0000	1.3
+++ python-sexy.spec	17 Oct 2006 15:17:56 -0000	1.4
@@ -14,11 +14,11 @@
 Patch0:		%{name}-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsexy-devel >= 0.1.9
+BuildRequires:  libsexy-devel >= 0.1.10
 BuildRequires:  python-devel >= 2
 BuildRequires:  pygtk2-devel >= 2.8.0
 BuildRequires:  libxml2-devel
-Requires:  libsexy-devel >= 0.1.9
+Requires:  libsexy-devel >= 0.1.10
 
 %description
 sexy-python is a set of Python bindings around libsexy.



From fedora-extras-commits at redhat.com  Tue Oct 17 15:22:14 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 17 Oct 2006 08:22:14 -0700
Subject: rpms/TurboGears/devel TurboGears-1.0b1-setuptools.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 TurboGears.spec, 1.4, 1.5 sources, 1.3,
	1.4 TurboGears-0.8.9-setuptools.patch, 1.1, NONE
Message-ID: <200610171522.k9HFMEsq000974@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv926

Modified Files:
	.cvsignore TurboGears.spec sources 
Added Files:
	TurboGears-1.0b1-setuptools.patch 
Removed Files:
	TurboGears-0.8.9-setuptools.patch 
Log Message:
1.0b1

TurboGears-1.0b1-setuptools.patch:

--- NEW FILE TurboGears-1.0b1-setuptools.patch ---
--- setup.py.orig	2006-09-12 21:43:09.000000000 -0400
+++ setup.py	2006-09-12 21:43:25.000000000 -0400
@@ -34,21 +34,7 @@
 The latest development version is available in <a href="http://www.turbogears.org/svn/turbogears/trunk#egg=turbogears-dev">the TurboGears subversion repository</a>.""",
     url="http://www.turbogears.org",
     zip_safe=False,
-    install_requires = [
-        "TurboJson >= 0.9.9", 
-        "TurboCheetah >= 0.9.5",
-        "TurboKid >= 0.9.8",
-        "CherryPy >= 2.2.1,<3.0.0alpha",
-        "SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99",
-        "simplejson >= 1.3",
-        "elementtree >= 1.2.6", 
-        "PasteScript >= 0.9.7",
-        "cElementTree >= 1.0.5", 
-        "FormEncode >= 0.5.1",
-        "setuptools >= 0.6c2",
-        "RuleDispatch", 
-        "ConfigObj >= 4.3.2", 
-        "nose >= 0.9"],
+    install_requires = [],
     packages=find_packages(),
     include_package_data=True,
     exclude_package_data={"thirdparty" : ["*"]},


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jul 2006 18:53:18 -0000	1.3
+++ .cvsignore	17 Oct 2006 15:21:43 -0000	1.4
@@ -1 +1 @@
-TurboGears-0.8.9.tar.gz
+TurboGears-1.0b1.tar.gz


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurboGears.spec	4 Sep 2006 00:56:36 -0000	1.4
+++ TurboGears.spec	17 Oct 2006 15:21:43 -0000	1.5
@@ -1,72 +1,94 @@
 %{!?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)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        1.0b1
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
-URL:            http://www.turbogears.org/
-Source0:        http://www.turbogears.org/download/eggs/%{name}-%{version}.tar.gz
+URL:            http://www.turbogears.org
+Source0:        http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools >= 0.6a8 
-BuildRequires:  python-kid >= 0.8 python-TestGears >= 0.2
-BuildRequires:  python-formencode >= 0.4 python-cherrypy >= 2.1.0
-BuildRequires:  python-sqlobject >= 0.7
-BuildRequires:  python-json >= 3.3 python-elementtree >= 1.2.6
-Requires:       python-abi = %{pyver}
-Requires:       python-kid >= 0.8  python-cherrypy >= 2.1.0
-Requires:       python-sqlobject >= 0.7 python-formencode >= 0.4
+
+BuildRequires:  python-setuptools >= 0.6c2
+
+Requires:       python-kid >= 0.8  python-cherrypy >= 2.1.1
+Requires:       python-sqlobject >= 0.7 python-formencode >= 0.5.1
 Requires:       python-json >= 3.3 python-elementtree >= 1.2.6
-Requires:       python-setuptools >= 0.6a8 python-TestGears >= 0.2
+Requires:       python-setuptools >= 0.6a11
+Requires:       python-turbocheetah >= 0.9.5 python-turbojson >= 0.9.9 
+Requires:       python-turbokid >= 0.9.8 python-tgfastdata
+Requires:       python-simplejson >= 1.3 python-paste-script >= 0.9.7
+Requires:       python-configobj >= 4.3.2 python-ruledispatch
+Requires:       python-nose >= 0.9
 
 %description
-TurboGears takes the best components available and combines them into one
-easy-to-install, documented whole. TurboGears includes parts that join the
-pieces together and make them work together seamlessly, but doesn't obscure
-each included project. This allows you to take advantage of all existing
-documentation, articles, mailing lists and other resources that have built up
-in the communities for each project.
+TurboGears brings together four major pieces to create an
+easy to install, easy to use web megaframework. It covers
+everything from front end (MochiKit JavaScript for the browser,
+Kid for templates in Python) to the controllers (CherryPy) to
+the back end (SQLObject).
+
+The TurboGears project is focused on providing documentation
+and integration with these tools without losing touch
+with the communities that already exist around those tools.
+
+TurboGears is easy to use for a wide range of web applications.
+
 
 %prep
 %setup -q
-%patch0 -p1
-find docs -type f -exec chmod a-x {} \; -exec sed -i 's/\r//g' {} \;
+%patch0
+
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__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 --single-version-externally-managed
- 
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+# build the filelists
+for module in turbogears ; do
+    echo '%defattr (0644,root,root,0755)' > $module-pyfiles
+    find %{buildroot}%{python_sitelib}/$module -type d | \
+        sed 's:%{buildroot}\(.*\):%dir \1:' >> $module-pyfiles
+    find %{buildroot}%{python_sitelib}/$module -not -type d -not -name '*.pyo' \
+        | sed 's:%{buildroot}\(.*\):\1:' >> $module-pyfiles
+    find %{buildroot}%{python_sitelib}/$module -not -type d -name '*.pyo' | \
+        sed 's:%{buildroot}\(.*\):%ghost \1:' >> $module-pyfiles
+done
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files -f turbogears-pyfiles
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt docs LICENSE.txt
+%doc CHANGELOG.txt LICENSE.txt
 %{_bindir}/tg-admin
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
-%{python_sitelib}/turbogears
 
 %changelog
+* Mon Sep 11 2006 Luke Macken <lmacken at redhat.com> 1.0b1-1
+- 1.0b1
+
 * Sun Sep  3 2006 Luke Macken <lmacken at redhat.com> 0.8.9-4
 - Rebuild for FC6
 
 * Sun Jul  9 2006 Luke Macken <lmacken at redhat.com> 0.8.9-3
 - Require python-TestGears (bug #195370)
 
-* Thu Jul  6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-2
+* Thu Jul 6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-2
 - Add TurboGears-0.8.9-setuptools.patch
 
-* Thu Jul  6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-1
+* Thu Jul 6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-1
 - Bump to 0.8.9
 - Remove TurboGears-0.8a5-optim.patch and TurboGears-0.8a5-setuptools.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jul 2006 18:53:18 -0000	1.3
+++ sources	17 Oct 2006 15:21:43 -0000	1.4
@@ -1 +1 @@
-65ae29ce01fd1e0bad4924b12b4c3706  TurboGears-0.8.9.tar.gz
+667a84671d1ce3639ba11d8e73462639  TurboGears-1.0b1.tar.gz


--- TurboGears-0.8.9-setuptools.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 15:22:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 17 Oct 2006 08:22:30 -0700
Subject: rpms/python-sexy/devel python-sexy.spec,1.4,1.5
Message-ID: <200610171522.k9HFMUf0001018@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv948

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-sexy.spec	17 Oct 2006 15:17:56 -0000	1.4
+++ python-sexy.spec	17 Oct 2006 15:22:00 -0000	1.5
@@ -10,8 +10,6 @@
 License:        LGPL
 URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/libsexy/sexy-python/sexy-python-%{version}.tar.gz
-#This will be removed when the license file will be fixed upstream
-Patch0:		%{name}-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsexy-devel >= 0.1.10



From fedora-extras-commits at redhat.com  Tue Oct 17 15:45:29 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 17 Oct 2006 08:45:29 -0700
Subject: rpms/libsexymm/devel .cvsignore, 1.2, 1.3 libsexymm.spec, 1.2,
	1.3 sources, 1.2, 1.3 libsexymm-license.patch, 1.1, NONE
Message-ID: <200610171545.k9HFjTml001282@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/libsexymm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1260

Modified Files:
	.cvsignore libsexymm.spec sources 
Removed Files:
	libsexymm-license.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsexymm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Aug 2006 22:31:34 -0000	1.2
+++ .cvsignore	17 Oct 2006 15:44:59 -0000	1.3
@@ -1 +1 @@
-libsexymm-0.1.7.tar.gz
+libsexymm-0.1.9.tar.gz


Index: libsexymm.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexymm/devel/libsexymm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsexymm.spec	12 Sep 2006 19:18:18 -0000	1.2
+++ libsexymm.spec	17 Oct 2006 15:44:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libsexymm
-Version:        0.1.7
-Release:        4%{?dist}
+Version:        0.1.9
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for libsexy
 
@@ -8,15 +8,13 @@
 License:        LGPL
 URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/libsexy/libsexymm/libsexymm-%{version}.tar.gz
-#This will be removed when the license file will be fixed upstream
-Patch0:		%{name}-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  gtkmm24-devel >= 2.4.0
-BuildRequires:  libsexy-devel >= 0.1.7
+BuildRequires:  libsexy-devel >= 0.1.10
 BuildRequires: libxml2-devel
 
 %description
@@ -37,7 +35,6 @@
 
 %prep
 %setup -q -n libsexymm-%{version}
-%patch0 -p0
 
 
 %build
@@ -80,6 +77,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Nov 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
+- updated to 0.1.9, license file issue has been fixed upstream
+
 * Tue Sep 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.7-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsexymm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Aug 2006 22:31:34 -0000	1.2
+++ sources	17 Oct 2006 15:44:59 -0000	1.3
@@ -1 +1 @@
-cb01af4595000d9e192f5d9fcff5b742  libsexymm-0.1.7.tar.gz
+77c8ae69084e478a6b090ec6e5ae26bf  libsexymm-0.1.9.tar.gz


--- libsexymm-license.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 16:17:24 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:17:24 -0700
Subject: rpms/MegaMek - New directory
Message-ID: <200610171617.k9HGHOni004748@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4744/MegaMek

Log Message:
Directory /cvs/extras/rpms/MegaMek added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 16:17:30 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:17:30 -0700
Subject: rpms/MegaMek/devel - New directory
Message-ID: <200610171617.k9HGHUlW004762@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4744/MegaMek/devel

Log Message:
Directory /cvs/extras/rpms/MegaMek/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 16:17:45 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:17:45 -0700
Subject: rpms/MegaMek Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610171617.k9HGHjvd004793@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4787

Added Files:
	Makefile import.log 
Log Message:
Setup of module MegaMek


--- NEW FILE Makefile ---
# Top level Makefile for module MegaMek
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 16:17:51 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:17:51 -0700
Subject: rpms/MegaMek/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610171617.k9HGHpmE004809@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4787/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module MegaMek


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 16:26:40 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:26:40 -0700
Subject: rpms/MegaMek import.log,1.1,1.2
Message-ID: <200610171626.k9HGQeXH005017@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4980

Modified Files:
	import.log 
Log Message:
auto-import MegaMek-0.30.11-1 on branch devel from MegaMek-0.30.11-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/MegaMek/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 16:17:45 -0000	1.1
+++ import.log	17 Oct 2006 16:26:10 -0000	1.2
@@ -0,0 +1 @@
+MegaMek-0_30_11-1:HEAD:MegaMek-0.30.11-1.src.rpm:1161102356



From fedora-extras-commits at redhat.com  Tue Oct 17 16:26:41 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:26:41 -0700
Subject: rpms/MegaMek/devel MegaMek-directories.patch, NONE,
	1.1 MegaMek-icon.png, NONE, 1.1 MegaMek.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610171626.k9HGQfYV005021@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4980/devel

Modified Files:
	.cvsignore sources 
Added Files:
	MegaMek-directories.patch MegaMek-icon.png MegaMek.spec 
Log Message:
auto-import MegaMek-0.30.11-1 on branch devel from MegaMek-0.30.11-1.src.rpm

MegaMek-directories.patch:

--- NEW FILE MegaMek-directories.patch ---
diff -ur src.orig/megamek/client/bot/BotConfiguration.java src/megamek/client/bot/BotConfiguration.java
--- src.orig/megamek/client/bot/BotConfiguration.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/client/bot/BotConfiguration.java	2006-09-18 01:26:05.000000000 -0400
@@ -9,7 +9,7 @@
 
     static {
         try {
-            BotProperties.load(new FileInputStream("mmconf/bot.properties")); //$NON-NLS-1$
+            BotProperties.load(new FileInputStream(System.getProperty("user.home") + "/.megamek/mmconf/bot.properties")); //$NON-NLS-1$
         } catch (Exception e) {
             System.out.println("Bot properties could not be loaded, will use defaults"); //$NON-NLS-1$
         }
diff -ur src.orig/megamek/client/Client.java src/megamek/client/Client.java
--- src.orig/megamek/client/Client.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/client/Client.java	2006-09-18 01:30:01.000000000 -0400
@@ -922,7 +922,7 @@
                 case Packet.COMMAND_SEND_SAVEGAME:
                     String sFinalFile = (String)c.getObject(0);
                     try {
-                        File sDir = new File("savegames");
+                        File sDir = new File(System.getProperty("user.home") + "/.megamek/savegames");
                         if (!sDir.exists()) {
                             sDir.mkdir();
                         }
diff -ur src.orig/megamek/common/options/GameOptions.java src/megamek/common/options/GameOptions.java
--- src.orig/megamek/common/options/GameOptions.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/common/options/GameOptions.java	2006-09-18 01:26:15.000000000 -0400
@@ -41,7 +41,7 @@
 public class GameOptions extends AbstractOptions implements Serializable {
     static final long serialVersionUID = 5417081099101580392L;
 
-    private static final String GAME_OPTIONS_FILE_NAME = "mmconf/gameoptions.xml"; //$NON-NLS-1$
+    private static final String GAME_OPTIONS_FILE_NAME = System.getProperty("user.home") + "/.megamek/mmconf/gameoptions.xml"; //$NON-NLS-1$
     
     public GameOptions() {
         super();
diff -ur src.orig/megamek/common/preference/ClientPreferences.java src/megamek/common/preference/ClientPreferences.java
--- src.orig/megamek/common/preference/ClientPreferences.java	2006-09-18 01:20:31.000000000 -0400
+++ src/megamek/common/preference/ClientPreferences.java	2006-09-18 02:22:17.000000000 -0400
@@ -60,7 +60,27 @@
         store.setDefault(MAP_TILESET, "defaulthexset.txt");
         store.setDefault(MAX_PATHFINDER_TIME, MovePath.DEFAULT_PATHFINDER_TIME_LIMIT);
         store.setDefault(DATA_DIRECTORY,"data");
-        store.setDefault(LOG_DIRECTORY,"logs");
+        try {
+          File homeDataDir = new File(System.getProperty("user.home") + "/.megamek");
+          if (!homeDataDir.exists()) {
+            homeDataDir.mkdir();
+          }
+          File homeConfDir = new File(System.getProperty("user.home") + "/.megamek/mmconf");
+          if (!homeConfDir.exists()) {
+            homeConfDir.mkdir();
+          }
+          File homeSaveDir = new File(System.getProperty("user.home") + "/.megamek/savegames");
+          if (!homeSaveDir.exists()) {
+            homeSaveDir.mkdir();
+          }
+          File homeLogsDir = new File(System.getProperty("user.home") + "/.megamek/logs");
+          if (!homeLogsDir.exists()) {
+            homeLogsDir.mkdir();
+          }
+        } catch (Exception e) {
+          System.err.println("Unable to create " + System.getProperty("user.home") + "/.megamek directories");
+        }
+        store.setDefault(LOG_DIRECTORY,System.getProperty("user.home") + "/.megamek/logs");
         store.setDefault(MECH_DIRECTORY, store.getDefaultString(DATA_DIRECTORY) + File.separator + "mechfiles");
         store.setDefault(METASERVER_NAME, "http://www.damour.info/cgi-bin/james/metaserver");
         store.setDefault(GOAL_PLAYERS, 2);
diff -ur src.orig/megamek/common/preference/PreferenceManager.java src/megamek/common/preference/PreferenceManager.java
--- src.orig/megamek/common/preference/PreferenceManager.java	2006-09-18 01:20:31.000000000 -0400
+++ src/megamek/common/preference/PreferenceManager.java	2006-09-18 01:27:25.000000000 -0400
@@ -35,7 +35,7 @@
 
 public class PreferenceManager {
 
-    public static final String DEFAULT_CFG_FILE_NAME = "mmconf/clientsettings.xml";
+    public static final String DEFAULT_CFG_FILE_NAME = System.getProperty("user.home") + "/.megamek/mmconf/clientsettings.xml";
     public static final String CFG_FILE_OPTION_NAME = "cfgfilename";
     public static final String ROOT_NODE_NAME = "MegaMekSettings";
     public static final String CLIENT_SETTINGS_STORE_NAME = "ClientSettings";    
diff -ur src.orig/megamek/MegaMek.java src/megamek/MegaMek.java
--- src.orig/megamek/MegaMek.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/MegaMek.java	2006-09-18 01:29:28.000000000 -0400
@@ -361,7 +361,7 @@
 
     public void loadGame() {
         FileDialog fd = new FileDialog(frame, Messages.getString("MegaMek.SaveGameDialog.title"), FileDialog.LOAD); //$NON-NLS-1$
-        fd.setDirectory("savegames"); //$NON-NLS-1$
+        fd.setDirectory(System.getProperty("user.home") + "/.megamek/savegames"); //$NON-NLS-1$
         // limit file-list to savedgames only
         fd.setFilenameFilter(new FilenameFilter() {
             public boolean accept(File dir, String name) {
diff -ur src.orig/megamek/server/Server.java src/megamek/server/Server.java
--- src.orig/megamek/server/Server.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/server/Server.java	2006-09-18 01:30:41.000000000 -0400
@@ -673,7 +673,7 @@
         if (!sFinalFile.endsWith(".sav")) {
             sFinalFile = sFile + ".sav";
         }
-        sFinalFile = "savegames" + File.separator + sFinalFile;
+        sFinalFile = System.getProperty("user.home") + "/.megamek/savegames" + File.separator + sFinalFile;
         File f = new File(sFinalFile);
         try {
             ObjectInputStream ois = new ObjectInputStream(
@@ -699,7 +699,7 @@
             sFinalFile = sFile + ".sav";
         }
         try {
-            File sDir = new File("savegames");
+            File sDir = new File(System.getProperty("user.home") + "/.megamek/savegames");
             if (!sDir.exists()) {
                 sDir.mkdir();
             }


--- NEW FILE MegaMek.spec ---
# camel-case name at the request of the upstream maintainers.
Name:		MegaMek
Version:	0.30.11
Release:	1%{?dist}
Summary:	A portable, network-enabled BattleTech engine

Group:		Amusements/Games
License:	GPL
URL:		http://prdownloads.sourceforge.net/megamek/MegaMek-v0.30.11.zip
Source0:	MegaMek-v0.30.11.zip
# converted from data/images/misc/megamek-icon.gif
Source1:	MegaMek-icon.png
Patch0:		MegaMek-directories.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:		desktop-file-utils
BuildRequires:		java-gcj-compat-devel
Requires(post):		java-gcj-compat
Requires(postun):	java-gcj-compat
Provides:		megamek = %{version}-%{release}

%description
MegaMek is a community effort to implement the Classic BattleTech
rules in an operating-system-agnostic, network-enabled manner.

%prep
%setup -q -c -n MegaMek
%patch0 -p0
# remove included binaries and rebuild everything from source
rm -f MegaMek.exe MegaMek.jar
rm -f lib/TinyXML.jar lib/retroweaver-rt.jar
pushd src
  jar xf ../lib/Ostermiller.jar
  # remove hard-to-build sources that are not required
  rm -f com/Ostermiller/util/*CSV*
  rm -f com/Ostermiller/util/*CGI*
  rm -f com/Ostermiller/util/*Properties*
  rm -r com/Ostermiller/util/*Browser*
  rm -rf META-INF
  jar xf ../lib/PngEncoder.jar
  rm -rf META-INF
  rm -f LICENSE.txt PngEncoderB.html PngEncoder.html
  jar xf ../lib/TabPanel.jar
  rm -rf META-INF gov doc
  rm -f LICENSE README
  mv src/gov .
  rmdir src
  unzip -qq ../lib/tinyXML07-src.zip
  mv sources/*.java .
  mv sources/gd .
  rm -rf classes javadoc
  rmdir sources
  rm -f DevelopmentDiary-TinyXML.txt readme.txt gpl.txt
  jar xf ../lib/collections.jar
  rm -rf META-INF
  rm -f ../lib/collections.jar
  find -name \*.class | xargs rm -f
  rm -f ../lib/Ostermiller.jar ../lib/PngEncoder.jar
  rm -f ../lib/TabPanel.jar ../lib/tinyXML07-src.zip
  find -name .svn | xargs rm -rf
  cp ../l10n/megamek/client/*.properties megamek/client
  cp ../l10n/megamek/client/bot/*.properties megamek/client/bot
  cp ../l10n/megamek/common/*.properties megamek/common
  cp ../l10n/megamek/common/options/*.properties megamek/common/options
popd
find data docs mmconf -name .svn -print0 | xargs -0 rm -rf
find data docs mmconf -type f -print0 | xargs -0 chmod 644
find data docs mmconf -type d -print0 | xargs -0 chmod 755
rm -f mmconf/MegaMek.bat
mv docs/stats.pl .

%build
pushd src
  javac `find -name '*.java'`
  jar cf MegaMek.jar com gd gnu gov keypoint megamek *.class *.java
popd

cat > MegaMek.sh << EOF
#!/bin/sh

cd %{_datadir}/MegaMek
exec java -classpath %{_javadir}/MegaMek.jar megamek.MegaMek
EOF

cat > MegaMek.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=MegaMek
GenericName=A BattleTech engine
Comment=Play MegaMek
Exec=MegaMek
Icon=MegaMek-icon.png
Terminal=false
Type=Application
Categories=Game;BoardGame;
Version=%{version}
EOF

%install
rm -rf $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{_javadir}
install -pm 644 src/MegaMek.jar \
  $RPM_BUILD_ROOT%{_javadir}/MegaMek.jar

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/MegaMek
cp -r data docs mmconf $RPM_BUILD_ROOT%{_datadir}/MegaMek
install -pm 644 readme.txt \
  $RPM_BUILD_ROOT%{_datadir}/MegaMek/readme.txt

install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -pm 755 MegaMek.sh \
  $RPM_BUILD_ROOT%{_bindir}/MegaMek
install -pm 755 stats.pl \
  $RPM_BUILD_ROOT%{_bindir}/MegaMek-stats

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  MegaMek.desktop

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -pm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_datadir}/pixmaps/MegaMek-icon.png

%{_bindir}/aot-compile-rpm

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%files
%defattr(-,root,root,-)
%doc HACKING license.txt readme-German.txt readme.txt
%{_javadir}/MegaMek.jar
%{_datadir}/MegaMek
%{_bindir}/MegaMek
%{_bindir}/MegaMek-stats
%{_datadir}/applications/fedora-MegaMek.desktop
%{_datadir}/pixmaps/MegaMek-icon.png

%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/MegaMek.jar.*

%changelog
* Sat Sep 16 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.30.11-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/MegaMek/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 16:17:50 -0000	1.1
+++ .cvsignore	17 Oct 2006 16:26:11 -0000	1.2
@@ -0,0 +1 @@
+MegaMek-v0.30.11.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/MegaMek/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 16:17:50 -0000	1.1
+++ sources	17 Oct 2006 16:26:11 -0000	1.2
@@ -0,0 +1 @@
+9559f6d138f0b0854991a83cdba79b59  MegaMek-v0.30.11.zip



From fedora-extras-commits at redhat.com  Tue Oct 17 16:34:33 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:34:33 -0700
Subject: owners owners.list,1.1839,1.1840
Message-ID: <200610171634.k9HGYXTO005166@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5135

Modified Files:
	owners.list 
Log Message:
	* MegaMek: New component.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1839
retrieving revision 1.1840
diff -u -r1.1839 -r1.1840
--- owners.list	17 Oct 2006 08:47:19 -0000	1.1839
+++ owners.list	17 Oct 2006 16:34:02 -0000	1.1840
@@ -1019,6 +1019,7 @@
 Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org
+Fedora Extras|MegaMek|A portable, network-enabled BattleTech engine|fitzsim at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|mercator|Terrain library for WorldForge client/server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 16:38:02 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:38:02 -0700
Subject: rpms/R-waveslim/devel R-waveslim.spec,1.3,1.4
Message-ID: <200610171638.k9HGc2s8005255@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-waveslim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5200

Modified Files:
	R-waveslim.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
- Rebuild for R 2.4.0.



Index: R-waveslim.spec
===================================================================
RCS file: /cvs/extras/rpms/R-waveslim/devel/R-waveslim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- R-waveslim.spec	14 Sep 2006 12:56:40 -0000	1.3
+++ R-waveslim.spec	17 Oct 2006 16:37:32 -0000	1.4
@@ -1,18 +1,18 @@
 %define packname waveslim
 
-Summary:	R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
-Name:		R-%{packname}
-Version: 	1.5
-Release: 	4%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-URL:		http://www.image.ucar.edu/staff/whitcher/
+Summary: R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
+Name: R-%{packname}
+Version: 1.5
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+URL: http://www.image.ucar.edu/staff/whitcher/
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.9.0
-BuildRequires:	R >= 1.9.0, tetex-latex, gcc-gfortran
+Requires: R >= 1.9.0
+BuildRequires: R >= 1.9.0, tetex-latex, gcc-gfortran
 
 
 %description
@@ -54,6 +54,9 @@
 %doc DESCRIPTION
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
+- Rebuild for R 2.4.0.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-4
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 16:39:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:39:34 -0700
Subject: rpms/R-waveslim/FC-5 R-waveslim.spec,1.2,1.3
Message-ID: <200610171639.k9HGdYY4005320@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-waveslim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5304

Modified Files:
	R-waveslim.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
- Rebuild for R 2.4.0.



Index: R-waveslim.spec
===================================================================
RCS file: /cvs/extras/rpms/R-waveslim/FC-5/R-waveslim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-waveslim.spec	4 Jun 2006 22:07:59 -0000	1.2
+++ R-waveslim.spec	17 Oct 2006 16:39:03 -0000	1.3
@@ -1,18 +1,18 @@
 %define packname waveslim
 
-Summary:	R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
-Name:		R-%{packname}
-Version: 	1.5
-Release: 	3%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-URL:		http://www.image.ucar.edu/staff/whitcher/
+Summary: R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
+Name: R-%{packname}
+Version: 1.5
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+URL: http://www.image.ucar.edu/staff/whitcher/
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.9.0
-BuildRequires:	R >= 1.9.0, tetex-latex, gcc-gfortran
+Requires: R >= 1.9.0
+BuildRequires: R >= 1.9.0, tetex-latex, gcc-gfortran
 
 
 %description
@@ -54,11 +54,17 @@
 %doc DESCRIPTION
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.5-3
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-4
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-3
 - Rebuild for R-2.3.x
 
-* Wed Mar 08 2006 Jos?? Matos <jamatos at fc.up.pt> 1.5-2
+* Wed Mar 08 2006 Jos?? Matos <jamatos[AT]fc.up.pt> 1.5-2
 - Rename License to GPL only, add gfortran as BR, add DESCRIPTION to %%doc
 
-* Fri Mar 03 2006 Jos?? Matos <jamatos at fc.up.pt> 1.5-1
+* Fri Mar 03 2006 Jos?? Matos <jamatos[AT]fc.up.pt> 1.5-1
 - Initial package creation



From fedora-extras-commits at redhat.com  Tue Oct 17 16:41:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:41:23 -0700
Subject: rpms/R-waveslim/FC-4 R-waveslim.spec,1.2,1.3
Message-ID: <200610171641.k9HGfNX0005397@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-waveslim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5381

Modified Files:
	R-waveslim.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
- Rebuild for R 2.4.0.



Index: R-waveslim.spec
===================================================================
RCS file: /cvs/extras/rpms/R-waveslim/FC-4/R-waveslim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-waveslim.spec	4 Jun 2006 22:08:33 -0000	1.2
+++ R-waveslim.spec	17 Oct 2006 16:40:53 -0000	1.3
@@ -1,18 +1,18 @@
 %define packname waveslim
 
-Summary:	R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
-Name:		R-%{packname}
-Version: 	1.5
-Release: 	3%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-URL:		http://www.image.ucar.edu/staff/whitcher/
+Summary: R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
+Name: R-%{packname}
+Version: 1.5
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+URL: http://www.image.ucar.edu/staff/whitcher/
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.9.0
-BuildRequires:	R >= 1.9.0, tetex-latex, gcc-gfortran
+Requires: R >= 1.9.0
+BuildRequires: R >= 1.9.0, tetex-latex, gcc-gfortran
 
 
 %description
@@ -54,11 +54,17 @@
 %doc DESCRIPTION
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.5-3
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-4
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-3
 - Rebuild for R-2.3.x
 
-* Wed Mar 08 2006 Jos?? Matos <jamatos at fc.up.pt> 1.5-2
+* Wed Mar 08 2006 Jos?? Matos <jamatos[AT]fc.up.pt> 1.5-2
 - Rename License to GPL only, add gfortran as BR, add DESCRIPTION to %%doc
 
-* Fri Mar 03 2006 Jos?? Matos <jamatos at fc.up.pt> 1.5-1
+* Fri Mar 03 2006 Jos?? Matos <jamatos[AT]fc.up.pt> 1.5-1
 - Initial package creation



From fedora-extras-commits at redhat.com  Tue Oct 17 16:44:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:44:46 -0700
Subject: rpms/R-wavethresh/devel R-wavethresh.spec,1.3,1.4
Message-ID: <200610171644.k9HGikQv005492@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-wavethresh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5469

Modified Files:
	R-wavethresh.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
- Rebuild for R 2.4.0.



Index: R-wavethresh.spec
===================================================================
RCS file: /cvs/extras/rpms/R-wavethresh/devel/R-wavethresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- R-wavethresh.spec	14 Sep 2006 13:07:24 -0000	1.3
+++ R-wavethresh.spec	17 Oct 2006 16:44:16 -0000	1.4
@@ -1,19 +1,19 @@
 %define packrel  9
 %define packname wavethresh
 
-Summary:	R module, Software to perform wavelet statistics and transforms
-Name:		R-%{packname}
-Version: 	2.2
-Release: 	4%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
-URL:		http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
+Summary: R module, Software to perform wavelet statistics and transforms
+Name: R-%{packname}
+Version: 2.2
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
+URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.4
-BuildRequires:	R >= 1.4, tetex-latex
+Requires: R >= 2.1
+BuildRequires: R >= 2.1, tetex-latex
 
 
 %description
@@ -48,6 +48,9 @@
 %doc DESCRIPTION
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
+- Rebuild for R 2.4.0.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos at fc.up.pt> - 2.2-4
 - New upstream version 2.2-9.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 16:46:09 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:46:09 -0700
Subject: rpms/R-wavethresh/FC-5 R-wavethresh.spec,1.3,1.4
Message-ID: <200610171646.k9HGk96u005575@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-wavethresh/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5538

Modified Files:
	R-wavethresh.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
- Rebuild for R 2.4.0.



Index: R-wavethresh.spec
===================================================================
RCS file: /cvs/extras/rpms/R-wavethresh/FC-5/R-wavethresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- R-wavethresh.spec	14 Sep 2006 13:08:27 -0000	1.3
+++ R-wavethresh.spec	17 Oct 2006 16:45:39 -0000	1.4
@@ -1,19 +1,19 @@
 %define packrel  9
 %define packname wavethresh
 
-Summary:	R module, Software to perform wavelet statistics and transforms
-Name:		R-%{packname}
-Version: 	2.2
-Release: 	4%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
-URL:		http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
+Summary: R module, Software to perform wavelet statistics and transforms
+Name: R-%{packname}
+Version: 2.2
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
+URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.4
-BuildRequires:	R >= 1.4, tetex-latex
+Requires: R >= 2.1
+BuildRequires: R >= 2.1, tetex-latex
 
 
 %description
@@ -48,6 +48,9 @@
 %doc DESCRIPTION
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
+- Rebuild for R 2.4.0.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos at fc.up.pt> - 2.2-4
 - New upstream version 2.2-9.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 16:47:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:47:17 -0700
Subject: rpms/R-wavethresh/FC-4 R-wavethresh.spec,1.2,1.3
Message-ID: <200610171647.k9HGlHOv005664@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-wavethresh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5634

Modified Files:
	R-wavethresh.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
- Rebuild for R 2.4.0.



Index: R-wavethresh.spec
===================================================================
RCS file: /cvs/extras/rpms/R-wavethresh/FC-4/R-wavethresh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-wavethresh.spec	4 Jun 2006 22:15:30 -0000	1.2
+++ R-wavethresh.spec	17 Oct 2006 16:46:47 -0000	1.3
@@ -1,19 +1,19 @@
-%define packrel  8
+%define packrel  9
 %define packname wavethresh
 
-Summary:	R module, Software to perform wavelet statistics and transforms
-Name:		R-%{packname}
-Version: 	2.2
-Release: 	3%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
-URL:		http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
+Summary: R module, Software to perform wavelet statistics and transforms
+Name: R-%{packname}
+Version: 2.2
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
+URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.4
-BuildRequires:	R >= 1.4, tetex-latex
+Requires: R >= 2.1
+BuildRequires: R >= 2.1, tetex-latex
 
 
 %description
@@ -48,6 +48,12 @@
 %doc DESCRIPTION
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos at fc.up.pt> - 2.2-4
+- New upstream version 2.2-9.
+
 * Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 2.2-3
 - Rebuild for R-2.3.x
 



From fedora-extras-commits at redhat.com  Tue Oct 17 17:16:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:16:40 -0700
Subject: rpms/wallpapoz - New directory
Message-ID: <200610171716.k9HHGeYu009045@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9041/wallpapoz

Log Message:
Directory /cvs/extras/rpms/wallpapoz added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 17:16:45 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:16:45 -0700
Subject: rpms/wallpapoz/devel - New directory
Message-ID: <200610171716.k9HHGj7v009061@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9041/wallpapoz/devel

Log Message:
Directory /cvs/extras/rpms/wallpapoz/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 17:17:00 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:17:00 -0700
Subject: rpms/wallpapoz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610171717.k9HHH0Ys009092@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9086

Added Files:
	Makefile import.log 
Log Message:
Setup of module wallpapoz


--- NEW FILE Makefile ---
# Top level Makefile for module wallpapoz
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 17:17:06 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:17:06 -0700
Subject: rpms/wallpapoz/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610171717.k9HHH6G0009110@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9086/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wallpapoz


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 17:18:03 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:18:03 -0700
Subject: rpms/wallpapoz import.log,1.1,1.2
Message-ID: <200610171718.k9HHI36N009192@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9155

Modified Files:
	import.log 
Log Message:
auto-import wallpapoz-0.3-1 on branch devel from wallpapoz-0.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 17:17:00 -0000	1.1
+++ import.log	17 Oct 2006 17:17:33 -0000	1.2
@@ -0,0 +1 @@
+wallpapoz-0_3-1:HEAD:wallpapoz-0.3-1.src.rpm:1161105448



From fedora-extras-commits at redhat.com  Tue Oct 17 17:18:04 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:18:04 -0700
Subject: rpms/wallpapoz/devel wallpapoz.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610171718.k9HHI4vm009196@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9155/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wallpapoz.spec 
Log Message:
auto-import wallpapoz-0.3-1 on branch devel from wallpapoz-0.3-1.src.rpm


--- NEW FILE wallpapoz.spec ---
%define         srcurl          http://wallpapoz.akbarhome.com/
%define         icondir         %{_datadir}/icons/hicolor/128x128/apps

Name:           wallpapoz
Version:        0.3
Release:        1%{?dist}
Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool

Group:          User Interface/Desktops
License:        GPL
URL:            %{srcurl}
Source0:        %{srcurl}files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  desktop-file-utils
Requires:       pygtk2-libglade

%description
This tool enables your Gnome desktop to have different 
wallpapers for different workspaces or virtual desktops.

%prep
%setup -q

%build
# some directory change
for f in src/*wall*.py ; do
   %{__sed} -i.dir \
      -e '/import sys/d' \
      -e '/xml_processing/s|^\(.*\)$|import sys\nsys.path.insert(0, %{_datadir}/%{name})\n\1|' \
      $f
   %{__sed} -i -e "s|%{_datadir}/%{name}|'%{_datadir}/%{name}'|" \
      $f
done

%{__sed} -i.dir \
   -e 's|-f daemon_wallpapoz.py|-f %{_bindir}/daemon_wallpapoz|g' \
   -e 's|\./daemon_wallpapoz.py\&|%{_bindir}/daemon_wallpapoz \&|' \
   src/wallpapoz.py

%{__sed} -i.rpmlint -e '1,3d' src/*processing.py

%{__sed} -i.dir \
   -e 's|Icon=.*|Icon=%{name}|' \
   -e 's|Exec=.*|Exec=%{name}|' \
   share/%{name}/%{name}.desktop

%install
%{__rm} -rf $RPM_BUILD_ROOT

# install by myself

for dir in %{_bindir} %{_datadir}/{applications,%{name},pixmaps} %{icondir} ; do
   %{__mkdir_p} $RPM_BUILD_ROOT$dir
done

for f in src/*%{name}.py ; do
   name=`basename $f | sed -e 's|.py$||'`
   %{__install} -c -p -m755 $f $RPM_BUILD_ROOT%{_bindir}/$name
done
%{__install} -c -p -m644 src/*processing.py $RPM_BUILD_ROOT%{_datadir}/%{name}/

pushd share/%{name}
%{__install} -c -p -m644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__install} -c -p -m644 %{name}.glade* $RPM_BUILD_ROOT%{_datadir}/%{name}/

desktop-file-install \
   --vendor fedora \
   --add-category Application \
   --add-category X-Fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{name}.desktop
popd

ln -sf ../../../../%{name}/%{name}.png $RPM_BUILD_ROOT%{icondir}

%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 AUTHORS COPYING NEWS README
%{_bindir}/*%{name}

%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*processing.py*
%{_datadir}/%{name}/%{name}.glade*
%{_datadir}/%{name}/%{name}.png

%{icondir}/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop

%changelog
* Thu Oct 12 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-1
- Initial packaging, importing to Fedora extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 17:17:06 -0000	1.1
+++ .cvsignore	17 Oct 2006 17:17:34 -0000	1.2
@@ -0,0 +1 @@
+wallpapoz-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 17:17:06 -0000	1.1
+++ sources	17 Oct 2006 17:17:34 -0000	1.2
@@ -0,0 +1 @@
+7b3c2189f24f3cee48acb4085944b7c4  wallpapoz-0.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 17 17:20:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:20:40 -0700
Subject: owners owners.list,1.1840,1.1841
Message-ID: <200610171720.k9HHKeVd009309@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9282

Modified Files:
	owners.list 
Log Message:
add wallpapoz to owners.list


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1840
retrieving revision 1.1841
diff -u -r1.1840 -r1.1841
--- owners.list	17 Oct 2006 16:34:02 -0000	1.1840
+++ owners.list	17 Oct 2006 17:20:09 -0000	1.1841
@@ -2272,6 +2272,7 @@
 Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|wallpapoz|Gnome Multi Backgrounds and Wallpapers Configuration Tool|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wavpack|A completely open audiocodec|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 17:27:33 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Tue, 17 Oct 2006 10:27:33 -0700
Subject: rpms/scanbuttond/devel scanbuttond.init, 1.2, 1.3 scanbuttond.spec, 
	1.2, 1.3
Message-ID: <200610171727.k9HHRXkJ009384@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9366/devel

Modified Files:
	scanbuttond.init scanbuttond.spec 
Log Message:
auto-import scanbuttond-0.2.3-9 on branch devel from scanbuttond-0.2.3-9.src.rpm


Index: scanbuttond.init
===================================================================
RCS file: /cvs/extras/rpms/scanbuttond/devel/scanbuttond.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scanbuttond.init	16 Oct 2006 16:07:55 -0000	1.2
+++ scanbuttond.init	17 Oct 2006 17:27:03 -0000	1.3
@@ -5,7 +5,8 @@
 # chkconfig: - 98 54
 # description: scanbuttond is a small daemon which checks for supported scanners \
 #              when attached to system, it loads that respective backend so that \
-#              buttons on that scanners gets activated for their functionings.
+#              buttons on that scanners gets activated for their functionings defined \
+#              in /etc/scanbuttond/buttonpressed.sh file.
 # processname: scanbuttond
 # config: /etc/scanbuttond
 


Index: scanbuttond.spec
===================================================================
RCS file: /cvs/extras/rpms/scanbuttond/devel/scanbuttond.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scanbuttond.spec	16 Oct 2006 16:07:55 -0000	1.2
+++ scanbuttond.spec	17 Oct 2006 17:27:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:            scanbuttond
 Version:         0.2.3
-Release:         8%{?dist}
+Release:         9%{?dist}
 Summary:         Scanner Button tools to SANE
 
 Group:           System Environment/Libraries
@@ -77,6 +77,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-9
+- Got CVS tagging problem as usual to me
+- so increasing release number
+
 * Mon Oct 16 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-8
 - corrected scanbuttond.init which i hacked from lisa daemon 
 



From fedora-extras-commits at redhat.com  Tue Oct 17 17:32:51 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:32:51 -0700
Subject: comps comps-fe6.xml.in,1.191,1.192
Message-ID: <200610171732.k9HHWp1F009552@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9535

Modified Files:
	comps-fe6.xml.in 
Log Message:
add wallpapoz to fe6.xml.in


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- comps-fe6.xml.in	16 Oct 2006 23:55:32 -0000	1.191
+++ comps-fe6.xml.in	17 Oct 2006 17:32:20 -0000	1.192
@@ -475,6 +475,7 @@
       <packagereq type="optional">smeg</packagereq>
       <packagereq type="optional">themes-backgrounds-gnome</packagereq>
       <packagereq type="optional">verbiste-gnome</packagereq>
+      <packagereq type="optional">wallpapoz</packagereq>
       <packagereq type="optional">wp_tray</packagereq>
       <packagereq type="optional">xscreensaver-extras-gss</packagereq>
       <packagereq type="optional">xscreensaver-gl-extras-gss</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 17 17:39:42 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 10:39:42 -0700
Subject: owners owners.list,1.1841,1.1842
Message-ID: <200610171739.k9HHdgrv009730@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9683

Modified Files:
	owners.list 
Log Message:
add libctl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1841
retrieving revision 1.1842
diff -u -r1.1841 -r1.1842
--- owners.list	17 Oct 2006 17:20:09 -0000	1.1841
+++ owners.list	17 Oct 2006 17:39:12 -0000	1.1842
@@ -838,6 +838,7 @@
 Fedora Extras|libbinio|A binary stream interface class library for C++|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libburn|Library for reading, mastering and writing optical discs|jkeating at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|libctl|Guile-based support for flexible control files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|libchmxx|C++ bindings for chmlib|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 17:52:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Oct 2006 10:52:33 -0700
Subject: comps comps-fe5.xml.in,1.170,1.171
Message-ID: <200610171752.k9HHqX8d009799@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9783

Modified Files:
	comps-fe5.xml.in 
Log Message:
Add vdr.


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- comps-fe5.xml.in	16 Oct 2006 23:55:32 -0000	1.170
+++ comps-fe5.xml.in	17 Oct 2006 17:52:03 -0000	1.171
@@ -773,6 +773,7 @@
       <packagereq type="optional">tagtool</packagereq>
       <packagereq type="optional">tclabc</packagereq>
       <packagereq type="optional">ushare</packagereq>
+      <packagereq type="optional">vdr</packagereq>
       <packagereq type="optional">xmms</packagereq>
       <packagereq type="optional">xmms-cdread</packagereq>
       <packagereq type="optional">xmms-flac</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 17 18:13:51 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 17 Oct 2006 11:13:51 -0700
Subject: fedora-security/audit fc5,1.360,1.361 fc6,1.114,1.115
Message-ID: <200610171813.k9HIDpRC012830@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12810/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-4342



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- fc5	17 Oct 2006 14:49:34 -0000	1.360
+++ fc5	17 Oct 2006 18:13:49 -0000	1.361
@@ -70,6 +70,7 @@
 CVE-2006-4434 ignore (sendmail, fixed 8.13.8) not exploitable
 CVE-2006-4380 version (mysql, fixed 4.1.13)
 CVE-2006-4343 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
+CVE-2006-4342 ignore (kernel) rhel3 only
 CVE-2006-4340 version (nss, fixed 3.11.3) [since FEDORA-2006-979]
 CVE-2006-4339 backport (openssl) [since FEDORA-2006-953]
 CVE-2006-4339 backport (openssl097a) [since FEDORA-2006-953]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fc6	15 Oct 2006 14:05:49 -0000	1.114
+++ fc6	17 Oct 2006 18:13:49 -0000	1.115
@@ -61,6 +61,7 @@
 CVE-2006-4433 version (php, fixed 5.1.4)
 CVE-2006-4380 version (mysql, fixed 4.1.13)
 CVE-2006-4343 backport (openssl, fixed 0.9.8d)
+CVE-2006-4342 ignore (kernel) rhel3 only
 CVE-2006-4340 version (nss, fixed 3.11.3)
 CVE-2006-4339 backport (openssl, fixed 0.9.8c)
 CVE-2006-4339 backport (openssl097)



From fedora-extras-commits at redhat.com  Tue Oct 17 18:31:51 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 17 Oct 2006 11:31:51 -0700
Subject: rpms/git/devel .cvsignore, 1.33, 1.34 git.spec, 1.22, 1.23 sources, 
	1.33, 1.34
Message-ID: <200610171831.k9HIVpHQ012927@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12907

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Oct 2006 05:02:54 -0000	1.33
+++ .cvsignore	17 Oct 2006 18:31:21 -0000	1.34
@@ -1 +1 @@
-git-1.4.2.3.tar.gz
+git-1.4.2.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- git.spec	5 Oct 2006 05:02:54 -0000	1.22
+++ git.spec	17 Oct 2006 18:31:21 -0000	1.23
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.3
+Version: 	1.4.2.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
+- git-1.4.2.4
+
 * Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
 - git-1.4.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Oct 2006 05:02:54 -0000	1.33
+++ sources	17 Oct 2006 18:31:21 -0000	1.34
@@ -1 +1 @@
-3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz
+285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 19:06:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Oct 2006 12:06:49 -0700
Subject: rpms/tagtool/devel tagtool-genre.patch, NONE, 1.1 tagtool.spec, 1.7,
	1.8
Message-ID: <200610171906.k9HJ6n9f016197@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/tagtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16159

Modified Files:
	tagtool.spec 
Added Files:
	tagtool-genre.patch 
Log Message:
* Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-9
- Add patch to fix genre ui bug. (#211145)


tagtool-genre.patch:

--- NEW FILE tagtool-genre.patch ---
diff -ur tagtool-0.12.2.OLD/src/tagtool.glade tagtool-0.12.2/src/tagtool.glade
--- tagtool-0.12.2.OLD/src/tagtool.glade	2005-05-26 11:12:54.000000000 -0400
+++ tagtool-0.12.2/src/tagtool.glade	2006-10-17 14:31:22.000000000 -0400
@@ -2797,7 +2797,7 @@
 					      <child>
 						<widget class="GtkCombo" id="combo_vor_genre">
 						  <property name="visible">True</property>
-						  <property name="value_in_list">True</property>
+						  <property name="value_in_list">False</property>
 						  <property name="allow_empty">True</property>
 						  <property name="case_sensitive">False</property>
 						  <property name="enable_arrow_keys">True</property>


Index: tagtool.spec
===================================================================
RCS file: /cvs/extras/rpms/tagtool/devel/tagtool.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tagtool.spec	31 Aug 2006 22:15:48 -0000	1.7
+++ tagtool.spec	17 Oct 2006 19:06:19 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		tagtool
 Version:	0.12.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Ogg Vorbis and MP3 tag manager
 
 Group:		Applications/Multimedia
@@ -8,6 +8,7 @@
 URL:		http://pwp.netcabo.pt/paol/tagtool/
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:		%{name}-contents.patch
+Patch2:		%{name}-genre.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libglade2-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch2 -p1 -b .genre
 %patch1 -p1 -b .contents
 
 
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-9
+- Add patch to fix genre ui bug. (#211145)
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-8
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 19:07:27 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 17 Oct 2006 12:07:27 -0700
Subject: rpms/yadex/FC-5 yadex.spec,1.2,1.3
Message-ID: <200610171907.k9HJ7RBG016282@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16191/FC-5

Modified Files:
	yadex.spec 
Log Message:
Add ownership of extra directory




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/FC-5/yadex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yadex.spec	10 Apr 2006 15:35:56 -0000	1.2
+++ yadex.spec	17 Oct 2006 19:06:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -92,6 +92,7 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}-%{version}
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/%{version}
 %config(noreplace) %{_sysconfdir}/%{name}/%{version}/%{name}.cfg
 %{_datadir}/%{name}
 %{_mandir}/man6/*
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Wart <wart at kobold.org> 1.7.0-5
+- Own an extra directory
+
 * Mon Apr 10 2006 Wart <wart at kobold.org> 1.7.0-4
 - Update for modular x.org
 



From fedora-extras-commits at redhat.com  Tue Oct 17 19:07:27 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 17 Oct 2006 12:07:27 -0700
Subject: rpms/yadex/devel yadex.spec,1.3,1.4
Message-ID: <200610171907.k9HJ7RG4016285@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16191/devel

Modified Files:
	yadex.spec 
Log Message:
Add ownership of extra directory




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/yadex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yadex.spec	28 Aug 2006 03:38:00 -0000	1.3
+++ yadex.spec	17 Oct 2006 19:06:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -90,6 +90,7 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}-%{version}
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/%{version}
 %config(noreplace) %{_sysconfdir}/%{name}/%{version}/%{name}.cfg
 %{_datadir}/%{name}
 %{_mandir}/man6/*
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Wart <wart at kobold.org> 1.7.0-6
+- Own an extra directory
+
 * Sun Aug 27 2006 Wart <wart at kobold.org> 1.7.0-5
 - Rebuild for FC-6
 



From fedora-extras-commits at redhat.com  Tue Oct 17 19:08:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Oct 2006 12:08:48 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.8,1.9
Message-ID: <200610171908.k9HJ8m5q016315@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Oct 17 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.18-1.2798.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- em8300-kmod.spec	8 Oct 2006 16:29:57 -0000	1.8
+++ em8300-kmod.spec	17 Oct 2006 19:08:18 -0000	1.9
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2747.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.18-1.2798.fc6.
+
 * Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
 - Don't use <linux/config.h>.
 - Build for kernel 2.6.18-1.2747.fc6.



From fedora-extras-commits at redhat.com  Tue Oct 17 19:15:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Oct 2006 12:15:27 -0700
Subject: fedora-security/audit fe3,1.21,1.22 fe4,1.79,1.80 fe5,1.86,1.87
Message-ID: <200610171915.k9HJFRAd016487@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16465

Modified Files:
	fe3 fe4 fe5 
Log Message:
Add clamav CVE ids.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fe3	16 Oct 2006 18:14:43 -0000	1.21
+++ fe3	17 Oct 2006 19:15:24 -0000	1.22
@@ -2,11 +2,12 @@
 
 ** are items that need attention
 
-CVE-????-???? VULNERABLE (clamav) #210973
+CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
+CVE-2006-4182 VULNERABLE (clamav) #210973
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-3) #200545
 CVE-2006-3816 version (krusader, fixed 1.70.1) #200323


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- fe4	16 Oct 2006 18:14:43 -0000	1.79
+++ fe4	17 Oct 2006 19:15:24 -0000	1.80
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-????-???? VULNERABLE (clamav) #210973
+CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -28,6 +28,7 @@
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
+CVE-2006-4182 VULNERABLE (clamav) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-4) #200545


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- fe5	16 Oct 2006 18:14:43 -0000	1.86
+++ fe5	17 Oct 2006 19:15:24 -0000	1.87
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-????-???? VULNERABLE (clamav) #210973
+CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -28,6 +28,7 @@
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
+CVE-2006-4182 VULNERABLE (clamav) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-5) #200545



From fedora-extras-commits at redhat.com  Tue Oct 17 19:17:59 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Oct 2006 12:17:59 -0700
Subject: rpms/tagtool/FC-5 tagtool-genre.patch, NONE, 1.1 tagtool.spec, 1.6,
	1.7
Message-ID: <200610171917.k9HJHxaF016539@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/tagtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16519

Modified Files:
	tagtool.spec 
Added Files:
	tagtool-genre.patch 
Log Message:
* Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-7
- Add patch to fix genre ui bug. (#211145)


tagtool-genre.patch:

--- NEW FILE tagtool-genre.patch ---
diff -ur tagtool-0.12.2.OLD/src/tagtool.glade tagtool-0.12.2/src/tagtool.glade
--- tagtool-0.12.2.OLD/src/tagtool.glade	2005-05-26 11:12:54.000000000 -0400
+++ tagtool-0.12.2/src/tagtool.glade	2006-10-17 14:31:22.000000000 -0400
@@ -2797,7 +2797,7 @@
 					      <child>
 						<widget class="GtkCombo" id="combo_vor_genre">
 						  <property name="visible">True</property>
-						  <property name="value_in_list">True</property>
+						  <property name="value_in_list">False</property>
 						  <property name="allow_empty">True</property>
 						  <property name="case_sensitive">False</property>
 						  <property name="enable_arrow_keys">True</property>


Index: tagtool.spec
===================================================================
RCS file: /cvs/extras/rpms/tagtool/FC-5/tagtool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tagtool.spec	23 Jun 2006 14:31:01 -0000	1.6
+++ tagtool.spec	17 Oct 2006 19:17:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		tagtool
 Version:	0.12.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Ogg Vorbis and MP3 tag manager
 
 Group:		Applications/Multimedia
@@ -8,6 +8,7 @@
 URL:		http://pwp.netcabo.pt/paol/tagtool/
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:		%{name}-contents.patch
+Patch2:		%{name}-genre.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libglade2-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch2 -p1 -b .genre
 %patch1 -p1 -b .contents
 
 
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-7
+- Add patch to fix genre ui bug. (#211145)
+
 * Fri Jun 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-6
 - Add BR for perl(XML::Parser).
 



From fedora-extras-commits at redhat.com  Tue Oct 17 19:54:51 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 17 Oct 2006 12:54:51 -0700
Subject: rpms/ghdl/FC-5 ghdl-svn73.patch, NONE, 1.1 ghdl.spec, 1.17,
	1.18 ghdl-svn61.patch, 1.1, NONE
Message-ID: <200610171954.k9HJspte016806@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16785

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn73.patch 
Removed Files:
	ghdl-svn61.patch 
Log Message:
update to svn73


ghdl-svn73.patch:

--- NEW FILE ghdl-svn73.patch ---
diff -urN ghdl-0.25/vhdl/back_end.ads ghdl-0.26dev/vhdl/back_end.ads
--- ghdl-0.25/vhdl/back_end.ads	2005-09-22 23:07:25.000000000 +0200
+++ ghdl-0.26dev/vhdl/back_end.ads	2006-10-05 11:35:25.000000000 +0200
@@ -29,6 +29,14 @@
    Library_To_File_Name : Library_To_File_Name_Acc :=
      Default_Library_To_File_Name'Access;
 
+   --  Back-end options.
+   type Parse_Option_Acc is access function (Opt : String) return Boolean;
+   Parse_Option : Parse_Option_Acc := null;
+
+   --  Disp back-end option help.
+   type Disp_Option_Acc is access procedure;
+   Disp_Option : Disp_Option_Acc := null;
+
    --  UNIT is a design unit from parse.
    --  According to the current back-end, do what is necessary.
    --
@@ -46,8 +54,5 @@
    --  May be NULL for no additionnal checks.
    type Sem_Foreign_Acc is access procedure (Decl : Iir);
    Sem_Foreign : Sem_Foreign_Acc := null;
-
-   --procedure Finish_Compilation
-   --  (Unit : Iir_Design_Unit; Main : Boolean := False);
 end Back_End;
 
diff -urN ghdl-0.25/vhdl/bug.adb ghdl-0.26dev/vhdl/bug.adb
--- ghdl-0.25/vhdl/bug.adb	2005-11-18 02:34:12.000000000 +0100
+++ ghdl-0.26dev/vhdl/bug.adb	2006-10-05 11:35:25.000000000 +0200
@@ -70,7 +70,7 @@
       Put_Line
         (Standard_Error,
          "Please report this bug on http://gna.org/projects/ghdl");
-      Put_Line (Standard_Error, "GHDL version: " & Ghdl_Version);
+      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "In directory: " &
                 GNAT.Directory_Operations.Get_Current_Dir);
diff -urN ghdl-0.25/vhdl/canon.adb ghdl-0.26dev/vhdl/canon.adb
--- ghdl-0.25/vhdl/canon.adb	2006-07-29 06:42:30.000000000 +0200
+++ ghdl-0.26dev/vhdl/canon.adb	2006-10-05 11:35:25.000000000 +0200
@@ -847,22 +847,6 @@
       end loop;
    end Canon_Sequential_Stmts;
 
-   procedure Add_Driver_For_Signal (Driver_List : Iir_List;
-                                    Signal : Iir)
-   is
-      Choice : Iir;
-   begin
-      if Get_Kind (Signal) = Iir_Kind_Aggregate then
-         Choice := Get_Association_Choices_Chain (Signal);
-         while Choice /= Null_Iir loop
-            Add_Driver_For_Signal (Driver_List, Get_Associated (Choice));
-            Choice := Get_Chain (Choice);
-         end loop;
-      else
-         Add_Element (Driver_List, Get_Longuest_Static_Prefix (Signal));
-      end if;
-   end Add_Driver_For_Signal;
-
    -- Create a statement transform from concurrent_signal_assignment
    -- statement STMT (either selected or conditional).
    -- waveform transformation is not done.
@@ -895,9 +879,6 @@
       --      reserved word POSTPONED.
       Set_Postponed_Flag (Proc, Get_Postponed_Flag (Proc));
 
-      Set_Driver_List (Proc, Create_Iir_List);
-      Add_Driver_For_Signal (Get_Driver_List (Proc), Get_Target (Stmt));
-
       Canon_Extract_Sensitivity (Get_Target (Stmt), Sensitivity_List, True);
 
       if Canon_Flag_Expressions then
@@ -966,7 +947,6 @@
       Assoc_Chain : Iir;
       Assoc : Iir;
       Imp : Iir;
-      Driver_List : Iir_Driver_List;
       Inter : Iir;
       Sensitivity_List : Iir_List;
       Is_Sensitized : Boolean;
@@ -1014,7 +994,6 @@
          Get_Parameter_Association_Chain (Call),
          Call);
       Set_Parameter_Association_Chain (Call, Assoc_Chain);
-      Driver_List := Null_Iir_List;
       Assoc := Assoc_Chain;
 
       --  LRM93 9.3
@@ -1034,18 +1013,6 @@
                   Canon_Extract_Sensitivity
                     (Get_Actual (Assoc), Sensitivity_List, False);
                end if;
-               --  LRM 2.1.1.2 Signal Parameters
-               if Get_Kind (Inter) = Iir_Kind_Signal_Interface_Declaration
-                 and then Get_Mode (Inter) in Iir_Out_Modes
-               then
-                  if Driver_List = Null_Iir_List then
-                     Driver_List := Create_Iir_List;
-                     Set_Driver_List (Proc, Driver_List);
-                  end if;
-                  Add_Element
-                    (Driver_List,
-                     Get_Longuest_Static_Prefix (Get_Actual (Assoc)));
-               end if;
             when Iir_Kind_Association_Element_Open
               | Iir_Kind_Association_Element_By_Individual =>
                null;
diff -urN ghdl-0.25/vhdl/disp_tree.adb ghdl-0.26dev/vhdl/disp_tree.adb
--- ghdl-0.25/vhdl/disp_tree.adb	2005-10-26 14:31:21.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_tree.adb	2006-10-05 11:35:25.000000000 +0200
@@ -1023,8 +1023,6 @@
             Disp_Depth (Get_Subprogram_Depth (Tree));
             Header ("subprogram_body:");
             Disp_Tree_Flat (Get_Subprogram_Body (Tree), Ntab);
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("attribute_value_chain:");
             Disp_Tree_Flat_Chain (Get_Attribute_Value_Chain (Tree), Ntab);
          when Iir_Kind_Procedure_Body
@@ -1423,8 +1421,6 @@
                Header ("sensivity list:");
                Disp_Tree_List (Get_Sensitivity_List (Tree), Ntab, True);
             end if;
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("declaration_chain:");
             Disp_Tree_Chain (Get_Declaration_Chain (Tree), Ntab);
             Header ("process statements:");
diff -urN ghdl-0.25/vhdl/disp_vhdl.adb ghdl-0.26dev/vhdl/disp_vhdl.adb
--- ghdl-0.25/vhdl/disp_vhdl.adb	2006-07-09 03:55:28.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_vhdl.adb	2006-10-05 11:35:25.000000000 +0200
@@ -893,25 +893,6 @@
       Put_Line (";");
    end Disp_Object_Declaration;
 
-   procedure Disp_Driver_List (List: Iir_Driver_List; Indent : Count)
-   is
-      El: Iir;
-   begin
-      if List = Null_Iir_List or else Get_Nbr_Elements (List) = 0 then
-         return;
-      end if;
-      Set_Col (Indent);
-      Put_Line ("-- drivers needed for signals:");
-      for I in Natural loop
-         El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
-         Set_Col (Indent);
-         Put ("--   ");
-         Disp_Expression (El);
-         New_Line;
-      end loop;
-   end Disp_Driver_List;
-
    procedure Disp_Subprogram_Declaration (Subprg: Iir)
    is
       Indent: Count;
@@ -943,10 +924,6 @@
          when others =>
             raise Internal_Error;
       end case;
-
-      if Get_Kind (Subprg) = Iir_Kind_Procedure_Declaration then
-         Disp_Driver_List (Get_Driver_List (Subprg), Indent);
-      end if;
    end Disp_Subprogram_Declaration;
 
    procedure Disp_Subprogram_Body (Subprg : Iir)
@@ -1517,7 +1494,6 @@
       else
          New_Line;
       end if;
-      Disp_Driver_List (Get_Driver_List (Process), Start + Indentation);
       Disp_Declaration_Chain (Process, Start + Indentation);
       Set_Col (Start);
       Put_Line ("begin");
@@ -2312,10 +2288,10 @@
             Disp_Concurrent_Conditional_Signal_Assignment (An_Iir);
          when Iir_Kinds_Dyadic_Operator =>
             Disp_Dyadic_Operator (An_Iir);
-         when Iir_Kind_Signal_Interface_Declaration =>
+         when Iir_Kind_Signal_Interface_Declaration
+           | Iir_Kind_Signal_Declaration
+           | Iir_Kind_Object_Alias_Declaration =>
             Disp_Name_Of (An_Iir);
-         when Iir_Kind_Signal_Declaration =>
-            Disp_Identifier (An_Iir);
          when Iir_Kind_Enumeration_Literal =>
             Disp_Identifier (An_Iir);
          when Iir_Kind_Component_Instantiation_Statement =>
@@ -2330,8 +2306,11 @@
             Disp_Package_Declaration (An_Iir);
          when Iir_Kind_Wait_Statement =>
             Disp_Wait_Statement (An_Iir);
-         when Iir_Kind_Selected_Name =>
-            Disp_Name (An_Iir);
[...4286 lines suppressed...]
+         end if;
+         return Create_Var_Identifier_From_Buffer (L);
       end Create_Var_Identifier;
 
       function Create_Uniq_Identifier return Var_Ident_Type
@@ -22728,19 +23323,6 @@
          end case;
       end Translate_Succ_Pred_Attribute;
 
-      --  Read the boolean attribute (active or event) FIELD of simple signal
-      --  SIG.
-      function Read_Bool_Signal_Attribute (Sig : O_Enode; Field : O_Fnode)
-                                          return O_Enode
-      is
-         S : O_Enode;
-      begin
-         S := New_Convert_Ov (Sig, Ghdl_Signal_Ptr);
-         return New_Value
-           (New_Selected_Element (New_Access_Element (S), Field));
-         --Ghdl_Signal_Event_Node));
-      end Read_Bool_Signal_Attribute;
-
       type Bool_Sigattr_Data_Type is record
          Label : O_Snode;
          Field : O_Fnode;
@@ -22752,8 +23334,7 @@
          pragma Unreferenced (Targ_Type);
       begin
          Gen_Exit_When (Data.Label,
-                        Read_Bool_Signal_Attribute (New_Value (M2Lv (Targ)),
-                                                    Data.Field));
+                        New_Value (Get_Signal_Field (Targ, Data.Field)));
       end Bool_Sigattr_Non_Composite_Signal;
 
       function Bool_Sigattr_Prepare_Data_Composite
@@ -22819,7 +23400,7 @@
          if Get_Kind (Prefix_Type) in Iir_Kinds_Scalar_Type_Definition then
             --  Effecient handling for a scalar signal.
             Name := Chap6.Translate_Name (Prefix);
-            return Read_Bool_Signal_Attribute (New_Value (M2Lv (Name)), Field);
+            return New_Value (Get_Signal_Field (Name, Field));
          else
             --  Element per element handling for composite signals.
             Res := Create_Temp (Std_Boolean_Type_Node);
@@ -22839,13 +23420,14 @@
 
       function Translate_Event_Attribute (Attr : Iir) return O_Enode is
       begin
-         return Translate_Bool_Signal_Attribute (Attr, Ghdl_Signal_Event_Node);
+         return Translate_Bool_Signal_Attribute
+           (Attr, Ghdl_Signal_Event_Field);
       end Translate_Event_Attribute;
 
       function Translate_Active_Attribute (Attr : Iir) return O_Enode is
       begin
          return Translate_Bool_Signal_Attribute
-           (Attr, Ghdl_Signal_Active_Node);
+           (Attr, Ghdl_Signal_Active_Field);
       end Translate_Active_Attribute;
 
       --  Read signal value FIELD of signal SIG.
@@ -22862,11 +23444,20 @@
            (New_Unchecked_Address (New_Selected_Element (T, Field), S_Type));
       end Get_Signal_Value_Field;
 
+      function Get_Signal_Field (Sig : Mnode; Field : O_Fnode)
+                                return O_Lnode
+      is
+         S : O_Enode;
+      begin
+         S := New_Convert_Ov (New_Value (M2Lv (Sig)), Ghdl_Signal_Ptr);
+         return New_Selected_Element (New_Access_Element (S), Field);
+      end Get_Signal_Field;
+
       function Read_Last_Value (Sig : O_Enode; Sig_Type : Iir) return O_Enode
       is
       begin
          return New_Value (Get_Signal_Value_Field
-                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Node));
+                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Field));
       end Read_Last_Value;
 
       function Translate_Last_Value is new Chap7.Translate_Signal_Value
@@ -27031,39 +27622,53 @@
         (Chararray_Type, New_Unsigned_Literal (Ghdl_Index_Type, 8));
       New_Type_Decl (Get_Identifier ("__ghdl_scalar_bytes"),
                      Ghdl_Scalar_Bytes);
+
+      Ghdl_Signal_Ptr := New_Access_Type (O_Tnode_Null);
+      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+
       --  Type __signal_signal is record
       Start_Record_Type (Rec);
-      New_Record_Field (Rec, Ghdl_Signal_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Value_Field,
                         Get_Identifier ("value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Field,
                         Get_Identifier ("driving_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Field,
                         Get_Identifier ("last_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Field,
                         Get_Identifier ("last_event"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Field,
                         Get_Identifier ("last_active"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Chain_Field,
+                        Get_Identifier ("active_chain"),
+                        Ghdl_Signal_Ptr);
+      New_Record_Field (Rec, Ghdl_Signal_Event_Field,
                         Get_Identifier ("event"),
                         Std_Boolean_Type_Node);
-      New_Record_Field (Rec, Ghdl_Signal_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Field,
                         Get_Identifier ("active"),
                         Std_Boolean_Type_Node);
+      New_Record_Field (Rec, Ghdl_Signal_Has_Active_Field,
+                        Get_Identifier ("has_active"),
+                        Ghdl_Bool_Type);
       Finish_Record_Type (Rec, Ghdl_Signal_Type);
       New_Type_Decl (Get_Identifier ("__ghdl_signal"), Ghdl_Signal_Type);
 
-      Ghdl_Signal_Ptr := New_Access_Type (Ghdl_Signal_Type);
-      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+      Finish_Access_Type (Ghdl_Signal_Ptr, Ghdl_Signal_Type);
 
       Ghdl_Signal_Ptr_Ptr := New_Access_Type (Ghdl_Signal_Ptr);
       New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr_ptr"),
                      Ghdl_Signal_Ptr_Ptr);
 
+      New_Var_Decl (Ghdl_Signal_Active_Chain,
+                    Get_Identifier ("__ghdl_signal_active_chain"),
+                    O_Storage_External,
+                    Ghdl_Signal_Ptr);
+
       --  procedure __ghdl_signal_merge_rti
       --       (sig : ghdl_signal_ptr; rti : ghdl_rti_access)
       Start_Procedure_Decl
@@ -27305,6 +27910,17 @@
       New_Interface_Decl (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
       Finish_Subprogram_Decl (Interfaces, Ghdl_Process_Add_Driver);
 
+      --  procedure __ghdl_signal_direct_driver (sig : __ghdl_signal_ptr;
+      --                                         Drv : Ghdl_Ptr_type);
+      Start_Procedure_Decl
+        (Interfaces, Get_Identifier ("__ghdl_signal_direct_driver"),
+         O_Storage_External);
+      New_Interface_Decl
+        (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
+      New_Interface_Decl
+        (Interfaces, Param, Get_Identifier ("drv"), Ghdl_Ptr_Type);
+      Finish_Subprogram_Decl (Interfaces, Ghdl_Signal_Direct_Driver);
+
       declare
          procedure Create_Signal_Conversion (Name : String; Res : out O_Dnode)
          is
diff -urN ghdl-0.25/vhdl/translation.ads ghdl-0.26dev/vhdl/translation.ads
--- ghdl-0.25/vhdl/translation.ads	2006-08-02 06:13:50.000000000 +0200
+++ ghdl-0.26dev/vhdl/translation.ads	2006-10-05 11:35:23.000000000 +0200
@@ -61,6 +61,21 @@
    --  If set, do not generate code for unused implicit subprograms.
    Flag_Discard_Unused_Implicit : Boolean := False;
 
+   --  If set, dump drivers per process during compilation.
+   Flag_Dump_Drivers : Boolean := False;
+
+   --  If set, try to create direct drivers.
+   Flag_Direct_Drivers : Boolean := True;
+
+   --  If set, checks ranges (subtype ranges).
+   Flag_Range_Checks : Boolean := True;
+
+   --  If set, checks indexes (arrays index and slice).
+   Flag_Index_Checks : Boolean := True;
+
+   --  If set, do not create identifiers (for in memory compilation).
+   Flag_Discard_Identifiers : Boolean := False;
+
    type Foreign_Kind_Type is (Foreign_Unknown,
                               Foreign_Vhpidirect,
                               Foreign_Intrinsic);
diff -urN ghdl-0.25/vhdl/version.ads ghdl-0.26dev/vhdl/version.ads
--- ghdl-0.25/vhdl/version.ads	2006-08-11 05:15:55.000000000 +0200
+++ ghdl-0.26dev/vhdl/version.ads	2006-10-05 11:35:25.000000000 +0200
@@ -1,4 +1,5 @@
 package Version is
-   Ghdl_Version : constant String :=
-      "GHDL 0.25 (20060811) [Sokcho edition]";
+   Ghdl_Release : constant String :=
+      "GHDL 0.26dev (20060819) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.26dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-5/ghdl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ghdl.spec	28 Aug 2006 22:29:28 -0000	1.17
+++ ghdl.spec	17 Oct 2006 19:54:21 -0000	1.18
@@ -1,6 +1,6 @@
 %define gccver 4.1.1
 %define ghdlver 0.25
-%define ghdlsvnver 61
+%define ghdlsvnver 73
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.73svn.0
+- update to svn73
+
 * Tue Aug 29 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.61svn.0
 - update to svn61
 


--- ghdl-svn61.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 20:11:42 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 17 Oct 2006 13:11:42 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.5, 1.6 cobbler.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610172011.k9HKBgo0019867@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19842

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Oct 2006 20:18:47 -0000	1.5
+++ .cvsignore	17 Oct 2006 20:11:11 -0000	1.6
@@ -2,3 +2,4 @@
 cobbler-0.2.1.tar.gz
 cobbler-0.2.2.tar.gz
 cobbler-0.2.3.tar.gz
+cobbler-0.2.5.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cobbler.spec	10 Oct 2006 20:18:47 -0000	1.4
+++ cobbler.spec	17 Oct 2006 20:11:11 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.3
+Version: 0.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -28,19 +28,20 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %{_bindir}/cobbler
 %dir /etc/cobbler
+/etc/cobbler/*.ks
 /etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
@@ -54,6 +55,14 @@
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
+
+* Mon Oct 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
+- Upstream features and bugfixes (see CHANGELOG)
+- Packaged additional kickstart file and specfile cleanup
+
+* Thu Oct 12 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.4-1
+- Upstream features and bugfixes (see CHANGELOG)
+
 * Mon Oct 9 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
 - Upstream features (see CHANGELOG) & URL update
 
@@ -70,7 +79,7 @@
 - Lots of new PXE and dhcpd.conf upstream, elilo.efi now included.
 
 * Thu Sep 21 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-8
-- Added doc files to %doc, removed INSTALLED_FILES code
+- Added doc files to doc, removed INSTALLED_FILES code
 
 * Wed Sep 20 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-7
 - Upstream updates


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Oct 2006 20:18:47 -0000	1.5
+++ sources	17 Oct 2006 20:11:11 -0000	1.6
@@ -1 +1 @@
-90596f95025ec8180e1907cb2f768fa7  cobbler-0.2.3.tar.gz
+ac4be73942d50274648093510f119aaf  cobbler-0.2.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 20:35:45 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 17 Oct 2006 13:35:45 -0700
Subject: rpms/perl-IPC-Cmd/devel .cvsignore, 1.3, 1.4 perl-IPC-Cmd.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610172035.k9HKZjkB020082@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20062

Modified Files:
	.cvsignore perl-IPC-Cmd.spec sources 
Log Message:
Update to 0.32.
Use fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Sep 2006 01:08:52 -0000	1.3
+++ .cvsignore	17 Oct 2006 20:35:15 -0000	1.4
@@ -1 +1 @@
-IPC-Cmd-0.25.tar.gz
+IPC-Cmd-0.32.tar.gz


Index: perl-IPC-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/perl-IPC-Cmd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-IPC-Cmd.spec	17 Sep 2006 01:08:52 -0000	1.2
+++ perl-IPC-Cmd.spec	17 Oct 2006 20:35:15 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-IPC-Cmd
-Version:        0.25
+Version:        0.32
 Release:        1%{?dist}
 Summary:        Finding and running system commands made easy
 License:        GPL or Artistic
@@ -32,7 +32,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -47,6 +47,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.32-1
+- Update to 0.32.
+- Use fixperms macro instead of our own chmod incantation.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.25-1
 - Update to 0.25.
 - Fix find option order.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Sep 2006 01:08:52 -0000	1.3
+++ sources	17 Oct 2006 20:35:15 -0000	1.4
@@ -1 +1 @@
-69bb014822594266ca2cbd01aae54912  IPC-Cmd-0.25.tar.gz
+4a9828ce6bd63fedba46bca124743850  IPC-Cmd-0.32.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 20:40:18 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 17 Oct 2006 13:40:18 -0700
Subject: rpms/perl-Object-Accessor/devel .cvsignore, 1.5,
	1.6 perl-Object-Accessor.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200610172040.k9HKeIpB020282@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Object-Accessor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20201

Modified Files:
	.cvsignore perl-Object-Accessor.spec sources 
Log Message:
Update to 0.32.
Use fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 21:31:55 -0000	1.5
+++ .cvsignore	17 Oct 2006 20:39:47 -0000	1.6
@@ -1 +1 @@
-Object-Accessor-0.30.tar.gz
+Object-Accessor-0.32.tar.gz


Index: perl-Object-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/perl-Object-Accessor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Object-Accessor.spec	21 Sep 2006 21:31:55 -0000	1.5
+++ perl-Object-Accessor.spec	17 Oct 2006 20:39:47 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Object-Accessor
-Version:        0.30
+Version:        0.32
 Release:        1%{?dist}
 Summary:        Perl module that allows per object accessors
 License:        GPL or Artistic
@@ -30,7 +30,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -45,6 +45,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.32-1
+- Update to 0.32.
+- Use fixperms macro instead of our own chmod incantation.
+
 * Thu Sep 21 2006 Steven Pritchard <steve at kspei.com> 0.30-1
 - Update to 0.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 21:31:55 -0000	1.5
+++ sources	17 Oct 2006 20:39:47 -0000	1.6
@@ -1 +1 @@
-f90bbe941b5489ca228513a45840ee5a  Object-Accessor-0.30.tar.gz
+bb898baa4cee74cbacdb3fd116b29922  Object-Accessor-0.32.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 20:41:07 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:41:07 -0700
Subject: rpms/oki4linux - New directory
Message-ID: <200610172041.k9HKf7hQ020379@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20374/oki4linux

Log Message:
Directory /cvs/extras/rpms/oki4linux added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 20:41:13 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:41:13 -0700
Subject: rpms/oki4linux/devel - New directory
Message-ID: <200610172041.k9HKfDUZ020393@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20374/oki4linux/devel

Log Message:
Directory /cvs/extras/rpms/oki4linux/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 20:41:31 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:41:31 -0700
Subject: rpms/oki4linux Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610172041.k9HKfVWV020428@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20422

Added Files:
	Makefile import.log 
Log Message:
Setup of module oki4linux


--- NEW FILE Makefile ---
# Top level Makefile for module oki4linux
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 20:41:37 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:41:37 -0700
Subject: rpms/oki4linux/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610172041.k9HKfbcN020446@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20422/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oki4linux


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 20:43:46 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:43:46 -0700
Subject: rpms/oki4linux import.log,1.1,1.2
Message-ID: <200610172043.k9HKhkuw020580@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20541

Modified Files:
	import.log 
Log Message:
auto-import oki4linux-2.1gst-1 on branch devel from oki4linux-2.1gst-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oki4linux/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 20:41:31 -0000	1.1
+++ import.log	17 Oct 2006 20:43:16 -0000	1.2
@@ -0,0 +1 @@
+oki4linux-2_1gst-1:HEAD:oki4linux-2.1gst-1.src.rpm:1161117847



From fedora-extras-commits at redhat.com  Tue Oct 17 20:43:46 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:43:46 -0700
Subject: rpms/oki4linux/devel oki4linux-a4.patch, NONE,
	1.1 oki4linux-daemon.patch, NONE, 1.1 oki4linux.init, NONE,
	1.1 oki4linux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610172043.k9HKhkDL020584@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20541/devel

Modified Files:
	.cvsignore sources 
Added Files:
	oki4linux-a4.patch oki4linux-daemon.patch oki4linux.init 
	oki4linux.spec 
Log Message:
auto-import oki4linux-2.1gst-1 on branch devel from oki4linux-2.1gst-1.src.rpm

oki4linux-a4.patch:

--- NEW FILE oki4linux-a4.patch ---
diff -Nura oki4linux.bef/src/main.c oki4linux/src/main.c
--- oki4linux.bef/src/main.c	2004-03-07 23:58:13.000000000 +0100
+++ oki4linux/src/main.c	2004-03-07 23:59:30.000000000 +0100
@@ -98,7 +98,7 @@
  * Global data set up by command line options.
  */
 static int verbose = 0;
-static int size_index = 4;	/* Letter paper is default */
+static int size_index = 0;	/* A4 paper is default */
 static char *output_name = NULL;	/* default output device file */
 
 static enum {
diff -Nura oki4linux.bef/src/oki4daemon oki4linux/src/oki4daemon
--- oki4linux.bef/src/oki4daemon	2004-03-07 23:58:13.000000000 +0100
+++ oki4linux/src/oki4daemon	2004-03-08 00:01:29.000000000 +0100
@@ -97,7 +97,7 @@
     my ($papersize, $darkness, $paperweight, $graphics, $manual);
 
     # override default in oki4drv
-    $papersize = 'letter';
+    $papersize = 'a4';
 
     # Step 2: read beginning of job, until no @FAKEOKI options
     my $firstline;

oki4linux-daemon.patch:

--- NEW FILE oki4linux-daemon.patch ---
diff -Nura oki4linux.dupa/src/oki4daemon oki4linux/src/oki4daemon
--- oki4linux.dupa/src/oki4daemon	2004-03-06 04:25:04.000000000 +0100
+++ oki4linux/src/oki4daemon	2004-03-06 04:28:27.000000000 +0100
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 
 # Simple named pipe daemon for oki4drv.
 
@@ -18,7 +18,7 @@
 # below...
 
 # If not in path
-my $oki4drv = '/usr/local/sbin/oki4drv';
+my $oki4drv = '/usr/sbin/oki4drv';
 
 # contents of 8min.rip from distribution.  You could use immediate.rip.
 my $sleepstring = '%-98765XBb

@@ -36,10 +36,13 @@
 $fifo = $opt_f if ($opt_f);
 
 if (! -p $fifo) {
-    system("mkfifo $fifo 0600") == 0
+    system("mkfifo $fifo -m0660") == 0
 	or die "Unable to make named pipe $fifo";
 }
 
+#system("chown lp.sys $fifo; chmod 660 $fifo") == 0
+#    or die "Unable to set ownerships/permissions for named pipe $fifo";
+
 # Step 1.5: dissociate, daemonize, &c...
 
 # TODO: Connect stderr/stdout to logger or something similar, and/or
@@ -48,7 +51,7 @@
 fork and exit;
 
 use Sys::Syslog qw(:DEFAULT setlogsock);
-setlogsock('unix');             # change to 'inet' for network logging
+setlogsock('inet');             # change to 'inet' for network logging
 openlog ('oki4daemon', 'pid,cons,ndelay', 'lpr') 
     or die 'Unable to open syslog';

diff -Nura oki4linux.dupa/src/oki4daemon oki4linux/src/oki4daemon 
--- oki4linux.dupa/src/oki4daemon	2004-03-06 05:34:04.000000000 +0100
+++ oki4linux/src/oki4daemon	2004-03-06 05:34:26.000000000 +0100
@@ -40,8 +40,8 @@
 	or die "Unable to make named pipe $fifo";
 }
 
-#system("chown lp.sys $fifo; chmod 660 $fifo") == 0
-#    or die "Unable to set ownerships/permissions for named pipe $fifo";
+system("chown root:lp $fifo; chmod 660 $fifo") == 0
+    or die "Unable to set ownerships/permissions for named pipe $fifo";
 
 # Step 1.5: dissociate, daemonize, &c...
 


--- NEW FILE oki4linux.init ---
#!/bin/sh
#
# oki4daemon	oki4daemon - printer driver daemon
#
# chkconfig:	2345 11 89
#
# description: oki4daemon - daemon developed by Grant Taylor to \
#              support the OKI 4w and compatible winprinters. \
#              These printers have high requirements concerning \
#              timing and therefore one cannot use their driver \
#              directly out of a printer spooler (CUPS, LPD). To \
#              solve this problem, one lets the spooler send the \
#              job to this deamon. Activate this daemon when you \
#              have one of these printers and set up a CUPS queue \
#              for your printer with "oki4w_install". Do not \
#              connect an OKI winprinter to a machine with high \
#              loads or high security demands.
#


# Source function library
. /etc/rc.d/init.d/functions

# Get service config - may override defaults
[ -f /etc/sysconfig/oki4daemon ] && . /etc/sysconfig/oki4daemon

# See how we were called.
case "$1" in
  start)
	# Check if the service is already running?
	if [ ! -f /var/lock/subsys/oki4daemon ]; then
		echo -n $"Starting oki4daemon: "
		daemon oki4daemon
		RETVAL=$?
		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/oki4daemon
		echo
	fi
	;;
  stop)
	if [ -f /var/lock/subsys/oki4daemon ]; then
		# Stop daemons.
		echo -n $"Stopping oki4daemon: "
		killproc oki4daemon
		rm -f /var/lock/subsys/oki4daemon
		echo
	fi
	;;
  restart)
	$0 stop
	$0 start
	exit $?
	;;
  reload)
	if [ -f /var/lock/subsys/oki4daemon ]; then
		echo -n $"Reloading oki4daemon: "
		killproc oki4daemon -HUP
		RETVAL=$?
		echo
	fi
	;;
  force-reload)
	# if program allows reloading without stopping
	$0 reload

	# or if it doesn't
	$0 restart

	exit $?
	;;
  status)
	status oki4daemon
	RETVAL=$?
	;;
  *)
	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
	exit 3
esac

exit $RETVAL

# This must be last line !
# vi:syntax=sh:tw=78:ts=8:sw=4


--- NEW FILE oki4linux.spec ---
Summary:	OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w printer driver
Summary(pl):	Sterownik do drukarek OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w
Name:		oki4linux
Version:	2.1gst
Release:	1%{?dist}
License:	BSD
Group:		System Environment/Daemons
URL:		http://www.linuxprinting.org/show_driver.cgi?driver=oki4drv
Source0:	http://www.linuxprinting.org/download/printing/%{name}-%{version}.tar.gz
# Source0-md5:	54c85488d2489d2431ce518916b20515
Source1:	%{name}.init
Patch0:		%{name}-daemon.patch
Patch1:		%{name}-a4.patch
Requires:	initscripts
Requires(post):	/sbin/chkconfig
Requires(preun):	/sbin/chkconfig
Requires:	ghostscript
BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)

%description
User space based driver for OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w
printers.

%description -l pl
Sterownik do drukarek OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w
zaimplementowany w przestrzeni u??ytkownika.

%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1

%build
pushd src
make clean
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sbindir},%{_initrddir},%{_mandir}/man1,/dev}

install -pm755 src/oki4drv	$RPM_BUILD_ROOT%{_sbindir}
install -pm755 src/oki4daemon	$RPM_BUILD_ROOT%{_sbindir}
install -pm644 src/oki4drv.man	$RPM_BUILD_ROOT%{_mandir}/man1/oki4drv.1
install -pm644 src/README.oki4daemon	./
install -pm644 src/readback.c	doc/
install -pm755 %{SOURCE1}	$RPM_BUILD_ROOT%{_initrddir}/oki4daemon
touch $RPM_BUILD_ROOT/dev/oki4drv

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add oki4daemon
if [ -f /var/lock/subsys/oki4daemon ]; then
	/etc/rc.d/init.d/oki4daemon restart 1>&2
else
	echo "Run \"/etc/rc.d/init.d/oki4daemon start\" to start oki4daemon daemon."
fi

%preun
if [ "$1" = "0" ]; then
	if [ -f /var/lock/subsys/oki4daemon ]; then
		/etc/rc.d/init.d/oki4daemon stop 1>&2
	fi
	/sbin/chkconfig --del oki4daemon
fi

%files
%defattr(644,root,root,755)
%doc ChangeLog COPYING README README.oki4daemon crack doc samples
%attr(755,root,root) %{_sbindir}/oki4d*
%attr(755,root,root) /etc/rc.d/init.d/oki4daemon
%{_mandir}/man1/oki4drv.1*
%attr(660,root,lp) %ghost /dev/oki4drv

%changelog
* Thu Oct 05 2006 Dominik Mierzejewski <rpm at greysector.net> 2.1gst-1
- adapted PLD spec
- FE compliance


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oki4linux/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 20:41:37 -0000	1.1
+++ .cvsignore	17 Oct 2006 20:43:16 -0000	1.2
@@ -0,0 +1 @@
+oki4linux-2.1gst.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oki4linux/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 20:41:37 -0000	1.1
+++ sources	17 Oct 2006 20:43:16 -0000	1.2
@@ -0,0 +1 @@
+54c85488d2489d2431ce518916b20515  oki4linux-2.1gst.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 20:47:25 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 17 Oct 2006 13:47:25 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.6, 1.7 cobbler.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200610172047.k9HKlPAj020720@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20686

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Oct 2006 20:11:11 -0000	1.6
+++ .cvsignore	17 Oct 2006 20:46:55 -0000	1.7
@@ -3,3 +3,4 @@
 cobbler-0.2.2.tar.gz
 cobbler-0.2.3.tar.gz
 cobbler-0.2.5.tar.gz
+cobbler-0.2.6.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cobbler.spec	17 Oct 2006 20:11:11 -0000	1.5
+++ cobbler.spec	17 Oct 2006 20:46:55 -0000	1.6
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.5
+Version: 0.2.6
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -10,7 +10,6 @@
 Requires: python >= 2.3
 Requires: httpd
 Requires: tftp-server
-Requires: python-cheetah
 Requires: pexpect
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
@@ -56,6 +55,9 @@
 
 %changelog
 
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
+- Upstream changes (see CHANGELOG), includes removing Cheetah as a require
+
 * Mon Oct 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
 - Upstream features and bugfixes (see CHANGELOG)
 - Packaged additional kickstart file and specfile cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Oct 2006 20:11:11 -0000	1.6
+++ sources	17 Oct 2006 20:46:55 -0000	1.7
@@ -1 +1 @@
-ac4be73942d50274648093510f119aaf  cobbler-0.2.5.tar.gz
+44f1e470bf40444b32be11393dee8e20  cobbler-0.2.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 21:26:59 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 17 Oct 2006 14:26:59 -0700
Subject: fedora-security/audit fc5,1.361,1.362 fc6,1.115,1.116
Message-ID: <200610172126.k9HLQxLL023935@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23915/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-5331



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- fc5	17 Oct 2006 18:13:49 -0000	1.361
+++ fc5	17 Oct 2006 21:26:56 -0000	1.362
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 ** mutt
 CVE-2006-5297 ** mutt
 CVE-2006-5229 ignore (openssh) reported not an issue


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fc6	17 Oct 2006 18:13:49 -0000	1.115
+++ fc6	17 Oct 2006 21:26:56 -0000	1.116
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)



From fedora-extras-commits at redhat.com  Tue Oct 17 21:33:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 17 Oct 2006 14:33:25 -0700
Subject: rpms/perl-IO-All/devel .cvsignore, 1.3, 1.4 perl-IO-All.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <200610172133.k9HLXPlA023999@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IO-All/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23979

Modified Files:
	.cvsignore perl-IO-All.spec sources 
Log Message:
Update to 0.36.
Use fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-All/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 May 2006 00:17:53 -0000	1.3
+++ .cvsignore	17 Oct 2006 21:32:55 -0000	1.4
@@ -1 +1 @@
-IO-All-0.35.tar.gz
+IO-All-0.36.tar.gz


Index: perl-IO-All.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-All/devel/perl-IO-All.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-IO-All.spec	17 Sep 2006 20:46:31 -0000	1.6
+++ perl-IO-All.spec	17 Oct 2006 21:32:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-IO-All
-Version:        0.35
-Release:        4%{?dist}
+Version:        0.36
+Release:        1%{?dist}
 Summary:        IO::All Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -44,7 +44,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -59,6 +59,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.36-1
+- Update to 0.36.
+- Use fixperms macro instead of our own chmod incantation.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.35-4
 - Fix find option order.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-All/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 May 2006 00:17:53 -0000	1.3
+++ sources	17 Oct 2006 21:32:55 -0000	1.4
@@ -1 +1 @@
-feea9663b97eb78abac4d956dde72f08  IO-All-0.35.tar.gz
+e6d28db65f56936c641f68dcf2daa45f  IO-All-0.36.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 21:34:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Oct 2006 14:34:27 -0700
Subject: rpms/R-hdf5/FC-4 R-hdf5.spec,1.2,1.3
Message-ID: <200610172134.k9HLYRxT024088@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-hdf5/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24034/FC-4

Modified Files:
	R-hdf5.spec 
Log Message:

bump for R 2.4.0



Index: R-hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/R-hdf5/FC-4/R-hdf5.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-hdf5.spec	15 Sep 2006 16:22:46 -0000	1.2
+++ R-hdf5.spec	17 Oct 2006 21:33:57 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: R-%{packname}
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: GPL version 2 or later
 URL: http://cran.r-project.org/contrib
@@ -44,6 +44,9 @@
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Tue Oct 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-2
+- bump for R 2.4.0
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-1
 - bump to 1.6.4
 



From fedora-extras-commits at redhat.com  Tue Oct 17 21:34:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Oct 2006 14:34:28 -0700
Subject: rpms/R-hdf5/FC-5 R-hdf5.spec,1.2,1.3
Message-ID: <200610172134.k9HLYSal024091@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-hdf5/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24034/FC-5

Modified Files:
	R-hdf5.spec 
Log Message:

bump for R 2.4.0



Index: R-hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/R-hdf5/FC-5/R-hdf5.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-hdf5.spec	15 Sep 2006 16:22:46 -0000	1.2
+++ R-hdf5.spec	17 Oct 2006 21:33:58 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: R-%{packname}
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: GPL version 2 or later
 URL: http://cran.r-project.org/contrib
@@ -44,6 +44,9 @@
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Tue Oct 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-2
+- bump for R 2.4.0
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-1
 - bump to 1.6.4
 



From fedora-extras-commits at redhat.com  Tue Oct 17 21:34:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Oct 2006 14:34:34 -0700
Subject: rpms/R-hdf5/devel R-hdf5.spec,1.2,1.3
Message-ID: <200610172134.k9HLYYw6024094@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24034/devel

Modified Files:
	R-hdf5.spec 
Log Message:

bump for R 2.4.0



Index: R-hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/R-hdf5/devel/R-hdf5.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-hdf5.spec	15 Sep 2006 16:22:47 -0000	1.2
+++ R-hdf5.spec	17 Oct 2006 21:34:04 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: R-%{packname}
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: GPL version 2 or later
 URL: http://cran.r-project.org/contrib
@@ -44,6 +44,9 @@
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Tue Oct 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-2
+- bump for R 2.4.0
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-1
 - bump to 1.6.4
 



From fedora-extras-commits at redhat.com  Tue Oct 17 22:15:49 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 17 Oct 2006 15:15:49 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.7, 1.8 cobbler.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200610172215.k9HMFnI7027363@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27343

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Oct 2006 20:46:55 -0000	1.7
+++ .cvsignore	17 Oct 2006 22:15:18 -0000	1.8
@@ -4,3 +4,4 @@
 cobbler-0.2.3.tar.gz
 cobbler-0.2.5.tar.gz
 cobbler-0.2.6.tar.gz
+cobbler-0.2.7.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cobbler.spec	17 Oct 2006 20:46:55 -0000	1.6
+++ cobbler.spec	17 Oct 2006 22:15:18 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.6
+Version: 0.2.7
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -10,7 +10,6 @@
 Requires: python >= 2.3
 Requires: httpd
 Requires: tftp-server
-Requires: pexpect
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -55,7 +54,11 @@
 
 %changelog
 
-* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.7-1
+- Upstream changes (see CHANGELOG), includes removing pexpect as a require
+- This RPM now builds on RHEL4
+
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.6-1
 - Upstream changes (see CHANGELOG), includes removing Cheetah as a require
 
 * Mon Oct 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Oct 2006 20:46:55 -0000	1.7
+++ sources	17 Oct 2006 22:15:18 -0000	1.8
@@ -1 +1,2 @@
 44f1e470bf40444b32be11393dee8e20  cobbler-0.2.6.tar.gz
+41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 22:28:11 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Oct 2006 15:28:11 -0700
Subject: kadischi/livecd_generator kadischi.py,1.52,1.53
Message-ID: <200610172228.k9HMSBbU027519@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27500

Modified Files:
	kadischi.py 
Log Message:
Add missing format string.



Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kadischi.py	23 Sep 2006 13:42:33 -0000	1.52
+++ kadischi.py	17 Oct 2006 22:28:09 -0000	1.53
@@ -237,7 +237,7 @@
         # make iso
         ### Again. check for Grub or Isolinux configuration
         if bootloader == "grub":
-            print "[kadischi]: creating iso image" % isoimage
+            print "[kadischi]: creating iso image %s" % isoimage
             args = ["/usr/bin/mkisofs", "-quiet", "-R",
                 "-V", dist,
                 "-b", "boot/grub/stage2_eltorito",



From fedora-extras-commits at redhat.com  Wed Oct 18 00:53:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 17 Oct 2006 17:53:13 -0700
Subject: rpms/perl-HTML-Mason/devel .cvsignore, 1.5, 1.6 perl-HTML-Mason.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200610180053.k9I0rDrT001736@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1697

Modified Files:
	.cvsignore perl-HTML-Mason.spec sources 
Log Message:
Update to 1.35.
BR Test::Memory::Cycle for better test coverage.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2006 00:58:27 -0000	1.5
+++ .cvsignore	18 Oct 2006 00:52:43 -0000	1.6
@@ -1 +1 @@
-HTML-Mason-1.34.tar.gz
+HTML-Mason-1.35.tar.gz


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-HTML-Mason.spec	17 Oct 2006 00:58:27 -0000	1.8
+++ perl-HTML-Mason.spec	18 Oct 2006 00:52:43 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Mason
-Version:        1.34
+Version:        1.35
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
@@ -18,6 +18,7 @@
 BuildRequires:  perl(Params::Validate) >= 0.7
 BuildRequires:  perl(mod_perl2)
 BuildRequires:  perl(HTML::Entities)
+BuildRequires:  perl(Test::Memory::Cycle)
 Requires:       perl(Cache::Cache) >= 1
 Requires:       perl(Class::Container) >= 0.07
 Requires:       perl(Exception::Class) >= 1.15
@@ -95,6 +96,10 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 1:1.35-1
+- Update to 1.35.
+- BR Test::Memory::Cycle for better test coverage.
+
 * Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1:1.34-1
 - Update to 1.34.
 - Use fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2006 00:58:27 -0000	1.5
+++ sources	18 Oct 2006 00:52:43 -0000	1.6
@@ -1 +1 @@
-a41b0fc3890f07a1b701950537f7543e  HTML-Mason-1.34.tar.gz
+c09f77e2af500b51d22e0238c0534994  HTML-Mason-1.35.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 01:06:59 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:06:59 -0700
Subject: rpms/harminv - New directory
Message-ID: <200610180106.k9I16xso004876@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4872/harminv

Log Message:
Directory /cvs/extras/rpms/harminv added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 01:07:05 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:07:05 -0700
Subject: rpms/harminv/devel - New directory
Message-ID: <200610180107.k9I175wn004890@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4872/harminv/devel

Log Message:
Directory /cvs/extras/rpms/harminv/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 01:07:17 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:07:17 -0700
Subject: rpms/harminv Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610180107.k9I17HaK004923@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4915

Added Files:
	Makefile import.log 
Log Message:
Setup of module harminv


--- NEW FILE Makefile ---
# Top level Makefile for module harminv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 01:07:23 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:07:23 -0700
Subject: rpms/harminv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610180107.k9I17Nlw004945@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4915/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module harminv


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 01:08:21 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:08:21 -0700
Subject: rpms/harminv import.log,1.1,1.2
Message-ID: <200610180108.k9I18LOP005019@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4987

Modified Files:
	import.log 
Log Message:
auto-import harminv-1.3.1-5 on branch devel from harminv-1.3.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/harminv/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 01:07:17 -0000	1.1
+++ import.log	18 Oct 2006 01:07:51 -0000	1.2
@@ -0,0 +1 @@
+harminv-1_3_1-5:HEAD:harminv-1.3.1-5.src.rpm:1161133668



From fedora-extras-commits at redhat.com  Wed Oct 18 01:08:22 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:08:22 -0700
Subject: rpms/harminv/devel harminv.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610180108.k9I18Mpk005023@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4987/devel

Modified Files:
	.cvsignore sources 
Added Files:
	harminv.spec 
Log Message:
auto-import harminv-1.3.1-5 on branch devel from harminv-1.3.1-5.src.rpm


--- NEW FILE harminv.spec ---
Name:           harminv
Version:        1.3.1
Release:        5%{?dist}
Summary:        Program and library for solving the harmonic inversion problem

Group:          Applications/Engineering
License:        GPL
URL:            http://ab-initio.mit.edu/wiki/index.php/Harminv
Source0:        http://ab-initio.mit.edu/harminv/harminv-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-gfortran, atlas-devel

%description
Harminv is a free program (and accompanying library) to solve the
problem of "harmonic inversion."  Given a discrete, finite-length
signal that consists of a sum of finitely-many sinusoids (possibly
exponentially decaying), it determines the frequencies, decay
constants, amplitudes, and phases of those sinusoids.

%package devel
Summary:        Development files for harminv
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package contains the development files for harminv.


%prep
%setup -q

%build
export CFLAGS="-I/usr/include/atlas"
export LDFLAGS="-L/usr/lib/atlas"
export F77=gfortran
%configure --enable-shared --disable-static --with-cxx
make %{?_smp_mflags}
# cat harminv.pc | sed -e 's|-L[^ ]*gcc[^ ]*||g' > harminv.pc.NEW
# mv -f harminv.pc.NEW harminv.pc

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING README AUTHORS ChangeLog NEWS
%{_bindir}/harminv
%{_libdir}/*.so.*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%exclude %{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/*.so


%changelog
* Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-5
- remove pc file, manpage in main, and F77 as env var

* Sun Oct 15 2006  Ed Hill <ed at eh3.com> - 1.3.1-4
- include license copy in doc

* Sun Oct 15 2006  Ed Hill <ed at eh3.com> - 1.3.1-3
- sanitize harminv.pc

* Sun Oct 15 2006  Ed Hill <ed at eh3.com> - 1.3.1-2
- remove static libs and sanitize harminv.pc

* Wed Sep 20 2006  Ed Hill <ed at eh3.com> - 1.3.1-1
- initial package creation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 01:07:23 -0000	1.1
+++ .cvsignore	18 Oct 2006 01:07:52 -0000	1.2
@@ -0,0 +1 @@
+harminv-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 01:07:23 -0000	1.1
+++ sources	18 Oct 2006 01:07:52 -0000	1.2
@@ -0,0 +1 @@
+d3f49f1c90856b3b2e8b77dc4a99c37a  harminv-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 01:14:31 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 18:14:31 -0700
Subject: owners owners.list,1.1842,1.1843
Message-ID: <200610180114.k9I1EVZ4005078@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5062

Modified Files:
	owners.list 
Log Message:
Add myself as the maintainer of oki4linux


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1842
retrieving revision 1.1843
diff -u -r1.1842 -r1.1843
--- owners.list	17 Oct 2006 17:39:12 -0000	1.1842
+++ owners.list	18 Oct 2006 01:14:01 -0000	1.1843
@@ -1159,6 +1159,7 @@
 Fedora Extras|ode|High performance library for simulating rigid body dynamics|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|hugo at devin.com.br
 Fedora Extras|ogre|Object-Oriented Graphics Rendering Engine library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|oki4linux|OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w printer driver|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ooo2txt|Convert OpenOffice documents to simple text|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|oooqs2|OpenOffice.org Quickstarter 2|dennis at ausil.us|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 01:19:34 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:19:34 -0700
Subject: owners owners.list,1.1843,1.1844
Message-ID: <200610180119.k9I1JYsI005122@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5106

Modified Files:
	owners.list 
Log Message:
add harminv



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1843
retrieving revision 1.1844
diff -u -r1.1843 -r1.1844
--- owners.list	18 Oct 2006 01:14:01 -0000	1.1843
+++ owners.list	18 Oct 2006 01:19:04 -0000	1.1844
@@ -645,6 +645,7 @@
 Fedora Extras|gxemul|Instruction-level machine emulator|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|hackedbox|The bastard son of Blackbox, a small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|haddock|Documentation tool for annotated Haskell source code|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr



From fedora-extras-commits at redhat.com  Wed Oct 18 01:36:10 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:36:10 -0700
Subject: rpms/harminv/devel harminv.spec,1.1,1.2
Message-ID: <200610180136.k9I1aAPZ005279@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5258

Modified Files:
	harminv.spec 
Log Message:
re-add blas-devel since it fails to build w/o it



Index: harminv.spec
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/harminv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- harminv.spec	18 Oct 2006 01:07:52 -0000	1.1
+++ harminv.spec	18 Oct 2006 01:35:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           harminv
 Version:        1.3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Program and library for solving the harmonic inversion problem
 
 Group:          Applications/Engineering
@@ -9,7 +9,7 @@
 Source0:        http://ab-initio.mit.edu/harminv/harminv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gcc-gfortran, atlas-devel
+BuildRequires:  gcc-gfortran, atlas-devel, blas-devel
 
 %description
 Harminv is a free program (and accompanying library) to solve the
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-6
+- re-add blas-devel since it fails to build without it
+
 * Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-5
 - remove pc file, manpage in main, and F77 as env var
 



From fedora-extras-commits at redhat.com  Wed Oct 18 01:37:51 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:37:51 -0700
Subject: rpms/pekwm - New directory
Message-ID: <200610180137.k9I1bpq5005373@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5369/pekwm

Log Message:
Directory /cvs/extras/rpms/pekwm added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 01:37:56 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:37:56 -0700
Subject: rpms/pekwm/devel - New directory
Message-ID: <200610180137.k9I1bu9G005387@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5369/pekwm/devel

Log Message:
Directory /cvs/extras/rpms/pekwm/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 01:38:05 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:38:05 -0700
Subject: rpms/pekwm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610180138.k9I1c52O005418@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5412

Added Files:
	Makefile import.log 
Log Message:
Setup of module pekwm


--- NEW FILE Makefile ---
# Top level Makefile for module pekwm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 01:38:10 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:38:10 -0700
Subject: rpms/pekwm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610180138.k9I1cASX005434@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5412/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pekwm


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 01:39:13 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:39:13 -0700
Subject: rpms/pekwm import.log,1.1,1.2
Message-ID: <200610180139.k9I1dDGQ005550@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5503

Modified Files:
	import.log 
Log Message:
auto-import pekwm-0.1.5-5.fc5 on branch devel from pekwm-0.1.5-5.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pekwm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 01:38:04 -0000	1.1
+++ import.log	18 Oct 2006 01:38:43 -0000	1.2
@@ -0,0 +1 @@
+pekwm-0_1_5-5_fc5:HEAD:pekwm-0.1.5-5.fc5.src.rpm:1161135518



From fedora-extras-commits at redhat.com  Wed Oct 18 01:39:14 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:39:14 -0700
Subject: rpms/pekwm/devel pekwm-xdg-menu.py, NONE, 1.1 pekwm.desktop, NONE, 
	1.1 pekwm.spec, NONE, 1.1 pekwm_configure.patch, NONE,
	1.1 pekwm_menu.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610180139.k9I1dEP5005554@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5503/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pekwm-xdg-menu.py pekwm.desktop pekwm.spec 
	pekwm_configure.patch pekwm_menu.patch 
Log Message:
auto-import pekwm-0.1.5-5.fc5 on branch devel from pekwm-0.1.5-5.fc5.src.rpm


--- NEW FILE pekwm-xdg-menu.py ---
#!/usr/bin/env python
# vim: noexpandtab:ts=4:sts=4

"""Menu Generator for PekWM 
Generates a dynamic menu for PekWM using the freedesktop.org standards

Usage:

  Options:
  -l ..., --lang=...      create the menu using a language. Default = $LANG
  -h, --help              show this help

"""

__author__ = "Michael Rice , Rudolf Kastl , Antonio Gomes"
__version__ = "$Revision: 1.0 $"
__date__ = "$Date: 2006/10/12 18:20:10 $"
__license__ = "GPL"

import xdg.Menu,xdg.DesktopEntry
import getopt,os,sys

def usage():
	print __doc__

def checkWm(entry):
	if entry.DesktopEntry.getOnlyShowIn() != []:
		entry.Show = False
	if entry.DesktopEntry.getNotShowIn() != []:
		if isinstance(entry, xdg.Menu.MenuEntry):
			if wm in entry.DesktopEntry.getNotShowIn():
				entry.Show = False
			else:
				entry.Show = True 
	
def parseMenu(menu,depth=1):
    print "%s Submenu =  \"%s\" {" % ( (depth*"\t"), menu.getName().encode('utf8'), )
    depth += 1
    for entry in menu.getEntries():
		if isinstance(entry, xdg.Menu.Menu):
			parseMenu(entry,depth)
		elif isinstance(entry, xdg.Menu.MenuEntry):
		    checkWm(entry)
		    if entry.Show == False: continue
		    print "%sEntry = \"%s\" { Actions = \"Exec %s &\" }  " % ( (depth*"\t"), \
		      entry.DesktopEntry.getName().encode("utf8"), \
		  	  entry.DesktopEntry.getExec().split()[0]) 
		elif isinstance(entry,xdg.Menu.Separator):
			print "%sSeparator {}" % (depth*"\t")
		elif isinstance(entry.xdg.Menu.Header):
			print "%s%s" % ( (depth*"\t"), entry.Name )
	depth -= 1
	print "%s}" % (depth*"\t")
def main(argv):
	lang = os.getenv("LANG","C")
	try:
	    opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang="])
	except getopt.GetoptError:
	    usage()
		raise SystemExit
	for opt, arg in opts:
	    if opt in ("-h", "--help"):
		    usage()
			raise SystemExit
		elif opt in ("-l", "--lang"):
		    lang = arg
	
	menu=xdg.Menu.parse()
	print "Dynamic {"
	parseMenu(menu)
	print "}"

if __name__ == "__main__":
	main(sys.argv[1:])


--- NEW FILE pekwm.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=PekWM
Comment=Very small and fast window manger
Exec=pekwm
Terminal=False
TryExec=pekwm

[Window Manager]
SessionManaged=true
# vi: encoding=utf-8


--- NEW FILE pekwm.spec ---
Name:           pekwm
Version:        0.1.5
Release:        5%{?dist}
Summary:        The Pek Window Manager

Group:          User Interface/Desktops
License:        GPL
URL:            http://pekwm.org
Source0:        http://pekwm.org/files/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        pekwm-xdg-menu.py
Patch0:         pekwm_configure.patch
Patch2:         pekwm_menu.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel, xorg-x11-proto-devel, libXft-devel,libXpm-devel
BuildRequires:  libXrandr-devel, libXinerama-devel, libpng-devel, libjpeg-devel
BuildRequires:  pcre-devel
Requires:       pyxdg, procps, xprop

%description
A lightweight window manager with tabs based on aewm++.

%prep
%setup -q
%patch0
%patch2

sed -i s,"<BINDIR>",%{_bindir},g data/menu.in
sed -i s,"XftDrawString8","XftDrawStringUtf8", src/PFont.cc

%build
%configure --enable-shape \
           --enable-xinerama \
           --enable-xrandr \
           --enable-xft \
           --enable-image-xpm \
           --enable-image-jpeg \
           --enable-image-png  \
           --enable-menus \
           --enable-harbour \
           --enable-pcre \
           --x-includes=%{_includedir} \
           --x-libraries=%{_libdir} 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT scriptsdir=%{_bindir}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/xsessions/
install -m 0755 -p %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/pekwm-xdg-menu
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,755)
%doc AUTHORS ChangeLog
%{_bindir}/pekwm
%{_bindir}/pekwm-xdg-menu
%{_bindir}/pekwm_themeset.pl
%{_bindir}/pekwm_themeset.sh
%{_bindir}/pekwm_ws_menu.pl
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/themes/
%dir %{_datadir}/%{name}/themes/default
%{_datadir}/%{name}/themes/default/theme
%dir %{_sysconfdir}/%{name}
%{_datadir}/xsessions/%{name}.desktop
%config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/start
%config(noreplace) %{_sysconfdir}/%{name}/menu
%config(noreplace) %{_sysconfdir}/%{name}/keys
%config(noreplace) %{_sysconfdir}/%{name}/autoproperties
%config(noreplace) %{_sysconfdir}/%{name}/config
%config(noreplace) %{_sysconfdir}/%{name}/mouse
%config(noreplace) %{_sysconfdir}/%{name}/vars


%changelog
* Tue Oct 17 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-5
- Add UTF-8 support per: 
    http://adresh.com/pekwm/dev_docs/html/faq/answers.html#FAQ-1546

* Tue Oct 17 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-4
- Add dir datadir/name/themes/ for ownership
- Add BR for pcre
- Add Requires for use of pkill in a provided script
- Change summary & add a . to the description
- Change Requires to xprop and not xorg-x11-utils

* Mon Oct 16 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-3
- Move default configs into sysconfdir
- Fix double listing of sysconf stuff
- Place all scripts into bindir
- fix typo in menu_patch

* Fri Oct 13 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-2
- Add fedora compliant menu generator.
- Remake provided menu to use the pekwm-xdg-menu
- Add requires for pyxdg
- Rebuilt with pcre
- Add BR for jpeg, png, and xinerama

* Mon Oct 09 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-1
- Initial RPM release

pekwm_configure.patch:

--- NEW FILE pekwm_configure.patch ---
--- configure	2006-04-17 13:22:36.000000000 -0500
+++ configure.new	2006-10-09 14:19:21.000000000 -0500
@@ -4915,18 +4915,18 @@
   if test x$xft_config_exec_prefix != x ; then
      xft_config_args="$xft_config_args --exec-prefix=$xft_config_exec_prefix"
      if test x${XFT_CONFIG+set} != xset ; then
-       XFT_CONFIG=$xft_config_exec_prefix/bin/xft-config
+       XFT_CONFIG=$xft_config_exec_prefix/bin/pkg-config xft --cflags
      fi
   fi
   if test x$xft_config_prefix != x ; then
      xft_config_args="$xft_config_args --prefix=$xft_config_prefix"
      if test x${XFT_CONFIG+set} != xset ; then
-       XFT_CONFIG=$xft_config_prefix/bin/xft-config
+       XFT_CONFIG=$xft_config_prefix/bin/pkg-config xft --cflags
      fi
   fi
 
-  # Extract the first word of "xft-config", so it can be a program name with args.
-set dummy xft-config; ac_word=$2
+  # Extract the first word of "pkg-config xft --cflags", so it can be a program name with args.
+set dummy pkg-config xft --cflags; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XFT_CONFIG+set}" = set; then
@@ -5013,10 +5013,10 @@
           echo    ".$xft_wanted_micro_version."
           echo "***"
           echo "*** If you have already installed a sufficiently new version, this error"
-          echo "*** probably means that the wrong copy of the xft-config shell script is"
+          echo "*** probably means that the wrong copy of the pkg-config xft --cflags shell script is"
           echo "*** being found. The easiest way to fix this is to remove the old version"
           echo "*** of xft, but you can also set the XFT_CONFIG environment to point to the"
-          echo "*** correct copy of xft-config. (In this case, you will have to"
+          echo "*** correct copy of pkg-config xft --cflags. (In this case, you will have to"
           echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
           echo "*** so that the correct libraries are found at run-time)"
         fi
@@ -5031,8 +5031,8 @@
 #define HAVE_XFT
 _ACEOF
 
-			XFT_LIBS=`xft-config --libs`
-			XFT_CFLAGS=`xft-config --cflags`
+			XFT_LIBS=`pkg-config xft --cflags --libs`
+			XFT_CFLAGS=`pkg-config xft --cflags --cflags`
 			LIBS="$LIBS $XFT_LIBS"
 			CXXFLAGS="$CXXFLAGS $XFT_CFLAGS"
 			FEATURES="$FEATURES Xft";
@@ -5041,10 +5041,10 @@
      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
      if test "$XFT_CONFIG" = "no" ; then
-       echo "*** The xft-config script installed by xft could not be found"
+       echo "*** The pkg-config xft --cflags script installed by xft could not be found"
        echo "*** If xft was installed in PREFIX, make sure PREFIX/bin is in"
        echo "*** your path, or set the XFT_CONFIG environment variable to the"
-       echo "*** full path to xft-config."
+       echo "*** full path to pkg-config xft --cflags."
      fi
      XFT_CFLAGS=""
      XFT_LIBS=""

pekwm_menu.patch:

--- NEW FILE pekwm_menu.patch ---
--- data/menu.in	2006-04-17 13:22:21.000000000 -0500
+++ data/my_menu.in	2006-10-16 16:01:25.000000000 -0500
@@ -6,97 +6,33 @@
 RootMenu = "Pekwm" {
 	Entry = "Terminal" { Actions = "Exec $TERM &" }
 	Entry = "Run.." { Actions = "ShowCmdDialog" }
+  Entry = "Web Browser" { Actions = "Exec htmlview &" }
 
 	Separator {}
-
-	Submenu = "Editors" {
-		Entry = "vi" { Actions = "Exec $TERM -title vi -e vi &" }
-		Entry = "vim" { Actions = "Exec $TERM -title vim -e vim &" }
-		Entry = "gvim" { Actions = "Exec gvim &" }
-		Entry = "Emacs" { Actions = "Exec emacs &" }
-		Entry = "Emacs Terminal" { Actions = "Exec $TERM -title emacs -e emacs -nw &" }
-		Entry = "Kate" { Actions = "Exec kate &" }
-	}
-	Submenu = "Graphics" {
-		Entry = "display" { Actions = "Exec display &" }
-		Entry = "Gimp" { Actions = "Exec gimp &" }
-		Entry = "Gv" { Actions = "Exec gv &" }
-		Entry = "Xpdf" { Actions = "Exec xpdf &" }
-		Entry = "gqview" { Actions = "Exec gqview &" }
-	}
-	Submenu = "Multimedia" {
-		Entry = "Amarok" { Actions = "Exec amarok &" }
-		Entry = "Quod Libet" { Actions = "Exec quodlibet &" }
-		Entry = "Xmms" { Actions = "Exec xmms &" }
-		Entry = "MPlayer" { Actions = "Exec gmplayer &" }
-		Entry = "Xine" { Actions = "Exec xine &" }
-		Entry = "xawtv" { Actions = "Exec xawtv &" }
-		Entry = "Ogle" { actions = "exec ogle &" }
-		Entry = "alsamixer" { Actions = "Exec $TERM -title alsamixer -e alsamixer &" }
-	}
-	Submenu = "Utils" {
-		Entry = "XCalc" { Actions = "Exec xcalc &" }
-		Entry = "XMan" { Actions = "Exec xman &" }
-		Entry = "Xpdf" { Actions = "Exec xpdf &" }
-		Entry = "GGv" { Actions = "Exec ggv &" }
-		Entry = "Evince" { Actions = "Exec evince &" }
-		Entry = "gucharmap" { Actions = "Exec gucharmap &" }
-		Entry = "Gkrellm" { Actions = "Exec gkrellm &" }
-		Entry = "Gkrellm2" { Actions = "Exec gkrellm2 &" }
-		Entry = "ROX Filer" { Actions = "Exec rox &" }
-	}
-	Submenu = "WWW" {
-		Entry = "Dillo" { Actions = "Exec dillo &" }
-		Entry = "Konqueror" { Actions = "Exec konqueror &" }
-		Entry = "Mozilla" { Actions = "Exec mozilla &" }
-		Entry = "Firefox" { Actions = "Exec firefox &" }
-		Entry = "Mozilla Firefox" { Actions = "Exec mozilla-firefox &" }
-	}
-	Submenu = "FTP" {
-		Entry = "gftp" { Actions = "Exec gftp &" }
-		Entry = "lftp" { Actions = "Exec $TERM -title lftp -e lftp &" }
-	}
-	Submenu = "Communication" {
-		Entry = "Mutt" { Actions = "Exec $TERM -title mutt -e mutt &" }
-		Entry = "Pine" { Actions = "Exec $TERM -title pine -e pine &" }
-		Entry = "Thunderbird" { Actions = "Exec thunderbird &" }
-		Entry = "Mozilla Thunderbird" { Actions = "Exec mozilla-thunderbird &" }
-		Entry = "Evolution" { Actions = "Exec evolution &" }
-		Entry = "KMail" { Actions = "Exec kmail &" }
-		Entry = "Gaim" { Actions = "Exec gaim &" }
-		Entry = "Irssi" { Actions = "Exec $TERM -title irssi -e irssi &" }
-		Entry = "Kopete" { Actions = "Exec kopete &" }
-	}
-	Submenu = "Office" {
-		Entry = "KOffice Workspace" { Actions = "Exec koshell &" }
-		Entry = "OpenOffice" { Actions = "Exec ooffice &" }
-		Entry = "StarOffice" { Actions = "Exec soffice &" }
-	}
-	Submenu = "Development" {
-		Entry = "Anjuta" { Actions = "Exec anjuta &" }
-		Entry = "Eclipse" { Actions = "Exec eclipse &" }
-		Entry = "KDevelop" { Actions = "Exec kdevelop &" }
-	}
-
+  
+  Submenu = "Fedora Menu" {
+      Entry { Actions = "Dynamic <BINDIR>/pekwm-xdg-menu" }
+  }
+  
 	Separator {}
 
 	Submenu = "Go to" {
 		SubMenu = "Workspace" {
 			# Create goto menu once per pekwm config reload. The fast way that
 			# will work for most if not all users.
-			COMMAND = "<PREFIX>/scripts/pekwm_ws_menu.pl -n goto"
+			COMMAND = "<BINDIR>/pekwm_ws_menu.pl -n goto"
 			# Create goto menu every time the menu is opened. The slow way.
 			# This is what you want if you are using external tools to make
 			# the amount of workspaces something else than what you define in
 			# ~/.pekwm/config. You will know if you want this.
-			# Entry = "" { Actions = "Dynamic <PREFIX>/scripts/pekwm_ws_menu.pl goto" }
+			# Entry = "" { Actions = "Dynamic <BINDIR>/pekwm_ws_menu.pl goto" }
 		}
 		Entry = "Window.." { Actions = "ShowMenu GotoClient True" }
 	}
 	Submenu = "Pekwm" {
 		Submenu = "Themes" {
-			Entry { Actions = "Dynamic <PREFIX>/scripts/pekwm_themeset.pl <PREFIX>/themes" }
-			Entry { Actions = "Dynamic <PREFIX>/scripts/pekwm_themeset.pl ~/.pekwm/themes" }
+			Entry { Actions = "Dynamic <BINDIR>/pekwm_themeset.pl <PREFIX>/themes" }
+			Entry { Actions = "Dynamic <BINDIR>/pekwm_themeset.pl ~/.pekwm/themes" }
 		}
 		Entry = "Reload" { Actions = "Reload" }
 		Entry = "Restart" { Actions = "Restart" }
@@ -143,12 +79,12 @@
 	SubMenu = "Send To" {
 		# Create sendto menu once per pekwm config reload. The fast way that
 		# will work for most if not all users.
-		COMMAND = "<PREFIX>/scripts/pekwm_ws_menu.pl -n send"
+		COMMAND = "<BINDIR>/pekwm_ws_menu.pl -n send"
 		# Create sendto menu every time the menu is opened. The slow way.
 		# This is what you want if you are using external tools to make
 		# the amount of workspaces something else than what you define in
 		# ~/.pekwm/config. You will know if you want this.
-		# Entry = "" { Actions = "Dynamic <PREFIX>/scripts/pekwm_ws_menu.pl send" }
+		# Entry = "" { Actions = "Dynamic <BINDIR>/pekwm_ws_menu.pl send" }
 	}
 	Separator {}
 	Entry = "Close" { Actions = "Close" }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pekwm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 01:38:10 -0000	1.1
+++ .cvsignore	18 Oct 2006 01:38:43 -0000	1.2
@@ -0,0 +1 @@
+pekwm-0.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pekwm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 01:38:10 -0000	1.1
+++ sources	18 Oct 2006 01:38:43 -0000	1.2
@@ -0,0 +1 @@
+fe3e0d77250d27963991994f83ccb4ea  pekwm-0.1.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 01:42:19 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:42:19 -0700
Subject: owners owners.list,1.1844,1.1845
Message-ID: <200610180142.k9I1gJhX005620@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5598

Modified Files:
	owners.list 
Log Message:
Adding my self as maintainer of pekwm bug: 210087



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1844
retrieving revision 1.1845
diff -u -r1.1844 -r1.1845
--- owners.list	18 Oct 2006 01:19:04 -0000	1.1844
+++ owners.list	18 Oct 2006 01:41:49 -0000	1.1845
@@ -1224,6 +1224,7 @@
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pdsh|Parallel remote shell program|woodard at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|pekwm|PekWM window manager|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|pengupop|Networked Game in the vein of Move/Puzzle Bobble|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Algorithm-Annotate|Represent a series of changes in annotate|ianburrell at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Algorithm-C3|Module for merging hierarchies using the C3 algorithm|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Oct 18 01:47:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:47:15 -0700
Subject: rpms/harminv/devel harminv.spec,1.2,1.3
Message-ID: <200610180147.k9I1lFT8005691@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5646

Modified Files:
	harminv.spec 
Log Message:
re-add lapack-devel since it fails to build without it



Index: harminv.spec
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/harminv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- harminv.spec	18 Oct 2006 01:35:40 -0000	1.2
+++ harminv.spec	18 Oct 2006 01:46:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           harminv
 Version:        1.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Program and library for solving the harmonic inversion problem
 
 Group:          Applications/Engineering
@@ -9,7 +9,7 @@
 Source0:        http://ab-initio.mit.edu/harminv/harminv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gcc-gfortran, atlas-devel, blas-devel
+BuildRequires:  gcc-gfortran, atlas-devel, blas-devel, lapack-devel
 
 %description
 Harminv is a free program (and accompanying library) to solve the
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-7
+- re-add lapack-devel since it fails to build without it
+
 * Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-6
 - re-add blas-devel since it fails to build without it
 



From fedora-extras-commits at redhat.com  Wed Oct 18 03:02:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 17 Oct 2006 20:02:30 -0700
Subject: rpms/prboom/devel .cvsignore, 1.7, 1.8 prboom.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200610180302.k9I32USn012565@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12522

Modified Files:
	.cvsignore prboom.spec sources 
Log Message:
Update to 2.4.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Aug 2006 23:18:46 -0000	1.7
+++ .cvsignore	18 Oct 2006 03:01:59 -0000	1.8
@@ -1 +1 @@
-prboom-2.4.5.tar.gz
+prboom-2.4.6.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- prboom.spec	2 Sep 2006 06:09:53 -0000	1.11
+++ prboom.spec	18 Oct 2006 03:01:59 -0000	1.12
@@ -1,14 +1,14 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.4.5
-Release:        2%{?dist}
+Version:        2.4.6
+Release:        1%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://prboom.sourceforge.net/
-Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.5.tar.gz
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -27,7 +27,6 @@
 %setup -q
 
 %build
-# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix='' --with-waddir=%{waddir}
 make %{?_smp_mflags}
 
@@ -59,6 +58,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Oct 17 2006 Wart <wart at kobold.org> 2.4.6-1
+- Update to 2.4.6
+
 * Fri Sep 1 2006 Wart <wart at kobold.org> 2.4.5-2
 - Rebuild for Fedora Extras 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2006 23:18:46 -0000	1.7
+++ sources	18 Oct 2006 03:01:59 -0000	1.8
@@ -1 +1 @@
-24381017240a9eda5da21af0ca046228  prboom-2.4.5.tar.gz
+0f60f3ad6a8dad5b2c6d4360f181ac22  prboom-2.4.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 03:05:25 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 20:05:25 -0700
Subject: rpms/harminv/devel harminv.spec,1.3,1.4
Message-ID: <200610180305.k9I35PEx012649@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12614

Modified Files:
	harminv.spec 
Log Message:
try w/o blas and lapack BRs and with sanitized dirs



Index: harminv.spec
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/harminv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- harminv.spec	18 Oct 2006 01:46:44 -0000	1.3
+++ harminv.spec	18 Oct 2006 03:04:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           harminv
 Version:        1.3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Program and library for solving the harmonic inversion problem
 
 Group:          Applications/Engineering
@@ -9,7 +9,7 @@
 Source0:        http://ab-initio.mit.edu/harminv/harminv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gcc-gfortran, atlas-devel, blas-devel, lapack-devel
+BuildRequires:  gcc-gfortran, atlas-devel
 
 %description
 Harminv is a free program (and accompanying library) to solve the
@@ -31,8 +31,8 @@
 %setup -q
 
 %build
-export CFLAGS="-I/usr/include/atlas"
-export LDFLAGS="-L/usr/lib/atlas"
+export CFLAGS="-I%{_includedir}/atlas"
+export LDFLAGS="-L%{_libdir}/atlas"
 export F77=gfortran
 %configure --enable-shared --disable-static --with-cxx
 make %{?_smp_mflags}
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-8
+- try w/o blas and lapack BRs and with sanitized dirs
+
 * Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-7
 - re-add lapack-devel since it fails to build without it
 



From fedora-extras-commits at redhat.com  Wed Oct 18 04:10:25 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 17 Oct 2006 21:10:25 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.33, 1.34 git.spec, 1.21, 1.22 sources, 
	1.33, 1.34
Message-ID: <200610180410.k9I4APs8015895@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15875

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Oct 2006 04:58:08 -0000	1.33
+++ .cvsignore	18 Oct 2006 04:09:55 -0000	1.34
@@ -1 +1 @@
-git-1.4.2.3.tar.gz
+git-1.4.2.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.spec	5 Oct 2006 04:58:08 -0000	1.21
+++ git.spec	18 Oct 2006 04:09:55 -0000	1.22
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.3
+Version: 	1.4.2.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
+- git-1.4.2.4
+
 * Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
 - git-1.4.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Oct 2006 04:58:08 -0000	1.33
+++ sources	18 Oct 2006 04:09:55 -0000	1.34
@@ -1 +1 @@
-3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz
+285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 04:12:03 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 17 Oct 2006 21:12:03 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.33, 1.34 git.spec, 1.21, 1.22 sources, 
	1.33, 1.34
Message-ID: <200610180412.k9I4C3Vl015970@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15950

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Oct 2006 04:59:03 -0000	1.33
+++ .cvsignore	18 Oct 2006 04:11:33 -0000	1.34
@@ -1 +1 @@
-git-1.4.2.3.tar.gz
+git-1.4.2.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.spec	5 Oct 2006 04:59:03 -0000	1.21
+++ git.spec	18 Oct 2006 04:11:33 -0000	1.22
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.3
+Version: 	1.4.2.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
+- git-1.4.2.4
+
 * Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
 - git-1.4.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Oct 2006 04:59:03 -0000	1.33
+++ sources	18 Oct 2006 04:11:33 -0000	1.34
@@ -1 +1 @@
-3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz
+285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 04:15:05 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 17 Oct 2006 21:15:05 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.33, 1.34 git.spec, 1.21, 1.22 sources, 
	1.33, 1.34
Message-ID: <200610180415.k9I4F5Kt016045@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16025

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Oct 2006 05:00:10 -0000	1.33
+++ .cvsignore	18 Oct 2006 04:14:35 -0000	1.34
@@ -1 +1 @@
-git-1.4.2.3.tar.gz
+git-1.4.2.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.spec	5 Oct 2006 05:00:10 -0000	1.21
+++ git.spec	18 Oct 2006 04:14:35 -0000	1.22
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.3
+Version: 	1.4.2.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
+- git-1.4.2.4
+
 * Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
 - git-1.4.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Oct 2006 05:00:10 -0000	1.33
+++ sources	18 Oct 2006 04:14:35 -0000	1.34
@@ -1 +1 @@
-3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz
+285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 05:12:38 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 17 Oct 2006 22:12:38 -0700
Subject: rpms/python-myghty/devel python-myghty.spec,1.8,1.9
Message-ID: <200610180512.k9I5CcjX019252@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19219

Modified Files:
	python-myghty.spec 
Log Message:
1.1



Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-myghty.spec	4 Sep 2006 00:41:44 -0000	1.8
+++ python-myghty.spec	18 Oct 2006 05:12:08 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-myghty
-Version:        1.0.2
+Version:        1.1
 Release:        2%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Luke Macken <lmacken at redhat.com> 1.1-1
+- 1.1
+
 * Sun Sep  3 2006 Luke Macken <lmacken at redhat.com> 1.0.2-2
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Wed Oct 18 05:13:26 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 17 Oct 2006 22:13:26 -0700
Subject: rpms/python-myghty/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200610180513.k9I5DQeG019281@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19263

Modified Files:
	.cvsignore sources 
Log Message:
1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Aug 2006 05:03:00 -0000	1.7
+++ .cvsignore	18 Oct 2006 05:12:56 -0000	1.8
@@ -1 +1 @@
-Myghty-1.0.2.tar.gz
+Myghty-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Aug 2006 05:03:00 -0000	1.7
+++ sources	18 Oct 2006 05:12:56 -0000	1.8
@@ -1 +1 @@
-afe785fabe2ca1bf1d0a4b05bf439671  Myghty-1.0.2.tar.gz
+5865361811dca4054f1ec60ac32ee965  Myghty-1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 06:11:18 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 17 Oct 2006 23:11:18 -0700
Subject: rpms/yumex/FC-5 yumex.spec,1.29,1.30
Message-ID: <200610180611.k9I6BI7r022458@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22442

Modified Files:
	yumex.spec 
Log Message:
new 1.0.3-2.0 release, updated FC5 spec


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- yumex.spec	19 Jun 2006 08:53:32 -0000	1.29
+++ yumex.spec	18 Oct 2006 06:10:48 -0000	1.30
@@ -1,6 +1,6 @@
 Name:     yumex
-Version:  1.0.2
-Release:  1.0%{?dist}
+Version:  1.0.3
+Release:  2.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -13,11 +13,13 @@
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
+BuildRequires: intltool
 
 Requires: yum >= 2.4
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
+Conflicts: selinux-policy < 2.2.25-3.fc5
 
 %description
 Graphical User Interface for Yum.
@@ -65,6 +67,13 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 18 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.3-2.0
+- Added Conflicts: selinux-policy < 2.2.25-3.fc5 (#186227)
+- To avoid problems with fresh installed fc5 installation
+- There tries to update there systems.
+* Mon Jun 19 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.3-1.0
+- Release 1.0.3-1.0
+- Added BuildRequires: intltool
 * Wed May 10 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.2-1.0
 - Release 1.0.2-1.0
 * Wed May 3 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.1-1.0



From fedora-extras-commits at redhat.com  Wed Oct 18 06:22:12 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 17 Oct 2006 23:22:12 -0700
Subject: rpms/yumex/FC-5 .cvsignore, 1.23, 1.24 sources, 1.28,
	1.29 yumex.spec, 1.30, 1.31
Message-ID: <200610180622.k9I6MCNI022645@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22581

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
new 1.0.3-3.0 release, updated FC5 spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	19 Jun 2006 08:53:32 -0000	1.23
+++ .cvsignore	18 Oct 2006 06:21:42 -0000	1.24
@@ -1 +1 @@
-yumex-1.0.2.tar.gz
+yumex-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	19 Jun 2006 08:53:32 -0000	1.28
+++ sources	18 Oct 2006 06:21:42 -0000	1.29
@@ -1 +1 @@
-f1b9f442abd67ce12aa39bd973f51323  yumex-1.0.2.tar.gz
+512a4108e9c9a1d5c8ef5ac879a92cf0  yumex-1.0.3.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- yumex.spec	18 Oct 2006 06:10:48 -0000	1.30
+++ yumex.spec	18 Oct 2006 06:21:42 -0000	1.31
@@ -1,6 +1,6 @@
 Name:     yumex
 Version:  1.0.3
-Release:  2.0%{?dist}
+Release:  3.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 18 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.3-3.0
+- bumped the release for a new build
 * Wed Oct 18 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.3-2.0
 - Added Conflicts: selinux-policy < 2.2.25-3.fc5 (#186227)
 - To avoid problems with fresh installed fc5 installation



From fedora-extras-commits at redhat.com  Wed Oct 18 07:22:49 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 18 Oct 2006 00:22:49 -0700
Subject: rpms/clamav/devel clamav-0.88.4-visibility.patch, NONE,
	1.1 clamav.spec, 1.42, 1.43 sources, 1.19, 1.20
Message-ID: <200610180722.k9I7MndS025813@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25792

Modified Files:
	clamav.spec sources 
Added Files:
	clamav-0.88.4-visibility.patch 
Log Message:
- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
- added patch to set '__attribute__ ((visibility("hidden")))' for
  exported MD5_*() functions (fixes #202043)



clamav-0.88.4-visibility.patch:

--- NEW FILE clamav-0.88.4-visibility.patch ---
--- clamav-0.88.4/libclamav/md5.c.visibility	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.4/libclamav/md5.c	2006-08-11 08:19:02.000000000 +0200
@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da
 	return ptr;
 }
 
-void MD5_Init(MD5_CTX *ctx)
+void  __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx)
 {
 	ctx->a = 0x67452301;
 	ctx->b = 0xefcdab89;
@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx)
 	ctx->hi = 0;
 }
 
-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
 {
 	MD5_u32plus saved_lo;
 	unsigned long used, free;
@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data
 	memcpy(ctx->buffer, data, size);
 }
 
-void MD5_Final(unsigned char *result, MD5_CTX *ctx)
+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx)
 {
 	unsigned long used, free;
 


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- clamav.spec	4 Oct 2006 22:32:25 -0000	1.42
+++ clamav.spec	18 Oct 2006 07:22:18 -0000	1.43
@@ -18,8 +18,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.4
-Release: %release_func 4
+Version:	0.88.5
+Release: %release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -38,6 +38,7 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
+Patch23:	clamav-0.88.4-visibility.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -185,6 +186,7 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
+%patch23 -p1 -b .visibility
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
@@ -446,6 +448,11 @@
 
 
 %changelog
+* Wed Oct 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.5-1
+- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
+- added patch to set '__attribute__ ((visibility("hidden")))' for
+  exported MD5_*() functions (fixes #202043)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.88.4-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	9 Aug 2006 06:49:22 -0000	1.19
+++ sources	18 Oct 2006 07:22:18 -0000	1.20
@@ -1,2 +1,2 @@
-7759784aa4506b314e6543e0f2a8587b  clamav-0.88.4.tar.gz
-450d59c0a663b5986cda1105b85ae673  clamav-0.88.4.tar.gz.sig
+d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
+5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig



From fedora-extras-commits at redhat.com  Wed Oct 18 07:25:03 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 18 Oct 2006 00:25:03 -0700
Subject: rpms/clamav/FC-5 .cvsignore, 1.6, 1.7 clamav-0.88.4-visibility.patch,
	1.1, 1.2 clamav.spec, 1.37, 1.38 sources, 1.18, 1.19
Message-ID: <200610180725.k9I7P3MD025896@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25870

Modified Files:
	.cvsignore clamav-0.88.4-visibility.patch clamav.spec sources 
Log Message:
updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2005 17:16:39 -0000	1.6
+++ .cvsignore	18 Oct 2006 07:24:32 -0000	1.7
@@ -1,2 +1,2 @@
-clamav-*.tar.gz*
-clamav-*.*.rpm
+clamav-0.88.5.tar.gz
+clamav-0.88.5.tar.gz.sig

clamav-0.88.4-visibility.patch:

Index: clamav-0.88.4-visibility.patch
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/clamav-0.88.4-visibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamav-0.88.4-visibility.patch	11 Aug 2006 06:27:20 -0000	1.1
+++ clamav-0.88.4-visibility.patch	18 Oct 2006 07:24:32 -0000	1.2
@@ -5,7 +5,7 @@
  }
  
 -void MD5_Init(MD5_CTX *ctx)
-+void  __attribute__ ((visibility("hidden"))) MD5_Init(MD5_CTX *ctx)
++void  __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx)
  {
  	ctx->a = 0x67452301;
  	ctx->b = 0xefcdab89;
@@ -14,7 +14,7 @@
  }
  
 -void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
-+void __attribute__ ((visibility("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
++void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
  {
  	MD5_u32plus saved_lo;
  	unsigned long used, free;
@@ -23,7 +23,7 @@
  }
  
 -void MD5_Final(unsigned char *result, MD5_CTX *ctx)
-+void __attribute__ ((visibility("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx)
++void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx)
  {
  	unsigned long used, free;
  


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/clamav.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- clamav.spec	11 Aug 2006 06:27:20 -0000	1.37
+++ clamav.spec	18 Oct 2006 07:24:32 -0000	1.38
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.4
-Release:	%release_func 1.1
+Version:	0.88.5
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -434,6 +434,9 @@
 %endif	# _without_milter
 
 %changelog
+* Wed Oct 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.5-1
+- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
+
 * Fri Aug 11 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.4-2
 - added patch to set '__attribute__ ((visibility("hidden")))' for
   exported MD5_*() functions (fixes #202043)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Aug 2006 06:53:29 -0000	1.18
+++ sources	18 Oct 2006 07:24:32 -0000	1.19
@@ -1,2 +1,2 @@
-7759784aa4506b314e6543e0f2a8587b  clamav-0.88.4.tar.gz
-450d59c0a663b5986cda1105b85ae673  clamav-0.88.4.tar.gz.sig
+d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
+5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig



From fedora-extras-commits at redhat.com  Wed Oct 18 10:49:46 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 18 Oct 2006 03:49:46 -0700
Subject: rpms/gtkwave/devel gtkwave.spec, 1.25, 1.26 sources, 1.23,
	1.24 .cvsignore, 1.23, 1.24
Message-ID: <200610181049.k9IAnkNS002942@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2922

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
update to 3.0.14



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtkwave.spec	9 Oct 2006 13:27:49 -0000	1.25
+++ gtkwave.spec	18 Oct 2006 10:49:15 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.13
+Version:		3.0.14
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
+- update to 3.0.14
+
 * Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
 - update to 3.0.13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Oct 2006 13:27:49 -0000	1.23
+++ sources	18 Oct 2006 10:49:15 -0000	1.24
@@ -1 +1 @@
-e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz
+ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Oct 2006 13:27:49 -0000	1.23
+++ .cvsignore	18 Oct 2006 10:49:15 -0000	1.24
@@ -1 +1 @@
-gtkwave-3.0.13.tar.gz
+gtkwave-3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 11:07:00 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 18 Oct 2006 04:07:00 -0700
Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.23, 1.24 .cvsignore, 1.23,
	1.24 sources, 1.23, 1.24
Message-ID: <200610181107.k9IB70ZC006157@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6125

Modified Files:
	gtkwave.spec .cvsignore sources 
Log Message:
resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtkwave.spec	9 Oct 2006 13:29:00 -0000	1.23
+++ gtkwave.spec	18 Oct 2006 11:06:30 -0000	1.24
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.13
+Version:		3.0.14
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
+- update to 3.0.14
+
 * Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
 - update to 3.0.13
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Oct 2006 13:29:00 -0000	1.23
+++ .cvsignore	18 Oct 2006 11:06:30 -0000	1.24
@@ -1 +1 @@
-gtkwave-3.0.13.tar.gz
+gtkwave-3.0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Oct 2006 13:29:00 -0000	1.23
+++ sources	18 Oct 2006 11:06:30 -0000	1.24
@@ -1 +1 @@
-e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz
+ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 11:08:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 18 Oct 2006 04:08:19 -0700
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.22, 1.23 .cvsignore, 1.23,
	1.24 sources, 1.23, 1.24
Message-ID: <200610181108.k9IB8JD1006268@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6244

Modified Files:
	gtkwave.spec .cvsignore sources 
Log Message:
resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtkwave.spec	9 Oct 2006 13:29:40 -0000	1.22
+++ gtkwave.spec	18 Oct 2006 11:07:49 -0000	1.23
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.13
+Version:		3.0.14
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
+- update to 3.0.14
+
 * Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
 - update to 3.0.13
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Oct 2006 13:29:40 -0000	1.23
+++ .cvsignore	18 Oct 2006 11:07:49 -0000	1.24
@@ -1 +1 @@
-gtkwave-3.0.13.tar.gz
+gtkwave-3.0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Oct 2006 13:29:40 -0000	1.23
+++ sources	18 Oct 2006 11:07:49 -0000	1.24
@@ -1 +1 @@
-e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz
+ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 11:35:48 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 04:35:48 -0700
Subject: rpms/kbibtex/FC-5 kbibtex-0.1.5.tar.bz2,NONE,1.1
Message-ID: <200610181135.k9IBZmtZ006453@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6448

Added Files:
	kbibtex-0.1.5.tar.bz2 
Log Message:
kbibtex-0.1.5 sources




--- NEW FILE kbibtex-0.1.5.tar.bz2 ---
BZh91AY&SY??>???????????????????????????????????????????:?Q?DH?
@
p?????????M?n?c??zNw}T????^>?C??].???r???B?+?
??
??}2?'??
=?J=?
?s?}?>.??
}??f??s?????
??|
+<]??J ???????C
??????^
?>?{??E???
?
?9{????u????.?k?2???wk???R??????
????
?????n???O???4?C??U{t?9??7?,	z?e?6sW?|????????&??@7??
j???tw\?@??p?b{???v?1?-?;?|v???\???
*`w^?
?
?	?kd????|???w???f7nl?.v;^U??????ll?3
0&#L#&F???i?di?H%4@ @@h
y??????i???!OOT?4?)?S??O?'???SO4??'???????5zMM<)??h??P???
?Lj=

?oCI?)???@?i$?OT?*6???Q?h?????)???I4{J6?SL)?
??eOS?O?????????a'?E??!	?uUMX??lg????(V#????Y???K?W???n?_????????O?s????4??m?Gsj?EW?XX??1?1'????e?Ej?jr4d??????{?_??olW
C\}
X?+?P
	#?????=oe,)?????P?Q?n?h\?|K4O???usa?w????Ce?>
?
*x^??x???,!K?u?-??D?la??~L2d0m????????/?????C??h@?1????[?w??C1AW6??^??q'?%?/?:??
?X`?~?Z?????Q??$??L???4`	
???@
???Qa?@???B"z??0?
w????X???}?@?s?'
hF?;@K??-#A??"@?? 
y???????s^????$? ?G?|N&?}$O??A 8????

?????????#?X???H???l?UO^[m?O?VJ???w0?'?r{?fk
???D??+"Mn???)#^
V?
?0??:uH?@Ay???|dW??,??o?o
p	??}??????.z????A??'????x=???/??|Fo???????9?g'????z????4?x(?Q
???A??_r
?Iw?>??]??:??S?Gq"????3?5?????#?yl4z???~??g????n^??B????
L?h?? ?????"?{
t}@?{'s?s?????
??@"T???]?I??{r?	?} ?(??;YF??QrB!Q?
????U?????.st????wH?xD%?+?????:ge:$??=?$r?l??B????F{??m???}_9?t??????\??DO???F #?D????)???+uD!
??
s%??
??;?qsoUH??TM?a[???zk????????K?T?}??[W?\T??????I???O??/I?5??",D?JDB(???????????ZwNX???O???d?a?????Zj?p%[???????? ????
??????r?t??y

IIi+?]d??nl??RVK????v?h??C?3W?co=?T?'???X?x???$R?e?B??H?z*
??# X??>???xa??R??f?-|x?t?/?????????&A?*K??#,1?G?,v???-??u???2tR^"F/??I
on????E????????H?
??a??S?>l???p?????z3????w
"e?'??}\???Z_??}?4?e?no)?-O??U?G??[?}???@tH	???C?
_?Hgz????&???<t?|??;?m????????<&2?P/47D??7?b????n?6????nZ???r?c?L??????c?%??o????????od???o??b??????_????}?h4<F???D1?\B?
??r?H??h?;np?x?????%??$
"?Y?[l??U????I
J{???	F[?y?`???????WP??	?? ?
?|{?1?5????U?>BG??K???/???????pK???G&1,??]A1?`???eD?Y??GOO???07????????????????h???U????????"g????M??L=?\=|???t??KD$??#??k?V???G$!m%I"??????? 22e?%??u,oyg?@}?1?;<?K?DB?'K???
??T???7AO??1??Ik?*?????????v????_?[???ow??o?Vr????),?!??%???:|???~????MaF???t??????~\?o-z#??V??3?1:?K???7\>t?k?WO?????O?;o??&#????~v???~/}?y???Pg?})??p???$yP(?d40??<G*s?????ef?E?Mn???HD??0??&T???
??*?MA?:?6?????J????'??M????Ux?F/?(}????t?[?.?5AR???'wg????
<?$?>?v???'?????
?
?g7?????t??e?V?????{o???W???????#	Q??Tl??}??2 ???_?*?ZQ?h??n??????w?~/?+????tA"
??=t??i??dR??K kA?CIr0??!???????????"
&???????_??N^??#m~	U????????dKJm???F??E}K????j???scnd?h?9Pb?5\?s?Q\?????h??sh?k??L??TF4L?\?????U????G??lh???F??????W-??1??+P?1T0???1????Ed???]$?6? HI!?g???z>??}???twxJ?4??<Ne7jp?G?{???\?M?)f?m?J???????Wo????S?0???e?L?,3??"	<???2?6Ee??H???}??????z??`?W?h?R???????.4???C?^l??E3?r&????Y???T????h7?o$}'?f??"<??R?????M?m????x?+?^??"?w?}^D??l??~-?:<	??B?;?N?{???*??#?l????'G?s??w=?P???d?f??OR?????L+gI??1-51??x??<??F2?C07?P?;?I?????b??Oa?1N?????/?q??U?????H??????v|??<G??_??v6??.S?Qj?j??(?S1????9j?r0?T/????AN??????????g????XW?~?p?????????????,?Q?B???.Y2??d?bh??#ai1
??
?l?e??R!S2???#l72?X?C?%?e#???icP??L??????Y?
??aB????E??8?J?I#????s?-r%??m???tS???y?8|?k?]?I???k??%'?0? ?e-???k??
???]:???&,??P`?*O??JI?? 
?b?G*?????Z?md%/????$??t?y?7?d%'b???og????
????ZQ?+.t?&	??4?????[_??*???Dl???3?7?BW:Q??M??Ms?v???C}o<;f??7h?????\XAIyJ??#???O???I???>'pwC?!;=??g????;??s'UTc? 65zg/?p?I??????t{???[?Wi2?re????b;].?*???K????X???3,?H?V??F%DF?y??Lh??r:?8?(=ZIj+m???B??z??]Y???(??2?????a??N??w8????23????!/_.????#de?OY?????#$?
??FT?5???Hb8????*/m?h????s+^?u???4LC??h???-)C??6?T?j+1:??$?X?/T???Ua?c??rv???
?8\?;$?wt?h??':I33??no????^&Q?0??%?(T??=?&???c????$Dd ?"k~????_???x?Mx???6??6?j?h?????k???1ch?FJ(LX???lZ6?5?? ??????v?????V????X;; ???w????l??|?P??UwJI
??+?=5????2?sL?h??I&????? ?SdC??????y??4????D?C8:???l:zIP)??o^?????b???????Z?d????b.?`?*e?Ko??[?????&"
T??
a??R???JJ?e???V????9????"%iD??S
?%?jA?G?.???????S?nO??|????????n?????S%T??????2??ilhR?
E7?n?'?2
C??C(>6V??<??
M?|m??1?%?dV?r??dr?0?X
;?????
m79?m4.??t??.<n)0Uas????{??9O?x?D?h?????C??????f???K:??L??@J5?g)&?H?\?m?K??:?7l???/y]??=?=Kr??P??)???.xfLvt???,g?[?h?5?-?[????W?????!! ycQ$?G{????????p?>????????1`?????)>????B?X??gBr^?O?2c='|?)???/??f???)?U
???e?????i?????.a??%?09I??s?m????J &?m0???yK???K???X??????jC??????e?y?<,????
?N2??'3
%B?}???o?q??S?????p???g-
?a???+Db`??*??7n?e?q???>???????"3?4H(????CKb?'V?L?G?!LmR??-?M???
?/]eU????B??!t?N???E????????][?S?w????y?(3?????//???^??.o=??s2??%
?f?????????6F?d???' ?(?? ????+???>)F7&h???z?? ?wA?4hYy?y???5?}??????B?{?????VU?:oRb???3??t?u??WUK??vwT?m???????tz???0?M(sX?C?y?x??#?k$??E?rj?????n??
???? ??(??"?;?}??X!???4?JI?&????d)"??y<"k>N?B?U'?7?r'*B?
*?A???y???E?G??$???.?C;?F????????,?&??r?????f????????t??{??g?v???f?Lb?tV??gV??H?? k'????}ix8???
??vA?????????u??%2.?????\???m??????-y6<c>F?>??}?q>????r[????}y?G?S?+nr?z???|{~*???joR.???4?e??YtH???zz?????4??v?o??s[???2?T??<DH17
??J\?n(?? uq?????I??_N???)"v?~?%?O???_^=????lrV??5A?SD??E???~??e?7!W?S/w?p??4s?'??6????i?{yj4??gI
f?zw.?|??>RQU??0?J??wS??g?o?????3??~x)[??JR??2???
??T?{??????Z??7?79?w$)?????W?	$??s?<T?Q?3h?Q?L?? ???:I>~???}w?o8~G;???g&????h=?'???
}??<?1?????~?(?/? {3
?^/?;??>??3N??I????vM~?????Pl{????????}?z&9??T?^???????????Z?foQ?C?]
?iT(V??Y?{?k???yYQ=??ZcmY
z?w??	???????z??c???????????C??,?k;r)?}????ZS9??????sV?i?3?b???L??KQ?V?9sUUUUv??n,E+kQ5.%V??????V-???&?a????b@??osv??t?L?"bj?c^??L??6???t??mP@++"??T
R[f`[???zv?????A???V??)
1dD??jJ?I?[????e2??z??uE??f?$?0????D?Z?q????????j??M??>?????}????????????AQN?"3t?WG^_??9ySA?V?R??=AC??????:??????]??
?@?) BBA???D"?Y?ko??o?_?o?~???OL????t????KuTL;??u???X??????%?????5NO4?O??I?v??????d?	
1??????O?w.~?;8%TC6??r?L/???Y?<??U66?no?c-??i]I?1???
?Bo???~'???G?S????9???%??#???j`%?n??s?????NN?w??j&??}?l!?A?$V?4*??<????\\???unn???`l????????3?r|!?=???l?:r??????n???q?@???u??F
D??h??*&ta??Y?	???????????)C?l?P?icPK???,?(?PN^|???c?mA/??&?	?	?["o</??^??
??s???)???7?8D?&??'$W??O???~??q?I?S?w?.]=>^???:?@????eu?y??4???@??g?v}?
???k?'J<8??6??????{????V??????!??;>??_?????QR??I??lv?h?y?????c??????M??)??B"???e??*?Hrh?????|??????)??K;?gi??y?n??s??pU??t?~Ru?m??????/`??	I?p?NL\cz?? Y???A??G?v2????<?
????T??D?b.d?{?????1g?`b????fx????}????$??BT`?c???p??k:K???a?j?D?O?&I
?????[t?k?:?[??r??????q??7????nG?|??36???G???F??l????2?67?C?bg5T??WR?N???????F.?"?????w???????K?l?7?nc?x?#q?A??%??~?????l??<???p|^?v?~??i?K??,N???evY?^?e???v??I???{4?m?r?.?H?G[?s%?(?)?????????*G~??h??%F5<?i??i???\@?Y?Q???.r??
?HB
( <??F
?,D?????X?????????'OJ4???????/?????_??????Q? ???	?q?	????
~??????P`????
?F???v?_SRj??????w?I???<?a??}??=!d????2??-??
W????
}e?????3??5???MwdN???w??%\????{`8??l
?????????LS??0?????????????a??D?m(l~Z0?Hh?;????
??
??Y?????L??/w?<??>??:???,?????\??l??\?e??????????/??onr\??|???PI?>?=??<&???C????Y??????? *?,?qF?I'??;???_?i
???#???N??C_???M]|.??1-H?:?~;?g8???m?/<??r????r~tk???:?M?T???????<??ch?q?w<?av?????
5?>?k?p}?=Z?????R??????/??+?A?)?]????/pV?Y??qYw1I??????????Fs??q??<p2????6	???dN??;?d4???+??Z?<
??5?????J??*?/??cH??e~GN\?.??????O?Ta/|Y??P?v?eV???ZG[?????*??D}?
??rY?R?|{?????`??9?;/\pk{?<??iPS??N?/??wn?g?G??r?R?????$??]Ip???DR\?
??u.???!????t?5dM??h??j??j^????VK??
R??$????p???
>??????#????P@
/ga??Cxi?,(????e??
y???V?}O???Y??D8??#?$m?/??*?%?C??0??f!?V????U??????????.?t?????"?E??Z????
_w?t??L,&????8??^?N???h???nI??r?-??????QS???=?2????+?b*?-i??
?z~?#?F?s?#??~?>?I???,??C?????\?7-?)^???+????`?????
?????x???`s?`
?????$?E\?h9*???#V?3?%???????K>?Q?s?
??vNo???J??{7+?????p??
?g??)?????Q???|?N/]r??]4??#Z?;??
?_?D??&!Q??U????\k?}??E??Q????????]p?
#??^?"!??E?$???????U???????1*-+?i????o???J?.F??D	???????{X?j?~?R?.F?v?(???U8???!G???d!??????m??)Q?|sH?.???z-s??8??8i"?g?o???????%??
:?6Bu???$w]I$J|"K??d????? ???*??g3f.|?=?%G?v???????fT?-Hg??v[0??????345???????
>x?05??Ko8??5??_??8?NQM??2}???t?,P????sr^?(??A\?T?_?????S[
?D?T?y/_????I{??? ??????Y?'? ?(???
R?CtX??Y?Z?LAB$72?'?
??!???r)0????N*???@!???Y????v??????e???????B?Y*e????|????{Fgl??5@?:u??]??El??i???]??8?Bc?b?s?]>?n8K???M_1??????C?????l?k??K???jw????N[M???G????p|}?T?????W????_B???$?QA???x.??o??E?E2???????k??@???8m:*@
??^y????
?@ElD
??E?????
C??>?{?????Q?aC?j'???,?O??<k?6|???O????f???????}?????~1??j1'?????/?C?Mo???????I????&?Rc??7?5Am?t??@
W????PO??????=?DC??
?Uh??#?Z???2V?V???mZ??5???P??@*H??;*??R?P?i????mF???kf??j???f?kX?i? T**?"J?QUU??`i
D?;???F ?q??*l??????|??KT???b????WE?????M
-??H???? oG?~??????e?eF???D`??D?Q???|????????A
???X?U??
@$
4?????????s
??`T?H??T??????D
e?`YDS1??F(?w?Q?{DF
???x???????
?4UXDe0Dfq??#^Y??????"?"9
?U#@??????#???q[??^	?????xA$?E(?Db?w?=?Bl?bc%N
0?BL????EBx?"BZ??v????]??4??d?v??!?C
6??Tf??
?Q??{?Kd0????m??J+%?Z??a?8I???ZS)!????$c3???????:?{E??2_o????/????k*}phHOkT?"~????????dS???????D???25????%?e??E?1???a?uKF?]??m?Z+v???Z?b??y?????nV1?Q???+??H?#?8>??"i?S?????zu?j4?-0$MD?????/?<????R??	???(????C,???&F?v?C7?(??????.??=????????s???VJ4?YiE??H?????}~????p?2???S?X'i??qRWW????rl?Rs??q?????!???y??<Rsy4?v?]iz
Wff??????1?j?.?
3?@J?
i??0x???U?pc?U$q?&????Z???
#I??!P?h?P???uy?????G???a+???OU>ca?<?OA1!k??-??#???2L?????{[?????K??u??y??2?A??B??l0?d?VX???e?T6?m[?Zo????F???{m???h??;??B??????????0?5E?+?(?<dg??gG????5$?!P`b?)ky?EG??8{????S:?7b?4??J?????_????b{??^?n???O???eX/?+
?.??????R?{???c????E"?,???i??? ??????
?@?FIxV	
?m]!eUZT?)?VL??;d*?g??n
???N?V?PI?Aa?X?d???T^[qX]???LH???0f$!J???d"?1??	d???????^?
%3g=k???"H?\(???I?????X??pI/N?R?o\g??m??k??????b?Z7.??A/??1?S??dG?Y)k
"?,
3??JU???T4???>?|4????@?J,?\???U!1?u???j[+[klO:}?z:?N?iq???aoY??e???.?7??D???*??zUY?DKD?|??w??
*?#??s????E-?Q??+?&?c'j@~?K?-?Y06?4N????'?'@x?A
H??eXl\??3?My??C???
??C
???????????(?ZZ??\?????>????]um??m???aKV??-ZZ???? ~?a,???<?@?4??=??K??
?1?8?
{?
b??1?w??n????Nr???V
;???n??"w??
0q?s?(""?+T?I??L?
???9 2?q?+??????<[????5??2jZ?????Km??m??m??im??m??-??[2?1?]???32??m??m-??????A??LJ????"T?*2?gh?]?
???rt????GG?????
T???+%?<}??????????}?~???w?|??6????u[;???m???(?e?%?s(od???#??????n#?i?Z?????J?"?E?m?%p?f??{?<?l????m??;d?Wlt/?c?o,?PE!)7k???y?|??$??(?M????brQ??????98??7??22y
m???=Q???Ji???_at.??zH?Nr??{>?m^v???M??,?W?????5U()??
??????????OsK?.H?????[?????S?;???-Y?o#w??}WYZW?m?=~w???Cl????????j?zf?@????t[?]	7??iH??6??	??"	;?h<n?z$??E:2?????????v/$J?f.??M??	DH???4??x?|[?w??<???0fUKz?
?&o?????#.|64m?p?#|?hci?5PT?f7???\??+S_(o?pov?8?;x?v?faD?)B
?  ?z?f???R?Y????W??,?
(?r?rF???*!?????t<?)?$ S?ar?n?7??Q?6?*o????'???=?
???9?????P=2{?1 ?'Hq:?d??F???YL
@8?Y$(?d:)????t?)???0??(???&??!?[??=?f??V??5$??K??????z~(???A???
%???u?K?s6"??*?
I??7?G?\?B~y???????=??;????0f???~0o?W??????????W?k???r?a?d?}???=?}??^?|?N???lyx?^?KNN?????{_??I?Q??}?????{???????b??O9?{^i???99ZD???F?????l'?F?"?EJn?A?^?N??
??24??t?3?????????????N2??j????:?Wo.????q????KW?g}??	)??Bcc~Dm??$??zRPv?"h????1??b?L????'?}?xJ??n?M/=?>(??T??{??%K??f?n??N???n	Jb?N???+D?h"CvJYN?
????[2?)????l?^UC??*?J!*?L??o?<?j+?y??%+R?qDe/DV????K9????9K????^?Y?1?&f?f????	??8B/???Th??W
?pl0:g??\?6r?A??G????$U???n?E???m8?xj?-????BE?W-????x?$?NOB7c>?i1??
???5o??8;+<q?D???btQ?Du'h??6?K?ZT??9???????w????Yq?3??'??3?J7j?"b^kCA$???????????????m?Q?i7T-3?????S[Y|?????[????$-i????R?S<{zJ??c;??????[M?0E?K????u??p??#???A?,s????????_?>?G??z<??&?????_Y??????J?UM2?Q>i$?Iir?m3[S-??S?k<?
d?d?$????q<>7<??f?D?@?:??&??fl?&?>!????/?3=??H?????J:E&?\2X7W5?t??????0Q?B???YATF|??(?}???x@?13o??????????????z?!?HLAB&?????AI
EW-??77?k~????^??6-?|mB??eT?X??D?7? qd??a?t2$?	&????q?.?????E+?Hx\???w*???dy?^?I??9#???=????lP???o???Yrv?x??
?<"?xX?
?
?x?$?0???!????B????O$T???-?J?m??????????WL???"|?	4??t???u<?~??l6Z??6??QD??X?us$?ZD?L\?gJ???V?Q?j}8E[
?f?*<??-?\?V??)??:??????aN\?yG????|G	b?X?u??p??`y?v?????9tO<?yQm."??v??????j???(???n??2;?????Y?x??G8A??5??N?UI]?K'')<X??~E?????????a?F??????d??iJ.p	???S?R%??????j\??e
_"??h??0??? ?>???@??0??\V?|?~?74Y8?4^8}>??r@?
	??!??CW?y[V?B?k?P?m?l???????Z3???b]?*U??
Zf?????????Lfyz??/l}?8????MI?2m????????Cw?EgT?c2??v,&qPz?xR-n????;,??K???UXC????r??~t?6?+?Y5eY???U???7??0?L??^?u8???!?Sw????i??Dg?X???P????g?s???m9j???'???8??O?;??OIp??t????U?'??=??w??Q???z?;??????V???T??????T??????W:???k6?>t?#?JU??????e?-I[m???,?+???ZF???Z?=?????w?bU????????r8)?E2Qg??'?7J???#{??J
KzK:7????
?	???y??pS=????v7????i?Z???4???^?mv?/4S????????N????????Y_}I?]??q??t?d'?'??????l??Q9?mi?r?q-b:6??)(v??;e?^??n
?_???H?????kg?g?iRL??:??k?#??:;SF??????????*K??~2
?D$???Hq?'????!????S???C?:?lYK??}?w\?<?4K??Rz??|??M???PeH)?M)???N?=k?Z??5???{??V??[m=????W$???Y?|??'7C??????dwtJh??q??u???v??~N?kJ?q2c;??9?2??XL?n??
Jdtt?????lml?8gl??S>??e0)<??n?MT??}i?jp??a???{???v?*x?2??N??J}*P:????P?<WM??)??	Z?B???IJL?J????iJ.?m9?eM????????????o??>?oi?a?c?P;???????Y??@???u
??+1#?Jh$??bV'????Z?_]g????v13VMV|I?@s;
F????????????Ei??L?
?j??$?????a????&b?+	&??????????????????6??"A0??3G@???g??????
??@zn"|6B?cu=si???[?MK?]?RA9?;"?2%Ql[??WY?;T:? C1?F????OL?N1WC???_?FhU???4U?^????+???-?y??3?L
???B2?	?U^?????~y???z3d?????*?p?9/!m?/?,&;????Z?????<?}?&/???g??C????A?p?
?'?cjem9?uq>?_QoD;?Pp?????????X?}?:Q#?????????'.?-??V?+?????V'?c&"??)??x?? ?$0?,???$??iv?b???g??K?<O~??z4??=??_??????G?????#???P???6?o_>R=b?x?~???A1????9?C?W???W?=?=???W????a???{I??6???????/?????
<|~?w???? ??^ns??H???w????C$??n8>???;?z????c?j??l?|?n?gs
P?t?o???P???E??Tm??XI???v???Zf?R8E?;~v|???]1?k\?l??n ??Q)?vyyG^jT?l?,??g9???0?Y%4??????????>?	?&???ON
*??}?????,;???4{???W??????Ny??|3?,????hH?l1??"?w??bG??6???/??mg?3vO	?:@?????.??=???
???D05????H?
r a
?b??TEZ?C?)@????z?!48?$5!?"t??????I?!H?? ??q?
Hx???????~Rp??
?&i?i???K?U
'u?????K?r???????WWj<=????
???{Q??p??f[^&?w?0???f|.??!?S?-9?{RhL?4?????c\????r9?R??S+
]?>??)0?&??XsK'?b?L??S????t??i?2L???<??[$Mi?}?f%?RY3?^	?K%??+z_???d??	?????"jK'*q0?r&??t$M?O?NT?s'*h?'?????mMII?))0L???}?kL?$?%??RD?K&?a1LS?,&??[%???f?,??+?D?LSA1L?
RP?H?"]0JQ
Oe.%?? ?%??	?hg???b??D
???&?\?u??hgVwD??????L_j?'S?2??
????VN????M?({a?`???@????gt[????W?0p??X?H?B {e?M??v???qo??D??%
0x?&=Ud????S?y????????r?RD?]????ge??%NO?E?:??2t?j???@HHw&%?????,????u?????w=?
??-?
i??3?#??????G??$?m?-B??
Wl7?`?M?yM?fOi[#5kL>?C??f?????d<?pr!??;?g'?#e??o&?]??^|]????%?????????????8	JZ??r#??<j0????*&L(??$9I?rUi??????%??*?&I?Q?Y?6o????a?Y;@')0?7?&??
<'rzGQ?dMI?LfD??AJ?
f??l???? o?g????C*4??>?P??K?????k?v?7?bD?????FBQ0
L8I?	K?	S?
????"c?????i
=?|8fi?=?]"Gj?A???J??^G.????K?L??@kV?BKl??9??n9??/
?^?2??????U/Af*
?D:???Pb?4+?z?J9O?

D??D8???y??g?7???7?????
?RP{v?O??K}v`fG??s?\???L???U???#???n?Z?lGH?i>I$?I$?H
B???
??v??nlw?L$??j????c??IY?d0g	?DE??(s3??mz??!???J?Z?k
?;?M??v??
???
?'_??-???????bp????????R:[?}?-ZJch-?~?????nT?37?????????Hi@@o?QuF?#7(?L?g??@`??E?t?zS#F[?
??N?h???5?k(?3??x!J??I????????1*)??#?!???-?W?=qh~?#????<???????9??t??2n??????a??G??*#9?z?[????t?(?????
???K?i??IM?;i?????6?&<???
?????q?\a?x4?I$
)????????yc?3o?w????????w{G?!?K??Mt??]?6?h??????vm?????O???? ????????X??zh7???e?Fh?01&?f}?n<???
?$?H&	?r?_
20S?2V??????v`tM??l???FAPR?14????????????=??????p3?I?B?s????}
?3
D?$?x2???DH????	
FH|??Q??	?vO??7*?UQ,-??Q????
6?uq?M$??N?????f?O.??6?\?M.!??	?a??Cg??i?y????w
???$???P????a??2?k????/?-	$|???????J????L?_?g,???}?=?u?$?Iz??>??bY?0
N??v????o?+?O???{??7S?rJ????~d?
??.C6?????5??R???????6?`?*?????8???.[????`fn7	J???p??? ?&W7??*7U+?y????????o7dE??
 ???
??R?_vc|?F?S36Y$?y????	??A?????j\`?/??ZBqh????7????????ur??t??N?:?2???
Ge?S??X???2?9??????.??H?2O??n??)??O???>?????p?&????f???Dz?????}?~~?D?w?/1??4????HY?R0BDd
?DC8?
l?z,???*???o?!J?I\????D???rK~
>?D?lH????v"B?Q?:))1a
8??N??K??JN:n;??)???.??O????T???????v????5?!?;?K?Tn??? ??kv?F=C??J2???x?{r?S???)?R????y???????^!a?g-???_Mw?;kz?0?????Y???????'???v???p7|St??????????????.?j????[Rg???\????J????z?F?<s6???????E???????e?~??????~?
/>???????0?=?`}?f??????5+???????(?????:s?#??'c?:????2 ?C$z;~??W??"?? r?JG?1:??!0?,?2oy???d)?UR?'?_t????x?e???2?Jn?33
?q???J???wco????./?1?Ps?y??ui????O'8zyB????c?	?VcwE?@?B%i??n??\?I,6PK?b??1w????
??????s?N	s?@?_<*N?h???????????}???#|?-+???h??p????=?~n???4?-:T??4
#4@??D?a?????????ug?????w?)&
L????"?-R w?V?????|?w"?nYn??????]??E??????a??nxs????u?1?*>?\?
M?#I7q????;???y;1?1??=?cnYZ??6Rs[???cy?z?{^A?? ?7$M#?>8c?Q?v??z?????F4????GH?q^?z?Nw????????o?#C??it????80w1??g(??q6?H=??x\?????Df?
?!??

z4*?|??M??????CU???v?w??M??Bq????bm6E1D~1?P???v\??a???G?????[???~??QF?????,?tK???g??g?&?Jv{????K?[L????9???M?ua	@???
`????75i
?????cj??_?s?b???????'v???????,1?V^??7
X??FX???Ro????~s????(	  ??M???L??Y???????KD?"?)??M????Zo?????: ?NZ?I0??"???r???P????;?g???=<??4?8H?e~????NS?`??qFG????n?:x?g?yjsZI?rsR???tT?<~=T??/?????v)?s?q?4c??[H??wp?????????????B?W??!???]??[????o)??????^??????j]??????#U?E??s7?8sd?dsyq?d?d}~??????6?_H?:?????`$<?N???3?3?M^?A??WS???????V	i#H}a??NB?;h??Aq?????<Y???g?L?X?z3`X?*w3O?????I i0
?H~????????|4??=7?t
'8g?L?u??n?'-?=??8?????a??F?
?=^????Q?????E}?q;P	6H,
: <?o?<x??'?v??X{???v???????~gS?y*?? ?z?
YO^a@?\2+(????zyu2BM???'?
?;R?U?<R?G?z\xvq?E7????;??I$??t?)?=????{??N\:s??
"???6;S
\?`@/???O4D;l??!??;4?b??,???+?%s?J?Vw`
4?Pn?2B7?HN?ji??_
TM?d???????6e??'?H??y???$?T???????(???F??????6lZ?lY?v????b???n]?f??Y?f????sX|P?jf??Xs???Gf?Gc?]??wq??w?wr?^??--??0?Ki~.]0?~I$p?l???Q?N~??"n??M???????5????hps??d??
?n+?C1?ca????wY??E?}?C?:B??5Iz~Zx???]
??D?u???5?Gf??:?7?i?{.o?????\X??-??x??[??3??	
?*??<k???_s4?+7??9????pZ]??k?xh:??zy???]yv$?$7b??f??D@?CA
??Kf?3M*t|??oS?f2a?;????.??9?e?????ue?1?G?????J?g*u?^??????
?^???Q??%???????[fr??z?$???<=???V?9=e?;?p??]Gmk-???t?x?L???VSkQ??????id?tt??c!???-??/Eg???V???D.1)Oy????8De??U????????n?[????vKo?M
??~??jW^?Nw.zq?/7^3o??c0??????yE
?r???2?????2/??E???R???</?%??V???#n F	"?N`????dKRY?:?????????,S???????k?F$??2????E?????)3????T?????,??????+?????00??>?=???n?i?o??[?????J???e???@?d?0?C??u?"??1S??1?u??Q?s??:?(??/????r???e??t??6????c??F???????O\/?I?g?*?%?k????4?>?{??!??9?L?S??8??F??P?}??????N??\7?c{m'G????qZ??
?%l??2???m???*????)?S>???????_<?<?uJ???[?t???xdu???S????>?O?fC??~???d? ??g??????g??v??y??H?F^?[??&?/oN!??j0?k????4w??3?8}?AH?M???	+;????S?9T??????K???????u????6?H?)HnI??
??.?U?
m1\|~l1J?4????6????b???%X???k????x?	J?)?
D??y?T?????'b?Y?]????????}???C? ?yb??$Y???P&?Q??????9,[??-^7mZP{{?*???6?
?5V?*?`1?a ????N2?????!????"B!???A??#p????CVr?r!?p#	6?B&}>??+??D??(?????_?{on}=??E?ka?????M????d??V???????7\eV?|~
?V????
_????Z?4??????h?9??|-???jo??;Q,?ff?????CLTm??
??Yo?k???5??
?i???Z&??1????jU?}&e?2???????
<4v?T3?I???????
'???8?Qg???2??1P?RT??G?n?]????sx4??m??UF9????|?
???;??????{c$??}??^p??T?c???
??1??*?0??`?d?b???)??)??)??)??)??)??6???&?f
b??ci?U.a?w?`??n??f?f?f?3S3!?fL?ZU70?30??Ssv??|?}?3w???,>??Bf???H?:?"1K?SV??%8?gVg?^ xMd?};:??@???m???T?U?4?e?Y???v????I?bf??e0??&+,H?80???8?Q?N?[??g>???\??/??????1"???q????f?S|???
??????u=??Y??Z[???>{?c??????)?>m??F(??|?a+?7oX?????68??u?????>?cx??V??+???c
??]M??[??G
?-?$??????;?Kwc?Y???????z??y?w/???,?????N???)?aS/?o??|???=???Cwx??9Ot>'?????????]?2???k?????nBM?8?|?0??C?{??6
??]2??`??@????$?o?M?y?S)??@w???
??w?S
?????????R?:5!mF???M?S?%.#?????&??2???????*=|?#cl?????o??{??Ix?I.KM:?????????s?Y?ma??1!?B?dz2?@??????????????! ?-?QF???VD?veF??
GC?????w>?-gu??????????R????????j????????~?++???}??Xww}??????:??(????3??I???(???9>?Aoc??k?j??{O??u?E(?2?c}??
k???GY4!!
X2????h?7g?I????'9?
??????????w?
????????%???m??}i??Yp]?1?.?+?ah??`,`HNZl?Cj?d?}n??1?!??qM???b6?$i)x???[??<??6\??q???M????N??????????f@???:?8???2:-???/=y??M?{?G??????z?;T?Fi??v??^??E?L&?*;??8^?y@?W)?????H???"~9???0?F:6?s?`?w? ?n????,????2?????s90?2??y|B??o@???90?J?;??&?t?C??c?uk?????J9Sz??!?]??My??kM???Q?N?D!?????oR?(???X??Q?.i?{=f??Y???????(:??({L;?5??M2?r?7?????5?k?^$??w????,/????Tpmj})?r??g?VHa??????c?)?c??|?{?tD??N?!??|d?C?I$????s???e????+??>('?l?ty??P?S
???u??]?e&??M?E?Z?F!(q??
?9?;??:.|5
????w#s3%?rRgM???o9???Go/???_ff~l??;A??
k6?t?dv??9?DbR?O/l?M????}]?%?g????o	?5N?1?ow?#????i{???????fwn_\???[??lnnuq?m??hT2???.?{??e?????M????|?-[?yB{?G??F	???s)u?g??Hd?!&I?a?I2?
[?vG?4???)?n???????>}?8???????a???q?	?4??-x???\?[?#}?x?k????%?5???????)?Q?IY%2r??a2	!2	
??Ci;?m+>??S#2RT wt???kx?N? 	?C??>?v??????5?/?wT?	34???G???R????H??Q?"3???%VW
??t??"<?X?0?C??4]??a????y??T??"F$JU???;???Y???s?9?$r????????X?n??*????/???E?[Li?J>?*VS?oyfgd??/V??C????x?????BYZX??oS?%?z?N?"?????D?e??Z)"?/Y?J?1???0??2?=L?G??^?Nw?Wx?-Kn],t?a?n3%
zl?
?v(???5??????[xm?C3&L???T?????V???m:?m_??o??0???@y8I????n??Q????S??A??m?_,?}?j??vG?}????L?ts?s?gW???FR?????G?????BOY????X????<^?u&C?Z7?,?n??3
?????FZ?"S?4?Y=[.??V??^?n?????yO??????gc?@?C?????)t?#s?&=:??0??1??T??
??????????7kLn???????????PK$?0?h??N?G???????oe@{O?GL?:????&??
????6???^?????!G)????????c??a.?y?	?63W??????1v?&??b?C?A&8i?Qp??
?>???1?H???u)h??2???{D????????"??ftM?SM?????????F/.??l?)??7??M?7dY@??<????/?w??Z?
????&"???B?$Nt???0?
???[r9k????)?Gc^?{?S<?w_8????N^??LN???F????n)?}fv??B>7?????Q=?m??????q)l???6?n?0??Ksk??????B????d???????W?O8?@:??:??+????*???K???z??=?G#su?Q&?)@J^?[?q?8?????z???L5?VN????? A#?o<??q???{t?i?3??2W?K?????S?}?h/??{r(??:+?????????R??u/$???2?????|?????I9??~????3
?]????7?t??????rLt??U?bcFJm??q?????k6>c????{ZR????o0QA<?y?Y???
??>???3SD??V????sz2:?=?????a;6????Eb_?oi?(S??Wv??s?*0??Z?????Y??el
3??\|?&????"?X"???D?f??\??_R?????????g???e??????q??????y?T?C'?????????!??Va??a?"}i??+???x?1h?@8?:nre`?y??t????l?r?Ht?
0??ab?l?????4?7???? ???nc?'?}G
4ss)K???8??
hka?b?1v9%.v&4w??@????4ET.
!?y{??g?E?h4H??eu???c??
?`
?
$l3?????+R?B
?h????7???xIcm"'?????q?2Y??
???8?d?]?b????????????33??????O????L??9?C????C???7????T????
i?????????>?;T?8?7????Iu??????N	?d????n?u???:?????????c?<\B??J?N?}?q??g%
??o>?*????P`?c?|$H?I???????*53???(r???X??^M4??????{??nQ?????RW??on??./????{G?j???m??=???x?{?O???g d????A?9y}p????
???p?3V&?:?I0??wz7O??:?????O?E?e????~??????Rzs?m?>????9?????W???wj????????~:w??o??!??g?_A???o
5p????I???~???????KS???????\??????=???5?????Wl? ?5???????Y????G??}???b?;l??3w???&?:>????=??????B_MI???|?r???????a??{
nm|??????c??R_4?JH?*???;q?????*????NUD???K???U???>s?.?y??A(????^j>???-??G????5?/??5?>??bC?r??H???+?i%??e?:?/<I}??6???MX?)51vB????=,R?}C[_W???????qa???y?9?fgU)?iXTw??&?????\?S,?$?:??
?Z}OX?????9??v??j?B}!?|?w??U?xO+?.?-?N??u?y??1~?q????W8q?b???????)?`????VTEf/?=?)?h???t?W,?N?U?[)"?Q??"~??????&?_~Uw??rj?)???????
??82?te??i2??P?F??????)????s??H3ff??y$?O`??;3????????t?`????})???W??????)x??u?n???5?^;????m???????{zT?1R?k?hGJ??????????&S?W(??j????\sZOY?]??|??1Y=????{?<n???c?????g?????o???F ???[=z???q?/???????k?st??????{?x7???z?=C?Nb$ ?Q??Ai??[)"em
???a????2????<?Ww?????E
??k?y=?}?????O?>0????{my???~}|?J?;??_?|?/?????A??S???;?j???}??M?w???o?E~i{*?:?????cSz
>????p?t?X?&????z?DcX^??+p????????|L;6??Dp?soy??a?y[?}X5?iK???5??o????D???f??g??r?d?????Hc???????_Uu????~&%??Yu???JO?/??!??30?=???A_?E?<???\??F??
~???e??h?????????t8?<???'??a?C?k??>?????=?E?$H0????Xi8?nO?^8)"?#y?
??C??=dW???????o????n??_h??~??????z>>?gO??C?L????Rq???????????+????[???g??6??????a??+??O?????????nP?]?????5????EI?L??O-????./??
.?x??)??@?, 8??Z???(/p????N??z9??t???N?????!???L???
?I????? @?????fX??L&M?B;??9/c???{?`$p???y???x??_???X???LW?n?????????F??????n
??8????H?@?>z}%?i???6???z?{?U???<??????????I?_=?????O?????.??A??2d?/?jM??2?t??%??2?f??&??????*?;?X?Zi
???+?G???+?z??It?9)	??(O??v?v}c|?p?hF?????D6?KKb}a????N
Q?E5,p#??}?????Z?-?v?#a??8
???w??U???}??q%??A?~?q?$?cm??=?rC???2????bk at F?%J???n?k?????=TG????d??NE?????I?0??(??
?(H0gj??mp?h????6^?E
???H@
>@?h??v??sY???U?1?8%?4?m?????????F?|v??rf??Y%??/??????r???K]?#??Nm??k=b?'?????z?
L????W,????
M??|7?????z?(?|[8???M<U????UUV???&??!??b???Wp????x?I??B?O??_(8{??02EdG  #?x-??
???=?? *h!
?)-
?k	?A,%???%?RB? XXV	,(???D???@@3V?e?)2P((???S2?f??)r??/?[F???&?I???KWiS7?????+*?" ?$,?B?)???????mI?ud??{?h?1	??
$a '????l???s)
&?
$d??$?AC0;IeD?	?h?1???????x?t??0}?????????N???c????/????b?*&0*%???.?#0|?=!??A?'E1
?u?h?????l?(y
M?"?d}?V1?????$????df\??muuc?K|g???i??O3????#???un9???yk?Z.?e??93I?'???],??l2?!0?$??
???~?f??N?-?S!.m??}???o$?O?d???{7W8?K??FBQ*.j?b??;m?]T???Ok?Wz:?(J?[?h?????3:????aO??o?K??????C?T?hp???J??AE?0??lXdd????F8?^? 0??u>???#G?????HHn?k?????S?c??H2f?]Z?A??????m)O??9l8??G?????? N??^??!Z?UPA??:??Q1????&??n??._?7????E?&?e?W}^v??e??'??g
RG???3?p???s??Xu???FtsfXJ7????h?????{????H????zr?`??l2?&??????t????&???8[	N{??:K?tLK?t]??Ot?f??lS??????)?E]????????m?8%?Y??i??[<V?
~U$??I1'yHe??? ?R#!?????h?????sq?!B???.?W^+?6????
???O/Z?+E?T>?9?9f???1??:3???J6v?B?~??F??
F+???????????=?l?K;%??5??=y???{m????#q?m?7??6??!f
C?}v'??l2??M{??x??W?f??c?p=Ob????Jx~L|P2??;????(???6?Uw???y???9?|?O??<N?_??>???y??\???/???????d??e]?H?b?W??7????Hh???,x?iz3?xL??K?~????o??8???[????~fg?#pwU?k??<2?'?
???wn???
?]?i??0Xd@
????s???=??:????????/???E????!h?????T{?I???>|U??y?|??/1
??m?{??Qu?C??~?V??????rt?s??^;S?#?/??
????{???????n'???-?&+??%I?G^?f6????y/?????????:??ZC??????8??????M??36&????c?^1?????n???O???;?(n?k?Nkjf&?hs????????4?????????P6???d?H$?B0??T"Q?e?{'?????oV??{7??????'go??I'=??K??>_<??69xM[??^??P?wYq????dp???i&x???.?5???????d~
?????+?LK?????????
????&)uuA-[????]???E?4?$?J>????W??'_w????f"????[??*??????.?B?=?Y?|n??.nh-????{?2MTC5??>??9=????
?
AE",?????2N\o_?=?-{o??_(??K????????????q??@6x?
?#:-
?.h?
v14????$????~??????U??? c???_0?&=_z???g?.M82lg?nh?V???)_?Ug??59??R\.~;h;?=~?_?k}?????E

ft??????Q?N4
LH? ?Yk!
?w??0 ???m|??|??y|l??I???M??N?X?)%?lLC?h]?'<=??q?
i??4?M?L?0?I	??0?B&H??Bf???$r3M?k?G??p?DN??p`??
3??@???o?PBv{9??&?OY??PL?@?tzb?a?:???LLS?Q)?wG?p&??
C(& 0rIZ")
??d????$.??0K.??-??5Y?????W*n?A????L?
/?c?;?,??/?????????
?W???????0????a????i?a?Bk?=F????????j??[ Y=?Ra??9?y8?j???9$?taz|z??3??K?Qr?Yg?????>??
l]jV????2?n?8?a??oW?;?h??J?Z?Q?*Tm'b9g6??z???????d???u?????Bhy?&???2*??FZ<91??^J??S?^?^???Q ????6??C????.SqM????J?90u'??x????d:????03??>????$9H?3yJ?-8.???j
y?T$?	???c?Z}7?VU5Bl?&???"0???l7?U{?t[?f*???????~?????????bFa?rM?F??m??m???-??m??m??Am?[m??m??m??mofm????bRaN$Hrsy?vl?]?rU`?????7?????????2e3V??1???????p??T<1EQb????-B???2Cc?[f??Wr??~a?!????X	????:ACBx%-??8???'=?&*??.L?????2?0I],??Sm??P5g??M?8b?????B????]1?
a>z????jF7]???v?K?a?v0q??(Vt???i?7
;$%.*?$?%v
?iD?Z?L(T??9??3M?????<??W$%?????C??	]??:Z???F?Tiy?}?{???j??<??K?h?tl?|,#Vm??p?N<!I?Hf?m?q?d?Y?
??j?^??%??d?97??Y???R????!
N???u#)??3??$0c???1|????Tg??9p???7T?D0??ee??G??#?O???????"5??+?9O???k???O?|Rr?
80??0?C?????~z????????????y?YO?k?3?????z?){??+???????+q?????{Y?=???DII+?e*????c??aE?C????i["??????f???)I?m???D?~?|??S2?	?I???????K???????IG)J+??A?;???i?6?V?ik}??>???~3?o??????Kz??=??k???5???????s?R?N??OT???v?????????L???1\7?s????????S)z=?8M<??	?v???E!SA?+>?AICV	e????d]?<[??\??!!)$???(d???k???????)Z?6?N?dZWhY=????I?r'?7?Q
>??????u??$??:L&???O7?QJ3Cr{?_q???p??h?s?X00?H^??QA???9\?6?Y?4????7V?:
Y?6U?
J??9R??Y?r
	-?RH????5)J<M?Ga???HCRD?-	???V???#???%T:??O(?!Sui?T?h????)?C?)?Bn????.)?r??;??33????)?^??;V?p????%???X?V/?i.4??y?????;???W?qIH??R?~??~??W"9D?"z?	???T%,D???BFw?{sk??3r?+????c??w???????,P????95eI?NS???$????f?nzR?t?mt ?;,??$?j????)fD????!?e?"??<(~<+??h????=??R???C????X*?i?C?%??BD?L???.
?ssf?f?????+Q?J'y!wkF???eX????J6?Noj?3{?:??#[^?-?<3?v?????zqP|??%???+b??8!?-(?{?,?z|?J???(????C??_??'T?s???w??s????????T$????m1?E???z?R9???y?d??[NX???? *>??%yU??	RPf?_????fQtM;t??K??g?P??[hs???S????-???"%??n1?!??oi?>??v??AI
?Y\??W:????p??????B????@v??y
?????????
?m?*?X}?????JxC??????????L??;2???4">?6c??D?????PSUS$?T???????????vn?Q?????@??nA;???????????????????S????????Z????????o?????Q?L?ZeD?,d?%,?SRm??'kk???C
X#F??KF??????6"fkI?<???j???!?YF?\?t')?@????*????????????l???y?a???,LO???p?.?"=???????A????ky??i?????#?A~o???r?????>?j?4??w?q?M0??i2?Q??C,??R?^?I?
\?q?H?.???U????CL??M????????i?????$?E???r9	??tq??d??6?;lm????9?????^?!???3?x??P?`??D??M?M$&?T??_???l?p?$??Z?0
c(;?0iM;[@cj3??o???\?qt
?@
?7^??I\?e??Pt?;?????$?j??)-"??i?*gN!i]?y??????ye???3????"?n{????]?????????Uo?=y;
??*?????V1y?<F???????-:????+OS;??????h?_N???2?U'Ywnd?i??
]9??%??~l??L????M?I1P0Uw??/???tO?j??????y?q?&????{?k}?L?????D?~;?\w??
?s??b&??????6?=???^???R??E???Af	F??h?4A!?I??d???4V?iFh?J%L???ffSASL??5!T?VII"f???2[$cA@	???s?N	??[Co?my?@$??RCy?????!?C?????????$????0OT?@Dy32???,?B"l?`[???D<p+2??????
_??@t`a??$?YG?????????a	???4NGM??%NH?UY???|R%?????N[?rA?4???7o???%?oD?M????	??]CQO}'D??"???{#??9???ppc??>'?z???=?_???V??{??.N??w?w?H>k??ZNY&=??
????x??;?_;v ???4D&o??<??oW??i?#????????X?
-???SM??r:o]?M{??"?????}????????q?dI8????(???MR???????????Cz?zT?z?yP????_??Dy????(7?X?]?0?/K??1?????	!??13o??\?S??G???7
???????xx\:?
??S??yf??????`$ ;?-?t????3???Q!p??%???D?0)?[??a??"??=????*???(?R????&?1c???????4?)E?I!?4??H??6?%%M

??Zjh%5?F?I??4?f??6???&??X"?Ja6?????Jf??`?Q?(EQB? ?FM	????Q
1?(?lU1%?,?b???DCa?,???da?6d?Q5?$?&L?	Q?????"?yNuy????D!
6?mMi??.???~??;lsL?wm??(???0??????U4???<??-?H?cY*%???4????ci?~??W???????V?bD?'?????p?A???!?????<???Q???????!!"I???I???	?????o9??9?+?;?y????c?wq?\e??5?QS??2
0????2HA3??-?0?a???????Zr???;W?_x?#7???_K???&~fv--?[?>???tU?x?Sx|????????:f??g?X???w\^?????z??n?a???B#w???R?????????l$?ISbj?M?6???L?y??m?I~T??)????[6??????m??#*??N5$dUF@?y??>m????%|?W??1? `?C??	tD??"
b(?	;??]L??L??EQE2?L?S)??e2?e2?L??ES(??E*?w]????
)???E2?L?Se?3}?7?S?m3u?;???d??!!$F????i	(?Lj`#??)Q?$??P?$???-SD??b??i?,?b+X?e?#4?)?4???h?b??+,mJDX
??X?%?e?Q?b1$?&l,??wd????????I?????(?W???Sd???$?%?#i??H??0c
,?i?$???1	?$?"??Ddh
??u???d?????"??Dm???f?HT???kQon?V?V?????V???DS6@?????Z?RT?&M?!$???U?????H???????6?"?,M5$????6?KY-Q4?E,?!$1B,??`???4???L?"?b???b?HTPi"?-??X?M?2??h?ci5(?6DF?2""?a&?V???d?U??l??J?????*6?
S*fI?F4h??E????j2K-AYaHQTTFM?%HZ???a2@??	A??L????????5?????NZy?t??0?????c????????{$3?)?
 ?I
?

??
?!??TPL?????g???0.?{=?=3?Y+????????I?iqT?????????Y2?a?hZp?x4?i?.??FOQV?F?,t1%??k0~
??0LO?,??|;?v?I?9?>FM?????[`??7????~_+?~????????;?
???T???!	?$???d??u?i??}Z[}?C??,????X?????{e?}%?i~X"0? 8?#????73????"p??F?Q?8??.????????$?;Q?n<??1|??u????2??-d???}??/?z?z?>N
G???}???&c??????M}?x???????Eb?8?'~?7?
N\?"?<???f!????:???????,?o?O??ZG??3y??????????w???????P`
p??1?"ED??%D!?<??9?
??^?W??_???????Mjs?"?J???C???	<?0=[wE???	-+?'????? xil?[?q?n??????6?#??????3??n_h????$???r?s?4r???????;??
???F?????s@>I%??????d??c????lt<??8?})?c???????????KJR??L?"1??c?Mm?`?(?????q?AW????qv}~?s????>??~??g????????F????}???^??&???<?\??n??N?????N?#??Y??gX????	V<?g??p??<?7-\?$??b?3e?7o?????1???????%?????:?i?Q?????I?A
??\???`??f:}v?J???]"s???M<?a: W?f???UH$?}???lop?o2??S???*???gyR{?O?i?|_??????_?y?????=??~?m=5??N?m????z???/?|??a??Mtz5Q??
??Z???dz3?P???:???
f$?Li???:?i?mH?]~%???>?Ym??Y?]?Q%?s???S?v?-?y????A?G/???VZ(????y????~=????z????U???????-???"#?9????????!!!$????u^</??????i??s?Jm????i?i]?????{u?f3??l????$?b?=????aO???.I
6?,,q????o????Zb}?_??6?P??????.dF?2oP!
?H??]$?g??#??v?n??9t9????x??&?,?<?)?SR6?k
<???!???wfc?o????
????Hq???C?V???M??#?}*^&?T[[?1??&????f?59???"H??4??D?L?p?J?????pF%,???J??
K??W????s????z??K???zw??V?u????/??9?????v??`S?n,;??D?$?????+?|
?%????)??'&z?SN?N?o??O??l?QO???d
?HY??

yu?mt??JM???4}?6M??=???&(k????C?????'R?E?????x?)???(h=/3??s
'??Fe??x,?K>,l?b?~??????VI+???F?Owj??k_?? ^???B?D??,?>???{_I??????u?@????U???Dj?$?+?????h?
?G???k??@???Sc,??uH!_????G?(\H??qju~w??
??@????????$????+?????=F?&???y??(?gxx?%,e??????,$????1?7M?Wa??M??%z?:??c
A;?5<???l?*?1????g????k??Cn9??:??05
??540??>??=e???DPDK
?Y??)B??v?e?R?J?:q?]T?J?zt??)?'I;?b???????M?:&=??b??<?KYp?????????#:????"&?\@??i?!?p\5{??????? ??d???^T?????|??c?b????F?R????nl"???.	?}????[z???4?\????v2?$U????R?]?B%?ze'??)t;??%????
??4?8?D?os]????????t?p????T	 @??fO???????=<"?L??F$-????A???Gt?R??6G|?j?{o???U?T$???????G???FCaU F$???s??S?????|????Ey???[?? &?*??????????4?@\?d?ZP??????B&	?d??	?@?e?L????&)lB$t?/?Z?|??h	??K%?
?9?*),?9?????*????'|a?|??p?8?3?!??IW?ff.??? ?(*U?)t??RRR_qb?5n1???9? ?0P?y?????ku'}??of+?XH?&??
?<J|?	?????Q?@?#?Q6SL#?aNUo?!?u?B???d at t??0
j37Q?
?t?????7??p
?H[??|G~LI?	5n,hR???e?????????????0?N????jx?Y#?j????%?V?j???T?k?*????O???lw???J??w?WL?p?dJ??
K)7??]?S???IuK??J8??

???????v:?1???:z?EN|[D??R
????Jz???^??L???9??#?SNS#??+|???:k?V???UR?K?_???N?????_?????o]p??"<?#q???~?????z???#6s)g??X?=?T?elO???:^{L?/?q??mi*???q*&?=k]?Y??????9{?a>ndV\W?=???X?$?,?W????S)`G?]&i???&?Ic,s???`?????PF,TU_??o?8??s?-????B???6???v=????????;?W?????????U?1$???>??&1???ggc?1?c?vv1?c?1?c;;;;;;?3???#,?N?/?>g??y?k???,??
?+rP?&1?H??:??~9)??j?A?6???a??
!?)??~&?w?D??????(?7j???7pT?O,n9??g??w9a[7???V?????o??H???r??F?I:?U>N??6?V??7???kh|h??'z?6?&?{p7?w??F??B
?????????i??gf?j,4???ty??j?^h??j??.??cM9????u?M?&?]??v??]C?9?.z???$?L?u?y?^
ov9?Af??!????????????[????.]?c??!Q?9??d?G???????u??????+N??y?$iSK?4>'? ?Z??D????N??????bQ,g?*?X?X??b?I???L?e:V"?w?Oc9D??Rd?5j."?????~gfjP??}?846??dn}?f??Z?dkf?Y???%h?E???|-^
w??]%???No?[??m??????fz~?	????+??^??m?O
??P=?U??D??S?4?V?(N?Io??"Q%?5???Yv???*D'?H??C???"s?Rz=r?T?ezf?s?H?????M?[?????yJJ?T?2??!d??X???!jL#u?????g?IM'?s??????s??5?5?zg???FDJ?Abo|t
b??n??=??Y?N??N^S?,??C??Qi??I?Trq?YJY?Ur?????X???y(|??5??81$?H?q8?n<???????????k???uFMe?	Sy???7?????
?|?	?8?X?/w??NQ?TT??UID?Y??$ZV??M?!
??	n??)??$V???QW??TV??????v???`V?Ig)i??R???m?1????%<i1H?Uc,??<??????C???;4?s??.??s?
f??????&pRKkJ?Tv??)I?wG$M????F???)??t????6?z?@=?q???w%(H??N?H?o??c???/??S??C?CB???????#Rd???8yI? sA?(@?o??J????:V"?w?O?t?Z??X?&d?&?EZ????!?+m?X???i>
%?E????9QJXD?Qw|??????W????&??M???^?j?
??W??IL?h?????x:;8i?????p?0?Q?
??i???j???Hxt???z???rS?b+Gy??1(?]_???????t
?j?????,?g?%:V"?w?O??(?%?w?Ti(H?G^????rO?`?a5D??????????a
?7?}??Y??w%??/K?????i??	?K??j??`?g??]e"????T=?#.}/?0/??????l?`?
??
/l???k!>
?????S~???_w??????|jP?u'L$???4|^La?|????u?`?{T?!In??y?t?'u???5&???????;??J~???,iDur??/A?????+????H?l?=??h??B?HL???e??
g?o???h?????N?x?q?96?2?YyN\???%9?????^J!??RD???K0{?G??
4???}??1??f?N?o@?????p?8
???g
?
??am?-????P
(??
??????%J`E"??t8N?~?????|??U????oj??n??>???g!
%?QZ??P?uHU5R??W???G???\??N?-b??????<L??6???	??d???IV%?%X?mA?????>6??'??????
????]?n?`?C?~?????{??6???(?P?"0?a9=??p?{?g????W\QT<?2???8z
X}? ?[?\6???S?
r?x??(??o???Oq?2???7?????????;??????`Uo^9???~?U&O???????+?`???l?
?x?@????![????{??_F???o?z???????/?????&p:_?9??PU
??q?+??????`?X,????????/??????>???p?X(,

?????????????{???	-?????Ji\?e??????r?????ON?z?t?)4e9?HP'J??????$???&?m???e?~????%?CCD??f??!?5?N?x?s?dF??E
I~F??4??Hx??fv???tTs??T?c)??X?z0?#?qL????n)??-??f??N???j??J?J?KS??H1{????????Q
??y?k?N???????	??
?I????U??H???{@??V+?c?I=??&~=??????T?yo????2???f4?y?0c?Y???p??$??g?= ? ^m?;}??!?5?~
[...1814 lines suppressed...]
??i-f%???Pv?E?G)W?????n?h??<?q0??KZ?*???.???M?V??M?m!<????jK????RCZ?\?????B
O??89??|??2/?_?f?g??O?#?q8i???3oW?v?{??]??s
??M?
??,L?,2??????:??Y??;.???FB0q?????'?c??gI??Y&r]%???$okxe#???????0Sv??
?????	j??V?k?ky?xfU?T?)Q6L?Q?i?]?0svihAKIU???mIL?5??m??Us\pw]???,??
g?S??H???A at p??8n?$F?9S:?y?<???l??t??k!r?fp?GU??f????H??\y?l5???2???o????????3??+?o?2?P;???<?g??S
?Sb???V?1	
/bs???`??#???N?|E3En=?AD?v?x0
??????Sa????y???0VSJ;m??????k?<????E??8???????u?M?????i ???3h?H?? ?
????????????I??????????????yC?{?
?????N??f)????c?????QT?c???$?;?????9??????/,`??????W??a???D???R????l?c??
?Y'6???Yn[kz???????????d??)??3~?h}
?8
6#???? ?b9w?K???j?*Z??
CR)????2??K?????\??????nI4d??n?jr

<?
?????
??dV?}???S???2h???)????Z??c?????=Wx??q<@??eTUQUUp?H??NUEJ???pC?h?J|1????ff?b!u??df&(Y??Lb????0?K? B??OI????ZrW??Q????59[?Q?
B???H5.????I?H?????
??I?J&d?0?	?G at v?J?li????Y???
??6r?vSUM???h"Q(???? B
iQ?;??b??0?P?N*%??r?h*??}?3????A?$X?4D|?????|\P? t&??N?u???[?&??Db
=???b?? ?$?s?A?
??b?W?7??&P??=j?1?X?L??????#v???oRCY?Or???rZ??\?
?ox?????????9??G?<<??#????a????~?S?:??x???.B=?lT??/?!???jWF
???S??M
?V?9T4M
????9?????9*
??j??-
???2?/J??GP8
??tX?]?C	???O???_?X e?
?#Bu???N?s?q3i2@????}?P6<?yu?8?F`j ???,??Z?,9w?h
6?????2:???aG\8^?N?????A??*D'4?I%?[^?r#??n
????v?!nP????? ??Ldn????B?#??8???????r2??P+ ?!??v?|??lu
??l8?!j?

{X<?\H?<;K?EVk??????!?>}????vpw ?@???2?//?$?,!_8NK?
FPTLU?F?21?F?,?f&?2???????i(%???4??`?[;?>*>???@??H????aMu?,S??
J?P`lup7?[a??l?&?;d???kj?Wb?U?
??A?????<???y ?t? ?0??#b"???????????n/P!?P???|??N??-A?-<
??#!
a??????Cy?BE???$`?9?)-?@??&??i?SLT54?????????7~?I???????sK???F
j?2B'???*?A??X?0K7z}jgG??/??Y??>??h?????]I??wgs<I???sq?????????v7?v?)???"|?T????i??aB??I?a"?cYVaj???s54%?yfOK??? ?8.??d?4a?-&q? ??????]K??n??R?<?K?,???K0???d8b:!(u
&`?
?=??0?????fM???
h?bH<$??,?F?cc???[)??q?????? y4)<G???=?dC???}?????``?(????Y????tbZ?;P?0??0 wB?C?$:Y?b?? ??}???W}?J-??;g^?p?o7???}?&CQ?h/??????A?q43?X?????+?@?1??fkbb????4??-?Q?;?{
??"?s?=a&??????e??????w??
?33e?x?UA??c'??4?? ?????h?5???`INY-?Z?}?	?$?RHI????????7?^?-?????????A??8s,?I??`?,??GE??B	D?	??f?`????@??2hd ?BQ7??.+3\??iQ??a????y??9??D??pq??R?=nm?"???+5??j&?X????*a???v????K???aYX?!0 ?4P)R?>???f?n????+`?mu?J??K?j?
????????D??l?}?\?????(7R"yX,???5
yd?y?`A?WX?B'?K?????????<??6??%R?)@O8L?Q'??yC?:?I>Q?Q??&&eIFC?KH?F??????$w????8??z~?+???$
}?6QA*?
?2rB	??\?}?9
?
?v	?.?t???dd?[vQ?]?v?Q?{p?????!?%J??h?i?$)%?=E?WH>l????RC?l0?????~??N?,???Eih?))\?p.????g??z|?x%?[v?j|#.P??'??O2
?`p??
G?D???????7
?,
LIZq??f3D????>??.E??=h{Y?H?U???l??b??$U?M`?`@??&h!?4???.?xP????????i?:??c}rd?????????c\?:VyM??$?p?<m?&?Y
d) ?6????7
,HD?????^!#?? ???????s+,?????9 ?????L?D?A6?z?=??/w?_<I???\?:P
???????????<??d?<qW?Bb????-e	??#G?qY???n??)??x??E?i?B???
u%??H?~???}>??$+E??4????`?Oi.???D8MF?,?0aR

}??"??5
? ?C?I???2??P???B??@Pr??P?=???G??a?h?7R "z??6H??f??9?0??D?&A?>a?`?1???xTFFt?[???H???????{???c??*!?????=gQ???@\??#????5d???_:|thjv?RKt?Bg?|?????Kv???;O?W?r?
9z?4I???"{?G???v????nh???^mn1?,?L??T?2>?x?U??E???v???^t???C}(:C?4??4? ?~?p?	z???|????JpxG?"?`???i??g1???@????????u0??Ug???s???`???????4F	?a:?X`Z=S??5 ???hN????? ??m=????,????W
?1??Nt?es?+??=?????d?-
????P?'??0
?HdD?
?u@?_oW"???Y?????J???b??*??Q?J?????a=??M??)|.??>?#????????????@??`o??Fc6??HZa???E??>?a?		??hQ?
2?3(2??Z$?2G?JP?-#B??????Y?8?0 :?!$??????N??G?D????2?=?????(???b{ ?vH???3?[?4B?
?
??O???	,CMYN?	t8(*?
??
?M-??0=?;???Ih??^??????W&?Q??????}DCt?AE?7??=?3h?\? ,XI?
!p?\3???GD??$h??	??????z?????ZN?|??=????1??dmRZ?5?g?G?lX?J?NW4G??R7?WS??y?#?$??-$O???????8???s?z?!	XU????N?6???j??L|??A{H??b:?????????9|)??)??)?6E?o??2	BB*
!????|sq??????'?)??2
??X"A?`I!?fR
~2??Rf'<?~/?M*)?xxH?byF
]?4?????*,(?????????b(Hf'???c??????@??@?D p?$??$>?G?O?^wk??~??l?=?D?ec?\_?>?3?????e???~?????
??;
7????"??4?_]s?03?(???;(???Y????	U??????f??o??"??/?(?????':???h?8?f|v?
3N??BB$ ???
L?*
?"???h&??}=?3?????EZDI?Xr@
?
%?\?????i?xBe~)?S????#???4???G?6?h??????a?T??"?!?k'??_4??"?7N????Q?a?,?pq??J/??8C?v5D?	ef H@V?pQBPDL#!????'??a?K&????/w??F
?k??J????{???c' p?y?l<b|D?9d  q??6r @iC?%?I`
??4?x2X?!H_?f
?ENG?x??J5??]??2E???'ds???&?s??d?$??F??SU![?a??G????S?O?|??#M?9`?X??YrF?.bX?q?
??F??R1?,???????ek??1==-?M?xa?Sg??'H~~?????J???h???h???g?A?D?"???<o?????Dzi&o????r?3Fc??JW?????]:??X?uUEe??t???C??(?%?uRo?,?E???>?z?*J}???k?;?IL??????t??`;???h?Y?!?'?!I?a??$??$H)??4HR9?j-X&+)kXi?? ??\0A?????*?+V$[$?
?`??0??5????p??W9???,Po0??fK}T?tI5Tx?	rf7%d?r?Bih??!????}S???<S?H"PUQJ??[?(?*???{=_?Op?~???QM&?0???;? ???#?Tzg40???
??A^]??$?2??
?z????Ro??jE?????1-Kr??@?c????????bbT????*???Z??P>?&WA(r?M??5?{	'?,LR<?}?8\C?$D?Q?&? ???`?????D?????}&?$??????Qx????#?#q??\e???<:????????y?JrIT???y7?J?A!?u???7CA&?
??0?=!????9?3????"8p>?9?????=	?
'f*?)L?D{`??^?{Ro????\>y?????H??#??????]y?g?T=NT??????'?c??Fj?c?}?Q?(?D??5??
r?R ?|l4^??v&?>B*?J??<????n?fN?`.k}?O???P?????t<?z
3?&??K#3g5?Y?2ucY??W$??`m4	??Yn??????&???X45?)?F??+e?L????U
P???
???6#Em???=x?6?????????0f
?y?!?7_????????L6?\|??_^?+?????g?(C?
R??lm??|	 ?M?Ci??Tu?|???a^qx???B97b??=y?	??i????????NO??6j'?
:1]??V	`???gp??0??=1!r?Fo??*Jl???B`??8?-&
?"n?85??th?8?JZ??c??,Cy??????4I?f?m?t? ?D8?AF?#??!??j	??????tN?"I?\????M'?????m????1)5???W?B???Q?
?????1????]]V?,?<?F???????C?t?2!?'?TAd??.?7???	KB???;??Q?#/[???8??[h?)+I?iKXa)<???n'f;%?0m?u?\n?2??)]r??????EF?Zq??&???x??f'Bf?a
>????r?!f3?>]??t?9dMv?s??7qM?????Z??0??1???
d`?q?????NY?Ca??? ??H?D??J8\??????l?F?k ????Y?+hC?:??,(W???????4??a?L?#???L??oH?q6?;????)????

E)"xRT?Lp???{`?n3??+E??eRIy?????f?????o\????'??`?t'?q??!??5j?k??9 r??M!????_V? ???G????s0????DT?

???l?j@#??[??.j??O???N]:?[ '9?
.?(1:???^?l???vl??f*p)?Y?????k#q??Cm#?=L??g^<;}????R?\?7?H,?8\/???"?????q
??!?i?e1??i?^c????;????>????8?n?
5j??????????P??a?
???????????,D3?~?????g??!Ty.P|t???????[?k?K?????o???;;?v?{???`@?0??u?????Z?
?sk/;=???m?????=?5]B@:?????P}?3??w???L:??H??????WF?nm??<Ck}?????|?????p?{$??m<????H?C+?@/??=????Q?%??#;???
	?d ?????
W,a1?Vv???T3?p?????W???%????v9'????(?!aC??
???J??k]???????????^	?Gu??c?B????vSN}?v???;?6?<Lc?8?um?PI????????~O|?z
?^I?^??i??N???X??????.&w?????I%j?o8??r?]?????Kw??n{p?????o??\?????x?x?B??G?>?A?18-?{?"?$d?
?????XB%#T8?,???>??H?[?????1??
?sxH????R?-W???B??3??09????$??
O"X6??3?j4#2????????Q??b??GV?pC????bX??????)????hd5A?P?g$4g?E	?+a???!?7\V{??
???"0?????????????7?O9=
?,???dFE????R<???y?#$?Ciw?y?*	?B??x???
??|: 78+?x??_<???????5e??.h???2??U<??"Q??J??V8????n?#lllq??j???$??cpn?j?u?j????
P5?
l??
??G????p??TDH?I?sv?8?'0??????:??
??Go??
?B?e?C\j6Q
#?!{?$????
??46??
?7<M!?#??9????;?Y|
gE?`?
??5?}W`?-??I32Y3M~Zg?D????g?.????>?q?8?0??
JF
???P[7)3e?????/~????@?
V??BgLp"??	3I?C????3????@???ai?G?#i??,?0a????gz
?!?_I????F-??L?*b9$??UJiY\F?nr,??s-?????7v??c[???E?+????r?N????t"o?o?	??!2V??F&\
???'w5?pqW?T*rc??K?"??Y???-?jqc1??k?*KN?Q?
[????2??G?????k|???<F?N???9Sx?QHc???????Pd?,?;?2CZL?????]?H?_??"?ge??~f,?/???g??3?%g?????????M??F?6?c?7b???X?!?F????M??dh???9~)W	?b??)???q,?O'I?#????Z??6c%?@]wc??R!
?4g?V4?VN??;dv?????z?n?42%??wt?C??ZM?3?????tg??h?s?80[ul??7??8?E????x?-?S<??$??Y1
r(??V]??@?"B???,?O???]???Y;3r?^,;`}?A??C
Q?O???.P/9{??a??5?q??x?wy""???+n???v??^c???Ya^|??S?K????n??;tL?????N??;|???kE9?A?^?{N???Q?[F&8^!?K2E???W?j??6?????zu?>z?-??'Bk?r??Uj,m?????m??onn\?????I?Hl?4???i???:,?qg?h=@,??5{??'
)?]?+h??9vg at N???d?
D???G??9?P?	?|B?&0???\?B?X?k8?a1?n??????hN???[A8???Lpe??F?
#2?V?E	??#)??-???????-?it?2[?A(1???A??????a?/;??????	???`??^5b?=8?vcD+??l??jv._????$??+?S?w??????{???f}>?jY??K\???????1??)????;9??NOC\L???]?
??b?????y??q??????&ug?
%??Y?W++b?)]??;KK&m??6Ce??d?Lx8?j[	`e?B7??Z|a?-L2,??//??xU#?&??R??cq?j y???(??Z??8;q?????~?D?c?M^mn??{.U??`)k??vh[;^%s??r[+?S7?j??>G:??<??1??c^bY??~??p?????\l??<n??*M??Y???z1p?????K???<????)S?GX?iG??n_?I???????2??x8?G}???????]??????z???|???zt=1N?;????U;ZU?????4?Gwc?C??{??lX!?$5???@?E?x??w)??(??]??
N?!???????????????K?)?S?=???L?-?hBBB?????`?F=O??p?!??p	=??8??k^/}Q3??Vh2*n????l9?;?Y?~5?????s&???h??^b9v~-????C?????? wW?$???r?"-?ml?-?,+b ?;Ge???Z???N??qsr??`U??Fx??$?8xf?n
?3?e?4?#mx???#7?z??^
8????]??X??C?i?a?Y??'?Y?~9X?.?Oz?;????????Q??U?]????;??j/6!?8??????7?1d? p?0u:??&b?"R?????y?@??%???w?9??C
??G??7u?8???LCA
"????
?|(
?????8s??un}?{?'???t?t?vk?L;???????i`H??
??T?Bf???????rd??Ff	O
3??;??w???h?8???f??H????(Y?&+?]?K??h????1?7EdF?XR??u@?L??
??1?`ji? ?E)H?
&??X?? 
?!??M"Hi????&[?Ci??"	? ??19?Q@???tT(V?B?
V??Dp
DY0,T6????h4??	?a??<?i??pRX	e
??@&^4\??2R?N?~?D?_?o?G??????`???y??b?,?>?~7L???Pg,+2?[??f.tQ?il9???Z???2?	?K'	??????F:?G?k???Sl???
??J????rc?l????6????P[7KC??q?a
25+??o5?Bj??y?k???J?p{???7??????@??~?+@???}R??2?n??u?H1M#`6mt?	kl?p!?3?H??!p
%???
??tw??A?L?'? ???Z????&v#??I?\,??(I??Z6m?yL?<??v??:?
,?]?#[?&???x???P?P?*?OT!?4xv^?7??;
????|?-??j??9??2???9C??o??????3[<?

?wq?T?MI????V#??&?X???"Q~?U????5Z?r?Gi??U&?2???+?{?/D?H?:??~???m?8?k?????tO=?be??#w?[?	g?g?-9*J??jgW??9?j????5????w?H?W??bq.??[{?i. ?<.???dc???G!?? ?{e???6*;J?`%	??|c?
?;?X?GU?Wx?
)@{??G??????O8???+TJ?????I?
?4?	4???:?"?????J ??I??=1?z
b?v\?w??FY?h7?9?
t????=h??????
??k?5O???I4?N??&??{??CET?? ?Z?hf?E??4xK?{Ff?????s???\}??=?s?|?S4Sp??W@{H???`??????<D?'???????~?????d9??:t???R ?!&???K??Q?d?p89c#3????5L?R?"X?u??0t?k???L??Vg)'???/R???-?1???/}Td91f%_F?3[34Ta[?R1? Qw{???)??y???8{h,?PHs8????? t?
!?????X?n?`?n??":q????????L|k?M??+?g??t8???&?L??,' ??Cp7F??>????????vU???yXT??L?0f????'w?*?Z|?e
??^????r?7????%??p?M??I[?.?C??????????,i???Hm???p?????dH=>E<?Ye??3?????*?
?|yw??6??R?h?
A??M?$oj+??fG/?OH?>???3??Q?*?Z)?b??Q??z??p^/?O7??RX?
5VP?vML?????1??TAL4EAST4
??.
F?J??_w??{x??? ?Kg T?Z%W??B????C?pA at P?J?c?@??l?O?m~8(m?!?=^>#Rw?d???0<?u??PH?.??s6Ei6?/?Q7?$?a???????Mci??&J?NM?????????4&?
???????m?4??m???"B)??^?9
????}k???U?z??<??2?{U?l,$?a?z?(??2?{p?Yp?6s????????>d????=??? {????7M?W?K??elGk?2
?????04$??u?hb??(?[#??OV,o?f'??'0org;???c?^????c?h?????j??l???w???q|?w???x??????D??G?w?)??g?????0???i,??3"[30N,?dDMDUV??3+&8%@F?X"?q??7??V?c8??cir??2????	B/'z??????y?k3i??Y??;x!J;?y(??~????HB2?1????&{?5F?n?K;?????-???????7?k????-
Q?6?f?+q?Z?=1?3e???j?j???:????P4sD3ms*?$????2I??jb??j??kQS;?
k???EUUU?5?0??*???IuD??b?(kT?R?C? ?3O?<Q?$?P???/?
??S?????q?bh??????Z????.?T?????7?G ???? ???????B!????ZS???>???mCn??"L ???3Px/???T???B?H?????x"A8??A?E]?D?p|???xJ?	? .?2C?:
??????^I?/??7=???
???
??????????@?
#	A??D]l[?3U1????%v?/&??*~??????????y??^N??2???c?!?????o??/??CX=??F??gD$?????i?<<}????????????aEJ(?XIp????|a???XY??t?ci?7??9??.PG?????s|
xE???[??????i+???0???/7?????4??P??y?E??<???
?A9_?ZaIZ????????!?:????NE?????S???iG_???OG??$a?}}2p4? ?G)????????????
??S???1???%?(???h?t&???????7G???%???p|?5i=r??!?t???t
f??AT???"{a?}g?<?I??e?d?B
?M??(???C?mc@??????K?c??qD??e?H?h???'@?"r?O? ?ME?V@??2??l?X?m??`??j.?,X
?~p???Vd ?|??	?{kD?c?c?q?p\fM??J?a
K??d?? ????
?hiW??m6??t_?g	Aq?SI?"?J{`?T??
%I
ZC`??cW
j?M?h??(~?@X??c????????
?j
A???#?v?O?1?C
=????;1?r???m????U;????????;c<v?lH??
s
?3??J??m??????aC3???tz?~L?	???
?J5IRm`2A?`????@0J?? Sx??5?jv'CUQ??@>~x????#?I?D
"0s?'v
??
3?=i????\????T?@?=~?
??+.?jQ?%;???ddbwJj at u
y%??>??$9 }???]?)r??????M??Eg
E?8?kC????y?HF???4?????B?;
;@];?/?w=??!?E
HG?M??K?w?S????????jC??ERP??A?X?+#T???4??]?ch?zf??M?
J??7P"P?!i?L?0????j?)?]??0??F at q#?;7>???r
N?c8hX?F5??`d????sq%q????!V???"b?4K??
x`?Ejw`?p<??\T1?A??8?Abd?0Q$*
_?@??"???????t??CtY?jG????L????!??#?6&??!?G#F????	M?q??????O????=%/?/#????I???????5&H#?`???a?????????IXu?!+??
?$?L*?U#?%??(>x???+x at GQ?L?;tL??????????o??>????S,?Vi<?[?????????Lj?'b?7??mo)?b1^|[?Tdbf?J?c???v???ePLm??e??4????dQ????p?>h?kS"#`?da\m?I?
`F?g???JLT?F?&??????????4??Y?TFc?i?z??l?2???q?F??!?
???2Wh#h???Z?9?bB	1?Rx?
C0?H %4?B8K??4?P?????-!@??C?r*?JN?.?]T
(P
??+BP?*?(?S?:h C?f?=???&x:aFV"
?D??>?A???1?UQ
$BRHSI???+?	,Or?????@zc?!"8
=?#

?#J?yf(??????!',0??1??i?"MZR??D?|n]??U{:c??q?K??sN?AI 6h??N
a?
??3??<?LRvG??)?3??-??~?????????=?"z:????'n??Tt?
(O(
Jd??QU?P5$?KSQEQML?D0B??"QUKJLL%??E?8R?q????EQCT(????$?
,7F????u?5??3;6?_0?MO?????a?"??bg'???a??
tfd??$?W??1??`q?h5?1?d??f(?/[7?????B'R+?83??a???.l???<H?]f?k??vDH@?=????#P?2?2(?
(??e???=7q}?
???+x?/c?l??$E>
???PkNr\?,U?DRa&??????&
?C@?h????Z???p`DB???&iM?q?l????vC@?M1??g'???CIE????????$E4!-.?A?\0??N\?V??q?{???5???4+????]2?1!??		4?:
?m?qL^KRm?-??j??????0?GNx?/H???\?p??s?%Dh??
?l?}+F^??B?(j???M
???7??[?@?H?c?GI0M????i?RR?jG?
?? ?]iN???
????$?
o????m4?T?f?????????&???u?)??a]?h??E??p??d??\UD~{??~?????h??????????T?iVRgm?a\???X???:25?Y??CC??????#Pm?!?,7w? \?g<?f?M5j??jE??5?71??u?OR"?lq'
??5???????b?j.???[?C;??????????ha?????FV3???0?N???S?Q44??=?anqji??a?#d0??tZ?S????L???`?&A?T??x??f?c?i?a????=>??;???2u????*p?_????*Q?'????5??b??$????HB?I~7}'%??U?%?t?8?5-????%??h?
?Q?????????d?I`?8E??????G?	????8???@?po1??_?6??? k????`EO$??{?D?r(???0?d?K??Pj? ?!?F&9?d	
?!B??0?^??h?f?c?????D?

x?????m?u~???\?9??$?????d?:??G????$K??,?;K*Y????0??? ???Z????h?A??
A???$7(???c?)??A?(_?-.?!?f??&?.?
9J???????'?fQ	?i??????2?????B,?Bs????Q?~$!I??'???#%
??4
??A???<l?%

??<???8A*?O???k
b?a?>??i'*h
@??? ?&?1r???!U?`sjrp@?S?l??v?R#?/???M?:a? ??i&b????|#?D?>o??????"?h?2MQXMLZ{"??1z??}|????????#???G3}qbG?t??`?$x+=?q?"!???n???'=???7?j3?}`v.Z???X
\?F???E?j"e????<_?1??????u???8??][d??W????w?>?T"???????q?lF?&?6?n?FZ?j????l?=?#????f?;?Kn?[9!_?????<?9w?#??t[@?+?J??$?LW?:,????C??`PYe???p4?="D0??u"??#2????`?:????V??q(?H??????q????t??????N???P?r????2?I* w?Ghs?]?0.?2?$)
"???6?#??\=??%????1g??5??7???+??@g8[?}????G????
??d???(??u
|2??;?7F?<
??X&????D?y$??]%6(<????????>?/^?}???!#??fz?N?'eY???E?????
?!???R?????(z}??|?!#T?:/?
@? ? ?? ?j?!b?(?
????b?Z" ?)Z??
????"?E?d!? JB???()???B??("???O???I&#??\?\Y'3??????????Q#?_H?????T W?@?!??b>wt:?DP-??Hn????~???????(??PGx???0Rl4
?z?Q?"&#	U?
(ja?$"FJ???R*
?(?????@z????##??'?
?????6?@?5. at m????f9??`??f????P?{?PFS?????/bo?@??@?!??Dx??.????0X?7?Z#\?????o??p?bq??L
?
`?$?.???
??rnFI?Ho:=?=5?/&m??1?9?52???????XEU4??
U
??f%?v???@dB?:???0wT??(C?[|%iu.??t
??SbK	?-
&??I??/??
??d???M???PH??bB`???Y??C??L\?F>????_q???????eA?
??kJ!????7?????"???DG?S???2*????????????&O?s="?Hv??$?c7b?o????u??"??+?H?%#??HS_$??D??k?82?2ImyFCEnLf"?"EZ""l?mQ??3R?
??,??e?Ae??A???P???1??q??B?p?/???????P?P?
????P?wK??&?????P?
???#??c???????????)?/??_?>???????
?9?1?$? F??????E,1?&?>???^R?E?o????E(??0P4??@5???m???B?+p??q??Fq?$"??m"????E?m??D??{?m???08	$?B??????x?g?????
b/g9??_=???vA??????3????/Z?y+??1?Re?i??tH?a.??KW??Jy_???LLQ??}???x?t?@??C?HK?????*I&4??@?9????y??]??s9??V?? Q?{????18&HU??zo&j??<?????
????c??Y
??sn???<?3??k*????*????{??W??=V1???????ME??????-k[]???8?S??RI3Q?
F?	?;???N.?a???;??&?Z??????????	??|??:?B??????T????S?j????$R??J?C?a?DI?"|???????A??&?	??
??x????
?;?e??,-D4cY??-Z???	?????'0?v0????[?a$?9A????4??>?e6?QZ"?b"Ld??H????C!?JDY??4?E2]K(??T???????1Rlj??n at J??1????+??q???`
 bg?????p??n&?G?
?
?L2Z
??2??x`@??"?m?3?6???rx?>V??8K?p??o?6/??H???S[??
????????',a]?Cie ?D?,R?6??e??R/	??8?&???]lh?
?{??w???????n??pH?????a??c??a???JR&?6?A(???]#S
SQDX??@K D%0U???L??-
????h???=)?v??!?T?o????"????DP^??????????<y
??o#[??XmxMDz?
*c?:Z?)??'t?4D<X
?37K
?/?hh?? (???{?F?\?'A at U???\g??N?G9?+H,??#M?ZR???:??q1??*??E!??X?4c`???6`]DF4?P?M:?a?6?
????Za%???
A?$
?g$??T?Q??6N??b??$???G??h?D?5&?%?X??W6	*t?J??X???1Z???7c@=z?`??:j??B<??????'?@;!
?BC???K??p?c(0??hG??)?4=?S!??F(U?=8?%x?8??&?`a&Yfc??????*????w
?????G???~93?OT?<5H)?
?(?U,O?`??3DD>?d?6 at q?N????05!TS?XH?rI.>??xF??}?????[k^???p?z??c"epD8	??+?4r?]?S?4)c"??QCu?r,rf????m?4???????Y!?????P=,GM?5@????G_?i$??7????F?l?@?-?i????P?4
E at d?<d?p???0g
??%::b??a?????? ?*?$
sA?,???R?G?H+??zg?
>K????R?/1?-??B?a2L???F~	:???&??x??H?>
%P????6"N0"hX|
??????|?e2~|2)
x,??~?Z??@??q?&
?3?AH@???kmMA?D???P?P0?Rp???Z??kM%??J?F??	?1??8e
?S5p??V?@5
???	?(+???P??
1??Y?S???a??2??I
(% $H????
??D?>???????hD???j??????Fb??J7]Cl????>??pP??OIbD +?t?=???CHd?"??u???k??????p[?=????Y?CLf??'?b??|?J?4\I?????Q"c??C$M??x?F??3???]R-R	??Vnw???av????;????7??????GM~j??>C??'??????K
?2F??b!??:a?Tj7kF
? ??L?R??t?`Z?F??#???=???P
,?B^?8???MEF???3t??h??7F??ZkT???vi?B8????-f????\?
.0g??-?O]2?+??????llmVIz`??'?rq*?N?3vU?w?%^?)??????_ ???d?r?????0?P????@?!?a?q?v?m??V??UZ???O#?p5?RErWp????w;????N??*xUH?9?????h??????>$>???????????##??<??4???M#N???#i?d?;?N??{?Ep??.?P??5T??-&eSw? ?%$????X?Ml\?????*??^???["?9??*;???C?_???(
oa2I{&???CM"^?d???vI:??F??jKc?<?R32?1vf?a[?	:???????m?????hv8?0?td??f?4?m0#lLi*?7Ir?????
+??w???C??LD??rnn)?Tf????????;????;??????U??k?1????E?5?:?>bf????S? ~???$?E[?"J9?????kp?=???
?@ZZ??CGP)??l7??x??f??JN?ibv)
y0q~,?.W?P?D?o:??U
?i/?/
 ?4!??$n?5,????B>?"????C??????y??"?Sg9?9???d????K?~B.??(w ?
?N????E#QV@??????'?A?|?)?oB
Y?MY?$?9???H^?!8???J??DBh?9?HLd?MX???x?@??C????
#:=?`???>????Y$?"?s?=???7@????l
?Bw|x???
7??????=_^?n????6??#`??!(|???AzN
g8???-0N?I?*?GR??J?DrZ?????4'??B57`?4???
??6?X5?H?!?.?Lve???????BGn????=#????????Z???[?? ???\?R|?O\Z?k???bjr??(???????2?H0,?
x?AAyFF&IY??1??Cy???l1u#?R???x?SQ!H?0?#3#&f?
F,
!
????	 
(?, B?b?%L??"hj%3H??P?u?P??(?@??f??????(?B?3???`???4???hx??S?P??f?pn3?Cn	?=0???PbBW\?l?
????SD??
?k0
??i3??q?Nq(?;9e??9
?k?;d#???????	?
??gQ????????(???QFX???????e1]??S\?G???i??+PwAU???s!?4?c??&<?T????l????6<x5J?P???v?,?:3M-&???(?Y-??2?
I??
-W??'[q<1?Y,??a?"?ZiGA?[\?????A?	a??#]???A6@|S	???0???????PeE!???h??*p?e|BQ??X?^?d?????A?C?#0puR?114???B?u????]?n$l?*;?5?	??????B#30#7?Z?Z?t"?D*??cb?v?W??A??????`cOC?Z??3#5
A??????????????
d???????5
?[???c0?

?h?????4v'$????6??14???y???q??&???$Ck?M
?R?'}*?
?%R$H<C?u0??Z???
?????;??6}?w??????D???H R_'K?C;5??????A?????gN??7t?8v[cb????j+??^b?;N ??????KHx?R??
r({??h??n<D18???%???D?b$?????&?-j??????
??i??V:1(?(?Iz??4?????q?U??!2K0??d?f???GR&H'????dh>xM<tb?M???B?C7?????? $x?z1?#z?ckI.?u!F????z0???3N???C??5:??????,???q0????????R???PR*??a?/??+4?#
D?e?vl???L?(?*%?*?3 ???ec?)jhK????wa?s????BP
H?S?q??"????????Z?b(&-F1-
Ljr?B#?0???A??2% ???0?
%?=??????????RR??.?
?
?{?>:????WP?&z?\?RA??????.?????S??9BbG?bC?????????G??$?j???G#A??????
?????X@??C*4
@?)J?
*1
b?/???????!?	"??`D?
???FD?05~P?
??
Ey
(L}???z??C;???~??a????MP??H?1HAJ?@A'?G?ve?31R???~?r^%HN??oB"
Z??e?`Z?9G??&C I???>a?k???A?B	If&????J??)?????????a??:?4`q?1h?5`????B\??wh?%???{
*	r:???b?m?P????~??q??)??	?X$fT%
?F`1@???????S???'?Z???UP??DEjZC??a? !??1!diq?)????????0
??	?w??ABHD??EU?a`H.?o
L?5'Cy?gq/4?s)????NT?"?G 6?%54???*{?_h?w??0????D??rY9WZ?D??rUp?mC??
?D??x?8&??w???. ?>y??????B?_???~?W??d~??3I????	L?PoY?????X?
X?" ?5Dj?j?b?T2?!??
????#?
?d	BC???
?F.?G" ??b
?!?$?.?????????6qb'???}????:g?k?c??0/???t????6/:&&?????w?8?%?L?N????4??9??W??
??]?2????FI??Wrw6H?q?????G0$(????9?M{s???E)?7	?'^??5??p4A?	OB?)???
-???hq?Lihb?%?/y???!?s?4??W?i??v?2cn?4&3N?j&????Q??CZ8?h??CK?s???ft??Q??GK?CR?'?C??q?G,????H??e?~??a??????X8?T?c?(?d8?.1 ????o57m[?31cM'S{?x??m??zg?n?|?`g8???y?B3x9p?b???!XK?oNL?
??????0c(&i-?????ar?uW?!E<M?>?u???%?
??FRWb??A
????#?uQ????P\"C8}?z?O????:?(@$aa?.I
Ja??Mq?x*??!?N???Q?Q}???N
E??<X_4BDN???M?I?AN???I?-?8I?fPJ? E#?B'??HR?T3(/?@`?'?<t?????z?????
?P??P
?<?V??L??-??Z???b????<
?cxd??DA%???
26?C?)H@?7??CtY?]?U????vG??dK????-9???A???i?k^??:?;????R?I?QX?~??w??)S?Y`;j?`????@??M??RRPUfg?=F-?{?
 }?Y	
E?H??A(q?$??(??|%??^??__????p&?5?X?	??N??????/;???0@4?lJ_???
???"n?"??dQ;m?xz???&??%?9?9?A??$?L=???.?&?,??@??a?? t?^??|&?i
?v=r??'`?+?% ???p??6????

?Q?1?E]g
????_MY$9?U??tbt??4??Q???Y:?d?p??nb?u?;?U,b*???;a?J????*?B??????u??:?????w??i)???b?\!??
??'1)??z=Q?9>?8???H?O?;3!J5l?1,#A?],lq???
?
?`?e?9n?i???????dh"??P*("?*?$)"??P(???\<??e
c?8f|?IAG???? L?????kZ???p20??y??DC????rM#????7?!??E@9v?????IT!?
n;X?
??T?A
)?d???2?/?k?\'???r???
s???BIH?H?????'"?F'???????}?E-p??????E???1?? ??5A???m8?'?????)L+?5??T?S????R9??1:???O	????$?5??4w?Q???l?9:?}>??8?*.???f.?-??2?R*??7cU:??mP at e0U?l???_?=j??t5?+?U??n^?}??x?R?/???? ??d????T~Z{r?-R?????h??d???a?3?i?$????c7 -?D?????t???l
y??6?(??
?Ut??,=n?!?`K*??-qw?c???f????????~Y0T????&???z?5??=???$?????
9s]Ae????OT?S?8??$??v!???!??#I?B??g
}>???d-p.T????BY?Zi0~?NH??#I??L??([??H0?l?V??Rc??2G,v?2????L|???7>b!i]??.?Q?`
Y#????!??b?$K??@5;k??Y???RV???]Q1}????!?`
`<k????/???2|Ui?RG?xk??
??&?????	e??&?
??h?H?B? '?PZ??????[=j?B`{
??t'?h??2qz??U?Y?O?????u??(??3??u\?&?r??&?????3?I-?`???Y6?4??CI2d????0h?'p?}??@0?p	;?3"t??x???u????%???a=??Sa?????|:??t{???:XFke?6HD?|?9
?B'????2/Tx??<? ^??>??Fda?@q3&?	????D?c??p2
?"!??v?L??*eQt?{-?b?B+??<?
?GH?????m??E	?JE?YB?!?TiM?V??A????5?-b	?g?!]?/$???K??fFC&(???????
33v??T?2lt~@??{???S?=??D??????d?PF??WH4=Nd????Od s????)?QI?'????D{us?v?H?j??n}R]?v???!?3??Z??B?uI?x??C???????o???Z??w?????????>3?z?????&???Bt??$/KT>ls???	y???h??H? ?*E$
|?9HMU?1?
??|>R?H??)???S'????F0??
4??%????w???P???n??i???????*?DDE?QE?2???|????Hi)?;?m_????Z{x?t%L!?)???
?Wcp???d???:????~?M)?:b?Z??.???I????a?\?????8B?$???.
z
D??V ??)?E^b?,?? ??.?	????N?i8?1T?
#%?#?????96??'Yl????6??(?F??9?????BE"M?L????J?????E???4??GwW]??0Nb?I$]?`??s????ES??,??0?(??$???????m???Q?????F??S??Q?`??VfZ~??v<0?S???!d?Y`j??"?
J?
?1$ll??2-?!??a??h2	28 th???x`V??f,!???'????b
aP???DED50EKQ$S
??5
??????hS?????%*d
a"???PF`?H??&?L?&3?$???K|bj
Y???5???B?8??8??!????7??JQn?zN[#me??Yd@???i?bf???\?7B4??pmX?????SFT??m:f?)????`x?!????dE)$N??1?@??h??X	)!?-???????>?nZ??<???]B??q?p??YX?S?8?8???ba?d????E<@w???v?f??U?A?"h?\??7?9?Q?
??a???.???]%?<b!@?R,E>?W??
?My%? qv?????h???B`;??zxO5fe????????KPV?mPP?5R?%??G??????gL???{???f??F??U?;;?G??&??????D"@8?
?n6?D!B8?
????m?a
5\c?d"??c?????
41?(??r??jk??I????W???CX&????
Of????I
0#"?0?b??bl?B-M
?q??J'
U?d-?i??~?6?-:?????!???i??}Jl?%%/r~?5???m???3?#?'???A?0?,?0?3???d?#??+?sj1??Q*H???FC?mwB?BE????
?X?z?C??MD?	?2x???+??

???y???>??F?/??r(iE@??L\P|s?2??0?\?%G(?rG

TH|??jK????v=[???f???)?x??
?e?>$??O|?"gB?5?l??=_??D?(*"??0(?82???@I?U?wQPD?
???i????o?d?8???&?????5?X!?
\??CD??8?DU`??,%ld?q????6?b8j'?|%?>
??X??Pu?,?
??EUN??h#	?Q?*???J?NFd`??4:???????RB*?	???????:t?4H?J H??G_?%??!(
J?Lb
L?"??'*,?rR$%??%O??Cc9jU???4d??k??? `o]?????O x?|{?6 at t?"??8??d????????$?{?yG@OI??y????T??Y215f`>???j8?????!??0????)????????m?;!]3)?????hChll)cFQ
???V???h{@???_3D?Z????p???3???A<qE?\?v.??pkUW??t???3??4??+??!?}??Y?????a???k??????q?KC??Km2	?@??P?)??????S?w<??=????km?|.t????,[xi????J	???n???3q???????]_w	??Tw!h|???]7H???3*^q?]???JfK??k?9ZEO/
??p???\W?c?/Z??_?UT<qi?~}?^l?Yq??
??????6???|????]>?????-Ox??&TwUg;????D??7??????0\?>#Z~?'l???<#M????s????^2??7??t?`xq????F	?+z???
??^?u5@??wq?7h?u???	mRo???????8??_h{??IIV;???)h??lF8u9?F,??[?	?R??C5]?B2??#.Tk?^Li??%e?D?6VZ"??"m4??GUEE2Q??T???wm:????????P??rgt???g3G?C??ND???????i????K??+?M'?N???r.??R?0?L3
	???T0I*?&x????????k?\&??t?43F??&??-?b???????gyHjG??L2?qY|?;?????a??I!{s??????[????t???~???
???????}?zZ9??Cy???5#???	.?Z?<Y?ixk[Q3/?}'P??I?y??S|0????ZR??9??%??9????fl??^??d?kL??X?? u^?x????Cu?q??'??????$
?????=>p?>}1h-?b?>??z??x?wD`o<9eI%,r??L?APJv?fo,??]?qX?????
?sj?3GB???F????	???/H?
 |Htg,?Hp??{&?tM??lB?W#???\;6@!?-???QpS??7I"8?z?A
???(6?3"@??B?=???<O???D??'3???Q?OA?*-????<}?x????z?Y????z?.??;??>?9Zh5?m?A-H???????b`V??=?n????k???m???3#??$?5????1?|"??|?9.?c??e???L?h?:?fdQ????4?k#?l?P?"s/H????????wf??\??EX??t;???PR8???=????h?o??????=
??m?????F?k<????I|?y????w???
B)??????s!=

bG.???}?R????V>/}???-8T;E????M?????!?r?Jv?=??B?r??g?t??g?V??i???{?????????k?????C??p???NE?!6y?C;????f?Seo>,???\?(O[N^!???????H1??? \]?=
s>???2?6???2?)?3EUh	??,q1???{~E2???,0-??]??J?9?r?????????Z,'Uq??n??H?v6v?DD??r?(??xQ?m?>d??8}??=?Ml?TP2F??Cez?Z??U??????&??8qQ&M?9IwuDN??f?s??z]
A?I$HjN??
?N	?,?
B?9?%?"r?dQ?U9/????G3Y??P?????H???7?Ly!?M????d?s??dj
?V?1X??n*????????;??)????p????T?LM
?dC????F?????m$3???:q?Mj??2?x?&X???nb????5?J'??????UEDPi?^???????Bk5c.?`?S?A ????d4Oh#?Y????=:???????s?,"]???????|?003?q???a????|:o?????"9??jx{t??tkmr?OC?J?[G
??i?]8?@????C)?|?????K?r?A???N????@?????M?04????t???]??
d?v0????P5
??
????7,UkH????~???4bz?2?GZ??E??Mg-"'??1??????S?U}?lwz2?GRx?? ?x?61????m\_???]TT_\???H	)?M???3???:]??oN??/???????????$??r
s?????	?R)??y????1?~3?^?Cy?{x?S<??	?;?l??LD??mA???g???5}???p?3??????/ncs!$?{??????i??
uc????{?
?Y?-? 0N??O?b4'?A??+???!???~?????????
?????dP?)+&?tw?r??????n7???!????2???m???5?=8?z?/?"??f,I???_?2?=(h??0?5Y??`X?O?$\???`1??C?7??@????f?j??SP??>?'y{???d??????g~If!?
A??D??c?Q?#?Vd??A?v???????x????QH3???$???Ht????N|?????*?s~??cXnAD??p???m30?6???k?WX??V?f*??-4Y?mB5&?????F]??G???I???7?'-!?I?bh??)????y?4aVF?f.?F?:p?3?????????c9Z??????Z!??zn2???H??@b??j$p???6X????`??(???8	?C??T@???O??????0????Pa]???jv?I??'??$?hxi????????
b??
??????K???????//4???????I?\??0r?h???b&??V?R?H%???%	E?E?P??M?e{H?(j?????'?<@Q?1??Fj?Zs??Y$???u
??K??|??>?(9?=\V?d?????#
??D?l??Ph?/?}??(??f??3z?^?$
?????#;???w?Jq;??.`?k}?Xy?j???>??"?????W?<???q??X?LtW^|??c???S?{?30???Ndwv?"??????????GJiI???&z????`JE?????
S????W;
?????^?qn-R??@y^;?=???	?c???`.??3*2 at J???XB???U7fn:??P?A\??(????F0-??`??
??
???,$?1f|???? r??J???Q??h??*???",?)?^?"&???c]???qy??,??H???K?Oy?J?
??K?n?,???}???oAL+?[?[gx
???C#?e?Y???ce?	^3????????/sq\=S??????9F$?)??/\????Y???+#(?S4???
???l???d(?vT???juw???b?f/{Z!?zD???f?]g??3?kV??Z??s??}?
Tq?{?t??x?aK7)?%????q]??d?+]5?c????;??u?U?7FK?^???'.?kS??vr?@?,?u
<?+?o@??p{?M?V6?"K&4?Smz????,?omo????K??62?-??;0?"7???????M???????????????K??&'?s???.\ut?1??Y?w?w???;???Y&?G?6????stqNe???'F???j??61???I5$3^???1{^?|<$?W{??-???'??/?c??F???e?Co??9?|?U)?LF?7??????????r?$C]<5?*@?D?????cE?7?I%D?I?`|?fs;??B??B???9?
W{x??;??q?FS??.???Gc??=q???w?Y?p?F??"???????????	E?????Y???e???Vww???vFl3-T?)?????
????????!?|
.?#??I?,0?k??jO???j???,?iz<)?$?????'R?,J=P?1?qh,???nk??z!?K?cN/e???4??????s?if??E?W/???g$Z?jtz8U???4???P??.:r??C??j??????	y??1??b?4??????????03??G?&???????k????]???????Gl;?	?l`?TM???9
?Q?h?6?8c08;?I?NM0?s7?b????)X?e70W&mX??FL?,g>??d?0?%n?r?x?E?i0??S?kM7R??G??q.?;
Z?`???9n?.?hi????o???????4???PWK?
??k%*fig`????4?a?y??u?I< vL?,<?
??-?n??k????fpK??!?k?-???fGI?;9?????w?x?????=?????q?%??
	""p?V??????????@???o????b?&?lBe???
J
?R?@?B???t???f*^$?4?
 <:E?b???C??Hr??ho?"
?"?v&????A?H??K?&<?/?=??????"??o5|??G??1??-m????Y`H????????O??T??f?9j4B{???CM$???????p???g
E?Ygb??3:}?????*?b-7a?g????h?lF??????1i????/$??h??j6??3?1#v???}A???<@PA0???????s?Kxez	???1?k?9sd\?|???L?????8D?$???Jt??4??vb`
I??pN??]?R"
a9z???
O?M%??j2???D?P?"A?P??#!
('???W?H|?
B??\?_q????@$@?}?$J z?S$5*}??

E
J;%?HnT?_????"?Jh? 
??889????5?#?a8?]???-k?O??P?a??N??a?M;?XqM(?8TT?
?@?>??1?????CC?]?lH?OVhaQ@|?``K?Io?^??2?????&n??",a?,????8{=7??j?x??
1#?A?-??
??mt?c?R?????RX?,PccY^J?V1?71????2JMXI?T??????Z?Q&??J?8???<?-?s?F?\

H??s???;?????`?????842p?R??"h?
????d????)bS?
?QDt???????CM
?*c ?%$V$J$R?(?????}
?p??`XA??,T????ab%??*?!QS-??PZ?{2???/?sD;???xb?????????SRM???Q?@>\????{??1?????TP??=??zS?h??;?$?%PQ=???R}(???*?=4???I?rhkAb??*p@?nG???
0i????B1&? ?
??.t?la-??p?S~8??B?	\*?G???S???K?????*?+=Y?&wKg.'13p???$7w)?PG?_63???\_?1????y??%a?E???????6 "g%V??Q??X"y??$??`f???C/2??T?!LJb?I??l?3i??9?0??]7????>?`'???j??v??'?tM??K?=??qLc?o??p3'&?b?,AN??w?
???6?????a*U%????L8???+???a???0?!b?':?w?ZU
`?????m??j?B?w????$?2]H??s?\SlN%??????Ml?????r?????wQV?? ??d??
?????
??????8??<M?
n??,B'?8?^?w???&
?j??y???"????"??X?`('yR??x??&:L??f?~?D)?Q????+ at wH????????:????9d????0?,?8?6E??R!????A???C2
??=???@l??
:????Ap?P(?|{35?Q	?1Z?NN??#U3z??????
??P?`??Kz(j?
JF??$??&?|a????#XdD??NIIzo??????O?/??
??R?9?
X?Ne?IKdNFc?F?#?*?X??$?@aS?$??z??zfs????"??P??8??_??$C???N???x?xCEL?s??????*(?"I??BB?y??T;??%?????????????lH??????B?3*F??O?HI??G?n?????f<?[
`??S???E2??U(?mH
??S??}?Zu?'??FIS?????_a??NO?*?????~x??{?????`??0?`d,??7Id@??!???
???=Y??5??)%11S???3 ?
5??fY??d?M?N??????0Xc?W?CPM%T???b???I?RUYpdq?Cd
??I?0,??Z4?????*???:?h???
F.T?IstX???j[?=Q?`v?gZ??h?5?M14??0i?K?5???%????.@??ka?|??QkUE??\?@???$t*A??,?
????
??????hPN??4?????7?b????
????? ??????2????b? "9???J?t`?;?Hu??6??@H?i??"@b?1?JhOn????cA=Wl]L???(?
S9?|}????F&9??l??h?J??#uK?gM?V?]?u
???(u?As??Wu??.?H'TA?'Hp?^e'?'X8d)?A?G?h??5K"???y????~G??Y 3W%T<???J?G\\????]??MZ??????\2??Y?=rq?b??N`<??T@`HB??2??D???X~?3?????*B ?)>Ff~K$3Fx?d9?1x??Ai:d???:?????M!???`??4?????(KXO???z?V??0???%?~?j_?$?Q
????F???Yda	?!Ai?Z?Fq?x????
SZ????K?wthI`YM?i?zD??(q???E<??jAO?'7????)?d?*Txd??*h`?v`w???k?o??????P12?' ??4??&B
??????3????S?L?CF?P??-2I(??N'.???D?2???L?#458?ba]a???u??????:??}(????;?v~??tR???R?H?:?N????????ut?Q-???!bM??Xf+??PE??Bak???2Be
??R????????????????'k
??;??X?$j?S?`b?)q????-E?8}??Ti??V*????Y?(?[?GA.?p?[?I???)??????g!0?"?"A?sT	
/E?1d?3??????w$S?	n	P



From fedora-extras-commits at redhat.com  Wed Oct 18 11:45:59 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 04:45:59 -0700
Subject: rpms/kbibtex/FC-5 kbibtex-0.1.5.tar.bz2,1.1,NONE
Message-ID: <200610181145.k9IBjxGV006519@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6514

Removed Files:
	kbibtex-0.1.5.tar.bz2 
Log Message:
removed source




--- kbibtex-0.1.5.tar.bz2 DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 18 11:52:05 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 04:52:05 -0700
Subject: rpms/kbibtex/FC-5 .cvsignore, 1.3, 1.4 kbibtex.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200610181152.k9IBq5nl006572@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6550

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to version 1.5.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Apr 2006 17:43:17 -0000	1.3
+++ .cvsignore	18 Oct 2006 11:51:35 -0000	1.4
@@ -1 +1 @@
-kbibtex-0.1.4.tar.bz2
+kbibtex-0.1.5.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kbibtex.spec	27 Apr 2006 17:43:17 -0000	1.4
+++ kbibtex.spec	18 Oct 2006 11:51:35 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		kbibtex
-Version:	0.1.4
+Version:	0.1.5
 Release:	1%{?dist}
 Summary:	A BibTeX editor for KDE  
 
@@ -114,6 +114,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
+- Update to 1.5.0
+
 * Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
 - Update to the version 0.1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Apr 2006 17:43:17 -0000	1.3
+++ sources	18 Oct 2006 11:51:35 -0000	1.4
@@ -1 +1 @@
-8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2
+83a8c1cade06837431b6ebe79d13ef7b  kbibtex-0.1.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 11:55:39 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 04:55:39 -0700
Subject: rpms/kbibtex/FC-4 .cvsignore, 1.3, 1.4 kbibtex.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610181155.k9IBtdBT006647@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6627

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to 0.1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Apr 2006 18:48:54 -0000	1.3
+++ .cvsignore	18 Oct 2006 11:55:09 -0000	1.4
@@ -1 +1 @@
-kbibtex-0.1.4.tar.bz2
+kbibtex-0.1.5.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/kbibtex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kbibtex.spec	27 Apr 2006 18:48:54 -0000	1.2
+++ kbibtex.spec	18 Oct 2006 11:55:09 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		kbibtex
-Version:	0.1.4
+Version:	0.1.5
 Release:	1%{?dist}
 Summary:	A BibTeX editor for KDE  
 
@@ -114,6 +114,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Wed Oct 16 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
+- Update to 0.1.5
+
 * Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
 - Update to the version 0.1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Apr 2006 18:48:54 -0000	1.3
+++ sources	18 Oct 2006 11:55:09 -0000	1.4
@@ -1 +1 @@
-8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2
+83a8c1cade06837431b6ebe79d13ef7b  kbibtex-0.1.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 12:05:50 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 05:05:50 -0700
Subject: rpms/kbibtex/devel .cvsignore, 1.3, 1.4 kbibtex.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200610181205.k9IC5o9w009619@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9599

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to 0.1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Apr 2006 18:53:10 -0000	1.3
+++ .cvsignore	18 Oct 2006 12:05:17 -0000	1.4
@@ -1 +1 @@
-kbibtex-0.1.4.tar.bz2
+kbibtex-0.1.5.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kbibtex.spec	15 Sep 2006 07:04:54 -0000	1.5
+++ kbibtex.spec	18 Oct 2006 12:05:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		kbibtex
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	0.1.5
+Release:	1%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
@@ -114,6 +114,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
+- Update to 0.1.5
+
 * Fri Sep 15 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-2
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Apr 2006 18:53:10 -0000	1.3
+++ sources	18 Oct 2006 12:05:17 -0000	1.4
@@ -1 +1 @@
-8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2
+83a8c1cade06837431b6ebe79d13ef7b  kbibtex-0.1.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 13:23:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Oct 2006 06:23:20 -0700
Subject: rpms/wine/FC-5 .cvsignore, 1.23, 1.24 sources, 1.24, 1.25 wine.spec,
	1.36, 1.37
Message-ID: <200610181323.k9IDNKBA013076@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13039/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	3 Oct 2006 09:06:26 -0000	1.23
+++ .cvsignore	18 Oct 2006 13:22:50 -0000	1.24
@@ -1 +1 @@
-wine-0.9.22-fe.tar.bz2
+wine-0.9.23-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Oct 2006 09:06:26 -0000	1.24
+++ sources	18 Oct 2006 13:22:50 -0000	1.25
@@ -1 +1 @@
-955338998d9fe4e0546212b97adbacd2  wine-0.9.22-fe.tar.bz2
+6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wine.spec	3 Oct 2006 09:06:26 -0000	1.36
+++ wine.spec	18 Oct 2006 13:22:50 -0000	1.37
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.22
+Version:	0.9.23
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.22-fe.tar.bz2
+Source0:        wine-0.9.23-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -458,6 +458,7 @@
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
@@ -507,6 +508,7 @@
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/resutils.dll.so
 %{_libdir}/wine/riched20.dll.so
 %{_libdir}/wine/riched32.dll.so
 %{_libdir}/wine/rpcrt4.dll.so
@@ -688,6 +690,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.22-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct 18 13:23:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Oct 2006 06:23:21 -0700
Subject: rpms/wine/devel .cvsignore, 1.23, 1.24 sources, 1.24, 1.25 wine.spec,
	1.36, 1.37
Message-ID: <200610181323.k9IDNLWO013081@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13039/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	3 Oct 2006 09:06:27 -0000	1.23
+++ .cvsignore	18 Oct 2006 13:22:51 -0000	1.24
@@ -1 +1 @@
-wine-0.9.22-fe.tar.bz2
+wine-0.9.23-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Oct 2006 09:06:27 -0000	1.24
+++ sources	18 Oct 2006 13:22:51 -0000	1.25
@@ -1 +1 @@
-955338998d9fe4e0546212b97adbacd2  wine-0.9.22-fe.tar.bz2
+6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wine.spec	3 Oct 2006 09:06:27 -0000	1.36
+++ wine.spec	18 Oct 2006 13:22:51 -0000	1.37
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.22
+Version:	0.9.23
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.22-fe.tar.bz2
+Source0:        wine-0.9.23-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -458,6 +458,7 @@
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
@@ -507,6 +508,7 @@
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/resutils.dll.so
 %{_libdir}/wine/riched20.dll.so
 %{_libdir}/wine/riched32.dll.so
 %{_libdir}/wine/rpcrt4.dll.so
@@ -688,6 +690,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.22-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct 18 13:24:35 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Oct 2006 06:24:35 -0700
Subject: status-report-scripts parseBZbugList,1.51,1.52
Message-ID: <200610181324.k9IDOZn7013115@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13097

Modified Files:
	parseBZbugList 
Log Message:
Do away with the bzId_pkg.txt stuff.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- parseBZbugList	27 Sep 2006 23:21:04 -0000	1.51
+++ parseBZbugList	18 Oct 2006 13:24:32 -0000	1.52
@@ -18,9 +18,6 @@
 #     http://mirrors.kernel.org/fedora/core/development/SRPMS/)
 #   * the URL of packages available in the FC release repo (defaults to
 #     http://mirrors.kernel.org/fedora/core/5/source/SRPMS/)
-#   * the URL to a short list linking BZ ticket numbers with package names,
-#     used when the script can't deduce the package name automatically from
-#     the summary. (defaults to bzId_pkg.txt)
 #   * the owners.list file
 #   * the URL to a wiki page containing the list of migrated/retired packages
 #     (defaults to Extras/PackagesNoLongerInDevel)
@@ -53,14 +50,12 @@
   "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&version=4&version=5&version=devel&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED&bug_severity=security&bug_severity=high&bug_severity=normal&bug_severity=low&bug_severity=translation&bug_severity=regression&chfieldto=Now&negate0=1&field0-0-0=component&type0-0-0=equals&value0-0-0=Package%20Review&ctype=csv";
 
 my %opt;
-my @options = ( "help", "repourl=s", "bzid=s", "o=s", "d=s", "cvs=s",
+my @options = ( "help", "repourl=s", "o=s", "d=s", "cvs=s",
 		"comps=s", "currel=i", "firstrel=i" );
 
 $main::repourl = "http://mirrors.kernel.org/fedora";
 $main::discarded
   = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
-$main::bzid
-  = "http://fedoraproject.org/wiki/Extras/UsefulScripts?action=AttachFile&do=get&target=bzId_pkg.txt";
 $main::members
   = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
 $main::cvsDir = "/export/scratch/extras";
@@ -72,7 +67,6 @@
 # Override any default settings with arguments that the user has supplied
 $main::repourl = $opt{"repourl"} if defined $opt{"repourl"};
 $main::discarded = $opt{"d"} if defined $opt{"d"};
-$main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
 $main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
 $main::compsDir = $opt{"comps"} if defined $opt{"comps"};
 $main::currel = $opt{"currel"} if defined $opt{"currel"};
@@ -102,7 +96,6 @@
 my @CORE_DROPPED_SRPMS;
 my @COMPS;
 my @COMPS_M;
-my %NAME;
 my %OWN;
 my %OWN_DUP;
 my %OWN_CVS_RECENT;
@@ -133,17 +126,6 @@
   "php-pecl-sqlite" => 1,
   "wxPythonGTK2" => 1
 );
-if ($main::bzid ne "") {
-  local *IN;
-  open IN, "wget -nv -O - \"$main::bzid\"|"
-    or die "Failed to wget $main::bzid : $!";
-  while ( <IN> ) {
-    s/\s+$//;
-    my @F = split /\t/;
-    $NAME{$F[0]} = $F[1];
-  }
-  close IN;
-}
 if ($main::members ne "") {
   local *IN;
   open IN, "wget -nv -O - --no-check-certificate \"$main::members\"|"
@@ -346,9 +328,7 @@
     $F[11] = $F[10];
     $F[11] =~ s/^["]+//;
     $F[11] =~ s/["]+$//;
-    if (defined $NAME{$F[0]}) {
-      $F[10] = $NAME{$F[0]};
-    } elsif ($F[8] eq "Package Review") {
+    if ($F[8] eq "Package Review") {
       # Try to guess package name
       $F[10] =~ s/["]//g;
       $F[10] =~ s/^.*review\s+request:?\s+<?//i;
@@ -1021,8 +1001,6 @@
   print STDERR "Usage: $0 [options] <bugs list>
  where options are:
   -help           this help note
-  -bzid <url>     list associating bz ticket number with package name
-                  [$main::bzid]
   -comps <dir>    extras comps directory [$main::compsDir]
   -currel <int>   current Fedora release number [$main::currel]
   -cvs <dir>      extras CVS directory [$main::cvsDir]



From fedora-extras-commits at redhat.com  Wed Oct 18 13:51:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Oct 2006 06:51:12 -0700
Subject: status-report-scripts parseBZbugList,1.52,1.53
Message-ID: <200610181351.k9IDpCAj013317@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13299

Modified Files:
	parseBZbugList 
Log Message:
Stop using PackagesNoLongerInDevel.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- parseBZbugList	18 Oct 2006 13:24:32 -0000	1.52
+++ parseBZbugList	18 Oct 2006 13:51:10 -0000	1.53
@@ -19,8 +19,6 @@
 #   * the URL of packages available in the FC release repo (defaults to
 #     http://mirrors.kernel.org/fedora/core/5/source/SRPMS/)
 #   * the owners.list file
-#   * the URL to a wiki page containing the list of migrated/retired packages
-#     (defaults to Extras/PackagesNoLongerInDevel)
 #   * a full CVS checkout of Fedora Extras packages
 
 
@@ -54,8 +52,6 @@
 		"comps=s", "currel=i", "firstrel=i" );
 
 $main::repourl = "http://mirrors.kernel.org/fedora";
-$main::discarded
-  = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
 $main::members
   = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
 $main::cvsDir = "/export/scratch/extras";
@@ -66,7 +62,6 @@
 
 # Override any default settings with arguments that the user has supplied
 $main::repourl = $opt{"repourl"} if defined $opt{"repourl"};
-$main::discarded = $opt{"d"} if defined $opt{"d"};
 $main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
 $main::compsDir = $opt{"comps"} if defined $opt{"comps"};
 $main::currel = $opt{"currel"} if defined $opt{"currel"};
@@ -101,7 +96,6 @@
 my %OWN_CVS_RECENT;
 my %MEMBER;
 my %CVS_NO_OWNER;
-my %FC_INTEGRATED;
 my %PKG_LIST;
 my %BUG_LIST;
 my %MAINT_LIST;
@@ -137,27 +131,6 @@
   }
   close IN;
 }
-if ($main::discarded ne "") {
-  local *IN;
-  open IN, "wget -nv -O - \"$main::discarded\"|"
-    or die "Failed to wget $main::discarded : $!";
-  while ( <IN> ) {
-    last if /^<p>These FE packages became integrated into a FC package/;
-  }
-  while ( <IN> ) {
-    last if /^<pre>/;
-  }
-  while ( <IN> ) {
-    last if /^<\/pre>/;
-    s/[\r\n]+$//;
-    s/\s.*$//;
-    $FC_INTEGRATED{$_} = 1;
-  }
-  while ( <IN> ) {
-    # Read the rest to avoid a broken pipe...
-  }
-  close IN;
-}
 if (defined $opt{"o"}) {
   local *IN;
   my $prev;
@@ -195,9 +168,6 @@
 foreach my $k (keys %CORE_D) {
   $SRPMS{$k} = 1;
 }
-foreach my $k (keys %FC_INTEGRATED) {
-  $SRPMS{$k} = 1;
-}
 # Check comps files
 for my $i ($main::currel .. ($main::currel + 1)) {
   print STDERR "Looking for $main::compsDir/comps-fe$i.xml.in\n";
@@ -508,7 +478,7 @@
       $$s[2] = 1 if defined $OWN_CVS_RECENT{$k};
     }
     unless (defined $EXTRAS_D{$k}) {
-      if (defined($CORE_D{$k}) || defined($FC_INTEGRATED{$k})) {
+      if (defined($CORE_D{$k})) {
 	push @NPC, $k;
 	next;
       }
@@ -1004,8 +974,6 @@
   -comps <dir>    extras comps directory [$main::compsDir]
   -currel <int>   current Fedora release number [$main::currel]
   -cvs <dir>      extras CVS directory [$main::cvsDir]
-  -d <url>        list of migrated/discarded packages
-                  [$main::discarded]
   -firstrel <int> first Fedora release number [$main::firstrel]
   -o <file>       owners.list file
   -repourl <url>  Fedora core and extras SRPMS development repo base



From fedora-extras-commits at redhat.com  Wed Oct 18 14:07:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 18 Oct 2006 07:07:38 -0700
Subject: rpms/libassuan/devel libassuan-0.9.3-m4-2.patch, NONE,
	1.1 libassuan.spec, 1.19, 1.20
Message-ID: <200610181407.k9IE7cPf016335@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16316

Modified Files:
	libassuan.spec 
Added Files:
	libassuan-0.9.3-m4-2.patch 
Log Message:
* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-2
- another libassuan.m4 patch


libassuan-0.9.3-m4-2.patch:

--- NEW FILE libassuan-0.9.3-m4-2.patch ---
--- src/libassuan.m4~	2006-10-14 23:36:40.000000000 +0300
+++ src/libassuan.m4	2006-10-14 23:38:07.000000000 +0300
@@ -120,7 +120,7 @@
 
 dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION,
 dnl                      [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGSand LIBASSUAN_PTH_LIBS
+dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS
 dnl
 AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
 [ _AM_PATH_LIBASSUAN_COMMON($1,pth)
@@ -144,7 +144,7 @@
 dnl                           and LIBASSUAN_PTHREAD_LIBS
 dnl
 AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
-[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
+[ _AM_PATH_LIBASSUAN_COMMON($1,pthread)
   if test $ok = yes; then
     LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
     LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libassuan.spec	10 Oct 2006 18:37:19 -0000	1.19
+++ libassuan.spec	18 Oct 2006 14:07:08 -0000	1.20
@@ -2,7 +2,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
 Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: libassuan-0.9.3-m4.patch
+Patch2: libassuan-0.9.3-m4-2.patch
 
 BuildRequires: pth-devel
 
@@ -37,6 +38,7 @@
 %setup -q
 
 %patch1 -p1 -b .m4patch
+%patch2 -p0 -b .m4patch-2
 
 
 %build
@@ -56,6 +58,7 @@
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+
 %check || :
 make check
 
@@ -84,6 +87,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-2
+- another libassuan.m4 patch
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-1
 - 0.9.3
 - BR: pth-devel, -devel: Requires: pth-devel



From fedora-extras-commits at redhat.com  Wed Oct 18 14:41:52 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:41:52 -0700
Subject: rpms/luma - New directory
Message-ID: <200610181441.k9IEfq5i016600@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16596/luma

Log Message:
Directory /cvs/extras/rpms/luma added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 14:41:58 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:41:58 -0700
Subject: rpms/luma/devel - New directory
Message-ID: <200610181441.k9IEfwvm016614@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16596/luma/devel

Log Message:
Directory /cvs/extras/rpms/luma/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 14:42:15 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:42:15 -0700
Subject: rpms/luma Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610181442.k9IEgFXR016683@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16677

Added Files:
	Makefile import.log 
Log Message:
Setup of module luma


--- NEW FILE Makefile ---
# Top level Makefile for module luma
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 14:42:20 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:42:20 -0700
Subject: rpms/luma/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610181442.k9IEgKUm016699@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16677/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module luma


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 14:42:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Oct 2006 07:42:55 -0700
Subject: owners owners.list,1.1845,1.1846
Message-ID: <200610181442.k9IEgtld016758@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16712

Modified Files:
	owners.list 
Log Message:
Fix sorting.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1845
retrieving revision 1.1846
diff -u -r1.1845 -r1.1846
--- owners.list	18 Oct 2006 01:41:49 -0000	1.1845
+++ owners.list	18 Oct 2006 14:42:25 -0000	1.1846
@@ -645,8 +645,8 @@
 Fedora Extras|gxemul|Instruction-level machine emulator|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|hackedbox|The bastard son of Blackbox, a small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|haddock|Documentation tool for annotated Haskell source code|petersen at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
+Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -839,12 +839,12 @@
 Fedora Extras|libbinio|A binary stream interface class library for C++|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libburn|Library for reading, mastering and writing optical discs|jkeating at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|libctl|Guile-based support for flexible control files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|libchmxx|C++ bindings for chmlib|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libconfuse|A configuration file parser library|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|libctl|Guile-based support for flexible control files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|libdap|The C++ DAP2 library from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
@@ -1388,8 +1388,8 @@
 Fedora Extras|perl-File-Find-Rule-PPI|Add support for PPI queries to File::Find::Rule|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-HomeDir|Get the home directory for yourself or other users|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-File-MMagic-XS|Guess file type with XS|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-MimeInfo|Determine file type and open application|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-MMagic-XS|Guess file type with XS|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NFSLock|Perl module to do NFS (or not) locking|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-ReadBackwards|File::ReadBackwards Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Oct 18 14:43:33 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:43:33 -0700
Subject: rpms/luma import.log,1.1,1.2
Message-ID: <200610181443.k9IEhXjA016815@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16773

Modified Files:
	import.log 
Log Message:
auto-import luma-2.3-8 on branch devel from luma-2.3-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/luma/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 14:42:15 -0000	1.1
+++ import.log	18 Oct 2006 14:43:03 -0000	1.2
@@ -0,0 +1 @@
+luma-2_3-8:HEAD:luma-2.3-8.src.rpm:1161182578



From fedora-extras-commits at redhat.com  Wed Oct 18 14:43:34 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:43:34 -0700
Subject: rpms/luma/devel luma-2.3-plugins.patch, NONE, 1.1 luma.desktop, NONE,
	1.1 luma.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610181443.k9IEhYOe016819@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16773/devel

Modified Files:
	.cvsignore sources 
Added Files:
	luma-2.3-plugins.patch luma.desktop luma.spec 
Log Message:
auto-import luma-2.3-8 on branch devel from luma-2.3-8.src.rpm

luma-2.3-plugins.patch:

--- NEW FILE luma-2.3-plugins.patch ---
--- luma-2.3/lib/luma/base/backend/PluginLoader.py.org	2006-03-14 17:16:25.000000000 +0100
+++ luma-2.3/lib/luma/base/backend/PluginLoader.py	2006-10-15 21:00:40.000000000 +0200
@@ -45,7 +45,7 @@
         self.PLUGINS = {}
         
         # get the base diretory of the plugins as a string
-        self.pluginBaseDir = os.path.join(environment.lumaInstallationPrefix,  "lib", "luma", "plugins")
+        self.pluginBaseDir = os.path.join(environment.lumaInstallationPrefix, "share",  "luma", "lib", "plugins")
         
         self.pluginDirList = []
         self.pluginDirList = self.getPluginList()


--- NEW FILE luma.desktop ---
[Desktop Entry]
Name=Luma
Comment=Tool for managing LDAP servers
Exec=luma
Terminal=false
Icon=luma.png
Type=Application
Encoding=UTF-8


--- NEW FILE luma.spec ---
%define lumadata %{_datadir}/luma
%define lumalib %{lumadata}/lib
%define plugins %{lumalib}/plugins

Name:		luma
Version:	2.3
Release: 	8%{?dist}
Summary:	A graphical tool for managing LDAP servers

Group:		Applications/System
License:	GPL
URL:		http://www.sourceforge.net/projects/luma
Source0:	http://prdowloads.sourceforge.net/luma/luma-%{version}.tar.bz2
Source1:	luma.desktop
Patch1:		luma-2.3-plugins.patch

BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python >= 2.3
BuildRequires:	PyQt >= 3.10
BuildRequires:	python-ldap >= 2.0.0
BuildRequires:	python-smbpasswd
BuildRequires:	desktop-file-utils

Requires:	python >= 2.3
Requires:	PyQt >= 3.10
Requires:	python-ldap >= 2.0.0
Requires:	python-smbpasswd
Requires:	desktop-file-utils

%description
Luma - a graphical tool for accessing and managing LDAP 
servers. It is written in Python, using PyQt and python-ldap. 
Plugin-support is included and useful widgets with LDAP-
functionality for easy creation of plugins are delivered.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 

%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_prefix}
./install.py --prefix=$RPM_BUILD_ROOT%{_prefix}

mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons

pushd ${RPM_BUILD_ROOT}/%{_prefix}/lib
mv luma ${RPM_BUILD_ROOT}/%{_datadir}/luma/lib
popd

pushd ${RPM_BUILD_ROOT}/%{_bindir}
ln -sf ../share/luma/lib/luma.py luma
popd
 
cp share/luma/icons/luma-64.png ${RPM_BUILD_ROOT}/%{_datadir}/icons/

# Desktop entry for luma-settings
desktop-file-install --vendor fedora \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
	--add-category System \
	--add-category Application \
	%{SOURCE1}

for i in 22 32 48 ; do # 16, 64, 128 do not have transparent bg...
  d=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
  install -dm 755 $d
  ln -s ../../../../luma/icons/luma-$i.png $d/luma.png
done

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/luma
%dir %{lumadata}

%{lumalib}/ 

%{lumadata}/doc/
%{lumadata}/icons/

%dir %{lumadata}/i18n/
%lang(br) %{lumadata}/i18n/*br.*
%lang(cs) %{lumadata}/i18n/*cs.*
%lang(de) %{lumadata}/i18n/*de.*
%lang(en) %{lumadata}/i18n/gb.png
%lang(es) %{lumadata}/i18n/*es.*
%lang(fr) %{lumadata}/i18n/*fr.*
%lang(it) %{lumadata}/i18n/*it.*
%lang(no) %{lumadata}/i18n/*no*
%lang(ru) %{lumadata}/i18n/*ru.*
%lang(sv) %{lumadata}/i18n/*sv.*

%{_datadir}/applications/fedora-luma.desktop
%{_datadir}/icons/luma-*.png
%{_datadir}/icons/hicolor/*/apps/*.png

%{_mandir}/man1/luma.1.gz

%doc LICENSE


%changelog
* Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-8
- Fix x64 problem

* Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-7
- Fix plugin loading problem

* Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-6
- Some changes on the desktop file.

* Thu Aug 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-5
- Remove %%ghost becouse new packaging guidelines.

* Wed Aug  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-4
- Move python files to %%{_datadir}/luma/lib

* Wed Jul 26 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-3
- Add Requires
c- Add %%lang before language specific files
- Change versioning schema to upstream

* Tue Jul 25 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3.0-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/luma/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 14:42:20 -0000	1.1
+++ .cvsignore	18 Oct 2006 14:43:04 -0000	1.2
@@ -0,0 +1 @@
+luma-2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/luma/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 14:42:20 -0000	1.1
+++ sources	18 Oct 2006 14:43:04 -0000	1.2
@@ -0,0 +1 @@
+c1f3a8033a047a7046848833445ed496  luma-2.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 14:50:52 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:50:52 -0700
Subject: owners owners.list,1.1846,1.1847
Message-ID: <200610181450.k9IEoqmR016946@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16917

Modified Files:
	owners.list 
Log Message:
Add luma to bugzilla


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1846
retrieving revision 1.1847
diff -u -r1.1846 -r1.1847
--- owners.list	18 Oct 2006 14:42:25 -0000	1.1846
+++ owners.list	18 Oct 2006 14:50:22 -0000	1.1847
@@ -985,6 +985,7 @@
 Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|luma|A graphical tool for managing LDAP servers|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 14:53:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 18 Oct 2006 07:53:03 -0700
Subject: rpms/jasper/FC-3 jasper-1.701.0-GL-ac.patch, NONE,
	1.1 jasper-1.701.0-memory_leak.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 jasper-1.701.0-GL.patch, 1.2, 1.3 jasper.spec, 1.6, 1.7
Message-ID: <200610181453.k9IEr3o9017005@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971

Modified Files:
	.cvsignore jasper-1.701.0-GL.patch jasper.spec 
Added Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-memory_leak.patch 
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
- memory leak (#207006)


jasper-1.701.0-GL-ac.patch:

--- NEW FILE jasper-1.701.0-GL-ac.patch ---
--- jasper-1.701.0.GEO/configure.ac.GL	2006-02-20 19:58:02.000000000 -0600
+++ jasper-1.701.0.GEO/configure.ac	2006-02-24 07:40:38.000000000 -0600
@@ -242,7 +242,7 @@
 OPENGL_LIBS=""
 if test $ENABLE_OPENGL = yes; then
 	if test $HAVE_OPENGL = no; then
-		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
+		TMPLIBS="-lglut"
 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
 	fi

jasper-1.701.0-memory_leak.patch:

--- NEW FILE jasper-1.701.0-memory_leak.patch ---
diff -ur jasper-1.701.0/src/libjasper/base/jas_stream.c jasper-1.701.0-local/src/libjasper/base/jas_stream.c
--- jasper-1.701.0/src/libjasper/base/jas_stream.c	2004-02-09 07:04:40.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/base/jas_stream.c	2005-10-23 02:08:06.145589016 +0530
@@ -361,11 +361,11 @@
 	}
 	obj->fd = -1;
 	obj->flags = 0;
-	obj->pathname[0] = '\0';
+	strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	tmpnam(obj->pathname);
+	mkstemp(obj->pathname);
 
 	/* Open the underlying file. */
 	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
diff -ur jasper-1.701.0/src/libjasper/jpg/jpg_enc.c jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c
--- jasper-1.701.0/src/libjasper/jpg/jpg_enc.c	2004-02-09 07:04:41.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c	2005-10-23 02:09:02.526017888 +0530
@@ -331,6 +331,7 @@
 	rewind(output_file);
 	jpg_copyfiletostream(out, output_file);
 	fclose(output_file);
+	jas_matrix_destroy(src_mgr->data);
 	output_file = 0;
 
 	return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:40:10 -0000	1.2
+++ .cvsignore	18 Oct 2006 14:52:33 -0000	1.3
@@ -1 +1,2 @@
+geojasper_src.zip
 jasper-1.701.0.zip

jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper-1.701.0-GL.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper-1.701.0-GL.patch	31 Jan 2006 18:27:57 -0000	1.2
+++ jasper-1.701.0-GL.patch	18 Oct 2006 14:52:33 -0000	1.3
@@ -1,6 +1,6 @@
---- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
-+++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
-@@ -9465,7 +9465,7 @@
+--- jasper-1.701.0.GEO/configure.GL	2006-02-20 20:01:30.000000000 -0600
++++ jasper-1.701.0.GEO/configure	2006-02-24 07:40:46.000000000 -0600
+@@ -9464,7 +9464,7 @@
  OPENGL_LIBS=""
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jasper.spec	31 Jan 2006 18:27:57 -0000	1.6
+++ jasper.spec	18 Oct 2006 14:52:33 -0000	1.7
@@ -5,25 +5,40 @@
 # koffice
 # 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.701.0
-Release: 9%{?dist}
+Release: 15%{?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
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
+# autoconf/automake bits of patch1
+Patch2: jasper-1.701.0-GL-ac.patch
+# memory leak, see
+# http://gyachi.sourceforge.net/download.shtml
+# http://ayttm.sourceforge.net/files.shtml
+# http://ayttm.sourceforge.net/jasper-memory-leak-1.701.0.patch.gz
+Patch3: jasper-1.701.0-memory_leak.patch
 
+BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -40,12 +55,24 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?geo:.GEO}
 
 %patch1 -p1 -b .GL
+%patch3 -p1 -b .memleak
+
+%if "%{?geo:1}" == "1"
+chmod +x configure configure.ac
+%patch2 -p1 -b .GL-ac
+libtoolize --force
+aclocal
+autoconf
+autoheader
+automake -a
+%endif
 
 
 %build
+
 %configure \
   --enable-shared \
   --disable-static 
@@ -67,24 +94,20 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}*
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-# avoid conflict(s) with tomcat
-# not needed anymore, see bz #176773
-# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
-
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/jiv
 %{_bindir}/imginfo
-%{_bindir}/jasper*
+%{_bindir}/*jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*
-%{_includedir}/*
+%{_includedir}/jasper/
 %{_libdir}/lib*.so
 
 
@@ -98,6 +121,22 @@
 
 
 %changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
+- memory leak (#207006)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-13
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-12
+- fixup build issues introduced by geojasper integration
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-10
+- support/use geojasper (optional, default no)
+- fc5: gcc/glibc respin
+
+* Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
 - workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
   (#179464)



From fedora-extras-commits at redhat.com  Wed Oct 18 14:55:29 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:55:29 -0700
Subject: comps comps-fe5.xml.in,1.171,1.172 comps-fe6.xml.in,1.192,1.193
Message-ID: <200610181455.k9IEtTXJ017117@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17099

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add luma to comps.xml


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- comps-fe5.xml.in	17 Oct 2006 17:52:03 -0000	1.171
+++ comps-fe5.xml.in	18 Oct 2006 14:54:59 -0000	1.172
@@ -11,6 +11,7 @@
       <packagereq type="optional">gparted</packagereq>
       <packagereq type="optional">gsynaptics</packagereq>
       <packagereq type="optional">lat</packagereq>
+      <packagereq type="optional">luma</packagereq>
       <packagereq type="optional">qtparted</packagereq>
       <packagereq type="optional">system-config-control</packagereq>
       <packagereq type="optional">yumex</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- comps-fe6.xml.in	17 Oct 2006 17:32:20 -0000	1.192
+++ comps-fe6.xml.in	18 Oct 2006 14:54:59 -0000	1.193
@@ -11,6 +11,7 @@
       <packagereq type="optional">gparted</packagereq>
       <packagereq type="optional">gsynaptics</packagereq>
       <packagereq type="optional">lat</packagereq>
+      <packagereq type="optional">luma</packagereq>
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
       <packagereq type="optional">yumex</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 15:40:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:40:40 -0700
Subject: rpms/genius - New directory
Message-ID: <200610181540.k9IFeetr020390@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20386/genius

Log Message:
Directory /cvs/extras/rpms/genius added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 15:40:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:40:46 -0700
Subject: rpms/genius/devel - New directory
Message-ID: <200610181540.k9IFek8t020404@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20386/genius/devel

Log Message:
Directory /cvs/extras/rpms/genius/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 15:41:08 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:41:08 -0700
Subject: rpms/genius Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610181541.k9IFf8bW020435@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20429

Added Files:
	Makefile import.log 
Log Message:
Setup of module genius


--- NEW FILE Makefile ---
# Top level Makefile for module genius
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 15:41:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:41:13 -0700
Subject: rpms/genius/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610181541.k9IFfDDx020452@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20429/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module genius


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 15:44:15 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 18 Oct 2006 08:44:15 -0700
Subject: owners owners.list,1.1847,1.1848
Message-ID: <200610181544.k9IFiFuq020550@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481

Modified Files:
	owners.list 
Log Message:
Unorphan perl-Chart, perl-HTML-Template-Expr, perl-Net-SCP, perl-Net-SSH,
perl-String-ShellQuote, and perl-XML-XQL.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1847
retrieving revision 1.1848
diff -u -r1.1847 -r1.1848
--- owners.list	18 Oct 2006 14:50:22 -0000	1.1847
+++ owners.list	18 Oct 2006 15:43:45 -0000	1.1848
@@ -1260,7 +1260,7 @@
 Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-CGI-Untaint-email|Validate an email address|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Chart|Perl modules for producing many types of charts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Chart|Perl modules for producing many types of charts|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1429,7 +1429,7 @@
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-TableExtract|A Perl module for extracting content in HTML tables|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Body|HTTP Body Parser|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1533,10 +1533,10 @@
 Fedora Extras|perl-Net-LibIDN|Perl bindings for GNU LibIDN|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Patricia|Patricia Trie perl module for fast IP address lookups|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-SNMP|Object oriented interface to SNMP|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-SSH|Perl extension for secure shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-SSH-Perl|SSH (Secure Shell) client|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-XMPP|Net::XMPP - perl XMPP library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1623,7 +1623,7 @@
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Format|Sprintf-like string formatting capabilities with arbitrary format definitions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Exporter|Sophisticated exporter for custom-built routines|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Identify|Retrieve names of code references|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Install|Install subroutines into packages easily|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1717,7 +1717,7 @@
 Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-Stream|XML::Stream - streaming XML library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML-Parser-Syck|Perl Wrapper for the YAML Parser Extension: libsyck|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,oliver at linux-kernel.at
 Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 15:44:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:44:30 -0700
Subject: rpms/genius import.log,1.1,1.2
Message-ID: <200610181544.k9IFiU7F020559@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20516

Modified Files:
	import.log 
Log Message:
auto-import genius-0.7.6.1-3 on branch devel from genius-0.7.6.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/genius/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 15:41:07 -0000	1.1
+++ import.log	18 Oct 2006 15:44:00 -0000	1.2
@@ -0,0 +1 @@
+genius-0_7_6_1-3:HEAD:genius-0.7.6.1-3.src.rpm:1161186232



From fedora-extras-commits at redhat.com  Wed Oct 18 15:44:31 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:44:31 -0700
Subject: rpms/genius/devel genius.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610181544.k9IFiVll020563@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20516/devel

Modified Files:
	.cvsignore sources 
Added Files:
	genius.spec 
Log Message:
auto-import genius-0.7.6.1-3 on branch devel from genius-0.7.6.1-3.src.rpm


--- NEW FILE genius.spec ---
Name:           genius
Version:        0.7.6.1
Release:        3%{?dist}
Summary:        An arbitrary precision integer and multiple precision floatingpoint calculator

Group:          Applications/Engineering
License:        GPL
URL:            http://www.jirka.org/genius.html
Source0:        http://ftp.5z.com/pub/genius/genius-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vte-devel
BuildRequires:  readline-devel
BuildRequires:  gmp-devel
BuildRequires:  popt
BuildRequires:  pkgconfig
BuildRequires:  intltool
BuildRequires:  gtksourceview-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  desktop-file-utils
BuildRequires:  scrollkeeper
BuildRequires:  flex
BuildRequires:  gettext


%description
Genius is a calculator program similar in some aspects to BC, Matlab
or Maple. GEL is the name of its extension language, in fact, a large
part of the standard genius functions are written in GEL itself.


%package devel
Summary:        Development files for Genius
Group:          Applications/Engineering
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for Genius.


%package -n gnome-genius
Summary:        GNOME frontend for Genius
Group:          Applications/Engineering
Requires:       %{name} = %{version}-%{release}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description -n gnome-genius
GNOME frontend for Genius.


%prep
%setup -q
sed -i "s|Mime-Type|MimeType|" src/gnome-genius.desktop*
find -name \*.c | xargs chmod 0644


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_libdir}
rm -f $RPM_BUILD_ROOT%{_datadir}/genius/plugins/test.plugin
rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
rm -rf $RPM_BUILD_ROOT%{_datadir}/mime/{subclasses,text,XMLnamespaces,aliases,globs,magic,mime.cache}
rm -rf $RPM_BUILD_ROOT/var
desktop-file-install \
    --vendor fedora \
    --add-category X-Fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/gnome-genius.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/genius
%{_datadir}/genius


%files devel
%defattr(-,root,root,-)
%{_includedir}/genius


%files -n gnome-genius
%defattr(-,root,root,-)
%{_bindir}/gnome-genius
%{_libexecdir}/*
%{_datadir}/omf/genius
%{_datadir}/gnome/help/genius
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/mime/packages/*
%{_datadir}/applications/*


%post -n gnome-genius
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database > /dev/null 2>&1 ||:
scrollkeeper-update -q -o %{_datadir}/omf/genius ||:
gtk-update-icon-cache -qf /usr/share/icons/hicolor &> /dev/null || :


%postun -n gnome-genius
if [ $1 -eq 0 ]; then
  update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
  update-desktop-database > /dev/null 2>&1 ||:
  scrollkeeper-update -q ||:
  gtk-update-icon-cache -qf /usr/share/icons/hicolor &> /dev/null || :
fi


%changelog
* Wed Oct 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.7.6.1-3
- Fixed Req and permissions

* Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.7.6.1-2
- Fixed BR

* Sun Oct 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.7.6.1-1
- first Fedora release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/genius/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 15:41:13 -0000	1.1
+++ .cvsignore	18 Oct 2006 15:44:01 -0000	1.2
@@ -0,0 +1 @@
+genius-0.7.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/genius/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 15:41:13 -0000	1.1
+++ sources	18 Oct 2006 15:44:01 -0000	1.2
@@ -0,0 +1 @@
+5af450d765dfff8465da47d227333c72  genius-0.7.6.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 15:45:03 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 08:45:03 -0700
Subject: rpms/cobbler/devel sources,1.8,1.9
Message-ID: <200610181545.k9IFj3Zu020616@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20558

Modified Files:
	sources 
Log Message:
Not needed, save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Oct 2006 22:15:18 -0000	1.8
+++ sources	18 Oct 2006 15:44:33 -0000	1.9
@@ -1,2 +1 @@
-44f1e470bf40444b32be11393dee8e20  cobbler-0.2.6.tar.gz
 41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 15:48:56 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 08:48:56 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.2, 1.3 cobbler.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610181548.k9IFmuC4020703@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20677

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Adding cobbler for FC-5 as well as FC-6, starting at 0.2.7




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 20:13:11 -0000	1.2
+++ .cvsignore	18 Oct 2006 15:48:26 -0000	1.3
@@ -1 +1,2 @@
 cobbler-0.1.1.tar.gz
+cobbler-0.2.7.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cobbler.spec	27 Sep 2006 20:13:11 -0000	1.1
+++ cobbler.spec	18 Oct 2006 15:48:26 -0000	1.2
@@ -2,18 +2,18 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.1.1
-Release: 8%{?dist}
+Version: 0.2.7
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
 Requires: tftp-server
-Requires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Url: http://et.redhat.com/page/Cobbler_%26_Koan_Provisioning_Tools
+ExcludeArch: ppc
+Url: http://cobbler.et.redhat.com
 
 %description
 
@@ -26,40 +26,84 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %{_bindir}/cobbler
+%dir /etc/cobbler
+/etc/cobbler/*.ks
+/etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
 %{python_sitelib}/cobbler/yaml/*.py*
 %{_mandir}/man1/cobbler.1.gz
+%dir /var/lib/cobbler
+%dir /var/www/cobbler
+/var/lib/cobbler/elilo-3.6-ia64.efi
 
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
-* Thu Sep 21 2006 - 0.1.1-8
-- Added doc files to %doc, removed INSTALLED_FILES code
-* Wed Sep 20 2006 - 0.1.1-7
+
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.7-1
+- Upstream changes (see CHANGELOG), includes removing pexpect as a require
+- This RPM now builds on RHEL4
+
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.6-1
+- Upstream changes (see CHANGELOG), includes removing Cheetah as a require
+
+* Mon Oct 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
+- Upstream features and bugfixes (see CHANGELOG)
+- Packaged additional kickstart file and specfile cleanup
+
+* Thu Oct 12 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.4-1
+- Upstream features and bugfixes (see CHANGELOG)
+
+* Mon Oct 9 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
+- Upstream features (see CHANGELOG) & URL update
+
+* Fri Oct 6 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
+- Upstream bugfixes
+
+* Fri Sep 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.1-2
+- URL update
+
+* Thu Sep 28 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
+- Upstream pull of bugfixes and new remote system "enchant" feature
+
+* Fri Sep 22 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.0-1
+- Lots of new PXE and dhcpd.conf upstream, elilo.efi now included.
+
+* Thu Sep 21 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-8
+- Added doc files to doc, removed INSTALLED_FILES code
+
+* Wed Sep 20 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-7
 - Upstream updates
-* Fri Sep 15 2006 - 0.1.1-6
+
+* Fri Sep 15 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-6
 - Make koan own it's directory, add GPL "COPYING" file.
-* Wed Aug 16 2006 - 0.1.1-5
+
+* Wed Aug 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-5
 - Spec file tweaks only for FC-Extras
-* Thu Jul 20 2006 - 0.1.1-4
+
+* Thu Jul 20 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-4
 - Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module.
-* Wed Jul 12 2006 - 0.1.1-3
+
+* Wed Jul 12 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-3
 - Added templating support using Cheetah
-* Thu Jul 9 2006 - 0.1.0-2
+
+* Thu Jul 9 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.0-2
 - Fedora-Extras rpm spec tweaks
-* Tue Jun 28 2006 - 0.1.0-1
+
+* Tue Jun 28 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.0-1
 - rpm genesis
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Sep 2006 20:13:11 -0000	1.2
+++ sources	18 Oct 2006 15:48:26 -0000	1.3
@@ -1 +1,2 @@
 c48fc1ba04be7372537dc6483dea5de5  cobbler-0.1.1.tar.gz
+41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 15:49:41 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 18 Oct 2006 08:49:41 -0700
Subject: owners owners.list,1.1848,1.1849
Message-ID: <200610181549.k9IFnfdm020727@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20707

Modified Files:
	owners.list 
Log Message:
Add mISDN and OpenPBX


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1848
retrieving revision 1.1849
diff -u -r1.1848 -r1.1849
--- owners.list	18 Oct 2006 15:43:45 -0000	1.1848
+++ owners.list	18 Oct 2006 15:49:11 -0000	1.1849
@@ -1043,6 +1043,7 @@
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mirrormagic|Puzzle game where you steer a beam of light using mirrors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|mISDN|Userspace part of Modular ISDN stack|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mlton|Optimizing compiler for Standard ML|adam at spicenitz.org|extras-qa at fedoraproject.org|
@@ -1178,6 +1179,7 @@
 Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|openpbx|The Truly Open Source PBX|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 15:53:23 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 08:53:23 -0700
Subject: rpms/koan/FC-5 .cvsignore, 1.2, 1.3 koan.spec, 1.4, 1.5 sources, 1.3,
	1.4
Message-ID: <200610181553.k9IFrN5K020804@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20784

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Adding koan to FC-5, starting with koan 0.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 20:15:39 -0000	1.2
+++ .cvsignore	18 Oct 2006 15:52:53 -0000	1.3
@@ -1 +1,2 @@
 koan-0.1.1.tar.gz
+koan-0.2.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/koan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- koan.spec	28 Sep 2006 21:29:17 -0000	1.4
+++ koan.spec	18 Oct 2006 15:52:53 -0000	1.5
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.1.1
-Release: 10%{?dist}
+Version: 0.2.2
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/page/Cobbler_%26_Koan_Provisioning_Tools
+Url: http://et.redhat.com/~mdehaan/cobbler
 
 %description
 
@@ -47,23 +47,38 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
-* Thu Sep 28 2006 - 0.1.1-10
-- Building build rev to keep FC-E happy
-* Thu Sep 28 2006 - 0.1.1-9
+* Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
+- Upstream change -- support Python 2.3
+
+* Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
+- Upstream features (see CHANGELOG)
+
+* Thu Sep 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-10
+- Bumping build rev for FC-E
+
+* Thu Sep 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-9
 - Excluding PPC since syslinux (gethostip) isn't available for ppc
-* Thu Sep 21 2006 - 0.1.1-8
+
+* Thu Sep 21 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-8
 - Added doc files to %doc, removed INSTALLED_FILES code
-* Wed Sep 20 2006 - 0.1.1-7
+
+* Wed Sep 20 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-7
 - Upstream updates
-* Fri Sep 15 2006 - 0.1.1-6
+
+* Fri Sep 15 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-6
 - Make koan own it's directory, add GPL "COPYING" file.
-* Wed Aug 16 2006 - 0.1.1-5
+
+* Wed Aug 16 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-5
 - Spec-file only changes for FC-Extras submission
-* Thu Jul 20 2006 - 0.1.1-4
+
+* Thu Jul 20 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-4
 - Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module.
-* Fri Jul 12 2006 - 0.1.1-3
+
+* Fri Jul 12 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-3
 - allow installing with per-system cobbler data in addition to per-profile
-* Thu Jul 09 2006 - 0.1.0-2
+
+* Thu Jul 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.0-2
 - rpm tweaks for Fedora Extras
-* Wed Jun 28 2006 - 0.1.0-1
+
+* Wed Jun 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.0-1
 - rpm genesis


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 21:26:18 -0000	1.3
+++ sources	18 Oct 2006 15:52:53 -0000	1.4
@@ -1 +1,2 @@
 d1b7df4a1fb022d345d79f3b182d769b  koan-0.1.1.tar.gz
+8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 16:05:29 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 09:05:29 -0700
Subject: owners owners.list,1.1849,1.1850
Message-ID: <200610181605.k9IG5Tph023880@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23864

Modified Files:
	owners.list 
Log Message:
added genius


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1849
retrieving revision 1.1850
diff -u -r1.1849 -r1.1850
--- owners.list	18 Oct 2006 15:49:11 -0000	1.1849
+++ owners.list	18 Oct 2006 16:04:58 -0000	1.1850
@@ -484,6 +484,7 @@
 Fedora Extras|geda-utils|Several utilities for the gEDA project|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|genchemlab|A general chemistry lab simulation|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|genius|An arbitrary precision integer and multiple precision floatingpoint calculator|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gentium-fonts|SIL Gentium fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|GeoIP|C library for country/city/organization to IP address or hostname mapping|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 16:08:23 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 18 Oct 2006 09:08:23 -0700
Subject: rpms/python-basemap/devel .cvsignore, 1.7, 1.8 python-basemap.spec, 
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200610181608.k9IG8NY1024101@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24031

Modified Files:
	.cvsignore python-basemap.spec sources 
Log Message:
Update to upstream 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Sep 2006 19:53:08 -0000	1.7
+++ .cvsignore	18 Oct 2006 16:07:53 -0000	1.8
@@ -1 +1 @@
-basemap-0.9.2.tar.gz
+basemap-0.9.3.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-basemap.spec	7 Sep 2006 19:53:08 -0000	1.9
+++ python-basemap.spec	18 Oct 2006 16:07:53 -0000	1.10
@@ -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-basemap
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Orion Poplawski <orion at cora.nwra.com> 0.9.3-1
+- Update to upstream 0.9.3
+
 * Thu Sep  7 2006 Orion Poplawski <orion at cora.nwra.com> 0.9.2-1
 - Update to upstream 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Sep 2006 19:53:08 -0000	1.7
+++ sources	18 Oct 2006 16:07:53 -0000	1.8
@@ -1 +1 @@
-1b2f7f654c007ca5cd98fcd18b85df61  basemap-0.9.2.tar.gz
+1d02d6230286262a3bb6c11aad3f58ce  basemap-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 16:18:16 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 18 Oct 2006 09:18:16 -0700
Subject: rpms/openpbx/devel .cvsignore, 1.2, 1.3 openpbx.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610181618.k9IGIGu6024297@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24272

Modified Files:
	.cvsignore openpbx.spec sources 
Log Message:
build with mISDN and MySQL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Oct 2006 06:43:10 -0000	1.2
+++ .cvsignore	18 Oct 2006 16:17:46 -0000	1.3
@@ -1 +1 @@
-openpbx-r1979.tar.gz
+openpbx-r1984.tar.gz


Index: openpbx.spec
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/openpbx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openpbx.spec	17 Oct 2006 12:43:14 -0000	1.2
+++ openpbx.spec	18 Oct 2006 16:17:46 -0000	1.3
@@ -1,13 +1,13 @@
-%define snap 1979
+%define snap 1984
 
-%bcond_with misdn
+%bcond_without misdn
 %bcond_without zaptel
 
 %bcond_without	fedora
 
 Name:		openpbx
 Version:	1.2
-Release:	1.rc1.svn%{snap}%{?dist}
+Release:	2.rc1.svn%{snap}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -23,7 +23,7 @@
 BuildRequires:	fedora-usermgmt-devel bluez-libs-devel openldap-devel
 BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
 BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
-BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel
+BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel mysql-devel
 BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN-devel}
 BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel}
 
@@ -60,6 +60,14 @@
 %description postgresql
 This package contains modules for OpenPBX which make use of PostgreSQL.
 
+%package mysql
+Group:		Applications/Internet
+Summary:	MySQL support for OpenPBX
+Requires:	%{name} = %{version}-%{release}
+
+%description mysql
+This package contains modules for OpenPBX which make use of MySQL.
+
 %package odbc
 Group:		Applications/Internet
 Summary:	ODBC support for OpenPBX
@@ -167,7 +175,9 @@
 	   --enable-javascript --with-res_js --enable-fast-install \
 	   %{?with_misdn:--with-chan_misdn} \
 	   %{?with_zaptel:--enable-zaptel} \
-	   --enable-jabber --with-res_jabber # --with-res_sqlite
+	   --enable-jabber --with-res_jabber \
+	   --enable-mysql --with-res_config_mysql --with-cdr_mysql
+	   
 
 # Poxy fscking libtool is _such_ a pile of crap...
 sed -i 's/^CC="gcc"/CC="gcc -Wl,--as-needed"/' libtool
@@ -247,6 +257,7 @@
 %exclude %{_sysconfdir}/openpbx.org/cdr_tds.conf
 # Separately packaged
 %exclude %{_libdir}/openpbx.org/modules/*pgsql.so
+%exclude %{_libdir}/openpbx.org/modules/*mysql.so
 %exclude %{_libdir}/openpbx.org/modules/app_sql_postgres.so
 %exclude %{_libdir}/openpbx.org/modules/app_ldap.so
 %exclude %{_libdir}/openpbx.org/modules/cdr_odbc.so
@@ -257,6 +268,7 @@
 %exclude %{_libdir}/openpbx.org/modules/res_ogi.so
 %exclude %{_libdir}/openpbx.org/modules/chan_capi.so
 %exclude %{_sysconfdir}/openpbx.org/cdr_pgsql.conf
+%exclude %{_sysconfdir}/openpbx.org/*mysql.conf
 %exclude %{_sysconfdir}/openpbx.org/cdr_odbc.conf
 %exclude %{_sysconfdir}/openpbx.org/chan_bluetooth.conf
 %exclude %{_sysconfdir}/openpbx.org/res_jabber.conf
@@ -285,6 +297,10 @@
 %{_libdir}/openpbx.org/modules/app_sql_postgres.so
 %config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_pgsql.conf
 
+%files mysql
+%{_libdir}/openpbx.org/modules/*mysql.so
+%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/*mysql.conf
+
 %files odbc
 %{_libdir}/openpbx.org/modules/cdr_odbc.so
 %config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_odbc.conf
@@ -337,5 +353,8 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Wed Oct 18 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-2.rc1.svn1984
+- Build with mISDN and MySQL support
+
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-1.rc1.svn1979
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Oct 2006 06:43:10 -0000	1.2
+++ sources	18 Oct 2006 16:17:46 -0000	1.3
@@ -1 +1 @@
-b863cbd1e90338b05439267be3eccb44  openpbx-r1979.tar.gz
+8aed2d6afedbd13082d8ce4318b8f163  openpbx-r1984.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 18:21:29 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 11:21:29 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.3, 1.4 cobbler.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610181821.k9IILT24031236@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31196

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2006 15:48:26 -0000	1.3
+++ .cvsignore	18 Oct 2006 18:20:58 -0000	1.4
@@ -1,2 +1,3 @@
 cobbler-0.1.1.tar.gz
 cobbler-0.2.7.tar.gz
+cobbler-0.2.8.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cobbler.spec	18 Oct 2006 15:48:26 -0000	1.2
+++ cobbler.spec	18 Oct 2006 18:20:58 -0000	1.3
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.7
+Version: 0.2.8
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -54,6 +54,9 @@
 
 %changelog
 
+* Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.7-1
 - Upstream changes (see CHANGELOG), includes removing pexpect as a require
 - This RPM now builds on RHEL4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Oct 2006 15:48:26 -0000	1.3
+++ sources	18 Oct 2006 18:20:58 -0000	1.4
@@ -1,2 +1 @@
-c48fc1ba04be7372537dc6483dea5de5  cobbler-0.1.1.tar.gz
-41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz
+f6f86ccf17ad4bfbd167291cf748eb01  cobbler-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 18:23:30 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 11:23:30 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.8, 1.9 cobbler.spec, 1.7,
	1.8 sources, 1.9, 1.10
Message-ID: <200610181823.k9IINUtC031332@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31312

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Oct 2006 22:15:18 -0000	1.8
+++ .cvsignore	18 Oct 2006 18:22:59 -0000	1.9
@@ -5,3 +5,4 @@
 cobbler-0.2.5.tar.gz
 cobbler-0.2.6.tar.gz
 cobbler-0.2.7.tar.gz
+cobbler-0.2.8.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cobbler.spec	17 Oct 2006 22:15:18 -0000	1.7
+++ cobbler.spec	18 Oct 2006 18:22:59 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.7
+Version: 0.2.8
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -54,6 +54,9 @@
 
 %changelog
 
+* Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.7-1
 - Upstream changes (see CHANGELOG), includes removing pexpect as a require
 - This RPM now builds on RHEL4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Oct 2006 15:44:33 -0000	1.9
+++ sources	18 Oct 2006 18:22:59 -0000	1.10
@@ -1 +1 @@
-41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz
+f6f86ccf17ad4bfbd167291cf748eb01  cobbler-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 18:44:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 18 Oct 2006 11:44:14 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.13, 1.14 gnupg2.spec, 1.52,
	1.53 sources, 1.15, 1.16 gnupg-1.9.91-readline.patch, 1.1, NONE
Message-ID: <200610181844.k9IIiEkE031494@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31471

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.91-readline.patch 
Log Message:
* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.93-1
- 1.9.93



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Oct 2006 12:23:06 -0000	1.13
+++ .cvsignore	18 Oct 2006 18:43:44 -0000	1.14
@@ -1,4 +1,2 @@
-gnupg-1.9.23.tar.bz2
-gnupg-1.9.23.tar.bz2.sig
-gnupg-1.9.91.tar.bz2.sig
-gnupg-1.9.92.tar.bz2.sig
+gnupg-1.9.93.tar.bz2
+gnupg-1.9.93.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnupg2.spec	11 Oct 2006 14:16:26 -0000	1.52
+++ gnupg2.spec	18 Oct 2006 18:43:44 -0000	1.53
@@ -11,8 +11,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.92
-Release: 2%{?dist}
+Version: 1.9.93
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -111,10 +111,8 @@
 make 
 
 
-%check ||:
-## Allows for better debugability (doesn't work, fixme)
-# echo "debug-allow-core-dumps" >> tests/gpgsm.conf
-# (sometimes?) expect one failure (reported upstream)
+%check
+# some gpg2 tests (still) FAIL
 make -k check ||:
 
 
@@ -134,7 +132,6 @@
 #file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
 #file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
 #file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-
 rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
 mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
 
@@ -185,6 +182,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.93-1
+- 1.9.93
+
 * Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-2
 - fix file conflicts with gnupg
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Oct 2006 12:23:06 -0000	1.15
+++ sources	18 Oct 2006 18:43:44 -0000	1.16
@@ -1,2 +1,2 @@
-1d0b7ce8c5ff98976253e78a3e20c3a7  gnupg-1.9.92.tar.bz2.sig
-46fc473680ff5586184ddb53e7e18277  gnupg-1.9.92.tar.bz2
+fc2d20e6e8aba396953768b503bf07fe  gnupg-1.9.93.tar.bz2.sig
+84b1af5b6c489fcbbbbf4f219aaf2526  gnupg-1.9.93.tar.bz2


--- gnupg-1.9.91-readline.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 18 19:03:20 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 12:03:20 -0700
Subject: rpms/koan/devel .cvsignore, 1.3, 1.4 koan.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200610181903.k9IJ3Kkh002103@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2083

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Update koan to latest to fix EVR mail item




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 20:20:02 -0000	1.3
+++ .cvsignore	18 Oct 2006 19:02:50 -0000	1.4
@@ -1,2 +1,3 @@
 koan-0.1.1.tar.gz
 koan-0.2.1.tar.gz
+koan-0.2.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- koan.spec	10 Oct 2006 20:20:02 -0000	1.5
+++ koan.spec	18 Oct 2006 19:02:50 -0000	1.6
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.1
+Version: 0.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -47,6 +47,9 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
+- Upstream change -- support Python 2.3
+
 * Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
 - Upstream features (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Oct 2006 20:20:02 -0000	1.4
+++ sources	18 Oct 2006 19:02:50 -0000	1.5
@@ -1 +1 @@
-79137117f164586f4d7fd19f837bec33  koan-0.2.1.tar.gz
+8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 19:39:35 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 18 Oct 2006 12:39:35 -0700
Subject: fedora-security/audit fc5,1.362,1.363 fc6,1.116,1.117
Message-ID: <200610181939.k9IJdZIQ002408@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2388

Modified Files:
	fc5 fc6 
Log Message:
Note a new kdelibs issue.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- fc5	17 Oct 2006 21:26:56 -0000	1.362
+++ fc5	18 Oct 2006 19:39:32 -0000	1.363
@@ -32,6 +32,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4811 VULNERABLE (kdelibs) #211342
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fc6	17 Oct 2006 21:26:56 -0000	1.116
+++ fc6	18 Oct 2006 19:39:32 -0000	1.117
@@ -28,6 +28,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4811 VULNERABLE (kdelibs) #211347
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Wed Oct 18 19:41:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 18 Oct 2006 12:41:29 -0700
Subject: owners owners.list,1.1850,1.1851
Message-ID: <200610181941.k9IJfTVt002443@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2423

Modified Files:
	owners.list 
Log Message:
Adding libpri.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1850
retrieving revision 1.1851
diff -u -r1.1850 -r1.1851
--- owners.list	18 Oct 2006 16:04:58 -0000	1.1850
+++ owners.list	18 Oct 2006 19:40:58 -0000	1.1851
@@ -924,6 +924,7 @@
 Fedora Extras|libpng10|Old version of libpng, needed to run old binaries|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|libpolyxmass|Polymer chemistry-related functionalities|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|libpri|An implementation of Primary Rate ISDN|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|libqalculate|Multi-purpose calculator library|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libreadline-java|A Java wrapper around EditLine|ifoox at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libresample|A real-time library for audio sampling rate conversion|jeff at ocjtech.us|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 20:13:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 13:13:21 -0700
Subject: owners owners.list,1.1851,1.1852
Message-ID: <200610182013.k9IKDL8Q005544@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5526

Modified Files:
	owners.list 
Log Message:

Forgot to add libpaper, my bad.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1851
retrieving revision 1.1852
diff -u -r1.1851 -r1.1852
--- owners.list	18 Oct 2006 19:40:58 -0000	1.1851
+++ owners.list	18 Oct 2006 20:12:51 -0000	1.1852
@@ -921,6 +921,7 @@
 Fedora Extras|libosip2|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|libpano12|Library for manipulating panoramic images|bruno at postle.net|extras-qa at fedoraproject.org|
+Fedora Extras|libpaper|Library and tools for handling papersize|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libpng10|Old version of libpng, needed to run old binaries|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|libpolyxmass|Polymer chemistry-related functionalities|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 20:42:46 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 18 Oct 2006 13:42:46 -0700
Subject: rpms/anjuta import.log,1.22,1.23
Message-ID: <200610182042.k9IKgk1Z005829@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5761

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-8 on branch devel from anjuta-2.0.2-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- import.log	2 Sep 2006 16:30:32 -0000	1.22
+++ import.log	18 Oct 2006 20:42:16 -0000	1.23
@@ -19,3 +19,4 @@
 anjuta-1_2_4a-6:HEAD:anjuta-1.2.4a-6.src.rpm:1156690572
 anjuta-1_2_4a-7:HEAD:anjuta-1.2.4a-7.src.rpm:1157214546
 anjuta-1_2_4a-7:FC-5:anjuta-1.2.4a-7.src.rpm:1157214616
+anjuta-2_0_2-8:HEAD:anjuta-2.0.2-8.src.rpm:1161204122



From fedora-extras-commits at redhat.com  Wed Oct 18 20:42:47 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 18 Oct 2006 13:42:47 -0700
Subject: rpms/anjuta/devel anjuta2.spec, NONE, 1.1 .cvsignore, 1.6,
	1.7 sources, 1.6, 1.7 anjuta-1.2.4a-search.patch, 1.1,
	NONE anjuta-1.2.4a-watch-keys.patch, 1.1,
	NONE anjuta-export-dynamic.patch, 1.1,
	NONE anjuta-project_type.patch, 1.1, NONE anjuta.spec, 1.22, NONE
Message-ID: <200610182042.k9IKgls1005833@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5761/devel

Modified Files:
	.cvsignore sources 
Added Files:
	anjuta2.spec 
Removed Files:
	anjuta-1.2.4a-search.patch anjuta-1.2.4a-watch-keys.patch 
	anjuta-export-dynamic.patch anjuta-project_type.patch 
	anjuta.spec 
Log Message:
auto-import anjuta-2.0.2-8 on branch devel from anjuta-2.0.2-8.src.rpm


--- NEW FILE anjuta2.spec ---
Summary: Integrated Development Environment
Name:    anjuta
Version: 2.0.2
Release: 8%{?dist}
License: GPL
Group:   Development/Tools
URL:     http://www.anjuta.org
Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Epoch: 1

%description
Anjuta DevStudio is a versatile Integrated Development Environment (IDE)
on GNOME Desktop Environment and features a number of advanced
programming facilities. These include project management, application and
class wizards, an on-board interactive debugger, powerful source editor,
syntax highlighting, intellisense autocompletions, symbol navigation,
version controls, integrated GUI designing and other tools.

%package devel
Summary: Libraries and include files for Anjuta plugins development
Group:   Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libgnomeui-devel, libglade2-devel, pkgconfig

%description devel
Libraries, header files and API docs for developing Anjuta plugins

%package docs
Summary: Anjuta 2 documentation
Group: Documentation
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description docs
Anjuta 2 documentation

%prep
%setup -q
sed -i 's/\r//' doc/ScintillaDoc.html
%{_bindir}/iconv -t UTF-8 THANKS -o THANKS
%{_bindir}/iconv -t UTF-8 COPYING -o COPYING
%{_bindir}/iconv -t UTF-8 NEWS -o NEWS
%{_bindir}/iconv -t UTF-8 README -o README
chmod 644 scintilla/*.cxx
chmod 644 scintilla/*.h

%build
%configure --disable-static --disable-plugin-subversion --enable-nls
%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL="install -c -p" install
%find_lang %{name}

desktop-file-install --vendor fedora --delete-original \
  --dir %{buildroot}/%{_datadir}/applications      \
  --add-category X-Fedora                              \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig

%post docs
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :

%postun docs
scrollkeeper-update -q || :

%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc doc/ScintillaDoc.html
%{_bindir}/%{name}*
%{_bindir}/create_global_tags.sh
%{_bindir}/test_tm_buffer
%{_libdir}/lib%{name}*.so.*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}
%{_datadir}/doc/%{name}
%{_datadir}/application-registry/%{name}.applications
%{_datadir}/mime-info/%{name}.mime
%{_datadir}/mime-info/%{name}.keys
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/48x48/apps/anjuta*
%{_datadir}/icons/hicolor/scalable/apps/anjuta*
%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png
%{_mandir}/man1/anjuta*

%files docs
%defattr(-,root, root, -)
%{_datadir}/gnome/help/%{name}
%{_datadir}/omf/%{name}

%files devel
%defattr (-, root, root)
%{_includedir}/*%{name}*
%{_libdir}/pkgconfig/*%{name}*
%{_libdir}/lib%{name}*.so
%{_datadir}/gtk-doc/html/*%{name}*

%changelog
* Tue Oct 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-8
- fix the INSTALL line in install
- fixed encoding on text files
- removed two docs (not really needed)
- fixed ldconfig

* Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-7
- install keeps timestampe
- now keeps time stamps
- lots of BRs removed
- Moved docs Rs to the correct place
- fixed encodings

* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-6
- removed RPM_BUILD_ROOT
- fixed devel package
- altered update-mime-database
- fixed debuginfo permission problems
- altered R and BR

* Wed Oct 11 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-5
- re-enabled docs
- multiple spec fixes
- spec file clean
- added gtksourceview-devel and gtksourceview to BR and R

* Thu Jun 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-2
- Lotza fixes!

* Tue May 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-1
- bump to new version 

* Thu Apr 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-3
- removed the hack from anjuta (1.2.4a)
- added anjuta-docs subpackage

* Wed Apr 26 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-2
- removed smp_flags

* Tue Feb 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-1
- Initial import for FC
- Sanitised the spec file somewhat
- Removed .a and .la files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Apr 2006 23:26:25 -0000	1.6
+++ .cvsignore	18 Oct 2006 20:42:16 -0000	1.7
@@ -1 +1 @@
-anjuta-1.2.4a.tar.gz
+anjuta-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Apr 2006 23:26:25 -0000	1.6
+++ sources	18 Oct 2006 20:42:16 -0000	1.7
@@ -1 +1 @@
-7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz
+e0d1e216da809df32816d233d7c55165  anjuta-2.0.2.tar.gz


--- anjuta-1.2.4a-search.patch DELETED ---


--- anjuta-1.2.4a-watch-keys.patch DELETED ---


--- anjuta-export-dynamic.patch DELETED ---


--- anjuta-project_type.patch DELETED ---


--- anjuta.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 18 20:59:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 13:59:28 -0700
Subject: rpms/abcMIDI/devel abcMIDI.spec,1.11,1.12
Message-ID: <200610182059.k9IKxSfI006058@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6037

Modified Files:
	abcMIDI.spec 
Log Message:



Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abcMIDI.spec	16 Oct 2006 21:25:56 -0000	1.11
+++ abcMIDI.spec	18 Oct 2006 20:58:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           abcMIDI
 Version:        20061015
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia



From fedora-extras-commits at redhat.com  Wed Oct 18 21:12:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:12:51 -0700
Subject: rpms/ser2net - New directory
Message-ID: <200610182112.k9ILCp7m009191@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9187/ser2net

Log Message:
Directory /cvs/extras/rpms/ser2net added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 21:12:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:12:56 -0700
Subject: rpms/ser2net/devel - New directory
Message-ID: <200610182112.k9ILCu30009205@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9187/ser2net/devel

Log Message:
Directory /cvs/extras/rpms/ser2net/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 21:13:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:13:33 -0700
Subject: rpms/ser2net Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610182113.k9ILDXZ6009236@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9230

Added Files:
	Makefile import.log 
Log Message:
Setup of module ser2net


--- NEW FILE Makefile ---
# Top level Makefile for module ser2net
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 21:13:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:13:39 -0700
Subject: rpms/ser2net/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610182113.k9ILDd7f009252@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9230/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ser2net


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 21:17:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:17:02 -0700
Subject: rpms/ser2net import.log,1.1,1.2
Message-ID: <200610182117.k9ILH2uB009335@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9300

Modified Files:
	import.log 
Log Message:
auto-import ser2net-2.3-3.fc6 on branch devel from ser2net-2.3-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ser2net/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 21:13:33 -0000	1.1
+++ import.log	18 Oct 2006 21:16:31 -0000	1.2
@@ -0,0 +1 @@
+ser2net-2_3-3_fc6:HEAD:ser2net-2.3-3.fc6.src.rpm:1161206179



From fedora-extras-commits at redhat.com  Wed Oct 18 21:17:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:17:02 -0700
Subject: rpms/ser2net/devel ser2net-2.3-initaddreload.patch, NONE,
	1.1 ser2net.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610182117.k9ILH2dW009339@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9300/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ser2net-2.3-initaddreload.patch ser2net.spec 
Log Message:
auto-import ser2net-2.3-3.fc6 on branch devel from ser2net-2.3-3.fc6.src.rpm

ser2net-2.3-initaddreload.patch:

--- NEW FILE ser2net-2.3-initaddreload.patch ---
--- ser2net-2.3/ser2net.init.BAD	2006-07-28 16:09:24.000000000 -0500
+++ ser2net-2.3/ser2net.init	2006-07-28 16:10:57.000000000 -0500
@@ -33,6 +33,17 @@
     return 0
 }
 
+reload() {
+        echo -n $"Reloading ser2net: "
+        if [ -n "`pidfileofproc ser2net`" ] ; then
+            killproc ser2net -HUP
+        else
+            failure $"Reloading ser2net"
+        fi
+        RETVAL=$?
+        echo
+}
+
 case "$1" in
 	start)
 	    start
@@ -49,6 +60,9 @@
 	    stop
 	    start
 	    ;;
+	reload)
+	    reload
+	    ;;
 	condrestart)
 	    if test "x`pidof ser2net`" != x; then
 		stop
@@ -57,7 +71,7 @@
 	    ;;
 	
 	*)
-	    echo "Usage: ser2net {start|stop|restart|condrestart|status}"
+	    echo "Usage: ser2net {start|stop|restart|reload|condrestart|status}"
 	    exit 1
 
 esac


--- NEW FILE ser2net.spec ---
Name:		ser2net
Summary: 	Proxy that allows tcp connections to serial ports
Version:	2.3
Release:	3%{?dist}
License:	GPL
Group:		Applications/System
Source0:	http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz
Patch0:		ser2net-2.3-initaddreload.patch
URL:		http://ser2net.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service

%description
ser2net provides a way for a user to connect from a network connection to a 
serial port. It provides all the serial port setup, a configuration file to 
configure the ports, a control login for modifying port parameters, 
monitoring ports, and controlling ports.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m0644 ser2net.conf $RPM_BUILD_ROOT%{_sysconfdir}
install ser2net.init $RPM_BUILD_ROOT%{_initrddir}/ser2net

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add ser2net

%preun
if test [ $1  = 0 ]; then
	/sbin/service ser2net stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del ser2net
fi

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

%files
%defattr(-,root,root)
%doc COPYING ChangeLog AUTHORS README
%attr(0755,root,root) %{_initrddir}/ser2net
%config(noreplace) %{_sysconfdir}/ser2net.conf
%{_sbindir}/ser2net
%{_mandir}/man8/ser2net*

%changelog
* Wed Oct 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-3
- fix typo

* Wed Oct  4 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-2
- fix initscript handling

* Fri Jul 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ser2net/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 21:13:39 -0000	1.1
+++ .cvsignore	18 Oct 2006 21:16:32 -0000	1.2
@@ -0,0 +1 @@
+ser2net-2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ser2net/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 21:13:39 -0000	1.1
+++ sources	18 Oct 2006 21:16:32 -0000	1.2
@@ -0,0 +1 @@
+5f83a3e8aec18331cb61069dccdfba47  ser2net-2.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 21:22:33 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 18 Oct 2006 14:22:33 -0700
Subject: comps comps-fe5.xml.in,1.172,1.173
Message-ID: <200610182122.k9ILMXCK009584@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9563

Modified Files:
	comps-fe5.xml.in 
Log Message:
Added manaworld game




Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- comps-fe5.xml.in	18 Oct 2006 14:54:59 -0000	1.172
+++ comps-fe5.xml.in	18 Oct 2006 21:22:03 -0000	1.173
@@ -318,6 +318,7 @@
       <packagereq type="optional">lmarbles</packagereq>
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
+      <packagereq type="optional">manaworld</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>
       <packagereq type="optional">monsterz</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 21:29:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:29:19 -0700
Subject: owners owners.list,1.1852,1.1853
Message-ID: <200610182129.k9ILTJdV009661@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628

Modified Files:
	owners.list 
Log Message:

ser2net



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1852
retrieving revision 1.1853
diff -u -r1.1852 -r1.1853
--- owners.list	18 Oct 2006 20:12:51 -0000	1.1852
+++ owners.list	18 Oct 2006 21:28:49 -0000	1.1853
@@ -2061,6 +2061,7 @@
 Fedora Extras|sec|Simple Event Correlator|lists at forevermore.net|extras-qa at fedoraproject.org|
 Fedora Extras|seq24|Real-time midi sequencer|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ser|SIP Express Router|andreas at bawue.net|extras-qa at fedoraproject.org|
+Fedora Extras|ser2net|Proxy that allows tcp connections to serial ports|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|serpentine|Audio CD Burner|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|sextractor|Extract catalogs of sources from astronomical images|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
 Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 21:31:27 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 18 Oct 2006 14:31:27 -0700
Subject: comps comps-fe6.xml.in,1.193,1.194
Message-ID: <200610182131.k9ILVReJ009841@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9790

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add Thunar and Terminal, remove xffm



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- comps-fe6.xml.in	18 Oct 2006 14:54:59 -0000	1.193
+++ comps-fe6.xml.in	18 Oct 2006 21:30:57 -0000	1.194
@@ -1111,12 +1111,12 @@
       <packagereq type="mandatory">libxfce4mcs</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-session-engines</packagereq>
       <packagereq type="mandatory">xfdesktop</packagereq>
-      <packagereq type="mandatory">xffm</packagereq>
       <packagereq type="mandatory">xfwm4</packagereq>
       <packagereq type="default">xfce-mcs-manager</packagereq>
       <packagereq type="default">xfce-mcs-plugins</packagereq>
@@ -1124,15 +1124,15 @@
       <packagereq type="default">xfce4-icon-theme</packagereq>
       <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
       <packagereq type="default">xfce4-mixer</packagereq>
-      <packagereq type="default">xffm-icons</packagereq>
       <packagereq type="default">xfprint</packagereq>
       <packagereq type="optional">mousepad</packagereq>
       <packagereq type="optional">orage</packagereq>
+      <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>
       <packagereq type="optional">xfce4-clipman-plugin</packagereq>
       <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
-      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
       <packagereq type="optional">xfce4-datetime-plugin</packagereq>
+      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
       <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
       <packagereq type="optional">xfce4-genmon-plugin</packagereq>
       <packagereq type="optional">xfce4-minicmd-plugin</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 21:39:04 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 18 Oct 2006 14:39:04 -0700
Subject: comps comps-fe6.xml.in,1.194,1.195
Message-ID: <200610182139.k9ILd4TD009886@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9870

Modified Files:
	comps-fe6.xml.in 
Log Message:
add twinkle apg fwrestart munin p0f



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- comps-fe6.xml.in	18 Oct 2006 21:30:57 -0000	1.194
+++ comps-fe6.xml.in	18 Oct 2006 21:38:34 -0000	1.195
@@ -569,6 +569,7 @@
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
+      <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">valknut</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
       <packagereq type="optional">xchat-gnome</packagereq>
@@ -889,6 +890,7 @@
       <packagereq type="optional">aide</packagereq>
       <packagereq type="optional">airsnort</packagereq>
       <packagereq type="optional">apcupsd</packagereq>
+      <packagereq type="optional">apg</packagereq>
       <packagereq type="optional">apt</packagereq>
       <packagereq type="optional">arc</packagereq>
       <packagereq type="optional">arj</packagereq>
@@ -916,6 +918,7 @@
       <packagereq type="optional">freeze</packagereq>
       <packagereq type="optional">fuse</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
+      <packagereq type="optional">fwrestart</packagereq>
       <packagereq type="optional">ganglia</packagereq>
       <packagereq type="optional">ghasher</packagereq>
       <packagereq type="optional">ghex</packagereq>
@@ -942,11 +945,13 @@
       <packagereq type="optional">mmv</packagereq>
       <packagereq type="optional">moodss</packagereq>
       <packagereq type="optional">moomps</packagereq>
+      <packagereq type="optional">munin</packagereq>
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">netgo</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nomarch</packagereq>
       <packagereq type="optional">oddjob</packagereq>
+      <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
       <packagereq type="optional">par2cmdline</packagereq>
       <packagereq type="optional">pbzip2</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 21:48:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 18 Oct 2006 14:48:34 -0700
Subject: rpms/munin/devel munin-1.2.5-hddtemp_smartctl-config, NONE,
	1.1 munin-node.logrotate, NONE, 1.1 munin.logrotate, NONE,
	1.1 munin.spec, 1.9, 1.10 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200610182148.k9ILmYas010019@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.2.5-hddtemp_smartctl-config munin-node.logrotate 
	munin.logrotate 
Log Message:
Update to 1.2.5
Fix HD stats (fixes #205042)
Add in logrotate scripts that seem to have been dropped upstream



--- NEW FILE munin-1.2.5-hddtemp_smartctl-config ---
[hddtemp_smartctl]
user root


--- NEW FILE munin-node.logrotate ---
/var/log/munin/munin-node.log {
	daily
	missingok
	rotate 7
	compress
	copytruncate
	notifempty
	create 640 root adm
}


--- NEW FILE munin.logrotate ---
/var/log/munin/munin-update.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-graph.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-html.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-limits.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- munin.spec	28 Aug 2006 04:28:35 -0000	1.9
+++ munin.spec	18 Oct 2006 21:48:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.4
-Release:   10%{?dist}
+Version:   1.2.5
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -10,6 +10,9 @@
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
 Source1: munin-1.2.4-sendmail-config
+Source2: munin-1.2.5-hddtemp_smartctl-config
+Source3: munin-node.logrotate
+Source4: munin.logrotate
 Patch0: munin-1.2.4-cron.patch
 Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
@@ -17,8 +20,8 @@
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
+Requires(pre): fedora-usermgmt >= 0.7
+Requires(postun): fedora-usermgmt >= 0.7
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -104,8 +107,6 @@
 
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
-install -m0644 dists/debian/munin.logrotate %{buildroot}/etc/logrotate.d/munin
-install -m0644 dists/debian/munin-node.logrotate %{buildroot}/etc/logrotate.d/munin-node
 
 # 
 # remove the Sybase plugin for now, as they need perl modules 
@@ -127,6 +128,11 @@
 install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog
 # install config for sendmail under fedora
 install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
+# install config for hddtemp_smartctl
+install -m 0644 %{SOURCE2} %{buildroot}/etc/munin/plugin-conf.d/hddtemp_smartctl
+# install logrotate scripts
+install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
+install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -177,6 +183,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
+%{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
@@ -204,6 +211,7 @@
 %config(noreplace) /etc/munin/munin-node.conf
 %config(noreplace) /etc/munin/plugin-conf.d/munin-node
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
+%config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
 %config(noreplace) /etc/logrotate.d/munin-node
 /etc/rc.d/init.d/munin-node
 %config(noreplace) /etc/munin/plugins.conf
@@ -226,6 +234,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Tue Oct 17 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
+- Update to 1.2.5
+- Fix HD stats (fixes #205042)
+- Add in logrotate scripts that seem to have been dropped upstream
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-10
 - Rebuild for fc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2005 03:38:04 -0000	1.2
+++ sources	18 Oct 2006 21:48:04 -0000	1.3
@@ -1 +1 @@
-f91f5d96c01d8527db1d2f4b3f0f4cc5  munin_1.2.4.tar.gz
+e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2005 03:38:04 -0000	1.2
+++ .cvsignore	18 Oct 2006 21:48:04 -0000	1.3
@@ -1 +1 @@
-munin_1.2.4.tar.gz
+munin_1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 21:53:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 18 Oct 2006 14:53:08 -0700
Subject: comps comps-fe5.xml.in,1.173,1.174 comps-fe6.xml.in,1.195,1.196
Message-ID: <200610182153.k9ILr8hR010104@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10086

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add asymptote


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- comps-fe5.xml.in	18 Oct 2006 21:22:03 -0000	1.173
+++ comps-fe5.xml.in	18 Oct 2006 21:52:37 -0000	1.174
@@ -510,6 +510,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">asymptote</packagereq>
       <packagereq type="optional">blender</packagereq>
       <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">digikam</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- comps-fe6.xml.in	18 Oct 2006 21:38:34 -0000	1.195
+++ comps-fe6.xml.in	18 Oct 2006 21:52:37 -0000	1.196
@@ -583,6 +583,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">agave</packagereq>
+      <packagereq type="optional">asymptote</packagereq>
       <packagereq type="optional">blender</packagereq>
       <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">digikam</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 22:02:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 18 Oct 2006 15:02:56 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.11, 1.12 perl-Error.spec, 1.15, 
	1.16 sources, 1.11, 1.12
Message-ID: <200610182202.k9IM2uAa013103@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13078

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17007.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Oct 2006 17:41:51 -0000	1.11
+++ .cvsignore	18 Oct 2006 22:02:25 -0000	1.12
@@ -1 +1 @@
-Error-0.17006.tar.gz
+Error-0.17007.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Error.spec	7 Oct 2006 17:41:51 -0000	1.15
+++ perl-Error.spec	18 Oct 2006 22:02:25 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17006
+Version:        0.17007
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17007-1
+- Update to 0.17007.
+
 * Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17006-1
 - Update to 0.17006.
 - New build requirements: Test::Pod and Test::Pod::Coverage.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Oct 2006 17:41:51 -0000	1.11
+++ sources	18 Oct 2006 22:02:25 -0000	1.12
@@ -1 +1 @@
-fc9f7e5000d5607359e2ed03f6a9cf1c  Error-0.17006.tar.gz
+fd80f6b2d1f5d31529145301031795b4  Error-0.17007.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 22:12:02 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 18 Oct 2006 15:12:02 -0700
Subject: rpms/naim/FC-5 .cvsignore, 1.6, 1.7 naim.spec, 1.12, 1.13 sources,
	1.6, 1.7
Message-ID: <200610182212.k9IMC2o8013265@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/naim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13245

Modified Files:
	.cvsignore naim.spec sources 
Log Message:
* Wed Oct 18 2006 Luke Macken <lmacken at redhat.com> 0.11.8.2.1-1
- Update to 0.11.8.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Sep 2006 18:36:54 -0000	1.6
+++ .cvsignore	18 Oct 2006 22:11:32 -0000	1.7
@@ -1 +1 @@
-naim-0.11.8.2.tar.bz2
+naim-0.11.8.2.1.tar.bz2


Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-5/naim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- naim.spec	7 Sep 2006 01:57:46 -0000	1.12
+++ naim.spec	18 Oct 2006 22:11:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name: naim
-Version: 0.11.8.2
-Release: 5%{?dist}
+Version: 0.11.8.2.1
+Release: 1%{?dist}
 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client
 
 Group: Applications/Internet
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Oct 18 2006 Luke Macken <lmacken at redhat.com> 0.11.8.2.1-1
+- Update to 0.11.8.2.1
+
 * Wed Sep  6 2006 Luke Macken <lmacken at redhat.com>
 - Remove %%{?_smp_mflags} macro to fix ppc build issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Sep 2006 18:36:54 -0000	1.6
+++ sources	18 Oct 2006 22:11:32 -0000	1.7
@@ -1 +1 @@
-92bfbf60c4fd8f0eab4c4c6bbfe50422  naim-0.11.8.2.tar.bz2
+0f47e1927c00ed89cbce6d77486d884a  naim-0.11.8.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 03:08:15 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 18 Oct 2006 20:08:15 -0700
Subject: rpms/zaptel/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zaptel.spec,
	1.1, 1.2
Message-ID: <200610190308.k9J38F37029078@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29054

Modified Files:
	.cvsignore sources zaptel.spec 
Log Message:
Update to 1.4.0-beta2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2006 11:53:07 -0000	1.2
+++ .cvsignore	19 Oct 2006 03:07:45 -0000	1.3
@@ -1 +1 @@
-zaptel-1.4.0-beta1.tar.gz
+zaptel-1.4.0-beta2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2006 11:53:07 -0000	1.2
+++ sources	19 Oct 2006 03:07:45 -0000	1.3
@@ -1 +1 @@
-6d2bae038c85770fd09a323f192cd682  zaptel-1.4.0-beta1.tar.gz
+4fe09984245f3507d8050bad740e873a  zaptel-1.4.0-beta2.tar.gz


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/zaptel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zaptel.spec	16 Oct 2006 11:53:07 -0000	1.1
+++ zaptel.spec	19 Oct 2006 03:07:45 -0000	1.2
@@ -1,11 +1,11 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.0
-Release: 2%{?dist}.beta1
+Release: 3%{?dist}.beta2
 License: GPL
 Group: Applications/System
 URL: http://www.digium.com/
-Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta1.tar.gz
+Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta2.tar.gz
 Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
 Patch1:  zaptel-1.4.0-beta1-makefile.patch
 
@@ -54,7 +54,7 @@
 Development files for Zapata telephony interfaces.
 
 %prep
-%setup0 -q -n zaptel-%{version}-beta1
+%setup0 -q -n zaptel-%{version}-beta2
 
 %patch0 -p0
 %patch1 -p0
@@ -185,6 +185,9 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Wed Oct 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-3.beta2
+- Update to 1.4.0-beta2
+
 * Sun Oct 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
 - Don't package firmware until license can be figured out.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 03:09:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 18 Oct 2006 20:09:37 -0700
Subject: rpms/zaptel/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zaptel.spec,
	1.1, 1.2
Message-ID: <200610190309.k9J39bnO029152@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29132

Modified Files:
	.cvsignore sources zaptel.spec 
Log Message:
Update to 1.4.0-beta2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2006 11:53:07 -0000	1.2
+++ .cvsignore	19 Oct 2006 03:09:06 -0000	1.3
@@ -1 +1 @@
-zaptel-1.4.0-beta1.tar.gz
+zaptel-1.4.0-beta2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2006 11:53:07 -0000	1.2
+++ sources	19 Oct 2006 03:09:06 -0000	1.3
@@ -1 +1 @@
-6d2bae038c85770fd09a323f192cd682  zaptel-1.4.0-beta1.tar.gz
+4fe09984245f3507d8050bad740e873a  zaptel-1.4.0-beta2.tar.gz


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-5/zaptel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zaptel.spec	16 Oct 2006 11:53:07 -0000	1.1
+++ zaptel.spec	19 Oct 2006 03:09:06 -0000	1.2
@@ -1,11 +1,11 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.0
-Release: 2%{?dist}.beta1
+Release: 3%{?dist}.beta2
 License: GPL
 Group: Applications/System
 URL: http://www.digium.com/
-Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta1.tar.gz
+Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta2.tar.gz
 Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
 Patch1:  zaptel-1.4.0-beta1-makefile.patch
 
@@ -54,7 +54,7 @@
 Development files for Zapata telephony interfaces.
 
 %prep
-%setup0 -q -n zaptel-%{version}-beta1
+%setup0 -q -n zaptel-%{version}-beta2
 
 %patch0 -p0
 %patch1 -p0
@@ -185,6 +185,9 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Wed Oct 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-3.beta2
+- Update to 1.4.0-beta2
+
 * Sun Oct 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
 - Don't package firmware until license can be figured out.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 03:28:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 18 Oct 2006 20:28:11 -0700
Subject: rpms/perl-WWW-Myspace Makefile,1.3,1.4
Message-ID: <200610190328.k9J3SBZ7029318@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29271

Modified Files:
	Makefile 
Log Message:
update to 0.59



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	30 Sep 2006 00:37:05 -0000	1.3
+++ Makefile	19 Oct 2006 03:27:40 -0000	1.4
@@ -2,15 +2,14 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
 # tag & build all non-legacy branches...
-# this is clearly a non-optimal solution; to my knowledge there is no way to
-# currently determine if a branch is legacy or not (and this module is
-# frequently updated).  Correction on this point welcomed :)
 build-all :
-	@echo WARNING: building for devel and FC-5
+	@echo NOTICE: building for ${BRANCHES}
 	@sleep 5s
-	@cd FC-5  && test -f dead.package || ( make tag && make plague )
-	@cd devel && test -f dead.package || ( make tag && make plague )
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
 
 common-update : common
 	@cd common && cvs update



From fedora-extras-commits at redhat.com  Thu Oct 19 03:28:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 18 Oct 2006 20:28:11 -0700
Subject: rpms/perl-WWW-Myspace/FC-5 perl-WWW-Myspace.spec, 1.10, 1.11 sources,
	1.10, 1.11
Message-ID: <200610190328.k9J3SBic029322@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29271/FC-5

Modified Files:
	perl-WWW-Myspace.spec sources 
Log Message:
update to 0.59



Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-5/perl-WWW-Myspace.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-WWW-Myspace.spec	30 Sep 2006 00:35:10 -0000	1.10
+++ perl-WWW-Myspace.spec	19 Oct 2006 03:27:41 -0000	1.11
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.58
+Version:  0.59
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
+- update to 0.59
+
 * Fri Sep 29 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.58-1
 - update to 0.58
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 00:35:10 -0000	1.10
+++ sources	19 Oct 2006 03:27:41 -0000	1.11
@@ -1 +1 @@
-bb2bbff40164df653217aadc38c757bc  WWW-Myspace-0.58.tar.gz
+324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 03:28:12 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 18 Oct 2006 20:28:12 -0700
Subject: rpms/perl-WWW-Myspace/devel .cvsignore, 1.10,
	1.11 perl-WWW-Myspace.spec, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200610190328.k9J3SCCp029327@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29271/devel

Modified Files:
	.cvsignore perl-WWW-Myspace.spec sources 
Log Message:
update to 0.59



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2006 00:35:11 -0000	1.10
+++ .cvsignore	19 Oct 2006 03:27:42 -0000	1.11
@@ -1 +1 @@
-WWW-Myspace-0.58.tar.gz
+WWW-Myspace-0.59.tar.gz


Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/perl-WWW-Myspace.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-WWW-Myspace.spec	30 Sep 2006 00:35:11 -0000	1.12
+++ perl-WWW-Myspace.spec	19 Oct 2006 03:27:42 -0000	1.13
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.58
+Version:  0.59
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
+- update to 0.59
+
 * Fri Sep 29 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.58-1
 - update to 0.58
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 00:35:11 -0000	1.10
+++ sources	19 Oct 2006 03:27:42 -0000	1.11
@@ -1 +1 @@
-bb2bbff40164df653217aadc38c757bc  WWW-Myspace-0.58.tar.gz
+324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 06:49:30 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:49:30 -0700
Subject: rpms/viaideinfo - New directory
Message-ID: <200610190649.k9J6nUfj006417@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413/viaideinfo

Log Message:
Directory /cvs/extras/rpms/viaideinfo added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 19 06:49:36 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:49:36 -0700
Subject: rpms/viaideinfo/devel - New directory
Message-ID: <200610190649.k9J6naId006431@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413/viaideinfo/devel

Log Message:
Directory /cvs/extras/rpms/viaideinfo/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 19 06:49:47 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:49:47 -0700
Subject: rpms/viaideinfo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610190649.k9J6nllx006462@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6456

Added Files:
	Makefile import.log 
Log Message:
Setup of module viaideinfo


--- NEW FILE Makefile ---
# Top level Makefile for module viaideinfo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct 19 06:49:53 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:49:53 -0700
Subject: rpms/viaideinfo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610190649.k9J6nrwZ006478@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6456/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module viaideinfo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct 19 06:50:42 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:50:42 -0700
Subject: rpms/viaideinfo import.log,1.1,1.2
Message-ID: <200610190650.k9J6ogZ7006552@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6518

Modified Files:
	import.log 
Log Message:
auto-import viaideinfo-0.4-1 on branch devel from viaideinfo-0.4-1.src.rpm
Initial import (review and approval in bug #211256)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Oct 2006 06:49:47 -0000	1.1
+++ import.log	19 Oct 2006 06:50:12 -0000	1.2
@@ -0,0 +1 @@
+viaideinfo-0_4-1:HEAD:viaideinfo-0.4-1.src.rpm:1161240609



From fedora-extras-commits at redhat.com  Thu Oct 19 06:50:43 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:50:43 -0700
Subject: rpms/viaideinfo/devel viaideinfo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610190650.k9J6ohJA006556@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6518/devel

Modified Files:
	.cvsignore sources 
Added Files:
	viaideinfo.spec 
Log Message:
auto-import viaideinfo-0.4-1 on branch devel from viaideinfo-0.4-1.src.rpm
Initial import (review and approval in bug #211256)


--- NEW FILE viaideinfo.spec ---
Name:		viaideinfo
Version:	0.4
Release:	1%{?dist}
Summary:	Displays the information of installed VIA IDE controllers 
Group:		Applications/System
License:	GPL
URL:		http://reactivated.net/software/viaideinfo

Source0:	http://reactivated.net/software/viaideinfo/viaideinfo-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch:	%{ix86}

BuildRequires:	pciutils-devel >= 2.2.0  

# Taken from the README
%description
This command-line application identifies VIA IDE controllers installed in the
computer, and displays various information/statistics regarding these. This
does not depend on the via82cxxx kernel IDE driver, and will work regardless of
whether it is present or not. All this information used to be available through
/proc/ide/via; however this file was removed in Linux 2.6.15 to reduce the
complexity of the IDE driver. Since it performs some basic port I/O, it must be
run as root.

Supported devices:
	VT82C576, VT82C586, VT82C586A, VT82C586B, VT82C596A, VT82C596B,
	VT82C686, VT82C686A, VT82C686B, VT8231, VT8233, VT8233C, VT8233A,
	VT8235, VT8237, VT8237A, VT8251, VT6410


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


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


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS  
%{_bindir}/%{name}
%{_mandir}/man8/%{name}.8.gz


%changelog
* Tue Oct 17 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Oct 2006 06:49:52 -0000	1.1
+++ .cvsignore	19 Oct 2006 06:50:13 -0000	1.2
@@ -0,0 +1 @@
+viaideinfo-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Oct 2006 06:49:52 -0000	1.1
+++ sources	19 Oct 2006 06:50:13 -0000	1.2
@@ -0,0 +1 @@
+e436a580eb8a047a0551cb996b11e6f5  viaideinfo-0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 06:53:08 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:53:08 -0700
Subject: owners owners.list,1.1853,1.1854
Message-ID: <200610190653.k9J6r8vP006614@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598

Modified Files:
	owners.list 
Log Message:
Adding viaideinfo entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1853
retrieving revision 1.1854
diff -u -r1.1853 -r1.1854
--- owners.list	18 Oct 2006 21:28:49 -0000	1.1853
+++ owners.list	19 Oct 2006 06:52:38 -0000	1.1854
@@ -2271,6 +2271,7 @@
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
+Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at beer.tclug.org|extras-qa at fedoraproject.org|
 Fedora Extras|vigra|Generic Programming for Computer Vision|bruno at postle.net|extras-qa at fedoraproject.org|
 Fedora Extras|vips|Library for processing large images|adam at spicenitz.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct 19 06:57:17 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:57:17 -0700
Subject: comps comps-fe6.xml.in,1.196,1.197
Message-ID: <200610190657.k9J6vHKn006651@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6635/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add entry for viaideinfo


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- comps-fe6.xml.in	18 Oct 2006 21:52:37 -0000	1.196
+++ comps-fe6.xml.in	19 Oct 2006 06:56:47 -0000	1.197
@@ -982,6 +982,7 @@
       <packagereq type="optional">ttywatch</packagereq>
       <packagereq type="optional">unison</packagereq>
       <packagereq type="optional">upx</packagereq>
+      <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vnstat</packagereq>
       <packagereq type="optional">vpnc</packagereq>
       <packagereq type="optional">wifiroamd</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 07:30:15 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Oct 2006 00:30:15 -0700
Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec, 1.4, 1.5 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610190730.k9J7UF5R009747@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9705

Modified Files:
	perl-Math-Pari.spec sources .cvsignore 
Log Message:
Update to 2.010708
Fix argument order for find with -depth
Fix Source1 URL



Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Math-Pari.spec	30 Aug 2006 07:17:01 -0000	1.4
+++ perl-Math-Pari.spec	19 Oct 2006 07:29:44 -0000	1.5
@@ -9,17 +9,17 @@
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	2.010706
+Version:	2.010708
 # You'll need to replace pariversion with a hardcoded version number if you're
 # testing with a development version of PARI, as this expression evaluates
 # the latest version of GP/PARI the perl module was tested with.
 %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e')
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	Artistic or GPL
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
 Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz
-Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pariversion}.tgz
+Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pariversion}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -53,7 +53,7 @@
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
 /usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -73,6 +73,11 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 2.010708-1
+- Update to 2.010708
+- Fix argument order for find with -depth
+- Fix Source1 URL
+
 * Wed Aug 30 2006 Paul Howarth <paul at city-fan.org> 2.010706-2
 - FE6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jun 2006 09:13:07 -0000	1.4
+++ sources	19 Oct 2006 07:29:44 -0000	1.5
@@ -1,2 +1,2 @@
-5ed1fb49f246288a9899fa6ad1b7753c  Math-Pari-2.010706.tar.gz
+d06781230dc62eb75a88f5b509d55ac6  Math-Pari-2.010708.tar.gz
 357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jun 2006 09:13:07 -0000	1.4
+++ .cvsignore	19 Oct 2006 07:29:44 -0000	1.5
@@ -1,2 +1,2 @@
-Math-Pari-2.010706.tar.gz
+Math-Pari-2.010708.tar.gz
 pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Thu Oct 19 07:58:52 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Oct 2006 00:58:52 -0700
Subject: rpms/perl-Math-Pari/FC-5 perl-Math-Pari.spec, 1.4, 1.5 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610190758.k9J7wqVt009863@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9838

Modified Files:
	perl-Math-Pari.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/perl-Math-Pari.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Math-Pari.spec	2 Jun 2006 09:26:02 -0000	1.4
+++ perl-Math-Pari.spec	19 Oct 2006 07:58:22 -0000	1.5
@@ -9,7 +9,7 @@
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	2.010706
+Version:	2.010708
 # You'll need to replace pariversion with a hardcoded version number if you're
 # testing with a development version of PARI, as this expression evaluates
 # the latest version of GP/PARI the perl module was tested with.
@@ -19,7 +19,7 @@
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
 Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz
-Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pariversion}.tgz
+Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pariversion}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -53,7 +53,7 @@
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
 /usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -73,6 +73,14 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 2.010708-1
+- Update to 2.010708
+- Fix argument order for find with -depth
+- Fix Source1 URL
+
+* Wed Aug 30 2006 Paul Howarth <paul at city-fan.org> 2.010706-2
+- FE6 mass rebuild
+
 * Fri Jun  2 2006 Paul Howarth <paul at city-fan.org> 2.010706-1
 - Update to 2.010706
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jun 2006 09:26:02 -0000	1.4
+++ sources	19 Oct 2006 07:58:22 -0000	1.5
@@ -1,2 +1,2 @@
-5ed1fb49f246288a9899fa6ad1b7753c  Math-Pari-2.010706.tar.gz
+d06781230dc62eb75a88f5b509d55ac6  Math-Pari-2.010708.tar.gz
 357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jun 2006 09:26:02 -0000	1.4
+++ .cvsignore	19 Oct 2006 07:58:22 -0000	1.5
@@ -1,2 +1,2 @@
-Math-Pari-2.010706.tar.gz
+Math-Pari-2.010708.tar.gz
 pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Thu Oct 19 08:03:36 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Oct 2006 01:03:36 -0700
Subject: rpms/perl-Math-Pari/FC-4 perl-Math-Pari.spec, 1.3, 1.4 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610190803.k9J83aFI012827@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12807

Modified Files:
	perl-Math-Pari.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/perl-Math-Pari.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Math-Pari.spec	2 Jun 2006 09:27:24 -0000	1.3
+++ perl-Math-Pari.spec	19 Oct 2006 08:03:06 -0000	1.4
@@ -9,7 +9,7 @@
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	2.010706
+Version:	2.010708
 # You'll need to replace pariversion with a hardcoded version number if you're
 # testing with a development version of PARI, as this expression evaluates
 # the latest version of GP/PARI the perl module was tested with.
@@ -19,7 +19,7 @@
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
 Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz
-Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pariversion}.tgz
+Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pariversion}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -53,7 +53,7 @@
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
 /usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -73,6 +73,14 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 2.010708-1
+- Update to 2.010708
+- Fix argument order for find with -depth
+- Fix Source1 URL
+
+* Wed Aug 30 2006 Paul Howarth <paul at city-fan.org> 2.010706-2
+- FE6 mass rebuild
+
 * Fri Jun  2 2006 Paul Howarth <paul at city-fan.org> 2.010706-1
 - Update to 2.010706
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jun 2006 09:27:24 -0000	1.4
+++ sources	19 Oct 2006 08:03:06 -0000	1.5
@@ -1,2 +1,2 @@
-5ed1fb49f246288a9899fa6ad1b7753c  Math-Pari-2.010706.tar.gz
+d06781230dc62eb75a88f5b509d55ac6  Math-Pari-2.010708.tar.gz
 357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jun 2006 09:27:24 -0000	1.4
+++ .cvsignore	19 Oct 2006 08:03:06 -0000	1.5
@@ -1,2 +1,2 @@
-Math-Pari-2.010706.tar.gz
+Math-Pari-2.010708.tar.gz
 pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:32:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:32:48 -0700
Subject: rpms/perl-Calendar-Simple/devel .cvsignore, 1.3,
	1.4 perl-Calendar-Simple.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200610190932.k9J9WmbQ017379@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17359

Modified Files:
	.cvsignore perl-Calendar-Simple.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Sep 2006 13:33:52 -0000	1.3
+++ .cvsignore	19 Oct 2006 09:32:18 -0000	1.4
@@ -1 +1 @@
-Calendar-Simple-1.14.tar.gz
+Calendar-Simple-1.17.tar.gz


Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/devel/perl-Calendar-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Calendar-Simple.spec	7 Oct 2006 04:57:52 -0000	1.5
+++ perl-Calendar-Simple.spec	19 Oct 2006 09:32:18 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
-Version:	1.14
-Release:	2%{?dist}
+Version:	1.17
+Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
-chmod -x COPYING lib/*/*.pm
+chmod -x lib/*/Simple.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -45,10 +45,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes COPYING README
+%{_bindir}/pcal
 %{perl_vendorlib}/Calendar
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
+- Upstream update.
+
 * Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
 - chmod -x files with broken permissions.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Sep 2006 13:33:52 -0000	1.3
+++ sources	19 Oct 2006 09:32:18 -0000	1.4
@@ -1 +1 @@
-b6a9fb7194b9657a8e3932032809fbc3  Calendar-Simple-1.14.tar.gz
+94acbe82b7b1f32293dfdb119b2cf765  Calendar-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:34:32 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:34:32 -0700
Subject: rpms/perl-Calendar-Simple/FC-5 .cvsignore, 1.3,
	1.4 perl-Calendar-Simple.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610190934.k9J9YWaB017445@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17423

Modified Files:
	.cvsignore perl-Calendar-Simple.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Sep 2006 13:38:39 -0000	1.3
+++ .cvsignore	19 Oct 2006 09:34:02 -0000	1.4
@@ -1 +1 @@
-Calendar-Simple-1.14.tar.gz
+Calendar-Simple-1.17.tar.gz


Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-5/perl-Calendar-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Calendar-Simple.spec	7 Oct 2006 04:58:43 -0000	1.4
+++ perl-Calendar-Simple.spec	19 Oct 2006 09:34:02 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
-Version:	1.14
-Release:	2%{?dist}
+Version:	1.17
+Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
-chmod -x COPYING lib/*/*.pm
+chmod -x lib/*/Simple.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -45,10 +45,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes COPYING README
+%{_bindir}/pcal
 %{perl_vendorlib}/Calendar
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
+- Upstream update.
+
 * Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
 - chmod -x files with broken permissions.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Sep 2006 13:38:39 -0000	1.3
+++ sources	19 Oct 2006 09:34:02 -0000	1.4
@@ -1 +1 @@
-b6a9fb7194b9657a8e3932032809fbc3  Calendar-Simple-1.14.tar.gz
+94acbe82b7b1f32293dfdb119b2cf765  Calendar-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:36:09 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:36:09 -0700
Subject: rpms/perl-Calendar-Simple/FC-4 .cvsignore, 1.3,
	1.4 perl-Calendar-Simple.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610190936.k9J9a9tS017512@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17491

Modified Files:
	.cvsignore perl-Calendar-Simple.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Sep 2006 13:39:00 -0000	1.3
+++ .cvsignore	19 Oct 2006 09:35:38 -0000	1.4
@@ -1 +1 @@
-Calendar-Simple-1.14.tar.gz
+Calendar-Simple-1.17.tar.gz


Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-4/perl-Calendar-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Calendar-Simple.spec	7 Oct 2006 04:59:36 -0000	1.4
+++ perl-Calendar-Simple.spec	19 Oct 2006 09:35:38 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
-Version:	1.14
-Release:	2%{?dist}
+Version:	1.17
+Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
-chmod -x COPYING lib/*/*.pm
+chmod -x lib/*/Simple.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -45,10 +45,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes COPYING README
+%{_bindir}/pcal
 %{perl_vendorlib}/Calendar
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
+- Upstream update.
+
 * Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
 - chmod -x files with broken permissions.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Sep 2006 13:39:00 -0000	1.3
+++ sources	19 Oct 2006 09:35:38 -0000	1.4
@@ -1 +1 @@
-b6a9fb7194b9657a8e3932032809fbc3  Calendar-Simple-1.14.tar.gz
+94acbe82b7b1f32293dfdb119b2cf765  Calendar-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:39:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:39:39 -0700
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.14,
	1.15 perl-Params-Util.spec, 1.15, 1.16 sources, 1.14, 1.15
Message-ID: <200610190939.k9J9ddxM017585@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17565

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Oct 2006 06:36:05 -0000	1.14
+++ .cvsignore	19 Oct 2006 09:39:09 -0000	1.15
@@ -1 +1 @@
-Params-Util-0.20.tar.gz
+Params-Util-0.21.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Params-Util.spec	4 Oct 2006 06:36:05 -0000	1.15
+++ perl-Params-Util.spec	19 Oct 2006 09:39:09 -0000	1.16
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.20
+Version: 	0.21
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
+- Upstream update.
+
 * Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Oct 2006 06:36:05 -0000	1.14
+++ sources	19 Oct 2006 09:39:09 -0000	1.15
@@ -1 +1 @@
-33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz
+5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:41:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:41:05 -0700
Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.14,
	1.15 perl-Params-Util.spec, 1.14, 1.15 sources, 1.14, 1.15
Message-ID: <200610190941.k9J9f5YU017653@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17633

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Oct 2006 06:37:26 -0000	1.14
+++ .cvsignore	19 Oct 2006 09:40:35 -0000	1.15
@@ -1 +1 @@
-Params-Util-0.20.tar.gz
+Params-Util-0.21.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Params-Util.spec	4 Oct 2006 06:37:26 -0000	1.14
+++ perl-Params-Util.spec	19 Oct 2006 09:40:35 -0000	1.15
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.20
+Version: 	0.21
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
+- Upstream update.
+
 * Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Oct 2006 06:37:26 -0000	1.14
+++ sources	19 Oct 2006 09:40:35 -0000	1.15
@@ -1 +1 @@
-33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz
+5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:42:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:42:36 -0700
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.14,
	1.15 perl-Params-Util.spec, 1.13, 1.14 sources, 1.14, 1.15
Message-ID: <200610190942.k9J9gaOt017755@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17730

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Oct 2006 06:54:05 -0000	1.14
+++ .cvsignore	19 Oct 2006 09:42:06 -0000	1.15
@@ -1 +1 @@
-Params-Util-0.20.tar.gz
+Params-Util-0.21.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Params-Util.spec	4 Oct 2006 06:54:05 -0000	1.13
+++ perl-Params-Util.spec	19 Oct 2006 09:42:06 -0000	1.14
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.20
+Version: 	0.21
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
+- Upstream update.
+
 * Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Oct 2006 06:54:05 -0000	1.14
+++ sources	19 Oct 2006 09:42:06 -0000	1.15
@@ -1 +1 @@
-33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz
+5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 10:11:12 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 03:11:12 -0700
Subject: rpms/glom/devel .cvsignore, 1.3, 1.4 glom.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200610191011.k9JABC7m020875@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20855

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.0, added omf directory


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 21:39:47 -0000	1.3
+++ .cvsignore	19 Oct 2006 10:10:41 -0000	1.4
@@ -1 +0,0 @@
-glom-1.0.7.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glom.spec	8 Oct 2006 21:39:47 -0000	1.2
+++ glom.spec	19 Oct 2006 10:10:41 -0000	1.3
@@ -1,5 +1,5 @@
-%define major_version  1.0
-%define minor_version  7
+%define major_version  1.2
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -75,11 +75,7 @@
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libglom.so
 
-cat << EOF >> ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
-MimeType=application/x-glom;
-EOF
-
-desktop-file-install --vendor fedora --delete-original     \
+desktop-file-install --vendor "" --delete-original         \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
   --add-category X-Fedora                                  \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
@@ -110,15 +106,20 @@
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/python2.4/site-packages/%{name}.so
 %{_datadir}/%{name}/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mime-info/*
+%{_datadir}/omf/%{name}
 
 
 %changelog
+* Wed Oct 18 2006 Denis Leroy <denis at poolshark.org> - 1.2.0-1
+- Update to 1.2.0
+- Added omf directory
+
 * Sun Oct  8 2006 Denis Leroy <denis at poolshark.org> - 1.0.7-1
 - Update to 1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 21:39:47 -0000	1.3
+++ sources	19 Oct 2006 10:10:41 -0000	1.4
@@ -1 +0,0 @@
-64a8e0a8214c7a3267b7d97caec65817  glom-1.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 10:17:13 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 03:17:13 -0700
Subject: rpms/glom/devel .cvsignore, 1.4, 1.5 glom.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200610191017.k9JAHDx7021038@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21018

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Rebuild with correct sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Oct 2006 10:10:41 -0000	1.4
+++ .cvsignore	19 Oct 2006 10:16:43 -0000	1.5
@@ -0,0 +1 @@
+glom-1.2.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glom.spec	19 Oct 2006 10:10:41 -0000	1.3
+++ glom.spec	19 Oct 2006 10:16:43 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Denis Leroy <denis at poolshark.org> - 1.2.0-2
+- Rebuild with correct sources files
+
 * Wed Oct 18 2006 Denis Leroy <denis at poolshark.org> - 1.2.0-1
 - Update to 1.2.0
 - Added omf directory


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Oct 2006 10:10:41 -0000	1.4
+++ sources	19 Oct 2006 10:16:43 -0000	1.5
@@ -0,0 +1 @@
+690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 10:22:12 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 03:22:12 -0700
Subject: rpms/glom/FC-5 .cvsignore, 1.3, 1.4 glom.spec, 1.2, 1.3 sources, 1.3,
	1.4
Message-ID: <200610191022.k9JAMCGs021190@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21155

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.0. Added omf directory


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 21:39:47 -0000	1.3
+++ .cvsignore	19 Oct 2006 10:21:41 -0000	1.4
@@ -1 +1 @@
-glom-1.0.7.tar.bz2
+glom-1.2.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/glom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glom.spec	8 Oct 2006 21:39:47 -0000	1.2
+++ glom.spec	19 Oct 2006 10:21:41 -0000	1.3
@@ -1,5 +1,5 @@
-%define major_version  1.0
-%define minor_version  7
+%define major_version  1.2
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -75,11 +75,7 @@
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libglom.so
 
-cat << EOF >> ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
-MimeType=application/x-glom;
-EOF
-
-desktop-file-install --vendor fedora --delete-original     \
+desktop-file-install --vendor "" --delete-original     \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
   --add-category X-Fedora                                  \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
@@ -110,15 +106,20 @@
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/python2.4/site-packages/%{name}.so
 %{_datadir}/%{name}/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mime-info/*
+%{_datadir}/omf/%{name}
 
 
 %changelog
+* Thu Oct 19 2006 Denis Leroy <denis at poolshark.org> - 1.2.0-1
+- Update to 1.2.0
+- Added omf directory
+
 * Sun Oct  8 2006 Denis Leroy <denis at poolshark.org> - 1.0.7-1
 - Update to 1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 21:39:47 -0000	1.3
+++ sources	19 Oct 2006 10:21:41 -0000	1.4
@@ -1 +1 @@
-64a8e0a8214c7a3267b7d97caec65817  glom-1.0.7.tar.bz2
+690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 13:55:19 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 19 Oct 2006 06:55:19 -0700
Subject: comps comps-fe5.xml.in,1.174,1.175 comps-fe6.xml.in,1.197,1.198
Message-ID: <200610191355.k9JDtJRm031902@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31884

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add a few sci/engr packages



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- comps-fe5.xml.in	18 Oct 2006 21:52:37 -0000	1.174
+++ comps-fe5.xml.in	19 Oct 2006 13:54:49 -0000	1.175
@@ -224,6 +224,7 @@
       <packagereq type="optional">atlas</packagereq>
       <packagereq type="optional">blacs</packagereq>
       <packagereq type="optional">blas</packagereq>
+      <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
@@ -234,6 +235,8 @@
       <packagereq type="optional">gnucap</packagereq>
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
+      <packagereq type="optional">gts</packagereq>
+      <packagereq type="optional">harminv</packagereq>
       <packagereq type="optional">hdf</packagereq>
       <packagereq type="optional">hdf5</packagereq>
       <packagereq type="optional">hmmer</packagereq>
@@ -241,12 +244,18 @@
       <packagereq type="optional">kst</packagereq>
       <packagereq type="optional">lagan</packagereq>
       <packagereq type="optional">lapack</packagereq>
+      <packagereq type="optional">libctl</packagereq>
+      <packagereq type="optional">libmatheval</packagereq>
       <packagereq type="optional">ncarg</packagereq>
+      <packagereq type="optional">nco</packagereq>
+      <packagereq type="optional">ncview</packagereq>
+      <packagereq type="optional">netcdf</packagereq>
       <packagereq type="optional">numpy</packagereq>
       <packagereq type="optional">octave</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">openbabel</packagereq>
       <packagereq type="optional">orpie</packagereq>
+      <packagereq type="optional">osiv</packagereq>
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
@@ -256,6 +265,7 @@
       <packagereq type="optional">R</packagereq>
       <packagereq type="optional">R-RScaLAPACK</packagereq>
       <packagereq type="optional">scalapack</packagereq>
+      <packagereq type="optional">scrip</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
     </packagelist>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- comps-fe6.xml.in	19 Oct 2006 06:56:47 -0000	1.197
+++ comps-fe6.xml.in	19 Oct 2006 13:54:49 -0000	1.198
@@ -283,6 +283,7 @@
       <packagereq type="optional">gresistor</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
       <packagereq type="optional">gts</packagereq>
+      <packagereq type="optional">harminv</packagereq>
       <packagereq type="optional">hdf</packagereq>
       <packagereq type="optional">hdf5</packagereq>
       <packagereq type="optional">hmmer</packagereq>
@@ -291,6 +292,8 @@
       <packagereq type="optional">kst</packagereq>
       <packagereq type="optional">lagan</packagereq>
       <packagereq type="optional">lapack</packagereq>
+      <packagereq type="optional">libctl</packagereq>
+      <packagereq type="optional">libmatheval</packagereq>
       <packagereq type="optional">ncarg</packagereq>
       <packagereq type="optional">nco</packagereq>
       <packagereq type="optional">ncview</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 14:06:41 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 07:06:41 -0700
Subject: rpms/galeon/devel galeon-2.0.3-flashfix.patch, NONE, 1.1 galeon.spec,
	1.24, 1.25
Message-ID: <200610191406.k9JE6fZT002481@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2455

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-flashfix.patch 
Log Message:
Fix for 210807 (flash crash). Made BR on gecko-devel

galeon-2.0.3-flashfix.patch:

--- NEW FILE galeon-2.0.3-flashfix.patch ---
--- galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.orig	2006-10-19 15:43:31.000000000 +0200
+++ galeon-2.0.3/mozilla/mozilla-embed-shell.cpp	2006-10-19 15:41:51.000000000 +0200
@@ -236,6 +236,9 @@
 
 	g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
 
+	/* Work-around Flash Player crash */
+	g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE);
+
 	g_string_free (new_path, TRUE);
 }
 


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- galeon.spec	4 Oct 2006 22:56:43 -0000	1.24
+++ galeon.spec	19 Oct 2006 14:06:10 -0000	1.25
@@ -1,17 +1,18 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
+Patch0:		galeon-2.0.3-flashfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	gnome-desktop-devel
-BuildRequires:	firefox-devel
+BuildRequires:	gecko-devel
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
@@ -32,13 +33,16 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
+%patch0 -p1 -b .flashfix
 
 
 %build
 %configure \
 	--disable-nautilus-view			\
 	--disable-werror                        \
-	--disable-schemas-install
+	--disable-schemas-install		\
+	--disable-dependency-tracking		\
+	--with-mozilla=firefox
 make %{?_smp_mflags}
 
 
@@ -106,6 +110,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Denis Leroy <denis at poolshark.org> - 2.0.3-3
+- Added patch to fix flash plugin crash
+- Make package depend on gecko-devel
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.3-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Oct 19 14:51:32 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 19 Oct 2006 07:51:32 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 telepathy-gabble.spec, 1.10, 1.11
Message-ID: <200610191451.k9JEpWMi002871@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2850

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
- Update to 0.4.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Oct 2006 18:25:13 -0000	1.10
+++ .cvsignore	19 Oct 2006 14:51:02 -0000	1.11
@@ -1 +1 @@
-telepathy-gabble-0.3.13.tar.gz
+telepathy-gabble-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Oct 2006 18:25:13 -0000	1.10
+++ sources	19 Oct 2006 14:51:02 -0000	1.11
@@ -1 +1 @@
-5c450c77155aec13d4762b38b3ccb980  telepathy-gabble-0.3.13.tar.gz
+dc78e31762fef419c6c64d2f8a82e012  telepathy-gabble-0.4.0.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- telepathy-gabble.spec	13 Oct 2006 18:25:13 -0000	1.10
+++ telepathy-gabble.spec	19 Oct 2006 14:51:02 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.13
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
+- Update to 0.4.0.
+
 * Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.13-1
 - Update to 0.3.13.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 15:03:54 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 08:03:54 -0700
Subject: rpms/soundconverter/devel .cvsignore, 1.6, 1.7 soundconverter.spec, 
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200610191503.k9JF3sGU005959@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5939

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Oct 2006 08:45:39 -0000	1.6
+++ .cvsignore	19 Oct 2006 15:03:24 -0000	1.7
@@ -1 +1 @@
-soundconverter-0.9.2.tar.gz
+soundconverter-0.9.3.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/soundconverter.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- soundconverter.spec	17 Oct 2006 08:45:39 -0000	1.10
+++ soundconverter.spec	19 Oct 2006 15:03:24 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           soundconverter
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Denis Leroy <denis at poolshark.org> - 0.9.3-1
+- Update to 0.9.3
+
 * Tue Oct 17 2006 Denis Leroy <denis at poolshark.org> - 0.9.2-1
 - Update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Oct 2006 08:45:39 -0000	1.6
+++ sources	19 Oct 2006 15:03:24 -0000	1.7
@@ -1 +1 @@
-ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz
+4f54b5b706c2f69924936f6bd5b0bcd6  soundconverter-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 15:25:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 19 Oct 2006 08:25:46 -0700
Subject: comps comps-fe5.xml.in,1.175,1.176 comps-fe6.xml.in,1.198,1.199
Message-ID: <200610191525.k9JFPkLT006245@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6227

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added genius


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- comps-fe5.xml.in	19 Oct 2006 13:54:49 -0000	1.175
+++ comps-fe5.xml.in	19 Oct 2006 15:25:16 -0000	1.176
@@ -231,6 +231,7 @@
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">geant321</packagereq>
+      <packagereq type="optional">genius</packagereq>	
       <packagereq type="optional">ghdl</packagereq>
       <packagereq type="optional">gnucap</packagereq>
       <packagereq type="optional">grads</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- comps-fe6.xml.in	19 Oct 2006 13:54:49 -0000	1.198
+++ comps-fe6.xml.in	19 Oct 2006 15:25:16 -0000	1.199
@@ -269,6 +269,7 @@
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">geant321</packagereq>
+      <packagereq type="optional">genius</packagereq>	
       <packagereq type="optional">geda-docs</packagereq>
       <packagereq type="optional">geda-example</packagereq>
       <packagereq type="optional">geda-gattrib</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 15:36:13 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Oct 2006 08:36:13 -0700
Subject: rpms/svn2cl/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 svn2cl.spec,
	1.3, 1.4
Message-ID: <200610191536.k9JFaDTU006586@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6548/FC-5

Modified Files:
	.cvsignore sources svn2cl.spec 
Log Message:
* Thu Oct 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8-1
- 0.8.
- Add (empty) %build section.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jun 2006 21:44:10 -0000	1.3
+++ .cvsignore	19 Oct 2006 15:35:43 -0000	1.4
@@ -1 +1 @@
-svn2cl-0.7.tar.gz
+svn2cl-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jun 2006 21:44:10 -0000	1.3
+++ sources	19 Oct 2006 15:35:43 -0000	1.4
@@ -1 +1 @@
-03806cf56c9a04739cc1120c23c1b2be  svn2cl-0.7.tar.gz
+240cb722c31823cd37c39361efbc37f1  svn2cl-0.8.tar.gz


Index: svn2cl.spec
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/FC-5/svn2cl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svn2cl.spec	1 Jun 2006 21:44:10 -0000	1.3
+++ svn2cl.spec	19 Oct 2006 15:35:43 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           svn2cl
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Create a ChangeLog from a Subversion log
 
@@ -25,6 +25,9 @@
 sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' svn2cl.sh
 
 
+%build
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
@@ -46,6 +49,13 @@
 
 
 %changelog
+* Thu Oct 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8-1
+- 0.8.
+- Add (empty) %%build section.
+
+* Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-2
+- Rebuild.
+
 * Fri Jun  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-1
 - 0.7.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 15:36:14 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Oct 2006 08:36:14 -0700
Subject: rpms/svn2cl/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 svn2cl.spec,
	1.4, 1.5
Message-ID: <200610191536.k9JFaEKw006591@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6548/devel

Modified Files:
	.cvsignore sources svn2cl.spec 
Log Message:
* Thu Oct 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8-1
- 0.8.
- Add (empty) %build section.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jun 2006 21:44:11 -0000	1.3
+++ .cvsignore	19 Oct 2006 15:35:44 -0000	1.4
@@ -1 +1 @@
-svn2cl-0.7.tar.gz
+svn2cl-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jun 2006 21:44:11 -0000	1.3
+++ sources	19 Oct 2006 15:35:44 -0000	1.4
@@ -1 +1 @@
-03806cf56c9a04739cc1120c23c1b2be  svn2cl-0.7.tar.gz
+240cb722c31823cd37c39361efbc37f1  svn2cl-0.8.tar.gz


Index: svn2cl.spec
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/svn2cl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- svn2cl.spec	15 Sep 2006 16:28:54 -0000	1.4
+++ svn2cl.spec	19 Oct 2006 15:35:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           svn2cl
-Version:        0.7
-Release:        2%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Create a ChangeLog from a Subversion log
 
 Group:          Development/Tools
@@ -25,6 +25,9 @@
 sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' svn2cl.sh
 
 
+%build
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
@@ -46,6 +49,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8-1
+- 0.8.
+- Add (empty) %%build section.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 16:28:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Oct 2006 09:28:27 -0700
Subject: rpms/libetpan/FC-3 .cvsignore, 1.8, 1.9 libetpan.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200610191628.k9JGSRbO009957@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/FC-3

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Apr 2006 21:40:09 -0000	1.8
+++ .cvsignore	19 Oct 2006 16:27:57 -0000	1.9
@@ -1 +1 @@
-libetpan-0.45.tar.gz
+libetpan-0.47.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libetpan.spec	5 Apr 2006 21:40:09 -0000	1.7
+++ libetpan.spec	19 Oct 2006 16:27:57 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.45
+Version:        0.47
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.1.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.47-1
+- version upgrade
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.45-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Apr 2006 21:40:09 -0000	1.8
+++ sources	19 Oct 2006 16:27:57 -0000	1.9
@@ -1 +1 @@
-0135cf6a9d97afb1f75001f514448836  libetpan-0.45.tar.gz
+bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 16:28:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Oct 2006 09:28:28 -0700
Subject: rpms/libetpan/FC-4 .cvsignore, 1.9, 1.10 libetpan.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200610191628.k9JGSSh7009962@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/FC-4

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:47:38 -0000	1.9
+++ .cvsignore	19 Oct 2006 16:27:58 -0000	1.10
@@ -1 +1 @@
-libetpan-0.46.tar.gz
+libetpan-0.47.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libetpan.spec	30 Sep 2006 09:47:38 -0000	1.8
+++ libetpan.spec	19 Oct 2006 16:27:58 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.46
+Version:        0.47
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.0.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.47-1
+- version upgrade
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.46-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:47:38 -0000	1.9
+++ sources	19 Oct 2006 16:27:58 -0000	1.10
@@ -1 +1 @@
-afa4abd73665e1a46b0510c4f4efa9a9  libetpan-0.46.tar.gz
+bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 16:28:29 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Oct 2006 09:28:29 -0700
Subject: rpms/libetpan/FC-5 .cvsignore, 1.9, 1.10 libetpan.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200610191628.k9JGSTv4009967@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/FC-5

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Sep 2006 15:58:09 -0000	1.9
+++ .cvsignore	19 Oct 2006 16:27:59 -0000	1.10
@@ -1 +1 @@
-libetpan-0.46.tar.gz
+libetpan-0.47.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/libetpan.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libetpan.spec	26 Sep 2006 15:58:09 -0000	1.11
+++ libetpan.spec	19 Oct 2006 16:27:59 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.46
+Version:        0.47
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.0.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.47-1
+- version upgrade
+
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.46-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Sep 2006 15:58:09 -0000	1.9
+++ sources	19 Oct 2006 16:27:59 -0000	1.10
@@ -1 +1 @@
-afa4abd73665e1a46b0510c4f4efa9a9  libetpan-0.46.tar.gz
+bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 16:28:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Oct 2006 09:28:30 -0700
Subject: rpms/libetpan/devel .cvsignore, 1.9, 1.10 libetpan.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200610191628.k9JGSUvk009972@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/devel

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Sep 2006 16:26:23 -0000	1.9
+++ .cvsignore	19 Oct 2006 16:28:00 -0000	1.10
@@ -1 +1 @@
-libetpan-0.46.tar.gz
+libetpan-0.47.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libetpan.spec	4 Oct 2006 22:14:53 -0000	1.13
+++ libetpan.spec	19 Oct 2006 16:28:00 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libetpan
-Version:        0.46
-Release:        2%{?dist}
+Version:        0.47
+Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
 Group:          System Environment/Libraries
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.0.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.47-1
+- version upgrade
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.46-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Sep 2006 16:26:23 -0000	1.9
+++ sources	19 Oct 2006 16:28:00 -0000	1.10
@@ -1 +1 @@
-afa4abd73665e1a46b0510c4f4efa9a9  libetpan-0.46.tar.gz
+bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 16:33:01 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 19 Oct 2006 09:33:01 -0700
Subject: comps comps-fe5.xml.in,1.176,1.177
Message-ID: <200610191633.k9JGX1Bl010079@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10063

Modified Files:
	comps-fe5.xml.in 
Log Message:
add wallpapoz to comps-fe5.xml.in


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- comps-fe5.xml.in	19 Oct 2006 15:25:16 -0000	1.176
+++ comps-fe5.xml.in	19 Oct 2006 16:32:30 -0000	1.177
@@ -422,6 +422,7 @@
       <packagereq type="optional">seahorse</packagereq>
       <packagereq type="optional">smeg</packagereq>
       <packagereq type="optional">themes-backgrounds-gnome</packagereq>
+      <packagereq type="optional">wallpapoz</packagereq>
       <packagereq type="optional">wp_tray</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Thu Oct 19 16:55:20 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 09:55:20 -0700
Subject: comps comps-fe6.xml.in,1.199,1.200
Message-ID: <200610191655.k9JGtK0i010354@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10338

Modified Files:
	comps-fe6.xml.in 
Log Message:
Finally got around to updating comps with my own packages


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- comps-fe6.xml.in	19 Oct 2006 15:25:16 -0000	1.199
+++ comps-fe6.xml.in	19 Oct 2006 16:54:49 -0000	1.200
@@ -280,6 +280,7 @@
       <packagereq type="optional">geda-utils</packagereq>
       <packagereq type="optional">ghdl</packagereq>
       <packagereq type="optional">gnucap</packagereq>
+      <packagereq type="optional">gpredict</packagereq>
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gresistor</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
@@ -309,6 +310,7 @@
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">pcb</packagereq>
+      <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>
       <packagereq type="optional">qcad</packagereq>
@@ -496,6 +498,7 @@
       <packagereq type="optional">anjuta</packagereq>
       <packagereq type="optional">anjuta-docs</packagereq>
       <packagereq type="optional">at-poke</packagereq>
+      <packagereq type="optional">bakery-devel</packagereq>
       <packagereq type="optional">bit-devel</packagereq>
       <packagereq type="optional">bitgtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
@@ -512,8 +515,13 @@
       <packagereq type="optional">gtkalog</packagereq>
       <packagereq type="optional">gtkdatabox</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
+      <packagereq type="optional">libglademm24-devel</packagereq>
+      <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
+      <packagereq type="optional">libgnomemm26-devel</packagereq>
+      <packagereq type="optional">libgnomeuimm26-devel</packagereq>
       <packagereq type="optional">libsexy-devel</packagereq>
       <packagereq type="optional">libsexymm-devel</packagereq>
+      <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">papyrus-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
     </packagelist>
@@ -573,6 +581,7 @@
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
+      <packagereq type="optional">transmission</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">valknut</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
@@ -602,6 +611,7 @@
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>
       <packagereq type="optional">optipng</packagereq>
+      <packagereq type="optional">pstoedit</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">rawstudio</packagereq>
@@ -774,6 +784,7 @@
       <packagereq type="optional">jabberd</packagereq>
       <packagereq type="optional">kannel</packagereq>
       <packagereq type="optional">l2tpd</packagereq>
+      <packagereq type="optional">NetworkManager-vpnc</packagereq>
       <packagereq type="optional">nsd</packagereq>
       <packagereq type="optional">oidentd</packagereq>
       <packagereq type="optional">openvpn</packagereq>
@@ -813,6 +824,7 @@
       <packagereq type="optional">dia</packagereq>
       <packagereq type="optional">gdeskcal</packagereq>
       <packagereq type="optional">glabels</packagereq>
+      <packagereq type="optional">glom</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gnumeric</packagereq>
       <packagereq type="optional">gramps</packagereq>
@@ -850,6 +862,7 @@
       <packagereq type="optional">audacity</packagereq>
       <packagereq type="optional">bin2iso</packagereq>
       <packagereq type="optional">bmp</packagereq>
+      <packagereq type="optional">brasero</packagereq>
       <packagereq type="optional">camE</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
@@ -958,6 +971,7 @@
       <packagereq type="optional">oddjob</packagereq>
       <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
+      <packagereq type="optional">pam_keyring</packagereq>
       <packagereq type="optional">par2cmdline</packagereq>
       <packagereq type="optional">pbzip2</packagereq>
       <packagereq type="optional">powerman</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 17:12:07 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 10:12:07 -0700
Subject: comps comps-fe5.xml.in,1.177,1.178
Message-ID: <200610191712.k9JHC7UE013422@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13404

Modified Files:
	comps-fe5.xml.in 
Log Message:
Updated my packages


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- comps-fe5.xml.in	19 Oct 2006 16:32:30 -0000	1.177
+++ comps-fe5.xml.in	19 Oct 2006 17:11:37 -0000	1.178
@@ -234,6 +234,7 @@
       <packagereq type="optional">genius</packagereq>	
       <packagereq type="optional">ghdl</packagereq>
       <packagereq type="optional">gnucap</packagereq>
+      <packagereq type="optional">gpredict</packagereq>
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
       <packagereq type="optional">gts</packagereq>
@@ -259,6 +260,7 @@
       <packagereq type="optional">osiv</packagereq>
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
+      <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>
       <packagereq type="optional">qcad</packagereq>
@@ -436,6 +438,7 @@
       <packagereq type="optional">anjuta</packagereq>
       <packagereq type="optional">anjuta-docs</packagereq>
       <packagereq type="optional">at-poke</packagereq>
+      <packagereq type="optional">bakery-devel</packagereq>
       <packagereq type="optional">bit-devel</packagereq>
       <packagereq type="optional">bitgtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
@@ -445,14 +448,20 @@
       <packagereq type="optional">gconfmm26-devel</packagereq>
       <packagereq type="optional">glibmm24-devel</packagereq>
       <packagereq type="optional">gnome-common</packagereq>
+      <packagereq type="optional">gnome-python2-gda-devel</packagereq>
       <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
       <packagereq type="optional">gquilt</packagereq>
       <packagereq type="optional">gtk+extra</packagereq>
       <packagereq type="optional">gtkalog</packagereq>
       <packagereq type="optional">gtkdatabox</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
+      <packagereq type="optional">libglademm24-devel</packagereq>
+      <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
+      <packagereq type="optional">libgnomemm26-devel</packagereq>
+      <packagereq type="optional">libgnomeuimm26-devel</packagereq>
       <packagereq type="optional">libsexy-devel</packagereq>
       <packagereq type="optional">libsexymm-devel</packagereq>
+      <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">papyrus-devel</packagereq>
     </packagelist>
   </group>
@@ -510,6 +519,7 @@
       <packagereq type="optional">straw</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
+      <packagereq type="optional">transmission</packagereq>
       <packagereq type="optional">valknut</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
       <packagereq type="optional">xchat-gnome</packagereq>
@@ -535,6 +545,7 @@
       <packagereq type="optional">gwenview</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">k3d</packagereq>
+      <packagereq type="optional">pstoedit</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">rawstudio</packagereq>
@@ -693,6 +704,7 @@
       <packagereq type="optional">jabberd</packagereq>
       <packagereq type="optional">kannel</packagereq>
       <packagereq type="optional">l2tpd</packagereq>
+      <packagereq type="optional">NetworkManager-vpnc</packagereq>
       <packagereq type="optional">nsd</packagereq>
       <packagereq type="optional">openvpn</packagereq>
       <packagereq type="optional">puppet-server</packagereq>
@@ -725,6 +737,7 @@
       <packagereq type="optional">dia</packagereq>
       <packagereq type="optional">gdeskcal</packagereq>
       <packagereq type="optional">glabels</packagereq>
+      <packagereq type="optional">glom</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gnumeric</packagereq>
       <packagereq type="optional">gourmet</packagereq>
@@ -845,6 +858,7 @@
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nomarch</packagereq>
       <packagereq type="optional">oddjob</packagereq>
+      <packagereq type="optional">pam_keyring</packagereq>
       <packagereq type="optional">pbzip2</packagereq>
       <packagereq type="optional">puppet</packagereq>
       <packagereq type="optional">qstat</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 17:14:22 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 10:14:22 -0700
Subject: comps comps-fe6.xml.in,1.200,1.201
Message-ID: <200610191714.k9JHEMHI013472@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13451

Modified Files:
	comps-fe6.xml.in 
Log Message:
Forgot gnome-python2-gda


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- comps-fe6.xml.in	19 Oct 2006 16:54:49 -0000	1.200
+++ comps-fe6.xml.in	19 Oct 2006 17:13:51 -0000	1.201
@@ -508,6 +508,7 @@
       <packagereq type="optional">gconfmm26-devel</packagereq>
       <packagereq type="optional">glibmm24-devel</packagereq>
       <packagereq type="optional">gnome-common</packagereq>
+      <packagereq type="optional">gnome-python2-gda-devel</packagereq>
       <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
       <packagereq type="optional">gquilt</packagereq>
       <packagereq type="optional">gtk+extra</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 17:25:03 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 10:25:03 -0700
Subject: rpms/bwidget/FC-5 .cvsignore, 1.2, 1.3 bwidget.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610191725.k9JHP3gp013572@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bwidget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13536/FC-5

Modified Files:
	.cvsignore bwidget.spec sources 
Log Message:
Update to 1.8.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bwidget/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Feb 2006 17:40:19 -0000	1.2
+++ .cvsignore	19 Oct 2006 17:24:33 -0000	1.3
@@ -1 +1 @@
-BWidget-1.7.0.tar.gz
+BWidget-1.8.0.tar.gz


Index: bwidget.spec
===================================================================
RCS file: /cvs/extras/rpms/bwidget/FC-5/bwidget.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bwidget.spec	13 Aug 2006 04:14:17 -0000	1.2
+++ bwidget.spec	19 Oct 2006 17:24:33 -0000	1.3
@@ -1,13 +1,12 @@
 Name:           bwidget
-Version:        1.7.0
-Release:        3%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Extended widget set for Tk
 
 Group:          Development/Libraries
 License:        Distributable
 URL:            http://tcllib.sourceforge.net/
-Source0:        http://download.sourceforge.net/tcllib/BWidget-1.7.0.tar.gz
-Patch0:         bwidget-1.7.0-colorchooser.patch
+Source0:        http://download.sourceforge.net/tcllib/BWidget-1.8.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q -n BWidget-%{version}
-%patch0 -p4
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %install
@@ -46,6 +44,10 @@
 %doc BWman/*.html
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.8.0-1
+- Update to 1.8.0
+- Remove patch that was accepted upstream
+
 * Fri Aug 11 2006 Wart <wart at kobold.org> 1.7.0-3
 - Add patch for adding a color selector to the font dialog (BZ #200809)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bwidget/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Feb 2006 17:40:19 -0000	1.2
+++ sources	19 Oct 2006 17:24:33 -0000	1.3
@@ -1 +1 @@
-d28c6b781dd06f09e55bbb3fccb1ee3c  BWidget-1.7.0.tar.gz
+bc590989cae539a9c78fda34e12e277e  BWidget-1.8.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 17:25:04 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 10:25:04 -0700
Subject: rpms/bwidget/devel .cvsignore, 1.2, 1.3 bwidget.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610191725.k9JHP4Tr013577@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bwidget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13536/devel

Modified Files:
	.cvsignore bwidget.spec sources 
Log Message:
Update to 1.8.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bwidget/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Feb 2006 17:40:19 -0000	1.2
+++ .cvsignore	19 Oct 2006 17:24:34 -0000	1.3
@@ -1 +1 @@
-BWidget-1.7.0.tar.gz
+BWidget-1.8.0.tar.gz


Index: bwidget.spec
===================================================================
RCS file: /cvs/extras/rpms/bwidget/devel/bwidget.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bwidget.spec	28 Aug 2006 16:48:50 -0000	1.3
+++ bwidget.spec	19 Oct 2006 17:24:34 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           bwidget
-Version:        1.7.0
-Release:        4%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Extended widget set for Tk
 
 Group:          Development/Libraries
 License:        Distributable
 URL:            http://tcllib.sourceforge.net/
-Source0:        http://download.sourceforge.net/tcllib/BWidget-1.7.0.tar.gz
-Patch0:         bwidget-1.7.0-colorchooser.patch
+Source0:        http://download.sourceforge.net/tcllib/BWidget-1.8.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q -n BWidget-%{version}
-%patch0 -p4
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %install
@@ -46,6 +44,10 @@
 %doc BWman/*.html
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.8.0-1
+- Update to 1.8.0
+- Remove patch that was accepted upstream
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> 1.7.0-4
 - Rebuild for Fedora Extras
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bwidget/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Feb 2006 17:40:19 -0000	1.2
+++ sources	19 Oct 2006 17:24:34 -0000	1.3
@@ -1 +1 @@
-d28c6b781dd06f09e55bbb3fccb1ee3c  BWidget-1.7.0.tar.gz
+bc590989cae539a9c78fda34e12e277e  BWidget-1.8.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 17:26:11 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 10:26:11 -0700
Subject: rpms/bwidget/devel bwidget-1.7.0-colorchooser.patch,1.1,NONE
Message-ID: <200610191726.k9JHQBTh013627@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bwidget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13622

Removed Files:
	bwidget-1.7.0-colorchooser.patch 
Log Message:
Patch accepted upstream.




--- bwidget-1.7.0-colorchooser.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 19 17:26:47 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 10:26:47 -0700
Subject: rpms/bwidget/FC-5 bwidget-1.7.0-colorchooser.patch,1.1,NONE
Message-ID: <200610191726.k9JHQl77013663@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bwidget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13658

Removed Files:
	bwidget-1.7.0-colorchooser.patch 
Log Message:
Patch accepted upstream




--- bwidget-1.7.0-colorchooser.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 19 17:27:28 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 19 Oct 2006 10:27:28 -0700
Subject: rpms/aalib/devel aalib.spec,1.14,1.15
Message-ID: <200610191727.k9JHRS2x013694@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/aalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13678

Modified Files:
	aalib.spec 
Log Message:
* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.10.rc6
- Rebuild with ncurses support



Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aalib.spec	28 Aug 2006 05:05:47 -0000	1.14
+++ aalib.spec	19 Oct 2006 17:26:58 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:        ASCII art library
 Name:           aalib
 Version:        1.4.0
-Release:        0.9.%{rc_subver}%{?dist}
+Release:        0.10.%{rc_subver}%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://aa-project.sourceforge.net/aalib/
@@ -13,7 +13,7 @@
 Patch2:         aalib-1.4rc5-bug149361.patch
 Patch3:         aalib-1.4rc5-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  slang-devel libXt-devel gpm-devel
+BuildRequires:  slang-devel libXt-devel gpm-devel ncurses-devel
 
 %description
 AA-lib is a low level gfx library just as many other libraries are. The
@@ -51,7 +51,7 @@
 
 
 %build
-%configure --disable-static
+%configure --disable-static  --with-curses-driver=yes --with-ncurses
 # 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
@@ -101,6 +101,9 @@
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.10.rc6
+- Rebuild with ncurses support
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-0.8.rc6
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Thu Oct 19 17:30:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 19 Oct 2006 10:30:22 -0700
Subject: owners owners.list,1.1854,1.1855
Message-ID: <200610191730.k9JHUMkC013846@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13799

Modified Files:
	owners.list 
Log Message:
taking ownership of aalib


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1854
retrieving revision 1.1855
diff -u -r1.1854 -r1.1855
--- owners.list	19 Oct 2006 06:52:38 -0000	1.1854
+++ owners.list	19 Oct 2006 17:29:52 -0000	1.1855
@@ -11,7 +11,7 @@
 #
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 Fedora Extras|915resolution|Intel video BIOS hack to support certain resolutions|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
-Fedora Extras|aalib|An ASCII art library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|aalib|An ASCII art library|garrick at usc.edu|extras-qa at fedoraproject.org|
 Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abcMIDI|ABC to/from MIDI conversion utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct 19 17:47:03 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 19 Oct 2006 10:47:03 -0700
Subject: rpms/comix/devel .cvsignore, 1.2, 1.3 comix.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200610191747.k9JHl32t013946@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13923

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
* Thu Oct 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.1-1
- 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 03:40:40 -0000	1.2
+++ .cvsignore	19 Oct 2006 17:46:33 -0000	1.3
@@ -1 +1 @@
-comix-3.6.tar.gz
+comix-3.6.1.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comix.spec	7 Oct 2006 03:40:40 -0000	1.1
+++ comix.spec	19 Oct 2006 17:46:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		comix
-Version:	3.6
-Release:	2%{?dist}
+Version:	3.6.1
+Release:	1%{?dist}
 Summary:	A user-friendly, customizable image viewer
 
 Group:		Amusements/Graphics
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.1-1
+- 3.6.1
+
 * Fri Oct 06 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6-2
 - Specify URL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 03:40:40 -0000	1.2
+++ sources	19 Oct 2006 17:46:33 -0000	1.3
@@ -1 +1 @@
-2d6034c5c032fcb5fe257048d64364a8  comix-3.6.tar.gz
+5ed7c540ed9434783c3cdb041912d41d  comix-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 17:49:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 19 Oct 2006 10:49:25 -0700
Subject: rpms/comix/FC-5 .cvsignore, 1.2, 1.3 comix.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610191749.k9JHnPQU014040@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14015

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
* Thu Oct 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.1-1
- 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 03:40:40 -0000	1.2
+++ .cvsignore	19 Oct 2006 17:48:55 -0000	1.3
@@ -1 +1 @@
-comix-3.6.tar.gz
+comix-3.6.1.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/FC-5/comix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comix.spec	7 Oct 2006 03:40:40 -0000	1.1
+++ comix.spec	19 Oct 2006 17:48:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		comix
-Version:	3.6
-Release:	2%{?dist}
+Version:	3.6.1
+Release:	1%{?dist}
 Summary:	A user-friendly, customizable image viewer
 
 Group:		Amusements/Graphics
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.1-1
+- 3.6.1
+
 * Fri Oct 06 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6-2
 - Specify URL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 03:40:40 -0000	1.2
+++ sources	19 Oct 2006 17:48:55 -0000	1.3
@@ -1 +1 @@
-2d6034c5c032fcb5fe257048d64364a8  comix-3.6.tar.gz
+5ed7c540ed9434783c3cdb041912d41d  comix-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 17:50:20 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 19 Oct 2006 10:50:20 -0700
Subject: rpms/aalib/devel aalib.spec,1.15,1.16
Message-ID: <200610191750.k9JHoKfF014105@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/aalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14089

Modified Files:
	aalib.spec 
Log Message:
* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.11.rc5
- incorrect subversion in previous two changelog entries



Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aalib.spec	19 Oct 2006 17:26:58 -0000	1.15
+++ aalib.spec	19 Oct 2006 17:49:49 -0000	1.16
@@ -3,7 +3,7 @@
 Summary:        ASCII art library
 Name:           aalib
 Version:        1.4.0
-Release:        0.10.%{rc_subver}%{?dist}
+Release:        0.11.%{rc_subver}%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://aa-project.sourceforge.net/aalib/
@@ -101,6 +101,9 @@
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.11.rc5
+- incorrect subversion in previous two changelog entries
+
 * Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.10.rc6
 - Rebuild with ncurses support
 



From fedora-extras-commits at redhat.com  Thu Oct 19 17:52:54 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 19 Oct 2006 10:52:54 -0700
Subject: rpms/clement/devel clement.spec,1.19,1.20
Message-ID: <200610191752.k9JHqsXu014189@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/clement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14166

Modified Files:
	clement.spec 
Log Message:
* Thu Oct 19 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1-210
- Remove errant repository.



Index: clement.spec
===================================================================
RCS file: /cvs/extras/rpms/clement/devel/clement.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- clement.spec	4 Sep 2006 17:15:11 -0000	1.19
+++ clement.spec	19 Oct 2006 17:52:23 -0000	1.20
@@ -1,6 +1,6 @@
 Name: clement
 Version: 2.1
-Release: 209.1%{?dist}
+Release: 210%{?dist}
 URL: http://www.clement.safe.ca
 License: GPL
 Summary: An application to filter and manage E-mail traffic
@@ -38,6 +38,10 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+# This package attempts to install a yum repository, which is terrible idea.
+# Remove it here.
+%{__rm} -rf %{buildroot}/%{_sysconfdir}/yum.repos.d
+
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -100,13 +104,15 @@
 
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
-%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
 
 
 %changelog
+* Thu Oct 19 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1-210
+- Remove errant repository.
+
 * Mon Sep  3 2006 Jean-Marc Pigeon <jmp at safe.ca> 2.1-209
 - Bug-Fix:
     * Fixed problem about undue relaying, was caused



From fedora-extras-commits at redhat.com  Thu Oct 19 18:09:49 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 19 Oct 2006 11:09:49 -0700
Subject: rpms/dnsmasq/devel .cvsignore, 1.5, 1.6 dnsmasq.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200610191809.k9JI9nKY017272@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17242

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

Update to 2.34, minor cleanup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Aug 2006 20:35:02 -0000	1.5
+++ .cvsignore	19 Oct 2006 18:09:19 -0000	1.6
@@ -1 +1 @@
-dnsmasq-2.33.tar.gz
+dnsmasq-2.34.tar.gz


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dnsmasq.spec	28 Aug 2006 17:03:59 -0000	1.11
+++ dnsmasq.spec	19 Oct 2006 18:09:19 -0000	1.12
@@ -1,14 +1,14 @@
 Name:           dnsmasq
-Version:        2.33
-Release:        2%{?dist}
+Version:        2.34
+Release:        1%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
-Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch
-Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch
+Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
+Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -90,6 +90,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
+- Hardcoded version in patches, as I'm getting tired of updating them
+- Update to 2.34
+
 * Mon Aug 28 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.33-2
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Aug 2006 20:35:02 -0000	1.5
+++ sources	19 Oct 2006 18:09:19 -0000	1.6
@@ -1 +1 @@
-45696461b6e6bc929273b1191ca50447  dnsmasq-2.33.tar.gz
+a40b79bec295bb4631b1c033cf0bbdf1  dnsmasq-2.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 18:19:08 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 19 Oct 2006 11:19:08 -0700
Subject: rpms/eclipse-gef/devel eclipse-gef.spec,1.1,1.2
Message-ID: <200610191819.k9JIJ83P017359@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-gef/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17343

Modified Files:
	eclipse-gef.spec 
Log Message:
* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-1
- 3.2.1.



Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-gef.spec	7 Sep 2006 17:57:16 -0000	1.1
+++ eclipse-gef.spec	19 Oct 2006 18:18:38 -0000	1.2
@@ -9,20 +9,20 @@
 %define major                   3
 %define minor                   2
 %define majmin                  %{major}.%{minor}
-%define micro                   0
+%define micro                   1
 %define eclipse_base            %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base        %{_libdir}/%{eclipse_name}
 
 Summary:        Graphical Editor Framework (GEF) plugin for Eclipse
 Name:           %{eclipse_name}-gef
 Version:        %{majmin}.%{micro}
-Release:        2
+Release:        1
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/gef/
 Requires:       eclipse-platform
 
-# # Here's how to generate the source drop for GEF 3.2.0:
+# # Here's how to generate the source drop for GEF 3.2.1:
 # #
 # mkdir -p temp/home && cd temp
 # touch home/.cvspass
@@ -80,7 +80,7 @@
 # 
 # popd
 # 
-# tar jcf eclipse-gef-fetched-src-3.2.0.tar.bz2 org.eclipse.releng.gefbuilder
+# tar jcf eclipse-gef-fetched-src-3.2.1.tar.bz2 org.eclipse.releng.gefbuilder
 
 Source0:        %{name}-fetched-src-%{version}.tar.bz2
 
@@ -102,7 +102,7 @@
 BuildArch:        noarch
 %endif
 
-Requires:       eclipse-platform >= 1:3.2.0
+Requires:       eclipse-platform >= 1:3.2.1
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
@@ -154,8 +154,6 @@
 # -DbaseLocation=$SDK: $SDK is a mirror of the system SDK dir that is writable by the process 
 #                      running the build. This let's the build "see" the jars and have a place to 
 #                      put the plugins that have just been built
-# -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts:  we need to specify this 
-#                                                                        because we are using 3.1.2 
 # -DskipFetch=true: don't fetch the sources 
 # -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
 java -cp $SDK/startup.jar                       \
@@ -253,6 +251,9 @@
 %doc %{eclipse_base}/features/org.eclipse.gef_*/epl-v10.html
 
 %changelog
+* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-1
+- 3.2.1.
+
 * Tue Aug 29 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-2
 - First release for Fedora.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 18:20:18 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 19 Oct 2006 11:20:18 -0700
Subject: rpms/dnsmasq/FC-5 dnsmasq.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200610191820.k9JIKIlS017383@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17339

Modified Files:
	dnsmasq.spec sources 
Log Message:

Update to 2.34, minor cleanup



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dnsmasq.spec	15 Aug 2006 20:52:31 -0000	1.6
+++ dnsmasq.spec	19 Oct 2006 18:19:48 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           dnsmasq
-Version:        2.33
+Version:        2.34
 Release:        1%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
@@ -7,8 +7,8 @@
 License:        GPL
 URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
-Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch
-Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch
+Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
+Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -90,6 +90,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
+- Hardcoded version in patches, as I'm getting tired of updating them
+- Update to 2.34
+
 * Tue Aug 15 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.33-1
 - Update
 - Added pkgconfig BuildReq due to reduced buildroot


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Aug 2006 20:52:31 -0000	1.5
+++ sources	19 Oct 2006 18:19:48 -0000	1.6
@@ -1 +1 @@
-45696461b6e6bc929273b1191ca50447  dnsmasq-2.33.tar.gz
+a40b79bec295bb4631b1c033cf0bbdf1  dnsmasq-2.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 18:22:00 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 19 Oct 2006 11:22:00 -0700
Subject: rpms/eclipse-gef/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610191822.k9JIM0Sj017452@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-gef/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17406

Modified Files:
	.cvsignore sources 
Log Message:
3.2.1 source.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 17:57:16 -0000	1.2
+++ .cvsignore	19 Oct 2006 18:21:29 -0000	1.3
@@ -1 +1 @@
-eclipse-gef-fetched-src-3.2.0.tar.bz2
+eclipse-gef-fetched-src-3.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 17:57:16 -0000	1.2
+++ sources	19 Oct 2006 18:21:29 -0000	1.3
@@ -1 +1 @@
-966bbdc00340b01a98802dd89e5a7af0  eclipse-gef-fetched-src-3.2.0.tar.bz2
+f0dea818826d71384df117ab8863e32c  eclipse-gef-fetched-src-3.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 18:31:21 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 11:31:21 -0700
Subject: rpms/tcllib/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tcllib.spec,
	1.6, 1.7
Message-ID: <200610191831.k9JIVLM6017653@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcllib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611/FC-5

Modified Files:
	.cvsignore sources tcllib.spec 
Log Message:
Update to 1.9




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcllib/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2005 23:16:09 -0000	1.3
+++ .cvsignore	19 Oct 2006 18:30:51 -0000	1.4
@@ -1 +1 @@
-tcllib-1.8.tar.gz
+tcllib-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcllib/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2005 23:12:25 -0000	1.3
+++ sources	19 Oct 2006 18:30:51 -0000	1.4
@@ -1 +1 @@
-d8bea3b18e51f551f1d529164a3215d1  tcllib-1.8.tar.gz
+17d9ae35b1c6fde1d79c5b1423416cd2  tcllib-1.9.tar.gz


Index: tcllib.spec
===================================================================
RCS file: /cvs/extras/rpms/tcllib/FC-5/tcllib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tcllib.spec	16 Feb 2006 05:54:22 -0000	1.6
+++ tcllib.spec	19 Oct 2006 18:30:51 -0000	1.7
@@ -1,10 +1,10 @@
 Summary: The standard Tcl library
 Name: tcllib
-Version: 1.8
-Release: 4%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 License: BSD-like
 Group: Development/Libraries
-Source: http://download.sourceforge.net/tcllib/tcllib-1.8.tar.gz
+Source: http://download.sourceforge.net/tcllib/tcllib-1.9.tar.gz
 URL: http://tcllib.sourceforge.net/
 BuildArchitectures: noarch
 Requires: tcl >= 8.3.1
@@ -18,35 +18,45 @@
 
 %prep
 %setup -q
+chmod -x modules/doctools/mpformats/fr.msg
 
 %install
 rm -rf $RPM_BUILD_ROOT
 echo 'not available' > modules/imap4/imap4.n
-%_bindir/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\
+%{_bindir}/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\
     -pkg-path $RPM_BUILD_ROOT/$(echo 'puts $tcl_library' | %_bindir/tclsh)/%name-%version\
     -nroff-path $RPM_BUILD_ROOT%_mandir/mann
 # install HTML documentation into specific modules sub-directories:
-cd modules
-    mkdir -p ../ftp; cp ftp/docs/*.html ../ftp/
-    for module in exif mime stooop struct textutil; do
-        mkdir -p ../$module && cp $module/*.html ../$module/;
-    done
-cd ..
+pushd modules
+cp ftp/docs/*.html ftp/
+for module in comm exif ftp mime stooop struct textutil; do
+    mkdir -p ../$module && cp $module/*.html ../$module/;
+done
+popd
 
-# Clean up rpmlint warnints
+# Clean up rpmlint warnings
 find $RPM_BUILD_ROOT/%{_datadir} -name \*.tcl -exec chmod 0644 {} \;
 
+iconv --from=ISO-8859-1 --to=UTF-8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n > $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n.utf8
+iconv --from=ISO-8859-1 --to=UTF-8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n > $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n.utf8
+mv $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n.utf8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n
+mv $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n.utf8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc PACKAGES README README-1.8.txt ChangeLog license.terms
+%doc support/releases/PACKAGES README support/releases/history/README-1.9.txt
+%doc ChangeLog license.terms
 %doc exif/ ftp/ mime/ stooop/ struct/ textutil/
 %{_datadir}/tcl*/%{name}-%{version}
 %{_mandir}/mann/*
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.9-1
+- Update to 1.9
+
 * Thu Feb 16 2006 Wart <wart at kobold.org> 1.8-4
 - Remove executable bits on the library files to clean up rpmlint
   warnings.



From fedora-extras-commits at redhat.com  Thu Oct 19 18:31:22 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 11:31:22 -0700
Subject: rpms/tcllib/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tcllib.spec,
	1.7, 1.8
Message-ID: <200610191831.k9JIVMxE017658@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcllib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611/devel

Modified Files:
	.cvsignore sources tcllib.spec 
Log Message:
Update to 1.9




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcllib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2005 23:16:09 -0000	1.3
+++ .cvsignore	19 Oct 2006 18:30:52 -0000	1.4
@@ -1 +1 @@
-tcllib-1.8.tar.gz
+tcllib-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcllib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2005 23:12:25 -0000	1.3
+++ sources	19 Oct 2006 18:30:52 -0000	1.4
@@ -1 +1 @@
-d8bea3b18e51f551f1d529164a3215d1  tcllib-1.8.tar.gz
+17d9ae35b1c6fde1d79c5b1423416cd2  tcllib-1.9.tar.gz


Index: tcllib.spec
===================================================================
RCS file: /cvs/extras/rpms/tcllib/devel/tcllib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tcllib.spec	28 Aug 2006 16:13:19 -0000	1.7
+++ tcllib.spec	19 Oct 2006 18:30:52 -0000	1.8
@@ -1,10 +1,10 @@
 Summary: The standard Tcl library
 Name: tcllib
-Version: 1.8
-Release: 5%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 License: BSD-like
 Group: Development/Libraries
-Source: http://download.sourceforge.net/tcllib/tcllib-1.8.tar.gz
+Source: http://download.sourceforge.net/tcllib/tcllib-1.9.tar.gz
 URL: http://tcllib.sourceforge.net/
 BuildArchitectures: noarch
 Requires: tcl >= 8.3.1
@@ -18,35 +18,45 @@
 
 %prep
 %setup -q
+chmod -x modules/doctools/mpformats/fr.msg
 
 %install
 rm -rf $RPM_BUILD_ROOT
 echo 'not available' > modules/imap4/imap4.n
-%_bindir/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\
+%{_bindir}/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\
     -pkg-path $RPM_BUILD_ROOT/$(echo 'puts $tcl_library' | %_bindir/tclsh)/%name-%version\
     -nroff-path $RPM_BUILD_ROOT%_mandir/mann
 # install HTML documentation into specific modules sub-directories:
-cd modules
-    mkdir -p ../ftp; cp ftp/docs/*.html ../ftp/
-    for module in exif mime stooop struct textutil; do
-        mkdir -p ../$module && cp $module/*.html ../$module/;
-    done
-cd ..
+pushd modules
+cp ftp/docs/*.html ftp/
+for module in comm exif ftp mime stooop struct textutil; do
+    mkdir -p ../$module && cp $module/*.html ../$module/;
+done
+popd
 
-# Clean up rpmlint warnints
+# Clean up rpmlint warnings
 find $RPM_BUILD_ROOT/%{_datadir} -name \*.tcl -exec chmod 0644 {} \;
 
+iconv --from=ISO-8859-1 --to=UTF-8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n > $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n.utf8
+iconv --from=ISO-8859-1 --to=UTF-8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n > $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n.utf8
+mv $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n.utf8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n
+mv $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n.utf8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc PACKAGES README README-1.8.txt ChangeLog license.terms
+%doc support/releases/PACKAGES README support/releases/history/README-1.9.txt
+%doc ChangeLog license.terms
 %doc exif/ ftp/ mime/ stooop/ struct/ textutil/
 %{_datadir}/tcl*/%{name}-%{version}
 %{_mandir}/mann/*
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.9-1
+- Update to 1.9
+
 * Mon Aug 21 2006 Wart <wart at kobold.org> 1.8-5
 - Rebuild for Fedora Extras
 



From fedora-extras-commits at redhat.com  Thu Oct 19 19:30:18 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 19 Oct 2006 12:30:18 -0700
Subject: rpms/aalib/FC-5 aalib.spec,1.12,1.13
Message-ID: <200610191930.k9JJUIRd020918@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/aalib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20878

Modified Files:
	aalib.spec 
Log Message:
Rebuild with ncurses support


Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/FC-5/aalib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aalib.spec	23 Jul 2006 08:16:38 -0000	1.12
+++ aalib.spec	19 Oct 2006 19:29:48 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:        ASCII art library
 Name:           aalib
 Version:        1.4.0
-Release:        0.8.%{rc_subver}%{?dist}
+Release:        0.11.%{rc_subver}%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://aa-project.sourceforge.net/aalib/
@@ -13,7 +13,7 @@
 Patch2:         aalib-1.4rc5-bug149361.patch
 Patch3:         aalib-1.4rc5-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  slang-devel libXt-devel gpm-devel
+BuildRequires:  slang-devel libXt-devel gpm-devel ncurses-devel
 
 %description
 AA-lib is a low level gfx library just as many other libraries are. The
@@ -51,7 +51,7 @@
 
 
 %build
-%configure --disable-static
+%configure --disable-static  --with-curses-driver=yes --with-ncurses
 # 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
@@ -101,6 +101,15 @@
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.11.rc5
+- incorrect subversion in previous two changelog entries
+
+* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.10.rc6
+- Rebuild with ncurses support
+
+* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-0.8.rc6
+- FE6 Rebuild
+
 * Sun Jul 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-0.8.rc5
 - Taking over as maintainer since Anvil has other priorities
 - Long long due rebuild with new gcc for FC-5 (bug 185870)



From fedora-extras-commits at redhat.com  Thu Oct 19 20:19:48 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Oct 2006 13:19:48 -0700
Subject: rpms/stellarium/devel stellarium-0.8.2-x64.patch, NONE,
	1.1 stellarium.spec, 1.23, 1.24
Message-ID: <200610192019.k9JKJmp0024261@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64.patch 
Log Message:
Fix segfault on x64 systems

stellarium-0.8.2-x64.patch:

--- NEW FILE stellarium-0.8.2-x64.patch ---
--- stellarium-0.8.2/src/translator.cpp.org	2006-10-15 21:14:08.000000000 +0200
+++ stellarium-0.8.2/src/translator.cpp	2006-10-15 21:15:42.000000000 +0200
@@ -73,9 +73,9 @@
 	//change systemLangName to ISO 639 / ISO 3166.
 	unsigned int pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
-	       Translator::systemLangName.resize(pos);
+	       Translator::systemLangName.resize(pos+1);
 	pos = Translator::systemLangName.find('.', 0);
-	if(pos == 5) Translator::systemLangName.resize(pos);
+	if(pos == 5) Translator::systemLangName.resize(pos+1);
 }
 
 void Translator::reload()


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- stellarium.spec	10 Oct 2006 19:38:15 -0000	1.23
+++ stellarium.spec	19 Oct 2006 20:19:18 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
+Patch1:		stellarium-0.8.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -83,6 +85,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Thu Oct 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-2
+- Fix segfault on x64 systems (#210525)
+
 * Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Thu Oct 19 20:22:01 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 19 Oct 2006 13:22:01 -0700
Subject: rpms/liferea/devel .cvsignore, 1.35, 1.36 liferea.spec, 1.52,
	1.53 sources, 1.36, 1.37
Message-ID: <200610192022.k9JKM1I7024351@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24331

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
- Update to 1.0.24.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	18 Sep 2006 16:33:25 -0000	1.35
+++ .cvsignore	19 Oct 2006 20:21:31 -0000	1.36
@@ -1 +1 @@
-liferea-1.0.23.tar.gz
+liferea-1.0.24.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- liferea.spec	12 Oct 2006 18:25:43 -0000	1.52
+++ liferea.spec	19 Oct 2006 20:21:31 -0000	1.53
@@ -1,15 +1,15 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.23
-Release:        3%{?dist}
+Version:        1.0.24
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}-fedorafeed.patch
+Patch0:		%{name}-1.0.23-fedorafeed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml2-devel
@@ -56,7 +56,6 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
@@ -110,6 +109,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
+- Update to 1.0.24.
+
 * Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-3
 - Add patch to add Fedora default feeds. (#209301)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	18 Sep 2006 16:33:25 -0000	1.36
+++ sources	19 Oct 2006 20:21:31 -0000	1.37
@@ -1 +1 @@
-a29a9ecb2fe2ea2b7eac44795b5d3bc4  liferea-1.0.23.tar.gz
+f872d4ffd483cdcd4fe1f56dc86d5407  liferea-1.0.24.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 20:34:39 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 19 Oct 2006 13:34:39 -0700
Subject: rpms/eclipse-gef/devel eclipse-gef.spec,1.2,1.3
Message-ID: <200610192034.k9JKYdSb024566@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-gef/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24544

Modified Files:
	eclipse-gef.spec 
Log Message:
* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-2
- Fix buildroot (don't know how the wrong one slipped in).



Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-gef.spec	19 Oct 2006 18:18:38 -0000	1.2
+++ eclipse-gef.spec	19 Oct 2006 20:34:09 -0000	1.3
@@ -16,7 +16,7 @@
 Summary:        Graphical Editor Framework (GEF) plugin for Eclipse
 Name:           %{eclipse_name}-gef
 Version:        %{majmin}.%{micro}
-Release:        1
+Release:        2%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/gef/
@@ -104,7 +104,7 @@
 
 Requires:       eclipse-platform >= 1:3.2.1
 
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package        sdk
 Summary:        Eclipse GEF SDK
@@ -222,6 +222,9 @@
 %{_libdir}/gcj/%{name}/org.eclipse.draw2d_*
 %{_libdir}/gcj/%{name}/org.eclipse.gef_*
 %endif
+%doc %{eclipse_base}/readme/*
+%doc %{eclipse_base}/features/org.eclipse.gef_*/notice.html
+%doc %{eclipse_base}/features/org.eclipse.gef_*/epl-v10.html
 
 %files sdk
 %defattr(-,root,root)
@@ -246,11 +249,10 @@
 %{_libdir}/gcj/%{name}/org.eclipse.gef.examples.shapes_*
 %endif
 
-%doc %{eclipse_base}/readme/*
-%doc %{eclipse_base}/features/org.eclipse.gef_*/notice.html
-%doc %{eclipse_base}/features/org.eclipse.gef_*/epl-v10.html
-
 %changelog
+* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-2
+- Fix buildroot (don't know how the wrong one slipped in).
+
 * Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-1
 - 3.2.1.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 21:19:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:19:20 -0700
Subject: rpms/perl-Alien-wxWidgets/devel .cvsignore, 1.3,
	1.4 perl-Alien-wxWidgets.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610192119.k9JLJKJs030748@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30728

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.23.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Oct 2006 20:00:07 -0000	1.3
+++ .cvsignore	19 Oct 2006 21:18:50 -0000	1.4
@@ -1 +1 @@
-Alien-wxWidgets-0.22.tar.gz
+Alien-wxWidgets-0.23.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Alien-wxWidgets.spec	3 Oct 2006 20:00:07 -0000	1.4
+++ perl-Alien-wxWidgets.spec	19 Oct 2006 21:18:50 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.22
+Version:        0.23
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
+- Update to 0.23.
+
 * Tue Oct  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
 - Update to 0.22.
 - Avoid creation of the debuginfo package (#209180).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Oct 2006 20:00:07 -0000	1.3
+++ sources	19 Oct 2006 21:18:50 -0000	1.4
@@ -1 +1 @@
-98de414f8d378170ede6cf96a0e2f73e  Alien-wxWidgets-0.22.tar.gz
+487dcec3fc7ef94c4247913883b5cc65  Alien-wxWidgets-0.23.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:23:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:23:28 -0700
Subject: rpms/perl-Email-Simple/devel .cvsignore, 1.8,
	1.9 perl-Email-Simple.spec, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <200610192123.k9JLNSfY030858@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30838

Modified Files:
	.cvsignore perl-Email-Simple.spec sources 
Log Message:
Update to 1.995.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Oct 2006 17:32:27 -0000	1.8
+++ .cvsignore	19 Oct 2006 21:22:58 -0000	1.9
@@ -1 +1 @@
-Email-Simple-1.992.tar.gz
+Email-Simple-1.995.tar.gz


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/perl-Email-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Email-Simple.spec	7 Oct 2006 17:32:27 -0000	1.7
+++ perl-Email-Simple.spec	19 Oct 2006 21:22:58 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Email-Simple
-Version:        1.992
+Version:        1.995
 Release:        1%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.995-1
+- Update to 1.995.
+
 * Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.992-1
 - Update to 1.992.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Oct 2006 17:32:27 -0000	1.8
+++ sources	19 Oct 2006 21:22:58 -0000	1.9
@@ -1 +1 @@
-901b2c7d2b978a0b31ca6b274282b852  Email-Simple-1.992.tar.gz
+6077eb2074fc883cab6b6eee68f344b3  Email-Simple-1.995.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:27:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:27:10 -0700
Subject: rpms/perl-Email-Simple/FC-5 .cvsignore, 1.7,
	1.8 perl-Email-Simple.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200610192127.k9JLRAOT030930@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30907

Modified Files:
	.cvsignore perl-Email-Simple.spec sources 
Log Message:
Update to 1.995.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Oct 2006 17:32:26 -0000	1.7
+++ .cvsignore	19 Oct 2006 21:26:40 -0000	1.8
@@ -1 +1 @@
-Email-Simple-1.992.tar.gz
+Email-Simple-1.995.tar.gz


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/perl-Email-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Simple.spec	7 Oct 2006 17:32:26 -0000	1.6
+++ perl-Email-Simple.spec	19 Oct 2006 21:26:40 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Simple
-Version:        1.992
+Version:        1.995
 Release:        1%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.995-1
+- Update to 1.995.
+
 * Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.992-1
 - Update to 1.992.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Oct 2006 17:32:26 -0000	1.7
+++ sources	19 Oct 2006 21:26:40 -0000	1.8
@@ -1 +1 @@
-901b2c7d2b978a0b31ca6b274282b852  Email-Simple-1.992.tar.gz
+6077eb2074fc883cab6b6eee68f344b3  Email-Simple-1.995.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:42:04 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:42:04 -0700
Subject: rpms/perl-Email-MIME/FC-5 .cvsignore, 1.6, 1.7 perl-Email-MIME.spec,
	1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200610192142.k9JLg4Tf031120@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081/FC-5

Modified Files:
	.cvsignore perl-Email-MIME.spec sources 
Log Message:
Update to 1.855.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Oct 2006 14:01:10 -0000	1.6
+++ .cvsignore	19 Oct 2006 21:41:34 -0000	1.7
@@ -1 +1 @@
-Email-MIME-1.853.tar.gz
+Email-MIME-1.855.tar.gz


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/perl-Email-MIME.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-MIME.spec	14 Oct 2006 14:01:10 -0000	1.5
+++ perl-Email-MIME.spec	19 Oct 2006 21:41:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME
-Version:        1.853
+Version:        1.855
 Release:        1%{?dist}
 Summary:        Easy MIME message parsing
 
@@ -12,7 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
-BuildRequires:  perl(Email::Simple) >= 1.91
+BuildRequires:  perl(Email::Simple) >= 1.995
 BuildRequires:  perl(MIME::Types) >= 1.13
 BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
@@ -60,6 +60,12 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.855-1
+- Update to 1.855.
+
+* Sun Oct 15 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.854-1
+- Update to 1.854.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.853-1
 - Update to 1.853.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Oct 2006 14:01:10 -0000	1.6
+++ sources	19 Oct 2006 21:41:34 -0000	1.7
@@ -1 +1 @@
-ff4f3f7c3aefbd74cb56cb513797c9fd  Email-MIME-1.853.tar.gz
+22b8b110fa3e10331cc703700d3c79cd  Email-MIME-1.855.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:42:04 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:42:04 -0700
Subject: rpms/perl-Email-MIME/devel .cvsignore, 1.6, 1.7 perl-Email-MIME.spec,
	1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200610192142.k9JLg4bq031125@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081/devel

Modified Files:
	.cvsignore perl-Email-MIME.spec sources 
Log Message:
Update to 1.855.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Oct 2006 14:01:16 -0000	1.6
+++ .cvsignore	19 Oct 2006 21:41:34 -0000	1.7
@@ -1 +1 @@
-Email-MIME-1.853.tar.gz
+Email-MIME-1.855.tar.gz


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/perl-Email-MIME.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-MIME.spec	14 Oct 2006 14:01:16 -0000	1.5
+++ perl-Email-MIME.spec	19 Oct 2006 21:41:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME
-Version:        1.853
+Version:        1.855
 Release:        1%{?dist}
 Summary:        Easy MIME message parsing
 
@@ -12,7 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
-BuildRequires:  perl(Email::Simple) >= 1.91
+BuildRequires:  perl(Email::Simple) >= 1.995
 BuildRequires:  perl(MIME::Types) >= 1.13
 BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
@@ -60,6 +60,12 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.855-1
+- Update to 1.855.
+
+* Sun Oct 15 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.854-1
+- Update to 1.854.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.853-1
 - Update to 1.853.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Oct 2006 14:01:16 -0000	1.6
+++ sources	19 Oct 2006 21:41:34 -0000	1.7
@@ -1 +1 @@
-ff4f3f7c3aefbd74cb56cb513797c9fd  Email-MIME-1.853.tar.gz
+22b8b110fa3e10331cc703700d3c79cd  Email-MIME-1.855.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:44:03 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 19 Oct 2006 14:44:03 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.4,1.5
Message-ID: <200610192144.k9JLi3j4031230@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31212

Modified Files:
	MultiLib.py 
Log Message:
Ensure that debuginfo packages, which we want to copy, do exist
actually. :)



Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultiLib.py	15 Oct 2006 12:34:25 -0000	1.4
+++ MultiLib.py	19 Oct 2006 21:44:00 -0000	1.5
@@ -280,9 +280,10 @@
     for f in my.needed['debug']:
         srcfile = os.path.join(cfg.treedir,dist,srcarch,'debug',f)
         destfile = os.path.join(cfg.treedir,dist,targetarch,'debug',f)
-        if not os.path.exists(destfile):  # silent extra-check
-            Utils.install_link_or_copy(srcfile,destfile)
-            changed = True
+        if os.path.exists(srcfile):
+            if not os.path.exists(destfile):  # silent extra-check
+                Utils.install_link_or_copy(srcfile,destfile)
+                changed = True
         
     return changed
 



From fedora-extras-commits at redhat.com  Thu Oct 19 22:49:28 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 19 Oct 2006 15:49:28 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.5,1.6
Message-ID: <200610192249.k9JMnSID002042@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2024

Modified Files:
	MultiLib.py 
Log Message:
printing the debuginfo package name at this point is uninteresting


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MultiLib.py	19 Oct 2006 21:44:00 -0000	1.5
+++ MultiLib.py	19 Oct 2006 22:49:25 -0000	1.6
@@ -127,7 +127,6 @@
         if debugrpm not in pkglist:
             pkglist.append(debugrpm)
             missingdict[targetarch]['debug'] = pkglist
-            print ' +', debugrpm
         
     return
 



From fedora-extras-commits at redhat.com  Thu Oct 19 22:53:52 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 19 Oct 2006 15:53:52 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.6,1.7
Message-ID: <200610192253.k9JMrqI3002081@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2063

Modified Files:
	MultiLib.py 
Log Message:
improve one status message


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiLib.py	19 Oct 2006 22:49:25 -0000	1.6
+++ MultiLib.py	19 Oct 2006 22:53:49 -0000	1.7
@@ -110,13 +110,14 @@
         
         if not srcrpm:
             continue
-        
+
+        pkgbasefn = os.path.basename(fname)
+
         if targetarch in excludearch:
-            print 'Multi-compat, but ExcludeArch %s' % excludearch
+            print ' -', pkgbasefn, ': Multi-compat, but ExcludeArch %s' % excludearch
             continue
 
         # Save base file-names here.
-        pkgbasefn = os.path.basename(fname)
         missingdict.setdefault(targetarch,{})
         pkglist = missingdict[targetarch].setdefault('rpms',[])
         if pkgbasefn not in pkglist:



From fedora-extras-commits at redhat.com  Thu Oct 19 22:56:43 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 19 Oct 2006 15:56:43 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.7,1.8
Message-ID: <200610192256.k9JMuhkY002111@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2093

Modified Files:
	MultiLib.py 
Log Message:
improve one status message


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiLib.py	19 Oct 2006 22:53:49 -0000	1.7
+++ MultiLib.py	19 Oct 2006 22:56:40 -0000	1.8
@@ -284,6 +284,7 @@
             if not os.path.exists(destfile):  # silent extra-check
                 Utils.install_link_or_copy(srcfile,destfile)
                 changed = True
+    print 'done.'
         
     return changed
 



From fedora-extras-commits at redhat.com  Fri Oct 20 00:43:39 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:43:39 -0700
Subject: rpms/scribes-templates - New directory
Message-ID: <200610200043.k9K0hdiT008915@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8911/scribes-templates

Log Message:
Directory /cvs/extras/rpms/scribes-templates added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 00:43:45 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:43:45 -0700
Subject: rpms/scribes-templates/devel - New directory
Message-ID: <200610200043.k9K0hjat008929@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8911/scribes-templates/devel

Log Message:
Directory /cvs/extras/rpms/scribes-templates/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 00:43:56 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:43:56 -0700
Subject: rpms/scribes-templates Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610200043.k9K0hu8s008960@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8954

Added Files:
	Makefile import.log 
Log Message:
Setup of module scribes-templates


--- NEW FILE Makefile ---
# Top level Makefile for module scribes-templates
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 20 00:44:02 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:44:02 -0700
Subject: rpms/scribes-templates/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610200044.k9K0i2ZB008976@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8954/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scribes-templates


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 20 00:44:51 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:44:51 -0700
Subject: rpms/scribes-templates import.log,1.1,1.2
Message-ID: <200610200044.k9K0ipwX009054@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9021

Modified Files:
	import.log 
Log Message:
auto-import scribes-templates-20061017-2 on branch devel from scribes-templates-20061017-2.src.rpm
Initial import (review and approval in bug #211242)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Oct 2006 00:43:56 -0000	1.1
+++ import.log	20 Oct 2006 00:44:21 -0000	1.2
@@ -0,0 +1 @@
+scribes-templates-20061017-2:HEAD:scribes-templates-20061017-2.src.rpm:1161305058



From fedora-extras-commits at redhat.com  Fri Oct 20 00:44:52 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:44:52 -0700
Subject: rpms/scribes-templates/devel COPYING.Fedora, NONE,
	1.1 scribes-templates.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610200044.k9K0iqaV009058@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9021/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING.Fedora scribes-templates.spec 
Log Message:
auto-import scribes-templates-20061017-2 on branch devel from scribes-templates-20061017-2.src.rpm
Initial import (review and approval in bug #211242)


--- NEW FILE COPYING.Fedora ---
The contents of this package are released under the terms of the GPLv2, as
stated by Mystilleef (the Scribes upstream maintainer) in the following 
email:

Message-ID: <9605403b0610170337r4bd5e28cu5442e2f15d401467 at mail.gmail.com>
Date: Tue, 17 Oct 2006 06:37:03 -0400
From: Mystilleef <mystilleef at gmail.com>
To: "Peter Gordon" <peter at thecodergeek.com>
Subject: Re: Scribes Templates Tarball Versioning
In-Reply-To: <453472D8.2090606 at thecodergeek.com>

Hello Peter,

Scribes cannot automatically import templates. Users have to download
them and import them manually. Yes, the templates are all GPL.

Thanks

On 10/17/06, Peter Gordon <peter at thecodergeek.com> wrote:
> One more thing!
>
> These are all GPL'd, I presume? Would you please add a COPYING file or similar
> to the tarball to make that explicitly clear?
>
> Thanks, and sorry for bugging you about this so much! ^_^
>
> --
> Peter Gordon (codergeek42)


--- NEW FILE scribes-templates.spec ---
Name:		scribes-templates
Version:	20061017
Release:	2%{?dist}
Summary:	Templates ("Snippets") for the Scribes text editor
Group:		Applications/Editors
# Though the tarball does not mention it explicitly, Mystilleef (the upstream
# maintainer of Scribes) did state that these are GPL in an email message to
# me on 2006-10-17, a copy of which is contained in COPYING.Fedora. Future
# versions should contain an explicit COPYING file.
License:	GPL
URL:		http://scribes.sourceforge.net/template.html

Source0:	http://scribes.sourceforge.net/templates-%{version}.tar.bz2
Source1:	COPYING.Fedora

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArch:	noarch

# Scribes' template system was rewritten, so these will not work with earlier
# versions, and it needs scribes installed so that the parent directory in
# %%datadir will not be left unowned.
Requires:	scribes >= 0.2.9.87


%description
Scribes is a simple and sleek text editor for the the GNOME desktop. It focuses
on keeping the working environment free from distractions, and providing strong
automation of mundane, repetitive tasks. One of its greatest features is a
dynamic templating system (popularly called Snippets) to automate the creation
of various types of files following the same general format. This package
contains a collection of various pre-made templates for Scribes.


%prep
%setup -q -n "templates"
install -p -m 0644 %{SOURCE1} .

%build
# Nothing to build...


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/scribes/templates
install -p -m 0644 *-templates.xml %{buildroot}%{_datadir}/scribes/templates/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING.Fedora
%{_datadir}/scribes/templates/


%changelog
* Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 20061017-2
- Make install invocations in %%install and %%prep keep timestamps ("-p")
- Remove empty %%pre/%%preun/%%post/%%postun
- (Thanks to Mamoru Tasaka in bug #211242)
 

* Tue Oct 17 2006 Peter Gordon <peter at thecodergeek.com> - 20061017-1
- Initial packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2006 00:44:01 -0000	1.1
+++ .cvsignore	20 Oct 2006 00:44:22 -0000	1.2
@@ -0,0 +1 @@
+templates-20061017.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2006 00:44:01 -0000	1.1
+++ sources	20 Oct 2006 00:44:22 -0000	1.2
@@ -0,0 +1 @@
+881f13d77207bdcc1fd959a283f220bb  templates-20061017.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 00:49:05 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:49:05 -0700
Subject: owners owners.list,1.1855,1.1856
Message-ID: <200610200049.k9K0n55s009198@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9174/owners

Modified Files:
	owners.list 
Log Message:
Add entry for scribes-templates


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1855
retrieving revision 1.1856
diff -u -r1.1855 -r1.1856
--- owners.list	19 Oct 2006 17:29:52 -0000	1.1855
+++ owners.list	20 Oct 2006 00:48:34 -0000	1.1856
@@ -2045,6 +2045,7 @@
 Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org|mystilleef at gmail.com
+Fedora Extras|scribes-templates|Templates ("Snippets") for the Scribes text editor|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|scribus-templates|This package includes additional templates for Scribus|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de
 Fedora Extras|scrip|Spherical Coordinate Remapping and Interpolation Package|ed at eh3.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 20 00:51:30 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:51:30 -0700
Subject: comps comps-fe6.xml.in,1.201,1.202
Message-ID: <200610200051.k9K0pUth009242@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9225/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add entry for scribes-templates


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- comps-fe6.xml.in	19 Oct 2006 17:13:51 -0000	1.201
+++ comps-fe6.xml.in	20 Oct 2006 00:51:00 -0000	1.202
@@ -232,6 +232,7 @@
       <packagereq type="optional">poedit</packagereq>
       <packagereq type="optional">scite</packagereq>
       <packagereq type="optional">scribes</packagereq>
+      <packagereq type="optional">scribes-templates</packagereq>
       <packagereq type="optional">TeXmacs</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Fri Oct 20 00:54:42 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:54:42 -0700
Subject: comps comps-fe5.xml.in,1.178,1.179
Message-ID: <200610200054.k9K0sgPH009288@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9267/comps

Modified Files:
	comps-fe5.xml.in 
Log Message:
Add entry for viaideinfo now that it's branched and built for FC-5


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- comps-fe5.xml.in	19 Oct 2006 17:11:37 -0000	1.178
+++ comps-fe5.xml.in	20 Oct 2006 00:54:12 -0000	1.179
@@ -877,6 +877,7 @@
       <packagereq type="optional">tiobench</packagereq>
       <packagereq type="optional">ttywatch</packagereq>
       <packagereq type="optional">unison</packagereq>
+      <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vnstat</packagereq>
       <packagereq type="optional">vpnc</packagereq>
       <packagereq type="optional">wine</packagereq>



From fedora-extras-commits at redhat.com  Fri Oct 20 00:56:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:56:20 -0700
Subject: rpms/perl-Cache-Mmap - New directory
Message-ID: <200610200056.k9K0uKZJ009359@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9355/perl-Cache-Mmap

Log Message:
Directory /cvs/extras/rpms/perl-Cache-Mmap added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 00:56:26 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:56:26 -0700
Subject: rpms/perl-Cache-Mmap/devel - New directory
Message-ID: <200610200056.k9K0uQqG009373@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9355/perl-Cache-Mmap/devel

Log Message:
Directory /cvs/extras/rpms/perl-Cache-Mmap/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 00:57:06 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:57:06 -0700
Subject: rpms/perl-HTML-Template-Expr/devel perl-HTML-Template-Expr.spec, 1.6,
	1.7
Message-ID: <200610200057.k9K0v6l4009428@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9390

Modified Files:
	perl-HTML-Template-Expr.spec 
Log Message:
Rebuild.


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/perl-HTML-Template-Expr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-HTML-Template-Expr.spec	30 Aug 2006 15:46:53 -0000	1.6
+++ perl-HTML-Template-Expr.spec	20 Oct 2006 00:56:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template-Expr
 Version:        0.07
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Expression support extension for HTML::Template
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Steven Pritchard <steve at kspei.com> 0.07-3
+- Rebuild.
+
 * Wed Aug 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-2
 - Fix order of arguments to find(1).
 



From fedora-extras-commits at redhat.com  Fri Oct 20 00:57:14 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:57:14 -0700
Subject: rpms/perl-Cache-Mmap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610200057.k9K0vEv8009440@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9433

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Cache-Mmap


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Cache-Mmap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 20 00:57:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:57:20 -0700
Subject: rpms/perl-Cache-Mmap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610200057.k9K0vKuv009456@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9433/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Cache-Mmap


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 20 00:59:21 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:59:21 -0700
Subject: rpms/perl-Cache-Mmap import.log,1.1,1.2
Message-ID: <200610200059.k9K0xL2i009565@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9533

Modified Files:
	import.log 
Log Message:
auto-import perl-Cache-Mmap-0.09-1 on branch devel from perl-Cache-Mmap-0.09-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Mmap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Oct 2006 00:57:14 -0000	1.1
+++ import.log	20 Oct 2006 00:58:51 -0000	1.2
@@ -0,0 +1 @@
+perl-Cache-Mmap-0_09-1:HEAD:perl-Cache-Mmap-0.09-1.src.rpm:1161305903



From fedora-extras-commits at redhat.com  Fri Oct 20 00:59:22 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:59:22 -0700
Subject: rpms/perl-Cache-Mmap/devel perl-Cache-Mmap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610200059.k9K0xMwk009569@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9533/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Cache-Mmap.spec 
Log Message:
auto-import perl-Cache-Mmap-0.09-1 on branch devel from perl-Cache-Mmap-0.09-1.src.rpm


--- NEW FILE perl-Cache-Mmap.spec ---
Name:           perl-Cache-Mmap
Version:        0.09
Release:        1%{?dist}
Summary:        Shared data cache using memory mapped files
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Cache-Mmap/
Source0:        http://www.cpan.org/authors/id/P/PM/PMH/Cache-Mmap-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a shared data cache, using memory mapped files. If
routines are provided which interact with the underlying data, access to
the cache is completely transparent, and the module handles all the details
of refreshing cache contents, and updating underlying data, if necessary.

%prep
%setup -q -n Cache-Mmap-%{version}
chmod a-x cmmtest

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes cmmtest README Todo
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Cache*
%{_mandir}/man3/*

%changelog
* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.09-1
- Specfile autogenerated by cpanspec 1.69.1.
- Fix License.
- Drop execute bits on cmmtest (included as documentation).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Mmap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2006 00:57:20 -0000	1.1
+++ .cvsignore	20 Oct 2006 00:58:51 -0000	1.2
@@ -0,0 +1 @@
+Cache-Mmap-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Mmap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2006 00:57:20 -0000	1.1
+++ sources	20 Oct 2006 00:58:51 -0000	1.2
@@ -0,0 +1 @@
+fef44673771a0f1f14982ae719f57221  Cache-Mmap-0.09.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 01:04:35 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 18:04:35 -0700
Subject: owners owners.list,1.1856,1.1857
Message-ID: <200610200104.k9K14Zf4012522@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12506

Modified Files:
	owners.list 
Log Message:
Add perl-Cache-Mmap.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1856
retrieving revision 1.1857
diff -u -r1.1856 -r1.1857
--- owners.list	20 Oct 2006 00:48:34 -0000	1.1856
+++ owners.list	20 Oct 2006 01:04:04 -0000	1.1857
@@ -1254,6 +1254,7 @@
 Fedora Extras|perl-Business-Hours|Calculate business hours in a time period|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache|The Cache interfacel|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Cache-Mmap|Shared data cache using memory mapped files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache-Simple-TimedExpiry|Cache::Simple::TimedExpiry Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cairo|Perl interface to the cairo library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Calendar-Simple|Perl extension to create simple calendars|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Oct 20 01:19:10 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 18:19:10 -0700
Subject: rpms/skstream/devel .cvsignore, 1.2, 1.3 skstream.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610200119.k9K1JAXj012695@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/skstream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12675

Modified Files:
	.cvsignore skstream.spec sources 
Log Message:
Update to 0.3.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skstream/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jul 2006 23:05:13 -0000	1.2
+++ .cvsignore	20 Oct 2006 01:18:39 -0000	1.3
@@ -1 +1 @@
-skstream-0.3.5.tar.gz
+skstream-0.3.6.tar.gz


Index: skstream.spec
===================================================================
RCS file: /cvs/extras/rpms/skstream/devel/skstream.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skstream.spec	28 Aug 2006 15:25:05 -0000	1.3
+++ skstream.spec	20 Oct 2006 01:18:39 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           skstream
-Version:        0.3.5
-Release:        4%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        C++ I/O library for WorldForge clients/servers
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://worldforge.org/dev/eng/libraries/skstream
-Source0:        http///dl.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cppunit-devel
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 0.3.6-1
+- Update to 0.3.6
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> 0.3.5-4
 - Rebuild for Fedora Extras
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skstream/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jul 2006 23:05:13 -0000	1.2
+++ sources	20 Oct 2006 01:18:39 -0000	1.3
@@ -1 +1 @@
-0c5ec89551bc0900b2e708992f321794  skstream-0.3.5.tar.gz
+eb135ad0c20fc6b0ac32fcc6c0c6671a  skstream-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 01:38:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 18:38:51 -0700
Subject: rpms/eris/devel eris.spec,1.7,1.8
Message-ID: <200610200138.k9K1cpNk012861@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/eris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12842

Modified Files:
	eris.spec 
Log Message:
Rebuild for newer version of skstream




Index: eris.spec
===================================================================
RCS file: /cvs/extras/rpms/eris/devel/eris.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eris.spec	28 Aug 2006 01:24:38 -0000	1.7
+++ eris.spec	20 Oct 2006 01:38:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           eris
 Version:        1.3.11
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Client-side session layer for Atlas-C++
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.3.11-9
+- Rebuild for newer version of skstream
+
 * Sun Aug 27 2006 Wart <wart at kobold.org> 1.3.11-8
 - Rebuild for newer version of wfmath
 



From fedora-extras-commits at redhat.com  Fri Oct 20 01:42:21 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 18:42:21 -0700
Subject: rpms/cyphesis/devel .cvsignore, 1.2, 1.3 cyphesis.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610200142.k9K1gLCO012973@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/cyphesis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12948

Modified Files:
	.cvsignore cyphesis.spec sources 
Log Message:
Update to 0.5.10




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2006 15:28:29 -0000	1.2
+++ .cvsignore	20 Oct 2006 01:41:50 -0000	1.3
@@ -1 +1 @@
-cyphesis-0.5.9.tar.gz
+cyphesis-0.5.10.tar.gz


Index: cyphesis.spec
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyphesis.spec	31 Aug 2006 15:28:29 -0000	1.1
+++ cyphesis.spec	20 Oct 2006 01:41:50 -0000	1.2
@@ -2,8 +2,8 @@
 %define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
 
 Name:           cyphesis
-Version:        0.5.9
-Release:        2%{?dist}
+Version:        0.5.10
+Release:        1%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 License:        GPL
@@ -12,18 +12,12 @@
 Source1:        cyphesis.te
 Source2:        cyphesis.if
 Source3:        cyphesis.fc
-Patch0:         cyphesis-0.5.8-postgresinit.patch
-Patch1:         cyphesis-0.5.8-init.patch
+Patch0:         cyphesis-0.5.8-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
 BuildRequires:  varconf-devel libsigc++20-devel mercator-devel skstream-devel
 BuildRequires:  postgresql-devel readline-devel avahi-devel
-
-%if "%{?fedora}" == "5"
-BuildRequires:  checkpolicy selinux-policy >= 2.2.40 m4 hardlink
-%else
 BuildRequires:  checkpolicy selinux-policy-devel hardlink
-%endif
 
 %if "%{selinux_policyver}" != ""
 Requires:       selinux-policy >= %{selinux_policyver}
@@ -56,15 +50,7 @@
 
 %prep
 %setup -q
-
-# It seems that the behavior of the postgres command 'createuser' 
-# became more interactive in FC6.  We need to update the
-# command line arguments to make it shut up.
-%if 0%{?fedora} >= 6
 %patch0
-%endif
-
-%patch1
 
 chmod a-x rulesets/basic/world/objects/*/*.py
 chmod a-x rulesets/basic/mind/dictlist.py


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2006 15:28:29 -0000	1.2
+++ sources	20 Oct 2006 01:41:50 -0000	1.3
@@ -1 +1 @@
-afb0a55d508b85e6152c4169caa432ff  cyphesis-0.5.9.tar.gz
+60879c8b91a19f572230f31d64b832e5  cyphesis-0.5.10.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 04:18:12 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 19 Oct 2006 21:18:12 -0700
Subject: rpms/liferea/FC-5 .cvsignore, 1.34, 1.35 liferea.spec, 1.47,
	1.48 sources, 1.35, 1.36
Message-ID: <200610200418.k9K4ICNn022538@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22518

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
- Update to 1.0.24.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	18 Sep 2006 16:35:06 -0000	1.34
+++ .cvsignore	20 Oct 2006 04:17:41 -0000	1.35
@@ -1 +1 @@
-liferea-1.0.23.tar.gz
+liferea-1.0.24.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- liferea.spec	18 Sep 2006 16:35:06 -0000	1.47
+++ liferea.spec	20 Oct 2006 04:17:41 -0000	1.48
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.23
+Version:        1.0.24
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -54,7 +54,6 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
@@ -108,6 +107,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
+- Update to 1.0.24.
+
 * Mon Sep 18 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-1
 - Update to 1.0.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	18 Sep 2006 16:35:06 -0000	1.35
+++ sources	20 Oct 2006 04:17:41 -0000	1.36
@@ -1 +1 @@
-a29a9ecb2fe2ea2b7eac44795b5d3bc4  liferea-1.0.23.tar.gz
+f872d4ffd483cdcd4fe1f56dc86d5407  liferea-1.0.24.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 07:17:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 00:17:52 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.27, 1.28 sources, 1.28,
	1.29 sylpheed-claws.spec, 1.53, 1.54
Message-ID: <200610200717.k9K7HqU1032068@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32047

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	12 Oct 2006 15:30:14 -0000	1.27
+++ .cvsignore	20 Oct 2006 07:17:22 -0000	1.28
@@ -1 +1 @@
-sylpheed-claws-2.5.5.tar.bz2
+sylpheed-claws-2.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Oct 2006 15:30:14 -0000	1.28
+++ sources	20 Oct 2006 07:17:22 -0000	1.29
@@ -1 +1 @@
-ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2
+f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sylpheed-claws.spec	12 Oct 2006 15:30:14 -0000	1.53
+++ sylpheed-claws.spec	20 Oct 2006 07:17:22 -0000	1.54
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.5
+Version:        2.5.6
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.6-1
+- version upgrade
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Oct 20 07:25:16 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 20 Oct 2006 00:25:16 -0700
Subject: rpms/audacious/devel audacious.spec,1.10,1.11
Message-ID: <200610200725.k9K7PGBO032148@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32132

Modified Files:
	audacious.spec 
Log Message:
- Add Obsoletes/Provides for BMP


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- audacious.spec	6 Sep 2006 20:17:34 -0000	1.10
+++ audacious.spec	20 Oct 2006 07:24:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -36,6 +36,9 @@
 Requires(post):  desktop-file-utils >= 0.9, /sbin/ldconfig
 Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
 
+Obsoletes:      bmp <= 0.9.7.1, bmp-flac2 <= 009
+Provides:       bmp = 0.9.7.1, bmp-flac2 = 009
+
 %description
 Audacious is a media player that currently uses a skinned
 user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -48,6 +51,9 @@
 Requires:       glib2-devel gtk2-devel gnome-vfs2-devel GConf2-devel
 Requires:       pkgconfig
 
+Obsoletes:      bmp-devel <= 0.9.7.1
+Provides:       bmp-devel = 0.9.7.1
+
 %description    devel
 Development files for Audacious
 
@@ -203,6 +209,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-2.fc6
+- Add Obsoletes/Provides for BMP
+
 * Wed Sep 06 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-1.fc6
 - Update to 1.1.2
 



From fedora-extras-commits at redhat.com  Fri Oct 20 08:15:18 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Fri, 20 Oct 2006 01:15:18 -0700
Subject: rpms/gcin/devel .cvsignore, 1.7, 1.8 gcin.spec, 1.10,
	1.11 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <200610200815.k9K8FItf002911@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2884

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:13:47 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:14:47 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	9 Oct 2006 01:13:47 -0000	1.10
+++ gcin.spec	20 Oct 2006 08:14:47 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -34,6 +34,9 @@
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
+echo "#!/bin/bash" > scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +51,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +100,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
  - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:14:47 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:13:47 -0000	1.7
+++ sources	20 Oct 2006 08:14:47 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 08:17:58 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Fri, 20 Oct 2006 01:17:58 -0700
Subject: rpms/gcin/FC-5 .cvsignore, 1.7, 1.8 gcin.spec, 1.10,
	1.11 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <200610200817.k9K8Hw1o002996@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2969

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:15:50 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:17:28 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	9 Oct 2006 01:15:50 -0000	1.10
+++ gcin.spec	20 Oct 2006 08:17:28 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -34,6 +34,9 @@
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
+echo "#!/bin/bash" > scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +51,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +100,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
 - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:17:28 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:15:50 -0000	1.7
+++ sources	20 Oct 2006 08:17:28 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 08:21:49 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 01:21:49 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.23, 1.24 sources, 1.24,
	1.25 sylpheed-claws.spec, 1.47, 1.48
Message-ID: <200610200821.k9K8LnPS003105@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	12 Oct 2006 15:30:12 -0000	1.23
+++ .cvsignore	20 Oct 2006 08:21:19 -0000	1.24
@@ -1 +1 @@
-sylpheed-claws-2.5.5.tar.bz2
+sylpheed-claws-2.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Oct 2006 15:30:12 -0000	1.24
+++ sources	20 Oct 2006 08:21:19 -0000	1.25
@@ -1 +1 @@
-ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2
+f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sylpheed-claws.spec	12 Oct 2006 15:30:12 -0000	1.47
+++ sylpheed-claws.spec	20 Oct 2006 08:21:19 -0000	1.48
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        2.5.5
+Version:        2.5.6
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -179,6 +179,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.6-1
+- version upgrade
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Oct 20 08:21:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 01:21:50 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.27, 1.28 sources, 1.28,
	1.29 sylpheed-claws.spec, 1.52, 1.53
Message-ID: <200610200821.k9K8LoYh003110@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	12 Oct 2006 15:30:13 -0000	1.27
+++ .cvsignore	20 Oct 2006 08:21:20 -0000	1.28
@@ -1 +1 @@
-sylpheed-claws-2.5.5.tar.bz2
+sylpheed-claws-2.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Oct 2006 15:30:13 -0000	1.28
+++ sources	20 Oct 2006 08:21:20 -0000	1.29
@@ -1 +1 @@
-ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2
+f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sylpheed-claws.spec	12 Oct 2006 15:30:13 -0000	1.52
+++ sylpheed-claws.spec	20 Oct 2006 08:21:20 -0000	1.53
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.5
+Version:        2.5.6
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -168,6 +168,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.6-1
+- version upgrade
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Oct 20 08:22:45 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Fri, 20 Oct 2006 01:22:45 -0700
Subject: rpms/gcin/FC-4 .cvsignore, 1.7, 1.8 gcin.spec, 1.11,
	1.12 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <200610200822.k9K8MjDp003226@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3154

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:17:28 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:22:14 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	9 Oct 2006 01:17:28 -0000	1.11
+++ gcin.spec	20 Oct 2006 08:22:14 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -12,7 +12,6 @@
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
-Patch4:         gcin-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -29,11 +28,13 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
-%patch4 -p1 -b .x86_64
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
+echo "#!/bin/bash" > scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +49,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +98,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
 - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:22:14 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:17:28 -0000	1.7
+++ sources	20 Oct 2006 08:22:14 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 08:32:08 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Fri, 20 Oct 2006 01:32:08 -0700
Subject: rpms/gcin/FC-3 .cvsignore, 1.7, 1.8 gcin.spec, 1.10,
	1.11 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <200610200832.k9K8W8Ze003403@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3372

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:18:27 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:31:38 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	9 Oct 2006 01:18:27 -0000	1.10
+++ gcin.spec	20 Oct 2006 08:31:38 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -12,7 +12,6 @@
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
-Patch4:         gcin-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -29,11 +28,13 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
-%patch4 -p1 -b .x86_64
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
+echo "#!/bin/bash" > scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +49,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +98,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
 - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:31:38 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:18:27 -0000	1.7
+++ sources	20 Oct 2006 08:31:38 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 09:48:18 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 02:48:18 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.16, 
	1.17
Message-ID: <200610200948.k9K9mI7T006985@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6935/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sylpheed-claws-plugins.spec	12 Oct 2006 17:09:52 -0000	1.16
+++ sylpheed-claws-plugins.spec	20 Oct 2006 09:47:48 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-4
+- rebuild
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-3
 - rebuild



From fedora-extras-commits at redhat.com  Fri Oct 20 09:48:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 02:48:19 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.21, 
	1.22
Message-ID: <200610200948.k9K9mJUc006988@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6935/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sylpheed-claws-plugins.spec	12 Oct 2006 17:09:53 -0000	1.21
+++ sylpheed-claws-plugins.spec	20 Oct 2006 09:47:49 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-4
+- rebuild
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-3
 - rebuild



From fedora-extras-commits at redhat.com  Fri Oct 20 09:48:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 02:48:20 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.22,
	1.23
Message-ID: <200610200948.k9K9mKNq006991@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6935/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sylpheed-claws-plugins.spec	12 Oct 2006 17:09:54 -0000	1.22
+++ sylpheed-claws-plugins.spec	20 Oct 2006 09:47:50 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-4
+- rebuild
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-3
 - rebuild



From fedora-extras-commits at redhat.com  Fri Oct 20 10:06:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:06:43 -0700
Subject: rpms/libopensync/FC-3 .cvsignore, 1.2, 1.3 libopensync-rpath.patch, 
	1.1, 1.2 libopensync.spec, 1.4, 1.5 sources, 1.2,
	1.3 libopensync-configure.patch, 1.1, NONE
Message-ID: <200610201006.k9KA6h8N010249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/FC-3

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:12 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:12 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync.spec	13 Dec 2005 13:46:20 -0000	1.4
+++ libopensync.spec	20 Oct 2006 10:06:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,7 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -19,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -42,7 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -51,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -100,10 +101,15 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-5
 - change handling of ld.so.conf files
 - patch configure for x86_64 python
+- add wrapper compile patch (no Werror)
 
 * Sun Dec 11 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:12 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:06:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:06:44 -0700
Subject: rpms/libopensync/FC-4 .cvsignore, 1.2, 1.3 libopensync-rpath.patch, 
	1.1, 1.2 libopensync.spec, 1.4, 1.5 sources, 1.2,
	1.3 libopensync-configure.patch, 1.1, NONE
Message-ID: <200610201006.k9KA6iI9010258@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/FC-4

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:13 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:13 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync.spec	13 Dec 2005 13:46:26 -0000	1.4
+++ libopensync.spec	20 Oct 2006 10:06:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,7 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -19,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -42,7 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -51,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -100,10 +101,15 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-5
 - change handling of ld.so.conf files
 - patch configure for x86_64 python
+- add wrapper compile patch (no Werror)
 
 * Sun Dec 11 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:13 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:06:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:06:44 -0700
Subject: rpms/libopensync/FC-5 .cvsignore, 1.2, 1.3 libopensync-rpath.patch, 
	1.1, 1.2 libopensync.spec, 1.6, 1.7 sources, 1.2,
	1.3 libopensync-configure.patch, 1.1,
	NONE libopensync-wrapper.patch, 1.1, NONE
Message-ID: <200610201006.k9KA6iI9010267@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/FC-5

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch libopensync-wrapper.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:14 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:14 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/libopensync.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libopensync.spec	15 Feb 2006 08:38:13 -0000	1.6
+++ libopensync.spec	20 Oct 2006 10:06:14 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        6%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,8 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
-Patch2:         libopensync-wrapper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -20,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -43,8 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
-%patch2
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -53,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -86,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -102,6 +101,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-6
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:14 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---


--- libopensync-wrapper.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:06:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:06:45 -0700
Subject: rpms/libopensync/devel .cvsignore, 1.2, 1.3 libopensync-rpath.patch,
	1.1, 1.2 libopensync.spec, 1.7, 1.8 sources, 1.2,
	1.3 libopensync-configure.patch, 1.1,
	NONE libopensync-wrapper.patch, 1.1, NONE
Message-ID: <200610201006.k9KA6j7o010276@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/devel

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch libopensync-wrapper.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:15 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:15 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync.spec	13 Sep 2006 11:42:46 -0000	1.7
+++ libopensync.spec	20 Oct 2006 10:06:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        7%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,8 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
-Patch2:         libopensync-wrapper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -20,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -43,8 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
-%patch2
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -53,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -86,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -102,6 +101,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-7
 - FE6 rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:15 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---


--- libopensync-wrapper.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:29:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:29:26 -0700
Subject: rpms/libopensync/FC-5 libopensync.spec,1.7,1.8
Message-ID: <200610201029.k9KATQ2E010629@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567/FC-5

Modified Files:
	libopensync.spec 
Log Message:
- fix BR



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/libopensync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync.spec	20 Oct 2006 10:06:14 -0000	1.7
+++ libopensync.spec	20 Oct 2006 10:28:56 -0000	1.8
@@ -19,6 +19,8 @@
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 OpenSync is a synchronization framework that is platform and distribution



From fedora-extras-commits at redhat.com  Fri Oct 20 10:29:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:29:24 -0700
Subject: rpms/libopensync/FC-3 libopensync.spec,1.5,1.6
Message-ID: <200610201029.k9KATOi4010625@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567/FC-3

Modified Files:
	libopensync.spec 
Log Message:
- fix BR



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync.spec	20 Oct 2006 10:06:12 -0000	1.5
+++ libopensync.spec	20 Oct 2006 10:28:54 -0000	1.6
@@ -19,6 +19,8 @@
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 OpenSync is a synchronization framework that is platform and distribution



From fedora-extras-commits at redhat.com  Fri Oct 20 10:29:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:29:25 -0700
Subject: rpms/libopensync/FC-4 libopensync.spec,1.5,1.6
Message-ID: <200610201029.k9KATP4Y010628@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567/FC-4

Modified Files:
	libopensync.spec 
Log Message:
- fix BR



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync.spec	20 Oct 2006 10:06:13 -0000	1.5
+++ libopensync.spec	20 Oct 2006 10:28:55 -0000	1.6
@@ -19,6 +19,8 @@
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 OpenSync is a synchronization framework that is platform and distribution



From fedora-extras-commits at redhat.com  Fri Oct 20 10:29:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:29:27 -0700
Subject: rpms/libopensync/devel libopensync.spec,1.8,1.9
Message-ID: <200610201029.k9KATRkV010632@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567/devel

Modified Files:
	libopensync.spec 
Log Message:
- fix BR



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libopensync.spec	20 Oct 2006 10:06:15 -0000	1.8
+++ libopensync.spec	20 Oct 2006 10:28:56 -0000	1.9
@@ -19,6 +19,8 @@
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 OpenSync is a synchronization framework that is platform and distribution



From fedora-extras-commits at redhat.com  Fri Oct 20 10:58:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:58:20 -0700
Subject: rpms/multisync/FC-4 .cvsignore, 1.2, 1.3 multisync-rpath.patch, 1.1,
	1.2 multisync.spec, 1.2, 1.3 sources, 1.2,
	1.3 multisync-gui-svn151.patch, 1.1, NONE multisync-tool.patch,
	1.1, NONE multisync-werror.patch, 1.1, NONE
Message-ID: <200610201058.k9KAwKwd011023@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/FC-4

Modified Files:
	.cvsignore multisync-rpath.patch multisync.spec sources 
Removed Files:
	multisync-gui-svn151.patch multisync-tool.patch 
	multisync-werror.patch 
Log Message:
- version upgrade
- should fix #187288,#187319,#188250,#196412



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2006 09:11:47 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:57:50 -0000	1.3
@@ -1 +1,2 @@
-multisync-0.90.18.tar.gz
+multisync-gui-0.90.19.tar.gz
+msynctool-0.19.tar.gz

multisync-rpath.patch:

Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/multisync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisync-rpath.patch	13 Mar 2006 09:11:47 -0000	1.1
+++ multisync-rpath.patch	20 Oct 2006 10:57:50 -0000	1.2
@@ -1,6 +1,24 @@
---- tools/Makefile.am.orig	2005-11-29 14:43:23.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 14:46:18.000000000 +0100
-@@ -1,13 +1,13 @@
+--- msynctool-0.19/tools/Makefile.in.orig	2006-10-20 12:42:27.000000000 +0200
++++ msynctool-0.19/tools/Makefile.in	2006-10-20 12:43:04.000000000 +0200
+@@ -181,12 +181,12 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(top_srcdir)
+ INCLUDES = @PACKAGE_CFLAGS@
+ msynctool_SOURCES = msynctool.c
+-msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++msynctool_LDFLAGS = @PACKAGE_LIBS@
+ convcard_SOURCES = convcard.c
+-convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convcard_LDFLAGS = @PACKAGE_LIBS@
+ man_MANS = convcard.1 msynctool.1
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
+--- msynctool-0.19/tools/Makefile.am.orig	2006-10-20 12:42:24.000000000 +0200
++++ msynctool-0.19/tools/Makefile.am	2006-10-20 12:42:45.000000000 +0200
+@@ -1,16 +1,16 @@
  ## Process this file with automake to produce Makefile.in
  
 -AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
@@ -16,5 +34,7 @@
  
  convcard_SOURCES = convcard.c
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
-\ No newline at end of file
 +convcard_LDFLAGS = @PACKAGE_LIBS@
+ 
+ man_MANS = convcard.1 msynctool.1
+ 


Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/multisync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multisync.spec	17 Mar 2006 10:58:01 -0000	1.2
+++ multisync.spec	20 Oct 2006 10:57:50 -0000	1.3
@@ -1,19 +1,16 @@
 Name:           multisync
-Version:        0.90.18
-Release:        5%{?dist}
+Version:        0.90.19
+Release:        1%{?dist}
 Summary:        Calendar (and other PIM data) synchronization program
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-gui-%{version}.tar.gz
 Source1:        %{name}.desktop
+Source2:        msynctool-0.19.tar.gz
 Patch0:         multisync-rpath.patch
-# this is svn151 with a few fixes
-Patch1:         multisync-gui-svn151.patch
-Patch2:         multisync-werror.patch
-Patch3:         multisync-tool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -22,12 +19,15 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
 BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 MultiSync is a program to synchronize calendars, addressbooks and other PIM
 data between programs on your computer and other computers, mobile devices,
 PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC
 mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup.
+For proper use, please install the desired plugins found in the
+libopensync-plugin-* packages.
 
 %package gui
 Summary:  GUI interface for multisync
@@ -38,37 +38,31 @@
 Graphical User Interface for multisync
 
 %prep
-%setup -q
+%setup -q -n multisync-gui-%{version}
+tar xzvf %{SOURCE2}
 %patch0
-%patch1
-%patch2
-%patch3 -p1
 
 %build
 # both don't like smp flags so disable them for now
 
-NOCONFIGURE=true ./autogen.sh
-%configure --disable-static
+%configure --disable-static --disable-rpath
 %{__make}
 
 # build gui
-cd gui
-autoreconf -sfi 
+cd msynctool-0.19
 %configure --disable-static --disable-rpath
-# if we don't do a make clean here we only get a segfaulting binary
-%{__make} clean
 %{__make}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
-cd gui
+cd msynctool-0.19
 %makeinstall
 
-mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
-
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
+
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -80,17 +74,24 @@
 
 %files
 %defattr(-, root, root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc msynctool-0.19/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
 %{_bindir}/convcard
 %{_bindir}/msynctool
+%{_mandir}/man1/convcard*
+%{_mandir}/man1/msynctool*
 
 %files gui
 %defattr(-, root, root,-)
-%doc COPYING
+%doc AUTHORS COPYING ChangeLog README COPYING
 %{_bindir}/multisync
 %{_datadir}/applications/*desktop
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.90.19-1
+- version upgrade
+- should fix #187288,#187319,#196412
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.90.18-5
 - fix #185631


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2006 09:11:47 -0000	1.2
+++ sources	20 Oct 2006 10:57:50 -0000	1.3
@@ -1 +1,2 @@
-d55d8eaeecb825b87a25eeceaef92cb9  multisync-0.90.18.tar.gz
+57bfe0f3375c8d6d5a86cb861d1eeeea  multisync-gui-0.90.19.tar.gz
+5c7728254f2d634051af603e7d467832  msynctool-0.19.tar.gz


--- multisync-gui-svn151.patch DELETED ---


--- multisync-tool.patch DELETED ---


--- multisync-werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:58:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:58:21 -0700
Subject: rpms/multisync/FC-5 .cvsignore, 1.2, 1.3 multisync-rpath.patch, 1.1,
	1.2 multisync.spec, 1.2, 1.3 sources, 1.2,
	1.3 multisync-gui-svn151.patch, 1.1, NONE multisync-tool.patch,
	1.1, NONE multisync-werror.patch, 1.1, NONE
Message-ID: <200610201058.k9KAwLGi011032@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/FC-5

Modified Files:
	.cvsignore multisync-rpath.patch multisync.spec sources 
Removed Files:
	multisync-gui-svn151.patch multisync-tool.patch 
	multisync-werror.patch 
Log Message:
- version upgrade
- should fix #187288,#187319,#188250,#196412



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2006 09:11:47 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:57:51 -0000	1.3
@@ -1 +1,2 @@
-multisync-0.90.18.tar.gz
+multisync-gui-0.90.19.tar.gz
+msynctool-0.19.tar.gz

multisync-rpath.patch:

Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/multisync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisync-rpath.patch	13 Mar 2006 09:11:47 -0000	1.1
+++ multisync-rpath.patch	20 Oct 2006 10:57:51 -0000	1.2
@@ -1,6 +1,24 @@
---- tools/Makefile.am.orig	2005-11-29 14:43:23.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 14:46:18.000000000 +0100
-@@ -1,13 +1,13 @@
+--- msynctool-0.19/tools/Makefile.in.orig	2006-10-20 12:42:27.000000000 +0200
++++ msynctool-0.19/tools/Makefile.in	2006-10-20 12:43:04.000000000 +0200
+@@ -181,12 +181,12 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(top_srcdir)
+ INCLUDES = @PACKAGE_CFLAGS@
+ msynctool_SOURCES = msynctool.c
+-msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++msynctool_LDFLAGS = @PACKAGE_LIBS@
+ convcard_SOURCES = convcard.c
+-convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convcard_LDFLAGS = @PACKAGE_LIBS@
+ man_MANS = convcard.1 msynctool.1
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
+--- msynctool-0.19/tools/Makefile.am.orig	2006-10-20 12:42:24.000000000 +0200
++++ msynctool-0.19/tools/Makefile.am	2006-10-20 12:42:45.000000000 +0200
+@@ -1,16 +1,16 @@
  ## Process this file with automake to produce Makefile.in
  
 -AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
@@ -16,5 +34,7 @@
  
  convcard_SOURCES = convcard.c
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
-\ No newline at end of file
 +convcard_LDFLAGS = @PACKAGE_LIBS@
+ 
+ man_MANS = convcard.1 msynctool.1
+ 


Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/multisync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multisync.spec	17 Mar 2006 10:58:08 -0000	1.2
+++ multisync.spec	20 Oct 2006 10:57:51 -0000	1.3
@@ -1,19 +1,16 @@
 Name:           multisync
-Version:        0.90.18
-Release:        5%{?dist}
+Version:        0.90.19
+Release:        1%{?dist}
 Summary:        Calendar (and other PIM data) synchronization program
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-gui-%{version}.tar.gz
 Source1:        %{name}.desktop
+Source2:        msynctool-0.19.tar.gz
 Patch0:         multisync-rpath.patch
-# this is svn151 with a few fixes
-Patch1:         multisync-gui-svn151.patch
-Patch2:         multisync-werror.patch
-Patch3:         multisync-tool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -21,13 +18,18 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
+BuildRequires:  libopensync-plugin-gpe-devel
+BuildRequires:  libopensync-plugin-palm-devel
 BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 MultiSync is a program to synchronize calendars, addressbooks and other PIM
 data between programs on your computer and other computers, mobile devices,
 PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC
 mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup.
+For proper use, please install the desired plugins found in the
+libopensync-plugin-* packages.
 
 %package gui
 Summary:  GUI interface for multisync
@@ -38,37 +40,31 @@
 Graphical User Interface for multisync
 
 %prep
-%setup -q
+%setup -q -n multisync-gui-%{version}
+tar xzvf %{SOURCE2}
 %patch0
-%patch1
-%patch2
-%patch3 -p1
 
 %build
 # both don't like smp flags so disable them for now
 
-NOCONFIGURE=true ./autogen.sh
-%configure --disable-static
+%configure --disable-static --disable-rpath
 %{__make}
 
 # build gui
-cd gui
-autoreconf -sfi 
+cd msynctool-0.19
 %configure --disable-static --disable-rpath
-# if we don't do a make clean here we only get a segfaulting binary
-%{__make} clean
 %{__make}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
-cd gui
+cd msynctool-0.19
 %makeinstall
 
-mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
-
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
+
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -80,17 +76,24 @@
 
 %files
 %defattr(-, root, root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc msynctool-0.19/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
 %{_bindir}/convcard
 %{_bindir}/msynctool
+%{_mandir}/man1/convcard*
+%{_mandir}/man1/msynctool*
 
 %files gui
 %defattr(-, root, root,-)
-%doc COPYING
+%doc AUTHORS COPYING ChangeLog README COPYING
 %{_bindir}/multisync
 %{_datadir}/applications/*desktop
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.90.19-1
+- version upgrade
+- should fix #187288,#187319,#196412
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.90.18-5
 - fix #185631


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2006 09:11:47 -0000	1.2
+++ sources	20 Oct 2006 10:57:51 -0000	1.3
@@ -1 +1,2 @@
-d55d8eaeecb825b87a25eeceaef92cb9  multisync-0.90.18.tar.gz
+57bfe0f3375c8d6d5a86cb861d1eeeea  multisync-gui-0.90.19.tar.gz
+5c7728254f2d634051af603e7d467832  msynctool-0.19.tar.gz


--- multisync-gui-svn151.patch DELETED ---


--- multisync-tool.patch DELETED ---


--- multisync-werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:58:22 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:58:22 -0700
Subject: rpms/multisync/devel .cvsignore, 1.2, 1.3 multisync-rpath.patch, 1.1,
	1.2 multisync.spec, 1.4, 1.5 sources, 1.2,
	1.3 multisync-gui-svn151.patch, 1.1, NONE multisync-tool.patch,
	1.1, NONE multisync-werror.patch, 1.1, NONE
Message-ID: <200610201058.k9KAwMbF011041@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/devel

Modified Files:
	.cvsignore multisync-rpath.patch multisync.spec sources 
Removed Files:
	multisync-gui-svn151.patch multisync-tool.patch 
	multisync-werror.patch 
Log Message:
- version upgrade
- should fix #187288,#187319,#188250,#196412



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2006 09:11:47 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:57:52 -0000	1.3
@@ -1 +1,2 @@
-multisync-0.90.18.tar.gz
+multisync-gui-0.90.19.tar.gz
+msynctool-0.19.tar.gz

multisync-rpath.patch:

Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/multisync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisync-rpath.patch	13 Mar 2006 09:11:47 -0000	1.1
+++ multisync-rpath.patch	20 Oct 2006 10:57:52 -0000	1.2
@@ -1,6 +1,24 @@
---- tools/Makefile.am.orig	2005-11-29 14:43:23.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 14:46:18.000000000 +0100
-@@ -1,13 +1,13 @@
+--- msynctool-0.19/tools/Makefile.in.orig	2006-10-20 12:42:27.000000000 +0200
++++ msynctool-0.19/tools/Makefile.in	2006-10-20 12:43:04.000000000 +0200
+@@ -181,12 +181,12 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(top_srcdir)
+ INCLUDES = @PACKAGE_CFLAGS@
+ msynctool_SOURCES = msynctool.c
+-msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++msynctool_LDFLAGS = @PACKAGE_LIBS@
+ convcard_SOURCES = convcard.c
+-convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convcard_LDFLAGS = @PACKAGE_LIBS@
+ man_MANS = convcard.1 msynctool.1
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
+--- msynctool-0.19/tools/Makefile.am.orig	2006-10-20 12:42:24.000000000 +0200
++++ msynctool-0.19/tools/Makefile.am	2006-10-20 12:42:45.000000000 +0200
+@@ -1,16 +1,16 @@
  ## Process this file with automake to produce Makefile.in
  
 -AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
@@ -16,5 +34,7 @@
  
  convcard_SOURCES = convcard.c
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
-\ No newline at end of file
 +convcard_LDFLAGS = @PACKAGE_LIBS@
+ 
+ man_MANS = convcard.1 msynctool.1
+ 


Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/multisync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- multisync.spec	15 Sep 2006 06:38:27 -0000	1.4
+++ multisync.spec	20 Oct 2006 10:57:52 -0000	1.5
@@ -1,19 +1,16 @@
 Name:           multisync
-Version:        0.90.18
-Release:        6%{?dist}
+Version:        0.90.19
+Release:        1%{?dist}
 Summary:        Calendar (and other PIM data) synchronization program
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-gui-%{version}.tar.gz
 Source1:        %{name}.desktop
+Source2:        msynctool-0.19.tar.gz
 Patch0:         multisync-rpath.patch
-# this is svn151 with a few fixes
-Patch1:         multisync-gui-svn151.patch
-Patch2:         multisync-werror.patch
-Patch3:         multisync-tool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -29,6 +26,8 @@
 data between programs on your computer and other computers, mobile devices,
 PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC
 mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup.
+For proper use, please install the desired plugins found in the
+libopensync-plugin-* packages.
 
 %package gui
 Summary:  GUI interface for multisync
@@ -39,37 +38,31 @@
 Graphical User Interface for multisync
 
 %prep
-%setup -q
+%setup -q -n multisync-gui-%{version}
+tar xzvf %{SOURCE2}
 %patch0
-%patch1
-%patch2
-%patch3 -p1
 
 %build
 # both don't like smp flags so disable them for now
 
-NOCONFIGURE=true ./autogen.sh
-%configure --disable-static
+%configure --disable-static --disable-rpath
 %{__make}
 
 # build gui
-cd gui
-autoreconf -sfi 
+cd msynctool-0.19
 %configure --disable-static --disable-rpath
-# if we don't do a make clean here we only get a segfaulting binary
-%{__make} clean
 %{__make}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
-cd gui
+cd msynctool-0.19
 %makeinstall
 
-mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
-
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
+
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -81,17 +74,24 @@
 
 %files
 %defattr(-, root, root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc msynctool-0.19/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
 %{_bindir}/convcard
 %{_bindir}/msynctool
+%{_mandir}/man1/convcard*
+%{_mandir}/man1/msynctool*
 
 %files gui
 %defattr(-, root, root,-)
-%doc COPYING
+%doc AUTHORS COPYING ChangeLog README COPYING
 %{_bindir}/multisync
 %{_datadir}/applications/*desktop
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.90.19-1
+- version upgrade
+- should fix #187288,#187319,#196412
+
 * Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.90.18-6
 - FE6 rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2006 09:11:47 -0000	1.2
+++ sources	20 Oct 2006 10:57:52 -0000	1.3
@@ -1 +1,2 @@
-d55d8eaeecb825b87a25eeceaef92cb9  multisync-0.90.18.tar.gz
+57bfe0f3375c8d6d5a86cb861d1eeeea  multisync-gui-0.90.19.tar.gz
+5c7728254f2d634051af603e7d467832  msynctool-0.19.tar.gz


--- multisync-gui-svn151.patch DELETED ---


--- multisync-tool.patch DELETED ---


--- multisync-werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:07:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:07:06 -0700
Subject: rpms/libopensync-plugin-evolution2/FC-3 .cvsignore, 1.2,
	1.3 libopensync-plugin-evolution2.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201107.k9KB7691014276@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14203/FC-3

Modified Files:
	.cvsignore libopensync-plugin-evolution2.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:06:35 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-evolution2-0.18.tar.gz
+libopensync-plugin-evolution2-0.19.tar.gz


Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-3/libopensync-plugin-evolution2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-evolution2.spec	13 Dec 2005 14:57:50 -0000	1.2
+++ libopensync-plugin-evolution2.spec	20 Oct 2006 11:06:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:22:59 -0000	1.2
+++ sources	20 Oct 2006 11:06:35 -0000	1.3
@@ -1 +1 @@
-64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz
+c43a85a1d5ef3059eef8058b5ebe9f0a  libopensync-plugin-evolution2-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:07:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:07:06 -0700
Subject: rpms/libopensync-plugin-evolution2/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-evolution2.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201107.k9KB76qQ014279@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14203/FC-4

Modified Files:
	.cvsignore libopensync-plugin-evolution2.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:06:36 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-evolution2-0.18.tar.gz
+libopensync-plugin-evolution2-0.19.tar.gz


Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-4/libopensync-plugin-evolution2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-evolution2.spec	13 Dec 2005 14:57:50 -0000	1.2
+++ libopensync-plugin-evolution2.spec	20 Oct 2006 11:06:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:22:59 -0000	1.2
+++ sources	20 Oct 2006 11:06:36 -0000	1.3
@@ -1 +1 @@
-64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz
+c43a85a1d5ef3059eef8058b5ebe9f0a  libopensync-plugin-evolution2-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:07:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:07:07 -0700
Subject: rpms/libopensync-plugin-evolution2/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-evolution2.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200610201107.k9KB77KQ014284@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14203/FC-5

Modified Files:
	.cvsignore libopensync-plugin-evolution2.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:06:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-evolution2-0.18.tar.gz
+libopensync-plugin-evolution2-0.19.tar.gz


Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-5/libopensync-plugin-evolution2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync-plugin-evolution2.spec	21 Aug 2006 06:54:52 -0000	1.7
+++ libopensync-plugin-evolution2.spec	20 Oct 2006 11:06:37 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
-Version:        0.18
-Release:        8%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,11 +58,8 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
-* Mon Aug 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-8
-- bump
-
-* Fri Jun 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-7
-- bump
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
 
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-6
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:22:59 -0000	1.2
+++ sources	20 Oct 2006 11:06:37 -0000	1.3
@@ -1 +1 @@
-64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz
+c43a85a1d5ef3059eef8058b5ebe9f0a  libopensync-plugin-evolution2-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:07:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:07:08 -0700
Subject: rpms/libopensync-plugin-evolution2/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-evolution2.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200610201107.k9KB78m6014289@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14203/devel

Modified Files:
	.cvsignore libopensync-plugin-evolution2.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:06:38 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-evolution2-0.18.tar.gz
+libopensync-plugin-evolution2-0.19.tar.gz


Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/libopensync-plugin-evolution2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync-plugin-evolution2.spec	13 Sep 2006 13:20:22 -0000	1.7
+++ libopensync-plugin-evolution2.spec	20 Oct 2006 11:06:38 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
-Version:        0.18
-Release:        9%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-9
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:22:59 -0000	1.2
+++ sources	20 Oct 2006 11:06:38 -0000	1.3
@@ -1 +1 @@
-64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz
+c43a85a1d5ef3059eef8058b5ebe9f0a  libopensync-plugin-evolution2-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:24:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:24:26 -0700
Subject: rpms/libopensync-plugin-file/FC-3 .cvsignore, 1.2,
	1.3 libopensync-plugin-file.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201124.k9KBOQY7014691@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14589/FC-3

Modified Files:
	.cvsignore libopensync-plugin-file.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:23:56 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-file-0.18.tar.gz
+libopensync-plugin-file-0.19.tar.gz


Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-3/libopensync-plugin-file.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-file.spec	13 Dec 2005 15:09:38 -0000	1.2
+++ libopensync-plugin-file.spec	20 Oct 2006 11:23:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:28:03 -0000	1.2
+++ sources	20 Oct 2006 11:23:56 -0000	1.3
@@ -1 +1 @@
-a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz
+dad7ded0c3f5ec089e6efdb4bf5d7b4b  libopensync-plugin-file-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:24:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:24:27 -0700
Subject: rpms/libopensync-plugin-file/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-file.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201124.k9KBORYR014696@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14589/FC-4

Modified Files:
	.cvsignore libopensync-plugin-file.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:23:56 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-file-0.18.tar.gz
+libopensync-plugin-file-0.19.tar.gz


Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-4/libopensync-plugin-file.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-file.spec	13 Dec 2005 15:09:38 -0000	1.2
+++ libopensync-plugin-file.spec	20 Oct 2006 11:23:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:28:03 -0000	1.2
+++ sources	20 Oct 2006 11:23:56 -0000	1.3
@@ -1 +1 @@
-a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz
+dad7ded0c3f5ec089e6efdb4bf5d7b4b  libopensync-plugin-file-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:24:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:24:27 -0700
Subject: rpms/libopensync-plugin-file/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-file.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610201124.k9KBORWB014701@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14589/FC-5

Modified Files:
	.cvsignore libopensync-plugin-file.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:23:57 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-file-0.18.tar.gz
+libopensync-plugin-file-0.19.tar.gz


Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-5/libopensync-plugin-file.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-file.spec	16 Feb 2006 23:16:22 -0000	1.3
+++ libopensync-plugin-file.spec	20 Oct 2006 11:23:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
-Version:        0.18
-Release:        4%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:28:03 -0000	1.2
+++ sources	20 Oct 2006 11:23:57 -0000	1.3
@@ -1 +1 @@
-a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz
+dad7ded0c3f5ec089e6efdb4bf5d7b4b  libopensync-plugin-file-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:24:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:24:28 -0700
Subject: rpms/libopensync-plugin-file/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-file.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200610201124.k9KBOSK1014706@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14589/devel

Modified Files:
	.cvsignore libopensync-plugin-file.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:23:58 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-file-0.18.tar.gz
+libopensync-plugin-file-0.19.tar.gz


Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/libopensync-plugin-file.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-file.spec	13 Sep 2006 13:39:44 -0000	1.4
+++ libopensync-plugin-file.spec	20 Oct 2006 11:23:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-5
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:28:03 -0000	1.2
+++ sources	20 Oct 2006 11:23:58 -0000	1.3
@@ -1 +1 @@
-a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz
+dad7ded0c3f5ec089e6efdb4bf5d7b4b  libopensync-plugin-file-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:37:18 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 20 Oct 2006 04:37:18 -0700
Subject: rpms/quilt/devel .cvsignore, 1.7, 1.8 quilt.spec, 1.12, 1.13 sources,
	1.7, 1.8
Message-ID: <200610201137.k9KBbIG0015075@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15019/devel

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:
Update to latest quilt release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Apr 2006 16:24:14 -0000	1.7
+++ .cvsignore	20 Oct 2006 11:36:48 -0000	1.8
@@ -1 +1 @@
-quilt-0.45.tar.gz
+quilt-0.46.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/quilt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- quilt.spec	28 Aug 2006 00:24:23 -0000	1.12
+++ quilt.spec	20 Oct 2006 11:36:48 -0000	1.13
@@ -6,8 +6,8 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.45
-Release:	2%{?dist}
+Version:	0.46
+Release:	1%{?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)
@@ -61,6 +61,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 20 2006 - jwboyer at jdub.homelinux.org 0.46-1
+- Update to latest release
+
 * Sun Aug 27 2006 - jwboyer at jdub.homelinux.org 0.45-2
 - Bump and rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Apr 2006 16:24:14 -0000	1.7
+++ sources	20 Oct 2006 11:36:48 -0000	1.8
@@ -1 +1 @@
-5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz
+4508546d1ed0257ef7c128b6121b7208  quilt-0.46.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:37:17 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 20 Oct 2006 04:37:17 -0700
Subject: rpms/quilt/FC-5 .cvsignore, 1.7, 1.8 quilt.spec, 1.11, 1.12 sources,
	1.7, 1.8
Message-ID: <200610201137.k9KBbH5c015070@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15019/FC-5

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:
Update to latest quilt release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Apr 2006 16:24:14 -0000	1.7
+++ .cvsignore	20 Oct 2006 11:36:47 -0000	1.8
@@ -1 +1 @@
-quilt-0.45.tar.gz
+quilt-0.46.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/quilt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- quilt.spec	24 Apr 2006 16:24:14 -0000	1.11
+++ quilt.spec	20 Oct 2006 11:36:47 -0000	1.12
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.45
+Version:	0.46
 Release:	1%{?dist}
 Source:		http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz
 URL:		http://savannah.nongnu.org/projects/quilt
@@ -61,6 +61,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 20 2006 - jwboyer at jdub.homelinux.org 0.46-1
+- Update to latest release
+
 * Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Apr 2006 16:24:14 -0000	1.7
+++ sources	20 Oct 2006 11:36:47 -0000	1.8
@@ -1 +1 @@
-5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz
+4508546d1ed0257ef7c128b6121b7208  quilt-0.46.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:38:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:38:36 -0700
Subject: rpms/libopensync-plugin-gpe/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-gpe.spec, 1.1, 1.2 sources, 1.2,
	1.3 libopensync-plugin-gpe-Makefile.patch, 1.1, NONE
Message-ID: <200610201138.k9KBcaq6015215@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-gpe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123/FC-4

Modified Files:
	.cvsignore libopensync-plugin-gpe.spec sources 
Removed Files:
	libopensync-plugin-gpe-Makefile.patch 
Log Message:
- version upgade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Feb 2006 23:30:24 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:38:06 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-gpe-0.18.tar.gz
+libopensync-plugin-gpe-0.19.tar.gz


Index: libopensync-plugin-gpe.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-4/libopensync-plugin-gpe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-gpe.spec	27 Feb 2006 23:30:24 -0000	1.1
+++ libopensync-plugin-gpe.spec	20 Oct 2006 11:38:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-gpe
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        GPE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -58,6 +56,9 @@
 %{_includedir}/opensync-1.0/opensync/gpe_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Sun Feb 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - fix description
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Feb 2006 23:30:24 -0000	1.2
+++ sources	20 Oct 2006 11:38:06 -0000	1.3
@@ -1 +1 @@
-6b35732f34aad4becfc24ee500d32c9b  libopensync-plugin-gpe-0.18.tar.gz
+fcb08b2ea4944effc88360d568029efe  libopensync-plugin-gpe-0.19.tar.gz


--- libopensync-plugin-gpe-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:38:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:38:37 -0700
Subject: rpms/libopensync-plugin-gpe/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-gpe.spec, 1.1, 1.2 sources, 1.2,
	1.3 libopensync-plugin-gpe-Makefile.patch, 1.1, NONE
Message-ID: <200610201138.k9KBcbll015220@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-gpe/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123/FC-5

Modified Files:
	.cvsignore libopensync-plugin-gpe.spec sources 
Removed Files:
	libopensync-plugin-gpe-Makefile.patch 
Log Message:
- version upgade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Feb 2006 23:30:24 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:38:07 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-gpe-0.18.tar.gz
+libopensync-plugin-gpe-0.19.tar.gz


Index: libopensync-plugin-gpe.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-5/libopensync-plugin-gpe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-gpe.spec	27 Feb 2006 23:30:24 -0000	1.1
+++ libopensync-plugin-gpe.spec	20 Oct 2006 11:38:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-gpe
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        GPE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -58,6 +56,9 @@
 %{_includedir}/opensync-1.0/opensync/gpe_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Sun Feb 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - fix description
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Feb 2006 23:30:24 -0000	1.2
+++ sources	20 Oct 2006 11:38:07 -0000	1.3
@@ -1 +1 @@
-6b35732f34aad4becfc24ee500d32c9b  libopensync-plugin-gpe-0.18.tar.gz
+fcb08b2ea4944effc88360d568029efe  libopensync-plugin-gpe-0.19.tar.gz


--- libopensync-plugin-gpe-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:38:38 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:38:38 -0700
Subject: rpms/libopensync-plugin-gpe/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-gpe.spec, 1.2, 1.3 sources, 1.2,
	1.3 libopensync-plugin-gpe-Makefile.patch, 1.1, NONE
Message-ID: <200610201138.k9KBccws015225@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-gpe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123/devel

Modified Files:
	.cvsignore libopensync-plugin-gpe.spec sources 
Removed Files:
	libopensync-plugin-gpe-Makefile.patch 
Log Message:
- version upgade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Feb 2006 23:30:24 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:38:07 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-gpe-0.18.tar.gz
+libopensync-plugin-gpe-0.19.tar.gz


Index: libopensync-plugin-gpe.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/devel/libopensync-plugin-gpe.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-gpe.spec	13 Sep 2006 13:41:37 -0000	1.2
+++ libopensync-plugin-gpe.spec	20 Oct 2006 11:38:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-gpe
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        GPE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -58,6 +56,9 @@
 %{_includedir}/opensync-1.0/opensync/gpe_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Feb 2006 23:30:24 -0000	1.2
+++ sources	20 Oct 2006 11:38:07 -0000	1.3
@@ -1 +1 @@
-6b35732f34aad4becfc24ee500d32c9b  libopensync-plugin-gpe-0.18.tar.gz
+fcb08b2ea4944effc88360d568029efe  libopensync-plugin-gpe-0.19.tar.gz


--- libopensync-plugin-gpe-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:42:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:42:17 -0700
Subject: rpms/libopensync-plugin-irmc/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-irmc.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200610201142.k9KBgHfX015452@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-irmc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15394/FC-5

Modified Files:
	.cvsignore libopensync-plugin-irmc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Feb 2006 00:37:14 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:41:47 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-irmc-0.18.tar.gz
+libopensync-plugin-irmc-0.19.tar.gz


Index: libopensync-plugin-irmc.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-5/libopensync-plugin-irmc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-irmc.spec	28 Feb 2006 23:09:26 -0000	1.4
+++ libopensync-plugin-irmc.spec	20 Oct 2006 11:41:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-irmc
-Version:        0.18
-Release:        6%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Irmc plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@
 %{_datadir}/opensync/defaults/irmc-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Mar 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-6
 - Bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Feb 2006 00:37:14 -0000	1.2
+++ sources	20 Oct 2006 11:41:47 -0000	1.3
@@ -1 +1 @@
-52f86db50d653f5af0adefeb76cf9a31  libopensync-plugin-irmc-0.18.tar.gz
+14451c845a69ec8a10815d34a2abcf61  libopensync-plugin-irmc-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:42:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:42:16 -0700
Subject: rpms/libopensync-plugin-irmc/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-irmc.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201142.k9KBgG4G015447@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-irmc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15394/FC-4

Modified Files:
	.cvsignore libopensync-plugin-irmc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Feb 2006 00:37:14 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:41:46 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-irmc-0.18.tar.gz
+libopensync-plugin-irmc-0.19.tar.gz


Index: libopensync-plugin-irmc.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-4/libopensync-plugin-irmc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-irmc.spec	5 Feb 2006 00:51:05 -0000	1.2
+++ libopensync-plugin-irmc.spec	20 Oct 2006 11:41:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-irmc
-Version:        0.18
-Release:        4%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Irmc plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@
 %{_datadir}/opensync/defaults/irmc-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Sun Feb 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Feb 2006 00:37:14 -0000	1.2
+++ sources	20 Oct 2006 11:41:46 -0000	1.3
@@ -1 +1 @@
-52f86db50d653f5af0adefeb76cf9a31  libopensync-plugin-irmc-0.18.tar.gz
+14451c845a69ec8a10815d34a2abcf61  libopensync-plugin-irmc-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:42:18 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:42:18 -0700
Subject: rpms/libopensync-plugin-irmc/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-irmc.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200610201142.k9KBgIxC015457@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-irmc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15394/devel

Modified Files:
	.cvsignore libopensync-plugin-irmc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Feb 2006 00:37:14 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:41:48 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-irmc-0.18.tar.gz
+libopensync-plugin-irmc-0.19.tar.gz


Index: libopensync-plugin-irmc.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/libopensync-plugin-irmc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync-plugin-irmc.spec	13 Sep 2006 13:44:34 -0000	1.7
+++ libopensync-plugin-irmc.spec	20 Oct 2006 11:41:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-irmc
-Version:        0.18
-Release:        8%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Irmc plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@
 %{_datadir}/opensync/defaults/irmc-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-8
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Feb 2006 00:37:14 -0000	1.2
+++ sources	20 Oct 2006 11:41:48 -0000	1.3
@@ -1 +1 @@
-52f86db50d653f5af0adefeb76cf9a31  libopensync-plugin-irmc-0.18.tar.gz
+14451c845a69ec8a10815d34a2abcf61  libopensync-plugin-irmc-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:47:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:47:07 -0700
Subject: rpms/libopensync-plugin-kdepim/FC-4
	libopensync-plugin-kdepim-Makefile.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libopensync-plugin-kdepim.spec, 1.3, 1.4 sources, 1.2,
	1.3 libopensync-plugin-kdepim-gcc41.patch, 1.1, NONE
Message-ID: <200610201147.k9KBl722015670@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-kdepim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15609/FC-4

Modified Files:
	.cvsignore libopensync-plugin-kdepim.spec sources 
Added Files:
	libopensync-plugin-kdepim-Makefile.patch 
Removed Files:
	libopensync-plugin-kdepim-gcc41.patch 
Log Message:
- version upgrade


libopensync-plugin-kdepim-Makefile.patch:

--- NEW FILE libopensync-plugin-kdepim-Makefile.patch ---
--- Makefile.in.orig	2006-10-20 11:34:30.000000000 +0200
+++ Makefile.in	2006-10-20 11:34:57.000000000 +0200
@@ -479,9 +479,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kdepim_lib.la: $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
 kdepim_sync.la: $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2006 20:58:42 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:46:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-kdepim-0.18.tar.gz
+libopensync-plugin-kdepim-0.19.tar.gz


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-4/libopensync-plugin-kdepim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-kdepim.spec	2 Mar 2006 22:21:15 -0000	1.3
+++ libopensync-plugin-kdepim.spec	20 Oct 2006 11:46:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-kdepim
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,13 +8,16 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         libopensync-plugin-kdepim-gcc41.patch
+Patch0:         libopensync-plugin-kdepim-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  kdepim-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 %{summary}
@@ -32,7 +35,7 @@
 %prep
 %setup -q
 %patch0
-
+autoreconf
 %build
 %configure --disable-rpath
 # smpflags sometimes screw up the build
@@ -56,8 +59,12 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/opensync/plugins/kdepim*.so
+%{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Thu Mar 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 - add gcc4.1 fixes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2006 20:58:42 -0000	1.2
+++ sources	20 Oct 2006 11:46:37 -0000	1.3
@@ -1 +1 @@
-96c43911a0fbdaff4920bbc0f4cd3816  libopensync-plugin-kdepim-0.18.tar.gz
+258defed0c5f8d39eac42f6c294c8f1c  libopensync-plugin-kdepim-0.19.tar.gz


--- libopensync-plugin-kdepim-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:47:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:47:08 -0700
Subject: rpms/libopensync-plugin-kdepim/FC-5
	libopensync-plugin-kdepim-Makefile.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libopensync-plugin-kdepim.spec, 1.3, 1.4 sources, 1.2,
	1.3 libopensync-plugin-kdepim-gcc41.patch, 1.1, NONE
Message-ID: <200610201147.k9KBl8xB015675@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-kdepim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15609/FC-5

Modified Files:
	.cvsignore libopensync-plugin-kdepim.spec sources 
Added Files:
	libopensync-plugin-kdepim-Makefile.patch 
Removed Files:
	libopensync-plugin-kdepim-gcc41.patch 
Log Message:
- version upgrade


libopensync-plugin-kdepim-Makefile.patch:

--- NEW FILE libopensync-plugin-kdepim-Makefile.patch ---
--- Makefile.in.orig	2006-10-20 11:34:30.000000000 +0200
+++ Makefile.in	2006-10-20 11:34:57.000000000 +0200
@@ -479,9 +479,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kdepim_lib.la: $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
 kdepim_sync.la: $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2006 20:58:42 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:46:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-kdepim-0.18.tar.gz
+libopensync-plugin-kdepim-0.19.tar.gz


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-5/libopensync-plugin-kdepim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-kdepim.spec	2 Mar 2006 22:21:15 -0000	1.3
+++ libopensync-plugin-kdepim.spec	20 Oct 2006 11:46:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-kdepim
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,13 +8,16 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         libopensync-plugin-kdepim-gcc41.patch
+Patch0:         libopensync-plugin-kdepim-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  kdepim-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 %{summary}
@@ -32,7 +35,7 @@
 %prep
 %setup -q
 %patch0
-
+autoreconf
 %build
 %configure --disable-rpath
 # smpflags sometimes screw up the build
@@ -56,8 +59,12 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/opensync/plugins/kdepim*.so
+%{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Thu Mar 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 - add gcc4.1 fixes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2006 20:58:42 -0000	1.2
+++ sources	20 Oct 2006 11:46:37 -0000	1.3
@@ -1 +1 @@
-96c43911a0fbdaff4920bbc0f4cd3816  libopensync-plugin-kdepim-0.18.tar.gz
+258defed0c5f8d39eac42f6c294c8f1c  libopensync-plugin-kdepim-0.19.tar.gz


--- libopensync-plugin-kdepim-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:47:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:47:13 -0700
Subject: rpms/libopensync-plugin-kdepim/devel
	libopensync-plugin-kdepim-Makefile.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libopensync-plugin-kdepim.spec, 1.4, 1.5 sources, 1.2,
	1.3 libopensync-plugin-kdepim-gcc41.patch, 1.1, NONE
Message-ID: <200610201147.k9KBlDJ4015680@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15609/devel

Modified Files:
	.cvsignore libopensync-plugin-kdepim.spec sources 
Added Files:
	libopensync-plugin-kdepim-Makefile.patch 
Removed Files:
	libopensync-plugin-kdepim-gcc41.patch 
Log Message:
- version upgrade


libopensync-plugin-kdepim-Makefile.patch:

--- NEW FILE libopensync-plugin-kdepim-Makefile.patch ---
--- Makefile.in.orig	2006-10-20 11:34:30.000000000 +0200
+++ Makefile.in	2006-10-20 11:34:57.000000000 +0200
@@ -479,9 +479,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kdepim_lib.la: $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
 kdepim_sync.la: $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2006 20:58:42 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:46:43 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-kdepim-0.18.tar.gz
+libopensync-plugin-kdepim-0.19.tar.gz


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-kdepim.spec	13 Sep 2006 13:48:11 -0000	1.4
+++ libopensync-plugin-kdepim.spec	20 Oct 2006 11:46:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-kdepim
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,13 +8,16 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         libopensync-plugin-kdepim-gcc41.patch
+Patch0:         libopensync-plugin-kdepim-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  kdepim-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 %{summary}
@@ -32,7 +35,7 @@
 %prep
 %setup -q
 %patch0
-
+autoreconf
 %build
 %configure --disable-rpath
 # smpflags sometimes screw up the build
@@ -56,8 +59,12 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/opensync/plugins/kdepim*.so
+%{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2006 20:58:42 -0000	1.2
+++ sources	20 Oct 2006 11:46:43 -0000	1.3
@@ -1 +1 @@
-96c43911a0fbdaff4920bbc0f4cd3816  libopensync-plugin-kdepim-0.18.tar.gz
+258defed0c5f8d39eac42f6c294c8f1c  libopensync-plugin-kdepim-0.19.tar.gz


--- libopensync-plugin-kdepim-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:37:23 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 20 Oct 2006 05:37:23 -0700
Subject: fedora-security/audit fc5,1.363,1.364
Message-ID: <200610201237.k9KCbNAY018983@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18965

Modified Files:
	fc5 
Log Message:
Note the PHP update


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- fc5	18 Oct 2006 19:39:32 -0000	1.363
+++ fc5	20 Oct 2006 12:37:20 -0000	1.364
@@ -31,7 +31,7 @@
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
-CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4812 VULNERABLE (php) [since FEDORA-2006-1024]
 CVE-2006-4811 VULNERABLE (kdelibs) #211342
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
@@ -60,12 +60,12 @@
 CVE-2006-4538 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] ia64 and sparc only
 CVE-2006-4535 version (kernel, fixed 2.6.17.12, fixed 2.6.18-rc6) [since FEDORA-2006-967]
 CVE-2006-4507 ignore (libtiff) can't reproduce
-CVE-2006-4486 VULNERABLE (php, fixed 5.1.6)
-CVE-2006-4485 VULNERABLE (php, fixed 5.1.5)
-CVE-2006-4484 ignore (php, fixed 5.1.5)
+CVE-2006-4486 VULNERABLE (php, fixed 5.1.6) [since FEDORA-2006-1024]
+CVE-2006-4485 VULNERABLE (php, fixed 5.1.5) [since FEDORA-2006-1024]
+CVE-2006-4484 ignore (php, fixed 5.1.5) [since FEDORA-2006-1024]
 CVE-2006-4484 ignore (gd)
 CVE-2006-4483 ignore (php) not linux
-CVE-2006-4482 VULNERABLE (php, fixed 5.1.5) [#204995]
+CVE-2006-4482 VULNERABLE (php, fixed 5.1.5) [#204995] [since FEDORA-2006-1024]
 CVE-2006-4481 ignore (php) safe mode isn't safe
 CVE-2006-4455 ignore (xchat) client DoS
 CVE-2006-4447 ignore (xorg) not a security issue
@@ -99,7 +99,7 @@
 CVE-2006-4095 version (bind) [since FEDORA-2006-418] was backport since FEDORA-2006-966
 CVE-2006-4093 version (kernel, fixed 2.6.17.9) [since FEDORA-2006-967]
 CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) #202247
-CVE-2006-4020 VULNERABLE (php) #201767
+CVE-2006-4020 VULNERABLE (php) #201767 [since FEDORA-2006-1024]
 CVE-2006-4019 version (squirrelmail, fixed 1.4.8) #202196 [since FEDORA-2006-913]
 CVE-2006-3918 version httpd, fixed 2.2.2 [since FEDORA-2006-364]
 CVE-2006-3879 version (mikmod, not 3.1.6)



From fedora-extras-commits at redhat.com  Fri Oct 20 12:47:42 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:47:42 -0700
Subject: rpms/chkrootkit/devel chkrootkit-0.47-warnings.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 chkrootkit.spec, 1.15, 1.16 sources,
	1.5, 1.6 chkrootkit-0.46a-warnings.patch, 1.1, NONE
Message-ID: <200610201247.k9KClgkO019261@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19206

Modified Files:
	.cvsignore chkrootkit.spec sources 
Added Files:
	chkrootkit-0.47-warnings.patch 
Removed Files:
	chkrootkit-0.46a-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config


chkrootkit-0.47-warnings.patch:

--- NEW FILE chkrootkit-0.47-warnings.patch ---
diff -Nur chkrootkit-0.47-orig/chklastlog.c chkrootkit-0.47/chklastlog.c
--- chkrootkit-0.47-orig/chklastlog.c	2006-02-11 18:02:48.000000000 +0100
+++ chkrootkit-0.47/chklastlog.c	2006-10-20 14:31:43.000000000 +0200
@@ -164,7 +164,7 @@
             {
                 if (*uid > MAX_ID)
                 {
-                   fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", MAX_ID, *uid );
+                    fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", (long int)MAX_ID, (long int)*uid );
                    exit (1);
 
                 }
diff -Nur chkrootkit-0.47-orig/chkproc.c chkrootkit-0.47/chkproc.c
--- chkrootkit-0.47-orig/chkproc.c	2006-07-25 16:55:21.000000000 +0200
+++ chkrootkit-0.47/chkproc.c	2006-10-20 14:34:12.000000000 +0200
@@ -180,10 +180,8 @@
    if (pv < 1 || pv > PS_MAX)
       pv = 1;
    pscmd = ps_cmds[pv];
-/*  printf("pv = %d\n\r", pv); /* -- DEBUG */
 #endif
 
-/* printf("pscmd = %s\n\r", pscmd); /* -- DEBUG */ 
    if (!(ps = popen(pscmd, "r")))
    {
        perror("ps");
@@ -228,7 +226,6 @@
           p++;
       while (isspace(*p)) /* Skip spaces */
           p++;
-/*  printf(">>%s<<\n", p);  /* -- DEBUG */
       ret = atol(p);
       if ( ret < 0 || ret > MAX_PROCESSES )
       {
@@ -263,7 +260,6 @@
       }
 #endif
 
-/*      printf("%s\n", tmp_d_name); /* -- DEBUG */
       dirproc[atol(tmp_d_name)] = 1;
    }
    closedir(proc);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2005 21:17:14 -0000	1.5
+++ .cvsignore	20 Oct 2006 12:47:12 -0000	1.6
@@ -1 +1,2 @@
-chkrootkit-0.46a.tar.gz
+chkrootkit-0.47.tar.gz
+chkrootkit-0.47.tar.gz.sig


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/devel/chkrootkit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- chkrootkit.spec	28 Aug 2006 00:12:08 -0000	1.15
+++ chkrootkit.spec	20 Oct 2006 12:47:12 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           chkrootkit
-Version:        0.46a
-Release: 3%{?dist}
+Version:        0.47
+Release: 1%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD-like
@@ -14,7 +14,7 @@
 Patch1:         chkrootkit-0.44-getCMD.patch
 Patch2:         chkrootkit-0.44-inetd.patch
 Patch3:         chkrootkit-0.45-includes.patch
-Patch4:         chkrootkit-0.46a-warnings.patch
+Patch4:         chkrootkit-0.47-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -100,14 +100,18 @@
 %{_sbindir}/chkrootkit
 %{_bindir}/chkrootkit
 %{_bindir}/chkrootkitX
-%{_sysconfdir}/pam.d/chkrootkit
-%{_sysconfdir}/security/console.apps/chkrootkit
+%config(noreplace) %{_sysconfdir}/pam.d/chkrootkit
+%config(noreplace) %{_sysconfdir}/security/console.apps/chkrootkit
 %{_libdir}/%{name}-%{version}
 %{_datadir}/applications/fedora-chkrootkit.desktop
 %{_datadir}/pixmaps/chkrootkit.png
 
 
 %changelog
+* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
+- Update to 0.47.
+- mark PAM and consolehelper files in /etc as config
+
 * Mon Aug 28 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2005 21:17:14 -0000	1.5
+++ sources	20 Oct 2006 12:47:12 -0000	1.6
@@ -1 +1,2 @@
-b73fb9e365d2edcd031d65b16e965a18  chkrootkit-0.46a.tar.gz
+4c6455d202cef35395a673386e4bf01a  chkrootkit-0.47.tar.gz
+39d898c13e094d884237f7ad9f343895  chkrootkit-0.47.tar.gz.sig


--- chkrootkit-0.46a-warnings.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:51:57 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:51:57 -0700
Subject: rpms/chkrootkit/FC-5 .cvsignore, 1.5, 1.6 chkrootkit.spec, 1.14,
	1.15 sources, 1.5, 1.6 chkrootkit-0.46a-warnings.patch, 1.1, NONE
Message-ID: <200610201251.k9KCpvkK019411@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19326

Modified Files:
	.cvsignore chkrootkit.spec sources 
Removed Files:
	chkrootkit-0.46a-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2005 21:17:14 -0000	1.5
+++ .cvsignore	20 Oct 2006 12:51:26 -0000	1.6
@@ -1 +1,2 @@
-chkrootkit-0.46a.tar.gz
+chkrootkit-0.47.tar.gz
+chkrootkit-0.47.tar.gz.sig


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-5/chkrootkit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- chkrootkit.spec	25 Feb 2006 21:51:24 -0000	1.14
+++ chkrootkit.spec	20 Oct 2006 12:51:26 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           chkrootkit
-Version:        0.46a
-Release:        2%{?dist}
+Version:        0.47
+Release: 1%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD-like
@@ -14,7 +14,7 @@
 Patch1:         chkrootkit-0.44-getCMD.patch
 Patch2:         chkrootkit-0.44-inetd.patch
 Patch3:         chkrootkit-0.45-includes.patch
-Patch4:         chkrootkit-0.46a-warnings.patch
+Patch4:         chkrootkit-0.47-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -100,14 +100,18 @@
 %{_sbindir}/chkrootkit
 %{_bindir}/chkrootkit
 %{_bindir}/chkrootkitX
-%{_sysconfdir}/pam.d/chkrootkit
-%{_sysconfdir}/security/console.apps/chkrootkit
+%config(noreplace) %{_sysconfdir}/pam.d/chkrootkit
+%config(noreplace) %{_sysconfdir}/security/console.apps/chkrootkit
 %{_libdir}/%{name}-%{version}
 %{_datadir}/applications/fedora-chkrootkit.desktop
 %{_datadir}/pixmaps/chkrootkit.png
 
 
 %changelog
+* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
+- Update to 0.47.
+- mark PAM and consolehelper files in /etc as config
+
 * Sat Feb 25 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.46a-2
 - rebuilt for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2005 21:17:14 -0000	1.5
+++ sources	20 Oct 2006 12:51:26 -0000	1.6
@@ -1 +1,2 @@
-b73fb9e365d2edcd031d65b16e965a18  chkrootkit-0.46a.tar.gz
+4c6455d202cef35395a673386e4bf01a  chkrootkit-0.47.tar.gz
+39d898c13e094d884237f7ad9f343895  chkrootkit-0.47.tar.gz.sig


--- chkrootkit-0.46a-warnings.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:52:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 05:52:08 -0700
Subject: rpms/libopensync-plugin-palm/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-palm.spec, 1.4, 1.5 sources, 1.2,
	1.3 libopensync-plugin-palm-Makefile.patch, 1.1, NONE
Message-ID: <200610201252.k9KCq8XU019457@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/FC-5

Modified Files:
	.cvsignore libopensync-plugin-palm.spec sources 
Removed Files:
	libopensync-plugin-palm-Makefile.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
+++ .cvsignore	20 Oct 2006 12:51:38 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-palm-0.18.tar.gz
+libopensync-plugin-palm-0.19.tar.gz


Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-5/libopensync-plugin-palm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-palm.spec	21 Apr 2006 23:52:13 -0000	1.4
+++ libopensync-plugin-palm.spec	20 Oct 2006 12:51:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
-Version:        0.18
-Release:        4%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -60,7 +58,10 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
-* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
+* Fri Mar 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - bump
 
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 08:40:26 -0000	1.2
+++ sources	20 Oct 2006 12:51:38 -0000	1.3
@@ -1 +1 @@
-d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz
+b0bbf5f7e39ffe2a09275b4d5edc3e1d  libopensync-plugin-palm-0.19.tar.gz


--- libopensync-plugin-palm-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:52:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 05:52:07 -0700
Subject: rpms/libopensync-plugin-palm/FC-3 .cvsignore, 1.2,
	1.3 libopensync-plugin-palm.spec, 1.2, 1.3 sources, 1.2,
	1.3 libopensync-plugin-palm-Makefile.patch, 1.1, NONE
Message-ID: <200610201252.k9KCq7nq019445@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/FC-3

Modified Files:
	.cvsignore libopensync-plugin-palm.spec sources 
Removed Files:
	libopensync-plugin-palm-Makefile.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
+++ .cvsignore	20 Oct 2006 12:51:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-palm-0.18.tar.gz
+libopensync-plugin-palm-0.19.tar.gz


Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-3/libopensync-plugin-palm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-palm.spec	13 Dec 2005 15:12:11 -0000	1.2
+++ libopensync-plugin-palm.spec	20 Oct 2006 12:51:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -60,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 08:40:26 -0000	1.2
+++ sources	20 Oct 2006 12:51:37 -0000	1.3
@@ -1 +1 @@
-d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz
+b0bbf5f7e39ffe2a09275b4d5edc3e1d  libopensync-plugin-palm-0.19.tar.gz


--- libopensync-plugin-palm-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:52:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 05:52:08 -0700
Subject: rpms/libopensync-plugin-palm/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-palm.spec, 1.3, 1.4 sources, 1.2,
	1.3 libopensync-plugin-palm-Makefile.patch, 1.1, NONE
Message-ID: <200610201252.k9KCq8AO019451@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/FC-4

Modified Files:
	.cvsignore libopensync-plugin-palm.spec sources 
Removed Files:
	libopensync-plugin-palm-Makefile.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
+++ .cvsignore	20 Oct 2006 12:51:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-palm-0.18.tar.gz
+libopensync-plugin-palm-0.19.tar.gz


Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-4/libopensync-plugin-palm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-palm.spec	21 Apr 2006 23:52:12 -0000	1.3
+++ libopensync-plugin-palm.spec	20 Oct 2006 12:51:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -60,9 +58,15 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
-* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
+* Fri Mar 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - bump
 
+* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
+- Rebuild for Fedora Extras 
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 08:40:26 -0000	1.2
+++ sources	20 Oct 2006 12:51:37 -0000	1.3
@@ -1 +1 @@
-d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz
+b0bbf5f7e39ffe2a09275b4d5edc3e1d  libopensync-plugin-palm-0.19.tar.gz


--- libopensync-plugin-palm-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:52:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 05:52:09 -0700
Subject: rpms/libopensync-plugin-palm/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-palm.spec, 1.5, 1.6 sources, 1.2,
	1.3 libopensync-plugin-palm-Makefile.patch, 1.1, NONE
Message-ID: <200610201252.k9KCq942019462@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/devel

Modified Files:
	.cvsignore libopensync-plugin-palm.spec sources 
Removed Files:
	libopensync-plugin-palm-Makefile.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
+++ .cvsignore	20 Oct 2006 12:51:39 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-palm-0.18.tar.gz
+libopensync-plugin-palm-0.19.tar.gz


Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/libopensync-plugin-palm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync-plugin-palm.spec	13 Sep 2006 13:51:53 -0000	1.5
+++ libopensync-plugin-palm.spec	20 Oct 2006 12:51:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -60,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-5
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 08:40:26 -0000	1.2
+++ sources	20 Oct 2006 12:51:39 -0000	1.3
@@ -1 +1 @@
-d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz
+b0bbf5f7e39ffe2a09275b4d5edc3e1d  libopensync-plugin-palm-0.19.tar.gz


--- libopensync-plugin-palm-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:53:39 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:53:39 -0700
Subject: rpms/chkrootkit/FC-4 .cvsignore, 1.5, 1.6 chkrootkit.spec, 1.13,
	1.14 sources, 1.5, 1.6 chkrootkit-0.46a-warnings.patch, 1.1, NONE
Message-ID: <200610201253.k9KCrdOX019652@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19587

Modified Files:
	.cvsignore chkrootkit.spec sources 
Removed Files:
	chkrootkit-0.46a-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Nov 2005 13:05:41 -0000	1.5
+++ .cvsignore	20 Oct 2006 12:53:09 -0000	1.6
@@ -1 +1,2 @@
-chkrootkit-0.46a.tar.gz
+chkrootkit-0.47.tar.gz
+chkrootkit-0.47.tar.gz.sig


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-4/chkrootkit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chkrootkit.spec	29 Nov 2005 13:05:41 -0000	1.13
+++ chkrootkit.spec	20 Oct 2006 12:53:09 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           chkrootkit
-Version:        0.46a
-Release:        1%{?dist}
+Version:        0.47
+Release: 1%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD-like
@@ -14,7 +14,7 @@
 Patch1:         chkrootkit-0.44-getCMD.patch
 Patch2:         chkrootkit-0.44-inetd.patch
 Patch3:         chkrootkit-0.45-includes.patch
-Patch4:         chkrootkit-0.46a-warnings.patch
+Patch4:         chkrootkit-0.47-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -100,14 +100,18 @@
 %{_sbindir}/chkrootkit
 %{_bindir}/chkrootkit
 %{_bindir}/chkrootkitX
-%{_sysconfdir}/pam.d/chkrootkit
-%{_sysconfdir}/security/console.apps/chkrootkit
+%config(noreplace) %{_sysconfdir}/pam.d/chkrootkit
+%config(noreplace) %{_sysconfdir}/security/console.apps/chkrootkit
 %{_libdir}/%{name}-%{version}
 %{_datadir}/applications/fedora-chkrootkit.desktop
 %{_datadir}/pixmaps/chkrootkit.png
 
 
 %changelog
+* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
+- Update to 0.47.
+- mark PAM and consolehelper files in /etc as config
+
 * Thu Nov 10 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.46a-1
 - Update to 0.46a.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Nov 2005 13:05:41 -0000	1.5
+++ sources	20 Oct 2006 12:53:09 -0000	1.6
@@ -1 +1,2 @@
-b73fb9e365d2edcd031d65b16e965a18  chkrootkit-0.46a.tar.gz
+4c6455d202cef35395a673386e4bf01a  chkrootkit-0.47.tar.gz
+39d898c13e094d884237f7ad9f343895  chkrootkit-0.47.tar.gz.sig


--- chkrootkit-0.46a-warnings.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:54:00 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:54:00 -0700
Subject: rpms/chkrootkit/FC-4 chkrootkit-0.47-warnings.patch,NONE,1.1
Message-ID: <200610201254.k9KCs0wU019675@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19668

Added Files:
	chkrootkit-0.47-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config


chkrootkit-0.47-warnings.patch:

--- NEW FILE chkrootkit-0.47-warnings.patch ---
diff -Nur chkrootkit-0.47-orig/chklastlog.c chkrootkit-0.47/chklastlog.c
--- chkrootkit-0.47-orig/chklastlog.c	2006-02-11 18:02:48.000000000 +0100
+++ chkrootkit-0.47/chklastlog.c	2006-10-20 14:31:43.000000000 +0200
@@ -164,7 +164,7 @@
             {
                 if (*uid > MAX_ID)
                 {
-                   fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", MAX_ID, *uid );
+                    fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", (long int)MAX_ID, (long int)*uid );
                    exit (1);
 
                 }
diff -Nur chkrootkit-0.47-orig/chkproc.c chkrootkit-0.47/chkproc.c
--- chkrootkit-0.47-orig/chkproc.c	2006-07-25 16:55:21.000000000 +0200
+++ chkrootkit-0.47/chkproc.c	2006-10-20 14:34:12.000000000 +0200
@@ -180,10 +180,8 @@
    if (pv < 1 || pv > PS_MAX)
       pv = 1;
    pscmd = ps_cmds[pv];
-/*  printf("pv = %d\n\r", pv); /* -- DEBUG */
 #endif
 
-/* printf("pscmd = %s\n\r", pscmd); /* -- DEBUG */ 
    if (!(ps = popen(pscmd, "r")))
    {
        perror("ps");
@@ -228,7 +226,6 @@
           p++;
       while (isspace(*p)) /* Skip spaces */
           p++;
-/*  printf(">>%s<<\n", p);  /* -- DEBUG */
       ret = atol(p);
       if ( ret < 0 || ret > MAX_PROCESSES )
       {
@@ -263,7 +260,6 @@
       }
 #endif
 
-/*      printf("%s\n", tmp_d_name); /* -- DEBUG */
       dirproc[atol(tmp_d_name)] = 1;
    }
    closedir(proc);



From fedora-extras-commits at redhat.com  Fri Oct 20 12:54:17 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:54:17 -0700
Subject: rpms/chkrootkit/FC-5 chkrootkit-0.47-warnings.patch,NONE,1.1
Message-ID: <200610201254.k9KCsHrK019700@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19691

Added Files:
	chkrootkit-0.47-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config


chkrootkit-0.47-warnings.patch:

--- NEW FILE chkrootkit-0.47-warnings.patch ---
diff -Nur chkrootkit-0.47-orig/chklastlog.c chkrootkit-0.47/chklastlog.c
--- chkrootkit-0.47-orig/chklastlog.c	2006-02-11 18:02:48.000000000 +0100
+++ chkrootkit-0.47/chklastlog.c	2006-10-20 14:31:43.000000000 +0200
@@ -164,7 +164,7 @@
             {
                 if (*uid > MAX_ID)
                 {
-                   fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", MAX_ID, *uid );
+                    fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", (long int)MAX_ID, (long int)*uid );
                    exit (1);
 
                 }
diff -Nur chkrootkit-0.47-orig/chkproc.c chkrootkit-0.47/chkproc.c
--- chkrootkit-0.47-orig/chkproc.c	2006-07-25 16:55:21.000000000 +0200
+++ chkrootkit-0.47/chkproc.c	2006-10-20 14:34:12.000000000 +0200
@@ -180,10 +180,8 @@
    if (pv < 1 || pv > PS_MAX)
       pv = 1;
    pscmd = ps_cmds[pv];
-/*  printf("pv = %d\n\r", pv); /* -- DEBUG */
 #endif
 
-/* printf("pscmd = %s\n\r", pscmd); /* -- DEBUG */ 
    if (!(ps = popen(pscmd, "r")))
    {
        perror("ps");
@@ -228,7 +226,6 @@
           p++;
       while (isspace(*p)) /* Skip spaces */
           p++;
-/*  printf(">>%s<<\n", p);  /* -- DEBUG */
       ret = atol(p);
       if ( ret < 0 || ret > MAX_PROCESSES )
       {
@@ -263,7 +260,6 @@
       }
 #endif
 
-/*      printf("%s\n", tmp_d_name); /* -- DEBUG */
       dirproc[atol(tmp_d_name)] = 1;
    }
    closedir(proc);



From fedora-extras-commits at redhat.com  Fri Oct 20 13:00:23 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 06:00:23 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.5,1.6
Message-ID: <200610201300.k9KD0N14019816@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19786

Modified Files:
	Config_Extras.py 
Log Message:
Prepare some FC-6 updates.

Left to do:
 - alldists list: add '6'
 - multiwhitelists dict: uncomment new 'development' entry




Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Config_Extras.py	30 Sep 2006 18:52:16 -0000	1.5
+++ Config_Extras.py	20 Oct 2006 13:00:21 -0000	1.6
@@ -45,10 +45,11 @@
 archdict = {'3':['x86_64', 'i386'], 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386'],
+            '6':['ppc','x86_64', 'i386'],
             'development':['ppc','x86_64','i386'],
             }
 
-multilibdists = [ 'development', '5', '4', '3' ]
+multilibdists = [ 'development', '6', '5', '4', '3' ]
 
 # map: dist -> target arch -> list of pkg name regexp patterns
 # We don't check virtual package names, unless it's a virtual -devel pkg.
@@ -57,7 +58,7 @@
                }
 multiwhitelists = { 'development' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                # 'development' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
-               #'6' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
+               '6' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '5' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '4' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '3' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
@@ -67,6 +68,7 @@
 repomanage_keepdict = {'3': "'/\([^/]\+-\)\?kmod-'",
                        '4': "'/\([^/]\+-\)\?kmod-'",
                        '5': "'/\([^/]\+-\)\?kmod-'",
+                       '6': "'/\([^/]\+-\)\?kmod-'",
                        'development': "'/\([^/]\+-\)\?kmod-'",
                        }
 
@@ -83,6 +85,7 @@
 baserepos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'],
               '4' : ['fedora-core','fedora-core-updates','fedora-extras'],
               '5' : ['fedora-core','fedora-core-updates','fedora-extras'],
+              '6' : ['fedora-core','fedora-core-updates','fedora-extras'],
               'development' : ['fedora-core','fedora-extras']
               }
 
@@ -90,6 +93,7 @@
 testrepos = { '3' : ['fedora-core-updates-testing'],
               '4' : ['fedora-core-updates-testing'],
               '5' : ['fedora-core-updates-testing'],
+              '6' : ['fedora-core-updates-testing'],
               'development' : []
               }
 



From fedora-extras-commits at redhat.com  Fri Oct 20 13:02:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:02:19 -0700
Subject: rpms/libopensync-plugin-python/FC-3 .cvsignore, 1.2,
	1.3 libopensync-plugin-python.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201302.k9KD2Jb7022770@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822/FC-3

Modified Files:
	.cvsignore libopensync-plugin-python.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
+++ .cvsignore	20 Oct 2006 13:01:49 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-python-0.18.tar.gz
+libopensync-plugin-python-0.19.tar.gz


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-3/libopensync-plugin-python.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-python.spec	13 Dec 2005 15:55:28 -0000	1.2
+++ libopensync-plugin-python.spec	20 Oct 2006 13:01:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:36:46 -0000	1.2
+++ sources	20 Oct 2006 13:01:49 -0000	1.3
@@ -1 +1 @@
-8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz
+edfea3d97b55386f3a6cb4756cd17ec2  libopensync-plugin-python-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 13:02:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:02:28 -0700
Subject: rpms/libopensync-plugin-python/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-python.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610201302.k9KD2SHV022777@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822/FC-5

Modified Files:
	.cvsignore libopensync-plugin-python.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
+++ .cvsignore	20 Oct 2006 13:01:57 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-python-0.18.tar.gz
+libopensync-plugin-python-0.19.tar.gz


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-5/libopensync-plugin-python.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-python.spec	16 Feb 2006 23:20:36 -0000	1.3
+++ libopensync-plugin-python.spec	20 Oct 2006 13:01:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
-Version:        0.18
-Release:        4%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:36:46 -0000	1.2
+++ sources	20 Oct 2006 13:01:57 -0000	1.3
@@ -1 +1 @@
-8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz
+edfea3d97b55386f3a6cb4756cd17ec2  libopensync-plugin-python-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 13:02:31 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:02:31 -0700
Subject: rpms/libopensync-plugin-python/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-python.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200610201302.k9KD2VLP022783@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822/devel

Modified Files:
	.cvsignore libopensync-plugin-python.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
+++ .cvsignore	20 Oct 2006 13:02:00 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-python-0.18.tar.gz
+libopensync-plugin-python-0.19.tar.gz


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/libopensync-plugin-python.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-python.spec	13 Sep 2006 13:53:27 -0000	1.4
+++ libopensync-plugin-python.spec	20 Oct 2006 13:02:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-5
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:36:46 -0000	1.2
+++ sources	20 Oct 2006 13:02:00 -0000	1.3
@@ -1 +1 @@
-8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz
+edfea3d97b55386f3a6cb4756cd17ec2  libopensync-plugin-python-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 13:02:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:02:28 -0700
Subject: rpms/libopensync-plugin-python/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-python.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201302.k9KD2Srn022778@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822/FC-4

Modified Files:
	.cvsignore libopensync-plugin-python.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
+++ .cvsignore	20 Oct 2006 13:01:56 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-python-0.18.tar.gz
+libopensync-plugin-python-0.19.tar.gz


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-4/libopensync-plugin-python.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-python.spec	13 Dec 2005 15:55:28 -0000	1.2
+++ libopensync-plugin-python.spec	20 Oct 2006 13:01:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:36:46 -0000	1.2
+++ sources	20 Oct 2006 13:01:56 -0000	1.3
@@ -1 +1 @@
-8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz
+edfea3d97b55386f3a6cb4756cd17ec2  libopensync-plugin-python-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 13:09:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:09:55 -0700
Subject: rpms/multisync/FC-4 multisync.spec,1.3,1.4
Message-ID: <200610201309.k9KD9tfP023083@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23053/FC-4

Modified Files:
	multisync.spec 
Log Message:
- fix BR



Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/multisync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multisync.spec	20 Oct 2006 10:57:50 -0000	1.3
+++ multisync.spec	20 Oct 2006 13:09:25 -0000	1.4
@@ -18,6 +18,8 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
+BuildRequires:  libopensync-plugin-gpe-devel
+BuildRequires:  libopensync-plugin-palm-devel
 BuildRequires:  automake
 BuildRequires:  libtool
 



From fedora-extras-commits at redhat.com  Fri Oct 20 13:09:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:09:56 -0700
Subject: rpms/multisync/devel multisync.spec,1.5,1.6
Message-ID: <200610201309.k9KD9uCx023086@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23053/devel

Modified Files:
	multisync.spec 
Log Message:
- fix BR



Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/multisync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- multisync.spec	20 Oct 2006 10:57:52 -0000	1.5
+++ multisync.spec	20 Oct 2006 13:09:25 -0000	1.6
@@ -18,6 +18,8 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
+BuildRequires:  libopensync-plugin-gpe-devel
+BuildRequires:  libopensync-plugin-palm-devel
 BuildRequires:  automake
 BuildRequires:  libtool
 



From fedora-extras-commits at redhat.com  Fri Oct 20 13:44:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:44:12 -0700
Subject: rpms/koffice/devel koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.12, 
	1.13 koffice.spec, 1.42, 1.43 sources, 1.12, 1.13
Message-ID: <200610201344.k9KDiCCB023361@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23338

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.0.patch 
Log Message:
- version upgrade


koffice-1.6.0.patch:

--- NEW FILE koffice-1.6.0.patch ---
--- lib/kross/python/cxx/Objects.hxx.orig	2006-10-19 00:00:02.000000000 +0200
+++ lib/kross/python/cxx/Objects.hxx	2006-10-19 00:02:04.000000000 +0200
@@ -1938,8 +1938,8 @@
 			if(map.hasKey(key)) the_item = map.getItem(key);
 			};
 
-		~mapref<T>()
-			{}
+	//	~mapref<T>()
+	//		{};
 
 		// MapBase<T> stuff
 		// lvalue


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Aug 2006 09:15:26 -0000	1.12
+++ .cvsignore	20 Oct 2006 13:43:42 -0000	1.13
@@ -1 +1 @@
-koffice-1.5.2.tar.bz2
+koffice-1.6.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- koffice.spec	4 Oct 2006 19:38:54 -0000	1.42
+++ koffice.spec	20 Oct 2006 13:43:42 -0000	1.43
@@ -1,14 +1,14 @@
 Name:           koffice
-Version:        1.5.2
-Release:        3%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-1.5.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
 Source100:      koshell.png
-
+Patch0:         koffice-1.6.0.patch
 # stuff for the build configuration
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -216,6 +216,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -443,6 +444,8 @@
 %{_libdir}/kde3/libopencalcexport.*
 %{_libdir}/kde3/libopencalcimport.*
 %{_libdir}/kde3/libqproimport.*
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
 %{_datadir}/apps/kspread/
 %{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
@@ -516,6 +519,8 @@
 %{_libdir}/libkrita_rgb_f16half.so.*
 %{_libdir}/libkrita_rgb_f32.so.*
 %{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkrita_ycbcr_u16.so*
+%{_libdir}/libkrita_ycbcr_u8.so*
 %{_libdir}/libkritacolor.so.*
 %{_libdir}/libkritagrayscale.so.*
 %{_libdir}/libkritaimage.so.*
@@ -550,8 +555,6 @@
 %{_libdir}/kde3/kritatoolstar.*
 %{_libdir}/kde3/kritatooltransform.*
 %{_libdir}/kde3/libkritapart.*
-%{_libdir}/kde3/libkritamagickexport.*
-%{_libdir}/kde3/libkritamagickimport.*
 %{_libdir}/kde3/krita_cmyk_u16_plugin.*
 %{_libdir}/kde3/krita_gray_u16_plugin.*
 %{_libdir}/kde3/krita_lms_f32_plugin.*
@@ -569,7 +572,6 @@
 %{_libdir}/kde3/kritascripting.*
 %{_libdir}/kde3/kritaseparatechannels.*
 %{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasmearybrush.*
 %{_libdir}/kde3/kritasobelfilter.*
 %{_libdir}/kde3/kritatoolselectsimilar.*
 %{_libdir}/kde3/kritawetplugin.*
@@ -583,6 +585,21 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/krosskritacore.*
+%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
+%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
+%{_libdir}/kde3/kritablurfilter.*
+%{_libdir}/kde3/kritaextensioncolorsfilters.*
+%{_libdir}/kde3/kritafastcolortransfer.*
+%{_libdir}/kde3/kritalenscorrectionfilter.*
+%{_libdir}/kde3/kritamodifyselection.*
+%{_libdir}/kde3/kritanoisefilter.*
+%{_libdir}/kde3/kritarandompickfilter.*
+%{_libdir}/kde3/kritasubstrate.*
+%{_libdir}/kde3/kritatoolcurves.*
+%{_libdir}/kde3/kritatoolperspectivegrid.*
+%{_libdir}/kde3/kritatoolperspectivetransform.*
+%{_libdir}/kde3/kritaunsharpfilter.*
+%{_libdir}/kde3/kritawavefilter.*
 %{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -768,9 +785,11 @@
 %{_libdir}/kde3/libhancomwordimport.*
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libpowerpointimport.*
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_libdir}/kde3/libolefilter.*
 %{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
 
@@ -786,6 +805,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0
+- version upgrade
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - 1.5.3-3
 - respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Aug 2006 09:15:26 -0000	1.12
+++ sources	20 Oct 2006 13:43:42 -0000	1.13
@@ -1 +1 @@
-cbe9deeb7c811a6bb5a954989b25c1f2  koffice-1.5.2.tar.bz2
+e669cf19b2e1c7db7029c0772c527c0d  koffice-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 14:09:27 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Fri, 20 Oct 2006 07:09:27 -0700
Subject: rpms/listen/FC-5 listen.spec,1.13,1.14
Message-ID: <200610201409.k9KE9RXc026449@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26419/FC-5

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- listen.spec	14 Oct 2006 16:16:00 -0000	1.13
+++ listen.spec	20 Oct 2006 14:08:57 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        7.beta1%{?dist}
+Release:        8.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -89,6 +89,10 @@
 %{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
 # enable the use of %{find_lang} macros
 %{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%ifarch x86_64
+# correct a path issue that prevent Listen to be launched on a x86_64 box
+%{__sed} -i 's/lib\/listen/lib64\/listen/' listen
+%endif
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -138,12 +142,16 @@
 %doc gpl.txt
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
-%{_datadir}/%{name}/trackedit.glade
-%{_datadir}/%{name}/img/
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Fri Nov 20 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-8.beta1
+- Fixed a path issue that prevent Listen to be launched on x86_64 
+ systems. Now owns {_datadir}/%{name}
+
 * Sat Nov 14 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 



From fedora-extras-commits at redhat.com  Fri Oct 20 14:09:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Fri, 20 Oct 2006 07:09:28 -0700
Subject: rpms/listen/devel listen.spec,1.13,1.14
Message-ID: <200610201409.k9KE9SOa026452@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26419/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- listen.spec	14 Oct 2006 16:16:00 -0000	1.13
+++ listen.spec	20 Oct 2006 14:08:58 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        7.beta1%{?dist}
+Release:        8.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -89,6 +89,10 @@
 %{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
 # enable the use of %{find_lang} macros
 %{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%ifarch x86_64
+# correct a path issue that prevent Listen to be launched on a x86_64 box
+%{__sed} -i 's/lib\/listen/lib64\/listen/' listen
+%endif
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -138,12 +142,16 @@
 %doc gpl.txt
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
-%{_datadir}/%{name}/trackedit.glade
-%{_datadir}/%{name}/img/
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Fri Nov 20 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-8.beta1
+- Fixed a path issue that prevent Listen to be launched on x86_64 
+ systems. Now owns {_datadir}/%{name}
+
 * Sat Nov 14 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 



From fedora-extras-commits at redhat.com  Fri Oct 20 14:33:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Fri, 20 Oct 2006 07:33:42 -0700
Subject: rpms/listen/FC-5 listen.spec,1.14,1.15
Message-ID: <200610201433.k9KEXgcg026772@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26742/FC-5

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- listen.spec	20 Oct 2006 14:08:57 -0000	1.14
+++ listen.spec	20 Oct 2006 14:33:11 -0000	1.15
@@ -91,7 +91,7 @@
 %{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
 %ifarch x86_64
 # correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen/lib64\/listen/' listen
+%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
 %endif
 
 %build



From fedora-extras-commits at redhat.com  Fri Oct 20 14:33:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Fri, 20 Oct 2006 07:33:43 -0700
Subject: rpms/listen/devel listen.spec,1.14,1.15
Message-ID: <200610201433.k9KEXhlu026775@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26742/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- listen.spec	20 Oct 2006 14:08:58 -0000	1.14
+++ listen.spec	20 Oct 2006 14:33:12 -0000	1.15
@@ -91,7 +91,7 @@
 %{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
 %ifarch x86_64
 # correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen/lib64\/listen/' listen
+%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
 %endif
 
 %build



From fedora-extras-commits at redhat.com  Fri Oct 20 15:01:09 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 20 Oct 2006 08:01:09 -0700
Subject: rpms/lat/devel lat.spec, 1.10, 1.11 sources, 1.5, 1.6 .cvsignore,
	1.5, 1.6
Message-ID: <200610201501.k9KF19RK032633@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/lat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29683

Modified Files:
	lat.spec sources .cvsignore 
Log Message:
update to 1.2.1.1



Index: lat.spec
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/lat.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lat.spec	3 Oct 2006 09:40:17 -0000	1.10
+++ lat.spec	20 Oct 2006 15:00:39 -0000	1.11
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
-Version:            1.2.0.1
-Release:            2%{?dist}
+Version:            1.2.1.1
+Release:            1%{?dist}
 License:            GPL
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Fri Oct 20 2006 Paul Howarth <paul at city-fan.org> 1.2.1.1-1
+- Update to 1.2.1.1
+
 * Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 1.2.0.1-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Sep 2006 07:32:08 -0000	1.5
+++ sources	20 Oct 2006 15:00:39 -0000	1.6
@@ -1 +1 @@
-49211681138598392d10a4cfc2effd66  lat-1.2.0.1.tar.gz
+aea2b241321bd829f33d69813a842c6b  lat-1.2.1.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Sep 2006 07:32:08 -0000	1.5
+++ .cvsignore	20 Oct 2006 15:00:39 -0000	1.6
@@ -1 +1 @@
-lat-1.2.0.1.tar.gz
+lat-1.2.1.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 17:01:19 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:01:19 -0700
Subject: rpms/international-time - New directory
Message-ID: <200610201701.k9KH1JDL007731@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7727/international-time

Log Message:
Directory /cvs/extras/rpms/international-time added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 17:01:25 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:01:25 -0700
Subject: rpms/international-time/devel - New directory
Message-ID: <200610201701.k9KH1P1I007757@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7727/international-time/devel

Log Message:
Directory /cvs/extras/rpms/international-time/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 17:02:07 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:02:07 -0700
Subject: rpms/international-time Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610201702.k9KH273m007790@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784

Added Files:
	Makefile import.log 
Log Message:
Setup of module international-time


--- NEW FILE Makefile ---
# Top level Makefile for module international-time
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 20 17:02:14 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:02:14 -0700
Subject: rpms/international-time/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610201702.k9KH2EEG007808@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module international-time


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 20 17:03:40 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:03:40 -0700
Subject: rpms/international-time/devel international-time.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610201703.k9KH3eI3007886@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7850/devel

Modified Files:
	.cvsignore sources 
Added Files:
	international-time.spec 
Log Message:
auto-import international-time-0.0.2-2 on branch devel from international-time-0.0.2-2.src.rpm


--- NEW FILE international-time.spec ---
Summary: 	A tool for arranging times in advance with overseas colleagues
Name: 		international-time
Version: 	0.0.2
Release: 	2%{?dist}
License: 	GPL
Group: 		Applications/System
Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
Url:            http://cyberelk.net/tim/data/international-time/
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: 	noarch

BuildRequires: 	desktop-file-utils >= 0.2.92
Requires: 	pygtk2-libglade

%description
This is a graphical tool for converting a local "wall-clock" time into
UTC.  This is useful for arranging conference calls where participants
from other countries are expected

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

%build

%install
rm -rf %{buildroot}

cat >international-time.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=International Time
Comment=International Time Coordinator
Exec=/usr/bin/international-time
Terminal=false
Type=Application
EOF

mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/applications
install -m 0755 international-time.py %{buildroot}%{_bindir}/international-time
install -m 0644 international-time.glade %{buildroot}%{_datadir}/%{name}
desktop-file-install --vendor fedora \
  --dir %{buildroot}%{_datadir}/applications \
  --add-category X-Fedora \
  international-time.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*

%changelog
* Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1
- 0.0.2.  More fixes from package review.

* Thu Oct 12 2006 Tim Waugh <twaugh at redhat.com> 0.0.1-2
- Fixes from package review.

* Thu Jul 27 2006 Tim Waugh <twaugh at redhat.com> 0.0.1-1
- Minor GUI change.

* Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com>
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/international-time/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2006 17:02:14 -0000	1.1
+++ .cvsignore	20 Oct 2006 17:03:09 -0000	1.2
@@ -0,0 +1 @@
+international-time-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/international-time/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2006 17:02:14 -0000	1.1
+++ sources	20 Oct 2006 17:03:09 -0000	1.2
@@ -0,0 +1 @@
+547469b393684f987a7e6656e6da66e0  international-time-0.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 17:03:37 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:03:37 -0700
Subject: rpms/international-time import.log,1.1,1.2
Message-ID: <200610201703.k9KH3bu3007882@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7850

Modified Files:
	import.log 
Log Message:
auto-import international-time-0.0.2-2 on branch devel from international-time-0.0.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/international-time/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Oct 2006 17:02:07 -0000	1.1
+++ import.log	20 Oct 2006 17:03:06 -0000	1.2
@@ -0,0 +1 @@
+international-time-0_0_2-2:HEAD:international-time-0.0.2-2.src.rpm:1161363770



From fedora-extras-commits at redhat.com  Fri Oct 20 17:07:10 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:07:10 -0700
Subject: owners owners.list,1.1857,1.1858
Message-ID: <200610201707.k9KH7A9T008007@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7986/owners

Modified Files:
	owners.list 
Log Message:
international-time


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1857
retrieving revision 1.1858
diff -u -r1.1857 -r1.1858
--- owners.list	20 Oct 2006 01:04:04 -0000	1.1857
+++ owners.list	20 Oct 2006 17:06:40 -0000	1.1858
@@ -703,6 +703,7 @@
 Fedora Extras|initng-ifiles|Scripts for initng|dm at mensa.se|extras-qa at fedoraproject.org|
 Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inotify-tools|Command line utilities for inotify|gajownik at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|international-time|Utility for arranging international meeting times|twaugh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 20 17:10:29 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 20 Oct 2006 10:10:29 -0700
Subject: rpms/enemies-of-carlotta/devel enemies-of-carlotta.spec,1.6,1.7
Message-ID: <200610201710.k9KHATxm008052@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/enemies-of-carlotta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036

Modified Files:
	enemies-of-carlotta.spec 
Log Message:

- Temporarily exclude the french man pages to evade an update
  conflict with man-pages-fr



Index: enemies-of-carlotta.spec
===================================================================
RCS file: /cvs/extras/rpms/enemies-of-carlotta/devel/enemies-of-carlotta.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- enemies-of-carlotta.spec	15 Sep 2006 07:37:40 -0000	1.6
+++ enemies-of-carlotta.spec	20 Oct 2006 17:09:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           enemies-of-carlotta
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple mailing list manager
 
 Group:          Applications/Internet
@@ -48,12 +48,16 @@
 %{_bindir}/enemies-of-carlotta
 %{_datadir}/%{name}
 %{_mandir}/man1/*
-%{_mandir}/fr/man1/*
+%exclude %{_mandir}/fr/man1/*
 %{_mandir}/es/man1/*
 
 
 
 %changelog
+* Fri Oct 20 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.2-3.fc6
+- Temporarily exclude the french man pages to evade an update
+  conflict with man-pages-fr
+
 * Thu Sep 15 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.2-2.fc6
 - Update to 1.2.2
 



From fedora-extras-commits at redhat.com  Fri Oct 20 18:41:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 20 Oct 2006 11:41:11 -0700
Subject: rpms/fontforge/devel fontforge.spec, 1.20, 1.21 sources, 1.9,
	1.10 .cvsignore, 1.9, 1.10
Message-ID: <200610201841.k9KIfBKt011775@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11755

Modified Files:
	fontforge.spec sources .cvsignore 
Log Message:
Update to 20061019



Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fontforge.spec	4 Oct 2006 22:30:43 -0000	1.20
+++ fontforge.spec	20 Oct 2006 18:40:41 -0000	1.21
@@ -1,9 +1,9 @@
-%define docs_version 20060822
+%define docs_version 20061014
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20060822
-Release:        2%{?dist}
+Version:        20061019
+Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Fri Oct 20 2006 Kevin Fenzi <kevin at tummy.com> - 20061019-1
+- Update to 20061019
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 20060822-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Sep 2006 04:58:23 -0000	1.9
+++ sources	20 Oct 2006 18:40:41 -0000	1.10
@@ -1,2 +1,2 @@
-872a8013be82e322677f7c254101544d  fontforge_full-20060822.tar.bz2
-40f374cf43d57d8e8f29e7fe25bf8f39  fontforge_htdocs-20060822.tar.bz2
+17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
+c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Sep 2006 04:58:23 -0000	1.9
+++ .cvsignore	20 Oct 2006 18:40:41 -0000	1.10
@@ -1,2 +1,2 @@
-fontforge_full-20060822.tar.bz2
-fontforge_htdocs-20060822.tar.bz2
+fontforge_full-20061019.tar.bz2
+fontforge_htdocs-20061014.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 18:57:19 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Fri, 20 Oct 2006 11:57:19 -0700
Subject: rpms/libmtp/devel .cvsignore, 1.2, 1.3 libmtp.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610201857.k9KIvJgA011930@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11909

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 18:15:02 -0000	1.2
+++ .cvsignore	20 Oct 2006 18:56:49 -0000	1.3
@@ -1 +1 @@
-libmtp-0.0.20.tar.gz
+libmtp-0.0.21.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmtp.spec	27 Sep 2006 18:15:02 -0000	1.1
+++ libmtp.spec	20 Oct 2006 18:56:49 -0000	1.2
@@ -11,7 +11,7 @@
 #
 
 Name:           libmtp
-Version:        0.0.20
+Version:        0.0.21
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Oct 20 2006 Linus Walleij <triad at df.lth.se> 0.0.21-1
+- New upstream release.
+
 * Tue Sep 26 2006 Linus Walleij <triad at df.lth.se> 0.0.20-1
 - New upstream release.
 - Updated after review by Parag AN, Kevin Fenzi and Ralf Corsepius.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Sep 2006 18:15:02 -0000	1.2
+++ sources	20 Oct 2006 18:56:49 -0000	1.3
@@ -1 +1 @@
-0f79eb3b7ee672e1196d260a6dee5bcd  libmtp-0.0.20.tar.gz
+621b4590c3c0d09f3546ad67f39ef80b  libmtp-0.0.21.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 18:59:24 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Fri, 20 Oct 2006 11:59:24 -0700
Subject: rpms/libmtp/FC-5 .cvsignore, 1.2, 1.3 libmtp.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610201859.k9KIxOwC012018@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11988

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 18:15:02 -0000	1.2
+++ .cvsignore	20 Oct 2006 18:58:53 -0000	1.3
@@ -1 +1 @@
-libmtp-0.0.20.tar.gz
+libmtp-0.0.21.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/FC-5/libmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmtp.spec	27 Sep 2006 18:15:02 -0000	1.1
+++ libmtp.spec	20 Oct 2006 18:58:53 -0000	1.2
@@ -11,7 +11,7 @@
 #
 
 Name:           libmtp
-Version:        0.0.20
+Version:        0.0.21
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Oct 20 2006 Linus Walleij <triad at df.lth.se> 0.0.21-1
+- New upstream release.
+
 * Tue Sep 26 2006 Linus Walleij <triad at df.lth.se> 0.0.20-1
 - New upstream release.
 - Updated after review by Parag AN, Kevin Fenzi and Ralf Corsepius.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Sep 2006 18:15:02 -0000	1.2
+++ sources	20 Oct 2006 18:58:53 -0000	1.3
@@ -1 +1 @@
-0f79eb3b7ee672e1196d260a6dee5bcd  libmtp-0.0.20.tar.gz
+621b4590c3c0d09f3546ad67f39ef80b  libmtp-0.0.21.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 19:00:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 20 Oct 2006 12:00:32 -0700
Subject: rpms/fontforge/FC-5 fontforge.spec, 1.17, 1.18 sources, 1.8,
	1.9 .cvsignore, 1.8, 1.9
Message-ID: <200610201900.k9KJ0WC7012102@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fontforge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12036

Modified Files:
	fontforge.spec sources .cvsignore 
Log Message:
Update to 20061019
Sync up with devel



Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/fontforge.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fontforge.spec	13 Feb 2006 18:06:43 -0000	1.17
+++ fontforge.spec	20 Oct 2006 19:00:02 -0000	1.18
@@ -1,9 +1,9 @@
-%define docs_version 20060114
+%define docs_version 20061014
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20060125
-Release:        6%{?dist}
+Version:        20061019
+Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -11,8 +11,7 @@
 URL:            http://fontforge.sourceforge.net/
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
-Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tgz
-Patch1:         fontforge-20060125-glibccrash.patch
+Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -27,6 +26,7 @@
 BuildRequires:  libuninameslist-devel
 BuildRequires:  libXt-devel
 BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  gettext
 
 Obsoletes:      pfaedit
 Provides:       pfaedit
@@ -39,12 +39,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .glibccrash
 
 mkdir htdocs
-tar xzf %{SOURCE2} -C htdocs
+tar xjf %{SOURCE2} -C htdocs
 rm -rf htdocs/scripts
-chmod 644 htdocs/*
+chmod 644 htdocs/*.gif
+chmod 644 htdocs/*.html
+chmod 644 htdocs/*.png
 mkdir cidmaps
 tar xzf htdocs/cidmaps.tgz -C cidmaps
 
@@ -57,6 +58,7 @@
 
 %build
 export CPPFLAGS='-DDOCDIR=\"%{_docdir}/%{name}-%{version}/htdocs\"'
+export LIBS=-lgif
 %configure --with-regular-link --with-freetype-bytecode=no
 
 make %{?_smp_mflags}
@@ -110,6 +112,21 @@
 
 
 %changelog
+* Fri Oct 20 2006 Kevin Fenzi <kevin at tummy.com> - 20061019-1
+- Update to 20061019
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 20060822-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Thu Sep 21 2006 Kevin Fenzi <kevin at tummy.com> - 20060822-1
+- Update to 20060822
+- Remove unneeded patch
+- Add flag to compile right with giflib
+
+* Sun Jun 18 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-7
+- Add BuildRequires on gettext, to make sure the package builds in minimal
+  mock environments
+
 * Mon Feb 13 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-6
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Feb 2006 12:33:42 -0000	1.8
+++ sources	20 Oct 2006 19:00:02 -0000	1.9
@@ -1,2 +1,2 @@
-831ac5225b1a9b00b0b7bcf622c62fee  fontforge_full-20060125.tar.bz2
-78a9f24e14c3e89afb5b88622f675546  fontforge_htdocs-20060114.tgz
+17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
+c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Feb 2006 12:33:42 -0000	1.8
+++ .cvsignore	20 Oct 2006 19:00:02 -0000	1.9
@@ -1,2 +1,2 @@
-fontforge_full-20060125.tar.bz2
-fontforge_htdocs-20060114.tgz
+fontforge_full-20061019.tar.bz2
+fontforge_htdocs-20061014.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 19:03:20 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 20 Oct 2006 12:03:20 -0700
Subject: rpms/munin/FC-5 munin-1.2.5-hddtemp_smartctl-config, NONE,
	1.1 munin-node.logrotate, NONE, 1.1 munin.logrotate, NONE,
	1.1 munin.spec, 1.8, 1.9 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200610201903.k9KJ3KFB015089@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15053

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.2.5-hddtemp_smartctl-config munin-node.logrotate 
	munin.logrotate 
Log Message:
Update to 1.2.5
Fix HD stats (fixes #205042)
Add in logrotate scripts that seem to have been dropped upstream



--- NEW FILE munin-1.2.5-hddtemp_smartctl-config ---
[hddtemp_smartctl]
user root


--- NEW FILE munin-node.logrotate ---
/var/log/munin/munin-node.log {
	daily
	missingok
	rotate 7
	compress
	copytruncate
	notifempty
	create 640 root adm
}


--- NEW FILE munin.logrotate ---
/var/log/munin/munin-update.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-graph.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-html.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-limits.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/munin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- munin.spec	28 Jun 2006 04:38:36 -0000	1.8
+++ munin.spec	20 Oct 2006 19:02:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.4
-Release:   9%{?dist}
+Version:   1.2.5
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -10,6 +10,9 @@
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
 Source1: munin-1.2.4-sendmail-config
+Source2: munin-1.2.5-hddtemp_smartctl-config
+Source3: munin-node.logrotate
+Source4: munin.logrotate
 Patch0: munin-1.2.4-cron.patch
 Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
@@ -17,8 +20,8 @@
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
+Requires(pre): fedora-usermgmt >= 0.7
+Requires(postun): fedora-usermgmt >= 0.7
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -104,8 +107,6 @@
 
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
-install -m0644 dists/debian/munin.logrotate %{buildroot}/etc/logrotate.d/munin
-install -m0644 dists/debian/munin-node.logrotate %{buildroot}/etc/logrotate.d/munin-node
 
 # 
 # remove the Sybase plugin for now, as they need perl modules 
@@ -127,6 +128,11 @@
 install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog
 # install config for sendmail under fedora
 install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
+# install config for hddtemp_smartctl
+install -m 0644 %{SOURCE2} %{buildroot}/etc/munin/plugin-conf.d/hddtemp_smartctl
+# install logrotate scripts
+install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
+install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -177,6 +183,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
+%{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
@@ -204,6 +211,7 @@
 %config(noreplace) /etc/munin/munin-node.conf
 %config(noreplace) /etc/munin/plugin-conf.d/munin-node
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
+%config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
 %config(noreplace) /etc/logrotate.d/munin-node
 /etc/rc.d/init.d/munin-node
 %config(noreplace) /etc/munin/plugins.conf
@@ -226,6 +234,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Tue Oct 17 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
+- Update to 1.2.5
+- Fix HD stats (fixes #205042)
+- Add in logrotate scripts that seem to have been dropped upstream
+
 * Tue Jun 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-9
 - Re-enable snmp plugins now that perl-Net-SNMP is available (fixes 196588)
 - Thanks to Herbert Straub <herbert at linuxhacker.at> for patch. 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2005 03:38:04 -0000	1.2
+++ sources	20 Oct 2006 19:02:50 -0000	1.3
@@ -1 +1 @@
-f91f5d96c01d8527db1d2f4b3f0f4cc5  munin_1.2.4.tar.gz
+e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2005 03:38:04 -0000	1.2
+++ .cvsignore	20 Oct 2006 19:02:50 -0000	1.3
@@ -1 +1 @@
-munin_1.2.4.tar.gz
+munin_1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 19:39:45 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Fri, 20 Oct 2006 12:39:45 -0700
Subject: kadischi kadischi.spec,1.45,1.46
Message-ID: <200610201939.k9KJdjkP018981@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18960/kadischi

Modified Files:
	kadischi.spec 
Log Message:
Remove unneccessary Requires


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kadischi.spec	13 Oct 2006 18:56:53 -0000	1.45
+++ kadischi.spec	20 Oct 2006 19:39:43 -0000	1.46
@@ -13,7 +13,7 @@
 
 BuildRequires:  kudzu-devel intltool automake desktop-file-utils glib2-devel
 Requires:       anaconda busybox-anaconda syslinux mkisofs squashfs-tools
-Requires:       usermode gnome-python2-gtkhtml2
+Requires:       usermode
 AutoReqProv:    on
 
 %description
@@ -91,6 +91,10 @@
 %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo
 
 %changelog
+* Fri Oct 20 2006 <jasperhartline at adelphia.net> 3.4-4.20061020cvs
+- Removed gnome-python2-gtkhtml2 as Requires.
+
+
 * Fri Oct 13 2006 <jasperhartline at adelphia.net> 3.4-3.20061013cvs
 - Add glib2-devel as BuildRequires.
 



From fedora-extras-commits at redhat.com  Fri Oct 20 19:42:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:42:27 -0700
Subject: rpms/ntfs-3g - New directory
Message-ID: <200610201942.k9KJgRM1019111@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19107/ntfs-3g

Log Message:
Directory /cvs/extras/rpms/ntfs-3g added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 19:42:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:42:33 -0700
Subject: rpms/ntfs-3g/devel - New directory
Message-ID: <200610201942.k9KJgXPv019125@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19107/ntfs-3g/devel

Log Message:
Directory /cvs/extras/rpms/ntfs-3g/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 19:42:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:42:47 -0700
Subject: rpms/ntfs-3g Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610201942.k9KJglZQ019156@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19150

Added Files:
	Makefile import.log 
Log Message:
Setup of module ntfs-3g


--- NEW FILE Makefile ---
# Top level Makefile for module ntfs-3g
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 20 19:42:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:42:53 -0700
Subject: rpms/ntfs-3g/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610201942.k9KJgrL6019172@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19150/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ntfs-3g


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 20 19:44:05 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:44:05 -0700
Subject: rpms/ntfs-3g import.log,1.1,1.2
Message-ID: <200610201944.k9KJi5sS019252@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217

Modified Files:
	import.log 
Log Message:
auto-import ntfs-3g-0-0.3.20070920.fc6 on branch devel from ntfs-3g-0-0.3.20070920.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Oct 2006 19:42:47 -0000	1.1
+++ import.log	20 Oct 2006 19:43:34 -0000	1.2
@@ -0,0 +1 @@
+ntfs-3g-0-0_3_20070920_fc6:HEAD:ntfs-3g-0-0.3.20070920.fc6.src.rpm:1161373419



From fedora-extras-commits at redhat.com  Fri Oct 20 19:44:05 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:44:05 -0700
Subject: rpms/ntfs-3g/devel ntfs-3g-20070920-BETA-noldconfig.patch, NONE,
	1.1 ntfs-3g.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610201944.k9KJi5cc019256@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ntfs-3g-20070920-BETA-noldconfig.patch ntfs-3g.spec 
Log Message:
auto-import ntfs-3g-0-0.3.20070920.fc6 on branch devel from ntfs-3g-0-0.3.20070920.fc6.src.rpm

ntfs-3g-20070920-BETA-noldconfig.patch:

--- NEW FILE ntfs-3g-20070920-BETA-noldconfig.patch ---
--- ntfs-3g-20070920-BETA/src/Makefile.in.BAD	2006-10-15 19:15:01.000000000 -0500
+++ ntfs-3g-20070920-BETA/src/Makefile.in	2006-10-15 19:15:08.000000000 -0500
@@ -579,7 +579,6 @@ libs:
 install-exec-hook:
 	$(INSTALL) -d $(DESTDIR)/sbin
 	$(LN_S) -f $(bindir)/ntfs-3g $(DESTDIR)/sbin/mount.ntfs-3g
-	ldconfig
 
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)$(man8dir)


--- NEW FILE ntfs-3g.spec ---
%define buildrev 20070920

Name:		ntfs-3g
Summary: 	Linux NTFS userspace driver 
Version:	0
Release:	0.3.%{buildrev}%{?dist}
License:	GPL
Group:		System Environment/Base
Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
Patch0:		ntfs-3g-20070920-BETA-noldconfig.patch
URL:		http://mlf.linux.rulez.org/mlf/ezaz/ntfs-3g-download.html
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	fuse-devel
Requires:	fuse
Epoch:		1

%description
The ntfs-3g driver is an open source, GPL licensed, third generation 
Linux NTFS driver. It provides full read-write access to NTFS, excluding 
access to encrypted files, writing compressed files, changing file 
ownership, access right.

Technically it???s based on and a major improvement to the third 
generation Linux NTFS driver, ntfsmount. The improvements include 
functionality, quality and performance enhancements.

ntfs-3g features are being merged to ntfsmount. In the meanwhile, 
ntfs-3g is currently the only free, as in either speech or beer, NTFS 
driver for Linux that supports unlimited file creation and deletion.

%package devel
Summary:	Development files and libraries for ntfs-3g
Group:		Development/Libraries
Requires:	%{name} = %{epoch}:%{version}-%{release}

%description devel
Headers and libraries for developing applications that use ntfs-3g 
functionality.

%prep
%setup -q -n %{name}-%{buildrev}-BETA
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la

# make the symlink an actual copy to avoid confusion
rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
/sbin/mount.ntfs-3g
%{_bindir}/ntfs-3g
%{_libdir}/libntfs-3g.so.*
%{_mandir}/man8/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/ntfs-3g/
%{_libdir}/libntfs-3g.so

%changelog
* Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.3.20070920
- add explicit Requires on fuse

* Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.2.20070920
- fixed versioning (bumped epoch, since it now shows as older)
- change sbin symlink to actual copy to be safe

* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.1.20070920-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2006 19:42:52 -0000	1.1
+++ .cvsignore	20 Oct 2006 19:43:35 -0000	1.2
@@ -0,0 +1 @@
+ntfs-3g-20070920-BETA.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2006 19:42:52 -0000	1.1
+++ sources	20 Oct 2006 19:43:35 -0000	1.2
@@ -0,0 +1 @@
+6382355a472c96e0ed9f4f62d4d9496f  ntfs-3g-20070920-BETA.tgz



From fedora-extras-commits at redhat.com  Fri Oct 20 22:31:56 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 20 Oct 2006 15:31:56 -0700
Subject: rpms/kst/devel .cvsignore,1.4,1.5 kst.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200610202231.k9KMVuBk028887@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28863

Modified Files:
	.cvsignore kst.spec sources 
Log Message:
Kst is now at version 1.3.1 (to fix a few bugs from 1.3.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2006 14:44:39 -0000	1.4
+++ .cvsignore	20 Oct 2006 22:31:25 -0000	1.5
@@ -1 +1 @@
-kst-1.3.0.tar.gz
+kst-1.3.1.tar.gz


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kst.spec	29 Sep 2006 23:56:34 -0000	1.8
+++ kst.spec	20 Oct 2006 22:31:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:       kst
-Version:    1.3.0
-Release:    2%{?dist}
+Version:    1.3.1
+Release:    1%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -211,6 +211,9 @@
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %changelog
+* Fri Oct 20 2006 Matthew Truch <matt at truch.net> - 1.3.1-1
+- Update to kst 1.3.1 bugfix release.
+
 * Fri Sep 29 2006 Matthew Truch <matt at truch.net> - 1.3.0-2
 - Bump release to maintain upgrade path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2006 14:44:39 -0000	1.4
+++ sources	20 Oct 2006 22:31:25 -0000	1.5
@@ -1 +1 @@
-3a3978eb498c456bb23c261dbd82d215  kst-1.3.0.tar.gz
+b18013223dc4cc2d1d0c8c4197bf8f97  kst-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 22:41:25 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Fri, 20 Oct 2006 15:41:25 -0700
Subject: accounts2 52fc-fedora-group.ldif, NONE,
	1.1 52fc-fedora-membership.ldif, NONE,
	1.1 52fc-fedora-person.ldif, NONE, 1.1
Message-ID: <200610202241.k9KMfPsb028965@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28946

Added Files:
	52fc-fedora-group.ldif 52fc-fedora-membership.ldif 
	52fc-fedora-person.ldif 
Log Message:
These changes were made for compatability with FDS



--- NEW FILE 52fc-fedora-group.ldif ---
#this is the fedora group schema file for use with the accounts system2
#it currently contains the following:
#owner (the owner's DN) 
#group_type 
#needs_sponsor 
#user_can_remove (will be handled by ACLs, but we need to clue the interface about it) #prerequisite_id (no idea what that is, so maybe not)  -- not included yet
#joinmsg 
dn: cn=schema
attributeTypes: ( 2.5.444.10 NAME 'groupowner' DESC 'group owner' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
attributeTypes: ( 2.5.444.11 NAME 'grouptype' DESC 'the type of group' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
attributeTypes: ( 2.5.444.12 NAME 'needssponsor' DESC 'boolean indicating whether or not the group needs a sponsor' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
attributeTypes: ( 2.5.444.13 NAME 'usercanremove' DESC 'boolean indicating whether or not the user can remove the group' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
attributeTypes: ( 2.5.444.14 NAME 'joinmsg' DESC 'message received upon joining the group' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
objectclasses:	( 2.5.555.3 NAME 'fedoraGroup' DESC 'A object describing a group entry' SUP top STRUCTURAL MUST ( cn $ groupowner ) MAY ( joinmsg $ usercanremove $ grouptype $ needssponsor $ usercanremove ) )



--- NEW FILE 52fc-fedora-membership.ldif ---
#this is the fedoraMembership shema file for use with the Account system
#check out http://www.openldap.org/doc/admin23/schema.html#Extending%20Schema 
#for more information
#for now this is the contents
#role_type 
#role_domain 
#role_status 
#internal_comments 
#sponsor (points to the sponsor's DN) 
#creation (date) 
#approval (date) 
#don't have a name use cn instead
#attributeType ( 2.5.444.1 NAME 'name'
#                DESC 'group name'
#                EQUALITY caseIgnoreMatch
#                SUBSTR caseIgnoreSubstringsMatch
#                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
dn: cn=schema
attributeTypes: ( 2.5.444.2 NAME 'roletype' DESC 'the type of membership role' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
attributeTypes: ( 2.5.444.15 NAME 'roledomain' DESC 'the domain of this role' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
attributeTypes: ( 2.5.444.3 NAME 'rolestatus' DESC 'the approval status of this role' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
attributeTypes: ( 2.5.444.4 NAME 'internalcomments' DESC 'group membership comments' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
attributeTypes: ( 2.5.444.5 NAME 'sponsor' DESC 'membership sponsor' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
attributeTypes: ( 2.5.444.6 NAME 'creationdate' DESC 'membership creation date' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
attributeTypes: ( 2.5.444.7 NAME 'approvaldate' DESC 'membership approval date' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
objectclasses:	( 2.5.555.2 NAME 'fedoraMembership' DESC 'An object describing a persons memebership' SUP top STRUCTURAL MUST ( cn  ) MAY ( approvaldate $ creationdate $ approvaldate $ roletype $ rolestatus $ roledomain $ internalcomments $ sponsor ) )


--- NEW FILE 52fc-fedora-person.ldif ---
#this is the fedoraPerson shema file for use with the Account system
#it is based on the inetOrgPerson shema, but has some spicific
#attribues added onto it for use by the Account system
#for now this is the contents
#sshkey bugzillaemail
dn: cn=schema
attributeTypes: ( 2.5.444.8 NAME 'sshkey' DESC 'ssh key for this member' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
attributeTypes: ( 2.5.444.9 NAME 'bugzillaemail' DESC 'members preferred bugzilla email address' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
# fedoraPerson
# The fedoraPerson represents people who are a member of the fedora project
# in some way.  It is a structural class and inherits
# from the inetOrgPerson class
objectclasses:	( 2.5.555.1 NAME 'fedoraPerson' DESC 'A member of the fedoraproject group' SUP inetOrgPerson STRUCTURAL MUST ( sshkey $ bugzillaemail ) )



From fedora-extras-commits at redhat.com  Fri Oct 20 23:56:51 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri, 20 Oct 2006 16:56:51 -0700
Subject: rpms/mantis/FC-4 mantis-0.19.5-unreleased.patch, NONE,
	1.1 mantis.spec, 1.8, 1.9
Message-ID: <200610202356.k9KNup2U032096@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32077

Modified Files:
	mantis.spec 
Added Files:
	mantis-0.19.5-unreleased.patch 
Log Message:
Add unreleased security patches from upsream CVS


mantis-0.19.5-unreleased.patch:

--- NEW FILE mantis-0.19.5-unreleased.patch ---
? mantis-0.19.5-unreleased.patch
Index: bug_view_advanced_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_advanced_page.php,v
retrieving revision 1.67
retrieving revision 1.67.6.1
diff -u -r1.67 -r1.67.6.1
--- bug_view_advanced_page.php	25 Oct 2004 19:59:12 -0000	1.67
+++ bug_view_advanced_page.php	1 Jan 2006 04:29:49 -0000	1.67.6.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: bug_view_advanced_page.php,v 1.67 2004/10/25 19:59:12 marcelloscata Exp $
+	# $Id: bug_view_advanced_page.php,v 1.67.6.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 
 	require_once( 'core.php' );
@@ -136,7 +136,7 @@
 	<!-- Category -->
 	<td>
 		<?php
-			$t_project_name = project_get_field( $t_bug->project_id, 'name' );
+			$t_project_name = string_display( project_get_field( $t_bug->project_id, 'name' ) );
 			echo "[$t_project_name] $t_bug->category";
 		?>
 	</td>
Index: bug_view_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_page.php,v
retrieving revision 1.70
retrieving revision 1.70.6.1
diff -u -r1.70 -r1.70.6.1
--- bug_view_page.php	17 Oct 2004 00:14:27 -0000	1.70
+++ bug_view_page.php	1 Jan 2006 04:29:49 -0000	1.70.6.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: bug_view_page.php,v 1.70 2004/10/17 00:14:27 thraxisp Exp $
+	# $Id: bug_view_page.php,v 1.70.6.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -138,7 +138,7 @@
 	<!-- Category -->
 	<td>
 		<?php
-			$t_project_name = project_get_field( $t_bug->project_id, 'name' );
+			$t_project_name = string_display( project_get_field( $t_bug->project_id, 'name' ) );
 			echo "[$t_project_name] $t_bug->category";
 		?>
 	</td>
Index: changelog_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/changelog_page.php,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -r1.9 -r1.9.6.1
--- changelog_page.php	25 Oct 2004 19:51:02 -0000	1.9
+++ changelog_page.php	1 Jan 2006 04:29:49 -0000	1.9.6.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: changelog_page.php,v 1.9 2004/10/25 19:51:02 marcelloscata Exp $
+	# $Id: changelog_page.php,v 1.9.6.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 
 	require_once( 'core.php' );
@@ -21,7 +21,7 @@
 		$t_version_name = version_get_field( $p_version_id, 'version' );
 		$t_project_name = project_get_field( $t_project_id, 'name' );
 
-		$t_release_title = $t_project_name . ' - ' . $t_version_name;
+		$t_release_title = string_display( $t_project_name ) . ' - ' . string_display( $t_version_name );
 		echo $t_release_title, '<br />';
 		echo str_pad( '', strlen( $t_release_title ), '=' ), '<br />';
 
@@ -56,7 +56,7 @@
 
 	$t_version_rows = version_get_all_rows( $f_project_id );
 
-	echo '<br /><span class="pagetitle">', $t_project_name, ' - ', lang_get( 'changelog' ), '</span><br /><br />';
+	echo '<br /><span class="pagetitle">', string_display( $t_project_name ), ' - ', lang_get( 'changelog' ), '</span><br /><br />';
 	echo '<tt>';
 
 	$i = 0;
Index: manage_proj_create.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_create.php,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- manage_proj_create.php	1 Dec 2004 12:45:22 -0000	1.6
+++ manage_proj_create.php	1 Jan 2006 04:29:49 -0000	1.6.4.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: manage_proj_create.php,v 1.6 2004/12/01 12:45:22 vboctor Exp $
+	# $Id: manage_proj_create.php,v 1.6.4.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php require_once( 'core.php' ) ?>
@@ -19,7 +19,7 @@
 	$f_status		= gpc_get_int( 'status' );
 	$f_file_path	= gpc_get_string( 'file_path', '' );
 
-	$t_project_id = project_create( $f_name, $f_description, $f_status, $f_view_state, $f_file_path );
+	$t_project_id = project_create( string_strip_tags( $f_name ), $f_description, $f_status, $f_view_state, $f_file_path );
 
 	if ( ( $f_view_state == VS_PRIVATE ) && ( false === current_user_is_administrator() ) ) {
 		$t_access_level = access_get_global_level();
Index: manage_user_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_user_page.php,v
retrieving revision 1.56.4.1
retrieving revision 1.56.4.2
diff -u -r1.56.4.1 -r1.56.4.2
--- manage_user_page.php	5 Dec 2005 10:49:06 -0000	1.56.4.1
+++ manage_user_page.php	5 Jan 2006 03:57:56 -0000	1.56.4.2
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: manage_user_page.php,v 1.56.4.1 2005/12/05 10:49:06 vboctor Exp $
+	# $Id: manage_user_page.php,v 1.56.4.2 2006/01/05 03:57:56 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -25,12 +25,31 @@
 	$f_save = gpc_get_bool( 'save' );
 	$f_prefix = strtoupper( gpc_get_string( 'prefix', config_get( 'default_manage_user_prefix' ) ) );
 
+	$t_user_table = config_get( 'mantis_user_table' );
 	$t_cookie_name = config_get( 'manage_cookie' );
 	$t_lock_image = '<img src="' . config_get( 'icon_path' ) . 'protected.gif" width="8" height="15" border="0" alt="' . lang_get( 'protected' ) . '" />';
 
+	# Clean up the form variables
+	if ( ! in_array( $f_sort, db_field_names( $t_user_table ) ) ) {
+        $c_sort = 'username';
+    } else {	 
+        $c_sort = addslashes($f_sort);
+    }
+
+	if ($f_dir == 'ASC') {
+		$c_dir = 'ASC';
+	} else {
+		$c_dir = 'DESC';
+	}
+
+	if ($f_hide == 0) { # a 0 will turn it off
+		$c_hide = 0;
+	} else {            # anything else (including 'on') will turn it on
+		$c_hide = 1;
+	}
 	# set cookie values for hide, sort by, and dir
 	if ( $f_save ) {
-		$t_manage_string = $f_hide.':'.$f_sort.':'.$f_dir;
+		$t_manage_string = $c_hide.':'.$c_sort.':'.$c_dir;
 		gpc_set_cookie( $t_cookie_name, $t_manage_string, true );
 	} else if ( !is_blank( gpc_get_cookie( $t_cookie_name, '' ) ) ) {
 		$t_manage_arr = explode( ':', gpc_get_cookie( $t_cookie_name ) );
@@ -49,20 +68,6 @@
 		}
 	}
 
-	# Clean up the form variables
-	$c_sort = addslashes($f_sort);
-
-	if ($f_dir == 'ASC') {
-		$c_dir = 'ASC';
-	} else {
-		$c_dir = 'DESC';
-	}
-
-	if ($f_hide == 0) { # a 0 will turn it off
-		$c_hide = 0;
-	} else {            # anything else (including 'on') will turn it on
-		$c_hide = 1;
-	}
 ?>
 <?php html_page_top1( lang_get( 'manage_users_link' ) ) ?>
 <?php html_page_top2() ?>
@@ -71,8 +76,6 @@
 
 <?php # New Accounts Form BEGIN ?>
 <?php
-	$t_user_table = config_get( 'mantis_user_table' );
-
 	$days_old = 7;
 	$query = "SELECT *
 		FROM $t_user_table
Index: print_all_bug_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/print_all_bug_page.php,v
retrieving revision 1.80
retrieving revision 1.80.10.1
diff -u -r1.80 -r1.80.10.1
--- print_all_bug_page.php	24 Jul 2004 14:31:43 -0000	1.80
+++ print_all_bug_page.php	1 Jan 2006 04:29:49 -0000	1.80.10.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: print_all_bug_page.php,v 1.80 2004/07/24 14:31:43 vboctor Exp $
+	# $Id: print_all_bug_page.php,v 1.80.10.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -75,7 +75,7 @@
 
 <table class="width100"><tr><td class="form-title">
 	<div class="center">
-		<?php echo config_get( 'window_title' ) . ' - ' . project_get_name( $t_project_id ); ?>
+		<?php echo config_get( 'window_title' ) . ' - ' . string_display( project_get_name( $t_project_id ) ); ?>
 	</div>
 </td></tr></table>
 
Index: print_bug_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/print_bug_page.php,v
retrieving revision 1.51
retrieving revision 1.51.10.1
diff -u -r1.51 -r1.51.10.1
--- print_bug_page.php	27 Aug 2004 00:29:54 -0000	1.51
+++ print_bug_page.php	1 Jan 2006 04:29:49 -0000	1.51.10.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: print_bug_page.php,v 1.51 2004/08/27 00:29:54 thraxisp Exp $
+	# $Id: print_bug_page.php,v 1.51.10.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -63,7 +63,7 @@
 <table class="width100" cellspacing="1">
 <tr>
 	<td class="form-title" colspan="6">
-		<div class="center"><?php echo config_get( 'window_title' ) . ' - ' . project_get_name( $v_project_id ) ?></div>
+		<div class="center"><?php echo config_get( 'window_title' ) . ' - ' . string_display( project_get_name( $v_project_id ) ) ?></div>
 	</td>
 </tr>
 <tr>
Index: query_store.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/query_store.php,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -r1.3 -r1.3.12.1
--- query_store.php	7 Jul 2004 20:30:13 -0000	1.3
+++ query_store.php	8 Jan 2006 14:42:25 -0000	1.3.12.1
@@ -19,7 +19,7 @@
 	auth_ensure_user_authenticated();
 	compress_enable();
 
-	$f_query_name = gpc_get_string( 'query_name' );
+	$f_query_name = string_strip_tags( gpc_get_string( 'query_name' ) );
 	$f_is_public = gpc_get_bool( 'is_public' );
 	$f_all_projects = gpc_get_bool( 'all_projects' );
 	
Index: query_store_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/query_store_page.php,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -r1.5 -r1.5.10.1
--- query_store_page.php	26 Jul 2004 12:06:23 -0000	1.5
+++ query_store_page.php	8 Jan 2006 14:42:25 -0000	1.5.10.1
@@ -38,7 +38,7 @@
 	} 
 	
 	# Check for an error
-	$t_error_msg = gpc_get_string( 'error_msg', null );
+	$t_error_msg = string_strip_tags( gpc_get_string( 'error_msg', null ) );
 	if ( $t_error_msg != null ) {
 		print "<br />$t_error_msg<br /><br />";
 	}
Index: view_all_set.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/view_all_set.php,v
retrieving revision 1.38.6.1
retrieving revision 1.38.6.2
diff -u -r1.38.6.1 -r1.38.6.2
--- view_all_set.php	10 Dec 2005 03:31:48 -0000	1.38.6.1
+++ view_all_set.php	18 Dec 2005 02:58:59 -0000	1.38.6.2
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: view_all_set.php,v 1.38.6.1 2005/12/10 03:31:48 thraxisp Exp $
+	# $Id: view_all_set.php,v 1.38.6.2 2005/12/18 02:58:59 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php require_once( 'core.php' ) ?>
@@ -134,7 +134,7 @@
 
 	# these are only single values, even when doing advanced filtering
 	$f_per_page				= gpc_get_int( 'per_page', -1 );
-	$f_highlight_changed	= gpc_get_string( 'highlight_changed', config_get( 'default_show_changed' ) );
+	$f_highlight_changed	= gpc_get_int( 'highlight_changed', config_get( 'default_show_changed' ) );
 	# sort direction
 	$f_sort					= gpc_get_string( 'sort', 'last_updated' );
 	$f_dir					= gpc_get_string( 'dir', 'DESC' );
Index: view_filters_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/view_filters_page.php,v
retrieving revision 1.22.6.1
retrieving revision 1.22.6.3
diff -u -r1.22.6.1 -r1.22.6.3
--- view_filters_page.php	10 Dec 2005 03:31:48 -0000	1.22.6.1
+++ view_filters_page.php	8 Jan 2006 15:37:51 -0000	1.22.6.3
@@ -24,11 +24,14 @@
 	html_page_top2();
 
 	$t_project_id = helper_get_current_project();
+	$t_current_user_access_level = current_user_get_access_level();
 	$t_target_field = gpc_get_string( 'target_field', '' );
 	$t_fields = array( 'priority', 'id', 'sponsorship_total', 'category', 'severity', 'status', 'last_updated', 'summary' );
 	$t_accessible_custom_fields_ids = array();
 	$t_accessible_custom_fields_names = array();
 	$t_accessible_custom_fields_values = array();
+	$t_custom_cols = 1;
+	$t_custom_rows = 0;
 
 	if ( ON == config_get( 'filter_by_custom_fields' ) ) {
 		$t_custom_cols = config_get( 'filter_custom_fields_per_row' );
@@ -104,8 +107,6 @@
 	
 	$t_current_user_access_level = current_user_get_access_level();
 	$t_filter_cols = 7;
-	$t_custom_cols = 1;
-	$t_custom_rows = 0;
 
 	$f_for_screen = gpc_get_bool( 'for_screen', true );
 
Index: core/database_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/database_api.php,v
retrieving revision 1.38
retrieving revision 1.38.4.1
diff -u -r1.38 -r1.38.4.1
--- core/database_api.php	9 Dec 2004 18:55:06 -0000	1.38
+++ core/database_api.php	5 Jan 2006 03:57:56 -0000	1.38.4.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: database_api.php,v 1.38 2004/12/09 18:55:06 thraxisp Exp $
+	# $Id: database_api.php,v 1.38.4.1 2006/01/05 03:57:56 thraxisp Exp $
 	# --------------------------------------------------------
 
 	### Database ###
@@ -175,6 +175,12 @@
 	}
 
 	# --------------------
+	function db_field_names( $p_table_name ) {
+		global $g_db;
+		return $g_db->MetaColumnNames( $p_table_name );
+	}
+
+	# --------------------
 	# Check if there is an index defined on the specified table/field and with
 	# the specified type.
 	#
@@ -236,6 +242,7 @@
 	# --------------------
 	# prepare a string before DB insertion
 	# @@@ should default be return addslashes( $p_string ); or generate an error
+	# @@@ Consider using ADODB escaping for all databases.
 	function db_prepare_string( $p_string ) {
 		global $g_db;
 		$t_db_type = config_get( 'db_type' );
@@ -246,11 +253,15 @@
 				return addslashes( $p_string );
 
 			case 'mysql':
-				return mysql_escape_string( $p_string );
+				# mysql_escape_string was deprecated in v4.3.0 
+				if ( php_version_at_least( '4.3.0' ) ) {
+					return mysql_real_escape_string( $p_string );
+				} else {
+					return mysql_escape_string( $p_string );
+				}
 
 			# For some reason mysqli_escape_string( $p_string ) always returns an empty
 			# string.  This is happening with PHP v5.0.2.
-			# @@@ Consider using ADODB escaping for all databases.
 			case 'mysqli':
 				$t_escaped = $g_db->qstr( $p_string, false );
 				return substr( $t_escaped, 1, strlen( $t_escaped ) - 2 );
Index: core/string_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/string_api.php,v
retrieving revision 1.62.4.1
retrieving revision 1.62.4.2
diff -u -r1.62.4.1 -r1.62.4.2
--- core/string_api.php	5 Dec 2005 12:12:05 -0000	1.62.4.1
+++ core/string_api.php	1 Jan 2006 04:29:49 -0000	1.62.4.2
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: string_api.php,v 1.62.4.1 2005/12/05 12:12:05 vboctor Exp $
+	# $Id: string_api.php,v 1.62.4.2 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 
 	$t_core_dir = dirname( __FILE__ ).DIRECTORY_SEPARATOR;
@@ -345,6 +345,45 @@
 	}
 
 	# --------------------
+	# strip all tags from a string
+	# This will remove HTML tags, javascript sections
+	# and white space. It will also convert some
+	# common HTML entities to their text equivalent.
+	function string_strip_tags( $p_string ) {
+		$t_search = array( 
+				'@<script[^>]*?>.*?</script>@si',	/* Strip out javascript */
+				'@<[\/\!]*?[^<>]*?>@si',			/* Strip out HTML tags */
+				'@([\r\n])[\s]+@',					/* Strip out white space */
+				'@&(quot|#34);@i',					/* Replace HTML entities */
+				'@&(amp|#38);@i',
+				'@&(lt|#60);@i',
+				'@&(gt|#62);@i',
+				'@&(nbsp|#160);@i',
+				'@&(iexcl|#161);@i',
+				'@&(cent|#162);@i',
+				'@&(pound|#163);@i',
+				'@&(copy|#169);@i',
+				'@&#(\d+);@e' );					/* evaluate as php */
+
+		$t_replace = array( 
+				'',
+				'',
+				'\1',
+				'"',
+				'&',
+				'<',
+				'>',
+				' ',
+				chr(161),
+				chr(162),
+				chr(163),
+				chr(169),
+				'chr(\1)' );
+
+		return preg_replace($t_search, $t_replace, $p_string);
+	}
+	
+	# --------------------
 	# This function looks for text with htmlentities
 	# like &lt;b&gt; and converts is into corresponding
 	# html <b> based on the configuration presets


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-4/mantis.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mantis.spec	23 Dec 2005 15:46:58 -0000	1.8
+++ mantis.spec	20 Oct 2006 23:56:20 -0000	1.9
@@ -9,7 +9,7 @@
 Summary:	Web-based bugtracking system
 Name:		mantis
 Version:	0.19.4
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		Applications/Internet
 URL:		http://mantisbt.sourceforge.net/
@@ -18,6 +18,8 @@
 Patch0:		mantis-0.19.2-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-0.19.2-noadmin.patch
+# unreleased patches from CVS. Could be removed after an eventual 0.19.5 release
+Patch3:		mantis-0.19.5-unreleased.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	diffutils
 Requires:	php
@@ -58,6 +60,7 @@
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
+%patch3 -p0 -b .unreleased
 
 chmod -x *.php sql/*
 rm -rf packages
@@ -154,6 +157,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Gianluca Sforna <giallu gmail com> 0.19.4-2
+- add unreleased security patches from CVS
+
 * Fri Dec 23 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.19.4-1
 - SECURITY: release 0.19.4
   * File Upload Vulnerability (TKADV2005-11-002) (thraxisp)



From fedora-extras-commits at redhat.com  Sat Oct 21 01:28:37 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 20 Oct 2006 18:28:37 -0700
Subject: rpms/torque/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 torque.spec,
	1.15, 1.16
Message-ID: <200610210128.k9L1SbSR006168@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6148

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
- bump to fix "Spool Job Race condition" on bugtraq



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Oct 2006 19:11:15 -0000	1.8
+++ .cvsignore	21 Oct 2006 01:28:07 -0000	1.9
@@ -1 +1 @@
-torque-2.1.3.tar.gz
+torque-2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Oct 2006 19:11:15 -0000	1.8
+++ sources	21 Oct 2006 01:28:07 -0000	1.9
@@ -1 +1 @@
-0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz
+9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- torque.spec	16 Oct 2006 22:36:00 -0000	1.15
+++ torque.spec	21 Oct 2006 01:28:07 -0000	1.16
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.3
+%define version 2.1.4
 #%%define snap 200604251602
-%define release 3
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -335,6 +335,7 @@
 Summary: Graphical clients for TORQUE
 Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: xpbs xpbsmon
+Provides: %{name}-x11tools
 %description gui
 %shared_description
 This package holds the graphical clients.
@@ -402,6 +403,9 @@
 
 
 %changelog
+* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
+- bump to fix "Spool Job Race condition" on bugtraq
+
 * Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
 - correct unowned directories
 



From fedora-extras-commits at redhat.com  Sat Oct 21 01:55:03 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 20 Oct 2006 18:55:03 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 torque.spec,
	1.12, 1.13
Message-ID: <200610210155.k9L1t3nk006435@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6415

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
- bump to fix "Spool Job Race condition" on bugtraq



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Oct 2006 20:07:05 -0000	1.8
+++ .cvsignore	21 Oct 2006 01:54:33 -0000	1.9
@@ -1 +1 @@
-torque-2.1.3.tar.gz
+torque-2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Oct 2006 20:07:05 -0000	1.8
+++ sources	21 Oct 2006 01:54:33 -0000	1.9
@@ -1 +1 @@
-0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz
+9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- torque.spec	12 Oct 2006 20:07:05 -0000	1.12
+++ torque.spec	21 Oct 2006 01:54:33 -0000	1.13
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.3
+%define version 2.1.4
 #%%define snap 200604251602
-%define release 2
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -199,6 +199,7 @@
 %doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
 %{torquehomedir}/aux
 %{torquehomedir}/spool
 
@@ -288,7 +289,7 @@
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
 %endif
-%{torquehomedir}/mom_priv/*
+%{torquehomedir}/mom_priv
 %{torquehomedir}/mom_logs
 %{torquehomedir}/checkpoint
 %{torquehomedir}/undelivered
@@ -334,6 +335,7 @@
 Summary: Graphical clients for TORQUE
 Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: xpbs xpbsmon
+Provides: %{name}-x11tools
 %description gui
 %shared_description
 This package holds the graphical clients.
@@ -401,6 +403,12 @@
 
 
 %changelog
+* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
+- bump to fix "Spool Job Race condition" on bugtraq
+
+* Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
+- correct unowned directories
+
 * Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
 - missing BR ncurses-devel and readline-devel
 



From fedora-extras-commits at redhat.com  Sat Oct 21 02:11:36 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 20 Oct 2006 19:11:36 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 torque.spec,
	1.10, 1.11
Message-ID: <200610210211.k9L2Baui009499@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9479

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
- bump to fix "Spool Job Race condition" on bugtraq



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Oct 2006 21:02:48 -0000	1.8
+++ .cvsignore	21 Oct 2006 02:11:06 -0000	1.9
@@ -1 +1 @@
-torque-2.1.3.tar.gz
+torque-2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Oct 2006 21:02:48 -0000	1.8
+++ sources	21 Oct 2006 02:11:06 -0000	1.9
@@ -1 +1 @@
-0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz
+9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- torque.spec	12 Oct 2006 21:02:48 -0000	1.10
+++ torque.spec	21 Oct 2006 02:11:06 -0000	1.11
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.3
+%define version 2.1.4
 #%%define snap 200604251602
-%define release 2
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -199,6 +199,7 @@
 %doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
 %{torquehomedir}/aux
 %{torquehomedir}/spool
 
@@ -288,7 +289,7 @@
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
 %endif
-%{torquehomedir}/mom_priv/*
+%{torquehomedir}/mom_priv
 %{torquehomedir}/mom_logs
 %{torquehomedir}/checkpoint
 %{torquehomedir}/undelivered
@@ -334,6 +335,7 @@
 Summary: Graphical clients for TORQUE
 Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: xpbs xpbsmon
+Provides: %{name}-x11tools
 %description gui
 %shared_description
 This package holds the graphical clients.
@@ -401,6 +403,12 @@
 
 
 %changelog
+* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
+- bump to fix "Spool Job Race condition" on bugtraq
+
+* Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
+- correct unowned directories
+
 * Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
 - missing BR ncurses-devel and readline-devel
 



From fedora-extras-commits at redhat.com  Sat Oct 21 02:17:52 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 20 Oct 2006 19:17:52 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 torque.spec,
	1.9, 1.10
Message-ID: <200610210217.k9L2Hqck009566@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9545

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
- bump to fix "Spool Job Race condition" on bugtraq



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2006 23:42:04 -0000	1.7
+++ .cvsignore	21 Oct 2006 02:17:22 -0000	1.8
@@ -1 +1 @@
-torque-2.1.2.tar.gz
+torque-2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2006 23:42:04 -0000	1.7
+++ sources	21 Oct 2006 02:17:22 -0000	1.8
@@ -1 +1 @@
-f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
+9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- torque.spec	3 Aug 2006 05:52:26 -0000	1.9
+++ torque.spec	21 Oct 2006 02:17:22 -0000	1.10
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.2
+%define version 2.1.4
 #%%define snap 200604251602
-%define release 2
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -92,13 +92,12 @@
 Source5: xpbsmon.png
 Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.2-pam-getpwnam.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -122,7 +121,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
@@ -201,6 +199,7 @@
 %doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
 %{torquehomedir}/aux
 %{torquehomedir}/spool
 
@@ -290,7 +289,7 @@
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
 %endif
-%{torquehomedir}/mom_priv/*
+%{torquehomedir}/mom_priv
 %{torquehomedir}/mom_logs
 %{torquehomedir}/checkpoint
 %{torquehomedir}/undelivered
@@ -336,6 +335,7 @@
 Summary: Graphical clients for TORQUE
 Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: xpbs xpbsmon
+Provides: %{name}-x11tools
 %description gui
 %shared_description
 This package holds the graphical clients.
@@ -389,7 +389,7 @@
 %{_bindir}/pbs-config
 
 %package pam
-Summary: PAM module for PBS MOM nodes.
+Summary: PAM module for TORQUE MOM nodes
 Group: System Environment/Base
 
 %description pam
@@ -403,6 +403,21 @@
 
 
 %changelog
+* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
+- bump to fix "Spool Job Race condition" on bugtraq
+
+* Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
+- correct unowned directories
+
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
+- missing BR ncurses-devel and readline-devel
+
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
+- bump to 2.1.3
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 2.1.2-3
+- FC6 mass rebuild
+
 * Wed Aug  2 2006 Garrick Staples <garrick at usc.edu> 2.1.2-2
 - fix incorrect _pam_getpwnam_r usage in pam module
 



From fedora-extras-commits at redhat.com  Sat Oct 21 03:39:30 2006
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Fri, 20 Oct 2006 20:39:30 -0700
Subject: owners owners.list,1.3,1.4
Message-ID: <200610210339.k9L3dUgw013015@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12997

Modified Files:
	owners.list 
Log Message:
Update BZ addresses for websites



Index: owners.list
===================================================================
RCS file: /cvs/fedora/owners/owners.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- owners.list	8 Dec 2005 21:56:19 -0000	1.3
+++ owners.list	21 Oct 2006 03:39:27 -0000	1.4
@@ -13,4 +13,4 @@
 Fedora Infrastructure|extras buildsys|For issues related to the Fedora Extras build system.|skvidal at phy.duke.edu|katzj at redhat.com|wtogami at redhat.com
 Fedora Infrastructure|other|Anything else|wtogami at redhat.com||sopwith at redhat.com
 Fedora Infrastructure|update system|The Fedora Core update system|lmacken at redhat.com|notting at redhat.com|
-Fedora Infrastructure|website|For issues related to the Fedora web site.|gdk at redhat.com|sopwith at redhat.com|wtogami at redhat.com
+Fedora Infrastructure|website|For issues related to the Fedora web site.|web-members at fedoraproject.org|sopwith at redhat.com|wtogami at redhat.com,gdk at redhat.com,nman64 at n-man.com



From fedora-extras-commits at redhat.com  Sat Oct 21 07:09:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 00:09:19 -0700
Subject: rpms/libpqxx/FC-5 .cvsignore, 1.5, 1.6 libpqxx.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200610210709.k9L79JuV026476@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpqxx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26433/FC-5

Modified Files:
	.cvsignore libpqxx.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Aug 2006 10:10:54 -0000	1.5
+++ .cvsignore	21 Oct 2006 07:08:48 -0000	1.6
@@ -1 +1,2 @@
 libpqxx-2.6.7.tar.gz
+libpqxx-2.6.8.tar.gz


Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-5/libpqxx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libpqxx.spec	3 Aug 2006 10:10:54 -0000	1.8
+++ libpqxx.spec	21 Oct 2006 07:08:48 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           libpqxx
-Version:        2.6.7
+Version:        2.6.8
 Release:        1%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://pqxx.org
-Source0:        http://thaiopensource.org/download/software/libpqxx/libpqxx-2.6.7.tar.gz
+Source0:        http://thaiopensource.org/download/software/libpqxx/libpqxx-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  postgresql-devel
@@ -55,7 +55,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-2.6.7.so
+%{_libdir}/libpqxx-*.so
 
 %files devel
 %doc README-UPGRADE
@@ -65,6 +65,9 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.6.8-1
+- version upgrade #209897
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.6.7-1
 - version upgrade
 - fix #192933


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Aug 2006 10:10:54 -0000	1.5
+++ sources	21 Oct 2006 07:08:48 -0000	1.6
@@ -1 +1 @@
-f66b41065a5e3103a348d378320999e4  libpqxx-2.6.7.tar.gz
+cb818ca7698955bcea8b7ba1b7962811  libpqxx-2.6.8.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 07:09:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 00:09:17 -0700
Subject: rpms/libpqxx/FC-4 .cvsignore, 1.5, 1.6 libpqxx.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200610210709.k9L79H75026471@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpqxx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26433/FC-4

Modified Files:
	.cvsignore libpqxx.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Aug 2006 10:10:54 -0000	1.5
+++ .cvsignore	21 Oct 2006 07:08:47 -0000	1.6
@@ -1 +1,2 @@
 libpqxx-2.6.7.tar.gz
+libpqxx-2.6.8.tar.gz


Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libpqxx.spec	3 Aug 2006 10:10:54 -0000	1.6
+++ libpqxx.spec	21 Oct 2006 07:08:47 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           libpqxx
-Version:        2.6.7
+Version:        2.6.8
 Release:        1%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://gborg.postgresql.org/project/libpqxx/projdisplay.php
-Source0:        ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.6.7.tar.gz
+Source0:        ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  postgresql-devel
@@ -55,7 +55,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-2.6.7.so
+%{_libdir}/libpqxx-*.so
 
 %files devel
 %doc README-UPGRADE
@@ -65,6 +65,9 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.6.8-1
+- version upgrade
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.6.7-1
 - version upgrade
 - fix #197933


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Aug 2006 10:10:54 -0000	1.5
+++ sources	21 Oct 2006 07:08:47 -0000	1.6
@@ -1 +1 @@
-f66b41065a5e3103a348d378320999e4  libpqxx-2.6.7.tar.gz
+cb818ca7698955bcea8b7ba1b7962811  libpqxx-2.6.8.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 07:52:29 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 00:52:29 -0700
Subject: rpms/koffice/FC-5 koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.12, 
	1.13 koffice.spec, 1.40, 1.41 sources, 1.12,
	1.13 koffice-admin-gcc4isok.patch, 1.1, NONE
Message-ID: <200610210752.k9L7qTbV026969@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26922/FC-5

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.0.patch 
Removed Files:
	koffice-admin-gcc4isok.patch 
Log Message:
- version upgrade


koffice-1.6.0.patch:

--- NEW FILE koffice-1.6.0.patch ---
--- lib/kross/python/cxx/Objects.hxx.orig	2006-10-19 00:00:02.000000000 +0200
+++ lib/kross/python/cxx/Objects.hxx	2006-10-19 00:02:04.000000000 +0200
@@ -1938,8 +1938,8 @@
 			if(map.hasKey(key)) the_item = map.getItem(key);
 			};
 
-		~mapref<T>()
-			{}
+	//	~mapref<T>()
+	//		{};
 
 		// MapBase<T> stuff
 		// lvalue


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Aug 2006 09:15:25 -0000	1.12
+++ .cvsignore	21 Oct 2006 07:51:58 -0000	1.13
@@ -1 +1 @@
-koffice-1.5.2.tar.bz2
+koffice-1.6.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- koffice.spec	3 Aug 2006 09:15:25 -0000	1.40
+++ koffice.spec	21 Oct 2006 07:51:58 -0000	1.41
@@ -1,64 +1,53 @@
 Name:           koffice
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-1.5.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
-Patch0:         koffice-admin-gcc4isok.patch
+Patch0:         koffice-1.6.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
-BuildRequires:  automake
-BuildRequires:  autoconf >= 2.53
 BuildRequires:  kdebase-devel
 BuildRequires:  kdelibs-devel
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  libart_lgpl-devel
-BuildRequires:  libidn-devel
-BuildRequires:  gamin-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  ImageMagick-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  libogg-devel
 BuildRequires:  openssl-devel
-BuildRequires:  esound-devel
-BuildRequires:  python-devel
+BuildRequires:  python-devel python
 BuildRequires:  pcre-devel
 BuildRequires:  libwpd-devel
 BuildRequires:  lcms-devel
 BuildRequires:  gettext-devel
 BuildRequires:  mysql-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  postgresql-devel
 BuildRequires:  perl
-BuildRequires:  python2-devel
 BuildRequires:  wv2-devel
 BuildRequires:  libpqxx-devel
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
-BuildRequires:  libacl-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  libexif-devel
 BuildRequires:  libGL-devel libGLU-devel
-BuildRequires:  libXi-devel
 BuildRequires:  readline-devel
-BuildRequires:  ruby ruby-devel
-
+BuildRequires:  ruby ruby-devel >= 1.8.2 
+%if "%{?fedora}" > "4"
+BuildRequires:  libXi-devel
+%endif
 %description
 KOffice - Integrated Office Suite
 KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
@@ -225,22 +214,23 @@
 
 %prep
 %setup -q
-%patch0 -p1
-
-# this will make sure that patch0 is considered
-make -f admin/Makefile.common
+%patch0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure --disable-rpath --disable-dependency-tracking --enable-shared \
---enable-fast-install --with-pic --disable-static \
---with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
---with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
---with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
+  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+  --enable-final
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -265,156 +255,41 @@
 #now take care of all the desktop files with desktop-file-utils
 #core
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/KThesaurus.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
-
-#kword
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kword.desktop
-
-#kspread
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kspread.desktop
-
-#kpresenter
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kpresenter.desktop
-
-#karbon
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/karbon.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
-#krita
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_magick.desktop
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_openexr.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_png.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_raw.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_tiff.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
-
-#kugar
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
-
-#kchart
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kchart.desktop
-
-#kformula
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kformula.desktop
-
-#kivio
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kivio.desktop
-
-#kexi
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kexi.desktop
-
-#kplato
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop
-
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
+%post core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
 
 %post kword -p /sbin/ldconfig
 %postun kword -p /sbin/ldconfig
@@ -496,15 +371,17 @@
 %{_libdir}/kde3/libkprkword.*
 %{_libdir}/kde3/libthesaurustool.*
 %{_libdir}/kde3/clipartthumbnail.*
-%{_datadir}/apps/koffice
+%{_datadir}/apps/koffice/
 %{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell
-%{_datadir}/apps/thesaurus
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
 %{_datadir}/config.kcfg/koshell.kcfg
-%{_datadir}/doc/HTML/en/koffice
-%{_datadir}/doc/HTML/en/koshell
-%{_datadir}/doc/HTML/en/thesaurus
-%{_datadir}/icons/*
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/services/clipartthumbnail.desktop
 %{_datadir}/services/kfile*.desktop
 %{_datadir}/services/kwmailmerge*.desktop
@@ -518,20 +395,20 @@
 %{_datadir}/servicetypes/koplugin.desktop
 %{_datadir}/servicetypes/kwmailmerge.desktop
 %{_datadir}/servicetypes/widgetfactory.desktop
-%{_datadir}/applications/fedora-KThesaurus.desktop
-%{_datadir}/applications/fedora-koshell.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublecombobox.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublelineedit.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
-%{_datadir}/apps/kross
+%{_datadir}/apps/kross/
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
 
 %files devel
 %{_includedir}/*
-%{_datadir}/doc/HTML/en/koffice-apidocs
-%{_libdir}/*.so
+%{_datadir}/doc/HTML/en/koffice-apidocs/
+%{_libdir}/lib*.so
 
 %files kword
 %defattr(-,root,root,-)
@@ -540,13 +417,13 @@
 %{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
-%{_datadir}/apps/kword
+%{_datadir}/apps/kword/
 %{_datadir}/doc/HTML/en/kword
 %{_datadir}/services/kword*.desktop
 %{_datadir}/services/kwserial*.desktop
 %{_datadir}/templates/TextDocument.desktop
 %{_datadir}/templates/.source/TextDocument.kwt
-%{_datadir}/applications/fedora-kword.desktop
+%{_datadir}/applications/kde/*kword.desktop
 
 %files kspread
 %defattr(-,root,root,-)
@@ -565,12 +442,14 @@
 %{_libdir}/kde3/libopencalcexport.*
 %{_libdir}/kde3/libopencalcimport.*
 %{_libdir}/kde3/libqproimport.*
-%{_datadir}/apps/kspread
-%{_datadir}/doc/HTML/en/kspread
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
+%{_datadir}/apps/kspread/
+%{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
 %{_datadir}/templates/SpreadSheet.desktop
 %{_datadir}/templates/.source/SpreadSheet.kst
-%{_datadir}/applications/fedora-kspread.desktop
+%{_datadir}/applications/kde/*kspread.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
@@ -589,12 +468,12 @@
 %{_libdir}/kde3/libkpresentersvgexport.*
 %{_libdir}/kde3/libkpresenterxbmexport.*
 %{_libdir}/kde3/libkpresenterxpmexport.*
-%{_datadir}/apps/kpresenter
-%{_datadir}/doc/HTML/en/kpresenter
+%{_datadir}/apps/kpresenter/
+%{_datadir}/doc/HTML/en/kpresenter/
 %{_datadir}/services/kpresenter*.desktop
 %{_datadir}/templates/Presentation.desktop
 %{_datadir}/templates/.source/Presentation.kpt
-%{_datadir}/applications/fedora-kpresenter.desktop
+%{_datadir}/applications/kde/*kpresenter.desktop
 
 %files karbon
 %defattr(-,root,root,-)
@@ -621,11 +500,11 @@
 %{_libdir}/kde3/libkarbonxcfexport.*
 %{_libdir}/kde3/libwmfexport.*
 %{_libdir}/kde3/libwmfimport.*
-%{_datadir}/apps/karbon
+%{_datadir}/apps/karbon/
 %{_datadir}/services/karbon*
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
-%{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/applications/kde/*karbon.desktop
 %{_datadir}/doc/HTML/en/karbon/
 
 %files krita
@@ -638,6 +517,8 @@
 %{_libdir}/libkrita_rgb_f16half.so.*
 %{_libdir}/libkrita_rgb_f32.so.*
 %{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkrita_ycbcr_u16.so*
+%{_libdir}/libkrita_ycbcr_u8.so*
 %{_libdir}/libkritacolor.so.*
 %{_libdir}/libkritagrayscale.so.*
 %{_libdir}/libkritaimage.so.*
@@ -672,8 +553,6 @@
 %{_libdir}/kde3/kritatoolstar.*
 %{_libdir}/kde3/kritatooltransform.*
 %{_libdir}/kde3/libkritapart.*
-%{_libdir}/kde3/libkritamagickexport.*
-%{_libdir}/kde3/libkritamagickimport.*
 %{_libdir}/kde3/krita_cmyk_u16_plugin.*
 %{_libdir}/kde3/krita_gray_u16_plugin.*
 %{_libdir}/kde3/krita_lms_f32_plugin.*
@@ -691,7 +570,6 @@
 %{_libdir}/kde3/kritascripting.*
 %{_libdir}/kde3/kritaseparatechannels.*
 %{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasmearybrush.*
 %{_libdir}/kde3/kritasobelfilter.*
 %{_libdir}/kde3/kritatoolselectsimilar.*
 %{_libdir}/kde3/kritawetplugin.*
@@ -705,12 +583,27 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/krosskritacore.*
-%{_datadir}/apps/krita
+%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
+%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
+%{_libdir}/kde3/kritablurfilter.*
+%{_libdir}/kde3/kritaextensioncolorsfilters.*
+%{_libdir}/kde3/kritafastcolortransfer.*
+%{_libdir}/kde3/kritalenscorrectionfilter.*
+%{_libdir}/kde3/kritamodifyselection.*
+%{_libdir}/kde3/kritanoisefilter.*
+%{_libdir}/kde3/kritarandompickfilter.*
+%{_libdir}/kde3/kritasubstrate.*
+%{_libdir}/kde3/kritatoolcurves.*
+%{_libdir}/kde3/kritatoolperspectivegrid.*
+%{_libdir}/kde3/kritatoolperspectivetransform.*
+%{_libdir}/kde3/kritaunsharpfilter.*
+%{_libdir}/kde3/kritawavefilter.*
+%{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita*.desktop
-%{_datadir}/apps/kritaplugins
-%{_datadir}/doc/HTML/en/krita
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
+%{_datadir}/doc/HTML/en/krita/
 %{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
@@ -725,13 +618,13 @@
 %{_libdir}/kde3/kugar.*
 %{_libdir}/kde3/libkudesignerpart.*
 %{_libdir}/kde3/libkugarpart.*
-%{_datadir}/apps/kudesigner
-%{_datadir}/apps/kugar
-%{_datadir}/doc/HTML/en/kugar
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/doc/HTML/en/kugar/
 %{_datadir}/services/kugar*.desktop
-%{_datadir}/applications/fedora-kugar.desktop
+%{_datadir}/applications/kde/*kugar.desktop
 # this not being fedorarized fixes #173086
-%{_datadir}/applnk/Office/kudesigner.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -773,10 +666,10 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/apps/kexi
+%{_datadir}/apps/kexi/
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/doc/HTML/en/kexi
-%{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/doc/HTML/en/kexi/
+%{_datadir}/applications/kde/*kexi.desktop
 %{_datadir}/services/kexidb_sqlite*driver.desktop
 
 %files kexi-driver-mysql
@@ -808,20 +701,20 @@
 %{_libdir}/kde3/libkchartmngexport.*
 %{_libdir}/kde3/libkchartxbmexport.*
 %{_libdir}/kde3/libkchartxpmexport.*
-%{_datadir}/apps/kchart
+%{_datadir}/apps/kchart/
 %{_datadir}/services/kchart*.desktop
-%{_datadir}/doc/HTML/en/kchart
-%{_datadir}/applications/fedora-kchart.desktop
+%{_datadir}/doc/HTML/en/kchart/
+%{_datadir}/applications/kde/*kchart.desktop
 
 %files kformula
 %defattr(-,root,root,-)
 %{_bindir}/kformula
 %{_libdir}/kde3/libkformulapart.*
 %{_libdir}/kde3/kformula.*
-%{_datadir}/apps/kformula
-%{_datadir}/doc/HTML/en/kformula
+%{_datadir}/apps/kformula/
+%{_datadir}/doc/HTML/en/kformula/
 %{_datadir}/services/kformula*.desktop
-%{_datadir}/applications/fedora-kformula.desktop
+%{_datadir}/applications/kde/*kformula.desktop
 
 %files kivio
 %defattr(-,root,root,-)
@@ -837,11 +730,11 @@
 %{_libdir}/kde3/libkiviotargettool.*
 %{_libdir}/kde3/libkiviotexttool.*
 %{_libdir}/kde3/libkiviozoomtool.*
-%{_datadir}/apps/kivio
+%{_datadir}/apps/kivio/
 %{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/doc/HTML/en/kivio
+%{_datadir}/doc/HTML/en/kivio/
 %{_datadir}/services/kivio*.desktop
-%{_datadir}/applications/fedora-kivio.desktop
+%{_datadir}/applications/kde/*kivio.desktop
 
 %files filters
 %defattr(-,root,root,-)
@@ -890,11 +783,13 @@
 %{_libdir}/kde3/libhancomwordimport.*
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libpowerpointimport.*
-%{_datadir}/apps/xsltfilter
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_libdir}/kde3/libolefilter.*
+%{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
 
 %files kplato
 %defattr(-,root,root,-)
@@ -902,12 +797,17 @@
 %{_libdir}/libkdeinit_kplato.so
 %{_libdir}/kde3/kplato.*
 %{_libdir}/kde3/libkplatopart.*
-%{_datadir}/apps/kplato
-%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/apps/kplato/
+%{_datadir}/doc/HTML/en/kplato/
 %{_datadir}/services/kplatopart.desktop
-%{_datadir}/applications/fedora-kplato.desktop
+%{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+- merge with rexe's edition of the devel spec (thanks again)
+
 * Wed Aug 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Aug 2006 09:15:25 -0000	1.12
+++ sources	21 Oct 2006 07:51:58 -0000	1.13
@@ -1 +1 @@
-cbe9deeb7c811a6bb5a954989b25c1f2  koffice-1.5.2.tar.bz2
+e669cf19b2e1c7db7029c0772c527c0d  koffice-1.6.0.tar.bz2


--- koffice-admin-gcc4isok.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 07:52:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 00:52:28 -0700
Subject: rpms/koffice/FC-4 koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 koffice.spec, 1.17, 1.18 sources, 1.9,
	1.10 koffice-admin-gcc4isok.patch, 1.1,
	NONE koffice-kexi-version.patch, 1.1, NONE
Message-ID: <200610210752.k9L7qSfs026964@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26922/FC-4

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.0.patch 
Removed Files:
	koffice-admin-gcc4isok.patch koffice-kexi-version.patch 
Log Message:
- version upgrade


koffice-1.6.0.patch:

--- NEW FILE koffice-1.6.0.patch ---
--- lib/kross/python/cxx/Objects.hxx.orig	2006-10-19 00:00:02.000000000 +0200
+++ lib/kross/python/cxx/Objects.hxx	2006-10-19 00:02:04.000000000 +0200
@@ -1938,8 +1938,8 @@
 			if(map.hasKey(key)) the_item = map.getItem(key);
 			};
 
-		~mapref<T>()
-			{}
+	//	~mapref<T>()
+	//		{};
 
 		// MapBase<T> stuff
 		// lvalue


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2006 09:15:24 -0000	1.9
+++ .cvsignore	21 Oct 2006 07:51:58 -0000	1.10
@@ -1 +1 @@
-koffice-1.5.2.tar.bz2
+koffice-1.6.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- koffice.spec	3 Aug 2006 09:15:24 -0000	1.17
+++ koffice.spec	21 Oct 2006 07:51:58 -0000	1.18
@@ -1,16 +1,16 @@
 Name:           koffice
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-1.5.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
-Patch0:         koffice-admin-gcc4isok.patch
+Patch0:         koffice-1.6.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -224,22 +224,23 @@
 
 %prep
 %setup -q
-%patch0 -p1
-
-# this will make sure that patch0 is considered
-make -f admin/Makefile.common
+%patch0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure --disable-rpath --disable-dependency-tracking --enable-shared \
---enable-fast-install --with-pic --disable-static \
---with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
---with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
---with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
+  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+  --enable-final
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -264,156 +265,41 @@
 #now take care of all the desktop files with desktop-file-utils
 #core
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/KThesaurus.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
-
-#kword
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kword.desktop
-
-#kspread
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kspread.desktop
-
-#kpresenter
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kpresenter.desktop
-
-#karbon
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/karbon.desktop
-
-#krita
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_magick.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_openexr.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_png.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_raw.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_tiff.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
-
-#kugar
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
-
-#kchart
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kchart.desktop
-
-#kformula
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kformula.desktop
-
-#kivio
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kivio.desktop
-
-#kexi
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kexi.desktop
-
-#kplato
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
+%post core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
 
 %post kword -p /sbin/ldconfig
 %postun kword -p /sbin/ldconfig
@@ -495,15 +381,17 @@
 %{_libdir}/kde3/libkprkword.*
 %{_libdir}/kde3/libthesaurustool.*
 %{_libdir}/kde3/clipartthumbnail.*
-%{_datadir}/apps/koffice
+%{_datadir}/apps/koffice/
 %{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell
-%{_datadir}/apps/thesaurus
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
 %{_datadir}/config.kcfg/koshell.kcfg
-%{_datadir}/doc/HTML/en/koffice
-%{_datadir}/doc/HTML/en/koshell
-%{_datadir}/doc/HTML/en/thesaurus
-%{_datadir}/icons/*
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/services/clipartthumbnail.desktop
 %{_datadir}/services/kfile*.desktop
 %{_datadir}/services/kwmailmerge*.desktop
@@ -517,20 +405,20 @@
 %{_datadir}/servicetypes/koplugin.desktop
 %{_datadir}/servicetypes/kwmailmerge.desktop
 %{_datadir}/servicetypes/widgetfactory.desktop
-%{_datadir}/applications/fedora-KThesaurus.desktop
-%{_datadir}/applications/fedora-koshell.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublecombobox.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublelineedit.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
-%{_datadir}/apps/kross
+%{_datadir}/apps/kross/
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
 
 %files devel
 %{_includedir}/*
-%{_datadir}/doc/HTML/en/koffice-apidocs
-%{_libdir}/*.so
+%{_datadir}/doc/HTML/en/koffice-apidocs/
+%{_libdir}/lib*.so
 
 %files kword
 %defattr(-,root,root,-)
@@ -539,13 +427,13 @@
 %{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
-%{_datadir}/apps/kword
-%{_datadir}/doc/HTML/en/kword
+%{_datadir}/apps/kword/
+%{_datadir}/doc/HTML/en/kword/
 %{_datadir}/services/kword*.desktop
 %{_datadir}/services/kwserial*.desktop
 %{_datadir}/templates/TextDocument.desktop
 %{_datadir}/templates/.source/TextDocument.kwt
-%{_datadir}/applications/fedora-kword.desktop
+%{_datadir}/applications/kde/*kword.desktop
 
 %files kspread
 %defattr(-,root,root,-)
@@ -564,12 +452,14 @@
 %{_libdir}/kde3/libopencalcexport.*
 %{_libdir}/kde3/libopencalcimport.*
 %{_libdir}/kde3/libqproimport.*
-%{_datadir}/apps/kspread
-%{_datadir}/doc/HTML/en/kspread
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
+%{_datadir}/apps/kspread/
+%{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
 %{_datadir}/templates/SpreadSheet.desktop
 %{_datadir}/templates/.source/SpreadSheet.kst
-%{_datadir}/applications/fedora-kspread.desktop
+%{_datadir}/applications/kde/*kspread.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
@@ -588,12 +478,12 @@
 %{_libdir}/kde3/libkpresentersvgexport.*
 %{_libdir}/kde3/libkpresenterxbmexport.*
 %{_libdir}/kde3/libkpresenterxpmexport.*
-%{_datadir}/apps/kpresenter
-%{_datadir}/doc/HTML/en/kpresenter
+%{_datadir}/apps/kpresenter/
+%{_datadir}/doc/HTML/en/kpresenter/
 %{_datadir}/services/kpresenter*.desktop
 %{_datadir}/templates/Presentation.desktop
 %{_datadir}/templates/.source/Presentation.kpt
-%{_datadir}/applications/fedora-kpresenter.desktop
+%{_datadir}/applications/kde/*kpresenter.desktop
 
 %files karbon
 %defattr(-,root,root,-)
@@ -620,11 +510,11 @@
 %{_libdir}/kde3/libkarbonxcfexport.*
 %{_libdir}/kde3/libwmfexport.*
 %{_libdir}/kde3/libwmfimport.*
-%{_datadir}/apps/karbon
+%{_datadir}/apps/karbon/
 %{_datadir}/services/karbon*
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
-%{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/applications/kde/*karbon.desktop
 %{_datadir}/doc/HTML/en/karbon/
 
 %files krita
@@ -637,6 +527,8 @@
 %{_libdir}/libkrita_rgb_f16half.so.*
 %{_libdir}/libkrita_rgb_f32.so.*
 %{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkrita_ycbcr_u16.so*
+%{_libdir}/libkrita_ycbcr_u8.so*
 %{_libdir}/libkritacolor.so.*
 %{_libdir}/libkritagrayscale.so.*
 %{_libdir}/libkritaimage.so.*
@@ -671,8 +563,6 @@
 %{_libdir}/kde3/kritatoolstar.*
 %{_libdir}/kde3/kritatooltransform.*
 %{_libdir}/kde3/libkritapart.*
-%{_libdir}/kde3/libkritamagickexport.*
-%{_libdir}/kde3/libkritamagickimport.*
 %{_libdir}/kde3/krita_cmyk_u16_plugin.*
 %{_libdir}/kde3/krita_gray_u16_plugin.*
 %{_libdir}/kde3/krita_lms_f32_plugin.*
@@ -690,7 +580,6 @@
 %{_libdir}/kde3/kritascripting.*
 %{_libdir}/kde3/kritaseparatechannels.*
 %{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasmearybrush.*
 %{_libdir}/kde3/kritasobelfilter.*
 %{_libdir}/kde3/kritatoolselectsimilar.*
 %{_libdir}/kde3/kritawetplugin.*
@@ -704,12 +593,27 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/krosskritacore.*
-%{_datadir}/apps/krita
+%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
+%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
+%{_libdir}/kde3/kritablurfilter.*
+%{_libdir}/kde3/kritaextensioncolorsfilters.*
+%{_libdir}/kde3/kritafastcolortransfer.*
+%{_libdir}/kde3/kritalenscorrectionfilter.*
+%{_libdir}/kde3/kritamodifyselection.*
+%{_libdir}/kde3/kritanoisefilter.*
+%{_libdir}/kde3/kritarandompickfilter.*
+%{_libdir}/kde3/kritasubstrate.*
+%{_libdir}/kde3/kritatoolcurves.*
+%{_libdir}/kde3/kritatoolperspectivegrid.*
+%{_libdir}/kde3/kritatoolperspectivetransform.*
+%{_libdir}/kde3/kritaunsharpfilter.*
+%{_libdir}/kde3/kritawavefilter.*
+%{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita*.desktop
-%{_datadir}/apps/kritaplugins
-%{_datadir}/doc/HTML/en/krita
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
+%{_datadir}/doc/HTML/en/krita/
 %{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
@@ -724,13 +628,13 @@
 %{_libdir}/kde3/kugar.*
 %{_libdir}/kde3/libkudesignerpart.*
 %{_libdir}/kde3/libkugarpart.*
-%{_datadir}/apps/kudesigner
-%{_datadir}/apps/kugar
-%{_datadir}/doc/HTML/en/kugar
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/doc/HTML/en/kugar/
 %{_datadir}/services/kugar*.desktop
-%{_datadir}/applications/fedora-kugar.desktop
+%{_datadir}/applications/kde/*kugar.desktop
 # this not being fedorarized fixes #173086
-%{_datadir}/applnk/Office/kudesigner.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -772,10 +676,10 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/apps/kexi
+%{_datadir}/apps/kexi/
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/doc/HTML/en/kexi
-%{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/doc/HTML/en/kexi/
+%{_datadir}/applications/kde/*kexi.desktop
 %{_datadir}/services/kexidb_sqlite*driver.desktop
 
 %files kexi-driver-mysql
@@ -807,20 +711,20 @@
 %{_libdir}/kde3/libkchartmngexport.*
 %{_libdir}/kde3/libkchartxbmexport.*
 %{_libdir}/kde3/libkchartxpmexport.*
-%{_datadir}/apps/kchart
+%{_datadir}/apps/kchart/
 %{_datadir}/services/kchart*.desktop
-%{_datadir}/doc/HTML/en/kchart
-%{_datadir}/applications/fedora-kchart.desktop
+%{_datadir}/doc/HTML/en/kchart/
+%{_datadir}/applications/kde/*kchart.desktop
 
 %files kformula
 %defattr(-,root,root,-)
 %{_bindir}/kformula
 %{_libdir}/kde3/libkformulapart.*
 %{_libdir}/kde3/kformula.*
-%{_datadir}/apps/kformula
-%{_datadir}/doc/HTML/en/kformula
+%{_datadir}/apps/kformula/
+%{_datadir}/doc/HTML/en/kformula/
 %{_datadir}/services/kformula*.desktop
-%{_datadir}/applications/fedora-kformula.desktop
+%{_datadir}/applications/kde/*kformula.desktop
 
 %files kivio
 %defattr(-,root,root,-)
@@ -836,11 +740,11 @@
 %{_libdir}/kde3/libkiviotargettool.*
 %{_libdir}/kde3/libkiviotexttool.*
 %{_libdir}/kde3/libkiviozoomtool.*
-%{_datadir}/apps/kivio
+%{_datadir}/apps/kivio/
 %{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/doc/HTML/en/kivio
+%{_datadir}/doc/HTML/en/kivio/
 %{_datadir}/services/kivio*.desktop
-%{_datadir}/applications/fedora-kivio.desktop
+%{_datadir}/applications/kde/*kivio.desktop
 
 %files filters
 %defattr(-,root,root,-)
@@ -889,11 +793,13 @@
 %{_libdir}/kde3/libhancomwordimport.*
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libpowerpointimport.*
-%{_datadir}/apps/xsltfilter
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_libdir}/kde3/libolefilter.*
+%{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
 
 %files kplato
 %defattr(-,root,root,-)
@@ -901,12 +807,17 @@
 %{_libdir}/libkdeinit_kplato.so
 %{_libdir}/kde3/kplato.*
 %{_libdir}/kde3/libkplatopart.*
-%{_datadir}/apps/kplato
-%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/apps/kplato/
+%{_datadir}/doc/HTML/en/kplato/
 %{_datadir}/services/kplatopart.desktop
-%{_datadir}/applications/fedora-kplato.desktop
+%{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+- merge with rexe's edition of the devel spec (thanks again)
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2006 09:15:24 -0000	1.9
+++ sources	21 Oct 2006 07:51:58 -0000	1.10
@@ -1 +1 @@
-cbe9deeb7c811a6bb5a954989b25c1f2  koffice-1.5.2.tar.bz2
+e669cf19b2e1c7db7029c0772c527c0d  koffice-1.6.0.tar.bz2


--- koffice-admin-gcc4isok.patch DELETED ---


--- koffice-kexi-version.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 08:21:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 01:21:10 -0700
Subject: rpms/wine/FC-3 .cvsignore, 1.19, 1.20 sources, 1.20, 1.21 wine.spec,
	1.27, 1.28
Message-ID: <200610210821.k9L8LALZ030248@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30212/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	17 Sep 2006 14:14:59 -0000	1.19
+++ .cvsignore	21 Oct 2006 08:20:40 -0000	1.20
@@ -1 +1 @@
-wine-0.9.21-fe.tar.bz2
+wine-0.9.23-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	17 Sep 2006 14:14:59 -0000	1.20
+++ sources	21 Oct 2006 08:20:40 -0000	1.21
@@ -1 +1 @@
-98232c907314f15b54d7f685ecfb5535  wine-0.9.21-fe.tar.bz2
+6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wine.spec	17 Sep 2006 14:14:59 -0000	1.27
+++ wine.spec	21 Oct 2006 08:20:40 -0000	1.28
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.21
+Version:	0.9.23
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.21-fe.tar.bz2
+Source0:        wine-0.9.23-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -359,6 +359,7 @@
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
 %{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/clusapi.dll.so
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
@@ -445,6 +446,7 @@
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
@@ -463,6 +465,7 @@
 %{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
@@ -493,6 +496,7 @@
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/resutils.dll.so
 %{_libdir}/wine/riched20.dll.so
 %{_libdir}/wine/riched32.dll.so
 %{_libdir}/wine/rpcrt4.dll.so
@@ -674,6 +678,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Sun Sep 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.21-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 08:21:11 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 01:21:11 -0700
Subject: rpms/wine/FC-4 .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 wine.spec,
	1.30, 1.31
Message-ID: <200610210821.k9L8LBlG030253@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30212/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	17 Sep 2006 14:15:00 -0000	1.20
+++ .cvsignore	21 Oct 2006 08:20:41 -0000	1.21
@@ -1 +1 @@
-wine-0.9.21-fe.tar.bz2
+wine-0.9.23-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	17 Sep 2006 14:15:00 -0000	1.21
+++ sources	21 Oct 2006 08:20:41 -0000	1.22
@@ -1 +1 @@
-98232c907314f15b54d7f685ecfb5535  wine-0.9.21-fe.tar.bz2
+6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wine.spec	17 Sep 2006 14:15:00 -0000	1.30
+++ wine.spec	21 Oct 2006 08:20:41 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.21
+Version:	0.9.23
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.21-fe.tar.bz2
+Source0:        wine-0.9.23-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -359,6 +359,7 @@
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
 %{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/clusapi.dll.so
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
@@ -445,6 +446,7 @@
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
@@ -463,6 +465,7 @@
 %{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
@@ -493,6 +496,7 @@
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/resutils.dll.so
 %{_libdir}/wine/riched20.dll.so
 %{_libdir}/wine/riched32.dll.so
 %{_libdir}/wine/rpcrt4.dll.so
@@ -674,6 +678,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Sun Sep 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.21-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:06:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:06:36 -0700
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wine-docs.spec, 1.20, 1.21
Message-ID: <200610210906.k9L96aJr000958@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/FC-3

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2006 04:12:23 -0000	1.17
+++ .cvsignore	21 Oct 2006 09:06:05 -0000	1.18
@@ -1 +1 @@
-wine-docs-0.9.20.tar.bz2
+wine-docs-0.9.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2006 04:12:23 -0000	1.17
+++ sources	21 Oct 2006 09:06:05 -0000	1.18
@@ -1 +1 @@
-770e081e2917d291294c157dda4856eb  wine-docs-0.9.20.tar.bz2
+8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wine-docs.spec	28 Aug 2006 04:12:23 -0000	1.20
+++ wine-docs.spec	21 Oct 2006 09:06:05 -0000	1.21
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.20
+Version:        0.9.23
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.20.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.20-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:06:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:06:36 -0700
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wine-docs.spec, 1.24, 1.25
Message-ID: <200610210906.k9L96aha000963@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/FC-4

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2006 04:12:24 -0000	1.17
+++ .cvsignore	21 Oct 2006 09:06:06 -0000	1.18
@@ -1 +1 @@
-wine-docs-0.9.20.tar.bz2
+wine-docs-0.9.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2006 04:12:24 -0000	1.17
+++ sources	21 Oct 2006 09:06:06 -0000	1.18
@@ -1 +1 @@
-770e081e2917d291294c157dda4856eb  wine-docs-0.9.20.tar.bz2
+8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wine-docs.spec	28 Aug 2006 04:12:24 -0000	1.24
+++ wine-docs.spec	21 Oct 2006 09:06:06 -0000	1.25
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.20
+Version:        0.9.23
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.20.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -51,6 +51,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.20-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:06:42 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:06:42 -0700
Subject: rpms/wine-docs/FC-5 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wine-docs.spec, 1.17, 1.18
Message-ID: <200610210906.k9L96gaw000968@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/FC-5

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2006 04:12:30 -0000	1.17
+++ .cvsignore	21 Oct 2006 09:06:12 -0000	1.18
@@ -1 +1 @@
-wine-docs-0.9.20.tar.bz2
+wine-docs-0.9.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2006 04:12:30 -0000	1.17
+++ sources	21 Oct 2006 09:06:12 -0000	1.18
@@ -1 +1 @@
-770e081e2917d291294c157dda4856eb  wine-docs-0.9.20.tar.bz2
+8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wine-docs.spec	28 Aug 2006 04:12:30 -0000	1.17
+++ wine-docs.spec	21 Oct 2006 09:06:12 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.20
+Version:        0.9.23
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.20.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.20-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:06:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:06:43 -0700
Subject: rpms/wine-docs/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wine-docs.spec, 1.17, 1.18
Message-ID: <200610210906.k9L96hU5000973@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/devel

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2006 04:12:30 -0000	1.17
+++ .cvsignore	21 Oct 2006 09:06:13 -0000	1.18
@@ -1 +1 @@
-wine-docs-0.9.20.tar.bz2
+wine-docs-0.9.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2006 04:12:30 -0000	1.17
+++ sources	21 Oct 2006 09:06:13 -0000	1.18
@@ -1 +1 @@
-770e081e2917d291294c157dda4856eb  wine-docs-0.9.20.tar.bz2
+8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wine-docs.spec	28 Aug 2006 04:12:30 -0000	1.17
+++ wine-docs.spec	21 Oct 2006 09:06:13 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.20
+Version:        0.9.23
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.20.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.20-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:16:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 02:16:07 -0700
Subject: owners owners.list,1.1858,1.1859
Message-ID: <200610210916.k9L9G7fQ001210@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1166

Modified Files:
	owners.list 
Log Message:
unorphan MagicPoint


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1858
retrieving revision 1.1859
diff -u -r1.1858 -r1.1859
--- owners.list	20 Oct 2006 17:06:40 -0000	1.1858
+++ owners.list	21 Oct 2006 09:15:36 -0000	1.1859
@@ -1011,7 +1011,7 @@
 Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|MagicPoint|X based presentation software|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org,byte at fedoraproject.org
+Fedora Extras|MagicPoint|X based presentation software|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|rms at 1407.org,byte at fedoraproject.org
 Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|man-pages-uk|Ukrainian man pages from the Linux Documentation Project|andy at smile.org.ua|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 21 09:29:21 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 21 Oct 2006 02:29:21 -0700
Subject: rpms/clamav/FC-3 clamav.spec,1.24,1.25 sources,1.16,1.17
Message-ID: <200610210929.k9L9TLmV001411@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1391

Modified Files:
	clamav.spec sources 
Log Message:
updated to 0.88.5


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- clamav.spec	9 Aug 2006 06:59:30 -0000	1.24
+++ clamav.spec	21 Oct 2006 09:28:51 -0000	1.25
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.4
+Version:	0.88.5
 Release:	%release_func 1
 
 License:	GPL
@@ -432,6 +432,9 @@
 %endif	# _without_milter
 
 %changelog
+* Sat Oct 21 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.5-1
+- updated to 0.88.5
+
 * Tue Aug  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.4-1
 - updated to 0.88.4 (SECURITY)
 - removed some superfluous %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Aug 2006 06:59:30 -0000	1.16
+++ sources	21 Oct 2006 09:28:51 -0000	1.17
@@ -1,2 +1,2 @@
-7759784aa4506b314e6543e0f2a8587b  clamav-0.88.4.tar.gz
-450d59c0a663b5986cda1105b85ae673  clamav-0.88.4.tar.gz.sig
+d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
+5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Oct 21 09:31:29 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 21 Oct 2006 02:31:29 -0700
Subject: rpms/clamav/FC-4 clamav.spec,1.34,1.35 sources,1.18,1.19
Message-ID: <200610210931.k9L9VTVt001510@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492

Modified Files:
	clamav.spec sources 
Log Message:
updated to 0.88.5


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- clamav.spec	9 Aug 2006 06:57:03 -0000	1.34
+++ clamav.spec	21 Oct 2006 09:30:58 -0000	1.35
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.4
+Version:	0.88.5
 Release:	%release_func 1
 
 License:	GPL
@@ -432,6 +432,9 @@
 %endif	# _without_milter
 
 %changelog
+* Sat Oct 21 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.5-1
+- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
+
 * Tue Aug  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.4-1
 - updated to 0.88.4 (SECURITY)
 - removed some superfluous %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Aug 2006 06:57:03 -0000	1.18
+++ sources	21 Oct 2006 09:30:58 -0000	1.19
@@ -1,2 +1,2 @@
-7759784aa4506b314e6543e0f2a8587b  clamav-0.88.4.tar.gz
-450d59c0a663b5986cda1105b85ae673  clamav-0.88.4.tar.gz.sig
+d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
+5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Oct 21 09:38:41 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:38:41 -0700
Subject: rpms/fluxbox/FC-3 fluxbox-xdg-menu.py, 1.2, 1.3 fluxbox.spec, 1.13, 
	1.14 fluxbox-menu.patch, 1.1, NONE
Message-ID: <200610210938.k9L9cfEF001650@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585/FC-3

Modified Files:
	fluxbox-xdg-menu.py fluxbox.spec 
Removed Files:
	fluxbox-menu.patch 
Log Message:
- fix #209347 and #187740
- fc{5,6} fix #196106 



Index: fluxbox-xdg-menu.py
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/fluxbox-xdg-menu.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fluxbox-xdg-menu.py	5 Apr 2006 21:19:28 -0000	1.2
+++ fluxbox-xdg-menu.py	21 Oct 2006 09:38:11 -0000	1.3
@@ -1,20 +1,34 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
+# vim: noexpandtab:ts=4:sts=4
+
 """Menu Generator for Fluxbox
 
 Generates a menu for Fluxbox using the freedesktop.org standards
 
-Usage: fluxbox-fdo-menugen.py [options]
+Usage: fluxbox-xdg-menu.py [options]
 
 Options:
   -l ..., --lang=...      create the menu using a language. Default = $LANG
   -h, --help              show this help
   -f ..., --file=...      output the menu into a file. Default = ~/.fluxbox/menu
-  --with-icons         do not put icons for applications in the menu
+  -t ..., --theme=...     what icon theme you want to use
+  --with-icons            put icons for applications in the menu
   --stdout                output the menu to standard output
+  --submenu               output to be used as an include/submenu with fluxbox
+  --with-backgrounds      creates a background menu. Default background_paths = 
+                          ~/.fluxbox/backgrounds, /usr/share/wallpapers,
+                          /usr/share/backgrounds
+  --backgrounds-only      do not regenerate menu, only do the bg menu.
+  --bg-path=              path to location to look for images 
+                          example: --bg-path=~/pics  
+			  may be used with --backgrounds-only but --bg-path= 
+			  must be first: --bg-path=~/some/path --backgrounds-only
 
+A nice example string to use: fluxbox-fdo-menugen.py --with-icons --with-backgrounds --bg-path=~/some/path
+To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --backgrounds-only
 """
 
-__author__ = "Rudolf Kastl , Antonio Gomes"
+__author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice"
 __version__ = "$Revision$"
 __date__ = "$Date$"
 __license__ = "GPL"
@@ -22,6 +36,7 @@
 
 import os,re,sys,glob,getopt
 import xdg.Menu,xdg.DesktopEntry,xdg.IconTheme
+from os.path import isfile
 
 def usage():
 	print __doc__
@@ -31,7 +46,7 @@
 [begin] (Fluxbox)
 	[exec] (Web Browser) {htmlview}
 	[exec] (Email) {evolution}
-	[exec] (Terminal) {gnome-terminal}
+	[exec] (Terminal) {$TERM}
 	[exec] (Irc) {xchat}
 	[separator]\n"""
 
@@ -78,66 +93,31 @@
 			else:
 				entry.Show = True 
 	
-#def findIcon(icon):
-#	"""Finds the path and filename for the given icon name
-#		e.g. gaim --> /usr/share/pixmaps/gaim.png
-#		e.g. fart.png --> /usr/share/pixmaps/fart.png
-#	"""
-#	if os.path.isfile(icon): return icon
-#	paths = ["~/.icons","/usr/share/pixmaps","/usr/share/icons"]
-#	for path in paths:
-#		for dirpath , dirnames, filenames in os.walk(os.path.expanduser(path)):
-#			for filename in filenames:
-#				pattern = '^%s\.(png|jpg|gif|xpm)' % icon # matches <filename>.<something>
-#				if icon == filename or re.search(pattern, filename):
-#					return os.path.join(dirpath,filename)
-
-
-def findIcon(icon):
+def findIcon(icon, theme):
 	"""Finds the path and filename for the given icon name
 		e.g. gaim --> /usr/share/pixmaps/gaim.png
 		e.g. fart.png --> /usr/share/pixmaps/fart.png
 	"""
-	global paths
-	global locs
-
-	# Case Icon=/path/to/file.extension
-	if os.path.isfile(icon): return icon
-
-
-	# Case Icon=file.extension	
-
-	if re.search("^\w+.*\.\w{3}$",icon):
-		names=[icon]
-	# Case Icon=file
-	elif re.search("^\w+.*$",icon):
-		names=[icon+".png",icon+".xpm",icon+".jpg"]
-	else:
-		names=[]
+	retval=str(xdg.IconTheme.getIconPath(icon, 48, theme))
+	if retval == "None":
+		retval=""
 
-	for path in paths:	
-		for name in names:
-			if (os.path.isfile(path+name)):
-				locs.append(path)
-				return (path+name).encode('utf8')
+	return (retval + "").encode('utf8')
 
-
-def parseMenu(menu,depth=1):
-	global wm
-	global use_icons
+def parseMenu(menu,wm,use_icons,theme,depth=1):
 	if use_icons:
-		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'), findIcon(menu.getIcon()) )
+		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'),  findIcon(menu.getIcon(), theme) )
 	else:
 		print "%s[submenu] (%s) " % ( (depth*"\t"), menu.getName().encode('utf8'), )
 	depth += 1
 	for entry in menu.getEntries():
 		if isinstance(entry, xdg.Menu.Menu):
-			parseMenu(entry,depth)
+			parseMenu(entry,wm,use_icons,theme,depth)
 		elif isinstance(entry, xdg.Menu.MenuEntry):
 			checkWm(entry,wm)
 			if entry.Show == False: continue
 			if use_icons:
-				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon()) )
+				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) )
 			else:
 				print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] )
 		elif isinstance(entry,xdg.Menu.Separator):
@@ -147,22 +127,77 @@
 	depth -= 1
 	print "%s[end]" % (depth*"\t")
 
+def get_bgimgs_and_parse(xPath):
+    try:
+        if isfile(os.path.expanduser("~/.fluxbox/bgmenu")) == True:
+            os.unlink(os.path.expanduser("~/.fluxbox/bgmenu"))
+    except OSError:
+        pass
+    h = {}
+    bg_paths =["~/.fluxbox/backgrounds","/usr/share/wallpapers",
+		"/usr/share/backgrounds","/usr/share/backgrounds/images"]
+    try:
+        if xPath == None:
+           pass
+        else:
+            bg_paths.append(xPath)
+    except(TypeError):
+        pass
+    for dir in bg_paths:
+        for imgpth in bg_paths:
+            try:
+                imgs = os.listdir(os.path.expanduser(imgpth))
+                for i in imgs:
+                    h[i] = imgpth
+            except (OSError):
+                pass
+    bgMenu = open(os.path.expanduser("~/.fluxbox/bgmenu"),'w+')
+    num = len(h)
+    countNum = 1
+    bgPagCk = 1
+    bgPgNum = 1
+    bgMenu.write( "[submenu] (Backgrounds)\n" )
+    bgMenu.write( "[submenu] (Backgrounds) {Set Your Background}\n" )
+    bgMenu.write("\t[exec]  (Random Image)  {fbsetbg -r ~/.fluxbox/backgrounds}\n")
+	types = ["png","jpg","jpeg","gif"]
+    for i in h.keys():
+	    try:
+		    t = i.split(".")[-1].lower()
+			if t in types:
+			    print "Hello"
+			    bgMenu.write( "\t[exec]\t("+ i +") {fbsetbg -f "+ h[i] + "/" + i +"}\n" )
+				countNum = countNum + 1
+				num = num - 1
+				bgPagCk = bgPagCk + 1
+				if bgPagCk == 26:
+				    bgPgNum = bgPgNum + 1
+					bgMenu.write("[end]\n[submenu] (Backgrounds " + str(bgPgNum) +") \
+						{Set Your Background}\n")
+					bgPagCk = 1
+				if num == 0:
+				    bgMenu.write( "[end]\n[end]\n" )
+					bgMenu.close()
+		except(KeyError):
+		    print h[i]
+		    pass
 
 def main(argv):
 # Setting the default values
-	global locs
-	locs=[]
-	global wm
 	wm = "fluxbox"
-	global file
 	file = "~/.fluxbox/menu"
-	global use_icons
 	use_icons = False
+    use_bg = False
+    bg_Xpath = False
+	theme = "gnome"
 	lang = os.getenv("LANG","C")
 	file = os.path.expanduser("~/.fluxbox/menu")
+	do_submenu = False
+	use_stdout = False
 	
 	try:
-		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout"])
+		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout",\
+			"theme=","submenu","with-backgrounds","backgrounds-only","bg-path="])
+
 	except getopt.GetoptError:
 		usage()
 		sys.exit(2)
@@ -175,50 +210,51 @@
 		elif opt in ("-f", "--file"):
 			file = os.path.expanduser(arg)
 		elif opt == '--with-icons':
-			use_icons = True		
-			global paths
-			locations = \
-			['/usr/share/pixmaps/', \
-			'/usr/share/icons/hicolor/24x24/apps/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/hicolor/48x48/apps/', \
-			'/usr/share/icons/hicolor/24x24/stock/generic/', \
-			'/usr/share/icons/HighContrastLargePrintInverse/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/16x16/apps/', \
-			'/usr/share/icons/crystalsvg/32x32/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/devices/', \
-			'/usr/share/icons/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/Bluecurve/24x24/stock/', \
-			'/usr/share/icons/Bluecurve/48x48/filesystems/']
-			paths=locations
-#			for path in locations:
-#				paths+=glob.glob(path+"/*/")+glob.glob(path+"/*/*/")
-#			print paths
+			use_icons = True
+		elif opt in ("-t", "--theme"):
+			theme = arg
+		elif opt == '--stdout':
+			use_stdout = True
 		elif opt == '--stdout':
 			file = sys.stdout
-
-
-	fsock = open(file,'w')
-	saveout = sys.stdout
-	sys.stdout = fsock
+		elif opt == '--bg-path':
+		    bg_Xpath = True
+			xPath = os.path.expanduser(arg)
+		elif opt == '--with-backgrounds':
+		    use_bg = True
+		elif opt == '--backgrounds-only':
+		    if bg_Xpath:
+			    get_bgimgs_and_parse(xPath)
+			else:
+			    get_bgimgs_and_parse(None)
+				raise SystemExit
+			  
+		elif opt == '--submenu':
+			do_submenu = True
+
+	if not use_stdout:
+		fsock = open(file,'w')
+		saveout = sys.stdout
+		sys.stdout = fsock
 
 	menu=xdg.Menu.parse()
 # is done automatically now
 #	menu.setLocale(lang)
 
-	print header()
-	parseMenu(menu)
-	print footer()
+	if not do_submenu:
+        print header()
+	parseMenu(menu,wm,use_icons,theme)
+	if not do_submenu and use_bg and bg_Xpath:
+	    get_bgimgs_and_parse(xPath) 
+	    print "[include] (~/.fluxbox/bgmenu)"
+	if not do_submenu and use_bg and not bg_Xpath:
+	    print "[include] (~/.fluxbox/bgmenu)"
+		get_bgimgs_and_parse(None)
+    if not do_submenu:
+        print footer()
+	if not use_stdout:
+		sys.stdout = saveout
 
-	sys.stdout = saveout
 #	print menu
 if __name__ == "__main__":
 	main(sys.argv[1:])
-
-#WindowMaker Reminder
-#>>> p=re.compile("(\).*),(\s*\))")
-#>>> p.search("((ola),(ola),)").groups()
-#('),(ola)', ')')
-


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/fluxbox.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fluxbox.spec	5 Apr 2006 21:19:28 -0000	1.13
+++ fluxbox.spec	21 Oct 2006 09:38:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -13,7 +13,6 @@
 Source2:        FluxBox
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
-Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -35,7 +34,6 @@
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure      --enable-xft \
@@ -80,6 +78,10 @@
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-2
+- fix #187740 and #209347
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15.1-1
 - version upgrade


--- fluxbox-menu.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 09:38:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:38:43 -0700
Subject: rpms/fluxbox/FC-5 fluxbox-xdg-menu.py, 1.1, 1.2 fluxbox.spec, 1.19, 
	1.20 fluxbox-menu.patch, 1.3, NONE
Message-ID: <200610210938.k9L9chge001658@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585/FC-5

Modified Files:
	fluxbox-xdg-menu.py fluxbox.spec 
Removed Files:
	fluxbox-menu.patch 
Log Message:
- fix #209347 and #187740
- fc{5,6} fix #196106 



Index: fluxbox-xdg-menu.py
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox-xdg-menu.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-xdg-menu.py	29 Nov 2005 15:56:10 -0000	1.1
+++ fluxbox-xdg-menu.py	21 Oct 2006 09:38:13 -0000	1.2
@@ -1,20 +1,34 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
+# vim: noexpandtab:ts=4:sts=4
+
 """Menu Generator for Fluxbox
 
 Generates a menu for Fluxbox using the freedesktop.org standards
 
-Usage: fluxbox-fdo-menugen.py [options]
+Usage: fluxbox-xdg-menu.py [options]
 
 Options:
   -l ..., --lang=...      create the menu using a language. Default = $LANG
   -h, --help              show this help
   -f ..., --file=...      output the menu into a file. Default = ~/.fluxbox/menu
-  --with-icons         do not put icons for applications in the menu
+  -t ..., --theme=...     what icon theme you want to use
+  --with-icons            put icons for applications in the menu
   --stdout                output the menu to standard output
+  --submenu               output to be used as an include/submenu with fluxbox
+  --with-backgrounds      creates a background menu. Default background_paths = 
+                          ~/.fluxbox/backgrounds, /usr/share/wallpapers,
+                          /usr/share/backgrounds
+  --backgrounds-only      do not regenerate menu, only do the bg menu.
+  --bg-path=              path to location to look for images 
+                          example: --bg-path=~/pics  
+			  may be used with --backgrounds-only but --bg-path= 
+			  must be first: --bg-path=~/some/path --backgrounds-only
 
+A nice example string to use: fluxbox-fdo-menugen.py --with-icons --with-backgrounds --bg-path=~/some/path
+To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --backgrounds-only
 """
 
-__author__ = "Rudolf Kastl , Antonio Gomes"
+__author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice"
 __version__ = "$Revision$"
 __date__ = "$Date$"
 __license__ = "GPL"
@@ -22,6 +36,7 @@
 
 import os,re,sys,glob,getopt
 import xdg.Menu,xdg.DesktopEntry,xdg.IconTheme
+from os.path import isfile
 
 def usage():
 	print __doc__
@@ -31,7 +46,7 @@
 [begin] (Fluxbox)
 	[exec] (Web Browser) {htmlview}
 	[exec] (Email) {evolution}
-	[exec] (Terminal) {gnome-terminal}
+	[exec] (Terminal) {$TERM}
 	[exec] (Irc) {xchat}
 	[separator]\n"""
 
@@ -78,66 +93,31 @@
 			else:
 				entry.Show = True 
 	
-#def findIcon(icon):
-#	"""Finds the path and filename for the given icon name
-#		e.g. gaim --> /usr/share/pixmaps/gaim.png
-#		e.g. fart.png --> /usr/share/pixmaps/fart.png
-#	"""
-#	if os.path.isfile(icon): return icon
-#	paths = ["~/.icons","/usr/share/pixmaps","/usr/share/icons"]
-#	for path in paths:
-#		for dirpath , dirnames, filenames in os.walk(os.path.expanduser(path)):
-#			for filename in filenames:
-#				pattern = '^%s\.(png|jpg|gif|xpm)' % icon # matches <filename>.<something>
-#				if icon == filename or re.search(pattern, filename):
-#					return os.path.join(dirpath,filename)
-
-
-def findIcon(icon):
+def findIcon(icon, theme):
 	"""Finds the path and filename for the given icon name
 		e.g. gaim --> /usr/share/pixmaps/gaim.png
 		e.g. fart.png --> /usr/share/pixmaps/fart.png
 	"""
-	global paths
-	global locs
-
-	# Case Icon=/path/to/file.extension
-	if os.path.isfile(icon): return icon
-
-
-	# Case Icon=file.extension	
-
-	if re.search("^\w+.*\.\w{3}$",icon):
-		names=[icon]
-	# Case Icon=file
-	elif re.search("^\w+.*$",icon):
-		names=[icon+".png",icon+".xpm",icon+".jpg"]
-	else:
-		names=[]
+	retval=str(xdg.IconTheme.getIconPath(icon, 48, theme))
+	if retval == "None":
+		retval=""
 
-	for path in paths:	
-		for name in names:
-			if (os.path.isfile(path+name)):
-				locs.append(path)
-				return (path+name).encode('utf8')
+	return (retval + "").encode('utf8')
 
-
-def parseMenu(menu,depth=1):
-	global wm
-	global use_icons
+def parseMenu(menu,wm,use_icons,theme,depth=1):
 	if use_icons:
-		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'), findIcon(menu.getIcon()) )
+		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'),  findIcon(menu.getIcon(), theme) )
 	else:
 		print "%s[submenu] (%s) " % ( (depth*"\t"), menu.getName().encode('utf8'), )
 	depth += 1
 	for entry in menu.getEntries():
 		if isinstance(entry, xdg.Menu.Menu):
-			parseMenu(entry,depth)
+			parseMenu(entry,wm,use_icons,theme,depth)
 		elif isinstance(entry, xdg.Menu.MenuEntry):
 			checkWm(entry,wm)
 			if entry.Show == False: continue
 			if use_icons:
-				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon()) )
+				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) )
 			else:
 				print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] )
 		elif isinstance(entry,xdg.Menu.Separator):
@@ -147,22 +127,77 @@
 	depth -= 1
 	print "%s[end]" % (depth*"\t")
 
+def get_bgimgs_and_parse(xPath):
+    try:
+        if isfile(os.path.expanduser("~/.fluxbox/bgmenu")) == True:
+            os.unlink(os.path.expanduser("~/.fluxbox/bgmenu"))
+    except OSError:
+        pass
+    h = {}
+    bg_paths =["~/.fluxbox/backgrounds","/usr/share/wallpapers",
+		"/usr/share/backgrounds","/usr/share/backgrounds/images"]
+    try:
+        if xPath == None:
+           pass
+        else:
+            bg_paths.append(xPath)
+    except(TypeError):
+        pass
+    for dir in bg_paths:
+        for imgpth in bg_paths:
+            try:
+                imgs = os.listdir(os.path.expanduser(imgpth))
+                for i in imgs:
+                    h[i] = imgpth
+            except (OSError):
+                pass
+    bgMenu = open(os.path.expanduser("~/.fluxbox/bgmenu"),'w+')
+    num = len(h)
+    countNum = 1
+    bgPagCk = 1
+    bgPgNum = 1
+    bgMenu.write( "[submenu] (Backgrounds)\n" )
+    bgMenu.write( "[submenu] (Backgrounds) {Set Your Background}\n" )
+    bgMenu.write("\t[exec]  (Random Image)  {fbsetbg -r ~/.fluxbox/backgrounds}\n")
+	types = ["png","jpg","jpeg","gif"]
+    for i in h.keys():
+	    try:
+		    t = i.split(".")[-1].lower()
+			if t in types:
+			    print "Hello"
+			    bgMenu.write( "\t[exec]\t("+ i +") {fbsetbg -f "+ h[i] + "/" + i +"}\n" )
+				countNum = countNum + 1
+				num = num - 1
+				bgPagCk = bgPagCk + 1
+				if bgPagCk == 26:
+				    bgPgNum = bgPgNum + 1
+					bgMenu.write("[end]\n[submenu] (Backgrounds " + str(bgPgNum) +") \
+						{Set Your Background}\n")
+					bgPagCk = 1
+				if num == 0:
+				    bgMenu.write( "[end]\n[end]\n" )
+					bgMenu.close()
+		except(KeyError):
+		    print h[i]
+		    pass
 
 def main(argv):
 # Setting the default values
-	global locs
-	locs=[]
-	global wm
 	wm = "fluxbox"
-	global file
 	file = "~/.fluxbox/menu"
-	global use_icons
 	use_icons = False
+    use_bg = False
+    bg_Xpath = False
+	theme = "gnome"
 	lang = os.getenv("LANG","C")
 	file = os.path.expanduser("~/.fluxbox/menu")
+	do_submenu = False
+	use_stdout = False
 	
 	try:
-		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout"])
+		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout",\
+			"theme=","submenu","with-backgrounds","backgrounds-only","bg-path="])
+
 	except getopt.GetoptError:
 		usage()
 		sys.exit(2)
@@ -175,50 +210,51 @@
 		elif opt in ("-f", "--file"):
 			file = os.path.expanduser(arg)
 		elif opt == '--with-icons':
-			use_icons = True		
-			global paths
-			locations = \
-			['/usr/share/pixmaps/', \
-			'/usr/share/icons/hicolor/24x24/apps/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/hicolor/48x48/apps/', \
-			'/usr/share/icons/hicolor/24x24/stock/generic/', \
-			'/usr/share/icons/HighContrastLargePrintInverse/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/16x16/apps/', \
-			'/usr/share/icons/crystalsvg/32x32/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/devices/', \
-			'/usr/share/icons/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/Bluecurve/24x24/stock/', \
-			'/usr/share/icons/Bluecurve/48x48/filesystems/']
-			paths=locations
-#			for path in locations:
-#				paths+=glob.glob(path+"/*/")+glob.glob(path+"/*/*/")
-#			print paths
+			use_icons = True
+		elif opt in ("-t", "--theme"):
+			theme = arg
+		elif opt == '--stdout':
+			use_stdout = True
 		elif opt == '--stdout':
 			file = sys.stdout
-
-
-	fsock = open(file,'w')
-	saveout = sys.stdout
-	sys.stdout = fsock
+		elif opt == '--bg-path':
+		    bg_Xpath = True
+			xPath = os.path.expanduser(arg)
+		elif opt == '--with-backgrounds':
+		    use_bg = True
+		elif opt == '--backgrounds-only':
+		    if bg_Xpath:
+			    get_bgimgs_and_parse(xPath)
+			else:
+			    get_bgimgs_and_parse(None)
+				raise SystemExit
+			  
+		elif opt == '--submenu':
+			do_submenu = True
+
+	if not use_stdout:
+		fsock = open(file,'w')
+		saveout = sys.stdout
+		sys.stdout = fsock
 
 	menu=xdg.Menu.parse()
 # is done automatically now
 #	menu.setLocale(lang)
 
-	print header()
-	parseMenu(menu)
-	print footer()
+	if not do_submenu:
+        print header()
+	parseMenu(menu,wm,use_icons,theme)
+	if not do_submenu and use_bg and bg_Xpath:
+	    get_bgimgs_and_parse(xPath) 
+	    print "[include] (~/.fluxbox/bgmenu)"
+	if not do_submenu and use_bg and not bg_Xpath:
+	    print "[include] (~/.fluxbox/bgmenu)"
+		get_bgimgs_and_parse(None)
+    if not do_submenu:
+        print footer()
+	if not use_stdout:
+		sys.stdout = saveout
 
-	sys.stdout = saveout
 #	print menu
 if __name__ == "__main__":
 	main(sys.argv[1:])
-
-#WindowMaker Reminder
-#>>> p=re.compile("(\).*),(\s*\))")
-#>>> p.search("((ola),(ola),)").groups()
-#('),(ola)', ')')
-


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fluxbox.spec	5 Apr 2006 21:19:35 -0000	1.19
+++ fluxbox.spec	21 Oct 2006 09:38:13 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -11,7 +11,6 @@
 Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.1.tar.bz2
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
-Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -42,7 +41,6 @@
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure      --enable-xft \
@@ -63,7 +61,7 @@
 
 # this is for Fedora Core
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
-install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
+install -m 0644 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
 install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu
 
 %clean
@@ -78,6 +76,10 @@
 %{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-2
+- fix #209347,#196106, and #187740
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15.1-1
 - version upgrade


--- fluxbox-menu.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 09:38:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:38:44 -0700
Subject: rpms/fluxbox/devel fluxbox-xdg-menu.py, 1.1, 1.2 fluxbox.spec, 1.20,
	1.21 fluxbox-menu.patch, 1.3, NONE
Message-ID: <200610210938.k9L9ciOr001662@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585/devel

Modified Files:
	fluxbox-xdg-menu.py fluxbox.spec 
Removed Files:
	fluxbox-menu.patch 
Log Message:
- fix #209347 and #187740
- fc{5,6} fix #196106 



Index: fluxbox-xdg-menu.py
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox-xdg-menu.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-xdg-menu.py	29 Nov 2005 15:56:10 -0000	1.1
+++ fluxbox-xdg-menu.py	21 Oct 2006 09:38:14 -0000	1.2
@@ -1,20 +1,34 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
+# vim: noexpandtab:ts=4:sts=4
+
 """Menu Generator for Fluxbox
 
 Generates a menu for Fluxbox using the freedesktop.org standards
 
-Usage: fluxbox-fdo-menugen.py [options]
+Usage: fluxbox-xdg-menu.py [options]
 
 Options:
   -l ..., --lang=...      create the menu using a language. Default = $LANG
   -h, --help              show this help
   -f ..., --file=...      output the menu into a file. Default = ~/.fluxbox/menu
-  --with-icons         do not put icons for applications in the menu
+  -t ..., --theme=...     what icon theme you want to use
+  --with-icons            put icons for applications in the menu
   --stdout                output the menu to standard output
+  --submenu               output to be used as an include/submenu with fluxbox
+  --with-backgrounds      creates a background menu. Default background_paths = 
+                          ~/.fluxbox/backgrounds, /usr/share/wallpapers,
+                          /usr/share/backgrounds
+  --backgrounds-only      do not regenerate menu, only do the bg menu.
+  --bg-path=              path to location to look for images 
+                          example: --bg-path=~/pics  
+			  may be used with --backgrounds-only but --bg-path= 
+			  must be first: --bg-path=~/some/path --backgrounds-only
 
+A nice example string to use: fluxbox-fdo-menugen.py --with-icons --with-backgrounds --bg-path=~/some/path
+To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --backgrounds-only
 """
 
-__author__ = "Rudolf Kastl , Antonio Gomes"
+__author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice"
 __version__ = "$Revision$"
 __date__ = "$Date$"
 __license__ = "GPL"
@@ -22,6 +36,7 @@
 
 import os,re,sys,glob,getopt
 import xdg.Menu,xdg.DesktopEntry,xdg.IconTheme
+from os.path import isfile
 
 def usage():
 	print __doc__
@@ -31,7 +46,7 @@
 [begin] (Fluxbox)
 	[exec] (Web Browser) {htmlview}
 	[exec] (Email) {evolution}
-	[exec] (Terminal) {gnome-terminal}
+	[exec] (Terminal) {$TERM}
 	[exec] (Irc) {xchat}
 	[separator]\n"""
 
@@ -78,66 +93,31 @@
 			else:
 				entry.Show = True 
 	
-#def findIcon(icon):
-#	"""Finds the path and filename for the given icon name
-#		e.g. gaim --> /usr/share/pixmaps/gaim.png
-#		e.g. fart.png --> /usr/share/pixmaps/fart.png
-#	"""
-#	if os.path.isfile(icon): return icon
-#	paths = ["~/.icons","/usr/share/pixmaps","/usr/share/icons"]
-#	for path in paths:
-#		for dirpath , dirnames, filenames in os.walk(os.path.expanduser(path)):
-#			for filename in filenames:
-#				pattern = '^%s\.(png|jpg|gif|xpm)' % icon # matches <filename>.<something>
-#				if icon == filename or re.search(pattern, filename):
-#					return os.path.join(dirpath,filename)
-
-
-def findIcon(icon):
+def findIcon(icon, theme):
 	"""Finds the path and filename for the given icon name
 		e.g. gaim --> /usr/share/pixmaps/gaim.png
 		e.g. fart.png --> /usr/share/pixmaps/fart.png
 	"""
-	global paths
-	global locs
-
-	# Case Icon=/path/to/file.extension
-	if os.path.isfile(icon): return icon
-
-
-	# Case Icon=file.extension	
-
-	if re.search("^\w+.*\.\w{3}$",icon):
-		names=[icon]
-	# Case Icon=file
-	elif re.search("^\w+.*$",icon):
-		names=[icon+".png",icon+".xpm",icon+".jpg"]
-	else:
-		names=[]
+	retval=str(xdg.IconTheme.getIconPath(icon, 48, theme))
+	if retval == "None":
+		retval=""
 
-	for path in paths:	
-		for name in names:
-			if (os.path.isfile(path+name)):
-				locs.append(path)
-				return (path+name).encode('utf8')
+	return (retval + "").encode('utf8')
 
-
-def parseMenu(menu,depth=1):
-	global wm
-	global use_icons
+def parseMenu(menu,wm,use_icons,theme,depth=1):
 	if use_icons:
-		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'), findIcon(menu.getIcon()) )
+		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'),  findIcon(menu.getIcon(), theme) )
 	else:
 		print "%s[submenu] (%s) " % ( (depth*"\t"), menu.getName().encode('utf8'), )
 	depth += 1
 	for entry in menu.getEntries():
 		if isinstance(entry, xdg.Menu.Menu):
-			parseMenu(entry,depth)
+			parseMenu(entry,wm,use_icons,theme,depth)
 		elif isinstance(entry, xdg.Menu.MenuEntry):
 			checkWm(entry,wm)
 			if entry.Show == False: continue
 			if use_icons:
-				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon()) )
+				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) )
 			else:
 				print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] )
 		elif isinstance(entry,xdg.Menu.Separator):
@@ -147,22 +127,77 @@
 	depth -= 1
 	print "%s[end]" % (depth*"\t")
 
+def get_bgimgs_and_parse(xPath):
+    try:
+        if isfile(os.path.expanduser("~/.fluxbox/bgmenu")) == True:
+            os.unlink(os.path.expanduser("~/.fluxbox/bgmenu"))
+    except OSError:
+        pass
+    h = {}
+    bg_paths =["~/.fluxbox/backgrounds","/usr/share/wallpapers",
+		"/usr/share/backgrounds","/usr/share/backgrounds/images"]
+    try:
+        if xPath == None:
+           pass
+        else:
+            bg_paths.append(xPath)
+    except(TypeError):
+        pass
+    for dir in bg_paths:
+        for imgpth in bg_paths:
+            try:
+                imgs = os.listdir(os.path.expanduser(imgpth))
+                for i in imgs:
+                    h[i] = imgpth
+            except (OSError):
+                pass
+    bgMenu = open(os.path.expanduser("~/.fluxbox/bgmenu"),'w+')
+    num = len(h)
+    countNum = 1
+    bgPagCk = 1
+    bgPgNum = 1
+    bgMenu.write( "[submenu] (Backgrounds)\n" )
+    bgMenu.write( "[submenu] (Backgrounds) {Set Your Background}\n" )
+    bgMenu.write("\t[exec]  (Random Image)  {fbsetbg -r ~/.fluxbox/backgrounds}\n")
+	types = ["png","jpg","jpeg","gif"]
+    for i in h.keys():
+	    try:
+		    t = i.split(".")[-1].lower()
+			if t in types:
+			    print "Hello"
+			    bgMenu.write( "\t[exec]\t("+ i +") {fbsetbg -f "+ h[i] + "/" + i +"}\n" )
+				countNum = countNum + 1
+				num = num - 1
+				bgPagCk = bgPagCk + 1
+				if bgPagCk == 26:
+				    bgPgNum = bgPgNum + 1
+					bgMenu.write("[end]\n[submenu] (Backgrounds " + str(bgPgNum) +") \
+						{Set Your Background}\n")
+					bgPagCk = 1
+				if num == 0:
+				    bgMenu.write( "[end]\n[end]\n" )
+					bgMenu.close()
+		except(KeyError):
+		    print h[i]
+		    pass
 
 def main(argv):
 # Setting the default values
-	global locs
-	locs=[]
-	global wm
 	wm = "fluxbox"
-	global file
 	file = "~/.fluxbox/menu"
-	global use_icons
 	use_icons = False
+    use_bg = False
+    bg_Xpath = False
+	theme = "gnome"
 	lang = os.getenv("LANG","C")
 	file = os.path.expanduser("~/.fluxbox/menu")
+	do_submenu = False
+	use_stdout = False
 	
 	try:
-		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout"])
+		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout",\
+			"theme=","submenu","with-backgrounds","backgrounds-only","bg-path="])
+
 	except getopt.GetoptError:
 		usage()
 		sys.exit(2)
@@ -175,50 +210,51 @@
 		elif opt in ("-f", "--file"):
 			file = os.path.expanduser(arg)
 		elif opt == '--with-icons':
-			use_icons = True		
-			global paths
-			locations = \
-			['/usr/share/pixmaps/', \
-			'/usr/share/icons/hicolor/24x24/apps/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/hicolor/48x48/apps/', \
-			'/usr/share/icons/hicolor/24x24/stock/generic/', \
-			'/usr/share/icons/HighContrastLargePrintInverse/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/16x16/apps/', \
-			'/usr/share/icons/crystalsvg/32x32/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/devices/', \
-			'/usr/share/icons/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/Bluecurve/24x24/stock/', \
-			'/usr/share/icons/Bluecurve/48x48/filesystems/']
-			paths=locations
-#			for path in locations:
-#				paths+=glob.glob(path+"/*/")+glob.glob(path+"/*/*/")
-#			print paths
+			use_icons = True
+		elif opt in ("-t", "--theme"):
+			theme = arg
+		elif opt == '--stdout':
+			use_stdout = True
 		elif opt == '--stdout':
 			file = sys.stdout
-
-
-	fsock = open(file,'w')
-	saveout = sys.stdout
-	sys.stdout = fsock
+		elif opt == '--bg-path':
+		    bg_Xpath = True
+			xPath = os.path.expanduser(arg)
+		elif opt == '--with-backgrounds':
+		    use_bg = True
+		elif opt == '--backgrounds-only':
+		    if bg_Xpath:
+			    get_bgimgs_and_parse(xPath)
+			else:
+			    get_bgimgs_and_parse(None)
+				raise SystemExit
+			  
+		elif opt == '--submenu':
+			do_submenu = True
+
+	if not use_stdout:
+		fsock = open(file,'w')
+		saveout = sys.stdout
+		sys.stdout = fsock
 
 	menu=xdg.Menu.parse()
 # is done automatically now
 #	menu.setLocale(lang)
 
-	print header()
-	parseMenu(menu)
-	print footer()
+	if not do_submenu:
+        print header()
+	parseMenu(menu,wm,use_icons,theme)
+	if not do_submenu and use_bg and bg_Xpath:
+	    get_bgimgs_and_parse(xPath) 
+	    print "[include] (~/.fluxbox/bgmenu)"
+	if not do_submenu and use_bg and not bg_Xpath:
+	    print "[include] (~/.fluxbox/bgmenu)"
+		get_bgimgs_and_parse(None)
+    if not do_submenu:
+        print footer()
+	if not use_stdout:
+		sys.stdout = saveout
 
-	sys.stdout = saveout
 #	print menu
 if __name__ == "__main__":
 	main(sys.argv[1:])
-
-#WindowMaker Reminder
-#>>> p=re.compile("(\).*),(\s*\))")
-#>>> p.search("((ola),(ola),)").groups()
-#('),(ola)', ')')
-


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fluxbox.spec	13 Sep 2006 04:31:23 -0000	1.20
+++ fluxbox.spec	21 Oct 2006 09:38:14 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -11,7 +11,6 @@
 Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.1.tar.bz2
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
-Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -42,7 +41,6 @@
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure      --enable-xft \
@@ -63,7 +61,7 @@
 
 # this is for Fedora Core
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
-install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
+install -m 0644 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
 install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu
 
 %clean
@@ -78,6 +76,10 @@
 %{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-3
+- fix #209347,#196106, and #187740
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15.1-2
 - FE6 rebuild


--- fluxbox-menu.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 09:38:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:38:43 -0700
Subject: rpms/fluxbox/FC-4 fluxbox-xdg-menu.py, 1.2, 1.3 fluxbox.spec, 1.17, 
	1.18 fluxbox-menu.patch, 1.1, NONE
Message-ID: <200610210938.k9L9chjC001654@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585/FC-4

Modified Files:
	fluxbox-xdg-menu.py fluxbox.spec 
Removed Files:
	fluxbox-menu.patch 
Log Message:
- fix #209347 and #187740
- fc{5,6} fix #196106 



Index: fluxbox-xdg-menu.py
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox-xdg-menu.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fluxbox-xdg-menu.py	5 Apr 2006 21:19:29 -0000	1.2
+++ fluxbox-xdg-menu.py	21 Oct 2006 09:38:12 -0000	1.3
@@ -1,20 +1,34 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
+# vim: noexpandtab:ts=4:sts=4
+
 """Menu Generator for Fluxbox
 
 Generates a menu for Fluxbox using the freedesktop.org standards
 
-Usage: fluxbox-fdo-menugen.py [options]
+Usage: fluxbox-xdg-menu.py [options]
 
 Options:
   -l ..., --lang=...      create the menu using a language. Default = $LANG
   -h, --help              show this help
   -f ..., --file=...      output the menu into a file. Default = ~/.fluxbox/menu
-  --with-icons         do not put icons for applications in the menu
+  -t ..., --theme=...     what icon theme you want to use
+  --with-icons            put icons for applications in the menu
   --stdout                output the menu to standard output
+  --submenu               output to be used as an include/submenu with fluxbox
+  --with-backgrounds      creates a background menu. Default background_paths = 
+                          ~/.fluxbox/backgrounds, /usr/share/wallpapers,
+                          /usr/share/backgrounds
+  --backgrounds-only      do not regenerate menu, only do the bg menu.
+  --bg-path=              path to location to look for images 
+                          example: --bg-path=~/pics  
+			  may be used with --backgrounds-only but --bg-path= 
+			  must be first: --bg-path=~/some/path --backgrounds-only
 
+A nice example string to use: fluxbox-fdo-menugen.py --with-icons --with-backgrounds --bg-path=~/some/path
+To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --backgrounds-only
 """
 
-__author__ = "Rudolf Kastl , Antonio Gomes"
+__author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice"
 __version__ = "$Revision$"
 __date__ = "$Date$"
 __license__ = "GPL"
@@ -22,6 +36,7 @@
 
 import os,re,sys,glob,getopt
 import xdg.Menu,xdg.DesktopEntry,xdg.IconTheme
+from os.path import isfile
 
 def usage():
 	print __doc__
@@ -31,7 +46,7 @@
 [begin] (Fluxbox)
 	[exec] (Web Browser) {htmlview}
 	[exec] (Email) {evolution}
-	[exec] (Terminal) {gnome-terminal}
+	[exec] (Terminal) {$TERM}
 	[exec] (Irc) {xchat}
 	[separator]\n"""
 
@@ -78,66 +93,31 @@
 			else:
 				entry.Show = True 
 	
-#def findIcon(icon):
-#	"""Finds the path and filename for the given icon name
-#		e.g. gaim --> /usr/share/pixmaps/gaim.png
-#		e.g. fart.png --> /usr/share/pixmaps/fart.png
-#	"""
-#	if os.path.isfile(icon): return icon
-#	paths = ["~/.icons","/usr/share/pixmaps","/usr/share/icons"]
-#	for path in paths:
-#		for dirpath , dirnames, filenames in os.walk(os.path.expanduser(path)):
-#			for filename in filenames:
-#				pattern = '^%s\.(png|jpg|gif|xpm)' % icon # matches <filename>.<something>
-#				if icon == filename or re.search(pattern, filename):
-#					return os.path.join(dirpath,filename)
-
-
-def findIcon(icon):
+def findIcon(icon, theme):
 	"""Finds the path and filename for the given icon name
 		e.g. gaim --> /usr/share/pixmaps/gaim.png
 		e.g. fart.png --> /usr/share/pixmaps/fart.png
 	"""
-	global paths
-	global locs
-
-	# Case Icon=/path/to/file.extension
-	if os.path.isfile(icon): return icon
-
-
-	# Case Icon=file.extension	
-
-	if re.search("^\w+.*\.\w{3}$",icon):
-		names=[icon]
-	# Case Icon=file
-	elif re.search("^\w+.*$",icon):
-		names=[icon+".png",icon+".xpm",icon+".jpg"]
-	else:
-		names=[]
+	retval=str(xdg.IconTheme.getIconPath(icon, 48, theme))
+	if retval == "None":
+		retval=""
 
-	for path in paths:	
-		for name in names:
-			if (os.path.isfile(path+name)):
-				locs.append(path)
-				return (path+name).encode('utf8')
+	return (retval + "").encode('utf8')
 
-
-def parseMenu(menu,depth=1):
-	global wm
-	global use_icons
+def parseMenu(menu,wm,use_icons,theme,depth=1):
 	if use_icons:
-		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'), findIcon(menu.getIcon()) )
+		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'),  findIcon(menu.getIcon(), theme) )
 	else:
 		print "%s[submenu] (%s) " % ( (depth*"\t"), menu.getName().encode('utf8'), )
 	depth += 1
 	for entry in menu.getEntries():
 		if isinstance(entry, xdg.Menu.Menu):
-			parseMenu(entry,depth)
+			parseMenu(entry,wm,use_icons,theme,depth)
 		elif isinstance(entry, xdg.Menu.MenuEntry):
 			checkWm(entry,wm)
 			if entry.Show == False: continue
 			if use_icons:
-				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon()) )
+				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) )
 			else:
 				print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] )
 		elif isinstance(entry,xdg.Menu.Separator):
@@ -147,22 +127,77 @@
 	depth -= 1
 	print "%s[end]" % (depth*"\t")
 
+def get_bgimgs_and_parse(xPath):
+    try:
+        if isfile(os.path.expanduser("~/.fluxbox/bgmenu")) == True:
+            os.unlink(os.path.expanduser("~/.fluxbox/bgmenu"))
+    except OSError:
+        pass
+    h = {}
+    bg_paths =["~/.fluxbox/backgrounds","/usr/share/wallpapers",
+		"/usr/share/backgrounds","/usr/share/backgrounds/images"]
+    try:
+        if xPath == None:
+           pass
+        else:
+            bg_paths.append(xPath)
+    except(TypeError):
+        pass
+    for dir in bg_paths:
+        for imgpth in bg_paths:
+            try:
+                imgs = os.listdir(os.path.expanduser(imgpth))
+                for i in imgs:
+                    h[i] = imgpth
+            except (OSError):
+                pass
+    bgMenu = open(os.path.expanduser("~/.fluxbox/bgmenu"),'w+')
+    num = len(h)
+    countNum = 1
+    bgPagCk = 1
+    bgPgNum = 1
+    bgMenu.write( "[submenu] (Backgrounds)\n" )
+    bgMenu.write( "[submenu] (Backgrounds) {Set Your Background}\n" )
+    bgMenu.write("\t[exec]  (Random Image)  {fbsetbg -r ~/.fluxbox/backgrounds}\n")
+	types = ["png","jpg","jpeg","gif"]
+    for i in h.keys():
+	    try:
+		    t = i.split(".")[-1].lower()
+			if t in types:
+			    print "Hello"
+			    bgMenu.write( "\t[exec]\t("+ i +") {fbsetbg -f "+ h[i] + "/" + i +"}\n" )
+				countNum = countNum + 1
+				num = num - 1
+				bgPagCk = bgPagCk + 1
+				if bgPagCk == 26:
+				    bgPgNum = bgPgNum + 1
+					bgMenu.write("[end]\n[submenu] (Backgrounds " + str(bgPgNum) +") \
+						{Set Your Background}\n")
+					bgPagCk = 1
+				if num == 0:
+				    bgMenu.write( "[end]\n[end]\n" )
+					bgMenu.close()
+		except(KeyError):
+		    print h[i]
+		    pass
 
 def main(argv):
 # Setting the default values
-	global locs
-	locs=[]
-	global wm
 	wm = "fluxbox"
-	global file
 	file = "~/.fluxbox/menu"
-	global use_icons
 	use_icons = False
+    use_bg = False
+    bg_Xpath = False
+	theme = "gnome"
 	lang = os.getenv("LANG","C")
 	file = os.path.expanduser("~/.fluxbox/menu")
+	do_submenu = False
+	use_stdout = False
 	
 	try:
-		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout"])
+		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout",\
+			"theme=","submenu","with-backgrounds","backgrounds-only","bg-path="])
+
 	except getopt.GetoptError:
 		usage()
 		sys.exit(2)
@@ -175,50 +210,51 @@
 		elif opt in ("-f", "--file"):
 			file = os.path.expanduser(arg)
 		elif opt == '--with-icons':
-			use_icons = True		
-			global paths
-			locations = \
-			['/usr/share/pixmaps/', \
-			'/usr/share/icons/hicolor/24x24/apps/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/hicolor/48x48/apps/', \
-			'/usr/share/icons/hicolor/24x24/stock/generic/', \
-			'/usr/share/icons/HighContrastLargePrintInverse/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/16x16/apps/', \
-			'/usr/share/icons/crystalsvg/32x32/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/devices/', \
-			'/usr/share/icons/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/Bluecurve/24x24/stock/', \
-			'/usr/share/icons/Bluecurve/48x48/filesystems/']
-			paths=locations
-#			for path in locations:
-#				paths+=glob.glob(path+"/*/")+glob.glob(path+"/*/*/")
-#			print paths
+			use_icons = True
+		elif opt in ("-t", "--theme"):
+			theme = arg
+		elif opt == '--stdout':
+			use_stdout = True
 		elif opt == '--stdout':
 			file = sys.stdout
-
-
-	fsock = open(file,'w')
-	saveout = sys.stdout
-	sys.stdout = fsock
+		elif opt == '--bg-path':
+		    bg_Xpath = True
+			xPath = os.path.expanduser(arg)
+		elif opt == '--with-backgrounds':
+		    use_bg = True
+		elif opt == '--backgrounds-only':
+		    if bg_Xpath:
+			    get_bgimgs_and_parse(xPath)
+			else:
+			    get_bgimgs_and_parse(None)
+				raise SystemExit
+			  
+		elif opt == '--submenu':
+			do_submenu = True
+
+	if not use_stdout:
+		fsock = open(file,'w')
+		saveout = sys.stdout
+		sys.stdout = fsock
 
 	menu=xdg.Menu.parse()
 # is done automatically now
 #	menu.setLocale(lang)
 
-	print header()
-	parseMenu(menu)
-	print footer()
+	if not do_submenu:
+        print header()
+	parseMenu(menu,wm,use_icons,theme)
+	if not do_submenu and use_bg and bg_Xpath:
+	    get_bgimgs_and_parse(xPath) 
+	    print "[include] (~/.fluxbox/bgmenu)"
+	if not do_submenu and use_bg and not bg_Xpath:
+	    print "[include] (~/.fluxbox/bgmenu)"
+		get_bgimgs_and_parse(None)
+    if not do_submenu:
+        print footer()
+	if not use_stdout:
+		sys.stdout = saveout
 
-	sys.stdout = saveout
 #	print menu
 if __name__ == "__main__":
 	main(sys.argv[1:])
-
-#WindowMaker Reminder
-#>>> p=re.compile("(\).*),(\s*\))")
-#>>> p.search("((ola),(ola),)").groups()
-#('),(ola)', ')')
-


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fluxbox.spec	5 Apr 2006 21:19:29 -0000	1.17
+++ fluxbox.spec	21 Oct 2006 09:38:12 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -13,7 +13,6 @@
 Source2:        FluxBox
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
-Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -35,7 +34,6 @@
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure      --enable-xft \
@@ -80,6 +78,10 @@
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-2
+- fix #187740 and #209347
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15.1-1
 - version upgrade


--- fluxbox-menu.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 10:12:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 03:12:01 -0700
Subject: rpms/koffice-langpack/FC-4 .cvsignore, 1.6,
	1.7 koffice-langpack.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200610211012.k9LAC1Rc004916@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice-langpack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4856/FC-4

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Aug 2006 10:10:42 -0000	1.6
+++ .cvsignore	21 Oct 2006 10:11:31 -0000	1.7
@@ -47,3 +47,35 @@
 koffice-l10n-uz-1.5.2.tar.bz2
 koffice-l10n-zh_CN-1.5.2.tar.bz2
 koffice-l10n-zh_TW-1.5.2.tar.bz2
+koffice-l10n-ca-1.6.0.tar.bz2
+koffice-l10n-cs-1.6.0.tar.bz2
+koffice-l10n-cy-1.6.0.tar.bz2
+koffice-l10n-da-1.6.0.tar.bz2
+koffice-l10n-de-1.6.0.tar.bz2
+koffice-l10n-el-1.6.0.tar.bz2
+koffice-l10n-en_GB-1.6.0.tar.bz2
+koffice-l10n-es-1.6.0.tar.bz2
+koffice-l10n-et-1.6.0.tar.bz2
+koffice-l10n-eu-1.6.0.tar.bz2
+koffice-l10n-fi-1.6.0.tar.bz2
+koffice-l10n-fr-1.6.0.tar.bz2
+koffice-l10n-hu-1.6.0.tar.bz2
+koffice-l10n-it-1.6.0.tar.bz2
+koffice-l10n-ja-1.6.0.tar.bz2
+koffice-l10n-lv-1.6.0.tar.bz2
+koffice-l10n-ms-1.6.0.tar.bz2
+koffice-l10n-nb-1.6.0.tar.bz2
+koffice-l10n-nl-1.6.0.tar.bz2
+koffice-l10n-pl-1.6.0.tar.bz2
+koffice-l10n-pt-1.6.0.tar.bz2
+koffice-l10n-pt_BR-1.6.0.tar.bz2
+koffice-l10n-ru-1.6.0.tar.bz2
+koffice-l10n-sk-1.6.0.tar.bz2
+koffice-l10n-sl-1.6.0.tar.bz2
+koffice-l10n-sr-1.6.0.tar.bz2
+koffice-l10n-sr at Latn-1.6.0.tar.bz2
+koffice-l10n-sv-1.6.0.tar.bz2
+koffice-l10n-tr-1.6.0.tar.bz2
+koffice-l10n-uk-1.6.0.tar.bz2
+koffice-l10n-zh_CN-1.6.0.tar.bz2
+koffice-l10n-zh_TW-1.6.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/koffice-langpack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- koffice-langpack.spec	3 Aug 2006 10:10:42 -0000	1.6
+++ koffice-langpack.spec	21 Oct 2006 10:11:31 -0000	1.7
@@ -1,60 +1,43 @@
 Name:           koffice-langpack
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-af-1.5.2.tar.bz2
-Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ar-1.5.2.tar.bz2
-Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bg-1.5.2.tar.bz2
-Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-br-1.5.2.tar.bz2
-Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bs-1.5.2.tar.bz2
-Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ca-1.5.2.tar.bz2
-Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cs-1.5.2.tar.bz2
-Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cy-1.5.2.tar.bz2
-Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-da-1.5.2.tar.bz2
-Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-de-1.5.2.tar.bz2
-Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-el-1.5.2.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-en_GB-1.5.2.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eo-1.5.2.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-es-1.5.2.tar.bz2
-Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-et-1.5.2.tar.bz2
-Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eu-1.5.2.tar.bz2
-Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fi-1.5.2.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fr-1.5.2.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ga-1.5.2.tar.bz2
-Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-he-1.5.2.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hi-1.5.2.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hu-1.5.2.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-is-1.5.2.tar.bz2
-Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-it-1.5.2.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ja-1.5.2.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-lt-1.5.2.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-mk-1.5.2.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nb-1.5.2.tar.bz2
-Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nl-1.5.2.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nn-1.5.2.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pl-1.5.2.tar.bz2
-Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt-1.5.2.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt_BR-1.5.2.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ro-1.5.2.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ru-1.5.2.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-se-1.5.2.tar.bz2
-Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sk-1.5.2.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sl-1.5.2.tar.bz2
-Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr-1.5.2.tar.bz2
-Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.2.tar.bz2
-Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sv-1.5.2.tar.bz2
-Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ta-1.5.2.tar.bz2
-Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tg-1.5.2.tar.bz2
-Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tr-1.5.2.tar.bz2
-Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uk-1.5.2.tar.bz2
-Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uz-1.5.2.tar.bz2
-Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_CN-1.5.2.tar.bz2
-Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ms-1.5.2.tar.bz2
-Source48:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_TW-1.5.2.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ca-1.6.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cs-1.6.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cy-1.6.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-da-1.6.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-de-1.6.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-el-1.6.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-en_GB-1.6.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-es-1.6.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-et-1.6.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-eu-1.6.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fi-1.6.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fr-1.6.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-hu-1.6.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-it-1.6.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ja-1.6.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-lv-1.6.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nb-1.6.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nl-1.6.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pl-1.6.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt-1.6.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt_BR-1.6.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ru-1.6.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sk-1.6.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sl-1.6.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr-1.6.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.6.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sv-1.6.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-tr-1.6.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-uk-1.6.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_CN-1.6.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ms-1.6.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_TW-1.6.0.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,46 +49,46 @@
 %description
 Language files for koffice
 
-%package af
-Summary:        Afrikaans language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description ar
-Provides additional arabic translations for koffice
+#%package af
+#Summary:        Afrikaans language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description ar
+#Provides additional arabic translations for koffice
+
+#%package bs
+#Summary:        Bosnian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description br
+#Provides additional breton translations for koffice
+
+
+#%package bg
+#Summary:        Bulgarian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%package bs
-Summary:        Bosnian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description br
-Provides additional breton translations for koffice
-
-
-%package bg
-Summary:        Bulgarian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description bg
-Provides additional bulgarian translations for koffice
+#%description bg
+#Provides additional bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
@@ -147,13 +130,13 @@
 %description de
 Provides additional german translations for koffice
 
-%package eo
-Summary:        Esperanto language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package eo
+#Summary:        Esperanto language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description eo
-Provides additional esperanto translations for koffice
+#%description eo
+#Provides additional esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
@@ -213,29 +196,29 @@
 %description fr
 Provides additional french translations for koffice
 
-%package ga
-Summary:        Irish language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package ga
+#Summary:        Irish language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description ga
+#Provides additional irish translations for koffice
+
+#%package he
+#Summary:        Hebrew language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description ga
-Provides additional irish translations for koffice
-
-%package he
-Summary:        Hebrew language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description hi
-Provides additional hindi translations for koffice
+#%description hi
+#Provides additional hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
@@ -245,13 +228,13 @@
 %description hu
 Provides additional hungarian translations for koffice
 
-%package is
-Summary:        Icelandic language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package is
+#Summary:        Icelandic language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description is
-Provides additional icelandic translations for koffice
+#%description is
+#Provides additional icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
@@ -269,21 +252,21 @@
 %description ja
 Provides additional japanese translations for koffice
 
-%package lt
-Summary:        Lithuanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description lt
-Provides additional lithuanian translations for koffice
-
-%package mk
-Summary:        Macedonian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package lt
+#Summary:        Lithuanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description lt
+#Provides additional lithuanian translations for koffice
+
+#%package mk
+#Summary:        Macedonian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description mk
-Provides additional macedonian translations for koffice
+#%description mk
+#Provides additional macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
@@ -309,13 +292,13 @@
 %description nl
 Provides additional dutch translations for koffice
 
-%package nn
-Summary:        Nynorsk language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package nn
+#Summary:        Nynorsk language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description nn
-Provides additional nynorsk translations for koffice
+#%description nn
+#Provides additional nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
@@ -349,20 +332,21 @@
 %description ru
 Provides additional russian translations for koffice
 
-%package ro
-Summary:        Romanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
+#%package ro
+#Summary:        Romanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description se
-Provides additional northern sami translations for koffice
+#%description se
+#Provides additional northern sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
@@ -404,21 +388,21 @@
 %description sv
 Provides additional Swedish translations for koffice
 
-%package ta
-Summary:        Tamil language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description ta
-Provides additional tamil translations for koffice
+#%package ta
+#Summary:        Tamil language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%package tg
-Summary:        Tajik language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description tg
-Provides additional tajik translations for koffice
+#%description tg
+#Provides additional tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
@@ -436,13 +420,13 @@
 %description uk
 Provides additional ukrainian translations for koffice
 
-%package uz
-Summary:        Uzbek language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package uz
+#Summary:        Uzbek language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description uz
-Provides additional uzbek translations for koffice
+#%description uz
+#Provides additional uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
@@ -460,11 +444,18 @@
 %description zh_TW
 Provides additional traditional chinese translations for koffice
 
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description lv
+Provides additional lativian translations for koffice
+
 %prep
 %{__mkdir_p} %{_builddir}/%{name}-%{version}
 cd %{_builddir}/%{name}-%{version}
 
-%{__tar} xjvf %{SOURCE0}
 %{__tar} xjvf %{SOURCE1}
 %{__tar} xjvf %{SOURCE2}
 %{__tar} xjvf %{SOURCE3}
@@ -497,28 +488,12 @@
 %{__tar} xjvf %{SOURCE30}
 %{__tar} xjvf %{SOURCE31}
 %{__tar} xjvf %{SOURCE32}
-%{__tar} xjvf %{SOURCE33}
-%{__tar} xjvf %{SOURCE34}
-%{__tar} xjvf %{SOURCE35}
-%{__tar} xjvf %{SOURCE36}
-%{__tar} xjvf %{SOURCE37}
-%{__tar} xjvf %{SOURCE38}
-%{__tar} xjvf %{SOURCE39}
-%{__tar} xjvf %{SOURCE40}
-%{__tar} xjvf %{SOURCE41}
-%{__tar} xjvf %{SOURCE42}
-%{__tar} xjvf %{SOURCE43}
-%{__tar} xjvf %{SOURCE44}
-%{__tar} xjvf %{SOURCE45}
-%{__tar} xjvf %{SOURCE46}
-%{__tar} xjvf %{SOURCE47}
-%{__tar} xjvf %{SOURCE48}
 
 %build
 # dont work: et
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -527,9 +502,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -554,26 +529,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files af
-%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%files ar
-%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-
-%files bg
-%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-
-%files br
-%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-
-%files bs
-%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
@@ -608,10 +563,6 @@
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
 
-%files eo
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-
 %files es
 %defattr(-,root,root,-)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
@@ -637,44 +588,24 @@
 %lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
 %lang(fr) %{_datadir}/doc/HTML/fr/*
 
-%files ga
-%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
-
-%files he
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-
-%files hi
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-
 %files hu
 %defattr(-,root,root,-)
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
 
-%files is
-%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
-
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
 %lang(it) %{_datadir}/doc/HTML/it/*
 
-%files ja
-%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%files lt
+%files lv
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
 
-%files mk
+%files ja
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
 %files ms
 %defattr(-,root,root,-)
@@ -689,11 +620,6 @@
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
 %lang(nl) %{_datadir}/doc/HTML/nl/*
 
-%files nn
-%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
-%lang(nn) %{_datadir}/apps/koffice/autocorrect/nn.xml
-
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
@@ -708,19 +634,11 @@
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %{_datadir}/doc/HTML/pt/*
 
-%files ro
-%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
-
 %files ru
 %defattr(-,root,root,-)
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %{_datadir}/doc/HTML/ru/*
 
-%files se
-%defattr(-,root,root,-)
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-
 %files sk
 %defattr(-,root,root,-)
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
@@ -745,14 +663,6 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/doc/HTML/sv/*
 
-%files ta
-%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-
-%files tg
-%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-
 %files tr
 %defattr(-,root,root,-)
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
@@ -761,10 +671,6 @@
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 
-%files uz
-%defattr(-,root,root,-)
-%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/*
-
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
@@ -774,6 +680,10 @@
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Aug 2006 10:10:42 -0000	1.6
+++ sources	21 Oct 2006 10:11:31 -0000	1.7
@@ -1,49 +1,32 @@
-c7a48bb275230d1152e29c67a869daee  koffice-l10n-af-1.5.2.tar.bz2
-a35e9b3f75265488ca400469f23a5a91  koffice-l10n-ar-1.5.2.tar.bz2
-b8be1348ffab32d826c358d44de68c5e  koffice-l10n-bg-1.5.2.tar.bz2
-fd0738d2c9538994de3573ec00964cf1  koffice-l10n-br-1.5.2.tar.bz2
-b7de9b93298aba597d9d8f8da038fc37  koffice-l10n-bs-1.5.2.tar.bz2
-8e3ff02096b6574cf337430924d5af98  koffice-l10n-ca-1.5.2.tar.bz2
-b8f83541b98ff0cb8361f797f665971c  koffice-l10n-cs-1.5.2.tar.bz2
-64782ef55dbdfbbc3672b613dc7f5faf  koffice-l10n-cy-1.5.2.tar.bz2
-58c13527c47dee445572d26141fd3269  koffice-l10n-da-1.5.2.tar.bz2
-ef007ab98ffe65ce072a9245f51b01e1  koffice-l10n-de-1.5.2.tar.bz2
-4392e652560adb8c83fe2aac9479fcb8  koffice-l10n-el-1.5.2.tar.bz2
-11b499953ae1616c589e793abc4e474b  koffice-l10n-en_GB-1.5.2.tar.bz2
-c7025f7d946342267943fd146a5cc19c  koffice-l10n-eo-1.5.2.tar.bz2
-fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc  koffice-l10n-es-1.5.2.tar.bz2
-fed89528182c0dc7baa2c50fee165270  koffice-l10n-et-1.5.2.tar.bz2
-3e15c7433f91486d8b76eefb19990a74  koffice-l10n-eu-1.5.2.tar.bz2
-de6a7a2b2b2edc1a4eaad7523b1bab39  koffice-l10n-fi-1.5.2.tar.bz2
-8f868a919c6ccb66b719196d3e842910  koffice-l10n-fr-1.5.2.tar.bz2
-b8b4d4cbb0ff29bc0da4954eb9ba4e13  koffice-l10n-ga-1.5.2.tar.bz2
-a0368a287bf2a3566b802ffe6de8b472  koffice-l10n-he-1.5.2.tar.bz2
-95a4edd9df2b1c4744ae0b590d68822a  koffice-l10n-hi-1.5.2.tar.bz2
-cd57e11f100ffabf6a3c72faa6433569  koffice-l10n-hu-1.5.2.tar.bz2
-e3b5ec6948dea217e79d3c692d3e3bd3  koffice-l10n-is-1.5.2.tar.bz2
-9658442039b455e52cf68599e3250f54  koffice-l10n-it-1.5.2.tar.bz2
-7eb7880c8e03a8c905a7bba06423fdde  koffice-l10n-ja-1.5.2.tar.bz2
-bf8fb56e3b2ab401d4b3ac9e19ad30f4  koffice-l10n-lt-1.5.2.tar.bz2
-8f9a9ccea194653be186517c0879fe8c  koffice-l10n-mk-1.5.2.tar.bz2
-617ab3344f714fa9109875bc50b79502  koffice-l10n-ms-1.5.2.tar.bz2
-02adef48c63e4a9f87fed63cefb19d1d  koffice-l10n-nb-1.5.2.tar.bz2
-9847ff8d7dbddf4c2f1ae4a6cb0694d1  koffice-l10n-nl-1.5.2.tar.bz2
-9926f8aa4449e839d40f97e7c621de96  koffice-l10n-nn-1.5.2.tar.bz2
-193d09145eea9136067676b6d74ab5f9  koffice-l10n-pl-1.5.2.tar.bz2
-f8d4e8990e1f24ef6076de1c9698458f  koffice-l10n-pt-1.5.2.tar.bz2
-bba591e0460c4a0169c07c3d5ae5b118  koffice-l10n-pt_BR-1.5.2.tar.bz2
-22d91909560288e7dd79a3db6e2aab42  koffice-l10n-ro-1.5.2.tar.bz2
-e0a809bf7c9202cf5eebaaa93999f4f3  koffice-l10n-ru-1.5.2.tar.bz2
-8fa484cd096f3f8461c054bad31c3601  koffice-l10n-se-1.5.2.tar.bz2
-a7dbf6b5fa42d0cdee1f0928cbaadfd0  koffice-l10n-sk-1.5.2.tar.bz2
-e5fe2c8a350ba2636f4bd8dd2168b017  koffice-l10n-sl-1.5.2.tar.bz2
-2717a1e1e1ff92d1e962e3b69625e906  koffice-l10n-sr-1.5.2.tar.bz2
-f7774ad33c0efb072653495894865e0e  koffice-l10n-sr at Latn-1.5.2.tar.bz2
-83f73110f60ef4b5f633e3cca0dd4e12  koffice-l10n-sv-1.5.2.tar.bz2
-3f0ce9e790415b90daf43c35736a62e7  koffice-l10n-ta-1.5.2.tar.bz2
-add764f98fd61d74bf0886f4bfe7808f  koffice-l10n-tg-1.5.2.tar.bz2
-6b7df893cae7725ca94979a4dcd73edf  koffice-l10n-tr-1.5.2.tar.bz2
-a31dc3319a452ae7d2d689ac50a73bb0  koffice-l10n-uk-1.5.2.tar.bz2
-259739c2bde6d4fb890915cf7f3358c9  koffice-l10n-uz-1.5.2.tar.bz2
-e2de60faab2bc7049e2b4af6827cbe8e  koffice-l10n-zh_CN-1.5.2.tar.bz2
-a39dcaf36d9361d2915399ee0dce0cc0  koffice-l10n-zh_TW-1.5.2.tar.bz2
+b90e14bd3508bcc030096496ea87683a  koffice-l10n-ca-1.6.0.tar.bz2
+21f9a7c3daf57aabf70111dded8a26a6  koffice-l10n-cs-1.6.0.tar.bz2
+b1d03624474b91becd3ff64647f45087  koffice-l10n-cy-1.6.0.tar.bz2
+d1532dc1107f01752a9eeeb362666289  koffice-l10n-da-1.6.0.tar.bz2
+21344257dcd9b418898fb5e348918171  koffice-l10n-de-1.6.0.tar.bz2
+c00bbbf55de2d5d8aa68916ef6618ee3  koffice-l10n-el-1.6.0.tar.bz2
+eb4582f359eaada24a1dd96443636219  koffice-l10n-en_GB-1.6.0.tar.bz2
+81db059841e59cfee6371d10b12e82d7  koffice-l10n-es-1.6.0.tar.bz2
+64b4dd81d61362599af0882d695dd175  koffice-l10n-et-1.6.0.tar.bz2
+c3c5dbfe0135896c41f749ff79c6744e  koffice-l10n-eu-1.6.0.tar.bz2
+738bf409e16c08018b75f672abcb94a4  koffice-l10n-fi-1.6.0.tar.bz2
+96a5871374f69c694be87e621f04f39e  koffice-l10n-fr-1.6.0.tar.bz2
+01ea831cfbd136fecb1c7de8826e97b9  koffice-l10n-hu-1.6.0.tar.bz2
+73f17287697e54e61237a8cf7f6fc75f  koffice-l10n-it-1.6.0.tar.bz2
+dd3f979c03f9bc4ae6393a54766b4a84  koffice-l10n-ja-1.6.0.tar.bz2
+af51669631e18feef464e8d6778a41ad  koffice-l10n-lv-1.6.0.tar.bz2
+259be59d9bfe0e7fba7d96c1b5740614  koffice-l10n-ms-1.6.0.tar.bz2
+ef631712fe58e8129823b0f53253e153  koffice-l10n-nb-1.6.0.tar.bz2
+b9c572b04701226fdce5e9ae5817177c  koffice-l10n-nl-1.6.0.tar.bz2
+aaa167a7881f383b88696d34fd1903a5  koffice-l10n-pl-1.6.0.tar.bz2
+c907923d13d2e2d15e09ac5be9259c96  koffice-l10n-pt-1.6.0.tar.bz2
+8d1be2180acdba3287c2936cc379b4c6  koffice-l10n-pt_BR-1.6.0.tar.bz2
+0b895c8a86f0b3c6f31903c906e0dd08  koffice-l10n-ru-1.6.0.tar.bz2
+3bdbfb8532c3a3422345ff8693544b29  koffice-l10n-sk-1.6.0.tar.bz2
+6dfa4b30a8d246a46dddef1e3933cf36  koffice-l10n-sl-1.6.0.tar.bz2
+69681fe0a95a61b88aa5b9ee226fc320  koffice-l10n-sr-1.6.0.tar.bz2
+8ce2f6edd23a43b079fbec9c20cfe516  koffice-l10n-sr at Latn-1.6.0.tar.bz2
+774efb0a9c02776c58ca6cfe1930d327  koffice-l10n-sv-1.6.0.tar.bz2
+d941eddab83cc8991d4f218854d25f64  koffice-l10n-tr-1.6.0.tar.bz2
+b29bea37e37917edb45cfde8c48b50f7  koffice-l10n-uk-1.6.0.tar.bz2
+a3fda356e170368d7fd88d0ce892307b  koffice-l10n-zh_CN-1.6.0.tar.bz2
+17ec8363abee3dd45c1a4c103b023ff3  koffice-l10n-zh_TW-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 10:12:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 03:12:02 -0700
Subject: rpms/koffice-langpack/FC-5 .cvsignore, 1.6,
	1.7 koffice-langpack.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200610211012.k9LAC25I004921@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice-langpack/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4856/FC-5

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Aug 2006 10:10:42 -0000	1.6
+++ .cvsignore	21 Oct 2006 10:11:32 -0000	1.7
@@ -47,3 +47,35 @@
 koffice-l10n-uz-1.5.2.tar.bz2
 koffice-l10n-zh_CN-1.5.2.tar.bz2
 koffice-l10n-zh_TW-1.5.2.tar.bz2
+koffice-l10n-ca-1.6.0.tar.bz2
+koffice-l10n-cs-1.6.0.tar.bz2
+koffice-l10n-cy-1.6.0.tar.bz2
+koffice-l10n-da-1.6.0.tar.bz2
+koffice-l10n-de-1.6.0.tar.bz2
+koffice-l10n-el-1.6.0.tar.bz2
+koffice-l10n-en_GB-1.6.0.tar.bz2
+koffice-l10n-es-1.6.0.tar.bz2
+koffice-l10n-et-1.6.0.tar.bz2
+koffice-l10n-eu-1.6.0.tar.bz2
+koffice-l10n-fi-1.6.0.tar.bz2
+koffice-l10n-fr-1.6.0.tar.bz2
+koffice-l10n-hu-1.6.0.tar.bz2
+koffice-l10n-it-1.6.0.tar.bz2
+koffice-l10n-ja-1.6.0.tar.bz2
+koffice-l10n-lv-1.6.0.tar.bz2
+koffice-l10n-ms-1.6.0.tar.bz2
+koffice-l10n-nb-1.6.0.tar.bz2
+koffice-l10n-nl-1.6.0.tar.bz2
+koffice-l10n-pl-1.6.0.tar.bz2
+koffice-l10n-pt-1.6.0.tar.bz2
+koffice-l10n-pt_BR-1.6.0.tar.bz2
+koffice-l10n-ru-1.6.0.tar.bz2
+koffice-l10n-sk-1.6.0.tar.bz2
+koffice-l10n-sl-1.6.0.tar.bz2
+koffice-l10n-sr-1.6.0.tar.bz2
+koffice-l10n-sr at Latn-1.6.0.tar.bz2
+koffice-l10n-sv-1.6.0.tar.bz2
+koffice-l10n-tr-1.6.0.tar.bz2
+koffice-l10n-uk-1.6.0.tar.bz2
+koffice-l10n-zh_CN-1.6.0.tar.bz2
+koffice-l10n-zh_TW-1.6.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/koffice-langpack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- koffice-langpack.spec	3 Aug 2006 10:10:42 -0000	1.7
+++ koffice-langpack.spec	21 Oct 2006 10:11:32 -0000	1.8
@@ -1,60 +1,43 @@
 Name:           koffice-langpack
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-af-1.5.2.tar.bz2
-Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ar-1.5.2.tar.bz2
-Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bg-1.5.2.tar.bz2
-Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-br-1.5.2.tar.bz2
-Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bs-1.5.2.tar.bz2
-Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ca-1.5.2.tar.bz2
-Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cs-1.5.2.tar.bz2
-Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cy-1.5.2.tar.bz2
-Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-da-1.5.2.tar.bz2
-Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-de-1.5.2.tar.bz2
-Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-el-1.5.2.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-en_GB-1.5.2.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eo-1.5.2.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-es-1.5.2.tar.bz2
-Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-et-1.5.2.tar.bz2
-Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eu-1.5.2.tar.bz2
-Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fi-1.5.2.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fr-1.5.2.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ga-1.5.2.tar.bz2
-Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-he-1.5.2.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hi-1.5.2.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hu-1.5.2.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-is-1.5.2.tar.bz2
-Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-it-1.5.2.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ja-1.5.2.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-lt-1.5.2.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-mk-1.5.2.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nb-1.5.2.tar.bz2
-Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nl-1.5.2.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nn-1.5.2.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pl-1.5.2.tar.bz2
-Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt-1.5.2.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt_BR-1.5.2.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ro-1.5.2.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ru-1.5.2.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-se-1.5.2.tar.bz2
-Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sk-1.5.2.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sl-1.5.2.tar.bz2
-Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr-1.5.2.tar.bz2
-Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.2.tar.bz2
-Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sv-1.5.2.tar.bz2
-Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ta-1.5.2.tar.bz2
-Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tg-1.5.2.tar.bz2
-Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tr-1.5.2.tar.bz2
-Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uk-1.5.2.tar.bz2
-Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uz-1.5.2.tar.bz2
-Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_CN-1.5.2.tar.bz2
-Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ms-1.5.2.tar.bz2
-Source48:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_TW-1.5.2.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ca-1.6.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cs-1.6.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cy-1.6.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-da-1.6.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-de-1.6.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-el-1.6.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-en_GB-1.6.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-es-1.6.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-et-1.6.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-eu-1.6.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fi-1.6.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fr-1.6.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-hu-1.6.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-it-1.6.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ja-1.6.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-lv-1.6.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nb-1.6.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nl-1.6.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pl-1.6.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt-1.6.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt_BR-1.6.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ru-1.6.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sk-1.6.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sl-1.6.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr-1.6.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.6.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sv-1.6.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-tr-1.6.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-uk-1.6.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_CN-1.6.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ms-1.6.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_TW-1.6.0.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,46 +49,46 @@
 %description
 Language files for koffice
 
-%package af
-Summary:        Afrikaans language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description ar
-Provides additional arabic translations for koffice
+#%package af
+#Summary:        Afrikaans language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description ar
+#Provides additional arabic translations for koffice
+
+#%package bs
+#Summary:        Bosnian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description br
+#Provides additional breton translations for koffice
+
+
+#%package bg
+#Summary:        Bulgarian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%package bs
-Summary:        Bosnian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description br
-Provides additional breton translations for koffice
-
-
-%package bg
-Summary:        Bulgarian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description bg
-Provides additional bulgarian translations for koffice
+#%description bg
+#Provides additional bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
@@ -147,13 +130,13 @@
 %description de
 Provides additional german translations for koffice
 
-%package eo
-Summary:        Esperanto language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package eo
+#Summary:        Esperanto language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description eo
-Provides additional esperanto translations for koffice
+#%description eo
+#Provides additional esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
@@ -213,29 +196,29 @@
 %description fr
 Provides additional french translations for koffice
 
-%package ga
-Summary:        Irish language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package ga
+#Summary:        Irish language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description ga
+#Provides additional irish translations for koffice
+
+#%package he
+#Summary:        Hebrew language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description ga
-Provides additional irish translations for koffice
-
-%package he
-Summary:        Hebrew language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description hi
-Provides additional hindi translations for koffice
+#%description hi
+#Provides additional hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
@@ -245,13 +228,13 @@
 %description hu
 Provides additional hungarian translations for koffice
 
-%package is
-Summary:        Icelandic language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package is
+#Summary:        Icelandic language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description is
-Provides additional icelandic translations for koffice
+#%description is
+#Provides additional icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
@@ -269,21 +252,21 @@
 %description ja
 Provides additional japanese translations for koffice
 
-%package lt
-Summary:        Lithuanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description lt
-Provides additional lithuanian translations for koffice
-
-%package mk
-Summary:        Macedonian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package lt
+#Summary:        Lithuanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description lt
+#Provides additional lithuanian translations for koffice
+
+#%package mk
+#Summary:        Macedonian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description mk
-Provides additional macedonian translations for koffice
+#%description mk
+#Provides additional macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
@@ -309,13 +292,13 @@
 %description nl
 Provides additional dutch translations for koffice
 
-%package nn
-Summary:        Nynorsk language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package nn
+#Summary:        Nynorsk language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description nn
-Provides additional nynorsk translations for koffice
+#%description nn
+#Provides additional nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
@@ -349,20 +332,21 @@
 %description ru
 Provides additional russian translations for koffice
 
-%package ro
-Summary:        Romanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
+#%package ro
+#Summary:        Romanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description se
-Provides additional northern sami translations for koffice
+#%description se
+#Provides additional northern sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
@@ -404,21 +388,21 @@
 %description sv
 Provides additional Swedish translations for koffice
 
-%package ta
-Summary:        Tamil language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description ta
-Provides additional tamil translations for koffice
+#%package ta
+#Summary:        Tamil language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%package tg
-Summary:        Tajik language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description tg
-Provides additional tajik translations for koffice
+#%description tg
+#Provides additional tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
@@ -436,13 +420,13 @@
 %description uk
 Provides additional ukrainian translations for koffice
 
-%package uz
-Summary:        Uzbek language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package uz
+#Summary:        Uzbek language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description uz
-Provides additional uzbek translations for koffice
+#%description uz
+#Provides additional uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
@@ -460,11 +444,18 @@
 %description zh_TW
 Provides additional traditional chinese translations for koffice
 
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description lv
+Provides additional lativian translations for koffice
+
 %prep
 %{__mkdir_p} %{_builddir}/%{name}-%{version}
 cd %{_builddir}/%{name}-%{version}
 
-%{__tar} xjvf %{SOURCE0}
 %{__tar} xjvf %{SOURCE1}
 %{__tar} xjvf %{SOURCE2}
 %{__tar} xjvf %{SOURCE3}
@@ -497,28 +488,12 @@
 %{__tar} xjvf %{SOURCE30}
 %{__tar} xjvf %{SOURCE31}
 %{__tar} xjvf %{SOURCE32}
-%{__tar} xjvf %{SOURCE33}
-%{__tar} xjvf %{SOURCE34}
-%{__tar} xjvf %{SOURCE35}
-%{__tar} xjvf %{SOURCE36}
-%{__tar} xjvf %{SOURCE37}
-%{__tar} xjvf %{SOURCE38}
-%{__tar} xjvf %{SOURCE39}
-%{__tar} xjvf %{SOURCE40}
-%{__tar} xjvf %{SOURCE41}
-%{__tar} xjvf %{SOURCE42}
-%{__tar} xjvf %{SOURCE43}
-%{__tar} xjvf %{SOURCE44}
-%{__tar} xjvf %{SOURCE45}
-%{__tar} xjvf %{SOURCE46}
-%{__tar} xjvf %{SOURCE47}
-%{__tar} xjvf %{SOURCE48}
 
 %build
 # dont work: et
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -527,9 +502,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -554,26 +529,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files af
-%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%files ar
-%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-
-%files bg
-%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-
-%files br
-%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-
-%files bs
-%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
@@ -608,10 +563,6 @@
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
 
-%files eo
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-
 %files es
 %defattr(-,root,root,-)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
@@ -637,44 +588,24 @@
 %lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
 %lang(fr) %{_datadir}/doc/HTML/fr/*
 
-%files ga
-%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
-
-%files he
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-
-%files hi
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-
 %files hu
 %defattr(-,root,root,-)
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
 
-%files is
-%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
-
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
 %lang(it) %{_datadir}/doc/HTML/it/*
 
-%files ja
-%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%files lt
+%files lv
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
 
-%files mk
+%files ja
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
 %files ms
 %defattr(-,root,root,-)
@@ -689,11 +620,6 @@
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
 %lang(nl) %{_datadir}/doc/HTML/nl/*
 
-%files nn
-%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
-%lang(nn) %{_datadir}/apps/koffice/autocorrect/nn.xml
-
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
@@ -708,19 +634,11 @@
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %{_datadir}/doc/HTML/pt/*
 
-%files ro
-%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
-
 %files ru
 %defattr(-,root,root,-)
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %{_datadir}/doc/HTML/ru/*
 
-%files se
-%defattr(-,root,root,-)
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-
 %files sk
 %defattr(-,root,root,-)
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
@@ -745,14 +663,6 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/doc/HTML/sv/*
 
-%files ta
-%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-
-%files tg
-%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-
 %files tr
 %defattr(-,root,root,-)
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
@@ -761,10 +671,6 @@
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 
-%files uz
-%defattr(-,root,root,-)
-%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/*
-
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
@@ -774,6 +680,10 @@
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Aug 2006 10:10:42 -0000	1.6
+++ sources	21 Oct 2006 10:11:32 -0000	1.7
@@ -1,49 +1,32 @@
-c7a48bb275230d1152e29c67a869daee  koffice-l10n-af-1.5.2.tar.bz2
-a35e9b3f75265488ca400469f23a5a91  koffice-l10n-ar-1.5.2.tar.bz2
-b8be1348ffab32d826c358d44de68c5e  koffice-l10n-bg-1.5.2.tar.bz2
-fd0738d2c9538994de3573ec00964cf1  koffice-l10n-br-1.5.2.tar.bz2
-b7de9b93298aba597d9d8f8da038fc37  koffice-l10n-bs-1.5.2.tar.bz2
-8e3ff02096b6574cf337430924d5af98  koffice-l10n-ca-1.5.2.tar.bz2
-b8f83541b98ff0cb8361f797f665971c  koffice-l10n-cs-1.5.2.tar.bz2
-64782ef55dbdfbbc3672b613dc7f5faf  koffice-l10n-cy-1.5.2.tar.bz2
-58c13527c47dee445572d26141fd3269  koffice-l10n-da-1.5.2.tar.bz2
-ef007ab98ffe65ce072a9245f51b01e1  koffice-l10n-de-1.5.2.tar.bz2
-4392e652560adb8c83fe2aac9479fcb8  koffice-l10n-el-1.5.2.tar.bz2
-11b499953ae1616c589e793abc4e474b  koffice-l10n-en_GB-1.5.2.tar.bz2
-c7025f7d946342267943fd146a5cc19c  koffice-l10n-eo-1.5.2.tar.bz2
-fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc  koffice-l10n-es-1.5.2.tar.bz2
-fed89528182c0dc7baa2c50fee165270  koffice-l10n-et-1.5.2.tar.bz2
-3e15c7433f91486d8b76eefb19990a74  koffice-l10n-eu-1.5.2.tar.bz2
-de6a7a2b2b2edc1a4eaad7523b1bab39  koffice-l10n-fi-1.5.2.tar.bz2
-8f868a919c6ccb66b719196d3e842910  koffice-l10n-fr-1.5.2.tar.bz2
-b8b4d4cbb0ff29bc0da4954eb9ba4e13  koffice-l10n-ga-1.5.2.tar.bz2
-a0368a287bf2a3566b802ffe6de8b472  koffice-l10n-he-1.5.2.tar.bz2
-95a4edd9df2b1c4744ae0b590d68822a  koffice-l10n-hi-1.5.2.tar.bz2
-cd57e11f100ffabf6a3c72faa6433569  koffice-l10n-hu-1.5.2.tar.bz2
-e3b5ec6948dea217e79d3c692d3e3bd3  koffice-l10n-is-1.5.2.tar.bz2
-9658442039b455e52cf68599e3250f54  koffice-l10n-it-1.5.2.tar.bz2
-7eb7880c8e03a8c905a7bba06423fdde  koffice-l10n-ja-1.5.2.tar.bz2
-bf8fb56e3b2ab401d4b3ac9e19ad30f4  koffice-l10n-lt-1.5.2.tar.bz2
-8f9a9ccea194653be186517c0879fe8c  koffice-l10n-mk-1.5.2.tar.bz2
-617ab3344f714fa9109875bc50b79502  koffice-l10n-ms-1.5.2.tar.bz2
-02adef48c63e4a9f87fed63cefb19d1d  koffice-l10n-nb-1.5.2.tar.bz2
-9847ff8d7dbddf4c2f1ae4a6cb0694d1  koffice-l10n-nl-1.5.2.tar.bz2
-9926f8aa4449e839d40f97e7c621de96  koffice-l10n-nn-1.5.2.tar.bz2
-193d09145eea9136067676b6d74ab5f9  koffice-l10n-pl-1.5.2.tar.bz2
-f8d4e8990e1f24ef6076de1c9698458f  koffice-l10n-pt-1.5.2.tar.bz2
-bba591e0460c4a0169c07c3d5ae5b118  koffice-l10n-pt_BR-1.5.2.tar.bz2
-22d91909560288e7dd79a3db6e2aab42  koffice-l10n-ro-1.5.2.tar.bz2
-e0a809bf7c9202cf5eebaaa93999f4f3  koffice-l10n-ru-1.5.2.tar.bz2
-8fa484cd096f3f8461c054bad31c3601  koffice-l10n-se-1.5.2.tar.bz2
-a7dbf6b5fa42d0cdee1f0928cbaadfd0  koffice-l10n-sk-1.5.2.tar.bz2
-e5fe2c8a350ba2636f4bd8dd2168b017  koffice-l10n-sl-1.5.2.tar.bz2
-2717a1e1e1ff92d1e962e3b69625e906  koffice-l10n-sr-1.5.2.tar.bz2
-f7774ad33c0efb072653495894865e0e  koffice-l10n-sr at Latn-1.5.2.tar.bz2
-83f73110f60ef4b5f633e3cca0dd4e12  koffice-l10n-sv-1.5.2.tar.bz2
-3f0ce9e790415b90daf43c35736a62e7  koffice-l10n-ta-1.5.2.tar.bz2
-add764f98fd61d74bf0886f4bfe7808f  koffice-l10n-tg-1.5.2.tar.bz2
-6b7df893cae7725ca94979a4dcd73edf  koffice-l10n-tr-1.5.2.tar.bz2
-a31dc3319a452ae7d2d689ac50a73bb0  koffice-l10n-uk-1.5.2.tar.bz2
-259739c2bde6d4fb890915cf7f3358c9  koffice-l10n-uz-1.5.2.tar.bz2
-e2de60faab2bc7049e2b4af6827cbe8e  koffice-l10n-zh_CN-1.5.2.tar.bz2
-a39dcaf36d9361d2915399ee0dce0cc0  koffice-l10n-zh_TW-1.5.2.tar.bz2
+b90e14bd3508bcc030096496ea87683a  koffice-l10n-ca-1.6.0.tar.bz2
+21f9a7c3daf57aabf70111dded8a26a6  koffice-l10n-cs-1.6.0.tar.bz2
+b1d03624474b91becd3ff64647f45087  koffice-l10n-cy-1.6.0.tar.bz2
+d1532dc1107f01752a9eeeb362666289  koffice-l10n-da-1.6.0.tar.bz2
+21344257dcd9b418898fb5e348918171  koffice-l10n-de-1.6.0.tar.bz2
+c00bbbf55de2d5d8aa68916ef6618ee3  koffice-l10n-el-1.6.0.tar.bz2
+eb4582f359eaada24a1dd96443636219  koffice-l10n-en_GB-1.6.0.tar.bz2
+81db059841e59cfee6371d10b12e82d7  koffice-l10n-es-1.6.0.tar.bz2
+64b4dd81d61362599af0882d695dd175  koffice-l10n-et-1.6.0.tar.bz2
+c3c5dbfe0135896c41f749ff79c6744e  koffice-l10n-eu-1.6.0.tar.bz2
+738bf409e16c08018b75f672abcb94a4  koffice-l10n-fi-1.6.0.tar.bz2
+96a5871374f69c694be87e621f04f39e  koffice-l10n-fr-1.6.0.tar.bz2
+01ea831cfbd136fecb1c7de8826e97b9  koffice-l10n-hu-1.6.0.tar.bz2
+73f17287697e54e61237a8cf7f6fc75f  koffice-l10n-it-1.6.0.tar.bz2
+dd3f979c03f9bc4ae6393a54766b4a84  koffice-l10n-ja-1.6.0.tar.bz2
+af51669631e18feef464e8d6778a41ad  koffice-l10n-lv-1.6.0.tar.bz2
+259be59d9bfe0e7fba7d96c1b5740614  koffice-l10n-ms-1.6.0.tar.bz2
+ef631712fe58e8129823b0f53253e153  koffice-l10n-nb-1.6.0.tar.bz2
+b9c572b04701226fdce5e9ae5817177c  koffice-l10n-nl-1.6.0.tar.bz2
+aaa167a7881f383b88696d34fd1903a5  koffice-l10n-pl-1.6.0.tar.bz2
+c907923d13d2e2d15e09ac5be9259c96  koffice-l10n-pt-1.6.0.tar.bz2
+8d1be2180acdba3287c2936cc379b4c6  koffice-l10n-pt_BR-1.6.0.tar.bz2
+0b895c8a86f0b3c6f31903c906e0dd08  koffice-l10n-ru-1.6.0.tar.bz2
+3bdbfb8532c3a3422345ff8693544b29  koffice-l10n-sk-1.6.0.tar.bz2
+6dfa4b30a8d246a46dddef1e3933cf36  koffice-l10n-sl-1.6.0.tar.bz2
+69681fe0a95a61b88aa5b9ee226fc320  koffice-l10n-sr-1.6.0.tar.bz2
+8ce2f6edd23a43b079fbec9c20cfe516  koffice-l10n-sr at Latn-1.6.0.tar.bz2
+774efb0a9c02776c58ca6cfe1930d327  koffice-l10n-sv-1.6.0.tar.bz2
+d941eddab83cc8991d4f218854d25f64  koffice-l10n-tr-1.6.0.tar.bz2
+b29bea37e37917edb45cfde8c48b50f7  koffice-l10n-uk-1.6.0.tar.bz2
+a3fda356e170368d7fd88d0ce892307b  koffice-l10n-zh_CN-1.6.0.tar.bz2
+17ec8363abee3dd45c1a4c103b023ff3  koffice-l10n-zh_TW-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 10:12:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 03:12:03 -0700
Subject: rpms/koffice-langpack/devel .cvsignore, 1.6,
	1.7 koffice-langpack.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200610211012.k9LAC3vu004926@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice-langpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4856/devel

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Aug 2006 10:10:48 -0000	1.6
+++ .cvsignore	21 Oct 2006 10:11:33 -0000	1.7
@@ -47,3 +47,35 @@
 koffice-l10n-uz-1.5.2.tar.bz2
 koffice-l10n-zh_CN-1.5.2.tar.bz2
 koffice-l10n-zh_TW-1.5.2.tar.bz2
+koffice-l10n-ca-1.6.0.tar.bz2
+koffice-l10n-cs-1.6.0.tar.bz2
+koffice-l10n-cy-1.6.0.tar.bz2
+koffice-l10n-da-1.6.0.tar.bz2
+koffice-l10n-de-1.6.0.tar.bz2
+koffice-l10n-el-1.6.0.tar.bz2
+koffice-l10n-en_GB-1.6.0.tar.bz2
+koffice-l10n-es-1.6.0.tar.bz2
+koffice-l10n-et-1.6.0.tar.bz2
+koffice-l10n-eu-1.6.0.tar.bz2
+koffice-l10n-fi-1.6.0.tar.bz2
+koffice-l10n-fr-1.6.0.tar.bz2
+koffice-l10n-hu-1.6.0.tar.bz2
+koffice-l10n-it-1.6.0.tar.bz2
+koffice-l10n-ja-1.6.0.tar.bz2
+koffice-l10n-lv-1.6.0.tar.bz2
+koffice-l10n-ms-1.6.0.tar.bz2
+koffice-l10n-nb-1.6.0.tar.bz2
+koffice-l10n-nl-1.6.0.tar.bz2
+koffice-l10n-pl-1.6.0.tar.bz2
+koffice-l10n-pt-1.6.0.tar.bz2
+koffice-l10n-pt_BR-1.6.0.tar.bz2
+koffice-l10n-ru-1.6.0.tar.bz2
+koffice-l10n-sk-1.6.0.tar.bz2
+koffice-l10n-sl-1.6.0.tar.bz2
+koffice-l10n-sr-1.6.0.tar.bz2
+koffice-l10n-sr at Latn-1.6.0.tar.bz2
+koffice-l10n-sv-1.6.0.tar.bz2
+koffice-l10n-tr-1.6.0.tar.bz2
+koffice-l10n-uk-1.6.0.tar.bz2
+koffice-l10n-zh_CN-1.6.0.tar.bz2
+koffice-l10n-zh_TW-1.6.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- koffice-langpack.spec	3 Aug 2006 10:10:48 -0000	1.7
+++ koffice-langpack.spec	21 Oct 2006 10:11:33 -0000	1.8
@@ -1,60 +1,43 @@
 Name:           koffice-langpack
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-af-1.5.2.tar.bz2
-Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ar-1.5.2.tar.bz2
-Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bg-1.5.2.tar.bz2
-Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-br-1.5.2.tar.bz2
-Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bs-1.5.2.tar.bz2
-Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ca-1.5.2.tar.bz2
-Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cs-1.5.2.tar.bz2
-Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cy-1.5.2.tar.bz2
-Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-da-1.5.2.tar.bz2
-Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-de-1.5.2.tar.bz2
-Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-el-1.5.2.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-en_GB-1.5.2.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eo-1.5.2.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-es-1.5.2.tar.bz2
-Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-et-1.5.2.tar.bz2
-Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eu-1.5.2.tar.bz2
-Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fi-1.5.2.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fr-1.5.2.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ga-1.5.2.tar.bz2
-Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-he-1.5.2.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hi-1.5.2.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hu-1.5.2.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-is-1.5.2.tar.bz2
-Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-it-1.5.2.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ja-1.5.2.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-lt-1.5.2.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-mk-1.5.2.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nb-1.5.2.tar.bz2
-Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nl-1.5.2.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nn-1.5.2.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pl-1.5.2.tar.bz2
-Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt-1.5.2.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt_BR-1.5.2.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ro-1.5.2.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ru-1.5.2.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-se-1.5.2.tar.bz2
-Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sk-1.5.2.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sl-1.5.2.tar.bz2
-Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr-1.5.2.tar.bz2
-Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.2.tar.bz2
-Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sv-1.5.2.tar.bz2
-Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ta-1.5.2.tar.bz2
-Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tg-1.5.2.tar.bz2
-Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tr-1.5.2.tar.bz2
-Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uk-1.5.2.tar.bz2
-Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uz-1.5.2.tar.bz2
-Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_CN-1.5.2.tar.bz2
-Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ms-1.5.2.tar.bz2
-Source48:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_TW-1.5.2.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ca-1.6.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cs-1.6.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cy-1.6.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-da-1.6.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-de-1.6.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-el-1.6.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-en_GB-1.6.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-es-1.6.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-et-1.6.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-eu-1.6.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fi-1.6.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fr-1.6.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-hu-1.6.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-it-1.6.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ja-1.6.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-lv-1.6.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nb-1.6.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nl-1.6.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pl-1.6.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt-1.6.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt_BR-1.6.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ru-1.6.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sk-1.6.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sl-1.6.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr-1.6.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.6.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sv-1.6.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-tr-1.6.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-uk-1.6.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_CN-1.6.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ms-1.6.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_TW-1.6.0.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,46 +49,46 @@
 %description
 Language files for koffice
 
-%package af
-Summary:        Afrikaans language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description ar
-Provides additional arabic translations for koffice
+#%package af
+#Summary:        Afrikaans language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description ar
+#Provides additional arabic translations for koffice
+
+#%package bs
+#Summary:        Bosnian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description br
+#Provides additional breton translations for koffice
+
+
+#%package bg
+#Summary:        Bulgarian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%package bs
-Summary:        Bosnian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description br
-Provides additional breton translations for koffice
-
-
-%package bg
-Summary:        Bulgarian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description bg
-Provides additional bulgarian translations for koffice
+#%description bg
+#Provides additional bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
@@ -147,13 +130,13 @@
 %description de
 Provides additional german translations for koffice
 
-%package eo
-Summary:        Esperanto language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package eo
+#Summary:        Esperanto language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description eo
-Provides additional esperanto translations for koffice
+#%description eo
+#Provides additional esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
@@ -213,29 +196,29 @@
 %description fr
 Provides additional french translations for koffice
 
-%package ga
-Summary:        Irish language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package ga
+#Summary:        Irish language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description ga
+#Provides additional irish translations for koffice
+
+#%package he
+#Summary:        Hebrew language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description ga
-Provides additional irish translations for koffice
-
-%package he
-Summary:        Hebrew language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description hi
-Provides additional hindi translations for koffice
+#%description hi
+#Provides additional hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
@@ -245,13 +228,13 @@
 %description hu
 Provides additional hungarian translations for koffice
 
-%package is
-Summary:        Icelandic language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package is
+#Summary:        Icelandic language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description is
-Provides additional icelandic translations for koffice
+#%description is
+#Provides additional icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
@@ -269,21 +252,21 @@
 %description ja
 Provides additional japanese translations for koffice
 
-%package lt
-Summary:        Lithuanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description lt
-Provides additional lithuanian translations for koffice
-
-%package mk
-Summary:        Macedonian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package lt
+#Summary:        Lithuanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description lt
+#Provides additional lithuanian translations for koffice
+
+#%package mk
+#Summary:        Macedonian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description mk
-Provides additional macedonian translations for koffice
+#%description mk
+#Provides additional macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
@@ -309,13 +292,13 @@
 %description nl
 Provides additional dutch translations for koffice
 
-%package nn
-Summary:        Nynorsk language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package nn
+#Summary:        Nynorsk language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description nn
-Provides additional nynorsk translations for koffice
+#%description nn
+#Provides additional nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
@@ -349,20 +332,21 @@
 %description ru
 Provides additional russian translations for koffice
 
-%package ro
-Summary:        Romanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
+#%package ro
+#Summary:        Romanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description se
-Provides additional northern sami translations for koffice
+#%description se
+#Provides additional northern sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
@@ -404,21 +388,21 @@
 %description sv
 Provides additional Swedish translations for koffice
 
-%package ta
-Summary:        Tamil language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description ta
-Provides additional tamil translations for koffice
+#%package ta
+#Summary:        Tamil language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%package tg
-Summary:        Tajik language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description tg
-Provides additional tajik translations for koffice
+#%description tg
+#Provides additional tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
@@ -436,13 +420,13 @@
 %description uk
 Provides additional ukrainian translations for koffice
 
-%package uz
-Summary:        Uzbek language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package uz
+#Summary:        Uzbek language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description uz
-Provides additional uzbek translations for koffice
+#%description uz
+#Provides additional uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
@@ -460,11 +444,18 @@
 %description zh_TW
 Provides additional traditional chinese translations for koffice
 
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description lv
+Provides additional lativian translations for koffice
+
 %prep
 %{__mkdir_p} %{_builddir}/%{name}-%{version}
 cd %{_builddir}/%{name}-%{version}
 
-%{__tar} xjvf %{SOURCE0}
 %{__tar} xjvf %{SOURCE1}
 %{__tar} xjvf %{SOURCE2}
 %{__tar} xjvf %{SOURCE3}
@@ -497,28 +488,12 @@
 %{__tar} xjvf %{SOURCE30}
 %{__tar} xjvf %{SOURCE31}
 %{__tar} xjvf %{SOURCE32}
-%{__tar} xjvf %{SOURCE33}
-%{__tar} xjvf %{SOURCE34}
-%{__tar} xjvf %{SOURCE35}
-%{__tar} xjvf %{SOURCE36}
-%{__tar} xjvf %{SOURCE37}
-%{__tar} xjvf %{SOURCE38}
-%{__tar} xjvf %{SOURCE39}
-%{__tar} xjvf %{SOURCE40}
-%{__tar} xjvf %{SOURCE41}
-%{__tar} xjvf %{SOURCE42}
-%{__tar} xjvf %{SOURCE43}
-%{__tar} xjvf %{SOURCE44}
-%{__tar} xjvf %{SOURCE45}
-%{__tar} xjvf %{SOURCE46}
-%{__tar} xjvf %{SOURCE47}
-%{__tar} xjvf %{SOURCE48}
 
 %build
 # dont work: et
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -527,9 +502,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -554,26 +529,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files af
-%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%files ar
-%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-
-%files bg
-%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-
-%files br
-%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-
-%files bs
-%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
@@ -608,10 +563,6 @@
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
 
-%files eo
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-
 %files es
 %defattr(-,root,root,-)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
@@ -637,44 +588,24 @@
 %lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
 %lang(fr) %{_datadir}/doc/HTML/fr/*
 
-%files ga
-%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
-
-%files he
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-
-%files hi
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-
 %files hu
 %defattr(-,root,root,-)
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
 
-%files is
-%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
-
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
 %lang(it) %{_datadir}/doc/HTML/it/*
 
-%files ja
-%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%files lt
+%files lv
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
 
-%files mk
+%files ja
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
 %files ms
 %defattr(-,root,root,-)
@@ -689,11 +620,6 @@
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
 %lang(nl) %{_datadir}/doc/HTML/nl/*
 
-%files nn
-%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
-%lang(nn) %{_datadir}/apps/koffice/autocorrect/nn.xml
-
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
@@ -708,19 +634,11 @@
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %{_datadir}/doc/HTML/pt/*
 
-%files ro
-%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
-
 %files ru
 %defattr(-,root,root,-)
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %{_datadir}/doc/HTML/ru/*
 
-%files se
-%defattr(-,root,root,-)
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-
 %files sk
 %defattr(-,root,root,-)
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
@@ -745,14 +663,6 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/doc/HTML/sv/*
 
-%files ta
-%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-
-%files tg
-%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-
 %files tr
 %defattr(-,root,root,-)
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
@@ -761,10 +671,6 @@
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 
-%files uz
-%defattr(-,root,root,-)
-%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/*
-
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
@@ -774,6 +680,10 @@
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Aug 2006 10:10:48 -0000	1.6
+++ sources	21 Oct 2006 10:11:33 -0000	1.7
@@ -1,49 +1,32 @@
-c7a48bb275230d1152e29c67a869daee  koffice-l10n-af-1.5.2.tar.bz2
-a35e9b3f75265488ca400469f23a5a91  koffice-l10n-ar-1.5.2.tar.bz2
-b8be1348ffab32d826c358d44de68c5e  koffice-l10n-bg-1.5.2.tar.bz2
-fd0738d2c9538994de3573ec00964cf1  koffice-l10n-br-1.5.2.tar.bz2
-b7de9b93298aba597d9d8f8da038fc37  koffice-l10n-bs-1.5.2.tar.bz2
-8e3ff02096b6574cf337430924d5af98  koffice-l10n-ca-1.5.2.tar.bz2
-b8f83541b98ff0cb8361f797f665971c  koffice-l10n-cs-1.5.2.tar.bz2
-64782ef55dbdfbbc3672b613dc7f5faf  koffice-l10n-cy-1.5.2.tar.bz2
-58c13527c47dee445572d26141fd3269  koffice-l10n-da-1.5.2.tar.bz2
-ef007ab98ffe65ce072a9245f51b01e1  koffice-l10n-de-1.5.2.tar.bz2
-4392e652560adb8c83fe2aac9479fcb8  koffice-l10n-el-1.5.2.tar.bz2
-11b499953ae1616c589e793abc4e474b  koffice-l10n-en_GB-1.5.2.tar.bz2
-c7025f7d946342267943fd146a5cc19c  koffice-l10n-eo-1.5.2.tar.bz2
-fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc  koffice-l10n-es-1.5.2.tar.bz2
-fed89528182c0dc7baa2c50fee165270  koffice-l10n-et-1.5.2.tar.bz2
-3e15c7433f91486d8b76eefb19990a74  koffice-l10n-eu-1.5.2.tar.bz2
-de6a7a2b2b2edc1a4eaad7523b1bab39  koffice-l10n-fi-1.5.2.tar.bz2
-8f868a919c6ccb66b719196d3e842910  koffice-l10n-fr-1.5.2.tar.bz2
-b8b4d4cbb0ff29bc0da4954eb9ba4e13  koffice-l10n-ga-1.5.2.tar.bz2
-a0368a287bf2a3566b802ffe6de8b472  koffice-l10n-he-1.5.2.tar.bz2
-95a4edd9df2b1c4744ae0b590d68822a  koffice-l10n-hi-1.5.2.tar.bz2
-cd57e11f100ffabf6a3c72faa6433569  koffice-l10n-hu-1.5.2.tar.bz2
-e3b5ec6948dea217e79d3c692d3e3bd3  koffice-l10n-is-1.5.2.tar.bz2
-9658442039b455e52cf68599e3250f54  koffice-l10n-it-1.5.2.tar.bz2
-7eb7880c8e03a8c905a7bba06423fdde  koffice-l10n-ja-1.5.2.tar.bz2
-bf8fb56e3b2ab401d4b3ac9e19ad30f4  koffice-l10n-lt-1.5.2.tar.bz2
-8f9a9ccea194653be186517c0879fe8c  koffice-l10n-mk-1.5.2.tar.bz2
-617ab3344f714fa9109875bc50b79502  koffice-l10n-ms-1.5.2.tar.bz2
-02adef48c63e4a9f87fed63cefb19d1d  koffice-l10n-nb-1.5.2.tar.bz2
-9847ff8d7dbddf4c2f1ae4a6cb0694d1  koffice-l10n-nl-1.5.2.tar.bz2
-9926f8aa4449e839d40f97e7c621de96  koffice-l10n-nn-1.5.2.tar.bz2
-193d09145eea9136067676b6d74ab5f9  koffice-l10n-pl-1.5.2.tar.bz2
-f8d4e8990e1f24ef6076de1c9698458f  koffice-l10n-pt-1.5.2.tar.bz2
-bba591e0460c4a0169c07c3d5ae5b118  koffice-l10n-pt_BR-1.5.2.tar.bz2
-22d91909560288e7dd79a3db6e2aab42  koffice-l10n-ro-1.5.2.tar.bz2
-e0a809bf7c9202cf5eebaaa93999f4f3  koffice-l10n-ru-1.5.2.tar.bz2
-8fa484cd096f3f8461c054bad31c3601  koffice-l10n-se-1.5.2.tar.bz2
-a7dbf6b5fa42d0cdee1f0928cbaadfd0  koffice-l10n-sk-1.5.2.tar.bz2
-e5fe2c8a350ba2636f4bd8dd2168b017  koffice-l10n-sl-1.5.2.tar.bz2
-2717a1e1e1ff92d1e962e3b69625e906  koffice-l10n-sr-1.5.2.tar.bz2
-f7774ad33c0efb072653495894865e0e  koffice-l10n-sr at Latn-1.5.2.tar.bz2
-83f73110f60ef4b5f633e3cca0dd4e12  koffice-l10n-sv-1.5.2.tar.bz2
-3f0ce9e790415b90daf43c35736a62e7  koffice-l10n-ta-1.5.2.tar.bz2
-add764f98fd61d74bf0886f4bfe7808f  koffice-l10n-tg-1.5.2.tar.bz2
-6b7df893cae7725ca94979a4dcd73edf  koffice-l10n-tr-1.5.2.tar.bz2
-a31dc3319a452ae7d2d689ac50a73bb0  koffice-l10n-uk-1.5.2.tar.bz2
-259739c2bde6d4fb890915cf7f3358c9  koffice-l10n-uz-1.5.2.tar.bz2
-e2de60faab2bc7049e2b4af6827cbe8e  koffice-l10n-zh_CN-1.5.2.tar.bz2
-a39dcaf36d9361d2915399ee0dce0cc0  koffice-l10n-zh_TW-1.5.2.tar.bz2
+b90e14bd3508bcc030096496ea87683a  koffice-l10n-ca-1.6.0.tar.bz2
+21f9a7c3daf57aabf70111dded8a26a6  koffice-l10n-cs-1.6.0.tar.bz2
+b1d03624474b91becd3ff64647f45087  koffice-l10n-cy-1.6.0.tar.bz2
+d1532dc1107f01752a9eeeb362666289  koffice-l10n-da-1.6.0.tar.bz2
+21344257dcd9b418898fb5e348918171  koffice-l10n-de-1.6.0.tar.bz2
+c00bbbf55de2d5d8aa68916ef6618ee3  koffice-l10n-el-1.6.0.tar.bz2
+eb4582f359eaada24a1dd96443636219  koffice-l10n-en_GB-1.6.0.tar.bz2
+81db059841e59cfee6371d10b12e82d7  koffice-l10n-es-1.6.0.tar.bz2
+64b4dd81d61362599af0882d695dd175  koffice-l10n-et-1.6.0.tar.bz2
+c3c5dbfe0135896c41f749ff79c6744e  koffice-l10n-eu-1.6.0.tar.bz2
+738bf409e16c08018b75f672abcb94a4  koffice-l10n-fi-1.6.0.tar.bz2
+96a5871374f69c694be87e621f04f39e  koffice-l10n-fr-1.6.0.tar.bz2
+01ea831cfbd136fecb1c7de8826e97b9  koffice-l10n-hu-1.6.0.tar.bz2
+73f17287697e54e61237a8cf7f6fc75f  koffice-l10n-it-1.6.0.tar.bz2
+dd3f979c03f9bc4ae6393a54766b4a84  koffice-l10n-ja-1.6.0.tar.bz2
+af51669631e18feef464e8d6778a41ad  koffice-l10n-lv-1.6.0.tar.bz2
+259be59d9bfe0e7fba7d96c1b5740614  koffice-l10n-ms-1.6.0.tar.bz2
+ef631712fe58e8129823b0f53253e153  koffice-l10n-nb-1.6.0.tar.bz2
+b9c572b04701226fdce5e9ae5817177c  koffice-l10n-nl-1.6.0.tar.bz2
+aaa167a7881f383b88696d34fd1903a5  koffice-l10n-pl-1.6.0.tar.bz2
+c907923d13d2e2d15e09ac5be9259c96  koffice-l10n-pt-1.6.0.tar.bz2
+8d1be2180acdba3287c2936cc379b4c6  koffice-l10n-pt_BR-1.6.0.tar.bz2
+0b895c8a86f0b3c6f31903c906e0dd08  koffice-l10n-ru-1.6.0.tar.bz2
+3bdbfb8532c3a3422345ff8693544b29  koffice-l10n-sk-1.6.0.tar.bz2
+6dfa4b30a8d246a46dddef1e3933cf36  koffice-l10n-sl-1.6.0.tar.bz2
+69681fe0a95a61b88aa5b9ee226fc320  koffice-l10n-sr-1.6.0.tar.bz2
+8ce2f6edd23a43b079fbec9c20cfe516  koffice-l10n-sr at Latn-1.6.0.tar.bz2
+774efb0a9c02776c58ca6cfe1930d327  koffice-l10n-sv-1.6.0.tar.bz2
+d941eddab83cc8991d4f218854d25f64  koffice-l10n-tr-1.6.0.tar.bz2
+b29bea37e37917edb45cfde8c48b50f7  koffice-l10n-uk-1.6.0.tar.bz2
+a3fda356e170368d7fd88d0ce892307b  koffice-l10n-zh_CN-1.6.0.tar.bz2
+17ec8363abee3dd45c1a4c103b023ff3  koffice-l10n-zh_TW-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 11:14:58 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:14:58 -0700
Subject: rpms/autogen import.log,1.3,1.4
Message-ID: <200610211114.k9LBEwp7008561@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8529

Modified Files:
	import.log 
Log Message:
auto-import autogen-5.8.7-1 on branch devel from autogen-5.8.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/autogen/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Sep 2006 21:44:32 -0000	1.3
+++ import.log	21 Oct 2006 11:14:27 -0000	1.4
@@ -1,2 +1,3 @@
 autogen-5_8_5-6:HEAD:autogen-5.8.5-6.src.rpm:1157919650
 autogen-5_8_5-7:FC-5:autogen-5.8.5-7.src.rpm:1157924662
+autogen-5_8_7-1:HEAD:autogen-5.8.7-1.src.rpm:1161429254



From fedora-extras-commits at redhat.com  Sat Oct 21 11:14:59 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:14:59 -0700
Subject: rpms/autogen/devel .cvsignore, 1.2, 1.3 autogen.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610211114.k9LBExOo008566@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8529/devel

Modified Files:
	.cvsignore autogen.spec sources 
Log Message:
auto-import autogen-5.8.7-1 on branch devel from autogen-5.8.7-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 20:21:05 -0000	1.2
+++ .cvsignore	21 Oct 2006 11:14:28 -0000	1.3
@@ -1 +1 @@
-autogen-5.8.5.tar.bz2
+autogen-5.8.7.tar.bz2


Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/autogen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.spec	10 Sep 2006 21:37:04 -0000	1.2
+++ autogen.spec	21 Oct 2006 11:14:28 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
-Version: 5.8.5
-Release: 7%{?dist}
+Version: 5.8.7
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
+- bump to new version
+
 * Sun Sep 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.5-7
 - removed libopts and other autoopts conflicts
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 20:21:05 -0000	1.2
+++ sources	21 Oct 2006 11:14:28 -0000	1.3
@@ -1 +1 @@
-23d32772a119dbff4f3ce51a6331e06d  autogen-5.8.5.tar.bz2
+76599cc04f352512610191b13f3ce2a6  autogen-5.8.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 11:16:29 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:16:29 -0700
Subject: rpms/autogen import.log,1.4,1.5
Message-ID: <200610211116.k9LBGTf9008661@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8629

Modified Files:
	import.log 
Log Message:
auto-import autogen-5.8.7-1 on branch FC-5 from autogen-5.8.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/autogen/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	21 Oct 2006 11:14:27 -0000	1.4
+++ import.log	21 Oct 2006 11:15:59 -0000	1.5
@@ -1,3 +1,4 @@
 autogen-5_8_5-6:HEAD:autogen-5.8.5-6.src.rpm:1157919650
 autogen-5_8_5-7:FC-5:autogen-5.8.5-7.src.rpm:1157924662
 autogen-5_8_7-1:HEAD:autogen-5.8.7-1.src.rpm:1161429254
+autogen-5_8_7-1:FC-5:autogen-5.8.7-1.src.rpm:1161429346



From fedora-extras-commits at redhat.com  Sat Oct 21 11:16:30 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:16:30 -0700
Subject: rpms/autogen/FC-5 .cvsignore, 1.2, 1.3 autogen.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610211116.k9LBGUIk008666@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8629/FC-5

Modified Files:
	.cvsignore autogen.spec sources 
Log Message:
auto-import autogen-5.8.7-1 on branch FC-5 from autogen-5.8.7-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 20:21:05 -0000	1.2
+++ .cvsignore	21 Oct 2006 11:16:00 -0000	1.3
@@ -1 +1 @@
-autogen-5.8.5.tar.bz2
+autogen-5.8.7.tar.bz2


Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/autogen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.spec	10 Sep 2006 21:44:33 -0000	1.2
+++ autogen.spec	21 Oct 2006 11:16:00 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
-Version: 5.8.5
-Release: 7%{?dist}
+Version: 5.8.7
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
+- bump to new version
+
 * Sun Sep 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.5-7
 - removed libopts and other autoopts conflicts
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 20:21:05 -0000	1.2
+++ sources	21 Oct 2006 11:16:00 -0000	1.3
@@ -1 +1 @@
-23d32772a119dbff4f3ce51a6331e06d  autogen-5.8.5.tar.bz2
+76599cc04f352512610191b13f3ce2a6  autogen-5.8.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 11:20:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:20:33 -0700
Subject: rpms/anjuta import.log,1.23,1.24
Message-ID: <200610211120.k9LBKXMa008876@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8840

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-8 on branch FC-5 from anjuta-2.0.2-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- import.log	18 Oct 2006 20:42:16 -0000	1.23
+++ import.log	21 Oct 2006 11:20:03 -0000	1.24
@@ -20,3 +20,4 @@
 anjuta-1_2_4a-7:HEAD:anjuta-1.2.4a-7.src.rpm:1157214546
 anjuta-1_2_4a-7:FC-5:anjuta-1.2.4a-7.src.rpm:1157214616
 anjuta-2_0_2-8:HEAD:anjuta-2.0.2-8.src.rpm:1161204122
+anjuta-2_0_2-8:FC-5:anjuta-2.0.2-8.src.rpm:1161429591



From fedora-extras-commits at redhat.com  Sat Oct 21 11:20:34 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:20:34 -0700
Subject: rpms/anjuta/FC-5 anjuta2.spec, NONE, 1.1 .cvsignore, 1.6,
	1.7 sources, 1.6, 1.7 anjuta-1.2.4a-search.patch, 1.1,
	NONE anjuta-1.2.4a-watch-keys.patch, 1.1,
	NONE anjuta-export-dynamic.patch, 1.1,
	NONE anjuta-project_type.patch, 1.1, NONE anjuta.spec, 1.21, NONE
Message-ID: <200610211120.k9LBKYSs008880@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8840/FC-5

Modified Files:
	.cvsignore sources 
Added Files:
	anjuta2.spec 
Removed Files:
	anjuta-1.2.4a-search.patch anjuta-1.2.4a-watch-keys.patch 
	anjuta-export-dynamic.patch anjuta-project_type.patch 
	anjuta.spec 
Log Message:
auto-import anjuta-2.0.2-8 on branch FC-5 from anjuta-2.0.2-8.src.rpm


--- NEW FILE anjuta2.spec ---
Summary: Integrated Development Environment
Name:    anjuta
Version: 2.0.2
Release: 8%{?dist}
License: GPL
Group:   Development/Tools
URL:     http://www.anjuta.org
Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Epoch: 1

%description
Anjuta DevStudio is a versatile Integrated Development Environment (IDE)
on GNOME Desktop Environment and features a number of advanced
programming facilities. These include project management, application and
class wizards, an on-board interactive debugger, powerful source editor,
syntax highlighting, intellisense autocompletions, symbol navigation,
version controls, integrated GUI designing and other tools.

%package devel
Summary: Libraries and include files for Anjuta plugins development
Group:   Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libgnomeui-devel, libglade2-devel, pkgconfig

%description devel
Libraries, header files and API docs for developing Anjuta plugins

%package docs
Summary: Anjuta 2 documentation
Group: Documentation
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description docs
Anjuta 2 documentation

%prep
%setup -q
sed -i 's/\r//' doc/ScintillaDoc.html
%{_bindir}/iconv -t UTF-8 THANKS -o THANKS
%{_bindir}/iconv -t UTF-8 COPYING -o COPYING
%{_bindir}/iconv -t UTF-8 NEWS -o NEWS
%{_bindir}/iconv -t UTF-8 README -o README
chmod 644 scintilla/*.cxx
chmod 644 scintilla/*.h

%build
%configure --disable-static --disable-plugin-subversion --enable-nls
%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL="install -c -p" install
%find_lang %{name}

desktop-file-install --vendor fedora --delete-original \
  --dir %{buildroot}/%{_datadir}/applications      \
  --add-category X-Fedora                              \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig

%post docs
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :

%postun docs
scrollkeeper-update -q || :

%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc doc/ScintillaDoc.html
%{_bindir}/%{name}*
%{_bindir}/create_global_tags.sh
%{_bindir}/test_tm_buffer
%{_libdir}/lib%{name}*.so.*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}
%{_datadir}/doc/%{name}
%{_datadir}/application-registry/%{name}.applications
%{_datadir}/mime-info/%{name}.mime
%{_datadir}/mime-info/%{name}.keys
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/48x48/apps/anjuta*
%{_datadir}/icons/hicolor/scalable/apps/anjuta*
%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png
%{_mandir}/man1/anjuta*

%files docs
%defattr(-,root, root, -)
%{_datadir}/gnome/help/%{name}
%{_datadir}/omf/%{name}

%files devel
%defattr (-, root, root)
%{_includedir}/*%{name}*
%{_libdir}/pkgconfig/*%{name}*
%{_libdir}/lib%{name}*.so
%{_datadir}/gtk-doc/html/*%{name}*

%changelog
* Tue Oct 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-8
- fix the INSTALL line in install
- fixed encoding on text files
- removed two docs (not really needed)
- fixed ldconfig

* Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-7
- install keeps timestampe
- now keeps time stamps
- lots of BRs removed
- Moved docs Rs to the correct place
- fixed encodings

* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-6
- removed RPM_BUILD_ROOT
- fixed devel package
- altered update-mime-database
- fixed debuginfo permission problems
- altered R and BR

* Wed Oct 11 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-5
- re-enabled docs
- multiple spec fixes
- spec file clean
- added gtksourceview-devel and gtksourceview to BR and R

* Thu Jun 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-2
- Lotza fixes!

* Tue May 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-1
- bump to new version 

* Thu Apr 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-3
- removed the hack from anjuta (1.2.4a)
- added anjuta-docs subpackage

* Wed Apr 26 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-2
- removed smp_flags

* Tue Feb 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-1
- Initial import for FC
- Sanitised the spec file somewhat
- Removed .a and .la files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Apr 2006 23:27:32 -0000	1.6
+++ .cvsignore	21 Oct 2006 11:20:03 -0000	1.7
@@ -1 +1 @@
-anjuta-1.2.4a.tar.gz
+anjuta-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Apr 2006 23:27:32 -0000	1.6
+++ sources	21 Oct 2006 11:20:03 -0000	1.7
@@ -1 +1 @@
-7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz
+e0d1e216da809df32816d233d7c55165  anjuta-2.0.2.tar.gz


--- anjuta-1.2.4a-search.patch DELETED ---


--- anjuta-1.2.4a-watch-keys.patch DELETED ---


--- anjuta-export-dynamic.patch DELETED ---


--- anjuta-project_type.patch DELETED ---


--- anjuta.spec DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 13:30:08 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Sat, 21 Oct 2006 06:30:08 -0700
Subject: rpms/kst/FC-5 .cvsignore,1.4,1.5 kst.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200610211330.k9LDU8vR015319@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15280

Modified Files:
	.cvsignore kst.spec sources 
Log Message:
Upgrade to kst 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kst/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2006 14:41:07 -0000	1.4
+++ .cvsignore	21 Oct 2006 13:29:38 -0000	1.5
@@ -1 +1 @@
-kst-1.3.0.tar.gz
+kst-1.3.1.tar.gz


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/FC-5/kst.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kst.spec	27 Sep 2006 14:42:48 -0000	1.7
+++ kst.spec	21 Oct 2006 13:29:38 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       kst
-Version:    1.3.0
-Release:    2%{?dist}
+Version:    1.3.1
+Release:    1%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -211,6 +211,9 @@
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %changelog
+* Sat Oct 21 2006 Matthew Truch <matt at truch.net> - 1.3.1-1
+- Upgrade to 1.3.1 bugfix release.
+
 * Wed Sep 27 2006 Matthew Truch <matt at truch.net> - 1.3.0-2
 - Bump release due to tagging mis-hap.  No real changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kst/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2006 14:41:07 -0000	1.4
+++ sources	21 Oct 2006 13:29:38 -0000	1.5
@@ -1 +1 @@
-3a3978eb498c456bb23c261dbd82d215  kst-1.3.0.tar.gz
+b18013223dc4cc2d1d0c8c4197bf8f97  kst-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 13:58:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 06:58:01 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-5 .cvsignore, 1.3,
	1.4 perl-Alien-wxWidgets.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610211358.k9LDw16f015446@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15410/FC-5

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Oct 2006 20:10:34 -0000	1.3
+++ .cvsignore	21 Oct 2006 13:57:31 -0000	1.4
@@ -1 +1 @@
-Alien-wxWidgets-0.22.tar.gz
+Alien-wxWidgets-0.24.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/perl-Alien-wxWidgets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Alien-wxWidgets.spec	3 Oct 2006 20:10:34 -0000	1.4
+++ perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:31 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.22
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -16,6 +16,7 @@
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# No binaries in this package
 %define debug_package %{nil}
 
 %description
@@ -54,6 +55,12 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.24-1
+- Update to 0.24.
+
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
+- Update to 0.23.
+
 * Tue Oct  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
 - Update to 0.22.
 - Avoid creation of the debuginfo package (#209180).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Oct 2006 20:10:34 -0000	1.3
+++ sources	21 Oct 2006 13:57:31 -0000	1.4
@@ -1 +1 @@
-98de414f8d378170ede6cf96a0e2f73e  Alien-wxWidgets-0.22.tar.gz
+40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 13:58:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 06:58:02 -0700
Subject: rpms/perl-Alien-wxWidgets/devel .cvsignore, 1.4,
	1.5 perl-Alien-wxWidgets.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200610211358.k9LDw2Vw015451@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15410/devel

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Oct 2006 21:18:50 -0000	1.4
+++ .cvsignore	21 Oct 2006 13:57:32 -0000	1.5
@@ -1 +1 @@
-Alien-wxWidgets-0.23.tar.gz
+Alien-wxWidgets-0.24.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Alien-wxWidgets.spec	19 Oct 2006 21:18:50 -0000	1.5
+++ perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:32 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.23
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -16,6 +16,7 @@
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# No binaries in this package
 %define debug_package %{nil}
 
 %description
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.24-1
+- Update to 0.24.
+
 * Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
 - Update to 0.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Oct 2006 21:18:50 -0000	1.4
+++ sources	21 Oct 2006 13:57:32 -0000	1.5
@@ -1 +1 @@
-487dcec3fc7ef94c4247913883b5cc65  Alien-wxWidgets-0.23.tar.gz
+40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:04:40 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 07:04:40 -0700
Subject: rpms/perl-Wx/FC-5 .cvsignore, 1.2, 1.3 perl-Wx.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610211404.k9LE4e3l018490@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18451/FC-5

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.59.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2006 10:42:07 -0000	1.2
+++ .cvsignore	21 Oct 2006 14:04:09 -0000	1.3
@@ -1 +1 @@
-Wx-0.57.tar.gz
+Wx-0.59.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/perl-Wx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Wx.spec	2 Oct 2006 10:42:07 -0000	1.1
+++ perl-Wx.spec	21 Oct 2006 14:04:09 -0000	1.2
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Wx
-Version:        0.57
-Release:        2%{?dist}
+Version:        0.59
+Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.15
+BuildRequires:  perl(Alien::wxWidgets) >= 0.22
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.59-1
+- Update to 0.59.
+
+* Fri Oct 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.58-1
+- Update to 0.58.
+
 * Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.57-2
 - Filtered perl(Wx) duplicate provide.
 - Corrected several file permission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 10:42:07 -0000	1.2
+++ sources	21 Oct 2006 14:04:09 -0000	1.3
@@ -1 +1 @@
-95689cae67e55eb62febe8f41751c1c2  Wx-0.57.tar.gz
+8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:04:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 07:04:42 -0700
Subject: rpms/perl-Wx/devel .cvsignore, 1.2, 1.3 perl-Wx.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610211404.k9LE4gQj018495@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18451/devel

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.59.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2006 10:42:07 -0000	1.2
+++ .cvsignore	21 Oct 2006 14:04:11 -0000	1.3
@@ -1 +1 @@
-Wx-0.57.tar.gz
+Wx-0.59.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Wx.spec	2 Oct 2006 10:42:07 -0000	1.1
+++ perl-Wx.spec	21 Oct 2006 14:04:11 -0000	1.2
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Wx
-Version:        0.57
-Release:        2%{?dist}
+Version:        0.59
+Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.15
+BuildRequires:  perl(Alien::wxWidgets) >= 0.22
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.59-1
+- Update to 0.59.
+
+* Fri Oct 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.58-1
+- Update to 0.58.
+
 * Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.57-2
 - Filtered perl(Wx) duplicate provide.
 - Corrected several file permission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 10:42:07 -0000	1.2
+++ sources	21 Oct 2006 14:04:11 -0000	1.3
@@ -1 +1 @@
-95689cae67e55eb62febe8f41751c1c2  Wx-0.57.tar.gz
+8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:31:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 07:31:08 -0700
Subject: rpms/perl-Log-Log4perl/FC-5 .cvsignore, 1.5,
	1.6 perl-Log-Log4perl.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610211431.k9LEV8xw018810@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774/FC-5

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.07.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jul 2006 15:53:56 -0000	1.5
+++ .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
@@ -1 +1 @@
-Log-Log4perl-1.06.tar.gz
+Log-Log4perl-1.07.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/perl-Log-Log4perl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Log-Log4perl.spec	21 Jul 2006 15:53:56 -0000	1.7
+++ perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.06
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -33,9 +33,9 @@
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
 %patch1 -p1
-find lib -name "*.pm" -exec chmod a-x {} ';'
+find lib -name "*.pm" -exec chmod -c a-x {} ';'
 %{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod a-x eg/* 
+chmod -c a-x eg/* 
 
 
 %build
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.07-1
+- Update to 1.07.
+
 * Fri Jul 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jul 2006 15:53:56 -0000	1.5
+++ sources	21 Oct 2006 14:30:38 -0000	1.6
@@ -1 +1 @@
-a7bda690ec0ad0bed457fa525e28034a  Log-Log4perl-1.06.tar.gz
+dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:31:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 07:31:09 -0700
Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.5,
	1.6 perl-Log-Log4perl.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610211431.k9LEV9cs018815@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774/devel

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.07.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jul 2006 15:54:02 -0000	1.5
+++ .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
@@ -1 +1 @@
-Log-Log4perl-1.06.tar.gz
+Log-Log4perl-1.07.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Log-Log4perl.spec	21 Jul 2006 15:54:02 -0000	1.7
+++ perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.06
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -33,9 +33,9 @@
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
 %patch1 -p1
-find lib -name "*.pm" -exec chmod a-x {} ';'
+find lib -name "*.pm" -exec chmod -c a-x {} ';'
 %{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod a-x eg/* 
+chmod -c a-x eg/* 
 
 
 %build
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.07-1
+- Update to 1.07.
+
 * Fri Jul 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jul 2006 15:54:02 -0000	1.5
+++ sources	21 Oct 2006 14:30:38 -0000	1.6
@@ -1 +1 @@
-a7bda690ec0ad0bed457fa525e28034a  Log-Log4perl-1.06.tar.gz
+dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:40:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 07:40:09 -0700
Subject: rpms/MagicPoint/devel .cvsignore, 1.3, 1.4 MagicPoint.spec, 1.4,
	1.5 Makefile, 1.2, 1.3 magicpoint-1.09a-rpath.patch, 1.2,
	1.3 magicpoint-1.10a-fix-gcc34.patch, 1.2,
	1.3 magicpoint-1.10a-fix-usleep.patch, 1.2,
	1.3 magicpoint-1.10a-longline.patch, 1.2,
	1.3 magicpoint-1.11a-fix-gcc-warnings.patch, 1.2,
	1.3 magicpoint-1.11b-64bit.patch, NONE,
	1.1 magicpoint-1.11b-debian.patch, NONE,
	1.1 magicpoint-1.11b-embed.patch, NONE, 1.1 sources, 1.3,
	1.4 dead.package, 1.1, NONE
Message-ID: <200610211440.k9LEe95t019009@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/MagicPoint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18953

Added Files:
	.cvsignore MagicPoint.spec Makefile 
	magicpoint-1.09a-rpath.patch magicpoint-1.10a-fix-gcc34.patch 
	magicpoint-1.10a-fix-usleep.patch 
	magicpoint-1.10a-longline.patch 
	magicpoint-1.11a-fix-gcc-warnings.patch 
	magicpoint-1.11b-64bit.patch magicpoint-1.11b-debian.patch 
	magicpoint-1.11b-embed.patch sources 
Removed Files:
	dead.package 
Log Message:
* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.11b-4
- Unorphan
- Take some patches from Debian
- Actually make ./configure detect and use freetype1, it was testing for it
  but the test failed
- Package mgp2html and mgp2latex from the contrib dir 



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	21 Oct 2006 14:39:38 -0000	1.4
@@ -0,0 +1 @@
+magicpoint-1.11b.tar.gz


Index: MagicPoint.spec
===================================================================
RCS file: MagicPoint.spec
diff -N MagicPoint.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MagicPoint.spec	21 Oct 2006 14:39:38 -0000	1.5
@@ -0,0 +1,237 @@
+Name:           MagicPoint
+Version:        1.11b
+Release:        4%{?dist}
+Summary:        X based presentation software
+Group:          Applications/Productivity
+License:        BSD
+URL:            http://member.wide.ad.jp/wg/mgp/
+Source0:        ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/magicpoint-%{version}.tar.gz
+Patch0:         magicpoint-1.11b-debian.patch
+Patch1:         magicpoint-1.11b-64bit.patch
+Patch2:         magicpoint-1.09a-rpath.patch
+Patch3:         magicpoint-1.11a-fix-gcc-warnings.patch
+Patch4:         magicpoint-1.11b-embed.patch
+Patch6:         magicpoint-1.10a-longline.patch
+Patch10:        magicpoint-1.10a-fix-usleep.patch
+Patch11:        magicpoint-1.10a-fix-gcc34.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  freetype1-devel libungif-devel libpng-devel libmng-devel imake
+BuildRequires:  imlib-devel libXt-devel libXft-devel bison flex perl sharutils
+Requires:       sharutils
+Obsoletes:      mgp < %{version}-%{release}, magicpoint < %{version}-%{release}
+Provides:       mgp = %{version}-%{release}, magicpoint = %{version}-%{release}
+
+%description
+MagicPoint is an X11 based presentation tool. MagicPoint's
+presentation files (typically .mgp files) are plain text so you can
+create presentation files quickly with your favorite editor.
+
+
+%prep
+%setup -q -n magicpoint-%{version}
+%patch0 -p1
+%patch1 -p1 -z .64bit
+%patch2 -p1 -z .rpath
+%patch3 -p1 -z .warnings
+%patch4 -p1 -z .embed
+%patch6 -p1 -z .longline
+%patch10 -p1 -z .usleep
+%patch11 -p1 -z .gcc34
+# fix hopelessly broken way configure searches for libttf
+sed -i 's:$dir/lib:%{_libdir}:g' configure
+sed -i 's:$dir/include/freetype:/usr/include/freetype1/freetype:g' configure
+
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype1/freetype"
+%configure --enable-locale --enable-freetype --enable-freetype-charset16 \
+  --enable-xft2 --disable-vflib --enable-gif --enable-imlib
+xmkmf -a
+# LIBDIR is used by the makefile to determine where to install data files
+make CDEBUGFLAGS="$RPM_OPT_FLAGS" LIBDIR=%{_datadir}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install install.man DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_datadir}
+install -m 755 contrib/mgp2html.pl $RPM_BUILD_ROOT%{_bindir}/mgp2html
+install -m 755 contrib/mgp2latex.pl $RPM_BUILD_ROOT%{_bindir}/mgp2latex
+# stop these from ending up in %doc
+rm sample/.cvsignore sample/*akefile*
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYRIGHT README SYNTAX USAGE sample
+%{_bindir}/*
+%{_datadir}/mgp
+%{_mandir}/*/*
+
+
+%changelog
+* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.11b-4
+- Unorphan
+- Take some patches from Debian
+- Actually make ./configure detect and use freetype1, it was testing for it
+  but the test failed
+- Package mgp2html and mgp2latex from the contrib dir 
+
+* Fri Aug 5 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-3
+- Re-enable debuginfo builds
+- Ralf Corsepius watchful eyes fixes - cleaning up the spec
+
+* Thu Aug 4 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-2
+- Removed Patch12 to fix undefined operation
+- Bump spec to somewhat match work from Rui Miguel Silva Seabra <rms at 1407.org>
+- Remove requirement on VFlib2, seeing that we disable it in configure
+
+* Mon Sep 27 2004 Akira TAGOH <tagoh at redhat.com> - 1.11b-1
+- New upstream release.
+
+* Wed Sep 15 2004 Akira TAGOH <tagoh at redhat.com> - 1.11a-1
+- New upstream release.
+- magicpoint-1.11a-fix-gcc-warnings.patch: updated from 1.10a.
+- magicpoint-1.10a-fixtypo-opaque.patch: removed, it's no lnger needed.
+- magicpoint-1.10a-fix-ft2build.patch: removed, it's no longer needed.
+- magicpoint-1.10a-png.patch: removed, it's no longer needed.
+- XFree4.0-freetype.patch: removed, freetype1 is no longer available.
+
+* Mon Jun 21 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-10
+- magicpoint-1.10a-fix-gcc34.patch: applied to build with gcc 3.4.
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Feb 18 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-8
+- fix wrong license description. (#115947: Miloslav Trmac)
+- included COPYRIGHT file.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Feb 09 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-6
+- magicpoint-1.10a-fix-gcc-warnings2.patch: applied to fix gcc warnings (#115161)
+- magicpoint-1.10a-fix-ft2build.patch: applied to fix build error for freetype.
+- magicpoint-1.10a-fix-usleep.patch: applied to fix missing compile options.
+
+* Fri Nov 28 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-5
+- magicpoint-1.10a-fix-gcc-warnings.patch: updated for more gcc3 compliant. (#110773)
+
+* Fri Sep 19 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-4
+- added some missing BuildRequires.
+
+* Tue Sep 02 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-3
+- magicpoint-1.10a-fixtypo-opaque.patch: applied a patch to work the opaque.
+
+* Wed Aug 20 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-2
+- magicpoint-1.10a-longline.patch: fixed the freeze if the line is too long. (#100736)
+
+* Wed Jun 25 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-1
+- New upstream release.
+- removed the dependency of watanabe-vf due to the copyright issue.
+- add fontconfig-devel and XFree86-devel to BuildReqruies.
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu May 22 2003 Jeremy Katz <katzj at redhat.com> 1.09a-12
+- gcc 3.3 doesn't implement varargs.h, include stdarg.h instead
+
+* Fri Apr 18 2003 Akira TAGOH <tagoh at redhat.com> 1.09a-11
+- rebuild.
+
+* Fri Apr 18 2003 Akira TAGOH <tagoh at redhat.com> 1.09a-10
+- magicpoint-1.09a-rpath.patch: don't specify -rpath. (#65966)
+- magicpoint-1.09a-fix-gcc-warnings.patch: applied to fix gcc warnings. (#79642)
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 1.09a-8
+- add VFlib2-conf-ja >=2.25.6-8 as a requirement to fix bug 74105
+
+* Wed Nov 20 2002 Tim Powers <timp at redhat.com>
+- rebuild on all arches
+
+* Tue Jun 25 2002 Owen Taylor <otaylor at redhat.com>
+- Remove extraneous ttfonts dependency; VFlib already has that dependency
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon May 27 2002 Yukihiro Nakai <ynakai at redhat.com>
+- Remove .cvsignore file(#65241)
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Mar 26 2002 Yukihiro Nakai <ynakai at redhat.com>
+- Update to 1.09a
+
+* Tue Mar  5 2002 Jeremy Katz <katzj at redhat.com>
+- Add ttfonts to Requires (#24868)
+- rebuild in new environment
+
+* Thu Jan 31 2002 Bill Nottingham <notting at redhat.com>
+- rebuild in new environment
+
+* Wed Sep 05 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Add magicpoint to Obsoletes.
+
+* Tue Sep 04 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Add --enable-gif
+- Add watanabe-vf to Requires.
+
+* Wed Jul 18 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Delete require ttfont-ja
+
+* Mon Jul  9 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Rebuild against RHL7.2
+- Rename to MagicPoint
+- Update to 1.08a
+- Enable vflib
+
+* Wed Jan 24 2001 Tim Powers <timp at redhat.com>
+- fixed bug 24868
+
+* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
+- disable vflib to fix bug #15607
+
+* Wed Aug 2 2000 Tim Powers <timp at redhat.com>
+- rebuilt against libpng-1.0.8
+
+* Mon Jul 24 2000 Prospector <prospector at redhat.com>
+- rebuilt
+
+* Thu Jul 13 2000 Nalin Dahyabhai <nalin at redhat.com>
+- stop disabling freetype support
+
+* Mon Jul 10 2000 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Mon Jul 03 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Wed May 24 2000 Tim Powers <timp at redhat.com>
+- updated to 1.07a
+- cleaned up files list
+- using %%configure
+- fixed to use XFree86 4.0
+
+* Mon Jul 19 1999 Tim Powers <timp at redhat.com>
+- updated source to 1.05a 
+- built for 6.1
+
+* Thu Apr 15 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+
+* Fri Oct 08 1998 Michael Maher <mike at redhat.com> 
+- updated source to 1.04a
+- built for 5.2
+
+* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
+- built for PowerTools


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: MagicPoint
+# $Id$
+NAME := MagicPoint
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

magicpoint-1.09a-rpath.patch:

Index: magicpoint-1.09a-rpath.patch
===================================================================
RCS file: magicpoint-1.09a-rpath.patch
diff -N magicpoint-1.09a-rpath.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.09a-rpath.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,23 @@
+diff -ruN magicpoint-1.09a.orig/configure.in magicpoint-1.09a/configure.in
+--- magicpoint-1.09a.orig/configure.in	2003-04-18 16:49:30.000000000 +0900
++++ magicpoint-1.09a/configure.in	2003-04-18 17:14:12.000000000 +0900
+@@ -277,7 +277,7 @@
+ 		LIBS="$LIBS -L$i/lib"
+ 		OPTFLAGS="$OPTFLAGS -I$i/include"
+ 		AC_CHECK_LIB(mng, mng_initialize, 
+-			[LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
++			[LIBS="$LIBS -lmng"
+ 			 AC_DEFINE(MNG)], 
+ 		[AC_CHECK_LIB(mng, mng_readdisplay,
+ 			[LIBS="$LIBS -lmng -ljpeg"
+--- magicpoint-1.11b/configure~	2006-10-07 17:31:51.000000000 +0200
++++ magicpoint-1.11b/configure	2006-10-07 17:31:51.000000000 +0200
+@@ -4831,7 +4831,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_mng_mng_initialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_mng_mng_initialize" >&6
+ if test $ac_cv_lib_mng_mng_initialize = yes; then
+-  LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
++  LIBS="$LIBS -lmng"
+ 			 cat >>confdefs.h <<\_ACEOF
+ #define MNG 1
+ _ACEOF

magicpoint-1.10a-fix-gcc34.patch:

Index: magicpoint-1.10a-fix-gcc34.patch
===================================================================
RCS file: magicpoint-1.10a-fix-gcc34.patch
diff -N magicpoint-1.10a-fix-gcc34.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.10a-fix-gcc34.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,51 @@
+diff -ruN magicpoint-1.10a.orig/contrib/xwintoppm/dsimple.c magicpoint-1.10a/contrib/xwintoppm/dsimple.c
+--- magicpoint-1.10a.orig/contrib/xwintoppm/dsimple.c	2004-06-21 22:05:39.870925000 +0900
++++ magicpoint-1.10a/contrib/xwintoppm/dsimple.c	2004-06-21 22:05:32.567891488 +0900
+@@ -35,6 +35,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <stdio.h>
++#include <stdarg.h>
+ /*
+  * Other_stuff.h: Definitions of routines in other_stuff.
+  *
+@@ -55,6 +56,7 @@
+ void blip();
+ Window Window_With_Name();
+ void Fatal_Error();
++void outl(char *msg, ...);
+ 
+ /*
+  * Just_display: A group of routines designed to make the writting of simple
+@@ -496,12 +498,16 @@
+  */
+ /* VARARGS1 */
+ void
+-outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
+-     char *msg;
+-     char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
++outl(char *msg, ...)
+ {
++	va_list args;
++
+ 	fflush(stdout);
+-	fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
++
++	va_start(args, msg);
++	vfprintf(stderr, msg, args);
++	va_end(args);
++
+ 	fprintf(stderr, "\n");
+ 	fflush(stderr);
+ }
+diff -ruN magicpoint-1.10a.orig/contrib/xwintoppm/xwintoppm.c magicpoint-1.10a/contrib/xwintoppm/xwintoppm.c
+--- magicpoint-1.10a.orig/contrib/xwintoppm/xwintoppm.c	2004-06-21 22:05:39.871924000 +0900
++++ magicpoint-1.10a/contrib/xwintoppm/xwintoppm.c	2004-06-21 22:05:32.568891356 +0900
+@@ -138,6 +138,7 @@
+ 
+ extern int (*_XErrorFunction)();
+ extern int _XDefaultError();
++void Window_Dump(Window window, FILE *out);
+ 
+ static long parse_long (s)
+     char *s;

magicpoint-1.10a-fix-usleep.patch:

Index: magicpoint-1.10a-fix-usleep.patch
===================================================================
RCS file: magicpoint-1.10a-fix-usleep.patch
diff -N magicpoint-1.10a-fix-usleep.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.10a-fix-usleep.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,11 @@
+diff -ruN magicpoint-1.10a.orig/image/Imakefile.in magicpoint-1.10a/image/Imakefile.in
+--- magicpoint-1.10a.orig/image/Imakefile.in	2001-01-18 18:07:14.000000000 +0900
++++ magicpoint-1.10a/image/Imakefile.in	2004-02-09 11:10:02.127523603 +0900
+@@ -32,6 +32,7 @@
+ SpecialObjectRule(imagetypes.o,imagetypes.c,$(DEFS))
+ #SpecialObjectRule(png.o,png.c,$(DEFS) $(OPTFLAGS))
+ SpecialObjectRule(imlib_loader.o,imlib_loader.c,$(DEFS))
++SpecialObjectRule(send.o,send.c,$(DEFS) $(OPTFLAGS))
+ 
+ #ifndef NullParameter
+ #define  NullParameter 

magicpoint-1.10a-longline.patch:

Index: magicpoint-1.10a-longline.patch
===================================================================
RCS file: magicpoint-1.10a-longline.patch
diff -N magicpoint-1.10a-longline.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.10a-longline.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,63 @@
+diff -ruN magicpoint-1.10a.orig/draw.c magicpoint-1.10a/draw.c
+--- magicpoint-1.10a.orig/draw.c	2003-05-14 16:45:35.000000000 +0900
++++ magicpoint-1.10a/draw.c	2003-08-20 19:02:19.000000000 +0900
+@@ -4504,6 +4504,7 @@
+ 	char buf16[1024], *p16;
+ 	char out16[1024], *o16;
+ 	int ileft, oleft;
++	int forcefolding = 0;
+ #ifdef HAVE_ICONV
+ 	static iconv_t icv[3];
+ #endif
+@@ -4569,6 +4570,29 @@
+ 		if (isspace(*(p + len -1))) {
+ 		    XftTextExtents8(display, xft_font, (XftChar8 *)p, len -1, &extents);
+ 			if (state->width - state->leftfillpos / 2 - state->linewidth >= extents.xOff) goto nofolding;
++		} else {
++			/* the specified line might be too long. enforce to split the line in order to avoid the freeze. */
++			wchar_t *wcstr;
++			char *mbstr;
++			int wclength, mblength, i;
++
++			/* converting the strings to wchar to handle the multibyte characters correctly */
++			wcstr = (wchar_t *) malloc (sizeof (wchar_t) * (strlen (p) + 1));
++			wclength = mbstowcs (wcstr, p, len);
++			for (i = wclength - 1; i >= 1; i--) {
++				mbstr = (char *) malloc (sizeof (char) * (i + 1));
++				mblength = wcstombs (mbstr, wcstr, i);
++				XftTextExtents8 (display, xft_font, (XftChar8 *)p, mblength, &extents);
++				if (state->width - state->leftfillpos / 2 - state->linewidth < extents.xOff) {
++					free (mbstr);
++					free (wcstr);
++					len = mblength;
++					forcefolding = 1;
++					goto nofolding;
++				}
++				free (mbstr);
++			}
++			free (wcstr);
+ 		}
+ 
+ 		draw_line_end(state); 
+@@ -4588,9 +4612,20 @@
+ 	if (obj_new_xftfont(state, state->linewidth, 0, p, len, 
+ 				fontname, registry, char_size[caching], charset16, xft_font)){
+ 		state->linewidth += extents.xOff;
++		if (forcefolding == 1) {
++			draw_line_end (state);
++			draw_line_start (state);
++			state->linewidth = state->leftfillpos;
++		}
+ 		return p + len;
+-	} else
++	} else {
++		if (forcefolding == 1) {
++			draw_line_end (state);
++			draw_line_start (state);
++			state->linewidth = state->leftfillpos;
++		}
+ 		return NULL; 
++	}
+ }
+ static int
+ obj_new_xftfont(state, x, y, p, len, fontname, registry, size, charset16, xft_font)

magicpoint-1.11a-fix-gcc-warnings.patch:

Index: magicpoint-1.11a-fix-gcc-warnings.patch
===================================================================
RCS file: magicpoint-1.11a-fix-gcc-warnings.patch
diff -N magicpoint-1.11a-fix-gcc-warnings.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.11a-fix-gcc-warnings.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,98 @@
+diff -ruN magicpoint-1.11a.orig/contrib/xwintoppm/dsimple.c magicpoint-1.11a/contrib/xwintoppm/dsimple.c
+--- magicpoint-1.11a.orig/contrib/xwintoppm/dsimple.c	1998-02-13 16:48:29.000000000 +0900
++++ magicpoint-1.11a/contrib/xwintoppm/dsimple.c	2004-09-15 21:09:10.000000000 +0900
+@@ -495,6 +495,7 @@
+  *       printf with up to 7 arguments.
+  */
+ /* VARARGS1 */
++void
+ outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
+      char *msg;
+      char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+diff -ruN magicpoint-1.11a.orig/contrib/xwintoppm/xwintoppm.c magicpoint-1.11a/contrib/xwintoppm/xwintoppm.c
+--- magicpoint-1.11a.orig/contrib/xwintoppm/xwintoppm.c	1998-08-26 14:30:16.000000000 +0900
++++ magicpoint-1.11a/contrib/xwintoppm/xwintoppm.c	2004-09-15 21:09:10.000000000 +0900
+@@ -281,6 +281,7 @@
+  *              writting.
+  */
+ 
++void
+ Window_Dump(window, out)
+      Window window;
+      FILE *out;
+@@ -716,9 +717,9 @@
+     return ncolors ;
+ }
+ 
+-_swapshort (bp, n)
+-    register char *bp;
+-    register unsigned n;
++void
++_swapshort (register char *bp,
++	    register unsigned n)
+ {
+     register char c;
+     register char *ep = bp + n;
+@@ -731,9 +732,9 @@
+     }
+ }
+ 
+-_swaplong (bp, n)
+-    register char *bp;
+-    register unsigned n;
++void
++_swaplong (register char *bp,
++	   register unsigned  n)
+ {
+     register char c;
+     register char *ep = bp + n;
+diff -ruN magicpoint-1.11a.orig/image/gif.c magicpoint-1.11a/image/gif.c
+--- magicpoint-1.11a.orig/image/gif.c	2000-03-07 15:59:56.000000000 +0900
++++ magicpoint-1.11a/image/gif.c	2004-09-15 21:09:11.000000000 +0900
+@@ -103,7 +103,7 @@
+ 			if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth ||
+ 			   GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) {
+ 				fprintf(stderr,
+-"Image %d is not confined to screen dimension, aborted.\n");
++"Image %d is not confined to screen dimension, aborted.\n", GifFile->ImageCount);
+ 				exit(-2);
+ 			}
+ 			if (GifFile->Image.Interlace) {
+@@ -200,8 +200,8 @@
+ 	if (gifp == NULL)
+ 		ret = 0;
+ 	else {
++		tellAboutImage(name, gifp);
+ 		DGifCloseFile(gifp);
+-		tellAboutImage(name);
+ 		ret = 1;
+ 	}
+ 	return ret;
+diff -ruN magicpoint-1.11a.orig/image/pbm.c magicpoint-1.11a/image/pbm.c
+--- magicpoint-1.11a.orig/image/pbm.c	1998-12-28 17:23:14.000000000 +0900
++++ magicpoint-1.11a/image/pbm.c	2004-09-15 21:05:27.000000000 +0900
+@@ -359,8 +359,10 @@
+        */
+ 
+       destptr = image->data;
+-      for (y = 0; y < size; y++)
+-	*(destptr++) = PM_SCALE(*destptr, maxval, 0xff);
++      for (y = 0; y < size; y++) {
++	*destptr = PM_SCALE(*destptr, maxval, 0xff);
++	destptr++;
++      }
+       break;
+ 
+     case ITRUE:
+diff -ruN magicpoint-1.11a.orig/image/png.c magicpoint-1.11a/image/png.c
+--- magicpoint-1.11a.orig/image/png.c	2001-04-11 17:37:00.000000000 +0900
++++ magicpoint-1.11a/image/png.c	2004-09-15 21:09:11.000000000 +0900
+@@ -44,7 +44,7 @@
+ #define PNG_CHECK_BYTES 4
+ 
+ int 
+-pngIdent(char *fullname, char *name) {}
++pngIdent(char *fullname, char *name) {return 0;}
+     
+ Image *
+ pngLoad(fullname, name, verbose)

magicpoint-1.11b-64bit.patch:

--- NEW FILE magicpoint-1.11b-64bit.patch ---
--- magicpoint-1.11b/draw.c.64bit	2006-10-21 13:29:24.000000000 +0200
+++ magicpoint-1.11b/draw.c	2006-10-21 13:27:28.000000000 +0200
@@ -4884,8 +4884,8 @@
 	char *registry;
 {
 	char *xfont;
-	static XftFont *last_xftfont;
-	static char lastfont[100];
+	static XftFont *last_xftfont = NULL;
+	static char lastfont[100] = "";
 	static int lastsize = 0;
 	XftFont *xftfont;
 	char *p, *p2;
@@ -4934,12 +4934,12 @@
 		    XFT_FAMILY, XftTypeString, font,
 		    XFT_ENCODING, XftTypeString, registry,
 		    XFT_STYLE, XftTypeString, style,
-		    XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
+		    XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL);
 	} else {
 		xftfont = XftFontOpen(display, screen,
 		    XFT_FAMILY, XftTypeString, font,
 		    XFT_ENCODING, XftTypeString, registry,
-		    XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
+		    XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL);
 	}
 	if (xftfont == 0) {
 		free(xfont);
@@ -4950,6 +4950,9 @@
 		fprintf(stderr, "using xftfont [%s] size: %d\n", lastfont,
 		    csize);
 	}
+	if (last_xftfont)
+		XftFontClose(display, last_xftfont);
+	
 	lastsize = csize;
 	last_xftfont = xftfont;
 	free(xfont);

magicpoint-1.11b-debian.patch:

--- NEW FILE magicpoint-1.11b-debian.patch ---
--- mgp-1.11b.orig/contrib/mgp2html.pl.in
+++ mgp-1.11b/contrib/mgp2html.pl.in
@@ -79,10 +79,18 @@
 
 &prologue;
 while (<>) {
-	s/\n$//;
+	s/[\n\r]*$//; # trim CR and LF
+	s/</&lt;/g; # escape < as &lt;
 
 	$_ = '' if (/^#/o);
 
+	# multiline processing (lines ending with '\')
+	while ((/\\$/) && (not eof())) {
+		$_=substr($_,0,-1); # cuts last char (should be '\')
+		$_=$_.<>; # concatenate next line
+		s/[\n\r]*$//; # trim CR and LF
+	}
+
 	if ($_ eq '' || $_ =~ /^[^%]/) {
 		$line++;
 		$cont = 0 if ($cont == 2);
@@ -103,6 +111,8 @@
 		next;
 	}
 
+        $cont = 0 if ($cont == 2);
+        $cont = 2 if ($cont == 1);
 	&cmds($_);
 }
 &pageepilogue;
@@ -152,14 +162,15 @@
 			if (!$doimage) {
 				# don't use images
 			} elsif (scalar(@dir) == 2 || scalar(@dir) == 3) {
-				print "<IMG SRC=\"$dir[1]\" ALT=\"$dir[1]\">\n";
+				&output("<IMG SRC=\"$dir[1]\" ALT=\"$dir[1]\">\n");
 			} elsif (scalar(@dir) == 4) {
 				# interpretation wrong
-				print "<IMG SRC=\"$dir[1]\" WIDTH=$dir[3]% HEIGHT=$dir[3]% ALT=\"$dir[1]\">\n";
+				&output("<IMG SRC=\"$dir[1]\" WIDTH=$dir[3]% HEIGHT=$dir[3]% ALT=\"$dir[1]\">\n");
 			} elsif (scalar(@dir) >= 5) {
 				# interpretation wrong
-				print "<IMG SRC=\"$dir[1]\" WIDTH=$dir[3]% HEIGHT=$dir[4]% ALT=\"$dir[1]\">\n";
+				&output("<IMG SRC=\"$dir[1]\" WIDTH=$dir[3]% HEIGHT=$dir[4]% ALT=\"$dir[1]\">\n");
 			}
+			$endline = "<BR>\n";
 		} elsif ($dir[0] eq 'nodefault') {
 			$nodefault++;
 		} elsif ($dir[0] =~ /^(left|leftfill|right|center)$/) {
--- mgp-1.11b.orig/contrib/mgpnet.in
+++ mgp-1.11b/contrib/mgpnet.in
@@ -32,7 +32,7 @@
 
 # configurations
 $tmpdir = '/tmp';
-$httpdatestr = "date '+\%a, \%d \%b \%Y \%H:\%M:\%S \%Z'";
+$httpdatestr = "env LC_ALL=C date '+\%a, \%d \%b \%Y \%H:\%M:\%S \%Z'";
 $seltimeout = 1;
 $refreshtimeout = 10;
 $debug = 0;
@@ -53,6 +53,7 @@
 		} while ($hostname =~ /^127\./);
 		close(IN);
 	};
+	$hostname =~ s/^addr://; # for GNU/Linux, by ukai
 	print "http://$hostname:$port/\n";
 	exit 0;
 }
@@ -150,19 +151,19 @@
 	vec($rin, fileno(S), 1) = 1;
 	vec($win, fileno(S), 1) = 1;
 	$ewin = $rin | $win;
-	print STDERR "waiting for connetion...\n" if ($debug);
+	print STDERR "waiting for connection...\n" if ($debug);
 	($nfound, $timeleft) = 
 		select($rout = $rin, $wout = $win, $eout = $ein, $seltimeout);
 	next if ($nfound <= 0);
 	if (vec($rout, fileno(S), 1)) {
-		print STDERR "accepting connetion...\n" if ($debug);
+		print STDERR "accepting connection...\n" if ($debug);
 		accept(NS, S) || do {
 			print STDERR "server: accept fail\n" if ($debug);
 			next;
 		};
 
 		$acceptstat++;
-		print STDERR "connetion accepted...\n" if ($debug);
+		print STDERR "connection accepted...\n" if ($debug);
 
 		$pid = fork;
 		if ($pid < 0) {
@@ -185,7 +186,7 @@
 	}
 }
 print STDERR "leaving MagicPoint Netserver...\n";
-print STDERR "accepted $acceptstat connetions so far.\n";
+print STDERR "accepted $acceptstat connections so far.\n";
 close(NS);
 close(S);
 unlink($imagefile);
@@ -256,7 +257,7 @@
 	$httpmethod = $httppath = $httpver = '';
 	($httpmethod, $httppath, $httpver) = split(/\s+/, $httpreq);
 	$httppath =~ s/http:\/\/[^:\/]+(:\d+)\//\//;
-	if ($httpver eq '' || $httpver eq 'HTTP/1.0') {
+	if ($httpver eq '' || $httpver =~ m'HTTP/1.[01]') {
 		;	# ok
 	} else {
 		&httpheader(501, $cthtml) if ($httpver);
@@ -350,7 +351,7 @@
 <HEAD><TITLE>File Not found</TITLE></HEAD>
 <BODY><H1>File Not found</H1>
 The requested URL $httppath was not found on this server.<P>
-Looks like a mitake in configuration.
+Looks like a mistake in configuration.
 Contact the administrator.<P>
 </BODY>
 EOF
@@ -415,7 +416,7 @@
 'XXX4', 'SO_REUSEPORT',	'XXX5', 'SOCK_STREAM',	'XXX6', 'WNOHANG',
 );
 	$tmpnam = &tmpname;
-	open(CPP, "| @CPP@ >$tmpnam") || return;
+	open(CPP, "| @CPP@ - >$tmpnam") || return;
 	print CPP "#include <sys/socket.h>\n";
 	print CPP "#include <sys/wait.h>\n";
 	foreach $tmp (keys %varnames) {
@@ -439,12 +440,19 @@
 		$havesinlen = 0; $sockaddr = 'S n a4 x8';
 	}
 
+	use Socket;
 	foreach $i (keys %varnames) {
 		if (@tmp2 = grep($_ =~ /^$i/, @tmp1)) {
 			$tmp = (split(/\s+/, @tmp2[0]))[1];
 			$tmp = oct($tmp) if ($tmp =~ /^0/);
-			next if ($tmp !~ /^[0-9]+$/);
-			eval "\$$varnames{$i} = \$tmp;";
+			if ($tmp =~ /^[0-9]+$/) {
+			    eval "\$$varnames{$i} = \$tmp;";
+			} else {
+			    # some constant defined by enum, so we can not
+			    # always use cpp as above. I believe use Socket
+			    # is more reliable in these days.
+			    eval "\$$varnames{$i} = &$varnames{$i};";
+			}
 		}
 	}
 }
--- mgp-1.11b.orig/README.lang
+++ mgp-1.11b/README.lang
@@ -16,6 +16,9 @@
 
 	%charset "iso8859-1"
 
+Note that this directive can be used after %page directive, that is,
+you can't use %charset directive in preamble.
+
 In the future, we will add more encodings to charset directive, like
 "iso2022-jp", or "euc-jp"
 
--- mgp-1.11b.orig/mgpembed.pl.in
+++ mgp-1.11b/mgpembed.pl.in
@@ -85,12 +85,20 @@
 			print OUT;
 			next;
 		}
-		if (/^%(.*)image\s+/i) {
-			$prefix = $1; $postfix = $';
-			if ($postfix =~ /\"([^"]*)\"/) { 
-                # "]*)\"/) { # (workaround for bug in Emacs Perl-syntax)
+		if (/^%(.*)image\s+([^,]+)/i) {
+			$a = $1; $fname0 = $fname = $2; $b = $';
+			if ($a =~ /new$/) {
+			    if ($fname =~ /\"([^"]*)\"$/) {
 				$fname = $1;
-			} elsif ($b =~ /^(\S+)/) {
+			    }
+			} else {
+			    if ($fname =~ /\s.*/) {
+				$b = $' . $b;
+			    }
+			}
+			if ($fname =~ /^\"([^"]*)\"/) {
+				$fname = $1;
+			} elsif ($fname =~ /^(\S+)/) {
 				$fname = $1;
 			}
 			$base = $fname;
@@ -106,10 +114,11 @@
 			}
 			$files{$base} = $fname;
 			$embfn = "EMBEDDIR/" . $base;
-			$postfix =~ s/\"$fname\"/\"$embfn\"/;
+			$fname0 =~ s/$fname/$embfn/;
 			print OUT '%';
-			print OUT "$prefix";
-			print OUT "image $postfix";
+			print OUT "$a";
+			print OUT "image $fname0";
+			print OUT "$b";
 		} elsif (/^%(.*)include\s+(\S+)(.*)$/i) {
 			$incfname = $2;
 			if ($incfname =~ /^\"(.+)\"$/) {
--- mgp-1.11b.orig/parse.c
+++ mgp-1.11b/parse.c
@@ -782,6 +782,10 @@
 				}
 			}
 		} else {
+#if 1 /* escape % by backslash */
+			if (buf[0] == 0x5c)
+				memcpy(&buf[0], &buf[1], strlen(buf));
+#endif
 			/* this is data */
 
 			/*
@@ -1091,6 +1099,7 @@
 				case CTL_TMFONT: tmpstr[4] = cp; break;
 #endif
 				case CTL_XFONT2:
+					define_font (cp);
 					if (strcmp(cp->ctc2_value2,
 							"iso8859-1") == 0) {
 						tmpstr[2] = cp;
@@ -1913,7 +1922,7 @@
 	int i;
 
 	/* find duplicated def */
-	for (i = 0; i < MAXFONTDEF; i++) {
+	for (i = 0; cp->ct_op != CTL_XFONT2 && i < MAXFONTDEF; i++) {
 		if (!fontdef_control[i])
 			continue;
 		if (strcmp(fontdef_control[i]->ctc_value,
@@ -1949,8 +1958,10 @@
 	for (i = 0; i < MAXFONTDEF; i++) {
 		if (!fontdef_control[i])
 			continue;
-		if (strcmp(fontdef_control[i]->ctc_value, font) == 0)
+		if (fontdef_control[i]->ct_op != CTL_XFONT2
+		    && strcmp(fontdef_control[i]->ctc_value, font) == 0) {
 			return fontdef_control[i];
+		}
 	}
 	return NULL;
 }
--- mgp-1.11b.orig/sample/sample-fr.mgp
+++ mgp-1.11b/sample/sample-fr.mgp
@@ -182,6 +182,8 @@
 this is test
 %endfilter
 
+	Pour voir cette feature (et les 2 slides prochains) il faut utiliser -U parce que c'est dangereux.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 
--- mgp-1.11b.orig/sample/sample-jp.mgp
+++ mgp-1.11b/sample/sample-jp.mgp
@@ -312,6 +312,9 @@
 %filter "rev"
 this is test
 %endfilter
+
+	$B$3$N%U%#!<%A%c!<$O4m$$$G$9$+$i(B -U $B$,I,MW$G$9!J<!$N#2%9%i%$%I$b!K(B
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 
--- mgp-1.11b.orig/sample/sample.mgp
+++ mgp-1.11b/sample/sample.mgp
@@ -229,6 +229,8 @@
 this is test
 %endfilter
 
+	Note the -U command line option is required to make this (un-secure) feature and the next two slides work.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 %bgrad 0 0 256 0 0 "white" "blue"

magicpoint-1.11b-embed.patch:

--- NEW FILE magicpoint-1.11b-embed.patch ---
--- magicpoint-1.11b/draw.c~	2006-10-21 15:48:48.000000000 +0200
+++ magicpoint-1.11b/draw.c	2006-10-21 15:48:48.000000000 +0200
@@ -3750,7 +3750,7 @@
 		target = parent;
 	}
 	XReparentWindow(display, child_window, window, x, y);
-#if 0
+#if 1
 	XDestroyWindow(display, target);
 #endif
 }


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Oct 2006 14:39:38 -0000	1.4
@@ -0,0 +1 @@
+2b627f17443842eb5009304864577a4c  magicpoint-1.11b.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 17:01:37 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:01:37 -0700
Subject: rpms/vkeybd - New directory
Message-ID: <200610211701.k9LH1bbF028210@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206/vkeybd

Log Message:
Directory /cvs/extras/rpms/vkeybd added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 17:01:42 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:01:42 -0700
Subject: rpms/vkeybd/devel - New directory
Message-ID: <200610211701.k9LH1gq2028226@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206/vkeybd/devel

Log Message:
Directory /cvs/extras/rpms/vkeybd/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 17:02:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:02:34 -0700
Subject: rpms/vkeybd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610211702.k9LH2YnT028266@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28258

Added Files:
	Makefile import.log 
Log Message:
Setup of module vkeybd


--- NEW FILE Makefile ---
# Top level Makefile for module vkeybd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 21 17:02:37 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:02:37 -0700
Subject: rpms/vkeybd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610211702.k9LH2bxi028282@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28258/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vkeybd


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 21 17:05:31 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:05:31 -0700
Subject: rpms/vkeybd import.log,1.1,1.2
Message-ID: <200610211705.k9LH5Vhv028408@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28353

Modified Files:
	import.log 
Log Message:
auto-import vkeybd-0.1.17a-1 on branch devel from vkeybd-0.1.17a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vkeybd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Oct 2006 17:02:34 -0000	1.1
+++ import.log	21 Oct 2006 17:05:01 -0000	1.2
@@ -0,0 +1 @@
+vkeybd-0_1_17a-1:HEAD:vkeybd-0.1.17a-1.src.rpm:1161450293



From fedora-extras-commits at redhat.com  Sat Oct 21 17:05:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:05:34 -0700
Subject: rpms/vkeybd/devel vkeybd-CFLAGS.patch, NONE, 1.1 vkeybd-lash-2.patch,
	NONE, 1.1 vkeybd-lash.patch, NONE, 1.1 vkeybd.desktop, NONE,
	1.1 vkeybd.png, NONE, 1.1 vkeybd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610211705.k9LH5Y2M028413@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28353/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vkeybd-CFLAGS.patch vkeybd-lash-2.patch vkeybd-lash.patch 
	vkeybd.desktop vkeybd.png vkeybd.spec 
Log Message:
auto-import vkeybd-0.1.17a-1 on branch devel from vkeybd-0.1.17a-1.src.rpm

vkeybd-CFLAGS.patch:

--- NEW FILE vkeybd-CFLAGS.patch ---
--- Makefile.orig	2006-04-25 11:28:38.000000000 -0400
+++ Makefile	2006-04-25 11:31:19.000000000 -0400
@@ -84,7 +84,7 @@
 
 VKB_TCLFILE = $(VKBLIB_DIR)/vkeybd.tcl
 
-CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
+CFLAGS = -Wall $(RPM_OPT_FLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
 	-DVERSION_STR=\"$(VERSION)\"\
 	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)

vkeybd-lash-2.patch:

--- NEW FILE vkeybd-lash-2.patch ---
--- README~	2006-09-25 09:00:12.000000000 -0700
+++ README	2006-09-25 09:08:53.000000000 -0700
@@ -46,8 +46,8 @@
       To disable a device, set the value 0.  Do not undefine it.
       At least one of them must have non-zero value.
 
-  - USE_LADCCA
-      Supports LADCCA (http://pkl.net/~node/software/)
+  - USE_LASH
+      Supports LASH (http://www.nongnu.org/lash/)
       Set 1 to add the this support.
 
   - TCLLIB
@@ -106,7 +106,7 @@
 	device port.  This options makes vkeybd possible to "fake"
 	as a real MIDI device.
   --lash bool
-	Specify the support of LADCCA.  Give yes or no as the
+	Specify the support of LASH.  Give yes or no as the
 	argument.  The default value is no.
 
 OSS Sequencer Device Option:

vkeybd-lash.patch:

--- NEW FILE vkeybd-lash.patch ---
--- Makefile~	2006-04-25 07:00:14.000000000 -0400
+++ Makefile	2006-04-25 07:00:36.000000000 -0400
@@ -30,7 +30,7 @@
 USE_AWE = 1
 USE_MIDI = 1
 USE_ALSA = 1
-USE_LADCCA = 0
+USE_LASH = 0
 
 #
 # Tcl/Tk library -- depends on your distribution
@@ -68,14 +68,14 @@
 endif
 
 #
-# LADCCA stuff
+# LASH stuff
 #
-ifeq (1,$(USE_LADCCA))
-LADCCACFLAGS = $(shell pkg-config --cflags ladcca-1.0) \
-	       $(shell pkg-config --exists ladcca-1.0 && echo "-DHAVE_LADCCA" )
-LADCCALIBS   = $(shell pkg-config --libs ladcca-1.0)
-DEVICES += $(LADCCACFLAGS)
-EXTRALIB += $(LADCCALIBS)
+ifeq (1,$(USE_LASH))
+LASHCFLAGS = $(shell pkg-config --cflags lash-1.0) \
+	       $(shell pkg-config --exists lash-1.0 && echo "-DHAVE_LASH" )
+LASHLIBS   = $(shell pkg-config --libs lash-1.0)
+DEVICES += $(LASHCFLAGS)
+EXTRALIB += $(LASHLIBS)
 endif
 
 #----------------------------------------------------------------
@@ -87,7 +87,7 @@
 CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
 	-DVERSION_STR=\"$(VERSION)\"\
-	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LADCCACFLAGS)
+	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)
 
 TARGETS = vkeybd sftovkb
 
--- oper_alsa.c~	2006-04-25 06:59:53.000000000 -0400
+++ oper_alsa.c	2006-04-25 07:00:36.000000000 -0400
@@ -79,7 +79,7 @@
 	{"addr", "subscriber", "--addr client:port or 'subscriber' : ALSA sequencer destination"},
 	{"name", DEFAULT_NAME, "--name string : use the specified string as client/port names"},
 #ifdef HAVE_LADCCA	
-	{"ladcca", "no", "--ladcca <yes|no> : support LADCCA (default = no)"},
+	{"lash", "no", "--lash <yes|no> : support LASH (default = no)"},
 #endif
 	{NULL},
 };
@@ -100,7 +100,7 @@
 static int seq_client, seq_port;
 static int chan_no;
 
-#ifdef HAVE_LADCCA	
+#ifdef HAVE_LASH	
 static cca_client_t * cca_client = NULL;
 #endif
 
@@ -156,9 +156,9 @@
 	/* get my client id */
 	my_client = snd_seq_client_id(seq_handle);
 	
-	/* tell the ladcca server our client id */
-#ifdef HAVE_LADCCA
-	if ((var = Tcl_GetVar2(ip, "optvar", "ladcca", TCL_GLOBAL_ONLY)) != NULL) {
+	/* tell the lash server our client id */
+#ifdef HAVE_LASH
+	if ((var = Tcl_GetVar2(ip, "optvar", "lash", TCL_GLOBAL_ONLY)) != NULL) {
 		if (*var == 'y' || *var == 'Y' || *var == '1') {
 			cca_client = cca_init (cca_args,
 					       "vkeybd",
@@ -174,7 +174,7 @@
 			}
 		}
 	}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
  
 	/* set client info */
 	if ((var = Tcl_GetVar2(ip, "optvar", "name", TCL_GLOBAL_ONLY)) != NULL)
@@ -203,7 +203,7 @@
 	if (seq_client != SND_SEQ_ADDRESS_SUBSCRIBERS) {
 		/* subscribe to MIDI port */
 		if (
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
 		    !cca_enabled (cca_client) &&
 #endif
 		    snd_seq_connect_to(seq_handle, my_port, seq_client, seq_port) < 0) {
--- README~	2006-04-25 06:59:57.000000000 -0400
+++ README	2006-04-25 07:00:36.000000000 -0400
@@ -105,7 +105,7 @@
 	tk707 check the client/port name whether it is a valid MIDI
 	device port.  This options makes vkeybd possible to "fake"
 	as a real MIDI device.
-  --ladcca bool
+  --lash bool
 	Specify the support of LADCCA.  Give yes or no as the
 	argument.  The default value is no.
 
--- vkb.c~	2006-04-25 07:00:21.000000000 -0400
+++ vkb.c	2006-04-25 07:00:37.000000000 -0400
@@ -65,7 +65,7 @@
 static vkb_oper_t *oper;
 
 #ifdef HAVE_LADCCA	
-cca_args_t * cca_args = NULL;
+lash_args_t * lash_args = NULL;
 #endif
  
 /*
@@ -78,7 +78,7 @@
 	int c, nargc;
 
 #ifdef HAVE_LADCCA	
-	cca_args = cca_extract_args(&argc, &argv);
+	lash_args = lash_extract_args(&argc, &argv);
 #endif /* HAVE_LADCCA */
 
 	nargc = argc + 1;
--- vkb.h~	2006-04-25 07:00:29.000000000 -0400
+++ vkb.h	2006-04-25 07:00:37.000000000 -0400
@@ -24,7 +24,7 @@
 #include <tcl.h>
 
 #ifdef HAVE_LADCCA
-#include <ladcca/ladcca.h>
+#include <lash/lash.h>
 #endif
 
 #ifndef VKB_TCLFILE


--- NEW FILE vkeybd.desktop ---
[Desktop Entry]
Name=Vkeybd
Comment=Virtual MIDI keyboard
Icon=vkeybd.png
Exec=vkeybd
Terminal=false
StartupWMClass=vkeybd.tcl
Type=Application
Categories=Application;AudioVideo;
Encoding=UTF-8


--- NEW FILE vkeybd.spec ---
Summary:      Virtual MIDI keyboard
Name:         vkeybd
Version:      0.1.17a
Release:      1%{?dist}
License:      GPL
Group:        Applications/Multimedia
URL:          http://www.alsa-project.org/~iwai/alsa.html
Source0:      http://www.alsa-project.org/~iwai/vkeybd-0.1.17a.tar.bz2
Source1:      vkeybd.png
Source2:      vkeybd.desktop
Patch0:       vkeybd-lash.patch
Patch1:       vkeybd-CFLAGS.patch
Patch2:       vkeybd-lash-2.patch
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: tk-devel >= 8.4, tk-devel < 8.5
BuildRequires: lash-devel

BuildRequires: desktop-file-utils

Requires: tk >= 8.4, tk < 8.5, lash
Requires: hicolor-icon-theme

%description
This is a virtual keyboard for AWE, MIDI and ALSA drivers.
It's a simple fake of a MIDI keyboard on X-windows system.
Enjoy a music with your mouse and "computer" keyboard :-)

%prep
%setup -q -n vkeybd
%patch0 -p0
%patch1 -p0
%patch2 -p0

%build
make %{?_smp_mflags} USE_LADCCA=1 TCL_VERSION=8.4 PREFIX=%{_prefix}

%install
rm -rf $RPM_BUILD_ROOT
make USE_LADCCA=1 PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install
make USE_LADCCA=1 PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install-man
chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/*
chmod 755 $RPM_BUILD_ROOT/%{_datadir}/vkeybd/vkeybd.tcl

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/vkeybd.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE2}

%clean
rm -rf $RPM_BUILD_ROOT

%post
# update icon themes
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
# update icon themes
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_bindir}/vkeybd
%{_bindir}/sftovkb
%{_datadir}/vkeybd/
%{_mandir}/man1/*
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/vkeybd.png

%changelog
* Thu Oct 19 2006 Anthony Green <green at redhat.com> 0.1.17a-1
- Update sources.
- Remove jack-audio-connection-kit dependency, which is implied by
  lash dependency.

* Mon Sep 25 2006 Anthony Green <green at redhat.com> 0.1.17-8
- Tweak vkeybd.desktop file.
- Package ChangeLog.
- Clean up %%files.
- Move Categories to .desktop file.
- More LADCCA to LASH patching.
- Fix man page permissions.

* Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.1.17-7
- Remove Require(post,postun) for gtk2, as per the packaging
  guidelines.

* Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.1.17-6
- Remove my COPYING file.
- Don't use update-desktop-database.
- Clean up BuildRequires.
- Install the icon in the hicolor tree.
- Require hicolor-icon-theme.
- Don't Require tcl, since tk does that.
- Collar tk version requirements.
- Make vkeybd.tcl executable.
- Require(post,postun) gtk2 for gtk-update-icon-cache.

* Thu Jun  1 2006 Anthony Green <green at redhat.com> 0.1.17-5
- Add dist tag to Release.
- Build with _smp_mflags.
- Add GPL license file (COPYING).

* Tue Apr 25 2006 Anthony Green <green at redhat.com> 0.1.17-4
- Add Fernando Lopez-Lezcano's icon and related changes.
- Clean up macro usage.

* Tue Apr 25 2006 Anthony Green <green at redhat.com> 0.1.17-3
- Build with RPM_OPT_FLAGS with vkeybd-CFLAGS.patch.

* Sat Apr 22 2006 Anthony Green <green at redhat.com> 0.1.17-2
- Build for Fedora Extras.
- Port from ladcca to lash.
- Update description.

* Mon Dec 27 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.17-1
- updated to 0.1.17
- spec file cleanup
* Mon May 10 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added buildrequires, detect tcl version
* Tue Feb 24 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.15-1
- updated to 0.1.15
* Sat Jul 26 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.13a-1
- updated to 0.1.13a
- added menu entries
* Mon Dec 30 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.12-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vkeybd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Oct 2006 17:02:37 -0000	1.1
+++ .cvsignore	21 Oct 2006 17:05:04 -0000	1.2
@@ -0,0 +1 @@
+vkeybd-0.1.17a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vkeybd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Oct 2006 17:02:37 -0000	1.1
+++ sources	21 Oct 2006 17:05:04 -0000	1.2
@@ -0,0 +1 @@
+3def91f76f68203a275781d471c5b7e2  vkeybd-0.1.17a.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 17:11:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:11:34 -0700
Subject: owners owners.list,1.1859,1.1860
Message-ID: <200610211711.k9LHBYH3028568@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28552

Modified Files:
	owners.list 
Log Message:
Add vkeybd



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1859
retrieving revision 1.1860
diff -u -r1.1859 -r1.1860
--- owners.list	21 Oct 2006 09:15:36 -0000	1.1859
+++ owners.list	21 Oct 2006 17:11:04 -0000	1.1860
@@ -2279,6 +2279,7 @@
 Fedora Extras|vigra|Generic Programming for Computer Vision|bruno at postle.net|extras-qa at fedoraproject.org|
 Fedora Extras|vips|Library for processing large images|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|vkeybd|Virtual MIDI keyboard|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|vnc-reflector|A specialized, multiplexing vnc proxy server|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 21 17:42:12 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 21 Oct 2006 10:42:12 -0700
Subject: rpms/qemu/FC-3 qemu.spec,1.2,1.3
Message-ID: <200610211742.k9LHgCGU028701@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/qemu/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28670/FC-3

Modified Files:
	qemu.spec 
Log Message:
Fix BuildRoot to be in compliance with the packaging guidelines; fixes bug #194432


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-3/qemu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu.spec	13 Feb 2005 16:08:11 -0000	1.2
+++ qemu.spec	21 Oct 2006 17:41:42 -0000	1.3
@@ -8,7 +8,7 @@
 Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz
 Source1: qemu.init
 Patch0: qemu-0.6.1-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel
 PreReq: /sbin/chkconfig
 PreReq: /sbin/service
@@ -73,6 +73,9 @@
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com>
+- Fix BuildRoot to be in compliance with the Packaging Guidelines.
+
 * Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0.6.1-2
 - Package cleanup
 



From fedora-extras-commits at redhat.com  Sat Oct 21 17:42:13 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 21 Oct 2006 10:42:13 -0700
Subject: rpms/qemu/FC-4 qemu.spec,1.11,1.12
Message-ID: <200610211742.k9LHgDK5028704@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/qemu/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28670/FC-4

Modified Files:
	qemu.spec 
Log Message:
Fix BuildRoot to be in compliance with the packaging guidelines; fixes bug #194432


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qemu.spec	17 Mar 2006 11:13:27 -0000	1.11
+++ qemu.spec	21 Oct 2006 17:41:43 -0000	1.12
@@ -9,7 +9,7 @@
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-32
 PreReq: /sbin/chkconfig
 PreReq: /sbin/service
@@ -78,6 +78,9 @@
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com>
+- Fix BuildRoot to be in compliance with the Packaging Guidelines.
+
 * Fri Mar 17 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-3
 - Use -mcpu= instead of -mtune= on x86_64 too
 - Disable SPARC targets on x86_64, because dyngen doesn't like fnegs



From fedora-extras-commits at redhat.com  Sat Oct 21 19:03:52 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Sat, 21 Oct 2006 12:03:52 -0700
Subject: mock mock.spec,1.16.2.11,1.16.2.12 ChangeLog,1.8.2.2,1.8.2.3
Message-ID: <200610211903.k9LJ3qe3002702@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2682

Modified Files:
      Tag: mock-0-6-branch
	mock.spec ChangeLog 
Log Message:
fixed problem generating tarball


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.16.2.11
retrieving revision 1.16.2.12
diff -u -r1.16.2.11 -r1.16.2.12
--- mock.spec	11 Sep 2006 16:37:32 -0000	1.16.2.11
+++ mock.spec	21 Oct 2006 19:03:48 -0000	1.16.2.12
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.5
+Version: 0.6.6
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
+- bumped version to 0.6.6 (fixed tarball problem)
+
 * Mon Sep 11 2006 Clark Williams <williams at redhat.com> - 0.6.5-1
 - changed version number for patch from Karanbir Singh
   (rpm workaround on CentOS 4.4)


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/mock/ChangeLog,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- ChangeLog	11 Sep 2006 16:37:32 -0000	1.8.2.2
+++ ChangeLog	21 Oct 2006 19:03:48 -0000	1.8.2.3
@@ -1,3 +1,8 @@
+2006-10-21  Clark Williams  <williams at redhat.com>
+
+	* mock.spec
+	Bumped version to 0.6.6
+
 2006-09-11 11:21  jcwillia
 	* mock.py
 	added patch from Karanbir Singh to fix RPM problem in 



From fedora-extras-commits at redhat.com  Sat Oct 21 19:04:04 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Sat, 21 Oct 2006 12:04:04 -0700
Subject: mock Makefile,1.8.2.4,1.8.2.5
Message-ID: <200610211904.k9LJ44fL002726@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2708

Modified Files:
      Tag: mock-0-6-branch
	Makefile 
Log Message:
fixed problem generating tarball


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- Makefile	29 Aug 2006 19:55:58 -0000	1.8.2.4
+++ Makefile	21 Oct 2006 19:04:02 -0000	1.8.2.5
@@ -26,8 +26,8 @@
 	mkdir -p $(DESTDIR)/var/lib/mock
 	for d in $(SUBDIRS); do make  DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
 
-archive:
-	@rm -rf ${PKGNAME}-%{VERSION}.tar.gz
+archive: clean
+	@rm -rf ${PKGNAME}-*.tar.gz
 	@rm -rf /tmp/${PKGNAME}-$(VERSION) /tmp/${PKGNAME}
 	@dir=$$PWD; cd /tmp; cp -a $$dir ${PKGNAME}
 	@rm -rf /tmp/${PKGNAME}/${PKGNAME}-daily.spec /tmp/${PKGNAME}/build /tmp/${PKGNAME}/dist



From fedora-extras-commits at redhat.com  Sat Oct 21 19:41:42 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sat, 21 Oct 2006 12:41:42 -0700
Subject: rpms/libburn/devel .cvsignore, 1.2, 1.3 libburn.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610211941.k9LJfgO6003037@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/libburn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3017

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
0.2.2 release; add html docs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libburn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Aug 2006 02:42:02 -0000	1.2
+++ .cvsignore	21 Oct 2006 19:41:12 -0000	1.3
@@ -1 +1,2 @@
 libburn-0.2svn.tar.gz
+libburn-0.2.2.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/extras/rpms/libburn/devel/libburn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libburn.spec	8 Sep 2006 20:08:54 -0000	1.2
+++ libburn.spec	21 Oct 2006 19:41:12 -0000	1.3
@@ -1,18 +1,15 @@
-%define         mainver 0.2
-# define this as version gets overridden by the subpackage with its own version
-
 Name:           libburn
-Version:        0.2
-Release:        4.20060908svn%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libburn.pykix.org/
-Source0:        %{name}-%{version}svn.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake libtool intltool gettext 
+BuildRequires:  automake libtool intltool gettext doxygen graphviz
 #Requires:       
 
 %description
@@ -61,8 +58,7 @@
 %package -n     cdrskin
 Summary:        Limited cdrecord compatibility wrapper to ease migration to libburn
 Group:          Applications/Multimedia
-Version:        0.1.4
-Requires:       %{name} = %{mainver}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description -n cdrskin
 A limited cdrecord compatibility wrapper which allows to use some libburn 
@@ -70,13 +66,14 @@
 
 
 %prep
-%setup -n %{name}-%{mainver}svn -q
+%setup -q
 
 
 %build
-./bootstrap
+#./bootstrap
 %configure --disable-static
 make %{?_smp_mflags}
+doxygen doc/doxygen.conf
 
 
 %install
@@ -84,6 +81,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -102,7 +101,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT README
+%doc AUTHORS COPYING COPYRIGHT README doc/html
 %{_libdir}/%{name}*.so.*
 
 %files devel
@@ -131,6 +130,12 @@
 
 
 %changelog
+* Fri Oct 20 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-1
+- 0.2.2 release
+
+* Tue Sep 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2-5.20060808svn
+- Create doxygen docs
+
 * Fri Sep  8 2006 Jesse Keating <jkeating at redhat.com> - 0.2-4.20060808svn
 - rebuild with new snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libburn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 20:08:54 -0000	1.3
+++ sources	21 Oct 2006 19:41:12 -0000	1.4
@@ -1 +1 @@
-87ba6cf624ccc53b5b086a0e72b5d39c  libburn-0.2svn.tar.gz
+20d0903d6b3fc646d32888cc91b12376  libburn-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 20:01:27 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:01:27 -0700
Subject: rpms/GtkAda/FC-5 .cvsignore, 1.3, 1.4 GtkAda.spec, 1.15,
	1.16 sources, 1.3, 1.4 GtkAda-case-none.patch, 1.1,
	NONE GtkAda-pkgconfig.patch, 1.1, NONE
Message-ID: <200610212001.k9LK1RRJ006155@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3224

Modified Files:
	.cvsignore GtkAda.spec sources 
Removed Files:
	GtkAda-case-none.patch GtkAda-pkgconfig.patch 
Log Message:
new version 2.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 21:33:53 -0000	1.3
+++ .cvsignore	21 Oct 2006 20:00:54 -0000	1.4
@@ -1 +1 @@
-GtkAda-2.4.0.tgz
+GtkAda-gpl-2.8.0.tgz


Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- GtkAda.spec	17 Feb 2006 21:32:17 -0000	1.15
+++ GtkAda.spec	21 Oct 2006 20:00:54 -0000	1.16
@@ -1,13 +1,13 @@
 Name:		GtkAda
-Version:	2.4.0
-Release:	11%{?dist}
+Version:	2.8.0
+Release:	1%{?dist}
 
 Summary:	Ada95 graphical toolkit based on Gtk+
 
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://libre.act-europe.fr/GtkAda
-Source:         http://libre.act-europe.fr/GtkAda/GtkAda-2.4.0.tgz
+Source:         http://libre.act-europe.fr/GtkAda/GtkAda-gpl-2.8.0.tgz
 Patch0:		GtkAda-case-none.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
@@ -26,104 +26,90 @@
 %description
 GtkAda is an Ada95 graphical toolkit based on Gtk+, providing the
 complete set of Gtk+ widgets using the Object-Oriented features of
-this language. GtkAda supports the latest 2.4 stable releases.
+this language. GtkAda supports the latest 2.8 stable releases.
+
 
 %package devel
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}, perl
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 
 %description devel
 Development files for GtkAda.
 
+
 %prep
-%setup -q
-%patch0 -p1 -b .case-none
+%setup -q -n %{name}-gpl-%{version}
+
 
 %build
+# adapt opt flags to gnatmake
+GNAT_RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|--param=ssp-buffer-size=4||'`
+sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
-perl -pi -e 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-(
-    mkdir -p src/lib-obj;
-    cd src/lib-obj;
-)
+sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
 make
 make -C docs
 
+
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
+(make -C docs install prefix=$PWD/doc-install)
+
+# move shared libraries to standard place
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*
+mv $RPM_BUILD_ROOT%{_libdir}/gtkada/lib* $RPM_BUILD_ROOT%{_libdir}
 
 # make libraries executables, otherwise dependencies are not found
-chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*
+chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
+find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
-cp -a ${RPM_BUILD_ROOT}%{_datadir} .
-rm -fr ${RPM_BUILD_ROOT}%{_datadir}
-cp -a ${RPM_BUILD_ROOT}%{_prefix}/doc .
-rm -fr ${RPM_BUILD_ROOT}%{_prefix}/doc
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 ${RPM_BUILD_ROOT}%{_mandir}/man1)
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
 
 # this conflicts with gdialog from gnome-utils
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/gdialog
+rm -f $RPM_BUILD_ROOT%{_bindir}/gdialog
 
-rm -fr ${RPM_BUILD_ROOT}%{_prefix}/projects
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
-cp -a doc/GtkAda/gtkada_rm/*.info* ${RPM_BUILD_ROOT}%{_infodir}
-cp -a doc/GtkAda/gtkada_ug/*.info* ${RPM_BUILD_ROOT}%{_infodir}
-
-# prepare documentation in separate directory
-# in order to leave doc/GtkAda untouched
-rm -fr doc-install
-mkdir doc-install
-cp -fr doc/GtkAda/gtkada_rm doc/GtkAda/gtkada_ug doc-install
-rm -f doc-install/gtkada_rm/*.info*
-rm -f doc-install/gtkada_rm/*.ps
-rm -f doc-install/gtkada_rm/*.tex*
-rm -f doc-install/gtkada_rm/*.txt
-rm -f doc-install/gtkada_ug/*.info*
-rm -f doc-install/gtkada_ug/*.ps
-rm -f doc-install/gtkada_ug/*.tex*
-rm -f doc-install/gtkada_ug/*.txt
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
-%post devel
-/sbin/install-info %{_infodir}/gtkada_rm.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/gtkada_ug.info %{_infodir}/dir 2>/dev/null || :
-
-%preun devel
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/gtkada_rm.info %{_infodir}/dir 2>/dev/null || :
-  /sbin/install-info --delete %{_infodir}/gtkada_ug.info %{_infodir}/dir 2>/dev/null || :
-fi
 
 %files
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 %doc AUTHORS COPYING README
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_includedir}/gtkada
-%{_libdir}/lib*.a
+%{_libdir}/gtkada
+%{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_datadir}/gps
 %{_mandir}/man*/*
-%{_infodir}/*
-%doc share/gtkada/examples
-%doc doc-install/*
+%doc examples
+%doc doc-install/share/doc/gtkada/*
 %doc known-problems
 
+
 %changelog
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+- new version 2.8.0
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 21:33:53 -0000	1.3
+++ sources	21 Oct 2006 20:00:54 -0000	1.4
@@ -1 +1 @@
-31232d695ca40c3fb346fb34bc93ed3d  GtkAda-2.4.0.tgz
+e8ae05f6c3122b0c17555741688d47ed  GtkAda-gpl-2.8.0.tgz


--- GtkAda-case-none.patch DELETED ---


--- GtkAda-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:04:55 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:04:55 -0700
Subject: rpms/GtkAda/devel .cvsignore, 1.3, 1.4 GtkAda.spec, 1.17,
	1.18 sources, 1.3, 1.4 GtkAda-case-none.patch, 1.1,
	NONE GtkAda-pkgconfig.patch, 1.1, NONE
Message-ID: <200610212004.k9LK4ttX006200@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6177

Modified Files:
	.cvsignore GtkAda.spec sources 
Removed Files:
	GtkAda-case-none.patch GtkAda-pkgconfig.patch 
Log Message:
new version 2.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 21:33:53 -0000	1.3
+++ .cvsignore	21 Oct 2006 20:04:24 -0000	1.4
@@ -1 +1 @@
-GtkAda-2.4.0.tgz
+GtkAda-gpl-2.8.0.tgz


Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- GtkAda.spec	28 Aug 2006 11:21:55 -0000	1.17
+++ GtkAda.spec	21 Oct 2006 20:04:24 -0000	1.18
@@ -1,13 +1,13 @@
 Name:		GtkAda
-Version:	2.4.0
-Release:	13%{?dist}
+Version:	2.8.0
+Release:	1%{?dist}
 
 Summary:	Ada95 graphical toolkit based on Gtk+
 
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://libre.act-europe.fr/GtkAda
-Source:         http://libre.act-europe.fr/GtkAda/GtkAda-2.4.0.tgz
+Source:         http://libre.act-europe.fr/GtkAda/GtkAda-gpl-2.8.0.tgz
 Patch0:		GtkAda-case-none.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
@@ -28,104 +28,90 @@
 %description
 GtkAda is an Ada95 graphical toolkit based on Gtk+, providing the
 complete set of Gtk+ widgets using the Object-Oriented features of
-this language. GtkAda supports the latest 2.4 stable releases.
+this language. GtkAda supports the latest 2.8 stable releases.
+
 
 %package devel
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}, perl
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 
 %description devel
 Development files for GtkAda.
 
+
 %prep
-%setup -q
-%patch0 -p1 -b .case-none
+%setup -q -n %{name}-gpl-%{version}
+
 
 %build
+# adapt opt flags to gnatmake
+GNAT_RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|--param=ssp-buffer-size=4||'`
+sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
-perl -pi -e 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-(
-    mkdir -p src/lib-obj;
-    cd src/lib-obj;
-)
+sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
 make
 make -C docs
 
+
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
+(make -C docs install prefix=$PWD/doc-install)
+
+# move shared libraries to standard place
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*
+mv $RPM_BUILD_ROOT%{_libdir}/gtkada/lib* $RPM_BUILD_ROOT%{_libdir}
 
 # make libraries executables, otherwise dependencies are not found
-chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*
+chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
+find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
-cp -a ${RPM_BUILD_ROOT}%{_datadir} .
-rm -fr ${RPM_BUILD_ROOT}%{_datadir}
-cp -a ${RPM_BUILD_ROOT}%{_prefix}/doc .
-rm -fr ${RPM_BUILD_ROOT}%{_prefix}/doc
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 ${RPM_BUILD_ROOT}%{_mandir}/man1)
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
 
 # this conflicts with gdialog from gnome-utils
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/gdialog
+rm -f $RPM_BUILD_ROOT%{_bindir}/gdialog
 
-rm -fr ${RPM_BUILD_ROOT}%{_prefix}/projects
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
-cp -a doc/GtkAda/gtkada_rm/*.info* ${RPM_BUILD_ROOT}%{_infodir}
-cp -a doc/GtkAda/gtkada_ug/*.info* ${RPM_BUILD_ROOT}%{_infodir}
-
-# prepare documentation in separate directory
-# in order to leave doc/GtkAda untouched
-rm -fr doc-install
-mkdir doc-install
-cp -fr doc/GtkAda/gtkada_rm doc/GtkAda/gtkada_ug doc-install
-rm -f doc-install/gtkada_rm/*.info*
-rm -f doc-install/gtkada_rm/*.ps
-rm -f doc-install/gtkada_rm/*.tex*
-rm -f doc-install/gtkada_rm/*.txt
-rm -f doc-install/gtkada_ug/*.info*
-rm -f doc-install/gtkada_ug/*.ps
-rm -f doc-install/gtkada_ug/*.tex*
-rm -f doc-install/gtkada_ug/*.txt
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
-%post devel
-/sbin/install-info %{_infodir}/gtkada_rm.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/gtkada_ug.info %{_infodir}/dir 2>/dev/null || :
-
-%preun devel
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/gtkada_rm.info %{_infodir}/dir 2>/dev/null || :
-  /sbin/install-info --delete %{_infodir}/gtkada_ug.info %{_infodir}/dir 2>/dev/null || :
-fi
 
 %files
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 %doc AUTHORS COPYING README
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_includedir}/gtkada
-%{_libdir}/lib*.a
+%{_libdir}/gtkada
+%{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_datadir}/gps
 %{_mandir}/man*/*
-%{_infodir}/*
-%doc share/gtkada/examples
-%doc doc-install/*
+%doc examples
+%doc doc-install/share/doc/gtkada/*
 %doc known-problems
 
+
 %changelog
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+- new version 2.8.0
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-13
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 21:33:53 -0000	1.3
+++ sources	21 Oct 2006 20:04:24 -0000	1.4
@@ -1 +1 @@
-31232d695ca40c3fb346fb34bc93ed3d  GtkAda-2.4.0.tgz
+e8ae05f6c3122b0c17555741688d47ed  GtkAda-gpl-2.8.0.tgz


--- GtkAda-case-none.patch DELETED ---


--- GtkAda-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:07:21 -0700
Subject: rpms/magicor - New directory
Message-ID: <200610212007.k9LK7Lli006416@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6411/magicor

Log Message:
Directory /cvs/extras/rpms/magicor added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:07:27 -0700
Subject: rpms/magicor/devel - New directory
Message-ID: <200610212007.k9LK7Rwv006433@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6411/magicor/devel

Log Message:
Directory /cvs/extras/rpms/magicor/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:32 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:07:32 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.16,1.17
Message-ID: <200610212007.k9LK7WYt006450@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6366/FC-5

Modified Files:
	GtkAda.spec 
Log Message:
new version 2.8.0


Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- GtkAda.spec	21 Oct 2006 20:00:54 -0000	1.16
+++ GtkAda.spec	21 Oct 2006 20:07:02 -0000	1.17
@@ -1,14 +1,11 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	1%{?dist}
-
+Release:	2%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
-
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://libre.act-europe.fr/GtkAda
 Source:         http://libre.act-europe.fr/GtkAda/GtkAda-gpl-2.8.0.tgz
-Patch0:		GtkAda-case-none.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat



From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:33 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:07:33 -0700
Subject: rpms/GtkAda/devel GtkAda.spec,1.18,1.19
Message-ID: <200610212007.k9LK7XGC006454@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6366/devel

Modified Files:
	GtkAda.spec 
Log Message:
new version 2.8.0


Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- GtkAda.spec	21 Oct 2006 20:04:24 -0000	1.18
+++ GtkAda.spec	21 Oct 2006 20:07:03 -0000	1.19
@@ -1,14 +1,11 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	1%{?dist}
-
+Release:	2%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
-
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://libre.act-europe.fr/GtkAda
 Source:         http://libre.act-europe.fr/GtkAda/GtkAda-gpl-2.8.0.tgz
-Patch0:		GtkAda-case-none.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat



From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:40 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:07:40 -0700
Subject: rpms/magicor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610212007.k9LK7el7006470@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6464

Added Files:
	Makefile import.log 
Log Message:
Setup of module magicor


--- NEW FILE Makefile ---
# Top level Makefile for module magicor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:46 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:07:46 -0700
Subject: rpms/magicor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610212007.k9LK7kD3006486@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6464/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module magicor


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:12:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:12:24 -0700
Subject: rpms/magicor/devel magicor.desktop, NONE, 1.1 magicor.png, NONE,
	1.1 magicor.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610212012.k9LKCOBu006655@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/devel

Modified Files:
	.cvsignore sources 
Added Files:
	magicor.desktop magicor.png magicor.spec 
Log Message:
auto-import magicor-0.1-2.fc6 on branch devel from magicor-0.1-2.fc6.src.rpm


--- NEW FILE magicor.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Magicor
Comment=Push ice blocks around to extenguish all fires
Exec=magicor
Icon=magicor.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;LogicGame;


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

Name:           magicor
Version:        0.1
Release:        2%{?dist}
Summary:        Push ice blocks around to extenguish all fires
Group:          Amusements/Games
License:        Public Domain
URL:            http://magicor.sourceforge.net/
Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}.tar.gz
Source2:        %{name}.desktop
Source3:        %{name}.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       pygame hicolor-icon-theme

%description
The goal of the game is to annihilate all burning fires. You do this
by pushing blocks of ice until they collide with a burning fire.
When the ice blocks hit burning fire the block and the fire are destroyed.
Once all fires are extinguished the level is completed.


%prep
%setup -q -b 1
sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
  scripts/Magicor-LevelEditor.py
sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf


# %build
# nothing to build, python code + data only


%install
rm -rf $RPM_BUILD_ROOT
# We must do a DIY install as the makefile doesn't support installing into
# an install root
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE3} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%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 COPYRIGHT LICENSE README
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_bindir}/%{name}*
%{python_sitelib}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%changelog
* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
- Mark /etc/magicor.conf %%config(noreplace)

* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Oct 2006 20:07:45 -0000	1.1
+++ .cvsignore	21 Oct 2006 20:11:54 -0000	1.2
@@ -0,0 +1,2 @@
+magicor-0.1.tar.gz
+magicor-data-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Oct 2006 20:07:45 -0000	1.1
+++ sources	21 Oct 2006 20:11:54 -0000	1.2
@@ -0,0 +1,2 @@
+d5872a5fb0457af8c14a0c392b824c68  magicor-0.1.tar.gz
+0f9920721788147331d8e7d0a6d60a46  magicor-data-0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 20:12:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:12:24 -0700
Subject: rpms/magicor import.log,1.1,1.2
Message-ID: <200610212012.k9LKCOmf006651@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617

Modified Files:
	import.log 
Log Message:
auto-import magicor-0.1-2.fc6 on branch devel from magicor-0.1-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/magicor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Oct 2006 20:07:40 -0000	1.1
+++ import.log	21 Oct 2006 20:11:53 -0000	1.2
@@ -0,0 +1 @@
+magicor-0_1-2_fc6:HEAD:magicor-0.1-2.fc6.src.rpm:1161462141



From fedora-extras-commits at redhat.com  Sat Oct 21 20:21:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:21:25 -0700
Subject: owners owners.list,1.1860,1.1861
Message-ID: <200610212021.k9LKLPrt006743@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6720

Modified Files:
	owners.list 
Log Message:
added magicor


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1860
retrieving revision 1.1861
diff -u -r1.1860 -r1.1861
--- owners.list	21 Oct 2006 17:11:04 -0000	1.1860
+++ owners.list	21 Oct 2006 20:20:55 -0000	1.1861
@@ -989,7 +989,6 @@
 Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|luma|A graphical tool for managing LDAP servers|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -1002,6 +1001,7 @@
 Fedora Extras|lua|A powerful light-weight programming language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|luks-tools|Utilities for working with LUKS-protected filesystems|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
+Fedora Extras|luma|A graphical tool for managing LDAP servers|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|lzo|Data compression library with very fast (de)compression|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -1011,6 +1011,7 @@
 Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|magicor|Push ice blocks around to extenguish all fires|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|MagicPoint|X based presentation software|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|rms at 1407.org,byte at fedoraproject.org
 Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 21 20:27:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:27:40 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.17,1.18
Message-ID: <200610212027.k9LKRe7a006780@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6764

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- GtkAda.spec	21 Oct 2006 20:07:02 -0000	1.17
+++ GtkAda.spec	21 Oct 2006 20:27:10 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -60,7 +60,6 @@
 
 # make libraries executables, otherwise dependencies are not found
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
-find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 (cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
@@ -71,6 +70,8 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
+sed -i "s|/.*/usr/lib|/usr/lib|" %{_libdir}/gnat/*.gpr
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,6 +96,7 @@
 %{_libdir}/gtkada
 %{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/lib*.a
 %{_libdir}/pkgconfig/*
 %{_datadir}/gps
 %{_mandir}/man*/*



From fedora-extras-commits at redhat.com  Sat Oct 21 20:37:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:37:48 -0700
Subject: comps comps-fe5.xml.in,1.179,1.180 comps-fe6.xml.in,1.202,1.203
Message-ID: <200610212037.k9LKbmlr006883@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6864

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add magicor


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- comps-fe5.xml.in	20 Oct 2006 00:54:12 -0000	1.179
+++ comps-fe5.xml.in	21 Oct 2006 20:37:17 -0000	1.180
@@ -331,6 +331,7 @@
       <packagereq type="optional">lmarbles</packagereq>
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
+      <packagereq type="optional">magicor</packagereq>
       <packagereq type="optional">manaworld</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- comps-fe6.xml.in	20 Oct 2006 00:51:00 -0000	1.202
+++ comps-fe6.xml.in	21 Oct 2006 20:37:17 -0000	1.203
@@ -387,6 +387,7 @@
       <packagereq type="optional">lmarbles</packagereq>
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
+      <packagereq type="optional">magicor</packagereq>
       <packagereq type="optional">manaworld</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct 21 20:41:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:41:11 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.18,1.19
Message-ID: <200610212041.k9LKfBLT006931@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6903

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- GtkAda.spec	21 Oct 2006 20:27:10 -0000	1.18
+++ GtkAda.spec	21 Oct 2006 20:40:41 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -70,7 +70,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-sed -i "s|/.*/usr/lib|/usr/lib|" %{_libdir}/gnat/*.gpr
+sed -i "s|/.*/usr/lib|/usr/lib|" $RPM_BUILD_ROOT%{_libdir}/gnat/*.gpr
 
 
 %clean
@@ -106,7 +106,7 @@
 
 
 %changelog
-* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-4
 - new version 2.8.0
 
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0



From fedora-extras-commits at redhat.com  Sat Oct 21 20:52:11 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:52:11 -0700
Subject: rpms/libfreebob - New directory
Message-ID: <200610212052.k9LKqBlf007059@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055/libfreebob

Log Message:
Directory /cvs/extras/rpms/libfreebob added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 20:52:17 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:52:17 -0700
Subject: rpms/libfreebob/devel - New directory
Message-ID: <200610212052.k9LKqH3r007076@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055/libfreebob/devel

Log Message:
Directory /cvs/extras/rpms/libfreebob/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 20:52:38 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:52:38 -0700
Subject: rpms/libfreebob Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610212052.k9LKqcvg007109@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7103

Added Files:
	Makefile import.log 
Log Message:
Setup of module libfreebob


--- NEW FILE Makefile ---
# Top level Makefile for module libfreebob
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:52:39 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:52:39 -0700
Subject: rpms/libfreebob/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610212052.k9LKqdKU007125@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7103/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libfreebob


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:53:53 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:53:53 -0700
Subject: rpms/libfreebob import.log,1.1,1.2
Message-ID: <200610212053.k9LKrrS2007200@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7165

Modified Files:
	import.log 
Log Message:
auto-import libfreebob-1.0.0-3 on branch devel from libfreebob-1.0.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libfreebob/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Oct 2006 20:52:38 -0000	1.1
+++ import.log	21 Oct 2006 20:53:22 -0000	1.2
@@ -0,0 +1 @@
+libfreebob-1_0_0-3:HEAD:libfreebob-1.0.0-3.src.rpm:1161464009



From fedora-extras-commits at redhat.com  Sat Oct 21 20:53:53 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:53:53 -0700
Subject: rpms/libfreebob/devel libfreebob.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610212053.k9LKrrur007204@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7165/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libfreebob.spec 
Log Message:
auto-import libfreebob-1.0.0-3 on branch devel from libfreebob-1.0.0-3.src.rpm


--- NEW FILE libfreebob.spec ---
Summary:       FreeBoB firewire audio driver library
Name:          libfreebob
Version:       1.0.0
Release:       3%{?dist}
License:       GPL
Group:         System Environment/Libraries
Source0:       http://surfnet.dl.sourceforge.net/sourceforge/freebob/libfreebob-%{version}.tar.bz2
URL:           http://freebob.sourceforge.net
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libavc1394-devel >= 0.5.3, libiec61883-devel, libraw1394-devel
BuildRequires: alsa-lib-devel libxml2-devel autoconf

%description
libfreebob implements a userland driver for BeBoB-based fireware audio
devices.

%package devel
Summary: Libraries, includes etc to develop with libfreebob
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
Libraries, includes etc to develop with libfreebob.

%prep
%setup -q
# Tweak libiec61883 build requirements.
perl -pi -e 's/1.1.0/1.0.0/' configure

%build
%configure --disable-static
make %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/libfreebob.pc
%{_includedir}/*

%changelog
* Sat Oct 21 2006 Anthony Green <green at redhat.com> 1.0.0-3
- Remove %%doc line from devel package.
- Remove trailing '.' from devel package summary.

* Wed Oct 11 2006 Anthony Green <green at redhat.com> 1.0.0-2
- Use upstream tarball release, not svn 1.0 release.
- Tweak %%files.
- Tweak libiec61883 build requirements in configure script.
- Don't generate configure script and remove some autotools dependencies.

* Sat Sep  9 2006 Anthony Green <green at redhat.com> 1.0-1
- Created.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfreebob/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Oct 2006 20:52:39 -0000	1.1
+++ .cvsignore	21 Oct 2006 20:53:23 -0000	1.2
@@ -0,0 +1 @@
+libfreebob-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfreebob/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Oct 2006 20:52:39 -0000	1.1
+++ sources	21 Oct 2006 20:53:23 -0000	1.2
@@ -0,0 +1 @@
+aa550528324a4dfb3cf7c9a90d83c694  libfreebob-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 21:08:56 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 14:08:56 -0700
Subject: owners owners.list,1.1861,1.1862
Message-ID: <200610212108.k9LL8ulj010280@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10262

Modified Files:
	owners.list 
Log Message:
Add libfreebob.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1861
retrieving revision 1.1862
diff -u -r1.1861 -r1.1862
--- owners.list	21 Oct 2006 20:20:55 -0000	1.1861
+++ owners.list	21 Oct 2006 21:08:26 -0000	1.1862
@@ -859,6 +859,7 @@
 Fedora Extras|libeXosip2|A library that hides the complexity of using the SIP protocol|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libFoundation|A free implementation of OpenStep's Foundation Kit|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
+Fedora Extras|libfreebob|FreeBob firewire audio driver library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libfwbuilder|Firewall Builder API|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libgadu|Gadu-gadu protocol support library|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgalago|Galago presence library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 21 21:36:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 14:36:05 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.19,1.20
Message-ID: <200610212136.k9LLa5hL010391@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10375

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GtkAda.spec	21 Oct 2006 20:40:41 -0000	1.19
+++ GtkAda.spec	21 Oct 2006 21:35:35 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -45,13 +45,13 @@
 sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
 sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-make
+make incdir=%{_includedir}/gtkada alidir=%{_libdir}/gtkada
 make -C docs
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall incdir=$RPM_BUILD_ROOT%{_includedir}/gtkada alidir=$RPM_BUILD_ROOT%{_libdir}/gtkada
 (make -C docs install prefix=$PWD/doc-install)
 
 # move shared libraries to standard place
@@ -106,10 +106,10 @@
 
 
 %changelog
-* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-4
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-5
 - new version 2.8.0
 
-* Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0
+* Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-11
 - Rebuild for Fedora Extras 5
 
 * Thu Feb  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-10



From fedora-extras-commits at redhat.com  Sat Oct 21 22:24:18 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 15:24:18 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.20,1.21
Message-ID: <200610212224.k9LMOI0B013560@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13544

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- GtkAda.spec	21 Oct 2006 21:35:35 -0000	1.20
+++ GtkAda.spec	21 Oct 2006 22:23:47 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -37,7 +37,8 @@
 
 %prep
 %setup -q -n %{name}-gpl-%{version}
-
+sed -i "s|\$.prefix./lib|\$(libdir)|" projects/Makefile
+sed -i "s|\$prefix/lib|%{_libdir}|" projects/generate_prj.sh
 
 %build
 # adapt opt flags to gnatmake
@@ -70,7 +71,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-sed -i "s|/.*/usr/lib|/usr/lib|" $RPM_BUILD_ROOT%{_libdir}/gnat/*.gpr
+#sed -i "s|/.*/usr/lib|/usr/lib|" $RPM_BUILD_ROOT%{_libdir}/gnat/*.gpr
 
 
 %clean



From fedora-extras-commits at redhat.com  Sat Oct 21 22:41:03 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sat, 21 Oct 2006 15:41:03 -0700
Subject: rpms/torque/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 torque.spec, 1.16, 1.17
Message-ID: <200610212241.k9LMf3R2013737@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13717

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Oct 2006 01:28:07 -0000	1.9
+++ .cvsignore	21 Oct 2006 22:40:33 -0000	1.10
@@ -1 +1 @@
-torque-2.1.4.tar.gz
+torque-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Oct 2006 01:28:07 -0000	1.9
+++ sources	21 Oct 2006 22:40:33 -0000	1.10
@@ -1 +1 @@
-9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz
+88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- torque.spec	21 Oct 2006 01:28:07 -0000	1.16
+++ torque.spec	21 Oct 2006 22:40:33 -0000	1.17
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.4
+%define version 2.1.5
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
+- fixes "qsub -o /dev/null" regression
+
 * Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
 - bump to fix "Spool Job Race condition" on bugtraq
 



From fedora-extras-commits at redhat.com  Sat Oct 21 22:42:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 15:42:52 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.21,1.22
Message-ID: <200610212242.k9LMgqOe013821@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13781/FC-5

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- GtkAda.spec	21 Oct 2006 22:23:47 -0000	1.21
+++ GtkAda.spec	21 Oct 2006 22:42:22 -0000	1.22
@@ -71,8 +71,6 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-#sed -i "s|/.*/usr/lib|/usr/lib|" $RPM_BUILD_ROOT%{_libdir}/gnat/*.gpr
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Sat Oct 21 22:42:53 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 15:42:53 -0700
Subject: rpms/GtkAda/devel GtkAda.spec,1.19,1.20
Message-ID: <200610212242.k9LMgr1v013824@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13781/devel

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GtkAda.spec	21 Oct 2006 20:07:03 -0000	1.19
+++ GtkAda.spec	21 Oct 2006 22:42:23 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	2%{?dist}
+Release:	6%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -39,7 +39,8 @@
 
 %prep
 %setup -q -n %{name}-gpl-%{version}
-
+sed -i "s|\$.prefix./lib|\$(libdir)|" projects/Makefile
+sed -i "s|\$prefix/lib|%{_libdir}|" projects/generate_prj.sh
 
 %build
 # adapt opt flags to gnatmake
@@ -47,13 +48,13 @@
 sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
 sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-make
+make incdir=%{_includedir}/gtkada alidir=%{_libdir}/gtkada
 make -C docs
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall incdir=$RPM_BUILD_ROOT%{_includedir}/gtkada alidir=$RPM_BUILD_ROOT%{_libdir}/gtkada
 (make -C docs install prefix=$PWD/doc-install)
 
 # move shared libraries to standard place
@@ -62,7 +63,6 @@
 
 # make libraries executables, otherwise dependencies are not found
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
-find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 (cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
@@ -97,6 +97,7 @@
 %{_libdir}/gtkada
 %{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/lib*.a
 %{_libdir}/pkgconfig/*
 %{_datadir}/gps
 %{_mandir}/man*/*
@@ -106,7 +107,7 @@
 
 
 %changelog
-* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-5
 - new version 2.8.0
 
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-13



From fedora-extras-commits at redhat.com  Sat Oct 21 22:48:39 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 15:48:39 -0700
Subject: rpms/xeuphoric/devel xeuphoric.spec,1.1,1.2
Message-ID: <200610212248.k9LMmdfr013899@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13883

Modified Files:
	xeuphoric.spec 
Log Message:

removed ppc64 and added ppc to the ExcludeArch 
 	xeuphoric.spec 



Index: xeuphoric.spec
===================================================================
RCS file: /cvs/extras/rpms/xeuphoric/devel/xeuphoric.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xeuphoric.spec	15 Oct 2006 21:57:01 -0000	1.1
+++ xeuphoric.spec	21 Oct 2006 22:48:09 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: An X based ORIC emulator
 Name: xeuphoric
 Version: 0.18.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Emulators
 Source0: http://www.teaser.fr/~amajorel/%{name}/%{name}-%{version}.tar.gz
@@ -12,7 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: arts-devel libXext-devel desktop-file-utils
 Requires: %{name}-roms
-ExcludeArch: x86_64 ia64 ppc64
+ExcludeArch: x86_64 ia64 ppc
 # excluded due to compilation problems - upstream developer changing RSN (me!)
 
 %description
@@ -83,6 +83,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-6
+- changed ppc64 to ppc
+
 * Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-5
 - corrected iconv
 



From fedora-extras-commits at redhat.com  Sat Oct 21 23:28:00 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sat, 21 Oct 2006 16:28:00 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 torque.spec, 1.13, 1.14
Message-ID: <200610212328.k9LNS0lv016991@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Oct 2006 01:54:33 -0000	1.9
+++ .cvsignore	21 Oct 2006 23:27:30 -0000	1.10
@@ -1 +1 @@
-torque-2.1.4.tar.gz
+torque-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Oct 2006 01:54:33 -0000	1.9
+++ sources	21 Oct 2006 23:27:30 -0000	1.10
@@ -1 +1 @@
-9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz
+88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- torque.spec	21 Oct 2006 01:54:33 -0000	1.13
+++ torque.spec	21 Oct 2006 23:27:30 -0000	1.14
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.4
+%define version 2.1.5
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
+- fixes "qsub -o /dev/null" regression
+
 * Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
 - bump to fix "Spool Job Race condition" on bugtraq
 



From fedora-extras-commits at redhat.com  Sat Oct 21 23:29:32 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sat, 21 Oct 2006 16:29:32 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 torque.spec, 1.11, 1.12
Message-ID: <200610212329.k9LNTWwP017055@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17035

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Oct 2006 02:11:06 -0000	1.9
+++ .cvsignore	21 Oct 2006 23:29:02 -0000	1.10
@@ -1 +1 @@
-torque-2.1.4.tar.gz
+torque-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Oct 2006 02:11:06 -0000	1.9
+++ sources	21 Oct 2006 23:29:02 -0000	1.10
@@ -1 +1 @@
-9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz
+88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- torque.spec	21 Oct 2006 02:11:06 -0000	1.11
+++ torque.spec	21 Oct 2006 23:29:02 -0000	1.12
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.4
+%define version 2.1.5
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
+- fixes "qsub -o /dev/null" regression
+
 * Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
 - bump to fix "Spool Job Race condition" on bugtraq
 



From fedora-extras-commits at redhat.com  Sat Oct 21 23:30:16 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sat, 21 Oct 2006 16:30:16 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 torque.spec,
	1.10, 1.11
Message-ID: <200610212330.k9LNUGQR017145@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17103

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Oct 2006 02:17:22 -0000	1.8
+++ .cvsignore	21 Oct 2006 23:29:46 -0000	1.9
@@ -1 +1 @@
-torque-2.1.4.tar.gz
+torque-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Oct 2006 02:17:22 -0000	1.8
+++ sources	21 Oct 2006 23:29:46 -0000	1.9
@@ -1 +1 @@
-9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz
+88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- torque.spec	21 Oct 2006 02:17:22 -0000	1.10
+++ torque.spec	21 Oct 2006 23:29:46 -0000	1.11
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.4
+%define version 2.1.5
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
+- fixes "qsub -o /dev/null" regression
+
 * Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
 - bump to fix "Spool Job Race condition" on bugtraq
 



From fedora-extras-commits at redhat.com  Sun Oct 22 01:43:37 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:43:37 -0700
Subject: rpms/thewidgetfactory - New directory
Message-ID: <200610220143.k9M1hbLV023427@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23423/thewidgetfactory

Log Message:
Directory /cvs/extras/rpms/thewidgetfactory added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 01:43:43 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:43:43 -0700
Subject: rpms/thewidgetfactory/devel - New directory
Message-ID: <200610220143.k9M1hh4q023441@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23423/thewidgetfactory/devel

Log Message:
Directory /cvs/extras/rpms/thewidgetfactory/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 01:43:54 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:43:54 -0700
Subject: rpms/thewidgetfactory Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610220143.k9M1hsou023472@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466

Added Files:
	Makefile import.log 
Log Message:
Setup of module thewidgetfactory


--- NEW FILE Makefile ---
# Top level Makefile for module thewidgetfactory
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 22 01:44:00 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:44:00 -0700
Subject: rpms/thewidgetfactory/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610220144.k9M1i0Hw023488@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module thewidgetfactory


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 22 01:44:54 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:44:54 -0700
Subject: rpms/thewidgetfactory import.log,1.1,1.2
Message-ID: <200610220144.k9M1isoU023600@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23538

Modified Files:
	import.log 
Log Message:
auto-import thewidgetfactory-0.2.1-2 on branch devel from thewidgetfactory-0.2.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/thewidgetfactory/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Oct 2006 01:43:54 -0000	1.1
+++ import.log	22 Oct 2006 01:44:24 -0000	1.2
@@ -0,0 +1 @@
+thewidgetfactory-0_2_1-2:HEAD:thewidgetfactory-0.2.1-2.src.rpm:1161481461



From fedora-extras-commits at redhat.com  Sun Oct 22 01:44:55 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:44:55 -0700
Subject: rpms/thewidgetfactory/devel thewidgetfactory.desktop, NONE,
	1.1 thewidgetfactory.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610220145.k9M1itR1023604@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23538/devel

Modified Files:
	.cvsignore sources 
Added Files:
	thewidgetfactory.desktop thewidgetfactory.spec 
Log Message:
auto-import thewidgetfactory-0.2.1-2 on branch devel from thewidgetfactory-0.2.1-2.src.rpm


--- NEW FILE thewidgetfactory.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=The Widget Factory
# It appears GenericName is not used at all
#GenericName=The Widget Factory
Comment=A tool for previewing GTK widgets
Exec=twf
# Icon not available, need to discuss with upstream maintainer
# Icon=thewidgetfactory.png
Terminal=false
Type=Application
Categories=Development;Tools;
Version=0.2.1


--- NEW FILE thewidgetfactory.spec ---
Name:           thewidgetfactory
Version:        0.2.1
Release:        2%{?dist}
Summary:        A tool for previewing GTK widgets

Group:          Development/Tools
License:        GPL 
URL:            http://www.stellingwerff.com/?page_id=10 
Source0:        http://www.stellingwerff.com/TheWidgetFactory/%{name}-%{version}.tar.gz
Source1:        thewidgetfactory.desktop 
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel, desktop-file-utils

%description
The Widget Factory is a program designed to show a wide range of widgets
on a single window.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README COPYING
%{_bindir}/twf
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Sat Oct 21 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> 0.2.1-2
 - Fixed permission on bin directory
 - Added desktop-file-utils for menu
* Fri Oct 20 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> 0.2.1-1
 - Initial creation 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thewidgetfactory/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2006 01:44:00 -0000	1.1
+++ .cvsignore	22 Oct 2006 01:44:25 -0000	1.2
@@ -0,0 +1 @@
+thewidgetfactory-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thewidgetfactory/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Oct 2006 01:44:00 -0000	1.1
+++ sources	22 Oct 2006 01:44:25 -0000	1.2
@@ -0,0 +1 @@
+60175721233c6f265326fcdc0334c269  thewidgetfactory-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 01:46:40 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 21 Oct 2006 18:46:40 -0700
Subject: rpms/viaideinfo/devel viaideinfo.spec,1.1,1.2
Message-ID: <200610220146.k9M1kefc023654@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23638/viaideinfo/devel

Modified Files:
	viaideinfo.spec 
Log Message:
Enable x86-64 building (upstream says its OK)


Index: viaideinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/devel/viaideinfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- viaideinfo.spec	19 Oct 2006 06:50:13 -0000	1.1
+++ viaideinfo.spec	22 Oct 2006 01:46:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		viaideinfo
 Version:	0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Displays the information of installed VIA IDE controllers 
 Group:		Applications/System
 License:	GPL
@@ -9,7 +9,7 @@
 Source0:	http://reactivated.net/software/viaideinfo/viaideinfo-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pciutils-devel >= 2.2.0  
 
@@ -55,5 +55,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-2
+- Enable building on x86_64 (It works fine on x86-64 Via-based systems too,
+  according to an email from the upstream maintainer.)
+
 * Tue Oct 17 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-1
 - Initial packaging



From fedora-extras-commits at redhat.com  Sun Oct 22 01:49:27 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 21 Oct 2006 18:49:27 -0700
Subject: rpms/viaideinfo/devel viaideinfo.spec,1.2,1.3
Message-ID: <200610220149.k9M1nRIA023740@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23719/viaideinfo/devel

Modified Files:
	viaideinfo.spec 
Log Message:
Bump release to fix CVS tagging issue


Index: viaideinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/devel/viaideinfo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- viaideinfo.spec	22 Oct 2006 01:46:10 -0000	1.2
+++ viaideinfo.spec	22 Oct 2006 01:48:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		viaideinfo
 Version:	0.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Displays the information of installed VIA IDE controllers 
 Group:		Applications/System
 License:	GPL
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-3
+- Bump release to fix CVS tagging issue
+
 * Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-2
 - Enable building on x86_64 (It works fine on x86-64 Via-based systems too,
   according to an email from the upstream maintainer.)



From fedora-extras-commits at redhat.com  Sun Oct 22 01:50:32 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:50:32 -0700
Subject: rpms/libassa - New directory
Message-ID: <200610220150.k9M1oWrA023807@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23803/libassa

Log Message:
Directory /cvs/extras/rpms/libassa added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 01:50:38 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:50:38 -0700
Subject: rpms/libassa/devel - New directory
Message-ID: <200610220150.k9M1ocWU023826@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23803/libassa/devel

Log Message:
Directory /cvs/extras/rpms/libassa/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 01:51:16 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:51:16 -0700
Subject: rpms/libassa Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610220151.k9M1pGSn023877@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23871

Added Files:
	Makefile import.log 
Log Message:
Setup of module libassa


--- NEW FILE Makefile ---
# Top level Makefile for module libassa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 22 01:51:20 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:51:20 -0700
Subject: owners owners.list,1.1862,1.1863
Message-ID: <200610220151.k9M1pK9w023903@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23842

Modified Files:
	owners.list 
Log Message:
added thewidgetfactory


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1862
retrieving revision 1.1863
diff -u -r1.1862 -r1.1863
--- owners.list	21 Oct 2006 21:08:26 -0000	1.1862
+++ owners.list	22 Oct 2006 01:50:50 -0000	1.1863
@@ -2198,6 +2198,7 @@
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|thewidgetfactory|A tool for previewing widgets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 22 01:51:17 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:51:17 -0700
Subject: rpms/libassa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610220151.k9M1pH80023893@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23871/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libassa


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 22 01:53:18 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:53:18 -0700
Subject: rpms/libassa import.log,1.1,1.2
Message-ID: <200610220153.k9M1rIM5023968@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23936

Modified Files:
	import.log 
Log Message:
auto-import libassa-3.4.2-4 on branch devel from libassa-3.4.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassa/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Oct 2006 01:51:16 -0000	1.1
+++ import.log	22 Oct 2006 01:52:48 -0000	1.2
@@ -0,0 +1 @@
+libassa-3_4_2-4:HEAD:libassa-3.4.2-4.src.rpm:1161481953



From fedora-extras-commits at redhat.com  Sun Oct 22 01:53:19 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:53:19 -0700
Subject: rpms/libassa/devel libassa.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610220153.k9M1rJKb023972@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23936/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libassa.spec 
Log Message:
auto-import libassa-3.4.2-4 on branch devel from libassa-3.4.2-4.src.rpm


--- NEW FILE libassa.spec ---
# -*- rpm-spec -*-
#===============================================================================
#
# ASSA library RPM spec file.
#
# RPM format: name-version-release.rpm
#
# $Id$
#===============================================================================

Summary:    C++ network-oriented application framework 
Name:       libassa
Version:    3.4.2
Release:    4
License:    LGPL
Group:      System Environment/Libraries
URL:        http://libassa.sourceforge.net/
Source:     http://dl.sf.net/sourceforge/libassa/libassa-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires: doxygen

#===============================================================================
# libassa package 
#===============================================================================

%description
This package is a C++ framework for writing network-based server and
client applications. It is a non-threaded implementation of Adaptive 
Communication Environment design patterns such as Reactor, Connector, 
Acceptor and others.

#===============================================================================
# libassa-devel package 
#===============================================================================

%package    devel
Summary:    Headers for developing programs with libassa library
Group:      Development/Libraries
Requires:   %{name} = %{version}-%{release}
Requires:   pkgconfig

%description devel
This package contains the headers that programmers will need to develop
applications which will use libassa Library.

#===============================================================================
# libassa-devel package 
#===============================================================================

%package    doc
Summary:    HTML formatted API documentation for libassa library.
Group:      Development/Libraries

%description doc
This package contains Doxygen-generated class reference of libassa Library.

#===============================================================================
# preparation section
#===============================================================================

%prep
%setup -q

#===============================================================================
# build section
#===============================================================================

%build
%configure \
    --disable-rpath      \
    --disable-static     \
    --enable-shared      \
    --disable-selftests  \
    --disable-examples

# Disable rpaths, because --disable-rpath is not supported yet.
sed -i 's|\(^hardcode_libdir_flag_spec=\).*|\1""|g' libtool
sed -i 's|\(^runpath_var=\)LD_RUN_PATH|\1DIE_RPATH_DIE|g' libtool

%{__make} %{?_smp_mflags}

#===============================================================================
# install section
#===============================================================================

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install

rm -rf __docdir ; mkdir __docdir
mv %{buildroot}%{_datadir}/doc/%{name}-%{version}/* __docdir

### Clean up buildroot
%{__rm} -f %{buildroot}%{_libdir}/*.la

%check
# FAIL: sighands.test
#make check

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

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

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/*.so.*


%files  devel
%defattr(-, root, root, -)
%{_bindir}/*
%{_includedir}/assa-3.4/
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so

%files doc
%defattr(-, root, root, -)
%doc __docdir/*.html __docdir/html/


%changelog
* Mon Oct 16 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.4.2-3
- disable rpaths
- disable static libs
- build tests and add %%check section for them
- BR doxygen and fix inclusion of HTML files
- execute /sbin/ldconfig in scriptlets directly
- don't use %%makeinstall

* Thu Oct 12 2006 Vladislav Grinchenko <vlg[AT]users.sourceforge.net> - 3.4.2-0
- Overall makeup to adhere to the RPM packaging guidelines.

* Wed Jul 19 2006 Vladislav Grinchenko <vlg[AT]users.sourceforge.net>
- disabled tests and examples in configure step

* Sun Mar 20 2005 Vladislav Grinchenko <vlg[AT]users.sourceforge.net>
- add distribution tag

* Tue Mar  1 2005 Vladislav Grinchenko <vlg[AT]users.sourceforge.net>
- fix documentation installation error

* Sun Dec 12 2004 Vladislav Grinchenko <vlg[AT]users.sourceforge.net>
- fix postrun spelling error

* Tue Aug  6 2002 Vladislav Grinchenko <vladg at erols.com>
- first public release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2006 01:51:17 -0000	1.1
+++ .cvsignore	22 Oct 2006 01:52:48 -0000	1.2
@@ -0,0 +1 @@
+libassa-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Oct 2006 01:51:17 -0000	1.1
+++ sources	22 Oct 2006 01:52:48 -0000	1.2
@@ -0,0 +1 @@
+380cf1e782d42bab2c58500965b2198b  libassa-3.4.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 01:59:48 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:59:48 -0700
Subject: owners owners.list,1.1863,1.1864
Message-ID: <200610220159.k9M1xmCJ024027@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24011

Modified Files:
	owners.list 
Log Message:
Added libassa entry (new package).



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1863
retrieving revision 1.1864
diff -u -r1.1863 -r1.1864
--- owners.list	22 Oct 2006 01:50:50 -0000	1.1863
+++ owners.list	22 Oct 2006 01:59:18 -0000	1.1864
@@ -835,6 +835,7 @@
 Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libapreq2|Apache HTTP request library|bojan at rexursive.com|extras-qa at fedoraproject.org|
+Fedora Extras|libassa|C++ network-oriented application framework|3rdshift at comcast.net|extras-qa at fedoraproject.org|
 Fedora Extras|libassetml|XML resource database library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libatomic_ops|Atomic memory update operations|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 22 02:02:37 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:02:37 -0700
Subject: rpms/granule - New directory
Message-ID: <200610220202.k9M22ba4026984@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26980/granule

Log Message:
Directory /cvs/extras/rpms/granule added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 02:02:46 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:02:46 -0700
Subject: rpms/granule/devel - New directory
Message-ID: <200610220202.k9M22k4c026995@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26980/granule/devel

Log Message:
Directory /cvs/extras/rpms/granule/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 02:03:16 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:03:16 -0700
Subject: rpms/granule Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610220203.k9M23GBL027029@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023

Added Files:
	Makefile import.log 
Log Message:
Setup of module granule


--- NEW FILE Makefile ---
# Top level Makefile for module granule
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 22 02:03:24 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:03:24 -0700
Subject: rpms/granule/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610220203.k9M23OVc027045@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module granule


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 22 02:05:05 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:05:05 -0700
Subject: rpms/granule import.log,1.1,1.2
Message-ID: <200610220205.k9M255wN027120@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27085

Modified Files:
	import.log 
Log Message:
auto-import granule-1.2.3-2 on branch devel from granule-1.2.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/granule/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Oct 2006 02:03:16 -0000	1.1
+++ import.log	22 Oct 2006 02:04:34 -0000	1.2
@@ -0,0 +1 @@
+granule-1_2_3-2:HEAD:granule-1.2.3-2.src.rpm:1161482660



From fedora-extras-commits at redhat.com  Sun Oct 22 02:05:07 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:05:07 -0700
Subject: rpms/granule/devel granule.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610220205.k9M257nd027124@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27085/devel

Modified Files:
	.cvsignore sources 
Added Files:
	granule.spec 
Log Message:
auto-import granule-1.2.3-2 on branch devel from granule-1.2.3-2.src.rpm


--- NEW FILE granule.spec ---
Summary:    Flashcards program based on Leitner methodology
Name:       granule
Version:    1.2.3
Release:    2
License:    GPL
Group:      Applications/Multimedia
URL:        http://granule.sourceforge.net/
Source:     http://dl.sf.net/sourceforge/granule/granule-%{version}.tar.gz 
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires: gtkmm24-devel >= 2.4.0
BuildRequires: libassa-devel
BuildRequires: libxml2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
# Only for the glib-gettextize and intltoolize hack.
BuildRequires: glib2-devel intltool

%description 
granule is a flashcard program that implements Leither cardfile
methodology for learing new words. It features both short-term and
long-term memory training capabilities with scheduling.


%prep
%setup -q


%build
glib-gettextize --copy --force
intltoolize --automake --copy --force
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
%find_lang %{name} --with-gnome

mkdir -p -m0755 ${RPM_BUILD_ROOT}%{_datadir}/granule/pixmaps
mkdir -p -m0755 ${RPM_BUILD_ROOT}%{_datadir}/granule/xml

install -p -m 0644 granule ${RPM_BUILD_ROOT}%{_datadir}/granule/
install -p -m 0644 pixmaps/*.png ${RPM_BUILD_ROOT}%{_datadir}/granule/pixmaps/
install -p -m 0644 *.dtd ${RPM_BUILD_ROOT}%{_datadir}/granule/xml/

desktop-file-install --vendor ""  \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications  \
        --add-category X-Fedora  \
        %{name}.desktop


%clean
%{__rm} -rf ${RPM_BUILD_ROOT}


%files -f %{name}.lang
%defattr(-,root,root, -)
%doc COPYING AUTHORS README ChangeLog NEWS 
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}/


%changelog
* Wed Oct 18 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.3-2
- Fix missing BR and remaining spec issues.

* Sat Oct 14 2006 Vladislav Grinchenko <vlg at users.sourceforge.net> - 1.2.3
- Overall makeup to adhere to the RPM packaging guidelines.

* Sun Nov  6 2005 Vladislav Grinchenko <vlg at users.sourceforge.net> 
- Fixed License tag

* Mon Jul  4 2005 Vladislav Grinchenko <vlg at users.sourceforge.net> 
- Changed XML dir.
 
* Thu Jun  3 2004 Vladislav Grinchenko <vlg at users.sourceforge.net> - 1.0.0
- Initial release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2006 02:03:24 -0000	1.1
+++ .cvsignore	22 Oct 2006 02:04:37 -0000	1.2
@@ -0,0 +1 @@
+granule-1.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Oct 2006 02:03:24 -0000	1.1
+++ sources	22 Oct 2006 02:04:37 -0000	1.2
@@ -0,0 +1 @@
+21b5210318b2836592d265e8b58c8740  granule-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 02:09:53 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:09:53 -0700
Subject: owners owners.list,1.1864,1.1865
Message-ID: <200610220209.k9M29rj1027276@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27253

Modified Files:
	owners.list 
Log Message:
Added new project entry (granule).



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1864
retrieving revision 1.1865
diff -u -r1.1864 -r1.1865
--- owners.list	22 Oct 2006 01:59:18 -0000	1.1864
+++ owners.list	22 Oct 2006 02:09:23 -0000	1.1865
@@ -594,6 +594,7 @@
 Fedora Extras|grace|Numerical Data Processing and Visualization Tool|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|grads|Tool for easy acces, manipulation, and visualization of data|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|granule|Flashcards program based on Leitner methodology|3rdshift at comcast.net|extras-qa at fedoraproject.org|
 Fedora Extras|graphviz|Graph Visualization Tools|jima at beer.tclug.org|extras-qa at fedoraproject.org|ellson at research.att.com
 Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|grepmail|Search mailboxes for a particular email|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Oct 22 03:18:08 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sat, 21 Oct 2006 20:18:08 -0700
Subject: rpms/libburn/devel libburn.spec,1.3,1.4
Message-ID: <200610220318.k9M3I8qw030488@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/libburn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30472

Modified Files:
	libburn.spec 
Log Message:
We have an upstream tarball, actually point it it in the Source



Index: libburn.spec
===================================================================
RCS file: /cvs/extras/rpms/libburn/devel/libburn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libburn.spec	21 Oct 2006 19:41:12 -0000	1.3
+++ libburn.spec	22 Oct 2006 03:17:37 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           libburn
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libburn.pykix.org/
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://libburn-download.pykix.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake libtool intltool gettext doxygen graphviz
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-2
+- Point to a real URL in source, now that we have a tarball
+
 * Fri Oct 20 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-1
 - 0.2.2 release
 



From fedora-extras-commits at redhat.com  Sun Oct 22 03:26:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:26:49 -0700
Subject: rpms/ntfsprogs - New directory
Message-ID: <200610220326.k9M3QnrD030565@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30561/ntfsprogs

Log Message:
Directory /cvs/extras/rpms/ntfsprogs added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 03:26:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:26:55 -0700
Subject: rpms/ntfsprogs/devel - New directory
Message-ID: <200610220326.k9M3QtLv030579@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30561/ntfsprogs/devel

Log Message:
Directory /cvs/extras/rpms/ntfsprogs/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 03:27:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:27:08 -0700
Subject: rpms/ntfsprogs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610220327.k9M3R8QK030610@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30604

Added Files:
	Makefile import.log 
Log Message:
Setup of module ntfsprogs


--- NEW FILE Makefile ---
# Top level Makefile for module ntfsprogs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 22 03:27:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:27:13 -0700
Subject: rpms/ntfsprogs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610220327.k9M3RDe9030626@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30604/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ntfsprogs


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 22 03:28:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:28:27 -0700
Subject: rpms/ntfsprogs import.log,1.1,1.2
Message-ID: <200610220328.k9M3SRCx030698@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666

Modified Files:
	import.log 
Log Message:
auto-import ntfsprogs-1.13.1-3.fc6 on branch devel from ntfsprogs-1.13.1-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ntfsprogs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Oct 2006 03:27:07 -0000	1.1
+++ import.log	22 Oct 2006 03:27:57 -0000	1.2
@@ -0,0 +1 @@
+ntfsprogs-1_13_1-3_fc6:HEAD:ntfsprogs-1.13.1-3.fc6.src.rpm:1161487682



From fedora-extras-commits at redhat.com  Sun Oct 22 03:28:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:28:28 -0700
Subject: rpms/ntfsprogs/devel ntfsprogs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610220328.k9M3SSZw030702@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ntfsprogs.spec 
Log Message:
auto-import ntfsprogs-1.13.1-3.fc6 on branch devel from ntfsprogs-1.13.1-3.fc6.src.rpm


--- NEW FILE ntfsprogs.spec ---
Name:		ntfsprogs
Version:	1.13.1
Release:	3%{?dist}
Summary:	NTFS filesystem libraries and utilities
Source0:	http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.gz
License:	GPL
URL:		http://www.linux-ntfs.org/
Group:		System Environment/Base
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	glib2-devel, gnome-vfs2-devel, libtool
BuildRequires:	libgcrypt-devel, gnutls-devel

%description
The Linux-NTFS project (http://www.linux-ntfs.org/) aims to bring full support
for the NTFS filesystem to the Linux operating system.  The ntfsprogs package
currently consists of a library and utilities such as mkntfs, ntfscat, ntfsls, 
ntfsresize, and ntfsundelete (for a full list of included utilities see man 8 
ntfsprogs after installation).

%package gnomevfs
Summary:	NTFS GNOME virtual filesystem module
Group:		System Environment/Base
Requires:	%{name} = %{version}-%{release}
Requires:	glib2, gnome-vfs2

%description gnomevfs
This package contains the NTFS GNOME virtual filesystem (VFS) module which
allows GNOME VFS clients to seamlessly utilize the NTFS library (libntfs).

%package devel
Summary:	Headers and libraries for libntfs
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
This package includes the header files and libraries needed to link software
with the NTFS library (libntfs).

%prep
%setup -q

%build
# If we need to enable the fuse module, we'd change this.
# The ntfs-3g stuff is better than what is here currently, so we'll let people use it.
%configure --enable-gnome-vfs --disable-fuse-module --disable-static --enable-test --enable-crypto
make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} extra

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# the extra files have to be manually installed
install -m0755 ntfsprogs/ntfsdump_logfile $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfswipe $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfstruncate $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfsmove $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfsmftalloc $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfsdecrypt $RPM_BUILD_ROOT%{_bindir}

# We're not including ntfsmount, so we don't need the manpages
rm -rf $RPM_BUILD_ROOT%{_mandir}/man8/ntfsmount*

# Libtool files go bye bye
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.la

# Clear up symlink confusion by making a copy
rm -rf $RPM_BUILD_ROOT/sbin/mkfs.ntfs
cp -a $RPM_BUILD_ROOT%{_sbindir}/mkntfs $RPM_BUILD_ROOT/sbin/mkfs.ntfs

# runlist isn't really useful
rm -rf $RPM_BUILD_ROOT%{_bindir}/runlist

# Also, these static libs aren't really useful.
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.a

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO.include TODO.libntfs TODO.ntfsprogs 
%doc doc/attribute_definitions doc/attributes.txt doc/compression.txt doc/tunable_settings 
%doc doc/system_files.txt doc/system_security_descriptors.txt
%{_bindir}/*
%{_sbindir}/*
/sbin/mkfs.ntfs
%{_mandir}/man8/mkntfs.8*
%{_mandir}/man8/mkfs.ntfs.8*
%{_mandir}/man8/ntfs[^m][^o]*.8*
%{_libdir}/libntfs.*so.*

%files gnomevfs
%defattr(-,root,root,-)
%{_mandir}/man8/libntfs-gnomevfs.8*
%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so*
%config(noreplace) %{_sysconfdir}/gnome-vfs-2.0/modules/libntfs.conf

%files devel
%defattr(-,root,root,-)
%doc doc/CodingStyle doc/template.h doc/template.c
%{_includedir}/*
%{_libdir}/libntfs.so
%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so.*

%changelog
* Sat Oct 21 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-3
- really fix rpath
- nuke static libs
- build the "extra" files and install them
- get rid of "runlist"

* Sat Oct 21 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-2
- enable crypto
- enable test suite
- use system libtool to eliminate rpath for lib64

* Fri Oct 20 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-1
- initial release for Fedora, deuglify upstream spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfsprogs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2006 03:27:13 -0000	1.1
+++ .cvsignore	22 Oct 2006 03:27:58 -0000	1.2
@@ -0,0 +1 @@
+ntfsprogs-1.13.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfsprogs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Oct 2006 03:27:13 -0000	1.1
+++ sources	22 Oct 2006 03:27:58 -0000	1.2
@@ -0,0 +1 @@
+23160eb8d34abe3d2a88cd6d054faa47  ntfsprogs-1.13.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 03:37:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:37:28 -0700
Subject: owners owners.list,1.1865,1.1866
Message-ID: <200610220337.k9M3bSvS030980@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30960

Modified Files:
	owners.list 
Log Message:

ntfs-3g and ntfsprogs




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1865
retrieving revision 1.1866
diff -u -r1.1865 -r1.1866
--- owners.list	22 Oct 2006 02:09:23 -0000	1.1865
+++ owners.list	22 Oct 2006 03:36:58 -0000	1.1866
@@ -1153,6 +1153,8 @@
 Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora at leemhuis.info
 Fedora Extras|nqc|Not Quite C compiler for Lego's RCX bricks|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|nsd|NSD is a complete implementation of an authoritative DNS name server|paul at xelerance.com|extras-qa at fedoraproject.org|
+Fedora Extras|ntfs-3g|Linux NTFS userspace driver|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ntfsprogs|NTFS filesystem libraries and utilities|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ntl|High-performance algorithms for vectors, matrices, and polynomials|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|nucleo|Toolkit for exploring new uses of video|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|chris.stone at gmail.com
 Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 22 11:39:04 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 22 Oct 2006 04:39:04 -0700
Subject: rpms/python-reportlab/FC-3 python-reportlab.spec,1.5,1.6
Message-ID: <200610221139.k9MBd4Vr007516@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-reportlab/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7500

Modified Files:
	python-reportlab.spec 
Log Message:
sync this with FC-4 and fix incomplete FC-3 build


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/FC-3/python-reportlab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-reportlab.spec	7 Apr 2005 14:51:21 -0000	1.5
+++ python-reportlab.spec	22 Oct 2006 11:38:34 -0000	1.6
@@ -1,9 +1,9 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-reportlab
 Version:	1.20
-Release:	2.fc3
+Release:	3.fc3
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -12,6 +12,7 @@
 Source0:	http://www.reportlab.org/ftp/ReportLab_1_20.tgz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:	python-devel >= 2.2
 Requires:	python-abi = %{pyver}
@@ -34,9 +35,9 @@
 cd ./reportlab
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 
-rm -f ${RPM_BUILD_ROOT}%{python_sitearch}/reportlab/README
-rm -f ${RPM_BUILD_ROOT}%{python_sitearch}/reportlab/changes
-rm -f ${RPM_BUILD_ROOT}%{python_sitearch}/reportlab/license.txt
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,14 +46,19 @@
 %files
 %defattr(-,root,root,-)
 %doc reportlab/README reportlab/changes reportlab/license.txt
-%{python_sitearch}/*
+%{python_sitelib}/*
 
 
 %changelog
+* Mon May  9 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-3.fc3
+- Switchback to sitelib patch.
+- Make package noarch.
+
 * Thu Apr  7 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-2.fc3
 - Use python_sitearch to fix x86_64 build.
 
 * Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-1.fc3
+- Rebuild for Python 2.4.
 - Update to 1.20.
 - Switch to the new python macros for python-abi
 - Add dist tag.



From fedora-extras-commits at redhat.com  Sun Oct 22 12:12:45 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sun, 22 Oct 2006 05:12:45 -0700
Subject: rpms/pan/devel pan.spec,1.21,1.22
Message-ID: <200610221212.k9MCCjCl010641@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10624

Modified Files:
	pan.spec 
Log Message:
Update to current upstream release.

"This week's release improves download speed and has many mall bug fixes."




Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pan.spec	15 Oct 2006 11:01:27 -0000	1.21
+++ pan.spec	22 Oct 2006 12:12:15 -0000	1.22
@@ -1,6 +1,6 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.116
+Version:	0.117
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 22 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.117-1
+- Update to 0.117
+
 * Sun Oct 15 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.116-1
 - Update to 0.116
 



From fedora-extras-commits at redhat.com  Sun Oct 22 12:18:33 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sun, 22 Oct 2006 05:18:33 -0700
Subject: rpms/pan/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <200610221218.k9MCIXpr010712@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10694

Modified Files:
	.cvsignore sources 
Log Message:
Update to current upstream version.

"This week's release improves download speed and has many mall bug fixes."




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Oct 2006 11:01:27 -0000	1.12
+++ .cvsignore	22 Oct 2006 12:18:03 -0000	1.13
@@ -1 +1 @@
-pan-0.116.tar.bz2
+pan-0.117.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Oct 2006 11:01:27 -0000	1.12
+++ sources	22 Oct 2006 12:18:03 -0000	1.13
@@ -1 +1 @@
-590587dea07f23f5e87562fdddd67d4a  pan-0.116.tar.bz2
+0545c24799f675db73f77cd3fa0bffa0  pan-0.117.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 22 12:38:38 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Sun, 22 Oct 2006 05:38:38 -0700
Subject: rpms/yumex/devel .cvsignore, 1.24, 1.25 sources, 1.32,
	1.33 yumex.spec, 1.37, 1.38
Message-ID: <200610221238.k9MCccDo010883@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10835

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 1.1.5-1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	8 Oct 2006 07:24:22 -0000	1.24
+++ .cvsignore	22 Oct 2006 12:38:08 -0000	1.25
@@ -1 +1 @@
-yumex-1.1.4.tar.gz
+yumex-1.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	8 Oct 2006 07:24:22 -0000	1.32
+++ sources	22 Oct 2006 12:38:08 -0000	1.33
@@ -1 +1 @@
-7c6d3ec4d113ca897f5889ebd3112757  yumex-1.1.4.tar.gz
+028fd37ed2dc0f473d244465a2150fbd  yumex-1.1.5.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- yumex.spec	9 Oct 2006 07:06:21 -0000	1.37
+++ yumex.spec	22 Oct 2006 12:38:08 -0000	1.38
@@ -1,6 +1,6 @@
 Name:     yumex
-Version:  1.1.4
-Release:  2.0%{?dist}
+Version:  1.1.5
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-1.0
+- Development Release 1.1.5-1.0
 * Mon Oct 9 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-2.0
 - Development Release 1.1.4-2.0
 - Updated Requires: yum >= 3.0.0 to yum >= 3.0



From fedora-extras-commits at redhat.com  Sun Oct 22 13:48:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 22 Oct 2006 06:48:32 -0700
Subject: rpms/asymptote/FC-4 .cvsignore, 1.8, 1.9 asymptote.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200610221348.k9MDmWYF014262@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207/FC-4

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2006 16:01:23 -0000	1.8
+++ .cvsignore	22 Oct 2006 13:48:02 -0000	1.9
@@ -1 +1 @@
-asymptote-1.13.tar.gz
+asymptote-1.15.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/asymptote.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- asymptote.spec	6 Sep 2006 16:01:23 -0000	1.9
+++ asymptote.spec	22 Oct 2006 13:48:02 -0000	1.10
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.13
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2006 16:01:23 -0000	1.8
+++ sources	22 Oct 2006 13:48:02 -0000	1.9
@@ -1 +1 @@
-c1d2461ac846ab5e16c46fffd1dc1935  asymptote-1.13.tar.gz
+0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 13:48:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 22 Oct 2006 06:48:33 -0700
Subject: rpms/asymptote/devel .cvsignore, 1.8, 1.9 asymptote.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200610221348.k9MDmX2p014270@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207/devel

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2006 15:43:06 -0000	1.8
+++ .cvsignore	22 Oct 2006 13:48:03 -0000	1.9
@@ -1 +1 @@
-asymptote-1.13.tar.gz
+asymptote-1.15.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- asymptote.spec	6 Sep 2006 15:43:06 -0000	1.9
+++ asymptote.spec	22 Oct 2006 13:48:03 -0000	1.10
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.13
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2006 15:43:06 -0000	1.8
+++ sources	22 Oct 2006 13:48:03 -0000	1.9
@@ -1 +1 @@
-c1d2461ac846ab5e16c46fffd1dc1935  asymptote-1.13.tar.gz
+0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 13:48:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 22 Oct 2006 06:48:32 -0700
Subject: rpms/asymptote/FC-5 .cvsignore, 1.8, 1.9 asymptote.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200610221348.k9MDmWQi014267@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207/FC-5

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2006 16:01:26 -0000	1.8
+++ .cvsignore	22 Oct 2006 13:48:02 -0000	1.9
@@ -1 +1 @@
-asymptote-1.13.tar.gz
+asymptote-1.15.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/asymptote.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- asymptote.spec	6 Sep 2006 16:01:26 -0000	1.9
+++ asymptote.spec	22 Oct 2006 13:48:02 -0000	1.10
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.13
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2006 16:01:26 -0000	1.8
+++ sources	22 Oct 2006 13:48:02 -0000	1.9
@@ -1 +1 @@
-c1d2461ac846ab5e16c46fffd1dc1935  asymptote-1.13.tar.gz
+0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 15:09:13 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 22 Oct 2006 08:09:13 -0700
Subject: rpms/jd/devel .cvsignore,1.5,1.6 jd.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <200610221509.k9MF9DYC020576@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20556

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 12:21:27 -0000	1.5
+++ .cvsignore	22 Oct 2006 15:08:43 -0000	1.6
@@ -1 +1 @@
-jd-1.8.0-beta061009.tgz
+jd-1.8.0-cvs061022.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jd.spec	9 Oct 2006 12:21:27 -0000	1.5
+++ jd.spec	22 Oct 2006 15:08:43 -0000	1.6
@@ -4,19 +4,22 @@
 # enter return
 # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.jp:/cvsroot/jd4linux co jd
 # mv jd jd-%%{main_ver}-%%{strtag}
+# tar -cvz jd-%%{main_ver}-%%{strtag}.tgz jd-%%{main_ver}-%%{strtag}
 #
 ##########################################
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061009
+%define         strtag        cvs061022
 %define         repoid        22118
 
 
 # Defined by vendor
 #
 %define         vendor_rel    1
-%define         vendor        fedora
+# Tag name changed from vendor to vendorname so as not to
+# overwrite Vendor entry in Summary
+%define         vendorname    fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
@@ -41,8 +44,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -76,7 +79,7 @@
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 desktop-file-install \
-   --vendor %{vendor} \
+   --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category %{category} \
    %{name}.desktop
@@ -96,12 +99,15 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
-%{_datadir}/applications/%{vendor}-%{name}.desktop
+%{_datadir}/applications/%{vendorname}-%{name}.desktop
 %{icondir}/%{name}.png
 
 %changelog
+* 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 a061009
+- 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 12:21:27 -0000	1.5
+++ sources	22 Oct 2006 15:08:43 -0000	1.6
@@ -1 +1 @@
-b71195e64e520b745885120b2d77c5c2  jd-1.8.0-beta061009.tgz
+f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz



From fedora-extras-commits at redhat.com  Sun Oct 22 15:10:41 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sun, 22 Oct 2006 08:10:41 -0700
Subject: rpms/pan/devel pan.spec,1.22,1.23
Message-ID: <200610221510.k9MFAfOb020611@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20590

Modified Files:
	pan.spec 
Log Message:
Bump release to correct cvs committing mistake




Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pan.spec	22 Oct 2006 12:12:15 -0000	1.22
+++ pan.spec	22 Oct 2006 15:10:11 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
 Version:	0.117
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 22 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.117-2
+- Bump release to correct cvs commit mistake
+
 * Sun Oct 22 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.117-1
 - Update to 0.117
 



From fedora-extras-commits at redhat.com  Sun Oct 22 15:11:27 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 22 Oct 2006 08:11:27 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.4,1.5 jd.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <200610221511.k9MFBR4f020675@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20646

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Oct 2006 13:07:35 -0000	1.4
+++ .cvsignore	22 Oct 2006 15:10:57 -0000	1.5
@@ -1 +1 @@
-jd-1.8.0-beta061009.tgz
+jd-1.8.0-cvs061022.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jd.spec	9 Oct 2006 13:07:35 -0000	1.4
+++ jd.spec	22 Oct 2006 15:10:57 -0000	1.5
@@ -4,19 +4,22 @@
 # enter return
 # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.jp:/cvsroot/jd4linux co jd
 # mv jd jd-%%{main_ver}-%%{strtag}
+# tar -cvz jd-%%{main_ver}-%%{strtag}.tgz jd-%%{main_ver}-%%{strtag}
 #
 ##########################################
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061009
+%define         strtag        cvs061022
 %define         repoid        22118
 
 
 # Defined by vendor
 #
 %define         vendor_rel    1
-%define         vendor        fedora
+# Tag name changed from vendor to vendorname so as not to
+# overwrite Vendor entry in Summary
+%define         vendorname    fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
@@ -41,8 +44,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -76,7 +79,7 @@
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 desktop-file-install \
-   --vendor %{vendor} \
+   --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category %{category} \
    %{name}.desktop
@@ -96,12 +99,15 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
-%{_datadir}/applications/%{vendor}-%{name}.desktop
+%{_datadir}/applications/%{vendorname}-%{name}.desktop
 %{icondir}/%{name}.png
 
 %changelog
+* 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 a061009
+- 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Oct 2006 13:07:35 -0000	1.4
+++ sources	22 Oct 2006 15:10:57 -0000	1.5
@@ -1 +1 @@
-b71195e64e520b745885120b2d77c5c2  jd-1.8.0-beta061009.tgz
+f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz



From fedora-extras-commits at redhat.com  Sun Oct 22 15:28:43 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 22 Oct 2006 08:28:43 -0700
Subject: rpms/python-reportlab/FC-3 python-reportlab.spec,1.6,1.7
Message-ID: <200610221528.k9MFShTk020806@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-reportlab/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20790

Modified Files:
	python-reportlab.spec 
Log Message:
apparently it still does not build on x86_64, will add more to bug #211766


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/FC-3/python-reportlab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-reportlab.spec	22 Oct 2006 11:38:34 -0000	1.6
+++ python-reportlab.spec	22 Oct 2006 15:28:13 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		python-reportlab
 Version:	1.20
-Release:	3.fc3
+Release:	3.fc3.1
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -32,9 +32,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+# Hack. See spec changelog.
+mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}
+ln -s lib ${RPM_BUILD_ROOT}%{_prefix}/lib64
+
 cd ./reportlab
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 
+# Hack. See spec changelog.
+rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib64
+
 rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
 rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
 rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
@@ -50,6 +58,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.20-3.fc3.1
+- Hack the spec to make this build as noarch on x86_64, too.
+
 * Mon May  9 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-3.fc3
 - Switchback to sitelib patch.
 - Make package noarch.



From fedora-extras-commits at redhat.com  Sun Oct 22 17:57:17 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 22 Oct 2006 10:57:17 -0700
Subject: rpms/dejavu-fonts import.log,1.87,1.88
Message-ID: <200610221757.k9MHvHXt027313@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27278

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.11-1.fc6 on branch devel from dejavu-fonts-2.11-1.fc6.src.rpm
2.11


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- import.log	24 Sep 2006 10:44:46 -0000	1.87
+++ import.log	22 Oct 2006 17:56:47 -0000	1.88
@@ -84,3 +84,4 @@
 dejavu-fonts-2_10-1_fc6:HEAD:dejavu-fonts-2.10-1.fc6.src.rpm:1158499493
 dejavu-fonts-2_10-1_fc5:FC-5:dejavu-fonts-2.10-1.fc5.src.rpm:1158500068
 dejavu-fonts-2_10_0-2_fc6:HEAD:dejavu-fonts-2.10.0-2.fc6.src.rpm:1159094676
+dejavu-fonts-2_11-1_fc6:HEAD:dejavu-fonts-2.11-1.fc6.src.rpm:1161539797



From fedora-extras-commits at redhat.com  Sun Oct 22 17:57:18 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 22 Oct 2006 10:57:18 -0700
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.23,
	1.24 dejavu-fonts-experimental-fontconfig.conf, 1.5,
	1.6 dejavu-fonts.spec, 1.46, 1.47 sources, 1.23,
	1.24 dejavu-fonts-condensed-fontconfig.conf, 1.1, NONE
Message-ID: <200610221757.k9MHvIlA027319@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27278/devel

Modified Files:
	.cvsignore dejavu-fonts-experimental-fontconfig.conf 
	dejavu-fonts.spec sources 
Removed Files:
	dejavu-fonts-condensed-fontconfig.conf 
Log Message:
auto-import dejavu-fonts-2.11-1.fc6 on branch devel from dejavu-fonts-2.11-1.fc6.src.rpm
2.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	17 Sep 2006 13:25:04 -0000	1.23
+++ .cvsignore	22 Oct 2006 17:56:48 -0000	1.24
@@ -1 +1 @@
-dejavu-sfd-2.10.tar.gz
+dejavu-sfd-2.11.tar.gz


Index: dejavu-fonts-experimental-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-experimental-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dejavu-fonts-experimental-fontconfig.conf	24 Sep 2006 10:44:47 -0000	1.5
+++ dejavu-fonts-experimental-fontconfig.conf	22 Oct 2006 17:56:48 -0000	1.6
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/58-dejavu-experimental.conf
+<!-- /etc/fonts/conf.d/61-dejavu-experimental.conf
 
      Define aliasing and other fontconfig settings for
      DejaVu experimental families
@@ -43,22 +43,14 @@
   </match>
 <!-- Assign generic name -->
   <alias>
-    <family>DejaVu Sans Condensed</family>
-    <default>
-      <family>condensed</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Serif Condensed</family>
-    <default>
-      <family>condensed</family>
-    </default>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans Condensed</family>
+    </prefer>
   </alias>
-<!-- Alias generic names -->
   <alias>
-    <family>condensed</family>
+    <family>serif</family>
     <prefer>
-      <family>DejaVu Sans Condensed</family>
       <family>DejaVu Serif Condensed</family>
     </prefer>
   </alias>


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- dejavu-fonts.spec	24 Sep 2006 10:44:47 -0000	1.46
+++ dejavu-fonts.spec	22 Oct 2006 17:56:48 -0000	1.47
@@ -2,7 +2,7 @@
 # This macro has the same value as %{version}, except when testing pre-release snapshots
 #%define alphatag        20060913svn1149
 
-%define archiveversion  2.10
+%define archiveversion  2.11
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 
@@ -11,8 +11,8 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.10.0
-Release:   2%{?dist}
+Version:   2.11
+Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -22,10 +22,8 @@
 Source1:   %{name}-fontconfig.conf
 # DejaVu fontconfig setup (experimental families)
 Source2:   %{name}-experimental-fontconfig.conf
-# Declare fontconfig condensed generic
-Source3:   %{name}-condensed-fontconfig.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fontforge
+BuildRequires: fontforge >= 20061019-1
 # The CPAN sources do not declare perl(Font::TTF)
 BuildRequires: perl-Font-TTF
 # Needed to compute unicode coverage
@@ -39,6 +37,9 @@
 Obsoletes: %{name}-makedefault < 2.9.0-1
 Obsoletes: %{name}-block < 2.9.0-1
 
+Provides: %{name}-makedefault = %{version}
+Provides: %{name}-fontconfig = %{version}
+
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -95,8 +96,7 @@
 # Fontconfig overrides for some scripts
 install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
 install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
-install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/58-dejavu-experimental.conf
-install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/41-condensed.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
 
 %clean
 /bin/rm -rf %{buildroot}
@@ -146,8 +146,7 @@
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config %{fontconfdir}/conf.d/41-condensed.conf
-%config %{fontconfdir}/conf.d/58-dejavu-experimental.conf
+%config %{fontconfdir}/conf.d/61-dejavu-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -155,6 +154,11 @@
 
 
 %changelog
+* Sun Oct 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.11
+- forget about the "condensed" generic, based on current feedback
+- new minimal fontforge BR
+
 * Sun Sep 24 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.10.0-2
 - rebuild with new fontforge snapshot


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Sep 2006 13:25:04 -0000	1.23
+++ sources	22 Oct 2006 17:56:48 -0000	1.24
@@ -1 +1 @@
-2d0c48afaba583833d90d30ff33d320a  dejavu-sfd-2.10.tar.gz
+64a34c66b1dbbdaccc108bd40a101d9c  dejavu-sfd-2.11.tar.gz


--- dejavu-fonts-condensed-fontconfig.conf DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 22 18:06:58 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 22 Oct 2006 11:06:58 -0700
Subject: rpms/dejavu-fonts import.log,1.88,1.89
Message-ID: <200610221806.k9MI6wVr030388@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30354

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.11-1.fc5 on branch FC-5 from dejavu-fonts-2.11-1.fc5.src.rpm
2.11


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- import.log	22 Oct 2006 17:56:47 -0000	1.88
+++ import.log	22 Oct 2006 18:06:28 -0000	1.89
@@ -85,3 +85,4 @@
 dejavu-fonts-2_10-1_fc5:FC-5:dejavu-fonts-2.10-1.fc5.src.rpm:1158500068
 dejavu-fonts-2_10_0-2_fc6:HEAD:dejavu-fonts-2.10.0-2.fc6.src.rpm:1159094676
 dejavu-fonts-2_11-1_fc6:HEAD:dejavu-fonts-2.11-1.fc6.src.rpm:1161539797
+dejavu-fonts-2_11-1_fc5:FC-5:dejavu-fonts-2.11-1.fc5.src.rpm:1161540378



From fedora-extras-commits at redhat.com  Sun Oct 22 18:06:59 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 22 Oct 2006 11:06:59 -0700
Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.19,
	1.20 dejavu-fonts-experimental-fontconfig.conf, 1.3,
	1.4 dejavu-fonts-fontconfig.conf, 1.4, 1.5 dejavu-fonts.spec,
	1.28, 1.29 sources, 1.19, 1.20
Message-ID: <200610221806.k9MI6xN2030395@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30354/FC-5

Modified Files:
	.cvsignore dejavu-fonts-experimental-fontconfig.conf 
	dejavu-fonts-fontconfig.conf dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.11-1.fc5 on branch FC-5 from dejavu-fonts-2.11-1.fc5.src.rpm
2.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	17 Sep 2006 13:34:39 -0000	1.19
+++ .cvsignore	22 Oct 2006 18:06:29 -0000	1.20
@@ -1 +1 @@
-dejavu-sfd-2.10.tar.gz
+dejavu-sfd-2.11.tar.gz


Index: dejavu-fonts-experimental-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-experimental-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dejavu-fonts-experimental-fontconfig.conf	17 Sep 2006 13:34:39 -0000	1.3
+++ dejavu-fonts-experimental-fontconfig.conf	22 Oct 2006 18:06:29 -0000	1.4
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/58-dejavu-experimental.conf
+<!-- /etc/fonts/conf.d/61-dejavu-experimental.conf
 
-     Define aliasing and other fontconfig stuff for DejaVu experimental
-     families
+     Define aliasing and other fontconfig settings for
+     DejaVu experimental families
 
      ?? 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-
-     $Id$
 -->
 <fontconfig>
 <!-- Declare substitutes -->
@@ -45,16 +43,16 @@
   </match>
 <!-- Assign generic name -->
   <alias>
-    <family>DejaVu Sans Condensed</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans Condensed</family>
+    </prefer>
   </alias>
   <alias>
-    <family>DejaVu Serif Condensed</family>
-    <default>
-      <family>serif</family>
-    </default>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu Serif Condensed</family>
+    </prefer>
   </alias>
 <!-- Turn off hinting at small sizes -->
   <match target="font">


Index: dejavu-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dejavu-fonts-fontconfig.conf	17 Sep 2006 13:34:39 -0000	1.4
+++ dejavu-fonts-fontconfig.conf	22 Oct 2006 18:06:29 -0000	1.5
@@ -2,11 +2,10 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/conf.d/58-dejavu.conf
 
-     Define aliasing and other fontconfig settings for DejaVu stable families
+     Define aliasing and other fontconfig settings for
+     DejaVu stable families
 
      ?? 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-
-     $Id$
 -->
 <fontconfig>
 <!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans
@@ -179,30 +178,24 @@
     </default>
   </alias>
 <!-- Alias generic names -->
-  <match>
-    <test name="family">
-      <string>sans-serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>monospace</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>DejaVu Sans Mono</family>
+    </prefer>
+  </alias>
 <!-- Turn off hinting at small sizes -->
   <match target="font">
     <test name="family">


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dejavu-fonts.spec	17 Sep 2006 13:34:39 -0000	1.28
+++ dejavu-fonts.spec	22 Oct 2006 18:06:29 -0000	1.29
@@ -2,7 +2,7 @@
 # This macro has the same value as %{version}, except when testing pre-release snapshots
 #%define alphatag        20060913svn1149
 
-%define archiveversion  2.10
+%define archiveversion  2.11
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 %define xsldir          %{_datadir}/xml/%{name}
@@ -12,28 +12,28 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.10
+Version:   2.11
 Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
 Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz
-# Make DejaVu fonts the default in Sans, Serif and Monospace
-Source1:   %{name}-makedefault.xsl
-#  Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi
-Source2:   %{name}-block.xsl
-Source3:   %{name}-unblock.xsl
 # DejaVu fontconfig setup
-Source4:   %{name}-fontconfig.conf
+Source1:   %{name}-fontconfig.conf
 # DejaVu fontconfig setup (experimental families)
-Source5:   %{name}-experimental-fontconfig.conf
+Source2:   %{name}-experimental-fontconfig.conf
+# Make DejaVu fonts the default in Sans, Serif and Monospace
+Source3:   %{name}-makedefault.xsl
+#  Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi
+Source4:   %{name}-block.xsl
+Source5:   %{name}-unblock.xsl
 # Substitute the glyphs of another font in DejaVu for Farsi
 Source6:   %{name}-persian-override.conf
 # Substitute the glyphs of another font in DejaVu for Arabic
 Source7:   %{name}-arabic-override.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fontforge
+BuildRequires: fontforge >= 20061019
 # The CPAN sources do not declare perl(Font::TTF)
 BuildRequires: perl-Font-TTF
 # Needed to compute unicode coverage
@@ -136,14 +136,14 @@
 
 #xsl
 install -d -m 755 %{buildroot}%{xsldir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/makedefault.xsl
-install -p -m 644 %{SOURCE2} %{buildroot}%{xsldir}/block.xsl
-install -p -m 644 %{SOURCE3} %{buildroot}%{xsldir}/unblock.xsl
+install -p -m 644 %{SOURCE3} %{buildroot}%{xsldir}/makedefault.xsl
+install -p -m 644 %{SOURCE4} %{buildroot}%{xsldir}/block.xsl
+install -p -m 644 %{SOURCE5} %{buildroot}%{xsldir}/unblock.xsl
 
 # Fontconfig overrides for some scripts
 install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
-install -m 0644 %{SOURCE5} %{buildroot}%{fontconfdir}/conf.d/58-dejavu-experimental.conf
+install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
 install -m 0644 %{SOURCE6} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-persian-override.conf
 install -m 0644 %{SOURCE7} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-arabic-override.conf
 
@@ -228,7 +228,7 @@
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config %{fontconfdir}/conf.d/58-dejavu-experimental.conf
+%config %{fontconfdir}/conf.d/61-dejavu-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -252,6 +252,10 @@
 
 
 %changelog
+* Sun Oct 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.11
+- new minimal fontforge BR
+
 * Sun Sep 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Sep 2006 13:34:39 -0000	1.19
+++ sources	22 Oct 2006 18:06:29 -0000	1.20
@@ -1 +1 @@
-2d0c48afaba583833d90d30ff33d320a  dejavu-sfd-2.10.tar.gz
+64a34c66b1dbbdaccc108bd40a101d9c  dejavu-sfd-2.11.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 23:43:58 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 16:43:58 -0700
Subject: fedora-updates-system README,NONE,1.1
Message-ID: <200610222343.k9MNhwmF014355@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-updates-system
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14338

Added Files:
	README 
Log Message:
Added basic readme file (empty_



--- NEW FILE README ---



From fedora-extras-commits at redhat.com  Mon Oct 23 01:05:54 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 22 Oct 2006 18:05:54 -0700
Subject: rpms/viaideinfo/FC-5 viaideinfo.spec,1.1,1.2
Message-ID: <200610230105.k9N15sWr021222@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21151

Modified Files:
	viaideinfo.spec 
Log Message:
Enable x86-64 building (upstream says its OK)


Index: viaideinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/FC-5/viaideinfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- viaideinfo.spec	19 Oct 2006 06:50:13 -0000	1.1
+++ viaideinfo.spec	23 Oct 2006 01:05:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		viaideinfo
 Version:	0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Displays the information of installed VIA IDE controllers 
 Group:		Applications/System
 License:	GPL
@@ -9,7 +9,7 @@
 Source0:	http://reactivated.net/software/viaideinfo/viaideinfo-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pciutils-devel >= 2.2.0  
 
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Sun Oct 22 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-2 
+- Enable x86-64 build support
+
 * Tue Oct 17 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-1
 - Initial packaging



From fedora-extras-commits at redhat.com  Mon Oct 23 01:32:44 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:32:44 -0700
Subject: rpms/moodle/FC-4 moodle.spec,1.5,1.6
Message-ID: <200610230132.k9N1WiRh021372@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21328/FC-4

Modified Files:
	moodle.spec 
Log Message:
Added php-mysql #208255


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- moodle.spec	16 Oct 2006 14:09:05 -0000	1.5
+++ moodle.spec	23 Oct 2006 01:32:14 -0000	1.6
@@ -28,7 +28,7 @@
 BuildArch:      noarch
 
 #BuildRequires:  
-Requires:       php-gd vixie-cron mimetex perl(lib)
+Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service



From fedora-extras-commits at redhat.com  Mon Oct 23 01:32:45 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:32:45 -0700
Subject: rpms/moodle/FC-5 moodle.spec,1.5,1.6
Message-ID: <200610230132.k9N1Wjmi021375@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21328/FC-5

Modified Files:
	moodle.spec 
Log Message:
Added php-mysql #208255


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/moodle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- moodle.spec	16 Oct 2006 14:09:05 -0000	1.5
+++ moodle.spec	23 Oct 2006 01:32:15 -0000	1.6
@@ -28,7 +28,7 @@
 BuildArch:      noarch
 
 #BuildRequires:  
-Requires:       php-gd vixie-cron mimetex perl(lib)
+Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service



From fedora-extras-commits at redhat.com  Mon Oct 23 01:32:51 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:32:51 -0700
Subject: rpms/moodle/devel moodle.spec,1.6,1.7
Message-ID: <200610230132.k9N1Wp4C021378@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21328/devel

Modified Files:
	moodle.spec 
Log Message:
Added php-mysql #208255


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- moodle.spec	13 Oct 2006 20:34:10 -0000	1.6
+++ moodle.spec	23 Oct 2006 01:32:21 -0000	1.7
@@ -28,7 +28,7 @@
 BuildArch:      noarch
 
 #BuildRequires:  
-Requires:       php-gd vixie-cron mimetex perl(lib)
+Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service



From fedora-extras-commits at redhat.com  Mon Oct 23 01:34:59 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:34:59 -0700
Subject: rpms/moodle/FC-5 moodle.spec,1.6,1.7
Message-ID: <200610230134.k9N1YxeK021464@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21414/FC-5

Modified Files:
	moodle.spec 
Log Message:
Forgot to bump release and add changelog


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/moodle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- moodle.spec	23 Oct 2006 01:32:15 -0000	1.6
+++ moodle.spec	23 Oct 2006 01:34:29 -0000	1.7
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
+- Added requires php-mysql
+
 * Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
 - Major changes, update to 1.6.3
 - SpellChecker moved



From fedora-extras-commits at redhat.com  Mon Oct 23 01:34:58 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:34:58 -0700
Subject: rpms/moodle/FC-4 moodle.spec,1.6,1.7
Message-ID: <200610230134.k9N1YwWs021461@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21414/FC-4

Modified Files:
	moodle.spec 
Log Message:
Forgot to bump release and add changelog


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- moodle.spec	23 Oct 2006 01:32:14 -0000	1.6
+++ moodle.spec	23 Oct 2006 01:34:28 -0000	1.7
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
+- Added requires php-mysql
+
 * Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
 - Major changes, update to 1.6.3
 - SpellChecker moved



From fedora-extras-commits at redhat.com  Mon Oct 23 01:35:00 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:35:00 -0700
Subject: rpms/moodle/devel moodle.spec,1.7,1.8
Message-ID: <200610230135.k9N1Z0Wu021467@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21414/devel

Modified Files:
	moodle.spec 
Log Message:
Forgot to bump release and add changelog


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moodle.spec	23 Oct 2006 01:32:21 -0000	1.7
+++ moodle.spec	23 Oct 2006 01:34:29 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
+- Added requires php-mysql
+
 * Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
 - Major changes, update to 1.6.3
 - SpellChecker moved



From fedora-extras-commits at redhat.com  Mon Oct 23 02:30:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 22 Oct 2006 19:30:48 -0700
Subject: rpms/perl-POE-Component-IRC/devel .cvsignore, 1.10,
	1.11 perl-POE-Component-IRC.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <200610230230.k9N2Um6w024980@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24940/devel

Modified Files:
	.cvsignore perl-POE-Component-IRC.spec sources 
Log Message:
update to 5.07



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Oct 2006 02:40:36 -0000	1.10
+++ .cvsignore	23 Oct 2006 02:30:18 -0000	1.11
@@ -1 +1 @@
-POE-Component-IRC-5.05.tar.gz
+POE-Component-IRC-5.07.tar.gz


Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/perl-POE-Component-IRC.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-POE-Component-IRC.spec	11 Oct 2006 02:40:36 -0000	1.11
+++ perl-POE-Component-IRC.spec	23 Oct 2006 02:30:18 -0000	1.12
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        5.05
+Version:        5.07
 Release:        1%{?dist}
 Summary:        A POE component for building IRC clients        
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.07-1
+- update to 5.07
+
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.05-1
 - update to 5.05
 - scratched head in confusion at versions in the last few changelogs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 02:40:36 -0000	1.10
+++ sources	23 Oct 2006 02:30:18 -0000	1.11
@@ -1 +1 @@
-ce082865e2c21e01a870c0b792649d5a  POE-Component-IRC-5.05.tar.gz
+776f4e27fd605ea0b8064d42aad3fc9b  POE-Component-IRC-5.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:30:47 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 22 Oct 2006 19:30:47 -0700
Subject: rpms/perl-POE-Component-IRC/FC-5 perl-POE-Component-IRC.spec, 1.11, 
	1.12 sources, 1.10, 1.11
Message-ID: <200610230230.k9N2Ul9m024975@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24940/FC-5

Modified Files:
	perl-POE-Component-IRC.spec sources 
Log Message:
update to 5.07



Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/FC-5/perl-POE-Component-IRC.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-POE-Component-IRC.spec	11 Oct 2006 02:40:34 -0000	1.11
+++ perl-POE-Component-IRC.spec	23 Oct 2006 02:30:16 -0000	1.12
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        5.05
+Version:        5.07
 Release:        1%{?dist}
 Summary:        A POE component for building IRC clients        
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.07-1
+- update to 5.07
+
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.05-1
 - update to 5.05
 - scratched head in confusion at versions in the last few changelogs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 02:40:34 -0000	1.10
+++ sources	23 Oct 2006 02:30:16 -0000	1.11
@@ -1 +1 @@
-ce082865e2c21e01a870c0b792649d5a  POE-Component-IRC-5.05.tar.gz
+776f4e27fd605ea0b8064d42aad3fc9b  POE-Component-IRC-5.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:37:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 22 Oct 2006 19:37:57 -0700
Subject: rpms/perl-POE-Component-Client-HTTP/FC-5
	perl-POE-Component-Client-HTTP.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610230237.k9N2bvWT025108@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25072/FC-5

Modified Files:
	perl-POE-Component-Client-HTTP.spec sources 
Log Message:
update to 0.79



Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-POE-Component-Client-HTTP.spec	4 Oct 2006 04:58:35 -0000	1.3
+++ perl-POE-Component-Client-HTTP.spec	23 Oct 2006 02:37:27 -0000	1.4
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.78
+Version:        0.79
 Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
@@ -25,6 +25,7 @@
 BuildRequires:  perl(POE) >= 0.31, perl(HTTP::Request) >= 1.30
 BuildRequires:  perl(HTTP::Response) >= 1.37, perl(URI) >= 1.24
 BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0901
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 BuildRequires:  dos2unix, sed
 
 # use base...
@@ -84,6 +85,10 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.79-1
+- update to 0.79-1
+- add pod test modules to BR
+
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
 - update to 0.78
 - minor spec tweaks


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:58:35 -0000	1.3
+++ sources	23 Oct 2006 02:37:27 -0000	1.4
@@ -1 +1 @@
-093521d8c3a2b874fce1c04092e7159a  POE-Component-Client-HTTP-0.78.tar.gz
+f873ef9a39958c6b5389e8e48577e9e2  POE-Component-Client-HTTP-0.79.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:37:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 22 Oct 2006 19:37:58 -0700
Subject: rpms/perl-POE-Component-Client-HTTP/devel .cvsignore, 1.3,
	1.4 perl-POE-Component-Client-HTTP.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200610230237.k9N2bwQi025113@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25072/devel

Modified Files:
	.cvsignore perl-POE-Component-Client-HTTP.spec sources 
Log Message:
update to 0.79



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 04:58:36 -0000	1.3
+++ .cvsignore	23 Oct 2006 02:37:28 -0000	1.4
@@ -1 +1 @@
-POE-Component-Client-HTTP-0.78.tar.gz
+POE-Component-Client-HTTP-0.79.tar.gz


Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-POE-Component-Client-HTTP.spec	4 Oct 2006 04:58:36 -0000	1.5
+++ perl-POE-Component-Client-HTTP.spec	23 Oct 2006 02:37:28 -0000	1.6
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.78
+Version:        0.79
 Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
@@ -25,6 +25,7 @@
 BuildRequires:  perl(POE) >= 0.31, perl(HTTP::Request) >= 1.30
 BuildRequires:  perl(HTTP::Response) >= 1.37, perl(URI) >= 1.24
 BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0901
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 BuildRequires:  dos2unix, sed
 
 # use base...
@@ -84,6 +85,10 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.79-1
+- update to 0.79-1
+- add pod test modules to BR
+
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
 - update to 0.78
 - minor spec tweaks


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:58:36 -0000	1.3
+++ sources	23 Oct 2006 02:37:28 -0000	1.4
@@ -1 +1 @@
-093521d8c3a2b874fce1c04092e7159a  POE-Component-Client-HTTP-0.78.tar.gz
+f873ef9a39958c6b5389e8e48577e9e2  POE-Component-Client-HTTP-0.79.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:50:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 22 Oct 2006 19:50:17 -0700
Subject: rpms/qt4/devel .cvsignore, 1.10, 1.11 qt4.spec, 1.24, 1.25 sources, 
	1.8, 1.9
Message-ID: <200610230250.k9N2oHsb025238@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25218

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Oct 2006 13:54:11 -0000	1.10
+++ .cvsignore	23 Oct 2006 02:49:46 -0000	1.11
@@ -1,5 +1,5 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
-qt-x11-opensource-src-4.2.0-rc1.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
+qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- qt4.spec	4 Oct 2006 13:54:11 -0000	1.24
+++ qt4.spec	23 Oct 2006 02:49:46 -0000	1.25
@@ -12,7 +12,7 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.2.0
+Version: 4.2.1
 Release: 1%{?dist}
 
 License: GPL/QPL
@@ -56,7 +56,7 @@
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
-# See bug #196901
+# See http://bugzilla.redhat.com/196901
 %define qt_datadir %{_datadir}/%{qt_dirname}
 %define qt_docdir %{_docdir}/%{qt_dirname}
 %define qt_headerdir %{_includedir} 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Oct 2006 13:54:11 -0000	1.8
+++ sources	23 Oct 2006 02:49:46 -0000	1.9
@@ -1 +1 @@
-2c062a125d5ca66397e3430ba537fbec  qt-x11-opensource-src-4.2.0.tar.gz
+6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:52:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 22 Oct 2006 19:52:35 -0700
Subject: rpms/qt4/FC-5 .cvsignore, 1.7, 1.8 qt4.spec, 1.18, 1.19 sources, 1.5,
	1.6
Message-ID: <200610230252.k9N2qZuB025305@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25284

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Oct 2006 19:19:15 -0000	1.7
+++ .cvsignore	23 Oct 2006 02:52:05 -0000	1.8
@@ -2,3 +2,4 @@
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
+qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qt4.spec	11 Oct 2006 19:19:15 -0000	1.18
+++ qt4.spec	23 Oct 2006 02:52:05 -0000	1.19
@@ -12,7 +12,7 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.2.0
+Version: 4.2.1
 Release: 1%{?dist}
 
 License: GPL/QPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Oct 2006 19:19:15 -0000	1.5
+++ sources	23 Oct 2006 02:52:05 -0000	1.6
@@ -1 +1 @@
-2c062a125d5ca66397e3430ba537fbec  qt-x11-opensource-src-4.2.0.tar.gz
+6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 03:23:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 22 Oct 2006 20:23:48 -0700
Subject: rpms/qt4/FC-4 .cvsignore, 1.7, 1.8 qt4.spec, 1.14, 1.15 sources, 1.3,
	1.4
Message-ID: <200610230323.k9N3Nmiu028541@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28520

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-1
- 4.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Oct 2006 14:47:31 -0000	1.7
+++ .cvsignore	23 Oct 2006 03:23:17 -0000	1.8
@@ -1,4 +1,6 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
+qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qt4.spec	11 Oct 2006 17:17:42 -0000	1.14
+++ qt4.spec	23 Oct 2006 03:23:17 -0000	1.15
@@ -4,8 +4,8 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.1.4
-Release: 11%{?dist}.2
+Version: 4.1.5
+Release: 1%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -462,6 +462,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-1
+- 4.1.5
+
 * Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.2
 - (re)enable -system-nas-sound on FC-4/x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2006 18:36:33 -0000	1.3
+++ sources	23 Oct 2006 03:23:17 -0000	1.4
@@ -1 +1 @@
-88f8c9c4622108baca2950baac3c02d6  qt-x11-opensource-src-4.1.4.tar.gz
+4ef549ca642c57f3b217ee88670e56cb  qt-x11-opensource-src-4.1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 06:40:07 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Sun, 22 Oct 2006 23:40:07 -0700
Subject: rpms/yumex/devel yumex.spec,1.38,1.39
Message-ID: <200610230640.k9N6e7EZ005570@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5554

Modified Files:
	yumex.spec 
Log Message:
bump release for a new build


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- yumex.spec	22 Oct 2006 12:38:08 -0000	1.38
+++ yumex.spec	23 Oct 2006 06:39:36 -0000	1.39
@@ -1,6 +1,6 @@
 Name:     yumex
 Version:  1.1.5
-Release:  1.0%{?dist}
+Release:  2.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0
+- bumped release for new build
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-1.0
 - Development Release 1.1.5-1.0
 * Mon Oct 9 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-2.0



From fedora-extras-commits at redhat.com  Mon Oct 23 08:15:33 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 23 Oct 2006 01:15:33 -0700
Subject: fedora-security/audit fc5,1.364,1.365
Message-ID: <200610230815.k9N8FX7G011885@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11867

Modified Files:
	fc5 
Log Message:
Add mutt, fixup after php release



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- fc5	20 Oct 2006 12:37:20 -0000	1.364
+++ fc5	23 Oct 2006 08:15:29 -0000	1.365
@@ -1,11 +1,11 @@
-Up to date CVE as of CVE email 20061016
+Up to date CVE as of CVE email 20061022
 Up to date FC5 as of 20061016
 
 ** are items that need attention
 
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
-CVE-2006-5298 ** mutt
-CVE-2006-5297 ** mutt
+CVE-2006-5298 VULNERABLE (mutt)
+CVE-2006-5297 VULNERABLE (mutt)
 CVE-2006-5229 ignore (openssh) reported not an issue
 CVE-2006-5215 VULNERABLE (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
@@ -27,15 +27,15 @@
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022]
 CVE-2006-4980 VULNERABLE (python) #208166
-CVE-2006-4925 ** openssh
+CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
-CVE-2006-4812 VULNERABLE (php) [since FEDORA-2006-1024]
+CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 VULNERABLE (kdelibs) #211342
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
-CVE-2006-4625 VULNERABLE (php)
+CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
 CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) #205652
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
@@ -60,12 +60,12 @@
 CVE-2006-4538 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] ia64 and sparc only
 CVE-2006-4535 version (kernel, fixed 2.6.17.12, fixed 2.6.18-rc6) [since FEDORA-2006-967]
 CVE-2006-4507 ignore (libtiff) can't reproduce
-CVE-2006-4486 VULNERABLE (php, fixed 5.1.6) [since FEDORA-2006-1024]
-CVE-2006-4485 VULNERABLE (php, fixed 5.1.5) [since FEDORA-2006-1024]
-CVE-2006-4484 ignore (php, fixed 5.1.5) [since FEDORA-2006-1024]
+CVE-2006-4486 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
+CVE-2006-4485 version (php, fixed 5.1.5) [since FEDORA-2006-1024]
+CVE-2006-4484 version (php, fixed 5.1.5) [since FEDORA-2006-1024] also ignore
 CVE-2006-4484 ignore (gd)
 CVE-2006-4483 ignore (php) not linux
-CVE-2006-4482 VULNERABLE (php, fixed 5.1.5) [#204995] [since FEDORA-2006-1024]
+CVE-2006-4482 version (php, fixed 5.1.5) #204995 [since FEDORA-2006-1024]
 CVE-2006-4481 ignore (php) safe mode isn't safe
 CVE-2006-4455 ignore (xchat) client DoS
 CVE-2006-4447 ignore (xorg) not a security issue
@@ -81,7 +81,7 @@
 CVE-2006-4336 version (gzip) #207643 [since FEDORA-2006-993]
 CVE-2006-4335 version (gzip) #207643 [since FEDORA-2006-993]
 CVE-2006-4334 version (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4433 VULNERABLE (php, fixed 5.1.4)
+CVE-2006-4433 version (php, fixed 5.1.4) [since FEDORA-2006-1024]
 CVE-2006-4333 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
 CVE-2006-4332 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
 CVE-2006-4331 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
@@ -99,7 +99,7 @@
 CVE-2006-4095 version (bind) [since FEDORA-2006-418] was backport since FEDORA-2006-966
 CVE-2006-4093 version (kernel, fixed 2.6.17.9) [since FEDORA-2006-967]
 CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) #202247
-CVE-2006-4020 VULNERABLE (php) #201767 [since FEDORA-2006-1024]
+CVE-2006-4020 version (php) #201767 [since FEDORA-2006-1024]
 CVE-2006-4019 version (squirrelmail, fixed 1.4.8) #202196 [since FEDORA-2006-913]
 CVE-2006-3918 version httpd, fixed 2.2.2 [since FEDORA-2006-364]
 CVE-2006-3879 version (mikmod, not 3.1.6)
@@ -203,9 +203,9 @@
 CVE-2006-3081 version (mysql, fixed 5.1.18) [since FEDORA-2006-702]
 CVE-2006-3057 version (dhcdbd, fixed 1.14) [since FEDORA-2006-609]
 CVE-2006-3018 ignore (php, fixed 5.1.3) no verification of flaw
-CVE-2006-3017 VULNERABLE (php, fixed 5.1.3) #197379
-CVE-2006-3016 VULNERABLE (php, fixed 5.1.3)
-CVE-2006-3011 VULNERABLE (php) (safe mode isn't)
+CVE-2006-3017 version (php, fixed 5.1.3) #197379 [since FEDORA-2006-1024]
+CVE-2006-3016 version (php, fixed 5.1.3) [since FEDORA-2006-1024]
+CVE-2006-3011 version (php, fixed 5.1.5) [since FEDORA-2006-1024]
 CVE-2006-3005 ignore (libjpeg) not a vuln
 CVE-2006-2941 VULNERABLE (mailman, fixed 2.1.9)
 CVE-2006-2940 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
@@ -533,8 +533,8 @@
 CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0019 version (kdelibs, fixed 3.5.1)
 CVE-2005-4811 version (kernel, fixed 2.6.13)
-CVE-2005-4809 ** firefox
-CVE-2005-4809 ** seamonkey
+CVE-2005-4809 VULNERABLE (firefox)
+CVE-2005-4809 VULNERABLE (seamonkey)
 CVE-2005-4808 ignore (binutils, gas fixed 20050714) this is a bug
 CVE-2005-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2005-4798 version (kernel, not 2.6)



From fedora-extras-commits at redhat.com  Mon Oct 23 08:18:15 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 23 Oct 2006 01:18:15 -0700
Subject: fedora-security/audit fc6,1.117,1.118
Message-ID: <200610230818.k9N8IFXT011930@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11912

Modified Files:
	fc6 
Log Message:
Bring up to date with GOLD and recent CVE



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fc6	18 Oct 2006 19:39:32 -0000	1.117
+++ fc6	23 Oct 2006 08:18:12 -0000	1.118
@@ -1,9 +1,11 @@
-Up to date CVE as of CVE email 20061014
-Up to date FC6 as of re20061014.0
+Up to date CVE as of CVE email 20061022
+Up to date FC6 as of GOLD
 
 ** are items that need attention
 
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
+CVE-2006-5298 VULNERABLE (mutt)
+CVE-2006-5297 VULNERABLE (mutt)
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)



From fedora-extras-commits at redhat.com  Mon Oct 23 09:08:08 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Mon, 23 Oct 2006 02:08:08 -0700
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.1,1.2
Message-ID: <200610230908.k9N988E5015094@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15066/devel

Modified Files:
	pulseaudio.spec 
Log Message:
Create the user and groups that PulseAudio wants as part of the RPM process.



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulseaudio.spec	28 Aug 2006 12:41:01 -0000	1.1
+++ pulseaudio.spec	23 Oct 2006 09:07:38 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -134,7 +134,7 @@
 %patch1 -p1
 
 %build
-%configure --disable-ltdl-install --disable-static --disable-rpath
+%configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
 make LIBTOOL=/usr/bin/libtool
 make doxygen
 
@@ -149,8 +149,23 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+groupadd -r pulse &>/dev/null || :
+useradd -r -c 'PulseAudio daemon' \
+    -s /sbin/nologin -d / -g pulse pulse &>/dev/null || :
+groupadd -r pulse-rt &>/dev/null || :
+groupadd -r pulse-access &>/dev/null || :
+
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ]; then
+    userdel pulse &>/dev/null || :
+    groupdel pulse &>/dev/null || :
+    groupdel pulse-rt &>/dev/null || :
+    groupdel pulse-access &>/dev/null || :
+fi
 
 %post lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -302,6 +317,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Wed Oct 23 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-2
+- Create user and groups for daemon.
+
 * Mon Aug 28 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-1
 - Upgrade to 0.9.5.
 



From fedora-extras-commits at redhat.com  Mon Oct 23 10:27:17 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Mon, 23 Oct 2006 03:27:17 -0700
Subject: rpms/pulseaudio/FC-5 pulseaudio.spec,1.1,1.2
Message-ID: <200610231027.k9NARH9j018541@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/pulseaudio/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18521

Modified Files:
	pulseaudio.spec 
Log Message:
Create the user and groups that PulseAudio wants as part of the RPM process.



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/pulseaudio/FC-5/pulseaudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulseaudio.spec	28 Aug 2006 12:41:01 -0000	1.1
+++ pulseaudio.spec	23 Oct 2006 10:26:47 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -134,7 +134,7 @@
 %patch1 -p1
 
 %build
-%configure --disable-ltdl-install --disable-static --disable-rpath
+%configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
 make LIBTOOL=/usr/bin/libtool
 make doxygen
 
@@ -149,8 +149,23 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+groupadd -r pulse &>/dev/null || :
+useradd -r -c 'PulseAudio daemon' \
+    -s /sbin/nologin -d / -g pulse pulse &>/dev/null || :
+groupadd -r pulse-rt &>/dev/null || :
+groupadd -r pulse-access &>/dev/null || :
+
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ]; then
+    userdel pulse &>/dev/null || :
+    groupdel pulse &>/dev/null || :
+    groupdel pulse-rt &>/dev/null || :
+    groupdel pulse-access &>/dev/null || :
+fi
 
 %post lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -302,6 +317,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Wed Oct 23 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-2
+- Create user and groups for daemon.
+
 * Mon Aug 28 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-1
 - Upgrade to 0.9.5.
 



From fedora-extras-commits at redhat.com  Mon Oct 23 11:24:38 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 04:24:38 -0700
Subject: extras-buildsys/utils/pushscript extras-repoprune, NONE,
	1.1 RepoPrune.py, NONE, 1.1 README, 1.4, 1.5 Push.py, 1.5,
	1.6 extras-repomanage, 1.1, NONE RepoManage.py, 1.1, NONE
Message-ID: <200610231124.k9NBOcBF022696@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22665

Modified Files:
	README Push.py 
Added Files:
	extras-repoprune RepoPrune.py 
Removed Files:
	extras-repomanage RepoManage.py 
Log Message:
Replace "repomanage" usage with repoprune. It not just gets rid
of obsolete and forgotten sub-packages, but is also 4x faster. 



--- NEW FILE extras-repoprune ---
#!/usr/bin/python -t
# 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

cfg = 'Extras'

if __name__ == '__main__':
    import os, sys, errno
    if len(sys.argv) < 2:
        print 'Usage: %s <release>\n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)
    cmd = os.path.join(sys.path[0],'RepoPrune.py')
    args = [cmd]+[cfg]+sys.argv[1:]
    os.execvp(cmd,args)


--- NEW FILE RepoPrune.py ---
#!/usr/bin/python -t
# -*- mode: Python; indent-tabs-mode: nil; -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

import errno, os, sys
import fnmatch, re
import rpmUtils.transaction, rpmUtils.miscutils

import Utils

DEBUG = False
Utils.setdebug(DEBUG)

def pruneRepo(keep,whitelist,srcdir,bindirlist):
    ts = rpmUtils.transaction.initReadOnlyTransaction()
    changed = False
    
    # Create list of src.rpm files.
    # We don't use "glob", so sub-directories are supported.
    print 'Expiring (keep=%d):' % keep, srcdir
    srcfiles = []
    for root, dirs, files in os.walk(srcdir):
            for f in fnmatch.filter(files,'*.src.rpm'):
                srcfiles.append(os.path.join(root,f))
    if not len(srcfiles):
        print '  Nothing found.'
        return changed
    assert srcfiles[0].startswith(srcdir)

    # Create map: rpm %name -> list of tuples (filename,name,e,v,r)
    newestsrcrpms = {}
    for f in srcfiles:
        hdr = rpmUtils.miscutils.hdrFromPackage(ts,f)
        n = hdr['name']
        v = hdr['version']
        r = hdr['release']
        e = hdr['epoch']
        if e is None:
            e = 0
        newestsrcrpms.setdefault(n,[])
        newestsrcrpms[n].append((f,n,e,v,r))

    # Now purge old src.rpm unless their %name matches a white-list pattern.
    for l in newestsrcrpms.values():
        x = len(l)

        if x > 1:
            # White-listing.
            (f,n,e,v,r) = l[0]
            keepthis = False
            for r in whitelist:
                if re.compile(r).search(n):
                    keepthis = True
                    break
            if keepthis:
                print '  Skipping',n
                continue

            def sortByEVR(fnevr1, fnevr2):
                (f1,n1,e1,v1,r1) = fnevr1
                (f2,n2,e2,v2,r2) = fnevr2
                rc = rpmUtils.miscutils.compareEVR((e1,v1,r1),(e2,v2,r2))
                if rc == 0:
                    return 0
                if rc > 0:
                    return -1
                if rc < 0:
                    return 1
            
            l.sort(sortByEVR)  # highest first in list
        
        oldies = []
        if len(l) > abs(keep):
            oldies = l[keep:]
        for (f,n,e,v,r) in oldies:
            print '  Removing', os.path.basename(f)
            srcfiles.remove(f)
            if not DEBUG:
                os.remove(f)
            changed = True

    if not len(srcfiles):
        print 'WARNING: No src.rpms left. Stopping here.'
        return changed

    # Examine binary repository directories and remove everything which
    # is missing its corresponding src.rpm.
    for bindir in bindirlist:
        print 'Pruning:', bindir
        for root, dirs, files in os.walk(bindir):
            for f in fnmatch.filter(files,'*.rpm'):
                fullname = os.path.join(root,f)
                hdr = rpmUtils.miscutils.hdrFromPackage(ts,fullname)
                sourcerpm = hdr['sourcerpm']
                if not sourcerpm.endswith('.rpm'):
                    continue
                if not os.path.join(srcdir,sourcerpm) in srcfiles:
                    print '  Removing', f
                    if not DEBUG:
                        os.remove(fullname)
                    changed = True
    return changed


def main(cfg,dist):
    assert rpmUtils.miscutils.compareEVR((1,2,3),(1,2,0)) > 0
    assert rpmUtils.miscutils.compareEVR((0,1,2),(0,1,2)) == 0
    assert rpmUtils.miscutils.compareEVR((1,2,3),(4,0,99)) < 0

    keep = (dist == 'development') and 1 or 2
    whitelist = cfg.repoprune_keepdict[dist]

    srcdir = os.path.join(cfg.treedir,dist,'SRPMS')
    bindirs = []
    for arch in cfg.archdict[dist]:  # list of repo archs
        bindirs.append(os.path.join(cfg.treedir,dist,arch))
        
    return pruneRepo(keep,whitelist,srcdir,bindirs)


if __name__ == '__main__':
    if len(sys.argv) < 3:
        print 'Usage: %s <project> <release> [release]...\n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)

    cfg = Utils.load_config_module(sys.argv[1])

    Utils.signer_gid_check(cfg.signersgid)
    os.umask(cfg.signersumask)
    
    for dist in sys.argv[2:]:
        if not cfg.archdict.has_key(dist):
            print "No distribution release named '%s' found" % dist
            sys.exit(errno.EINVAL)
        main(cfg,dist)
    sys.exit(0)


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README	15 Oct 2006 12:30:38 -0000	1.4
+++ README	23 Oct 2006 11:24:35 -0000	1.5
@@ -14,16 +14,19 @@
 
 Scripts we need in $PATH:
 
-extras-push          -> pushscript/extras-push
-extras-repobuild     -> pushscript/extras-repobuild
-extras-repomanage    -> pushscript/extras-repomanage
-extras-repoview      -> pushscript/extras-repoview
-extras-sync          -> pushscript/extras-sync
+  extras-push          -> pushscript/extras-push
+  extras-sync          -> pushscript/extras-sync
 
-rc-modified          -> extras-repoclosure/rc-modified
-rc-report.py         -> extras-repoclosure
-rc-run.py            -> extras-buildsys/utils/rc-run.py
-rc-run-all.py        -> rc-run.py
+  rc-modified          -> extras-repoclosure/rc-modified
+  rc-report.py         -> extras-repoclosure/rc-report.py
+  rc-run.py            -> extras-buildsys/utils/rc-run.py
+  rc-run-all.py        -> rc-run.py
 
-upgradecheck.py
+  upgradecheck.py
+
+Optional:
+
+  extras-repobuild     -> pushscript/extras-repobuild
+  extras-repoview      -> pushscript/extras-repoview
+  extras-repoprune     -> pushscript/extras-repoprune
 


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Push.py	15 Oct 2006 12:37:20 -0000	1.5
+++ Push.py	23 Oct 2006 11:24:35 -0000	1.6
@@ -25,7 +25,7 @@
 import time
 
 import Utils, MultiLib
-import RepoBuild, RepoManage, RepoView
+import RepoBuild, RepoPrune, RepoView
 
 DEBUG = False
 Utils.setdebug(DEBUG)
@@ -616,8 +616,8 @@
         changed = diststopush
 
     for dist in changed:
-        if cfg.opts.repomanage:
-            RepoManage.main(cfg,dist)
+        if cfg.opts.repoprune:
+            RepoPrune.main(cfg,dist)
         RepoBuild.main(cfg,dist)
 
     # TODO: multilib resolver hook


--- extras-repomanage DELETED ---


--- RepoManage.py DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 11:25:18 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 04:25:18 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.6,1.7
Message-ID: <200610231125.k9NBPIhi022720@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22702

Modified Files:
	Config_Extras.py 
Log Message:
adjust config from repomanage -> repoprune



Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Config_Extras.py	20 Oct 2006 13:00:21 -0000	1.6
+++ Config_Extras.py	23 Oct 2006 11:25:15 -0000	1.7
@@ -26,7 +26,7 @@
 
 class opts:
     mail = True
-    repomanage = True
+    repoprune = True
     repoview = True
     signkeycheck = True
     doublesync = False
@@ -64,13 +64,13 @@
                '3' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                }
 
-# packages to exclude from being repomanaged: dist => shell quoted path regexp
-repomanage_keepdict = {'3': "'/\([^/]\+-\)\?kmod-'",
-                       '4': "'/\([^/]\+-\)\?kmod-'",
-                       '5': "'/\([^/]\+-\)\?kmod-'",
-                       '6': "'/\([^/]\+-\)\?kmod-'",
-                       'development': "'/\([^/]\+-\)\?kmod-'",
-                       }
+# packages to exclude from being pruned: dist => Python regexp list
+repoprune_keepdict = {'3': ["-kmod$"],
+                      '4': ["-kmod$"],
+                      '5': ["-kmod$"],
+                      '6': ["-kmod$"],
+                      'development': ["-kmod$"],
+                      }
 
 # repository symlinks to remove/create since they confuse createrepo
 repobuild_linkdict = {}
@@ -121,8 +121,6 @@
 #repoview = '/usr/bin/repoview'
 repoview = '/srv/extras-push/work/repoview'
 
-repomanage = '/usr/bin/repomanage'
-
 #post_cmds = []
 post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
              'nohup rc-run-all.py &'



From fedora-extras-commits at redhat.com  Mon Oct 23 11:40:09 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 04:40:09 -0700
Subject: rpms/gtk-gnutella/FC-5 .cvsignore, 1.4, 1.5 gtk-gnutella.spec, 1.6, 
	1.7 sources, 1.4, 1.5
Message-ID: <200610231140.k9NBe9ZX022810@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22790

Modified Files:
	.cvsignore gtk-gnutella.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Feb 2006 13:09:00 -0000	1.4
+++ .cvsignore	23 Oct 2006 11:39:38 -0000	1.5
@@ -1 +1 @@
-gtk-gnutella-0.96.1.tar.bz2
+gtk-gnutella-0.96.2.tar.bz2


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk-gnutella.spec	24 Feb 2006 13:09:00 -0000	1.6
+++ gtk-gnutella.spec	23 Oct 2006 11:39:38 -0000	1.7
@@ -1,7 +1,7 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.1
+Version: 0.96.2
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.2-1
+- update to 0.96.2
+
 * Fri Feb 24 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.1-1
 - update to 0.96.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Feb 2006 13:09:00 -0000	1.4
+++ sources	23 Oct 2006 11:39:38 -0000	1.5
@@ -1 +1 @@
-6529379cc105c1e98f501a67e8e875fd  gtk-gnutella-0.96.1.tar.bz2
+a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 23 11:50:23 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 04:50:23 -0700
Subject: rpms/dvdisaster/FC-5 .cvsignore, 1.3, 1.4 dvdisaster.spec, 1.13,
	1.14 sources, 1.6, 1.7 dvdisaster-0.70.2a.patch, 1.1,
	NONE dvdisaster-0.70.2b.patch, 1.1, NONE
Message-ID: <200610231150.k9NBoN71022927@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22902

Modified Files:
	.cvsignore dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.70.2a.patch dvdisaster-0.70.2b.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Jan 2006 14:02:39 -0000	1.3
+++ .cvsignore	23 Oct 2006 11:49:53 -0000	1.4
@@ -1 +1 @@
-dvdisaster-0.65.tar.bz2
+dvdisaster-0.70.2.tar.bz2


Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dvdisaster.spec	11 Sep 2006 12:30:43 -0000	1.13
+++ dvdisaster.spec	23 Oct 2006 11:49:53 -0000	1.14
@@ -1,13 +1,11 @@
 Name: dvdisaster
 Summary: Additional error protection for CD/DVD media
-Version: 0.70.1
+Version: 0.70.2
 Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
-Patch0: dvdisaster-0.70.2a.patch
-Patch1: dvdisaster-0.70.2b.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,9 +40,7 @@
 
 
 %prep
-%setup -q -n %{name}-0.70
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 
 %build
@@ -112,6 +108,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-1
+- update to 0.70.2
+
 * Fri Sep 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.1-1
 - update to 0.70.1
 - add two upstream's pre-0.70.2 patches.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Sep 2006 13:50:21 -0000	1.6
+++ sources	23 Oct 2006 11:49:53 -0000	1.7
@@ -1 +1 @@
-350b76ccaf2c8f08dcd26643ec359614  dvdisaster-0.70.1.tar.bz2
+59f3137c337f8a00a4739c8e77713fbd  dvdisaster-0.70.2.tar.bz2


--- dvdisaster-0.70.2a.patch DELETED ---


--- dvdisaster-0.70.2b.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 11:55:59 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 04:55:59 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.7,1.8
Message-ID: <200610231155.k9NBtxKL023064@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23044

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtk-gnutella.spec	23 Oct 2006 11:39:38 -0000	1.7
+++ gtk-gnutella.spec	23 Oct 2006 11:55:28 -0000	1.8
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc, groff
+BuildRequires: libxml2-devel, byacc, groff, gettext
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Mon Oct 23 12:01:40 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 05:01:40 -0700
Subject: rpms/dvdisaster/devel dvdisaster.spec, 1.13, 1.14 sources, 1.6,
	1.7 dvdisaster-0.70.2a.patch, 1.1, NONE dvdisaster-0.70.2b.patch,
	1.1, NONE
Message-ID: <200610231201.k9NC1eNY026065@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25960

Modified Files:
	dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.70.2a.patch dvdisaster-0.70.2b.patch 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dvdisaster.spec	11 Sep 2006 12:29:54 -0000	1.13
+++ dvdisaster.spec	23 Oct 2006 12:01:10 -0000	1.14
@@ -1,13 +1,11 @@
 Name: dvdisaster
 Summary: Additional error protection for CD/DVD media
-Version: 0.70.1
+Version: 0.70.2
 Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
-Patch0: dvdisaster-0.70.2a.patch
-Patch1: dvdisaster-0.70.2b.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,9 +40,7 @@
 
 
 %prep
-%setup -q -n %{name}-0.70
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 
 %build
@@ -112,6 +108,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-1
+- update to 0.70.2
+
 * Fri Sep 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.1-1
 - update to 0.70.1
 - add two upstream's pre-0.70.2 patches.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Sep 2006 13:49:19 -0000	1.6
+++ sources	23 Oct 2006 12:01:10 -0000	1.7
@@ -1 +1 @@
-350b76ccaf2c8f08dcd26643ec359614  dvdisaster-0.70.1.tar.bz2
+59f3137c337f8a00a4739c8e77713fbd  dvdisaster-0.70.2.tar.bz2


--- dvdisaster-0.70.2a.patch DELETED ---


--- dvdisaster-0.70.2b.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 12:04:47 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 05:04:47 -0700
Subject: rpms/gtk-gnutella/devel gtk-gnutella.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200610231204.k9NC4lYR026124@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26106

Modified Files:
	gtk-gnutella.spec sources 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-gnutella.spec	1 Sep 2006 14:11:30 -0000	1.8
+++ gtk-gnutella.spec	23 Oct 2006 12:04:16 -0000	1.9
@@ -1,8 +1,8 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.1
-Release: 3%{?dist}
+Version: 0.96.2
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.2-1
+- update to 0.96.2
+
 * Fri Sep  1 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.1-3
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Feb 2006 13:09:00 -0000	1.4
+++ sources	23 Oct 2006 12:04:16 -0000	1.5
@@ -1 +1 @@
-6529379cc105c1e98f501a67e8e875fd  gtk-gnutella-0.96.1.tar.bz2
+a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 23 12:28:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Oct 2006 05:28:18 -0700
Subject: rpms/perl-PadWalker/devel .cvsignore, 1.2, 1.3 perl-PadWalker.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610231228.k9NCSIID026339@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PadWalker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
Update to 1.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 May 2006 21:17:41 -0000	1.2
+++ .cvsignore	23 Oct 2006 12:27:48 -0000	1.3
@@ -1 +1 @@
-PadWalker-1.0.tar.gz
+PadWalker-1.1.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/perl-PadWalker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-PadWalker.spec	10 Sep 2006 15:47:26 -0000	1.2
+++ perl-PadWalker.spec	23 Oct 2006 12:27:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-PadWalker
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Play with other peoples' lexical variables
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.1-1
+- Update to 1.1.
+
 * Sun Sep 10 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-2
 - Rebuild for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2006 21:17:41 -0000	1.2
+++ sources	23 Oct 2006 12:27:48 -0000	1.3
@@ -1 +1 @@
-05d684ce2f17ef4f058ec2e912b5f95c  PadWalker-1.0.tar.gz
+193821660d7da7a5944776e21fceda7e  PadWalker-1.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 12:49:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Oct 2006 05:49:10 -0700
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.7,
	1.8 perl-HTTP-Server-Simple.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200610231249.k9NCnA68026475@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26455

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.23.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Jun 2006 22:22:48 -0000	1.7
+++ .cvsignore	23 Oct 2006 12:48:40 -0000	1.8
@@ -1 +1 @@
-HTTP-Server-Simple-0.20.tar.gz
+HTTP-Server-Simple-0.23.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-HTTP-Server-Simple.spec	20 Jun 2006 22:22:48 -0000	1.8
+++ perl-HTTP-Server-Simple.spec	23 Oct 2006 12:48:40 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.20
+Version:        0.23
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(URI::Escape)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
+- Update to 0.23.
+
 * Tue Jun 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
 - Update to 0.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Jun 2006 22:22:48 -0000	1.7
+++ sources	23 Oct 2006 12:48:40 -0000	1.8
@@ -1 +1 @@
-31b88af89c4966183bf6e95ca2b40050  HTTP-Server-Simple-0.20.tar.gz
+5d410b9585c4c09426a6d6d14d0af6b1  HTTP-Server-Simple-0.23.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 12:52:30 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 05:52:30 -0700
Subject: rpms/php-extras/FC-5 php-extras.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200610231252.k9NCqU25026539@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26521

Modified Files:
	php-extras.spec sources 
Log Message:



Index: php-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/php-extras/FC-5/php-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-extras.spec	22 Jun 2006 11:48:48 -0000	1.6
+++ php-extras.spec	23 Oct 2006 12:52:00 -0000	1.7
@@ -14,15 +14,15 @@
 %define list	%{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql}
 
 
-%define extdir	%(php-config --extension-dir 2>/dev/null || echo be_happy_mock)
-%define apiver	%(( phpize --version 2>/dev/null || echo 'PHP Api Version: be_happy_mock' ) | sed -n '/PHP Api Version/ s/.*:[ 	]*//p')
+%global extdir	%(php-config --extension-dir 2>/dev/null || echo "undefined")
+%global apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
 
 Name: php-extras
 Summary: Additional PHP modules from the standard PHP distribution
-#Version: %(php-config --version)
-Version: 5.1.4
-Release: 2%{?dist}
+#Version: %(php-config --version 2>/dev/null || echo 0)
+Version: 5.1.6
+Release: 1%{?dist}
 Group: Development/Languages
 License: The PHP License
 URL: http://www.php.net/
@@ -117,7 +117,7 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign"
 
 
 for mod in %{list}
@@ -251,6 +251,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.6-1
+- update to 5.1.6
+
 * Thu Jun 22 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.4-2
 - auto-detect extdir and apiver again (needed for x86_64)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-extras/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jun 2006 16:56:08 -0000	1.3
+++ sources	23 Oct 2006 12:52:00 -0000	1.4
@@ -1 +1 @@
-4b7c93c9730ef7807f59732697470dad  php-5.1.4.tar.gz
+04d6166552289eaeff771f5ec953b065  php-5.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 12:59:30 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 05:59:30 -0700
Subject: rpms/dvdisaster/FC-5 dvdisaster.spec,1.14,1.15
Message-ID: <200610231259.k9NCxU9i026599@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26583

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvdisaster.spec	23 Oct 2006 11:49:53 -0000	1.14
+++ dvdisaster.spec	23 Oct 2006 12:59:00 -0000	1.15
@@ -68,6 +68,14 @@
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh
 
+pushd $RPM_BUILD_ROOT%{_mandir}
+for i in `find . -type f -name "*.[1-9]"`
+do
+    sed -i "s,$RPM_BUILD_ROOT,,g" $i
+done
+popd
+
+
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 



From fedora-extras-commits at redhat.com  Mon Oct 23 13:29:35 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 06:29:35 -0700
Subject: rpms/dvdisaster/devel dvdisaster.spec,1.14,1.15
Message-ID: <200610231329.k9NDTZdm029722@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29706

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvdisaster.spec	23 Oct 2006 12:01:10 -0000	1.14
+++ dvdisaster.spec	23 Oct 2006 13:29:04 -0000	1.15
@@ -68,6 +68,14 @@
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh
 
+pushd $RPM_BUILD_ROOT%{_mandir}
+for i in `find . -type f -name "*.[1-9]"`
+do
+    sed -i "s,$RPM_BUILD_ROOT,,g" $i
+done
+popd
+
+
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 



From fedora-extras-commits at redhat.com  Mon Oct 23 13:35:32 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 23 Oct 2006 06:35:32 -0700
Subject: fedora-security/audit fc5,1.365,1.366 fc6,1.118,1.119
Message-ID: <200610231335.k9NDZWp2029832@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29812

Modified Files:
	fc5 fc6 
Log Message:
CVE-2006-4811 is really a qt issue.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- fc5	23 Oct 2006 08:15:29 -0000	1.365
+++ fc5	23 Oct 2006 13:35:30 -0000	1.366
@@ -32,7 +32,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
-CVE-2006-4811 VULNERABLE (kdelibs) #211342
+CVE-2006-4811 VULNERABLE (qt) #211342
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fc6	23 Oct 2006 08:18:12 -0000	1.118
+++ fc6	23 Oct 2006 13:35:30 -0000	1.119
@@ -30,7 +30,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4811 VULNERABLE (kdelibs) #211347
+CVE-2006-4811 VULNERABLE (qt) #211347
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Mon Oct 23 14:13:08 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 23 Oct 2006 07:13:08 -0700
Subject: devel/common branches,1.4,1.5
Message-ID: <200610231413.k9NED8kl000546@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv530

Modified Files:
	branches 
Log Message:
add fc6 and fc7 branch bits


Index: branches
===================================================================
RCS file: /cvs/extras/devel/common/branches,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- branches	16 Mar 2006 20:25:32 -0000	1.4
+++ branches	23 Oct 2006 14:12:37 -0000	1.5
@@ -6,4 +6,5 @@
 FC-3:fc3:.fc3:fedora:3
 FC-4:fc4:.fc4:fedora:4
 FC-5:fc5:.fc5:fedora:5
-devel:devel:.fc6:fedora:6
+FC-6:fc6:.fc6:fedora:6
+devel:devel:.fc7:fedora:7



From fedora-extras-commits at redhat.com  Mon Oct 23 14:32:33 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Mon, 23 Oct 2006 07:32:33 -0700
Subject: fedora-security/audit fc6,1.119,1.120
Message-ID: <200610231432.k9NEWXfp003501@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/audit

Modified Files:
	fc6 
Log Message:
Update CVE-2002-0704



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fc6	23 Oct 2006 13:35:30 -0000	1.119
+++ fc6	23 Oct 2006 14:32:31 -0000	1.120
@@ -1811,7 +1811,7 @@
 CVE-2002-0715 version (squid, fixed 2.4.STABLE6)
 CVE-2002-0714 version (squid, fixed 2.4.STABLE6)
 CVE-2002-0713 version (squid, fixed 2.4.STABLE6)
-CVE-2002-0704 ** kernel http://www.netfilter.org/security/2002-04-02-icmp-dnat.html
+CVE-2002-0704 version (kernel, fixed 2.6.11)
 CVE-2002-0702 version (dhcpd, fixed 3.0.1)
 CVE-2002-0684 version (glibc, fixed afted 2.2.5)
 CVE-2002-0682 version (tomcat, fixed 4.1.3)



From fedora-extras-commits at redhat.com  Mon Oct 23 19:51:05 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 23 Oct 2006 12:51:05 -0700
Subject: rpms/bitlbee - New directory
Message-ID: <200610231951.k9NJp5wP021059@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21055/bitlbee

Log Message:
Directory /cvs/extras/rpms/bitlbee added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 23 19:51:11 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 23 Oct 2006 12:51:11 -0700
Subject: rpms/bitlbee/devel - New directory
Message-ID: <200610231951.k9NJpBv0021073@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21055/bitlbee/devel

Log Message:
Directory /cvs/extras/rpms/bitlbee/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 23 20:41:31 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 13:41:31 -0700
Subject: rpms/gcstar - New directory
Message-ID: <200610232041.k9NKfVYh024515@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24511/gcstar

Log Message:
Directory /cvs/extras/rpms/gcstar added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 23 20:41:37 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 13:41:37 -0700
Subject: rpms/gcstar/devel - New directory
Message-ID: <200610232041.k9NKfbnL024529@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24511/gcstar/devel

Log Message:
Directory /cvs/extras/rpms/gcstar/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 23 20:52:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 23 Oct 2006 13:52:11 -0700
Subject: fedora-security/audit fe4,1.80,1.81 fe5,1.87,1.88
Message-ID: <200610232052.k9NKqBIT024736@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24711

Modified Files:
	fe4 fe5 
Log Message:
Catch up with mantis updates.


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fe4	17 Oct 2006 19:15:24 -0000	1.80
+++ fe4	23 Oct 2006 20:52:08 -0000	1.81
@@ -101,7 +101,7 @@
 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
 CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
 CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
-CVE-2006-1577 VULNERABLE (mantis) bz#191089
+CVE-2006-1577 ** (mantis) bz#191089
 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
 CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem)
 CVE-2006-1531 version (seamonkey, fixed 1.0.1)
@@ -116,15 +116,15 @@
 CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
 CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7)
 CVE-2006-0847 version (python-cherrypy, fixed 2.1.1)
-CVE-2006-0841 VULNERABLE (mantis) bz#191089
-CVE-2006-0840 VULNERABLE (mantis) bz#191089
+CVE-2006-0841 ** (mantis) bz#191089
+CVE-2006-0840 backport (mantis, fixed 0.19.4-2) bz#191089
 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297
 CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
 CVE-2006-0760 version (lighttpd, fixed 1.4.10)
 CVE-2006-0749 version (seamonkey, fixed 1.0)
 CVE-2006-0748 version (seamonkey, fixed 1.0.1)
-CVE-2006-0665 VULNERABLE (mantis) bz#191089
-CVE-2006-0664 VULNERABLE (mantis) bz#191089
+CVE-2006-0665 backport (mantis, fixed 0.19.4-2) bz#191089
+CVE-2006-0664 ** (mantis) bz#191089
 CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097
 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
 CVE-2006-0322 version (mediawiki, fixed 1.5.8)


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- fe5	17 Oct 2006 19:15:24 -0000	1.87
+++ fe5	23 Oct 2006 20:52:08 -0000	1.88
@@ -106,7 +106,7 @@
 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
 CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
 CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
-CVE-2006-1577 VULNERABLE (mantis) bz#191089
+CVE-2006-1577 version (mantis, fixed 1.0.5) bz#191089
 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
 CVE-2006-1550 version (dia, fixed 0.95) bz#187556
 CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem)



From fedora-extras-commits at redhat.com  Mon Oct 23 20:55:37 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 13:55:37 -0700
Subject: owners owners.list,1.1866,1.1867
Message-ID: <200610232055.k9NKtb9s024883@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24862

Modified Files:
	owners.list 
Log Message:
Added gcstar



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1866
retrieving revision 1.1867
diff -u -r1.1866 -r1.1867
--- owners.list	22 Oct 2006 03:36:58 -0000	1.1866
+++ owners.list	23 Oct 2006 20:55:07 -0000	1.1867
@@ -468,6 +468,7 @@
 Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gconvert|A desktop unit converter|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|gcstar|Personal collections manager|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 23 21:13:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 23 Oct 2006 14:13:54 -0700
Subject: rpms/w3c-markup-validator/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 w3c-markup-validator.spec, 1.9,
	1.10 w3c-markup-validator-0.7.2-feedback.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-undebian.patch, 1.1, NONE
Message-ID: <200610232113.k9NLDsre028316@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28231/FC-5

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Removed Files:
	w3c-markup-validator-0.7.2-feedback.patch 
	w3c-markup-validator-0.7.2-undebian.patch 
Log Message:
* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
- 0.7.3, feedback and undebian patches applied upstream.
- Use "W3C License" as the License tag to appease rpmlint.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Feb 2006 17:14:14 -0000	1.4
+++ .cvsignore	23 Oct 2006 21:13:24 -0000	1.5
@@ -1,2 +1,2 @@
-validator-0_7_2.tar.gz
-sgml-lib-0_7_2.tar.gz
+validator-0_7_3.tar.gz
+sgml-lib-0_7_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2006 17:14:14 -0000	1.4
+++ sources	23 Oct 2006 21:13:24 -0000	1.5
@@ -1,2 +1,2 @@
-5a0a1fdcdbdd1856d8776f95a3156e26  validator-0_7_2.tar.gz
-2d86fd1a66f599acc6aa2267b86cd1ec  sgml-lib-0_7_2.tar.gz
+8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
+ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/w3c-markup-validator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- w3c-markup-validator.spec	15 Sep 2006 15:54:08 -0000	1.9
+++ w3c-markup-validator.spec	23 Oct 2006 21:13:24 -0000	1.10
@@ -1,20 +1,18 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.2
-Release:        4%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
-License:        W3C Software License
+License:        W3C License
 URL:            http://validator.w3.org/
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
 Patch1:         %{name}-0.7.2-syspaths.patch
 Patch2:         %{name}-0.7.2-html401.patch
-Patch3:         %{name}-0.7.2-feedback.patch
-Patch4:         %{name}-0.7.2-undebian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,8 +42,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
-%patch3 -p1
-%patch4 -p0
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -121,6 +117,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
+- 0.7.3, feedback and undebian patches applied upstream.
+- Use "W3C License" as the License tag to appease rpmlint.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.2-4
 - Fix feedback view, remove references to Debian (#206617).
 


--- w3c-markup-validator-0.7.2-feedback.patch DELETED ---


--- w3c-markup-validator-0.7.2-undebian.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 21:13:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 23 Oct 2006 14:13:55 -0700
Subject: rpms/w3c-markup-validator/FC-6 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 w3c-markup-validator.spec, 1.10,
	1.11 w3c-markup-validator-0.7.2-feedback.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-undebian.patch, 1.1, NONE
Message-ID: <200610232113.k9NLDtAY028321@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28231/FC-6

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Removed Files:
	w3c-markup-validator-0.7.2-feedback.patch 
	w3c-markup-validator-0.7.2-undebian.patch 
Log Message:
* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
- 0.7.3, feedback and undebian patches applied upstream.
- Use "W3C License" as the License tag to appease rpmlint.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Feb 2006 17:14:14 -0000	1.4
+++ .cvsignore	23 Oct 2006 21:13:25 -0000	1.5
@@ -1,2 +1,2 @@
-validator-0_7_2.tar.gz
-sgml-lib-0_7_2.tar.gz
+validator-0_7_3.tar.gz
+sgml-lib-0_7_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2006 17:14:14 -0000	1.4
+++ sources	23 Oct 2006 21:13:25 -0000	1.5
@@ -1,2 +1,2 @@
-5a0a1fdcdbdd1856d8776f95a3156e26  validator-0_7_2.tar.gz
-2d86fd1a66f599acc6aa2267b86cd1ec  sgml-lib-0_7_2.tar.gz
+8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
+ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/w3c-markup-validator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- w3c-markup-validator.spec	15 Sep 2006 15:51:40 -0000	1.10
+++ w3c-markup-validator.spec	23 Oct 2006 21:13:25 -0000	1.11
@@ -1,20 +1,18 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.2
-Release:        4%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
-License:        W3C Software License
+License:        W3C License
 URL:            http://validator.w3.org/
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
 Patch1:         %{name}-0.7.2-syspaths.patch
 Patch2:         %{name}-0.7.2-html401.patch
-Patch3:         %{name}-0.7.2-feedback.patch
-Patch4:         %{name}-0.7.2-undebian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,8 +42,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
-%patch3 -p1
-%patch4 -p0
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -121,6 +117,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
+- 0.7.3, feedback and undebian patches applied upstream.
+- Use "W3C License" as the License tag to appease rpmlint.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.2-4
 - Fix feedback view, remove references to Debian (#206617).
 


--- w3c-markup-validator-0.7.2-feedback.patch DELETED ---


--- w3c-markup-validator-0.7.2-undebian.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 21:13:56 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:13:56 -0700
Subject: rpms/libopts/devel .cvsignore, 1.2, 1.3 libopts.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200610232113.k9NLDuSO028327@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238/devel

Modified Files:
	.cvsignore libopts.spec sources 
Log Message:
auto-import libopts-27.4-1 on branch devel from libopts-27.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2006 12:33:35 -0000	1.2
+++ .cvsignore	23 Oct 2006 21:13:26 -0000	1.3
@@ -1 +1 @@
-libopts-27.1.tar.gz
+libopts-27.4.tar.bz2


Index: libopts.spec
===================================================================
RCS file: /cvs/extras/rpms/libopts/devel/libopts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopts.spec	16 Sep 2006 20:29:39 -0000	1.5
+++ libopts.spec	23 Oct 2006 21:13:26 -0000	1.6
@@ -1,10 +1,10 @@
 Summary: Options library for autogen
 Name: libopts
-Version: 27.1
-Release: 7%{?dist}
+Version: 27.4
+Release: 1%{?dist}
 License: LGPL or BSD
 Group: Development/Libraries
-Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz
+Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.bz2
 URL: http://autogen.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,8 +64,8 @@
 %{_includedir}/autoopts
 
 %changelog
-* Sat Sep 16 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-7
-- rebuild
+* Mon Oct 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.4-1
+- bump to new version
 
 * Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-6
 - changed __infodir to _infodir 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2006 12:33:35 -0000	1.2
+++ sources	23 Oct 2006 21:13:26 -0000	1.3
@@ -1 +1 @@
-50a546ee14d866819afd502e809c8095  libopts-27.1.tar.gz
+d3199c049a38c26d71c164e0d6ee4d43  libopts-27.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 23 21:13:55 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:13:55 -0700
Subject: rpms/libopts import.log,1.6,1.7
Message-ID: <200610232114.k9NLDtHB028322@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238

Modified Files:
	import.log 
Log Message:
auto-import libopts-27.4-1 on branch devel from libopts-27.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopts/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	3 Sep 2006 21:21:56 -0000	1.6
+++ import.log	23 Oct 2006 21:13:25 -0000	1.7
@@ -3,3 +3,4 @@
 libopts-27_1-5:HEAD:libopts-27.1-5.src.rpm:1142811579
 libopts-27_1-6:HEAD:libopts-27.1-6.src.rpm:1144238404
 libopts-27_1-6:FC-5:libopts-27.1-6.src.rpm:1157318521
+libopts-27_4-1:HEAD:libopts-27.4-1.src.rpm:1161637988



From fedora-extras-commits at redhat.com  Mon Oct 23 21:14:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 23 Oct 2006 14:14:01 -0700
Subject: rpms/w3c-markup-validator/devel .cvsignore, 1.4, 1.5 sources, 1.4, 
	1.5 w3c-markup-validator.spec, 1.10,
	1.11 w3c-markup-validator-0.7.2-feedback.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-undebian.patch, 1.1, NONE
Message-ID: <200610232114.k9NLE1s5028334@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28231/devel

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Removed Files:
	w3c-markup-validator-0.7.2-feedback.patch 
	w3c-markup-validator-0.7.2-undebian.patch 
Log Message:
* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
- 0.7.3, feedback and undebian patches applied upstream.
- Use "W3C License" as the License tag to appease rpmlint.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Feb 2006 17:14:14 -0000	1.4
+++ .cvsignore	23 Oct 2006 21:13:31 -0000	1.5
@@ -1,2 +1,2 @@
-validator-0_7_2.tar.gz
-sgml-lib-0_7_2.tar.gz
+validator-0_7_3.tar.gz
+sgml-lib-0_7_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2006 17:14:14 -0000	1.4
+++ sources	23 Oct 2006 21:13:31 -0000	1.5
@@ -1,2 +1,2 @@
-5a0a1fdcdbdd1856d8776f95a3156e26  validator-0_7_2.tar.gz
-2d86fd1a66f599acc6aa2267b86cd1ec  sgml-lib-0_7_2.tar.gz
+8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
+ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- w3c-markup-validator.spec	15 Sep 2006 15:51:40 -0000	1.10
+++ w3c-markup-validator.spec	23 Oct 2006 21:13:31 -0000	1.11
@@ -1,20 +1,18 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.2
-Release:        4%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
-License:        W3C Software License
+License:        W3C License
 URL:            http://validator.w3.org/
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
 Patch1:         %{name}-0.7.2-syspaths.patch
 Patch2:         %{name}-0.7.2-html401.patch
-Patch3:         %{name}-0.7.2-feedback.patch
-Patch4:         %{name}-0.7.2-undebian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,8 +42,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
-%patch3 -p1
-%patch4 -p0
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -121,6 +117,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
+- 0.7.3, feedback and undebian patches applied upstream.
+- Use "W3C License" as the License tag to appease rpmlint.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.2-4
 - Fix feedback view, remove references to Debian (#206617).
 


--- w3c-markup-validator-0.7.2-feedback.patch DELETED ---


--- w3c-markup-validator-0.7.2-undebian.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 21:16:02 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:16:02 -0700
Subject: rpms/libopts import.log,1.7,1.8
Message-ID: <200610232116.k9NLG2bM028562@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28526

Modified Files:
	import.log 
Log Message:
auto-import libopts-27.4-1 on branch FC-5 from libopts-27.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopts/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	23 Oct 2006 21:13:25 -0000	1.7
+++ import.log	23 Oct 2006 21:15:32 -0000	1.8
@@ -4,3 +4,4 @@
 libopts-27_1-6:HEAD:libopts-27.1-6.src.rpm:1144238404
 libopts-27_1-6:FC-5:libopts-27.1-6.src.rpm:1157318521
 libopts-27_4-1:HEAD:libopts-27.4-1.src.rpm:1161637988
+libopts-27_4-1:FC-5:libopts-27.4-1.src.rpm:1161638119



From fedora-extras-commits at redhat.com  Mon Oct 23 21:16:03 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:16:03 -0700
Subject: rpms/libopts/FC-5 .cvsignore, 1.2, 1.3 libopts.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200610232116.k9NLG3AO028567@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28526/FC-5

Modified Files:
	.cvsignore libopts.spec sources 
Log Message:
auto-import libopts-27.4-1 on branch FC-5 from libopts-27.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2006 12:33:35 -0000	1.2
+++ .cvsignore	23 Oct 2006 21:15:33 -0000	1.3
@@ -1 +1 @@
-libopts-27.1.tar.gz
+libopts-27.4.tar.bz2


Index: libopts.spec
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-5/libopts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopts.spec	5 Apr 2006 12:00:16 -0000	1.4
+++ libopts.spec	23 Oct 2006 21:15:33 -0000	1.5
@@ -1,10 +1,10 @@
 Summary: Options library for autogen
 Name: libopts
-Version: 27.1
-Release: 6%{?dist}
+Version: 27.4
+Release: 1%{?dist}
 License: LGPL or BSD
 Group: Development/Libraries
-Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz
+Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.bz2
 URL: http://autogen.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +64,9 @@
 %{_includedir}/autoopts
 
 %changelog
+* Mon Oct 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.4-1
+- bump to new version
+
 * Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-6
 - changed __infodir to _infodir 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2006 12:33:35 -0000	1.2
+++ sources	23 Oct 2006 21:15:33 -0000	1.3
@@ -1 +1 @@
-50a546ee14d866819afd502e809c8095  libopts-27.1.tar.gz
+d3199c049a38c26d71c164e0d6ee4d43  libopts-27.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 23 21:27:55 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 14:27:55 -0700
Subject: rpms/gcstar/devel Makefile,NONE,1.1
Message-ID: <200610232127.k9NLRtH1029004@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28999

Added Files:
	Makefile 
Log Message:
Setup of gcstar



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Mon Oct 23 21:29:17 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:29:17 -0700
Subject: rpms/autogen/FC-5 autogen.spec,1.3,1.4
Message-ID: <200610232129.k9NLTHAZ029065@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29027

Modified Files:
	autogen.spec 
Log Message:

Rebuild against newer libopts 
 	autogen.spec 



Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/autogen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.spec	21 Oct 2006 11:16:00 -0000	1.3
+++ autogen.spec	23 Oct 2006 21:28:47 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Mon Oct 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-2
+- rebuild for newer libopts
+
 * Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
 - bump to new version
 



From fedora-extras-commits at redhat.com  Mon Oct 23 21:29:30 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 14:29:30 -0700
Subject: rpms/gcstar/devel gcstar.spec,NONE,1.1 sources,NONE,1.1
Message-ID: <200610232129.k9NLTU34029086@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29081/devel

Added Files:
	gcstar.spec sources 
Log Message:
auto-import gcstar-0.5.0-3 on branch devel from gcstar-0.5.0-3.src.rpm


--- NEW FILE gcstar.spec ---
Name:           gcstar
Version:        0.5.0
Release:        3%{?dist}
Summary:        Personal collections manager

Group:          Applications/Databases
License:        GPL
URL:            http://www.gcstar.org/
Source0:        http://download.gna.org/gcstar/gcstar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:    desktop-file-utils
Requires:         perl-Gtk2

%define desktop_vendor fedora

%description
GCstar is an application for managing your personal collections.
Detailed information on each item can be automatically retrieved
from the internet and you can store additional data, depending on
the collection type. And also who you've lent your them to. You
may also search and filter your collection by criteria.

%prep
%setup -q -n gcstar


%build

%install
rm -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{_prefix}
%{__install} -d %{buildroot}%{_bindir}
%{__install} bin/gcstar %{buildroot}%{_bindir}
%{__install} -d %{buildroot}%{_libdir}
%{__cp} -a lib/gcstar %{buildroot}%{_libdir}
%{__install} -d %{buildroot}%{_datadir}
%{__cp} -a share/gcstar %{buildroot}%{_datadir}
%{__install} -d %{buildroot}%{_mandir}/man1
%{__install} man/gcstar.1 %{buildroot}%{_mandir}/man1
gzip %{buildroot}%{_mandir}/man1/gcstar.1

# Install menu entry
%{__cat} > %{name}.desktop << EOF
[Desktop Entry]
Name=GCstar
Comment=Manage your collections
GenericName=Personal collections manager
Exec=gcstar
Icon=%{_datadir}/gcstar/icons/gcstar_64x64.png
Terminal=false
Type=Application
MimeType=application/x-gcstar
Categories=Application;Office;
Encoding=UTF-8
EOF

%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install \
    --vendor %{desktop_vendor} \
    --dir %{buildroot}%{_datadir}/applications  \
    %{name}.desktop

#Mime Type
%{__cat} > %{name}.xml <<EOF
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
        <mime-type type="application/x-gcstar">
                <comment>GCstar collection</comment>
                <glob pattern="*.gcs"/>
        </mime-type>
</mime-info>
EOF

%{__mkdir_p} %{buildroot}%{_datadir}/mime/packages
cp %{name}.xml %{buildroot}%{_datadir}/mime/packages


%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :

%files
%defattr(-,root,root)
%doc CHANGELOG README LICENSE
%{_libdir}/gcstar
%{_datadir}/gcstar
%{_mandir}/man1/gcstar.1.gz
%attr(0755,root,root) %{_bindir}/gcstar
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml

%changelog
* Sun Oct 22 2006 Tian <tian at c-sait.net> - 0.5.0-3
  - Restored BuildRequires
* Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-2
  - Changed desktop vendor
  - Removed desktop-file-utils and shared-mime-info from required
  - Fixed icon path in desktop file
* Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-1
  - First Fedora Extras version.


--- NEW FILE sources ---
12ba75fe2f3091c1ccd03864424a34e2  gcstar-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 21:53:09 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 14:53:09 -0700
Subject: rpms/aide/devel aide-0.12-rh-bugfixes.patch, NONE, 1.1 aide.spec,
	1.15, 1.16
Message-ID: <200610232153.k9NLr9HQ030084@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30049

Modified Files:
	aide.spec 
Added Files:
	aide-0.12-rh-bugfixes.patch 
Log Message:
* Mon Oct 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-2
- Add "memory leaks and performance updates" patch as posted
  to aide-devel by Steve Grubb.


aide-0.12-rh-bugfixes.patch:

--- NEW FILE aide-0.12-rh-bugfixes.patch ---
Hi,

This patch removes a couple unnecessary memsets, fixes some memory leaks
associated with strlastslash usage, fixes some memory leaks in populate_tree,
and moves a couple assignments closer to where they are used in case they are
not needed.

-Steve


diff -ur aide-0.12_rc1.orig/src/base64.c aide-0.12_rc1/src/base64.c
--- aide-0.12_rc1.orig/src/base64.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/base64.c	2006-10-16 13:43:08.000000000 -0400
@@ -103,8 +103,6 @@
   }
   outbuf = (char *)malloc(sizeof(char)*B64_BUF);
   
-  memset((void*)outbuf,0,B64_BUF);
-  
   /* Initialize working pointers */
   inb = src;
   i = 0;
@@ -191,11 +189,9 @@
     return NULL;
 
 
-
   /* Initialize working pointers */
   inb = src;
   outbuf = (byte *)malloc(sizeof(byte)*B64_BUF);
-  memset(outbuf,0,sizeof(byte)*B64_BUF);
 
   l = 0;
   triple = 0;
diff -ur aide-0.12_rc1.orig/src/commandconf.c aide-0.12_rc1/src/commandconf.c
--- aide-0.12_rc1.orig/src/commandconf.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/commandconf.c	2006-10-16 13:43:08.000000000 -0400
@@ -240,11 +240,11 @@
 {
   int retval=0;
   int c=0;
-  char* tmp=NULL;
   int err=0;
-  int* domd=0;
+  int* domd=NULL;
   url_t* db_url=NULL;
 #ifdef WITH_MHASH
+  char* tmp=NULL;
   MHASH* md=NULL;
   void* key=NULL;
   int keylen;
@@ -401,7 +401,7 @@
 
 int check_db_order(DB_FIELD* d,int size, DB_FIELD a)
 {
-  int i=0;
+  int i;
   for(i=0;i<size;i++){
     if(d[i]==a)
       return RETFAIL;
diff -ur aide-0.12_rc1.orig/src/gen_list.c aide-0.12_rc1/src/gen_list.c
--- aide-0.12_rc1.orig/src/gen_list.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/gen_list.c	2006-10-16 14:09:49.000000000 -0400
@@ -229,8 +229,7 @@
 {
     if( r!=NULL ){
         node->conf_lineno = r->conf_lineno;  
-        node->rx=(char*)malloc(strlen(r->rx)+1);
-        strcpy(node->rx,r->rx);
+        node->rx=strdup(r->rx);
     } else {
         node->conf_lineno = -1;
         node->rx=NULL;
@@ -265,13 +264,17 @@
     if(isrx){
       parent=get_seltree_node(tree,tmprxtok);
     }else {
-      parent=get_seltree_node(tree,strlastslash(path));
+      char* dirn=strlastslash(path);
+      parent=get_seltree_node(tree,dirn);
+      free(dirn);
     }      
     if(parent==NULL){
       if(isrx){
 	parent=new_seltree_node(tree,tmprxtok,isrx,r);
       }else {
-	parent=new_seltree_node(tree,strlastslash(path),isrx,r);
+        char* dirn=strlastslash(path);
+        parent=new_seltree_node(tree,dirn,isrx,r);
+        free(dirn);
       }
     }
     free(tmprxtok);
@@ -306,8 +309,7 @@
     error(240,"Handling %s with %c \"%s\" with node \"%s\"\n",rxtok,type,curr_rule->rx,curnode->path);
 	
     
-    /* We have to add '^' to the first charaster of string... 
-     *
+    /* We have to add '^' to the first character of string... 
      */
 
     data=(char*)malloc(strlen(curr_rule->rx)+1+1);
@@ -1518,9 +1520,14 @@
 	if((add=check_rxtree(old->filename,tree,&attr))>0){
 	  add_file_to_tree(tree,old,DB_OLD,0,attr);
 	  i++;
-	}else if(!initdbwarningprinted){
-	  error(3,_("WARNING: Old db contains a file that shouldn\'t be there, run --init or --update\n"));
-	  initdbwarningprinted=1;
+	}else{
+          free_db_line(old);
+          free(old);
+          old=NULL;
+          if(!initdbwarningprinted){
+	    error(3,_("WARNING: Old db contains a file that shouldn\'t be there, run --init or --update\n"));
+	    initdbwarningprinted=1;
+	  }
 	}
 	if(i<100){
 	  old=db_readline(DB_OLD);
@@ -1543,6 +1550,10 @@
 	if((add=check_rxtree(new->filename,tree,&attr))>0){
 	  add_file_to_tree(tree,new,DB_NEW,0,attr);
 	  i++;
+	} else {
+          free_db_line(new);
+          free(new);
+          new=NULL;
 	}
 	if(i<100){
 	  new=db_readline(DB_NEW);
@@ -1568,6 +1579,8 @@
 	}
 	if((conf->action&DO_INIT)&&!(conf->action&DO_COMPARE)){
 	  free_db_line(new);
+          free(new);
+          new=NULL;
 	}
 	if(i<100){
 	  new=db_readline(DB_DISK);
diff -ur aide-0.12_rc1.orig/src/symboltable.c aide-0.12_rc1/src/symboltable.c
--- aide-0.12_rc1.orig/src/symboltable.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/symboltable.c	2006-10-16 13:43:08.000000000 -0400
@@ -34,13 +34,13 @@
     return NULL;
   }
 
-  l=item->prev;
   p=item;
   while(p!=NULL){
     if (strcmp(s,((symba*)p->data)->name)==0) return p;
     p=p->next;
   }
     
+  l=item->prev;
   while(l!=NULL){
     /* Insert bug to here return l-> return p */
     if (strcmp(s,((symba*)l->data)->name)==0) return l; 



Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aide.spec	14 Oct 2006 20:41:21 -0000	1.15
+++ aide.spec	23 Oct 2006 21:52:39 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
@@ -15,6 +15,7 @@
 Source1: aide.conf
 Source2: README.quickstart
 Patch0: aide-0.12-getopt.patch
+Patch1: aide-0.12-rh-bugfixes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .getopt
+%patch1 -p1 -b .rh-bugfixes
 
 
 %build
@@ -75,6 +77,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-2
+- Add "memory leaks and performance updates" patch as posted
+  to aide-devel by Steve Grubb.
+
 * Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
 - Update to 0.12 release.
 - now offers --disable-static, so -no-static patch is obsolete



From fedora-extras-commits at redhat.com  Mon Oct 23 22:03:27 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 23 Oct 2006 15:03:27 -0700
Subject: rpms/libburn/FC-5 libburn.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200610232203.k9NM3RLG000838@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/libburn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv806/FC-5

Modified Files:
	libburn.spec sources 
Log Message:
Release new version on FC-6 and FC-5.



Index: libburn.spec
===================================================================
RCS file: /cvs/extras/rpms/libburn/FC-5/libburn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libburn.spec	8 Sep 2006 20:08:53 -0000	1.2
+++ libburn.spec	23 Oct 2006 22:02:55 -0000	1.3
@@ -1,18 +1,15 @@
-%define         mainver 0.2
-# define this as version gets overridden by the subpackage with its own version
-
 Name:           libburn
-Version:        0.2
-Release:        4.20060908svn%{?dist}
+Version:        0.2.2
+Release:        2%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libburn.pykix.org/
-Source0:        %{name}-%{version}svn.tar.gz
+Source0:        http://libburn-download.pykix.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake libtool intltool gettext 
+BuildRequires:  automake libtool intltool gettext doxygen graphviz
 #Requires:       
 
 %description
@@ -61,8 +58,7 @@
 %package -n     cdrskin
 Summary:        Limited cdrecord compatibility wrapper to ease migration to libburn
 Group:          Applications/Multimedia
-Version:        0.1.4
-Requires:       %{name} = %{mainver}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description -n cdrskin
 A limited cdrecord compatibility wrapper which allows to use some libburn 
@@ -70,13 +66,14 @@
 
 
 %prep
-%setup -n %{name}-%{mainver}svn -q
+%setup -q
 
 
 %build
-./bootstrap
+#./bootstrap
 %configure --disable-static
 make %{?_smp_mflags}
+doxygen doc/doxygen.conf
 
 
 %install
@@ -84,6 +81,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -102,7 +101,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT README
+%doc AUTHORS COPYING COPYRIGHT README doc/html
 %{_libdir}/%{name}*.so.*
 
 %files devel
@@ -131,6 +130,15 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-2
+- Point to a real URL in source, now that we have a tarball
+
+* Fri Oct 20 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-1
+- 0.2.2 release
+
+* Tue Sep 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2-5.20060808svn
+- Create doxygen docs
+
 * Fri Sep  8 2006 Jesse Keating <jkeating at redhat.com> - 0.2-4.20060808svn
 - rebuild with new snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libburn/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 20:08:53 -0000	1.3
+++ sources	23 Oct 2006 22:02:55 -0000	1.4
@@ -1 +1 @@
-87ba6cf624ccc53b5b086a0e72b5d39c  libburn-0.2svn.tar.gz
+20d0903d6b3fc646d32888cc91b12376  libburn-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 22:06:55 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 23 Oct 2006 15:06:55 -0700
Subject: owners owners.list,1.1867,1.1868
Message-ID: <200610232206.k9NM6tM7001086@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1017

Modified Files:
	owners.list 
Log Message:
Added bitlbee



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1867
retrieving revision 1.1868
diff -u -r1.1867 -r1.1868
--- owners.list	23 Oct 2006 20:55:07 -0000	1.1867
+++ owners.list	23 Oct 2006 22:06:25 -0000	1.1868
@@ -111,6 +111,7 @@
 Fedora Extras|bit|C++ classes for bit manipulations|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|bitbake|BitBake build tool|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|bitgtkmm|Gtkmm widgets for bit|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
+Fedora Extras|bitlbee|IRC to other chat networks gateway|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|bitmap|Bitmap editor and converter utilities for the X Window System|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 23 23:00:24 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 16:00:24 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.7,1.8
Message-ID: <200610232300.k9NN0Olx001905@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1877

Modified Files:
	Config_Extras.py 
Log Message:
FC-6 branch


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Config_Extras.py	23 Oct 2006 11:25:15 -0000	1.7
+++ Config_Extras.py	23 Oct 2006 23:00:19 -0000	1.8
@@ -40,7 +40,7 @@
 rundir = top_workdir+'/extras-push-rundir'
 cachedir = rundir+'/mdcache'
 
-alldists = [ 'development', '5', '4', '3' ] # also the order in build reports
+alldists = [ 'development', '6', '5', '4', '3' ] # also the order in build reports
 
 archdict = {'3':['x86_64', 'i386'], 
             '4':['ppc','x86_64', 'i386'],
@@ -56,8 +56,7 @@
 # black-list takes precedence over white-list
 multiblacklists = { 'development' : { 'x86_64' : [] },
                }
-multiwhitelists = { 'development' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
-               # 'development' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+multiwhitelists = { 'development' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
                '6' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '5' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '4' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },



From fedora-extras-commits at redhat.com  Mon Oct 23 23:04:44 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 16:04:44 -0700
Subject: rpms/aide/FC-6 aide-0.12-rh-bugfixes.patch, NONE, 1.1 aide.spec,
	1.15, 1.16
Message-ID: <200610232304.k9NN4iJX004910@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4891

Modified Files:
	aide.spec 
Added Files:
	aide-0.12-rh-bugfixes.patch 
Log Message:
* Mon Oct 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-2
- Add "memory leaks and performance updates" patch as posted
  to aide-devel by Steve Grubb.


aide-0.12-rh-bugfixes.patch:

--- NEW FILE aide-0.12-rh-bugfixes.patch ---
Hi,

This patch removes a couple unnecessary memsets, fixes some memory leaks
associated with strlastslash usage, fixes some memory leaks in populate_tree,
and moves a couple assignments closer to where they are used in case they are
not needed.

-Steve


diff -ur aide-0.12_rc1.orig/src/base64.c aide-0.12_rc1/src/base64.c
--- aide-0.12_rc1.orig/src/base64.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/base64.c	2006-10-16 13:43:08.000000000 -0400
@@ -103,8 +103,6 @@
   }
   outbuf = (char *)malloc(sizeof(char)*B64_BUF);
   
-  memset((void*)outbuf,0,B64_BUF);
-  
   /* Initialize working pointers */
   inb = src;
   i = 0;
@@ -191,11 +189,9 @@
     return NULL;
 
 
-
   /* Initialize working pointers */
   inb = src;
   outbuf = (byte *)malloc(sizeof(byte)*B64_BUF);
-  memset(outbuf,0,sizeof(byte)*B64_BUF);
 
   l = 0;
   triple = 0;
diff -ur aide-0.12_rc1.orig/src/commandconf.c aide-0.12_rc1/src/commandconf.c
--- aide-0.12_rc1.orig/src/commandconf.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/commandconf.c	2006-10-16 13:43:08.000000000 -0400
@@ -240,11 +240,11 @@
 {
   int retval=0;
   int c=0;
-  char* tmp=NULL;
   int err=0;
-  int* domd=0;
+  int* domd=NULL;
   url_t* db_url=NULL;
 #ifdef WITH_MHASH
+  char* tmp=NULL;
   MHASH* md=NULL;
   void* key=NULL;
   int keylen;
@@ -401,7 +401,7 @@
 
 int check_db_order(DB_FIELD* d,int size, DB_FIELD a)
 {
-  int i=0;
+  int i;
   for(i=0;i<size;i++){
     if(d[i]==a)
       return RETFAIL;
diff -ur aide-0.12_rc1.orig/src/gen_list.c aide-0.12_rc1/src/gen_list.c
--- aide-0.12_rc1.orig/src/gen_list.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/gen_list.c	2006-10-16 14:09:49.000000000 -0400
@@ -229,8 +229,7 @@
 {
     if( r!=NULL ){
         node->conf_lineno = r->conf_lineno;  
-        node->rx=(char*)malloc(strlen(r->rx)+1);
-        strcpy(node->rx,r->rx);
+        node->rx=strdup(r->rx);
     } else {
         node->conf_lineno = -1;
         node->rx=NULL;
@@ -265,13 +264,17 @@
     if(isrx){
       parent=get_seltree_node(tree,tmprxtok);
     }else {
-      parent=get_seltree_node(tree,strlastslash(path));
+      char* dirn=strlastslash(path);
+      parent=get_seltree_node(tree,dirn);
+      free(dirn);
     }      
     if(parent==NULL){
       if(isrx){
 	parent=new_seltree_node(tree,tmprxtok,isrx,r);
       }else {
-	parent=new_seltree_node(tree,strlastslash(path),isrx,r);
+        char* dirn=strlastslash(path);
+        parent=new_seltree_node(tree,dirn,isrx,r);
+        free(dirn);
       }
     }
     free(tmprxtok);
@@ -306,8 +309,7 @@
     error(240,"Handling %s with %c \"%s\" with node \"%s\"\n",rxtok,type,curr_rule->rx,curnode->path);
 	
     
-    /* We have to add '^' to the first charaster of string... 
-     *
+    /* We have to add '^' to the first character of string... 
      */
 
     data=(char*)malloc(strlen(curr_rule->rx)+1+1);
@@ -1518,9 +1520,14 @@
 	if((add=check_rxtree(old->filename,tree,&attr))>0){
 	  add_file_to_tree(tree,old,DB_OLD,0,attr);
 	  i++;
-	}else if(!initdbwarningprinted){
-	  error(3,_("WARNING: Old db contains a file that shouldn\'t be there, run --init or --update\n"));
-	  initdbwarningprinted=1;
+	}else{
+          free_db_line(old);
+          free(old);
+          old=NULL;
+          if(!initdbwarningprinted){
+	    error(3,_("WARNING: Old db contains a file that shouldn\'t be there, run --init or --update\n"));
+	    initdbwarningprinted=1;
+	  }
 	}
 	if(i<100){
 	  old=db_readline(DB_OLD);
@@ -1543,6 +1550,10 @@
 	if((add=check_rxtree(new->filename,tree,&attr))>0){
 	  add_file_to_tree(tree,new,DB_NEW,0,attr);
 	  i++;
+	} else {
+          free_db_line(new);
+          free(new);
+          new=NULL;
 	}
 	if(i<100){
 	  new=db_readline(DB_NEW);
@@ -1568,6 +1579,8 @@
 	}
 	if((conf->action&DO_INIT)&&!(conf->action&DO_COMPARE)){
 	  free_db_line(new);
+          free(new);
+          new=NULL;
 	}
 	if(i<100){
 	  new=db_readline(DB_DISK);
diff -ur aide-0.12_rc1.orig/src/symboltable.c aide-0.12_rc1/src/symboltable.c
--- aide-0.12_rc1.orig/src/symboltable.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/symboltable.c	2006-10-16 13:43:08.000000000 -0400
@@ -34,13 +34,13 @@
     return NULL;
   }
 
-  l=item->prev;
   p=item;
   while(p!=NULL){
     if (strcmp(s,((symba*)p->data)->name)==0) return p;
     p=p->next;
   }
     
+  l=item->prev;
   while(l!=NULL){
     /* Insert bug to here return l-> return p */
     if (strcmp(s,((symba*)l->data)->name)==0) return l; 



Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/FC-6/aide.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aide.spec	14 Oct 2006 20:41:21 -0000	1.15
+++ aide.spec	23 Oct 2006 23:04:08 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
@@ -15,6 +15,7 @@
 Source1: aide.conf
 Source2: README.quickstart
 Patch0: aide-0.12-getopt.patch
+Patch1: aide-0.12-rh-bugfixes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .getopt
+%patch1 -p1 -b .rh-bugfixes
 
 
 %build
@@ -75,6 +77,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-2
+- Add "memory leaks and performance updates" patch as posted
+  to aide-devel by Steve Grubb.
+
 * Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
 - Update to 0.12 release.
 - now offers --disable-static, so -no-static patch is obsolete



From fedora-extras-commits at redhat.com  Mon Oct 23 23:07:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Oct 2006 16:07:20 -0700
Subject: rpms/qt4/FC-4 qt4.spec,1.15,1.16
Message-ID: <200610232307.k9NN7Kgl005085@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5035

Modified Files:
	qt4.spec 
Log Message:
* Mon Oct 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-2
- fix qm2ts conflict with qt-devel



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt4.spec	23 Oct 2006 03:23:17 -0000	1.15
+++ qt4.spec	23 Oct 2006 23:06:49 -0000	1.16
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -300,7 +300,7 @@
 pushd %{buildroot}%{qtdir}/bin
 for i in *; do
   case "${i}" in
-    assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
+    assistant|designer|linguist|lrelease|lupdate|moc|qm2ts|qmake|qtconfig|qtdemo|uic)
       LINK="${i}-qt4"
       ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
       ;;
@@ -462,6 +462,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-2
+- fix qm2ts conflict with qt-devel
+
 * Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-1
 - 4.1.5
 



From fedora-extras-commits at redhat.com  Mon Oct 23 23:08:42 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 16:08:42 -0700
Subject: rpms/aide/FC-6 aide.spec,1.16,1.17
Message-ID: <200610232308.k9NN8gg3005193@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5157

Modified Files:
	aide.spec 
Log Message:
hit make tag right after FC-6 branch


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/FC-6/aide.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aide.spec	23 Oct 2006 23:04:08 -0000	1.16
+++ aide.spec	23 Oct 2006 23:08:11 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.12
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System



From fedora-extras-commits at redhat.com  Mon Oct 23 23:08:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Oct 2006 16:08:45 -0700
Subject: rpms/qt4/FC-5 qt4.spec,1.20,1.21
Message-ID: <200610232308.k9NN8jLW005200@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5176

Modified Files:
	qt4.spec 
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use respun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt4.spec	23 Oct 2006 23:07:46 -0000	1.20
+++ qt4.spec	23 Oct 2006 23:08:15 -0000	1.21
@@ -510,7 +510,7 @@
 
 %changelog
 * Mon Oct 23 2006 Rex Dieter 4.2.1-2
-- use repun upstream 4.2.1 tarball
+- use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1



From fedora-extras-commits at redhat.com  Mon Oct 23 23:08:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Oct 2006 16:08:46 -0700
Subject: rpms/qt4/FC-5 .cvsignore, 1.8, 1.9 qt4.spec, 1.19, 1.20 sources, 1.6,
	1.7
Message-ID: <200610232308.k9NN8kSh005205@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5129

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use repun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Oct 2006 02:52:05 -0000	1.8
+++ .cvsignore	23 Oct 2006 23:07:46 -0000	1.9
@@ -1,5 +1,6 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
 qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt4.spec	23 Oct 2006 02:52:05 -0000	1.19
+++ qt4.spec	23 Oct 2006 23:07:46 -0000	1.20
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -84,11 +84,14 @@
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps}
+BuildRequires: %{x_deps} %{?x_deps_GL_hack}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
@@ -149,7 +152,7 @@
 Summary: API documentation, demos and example programs for %{name}
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}_%{release}
+Provides: %{name}-assistant = %{version}-%{release}
 # For docs -> doc rename, temporary, since it was a short-lived subpkg
 #Obsoletes: %{name}-docs < %{version}-%{release}
 #Provides:  %{name}-docs = %{version}-%{release}
@@ -506,6 +509,13 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+- use repun upstream 4.2.1 tarball
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1
+- 4.2.1
+
 * Wed Oct 04 2006 Rex Dieter 4.2.0-1
 - 4.2.0(final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Oct 2006 02:52:05 -0000	1.6
+++ sources	23 Oct 2006 23:07:46 -0000	1.7
@@ -1 +1 @@
-6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz
+2ab1c88084f55b94809f025a8503bf18  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:20:46 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 23 Oct 2006 17:20:46 -0700
Subject: rpms/puppet/FC-4 .cvsignore, 1.7, 1.8 puppet.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610240020.k9O0Kksv010499@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10209

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 14:08:28 -0000	1.7
+++ .cvsignore	24 Oct 2006 00:20:16 -0000	1.8
@@ -1 +1 @@
-puppet-0.19.3.tgz
+puppet-0.20.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-4/puppet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- puppet.spec	26 Sep 2006 14:08:28 -0000	1.7
+++ puppet.spec	24 Oct 2006 00:20:16 -0000	1.8
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.19.3
+Version: 0.20.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 23 2006 David Lutterkort <dlutter at redhat.com> - 0.20.0-1
+- New version
+
 * Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 0.19.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 14:08:28 -0000	1.7
+++ sources	24 Oct 2006 00:20:16 -0000	1.8
@@ -1 +1 @@
-c3a15c89f5108bccc0547acbfb5eca41  puppet-0.19.3.tgz
+0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:21:58 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 23 Oct 2006 17:21:58 -0700
Subject: rpms/puppet/FC-5 .cvsignore, 1.7, 1.8 puppet.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610240021.k9O0LwxG010573@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10552

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 14:06:18 -0000	1.7
+++ .cvsignore	24 Oct 2006 00:21:28 -0000	1.8
@@ -1 +1 @@
-puppet-0.19.3.tgz
+puppet-0.20.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- puppet.spec	26 Sep 2006 14:06:18 -0000	1.7
+++ puppet.spec	24 Oct 2006 00:21:28 -0000	1.8
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.19.3
+Version: 0.20.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 23 2006 David Lutterkort <dlutter at redhat.com> - 0.20.0-1
+- New version
+
 * Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 0.19.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 14:06:18 -0000	1.7
+++ sources	24 Oct 2006 00:21:28 -0000	1.8
@@ -1 +1 @@
-c3a15c89f5108bccc0547acbfb5eca41  puppet-0.19.3.tgz
+0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:23:39 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 23 Oct 2006 17:23:39 -0700
Subject: rpms/puppet/FC-6 .cvsignore, 1.7, 1.8 puppet.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610240023.k9O0NdwH010645@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10624

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 14:03:26 -0000	1.7
+++ .cvsignore	24 Oct 2006 00:23:09 -0000	1.8
@@ -1 +1 @@
-puppet-0.19.3.tgz
+puppet-0.20.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/puppet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- puppet.spec	26 Sep 2006 14:03:26 -0000	1.7
+++ puppet.spec	24 Oct 2006 00:23:09 -0000	1.8
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.19.3
+Version: 0.20.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 23 2006 David Lutterkort <dlutter at redhat.com> - 0.20.0-1
+- New version
+
 * Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 0.19.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 14:03:26 -0000	1.7
+++ sources	24 Oct 2006 00:23:09 -0000	1.8
@@ -1 +1 @@
-c3a15c89f5108bccc0547acbfb5eca41  puppet-0.19.3.tgz
+0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:26:51 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 23 Oct 2006 17:26:51 -0700
Subject: rpms/puppet/devel .cvsignore, 1.7, 1.8 puppet.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610240026.k9O0QpnA010721@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10700

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 14:03:26 -0000	1.7
+++ .cvsignore	24 Oct 2006 00:26:21 -0000	1.8
@@ -1 +1 @@
-puppet-0.19.3.tgz
+puppet-0.20.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/puppet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- puppet.spec	26 Sep 2006 14:03:26 -0000	1.7
+++ puppet.spec	24 Oct 2006 00:26:21 -0000	1.8
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.19.3
+Version: 0.20.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 23 2006 David Lutterkort <dlutter at redhat.com> - 0.20.0-1
+- New version
+
 * Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 0.19.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 14:03:26 -0000	1.7
+++ sources	24 Oct 2006 00:26:21 -0000	1.8
@@ -1 +1 @@
-c3a15c89f5108bccc0547acbfb5eca41  puppet-0.19.3.tgz
+0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:55:02 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 23 Oct 2006 17:55:02 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 telepathy-gabble.spec, 1.11, 1.12
Message-ID: <200610240055.k9O0t2x2011021@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10996

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Oct 2006 14:51:02 -0000	1.11
+++ .cvsignore	24 Oct 2006 00:54:32 -0000	1.12
@@ -1 +1 @@
-telepathy-gabble-0.4.0.tar.gz
+telepathy-gabble-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 14:51:02 -0000	1.11
+++ sources	24 Oct 2006 00:54:32 -0000	1.12
@@ -1 +1 @@
-dc78e31762fef419c6c64d2f8a82e012  telepathy-gabble-0.4.0.tar.gz
+e08f4e1f361165635128c5996d71e2b9  telepathy-gabble-0.4.1.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- telepathy-gabble.spec	19 Oct 2006 14:51:02 -0000	1.11
+++ telepathy-gabble.spec	24 Oct 2006 00:54:32 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
+- Update to 0.4.1.
+
 * Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0.
 



From fedora-extras-commits at redhat.com  Tue Oct 24 01:10:32 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 23 Oct 2006 18:10:32 -0700
Subject: rpms/telepathy-gabble/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 telepathy-gabble.spec, 1.11, 1.12
Message-ID: <200610240110.k9O1AWOb014120@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14100

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Oct 2006 14:51:02 -0000	1.11
+++ .cvsignore	24 Oct 2006 01:10:02 -0000	1.12
@@ -1 +1 @@
-telepathy-gabble-0.4.0.tar.gz
+telepathy-gabble-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 14:51:02 -0000	1.11
+++ sources	24 Oct 2006 01:10:02 -0000	1.12
@@ -1 +1 @@
-dc78e31762fef419c6c64d2f8a82e012  telepathy-gabble-0.4.0.tar.gz
+e08f4e1f361165635128c5996d71e2b9  telepathy-gabble-0.4.1.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/telepathy-gabble.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- telepathy-gabble.spec	19 Oct 2006 14:51:02 -0000	1.11
+++ telepathy-gabble.spec	24 Oct 2006 01:10:02 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
+- Update to 0.4.1.
+
 * Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0.
 



From fedora-extras-commits at redhat.com  Tue Oct 24 04:35:53 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Oct 2006 21:35:53 -0700
Subject: rpms/csound/devel csound-5.03.0-disable-atsa.patch, NONE,
	1.1 csound-5.03.0-gstabs-disable-option.patch, NONE,
	1.1 csound-5.03.0-no-usr-local.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 csound-5.03.0-enable-fluidsynth.patch, 1.1, 1.2 csound.spec,
	1.2, 1.3 sources, 1.2, 1.3 csound-5.03.0-no-gstabs.patch, 1.1,
	NONE csound-5.03.0-printf-redef.patch, 1.1,
	NONE csound-5.03.0-uninitialized.patch, 1.1, NONE
Message-ID: <200610240435.k9O4Zrcd024439@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24405

Modified Files:
	.cvsignore csound-5.03.0-enable-fluidsynth.patch csound.spec 
	sources 
Added Files:
	csound-5.03.0-disable-atsa.patch 
	csound-5.03.0-gstabs-disable-option.patch 
	csound-5.03.0-no-usr-local.patch 
Removed Files:
	csound-5.03.0-no-gstabs.patch csound-5.03.0-printf-redef.patch 
	csound-5.03.0-uninitialized.patch 
Log Message:
* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
- Drop csound-5.03.0-uninitialized.patch, upstream
- Drop csound-5.03.0-printf-redef.patch, upstream
- CVS snapshot to grab some updated opcodes and fixes
- Make disabling -gstabs an option for better upstream palatability
- Disable atsa; it breaks the build for some unknown reason



csound-5.03.0-disable-atsa.patch:

--- NEW FILE csound-5.03.0-disable-atsa.patch ---
diff -ru Csound5.03.0/SConstruct /tmp/Csound5.03.0/SConstruct
--- Csound5.03.0/SConstruct	2006-10-23 16:07:41.000000000 -0400
+++ /tmp/Csound5.03.0/SConstruct	2006-08-11 09:23:01.000000000 -0400
@@ -1422,7 +1365,6 @@
 
 if (commonEnvironment['buildUtilities'] != '0'):
     utils = [
-        ['atsa',        'util/atsa_main.c'    ],
         ['cvanal',      'util/cvl_main.c'     ],
         ['dnoise',      'util/dnoise_main.c'  ],
         ['envext',      'util/env_main.c'     ],

csound-5.03.0-gstabs-disable-option.patch:

--- NEW FILE csound-5.03.0-gstabs-disable-option.patch ---
--- Csound5.03.0/SConstruct.gstabs-disable-option	2006-10-23 15:36:38.000000000 -0400
+++ Csound5.03.0/SConstruct	2006-10-23 15:39:28.000000000 -0400
@@ -161,6 +161,9 @@
 opts.Add('noDebug',
     'Build without debugging information.',
     '0')
+opts.Add('disableGStabs',
+    'Set to 1 if you want to turn off GStabs debug info support, which may break some architectures',
+    '0')
 opts.Add('gcc3opt',
     'Enable gcc 3.3.x or later optimizations for the specified CPU architecture (e.g. pentium3); implies noDebug.',
     '0')
@@ -289,7 +292,10 @@
     commonEnvironment.Prepend(CCFLAGS = ['-g', '-O2'])
   else:
     if not withMSVC():
-      commonEnvironment.Prepend(CCFLAGS = ['-g', '-gstabs', '-O2'])
+      debug_opts = ['-g', '-O2']
+      if commonEnvironment['disableGStabs'] == '0':
+        debug_opts.append('-gstabs')
+      commonEnvironment.Prepend(CCFLAGS = debug_opts)
 else:
   commonEnvironment.Prepend(CCFLAGS = ['-O2'])
 if commonEnvironment['useGprof'] == '1':

csound-5.03.0-no-usr-local.patch:

--- NEW FILE csound-5.03.0-no-usr-local.patch ---
--- Csound5.03.0/SConstruct.no-usr-local	2006-10-23 15:42:27.000000000 -0400
+++ Csound5.03.0/SConstruct	2006-10-23 15:43:31.000000000 -0400
@@ -307,10 +307,10 @@
 if commonEnvironment['buildRelease'] == '0':
     commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
 if commonEnvironment['Word64'] == '1':
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
     commonEnvironment.Append(CCFLAGS = ['-fPIC'])
 else:
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
 
 if commonEnvironment['useDouble'] == '0':
     print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
@@ -325,14 +325,12 @@
 
 if getPlatform() == 'linux':
     commonEnvironment.Append(CCFLAGS = "-DLINUX")
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
     commonEnvironment.Append(CPPPATH = '/usr/include')
     commonEnvironment.Append(CPPPATH = '/usr/X11R6/include')
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
 elif getPlatform() == 'darwin':
     commonEnvironment.Append(CCFLAGS = "-DMACOSX")
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     if commonEnvironment['useAltivec'] == '1':
         print 'CONFIGURATION DECISION using Altivec optmisation'
@@ -343,7 +341,6 @@
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
     if not withMSVC():
-        commonEnvironment.Append(CPPPATH = '/usr/local/include')
         commonEnvironment.Append(CPPPATH = '/usr/include')
         commonEnvironment.Append(CCFLAGS = "-mthreads")
     else:
@@ -351,15 +348,14 @@
 
 if getPlatform() == 'linux':
     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
-    pythonIncludePath = [path1, path2]
+    pythonIncludePath = [path1]
     pythonLinkFlags = []
     if commonEnvironment['Word64'] == '1':
         tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
+        pythonLibraryPath = ['/usr/lib64', tmp]
     else:
         tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
+        pythonLibraryPath = ['/usr/lib', tmp]
     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
 elif getPlatform() == 'darwin':
     pyBasePath = '/System/Library/Frameworks/Python.Framework'


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Sep 2006 18:09:14 -0000	1.2
+++ .cvsignore	24 Oct 2006 04:35:22 -0000	1.3
@@ -1,2 +1,3 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
+Csound5.03_src-cvs20061023.tar.bz2

csound-5.03.0-enable-fluidsynth.patch:

Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-enable-fluidsynth.patch	5 Sep 2006 18:09:14 -0000	1.1
+++ csound-5.03.0-enable-fluidsynth.patch	24 Oct 2006 04:35:22 -0000	1.2
@@ -1,16 +1,16 @@
---- Csound5.03.0/SConstruct.enable-fluidsynth	2006-08-11 09:23:01.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-08-30 13:48:19.000000000 -0400
-@@ -212,6 +212,9 @@
- opts.Add('buildOSXGUI',
-     'On OSX, set to 1 to build the basic GUI frontend',
+--- Csound5.03.0/SConstruct.enable-fluidsynth	2006-10-21 11:03:22.000000000 -0400
++++ Csound5.03.0/SConstruct	2006-10-23 15:36:10.000000000 -0400
+@@ -225,6 +225,9 @@
      '0')
+ opts.Add('isWinNT', 'On windows, if win2000 or NT is used',
+           '%d' % withMSVC())
 +opts.Add('useFluidsynth',
 +    'Set to 1 if you want OSC support',
 +    '0')
  
  # Define the common part of the build environment.
  # This section also sets up customized options for third-party libraries, which
-@@ -405,6 +408,7 @@
+@@ -426,6 +429,7 @@
  pdhfound = configure.CheckHeader("m_pd.h", language = "C")
  tclhfound = configure.CheckHeader("tcl.h", language = "C")
  luaFound = configure.CheckHeader("lua.h", language = "C")
@@ -18,7 +18,7 @@
  swigFound = 'swig' in commonEnvironment['TOOLS']
  print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
  pythonFound = configure.CheckHeader("Python.h", language = "C")
-@@ -1187,7 +1191,7 @@
+@@ -1228,7 +1232,7 @@
  
  # FLUIDSYNTH OPCODES
  


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound.spec	8 Sep 2006 14:59:23 -0000	1.2
+++ csound.spec	24 Oct 2006 04:35:22 -0000	1.3
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0:     http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src.tgz
+Source0:     http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061023.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -36,10 +36,10 @@
 # cvs -z9 -d :pserver:anonymous at csound.cvs.sourceforge.net:/cvsroot/csound checkout -P -r csound-5_03_0 manual
 Source1: Csound5.03_manual.tgz
 
-Patch0: csound-5.03.0-uninitialized.patch
-Patch1: csound-5.03.0-printf-redef.patch
-Patch2: csound-5.03.0-enable-fluidsynth.patch
-Patch3: csound-5.03.0-no-gstabs.patch
+Patch0: csound-5.03.0-enable-fluidsynth.patch
+Patch1: csound-5.03.0-gstabs-disable-option.patch
+Patch2: csound-5.03.0-no-usr-local.patch
+Patch3: csound-5.03.0-disable-atsa.patch
 
 
 %description
@@ -161,10 +161,11 @@
 
 %prep
 %setup -q -n Csound5.03.0
-%patch0 -p1 -b .uninitialized
-%patch1 -p1 -b .printf-redef
-%patch2 -p1 -b .enable-fluidsynth
-%patch3 -p1 -b .no-gstabs
+%patch0 -p1 -b .enable-fluidsynth
+%patch1 -p1 -b .gstabs-disable-option
+%patch2 -p1 -b .no-usr-local
+%patch3 -p1 -b .disable-atsa
+
 tar xf %{SOURCE1}
 
 %build
@@ -174,6 +175,11 @@
       frontends/fltk_gui/CsoundGlobalSettings.cpp
 
 scons dynamicCsoundLibrary=1 \
+      buildRelease=0 \
+      noDebug=0 \
+      disableGStabs=1 \
+      buildInterfaces=1 \
+      useALSA=1 \
       usePortAudio=0 \
       usePortMIDI=0 \
       useOSC=1 \
@@ -186,6 +192,7 @@
       buildTclcsound=1 \
       buildJavaWrapper=1 \
       buildDSSI=1 \
+      buildUtilities=1 \
       prefix=%{_prefix} \
       customCCFLAGS="%{optflags}" \
       customCXXFLAGS="%{optflags}" \
@@ -268,6 +275,8 @@
 %{_bindir}/scsort
 %{_bindir}/sndinfo
 %{_bindir}/srconv
+%{_bindir}/pv_export
+%{_bindir}/pv_import
 %{_libdir}/lib%{name}.so.5.1
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/xmg/*.xmg
@@ -298,6 +307,9 @@
 %{_libdir}/%{name}/plugins/libudprecv.so
 %{_libdir}/%{name}/plugins/libudpsend.so
 %{_libdir}/%{name}/plugins/libvbap.so
+%{_libdir}/%{name}/plugins/libharmon.so
+%{_libdir}/%{name}/plugins/libugakbari.so
+%{_libdir}/%{name}/plugins/libvaops.so
 %{_libdir}/%{name}/plugins/opcodes.dir
 
 %files devel
@@ -364,6 +376,13 @@
 %doc tutorial/*.py
 
 %changelog
+* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
+- Drop csound-5.03.0-uninitialized.patch, upstream
+- Drop csound-5.03.0-printf-redef.patch, upstream
+- CVS snapshot to grab some updated opcodes and fixes
+- Make disabling -gstabs an option for better upstream palatability
+- Disable atsa; it breaks the build for some unknown reason
+
 * Fri Sep  8 2006 Dan Williams <dcbw at redhat.com> 5.03.0-3
 - csound-5.03.0-no-gstabs.patch added; produce dwarf2 like everyone else
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2006 18:09:14 -0000	1.2
+++ sources	24 Oct 2006 04:35:22 -0000	1.3
@@ -1,2 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-15801aef4abce5efb8975b201aa900a2  Csound5.03_src.tgz
+58b8a3f2f7729387acb7cd365191a979  Csound5.03_src-cvs20061023.tar.bz2


--- csound-5.03.0-no-gstabs.patch DELETED ---


--- csound-5.03.0-printf-redef.patch DELETED ---


--- csound-5.03.0-uninitialized.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 24 05:31:49 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 23 Oct 2006 22:31:49 -0700
Subject: rpms/jd/devel .cvsignore,1.6,1.7 jd.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <200610240531.k9O5Vnl1027891@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27869

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Oct 2006 15:08:43 -0000	1.6
+++ .cvsignore	24 Oct 2006 05:31:18 -0000	1.7
@@ -1 +1 @@
-jd-1.8.0-cvs061022.tgz
+jd-1.8.0-beta061023.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jd.spec	22 Oct 2006 15:08:43 -0000	1.6
+++ jd.spec	24 Oct 2006 05:31:18 -0000	1.7
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061022
-%define         repoid        22118
+%define         strtag        beta061023
+%define         repoid        22352
 
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Oct 2006 15:08:43 -0000	1.6
+++ sources	24 Oct 2006 05:31:18 -0000	1.7
@@ -1 +1 @@
-f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz
+31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 05:33:11 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 23 Oct 2006 22:33:11 -0700
Subject: rpms/jd/FC-6 .cvsignore,1.6,1.7 jd.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <200610240533.k9O5XBI4027946@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27924

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Oct 2006 15:08:43 -0000	1.6
+++ .cvsignore	24 Oct 2006 05:32:41 -0000	1.7
@@ -1 +1 @@
-jd-1.8.0-cvs061022.tgz
+jd-1.8.0-beta061023.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jd.spec	22 Oct 2006 15:08:43 -0000	1.6
+++ jd.spec	24 Oct 2006 05:32:41 -0000	1.7
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061022
-%define         repoid        22118
+%define         strtag        beta061023
+%define         repoid        22352
 
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Oct 2006 15:08:43 -0000	1.6
+++ sources	24 Oct 2006 05:32:41 -0000	1.7
@@ -1 +1 @@
-f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz
+31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 05:34:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 23 Oct 2006 22:34:38 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.5,1.6 jd.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <200610240534.k9O5YcRu027991@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27971

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2006 15:10:57 -0000	1.5
+++ .cvsignore	24 Oct 2006 05:34:08 -0000	1.6
@@ -1 +1 @@
-jd-1.8.0-cvs061022.tgz
+jd-1.8.0-beta061023.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jd.spec	22 Oct 2006 15:10:57 -0000	1.5
+++ jd.spec	24 Oct 2006 05:34:08 -0000	1.6
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061022
-%define         repoid        22118
+%define         strtag        beta061023
+%define         repoid        22352
 
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2006 15:10:57 -0000	1.5
+++ sources	24 Oct 2006 05:34:08 -0000	1.6
@@ -1 +1 @@
-f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz
+31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 05:43:33 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 23 Oct 2006 22:43:33 -0700
Subject: rpms/gaim-gaym/devel .cvsignore, 1.2, 1.3 gaim-gaym.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610240543.k9O5hXbw028211@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28182

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
update to SVN snapshot that can deal with gaim2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 May 2006 15:43:16 -0000	1.2
+++ .cvsignore	24 Oct 2006 05:43:03 -0000	1.3
@@ -1 +1 @@
-qrc-0.96.tgz
+qrc-0.96-289svn.tar.gz


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-gaym.spec	16 May 2006 15:43:16 -0000	1.1
+++ gaim-gaym.spec	24 Oct 2006 05:43:03 -0000	1.2
@@ -1,21 +1,29 @@
-# $Id$
-
-# make sure we require the correct versions of gaim
-%define gaim_min 1:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
-%define gaim_max 1:2.0.0
+# make sure we require the correct versions of gaim 
+%define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
+%define gaim_max 2:3.0.0
+
+%define gaimsrcver 2.0.0beta3
+
+# it's not quite 0.97, but it's definitely:
+#   branch:      fork-for-gaim-2
+#   svn release: 289
+%define alphatag 289svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        2%{?dist}
+Release:        3%{?alphatag:.1.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://groups.yahoo.com/group/gaymplugin/
-Source0:        http://download.berlios.de/qrc/qrc-%{version}.tgz
+Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz
+Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gaim < %{gaim_max}, gtk2-devel
+BuildRequires:  gaim-devel < %{gaim_max}, gtk2-devel
+%{?alphatag:BuildRequires: autoconf, automake, libtool, pkgconfig}
+
 Requires:       gaim >= %{gaim_min}, gaim < %{gaim_max}
 
 %description
@@ -27,10 +35,22 @@
 and less than %{gaim_max}.
 
 %prep
-%setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version} -T -D -a 1
+%setup -q -n fork-for-gaim-2
+%setup -q -n fork-for-gaim-2 -T -D -a 1
+
 
+# copy the needed headers to the right places...
+for i in gaym/src bot-challenger gaym-extras/src ; do
+    cp gaim-%{gaimsrcver}/src/internal.h $i
+    cp gaim-%{gaimsrcver}/src/prefix.h   $i
+done
+
+rm -rf gaim-%{gaimsrcver}
 
 %build
+autoreconf --force --install
 %configure --enable-display_options
 make %{?_smp_mflags}
 
@@ -56,6 +76,11 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.1.289svn
+- pull in header files not included in gaim-devel
+- switch to SVN branch fork-for-gaim-2, rev 289
+- pull in all the auto* stuff we now need for a devel snapshot
+
 * Mon May  8 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-2
 - dropped explicit requires: gtk2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2006 15:43:16 -0000	1.2
+++ sources	24 Oct 2006 05:43:03 -0000	1.3
@@ -1 +1 @@
-f846fdc07c2e38e74f8e27c58cdde37a  qrc-0.96.tgz
+34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 06:05:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 23 Oct 2006 23:05:37 -0700
Subject: rpms/gaim-gaym/devel .cvsignore, 1.3, 1.4 gaim-gaym.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610240605.k9O65bUD031299@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
*sigh*



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Oct 2006 05:43:03 -0000	1.3
+++ .cvsignore	24 Oct 2006 06:05:07 -0000	1.4
@@ -1 +1,2 @@
 qrc-0.96-289svn.tar.gz
+gaim-2.0.0beta3.tar.bz2


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaim-gaym.spec	24 Oct 2006 05:43:03 -0000	1.2
+++ gaim-gaym.spec	24 Oct 2006 06:05:07 -0000	1.3
@@ -11,7 +11,7 @@
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.1.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.2.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.2.289svn
+- it helps to upload all sources to the lookaside cache.
+
 * Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.1.289svn
 - pull in header files not included in gaim-devel
 - switch to SVN branch fork-for-gaim-2, rev 289


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Oct 2006 05:43:03 -0000	1.3
+++ sources	24 Oct 2006 06:05:07 -0000	1.4
@@ -1 +1,2 @@
 34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz
+c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 06:12:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 23 Oct 2006 23:12:54 -0700
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200610240612.k9O6CsOi031438@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31413

Modified Files:
	gaim-gaym.spec sources 
Log Message:
update to svn snapshot



Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-gaym.spec	16 May 2006 15:43:16 -0000	1.1
+++ gaim-gaym.spec	24 Oct 2006 06:12:24 -0000	1.2
@@ -1,21 +1,29 @@
-# $Id$
-
-# make sure we require the correct versions of gaim
-%define gaim_min 1:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
-%define gaim_max 1:2.0.0
+# make sure we require the correct versions of gaim 
+%define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
+%define gaim_max 2:3.0.0
+
+%define gaimsrcver 2.0.0beta3
+
+# it's not quite 0.97, but it's definitely:
+#   branch:      fork-for-gaim-2
+#   svn release: 289
+%define alphatag 289svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        2%{?dist}
+Release:        3%{?alphatag:.2.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://groups.yahoo.com/group/gaymplugin/
-Source0:        http://download.berlios.de/qrc/qrc-%{version}.tgz
+Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz
+Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gaim < %{gaim_max}, gtk2-devel
+BuildRequires:  gaim-devel < %{gaim_max}, gtk2-devel
+%{?alphatag:BuildRequires: autoconf, automake, libtool, pkgconfig}
+
 Requires:       gaim >= %{gaim_min}, gaim < %{gaim_max}
 
 %description
@@ -27,10 +35,22 @@
 and less than %{gaim_max}.
 
 %prep
-%setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version} -T -D -a 1
+%setup -q -n fork-for-gaim-2
+%setup -q -n fork-for-gaim-2 -T -D -a 1
+
 
+# copy the needed headers to the right places...
+for i in gaym/src bot-challenger gaym-extras/src ; do
+    cp gaim-%{gaimsrcver}/src/internal.h $i
+    cp gaim-%{gaimsrcver}/src/prefix.h   $i
+done
+
+rm -rf gaim-%{gaimsrcver}
 
 %build
+autoreconf --force --install
 %configure --enable-display_options
 make %{?_smp_mflags}
 
@@ -56,6 +76,14 @@
 
 
 %changelog
+* Mon Oct 23 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.2.289svn
+- it helps to upload all sources to the lookaside cache.
+
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.1.289svn
+- pull in header files not included in gaim-devel
+- switch to SVN branch fork-for-gaim-2, rev 289
+- pull in all the auto* stuff we now need for a devel snapshot
+
 * Mon May  8 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-2
 - dropped explicit requires: gtk2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2006 15:43:16 -0000	1.2
+++ sources	24 Oct 2006 06:12:24 -0000	1.3
@@ -1 +1,2 @@
-f846fdc07c2e38e74f8e27c58cdde37a  qrc-0.96.tgz
+34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz
+c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 06:27:48 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Oct 2006 23:27:48 -0700
Subject: rpms/testdisk/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 testdisk.spec, 1.7, 1.8
Message-ID: <200610240627.k9O6RmIn031788@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31768

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update TestDisk to 6.5 version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 11:01:46 -0000	1.4
+++ .cvsignore	24 Oct 2006 06:27:17 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 11:01:46 -0000	1.4
+++ sources	24 Oct 2006 06:27:17 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testdisk.spec	28 Aug 2006 18:13:24 -0000	1.7
+++ testdisk.spec	24 Oct 2006 06:27:17 -0000	1.8
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	3%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
 * Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Tue Oct 24 06:36:59 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Oct 2006 23:36:59 -0700
Subject: rpms/testdisk/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 testdisk.spec, 1.7, 1.8
Message-ID: <200610240636.k9O6axh1031881@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31861

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update TestDisk to 6.5 version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 13:45:41 -0000	1.4
+++ .cvsignore	24 Oct 2006 06:36:29 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 13:45:41 -0000	1.4
+++ sources	24 Oct 2006 06:36:29 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-5/testdisk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testdisk.spec	21 Jun 2006 13:45:41 -0000	1.7
+++ testdisk.spec	24 Oct 2006 06:36:29 -0000	1.8
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	2%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,12 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
+* Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
+- Rebuild for Fedora Extras 6
+
 * Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-2
 - FC3 and FC4 has a release of 2, need to align
 



From fedora-extras-commits at redhat.com  Tue Oct 24 07:35:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 24 Oct 2006 00:35:49 -0700
Subject: rpms/smbldap-tools/devel smbldap-tools-0.9.2-config.patch, 1.1,
	1.2 smbldap-tools.spec, 1.2, 1.3
Message-ID: <200610240735.k9O7ZnlI002612@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2590

Modified Files:
	smbldap-tools-0.9.2-config.patch smbldap-tools.spec 
Log Message:
Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
A consequence of this is that the package can no longer be noarch
Install smbldap_tools.pm without unnecessary exec bits
Fix example idmapdn entry in config file


smbldap-tools-0.9.2-config.patch:

Index: smbldap-tools-0.9.2-config.patch
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/devel/smbldap-tools-0.9.2-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smbldap-tools-0.9.2-config.patch	24 Mar 2006 07:15:06 -0000	1.1
+++ smbldap-tools-0.9.2-config.patch	24 Oct 2006 07:35:18 -0000	1.2
@@ -1,5 +1,5 @@
---- smbldap.conf	2006-01-27 10:52:27.000000000 +0000
-+++ smbldap.conf	2006-01-27 11:34:20.000000000 +0000
+--- smbldap.conf	2006-10-24 08:06:27.000000000 +0100
++++ smbldap.conf	2006-10-24 08:08:46.000000000 +0100
 @@ -34,12 +34,12 @@
  
  # Put your own SID. To obtain this number do: "net getlocalsid".
@@ -43,7 +43,7 @@
  
  # Where are stored Computers
  # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
-@@ -112,7 +112,7 @@
+@@ -112,10 +112,10 @@
  # Where are stored Groups
  # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
  # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
@@ -51,4 +51,8 @@
 +groupsdn="ou=Group,${suffix}"
  
  # Where are stored Idmap entries (used if samba is a domain member server)
- # Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
+-# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
++# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
+ # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
+ idmapdn="ou=Idmap,${suffix}"
+ 


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smbldap-tools.spec	22 Sep 2006 11:21:25 -0000	1.2
+++ smbldap-tools.spec	24 Oct 2006 07:35:18 -0000	1.3
@@ -1,16 +1,21 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
 Source:		http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz
 Patch0:		smbldap-tools-0.9.2-config.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildArch:	noarch
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
+#BuildArch:	noarch
+ExcludeArch:	x86_64
+# Debuginfo package would be empty as there are no binaries in this package
+%define debug_package %{nil}
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -36,7 +41,7 @@
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 %{__install} -d -m0755 %{buildroot}%{perl_vendorlib}
 %{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}
-%{__install} -p -m0755 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
+%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
 %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
 %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
 
@@ -64,6 +69,12 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
+- Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
+- A consequence of this is that the package can no longer be noarch
+- Install smbldap_tools.pm without unnecessary exec bits
+- Fix example idmapdn entry in config file
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 0.9.2-3
 - Require IO::Socket::SSL to ensure we have SSL support even if perl-LDAP
   doesn't enforce this dependency (#122066, #207430)
@@ -82,7 +93,7 @@
 * Tue Jan 17 2006 Paul Howarth <paul at city-fan.org> 0.9.1-2
 - Unpack tarball quietly
 - Clean up file list
-- Put smbldap_tools.pm in %{perl_vendorlib} rather than %{_sbindir}
+- Put smbldap_tools.pm in %%{perl_vendorlib} rather than %%{_sbindir}
 - Add %%{?dist} tag
 
 * Sat Jun 04 2005 Dag Wieers <dag at wieers.com> - 0.9.1-1 - 3108+/dag



From fedora-extras-commits at redhat.com  Tue Oct 24 07:37:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 24 Oct 2006 00:37:50 -0700
Subject: rpms/smbldap-tools/FC-6 smbldap-tools-0.9.2-config.patch, 1.1,
	1.2 smbldap-tools.spec, 1.2, 1.3
Message-ID: <200610240737.k9O7boJN002699@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2666

Modified Files:
	smbldap-tools-0.9.2-config.patch smbldap-tools.spec 
Log Message:
resync with devel

smbldap-tools-0.9.2-config.patch:

Index: smbldap-tools-0.9.2-config.patch
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/FC-6/smbldap-tools-0.9.2-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smbldap-tools-0.9.2-config.patch	24 Mar 2006 07:15:06 -0000	1.1
+++ smbldap-tools-0.9.2-config.patch	24 Oct 2006 07:37:19 -0000	1.2
@@ -1,5 +1,5 @@
---- smbldap.conf	2006-01-27 10:52:27.000000000 +0000
-+++ smbldap.conf	2006-01-27 11:34:20.000000000 +0000
+--- smbldap.conf	2006-10-24 08:06:27.000000000 +0100
++++ smbldap.conf	2006-10-24 08:08:46.000000000 +0100
 @@ -34,12 +34,12 @@
  
  # Put your own SID. To obtain this number do: "net getlocalsid".
@@ -43,7 +43,7 @@
  
  # Where are stored Computers
  # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
-@@ -112,7 +112,7 @@
+@@ -112,10 +112,10 @@
  # Where are stored Groups
  # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
  # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
@@ -51,4 +51,8 @@
 +groupsdn="ou=Group,${suffix}"
  
  # Where are stored Idmap entries (used if samba is a domain member server)
- # Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
+-# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
++# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
+ # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
+ idmapdn="ou=Idmap,${suffix}"
+ 


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/FC-6/smbldap-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smbldap-tools.spec	22 Sep 2006 11:21:25 -0000	1.2
+++ smbldap-tools.spec	24 Oct 2006 07:37:19 -0000	1.3
@@ -1,16 +1,21 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
 Source:		http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz
 Patch0:		smbldap-tools-0.9.2-config.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildArch:	noarch
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
+#BuildArch:	noarch
+ExcludeArch:	x86_64
+# Debuginfo package would be empty as there are no binaries in this package
+%define debug_package %{nil}
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -36,7 +41,7 @@
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 %{__install} -d -m0755 %{buildroot}%{perl_vendorlib}
 %{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}
-%{__install} -p -m0755 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
+%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
 %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
 %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
 
@@ -64,6 +69,12 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
+- Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
+- A consequence of this is that the package can no longer be noarch
+- Install smbldap_tools.pm without unnecessary exec bits
+- Fix example idmapdn entry in config file
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 0.9.2-3
 - Require IO::Socket::SSL to ensure we have SSL support even if perl-LDAP
   doesn't enforce this dependency (#122066, #207430)
@@ -82,7 +93,7 @@
 * Tue Jan 17 2006 Paul Howarth <paul at city-fan.org> 0.9.1-2
 - Unpack tarball quietly
 - Clean up file list
-- Put smbldap_tools.pm in %{perl_vendorlib} rather than %{_sbindir}
+- Put smbldap_tools.pm in %%{perl_vendorlib} rather than %%{_sbindir}
 - Add %%{?dist} tag
 
 * Sat Jun 04 2005 Dag Wieers <dag at wieers.com> - 0.9.1-1 - 3108+/dag



From fedora-extras-commits at redhat.com  Tue Oct 24 07:39:31 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:39:31 -0700
Subject: rpms/bitlbee - New directory
Message-ID: <200610240739.k9O7dVn6002800@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/bitlbee

Log Message:
Directory /cvs/extras/rpms/bitlbee added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 07:39:37 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:39:37 -0700
Subject: rpms/bitlbee/devel - New directory
Message-ID: <200610240739.k9O7dbr3002814@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/bitlbee/devel

Log Message:
Directory /cvs/extras/rpms/bitlbee/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 07:39:56 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:39:56 -0700
Subject: rpms/bitlbee/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610240739.k9O7duwv002865@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2841/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bitlbee


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 24 07:39:55 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:39:55 -0700
Subject: rpms/bitlbee Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610240739.k9O7dtKx002847@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2841

Added Files:
	Makefile import.log 
Log Message:
Setup of module bitlbee


--- NEW FILE Makefile ---
# Top level Makefile for module bitlbee
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 24 07:41:11 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:41:11 -0700
Subject: rpms/bitlbee import.log,1.1,1.2
Message-ID: <200610240741.k9O7fBTg002969@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2928

Modified Files:
	import.log 
Log Message:
auto-import bitlbee-1.0.3-5 on branch devel from bitlbee-1.0.3-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Oct 2006 07:39:55 -0000	1.1
+++ import.log	24 Oct 2006 07:40:40 -0000	1.2
@@ -0,0 +1 @@
+bitlbee-1_0_3-5:HEAD:bitlbee-1.0.3-5.src.rpm:1161675633



From fedora-extras-commits at redhat.com  Tue Oct 24 07:41:11 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:41:11 -0700
Subject: rpms/bitlbee/devel bitlbee-1.0.3-cflags.patch, NONE,
	1.1 bitlbee-1.0.3-socklen.patch, NONE, 1.1 bitlbee.spec, NONE,
	1.1 bitlbee.xinetd, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610240741.k9O7fBY7002973@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2928/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bitlbee-1.0.3-cflags.patch bitlbee-1.0.3-socklen.patch 
	bitlbee.spec bitlbee.xinetd 
Log Message:
auto-import bitlbee-1.0.3-5 on branch devel from bitlbee-1.0.3-5.src.rpm

bitlbee-1.0.3-cflags.patch:

--- NEW FILE bitlbee-1.0.3-cflags.patch ---
Bug #171: [PATCH] Environment variable CFLAGS isn't honored
--------------------------------------+-------------------------------------
 Reporter:  robert at fedoraproject.org  |        Owner:
     Type:  defect                    |       Status:  new
 Priority:  normal                    |    Milestone:
Component:  BitlBee                   |      Version:  1.0.3
 Keywords:                            |   Irc_client:  Client-independent
       Os:  Linux                     |   Os_version:
--------------------------------------+-------------------------------------
BitlBee currently doesn't honor passed CFLAGS, neither in 'CFLAGS="foo"
./configure' nor at 'make CFLAGS="foo"'. Last one will break BitlBee while
compiling completely. Following patch resolves the issue (especially for
vendors like Fedora, Mandrake etc). Thanks to wilmer and lucumo for
figgering out a suitable and working solution.

Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/171

--- bitlbee-1.0.3/configure		2006-06-24 16:00:43.000000000 +0200
+++ bitlbee-1.0.3/configure.rsc		2006-06-26 16:03:59.000000000 +0200
@@ -111,7 +111,11 @@
 	echo 'DEBUG=1' >> Makefile.settings
 	echo '#define DEBUG' >> config.h
 else
-	echo 'CFLAGS=-O3' >> Makefile.settings
+	if [ -n "$CFLAGS" ]; then
+		echo CFLAGS="$CFLAGS" >> Makefile.settings
+	else
+		echo CFLAGS="-O3" >> Makefile.settings
+	fi
 fi
 
 echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings

bitlbee-1.0.3-socklen.patch:

--- NEW FILE bitlbee-1.0.3-socklen.patch ---
Bug #200: bitlbee.c:41: warning: passing argument 3 of 'accept' from
          incompatible pointer type
--------------------------------------+-------------------------------------
 Reporter:  anonymous                 |        Owner:
     Type:  defect                    |       Status:  new
 Priority:  minor                     |    Milestone:
Component:  BitlBee                   |      Version:  1.0.3
 Keywords:                            |   Irc_client:  Client-independent
       Os:  Public server             |   Os_version:  Fedora Core 4
--------------------------------------+-------------------------------------
on x86_64 I get: 

bitlbee.c:41: warning: passing argument 3 of 'accept' from incompatible
pointer type 

This is because the type for size has been set to size_t instead of socklen_t.

Setting it to socklen_t resolved this for me.

paul at cypherpunks.ca

Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/200

--- bitlbee-1.0.3/bitlbee.c		2006-06-24 16:00:43.000000000 +0200
+++ bitlbee-1.0.3/bitlbee.c.socklen	2006-09-23 22:42:59.000000000 +0200
@@ -35,7 +35,7 @@
 
 gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data )
 {
-	size_t size = sizeof( struct sockaddr_in );
+	socklen_t size = sizeof( struct sockaddr_in );
 	struct sockaddr_in conn_info;
 	int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, 
 		                     &size );


--- NEW FILE bitlbee.spec ---
Summary:           IRC to other chat networks gateway
Name:              bitlbee
Version:           1.0.3
Release:           5%{?dist}
License:           GPL
Group:             System Environment/Daemons
URL:               http://www.bitlbee.org/
Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
Source1:           bitlbee.xinetd
Patch0:            bitlbee-1.0.3-cflags.patch
Patch1:            bitlbee-1.0.3-socklen.patch
Requires:          xinetd
Requires(pre):     /usr/sbin/useradd
Requires(preun):   /sbin/service
BuildRequires:     glib2-devel, libxslt
%if 0%{?rhl}%{?fedora}%{?rhel}
BuildRequires:     gnutls-devel
%else
BuildRequires:     openssl-devel
%endif
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Bitlbee is an IRC to other chat networks gateway. Bitlbee can be used as
an IRC server which forwards everything you say to people on other chat
networks like MSN/ICQ/Jabber.

%prep
%setup -q
%patch0 -p1 -b .cflags
%patch1 -p1 -b .socklen

perl -pi.make -e '
                s|\$\(BINDIR\)|\$(sbindir)|g;
                s|\$\(DATADIR\)|\$(datadir)/%{name}|g;
                s|\$\(ETCDIR\)|\$(sysconfdir)/%{name}|g;
                s|\$\(MANDIR\)|\$(mandir)|g;
        ' Makefile */Makefile */*/Makefile

%build
CFLAGS="$RPM_OPT_FLAGS" ./configure \
        --prefix=%{_prefix} \
        --bindir=%{_sbindir} \
        --etcdir=%{_sysconfdir}/%{name} \
        --mandir=%{_mandir} \
        --datadir=%{_datadir}/%{name} \
        --config=%{_localstatedir}/lib/%{name} \
        --strip=0 \
%if 0%{?rhl}%{?fedora}%{?rhel}
        --ssl=gnutls
%else
        --ssl=openssl
%endif

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib/%{name},%{_mandir}/man8}

install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/

%pre
%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} -M -c "BitlBee User" %{name} > /dev/null 2>&1 || :

%preun
if [ $1 -eq 0 ]; then
  /sbin/service xinetd condrestart > /dev/null 2>&1 || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
%doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
%{_sbindir}/%{name}
%{_datadir}/%{name}/
%{_mandir}/man?/%{name}*
%attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}

%changelog
* Sat Oct 21 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-5
- Create a bitlbee user and condrestart xinetd instead of reload

* Fri Aug 04 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-4
- Switched to gnutls per default for SSL support (#196591 #c12)

* Mon Jun 26 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-3
- Added patch for using CFLAGS env (#196591 #c4, upstream #171)

* Sun Jun 25 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-2
- Changes to match with Fedora Packaging Guidelines (#196591)

* Sun Jun 25 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-1
- Upgrade to 1.0.3

* Sun Apr 02 2006 Robert Scheck <robert at fedoraproject.org> 1.0.2-1
- Upgrade to 1.0.2

* Sun Jan 15 2006 Robert Scheck <robert at fedoraproject.org> 1.0.1-1
- Upgrade to 1.0.1

* Wed Dec 28 2005 Robert Scheck <robert at fedoraproject.org> 1.0-2
- Rebuilt against gcc 4.1

* Mon Dec 05 2005 Robert Scheck <robert at fedoraproject.org> 1.0-1
- Upgrade to 1.0

* Sat Nov 12 2005 Robert Scheck <robert at fedoraproject.org> 0.92-4
- Rebuilt against openssl 0.9.8a

* Sun Aug 28 2005 Robert Scheck <robert at fedoraproject.org> 0.92-3
- Added patch, that allows specifying the Jabber server manually
- Don't start bitlbee per default as xinetd service

* Sun Jul 03 2005 Robert Scheck <robert at fedoraproject.org> 0.92-2
- Added patch giving ICQ/AIM support for typing notifications

* Fri Jul 01 2005 Robert Scheck <robert at fedoraproject.org> 0.92-1
- Upgrade to 0.92
- Initial spec file for Fedora Core


--- NEW FILE bitlbee.xinetd ---
# default: off
# description: bitlbee is an IRC gateway to other IM networks.
service ircd
{
	disable = yes
	socket_type	= stream
	protocol	= tcp
	wait		= no
	user		= bitlbee
	bind		= 127.0.0.1
	server		= /usr/sbin/bitlbee
	type		= UNLISTED
	port		= 6667
	log_on_failure	+= USERID
}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Oct 2006 07:39:56 -0000	1.1
+++ .cvsignore	24 Oct 2006 07:40:41 -0000	1.2
@@ -0,0 +1 @@
+bitlbee-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Oct 2006 07:39:56 -0000	1.1
+++ sources	24 Oct 2006 07:40:41 -0000	1.2
@@ -0,0 +1 @@
+e46682d54cbd6265dd4436b3b6838d63  bitlbee-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 08:53:18 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Tue, 24 Oct 2006 01:53:18 -0700
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.9, 1.10
Message-ID: <200610240853.k9O8rI5U006582@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6566

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
close #211751


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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jack-audio-connection-kit.spec	11 Oct 2006 11:33:41 -0000	1.9
+++ jack-audio-connection-kit.spec	24 Oct 2006 08:52:48 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2.0%{?dist}
+Release: 2.1%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,7 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-#BuildRequires: libfreebob >= 1.0.0
+BuildRequires: libfreebob >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -55,6 +55,7 @@
 
 %configure \
     --with-html-dir=%{_docdir} \
+    --enable-freebob \
     --disable-oss \
     --disable-portaudio \
     --with-default-tmpdir=/dev/shm
@@ -119,6 +120,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Oct 24 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.1
+- rebuild with libfreebob (should closed #211751)
+
 * Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.0
 - update to 0.102.20
 - drop patch0 (already in mainstream)



From fedora-extras-commits at redhat.com  Tue Oct 24 09:27:50 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Tue, 24 Oct 2006 02:27:50 -0700
Subject: rpms/jack-audio-connection-kit/FC-6 jack-audio-connection-kit.spec, 
	1.9, 1.10
Message-ID: <200610240927.k9O9Ro98009915@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9899

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
close #211751


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/FC-6/jack-audio-connection-kit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jack-audio-connection-kit.spec	11 Oct 2006 11:33:41 -0000	1.9
+++ jack-audio-connection-kit.spec	24 Oct 2006 09:27:20 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2.0%{?dist}
+Release: 2.1%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,7 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-#BuildRequires: libfreebob >= 1.0.0
+BuildRequires: libfreebob >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -55,6 +55,7 @@
 
 %configure \
     --with-html-dir=%{_docdir} \
+    --enable-freebob \
     --disable-oss \
     --disable-portaudio \
     --with-default-tmpdir=/dev/shm
@@ -119,6 +120,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Oct 24 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.1
+- rebuild with libfreebob (should closed #211751)
+
 * Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.0
 - update to 0.102.20
 - drop patch0 (already in mainstream)



From fedora-extras-commits at redhat.com  Tue Oct 24 09:32:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 24 Oct 2006 02:32:10 -0700
Subject: rpms/NetworkManager-vpnc/devel
	NetworkManager-vpnc-0.7.0-gppasswd.patch, NONE,
	1.1 NetworkManager-vpnc.spec, 1.18, 1.19
Message-ID: <200610240932.k9O9WANk010008@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9989

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	NetworkManager-vpnc-0.7.0-gppasswd.patch 
Log Message:
Added patch to support saving group password only

NetworkManager-vpnc-0.7.0-gppasswd.patch:

--- NEW FILE NetworkManager-vpnc-0.7.0-gppasswd.patch ---
--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c	2006-10-21 15:03:55.000000000 +0200
@@ -33,13 +33,39 @@
 
 #define VPN_SERVICE "org.freedesktop.NetworkManager.vpnc"
 
-static GSList *
-lookup_pass (const char *vpn_name, const char *vpn_service, gboolean *is_session)
+struct keyring_data {
+	const char* password;
+	const char* group_password;
+	gboolean is_session;
+};
+
+void keyring_data_init(struct keyring_data* d)
 {
-	GSList *passwords;
-	GList *keyring_result;
+	d->password = NULL;
+	d->group_password = NULL;
+	d->is_session = FALSE;
+}
 
-	passwords = NULL;
+void keyring_data_free(struct keyring_data* d)
+{
+	/* For security reasons, Make sure to clear the data before freeing */
+	if (d->password) {
+		memset((void*)d->password, 0, strlen(d->password));
+		g_free((void*)d->password);
+		d->password = NULL;
+	}
+	if (d->group_password) {
+		memset((void*)d->group_password, 0, strlen(d->group_password));
+		g_free((void*)d->group_password);
+		d->group_password = NULL;
+	}
+}
+ 
+
+gboolean
+lookup_pass (const char *vpn_name, const char *vpn_service, struct keyring_data* kd)
+{
+	GList *keyring_result;
 
 	if (gnome_keyring_find_network_password_sync (g_get_user_name (),     /* user */
 						      NULL,                   /* domain */
@@ -51,40 +77,32 @@
 						      &keyring_result) != GNOME_KEYRING_RESULT_OK)
 		return FALSE;
 
-	if (keyring_result != NULL && g_list_length (keyring_result) == 2) {
-		char *password;
-		char *group_password;
-		GnomeKeyringNetworkPasswordData *data1 = keyring_result->data;
-		GnomeKeyringNetworkPasswordData *data2 = (g_list_next (keyring_result))->data;
+	char *password = NULL;
+	char *group_password = NULL;
+	GList* i;
+
+	for (i = keyring_result; i; i = g_list_next(i)) {
+		GnomeKeyringNetworkPasswordData *data = i->data;
+
+		if (data) {
+			if (strcmp (data->object, "group_password") == 0) {
+				group_password = data->password;
+			} else if (strcmp (data->object, "password") == 0) {
+				password = data->password;
+			}
 
-		password = NULL;
-		group_password = NULL;
-
-		if (strcmp (data1->object, "group_password") == 0) {
-			group_password = data1->password;
-		} else if (strcmp (data1->object, "password") == 0) {
-			password = data1->password;
-		}
-
-		if (strcmp (data2->object, "group_password") == 0) {
-			group_password = data2->password;
-		} else if (strcmp (data2->object, "password") == 0) {
-			password = data2->password;
+			kd->is_session = (strcmp (data->keyring, "session") == 0);
 		}
+	}
 
-		if (password != NULL && group_password != NULL) {
-			passwords = g_slist_append (passwords, g_strdup (group_password));
-			passwords = g_slist_append (passwords, g_strdup (password));
-			if (strcmp (data1->keyring, "session") == 0)
-				*is_session = TRUE;
-			else
-				*is_session = FALSE;
-		}
+	if (password)
+		kd->password = g_strdup(password);
+	if (group_password)
+		kd->group_password = g_strdup(group_password);
 
-		gnome_keyring_network_password_list_free (keyring_result);
-	}
+	gnome_keyring_network_password_list_free (keyring_result);
 
-	return passwords;
+	return TRUE;
 }
 
 static void save_vpn_password (const char *vpn_name, const char *vpn_service, const char *keyring, 
@@ -93,6 +111,7 @@
 	guint32 item_id;
 	GnomeKeyringResult keyring_result;
 
+	if (password) {
 	keyring_result = gnome_keyring_set_network_password_sync (keyring,
 								  g_get_user_name (),
 								  NULL,
@@ -107,6 +126,7 @@
 	{
 		g_warning ("Couldn't store password in keyring, code %d", (int) keyring_result);
 	}
+	}
 
 	keyring_result = gnome_keyring_set_network_password_sync (keyring,
 								  g_get_user_name (),
@@ -125,38 +145,20 @@
 	}
 }
 
-static GSList *
-get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry)
+gboolean
+get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry, struct keyring_data* kdata)
 {
-	GSList          *result;
-	char            *prompt;
+	char		*prompt;
 	GtkWidget	*dialog;
-	char            *keyring_password;
-	char            *keyring_group_password;
-	gboolean         keyring_is_session;
-	GSList          *keyring_result;
 	GnomeTwoPasswordDialogRemember remember;
 
-	result = NULL;
-	keyring_password = NULL;
-	keyring_group_password = NULL;
-	keyring_result = NULL;
-
-	g_return_val_if_fail (vpn_name != NULL, NULL);
+	g_return_val_if_fail (vpn_name != NULL, FALSE);
 
 	/* Use the system user name, since the VPN might have a different user name */
-	if (!retry) {
-		if ((result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-			return result;
-		}
-	} else {
-		if ((keyring_result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-			keyring_group_password = g_strdup ((char *) keyring_result->data);
-			keyring_password = g_strdup ((char *) (g_slist_next (keyring_result))->data);
-		}
-		g_slist_foreach (keyring_result, (GFunc)g_free, NULL);
-		g_slist_free (keyring_result);
-	}
+	gboolean has_keyring = lookup_pass (vpn_name, vpn_service, kdata);
+
+	if (!retry && has_keyring && kdata->password)
+		return TRUE;
 
 	prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name);
 	dialog = gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE);
@@ -169,21 +171,24 @@
 	gnome_two_password_dialog_set_password_secondary_label (GNOME_TWO_PASSWORD_DIALOG (dialog), _("_Group Password:"));
 	/* use the same keyring storage options as from the items we put in the entry boxes */
 	remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING;
-	if (keyring_result != NULL) {
-		if (keyring_is_session)
+	if (has_keyring) {
+		if (!kdata->password && kdata->group_password)
+			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
+		else if (kdata->is_session)
 			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
 		else
-			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;				
+			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
 	}
+
 	gnome_two_password_dialog_set_remember (GNOME_TWO_PASSWORD_DIALOG (dialog), remember);
 
-	/* if retrying, put in the passwords from the keyring */
-	if (keyring_password != NULL) {
-		gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_password);
-	}
-	if (keyring_group_password != NULL) {
-		gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_group_password);
-	}
+/* if retrying, put in the passwords from the keyring */
+	if (kdata->password)
+		gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), kdata->password);
+
+	if (kdata->group_password)
+		gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog),
+								  kdata->group_password);
 
 	gtk_widget_show (dialog);
 
@@ -192,18 +197,21 @@
 		char *password;
 		char *group_password;
 
-		password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
-		group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
-		result = g_slist_append (result, group_password);
-		result = g_slist_append (result, password);
+		keyring_data_free(kdata);
+
+		kdata->password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
+		kdata->group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
 
 		switch (gnome_two_password_dialog_get_remember (GNOME_TWO_PASSWORD_DIALOG (dialog)))
 		{
 			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION:
-				save_vpn_password (vpn_name, vpn_service, "session", password, group_password);
+				save_vpn_password (vpn_name, vpn_service, "session", kdata->password, kdata->group_password);
+				break;
+			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
+				save_vpn_password (vpn_name, vpn_service, NULL, NULL, kdata->group_password);
 				break;
 			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER:
-				save_vpn_password (vpn_name, vpn_service, NULL, password, group_password);
+				save_vpn_password (vpn_name, vpn_service, NULL, kdata->password, kdata->group_password);
 				break;
 			default:
 				break;
@@ -211,12 +219,9 @@
 
 	}
 
-	g_free (keyring_password);
-	g_free (keyring_group_password);
-
 	gtk_widget_destroy (dialog);
 
-	return result;
+	return TRUE;
 }
 
 int 
@@ -262,22 +267,28 @@
 	gnome_program_init ("nm-vpnc-auth-dialog", VERSION, LIBGNOMEUI_MODULE,
 			    argc, argv, 
 			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+
+	struct keyring_data kdata;
+	gboolean success = FALSE;
+
+	keyring_data_init(&kdata);
 	  
-	passwords = get_passwords (vpn_name, vpn_service, retry);
-	if (passwords == NULL)
+	if (! get_passwords (vpn_name, vpn_service, retry, &kdata))
 		goto out;
 
+	if (!kdata.password || !kdata.group_password)
+		goto out;
+
+	success = TRUE;
 	/* dump the passwords to stdout */
-	for (i = passwords; i != NULL; i = g_slist_next (i)) {
-		char *password = (char *) i->data;
-		printf ("%s\n", password);
-	}
+	printf ("%s\n", kdata.group_password);
+	printf ("%s\n", kdata.password);
+
 	printf ("\n\n");
 	/* for good measure, flush stdout since Kansas is going Bye-Bye */
 	fflush (stdout);
 
-	g_slist_foreach (passwords, (GFunc)g_free, NULL);
-	g_slist_free (passwords);
+	keyring_data_free(&kdata);
 
 	/* wait for data on stdin  */
 	fread (buf, sizeof (char), sizeof (buf), stdin);
@@ -285,5 +296,5 @@
 out:
 	g_option_context_free (context);
 
-	return passwords != NULL ? 0 : 1;
+	return success ? 0 : 1;
 }
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h	2006-10-21 15:01:12.000000000 +0200
@@ -57,6 +57,7 @@
 typedef enum {
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION,
+	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP,
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER
 } GnomeTwoPasswordDialogRemember;
 
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c	2006-10-21 15:01:12.000000000 +0200
@@ -68,6 +68,7 @@
 	
 	GtkWidget *remember_session_button;
 	GtkWidget *remember_forever_button;
+	GtkWidget *remember_group_forever_button;
 
 	GtkWidget *radio_vbox;
 	GtkWidget *connect_with_no_userpass_button;
@@ -465,11 +466,15 @@
 		gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session"));
 	password_dialog->details->remember_forever_button =
 		gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring"));
+	password_dialog->details->remember_group_forever_button =
+		gtk_check_button_new_with_mnemonic (_("S_ave group password in keyring"));
 
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, 
 			    TRUE, TRUE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, 
 			    TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_forever_button, 
+			    TRUE, TRUE, 6);
 
 
 	gnome_two_password_dialog_set_username (password_dialog, username);
@@ -689,9 +694,11 @@
 	if (show_remember) {
 		gtk_widget_show (password_dialog->details->remember_session_button);
 		gtk_widget_show (password_dialog->details->remember_forever_button);
+		gtk_widget_show (password_dialog->details->remember_group_forever_button);
 	} else {
 		gtk_widget_hide (password_dialog->details->remember_session_button);
 		gtk_widget_hide (password_dialog->details->remember_forever_button);
+		gtk_widget_hide (password_dialog->details->remember_group_forever_button);
 	}
 }
 
@@ -699,30 +706,38 @@
 gnome_two_password_dialog_set_remember      (GnomeTwoPasswordDialog         *password_dialog,
 					 GnomeTwoPasswordDialogRemember  remember)
 {
-	gboolean session, forever;
+	gboolean session, forever, group;
 
 	session = FALSE;
 	forever = FALSE;
+	group = FALSE;
 	if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) {
 		session = TRUE;
 	} else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){
 		forever = TRUE;
+	} else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP){
+		group = TRUE;
 	}
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button),
 				      session);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button),
 				      forever);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button),
+				      group);
 }
 
 GnomeTwoPasswordDialogRemember
 gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog         *password_dialog)
 {
-	gboolean session, forever;
+	gboolean session, forever, group;
 
 	session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button));
 	forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button));
+	group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button));
 	if (forever) {
 		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
+	} else if (group) {
+		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
 	} else if (session) {
 		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
 	}


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- NetworkManager-vpnc.spec	5 Oct 2006 16:12:07 -0000	1.18
+++ NetworkManager-vpnc.spec	24 Oct 2006 09:31:40 -0000	1.19
@@ -13,11 +13,12 @@
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
 Version:   0.7.0
-Release:   0%{?nm_vpnc_cvs_version}.2%{?dist}
+Release:   0%{?nm_vpnc_cvs_version}.3%{?dist}
 License:   GPL
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
+Patch0:    NetworkManager-vpnc-0.7.0-gppasswd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gppasswd
 
 %build
 %configure
@@ -97,6 +99,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Sat Oct 21 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.3
+- Added patch to support saving group password only
+
 * Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.2
 - Leave .so link alone, needed by nm
 



From fedora-extras-commits at redhat.com  Tue Oct 24 11:48:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 04:48:13 -0700
Subject: rpms/qt4/FC-6 .cvsignore, 1.11, 1.12 qt4.spec, 1.25, 1.26 sources,
	1.9, 1.10
Message-ID: <200610241148.k9OBmDfQ017461@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17435

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use respun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Oct 2006 02:49:46 -0000	1.11
+++ .cvsignore	24 Oct 2006 11:47:42 -0000	1.12
@@ -1,5 +1,6 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
 qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/qt4.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qt4.spec	23 Oct 2006 02:49:46 -0000	1.25
+++ qt4.spec	24 Oct 2006 11:47:42 -0000	1.26
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -84,11 +84,14 @@
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps}
+BuildRequires: %{x_deps} %{?x_deps_GL_hack}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
@@ -149,7 +152,7 @@
 Summary: API documentation, demos and example programs for %{name}
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}_%{release}
+Provides: %{name}-assistant = %{version}-%{release}
 # For docs -> doc rename, temporary, since it was a short-lived subpkg
 #Obsoletes: %{name}-docs < %{version}-%{release}
 #Provides:  %{name}-docs = %{version}-%{release}
@@ -506,6 +509,13 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+- use respun upstream 4.2.1 tarball
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1
+- 4.2.1
+
 * Wed Oct 04 2006 Rex Dieter 4.2.0-1
 - 4.2.0(final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Oct 2006 02:49:46 -0000	1.9
+++ sources	24 Oct 2006 11:47:42 -0000	1.10
@@ -1 +1 @@
-6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz
+2ab1c88084f55b94809f025a8503bf18  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 12:29:10 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 05:29:10 -0700
Subject: rpms/xdg-utils/devel xdg-utils-1.0-mimeopen.patch, NONE,
	1.1 xdg-utils.spec, 1.7, 1.8
Message-ID: <200610241229.k9OCTAnh020614@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20595

Modified Files:
	xdg-utils.spec 
Added Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
- prefer mimeopen as generic default (#210797)


xdg-utils-1.0-mimeopen.patch:

--- NEW FILE xdg-utils-1.0-mimeopen.patch ---
--- xdg-utils-1.0/scripts/xdg-open.mimeopen	2006-10-17 22:55:02.000000000 +0200
+++ xdg-utils-1.0/scripts/xdg-open	2006-10-17 22:55:15.000000000 +0200
@@ -360,6 +360,15 @@
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        else
+            exit_failure_operation_failed
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdg-utils.spec	10 Oct 2006 12:48:28 -0000	1.7
+++ xdg-utils.spec	24 Oct 2006 12:28:39 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,14 +11,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Not really used (yet)
-#BuildRequires: xmlto
-
 Requires: desktop-file-utils
 ## kde-config
-#Requires: kdelibs
-# update-gtk-icon-cache
-#Requires: gtk2
+#Requires(hint): kdelibs
+## update-gtk-icon-cache
+#Requires(hint): gtk2
+## generic default
+#Requires(hint): mimeopen
 
 
 %description
@@ -71,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
+- prefer mimeopen as generic default (#210797)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
 - 1.0(final)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 12:30:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 05:30:12 -0700
Subject: rpms/xdg-utils/FC-6 xdg-utils-1.0-mimeopen.patch, NONE,
	1.1 xdg-utils.spec, 1.7, 1.8
Message-ID: <200610241230.k9OCUClC020703@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20667

Modified Files:
	xdg-utils.spec 
Added Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
- prefer mimeopen as generic default (#210797)


xdg-utils-1.0-mimeopen.patch:

--- NEW FILE xdg-utils-1.0-mimeopen.patch ---
--- xdg-utils-1.0/scripts/xdg-open.mimeopen	2006-10-17 22:55:02.000000000 +0200
+++ xdg-utils-1.0/scripts/xdg-open	2006-10-17 22:55:15.000000000 +0200
@@ -360,6 +360,15 @@
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        else
+            exit_failure_operation_failed
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-6/xdg-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdg-utils.spec	10 Oct 2006 12:48:28 -0000	1.7
+++ xdg-utils.spec	24 Oct 2006 12:29:42 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,14 +11,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Not really used (yet)
-#BuildRequires: xmlto
-
 Requires: desktop-file-utils
 ## kde-config
-#Requires: kdelibs
-# update-gtk-icon-cache
-#Requires: gtk2
+#Requires(hint): kdelibs
+## update-gtk-icon-cache
+#Requires(hint): gtk2
+## generic default
+#Requires(hint): mimeopen
 
 
 %description
@@ -71,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
+- prefer mimeopen as generic default (#210797)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
 - 1.0(final)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 12:52:35 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Tue, 24 Oct 2006 05:52:35 -0700
Subject: rpms/libfwbuilder/devel .cvsignore, 1.6, 1.7 libfwbuilder.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200610241252.k9OCqZqV020963@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943

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

- Update to the 2.1.6 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Apr 2006 09:54:02 -0000	1.6
+++ .cvsignore	24 Oct 2006 12:52:05 -0000	1.7
@@ -1 +1 @@
-libfwbuilder-2.0.12.tar.gz
+libfwbuilder-2.1.6.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libfwbuilder.spec	11 Sep 2006 08:35:12 -0000	1.13
+++ libfwbuilder.spec	24 Oct 2006 12:52:05 -0000	1.14
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        2.0.12
-Release:        3%{?dist}
+Version:        2.1.6
+Release:        0.0.beta%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -37,10 +37,10 @@
 
 %files  devel
 %defattr(-, root, root)
-%{_bindir}/libfwbuilder-config-2
-%dir %{_includedir}/fwb-2.0/
-%{_includedir}/fwb-2.0/fwbuilder
-%{_includedir}/fwb-2.0/fwcompiler
+%{_bindir}/libfwbuilder-config-2.1
+%dir %{_includedir}/fwb-2.1/
+%{_includedir}/fwb-2.1/fwbuilder
+%{_includedir}/fwb-2.1/fwcompiler
 
 
 %prep
@@ -49,12 +49,6 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-#
-# configure does not pass our CXXFLAGS to the build process,
-# which kind of sucks.
-# There has to be a less ugly way to do this.
-#
-perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
 
 %configure \
     --enable-auto-docdir \
@@ -62,11 +56,6 @@
     --disable-static  \
     --enable-shared \
     --disable-dependency-tracking
-#
-# configure thinks we have a usable libresolv, when in fact we do
-# not (according to the definiton used by libfwbuilder, that is)
-#
-perl -pi -e 's,#define HAVE_GOODLIBRESOLV 1,/* #undef HAVE_GOODLIBRESOLV */,' src/fwbuilder/libfwbuilder-config.h
 make all
 
 
@@ -88,6 +77,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Ralf Ertzinger <ralf at skytale.net> 2.1.6-0.0.beta.fc7
+- Update to the 2.1.6 beta
+
 * Mon Sep 11 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-3.fc6
 - Bumped and rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Apr 2006 09:54:02 -0000	1.6
+++ sources	24 Oct 2006 12:52:05 -0000	1.7
@@ -1 +1 @@
-09834a242ad0f8aaae80c44ee4937c43  libfwbuilder-2.0.12.tar.gz
+34a5f0c2ae1c5cc45287e4b53ba23816  libfwbuilder-2.1.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 12:58:42 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Tue, 24 Oct 2006 05:58:42 -0700
Subject: rpms/fwbuilder/devel .cvsignore, 1.7, 1.8 fwbuilder.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200610241258.k9OCwgov021059@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21039

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

- Update to beta release 2.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 May 2006 16:52:05 -0000	1.7
+++ .cvsignore	24 Oct 2006 12:58:12 -0000	1.8
@@ -1 +1 @@
-fwbuilder-2.0.12.tar.gz
+fwbuilder-2.1.6.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fwbuilder.spec	11 Sep 2006 08:49:49 -0000	1.14
+++ fwbuilder.spec	24 Oct 2006 12:58:12 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.0.12
-Release:        2%dist
+Version:        2.1.6
+Release:        0.0.beta%{?dist}
 
 License:        GPL
 Group:          Applications/System
@@ -13,6 +13,7 @@
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  libfwbuilder-devel = %{version}
+BuildRequires:  /usr/bin/rename
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for
@@ -30,12 +31,22 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+
 #
-# configure does not pass our CXXFLAGS to the build process,
-# which kind of sucks.
-# There has to be a less ugly way to do this.
+# The beta releases are meant to be installed in parallel, we do
+# not want that. So we have to mangle some filenames
 #
-perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
+perl -pi -e 's,(fwb(?:edit|lookup|uilder|_ipf|_ipfw|_ipt|_pf))21,$1,' \
+    doc/doc.pro \
+    src/ipf/ipf.pro \
+    src/fwbedit/fwbedit.pro \
+    src/gui/gui.pro \
+    src/pf/pf.pro \
+    src/fwblookup/fwblookup.pro \
+    src/ipt/ipt.pro \
+    src/ipfw/ipfw.pro
+
+/usr/bin/rename 21.1 .1 doc/*21.1
 
 %configure \
     --with-templatedir=%{_datadir}/fwbuilder \
@@ -49,7 +60,7 @@
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 # Add an icon for the menu system
-install -Dpm 644 src/gui/icons/firewall_48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fwbuilder.png
+install -Dpm 644 src/gui/icons/firewall_64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/fwbuilder.png
 
 # Add menu entry
 desktop-file-install --vendor fedora               \
@@ -75,45 +86,17 @@
 %{_bindir}/fwbuilder
 %{_bindir}/fwblookup
 %{_bindir}/fwbedit
-%{_bindir}/fwb_install
-%{_bindir}/fwb_compile_all
 %doc doc/AUTHORS
 %doc doc/COPYING
 %doc doc/Credits
 %doc doc/ChangeLog
 %doc doc/PatchAcceptancePolicy.txt
 %doc doc/README.floppyfw
-%doc doc/ReleaseNotes_2_0.html
-%doc doc/ReleaseNotes_2_0.txt
-%doc doc/ReleaseNotes_2.0.1.html
-%doc doc/ReleaseNotes_2.0.1.txt
-%doc doc/ReleaseNotes_2.0.2.html
-%doc doc/ReleaseNotes_2.0.2.txt
-%doc doc/ReleaseNotes_2.0.3.html
-%doc doc/ReleaseNotes_2.0.3.txt
-%doc doc/ReleaseNotes_2.0.4.html
-%doc doc/ReleaseNotes_2.0.4.txt
-%doc doc/ReleaseNotes_2.0.5.html
-%doc doc/ReleaseNotes_2.0.5.txt
-%doc doc/ReleaseNotes_2.0.6.html
-%doc doc/ReleaseNotes_2.0.6.txt
-%doc doc/ReleaseNotes_2.0.7.html
-%doc doc/ReleaseNotes_2.0.7.txt
-%doc doc/ReleaseNotes_2.0.8.html
-%doc doc/ReleaseNotes_2.0.8.txt
-%doc doc/ReleaseNotes_2.0.9.html
-%doc doc/ReleaseNotes_2.0.9.txt
-%doc doc/ReleaseNotes_2.0.10.html
-%doc doc/ReleaseNotes_2.0.10.txt
-%doc doc/ReleaseNotes_2.0.11.html
-%doc doc/ReleaseNotes_2.0.11.txt
-%doc doc/ReleaseNotes_2.0.12.html
-%doc doc/ReleaseNotes_2.0.12.txt
+%doc doc/ReleaseNotes_*.txt
+%doc doc/ReleaseNotes_*.html
 %{_mandir}/man1/fwbuilder.1*
 %{_mandir}/man1/fwblookup.1*
 %{_mandir}/man1/fwbedit.1*
-%{_mandir}/man1/fwb_install.1*
-%{_mandir}/man1/fwb_compile_all.1*
 
 
 %package pf
@@ -176,6 +159,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Tue Oct 24 2006 Ralf Ertzinger <ralf at skytale.net> 2.1.6-0.0.beta.fc7
+- Update to beta release 2.1.6
+
 * Mon Sep 11 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-2.fc6
 - Bumped and rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 May 2006 16:52:05 -0000	1.7
+++ sources	24 Oct 2006 12:58:12 -0000	1.8
@@ -1 +1 @@
-43149297f4a64b19ad3fa519cfff2326  fwbuilder-2.0.12.tar.gz
+12638ce0987c87dd81cc54a8c5b906bb  fwbuilder-2.1.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 13:12:50 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:12:50 -0700
Subject: rpms/ren - New directory
Message-ID: <200610241312.k9ODCo3v024175@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24171/ren

Log Message:
Directory /cvs/extras/rpms/ren added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 13:12:56 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:12:56 -0700
Subject: rpms/ren/devel - New directory
Message-ID: <200610241312.k9ODCuc4024189@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24171/ren/devel

Log Message:
Directory /cvs/extras/rpms/ren/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 13:13:16 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:13:16 -0700
Subject: rpms/ren Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610241313.k9ODDGTQ024220@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24214

Added Files:
	Makefile import.log 
Log Message:
Setup of module ren


--- NEW FILE Makefile ---
# Top level Makefile for module ren
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 24 13:13:22 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:13:22 -0700
Subject: rpms/ren/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610241313.k9ODDMcY024238@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24214/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ren


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 24 13:14:31 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:14:31 -0700
Subject: rpms/ren import.log,1.1,1.2
Message-ID: <200610241314.k9ODEVcK024320@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24283

Modified Files:
	import.log 
Log Message:
auto-import ren-1.0-11 on branch devel from ren-1.0-11.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ren/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Oct 2006 13:13:16 -0000	1.1
+++ import.log	24 Oct 2006 13:14:01 -0000	1.2
@@ -0,0 +1 @@
+ren-1_0-11:HEAD:ren-1.0-11.src.rpm:1161695760



From fedora-extras-commits at redhat.com  Tue Oct 24 13:14:32 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:14:32 -0700
Subject: rpms/ren/devel ren-1.0.Wall.patch, NONE, 1.1 ren.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610241314.k9ODEWq2024324@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24283/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ren-1.0.Wall.patch ren.spec 
Log Message:
auto-import ren-1.0-11 on branch devel from ren-1.0-11.src.rpm

ren-1.0.Wall.patch:

--- NEW FILE ren-1.0.Wall.patch ---
diff -N -r -u ren-1.0-old/ren.c ren-1.0/ren.c
--- ren-1.0-old/ren.c	1997-10-28 05:32:44.000000000 +0000
+++ ren-1.0/ren.c	2006-06-23 10:22:34.000000000 +0100
@@ -3,6 +3,8 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define direct dirent
 
@@ -27,26 +29,22 @@
 #define NODEL 2
 #define ABORTDEL 3
 
-extern int alphasort();
-extern int scandir();
-extern qsort();
-
-static procargs();
+static int procargs();
 static int procdir();
 static int checkpats();
 static int getreps();
 static int scan();
 static char *makerep();
-static checkcollisons();
+static int checkcollisons();
 static int mycmp();
-static checkdeletes();
-static int bsearch();
+static int checkdeletes();
+static int ren_bsearch();
 static char** breakcycles();
-static dorenames();
+static int dorenames();
 
 static char tempprefix[] = "renTMP";
 
-main(argc, argv)
+int main(argc, argv)
 	int argc;
 	char *(argv[]);
 {
@@ -69,7 +67,7 @@
 }
 
 
-static procargs(argc, argv, pverbose, pdelstyle, pfrom_pat, pto_pat, ppath)
+static int procargs(argc, argv, pverbose, pdelstyle, pfrom_pat, pto_pat, ppath)
 	int argc;
 	char *(argv[]);
 	int *pverbose, *pdelstyle;
@@ -124,10 +122,11 @@
 	}
 	else
 		*ppath = ".";
+	return 0;
 }
 
 
-static checkpats(from_pat, to_pat)
+static int checkpats(from_pat, to_pat)
 	char *from_pat, *to_pat;
 {
 	char *p;
@@ -171,6 +170,7 @@
 				break;
 		}
 	}
+	return 0;
 }
 
 
@@ -340,7 +340,7 @@
 }
 
 
-static checkcollisons(reps, nreps)
+static int checkcollisons(reps, nreps)
 	REP *reps;
 	int nreps;
 {
@@ -361,6 +361,7 @@
 			fputs("Aborting, no renames done.\n", stderr);
 			exit(1);
 		}
+	return 0;
 }
 
 
@@ -371,7 +372,7 @@
 }
 
 
-static checkdeletes(reps, dot, filrep, nfils, delstyle)
+static int checkdeletes(reps, dot, filrep, nfils, delstyle)
 	REP *reps;
 	struct direct *(dot[]);
 	REP *(filrep[]);
@@ -386,7 +387,7 @@
 		for (cur = reps; cur != NULL; cur = cur->nextrep) {
 			if (cur->status == FORGET)
 				continue;
-			if ((i = bsearch(cur->repname, dot, nfils)) >= 0) {
+			if ((i = ren_bsearch(cur->repname, dot, nfils)) >= 0) {
 				if (filrep[i] == NULL && cur->mustdel < 0) {
 					cur->dofirst = NULL;
 					if (delstyle == QUIETDEL)
@@ -437,10 +438,12 @@
 			}
 		}
 	} while (recheck);
+
+	return 0;
 }
 
 
-static int bsearch(s, dlist, n)
+static int ren_bsearch(s, dlist, n)
 	char *s;
 	struct direct *(dlist[]);
 	int n;
@@ -484,7 +487,7 @@
 				exit(1);
 			}
 		}
-		if (pred == cur)
+		if (pred == cur) {
 			if (cur->dofirst == cur)
 				cur->status = FORGET;
 			else {
@@ -503,12 +506,15 @@
 				cur->dofirst = NULL;
 				cur->nextrep = pred;
 			}
+		}
 	}
 	return(tempnames);
+
+	return 0;
 }
 
 
-static dorenames(reps, dot, tempnames, verbose)
+static int dorenames(reps, dot, tempnames, verbose)
 	REP *reps;
 	struct direct *(dot[]);
 	char *(tempnames[]);
@@ -548,4 +554,5 @@
 			}
 		}
 	} while (skipped);
+	return 0;
 }


--- NEW FILE ren.spec ---
Summary: Rename multiple files
Name: ren
Version: 1.0
Release: 11%{?dist}
License: Public Domain
Group: Applications/File
Source: ftp://sunsite.unc.edu/pub/Linux/utils/file/ren-1.0.tar.gz
Patch0: ren-1.0.Wall.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://linux.maruhn.com/sec/ren.html

%description
Whereas mv can rename (as opposed to move) only one file at a time,
ren can rename many files according to search and replacement
patterns, ala VMS and MS-DOS (but better). ren checks for replacement name
collisions and handles rename chains (1 goes to 2 goes to 3 etc.)
gracefully.

%prep
%setup -q
%patch0 -p1

%build
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
#there is no install script included in the upstream Makefile
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_mandir}/man1/
install -m 755 ren %{buildroot}/%{_bindir}
install -m 644 ren.1 %{buildroot}/%{_mandir}/man1/


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{_mandir}/man1/ren.1*
%{_bindir}/ren

%changelog

* Fri Sep 22 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-11
- "freshly" included source did not have correct timestamps. Fixed.

* Fri Sep 22 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-10
- the included tar.gz file did not match the md5sum from upstrean. recreated the src.rpm with a freshly downloaded one

* Fri Sep 22 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-9
- cosmetic fixes

* Thu Jul 27 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-8
- fix generation of debuginfo package

* Wed Jun 28 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-7
- cleanup (%%defattr, %%make)

* Thu Jun 23 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-6
- minor spec cleaning

* Fri Jun 23 2006 Alan Iwi <A.M.Iwi at rl.ac.uk>
- buildroot
- man file is gzipped and is in %%{_mandir}/man1
- patch0: changes to ensure a clean build with gcc -Wall

* Sun Aug 30 1998 W. L. Estes <wlestes at uncg.edu>
- fix docdir permissions

* Sat Aug 01 1998 W. L. Estes <wlestes at hamlet.uncg.edu>
- buildroot
- drop patch to Makefile
- relocateable
- defattr in filelist


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ren/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Oct 2006 13:13:22 -0000	1.1
+++ .cvsignore	24 Oct 2006 13:14:02 -0000	1.2
@@ -0,0 +1 @@
+ren-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ren/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Oct 2006 13:13:22 -0000	1.1
+++ sources	24 Oct 2006 13:14:02 -0000	1.2
@@ -0,0 +1 @@
+245453453a8bd1c0bf7d03880b97d632  ren-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 13:31:08 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:31:08 -0700
Subject: owners owners.list,1.1868,1.1869
Message-ID: <200610241331.k9ODV8lZ024498@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24433/owners

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1868
retrieving revision 1.1869
diff -u -r1.1868 -r1.1869
--- owners.list	23 Oct 2006 22:06:25 -0000	1.1868
+++ owners.list	24 Oct 2006 13:30:38 -0000	1.1869
@@ -1989,6 +1989,7 @@
 Fedora Extras|regexxer|A nifty GUI search/replace tool|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|regionset|Reads/sets the region code of DVD drives|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|rekall|A KDE database front-end application|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ren|Rename multiple files|wolfy at nobugconsulting.ro|extras-qa at fedoraproject.org|
 Fedora Extras|renrot|A program to rename and rotate files according to EXIF tags|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|repoml|Tools and data for working with RepoML files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 24 15:48:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 08:48:54 -0700
Subject: rpms/xdg-utils/devel xdg-utils.spec,1.8,1.9
Message-ID: <200610241548.k9OFmskc031391@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31375

Modified Files:
	xdg-utils.spec 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
- actually *use* mimeopen patch (#210797)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xdg-utils.spec	24 Oct 2006 12:28:39 -0000	1.8
+++ xdg-utils.spec	24 Oct 2006 15:48:23 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,13 +11,16 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+Patch1: xdg-utils-1.0-mimeopen.patch
+
 Requires: desktop-file-utils
 ## kde-config
 #Requires(hint): kdelibs
 ## update-gtk-icon-cache
 #Requires(hint): gtk2
-## generic default
-#Requires(hint): mimeopen
+## mimeopen generic default
+#Requires(hint): %{_bindir}/mimeopen
+#Requires(hint): perl-File-MimeInfo 
 
 
 %description
@@ -45,6 +48,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch1 -p1 -b .mimeopen
+
 
 %build
 %configure
@@ -70,6 +75,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
+- actually *use* mimeopen patch (#210797)
+
 * Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
 - prefer mimeopen as generic default (#210797)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:00:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 09:00:39 -0700
Subject: rpms/xdg-utils/FC-6 xdg-utils.spec,1.8,1.9
Message-ID: <200610241600.k9OG0daR031678@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31651

Modified Files:
	xdg-utils.spec 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
- actually *use* mimeopen patch (#210797)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-6/xdg-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xdg-utils.spec	24 Oct 2006 12:29:42 -0000	1.8
+++ xdg-utils.spec	24 Oct 2006 16:00:09 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,13 +11,16 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+Patch1: xdg-utils-1.0-mimeopen.patch
+
 Requires: desktop-file-utils
 ## kde-config
 #Requires(hint): kdelibs
 ## update-gtk-icon-cache
 #Requires(hint): gtk2
-## generic default
-#Requires(hint): mimeopen
+## mimeopen generic default
+#Requires(hint): %{_bindir}/mimeopen
+#Requires(hint): perl-File-MimeInfo 
 
 
 %description
@@ -45,6 +48,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch1 -p1 -b .mimeopen
+
 
 %build
 %configure
@@ -70,6 +75,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
+- actually *use* mimeopen patch (#210797)
+
 * Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
 - prefer mimeopen as generic default (#210797)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:02:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 09:02:16 -0700
Subject: rpms/xdg-utils/FC-5 xdg-utils-1.0-mimeopen.patch, NONE,
	1.1 xdg-utils.spec, 1.7, 1.8
Message-ID: <200610241602.k9OG2G0N002200@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2179

Modified Files:
	xdg-utils.spec 
Added Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
- actually *use* mimeopen patch (#210797)


xdg-utils-1.0-mimeopen.patch:

--- NEW FILE xdg-utils-1.0-mimeopen.patch ---
--- xdg-utils-1.0/scripts/xdg-open.mimeopen	2006-10-17 22:55:02.000000000 +0200
+++ xdg-utils-1.0/scripts/xdg-open	2006-10-17 22:55:15.000000000 +0200
@@ -360,6 +360,15 @@
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        else
+            exit_failure_operation_failed
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdg-utils.spec	10 Oct 2006 12:51:18 -0000	1.7
+++ xdg-utils.spec	24 Oct 2006 16:01:45 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,14 +11,16 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Not really used (yet)
-#BuildRequires: xmlto
+Patch1: xdg-utils-1.0-mimeopen.patch
 
 Requires: desktop-file-utils
 ## kde-config
-#Requires: kdelibs
-# update-gtk-icon-cache
-#Requires: gtk2
+#Requires(hint): kdelibs
+## update-gtk-icon-cache
+#Requires(hint): gtk2
+## mimeopen generic default
+#Requires(hint): %{_bindir}/mimeopen
+#Requires(hint): perl-File-MimeInfo 
 
 
 %description
@@ -46,6 +48,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch1 -p1 -b .mimeopen
+
 
 %build
 %configure
@@ -71,6 +75,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
+- actually *use* mimeopen patch (#210797)
+
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
+- prefer mimeopen as generic default (#210797)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
 - 1.0(final)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:10:41 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Tue, 24 Oct 2006 09:10:41 -0700
Subject: rpms/testdisk/FC-6 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610241610.k9OGAfTn002436@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2392

Modified Files:
	.cvsignore sources 
Log Message:
Update TestDisk & PhotoRec to version 6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 11:01:46 -0000	1.4
+++ .cvsignore	24 Oct 2006 16:10:11 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 11:01:46 -0000	1.4
+++ sources	24 Oct 2006 16:10:11 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 16:18:08 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Tue, 24 Oct 2006 09:18:08 -0700
Subject: rpms/testdisk/FC-6 testdisk.spec,1.7,1.8
Message-ID: <200610241618.k9OGI8sF002520@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2498

Modified Files:
	testdisk.spec 
Log Message:
TestDisk & PhotoRec 6.5



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-6/testdisk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testdisk.spec	28 Aug 2006 18:13:24 -0000	1.7
+++ testdisk.spec	24 Oct 2006 16:17:38 -0000	1.8
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	3%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
 * Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:26:11 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:26:11 -0700
Subject: rpms/hatari - New directory
Message-ID: <200610241626.k9OGQBCa002637@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2633/hatari

Log Message:
Directory /cvs/extras/rpms/hatari added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 16:26:12 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:26:12 -0700
Subject: rpms/hatari/devel - New directory
Message-ID: <200610241626.k9OGQCam002651@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2633/hatari/devel

Log Message:
Directory /cvs/extras/rpms/hatari/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 16:26:33 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:26:33 -0700
Subject: rpms/hatari Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610241626.k9OGQXTq002682@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2676

Added Files:
	Makefile import.log 
Log Message:
Setup of module hatari


--- NEW FILE Makefile ---
# Top level Makefile for module hatari
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 24 16:26:39 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:26:39 -0700
Subject: rpms/hatari/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610241626.k9OGQdZO002706@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2676/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hatari


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 24 16:27:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 24 Oct 2006 09:27:19 -0700
Subject: rpms/dnsmasq/devel dnsmasq.spec,1.12,1.13
Message-ID: <200610241627.k9OGRJK0002768@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2703

Modified Files:
	dnsmasq.spec 
Log Message:

* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
- Fixed BZ#212005
- Moved %%postun scriptlet to %%post, where it made more sense
- Render scriptlets safer
- Minor cleanup for consistency



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dnsmasq.spec	19 Oct 2006 18:09:19 -0000	1.12
+++ dnsmasq.spec	24 Oct 2006 16:26:49 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -63,19 +63,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add dnsmasq
+if [ "$1" = "2" ]; then # if we're being upgraded
+    /sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
+else # if we're being installed
+    /sbin/chkconfig --add dnsmasq
+fi
 
 %preun
-if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
-    service dnsmasq stop >/dev/null 2>&1
+if [ "$1" = "0" ]; then     # execute this only if we are NOT doing an upgrade
+    /sbin/service dnsmasq stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dnsmasq
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-    service dnsmasq restart >/dev/null 2>&1
-fi
-
 
 %files
 %defattr(-,root,root,-)
@@ -90,6 +89,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
+- Fixed BZ#212005
+- Moved %%postun scriptlet to %%post, where it made more sense
+- Render scriptlets safer
+- Minor cleanup for consistency
+
 * Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
 - Hardcoded version in patches, as I'm getting tired of updating them
 - Update to 2.34



From fedora-extras-commits at redhat.com  Tue Oct 24 16:28:18 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:28:18 -0700
Subject: rpms/hatari import.log,1.1,1.2
Message-ID: <200610241628.k9OGSIDq002827@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2786

Modified Files:
	import.log 
Log Message:
auto-import hatari-0.90-5 on branch devel from hatari-0.90-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hatari/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Oct 2006 16:26:33 -0000	1.1
+++ import.log	24 Oct 2006 16:27:48 -0000	1.2
@@ -0,0 +1 @@
+hatari-0_90-5:HEAD:hatari-0.90-5.src.rpm:1161707258



From fedora-extras-commits at redhat.com  Tue Oct 24 16:28:19 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:28:19 -0700
Subject: rpms/hatari/devel hatari-0.90-nobinstrip.patch, NONE, 1.1 hatari.png,
	NONE, 1.1 hatari.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610241628.k9OGSJeJ002831@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2786/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hatari-0.90-nobinstrip.patch hatari.png hatari.spec 
Log Message:
auto-import hatari-0.90-5 on branch devel from hatari-0.90-5.src.rpm

hatari-0.90-nobinstrip.patch:

--- NEW FILE hatari-0.90-nobinstrip.patch ---
Common subdirectories: hatari-0.90.orig/doc and hatari-0.90/doc
Common subdirectories: hatari-0.90.orig/Hatari.xcodeproj and hatari-0.90/Hatari.xcodeproj
diff -u hatari-0.90.orig/Makefile.cnf.in hatari-0.90/Makefile.cnf.in
--- hatari-0.90.orig/Makefile.cnf.in	2006-10-23 12:16:52.000000000 +0200
+++ hatari-0.90/Makefile.cnf.in	2006-10-23 12:17:19.000000000 +0200
@@ -51,5 +51,5 @@
 
 # Program used for "make install"
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
Common subdirectories: hatari-0.90.orig/src and hatari-0.90/src


--- NEW FILE hatari.spec ---
Summary: An Atari ST emulator suitable for playing games
Name: hatari
Version: 0.90
Release: 5%{?dist}
License: GPL
Group: Applications/Emulators
URL: http://hatari.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
Source1: hatari.png
Patch0: hatari-0.90-nobinstrip.patch
BuildRequires: SDL-devel >= 1.2.0, zlib-devel, desktop-file-utils
Requires: hicolor-icon-theme

%description
Hatari is an Atari-ST and STE emulator for Linux. More precisely, it 
is an adaption of the WinSTon source code to Linux, using the UAE CPU
core instead of the original, non-portable assembler CPU core. 

Unlike other ST emulators which concentrate on desktop compatibility,
it is suitable for playing games.

%prep
%setup -q
%patch -p1

%build
%configure --datadir=%{_datadir}/hatari
make

# README.tos
cat >doc/README.tos <<EOF
To run the emulator a TOS ROM image is needed. EmuTOS, a free implementation 
of TOS, is shipped with hatari. 

EmuTOS is a single-user single-tasking operating system for the 32 bit Atari
computers and emulators. It can be used as a replacement for the TOS images
typically needed today for using emulators and it is also running on some
real hardware, like the Atari Mega STE. All the source code is open and
free, licensed under the GNU General Public License (GPL). A copy of the GNU 
GPL can be found in the gpl.txt file.

EmuTOS has its home at sourceforge:
http://sourceforge.net/projects/emutos

Hatari is shipped with tos.img ROM image that is identical to etos256us.img 
from the binary package of version 0.8.1 available at sourceforge:
http://dl.sourceforge.net/sourceforge/emutos/emutos256k-0.8.1.zip
EOF

# Build desktop icon
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=Hatari
Comment=Atari ST emulator
Exec=%{name}
Icon=%{name}.png
Terminal=false
Type=Application
Categories=Application;Emulators;
Version=%{version}
EOF

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 
install -d -m 755 %{buildroot}%{_mandir}/man1
install -m 644 doc/hatari.1 %{buildroot}%{_mandir}/man1

# install desktop file and icon
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora         \
  --dir %{buildroot}%{_datadir}/applications \
  --add-category X-Fedora                    \
  %{name}.desktop
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
cp %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps

%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)
%{_bindir}/hatari
%{_datadir}/hatari
%{_mandir}/man1/hatari.1*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc gpl.txt readme.txt doc/{*.txt,*.html,images}
%doc doc/README.tos

%changelog
* Mon Oct 23 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-5%{?dist}
- added a patch not to strip binaries during make install
- added hicolor-icon-theme to Requires

* Sat Oct 21 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-4%{?dist}
- added README.tos to explain that Hatari is shipped with EmuTOS

* Fri Oct 20 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-3%{?dist}
- new release for FE migration

* Sun Oct 08 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-2%{?dist}
- replaced %%_mandir with %%{_mandir}
- full URL is now specified in the Source tag
- added .desktop file and icons

* Sat Sep 30 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-1%{?dist}
- initial package




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hatari/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Oct 2006 16:26:38 -0000	1.1
+++ .cvsignore	24 Oct 2006 16:27:48 -0000	1.2
@@ -0,0 +1 @@
+hatari-0.90.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hatari/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Oct 2006 16:26:38 -0000	1.1
+++ sources	24 Oct 2006 16:27:48 -0000	1.2
@@ -0,0 +1 @@
+2e5d1e329ebbf6c75ccab8c4f9a78f11  hatari-0.90.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 16:36:52 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:36:52 -0700
Subject: owners owners.list,1.1869,1.1870
Message-ID: <200610241636.k9OGaqRW002992@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2972

Modified Files:
	owners.list 
Log Message:
Added hatari package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1869
retrieving revision 1.1870
diff -u -r1.1869 -r1.1870
--- owners.list	24 Oct 2006 13:30:38 -0000	1.1869
+++ owners.list	24 Oct 2006 16:36:22 -0000	1.1870
@@ -758,6 +758,7 @@
 Fedora Extras|kasablanca|Graphical FTP client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|katapult|Faster access to applications, bookmarks, and other items|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
+Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kbackup|Back up your data in a simple, user friendly way|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 24 16:37:40 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 24 Oct 2006 09:37:40 -0700
Subject: rpms/dnsmasq/FC-6 dnsmasq.spec,1.12,1.13
Message-ID: <200610241637.k9OGbeKk003042@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3003

Modified Files:
	dnsmasq.spec 
Log Message:

* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2          
- Fixed BZ#212005                                                               
- Moved %%postun scriptlet to %%post, where it made more sense                  
- Render scriptlets safer                                                       
- Minor cleanup for consistency                                                 



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-6/dnsmasq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dnsmasq.spec	19 Oct 2006 18:09:19 -0000	1.12
+++ dnsmasq.spec	24 Oct 2006 16:37:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -63,19 +63,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add dnsmasq
+if [ "$1" = "2" ]; then # if we're being upgraded
+    /sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
+else # if we're being installed
+    /sbin/chkconfig --add dnsmasq
+fi
 
 %preun
-if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
-    service dnsmasq stop >/dev/null 2>&1
+if [ "$1" = "0" ]; then     # execute this only if we are NOT doing an upgrade
+    /sbin/service dnsmasq stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dnsmasq
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-    service dnsmasq restart >/dev/null 2>&1
-fi
-
 
 %files
 %defattr(-,root,root,-)
@@ -90,6 +89,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
+- Fixed BZ#212005
+- Moved %%postun scriptlet to %%post, where it made more sense
+- Render scriptlets safer
+- Minor cleanup for consistency
+
 * Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
 - Hardcoded version in patches, as I'm getting tired of updating them
 - Update to 2.34



From fedora-extras-commits at redhat.com  Tue Oct 24 16:37:53 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 24 Oct 2006 09:37:53 -0700
Subject: rpms/php-pecl-zip/devel .cvsignore, 1.6, 1.7 php-pecl-zip.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200610241637.k9OGbrKa003047@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3022

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	Update to 1.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 15:43:06 -0000	1.6
+++ .cvsignore	24 Oct 2006 16:37:23 -0000	1.7
@@ -1 +1 @@
-zip-1.7.4.tgz
+zip-1.7.5.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/php-pecl-zip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-zip.spec	28 Sep 2006 15:43:06 -0000	1.6
+++ php-pecl-zip.spec	24 Oct 2006 16:37:23 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.4
+Version:      1.7.5
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Tue Oct 24 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Wed Sep 27 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 15:43:06 -0000	1.6
+++ sources	24 Oct 2006 16:37:23 -0000	1.7
@@ -1 +1 @@
-dccdc45aef30e9759deb6f93dd863dfd  zip-1.7.4.tgz
+e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 16:39:39 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 24 Oct 2006 09:39:39 -0700
Subject: rpms/dnsmasq/FC-5 dnsmasq.spec,1.7,1.8
Message-ID: <200610241639.k9OGddXX003153@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3126

Modified Files:
	dnsmasq.spec 
Log Message:

* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2          
- Fixed BZ#212005                                                               
- Moved %%postun scriptlet to %%post, where it made more sense                  
- Render scriptlets safer                                                       
- Minor cleanup for consistency                                                 



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dnsmasq.spec	19 Oct 2006 18:19:48 -0000	1.7
+++ dnsmasq.spec	24 Oct 2006 16:39:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -63,19 +63,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add dnsmasq
+if [ "$1" = "2" ]; then # if we're being upgraded
+    /sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
+else # if we're being installed
+    /sbin/chkconfig --add dnsmasq
+fi
 
 %preun
-if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
-    service dnsmasq stop >/dev/null 2>&1
+if [ "$1" = "0" ]; then     # execute this only if we are NOT doing an upgrade
+    /sbin/service dnsmasq stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dnsmasq
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-    service dnsmasq restart >/dev/null 2>&1
-fi
-
 
 %files
 %defattr(-,root,root,-)
@@ -90,6 +89,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
+- Fixed BZ#212005
+- Moved %%postun scriptlet to %%post, where it made more sense
+- Render scriptlets safer
+- Minor cleanup for consistency
+
 * Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
 - Hardcoded version in patches, as I'm getting tired of updating them
 - Update to 2.34



From fedora-extras-commits at redhat.com  Tue Oct 24 16:43:37 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Tue, 24 Oct 2006 09:43:37 -0700
Subject: rpms/testdisk/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 testdisk.spec, 1.5, 1.6
Message-ID: <200610241643.k9OGhbPt003264@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3228/FC-3

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
TestDisk & PhotoRec 6.5 in FC-3 & FC-4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 11:07:01 -0000	1.4
+++ .cvsignore	24 Oct 2006 16:43:07 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 11:07:01 -0000	1.4
+++ sources	24 Oct 2006 16:43:07 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-3/testdisk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testdisk.spec	21 Jun 2006 13:26:18 -0000	1.5
+++ testdisk.spec	24 Oct 2006 16:43:07 -0000	1.6
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	2%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,15 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
+* Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
+- Rebuild for Fedora Extras 6
+
+* Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-2
+- FC3 and FC4 has a release of 2, need to align
+
 * Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:43:38 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Tue, 24 Oct 2006 09:43:38 -0700
Subject: rpms/testdisk/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 testdisk.spec, 1.5, 1.6
Message-ID: <200610241643.k9OGhcmh003269@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3228/FC-4

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
TestDisk & PhotoRec 6.5 in FC-3 & FC-4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 13:38:34 -0000	1.4
+++ .cvsignore	24 Oct 2006 16:43:08 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 13:38:34 -0000	1.4
+++ sources	24 Oct 2006 16:43:08 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-4/testdisk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testdisk.spec	21 Jun 2006 13:31:26 -0000	1.5
+++ testdisk.spec	24 Oct 2006 16:43:08 -0000	1.6
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	2%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,15 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
+* Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
+- Rebuild for Fedora Extras 6
+
+* Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-2
+- FC3 and FC4 has a release of 2, need to align
+
 * Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Tue Oct 24 17:29:41 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 24 Oct 2006 10:29:41 -0700
Subject: rpms/highlight/devel .cvsignore, 1.6, 1.7 highlight.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <200610241729.k9OHTf32006515@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6487

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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Mar 2006 16:31:13 -0000	1.6
+++ .cvsignore	24 Oct 2006 17:29:10 -0000	1.7
@@ -1 +1 @@
-highlight-2.4.5.tar.gz
+highlight-2.4.8.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- highlight.spec	3 Sep 2006 19:29:02 -0000	1.16
+++ highlight.spec	24 Oct 2006 17:29:10 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.7
-Release:	2%{?dist}
+Version:	2.4.8
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
+- New upstream release
+
 * Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-2
 - Rebuilt for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jul 2006 19:00:09 -0000	1.7
+++ sources	24 Oct 2006 17:29:10 -0000	1.8
@@ -1 +1 @@
-43557684e05d6d2a1144bffcf9f30871  highlight-2.4.7.tar.gz
+8ffb1d62ef449ecf5ffef1f6931a3d16  highlight-2.4.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 17:32:32 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 24 Oct 2006 10:32:32 -0700
Subject: rpms/highlight/FC-5 highlight.spec,1.15,1.16 sources,1.7,1.8
Message-ID: <200610241732.k9OHWWav006598@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6579

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


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- highlight.spec	4 Jul 2006 18:58:13 -0000	1.15
+++ highlight.spec	24 Oct 2006 17:32:01 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.7
+Version:	2.4.8
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -49,6 +49,12 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
+- New upstream release
+
+* Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-2
+- Rebuilt for FC-6
+
 * Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jul 2006 18:58:13 -0000	1.7
+++ sources	24 Oct 2006 17:32:01 -0000	1.8
@@ -1 +1 @@
-43557684e05d6d2a1144bffcf9f30871  highlight-2.4.7.tar.gz
+8ffb1d62ef449ecf5ffef1f6931a3d16  highlight-2.4.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 17:35:08 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 24 Oct 2006 10:35:08 -0700
Subject: rpms/highlight/FC-6 highlight.spec,1.16,1.17 sources,1.7,1.8
Message-ID: <200610241735.k9OHZ8Ic006660@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6642

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


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-6/highlight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- highlight.spec	3 Sep 2006 19:29:02 -0000	1.16
+++ highlight.spec	24 Oct 2006 17:34:38 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.7
-Release:	2%{?dist}
+Version:	2.4.8
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
+- New upstream release
+
 * Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-2
 - Rebuilt for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jul 2006 19:00:09 -0000	1.7
+++ sources	24 Oct 2006 17:34:38 -0000	1.8
@@ -1 +1 @@
-43557684e05d6d2a1144bffcf9f30871  highlight-2.4.7.tar.gz
+8ffb1d62ef449ecf5ffef1f6931a3d16  highlight-2.4.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 18:10:51 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:10:51 -0700
Subject: rpms/moodss/devel .cvsignore,1.9,1.10 sources,1.10,1.11
Message-ID: <200610241810.k9OIApWU009836@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9818

Modified Files:
	.cvsignore sources 
Log Message:
upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2006 21:34:56 -0000	1.9
+++ .cvsignore	24 Oct 2006 18:10:21 -0000	1.10
@@ -1,3 +1 @@
-moodss-21.0.tar.bz2
-moodss-21.1.tar.bz2
-moodss-21.2.tar.bz2
+moodss-21.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Apr 2006 21:34:56 -0000	1.10
+++ sources	24 Oct 2006 18:10:21 -0000	1.11
@@ -1,3 +1 @@
-1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
-f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
-8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2
+8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:13:04 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:13:04 -0700
Subject: rpms/moomps/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200610241813.k9OID4Gl009872@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9854

Modified Files:
	.cvsignore sources 
Log Message:
upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 21:37:06 -0000	1.8
+++ .cvsignore	24 Oct 2006 18:12:34 -0000	1.9
@@ -1,3 +1 @@
-moomps-5.4.tar.bz2
-moomps-5.5.tar.bz2
-moomps-5.6.tar.bz2
+moomps-5.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 21:37:06 -0000	1.8
+++ sources	24 Oct 2006 18:12:34 -0000	1.9
@@ -1,3 +1 @@
-37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
-249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
-f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2
+47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:26:07 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:26:07 -0700
Subject: rpms/moodss/FC-5 .cvsignore, 1.9, 1.10 moodss.spec, 1.22,
	1.23 sources, 1.10, 1.11
Message-ID: <200610241826.k9OIQ7M1009991@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9968

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.3 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2006 21:51:17 -0000	1.9
+++ .cvsignore	24 Oct 2006 18:25:36 -0000	1.10
@@ -1,3 +1 @@
-moodss-21.0.tar.bz2
-moodss-21.1.tar.bz2
-moodss-21.2.tar.bz2
+moodss-21.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/moodss.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- moodss.spec	10 Apr 2006 21:51:17 -0000	1.22
+++ moodss.spec	24 Oct 2006 18:25:36 -0000	1.23
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.2
+Version: 21.3
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,12 @@
 
 
 %changelog
+* Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
+- 21.3 upstream release
+
+* Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-2
+- rebuild for Fedora Extras 6
+
 * Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-1
 - 21.2 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Apr 2006 21:51:17 -0000	1.10
+++ sources	24 Oct 2006 18:25:36 -0000	1.11
@@ -1,3 +1 @@
-1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
-f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
-8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2
+8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:27:36 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:27:36 -0700
Subject: rpms/moodss/FC-6 .cvsignore, 1.9, 1.10 moodss.spec, 1.23,
	1.24 sources, 1.10, 1.11
Message-ID: <200610241827.k9OIRaSd010044@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10002

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.3 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2006 21:34:56 -0000	1.9
+++ .cvsignore	24 Oct 2006 18:27:05 -0000	1.10
@@ -1,3 +1 @@
-moodss-21.0.tar.bz2
-moodss-21.1.tar.bz2
-moodss-21.2.tar.bz2
+moodss-21.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/moodss.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- moodss.spec	8 Sep 2006 21:12:44 -0000	1.23
+++ moodss.spec	24 Oct 2006 18:27:05 -0000	1.24
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.2
-Release: 2%{?dist}
+Version: 21.3
+Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
+- 21.3 upstream release
+
 * Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-2
 - rebuild for Fedora Extras 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Apr 2006 21:34:56 -0000	1.10
+++ sources	24 Oct 2006 18:27:05 -0000	1.11
@@ -1,3 +1 @@
-1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
-f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
-8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2
+8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:30:00 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:30:00 -0700
Subject: rpms/moodss/devel moodss.spec,1.23,1.24
Message-ID: <200610241830.k9OIU022010181@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10156

Modified Files:
	moodss.spec 
Log Message:
21.3 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- moodss.spec	8 Sep 2006 21:12:44 -0000	1.23
+++ moodss.spec	24 Oct 2006 18:29:30 -0000	1.24
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.2
-Release: 2%{?dist}
+Version: 21.3
+Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
+- 21.3 upstream release
+
 * Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-2
 - rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Tue Oct 24 18:51:01 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:51:01 -0700
Subject: rpms/moomps/devel moomps.spec,1.13,1.14
Message-ID: <200610241851.k9OIp1CC010337@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10321

Modified Files:
	moomps.spec 
Log Message:
5.7 upstream release.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- moomps.spec	8 Sep 2006 22:46:34 -0000	1.13
+++ moomps.spec	24 Oct 2006 18:50:31 -0000	1.14
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.6
-Release: 2%{?dist}
+Version: 5.7
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Oct 1 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.7-1
+- 5.7 upstream release
+
 * Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-2
 - rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Tue Oct 24 18:52:27 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:52:27 -0700
Subject: rpms/moomps/FC-5 .cvsignore, 1.8, 1.9 moomps.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200610241852.k9OIqRNx010365@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10343

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.7 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 22:05:25 -0000	1.8
+++ .cvsignore	24 Oct 2006 18:51:57 -0000	1.9
@@ -1,3 +1 @@
-moomps-5.4.tar.bz2
-moomps-5.5.tar.bz2
-moomps-5.6.tar.bz2
+moomps-5.7.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- moomps.spec	10 Apr 2006 22:05:25 -0000	1.12
+++ moomps.spec	24 Oct 2006 18:51:57 -0000	1.13
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.6
+Version: 5.7
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Sat Oct 1 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.7-1
+- 5.7 upstream release
+
+* Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-2
+- rebuild for Fedora Extras 6
+
 * Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-1
 - 5.6 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 22:05:25 -0000	1.8
+++ sources	24 Oct 2006 18:51:57 -0000	1.9
@@ -1,3 +1 @@
-37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
-249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
-f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2
+47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:54:45 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:54:45 -0700
Subject: rpms/moomps/FC-6 .cvsignore, 1.8, 1.9 moomps.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200610241854.k9OIsjPI010465@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10439

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.7 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 21:37:06 -0000	1.8
+++ .cvsignore	24 Oct 2006 18:54:15 -0000	1.9
@@ -1,3 +1 @@
-moomps-5.4.tar.bz2
-moomps-5.5.tar.bz2
-moomps-5.6.tar.bz2
+moomps-5.7.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/moomps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- moomps.spec	8 Sep 2006 22:46:34 -0000	1.13
+++ moomps.spec	24 Oct 2006 18:54:15 -0000	1.14
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.6
-Release: 2%{?dist}
+Version: 5.7
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Oct 1 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.7-1
+- 5.7 upstream release
+
 * Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-2
 - rebuild for Fedora Extras 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 21:37:06 -0000	1.8
+++ sources	24 Oct 2006 18:54:15 -0000	1.9
@@ -1,3 +1 @@
-37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
-249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
-f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2
+47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:56:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 24 Oct 2006 11:56:41 -0700
Subject: rpms/tuxpaint/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tuxpaint.spec, 1.12, 1.13
Message-ID: <200610241856.k9OIufYl010532@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10512

Modified Files:
	.cvsignore sources tuxpaint.spec 
Log Message:
Update to 0.9.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jun 2006 17:54:54 -0000	1.5
+++ .cvsignore	24 Oct 2006 18:56:11 -0000	1.6
@@ -1 +1 @@
-tuxpaint-0.9.15b.tar.gz
+tuxpaint-0.9.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jun 2006 17:54:54 -0000	1.5
+++ sources	24 Oct 2006 18:56:11 -0000	1.6
@@ -1 +1 @@
-04995631e0922570a0d5c2216d943941  tuxpaint-0.9.15b.tar.gz
+467ef64c7f81f9f3755ae2ceebe97f48  tuxpaint-0.9.16.tar.gz


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tuxpaint.spec	4 Oct 2006 22:31:35 -0000	1.12
+++ tuxpaint.spec	24 Oct 2006 18:56:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           tuxpaint
-Version:        0.9.15b
-Release:        4%{?dist}
+Version:        0.9.16
+Release:        1%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -71,6 +71,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Oct 24 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-1
+- Update to 0.9.16.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.15b-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 24 19:31:28 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 12:31:28 -0700
Subject: rpms/cobbler/FC-6 .cvsignore, 1.9, 1.10 cobbler.spec, 1.8,
	1.9 sources, 1.10, 1.11
Message-ID: <200610241931.k9OJVSd4013758@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13731

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Oct 2006 18:22:59 -0000	1.9
+++ .cvsignore	24 Oct 2006 19:30:58 -0000	1.10
@@ -6,3 +6,4 @@
 cobbler-0.2.6.tar.gz
 cobbler-0.2.7.tar.gz
 cobbler-0.2.8.tar.gz
+cobbler-0.2.9.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cobbler.spec	18 Oct 2006 18:22:59 -0000	1.8
+++ cobbler.spec	24 Oct 2006 19:30:58 -0000	1.9
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.8
+Version: 0.2.9
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -54,6 +54,9 @@
 
 %changelog
 
+* Tue Oct 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	18 Oct 2006 18:22:59 -0000	1.10
+++ sources	24 Oct 2006 19:30:58 -0000	1.11
@@ -1 +1 @@
-f6f86ccf17ad4bfbd167291cf748eb01  cobbler-0.2.8.tar.gz
+f2e55873a395b71b199d39501f51944e  cobbler-0.2.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 19:38:24 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 12:38:24 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.4, 1.5 cobbler.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610241938.k9OJcO0S013922@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13897

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Oct 2006 18:20:58 -0000	1.4
+++ .cvsignore	24 Oct 2006 19:37:54 -0000	1.5
@@ -1,3 +1,4 @@
 cobbler-0.1.1.tar.gz
 cobbler-0.2.7.tar.gz
 cobbler-0.2.8.tar.gz
+cobbler-0.2.9.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cobbler.spec	18 Oct 2006 18:20:58 -0000	1.3
+++ cobbler.spec	24 Oct 2006 19:37:54 -0000	1.4
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.8
+Version: 0.2.9
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -54,6 +54,9 @@
 
 %changelog
 
+* Tue Oct 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Oct 2006 18:20:58 -0000	1.4
+++ sources	24 Oct 2006 19:37:54 -0000	1.5
@@ -1 +1 @@
-f6f86ccf17ad4bfbd167291cf748eb01  cobbler-0.2.8.tar.gz
+f2e55873a395b71b199d39501f51944e  cobbler-0.2.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 19:40:29 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 12:40:29 -0700
Subject: rpms/koan/FC-6 .cvsignore, 1.4, 1.5 koan.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200610241940.k9OJeTdM014000@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13973

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream changes (see CHANGELOG)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Oct 2006 19:02:50 -0000	1.4
+++ .cvsignore	24 Oct 2006 19:39:58 -0000	1.5
@@ -1,3 +1,4 @@
 koan-0.1.1.tar.gz
 koan-0.2.1.tar.gz
 koan-0.2.2.tar.gz
+koan-0.2.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/koan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- koan.spec	18 Oct 2006 19:02:50 -0000	1.6
+++ koan.spec	24 Oct 2006 19:39:58 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.2
+Version: 0.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/~mdehaan/cobbler
+Url: http://cobbler.et.redhat.com/
 
 %description
 
@@ -26,14 +26,14 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -47,6 +47,13 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Tue Oct 24 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
+- Upstream changes (see CHANGELOG)
+
+* Wed Oct 18 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-2
+- Use __python instead of python, test RPM dir before deletion
+- Update URLs
+
 * Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
 - Upstream change -- support Python 2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Oct 2006 19:02:50 -0000	1.5
+++ sources	24 Oct 2006 19:39:58 -0000	1.6
@@ -1 +1 @@
-8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz
+34974b122210c2027e27da6524feffae  koan-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 19:42:18 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 12:42:18 -0700
Subject: rpms/koan/FC-5 .cvsignore, 1.3, 1.4 koan.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <200610241942.k9OJgIpR014044@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14018

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream changes (see CHANGELOG)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2006 15:52:53 -0000	1.3
+++ .cvsignore	24 Oct 2006 19:41:48 -0000	1.4
@@ -1,2 +1,3 @@
 koan-0.1.1.tar.gz
 koan-0.2.2.tar.gz
+koan-0.2.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/koan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- koan.spec	18 Oct 2006 15:52:53 -0000	1.5
+++ koan.spec	24 Oct 2006 19:41:48 -0000	1.6
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.2
+Version: 0.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/~mdehaan/cobbler
+Url: http://cobbler.et.redhat.com/
 
 %description
 
@@ -26,14 +26,14 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -47,6 +47,13 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Tue Oct 24 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
+- Upstream changes (see CHANGELOG)
+
+* Wed Oct 18 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-2
+- Use __python instead of python, test RPM dir before deletion
+- Update URLs
+
 * Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
 - Upstream change -- support Python 2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Oct 2006 15:52:53 -0000	1.4
+++ sources	24 Oct 2006 19:41:48 -0000	1.5
@@ -1,2 +1,3 @@
 d1b7df4a1fb022d345d79f3b182d769b  koan-0.1.1.tar.gz
 8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz
+34974b122210c2027e27da6524feffae  koan-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 19:48:58 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 24 Oct 2006 12:48:58 -0700
Subject: fedora-security/audit fc5,1.366,1.367 fc6,1.120,1.121
Message-ID: <200610241948.k9OJmwGo014099@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14079

Modified Files:
	fc5 fc6 
Log Message:
Note a new screen issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- fc5	23 Oct 2006 13:35:30 -0000	1.366
+++ fc5	24 Oct 2006 19:48:55 -0000	1.367
@@ -39,6 +39,7 @@
 CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) #205652
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
+CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7) [since FEDORA-2006-976]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- fc6	23 Oct 2006 14:32:31 -0000	1.120
+++ fc6	24 Oct 2006 19:48:55 -0000	1.121
@@ -37,6 +37,7 @@
 CVE-2006-4624 version (mailman, fixed 2.1.9rc1)
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1)
 CVE-2006-4600 version (openldap, fixed 2.3.25)
+CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7)
 CVE-2006-4570 version (thunderbird, fixed 1.5.0.7)



From fedora-extras-commits at redhat.com  Tue Oct 24 20:17:59 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 24 Oct 2006 13:17:59 -0700
Subject: rpms/tuxpaint-stamps/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tuxpaint-stamps.spec, 1.1, 1.2
Message-ID: <200610242017.k9OKHxAR017252@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/tuxpaint-stamps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17218

Modified Files:
	.cvsignore sources tuxpaint-stamps.spec 
Log Message:
Update to 2006.10.21.
Remove a little extra whitespace in the spec.
Just include docs/*.txt.
Use version macro in Source0 URL.
Use "install-all" target.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint-stamps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2006 01:04:32 -0000	1.2
+++ .cvsignore	24 Oct 2006 20:17:29 -0000	1.3
@@ -1 +1 @@
-tuxpaint-stamps-2005.11.25.tar.gz
+tuxpaint-stamps-2006.10.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint-stamps/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2006 01:04:32 -0000	1.2
+++ sources	24 Oct 2006 20:17:29 -0000	1.3
@@ -1 +1 @@
-6edf92504b1b9f9943e3b28011738691  tuxpaint-stamps-2005.11.25.tar.gz
+ea2cc00cf268ad2c59f1f27673e1c0ff  tuxpaint-stamps-2006.10.21.tar.gz


Index: tuxpaint-stamps.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint-stamps/devel/tuxpaint-stamps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxpaint-stamps.spec	14 Sep 2006 01:04:32 -0000	1.1
+++ tuxpaint-stamps.spec	24 Oct 2006 20:17:29 -0000	1.2
@@ -1,14 +1,12 @@
 Name:           tuxpaint-stamps
-Version:        2005.11.25
+Version:        2006.10.21
 Release:        1%{?dist}
 Summary:        Extra stamp files for tuxpaint
-
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.tuxpaint.org/
-Source0:        http://dl.sourceforge.net/tuxpaint/tuxpaint-stamps-2005.11.25.tar.gz
+Source0:        http://dl.sourceforge.net/tuxpaint/tuxpaint-stamps-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  python gettext
 Requires:       tuxpaint
@@ -16,7 +14,6 @@
 %description
 This package is a collection of 'rubber stamps' for Tux Paint's "Stamp" tool.
 
-
 %prep
 %setup -q
 
@@ -32,7 +29,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/tuxpaint/stamps
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make install-all PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 pushd po
 for file in *.po ; do
@@ -44,14 +41,12 @@
 
 %find_lang %{name}
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc docs/CHANGES.txt docs/CONTRIBUTORS.txt docs/COPYING.txt docs/README.txt docs/TODO.txt
+%doc docs/*.txt
 %lang(el) %doc docs/el
 %lang(es) %doc docs/es
 %lang(fr) %doc docs/fr
@@ -59,9 +54,13 @@
 %defattr(0644,root,root,0755)
 %{_datadir}/tuxpaint/stamps/*
 
-
-
 %changelog
+* Tue Oct 24 2006 Steven Pritchard <steve at kspei.com> 2006.10.21-1
+- Update to 2006.10.21.
+- Remove a little extra whitespace in the spec.
+- Just include docs/*.txt.
+- Use version macro in Source0 URL.
+- Use "install-all" target.
+
 * Mon Aug 28 2006 Wart <wart at kobold dot org> 2005.11.25-1
 - Initial Fedora Extras package
-



From fedora-extras-commits at redhat.com  Tue Oct 24 20:26:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 24 Oct 2006 13:26:21 -0700
Subject: rpms/imlib2/devel .cvsignore, 1.5, 1.6 imlib2.spec, 1.22,
	1.23 sources, 1.6, 1.7
Message-ID: <200610242026.k9OKQL8n017349@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17329

Modified Files:
	.cvsignore imlib2.spec sources 
Log Message:
* Tue Oct 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
- New upstream release 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jul 2006 09:07:44 -0000	1.5
+++ .cvsignore	24 Oct 2006 20:25:51 -0000	1.6
@@ -1 +1 @@
-imlib2-1.2.2.tar.gz
+imlib2-1.3.0.tar.gz


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- imlib2.spec	28 Aug 2006 14:11:38 -0000	1.22
+++ imlib2.spec	24 Oct 2006 20:25:51 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
-Version:	1.2.2
-Release:	2%{?dist}
+Version:	1.3.0
+Release:	1%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.enlightenment.org/Libraries/Imlib2/
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
+- New upstream release 1.3.0
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-2
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jul 2006 09:07:44 -0000	1.6
+++ sources	24 Oct 2006 20:25:51 -0000	1.7
@@ -1 +1 @@
-07b2a7745ddd3c7c4480b50cb916174c  imlib2-1.2.2.tar.gz
+00b724fc6d2dcfa3045bb6a554bb2c8a  imlib2-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 20:28:21 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 24 Oct 2006 13:28:21 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py, 1.8, 1.9 Push.py,
	1.6, 1.7 RepoBuild.py, 1.2, 1.3 Utils.py, 1.2, 1.3 MultiLib.py,
	1.8, 1.9
Message-ID: <200610242028.k9OKSLW2017418@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17389

Modified Files:
	Config_Extras.py Push.py RepoBuild.py Utils.py MultiLib.py 
Log Message:
Utils.py:
- make the create_repo* helper functions more flexible
- add reusable *repodirs functions

RepoBuild.py, MultiLib.py:
- use the modified Utils.create_repository()

Push.py, Config_*.py:
- make it possible to divert signed packages and install them into
  a place outside the default repository
- use new Utils.*repodirs() functions




Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Config_Extras.py	23 Oct 2006 23:00:19 -0000	1.8
+++ Config_Extras.py	24 Oct 2006 20:28:19 -0000	1.9
@@ -74,6 +74,9 @@
 # repository symlinks to remove/create since they confuse createrepo
 repobuild_linkdict = {}
 
+diversion_dict = { 'mugshot' : stagesdir+'/fedora-extras'+'/mugshot',
+                   }
+
 # For RepoSupport.py features (TODO: use rpmUtils?)
 targetarchs = { 'i386' : 'i686',
                 'x86_64' : 'x86_64',


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Push.py	23 Oct 2006 11:24:35 -0000	1.6
+++ Push.py	24 Oct 2006 20:28:19 -0000	1.7
@@ -292,11 +292,11 @@
     pass
 
 
-def push(dist,needsignroot,destroot,name,pkgrelroot):
+def push(dist,needsignroot,destroot,name,pkgrelroot,buildreport=True):
     """push the files found within a single package build-results directory"""
     rollback = []
     try:
-        push_with_rollback(rollback,dist,needsignroot,destroot,name,pkgrelroot)
+        push_with_rollback(rollback,dist,needsignroot,destroot,name,pkgrelroot,buildreport)
     except:
         print 'ERROR: Rollback:', rollback
         for f in rollback:
@@ -309,7 +309,7 @@
         raise
 
 
-def push_with_rollback(rollback,dist,needsignroot,destroot,name,pkgrelroot):
+def push_with_rollback(rollback,dist,needsignroot,destroot,name,pkgrelroot,buildreport):
     print '  %s-%s' % (name,os.path.basename(pkgrelroot))
     
     filedict = {}
@@ -401,7 +401,8 @@
     # Mark successfully signed packages as PUSHED.
     mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
     rollback = []
-    rundirfile.write(buildreportinfo)
+    if buildreport:
+        rundirfile.write(buildreportinfo)
     rundirfile.close()
     
 
@@ -413,13 +414,11 @@
     distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
     needsignroot = os.path.join(cfg.stagesdir, distdir)
     destroot = os.path.join(cfg.treedir, dist)
+    if not DEBUG and not os.path.exists(destroot):
+        os.makedirs(destroot)
     changed = False
     
-    repodirs = [os.path.join(destroot, 'SRPMS')]
-    for arch in cfg.archdict[dist]:
-        repodirs.append(os.path.join(destroot, arch))
-        repodirs.append(os.path.join(destroot, arch, 'debug'))
-    for repodir in repodirs:
+    for repodir in Utils.get_std_repodirs(cfg,dist,destroot):
         # We check for changes already here in case the repo has changed
         # due to external activities such as removing files etc, and will
         # recheck it again later if needed when we're done with this sign
@@ -484,8 +483,17 @@
         results = get_build_results(signtmpdir)
         for (name,pkgrelroots) in results:
             for pkgrelroot in pkgrelroots:
+                if name in cfg.diversion_dict:  # install this elsewhere?
+                    buildreport = False
+                    targetroot = os.path.join(cfg.diversion_dict[name],dist)
+                    if os.path.exists(targetroot):
+                        shutil.rmtree(targetroot)
+                    Utils.make_std_repodirs(cfg,dist,targetroot)
+                else:
+                    buildreport = True
+                    targetroot = destroot
                 try:
-                    push(dist,needsignroot,destroot,name,pkgrelroot)
+                    push(dist,needsignroot,targetroot,name,pkgrelroot,buildreport)
                 except PushWarning, e:
                     print e
     except:
@@ -497,7 +505,7 @@
 
     # All done, now check if something changed unless we already know it did:
     if not changed:
-        for repodir in repodirs:
+        for repodir in Utils.get_std_repodirs(cfg,dist,destroot):
             changed = Utils.is_repo_changed(repodir)
             if changed:
                 Utils.debugprint("Dist %s (%s) was changed" % (dist, repodir))


Index: RepoBuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoBuild.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepoBuild.py	29 Sep 2006 23:53:41 -0000	1.2
+++ RepoBuild.py	24 Oct 2006 20:28:19 -0000	1.3
@@ -23,16 +23,18 @@
         print "No distribution release named '%s' found" % dist
         sys.exit(errno.EINVAL)
 
-    Utils.create_src_repo(cfg,dist)  # source rpms
+    reporoot = os.path.join(cfg.treedir, dist)
+    repodir = os.path.join(reporoot,'SRPMS')
+    Utils.create_repository(cfg,repodir,debuginfo=False)  # source rpms
 
     # get rid of symlinks that are in the way (of createrepo)
     for link in cfg.repobuild_linkdict.get(dist) or []:
-        flink = os.path.join(cfg.treedir, dist, link)
+        flink = os.path.join(reporoot, link)
         if os.path.exists(flink):
             os.unlink(flink)
 
     for arch in cfg.archdict[dist]:
-        Utils.create_arch_repo(cfg,dist,arch)  # binary+debuginfo rpms
+        Utils.create_repository(cfg,os.path.join(reporoot,arch))  # binary+debuginfo rpms
 
     # recreate symlinks
     for link in cfg.repobuild_linkdict.get(dist) or []:


Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Utils.py	29 Sep 2006 16:23:13 -0000	1.2
+++ Utils.py	24 Oct 2006 20:28:19 -0000	1.3
@@ -111,8 +111,9 @@
         install_copy(src,dest)
 
 
-def create_repository(cfg,repodir):
-    """create/update repository metadata for a given directory"""
+def create_repository(cfg,repodir,debuginfo=True):
+    """create/update repository metadata for a given directory and
+    consider a 'debug' sub-repository by default"""
 
     print 'Creating repository %s' % repodir
     
@@ -131,26 +132,17 @@
     if os.path.exists( os.path.join(repodir,compsname) ):
         compsarg = '-g %s ' % compsname
     excludearg = ''
-    if os.path.exists( os.path.join(repodir,'debug') ):
+    if debuginfo and os.path.exists( os.path.join(repodir,'debug') ):
         excludearg = "-x \'*debuginfo*\'"
     cmd = '%s -c %s -q %s %s %s' % (cfg.createrepo, cfg.cr_cachedir, compsarg, excludearg, repodir)
     run_and_check(cmd)
-
-
-def create_arch_repo(cfg,dist,arch):
-    """create/update repository metadata for a given dist+arch pair and
-its 'debug' sub-directory, if available"""
-    repodir = os.path.join(cfg.treedir, dist, arch)
-    create_repository(cfg,repodir)
-    # If there's a debug subdir, make that a repo, too.
-    dbg_repodir = os.path.join(repodir, 'debug')
-    if os.path.exists(dbg_repodir):
-        create_repository(cfg,dbg_repodir)
-
-
-def create_src_repo(cfg,dist):
-    """create/update repository metadata for a given dist"""
-    create_repository( cfg, os.path.join(cfg.treedir,dist,'SRPMS') )
+    if debuginfo:
+        # If there's a debug subdir, make that a repo, too.
+        dbg_repodir = os.path.join(repodir, 'debug')
+        if os.path.exists(dbg_repodir):
+            print 'Creating repository %s' % dbg_repodir
+            cmd = '%s -c %s -q %s' % (cfg.createrepo, cfg.cr_cachedir, dbg_repodir)
+            run_and_check(cmd)
 
 
 def is_repo_changed(repodir):
@@ -183,6 +175,24 @@
     return False
 
 
+def get_std_repodirs(cfg,dist,reporoot):
+    """return list of all repository directories (below reporoot) for
+    this distribution version"""
+    repodirs = [os.path.join(reporoot,'SRPMS')]
+    for arch in cfg.archdict[dist]:
+        repodirs.append(os.path.join(reporoot,arch))
+        repodirs.append(os.path.join(reporoot,arch,'debug'))
+    return repodirs
+
+
+def make_std_repodirs(cfg,dist,reporoot):
+    """create all repository directories (below reporoot) for
+    this distribution version, if they don't exist"""
+    for repodir in get_std_repodirs(cfg,dist,reporoot):
+        if not DEBUG and not os.path.exists(repodir):
+            os.makedirs(repodir)
+
+                     
 def fix_mdcache_access(workdir,cachedir):
 # Work around explicit directory mode 0755 in yum/repos.py (that
 # is too restrictive for our extras_signers group) and an utime


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MultiLib.py	19 Oct 2006 22:56:40 -0000	1.8
+++ MultiLib.py	24 Oct 2006 20:28:19 -0000	1.9
@@ -296,7 +296,7 @@
         for arch in cfg.archdict[dist]:  # list of repo archs
             changedagain = resolveMissing(cfg,dist,arch)
             if changedagain:
-                Utils.create_arch_repo(cfg,dist,arch)
+                Utils.create_repository(cfg,os.path.join(cfg.treedir,dist,arch))
 
 
 if __name__ == '__main__':



From fedora-extras-commits at redhat.com  Tue Oct 24 21:55:57 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 14:55:57 -0700
Subject: rpms/cobbler/FC-6 .cvsignore, 1.10, 1.11 cobbler.spec, 1.9,
	1.10 sources, 1.11, 1.12
Message-ID: <200610242155.k9OLtvTH021224@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21189

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + adding some config files as (noreplace)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2006 19:30:58 -0000	1.10
+++ .cvsignore	24 Oct 2006 21:55:27 -0000	1.11
@@ -7,3 +7,4 @@
 cobbler-0.2.7.tar.gz
 cobbler-0.2.8.tar.gz
 cobbler-0.2.9.tar.gz
+cobbler-0.3.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cobbler.spec	24 Oct 2006 19:30:58 -0000	1.9
+++ cobbler.spec	24 Oct 2006 21:55:27 -0000	1.10
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.9
+Version: 0.3.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,8 +39,9 @@
 %defattr(-,root,root)
 %{_bindir}/cobbler
 %dir /etc/cobbler
-/etc/cobbler/*.ks
-/etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.ks
+%config(noreplace) /etc/cobbler/kickstart_fc5.ks
+%config(noreplace) /etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -54,7 +55,12 @@
 
 %changelog
 
-* Tue Oct 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
+* Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.0-1
+- Upstream changes (see CHANGELOG)
+- Marked files in /etc/cobbler as config
+- Marked /etc/cobbler/dhcpd.template as noreplace 
+
+* Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
 - Upstream changes (see CHANGELOG)
 
 * Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2006 19:30:58 -0000	1.11
+++ sources	24 Oct 2006 21:55:27 -0000	1.12
@@ -1 +1 @@
-f2e55873a395b71b199d39501f51944e  cobbler-0.2.9.tar.gz
+e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 21:58:42 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 14:58:42 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.5, 1.6 cobbler.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610242158.k9OLwgw6021295@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG) plus moving some config files to (noreplace)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Oct 2006 19:37:54 -0000	1.5
+++ .cvsignore	24 Oct 2006 21:58:12 -0000	1.6
@@ -2,3 +2,4 @@
 cobbler-0.2.7.tar.gz
 cobbler-0.2.8.tar.gz
 cobbler-0.2.9.tar.gz
+cobbler-0.3.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cobbler.spec	24 Oct 2006 19:37:54 -0000	1.4
+++ cobbler.spec	24 Oct 2006 21:58:12 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.9
+Version: 0.3.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,8 +39,9 @@
 %defattr(-,root,root)
 %{_bindir}/cobbler
 %dir /etc/cobbler
-/etc/cobbler/*.ks
-/etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.ks
+%config(noreplace) /etc/cobbler/kickstart_fc5.ks
+%config(noreplace) /etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -54,7 +55,12 @@
 
 %changelog
 
-* Tue Oct 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
+* Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.0-1
+- Upstream changes (see CHANGELOG)
+- Marked files in /etc/cobbler as config
+- Marked /etc/cobbler/dhcpd.template as noreplace 
+
+* Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
 - Upstream changes (see CHANGELOG)
 
 * Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Oct 2006 19:37:54 -0000	1.5
+++ sources	24 Oct 2006 21:58:12 -0000	1.6
@@ -1 +1 @@
-f2e55873a395b71b199d39501f51944e  cobbler-0.2.9.tar.gz
+e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 22:38:39 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 15:38:39 -0700
Subject: rpms/pygpgme/devel pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242238.k9OMcdY1024524@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24500

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/devel/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:38:09 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Tue Oct 24 22:41:41 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 24 Oct 2006 15:41:41 -0700
Subject: extras-buildsys/utils/pushscript Utils.py,1.3,1.4
Message-ID: <200610242241.k9OMffK6024591@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24572

Modified Files:
	Utils.py 
Log Message:
"help" old createrepo here too


Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Utils.py	24 Oct 2006 20:28:19 -0000	1.3
+++ Utils.py	24 Oct 2006 22:41:38 -0000	1.4
@@ -136,11 +136,16 @@
         excludearg = "-x \'*debuginfo*\'"
     cmd = '%s -c %s -q %s %s %s' % (cfg.createrepo, cfg.cr_cachedir, compsarg, excludearg, repodir)
     run_and_check(cmd)
+    
     if debuginfo:
         # If there's a debug subdir, make that a repo, too.
         dbg_repodir = os.path.join(repodir, 'debug')
         if os.path.exists(dbg_repodir):
             print 'Creating repository %s' % dbg_repodir
+            rpdata = os.path.join(dbg_repodir, 'repodata')  # see above
+            debugprint('removing tree %s' % rpdata)
+            if os.path.exists(rpdata) and not DEBUG:
+                shutil.rmtree(rpdata)
             cmd = '%s -c %s -q %s' % (cfg.createrepo, cfg.cr_cachedir, dbg_repodir)
             run_and_check(cmd)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 22:46:30 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 15:46:30 -0700
Subject: rpms/pygpgme/FC-6 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242246.k9OMkUd9024641@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24622

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-6/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:46:00 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Tue Oct 24 22:51:03 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 15:51:03 -0700
Subject: rpms/pygpgme/FC-5 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242251.k9OMp3nm024721@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24702

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-5/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:50:33 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Tue Oct 24 22:57:31 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 15:57:31 -0700
Subject: rpms/pygpgme/FC-4 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242257.k9OMvVAQ024796@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24777

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-4/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:57:00 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Tue Oct 24 23:00:50 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 16:00:50 -0700
Subject: rpms/pygpgme/FC-3 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242300.k9ON0oBw024887@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24864

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-3/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 23:00:20 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Wed Oct 25 00:34:09 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 17:34:09 -0700
Subject: rpms/torque/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 torque.spec, 1.17, 1.18
Message-ID: <200610250034.k9P0Y9Ir031802@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31782

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Oct 2006 22:40:33 -0000	1.10
+++ .cvsignore	25 Oct 2006 00:33:38 -0000	1.11
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2006 22:40:33 -0000	1.10
+++ sources	25 Oct 2006 00:33:38 -0000	1.11
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- torque.spec	21 Oct 2006 22:40:33 -0000	1.17
+++ torque.spec	25 Oct 2006 00:33:38 -0000	1.18
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:03:45 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 18:03:45 -0700
Subject: rpms/torque/FC-6 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 torque.spec, 1.17, 1.18
Message-ID: <200610250103.k9P13jYN002395@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2367

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Oct 2006 22:40:33 -0000	1.10
+++ .cvsignore	25 Oct 2006 01:03:14 -0000	1.11
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2006 22:40:33 -0000	1.10
+++ sources	25 Oct 2006 01:03:14 -0000	1.11
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-6/torque.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- torque.spec	21 Oct 2006 22:40:33 -0000	1.17
+++ torque.spec	25 Oct 2006 01:03:14 -0000	1.18
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:05:45 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 18:05:45 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 torque.spec, 1.14, 1.15
Message-ID: <200610250105.k9P15jkk002463@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2443

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Oct 2006 23:27:30 -0000	1.10
+++ .cvsignore	25 Oct 2006 01:05:14 -0000	1.11
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2006 23:27:30 -0000	1.10
+++ sources	25 Oct 2006 01:05:14 -0000	1.11
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- torque.spec	21 Oct 2006 23:27:30 -0000	1.14
+++ torque.spec	25 Oct 2006 01:05:14 -0000	1.15
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:06:44 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 18:06:44 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 torque.spec, 1.12, 1.13
Message-ID: <200610250106.k9P16i0C002530@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2507

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Oct 2006 23:29:02 -0000	1.10
+++ .cvsignore	25 Oct 2006 01:06:13 -0000	1.11
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2006 23:29:02 -0000	1.10
+++ sources	25 Oct 2006 01:06:13 -0000	1.11
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- torque.spec	21 Oct 2006 23:29:02 -0000	1.12
+++ torque.spec	25 Oct 2006 01:06:13 -0000	1.13
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:07:48 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 18:07:48 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 torque.spec, 1.11, 1.12
Message-ID: <200610250107.k9P17mYY002650@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2630

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Oct 2006 23:29:46 -0000	1.9
+++ .cvsignore	25 Oct 2006 01:07:18 -0000	1.10
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Oct 2006 23:29:46 -0000	1.9
+++ sources	25 Oct 2006 01:07:18 -0000	1.10
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- torque.spec	21 Oct 2006 23:29:46 -0000	1.11
+++ torque.spec	25 Oct 2006 01:07:18 -0000	1.12
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:44:45 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 24 Oct 2006 18:44:45 -0700
Subject: rpms/nagios-plugins/FC-4 nagios-plugins.spec, 1.14, 1.15 sources,
	1.4, 1.5
Message-ID: <200610250144.k9P1ijSb002904@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840/FC-4

Modified Files:
	nagios-plugins.spec sources 
Log Message:
upstream released new version
Added software raid check
Added check_apt
removed check_ide_smart



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-4/nagios-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nagios-plugins.spec	29 Sep 2006 17:12:52 -0000	1.14
+++ nagios-plugins.spec	25 Oct 2006 01:44:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.3
-Release: 20%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -55,6 +55,14 @@
 %description all
 This package provides all Nagios plugins.
 
+%package apt
+Summary: Nagios Plugin - check_apt
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description apt
+Provides check_apt support for Nagios.
+
 %package breeze
 Summary: Nagios Plugin - check_breeze
 Group: Applications/System
@@ -174,13 +182,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-%package ide_smart
-Summary: Nagios Plugin - check_ide_smart
-Group: Applications/System
-Requires: nagios-plugins = %{version}-%{release}
+#%package ide_smart
+#Summary: Nagios Plugin - check_ide_smart
+#Group: Applications/System
+#Requires: nagios-plugins = %{version}-%{release}
 
-%description ide_smart
-Provides check_ide_smart support for Nagios.
+#%description ide_smart
+#Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -214,6 +222,14 @@
 %description ldap
 Provides check_ldap and check_ldaps support for Nagios.
 
+%package linux_raid
+Summary: Nagios Plugin - check_linux_raid
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description linux_raid
+Provides check_linux_raid (software raid) support for Nagios.
+
 %package load
 Summary: Nagios Plugin - check_load
 Group: Applications/System
@@ -499,9 +515,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-cd plugins
-make check_ide_smart
-cd ..
+#cd plugins
+#make check_ide_smart
+#cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -509,7 +525,8 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -524,6 +541,10 @@
 
 %files all
 
+%files apt
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_apt
+
 %files breeze
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
@@ -576,12 +597,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-%files ide_smart
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+#%files ide_smart
+#%defattr(-,root,root,-)
+#%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
-%defattr(4750,root,root,-)
+%defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
@@ -601,6 +622,10 @@
 %{_libdir}/nagios/plugins/check_ldap
 %{_libdir}/nagios/plugins/check_ldaps
 
+%files linux_raid
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_linux_raid.pl
+
 %files load
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_load
@@ -717,7 +742,6 @@
 %{_libdir}/nagios/plugins/check_simap
 %{_libdir}/nagios/plugins/check_spop
 %{_libdir}/nagios/plugins/check_ssmtp
-%{_libdir}/nagios/plugins/check_udp2
 
 %files time
 %defattr(-,root,root,-)
@@ -749,11 +773,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Fri Sep 29 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-20
-- check_icmp is now suid root as per #208232
-
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-19
-- Rebuild for FC6
+* Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
+- Upstream new version
+- Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
+- Added check_apt
+- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 15:04:24 -0000	1.4
+++ sources	25 Oct 2006 01:44:15 -0000	1.5
@@ -1 +1 @@
-2c40fc69d51cc979e85150870a1daa93  nagios-plugins-1.4.3.tar.gz
+e27849f268ab04014bfbbd19d9af1333  nagios-plugins-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 01:44:46 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 24 Oct 2006 18:44:46 -0700
Subject: rpms/nagios-plugins/FC-6 nagios-plugins.spec, 1.18, 1.19 sources,
	1.4, 1.5
Message-ID: <200610250144.k9P1ikd0002912@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840/FC-6

Modified Files:
	nagios-plugins.spec sources 
Log Message:
upstream released new version
Added software raid check
Added check_apt
removed check_ide_smart



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-6/nagios-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nagios-plugins.spec	29 Sep 2006 17:12:53 -0000	1.18
+++ nagios-plugins.spec	25 Oct 2006 01:44:16 -0000	1.19
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.3
-Release: 20%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -55,6 +55,14 @@
 %description all
 This package provides all Nagios plugins.
 
+%package apt
+Summary: Nagios Plugin - check_apt
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description apt
+Provides check_apt support for Nagios.
+
 %package breeze
 Summary: Nagios Plugin - check_breeze
 Group: Applications/System
@@ -174,13 +182,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-%package ide_smart
-Summary: Nagios Plugin - check_ide_smart
-Group: Applications/System
-Requires: nagios-plugins = %{version}-%{release}
+#%package ide_smart
+#Summary: Nagios Plugin - check_ide_smart
+#Group: Applications/System
+#Requires: nagios-plugins = %{version}-%{release}
 
-%description ide_smart
-Provides check_ide_smart support for Nagios.
+#%description ide_smart
+#Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -214,6 +222,14 @@
 %description ldap
 Provides check_ldap and check_ldaps support for Nagios.
 
+%package linux_raid
+Summary: Nagios Plugin - check_linux_raid
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description linux_raid
+Provides check_linux_raid (software raid) support for Nagios.
+
 %package load
 Summary: Nagios Plugin - check_load
 Group: Applications/System
@@ -499,9 +515,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-cd plugins
-make check_ide_smart
-cd ..
+#cd plugins
+#make check_ide_smart
+#cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -509,7 +525,8 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -524,6 +541,10 @@
 
 %files all
 
+%files apt
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_apt
+
 %files breeze
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
@@ -576,12 +597,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-%files ide_smart
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+#%files ide_smart
+#%defattr(-,root,root,-)
+#%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
-%defattr(4750,root,root,-)
+%defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
@@ -601,6 +622,10 @@
 %{_libdir}/nagios/plugins/check_ldap
 %{_libdir}/nagios/plugins/check_ldaps
 
+%files linux_raid
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_linux_raid.pl
+
 %files load
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_load
@@ -717,7 +742,6 @@
 %{_libdir}/nagios/plugins/check_simap
 %{_libdir}/nagios/plugins/check_spop
 %{_libdir}/nagios/plugins/check_ssmtp
-%{_libdir}/nagios/plugins/check_udp2
 
 %files time
 %defattr(-,root,root,-)
@@ -749,11 +773,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Fri Sep 29 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-20
-- check_icmp is now suid root as per #208232
-
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-19
-- Rebuild for FC6
+* Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
+- Upstream new version
+- Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
+- Added check_apt
+- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 15:04:30 -0000	1.4
+++ sources	25 Oct 2006 01:44:16 -0000	1.5
@@ -1 +1 @@
-2c40fc69d51cc979e85150870a1daa93  nagios-plugins-1.4.3.tar.gz
+e27849f268ab04014bfbbd19d9af1333  nagios-plugins-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 01:44:46 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 24 Oct 2006 18:44:46 -0700
Subject: rpms/nagios-plugins/FC-5 nagios-plugins.spec, 1.14, 1.15 sources,
	1.4, 1.5
Message-ID: <200610250144.k9P1ikBK002908@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840/FC-5

Modified Files:
	nagios-plugins.spec sources 
Log Message:
upstream released new version
Added software raid check
Added check_apt
removed check_ide_smart



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-5/nagios-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nagios-plugins.spec	29 Sep 2006 17:12:53 -0000	1.14
+++ nagios-plugins.spec	25 Oct 2006 01:44:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.3
-Release: 20%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -55,6 +55,14 @@
 %description all
 This package provides all Nagios plugins.
 
+%package apt
+Summary: Nagios Plugin - check_apt
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description apt
+Provides check_apt support for Nagios.
+
 %package breeze
 Summary: Nagios Plugin - check_breeze
 Group: Applications/System
@@ -174,13 +182,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-%package ide_smart
-Summary: Nagios Plugin - check_ide_smart
-Group: Applications/System
-Requires: nagios-plugins = %{version}-%{release}
+#%package ide_smart
+#Summary: Nagios Plugin - check_ide_smart
+#Group: Applications/System
+#Requires: nagios-plugins = %{version}-%{release}
 
-%description ide_smart
-Provides check_ide_smart support for Nagios.
+#%description ide_smart
+#Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -214,6 +222,14 @@
 %description ldap
 Provides check_ldap and check_ldaps support for Nagios.
 
+%package linux_raid
+Summary: Nagios Plugin - check_linux_raid
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description linux_raid
+Provides check_linux_raid (software raid) support for Nagios.
+
 %package load
 Summary: Nagios Plugin - check_load
 Group: Applications/System
@@ -499,9 +515,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-cd plugins
-make check_ide_smart
-cd ..
+#cd plugins
+#make check_ide_smart
+#cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -509,7 +525,8 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -524,6 +541,10 @@
 
 %files all
 
+%files apt
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_apt
+
 %files breeze
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
@@ -576,12 +597,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-%files ide_smart
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+#%files ide_smart
+#%defattr(-,root,root,-)
+#%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
-%defattr(4750,root,root,-)
+%defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
@@ -601,6 +622,10 @@
 %{_libdir}/nagios/plugins/check_ldap
 %{_libdir}/nagios/plugins/check_ldaps
 
+%files linux_raid
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_linux_raid.pl
+
 %files load
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_load
@@ -717,7 +742,6 @@
 %{_libdir}/nagios/plugins/check_simap
 %{_libdir}/nagios/plugins/check_spop
 %{_libdir}/nagios/plugins/check_ssmtp
-%{_libdir}/nagios/plugins/check_udp2
 
 %files time
 %defattr(-,root,root,-)
@@ -749,11 +773,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Fri Sep 29 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-20
-- check_icmp is now suid root as per #208232
-
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-19
-- Rebuild for FC6
+* Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
+- Upstream new version
+- Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
+- Added check_apt
+- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 15:04:24 -0000	1.4
+++ sources	25 Oct 2006 01:44:15 -0000	1.5
@@ -1 +1 @@
-2c40fc69d51cc979e85150870a1daa93  nagios-plugins-1.4.3.tar.gz
+e27849f268ab04014bfbbd19d9af1333  nagios-plugins-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 01:44:47 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 24 Oct 2006 18:44:47 -0700
Subject: rpms/nagios-plugins/devel .cvsignore, 1.4, 1.5 nagios-plugins.spec, 
	1.18, 1.19 sources, 1.4, 1.5
Message-ID: <200610250144.k9P1ilTl002917@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840/devel

Modified Files:
	.cvsignore nagios-plugins.spec sources 
Log Message:
upstream released new version
Added software raid check
Added check_apt
removed check_ide_smart



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2006 15:04:30 -0000	1.4
+++ .cvsignore	25 Oct 2006 01:44:17 -0000	1.5
@@ -1 +1 @@
-nagios-plugins-1.4.3.tar.gz
+nagios-plugins-1.4.4.tar.gz


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nagios-plugins.spec	29 Sep 2006 17:12:53 -0000	1.18
+++ nagios-plugins.spec	25 Oct 2006 01:44:17 -0000	1.19
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.3
-Release: 20%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -55,6 +55,14 @@
 %description all
 This package provides all Nagios plugins.
 
+%package apt
+Summary: Nagios Plugin - check_apt
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description apt
+Provides check_apt support for Nagios.
+
 %package breeze
 Summary: Nagios Plugin - check_breeze
 Group: Applications/System
@@ -174,13 +182,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-%package ide_smart
-Summary: Nagios Plugin - check_ide_smart
-Group: Applications/System
-Requires: nagios-plugins = %{version}-%{release}
+#%package ide_smart
+#Summary: Nagios Plugin - check_ide_smart
+#Group: Applications/System
+#Requires: nagios-plugins = %{version}-%{release}
 
-%description ide_smart
-Provides check_ide_smart support for Nagios.
+#%description ide_smart
+#Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -214,6 +222,14 @@
 %description ldap
 Provides check_ldap and check_ldaps support for Nagios.
 
+%package linux_raid
+Summary: Nagios Plugin - check_linux_raid
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description linux_raid
+Provides check_linux_raid (software raid) support for Nagios.
+
 %package load
 Summary: Nagios Plugin - check_load
 Group: Applications/System
@@ -499,9 +515,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-cd plugins
-make check_ide_smart
-cd ..
+#cd plugins
+#make check_ide_smart
+#cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -509,7 +525,8 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -524,6 +541,10 @@
 
 %files all
 
+%files apt
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_apt
+
 %files breeze
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
@@ -576,12 +597,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-%files ide_smart
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+#%files ide_smart
+#%defattr(-,root,root,-)
+#%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
-%defattr(4750,root,root,-)
+%defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
@@ -601,6 +622,10 @@
 %{_libdir}/nagios/plugins/check_ldap
 %{_libdir}/nagios/plugins/check_ldaps
 
+%files linux_raid
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_linux_raid.pl
+
 %files load
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_load
@@ -717,7 +742,6 @@
 %{_libdir}/nagios/plugins/check_simap
 %{_libdir}/nagios/plugins/check_spop
 %{_libdir}/nagios/plugins/check_ssmtp
-%{_libdir}/nagios/plugins/check_udp2
 
 %files time
 %defattr(-,root,root,-)
@@ -749,11 +773,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Fri Sep 29 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-20
-- check_icmp is now suid root as per #208232
-
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-19
-- Rebuild for FC6
+* Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
+- Upstream new version
+- Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
+- Added check_apt
+- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 15:04:30 -0000	1.4
+++ sources	25 Oct 2006 01:44:17 -0000	1.5
@@ -1 +1 @@
-2c40fc69d51cc979e85150870a1daa93  nagios-plugins-1.4.3.tar.gz
+e27849f268ab04014bfbbd19d9af1333  nagios-plugins-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 05:26:20 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 24 Oct 2006 22:26:20 -0700
Subject: rpms/php-pecl-zip/FC-6 .cvsignore, 1.6, 1.7 php-pecl-zip.spec, 1.6, 
	1.7 sources, 1.6, 1.7
Message-ID: <200610250526.k9P5QKI5015911@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15891

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	update to 1.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 15:43:06 -0000	1.6
+++ .cvsignore	25 Oct 2006 05:25:50 -0000	1.7
@@ -1 +1 @@
-zip-1.7.4.tgz
+zip-1.7.5.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/php-pecl-zip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-zip.spec	28 Sep 2006 15:43:06 -0000	1.6
+++ php-pecl-zip.spec	25 Oct 2006 05:25:50 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.4
+Version:      1.7.5
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Tue Oct 24 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Wed Sep 27 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 15:43:06 -0000	1.6
+++ sources	25 Oct 2006 05:25:50 -0000	1.7
@@ -1 +1 @@
-dccdc45aef30e9759deb6f93dd863dfd  zip-1.7.4.tgz
+e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz



From fedora-extras-commits at redhat.com  Wed Oct 25 05:27:59 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 24 Oct 2006 22:27:59 -0700
Subject: rpms/php-pecl-zip/FC-5 .cvsignore, 1.6, 1.7 php-pecl-zip.spec, 1.5, 
	1.6 sources, 1.6, 1.7
Message-ID: <200610250527.k9P5RxF6015981@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15961

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	update to 1.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 15:44:35 -0000	1.6
+++ .cvsignore	25 Oct 2006 05:27:29 -0000	1.7
@@ -1 +1 @@
-zip-1.7.4.tgz
+zip-1.7.5.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/php-pecl-zip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-zip.spec	28 Sep 2006 15:44:35 -0000	1.5
+++ php-pecl-zip.spec	25 Oct 2006 05:27:29 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.4
+Version:      1.7.5
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Tue Oct 24 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Wed Sep 27 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 15:44:35 -0000	1.6
+++ sources	25 Oct 2006 05:27:29 -0000	1.7
@@ -1 +1 @@
-dccdc45aef30e9759deb6f93dd863dfd  zip-1.7.4.tgz
+e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz



From fedora-extras-commits at redhat.com  Wed Oct 25 06:34:18 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 24 Oct 2006 23:34:18 -0700
Subject: rpms/libopts import.log,1.8,1.9
Message-ID: <200610250634.k9P6YIUx019249@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217

Modified Files:
	import.log 
Log Message:
auto-import libopts-27.4-1 on branch FC-6 from libopts-27.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopts/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	23 Oct 2006 21:15:32 -0000	1.8
+++ import.log	25 Oct 2006 06:33:47 -0000	1.9
@@ -5,3 +5,4 @@
 libopts-27_1-6:FC-5:libopts-27.1-6.src.rpm:1157318521
 libopts-27_4-1:HEAD:libopts-27.4-1.src.rpm:1161637988
 libopts-27_4-1:FC-5:libopts-27.4-1.src.rpm:1161638119
+libopts-27_4-1:FC-6:libopts-27.4-1.src.rpm:1161758017



From fedora-extras-commits at redhat.com  Wed Oct 25 06:34:19 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 24 Oct 2006 23:34:19 -0700
Subject: rpms/libopts/FC-6 .cvsignore, 1.2, 1.3 libopts.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200610250634.k9P6YJUC019252@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217/FC-6

Modified Files:
	.cvsignore libopts.spec sources 
Log Message:
auto-import libopts-27.4-1 on branch FC-6 from libopts-27.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2006 12:33:35 -0000	1.2
+++ .cvsignore	25 Oct 2006 06:33:49 -0000	1.3
@@ -1 +1 @@
-libopts-27.1.tar.gz
+libopts-27.4.tar.bz2


Index: libopts.spec
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-6/libopts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopts.spec	16 Sep 2006 20:29:39 -0000	1.5
+++ libopts.spec	25 Oct 2006 06:33:49 -0000	1.6
@@ -1,10 +1,10 @@
 Summary: Options library for autogen
 Name: libopts
-Version: 27.1
-Release: 7%{?dist}
+Version: 27.4
+Release: 1%{?dist}
 License: LGPL or BSD
 Group: Development/Libraries
-Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz
+Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.bz2
 URL: http://autogen.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,8 +64,8 @@
 %{_includedir}/autoopts
 
 %changelog
-* Sat Sep 16 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-7
-- rebuild
+* Mon Oct 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.4-1
+- bump to new version
 
 * Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-6
 - changed __infodir to _infodir 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2006 12:33:35 -0000	1.2
+++ sources	25 Oct 2006 06:33:49 -0000	1.3
@@ -1 +1 @@
-50a546ee14d866819afd502e809c8095  libopts-27.1.tar.gz
+d3199c049a38c26d71c164e0d6ee4d43  libopts-27.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 06:36:55 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 24 Oct 2006 23:36:55 -0700
Subject: rpms/autogen/FC-6 autogen.spec,1.3,1.4
Message-ID: <200610250636.k9P6atjk019350@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19333

Modified Files:
	autogen.spec 
Log Message:

Rebuild 
 	autogen.spec 



Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-6/autogen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.spec	21 Oct 2006 11:14:28 -0000	1.3
+++ autogen.spec	25 Oct 2006 06:36:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Wed Oct 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-2
+- rebuild
+
 * Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
 - bump to new version
 



From fedora-extras-commits at redhat.com  Wed Oct 25 06:41:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 24 Oct 2006 23:41:54 -0700
Subject: rpms/koffice/devel koffice.spec,1.43,1.44
Message-ID: <200610250641.k9P6fs5G019428@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19412

Modified Files:
	koffice.spec 
Log Message:
- bump



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- koffice.spec	20 Oct 2006 13:43:42 -0000	1.43
+++ koffice.spec	25 Oct 2006 06:41:24 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -805,8 +805,12 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- bump
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.6.0
+1.6.0-1
 - version upgrade
 
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>



From fedora-extras-commits at redhat.com  Wed Oct 25 07:17:57 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 25 Oct 2006 00:17:57 -0700
Subject: rpms/eggdrop/devel eggdrop.spec,1.4,1.5
Message-ID: <200610250717.k9P7Hvad022604@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22588

Modified Files:
	eggdrop.spec 
Log Message:
Rebuild



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/devel/eggdrop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eggdrop.spec	16 Oct 2006 19:14:26 -0000	1.4
+++ eggdrop.spec	25 Oct 2006 07:17:27 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Oct 25 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-4
+- Rebuild
+
 * Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct 25 07:18:58 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 25 Oct 2006 00:18:58 -0700
Subject: rpms/eggdrop/FC-6 eggdrop.spec,1.4,1.5
Message-ID: <200610250718.k9P7IwEK022631@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22615

Modified Files:
	eggdrop.spec 
Log Message:
Rebuild



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-6/eggdrop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eggdrop.spec	16 Oct 2006 19:14:26 -0000	1.4
+++ eggdrop.spec	25 Oct 2006 07:18:27 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Oct 25 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-4
+- Rebuild
+
 * Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct 25 07:19:56 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 25 Oct 2006 00:19:56 -0700
Subject: rpms/eggdrop/FC-5 eggdrop.spec,1.4,1.5
Message-ID: <200610250719.k9P7Ju4X022659@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22643

Modified Files:
	eggdrop.spec 
Log Message:
Rebuild



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-5/eggdrop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eggdrop.spec	16 Oct 2006 19:15:33 -0000	1.4
+++ eggdrop.spec	25 Oct 2006 07:19:25 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Oct 25 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-4
+- Rebuild
+
 * Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct 25 07:20:53 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 25 Oct 2006 00:20:53 -0700
Subject: rpms/eggdrop/FC-4 eggdrop.spec,1.4,1.5
Message-ID: <200610250720.k9P7Krni022690@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22670

Modified Files:
	eggdrop.spec 
Log Message:
Rebuild



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-4/eggdrop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eggdrop.spec	16 Oct 2006 19:16:29 -0000	1.4
+++ eggdrop.spec	25 Oct 2006 07:20:22 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Oct 25 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-4
+- Rebuild
+
 * Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct 25 07:38:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 00:38:18 -0700
Subject: upgradecheck upgradecheck-core+extras.conf, 1.3,
	1.4 upgradecheck-extras.conf, 1.2, 1.3 upgradecheck.py, 1.26, 1.27
Message-ID: <200610250738.k9P7cIMF022991@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22969

Modified Files:
	upgradecheck-core+extras.conf upgradecheck-extras.conf 
	upgradecheck.py 
Log Message:
Update for FC6.


Index: upgradecheck-core+extras.conf
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck-core+extras.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upgradecheck-core+extras.conf	2 Sep 2006 11:54:42 -0000	1.3
+++ upgradecheck-core+extras.conf	25 Oct 2006 07:38:15 -0000	1.4
@@ -17,6 +17,10 @@
 
 [FC6]
 name=FC6
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/source/SRPMS/
+
+[FC7]
+name=FC7
 baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/
 
 [FL3-updates]
@@ -31,6 +35,10 @@
 name=FC5-updates
 baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/SRPMS/
 
+[FC6-updates]
+name=FC6-updates
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/SRPMS/
+
 [FE3]
 name=FE3
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/3/SRPMS/
@@ -48,5 +56,10 @@
 
 [FE6]
 name=FE6
+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/6/SRPMS/
+baseurl=file:///srv/rpmbuild/extras/tree/extras/6/SRPMS/
+
+[FE7]
+name=FE7
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/SRPMS/
 baseurl=file:///srv/rpmbuild/extras/tree/extras/development/SRPMS/


Index: upgradecheck-extras.conf
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck-extras.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upgradecheck-extras.conf	2 Sep 2006 11:54:42 -0000	1.2
+++ upgradecheck-extras.conf	25 Oct 2006 07:38:15 -0000	1.3
@@ -20,5 +20,10 @@
 
 [6]
 name=6
+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/6/SRPMS/
+baseurl=file:///srv/rpmbuild/extras/tree/extras/6/SRPMS/
+
+[7]
+name=7
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/SRPMS/
 baseurl=file:///srv/rpmbuild/extras/tree/extras/development/SRPMS/


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- upgradecheck.py	23 Sep 2006 11:15:57 -0000	1.26
+++ upgradecheck.py	25 Oct 2006 07:38:15 -0000	1.27
@@ -40,7 +40,7 @@
 # and all repos containing that number in their id's will be associated with
 # the corresponding distro version.  For example, repo id "foo9bar" will be
 # associated with distro "9".
-dists = ('3', '4', '5', '6')
+dists = ('3', '4', '5', '6', '7')
 
 # Architectures to operate on.
 archs = rpmUtils.arch.getArchList('src')
@@ -52,6 +52,7 @@
     'koffice': (('FL3-updates', 'FE4'),
                 ('FL3-updates', 'FE5'),
                 ('FL3-updates', 'FE6'),
+                ('FL3-updates', 'FE7'),
                 ),
     }
 



From fedora-extras-commits at redhat.com  Wed Oct 25 08:20:51 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Oct 2006 01:20:51 -0700
Subject: rpms/yumex/FC-6 .cvsignore, 1.25, 1.26 sources, 1.33,
	1.34 yumex.spec, 1.39, 1.40
Message-ID: <200610250820.k9P8KpSu026295@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26275

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 1.1.6-0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	22 Oct 2006 12:38:08 -0000	1.25
+++ .cvsignore	25 Oct 2006 08:20:21 -0000	1.26
@@ -1 +1 @@
-yumex-1.1.5.tar.gz
+yumex-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	22 Oct 2006 12:38:08 -0000	1.33
+++ sources	25 Oct 2006 08:20:21 -0000	1.34
@@ -1 +1 @@
-028fd37ed2dc0f473d244465a2150fbd  yumex-1.1.5.tar.gz
+7691f5b61017917fdbef102da170ba2f  yumex-1.1.6.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/yumex.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- yumex.spec	23 Oct 2006 06:39:36 -0000	1.39
+++ yumex.spec	25 Oct 2006 08:20:21 -0000	1.40
@@ -1,6 +1,6 @@
 Name:     yumex
-Version:  1.1.5
-Release:  2.0%{?dist}
+Version:  1.1.6
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.6-1.0
+- Development Release 1.1.6-1.0
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0
 - bumped release for new build
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-1.0



From fedora-extras-commits at redhat.com  Wed Oct 25 08:25:45 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Oct 2006 01:25:45 -0700
Subject: rpms/yumex/devel sources,1.33,1.34 yumex.spec,1.39,1.40
Message-ID: <200610250825.k9P8PjWo026369@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26351

Modified Files:
	sources yumex.spec 
Log Message:
Release 1.1.6-0.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	22 Oct 2006 12:38:08 -0000	1.33
+++ sources	25 Oct 2006 08:25:15 -0000	1.34
@@ -1 +1 @@
-028fd37ed2dc0f473d244465a2150fbd  yumex-1.1.5.tar.gz
+7691f5b61017917fdbef102da170ba2f  yumex-1.1.6.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- yumex.spec	23 Oct 2006 06:39:36 -0000	1.39
+++ yumex.spec	25 Oct 2006 08:25:15 -0000	1.40
@@ -1,6 +1,6 @@
 Name:     yumex
-Version:  1.1.5
-Release:  2.0%{?dist}
+Version:  1.1.6
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.6-1.0
+- Development Release 1.1.6-1.0
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0
 - bumped release for new build
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-1.0



From fedora-extras-commits at redhat.com  Wed Oct 25 09:22:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:22:00 -0700
Subject: rpms/vdradmin-am - New directory
Message-ID: <200610250922.k9P9M01k029841@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836/vdradmin-am

Log Message:
Directory /cvs/extras/rpms/vdradmin-am added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 09:22:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:22:05 -0700
Subject: rpms/vdradmin-am/devel - New directory
Message-ID: <200610250922.k9P9M5XO029862@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836/vdradmin-am/devel

Log Message:
Directory /cvs/extras/rpms/vdradmin-am/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 09:22:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:22:25 -0700
Subject: rpms/vdradmin-am Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610250922.k9P9MPce029898@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29892

Added Files:
	Makefile import.log 
Log Message:
Setup of module vdradmin-am


--- NEW FILE Makefile ---
# Top level Makefile for module vdradmin-am
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 25 09:22:31 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:22:31 -0700
Subject: rpms/vdradmin-am/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610250922.k9P9MV1C029917@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29892/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdradmin-am


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 25 09:24:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:24:06 -0700
Subject: rpms/vdradmin-am import.log,1.1,1.2
Message-ID: <200610250924.k9P9O6Ol030029@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29977

Modified Files:
	import.log 
Log Message:
auto-import vdradmin-am-3.4.7-2 on branch devel from vdradmin-am-3.4.7-2.src.rpm
Initial import (#211043).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Oct 2006 09:22:25 -0000	1.1
+++ import.log	25 Oct 2006 09:23:36 -0000	1.2
@@ -0,0 +1 @@
+vdradmin-am-3_4_7-2:HEAD:vdradmin-am-3.4.7-2.src.rpm:1161768207



From fedora-extras-commits at redhat.com  Wed Oct 25 09:24:07 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:24:07 -0700
Subject: rpms/vdradmin-am/devel vdradmin-am-3.4.5a-proctitle.patch, NONE,
	1.1 vdradmin-am-3.4.7-config.patch, NONE,
	1.1 vdradmin-am-httpd.conf, NONE, 1.1 vdradmin-am.init, NONE,
	1.1 vdradmin-am.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610250924.k9P9O7BA030033@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29977/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vdradmin-am-3.4.5a-proctitle.patch 
	vdradmin-am-3.4.7-config.patch vdradmin-am-httpd.conf 
	vdradmin-am.init vdradmin-am.spec 
Log Message:
auto-import vdradmin-am-3.4.7-2 on branch devel from vdradmin-am-3.4.7-2.src.rpm
Initial import (#211043).

vdradmin-am-3.4.5a-proctitle.patch:

--- NEW FILE vdradmin-am-3.4.5a-proctitle.patch ---
--- vdradmind.pl~	2006-05-09 16:09:37.000000000 +0300
+++ vdradmind.pl	2006-05-18 18:31:38.000000000 +0300
@@ -35,6 +35,7 @@
     $0 =~ /(^.*\/)/;
     $EXENAME  = $0;
     $BASENAME = $1;
+    $0 = "vdradmind";
     unshift(@INC, "/usr/share/vdradmin/lib");
     unshift(@INC, $BASENAME . "lib/");
 }

vdradmin-am-3.4.7-config.patch:

--- NEW FILE vdradmin-am-3.4.7-config.patch ---
--- vdradmind.pl~	2006-09-29 12:02:29.000000000 +0300
+++ vdradmind.pl	2006-09-29 19:27:55.000000000 +0300
@@ -89,7 +89,7 @@
 
 #use warnings;
 
-my $SEARCH_FILES_IN_SYSTEM    = 0;
+my $SEARCH_FILES_IN_SYSTEM    = 1;
 my $VDR_MAX_SVDRP_LENGTH      = 10000;                        # validate this value
 my $SUPPORTED_LOCALE_PREFIXES = "^(cs|de|en|es|fi|fr|nl|ru)_";
 
@@ -112,7 +112,7 @@
 my %CONFIG;
 $CONFIG{LOGLEVEL}             = 81;                # 32799
 $CONFIG{LOGGING}              = 0;
-$CONFIG{LOGFILE}              = "vdradmind.log";
+$CONFIG{LOGFILE}              = "vdradmin/vdradmind.log";
 $CONFIG{MOD_GZIP}             = 0;
 $CONFIG{CACHE_TIMEOUT}        = 60;
 $CONFIG{CACHE_LASTUPDATE}     = 0;
@@ -128,7 +128,7 @@
 $CONFIG{LOCAL_NET}  = "0.0.0.0/32";
 $CONFIG{VIDEODIR}   = "/video";
 $CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}";
-$CONFIG{EPGIMAGES}  = "$CONFIG{VIDEODIR}/epgimages";
+$CONFIG{EPGIMAGES}  = "/var/lib/vdradmin/epgimages";
 $CONFIG{VDRVFAT}    = 1;
 
 #
@@ -189,9 +189,9 @@
 
 #
 $CONFIG{AT_SENDMAIL}    = 0;                       # set to 1 and set all the "MAIL_" things if you want email notification on new autotimers.
-$CONFIG{MAIL_FROM}      = "from\@address.tld";
+chomp($CONFIG{MAIL_FROM} = 'vdradmin@' . (`hostname -f 2>/dev/null` || "localhost.localdomain"));
 $CONFIG{MAIL_TO}        = "your\@email.address";
-$CONFIG{MAIL_SERVER}    = "your.email.server";
+$CONFIG{MAIL_SERVER}    = "localhost";
 $CONFIG{MAIL_AUTH_USER} = "";
 $CONFIG{MAIL_AUTH_PASS} = "";
 
@@ -247,10 +247,10 @@
     $USER_CSS      = "${BASENAME}user.css";
     bindtextdomain("vdradmin", "${BASENAME}locale");
 } else {
-    $ETCDIR        = "/etc/vdradmin";
+    $ETCDIR        = "/var/lib/vdradmin";
     $TEMPLATEDIR   = "/usr/share/vdradmin/template";
     $LOGFILE       = "/var/log/$CONFIG{LOGFILE}";
-    $PIDFILE       = "/var/run/vdradmind.pid";
+    $PIDFILE       = "/var/run/vdradmin/vdradmind.pid";
     $CONFFILE      = "${ETCDIR}/vdradmind.conf";
     $AT_FILENAME   = "${ETCDIR}/vdradmind.at";
     $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
@@ -284,7 +284,7 @@
     EVAL_PERL    => 1,               # evaluate Perl code blocks
     CACHE_SIZE   => 10000,           # Tuning for Templates
     COMPILE_EXT  => 'cache',         # Tuning for Templates
-    COMPILE_DIR  => '/tmp',          # Tuning for Templates
+    COMPILE_DIR  => '/var/cache/vdradmin', # Tuning for Templates
     VARIABLES    => $Xtemplate_vars,
 
     #DEBUG        => DEBUG_ALL,


--- NEW FILE vdradmin-am-httpd.conf ---
#                                                                -*- apache -*-
# vdradmin - WWW interface for the Video Disk Recorder (VDR)
#
# This is an optional config file for proxying vdradmin with Apache.
# Copy to /etc/httpd/conf.d to do that.
#
# Note: with SELinux in enforcing mode, the httpd_can_network_connect
# SELinux boolean must be on, otherwise httpd won't be able to connect to
# the proxied port below.  See the setsebool(8) manual page or use the
# "Allow HTTPD to connect to the network" option in the
# system-config-securitylevel UI.
#

<IfModule mod_proxy.c>
  ProxyPass /vdradmin/ http://127.0.0.1:8001/
  ProxyPassReverse /vdradmin/ http://127.0.0.1:8001/
  <Location /vdradmin/>
    AddDefaultCharset Off
  </Location>
</IfModule>


--- NEW FILE vdradmin-am.init ---
#!/bin/sh
#
# vdradmind    WWW interface daemon for VDR
#
# chkconfig:   - 92 08
# description: WWW interface daemon for VDR.
# processname: vdradmind
# config:      /etc/vdr/vdradmind.conf
# pidfile:     /var/run/vdr/vdradmind.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0

exec="/usr/sbin/vdradmind"
prog=$(basename $exec)

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting $prog: "
    daemon --user vdradmin "$exec >/dev/null 2>&1"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        restart
        ;;
    reload)
        exit 3 # LSB: not implemented
        ;;
    status)
        status $prog
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
        exit 2
esac


--- NEW FILE vdradmin-am.spec ---
%define cachedir  %(vdr-config --cachedir  2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define videodir  %(vdr-config --videodir  2>/dev/null || echo ERROR)

Name:           vdradmin-am
Version:        3.4.7
Release:        2%{?dist}
Summary:        Web interface for VDR

Group:          Applications/Internet
License:        GPL
URL:            http://andreas.vdr-developer.org/en/
Source0:        http://andreas.vdr-developer.org/download/%{name}-%{version}.tar.bz2
Source1:        %{name}.init
Source2:        %{name}-httpd.conf
Patch0:         %{name}-3.4.5a-proctitle.patch
Patch1:         %{name}-3.4.7-config.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  vdr-devel >= 1.3.27-0.4
BuildRequires:  gettext
BuildRequires:  perl(Locale::gettext)
Requires:       perl(Locale::gettext)
Requires(pre):  %{_sbindir}/groupadd
Requires(pre):  %{_sbindir}/useradd

%description
VDRAdmin-AM is a web interface for managing VDR.


%prep
%setup -q
%patch0
%patch1
%{__perl} -pi -e \
  's|"/video"|"%{videodir}"| ;
   s|^(\$CONFIG\{VDRCONFDIR\}\s*=\s*")[^"]*(.*)|$1%{configdir}$2| ;
   s|\$CONFIG\{VIDEODIR\}/epg\.data|%{cachedir}/epg.data|' \
  vdradmind.pl
%{__perl} -pi -e \
  's/vdradmind\.pl/vdradmind/g ; s/(TH vdradmin )1/${1}8/' vdradmind.pl.1
for f in CREDITS HISTORY ; do
  iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
install -pm 644 %{SOURCE2} .


%build
%{__perl} -pe \
  's|^\s*\$CONFFILE\s*=.*|\$CONFFILE = "vdradmind.conf";| ;
   s|^.*COMPILE_DIR.*$|| ;
   s|/usr/share/vdradmin/template|./template|' \
  vdradmind.pl > vdradmind.tmp
%{__perl} ./vdradmind.tmp --config < /dev/null
./make.sh po


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 vdradmind.pl $RPM_BUILD_ROOT%{_sbindir}/vdradmind
install -Dpm 644 vdradmind.pl.1 $RPM_BUILD_ROOT%{_mandir}/man8/vdradmind.8
install -dm 755 $RPM_BUILD_ROOT/usr/share/vdradmin/epgimages
cp -pR template $RPM_BUILD_ROOT/usr/share/vdradmin
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
install -Dpm 640 vdradmind.conf $RPM_BUILD_ROOT/var/lib/vdradmin/vdradmind.conf
install -dm 755 $RPM_BUILD_ROOT/var/{cache,log,run}/vdradmin
install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/vdradmind
chmod 755 $RPM_BUILD_ROOT%{_initrddir}/vdradmind
%find_lang vdradmin


%clean
rm -rf $RPM_BUILD_ROOT


%pre
%{_sbindir}/groupadd -r vdradmin 2>/dev/null || :
%{_sbindir}/useradd -c "VDR web interface" -d /var/lib/vdradmin \
  -g vdradmin -M -n -r -s /sbin/nologin vdradmin 2>/dev/null || :

%post
/sbin/chkconfig --add vdradmind

%preun
if [ $1 -eq 0 ] ; then
    %{_initrddir}/vdradmind stop >/dev/null || :
    /sbin/chkconfig --del vdradmind
fi

%postun
if [ $1 -gt 0 ] ; then
    rm -rf /var/cache/vdradmin/*
    %{_initrddir}/vdradmind try-restart >/dev/null || :
fi


%files -f vdradmin.lang
%defattr(-,root,root,-)
%doc COPYING CREDITS FAQ HISTORY INSTALL README* contrib/*example convert.pl
%doc %{name}-httpd.conf
%{_initrddir}/vdradmind
%{_sbindir}/vdradmind
/usr/share/vdradmin/
%{_mandir}/man8/vdradmind.8*
%defattr(-,vdradmin,vdradmin,-)
%dir /var/cache/vdradmin/
%dir /var/lib/vdradmin/
%config(noreplace) /var/lib/vdradmin/vdradmind.conf
/var/log/vdradmin/
%dir /var/run/vdradmin/


%changelog
* Tue Oct 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-2
- Move compiled templates to /var/cache/vdradmin, clean them up on upgrades.
- Drop no longer needed Obsoletes and Provides.
- Prune pre-3.4.4 changelog entries.

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-1
- 3.4.7.
- Install optional Apache proxy snippet as doc, not in-place.

* Tue Sep 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.6-3
- Redirect stdin and stdout to /dev/null in the init script.

* Sun Jul 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.6-2
- Improve default config, enable VFAT compatiblity by default.

* Fri Jul 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.6-1
- 3.4.6.
- Clean up no longer relevant upgrade compat from %%post.

* Thu May 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.5a-1
- 3.4.5a.

* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.4-1
- 3.4.4.

* Thu Mar 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.4-0.1.rc
- 3.4.4rc.

* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.4-0.1.beta2
- 3.4.4beta2.

* Wed Mar  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.4-0.1.beta
- 3.4.4beta.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Oct 2006 09:22:31 -0000	1.1
+++ .cvsignore	25 Oct 2006 09:23:37 -0000	1.2
@@ -0,0 +1 @@
+vdradmin-am-3.4.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Oct 2006 09:22:31 -0000	1.1
+++ sources	25 Oct 2006 09:23:37 -0000	1.2
@@ -0,0 +1 @@
+b3f862dfa078bdef05b52a841850c65a  vdradmin-am-3.4.7.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 09:26:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:26:24 -0700
Subject: rpms/vdradmin-am/devel vdradmin-am.spec,1.1,1.2
Message-ID: <200610250926.k9P9QOBw030098@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30077

Modified Files:
	vdradmin-am.spec 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-3
- Improve description (#211043).



Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdradmin-am.spec	25 Oct 2006 09:23:37 -0000	1.1
+++ vdradmin-am.spec	25 Oct 2006 09:25:54 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           vdradmin-am
 Version:        3.4.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Web interface for VDR
 
 Group:          Applications/Internet
@@ -26,7 +26,8 @@
 Requires(pre):  %{_sbindir}/useradd
 
 %description
-VDRAdmin-AM is a web interface for managing VDR.
+VDRAdmin-AM is a web interface for managing VDR.  You will need access
+to a local or remote VDR install to use this package.
 
 
 %prep
@@ -113,6 +114,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-3
+- Improve description (#211043).
+
 * Tue Oct 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-2
 - Move compiled templates to /var/cache/vdradmin, clean them up on upgrades.
 - Drop no longer needed Obsoletes and Provides.



From fedora-extras-commits at redhat.com  Wed Oct 25 09:36:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:36:25 -0700
Subject: owners owners.list,1.1870,1.1871
Message-ID: <200610250936.k9P9aP9J030231@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30214

Modified Files:
	owners.list 
Log Message:
+vdradmin-am (#211043)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1870
retrieving revision 1.1871
diff -u -r1.1870 -r1.1871
--- owners.list	24 Oct 2006 16:36:22 -0000	1.1870
+++ owners.list	25 Oct 2006 09:35:54 -0000	1.1871
@@ -2283,6 +2283,7 @@
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 25 09:45:33 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 25 Oct 2006 02:45:33 -0700
Subject: fedora-security/audit fc5,1.367,1.368 fc6,1.121,1.122
Message-ID: <200610250945.k9P9jXHg030308@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30288

Modified Files:
	fc5 fc6 
Log Message:
Updates from cve mails and pushes



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- fc5	24 Oct 2006 19:48:55 -0000	1.367
+++ fc5	25 Oct 2006 09:45:31 -0000	1.368
@@ -1,11 +1,11 @@
-Up to date CVE as of CVE email 20061022
-Up to date FC5 as of 20061016
+Up to date CVE as of CVE email 20061024
+Up to date FC5 as of 20061024
 
 ** are items that need attention
 
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
-CVE-2006-5298 VULNERABLE (mutt)
-CVE-2006-5297 VULNERABLE (mutt)
+CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
+CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5229 ignore (openssh) reported not an issue
 CVE-2006-5215 VULNERABLE (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
@@ -32,11 +32,11 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
-CVE-2006-4811 VULNERABLE (qt) #211342
+CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
-CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) #205652
+CVE-2006-4624 version (mailman, fixed 2.1.9rc1) #205652 [since FEDORA-2006-1013]
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
 CVE-2006-4573 VULNERABLE (screen) #212057
@@ -159,7 +159,7 @@
 CVE-2006-3677 VULNERABLE (mozilla)
 CVE-2006-3672 ignore (konqueror) just a crash
 CVE-2006-3665 ignore (squirrelmail) don't enable register_globals!
-CVE-2006-3636 VULNERABLE (mailman, fixed 2.1.9)
+CVE-2006-3636 version (mailman, fixed 2.1.9) [since FEDORA-2006-1013]
 CVE-2006-3634 version (kernel, fixed 2.6.17.8) [since FEDORA-2006-906] s390 only
 CVE-2006-3632 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]
 CVE-2006-3631 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]
@@ -208,7 +208,7 @@
 CVE-2006-3016 version (php, fixed 5.1.3) [since FEDORA-2006-1024]
 CVE-2006-3011 version (php, fixed 5.1.5) [since FEDORA-2006-1024]
 CVE-2006-3005 ignore (libjpeg) not a vuln
-CVE-2006-2941 VULNERABLE (mailman, fixed 2.1.9)
+CVE-2006-2941 version (mailman, fixed 2.1.9) [since FEDORA-2006-1013]
 CVE-2006-2940 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
 CVE-2006-2937 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
 CVE-2006-2936 version (kernel, fixed 2.6.16.27, fixed 2.6.17.7) [since FEDORA-2006-906]
@@ -1653,6 +1653,7 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
+CVE-2003-1307 ** mod_php
 CVE-2003-1303 version (php, fixed 4.3.3)
 CVE-2003-1302 version (php, fixed 4.3.1)
 CVE-2003-1295 version (xscreensaver)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fc6	24 Oct 2006 19:48:55 -0000	1.121
+++ fc6	25 Oct 2006 09:45:31 -0000	1.122
@@ -1,11 +1,11 @@
-Up to date CVE as of CVE email 20061022
-Up to date FC6 as of GOLD
+Up to date CVE as of CVE email 20061024
+Up to date FC6 as of 20061024
 
 ** are items that need attention
 
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
-CVE-2006-5298 VULNERABLE (mutt)
-CVE-2006-5297 VULNERABLE (mutt)
+CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
+CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
@@ -30,7 +30,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4811 VULNERABLE (qt) #211347
+CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Wed Oct 25 09:52:36 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 25 Oct 2006 02:52:36 -0700
Subject: rpms/NetworkManager-vpnc/FC-6
	NetworkManager-vpnc-0.7.0-gppasswd.patch, NONE,
	1.1 NetworkManager-vpnc.spec, 1.18, 1.19
Message-ID: <200610250952.k9P9qacd030377@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/NetworkManager-vpnc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30357

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	NetworkManager-vpnc-0.7.0-gppasswd.patch 
Log Message:
Added patch to support saving group password only

NetworkManager-vpnc-0.7.0-gppasswd.patch:

--- NEW FILE NetworkManager-vpnc-0.7.0-gppasswd.patch ---
--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c	2006-10-21 15:03:55.000000000 +0200
@@ -33,13 +33,39 @@
 
 #define VPN_SERVICE "org.freedesktop.NetworkManager.vpnc"
 
-static GSList *
-lookup_pass (const char *vpn_name, const char *vpn_service, gboolean *is_session)
+struct keyring_data {
+	const char* password;
+	const char* group_password;
+	gboolean is_session;
+};
+
+void keyring_data_init(struct keyring_data* d)
 {
-	GSList *passwords;
-	GList *keyring_result;
+	d->password = NULL;
+	d->group_password = NULL;
+	d->is_session = FALSE;
+}
 
-	passwords = NULL;
+void keyring_data_free(struct keyring_data* d)
+{
+	/* For security reasons, Make sure to clear the data before freeing */
+	if (d->password) {
+		memset((void*)d->password, 0, strlen(d->password));
+		g_free((void*)d->password);
+		d->password = NULL;
+	}
+	if (d->group_password) {
+		memset((void*)d->group_password, 0, strlen(d->group_password));
+		g_free((void*)d->group_password);
+		d->group_password = NULL;
+	}
+}
+ 
+
+gboolean
+lookup_pass (const char *vpn_name, const char *vpn_service, struct keyring_data* kd)
+{
+	GList *keyring_result;
 
 	if (gnome_keyring_find_network_password_sync (g_get_user_name (),     /* user */
 						      NULL,                   /* domain */
@@ -51,40 +77,32 @@
 						      &keyring_result) != GNOME_KEYRING_RESULT_OK)
 		return FALSE;
 
-	if (keyring_result != NULL && g_list_length (keyring_result) == 2) {
-		char *password;
-		char *group_password;
-		GnomeKeyringNetworkPasswordData *data1 = keyring_result->data;
-		GnomeKeyringNetworkPasswordData *data2 = (g_list_next (keyring_result))->data;
+	char *password = NULL;
+	char *group_password = NULL;
+	GList* i;
+
+	for (i = keyring_result; i; i = g_list_next(i)) {
+		GnomeKeyringNetworkPasswordData *data = i->data;
+
+		if (data) {
+			if (strcmp (data->object, "group_password") == 0) {
+				group_password = data->password;
+			} else if (strcmp (data->object, "password") == 0) {
+				password = data->password;
+			}
 
-		password = NULL;
-		group_password = NULL;
-
-		if (strcmp (data1->object, "group_password") == 0) {
-			group_password = data1->password;
-		} else if (strcmp (data1->object, "password") == 0) {
-			password = data1->password;
-		}
-
-		if (strcmp (data2->object, "group_password") == 0) {
-			group_password = data2->password;
-		} else if (strcmp (data2->object, "password") == 0) {
-			password = data2->password;
+			kd->is_session = (strcmp (data->keyring, "session") == 0);
 		}
+	}
 
-		if (password != NULL && group_password != NULL) {
-			passwords = g_slist_append (passwords, g_strdup (group_password));
-			passwords = g_slist_append (passwords, g_strdup (password));
-			if (strcmp (data1->keyring, "session") == 0)
-				*is_session = TRUE;
-			else
-				*is_session = FALSE;
-		}
+	if (password)
+		kd->password = g_strdup(password);
+	if (group_password)
+		kd->group_password = g_strdup(group_password);
 
-		gnome_keyring_network_password_list_free (keyring_result);
-	}
+	gnome_keyring_network_password_list_free (keyring_result);
 
-	return passwords;
+	return TRUE;
 }
 
 static void save_vpn_password (const char *vpn_name, const char *vpn_service, const char *keyring, 
@@ -93,6 +111,7 @@
 	guint32 item_id;
 	GnomeKeyringResult keyring_result;
 
+	if (password) {
 	keyring_result = gnome_keyring_set_network_password_sync (keyring,
 								  g_get_user_name (),
 								  NULL,
@@ -107,6 +126,7 @@
 	{
 		g_warning ("Couldn't store password in keyring, code %d", (int) keyring_result);
 	}
+	}
 
 	keyring_result = gnome_keyring_set_network_password_sync (keyring,
 								  g_get_user_name (),
@@ -125,38 +145,20 @@
 	}
 }
 
-static GSList *
-get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry)
+gboolean
+get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry, struct keyring_data* kdata)
 {
-	GSList          *result;
-	char            *prompt;
+	char		*prompt;
 	GtkWidget	*dialog;
-	char            *keyring_password;
-	char            *keyring_group_password;
-	gboolean         keyring_is_session;
-	GSList          *keyring_result;
 	GnomeTwoPasswordDialogRemember remember;
 
-	result = NULL;
-	keyring_password = NULL;
-	keyring_group_password = NULL;
-	keyring_result = NULL;
-
-	g_return_val_if_fail (vpn_name != NULL, NULL);
+	g_return_val_if_fail (vpn_name != NULL, FALSE);
 
 	/* Use the system user name, since the VPN might have a different user name */
-	if (!retry) {
-		if ((result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-			return result;
-		}
-	} else {
-		if ((keyring_result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-			keyring_group_password = g_strdup ((char *) keyring_result->data);
-			keyring_password = g_strdup ((char *) (g_slist_next (keyring_result))->data);
-		}
-		g_slist_foreach (keyring_result, (GFunc)g_free, NULL);
-		g_slist_free (keyring_result);
-	}
+	gboolean has_keyring = lookup_pass (vpn_name, vpn_service, kdata);
+
+	if (!retry && has_keyring && kdata->password)
+		return TRUE;
 
 	prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name);
 	dialog = gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE);
@@ -169,21 +171,24 @@
 	gnome_two_password_dialog_set_password_secondary_label (GNOME_TWO_PASSWORD_DIALOG (dialog), _("_Group Password:"));
 	/* use the same keyring storage options as from the items we put in the entry boxes */
 	remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING;
-	if (keyring_result != NULL) {
-		if (keyring_is_session)
+	if (has_keyring) {
+		if (!kdata->password && kdata->group_password)
+			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
+		else if (kdata->is_session)
 			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
 		else
-			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;				
+			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
 	}
+
 	gnome_two_password_dialog_set_remember (GNOME_TWO_PASSWORD_DIALOG (dialog), remember);
 
-	/* if retrying, put in the passwords from the keyring */
-	if (keyring_password != NULL) {
-		gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_password);
-	}
-	if (keyring_group_password != NULL) {
-		gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_group_password);
-	}
+/* if retrying, put in the passwords from the keyring */
+	if (kdata->password)
+		gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), kdata->password);
+
+	if (kdata->group_password)
+		gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog),
+								  kdata->group_password);
 
 	gtk_widget_show (dialog);
 
@@ -192,18 +197,21 @@
 		char *password;
 		char *group_password;
 
-		password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
-		group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
-		result = g_slist_append (result, group_password);
-		result = g_slist_append (result, password);
+		keyring_data_free(kdata);
+
+		kdata->password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
+		kdata->group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
 
 		switch (gnome_two_password_dialog_get_remember (GNOME_TWO_PASSWORD_DIALOG (dialog)))
 		{
 			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION:
-				save_vpn_password (vpn_name, vpn_service, "session", password, group_password);
+				save_vpn_password (vpn_name, vpn_service, "session", kdata->password, kdata->group_password);
+				break;
+			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
+				save_vpn_password (vpn_name, vpn_service, NULL, NULL, kdata->group_password);
 				break;
 			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER:
-				save_vpn_password (vpn_name, vpn_service, NULL, password, group_password);
+				save_vpn_password (vpn_name, vpn_service, NULL, kdata->password, kdata->group_password);
 				break;
 			default:
 				break;
@@ -211,12 +219,9 @@
 
 	}
 
-	g_free (keyring_password);
-	g_free (keyring_group_password);
-
 	gtk_widget_destroy (dialog);
 
-	return result;
+	return TRUE;
 }
 
 int 
@@ -262,22 +267,28 @@
 	gnome_program_init ("nm-vpnc-auth-dialog", VERSION, LIBGNOMEUI_MODULE,
 			    argc, argv, 
 			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+
+	struct keyring_data kdata;
+	gboolean success = FALSE;
+
+	keyring_data_init(&kdata);
 	  
-	passwords = get_passwords (vpn_name, vpn_service, retry);
-	if (passwords == NULL)
+	if (! get_passwords (vpn_name, vpn_service, retry, &kdata))
 		goto out;
 
+	if (!kdata.password || !kdata.group_password)
+		goto out;
+
+	success = TRUE;
 	/* dump the passwords to stdout */
-	for (i = passwords; i != NULL; i = g_slist_next (i)) {
-		char *password = (char *) i->data;
-		printf ("%s\n", password);
-	}
+	printf ("%s\n", kdata.group_password);
+	printf ("%s\n", kdata.password);
+
 	printf ("\n\n");
 	/* for good measure, flush stdout since Kansas is going Bye-Bye */
 	fflush (stdout);
 
-	g_slist_foreach (passwords, (GFunc)g_free, NULL);
-	g_slist_free (passwords);
+	keyring_data_free(&kdata);
 
 	/* wait for data on stdin  */
 	fread (buf, sizeof (char), sizeof (buf), stdin);
@@ -285,5 +296,5 @@
 out:
 	g_option_context_free (context);
 
-	return passwords != NULL ? 0 : 1;
+	return success ? 0 : 1;
 }
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h	2006-10-21 15:01:12.000000000 +0200
@@ -57,6 +57,7 @@
 typedef enum {
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION,
+	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP,
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER
 } GnomeTwoPasswordDialogRemember;
 
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c	2006-10-21 15:01:12.000000000 +0200
@@ -68,6 +68,7 @@
 	
 	GtkWidget *remember_session_button;
 	GtkWidget *remember_forever_button;
+	GtkWidget *remember_group_forever_button;
 
 	GtkWidget *radio_vbox;
 	GtkWidget *connect_with_no_userpass_button;
@@ -465,11 +466,15 @@
 		gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session"));
 	password_dialog->details->remember_forever_button =
 		gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring"));
+	password_dialog->details->remember_group_forever_button =
+		gtk_check_button_new_with_mnemonic (_("S_ave group password in keyring"));
 
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, 
 			    TRUE, TRUE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, 
 			    TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_forever_button, 
+			    TRUE, TRUE, 6);
 
 
 	gnome_two_password_dialog_set_username (password_dialog, username);
@@ -689,9 +694,11 @@
 	if (show_remember) {
 		gtk_widget_show (password_dialog->details->remember_session_button);
 		gtk_widget_show (password_dialog->details->remember_forever_button);
+		gtk_widget_show (password_dialog->details->remember_group_forever_button);
 	} else {
 		gtk_widget_hide (password_dialog->details->remember_session_button);
 		gtk_widget_hide (password_dialog->details->remember_forever_button);
+		gtk_widget_hide (password_dialog->details->remember_group_forever_button);
 	}
 }
 
@@ -699,30 +706,38 @@
 gnome_two_password_dialog_set_remember      (GnomeTwoPasswordDialog         *password_dialog,
 					 GnomeTwoPasswordDialogRemember  remember)
 {
-	gboolean session, forever;
+	gboolean session, forever, group;
 
 	session = FALSE;
 	forever = FALSE;
+	group = FALSE;
 	if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) {
 		session = TRUE;
 	} else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){
 		forever = TRUE;
+	} else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP){
+		group = TRUE;
 	}
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button),
 				      session);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button),
 				      forever);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button),
+				      group);
 }
 
 GnomeTwoPasswordDialogRemember
 gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog         *password_dialog)
 {
-	gboolean session, forever;
+	gboolean session, forever, group;
 
 	session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button));
 	forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button));
+	group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button));
 	if (forever) {
 		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
+	} else if (group) {
+		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
 	} else if (session) {
 		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
 	}


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-6/NetworkManager-vpnc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- NetworkManager-vpnc.spec	5 Oct 2006 16:12:07 -0000	1.18
+++ NetworkManager-vpnc.spec	25 Oct 2006 09:52:06 -0000	1.19
@@ -13,11 +13,12 @@
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
 Version:   0.7.0
-Release:   0%{?nm_vpnc_cvs_version}.2%{?dist}
+Release:   0%{?nm_vpnc_cvs_version}.3%{?dist}
 License:   GPL
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
+Patch0:    NetworkManager-vpnc-0.7.0-gppasswd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -47,6 +48,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gppasswd
+
 
 %build
 %configure
@@ -97,6 +100,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Wed Oct 25 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.3
+- Added patch to support saving group password only
+
 * Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.2
 - Leave .so link alone, needed by nm
 



From fedora-extras-commits at redhat.com  Wed Oct 25 10:36:50 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 25 Oct 2006 03:36:50 -0700
Subject: rpms/fmio/devel README.fedora,1.1,1.2
Message-ID: <200610251036.k9PAaouC001194@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/fmio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1178

Modified Files:
	README.fedora 
Log Message:
README.Fedora minor update


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/fmio/devel/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	7 Sep 2006 05:27:25 -0000	1.1
+++ README.fedora	25 Oct 2006 10:36:19 -0000	1.2
@@ -10,3 +10,6 @@
 can start fmrinit in the startup script like /etc/rc.d/rc.local. Second, you
 may start it once after login in the system. And runing fmio twice will do the
 job too. Choose a method that'll suit you best.
+
+If you like to use native fmio's driver you should switch on setuid bit and
+choose any driver you want.



From fedora-extras-commits at redhat.com  Wed Oct 25 10:55:35 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 25 Oct 2006 03:55:35 -0700
Subject: rpms/international-time/devel international-time.spec,1.1,1.2
Message-ID: <200610251055.k9PAtZ4i001407@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1389

Modified Files:
	international-time.spec 
Log Message:
* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
- Update desktop database on installation.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/devel/international-time.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- international-time.spec	20 Oct 2006 17:03:09 -0000	1.1
+++ international-time.spec	25 Oct 2006 10:55:05 -0000	1.2
@@ -48,6 +48,14 @@
 %clean
 rm -rf %{buildroot}
 
+%post
+/usr/bin/update-desktop-database &>/dev/null ||:
+
+%postun
+if [ "$1" = "0" ]; then
+  /usr/bin/update-desktop-database &>/dev/null ||:
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -56,6 +64,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
+- Update desktop database on installation.
+
 * Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1
 - 0.0.2.  More fixes from package review.
 



From fedora-extras-commits at redhat.com  Wed Oct 25 11:19:47 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Oct 2006 04:19:47 -0700
Subject: rpms/koffice/FC-4 koffice.spec,1.18,1.19
Message-ID: <200610251119.k9PBJlf3004816@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756/FC-4

Modified Files:
	koffice.spec 
Log Message:
- fix #212145: add missing BR for krita pdf support



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- koffice.spec	21 Oct 2006 07:51:58 -0000	1.18
+++ koffice.spec	25 Oct 2006 11:19:17 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -57,6 +57,7 @@
 BuildRequires:  xorg-x11-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel
+BuildRequires:  poppler-devel
 
 %description
 KOffice - Integrated Office Suite
@@ -592,6 +593,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/libkritapdfimport.*
 %{_libdir}/kde3/krosskritacore.*
 %{_libdir}/kde3/krita_ycbcr_u16_plugin.*
 %{_libdir}/kde3/krita_ycbcr_u8_plugin.*
@@ -813,6 +815,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- fix #212145: add missing BR for krita pdf support
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.6.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct 25 11:19:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Oct 2006 04:19:50 -0700
Subject: rpms/koffice/devel koffice.spec,1.44,1.45
Message-ID: <200610251119.k9PBJoph004823@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756/devel

Modified Files:
	koffice.spec 
Log Message:
- fix #212145: add missing BR for krita pdf support



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- koffice.spec	25 Oct 2006 06:41:24 -0000	1.44
+++ koffice.spec	25 Oct 2006 11:19:20 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -44,6 +44,7 @@
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel >= 1.8.2 
+BuildRequires:  poppler-devel
 %if "%{?fedora}" > "4"
 BuildRequires:  libXi-devel
 %endif
@@ -584,6 +585,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/libkritapdfimport.*
 %{_libdir}/kde3/krosskritacore.*
 %{_libdir}/kde3/krita_ycbcr_u16_plugin.*
 %{_libdir}/kde3/krita_ycbcr_u8_plugin.*
@@ -806,6 +808,10 @@
 
 %changelog
 * Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-3
+- fix #212145: add missing BR for krita pdf support
+
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.6.0-2
 - bump
 



From fedora-extras-commits at redhat.com  Wed Oct 25 11:19:49 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Oct 2006 04:19:49 -0700
Subject: rpms/koffice/FC-6 koffice.spec,1.43,1.44
Message-ID: <200610251119.k9PBJn8e004820@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756/FC-6

Modified Files:
	koffice.spec 
Log Message:
- fix #212145: add missing BR for krita pdf support



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/koffice.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- koffice.spec	20 Oct 2006 13:43:42 -0000	1.43
+++ koffice.spec	25 Oct 2006 11:19:19 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -44,6 +44,7 @@
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel >= 1.8.2 
+BuildRequires:  poppler-devel
 %if "%{?fedora}" > "4"
 BuildRequires:  libXi-devel
 %endif
@@ -584,6 +585,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/libkritapdfimport.*
 %{_libdir}/kde3/krosskritacore.*
 %{_libdir}/kde3/krita_ycbcr_u16_plugin.*
 %{_libdir}/kde3/krita_ycbcr_u8_plugin.*
@@ -805,8 +807,12 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- fix #212145: add missing BR for krita pdf support
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.6.0
+1.6.0-1
 - version upgrade
 
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>



From fedora-extras-commits at redhat.com  Wed Oct 25 11:19:48 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Oct 2006 04:19:48 -0700
Subject: rpms/koffice/FC-5 koffice.spec,1.41,1.42
Message-ID: <200610251119.k9PBJml6004819@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756/FC-5

Modified Files:
	koffice.spec 
Log Message:
- fix #212145: add missing BR for krita pdf support



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- koffice.spec	21 Oct 2006 07:51:58 -0000	1.41
+++ koffice.spec	25 Oct 2006 11:19:18 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -45,6 +45,7 @@
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel >= 1.8.2 
+BuildRequires:  poppler-devel
 %if "%{?fedora}" > "4"
 BuildRequires:  libXi-devel
 %endif
@@ -582,6 +583,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/libkritapdfimport.*
 %{_libdir}/kde3/krosskritacore.*
 %{_libdir}/kde3/krita_ycbcr_u16_plugin.*
 %{_libdir}/kde3/krita_ycbcr_u8_plugin.*
@@ -803,6 +805,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- fix #212145: add missing BR for krita pdf support
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.6.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct 25 12:22:49 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 05:22:49 -0700
Subject: fedora-rpmdevtools configure.ac,1.5,1.6 rpmdevtools.spec,1.18,1.19
Message-ID: <200610251222.k9PCMnYr008237@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8217

Modified Files:
	configure.ac rpmdevtools.spec 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
- Update spectool to 1.0.8, fixes #212108.



Index: configure.ac
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.ac	2 Oct 2006 16:16:49 -0000	1.5
+++ configure.ac	25 Oct 2006 12:22:46 -0000	1.6
@@ -1,4 +1,4 @@
-AC_INIT(rpmdevtools, 5.2)
+AC_INIT(rpmdevtools, 5.3)
 AM_INIT_AUTOMAKE
 AC_PATH_PROG(HELP2MAN,help2man)
 AC_PATH_PROG(WGET,wget)


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpmdevtools.spec	2 Oct 2006 16:16:03 -0000	1.18
+++ rpmdevtools.spec	25 Oct 2006 12:22:46 -0000	1.19
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.



From fedora-extras-commits at redhat.com  Wed Oct 25 12:26:37 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 05:26:37 -0700
Subject: rpms/rpmdevtools/devel .cvsignore, 1.4, 1.5 rpmdevtools.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <200610251226.k9PCQbbs008356@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8281/devel

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
- Update spectool to 1.0.8, fixes #212108.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 16:29:08 -0000	1.4
+++ .cvsignore	25 Oct 2006 12:26:07 -0000	1.5
@@ -1,2 +1,2 @@
-spectool-1.0.7.tar.bz2
-rpmdevtools-5.2.tar.bz2
+rpmdevtools-5.3.tar.bz2
+spectool-1.0.8.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmdevtools.spec	2 Oct 2006 16:29:08 -0000	1.4
+++ rpmdevtools.spec	25 Oct 2006 12:26:07 -0000	1.5
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 16:29:08 -0000	1.5
+++ sources	25 Oct 2006 12:26:07 -0000	1.6
@@ -1,2 +1,2 @@
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2
+4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
+42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 12:26:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 05:26:35 -0700
Subject: rpms/rpmdevtools/FC-5 .cvsignore, 1.4, 1.5 rpmdevtools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610251226.k9PCQZsq008346@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8281/FC-5

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
- Update spectool to 1.0.8, fixes #212108.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 16:29:07 -0000	1.4
+++ .cvsignore	25 Oct 2006 12:26:05 -0000	1.5
@@ -1,2 +1,2 @@
-spectool-1.0.7.tar.bz2
-rpmdevtools-5.2.tar.bz2
+rpmdevtools-5.3.tar.bz2
+spectool-1.0.8.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/rpmdevtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmdevtools.spec	2 Oct 2006 16:29:07 -0000	1.4
+++ rpmdevtools.spec	25 Oct 2006 12:26:05 -0000	1.5
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 16:29:07 -0000	1.5
+++ sources	25 Oct 2006 12:26:05 -0000	1.6
@@ -1,2 +1,2 @@
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2
+4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
+42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 12:26:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 05:26:36 -0700
Subject: rpms/rpmdevtools/FC-6 .cvsignore, 1.4, 1.5 rpmdevtools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610251226.k9PCQanw008351@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8281/FC-6

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
- Update spectool to 1.0.8, fixes #212108.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 16:29:08 -0000	1.4
+++ .cvsignore	25 Oct 2006 12:26:06 -0000	1.5
@@ -1,2 +1,2 @@
-spectool-1.0.7.tar.bz2
-rpmdevtools-5.2.tar.bz2
+rpmdevtools-5.3.tar.bz2
+spectool-1.0.8.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-6/rpmdevtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmdevtools.spec	2 Oct 2006 16:29:08 -0000	1.4
+++ rpmdevtools.spec	25 Oct 2006 12:26:06 -0000	1.5
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 16:29:08 -0000	1.5
+++ sources	25 Oct 2006 12:26:06 -0000	1.6
@@ -1,2 +1,2 @@
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2
+4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
+42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 12:28:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 05:28:25 -0700
Subject: rpms/jd/devel jd.spec,1.7,1.8
Message-ID: <200610251228.k9PCSPsC008391@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8374

Modified Files:
	jd.spec 
Log Message:
* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Respin



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jd.spec	24 Oct 2006 05:31:18 -0000	1.7
+++ jd.spec	25 Oct 2006 12:27:54 -0000	1.8
@@ -28,7 +28,7 @@
 %define         pre_release   1
 
 %if %{pre_release}
-%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
+%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}.1
 %else
 %define         rel           %{vendor_rel}%{?dist}
 %endif
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Respin
+
 * 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
 



From fedora-extras-commits at redhat.com  Wed Oct 25 12:29:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 05:29:22 -0700
Subject: rpms/jd/devel jd.spec,1.8,1.9
Message-ID: <200610251229.k9PCTMTl008418@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8402

Modified Files:
	jd.spec 
Log Message:
fix date


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jd.spec	25 Oct 2006 12:27:54 -0000	1.8
+++ jd.spec	25 Oct 2006 12:28:52 -0000	1.9
@@ -103,7 +103,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Respin
 
 * Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.2.beta061023



From fedora-extras-commits at redhat.com  Wed Oct 25 13:01:16 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 25 Oct 2006 06:01:16 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.7,1.8
Message-ID: <200610251301.k9PD1Gi2011606@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11579

Modified Files:
	Push.py 
Log Message:
Push.py


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Push.py	24 Oct 2006 20:28:19 -0000	1.7
+++ Push.py	25 Oct 2006 13:01:11 -0000	1.8
@@ -344,6 +344,14 @@
     # if it is a noarch package, copy2 it to all arch locations
     # if it is a debuginfo package, move it into the 'debug' dir for that arch
 
+    if len(filedict['srpm']) > 1:
+        mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
+        buildreportinfo = 'Invalid build-job: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        if buildreport:
+            rundirfile.write(buildreportinfo)
+        rundirfile.close()
+        raise PushWarning, 'WARNING: %s ' % pkg_fn
+    
     package = filedict['srpm'][0]
     (n,a,e,v,r) = naevr(package)
     pkg_fn = os.path.basename(package)
@@ -356,6 +364,10 @@
         buildreportinfo = '%s-%s-%s\n' % (n,v,r)
     else:  # src.rpm published before, exclude entire build job
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
+        buildreportinfo = 'Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        if buildreport:
+            rundirfile.write(buildreportinfo)
+        rundirfile.close()
         raise PushWarning, 'WARNING: %s published before' % pkg_fn
 
     for package in filedict['rpm'] + filedict['debuginfo']:



From fedora-extras-commits at redhat.com  Wed Oct 25 13:07:57 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Oct 2006 06:07:57 -0700
Subject: rpms/yumex/devel sources,1.34,1.35 yumex.spec,1.40,1.41
Message-ID: <200610251307.k9PD7vm4011774@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11716/devel

Modified Files:
	sources yumex.spec 
Log Message:
Release 1.1.7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	25 Oct 2006 08:25:15 -0000	1.34
+++ sources	25 Oct 2006 13:07:27 -0000	1.35
@@ -1 +1 @@
-7691f5b61017917fdbef102da170ba2f  yumex-1.1.6.tar.gz
+307104c00fb4b00c140c353d38d42b6b  yumex-1.1.7.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- yumex.spec	25 Oct 2006 08:25:15 -0000	1.40
+++ yumex.spec	25 Oct 2006 13:07:27 -0000	1.41
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.6
+Version:  1.1.7
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.7-1.0
+- Development Release 1.1.7-1.0
 * Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.6-1.0
 - Development Release 1.1.6-1.0
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0



From fedora-extras-commits at redhat.com  Wed Oct 25 13:07:56 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Oct 2006 06:07:56 -0700
Subject: rpms/yumex/FC-6 .cvsignore, 1.26, 1.27 sources, 1.34,
	1.35 yumex.spec, 1.40, 1.41
Message-ID: <200610251307.k9PD7uv6011770@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11716/FC-6

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 1.1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	25 Oct 2006 08:20:21 -0000	1.26
+++ .cvsignore	25 Oct 2006 13:07:26 -0000	1.27
@@ -1 +1 @@
-yumex-1.1.6.tar.gz
+yumex-1.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	25 Oct 2006 08:20:21 -0000	1.34
+++ sources	25 Oct 2006 13:07:26 -0000	1.35
@@ -1 +1 @@
-7691f5b61017917fdbef102da170ba2f  yumex-1.1.6.tar.gz
+307104c00fb4b00c140c353d38d42b6b  yumex-1.1.7.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/yumex.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- yumex.spec	25 Oct 2006 08:20:21 -0000	1.40
+++ yumex.spec	25 Oct 2006 13:07:26 -0000	1.41
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.6
+Version:  1.1.7
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.7-1.0
+- Development Release 1.1.7-1.0
 * Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.6-1.0
 - Development Release 1.1.6-1.0
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0



From fedora-extras-commits at redhat.com  Wed Oct 25 13:15:47 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:15:47 -0700
Subject: rpms/fluxstyle - New directory
Message-ID: <200610251315.k9PDFlcK011978@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11974/fluxstyle

Log Message:
Directory /cvs/extras/rpms/fluxstyle added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 13:15:53 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:15:53 -0700
Subject: rpms/fluxstyle/devel - New directory
Message-ID: <200610251315.k9PDFr4b011992@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11974/fluxstyle/devel

Log Message:
Directory /cvs/extras/rpms/fluxstyle/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 13:16:05 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:16:05 -0700
Subject: rpms/fluxstyle Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610251316.k9PDG5Dp012023@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12017

Added Files:
	Makefile import.log 
Log Message:
Setup of module fluxstyle


--- NEW FILE Makefile ---
# Top level Makefile for module fluxstyle
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 25 13:16:05 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:16:05 -0700
Subject: rpms/fluxstyle/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610251316.k9PDG5pk012041@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12017/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fluxstyle


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 25 13:17:00 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:17:00 -0700
Subject: rpms/fluxstyle import.log,1.1,1.2
Message-ID: <200610251317.k9PDH0NX012119@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12086

Modified Files:
	import.log 
Log Message:
auto-import fluxstyle-1.0.1-1 on branch devel from fluxstyle-1.0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Oct 2006 13:16:05 -0000	1.1
+++ import.log	25 Oct 2006 13:16:29 -0000	1.2
@@ -0,0 +1 @@
+fluxstyle-1_0_1-1:HEAD:fluxstyle-1.0.1-1.src.rpm:1161782186



From fedora-extras-commits at redhat.com  Wed Oct 25 13:17:00 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:17:00 -0700
Subject: rpms/fluxstyle/devel fluxstyle.desktop, NONE, 1.1 fluxstyle.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610251317.k9PDH0CV012123@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12086/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fluxstyle.desktop fluxstyle.spec 
Log Message:
auto-import fluxstyle-1.0.1-1 on branch devel from fluxstyle-1.0.1-1.src.rpm


--- NEW FILE fluxstyle.desktop ---
[Desktop Entry]
Encoding=UTF-8
Version=1.0.1
Type=Application
Name=Fluxstyle
Comment=Graphical style manager for fluxbox
TryExec=fluxStyle
Exec=fluxStyle
Icon=fluxmetal.png
Categories=Application;GTK;System;Utilities;


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

Name:           fluxstyle
Version:        1.0.1
Release:        1%{?dist}
Summary:        A graphical style manager for Fluxbox

Group:          User Interface/X
License:        GPL
URL:            http://fluxstyle.berlios.de
Source0:        http://errr-online.com/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1:        fluxstyle.desktop

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python >= 2.3, pygtk2-libglade, pygtk2, desktop-file-utils
# Im not sure how which of these requires is really needed... the fluxbox for sure 
# (version of flux is important due to a bug in pre .9.15) 
# but considering yum has to have python is making it a require really needed?
Requires:       python >= 2.3, pygtk2 >= 2.4, pygtk2-libglade, fluxbox >= 0.9.15  

%description
fluxstyle is a graphical style manager for the fluxbox window manager.
fluxstyle is written in python using pygtk and glade, you can use it
to preview, add, remove and apply styles in fluxbox.

%prep
%setup -q

sed -i s,"mini-fluxbox6.png","../images/mini-fluxbox6.png", images/main.glade
sed -i s,"fluxmetal.png","../images/fluxmetal.png", images/main.glade
%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

desktop-file-install --vendor  fedora \
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
    --add-category X-Fedora  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
cp images/fluxmetal.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

#clean up docs
rm -rf %{buildroot}%{_datadir}/%{name}/docs
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/Changelog docs/LICENSE docs/README
%{_bindir}/fluxStyle

%dir %{python_sitelib}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/glade/
%dir %{_datadir}/%{name}/images/
%dir %{_datadir}/icons/hicolor/48x48/apps

%{python_sitelib}/%{name}/parseConfig.py
%{python_sitelib}/%{name}/errorMessage.py 
%{python_sitelib}/%{name}/findStyles.py
%{python_sitelib}/%{name}/__init__.py
%{python_sitelib}/%{name}/*.pyc
%{python_sitelib}/%{name}/*.pyo

%{_datadir}/%{name}/glade/main.glade
%{_datadir}/%{name}/images/*.png
%{_datadir}/%{name}/images/none.jpg
%{_datadir}/applications/fedora-fluxstyle.desktop
%{_datadir}/icons/hicolor/48x48/apps/fluxmetal.png

%changelog
* Sun Oct 22 2006 Michael Rice <errr[AT]errr-online.com> - 1.0.1-1
- Version bump
- Fix Mime in .desktop file

* Thu Oct 19 2006 Michael Rice <errr[AT]errr-online.com> - 1.0-3
- Remove ghost from *.pyo
- Remove CFLAGS for noarch
- Remove python site search

* Wed Oct 18 2006 Michael Rice <errr[AT]errr-online.com> - 1.0-2
- Submission to extras for review
- Add .desktop file

* Wed Sep 20 2006 Michael Rice <errr at errr-online.com> - 1.0-1
- Build for fc5 fluxstyle-1.0-1

* Tue Apr 11 2006 Michael Rice <errr at errr-online.com> - 1.0
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Oct 2006 13:16:05 -0000	1.1
+++ .cvsignore	25 Oct 2006 13:16:30 -0000	1.2
@@ -0,0 +1 @@
+fluxstyle-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Oct 2006 13:16:05 -0000	1.1
+++ sources	25 Oct 2006 13:16:30 -0000	1.2
@@ -0,0 +1 @@
+f06e121439e67750a2913c91acd205a1  fluxstyle-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 13:20:20 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:20:20 -0700
Subject: owners owners.list,1.1871,1.1872
Message-ID: <200610251320.k9PDKKo0012184@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12164

Modified Files:
	owners.list 
Log Message:
Adding my self as maintainer of fluxstyle bug: 211548



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1871
retrieving revision 1.1872
diff -u -r1.1871 -r1.1872
--- owners.list	25 Oct 2006 09:35:54 -0000	1.1871
+++ owners.list	25 Oct 2006 13:19:50 -0000	1.1872
@@ -401,6 +401,7 @@
 Fedora Extras|flumotion|flumotion - the Fluendo Streaming Server|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|fluxbox|Fluxbox is a windowmanager that is based on Blackbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fluxconf|Configuration utility for fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|fluxstyle|Style Manager for fluxbox|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|fmio|FM radio card manipulation utility|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fontforge|An outline and bitmap font editor|kevin at tummy.com|extras-qa at fedoraproject.org|roozbeh at farsiweb.info



From fedora-extras-commits at redhat.com  Wed Oct 25 13:43:20 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 25 Oct 2006 06:43:20 -0700
Subject: rpms/zaptel/devel menuselect.makeopts,1.1,1.2 zaptel.spec,1.2,1.3
Message-ID: <200610251343.k9PDhKWw012333@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12315

Modified Files:
	menuselect.makeopts zaptel.spec 
Log Message:
* Wed Oct 25 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 1.4.0-4.beta2
- Compile sethdlc and package related bits.
- Remove some readmes that aren't applicable to library/userland




Index: menuselect.makeopts
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/menuselect.makeopts,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menuselect.makeopts	16 Oct 2006 11:53:07 -0000	1.1
+++ menuselect.makeopts	25 Oct 2006 13:42:50 -0000	1.2
@@ -1,2 +1,2 @@
 MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb xpp_usb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode 
-MENUSELECT_UTILS=sethdlc-new
+MENUSELECT_UTILS=


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/zaptel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zaptel.spec	19 Oct 2006 03:07:45 -0000	1.2
+++ zaptel.spec	25 Oct 2006 13:42:50 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.0
-Release: 3%{?dist}.beta2
+Release: 4%{?dist}.beta2
 License: GPL
 Group: Applications/System
 URL: http://www.digium.com/
@@ -92,6 +92,7 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
 mkdir -p %{buildroot}%{_sysconfdir}/udev/permissions.d
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -136,10 +137,9 @@
 %defattr(-,root,root,-)
 
 %doc ChangeLog
+%doc ifcfg-hdlc0
 %doc LICENSE
 %doc README
-%doc README.Astribank
-%doc README.b410p
 %doc README.fxotune
 %doc README.fxsusb
 %doc README.Linux26
@@ -150,7 +150,10 @@
 %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel
 %config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules
 
+%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc
 /sbin/ztcfg
+/sbin/sethdlc
+/sbin/sethdlc-new
 
 %{_initrddir}/zaptel
 %{_mandir}/man8/ztcfg.8*
@@ -185,6 +188,10 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Wed Oct 25 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 1.4.0-4.beta2
+- Compile sethdlc and package related bits.
+- Remove some readmes that aren't applicable to library/userland
+
 * Wed Oct 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-3.beta2
 - Update to 1.4.0-beta2
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:03:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 25 Oct 2006 07:03:33 -0700
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.20,1.21
Message-ID: <200610251403.k9PE3Xmt015395@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kipi-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369

Modified Files:
	kipi-plugins.spec 
Log Message:
* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.1.2-2
- rebuild against new(er) imlib2



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kipi-plugins.spec	29 Aug 2006 18:57:20 -0000	1.20
+++ kipi-plugins.spec	25 Oct 2006 14:03:02 -0000	1.21
@@ -2,7 +2,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group:   Applications/Multimedia
@@ -14,8 +14,6 @@
 BuildRequires: libkipi-devel
 BuildRequires: kdelibs-devel 
 ## slideshow plugin
-# shouldn't qt-devel Req these?  I think so, see http://bugzilla.redhat.com/193741
-#BuildRequires: libGL-devel libGLU-devel
 BuildRequires: imlib2-devel
 ## acquireimages, jpeglossless and rawconverter plugins
 BuildRequires: libtiff-devel
@@ -23,14 +21,11 @@
 BuildRequires: gphoto2-devel 
 ## jpeglossless plugin
 BuildRequires: libkexif-devel
-BuildRequires: ImageMagick-c++-devel
 # gr, -c++-devel doesn't Req: -devel on *some* distro/releases
-BuildRequires: ImageMagick-devel
+BuildRequires: ImageMagick-c++-devel ImageMagick-devel
 ## htmlexport plugin
-BuildRequires: libxslt-devel
-BuildRequires: libxml2-devel >= 2.6
-# bogus extra dep from libxslt.la
-BuildRequires: libgcrypt-devel 
+# libgcrypt is a bogus extra dep from libxslt.la
+BuildRequires: libxml2-devel libxslt-devel libgcrypt-devel 
 
 ## (mostly) Essential
 Requires: ImageMagick 
@@ -92,7 +87,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -156,6 +150,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.1.2-2
+- rebuild against new(er) imlib2
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.1.2-1
 - 0.1.2
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:14:03 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 25 Oct 2006 07:14:03 -0700
Subject: fedora-security/audit fc5,1.368,1.369 fc6,1.122,1.123
Message-ID: <200610251414.k9PEE3n1015591@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15571

Modified Files:
	fc5 fc6 
Log Message:
Give bugs for CVE-2006-5214/5



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- fc5	25 Oct 2006 09:45:31 -0000	1.368
+++ fc5	25 Oct 2006 14:14:00 -0000	1.369
@@ -7,14 +7,14 @@
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5229 ignore (openssh) reported not an issue
-CVE-2006-5215 VULNERABLE (xorg-x11-xdm)
-CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
-CVE-2006-5215 VULNERABLE (gdm)
-CVE-2006-5215 VULNERABLE (kdebase)
-CVE-2006-5214 VULNERABLE (xorg-x11-xdm)
-CVE-2006-5214 VULNERABLE (xorg-x11-xinit)
-CVE-2006-5214 VULNERABLE (gdm)
-CVE-2006-5214 VULNERABLE (kdebase)
+CVE-2006-5215 VULNERABLE (xorg-x11-xdm) bz#212167
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
+CVE-2006-5215 VULNERABLE (gdm) bz#212168
+CVE-2006-5215 VULNERABLE (kdebase) bz#212166
+CVE-2006-5214 VULNERABLE (xorg-x11-xdm) bz#212167
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
+CVE-2006-5214 VULNERABLE (gdm) bz#212168
+CVE-2006-5214 VULNERABLE (kdebase) bz#212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fc6	25 Oct 2006 09:45:31 -0000	1.122
+++ fc6	25 Oct 2006 14:14:00 -0000	1.123
@@ -8,11 +8,11 @@
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
-CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
-CVE-2006-5215 VULNERABLE (kdebase)
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
+CVE-2006-5215 VULNERABLE (kdebase) bz#212166
 CVE-2006-5214 version (xorg-x11-xdm)
-CVE-2006-5214 VULNERABLE (xorg-x11-xinit)
-CVE-2006-5214 VULNERABLE (kdebase)
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
+CVE-2006-5214 VULNERABLE (kdebase) bz#212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield



From fedora-extras-commits at redhat.com  Wed Oct 25 14:29:16 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 25 Oct 2006 07:29:16 -0700
Subject: fedora-security/audit fc5,1.369,1.370
Message-ID: <200610251429.k9PETGV5015813@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15795

Modified Files:
	fc5 
Log Message:
Was a symlink on FC5



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- fc5	25 Oct 2006 14:14:00 -0000	1.369
+++ fc5	25 Oct 2006 14:29:13 -0000	1.370
@@ -9,11 +9,9 @@
 CVE-2006-5229 ignore (openssh) reported not an issue
 CVE-2006-5215 VULNERABLE (xorg-x11-xdm) bz#212167
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5215 VULNERABLE (gdm) bz#212168
 CVE-2006-5215 VULNERABLE (kdebase) bz#212166
 CVE-2006-5214 VULNERABLE (xorg-x11-xdm) bz#212167
 CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5214 VULNERABLE (gdm) bz#212168
 CVE-2006-5214 VULNERABLE (kdebase) bz#212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only



From fedora-extras-commits at redhat.com  Wed Oct 25 14:40:11 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 25 Oct 2006 07:40:11 -0700
Subject: rpms/zaptel/FC-6 menuselect.makeopts,1.1,1.2 zaptel.spec,1.2,1.3
Message-ID: <200610251440.k9PEeBoI015935@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15915

Modified Files:
	menuselect.makeopts zaptel.spec 
Log Message:
* Wed Oct 25 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 1.4.0-4.beta2
- Compile sethdlc and package related bits.
- Remove some readmes that aren't applicable to library/userland




Index: menuselect.makeopts
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-6/menuselect.makeopts,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menuselect.makeopts	16 Oct 2006 11:53:07 -0000	1.1
+++ menuselect.makeopts	25 Oct 2006 14:39:41 -0000	1.2
@@ -1,2 +1,2 @@
 MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb xpp_usb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode 
-MENUSELECT_UTILS=sethdlc-new
+MENUSELECT_UTILS=


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-6/zaptel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zaptel.spec	19 Oct 2006 03:07:45 -0000	1.2
+++ zaptel.spec	25 Oct 2006 14:39:41 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.0
-Release: 3%{?dist}.beta2
+Release: 4%{?dist}.beta2
 License: GPL
 Group: Applications/System
 URL: http://www.digium.com/
@@ -92,6 +92,7 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
 mkdir -p %{buildroot}%{_sysconfdir}/udev/permissions.d
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -136,10 +137,9 @@
 %defattr(-,root,root,-)
 
 %doc ChangeLog
+%doc ifcfg-hdlc0
 %doc LICENSE
 %doc README
-%doc README.Astribank
-%doc README.b410p
 %doc README.fxotune
 %doc README.fxsusb
 %doc README.Linux26
@@ -150,7 +150,10 @@
 %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel
 %config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules
 
+%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc
 /sbin/ztcfg
+/sbin/sethdlc
+/sbin/sethdlc-new
 
 %{_initrddir}/zaptel
 %{_mandir}/man8/ztcfg.8*
@@ -185,6 +188,10 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Wed Oct 25 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 1.4.0-4.beta2
+- Compile sethdlc and package related bits.
+- Remove some readmes that aren't applicable to library/userland
+
 * Wed Oct 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-3.beta2
 - Update to 1.4.0-beta2
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:40:44 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 07:40:44 -0700
Subject: rpms/highlight/FC-6 highlight.spec,1.17,1.18
Message-ID: <200610251440.k9PEei4O015961@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15939

Modified Files:
	highlight.spec 
Log Message:
Rebuid bc buildsys failure


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-6/highlight.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- highlight.spec	24 Oct 2006 17:34:38 -0000	1.17
+++ highlight.spec	25 Oct 2006 14:40:13 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.4.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Wed Oct 25 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1.1
+- Rebuilt
+
 * Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:53:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 25 Oct 2006 07:53:57 -0700
Subject: rpms/ntfs-3g/FC-5 ntfs-3g.spec,1.1,1.2
Message-ID: <200610251453.k9PErv4d016135@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052/FC-5

Modified Files:
	ntfs-3g.spec 
Log Message:

add missing Provides to make life easier for people



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-5/ntfs-3g.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntfs-3g.spec	20 Oct 2006 19:43:35 -0000	1.1
+++ ntfs-3g.spec	25 Oct 2006 14:53:27 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.3.%{buildrev}%{?dist}
+Release:	0.4.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -13,6 +13,8 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 Epoch:		1
+Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
 The ntfs-3g driver is an open source, GPL licensed, third generation 
@@ -75,6 +77,9 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Oct 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.4.20070920
+- add some extra Provides
+
 * Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.3.20070920
 - add explicit Requires on fuse
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:53:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 25 Oct 2006 07:53:59 -0700
Subject: rpms/ntfs-3g/devel ntfs-3g.spec,1.1,1.2
Message-ID: <200610251453.k9PErxbY016141@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052/devel

Modified Files:
	ntfs-3g.spec 
Log Message:

add missing Provides to make life easier for people



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntfs-3g.spec	20 Oct 2006 19:43:35 -0000	1.1
+++ ntfs-3g.spec	25 Oct 2006 14:53:29 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.3.%{buildrev}%{?dist}
+Release:	0.4.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -13,6 +13,8 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 Epoch:		1
+Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
 The ntfs-3g driver is an open source, GPL licensed, third generation 
@@ -75,6 +77,9 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Oct 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.4.20070920
+- add some extra Provides
+
 * Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.3.20070920
 - add explicit Requires on fuse
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:54:01 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 07:54:01 -0700
Subject: rpms/highlight/FC-5 highlight.spec,1.16,1.17
Message-ID: <200610251454.k9PEs1YV016144@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16107

Modified Files:
	highlight.spec 
Log Message:
Rebuild bc. buildsys failure


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- highlight.spec	24 Oct 2006 17:32:01 -0000	1.16
+++ highlight.spec	25 Oct 2006 14:53:31 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.4.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Wed Oct 25 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1.1
+- Rebuilt
+
 * Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:53:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 25 Oct 2006 07:53:58 -0700
Subject: rpms/ntfs-3g/FC-6 ntfs-3g.spec,1.1,1.2
Message-ID: <200610251453.k9PErw0r016138@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052/FC-6

Modified Files:
	ntfs-3g.spec 
Log Message:

add missing Provides to make life easier for people



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/ntfs-3g.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntfs-3g.spec	20 Oct 2006 19:43:35 -0000	1.1
+++ ntfs-3g.spec	25 Oct 2006 14:53:28 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.3.%{buildrev}%{?dist}
+Release:	0.4.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -13,6 +13,8 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 Epoch:		1
+Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
 The ntfs-3g driver is an open source, GPL licensed, third generation 
@@ -75,6 +77,9 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Oct 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.4.20070920
+- add some extra Provides
+
 * Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.3.20070920
 - add explicit Requires on fuse
 



From fedora-extras-commits at redhat.com  Wed Oct 25 15:11:58 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 25 Oct 2006 08:11:58 -0700
Subject: rpms/kompose/devel kompose.spec,1.5,1.6
Message-ID: <200610251511.k9PFBw3K019358@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kompose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19342

Modified Files:
	kompose.spec 
Log Message:
Rebuild for new imlib2



Index: kompose.spec
===================================================================
RCS file: /cvs/extras/rpms/kompose/devel/kompose.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kompose.spec	5 Sep 2006 20:06:22 -0000	1.5
+++ kompose.spec	25 Oct 2006 15:11:28 -0000	1.6
@@ -1,7 +1,7 @@
 Name: kompose
 Summary: Provides a full screen view of all open windows
 Version: 0.5.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: User Interface/X
 Url: http://kompose.berlios.de
@@ -67,6 +67,9 @@
 %{_datadir}/pixmaps/kompose.png
 
 %changelog
+* Wed Oct 25 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-7
+- Rebuild for new imlib2
+
 * Tue Aug 29 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-6
 - Revert to 0.5.3 and rebuild for FC6.  0.5.4 does not compile
 



From fedora-extras-commits at redhat.com  Wed Oct 25 16:13:36 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 09:13:36 -0700
Subject: rpms/csound/devel csound-5.03.0-remote-fixes.patch, NONE,
	1.1 csound.spec, 1.3, 1.4
Message-ID: <200610251613.k9PGDahq022610@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22591

Modified Files:
	csound.spec 
Added Files:
	csound-5.03.0-remote-fixes.patch 
Log Message:
* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
- Fix the remote plugin's local IP address read code, add more error checking



csound-5.03.0-remote-fixes.patch:

--- NEW FILE csound-5.03.0-remote-fixes.patch ---
--- Csound5.03.0/OOps/remote.c.remote-debug	2006-10-23 08:18:21.000000000 -0400
+++ Csound5.03.0/OOps/remote.c	2006-10-25 12:08:20.000000000 -0400
@@ -36,15 +36,18 @@
 
 #define ST(x)   (((REMOTE_GLOBALS*) ((CSOUND*)csound)->remoteGlobals)->x)
 
+void remote_Cleanup(CSOUND *csound);
+
+
 void remoteRESET(CSOUND *csound)
 {
     csound->remoteGlobals = NULL;
 }
 
  /* get the IPaddress of this machine */
-static void getIpAddress(char *ipaddr, char *ifname)
+static int getIpAddress(char *ipaddr, char *ifname)
 {
-
+    int ret = -1;
 #ifdef WIN32
     /* VL 12/10/06: something needs to go here */
     /* gethostbyname is the real answer; code below id unsafe */
@@ -57,25 +60,26 @@
 memset(&sin, 0, sizeof (struct sockaddr_in));
 memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
 strcpy(ipaddr, inet_ntoa (sin.sin_addr));
+ret = 0;
 
 #else
     struct ifreq ifr;
-    int fd, i;
-    unsigned char val;
+    int fd;
 
     fd = socket(AF_INET,SOCK_DGRAM, 0);
     if (fd >= 0) {
       strcpy(ifr.ifr_name, ifname);
 
       if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
-        for( i=2; i<6; i++){
-          val = (unsigned char)ifr.ifr_ifru.ifru_addr.sa_data[i];
-          sprintf(ipaddr, "%s%d%s", ipaddr, val, i==5?"":".");
-        }
+        char *local;
+        local = inet_ntoa(((struct sockaddr_in *)(&ifr.ifr_addr))->sin_addr);
+        strcpy(ipaddr, local);
+        ret = 0;
       }
     }
     close(fd);
 #endif
+    return ret;
 }
 
 char remoteID(CSOUND *csound)
@@ -84,31 +88,83 @@
     return ST(ipadrs)[len-1];
 }
 
-static void callox(CSOUND *csound)
+static int callox(CSOUND *csound)
 {
-    if (csound->remoteGlobals == NULL)
+    if (csound->remoteGlobals == NULL) {
       csound->remoteGlobals = csound->Calloc(csound, sizeof(REMOTE_GLOBALS));
+      if (csound->remoteGlobals == NULL) {
+        csound->Message(csound, Str("insufficient memory to initialize remote"
+                        " globals."));
+        goto error;
+      }
+    }
 
     ST(socksout) = (SOCK*)csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(SOCK));
+    if (ST(socksout) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize outgoing "
+                      "socket table."));
+      goto error;
+    }
     ST(socksin) = (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(socksin) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize incoming "
+                      "socket table."));
+      goto error;
+    }
     ST(insrfd_list) =
       (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(insrfd_list) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "insrfd_list."));
+      goto error;
+    }
     ST(chnrfd_list) =
       (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(chnrfd_list) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "chnrfd_list."));
+      goto error;
+    }
     ST(insrfd) = (int*) csound->Calloc(csound,(size_t)129 * sizeof(int));
+    if (ST(insrfd) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "insrfd table."));
+      goto error;
+    }
     ST(chnrfd) = (int*) csound->Calloc(csound,(size_t)17 * sizeof(int));
+    if (ST(chnrfd) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "chnrfd table."));
+      goto error;
+    }
     ST(ipadrs) = (char*) csound->Calloc(csound,(size_t)15 * sizeof(char));
+    if (ST(ipadrs) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "local ip address."));
+      goto error;
+    }
+
+	/* get IP adrs of this machine */
+	/* FIXME: don't hardcode eth0 */
+    if (getIpAddress(ST(ipadrs), "eth0") < 0) {
+      csound->Message(csound, Str("unable to get local ip address."));
+      goto error;
+    }
+
+	return 0;
 
-    getIpAddress(ST(ipadrs), "eth0"); /* get IP adrs of this machine */
+error:
+    /* Clean up anything we may have allocated before running out of memory */
+    remote_Cleanup(csound);
+    return -1;
 }
 
 /* Cleanup the above; called from musmon csoundCleanup */
 void remote_Cleanup(CSOUND *csound)
 {
     int fd;
-/*     if (csound->remoteGlobals == NULL) return; */
-    if (ST(socksout) == NULL) return;     /* if nothing allocated, return */
-    else {
+    if (csound->remoteGlobals == NULL) return;
+    if (ST(socksout) != NULL) {
       SOCK *sop = ST(socksout), *sop_end = sop + MAXREMOTES;
       for ( ; sop < sop_end; sop++)
         if ((fd = sop->rfd) > 0)
@@ -285,7 +341,12 @@
 {   /*      INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 3) {
       csound->InitError(csound, Str("missing instr nos"));
       return 0;
@@ -327,7 +388,12 @@
 {   /*      INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 2) {
       csound->InitError(csound, Str("missing instr nos"));
       return NOTOK;
@@ -357,7 +423,12 @@
 {                                            /* INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 3) {
       csound->InitError(csound, Str("missing channel nos"));
       return NOTOK;
@@ -396,7 +467,12 @@
 {                                         /*       INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
     
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 2) {
       csound->InitError(csound, Str("missing channel nos"));
       return NOTOK;


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csound.spec	24 Oct 2006 04:35:22 -0000	1.3
+++ csound.spec	25 Oct 2006 16:13:06 -0000	1.4
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       4%{?dist}
+Release:       5%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -40,6 +40,7 @@
 Patch1: csound-5.03.0-gstabs-disable-option.patch
 Patch2: csound-5.03.0-no-usr-local.patch
 Patch3: csound-5.03.0-disable-atsa.patch
+Patch4: csound-5.03.0-remote-fixes.patch
 
 
 %description
@@ -165,6 +166,7 @@
 %patch1 -p1 -b .gstabs-disable-option
 %patch2 -p1 -b .no-usr-local
 %patch3 -p1 -b .disable-atsa
+%patch4 -p1 -b .remote-fixes
 
 tar xf %{SOURCE1}
 
@@ -376,6 +378,9 @@
 %doc tutorial/*.py
 
 %changelog
+* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
+- Fix the remote plugin's local IP address read code, add more error checking
+
 * Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
 - Drop csound-5.03.0-uninitialized.patch, upstream
 - Drop csound-5.03.0-printf-redef.patch, upstream



From fedora-extras-commits at redhat.com  Wed Oct 25 16:18:51 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 25 Oct 2006 09:18:51 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.1,1.2
Message-ID: <200610251618.k9PGIpRq022698@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22678

Modified Files:
	international-time.spec 
Log Message:
* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
- Update desktop database on installation.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- international-time.spec	20 Oct 2006 17:03:09 -0000	1.1
+++ international-time.spec	25 Oct 2006 16:18:21 -0000	1.2
@@ -48,6 +48,14 @@
 %clean
 rm -rf %{buildroot}
 
+%post
+/usr/bin/update-desktop-database &>/dev/null ||:
+
+%postun
+if [ "$1" = "0" ]; then
+  /usr/bin/update-desktop-database &>/dev/null ||:
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -56,6 +64,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
+- Update desktop database on installation.
+
 * Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1
 - 0.0.2.  More fixes from package review.
 



From fedora-extras-commits at redhat.com  Wed Oct 25 16:19:45 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 25 Oct 2006 09:19:45 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.2,1.3
Message-ID: <200610251619.k9PGJja4022723@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22704

Modified Files:
	international-time.spec 
Log Message:
0.0.2-2.1


Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- international-time.spec	25 Oct 2006 16:18:21 -0000	1.2
+++ international-time.spec	25 Oct 2006 16:19:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: 	A tool for arranging times in advance with overseas colleagues
 Name: 		international-time
 Version: 	0.0.2
-Release: 	2%{?dist}
+Release: 	2%{?dist}.1
 License: 	GPL
 Group: 		Applications/System
 Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
@@ -64,7 +64,7 @@
 %{_datadir}/applications/*
 
 %changelog
-* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1
 - Update desktop database on installation.
 
 * Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1



From fedora-extras-commits at redhat.com  Wed Oct 25 16:50:32 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:50:32 -0700
Subject: rpms/crossvc - New directory
Message-ID: <200610251650.k9PGoWCV023068@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23064/crossvc

Log Message:
Directory /cvs/extras/rpms/crossvc added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 16:50:37 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:50:37 -0700
Subject: rpms/crossvc/devel - New directory
Message-ID: <200610251650.k9PGobGt023082@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23064/crossvc/devel

Log Message:
Directory /cvs/extras/rpms/crossvc/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 16:50:54 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:50:54 -0700
Subject: rpms/crossvc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610251650.k9PGossm023113@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23107

Added Files:
	Makefile import.log 
Log Message:
Setup of module crossvc


--- NEW FILE Makefile ---
# Top level Makefile for module crossvc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 25 16:51:00 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:51:00 -0700
Subject: rpms/crossvc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610251651.k9PGp0Zs023130@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23107/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crossvc


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 25 16:52:13 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:52:13 -0700
Subject: rpms/crossvc import.log,1.1,1.2
Message-ID: <200610251652.k9PGqD7h023213@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23178

Modified Files:
	import.log 
Log Message:
auto-import crossvc-1.5.0-4.fc6 on branch devel from crossvc-1.5.0-4.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crossvc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Oct 2006 16:50:54 -0000	1.1
+++ import.log	25 Oct 2006 16:51:43 -0000	1.2
@@ -0,0 +1 @@
+crossvc-1_5_0-4_fc6:HEAD:crossvc-1.5.0-4.fc6.src.rpm:1161795094



From fedora-extras-commits at redhat.com  Wed Oct 25 16:52:14 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:52:14 -0700
Subject: rpms/crossvc/devel crossvc.desktop, NONE, 1.1 crossvc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610251652.k9PGqEJu023217@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23178/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crossvc.desktop crossvc.spec 
Log Message:
auto-import crossvc-1.5.0-4.fc6 on branch devel from crossvc-1.5.0-4.fc6.src.rpm


--- NEW FILE crossvc.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=CrossVC
Comment=Graphical CVS Client (QT)
Exec=crossvc
Icon=crossvc.xpm
Terminal=false
StartupNotify=true
Type=Application
Categories=Application;Development;


--- NEW FILE crossvc.spec ---
Name:             crossvc
Version:          1.5.0
Release:          4%{?dist}

Summary:          Graphical CVS Client

Group:            Development/Tools
License:          GPL
URL:              http://www.lincvs.org
Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
Source1:          crossvc.desktop
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:    cvs >= 0:1.9.0
BuildRequires:    qt-devel >= 1:3.3
BuildRequires:    desktop-file-utils
Requires:         cvs >= 0:1.9.0

Provides:         lincvs = %{version}-%{release}
Obsoletes:        lincvs < 1.5.0

%description
CrossVC is a graphical Interface for the cvs client commandline tool 
on the Unix and Windows platform. It allows ato load modules from a 
server (checkout), create modules on the server (import), as well as 
checking the state of directories and individual files or 
updating them. Basic operations like add, remove and commit are 
supported as matter of course, just like showing the actual differences 
between the server version and the local sandbox, graphical display of 
the version tree, and manifoldy graphical support of project maintenance. 
All actions are logged on the cvs server (configurable via history), 
and are therewith comprehensible.

To keep CrossVC independent of the cvs version, CrossVC uses the local 
but separat installed cvs and therewith always should work with the 
latest version.


%prep
%setup -q -n CrossVC

cat <<'EOF' >lincvs.sh
#!/bin/sh
exec %{_libdir}/CrossVC/AppRun $@
EOF

%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
qmake -o Makefile lincvs.pro
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
%makeinstall
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps

cp -Rpa CrossVC ${RPM_BUILD_ROOT}%{_libdir}
cp -p CrossVC/AppIcon.xpm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/crossvc.xpm

install -p -D -m0755 lincvs.sh ${RPM_BUILD_ROOT}%{_bindir}/crossvc

desktop-file-install --vendor fedora                \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
  --add-category X-Fedora-Extra	                    \
  %{SOURCE1}


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS doc/README THANKS doc/SSH-HOWTO.txt doc/PROXY-HOWTO.txt doc/FAQ.txt
%attr(755,root,root) %{_bindir}/crossvc
%{_libdir}/CrossVC
%{_datadir}/pixmaps/crossvc.xpm
%{_datadir}/applications/fedora-crossvc.desktop


%changelog
* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-4
- Fix startup script (#210309)

* Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
- Add Provides and Obsolete tag (#209917)

* Wed Sep 27 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-1
- New upstream release

* Tue Feb 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.4.4-1
- Update to 1.4.4

* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 1.4.1-1
- update to 1.4.1
- BR desktop-file-utils (#156234)

* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.4.0-0.3.rc2
- rebuild on all arches

* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt

* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.4.0-0.1.rc2
- Fix for x86_64.

* Sat Feb 12 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.4.0-0.rc2
- 1.4.0-rc2.

* Sat Apr 05 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:1.1.5-0.fdr.4
- Added XFree86-devel to BuildRequires.
- Changed group to Development/Tools.
- Changed desktop category to Developement.

* Wed Apr 02 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.1.5-0.fdr.3
- Spec rebuilt after willy-nilly deletion of old one.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Oct 2006 16:51:00 -0000	1.1
+++ .cvsignore	25 Oct 2006 16:51:44 -0000	1.2
@@ -0,0 +1 @@
+crossvc-1.5.0-0-generic-src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Oct 2006 16:51:00 -0000	1.1
+++ sources	25 Oct 2006 16:51:44 -0000	1.2
@@ -0,0 +1 @@
+1c491bcaa92458e770227a7b5a62fad8  crossvc-1.5.0-0-generic-src.tgz



From fedora-extras-commits at redhat.com  Wed Oct 25 16:54:30 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:54:30 -0700
Subject: rpms/lincvs/devel dead.package, NONE, 1.1 crossvc.desktop, 1.1,
	NONE crossvc.spec, 1.3, NONE sources, 1.6, NONE
Message-ID: <200610251654.k9PGsUo9023287@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23282

Added Files:
	dead.package 
Removed Files:
	crossvc.desktop crossvc.spec sources 
Log Message:
Renamed lincvs into crossvc


--- NEW FILE dead.package ---
Package was renamed into crossvc.


--- crossvc.desktop DELETED ---


--- crossvc.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 25 17:22:03 2006
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Wed, 25 Oct 2006 10:22:03 -0700
Subject: fedora-security/audit fc5,1.370,1.371 fc6,1.123,1.124
Message-ID: <200610251722.k9PHM3KS026491@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26470

Modified Files:
	fc5 fc6 
Log Message:
ImageMagick overrun issues



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- fc5	25 Oct 2006 14:29:13 -0000	1.370
+++ fc5	25 Oct 2006 17:22:00 -0000	1.371
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- fc6	25 Oct 2006 14:14:00 -0000	1.123
+++ fc6	25 Oct 2006 17:22:00 -0000	1.124
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]



From fedora-extras-commits at redhat.com  Wed Oct 25 17:33:34 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 10:33:34 -0700
Subject: extras-buildsys/www/template main.psp,1.3.4.1,1.3.4.2
Message-ID: <200610251733.k9PHXY0U026610@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26573/www/template

Modified Files:
      Tag: STABLE_0_4
	main.psp 
Log Message:
2006-10-25  Dan Williams  <dcbw at redhat.com>

	* www/template/main.psp
		- Fix cross-site scripting vulnerability by stripping the provided
			email address quite harshly




Index: main.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- main.psp	24 Nov 2005 22:39:09 -0000	1.3.4.1
+++ main.psp	25 Oct 2006 17:33:31 -0000	1.3.4.2
@@ -2,6 +2,7 @@
 <%
 import time
 import os
+import urllib, cgi
 from plague import XMLRPCServerProxy
 from OpenSSL import SSL
 
@@ -18,7 +19,20 @@
 if form.has_key('action'):
     action = str(form['action'])
 if form.has_key('email'):
-    user_email = str(form['email'])
+    user_email = ''
+    unsafe = str(form['email'])
+    a = urllib.unquote(unsafe)
+    a = urllib.unquote(a)
+    if a == urllib.unquote(a):
+        safe = ''
+        for item in a:
+            if item != '>' and item != '<' and item != '/' and item != '\\' and item != ')' and item != '(' and item != "'" and item != '"' and item != '%':
+                safe = safe + item
+        user_email = cgi.escape(safe)
+    else:
+        # No email for you, too many quote levels
+        user_email = "error"
+    # endif
 
 # endif
 %>



From fedora-extras-commits at redhat.com  Wed Oct 25 17:33:33 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 10:33:33 -0700
Subject: extras-buildsys ChangeLog,1.126.2.48,1.126.2.49
Message-ID: <200610251733.k9PHXXxY026604@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26573

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-10-25  Dan Williams  <dcbw at redhat.com>

	* www/template/main.psp
		- Fix cross-site scripting vulnerability by stripping the provided
			email address quite harshly




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.48
retrieving revision 1.126.2.49
diff -u -r1.126.2.48 -r1.126.2.49
--- ChangeLog	2 Jun 2006 14:59:17 -0000	1.126.2.48
+++ ChangeLog	25 Oct 2006 17:33:31 -0000	1.126.2.49
@@ -1,3 +1,9 @@
+2006-10-25  Dan Williams  <dcbw at redhat.com>
+
+	* www/template/main.psp
+		- Fix cross-site scripting vulnerability by stripping the provided
+			email address quite harshly
+
 2006-06-02  Dan Williams  <dcbw at redhat.com>
 
     Patch from Michael Schwendt <bugs.michael at gmx.net>



From fedora-extras-commits at redhat.com  Wed Oct 25 17:34:32 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 10:34:32 -0700
Subject: extras-buildsys ChangeLog,1.210,1.211
Message-ID: <200610251734.k9PHYWvA026661@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26630

Modified Files:
	ChangeLog 
Log Message:
2006-10-25  Dan Williams  <dcbw at redhat.com>

	* www/template/main.psp
		- Fix cross-site scripting vulnerability by stripping the provided
			email address quite harshly




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- ChangeLog	26 Jul 2006 00:32:35 -0000	1.210
+++ ChangeLog	25 Oct 2006 17:34:30 -0000	1.211
@@ -1,3 +1,9 @@
+2006-10-25  Dan Williams  <dcbw at redhat.com>
+
+	* www/template/main.psp
+		- Fix cross-site scripting vulnerability by stripping the provided
+			email address quite harshly
+
 2006-07-25  Dan Williams  <dcbw at redhat.com>
 
     Patch from Dennis Gilmore <dennis at ausil.us>



From fedora-extras-commits at redhat.com  Wed Oct 25 17:34:33 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 10:34:33 -0700
Subject: extras-buildsys/www/template main.psp,1.4,1.5
Message-ID: <200610251734.k9PHYX9m026667@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26630/www/template

Modified Files:
	main.psp 
Log Message:
2006-10-25  Dan Williams  <dcbw at redhat.com>

	* www/template/main.psp
		- Fix cross-site scripting vulnerability by stripping the provided
			email address quite harshly




Index: main.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- main.psp	25 Nov 2005 04:45:18 -0000	1.4
+++ main.psp	25 Oct 2006 17:34:30 -0000	1.5
@@ -2,6 +2,7 @@
 <%
 import time
 import os
+import urllib, cgi
 from plague import XMLRPCServerProxy
 from OpenSSL import SSL
 
@@ -18,7 +19,20 @@
 if form.has_key('action'):
     action = str(form['action'])
 if form.has_key('email'):
-    user_email = str(form['email'])
+    user_email = ''
+    unsafe = str(form['email'])
+    a = urllib.unquote(unsafe)
+    a = urllib.unquote(a)
+    if a == urllib.unquote(a):
+        safe = ''
+        for item in a:
+            if item != '>' and item != '<' and item != '/' and item != '\\' and item != ')' and item != '(' and item != "'" and item != '"' and item != '%':
+                safe = safe + item
+        user_email = cgi.escape(safe)
+    else:
+        # No email for you, too many quote levels
+        user_email = "error"
+    # endif
 
 # endif
 %>



From fedora-extras-commits at redhat.com  Wed Oct 25 18:31:03 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 11:31:03 -0700
Subject: rpms/jd/devel jd.spec,1.9,1.10
Message-ID: <200610251831.k9PIV3s1029983@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29963

Modified Files:
	jd.spec 
Log Message:
* 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.



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jd.spec	25 Oct 2006 12:28:52 -0000	1.9
+++ jd.spec	25 Oct 2006 18:30:33 -0000	1.10
@@ -16,7 +16,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -28,7 +28,7 @@
 %define         pre_release   1
 
 %if %{pre_release}
-%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}.1
+%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
 %else
 %define         rel           %{vendor_rel}%{?dist}
 %endif
@@ -78,10 +78,13 @@
 
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
+# desktop-file-tools 0.10->0.11 change
+# 0.11 no longer accepts Applications, X-Fedora, X-RedHat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --add-category %{category} \
+   --remove-category %{category} \
+   --remove-category Application \
    %{name}.desktop
 
 %clean
@@ -103,8 +106,9 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Respin
+* 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



From fedora-extras-commits at redhat.com  Wed Oct 25 18:32:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 11:32:25 -0700
Subject: rpms/jd/devel jd.spec,1.10,1.11
Message-ID: <200610251832.k9PIWPd7030018@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30001

Modified Files:
	jd.spec 
Log Message:
remove category fix


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jd.spec	25 Oct 2006 18:30:33 -0000	1.10
+++ jd.spec	25 Oct 2006 18:31:54 -0000	1.11
@@ -83,7 +83,7 @@
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --remove-category %{category} \
+   --remove-category X-Red-Hat-Base \
    --remove-category Application \
    %{name}.desktop
 



From fedora-extras-commits at redhat.com  Wed Oct 25 18:33:58 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 11:33:58 -0700
Subject: rpms/jd/devel jd.spec,1.11,1.12
Message-ID: <200610251833.k9PIXwWg030057@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30029

Modified Files:
	jd.spec 
Log Message:
again small fix


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jd.spec	25 Oct 2006 18:31:54 -0000	1.11
+++ jd.spec	25 Oct 2006 18:33:28 -0000	1.12
@@ -79,7 +79,7 @@
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 # desktop-file-tools 0.10->0.11 change
-# 0.11 no longer accepts Applications, X-Fedora, X-RedHat-Base
+# 0.11 no longer accepts Applications, X-Fedora, X-Red-Hat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \



From fedora-extras-commits at redhat.com  Wed Oct 25 18:34:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 11:34:50 -0700
Subject: rpms/jd/devel jd.spec,1.12,1.13
Message-ID: <200610251834.k9PIYoLr030084@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30068

Modified Files:
	jd.spec 
Log Message:
oops...


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jd.spec	25 Oct 2006 18:33:28 -0000	1.12
+++ jd.spec	25 Oct 2006 18:34:20 -0000	1.13
@@ -79,7 +79,7 @@
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 # desktop-file-tools 0.10->0.11 change
-# 0.11 no longer accepts Applications, X-Fedora, X-Red-Hat-Base
+# 0.11 no longer accepts Application, X-Fedora, X-Red-Hat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \



From fedora-extras-commits at redhat.com  Wed Oct 25 18:43:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 25 Oct 2006 11:43:33 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.14, 1.15 gnupg2.spec, 1.53,
	1.54 sources, 1.16, 1.17
Message-ID: <200610251843.k9PIhXfQ030215@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30192

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.94-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	18 Oct 2006 18:43:44 -0000	1.14
+++ .cvsignore	25 Oct 2006 18:43:03 -0000	1.15
@@ -1,2 +1,2 @@
-gnupg-1.9.93.tar.bz2
-gnupg-1.9.93.tar.bz2.sig
+gnupg-1.9.94.tar.bz2
+gnupg-1.9.94.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnupg2.spec	18 Oct 2006 18:43:44 -0000	1.53
+++ gnupg2.spec	25 Oct 2006 18:43:03 -0000	1.54
@@ -11,7 +11,7 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.93
+Version: 1.9.94
 Release: 1%{?dist}
 
 License: GPL
@@ -95,8 +95,9 @@
 
 %build
 
+# see --disable-optimization below
 %ifarch x86_64
-#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O1|')"
+#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O0|')"
 %endif
 
 %configure \
@@ -182,6 +183,8 @@
 
 
 %changelog
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.94-1
+
 * Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.93-1
 - 1.9.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Oct 2006 18:43:44 -0000	1.16
+++ sources	25 Oct 2006 18:43:03 -0000	1.17
@@ -1,2 +1,2 @@
-fc2d20e6e8aba396953768b503bf07fe  gnupg-1.9.93.tar.bz2.sig
-84b1af5b6c489fcbbbbf4f219aaf2526  gnupg-1.9.93.tar.bz2
+1da8c928948800efa2a13d4aecb8d013  gnupg-1.9.94.tar.bz2
+18c269ffc15801ee62e1add2644391ec  gnupg-1.9.94.tar.bz2.sig



From fedora-extras-commits at redhat.com  Wed Oct 25 19:29:23 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 25 Oct 2006 12:29:23 -0700
Subject: rpms/rrdtool/devel rrdtool.spec,1.23,1.24
Message-ID: <200610251929.k9PJTN6G001031@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1015

Modified Files:
	rrdtool.spec 
Log Message:
Add tcl sub-package (#203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rrdtool.spec	5 Sep 2006 15:04:47 -0000	1.23
+++ rrdtool.spec	25 Oct 2006 19:28:53 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -85,6 +85,18 @@
 The %{name}-php package includes a dynamic shared object (DSO) that adds
 RRDtool bindings to the PHP HTML-embedded scripting language.
 
+%package tcl
+Summary: Tcl RRDtool bindings
+Group: Development/Languages
+BuildRequires: tcl-devel >= 8.0
+Requires: tcl >= 8.0
+Requires: %{name} = %{version}-%{release}
+Obsoletes: tcl-%{name} < %{version}-%{release}
+Provides: tcl-%{name} = %{version}-%{release}
+
+%description tcl
+The %{name}-tcl package includes RRDtool bindings for Tcl.
+
 %prep
 %setup -q
 %setup -q -T -D -a 1
@@ -105,6 +117,8 @@
 %configure \
     --disable-static \
     --with-pic \
+    --enable-tcl-site \
+    --with-tcllib=%{_libdir} \
     --with-perl-options='INSTALLDIRS="vendor"'
 
 # Fix another rpath issue
@@ -221,7 +235,16 @@
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
 %{php_extdir}/rrdtool.so
 
+%files tcl
+%defattr(-,root,root,-)
+%doc bindings/tcl/README
+%{_libdir}/tclrrd*.so
+%{_libdir}/rrdtool/*.tcl
+
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-5
+- Add tcl sub-package (#203275)
+
 * Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-4
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Wed Oct 25 19:35:52 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 25 Oct 2006 12:35:52 -0700
Subject: rpms/rrdtool/FC-6 rrdtool.spec,1.23,1.24
Message-ID: <200610251935.k9PJZqrI001165@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1149

Modified Files:
	rrdtool.spec 
Log Message:
Add tcl sub-package (#203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-6/rrdtool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rrdtool.spec	5 Sep 2006 15:04:47 -0000	1.23
+++ rrdtool.spec	25 Oct 2006 19:35:22 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -85,6 +85,18 @@
 The %{name}-php package includes a dynamic shared object (DSO) that adds
 RRDtool bindings to the PHP HTML-embedded scripting language.
 
+%package tcl
+Summary: Tcl RRDtool bindings
+Group: Development/Languages
+BuildRequires: tcl-devel >= 8.0
+Requires: tcl >= 8.0
+Requires: %{name} = %{version}-%{release}
+Obsoletes: tcl-%{name} < %{version}-%{release}
+Provides: tcl-%{name} = %{version}-%{release}
+
+%description tcl
+The %{name}-tcl package includes RRDtool bindings for Tcl.
+
 %prep
 %setup -q
 %setup -q -T -D -a 1
@@ -105,6 +117,8 @@
 %configure \
     --disable-static \
     --with-pic \
+    --enable-tcl-site \
+    --with-tcllib=%{_libdir} \
     --with-perl-options='INSTALLDIRS="vendor"'
 
 # Fix another rpath issue
@@ -221,7 +235,16 @@
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
 %{php_extdir}/rrdtool.so
 
+%files tcl
+%defattr(-,root,root,-)
+%doc bindings/tcl/README
+%{_libdir}/tclrrd*.so
+%{_libdir}/rrdtool/*.tcl
+
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-5
+- Add tcl sub-package (#203275)
+
 * Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-4
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Wed Oct 25 19:38:18 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 25 Oct 2006 12:38:18 -0700
Subject: rpms/rrdtool/FC-5 rrdtool.spec,1.23,1.24
Message-ID: <200610251938.k9PJcIqq001242@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1225

Modified Files:
	rrdtool.spec 
Log Message:
Add tcl sub-package (#203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rrdtool.spec	2 Aug 2006 14:43:16 -0000	1.23
+++ rrdtool.spec	25 Oct 2006 19:37:47 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.15
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -85,6 +85,18 @@
 The %{name}-php package includes a dynamic shared object (DSO) that adds
 RRDtool bindings to the PHP HTML-embedded scripting language.
 
+%package tcl
+Summary: Tcl RRDtool bindings
+Group: Development/Languages
+BuildRequires: tcl-devel >= 8.0
+Requires: tcl >= 8.0
+Requires: %{name} = %{version}-%{release}
+Obsoletes: tcl-%{name} < %{version}-%{release}
+Provides: tcl-%{name} = %{version}-%{release}
+
+%description tcl
+The %{name}-tcl package includes RRDtool bindings for Tcl.
+
 %prep
 %setup -q
 %setup -q -T -D -a 1
@@ -105,6 +117,8 @@
 %configure \
     --disable-static \
     --with-pic \
+    --enable-tcl-site \
+    --with-tcllib=%{_libdir} \
     --with-perl-options='INSTALLDIRS="vendor"'
 
 # Fix another rpath issue
@@ -221,7 +235,19 @@
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
 %{php_extdir}/rrdtool.so
 
+%files tcl
+%defattr(-,root,root,-)
+%doc bindings/tcl/README
+%{_libdir}/tclrrd*.so
+%{_libdir}/rrdtool/*.tcl
+
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-5
+- Add tcl sub-package (#203275)
+
+* Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-4
+- Rebuild for new glibc
+
 * Wed Aug 02 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-3
 - One more addition to initrrdtool patch, to fully revert
   and correct upstream changeset 839



From fedora-extras-commits at redhat.com  Wed Oct 25 19:47:32 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 25 Oct 2006 12:47:32 -0700
Subject: rpms/koan/FC-6 .cvsignore, 1.5, 1.6 koan.spec, 1.7, 1.8 sources, 1.6,
	1.7
Message-ID: <200610251947.k9PJlWf6001368@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + changed description




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Oct 2006 19:39:58 -0000	1.5
+++ .cvsignore	25 Oct 2006 19:47:02 -0000	1.6
@@ -2,3 +2,4 @@
 koan-0.2.1.tar.gz
 koan-0.2.2.tar.gz
 koan-0.2.3.tar.gz
+koan-0.2.4.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/koan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- koan.spec	24 Oct 2006 19:39:58 -0000	1.7
+++ koan.spec	25 Oct 2006 19:47:02 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -18,8 +18,8 @@
 %description
 
 Koan stands for kickstart-over-a-network and allows for both
-network provisioning of new Xen guests and destructive re-provisioning of
-any existing system.  For use with a boot-server configured with
+network provisioning of new virtualized guests and destructive re-provisioning 
+of any existing system.  For use with a boot-server configured with
 'cobbler'
 
 %prep
@@ -47,6 +47,10 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Wed Oct 25 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.4-1
+- Upstream changes (see CHANGELOG)
+- Description update
+
 * Tue Oct 24 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Oct 2006 19:39:58 -0000	1.6
+++ sources	25 Oct 2006 19:47:02 -0000	1.7
@@ -1 +1 @@
-34974b122210c2027e27da6524feffae  koan-0.2.3.tar.gz
+621686ed88229afd513e2a3340aba484  koan-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 19:50:05 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 25 Oct 2006 12:50:05 -0700
Subject: rpms/koan/FC-5 .cvsignore, 1.4, 1.5 koan.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200610251950.k9PJo5O8001444@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1424

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + description change




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Oct 2006 19:41:48 -0000	1.4
+++ .cvsignore	25 Oct 2006 19:49:34 -0000	1.5
@@ -1,3 +1,4 @@
 koan-0.1.1.tar.gz
 koan-0.2.2.tar.gz
 koan-0.2.3.tar.gz
+koan-0.2.4.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/koan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- koan.spec	24 Oct 2006 19:41:48 -0000	1.6
+++ koan.spec	25 Oct 2006 19:49:34 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -18,8 +18,8 @@
 %description
 
 Koan stands for kickstart-over-a-network and allows for both
-network provisioning of new Xen guests and destructive re-provisioning of
-any existing system.  For use with a boot-server configured with
+network provisioning of new virtualized guests and destructive re-provisioning 
+of any existing system.  For use with a boot-server configured with
 'cobbler'
 
 %prep
@@ -47,6 +47,10 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Wed Oct 25 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.4-1
+- Upstream changes (see CHANGELOG)
+- Description update
+
 * Tue Oct 24 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Oct 2006 19:41:48 -0000	1.5
+++ sources	25 Oct 2006 19:49:34 -0000	1.6
@@ -1,3 +1 @@
-d1b7df4a1fb022d345d79f3b182d769b  koan-0.1.1.tar.gz
-8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz
-34974b122210c2027e27da6524feffae  koan-0.2.3.tar.gz
+621686ed88229afd513e2a3340aba484  koan-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 19:55:17 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 25 Oct 2006 12:55:17 -0700
Subject: rpms/cobbler/FC-6 .cvsignore, 1.11, 1.12 cobbler.spec, 1.10,
	1.11 sources, 1.12, 1.13
Message-ID: <200610251955.k9PJtHh4001508@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1488

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + description change




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Oct 2006 21:55:27 -0000	1.11
+++ .cvsignore	25 Oct 2006 19:54:47 -0000	1.12
@@ -8,3 +8,4 @@
 cobbler-0.2.8.tar.gz
 cobbler-0.2.9.tar.gz
 cobbler-0.3.0.tar.gz
+cobbler-0.3.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cobbler.spec	24 Oct 2006 21:55:27 -0000	1.10
+++ cobbler.spec	25 Oct 2006 19:54:47 -0000	1.11
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.0
+Version: 0.3.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -17,10 +17,7 @@
 
 %description
 
-Cobbler is a command line tool for simplified configuration of provisioning
-servers.  It is also accessible as a Python library.  Cobbler supports PXE,
-Xen, and re-provisioning an existing Linux system via auto-kickstart.  The
-last two modes require 'koan' to be run on the remote system.
+Cobbler is a command line tool for configuration of boot/provisioning servers.  It is also accessible as a Python library.  Cobbler supports PXE, provisioning virtualized ("virt") images, and reinstalling machines that are already up and running (over SSH).  The last two modes require a helper tool called 'koan' that integrates with cobbler.  Cobbler's advanced features include importing distributions from rsync mirrors, kickstart templating, and managing dhcpd.conf.
 
 %prep
 %setup -q
@@ -55,6 +52,10 @@
 
 %changelog
 
+* Wed Oct 25 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.1-1
+- Upstream changes (see CHANGELOG)
+- Updated description
+
 * Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.0-1
 - Upstream changes (see CHANGELOG)
 - Marked files in /etc/cobbler as config


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Oct 2006 21:55:27 -0000	1.12
+++ sources	25 Oct 2006 19:54:47 -0000	1.13
@@ -1 +1 @@
-e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz
+0899462306f7da1e1423bd1fdaf679a1  cobbler-0.3.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 19:57:20 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 25 Oct 2006 12:57:20 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.6, 1.7 cobbler.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200610251957.k9PJvK0B001579@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1559

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + description change




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Oct 2006 21:58:12 -0000	1.6
+++ .cvsignore	25 Oct 2006 19:56:50 -0000	1.7
@@ -3,3 +3,4 @@
 cobbler-0.2.8.tar.gz
 cobbler-0.2.9.tar.gz
 cobbler-0.3.0.tar.gz
+cobbler-0.3.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cobbler.spec	24 Oct 2006 21:58:12 -0000	1.5
+++ cobbler.spec	25 Oct 2006 19:56:50 -0000	1.6
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.0
+Version: 0.3.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -17,10 +17,7 @@
 
 %description
 
-Cobbler is a command line tool for simplified configuration of provisioning
-servers.  It is also accessible as a Python library.  Cobbler supports PXE,
-Xen, and re-provisioning an existing Linux system via auto-kickstart.  The
-last two modes require 'koan' to be run on the remote system.
+Cobbler is a command line tool for configuration of boot/provisioning servers.  It is also accessible as a Python library.  Cobbler supports PXE, provisioning virtualized ("virt") images, and reinstalling machines that are already up and running (over SSH).  The last two modes require a helper tool called 'koan' that integrates with cobbler.  Cobbler's advanced features include importing distributions from rsync mirrors, kickstart templating, and managing dhcpd.conf.
 
 %prep
 %setup -q
@@ -55,6 +52,10 @@
 
 %changelog
 
+* Wed Oct 25 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.1-1
+- Upstream changes (see CHANGELOG)
+- Updated description
+
 * Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.0-1
 - Upstream changes (see CHANGELOG)
 - Marked files in /etc/cobbler as config


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Oct 2006 21:58:12 -0000	1.6
+++ sources	25 Oct 2006 19:56:50 -0000	1.7
@@ -1 +1,2 @@
 e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz
+0899462306f7da1e1423bd1fdaf679a1  cobbler-0.3.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 20:03:40 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 25 Oct 2006 13:03:40 -0700
Subject: rpms/basket/FC-5 .cvsignore, 1.2, 1.3 basket.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200610252003.k9PK3ejR004684@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/basket/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627/FC-5

Modified Files:
	.cvsignore basket.spec sources 
Log Message:
version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 16:11:00 -0000	1.2
+++ .cvsignore	25 Oct 2006 20:03:10 -0000	1.3
@@ -1 +1 @@
-basket-0.5.0.tar.gz
+basket-0.6.0.tar.gz


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-5/basket.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- basket.spec	21 Feb 2006 17:03:44 -0000	1.3
+++ basket.spec	25 Oct 2006 20:03:10 -0000	1.4
@@ -1,15 +1,14 @@
 Name:           basket
 Summary:        Notes taker for KDE
-Version:        0.5.0
-Release:        5%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 URL:           	http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
-Patch0:         basket-0.5.0-64bits.patch
+Source0:        http://basket.kde.org/downloads/basket-0.6.0.tar.gz
 License:        GPL
 
 Group:          Applications/Productivity
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs-devel, desktop-file-utils
+BuildRequires:  kdelibs-devel, desktop-file-utils, gamin-devel
 Requires:       kdebase >= 3.0
 
 %description
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bits
 
 
 %build
@@ -37,18 +35,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{find_lang} %{name}
-
 # Icons: use hicolor instead of crystalsvg
 mv $RPM_BUILD_ROOT%{_datadir}/icons/{crystalsvg,hicolor}
 
 # Menu
-# fix encoding
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop \
-        > $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop
-# install desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -60,6 +50,16 @@
         --add-category KDE \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%{find_lang} %{name}
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  lang=$(basename $lang_dir)
+  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+done
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -83,13 +83,34 @@
 %doc README AUTHORS COPYING ChangeLog NEWS TODO
 %{_bindir}/basket
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/actions/*.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/apps/basket
-%{_datadir}/doc/HTML/*/basket
-
+%{_libdir}/kde3/kcm_basket.*
+%{_libdir}/kde3/libbasketpart.*
+%{_libdir}/libbasketcommon.so
+%{_datadir}/services/*.desktop
 
 
 %changelog
+* Wed Oct 25 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.6.0-1
+- version 0.6.0
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
+- add explicit linking to libfam
+
+* Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-8
+- rebuild
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-7
+- BR: gamin-devel
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-6
+- rebuild
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.5.0-5
 - rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 16:11:00 -0000	1.2
+++ sources	25 Oct 2006 20:03:10 -0000	1.3
@@ -1 +1 @@
-1495261da3dbfc243a8340cd9c5723c2  basket-0.5.0.tar.gz
+968072a1c1dce84a0c6f8b72bd9b65b8  basket-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 20:03:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 25 Oct 2006 13:03:44 -0700
Subject: rpms/basket/devel .cvsignore, 1.2, 1.3 basket.spec, 1.8, 1.9 sources,
	1.2, 1.3
Message-ID: <200610252003.k9PK3ipu004688@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/basket/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627/devel

Modified Files:
	.cvsignore basket.spec sources 
Log Message:
version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 16:11:00 -0000	1.2
+++ .cvsignore	25 Oct 2006 20:03:14 -0000	1.3
@@ -1 +1 @@
-basket-0.5.0.tar.gz
+basket-0.6.0.tar.gz


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/basket.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- basket.spec	4 Oct 2006 22:48:16 -0000	1.8
+++ basket.spec	25 Oct 2006 20:03:14 -0000	1.9
@@ -1,10 +1,9 @@
 Name:           basket
 Summary:        Notes taker for KDE
-Version:        0.5.0
-Release:        10%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 URL:           	http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
-Patch0:         basket-0.5.0-64bits.patch
+Source0:        http://basket.kde.org/downloads/basket-0.6.0.tar.gz
 License:        GPL
 
 Group:          Applications/Productivity
@@ -21,8 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bits
-sed -i.orig -e 's/^basket_LDADD = \(.*\)$/basket_LDADD = -lfam \1/g' src/Makefile.in
 
 
 %build
@@ -38,18 +35,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{find_lang} %{name}
-
 # Icons: use hicolor instead of crystalsvg
 mv $RPM_BUILD_ROOT%{_datadir}/icons/{crystalsvg,hicolor}
 
 # Menu
-# fix encoding
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop \
-        > $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop
-# install desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -61,6 +50,16 @@
         --add-category KDE \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%{find_lang} %{name}
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  lang=$(basename $lang_dir)
+  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+done
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -84,15 +83,21 @@
 %doc README AUTHORS COPYING ChangeLog NEWS TODO
 %{_bindir}/basket
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/actions/*.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/apps/basket
-%{_datadir}/doc/HTML/*/basket
-
+%{_libdir}/kde3/kcm_basket.*
+%{_libdir}/kde3/libbasketpart.*
+%{_libdir}/libbasketcommon.so
+%{_datadir}/services/*.desktop
 
 
 %changelog
+* Wed Oct 25 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.6.0-1
+- version 0.6.0
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
 - add explicit linking to libfam


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 16:11:00 -0000	1.2
+++ sources	25 Oct 2006 20:03:14 -0000	1.3
@@ -1 +1 @@
-1495261da3dbfc243a8340cd9c5723c2  basket-0.5.0.tar.gz
+968072a1c1dce84a0c6f8b72bd9b65b8  basket-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 20:03:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 25 Oct 2006 13:03:44 -0700
Subject: rpms/basket/FC-6 .cvsignore, 1.2, 1.3 basket.spec, 1.8, 1.9 sources,
	1.2, 1.3
Message-ID: <200610252003.k9PK3iCC004690@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/basket/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627/FC-6

Modified Files:
	.cvsignore basket.spec sources 
Log Message:
version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 16:11:00 -0000	1.2
+++ .cvsignore	25 Oct 2006 20:03:12 -0000	1.3
@@ -1 +1 @@
-basket-0.5.0.tar.gz
+basket-0.6.0.tar.gz


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-6/basket.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- basket.spec	4 Oct 2006 22:48:16 -0000	1.8
+++ basket.spec	25 Oct 2006 20:03:12 -0000	1.9
@@ -1,10 +1,9 @@
 Name:           basket
 Summary:        Notes taker for KDE
-Version:        0.5.0
-Release:        10%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 URL:           	http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
-Patch0:         basket-0.5.0-64bits.patch
+Source0:        http://basket.kde.org/downloads/basket-0.6.0.tar.gz
 License:        GPL
 
 Group:          Applications/Productivity
@@ -21,8 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bits
-sed -i.orig -e 's/^basket_LDADD = \(.*\)$/basket_LDADD = -lfam \1/g' src/Makefile.in
 
 
 %build
@@ -38,18 +35,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{find_lang} %{name}
-
 # Icons: use hicolor instead of crystalsvg
 mv $RPM_BUILD_ROOT%{_datadir}/icons/{crystalsvg,hicolor}
 
 # Menu
-# fix encoding
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop \
-        > $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop
-# install desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -61,6 +50,16 @@
         --add-category KDE \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%{find_lang} %{name}
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  lang=$(basename $lang_dir)
+  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+done
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -84,15 +83,21 @@
 %doc README AUTHORS COPYING ChangeLog NEWS TODO
 %{_bindir}/basket
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/actions/*.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/apps/basket
-%{_datadir}/doc/HTML/*/basket
-
+%{_libdir}/kde3/kcm_basket.*
+%{_libdir}/kde3/libbasketpart.*
+%{_libdir}/libbasketcommon.so
+%{_datadir}/services/*.desktop
 
 
 %changelog
+* Wed Oct 25 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.6.0-1
+- version 0.6.0
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
 - add explicit linking to libfam


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 16:11:00 -0000	1.2
+++ sources	25 Oct 2006 20:03:12 -0000	1.3
@@ -1 +1 @@
-1495261da3dbfc243a8340cd9c5723c2  basket-0.5.0.tar.gz
+968072a1c1dce84a0c6f8b72bd9b65b8  basket-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 20:04:16 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 25 Oct 2006 13:04:16 -0700
Subject: comps comps-fe7.xml.in,NONE,1.1
Message-ID: <200610252004.k9PK4GQs004705@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4700

Added Files:
	comps-fe7.xml.in 
Log Message:
Copy over comps-fe6.xml.in for FC-7


--- NEW FILE comps-fe7.xml.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
<comps>
  <group>
    <id>admin-tools</id>
    <_name>Administration Tools</_name>
    <_description>This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">gparted</packagereq>
      <packagereq type="optional">gsynaptics</packagereq>
      <packagereq type="optional">lat</packagereq>
      <packagereq type="optional">luma</packagereq>
      <packagereq type="optional">pessulus</packagereq>
      <packagereq type="optional">qtparted</packagereq>
      <packagereq type="optional">yumex</packagereq>
    </packagelist>
  </group>
  <group>
    <id>arabic-support</id>
    <_name>Arabic Support</_name>
    <_description>This group is a collection of tools and resources of Arabic environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">dejavu-fonts</packagereq>
      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
    </packagelist>
  </group>
  <group>
    <id>armenian-support</id>
    <_name>Armenian Support</_name>
    <_description>This group is a collection of tools and resources of Armenian environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">dejavu-fonts</packagereq>
      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
    </packagelist>
  </group>
  <group>
    <id>authoring-and-publishing</id>
    <_name>Authoring and Publishing</_name>
    <_description>These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">BibTool</packagereq>
      <packagereq type="optional">conglomerate</packagereq>
      <packagereq type="optional">docbook2X</packagereq>
      <packagereq type="optional">html401-dtds</packagereq>
      <packagereq type="optional">kile</packagereq>
      <packagereq type="optional">lilypond</packagereq>
      <packagereq type="optional">lout</packagereq>
      <packagereq type="optional">ooo2txt</packagereq>
      <packagereq type="optional">python-docutils</packagereq>
      <packagereq type="optional">scribus</packagereq>
      <packagereq type="optional">tetex-eurofont</packagereq>
      <packagereq type="optional">tetex-prosper</packagereq>
      <packagereq type="optional">w3c-markup-validator</packagereq>
    </packagelist>
  </group>
  <group>
    <id>base-x</id>
    <_name>X Window System</_name>
    <_description>Install this group of packages to use the base graphical (X) user interface.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">alltray</packagereq>
      <packagereq type="optional">aterm</packagereq>
      <packagereq type="optional">Canna</packagereq>
      <packagereq type="optional">dejavu-fonts</packagereq>
      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
      <packagereq type="optional">efont-unicode-bdf</packagereq>
      <packagereq type="optional">FreeWnn</packagereq>
      <packagereq type="optional">kinput2</packagereq>
      <packagereq type="optional">lineak-defaultplugin</packagereq>
      <packagereq type="optional">lineak-xosdplugin</packagereq>
      <packagereq type="optional">lineakd</packagereq>
      <packagereq type="optional">rss-glx</packagereq>
      <packagereq type="optional">rss-glx-xscreensaver</packagereq>
      <packagereq type="optional">rxvt</packagereq>
      <packagereq type="optional">workrave</packagereq>
      <packagereq type="optional">xdaliclock</packagereq>
      <packagereq type="optional">xkeycaps</packagereq>
      <packagereq type="optional">xlockmore</packagereq>
      <packagereq type="optional">xscreensaver-base</packagereq>
      <packagereq type="optional">xscreensaver-extras</packagereq>
      <packagereq type="optional">xscreensaver-gl-extras</packagereq>
    </packagelist>
  </group>
  <group>
    <id>czech-support</id>
    <_name>Czech Support</_name>
    <_description>This group is a collection of tools and resources of Czech environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-dict-cs_CZ</packagereq>
    </packagelist>
  </group>
  <group>
    <id>development-tools</id>
    <_name>Development Tools</_name>
    <_description>These tools include core development tools such as automake, gcc, perl, python, and debuggers.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abicheck</packagereq>
      <packagereq type="optional">alleyoop</packagereq>
      <packagereq type="optional">aplus-fsf</packagereq>
      <packagereq type="optional">archmage</packagereq>
      <packagereq type="optional">asa</packagereq>
      <packagereq type="optional">bazaar</packagereq>
      <packagereq type="optional">bigloo</packagereq>
      <packagereq type="optional">bzr</packagereq>
      <packagereq type="optional">ccache</packagereq>
      <packagereq type="optional">clips</packagereq>
      <packagereq type="optional">clips-doc</packagereq>
      <packagereq type="optional">clips-xclips</packagereq>
      <packagereq type="optional">clisp</packagereq>
      <packagereq type="optional">cmake</packagereq>
      <packagereq type="optional">codeblocks</packagereq>
      <packagereq type="optional">cogito</packagereq>
      <packagereq type="optional">colordiff</packagereq>
      <packagereq type="optional">cpan2rpm</packagereq>
      <packagereq type="optional">cpanspec</packagereq>
      <packagereq type="optional">cppunit</packagereq>
      <packagereq type="optional">cproto</packagereq>
      <packagereq type="optional">curry</packagereq>
      <packagereq type="optional">cvs2cl</packagereq>
      <packagereq type="optional">cvs2svn</packagereq>
      <packagereq type="optional">cvsgraph</packagereq>
      <packagereq type="optional">cvsplot</packagereq>
      <packagereq type="optional">cvsps</packagereq>
      <packagereq type="optional">cvsweb</packagereq>
      <packagereq type="optional">darcs</packagereq>
      <packagereq type="optional">epydoc</packagereq>
      <packagereq type="optional">erlang</packagereq>
      <packagereq type="optional">flasm</packagereq>
      <packagereq type="optional">fpc</packagereq>
      <packagereq type="optional">ftnchek</packagereq>
      <packagereq type="optional">gauche</packagereq>
      <packagereq type="optional">gforth</packagereq>
      <packagereq type="optional">ghc</packagereq>
      <packagereq type="optional">git</packagereq>
      <packagereq type="optional">gphpedit</packagereq>
      <packagereq type="optional">gprolog</packagereq>
      <packagereq type="optional">gpsim</packagereq>
      <packagereq type="optional">gputils</packagereq>
      <packagereq type="optional">haddock</packagereq>
      <packagereq type="optional">highlight</packagereq>
      <packagereq type="optional">hugs98</packagereq>
      <packagereq type="optional">ipython</packagereq>
      <packagereq type="optional">jam</packagereq>
      <packagereq type="optional">kuipc</packagereq>
      <packagereq type="optional">lcov</packagereq>
      <packagereq type="optional">lightning</packagereq>
      <packagereq type="optional">lincvs</packagereq>
      <packagereq type="optional">lua</packagereq>
      <packagereq type="optional">mach</packagereq>
      <packagereq type="optional">mcrypt</packagereq>
      <packagereq type="optional">meld</packagereq>
      <packagereq type="optional">mercurial</packagereq>
      <packagereq type="optional">mock</packagereq>
      <packagereq type="optional">monotone</packagereq>
      <packagereq type="optional">nqc</packagereq>
      <packagereq type="optional">ocaml</packagereq>
      <packagereq type="optional">oorexx</packagereq>
      <packagereq type="optional">patchy</packagereq>
      <packagereq type="optional">perltidy</packagereq>
      <packagereq type="optional">pgadmin3</packagereq>
      <packagereq type="optional">pikdev</packagereq>
      <packagereq type="optional">pl</packagereq>
      <packagereq type="optional">plt-scheme</packagereq>
      <packagereq type="optional">pscan</packagereq>
      <packagereq type="optional">pylint</packagereq>
      <packagereq type="optional">q</packagereq>
      <packagereq type="optional">qgit</packagereq>
      <packagereq type="optional">quilt</packagereq>
      <packagereq type="optional">rapidsvn</packagereq>
      <packagereq type="optional">regexxer</packagereq>
      <packagereq type="optional">rpmdevtools</packagereq>
      <packagereq type="optional">rpmlint</packagereq>
      <packagereq type="optional">smarteiffel</packagereq>
      <packagereq type="optional">splint</packagereq>
      <packagereq type="optional">Sprog</packagereq>
      <packagereq type="optional">srecord</packagereq>
      <packagereq type="optional">svn2cl</packagereq>
      <packagereq type="optional">svnmailer</packagereq>
      <packagereq type="optional">sysconftool</packagereq>
      <packagereq type="optional">sysprof</packagereq>
      <packagereq type="optional">tkcvs</packagereq>
      <packagereq type="optional">tla</packagereq>
      <packagereq type="optional">tolua++</packagereq>
      <packagereq type="optional">trac</packagereq>
      <packagereq type="optional">ucblogo</packagereq>
      <packagereq type="optional">utrac</packagereq>
      <packagereq type="optional">xbsql</packagereq>
      <packagereq type="optional">xfce4-dev-tools</packagereq>
      <packagereq type="optional">yap</packagereq>
      <packagereq type="optional">yasm</packagereq>
    </packagelist>
  </group>
  <group>
    <id>dialup</id>
    <_name>Dialup Networking Support</_name>
    <description/>
    <default>true</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">pptp</packagereq>
    </packagelist>
  </group>
  <group>
    <id>editors</id>
    <_name>Editors</_name>
    <_description>Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <grouplist>
      <groupreq>base</groupreq>
      <metapkg type="optional">xemacs</metapkg>
    </grouplist>
    <packagelist>
      <packagereq type="optional">gobby</packagereq>
      <packagereq type="optional">jed</packagereq>
      <packagereq type="optional">leafpad</packagereq>
      <packagereq type="optional">nedit</packagereq>
      <packagereq type="optional">poedit</packagereq>
      <packagereq type="optional">scite</packagereq>
      <packagereq type="optional">scribes</packagereq>
      <packagereq type="optional">scribes-templates</packagereq>
      <packagereq type="optional">TeXmacs</packagereq>
    </packagelist>
  </group>
  <group>
    <id>education</id>
    <_name>Educational Software</_name>
    <_description>Educational software for learning</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">childsplay</packagereq>
      <packagereq type="optional">drgeo</packagereq>
      <packagereq type="optional">drgeo-doc</packagereq>
      <packagereq type="optional">gcompris</packagereq>
      <packagereq type="optional">gperiodic</packagereq>
      <packagereq type="optional">gtypist</packagereq>
      <packagereq type="optional">stellarium</packagereq>
      <packagereq type="optional">tuxtype2</packagereq>
    </packagelist>
  </group>
  <group>
    <id>engineering-and-scientific</id>
    <_name>Engineering and Scientific</_name>
    <_description>This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">atlas</packagereq>
      <packagereq type="optional">blacs</packagereq>
      <packagereq type="optional">blas</packagereq>
      <packagereq type="optional">cdo</packagereq>
      <packagereq type="optional">cernlib-utils</packagereq>
      <packagereq type="optional">dx</packagereq>
      <packagereq type="optional">dx-samples</packagereq>
      <packagereq type="optional">galculator</packagereq>
      <packagereq type="optional">gdl</packagereq>
      <packagereq type="optional">geant321</packagereq>
      <packagereq type="optional">genius</packagereq>	
      <packagereq type="optional">geda-docs</packagereq>
      <packagereq type="optional">geda-example</packagereq>
      <packagereq type="optional">geda-gattrib</packagereq>
      <packagereq type="optional">geda-gnetlist</packagereq>
      <packagereq type="optional">geda-gschem</packagereq>
      <packagereq type="optional">geda-gsymcheck</packagereq>
      <packagereq type="optional">geda-symbols</packagereq>
      <packagereq type="optional">geda-utils</packagereq>
      <packagereq type="optional">ghdl</packagereq>
      <packagereq type="optional">gnucap</packagereq>
      <packagereq type="optional">gpredict</packagereq>
      <packagereq type="optional">grads</packagereq>
      <packagereq type="optional">gresistor</packagereq>
      <packagereq type="optional">gtkwave</packagereq>
      <packagereq type="optional">gts</packagereq>
      <packagereq type="optional">harminv</packagereq>
      <packagereq type="optional">hdf</packagereq>
      <packagereq type="optional">hdf5</packagereq>
      <packagereq type="optional">hmmer</packagereq>
      <packagereq type="optional">kicad</packagereq>
      <packagereq type="optional">kpolynome</packagereq>
      <packagereq type="optional">kst</packagereq>
      <packagereq type="optional">lagan</packagereq>
      <packagereq type="optional">lapack</packagereq>
      <packagereq type="optional">libctl</packagereq>
      <packagereq type="optional">libmatheval</packagereq>
      <packagereq type="optional">ncarg</packagereq>
      <packagereq type="optional">nco</packagereq>
      <packagereq type="optional">ncview</packagereq>
      <packagereq type="optional">netcdf</packagereq>
      <packagereq type="optional">ngspice</packagereq>
      <packagereq type="optional">numpy</packagereq>
      <packagereq type="optional">octave</packagereq>
      <packagereq type="optional">octave-forge</packagereq>
      <packagereq type="optional">openbabel</packagereq>
      <packagereq type="optional">orpie</packagereq>
      <packagereq type="optional">osiv</packagereq>
      <packagereq type="optional">paraview</packagereq>
      <packagereq type="optional">paw</packagereq>
      <packagereq type="optional">pcb</packagereq>
      <packagereq type="optional">plotutils</packagereq>
      <packagereq type="optional">qalculate-gtk</packagereq>
      <packagereq type="optional">qalculate-kde</packagereq>
      <packagereq type="optional">qcad</packagereq>
      <packagereq type="optional">qucs</packagereq>
      <packagereq type="optional">R</packagereq>
      <packagereq type="optional">R-gnomeGUI</packagereq>
      <packagereq type="optional">rrdtool</packagereq>
      <packagereq type="optional">scalapack</packagereq>
      <packagereq type="optional">scrip</packagereq>
      <packagereq type="optional">SIBsim4</packagereq>
      <packagereq type="optional">veusz</packagereq>
      <packagereq type="optional">xcircuit</packagereq>
      <packagereq type="optional">xdrawchem</packagereq>
    </packagelist>
  </group>
  <group>
    <id>ftp-server</id>
    <_name>FTP Server</_name>
    <_description>These tools allow you to run an FTP server on the system.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">proftpd</packagereq>
      <packagereq type="optional">pure-ftpd</packagereq>
    </packagelist>
  </group>
  <group>
    <id>games</id>
    <_name>Games and Entertainment</_name>
    <_description>Various ways to relax and spend your free time.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abe</packagereq>
      <packagereq type="optional">abuse</packagereq>
      <packagereq type="optional">atomix</packagereq>
      <packagereq type="optional">auriferous</packagereq>
      <packagereq type="optional">ballbuster</packagereq>
      <packagereq type="optional">blobwars</packagereq>
      <packagereq type="optional">bsd-games</packagereq>
      <packagereq type="optional">bygfoot</packagereq>
      <packagereq type="optional">bzflag</packagereq>
      <packagereq type="optional">celestia</packagereq>
      <packagereq type="optional">cgoban</packagereq>
      <packagereq type="optional">chess</packagereq>
      <packagereq type="optional">clanbomber</packagereq>
      <packagereq type="optional">crack-attack</packagereq>
      <packagereq type="optional">crossfire-client</packagereq>
      <packagereq type="optional">crystal-stacker</packagereq>
      <packagereq type="optional">crystal-stacker-themes</packagereq>
      <packagereq type="optional">csmash</packagereq>
      <packagereq type="optional">enigma</packagereq>
      <packagereq type="optional">fbg</packagereq>
      <packagereq type="optional">fillets-ng</packagereq>
      <packagereq type="optional">foobillard</packagereq>
      <packagereq type="optional">fortune-mod</packagereq>
      <packagereq type="optional">fRaBs</packagereq>
      <packagereq type="optional">freeciv</packagereq>
      <packagereq type="optional">freedoom</packagereq>
      <packagereq type="optional">freedroid</packagereq>
      <packagereq type="optional">freedroidrpg</packagereq>
      <packagereq type="optional">frozen-bubble</packagereq>
      <packagereq type="optional">gl-117</packagereq>
      <packagereq type="optional">gnofract4d</packagereq>
      <packagereq type="optional">gnome-sudoku</packagereq>
      <packagereq type="optional">gnubg</packagereq>
      <packagereq type="optional">gnuchess</packagereq>
      <packagereq type="optional">gnugo</packagereq>
      <packagereq type="optional">grhino</packagereq>
      <packagereq type="optional">gweled</packagereq>
      <packagereq type="optional">lacewing</packagereq>
      <packagereq type="optional">lincity-ng</packagereq>
      <packagereq type="optional">lmarbles</packagereq>
      <packagereq type="optional">lucidlife</packagereq>
      <packagereq type="optional">Maelstrom</packagereq>
      <packagereq type="optional">magicor</packagereq>
      <packagereq type="optional">manaworld</packagereq>
      <packagereq type="optional">mirrormagic</packagereq>
      <packagereq type="optional">monkey-bubble</packagereq>
      <packagereq type="optional">monsterz</packagereq>
      <packagereq type="optional">nazghul</packagereq>
      <packagereq type="optional">nazghul-haxima</packagereq>
      <packagereq type="optional">nethack</packagereq>
      <packagereq type="optional">nethack-vultures</packagereq>
      <packagereq type="optional">netpanzer</packagereq>
      <packagereq type="optional">neverball</packagereq>
      <packagereq type="optional">nexuiz</packagereq>
      <packagereq type="optional">njam</packagereq>
      <packagereq type="optional">oneko</packagereq>
      <packagereq type="optional">overgod</packagereq>
      <packagereq type="optional">pengupop</packagereq>
      <packagereq type="optional">pinball</packagereq>
      <packagereq type="optional">pingus</packagereq>
      <packagereq type="optional">pipenightdreams</packagereq>
      <packagereq type="optional">powermanga</packagereq>
      <packagereq type="optional">ppracer</packagereq>
      <packagereq type="optional">qascade</packagereq>
      <packagereq type="optional">qgo</packagereq>
      <packagereq type="optional">qqo</packagereq>
      <packagereq type="optional">rafkill</packagereq>
      <packagereq type="optional">raidem</packagereq>
      <packagereq type="optional">rocksndiamonds</packagereq>
      <packagereq type="optional">rogue</packagereq>
      <packagereq type="optional">scorched3d</packagereq>
      <packagereq type="optional">shippy</packagereq>
      <packagereq type="optional">sirius</packagereq>
      <packagereq type="optional">sopwith</packagereq>
      <packagereq type="optional">starfighter</packagereq>
      <packagereq type="optional">sturmbahnfahrer</packagereq>
      <packagereq type="optional">supertux</packagereq>
      <packagereq type="optional">supertuxkart</packagereq>
      <packagereq type="optional">tong</packagereq>
      <packagereq type="optional">torcs</packagereq>
      <packagereq type="optional">trackballs</packagereq>
      <packagereq type="optional">trackballs-music</packagereq>
      <packagereq type="optional">tremulous</packagereq>
      <packagereq type="optional">tuxpuck</packagereq>
      <packagereq type="optional">ularn</packagereq>
      <packagereq type="optional">uqm</packagereq>
      <packagereq type="optional">viruskiller</packagereq>
      <packagereq type="optional">wesnoth</packagereq>
      <packagereq type="optional">worminator</packagereq>
      <packagereq type="optional">wormux</packagereq>
      <packagereq type="optional">xaos</packagereq>
      <packagereq type="optional">xarchon</packagereq>
      <packagereq type="optional">xboard</packagereq>
      <packagereq type="optional">xgalaxy</packagereq>
      <packagereq type="optional">xmoto</packagereq>
      <packagereq type="optional">xpilot-ng</packagereq>
      <packagereq type="optional">xplanet</packagereq>
      <packagereq type="optional">xscorch</packagereq>
      <packagereq type="optional">zasx</packagereq>
    </packagelist>
  </group>
  <group>
    <id>gnome-desktop</id>
    <_name>GNOME Desktop Environment</_name>
    <_description>GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">alacarte</packagereq>
      <packagereq type="optional">brightside</packagereq>
      <packagereq type="optional">buoh</packagereq>
      <packagereq type="optional">byzanz</packagereq>
      <packagereq type="optional">deskbar-applet</packagereq>
      <packagereq type="optional">gdesklets</packagereq>
      <packagereq type="optional">glipper</packagereq>
      <packagereq type="optional">glunarclock</packagereq>
      <packagereq type="optional">gmpc</packagereq>
      <packagereq type="optional">gnochm</packagereq>
      <packagereq type="optional">gnome-applet-netspeed</packagereq>
      <packagereq type="optional">gnome-applet-rhythmbox</packagereq>
      <packagereq type="optional">gnome-applet-sensors</packagereq>
      <packagereq type="optional">gnome-applet-timer</packagereq>
      <packagereq type="optional">gnome-theme-clearlooks-bigpack</packagereq>
      <packagereq type="optional">gnome-themes-extras</packagereq>
      <packagereq type="optional">gnotime</packagereq>
      <packagereq type="optional">gtweakui</packagereq>
      <packagereq type="optional">istanbul</packagereq>
      <packagereq type="optional">lock-keys-applet</packagereq>
      <packagereq type="optional">nautilus-actions</packagereq>
      <packagereq type="optional">nautilus-flac-converter</packagereq>
      <packagereq type="optional">nautilus-image-converter</packagereq>
      <packagereq type="optional">nautilus-open-terminal</packagereq>
      <packagereq type="optional">nautilus-search-tool</packagereq>
      <packagereq type="optional">rss-glx-gnome-screensaver</packagereq>
      <packagereq type="optional">sabayon</packagereq>
      <packagereq type="optional">seahorse</packagereq>
      <packagereq type="optional">smeg</packagereq>
      <packagereq type="optional">themes-backgrounds-gnome</packagereq>
      <packagereq type="optional">verbiste-gnome</packagereq>
      <packagereq type="optional">wallpapoz</packagereq>
      <packagereq type="optional">wp_tray</packagereq>
      <packagereq type="optional">xscreensaver-extras-gss</packagereq>
      <packagereq type="optional">xscreensaver-gl-extras-gss</packagereq>
    </packagelist>
  </group>
  <group>
    <id>gnome-software-development</id>
    <_name>GNOME Software Development</_name>
    <_description>Install these packages in order to develop GTK+ and GNOME graphical applications.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">anjuta</packagereq>
      <packagereq type="optional">anjuta-docs</packagereq>
      <packagereq type="optional">at-poke</packagereq>
      <packagereq type="optional">bakery-devel</packagereq>
      <packagereq type="optional">bit-devel</packagereq>
      <packagereq type="optional">bitgtkmm-devel</packagereq>
      <packagereq type="optional">cairomm-devel</packagereq>
      <packagereq type="optional">conexus-devel</packagereq>
      <packagereq type="optional">conexusmm-devel</packagereq>
      <packagereq type="optional">gazpacho</packagereq>
      <packagereq type="optional">gconfmm26-devel</packagereq>
      <packagereq type="optional">glibmm24-devel</packagereq>
      <packagereq type="optional">gnome-common</packagereq>
      <packagereq type="optional">gnome-python2-gda-devel</packagereq>
      <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
      <packagereq type="optional">gquilt</packagereq>
      <packagereq type="optional">gtk+extra</packagereq>
      <packagereq type="optional">gtk2hs</packagereq>
      <packagereq type="optional">gtkalog</packagereq>
      <packagereq type="optional">gtkdatabox</packagereq>
      <packagereq type="optional">gtkmm24-devel</packagereq>
      <packagereq type="optional">libglademm24-devel</packagereq>
      <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
      <packagereq type="optional">libgnomemm26-devel</packagereq>
      <packagereq type="optional">libgnomeuimm26-devel</packagereq>
      <packagereq type="optional">libsexy-devel</packagereq>
      <packagereq type="optional">libsexymm-devel</packagereq>
      <packagereq type="optional">libsigc++20-devel</packagereq>
      <packagereq type="optional">papyrus-devel</packagereq>
      <packagereq type="optional">plotmm-devel</packagereq>
    </packagelist>
  </group>
  <group>
    <id>graphical-internet</id>
    <_name>Graphical Internet</_name>
    <_description>This group includes graphical email, Web, and chat clients.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">amsn</packagereq>
      <packagereq type="optional">apollon</packagereq>
      <packagereq type="optional">azureus</packagereq>
      <packagereq type="optional">balsa</packagereq>
      <packagereq type="optional">bittorrent-gui</packagereq>
      <packagereq type="optional">blogtk</packagereq>
      <packagereq type="optional">bluefish</packagereq>
      <packagereq type="optional">contact-lookup-applet</packagereq>
      <packagereq type="optional">d4x</packagereq>
      <packagereq type="optional">deskbar-applet</packagereq>
      <packagereq type="optional">dillo</packagereq>
      <packagereq type="optional">drivel</packagereq>
      <packagereq type="optional">evolution-bogofilter</packagereq>
      <packagereq type="optional">fwbuilder</packagereq>
      <packagereq type="optional">gajim</packagereq>
      <packagereq type="optional">galeon</packagereq>
      <packagereq type="optional">gg2</packagereq>
      <packagereq type="optional">gnome-blog</packagereq>
      <packagereq type="optional">gnome-ppp</packagereq>
      <packagereq type="optional">gnome-telnet</packagereq>
      <packagereq type="optional">gnome-translate</packagereq>
      <packagereq type="optional">gnubiff</packagereq>
      <packagereq type="optional">gossip</packagereq>
      <packagereq type="optional">gtk-gnutella</packagereq>
      <packagereq type="optional">gtorrentviewer</packagereq>
      <packagereq type="optional">gwget</packagereq>
      <packagereq type="optional">jd</packagereq>
      <packagereq type="optional">kadu</packagereq>
      <packagereq type="optional">kickpim</packagereq>
      <packagereq type="optional">kita</packagereq>
      <packagereq type="optional">knetstats</packagereq>
      <packagereq type="optional">konversation</packagereq>
      <packagereq type="optional">kphone</packagereq>
      <packagereq type="optional">licq</packagereq>
      <packagereq type="optional">liferea</packagereq>
      <packagereq type="optional">linphone</packagereq>
      <packagereq type="optional">logjam</packagereq>
      <packagereq type="optional">mail-notification</packagereq>
      <packagereq type="optional">ochusha</packagereq>
      <packagereq type="optional">pan</packagereq>
      <packagereq type="optional">prozilla</packagereq>
      <packagereq type="optional">psi</packagereq>
      <packagereq type="optional">putty</packagereq>
      <packagereq type="optional">rssowl</packagereq>
      <packagereq type="optional">screem</packagereq>
      <packagereq type="optional">streamtuner</packagereq>
      <packagereq type="optional">sylpheed</packagereq>
      <packagereq type="optional">sylpheed-claws</packagereq>
      <packagereq type="optional">transmission</packagereq>
      <packagereq type="optional">twinkle</packagereq>
      <packagereq type="optional">valknut</packagereq>
      <packagereq type="optional">x3270-x11</packagereq>
      <packagereq type="optional">xchat-gnome</packagereq>
    </packagelist>
  </group>
  <group>
    <id>graphics</id>
    <_name>Graphics</_name>
    <_description>This group includes packages to help you manipulate and scan images.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">agave</packagereq>
      <packagereq type="optional">asymptote</packagereq>
      <packagereq type="optional">blender</packagereq>
      <packagereq type="optional">comix</packagereq>
      <packagereq type="optional">digikam</packagereq>
      <packagereq type="optional">fontforge</packagereq>
      <packagereq type="optional">fyre</packagereq>
      <packagereq type="optional">gpp</packagereq>
      <packagereq type="optional">gqview</packagereq>
      <packagereq type="optional">graphviz</packagereq>
      <packagereq type="optional">gv</packagereq>
      <packagereq type="optional">gwenview</packagereq>
      <packagereq type="optional">inkscape</packagereq>
      <packagereq type="optional">ipe</packagereq>
      <packagereq type="optional">k3d</packagereq>
      <packagereq type="optional">optipng</packagereq>
      <packagereq type="optional">pstoedit</packagereq>
      <packagereq type="optional">pydot</packagereq>
      <packagereq type="optional">qiv</packagereq>
      <packagereq type="optional">rawstudio</packagereq>
      <packagereq type="optional">renrot</packagereq>
      <packagereq type="optional">showimg</packagereq>
      <packagereq type="optional">skencil</packagereq>
      <packagereq type="optional">sodipodi</packagereq>
      <packagereq type="optional">tuxpaint</packagereq>
      <packagereq type="optional">ufraw</packagereq>
      <packagereq type="optional">wings</packagereq>
    </packagelist>
  </group>
  <group>
    <id>hardware-support</id>
    <_name>Hardware Support</_name>
    <_description>This group is a collection of tools for various hardware specific utilities.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">acpi</packagereq>
      <packagereq type="optional">acpitool</packagereq>
      <packagereq type="optional">gpsd</packagereq>
      <packagereq type="optional">gpsd-clients</packagereq>
      <packagereq type="optional">hddtemp</packagereq>
      <packagereq type="optional">i810switch</packagereq>
      <packagereq type="optional">i8kutils</packagereq>
      <packagereq type="optional">libifp</packagereq>
      <packagereq type="optional">lsscsi</packagereq>
      <packagereq type="optional">openct</packagereq>
      <packagereq type="optional">opensc</packagereq>
      <packagereq type="optional">s3switch</packagereq>
      <packagereq type="optional">tpb</packagereq>
    </packagelist>
  </group>
  <group>
    <id>hebrew-support</id>
    <_name>Hebrew Support</_name>
    <_description>This group is a collection of tools and resources of Hebrew environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">dejavu-fonts</packagereq>
      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
    </packagelist>
  </group>
  <group>
    <id>japanese-support</id>
    <_name>Japanese Support</_name>
    <_description>This group is a collection of tools and resources of Japanese environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">scim-input-pad</packagereq>
      <packagereq type="optional">scim-skk</packagereq>
      <packagereq type="optional">scim-tomoe</packagereq>
    </packagelist>
  </group>
  <group>
    <id>java</id>
    <_name>Java</_name>
    <_description>Support for running programs written in the Java programming language.</_description>
    <default>true</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">jikes</packagereq>
    </packagelist>
  </group>
  <group>
    <id>java-development</id>
    <_name>Java Development</_name>
    <_description>Support for developing programs in the Java programming language.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">jlint</packagereq>
    </packagelist>
  </group>
  <group>
    <id>kde-desktop</id>
    <_name>KDE (K Desktop Environment)</_name>
    <_description>KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">basket</packagereq>
      <packagereq type="optional">crystal</packagereq>
      <packagereq type="optional">katapult</packagereq>
      <packagereq type="optional">kbackup</packagereq>
      <packagereq type="optional">kbibtex</packagereq>
      <packagereq type="optional">kchmviewer</packagereq>
      <packagereq type="optional">kdissert</packagereq>
      <packagereq type="optional">kdmtheme</packagereq>
      <packagereq type="optional">kerry</packagereq>
      <packagereq type="optional">kickpim</packagereq>
      <packagereq type="optional">kiosktool</packagereq>
      <packagereq type="optional">klamav</packagereq>
      <packagereq type="optional">kmenu-gnome</packagereq>
      <packagereq type="optional">kmobiletools</packagereq>
      <packagereq type="optional">kmymoney2</packagereq>
      <packagereq type="optional">knemo</packagereq>
      <packagereq type="optional">knetworkmanager</packagereq>
      <packagereq type="optional">kompose</packagereq>
      <packagereq type="optional">kooldock</packagereq>
      <packagereq type="optional">krecipes</packagereq>
      <packagereq type="optional">krusader</packagereq>
      <packagereq type="optional">ksensors</packagereq>
      <packagereq type="optional">kshutdown</packagereq>
      <packagereq type="optional">ksynaptics</packagereq>
      <packagereq type="optional">ktorrent</packagereq>
      <packagereq type="optional">kyum</packagereq>
      <packagereq type="optional">lineak-kdeplugins</packagereq>
      <packagereq type="optional">metamonitor</packagereq>
      <packagereq type="optional">oooqs2</packagereq>
      <packagereq type="optional">rekall</packagereq>
      <packagereq type="optional">rsibreak</packagereq>
      <packagereq type="optional">rss-glx-kde</packagereq>
      <packagereq type="optional">smb4k</packagereq>
    </packagelist>
  </group>
  <group>
    <id>kde-software-development</id>
    <_name>KDE Software Development</_name>
    <_description>Install these packages to develop QT and KDE graphical applications.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">gambas</packagereq>
      <packagereq type="optional">kdesvn</packagereq>
    </packagelist>
  </group>
  <group>
    <id>mail-server</id>
    <_name>Mail Server</_name>
    <_description>These packages allow you to configure an IMAP or SMTP mail server.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">amavisd-new</packagereq>
      <packagereq type="optional">clamav</packagereq>
      <packagereq type="optional">clamav-data</packagereq>
      <packagereq type="optional">clamav-milter</packagereq>
      <packagereq type="optional">crm114</packagereq>
      <packagereq type="optional">cyrus-imapd</packagereq>
      <packagereq type="optional">enemies-of-carlotta</packagereq>
      <packagereq type="optional">esmtp</packagereq>
      <packagereq type="optional">exim</packagereq>
      <packagereq type="optional">exim-doc</packagereq>
      <packagereq type="optional">milter-regex</packagereq>
      <packagereq type="optional">mlmmj</packagereq>
      <packagereq type="optional">perl-Cyrus</packagereq>
      <packagereq type="optional">pyzor</packagereq>
      <packagereq type="optional">spamass-milter</packagereq>
    </packagelist>
  </group>
  <group>
    <id>network-server</id>
    <_name>Network Servers</_name>
    <_description>This group is a collection of network servers for specific purposes</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">ctrlproxy</packagereq>
      <packagereq type="optional">dnsmasq</packagereq>
      <packagereq type="optional">ejabberd</packagereq>
      <packagereq type="optional">flumotion</packagereq>
      <packagereq type="optional">freenx</packagereq>
      <packagereq type="optional">icecast</packagereq>
      <packagereq type="optional">ipxripd</packagereq>
      <packagereq type="optional">ircd-hybrid</packagereq>
      <packagereq type="optional">jabberd</packagereq>
      <packagereq type="optional">kannel</packagereq>
      <packagereq type="optional">l2tpd</packagereq>
      <packagereq type="optional">NetworkManager-vpnc</packagereq>
      <packagereq type="optional">nsd</packagereq>
      <packagereq type="optional">oidentd</packagereq>
      <packagereq type="optional">openvpn</packagereq>
      <packagereq type="optional">puppet-server</packagereq>
      <packagereq type="optional">rbldnsd</packagereq>
      <packagereq type="optional">rinetd</packagereq>
      <packagereq type="optional">sobby</packagereq>
      <packagereq type="optional">torque-server</packagereq>
      <packagereq type="optional">ucarp</packagereq>
      <packagereq type="optional">ushare</packagereq>
      <packagereq type="optional">vnc-reflector</packagereq>
    </packagelist>
  </group>
  <group>
    <id>news-server</id>
    <_name>News Server</_name>
    <_description>This group allows you to configure the system as a news server.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">leafnode</packagereq>
      <packagereq type="optional">newscache</packagereq>
      <packagereq type="optional">suck</packagereq>
    </packagelist>
  </group>
  <group>
    <id>office</id>
    <_name>Office/Productivity</_name>
    <_description>The applications include office suites, PDF viewers, and more.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abiword</packagereq>
      <packagereq type="optional">aiksaurus-gtk</packagereq>
      <packagereq type="optional">contacts</packagereq>
      <packagereq type="optional">dates</packagereq>
      <packagereq type="optional">dia</packagereq>
      <packagereq type="optional">gdeskcal</packagereq>
      <packagereq type="optional">glabels</packagereq>
      <packagereq type="optional">glom</packagereq>
      <packagereq type="optional">gnotime</packagereq>
      <packagereq type="optional">gnumeric</packagereq>
      <packagereq type="optional">gramps</packagereq>
      <packagereq type="optional">grisbi</packagereq>
      <packagereq type="optional">gsview</packagereq>
      <packagereq type="optional">hnb</packagereq>
      <packagereq type="optional">koffice-suite</packagereq>
      <packagereq type="optional">krecipes</packagereq>
      <packagereq type="optional">lyx</packagereq>
      <packagereq type="optional">notecase</packagereq>
      <packagereq type="optional">notemeister</packagereq>
      <packagereq type="optional">pybliographer</packagereq>
      <packagereq type="optional">qa-assistant</packagereq>
      <packagereq type="optional">qcad</packagereq>
      <packagereq type="optional">revelation</packagereq>
      <packagereq type="optional">taskjuggler</packagereq>
      <packagereq type="optional">texmaker</packagereq>
      <packagereq type="optional">tinyerp</packagereq>
      <packagereq type="optional">tinyerp-server</packagereq>
      <packagereq type="optional">xchm</packagereq>
    </packagelist>
  </group>
  <group>
    <id>sound-and-video</id>
    <_name>Sound and Video</_name>
    <_description>From CD recording to playing audio CDs and multimedia files, this package group allows you to work with sound and video on the system.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abcde</packagereq>
      <packagereq type="optional">adplay</packagereq>
      <packagereq type="optional">akode</packagereq>
      <packagereq type="optional">alsamixergui</packagereq>
      <packagereq type="optional">amarok</packagereq>
      <packagereq type="optional">audacity</packagereq>
      <packagereq type="optional">bin2iso</packagereq>
      <packagereq type="optional">bmp</packagereq>
      <packagereq type="optional">brasero</packagereq>
      <packagereq type="optional">camE</packagereq>
      <packagereq type="optional">cdlabelgen</packagereq>
      <packagereq type="optional">dvdisaster</packagereq>
      <packagereq type="optional">easytag</packagereq>
      <packagereq type="optional">gcdmaster</packagereq>
      <packagereq type="optional">gcfilms</packagereq>
      <packagereq type="optional">gcombust</packagereq>
      <packagereq type="optional">glrellmms</packagereq>
      <packagereq type="optional">gnomad2</packagereq>
      <packagereq type="optional">gnomebaker</packagereq>
      <packagereq type="optional">gnomeradio</packagereq>
      <packagereq type="optional">graveman</packagereq>
      <packagereq type="optional">grip</packagereq>
      <packagereq type="optional">id3v2</packagereq>
      <packagereq type="optional">jack-audio-connection-kit</packagereq>
      <packagereq type="optional">kid3</packagereq>
      <packagereq type="optional">kover</packagereq>
      <packagereq type="optional">libvisual-plugins</packagereq>
      <packagereq type="optional">nomadsync</packagereq>
      <packagereq type="optional">regionset</packagereq>
      <packagereq type="optional">rosegarden4</packagereq>
      <packagereq type="optional">soundconverter</packagereq>
      <packagereq type="optional">soundtracker</packagereq>
      <packagereq type="optional">sweep</packagereq>
      <packagereq type="optional">tagtool</packagereq>
      <packagereq type="optional">tclabc</packagereq>
      <packagereq type="optional">ushare</packagereq>
      <packagereq type="optional">vdr</packagereq>
      <packagereq type="optional">wmix</packagereq>
      <packagereq type="optional">xmms</packagereq>
      <packagereq type="optional">xmms-adplug</packagereq>
      <packagereq type="optional">xmms-cdread</packagereq>
      <packagereq type="optional">xmms-flac</packagereq>
    </packagelist>
  </group>
  <group>
    <id>system-tools</id>
    <_name>System Tools</_name>
    <_description>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.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">aide</packagereq>
      <packagereq type="optional">airsnort</packagereq>
      <packagereq type="optional">apcupsd</packagereq>
      <packagereq type="optional">apg</packagereq>
      <packagereq type="optional">apt</packagereq>
      <packagereq type="optional">arc</packagereq>
      <packagereq type="optional">arj</packagereq>
      <packagereq type="optional">bochs</packagereq>
      <packagereq type="optional">cabextract</packagereq>
      <packagereq type="optional">cfengine</packagereq>
      <packagereq type="optional">chrpath</packagereq>
      <packagereq type="optional">conman</packagereq>
      <packagereq type="optional">connect-proxy</packagereq>
      <packagereq type="optional">convmv</packagereq>
      <packagereq type="optional">crack</packagereq>
      <packagereq type="optional">denyhosts</packagereq>
      <packagereq type="optional">dkms</packagereq>
      <packagereq type="optional">ebtables</packagereq>
      <packagereq type="optional">ed2k_hash</packagereq>
      <packagereq type="optional">emelfm2</packagereq>
      <packagereq type="optional">enca</packagereq>
      <packagereq type="optional">environment-modules</packagereq>
      <packagereq type="optional">epylog</packagereq>
      <packagereq type="optional">fatsort</packagereq>
      <packagereq type="optional">fcron</packagereq>
      <packagereq type="optional">fedora-package-config-apt</packagereq>
      <packagereq type="optional">fedora-package-config-smart</packagereq>
      <packagereq type="optional">foremost</packagereq>
      <packagereq type="optional">freeze</packagereq>
      <packagereq type="optional">fuse</packagereq>
      <packagereq type="optional">fwbuilder</packagereq>
      <packagereq type="optional">fwrestart</packagereq>
      <packagereq type="optional">ganglia</packagereq>
      <packagereq type="optional">ghasher</packagereq>
      <packagereq type="optional">ghex</packagereq>
      <packagereq type="optional">gkrellm</packagereq>
      <packagereq type="optional">gnokii</packagereq>
      <packagereq type="optional">grepmail</packagereq>
      <packagereq type="optional">gtklp</packagereq>
      <packagereq type="optional">gtkterm</packagereq>
      <packagereq type="optional">gxemul</packagereq>
      <packagereq type="optional">hercules</packagereq>
      <packagereq type="optional">hfsplus-tools</packagereq>
      <packagereq type="optional">ibmonitor</packagereq>
      <packagereq type="optional">inadyn</packagereq>
      <packagereq type="optional">ip6sic</packagereq>
      <packagereq type="optional">isic</packagereq>
      <packagereq type="optional">jfbterm</packagereq>
      <packagereq type="optional">john</packagereq>
      <packagereq type="optional">kdirstat</packagereq>
      <packagereq type="optional">keychain</packagereq>
      <packagereq type="optional">ksmarttray</packagereq>
      <packagereq type="optional">lft</packagereq>
      <packagereq type="optional">lirc</packagereq>
      <packagereq type="optional">lzop</packagereq>
      <packagereq type="optional">mmv</packagereq>
      <packagereq type="optional">moodss</packagereq>
      <packagereq type="optional">moomps</packagereq>
      <packagereq type="optional">munin</packagereq>
      <packagereq type="optional">nagios</packagereq>
      <packagereq type="optional">netgo</packagereq>
      <packagereq type="optional">nfswatch</packagereq>
      <packagereq type="optional">nomarch</packagereq>
      <packagereq type="optional">oddjob</packagereq>
      <packagereq type="optional">p0f</packagereq>
      <packagereq type="optional">p7zip</packagereq>
      <packagereq type="optional">pam_keyring</packagereq>
      <packagereq type="optional">par2cmdline</packagereq>
      <packagereq type="optional">pbzip2</packagereq>
      <packagereq type="optional">powerman</packagereq>
      <packagereq type="optional">puppet</packagereq>
      <packagereq type="optional">pwgen</packagereq>
      <packagereq type="optional">qstat</packagereq>
      <packagereq type="optional">rdiff-backup</packagereq>
      <packagereq type="optional">rootsh</packagereq>
      <packagereq type="optional">rsnapshot</packagereq>
      <packagereq type="optional">sabayon</packagereq>
      <packagereq type="optional">scrub</packagereq>
      <packagereq type="optional">sec</packagereq>
      <packagereq type="optional">shorewall</packagereq>
      <packagereq type="optional">smart</packagereq>
      <packagereq type="optional">smart-gui</packagereq>
      <packagereq type="optional">snort</packagereq>
      <packagereq type="optional">stripesnoop</packagereq>
      <packagereq type="optional">swaks</packagereq>
      <packagereq type="optional">swatch</packagereq>
      <packagereq type="optional">synaptic</packagereq>
      <packagereq type="optional">syslog-ng</packagereq>
      <packagereq type="optional">testdisk</packagereq>
      <packagereq type="optional">tiobench</packagereq>
      <packagereq type="optional">torque-client</packagereq>
      <packagereq type="optional">torque-gui</packagereq>
      <packagereq type="optional">ttywatch</packagereq>
      <packagereq type="optional">unison</packagereq>
      <packagereq type="optional">upx</packagereq>
      <packagereq type="optional">viaideinfo</packagereq>
      <packagereq type="optional">vnstat</packagereq>
      <packagereq type="optional">vpnc</packagereq>
      <packagereq type="optional">wifiroamd</packagereq>
      <packagereq type="optional">wine</packagereq>
      <packagereq type="optional">wlassistant</packagereq>
      <packagereq type="optional">x3270-x11</packagereq>
      <packagereq type="optional">xsupplicant</packagereq>
      <packagereq type="optional">zidrav</packagereq>
    </packagelist>
  </group>
  <group>
    <id>text-internet</id>
    <_name>Text-based Internet</_name>
    <_description>This group includes text-based email, Web, and chat clients. These applications do not require the X Window System.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abook</packagereq>
      <packagereq type="optional">argus</packagereq>
      <packagereq type="optional">bittorrent</packagereq>
      <packagereq type="optional">centericq</packagereq>
      <packagereq type="optional">cone</packagereq>
      <packagereq type="optional">ctorrent</packagereq>
      <packagereq type="optional">ekg</packagereq>
      <packagereq type="optional">elmo</packagereq>
      <packagereq type="optional">iperf</packagereq>
      <packagereq type="optional">irssi</packagereq>
      <packagereq type="optional">libtranslate</packagereq>
      <packagereq type="optional">mew</packagereq>
      <packagereq type="optional">nail</packagereq>
      <packagereq type="optional">naim</packagereq>
      <packagereq type="optional">ncftp</packagereq>
      <packagereq type="optional">nget</packagereq>
      <packagereq type="optional">ninja</packagereq>
      <packagereq type="optional">nmh</packagereq>
      <packagereq type="optional">pork</packagereq>
      <packagereq type="optional">rtorrent</packagereq>
      <packagereq type="optional">snownews</packagereq>
      <packagereq type="optional">tin</packagereq>
      <packagereq type="optional">xprobe2</packagereq>
      <packagereq type="optional">yafc</packagereq>
    </packagelist>
  </group>
  <group>
    <id>web-development</id>
    <_name>Web Development</_name>
    <_description>These packages are helpful when developing web applications or web pages.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist/>
  </group>
  <group>
    <id>web-server</id>
    <_name>Web Server</_name>
    <_description>These tools allow you to run a Web server on the system.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">apachetop</packagereq>
      <packagereq type="optional">awstats</packagereq>
      <packagereq type="optional">boa</packagereq>
      <packagereq type="optional">dap-server-cgi</packagereq>
      <packagereq type="optional">lighttpd</packagereq>
      <packagereq type="optional">lighttpd-fastcgi</packagereq>
      <packagereq type="optional">mediawiki</packagereq>
      <packagereq type="optional">mod_cband</packagereq>
      <packagereq type="optional">mod_extract_forwarded</packagereq>
      <packagereq type="optional">mod_fcgid</packagereq>
      <packagereq type="optional">mod_geoip</packagereq>
      <packagereq type="optional">mod_security</packagereq>
      <packagereq type="optional">moin</packagereq>
      <packagereq type="optional">moin-latex</packagereq>
      <packagereq type="optional">namazu</packagereq>
      <packagereq type="optional">perl-HTML-Mason</packagereq>
      <packagereq type="optional">perl-Kwiki</packagereq>
      <packagereq type="optional">php-pecl-apc</packagereq>
      <packagereq type="optional">phpldapadmin</packagereq>
      <packagereq type="optional">plone</packagereq>
      <packagereq type="optional">tclhttpd</packagereq>
      <packagereq type="optional">thttpd</packagereq>
      <packagereq type="optional">TurboGears</packagereq>
      <packagereq type="optional">zope</packagereq>
    </packagelist>
  </group>
  <group>
    <id>window-managers</id>
    <_name>Window Managers</_name>
    <_description>Simple window managers that aren't part of a larger desktop environment.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">bbkeys</packagereq>
      <packagereq type="optional">blackbox</packagereq>
      <packagereq type="optional">fluxbox</packagereq>
      <packagereq type="optional">fluxconf</packagereq>
      <packagereq type="optional">hackedbox</packagereq>
      <packagereq type="optional">obconf</packagereq>
      <packagereq type="optional">obmenu</packagereq>
      <packagereq type="optional">openbox</packagereq>
      <packagereq type="optional">WindowMaker</packagereq>
      <packagereq type="optional">wmx</packagereq>
      <packagereq type="optional">xcompmgr</packagereq>
    </packagelist>
  </group>
  <group>
    <id>xemacs</id>
    <_name>XEmacs</_name>
    <_description>The XEmacs text editor.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <grouplist>
      <groupreq>base</groupreq>
    </grouplist>
    <packagelist>
      <packagereq type="mandatory">xemacs</packagereq>
      <packagereq type="default">xemacs-info</packagereq>
      <packagereq type="default">xemacs-packages-base</packagereq>
      <packagereq type="default">xemacs-packages-extra</packagereq>
      <packagereq type="default">xemacs-packages-extra-info</packagereq>
      <packagereq type="optional">xemacs-el</packagereq>
      <packagereq type="optional">xemacs-nox</packagereq>
      <packagereq type="optional">xemacs-packages-base-el</packagereq>
      <packagereq type="optional">xemacs-packages-extra-el</packagereq>
    </packagelist>
  </group>
  <group>
    <id>xfce-desktop</id>
    <_name>XFCE</_name>
    <_description>A lightweight desktop environment that works well on low end machines.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="mandatory">libxfce4mcs</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-session-engines</packagereq>
      <packagereq type="mandatory">xfdesktop</packagereq>
      <packagereq type="mandatory">xfwm4</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>
      <packagereq type="default">xfce4-mixer</packagereq>
      <packagereq type="default">xfprint</packagereq>
      <packagereq type="optional">mousepad</packagereq>
      <packagereq type="optional">orage</packagereq>
      <packagereq type="optional">Terminal</packagereq>
      <packagereq type="optional">xfce4-battery-plugin</packagereq>
      <packagereq type="optional">xfce4-clipman-plugin</packagereq>
      <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
      <packagereq type="optional">xfce4-datetime-plugin</packagereq>
      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
      <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
      <packagereq type="optional">xfce4-genmon-plugin</packagereq>
      <packagereq type="optional">xfce4-minicmd-plugin</packagereq>
      <packagereq type="optional">xfce4-mount-plugin</packagereq>
      <packagereq type="optional">xfce4-netload-plugin</packagereq>
      <packagereq type="optional">xfce4-notes-plugin</packagereq>
      <packagereq type="optional">xfce4-quicklauncher-plugin</packagereq>
      <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
      <packagereq type="optional">xfce4-sensors-plugin</packagereq>
      <packagereq type="optional">xfce4-systemload-plugin</packagereq>
      <packagereq type="optional">xfce4-taskmanager</packagereq>
      <packagereq type="optional">xfce4-toys</packagereq>
      <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
      <packagereq type="optional">xfce4-weather-plugin</packagereq>
      <packagereq type="optional">xfce4-websearch-plugin</packagereq>
      <packagereq type="optional">xfce4-xkb-plugin</packagereq>
      <packagereq type="optional">xfce4-xmms-plugin</packagereq>
      <packagereq type="optional">xfwm4-themes</packagereq>
    </packagelist>
  </group>
  <group>
    <id>xfce-software-development</id>
    <_name>XFCE Software Development</_name>
    <_description>Install these packages in order to develop GTK+ and XFCE graphical applications.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <grouplist>
      <groupreq>x-software-development</groupreq>
    </grouplist>
    <packagelist>
      <packagereq type="mandatory">glib2-devel</packagereq>
      <packagereq type="mandatory">gtk-doc</packagereq>
      <packagereq type="mandatory">gtk2-devel</packagereq>
      <packagereq type="mandatory">libxfce4mcs-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="default">glade2</packagereq>
      <packagereq type="default">pygtk2-devel</packagereq>
    </packagelist>
  </group>
  <category>
    <id>desktops</id>
    <_name>Desktop Environments</_name>
    <_description>Desktop environments</_description>
    <display_order>10</display_order>
    <grouplist>
      <groupid>xfce-desktop</groupid>
    </grouplist>
  </category>
  <category>
    <id>apps</id>
    <_name>Applications</_name>
    <_description>Applications for a variety of tasks</_description>
    <display_order>20</display_order>
    <grouplist>
      <groupid>education</groupid>
    </grouplist>
  </category>
  <category>
    <id>development</id>
    <_name>Development</_name>
    <_description>Packages which provide functionality for developing and building applications.</_description>
    <display_order>70</display_order>
    <grouplist>
      <groupid>web-development</groupid>
      <groupid>xfce-software-development</groupid>
    </grouplist>
  </category>
  <category>
    <id>servers</id>
    <_name>Servers</_name>
    <_description>Software used for running network servers</_description>
    <display_order>90</display_order>
    <grouplist>
      <groupid>network-server</groupid>
    </grouplist>
  </category>
  <category>
    <id>base-system</id>
    <_name>Base System</_name>
    <_description>Various core pieces of the system.</_description>
    <display_order>99</display_order>
    <grouplist>
      <groupid>hardware-support</groupid>
    </grouplist>
  </category>
</comps>



From fedora-extras-commits at redhat.com  Wed Oct 25 20:11:24 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 25 Oct 2006 13:11:24 -0700
Subject: status-report-scripts parseBZbugList,1.53,1.54
Message-ID: <200610252011.k9PKBO0b004954@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4936

Modified Files:
	parseBZbugList 
Log Message:
Bump for FC6.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- parseBZbugList	18 Oct 2006 13:51:10 -0000	1.53
+++ parseBZbugList	25 Oct 2006 20:11:22 -0000	1.54
@@ -45,7 +45,7 @@
   "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&chfieldto=Now&field0-0-0=blocked&type0-0-0=equals&value0-0-0=163779&ctype=csv";
 # All open FE bug reports
 push @BZ_URLs,
-  "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&version=4&version=5&version=devel&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED&bug_severity=security&bug_severity=high&bug_severity=normal&bug_severity=low&bug_severity=translation&bug_severity=regression&chfieldto=Now&negate0=1&field0-0-0=component&type0-0-0=equals&value0-0-0=Package%20Review&ctype=csv";
+  "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&version=4&version=5&version=6&version=devel&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED&bug_severity=security&bug_severity=high&bug_severity=normal&bug_severity=low&bug_severity=translation&bug_severity=regression&chfieldto=Now&negate0=1&field0-0-0=component&type0-0-0=equals&value0-0-0=Package%20Review&ctype=csv";
 
 my %opt;
 my @options = ( "help", "repourl=s", "o=s", "d=s", "cvs=s",
@@ -55,7 +55,7 @@
 $main::members
   = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
 $main::cvsDir = "/export/scratch/extras";
-$main::currel = 5;
+$main::currel = 6;
 $main::firstrel = 1;
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
@@ -1294,7 +1294,8 @@
   }
   print "\n== Duplicated packages in Core and Extras ==\n";
   if ($COUNT_LIST{"commonrelease"} > 0) {
-    print "\nWe have $COUNT_LIST{'commonrelease'} packages duplicated for FC5:\n";
+    my $FC = "FC" . $main::currel;
+    print "\nWe have $COUNT_LIST{'commonrelease'} packages duplicated for $FC:\n";
     &displayPkgListByOwnerWiki($PKG_LIST{"commonrelease"});
   }
   if ($COUNT_LIST{"commondevel"} > 0) {
@@ -1309,7 +1310,8 @@
   }
   print STDERR "\nPackages appearing both in Core and Extras:\n";
   if ($COUNT_LIST{"commonrelease"} > 0) {
-    print STDERR " - $COUNT_LIST{'commonrelease'} packages duplicated for FC5:\n";
+    my $FC = "FC" . $main::currel;
+    print STDERR " - $COUNT_LIST{'commonrelease'} packages duplicated for $FC:\n";
     &displayPkgListByOwnerMail($PKG_LIST{"commonrelease"});
   }
   if ($COUNT_LIST{"commondevel"} > 0) {



From fedora-extras-commits at redhat.com  Wed Oct 25 20:14:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 25 Oct 2006 13:14:08 -0700
Subject: owners owners.list,1.1872,1.1873
Message-ID: <200610252014.k9PKE8jp004989@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4973

Modified Files:
	owners.list 
Log Message:
Fix sorting.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1872
retrieving revision 1.1873
diff -u -r1.1872 -r1.1873
--- owners.list	25 Oct 2006 13:19:50 -0000	1.1872
+++ owners.list	25 Oct 2006 20:13:37 -0000	1.1873
@@ -652,6 +652,7 @@
 Fedora Extras|haddock|Documentation tool for annotated Haskell source code|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
 Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -759,7 +760,6 @@
 Fedora Extras|kasablanca|Graphical FTP client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|katapult|Faster access to applications, bookmarks, and other items|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kbackup|Back up your data in a simple, user friendly way|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 25 20:47:19 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 25 Oct 2006 13:47:19 -0700
Subject: rpms/autogen/devel autogen.spec,1.3,1.4
Message-ID: <200610252047.k9PKlJPX005283@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259

Modified Files:
	autogen.spec 
Log Message:

Rebuild against newer libopts 
 	autogen.spec 



Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/autogen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.spec	21 Oct 2006 11:14:28 -0000	1.3
+++ autogen.spec	25 Oct 2006 20:46:49 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Wed Oct 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-2
+- rebuild
+
 * Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
 - bump to new version
 



From fedora-extras-commits at redhat.com  Wed Oct 25 21:56:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 25 Oct 2006 14:56:13 -0700
Subject: rpms/numpy/devel numpy-1.0-gfortran.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 numpy.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200610252156.k9PLuDJf008576@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/numpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8550

Modified Files:
	.cvsignore numpy.spec sources 
Added Files:
	numpy-1.0-gfortran.patch 
Log Message:
update to numpy 1.0

numpy-1.0-gfortran.patch:

--- NEW FILE numpy-1.0-gfortran.patch ---
diff -ur numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py numpy-1.0/numpy/distutils/fcompiler/gnu.py
--- numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py	2006-10-09 03:46:59.000000000 -0400
+++ numpy-1.0/numpy/distutils/fcompiler/gnu.py	2006-10-25 13:51:18.000000000 -0400
@@ -30,7 +30,7 @@
         'compiler_f77' : [fc_exe, "-g", "-Wall","-fno-second-underscore"],
         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
         'compiler_fix' : None,
-        'linker_so'    : [fc_exe, "-g", "-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-g", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe, "-g", "-Wall"]
@@ -255,7 +255,7 @@
         'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
         'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
         'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
-        'linker_so'    : [fc_exe,"-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe,"-Wall"]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Sep 2006 20:36:23 -0000	1.5
+++ .cvsignore	25 Oct 2006 21:55:43 -0000	1.6
@@ -1,2 +1,3 @@
 numpy-0.9.6.tar.gz
 numpy-0.9.8.tar.gz
+numpy-1.0.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numpy.spec	5 Sep 2006 20:36:23 -0000	1.6
+++ numpy.spec	25 Oct 2006 21:55:43 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        0.9.8
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -12,8 +12,7 @@
 URL:            http://numeric.scipy.org/
 Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-0.9.4-f2pynumpy.patch
-Patch1:         numpy-0.9.8-gfortran.patch
-Patch2:         numpy-0.9.8-check_types.patch
+Patch1:         numpy-1.0-gfortran.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran
@@ -34,7 +33,6 @@
 %setup -q
 %patch0 -p1 -b .f2pynumpy
 %patch1 -p1 -b .gfortran
-%patch2 -p1 -b .check_types
 
 %build
 ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -43,7 +41,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# skip-build currently broken, this works around it for now
+ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
+    %{__python} setup.py install --root $RPM_BUILD_ROOT
 rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
 rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc .
@@ -68,6 +70,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.0-1
+- New upstream release
+
 * Tue Sep 06 2006 Jarod Wilson <jwilson at redhat.com> 0.9.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Sep 2006 20:36:23 -0000	1.5
+++ sources	25 Oct 2006 21:55:43 -0000	1.6
@@ -1 +1 @@
-ca528d2b460a6567d70bb6bdf0dc1805  numpy-0.9.8.tar.gz
+47dd0daa82e7b3f0fe74b969b388d7b3  numpy-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 21:58:16 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 14:58:16 -0700
Subject: rpms/wvs-data - New directory
Message-ID: <200610252158.k9PLwGfs008645@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8640/wvs-data

Log Message:
Directory /cvs/extras/rpms/wvs-data added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 21:58:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 14:58:22 -0700
Subject: rpms/wvs-data/devel - New directory
Message-ID: <200610252158.k9PLwMs6008664@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8640/wvs-data/devel

Log Message:
Directory /cvs/extras/rpms/wvs-data/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 21:58:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 14:58:41 -0700
Subject: rpms/wvs-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610252158.k9PLwfPd008700@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8694

Added Files:
	Makefile import.log 
Log Message:
Setup of module wvs-data


--- NEW FILE Makefile ---
# Top level Makefile for module wvs-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 25 21:58:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 14:58:47 -0700
Subject: rpms/wvs-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610252158.k9PLwlC8008717@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8694/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wvs-data


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 25 22:06:05 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 15:06:05 -0700
Subject: owners owners.list,1.1873,1.1874
Message-ID: <200610252206.k9PM65wk011738@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11719

Modified Files:
	owners.list 
Log Message:
add wvs-data


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1873
retrieving revision 1.1874
diff -u -r1.1873 -r1.1874
--- owners.list	25 Oct 2006 20:13:37 -0000	1.1873
+++ owners.list	25 Oct 2006 22:05:35 -0000	1.1874
@@ -2333,6 +2333,7 @@
 Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|denis at poolshark.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wvs-data|World Vector Shoreline data|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wxGTK|GTK+ port of the wxWidgets GUI library|mattdm at mattdm.org|extras-qa at fedoraproject.org|
 Fedora Extras|wxMaxima|Graphical user interface for Maxima|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 25 22:11:48 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 15:11:48 -0700
Subject: rpms/wvs-data import.log,1.1,1.2
Message-ID: <200610252211.k9PMBmOW011862@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11825

Modified Files:
	import.log 
Log Message:
auto-import wvs-data-0.0.20020219-2 on branch devel from wvs-data-0.0.20020219-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Oct 2006 21:58:41 -0000	1.1
+++ import.log	25 Oct 2006 22:11:18 -0000	1.2
@@ -0,0 +1 @@
+wvs-data-0_0_20020219-2:HEAD:wvs-data-0.0.20020219-2.src.rpm:1161814270



From fedora-extras-commits at redhat.com  Wed Oct 25 22:11:49 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 15:11:49 -0700
Subject: rpms/wvs-data/devel wvs-data.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610252211.k9PMBn2p011866@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11825/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wvs-data.spec 
Log Message:
auto-import wvs-data-0.0.20020219-2 on branch devel from wvs-data-0.0.20020219-2.src.rpm


--- NEW FILE wvs-data.spec ---
# Well, for now we use the timestamp of unpacked data
# for version

# Other information can be obtained on
# http://www.ngdc.noaa.gov/mgg/global/relief/ETOPO5/BOUNDARY/WVS/
# http://www.ngdc.noaa.gov/mgg/fliers/93mgg01.html

%define		WVS_date	20020219

Name:		wvs-data
Version:	0.0.%{WVS_date}
Release:	2
Summary:	World Vector Shoreline data

Group:		Applications/Engineering
License:	Public Domain
URL:		http://www.flaterco.com/xtide/files.html
Source0:	ftp://ftp.flaterco.com/xtide/wvs.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch

%description
This package contains World Vector Shoreline data, which can
be used for XTide related applications.

%prep
%setup -q -c %{name}-%{version}

%build

%install
%{__rm} -rf $RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -c -p -m644 *.dat \
	$RPM_BUILD_ROOT%{_datadir}/%{name}

%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_datadir}/%{name}/

%changelog
* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
- Directory name change.

* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-1
- Initial packaging.
- Use 0.0.%%{date} for version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Oct 2006 21:58:47 -0000	1.1
+++ .cvsignore	25 Oct 2006 22:11:19 -0000	1.2
@@ -0,0 +1 @@
+wvs.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Oct 2006 21:58:47 -0000	1.1
+++ sources	25 Oct 2006 22:11:19 -0000	1.2
@@ -0,0 +1 @@
+56325c8105c7137ced73396f2f2d8221  wvs.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 22:18:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 25 Oct 2006 15:18:46 -0700
Subject: rpms/asymptote/FC-4 .cvsignore, 1.9, 1.10 asymptote.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610252218.k9PMIkP1012049@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972/FC-4

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Oct 2006 13:48:02 -0000	1.9
+++ .cvsignore	25 Oct 2006 22:18:16 -0000	1.10
@@ -1 +1 @@
-asymptote-1.15.tar.gz
+asymptote-1.16.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/asymptote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asymptote.spec	22 Oct 2006 13:48:02 -0000	1.10
+++ asymptote.spec	25 Oct 2006 22:18:16 -0000	1.11
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -41,6 +41,7 @@
 %prep
 %setup -q
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
+%{__sed} -i 's/\r//' doc/CAD1.asy
 
 
 %build
@@ -137,6 +138,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
 - Update to 1.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Oct 2006 13:48:02 -0000	1.9
+++ sources	25 Oct 2006 22:18:16 -0000	1.10
@@ -1 +1 @@
-0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz
+ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 22:18:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 25 Oct 2006 15:18:48 -0700
Subject: rpms/asymptote/FC-6 .cvsignore, 1.9, 1.10 asymptote.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610252218.k9PMImCX012057@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972/FC-6

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Oct 2006 13:48:03 -0000	1.9
+++ .cvsignore	25 Oct 2006 22:18:17 -0000	1.10
@@ -1 +1 @@
-asymptote-1.15.tar.gz
+asymptote-1.16.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/asymptote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asymptote.spec	22 Oct 2006 13:48:03 -0000	1.10
+++ asymptote.spec	25 Oct 2006 22:18:17 -0000	1.11
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -41,6 +41,7 @@
 %prep
 %setup -q
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
+%{__sed} -i 's/\r//' doc/CAD1.asy
 
 
 %build
@@ -137,6 +138,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
 - Update to 1.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Oct 2006 13:48:03 -0000	1.9
+++ sources	25 Oct 2006 22:18:17 -0000	1.10
@@ -1 +1 @@
-0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz
+ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 22:18:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 25 Oct 2006 15:18:47 -0700
Subject: rpms/asymptote/FC-5 .cvsignore, 1.9, 1.10 asymptote.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610252218.k9PMIlBw012054@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972/FC-5

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Oct 2006 13:48:02 -0000	1.9
+++ .cvsignore	25 Oct 2006 22:18:17 -0000	1.10
@@ -1 +1 @@
-asymptote-1.15.tar.gz
+asymptote-1.16.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/asymptote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asymptote.spec	22 Oct 2006 13:48:02 -0000	1.10
+++ asymptote.spec	25 Oct 2006 22:18:17 -0000	1.11
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -41,6 +41,7 @@
 %prep
 %setup -q
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
+%{__sed} -i 's/\r//' doc/CAD1.asy
 
 
 %build
@@ -137,6 +138,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
 - Update to 1.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Oct 2006 13:48:02 -0000	1.9
+++ sources	25 Oct 2006 22:18:17 -0000	1.10
@@ -1 +1 @@
-0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz
+ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 22:18:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 25 Oct 2006 15:18:48 -0700
Subject: rpms/asymptote/devel .cvsignore, 1.9, 1.10 asymptote.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610252218.k9PMImjn012062@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972/devel

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Oct 2006 13:48:03 -0000	1.9
+++ .cvsignore	25 Oct 2006 22:18:18 -0000	1.10
@@ -1 +1 @@
-asymptote-1.15.tar.gz
+asymptote-1.16.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asymptote.spec	22 Oct 2006 13:48:03 -0000	1.10
+++ asymptote.spec	25 Oct 2006 22:18:18 -0000	1.11
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -41,6 +41,7 @@
 %prep
 %setup -q
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
+%{__sed} -i 's/\r//' doc/CAD1.asy
 
 
 %build
@@ -137,6 +138,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
 - Update to 1.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Oct 2006 13:48:03 -0000	1.9
+++ sources	25 Oct 2006 22:18:18 -0000	1.10
@@ -1 +1 @@
-0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz
+ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 22:26:22 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 25 Oct 2006 15:26:22 -0700
Subject: comps comps-fe5.xml.in, 1.180, 1.181 comps-fe6.xml.in, 1.203,
	1.204 comps-fe7.xml.in, 1.1, 1.2
Message-ID: <200610252226.k9PMQMXW012379@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12322

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Added crossfire, cyphesis, and xpilot game servers.




Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- comps-fe5.xml.in	21 Oct 2006 20:37:17 -0000	1.180
+++ comps-fe5.xml.in	25 Oct 2006 22:25:51 -0000	1.181
@@ -305,6 +305,8 @@
       <packagereq type="optional">chess</packagereq>
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">crack-attack</packagereq>
+      <packagereq type="optional">crossfire</packagereq>
+      <packagereq type="optional">crossfire-client</packagereq>
       <packagereq type="optional">crystal-stacker</packagereq>
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
@@ -384,6 +386,7 @@
       <packagereq type="optional">xgalaxy</packagereq>
       <packagereq type="optional">xmoto</packagereq>
       <packagereq type="optional">xpilot-ng</packagereq>
+      <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">zasx</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- comps-fe6.xml.in	21 Oct 2006 20:37:17 -0000	1.203
+++ comps-fe6.xml.in	25 Oct 2006 22:25:51 -0000	1.204
@@ -359,10 +359,12 @@
       <packagereq type="optional">chess</packagereq>
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">crack-attack</packagereq>
+      <packagereq type="optional">crossfire</packagereq>
       <packagereq type="optional">crossfire-client</packagereq>
       <packagereq type="optional">crystal-stacker</packagereq>
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
+      <packagereq type="optional">cyphesis</packagereq>
       <packagereq type="optional">enigma</packagereq>
       <packagereq type="optional">fbg</packagereq>
       <packagereq type="optional">fillets-ng</packagereq>
@@ -441,6 +443,7 @@
       <packagereq type="optional">xgalaxy</packagereq>
       <packagereq type="optional">xmoto</packagereq>
       <packagereq type="optional">xpilot-ng</packagereq>
+      <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">zasx</packagereq>


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comps-fe7.xml.in	25 Oct 2006 20:04:16 -0000	1.1
+++ comps-fe7.xml.in	25 Oct 2006 22:25:51 -0000	1.2
@@ -359,10 +359,12 @@
       <packagereq type="optional">chess</packagereq>
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">crack-attack</packagereq>
+      <packagereq type="optional">crossfire</packagereq>
       <packagereq type="optional">crossfire-client</packagereq>
       <packagereq type="optional">crystal-stacker</packagereq>
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
+      <packagereq type="optional">cyphesis</packagereq>
       <packagereq type="optional">enigma</packagereq>
       <packagereq type="optional">fbg</packagereq>
       <packagereq type="optional">fillets-ng</packagereq>
@@ -441,6 +443,7 @@
       <packagereq type="optional">xgalaxy</packagereq>
       <packagereq type="optional">xmoto</packagereq>
       <packagereq type="optional">xpilot-ng</packagereq>
+      <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">zasx</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 25 22:28:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Wed, 25 Oct 2006 15:28:36 -0700
Subject: rpms/python-sexy/FC-6 python-sexy.spec,1.5,1.6
Message-ID: <200610252228.k9PMSa03012441@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/FC-6

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/FC-6/python-sexy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-sexy.spec	17 Oct 2006 15:22:00 -0000	1.5
+++ python-sexy.spec	25 Oct 2006 22:28:06 -0000	1.6
@@ -2,7 +2,7 @@
 %define real_name sexy-python
 Name:           python-sexy
 Version:        0.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Python bindings to libsexy
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel >= 2
 BuildRequires:  pygtk2-devel >= 2.8.0
 BuildRequires:  libxml2-devel
-Requires:  libsexy-devel >= 0.1.10
+Requires:  libsexy >= 0.1.10
 
 %description
 sexy-python is a set of Python bindings around libsexy.
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Tue Nov 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
+* Thu Oct 26 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-2
+- fixed requires that asked libsexy-devel instead of libsexy.
+
+* Tue Oct 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
 - updated to 0.1.9, license file issue has been fixed upstream
 
 * Tue Sep 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8-5



From fedora-extras-commits at redhat.com  Wed Oct 25 22:28:35 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Wed, 25 Oct 2006 15:28:35 -0700
Subject: rpms/python-sexy/FC-5 python-sexy.spec,1.1,1.2
Message-ID: <200610252228.k9PMSZP4012438@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/FC-5

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/FC-5/python-sexy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-sexy.spec	25 Aug 2006 18:59:15 -0000	1.1
+++ python-sexy.spec	25 Oct 2006 22:28:05 -0000	1.2
@@ -2,7 +2,7 @@
 %define real_name sexy-python
 Name:           python-sexy
 Version:        0.1.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Python bindings to libsexy
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8.5
+- fixed requires that asked libsexy-devel instead of libsexy
+
 * Thu Aug 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8-4
 - Added quiet extraction of source tarball, some cleaning to the spec file
 



From fedora-extras-commits at redhat.com  Wed Oct 25 22:28:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Wed, 25 Oct 2006 15:28:42 -0700
Subject: rpms/python-sexy/devel python-sexy.spec,1.5,1.6
Message-ID: <200610252228.k9PMSgtN012444@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/devel

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-sexy.spec	17 Oct 2006 15:22:00 -0000	1.5
+++ python-sexy.spec	25 Oct 2006 22:28:12 -0000	1.6
@@ -2,7 +2,7 @@
 %define real_name sexy-python
 Name:           python-sexy
 Version:        0.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Python bindings to libsexy
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel >= 2
 BuildRequires:  pygtk2-devel >= 2.8.0
 BuildRequires:  libxml2-devel
-Requires:  libsexy-devel >= 0.1.10
+Requires:  libsexy >= 0.1.10
 
 %description
 sexy-python is a set of Python bindings around libsexy.
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Tue Nov 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
+* Thu Oct 26 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-2
+- fixed requires that asked libsexy-devel instead of libsexy.
+
+* Tue Oct 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
 - updated to 0.1.9, license file issue has been fixed upstream
 
 * Tue Sep 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8-5



From fedora-extras-commits at redhat.com  Wed Oct 25 23:04:15 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 25 Oct 2006 16:04:15 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.8,1.9
Message-ID: <200610252304.k9PN4FAD016571@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16550

Modified Files:
	Push.py 
Log Message:
fix a warning message


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Push.py	25 Oct 2006 13:01:11 -0000	1.8
+++ Push.py	25 Oct 2006 23:04:12 -0000	1.9
@@ -350,7 +350,7 @@
         if buildreport:
             rundirfile.write(buildreportinfo)
         rundirfile.close()
-        raise PushWarning, 'WARNING: %s ' % pkg_fn
+        raise PushWarning, 'WARNING: Multiple source rpms'
     
     package = filedict['srpm'][0]
     (n,a,e,v,r) = naevr(package)



From fedora-extras-commits at redhat.com  Wed Oct 25 23:55:45 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 25 Oct 2006 16:55:45 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.9,1.10
Message-ID: <200610252355.k9PNtjAG016970@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16952

Modified Files:
	Push.py 
Log Message:
fix a warning message once more


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Push.py	25 Oct 2006 23:04:12 -0000	1.9
+++ Push.py	25 Oct 2006 23:55:42 -0000	1.10
@@ -346,11 +346,11 @@
 
     if len(filedict['srpm']) > 1:
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
-        buildreportinfo = 'Invalid build-job: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        buildreportinfo = 'Invalid build results: %s-%s\n' % (name,os.path.basename(pkgrelroot))
         if buildreport:
             rundirfile.write(buildreportinfo)
         rundirfile.close()
-        raise PushWarning, 'WARNING: Multiple source rpms'
+        raise PushWarning, 'WARNING: Multiple source rpms in %s' % pkgrelroot
     
     package = filedict['srpm'][0]
     (n,a,e,v,r) = naevr(package)



From fedora-extras-commits at redhat.com  Thu Oct 26 03:40:51 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 20:40:51 -0700
Subject: rpms/fluxstyle/devel fluxstyle.desktop,1.1,1.2
Message-ID: <200610260340.k9Q3epPI030024@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30004

Modified Files:
	fluxstyle.desktop 
Log Message:
Fix category in .desktop file 



Index: fluxstyle.desktop
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/devel/fluxstyle.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxstyle.desktop	25 Oct 2006 13:16:30 -0000	1.1
+++ fluxstyle.desktop	26 Oct 2006 03:40:20 -0000	1.2
@@ -7,4 +7,4 @@
 TryExec=fluxStyle
 Exec=fluxStyle
 Icon=fluxmetal.png
-Categories=Application;GTK;System;Utilities;
+Categories=Application;Settings;GTK;System;Utility;



From fedora-extras-commits at redhat.com  Thu Oct 26 05:54:29 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 22:54:29 -0700
Subject: comps comps-fe5.xml.in, 1.181, 1.182 comps-fe6.xml.in, 1.204,
	1.205 comps-fe7.xml.in, 1.2, 1.3
Message-ID: <200610260554.k9Q5sSZ1004135@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4110

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
+vdradmin-am


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- comps-fe5.xml.in	25 Oct 2006 22:25:51 -0000	1.181
+++ comps-fe5.xml.in	26 Oct 2006 05:53:58 -0000	1.182
@@ -955,6 +955,7 @@
       <packagereq type="optional">plone</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">TurboGears</packagereq>
+      <packagereq type="optional">vdradmin-am</packagereq>
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- comps-fe6.xml.in	25 Oct 2006 22:25:51 -0000	1.204
+++ comps-fe6.xml.in	26 Oct 2006 05:53:58 -0000	1.205
@@ -1088,6 +1088,7 @@
       <packagereq type="optional">tclhttpd</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">TurboGears</packagereq>
+      <packagereq type="optional">vdradmin-am</packagereq>
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comps-fe7.xml.in	25 Oct 2006 22:25:51 -0000	1.2
+++ comps-fe7.xml.in	26 Oct 2006 05:53:58 -0000	1.3
@@ -1088,6 +1088,7 @@
       <packagereq type="optional">tclhttpd</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">TurboGears</packagereq>
+      <packagereq type="optional">vdradmin-am</packagereq>
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Thu Oct 26 10:09:25 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 26 Oct 2006 03:09:25 -0700
Subject: rpms/fedora-package-config-smart/FC-5
	fedora-package-config-smart.spec, 1.3, 1.4
Message-ID: <200610261009.k9QA9PHC020404@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/FC-5

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Adjust for FC6, remove unsupported (by smart) mirrorlists


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-5/fedora-package-config-smart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-package-config-smart.spec	13 May 2006 09:43:29 -0000	1.3
+++ fedora-package-config-smart.spec	26 Oct 2006 10:08:55 -0000	1.4
@@ -1,7 +1,7 @@
-Summary: Fedora configuration files for the smart package manager 
+Summary: Fedora configuration files for the smart package manager
 Name: fedora-package-config-smart
 Version: 5
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/



From fedora-extras-commits at redhat.com  Thu Oct 26 10:09:24 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 26 Oct 2006 03:09:24 -0700
Subject: rpms/fedora-package-config-smart/FC-4
	fedora-package-config-smart.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610261009.k9QA9OmI020401@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/FC-4

Modified Files:
	fedora-package-config-smart.spec sources 
Log Message:
Adjust for FC6, remove unsupported (by smart) mirrorlists


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/fedora-package-config-smart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-package-config-smart.spec	13 May 2006 09:43:28 -0000	1.4
+++ fedora-package-config-smart.spec	26 Oct 2006 10:08:53 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the smart package manager
 Name: fedora-package-config-smart
 Version: 4
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Apr 2006 11:47:11 -0000	1.3
+++ sources	26 Oct 2006 10:08:53 -0000	1.4
@@ -1 +1 @@
-0623cece6bf5084642c5e154c29867aa  fedora-package-config-smart-4.tar.bz2
+ce4a216e5e49efcb212aa7b3ab450964  fedora-package-config-smart-4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 26 10:09:26 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 26 Oct 2006 03:09:26 -0700
Subject: rpms/fedora-package-config-smart/FC-6 .cvsignore, 1.4,
	1.5 fedora-package-config-smart.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610261009.k9QA9Q9u020409@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/FC-6

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
Adjust for FC6, remove unsupported (by smart) mirrorlists


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2006 00:36:25 -0000	1.4
+++ .cvsignore	26 Oct 2006 10:08:56 -0000	1.5
@@ -1 +1 @@
-fedora-package-config-smart-5.92.tar.bz2
+fedora-package-config-smart-6.tar.bz2


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-6/fedora-package-config-smart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-package-config-smart.spec	30 Aug 2006 00:27:39 -0000	1.4
+++ fedora-package-config-smart.spec	26 Oct 2006 10:08:56 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the smart package manager
 Name: fedora-package-config-smart
-Version: 5.92
-Release: 7
+Version: 6
+Release: 8
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -38,6 +38,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Oct 26 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 6-8
+- Update to Fedora Core 6.
+
 * Sat May 13 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-7
 - Sync with fedora-package-config-apt, see also #191580.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Sep 2006 07:51:51 -0000	1.5
+++ sources	26 Oct 2006 10:08:56 -0000	1.6
@@ -1 +1 @@
-0efc10150b9cb49b32cf69bc00d0a59c  fedora-package-config-smart-5.92.tar.bz2
+61aaadfe0ff641c6c1be3e3f93f3dc09  fedora-package-config-smart-6.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 26 10:09:27 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 26 Oct 2006 03:09:27 -0700
Subject: rpms/fedora-package-config-smart/devel .cvsignore, 1.4,
	1.5 fedora-package-config-smart.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610261009.k9QA9R3T020414@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/devel

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
Adjust for FC6, remove unsupported (by smart) mirrorlists


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2006 00:36:25 -0000	1.4
+++ .cvsignore	26 Oct 2006 10:08:56 -0000	1.5
@@ -1 +1 @@
-fedora-package-config-smart-5.92.tar.bz2
+fedora-package-config-smart-6.89.tar.bz2


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/fedora-package-config-smart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-package-config-smart.spec	30 Aug 2006 00:27:39 -0000	1.4
+++ fedora-package-config-smart.spec	26 Oct 2006 10:08:56 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: Fedora configuration files for the smart package manager
 Name: fedora-package-config-smart
-Version: 5.92
+Version: 6.89
 Release: 7
 License: GPL
 Group: System Environment/Base
@@ -38,6 +38,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Oct 26 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 6.89-7
+- Update to post-FC6 rawhide.
+
 * Sat May 13 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-7
 - Sync with fedora-package-config-apt, see also #191580.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Sep 2006 07:51:51 -0000	1.5
+++ sources	26 Oct 2006 10:08:56 -0000	1.6
@@ -1 +1 @@
-0efc10150b9cb49b32cf69bc00d0a59c  fedora-package-config-smart-5.92.tar.bz2
+a8c5d17d5d3b0be3cb09f6d7f5a3f8f2  fedora-package-config-smart-6.89.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 26 12:52:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 05:52:51 -0700
Subject: rpms/sbcl/devel .cvsignore, 1.16, 1.17 sbcl.spec, 1.52, 1.53 sources,
	1.18, 1.19
Message-ID: <200610261252.k9QCqpvN027441@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27410

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.18-1
- sbcl-0.9.18



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Sep 2006 13:06:00 -0000	1.16
+++ .cvsignore	26 Oct 2006 12:52:20 -0000	1.17
@@ -3,3 +3,4 @@
 sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 sbcl-0.9.16-source.tar.bz2
 sbcl-0.9.17-source.tar.bz2
+sbcl-0.9.18-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sbcl.spec	27 Sep 2006 13:06:00 -0000	1.52
+++ sbcl.spec	26 Oct 2006 12:52:20 -0000	1.53
@@ -9,7 +9,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.17
+Version: 0.9.18
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -215,8 +215,11 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.18-1
+- sbcl-0.9.18
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.17-1
-- 0.9.17
+- sbcl-0.9.17
 
 * Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.16-3
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	27 Sep 2006 13:06:00 -0000	1.18
+++ sources	26 Oct 2006 12:52:20 -0000	1.19
@@ -1 +1 @@
-1f2297931f35d6d84d632c30aa099c13  sbcl-0.9.17-source.tar.bz2
+a00122024746ecb81bfff1a328bb2336  sbcl-0.9.18-source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 26 13:30:55 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 26 Oct 2006 06:30:55 -0700
Subject: rpms/linphone/devel linphone.spec,1.22,1.23
Message-ID: <200610261330.k9QDUtZF030594@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30570

Modified Files:
	linphone.spec 
Log Message:
* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-1
- Update to 1.5.0
- Fix spelling error in description.
- Remove invalid categories on desktop file.




Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linphone.spec	30 Aug 2006 15:50:47 -0000	1.22
+++ linphone.spec	26 Oct 2006 13:30:25 -0000	1.23
@@ -1,24 +1,39 @@
 Name:           linphone
-Version:        1.2.0
-Release:        7%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
-URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
+URL:            http://www.linphone.org/
+Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
-Patch1:         linphone-1.2.0-ortp.patch
-Patch2:         linphone-1.1.0-Werror.patch
-Patch3:         linphone-1.2.0-maxrtp.patch
-Patch4:         linphone-1.2.0-gtkentry.patch
+Patch1:         linphone-1.4.1-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires:  libosip2-devel speex-devel >= 1.0.5  gettext desktop-file-utils
-BuildRequires:  ortp-devel >= 0.7.1
+BuildRequires:  libosip2-devel
+BuildRequires:  ortp-devel = 0.11.0
+
+BuildRequires:  readline-devel
+BuildRequires:  ncurses-devel
+
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  glib2-devel
+BuildRequires:  alsa-lib-devel
+
+BuildRequires:  speex-devel >= 1.2
+
+BuildRequires:  desktop-file-utils
+
 BuildRequires:  perl(XML::Parser)
 
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  libtool
+BuildRequires:  intltool
+BuildRequires:  gettext
+
 %description
 Linphone is mostly sip compliant. It works successfully with these
 implementations:
@@ -27,7 +42,7 @@
     * Hotsip, a free of charge phone for Windows.
     * Vocal, an open source SIP stack from Vovida that includes a SIP proxy
         that works with linphone since version 0.7.1.
-    * Siproxd is a free sip proxy being developped by Thomas Ries because he
+    * Siproxd is a free sip proxy being developed by Thomas Ries because he
         would like to have linphone working behind his firewall. Siproxd is
         simple to setup and works perfectly with linphone.
     * Partysip aims at being a generic and fully functionnal SIP proxy. Visit
@@ -46,14 +61,27 @@
 %prep
 %setup -q
 %patch -p 1 -b .old
-%patch1 -p 1 -b .ortp
-%patch2 -p 1 -b .Werror
-%patch3 -p 1 -b .maxrtp
-%patch4 -p 1 -b .gtkentry
+%patch1 -p 1 -b .libs
+
 rm -r oRTP
 
+libtoolize --copy --force
+autoheader
+aclocal -I m4
+automake --force-missing --add-missing --copy
+autoconf
+rm -rf config.cache
+
+pushd mediastreamer2
+libtoolize --copy --force
+autoheader
+aclocal
+automake --force-missing --add-missing --copy
+autoconf
+popd
+
 %build
-%configure
+%configure --disable-static --disable-video
 make %{?_smp_mflags}
 
 %install
@@ -65,10 +93,11 @@
 desktop-file-install --vendor=fedora \
   --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
+  --remove-category Application \
   --add-category Telephony \
   --add-category GTK \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,12 +112,13 @@
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*.server
 %{_libdir}/liblinphone.so.*
+%{_libdir}/libmediastreamer.so.*
+%{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/gtk-doc/html/mediastreamer
 %{_datadir}/pixmaps/linphone
 %{_datadir}/pixmaps/linphone2.png
 %{_datadir}/sounds/linphone
@@ -96,12 +126,18 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/linphone
-%{_libdir}/liblinphone.a
-%{_libdir}/liblinphone.la
+%{_includedir}/mediastreamer2
 %{_libdir}/liblinphone.so
+%{_libdir}/libmediastreamer.so
+%{_libdir}/libquickstream.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-1
+- Update to 1.5.0
+- Fix spelling error in description.
+- Remove invalid categories on desktop file.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0-7
 - Bump release so that I can "make tag"
 



From fedora-extras-commits at redhat.com  Thu Oct 26 13:47:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 26 Oct 2006 06:47:29 -0700
Subject: rpms/linphone/devel linphone-1.4.1-libs.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 linphone.spec, 1.23, 1.24 sources, 1.5,
	1.6 linphone-1.0.1-pkgconfig.patch, 1.1,
	NONE linphone-1.1.0-Werror.patch, 1.1,
	NONE linphone-1.2.0-gtkentry.patch, 1.1,
	NONE linphone-1.2.0-maxrtp.patch, 1.1,
	NONE linphone-1.2.0-ortp.patch, 1.1, NONE
Message-ID: <200610261347.k9QDlTw9030773@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30746

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.4.1-libs.patch 
Removed Files:
	linphone-1.0.1-pkgconfig.patch linphone-1.1.0-Werror.patch 
	linphone-1.2.0-gtkentry.patch linphone-1.2.0-maxrtp.patch 
	linphone-1.2.0-ortp.patch 
Log Message:
* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-2
- Don't forget to add new files and remove old ones!



linphone-1.4.1-libs.patch:

--- NEW FILE linphone-1.4.1-libs.patch ---
diff -ru linphone-1.4.1.old/configure.in linphone-1.4.1.new/configure.in
--- linphone-1.4.1.old/configure.in	2006-09-18 02:28:20.000000000 -0500
+++ linphone-1.4.1.new/configure.in	2006-10-09 08:49:20.000000000 -0500
@@ -242,7 +242,7 @@
 
 AC_SUBST(STRICT_OPTIONS)
 
-AC_CONFIG_SUBDIRS( oRTP mediastreamer2 )
+AC_CONFIG_SUBDIRS( mediastreamer2 )
 
 dnl check for db2html (docbook) to generate html user manual
 AC_CHECK_PROG(have_db2html,db2html, yes, no)
@@ -258,12 +258,7 @@
 
 AC_DEFINE_UNQUOTED(LINPHONE_VERSION,"$PACKAGE_VERSION",[Linphone's version number])
 
-dnl Packaging: Pick oRTP version from ${top_srcdir}/oRTP/configure.ac
-dnl Feel free to propose an alternative & cleaner version...
-top_srcdir=`dirname $0`
-changequote(, )dnl
-ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'`
-changequote([, ])dnl
+ORTP_VERSION=0.11.0
 AC_SUBST([ORTP_VERSION])
 
 AC_OUTPUT([ 
diff -ru linphone-1.4.1.old/Makefile.am linphone-1.4.1.new/Makefile.am
--- linphone-1.4.1.old/Makefile.am	2006-09-11 07:58:46.000000000 -0500
+++ linphone-1.4.1.new/Makefile.am	2006-10-09 08:49:33.000000000 -0500
@@ -3,7 +3,7 @@
 # let make re-run automake upon need
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = m4 pixmaps po ipkg oRTP gsmlib mediastreamer2\
+SUBDIRS = m4 pixmaps po ipkg gsmlib mediastreamer2\
 		media_api exosip coreapi console gnome share
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2006 12:05:15 -0000	1.5
+++ .cvsignore	26 Oct 2006 13:46:59 -0000	1.6
@@ -1 +1 @@
-linphone-1.2.0.tar.gz
+linphone-1.5.0.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linphone.spec	26 Oct 2006 13:30:25 -0000	1.23
+++ linphone.spec	26 Oct 2006 13:46:59 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -133,6 +133,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-2
+- Don't forget to add new files and remove old ones!
+
 * Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-1
 - Update to 1.5.0
 - Fix spelling error in description.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 12:05:15 -0000	1.5
+++ sources	26 Oct 2006 13:46:59 -0000	1.6
@@ -1 +1 @@
-bd5e513a665ce2e381afce64d569c707  linphone-1.2.0.tar.gz
+e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz


--- linphone-1.0.1-pkgconfig.patch DELETED ---


--- linphone-1.1.0-Werror.patch DELETED ---


--- linphone-1.2.0-gtkentry.patch DELETED ---


--- linphone-1.2.0-maxrtp.patch DELETED ---


--- linphone-1.2.0-ortp.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 26 14:40:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Oct 2006 07:40:41 -0700
Subject: fedora-security/audit fe6,NONE,1.1
Message-ID: <200610261440.k9QEefk8001606@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586

Added Files:
	fe6 
Log Message:
Seed fe6 from fe5.


***** Error reading new file: [Errno 2] No such file or directory: 'fe6'



From fedora-extras-commits at redhat.com  Thu Oct 26 14:48:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Oct 2006 07:48:46 -0700
Subject: fedora-security/audit fe4,1.81,1.82 fe5,1.88,1.89 fe6,1.1,1.2
Message-ID: <200610261448.k9QEmkTg001681@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1659

Modified Files:
	fe4 fe5 fe6 
Log Message:
+CVE-2006-545[3-5] (bugzilla)


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fe4	23 Oct 2006 20:52:08 -0000	1.81
+++ fe4	26 Oct 2006 14:48:44 -0000	1.82
@@ -2,6 +2,9 @@
 
 ** are items that need attention
 
+CVE-2006-5455 VULNERABLE (bugzilla) #212355
+CVE-2006-5454 VULNERABLE (bugzilla) #212355
+CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- fe5	23 Oct 2006 20:52:08 -0000	1.88
+++ fe5	26 Oct 2006 14:48:44 -0000	1.89
@@ -2,6 +2,9 @@
 
 ** are items that need attention
 
+CVE-2006-5455 VULNERABLE (bugzilla) #212355
+CVE-2006-5454 VULNERABLE (bugzilla) #212355
+CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fe6	26 Oct 2006 14:40:38 -0000	1.1
+++ fe6	26 Oct 2006 14:48:44 -0000	1.2
@@ -2,6 +2,9 @@
 
 ** are items that need attention
 
+CVE-2006-5455 VULNERABLE (bugzilla) #212355
+CVE-2006-5454 VULNERABLE (bugzilla) #212355
+CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)



From fedora-extras-commits at redhat.com  Thu Oct 26 17:32:00 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu, 26 Oct 2006 10:32:00 -0700
Subject: fedora-security/audit fc5,1.371,1.372 fc6,1.124,1.125
Message-ID: <200610261732.k9QHW0Ul011254@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11234

Modified Files:
	fc5 fc6 
Log Message:
Note a new ruby issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- fc5	25 Oct 2006 17:22:00 -0000	1.371
+++ fc5	26 Oct 2006 17:31:57 -0000	1.372
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- fc6	25 Oct 2006 17:22:00 -0000	1.124
+++ fc6	26 Oct 2006 17:31:57 -0000	1.125
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]



From fedora-extras-commits at redhat.com  Thu Oct 26 19:15:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 12:15:11 -0700
Subject: rpms/uw-imap/devel .cvsignore, 1.5, 1.6 sources, 1.6,
	1.7 uw-imap.spec, 1.20, 1.21
Message-ID: <200610261915.k9QJFBV5017885@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17863

Modified Files:
	.cvsignore sources uw-imap.spec 
Log Message:
* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006c1-1
- imap-2006c1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Oct 2006 19:35:26 -0000	1.5
+++ .cvsignore	26 Oct 2006 19:14:40 -0000	1.6
@@ -1,3 +1,4 @@
 imap-2006.tar.Z
 imap-2006a.tar.Z
 imap-2006b.tar.Z
+imap-2006c1.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Oct 2006 19:35:26 -0000	1.6
+++ sources	26 Oct 2006 19:14:40 -0000	1.7
@@ -1 +1 @@
-6ba2c67118b7432d91999bcb5b227288  imap-2006b.tar.Z
+35a9976cc0c57e0423cd49fb0f967d5e  imap-2006c1.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- uw-imap.spec	6 Oct 2006 19:35:26 -0000	1.20
+++ uw-imap.spec	26 Oct 2006 19:14:40 -0000	1.21
@@ -1,7 +1,7 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006b
+Version: 2006c1
 Release: 1%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
@@ -274,6 +274,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006c1-1
+- imap-2006c1
+
 * Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
 - imap-2006b
 - %%ghost %%config(missingok,noreplace) %%{_sysconfdir}/c-client.cf



From fedora-extras-commits at redhat.com  Thu Oct 26 19:22:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 12:22:43 -0700
Subject: rpms/geomview/devel geomview.spec,1.27,1.28
Message-ID: <200610261922.k9QJMhlI018003@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17987

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
  Conflicts: lam (bug #212435)



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- geomview.spec	1 Oct 2006 21:36:53 -0000	1.27
+++ geomview.spec	26 Oct 2006 19:22:13 -0000	1.28
@@ -205,9 +205,12 @@
 # maniview manpage
 %{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
-# rename animate.1 that Conflicts: ImageMagick
-test -f $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 && \
-  mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1
+# rename animate.1 that Conflicts: ImageMagick (#202039)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
+# rename sweep.1 that Conflicts: lam (#212435)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
 
 # rpmdocs
 make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
@@ -276,6 +279,10 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
+- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
+  Conflicts: lam (bug #212435)
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
 - 1.8.2rc9
 



From fedora-extras-commits at redhat.com  Thu Oct 26 19:34:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 12:34:35 -0700
Subject: rpms/geomview/devel geomview.spec,1.28,1.29
Message-ID: <200610261934.k9QJYZXh018108@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18088

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.23.rc9
- fixup desktop-file-install usage



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- geomview.spec	26 Oct 2006 19:22:13 -0000	1.28
+++ geomview.spec	26 Oct 2006 19:34:05 -0000	1.29
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.21.%{beta}%{?dist}
+Release: 0.23.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,10 +190,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   %{SOURCE1}
 
 # app icon
@@ -279,6 +277,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.23.rc9
+- fixup desktop-file-install usage
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
 - rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
   Conflicts: lam (bug #212435)



From fedora-extras-commits at redhat.com  Thu Oct 26 19:41:54 2006
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Thu, 26 Oct 2006 12:41:54 -0700
Subject: fedora-security/audit fc5,1.372,1.373 fc6,1.125,1.126
Message-ID: <200610261941.k9QJfsZW018195@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18174

Modified Files:
	fc5 fc6 
Log Message:
CVE-2006-5540 pgsql DoS



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- fc5	26 Oct 2006 17:31:57 -0000	1.372
+++ fc5	26 Oct 2006 19:41:51 -0000	1.373
@@ -1,8 +1,9 @@
-Up to date CVE as of CVE email 20061024
-Up to date FC5 as of 20061024
+Up to date CVE as of CVE email 20061026
+Up to date FC5 as of 20061026
 
 ** are items that need attention
 
+CVE-2006-5540 VULNERABLE (postgresql) #212360
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- fc6	26 Oct 2006 17:31:57 -0000	1.125
+++ fc6	26 Oct 2006 19:41:51 -0000	1.126
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5540 VULNERABLE (postgresql) #212360
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)



From fedora-extras-commits at redhat.com  Thu Oct 26 20:04:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:04:22 -0700
Subject: rpms/geomview/devel geomview.desktop, 1.3, 1.4 geomview.spec, 1.29,
	1.30
Message-ID: <200610262004.k9QK4MY1021197@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21179

Modified Files:
	geomview.desktop geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
- fixup desktop-file-install usage
- fixup geomview.desktop Categories



Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geomview.desktop	12 May 2006 18:53:24 -0000	1.3
+++ geomview.desktop	26 Oct 2006 20:03:51 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-MimeType=application/x-geomview
+MimeType=application/x-geomview;
 Type=Application
 Encoding=UTF-8
-Categories=Application;Graphics;Scientific;Education;Math;
+Categories=Graphics;Science;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- geomview.spec	26 Oct 2006 19:34:05 -0000	1.29
+++ geomview.spec	26 Oct 2006 20:03:51 -0000	1.30
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.23.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -277,8 +277,9 @@
 
 
 %changelog
-* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.23.rc9
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
 - fixup desktop-file-install usage
+- fixup geomview.desktop Categories
 
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
 - rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid



From fedora-extras-commits at redhat.com  Thu Oct 26 20:21:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:21:37 -0700
Subject: rpms/geomview/FC-6 geomview.desktop, 1.3, 1.4 geomview.spec, 1.27,
	1.28
Message-ID: <200610262021.k9QKLbcc021385@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21361

Modified Files:
	geomview.desktop geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
- fixup desktop-file-install usage
- fixup geomview.desktop Categories

* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
  Conflicts: lam (bug #212435)




Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-6/geomview.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geomview.desktop	12 May 2006 18:53:24 -0000	1.3
+++ geomview.desktop	26 Oct 2006 20:21:06 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-MimeType=application/x-geomview
+MimeType=application/x-geomview;
 Type=Application
 Encoding=UTF-8
-Categories=Application;Graphics;Scientific;Education;Math;
+Categories=Graphics;Science;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-6/geomview.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- geomview.spec	1 Oct 2006 21:36:53 -0000	1.27
+++ geomview.spec	26 Oct 2006 20:21:06 -0000	1.28
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.21.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,10 +190,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   %{SOURCE1}
 
 # app icon
@@ -205,9 +203,12 @@
 # maniview manpage
 %{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
-# rename animate.1 that Conflicts: ImageMagick
-test -f $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 && \
-  mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1
+# rename animate.1 that Conflicts: ImageMagick (#202039)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
+# rename sweep.1 that Conflicts: lam (#212435)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
 
 # rpmdocs
 make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
@@ -276,6 +277,14 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
+- fixup desktop-file-install usage
+- fixup geomview.desktop Categories
+
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
+- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
+  Conflicts: lam (bug #212435)
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
 - 1.8.2rc9
 



From fedora-extras-commits at redhat.com  Thu Oct 26 20:23:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:23:56 -0700
Subject: rpms/geomview/FC-5 geomview.spec,1.15,1.16
Message-ID: <200610262023.k9QKNuNP021459@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21443

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
- fixup desktop-file-install usage
- fixup geomview.desktop Categories

* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
  Conflicts: lam (bug #212435)




Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/geomview.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- geomview.spec	1 Oct 2006 21:54:51 -0000	1.15
+++ geomview.spec	26 Oct 2006 20:23:26 -0000	1.16
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.21.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,10 +190,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   %{SOURCE1}
 
 # app icon
@@ -205,9 +203,12 @@
 # maniview manpage
 %{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
-# rename animate.1 that Conflicts: ImageMagick
-test -f $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 && \
-  mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1
+# rename animate.1 that Conflicts: ImageMagick (#202039)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
+# rename sweep.1 that Conflicts: lam (#212435)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
 
 # rpmdocs
 make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
@@ -276,6 +277,14 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
+- fixup desktop-file-install usage
+- fixup geomview.desktop Categories
+
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
+- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
+  Conflicts: lam (bug #212435)
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
 - 1.8.2rc9
 



From fedora-extras-commits at redhat.com  Thu Oct 26 20:29:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:29:48 -0700
Subject: rpms/geomview/devel geomview.spec,1.30,1.31
Message-ID: <200610262029.k9QKTmTi021541@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21520

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
- re-instate dfi --vendor=fedora (thanks Ville!) 



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- geomview.spec	26 Oct 2006 20:03:51 -0000	1.30
+++ geomview.spec	26 Oct 2006 20:29:17 -0000	1.31
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.24.%{beta}%{?dist}
+Release: 0.25.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,7 +190,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-desktop-file-install --vendor="" \
+desktop-file-install --vendor="fedora" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
+- re-instate dfi --vendor=fedora (thanks Ville!) 
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
 - fixup desktop-file-install usage
 - fixup geomview.desktop Categories



From fedora-extras-commits at redhat.com  Thu Oct 26 20:31:53 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:31:53 -0700
Subject: rpms/maxima/devel maxima.spec,1.42,1.43 xmaxima.desktop,1.4,1.5
Message-ID: <200610262031.k9QKVre7021625@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21605

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10-0-6
- respin for sbcl-0.9.18
- fixup %triggerun's



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- maxima.spec	2 Oct 2006 16:55:41 -0000	1.42
+++ maxima.spec	26 Oct 2006 20:31:22 -0000	1.43
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -303,11 +303,16 @@
 ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||:
 
 %triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+if [ $2 -eq 0 ]; then
+ rm -f %{emacs_sitelisp}/maxima || :
+ rm -f %{emacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 %triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
-
+if [ $2 -eq 0 ]; then
+ rm -f %{xemacs_sitelisp}/maxima || :
+ rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 
 %clean
@@ -380,6 +385,10 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10-0-6
+- respin for sbcl-0.9.18
+- fixup %%triggerun's
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
 - update xdg-utils patch (for .dvi handling too)
 


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/xmaxima.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmaxima.desktop	5 Jan 2006 14:56:22 -0000	1.4
+++ xmaxima.desktop	26 Oct 2006 20:31:22 -0000	1.5
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Application;Science;Education;Math;
+Categories=Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Thu Oct 26 20:37:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:37:44 -0700
Subject: rpms/maxima/devel maxima.spec,1.43,1.44
Message-ID: <200610262037.k9QKbi7g021716@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21698

Modified Files:
	maxima.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-7
- respin for sbcl-0.9.18
- fixup %triggerun's
- drop dfi --add-category=X-Fedora



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- maxima.spec	26 Oct 2006 20:31:22 -0000	1.43
+++ maxima.spec	26 Oct 2006 20:37:14 -0000	1.44
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -158,7 +158,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 # almost any sbcl will do, but we want to be sure we're using the latest -- Rex
-BuildRequires: sbcl >= 0.9.17
+BuildRequires: sbcl >= 0.9.18
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -239,7 +239,7 @@
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" --vendor="fedora" \
+  --vendor="fedora" \
   %{SOURCE2} 
 
 # emaxima LaTeX style
@@ -385,9 +385,10 @@
 
 
 %changelog
-* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10-0-6
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-7
 - respin for sbcl-0.9.18
 - fixup %%triggerun's
+- drop dfi --add-category=X-Fedora
 
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
 - update xdg-utils patch (for .dvi handling too)



From fedora-extras-commits at redhat.com  Thu Oct 26 20:57:54 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 26 Oct 2006 13:57:54 -0700
Subject: check-mirrors check-mirrors.conf, 1.9, 1.10 check-mirrors.py, 1.31,
	1.32 return-mirrorlist.py, 1.17, 1.18
Message-ID: <200610262057.k9QKvsnu021932@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21911

Modified Files:
	check-mirrors.conf check-mirrors.py return-mirrorlist.py 
Log Message:
fixed multiple bugs discovered during the FC6 launch
return mirrors had a recursive function that would get called regularly
check-mirrors assumed that when an update failed, it should insert.  Not the case if the db is simply locked.




Index: check-mirrors.conf
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- check-mirrors.conf	2 Aug 2006 22:03:46 -0000	1.9
+++ check-mirrors.conf	26 Oct 2006 20:57:52 -0000	1.10
@@ -1,52 +1,175 @@
 [global]
-db=/tmp/mirrors.db
+db=/var/www/mirrors/mirrors.db
+
+[rawhide]
+inputfile = http://fedoraproject.org/mirrors/fedora-core-rawhide
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://Download.fedoraproject.org/pub/fedora/linux/core/development/$ARCH/os/
+file_prefix = rawhide
+
+[core-6]
+inputfile = http://fedoraproject.org/mirrors/fedora-core-6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/6/$ARCH/os/
+file_prefix = core-6 
+
+[extras-6]
+inputfile = http://fedoraproject.org/mirrors/fedora-extras-6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/6/$ARCH/
+file_prefix = extras-6
+
+[updates-released-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-released-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/6/$ARCH/
+file_prefix = updates-released-fc6
+
+[updates-released-debug-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-released-debug-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/6/$ARCH/debug/
+file_prefix = updates-released-debug-fc6
+
+[updates-released-source-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-released-source-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/6/SRPMS/
+file_prefix = updates-released-source-fc6
+
+[updates-testing-source-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-source-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/testing/6/SRPMS/
+file_prefix = updates-testing-source-fc6
+
+[updates-testing-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/testing/6/$ARCH/
+file_prefix = updates-testing-fc6
+
+[updates-testing-debug-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-debug/fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/testing/6/$ARCH/debug
+file_prefix = updates-testing-fc6
+
+[core-source-6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/6/SRPMS/
+file_prefix = core-source-6
+
+[extras-source-6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/6/SRPMS/
+file_prefix = extras-source-6
+
+[core-debug-6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/6/$ARCH/debug/
+file_prefix = core-debug-6
+
+[extras-debug-6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/6/$ARCH/debug/
+file_prefix = extras-debug-6
+
+[legacy-updates-6]
+inputfile = http://fedoraproject.org/mirrors/legacy-updates-released-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://download.fedoralegacy.org/fedora/6/updates/$ARCH
+file_prefix = legacy-updates-6
+
+[legacy-updates-testing-6]
+inputfile = http://fedoraproject.org/mirrors/legacy-updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://download.fedoralegacy.org/fedora/6/updates-testing/$ARCH
+file_prefix = legacy-updates-6
+
+
+[extras-source-devel]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/development/SRPMS/
+file_prefix = extras-source-devel
+
+
 
 [core-5]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-core-5
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/fedora-core-5
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
+timeout = 2
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/5/$ARCH/os/
 file_prefix = core-5 
 
 [extras-5]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-extras-5
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/fedora-extras-5
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
+timeout = 2
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/5/$ARCH/
 file_prefix = extras-5
 
 [updates-released-5]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-core-5
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/updates-released-fc5
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
+timeout = 2
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/5/$ARCH/
 file_prefix = updates-released-5
 
 [updates-testing-5]
-inputfile = http://fedora.redhat.com/download/mirrors/updates-testing-fc5
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc5
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
+timeout = 2
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/testing/5/$ARCH/
 file_prefix = updates-testing-5
 
-[rawhide]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
-outputpath = /tmp/var/www/mirrors
-archlist = i386, x86_64, ppc
-timeout = 10
-canonical = http://download.fedoraproject.org/pub/fedora/linux/core/development/$ARCH/os/
-file_prefix = rawhide
-
 [extras-devel]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-extras-devel
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/fedora-extras-devel
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
-canonical = http://download.fedoraproject.org/pub/fedora/linux/extras/development/$ARCH/
+timeout = 2
+canonical = http://Download.fedoraproject.org/pub/fedora/linux/extras/development/$ARCH/
 file_prefix = extras-devel
 
 #legacy-updates-released


Index: check-mirrors.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- check-mirrors.py	27 Sep 2006 01:49:59 -0000	1.31
+++ check-mirrors.py	26 Oct 2006 20:57:52 -0000	1.32
@@ -27,7 +27,7 @@
 # - pull mirrors from the database instead of fedora.redhat.com ?
 
 
-debug = False
+debug = True
 
 __revision__ = '$Id$'
 CONFIG = '/etc/check-mirrors.conf'
@@ -102,6 +102,8 @@
             self.dbcursor.execute(sql)
             self.dbconn.commit()
         except sqlite.Error, errmsg:
+            if '%s' % errmsg == 'database is locked':
+                return 1
             errorprint("Query: %s" % sql)
             errorprint("Query Error: %s" % errmsg)
             return False


Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- return-mirrorlist.py	15 Oct 2006 04:02:23 -0000	1.17
+++ return-mirrorlist.py	26 Oct 2006 20:57:52 -0000	1.18
@@ -78,7 +78,7 @@
             dataList.append([ item for item in row])
         return dataList
 
-    def printMirrors(self):
+    def printMirrors(self,recursive=0):
         """ Print mirrors """
         rows = self.getMirrors(self.repo, self.arch, self.country)
         results = 0
@@ -88,11 +88,11 @@
                 results = results + 1
 
         if results == 0:
-            if self.country != 'global':
+            if self.country != 'global' and recursive == 0:
                 print '# No results found for country: %s\n# Defaulting to global' % self.country
 		#self.country='global'
                 self.countrySQL=''
-                self.printMirrors()
+                self.printMirrors(recursive = 1)
                 #self.printMirrors(self.repo, self.arch, 'global')
             else:
                 print '# no mirrors found, using default'



From fedora-extras-commits at redhat.com  Thu Oct 26 21:07:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 14:07:48 -0700
Subject: rpms/geomview/FC-6 geomview.spec,1.28,1.29
Message-ID: <200610262107.k9QL7m55024966@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24942

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
- re-instate dfi --vendor=fedora (thanks Ville!) 



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-6/geomview.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- geomview.spec	26 Oct 2006 20:21:06 -0000	1.28
+++ geomview.spec	26 Oct 2006 21:07:17 -0000	1.29
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.24.%{beta}%{?dist}
+Release: 0.25.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,7 +190,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-desktop-file-install --vendor="" \
+desktop-file-install --vendor="fedora" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
+- re-instate dfi --vendor=fedora (thanks Ville!) 
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
 - fixup desktop-file-install usage
 - fixup geomview.desktop Categories



From fedora-extras-commits at redhat.com  Thu Oct 26 21:08:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 14:08:36 -0700
Subject: rpms/geomview/FC-5 geomview.spec,1.16,1.17
Message-ID: <200610262108.k9QL8aX1025028@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25012

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
- re-instate dfi --vendor=fedora (thanks Ville!) 



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/geomview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geomview.spec	26 Oct 2006 20:23:26 -0000	1.16
+++ geomview.spec	26 Oct 2006 21:08:06 -0000	1.17
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.24.%{beta}%{?dist}
+Release: 0.25.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,7 +190,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-desktop-file-install --vendor="" \
+desktop-file-install --vendor="fedora" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
+- re-instate dfi --vendor=fedora (thanks Ville!) 
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
 - fixup desktop-file-install usage
 - fixup geomview.desktop Categories



From fedora-extras-commits at redhat.com  Thu Oct 26 21:36:14 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Oct 2006 14:36:14 -0700
Subject: rpms/tuxpaint/devel tuxpaint.spec,1.13,1.14
Message-ID: <200610262136.k9QLaE9n025244@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25223

Modified Files:
	tuxpaint.spec 
Log Message:
Drop "--add-category X-Fedora".


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tuxpaint.spec	24 Oct 2006 18:56:11 -0000	1.13
+++ tuxpaint.spec	26 Oct 2006 21:35:44 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           tuxpaint
 Version:        0.9.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -49,7 +49,6 @@
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--vendor fedora \
-	--add-category X-Fedora \
 	%{SOURCE1}
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -71,6 +70,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Thu Oct 26 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-2
+- Drop "--add-category X-Fedora".
+
 * Tue Oct 24 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-1
 - Update to 0.9.16.
 



From fedora-extras-commits at redhat.com  Thu Oct 26 21:41:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:41:09 -0700
Subject: rpms/php-pear-XML-Serializer - New directory
Message-ID: <200610262141.k9QLf9e4025507@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503/php-pear-XML-Serializer

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Serializer added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 26 21:41:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:41:15 -0700
Subject: rpms/php-pear-XML-Serializer/devel - New directory
Message-ID: <200610262141.k9QLfFtf025521@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503/php-pear-XML-Serializer/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Serializer/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 26 21:41:27 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:41:27 -0700
Subject: rpms/php-pear-XML-Serializer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610262141.k9QLfRLe025552@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25546

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-XML-Serializer


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-XML-Serializer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct 26 21:41:33 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:41:33 -0700
Subject: rpms/php-pear-XML-Serializer/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610262141.k9QLfXFE025569@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25546/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-XML-Serializer


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct 26 21:42:22 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:42:22 -0700
Subject: rpms/php-pear-XML-Serializer import.log,1.1,1.2
Message-ID: <200610262142.k9QLgMis025649@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25610

Modified Files:
	import.log 
Log Message:
auto-import php-pear-XML-Serializer-0.18.0-2 on branch devel from php-pear-XML-Serializer-0.18.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Serializer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Oct 2006 21:41:27 -0000	1.1
+++ import.log	26 Oct 2006 21:41:52 -0000	1.2
@@ -0,0 +1 @@
+php-pear-XML-Serializer-0_18_0-2:HEAD:php-pear-XML-Serializer-0.18.0-2.src.rpm:1161898909



From fedora-extras-commits at redhat.com  Thu Oct 26 21:42:23 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:42:23 -0700
Subject: rpms/php-pear-XML-Serializer/devel php-pear-XML-Serializer.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610262142.k9QLgNww025653@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25610/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-XML-Serializer.spec 
Log Message:
auto-import php-pear-XML-Serializer-0.18.0-2 on branch devel from php-pear-XML-Serializer-0.18.0-2.src.rpm


--- NEW FILE php-pear-XML-Serializer.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name XML_Serializer

Name:           php-pear-XML-Serializer
Version:        0.18.0
Release:        2%{?dist}
Summary:        Swiss-army knife for reading and writing XML files

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/XML_Serializer
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(XML_Util) php-pear(XML_Parser)
Requires:       php-xml
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
XML_Serializer serializes complex data structures like arrays or object as
XML documents. This class helps you generating any XML document you require
without the need for DOM.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/doc docdir/%{pear_name}

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/XML/*


%changelog
* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 0.18.0-2
- Move the todo file in %%{pear_datadir} into %%doc

* Sat Oct 14 2006 Christopher Stone <chris.stone at gmail.com> 0.18.0-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Serializer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Oct 2006 21:41:32 -0000	1.1
+++ .cvsignore	26 Oct 2006 21:41:53 -0000	1.2
@@ -0,0 +1 @@
+XML_Serializer-0.18.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Serializer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Oct 2006 21:41:32 -0000	1.1
+++ sources	26 Oct 2006 21:41:53 -0000	1.2
@@ -0,0 +1 @@
+f9d7dd792a7b3258dfa4544017734cf8  XML_Serializer-0.18.0.tgz



From fedora-extras-commits at redhat.com  Thu Oct 26 21:46:19 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:46:19 -0700
Subject: owners owners.list,1.1874,1.1875
Message-ID: <200610262146.k9QLkJSf025713@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25697

Modified Files:
	owners.list 
Log Message:
php-pear-XML-Serializer


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1874
retrieving revision 1.1875
diff -u -r1.1874 -r1.1875
--- owners.list	25 Oct 2006 22:05:35 -0000	1.1874
+++ owners.list	26 Oct 2006 21:45:48 -0000	1.1875
@@ -1776,6 +1776,7 @@
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Parser|XML parsing class based on PHP's bundled expat|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-XML-Serializer|Swiss-army knife for reading and writing XML files|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Util|XML utility class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-apc|APC caches and optimizes PHP intermediate code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct 26 22:23:08 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 26 Oct 2006 15:23:08 -0700
Subject: rpms/imlib2/devel imlib2-1.3.0-multilib.patch, NONE, 1.1 imlib2.spec,
	1.23, 1.24
Message-ID: <200610262223.k9QMN86F029455@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29364

Modified Files:
	imlib2.spec 
Added Files:
	imlib2-1.3.0-multilib.patch 
Log Message:
* Thu Oct 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-2
- Multilib devel goodness (make -devel i386 and x86_64 parallel installable)
- Fix bug 212469
- Add libid3tag-devel to the BR's so id3tag support gets build in


imlib2-1.3.0-multilib.patch:

--- NEW FILE imlib2-1.3.0-multilib.patch ---
--- imlib2-1.3.0/configure.in~	2006-10-27 00:18:39.000000000 +0200
+++ imlib2-1.3.0/configure.in	2006-10-27 00:18:39.000000000 +0200
@@ -190,7 +190,7 @@
   AC_PATH_XTRA
   x_dir=${x_dir:-/usr/X11R6}
   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+  x_libs="-lX11 -lXext"
   AM_CONDITIONAL(BUILD_X11, true)
   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
 else
--- imlib2-1.3.0/configure~	2006-10-27 00:18:25.000000000 +0200
+++ imlib2-1.3.0/configure	2006-10-27 00:18:25.000000000 +0200
@@ -23117,7 +23117,7 @@
 
   x_dir=${x_dir:-/usr/X11R6}
   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+  x_libs="-lX11 -lXext"
 
 
 if true; then
--- imlib2-1.3.0/imlib2-config.in~	2006-10-27 00:17:29.000000000 +0200
+++ imlib2-1.3.0/imlib2-config.in	2006-10-27 00:17:29.000000000 +0200
@@ -45,8 +45,7 @@
       echo $includes
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -lImlib2 @my_libs@
+      echo -lImlib2 @my_libs@
       ;;
     *)
       echo "${usage}" 1>&2


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- imlib2.spec	24 Oct 2006 20:25:51 -0000	1.23
+++ imlib2.spec	26 Oct 2006 22:22:38 -0000	1.24
@@ -1,16 +1,17 @@
 Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
 Version:	1.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.enlightenment.org/Libraries/Imlib2/
 Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
 Patch0:		imlib2-1.2.1-X11-path.patch
+Patch1:         imlib2-1.3.0-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libjpeg-devel libpng-devel libtiff-devel
-BuildRequires:	libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
-BuildRequires:	libX11-devel libXext-devel pkgconfig
+BuildRequires:	giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
+BuildRequires:	libX11-devel libXext-devel libid3tag-devel pkgconfig
 
 %package devel
 Summary:	Development package for %{name}
@@ -43,6 +44,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .x11-path
+%patch1 -p1 -b .multilib
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
 
 
 %build
@@ -107,6 +114,11 @@
 
 
 %changelog
+* Thu Oct 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-2
+- Multilib devel goodness (make -devel i386 and x86_64 parallel installable)
+- Fix bug 212469
+- Add libid3tag-devel to the BR's so id3tag support gets build in
+
 * Tue Oct 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
 - New upstream release 1.3.0
 



From fedora-extras-commits at redhat.com  Thu Oct 26 23:53:58 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 16:53:58 -0700
Subject: rpms/php-json/FC-6 php-json.spec,1.6,1.7
Message-ID: <200610262353.k9QNrwW2001153@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-json/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1137

Modified Files:
	php-json.spec 
Log Message:
Rebuilding for new PHP



Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-6/php-json.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-json.spec	4 Sep 2006 23:00:45 -0000	1.6
+++ php-json.spec	26 Oct 2006 23:53:28 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -62,6 +62,9 @@
 %{php_extdir}/json.so
 
 %changelog
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-4
+- Rebuild for new PHP
+
 * Mon Sep  4 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-3
 - New Maintainer
 - New FE php macros



From fedora-extras-commits at redhat.com  Fri Oct 27 00:00:32 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 17:00:32 -0700
Subject: rpms/php-json/FC-6 php-json.spec,1.7,1.8
Message-ID: <200610270000.k9R00W3i001224@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-json/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1195

Modified Files:
	php-json.spec 
Log Message:
tagged before I committed last time...



Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-6/php-json.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-json.spec	26 Oct 2006 23:53:28 -0000	1.7
+++ php-json.spec	27 Oct 2006 00:00:02 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -62,7 +62,7 @@
 %{php_extdir}/json.so
 
 %changelog
-* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-4
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-5
 - Rebuild for new PHP
 
 * Mon Sep  4 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-3



From fedora-extras-commits at redhat.com  Fri Oct 27 00:03:17 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 17:03:17 -0700
Subject: rpms/php-json/FC-5 php-json.spec,1.6,1.7
Message-ID: <200610270003.k9R03Hwe004227@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-json/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4211

Modified Files:
	php-json.spec 
Log Message:
Rebuild for new PHP



Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-5/php-json.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-json.spec	19 Aug 2006 18:23:10 -0000	1.6
+++ php-json.spec	27 Oct 2006 00:02:47 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -62,6 +62,9 @@
 %{php_extdir}/json.so
 
 %changelog
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-2
+- Rebuild for new PHP
+
 * Sat Aug 19 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-1
 - New Maintainer
 - Bumped to 1.2.1



From fedora-extras-commits at redhat.com  Fri Oct 27 00:06:12 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 17:06:12 -0700
Subject: rpms/php-shout/FC-6 php-shout.spec,1.4,1.5
Message-ID: <200610270006.k9R06CFE004303@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-shout/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4278

Modified Files:
	php-shout.spec 
Log Message:
Rebuild for new PHP



Index: php-shout.spec
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-6/php-shout.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-shout.spec	28 Aug 2006 04:46:57 -0000	1.4
+++ php-shout.spec	27 Oct 2006 00:05:42 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:		php-shout
 Version:	0.3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	PHP module for communicating with Icecast servers
 
 Source0:	http://dl.sf.net/phpshout/phpShout-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{php_extdir}/shout.so
 
 %changelog
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-7
+- Rebuild for new PHP
+
 * Fri Aug 11 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-6
 - Mass Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Fri Oct 27 00:08:06 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 17:08:06 -0700
Subject: rpms/php-shout/FC-5 php-shout.spec,1.3,1.4
Message-ID: <200610270008.k9R086Fn004441@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-shout/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4419

Modified Files:
	php-shout.spec 
Log Message:
Rebuild for new PHP



Index: php-shout.spec
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-5/php-shout.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-shout.spec	15 Aug 2006 04:06:48 -0000	1.3
+++ php-shout.spec	27 Oct 2006 00:07:36 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		php-shout
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	PHP module for communicating with Icecast servers
 
 Source0:	http://dl.sf.net/phpshout/phpShout-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{php_extdir}/shout.so
 
 %changelog
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-6
+- Rebuild for new PHP
+
 * Fri Aug 11 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-5
 - New FE php macros
 - Minor syntax / permission changes



From fedora-extras-commits at redhat.com  Fri Oct 27 01:19:08 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 26 Oct 2006 18:19:08 -0700
Subject: rpms/wordpress/FC-4 README.fedora.wordpress, 1.1, 1.2 wordpress.spec,
	1.4, 1.5
Message-ID: <200610270119.k9R1J8Hl007689@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/wordpress/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622/FC-4

Modified Files:
	README.fedora.wordpress wordpress.spec 
Log Message:
Doc update fixing BZ 207822, release bump



Index: README.fedora.wordpress
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-4/README.fedora.wordpress,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora.wordpress	4 Jul 2006 05:25:59 -0000	1.1
+++ README.fedora.wordpress	27 Oct 2006 01:18:38 -0000	1.2
@@ -21,6 +21,12 @@
   Bye
   #
 
+Under certain curcumstances, you may need to run variations of the "grant"
+command:
+mysql> grant all privileges on wordpress.* to wordpress at localhost identified by 'wordpress';
+   OR
+mysql> grant all privileges on wordpress.* to wordpress@'%' identified by 'wordpress';
+
 This has created an empty database called 'wordpress', created a user named
 'wordpress' with a password of 'wordpress', and given the 'wordpress' user total
 permission over the 'wordpress' database.  Obviously, you'll want to select a


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-4/wordpress.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wordpress.spec	12 Aug 2006 21:56:32 -0000	1.4
+++ wordpress.spec	27 Oct 2006 01:18:38 -0000	1.5
@@ -3,7 +3,7 @@
 Name: wordpress
 Version: 2.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 # Source0 with name-version does not work for web retrieval, 
 # latest.tar.gz does not work for build
@@ -72,6 +72,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 26 2006 John Berninger <jwb at redhat dot com> - 2.0.4-1
+- Doc fix for BZ 207822
+
 * Sat Aug 12 2006 John Berninger <jwb at redhat dot com> - 2.0.4-0
 - Multiple security vuln's fixed upstream - bz 201989
 



From fedora-extras-commits at redhat.com  Fri Oct 27 01:19:10 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 26 Oct 2006 18:19:10 -0700
Subject: rpms/wordpress/FC-6 README.fedora.wordpress, 1.1, 1.2 wordpress.spec,
	1.5, 1.6
Message-ID: <200610270119.k9R1JAtk007697@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/wordpress/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622/FC-6

Modified Files:
	README.fedora.wordpress wordpress.spec 
Log Message:
Doc update fixing BZ 207822, release bump



Index: README.fedora.wordpress
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/README.fedora.wordpress,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora.wordpress	4 Jul 2006 05:25:39 -0000	1.1
+++ README.fedora.wordpress	27 Oct 2006 01:18:40 -0000	1.2
@@ -21,6 +21,12 @@
   Bye
   #
 
+Under certain curcumstances, you may need to run variations of the "grant"
+command:
+mysql> grant all privileges on wordpress.* to wordpress at localhost identified by 'wordpress';
+   OR
+mysql> grant all privileges on wordpress.* to wordpress@'%' identified by 'wordpress';
+
 This has created an empty database called 'wordpress', created a user named
 'wordpress' with a password of 'wordpress', and given the 'wordpress' user total
 permission over the 'wordpress' database.  Obviously, you'll want to select a


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/wordpress.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wordpress.spec	12 Aug 2006 22:25:05 -0000	1.5
+++ wordpress.spec	27 Oct 2006 01:18:40 -0000	1.6
@@ -3,7 +3,7 @@
 Name: wordpress
 Version: 2.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 # Source0 with name-version does not work for web retrieval, 
 # latest.tar.gz does not work for build
@@ -72,6 +72,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 26 2006 John Berninger <jwb at redhat dot com> - 2.0.4-1
+- Doc fix for BZ 207822
+
 * Sat Aug 12 2006 John Berninger <jwb at redhat dot com> - 2.0.4-0
 - Upstream security vulns - bz 201989
 



From fedora-extras-commits at redhat.com  Fri Oct 27 01:19:09 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 26 Oct 2006 18:19:09 -0700
Subject: rpms/wordpress/FC-5 README.fedora.wordpress, 1.1, 1.2 wordpress.spec,
	1.5, 1.6
Message-ID: <200610270119.k9R1J90Z007693@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/wordpress/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622/FC-5

Modified Files:
	README.fedora.wordpress wordpress.spec 
Log Message:
Doc update fixing BZ 207822, release bump



Index: README.fedora.wordpress
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-5/README.fedora.wordpress,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora.wordpress	4 Jul 2006 05:23:21 -0000	1.1
+++ README.fedora.wordpress	27 Oct 2006 01:18:39 -0000	1.2
@@ -21,6 +21,12 @@
   Bye
   #
 
+Under certain curcumstances, you may need to run variations of the "grant"
+command:
+mysql> grant all privileges on wordpress.* to wordpress at localhost identified by 'wordpress';
+   OR
+mysql> grant all privileges on wordpress.* to wordpress@'%' identified by 'wordpress';
+
 This has created an empty database called 'wordpress', created a user named
 'wordpress' with a password of 'wordpress', and given the 'wordpress' user total
 permission over the 'wordpress' database.  Obviously, you'll want to select a


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-5/wordpress.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wordpress.spec	12 Aug 2006 22:05:55 -0000	1.5
+++ wordpress.spec	27 Oct 2006 01:18:39 -0000	1.6
@@ -3,7 +3,7 @@
 Name: wordpress
 Version: 2.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 # Source0 with name-version does not work for web retrieval, 
 # latest.tar.gz does not work for build
@@ -72,6 +72,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 26 2006 John Benringer <jwb at redhat dot com> - 2.0.4-1
+- Doc fix for BZ 207822
+
 * Sat Aug 12 2006 John Berninger <jwb at redhat dot com> - 2.0.4-0
 - Multiple upstream security vulns - bz 201989
 



From fedora-extras-commits at redhat.com  Fri Oct 27 01:19:11 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 26 Oct 2006 18:19:11 -0700
Subject: rpms/wordpress/devel README.fedora.wordpress, 1.1,
	1.2 wordpress.spec, 1.5, 1.6
Message-ID: <200610270119.k9R1JB4c007701@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622/devel

Modified Files:
	README.fedora.wordpress wordpress.spec 
Log Message:
Doc update fixing BZ 207822, release bump



Index: README.fedora.wordpress
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/README.fedora.wordpress,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora.wordpress	4 Jul 2006 05:25:39 -0000	1.1
+++ README.fedora.wordpress	27 Oct 2006 01:18:40 -0000	1.2
@@ -21,6 +21,12 @@
   Bye
   #
 
+Under certain curcumstances, you may need to run variations of the "grant"
+command:
+mysql> grant all privileges on wordpress.* to wordpress at localhost identified by 'wordpress';
+   OR
+mysql> grant all privileges on wordpress.* to wordpress@'%' identified by 'wordpress';
+
 This has created an empty database called 'wordpress', created a user named
 'wordpress' with a password of 'wordpress', and given the 'wordpress' user total
 permission over the 'wordpress' database.  Obviously, you'll want to select a


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wordpress.spec	12 Aug 2006 22:25:05 -0000	1.5
+++ wordpress.spec	27 Oct 2006 01:18:40 -0000	1.6
@@ -3,7 +3,7 @@
 Name: wordpress
 Version: 2.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 # Source0 with name-version does not work for web retrieval, 
 # latest.tar.gz does not work for build
@@ -72,6 +72,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 26 2006 John Berninger <jwb at redhat dot com> - 2.0.4-1
+- Doc fix for BZ 207822
+
 * Sat Aug 12 2006 John Berninger <jwb at redhat dot com> - 2.0.4-0
 - Upstream security vulns - bz 201989
 



From fedora-extras-commits at redhat.com  Fri Oct 27 07:45:47 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 27 Oct 2006 00:45:47 -0700
Subject: fedora-security/audit fc5,1.373,1.374 fc6,1.126,1.127
Message-ID: <200610270745.k9R7jlPn027390@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27370

Modified Files:
	fc5 fc6 
Log Message:
Latest CVE and fedora mails



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- fc5	26 Oct 2006 19:41:51 -0000	1.373
+++ fc5	27 Oct 2006 07:45:44 -0000	1.374
@@ -3,7 +3,9 @@
 
 ** are items that need attention
 
-CVE-2006-5540 VULNERABLE (postgresql) #212360
+CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -1654,7 +1656,7 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
-CVE-2003-1307 ** mod_php
+CVE-2003-1307 ignore (mod_php) not a vulnerability
 CVE-2003-1303 version (php, fixed 4.3.3)
 CVE-2003-1302 version (php, fixed 4.3.1)
 CVE-2003-1295 version (xscreensaver)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- fc6	26 Oct 2006 19:41:51 -0000	1.126
+++ fc6	27 Oct 2006 07:45:44 -0000	1.127
@@ -1,9 +1,11 @@
-Up to date CVE as of CVE email 20061024
-Up to date FC6 as of 20061024
+Up to date CVE as of CVE email 20061026
+Up to date FC6 as of 20061026
 
 ** are items that need attention
 
-CVE-2006-5540 VULNERABLE (postgresql) #212360
+CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -1442,6 +1444,7 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
+CVE-2003-1307 ignore (mod_php) not a vulnerability
 CVE-2003-1303 version (php, fixed 4.3.3)
 CVE-2003-1302 version (php, fixed 4.3.1)
 CVE-2003-1265 VULNERABLE (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=198442



From fedora-extras-commits at redhat.com  Fri Oct 27 09:14:29 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 27 Oct 2006 02:14:29 -0700
Subject: rpms/international-time/devel international-time.spec,1.2,1.3
Message-ID: <200610270914.k9R9ET8h001316@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1300

Modified Files:
	international-time.spec 
Log Message:
* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
- Better categories for the desktop file.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/devel/international-time.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- international-time.spec	25 Oct 2006 10:55:05 -0000	1.2
+++ international-time.spec	27 Oct 2006 09:13:58 -0000	1.3
@@ -42,6 +42,8 @@
 install -m 0644 international-time.glade %{buildroot}%{_datadir}/%{name}
 desktop-file-install --vendor fedora \
   --dir %{buildroot}%{_datadir}/applications \
+  --add-category Utility \
+  --add-category Application \
   --add-category X-Fedora \
   international-time.desktop
 
@@ -64,6 +66,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
+- Better categories for the desktop file.
+
 * Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
 - Update desktop database on installation.
 



From fedora-extras-commits at redhat.com  Fri Oct 27 09:18:03 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 27 Oct 2006 02:18:03 -0700
Subject: extras-buildsys/utils/pushscript List.py,NONE,1.1
Message-ID: <200610270918.k9R9I3SD001908@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1879

Added Files:
	List.py 
Log Message:
just a helper: list pending build jobs


--- NEW FILE List.py ---
#!/usr/bin/python -t
# -*- mode: Python; indent-tabs-mode: nil; -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

import errno, os, sys

import Utils, Push


def main(cfg,dists):
    if not dists:
        dists = cfg.alldists
    
    for dist in dists:
        distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
        print distdir+':'
        needsignroot = os.path.join(cfg.stagesdir, distdir)
        results = Push.get_build_results(needsignroot,droppushed=True)
        for (name,pkgrelroots) in results:
            for pkgrelroot in pkgrelroots:
                print '    '+name+'-'+os.path.basename(pkgrelroot)
        print


if __name__ == '__main__':
    if len(sys.argv) < 2:
        print 'Usage: %s <project> [release]...\n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)

    cfg = Utils.load_config_module(sys.argv[1])

    Utils.signer_gid_check(cfg.signersgid)
    os.umask(cfg.signersumask)
    main(cfg,sys.argv[2:])
    sys.exit(0)



From fedora-extras-commits at redhat.com  Fri Oct 27 09:33:33 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 27 Oct 2006 02:33:33 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.3,1.4
Message-ID: <200610270933.k9R9XXA9005190@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5066

Modified Files:
	international-time.spec 
Log Message:
* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
- Better categories for the desktop file.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- international-time.spec	25 Oct 2006 16:19:15 -0000	1.3
+++ international-time.spec	27 Oct 2006 09:33:03 -0000	1.4
@@ -42,6 +42,8 @@
 install -m 0644 international-time.glade %{buildroot}%{_datadir}/%{name}
 desktop-file-install --vendor fedora \
   --dir %{buildroot}%{_datadir}/applications \
+  --add-category Utility \
+  --add-category Application \
   --add-category X-Fedora \
   international-time.desktop
 
@@ -64,6 +66,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
+- Better categories for the desktop file.
+
 * Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1
 - Update desktop database on installation.
 



From fedora-extras-commits at redhat.com  Fri Oct 27 09:35:00 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 27 Oct 2006 02:35:00 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.4,1.5
Message-ID: <200610270935.k9R9Z0h0005517@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5392

Modified Files:
	international-time.spec 
Log Message:
0.0.2-2.2


Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- international-time.spec	27 Oct 2006 09:33:03 -0000	1.4
+++ international-time.spec	27 Oct 2006 09:34:30 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: 	A tool for arranging times in advance with overseas colleagues
 Name: 		international-time
 Version: 	0.0.2
-Release: 	2%{?dist}.1
+Release: 	2%{?dist}.2
 License: 	GPL
 Group: 		Applications/System
 Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
@@ -66,7 +66,7 @@
 %{_datadir}/applications/*
 
 %changelog
-* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.2
 - Better categories for the desktop file.
 
 * Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1



From fedora-extras-commits at redhat.com  Fri Oct 27 11:29:34 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Fri, 27 Oct 2006 04:29:34 -0700
Subject: rpms/licq/devel .cvsignore, 1.3, 1.4 licq.spec, 1.11, 1.12 sources, 
	1.3, 1.4 licq-1.3.2-gcc-4_1-patch, 1.1,
	NONE licq-1.3.2-libdir.patch, 1.1, NONE licq-1.3.2-viewUrl.patch,
	1.1, NONE
Message-ID: <200610271129.k9RBTYkU018243@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18217

Modified Files:
	.cvsignore licq.spec sources 
Removed Files:
	licq-1.3.2-gcc-4_1-patch licq-1.3.2-libdir.patch 
	licq-1.3.2-viewUrl.patch 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2006 13:51:41 -0000	1.3
+++ .cvsignore	27 Oct 2006 11:29:04 -0000	1.4
@@ -1,2 +1 @@
-licq-1.3.2.tar.bz2
-licq-viewurl.sh
+licq-1.3.4.tar.gz


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- licq.spec	4 Oct 2006 23:03:17 -0000	1.11
+++ licq.spec	27 Oct 2006 11:29:04 -0000	1.12
@@ -1,9 +1,8 @@
 Name: licq
-Version: 1.3.2
-Release: 11
+Version: 1.3.4
+Release: 1
 License: GPL
-Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
-Source1: licq-viewurl.sh
+Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/
 Summary: Licq - A graphical ICQ Client for Linux
 Group: Applications/Internet
@@ -15,9 +14,6 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gettext, automake, libtool
-Patch1: licq-1.3.2-gcc-4_1-patch
-Patch2: licq-1.3.2-libdir.patch
-Patch3: licq-1.3.2-viewUrl.patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -48,15 +44,14 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc-4_1
-%patch2 -p1 -b .libdir
-%patch3 -p1 -b .viewUrl
 
 #remove cvs stuff
 rm -rf `find . -name CVS`
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+export KDEDIR=/usr/%_lib
+
 sed -i s/lib/%{_lib}/ include/licq_constants.h
 %configure
 make
@@ -67,12 +62,9 @@
   automake
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
-  export KDEDIR=/usr/%_lib
   %configure \
      --with-kde \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/
   make
 cd ../qt-gui
   aclocal
@@ -80,19 +72,10 @@
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
   %configure \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/ \
   make
-  #create Qt qm files
-  cd po
-  lrelease *.ts
-cd ../../osd
-  rm -rf autom4te.cache
-  sed -i s/aclocal-1.7/aclocal/ build
-  sed -i s/automake-1.7/automake/ build
-  ./build
-  %configure --libdir=%{_libdir}/licq
+cd ../osd
+  %configure --libdir=%{_libdir}/
   make
 
 %install
@@ -111,16 +94,13 @@
 cd ../osd
 make install
 
-#install url viewer
-install -m755 %SOURCE1 %buildroot/%_bindir/licq-viewurl.sh
-
 %find_lang licq_osd_plugin
 
 #remove devel 
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
-#remove licq.desktop installed by makefile
-rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/kde/licq.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +114,8 @@
 %{_bindir}/viewurl-netscape.sh
 %{_bindir}/viewurl-opera.sh
 %{_bindir}/viewurl-w3m.sh
-%attr(0755,root,root) %_bindir/licq-viewurl.sh
+%{_bindir}/viewurl-firefox.sh
+%{_bindir}/viewurl-seamonkey.sh
 %dir %{_libdir}/licq
 %{_libdir}/licq/licq_qt-gui.so
 %{_datadir}/licq
@@ -157,7 +138,7 @@
 %lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
 %lang(uk) %{_datadir}/licq/qt-gui/locale/uk.qm
 %{_datadir}/applications/fedora-licq.desktop
-%doc doc/ upgrade/ ChangeLog README* LICENSE
+%doc doc/ upgrade/ README* LICENSE
 
 %files kde
 %defattr(-,root,root)
@@ -170,8 +151,8 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.2-11
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Fri Sep 27 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-1
+- upgrade
 
 * Mon Sep 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-10
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2006 13:51:41 -0000	1.3
+++ sources	27 Oct 2006 11:29:04 -0000	1.4
@@ -1,2 +1 @@
-0471bb8fed91eefb23dfe153c9a4a806  licq-1.3.2.tar.bz2
-b5d06b8482e9f73c3889d0b445aace00  licq-viewurl.sh
+34a51541173a2ba453b5984b52bfa489  licq-1.3.4.tar.gz


--- licq-1.3.2-gcc-4_1-patch DELETED ---


--- licq-1.3.2-libdir.patch DELETED ---


--- licq-1.3.2-viewUrl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 12:35:18 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 27 Oct 2006 05:35:18 -0700
Subject: rpms/ORBit/devel ORBit.spec,1.2,1.3
Message-ID: <200610271235.k9RCZIfm021597@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/ORBit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21581

Modified Files:
	ORBit.spec 
Log Message:
Don't let the scriptlets "fail"



Index: ORBit.spec
===================================================================
RCS file: /cvs/extras/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ORBit.spec	28 Aug 2006 15:12:46 -0000	1.2
+++ ORBit.spec	27 Oct 2006 12:34:48 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		19%{?dist}
+Release:		20%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -75,10 +75,10 @@
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
 %preun devel
-[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir
+[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -120,6 +120,9 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Thu Oct 26 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-20
+- Don't let the scriptlets "fail"
+
 * Mon Aug 28 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-19
 - Fix undefined non-weak symbols in libIIOP.so (#202328)
 



From fedora-extras-commits at redhat.com  Fri Oct 27 12:36:41 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 27 Oct 2006 05:36:41 -0700
Subject: rpms/ORBit/FC-6 ORBit.spec,1.2,1.3
Message-ID: <200610271236.k9RCafql021662@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/ORBit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21646

Modified Files:
	ORBit.spec 
Log Message:
resync with devel


Index: ORBit.spec
===================================================================
RCS file: /cvs/extras/rpms/ORBit/FC-6/ORBit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ORBit.spec	28 Aug 2006 15:12:46 -0000	1.2
+++ ORBit.spec	27 Oct 2006 12:36:11 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		19%{?dist}
+Release:		20%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -75,10 +75,10 @@
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
 %preun devel
-[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir
+[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -120,6 +120,9 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Thu Oct 26 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-20
+- Don't let the scriptlets "fail"
+
 * Mon Aug 28 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-19
 - Fix undefined non-weak symbols in libIIOP.so (#202328)
 



From fedora-extras-commits at redhat.com  Fri Oct 27 12:52:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 27 Oct 2006 05:52:14 -0700
Subject: rpms/libcddb/devel .cvsignore, 1.6, 1.7 libcddb.spec, 1.20,
	1.21 sources, 1.7, 1.8
Message-ID: <200610271252.k9RCqEPR021778@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libcddb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21754

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
- New upstream release 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2006 12:40:27 -0000	1.6
+++ .cvsignore	27 Oct 2006 12:51:44 -0000	1.7
@@ -1 +1 @@
-libcddb-1.2.2.tar.bz2
+libcddb-1.3.0.tar.bz2


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libcddb.spec	1 Oct 2006 12:40:27 -0000	1.20
+++ libcddb.spec	27 Oct 2006 12:51:44 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.2.2
+Version:	1.3.0
 Release:	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
+- New upstream release 1.3.0
+
 * Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
 - New upstream release 1.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Oct 2006 12:40:27 -0000	1.7
+++ sources	27 Oct 2006 12:51:44 -0000	1.8
@@ -1 +1 @@
-0735015d78b2d951fae3e2fcfb660591  libcddb-1.2.2.tar.bz2
+e4a7f9579956c32b7f300eb12e9ea6df  libcddb-1.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 27 13:34:29 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 27 Oct 2006 06:34:29 -0700
Subject: rpms/bmp/FC-6 dead.package, NONE, 1.1 Makefile, 1.1, NONE beep.png, 
	1.1, NONE bmp-0.9.7-default-alsa.patch, 1.1,
	NONE bmp-0.9.7-default-skin.patch, 1.1,
	NONE bmp-0.9.7-readmacro.patch, 1.1,
	NONE bmp-0.9.7-shaded-skin.patch, 1.1,
	NONE bmp-0.9.7.1-xmms-skins.patch, 1.1, NONE bmp.sh, 1.2,
	NONE bmp.spec, 1.15, NONE branch, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610271334.k9RDYTx3025025@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019

Added Files:
	dead.package 
Removed Files:
	Makefile beep.png bmp-0.9.7-default-alsa.patch 
	bmp-0.9.7-default-skin.patch bmp-0.9.7-readmacro.patch 
	bmp-0.9.7-shaded-skin.patch bmp-0.9.7.1-xmms-skins.patch 
	bmp.sh bmp.spec branch sources 
Log Message:
Obsolete package, obsoleted by audacious


--- NEW FILE dead.package ---
Obsolete package, obsoleted by audacious


--- Makefile DELETED ---


--- bmp-0.9.7-default-alsa.patch DELETED ---


--- bmp-0.9.7-default-skin.patch DELETED ---


--- bmp-0.9.7-readmacro.patch DELETED ---


--- bmp-0.9.7-shaded-skin.patch DELETED ---


--- bmp-0.9.7.1-xmms-skins.patch DELETED ---


--- bmp.sh DELETED ---


--- bmp.spec DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 13:35:04 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 27 Oct 2006 06:35:04 -0700
Subject: rpms/bmp/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE beep.png,
	1.1, NONE bmp-0.9.7-default-alsa.patch, 1.1,
	NONE bmp-0.9.7-default-skin.patch, 1.1,
	NONE bmp-0.9.7-readmacro.patch, 1.1,
	NONE bmp-0.9.7-shaded-skin.patch, 1.1,
	NONE bmp-0.9.7.1-xmms-skins.patch, 1.1, NONE bmp.sh, 1.2,
	NONE bmp.spec, 1.15, NONE sources, 1.3, NONE
Message-ID: <200610271335.k9RDZ43f025055@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25050

Added Files:
	dead.package 
Removed Files:
	Makefile beep.png bmp-0.9.7-default-alsa.patch 
	bmp-0.9.7-default-skin.patch bmp-0.9.7-readmacro.patch 
	bmp-0.9.7-shaded-skin.patch bmp-0.9.7.1-xmms-skins.patch 
	bmp.sh bmp.spec sources 
Log Message:
Obsolete package, obsoleted by audacious


--- NEW FILE dead.package ---
Obsolete package, obsoleted by audacious


--- Makefile DELETED ---


--- bmp-0.9.7-default-alsa.patch DELETED ---


--- bmp-0.9.7-default-skin.patch DELETED ---


--- bmp-0.9.7-readmacro.patch DELETED ---


--- bmp-0.9.7-shaded-skin.patch DELETED ---


--- bmp-0.9.7.1-xmms-skins.patch DELETED ---


--- bmp.sh DELETED ---


--- bmp.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 13:35:42 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 27 Oct 2006 06:35:42 -0700
Subject: rpms/bmp-flac2/FC-6 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE bmp-flac2.desktop, 1.1, NONE bmp-flac2.spec, 1.6,
	NONE branch, 1.1, NONE sources, 1.5, NONE
Message-ID: <200610271335.k9RDZgFN025086@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp-flac2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25081

Added Files:
	dead.package 
Removed Files:
	Makefile bmp-flac2.desktop bmp-flac2.spec branch sources 
Log Message:
Obsolete package, obsoleted by audacious


--- NEW FILE dead.package ---
Obsolete package, obsoleted by audacious


--- Makefile DELETED ---


--- bmp-flac2.desktop DELETED ---


--- bmp-flac2.spec DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 13:36:11 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 27 Oct 2006 06:36:11 -0700
Subject: rpms/bmp-flac2/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE bmp-flac2.desktop, 1.1, NONE bmp-flac2.spec, 1.6,
	NONE sources, 1.5, NONE
Message-ID: <200610271336.k9RDaBO6025117@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp-flac2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25112

Added Files:
	dead.package 
Removed Files:
	Makefile bmp-flac2.desktop bmp-flac2.spec sources 
Log Message:
Obsolete package, obsoleted by audacious


--- NEW FILE dead.package ---
Obsolete package, obsoleted by audacious


--- Makefile DELETED ---


--- bmp-flac2.desktop DELETED ---


--- bmp-flac2.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 13:51:04 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 06:51:04 -0700
Subject: rpms/xchat-gnome/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xchat-gnome-config.patch, 1.5, 1.6 xchat-gnome.spec, 1.28, 1.29
Message-ID: <200610271351.k9RDp4NB025274@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25247

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
- Update to 0.14.
- Remove xchat-gnome-remote.
- Drop X-Fedora desktop category.
- Use disable-schemas-install & disable-static with configure.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2006 15:42:35 -0000	1.11
+++ .cvsignore	27 Oct 2006 13:50:34 -0000	1.12
@@ -1 +1 @@
-xchat-gnome-0.13.tar.bz2
+xchat-gnome-0.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Jul 2006 15:42:35 -0000	1.11
+++ sources	27 Oct 2006 13:50:34 -0000	1.12
@@ -1 +1 @@
-5614773724afa0c2e617615722e10091  xchat-gnome-0.13.tar.bz2
+8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome-config.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchat-gnome-config.patch	26 Jul 2006 15:42:35 -0000	1.5
+++ xchat-gnome-config.patch	27 Oct 2006 13:50:34 -0000	1.6
@@ -1,30 +1,6 @@
-diff -ur xchat-gnome-0.13.OLD/plugins/perl/perl.c xchat-gnome-0.13/plugins/perl/perl.c
---- xchat-gnome-0.13.OLD/plugins/perl/perl.c	2006-05-01 11:31:57.000000000 -0400
-+++ xchat-gnome-0.13/plugins/perl/perl.c	2006-07-26 10:47:56.000000000 -0400
-@@ -93,7 +93,7 @@
- 	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
- 		xdir = xchat_get_info (ph, "xchatdir");
- 
--	/* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
-+	/* autoload from ~/.xchat-gnome/ or ${APPDATA}\X-Chat 2\ on win32 */
- 	perl_auto_load_from_path (xdir);
- 
- #ifdef WIN32
-diff -ur xchat-gnome-0.13.OLD/plugins/python/python.c xchat-gnome-0.13/plugins/python/python.c
---- xchat-gnome-0.13.OLD/plugins/python/python.c	2005-11-26 02:10:29.000000000 -0500
-+++ xchat-gnome-0.13/plugins/python/python.c	2006-07-26 10:47:32.000000000 -0400
-@@ -392,7 +392,7 @@
- 		return expanded;
- 	g_free(expanded);
- 
--	/* Check if ~/.xchat2/<filename> exists. */
-+	/* Check if ~/.xchat-gnome/<filename> exists. */
- 	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
- 				    filename, NULL);
- 	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-diff -ur xchat-gnome-0.13.OLD/src/common/cfgfiles.c xchat-gnome-0.13/src/common/cfgfiles.c
---- xchat-gnome-0.13.OLD/src/common/cfgfiles.c	2006-06-17 21:11:18.000000000 -0400
-+++ xchat-gnome-0.13/src/common/cfgfiles.c	2006-07-26 10:46:12.000000000 -0400
+diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
+--- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -43,10 +19,22 @@
  	}
  }
  
-diff -ur xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c	2006-04-17 18:15:14.000000000 -0400
-+++ xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c	2006-07-26 10:47:06.000000000 -0400
-@@ -182,7 +182,7 @@
+diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
+--- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
++++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
+@@ -100,7 +100,7 @@
+ void fe_get_int (char *prompt, int def, void *callback, void *ud);
+ #define FRF_WRITE 1	/* save file */
+ #define FRF_MULTIPLE 2	/* multi-select */
+-#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
++#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
+ #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
+ #define FRF_FILTERISINITIAL 16	/* unused */
+ #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
+diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
++++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+@@ -184,7 +184,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
  	homedir = g_get_home_dir();
@@ -55,7 +43,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -346,7 +346,7 @@
+@@ -347,7 +347,7 @@
  #endif
  
  	homedir = g_get_home_dir ();


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xchat-gnome.spec	31 Aug 2006 22:42:38 -0000	1.28
+++ xchat-gnome.spec	27 Oct 2006 13:50:34 -0000	1.29
@@ -1,9 +1,8 @@
-%define with_dbus 1
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.13
-Release:        4%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -22,10 +21,7 @@
 BuildRequires:  gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	gnome-doc-utils
-
-%if %{with_dbus}
 BuildRequires:	dbus-devel
-%endif
 
 # Leave as conditional until API is more stable.
 %if %{with_libnotify}
@@ -56,22 +52,18 @@
 
 
 %build
-%configure --disable-tcl --disable-scrollkeeper
+%configure --disable-tcl --disable-scrollkeeper --disable-schemas-install --disable-static
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{l,}a
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	--add-category X-Fedora				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -92,7 +84,7 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 for i in $SCHEMAS; do
 	gconftool-2 --makefile-install-rule \
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -107,7 +99,7 @@
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -134,14 +126,19 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
+%{_datadir}/dbus-1/services/org.gnome.Xchat.service
+%{_mandir}/man1/%{name}.1.gz
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/plugins/
-%if %{with_dbus}
-%{_bindir}/%{name}-remote
-%endif
 
 
 %changelog
+* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
+- Update to 0.14.
+- Remove xchat-gnome-remote.
+- Drop X-Fedora desktop category.
+- Use disable-schemas-install & disable-static with configure.
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-4
 - Add BR for perl(XML::Parser).
 



From fedora-extras-commits at redhat.com  Fri Oct 27 14:00:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 27 Oct 2006 07:00:50 -0700
Subject: rpms/perl-Math-Pari/devel .cvsignore, 1.5, 1.6 perl-Math-Pari.spec, 
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200610271400.k9RE0oMa025400@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25369

Modified Files:
	.cvsignore perl-Math-Pari.spec sources 
Log Message:
Update to 2.010709


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Oct 2006 07:29:44 -0000	1.5
+++ .cvsignore	27 Oct 2006 14:00:20 -0000	1.6
@@ -1,2 +1,2 @@
-Math-Pari-2.010708.tar.gz
+Math-Pari-2.010709.tar.gz
 pari-2.1.7.tgz


Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Math-Pari.spec	19 Oct 2006 07:29:44 -0000	1.5
+++ perl-Math-Pari.spec	27 Oct 2006 14:00:20 -0000	1.6
@@ -9,7 +9,7 @@
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	2.010708
+Version:	2.010709
 # You'll need to replace pariversion with a hardcoded version number if you're
 # testing with a development version of PARI, as this expression evaluates
 # the latest version of GP/PARI the perl module was tested with.
@@ -73,6 +73,9 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Fri Oct 27 2006 Paul Howarth <paul at city-fan.org> 2.010709-1
+- Update to 2.010709
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 2.010708-1
 - Update to 2.010708
 - Fix argument order for find with -depth


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Oct 2006 07:29:44 -0000	1.5
+++ sources	27 Oct 2006 14:00:20 -0000	1.6
@@ -1,2 +1,2 @@
-d06781230dc62eb75a88f5b509d55ac6  Math-Pari-2.010708.tar.gz
+58fdea358b37d00072723bd9cd69ce9e  Math-Pari-2.010709.tar.gz
 357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Fri Oct 27 14:11:54 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 07:11:54 -0700
Subject: rpms/xchat-gnome/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xchat-gnome-config.patch, 1.5, 1.6 xchat-gnome.spec, 1.28, 1.29
Message-ID: <200610271411.k9REBsM4028602@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28570

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
- Update to 0.14.
- Remove xchat-gnome-remote.
- Drop X-Fedora desktop category.
- Use disable-schemas-install & disable-static with configure.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2006 15:42:35 -0000	1.11
+++ .cvsignore	27 Oct 2006 14:11:24 -0000	1.12
@@ -1 +1 @@
-xchat-gnome-0.13.tar.bz2
+xchat-gnome-0.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Jul 2006 15:42:35 -0000	1.11
+++ sources	27 Oct 2006 14:11:24 -0000	1.12
@@ -1 +1 @@
-5614773724afa0c2e617615722e10091  xchat-gnome-0.13.tar.bz2
+8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome-config.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchat-gnome-config.patch	26 Jul 2006 15:42:35 -0000	1.5
+++ xchat-gnome-config.patch	27 Oct 2006 14:11:24 -0000	1.6
@@ -1,30 +1,6 @@
-diff -ur xchat-gnome-0.13.OLD/plugins/perl/perl.c xchat-gnome-0.13/plugins/perl/perl.c
---- xchat-gnome-0.13.OLD/plugins/perl/perl.c	2006-05-01 11:31:57.000000000 -0400
-+++ xchat-gnome-0.13/plugins/perl/perl.c	2006-07-26 10:47:56.000000000 -0400
-@@ -93,7 +93,7 @@
- 	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
- 		xdir = xchat_get_info (ph, "xchatdir");
- 
--	/* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
-+	/* autoload from ~/.xchat-gnome/ or ${APPDATA}\X-Chat 2\ on win32 */
- 	perl_auto_load_from_path (xdir);
- 
- #ifdef WIN32
-diff -ur xchat-gnome-0.13.OLD/plugins/python/python.c xchat-gnome-0.13/plugins/python/python.c
---- xchat-gnome-0.13.OLD/plugins/python/python.c	2005-11-26 02:10:29.000000000 -0500
-+++ xchat-gnome-0.13/plugins/python/python.c	2006-07-26 10:47:32.000000000 -0400
-@@ -392,7 +392,7 @@
- 		return expanded;
- 	g_free(expanded);
- 
--	/* Check if ~/.xchat2/<filename> exists. */
-+	/* Check if ~/.xchat-gnome/<filename> exists. */
- 	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
- 				    filename, NULL);
- 	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-diff -ur xchat-gnome-0.13.OLD/src/common/cfgfiles.c xchat-gnome-0.13/src/common/cfgfiles.c
---- xchat-gnome-0.13.OLD/src/common/cfgfiles.c	2006-06-17 21:11:18.000000000 -0400
-+++ xchat-gnome-0.13/src/common/cfgfiles.c	2006-07-26 10:46:12.000000000 -0400
+diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
+--- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -43,10 +19,22 @@
  	}
  }
  
-diff -ur xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c	2006-04-17 18:15:14.000000000 -0400
-+++ xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c	2006-07-26 10:47:06.000000000 -0400
-@@ -182,7 +182,7 @@
+diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
+--- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
++++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
+@@ -100,7 +100,7 @@
+ void fe_get_int (char *prompt, int def, void *callback, void *ud);
+ #define FRF_WRITE 1	/* save file */
+ #define FRF_MULTIPLE 2	/* multi-select */
+-#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
++#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
+ #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
+ #define FRF_FILTERISINITIAL 16	/* unused */
+ #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
+diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
++++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+@@ -184,7 +184,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
  	homedir = g_get_home_dir();
@@ -55,7 +43,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -346,7 +346,7 @@
+@@ -347,7 +347,7 @@
  #endif
  
  	homedir = g_get_home_dir ();


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xchat-gnome.spec	31 Aug 2006 22:42:38 -0000	1.28
+++ xchat-gnome.spec	27 Oct 2006 14:11:24 -0000	1.29
@@ -1,9 +1,8 @@
-%define with_dbus 1
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.13
-Release:        4%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -22,10 +21,7 @@
 BuildRequires:  gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	gnome-doc-utils
-
-%if %{with_dbus}
 BuildRequires:	dbus-devel
-%endif
 
 # Leave as conditional until API is more stable.
 %if %{with_libnotify}
@@ -56,22 +52,18 @@
 
 
 %build
-%configure --disable-tcl --disable-scrollkeeper
+%configure --disable-tcl --disable-scrollkeeper --disable-schemas-install --disable-static
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{l,}a
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	--add-category X-Fedora				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -92,7 +84,7 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 for i in $SCHEMAS; do
 	gconftool-2 --makefile-install-rule \
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -107,7 +99,7 @@
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -134,14 +126,19 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
+%{_datadir}/dbus-1/services/org.gnome.Xchat.service
+%{_mandir}/man1/%{name}.1.gz
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/plugins/
-%if %{with_dbus}
-%{_bindir}/%{name}-remote
-%endif
 
 
 %changelog
+* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
+- Update to 0.14.
+- Remove xchat-gnome-remote.
+- Drop X-Fedora desktop category.
+- Use disable-schemas-install & disable-static with configure.
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-4
 - Add BR for perl(XML::Parser).
 



From fedora-extras-commits at redhat.com  Fri Oct 27 14:17:35 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:17:35 -0700
Subject: rpms/nagios-plugins/FC-4 nagios-plugins.spec,1.15,1.16
Message-ID: <200610271417.k9REHZtC028739@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673/FC-4

Modified Files:
	nagios-plugins.spec 
Log Message:
Fixed bug 208232
212324
212555



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-4/nagios-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nagios-plugins.spec	25 Oct 2006 01:44:15 -0000	1.15
+++ nagios-plugins.spec	27 Oct 2006 14:17:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package



From fedora-extras-commits at redhat.com  Fri Oct 27 14:17:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:17:36 -0700
Subject: rpms/nagios-plugins/FC-5 nagios-plugins.spec,1.15,1.16
Message-ID: <200610271417.k9REHaZT028742@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673/FC-5

Modified Files:
	nagios-plugins.spec 
Log Message:
Fixed bug 208232
212324
212555



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-5/nagios-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nagios-plugins.spec	25 Oct 2006 01:44:15 -0000	1.15
+++ nagios-plugins.spec	27 Oct 2006 14:17:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package



From fedora-extras-commits at redhat.com  Fri Oct 27 14:17:41 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:17:41 -0700
Subject: rpms/nagios-plugins/FC-6 nagios-plugins.spec,1.19,1.20
Message-ID: <200610271417.k9REHf9J028745@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673/FC-6

Modified Files:
	nagios-plugins.spec 
Log Message:
Fixed bug 208232
212324
212555



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-6/nagios-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nagios-plugins.spec	25 Oct 2006 01:44:16 -0000	1.19
+++ nagios-plugins.spec	27 Oct 2006 14:17:11 -0000	1.20
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package



From fedora-extras-commits at redhat.com  Fri Oct 27 14:17:42 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:17:42 -0700
Subject: rpms/nagios-plugins/devel
	nagios-plugins-1.4.4-check_ide_smart.patch, 
	NONE, 1.1 nagios-plugins-1.4.4-linux_raid.patch, NONE,
	1.1 nagios-plugins.spec, 1.19, 1.20
Message-ID: <200610271417.k9REHg7g028748@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673/devel

Modified Files:
	nagios-plugins.spec 
Added Files:
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
Log Message:
Fixed bug 208232
212324
212555


nagios-plugins-1.4.4-check_ide_smart.patch:

--- NEW FILE nagios-plugins-1.4.4-check_ide_smart.patch ---
--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
+++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
 
 
 void
-print_thresholds (thresholds_t * p) 
+smart_print_thresholds (thresholds_t * p) 
 {
 	threshold_t * threshold = p->thresholds;
 	int i;
@@ -541,7 +541,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("Usage:");
+  printf (_("Usage:"));
   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
 }

nagios-plugins-1.4.4-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.4-linux_raid.patch ---
--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
+++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib utils.pm;
+use lib '/usr/lib/nagios/plugins';
 use utils qw(%ERRORS);



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nagios-plugins.spec	25 Oct 2006 01:44:17 -0000	1.19
+++ nagios-plugins.spec	27 Oct 2006 14:17:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package



From fedora-extras-commits at redhat.com  Fri Oct 27 14:19:25 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:19:25 -0700
Subject: rpms/nagios-plugins/FC-4 nagios-plugins-1.4.4-check_ide_smart.patch,
	NONE, 1.1 nagios-plugins-1.4.4-linux_raid.patch, NONE, 1.1
Message-ID: <200610271419.k9REJPgY028859@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/FC-4

Added Files:
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
Log Message:
Forgot to add patches

nagios-plugins-1.4.4-check_ide_smart.patch:

--- NEW FILE nagios-plugins-1.4.4-check_ide_smart.patch ---
--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
+++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
 
 
 void
-print_thresholds (thresholds_t * p) 
+smart_print_thresholds (thresholds_t * p) 
 {
 	threshold_t * threshold = p->thresholds;
 	int i;
@@ -541,7 +541,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("Usage:");
+  printf (_("Usage:"));
   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
 }

nagios-plugins-1.4.4-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.4-linux_raid.patch ---
--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
+++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib utils.pm;
+use lib '/usr/lib/nagios/plugins';
 use utils qw(%ERRORS);




From fedora-extras-commits at redhat.com  Fri Oct 27 14:19:31 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:19:31 -0700
Subject: rpms/nagios-plugins/FC-5 nagios-plugins-1.4.4-check_ide_smart.patch,
	NONE, 1.1 nagios-plugins-1.4.4-linux_raid.patch, NONE, 1.1
Message-ID: <200610271419.k9REJVLw028879@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/FC-5

Added Files:
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
Log Message:
Forgot to add patches

nagios-plugins-1.4.4-check_ide_smart.patch:

--- NEW FILE nagios-plugins-1.4.4-check_ide_smart.patch ---
--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
+++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
 
 
 void
-print_thresholds (thresholds_t * p) 
+smart_print_thresholds (thresholds_t * p) 
 {
 	threshold_t * threshold = p->thresholds;
 	int i;
@@ -541,7 +541,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("Usage:");
+  printf (_("Usage:"));
   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
 }

nagios-plugins-1.4.4-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.4-linux_raid.patch ---
--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
+++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib utils.pm;
+use lib '/usr/lib/nagios/plugins';
 use utils qw(%ERRORS);




From fedora-extras-commits at redhat.com  Fri Oct 27 14:19:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:19:36 -0700
Subject: rpms/nagios-plugins/FC-6 nagios-plugins-1.4.4-check_ide_smart.patch,
	NONE, 1.1 nagios-plugins-1.4.4-linux_raid.patch, NONE, 1.1
Message-ID: <200610271419.k9REJaCK028899@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/FC-6

Added Files:
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
Log Message:
Forgot to add patches

nagios-plugins-1.4.4-check_ide_smart.patch:

--- NEW FILE nagios-plugins-1.4.4-check_ide_smart.patch ---
--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
+++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
 
 
 void
-print_thresholds (thresholds_t * p) 
+smart_print_thresholds (thresholds_t * p) 
 {
 	threshold_t * threshold = p->thresholds;
 	int i;
@@ -541,7 +541,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("Usage:");
+  printf (_("Usage:"));
   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
 }

nagios-plugins-1.4.4-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.4-linux_raid.patch ---
--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
+++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib utils.pm;
+use lib '/usr/lib/nagios/plugins';
 use utils qw(%ERRORS);




From fedora-extras-commits at redhat.com  Fri Oct 27 15:23:25 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 08:23:25 -0700
Subject: rpms/liferea/devel .cvsignore, 1.36, 1.37 liferea.spec, 1.53,
	1.54 sources, 1.37, 1.38
Message-ID: <200610271523.k9RFNPkG032508@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32488

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
- Update to 1.0.25.
- Drop X-Fedora category from desktop file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	19 Oct 2006 20:21:31 -0000	1.36
+++ .cvsignore	27 Oct 2006 15:22:54 -0000	1.37
@@ -1 +1 @@
-liferea-1.0.24.tar.gz
+liferea-1.0.25.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- liferea.spec	19 Oct 2006 20:21:31 -0000	1.53
+++ liferea.spec	27 Oct 2006 15:22:54 -0000	1.54
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.24
+Version:        1.0.25
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -63,7 +63,6 @@
 
 desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
@@ -109,6 +108,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
+- Update to 1.0.25.
+- Drop X-Fedora category from desktop file.
+
 * Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
 - Update to 1.0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 Oct 2006 20:21:31 -0000	1.37
+++ sources	27 Oct 2006 15:22:54 -0000	1.38
@@ -1 +1 @@
-f872d4ffd483cdcd4fe1f56dc86d5407  liferea-1.0.24.tar.gz
+45d511c9eb829797336a60a4a86b5939  liferea-1.0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 27 15:58:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 27 Oct 2006 08:58:35 -0700
Subject: rpms/ogre/devel .cvsignore, 1.3, 1.4 ogre-1.2.2-soname.patch, 1.1, 
	1.2 ogre.spec, 1.4, 1.5 sources, 1.3,
	1.4 ogre-1.2.1-char_height.patch, 1.1,
	NONE ogre-1.2.1-gtkmm.patch, 1.2,
	NONE ogre-1.2.1-visibility.patch, 1.1, NONE
Message-ID: <200610271558.k9RFwZpp032710@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32685

Modified Files:
	.cvsignore ogre-1.2.2-soname.patch ogre.spec sources 
Removed Files:
	ogre-1.2.1-char_height.patch ogre-1.2.1-gtkmm.patch 
	ogre-1.2.1-visibility.patch 
Log Message:
* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-1
- New upstream release 1.2.3
- Warning as always with a new upstream ogre release this breaks the ABI
  and changes the soname!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Aug 2006 12:46:04 -0000	1.3
+++ .cvsignore	27 Oct 2006 15:58:04 -0000	1.4
@@ -1 +1 @@
-ogre-linux_osx-v1-2-2p1.tar.bz2
+ogre-linux_osx-v1-2-3.tar.bz2

ogre-1.2.2-soname.patch:

Index: ogre-1.2.2-soname.patch
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-1.2.2-soname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-1.2.2-soname.patch	1 Aug 2006 12:50:10 -0000	1.1
+++ ogre-1.2.2-soname.patch	27 Oct 2006 15:58:04 -0000	1.2
@@ -25,8 +25,8 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE OGREMAIN_VERSION_INFO LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_DOUBLE_PRECISION_FLAGS OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE OGREMAIN_VERSION_INFO LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_DOUBLE_PRECISION_FLAGS OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -34,8 +34,8 @@
  CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  LIBS="$LIBS $SDL_LIBS"
  
--OGREMAIN_CURRENT=11
--OGREMAIN_REVISION=2
+-OGREMAIN_CURRENT=12
+-OGREMAIN_REVISION=0
 -OGREMAIN_AGE=0
 -OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
 -
@@ -60,8 +60,8 @@
  
 -dnl versioning info for libtool
 -dnl Note this is the ABI version which is not the same as our actual library version
--OGREMAIN_CURRENT=11
--OGREMAIN_REVISION=2
+-OGREMAIN_CURRENT=12
+-OGREMAIN_REVISION=0
 -OGREMAIN_AGE=0
 -OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
 -AC_SUBST(OGREMAIN_VERSION_INFO)


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ogre.spec	28 Aug 2006 12:04:02 -0000	1.4
+++ ogre.spec	27 Oct 2006 15:58:04 -0000	1.5
@@ -1,16 +1,13 @@
-%define version_postfix p1
-
 Name:           ogre
-Version:        1.2.2
-Release:        2.%{version_postfix}%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
-Source0:        http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -)%{version_postfix}.tar.bz2
+Source0:        http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
 Patch0:         ogre-1.2.1-rpath.patch
-Patch1:         ogre-1.2.1-gtkmm.patch
-Patch2:         ogre-1.2.2-soname.patch
+Patch1:         ogre-1.2.2-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel SDL-devel freetype-devel
 BuildRequires:  libglademm24-devel libsigc++20-devel
@@ -48,8 +45,7 @@
 %prep
 %setup -q -n ogrenew
 %patch0 -p1 -z .rpath
-%patch1 -p1 -z .gtkmm
-%patch2 -p1 -z .soname
+%patch1 -p1 -z .soname
 # sigh stop autoxxx from rerunning because of our patches above.
 touch aclocal.m4
 touch configure
@@ -130,6 +126,11 @@
 
 
 %changelog
+* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-1
+- New upstream release 1.2.3
+- Warning as always with a new upstream ogre release this breaks the ABI
+  and changes the soname!
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-2.p1
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Aug 2006 12:31:47 -0000	1.3
+++ sources	27 Oct 2006 15:58:04 -0000	1.4
@@ -1 +1 @@
-34004bdde39427e9a3213286f8cc057a  ogre-linux_osx-v1-2-2p1.tar.bz2
+b2a8e3df61e2245c46457367a6b73ca0  ogre-linux_osx-v1-2-3.tar.bz2


--- ogre-1.2.1-char_height.patch DELETED ---


--- ogre-1.2.1-gtkmm.patch DELETED ---


--- ogre-1.2.1-visibility.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 16:00:36 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 27 Oct 2006 09:00:36 -0700
Subject: rpms/chess/devel chess.spec,1.3,1.4
Message-ID: <200610271600.k9RG0ada000315@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/chess/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32767

Modified Files:
	chess.spec 
Log Message:
* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
- Rebuild for new ogre



Index: chess.spec
===================================================================
RCS file: /cvs/extras/rpms/chess/devel/chess.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chess.spec	28 Aug 2006 05:13:41 -0000	1.3
+++ chess.spec	27 Oct 2006 16:00:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           chess
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        3D chess game
 Group:          Amusements/Games
 License:        GPL
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
+- Rebuild for new ogre
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Fri Oct 27 16:05:15 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 09:05:15 -0700
Subject: rpms/liferea/FC-6 .cvsignore, 1.36, 1.37 liferea.spec, 1.53,
	1.54 sources, 1.37, 1.38
Message-ID: <200610271605.k9RG5FPM003334@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3305

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
- Update to 1.0.25.
- Drop X-Fedora category from desktop file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	19 Oct 2006 20:21:31 -0000	1.36
+++ .cvsignore	27 Oct 2006 16:04:43 -0000	1.37
@@ -1 +1 @@
-liferea-1.0.24.tar.gz
+liferea-1.0.25.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/liferea.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- liferea.spec	19 Oct 2006 20:21:31 -0000	1.53
+++ liferea.spec	27 Oct 2006 16:04:43 -0000	1.54
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.24
+Version:        1.0.25
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -63,7 +63,6 @@
 
 desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
@@ -109,6 +108,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
+- Update to 1.0.25.
+- Drop X-Fedora category from desktop file.
+
 * Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
 - Update to 1.0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 Oct 2006 20:21:31 -0000	1.37
+++ sources	27 Oct 2006 16:04:43 -0000	1.38
@@ -1 +1 @@
-f872d4ffd483cdcd4fe1f56dc86d5407  liferea-1.0.24.tar.gz
+45d511c9eb829797336a60a4a86b5939  liferea-1.0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 27 16:17:35 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Fri, 27 Oct 2006 09:17:35 -0700
Subject: rpms/mod_nss/FC-5 .cvsignore, 1.2, 1.3 mod_nss-conf.patch, 1.2,
	1.3 mod_nss.spec, 1.2, 1.3 sources, 1.2,
	1.3 mod_nss-eccinit.patch, 1.1, NONE
Message-ID: <200610271617.k9RGHZeD003500@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3475

Modified Files:
	.cvsignore mod_nss-conf.patch mod_nss.spec sources 
Removed Files:
	mod_nss-eccinit.patch 
Log Message:
Update to 1.0.6-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 18:05:12 -0000	1.2
+++ .cvsignore	27 Oct 2006 16:17:04 -0000	1.3
@@ -1 +1 @@
-mod_nss-1.0.3.tar.gz
+mod_nss-1.0.6.tar.gz

mod_nss-conf.patch:

Index: mod_nss-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-5/mod_nss-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss-conf.patch	4 Aug 2006 20:11:02 -0000	1.2
+++ mod_nss-conf.patch	27 Oct 2006 16:17:04 -0000	1.3
@@ -1,5 +1,5 @@
---- mod_nss-1.0.3/nss.conf.in.orig	2006-08-04 14:06:50.000000000 -0400
-+++ mod_nss-1.0.3/nss.conf.in	2006-08-04 15:24:34.000000000 -0400
+--- mod_nss-1.0.6/nss.conf.in.orig	2006-10-20 11:08:42.000000000 -0400
++++ mod_nss-1.0.6/nss.conf.in	2006-10-23 15:27:22.000000000 -0400
 @@ -8,14 +8,16 @@
  # consult the online docs. You have been warned.  
  #
@@ -28,7 +28,7 @@
  
  #   Configure the SSL Session Cache. 
  #   NSSSessionCacheSize is the number of entries in the cache.
-@@ -68,16 +70,18 @@
+@@ -68,17 +70,17 @@
  ## SSL Virtual Host Context
  ##
  
@@ -41,18 +41,16 @@
 +#ServerName www.example.com:8443
  #ServerAdmin you at example.com
  
--# mod_nss can log to separate log files, you can choose to do that if you'd like
+ # mod_nss can log to separate log files, you can choose to do that if you'd like
+ # LogLevel is not inherited from httpd.conf.
 -#ErrorLog @apache_prefix@/logs/error_log
 -#TransferLog @apache_prefix@/logs/access_log
-+# Use separate log files for the SSL virtual host; note that LogLevel
-+# is not inherited from httpd.conf.
-+ErrorLog @apache_prefix@/logs/nss_error_log
-+TransferLog @apache_prefix@/logs/nss_access_log
-+LogLevel warn
++ErrorLog @apache_prefix@/logs/error_log
++TransferLog @apache_prefix@/logs/access_log
+ LogLevel warn
  
  #   SSL Engine Switch:
- #   Enable/Disable SSL for this virtual host.
-@@ -111,7 +115,7 @@
+@@ -113,7 +115,7 @@
  #   The NSS security database directory that holds the certificates and
  #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
  #   Provide the directory that these files exist.
@@ -61,7 +59,7 @@
  
  #   Database Prefix:
  #   In order to be able to store multiple NSS databases in one directory
-@@ -175,7 +179,7 @@
+@@ -189,7 +191,7 @@
  <Files ~ "\.(cgi|shtml|phtml|php3?)$">
      NSSOptions +StdEnvVars
  </Files>


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-5/mod_nss.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss.spec	4 Aug 2006 20:11:02 -0000	1.2
+++ mod_nss.spec	27 Oct 2006 16:17:04 -0000	1.3
@@ -1,21 +1,20 @@
 Name: mod_nss
-Version: 1.0.3
-Release: 4%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
 URL: http://directory.fedora.redhat.com/wiki/Mod_nss
 Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
+BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.11.3
 BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
 Requires: httpd >= 0:2.0.52
-Requires: nspr >= 4.6
-Requires: nss >= 3.11, nss-tools >= 3.11
+Requires: nspr >= 4.6.3
+Requires: nss >= 3.11.3, nss-tools >= 3.11.3
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
-Patch3: mod_nss-eccinit.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -27,7 +26,6 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
-%patch3 -p1 -b .eccinit
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -108,6 +106,9 @@
 %{_sbindir}/gencert
 
 %changelog
+* Fri Oct 27 2006 Rob Crittenden <rcritten at redhat.com> 1.0.6-1
+- Update to 1.0.6
+
 * Fri Aug 04 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-4
 - Include LogLevel warn in nss.conf and use separate log files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 18:05:12 -0000	1.2
+++ sources	27 Oct 2006 16:17:04 -0000	1.3
@@ -1 +1 @@
-feb2d314983a72318cc08e0650501fac  mod_nss-1.0.3.tar.gz
+5e529856b7c05e94c62146ef80eb5e37  mod_nss-1.0.6.tar.gz


--- mod_nss-eccinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 16:37:45 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 27 Oct 2006 09:37:45 -0700
Subject: rpms/dvdisaster/FC-6 dvdisaster.spec,1.15,1.16
Message-ID: <200610271637.k9RGbjoT004027@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4011

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-6/dvdisaster.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dvdisaster.spec	23 Oct 2006 13:29:04 -0000	1.15
+++ dvdisaster.spec	27 Oct 2006 16:37:15 -0000	1.16
@@ -1,7 +1,7 @@
 Name: dvdisaster
 Summary: Additional error protection for CD/DVD media
 Version: 0.70.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-2
+- rebuild
+
 * Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-1
 - update to 0.70.2
 



From fedora-extras-commits at redhat.com  Fri Oct 27 16:39:32 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 27 Oct 2006 09:39:32 -0700
Subject: rpms/dvdisaster/devel dvdisaster.spec,1.15,1.16
Message-ID: <200610271639.k9RGdWxn004092@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4075

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dvdisaster.spec	23 Oct 2006 13:29:04 -0000	1.15
+++ dvdisaster.spec	27 Oct 2006 16:39:02 -0000	1.16
@@ -1,7 +1,7 @@
 Name: dvdisaster
 Summary: Additional error protection for CD/DVD media
 Version: 0.70.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-2
+- rebuild
+
 * Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-1
 - update to 0.70.2
 



From fedora-extras-commits at redhat.com  Fri Oct 27 16:57:44 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 27 Oct 2006 09:57:44 -0700
Subject: rpms/oorexx/FC-6 oorexx.spec,1.5,1.6
Message-ID: <200610271657.k9RGviwo004353@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4337/FC-6

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/FC-6/oorexx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- oorexx.spec	10 Oct 2006 08:49:04 -0000	1.5
+++ oorexx.spec	27 Oct 2006 16:57:14 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,7 +10,9 @@
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    x86_64
+%ifarch x86_64
+Requires:       glibc-devel.i386
+%endif
 
 
 %description
@@ -120,6 +122,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-6
+- For x86_64 require the 32-bit glibc-devel explicitly
+
 * Tue Oct 10 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-5
 - Exclude x86_64
 



From fedora-extras-commits at redhat.com  Fri Oct 27 17:18:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 27 Oct 2006 10:18:19 -0700
Subject: fedora-security/audit fe3, 1.22, 1.23 fe4, 1.82, 1.83 fe5, 1.89,
	1.90 fe6, 1.2, 1.3
Message-ID: <200610271718.k9RHIJN4007465@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7441

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
Catch up with clamav 0.88.5.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fe3	17 Oct 2006 19:15:24 -0000	1.22
+++ fe3	27 Oct 2006 17:18:16 -0000	1.23
@@ -2,12 +2,12 @@
 
 ** are items that need attention
 
-CVE-2006-5295 VULNERABLE (clamav) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
-CVE-2006-4182 VULNERABLE (clamav) #210973
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-3) #200545
 CVE-2006-3816 version (krusader, fixed 1.70.1) #200323


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fe4	26 Oct 2006 14:48:44 -0000	1.82
+++ fe4	27 Oct 2006 17:18:16 -0000	1.83
@@ -5,7 +5,7 @@
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
-CVE-2006-5295 VULNERABLE (clamav) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -31,7 +31,7 @@
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
-CVE-2006-4182 VULNERABLE (clamav) #210973
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-4) #200545


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- fe5	26 Oct 2006 14:48:44 -0000	1.89
+++ fe5	27 Oct 2006 17:18:16 -0000	1.90
@@ -5,7 +5,7 @@
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
-CVE-2006-5295 VULNERABLE (clamav) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -31,7 +31,7 @@
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
-CVE-2006-4182 VULNERABLE (clamav) #210973
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-5) #200545


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fe6	26 Oct 2006 14:48:44 -0000	1.2
+++ fe6	27 Oct 2006 17:18:16 -0000	1.3
@@ -5,7 +5,7 @@
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
-CVE-2006-5295 VULNERABLE (clamav) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -31,7 +31,7 @@
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
-CVE-2006-4182 VULNERABLE (clamav) #210973
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-5) #200545



From fedora-extras-commits at redhat.com  Fri Oct 27 17:21:26 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Fri, 27 Oct 2006 10:21:26 -0700
Subject: rpms/mod_nss/FC-6 .cvsignore, 1.2, 1.3 mod_nss-conf.patch, 1.2,
	1.3 mod_nss.spec, 1.3, 1.4 sources, 1.2,
	1.3 mod_nss-eccinit.patch, 1.1, NONE
Message-ID: <200610271721.k9RHLQPT007612@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7522

Modified Files:
	.cvsignore mod_nss-conf.patch mod_nss.spec sources 
Removed Files:
	mod_nss-eccinit.patch 
Log Message:
Update to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 18:05:12 -0000	1.2
+++ .cvsignore	27 Oct 2006 17:20:55 -0000	1.3
@@ -1 +1 @@
-mod_nss-1.0.3.tar.gz
+mod_nss-1.0.6.tar.gz

mod_nss-conf.patch:

Index: mod_nss-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/mod_nss-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss-conf.patch	4 Aug 2006 20:11:03 -0000	1.2
+++ mod_nss-conf.patch	27 Oct 2006 17:20:55 -0000	1.3
@@ -1,5 +1,5 @@
---- mod_nss-1.0.3/nss.conf.in.orig	2006-08-04 14:06:50.000000000 -0400
-+++ mod_nss-1.0.3/nss.conf.in	2006-08-04 15:24:34.000000000 -0400
+--- mod_nss-1.0.6/nss.conf.in.orig	2006-10-20 11:08:42.000000000 -0400
++++ mod_nss-1.0.6/nss.conf.in	2006-10-23 15:27:22.000000000 -0400
 @@ -8,14 +8,16 @@
  # consult the online docs. You have been warned.  
  #
@@ -28,7 +28,7 @@
  
  #   Configure the SSL Session Cache. 
  #   NSSSessionCacheSize is the number of entries in the cache.
-@@ -68,16 +70,18 @@
+@@ -68,17 +70,17 @@
  ## SSL Virtual Host Context
  ##
  
@@ -41,18 +41,16 @@
 +#ServerName www.example.com:8443
  #ServerAdmin you at example.com
  
--# mod_nss can log to separate log files, you can choose to do that if you'd like
+ # mod_nss can log to separate log files, you can choose to do that if you'd like
+ # LogLevel is not inherited from httpd.conf.
 -#ErrorLog @apache_prefix@/logs/error_log
 -#TransferLog @apache_prefix@/logs/access_log
-+# Use separate log files for the SSL virtual host; note that LogLevel
-+# is not inherited from httpd.conf.
-+ErrorLog @apache_prefix@/logs/nss_error_log
-+TransferLog @apache_prefix@/logs/nss_access_log
-+LogLevel warn
++ErrorLog @apache_prefix@/logs/error_log
++TransferLog @apache_prefix@/logs/access_log
+ LogLevel warn
  
  #   SSL Engine Switch:
- #   Enable/Disable SSL for this virtual host.
-@@ -111,7 +115,7 @@
+@@ -113,7 +115,7 @@
  #   The NSS security database directory that holds the certificates and
  #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
  #   Provide the directory that these files exist.
@@ -61,7 +59,7 @@
  
  #   Database Prefix:
  #   In order to be able to store multiple NSS databases in one directory
-@@ -175,7 +179,7 @@
+@@ -189,7 +191,7 @@
  <Files ~ "\.(cgi|shtml|phtml|php3?)$">
      NSSOptions +StdEnvVars
  </Files>


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/mod_nss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_nss.spec	11 Sep 2006 13:40:15 -0000	1.3
+++ mod_nss.spec	27 Oct 2006 17:20:55 -0000	1.4
@@ -1,21 +1,20 @@
 Name: mod_nss
-Version: 1.0.3
-Release: 5%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
 URL: http://directory.fedora.redhat.com/wiki/Mod_nss
 Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
+BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.11.3
 BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
 Requires: httpd >= 0:2.0.52
-Requires: nspr >= 4.6
-Requires: nss >= 3.11, nss-tools >= 3.11
+Requires: nspr >= 4.6.3
+Requires: nss >= 3.11.3, nss-tools >= 3.11.3
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
-Patch3: mod_nss-eccinit.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -27,7 +26,6 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
-%patch3 -p1 -b .eccinit
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -108,8 +106,8 @@
 %{_sbindir}/gencert
 
 %changelog
-* Mon Sep 11 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-5
-- Mass rebuild for new toolset.
+* Mon Oct 23 2006 Rob Crittenden <rcritten at redhat.com> 1.0.6-1
+- Update to 1.0.6
 
 * Fri Aug 04 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-4
 - Include LogLevel warn in nss.conf and use separate log files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 18:05:12 -0000	1.2
+++ sources	27 Oct 2006 17:20:55 -0000	1.3
@@ -1 +1 @@
-feb2d314983a72318cc08e0650501fac  mod_nss-1.0.3.tar.gz
+5e529856b7c05e94c62146ef80eb5e37  mod_nss-1.0.6.tar.gz


--- mod_nss-eccinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 17:43:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 10:43:37 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 telepathy-gabble.spec, 1.12, 1.13
Message-ID: <200610271743.k9RHhb27008036@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8015

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Oct 2006 00:54:32 -0000	1.12
+++ .cvsignore	27 Oct 2006 17:43:07 -0000	1.13
@@ -1 +1 @@
-telepathy-gabble-0.4.1.tar.gz
+telepathy-gabble-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Oct 2006 00:54:32 -0000	1.12
+++ sources	27 Oct 2006 17:43:07 -0000	1.13
@@ -1 +1 @@
-e08f4e1f361165635128c5996d71e2b9  telepathy-gabble-0.4.1.tar.gz
+a1bc3939da26f9221b11806484d2b272  telepathy-gabble-0.4.2.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- telepathy-gabble.spec	24 Oct 2006 00:54:32 -0000	1.12
+++ telepathy-gabble.spec	27 Oct 2006 17:43:07 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2.
+
 * Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
 - Update to 0.4.1.
 



From fedora-extras-commits at redhat.com  Fri Oct 27 18:14:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 11:14:49 -0700
Subject: rpms/telepathy-gabble/FC-6 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 telepathy-gabble.spec, 1.12, 1.13
Message-ID: <200610271814.k9RIEntw011236@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11216

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Oct 2006 01:10:02 -0000	1.12
+++ .cvsignore	27 Oct 2006 18:14:19 -0000	1.13
@@ -1 +1 @@
-telepathy-gabble-0.4.1.tar.gz
+telepathy-gabble-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Oct 2006 01:10:02 -0000	1.12
+++ sources	27 Oct 2006 18:14:19 -0000	1.13
@@ -1 +1 @@
-e08f4e1f361165635128c5996d71e2b9  telepathy-gabble-0.4.1.tar.gz
+a1bc3939da26f9221b11806484d2b272  telepathy-gabble-0.4.2.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/telepathy-gabble.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- telepathy-gabble.spec	24 Oct 2006 01:10:02 -0000	1.12
+++ telepathy-gabble.spec	27 Oct 2006 18:14:19 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2.
+
 * Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
 - Update to 0.4.1.
 



From fedora-extras-commits at redhat.com  Fri Oct 27 18:19:49 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Fri, 27 Oct 2006 11:19:49 -0700
Subject: rpms/mod_nss/devel .cvsignore, 1.2, 1.3 mod_nss-conf.patch, 1.2,
	1.3 mod_nss.spec, 1.3, 1.4 sources, 1.2,
	1.3 mod_nss-eccinit.patch, 1.1, NONE
Message-ID: <200610271819.k9RIJnPF011321@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11292

Modified Files:
	.cvsignore mod_nss-conf.patch mod_nss.spec sources 
Removed Files:
	mod_nss-eccinit.patch 
Log Message:
Update to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 18:05:12 -0000	1.2
+++ .cvsignore	27 Oct 2006 18:19:19 -0000	1.3
@@ -1 +1 @@
-mod_nss-1.0.3.tar.gz
+mod_nss-1.0.6.tar.gz

mod_nss-conf.patch:

Index: mod_nss-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss-conf.patch	4 Aug 2006 20:11:03 -0000	1.2
+++ mod_nss-conf.patch	27 Oct 2006 18:19:19 -0000	1.3
@@ -1,5 +1,5 @@
---- mod_nss-1.0.3/nss.conf.in.orig	2006-08-04 14:06:50.000000000 -0400
-+++ mod_nss-1.0.3/nss.conf.in	2006-08-04 15:24:34.000000000 -0400
+--- mod_nss-1.0.6/nss.conf.in.orig	2006-10-20 11:08:42.000000000 -0400
++++ mod_nss-1.0.6/nss.conf.in	2006-10-23 15:27:22.000000000 -0400
 @@ -8,14 +8,16 @@
  # consult the online docs. You have been warned.  
  #
@@ -28,7 +28,7 @@
  
  #   Configure the SSL Session Cache. 
  #   NSSSessionCacheSize is the number of entries in the cache.
-@@ -68,16 +70,18 @@
+@@ -68,17 +70,17 @@
  ## SSL Virtual Host Context
  ##
  
@@ -41,18 +41,16 @@
 +#ServerName www.example.com:8443
  #ServerAdmin you at example.com
  
--# mod_nss can log to separate log files, you can choose to do that if you'd like
+ # mod_nss can log to separate log files, you can choose to do that if you'd like
+ # LogLevel is not inherited from httpd.conf.
 -#ErrorLog @apache_prefix@/logs/error_log
 -#TransferLog @apache_prefix@/logs/access_log
-+# Use separate log files for the SSL virtual host; note that LogLevel
-+# is not inherited from httpd.conf.
-+ErrorLog @apache_prefix@/logs/nss_error_log
-+TransferLog @apache_prefix@/logs/nss_access_log
-+LogLevel warn
++ErrorLog @apache_prefix@/logs/error_log
++TransferLog @apache_prefix@/logs/access_log
+ LogLevel warn
  
  #   SSL Engine Switch:
- #   Enable/Disable SSL for this virtual host.
-@@ -111,7 +115,7 @@
+@@ -113,7 +115,7 @@
  #   The NSS security database directory that holds the certificates and
  #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
  #   Provide the directory that these files exist.
@@ -61,7 +59,7 @@
  
  #   Database Prefix:
  #   In order to be able to store multiple NSS databases in one directory
-@@ -175,7 +179,7 @@
+@@ -189,7 +191,7 @@
  <Files ~ "\.(cgi|shtml|phtml|php3?)$">
      NSSOptions +StdEnvVars
  </Files>


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_nss.spec	11 Sep 2006 13:40:15 -0000	1.3
+++ mod_nss.spec	27 Oct 2006 18:19:19 -0000	1.4
@@ -1,21 +1,20 @@
 Name: mod_nss
-Version: 1.0.3
-Release: 5%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
 URL: http://directory.fedora.redhat.com/wiki/Mod_nss
 Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
+BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.11.3
 BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
 Requires: httpd >= 0:2.0.52
-Requires: nspr >= 4.6
-Requires: nss >= 3.11, nss-tools >= 3.11
+Requires: nspr >= 4.6.3
+Requires: nss >= 3.11.3, nss-tools >= 3.11.3
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
-Patch3: mod_nss-eccinit.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -27,7 +26,6 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
-%patch3 -p1 -b .eccinit
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -108,8 +106,8 @@
 %{_sbindir}/gencert
 
 %changelog
-* Mon Sep 11 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-5
-- Mass rebuild for new toolset.
+* Mon Oct 23 2006 Rob Crittenden <rcritten at redhat.com> 1.0.6-1
+- Update to 1.0.6
 
 * Fri Aug 04 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-4
 - Include LogLevel warn in nss.conf and use separate log files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 18:05:12 -0000	1.2
+++ sources	27 Oct 2006 18:19:19 -0000	1.3
@@ -1 +1 @@
-feb2d314983a72318cc08e0650501fac  mod_nss-1.0.3.tar.gz
+5e529856b7c05e94c62146ef80eb5e37  mod_nss-1.0.6.tar.gz


--- mod_nss-eccinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 18:37:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 27 Oct 2006 11:37:05 -0700
Subject: rpms/TeXmacs/FC-6 .cvsignore, 1.22, 1.23 TeXmacs.spec, 1.41,
	1.42 sources, 1.23, 1.24
Message-ID: <200610271837.k9RIb5Pt011476@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11456/FC-6

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-6/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	7 Aug 2006 16:43:05 -0000	1.22
+++ .cvsignore	27 Oct 2006 18:36:35 -0000	1.23
@@ -1 +1 @@
-TeXmacs-1.0.6.5-src.tar.gz
+TeXmacs-1.0.6.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-6/TeXmacs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- TeXmacs.spec	7 Aug 2006 16:43:05 -0000	1.41
+++ TeXmacs.spec	27 Oct 2006 18:36:35 -0000	1.42
@@ -1,12 +1,12 @@
 Name:		TeXmacs
-Version:	1.0.6.5
+Version:	1.0.6.6
 Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.5-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.6-src.tar.gz
 Patch1:		TeXmacs-inline.patch
 Patch2:		TeXmacs-event.patch
 Patch3:		TeXmacs-gcc41.patch
@@ -15,11 +15,10 @@
 Requires:	tetex
 Requires:	tetex-fonts
 Requires:	ghostscript
-Buildrequires:	guile-devel
-Buildrequires:	gmp-devel
-Buildrequires:	desktop-file-utils
-Buildrequires:	tetex
-Buildrequires:  freetype-devel
+BuildRequires:	guile-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	tetex
+BuildRequires:  freetype-devel
 BuildRequires:  libICE-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libX11-devel
@@ -55,7 +54,7 @@
 
 %prep
 %setup -q -n TeXmacs-%{version}-src
-%patch2 -p1
+#%patch2 -p1
 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 
 
@@ -155,6 +154,9 @@
 
 
 %changelog
+* Mon Aug 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.6-1
+- new version 1.0.6.6
+
 * Mon Aug  7 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.5-1
 - new version 1.0.6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-6/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Aug 2006 16:43:05 -0000	1.23
+++ sources	27 Oct 2006 18:36:35 -0000	1.24
@@ -1 +1 @@
-9f9c96838d4845e50d8f82dfb8f3eecd  TeXmacs-1.0.6.5-src.tar.gz
+53e21e5cb1a536a60cd6fb28dcb598d9  TeXmacs-1.0.6.6-src.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 27 19:20:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 27 Oct 2006 12:20:18 -0700
Subject: rpms/kdeartwork-extras/FC-6 kdeartwork-extras.spec,1.1,1.2
Message-ID: <200610271920.k9RJKIab014657@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14639

Modified Files:
	kdeartwork-extras.spec 
Log Message:
* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-6
- -extras: Requires: xscreensaver-base



Index: kdeartwork-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/FC-6/kdeartwork-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeartwork-extras.spec	2 Oct 2006 14:54:31 -0000	1.1
+++ kdeartwork-extras.spec	27 Oct 2006 19:19:47 -0000	1.2
@@ -12,7 +12,7 @@
 #define icons 1
 
 Version: 3.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if "%{?core}" == "1"
 Name:    kdeartwork 
@@ -28,7 +28,7 @@
 %define _with_xscreensaver --with-xscreensaver
 %define xsc xscreensaver-extras xscreensaver-gl-extras
 BuildRequires: %{xsc}
-Requires:      %{xsc}
+Requires:      %{xsc} xscreensaver-base
 # split occured at 3.5.3-6
 Conflicts: kdeartwork < 3.5.3-6
 Requires: kdebase
@@ -207,11 +207,14 @@
 
 
 %changelog
+* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-6
+- -extras: Requires: xscreensaver-base
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-5
-- %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
+- -extras: %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
 
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-4
-- extras: drop (Build)Requires: xscreensaver-base
+- -extras: drop (Build)Requires: xscreensaver-base
 
 * Sat Sep 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-3
 - use %%_foo style macros in %%changelog



From fedora-extras-commits at redhat.com  Fri Oct 27 19:37:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 27 Oct 2006 12:37:45 -0700
Subject: rpms/kdeartwork-extras/devel .cvsignore, 1.2,
	1.3 kdeartwork-extras.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610271937.k9RJbj8e014812@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14792

Modified Files:
	.cvsignore kdeartwork-extras.spec sources 
Log Message:
* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-2
- -extras: Requires: xscreensaver-base

* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-1
- 3.5.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2006 14:54:31 -0000	1.2
+++ .cvsignore	27 Oct 2006 19:37:15 -0000	1.3
@@ -1 +1,2 @@
 kdeartwork-3.5.4.tar.bz2
+kdeartwork-3.5.5.tar.bz2


Index: kdeartwork-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/kdeartwork-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeartwork-extras.spec	2 Oct 2006 14:54:31 -0000	1.1
+++ kdeartwork-extras.spec	27 Oct 2006 19:37:15 -0000	1.2
@@ -11,14 +11,12 @@
 %define extras 1
 #define icons 1
 
-Version: 3.5.4
-Release: 5%{?dist}
+Version: 3.5.5
+Release: 2%{?dist}
 
 %if "%{?core}" == "1"
 Name:    kdeartwork 
 Summary: Additional artwork (themes, sound themes, ...) for KDE 
-# For (kde) opengl screensavers, workaround http://bugzilla.redhat.com/193741
-#BuildRequires: libGL-devel libGLU-devel
 Requires: kdebase
 %endif
 
@@ -28,7 +26,7 @@
 %define _with_xscreensaver --with-xscreensaver
 %define xsc xscreensaver-extras xscreensaver-gl-extras
 BuildRequires: %{xsc}
-Requires:      %{xsc}
+Requires:      %{xsc} xscreensaver-base
 # split occured at 3.5.3-6
 Conflicts: kdeartwork < 3.5.3-6
 Requires: kdebase
@@ -60,6 +58,7 @@
 Patch1: kdeartwork-3.5.3-inherits.patch
 
 BuildRequires: kdebase-devel >= 6:%{version}
+BuildRequires: gettext
 
 ## upstream patches
 # fix GL issues, flickering, see http://bugs.kde.org/73813
@@ -207,11 +206,17 @@
 
 
 %changelog
+* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-2
+- -extras: Requires: xscreensaver-base
+
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-1
+- 3.5.5
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-5
-- %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
+- -extras: %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
 
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-4
-- extras: drop (Build)Requires: xscreensaver-base
+- -extras: drop (Build)Requires: xscreensaver-base
 
 * Sat Sep 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-3
 - use %%_foo style macros in %%changelog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 14:54:31 -0000	1.2
+++ sources	27 Oct 2006 19:37:15 -0000	1.3
@@ -1 +1 @@
-c7ff9048b9b68c976de08ed418598e40  kdeartwork-3.5.4.tar.bz2
+8d35156b506cf870eb9641f72a304c8c  kdeartwork-3.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 27 21:00:24 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 27 Oct 2006 14:00:24 -0700
Subject: extras-buildsys/utils/pushscript Utils.py,1.4,1.5
Message-ID: <200610272100.k9RL0O99018217@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18191

Modified Files:
	Utils.py 
Log Message:
Work around createrepo < 0.4.5 (upstream bug 595). Even if a future
upgrade of createrepo may work fine and never chokes on files in
".olddir", we here take over backing up files in "repodata" dir.




Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Utils.py	24 Oct 2006 22:41:38 -0000	1.4
+++ Utils.py	27 Oct 2006 21:00:21 -0000	1.5
@@ -33,15 +33,22 @@
     if DEBUG:
         print '    DEBUG:', msg
 
-def run_and_check(cmd):
+def run(cmd):
     debugprint(cmd)
     if not DEBUG:
         result = os.system(cmd)
         if result != 0:
             print >> sys.stderr, 'Error running command: %s ' % cmd
             if result > 127:
-                sys.exit(1)
-            sys.exit(result)
+                return 1
+            return result
+    else:
+        return 0
+
+def run_and_check(cmd):
+    result = run(cmd)
+    if result:
+        sys.exit(result)
 
 
 def load_config_module(project):
@@ -111,23 +118,9 @@
         install_copy(src,dest)
 
 
-def create_repository(cfg,repodir,debuginfo=True):
-    """create/update repository metadata for a given directory and
-    consider a 'debug' sub-repository by default"""
-
+def _create_repository(cfg,repodir,debuginfo=True):
     print 'Creating repository %s' % repodir
-    
-    if not os.path.exists(repodir):
-        os.makedirs(repodir)
-    
-    # TODO: Why remove the repodata dir? Isn't that entirely createrepo's
-    # work? (also further below for "debug")
-    # ? -> https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=595
-    rpdata = os.path.join(repodir, 'repodata')
-    debugprint('removing tree %s' % rpdata)
-    if os.path.exists(rpdata) and not DEBUG:
-        shutil.rmtree(rpdata)
-    
+
     compsarg = ''
     if os.path.exists( os.path.join(repodir,compsname) ):
         compsarg = '-g %s ' % compsname
@@ -135,7 +128,8 @@
     if debuginfo and os.path.exists( os.path.join(repodir,'debug') ):
         excludearg = "-x \'*debuginfo*\'"
     cmd = '%s -c %s -q %s %s %s' % (cfg.createrepo, cfg.cr_cachedir, compsarg, excludearg, repodir)
-    run_and_check(cmd)
+    if run(cmd):
+        raise Exception
     
     if debuginfo:
         # If there's a debug subdir, make that a repo, too.
@@ -147,9 +141,58 @@
             if os.path.exists(rpdata) and not DEBUG:
                 shutil.rmtree(rpdata)
             cmd = '%s -c %s -q %s' % (cfg.createrepo, cfg.cr_cachedir, dbg_repodir)
-            run_and_check(cmd)
+            if run(cmd):
+                raise Exception
+
+
+def _restore_repodata_dir(tmpdir,targetdir):  # helper function
+    for f in os.listdir(tmpdir):
+        sourcefile = os.path.join(tmpdir,f)
+        targetfile = os.path.join(targetdir,f)
+        if os.path.exists(targetfile):  # don't overwrite new files
+            if os.path.isdir(targetfile):
+                shutil.rmtree(sourcefile)
+            else:
+                os.remove(sourcefile)
+        else:
+            shutil.move(sourcefile,targetfile)
 
 
+def create_repository(cfg,repodir,debuginfo=True):
+    """create/update repository metadata for a given directory and
+    consider a 'debug' sub-repository by default"""
+
+    rpdata = os.path.join(repodir,'repodata')
+    for d in [repodir,rpdata]:
+        if not os.path.exists(d):
+            os.makedirs(d)
+
+    # Not only help createrepo < 0.4.5, but more important, create
+    # a backup of the "repodata" directory and restore repoview files,
+    # because it sucks to recreate them everytime from scratch.
+    # We used to remove the entire repodata directory because of:
+    # https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=595
+    
+    tmpdir = tempfile.mkdtemp('','.push',repodir)
+    if tmpdir == repodir: # paranoid, should never happen
+        sys.exit(errno.EPERM)
+    try:
+        for f in os.listdir(rpdata):
+            sourcefile = os.path.join(rpdata,f)
+            targetfile = os.path.join(tmpdir,f)
+            shutil.move(sourcefile,targetfile)
+
+        _create_repository(cfg,repodir,debuginfo)
+        
+        _restore_repodata_dir(tmpdir,rpdata)
+        shutil.rmtree(tmpdir)
+    except:  # everything is bad at this point
+        print 'ERROR: Creating temporary working directory failed.'
+        _restore_repodata_dir(tmpdir,rpdata)
+        shutil.rmtree(tmpdir)
+        sys.exit(errno.EPERM)
+    
+
 def is_repo_changed(repodir):
     """Checks if the repository has changed and needs to be reindexed"""
     ref_file = os.path.join(repodir, 'repodata', 'repomd.xml')



From fedora-extras-commits at redhat.com  Fri Oct 27 21:12:36 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 27 Oct 2006 14:12:36 -0700
Subject: rpms/csound/devel .cvsignore, 1.3,
	1.4 csound-5.03.0-no-usr-local.patch, 1.1,
	1.2 csound-5.03.0-remote-fixes.patch, 1.1, 1.2 csound.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200610272112.k9RLCaji021309@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275

Modified Files:
	.cvsignore csound-5.03.0-no-usr-local.patch 
	csound-5.03.0-remote-fixes.patch csound.spec sources 
Log Message:
* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
- Update to a cvs snapshot for the remote plugin and a few other fixes
- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
- Put the virtual MIDI keyboard into its own package




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Oct 2006 04:35:22 -0000	1.3
+++ .cvsignore	27 Oct 2006 21:12:05 -0000	1.4
@@ -1,3 +1,4 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
 Csound5.03_src-cvs20061023.tar.bz2
+Csound5.03_src-cvs20061027.tar.bz2

csound-5.03.0-no-usr-local.patch:

Index: csound-5.03.0-no-usr-local.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-no-usr-local.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-no-usr-local.patch	24 Oct 2006 04:35:22 -0000	1.1
+++ csound-5.03.0-no-usr-local.patch	27 Oct 2006 21:12:05 -0000	1.2
@@ -1,6 +1,6 @@
---- Csound5.03.0/SConstruct.no-usr-local	2006-10-23 15:42:27.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-10-23 15:43:31.000000000 -0400
-@@ -307,10 +307,10 @@
+--- Csound5.03.0/SConstruct.no-usr-local	2006-10-27 16:24:08.000000000 -0400
++++ Csound5.03.0/SConstruct	2006-10-27 16:26:03.000000000 -0400
+@@ -306,10 +306,10 @@
  if commonEnvironment['buildRelease'] == '0':
      commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
  if commonEnvironment['Word64'] == '1':
@@ -13,7 +13,7 @@
  
  if commonEnvironment['useDouble'] == '0':
      print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
-@@ -325,14 +325,12 @@
+@@ -324,14 +324,12 @@
  
  if getPlatform() == 'linux':
      commonEnvironment.Append(CCFLAGS = "-DLINUX")
@@ -28,7 +28,7 @@
      commonEnvironment.Append(CCFLAGS = "-DPIPES")
      if commonEnvironment['useAltivec'] == '1':
          print 'CONFIGURATION DECISION using Altivec optmisation'
-@@ -343,7 +341,6 @@
+@@ -342,7 +340,6 @@
      commonEnvironment.Append(CCFLAGS = "-DPIPES")
      commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
      if not withMSVC():
@@ -36,13 +36,17 @@
          commonEnvironment.Append(CPPPATH = '/usr/include')
          commonEnvironment.Append(CCFLAGS = "-mthreads")
      else:
-@@ -351,15 +348,14 @@
+@@ -350,18 +347,17 @@
  
  if getPlatform() == 'linux':
      path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
 -    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
 -    pythonIncludePath = [path1, path2]
 +    pythonIncludePath = [path1]
+     path1 = '/usr/include/tcl8.4'
+     path2 = '/usr/include/tk8.4'
+-    tclIncludePath = [path1, path2]
++    tclIncludePath = [path1]
      pythonLinkFlags = []
      if commonEnvironment['Word64'] == '1':
          tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']

csound-5.03.0-remote-fixes.patch:

Index: csound-5.03.0-remote-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-remote-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-remote-fixes.patch	25 Oct 2006 16:13:06 -0000	1.1
+++ csound-5.03.0-remote-fixes.patch	27 Oct 2006 21:12:05 -0000	1.2
@@ -1,6 +1,6 @@
---- Csound5.03.0/OOps/remote.c.remote-debug	2006-10-23 08:18:21.000000000 -0400
-+++ Csound5.03.0/OOps/remote.c	2006-10-25 12:08:20.000000000 -0400
-@@ -36,15 +36,18 @@
+--- Csound5.03.0/OOps/remote.c.remote-fixes	2006-10-27 16:00:10.000000000 -0400
++++ Csound5.03.0/OOps/remote.c	2006-10-27 16:32:02.000000000 -0400
+@@ -38,6 +38,9 @@
  
  #define ST(x)   (((REMOTE_GLOBALS*) ((CSOUND*)csound)->remoteGlobals)->x)
  
@@ -10,7 +10,8 @@
  void remoteRESET(CSOUND *csound)
  {
      csound->remoteGlobals = NULL;
- }
+@@ -46,9 +49,9 @@
+ #ifdef HAVE_SOCKETS
  
   /* get the IPaddress of this machine */
 -static void getIpAddress(char *ipaddr, char *ifname)
@@ -21,11 +22,11 @@
  #ifdef WIN32
      /* VL 12/10/06: something needs to go here */
      /* gethostbyname is the real answer; code below id unsafe */
-@@ -57,25 +60,26 @@
- memset(&sin, 0, sizeof (struct sockaddr_in));
- memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
- strcpy(ipaddr, inet_ntoa (sin.sin_addr));
-+ret = 0;
+@@ -61,25 +64,26 @@
+     memset(&sin, 0, sizeof (struct sockaddr_in));
+     memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
+     strcpy(ipaddr, inet_ntoa (sin.sin_addr));
++    ret = 0;
  
  #else
      struct ifreq ifr;
@@ -54,7 +55,7 @@
  }
  
  char remoteID(CSOUND *csound)
-@@ -84,31 +88,83 @@
+@@ -88,31 +92,83 @@
      return ST(ipadrs)[len-1];
  }
  
@@ -116,8 +117,8 @@
 +      goto error;
 +    }
 +
-+	/* get IP adrs of this machine */
-+	/* FIXME: don't hardcode eth0 */
++    /* get IP adrs of this machine */
++    /* FIXME: don't hardcode eth0 */
 +    if (getIpAddress(ST(ipadrs), "eth0") < 0) {
 +      csound->Message(csound, Str("unable to get local ip address."));
 +      goto error;
@@ -144,7 +145,7 @@
        SOCK *sop = ST(socksout), *sop_end = sop + MAXREMOTES;
        for ( ; sop < sop_end; sop++)
          if ((fd = sop->rfd) > 0)
-@@ -285,7 +341,12 @@
+@@ -289,7 +345,12 @@
  {   /*      INSTR 0 opcode  */
      short nargs = p->INOCOUNT;
  
@@ -158,7 +159,7 @@
      if (nargs < 3) {
        csound->InitError(csound, Str("missing instr nos"));
        return 0;
-@@ -327,7 +388,12 @@
+@@ -331,7 +392,12 @@
  {   /*      INSTR 0 opcode  */
      short nargs = p->INOCOUNT;
  
@@ -172,7 +173,7 @@
      if (nargs < 2) {
        csound->InitError(csound, Str("missing instr nos"));
        return NOTOK;
-@@ -357,7 +423,12 @@
+@@ -361,7 +427,12 @@
  {                                            /* INSTR 0 opcode  */
      short nargs = p->INOCOUNT;
  
@@ -186,7 +187,7 @@
      if (nargs < 3) {
        csound->InitError(csound, Str("missing channel nos"));
        return NOTOK;
-@@ -396,7 +467,12 @@
+@@ -400,7 +471,12 @@
  {                                         /*       INSTR 0 opcode  */
      short nargs = p->INOCOUNT;
      


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- csound.spec	25 Oct 2006 16:13:06 -0000	1.4
+++ csound.spec	27 Oct 2006 21:12:05 -0000	1.5
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       5%{?dist}
+Release:       7%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0:     http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061023.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -110,6 +110,15 @@
 %description gui
 Contains a FLTK-based GUI for Csound
 
+%package fltk
+Summary: FLTK plugins for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description fltk
+Contains FLTK plugins for csound
+
 %package jack
 Summary: Jack Audio plugins for Csound
 Group: Applications/Multimedia
@@ -145,6 +154,15 @@
 %description osc
 Open Sound Control (OSC) plugin for Csound
 
+%package virtual-keyboard
+Summary: Virtual MIDI keyboard plugin for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description virtual-keyboard
+A virtual MIDI keyboard plugin for Csound
+
 %package manual
 Summary: Csound manual
 Group: Documentation
@@ -346,6 +364,9 @@
 %files gui
 %defattr(-,root,root,0755)
 %{_bindir}/csound5gui
+
+%files fltk
+%defattr(-,root,root,0755)
 %{_libdir}/%{name}/plugins/libwidgets.so
 
 %files jack
@@ -364,6 +385,10 @@
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/plugins/libosc.so
 
+%files virtual-keyboard
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/plugins/libvirtual.so
+
 %files manual
 %defattr(-,root,root,0755)
 %doc manual/copying.txt manual/credits.txt manual/bugs.txt manual/readme.txt manual/news.txt
@@ -378,6 +403,11 @@
 %doc tutorial/*.py
 
 %changelog
+* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
+- Update to a cvs snapshot for the remote plugin and a few other fixes
+- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
+- Put the virtual MIDI keyboard into its own package
+
 * Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
 - Fix the remote plugin's local IP address read code, add more error checking
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Oct 2006 04:35:22 -0000	1.3
+++ sources	27 Oct 2006 21:12:05 -0000	1.4
@@ -1,2 +1,3 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
 58b8a3f2f7729387acb7cd365191a979  Csound5.03_src-cvs20061023.tar.bz2
+8f01e4b65c3cb046df04f7eae92448d5  Csound5.03_src-cvs20061027.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 27 22:12:35 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:12:35 -0700
Subject: rpms/monodevelop/FC-5 monodevelop.spec,1.9,1.10
Message-ID: <200610272212.k9RMCZ6N024591@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24575

Modified Files:
	monodevelop.spec 
Log Message:

Add R apr-devel and fixed web url 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/FC-5/monodevelop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- monodevelop.spec	27 Sep 2006 20:17:51 -0000	1.9
+++ monodevelop.spec	27 Oct 2006 22:12:05 -0000	1.10
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://go-mono.com/sources/%{name}/
+URL: http://www.monodevelop.com
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -96,6 +96,10 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-6
+- fix for SVN
+- url now correct
+
 * Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
 - pkgconfig fix 
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:15:13 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:15:13 -0700
Subject: rpms/monodevelop/FC-6 monodevelop.spec,1.10,1.11
Message-ID: <200610272215.k9RMFDex024654@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24636

Modified Files:
	monodevelop.spec 
Log Message:

Fixed web url, added R apr-devel 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/FC-6/monodevelop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monodevelop.spec	27 Sep 2006 20:16:30 -0000	1.10
+++ monodevelop.spec	27 Oct 2006 22:14:43 -0000	1.11
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://go-mono.com/sources/%{name}/
+URL: http://www.monodevelop.com
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -96,6 +96,10 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-6
+- fixed url
+- added R apr-devel
+
 * Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
 - pkgconfig fix 
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:17:37 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:17:37 -0700
Subject: rpms/monodevelop/devel monodevelop.spec,1.10,1.11
Message-ID: <200610272217.k9RMHbqh024717@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24700

Modified Files:
	monodevelop.spec 
Log Message:

Fixed web url, added R apr-devel 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monodevelop.spec	27 Sep 2006 20:16:30 -0000	1.10
+++ monodevelop.spec	27 Oct 2006 22:17:07 -0000	1.11
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://go-mono.com/sources/%{name}/
+URL: http://www.monodevelop.com
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -96,6 +96,10 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-6
+- fixed url
+- added R apr-devel
+
 * Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
 - pkgconfig fix 
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:02 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:20:02 -0700
Subject: rpms/gtk-sharp/FC-6 gtk-sharp.spec,1.2,1.3
Message-ID: <200610272220.k9RMK2o3024809@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtk-sharp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24777

Modified Files:
	gtk-sharp.spec 
Log Message:

rebuild 
 	gtk-sharp.spec 



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-sharp/FC-6/gtk-sharp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-sharp.spec	4 Oct 2006 22:16:57 -0000	1.2
+++ gtk-sharp.spec	27 Oct 2006 22:19:32 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPL
@@ -109,6 +109,9 @@
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0.10-12
+- rebuild
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.10-11
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:20:46 -0700
Subject: rpms/perl-Chatbot-Eliza - New directory
Message-ID: <200610272220.k9RMKkEq024878@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24874/perl-Chatbot-Eliza

Log Message:
Directory /cvs/extras/rpms/perl-Chatbot-Eliza added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:20:56 -0700
Subject: rpms/perl-Chatbot-Eliza/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610272220.k9RMKuvm024939@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24910/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Chatbot-Eliza


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:20:52 -0700
Subject: rpms/perl-Chatbot-Eliza/devel - New directory
Message-ID: <200610272220.k9RMKqel024894@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24874/perl-Chatbot-Eliza/devel

Log Message:
Directory /cvs/extras/rpms/perl-Chatbot-Eliza/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:20:55 -0700
Subject: rpms/perl-Chatbot-Eliza Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610272220.k9RMKt3G024916@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24910

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Chatbot-Eliza


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Chatbot-Eliza
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 27 22:21:32 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:21:32 -0700
Subject: rpms/perl-Chatbot-Eliza import.log,1.1,1.2
Message-ID: <200610272221.k9RMLWUm025017@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24961

Modified Files:
	import.log 
Log Message:
auto-import perl-Chatbot-Eliza-1.04-2.fc6 on branch devel from perl-Chatbot-Eliza-1.04-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Chatbot-Eliza/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Oct 2006 22:20:55 -0000	1.1
+++ import.log	27 Oct 2006 22:21:02 -0000	1.2
@@ -0,0 +1 @@
+perl-Chatbot-Eliza-1_04-2_fc6:HEAD:perl-Chatbot-Eliza-1.04-2.fc6.src.rpm:1161987661



From fedora-extras-commits at redhat.com  Fri Oct 27 22:21:33 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:21:33 -0700
Subject: rpms/perl-Chatbot-Eliza/devel perl-Chatbot-Eliza.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610272221.k9RMLXxS025021@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24961/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Chatbot-Eliza.spec 
Log Message:
auto-import perl-Chatbot-Eliza-1.04-2.fc6 on branch devel from perl-Chatbot-Eliza-1.04-2.fc6.src.rpm


--- NEW FILE perl-Chatbot-Eliza.spec ---
Name:           perl-Chatbot-Eliza
Version:        1.04
Release:        2%{?dist}
Summary:        Implementation of the Eliza algorithm
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Chatbot-Eliza/
Source0:        http://www.cpan.org/authors/id/J/JN/JNOLAN/Chatbot-Eliza-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements the classic Eliza algorithm. The original Eliza
program was written by Joseph Weizenbaum and described in the
Communications of the ACM in 1966. Eliza is a mock Rogerian
psychotherapist. It prompts for user input, and uses a simple
transformation algorithm to change user input into a follow-up question.
The program is designed to give the appearance of understanding.

%prep
%setup -q -n Chatbot-Eliza-%{version}

# quiet rpmlint :)
chmod -x *
chmod +x Chatbot

%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 simple.cgi doctor.txt README simple twobots debug.cgi
%lang(de) %doc deutsch*
%lang(no) %doc norsk*
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Oct 27 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-2
- change summary
- tag certain files in %%doc with %%lang

* Thu Oct 26 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Chatbot-Eliza/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Oct 2006 22:20:55 -0000	1.1
+++ .cvsignore	27 Oct 2006 22:21:03 -0000	1.2
@@ -0,0 +1 @@
+Chatbot-Eliza-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Chatbot-Eliza/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Oct 2006 22:20:55 -0000	1.1
+++ sources	27 Oct 2006 22:21:03 -0000	1.2
@@ -0,0 +1 @@
+754199bbe591eaa11301aee108586fcd  Chatbot-Eliza-1.04.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 27 22:21:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:21:56 -0700
Subject: owners owners.list,1.1875,1.1876
Message-ID: <200610272221.k9RMLuox025066@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24997

Modified Files:
	owners.list 
Log Message:
added perl-Chatbot-Eliza


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1875
retrieving revision 1.1876
diff -u -r1.1875 -r1.1876
--- owners.list	26 Oct 2006 21:45:48 -0000	1.1875
+++ owners.list	27 Oct 2006 22:21:26 -0000	1.1876
@@ -1278,6 +1278,7 @@
 Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-CGI-Untaint-email|Validate an email address|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Chart|Perl modules for producing many types of charts|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Chatbot-Eliza|Implementation of the Eliza algorithm|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Oct 27 22:22:10 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:22:10 -0700
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.2,1.3
Message-ID: <200610272222.k9RMMAwk025090@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtk-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25016

Modified Files:
	gtk-sharp.spec 
Log Message:

rebuild 
 	gtk-sharp.spec 



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-sharp.spec	4 Oct 2006 22:16:57 -0000	1.2
+++ gtk-sharp.spec	27 Oct 2006 22:21:40 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPL
@@ -109,6 +109,9 @@
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0.10-12
+- rebuild
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.10-11
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:22:33 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:22:33 -0700
Subject: rpms/perl-Chatbot-Eliza/devel perl-Chatbot-Eliza.spec,1.1,1.2
Message-ID: <200610272222.k9RMMX3J025127@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25074

Modified Files:
	perl-Chatbot-Eliza.spec 
Log Message:
release bump


Index: perl-Chatbot-Eliza.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chatbot-Eliza/devel/perl-Chatbot-Eliza.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Chatbot-Eliza.spec	27 Oct 2006 22:21:03 -0000	1.1
+++ perl-Chatbot-Eliza.spec	27 Oct 2006 22:22:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Chatbot-Eliza
 Version:        1.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Implementation of the Eliza algorithm
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 27 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-3
+- bump
+
 * Fri Oct 27 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-2
 - change summary
 - tag certain files in %%doc with %%lang



From fedora-extras-commits at redhat.com  Sat Oct 28 00:54:52 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 27 Oct 2006 17:54:52 -0700
Subject: extras-buildsys/utils/pushscript Utils.py, 1.5, 1.6 RepoView.py, 1.1,
	1.2
Message-ID: <200610280054.k9S0sqgR015727@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15705

Modified Files:
	Utils.py RepoView.py 
Log Message:
Also backup "debug/repodata", as we run repoview for debuginfo
packages, too (do we really want that?).

Now even less html files should be rewritten.

Temporarily run repoview non-quiet.



Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Utils.py	27 Oct 2006 21:00:21 -0000	1.5
+++ Utils.py	28 Oct 2006 00:54:49 -0000	1.6
@@ -131,19 +131,6 @@
     if run(cmd):
         raise Exception
     
-    if debuginfo:
-        # If there's a debug subdir, make that a repo, too.
-        dbg_repodir = os.path.join(repodir, 'debug')
-        if os.path.exists(dbg_repodir):
-            print 'Creating repository %s' % dbg_repodir
-            rpdata = os.path.join(dbg_repodir, 'repodata')  # see above
-            debugprint('removing tree %s' % rpdata)
-            if os.path.exists(rpdata) and not DEBUG:
-                shutil.rmtree(rpdata)
-            cmd = '%s -c %s -q %s' % (cfg.createrepo, cfg.cr_cachedir, dbg_repodir)
-            if run(cmd):
-                raise Exception
-
 
 def _restore_repodata_dir(tmpdir,targetdir):  # helper function
     for f in os.listdir(tmpdir):
@@ -158,10 +145,8 @@
             shutil.move(sourcefile,targetfile)
 
 
-def create_repository(cfg,repodir,debuginfo=True):
-    """create/update repository metadata for a given directory and
-    consider a 'debug' sub-repository by default"""
-
+def _backup_create_repository(cfg,repodir,debuginfo):
+    # Create dirs, if missing, so we would create empty backups, too.
     rpdata = os.path.join(repodir,'repodata')
     for d in [repodir,rpdata]:
         if not os.path.exists(d):
@@ -193,6 +178,18 @@
         sys.exit(errno.EPERM)
     
 
+def create_repository(cfg,repodir,debuginfo=True):
+    """create/update repository metadata for a given directory and
+    consider a 'debug' sub-repository by default"""
+
+    _backup_create_repository(cfg,repodir,debuginfo)
+
+    dbg_repodir = os.path.join(repodir, 'debug')
+    # If there's a debug subdir, make that a repo, too.
+    if debuginfo and os.path.exists(dbg_repodir):
+        _backup_create_repository(cfg,dbg_repodir,False)
+
+
 def is_repo_changed(repodir):
     """Checks if the repository has changed and needs to be reindexed"""
     ref_file = os.path.join(repodir, 'repodata', 'repomd.xml')


Index: RepoView.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoView.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepoView.py	29 Sep 2006 16:14:14 -0000	1.1
+++ RepoView.py	28 Oct 2006 00:54:49 -0000	1.2
@@ -20,14 +20,14 @@
 
 def do_repoview(cfg,repodir):
     print 'Generating repoview in %s' % repodir
-    cmd = '%s -q %s' % (cfg.repoview,repodir)
-    Utils.run_and_check(cmd)            
+    cmd = '%s %s' % (cfg.repoview,repodir)
+    Utils.run_and_check(cmd)
 
     # if there's a debug subdir, make that a repo, too.
     dbg_repodir = os.path.join(repodir, 'debug')
     if os.path.exists(dbg_repodir):
         print 'Generating repoview in %s' % dbg_repodir
-        cmd = '%s -q %s' % (cfg.repoview,dbg_repodir)
+        cmd = '%s %s' % (cfg.repoview,dbg_repodir)
         Utils.run_and_check(cmd)
 
 



From fedora-extras-commits at redhat.com  Sat Oct 28 03:29:17 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 20:29:17 -0700
Subject: rpms/daap-sharp/devel .cvsignore, 1.2, 1.3 daap-sharp.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200610280329.k9S3THr0025243@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/daap-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25223

Modified Files:
	.cvsignore daap-sharp.spec sources 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-1
- Update to 0.3.5.
- Disable debug info.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/daap-sharp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2006 02:55:30 -0000	1.2
+++ .cvsignore	28 Oct 2006 03:28:46 -0000	1.3
@@ -1 +1 @@
-daap-sharp-0.3.3.tar.gz
+daap-sharp-0.3.5.tar.gz


Index: daap-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/daap-sharp/devel/daap-sharp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- daap-sharp.spec	16 Sep 2006 16:15:56 -0000	1.4
+++ daap-sharp.spec	28 Oct 2006 03:28:46 -0000	1.5
@@ -1,6 +1,8 @@
+%define debug_package %{nil}
+
 Name:           daap-sharp
-Version:        0.3.3
-Release:        6%{?dist}
+Version:        0.3.5
+Release:        1%{?dist}
 Summary:        DAAP (Digial Audio Access Protocol) implementation using Mono
 
 Group:          System Environment/Libraries
@@ -63,6 +65,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-1
+- Update to 0.3.5.
+- Disable debug info.
+
 * Sat Sep 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.3-6
 - Add requires for pkgconfig for devel.
 - Drop patch for libdir.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/daap-sharp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2006 02:55:30 -0000	1.2
+++ sources	28 Oct 2006 03:28:46 -0000	1.3
@@ -1 +1 @@
-53feead0f3ef75cf5e34cbb4f1d37f30  daap-sharp-0.3.3.tar.gz
+8ec7e4a45367b314a23fed09eea56eab  daap-sharp-0.3.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:33 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:33 -0700
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.21, 1.22
Message-ID: <200610280522.k9S5MXtV031525@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/FC-3

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:05 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:03 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:05 -0000	1.18
+++ sources	28 Oct 2006 05:22:03 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wine-docs.spec	21 Oct 2006 09:06:05 -0000	1.21
+++ wine-docs.spec	28 Oct 2006 05:22:03 -0000	1.22
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:34 -0700
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.25, 1.26
Message-ID: <200610280522.k9S5MYhJ031530@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/FC-4

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:06 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:04 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:06 -0000	1.18
+++ sources	28 Oct 2006 05:22:04 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wine-docs.spec	21 Oct 2006 09:06:06 -0000	1.25
+++ wine-docs.spec	28 Oct 2006 05:22:04 -0000	1.26
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -51,6 +51,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:42 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:42 -0700
Subject: rpms/wine-docs/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.18, 1.19
Message-ID: <200610280522.k9S5Mg2b031545@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/devel

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:13 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:11 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:13 -0000	1.18
+++ sources	28 Oct 2006 05:22:11 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine-docs.spec	21 Oct 2006 09:06:13 -0000	1.18
+++ wine-docs.spec	28 Oct 2006 05:22:11 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:40 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:40 -0700
Subject: rpms/wine-docs/FC-5 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.18, 1.19
Message-ID: <200610280522.k9S5Me4x031535@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/FC-5

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:12 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:10 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:12 -0000	1.18
+++ sources	28 Oct 2006 05:22:10 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine-docs.spec	21 Oct 2006 09:06:12 -0000	1.18
+++ wine-docs.spec	28 Oct 2006 05:22:10 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:41 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:41 -0700
Subject: rpms/wine-docs/FC-6 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.18, 1.19
Message-ID: <200610280522.k9S5MfY4031540@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/FC-6

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:13 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:11 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:13 -0000	1.18
+++ sources	28 Oct 2006 05:22:11 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-6/wine-docs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine-docs.spec	21 Oct 2006 09:06:13 -0000	1.18
+++ wine-docs.spec	28 Oct 2006 05:22:11 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:41:10 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Fri, 27 Oct 2006 22:41:10 -0700
Subject: rpms/dircproxy/devel .cvsignore, 1.1, 1.2 dircproxy.spec, 1.1,
	1.2 sources, 1.1, 1.2 dircproxy-1.2.0-gcc4.patch, 1.1,
	NONE dircproxy-1.2.0-md5inversion.patch, 1.1, NONE
Message-ID: <200610280541.k9S5fAlv031862@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/dircproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31840

Modified Files:
	.cvsignore dircproxy.spec sources 
Removed Files:
	dircproxy-1.2.0-gcc4.patch dircproxy-1.2.0-md5inversion.patch 
Log Message:
bump to 1.2.0beta2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2006 15:11:12 -0000	1.1
+++ .cvsignore	28 Oct 2006 05:40:39 -0000	1.2
@@ -0,0 +1 @@
+dircproxy-1.2.0-beta2.tar.bz


Index: dircproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/dircproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dircproxy.spec	14 Sep 2006 15:11:38 -0000	1.1
+++ dircproxy.spec	28 Oct 2006 05:40:39 -0000	1.2
@@ -1,17 +1,15 @@
 Name:           dircproxy
 Version:        1.2.0
-Release:        0.4.beta%{?dist}
+%define betaver beta2
+Release:        0.5.%{betaver}%{?dist}
 Summary:        IRC proxy server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://dircproxy.securiweb.net/
-Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-beta.tar.bz
+Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-%{betaver}.tar.bz
 Source1:        dircproxy.init
 Source2:        dircproxy.sysconfig
-Source3:        README.ssl
-Patch0:         dircproxy-1.2.0-gcc4.patch
-Patch1:         dircproxy-1.2.0-md5inversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -27,10 +25,7 @@
 it'll let you know what you missed.
 
 %prep
-%setup -q -n %{name}-%{version}-beta
-%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .md5inv
-cp %{SOURCE3} .
+%setup -q -n %{name}-%{version}-%{betaver}
 
 %build
 %configure --enable-ssl
@@ -82,6 +77,9 @@
 %{_datadir}/dircproxy/
 
 %changelog
+* Tue Oct 10 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.5.beta2
+- Update to 1.2.0-beta2
+
 * Thu Sep 14 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.4.beta
 - Correct perms on sysconfig file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2006 15:11:12 -0000	1.1
+++ sources	28 Oct 2006 05:40:39 -0000	1.2
@@ -0,0 +1 @@
+850443437f709276ff21a173bbf98456  dircproxy-1.2.0-beta2.tar.bz


--- dircproxy-1.2.0-gcc4.patch DELETED ---


--- dircproxy-1.2.0-md5inversion.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 28 05:44:18 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Fri, 27 Oct 2006 22:44:18 -0700
Subject: rpms/dircproxy/FC-6 .cvsignore, 1.1, 1.2 dircproxy.spec, 1.1,
	1.2 sources, 1.1, 1.2 dircproxy-1.2.0-gcc4.patch, 1.1,
	NONE dircproxy-1.2.0-md5inversion.patch, 1.1, NONE
Message-ID: <200610280544.k9S5iIcv031945@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/dircproxy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31925

Modified Files:
	.cvsignore dircproxy.spec sources 
Removed Files:
	dircproxy-1.2.0-gcc4.patch dircproxy-1.2.0-md5inversion.patch 
Log Message:
bump to 1.2.0beta2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2006 15:11:12 -0000	1.1
+++ .cvsignore	28 Oct 2006 05:43:48 -0000	1.2
@@ -0,0 +1 @@
+dircproxy-1.2.0-beta2.tar.bz


Index: dircproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/FC-6/dircproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dircproxy.spec	14 Sep 2006 15:11:38 -0000	1.1
+++ dircproxy.spec	28 Oct 2006 05:43:48 -0000	1.2
@@ -1,17 +1,15 @@
 Name:           dircproxy
 Version:        1.2.0
-Release:        0.4.beta%{?dist}
+%define betaver beta2
+Release:        0.5.%{betaver}%{?dist}
 Summary:        IRC proxy server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://dircproxy.securiweb.net/
-Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-beta.tar.bz
+Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-%{betaver}.tar.bz
 Source1:        dircproxy.init
 Source2:        dircproxy.sysconfig
-Source3:        README.ssl
-Patch0:         dircproxy-1.2.0-gcc4.patch
-Patch1:         dircproxy-1.2.0-md5inversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -27,10 +25,7 @@
 it'll let you know what you missed.
 
 %prep
-%setup -q -n %{name}-%{version}-beta
-%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .md5inv
-cp %{SOURCE3} .
+%setup -q -n %{name}-%{version}-%{betaver}
 
 %build
 %configure --enable-ssl
@@ -82,6 +77,9 @@
 %{_datadir}/dircproxy/
 
 %changelog
+* Tue Oct 10 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.5.beta2
+- Update to 1.2.0-beta2
+
 * Thu Sep 14 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.4.beta
 - Correct perms on sysconfig file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2006 15:11:12 -0000	1.1
+++ sources	28 Oct 2006 05:43:48 -0000	1.2
@@ -0,0 +1 @@
+850443437f709276ff21a173bbf98456  dircproxy-1.2.0-beta2.tar.bz


--- dircproxy-1.2.0-gcc4.patch DELETED ---


--- dircproxy-1.2.0-md5inversion.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 28 05:51:59 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:51:59 -0700
Subject: rpms/wine/FC-6 .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 wine.spec,
	1.37, 1.38
Message-ID: <200610280551.k9S5pxSU032106@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/FC-6

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 13:22:51 -0000	1.24
+++ .cvsignore	28 Oct 2006 05:51:29 -0000	1.25
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Oct 2006 13:22:51 -0000	1.25
+++ sources	28 Oct 2006 05:51:29 -0000	1.26
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wine.spec	18 Oct 2006 13:22:51 -0000	1.37
+++ wine.spec	28 Oct 2006 05:51:29 -0000	1.38
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -51,6 +51,7 @@
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  giflib-devel
 BuildRequires:  cups-devel
@@ -690,6 +691,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:51:58 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:51:58 -0700
Subject: rpms/wine/FC-5 .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 wine.spec,
	1.37, 1.38
Message-ID: <200610280551.k9S5pwwi032101@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 13:22:50 -0000	1.24
+++ .cvsignore	28 Oct 2006 05:51:28 -0000	1.25
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Oct 2006 13:22:50 -0000	1.25
+++ sources	28 Oct 2006 05:51:28 -0000	1.26
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wine.spec	18 Oct 2006 13:22:50 -0000	1.37
+++ wine.spec	28 Oct 2006 05:51:28 -0000	1.38
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -51,6 +51,7 @@
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  giflib-devel
 BuildRequires:  cups-devel
@@ -690,6 +691,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:51:58 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:51:58 -0700
Subject: rpms/wine/FC-4 .cvsignore, 1.21, 1.22 sources, 1.22, 1.23 wine.spec,
	1.31, 1.32
Message-ID: <200610280552.k9S5pw2j032098@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	21 Oct 2006 08:20:41 -0000	1.21
+++ .cvsignore	28 Oct 2006 05:51:27 -0000	1.22
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	21 Oct 2006 08:20:41 -0000	1.22
+++ sources	28 Oct 2006 05:51:27 -0000	1.23
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wine.spec	21 Oct 2006 08:20:41 -0000	1.31
+++ wine.spec	28 Oct 2006 05:51:28 -0000	1.32
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -678,6 +678,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:51:57 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:51:57 -0700
Subject: rpms/wine/FC-3 .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 wine.spec,
	1.28, 1.29
Message-ID: <200610280551.k9S5pvXX032093@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	21 Oct 2006 08:20:40 -0000	1.20
+++ .cvsignore	28 Oct 2006 05:51:27 -0000	1.21
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	21 Oct 2006 08:20:40 -0000	1.21
+++ sources	28 Oct 2006 05:51:27 -0000	1.22
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wine.spec	21 Oct 2006 08:20:40 -0000	1.28
+++ wine.spec	28 Oct 2006 05:51:27 -0000	1.29
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -678,6 +678,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:52:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:52:05 -0700
Subject: rpms/wine/devel .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 wine.spec,
	1.37, 1.38
Message-ID: <200610280552.k9S5q5Ll032113@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 13:22:51 -0000	1.24
+++ .cvsignore	28 Oct 2006 05:51:35 -0000	1.25
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Oct 2006 13:22:51 -0000	1.25
+++ sources	28 Oct 2006 05:51:35 -0000	1.26
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wine.spec	18 Oct 2006 13:22:51 -0000	1.37
+++ wine.spec	28 Oct 2006 05:51:35 -0000	1.38
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -51,6 +51,7 @@
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  giflib-devel
 BuildRequires:  cups-devel
@@ -690,6 +691,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:56:27 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 22:56:27 -0700
Subject: rpms/scribes/devel .cvsignore, 1.5, 1.6 scribes.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200610280556.k9S5uRAM032350@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32330/devel

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
New upstream release (0.2.9.89)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2006 03:46:43 -0000	1.5
+++ .cvsignore	28 Oct 2006 05:55:57 -0000	1.6
@@ -1 +1 @@
-scribes-0.2.9.88.tar.bz2
+scribes-0.2.9.89.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scribes.spec	17 Oct 2006 03:49:39 -0000	1.14
+++ scribes.spec	28 Oct 2006 05:55:57 -0000	1.15
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define python_module_name	SCRIBES
+%define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.88
+Version:	0.2.9.89
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
+- Update to new upstream version (0.2.9.89)
+
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
 - Don't hardcode a Pysco requirement at all; but note that option in the
   %%description for those on x86 who want it, since the %ifarch conditional


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2006 03:46:43 -0000	1.5
+++ sources	28 Oct 2006 05:55:57 -0000	1.6
@@ -1 +1 @@
-cfcd7e4627b5ff4d77bf20bcd4b39535  scribes-0.2.9.88.tar.bz2
+7e94cc1ddb8ac32820fabefaf9ed305d  scribes-0.2.9.89.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 06:00:07 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 23:00:07 -0700
Subject: rpms/scribes/FC-6 .cvsignore, 1.5, 1.6 scribes.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200610280600.k9S6075r032431@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32403

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
New upstream release (0.2.9.89)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2006 03:46:43 -0000	1.5
+++ .cvsignore	28 Oct 2006 05:59:37 -0000	1.6
@@ -1 +1 @@
-scribes-0.2.9.88.tar.bz2
+scribes-0.2.9.89.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scribes.spec	17 Oct 2006 03:49:39 -0000	1.14
+++ scribes.spec	28 Oct 2006 05:59:37 -0000	1.15
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define python_module_name	SCRIBES
+%define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.88
+Version:	0.2.9.89
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
+- Update to new upstream version (0.2.9.89)
+
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
 - Don't hardcode a Pysco requirement at all; but note that option in the
   %%description for those on x86 who want it, since the %ifarch conditional


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2006 03:46:43 -0000	1.5
+++ sources	28 Oct 2006 05:59:37 -0000	1.6
@@ -1 +1 @@
-cfcd7e4627b5ff4d77bf20bcd4b39535  scribes-0.2.9.88.tar.bz2
+7e94cc1ddb8ac32820fabefaf9ed305d  scribes-0.2.9.89.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 06:16:42 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 27 Oct 2006 23:16:42 -0700
Subject: rpms/gaim-otr/devel gaim-beta4.patch,NONE,1.1
Message-ID: <200610280616.k9S6GgKN003028@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3020

Added Files:
	gaim-beta4.patch 
Log Message:
Patch for compiling against gaim 2.0.0-beta4


gaim-beta4.patch:

--- NEW FILE gaim-beta4.patch ---
diff -r -c -N gaim-otr/gtk-dialog.c gaim-otr-new/gtk-dialog.c
*** gaim-otr/gtk-dialog.c	2005-12-18 13:33:48.000000000 -0500
--- gaim-otr-new/gtk-dialog.c	2006-10-28 02:01:00.000000000 -0400
***************
*** 30,36 ****
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include "gtkstock.h"
  #endif
  #include "plugin.h"
  #include "notify.h"
--- 30,36 ----
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include <gtk/gtkstock.h>
  #endif
  #include "plugin.h"
  #include "notify.h"
***************
*** 648,662 ****
  
      switch (type) {
  	case GAIM_NOTIFY_MSG_ERROR:
! 	    icon_name = GAIM_STOCK_DIALOG_ERROR;
  	    break;
  
  	case GAIM_NOTIFY_MSG_WARNING:
! 	    icon_name = GAIM_STOCK_DIALOG_WARNING;
  	    break;
  
  	case GAIM_NOTIFY_MSG_INFO:
! 	    icon_name = GAIM_STOCK_DIALOG_INFO;
  	    break;
  
  	default:
--- 648,662 ----
  
      switch (type) {
  	case GAIM_NOTIFY_MSG_ERROR:
! 	    icon_name = GTK_STOCK_DIALOG_ERROR;
  	    break;
  
  	case GAIM_NOTIFY_MSG_WARNING:
! 	    icon_name = GTK_STOCK_DIALOG_WARNING;
  	    break;
  
  	case GAIM_NOTIFY_MSG_INFO:
! 	    icon_name = GTK_STOCK_DIALOG_INFO;
  	    break;
  
  	default:



From fedora-extras-commits at redhat.com  Sat Oct 28 06:17:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 27 Oct 2006 23:17:45 -0700
Subject: fedora-security/audit fe3, 1.23, 1.24 fe4, 1.83, 1.84 fe5, 1.90,
	1.91 fe6, 1.3, 1.4
Message-ID: <200610280617.k9S6HjUg003073@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3049

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-4513 VULNERABLE (wv) #212696


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fe3	27 Oct 2006 17:18:16 -0000	1.23
+++ fe3	28 Oct 2006 06:17:42 -0000	1.24
@@ -5,6 +5,7 @@
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
+CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4182 version (clamav, fixed 0.88.5) #210973


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fe4	27 Oct 2006 17:18:16 -0000	1.83
+++ fe4	28 Oct 2006 06:17:42 -0000	1.84
@@ -27,6 +27,7 @@
 CVE-2006-4568 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- fe5	27 Oct 2006 17:18:16 -0000	1.90
+++ fe5	28 Oct 2006 06:17:42 -0000	1.91
@@ -27,6 +27,7 @@
 CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fe6	27 Oct 2006 17:18:16 -0000	1.3
+++ fe6	28 Oct 2006 06:17:42 -0000	1.4
@@ -27,6 +27,7 @@
 CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163



From fedora-extras-commits at redhat.com  Sat Oct 28 06:34:14 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 27 Oct 2006 23:34:14 -0700
Subject: rpms/gaim-otr/devel gaim-otr.spec,1.23,1.24
Message-ID: <200610280634.k9S6YEXE003168@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3152

Modified Files:
	gaim-otr.spec 
Log Message:
* Sat Oct 28 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.3.20060921cvs
- Added patch for gaim 2.0.0-beta4



Index: gaim-otr.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-otr/devel/gaim-otr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gaim-otr.spec	2 Oct 2006 22:30:06 -0000	1.23
+++ gaim-otr.spec	28 Oct 2006 06:33:44 -0000	1.24
@@ -1,17 +1,18 @@
 Summary: Off-The-Record Messaging plugin for GAIM
 Name: gaim-otr
 Version: 3.0.1
-Release: 0.2.20060921cvs%{?dist}
+Release: 0.3.20060921cvs%{?dist}
 #Source: http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
 Source: %{name}-20060712.tar.gz
+Patch0: gaim-beta4.patch
 Url: http://www.cypherpunks.ca/otr/
 License: GPL
 Group: Applications/Internet
 Provides: otr-plugin = %{version}
 Obsoletes: otr-plugin
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gaim >= 2.0.0, libotr >= 3.0.0
-BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0, autoconf, automake, libtool, gaim-devel >= 2.0.0
+Requires: gaim >= 2.0.0-0.17.beta4, libotr >= 3.0.0
+BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0, autoconf, automake, libtool, gaim-devel >= 2.0.0-0.17.beta4
 
 %description 
 
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .beta4
 # temporary because we are using a cvs snapshot for now:
 #autoreconf
 autoreconf -s -i -v -f 
@@ -47,6 +49,9 @@
 %{_libdir}/gaim/gaim-otr.so
 
 %changelog
+* Sat Oct 28 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.3.20060921cvs
+- Added patch for gaim 2.0.0-beta4
+
 * Mon Oct  2 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.2.20060921cvs
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 06:36:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 27 Oct 2006 23:36:23 -0700
Subject: fedora-security/audit fe3, 1.24, 1.25 fe4, 1.84, 1.85 fe5, 1.91,
	1.92 fe6, 1.4, 1.5
Message-ID: <200610280636.k9S6aNQ7003261@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3237

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-4513 ** (abiword) #212698


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fe3	28 Oct 2006 06:17:42 -0000	1.24
+++ fe3	28 Oct 2006 06:36:21 -0000	1.25
@@ -6,6 +6,7 @@
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4182 version (clamav, fixed 0.88.5) #210973


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fe4	28 Oct 2006 06:17:42 -0000	1.84
+++ fe4	28 Oct 2006 06:36:21 -0000	1.85
@@ -28,6 +28,7 @@
 CVE-2006-4566 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- fe5	28 Oct 2006 06:17:42 -0000	1.91
+++ fe5	28 Oct 2006 06:36:21 -0000	1.92
@@ -28,6 +28,7 @@
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fe6	28 Oct 2006 06:17:42 -0000	1.4
+++ fe6	28 Oct 2006 06:36:21 -0000	1.5
@@ -28,6 +28,7 @@
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163



From fedora-extras-commits at redhat.com  Sat Oct 28 06:38:02 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 23:38:02 -0700
Subject: rpms/scribes/devel scribes.spec,1.15,1.16
Message-ID: <200610280638.k9S6c2xQ003294@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3278

Modified Files:
	scribes.spec 
Log Message:
Drop "--add-category X-Fedora" in desktop-file-install; fix last date entry in %changelog


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scribes.spec	28 Oct 2006 05:55:57 -0000	1.15
+++ scribes.spec	28 Oct 2006 06:37:32 -0000	1.16
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.89
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -95,7 +95,6 @@
 make DESTDIR=%{buildroot} install
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
@@ -153,7 +152,11 @@
 
 
 %changelog
-* Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
+* Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-2
+- Drop "--add-category X-Fedora" in desktop-file-install invocation
+- Fix last date entry in %%changelog
+
+* Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
 - Update to new upstream version (0.2.9.89)
 
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1



From fedora-extras-commits at redhat.com  Sat Oct 28 06:48:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 27 Oct 2006 23:48:24 -0700
Subject: fedora-security/audit fe3, 1.25, 1.26 fe4, 1.85, 1.86 fe5, 1.92,
	1.93 fe6, 1.5, 1.6
Message-ID: <200610280648.k9S6mO8D003353@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3329

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-560[12] (xsupplicant)


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fe3	28 Oct 2006 06:36:21 -0000	1.25
+++ fe3	28 Oct 2006 06:48:21 -0000	1.26
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-5602 VULNERABLE (xsupplicant) #212699
+CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- fe4	28 Oct 2006 06:36:21 -0000	1.85
+++ fe4	28 Oct 2006 06:48:21 -0000	1.86
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
+CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- fe5	28 Oct 2006 06:36:21 -0000	1.92
+++ fe5	28 Oct 2006 06:48:21 -0000	1.93
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
+CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fe6	28 Oct 2006 06:36:21 -0000	1.5
+++ fe6	28 Oct 2006 06:48:21 -0000	1.6
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
+CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355



From fedora-extras-commits at redhat.com  Sat Oct 28 06:49:50 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 23:49:50 -0700
Subject: rpms/scribes/FC-6 scribes.spec,1.15,1.16
Message-ID: <200610280649.k9S6noHT003394@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3364/FC-6

Modified Files:
	scribes.spec 
Log Message:
Update dbus-python dependency version (>= 0.70)


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scribes.spec	28 Oct 2006 05:59:37 -0000	1.15
+++ scribes.spec	28 Oct 2006 06:49:20 -0000	1.16
@@ -25,7 +25,7 @@
 BuildRequires:	gnome-doc-utils
 BuildRequires:	GConf2
 
-Requires:	dbus-python >= 0.60
+Requires:	dbus-python >= 0.70
 Requires:	pygobject2
 Requires:	pygtk2 >= 2.10
 Requires:	python >= 2.4
@@ -155,6 +155,7 @@
 %changelog
 * Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
 - Update to new upstream version (0.2.9.89)
+- Update dbus-python dependency version (>= 0.70)
 
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
 - Don't hardcode a Pysco requirement at all; but note that option in the



From fedora-extras-commits at redhat.com  Sat Oct 28 06:49:51 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 23:49:51 -0700
Subject: rpms/scribes/devel scribes.spec,1.16,1.17
Message-ID: <200610280649.k9S6npu8003397@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3364/devel

Modified Files:
	scribes.spec 
Log Message:
Update dbus-python dependency version (>= 0.70)


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scribes.spec	28 Oct 2006 06:37:32 -0000	1.16
+++ scribes.spec	28 Oct 2006 06:49:20 -0000	1.17
@@ -25,7 +25,7 @@
 BuildRequires:	gnome-doc-utils
 BuildRequires:	GConf2
 
-Requires:	dbus-python >= 0.60
+Requires:	dbus-python >= 0.70
 Requires:	pygobject2
 Requires:	pygtk2 >= 2.10
 Requires:	python >= 2.4
@@ -155,6 +155,7 @@
 * Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-2
 - Drop "--add-category X-Fedora" in desktop-file-install invocation
 - Fix last date entry in %%changelog
+- Update dbus-python dependency version (>= 0.70)
 
 * Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
 - Update to new upstream version (0.2.9.89)



From fedora-extras-commits at redhat.com  Sat Oct 28 07:05:42 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:05:42 -0700
Subject: rpms/gtksourceview-sharp/FC-5 gtksourceview-sharp.spec,1.8,1.9
Message-ID: <200610280705.k9S75geo006422@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtksourceview-sharp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6402

Modified Files:
	gtksourceview-sharp.spec 
Log Message:

rebuild 
 	gtksourceview-sharp.spec 



Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview-sharp/FC-5/gtksourceview-sharp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtksourceview-sharp.spec	7 Sep 2006 20:11:58 -0000	1.8
+++ gtksourceview-sharp.spec	28 Oct 2006 07:05:11 -0000	1.9
@@ -9,7 +9,7 @@
 Summary: A C sharp binder for gtksourceview
 Name: gtksourceview-sharp
 Version: 2.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://go-mono.com/sources-latest/%{name}-%{version}/%{name}-%{version}-%{extra}.tar.gz
@@ -68,6 +68,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-24
+- rebuild
+
 * Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-23
 - D'oh!
 



From fedora-extras-commits at redhat.com  Sat Oct 28 07:09:07 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:09:07 -0700
Subject: rpms/gtksourceview-sharp/FC-6 gtksourceview-sharp.spec,1.10,1.11
Message-ID: <200610280709.k9S7971B006538@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtksourceview-sharp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6522

Modified Files:
	gtksourceview-sharp.spec 
Log Message:

rebuild 
 	gtksourceview-sharp.spec 



Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview-sharp/FC-6/gtksourceview-sharp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtksourceview-sharp.spec	7 Sep 2006 20:12:51 -0000	1.10
+++ gtksourceview-sharp.spec	28 Oct 2006 07:08:37 -0000	1.11
@@ -9,7 +9,7 @@
 Summary: A C sharp binder for gtksourceview
 Name: gtksourceview-sharp
 Version: 2.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://go-mono.com/sources-latest/%{name}-%{version}/%{name}-%{version}-%{extra}.tar.gz
@@ -68,6 +68,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-24
+- rebuild
+
 * Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-23
 - D'oh!
 



From fedora-extras-commits at redhat.com  Sat Oct 28 07:14:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:14:01 -0700
Subject: rpms/gtksourceview-sharp/devel gtksourceview-sharp.spec,1.10,1.11
Message-ID: <200610280714.k9S7E1QV006614@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtksourceview-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598

Modified Files:
	gtksourceview-sharp.spec 
Log Message:

rebuild 
 	gtksourceview-sharp.spec 



Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview-sharp/devel/gtksourceview-sharp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtksourceview-sharp.spec	7 Sep 2006 20:12:51 -0000	1.10
+++ gtksourceview-sharp.spec	28 Oct 2006 07:13:31 -0000	1.11
@@ -9,7 +9,7 @@
 Summary: A C sharp binder for gtksourceview
 Name: gtksourceview-sharp
 Version: 2.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://go-mono.com/sources-latest/%{name}-%{version}/%{name}-%{version}-%{extra}.tar.gz
@@ -68,6 +68,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-24
+- rebuild
+
 * Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-23
 - D'oh!
 



From fedora-extras-commits at redhat.com  Sat Oct 28 07:16:28 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:16:28 -0700
Subject: rpms/anjuta/FC-6 anjuta2.spec,1.1,1.2
Message-ID: <200610280716.k9S7GSUt006691@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6664

Modified Files:
	anjuta2.spec 
Log Message:

rebuild against new libopts 
 	anjuta2.spec 



Index: anjuta2.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-6/anjuta2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anjuta2.spec	18 Oct 2006 20:42:16 -0000	1.1
+++ anjuta2.spec	28 Oct 2006 07:15:58 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
@@ -125,6 +125,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-9
+- rebuild for newer libopts
+
 * Tue Oct 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-8
 - fix the INSTALL line in install
 - fixed encoding on text files



From fedora-extras-commits at redhat.com  Sat Oct 28 07:20:59 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:20:59 -0700
Subject: rpms/anjuta/devel anjuta2.spec,1.1,1.2
Message-ID: <200610280720.k9S7Kxc3006776@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6748

Modified Files:
	anjuta2.spec 
Log Message:

rebuild against newer libopts		
 	anjuta2.spec 



Index: anjuta2.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anjuta2.spec	18 Oct 2006 20:42:16 -0000	1.1
+++ anjuta2.spec	28 Oct 2006 07:20:28 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
@@ -125,6 +125,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-9
+- rebuild against new libopts
+
 * Tue Oct 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-8
 - fix the INSTALL line in install
 - fixed encoding on text files



From fedora-extras-commits at redhat.com  Sat Oct 28 07:39:43 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 00:39:43 -0700
Subject: rpms/scribes/devel scribes.spec,1.17,1.18
Message-ID: <200610280739.k9S7dhWJ006895@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6879/devel

Modified Files:
	scribes.spec 
Log Message:
Drop Application category from installed .desktop file


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scribes.spec	28 Oct 2006 06:49:20 -0000	1.17
+++ scribes.spec	28 Oct 2006 07:39:13 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.89
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -95,6 +95,7 @@
 make DESTDIR=%{buildroot} install
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
+	--remove-category=Application	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
@@ -152,6 +153,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-3
+- Drop Application category from the installed .desktop file
+
 * Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-2
 - Drop "--add-category X-Fedora" in desktop-file-install invocation
 - Fix last date entry in %%changelog



From fedora-extras-commits at redhat.com  Sat Oct 28 08:07:29 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 28 Oct 2006 01:07:29 -0700
Subject: rpms/php-pear-Log/devel xml2changelog, NONE, 1.1 .cvsignore, 1.2,
	1.3 php-pear-Log.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610280807.k9S87T2s010040@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10019

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Added Files:
	xml2changelog 
Log Message:
	update to 1.9.9



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 19:59:09 -0000	1.2
+++ .cvsignore	28 Oct 2006 08:06:59 -0000	1.3
@@ -1 +1 @@
-Log-1.9.8.tgz
+Log-1.9.9.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/php-pear-Log.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Log.spec	7 Sep 2006 19:59:09 -0000	1.1
+++ php-pear-Log.spec	28 Oct 2006 08:06:59 -0000	1.2
@@ -1,20 +1,16 @@
-# default values when new /etc/rpm/macros.pear not present
-%{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Log
 
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.9.8
-Release:        5%{?dist}
+Version:        1.9.9
+Release:        1%{?dist}
 License:        PHP License
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:            http://pear.php.net/package/Log
 
@@ -47,7 +43,8 @@
 
 %prep
 %setup -c -q
-mv package2.xml Log-%{version}/Log.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
@@ -58,7 +55,7 @@
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Log.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -69,8 +66,7 @@
 
 popd
 # Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/* docdir
+mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
 
 %check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
@@ -80,23 +76,32 @@
 rm -rf %{buildroot}
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Log.xml >/dev/null || :
+%{__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 Log >/dev/null || :
+    %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE docdir/Log/docs/*
+%doc CHANGELOG LICENSE docdir/*
 %{pear_phpdir}/Log
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/Log.xml
+%{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Sat Oct 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.9-1
+- update to 1.9.9
+
+* Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-6
+- add CHANGELOG to %%doc
+
+* Fri Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5.fc5.1
+- rebuild for FC5
+
 * Thu Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5
 - BR php-pear >= 1:1.4.9-1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 19:59:09 -0000	1.2
+++ sources	28 Oct 2006 08:06:59 -0000	1.3
@@ -1 +1 @@
-d899cfa511b9bca9b54286245515586d  Log-1.9.8.tgz
+23f28e7fa803ddff7d68fec2850922d1  Log-1.9.9.tgz



From fedora-extras-commits at redhat.com  Sat Oct 28 08:19:23 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 28 Oct 2006 01:19:23 -0700
Subject: rpms/php-pear-Log/FC-6 xml2changelog, NONE, 1.1 .cvsignore, 1.2,
	1.3 php-pear-Log.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610280819.k9S8JNO0010169@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10134

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Added Files:
	xml2changelog 
Log Message:
	version 1.9.9



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 19:59:09 -0000	1.2
+++ .cvsignore	28 Oct 2006 08:18:53 -0000	1.3
@@ -1 +1 @@
-Log-1.9.8.tgz
+Log-1.9.9.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/php-pear-Log.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Log.spec	7 Sep 2006 19:59:09 -0000	1.1
+++ php-pear-Log.spec	28 Oct 2006 08:18:53 -0000	1.2
@@ -1,20 +1,16 @@
-# default values when new /etc/rpm/macros.pear not present
-%{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Log
 
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.9.8
-Release:        5%{?dist}
+Version:        1.9.9
+Release:        1%{?dist}
 License:        PHP License
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:            http://pear.php.net/package/Log
 
@@ -47,7 +43,8 @@
 
 %prep
 %setup -c -q
-mv package2.xml Log-%{version}/Log.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
@@ -58,7 +55,7 @@
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Log.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -69,8 +66,7 @@
 
 popd
 # Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/* docdir
+mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
 
 %check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
@@ -80,23 +76,32 @@
 rm -rf %{buildroot}
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Log.xml >/dev/null || :
+%{__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 Log >/dev/null || :
+    %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE docdir/Log/docs/*
+%doc CHANGELOG LICENSE docdir/*
 %{pear_phpdir}/Log
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/Log.xml
+%{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Sat Oct 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.9-1
+- update to 1.9.9
+
+* Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-6
+- add CHANGELOG to %%doc
+
+* Fri Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5.fc5.1
+- rebuild for FC5
+
 * Thu Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5
 - BR php-pear >= 1:1.4.9-1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 19:59:09 -0000	1.2
+++ sources	28 Oct 2006 08:18:53 -0000	1.3
@@ -1 +1 @@
-d899cfa511b9bca9b54286245515586d  Log-1.9.8.tgz
+23f28e7fa803ddff7d68fec2850922d1  Log-1.9.9.tgz



From fedora-extras-commits at redhat.com  Sat Oct 28 08:21:13 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 28 Oct 2006 01:21:13 -0700
Subject: rpms/php-pear-Log/FC-5 xml2changelog, NONE, 1.1 .cvsignore, 1.2,
	1.3 php-pear-Log.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610280821.k9S8LDgj010265@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10235

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Added Files:
	xml2changelog 
Log Message:
	version 1.9.9



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 19:59:09 -0000	1.2
+++ .cvsignore	28 Oct 2006 08:20:43 -0000	1.3
@@ -1 +1 @@
-Log-1.9.8.tgz
+Log-1.9.9.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/php-pear-Log.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Log.spec	8 Sep 2006 16:56:59 -0000	1.2
+++ php-pear-Log.spec	28 Oct 2006 08:20:43 -0000	1.3
@@ -1,20 +1,16 @@
-# default values when new /etc/rpm/macros.pear not present
-%{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Log
 
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.9.8
-Release:        5%{?dist}.1
+Version:        1.9.9
+Release:        1%{?dist}
 License:        PHP License
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:            http://pear.php.net/package/Log
 
@@ -47,7 +43,8 @@
 
 %prep
 %setup -c -q
-mv package2.xml Log-%{version}/Log.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
@@ -58,7 +55,7 @@
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Log.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -69,8 +66,7 @@
 
 popd
 # Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/* docdir
+mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
 
 %check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
@@ -80,23 +76,29 @@
 rm -rf %{buildroot}
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Log.xml >/dev/null || :
+%{__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 Log >/dev/null || :
+    %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE docdir/Log/docs/*
+%doc CHANGELOG LICENSE docdir/*
 %{pear_phpdir}/Log
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/Log.xml
+%{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Sat Oct 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.9-1
+- update to 1.9.9
+
+* Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-6
+- add CHANGELOG to %%doc
+
 * Fri Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5.fc5.1
 - rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 19:59:09 -0000	1.2
+++ sources	28 Oct 2006 08:20:43 -0000	1.3
@@ -1 +1 @@
-d899cfa511b9bca9b54286245515586d  Log-1.9.8.tgz
+23f28e7fa803ddff7d68fec2850922d1  Log-1.9.9.tgz



From fedora-extras-commits at redhat.com  Sat Oct 28 08:25:23 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Sat, 28 Oct 2006 01:25:23 -0700
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.10, 1.11
Message-ID: <200610280825.k9S8PN0F010335@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10319

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
fix BRs


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jack-audio-connection-kit.spec	24 Oct 2006 08:52:48 -0000	1.10
+++ jack-audio-connection-kit.spec	28 Oct 2006 08:24:53 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,7 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-BuildRequires: libfreebob >= 1.0.0
+BuildRequires: libfreebob-devel >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -120,6 +120,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Sat Oct 28 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-3
+- fix BuildRequires: libfreebob -> libfreebob-devel
+
 * Tue Oct 24 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.1
 - rebuild with libfreebob (should closed #211751)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 08:27:34 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Sat, 28 Oct 2006 01:27:34 -0700
Subject: rpms/jack-audio-connection-kit/FC-6 jack-audio-connection-kit.spec, 
	1.10, 1.11
Message-ID: <200610280827.k9S8RYDe010404@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10388

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
fix BRs


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/FC-6/jack-audio-connection-kit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jack-audio-connection-kit.spec	24 Oct 2006 09:27:20 -0000	1.10
+++ jack-audio-connection-kit.spec	28 Oct 2006 08:27:04 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,7 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-BuildRequires: libfreebob >= 1.0.0
+BuildRequires: libfreebob-devel >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -120,6 +120,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Sat Oct 28 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-3
+- fix BuildRequires: libfreebob -> libfreebob-devel
+
 * Tue Oct 24 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.1
 - rebuild with libfreebob (should closed #211751)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 08:54:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 01:54:08 -0700
Subject: rpms/wv/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5 wv.spec,1.14,1.15
Message-ID: <200610280854.k9S8s8AR010594@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/FC-5

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Dec 2005 21:11:53 -0000	1.4
+++ .cvsignore	28 Oct 2006 08:53:38 -0000	1.5
@@ -1 +1 @@
-wv-1.2.0.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Dec 2005 21:11:53 -0000	1.4
+++ sources	28 Oct 2006 08:53:38 -0000	1.5
@@ -1 +1 @@
-b6319d5e75611fe2210453b5feb82c0c  wv-1.2.0.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-5/wv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wv.spec	22 Feb 2006 00:03:54 -0000	1.14
+++ wv.spec	28 Oct 2006 08:53:38 -0000	1.15
@@ -1,11 +1,11 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.0
-Release:    3%{?dist}
+Version:    1.2.4
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.2.0.tar.gz
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
 #Patch0:     wv-wvtext-tmp.patch
 #Patch1:     wv-1.0.3-oledecod.patch
 #Patch2:     wv-1.0.3-gcc4.patch
@@ -85,6 +85,18 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
+- rebuild (releases 1 to 7, cvs problem)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-1
+- version 1.2.1
+
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
 - don't build the static lib
 



From fedora-extras-commits at redhat.com  Sat Oct 28 08:54:10 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 01:54:10 -0700
Subject: rpms/wv/devel .cvsignore,1.5,1.6 sources,1.5,1.6 wv.spec,1.20,1.21
Message-ID: <200610280854.k9S8sA8u010604@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/devel

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 14:50:07 -0000	1.5
+++ .cvsignore	28 Oct 2006 08:53:40 -0000	1.6
@@ -1 +1 @@
-wv-1.2.1.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 14:50:07 -0000	1.5
+++ sources	28 Oct 2006 08:53:40 -0000	1.6
@@ -1 +1 @@
-d757080af4595839d5d82a1a573c692c  wv-1.2.1.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/wv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wv.spec	8 Sep 2006 15:16:50 -0000	1.20
+++ wv.spec	28 Oct 2006 08:53:40 -0000	1.21
@@ -1,11 +1,11 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.1
-Release:    7%{?dist}
+Version:    1.2.4
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.2.1.tar.gz
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
 #Patch0:     wv-wvtext-tmp.patch
 #Patch1:     wv-1.0.3-oledecod.patch
 #Patch2:     wv-1.0.3-gcc4.patch
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
 * Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
 - rebuild (releases 1 to 7, cvs problem)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 08:54:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 01:54:08 -0700
Subject: rpms/wv/FC-4 .cvsignore,1.3,1.4 sources,1.3,1.4 wv.spec,1.10,1.11
Message-ID: <200610280854.k9S8s8Kc010589@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/FC-4

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 May 2005 15:30:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 08:53:37 -0000	1.4
@@ -1 +1 @@
-wv-1.0.3.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2005 15:30:18 -0000	1.3
+++ sources	28 Oct 2006 08:53:37 -0000	1.4
@@ -1 +1 @@
-71e42aa9af1e03cc8c608bbbdcb43af8  wv-1.0.3.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wv.spec	15 May 2005 15:30:18 -0000	1.10
+++ wv.spec	28 Oct 2006 08:53:37 -0000	1.11
@@ -1,26 +1,25 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.0.3
+Version:    1.2.4
 Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.0.3.tar.gz
-Patch0:     wv-wvtext-tmp.patch
-Patch1:     wv-1.0.3-oledecod.patch
-Patch2:     wv-1.0.3-gcc4.patch
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
+#Patch0:     wv-wvtext-tmp.patch
+#Patch1:     wv-1.0.3-oledecod.patch
+#Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
 
-#BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
+BuildRequires: libgsf-devel >= 1.11.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   wvware = %{version}-%{release}
-Provides:   wv-devel = %{version}-%{release}
 
 %description
 Wv is a program that understands the Microsoft Word 6/7/8/9
@@ -28,23 +27,36 @@
 documents into HTML, which can then be read with a browser.
 
 
+%package        devel
+Summary:        MSWord format converter - development files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+Wv is a program that understands the Microsoft Word 6/7/8/9
+binary file format and is able to convert Word
+documents into HTML, which can then be read with a browser.
+This package contains the development files
+
+
 %prep
 %setup -q
 #%patch0
-%patch1 -p1 -b .oledecod
-%patch2 -p1 -b .gcc4
+#%patch1 -p1 -b .oledecod
+#%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
 
 
 %build
 %configure --with-exporter \
-           --with-libxml2
+           --with-libxml2 \
+           --disable-static
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 #ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
@@ -62,13 +74,41 @@
 %doc COPYING README
 %{_bindir}/wv*
 %{_datadir}/wv
-%{_includedir}/wv
 %{_mandir}/man1/*
-%{_libdir}/libwv*
+%{_libdir}/libwv*.so.*
+
+%files      devel
+%defattr(-,root,root)
+%{_includedir}/wv
+%{_libdir}/libwv*.so
 %{_libdir}/pkgconfig/*
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
+- rebuild (releases 1 to 7, cvs problem)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-1
+- version 1.2.1
+
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
+- rebuild
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
+- don't build the static lib
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-2
+- rebuild for FC5
+
+* Fri Nov 11 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-1
+- version 1.2.0
+
+* Fri Oct 28 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-2
+- split out a -devel package (#171962)
+
 * Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}
 - new version
 - fix build with gcc4



From fedora-extras-commits at redhat.com  Sat Oct 28 08:54:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 01:54:09 -0700
Subject: rpms/wv/FC-6 .cvsignore,1.5,1.6 sources,1.5,1.6 wv.spec,1.20,1.21
Message-ID: <200610280854.k9S8s9Hq010599@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/FC-6

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 14:50:07 -0000	1.5
+++ .cvsignore	28 Oct 2006 08:53:39 -0000	1.6
@@ -1 +1 @@
-wv-1.2.1.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 14:50:07 -0000	1.5
+++ sources	28 Oct 2006 08:53:39 -0000	1.6
@@ -1 +1 @@
-d757080af4595839d5d82a1a573c692c  wv-1.2.1.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-6/wv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wv.spec	8 Sep 2006 15:16:50 -0000	1.20
+++ wv.spec	28 Oct 2006 08:53:39 -0000	1.21
@@ -1,11 +1,11 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.1
-Release:    7%{?dist}
+Version:    1.2.4
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.2.1.tar.gz
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
 #Patch0:     wv-wvtext-tmp.patch
 #Patch1:     wv-1.0.3-oledecod.patch
 #Patch2:     wv-1.0.3-gcc4.patch
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
 * Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
 - rebuild (releases 1 to 7, cvs problem)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 09:12:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 02:12:47 -0700
Subject: rpms/perl-Unicode-Map8/FC-5
	perl-Unicode-Map8-0.12-declaration.patch, 
	NONE, 1.1 perl-Unicode-Map8-0.12-type.patch, NONE,
	1.1 perl-Unicode-Map8.spec, 1.9, 1.10
Message-ID: <200610280912.k9S9Cl9Z013854@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/FC-5

Modified Files:
	perl-Unicode-Map8.spec 
Added Files:
	perl-Unicode-Map8-0.12-declaration.patch 
	perl-Unicode-Map8-0.12-type.patch 
Log Message:
add openSuSE patches for x86_64

perl-Unicode-Map8-0.12-declaration.patch:

--- NEW FILE perl-Unicode-Map8-0.12-declaration.patch ---
--- map8.h
+++ map8.h
@@ -81,7 +81,7 @@
 
 U16*  map8_to_str16(Map8*, U8*, U16*, int, int*);
 U8*   map8_to_str8 (Map8*, U16*, U8*, int, int*);
-U8*   map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*);
+U8*   map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*);
 
 int   map8_empty_block(Map8*, U8);
 

perl-Unicode-Map8-0.12-type.patch:

--- NEW FILE perl-Unicode-Map8-0.12-type.patch ---
--- Map8.xs
+++ Map8.xs
@@ -348,7 +348,7 @@
 	Map8* m2
 	PREINIT:
 	    STRLEN len;
-	    STRLEN rlen;
+	    int rlen;
 	    char*  res;
 	INPUT:
 	    char* str = SvPV(ST(2), len);


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/FC-5/perl-Unicode-Map8.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Unicode-Map8.spec	22 Feb 2006 22:55:31 -0000	1.9
+++ perl-Unicode-Map8.spec	28 Oct 2006 09:12:17 -0000	1.10
@@ -2,21 +2,20 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        8%{?dist}
+Release:        10%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
-Source0:      http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Patch0:         perl-Unicode-Map8-0.12-declaration.patch
+Patch1:         perl-Unicode-Map8-0.12-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(Unicode::String)
 
-# Does not work on x86_64, see bug #182514
-ExcludeArch:  x86_64
-
 
 %description
 The Unicode::Map8 class implements efficient mapping tables between
@@ -65,6 +64,12 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
+- add patches for x86_64
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-9
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.12-8
 - ExcludeArch x86_64
 



From fedora-extras-commits at redhat.com  Sat Oct 28 09:12:48 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 02:12:48 -0700
Subject: rpms/perl-Unicode-Map8/FC-6
	perl-Unicode-Map8-0.12-declaration.patch, 
	NONE, 1.1 perl-Unicode-Map8-0.12-type.patch, NONE,
	1.1 perl-Unicode-Map8.spec, 1.10, 1.11
Message-ID: <200610280912.k9S9Cma0013857@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/FC-6

Modified Files:
	perl-Unicode-Map8.spec 
Added Files:
	perl-Unicode-Map8-0.12-declaration.patch 
	perl-Unicode-Map8-0.12-type.patch 
Log Message:
add openSuSE patches for x86_64

perl-Unicode-Map8-0.12-declaration.patch:

--- NEW FILE perl-Unicode-Map8-0.12-declaration.patch ---
--- map8.h
+++ map8.h
@@ -81,7 +81,7 @@
 
 U16*  map8_to_str16(Map8*, U8*, U16*, int, int*);
 U8*   map8_to_str8 (Map8*, U16*, U8*, int, int*);
-U8*   map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*);
+U8*   map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*);
 
 int   map8_empty_block(Map8*, U8);
 

perl-Unicode-Map8-0.12-type.patch:

--- NEW FILE perl-Unicode-Map8-0.12-type.patch ---
--- Map8.xs
+++ Map8.xs
@@ -348,7 +348,7 @@
 	Map8* m2
 	PREINIT:
 	    STRLEN len;
-	    STRLEN rlen;
+	    int rlen;
 	    char*  res;
 	INPUT:
 	    char* str = SvPV(ST(2), len);


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/FC-6/perl-Unicode-Map8.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Unicode-Map8.spec	30 Aug 2006 16:19:50 -0000	1.10
+++ perl-Unicode-Map8.spec	28 Oct 2006 09:12:18 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -10,13 +10,12 @@
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Patch0:         perl-Unicode-Map8-0.12-declaration.patch
+Patch1:         perl-Unicode-Map8-0.12-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(Unicode::String)
 
-# Does not work on x86_64, see bug #182514
-ExcludeArch:  x86_64
-
 
 %description
 The Unicode::Map8 class implements efficient mapping tables between
@@ -65,6 +64,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
+- add patches for x86_64
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-9
 - rebuild
 



From fedora-extras-commits at redhat.com  Sat Oct 28 09:12:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 02:12:54 -0700
Subject: rpms/perl-Unicode-Map8/devel
	perl-Unicode-Map8-0.12-declaration.patch, 
	NONE, 1.1 perl-Unicode-Map8-0.12-type.patch, NONE,
	1.1 perl-Unicode-Map8.spec, 1.10, 1.11
Message-ID: <200610280912.k9S9Cs9x013860@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/devel

Modified Files:
	perl-Unicode-Map8.spec 
Added Files:
	perl-Unicode-Map8-0.12-declaration.patch 
	perl-Unicode-Map8-0.12-type.patch 
Log Message:
add openSuSE patches for x86_64

perl-Unicode-Map8-0.12-declaration.patch:

--- NEW FILE perl-Unicode-Map8-0.12-declaration.patch ---
--- map8.h
+++ map8.h
@@ -81,7 +81,7 @@
 
 U16*  map8_to_str16(Map8*, U8*, U16*, int, int*);
 U8*   map8_to_str8 (Map8*, U16*, U8*, int, int*);
-U8*   map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*);
+U8*   map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*);
 
 int   map8_empty_block(Map8*, U8);
 

perl-Unicode-Map8-0.12-type.patch:

--- NEW FILE perl-Unicode-Map8-0.12-type.patch ---
--- Map8.xs
+++ Map8.xs
@@ -348,7 +348,7 @@
 	Map8* m2
 	PREINIT:
 	    STRLEN len;
-	    STRLEN rlen;
+	    int rlen;
 	    char*  res;
 	INPUT:
 	    char* str = SvPV(ST(2), len);


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Unicode-Map8.spec	30 Aug 2006 16:19:50 -0000	1.10
+++ perl-Unicode-Map8.spec	28 Oct 2006 09:12:24 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -10,13 +10,12 @@
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Patch0:         perl-Unicode-Map8-0.12-declaration.patch
+Patch1:         perl-Unicode-Map8-0.12-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(Unicode::String)
 
-# Does not work on x86_64, see bug #182514
-ExcludeArch:  x86_64
-
 
 %description
 The Unicode::Map8 class implements efficient mapping tables between
@@ -65,6 +64,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
+- add patches for x86_64
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-9
 - rebuild
 



From fedora-extras-commits at redhat.com  Sat Oct 28 10:20:34 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 28 Oct 2006 03:20:34 -0700
Subject: rpms/php-manual-en/devel php-manual-en.spec, 1.3, 1.4 sources, 1.4,
	1.5
Message-ID: <200610281020.k9SAKYZv017180@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-manual-en/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17157

Modified Files:
	php-manual-en.spec sources 
Log Message:
Update to 2006-10-26 version


Index: php-manual-en.spec
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/devel/php-manual-en.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-manual-en.spec	25 Sep 2006 13:37:40 -0000	1.3
+++ php-manual-en.spec	28 Oct 2006 10:20:03 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           php-manual-en
-Version:        20060920
+Version:        20061026
 Release:        1%{?dist}
 Summary:        Documentation for the PHP programming language
 
@@ -38,6 +38,9 @@
 %doc LICENSE
 
 %changelog
+* Sat Oct 28 2006 Tim Jackson <rpm at timj.co.uk> 20061026-1
+- Update to 2006-10-26 version
+
 * Mon Sep 25 2006 Tim Jackson <rpm at timj.co.uk> 20060920-1
 - Update to 2006-09-20 version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2006 13:37:40 -0000	1.4
+++ sources	28 Oct 2006 10:20:03 -0000	1.5
@@ -1 +1 @@
-f027a871710424de6d925cbd695de081  php_manual_en.tar.gz
+fa4b78102b8a7cc4b9bb3f07a7d818d0  php_manual_en.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 10:27:15 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 28 Oct 2006 03:27:15 -0700
Subject: rpms/php-manual-en/FC-5 php-manual-en.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200610281027.k9SARF6R017253@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-manual-en/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17235

Modified Files:
	php-manual-en.spec sources 
Log Message:
Update to 2006-10-26 version


Index: php-manual-en.spec
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/FC-5/php-manual-en.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-manual-en.spec	25 Sep 2006 13:38:29 -0000	1.3
+++ php-manual-en.spec	28 Oct 2006 10:26:45 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           php-manual-en
-Version:        20060920
+Version:        20061026
 Release:        1%{?dist}
 Summary:        Documentation for the PHP programming language
 
@@ -38,6 +38,9 @@
 %doc LICENSE
 
 %changelog
+* Sat Oct 28 2006 Tim Jackson <rpm at timj.co.uk> 20061026-1
+- Update to 2006-10-26 version
+
 * Mon Sep 25 2006 Tim Jackson <rpm at timj.co.uk> 20060920-1
 - Update to 2006-09-20 version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2006 13:38:29 -0000	1.4
+++ sources	28 Oct 2006 10:26:45 -0000	1.5
@@ -1 +1 @@
-f027a871710424de6d925cbd695de081  php_manual_en.tar.gz
+fa4b78102b8a7cc4b9bb3f07a7d818d0  php_manual_en.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 10:35:50 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 28 Oct 2006 03:35:50 -0700
Subject: rpms/php-manual-en/FC-6 php-manual-en.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200610281035.k9SAZo3I017346@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-manual-en/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17328

Modified Files:
	php-manual-en.spec sources 
Log Message:
Update to 2006-10-26 version


Index: php-manual-en.spec
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/FC-6/php-manual-en.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-manual-en.spec	25 Sep 2006 13:37:40 -0000	1.3
+++ php-manual-en.spec	28 Oct 2006 10:35:20 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           php-manual-en
-Version:        20060920
+Version:        20061026
 Release:        1%{?dist}
 Summary:        Documentation for the PHP programming language
 
@@ -38,6 +38,9 @@
 %doc LICENSE
 
 %changelog
+* Sat Oct 28 2006 Tim Jackson <rpm at timj.co.uk> 20061026-1
+- Update to 2006-10-26 version
+
 * Mon Sep 25 2006 Tim Jackson <rpm at timj.co.uk> 20060920-1
 - Update to 2006-09-20 version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2006 13:37:40 -0000	1.4
+++ sources	28 Oct 2006 10:35:20 -0000	1.5
@@ -1 +1 @@
-f027a871710424de6d925cbd695de081  php_manual_en.tar.gz
+fa4b78102b8a7cc4b9bb3f07a7d818d0  php_manual_en.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:22:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 28 Oct 2006 06:22:03 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.12, 1.13 perl-Error.spec, 1.16, 
	1.17 sources, 1.12, 1.13
Message-ID: <200610281322.k9SDM3aq027089@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27069

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17008


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Oct 2006 22:02:25 -0000	1.12
+++ .cvsignore	28 Oct 2006 13:21:33 -0000	1.13
@@ -1 +1 @@
-Error-0.17007.tar.gz
+Error-0.17008.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Error.spec	18 Oct 2006 22:02:25 -0000	1.16
+++ perl-Error.spec	28 Oct 2006 13:21:33 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17007
+Version:        0.17008
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17008-1
+- Update to 0.17008.
+
 * Wed Oct 18 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17007-1
 - Update to 0.17007.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Oct 2006 22:02:25 -0000	1.12
+++ sources	28 Oct 2006 13:21:33 -0000	1.13
@@ -1 +1 @@
-fd80f6b2d1f5d31529145301031795b4  Error-0.17007.tar.gz
+647134e1aeb5893a4d08d711c858308b  Error-0.17008.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:29:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 28 Oct 2006 06:29:07 -0700
Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.8,
	1.9 perl-Module-ScanDeps.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200610281329.k9SDT7xQ027175@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27123/FC-5

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Sep 2006 12:13:17 -0000	1.8
+++ .cvsignore	28 Oct 2006 13:28:37 -0000	1.9
@@ -1 +1 @@
-Module-ScanDeps-0.66.tar.gz
+Module-ScanDeps-0.68.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/perl-Module-ScanDeps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-ScanDeps.spec	24 Sep 2006 12:13:17 -0000	1.8
+++ perl-Module-ScanDeps.spec	28 Oct 2006 13:28:37 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.66
+Version:        0.68
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.68-1
+- Update to 0.68.
+
 * Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.66-1
 - Update to 0.66.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Sep 2006 12:13:17 -0000	1.8
+++ sources	28 Oct 2006 13:28:37 -0000	1.9
@@ -1 +1 @@
-149d19cddaade706ead810442389db4a  Module-ScanDeps-0.66.tar.gz
+747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:29:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 28 Oct 2006 06:29:08 -0700
Subject: rpms/perl-Module-ScanDeps/FC-6 .cvsignore, 1.8,
	1.9 perl-Module-ScanDeps.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200610281329.k9SDT8Lk027180@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27123/FC-6

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Sep 2006 12:13:17 -0000	1.8
+++ .cvsignore	28 Oct 2006 13:28:37 -0000	1.9
@@ -1 +1 @@
-Module-ScanDeps-0.66.tar.gz
+Module-ScanDeps-0.68.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/perl-Module-ScanDeps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-ScanDeps.spec	24 Sep 2006 12:13:17 -0000	1.8
+++ perl-Module-ScanDeps.spec	28 Oct 2006 13:28:37 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.66
+Version:        0.68
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.68-1
+- Update to 0.68.
+
 * Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.66-1
 - Update to 0.66.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Sep 2006 12:13:17 -0000	1.8
+++ sources	28 Oct 2006 13:28:37 -0000	1.9
@@ -1 +1 @@
-149d19cddaade706ead810442389db4a  Module-ScanDeps-0.66.tar.gz
+747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:29:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 28 Oct 2006 06:29:13 -0700
Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.8,
	1.9 perl-Module-ScanDeps.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200610281329.k9SDTDZT027183@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27123/devel

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Sep 2006 12:13:17 -0000	1.8
+++ .cvsignore	28 Oct 2006 13:28:43 -0000	1.9
@@ -1 +1 @@
-Module-ScanDeps-0.66.tar.gz
+Module-ScanDeps-0.68.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-ScanDeps.spec	24 Sep 2006 12:13:17 -0000	1.8
+++ perl-Module-ScanDeps.spec	28 Oct 2006 13:28:43 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.66
+Version:        0.68
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.68-1
+- Update to 0.68.
+
 * Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.66-1
 - Update to 0.66.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Sep 2006 12:13:17 -0000	1.8
+++ sources	28 Oct 2006 13:28:43 -0000	1.9
@@ -1 +1 @@
-149d19cddaade706ead810442389db4a  Module-ScanDeps-0.66.tar.gz
+747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:31:12 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Sat, 28 Oct 2006 06:31:12 -0700
Subject: rpms/licq/devel licq.spec,1.12,1.13
Message-ID: <200610281331.k9SDVCbR027343@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27291

Modified Files:
	licq.spec 
Log Message:
fix desktop-file-install



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- licq.spec	27 Oct 2006 11:29:04 -0000	1.12
+++ licq.spec	28 Oct 2006 13:30:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.4
-Release: 1
+Release: 2
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/
@@ -85,7 +85,6 @@
 cd plugins/qt-gui
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         share/licq.desktop
 make install
 %find_lang licq
@@ -151,6 +150,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Sat Sep 28 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-2
+- fix desktop-file-install
+
 * Fri Sep 27 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-1
 - upgrade
 



From fedora-extras-commits at redhat.com  Sat Oct 28 14:14:58 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 28 Oct 2006 07:14:58 -0700
Subject: rpms/azureus/FC-6 azureus.script,1.9,1.10 azureus.spec,1.37,1.38
Message-ID: <200610281414.k9SEEw3m005992@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5792

Modified Files:
	azureus.script azureus.spec 
Log Message:
Add bcprov to classpath for Sun java.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- azureus.script	31 Jul 2006 01:39:16 -0000	1.9
+++ azureus.script	28 Oct 2006 14:14:28 -0000	1.10
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- azureus.spec	4 Oct 2006 22:49:08 -0000	1.37
+++ azureus.spec	28 Oct 2006 14:14:28 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -206,6 +206,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Sat Oct 28 2006 Anthony Green <green at redhat.com> 2.5.0.0-8
+- Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it
+  will run on non-gcj java alternatives.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.5.0.0-7
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 14:16:25 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 28 Oct 2006 07:16:25 -0700
Subject: rpms/azureus/devel azureus.script,1.9,1.10 azureus.spec,1.37,1.38
Message-ID: <200610281416.k9SEGPPe006391@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6171

Modified Files:
	azureus.script azureus.spec 
Log Message:
Add bcprov to classpath for non-gcj java.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- azureus.script	31 Jul 2006 01:39:16 -0000	1.9
+++ azureus.script	28 Oct 2006 14:15:55 -0000	1.10
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- azureus.spec	4 Oct 2006 22:49:08 -0000	1.37
+++ azureus.spec	28 Oct 2006 14:15:55 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -206,6 +206,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Sat Oct 28 2006 Anthony Green <green at redhat.com> 2.5.0.0-8
+- Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it
+  will run on non-gcj java alternatives.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.5.0.0-7
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 15:43:07 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:43:07 -0700
Subject: rpms/gcstar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610281543.k9SFh7it011807@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11801

Added Files:
	Makefile import.log 
Log Message:
Setup of module gcstar


--- NEW FILE Makefile ---
# Top level Makefile for module gcstar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 28 15:43:08 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:43:08 -0700
Subject: rpms/gcstar/devel .cvsignore,NONE,1.1
Message-ID: <200610281543.k9SFh8pM011825@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11801/devel

Added Files:
	.cvsignore 
Log Message:
Setup of module gcstar


--- NEW FILE .cvsignore ---



From fedora-extras-commits at redhat.com  Sat Oct 28 15:44:01 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:44:01 -0700
Subject: rpms/gcstar import.log,1.1,1.2
Message-ID: <200610281544.k9SFi1mE011884@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11852

Modified Files:
	import.log 
Log Message:
auto-import gcstar-0.5.0-3 on branch devel from gcstar-0.5.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcstar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Oct 2006 15:43:07 -0000	1.1
+++ import.log	28 Oct 2006 15:43:31 -0000	1.2
@@ -0,0 +1 @@
+gcstar-0_5_0-3:HEAD:gcstar-0.5.0-3.src.rpm:1162050201



From fedora-extras-commits at redhat.com  Sat Oct 28 15:44:02 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:44:02 -0700
Subject: rpms/gcstar/devel .cvsignore,1.1,1.2
Message-ID: <200610281544.k9SFi2Kx011887@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11852/devel

Modified Files:
	.cvsignore 
Log Message:
auto-import gcstar-0.5.0-3 on branch devel from gcstar-0.5.0-3.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Oct 2006 15:43:08 -0000	1.1
+++ .cvsignore	28 Oct 2006 15:43:32 -0000	1.2
@@ -0,0 +1 @@
+gcstar-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 15:47:26 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 08:47:26 -0700
Subject: rpms/cvs2svn/devel .cvsignore, 1.3, 1.4 cvs2svn.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200610281547.k9SFlQLu011987@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/cvs2svn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925/devel

Modified Files:
	.cvsignore cvs2svn.spec sources 
Log Message:
Upstream 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2006 16:26:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-cvs2svn-1.4.0.tar.gz
+cvs2svn-1.5.0.tar.gz


Index: cvs2svn.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/devel/cvs2svn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cvs2svn.spec	7 Sep 2006 01:41:51 -0000	1.4
+++ cvs2svn.spec	28 Oct 2006 15:46:56 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           cvs2svn
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        CVS to Subversion Repository Converter
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://cvs2svn.tigris.org/
-Source0:        http://cvs2svn.tigris.org/files/documents/1462/33339/cvs2svn-%{version}.tar.gz
+Source0:        http://cvs2svn.tigris.org/files/documents/1462/34574/cvs2svn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.5.0-1
+- Upstream 1.5.0
+
 * Wed Sep 06 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.0-2
 - Ghostbusting
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2006 16:26:18 -0000	1.3
+++ sources	28 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-0f202ef164d2bbcd58711fa7c2565e00  cvs2svn-1.4.0.tar.gz
+dc5bf68303498542cfa061f7ae79d9dd  cvs2svn-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 15:47:24 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 08:47:24 -0700
Subject: rpms/cvs2svn/FC-5 .cvsignore, 1.3, 1.4 cvs2svn.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200610281547.k9SFlO3W011977@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/cvs2svn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925/FC-5

Modified Files:
	.cvsignore cvs2svn.spec sources 
Log Message:
Upstream 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2006 16:26:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 15:46:54 -0000	1.4
@@ -1 +1 @@
-cvs2svn-1.4.0.tar.gz
+cvs2svn-1.5.0.tar.gz


Index: cvs2svn.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-5/cvs2svn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cvs2svn.spec	7 Sep 2006 01:46:48 -0000	1.3
+++ cvs2svn.spec	28 Oct 2006 15:46:54 -0000	1.4
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           cvs2svn
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        CVS to Subversion Repository Converter
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://cvs2svn.tigris.org/
-Source0:        http://cvs2svn.tigris.org/files/documents/1462/33339/cvs2svn-%{version}.tar.gz
+Source0:        http://cvs2svn.tigris.org/files/documents/1462/34574/cvs2svn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.5.0-1
+- Upstream 1.5.0
+
 * Wed Sep 06 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.0-2
 - Ghostbusting
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2006 16:26:18 -0000	1.3
+++ sources	28 Oct 2006 15:46:54 -0000	1.4
@@ -1 +1 @@
-0f202ef164d2bbcd58711fa7c2565e00  cvs2svn-1.4.0.tar.gz
+dc5bf68303498542cfa061f7ae79d9dd  cvs2svn-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 15:47:25 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 08:47:25 -0700
Subject: rpms/cvs2svn/FC-6 .cvsignore, 1.3, 1.4 cvs2svn.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200610281547.k9SFlP6Y011982@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/cvs2svn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925/FC-6

Modified Files:
	.cvsignore cvs2svn.spec sources 
Log Message:
Upstream 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2006 16:26:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 15:46:55 -0000	1.4
@@ -1 +1 @@
-cvs2svn-1.4.0.tar.gz
+cvs2svn-1.5.0.tar.gz


Index: cvs2svn.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-6/cvs2svn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cvs2svn.spec	7 Sep 2006 01:41:51 -0000	1.4
+++ cvs2svn.spec	28 Oct 2006 15:46:55 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           cvs2svn
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        CVS to Subversion Repository Converter
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://cvs2svn.tigris.org/
-Source0:        http://cvs2svn.tigris.org/files/documents/1462/33339/cvs2svn-%{version}.tar.gz
+Source0:        http://cvs2svn.tigris.org/files/documents/1462/34574/cvs2svn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.5.0-1
+- Upstream 1.5.0
+
 * Wed Sep 06 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.0-2
 - Ghostbusting
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2006 16:26:18 -0000	1.3
+++ sources	28 Oct 2006 15:46:55 -0000	1.4
@@ -1 +1 @@
-0f202ef164d2bbcd58711fa7c2565e00  cvs2svn-1.4.0.tar.gz
+dc5bf68303498542cfa061f7ae79d9dd  cvs2svn-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 15:48:53 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:48:53 -0700
Subject: rpms/gcstar import.log,1.2,1.3
Message-ID: <200610281548.k9SFmrWn012128@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12090

Modified Files:
	import.log 
Log Message:
auto-import gcstar-0.5.0-4 on branch devel from gcstar-0.5.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcstar/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Oct 2006 15:43:31 -0000	1.2
+++ import.log	28 Oct 2006 15:48:23 -0000	1.3
@@ -1 +1,2 @@
 gcstar-0_5_0-3:HEAD:gcstar-0.5.0-3.src.rpm:1162050201
+gcstar-0_5_0-4:HEAD:gcstar-0.5.0-4.src.rpm:1162050493



From fedora-extras-commits at redhat.com  Sat Oct 28 15:48:54 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:48:54 -0700
Subject: rpms/gcstar/devel gcstar.spec,1.1,1.2
Message-ID: <200610281548.k9SFmsbA012131@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12090/devel

Modified Files:
	gcstar.spec 
Log Message:
auto-import gcstar-0.5.0-4 on branch devel from gcstar-0.5.0-4.src.rpm


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/gcstar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcstar.spec	23 Oct 2006 21:29:30 -0000	1.1
+++ gcstar.spec	28 Oct 2006 15:48:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gcstar
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -99,6 +99,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Oct 28 2006 Tian <tian at c-sait.net> - 0.5.0-4
+  - Re-creation of the module because of a problem with previous import
 * Sun Oct 22 2006 Tian <tian at c-sait.net> - 0.5.0-3
   - Restored BuildRequires
 * Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-2



From fedora-extras-commits at redhat.com  Sat Oct 28 15:54:30 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:54:30 -0700
Subject: rpms/gcstar/FC-5 gcstar.spec,1.1,1.2
Message-ID: <200610281554.k9SFsUss012310@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12294

Modified Files:
	gcstar.spec 
Log Message:
Version bumped because of problems with previous import



Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-5/gcstar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcstar.spec	23 Oct 2006 21:29:30 -0000	1.1
+++ gcstar.spec	28 Oct 2006 15:54:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gcstar
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -99,6 +99,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Oct 28 2006 Tian <tian at c-sait.net> - 0.5.0-4
+  - Re-creation of the module because of a problem with previous import
 * Sun Oct 22 2006 Tian <tian at c-sait.net> - 0.5.0-3
   - Restored BuildRequires
 * Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-2



From fedora-extras-commits at redhat.com  Sat Oct 28 15:56:05 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:56:05 -0700
Subject: rpms/gcstar/FC-6 gcstar.spec,1.1,1.2
Message-ID: <200610281556.k9SFu5bJ012606@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12385

Modified Files:
	gcstar.spec 
Log Message:
Version bumped because of problems with previous import



Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/gcstar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcstar.spec	23 Oct 2006 21:29:30 -0000	1.1
+++ gcstar.spec	28 Oct 2006 15:55:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gcstar
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -99,6 +99,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Oct 28 2006 Tian <tian at c-sait.net> - 0.5.0-4
+  - Re-creation of the module because of a problem with previous import
 * Sun Oct 22 2006 Tian <tian at c-sait.net> - 0.5.0-3
   - Restored BuildRequires
 * Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-2



From fedora-extras-commits at redhat.com  Sat Oct 28 16:10:39 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 09:10:39 -0700
Subject: rpms/jd/devel .cvsignore,1.7,1.8 jd.spec,1.13,1.14 sources,1.7,1.8
Message-ID: <200610281610.k9SGAdJ3016061@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16034

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.cvs061028
- cvs 061028 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2006 05:31:18 -0000	1.7
+++ .cvsignore	28 Oct 2006 16:10:09 -0000	1.8
@@ -1 +1 @@
-jd-1.8.0-beta061023.tgz
+jd-1.8.0-cvs061028.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jd.spec	25 Oct 2006 18:34:20 -0000	1.13
+++ jd.spec	28 Oct 2006 16:10:09 -0000	1.14
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061023
+%define         strtag        cvs061028
 %define         repoid        22352
 
 
@@ -106,6 +106,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.cvs061028
+- 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Oct 2006 05:31:18 -0000	1.7
+++ sources	28 Oct 2006 16:10:09 -0000	1.8
@@ -1 +1 @@
-31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz
+6845b0b020e62f5708ddbd594c7db4f6  jd-1.8.0-cvs061028.tgz



From fedora-extras-commits at redhat.com  Sat Oct 28 16:13:34 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 09:13:34 -0700
Subject: rpms/yaz/FC-6 .cvsignore,1.3,1.4 sources,1.3,1.4 yaz.spec,1.3,1.4
Message-ID: <200610281613.k9SGDYjT016173@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/yaz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16115/FC-6

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
Upstream 2.1.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Aug 2006 21:21:02 -0000	1.3
+++ .cvsignore	28 Oct 2006 16:13:04 -0000	1.4
@@ -1 +1 @@
-yaz-2.1.26.tar.gz
+yaz-2.1.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Aug 2006 21:21:02 -0000	1.3
+++ sources	28 Oct 2006 16:13:04 -0000	1.4
@@ -1 +1 @@
-3c13d86714efe6d1f226c8f0a67923b6  yaz-2.1.26.tar.gz
+c55e693fdbb8d7b4f8248f687743b62a  yaz-2.1.36.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-6/yaz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yaz.spec	3 Sep 2006 16:39:15 -0000	1.3
+++ yaz.spec	28 Oct 2006 16:13:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           yaz
-Version:        2.1.26
-Release:        1.1%{?dist}
+Version:        2.1.36
+Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
 Group:          Applications/Internet
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.36-1
+- Upstream 2.1.36
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.26-1.1
 - Mass rebuild for FC6
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:13:33 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 09:13:33 -0700
Subject: rpms/yaz/FC-5 .cvsignore,1.3,1.4 sources,1.3,1.4 yaz.spec,1.2,1.3
Message-ID: <200610281613.k9SGDXfI016168@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/yaz/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16115/FC-5

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
Upstream 2.1.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Aug 2006 21:20:57 -0000	1.3
+++ .cvsignore	28 Oct 2006 16:13:03 -0000	1.4
@@ -1 +1 @@
-yaz-2.1.26.tar.gz
+yaz-2.1.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Aug 2006 21:20:57 -0000	1.3
+++ sources	28 Oct 2006 16:13:03 -0000	1.4
@@ -1 +1 @@
-3c13d86714efe6d1f226c8f0a67923b6  yaz-2.1.26.tar.gz
+c55e693fdbb8d7b4f8248f687743b62a  yaz-2.1.36.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-5/yaz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yaz.spec	15 Aug 2006 21:20:57 -0000	1.2
+++ yaz.spec	28 Oct 2006 16:13:03 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           yaz
-Version:        2.1.26
+Version:        2.1.36
 Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
@@ -105,6 +105,12 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.36-1
+- Upstream 2.1.36
+
+* Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.26-1.1
+- Mass rebuild for FC6
+
 * Tue Aug 15 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.26-1
 - Version 2.1.26
 - Kill all tabs



From fedora-extras-commits at redhat.com  Sat Oct 28 16:13:40 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 09:13:40 -0700
Subject: rpms/yaz/devel .cvsignore,1.3,1.4 sources,1.3,1.4 yaz.spec,1.3,1.4
Message-ID: <200610281613.k9SGDe1j016181@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/yaz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16115/devel

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
Upstream 2.1.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yaz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Aug 2006 21:21:02 -0000	1.3
+++ .cvsignore	28 Oct 2006 16:13:10 -0000	1.4
@@ -1 +1 @@
-yaz-2.1.26.tar.gz
+yaz-2.1.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yaz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Aug 2006 21:21:02 -0000	1.3
+++ sources	28 Oct 2006 16:13:10 -0000	1.4
@@ -1 +1 @@
-3c13d86714efe6d1f226c8f0a67923b6  yaz-2.1.26.tar.gz
+c55e693fdbb8d7b4f8248f687743b62a  yaz-2.1.36.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/extras/rpms/yaz/devel/yaz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yaz.spec	3 Sep 2006 16:39:15 -0000	1.3
+++ yaz.spec	28 Oct 2006 16:13:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           yaz
-Version:        2.1.26
-Release:        1.1%{?dist}
+Version:        2.1.36
+Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
 Group:          Applications/Internet
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.36-1
+- Upstream 2.1.36
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.26-1.1
 - Mass rebuild for FC6
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:22:45 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 09:22:45 -0700
Subject: rpms/wvs-data/devel wvs-data.spec,1.1,1.2
Message-ID: <200610281622.k9SGMjGb016413@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16397

Modified Files:
	wvs-data.spec 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Add %{?dist} tag as buildsys forces this.



Index: wvs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/devel/wvs-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wvs-data.spec	25 Oct 2006 22:11:19 -0000	1.1
+++ wvs-data.spec	28 Oct 2006 16:22:15 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:		wvs-data
 Version:	0.0.%{WVS_date}
-Release:	2
+Release:	2%{?dist}
 Summary:	World Vector Shoreline data
 
 Group:		Applications/Engineering
@@ -45,6 +45,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Add %%{?dist} tag as buildsys forces this.
+
 * Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
 - Directory name change.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:23:51 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 09:23:51 -0700
Subject: rpms/wvs-data/FC-6 wvs-data.spec,1.1,1.2
Message-ID: <200610281623.k9SGNpdm016440@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16424

Modified Files:
	wvs-data.spec 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Add %{?dist} tag as buildsys forces this.



Index: wvs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/FC-6/wvs-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wvs-data.spec	25 Oct 2006 22:11:19 -0000	1.1
+++ wvs-data.spec	28 Oct 2006 16:23:21 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:		wvs-data
 Version:	0.0.%{WVS_date}
-Release:	2
+Release:	2%{?dist}
 Summary:	World Vector Shoreline data
 
 Group:		Applications/Engineering
@@ -45,6 +45,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Add %%{?dist} tag as buildsys forces this.
+
 * Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
 - Directory name change.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:24:49 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 09:24:49 -0700
Subject: rpms/wvs-data/FC-5 wvs-data.spec,1.1,1.2
Message-ID: <200610281624.k9SGOnxB016467@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16451

Modified Files:
	wvs-data.spec 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Add %{?dist} tag as buildsys forces this.



Index: wvs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/FC-5/wvs-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wvs-data.spec	25 Oct 2006 22:11:19 -0000	1.1
+++ wvs-data.spec	28 Oct 2006 16:24:18 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:		wvs-data
 Version:	0.0.%{WVS_date}
-Release:	2
+Release:	2%{?dist}
 Summary:	World Vector Shoreline data
 
 Group:		Applications/Engineering
@@ -45,6 +45,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Add %%{?dist} tag as buildsys forces this.
+
 * Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
 - Directory name change.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:38:30 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 28 Oct 2006 09:38:30 -0700
Subject: upgradecheck upgradecheck.py,1.27,1.28
Message-ID: <200610281638.k9SGcU6l016710@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16692

Modified Files:
	upgradecheck.py 
Log Message:
Send reports to fedora-maintainers as discussed on f-e-l.


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- upgradecheck.py	25 Oct 2006 07:38:15 -0000	1.27
+++ upgradecheck.py	28 Oct 2006 16:38:28 -0000	1.28
@@ -32,7 +32,7 @@
 from PackageOwners import PackageOwners
 
 mail_from = "buildsys at fedoraproject.org"
-mail_to = "fedora-extras-list at redhat.com"
+mail_to = "fedora-maintainers at redhat.com"
 mail_subject = "Package EVR problems in FC+FE %s" % datetime.date.today()
 smtp_server = None
 



From fedora-extras-commits at redhat.com  Sat Oct 28 17:05:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 28 Oct 2006 10:05:14 -0700
Subject: rpms/itpp/devel .cvsignore, 1.2, 1.3 itpp.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610281705.k9SH5ERI019811@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19785

Modified Files:
	.cvsignore itpp.spec sources 
Log Message:
new upstream 3.10.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2006 01:45:11 -0000	1.2
+++ .cvsignore	28 Oct 2006 17:04:41 -0000	1.3
@@ -1 +1 @@
-itpp-3.10.5.tar.bz2
+itpp-3.10.6.tar.bz2


Index: itpp.spec
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/itpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- itpp.spec	13 Oct 2006 01:45:11 -0000	1.1
+++ itpp.spec	28 Oct 2006 17:04:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           itpp
-Version:        3.10.5
-Release:        7%{?dist}
+Version:        3.10.6
+Release:        1%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -48,8 +48,7 @@
 
 
 %build
-chmod 644 itpp/base/itpp_version.h
-export LDFLAGS="-L/usr/lib/atlas -lstdc++"
+export LDFLAGS="-L/usr/lib/atlas"
 export CPPFLAGS="-I/usr/include/atlas"
 export F77=gfortran
 %configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Sun Oct 28 2006  Ed Hill <ed at eh3.com> - 3.10.6-1
+- new upstream 3.10.6
+
 * Wed Oct 11 2006  Ed Hill <ed at eh3.com> - 3.10.5-7
 - explicitly link with -lstdc++
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2006 01:45:11 -0000	1.2
+++ sources	28 Oct 2006 17:04:41 -0000	1.3
@@ -1 +1 @@
-a4c9a13ff457ee168cec5edade272ff8  itpp-3.10.5.tar.bz2
+b78a13b5b2c7ae5bcd369b3440804c45  itpp-3.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 17:12:36 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 10:12:36 -0700
Subject: rpms/jd/devel jd-1.8.0-cvs061028-support-x86_64.patch, NONE,
	1.1 jd.spec, 1.14, 1.15
Message-ID: <200610281712.k9SHCak0020102@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20061

Modified Files:
	jd.spec 
Added Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* 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.


jd-1.8.0-cvs061028-support-x86_64.patch:

--- NEW FILE jd-1.8.0-cvs061028-support-x86_64.patch ---
--- jd-1.8.0-cvs061028/configure.in.x86_64	2006-10-09 14:28:54.000000000 +0900
+++ jd-1.8.0-cvs061028/configure.in	2006-10-29 01:53:28.000000000 +0900
@@ -120,7 +120,7 @@
 
   AC_MSG_CHECKING(for libSM and libICE)
   LIBSM_LIBS="" 
-  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib"
+  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib /usr/X11R6/lib64 /usr/lib64"
   for i in $dirs ; do
     if test -r $i/libICE.so -a -r $i/libSM.so ; then
       AC_MSG_RESULT($i)


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jd.spec	28 Oct 2006 16:10:09 -0000	1.14
+++ jd.spec	28 Oct 2006 17:12:05 -0000	1.15
@@ -16,7 +16,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -45,7 +45,8 @@
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
 #Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        %{name}-%{main_ver}-%{strtag}.tgz
+Patch0:         jd-1.8.0-cvs061028-support-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -106,6 +108,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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.
+
 * Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.cvs061028
 - cvs 061028 (23:59 JST)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 17:26:33 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 28 Oct 2006 10:26:33 -0700
Subject: rpms/itpp/FC-5 .cvsignore, 1.2, 1.3 itpp.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <200610281726.k9SHQXv3020709@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20650/FC-5

Modified Files:
	.cvsignore itpp.spec sources 
Log Message:
new upstream 3.10.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2006 01:45:11 -0000	1.2
+++ .cvsignore	28 Oct 2006 17:26:03 -0000	1.3
@@ -1 +1 @@
-itpp-3.10.5.tar.bz2
+itpp-3.10.6.tar.bz2


Index: itpp.spec
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-5/itpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- itpp.spec	13 Oct 2006 01:45:11 -0000	1.1
+++ itpp.spec	28 Oct 2006 17:26:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           itpp
-Version:        3.10.5
-Release:        7%{?dist}
+Version:        3.10.6
+Release:        1%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -48,8 +48,7 @@
 
 
 %build
-chmod 644 itpp/base/itpp_version.h
-export LDFLAGS="-L/usr/lib/atlas -lstdc++"
+export LDFLAGS="-L/usr/lib/atlas"
 export CPPFLAGS="-I/usr/include/atlas"
 export F77=gfortran
 %configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Sun Oct 28 2006  Ed Hill <ed at eh3.com> - 3.10.6-1
+- new upstream 3.10.6
+
 * Wed Oct 11 2006  Ed Hill <ed at eh3.com> - 3.10.5-7
 - explicitly link with -lstdc++
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2006 01:45:11 -0000	1.2
+++ sources	28 Oct 2006 17:26:03 -0000	1.3
@@ -1 +1 @@
-a4c9a13ff457ee168cec5edade272ff8  itpp-3.10.5.tar.bz2
+b78a13b5b2c7ae5bcd369b3440804c45  itpp-3.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 17:26:34 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 28 Oct 2006 10:26:34 -0700
Subject: rpms/itpp/FC-6 .cvsignore, 1.2, 1.3 itpp.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <200610281726.k9SHQYg9020715@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20650/FC-6

Modified Files:
	.cvsignore itpp.spec sources 
Log Message:
new upstream 3.10.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2006 01:45:11 -0000	1.2
+++ .cvsignore	28 Oct 2006 17:26:03 -0000	1.3
@@ -1 +1 @@
-itpp-3.10.5.tar.bz2
+itpp-3.10.6.tar.bz2


Index: itpp.spec
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-6/itpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- itpp.spec	13 Oct 2006 01:45:11 -0000	1.1
+++ itpp.spec	28 Oct 2006 17:26:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           itpp
-Version:        3.10.5
-Release:        7%{?dist}
+Version:        3.10.6
+Release:        1%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -48,8 +48,7 @@
 
 
 %build
-chmod 644 itpp/base/itpp_version.h
-export LDFLAGS="-L/usr/lib/atlas -lstdc++"
+export LDFLAGS="-L/usr/lib/atlas"
 export CPPFLAGS="-I/usr/include/atlas"
 export F77=gfortran
 %configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Sun Oct 28 2006  Ed Hill <ed at eh3.com> - 3.10.6-1
+- new upstream 3.10.6
+
 * Wed Oct 11 2006  Ed Hill <ed at eh3.com> - 3.10.5-7
 - explicitly link with -lstdc++
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2006 01:45:11 -0000	1.2
+++ sources	28 Oct 2006 17:26:03 -0000	1.3
@@ -1 +1 @@
-a4c9a13ff457ee168cec5edade272ff8  itpp-3.10.5.tar.bz2
+b78a13b5b2c7ae5bcd369b3440804c45  itpp-3.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 17:38:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 10:38:09 -0700
Subject: rpms/jd/FC-6 jd-1.8.0-cvs061028-support-x86_64.patch, NONE,
	1.1 jd.spec, 1.7, 1.8
Message-ID: <200610281738.k9SHc9jp021256@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21218

Modified Files:
	jd.spec 
Added Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
- Detect libSM and libICE for x86_64.


jd-1.8.0-cvs061028-support-x86_64.patch:

--- NEW FILE jd-1.8.0-cvs061028-support-x86_64.patch ---
--- jd-1.8.0-cvs061028/configure.in.x86_64	2006-10-09 14:28:54.000000000 +0900
+++ jd-1.8.0-cvs061028/configure.in	2006-10-29 01:53:28.000000000 +0900
@@ -120,7 +120,7 @@
 
   AC_MSG_CHECKING(for libSM and libICE)
   LIBSM_LIBS="" 
-  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib"
+  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib /usr/X11R6/lib64 /usr/lib64"
   for i in $dirs ; do
     if test -r $i/libICE.so -a -r $i/libSM.so ; then
       AC_MSG_RESULT($i)


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jd.spec	24 Oct 2006 05:32:41 -0000	1.7
+++ jd.spec	28 Oct 2006 17:37:39 -0000	1.8
@@ -16,7 +16,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -44,8 +44,9 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:         jd-1.8.0-cvs061028-support-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -103,6 +105,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
+- Detect libSM and libICE for x86_64.
+
 * 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
 



From fedora-extras-commits at redhat.com  Sat Oct 28 17:39:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 10:39:47 -0700
Subject: rpms/jd/FC-5 jd-1.8.0-cvs061028-support-x86_64.patch, NONE,
	1.1 jd.spec, 1.6, 1.7
Message-ID: <200610281739.k9SHdlHC021316@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21289

Modified Files:
	jd.spec 
Added Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
- Detect libSM and libICE for x86_64.


jd-1.8.0-cvs061028-support-x86_64.patch:

--- NEW FILE jd-1.8.0-cvs061028-support-x86_64.patch ---
--- jd-1.8.0-cvs061028/configure.in.x86_64	2006-10-09 14:28:54.000000000 +0900
+++ jd-1.8.0-cvs061028/configure.in	2006-10-29 01:53:28.000000000 +0900
@@ -120,7 +120,7 @@
 
   AC_MSG_CHECKING(for libSM and libICE)
   LIBSM_LIBS="" 
-  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib"
+  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib /usr/X11R6/lib64 /usr/lib64"
   for i in $dirs ; do
     if test -r $i/libICE.so -a -r $i/libSM.so ; then
       AC_MSG_RESULT($i)


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jd.spec	24 Oct 2006 05:34:08 -0000	1.6
+++ jd.spec	28 Oct 2006 17:39:17 -0000	1.7
@@ -16,7 +16,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -44,8 +44,9 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:         jd-1.8.0-cvs061028-support-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -103,6 +105,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
+- Detect libSM and libICE for x86_64.
+
 * 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
 



From fedora-extras-commits at redhat.com  Sat Oct 28 18:48:34 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sat, 28 Oct 2006 11:48:34 -0700
Subject: rpms/gaim-otr/FC-6 gaim-beta4.patch,NONE,1.1
Message-ID: <200610281848.k9SImYAW024954@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24946

Added Files:
	gaim-beta4.patch 
Log Message:
patch for use with gaim 2.0.0-beta4.


gaim-beta4.patch:

--- NEW FILE gaim-beta4.patch ---
diff -r -c -N gaim-otr/gtk-dialog.c gaim-otr-new/gtk-dialog.c
*** gaim-otr/gtk-dialog.c	2005-12-18 13:33:48.000000000 -0500
--- gaim-otr-new/gtk-dialog.c	2006-10-28 02:01:00.000000000 -0400
***************
*** 30,36 ****
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include "gtkstock.h"
  #endif
  #include "plugin.h"
  #include "notify.h"
--- 30,36 ----
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include <gtk/gtkstock.h>
  #endif
  #include "plugin.h"
  #include "notify.h"
***************
*** 648,662 ****
  
      switch (type) {
  	case GAIM_NOTIFY_MSG_ERROR:
! 	    icon_name = GAIM_STOCK_DIALOG_ERROR;
  	    break;
  
  	case GAIM_NOTIFY_MSG_WARNING:
! 	    icon_name = GAIM_STOCK_DIALOG_WARNING;
  	    break;
  
  	case GAIM_NOTIFY_MSG_INFO:
! 	    icon_name = GAIM_STOCK_DIALOG_INFO;
  	    break;
  
  	default:
--- 648,662 ----
  
      switch (type) {
  	case GAIM_NOTIFY_MSG_ERROR:
! 	    icon_name = GTK_STOCK_DIALOG_ERROR;
  	    break;
  
  	case GAIM_NOTIFY_MSG_WARNING:
! 	    icon_name = GTK_STOCK_DIALOG_WARNING;
  	    break;
  
  	case GAIM_NOTIFY_MSG_INFO:
! 	    icon_name = GTK_STOCK_DIALOG_INFO;
  	    break;
  
  	default:



From fedora-extras-commits at redhat.com  Sat Oct 28 18:50:24 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sat, 28 Oct 2006 11:50:24 -0700
Subject: rpms/gaim-otr/FC-6 gaim-otr.spec,1.23,1.24
Message-ID: <200610281850.k9SIoO38024985@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24969

Modified Files:
	gaim-otr.spec 
Log Message:
* Sat Oct 28 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.3.20060921cvs
- Added patch for gaim 2.0.0-beta4



Index: gaim-otr.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-otr/FC-6/gaim-otr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gaim-otr.spec	2 Oct 2006 22:30:06 -0000	1.23
+++ gaim-otr.spec	28 Oct 2006 18:49:54 -0000	1.24
@@ -1,17 +1,18 @@
 Summary: Off-The-Record Messaging plugin for GAIM
 Name: gaim-otr
 Version: 3.0.1
-Release: 0.2.20060921cvs%{?dist}
+Release: 0.3.20060921cvs%{?dist}
 #Source: http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
 Source: %{name}-20060712.tar.gz
+Patch0: gaim-beta4.patch
 Url: http://www.cypherpunks.ca/otr/
 License: GPL
 Group: Applications/Internet
 Provides: otr-plugin = %{version}
 Obsoletes: otr-plugin
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gaim >= 2.0.0, libotr >= 3.0.0
-BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0, autoconf, automake, libtool, gaim-devel >= 2.0.0
+Requires: gaim >= 2.0.0-0.17.beta4, libotr >= 3.0.0
+BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0, autoconf, automake, libtool, gaim-devel >= 2.0.0-0.17.beta4
 
 %description 
 
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .beta4
 # temporary because we are using a cvs snapshot for now:
 #autoreconf
 autoreconf -s -i -v -f 
@@ -47,6 +49,9 @@
 %{_libdir}/gaim/gaim-otr.so
 
 %changelog
+* Sat Oct 28 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.3.20060921cvs
+- Added patch for gaim 2.0.0-beta4
+
 * Mon Oct  2 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.2.20060921cvs
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 18:51:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 28 Oct 2006 11:51:44 -0700
Subject: rpms/qt4/devel .cvsignore, 1.11, 1.12 qt4.spec, 1.25, 1.26 sources, 
	1.9, 1.10
Message-ID: <200610281851.k9SIpiZU025061@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25041

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use respun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Oct 2006 02:49:46 -0000	1.11
+++ .cvsignore	28 Oct 2006 18:51:14 -0000	1.12
@@ -1,5 +1,6 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
 qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qt4.spec	23 Oct 2006 02:49:46 -0000	1.25
+++ qt4.spec	28 Oct 2006 18:51:14 -0000	1.26
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -84,11 +84,14 @@
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps}
+BuildRequires: %{x_deps} %{?x_deps_GL_hack}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
@@ -149,7 +152,7 @@
 Summary: API documentation, demos and example programs for %{name}
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}_%{release}
+Provides: %{name}-assistant = %{version}-%{release}
 # For docs -> doc rename, temporary, since it was a short-lived subpkg
 #Obsoletes: %{name}-docs < %{version}-%{release}
 #Provides:  %{name}-docs = %{version}-%{release}
@@ -506,6 +509,13 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+- use respun upstream 4.2.1 tarball
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1
+- 4.2.1
+
 * Wed Oct 04 2006 Rex Dieter 4.2.0-1
 - 4.2.0(final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Oct 2006 02:49:46 -0000	1.9
+++ sources	28 Oct 2006 18:51:14 -0000	1.10
@@ -1 +1 @@
-6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz
+2ab1c88084f55b94809f025a8503bf18  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 19:00:28 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 12:00:28 -0700
Subject: rpms/showimg/FC-5 showimg.spec,1.12,1.13
Message-ID: <200610281900.k9SJ0SFZ025254@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/FC-5

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-5/showimg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- showimg.spec	22 Sep 2006 09:51:47 -0000	1.12
+++ showimg.spec	28 Oct 2006 18:59:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,12 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-12
+- rebuild time !
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-10
 - yep, just that
 



From fedora-extras-commits at redhat.com  Sat Oct 28 19:00:27 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 12:00:27 -0700
Subject: rpms/showimg/FC-4 showimg.spec,1.11,1.12
Message-ID: <200610281900.k9SJ0RiZ025251@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/FC-4

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- showimg.spec	3 Oct 2006 07:27:47 -0000	1.11
+++ showimg.spec	28 Oct 2006 18:59:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,12 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-12
+- rebuild time !
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-10
 - yep, just that
 



From fedora-extras-commits at redhat.com  Sat Oct 28 19:00:28 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 12:00:28 -0700
Subject: rpms/showimg/FC-6 showimg.spec,1.15,1.16
Message-ID: <200610281900.k9SJ0S8M025257@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/FC-6

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-6/showimg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- showimg.spec	4 Oct 2006 22:34:55 -0000	1.15
+++ showimg.spec	28 Oct 2006 18:59:58 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-12
+- rebuild time !
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 19:00:29 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 12:00:29 -0700
Subject: rpms/showimg/devel showimg.spec,1.15,1.16
Message-ID: <200610281900.k9SJ0TUm025260@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/devel

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- showimg.spec	4 Oct 2006 22:34:55 -0000	1.15
+++ showimg.spec	28 Oct 2006 18:59:59 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-12
+- rebuild time !
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 20:17:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 28 Oct 2006 13:17:44 -0700
Subject: fedora-security/audit fe5,1.93,1.94 fe6,1.6,1.7
Message-ID: <200610282017.k9SKHiDh031825@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31805

Modified Files:
	fe5 fe6 
Log Message:
CVE-2006-4513 (wv) fixed for FE[56]


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- fe5	28 Oct 2006 06:48:21 -0000	1.93
+++ fe5	28 Oct 2006 20:17:41 -0000	1.94
@@ -29,7 +29,7 @@
 CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
-CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 version (wv, fixed 1.2.4) #212696
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fe6	28 Oct 2006 06:48:21 -0000	1.6
+++ fe6	28 Oct 2006 20:17:41 -0000	1.7
@@ -29,7 +29,7 @@
 CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
-CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 version (wv, fixed 1.2.4) #212696
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167



From fedora-extras-commits at redhat.com  Sat Oct 28 20:34:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 28 Oct 2006 13:34:32 -0700
Subject: rpms/gift/devel gift.spec,1.7,1.8
Message-ID: <200610282034.k9SKYW9q031952@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31936

Modified Files:
	gift.spec 
Log Message:
respin for devel/fc7



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gift.spec	10 Oct 2006 12:46:05 -0000	1.7
+++ gift.spec	28 Oct 2006 20:34:02 -0000	1.8
@@ -6,7 +6,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 6%{?dist}.1
+Release: 6%{?dist}
 
 License: GPL
 Group:	 System Environment/Daemons



From fedora-extras-commits at redhat.com  Sat Oct 28 22:08:52 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 28 Oct 2006 15:08:52 -0700
Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.31,1.32
Message-ID: <200610282208.k9SM8qXA006153@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6137

Modified Files:
	deskbar-applet.spec 
Log Message:
rebuild


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- deskbar-applet.spec	1 Oct 2006 22:03:15 -0000	1.31
+++ deskbar-applet.spec	28 Oct 2006 22:08:21 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -91,6 +91,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sat Oct 28 2006 Luke Macken <lmacken at redhat.com> - 2.16.0-2
+- Rebuild
+
 * Sun Oct  1 2006 Luke Macken <lmacken at redhat.com> - 2.16.0-1
 - 2.16.0
 



From fedora-extras-commits at redhat.com  Sat Oct 28 22:50:34 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat, 28 Oct 2006 15:50:34 -0700
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.5,1.6
Message-ID: <200610282250.k9SMoYHi006845@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6829

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Pick up libedataserver if bump.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-phone-manager.spec	8 Oct 2006 21:57:41 -0000	1.5
+++ gnome-phone-manager.spec	28 Oct 2006 22:50:04 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -81,7 +81,10 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
-* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+* Sun Oct 29 2006 Linus Walleij <triad at df.lth.se> 0.8-4
+- Rebuild to pick up libedataserver i/f bump.
+
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-3
 - Pick up intltool.
 
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2



From fedora-extras-commits at redhat.com  Sat Oct 28 22:52:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 28 Oct 2006 15:52:32 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.9,1.10
Message-ID: <200610282252.k9SMqW0j006914@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6894

Modified Files:
	Config_Extras.py 
Log Message:
repoview -> quiet again, but this time via the Config file :)


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Config_Extras.py	24 Oct 2006 20:28:19 -0000	1.9
+++ Config_Extras.py	28 Oct 2006 22:52:30 -0000	1.10
@@ -121,7 +121,7 @@
 cr_cachedir = '/tmp/repomd-cache'  # createrepo cachedir
 
 #repoview = '/usr/bin/repoview'
-repoview = '/srv/extras-push/work/repoview'
+repoview = '/srv/extras-push/work/repoview -q'
 
 #post_cmds = []
 post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),



From fedora-extras-commits at redhat.com  Sat Oct 28 22:55:41 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Oct 2006 15:55:41 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.5,1.6
Message-ID: <200610282255.k9SMtf3Z006964@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6948

Modified Files:
	eds-feed.spec 
Log Message:
* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
- Rebuild for new eds.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eds-feed.spec	11 Oct 2006 16:00:43 -0000	1.5
+++ eds-feed.spec	28 Oct 2006 22:55:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
+- Rebuild for new eds.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-5
 - Remove requires on galago-filesystem, libgalago owns directory.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 22:58:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Oct 2006 15:58:20 -0700
Subject: rpms/eds-feed/FC-6 eds-feed.spec,1.5,1.6
Message-ID: <200610282258.k9SMwKla007050@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7033

Modified Files:
	eds-feed.spec 
Log Message:
* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
- Rebuild for new eds.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/FC-6/eds-feed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eds-feed.spec	11 Oct 2006 16:00:43 -0000	1.5
+++ eds-feed.spec	28 Oct 2006 22:57:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
+- Rebuild for new eds.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-5
 - Remove requires on galago-filesystem, libgalago owns directory.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 23:00:35 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Oct 2006 16:00:35 -0700
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.20, 
	1.21
Message-ID: <200610282300.k9SN0Z8S007137@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7117

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
- Rebuild for new eds.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- contact-lookup-applet.spec	16 Oct 2006 23:20:11 -0000	1.20
+++ contact-lookup-applet.spec	28 Oct 2006 23:00:05 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
+- Rebuild for new eds.
+
 * Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
 - Update to 0.15.
 - Drop evolution api change patch.



From fedora-extras-commits at redhat.com  Sat Oct 28 23:01:18 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 28 Oct 2006 16:01:18 -0700
Subject: extras-buildsys/utils/pushscript README,1.5,1.6
Message-ID: <200610282301.k9SN1Ipw010095@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10077

Modified Files:
	README 
Log Message:



Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README	23 Oct 2006 11:24:35 -0000	1.5
+++ README	28 Oct 2006 23:01:15 -0000	1.6
@@ -1,9 +1,13 @@
-installed repoview is broken : quiet option doesn't work, we use a patched
-local installation
+repoview : installed repoview-0.5.1-1.centos4 is broken, quiet option
+doesn't work, we use a patched local installation (fix merged upstream)
 
-createrepo : pukes about unknown things (including repoview stuff) in
-repodata dirs, we rmtree the dir in Utils.create_repository before running
-createrepo -> https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=595
+createrepo : version < 0.4.5 pukes about unknown things (including
+repoview stuff) in repodata dirs - we work around that by moving the
+entire repodata dir to a tmp directory, then run createrepo and restore
+old files unless they would overwrite new files.  createrepo >= 0.4.5 will
+do something similar, but we don't want to run into any of createrepo's
+fatal error conditions (e.g. due to unexpected group file access problems
+or alike), where we would lose repoview'n'stuff in ".olddir".
 
 old yum Python modules : we use a newer/patched local copy (post yum 2.6.1
 with a patched "rpmUtils" and "yum" module), so we have more recent code



From fedora-extras-commits at redhat.com  Sat Oct 28 23:03:38 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Oct 2006 16:03:38 -0700
Subject: rpms/contact-lookup-applet/FC-6 contact-lookup-applet.spec, 1.20,
	1.21
Message-ID: <200610282303.k9SN3cSX010169@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
- Rebuild for new eds.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-6/contact-lookup-applet.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- contact-lookup-applet.spec	16 Oct 2006 23:20:11 -0000	1.20
+++ contact-lookup-applet.spec	28 Oct 2006 23:03:06 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
+- Rebuild for new eds.
+
 * Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
 - Update to 0.15.
 - Drop evolution api change patch.



From fedora-extras-commits at redhat.com  Sun Oct 29 00:48:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 28 Oct 2006 17:48:20 -0700
Subject: rpms/tuxpaint/devel tuxpaint.desktop, 1.2, 1.3 tuxpaint.spec, 1.14,
	1.15
Message-ID: <200610290048.k9T0mKT2013857@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13839

Modified Files:
	tuxpaint.desktop tuxpaint.spec 
Log Message:
Fix category in tuxpaint.desktop.


Index: tuxpaint.desktop
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tuxpaint.desktop	3 Jun 2006 17:52:11 -0000	1.2
+++ tuxpaint.desktop	29 Oct 2006 00:47:50 -0000	1.3
@@ -14,5 +14,5 @@
 Comment[nl]=Tux Paint: een tekenprogramma voor kinderen.
 Comment[pt]=Tux Paint: um programa de desenho para crian??as.
 Comment[sv]=Tux Paint: ett ritprogram f??r yngre barn.
-Categories=Education;Graphics;Application;
+Categories=Education;Graphics;KidsGame;
 Encoding=UTF-8


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tuxpaint.spec	26 Oct 2006 21:35:44 -0000	1.14
+++ tuxpaint.spec	29 Oct 2006 00:47:50 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           tuxpaint
 Version:        0.9.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -49,6 +49,7 @@
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--vendor fedora \
+	--add-category KidsGame \
 	%{SOURCE1}
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -70,6 +71,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Fri Oct 27 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-3
+- Fix category in tuxpaint.desktop.
+
 * Thu Oct 26 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-2
 - Drop "--add-category X-Fedora".
 



From fedora-extras-commits at redhat.com  Sun Oct 29 00:49:09 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 28 Oct 2006 17:49:09 -0700
Subject: rpms/qtparted/devel qtparted-desktop.patch, 1.3, 1.4 qtparted.spec, 
	1.17, 1.18
Message-ID: <200610290049.k9T0n9qx013922@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13897

Modified Files:
	qtparted-desktop.patch qtparted.spec 
Log Message:
Enable ntfs support.
Make desktop-file-install happy with our categories again.


qtparted-desktop.patch:

Index: qtparted-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted-desktop.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtparted-desktop.patch	13 Aug 2005 23:10:51 -0000	1.3
+++ qtparted-desktop.patch	29 Oct 2006 00:48:38 -0000	1.4
@@ -1,5 +1,5 @@
---- data/qtparted.desktop.orig	2004-04-24 19:41:27.000000000 +0300
-+++ data/qtparted.desktop	2004-05-21 00:36:57.955313448 +0300
+--- data/qtparted.desktop.orig	2005-07-06 14:34:10.000000000 -0500
++++ data/qtparted.desktop	2006-10-28 12:27:59.000000000 -0500
 @@ -1,7 +1,7 @@
  [Desktop Entry]
 -Exec=/usr/sbin/qtparted
@@ -10,3 +10,9 @@
  Terminal=false
  Type=Application
  Comment=Application for partitioning a disk
+@@ -9,4 +9,4 @@
+ Comment[fr]=Application pour partitionner un disque
+ Comment[fi]=Kiintolevyn partitiointity??kalu
+ Encoding=UTF-8
+-Categories=Application;System;QT;
++Categories=Utility;System;Qt;


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qtparted.spec	28 Aug 2006 19:45:48 -0000	1.17
+++ qtparted.spec	29 Oct 2006 00:48:38 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -18,7 +18,7 @@
 
 BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 1.6.6
 BuildRequires:  desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
-BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs
+BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs, ntfsprogs-devel
 BuildRequires:  automake, perl, autoconf
 Requires:       usermode-gtk, e2fsprogs, jfsutils, xfsprogs
 
@@ -41,8 +41,7 @@
 
 %configure \
   --with-log-dir=%{_localstatedir}/log \
-  --disable-reiserfs \
-  --disable-ntfs
+  --disable-reiserfs
 make %{?_smp_mflags}
 
 
@@ -54,7 +53,6 @@
   --vendor fedora \
   --mode 644 \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   $RPM_BUILD_ROOT%{_datadir}/applnk/System/qtparted.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 ln -s %{_datadir}/qtparted/pics/qtparted_32.png \
@@ -108,6 +106,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Steven Pritchard <steve at kspei.com> - 0.4.5-10
+- Enable ntfs support.
+- Make desktop-file-install happy with our categories again.
+
 * Mon Aug 28 2006 Steven Pritchard <steve at kspei.com> - 0.4.5-9
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sun Oct 29 03:22:48 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 20:22:48 -0700
Subject: rpms/lucidlife/devel lucidlife-add-.desktop-encoding.patch, NONE,
	1.1 lucidlife-make-docs-use-proper-dir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lucidlife.spec, 1.13, 1.14 sources, 1.2,
	1.3 make-docs-use-proper-dir.patch, 1.1, NONE
Message-ID: <200610290322.k9T3MmIY024703@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24677

Modified Files:
	.cvsignore lucidlife.spec sources 
Added Files:
	lucidlife-add-.desktop-encoding.patch 
	lucidlife-make-docs-use-proper-dir.patch 
Removed Files:
	make-docs-use-proper-dir.patch 
Log Message:
New upstream release (0.9.1)

lucidlife-add-.desktop-encoding.patch:

--- NEW FILE lucidlife-add-.desktop-encoding.patch ---
--- lucidlife.desktop.in.old	2006-10-28 11:02:18.000000000 -0700
+++ lucidlife.desktop.in	2006-10-28 11:10:43.000000000 -0700
@@ -6,3 +6,4 @@
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Game;
+Encoding=UTF-8

lucidlife-make-docs-use-proper-dir.patch:

--- NEW FILE lucidlife-make-docs-use-proper-dir.patch ---
--- doc/Makefile.am.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.am	2006-03-28 20:22:32.000000000 -0800
@@ -1,4 +1,4 @@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 
 EXTRA_DIST = *.png *.gif *.html *.css
--- doc/Makefile.in.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.in	2006-03-28 20:24:32.000000000 -0800
@@ -188,7 +188,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 EXTRA_DIST = *.png *.gif *.html *.css
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2006 21:10:04 -0000	1.2
+++ .cvsignore	29 Oct 2006 03:22:18 -0000	1.3
@@ -1 +1 @@
-lucidlife-0.9.tar.gz
+lucidlife-0.9.1.tar.gz


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lucidlife.spec	27 Aug 2006 22:51:56 -0000	1.13
+++ lucidlife.spec	29 Oct 2006 03:22:18 -0000	1.14
@@ -1,13 +1,14 @@
 Name:           lucidlife
-Version:        0.9
-Release:        11%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://icculus.org/~jcspray/LucidLife/
 Source0:        http://icculus.org/~jcspray/LucidLife/%{name}-%{version}.tar.gz
-Patch0:			make-docs-use-proper-dir.patch
+Patch0:		%{name}-make-docs-use-proper-dir.patch
+Patch1:		%{name}-add-.desktop-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -29,6 +30,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .old
+%patch1 -p0 -b .old
 
 
 %build
@@ -42,8 +44,8 @@
 %find_lang %{name}
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	--add-category X-Fedora	\
 	--delete-original	\
+	--remove-category=Application	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
  
 
@@ -62,6 +64,14 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
+- Update to new upstream release (0.9.1)
+- Drop X-Fedora and Application categories in installed .desktop file
+- Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:
+  + add-.desktop-encoding.patch
+- Add %%name prefix to old make-docs-use-proper-dir patch filename
+  to keep it all in the same logical namespace.
+
 * Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-11
 - Mass FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2006 21:10:04 -0000	1.2
+++ sources	29 Oct 2006 03:22:18 -0000	1.3
@@ -1 +1 @@
-25bcde0ddbe4f7db4a7ea92fcc36b7bc  lucidlife-0.9.tar.gz
+68e9cfe091fa18380984609af9c56467  lucidlife-0.9.1.tar.gz


--- make-docs-use-proper-dir.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 03:32:51 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 28 Oct 2006 20:32:51 -0700
Subject: rpms/csound/FC-6 csound-5.03.0-disable-atsa.patch, NONE,
	1.1 csound-5.03.0-gstabs-disable-option.patch, NONE,
	1.1 csound-5.03.0-no-usr-local.patch, NONE,
	1.1 csound-5.03.0-remote-fixes.patch, NONE,
	1.1 csound-5.03.0-enable-fluidsynth.patch, 1.1, 1.2 csound.spec,
	1.2, 1.3 sources, 1.2, 1.3 csound-5.03.0-no-gstabs.patch, 1.1,
	NONE csound-5.03.0-printf-redef.patch, 1.1,
	NONE csound-5.03.0-uninitialized.patch, 1.1, NONE
Message-ID: <200610290332.k9T3WpaW025491@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25315

Modified Files:
	csound-5.03.0-enable-fluidsynth.patch csound.spec sources 
Added Files:
	csound-5.03.0-disable-atsa.patch 
	csound-5.03.0-gstabs-disable-option.patch 
	csound-5.03.0-no-usr-local.patch 
	csound-5.03.0-remote-fixes.patch 
Removed Files:
	csound-5.03.0-no-gstabs.patch csound-5.03.0-printf-redef.patch 
	csound-5.03.0-uninitialized.patch 
Log Message:
* Sat Oct 28 2006 Dan Williams <dcbw at redhat.com> 5.03.0-7
- Rebuild to drop old source tarball

* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
- Update to a cvs snapshot for the remote plugin and a few other fixes
- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
- Put the virtual MIDI keyboard into its own package

* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
- Fix the remote plugin's local IP address read code, add more error checking

* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
- Drop csound-5.03.0-uninitialized.patch, upstream
- Drop csound-5.03.0-printf-redef.patch, upstream
- CVS snapshot to grab some updated opcodes and fixes
- Make disabling -gstabs an option for better upstream palatability
- Disable atsa; it breaks the build for some unknown reason



csound-5.03.0-disable-atsa.patch:

--- NEW FILE csound-5.03.0-disable-atsa.patch ---
diff -ru Csound5.03.0/SConstruct /tmp/Csound5.03.0/SConstruct
--- Csound5.03.0/SConstruct	2006-10-23 16:07:41.000000000 -0400
+++ /tmp/Csound5.03.0/SConstruct	2006-08-11 09:23:01.000000000 -0400
@@ -1422,7 +1365,6 @@
 
 if (commonEnvironment['buildUtilities'] != '0'):
     utils = [
-        ['atsa',        'util/atsa_main.c'    ],
         ['cvanal',      'util/cvl_main.c'     ],
         ['dnoise',      'util/dnoise_main.c'  ],
         ['envext',      'util/env_main.c'     ],

csound-5.03.0-gstabs-disable-option.patch:

--- NEW FILE csound-5.03.0-gstabs-disable-option.patch ---
--- Csound5.03.0/SConstruct.gstabs-disable-option	2006-10-23 15:36:38.000000000 -0400
+++ Csound5.03.0/SConstruct	2006-10-23 15:39:28.000000000 -0400
@@ -161,6 +161,9 @@
 opts.Add('noDebug',
     'Build without debugging information.',
     '0')
+opts.Add('disableGStabs',
+    'Set to 1 if you want to turn off GStabs debug info support, which may break some architectures',
+    '0')
 opts.Add('gcc3opt',
     'Enable gcc 3.3.x or later optimizations for the specified CPU architecture (e.g. pentium3); implies noDebug.',
     '0')
@@ -289,7 +292,10 @@
     commonEnvironment.Prepend(CCFLAGS = ['-g', '-O2'])
   else:
     if not withMSVC():
-      commonEnvironment.Prepend(CCFLAGS = ['-g', '-gstabs', '-O2'])
+      debug_opts = ['-g', '-O2']
+      if commonEnvironment['disableGStabs'] == '0':
+        debug_opts.append('-gstabs')
+      commonEnvironment.Prepend(CCFLAGS = debug_opts)
 else:
   commonEnvironment.Prepend(CCFLAGS = ['-O2'])
 if commonEnvironment['useGprof'] == '1':

csound-5.03.0-no-usr-local.patch:

--- NEW FILE csound-5.03.0-no-usr-local.patch ---
--- Csound5.03.0/SConstruct.no-usr-local	2006-10-27 16:24:08.000000000 -0400
+++ Csound5.03.0/SConstruct	2006-10-27 16:26:03.000000000 -0400
@@ -306,10 +306,10 @@
 if commonEnvironment['buildRelease'] == '0':
     commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
 if commonEnvironment['Word64'] == '1':
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
     commonEnvironment.Append(CCFLAGS = ['-fPIC'])
 else:
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
 
 if commonEnvironment['useDouble'] == '0':
     print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
@@ -324,14 +324,12 @@
 
 if getPlatform() == 'linux':
     commonEnvironment.Append(CCFLAGS = "-DLINUX")
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
     commonEnvironment.Append(CPPPATH = '/usr/include')
     commonEnvironment.Append(CPPPATH = '/usr/X11R6/include')
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
 elif getPlatform() == 'darwin':
     commonEnvironment.Append(CCFLAGS = "-DMACOSX")
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     if commonEnvironment['useAltivec'] == '1':
         print 'CONFIGURATION DECISION using Altivec optmisation'
@@ -342,7 +340,6 @@
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
     if not withMSVC():
-        commonEnvironment.Append(CPPPATH = '/usr/local/include')
         commonEnvironment.Append(CPPPATH = '/usr/include')
         commonEnvironment.Append(CCFLAGS = "-mthreads")
     else:
@@ -350,18 +347,17 @@
 
 if getPlatform() == 'linux':
     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
-    pythonIncludePath = [path1, path2]
+    pythonIncludePath = [path1]
     path1 = '/usr/include/tcl8.4'
     path2 = '/usr/include/tk8.4'
-    tclIncludePath = [path1, path2]
+    tclIncludePath = [path1]
     pythonLinkFlags = []
     if commonEnvironment['Word64'] == '1':
         tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
+        pythonLibraryPath = ['/usr/lib64', tmp]
     else:
         tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
+        pythonLibraryPath = ['/usr/lib', tmp]
     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
 elif getPlatform() == 'darwin':
     pyBasePath = '/System/Library/Frameworks/Python.Framework'

csound-5.03.0-remote-fixes.patch:

--- NEW FILE csound-5.03.0-remote-fixes.patch ---
--- Csound5.03.0/OOps/remote.c.remote-fixes	2006-10-27 16:00:10.000000000 -0400
+++ Csound5.03.0/OOps/remote.c	2006-10-27 16:32:02.000000000 -0400
@@ -38,6 +38,9 @@
 
 #define ST(x)   (((REMOTE_GLOBALS*) ((CSOUND*)csound)->remoteGlobals)->x)
 
+void remote_Cleanup(CSOUND *csound);
+
+
 void remoteRESET(CSOUND *csound)
 {
     csound->remoteGlobals = NULL;
@@ -46,9 +49,9 @@
 #ifdef HAVE_SOCKETS
 
  /* get the IPaddress of this machine */
-static void getIpAddress(char *ipaddr, char *ifname)
+static int getIpAddress(char *ipaddr, char *ifname)
 {
-
+    int ret = -1;
 #ifdef WIN32
     /* VL 12/10/06: something needs to go here */
     /* gethostbyname is the real answer; code below id unsafe */
@@ -61,25 +64,26 @@
     memset(&sin, 0, sizeof (struct sockaddr_in));
     memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
     strcpy(ipaddr, inet_ntoa (sin.sin_addr));
+    ret = 0;
 
 #else
     struct ifreq ifr;
-    int fd, i;
-    unsigned char val;
+    int fd;
 
     fd = socket(AF_INET,SOCK_DGRAM, 0);
     if (fd >= 0) {
       strcpy(ifr.ifr_name, ifname);
 
       if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
-        for( i=2; i<6; i++){
-          val = (unsigned char)ifr.ifr_ifru.ifru_addr.sa_data[i];
-          sprintf(ipaddr, "%s%d%s", ipaddr, val, i==5?"":".");
-        }
+        char *local;
+        local = inet_ntoa(((struct sockaddr_in *)(&ifr.ifr_addr))->sin_addr);
+        strcpy(ipaddr, local);
+        ret = 0;
       }
     }
     close(fd);
 #endif
+    return ret;
 }
 
 char remoteID(CSOUND *csound)
@@ -88,31 +92,83 @@
     return ST(ipadrs)[len-1];
 }
 
-static void callox(CSOUND *csound)
+static int callox(CSOUND *csound)
 {
-    if (csound->remoteGlobals == NULL)
+    if (csound->remoteGlobals == NULL) {
       csound->remoteGlobals = csound->Calloc(csound, sizeof(REMOTE_GLOBALS));
+      if (csound->remoteGlobals == NULL) {
+        csound->Message(csound, Str("insufficient memory to initialize remote"
+                        " globals."));
+        goto error;
+      }
+    }
 
     ST(socksout) = (SOCK*)csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(SOCK));
+    if (ST(socksout) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize outgoing "
+                      "socket table."));
+      goto error;
+    }
     ST(socksin) = (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(socksin) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize incoming "
+                      "socket table."));
+      goto error;
+    }
     ST(insrfd_list) =
       (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(insrfd_list) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "insrfd_list."));
+      goto error;
+    }
     ST(chnrfd_list) =
       (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(chnrfd_list) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "chnrfd_list."));
+      goto error;
+    }
     ST(insrfd) = (int*) csound->Calloc(csound,(size_t)129 * sizeof(int));
+    if (ST(insrfd) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "insrfd table."));
+      goto error;
+    }
     ST(chnrfd) = (int*) csound->Calloc(csound,(size_t)17 * sizeof(int));
+    if (ST(chnrfd) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "chnrfd table."));
+      goto error;
+    }
     ST(ipadrs) = (char*) csound->Calloc(csound,(size_t)15 * sizeof(char));
+    if (ST(ipadrs) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "local ip address."));
+      goto error;
+    }
+
+    /* get IP adrs of this machine */
+    /* FIXME: don't hardcode eth0 */
+    if (getIpAddress(ST(ipadrs), "eth0") < 0) {
+      csound->Message(csound, Str("unable to get local ip address."));
+      goto error;
+    }
+
+	return 0;
 
-    getIpAddress(ST(ipadrs), "eth0"); /* get IP adrs of this machine */
+error:
+    /* Clean up anything we may have allocated before running out of memory */
+    remote_Cleanup(csound);
+    return -1;
 }
 
 /* Cleanup the above; called from musmon csoundCleanup */
 void remote_Cleanup(CSOUND *csound)
 {
     int fd;
-/*     if (csound->remoteGlobals == NULL) return; */
-    if (ST(socksout) == NULL) return;     /* if nothing allocated, return */
-    else {
+    if (csound->remoteGlobals == NULL) return;
+    if (ST(socksout) != NULL) {
       SOCK *sop = ST(socksout), *sop_end = sop + MAXREMOTES;
       for ( ; sop < sop_end; sop++)
         if ((fd = sop->rfd) > 0)
@@ -289,7 +345,12 @@
 {   /*      INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 3) {
       csound->InitError(csound, Str("missing instr nos"));
       return 0;
@@ -331,7 +392,12 @@
 {   /*      INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 2) {
       csound->InitError(csound, Str("missing instr nos"));
       return NOTOK;
@@ -361,7 +427,12 @@
 {                                            /* INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 3) {
       csound->InitError(csound, Str("missing channel nos"));
       return NOTOK;
@@ -400,7 +471,12 @@
 {                                         /*       INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
     
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 2) {
       csound->InitError(csound, Str("missing channel nos"));
       return NOTOK;

csound-5.03.0-enable-fluidsynth.patch:

Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-enable-fluidsynth.patch	5 Sep 2006 18:09:14 -0000	1.1
+++ csound-5.03.0-enable-fluidsynth.patch	29 Oct 2006 03:32:20 -0000	1.2
@@ -1,16 +1,16 @@
---- Csound5.03.0/SConstruct.enable-fluidsynth	2006-08-11 09:23:01.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-08-30 13:48:19.000000000 -0400
-@@ -212,6 +212,9 @@
- opts.Add('buildOSXGUI',
-     'On OSX, set to 1 to build the basic GUI frontend',
+--- Csound5.03.0/SConstruct.enable-fluidsynth	2006-10-21 11:03:22.000000000 -0400
++++ Csound5.03.0/SConstruct	2006-10-23 15:36:10.000000000 -0400
+@@ -225,6 +225,9 @@
      '0')
+ opts.Add('isWinNT', 'On windows, if win2000 or NT is used',
+           '%d' % withMSVC())
 +opts.Add('useFluidsynth',
 +    'Set to 1 if you want OSC support',
 +    '0')
  
  # Define the common part of the build environment.
  # This section also sets up customized options for third-party libraries, which
-@@ -405,6 +408,7 @@
+@@ -426,6 +429,7 @@
  pdhfound = configure.CheckHeader("m_pd.h", language = "C")
  tclhfound = configure.CheckHeader("tcl.h", language = "C")
  luaFound = configure.CheckHeader("lua.h", language = "C")
@@ -18,7 +18,7 @@
  swigFound = 'swig' in commonEnvironment['TOOLS']
  print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
  pythonFound = configure.CheckHeader("Python.h", language = "C")
-@@ -1187,7 +1191,7 @@
+@@ -1228,7 +1232,7 @@
  
  # FLUIDSYNTH OPCODES
  


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound.spec	8 Sep 2006 14:59:23 -0000	1.2
+++ csound.spec	29 Oct 2006 03:32:20 -0000	1.3
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       3%{?dist}
+Release:       7%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0:     http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src.tgz
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -36,10 +36,11 @@
 # cvs -z9 -d :pserver:anonymous at csound.cvs.sourceforge.net:/cvsroot/csound checkout -P -r csound-5_03_0 manual
 Source1: Csound5.03_manual.tgz
 
-Patch0: csound-5.03.0-uninitialized.patch
-Patch1: csound-5.03.0-printf-redef.patch
-Patch2: csound-5.03.0-enable-fluidsynth.patch
-Patch3: csound-5.03.0-no-gstabs.patch
+Patch0: csound-5.03.0-enable-fluidsynth.patch
+Patch1: csound-5.03.0-gstabs-disable-option.patch
+Patch2: csound-5.03.0-no-usr-local.patch
+Patch3: csound-5.03.0-disable-atsa.patch
+Patch4: csound-5.03.0-remote-fixes.patch
 
 
 %description
@@ -109,6 +110,15 @@
 %description gui
 Contains a FLTK-based GUI for Csound
 
+%package fltk
+Summary: FLTK plugins for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description fltk
+Contains FLTK plugins for csound
+
 %package jack
 Summary: Jack Audio plugins for Csound
 Group: Applications/Multimedia
@@ -144,6 +154,15 @@
 %description osc
 Open Sound Control (OSC) plugin for Csound
 
+%package virtual-keyboard
+Summary: Virtual MIDI keyboard plugin for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description virtual-keyboard
+A virtual MIDI keyboard plugin for Csound
+
 %package manual
 Summary: Csound manual
 Group: Documentation
@@ -161,10 +180,12 @@
 
 %prep
 %setup -q -n Csound5.03.0
-%patch0 -p1 -b .uninitialized
-%patch1 -p1 -b .printf-redef
-%patch2 -p1 -b .enable-fluidsynth
-%patch3 -p1 -b .no-gstabs
+%patch0 -p1 -b .enable-fluidsynth
+%patch1 -p1 -b .gstabs-disable-option
+%patch2 -p1 -b .no-usr-local
+%patch3 -p1 -b .disable-atsa
+%patch4 -p1 -b .remote-fixes
+
 tar xf %{SOURCE1}
 
 %build
@@ -174,6 +195,11 @@
       frontends/fltk_gui/CsoundGlobalSettings.cpp
 
 scons dynamicCsoundLibrary=1 \
+      buildRelease=0 \
+      noDebug=0 \
+      disableGStabs=1 \
+      buildInterfaces=1 \
+      useALSA=1 \
       usePortAudio=0 \
       usePortMIDI=0 \
       useOSC=1 \
@@ -186,6 +212,7 @@
       buildTclcsound=1 \
       buildJavaWrapper=1 \
       buildDSSI=1 \
+      buildUtilities=1 \
       prefix=%{_prefix} \
       customCCFLAGS="%{optflags}" \
       customCXXFLAGS="%{optflags}" \
@@ -268,6 +295,8 @@
 %{_bindir}/scsort
 %{_bindir}/sndinfo
 %{_bindir}/srconv
+%{_bindir}/pv_export
+%{_bindir}/pv_import
 %{_libdir}/lib%{name}.so.5.1
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/xmg/*.xmg
@@ -298,6 +327,9 @@
 %{_libdir}/%{name}/plugins/libudprecv.so
 %{_libdir}/%{name}/plugins/libudpsend.so
 %{_libdir}/%{name}/plugins/libvbap.so
+%{_libdir}/%{name}/plugins/libharmon.so
+%{_libdir}/%{name}/plugins/libugakbari.so
+%{_libdir}/%{name}/plugins/libvaops.so
 %{_libdir}/%{name}/plugins/opcodes.dir
 
 %files devel
@@ -332,6 +364,9 @@
 %files gui
 %defattr(-,root,root,0755)
 %{_bindir}/csound5gui
+
+%files fltk
+%defattr(-,root,root,0755)
 %{_libdir}/%{name}/plugins/libwidgets.so
 
 %files jack
@@ -350,6 +385,10 @@
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/plugins/libosc.so
 
+%files virtual-keyboard
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/plugins/libvirtual.so
+
 %files manual
 %defattr(-,root,root,0755)
 %doc manual/copying.txt manual/credits.txt manual/bugs.txt manual/readme.txt manual/news.txt
@@ -364,6 +403,24 @@
 %doc tutorial/*.py
 
 %changelog
+* Sat Oct 28 2006 Dan Williams <dcbw at redhat.com> 5.03.0-7
+- Rebuild to drop old source tarball
+
+* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
+- Update to a cvs snapshot for the remote plugin and a few other fixes
+- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
+- Put the virtual MIDI keyboard into its own package
+
+* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
+- Fix the remote plugin's local IP address read code, add more error checking
+
+* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
+- Drop csound-5.03.0-uninitialized.patch, upstream
+- Drop csound-5.03.0-printf-redef.patch, upstream
+- CVS snapshot to grab some updated opcodes and fixes
+- Make disabling -gstabs an option for better upstream palatability
+- Disable atsa; it breaks the build for some unknown reason
+
 * Fri Sep  8 2006 Dan Williams <dcbw at redhat.com> 5.03.0-3
 - csound-5.03.0-no-gstabs.patch added; produce dwarf2 like everyone else
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2006 18:09:14 -0000	1.2
+++ sources	29 Oct 2006 03:32:20 -0000	1.3
@@ -1,2 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-15801aef4abce5efb8975b201aa900a2  Csound5.03_src.tgz
+8f01e4b65c3cb046df04f7eae92448d5  Csound5.03_src-cvs20061027.tar.bz2


--- csound-5.03.0-no-gstabs.patch DELETED ---


--- csound-5.03.0-printf-redef.patch DELETED ---


--- csound-5.03.0-uninitialized.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 03:55:09 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 28 Oct 2006 20:55:09 -0700
Subject: rpms/moodle/FC-5 moodle.spec,1.7,1.8
Message-ID: <200610290355.k9T3t9Zd025690@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629/FC-5

Modified Files:
	moodle.spec 
Log Message:
release bump


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/moodle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moodle.spec	23 Oct 2006 01:34:29 -0000	1.7
+++ moodle.spec	29 Oct 2006 03:54:39 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sat Oct 28 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-3
+- Release bump
+
 * Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
 - Added requires php-mysql
 



From fedora-extras-commits at redhat.com  Sun Oct 29 03:55:08 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 28 Oct 2006 20:55:08 -0700
Subject: rpms/moodle/FC-4 moodle.spec,1.7,1.8
Message-ID: <200610290355.k9T3t89r025687@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629/FC-4

Modified Files:
	moodle.spec 
Log Message:
release bump


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moodle.spec	23 Oct 2006 01:34:28 -0000	1.7
+++ moodle.spec	29 Oct 2006 03:54:37 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sat Oct 28 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-3
+- Release bump
+
 * Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
 - Added requires php-mysql
 



From fedora-extras-commits at redhat.com  Sun Oct 29 03:55:10 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 28 Oct 2006 20:55:10 -0700
Subject: rpms/moodle/FC-6 moodle.spec,1.8,1.9
Message-ID: <200610290355.k9T3tABD025691@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629/FC-6

Modified Files:
	moodle.spec 
Log Message:
release bump


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-6/moodle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moodle.spec	23 Oct 2006 01:34:29 -0000	1.8
+++ moodle.spec	29 Oct 2006 03:54:40 -0000	1.9
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sat Oct 28 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-3
+- Release bump
+
 * Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
 - Added requires php-mysql
 



From fedora-extras-commits at redhat.com  Sun Oct 29 03:55:11 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 28 Oct 2006 20:55:11 -0700
Subject: rpms/moodle/devel moodle.spec,1.8,1.9
Message-ID: <200610290355.k9T3tBVM025696@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629/devel

Modified Files:
	moodle.spec 
Log Message:
release bump


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moodle.spec	23 Oct 2006 01:34:29 -0000	1.8
+++ moodle.spec	29 Oct 2006 03:54:41 -0000	1.9
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sat Oct 28 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-3
+- Release bump
+
 * Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
 - Added requires php-mysql
 



From fedora-extras-commits at redhat.com  Sun Oct 29 04:25:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:25:34 -0700
Subject: rpms/php-pear-Date-Holidays - New directory
Message-ID: <200610290425.k9T4PYLw029023@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29019/php-pear-Date-Holidays

Log Message:
Directory /cvs/extras/rpms/php-pear-Date-Holidays added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 29 04:25:39 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:25:39 -0700
Subject: rpms/php-pear-Date-Holidays/devel - New directory
Message-ID: <200610290425.k9T4PdaO029037@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29019/php-pear-Date-Holidays/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Date-Holidays/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 29 04:25:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:25:51 -0700
Subject: rpms/php-pear-Date-Holidays Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610290425.k9T4PppI029068@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29062

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Date-Holidays


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Date-Holidays
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 29 04:25:57 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:25:57 -0700
Subject: rpms/php-pear-Date-Holidays/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610290425.k9T4PviH029084@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29062/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Date-Holidays


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 29 04:26:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:26:51 -0700
Subject: rpms/php-pear-Date-Holidays import.log,1.1,1.2
Message-ID: <200610290426.k9T4Qpni029160@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29124

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Date-Holidays-0.16.1-1 on branch devel from php-pear-Date-Holidays-0.16.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date-Holidays/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Oct 2006 04:25:51 -0000	1.1
+++ import.log	29 Oct 2006 04:26:20 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Date-Holidays-0_16_1-1:HEAD:php-pear-Date-Holidays-0.16.1-1.src.rpm:1162095977



From fedora-extras-commits at redhat.com  Sun Oct 29 04:26:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:26:51 -0700
Subject: rpms/php-pear-Date-Holidays/devel php-pear-Date-Holidays.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610290426.k9T4QpIL029164@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29124/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Date-Holidays.spec 
Log Message:
auto-import php-pear-Date-Holidays-0.16.1-1 on branch devel from php-pear-Date-Holidays-0.16.1-1.src.rpm


--- NEW FILE php-pear-Date-Holidays.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Date_Holidays

Name:           php-pear-Date-Holidays
Version:        0.16.1
Release:        1%{?dist}
Summary:        Driver based class to calculate holidays

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Date_Holidays
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(Date) php-pear(XML_Serializer)
Requires:       php-pear(Console_Getargs)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
Date_Holidays helps you calculating the dates and titles of holidays and
other special celebrations. The calculation is driver-based so it is easy
to add new drivers that calculate a country's holidays. The methods of the
class can be used to get a holiday's date and title in various languages.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{_bindir}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/Date/Holidays*


%changelog
* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 0.16.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date-Holidays/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Oct 2006 04:25:56 -0000	1.1
+++ .cvsignore	29 Oct 2006 04:26:21 -0000	1.2
@@ -0,0 +1 @@
+Date_Holidays-0.16.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date-Holidays/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Oct 2006 04:25:56 -0000	1.1
+++ sources	29 Oct 2006 04:26:21 -0000	1.2
@@ -0,0 +1 @@
+84dcf7f0c92afdf08b9c1d761a8ca89f  Date_Holidays-0.16.1.tgz



From fedora-extras-commits at redhat.com  Sun Oct 29 04:29:13 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:29:13 -0700
Subject: owners owners.list,1.1876,1.1877
Message-ID: <200610290429.k9T4TDqn029222@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29206

Modified Files:
	owners.list 
Log Message:
php-pear-Date-Holidays


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1876
retrieving revision 1.1877
diff -u -r1.1876 -r1.1877
--- owners.list	27 Oct 2006 22:21:26 -0000	1.1876
+++ owners.list	29 Oct 2006 04:28:43 -0000	1.1877
@@ -1756,6 +1756,7 @@
 Fedora Extras|php-pear-Console-Getargs|Command-line arguments and parameters parser|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Console-Table|Class that makes it easy to build console style tables|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Date-Holidays|Driver based class to calculate holidays|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 29 05:12:08 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 22:12:08 -0700
Subject: rpms/lucidlife/FC-6 lucidlife-add-.desktop-encoding.patch, NONE,
	1.1 lucidlife-make-docs-use-proper-dir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lucidlife.spec, 1.13, 1.14 sources, 1.2,
	1.3 make-docs-use-proper-dir.patch, 1.1, NONE
Message-ID: <200610290512.k9T5C8l5032389@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32342

Modified Files:
	.cvsignore lucidlife.spec sources 
Added Files:
	lucidlife-add-.desktop-encoding.patch 
	lucidlife-make-docs-use-proper-dir.patch 
Removed Files:
	make-docs-use-proper-dir.patch 
Log Message:
Update to new upstream release (0.9.1)

lucidlife-add-.desktop-encoding.patch:

--- NEW FILE lucidlife-add-.desktop-encoding.patch ---
--- lucidlife.desktop.in.old	2006-10-28 11:02:18.000000000 -0700
+++ lucidlife.desktop.in	2006-10-28 11:10:43.000000000 -0700
@@ -6,3 +6,4 @@
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Game;
+Encoding=UTF-8

lucidlife-make-docs-use-proper-dir.patch:

--- NEW FILE lucidlife-make-docs-use-proper-dir.patch ---
--- doc/Makefile.am.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.am	2006-03-28 20:22:32.000000000 -0800
@@ -1,4 +1,4 @@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 
 EXTRA_DIST = *.png *.gif *.html *.css
--- doc/Makefile.in.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.in	2006-03-28 20:24:32.000000000 -0800
@@ -188,7 +188,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 EXTRA_DIST = *.png *.gif *.html *.css
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2006 21:10:04 -0000	1.2
+++ .cvsignore	29 Oct 2006 05:11:38 -0000	1.3
@@ -1 +1 @@
-lucidlife-0.9.tar.gz
+lucidlife-0.9.1.tar.gz


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-6/lucidlife.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lucidlife.spec	27 Aug 2006 22:51:56 -0000	1.13
+++ lucidlife.spec	29 Oct 2006 05:11:38 -0000	1.14
@@ -1,13 +1,14 @@
 Name:           lucidlife
-Version:        0.9
-Release:        11%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://icculus.org/~jcspray/LucidLife/
 Source0:        http://icculus.org/~jcspray/LucidLife/%{name}-%{version}.tar.gz
-Patch0:			make-docs-use-proper-dir.patch
+Patch0:		%{name}-make-docs-use-proper-dir.patch
+Patch1:		%{name}-add-.desktop-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -29,6 +30,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .old
+%patch1 -p0 -b .old
 
 
 %build
@@ -62,6 +64,13 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
+- Update to new upstream release (0.9.1)
+- Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:
+  + add-.desktop-encoding.patch
+- Add %%name prefix to old make-docs-use-proper-dir patch filename
+  to keep it all in the same logical namespace.
+
 * Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-11
 - Mass FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2006 21:10:04 -0000	1.2
+++ sources	29 Oct 2006 05:11:38 -0000	1.3
@@ -1 +1 @@
-25bcde0ddbe4f7db4a7ea92fcc36b7bc  lucidlife-0.9.tar.gz
+68e9cfe091fa18380984609af9c56467  lucidlife-0.9.1.tar.gz


--- make-docs-use-proper-dir.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 05:40:52 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 22:40:52 -0700
Subject: rpms/lucidlife/FC-5 lucidlife-add-.desktop-encoding.patch, NONE,
	1.1 lucidlife-make-docs-use-proper-dir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lucidlife.spec, 1.9, 1.10 sources, 1.2,
	1.3 make-docs-use-proper-dir.patch, 1.1, NONE
Message-ID: <200610290540.k9T5eqiB002117@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1956

Modified Files:
	.cvsignore lucidlife.spec sources 
Added Files:
	lucidlife-add-.desktop-encoding.patch 
	lucidlife-make-docs-use-proper-dir.patch 
Removed Files:
	make-docs-use-proper-dir.patch 
Log Message:
Update to new upstream release (0.9.1)

lucidlife-add-.desktop-encoding.patch:

--- NEW FILE lucidlife-add-.desktop-encoding.patch ---
--- lucidlife.desktop.in.old	2006-10-28 11:02:18.000000000 -0700
+++ lucidlife.desktop.in	2006-10-28 11:10:43.000000000 -0700
@@ -6,3 +6,4 @@
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Game;
+Encoding=UTF-8

lucidlife-make-docs-use-proper-dir.patch:

--- NEW FILE lucidlife-make-docs-use-proper-dir.patch ---
--- doc/Makefile.am.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.am	2006-03-28 20:22:32.000000000 -0800
@@ -1,4 +1,4 @@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 
 EXTRA_DIST = *.png *.gif *.html *.css
--- doc/Makefile.in.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.in	2006-03-28 20:24:32.000000000 -0800
@@ -188,7 +188,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 EXTRA_DIST = *.png *.gif *.html *.css
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2006 21:10:04 -0000	1.2
+++ .cvsignore	29 Oct 2006 05:40:21 -0000	1.3
@@ -1 +1 @@
-lucidlife-0.9.tar.gz
+lucidlife-0.9.1.tar.gz


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lucidlife.spec	9 Apr 2006 05:13:24 -0000	1.9
+++ lucidlife.spec	29 Oct 2006 05:40:21 -0000	1.10
@@ -1,13 +1,14 @@
 Name:           lucidlife
-Version:        0.9
-Release:        7%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://icculus.org/~jcspray/LucidLife/
 Source0:        http://icculus.org/~jcspray/LucidLife/%{name}-%{version}.tar.gz
-Patch0:			make-docs-use-proper-dir.patch
+Patch0:		%{name}-make-docs-use-proper-dir.patch
+Patch1:		%{name}-add-.desktop-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .old
+%patch1 -p0 -b .old
 
 
 %build
@@ -60,6 +62,13 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
+- Update to new upstream release (0.9.1)
+- Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:
+  + add-.desktop-encoding.patch
+- Add %%name prefix to old make-docs-use-proper-dir patch filename
+  to keep it all in the same logical namespace.
+
 * Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7
 - Use desktop-file-install's "--delete-original" option instead of doing
   it manually.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2006 21:10:04 -0000	1.2
+++ sources	29 Oct 2006 05:40:21 -0000	1.3
@@ -1 +1 @@
-25bcde0ddbe4f7db4a7ea92fcc36b7bc  lucidlife-0.9.tar.gz
+68e9cfe091fa18380984609af9c56467  lucidlife-0.9.1.tar.gz


--- make-docs-use-proper-dir.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 06:26:00 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 23:26:00 -0700
Subject: rpms/lucidlife/FC-5 lucidlife.spec,1.10,1.11
Message-ID: <200610290626.k9T6Q0IV007342@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7322

Modified Files:
	lucidlife.spec 
Log Message:
Add gettext and perl(XML::Parser) to BR to fix reduced mock build


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lucidlife.spec	29 Oct 2006 05:40:21 -0000	1.10
+++ lucidlife.spec	29 Oct 2006 06:25:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           lucidlife
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
@@ -14,6 +14,8 @@
 BuildRequires:  gtk2-devel >= 2.6.0
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext
 
 %description
 LucidLife is a Conway's Life simulator. The rules are rather simple. The game
@@ -62,6 +64,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1.1
+- Add gettext and perl(XML::Parser) as BuildRequires to fix reduced mock build
+ 
 * Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
 - Update to new upstream release (0.9.1)
 - Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:



From fedora-extras-commits at redhat.com  Sun Oct 29 11:08:59 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 29 Oct 2006 04:08:59 -0700
Subject: rpms/heartbeat/devel heartbeat.spec,1.9,1.10
Message-ID: <200610291108.k9TB8xBK024290@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24274

Modified Files:
	heartbeat.spec 
Log Message:
* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
- fix preun, postun to check for upgrade (#212133)



Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- heartbeat.spec	30 Aug 2006 19:32:48 -0000	1.9
+++ heartbeat.spec	29 Oct 2006 11:08:28 -0000	1.10
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -157,9 +157,15 @@
 /sbin/chkconfig --add heartbeat
 
 %preun
-/sbin/chkconfig --del heartbeat
+if [ $1 = 0 ] ; then
+    /sbin/service heartbeat stop
+    /sbin/chkconfig --del heartbeat
+fi
 
 %postun 
+if [ "$1" -ge "1" ] ; then
+    /sbin/service heartbeat condrestart
+fi
 /sbin/ldconfig
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
@@ -295,6 +301,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
+- fix preun, postun to check for upgrade (#212133)
+
 * Wed Aug 30 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-2
 - rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:14:58 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 29 Oct 2006 04:14:58 -0700
Subject: rpms/wvs-data/devel wvs-data.spec,1.2,1.3
Message-ID: <200610291114.k9TBEw8f024490@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24472

Modified Files:
	wvs-data.spec 
Log Message:
* Sun Oct 29 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-3
- Bump to remove %{?dist} tag.



Index: wvs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/devel/wvs-data.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wvs-data.spec	28 Oct 2006 16:22:15 -0000	1.2
+++ wvs-data.spec	29 Oct 2006 11:14:27 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:		wvs-data
 Version:	0.0.%{WVS_date}
-Release:	2%{?dist}
+Release:	3
 Summary:	World Vector Shoreline data
 
 Group:		Applications/Engineering
@@ -45,8 +45,11 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Oct 29 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-3
+- Bump to remove %%{?dist} tag.
+
 * Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Add %%{?dist} tag as buildsys forces this.
+- Add %%{?dist} tag as CVS forces this.
 
 * Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
 - Directory name change.



From fedora-extras-commits at redhat.com  Sun Oct 29 11:24:58 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 04:24:58 -0700
Subject: rpms/kadu/devel .cvsignore, 1.6, 1.7 kadu.spec, 1.12, 1.13 sources, 
	1.6, 1.7
Message-ID: <200610291124.k9TBOw3U030606@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30586

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.16.20061029svn
- Bump cvs snapshot to 20061029



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Sep 2006 10:14:41 -0000	1.6
+++ .cvsignore	29 Oct 2006 11:24:27 -0000	1.7
@@ -1 +1 @@
-kadu-20060915.tar.bz2
+kadu-20061029.tar.bz2


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kadu.spec	10 Oct 2006 16:12:24 -0000	1.12
+++ kadu.spec	29 Oct 2006 11:24:27 -0000	1.13
@@ -1,7 +1,7 @@
-%define		cvs_date	20060915
+%define		cvs_date	20061029
 Name:		kadu
 Version:	0.5.0
-Release:	0.15.%{cvs_date}svn%{?dist}
+Release:	0.16.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -453,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.16.20061029svn
+- Bump cvs snapshot to 20061029
+
 * Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.15.20060915svn
 - Another fix to not rebuilding kadu-amarok
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Sep 2006 10:14:41 -0000	1.6
+++ sources	29 Oct 2006 11:24:27 -0000	1.7
@@ -1,4 +1,3 @@
-575746c975382dc7a7d275175449cb21  kadu-20060915.tar.bz2
 62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
 0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
@@ -16,3 +15,4 @@
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
 422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz
+203d4b6a041f39703a9b5d259a259c38  kadu-20061029.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 29 11:29:03 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 29 Oct 2006 04:29:03 -0700
Subject: rpms/heartbeat/FC-4 heartbeat.spec,1.5,1.6
Message-ID: <200610291129.k9TBT31O030715@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666/FC-4

Modified Files:
	heartbeat.spec 
Log Message:
fix preun, postun to check for upgrade (#212133)


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- heartbeat.spec	16 Aug 2006 12:03:07 -0000	1.5
+++ heartbeat.spec	29 Oct 2006 11:28:33 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          1%{?dist}
+Release:          3%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -157,9 +157,15 @@
 /sbin/chkconfig --add heartbeat
 
 %preun
-/sbin/chkconfig --del heartbeat
+if [ $1 = 0 ] ; then
+    /sbin/service heartbeat stop
+    /sbin/chkconfig --del heartbeat
+fi
 
 %postun 
+if [ "$1" -ge "1" ] ; then
+    /sbin/service heartbeat condrestart
+fi
 /sbin/ldconfig
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
@@ -295,6 +301,12 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
+- fix preun, postun to check for upgrade (#212133)
+
+* Wed Aug 30 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-2
+- rebuild for Fedora Extras 6
+
 * Wed Aug 16 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-1
 - upstream version 2.0.7
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:29:04 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 29 Oct 2006 04:29:04 -0700
Subject: rpms/heartbeat/FC-6 heartbeat.spec,1.9,1.10
Message-ID: <200610291129.k9TBT4kG030719@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666/FC-6

Modified Files:
	heartbeat.spec 
Log Message:
fix preun, postun to check for upgrade (#212133)


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-6/heartbeat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- heartbeat.spec	30 Aug 2006 19:32:48 -0000	1.9
+++ heartbeat.spec	29 Oct 2006 11:28:34 -0000	1.10
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -157,9 +157,15 @@
 /sbin/chkconfig --add heartbeat
 
 %preun
-/sbin/chkconfig --del heartbeat
+if [ $1 = 0 ] ; then
+    /sbin/service heartbeat stop
+    /sbin/chkconfig --del heartbeat
+fi
 
 %postun 
+if [ "$1" -ge "1" ] ; then
+    /sbin/service heartbeat condrestart
+fi
 /sbin/ldconfig
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
@@ -295,6 +301,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
+- fix preun, postun to check for upgrade (#212133)
+
 * Wed Aug 30 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-2
 - rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:29:04 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 29 Oct 2006 04:29:04 -0700
Subject: rpms/heartbeat/FC-5 heartbeat.spec,1.5,1.6
Message-ID: <200610291129.k9TBT4lZ030718@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666/FC-5

Modified Files:
	heartbeat.spec 
Log Message:
fix preun, postun to check for upgrade (#212133)


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- heartbeat.spec	16 Aug 2006 12:03:08 -0000	1.5
+++ heartbeat.spec	29 Oct 2006 11:28:33 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          1%{?dist}
+Release:          3%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -157,9 +157,15 @@
 /sbin/chkconfig --add heartbeat
 
 %preun
-/sbin/chkconfig --del heartbeat
+if [ $1 = 0 ] ; then
+    /sbin/service heartbeat stop
+    /sbin/chkconfig --del heartbeat
+fi
 
 %postun 
+if [ "$1" -ge "1" ] ; then
+    /sbin/service heartbeat condrestart
+fi
 /sbin/ldconfig
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
@@ -295,6 +301,12 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
+- fix preun, postun to check for upgrade (#212133)
+
+* Wed Aug 30 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-2
+- rebuild for Fedora Extras 6
+
 * Wed Aug 16 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-1
 - upstream version 2.0.7
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:47:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 04:47:48 -0700
Subject: rpms/kadu/devel kadu.spec,1.13,1.14
Message-ID: <200610291147.k9TBlmKR031003@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30983

Modified Files:
	kadu.spec 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.17.20061029svn
- Disabling kadu-amarok on ppc arch



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kadu.spec	29 Oct 2006 11:24:27 -0000	1.13
+++ kadu.spec	29 Oct 2006 11:47:18 -0000	1.14
@@ -244,7 +244,7 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
-%ifnarch ppc64 x86_64 s390 s390x ia64
+%ifnarch ppc64 x86_64 s390 s390x ia64 ppc
 	module_amarok \
 %endif
 	module_filedesc \
@@ -408,7 +408,7 @@
 %mod_files2 xmms
 
 
-%ifnarch ppc64 x86_64 s390 s390x ia64
+%ifnarch ppc64 x86_64 s390 s390x ia64 ppc
 %mod_files2 amarok
 
 %endif
@@ -453,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.17.20061029svn
+- Disabling kadu-amarok on ppc arch
+
 * Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.16.20061029svn
 - Bump cvs snapshot to 20061029
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:49:51 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 04:49:51 -0700
Subject: rpms/kadu/devel kadu.spec,1.14,1.15
Message-ID: <200610291149.k9TBnpuo031065@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31049

Modified Files:
	kadu.spec 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.17.20061029svn
- Disabling kadu-amarok on ppc arch



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kadu.spec	29 Oct 2006 11:47:18 -0000	1.14
+++ kadu.spec	29 Oct 2006 11:49:20 -0000	1.15
@@ -1,7 +1,7 @@
 %define		cvs_date	20061029
 Name:		kadu
 Version:	0.5.0
-Release:	0.16.%{cvs_date}svn%{?dist}
+Release:	0.17.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL



From fedora-extras-commits at redhat.com  Sun Oct 29 11:56:19 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 29 Oct 2006 04:56:19 -0700
Subject: comps Makefile,1.2,1.3
Message-ID: <200610291156.k9TBuJ8q031166@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31141

Modified Files:
	Makefile 
Log Message:
remove reference to non-existant "comps" target


Index: Makefile
===================================================================
RCS file: /cvs/extras/comps/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	26 Feb 2006 20:31:58 -0000	1.2
+++ Makefile	29 Oct 2006 11:55:48 -0000	1.3
@@ -1,7 +1,7 @@
 XMLINFILES=$(wildcard *.xml.in)
 XMLFILES = $(patsubst %.xml.in,%.xml,$(XMLINFILES))
 
-all: po comps $(XMLFILES)
+all: po $(XMLFILES)
 
 po: $(XMLINFILES)
 	make -C po || exit 1



From fedora-extras-commits at redhat.com  Sun Oct 29 12:40:01 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 05:40:01 -0700
Subject: rpms/perl-Unicode-Map8/FC-5 perl-Unicode-Map8.spec,1.10,1.11
Message-ID: <200610291240.k9TCe1VI002348@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304/FC-5

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
actually apply the patches...


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/FC-5/perl-Unicode-Map8.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Unicode-Map8.spec	28 Oct 2006 09:12:17 -0000	1.10
+++ perl-Unicode-Map8.spec	29 Oct 2006 12:39:31 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -28,6 +28,8 @@
 
 %prep
 %setup -q -n Unicode-Map8-%{version}
+%patch0 -p0 -b .declaration
+%patch1 -p0 -b .type
 
 
 %build
@@ -64,6 +66,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-11
+- actually apply the patches
+
 * Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
 - add patches for x86_64
 



From fedora-extras-commits at redhat.com  Sun Oct 29 12:40:02 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 05:40:02 -0700
Subject: rpms/perl-Unicode-Map8/FC-6 perl-Unicode-Map8.spec,1.11,1.12
Message-ID: <200610291240.k9TCe2jM002351@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304/FC-6

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
actually apply the patches...


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/FC-6/perl-Unicode-Map8.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Unicode-Map8.spec	28 Oct 2006 09:12:18 -0000	1.11
+++ perl-Unicode-Map8.spec	29 Oct 2006 12:39:32 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -28,6 +28,8 @@
 
 %prep
 %setup -q -n Unicode-Map8-%{version}
+%patch0 -p0 -b .declaration
+%patch1 -p0 -b .type
 
 
 %build
@@ -64,6 +66,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-11
+- actually apply the patches
+
 * Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
 - add patches for x86_64
 



From fedora-extras-commits at redhat.com  Sun Oct 29 12:40:03 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 05:40:03 -0700
Subject: rpms/perl-Unicode-Map8/devel perl-Unicode-Map8.spec,1.11,1.12
Message-ID: <200610291240.k9TCe3qt002354@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304/devel

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
actually apply the patches...


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Unicode-Map8.spec	28 Oct 2006 09:12:24 -0000	1.11
+++ perl-Unicode-Map8.spec	29 Oct 2006 12:39:32 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -28,6 +28,8 @@
 
 %prep
 %setup -q -n Unicode-Map8-%{version}
+%patch0 -p0 -b .declaration
+%patch1 -p0 -b .type
 
 
 %build
@@ -64,6 +66,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-11
+- actually apply the patches
+
 * Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
 - add patches for x86_64
 



From fedora-extras-commits at redhat.com  Sun Oct 29 13:04:13 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 06:04:13 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-5 perl-Unicode-MapUTF8.spec,1.7,1.8
Message-ID: <200610291304.k9TD4Dm7005615@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5566/FC-5

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Unicode-MapUTF8.spec	22 Feb 2006 23:01:11 -0000	1.7
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:42 -0000	1.8
@@ -1,23 +1,21 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Unicode-MapUTF8
-Version:        1.09
-Release:        6%{?dist}
+Version:        1.11
+Release:        2%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Unicode-MapUTF8/
-Source0:        http://www.cpan.org/authors/id/S/SN/SNOWHARE/Unicode-MapUTF8-1.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Jcode), perl(Unicode::String), perl(Unicode::Map)
 BuildRequires:  perl(Unicode::Map8)
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch: x86_64
 
 %description
 Unicode::MapUTF8 Provides an adapter layer between core routines for
@@ -65,6 +63,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- perl-Unicode-Map8 builds on x86_64 now, rebuilding
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1
+- update to 1.11
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.09-6
 - rebuild for FC5
 - ExcludeArch x86_64 because perl-Unicode-Map8 does not work on this arch



From fedora-extras-commits at redhat.com  Sun Oct 29 13:04:16 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 06:04:16 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-6 perl-Unicode-MapUTF8.spec,1.8,1.9
Message-ID: <200610291304.k9TD4GcJ005618@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5566/FC-6

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-6/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Unicode-MapUTF8.spec	30 Aug 2006 16:24:13 -0000	1.8
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:46 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -16,8 +16,6 @@
 BuildRequires:  perl(Jcode), perl(Unicode::String), perl(Unicode::Map)
 BuildRequires:  perl(Unicode::Map8)
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch: x86_64
 
 %description
 Unicode::MapUTF8 Provides an adapter layer between core routines for
@@ -65,6 +63,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- perl-Unicode-Map8 builds on x86_64 now, rebuilding
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1
 - update to 1.11
 



From fedora-extras-commits at redhat.com  Sun Oct 29 13:04:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 06:04:17 -0700
Subject: rpms/perl-Unicode-MapUTF8/devel perl-Unicode-MapUTF8.spec,1.8,1.9
Message-ID: <200610291304.k9TD4HKX005619@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5566/devel

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/devel/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Unicode-MapUTF8.spec	30 Aug 2006 16:24:13 -0000	1.8
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:47 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -16,8 +16,6 @@
 BuildRequires:  perl(Jcode), perl(Unicode::String), perl(Unicode::Map)
 BuildRequires:  perl(Unicode::Map8)
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch: x86_64
 
 %description
 Unicode::MapUTF8 Provides an adapter layer between core routines for
@@ -65,6 +63,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- perl-Unicode-Map8 builds on x86_64 now, rebuilding
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1
 - update to 1.11
 



From fedora-extras-commits at redhat.com  Sun Oct 29 14:09:40 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 07:09:40 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610291409.k9TE9e88009151@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9131

Modified Files:
	.cvsignore sources 
Log Message:
update sources file to match spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:10:23 -0000	1.2
+++ .cvsignore	29 Oct 2006 14:09:09 -0000	1.3
@@ -1 +1 @@
-Unicode-MapUTF8-1.09.tar.gz
+Unicode-MapUTF8-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:10:23 -0000	1.2
+++ sources	29 Oct 2006 14:09:09 -0000	1.3
@@ -1 +1 @@
-32b2593bb38b24b5f5fef2aaf444a367  Unicode-MapUTF8-1.09.tar.gz
+16e66ee0bdc0e6cc9c36e29212d8ffdc  Unicode-MapUTF8-1.11.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 14:11:53 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 07:11:53 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-6 perl-Unicode-MapUTF8.spec,1.9,1.10
Message-ID: <200610291411.k9TEBr14009257@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/FC-6

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-6/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:46 -0000	1.9
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 14:11:23 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -64,6 +64,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- rebuild
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
 - perl-Unicode-Map8 builds on x86_64 now, rebuilding
 
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1



From fedora-extras-commits at redhat.com  Sun Oct 29 14:11:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 07:11:54 -0700
Subject: rpms/perl-Unicode-MapUTF8/devel perl-Unicode-MapUTF8.spec,1.9,1.10
Message-ID: <200610291411.k9TEBsXW009260@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/devel

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/devel/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:47 -0000	1.9
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 14:11:24 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -64,6 +64,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- rebuild
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
 - perl-Unicode-Map8 builds on x86_64 now, rebuilding
 
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1



From fedora-extras-commits at redhat.com  Sun Oct 29 14:11:53 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 07:11:53 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-5 perl-Unicode-MapUTF8.spec,1.8,1.9
Message-ID: <200610291411.k9TEBrmD009254@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/FC-5

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:42 -0000	1.8
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 14:11:22 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -64,6 +64,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- rebuild
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
 - perl-Unicode-Map8 builds on x86_64 now, rebuilding
 
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1



From fedora-extras-commits at redhat.com  Sun Oct 29 14:26:27 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sun, 29 Oct 2006 07:26:27 -0700
Subject: rpms/smbldap-tools/devel smbldap-tools.spec,1.3,1.4
Message-ID: <200610291426.k9TEQR0Y009525@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9487

Modified Files:
	smbldap-tools.spec 
Log Message:
perl(Unicode::MapUTF8) now available on x86_64, so remove ExcludeArch
and revert to noarch package (#211866)



Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smbldap-tools.spec	24 Oct 2006 07:35:18 -0000	1.3
+++ smbldap-tools.spec	29 Oct 2006 14:25:57 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
@@ -10,12 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
-#BuildArch:	noarch
-ExcludeArch:	x86_64
-# Debuginfo package would be empty as there are no binaries in this package
-%define debug_package %{nil}
+BuildArch:	noarch
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -69,6 +64,10 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Sun Oct 29 2006 Paul Howarth <paul at city-fan.org> 0.9.2-5
+- perl(Unicode::MapUTF8) now available on x86_64, so remove ExcludeArch
+  and revert to noarch package (#211866)
+
 * Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
 - Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
 - A consequence of this is that the package can no longer be noarch



From fedora-extras-commits at redhat.com  Sun Oct 29 14:27:31 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:27:31 -0700
Subject: rpms/kbibtex/devel kbibtex-0.1.5-filteredselection.patch, NONE,
	1.1 kbibtex-0.1.5-gcc4.2.patch, NONE,
	1.1 kbibtex-0.1.5-viewdocument.patch, NONE, 1.1 kbibtex.spec, 1.6, 1.7
Message-ID: <200610291427.k9TERV9S009559@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9524

Modified Files:
	kbibtex.spec 
Added Files:
	kbibtex-0.1.5-filteredselection.patch 
	kbibtex-0.1.5-gcc4.2.patch kbibtex-0.1.5-viewdocument.patch 
Log Message:
- official kbibtex patches against 1.5.0 applied



kbibtex-0.1.5-filteredselection.patch:

--- NEW FILE kbibtex-0.1.5-filteredselection.patch ---
Index: src/documentlistview.cpp
===================================================================
--- src/documentlistview.cpp	(Revision 301)
+++ src/documentlistview.cpp	(Revision 302)
@@ -221,10 +221,13 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            m_bibtexFile->deleteElement( kblvi->element() );
-            it++;
-            takeItem( kblvi );
-            delete ( kblvi );
+            if ( kblvi->isVisible() )
+            {
+                m_bibtexFile->deleteElement( kblvi->element() );
+                it++;
+                takeItem( kblvi );
+                delete ( kblvi );
+            }
         }
 
         if ( above )
@@ -246,7 +249,7 @@
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
             BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
-            if ( entry != NULL )
+            if ( entry != NULL && kblvi->isVisible() )
             {
                 if ( !refs.isEmpty() )
                     refs.append( "," );
@@ -621,7 +624,8 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            exporter->save( &buffer, kblvi->element() );
+            if ( kblvi->isVisible() )
+                exporter->save( &buffer, kblvi->element() );
             it++;
         }
         delete exporter;

kbibtex-0.1.5-gcc4.2.patch:

--- NEW FILE kbibtex-0.1.5-gcc4.2.patch ---
Index: src/fileimporter.h
===================================================================
--- src/fileimporter.h	(Revision 307)
+++ src/fileimporter.h	(Arbeitskopie)
@@ -39,7 +39,7 @@
         ~FileImporter();
 
         File* load ( const QString& text );
-        virtual File* load( QIODevice *iodevice ) = NULL;
+        virtual File* load( QIODevice *iodevice ) = 0;
 
         static bool guessCanDecode( const QString & ) { return FALSE; };
 

kbibtex-0.1.5-viewdocument.patch:

--- NEW FILE kbibtex-0.1.5-viewdocument.patch ---
Index: src/documentwidget.h
===================================================================
--- src/documentwidget.h	(Revision 308)
+++ src/documentwidget.h	(Revision 310)
@@ -106,6 +106,7 @@
         int m_newElementCounter;
         EditMode m_editMode;
         KActionMenu *m_viewDocumentActionMenu;
+        QStringList m_viewDocumentActionMenuURLs;
         KActionMenu *m_searchWebsitesActionMenu;
         KAction *m_find;
         KAction *m_findNext;
Index: src/documentwidget.cpp
===================================================================
--- src/documentwidget.cpp	(Revision 308)
+++ src/documentwidget.cpp	(Revision 310)
@@ -471,13 +471,13 @@
         m_listViewElements->setFactory( factory, client );
         m_sourceView->setFactory( factory, client );
 
+        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         if ( m_viewDocumentActionMenu != NULL )
             connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
 
         m_copyReference = client->action( "edit_copyref" );
         m_find = client->action( "edit_find" );
         m_findNext = client->action( "edit_find_next" );
-        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
         m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
     }
@@ -486,6 +486,7 @@
     {
         KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
         popup->clear();
+        m_viewDocumentActionMenuURLs.clear();
 
         BibTeX::Element * currentElement = NULL;
 
@@ -517,6 +518,7 @@
                         popup->insertItem( SmallIcon( "html" ), prettyURL );
                     else
                         popup->insertItem( prettyURL );
+                    m_viewDocumentActionMenuURLs.append( prettyURL );
                 }
                 m_viewDocumentActionMenu->setEnabled( TRUE );
             }
@@ -908,7 +910,7 @@
 
     void DocumentWidget::slotViewDocument( int id )
     {
-        kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
+        kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
     }
 
 }


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kbibtex.spec	18 Oct 2006 12:05:17 -0000	1.6
+++ kbibtex.spec	29 Oct 2006 14:27:00 -0000	1.7
@@ -1,12 +1,15 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
 Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
+Patch0:		kbibtex-0.1.5-filteredselection.patch
+Patch1:		kbibtex-0.1.5-gcc4.2.patch
+Patch2:		kbibtex-0.1.5-viewdocument.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -19,7 +22,9 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .filteredselection
+%patch1 -p0 -b .gcc4.2
+%patch2	-p0 -b .viewdocument
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -114,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
+- latest released patches (filteredselection,gcc4.2,viewdocument)
+
 * Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
 - Update to 0.1.5
 



From fedora-extras-commits at redhat.com  Sun Oct 29 14:33:38 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:33:38 -0700
Subject: rpms/kbibtex/FC-5 kbibtex.spec,1.5,1.6
Message-ID: <200610291433.k9TEXceg009723@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9707

Modified Files:
	kbibtex.spec 
Log Message:
- applied latest official kbibtex patch-set




Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kbibtex.spec	18 Oct 2006 11:51:35 -0000	1.5
+++ kbibtex.spec	29 Oct 2006 14:33:07 -0000	1.6
@@ -7,6 +7,9 @@
 License:	GPL
 URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
 Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
+Patch0:		kbibtex-0.1.5-filteredselection.patch
+Patch1:		kbibtex-0.1.5-gcc4.2.patch
+Patch2:		kbibtex-0.1.5-viewdocument.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -19,7 +22,9 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .filteredselection
+%patch1 -p0 -b .gcc4.2
+%patch2	-p0 -b .viewdocument
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -114,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
+- latest released patches (filteredselection,gcc4.2,viewdocument)
+
 * Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
 - Update to 1.5.0
 



From fedora-extras-commits at redhat.com  Sun Oct 29 14:34:55 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sun, 29 Oct 2006 07:34:55 -0700
Subject: rpms/smbldap-tools/FC-6 smbldap-tools.spec,1.3,1.4
Message-ID: <200610291434.k9TEYtil009795@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9774

Modified Files:
	smbldap-tools.spec 
Log Message:
resync with devel


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/FC-6/smbldap-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smbldap-tools.spec	24 Oct 2006 07:37:19 -0000	1.3
+++ smbldap-tools.spec	29 Oct 2006 14:34:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
@@ -10,12 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
-#BuildArch:	noarch
-ExcludeArch:	x86_64
-# Debuginfo package would be empty as there are no binaries in this package
-%define debug_package %{nil}
+BuildArch:	noarch
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -69,6 +64,10 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Sun Oct 29 2006 Paul Howarth <paul at city-fan.org> 0.9.2-5
+- perl(Unicode::MapUTF8) now available on x86_64, so remove ExcludeArch
+  and revert to noarch package (#211866)
+
 * Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
 - Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
 - A consequence of this is that the package can no longer be noarch



From fedora-extras-commits at redhat.com  Sun Oct 29 14:35:50 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:35:50 -0700
Subject: rpms/kbibtex/FC-5 kbibtex.spec,1.6,1.7
Message-ID: <200610291435.k9TEZojY009857@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9801

Modified Files:
	kbibtex.spec 
Log Message:
- corrected wrong release ver



Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kbibtex.spec	29 Oct 2006 14:33:07 -0000	1.6
+++ kbibtex.spec	29 Oct 2006 14:35:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors



From fedora-extras-commits at redhat.com  Sun Oct 29 14:41:00 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:41:00 -0700
Subject: rpms/kbibtex/FC-4 kbibtex.spec,1.3,1.4
Message-ID: <200610291441.k9TEf0Nr009941@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9914

Modified Files:
	kbibtex.spec 
Log Message:
- applied latest official kbibtex patch-set



Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/kbibtex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbibtex.spec	18 Oct 2006 11:55:09 -0000	1.3
+++ kbibtex.spec	29 Oct 2006 14:40:30 -0000	1.4
@@ -1,12 +1,15 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
 Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
+Patch0:		kbibtex-0.1.5-filteredselection.patch
+Patch1:		kbibtex-0.1.5-gcc4.2.patch
+Patch2:		kbibtex-0.1.5-viewdocument.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -19,7 +22,9 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .filteredselection
+%patch1 -p0 -b .gcc4.2
+%patch2	-p0 -b .viewdocument
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -114,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
+- latest released patches (filteredselection,gcc4.2,viewdocument)
+
 * Wed Oct 16 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
 - Update to 0.1.5
 



From fedora-extras-commits at redhat.com  Sun Oct 29 14:43:08 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:43:08 -0700
Subject: rpms/kbibtex/FC-5 kbibtex-0.1.5-filteredselection.patch, NONE,
	1.1 kbibtex-0.1.5-gcc4.2.patch, NONE,
	1.1 kbibtex-0.1.5-viewdocument.patch, NONE, 1.1
Message-ID: <200610291443.k9TEh8Q8010023@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10012

Added Files:
	kbibtex-0.1.5-filteredselection.patch 
	kbibtex-0.1.5-gcc4.2.patch kbibtex-0.1.5-viewdocument.patch 
Log Message:
- forgotten .patch files


kbibtex-0.1.5-filteredselection.patch:

--- NEW FILE kbibtex-0.1.5-filteredselection.patch ---
Index: src/documentlistview.cpp
===================================================================
--- src/documentlistview.cpp	(Revision 301)
+++ src/documentlistview.cpp	(Revision 302)
@@ -221,10 +221,13 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            m_bibtexFile->deleteElement( kblvi->element() );
-            it++;
-            takeItem( kblvi );
-            delete ( kblvi );
+            if ( kblvi->isVisible() )
+            {
+                m_bibtexFile->deleteElement( kblvi->element() );
+                it++;
+                takeItem( kblvi );
+                delete ( kblvi );
+            }
         }
 
         if ( above )
@@ -246,7 +249,7 @@
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
             BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
-            if ( entry != NULL )
+            if ( entry != NULL && kblvi->isVisible() )
             {
                 if ( !refs.isEmpty() )
                     refs.append( "," );
@@ -621,7 +624,8 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            exporter->save( &buffer, kblvi->element() );
+            if ( kblvi->isVisible() )
+                exporter->save( &buffer, kblvi->element() );
             it++;
         }
         delete exporter;

kbibtex-0.1.5-gcc4.2.patch:

--- NEW FILE kbibtex-0.1.5-gcc4.2.patch ---
Index: src/fileimporter.h
===================================================================
--- src/fileimporter.h	(Revision 307)
+++ src/fileimporter.h	(Arbeitskopie)
@@ -39,7 +39,7 @@
         ~FileImporter();
 
         File* load ( const QString& text );
-        virtual File* load( QIODevice *iodevice ) = NULL;
+        virtual File* load( QIODevice *iodevice ) = 0;
 
         static bool guessCanDecode( const QString & ) { return FALSE; };
 

kbibtex-0.1.5-viewdocument.patch:

--- NEW FILE kbibtex-0.1.5-viewdocument.patch ---
Index: src/documentwidget.h
===================================================================
--- src/documentwidget.h	(Revision 308)
+++ src/documentwidget.h	(Revision 310)
@@ -106,6 +106,7 @@
         int m_newElementCounter;
         EditMode m_editMode;
         KActionMenu *m_viewDocumentActionMenu;
+        QStringList m_viewDocumentActionMenuURLs;
         KActionMenu *m_searchWebsitesActionMenu;
         KAction *m_find;
         KAction *m_findNext;
Index: src/documentwidget.cpp
===================================================================
--- src/documentwidget.cpp	(Revision 308)
+++ src/documentwidget.cpp	(Revision 310)
@@ -471,13 +471,13 @@
         m_listViewElements->setFactory( factory, client );
         m_sourceView->setFactory( factory, client );
 
+        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         if ( m_viewDocumentActionMenu != NULL )
             connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
 
         m_copyReference = client->action( "edit_copyref" );
         m_find = client->action( "edit_find" );
         m_findNext = client->action( "edit_find_next" );
-        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
         m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
     }
@@ -486,6 +486,7 @@
     {
         KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
         popup->clear();
+        m_viewDocumentActionMenuURLs.clear();
 
         BibTeX::Element * currentElement = NULL;
 
@@ -517,6 +518,7 @@
                         popup->insertItem( SmallIcon( "html" ), prettyURL );
                     else
                         popup->insertItem( prettyURL );
+                    m_viewDocumentActionMenuURLs.append( prettyURL );
                 }
                 m_viewDocumentActionMenu->setEnabled( TRUE );
             }
@@ -908,7 +910,7 @@
 
     void DocumentWidget::slotViewDocument( int id )
     {
-        kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
+        kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
     }
 
 }



From fedora-extras-commits at redhat.com  Sun Oct 29 14:44:07 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:44:07 -0700
Subject: rpms/kbibtex/FC-4 kbibtex-0.1.5-filteredselection.patch, NONE,
	1.1 kbibtex-0.1.5-gcc4.2.patch, NONE,
	1.1 kbibtex-0.1.5-viewdocument.patch, NONE, 1.1
Message-ID: <200610291444.k9TEi7Yn010106@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10072

Added Files:
	kbibtex-0.1.5-filteredselection.patch 
	kbibtex-0.1.5-gcc4.2.patch kbibtex-0.1.5-viewdocument.patch 
Log Message:
- forgotten .patch files


kbibtex-0.1.5-filteredselection.patch:

--- NEW FILE kbibtex-0.1.5-filteredselection.patch ---
Index: src/documentlistview.cpp
===================================================================
--- src/documentlistview.cpp	(Revision 301)
+++ src/documentlistview.cpp	(Revision 302)
@@ -221,10 +221,13 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            m_bibtexFile->deleteElement( kblvi->element() );
-            it++;
-            takeItem( kblvi );
-            delete ( kblvi );
+            if ( kblvi->isVisible() )
+            {
+                m_bibtexFile->deleteElement( kblvi->element() );
+                it++;
+                takeItem( kblvi );
+                delete ( kblvi );
+            }
         }
 
         if ( above )
@@ -246,7 +249,7 @@
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
             BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
-            if ( entry != NULL )
+            if ( entry != NULL && kblvi->isVisible() )
             {
                 if ( !refs.isEmpty() )
                     refs.append( "," );
@@ -621,7 +624,8 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            exporter->save( &buffer, kblvi->element() );
+            if ( kblvi->isVisible() )
+                exporter->save( &buffer, kblvi->element() );
             it++;
         }
         delete exporter;

kbibtex-0.1.5-gcc4.2.patch:

--- NEW FILE kbibtex-0.1.5-gcc4.2.patch ---
Index: src/fileimporter.h
===================================================================
--- src/fileimporter.h	(Revision 307)
+++ src/fileimporter.h	(Arbeitskopie)
@@ -39,7 +39,7 @@
         ~FileImporter();
 
         File* load ( const QString& text );
-        virtual File* load( QIODevice *iodevice ) = NULL;
+        virtual File* load( QIODevice *iodevice ) = 0;
 
         static bool guessCanDecode( const QString & ) { return FALSE; };
 

kbibtex-0.1.5-viewdocument.patch:

--- NEW FILE kbibtex-0.1.5-viewdocument.patch ---
Index: src/documentwidget.h
===================================================================
--- src/documentwidget.h	(Revision 308)
+++ src/documentwidget.h	(Revision 310)
@@ -106,6 +106,7 @@
         int m_newElementCounter;
         EditMode m_editMode;
         KActionMenu *m_viewDocumentActionMenu;
+        QStringList m_viewDocumentActionMenuURLs;
         KActionMenu *m_searchWebsitesActionMenu;
         KAction *m_find;
         KAction *m_findNext;
Index: src/documentwidget.cpp
===================================================================
--- src/documentwidget.cpp	(Revision 308)
+++ src/documentwidget.cpp	(Revision 310)
@@ -471,13 +471,13 @@
         m_listViewElements->setFactory( factory, client );
         m_sourceView->setFactory( factory, client );
 
+        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         if ( m_viewDocumentActionMenu != NULL )
             connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
 
         m_copyReference = client->action( "edit_copyref" );
         m_find = client->action( "edit_find" );
         m_findNext = client->action( "edit_find_next" );
-        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
         m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
     }
@@ -486,6 +486,7 @@
     {
         KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
         popup->clear();
+        m_viewDocumentActionMenuURLs.clear();
 
         BibTeX::Element * currentElement = NULL;
 
@@ -517,6 +518,7 @@
                         popup->insertItem( SmallIcon( "html" ), prettyURL );
                     else
                         popup->insertItem( prettyURL );
+                    m_viewDocumentActionMenuURLs.append( prettyURL );
                 }
                 m_viewDocumentActionMenu->setEnabled( TRUE );
             }
@@ -908,7 +910,7 @@
 
     void DocumentWidget::slotViewDocument( int id )
     {
-        kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
+        kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
     }
 
 }



From fedora-extras-commits at redhat.com  Sun Oct 29 14:44:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 29 Oct 2006 07:44:31 -0700
Subject: rpms/xchat-gnome/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xchat-gnome-config.patch, 1.6, 1.7 xchat-gnome.spec, 1.29, 1.30
Message-ID: <200610291444.k9TEiV4T010131@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10076

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
- Update to 0.15.
- Add new icons.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Oct 2006 13:50:34 -0000	1.12
+++ .cvsignore	29 Oct 2006 14:44:00 -0000	1.13
@@ -1 +1 @@
-xchat-gnome-0.14.tar.bz2
+xchat-gnome-0.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Oct 2006 13:50:34 -0000	1.12
+++ sources	29 Oct 2006 14:44:00 -0000	1.13
@@ -1 +1 @@
-8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2
+a0f1f011e594d85a5a5781cfc5f52221  xchat-gnome-0.15.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome-config.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-gnome-config.patch	27 Oct 2006 13:50:34 -0000	1.6
+++ xchat-gnome-config.patch	29 Oct 2006 14:44:00 -0000	1.7
@@ -1,6 +1,7 @@
-diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
---- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
-+++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
+Only in xchat-gnome-0.15/plugins/python: #python.c#
+diff -ur xchat-gnome-0.15.OLD/src/common/cfgfiles.c xchat-gnome-0.15/src/common/cfgfiles.c
+--- xchat-gnome-0.15.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.15/src/common/cfgfiles.c	2006-10-29 00:12:49.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -19,21 +20,11 @@
  	}
  }
  
-diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
---- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
-+++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
-@@ -100,7 +100,7 @@
- void fe_get_int (char *prompt, int def, void *callback, void *ud);
- #define FRF_WRITE 1	/* save file */
- #define FRF_MULTIPLE 2	/* multi-select */
--#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
-+#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
- #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
- #define FRF_FILTERISINITIAL 16	/* unused */
- #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
-diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
-+++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+Only in xchat-gnome-0.15/src/common: cfgfiles.c~
+Only in xchat-gnome-0.15/src/common: #fe.h#
+diff -ur xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-28 01:48:21.000000000 -0400
++++ xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c	2006-10-29 00:13:17.000000000 -0400
 @@ -184,7 +184,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
@@ -43,7 +34,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -347,7 +347,7 @@
+@@ -346,7 +346,7 @@
  #endif
  
  	homedir = g_get_home_dir ();
@@ -52,3 +43,4 @@
  	pageref = page;
  	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
  	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
+Only in xchat-gnome-0.15/src/fe-gnome: preferences-page-plugins.c~


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xchat-gnome.spec	27 Oct 2006 13:50:34 -0000	1.29
+++ xchat-gnome.spec	29 Oct 2006 14:44:00 -0000	1.30
@@ -1,7 +1,7 @@
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
@@ -74,7 +74,7 @@
 %pre
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
     	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
@@ -122,7 +122,11 @@
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}-*.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}-*.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-plugin.svg
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -133,6 +137,10 @@
 
 
 %changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
+- Update to 0.15.
+- Add new icons.
+
 * Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
 - Update to 0.14.
 - Remove xchat-gnome-remote.



From fedora-extras-commits at redhat.com  Sun Oct 29 14:47:31 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:47:31 -0700
Subject: rpms/kbibtex/FC-5 kbibtex.spec,1.7,1.8
Message-ID: <200610291447.k9TElVpQ010220@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10190

Modified Files:
	kbibtex.spec 
Log Message:
- release bump for rebuild (forgotten patches (forgotten patches)



Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kbibtex.spec	29 Oct 2006 14:35:20 -0000	1.7
+++ kbibtex.spec	29 Oct 2006 14:47:01 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
@@ -119,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-3
+- rebuild (patches were not checked in)
+
 * Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
 - latest released patches (filteredselection,gcc4.2,viewdocument)
 



From fedora-extras-commits at redhat.com  Sun Oct 29 15:14:29 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sun, 29 Oct 2006 08:14:29 -0700
Subject: rpms/poedit/FC-5 .cvsignore, 1.2, 1.3 poedit.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610291514.k9TFETCx013421@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13362/FC-5

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 15:41:45 -0000	1.2
+++ .cvsignore	29 Oct 2006 15:13:58 -0000	1.3
@@ -1 +1 @@
-poedit-1.3.4.tar.gz
+poedit-1.3.5.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/poedit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poedit.spec	20 Jun 2006 15:41:45 -0000	1.1
+++ poedit.spec	29 Oct 2006 15:13:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.3.4
-Release:        2%{?dist}
+Version:        1.3.5
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -37,24 +37,14 @@
 rm -rf \
 	$RPM_BUILD_ROOT%{_datadir}/applnk \
 	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/icons \
 	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps
-mkdir -p -m 0755 \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk/application
-cp -a src/icons/appicon/poedit.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-cp -a src/icons/appicon/poedit.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-sed -i -e 's|poedit.png|poedit.svg|g' install/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    install/poedit.desktop
-cp -a install/x-po.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
+    $RPM_BUILD_ROOT%{_datadir}/applications/poedit.desktop
 %{find_lang} poedit
 
 
@@ -83,14 +73,19 @@
 %doc NEWS TODO README COPYING AUTHORS docs/*.txt docs/en
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/icons/hicolor/*.png
-%{_datadir}/pixmaps/*.svg
+%{_datadir}/icons/hicolor/*/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man?/*
 %{_datadir}/poedit
 
 
 %changelog
+* Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
+- Upstream 1.3.5
+
+* Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.4-2.1
+- FC6 rebuild
+
 * Wed May 24 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.4-2
 - Remove any potential places where makefile may create copies of 
   .desktop files and icons.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 15:41:45 -0000	1.2
+++ sources	29 Oct 2006 15:13:58 -0000	1.3
@@ -1 +1 @@
-e76a84ae4be4ad9d9a176fd8a1a2effb  poedit-1.3.4.tar.gz
+e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 15:14:29 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sun, 29 Oct 2006 08:14:29 -0700
Subject: rpms/poedit/FC-6 .cvsignore, 1.2, 1.3 poedit.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610291514.k9TFETgQ013426@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13362/FC-6

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 15:41:45 -0000	1.2
+++ .cvsignore	29 Oct 2006 15:13:59 -0000	1.3
@@ -1 +1 @@
-poedit-1.3.4.tar.gz
+poedit-1.3.5.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/poedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poedit.spec	3 Sep 2006 18:09:53 -0000	1.2
+++ poedit.spec	29 Oct 2006 15:13:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.3.4
-Release:        2.1%{?dist}
+Version:        1.3.5
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -37,24 +37,14 @@
 rm -rf \
 	$RPM_BUILD_ROOT%{_datadir}/applnk \
 	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/icons \
 	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps
-mkdir -p -m 0755 \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk/application
-cp -a src/icons/appicon/poedit.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-cp -a src/icons/appicon/poedit.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-sed -i -e 's|poedit.png|poedit.svg|g' install/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    install/poedit.desktop
-cp -a install/x-po.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
+    $RPM_BUILD_ROOT%{_datadir}/applications/poedit.desktop
 %{find_lang} poedit
 
 
@@ -83,14 +73,16 @@
 %doc NEWS TODO README COPYING AUTHORS docs/*.txt docs/en
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/icons/hicolor/*.png
-%{_datadir}/pixmaps/*.svg
+%{_datadir}/icons/hicolor/*/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man?/*
 %{_datadir}/poedit
 
 
 %changelog
+* Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
+- Upstream 1.3.5
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.4-2.1
 - FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 15:41:45 -0000	1.2
+++ sources	29 Oct 2006 15:13:59 -0000	1.3
@@ -1 +1 @@
-e76a84ae4be4ad9d9a176fd8a1a2effb  poedit-1.3.4.tar.gz
+e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 15:14:30 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sun, 29 Oct 2006 08:14:30 -0700
Subject: rpms/poedit/devel .cvsignore, 1.2, 1.3 poedit.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610291514.k9TFEUg1013431@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13362/devel

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 15:41:45 -0000	1.2
+++ .cvsignore	29 Oct 2006 15:14:00 -0000	1.3
@@ -1 +1 @@
-poedit-1.3.4.tar.gz
+poedit-1.3.5.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/poedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poedit.spec	3 Sep 2006 18:09:53 -0000	1.2
+++ poedit.spec	29 Oct 2006 15:14:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.3.4
-Release:        2.1%{?dist}
+Version:        1.3.5
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -37,24 +37,14 @@
 rm -rf \
 	$RPM_BUILD_ROOT%{_datadir}/applnk \
 	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/icons \
 	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps
-mkdir -p -m 0755 \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk/application
-cp -a src/icons/appicon/poedit.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-cp -a src/icons/appicon/poedit.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-sed -i -e 's|poedit.png|poedit.svg|g' install/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    install/poedit.desktop
-cp -a install/x-po.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
+    $RPM_BUILD_ROOT%{_datadir}/applications/poedit.desktop
 %{find_lang} poedit
 
 
@@ -83,14 +73,16 @@
 %doc NEWS TODO README COPYING AUTHORS docs/*.txt docs/en
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/icons/hicolor/*.png
-%{_datadir}/pixmaps/*.svg
+%{_datadir}/icons/hicolor/*/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man?/*
 %{_datadir}/poedit
 
 
 %changelog
+* Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
+- Upstream 1.3.5
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.4-2.1
 - FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 15:41:45 -0000	1.2
+++ sources	29 Oct 2006 15:14:00 -0000	1.3
@@ -1 +1 @@
-e76a84ae4be4ad9d9a176fd8a1a2effb  poedit-1.3.4.tar.gz
+e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 15:15:54 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 08:15:54 -0700
Subject: rpms/kbibtex/FC-4 kbibtex.spec,1.4,1.5
Message-ID: <200610291515.k9TFFsXQ013536@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13480

Modified Files:
	kbibtex.spec 
Log Message:
bumped the release ver because for rebuild (forgotten patches)



Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/kbibtex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kbibtex.spec	29 Oct 2006 14:40:30 -0000	1.4
+++ kbibtex.spec	29 Oct 2006 15:15:23 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
@@ -119,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-3
+- rebuild (patches were not checked in)
+
 * Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
 - latest released patches (filteredselection,gcc4.2,viewdocument)
 



From fedora-extras-commits at redhat.com  Sun Oct 29 15:26:47 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 29 Oct 2006 08:26:47 -0700
Subject: rpms/mail-notification/devel mail-notification.spec,1.29,1.30
Message-ID: <200610291526.k9TFQlPu013695@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13673

Modified Files:
	mail-notification.spec 
Log Message:
3.0-8 -- add workaround that hacks configure to allow building with evo 2.10


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mail-notification.spec	2 Sep 2006 11:14:38 -0000	1.29
+++ mail-notification.spec	29 Oct 2006 15:26:17 -0000	1.30
@@ -1,6 +1,8 @@
+# FIXME -- remove evo 2.10 workaround
+
 Name:           mail-notification
 Version:        3.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -54,6 +56,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1} ./README.FEDORA
+# FIXME -- quick workaround for now
+sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
 
 %build
 %configure --disable-schemas-install  --enable-evolution
@@ -127,6 +131,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  3.0-8
+- add workaround that hacks configure to allow building with evo 2.10
+
 * Sat Sep 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  3.0-7
 - don't run mail-notification with unset-obsolete-configuration at all
 



From fedora-extras-commits at redhat.com  Sun Oct 29 15:55:41 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Sun, 29 Oct 2006 08:55:41 -0700
Subject: rpms/licq/FC-6 .cvsignore, 1.3, 1.4 licq.spec, 1.11, 1.12 sources,
	1.3, 
	1.4 licq-1.3.2-gcc-4_1-patch, 1.1, NONE licq-1.3.2-libdir.patch,
	1.1, NONE licq-1.3.2-viewUrl.patch, 1.1, NONE
Message-ID: <200610291555.k9TFtfKf013918@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13892

Modified Files:
	.cvsignore licq.spec sources 
Removed Files:
	licq-1.3.2-gcc-4_1-patch licq-1.3.2-libdir.patch 
	licq-1.3.2-viewUrl.patch 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/licq/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2006 13:51:41 -0000	1.3
+++ .cvsignore	29 Oct 2006 15:55:10 -0000	1.4
@@ -1,2 +1 @@
-licq-1.3.2.tar.bz2
-licq-viewurl.sh
+licq-1.3.4.tar.gz


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/FC-6/licq.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- licq.spec	4 Oct 2006 23:03:17 -0000	1.11
+++ licq.spec	29 Oct 2006 15:55:10 -0000	1.12
@@ -1,9 +1,8 @@
 Name: licq
-Version: 1.3.2
-Release: 11
+Version: 1.3.4
+Release: 2%{?dist}
 License: GPL
-Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
-Source1: licq-viewurl.sh
+Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/
 Summary: Licq - A graphical ICQ Client for Linux
 Group: Applications/Internet
@@ -15,9 +14,6 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gettext, automake, libtool
-Patch1: licq-1.3.2-gcc-4_1-patch
-Patch2: licq-1.3.2-libdir.patch
-Patch3: licq-1.3.2-viewUrl.patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -48,15 +44,14 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc-4_1
-%patch2 -p1 -b .libdir
-%patch3 -p1 -b .viewUrl
 
 #remove cvs stuff
 rm -rf `find . -name CVS`
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+export KDEDIR=/usr/%_lib
+
 sed -i s/lib/%{_lib}/ include/licq_constants.h
 %configure
 make
@@ -67,12 +62,9 @@
   automake
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
-  export KDEDIR=/usr/%_lib
   %configure \
      --with-kde \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/
   make
 cd ../qt-gui
   aclocal
@@ -80,19 +72,10 @@
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
   %configure \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/ \
   make
-  #create Qt qm files
-  cd po
-  lrelease *.ts
-cd ../../osd
-  rm -rf autom4te.cache
-  sed -i s/aclocal-1.7/aclocal/ build
-  sed -i s/automake-1.7/automake/ build
-  ./build
-  %configure --libdir=%{_libdir}/licq
+cd ../osd
+  %configure --libdir=%{_libdir}/
   make
 
 %install
@@ -102,7 +85,6 @@
 cd plugins/qt-gui
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         share/licq.desktop
 make install
 %find_lang licq
@@ -111,16 +93,13 @@
 cd ../osd
 make install
 
-#install url viewer
-install -m755 %SOURCE1 %buildroot/%_bindir/licq-viewurl.sh
-
 %find_lang licq_osd_plugin
 
 #remove devel 
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
-#remove licq.desktop installed by makefile
-rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/kde/licq.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +113,8 @@
 %{_bindir}/viewurl-netscape.sh
 %{_bindir}/viewurl-opera.sh
 %{_bindir}/viewurl-w3m.sh
-%attr(0755,root,root) %_bindir/licq-viewurl.sh
+%{_bindir}/viewurl-firefox.sh
+%{_bindir}/viewurl-seamonkey.sh
 %dir %{_libdir}/licq
 %{_libdir}/licq/licq_qt-gui.so
 %{_datadir}/licq
@@ -157,7 +137,7 @@
 %lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
 %lang(uk) %{_datadir}/licq/qt-gui/locale/uk.qm
 %{_datadir}/applications/fedora-licq.desktop
-%doc doc/ upgrade/ ChangeLog README* LICENSE
+%doc doc/ upgrade/ README* LICENSE
 
 %files kde
 %defattr(-,root,root)
@@ -170,8 +150,11 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.2-11
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Sun Sep 29 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-2
+- fix desktop-file-install
+
+* Fri Sep 27 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-1
+- upgrade
 
 * Mon Sep 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-10
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2006 13:51:41 -0000	1.3
+++ sources	29 Oct 2006 15:55:10 -0000	1.4
@@ -1,2 +1 @@
-0471bb8fed91eefb23dfe153c9a4a806  licq-1.3.2.tar.bz2
-b5d06b8482e9f73c3889d0b445aace00  licq-viewurl.sh
+34a51541173a2ba453b5984b52bfa489  licq-1.3.4.tar.gz


--- licq-1.3.2-gcc-4_1-patch DELETED ---


--- licq-1.3.2-libdir.patch DELETED ---


--- licq-1.3.2-viewUrl.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 16:08:10 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Sun, 29 Oct 2006 09:08:10 -0700
Subject: rpms/licq/devel licq.spec,1.13,1.14
Message-ID: <200610291608.k9TG8Ajw017051@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16962

Modified Files:
	licq.spec 
Log Message:
add dist tag



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- licq.spec	28 Oct 2006 13:30:42 -0000	1.13
+++ licq.spec	29 Oct 2006 16:07:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.4
-Release: 2
+Release: 2%{?dist}
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/



From fedora-extras-commits at redhat.com  Sun Oct 29 17:33:21 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 10:33:21 -0700
Subject: rpms/grhino/FC-6 grhino-Makefile-in.patch, 1.2, 1.3 grhino.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200610291733.k9THXLgB020671@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20638

Modified Files:
	grhino.spec sources 
Added Files:
	grhino-Makefile-in.patch 
Log Message:
Reverting to 0.15.0 for now until build problem inside mock fixed


grhino-Makefile-in.patch:

Index: grhino-Makefile-in.patch
===================================================================
RCS file: grhino-Makefile-in.patch
diff -N grhino-Makefile-in.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ grhino-Makefile-in.patch	29 Oct 2006 17:32:50 -0000	1.3
@@ -0,0 +1,152 @@
+diff -ru grhino-0.15.0-orig/Makefile.in grhino-0.15.0/Makefile.in
+--- grhino-0.15.0-orig/Makefile.in	2005-04-15 09:03:04.000000000 -0500
++++ grhino-0.15.0/Makefile.in	2005-08-20 16:33:54.000000000 -0500
+@@ -444,82 +444,82 @@
+ 	$(adBeginSubdir) $@ $(adEndSubdir)
+ 
+ install_mkdir :
+-	if [ ! -e "$(bindir)" ]; then		\
+-		mkdir -p "$(bindir)";		\
+-		chmod 755 "$(bindir)";		\
+-	fi
+-	if [ ! -e "$(pattern_dir)" ]; then	\
+-		mkdir -p "$(pattern_dir)";	\
+-		chmod 755 "$(pattern_dir)";	\
+-	fi
+-	if [ ! -e "$(book_dir)" ]; then		\
+-		mkdir -p "$(book_dir)";		\
+-		chmod 755 "$(book_dir)";	\
+-	fi
+-	if [ ! -e "$(theme_dir)" ]; then	\
+-		mkdir -p "$(theme_dir)";	\
+-		chmod 755 "$(theme_dir)";	\
+-	fi
+-	if [ ! -e "$(theme_dir)/small" ]; then	\
+-		mkdir -p "$(theme_dir)/small";	\
+-		chmod 755 "$(theme_dir)/small";	\
+-	fi
+-	if [ ! -e "$(helpdir)" ]; then		\
+-		mkdir -p "$(helpdir)";		\
+-		chmod 755 "$(helpdir)";		\
+-	fi
+-	if [ ! -e "$(helpdir)/C" ]; then	\
+-		mkdir -p "$(helpdir)/C";	\
+-		chmod 755 "$(helpdir)/C";	\
+-	fi
+-	if [ ! -e "$(helpdir)/C/figures" ]; then  \
+-		mkdir -p "$(helpdir)/C/figures";  \
+-		chmod 755 "$(helpdir)/C/figures"; \
++	if [ ! -e "$(DESTDIR)$(bindir)" ]; then		\
++		mkdir -p "$(DESTDIR)$(bindir)";		\
++		chmod 755 "$(DESTDIR)$(bindir)";		\
++	fi
++	if [ ! -e "$(DESTDIR)$(pattern_dir)" ]; then	\
++		mkdir -p "$(DESTDIR)$(pattern_dir)";	\
++		chmod 755 "$(DESTDIR)$(pattern_dir)";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(book_dir)" ]; then		\
++		mkdir -p "$(DESTDIR)$(book_dir)";		\
++		chmod 755 "$(DESTDIR)$(book_dir)";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(theme_dir)" ]; then	\
++		mkdir -p "$(DESTDIR)$(theme_dir)";	\
++		chmod 755 "$(DESTDIR)$(theme_dir)";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(theme_dir)/small" ]; then	\
++		mkdir -p "$(DESTDIR)$(theme_dir)/small";	\
++		chmod 755 "$(DESTDIR)$(theme_dir)/small";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(helpdir)" ]; then		\
++		mkdir -p "$(DESTDIR)$(helpdir)";		\
++		chmod 755 "$(DESTDIR)$(helpdir)";		\
++	fi
++	if [ ! -e "$(DESTDIR)$(helpdir)/C" ]; then	\
++		mkdir -p "$(DESTDIR)$(helpdir)/C";	\
++		chmod 755 "$(DESTDIR)$(helpdir)/C";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(helpdir)/C/figures" ]; then  \
++		mkdir -p "$(DESTDIR)$(helpdir)/C/figures";  \
++		chmod 755 "$(DESTDIR)$(helpdir)/C/figures"; \
+ 	fi
+ 
+ install : install_mkdir
+-	-$(INSTALL_PROGRAM) grhino "$(bindir)/grhino"
+-	-$(INSTALL_PROGRAM) gtp-rhino "$(bindir)/gtp-rhino"
+-	$(INSTALL_DATA) "$(srcdir)/row1.bin" "$(pattern_dir)/row1.bin"
+-	$(INSTALL_DATA) "$(srcdir)/row2.bin" "$(pattern_dir)/row2.bin"
+-	$(INSTALL_DATA) "$(srcdir)/row3.bin" "$(pattern_dir)/row3.bin"
+-	$(INSTALL_DATA) "$(srcdir)/row4.bin" "$(pattern_dir)/row4.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(pattern_dir)/diag1.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(pattern_dir)/diag2.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(pattern_dir)/diag3.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(pattern_dir)/diag4.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(pattern_dir)/diag5.bin"
+-	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(pattern_dir)/corner5x2.bin"
+-	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(book_dir)/book.bin"
+-	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(helpdir)/C/legal.xml"
+-	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
+-		"$(srcdir)/help/C/grhino-C.omf.in" "$(helpdir)/C/grhino-C.omf"
+-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(helpdir)/C/grhino.xml"
++	-$(INSTALL_PROGRAM) grhino "$(DESTDIR)$(bindir)/grhino"
++	-$(INSTALL_PROGRAM) gtp-rhino "$(DESTDIR)$(bindir)/gtp-rhino"
++	$(INSTALL_DATA) "$(srcdir)/row1.bin" "$(DESTDIR)$(pattern_dir)/row1.bin"
++	$(INSTALL_DATA) "$(srcdir)/row2.bin" "$(DESTDIR)$(pattern_dir)/row2.bin"
++	$(INSTALL_DATA) "$(srcdir)/row3.bin" "$(DESTDIR)$(pattern_dir)/row3.bin"
++	$(INSTALL_DATA) "$(srcdir)/row4.bin" "$(DESTDIR)$(pattern_dir)/row4.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(DESTDIR)$(pattern_dir)/diag1.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(DESTDIR)$(pattern_dir)/diag2.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(DESTDIR)$(pattern_dir)/diag3.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(DESTDIR)$(pattern_dir)/diag4.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(DESTDIR)$(pattern_dir)/diag5.bin"
++	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
++	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
++	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
++	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
++		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
++	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
+-		"$(helpdir)/C/figures/gamelist.png"
++		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \
+-		"$(helpdir)/C/figures/history.png"
++		"$(DESTDIR)$(helpdir)/C/figures/history.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/mainwindow.png" \
+-		"$(helpdir)/C/figures/mainwindow.png"
++		"$(DESTDIR)$(helpdir)/C/figures/mainwindow.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/pattern.png" \
+-		"$(helpdir)/C/figures/pattern.png"
++		"$(DESTDIR)$(helpdir)/C/figures/pattern.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-ai.png" \
+-		"$(helpdir)/C/figures/prefs-ai.png"
++		"$(DESTDIR)$(helpdir)/C/figures/prefs-ai.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-board.png" \
+-		"$(helpdir)/C/figures/prefs-board.png"
++		"$(DESTDIR)$(helpdir)/C/figures/prefs-board.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-theme.png" \
+-		"$(helpdir)/C/figures/prefs-theme.png"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(theme_dir)/small/black.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(theme_dir)/small/black_last.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(theme_dir)/small/bottom.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(theme_dir)/small/empty.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(theme_dir)/small/hint_black.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(theme_dir)/small/hint_white.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(theme_dir)/small/left.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(theme_dir)/small/right.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(theme_dir)/small/top.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(theme_dir)/small/white.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(theme_dir)/small/white_last.xpm"
++		"$(DESTDIR)$(helpdir)/C/figures/prefs-theme.png"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(DESTDIR)$(theme_dir)/small/black.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(DESTDIR)$(theme_dir)/small/black_last.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(DESTDIR)$(theme_dir)/small/bottom.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(DESTDIR)$(theme_dir)/small/empty.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(DESTDIR)$(theme_dir)/small/hint_black.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(DESTDIR)$(theme_dir)/small/hint_white.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(DESTDIR)$(theme_dir)/small/left.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(DESTDIR)$(theme_dir)/small/right.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(DESTDIR)$(theme_dir)/small/top.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(DESTDIR)$(theme_dir)/small/white.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(DESTDIR)$(theme_dir)/small/white_last.xpm"
+ 	if [ ! "@GMSGFMT@" = ":" ]; then				 \
+ 		cd po;							 \
+ 		$(MAKE) prefix="$(prefix)" DESTDIR="$(DESTDIR)" install; \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	10 Oct 2006 01:06:57 -0000	1.6
+++ grhino.spec	29 Oct 2006 17:32:50 -0000	1.7
@@ -1,20 +1,20 @@
 Name:           grhino
-Version:        0.15.2
-Release:        2%{?dist}
+Version:        0.15.0
+Release:        6%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
+#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -38,7 +38,7 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 
 
@@ -86,11 +86,8 @@
 
 
 %changelog
-* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
-- BuildRequire on gettext
-
-* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
-- Update to 0.15.2
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-6
+- Rebuild for Fedora Extras 6
 
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:36 -0000	1.5
+++ sources	29 Oct 2006 17:32:50 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 29 17:54:14 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Sun, 29 Oct 2006 10:54:14 -0700
Subject: owners owners.list,1.1877,1.1878
Message-ID: <200610291754.k9THsETk020992@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20971

Modified Files:
	owners.list 
Log Message:
Taking duplicity as per Michaels okay...



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1877
retrieving revision 1.1878
diff -u -r1.1877 -r1.1878
--- owners.list	29 Oct 2006 04:28:43 -0000	1.1877
+++ owners.list	29 Oct 2006 17:53:44 -0000	1.1878
@@ -314,7 +314,7 @@
 Fedora Extras|dstat|System Status Monitor|scott at perturb.org|extras-qa at fedoraproject.org|
 Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dx|Open source version of IBM's Visualization Data Explorer|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 29 17:57:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 29 Oct 2006 10:57:14 -0700
Subject: rpms/xchat-gnome/FC-6 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xchat-gnome-config.patch, 1.6, 1.7 xchat-gnome.spec, 1.29, 1.30
Message-ID: <200610291757.k9THvEbJ021072@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21041

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
- Update to 0.15.
- Add new icons.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Oct 2006 14:11:24 -0000	1.12
+++ .cvsignore	29 Oct 2006 17:56:44 -0000	1.13
@@ -1 +1 @@
-xchat-gnome-0.14.tar.bz2
+xchat-gnome-0.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Oct 2006 14:11:24 -0000	1.12
+++ sources	29 Oct 2006 17:56:44 -0000	1.13
@@ -1 +1 @@
-8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2
+a0f1f011e594d85a5a5781cfc5f52221  xchat-gnome-0.15.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome-config.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-gnome-config.patch	27 Oct 2006 14:11:24 -0000	1.6
+++ xchat-gnome-config.patch	29 Oct 2006 17:56:44 -0000	1.7
@@ -1,6 +1,7 @@
-diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
---- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
-+++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
+Only in xchat-gnome-0.15/plugins/python: #python.c#
+diff -ur xchat-gnome-0.15.OLD/src/common/cfgfiles.c xchat-gnome-0.15/src/common/cfgfiles.c
+--- xchat-gnome-0.15.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.15/src/common/cfgfiles.c	2006-10-29 00:12:49.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -19,21 +20,11 @@
  	}
  }
  
-diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
---- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
-+++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
-@@ -100,7 +100,7 @@
- void fe_get_int (char *prompt, int def, void *callback, void *ud);
- #define FRF_WRITE 1	/* save file */
- #define FRF_MULTIPLE 2	/* multi-select */
--#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
-+#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
- #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
- #define FRF_FILTERISINITIAL 16	/* unused */
- #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
-diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
-+++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+Only in xchat-gnome-0.15/src/common: cfgfiles.c~
+Only in xchat-gnome-0.15/src/common: #fe.h#
+diff -ur xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-28 01:48:21.000000000 -0400
++++ xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c	2006-10-29 00:13:17.000000000 -0400
 @@ -184,7 +184,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
@@ -43,7 +34,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -347,7 +347,7 @@
+@@ -346,7 +346,7 @@
  #endif
  
  	homedir = g_get_home_dir ();
@@ -52,3 +43,4 @@
  	pageref = page;
  	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
  	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
+Only in xchat-gnome-0.15/src/fe-gnome: preferences-page-plugins.c~


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xchat-gnome.spec	27 Oct 2006 14:11:24 -0000	1.29
+++ xchat-gnome.spec	29 Oct 2006 17:56:44 -0000	1.30
@@ -1,7 +1,7 @@
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
@@ -74,7 +74,7 @@
 %pre
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
     	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
@@ -122,7 +122,11 @@
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}-*.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}-*.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-plugin.svg
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -133,6 +137,10 @@
 
 
 %changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
+- Update to 0.15.
+- Add new icons.
+
 * Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
 - Update to 0.14.
 - Remove xchat-gnome-remote.



From fedora-extras-commits at redhat.com  Sun Oct 29 17:58:17 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 29 Oct 2006 10:58:17 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py, 1.10,
	1.11 Push.py, 1.10, 1.11
Message-ID: <200610291758.k9THwHfu021150@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21083

Modified Files:
	Config_Extras.py Push.py 
Log Message:
No need to set up ~/.rpmmacros just for this.



Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Config_Extras.py	28 Oct 2006 22:52:30 -0000	1.10
+++ Config_Extras.py	29 Oct 2006 17:58:15 -0000	1.11
@@ -28,7 +28,6 @@
     mail = True
     repoprune = True
     repoview = True
-    signkeycheck = True
     doublesync = False
 
 top_workdir = '/srv/rpmbuild'


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Push.py	25 Oct 2006 23:55:42 -0000	1.10
+++ Push.py	29 Oct 2006 17:58:15 -0000	1.11
@@ -262,7 +262,7 @@
     return hdr['excludearch']
 
 
-def sign_pkgs(filelist):
+def sign_pkgs(filelist,keyname):
     """gpg sign all the rpms"""
     numfiles = len(filelist)
     if numfiles < 1:
@@ -280,7 +280,7 @@
             filelist = []
     
         foo = string.join(files)
-        result = os.system('echo %s | xargs rpm --resign' % foo)
+        result = os.system('echo %s | xargs rpm --define "_signature gpg" --define "_gpg_name %s" --resign' % (foo,keyname))
         if result != 0:
             return result
         numfiles = len(filelist)
@@ -484,7 +484,7 @@
 
     try:
         print "Signing Packages:"
-        rv = sign_pkgs( find_files(signtmpdir,'*.rpm') )
+        rv = sign_pkgs( find_files(signtmpdir,'*.rpm'), cfg.signkeyname )
         if rv:
             print "Error signing packages! Please be patient - cleaning up."
             raise Exception
@@ -582,10 +582,6 @@
 
     os.umask(cfg.signersumask)
     Utils.signer_gid_check(cfg.signersgid)
-    if cfg.opts.signkeycheck:
-        if cfg.signkeyname != os.popen('rpm --eval %_gpg_name','r').read().rstrip():
-            print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!'
-            sys.exit(errno.EPERM)
 
     if '-f' in sys.argv[2:]:
         sys.argv.remove('-f')



From fedora-extras-commits at redhat.com  Sun Oct 29 18:01:30 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 11:01:30 -0700
Subject: rpms/wv/FC-4 wv-1.0.3-CVE-2006-4513.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 sources, 1.4, 1.5 wv.spec, 1.11, 1.12
Message-ID: <200610291801.k9TI1Uc1024136@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21208

Modified Files:
	.cvsignore sources wv.spec 
Added Files:
	wv-1.0.3-CVE-2006-4513.patch 
Log Message:
fix CVE-2006-4513

wv-1.0.3-CVE-2006-4513.patch:

--- NEW FILE wv-1.0.3-CVE-2006-4513.patch ---
diff -bruN wv-1.2.2/lfo.c wv-1.2.3/lfo.c
--- wv-1.2.2/lfo.c	2005-04-17 23:16:58.000000000 +0200
+++ wv-1.2.3/lfo.c	2006-10-20 03:48:47.000000000 +0200
@@ -32,6 +32,16 @@
 followed by its corresponding LVL structure (if LFOLVL.fFormatting is set).
 */
 
+static int
+multiplication_will_overflow(U32 a, U32 b)
+{
+  if((a > 0) && (b > 0) && (G_MAXUINT / a) >= b) {
+    return 0;
+  }
+
+  return 1;
+}
+
 int
 wvGetLFO_records (LFO ** lfo, LFOLVL ** lfolvl, LVL ** lvl, U32 * nolfo,
 		  U32 * nooflvl, U32 offset, U32 len, wvStream * fd)
@@ -49,7 +59,9 @@
     wvTrace (("pos %x %d\n", wvStream_tell (fd), *nooflvl));
     wvTrace (("nolfo is %d nooflvl is %d\n", *nolfo, *nooflvl));
 
-    if (*nooflvl == 0)
+    if ((*nooflvl == 0) ||
+	multiplication_will_overflow(sizeof (LFOLVL), *nooflvl) ||
+	multiplication_will_overflow(sizeof (LVL), *nooflvl))
       {
 	  *lfolvl = NULL;
 	  *lvl = NULL;
@@ -101,17 +113,23 @@
 	  *nolfo = read_32ubit (fd);
 	  wvTrace (("%d\n", *nolfo));
 
-	  *lfo = (LFO *) wvMalloc (*nolfo * sizeof (LFO));
+	  /* check for integer overflow */
+	  if (multiplication_will_overflow(*nolfo, sizeof(LFO))) {
+	    wvError (("Malicious document!\n"));			
+	    *nolfo = 0;
+	    return (1);
+	  } else {
+	    *lfo = (LFO *) wvMalloc (*nolfo * sizeof(LFO));
 	  if (*lfo == NULL)
 	    {
-		wvError (
-			 ("NO MEM 1, failed to alloc %d bytes\n",
+		wvError (("NO MEM 1, failed to alloc %d bytes\n",
 			  *nolfo * sizeof (LFO)));
 		return (1);
 	    }
 	  for (i = 0; i < *nolfo; i++)
 	      wvGetLFO (&((*lfo)[i]), fd);
       }
+      }
     return (0);
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Oct 2006 08:53:37 -0000	1.4
+++ .cvsignore	29 Oct 2006 18:00:59 -0000	1.5
@@ -1 +1 @@
-wv-1.2.4.tar.gz
+wv-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Oct 2006 08:53:37 -0000	1.4
+++ sources	29 Oct 2006 18:00:59 -0000	1.5
@@ -1 +1 @@
-c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz
+71e42aa9af1e03cc8c608bbbdcb43af8  wv-1.0.3.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wv.spec	28 Oct 2006 08:53:37 -0000	1.11
+++ wv.spec	29 Oct 2006 18:00:59 -0000	1.12
@@ -1,25 +1,27 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.4
-Release:    1%{?dist}
+Version:    1.0.3
+Release:    2%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
-#Patch0:     wv-wvtext-tmp.patch
-#Patch1:     wv-1.0.3-oledecod.patch
-#Patch2:     wv-1.0.3-gcc4.patch
+Source:     http://dl.sf.net/wvware/wv-1.0.3.tar.gz
+Patch0:     wv-wvtext-tmp.patch
+Patch1:     wv-1.0.3-oledecod.patch
+Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
+Patch6:     wv-1.0.3-CVE-2006-4513.patch
 
+#BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
-BuildRequires: libgsf-devel >= 1.11.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   wvware = %{version}-%{release}
+Provides:   wv-devel = %{version}-%{release}
 
 %description
 Wv is a program that understands the Microsoft Word 6/7/8/9
@@ -27,36 +29,24 @@
 documents into HTML, which can then be read with a browser.
 
 
-%package        devel
-Summary:        MSWord format converter - development files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-Wv is a program that understands the Microsoft Word 6/7/8/9
-binary file format and is able to convert Word
-documents into HTML, which can then be read with a browser.
-This package contains the development files
-
-
 %prep
 %setup -q
 #%patch0
-#%patch1 -p1 -b .oledecod
-#%patch2 -p1 -b .gcc4
+%patch1 -p1 -b .oledecod
+%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
+%patch6 -p1 -b .CVE-2006-4513
 
 
 %build
 %configure --with-exporter \
-           --with-libxml2 \
-           --disable-static
+           --with-libxml2
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
 
 #ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
@@ -74,40 +64,15 @@
 %doc COPYING README
 %{_bindir}/wv*
 %{_datadir}/wv
-%{_mandir}/man1/*
-%{_libdir}/libwv*.so.*
-
-%files      devel
-%defattr(-,root,root)
 %{_includedir}/wv
-%{_libdir}/libwv*.so
+%{_mandir}/man1/*
+%{_libdir}/libwv*
 %{_libdir}/pkgconfig/*
 
 
 %changelog
-* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
-- update to 1.2.4, fixes #212696 (CVE-2006-4513)
-
-* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
-- rebuild (releases 1 to 7, cvs problem)
-
-* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-1
-- version 1.2.1
-
-* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
-- rebuild
-
-* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
-- don't build the static lib
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-2
-- rebuild for FC5
-
-* Fri Nov 11 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-1
-- version 1.2.0
-
-* Fri Oct 28 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-2
-- split out a -devel package (#171962)
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.3-2
+- fix CVE-2006-4513
 
 * Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}
 - new version



From fedora-extras-commits at redhat.com  Sun Oct 29 18:03:24 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 29 Oct 2006 11:03:24 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py, 1.11,
	1.12 Push.py, 1.11, 1.12
Message-ID: <200610291803.k9TI3OKR024211@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24181

Modified Files:
	Config_Extras.py Push.py 
Log Message:
Didn't mean to commit this. Was just testing something with "Config_Test.py"



Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Config_Extras.py	29 Oct 2006 17:58:15 -0000	1.11
+++ Config_Extras.py	29 Oct 2006 18:03:18 -0000	1.12
@@ -28,6 +28,7 @@
     mail = True
     repoprune = True
     repoview = True
+    signkeycheck = True
     doublesync = False
 
 top_workdir = '/srv/rpmbuild'


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Push.py	29 Oct 2006 17:58:15 -0000	1.11
+++ Push.py	29 Oct 2006 18:03:18 -0000	1.12
@@ -262,7 +262,7 @@
     return hdr['excludearch']
 
 
-def sign_pkgs(filelist,keyname):
+def sign_pkgs(filelist):
     """gpg sign all the rpms"""
     numfiles = len(filelist)
     if numfiles < 1:
@@ -280,7 +280,7 @@
             filelist = []
     
         foo = string.join(files)
-        result = os.system('echo %s | xargs rpm --define "_signature gpg" --define "_gpg_name %s" --resign' % (foo,keyname))
+        result = os.system('echo %s | xargs rpm --resign' % foo)
         if result != 0:
             return result
         numfiles = len(filelist)
@@ -484,7 +484,7 @@
 
     try:
         print "Signing Packages:"
-        rv = sign_pkgs( find_files(signtmpdir,'*.rpm'), cfg.signkeyname )
+        rv = sign_pkgs( find_files(signtmpdir,'*.rpm') )
         if rv:
             print "Error signing packages! Please be patient - cleaning up."
             raise Exception
@@ -582,6 +582,10 @@
 
     os.umask(cfg.signersumask)
     Utils.signer_gid_check(cfg.signersgid)
+    if cfg.opts.signkeycheck:
+        if cfg.signkeyname != os.popen('rpm --eval %_gpg_name','r').read().rstrip():
+            print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!'
+            sys.exit(errno.EPERM)
 
     if '-f' in sys.argv[2:]:
         sys.argv.remove('-f')



From fedora-extras-commits at redhat.com  Sun Oct 29 18:46:12 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 29 Oct 2006 11:46:12 -0700
Subject: rpms/liferea/devel liferea.spec,1.54,1.55
Message-ID: <200610291846.k9TIkCS1024580@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24563

Modified Files:
	liferea.spec 
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-2
- Rebuild for new firefox.



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- liferea.spec	27 Oct 2006 15:22:54 -0000	1.54
+++ liferea.spec	29 Oct 2006 18:45:42 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -24,7 +24,7 @@
 BuildRequires:	dbus-devel
 %endif
 
-Requires:	firefox = 1.5.0.7
+Requires:	firefox = 2.0.2
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-2
+- Rebuild for new firefox.
+
 * Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
 - Update to 1.0.25.
 - Drop X-Fedora category from desktop file.



From fedora-extras-commits at redhat.com  Sun Oct 29 18:46:50 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 11:46:50 -0700
Subject: rpms/wv/FC-4 wv-1.0.3-CVE-2006-4513.patch, 1.1, 1.2 wv.spec, 1.12,
	1.13
Message-ID: <200610291846.k9TIkov6024638@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24586

Modified Files:
	wv-1.0.3-CVE-2006-4513.patch wv.spec 
Log Message:
fix CVE-2006-4513 properly

wv-1.0.3-CVE-2006-4513.patch:

Index: wv-1.0.3-CVE-2006-4513.patch
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv-1.0.3-CVE-2006-4513.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wv-1.0.3-CVE-2006-4513.patch	29 Oct 2006 18:00:59 -0000	1.1
+++ wv-1.0.3-CVE-2006-4513.patch	29 Oct 2006 18:46:19 -0000	1.2
@@ -1,6 +1,5 @@
-diff -bruN wv-1.2.2/lfo.c wv-1.2.3/lfo.c
---- wv-1.2.2/lfo.c	2005-04-17 23:16:58.000000000 +0200
-+++ wv-1.2.3/lfo.c	2006-10-20 03:48:47.000000000 +0200
+--- lfo.c	2005-04-17 23:16:58.000000000 +0200
++++ lfo.c	2006-10-20 03:48:47.000000000 +0200
 @@ -32,6 +32,16 @@
  followed by its corresponding LVL structure (if LFOLVL.fFormatting is set).
  */
@@ -56,3 +55,26 @@
      return (0);
  }
  
+--- wvConfig.c  18 Apr 2005 21:14:48 -0000      1.70
++++ wvConfig.c  25 Oct 2006 11:55:04 -0000      1.71
+@@ -3682,7 +3682,8 @@
+ void
+ wvBeginDocument (expand_data * data)
+ {
+-    if ((data->sd != NULL) && (data->sd->elements[TT_DOCUMENT].str[0] != NULL))
++    if ((data->sd) && (data->sd->elements[TT_DOCUMENT].str)
++       && (data->sd->elements[TT_DOCUMENT].str[0] != NULL))
+       {
+          wvTrace (("doc begin is %s", data->sd->elements[TT_DOCUMENT].str[0]));
+          wvExpand (data, data->sd->elements[TT_DOCUMENT].str[0],
+@@ -3708,7 +3709,8 @@
+     data->props = (void *) &apap;
+     wvEndPara (data);
+ 
+-    if ((data->sd != NULL) && (data->sd->elements[TT_DOCUMENT].str[1] != NULL))
++    if ((data->sd) && (data->sd->elements[TT_DOCUMENT].str)
++       && (data->sd->elements[TT_DOCUMENT].str[1] != NULL))
+       {
+          wvExpand (data, data->sd->elements[TT_DOCUMENT].str[1],
+                    strlen (data->sd->elements[TT_DOCUMENT].str[1]));
+


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wv.spec	29 Oct 2006 18:00:59 -0000	1.12
+++ wv.spec	29 Oct 2006 18:46:19 -0000	1.13
@@ -1,7 +1,7 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.0.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
@@ -35,7 +35,7 @@
 %patch1 -p1 -b .oledecod
 %patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
-%patch6 -p1 -b .CVE-2006-4513
+%patch6 -p0 -b .CVE-2006-4513
 
 
 %build
@@ -72,6 +72,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.3-2
+- fix CVE-2006-4513 properly (see bug 212698)
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.3-2
 - fix CVE-2006-4513
 
 * Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}



From fedora-extras-commits at redhat.com  Sun Oct 29 19:21:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 12:21:21 -0700
Subject: rpms/python-mutagen/devel .cvsignore, 1.3, 1.4 python-mutagen.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610291921.k9TJLLVk027888@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/python-mutagen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27856

Modified Files:
	.cvsignore python-mutagen.spec sources 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
- Bump to 1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2006 22:00:33 -0000	1.3
+++ .cvsignore	29 Oct 2006 19:20:51 -0000	1.4
@@ -1 +1 @@
-mutagen-1.6.tar.gz
+mutagen-1.8.tar.gz


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/devel/python-mutagen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-mutagen.spec	29 Sep 2006 19:26:43 -0000	1.3
+++ python-mutagen.spec	29 Oct 2006 19:20:51 -0000	1.4
@@ -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-mutagen
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 Group:          Development/Languages
 License:        GPL
@@ -49,6 +49,9 @@
 %{python_sitelib}/mutagen/*.pyo
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
+- Bump to 1.8
+
 * Fri Sep 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.6-2
 - .pyo files no longer ghosted
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2006 22:00:33 -0000	1.3
+++ sources	29 Oct 2006 19:20:51 -0000	1.4
@@ -1 +1 @@
-d68a4803f1b1e2678647cc92899278fb  mutagen-1.6.tar.gz
+01c7158131a18c18914f9fd3ebd499a3  mutagen-1.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 19:26:49 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 12:26:49 -0700
Subject: rpms/python-mutagen/FC-5 .cvsignore, 1.3, 1.4 python-mutagen.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610291926.k9TJQnWY028031@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/python-mutagen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28007

Modified Files:
	.cvsignore python-mutagen.spec sources 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
- Bump to 1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2006 22:04:23 -0000	1.3
+++ .cvsignore	29 Oct 2006 19:26:18 -0000	1.4
@@ -1 +1 @@
-mutagen-1.6.tar.gz
+mutagen-1.8.tar.gz


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-5/python-mutagen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-mutagen.spec	29 Sep 2006 19:30:16 -0000	1.4
+++ python-mutagen.spec	29 Oct 2006 19:26:18 -0000	1.5
@@ -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-mutagen
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 Group:          Development/Languages
 License:        GPL
@@ -49,6 +49,9 @@
 %{python_sitelib}/mutagen/*.pyo
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
+- Bump to 1.8
+
 * Fri Sep 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com>
 - .pyo files no longer ghosted
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2006 22:04:23 -0000	1.3
+++ sources	29 Oct 2006 19:26:18 -0000	1.4
@@ -1 +1 @@
-d68a4803f1b1e2678647cc92899278fb  mutagen-1.6.tar.gz
+01c7158131a18c18914f9fd3ebd499a3  mutagen-1.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:00 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 29 Oct 2006 12:31:00 -0700
Subject: rpms/fuse/FC-4 fuse-udev_rules.patch,1.3,1.4 fuse.spec,1.7,1.8
Message-ID: <200610291931.k9TJV0wc028208@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28127/FC-4

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule again

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse-udev_rules.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-udev_rules.patch	7 Oct 2006 06:46:59 -0000	1.3
+++ fuse-udev_rules.patch	29 Oct 2006 19:30:29 -0000	1.4
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fuse.spec	7 Oct 2006 06:46:59 -0000	1.7
+++ fuse.spec	29 Oct 2006 19:30:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sun Oct 29 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-5
+- Fixed udev-rule again
+
 * Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
 - Fixed udev-rule
 



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:01 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 29 Oct 2006 12:31:01 -0700
Subject: rpms/fuse/FC-5 fuse-udev_rules.patch,1.5,1.6 fuse.spec,1.11,1.12
Message-ID: <200610291931.k9TJV1VE028224@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28127/FC-5

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule again

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse-udev_rules.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuse-udev_rules.patch	7 Oct 2006 06:47:00 -0000	1.5
+++ fuse-udev_rules.patch	29 Oct 2006 19:30:30 -0000	1.6
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fuse.spec	7 Oct 2006 06:47:00 -0000	1.11
+++ fuse.spec	29 Oct 2006 19:30:30 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sun Oct 29 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-5
+- Fixed udev-rule again
+
 * Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
 - Fixed udev-rule
 



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:02 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 29 Oct 2006 12:31:02 -0700
Subject: rpms/fuse/FC-6 fuse-udev_rules.patch,1.5,1.6 fuse.spec,1.12,1.13
Message-ID: <200610291931.k9TJV22N028228@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28127/FC-6

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule again

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse-udev_rules.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuse-udev_rules.patch	7 Oct 2006 06:47:05 -0000	1.5
+++ fuse-udev_rules.patch	29 Oct 2006 19:30:31 -0000	1.6
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse.spec	7 Oct 2006 06:47:05 -0000	1.12
+++ fuse.spec	29 Oct 2006 19:30:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sun Oct 29 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-5
+- Fixed udev-rule again
+
 * Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
 - Fixed udev-rule
 



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:02 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 29 Oct 2006 12:31:02 -0700
Subject: rpms/fuse/devel fuse-udev_rules.patch,1.5,1.6 fuse.spec,1.12,1.13
Message-ID: <200610291931.k9TJV2ZM028232@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28127/devel

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule again

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse-udev_rules.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuse-udev_rules.patch	7 Oct 2006 06:47:05 -0000	1.5
+++ fuse-udev_rules.patch	29 Oct 2006 19:30:32 -0000	1.6
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse.spec	7 Oct 2006 06:47:05 -0000	1.12
+++ fuse.spec	29 Oct 2006 19:30:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sun Oct 29 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-5
+- Fixed udev-rule again
+
 * Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
 - Fixed udev-rule
 



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:31 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 12:31:31 -0700
Subject: rpms/python-mutagen/FC-6 .cvsignore, 1.3, 1.4 python-mutagen.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610291931.k9TJVV7M028275@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/python-mutagen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206

Modified Files:
	.cvsignore python-mutagen.spec sources 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
- Bump to 1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2006 22:00:33 -0000	1.3
+++ .cvsignore	29 Oct 2006 19:31:00 -0000	1.4
@@ -1 +1 @@
-mutagen-1.6.tar.gz
+mutagen-1.8.tar.gz


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-6/python-mutagen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-mutagen.spec	29 Sep 2006 19:26:43 -0000	1.3
+++ python-mutagen.spec	29 Oct 2006 19:31:00 -0000	1.4
@@ -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-mutagen
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 Group:          Development/Languages
 License:        GPL
@@ -49,6 +49,9 @@
 %{python_sitelib}/mutagen/*.pyo
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
+- Bump to 1.8
+
 * Fri Sep 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.6-2
 - .pyo files no longer ghosted
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2006 22:00:33 -0000	1.3
+++ sources	29 Oct 2006 19:31:00 -0000	1.4
@@ -1 +1 @@
-d68a4803f1b1e2678647cc92899278fb  mutagen-1.6.tar.gz
+01c7158131a18c18914f9fd3ebd499a3  mutagen-1.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 19:59:09 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 12:59:09 -0700
Subject: rpms/grhino/FC-6 grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, 
	NONE, 1.1 grhino.spec, 1.7, 1.8 sources, 1.6,
	1.7 grhino-Makefile-in.patch, 1.3, NONE
Message-ID: <200610291959.k9TJx9uS028586@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28562

Modified Files:
	grhino.spec sources 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	29 Oct 2006 17:32:50 -0000	1.7
+++ grhino.spec	29 Oct 2006 19:58:39 -0000	1.8
@@ -1,20 +1,20 @@
 Name:           grhino
-Version:        0.15.0
-Release:        6%{?dist}
+Version:        0.15.2
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -38,8 +38,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -86,8 +87,14 @@
 
 
 %changelog
-* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-6
-- Rebuild for Fedora Extras 6
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
 
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Oct 2006 17:32:50 -0000	1.6
+++ sources	29 Oct 2006 19:58:39 -0000	1.7
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 20:15:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 13:15:49 -0700
Subject: rpms/grhino/FC-3 grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.4, 1.5
Message-ID: <200610292015.k9TKFnqj031817@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/FC-3

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grhino.spec	8 Oct 2006 14:11:34 -0000	1.4
+++ grhino.spec	29 Oct 2006 20:15:18 -0000	1.5
@@ -1,19 +1,20 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -37,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -85,6 +87,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2
 



From fedora-extras-commits at redhat.com  Sun Oct 29 20:15:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 13:15:49 -0700
Subject: rpms/grhino/FC-4 grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.5, 1.6
Message-ID: <200610292015.k9TKFn1D031820@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/FC-4

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
+++ grhino.spec	29 Oct 2006 20:15:19 -0000	1.6
@@ -1,19 +1,20 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -37,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -85,6 +87,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2
 



From fedora-extras-commits at redhat.com  Sun Oct 29 20:15:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 13:15:55 -0700
Subject: rpms/grhino/FC-5 grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.5, 1.6
Message-ID: <200610292015.k9TKFt6J031823@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/FC-5

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
+++ grhino.spec	29 Oct 2006 20:15:25 -0000	1.6
@@ -1,19 +1,20 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -37,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -85,6 +87,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2
 



From fedora-extras-commits at redhat.com  Sun Oct 29 20:15:56 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 13:15:56 -0700
Subject: rpms/grhino/devel grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.6, 1.7
Message-ID: <200610292015.k9TKFuFH031826@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/devel

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	10 Oct 2006 01:06:57 -0000	1.6
+++ grhino.spec	29 Oct 2006 20:15:26 -0000	1.7
@@ -1,16 +1,16 @@
 Name:           grhino
 Version:        0.15.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
 * Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
 - BuildRequire on gettext
 



From fedora-extras-commits at redhat.com  Sun Oct 29 22:05:54 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 29 Oct 2006 15:05:54 -0700
Subject: rpms/php-pecl-xdebug/devel .cvsignore, 1.2, 1.3 php-pecl-xdebug.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610292205.k9TM5sKk006308@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6279

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
Upstream Sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 19:40:25 -0000	1.2
+++ .cvsignore	29 Oct 2006 22:05:24 -0000	1.3
@@ -1 +1 @@
-xdebug-2.0.0beta6.tgz
+xdebug-2.0.0RC1.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-xdebug.spec	6 Sep 2006 19:40:25 -0000	1.1
+++ php-pecl-xdebug.spec	29 Oct 2006 22:05:24 -0000	1.2
@@ -1,10 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta beta6
+%define beta RC1
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.1.%{beta}%{?dist}
+Release:        0.2.%{beta}%{?dist}
 Summary:        PECL package for debugging PHP scripts
 License:        PHP License
 Group:          Development/Languages
@@ -46,6 +46,9 @@
 %{php_extdir}/xdebug.so
 
 %changelog
+* Sun Oct 29 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.2.RC1
+- Upstream sync
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.1.beta6
 - Remove Provides php-xdebug
 - Fix Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 19:40:25 -0000	1.2
+++ sources	29 Oct 2006 22:05:24 -0000	1.3
@@ -1 +1 @@
-1ba82711d8f91c38c4b30a396cc2e72a  xdebug-2.0.0beta6.tgz
+a048de3dbb5a16489921f2096b8003e1  xdebug-2.0.0RC1.tgz



From fedora-extras-commits at redhat.com  Sun Oct 29 22:18:25 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 29 Oct 2006 15:18:25 -0700
Subject: rpms/php-pecl-xdebug/FC-5 .cvsignore, 1.2, 1.3 php-pecl-xdebug.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610292218.k9TMIPbE006573@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6535/FC-5

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 19:40:25 -0000	1.2
+++ .cvsignore	29 Oct 2006 22:17:54 -0000	1.3
@@ -1 +1 @@
-xdebug-2.0.0beta6.tgz
+xdebug-2.0.0RC1.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-5/php-pecl-xdebug.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-xdebug.spec	6 Sep 2006 19:40:25 -0000	1.1
+++ php-pecl-xdebug.spec	29 Oct 2006 22:17:54 -0000	1.2
@@ -1,10 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta beta6
+%define beta RC1
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.1.%{beta}%{?dist}
+Release:        0.2.%{beta}%{?dist}
 Summary:        PECL package for debugging PHP scripts
 License:        PHP License
 Group:          Development/Languages
@@ -46,6 +46,9 @@
 %{php_extdir}/xdebug.so
 
 %changelog
+* Sun Oct 29 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.2.RC1
+- Upstream sync
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.1.beta6
 - Remove Provides php-xdebug
 - Fix Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 19:40:25 -0000	1.2
+++ sources	29 Oct 2006 22:17:54 -0000	1.3
@@ -1 +1 @@
-1ba82711d8f91c38c4b30a396cc2e72a  xdebug-2.0.0beta6.tgz
+a048de3dbb5a16489921f2096b8003e1  xdebug-2.0.0RC1.tgz



From fedora-extras-commits at redhat.com  Sun Oct 29 22:18:25 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 29 Oct 2006 15:18:25 -0700
Subject: rpms/php-pecl-xdebug/FC-6 .cvsignore, 1.2, 1.3 php-pecl-xdebug.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610292218.k9TMIPt6006580@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6535/FC-6

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 19:40:25 -0000	1.2
+++ .cvsignore	29 Oct 2006 22:17:55 -0000	1.3
@@ -1 +1 @@
-xdebug-2.0.0beta6.tgz
+xdebug-2.0.0RC1.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/php-pecl-xdebug.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-xdebug.spec	6 Sep 2006 19:40:25 -0000	1.1
+++ php-pecl-xdebug.spec	29 Oct 2006 22:17:55 -0000	1.2
@@ -1,10 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta beta6
+%define beta RC1
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.1.%{beta}%{?dist}
+Release:        0.2.%{beta}%{?dist}
 Summary:        PECL package for debugging PHP scripts
 License:        PHP License
 Group:          Development/Languages
@@ -46,6 +46,9 @@
 %{php_extdir}/xdebug.so
 
 %changelog
+* Sun Oct 29 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.2.RC1
+- Upstream sync
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.1.beta6
 - Remove Provides php-xdebug
 - Fix Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 19:40:25 -0000	1.2
+++ sources	29 Oct 2006 22:17:55 -0000	1.3
@@ -1 +1 @@
-1ba82711d8f91c38c4b30a396cc2e72a  xdebug-2.0.0beta6.tgz
+a048de3dbb5a16489921f2096b8003e1  xdebug-2.0.0RC1.tgz



From fedora-extras-commits at redhat.com  Sun Oct 29 22:26:48 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 29 Oct 2006 15:26:48 -0700
Subject: rpms/liferea/devel liferea.spec,1.55,1.56
Message-ID: <200610292226.k9TMQmju006768@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6749

Modified Files:
	liferea.spec 
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-3
- Actually use the correct version for firefox.



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- liferea.spec	29 Oct 2006 18:45:42 -0000	1.55
+++ liferea.spec	29 Oct 2006 22:26:18 -0000	1.56
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.25
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -24,7 +24,7 @@
 BuildRequires:	dbus-devel
 %endif
 
-Requires:	firefox = 2.0.2
+Requires:	firefox = 2.0
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-3
+- Actually use the correct version for firefox.
+
 * Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-2
 - Rebuild for new firefox.
 



From fedora-extras-commits at redhat.com  Mon Oct 30 05:12:09 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Sun, 29 Oct 2006 22:12:09 -0700
Subject: rpms/php-shout/FC-6 .cvsignore, 1.2, 1.3 php-shout.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200610300512.k9U5C9Hi005990@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-shout/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970

Modified Files:
	.cvsignore php-shout.spec sources 
Log Message:
Bumped to 0.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Aug 2006 03:18:33 -0000	1.2
+++ .cvsignore	30 Oct 2006 05:11:38 -0000	1.3
@@ -1 +1 @@
-phpShout-0.3.1.tar.gz
+phpShout-0.9.1.tar.gz


Index: php-shout.spec
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-6/php-shout.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-shout.spec	27 Oct 2006 00:05:42 -0000	1.5
+++ php-shout.spec	30 Oct 2006 05:11:38 -0000	1.6
@@ -2,8 +2,8 @@
 %global php_extdir	%(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:		php-shout
-Version:	0.3.1
-Release:	7%{?dist}
+Version:	0.9.1
+Release:	1%{?dist}
 Summary:	PHP module for communicating with Icecast servers
 
 Source0:	http://dl.sf.net/phpshout/phpShout-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{php_extdir}/shout.so
 
 %changelog
+* Sun Oct 29 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.9.1-1
+- Bump to 0.9.1
+
 * Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-7
 - Rebuild for new PHP
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Aug 2006 03:18:33 -0000	1.2
+++ sources	30 Oct 2006 05:11:38 -0000	1.3
@@ -1 +1 @@
-3a630c1953e0bd0c42a3324f5e449077  phpShout-0.3.1.tar.gz
+0cb82355c6bdc985a9a0db923bf0372a  phpShout-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 06:47:43 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 29 Oct 2006 23:47:43 -0700
Subject: rpms/python-tgfastdata/devel python-tgfastdata.spec,1.1,1.2
Message-ID: <200610300647.k9U6lhAZ009432@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9409

Modified Files:
	python-tgfastdata.spec 
Log Message:
fix egg-info directory


Index: python-tgfastdata.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/devel/python-tgfastdata.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-tgfastdata.spec	15 Oct 2006 17:35:19 -0000	1.1
+++ python-tgfastdata.spec	30 Oct 2006 06:47:13 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           python-tgfastdata
 Version:        0.9a6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Automatic user interface generation for TurboGears
 
 Group:          Development/Languages
@@ -35,8 +35,8 @@
 install -p -m 0644 %{module}/templates/* %{buildroot}%{python_sitelib}/%{module}/templates
 
 # Install the egg-info directory
-mkdir -p %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
-install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
+mkdir -p %{buildroot}%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
+install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
 
 
 %clean
@@ -46,9 +46,12 @@
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}/%{module}/
-%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
+%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Mon Oct 30 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-5
+- Fix egg-info directory
+
 * Tue Oct 14 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-4
 - Fix Source0
 - Own %%{python_sitelib}/%{module}



From fedora-extras-commits at redhat.com  Mon Oct 30 06:56:16 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 29 Oct 2006 23:56:16 -0700
Subject: rpms/python-tgfastdata/FC-6 python-tgfastdata.spec,1.1,1.2
Message-ID: <200610300656.k9U6uG2k009558@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9542

Modified Files:
	python-tgfastdata.spec 
Log Message:
fix egg-info directory


Index: python-tgfastdata.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/FC-6/python-tgfastdata.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-tgfastdata.spec	15 Oct 2006 17:35:19 -0000	1.1
+++ python-tgfastdata.spec	30 Oct 2006 06:55:46 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           python-tgfastdata
 Version:        0.9a6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Automatic user interface generation for TurboGears
 
 Group:          Development/Languages
@@ -35,8 +35,8 @@
 install -p -m 0644 %{module}/templates/* %{buildroot}%{python_sitelib}/%{module}/templates
 
 # Install the egg-info directory
-mkdir -p %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
-install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
+mkdir -p %{buildroot}%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
+install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
 
 
 %clean
@@ -46,9 +46,12 @@
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}/%{module}/
-%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
+%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Mon Oct 30 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-5
+- Fix egg-info directory
+
 * Tue Oct 14 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-4
 - Fix Source0
 - Own %%{python_sitelib}/%{module}



From fedora-extras-commits at redhat.com  Mon Oct 30 07:51:11 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Oct 2006 00:51:11 -0700
Subject: rpms/codeblocks/devel .cvsignore, 1.3, 1.4 codeblocks-autorev.patch,
	1.1, 1.2 codeblocks.spec, 1.2, 1.3 sources, 1.3,
	1.4 codeblocks-rpath.patch, 1.1, NONE
Message-ID: <200610300751.k9U7pB8W012942@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12896

Modified Files:
	.cvsignore codeblocks-autorev.patch codeblocks.spec sources 
Removed Files:
	codeblocks-rpath.patch 
Log Message:
- update to revision 3157
- kill rpath in the spec file using sed
- fix directory ownership



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 09:16:19 -0000	1.3
+++ .cvsignore	30 Oct 2006 07:50:41 -0000	1.4
@@ -1 +1 @@
-codeblocks-svn3030.tar.bz2
+codeblocks-svn3157.tar.bz2

codeblocks-autorev.patch:

Index: codeblocks-autorev.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks-autorev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-autorev.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-autorev.patch	30 Oct 2006 07:50:41 -0000	1.2
@@ -14,8 +14,11 @@
  # Deal with some gentoo-specific issues
  export WANT_AUTOMAKE='1.7'
  export WANT_AUTOCONF='2.5'
---- src/tools/Makefile.am.orig	2006-09-13 17:45:04.000000000 +0200
-+++ src/tools/Makefile.am	2006-09-13 17:45:11.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = autorevision ConsoleRunner
-+SUBDIRS = ConsoleRunner
+--- src/Makefile.am.orig	2006-10-15 10:11:04.000000000 +0200
++++ src/Makefile.am	2006-10-15 10:11:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = build_tools sdk src plugins tools setup templates scripts wxsmith
++SUBDIRS = sdk src plugins tools setup templates scripts wxsmith
+ 
+ dist_pkgdata_DATA = tips.txt
+ 


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks.spec	8 Oct 2006 09:16:19 -0000	1.2
+++ codeblocks.spec	30 Oct 2006 07:50:41 -0000	1.3
@@ -1,9 +1,9 @@
-%define		rev	3030
-%define		date	20061007
+%define		rev	3157
+%define		date	20061029
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.10.%{date}svn%{rev}%{?dist}
+Release:	0.11.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -19,7 +19,6 @@
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
-Source1:	codeblocks-rpath.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -68,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -77,9 +76,6 @@
 
 ./bootstrap
 
-# get rid of rpath in libs and plugins
-patch -p0 < %{SOURCE1}
-
 # generate autorevision.h
 cat > src/sdk/autorevision.h << EOF
 /*%{rev}*/
@@ -107,6 +103,10 @@
 
 %configure --enable-contrib
 
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -162,14 +162,15 @@
 %{_datadir}/pixmaps/codeblocks.png
 
 %dir %{pkgdatadir}
-%{pkgdatadir}/icons/*
+%{pkgdatadir}/icons
+%dir %{pkgdatadir}/images
 %{pkgdatadir}/images/*.png
-%{pkgdatadir}/images/16x16/*
-%{pkgdatadir}/images/codecompletion/*
-%{pkgdatadir}/images/settings/*
-%{pkgdatadir}/lexers/*
-%{pkgdatadir}/scripts/*
-%{pkgdatadir}/templates/*
+%{pkgdatadir}/images/16x16
+%{pkgdatadir}/images/codecompletion
+%{pkgdatadir}/images/settings
+%{pkgdatadir}/lexers
+%{pkgdatadir}/scripts
+%{pkgdatadir}/templates
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
 %{pkgdatadir}/classwizard.zip
@@ -201,7 +202,9 @@
 %{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
 %{pkgdatadir}/keybinder.zip
-%{pkgdatadir}/CBProfiler.zip
+%{pkgdatadir}/lib_finder.zip
+%{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -215,11 +218,18 @@
 %{plugindir}/libexporter.so
 %{plugindir}/libhelp_plugin.so
 %{plugindir}/libkeybinder.so
-%{plugindir}/libprofiler.so
+%{plugindir}/liblib_finder.so
+%{plugindir}/libProfiler.so
+%{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Mon Oct 30 2006 Dan Horak <dan[at]danny.cz> 1.0-0.11.20061029svn3157
+- update to revision 3157
+- kill rpath in the spec file using sed
+- fix directory ownership
+
 * Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
 - update to revision 3030
 - change the install paths for plugins in the spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 09:16:19 -0000	1.3
+++ sources	30 Oct 2006 07:50:41 -0000	1.4
@@ -1 +1 @@
-5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2
+da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2


--- codeblocks-rpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 30 08:40:10 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Oct 2006 01:40:10 -0700
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.3, 1.4 codeblocks-autorev.patch, 
	1.1, 1.2 codeblocks.spec, 1.2, 1.3 sources, 1.3,
	1.4 codeblocks-rpath.patch, 1.1, NONE
Message-ID: <200610300840.k9U8eARd016259@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16234

Modified Files:
	.cvsignore codeblocks-autorev.patch codeblocks.spec sources 
Removed Files:
	codeblocks-rpath.patch 
Log Message:
- update to revision 3157
- kill rpath in the spec file using sed
- fix directory ownership



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 09:16:19 -0000	1.3
+++ .cvsignore	30 Oct 2006 08:39:39 -0000	1.4
@@ -1 +1 @@
-codeblocks-svn3030.tar.bz2
+codeblocks-svn3157.tar.bz2

codeblocks-autorev.patch:

Index: codeblocks-autorev.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-autorev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-autorev.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-autorev.patch	30 Oct 2006 08:39:39 -0000	1.2
@@ -14,8 +14,11 @@
  # Deal with some gentoo-specific issues
  export WANT_AUTOMAKE='1.7'
  export WANT_AUTOCONF='2.5'
---- src/tools/Makefile.am.orig	2006-09-13 17:45:04.000000000 +0200
-+++ src/tools/Makefile.am	2006-09-13 17:45:11.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = autorevision ConsoleRunner
-+SUBDIRS = ConsoleRunner
+--- src/Makefile.am.orig	2006-10-15 10:11:04.000000000 +0200
++++ src/Makefile.am	2006-10-15 10:11:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = build_tools sdk src plugins tools setup templates scripts wxsmith
++SUBDIRS = sdk src plugins tools setup templates scripts wxsmith
+ 
+ dist_pkgdata_DATA = tips.txt
+ 


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks.spec	8 Oct 2006 09:16:19 -0000	1.2
+++ codeblocks.spec	30 Oct 2006 08:39:39 -0000	1.3
@@ -1,9 +1,9 @@
-%define		rev	3030
-%define		date	20061007
+%define		rev	3157
+%define		date	20061029
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.10.%{date}svn%{rev}%{?dist}
+Release:	0.11.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -19,7 +19,6 @@
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
-Source1:	codeblocks-rpath.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -68,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -77,9 +76,6 @@
 
 ./bootstrap
 
-# get rid of rpath in libs and plugins
-patch -p0 < %{SOURCE1}
-
 # generate autorevision.h
 cat > src/sdk/autorevision.h << EOF
 /*%{rev}*/
@@ -107,6 +103,10 @@
 
 %configure --enable-contrib
 
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -162,14 +162,15 @@
 %{_datadir}/pixmaps/codeblocks.png
 
 %dir %{pkgdatadir}
-%{pkgdatadir}/icons/*
+%{pkgdatadir}/icons
+%dir %{pkgdatadir}/images
 %{pkgdatadir}/images/*.png
-%{pkgdatadir}/images/16x16/*
-%{pkgdatadir}/images/codecompletion/*
-%{pkgdatadir}/images/settings/*
-%{pkgdatadir}/lexers/*
-%{pkgdatadir}/scripts/*
-%{pkgdatadir}/templates/*
+%{pkgdatadir}/images/16x16
+%{pkgdatadir}/images/codecompletion
+%{pkgdatadir}/images/settings
+%{pkgdatadir}/lexers
+%{pkgdatadir}/scripts
+%{pkgdatadir}/templates
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
 %{pkgdatadir}/classwizard.zip
@@ -201,7 +202,9 @@
 %{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
 %{pkgdatadir}/keybinder.zip
-%{pkgdatadir}/CBProfiler.zip
+%{pkgdatadir}/lib_finder.zip
+%{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -215,11 +218,18 @@
 %{plugindir}/libexporter.so
 %{plugindir}/libhelp_plugin.so
 %{plugindir}/libkeybinder.so
-%{plugindir}/libprofiler.so
+%{plugindir}/liblib_finder.so
+%{plugindir}/libProfiler.so
+%{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Mon Oct 30 2006 Dan Horak <dan[at]danny.cz> 1.0-0.11.20061029svn3157
+- update to revision 3157
+- kill rpath in the spec file using sed
+- fix directory ownership
+
 * Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
 - update to revision 3030
 - change the install paths for plugins in the spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 09:16:19 -0000	1.3
+++ sources	30 Oct 2006 08:39:39 -0000	1.4
@@ -1 +1 @@
-5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2
+da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2


--- codeblocks-rpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 30 08:47:08 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Oct 2006 01:47:08 -0700
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.3, 1.4 codeblocks-autorev.patch, 
	1.1, 1.2 codeblocks.spec, 1.2, 1.3 sources, 1.3,
	1.4 codeblocks-rpath.patch, 1.1, NONE
Message-ID: <200610300847.k9U8l8Ts016358@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16331

Modified Files:
	.cvsignore codeblocks-autorev.patch codeblocks.spec sources 
Removed Files:
	codeblocks-rpath.patch 
Log Message:
- update to revision 3157
- kill rpath in the spec file using sed
- fix directory ownership



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 09:18:38 -0000	1.3
+++ .cvsignore	30 Oct 2006 08:46:37 -0000	1.4
@@ -1 +1 @@
-codeblocks-svn3030.tar.bz2
+codeblocks-svn3157.tar.bz2

codeblocks-autorev.patch:

Index: codeblocks-autorev.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-autorev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-autorev.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-autorev.patch	30 Oct 2006 08:46:37 -0000	1.2
@@ -14,8 +14,11 @@
  # Deal with some gentoo-specific issues
  export WANT_AUTOMAKE='1.7'
  export WANT_AUTOCONF='2.5'
---- src/tools/Makefile.am.orig	2006-09-13 17:45:04.000000000 +0200
-+++ src/tools/Makefile.am	2006-09-13 17:45:11.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = autorevision ConsoleRunner
-+SUBDIRS = ConsoleRunner
+--- src/Makefile.am.orig	2006-10-15 10:11:04.000000000 +0200
++++ src/Makefile.am	2006-10-15 10:11:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = build_tools sdk src plugins tools setup templates scripts wxsmith
++SUBDIRS = sdk src plugins tools setup templates scripts wxsmith
+ 
+ dist_pkgdata_DATA = tips.txt
+ 


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks.spec	8 Oct 2006 09:18:38 -0000	1.2
+++ codeblocks.spec	30 Oct 2006 08:46:37 -0000	1.3
@@ -1,9 +1,9 @@
-%define		rev	3030
-%define		date	20061007
+%define		rev	3157
+%define		date	20061029
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.10.%{date}svn%{rev}%{?dist}
+Release:	0.11.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -19,7 +19,6 @@
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
-Source1:	codeblocks-rpath.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -68,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -77,9 +76,6 @@
 
 ./bootstrap
 
-# get rid of rpath in libs and plugins
-patch -p0 < %{SOURCE1}
-
 # generate autorevision.h
 cat > src/sdk/autorevision.h << EOF
 /*%{rev}*/
@@ -107,6 +103,10 @@
 
 %configure --enable-contrib
 
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -162,14 +162,15 @@
 %{_datadir}/pixmaps/codeblocks.png
 
 %dir %{pkgdatadir}
-%{pkgdatadir}/icons/*
+%{pkgdatadir}/icons
+%dir %{pkgdatadir}/images
 %{pkgdatadir}/images/*.png
-%{pkgdatadir}/images/16x16/*
-%{pkgdatadir}/images/codecompletion/*
-%{pkgdatadir}/images/settings/*
-%{pkgdatadir}/lexers/*
-%{pkgdatadir}/scripts/*
-%{pkgdatadir}/templates/*
+%{pkgdatadir}/images/16x16
+%{pkgdatadir}/images/codecompletion
+%{pkgdatadir}/images/settings
+%{pkgdatadir}/lexers
+%{pkgdatadir}/scripts
+%{pkgdatadir}/templates
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
 %{pkgdatadir}/classwizard.zip
@@ -201,7 +202,9 @@
 %{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
 %{pkgdatadir}/keybinder.zip
-%{pkgdatadir}/CBProfiler.zip
+%{pkgdatadir}/lib_finder.zip
+%{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -215,11 +218,18 @@
 %{plugindir}/libexporter.so
 %{plugindir}/libhelp_plugin.so
 %{plugindir}/libkeybinder.so
-%{plugindir}/libprofiler.so
+%{plugindir}/liblib_finder.so
+%{plugindir}/libProfiler.so
+%{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Mon Oct 30 2006 Dan Horak <dan[at]danny.cz> 1.0-0.11.20061029svn3157
+- update to revision 3157
+- kill rpath in the spec file using sed
+- fix directory ownership
+
 * Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
 - update to revision 3030
 - change the install paths for plugins in the spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 09:18:38 -0000	1.3
+++ sources	30 Oct 2006 08:46:37 -0000	1.4
@@ -1 +1 @@
-5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2
+da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2


--- codeblocks-rpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 30 08:50:52 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 30 Oct 2006 01:50:52 -0700
Subject: fedora-security/audit fc5,1.374,1.375 fc6,1.127,1.128
Message-ID: <200610300850.k9U8oq6i016438@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16418

Modified Files:
	fc5 fc6 
Log Message:
Catchup with weekend CVE and releases



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- fc5	27 Oct 2006 07:45:44 -0000	1.374
+++ fc5	30 Oct 2006 08:50:50 -0000	1.375
@@ -1,11 +1,15 @@
-Up to date CVE as of CVE email 20061026
-Up to date FC5 as of 20061026
+Up to date CVE as of CVE email 20061029
+Up to date FC5 as of 20061029
 
 ** are items that need attention
 
+CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5470 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -36,12 +40,14 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
+CVE-2006-4805 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
 CVE-2006-4624 version (mailman, fixed 2.1.9rc1) #205652 [since FEDORA-2006-1013]
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
+CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- fc6	27 Oct 2006 07:45:44 -0000	1.127
+++ fc6	30 Oct 2006 08:50:50 -0000	1.128
@@ -1,11 +1,15 @@
-Up to date CVE as of CVE email 20061026
-Up to date FC6 as of 20061026
+Up to date CVE as of CVE email 20061029
+Up to date FC6 as of 20061029
 
 ** are items that need attention
 
+CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5470 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -36,12 +40,14 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055]
+CVE-2006-4805 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
 CVE-2006-4624 version (mailman, fixed 2.1.9rc1)
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1)
 CVE-2006-4600 version (openldap, fixed 2.3.25)
+CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7)



From fedora-extras-commits at redhat.com  Mon Oct 30 09:31:54 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 30 Oct 2006 02:31:54 -0700
Subject: rpms/brasero/FC-6 .cvsignore, 1.2, 1.3 brasero.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610300931.k9U9VsHf019827@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19807

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
- Update to 0.5.0
- Updated icon paths
- Added gconf schemas sections



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2006 22:59:10 -0000	1.2
+++ .cvsignore	30 Oct 2006 09:31:24 -0000	1.3
@@ -1 +1 @@
-brasero-0.4.4.tar.bz2
+brasero-0.5.0.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/brasero.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- brasero.spec	3 Oct 2006 22:59:10 -0000	1.1
+++ brasero.spec	30 Oct 2006 09:31:24 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:      brasero
-Version:   0.4.4
-Release:   3%{?dist}
+Version:   0.5.0
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPL
@@ -14,10 +14,11 @@
 BuildRequires:  libgnomeui-devel >= 2.10.0
 BuildRequires:  gstreamer-devel >= 0.10.6
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires:  nautilus-cd-burner-devel >= 2.14.0
-BuildRequires:  libnotify-devel >= 0.3.0
+BuildRequires:  nautilus-cd-burner-devel >= 2.16.0
 BuildRequires:  libbeagle-devel >= 0.1.1
 BuildRequires:  totem-devel >= 1.2.0
+BuildRequires:  libburn-devel >= 0.2.1
+BuildRequires:  libisofs-devel >= 0.2.1
 
 Requires:  dvd+rw-tools
 Requires:  cdrecord
@@ -27,6 +28,9 @@
 
 Requires(post):    shared-mime-info
 Requires(postun):  shared-mime-info
+Requires(pre):     GConf2
+Requires(post):    GConf2
+Requires(preun):   GConf2
 
 
 %description
@@ -39,12 +43,13 @@
 
 
 %build
-%configure --disable-caches
+%configure --disable-caches --disable-static --disable-schemas-install
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -60,34 +65,58 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null  || :
+killall -HUP gconfd-2 &>/dev/null || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%doc %{_mandir}/man1/%{name}.*
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/brasero.desktop
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/gnome/48x48/mimetypes/*
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/mime/packages/*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Sun Oct 29 2006 Denis Leroy <denis at poolshark.org> - 0.5.0-1
+- Update to 0.5.0
+- Updated icon paths
+- Added gconf schemas sections
+
 * Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-3
 - fixed homepage URL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2006 22:59:10 -0000	1.2
+++ sources	30 Oct 2006 09:31:24 -0000	1.3
@@ -1 +1 @@
-1ef6ae66677ed9136634692d8bc1cc7a  brasero-0.4.4.tar.bz2
+9cf947c4ca681e9ee66600022e697c80  brasero-0.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 09:36:33 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Mon, 30 Oct 2006 02:36:33 -0700
Subject: status-report-scripts parseBZbugList,1.54,1.55
Message-ID: <200610300936.k9U9aXst019932@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19914

Modified Files:
	parseBZbugList 
Log Message:
Add TODO item.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- parseBZbugList	25 Oct 2006 20:11:22 -0000	1.54
+++ parseBZbugList	30 Oct 2006 09:36:30 -0000	1.55
@@ -24,6 +24,7 @@
 
 # TODO stuff
 #  See why count in "Inactive maintainers with open bug reports" is strange.
+#  Maybe report a count of FE-DEADREVIEW.
 
 use strict;
 use Getopt::Long;
@@ -75,6 +76,7 @@
 my $FE_NEEDSPONSOR = 177841;
 my $FE_LEGAL = 182235;
 my $FE_GUIDELINES = 197974;
+my $FE_DEADREVIEW = 201449;
 my $extras_orphan = 'extras-orphan at fedoraproject.org';
 my %BZN;
 my %BZS;



From fedora-extras-commits at redhat.com  Mon Oct 30 10:05:39 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 30 Oct 2006 03:05:39 -0700
Subject: rpms/brasero/devel .cvsignore, 1.2, 1.3 brasero.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610301005.k9UA5dob023020@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22989

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
- Update to 0.5.0
- Updated icon paths
- Added gconf schemas sections



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2006 22:59:10 -0000	1.2
+++ .cvsignore	30 Oct 2006 10:05:09 -0000	1.3
@@ -1 +1 @@
-brasero-0.4.4.tar.bz2
+brasero-0.5.0.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- brasero.spec	3 Oct 2006 22:59:10 -0000	1.1
+++ brasero.spec	30 Oct 2006 10:05:09 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:      brasero
-Version:   0.4.4
-Release:   3%{?dist}
+Version:   0.5.0
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPL
@@ -14,10 +14,11 @@
 BuildRequires:  libgnomeui-devel >= 2.10.0
 BuildRequires:  gstreamer-devel >= 0.10.6
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires:  nautilus-cd-burner-devel >= 2.14.0
-BuildRequires:  libnotify-devel >= 0.3.0
+BuildRequires:  nautilus-cd-burner-devel >= 2.16.0
 BuildRequires:  libbeagle-devel >= 0.1.1
 BuildRequires:  totem-devel >= 1.2.0
+BuildRequires:  libburn-devel >= 0.2.1
+BuildRequires:  libisofs-devel >= 0.2.1
 
 Requires:  dvd+rw-tools
 Requires:  cdrecord
@@ -27,6 +28,9 @@
 
 Requires(post):    shared-mime-info
 Requires(postun):  shared-mime-info
+Requires(pre):     GConf2
+Requires(post):    GConf2
+Requires(preun):   GConf2
 
 
 %description
@@ -39,12 +43,13 @@
 
 
 %build
-%configure --disable-caches
+%configure --disable-caches --disable-static --disable-schemas-install
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -60,34 +65,58 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null  || :
+killall -HUP gconfd-2 &>/dev/null || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%doc %{_mandir}/man1/%{name}.*
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/brasero.desktop
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/gnome/48x48/mimetypes/*
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/mime/packages/*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Sun Oct 29 2006 Denis Leroy <denis at poolshark.org> - 0.5.0-1
+- Update to 0.5.0
+- Updated icon paths
+- Added gconf schemas sections
+
 * Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-3
 - fixed homepage URL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2006 22:59:10 -0000	1.2
+++ sources	30 Oct 2006 10:05:09 -0000	1.3
@@ -1 +1 @@
-1ef6ae66677ed9136634692d8bc1cc7a  brasero-0.4.4.tar.bz2
+9cf947c4ca681e9ee66600022e697c80  brasero-0.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 10:19:03 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 30 Oct 2006 03:19:03 -0700
Subject: rpms/hugs98/devel .cvsignore, 1.3, 1.4 hugs98.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200610301019.k9UAJ3kt023198@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23178

Modified Files:
	.cvsignore hugs98.spec sources 
Log Message:
new version Sep2006


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jun 2006 22:16:20 -0000	1.3
+++ .cvsignore	30 Oct 2006 10:18:33 -0000	1.4
@@ -1 +1 @@
-hugs98-plus-May2006.tar.gz
+hugs98-plus-Sep2006.tar.gz


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hugs98.spec	28 Aug 2006 09:13:58 -0000	1.9
+++ hugs98.spec	30 Oct 2006 10:18:33 -0000	1.10
@@ -1,14 +1,14 @@
-%define hugs_ver plus-May2006
+%define hugs_ver plus-Sep2006
 
 Name:		hugs98
-Version:	2006.05
-Release:	6%{?dist}
+Version:	2006.09
+Release:	1%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/2006-05/%{name}-%{hugs_ver}.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/2006-09/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -194,6 +194,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-1
+- new version Sep2006
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-6
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jun 2006 22:16:20 -0000	1.3
+++ sources	30 Oct 2006 10:18:33 -0000	1.4
@@ -1 +1 @@
-b6989dee41f818f5052d9d46e3663726  hugs98-plus-May2006.tar.gz
+e03e0ad79750d037237c47ebe33fa20e  hugs98-plus-Sep2006.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 10:25:12 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 30 Oct 2006 03:25:12 -0700
Subject: rpms/hugs98/FC-5 .cvsignore, 1.3, 1.4 hugs98.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200610301025.k9UAPCYs023308@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/FC-5

Modified Files:
	.cvsignore hugs98.spec sources 
Log Message:
new version Sep2006


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jun 2006 22:28:20 -0000	1.3
+++ .cvsignore	30 Oct 2006 10:24:42 -0000	1.4
@@ -1 +1 @@
-hugs98-plus-May2006.tar.gz
+hugs98-plus-Sep2006.tar.gz


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hugs98.spec	23 Jun 2006 08:12:50 -0000	1.9
+++ hugs98.spec	30 Oct 2006 10:24:42 -0000	1.10
@@ -1,14 +1,14 @@
-%define hugs_ver plus-May2006
+%define hugs_ver plus-Sep2006
 
 Name:		hugs98
-Version:	2006.05
-Release:	5%{?dist}
+Version:	2006.09
+Release:	1%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/2006-05/%{name}-%{hugs_ver}.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/2006-09/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -194,6 +194,12 @@
 
 
 %changelog
+* Mon Oct 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-1
+- new version Sep2006
+
+* Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-6
+- Rebuild for FE6
+
 * Fri Jun 23 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-5
 - switch char encoding from utf-8 to locale
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jun 2006 22:28:20 -0000	1.3
+++ sources	30 Oct 2006 10:24:42 -0000	1.4
@@ -1 +1 @@
-b6989dee41f818f5052d9d46e3663726  hugs98-plus-May2006.tar.gz
+e03e0ad79750d037237c47ebe33fa20e  hugs98-plus-Sep2006.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 10:25:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 30 Oct 2006 03:25:13 -0700
Subject: rpms/hugs98/FC-6 .cvsignore, 1.3, 1.4 hugs98.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200610301025.k9UAPDPV023313@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/FC-6

Modified Files:
	.cvsignore hugs98.spec sources 
Log Message:
new version Sep2006


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jun 2006 22:16:20 -0000	1.3
+++ .cvsignore	30 Oct 2006 10:24:42 -0000	1.4
@@ -1 +1 @@
-hugs98-plus-May2006.tar.gz
+hugs98-plus-Sep2006.tar.gz


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-6/hugs98.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hugs98.spec	28 Aug 2006 09:13:58 -0000	1.9
+++ hugs98.spec	30 Oct 2006 10:24:43 -0000	1.10
@@ -1,14 +1,14 @@
-%define hugs_ver plus-May2006
+%define hugs_ver plus-Sep2006
 
 Name:		hugs98
-Version:	2006.05
-Release:	6%{?dist}
+Version:	2006.09
+Release:	1%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/2006-05/%{name}-%{hugs_ver}.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/2006-09/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -194,6 +194,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-1
+- new version Sep2006
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-6
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jun 2006 22:16:20 -0000	1.3
+++ sources	30 Oct 2006 10:24:43 -0000	1.4
@@ -1 +1 @@
-b6989dee41f818f5052d9d46e3663726  hugs98-plus-May2006.tar.gz
+e03e0ad79750d037237c47ebe33fa20e  hugs98-plus-Sep2006.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 14:05:33 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 07:05:33 -0700
Subject: rpms/awstats/FC-5 awstats.spec,1.14,1.15
Message-ID: <200610301405.k9UE5XvU004233@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185/FC-5

Modified Files:
	awstats.spec 
Log Message:
fix dos encoding on logresolvemerge.pl (bug 212965)


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- awstats.spec	9 May 2006 09:04:15 -0000	1.14
+++ awstats.spec	30 Oct 2006 14:05:02 -0000	1.15
@@ -1,14 +1,13 @@
 Name:       awstats
-Version:    6.5
-Release:    5%{?dist}
+Version:    6.6
+Release:    0.3.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
-#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
+#Source0:    http://dl.sf.net/awstats/awstats-6.6.tar.gz
+Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
 Source1:    awstats.README.SELinux
-Patch0:     awstats-6.5-CVE-2006-1945.patch
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -35,15 +34,13 @@
 
 %prep
 %setup -q
-# no backup or the orig file will be installed
-%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
 chmod -x tools/httpd_conf
 find tools/xslt -type f | xargs chmod -x
 # Remove \r in conf file (file written on MS Windows)
-perl -pi -e 's/\r//g' tools/httpd_conf
+perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
 
@@ -176,11 +173,14 @@
 
 
 %changelog
-* Tue May 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-5
-- really fix CVE-2006-1945...
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+- fix DOS encoding on logresolvemerge.pl
 
-* Mon May 08 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-4
-- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923)
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
+- rebuild
+
+* Sun May 07 2006 Aurelien Bompard <gauret[AT]free.fr> 6.6-0.1.beta
+- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923)
 
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-3
 - SELinux support: use semanage to label the cgi and the database files



From fedora-extras-commits at redhat.com  Mon Oct 30 14:05:40 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 07:05:40 -0700
Subject: rpms/awstats/devel awstats.spec,1.15,1.16
Message-ID: <200610301405.k9UE5evP004239@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185/devel

Modified Files:
	awstats.spec 
Log Message:
fix dos encoding on logresolvemerge.pl (bug 212965)


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- awstats.spec	30 Aug 2006 14:29:10 -0000	1.15
+++ awstats.spec	30 Oct 2006 14:05:09 -0000	1.16
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.6
-Release:    0.2.beta%{?dist}
+Release:    0.3.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -40,7 +40,7 @@
 chmod -x tools/httpd_conf
 find tools/xslt -type f | xargs chmod -x
 # Remove \r in conf file (file written on MS Windows)
-perl -pi -e 's/\r//g' tools/httpd_conf
+perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
 
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+- fix DOS encoding on logresolvemerge.pl
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct 30 14:05:37 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 07:05:37 -0700
Subject: rpms/awstats/FC-6 awstats.spec,1.15,1.16
Message-ID: <200610301405.k9UE5b0t004236@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185/FC-6

Modified Files:
	awstats.spec 
Log Message:
fix dos encoding on logresolvemerge.pl (bug 212965)


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-6/awstats.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- awstats.spec	30 Aug 2006 14:29:10 -0000	1.15
+++ awstats.spec	30 Oct 2006 14:05:07 -0000	1.16
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.6
-Release:    0.2.beta%{?dist}
+Release:    0.3.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -40,7 +40,7 @@
 chmod -x tools/httpd_conf
 find tools/xslt -type f | xargs chmod -x
 # Remove \r in conf file (file written on MS Windows)
-perl -pi -e 's/\r//g' tools/httpd_conf
+perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
 
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+- fix DOS encoding on logresolvemerge.pl
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct 30 14:23:55 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 07:23:55 -0700
Subject: rpms/awstats/FC-5 awstats.spec,1.15,1.16
Message-ID: <200610301423.k9UENtKB004672@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4652

Modified Files:
	awstats.spec 
Log Message:
revert to FC-5 version + encoding fix


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- awstats.spec	30 Oct 2006 14:05:02 -0000	1.15
+++ awstats.spec	30 Oct 2006 14:23:25 -0000	1.16
@@ -1,13 +1,14 @@
 Name:       awstats
-Version:    6.6
-Release:    0.3.beta%{?dist}
+Version:    6.5
+Release:    6%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-#Source0:    http://dl.sf.net/awstats/awstats-6.6.tar.gz
-Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
 Source1:    awstats.README.SELinux
+Patch0:     awstats-6.5-CVE-2006-1945.patch
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -34,6 +35,8 @@
 
 %prep
 %setup -q
+# no backup or the orig file will be installed
+%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -173,14 +176,14 @@
 
 
 %changelog
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.5-5
 - fix DOS encoding on logresolvemerge.pl
 
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
-- rebuild
+* Tue May 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-5
+- really fix CVE-2006-1945...
 
-* Sun May 07 2006 Aurelien Bompard <gauret[AT]free.fr> 6.6-0.1.beta
-- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923)
+* Mon May 08 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-4
+- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923)
 
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-3
 - SELinux support: use semanage to label the cgi and the database files



From fedora-extras-commits at redhat.com  Mon Oct 30 15:05:05 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 30 Oct 2006 08:05:05 -0700
Subject: rpms/gtkwave/devel .cvsignore, 1.24, 1.25 gtkwave.spec, 1.26,
	1.27 sources, 1.24, 1.25
Message-ID: <200610301505.k9UF55ep007943@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7918

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 10:49:15 -0000	1.24
+++ .cvsignore	30 Oct 2006 15:04:34 -0000	1.25
@@ -1 +1 @@
-gtkwave-3.0.14.tar.gz
+gtkwave-3.0.15.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkwave.spec	18 Oct 2006 10:49:15 -0000	1.26
+++ gtkwave.spec	30 Oct 2006 15:04:34 -0000	1.27
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.14
+Version:		3.0.15
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 3.0.15-1
+- update to 3.0.15
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
 - update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Oct 2006 10:49:15 -0000	1.24
+++ sources	30 Oct 2006 15:04:34 -0000	1.25
@@ -1 +1 @@
-ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz
+c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:07:51 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 30 Oct 2006 08:07:51 -0700
Subject: rpms/gtkwave/FC-6 .cvsignore, 1.24, 1.25 gtkwave.spec, 1.26,
	1.27 sources, 1.24, 1.25
Message-ID: <200610301507.k9UF7pKt008081@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8059

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 10:49:15 -0000	1.24
+++ .cvsignore	30 Oct 2006 15:07:21 -0000	1.25
@@ -1 +1 @@
-gtkwave-3.0.14.tar.gz
+gtkwave-3.0.15.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/gtkwave.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkwave.spec	18 Oct 2006 10:49:15 -0000	1.26
+++ gtkwave.spec	30 Oct 2006 15:07:21 -0000	1.27
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.14
+Version:		3.0.15
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 3.0.15-1
+- update to 3.0.15
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
 - update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Oct 2006 10:49:15 -0000	1.24
+++ sources	30 Oct 2006 15:07:21 -0000	1.25
@@ -1 +1 @@
-ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz
+c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:09:11 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 30 Oct 2006 08:09:11 -0700
Subject: rpms/gtkwave/FC-5 .cvsignore, 1.24, 1.25 gtkwave.spec, 1.24,
	1.25 sources, 1.24, 1.25
Message-ID: <200610301509.k9UF9BGp008150@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8129

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 11:06:30 -0000	1.24
+++ .cvsignore	30 Oct 2006 15:08:41 -0000	1.25
@@ -1 +1 @@
-gtkwave-3.0.14.tar.gz
+gtkwave-3.0.15.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtkwave.spec	18 Oct 2006 11:06:30 -0000	1.24
+++ gtkwave.spec	30 Oct 2006 15:08:41 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.14
+Version:		3.0.15
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 3.0.15-1
+- update to 3.0.15
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
 - update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Oct 2006 11:06:30 -0000	1.24
+++ sources	30 Oct 2006 15:08:41 -0000	1.25
@@ -1 +1 @@
-ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz
+c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:10:33 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 30 Oct 2006 08:10:33 -0700
Subject: rpms/gtkwave/FC-4 .cvsignore, 1.24, 1.25 gtkwave.spec, 1.23,
	1.24 sources, 1.24, 1.25
Message-ID: <200610301510.k9UFAXPW008222@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8199

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 11:07:49 -0000	1.24
+++ .cvsignore	30 Oct 2006 15:10:03 -0000	1.25
@@ -1 +1 @@
-gtkwave-3.0.14.tar.gz
+gtkwave-3.0.15.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtkwave.spec	18 Oct 2006 11:07:49 -0000	1.23
+++ gtkwave.spec	30 Oct 2006 15:10:03 -0000	1.24
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.14
+Version:		3.0.15
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 3.0.15-1
+- update to 3.0.15
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
 - update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Oct 2006 11:07:49 -0000	1.24
+++ sources	30 Oct 2006 15:10:03 -0000	1.25
@@ -1 +1 @@
-ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz
+c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:27:19 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 30 Oct 2006 08:27:19 -0700
Subject: rpms/poedit/FC-5 .cvsignore, 1.3, 1.4 poedit.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200610301527.k9UFRJbg008537@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8485/FC-5

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2006 15:13:58 -0000	1.3
+++ .cvsignore	30 Oct 2006 15:26:49 -0000	1.4
@@ -1 +1 @@
-poedit-1.3.5.tar.gz
+poedit-1.3.6.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/poedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poedit.spec	29 Oct 2006 15:13:58 -0000	1.2
+++ poedit.spec	30 Oct 2006 15:26:49 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           poedit
-Version:        1.3.5
+Version:        1.3.6
 Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
@@ -35,10 +35,10 @@
 # Remove a few unnecessary locations where the makefile may install
 # copies of icons and .desktop files
 rm -rf \
-	$RPM_BUILD_ROOT%{_datadir}/applnk \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info
+    $RPM_BUILD_ROOT%{_datadir}/applnk \
+    $RPM_BUILD_ROOT%{_datadir}/mimelnk \
+    $RPM_BUILD_ROOT%{_datadir}/gnome \
+    $RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.6-1
+- Upstream 1.3.6
+
 * Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
 - Upstream 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2006 15:13:58 -0000	1.3
+++ sources	30 Oct 2006 15:26:49 -0000	1.4
@@ -1 +1 @@
-e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz
+01bab36f3065daf9dcddb5dedd7c7143  poedit-1.3.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:27:20 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 30 Oct 2006 08:27:20 -0700
Subject: rpms/poedit/FC-6 .cvsignore, 1.3, 1.4 poedit.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200610301527.k9UFRKZX008542@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8485/FC-6

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2006 15:13:59 -0000	1.3
+++ .cvsignore	30 Oct 2006 15:26:50 -0000	1.4
@@ -1 +1 @@
-poedit-1.3.5.tar.gz
+poedit-1.3.6.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/poedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poedit.spec	29 Oct 2006 15:13:59 -0000	1.3
+++ poedit.spec	30 Oct 2006 15:26:50 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           poedit
-Version:        1.3.5
+Version:        1.3.6
 Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
@@ -35,10 +35,10 @@
 # Remove a few unnecessary locations where the makefile may install
 # copies of icons and .desktop files
 rm -rf \
-	$RPM_BUILD_ROOT%{_datadir}/applnk \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info
+    $RPM_BUILD_ROOT%{_datadir}/applnk \
+    $RPM_BUILD_ROOT%{_datadir}/mimelnk \
+    $RPM_BUILD_ROOT%{_datadir}/gnome \
+    $RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.6-1
+- Upstream 1.3.6
+
 * Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
 - Upstream 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2006 15:13:59 -0000	1.3
+++ sources	30 Oct 2006 15:26:50 -0000	1.4
@@ -1 +1 @@
-e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz
+01bab36f3065daf9dcddb5dedd7c7143  poedit-1.3.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:27:26 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 30 Oct 2006 08:27:26 -0700
Subject: rpms/poedit/devel .cvsignore, 1.3, 1.4 poedit.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200610301527.k9UFRQT0008547@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8485/devel

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2006 15:14:00 -0000	1.3
+++ .cvsignore	30 Oct 2006 15:26:55 -0000	1.4
@@ -1 +1 @@
-poedit-1.3.5.tar.gz
+poedit-1.3.6.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/poedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poedit.spec	29 Oct 2006 15:14:00 -0000	1.3
+++ poedit.spec	30 Oct 2006 15:26:55 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           poedit
-Version:        1.3.5
+Version:        1.3.6
 Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
@@ -35,10 +35,10 @@
 # Remove a few unnecessary locations where the makefile may install
 # copies of icons and .desktop files
 rm -rf \
-	$RPM_BUILD_ROOT%{_datadir}/applnk \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info
+    $RPM_BUILD_ROOT%{_datadir}/applnk \
+    $RPM_BUILD_ROOT%{_datadir}/mimelnk \
+    $RPM_BUILD_ROOT%{_datadir}/gnome \
+    $RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.6-1
+- Upstream 1.3.6
+
 * Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
 - Upstream 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2006 15:14:00 -0000	1.3
+++ sources	30 Oct 2006 15:26:55 -0000	1.4
@@ -1 +1 @@
-e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz
+01bab36f3065daf9dcddb5dedd7c7143  poedit-1.3.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:39:43 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 30 Oct 2006 08:39:43 -0700
Subject: rpms/gaim-meanwhile/FC-6 .cvsignore, 1.9, 1.10 gaim-fedora-prefs.xml,
	1.1, 1.2 gaim-meanwhile.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200610301539.k9UFdhTi008739@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8717

Modified Files:
	.cvsignore gaim-fedora-prefs.xml gaim-meanwhile.spec sources 
Log Message:
Update to beta4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jun 2006 03:24:21 -0000	1.9
+++ .cvsignore	30 Oct 2006 15:39:13 -0000	1.10
@@ -1 +1 @@
-gaim-2.0.0beta3.tar.bz2
+gaim-2.0.0beta4.tar.bz2


Index: gaim-fedora-prefs.xml
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/gaim-fedora-prefs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-fedora-prefs.xml	29 Jun 2006 03:24:21 -0000	1.1
+++ gaim-fedora-prefs.xml	30 Oct 2006 15:39:13 -0000	1.2
@@ -1,261 +1,366 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
-<pref version='1.0' name='/'>
+<pref version='1' name='/'>
 	<pref name='core'>
 		<pref name='away'>
-			<pref name='away_when_idle' type='bool' value='1' />
-			<pref name='mins_before_away' type='int' value='5' />
-			<pref name='default_message' type='string' value='Slightly less boring default' />
-			<pref name='auto_reply' type='string' value='awayidle' />
-		</pref>
-		<pref name='buddies'>
-			<pref name='use_server_alias' type='bool' value='1' />
+			<pref name='idle_reporting' type='string' value='system'/>
+			<pref name='away_when_idle' type='bool' value='1'/>
+			<pref name='mins_before_away' type='int' value='5'/>
+			<pref name='auto_reply' type='string' value='awayidle'/>
 		</pref>
+		<pref name='buddies'/>
 		<pref name='contact'>
-			<pref name='last_match' type='bool' value='0' />
-			<pref name='offline_score' type='int' value='4' />
-			<pref name='away_score' type='int' value='2' />
-			<pref name='idle_score' type='int' value='1' />
+			<pref name='last_match' type='bool' value='0'/>
+			<pref name='offline_score' type='int' value='4'/>
+			<pref name='away_score' type='int' value='2'/>
+			<pref name='idle_score' type='int' value='1'/>
+		</pref>
+		<pref name='debug'>
+			<pref name='timestamps' type='bool' value='0'/>
+		</pref>
+		<pref name='status'>
+			<pref name='scores'>
+				<pref name='offline' type='int' value='-500'/>
+				<pref name='available' type='int' value='100'/>
+				<pref name='invisible' type='int' value='-50'/>
+				<pref name='away' type='int' value='-100'/>
+				<pref name='extended_away' type='int' value='-200'/>
+				<pref name='idle' type='int' value='-10'/>
+			</pref>
+		</pref>
+		<pref name='savedstatus'>
+			<pref name='default' type='int' value='1161808301'/>
+			<pref name='startup' type='int' value='0'/>
+			<pref name='startup_current_status' type='bool' value='1'/>
+			<pref name='idleaway' type='int' value='1161808306'/>
+			<pref name='isidleaway' type='bool' value='0'/>
+			<pref name='current' type='int' value='1153343286'/>
 		</pref>
 		<pref name='conversations'>
-			<pref name='use_alias_for_title' type='bool' value='1' />
 			<pref name='chat'>
-				<pref name='show_nick_change' type='bool' value='1' />
+				<pref name='show_nick_change' type='bool' value='1'/>
 			</pref>
 			<pref name='im'>
-				<pref name='send_typing' type='bool' value='1' />
+				<pref name='send_typing' type='bool' value='1'/>
 			</pref>
 		</pref>
 		<pref name='logging'>
-			<pref name='log_ims' type='bool' value='1' />
-			<pref name='log_chats' type='bool' value='0' />
-			<pref name='log_system' type='bool' value='0' />
-			<pref name='log_signon_signoff' type='bool' value='0' />
-			<pref name='log_idle_state' type='bool' value='0' />
-			<pref name='log_away_state' type='bool' value='0' />
-			<pref name='log_own_states' type='bool' value='0' />
-			<pref name='format' type='string' value='html' />
+			<pref name='log_ims' type='bool' value='1'/>
+			<pref name='log_chats' type='bool' value='0'/>
+			<pref name='log_system' type='bool' value='0'/>
+			<pref name='format' type='string' value='html'/>
 		</pref>
 		<pref name='network'>
-			<pref name='auto_ip' type='bool' value='1' />
-			<pref name='public_ip' type='string' value='' />
-			<pref name='ports_range_use' type='bool' value='0' />
-			<pref name='ports_range_start' type='int' value='1024' />
-			<pref name='ports_range_end' type='int' value='2048' />
+			<pref name='auto_ip' type='bool' value='1'/>
+			<pref name='public_ip' type='string' value='172.16.80.210'/>
+			<pref name='ports_range_use' type='bool' value='0'/>
+			<pref name='ports_range_start' type='int' value='1024'/>
+			<pref name='ports_range_end' type='int' value='2048'/>
+			<pref name='stun_server' type='string' value=''/>
 		</pref>
 		<pref name='proxy'>
-			<pref name='type' type='string' value='none' />
-			<pref name='host' type='string' value='' />
-			<pref name='port' type='int' value='0' />
-			<pref name='username' type='string' value='' />
-			<pref name='password' type='string' value='' />
+			<pref name='type' type='string' value='none'/>
+			<pref name='host' type='string' value=''/>
+			<pref name='port' type='int' value='0'/>
+			<pref name='username' type='string' value=''/>
+			<pref name='password' type='string' value=''/>
 		</pref>
 		<pref name='sound'>
-			<pref name='while_away' type='bool' value='0' />
+			<pref name='while_away' type='bool' value='0'/>
 		</pref>
 	</pref>
 	<pref name='plugins'>
 		<pref name='core'>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1' />
-				<pref name='notify_idle' type='bool' value='1' />
+			<pref name='psychic'>
+				<pref name='buddies_only' type='bool' value='0'/>
+				<pref name='show_notice' type='bool' value='1'/>
+				<pref name='activate_online' type='bool' value='1'/>
 			</pref>
-			<pref name='autorecon'>
-				<pref name='hide_connected_error' type='bool' value='0' />
-				<pref name='hide_connecting_error' type='bool' value='0' />
-				<pref name='restore_state' type='bool' value='1' />
+			<pref name='statenotify'>
+				<pref name='notify_away' type='bool' value='1'/>
+				<pref name='notify_idle' type='bool' value='1'/>
+				<pref name='notify_signon' type='bool' value='1'/>
 			</pref>
 		</pref>
-		<pref name='lopl' />
+		<pref name='lopl'/>
 		<pref name='prpl'>
+			<pref name='qq'>
+				<pref name='show_status_by_icon' type='bool' value='1'/>
+				<pref name='show_fake_video' type='bool' value='0'/>
+				<pref name='prompt_for_missing_packet' type='bool' value='1'/>
+				<pref name='prompt_group_msg_on_recv' type='bool' value='1'/>
+			</pref>
+			<pref name='oscar'>
+				<pref name='recent_buddies' type='bool' value='0'/>
+				<pref name='show_idle' type='bool' value='0'/>
+			</pref>
 			<pref name='silc'>
-				<pref name='sign_im' type='bool' value='0' />
-				<pref name='verify_im' type='bool' value='0' />
-				<pref name='sign_chat' type='bool' value='0' />
-				<pref name='verify_chat' type='bool' value='0' />
-				<pref name='vcard' type='string' value='' />
+				<pref name='sign_im' type='bool' value='0'/>
+				<pref name='verify_im' type='bool' value='0'/>
+				<pref name='sign_chat' type='bool' value='0'/>
+				<pref name='verify_chat' type='bool' value='0'/>
+				<pref name='vcard' type='string' value=''/>
 			</pref>
 			<pref name='msn'>
-				<pref name='conv_close_notice' type='bool' value='1' />
-				<pref name='conv_timeout_notice' type='bool' value='1' />
+				<pref name='conv_close_notice' type='bool' value='1'/>
+				<pref name='conv_timeout_notice' type='bool' value='1'/>
 			</pref>
 			<pref name='jabber'>
-				<pref name='hide_os' type='bool' value='0' />
+				<pref name='hide_os' type='bool' value='0'/>
 			</pref>
 		</pref>
 		<pref name='gtk'>
-			<pref name='docklet'>
-				<pref name='queue_messages' type='bool' value='0' />
+			<pref name='musicmessaging'>
+				<pref name='editor_path' type='string' value='/usr/local/bin/gscore'/>
+			</pref>
+			<pref name='extplacement'>
+				<pref name='placement_number' type='int' value='4'/>
+				<pref name='placement_number_separate' type='bool' value='0'/>
+			</pref>
+			<pref name='timestamp'>
+				<pref name='interval' type='int' value='300000'/>
+			</pref>
+			<pref name='timestamp_format'>
+				<pref name='force_24hr' type='bool' value='1'/>
+				<pref name='use_dates'>
+					<pref name='conversation' type='string' value='automatic'/>
+					<pref name='log' type='string' value='automatic'/>
+				</pref>
+			</pref>
+			<pref name='gaimrc'>
+				<pref name='set'>
+					<pref name='gtk-font-name' type='bool' value='0'/>
+					<pref name='gtk-key-theme-name' type='bool' value='0'/>
+					<pref name='color'>
+						<pref name='GtkWidget::cursor-color' type='bool' value='0'/>
+						<pref name='GtkWidget::secondary-cursor-color' type='bool' value='0'/>
+						<pref name='GtkIMHtml::hyperlink-color' type='bool' value='0'/>
+					</pref>
+					<pref name='size'>
+						<pref name='GtkTreeView::expander_size' type='bool' value='0'/>
+						<pref name='GtkTreeView::horizontal_separator' type='bool' value='0'/>
+					</pref>
+					<pref name='font'>
+						<pref name='*gaim_gtkconv_entry' type='bool' value='0'/>
+						<pref name='*gaim_gtkconv_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtklog_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtkrequest_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtknotify_imhtml' type='bool' value='0'/>
+					</pref>
+					<pref name='bool'>
+						<pref name='GtkTreeView::indent_expanders' type='bool' value='0'/>
+					</pref>
+				</pref>
+				<pref name='gtk-font-name' type='string' value=''/>
+				<pref name='gtk-key-theme-name' type='string' value=''/>
+				<pref name='color'>
+					<pref name='GtkWidget::cursor-color' type='string' value=''/>
+					<pref name='GtkWidget::secondary-cursor-color' type='string' value=''/>
+					<pref name='GtkIMHtml::hyperlink-color' type='string' value=''/>
+				</pref>
+				<pref name='size'>
+					<pref name='GtkTreeView::expander_size' type='int' value='0'/>
+					<pref name='GtkTreeView::horizontal_separator' type='int' value='0'/>
+				</pref>
+				<pref name='font'>
+					<pref name='*gaim_gtkconv_entry' type='string' value=''/>
+					<pref name='*gaim_gtkconv_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtklog_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtkrequest_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtknotify_imhtml' type='string' value=''/>
+				</pref>
+				<pref name='bool'>
+					<pref name='GtkTreeView::indent_expanders' type='bool' value='1'/>
+				</pref>
 			</pref>
 			<pref name='X11'>
 				<pref name='gestures'>
-					<pref name='visual' type='bool' value='0' />
+					<pref name='visual' type='bool' value='0'/>
 				</pref>
 				<pref name='notify'>
-					<pref name='type_im' type='bool' value='1' />
-					<pref name='type_chat' type='bool' value='0' />
-					<pref name='type_focused' type='bool' value='0' />
-					<pref name='method_string' type='bool' value='0' />
-					<pref name='title_string' type='string' value='(*)' />
-					<pref name='method_urgent' type='bool' value='1' />
-					<pref name='method_count' type='bool' value='1' />
-					<pref name='notify_focus' type='bool' value='1' />
-					<pref name='notify_click' type='bool' value='1' />
-					<pref name='notify_type' type='bool' value='1' />
-					<pref name='notify_send' type='bool' value='1' />
-					<pref name='notify_switch' type='bool' value='1' />
+					<pref name='type_im' type='bool' value='1'/>
+					<pref name='type_chat' type='bool' value='0'/>
+					<pref name='type_chat_nick' type='bool' value='0'/>
+					<pref name='type_focused' type='bool' value='0'/>
+					<pref name='method_string' type='bool' value='0'/>
+					<pref name='title_string' type='string' value='(*)'/>
+					<pref name='method_urgent' type='bool' value='1'/>
+					<pref name='method_count' type='bool' value='1'/>
+					<pref name='method_count_xprop' type='bool' value='0'/>
+					<pref name='method_raise' type='bool' value='0'/>
+					<pref name='notify_focus' type='bool' value='1'/>
+					<pref name='notify_click' type='bool' value='1'/>
+					<pref name='notify_type' type='bool' value='1'/>
+					<pref name='notify_send' type='bool' value='1'/>
+					<pref name='notify_switch' type='bool' value='1'/>
 				</pref>
 			</pref>
-			<pref name='timestamp'>
-				<pref name='interval' type='int' value='300000' />
+			<pref name='docklet'>
+				<pref name='blink_im' type='string' value='hidden'/>
+				<pref name='blink_chat' type='string' value='never'/>
 			</pref>
-			<pref name='extplacement'>
-				<pref name='placement_number' type='int' value='4' />
-				<pref name='placement_number_separate' type='bool' value='0' />
+		</pref>
+		<pref name='gnt'>
+			<pref name='gntgf'>
+				<pref name='events'>
+					<pref name='signonf' type='bool' value='1'/>
+					<pref name='immsg' type='bool' value='1'/>
+					<pref name='chatmsg' type='bool' value='1'/>
+					<pref name='chatnick' type='bool' value='1'/>
+				</pref>
+				<pref name='beep' type='bool' value='1'/>
+				<pref name='urgent' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>
 	<pref name='gaim'>
 		<pref name='gtk'>
-			<pref name='accounts'>
-				<pref name='dialog'>
-					<pref name='width' type='int' value='550' />
-					<pref name='height' type='int' value='250' />
-				</pref>
-			</pref>
-			<pref name='away'>
-				<pref name='queue_messages' type='bool' value='0' />
-			</pref>
 			<pref name='browsers'>
-				<pref name='place' type='int' value='0' />
-				<pref name='command' type='string' value='' />
-				<pref name='browser' type='string' value='gnome-open' />
-			</pref>
-			<pref name='idle'>
-				<pref name='reporting_method' type='string' value='system' />
+				<pref name='place' type='int' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='browser' type='string' value='gnome-open'/>
 			</pref>
 			<pref name='plugins'>
 				<pref name='loaded' type='stringlist'>
-					<item value='/usr/lib/gaim/autorecon.so' />
-					<item value='/usr/lib/gaim/history.so' />
-					<item value='/usr/lib/gaim/docklet.so' />
-					<item value='/usr/lib/gaim/extplacement.so' />
-					<item value='/usr/lib/gaim/notify.so' />
+					<item value='/usr/lib/gaim/autorecon.so'/>
+					<item value='/usr/lib/gaim/history.so'/>
+					<item value='/usr/lib/gaim/docklet.so'/>
+					<item value='/usr/lib/gaim/extplacement.so'/>
+					<item value='/usr/lib/gaim/notify.so'/>
 				</pref>
 			</pref>
+			<pref name='filelocations'>
+				<pref name='last_save_folder' type='string' value=''/>
+				<pref name='last_open_folder' type='string' value=''/>
+				<pref name='last_icon_folder' type='string' value=''/>
+			</pref>
 			<pref name='smileys'>
-				<pref name='theme' type='string' value='/usr/share/pixmaps/gaim/smileys/default/theme' />
+				<pref name='theme' type='string' value='Default'/>
 			</pref>
 			<pref name='debug'>
-				<pref name='enabled' type='bool' value='0' />
-				<pref name='timestamps' type='bool' value='0' />
-				<pref name='toolbar' type='bool' value='1' />
-				<pref name='width' type='int' value='450' />
-				<pref name='height' type='int' value='250' />
+				<pref name='enabled' type='bool' value='0'/>
+				<pref name='filterlevel' type='int' value='0'/>
+				<pref name='style' type='int' value='3'/>
+				<pref name='toolbar' type='bool' value='1'/>
+				<pref name='width' type='int' value='450'/>
+				<pref name='height' type='int' value='250'/>
+				<pref name='regex' type='string' value=''/>
+				<pref name='filter' type='bool' value='0'/>
+				<pref name='invert' type='bool' value='0'/>
+				<pref name='case_insensitive' type='bool' value='0'/>
+				<pref name='highlight' type='bool' value='0'/>
 			</pref>
 			<pref name='sound'>
 				<pref name='enabled'>
-					<pref name='login' type='bool' value='1' />
-					<pref name='logout' type='bool' value='1' />
-					<pref name='im_recv' type='bool' value='1' />
-					<pref name='first_im_recv' type='bool' value='0' />
-					<pref name='send_im' type='bool' value='1' />
-					<pref name='join_chat' type='bool' value='0' />
-					<pref name='left_chat' type='bool' value='0' />
-					<pref name='send_chat_msg' type='bool' value='0' />
-					<pref name='chat_msg_recv' type='bool' value='0' />
-					<pref name='nick_said' type='bool' value='0' />
-					<pref name='pounce_default' type='bool' value='1' />
+					<pref name='login' type='bool' value='1'/>
+					<pref name='logout' type='bool' value='1'/>
+					<pref name='im_recv' type='bool' value='1'/>
+					<pref name='first_im_recv' type='bool' value='0'/>
+					<pref name='send_im' type='bool' value='1'/>
+					<pref name='join_chat' type='bool' value='0'/>
+					<pref name='left_chat' type='bool' value='0'/>
+					<pref name='send_chat_msg' type='bool' value='0'/>
+					<pref name='chat_msg_recv' type='bool' value='0'/>
+					<pref name='nick_said' type='bool' value='0'/>
+					<pref name='pounce_default' type='bool' value='1'/>
 				</pref>
 				<pref name='file'>
-					<pref name='login' type='string' value='' />
-					<pref name='logout' type='string' value='' />
-					<pref name='im_recv' type='string' value='' />
-					<pref name='first_im_recv' type='string' value='' />
-					<pref name='send_im' type='string' value='' />
-					<pref name='join_chat' type='string' value='' />
-					<pref name='left_chat' type='string' value='' />
-					<pref name='send_chat_msg' type='string' value='' />
-					<pref name='chat_msg_recv' type='string' value='' />
-					<pref name='nick_said' type='string' value='' />
-					<pref name='pounce_default' type='string' value='' />
-				</pref>
-				<pref name='conv_focus' type='bool' value='1' />
-				<pref name='command' type='string' value='' />
-				<pref name='method' type='string' value='automatic' />
+					<pref name='login' type='string' value=''/>
+					<pref name='logout' type='string' value=''/>
+					<pref name='im_recv' type='string' value=''/>
+					<pref name='first_im_recv' type='string' value=''/>
+					<pref name='send_im' type='string' value=''/>
+					<pref name='join_chat' type='string' value=''/>
+					<pref name='left_chat' type='string' value=''/>
+					<pref name='send_chat_msg' type='string' value=''/>
+					<pref name='chat_msg_recv' type='string' value=''/>
+					<pref name='nick_said' type='string' value=''/>
+					<pref name='pounce_default' type='string' value=''/>
+				</pref>
+				<pref name='conv_focus' type='bool' value='1'/>
+				<pref name='mute' type='bool' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='method' type='string' value='automatic'/>
+				<pref name='volume' type='int' value='50'/>
+			</pref>
+			<pref name='accounts'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
+				<pref name='buddyicon' type='string' value=''/>
 			</pref>
 			<pref name='blist'>
-				<pref name='auto_expand_contacts' type='bool' value='1' />
-				<pref name='button_style' type='int' value='3' />
-				<pref name='grey_idle_buddies' type='bool' value='1' />
-				<pref name='raise_on_events' type='bool' value='0' />
-				<pref name='show_buddy_icons' type='bool' value='0' />
-				<pref name='show_empty_groups' type='bool' value='0' />
-				<pref name='show_idle_time' type='bool' value='1' />
-				<pref name='show_offline_buddies' type='bool' value='0' />
-				<pref name='show_warning_level' type='bool' value='1' />
-				<pref name='sort_type' type='string' value='alphabetical' />
-				<pref name='x' type='int' value='0' />
-				<pref name='y' type='int' value='0' />
-				<pref name='width' type='int' value='309' />
-				<pref name='height' type='int' value='500' />
-				<pref name='tooltip_delay' type='int' value='500' />
+				<pref name='show_buddy_icons' type='bool' value='0'/>
+				<pref name='show_empty_groups' type='bool' value='0'/>
+				<pref name='show_idle_time' type='bool' value='1'/>
+				<pref name='show_offline_buddies' type='bool' value='0'/>
+				<pref name='list_visible' type='bool' value='1'/>
+				<pref name='list_maximized' type='bool' value='0'/>
+				<pref name='sort_type' type='string' value='alphabetical'/>
+				<pref name='x' type='int' value='133'/>
+				<pref name='y' type='int' value='75'/>
+				<pref name='width' type='int' value='309'/>
+				<pref name='height' type='int' value='500'/>
+				<pref name='tooltip_delay' type='int' value='500'/>
+			</pref>
+			<pref name='status'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
 			</pref>
 			<pref name='conversations'>
-				<pref name='close_on_tabs' type='bool' value='1' />
-				<pref name='ctrl_enter_sends' type='bool' value='0' />
-				<pref name='enter_sends' type='bool' value='1' />
-				<pref name='escape_closes' type='bool' value='0' />
-				<pref name='send_formatting' type='bool' value='0' />
-				<pref name='send_bold' type='bool' value='0' />
-				<pref name='send_italic' type='bool' value='0' />
-				<pref name='send_underline' type='bool' value='0' />
-				<pref name='show_timestamps' type='bool' value='1' />
-				<pref name='spellcheck' type='bool' value='1' />
-				<pref name='ignore_colors' type='bool' value='0' />
-				<pref name='ignore_fonts' type='bool' value='0' />
-				<pref name='ignore_font_sizes' type='bool' value='0' />
-				<pref name='html_shortcuts' type='bool' value='1' />
-				<pref name='smiley_shortcuts' type='bool' value='0' />
-				<pref name='show_formatting_toolbar' type='bool' value='1' />
-				<pref name='passthrough_unknown_commands' type='bool' value='0' />
-				<pref name='placement' type='string' value='last' />
-				<pref name='placement_number' type='int' value='1' />
-				<pref name='bgcolor' type='string' value='' />
-				<pref name='fgcolor' type='string' value='' />
-				<pref name='font_face' type='string' value='' />
-				<pref name='font_size' type='int' value='3' />
-				<pref name='tabs' type='bool' value='1' />
-				<pref name='tab_side' type='int' value='2' />
-				<pref name='button_type' type='int' value='3' />
+				<pref name='use_smooth_scrolling' type='bool' value='1'/>
+				<pref name='close_on_tabs' type='bool' value='1'/>
+				<pref name='send_bold' type='bool' value='0'/>
+				<pref name='send_italic' type='bool' value='0'/>
+				<pref name='send_underline' type='bool' value='0'/>
+				<pref name='spellcheck' type='bool' value='1'/>
+				<pref name='show_incoming_formatting' type='bool' value='1'/>
+				<pref name='show_timestamps' type='bool' value='1'/>
+				<pref name='show_formatting_toolbar' type='bool' value='1'/>
+				<pref name='passthrough_unknown_commands' type='bool' value='0'/>
+				<pref name='placement' type='string' value='last'/>
+				<pref name='placement_number' type='int' value='1'/>
+				<pref name='bgcolor' type='string' value=''/>
+				<pref name='fgcolor' type='string' value=''/>
+				<pref name='font_face' type='string' value=''/>
+				<pref name='font_size' type='int' value='3'/>
+				<pref name='tabs' type='bool' value='1'/>
+				<pref name='tab_side' type='int' value='2'/>
+				<pref name='scrollback_lines' type='int' value='4000'/>
 				<pref name='chat'>
-					<pref name='color_nicks' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='userlist_width' type='int' value='80'/>
 				</pref>
 				<pref name='im'>
-					<pref name='animate_buddy_icons' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
-					<pref name='show_buddy_icons' type='bool' value='1' />
+					<pref name='animate_buddy_icons' type='bool' value='1'/>
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='show_buddy_icons' type='bool' value='1'/>
+					<pref name='hide_new' type='string' value='never'/>
 				</pref>
 			</pref>
 			<pref name='pounces'>
 				<pref name='default_actions'>
-					<pref name='open-window' type='bool' value='0' />
-					<pref name='popup-notify' type='bool' value='0' />
-					<pref name='send-message' type='bool' value='1' />
-					<pref name='execute-command' type='bool' value='0' />
-					<pref name='play-sound' type='bool' value='0' />
+					<pref name='open-window' type='bool' value='0'/>
+					<pref name='popup-notify' type='bool' value='0'/>
+					<pref name='send-message' type='bool' value='1'/>
+					<pref name='execute-command' type='bool' value='0'/>
+					<pref name='play-sound' type='bool' value='0'/>
+				</pref>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='520'/>
+					<pref name='height' type='int' value='321'/>
 				</pref>
 			</pref>
 			<pref name='filetransfer'>
-				<pref name='clear_finished' type='bool' value='1' />
-				<pref name='keep_open' type='bool' value='0' />
+				<pref name='clear_finished' type='bool' value='1'/>
+				<pref name='keep_open' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/gaim-meanwhile.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gaim-meanwhile.spec	28 Aug 2006 00:56:48 -0000	1.15
+++ gaim-meanwhile.spec	30 Oct 2006 15:39:13 -0000	1.16
@@ -23,11 +23,11 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta3
+%define betaver	beta4
 
 Name:		gaim-meanwhile
 Version:	2.0.0
-Release:	0.4.%{betaver}%{?dist}
+Release:	0.5.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -121,7 +121,7 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
-%patch5 -p1
+#%patch5 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -200,6 +200,8 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/libgaim*
 rm -rf $RPM_BUILD_ROOT%{_datadir}
 rm -rf $RPM_BUILD_ROOT%{_prefix}/src
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gaim.schemas
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gaim/private
 
 #preserve the libsametime debug libraries and delete the rest
 #mv $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/libsametime.so.debug $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/sametime.tmp
@@ -250,6 +252,9 @@
 %{_libdir}/gaim/
 
 %changelog
+* Sat Oct 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.5.beta4
+- Rebuild against most recent core package
+
 * Sun Aug 27 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.4.beta3
 - Bump and rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jun 2006 03:24:21 -0000	1.9
+++ sources	30 Oct 2006 15:39:13 -0000	1.10
@@ -1 +1 @@
-c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2
+ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 15:59:16 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 08:59:16 -0700
Subject: rpms/fslint/devel .cvsignore, 1.3, 1.4 fslint.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200610301559.k9UFxGUd008907@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8887

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2005 19:20:07 -0000	1.3
+++ .cvsignore	30 Oct 2006 15:58:46 -0000	1.4
@@ -1 +1 @@
-FSlint-2.11.tar.gz
+fslint-2.16.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fslint.spec	19 Sep 2006 12:46:18 -0000	1.7
+++ fslint.spec	30 Oct 2006 15:58:46 -0000	1.8
@@ -1,17 +1,18 @@
 Name:           fslint
-Version:        2.11
-Release:        3
+Version:        2.16
+Release:        1%{?dist}
+Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
+Source0:        http://www.pixelbeat.org/fslint/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -19,11 +20,9 @@
 
 
 %prep
-%setup -q -n FSlint-%{version}
-%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
-%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
-mv fslint/fstool/README README.fstool
-mv fslint/rmlint/README README.rmlint
+%setup -q -n %{name}-%{version}
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' fslint-gui
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' fslint-gui
 
 
 %build
@@ -32,19 +31,27 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -Dpm 755 fslint-gui $RPM_BUILD_ROOT%{_bindir}/fslint-gui
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,supprt}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/supprt/rmlint
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
 install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
+install -pm 755 fslint/{find*,fslint,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
 install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -pm 755 fslint/rmlint/* \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
+install -pm 644 fslint/supprt/fslver \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/get* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/rmlint/* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt/rmlint
+
+cp -a man/* \
+  $RPM_BUILD_ROOT%{_mandir}/man1/
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
@@ -64,14 +71,25 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/* README.*
-%{_bindir}/*lint
+%doc doc/*
+%{_mandir}/man1/fslint*
+%{_bindir}/fslint-gui
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
+- Update to 2.16 which has some minor packaging changes
+  to align with the debian package (suggested by lintian) and also
+- has man pages for fslint and fslint-gui.
+  Other Packaging changes introduced in 2.14 were
+- /usr/bin/{fs,FS}lint -> /usr/bin/fslint-gui
+- Tidy up /usr/bin/fslint/fslint directory
+- In addition to the above upstream changes I added
+  the dist tag to the release version
+
 * Tue Sep 19 2006 P??draig Brady <P at draigBrady.com> - 2.11-3
 - Rebuild for FC6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2005 19:20:07 -0000	1.3
+++ sources	30 Oct 2006 15:58:46 -0000	1.4
@@ -1 +1 @@
-518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz
+76307326b8be8a6404675965be481435  fslint-2.16.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 16:09:44 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 09:09:44 -0700
Subject: rpms/fslint/FC-6 .cvsignore, 1.3, 1.4 fslint.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200610301609.k9UG9icN011971@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11948

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2005 19:20:07 -0000	1.3
+++ .cvsignore	30 Oct 2006 16:09:14 -0000	1.4
@@ -1 +1 @@
-FSlint-2.11.tar.gz
+fslint-2.16.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/fslint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fslint.spec	19 Sep 2006 12:46:18 -0000	1.7
+++ fslint.spec	30 Oct 2006 16:09:14 -0000	1.8
@@ -1,17 +1,18 @@
 Name:           fslint
-Version:        2.11
-Release:        3
+Version:        2.16
+Release:        1%{?dist}
+Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
+Source0:        http://www.pixelbeat.org/fslint/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -19,11 +20,9 @@
 
 
 %prep
-%setup -q -n FSlint-%{version}
-%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
-%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
-mv fslint/fstool/README README.fstool
-mv fslint/rmlint/README README.rmlint
+%setup -q -n %{name}-%{version}
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' fslint-gui
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' fslint-gui
 
 
 %build
@@ -32,19 +31,27 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -Dpm 755 fslint-gui $RPM_BUILD_ROOT%{_bindir}/fslint-gui
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,supprt}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/supprt/rmlint
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
 install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
+install -pm 755 fslint/{find*,fslint,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
 install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -pm 755 fslint/rmlint/* \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
+install -pm 644 fslint/supprt/fslver \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/get* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/rmlint/* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt/rmlint
+
+cp -a man/* \
+  $RPM_BUILD_ROOT%{_mandir}/man1/
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
@@ -64,14 +71,25 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/* README.*
-%{_bindir}/*lint
+%doc doc/*
+%{_mandir}/man1/fslint*
+%{_bindir}/fslint-gui
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
+- Update to 2.16 which has some minor packaging changes
+  to align with the debian package (suggested by lintian) and also
+- has man pages for fslint and fslint-gui.
+  Other Packaging changes introduced in 2.14 were
+- /usr/bin/{fs,FS}lint -> /usr/bin/fslint-gui
+- Tidy up /usr/bin/fslint/fslint directory
+- In addition to the above upstream changes I added
+  the dist tag to the release version
+
 * Tue Sep 19 2006 P??draig Brady <P at draigBrady.com> - 2.11-3
 - Rebuild for FC6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2005 19:20:07 -0000	1.3
+++ sources	30 Oct 2006 16:09:14 -0000	1.4
@@ -1 +1 @@
-518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz
+76307326b8be8a6404675965be481435  fslint-2.16.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 16:15:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 09:15:34 -0700
Subject: rpms/fslint/FC-5 .cvsignore, 1.3, 1.4 fslint.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <200610301615.k9UGFYhT012070@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12050

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2005 19:20:07 -0000	1.3
+++ .cvsignore	30 Oct 2006 16:15:04 -0000	1.4
@@ -1 +1 @@
-FSlint-2.11.tar.gz
+fslint-2.16.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/fslint.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fslint.spec	29 Mar 2005 19:20:07 -0000	1.6
+++ fslint.spec	30 Oct 2006 16:15:04 -0000	1.7
@@ -1,17 +1,18 @@
 Name:           fslint
-Version:        2.11
-Release:        2
+Version:        2.16
+Release:        1%{?dist}
+Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
+Source0:        http://www.pixelbeat.org/fslint/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -19,11 +20,9 @@
 
 
 %prep
-%setup -q -n FSlint-%{version}
-%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
-%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
-mv fslint/fstool/README README.fstool
-mv fslint/rmlint/README README.rmlint
+%setup -q -n %{name}-%{version}
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' fslint-gui
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' fslint-gui
 
 
 %build
@@ -32,19 +31,27 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -Dpm 755 fslint-gui $RPM_BUILD_ROOT%{_bindir}/fslint-gui
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,supprt}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/supprt/rmlint
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
 install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
+install -pm 755 fslint/{find*,fslint,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
 install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -pm 755 fslint/rmlint/* \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
+install -pm 644 fslint/supprt/fslver \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/get* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/rmlint/* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt/rmlint
+
+cp -a man/* \
+  $RPM_BUILD_ROOT%{_mandir}/man1/
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
@@ -64,14 +71,28 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/* README.*
-%{_bindir}/*lint
+%doc doc/*
+%{_mandir}/man1/fslint*
+%{_bindir}/fslint-gui
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
+- Update to 2.16 which has some minor packaging changes
+  to align with the debian package (suggested by lintian) and also
+- has man pages for fslint and fslint-gui.
+  Other Packaging changes introduced in 2.14 were
+- /usr/bin/{fs,FS}lint -> /usr/bin/fslint-gui
+- Tidy up /usr/bin/fslint/fslint directory
+- In addition to the above upstream changes I added
+  the dist tag to the release version
+
+* Tue Sep 19 2006 P??draig Brady <P at draigBrady.com> - 2.11-3
+- Rebuild for FC6 mass rebuild
+
 * Fri Mar 18 2005 P??draig Brady <P at draigBrady.com> - 2.11-2
 - Update to 2.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2005 19:20:07 -0000	1.3
+++ sources	30 Oct 2006 16:15:04 -0000	1.4
@@ -1 +1 @@
-518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz
+76307326b8be8a6404675965be481435  fslint-2.16.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 16:50:59 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:50:59 -0700
Subject: rpms/eclipse-emf - New directory
Message-ID: <200610301650.k9UGoxDG012444@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12440/eclipse-emf

Log Message:
Directory /cvs/extras/rpms/eclipse-emf added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 30 16:51:05 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:51:05 -0700
Subject: rpms/eclipse-emf/devel - New directory
Message-ID: <200610301651.k9UGp5Oe012462@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12440/eclipse-emf/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-emf/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 30 16:51:18 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:51:18 -0700
Subject: rpms/eclipse-emf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610301651.k9UGpIFc012495@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12488

Added Files:
	Makefile import.log 
Log Message:
Setup of module eclipse-emf


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-emf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 30 16:51:23 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:51:23 -0700
Subject: rpms/eclipse-emf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610301651.k9UGpNDD012512@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12488/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-emf


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 30 16:53:17 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:53:17 -0700
Subject: rpms/eclipse-emf import.log,1.1,1.2
Message-ID: <200610301653.k9UGrHX0012665@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12606

Modified Files:
	import.log 
Log Message:
auto-import eclipse-emf-2.2.1-1 on branch devel from eclipse-emf-2.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Oct 2006 16:51:17 -0000	1.1
+++ import.log	30 Oct 2006 16:52:47 -0000	1.2
@@ -0,0 +1 @@
+eclipse-emf-2_2_1-1:HEAD:eclipse-emf-2.2.1-1.src.rpm:1162226857



From fedora-extras-commits at redhat.com  Mon Oct 30 16:53:18 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:53:18 -0700
Subject: rpms/eclipse-emf/devel
	eclipse-emf-addforceContextQualiferproperty.patch, NONE,
	1.1 eclipse-emf-buildAll.patch, NONE,
	1.1 eclipse-emf-customTargets.xml.patch, NONE,
	1.1 eclipse-emf-examples-dontChangeBundleClasspath.patch, NONE,
	1.1 eclipse-emf-javadoc.patch, NONE,
	1.1 eclipse-emf-nobootclasspath.patch, NONE,
	1.1 eclipse-emf-platformjavadocname.patch, NONE,
	1.1 eclipse-emf.spec, NONE, 1.1 fetch-eclipse-emf.sh, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610301653.k9UGrI1H012669@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12606/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-emf-addforceContextQualiferproperty.patch 
	eclipse-emf-buildAll.patch eclipse-emf-customTargets.xml.patch 
	eclipse-emf-examples-dontChangeBundleClasspath.patch 
	eclipse-emf-javadoc.patch eclipse-emf-nobootclasspath.patch 
	eclipse-emf-platformjavadocname.patch eclipse-emf.spec 
	fetch-eclipse-emf.sh 
Log Message:
auto-import eclipse-emf-2.2.1-1 on branch devel from eclipse-emf-2.2.1-1.src.rpm

eclipse-emf-addforceContextQualiferproperty.patch:

--- NEW FILE eclipse-emf-addforceContextQualiferproperty.patch ---
Index: build.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/build.xml,v
retrieving revision 1.14
diff -u -p -r1.14 build.xml
--- build.xml	7 Nov 2005 20:37:26 -0000	1.14
+++ build.xml	27 Jul 2006 19:42:36 -0000
@@ -12,6 +12,7 @@
 		<property name="buildType" value="I" />
 		<property name="buildId" value="build" />
 		<property name="buildid" value="build" />
+		<property name="forceContextQualifier" value="v${DSTAMP}${TSTAMP}" />
 		
 		<!-- Verify buildDirectory ends in eclipse. -->
 		<property name="fullBuild" location="${buildDirectory}"/>

eclipse-emf-buildAll.patch:

--- NEW FILE eclipse-emf-buildAll.patch ---
Index: buildAll.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/buildAll.xml,v
retrieving revision 1.58
diff -u -p -r1.58 buildAll.xml
--- buildAll.xml	19 Jun 2006 16:53:35 -0000	1.58
+++ buildAll.xml	1 Aug 2006 23:07:02 -0000
@@ -20,7 +20,7 @@
 		<!-- Reduce the amount of info in the build log -->
 		<property name="javacVerbose" value="false"/>
 
-		<property name="buildDirectory" location="${basedir}/../src/eclipse"/>
+		<property name="buildDirectory" location="${basedir}/src/eclipse"/>
 		<property file="${basedir}/repoInfo.properties"/>
 		<property name="testBase" location="${buildDirectory}/../testing"/>
 		<available file="${buildDirectory}/label.properties" property="label.properties.exists"/>
@@ -43,7 +43,9 @@
 		</condition>
 	  
 	  <!-- build emf.build.jar -->
-	  <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
+	  <property name="emfBuilderDir" location="${buildDirectory}/../.." />
+	  <echo message="buildDirectory:  ${buildDirectory}"/>
+	  <echo message="emfBuilderDir:  ${emfBuilderDir}"/>
 	  <ant antfile="${emfBuilderDir}/org.eclipse.emf.build/build.xml" 
 	       inheritall="false" dir="${emfBuilderDir}/org.eclipse.emf.build"/>
 	</target>
@@ -136,6 +138,17 @@
 		<antcall target="cleanUp"/>
 	</target>
 
+	<target name="buildRPM" depends="init">
+		<ant antfile="build.xml" target="main">
+			<property name="component" value="sdk"/>
+		</ant>
+		<ant antfile="build.xml" target="main">
+			<property name="component" value="examples"/>
+		</ant>
+		<!-- extra zips -->
+		<ant antfile="${emfBuilderDir}/zips/build.xml"/>
+	</target>
+
 	<target name="buildAll" depends="init">
 		<ant antfile="build.xml" target="main">
 			<property name="component" value="sdk"/>

eclipse-emf-customTargets.xml.patch:

--- NEW FILE eclipse-emf-customTargets.xml.patch ---
Index: sdk/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/sdk/customTargets.xml,v
retrieving revision 1.36
diff -u -p -r1.36 customTargets.xml
--- sdk/customTargets.xml	17 Jul 2006 00:02:48 -0000	1.36
+++ sdk/customTargets.xml	24 Oct 2006 17:27:48 -0000
@@ -88,13 +88,15 @@
   <!-- Steps to do before generating build scripts -->
   <!-- ===================================================================== -->
   <target name="preGenerate">
-    <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
+    <property name="emfBuilderDir" location="${buildDirectory}/../../org.eclipse.emf.releng.build" />
+    <echo message="buildDirectory: ${buildDirectory}" />
     <echo message="emfBuilderDir: ${emfBuilderDir}" />
-    
+    <echo message="bundlesDirectory: ${buildDirectory}/plugins" />
+
     <java classname="org.eclipse.emf.build.ChangeBundleClasspath"
       classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
       <arg line="-bundlesDirectory ${buildDirectory}/plugins"/>
-      <arg line="-bundleDirectoryExcludeRegex org\.eclipse\.(emf|xsd)\.cheatsheets"/>
+      <arg line="-bundleDirectoryExcludeRegex org\.eclipse\.(emf|xsd)\.(cheatsheets|example)"/>
       <arg line="-verbose"/>
     </java>
 
@@ -140,7 +142,7 @@
   <!-- Steps to do after generating the build scripts -->
   <!-- ===================================================================== -->
   <target name="postGenerate">
-    <antcall target="clean" />
+<!--    <antcall target="clean" />-->
 
     <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
     <echo message="emfBuilderDir: ${emfBuilderDir}" />

eclipse-emf-examples-dontChangeBundleClasspath.patch:

--- NEW FILE eclipse-emf-examples-dontChangeBundleClasspath.patch ---
Index: examples/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/examples/customTargets.xml,v
retrieving revision 1.16
diff -u -p -r1.16 customTargets.xml
--- examples/customTargets.xml	24 Aug 2006 14:47:17 -0000	1.16
+++ examples/customTargets.xml	20 Oct 2006 16:05:43 -0000
@@ -86,13 +86,6 @@
   <!-- Steps to do before generating build scripts -->
   <!-- ===================================================================== -->
   <target name="preGenerate">
-    <java classname="org.eclipse.emf.build.ChangeBundleClasspath" 
-    	classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
-      <arg line="-bundlesDirectory ${buildDirectory}/plugins" />
-      <arg line="-bundleDirectoryMatchRegex org\.eclipse\.emf\.(java|examples|library|exporter\.html).*\.*" />
-      <arg line="-verbose" />
-    </java>
-  	
   	<property name="eclipse.plugins" value="${buildDirectory}/plugins"/>
   	<emf.build.SetRequiredBundleVersionRanges verbose="true">
   	  	<manifestSet dir="${eclipse.plugins}">

eclipse-emf-javadoc.patch:

--- NEW FILE eclipse-emf-javadoc.patch ---
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh	2006-07-13 13:57:55.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh	2006-07-13 13:57:08.000000000 -0400
@@ -87,5 +87,5 @@
 ant	-f javadoc.xml \
 	-DdestDir="$destDir" \
 	-Dclasspath="$classpath" \
-	-DeclipseDir="$eclipseDir" \
+	-DeclipseDir="../../../../../../SDK" \
 	-Doverview="$eclipseDir/plugins/org.eclipse.emf.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-07-13 15:09:47.000000000 -0400
@@ -8,11 +8,11 @@
 	<property environment="env"/>
 	<property name="javaHome" value="${env.JAVA_HOME}"/>
 	
-	<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+	<property name="javadoc.link.location" value="../../../javadoc"/>
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2006-07-13 15:07:44.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2006-07-13 15:07:13.000000000 -0400
@@ -63,5 +63,5 @@
 ant	-f javadoc.xml \
 	-DdestDir="$destDir" \
 	-Dclasspath="$classpath" \
-	-DeclipseDir="$eclipseDir" \
+	-DeclipseDir="../../../../../../SDK" \
 	-Doverview="$eclipseDir/plugins/org.eclipse.emf.ecore.sdo.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2006-07-13 15:08:28.000000000 -0400
@@ -8,11 +8,11 @@
 	<property environment="env"/>
 	<property name="javaHome" value="${env.JAVA_HOME}"/>
 	
-	<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+	<property name="javadoc.link.location" value="../../../javadoc"/>
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh	2006-07-13 15:09:00.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh	2006-07-13 13:57:08.000000000 -0400
@@ -69,5 +69,5 @@
 ant	-f javadoc.xml \
 	-DdestDir="$destDir" \
 	-Dclasspath="$classpath" \
-	-DeclipseDir="$eclipseDir" \
+	-DeclipseDir="../../../../../../SDK" \
 	-Doverview="$eclipseDir/plugins/org.eclipse.xsd.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-07-13 15:09:42.000000000 -0400
@@ -8,11 +8,11 @@
 	<property environment="env"/>
 	<property name="javaHome" value="${env.JAVA_HOME}"/>
 	
-	<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+	<property name="javadoc.link.location" value="../../../javadoc"/>
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">

eclipse-emf-nobootclasspath.patch:

--- NEW FILE eclipse-emf-nobootclasspath.patch ---
diff -uNr src/eclipse/plugins/org.eclipse.emf.doc/build.xml src/eclipse/plugins/org.eclipse.emf.doc/build.xml
--- src/eclipse/plugins/org.eclipse.emf.doc/build.xml	2006-07-12 22:42:24.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.doc/build.xml	2006-07-12 22:43:00.000000000 -0400
@@ -16,15 +16,8 @@
 	<property name="compilerArg" value=""/>
 	<property name="javacSource" value="1.3"/>
 	<property name="javacTarget" value="1.2"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
 	<property name="bundleJavacSource" value="${javacSource}"/>
 	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
diff -uNr src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml
--- src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml	2006-07-12 22:42:25.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml	2006-07-12 22:43:10.000000000 -0400
@@ -16,15 +16,8 @@
 	<property name="compilerArg" value=""/>
 	<property name="javacSource" value="1.3"/>
 	<property name="javacTarget" value="1.2"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
 	<property name="bundleJavacSource" value="${javacSource}"/>
 	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
diff -uNr src/eclipse/plugins/org.eclipse.xsd.doc/build.xml src/eclipse/plugins/org.eclipse.xsd.doc/build.xml
--- src/eclipse/plugins/org.eclipse.xsd.doc/build.xml	2006-07-12 22:42:25.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.xsd.doc/build.xml	2006-07-12 22:43:06.000000000 -0400
@@ -16,15 +16,8 @@
 	<property name="compilerArg" value=""/>
 	<property name="javacSource" value="1.3"/>
 	<property name="javacTarget" value="1.2"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
 	<property name="bundleJavacSource" value="${javacSource}"/>
 	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">

eclipse-emf-platformjavadocname.patch:

--- NEW FILE eclipse-emf-platformjavadocname.patch ---
--- src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-10-20 14:11:08.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-10-20 14:11:45.000000000 -0400
@@ -12,7 +12,7 @@
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.1.r321_v2006030.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">
--- src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-10-20 14:10:49.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-10-20 14:11:52.000000000 -0400
@@ -12,7 +12,7 @@
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.1.r321_v2006030.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">


--- NEW FILE eclipse-emf.spec ---
%define gcj_support     1
%define major                   2
%define minor                   2
%define micro                   1
%define build_id                build_200609210005
%define eclipse_base            %{_datadir}/eclipse

Summary:        Eclipse Modeling Framework (EMF)
Name:           eclipse-emf
Version:        %{major}.%{minor}.%{micro}
Release:        1%{?dist}
License:        Eclipse Public License
Group:          System Environment/Libraries
URL:            http://www.eclipse.org/emf/
Requires:       eclipse-platform >= 1:3.2.1
Requires:       eclipse-platform < 1:3.2.2

# EMF's download page links to their map file for 2.2.1:
#   http://download.eclipse.org/tools/emf/downloads/drops/2.2.1/R200609210005/directory.txt
# and this tells us the CVS tag for 2.2.1. 
#
# Use the enclosed script to generate the source drop for EMF 2.2.1:
# 
# sh fetch-eclipse-emf.sh emf :pserver:anonymous at dev.eclipse.org:/home/tools \
#   build_200609210005 org.eclipse.emf.releng.build

Source0:        %{name}-fetched-src-%{build_id}.tar.bz2
Source1:        fetch-%{name}.sh

Patch0:         %{name}-customTargets.xml.patch
Patch1:         %{name}-nobootclasspath.patch
# Note, this patch includes the Eclipse SDK version number
Patch2:         %{name}-javadoc.patch
Patch3:         %{name}-addforceContextQualiferproperty.patch
Patch4:         %{name}-buildAll.patch
Patch5:         %{name}-examples-dontChangeBundleClasspath.patch
Patch6:         %{name}-platformjavadocname.patch

BuildRequires:  eclipse-pde
%if %{gcj_support}
BuildRequires:    gcc-java >= 4.0.2
BuildRequires:    java-gcj-compat-devel >= 1.0.64
Requires(post):   java-gcj-compat >= 1.0.64
Requires(postun): java-gcj-compat >= 1.0.64
%else
BuildRequires:    java-devel >= 1.4.2
%endif

%if %{gcj_support}
%else
BuildArch:        noarch
%endif

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%package        sdk
Summary:        Eclipse EMF SDK
Group:          System Environment/Libraries
Requires:       %{name}-sdo-sdk = %{version}-%{release}
Requires:       %{name}-xsd-sdk = %{version}-%{release}

%package        sdo
Summary:        Eclipse EMF SDO
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%package        sdo-sdk
Summary:        Eclipse EMF SDO Source (SDK)
Group:          System Environment/Libraries
Requires:       %{name}-sdo = %{version}-%{release}

%package        xsd
Summary:        Eclipse EMF XSD
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%package        xsd-sdk
Summary:        Eclipse EMF XSD Source (SDK)
Group:          System Environment/Libraries
Requires:       %{name}-xsd = %{version}-%{release}

%package        examples
Summary:        Eclipse EMF examples
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       %{name}-xsd = %{version}-%{release}

%package        standalone
Summary:        Eclipse EMF Standalone
Group:          System Environment/Libraries
Requires:       java-devel >= 1.4.2

%description
EMF is a modeling framework and code generation facility for building tools and
other applications based on a structured data model.

%description    sdk
Source for all of Eclipse EMF SDK for use within Eclipse.

%description    sdo
Service Data Objects (SDO) is a framework that simplifies and unifies data
application development in a service oriented architecture (SOA).

%description    sdo-sdk
Source for Eclipse EMF SDO for use within Eclipse.

%description    xsd
The XML Schema Infoset Model is a reference library that provides an API for
use with any code that examines, creates or modifies W3C XML Schema
(standalone or as part of other artifacts, such as XForms or WSDL documents). 

%description    xsd-sdk
Source for Eclipse EMF XSD for use within Eclipse.

%description    examples
Example source code and models that demonstrates how to use Eclipse EMF.

%description    standalone
An standalone (ie. independent of the Eclipse runtime) implementation of EMF.

%prep
%setup -q -c
pushd org.eclipse.emf.releng.build
%patch0 -p0
%patch1 -p0
%patch2 -p1
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch6 -p0

# Don't ever use bootclasspath
# FIXME:  why can't we use bootclasspath?  It gives the infamous
# "java.lang.Object cannot be found" error.
for f in emf/doc/build.properties emf/runtime/build.properties \
    examples/build.properties sdk/build.properties sdo/doc/build.properties \
    sdo/runtime/build.properties tests/build.properties \
    xsd/doc/build.properties xsd/runtime/build.properties; \
do sed --in-place 's/^bootclasspath/#bootclasspath/' $f; done
popd

%build
mkdir home
homedir=$(cd home > /dev/null && pwd)

# See comments in the script to understand this.
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
SDK=$(cd SDK > /dev/null && pwd)

# Build the EMF builder helper jars

# for ChangeBundleClasspath
pushd org.eclipse.emf.releng.build/org.eclipse.emf.build
# FIXME:  implement com.sun.tools.doclets.standard in gjdoc
rm -rf src/org/eclipse/emf/build/doclet/
ant
popd

# for SetRequiredBundleVersionRanges
pushd org.eclipse.emf.releng.build/org.eclipse.emf.build.ant
mkdir -p build

echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/assemble.org.eclipse.emf.build.ant.all.xml
echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/package.org.eclipse.emf.build.ant.all.xml

java -cp %{eclipse_base}/startup.jar                   \
     -Duser.home=$homedir                              \
     org.eclipse.core.launcher.Main                    \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=plugin                                    \
     -Did=org.eclipse.emf.build.ant                   \
     -DsourceDirectory=$(pwd)                          \
     -DbaseLocation=$SDK                               \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml

pushd build/plugins/org.eclipse.emf.build.ant
java -cp /usr/share/eclipse/startup.jar                   \
     org.eclipse.core.launcher.Main                    \
     -application org.eclipse.ant.core.antRunner       \
     -f build.xml build.update.jar
popd

# FIXME:  the SDK symlinks that point to /usr/share/eclipse end up causing the
# antRunner process below to not see anything in $SDK that *isn't* in
# /usr/share/eclipse.  As such, I've hacked this up to temporarily duplicate
# everything in /usr/share/eclipse and copy the emf.build.ant jar there for
# building.  Lame, yes, but it works and it only results in a bloated buildroot
# which is just temporary disk space.  Also, the task itself expects to have
# all of the plugins (including the SDK plugins themselves) in
# org.eclipse.emf.releng.build/src/eclipse/plugins so we symlink the SDK ones there.
# -- overholt 2006-07-27

pushd ../..
rm SDK/plugins/org.eclipse.pde.build
# Remove the bits of the SDK that we don't need
rm SDK/features/org.eclipse.pde.source*
rm SDK/features/org.eclipse.jdt.source*
rm SDK/features/org.eclipse.sdk*
rm SDK/plugins/org.eclipse.pde.source*
rm SDK/plugins/org.eclipse.jdt.source*
rm SDK/plugins/org.eclipse.jdt.doc*
rm SDK/plugins/org.eclipse.sdk*
# This tomcat chicanery will be fixed in a future Eclipse SDK RPM
mkdir SDK2
pushd SDK
for f in `find -mindepth 1 -maxdepth 1 -not -name plugins`; do cp -rL $f ../SDK2; done
mkdir ../SDK2/plugins
pushd plugins
for f in `find -mindepth 1 -not -name "org.eclipse.tomcat*"`; do cp -rL $f ../../SDK2/plugins; done
cp -r org.eclipse.tomcat* ../../SDK2/plugins
popd
popd
pushd SDK2/plugins 
ln -s org.eclipse.pde.build* org.eclipse.pde.build
popd
rm -rf SDK
mv SDK2 SDK
SDK=$(cd SDK && pwd)
popd

pushd ../src/eclipse/plugins
for f in `ls $SDK/plugins`; do ln -s $SDK/plugins/$f .; done
popd

# Make EMF ant task available to main EMF build
mv build/plugins/org.eclipse.emf.build.ant/*.jar $SDK/plugins
popd
# End build of EMF builder helper jar

cd org.eclipse.emf.releng.build

# some notes about what we're doing here:
#
# -Duser.home=$homedir: override java.home in the vm so that eclipse only adds files in the buildroot 
# -Dcomponent=sdk: the component of EMF we want to build 
# -DjavacFailOnError=true: fail if there is an error 
# -DdontUnzip=true: don't unzip the result, we will do it manually
# -DbaseLocation=$SDK: $SDK is a mirror of the system SDK dir that is writable by the process 
#                      running the build. This let's the build "see" the jars and have a place to 
#                      put the plugins that have just been built
# -DskipFetch=true: don't fetch the sources 
# -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
java -cp $SDK/startup.jar \
    -Duser.home=$homedir                        \
     org.eclipse.core.launcher.Main             \
    -application org.eclipse.ant.core.antRunner \
    -DjavacFailOnError=true                     \
    -DdontUnzip=true                            \
    -DmapsLocal=true                            \
    -DbaseLocation=$SDK                         \
    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build/scripts \
    -DskipFetch=true                            \
    -DbuildLabel=%{version}                     \
    -DbuildAlias=%{version}                     \
    -DbaseExists=true \
    -f buildAll.xml buildRPM

%install
rm -rf ${RPM_BUILD_ROOT}
install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}

# EMF SDK and Examples
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*SDK-%{version}.zip; do
  case $file in
    *eclipse*)
      # The ".." is needed since the zip files contain "eclipse/foo".
      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip -qq -o $file)
      ;;
  esac
done
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Examples-%{version}.zip; do
  case $file in
    *eclipse*)
      # The ".." is needed since the zip files contain "eclipse/foo".
      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip -qq -o $file)
      ;;
  esac
done

# EMF Models
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Models-%{version}.zip; do
   (cd $RPM_BUILD_ROOT/%{eclipse_base} && unzip -qq -o $file)
done
mv $RPM_BUILD_ROOT/%{eclipse_base}/readme_models.html \
  $RPM_BUILD_ROOT/%{eclipse_base}/emf/models

install -d -m755 ${RPM_BUILD_ROOT}/%{_datadir}/java/emf

# Standalone EMF
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Standalone-%{version}.zip; do
   (cd $RPM_BUILD_ROOT/%{_datadir}/java && unzip -qq -o $file)
done
mv $RPM_BUILD_ROOT/%{_datadir}/java/emf/bin/* \
  $RPM_BUILD_ROOT/%{_datadir}/java/emf
rmdir $RPM_BUILD_ROOT/%{_datadir}/java/emf/bin
mv $RPM_BUILD_ROOT/%{_datadir}/java/images/* \
  $RPM_BUILD_ROOT/%{_datadir}/java/emf
rmdir $RPM_BUILD_ROOT/%{_datadir}/java/images
mv $RPM_BUILD_ROOT/%{_datadir}/java/readme_standalone.html \
  $RPM_BUILD_ROOT/%{_datadir}/java/emf

# These are already included in the Eclipse SDK but the packaging guidelines
# would like them in a directory owned by this package
mv $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html \
  $RPM_BUILD_ROOT/%{eclipse_base}/features/org.eclipse.emf_*
mv $RPM_BUILD_ROOT/%{eclipse_base}/notice.html \
  $RPM_BUILD_ROOT/%{eclipse_base}/features/org.eclipse.emf_*

%if %{gcj_support}
doc_zip=`ls $RPM_BUILD_ROOT/%{eclipse_base}/plugins | grep org.eclipse.emf.doc`;
aot-compile-rpm --exclude %{eclipse_base}/plugins/$doc_zip/doc.zip
%endif

%clean 
rm -rf ${RPM_BUILD_ROOT}

%if %{gcj_support}
%post sdo
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun sdo
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%post xsd
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun xsd
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.cheatsheets_*
%{eclipse_base}/plugins/org.eclipse.emf_*
%{eclipse_base}/plugins/org.eclipse.emf.ant_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ecore.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen_*
%{eclipse_base}/plugins/org.eclipse.emf.common.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.common_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.change_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.change.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.xmi_*
%{eclipse_base}/plugins/org.eclipse.emf.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.edit.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2xml_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2xml.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.converter_*
%{eclipse_base}/plugins/org.eclipse.emf.importer_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.java_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.rose_*
%{eclipse_base}/plugins/org.eclipse.emf.exporter_*
%{eclipse_base}/features/org.eclipse.emf_*/*.jpg
%{eclipse_base}/features/org.eclipse.emf_*/feature*
%doc %{eclipse_base}/features/org.eclipse.emf_*/license.html
%doc %{eclipse_base}/features/org.eclipse.emf_*/notice.html
%doc %{eclipse_base}/features/org.eclipse.emf_*/epl-v10.html
%if %{gcj_support}
%{_libdir}/gcj/%{name}/cheatsheets*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ant_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ecore.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.common.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.common_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.converter_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.change.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.change_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.xmi_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.edit.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.exporter_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.java_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.rose_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2xml.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2xml_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping_*
%endif

%files sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.source_*
%{eclipse_base}/plugins/org.eclipse.emf.source_*
%{eclipse_base}/features/org.eclipse.emf.sdk_*

%files sdo
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.commonj.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.editor_*
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.doc_*
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.commonj.sdo_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo_*
%endif

%files sdo-sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo.source_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.source_*

%files xsd
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.xsd_*
%{eclipse_base}/features/org.eclipse.xsd.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.xsd2ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.xsd2ecore_*
%{eclipse_base}/plugins/org.eclipse.xsd.cheatsheets_*
%{eclipse_base}/plugins/org.eclipse.xsd.doc_*
%{eclipse_base}/plugins/org.eclipse.xsd.ecore.importer_*
%{eclipse_base}/plugins/org.eclipse.xsd.ecore.exporter_*
%{eclipse_base}/plugins/org.eclipse.xsd.edit_*
%{eclipse_base}/plugins/org.eclipse.xsd.editor_*
%{eclipse_base}/plugins/org.eclipse.xsd_*
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.xsd2ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.xsd2ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.ecore.importer_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.ecore.exporter_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.editor_*
%endif

%files xsd-sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.xsd.source_*
%{eclipse_base}/plugins/org.eclipse.xsd.source_*

%files examples
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.examples_*
%{eclipse_base}/plugins/org.eclipse.emf.examples_*
%{eclipse_base}/plugins/org.eclipse.emf.activities_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.exporter.html_*
%{eclipse_base}/plugins/org.eclipse.emf.java.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.java.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.java_*
%{eclipse_base}/plugins/org.eclipse.xsd.example_*
%{eclipse_base}/emf/models/*_%{major}*
%doc %{eclipse_base}/emf/models/readme_models.html
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.exporter.html_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd_*
%{_libdir}/gcj/%{name}/xsd.example*
%endif

%files standalone
%defattr(-,root,root)
%{_datadir}/java/emf/*.jar
%doc %{_datadir}/java/emf/jars.gif
%doc %{_datadir}/java/emf/readme_standalone.html

%changelog
* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-1
- 2.2.1.
- Add sdk package, fix up inter-dependencies to match upstream.
- Don't natively-compile doc.zip (the included jar is just an example).
- Add fetching script with proper permissions.
- Add guards in %%post{,un}s for rebuild-gcj-db's presence.

* Fri Sep 08 2006 Andrew Overholt <overholt at redhat.com> 2.2.0-2
- Remove custom doclet references as gjdoc doesn't implement the necessary
  classes.
- Add examples.

* Tue Aug 01 2006 Andrew Overholt <overholt at redhat.com> 2.2.0-1jpp_1rh
- 2.2.0
- Build using buildAll.xml

* Fri Apr 07 2006 Andrew Overholt <overholt at redhat.com> 2.1.2-1jpp_1rh
- 2.1.2
- Specfile cleanup.

* Thu Mar 17 2005 Jeff Pound <jpound at redhat.com> 2.0.1-4
- Change pde build script location to 3.0.1.

* Wed Mar 16 2005 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-3
- Fixed description

* Fri Oct 29 2004 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-2
- Modified tar-ball to reflect version  

* Wed Oct 27 2004 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-1
- Initial Import


--- NEW FILE fetch-eclipse-emf.sh ---
#!/bin/sh

# Generate a source drop for an eclipse.org project (tailored a bit for EMF)

# Usage message
usage="usage: $0 <project_name> <cvs_root> <cvs_tag> <cvs_directory>"

project_name=$1
cvs_root=$2
cvs_tag=$3
cvs_directory=$4

# Ensure we got all of the variables
if [ "x$project_name"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

if [ "x$cvs_root"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

if [ "x$cvs_tag"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

if [ "x$cvs_directory"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

mkdir -p temp/home && cd temp
touch home/.cvspass
cvs -d $cvs_root co -r $cvs_tag $cvs_directory
pushd $cvs_directory

# These patches do the following:
#   1. add a fetch target to grab the source
#   2. make it so that we don't have to strip the version at source grab time
#      (and thus depend upon org.eclipse.releng

patch -p0 << _EOF_

Index: build.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/build.xml,v
retrieving revision 1.14
diff -u -p -r1.14 build.xml
--- build.xml	7 Nov 2005 20:37:26 -0000	1.14
+++ build.xml	25 Oct 2006 18:07:28 -0000
@@ -44,4 +44,16 @@
 			<property name="builder" value="\${basedir}/\${component}" />
 		</ant>
 	</target>
-</project>
\ No newline at end of file
+
+        <target name="fetch" depends="init">
+                <ant antfile="build.xml" dir="\${pde.build.scripts}"
+                                target="preBuild">
+                        <property name="builder" value="\${basedir}/\${component}" />
+                </ant>
+                <ant antfile="build.xml" dir="\${pde.build.scripts}"
+                                target="fetch">
+                        <property name="builder" value="\${basedir}/\${component}" />
+                </ant>
+        </target>
+
+</project>
Index: sdk/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/sdk/customTargets.xml,v
retrieving revision 1.36
diff -u -p -r1.36 customTargets.xml
--- sdk/customTargets.xml	17 Jul 2006 00:02:48 -0000	1.36
+++ sdk/customTargets.xml	25 Oct 2006 17:59:33 -0000
@@ -28,7 +28,6 @@
   <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
   <!-- ===================================================================== -->
   <target name="checkLocal">
-    <available property="mapsLocal" file="\${buildDirectory}/maps/org.eclipse.emf" />
   </target>
 
   <target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
@@ -206,11 +205,11 @@
   </target>
 
   <target name="getBaseInit">
-    <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
     <property file="\${buildDirectory}/maps/org.eclipse.emf/build.cfg" />
   </target>
 
   <target name="getBaseEclipse" unless="baseExists" depends="getBaseInit">
+    <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
     <!-- if there's already an existing eclipse zip by the same name in the dest folder, don't download it again! -->
     <available file="\${downloadsDir}/\${eclipseFile}" property="baseZipExists" />
     <antcall target="downloadBaseEclipse" />
Index: examples/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/examples/customTargets.xml,v
retrieving revision 1.16
diff -u -p -r1.16 customTargets.xml
--- examples/customTargets.xml	24 Aug 2006 14:47:17 -0000	1.16
+++ examples/customTargets.xml	25 Oct 2006 17:59:33 -0000
@@ -27,7 +27,6 @@
   <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
   <!-- ===================================================================== -->
   <target name="checkLocal">
-    <available property="mapsLocal" file="\${buildDirectory}/maps/org.eclipse.emf" />
   </target>
 
   <target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
@@ -179,11 +178,11 @@
   </target>
 
   <target name="getBaseInit">
-    <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
     <property file="\${buildDirectory}/maps/org.eclipse.emf/build.cfg" />
   </target>
 
   <target name="getBaseEclipse" unless="baseExists" depends="getBaseInit">
+    <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
     <!-- if there's already an existing eclipse zip by the same name in the dest folder, don't download it again! -->
     <available file="\${downloadsDir}/\${eclipseFile}" property="baseZipExists" />
     <antcall target="downloadBaseEclipse" />

_EOF_

# Fetch the actual source

java -cp /usr/share/eclipse/startup.jar \
  -Duser.home=../home org.eclipse.core.launcher.Main \
  -application org.eclipse.ant.core.antRunner \
  -buildfile build.xml \
  -DbaseLocation=/usr/share/eclipse \
  -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
  -Dcomponent=sdk \
  -DbaseExists=true \
  -DbuildLabel=$cvs_tag \
  -DfetchTag=$cvs_tag \
  -DmapCvsRoot="$cvs_root" \
  -DmapVersionTag=$cvs_tag \
  fetch

# Fetch examples

java -cp /usr/share/eclipse/startup.jar \
    -Duser.home=../../home \
    org.eclipse.core.launcher.Main \
    -application org.eclipse.ant.core.antRunner \
    -buildfile build.xml \
    -DbaseLocation=/usr/share/eclipse \
    -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
    -Dcomponent=examples \
    -DbaseExists=true \
    -DbuildLabel=$cvs_tag \
    -DfetchTag=$cvs_tag \
    -DmapCvsRoot="$cvs_root" \
    -DmapVersionTag=$cvs_tag \
    fetch
  
popd
# Make the source tarball
tar jcf eclipse-$project_name-fetched-src-$cvs_tag.tar.bz2 $cvs_directory


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Oct 2006 16:51:23 -0000	1.1
+++ .cvsignore	30 Oct 2006 16:52:48 -0000	1.2
@@ -0,0 +1 @@
+eclipse-emf-fetched-src-build_200609210005.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Oct 2006 16:51:23 -0000	1.1
+++ sources	30 Oct 2006 16:52:48 -0000	1.2
@@ -0,0 +1 @@
+1269e4e5c40ab6f733a44c816f8e2eac  eclipse-emf-fetched-src-build_200609210005.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 17:27:50 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 10:27:50 -0700
Subject: rpms/plone/devel .cvsignore, 1.11, 1.12 plone.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200610301727.k9UHRonD016126@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16104/devel

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
update to 2.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
+++ .cvsignore	30 Oct 2006 17:27:20 -0000	1.12
@@ -1,2 +1 @@
-Plone-2.5.tar.gz
-PasswordResetTool-0.4.1.tar.gz
+Plone-2.5.1-final.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- plone.spec	5 Oct 2006 11:32:21 -0000	1.17
+++ plone.spec	30 Oct 2006 17:27:20 -0000	1.18
@@ -5,16 +5,16 @@
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.5
-Release:        4%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
-Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
+#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
-Patch0:         Plone-2.5-atxmlperms.patch
+#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q -n Plone-%{version}
-%patch0 -p0 -b .atxmlperms
+#%patch0 -p0 -b .atxmlperms
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -52,8 +52,8 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
 # Fixed version of PasswordResetTool
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
 
 
 %clean
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- version 2.5.1
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
 - Update PasswordResetTool to fix CVE-2006-4247
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Oct 2006 11:32:21 -0000	1.11
+++ sources	30 Oct 2006 17:27:20 -0000	1.12
@@ -1,2 +1 @@
-0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
-df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz
+cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 17:54:01 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 10:54:01 -0700
Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.1,1.2
Message-ID: <200610301754.k9UHs1h1016415@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16399

Modified Files:
	eclipse-emf.spec 
Log Message:
Add some unowned directories to files lists.


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf.spec	30 Oct 2006 16:52:48 -0000	1.1
+++ eclipse-emf.spec	30 Oct 2006 17:53:31 -0000	1.2
@@ -376,6 +376,7 @@
 %{eclipse_base}/plugins/org.eclipse.emf.exporter_*
 %{eclipse_base}/features/org.eclipse.emf_*/*.jpg
 %{eclipse_base}/features/org.eclipse.emf_*/feature*
+%dir %{eclipse_base}/features/org.eclipse.emf_*
 %doc %{eclipse_base}/features/org.eclipse.emf_*/license.html
 %doc %{eclipse_base}/features/org.eclipse.emf_*/notice.html
 %doc %{eclipse_base}/features/org.eclipse.emf_*/epl-v10.html
@@ -477,6 +478,8 @@
 %{eclipse_base}/plugins/org.eclipse.emf.java.editor_*
 %{eclipse_base}/plugins/org.eclipse.emf.java_*
 %{eclipse_base}/plugins/org.eclipse.xsd.example_*
+%dir %{eclipse_base}/emf
+%dir %{eclipse_base}/emf/models
 %{eclipse_base}/emf/models/*_%{major}*
 %doc %{eclipse_base}/emf/models/readme_models.html
 %if %{gcj_support}



From fedora-extras-commits at redhat.com  Mon Oct 30 18:19:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:19:18 -0700
Subject: rpms/plone/FC-6 plone.spec,1.17,1.18
Message-ID: <200610301819.k9UIJIro019514@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481/FC-6

Modified Files:
	plone.spec 
Log Message:
update to 2.5.1


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- plone.spec	5 Oct 2006 11:32:21 -0000	1.17
+++ plone.spec	30 Oct 2006 18:18:48 -0000	1.18
@@ -5,16 +5,16 @@
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.5
-Release:        4%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
-Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
+#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
-Patch0:         Plone-2.5-atxmlperms.patch
+#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q -n Plone-%{version}
-%patch0 -p0 -b .atxmlperms
+#%patch0 -p0 -b .atxmlperms
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -52,8 +52,8 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
 # Fixed version of PasswordResetTool
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
 
 
 %clean
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- version 2.5.1
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
 - Update PasswordResetTool to fix CVE-2006-4247
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:19:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:19:17 -0700
Subject: rpms/plone/FC-5 plone.spec,1.17,1.18
Message-ID: <200610301819.k9UIJH2G019511@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481/FC-5

Modified Files:
	plone.spec 
Log Message:
update to 2.5.1


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- plone.spec	5 Oct 2006 11:32:21 -0000	1.17
+++ plone.spec	30 Oct 2006 18:18:47 -0000	1.18
@@ -5,16 +5,16 @@
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.5
-Release:        4%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
-Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
+#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
-Patch0:         Plone-2.5-atxmlperms.patch
+#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q -n Plone-%{version}
-%patch0 -p0 -b .atxmlperms
+#%patch0 -p0 -b .atxmlperms
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -52,8 +52,8 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
 # Fixed version of PasswordResetTool
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
 
 
 %clean
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- version 2.5.1
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
 - Update PasswordResetTool to fix CVE-2006-4247
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:22:38 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:22:38 -0700
Subject: rpms/plone/devel plone.spec,1.18,1.19
Message-ID: <200610301822.k9UIMcCh019659@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602/devel

Modified Files:
	plone.spec 
Log Message:
rebuild


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plone.spec	30 Oct 2006 17:27:20 -0000	1.18
+++ plone.spec	30 Oct 2006 18:22:08 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
@@ -73,6 +73,9 @@
 
 %changelog
 * Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- rebuild
+
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
 - version 2.5.1
 
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4



From fedora-extras-commits at redhat.com  Mon Oct 30 18:22:36 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:22:36 -0700
Subject: rpms/plone/FC-5 .cvsignore, 1.11, 1.12 plone.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200610301822.k9UIMa1I019653@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602/FC-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
+++ .cvsignore	30 Oct 2006 18:22:06 -0000	1.12
@@ -1,2 +1 @@
-Plone-2.5.tar.gz
-PasswordResetTool-0.4.1.tar.gz
+Plone-2.5.1-final.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plone.spec	30 Oct 2006 18:18:47 -0000	1.18
+++ plone.spec	30 Oct 2006 18:22:06 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
@@ -73,6 +73,9 @@
 
 %changelog
 * Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- rebuild
+
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
 - version 2.5.1
 
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Oct 2006 11:32:21 -0000	1.11
+++ sources	30 Oct 2006 18:22:06 -0000	1.12
@@ -1,2 +1 @@
-0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
-df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz
+cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 18:22:37 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:22:37 -0700
Subject: rpms/plone/FC-6 .cvsignore, 1.11, 1.12 plone.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200610301822.k9UIMbfg019658@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602/FC-6

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
+++ .cvsignore	30 Oct 2006 18:22:07 -0000	1.12
@@ -1,2 +1 @@
-Plone-2.5.tar.gz
-PasswordResetTool-0.4.1.tar.gz
+Plone-2.5.1-final.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plone.spec	30 Oct 2006 18:18:48 -0000	1.18
+++ plone.spec	30 Oct 2006 18:22:07 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
@@ -73,6 +73,9 @@
 
 %changelog
 * Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- rebuild
+
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
 - version 2.5.1
 
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Oct 2006 11:32:21 -0000	1.11
+++ sources	30 Oct 2006 18:22:07 -0000	1.12
@@ -1,2 +1 @@
-0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
-df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz
+cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 18:28:46 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 11:28:46 -0700
Subject: rpms/contacts/devel contacts.spec,1.6,1.7
Message-ID: <200610301828.k9UISkIn019830@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19809

Modified Files:
	contacts.spec 
Log Message:
rebuild



Index: contacts.spec
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/contacts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- contacts.spec	28 Aug 2006 02:50:08 -0000	1.6
+++ contacts.spec	30 Oct 2006 18:28:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		contacts        
 Version:        0.1
-Release:        5.20060813svn%{?dist}
+Release:        6.20060813svn%{?dist}
 Summary:        Contacts addressbook
 
 Group:         	Applications/Productivity
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Jesse Keating <jkeating at redhat.com> - 0.1-6.20060813svn
+- rebuild for new eds
+
 * Sun Aug 27 2006 Jesse Keating <jkeating at redhat.com> - 0.1-5.20060813svn
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:29:59 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:29:59 -0700
Subject: rpms/xine-lib/devel - New directory
Message-ID: <200610301829.k9UITx4P019937@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19922/xine-lib/devel

Log Message:
Directory /cvs/extras/rpms/xine-lib/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 30 18:29:57 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:29:57 -0700
Subject: rpms/xine-lib - New directory
Message-ID: <200610301829.k9UITv37019926@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19922/xine-lib

Log Message:
Directory /cvs/extras/rpms/xine-lib added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 30 18:30:30 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:30:30 -0700
Subject: rpms/xine-lib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610301830.k9UIUUdU019983@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977

Added Files:
	Makefile import.log 
Log Message:
Setup of module xine-lib


--- NEW FILE Makefile ---
# Top level Makefile for module xine-lib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 30 18:30:36 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:30:36 -0700
Subject: rpms/xine-lib/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610301830.k9UIUaMV019999@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xine-lib


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 30 18:33:24 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:33:24 -0700
Subject: rpms/xine-lib import.log,1.1,1.2
Message-ID: <200610301833.k9UIXOZg020112@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20068

Modified Files:
	import.log 
Log Message:
auto-import xine-lib-1.1.2-17 on branch devel from xine-lib-1.1.2-17.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Oct 2006 18:30:30 -0000	1.1
+++ import.log	30 Oct 2006 18:32:54 -0000	1.2
@@ -0,0 +1 @@
+xine-lib-1_1_2-17:HEAD:xine-lib-1.1.2-17.src.rpm:1162233165



From fedora-extras-commits at redhat.com  Mon Oct 30 18:33:25 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:33:25 -0700
Subject: rpms/xine-lib/devel xine-lib-1.1.1-configure-no-mcpu-march.patch,
	NONE, 1.1 xine-lib-1.1.1-deepbind-939.patch, NONE,
	1.1 xine-lib-1.1.1-multilib-devel.patch, NONE,
	1.1 xine-lib-cleanup-sources.sh, NONE, 1.1 xine-lib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610301833.k9UIXPZ7020116@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20068/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xine-lib-1.1.1-configure-no-mcpu-march.patch 
	xine-lib-1.1.1-deepbind-939.patch 
	xine-lib-1.1.1-multilib-devel.patch 
	xine-lib-cleanup-sources.sh xine-lib.spec 
Log Message:
auto-import xine-lib-1.1.2-17 on branch devel from xine-lib-1.1.2-17.src.rpm

xine-lib-1.1.1-configure-no-mcpu-march.patch:

--- NEW FILE xine-lib-1.1.1-configure-no-mcpu-march.patch ---
--- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
+++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
@@ -161,10 +161,6 @@
                   ;;
 
               esac
-              if test x"$archopt_val" != x; then
-                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
-                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
-              fi
             fi
           else
             dnl we have the Intel compiler

xine-lib-1.1.1-deepbind-939.patch:

--- NEW FILE xine-lib-1.1.1-deepbind-939.patch ---
--- xine-lib-1.1.1/src/xine-engine/load_plugins.c.~1~	2005-09-19 09:14:02.000000000 -0700
+++ xine-lib-1.1.1/src/xine-engine/load_plugins.c	2006-04-22 23:07:33.000000000 -0700
@@ -591,7 +591,7 @@ static void collect_plugins(xine_t *this
 	    printf("load_plugins: %s not cached\n", str);
 #endif
 
-	  if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
+	  if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) {
 	    const char *error = dlerror();
 	    /* too noisy -- but good to catch unresolved references */
 	    xprintf(this, XINE_VERBOSITY_LOG, 
@@ -649,7 +649,7 @@ static int _load_plugin_class(xine_t *th
     /* load the dynamic library if needed */
     if (!node->file->lib_handle) {
       lprintf("dlopen %s\n", filename);
-      if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
+      if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) {
 	const char *error = dlerror();
 
 	xine_log (this, XINE_LOG_PLUGIN,

xine-lib-1.1.1-multilib-devel.patch:

--- NEW FILE xine-lib-1.1.1-multilib-devel.patch ---
--- misc/xine-config.in~	2005-09-05 20:02:57.000000000 +0300
+++ misc/xine-config.in	2006-06-13 01:43:55.000000000 +0300
@@ -2,8 +2,8 @@
 #
 #
 
-prefix=@XINE_CONFIG_PREFIX@
-exec_prefix=@exec_prefix@
+prefix=$(pkg-config libxine --variable=prefix)
+exec_prefix=$(pkg-config libxine --variable=exec_prefix)
 exec_prefix_set=no
 
 usage()
@@ -54,7 +54,7 @@
       echo_exec_prefix=yes
       ;;
     --version)
-      echo @XINE_MAJOR at .@XINE_MINOR at .@XINE_SUB@
+      pkg-config libxine --modversion
       ;;
     --acflags)
       echo_acflags=yes
@@ -100,14 +100,14 @@
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo -I at includedir@ @THREAD_CPPFLAGS@
+      pkg-config libxine --cflags
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo -L at libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@
+      pkg-config libxine --libs
 fi      
 if test "$echo_plugindir" = "yes"; then
-      echo "@XINE_PLUGINPATH@"
+      echo "$(pkg-config libxine --variable=libdir)/xine/plugins/$(pkg-config libxine --modversion)"
 fi      
 if test "$echo_datadir" = "yes"; then
       echo "@XINE_DATADIR@"


--- NEW FILE xine-lib-cleanup-sources.sh ---
#!/bin/bash

if [ -z "$1" -o $# -ne 1 ]; then
  echo "Usage: $0 <xine-version>"
  exit 2
fi

version=$1
tarball="xine-lib-$version.tar.bz2"
dir="xine-lib-$version"


if [ ! -f $tarball ]; then
  echo "Can't find $tarball !"
  exit 1
fi

echo "Uncompressing $tarball..."
rm -rf $dir
tar -xjf $tarball
cd $dir

# Main libraries
for remove in libfaad libffmpeg libmad libmpeg2 dxr3 libspudec libxineadec libspucmml libspucc liba52 libdts; do
    echo "removing src/$remove..."
    rm -rf src/$remove 
    sed -i -e "/$remove/d" src/Makefile.am
    sed -i -e "/^src\/$remove/d" configure.ac
done
# Input plugin libraries
for remove in libdvdnav vcd; do
    echo "removing src/input/$remove..."
    rm -rf src/input/$remove 
    sed -i -e "s/SUBDIRS = \(.*\)${remove}\(.*\)/SUBDIRS = \1\2/g" src/input/Makefile.am
    sed -i -e "/^src\/input\/$remove/d" configure.ac
done
# Input plugins
for p in dvd vcd mms; do
  echo "removing $p input plugin..."
  # Remove sources
  for sourcefile in `awk '/^xineplug_inp_'$p'_la_SOURCES/ { $1=""; $2=""; print $0}' src/input/Makefile.am`; do
      if [ "`grep -c $sourcefile src/input/Makefile.am`" -le 1 ]; then # if this file is only used for this plugin
          rm -f src/input/$sourcefile
      fi
  done
  # Remove from Makefile
  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
echo "removing planar and deinterlace postprocessors..."
sed -i -e 's/planar//g;s/deinterlace//g' src/post/Makefile.am # fails to build

# All clean !

cd ..
echo "Generating $tarball..."
rm -f $tarball.orig
mv $tarball $tarball.orig
tar -cjf $tarball $dir
rm -rf $dir


--- NEW FILE xine-lib.spec ---
# TODO, sometime, maybe:
# - libstk:  http://www.libstk.net/
# - polypaudio

%define         codecdir %{_libdir}/codecs
#%define         vdrver 0.7.9

Summary:        Xine library
Name:           xine-lib
Version:        1.1.2
Release:        17%{?dist}
License:        GPL
Group:          System Environment/Libraries
URL:            http://xinehq.de/
# The tarball is generated from the upstream tarball using
# the script in SOURCE1. It prunes potentially patented code
Source0:        http://dl.sourceforge.net/xine/xine-lib-1.1.2.tar.bz2
Source1:        xine-lib-cleanup-sources.sh
Patch1:         xine-lib-1.1.1-configure-no-mcpu-march.patch
Patch6:         xine-lib-1.1.1-deepbind-939.patch
Patch7:         xine-lib-1.1.1-multilib-devel.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
# X11
BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
# Video
BuildRequires:  freetype-devel SDL-devel libtheora-devel libmng-devel
BuildRequires:  aalib-devel >= 1.4 libcaca-devel
# Audio
BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
# CDs
BuildRequires:  libcdio-devel
# Other
BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
BuildRequires:  libtool >= 1.4.0 /usr/bin/automake-1.9 samba-common

%if 0%{?_with_directfb:1}
BuildRequires:        directfb-devel
%endif
%if 0%{!?_without_imagemagick:1}
BuildRequires:        ImageMagick-devel >= 6.2.4.6-1
%endif
#Provides:        %{name}(vdr) = %{vdrver}

%package devel
Summary:         Xine library development files
Group:           Development/Libraries
Requires:        %{name} = %{version}-%{release}
Requires:        pkgconfig zlib-devel
#Requires:        %{name}(vdr) = %{vdrver}
#Provides:        %{name}-devel(vdr) = %{vdrver}


%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.  Non-default rpmbuild options:
--without imagemagick:  Disable ImageMagick support
--with    directfb:     Enable DirectFB support

%description devel
This package contains development files for xine-lib.


%prep
%setup -q
%patch1 -p0 -b .nomcpu
###cp -p debian/changelog ChangeLog.vdr
# Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
%patch7 -p0 -b .multilib-devel

find . -name "*.[hc]" | xargs chmod -c -x

aclocal-1.9 -I m4
libtoolize --force
autoheader
automake-1.9 --gnu --add-missing
autoconf

# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure


%build
FFMPEG_CPPFLAGS=" "; FFMPEG_LIBS=" "; export FFMPEG_CPPFLAGS FFMPEG_LIBS
%configure --disable-dependency-tracking \
    --with-xv-path=%{_libdir} \
    --with-w32-path=%{codecdir} \
    --with-external-ffmpeg \
    --enable-ipv6 \
%if 0%{?_with_directfb:1}
    --enable-directfb \
%endif
%if 0%{?_without_imagemagick:1}
    --disable-imagemagick \
%endif
    --disable-rte \
    --disable-libfame \
    --disable-ffmpegtest \
    --disable-faad \
    --disable-mad \
    --disable-asf \
    --disable-vcd \
    --disable-a52dec \
    --with-external-dvdnav --disable-dvdnavtest

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT __docs
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang libxine1
cp -pR $RPM_BUILD_ROOT%{_docdir}/xine __docs
rm -rf $RPM_BUILD_ROOT%{_docdir}/xine

# Removing useless files
rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \
       __docs/README.{freebsd,irix,solaris,MINGWCROSS,WIN32} \
       __docs/README.{dxr3,network_dvd}

# Directory for binary codecs
mkdir -p $RPM_BUILD_ROOT%{codecdir}


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files -f libxine1.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS ChangeLog* README TODO __docs/README.* __docs/faq
%dir %{codecdir}
%{_datadir}/xine
%{_libdir}/libxine.so.*
%{_mandir}/man5/xine.5*
%dir %{_libdir}/xine/
%dir %{_libdir}/xine/plugins/
%dir %{_libdir}/xine/plugins/%{version}/
# I list all the plugins because I don't want a non-free plugin
# to sneak into a future version
# these plugins do not have legal problems according to the SuSE RPM
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so
#%{_libdir}/xine/plugins/%{version}/xineplug_inp_vdr.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_real_audio.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so
%{_libdir}/xine/plugins/%{version}/xineplug_flac.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
%endif
%ifnarch ppc64 s390 s390x
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
%endif
%{_libdir}/xine/plugins/%{version}/post/
%{_libdir}/xine/plugins/%{version}/vidix/
# Put it in a xine-lib-extras package one day ?
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so


%files devel
%defattr(-,root,root,-)
%doc __docs/hackersguide/*
%{_bindir}/xine-config
%{_datadir}/aclocal/xine.m4
%{_includedir}/xine.h
%{_includedir}/xine/
%{_libdir}/libxine.so
%{_libdir}/pkgconfig/libxine.pc
%{_mandir}/man1/xine-config.1*

# --------------------------------------------------------------------

%changelog
* Wed Oct 18 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-17
- cleanup docs
- remove mms
- delete more source files in the cleanup script
- drop patch3 (affecting mms)

* Tue Oct 17 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-16
- fix files list
- add BR gtk2-devel
- remove xineplug_decode_gdk_pixbuf.so from x86-only

* Mon Oct 16 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-15
- removed libdts
- drop dxr patch (it's removed from tarball)
- list xineplug_decode_gdk_pixbuf.so and xineplug_vo_out_vidix.so only on x86

* Sun Oct 15 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-14
- update SOURCE1 to remove liba52 from tarball (patented)

* Tue Sep 12 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-13
- drop patches 2 and 4

* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-12
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Oct 2006 18:30:36 -0000	1.1
+++ .cvsignore	30 Oct 2006 18:32:55 -0000	1.2
@@ -0,0 +1 @@
+xine-lib-1.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Oct 2006 18:30:36 -0000	1.1
+++ sources	30 Oct 2006 18:32:55 -0000	1.2
@@ -0,0 +1 @@
+d1afb34d2335f8c9ded4d9a2b741251e  xine-lib-1.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 18:39:51 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Mon, 30 Oct 2006 11:39:51 -0700
Subject: mock/etc fedora-6-i386-core.cfg, NONE, 1.1.2.1 fedora-6-ppc-core.cfg,
	NONE, 1.1.2.1 fedora-6-x86_64-core.cfg, NONE, 1.1.2.1 Makefile,
	1.5.2.1, 1.5.2.2
Message-ID: <200610301839.k9UIdp1C020198@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20180

Modified Files:
      Tag: mock-0-6-branch
	Makefile 
Added Files:
      Tag: mock-0-6-branch
	fedora-6-i386-core.cfg fedora-6-ppc-core.cfg 
	fedora-6-x86_64-core.cfg 
Log Message:
new config files for FC6; removed symlink from devel to fc6 in Makefile


--- NEW FILE fedora-6-i386-core.cfg ---
#!/usr/bin/python -tt

import os
config_opts['root'] = 'fedora-6-i386-core'
config_opts['target_arch'] = 'i386'


config_opts['yum.conf'] = """
[main]
cachedir=/var/cache/yum
debuglevel=1
reposdir=/dev/null
logfile=/var/log/yum.log
retries=20
obsoletes=1
gpgcheck=0
assumeyes=1

# repos

[core]
name=core
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6

[groups]
name=groups
baseurl=http://buildsys.fedoraproject.org/buildgroups/6/i386/

[extras]
name=extras
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6

[local]
name=local
baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/

"""





--- NEW FILE fedora-6-ppc-core.cfg ---
#!/usr/bin/python -tt
import os
config_opts['root'] = 'fedora-6-ppc-core'
config_opts['target_arch'] = 'ppc'


config_opts['yum.conf'] = """
[main]
cachedir=/var/cache/yum
debuglevel=1
reposdir=/dev/null
logfile=/var/log/yum.log
retries=20
obsoletes=1
gpgcheck=0
assumeyes=1
exclude=*.ppc64

# repos

[core]
name=core
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6

[groups]
name=groups
baseurl=http://buildsys.fedoraproject.org/buildgroups/6/ppc/

[extras]
name=extras
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6

[local]
name=local
baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/

"""





--- NEW FILE fedora-6-x86_64-core.cfg ---
#!/usr/bin/python -tt
import os

config_opts['root'] = 'fedora-6-x86_64-core'
config_opts['target_arch'] = 'x86_64'


config_opts['yum.conf'] = """
[main]
cachedir=/var/cache/yum
debuglevel=1
reposdir=/dev/null
logfile=/var/log/yum.log
retries=20
obsoletes=1
gpgcheck=0
assumeyes=1
exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86

# repos

[core]
name=core
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6

[groups]
name=groups
baseurl=http://buildsys.fedoraproject.org/buildgroups/6/x86_64/

[extras]
name=extras
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6

[local]
name=local
baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/

"""





Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/etc/Makefile,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- Makefile	23 Aug 2006 22:00:06 -0000	1.5.2.1
+++ Makefile	30 Oct 2006 18:39:48 -0000	1.5.2.2
@@ -9,7 +9,3 @@
 	for item in *.cfg; do \
 		install -m 644 $$item $(DESTDIR)/etc/mock/$$item; \
 	done
-	for arch in i386 ppc x86_64 ; do \
-		ln -sv fedora-devel-$$arch-core.cfg  $(DESTDIR)/etc/mock/fedora-6-$$arch-core.cfg; \
-	done
-



From fedora-extras-commits at redhat.com  Mon Oct 30 18:41:31 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 11:41:31 -0700
Subject: rpms/dates/devel dates.spec,1.4,1.5
Message-ID: <200610301841.k9UIfVSk020231@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/dates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20213

Modified Files:
	dates.spec 
Log Message:
rebuild


Index: dates.spec
===================================================================
RCS file: /cvs/extras/rpms/dates/devel/dates.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dates.spec	31 Aug 2006 14:40:12 -0000	1.4
+++ dates.spec	30 Oct 2006 18:41:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			dates
 Version:		0.1
-Release:		4.20060813svn%{?dist}
+Release:		5.20060813svn%{?dist}
 Summary:		Small, lightweight calendar
 
 Group:			Applications/Productivity
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Jesse Keating <jkeating at redhat.com> - 0.1-5.20060813svn
+- rebuild for new eds
+
 * Thu Aug 31 2006 Jesse Keating <jkeating at redhat.com> - 0.1-4.20060813svn
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:47:06 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Mon, 30 Oct 2006 11:47:06 -0700
Subject: mock mock.spec,1.16.2.12,1.16.2.13
Message-ID: <200610301847.k9UIl6Ng020324@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20305

Modified Files:
      Tag: mock-0-6-branch
	mock.spec 
Log Message:
bumped version for FC6 release


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.16.2.12
retrieving revision 1.16.2.13
diff -u -r1.16.2.12 -r1.16.2.13
--- mock.spec	21 Oct 2006 19:03:48 -0000	1.16.2.12
+++ mock.spec	30 Oct 2006 18:47:04 -0000	1.16.2.13
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.6
+Version: 0.6.7
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
+- updated for FC6 release
+
 * Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
 - bumped version to 0.6.6 (fixed tarball problem)
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:49:00 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Mon, 30 Oct 2006 11:49:00 -0700
Subject: mock ChangeLog,1.8.2.3,1.8.2.4
Message-ID: <200610301849.k9UIn0ki020370@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20351

Modified Files:
      Tag: mock-0-6-branch
	ChangeLog 
Log Message:
entries for FC6 release


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/mock/ChangeLog,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- ChangeLog	21 Oct 2006 19:03:48 -0000	1.8.2.3
+++ ChangeLog	30 Oct 2006 18:48:57 -0000	1.8.2.4
@@ -1,3 +1,11 @@
+2006-10-30  Clark Williams  <williams at redhat.com>
+
+	* Makefile
+	Bumped version to 0.6.7 for FC6 release
+
+	* etc/fedora-6-*
+	Added for FC6 release
+
 2006-10-21  Clark Williams  <williams at redhat.com>
 
 	* mock.spec



From fedora-extras-commits at redhat.com  Mon Oct 30 20:42:03 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 13:42:03 -0700
Subject: owners owners.list,1.1878,1.1879
Message-ID: <200610302042.k9UKg37j027152@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27136

Modified Files:
	owners.list 
Log Message:
add xine-lib


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1878
retrieving revision 1.1879
diff -u -r1.1878 -r1.1879
--- owners.list	29 Oct 2006 17:53:44 -0000	1.1878
+++ owners.list	30 Oct 2006 20:41:33 -0000	1.1879
@@ -2413,6 +2413,7 @@
 Fedora Extras|xfwm4|Next generation window manager for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xgalaxy|Galaxian / Galaga like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|xkeycaps|Graphical front end to xmodmap|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 30 20:48:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 13:48:43 -0700
Subject: rpms/fslint/devel fslint.spec,1.8,1.9
Message-ID: <200610302048.k9UKmh6k027247@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27195/devel

Modified Files:
	fslint.spec 
Log Message:
Zero Epochs are superfluous nowadays and frowned upon in Fedora


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fslint.spec	30 Oct 2006 15:58:46 -0000	1.8
+++ fslint.spec	30 Oct 2006 20:48:13 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           fslint
 Version:        2.16
-Release:        1%{?dist}
-Epoch:          0
+Release:        2%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -12,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -80,6 +79,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 2.16-2
+- Zero Epochs are superfluous nowadays and frowned upon in Fedora
+
 * Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
 - Update to 2.16 which has some minor packaging changes
   to align with the debian package (suggested by lintian) and also



From fedora-extras-commits at redhat.com  Mon Oct 30 20:48:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 13:48:42 -0700
Subject: rpms/fslint/FC-5 fslint.spec,1.7,1.8
Message-ID: <200610302048.k9UKmgmI027241@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27195/FC-5

Modified Files:
	fslint.spec 
Log Message:
Zero Epochs are superfluous nowadays and frowned upon in Fedora


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/fslint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fslint.spec	30 Oct 2006 16:15:04 -0000	1.7
+++ fslint.spec	30 Oct 2006 20:48:11 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           fslint
 Version:        2.16
-Release:        1%{?dist}
-Epoch:          0
+Release:        2%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -12,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -80,6 +79,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 2.16-2
+- Zero Epochs are superfluous nowadays and frowned upon in Fedora
+
 * Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
 - Update to 2.16 which has some minor packaging changes
   to align with the debian package (suggested by lintian) and also



From fedora-extras-commits at redhat.com  Mon Oct 30 20:48:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 13:48:42 -0700
Subject: rpms/fslint/FC-6 fslint.spec,1.8,1.9
Message-ID: <200610302048.k9UKmg1A027244@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27195/FC-6

Modified Files:
	fslint.spec 
Log Message:
Zero Epochs are superfluous nowadays and frowned upon in Fedora


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/fslint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fslint.spec	30 Oct 2006 16:09:14 -0000	1.8
+++ fslint.spec	30 Oct 2006 20:48:12 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           fslint
 Version:        2.16
-Release:        1%{?dist}
-Epoch:          0
+Release:        2%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -12,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -80,6 +79,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 2.16-2
+- Zero Epochs are superfluous nowadays and frowned upon in Fedora
+
 * Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
 - Update to 2.16 which has some minor packaging changes
   to align with the debian package (suggested by lintian) and also



From fedora-extras-commits at redhat.com  Mon Oct 30 20:52:16 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 13:52:16 -0700
Subject: rpms/mock/devel .cvsignore, 1.10, 1.11 mock.spec, 1.23, 1.24 sources,
	1.13, 1.14
Message-ID: <200610302052.k9UKqG8m027410@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27388

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
New upstream release.
Import changes into spec file from upstream spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Oct 2006 14:47:06 -0000	1.10
+++ .cvsignore	30 Oct 2006 20:51:45 -0000	1.11
@@ -1 +1,2 @@
 mock-0.6.5.tar.gz
+mock-0.6.7.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mock.spec	4 Oct 2006 14:47:06 -0000	1.23
+++ mock.spec	30 Oct 2006 20:51:45 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.5
+Version: 0.6.7
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -39,11 +39,16 @@
 if [ ! -f default.cfg ]; then
     if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then
         ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
-    else
+    elif [ -f fedora-devel-%{_target_cpu}-core.cfg ]; then
+        ln -s fedora-devel-%{_target_cpu}-core.cfg default.cfg
+    elif [ -f fedora-development-i386-core.cfg ]; then
         ln -s fedora-development-i386-core.cfg default.cfg
+    elif [ -f fedora-devel-i386-core.cfg ]; then
+        ln -s fedora-devel-i386-core.cfg default.cfg
     fi
 fi
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +73,12 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
+- updated for FC6 release
+
+* Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
+- bumped version to 0.6.6 (fixed tarball problem)
+
 * Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
 - new upstream version to fix #151255
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Oct 2006 14:47:06 -0000	1.13
+++ sources	30 Oct 2006 20:51:45 -0000	1.14
@@ -1 +1 @@
-77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz
+1798d3eeaf474b476f8ed4e7dc9cc63f  mock-0.6.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 21:30:20 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 14:30:20 -0700
Subject: rpms/mock/devel .cvsignore, 1.11, 1.12 mock.spec, 1.24, 1.25 sources,
	1.14, 1.15
Message-ID: <200610302130.k9ULUKtH030761@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30723

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
Another upstream release with more tarball fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Oct 2006 20:51:45 -0000	1.11
+++ .cvsignore	30 Oct 2006 21:29:50 -0000	1.12
@@ -1,2 +1 @@
-mock-0.6.5.tar.gz
-mock-0.6.7.tar.gz
+mock-0.6.8.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mock.spec	30 Oct 2006 20:51:45 -0000	1.24
+++ mock.spec	30 Oct 2006 21:29:50 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.7
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
+- respun tarballs without buildsys rpms
+
 * Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
 - updated for FC6 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 Oct 2006 20:51:45 -0000	1.14
+++ sources	30 Oct 2006 21:29:50 -0000	1.15
@@ -1 +1 @@
-1798d3eeaf474b476f8ed4e7dc9cc63f  mock-0.6.7.tar.gz
+5f8308a6e5b8fe87943bb7b28dd55bfd  mock-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 21:35:44 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Mon, 30 Oct 2006 14:35:44 -0700
Subject: mock mock.spec,1.16.2.13,1.16.2.14
Message-ID: <200610302135.k9ULZiG6030861@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30843

Modified Files:
      Tag: mock-0-6-branch
	mock.spec 
Log Message:
removed tabs


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.16.2.13
retrieving revision 1.16.2.14
diff -u -r1.16.2.13 -r1.16.2.14
--- mock.spec	30 Oct 2006 18:47:04 -0000	1.16.2.13
+++ mock.spec	30 Oct 2006 21:35:41 -0000	1.16.2.14
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.7
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -30,7 +30,7 @@
 
 %if 0%{?fedora:1}
 if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then
-   	ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
+        ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
 fi
 %endif
 
@@ -43,7 +43,7 @@
     elif [ -f fedora-development-i386-core.cfg ]; then
         ln -s fedora-development-i386-core.cfg default.cfg
     elif [ -f fedora-devel-i386-core.cfg ]; then
-	ln -s fedora-devel-i386-core.cfg default.cfg
+        ln -s fedora-devel-i386-core.cfg default.cfg
     fi
 fi
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
+- respun tarballs without buildsys rpms
+
 * Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
 - updated for FC6 release
 



From fedora-extras-commits at redhat.com  Mon Oct 30 21:48:32 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 30 Oct 2006 14:48:32 -0700
Subject: rpms/kompose/devel kompose.spec,1.6,1.7
Message-ID: <200610302148.k9ULmWhR030980@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kompose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30928

Modified Files:
	kompose.spec 
Log Message:
Remove X-Fedora desktop category



Index: kompose.spec
===================================================================
RCS file: /cvs/extras/rpms/kompose/devel/kompose.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kompose.spec	25 Oct 2006 15:11:28 -0000	1.6
+++ kompose.spec	30 Oct 2006 21:48:02 -0000	1.7
@@ -36,7 +36,6 @@
        --add-category=Qt \
        --add-category=KDE \
        --add-category=Utility \
-       --add-category=X-Fedora \
        --delete-original --dir %{buildroot}%{_datadir}/applications \
        $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/kompose.desktop
 install -D src/hi32-app-kompose.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kompose.png
@@ -67,8 +66,9 @@
 %{_datadir}/pixmaps/kompose.png
 
 %changelog
-* Wed Oct 25 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-7
+* Mon Oct 30 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-7
 - Rebuild for new imlib2
+- Remove X-Fedora desktop category
 
 * Tue Aug 29 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-6
 - Revert to 0.5.3 and rebuild for FC6.  0.5.4 does not compile



From fedora-extras-commits at redhat.com  Mon Oct 30 21:48:49 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 14:48:49 -0700
Subject: rpms/mock/FC-5 mock.spec,1.22,1.23 sources,1.13,1.14
Message-ID: <200610302148.k9ULmnOw031010@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30948/FC-5

Modified Files:
	mock.spec sources 
Log Message:
Sync devel across FC-6 and FC-5



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mock.spec	4 Oct 2006 14:47:05 -0000	1.22
+++ mock.spec	30 Oct 2006 21:48:19 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.5
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -39,11 +39,16 @@
 if [ ! -f default.cfg ]; then
     if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then
         ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
-    else
+    elif [ -f fedora-devel-%{_target_cpu}-core.cfg ]; then
+        ln -s fedora-devel-%{_target_cpu}-core.cfg default.cfg
+    elif [ -f fedora-development-i386-core.cfg ]; then
         ln -s fedora-development-i386-core.cfg default.cfg
+    elif [ -f fedora-devel-i386-core.cfg ]; then
+        ln -s fedora-devel-i386-core.cfg default.cfg
     fi
 fi
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +73,15 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
+- respun tarballs without buildsys rpms
+
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
+- updated for FC6 release
+
+* Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
+- bumped version to 0.6.6 (fixed tarball problem)
+
 * Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
 - new upstream version to fix #151255
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Oct 2006 14:47:05 -0000	1.13
+++ sources	30 Oct 2006 21:48:19 -0000	1.14
@@ -1 +1 @@
-77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz
+5f8308a6e5b8fe87943bb7b28dd55bfd  mock-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 21:48:50 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 14:48:50 -0700
Subject: rpms/mock/FC-6 mock.spec,1.23,1.24 sources,1.13,1.14
Message-ID: <200610302148.k9ULmoZZ031014@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30948/FC-6

Modified Files:
	mock.spec sources 
Log Message:
Sync devel across FC-6 and FC-5



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mock.spec	4 Oct 2006 14:47:06 -0000	1.23
+++ mock.spec	30 Oct 2006 21:48:20 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.5
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -39,11 +39,16 @@
 if [ ! -f default.cfg ]; then
     if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then
         ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
-    else
+    elif [ -f fedora-devel-%{_target_cpu}-core.cfg ]; then
+        ln -s fedora-devel-%{_target_cpu}-core.cfg default.cfg
+    elif [ -f fedora-development-i386-core.cfg ]; then
         ln -s fedora-development-i386-core.cfg default.cfg
+    elif [ -f fedora-devel-i386-core.cfg ]; then
+        ln -s fedora-devel-i386-core.cfg default.cfg
     fi
 fi
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +73,15 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
+- respun tarballs without buildsys rpms
+
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
+- updated for FC6 release
+
+* Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
+- bumped version to 0.6.6 (fixed tarball problem)
+
 * Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
 - new upstream version to fix #151255
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Oct 2006 14:47:06 -0000	1.13
+++ sources	30 Oct 2006 21:48:20 -0000	1.14
@@ -1 +1 @@
-77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz
+5f8308a6e5b8fe87943bb7b28dd55bfd  mock-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 23:56:14 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Mon, 30 Oct 2006 16:56:14 -0700
Subject: rpms/flumotion/FC-5 flumotion.spec,1.10,1.11
Message-ID: <200610302356.k9UNuEaH005382@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/flumotion/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5366

Modified Files:
	flumotion.spec 
Log Message:
fix xml comment


Index: flumotion.spec
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flumotion.spec	29 Sep 2006 10:14:36 -0000	1.10
+++ flumotion.spec	30 Oct 2006 23:55:43 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           flumotion
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flumotion - the Fluendo Streaming Server
 
 Group:          Applications/Internet
@@ -130,8 +130,10 @@
 <!--
     <port>7531</port>
     <transport>ssl</transport>
+-->
     <!-- certificate path can be relative to $sysconfdir/flumotion,
          or absolute -->
+<!--
     <certificate>default.pem</certificate>
 -->
     <component name="manager-bouncer" type="htpasswdcrypt">
@@ -226,6 +228,10 @@
 %{_sysconfdir}/rc.d/init.d/flumotion
 
 %changelog
+* Tue Oct 31 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.2.2-2
+- fix the comment in the xml
+
 * Fri Sep 29 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.2-1
 - new upstream release



From fedora-extras-commits at redhat.com  Tue Oct 31 00:40:48 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 17:40:48 -0700
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.8,
	1.9
Message-ID: <200610310040.k9V0emNM008623@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8607

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
change URL of Source0


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-datetime-plugin.spec	15 Oct 2006 13:19:21 -0000	1.8
+++ xfce4-datetime-plugin.spec	31 Oct 2006 00:40:17 -0000	1.9
@@ -6,7 +6,7 @@
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://xs4all.nl/~stacium/xfce/%{name}-%{version}.tar.gz
+Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel  >= 4.3.20, libxml2-devel



From fedora-extras-commits at redhat.com  Tue Oct 31 01:05:05 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 18:05:05 -0700
Subject: rpms/xfce4-genmon-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-genmon-plugin.spec, 1.5, 1.6
Message-ID: <200610310105.k9V155ix011650@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11630

Modified Files:
	.cvsignore sources xfce4-genmon-plugin.spec 
Log Message:
update to 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 12:18:36 -0000	1.3
+++ .cvsignore	31 Oct 2006 01:04:35 -0000	1.4
@@ -1 +1 @@
-xfce4-genmon-plugin-2.0.tar.bz2
+xfce4-genmon-plugin-3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 12:18:36 -0000	1.3
+++ sources	31 Oct 2006 01:04:35 -0000	1.4
@@ -1 +1 @@
-c859720637f943032545d7b1428aa0b4  xfce4-genmon-plugin-2.0.tar.bz2
+e44c78dab7a2856b76d5a1d8c9e6ebf2  xfce4-genmon-plugin-3.0.tar.bz2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-genmon-plugin.spec	5 Oct 2006 12:18:36 -0000	1.5
+++ xfce4-genmon-plugin.spec	31 Oct 2006 01:04:35 -0000	1.6
@@ -1,16 +1,17 @@
 Name:		xfce4-genmon-plugin
-Version:	2.0
-Release:	3%{?dist}
+Version:	3.0
+Release:	1%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	LGPL
-URL:		http://goodies.xfce.org/
+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)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	xfce4-dev-tools
 Requires:	xfce4-panel >= 4.3.99.1
 
 %description
@@ -21,23 +22,29 @@
 %setup -q
 
 %build
+xdt-autogen
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Tue Oct 31 01:31:43 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 30 Oct 2006 18:31:43 -0700
Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.9,
	1.10 gaim-fedora-prefs.xml, 
	1.1, 1.2 gaim-meanwhile.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200610310131.k9V1VhwT011880@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11818

Modified Files:
	.cvsignore gaim-fedora-prefs.xml gaim-meanwhile.spec sources 
Log Message:
Update to beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jun 2006 03:24:21 -0000	1.9
+++ .cvsignore	31 Oct 2006 01:31:13 -0000	1.10
@@ -1 +1 @@
-gaim-2.0.0beta3.tar.bz2
+gaim-2.0.0beta4.tar.bz2


Index: gaim-fedora-prefs.xml
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-fedora-prefs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-fedora-prefs.xml	29 Jun 2006 03:24:21 -0000	1.1
+++ gaim-fedora-prefs.xml	31 Oct 2006 01:31:13 -0000	1.2
@@ -1,261 +1,366 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
-<pref version='1.0' name='/'>
+<pref version='1' name='/'>
 	<pref name='core'>
 		<pref name='away'>
-			<pref name='away_when_idle' type='bool' value='1' />
-			<pref name='mins_before_away' type='int' value='5' />
-			<pref name='default_message' type='string' value='Slightly less boring default' />
-			<pref name='auto_reply' type='string' value='awayidle' />
-		</pref>
-		<pref name='buddies'>
-			<pref name='use_server_alias' type='bool' value='1' />
+			<pref name='idle_reporting' type='string' value='system'/>
+			<pref name='away_when_idle' type='bool' value='1'/>
+			<pref name='mins_before_away' type='int' value='5'/>
+			<pref name='auto_reply' type='string' value='awayidle'/>
 		</pref>
+		<pref name='buddies'/>
 		<pref name='contact'>
-			<pref name='last_match' type='bool' value='0' />
-			<pref name='offline_score' type='int' value='4' />
-			<pref name='away_score' type='int' value='2' />
-			<pref name='idle_score' type='int' value='1' />
+			<pref name='last_match' type='bool' value='0'/>
+			<pref name='offline_score' type='int' value='4'/>
+			<pref name='away_score' type='int' value='2'/>
+			<pref name='idle_score' type='int' value='1'/>
+		</pref>
+		<pref name='debug'>
+			<pref name='timestamps' type='bool' value='0'/>
+		</pref>
+		<pref name='status'>
+			<pref name='scores'>
+				<pref name='offline' type='int' value='-500'/>
+				<pref name='available' type='int' value='100'/>
+				<pref name='invisible' type='int' value='-50'/>
+				<pref name='away' type='int' value='-100'/>
+				<pref name='extended_away' type='int' value='-200'/>
+				<pref name='idle' type='int' value='-10'/>
+			</pref>
+		</pref>
+		<pref name='savedstatus'>
+			<pref name='default' type='int' value='1161808301'/>
+			<pref name='startup' type='int' value='0'/>
+			<pref name='startup_current_status' type='bool' value='1'/>
+			<pref name='idleaway' type='int' value='1161808306'/>
+			<pref name='isidleaway' type='bool' value='0'/>
+			<pref name='current' type='int' value='1153343286'/>
 		</pref>
 		<pref name='conversations'>
-			<pref name='use_alias_for_title' type='bool' value='1' />
 			<pref name='chat'>
-				<pref name='show_nick_change' type='bool' value='1' />
+				<pref name='show_nick_change' type='bool' value='1'/>
 			</pref>
 			<pref name='im'>
-				<pref name='send_typing' type='bool' value='1' />
+				<pref name='send_typing' type='bool' value='1'/>
 			</pref>
 		</pref>
 		<pref name='logging'>
-			<pref name='log_ims' type='bool' value='1' />
-			<pref name='log_chats' type='bool' value='0' />
-			<pref name='log_system' type='bool' value='0' />
-			<pref name='log_signon_signoff' type='bool' value='0' />
-			<pref name='log_idle_state' type='bool' value='0' />
-			<pref name='log_away_state' type='bool' value='0' />
-			<pref name='log_own_states' type='bool' value='0' />
-			<pref name='format' type='string' value='html' />
+			<pref name='log_ims' type='bool' value='1'/>
+			<pref name='log_chats' type='bool' value='0'/>
+			<pref name='log_system' type='bool' value='0'/>
+			<pref name='format' type='string' value='html'/>
 		</pref>
 		<pref name='network'>
-			<pref name='auto_ip' type='bool' value='1' />
-			<pref name='public_ip' type='string' value='' />
-			<pref name='ports_range_use' type='bool' value='0' />
-			<pref name='ports_range_start' type='int' value='1024' />
-			<pref name='ports_range_end' type='int' value='2048' />
+			<pref name='auto_ip' type='bool' value='1'/>
+			<pref name='public_ip' type='string' value='172.16.80.210'/>
+			<pref name='ports_range_use' type='bool' value='0'/>
+			<pref name='ports_range_start' type='int' value='1024'/>
+			<pref name='ports_range_end' type='int' value='2048'/>
+			<pref name='stun_server' type='string' value=''/>
 		</pref>
 		<pref name='proxy'>
-			<pref name='type' type='string' value='none' />
-			<pref name='host' type='string' value='' />
-			<pref name='port' type='int' value='0' />
-			<pref name='username' type='string' value='' />
-			<pref name='password' type='string' value='' />
+			<pref name='type' type='string' value='none'/>
+			<pref name='host' type='string' value=''/>
+			<pref name='port' type='int' value='0'/>
+			<pref name='username' type='string' value=''/>
+			<pref name='password' type='string' value=''/>
 		</pref>
 		<pref name='sound'>
-			<pref name='while_away' type='bool' value='0' />
+			<pref name='while_away' type='bool' value='0'/>
 		</pref>
 	</pref>
 	<pref name='plugins'>
 		<pref name='core'>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1' />
-				<pref name='notify_idle' type='bool' value='1' />
+			<pref name='psychic'>
+				<pref name='buddies_only' type='bool' value='0'/>
+				<pref name='show_notice' type='bool' value='1'/>
+				<pref name='activate_online' type='bool' value='1'/>
 			</pref>
-			<pref name='autorecon'>
-				<pref name='hide_connected_error' type='bool' value='0' />
-				<pref name='hide_connecting_error' type='bool' value='0' />
-				<pref name='restore_state' type='bool' value='1' />
+			<pref name='statenotify'>
+				<pref name='notify_away' type='bool' value='1'/>
+				<pref name='notify_idle' type='bool' value='1'/>
+				<pref name='notify_signon' type='bool' value='1'/>
 			</pref>
 		</pref>
-		<pref name='lopl' />
+		<pref name='lopl'/>
 		<pref name='prpl'>
+			<pref name='qq'>
+				<pref name='show_status_by_icon' type='bool' value='1'/>
+				<pref name='show_fake_video' type='bool' value='0'/>
+				<pref name='prompt_for_missing_packet' type='bool' value='1'/>
+				<pref name='prompt_group_msg_on_recv' type='bool' value='1'/>
+			</pref>
+			<pref name='oscar'>
+				<pref name='recent_buddies' type='bool' value='0'/>
+				<pref name='show_idle' type='bool' value='0'/>
+			</pref>
 			<pref name='silc'>
-				<pref name='sign_im' type='bool' value='0' />
-				<pref name='verify_im' type='bool' value='0' />
-				<pref name='sign_chat' type='bool' value='0' />
-				<pref name='verify_chat' type='bool' value='0' />
-				<pref name='vcard' type='string' value='' />
+				<pref name='sign_im' type='bool' value='0'/>
+				<pref name='verify_im' type='bool' value='0'/>
+				<pref name='sign_chat' type='bool' value='0'/>
+				<pref name='verify_chat' type='bool' value='0'/>
+				<pref name='vcard' type='string' value=''/>
 			</pref>
 			<pref name='msn'>
-				<pref name='conv_close_notice' type='bool' value='1' />
-				<pref name='conv_timeout_notice' type='bool' value='1' />
+				<pref name='conv_close_notice' type='bool' value='1'/>
+				<pref name='conv_timeout_notice' type='bool' value='1'/>
 			</pref>
 			<pref name='jabber'>
-				<pref name='hide_os' type='bool' value='0' />
+				<pref name='hide_os' type='bool' value='0'/>
 			</pref>
 		</pref>
 		<pref name='gtk'>
-			<pref name='docklet'>
-				<pref name='queue_messages' type='bool' value='0' />
+			<pref name='musicmessaging'>
+				<pref name='editor_path' type='string' value='/usr/local/bin/gscore'/>
+			</pref>
+			<pref name='extplacement'>
+				<pref name='placement_number' type='int' value='4'/>
+				<pref name='placement_number_separate' type='bool' value='0'/>
+			</pref>
+			<pref name='timestamp'>
+				<pref name='interval' type='int' value='300000'/>
+			</pref>
+			<pref name='timestamp_format'>
+				<pref name='force_24hr' type='bool' value='1'/>
+				<pref name='use_dates'>
+					<pref name='conversation' type='string' value='automatic'/>
+					<pref name='log' type='string' value='automatic'/>
+				</pref>
+			</pref>
+			<pref name='gaimrc'>
+				<pref name='set'>
+					<pref name='gtk-font-name' type='bool' value='0'/>
+					<pref name='gtk-key-theme-name' type='bool' value='0'/>
+					<pref name='color'>
+						<pref name='GtkWidget::cursor-color' type='bool' value='0'/>
+						<pref name='GtkWidget::secondary-cursor-color' type='bool' value='0'/>
+						<pref name='GtkIMHtml::hyperlink-color' type='bool' value='0'/>
+					</pref>
+					<pref name='size'>
+						<pref name='GtkTreeView::expander_size' type='bool' value='0'/>
+						<pref name='GtkTreeView::horizontal_separator' type='bool' value='0'/>
+					</pref>
+					<pref name='font'>
+						<pref name='*gaim_gtkconv_entry' type='bool' value='0'/>
+						<pref name='*gaim_gtkconv_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtklog_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtkrequest_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtknotify_imhtml' type='bool' value='0'/>
+					</pref>
+					<pref name='bool'>
+						<pref name='GtkTreeView::indent_expanders' type='bool' value='0'/>
+					</pref>
+				</pref>
+				<pref name='gtk-font-name' type='string' value=''/>
+				<pref name='gtk-key-theme-name' type='string' value=''/>
+				<pref name='color'>
+					<pref name='GtkWidget::cursor-color' type='string' value=''/>
+					<pref name='GtkWidget::secondary-cursor-color' type='string' value=''/>
+					<pref name='GtkIMHtml::hyperlink-color' type='string' value=''/>
+				</pref>
+				<pref name='size'>
+					<pref name='GtkTreeView::expander_size' type='int' value='0'/>
+					<pref name='GtkTreeView::horizontal_separator' type='int' value='0'/>
+				</pref>
+				<pref name='font'>
+					<pref name='*gaim_gtkconv_entry' type='string' value=''/>
+					<pref name='*gaim_gtkconv_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtklog_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtkrequest_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtknotify_imhtml' type='string' value=''/>
+				</pref>
+				<pref name='bool'>
+					<pref name='GtkTreeView::indent_expanders' type='bool' value='1'/>
+				</pref>
 			</pref>
 			<pref name='X11'>
 				<pref name='gestures'>
-					<pref name='visual' type='bool' value='0' />
+					<pref name='visual' type='bool' value='0'/>
 				</pref>
 				<pref name='notify'>
-					<pref name='type_im' type='bool' value='1' />
-					<pref name='type_chat' type='bool' value='0' />
-					<pref name='type_focused' type='bool' value='0' />
-					<pref name='method_string' type='bool' value='0' />
-					<pref name='title_string' type='string' value='(*)' />
-					<pref name='method_urgent' type='bool' value='1' />
-					<pref name='method_count' type='bool' value='1' />
-					<pref name='notify_focus' type='bool' value='1' />
-					<pref name='notify_click' type='bool' value='1' />
-					<pref name='notify_type' type='bool' value='1' />
-					<pref name='notify_send' type='bool' value='1' />
-					<pref name='notify_switch' type='bool' value='1' />
+					<pref name='type_im' type='bool' value='1'/>
+					<pref name='type_chat' type='bool' value='0'/>
+					<pref name='type_chat_nick' type='bool' value='0'/>
+					<pref name='type_focused' type='bool' value='0'/>
+					<pref name='method_string' type='bool' value='0'/>
+					<pref name='title_string' type='string' value='(*)'/>
+					<pref name='method_urgent' type='bool' value='1'/>
+					<pref name='method_count' type='bool' value='1'/>
+					<pref name='method_count_xprop' type='bool' value='0'/>
+					<pref name='method_raise' type='bool' value='0'/>
+					<pref name='notify_focus' type='bool' value='1'/>
+					<pref name='notify_click' type='bool' value='1'/>
+					<pref name='notify_type' type='bool' value='1'/>
+					<pref name='notify_send' type='bool' value='1'/>
+					<pref name='notify_switch' type='bool' value='1'/>
 				</pref>
 			</pref>
-			<pref name='timestamp'>
-				<pref name='interval' type='int' value='300000' />
+			<pref name='docklet'>
+				<pref name='blink_im' type='string' value='hidden'/>
+				<pref name='blink_chat' type='string' value='never'/>
 			</pref>
-			<pref name='extplacement'>
-				<pref name='placement_number' type='int' value='4' />
-				<pref name='placement_number_separate' type='bool' value='0' />
+		</pref>
+		<pref name='gnt'>
+			<pref name='gntgf'>
+				<pref name='events'>
+					<pref name='signonf' type='bool' value='1'/>
+					<pref name='immsg' type='bool' value='1'/>
+					<pref name='chatmsg' type='bool' value='1'/>
+					<pref name='chatnick' type='bool' value='1'/>
+				</pref>
+				<pref name='beep' type='bool' value='1'/>
+				<pref name='urgent' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>
 	<pref name='gaim'>
 		<pref name='gtk'>
-			<pref name='accounts'>
-				<pref name='dialog'>
-					<pref name='width' type='int' value='550' />
-					<pref name='height' type='int' value='250' />
-				</pref>
-			</pref>
-			<pref name='away'>
-				<pref name='queue_messages' type='bool' value='0' />
-			</pref>
 			<pref name='browsers'>
-				<pref name='place' type='int' value='0' />
-				<pref name='command' type='string' value='' />
-				<pref name='browser' type='string' value='gnome-open' />
-			</pref>
-			<pref name='idle'>
-				<pref name='reporting_method' type='string' value='system' />
+				<pref name='place' type='int' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='browser' type='string' value='gnome-open'/>
 			</pref>
 			<pref name='plugins'>
 				<pref name='loaded' type='stringlist'>
-					<item value='/usr/lib/gaim/autorecon.so' />
-					<item value='/usr/lib/gaim/history.so' />
-					<item value='/usr/lib/gaim/docklet.so' />
-					<item value='/usr/lib/gaim/extplacement.so' />
-					<item value='/usr/lib/gaim/notify.so' />
+					<item value='/usr/lib/gaim/autorecon.so'/>
+					<item value='/usr/lib/gaim/history.so'/>
+					<item value='/usr/lib/gaim/docklet.so'/>
+					<item value='/usr/lib/gaim/extplacement.so'/>
+					<item value='/usr/lib/gaim/notify.so'/>
 				</pref>
 			</pref>
+			<pref name='filelocations'>
+				<pref name='last_save_folder' type='string' value=''/>
+				<pref name='last_open_folder' type='string' value=''/>
+				<pref name='last_icon_folder' type='string' value=''/>
+			</pref>
 			<pref name='smileys'>
-				<pref name='theme' type='string' value='/usr/share/pixmaps/gaim/smileys/default/theme' />
+				<pref name='theme' type='string' value='Default'/>
 			</pref>
 			<pref name='debug'>
-				<pref name='enabled' type='bool' value='0' />
-				<pref name='timestamps' type='bool' value='0' />
-				<pref name='toolbar' type='bool' value='1' />
-				<pref name='width' type='int' value='450' />
-				<pref name='height' type='int' value='250' />
+				<pref name='enabled' type='bool' value='0'/>
+				<pref name='filterlevel' type='int' value='0'/>
+				<pref name='style' type='int' value='3'/>
+				<pref name='toolbar' type='bool' value='1'/>
+				<pref name='width' type='int' value='450'/>
+				<pref name='height' type='int' value='250'/>
+				<pref name='regex' type='string' value=''/>
+				<pref name='filter' type='bool' value='0'/>
+				<pref name='invert' type='bool' value='0'/>
+				<pref name='case_insensitive' type='bool' value='0'/>
+				<pref name='highlight' type='bool' value='0'/>
 			</pref>
 			<pref name='sound'>
 				<pref name='enabled'>
-					<pref name='login' type='bool' value='1' />
-					<pref name='logout' type='bool' value='1' />
-					<pref name='im_recv' type='bool' value='1' />
-					<pref name='first_im_recv' type='bool' value='0' />
-					<pref name='send_im' type='bool' value='1' />
-					<pref name='join_chat' type='bool' value='0' />
-					<pref name='left_chat' type='bool' value='0' />
-					<pref name='send_chat_msg' type='bool' value='0' />
-					<pref name='chat_msg_recv' type='bool' value='0' />
-					<pref name='nick_said' type='bool' value='0' />
-					<pref name='pounce_default' type='bool' value='1' />
+					<pref name='login' type='bool' value='1'/>
+					<pref name='logout' type='bool' value='1'/>
+					<pref name='im_recv' type='bool' value='1'/>
+					<pref name='first_im_recv' type='bool' value='0'/>
+					<pref name='send_im' type='bool' value='1'/>
+					<pref name='join_chat' type='bool' value='0'/>
+					<pref name='left_chat' type='bool' value='0'/>
+					<pref name='send_chat_msg' type='bool' value='0'/>
+					<pref name='chat_msg_recv' type='bool' value='0'/>
+					<pref name='nick_said' type='bool' value='0'/>
+					<pref name='pounce_default' type='bool' value='1'/>
 				</pref>
 				<pref name='file'>
-					<pref name='login' type='string' value='' />
-					<pref name='logout' type='string' value='' />
-					<pref name='im_recv' type='string' value='' />
-					<pref name='first_im_recv' type='string' value='' />
-					<pref name='send_im' type='string' value='' />
-					<pref name='join_chat' type='string' value='' />
-					<pref name='left_chat' type='string' value='' />
-					<pref name='send_chat_msg' type='string' value='' />
-					<pref name='chat_msg_recv' type='string' value='' />
-					<pref name='nick_said' type='string' value='' />
-					<pref name='pounce_default' type='string' value='' />
-				</pref>
-				<pref name='conv_focus' type='bool' value='1' />
-				<pref name='command' type='string' value='' />
-				<pref name='method' type='string' value='automatic' />
+					<pref name='login' type='string' value=''/>
+					<pref name='logout' type='string' value=''/>
+					<pref name='im_recv' type='string' value=''/>
+					<pref name='first_im_recv' type='string' value=''/>
+					<pref name='send_im' type='string' value=''/>
+					<pref name='join_chat' type='string' value=''/>
+					<pref name='left_chat' type='string' value=''/>
+					<pref name='send_chat_msg' type='string' value=''/>
+					<pref name='chat_msg_recv' type='string' value=''/>
+					<pref name='nick_said' type='string' value=''/>
+					<pref name='pounce_default' type='string' value=''/>
+				</pref>
+				<pref name='conv_focus' type='bool' value='1'/>
+				<pref name='mute' type='bool' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='method' type='string' value='automatic'/>
+				<pref name='volume' type='int' value='50'/>
+			</pref>
+			<pref name='accounts'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
+				<pref name='buddyicon' type='string' value=''/>
 			</pref>
 			<pref name='blist'>
-				<pref name='auto_expand_contacts' type='bool' value='1' />
-				<pref name='button_style' type='int' value='3' />
-				<pref name='grey_idle_buddies' type='bool' value='1' />
-				<pref name='raise_on_events' type='bool' value='0' />
-				<pref name='show_buddy_icons' type='bool' value='0' />
-				<pref name='show_empty_groups' type='bool' value='0' />
-				<pref name='show_idle_time' type='bool' value='1' />
-				<pref name='show_offline_buddies' type='bool' value='0' />
-				<pref name='show_warning_level' type='bool' value='1' />
-				<pref name='sort_type' type='string' value='alphabetical' />
-				<pref name='x' type='int' value='0' />
-				<pref name='y' type='int' value='0' />
-				<pref name='width' type='int' value='309' />
-				<pref name='height' type='int' value='500' />
-				<pref name='tooltip_delay' type='int' value='500' />
+				<pref name='show_buddy_icons' type='bool' value='0'/>
+				<pref name='show_empty_groups' type='bool' value='0'/>
+				<pref name='show_idle_time' type='bool' value='1'/>
+				<pref name='show_offline_buddies' type='bool' value='0'/>
+				<pref name='list_visible' type='bool' value='1'/>
+				<pref name='list_maximized' type='bool' value='0'/>
+				<pref name='sort_type' type='string' value='alphabetical'/>
+				<pref name='x' type='int' value='133'/>
+				<pref name='y' type='int' value='75'/>
+				<pref name='width' type='int' value='309'/>
+				<pref name='height' type='int' value='500'/>
+				<pref name='tooltip_delay' type='int' value='500'/>
+			</pref>
+			<pref name='status'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
 			</pref>
 			<pref name='conversations'>
-				<pref name='close_on_tabs' type='bool' value='1' />
-				<pref name='ctrl_enter_sends' type='bool' value='0' />
-				<pref name='enter_sends' type='bool' value='1' />
-				<pref name='escape_closes' type='bool' value='0' />
-				<pref name='send_formatting' type='bool' value='0' />
-				<pref name='send_bold' type='bool' value='0' />
-				<pref name='send_italic' type='bool' value='0' />
-				<pref name='send_underline' type='bool' value='0' />
-				<pref name='show_timestamps' type='bool' value='1' />
-				<pref name='spellcheck' type='bool' value='1' />
-				<pref name='ignore_colors' type='bool' value='0' />
-				<pref name='ignore_fonts' type='bool' value='0' />
-				<pref name='ignore_font_sizes' type='bool' value='0' />
-				<pref name='html_shortcuts' type='bool' value='1' />
-				<pref name='smiley_shortcuts' type='bool' value='0' />
-				<pref name='show_formatting_toolbar' type='bool' value='1' />
-				<pref name='passthrough_unknown_commands' type='bool' value='0' />
-				<pref name='placement' type='string' value='last' />
-				<pref name='placement_number' type='int' value='1' />
-				<pref name='bgcolor' type='string' value='' />
-				<pref name='fgcolor' type='string' value='' />
-				<pref name='font_face' type='string' value='' />
-				<pref name='font_size' type='int' value='3' />
-				<pref name='tabs' type='bool' value='1' />
-				<pref name='tab_side' type='int' value='2' />
-				<pref name='button_type' type='int' value='3' />
+				<pref name='use_smooth_scrolling' type='bool' value='1'/>
+				<pref name='close_on_tabs' type='bool' value='1'/>
+				<pref name='send_bold' type='bool' value='0'/>
+				<pref name='send_italic' type='bool' value='0'/>
+				<pref name='send_underline' type='bool' value='0'/>
+				<pref name='spellcheck' type='bool' value='1'/>
+				<pref name='show_incoming_formatting' type='bool' value='1'/>
+				<pref name='show_timestamps' type='bool' value='1'/>
+				<pref name='show_formatting_toolbar' type='bool' value='1'/>
+				<pref name='passthrough_unknown_commands' type='bool' value='0'/>
+				<pref name='placement' type='string' value='last'/>
+				<pref name='placement_number' type='int' value='1'/>
+				<pref name='bgcolor' type='string' value=''/>
+				<pref name='fgcolor' type='string' value=''/>
+				<pref name='font_face' type='string' value=''/>
+				<pref name='font_size' type='int' value='3'/>
+				<pref name='tabs' type='bool' value='1'/>
+				<pref name='tab_side' type='int' value='2'/>
+				<pref name='scrollback_lines' type='int' value='4000'/>
 				<pref name='chat'>
-					<pref name='color_nicks' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='userlist_width' type='int' value='80'/>
 				</pref>
 				<pref name='im'>
-					<pref name='animate_buddy_icons' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
-					<pref name='show_buddy_icons' type='bool' value='1' />
+					<pref name='animate_buddy_icons' type='bool' value='1'/>
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='show_buddy_icons' type='bool' value='1'/>
+					<pref name='hide_new' type='string' value='never'/>
 				</pref>
 			</pref>
 			<pref name='pounces'>
 				<pref name='default_actions'>
-					<pref name='open-window' type='bool' value='0' />
-					<pref name='popup-notify' type='bool' value='0' />
-					<pref name='send-message' type='bool' value='1' />
-					<pref name='execute-command' type='bool' value='0' />
-					<pref name='play-sound' type='bool' value='0' />
+					<pref name='open-window' type='bool' value='0'/>
+					<pref name='popup-notify' type='bool' value='0'/>
+					<pref name='send-message' type='bool' value='1'/>
+					<pref name='execute-command' type='bool' value='0'/>
+					<pref name='play-sound' type='bool' value='0'/>
+				</pref>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='520'/>
+					<pref name='height' type='int' value='321'/>
 				</pref>
 			</pref>
 			<pref name='filetransfer'>
-				<pref name='clear_finished' type='bool' value='1' />
-				<pref name='keep_open' type='bool' value='0' />
+				<pref name='clear_finished' type='bool' value='1'/>
+				<pref name='keep_open' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gaim-meanwhile.spec	28 Aug 2006 00:56:48 -0000	1.15
+++ gaim-meanwhile.spec	31 Oct 2006 01:31:13 -0000	1.16
@@ -23,11 +23,11 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta3
+%define betaver	beta4
 
 Name:		gaim-meanwhile
 Version:	2.0.0
-Release:	0.4.%{betaver}%{?dist}
+Release:	0.5.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -88,7 +88,7 @@
 %endif
 # Evolution integration (FC3+)
 %if %{evolution_integration}
-BuildRequires:	evolution-data-server-devel
+BuildRequires:	evolution-data-server-devel >= 1.9.1
 %endif
 # SILC integration (FC3+)
 %if %{silc_integration}
@@ -121,7 +121,8 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
-%patch5 -p1
+#PIE patch is broken
+#%patch5 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -200,6 +201,8 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/libgaim*
 rm -rf $RPM_BUILD_ROOT%{_datadir}
 rm -rf $RPM_BUILD_ROOT%{_prefix}/src
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gaim.schemas
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gaim/private
 
 #preserve the libsametime debug libraries and delete the rest
 #mv $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/libsametime.so.debug $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/sametime.tmp
@@ -250,6 +253,9 @@
 %{_libdir}/gaim/
 
 %changelog
+* Sat Oct 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.5.beta4
+- Rebuild against most recent core package
+
 * Sun Aug 27 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.4.beta3
 - Bump and rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jun 2006 03:24:21 -0000	1.9
+++ sources	31 Oct 2006 01:31:13 -0000	1.10
@@ -1 +1 @@
-c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2
+ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 01:45:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 18:45:27 -0700
Subject: rpms/gnome-applet-timer/devel .cvsignore, 1.3,
	1.4 gnome-applet-timer.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200610310145.k9V1jR9J011989@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11967

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.3.1 (#203234)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 14:44:55 -0000	1.3
+++ .cvsignore	31 Oct 2006 01:44:57 -0000	1.4
@@ -1 +1 @@
-timer-applet-1.2.tar.gz
+timer-applet-1.3.1.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-timer.spec	15 Sep 2006 10:05:35 -0000	1.6
+++ gnome-applet-timer.spec	31 Oct 2006 01:44:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -9,11 +9,12 @@
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel >= 2.6, gettext, scrollkeeper, perl(XML::Parser)
+BuildRequires:  gnome-panel-devel >= 2.6, libnotify-devel >= 0.3.0
+BuildRequires:  gettext, perl(XML::Parser), scrollkeeper
 Provides:       timer-applet = %{version}
 Requires(pre):  GConf2
 Requires(post): GConf2, scrollkeeper
-Requires(preun):  GConf2
+Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
 %description
@@ -53,7 +54,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 
@@ -61,7 +61,6 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-killall -HUP gconfd-2 || :
 
 scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || :
 
@@ -70,7 +69,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 %postun
@@ -89,6 +87,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Tue Oct 31 2006 Christoph Wickert <fedora wickert at arcor de> - 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
 - Mass rebuild for Fedora Core 6.
 - BuildRequire perl(XML::Parser).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 14:44:55 -0000	1.3
+++ sources	31 Oct 2006 01:44:57 -0000	1.4
@@ -1 +1 @@
-00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz
+6c7f36c41bd8d7a86c055bfdf42f1493  timer-applet-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 02:02:21 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 19:02:21 -0700
Subject: rpms/xfce4-genmon-plugin/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-genmon-plugin.spec, 1.5, 1.6
Message-ID: <200610310202.k9V22Lqb015009@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14987

Modified Files:
	.cvsignore sources xfce4-genmon-plugin.spec 
Log Message:
update to 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 12:18:36 -0000	1.3
+++ .cvsignore	31 Oct 2006 02:01:51 -0000	1.4
@@ -1 +1 @@
-xfce4-genmon-plugin-2.0.tar.bz2
+xfce4-genmon-plugin-3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 12:18:36 -0000	1.3
+++ sources	31 Oct 2006 02:01:51 -0000	1.4
@@ -1 +1 @@
-c859720637f943032545d7b1428aa0b4  xfce4-genmon-plugin-2.0.tar.bz2
+e44c78dab7a2856b76d5a1d8c9e6ebf2  xfce4-genmon-plugin-3.0.tar.bz2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-6/xfce4-genmon-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-genmon-plugin.spec	5 Oct 2006 12:18:36 -0000	1.5
+++ xfce4-genmon-plugin.spec	31 Oct 2006 02:01:51 -0000	1.6
@@ -1,16 +1,17 @@
 Name:		xfce4-genmon-plugin
-Version:	2.0
-Release:	3%{?dist}
+Version:	3.0
+Release:	1%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	LGPL
-URL:		http://goodies.xfce.org/
+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)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	xfce4-dev-tools
 Requires:	xfce4-panel >= 4.3.99.1
 
 %description
@@ -21,23 +22,29 @@
 %setup -q
 
 %build
+xdt-autogen
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Tue Oct 31 02:11:51 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 19:11:51 -0700
Subject: rpms/gnome-applet-timer/FC-6 .cvsignore, 1.3,
	1.4 gnome-applet-timer.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200610310211.k9V2BptQ015147@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.3.1 (#203234)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 14:44:55 -0000	1.3
+++ .cvsignore	31 Oct 2006 02:11:21 -0000	1.4
@@ -1 +1 @@
-timer-applet-1.2.tar.gz
+timer-applet-1.3.1.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-6/gnome-applet-timer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-timer.spec	15 Sep 2006 10:05:35 -0000	1.6
+++ gnome-applet-timer.spec	31 Oct 2006 02:11:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -9,11 +9,12 @@
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel >= 2.6, gettext, scrollkeeper, perl(XML::Parser)
+BuildRequires:  gnome-panel-devel >= 2.6, libnotify-devel >= 0.3.0
+BuildRequires:  gettext, perl(XML::Parser), scrollkeeper
 Provides:       timer-applet = %{version}
 Requires(pre):  GConf2
 Requires(post): GConf2, scrollkeeper
-Requires(preun):  GConf2
+Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
 %description
@@ -53,7 +54,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 
@@ -61,7 +61,6 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-killall -HUP gconfd-2 || :
 
 scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || :
 
@@ -70,7 +69,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 %postun
@@ -89,6 +87,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Tue Oct 31 2006 Christoph Wickert <fedora wickert at arcor de> - 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
 - Mass rebuild for Fedora Core 6.
 - BuildRequire perl(XML::Parser).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 14:44:55 -0000	1.3
+++ sources	31 Oct 2006 02:11:21 -0000	1.4
@@ -1 +1 @@
-00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz
+6c7f36c41bd8d7a86c055bfdf42f1493  timer-applet-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 04:43:54 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 30 Oct 2006 21:43:54 -0700
Subject: rpms/jd/devel .cvsignore, 1.8, 1.9 jd.spec, 1.15, 1.16 sources, 1.8,
	1.9 jd-1.8.0-cvs061028-support-x86_64.patch, 1.1, NONE
Message-ID: <200610310443.k9V4hsWP022653@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22633

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* Mon Oct 30 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.4.cvs061030
- cvs 061030 (25:15 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Oct 2006 16:10:09 -0000	1.8
+++ .cvsignore	31 Oct 2006 04:43:24 -0000	1.9
@@ -1 +1 @@
-jd-1.8.0-cvs061028.tgz
+jd-1.8.0-cvs061030.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jd.spec	28 Oct 2006 17:12:05 -0000	1.15
+++ jd.spec	31 Oct 2006 04:43:24 -0000	1.16
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061028
+%define         strtag        cvs061030
 %define         repoid        22352
 
 
@@ -20,7 +20,6 @@
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
-%define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
 
@@ -45,8 +44,7 @@
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
 #Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:        %{name}-%{main_ver}-%{strtag}.tgz
-Patch0:         jd-1.8.0-cvs061028-support-x86_64.patch
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -62,7 +60,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -85,8 +82,6 @@
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --remove-category X-Red-Hat-Base \
-   --remove-category Application \
    %{name}.desktop
 
 %clean
@@ -108,10 +103,11 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Oct 30 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.4.cvs061030
+- cvs 061030 (25:15 JST)
+
 * 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.
-
-* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.cvs061028
 - 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Oct 2006 16:10:09 -0000	1.8
+++ sources	31 Oct 2006 04:43:24 -0000	1.9
@@ -1 +1 @@
-6845b0b020e62f5708ddbd594c7db4f6  jd-1.8.0-cvs061028.tgz
+5810c2bb6cb4b6ff8cc84000eb0c166a  jd-1.8.0-cvs061030.tgz


--- jd-1.8.0-cvs061028-support-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 10:10:16 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 31 Oct 2006 03:10:16 -0700
Subject: rpms/yakuake/devel yakuake-getSessionName.diff, NONE,
	1.1 yakuake.spec, 1.4, 1.5
Message-ID: <200610311010.k9VAAGCa009333@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/yakuake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9306

Modified Files:
	yakuake.spec 
Added Files:
	yakuake-getSessionName.diff 
Log Message:
Add support for KonsoleScripts (#212862)

yakuake-getSessionName.diff:

--- NEW FILE yakuake-getSessionName.diff ---
diff -ur yakuake-2.7.5/yakuake/src/dcop_interface.h yakuake-2.7.5-patched/yakuake/src/dcop_interface.h
--- yakuake-2.7.5/yakuake/src/dcop_interface.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/dcop_interface.h	2006-08-08 14:10:16.721056702 +0300
@@ -43,6 +43,8 @@
     virtual void    slotToggleState() = 0;
 
     virtual void    slotRenameSession(int id, const QString & name) = 0;
+
+	virtual QString slotSessionName(int id) = 0;
     virtual void    slotSetSessionTitleText(int id, const QString & name) = 0;
     virtual void    slotRunCommandInSession(int id, const QString & value) = 0;
 };
diff -ur yakuake-2.7.5/yakuake/src/main_window.cpp yakuake-2.7.5-patched/yakuake/src/main_window.cpp
--- yakuake-2.7.5/yakuake/src/main_window.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.cpp	2006-08-08 14:12:08.191976212 +0300
@@ -290,6 +290,16 @@
 
 
 /******************************************************************************
+** Gets caption from an item given its id
+*********************************/
+
+QString MainWindow::slotSessionName(int id)
+{
+	return tabs_bar->getCaption(id);
+}
+
+
+/******************************************************************************
 ** Open inline edit for the current item and show tab bar if necessary
 ************************************************************************/
 
diff -ur yakuake-2.7.5/yakuake/src/main_window.h yakuake-2.7.5-patched/yakuake/src/main_window.h
--- yakuake-2.7.5/yakuake/src/main_window.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.h	2006-08-08 14:06:43.891845419 +0300
@@ -280,6 +280,7 @@
     void    slotPasteClipboard();
 
     void    slotRenameSession(int id, const QString & name);
+	QString slotSessionName(int id);
     void    slotInteractiveRename();
     void    slotSetSessionTitleText(int id, const QString & name);
     void    slotRunCommandInSession(int id, const QString & value);
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.cpp yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp
--- yakuake-2.7.5/yakuake/src/tabbed_widget.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp	2006-08-08 13:59:13.379880079 +0300
@@ -157,6 +157,18 @@
 
 
 /******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString    TabbedWidget::getCaption(int id)
+{
+    int index = items.findIndex(id);
+
+    return captions[index];
+}
+
+
+/******************************************************************************
 ** Open inline edit for the current item
 ******************************************/
 
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.h yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h
--- yakuake-2.7.5/yakuake/src/tabbed_widget.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h	2006-08-08 14:08:45.551397384 +0300
@@ -145,6 +145,7 @@
     void    selectPreviousItem();
 
     void    renameItem(int id, const QString & name);
+	QString getCaption(int id);
     void    interactiveRename();
 
     void    setFontColor(const QColor & color);
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.cpp yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp
--- yakuake-2.7.5/yakuake/src/tabs_bar.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp	2006-08-08 14:14:43.405611033 +0300
@@ -86,6 +86,16 @@
     tabs_widget->renameItem(id, name);
 }
 
+/******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString    TabsBar::getCaption(int id)
+{
+    return tabs_widget->getCaption(id);
+}
+
+
 
 /******************************************************************************
 ** Open inline edit for the current item
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.h yakuake-2.7.5-patched/yakuake/src/tabs_bar.h
--- yakuake-2.7.5/yakuake/src/tabs_bar.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.h	2006-08-08 14:15:04.210902512 +0300
@@ -127,6 +127,7 @@
     int     removeItem(int id);
 
     void    renameItem(int id, const QString & name);
+	QString getCaption(int id);
     void    interactiveRename();
 
 


Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yakuake.spec	15 Sep 2006 13:27:15 -0000	1.4
+++ yakuake.spec	31 Oct 2006 10:09:46 -0000	1.5
@@ -1,12 +1,14 @@
 Name:           yakuake
 Version:        2.7.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Terminal emulator for KDE
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://extragear.kde.org/apps/yakuake/
 Source0:        http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2
+# http://www.kde-look.org/content/download.php?content=43873&id=2
+Patch0:         http://ota.tr.spt.fi/~fisu81/stuff/konsolescripts/yakuake-getSessionName.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -19,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -79,6 +82,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.7.5-4
+- Add support for KonsoleScripts (#212862)
+
 * Fri Sep 15 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.7.5-3
 - Rebuild for FE6
 - Update e-mail address



From fedora-extras-commits at redhat.com  Tue Oct 31 10:54:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 03:54:58 -0700
Subject: rpms/childsplay_plugins/devel
	childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.1,
	1.2 childsplay_plugins.spec, 1.4,
	1.5 childsplay_plugins-0.80.8-assetml.patch, 1.2, NONE
Message-ID: <200610311054.k9VAsw0H009718@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9677

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Removed Files:
	childsplay_plugins-0.80.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	11 May 2006 18:18:46 -0000	1.1
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 10:54:28 -0000	1.2
@@ -4,10 +4,10 @@
      def _setup(self):
          """ Set all the stuff we need"""
          #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
--        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
--        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
-+        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
-+        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
+-        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
+-        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
          if not os.path.exists(self.sounddir):
 -            self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
 +            self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- childsplay_plugins.spec	6 Sep 2006 14:05:45 -0000	1.4
+++ childsplay_plugins.spec	31 Oct 2006 10:54:28 -0000	1.5
@@ -1,16 +1,15 @@
 Name:           childsplay_plugins
-Version:        0.83
-Release:        2%{?dist}
+Version:        0.84
+Release:        1%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
 License:        GPL
 URL:            http://childsplay.sourceforge.net/
 Source:         http://dl.sf.net/sourceforge/childsplay/%{name}-%{version}.tgz
 Patch0:         childsplay_plugins-0.80.7-alphabet-sounds.patch
-Patch1:         childsplay_plugins-0.80.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       childsplay >= 0.83
+Requires:       childsplay >= 0.84
 
 %description
 Plugins (games) for Childsplay a suite of educational games for young
@@ -21,7 +20,6 @@
 %setup -q
 # no backups otherwise the backups endup in the rpm.
 %patch0 -p1
-%patch1 -p1
 # the translation is merged into the assetml file, so don't ship it seperatly
 rm -r assetml/childsplay/sounds-misc/po
 
@@ -35,12 +33,9 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay
-mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
 
 
 %clean
@@ -51,10 +46,14 @@
 %defattr(-, root, root, -)
 %doc README*
 %{_datadir}/childsplay
-%{_datadir}/assetml
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
+- New upstream release 0.84
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
 - Don't %%ghost the .pyo files (bug 205370)
 


--- childsplay_plugins-0.80.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 10:55:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 03:55:23 -0700
Subject: rpms/childsplay/devel childsplay.spec, 1.6, 1.7 sources, 1.4,
	1.5 childsplay-0.81.8-assetml.patch, 1.2, NONE
Message-ID: <200610311055.k9VAtNne009722@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9700

Modified Files:
	childsplay.spec sources 
Removed Files:
	childsplay-0.81.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- childsplay.spec	22 Sep 2006 09:39:06 -0000	1.6
+++ childsplay.spec	31 Oct 2006 10:54:52 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           childsplay
-Version:        0.83.1
+Version:        0.84.1
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -8,11 +8,10 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Patch0:         childsplay-0.81.8-highscore.patch
-Patch1:         childsplay-0.81.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
-Requires:       pygame, childsplay_plugins >= 0.83
+Requires:       pygame, childsplay_plugins >= 0.84, hicolor-icon-theme
 
 %description
 Childsplay is a suite of educational games for young children. It's written in
@@ -27,8 +26,6 @@
 %prep
 %setup -q
 %patch0 -p1 -z .highscore
-# no backups otherwise the backups endup in the rpm.
-%patch1 -p1
 # we don't use the buggy provided install
 rm install.py
 # the translation is merged into the assetml file, so don't ship it seperatly
@@ -49,7 +46,7 @@
 echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
 echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py
 echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py
-echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py
+echo "ASSETMLDIR=\"%{_datadir}\"" >> BASEPATH.py
 echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py
 echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py
 
@@ -59,7 +56,6 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 cp -a *.py  $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -68,9 +64,7 @@
   $RPM_BUILD_ROOT%{_bindir}/letters-trans
 cp -a Data  $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
+cp -a assetml/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6
 
@@ -115,14 +109,18 @@
 %doc README* doc/GPL* doc/README* License_*.ttf.txt
 %{_bindir}/%{name}
 %{_bindir}/letters-trans
-%{_datadir}/childsplay
-%{_datadir}/assetml
+%{_datadir}/%{name}
 %{_mandir}/man6/*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
+- New upstream release 0.84.1
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83.1-1
 - New upstream release 0.83.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Sep 2006 09:39:55 -0000	1.4
+++ sources	31 Oct 2006 10:54:52 -0000	1.5
@@ -1 +1 @@
-bdcd090f0adcd992c62a60ef39819e14  childsplay-0.83.1.tgz
+ae4e26a361b12d88b2d597a57568ac5e  childsplay-0.84.1.tgz


--- childsplay-0.81.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:06 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 31 Oct 2006 04:02:06 -0700
Subject: rpms/amarok/FC-5 .cvsignore, 1.27, 1.28 amarok.spec, 1.62,
	1.63 sources, 1.27, 1.28
Message-ID: <200610311102.k9VB26K5012865@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12694/FC-5

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Sep 2006 13:27:07 -0000	1.27
+++ .cvsignore	31 Oct 2006 11:01:33 -0000	1.28
@@ -1 +1 @@
-amarok-1.4.3.tar.bz2
+amarok-1.4.4.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- amarok.spec	7 Oct 2006 09:01:50 -0000	1.62
+++ amarok.spec	31 Oct 2006 11:01:33 -0000	1.63
@@ -1,18 +1,16 @@
-# The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
-# than to include the unfinished gstreamer engine (private mail following
-# http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
+# TODO:
+# Rio Karma support : libkarma
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.3
-Release:    6%{?dist}
+Version:    1.4.4
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
-Patch0:     amarok-1.4.3-playlist_encoding.patch
+Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -26,6 +24,7 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  xine-lib-devel
 # Detected by configure
 BuildRequires:  ruby, ruby-devel
 BuildRequires:  libifp-devel, libusb-devel
@@ -43,8 +42,6 @@
 %endif
 
 Requires:  ruby
-# Helix is the only available engine
-Requires:  HelixPlayer
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -52,10 +49,6 @@
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 Provides:  amarok-devel = %{version}-%{release}
 
-# On those archs, there is no engine 
-# (Helix is unavailable, gstreamer is in beta, xine is encumbered)
-ExcludeArch: ppc64 x86_64 s390 s390x ia64
-
 
 %description
 Amarok is a KDE multimedia player with:
@@ -87,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .playlist_encoding
 
 
 
@@ -104,7 +96,6 @@
      --with-ifp \
      --with-libgpod \
      --without-mp4v2 \
-     --without-xine \
 %ifnarch ppc64 x86_64 s390 s390x ia64
      --with-helix=%{_libdir}/helix \
 %endif
@@ -179,7 +170,6 @@
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/%{name}
-%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
@@ -193,6 +183,7 @@
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
 %{_libdir}/kde3/libamarok_daap-mediadevice.*
@@ -224,6 +215,9 @@
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+# Xine engine
+%{_datadir}/services/amarok_xine-engine.desktop
+%{_libdir}/kde3/libamarok_xine-engine.*
 ## Gstreamer engine
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
@@ -244,6 +238,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-1
+- version 1.4.4
+- enable xine support since xine is now in Fedora
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
 - rebuild for new libtunepimp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Sep 2006 13:27:07 -0000	1.27
+++ sources	31 Oct 2006 11:01:33 -0000	1.28
@@ -1 +1 @@
-b0b4f8952ad23705c70815d50fd0af52  amarok-1.4.3.tar.bz2
+56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 31 Oct 2006 04:02:12 -0700
Subject: rpms/amarok/FC-6 .cvsignore, 1.27, 1.28 amarok.spec, 1.63,
	1.64 sources, 1.27, 1.28
Message-ID: <200610311102.k9VB2C1S012870@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12694/FC-6

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Sep 2006 13:27:07 -0000	1.27
+++ .cvsignore	31 Oct 2006 11:01:42 -0000	1.28
@@ -1 +1 @@
-amarok-1.4.3.tar.bz2
+amarok-1.4.4.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- amarok.spec	7 Oct 2006 09:01:54 -0000	1.63
+++ amarok.spec	31 Oct 2006 11:01:42 -0000	1.64
@@ -1,18 +1,16 @@
-# The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
-# than to include the unfinished gstreamer engine (private mail following
-# http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
+# TODO:
+# Rio Karma support : libkarma
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.3
-Release:    6%{?dist}
+Version:    1.4.4
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
-Patch0:     amarok-1.4.3-playlist_encoding.patch
+Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -26,6 +24,7 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  xine-lib-devel
 # Detected by configure
 BuildRequires:  ruby, ruby-devel
 BuildRequires:  libifp-devel, libusb-devel
@@ -43,8 +42,6 @@
 %endif
 
 Requires:  ruby
-# Helix is the only available engine
-Requires:  HelixPlayer
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -52,10 +49,6 @@
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 Provides:  amarok-devel = %{version}-%{release}
 
-# On those archs, there is no engine 
-# (Helix is unavailable, gstreamer is in beta, xine is encumbered)
-ExcludeArch: ppc64 x86_64 s390 s390x ia64
-
 
 %description
 Amarok is a KDE multimedia player with:
@@ -87,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .playlist_encoding
 
 
 
@@ -104,7 +96,6 @@
      --with-ifp \
      --with-libgpod \
      --without-mp4v2 \
-     --without-xine \
 %ifnarch ppc64 x86_64 s390 s390x ia64
      --with-helix=%{_libdir}/helix \
 %endif
@@ -179,7 +170,6 @@
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/%{name}
-%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
@@ -193,6 +183,7 @@
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
 %{_libdir}/kde3/libamarok_daap-mediadevice.*
@@ -224,6 +215,9 @@
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+# Xine engine
+%{_datadir}/services/amarok_xine-engine.desktop
+%{_libdir}/kde3/libamarok_xine-engine.*
 ## Gstreamer engine
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
@@ -244,6 +238,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-1
+- version 1.4.4
+- enable xine support since xine is now in Fedora
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
 - rebuild for new libtunepimp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Sep 2006 13:27:07 -0000	1.27
+++ sources	31 Oct 2006 11:01:42 -0000	1.28
@@ -1 +1 @@
-b0b4f8952ad23705c70815d50fd0af52  amarok-1.4.3.tar.bz2
+56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:15 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 31 Oct 2006 04:02:15 -0700
Subject: rpms/amarok/devel .cvsignore, 1.27, 1.28 amarok.spec, 1.63,
	1.64 sources, 1.27, 1.28
Message-ID: <200610311102.k9VB2FSL012875@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12694/devel

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Sep 2006 13:27:07 -0000	1.27
+++ .cvsignore	31 Oct 2006 11:01:45 -0000	1.28
@@ -1 +1 @@
-amarok-1.4.3.tar.bz2
+amarok-1.4.4.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- amarok.spec	7 Oct 2006 09:01:54 -0000	1.63
+++ amarok.spec	31 Oct 2006 11:01:45 -0000	1.64
@@ -1,18 +1,16 @@
-# The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
-# than to include the unfinished gstreamer engine (private mail following
-# http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
+# TODO:
+# Rio Karma support : libkarma
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.3
-Release:    6%{?dist}
+Version:    1.4.4
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
-Patch0:     amarok-1.4.3-playlist_encoding.patch
+Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -26,6 +24,7 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  xine-lib-devel
 # Detected by configure
 BuildRequires:  ruby, ruby-devel
 BuildRequires:  libifp-devel, libusb-devel
@@ -43,8 +42,6 @@
 %endif
 
 Requires:  ruby
-# Helix is the only available engine
-Requires:  HelixPlayer
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -52,10 +49,6 @@
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 Provides:  amarok-devel = %{version}-%{release}
 
-# On those archs, there is no engine 
-# (Helix is unavailable, gstreamer is in beta, xine is encumbered)
-ExcludeArch: ppc64 x86_64 s390 s390x ia64
-
 
 %description
 Amarok is a KDE multimedia player with:
@@ -87,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .playlist_encoding
 
 
 
@@ -104,7 +96,6 @@
      --with-ifp \
      --with-libgpod \
      --without-mp4v2 \
-     --without-xine \
 %ifnarch ppc64 x86_64 s390 s390x ia64
      --with-helix=%{_libdir}/helix \
 %endif
@@ -179,7 +170,6 @@
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/%{name}
-%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
@@ -193,6 +183,7 @@
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
 %{_libdir}/kde3/libamarok_daap-mediadevice.*
@@ -224,6 +215,9 @@
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+# Xine engine
+%{_datadir}/services/amarok_xine-engine.desktop
+%{_libdir}/kde3/libamarok_xine-engine.*
 ## Gstreamer engine
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
@@ -244,6 +238,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-1
+- version 1.4.4
+- enable xine support since xine is now in Fedora
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
 - rebuild for new libtunepimp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Sep 2006 13:27:07 -0000	1.27
+++ sources	31 Oct 2006 11:01:45 -0000	1.28
@@ -1 +1 @@
-b0b4f8952ad23705c70815d50fd0af52  amarok-1.4.3.tar.bz2
+56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:02:53 -0700
Subject: rpms/childsplay_plugins/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610311102.k9VB2rns012922@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12883

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2006 12:19:51 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:02:23 -0000	1.5
@@ -1 +1 @@
-childsplay_plugins-0.83.tgz
+childsplay_plugins-0.84.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2006 12:19:51 -0000	1.4
+++ sources	31 Oct 2006 11:02:23 -0000	1.5
@@ -1 +1 @@
-81355e87ee3968107305642333e253cf  childsplay_plugins-0.83.tgz
+573c1d60506143d68070e309c9009c20  childsplay_plugins-0.84.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:57 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:02:57 -0700
Subject: rpms/childsplay/devel .cvsignore,1.4,1.5
Message-ID: <200610311102.k9VB2v2G012925@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12896

Modified Files:
	.cvsignore 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Sep 2006 09:39:55 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:02:25 -0000	1.5
@@ -1 +1 @@
-childsplay-0.83.1.tgz
+childsplay-0.84.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:07:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:07:32 -0700
Subject: rpms/childsplay_plugins/FC-6
	childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.1,
	1.2 childsplay_plugins.spec, 1.4,
	1.5 childsplay_plugins-0.80.8-assetml.patch, 1.2, NONE
Message-ID: <200610311107.k9VB7W9w015152@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15074

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Removed Files:
	childsplay_plugins-0.80.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	11 May 2006 18:18:46 -0000	1.1
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 11:07:02 -0000	1.2
@@ -4,10 +4,10 @@
      def _setup(self):
          """ Set all the stuff we need"""
          #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
--        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
--        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
-+        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
-+        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
+-        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
+-        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
          if not os.path.exists(self.sounddir):
 -            self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
 +            self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/childsplay_plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- childsplay_plugins.spec	6 Sep 2006 14:05:45 -0000	1.4
+++ childsplay_plugins.spec	31 Oct 2006 11:07:02 -0000	1.5
@@ -1,16 +1,15 @@
 Name:           childsplay_plugins
-Version:        0.83
-Release:        2%{?dist}
+Version:        0.84
+Release:        1%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
 License:        GPL
 URL:            http://childsplay.sourceforge.net/
 Source:         http://dl.sf.net/sourceforge/childsplay/%{name}-%{version}.tgz
 Patch0:         childsplay_plugins-0.80.7-alphabet-sounds.patch
-Patch1:         childsplay_plugins-0.80.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       childsplay >= 0.83
+Requires:       childsplay >= 0.84
 
 %description
 Plugins (games) for Childsplay a suite of educational games for young
@@ -21,7 +20,6 @@
 %setup -q
 # no backups otherwise the backups endup in the rpm.
 %patch0 -p1
-%patch1 -p1
 # the translation is merged into the assetml file, so don't ship it seperatly
 rm -r assetml/childsplay/sounds-misc/po
 
@@ -35,12 +33,9 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay
-mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
 
 
 %clean
@@ -51,10 +46,14 @@
 %defattr(-, root, root, -)
 %doc README*
 %{_datadir}/childsplay
-%{_datadir}/assetml
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
+- New upstream release 0.84
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
 - Don't %%ghost the .pyo files (bug 205370)
 


--- childsplay_plugins-0.80.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:07:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:07:38 -0700
Subject: rpms/childsplay/FC-6 childsplay.spec, 1.6,
	1.7 childsplay-0.81.8-assetml.patch, 1.2, NONE
Message-ID: <200610311107.k9VB7cRn015184@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15097

Modified Files:
	childsplay.spec 
Removed Files:
	childsplay-0.81.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-6/childsplay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- childsplay.spec	22 Sep 2006 09:39:06 -0000	1.6
+++ childsplay.spec	31 Oct 2006 11:07:07 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           childsplay
-Version:        0.83.1
+Version:        0.84.1
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -8,11 +8,10 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Patch0:         childsplay-0.81.8-highscore.patch
-Patch1:         childsplay-0.81.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
-Requires:       pygame, childsplay_plugins >= 0.83
+Requires:       pygame, childsplay_plugins >= 0.84, hicolor-icon-theme
 
 %description
 Childsplay is a suite of educational games for young children. It's written in
@@ -27,8 +26,6 @@
 %prep
 %setup -q
 %patch0 -p1 -z .highscore
-# no backups otherwise the backups endup in the rpm.
-%patch1 -p1
 # we don't use the buggy provided install
 rm install.py
 # the translation is merged into the assetml file, so don't ship it seperatly
@@ -49,7 +46,7 @@
 echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
 echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py
 echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py
-echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py
+echo "ASSETMLDIR=\"%{_datadir}\"" >> BASEPATH.py
 echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py
 echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py
 
@@ -59,7 +56,6 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 cp -a *.py  $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -68,9 +64,7 @@
   $RPM_BUILD_ROOT%{_bindir}/letters-trans
 cp -a Data  $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
+cp -a assetml/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6
 
@@ -115,14 +109,18 @@
 %doc README* doc/GPL* doc/README* License_*.ttf.txt
 %{_bindir}/%{name}
 %{_bindir}/letters-trans
-%{_datadir}/childsplay
-%{_datadir}/assetml
+%{_datadir}/%{name}
 %{_mandir}/man6/*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
+- New upstream release 0.84.1
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83.1-1
 - New upstream release 0.83.1
 


--- childsplay-0.81.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:08:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:08:43 -0700
Subject: rpms/childsplay/FC-5 childsplay.spec, 1.4,
	1.5 childsplay-0.81.8-assetml.patch, 1.2, NONE
Message-ID: <200610311108.k9VB8hTQ015292@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15249

Modified Files:
	childsplay.spec 
Removed Files:
	childsplay-0.81.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-5/childsplay.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- childsplay.spec	27 Aug 2006 12:20:56 -0000	1.4
+++ childsplay.spec	31 Oct 2006 11:08:13 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           childsplay
-Version:        0.83
+Version:        0.84.1
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -8,11 +8,10 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Patch0:         childsplay-0.81.8-highscore.patch
-Patch1:         childsplay-0.81.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
-Requires:       pygame, childsplay_plugins >= 0.83
+Requires:       pygame, childsplay_plugins >= 0.84, hicolor-icon-theme
 
 %description
 Childsplay is a suite of educational games for young children. It's written in
@@ -27,8 +26,6 @@
 %prep
 %setup -q
 %patch0 -p1 -z .highscore
-# no backups otherwise the backups endup in the rpm.
-%patch1 -p1
 # we don't use the buggy provided install
 rm install.py
 # the translation is merged into the assetml file, so don't ship it seperatly
@@ -49,7 +46,7 @@
 echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
 echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py
 echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py
-echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py
+echo "ASSETMLDIR=\"%{_datadir}\"" >> BASEPATH.py
 echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py
 echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py
 
@@ -59,7 +56,6 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 cp -a *.py  $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -68,9 +64,7 @@
   $RPM_BUILD_ROOT%{_bindir}/letters-trans
 cp -a Data  $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
+cp -a assetml/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6
 
@@ -115,26 +109,24 @@
 %doc README* doc/GPL* doc/README* License_*.ttf.txt
 %{_bindir}/%{name}
 %{_bindir}/letters-trans
-%dir %{_datadir}/childsplay
-%{_datadir}/childsplay/*.py
-%{_datadir}/childsplay/*.pyc
-%ghost %{_datadir}/childsplay/*.pyo
-%{_datadir}/childsplay/Data
-%{_datadir}/childsplay/childsplay-images
-%{_datadir}/childsplay/childsplay-sounds
-%{_datadir}/childsplay/memory-136x136
-%dir %{_datadir}/childsplay/plugins
-%{_datadir}/childsplay/plugins/*.py
-%{_datadir}/childsplay/plugins/*.pyc
-%ghost %{_datadir}/childsplay/plugins/*.pyo
-%{_datadir}/childsplay/plugins/*Data
-%{_datadir}/assetml
+%{_datadir}/%{name}
 %{_mandir}/man6/*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
+- New upstream release 0.84.1
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
+* Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83.1-1
+- New upstream release 0.83.1
+
+* Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
+- Don't %%ghost the .pyo files (bug 205370)
+
 * Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-1
 - New upstream version 0.83
 


--- childsplay-0.81.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:08:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:08:45 -0700
Subject: rpms/childsplay_plugins/FC-5
	childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.1,
	1.2 childsplay_plugins.spec, 1.3,
	1.4 childsplay_plugins-0.80.8-assetml.patch, 1.2, NONE
Message-ID: <200610311108.k9VB8jMI015296@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15266

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Removed Files:
	childsplay_plugins-0.80.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	11 May 2006 18:18:46 -0000	1.1
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 11:08:15 -0000	1.2
@@ -4,10 +4,10 @@
      def _setup(self):
          """ Set all the stuff we need"""
          #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
--        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
--        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
-+        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
-+        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
+-        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
+-        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
          if not os.path.exists(self.sounddir):
 -            self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
 +            self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/childsplay_plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- childsplay_plugins.spec	27 Aug 2006 12:20:34 -0000	1.3
+++ childsplay_plugins.spec	31 Oct 2006 11:08:15 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           childsplay_plugins
-Version:        0.83
+Version:        0.84
 Release:        1%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
@@ -7,10 +7,9 @@
 URL:            http://childsplay.sourceforge.net/
 Source:         http://dl.sf.net/sourceforge/childsplay/%{name}-%{version}.tgz
 Patch0:         childsplay_plugins-0.80.7-alphabet-sounds.patch
-Patch1:         childsplay_plugins-0.80.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       childsplay >= 0.83
+Requires:       childsplay >= 0.84
 
 %description
 Plugins (games) for Childsplay a suite of educational games for young
@@ -21,7 +20,6 @@
 %setup -q
 # no backups otherwise the backups endup in the rpm.
 %patch0 -p1
-%patch1 -p1
 # the translation is merged into the assetml file, so don't ship it seperatly
 rm -r assetml/childsplay/sounds-misc/po
 
@@ -35,12 +33,9 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay
-mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
 
 
 %clean
@@ -50,18 +45,18 @@
 %files
 %defattr(-, root, root, -)
 %doc README*
-%dir %{_datadir}/childsplay
-%dir %{_datadir}/childsplay/plugins
-%{_datadir}/childsplay/plugins/*.py
-%{_datadir}/childsplay/plugins/*.pyc
-%ghost %{_datadir}/childsplay/plugins/*.pyo
-%{_datadir}/childsplay/plugins/*Data
-%{_datadir}/childsplay/plugins/SoundMemory
-%{_datadir}/childsplay/Data
-%{_datadir}/childsplay/sounds-misc
-%{_datadir}/assetml/*
+%{_datadir}/childsplay
+
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
+- New upstream release 0.84
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
+* Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
+- Don't %%ghost the .pyo files (bug 205370)
+
 * Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-1
 - New upstream version 0.83
 


--- childsplay_plugins-0.80.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:09:56 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 31 Oct 2006 04:09:56 -0700
Subject: rpms/revelation/devel revelation.spec,1.19,1.20
Message-ID: <200610311109.k9VB9uTW015372@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15316

Modified Files:
	revelation.spec 
Log Message:
0.4.7-6 -- track rawhide and BR gnome-python2-devel and cracklib-devel


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- revelation.spec	8 Sep 2006 17:34:29 -0000	1.19
+++ revelation.spec	31 Oct 2006 11:09:25 -0000	1.20
@@ -4,7 +4,7 @@
 Summary:	Password manager for GNOME 2
 Name:		revelation
 Version:	0.4.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Source0:	ftp://oss.codepoet.no/revelation/revelation-0.4.7.tar.bz2
@@ -19,12 +19,13 @@
 BuildRequires:	python >= 2.2
 BuildRequires:	python-devel >= 2.3
 BuildRequires:	pygtk2-devel >= 2.4
+BuildRequires:	gnome-python2-devel >= 2.5
 BuildRequires:	gnome-python2-gconf >= 2.0
 BuildRequires:	libgnomeui-devel >= 2.8
 BuildRequires:	gnome-keyring-devel >= 0.4.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	python-crypto >= 2.0
-BuildRequires:	cracklib
+BuildRequires:	cracklib-devel
 BuildRequires:	cracklib-dicts
 BuildRequires:	gnome-panel-devel gnome-python2-extras gnome-python2-desktop
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
@@ -102,6 +103,9 @@
 %{_libexecdir}/revelation-applet
 
 %changelog
+* Thu Oct 31 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.4.7-6
+- track rawhide and BR gnome-python2-devel and cracklib-devel
+
 * Thu Sep 07 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.4.7-5
 - Don't ghost pyo files (#205432)
 



From fedora-extras-commits at redhat.com  Tue Oct 31 11:10:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:10:10 -0700
Subject: rpms/childsplay/FC-5 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200610311110.k9VBAAvZ015419@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15335

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Aug 2006 12:20:56 -0000	1.3
+++ .cvsignore	31 Oct 2006 11:09:40 -0000	1.4
@@ -1 +1 @@
-childsplay-0.83.tgz
+childsplay-0.84.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Aug 2006 12:20:56 -0000	1.3
+++ sources	31 Oct 2006 11:09:40 -0000	1.4
@@ -1 +1 @@
-037aafb0a3ca8b16a596c06a9074cc20  childsplay-0.83.tgz
+ae4e26a361b12d88b2d597a57568ac5e  childsplay-0.84.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:10:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:10:16 -0700
Subject: rpms/childsplay_plugins/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610311110.k9VBAGTU015454@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15355

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2006 12:20:34 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:09:46 -0000	1.5
@@ -1 +1 @@
-childsplay_plugins-0.83.tgz
+childsplay_plugins-0.84.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2006 12:20:34 -0000	1.4
+++ sources	31 Oct 2006 11:09:46 -0000	1.5
@@ -1 +1 @@
-81355e87ee3968107305642333e253cf  childsplay_plugins-0.83.tgz
+573c1d60506143d68070e309c9009c20  childsplay_plugins-0.84.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:15:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:15:54 -0700
Subject: rpms/childsplay/FC-6 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610311115.k9VBFsRF015600@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15562

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Sep 2006 09:39:55 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:15:24 -0000	1.5
@@ -1 +1 @@
-childsplay-0.83.1.tgz
+childsplay-0.84.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Sep 2006 09:39:55 -0000	1.4
+++ sources	31 Oct 2006 11:15:24 -0000	1.5
@@ -1 +1 @@
-bdcd090f0adcd992c62a60ef39819e14  childsplay-0.83.1.tgz
+ae4e26a361b12d88b2d597a57568ac5e  childsplay-0.84.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:16:00 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:16:00 -0700
Subject: rpms/childsplay_plugins/FC-6 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610311116.k9VBG0Me015634@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15582

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2006 12:19:51 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:15:29 -0000	1.5
@@ -1 +1 @@
-childsplay_plugins-0.83.tgz
+childsplay_plugins-0.84.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2006 12:19:51 -0000	1.4
+++ sources	31 Oct 2006 11:15:29 -0000	1.5
@@ -1 +1 @@
-81355e87ee3968107305642333e253cf  childsplay_plugins-0.83.tgz
+573c1d60506143d68070e309c9009c20  childsplay_plugins-0.84.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 12:47:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 05:47:49 -0700
Subject: rpms/gtorrentviewer/devel gtorrentviewer.spec,1.9,1.10
Message-ID: <200610311247.k9VClnwQ019190@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtorrentviewer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19174

Modified Files:
	gtorrentviewer.spec 
Log Message:
rebuild for libcurl.so.4


Index: gtorrentviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/gtorrentviewer/devel/gtorrentviewer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtorrentviewer.spec	3 Oct 2006 09:38:56 -0000	1.9
+++ gtorrentviewer.spec	31 Oct 2006 12:47:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gtorrentviewer
 Version:	0.2b
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	A GTK2-based viewer and editor for BitTorrent meta files
 Group:		Applications/Internet
 License:	GPL
@@ -59,6 +59,9 @@
 %{_mandir}/man1/gtorrentviewer.1*
 
 %changelog
+* Tue Oct 30 2006 Paul Howarth <paul at city-fan.org> 0.2b-13
+- rebuild for libcurl.so.4
+
 * Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 0.2b-12
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 31 13:52:30 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 31 Oct 2006 06:52:30 -0700
Subject: rpms/international-time/FC-5 international-time.spec,1.2,1.3
Message-ID: <200610311352.k9VDqU7S022497@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22481

Modified Files:
	international-time.spec 
Log Message:
0.0.2-2.1.1


Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-5/international-time.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- international-time.spec	25 Oct 2006 10:55:05 -0000	1.2
+++ international-time.spec	31 Oct 2006 13:51:59 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: 	A tool for arranging times in advance with overseas colleagues
 Name: 		international-time
 Version: 	0.0.2
-Release: 	2%{?dist}
+Release: 	2%{?dist}.1.1
 License: 	GPL
 Group: 		Applications/System
 Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
@@ -64,7 +64,7 @@
 %{_datadir}/applications/*
 
 %changelog
-* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1.1
 - Update desktop database on installation.
 
 * Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1



From fedora-extras-commits at redhat.com  Tue Oct 31 14:08:20 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 07:08:20 -0700
Subject: rpms/abcMIDI/FC-5 .cvsignore, 1.10, 1.11 abcMIDI.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200610311408.k9VE8KwH025648@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25594/FC-5

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061027


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Oct 2006 21:44:25 -0000	1.10
+++ .cvsignore	31 Oct 2006 14:07:49 -0000	1.11
@@ -1 +1 @@
-abcMIDI-2006-10-15.zip
+abcMIDI-2006-10-27.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcMIDI.spec	16 Oct 2006 21:44:25 -0000	1.10
+++ abcMIDI.spec	31 Oct 2006 14:07:49 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061015
-Release:        1.1%{?dist}
+Version:        20061027
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061027-1
+- new version 20061027
+
 * Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
 - new version 20061015
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Oct 2006 21:44:25 -0000	1.10
+++ sources	31 Oct 2006 14:07:49 -0000	1.11
@@ -1 +1 @@
-747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip
+d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip



From fedora-extras-commits at redhat.com  Tue Oct 31 14:08:20 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 07:08:20 -0700
Subject: rpms/abcMIDI/FC-6 .cvsignore, 1.10, 1.11 abcMIDI.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <200610311408.k9VE8KqO025653@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25594/FC-6

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061027


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Oct 2006 21:25:56 -0000	1.10
+++ .cvsignore	31 Oct 2006 14:07:50 -0000	1.11
@@ -1 +1 @@
-abcMIDI-2006-10-15.zip
+abcMIDI-2006-10-27.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/abcMIDI.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- abcMIDI.spec	18 Oct 2006 20:58:58 -0000	1.12
+++ abcMIDI.spec	31 Oct 2006 14:07:50 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061015
-Release:        2%{?dist}
+Version:        20061027
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061027-1
+- new version 20061027
+
 * Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
 - new version 20061015
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Oct 2006 21:25:56 -0000	1.10
+++ sources	31 Oct 2006 14:07:50 -0000	1.11
@@ -1 +1 @@
-747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip
+d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip



From fedora-extras-commits at redhat.com  Tue Oct 31 14:08:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 07:08:21 -0700
Subject: rpms/abcMIDI/devel .cvsignore, 1.10, 1.11 abcMIDI.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <200610311408.k9VE8LYI025658@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25594/devel

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061027


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Oct 2006 21:25:56 -0000	1.10
+++ .cvsignore	31 Oct 2006 14:07:51 -0000	1.11
@@ -1 +1 @@
-abcMIDI-2006-10-15.zip
+abcMIDI-2006-10-27.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- abcMIDI.spec	18 Oct 2006 20:58:58 -0000	1.12
+++ abcMIDI.spec	31 Oct 2006 14:07:51 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061015
-Release:        2%{?dist}
+Version:        20061027
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061027-1
+- new version 20061027
+
 * Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
 - new version 20061015
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Oct 2006 21:25:56 -0000	1.10
+++ sources	31 Oct 2006 14:07:51 -0000	1.11
@@ -1 +1 @@
-747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip
+d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip



From fedora-extras-commits at redhat.com  Tue Oct 31 14:33:39 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 31 Oct 2006 07:33:39 -0700
Subject: rpms/yum-utils/FC-6 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 yum-utils.spec, 1.13, 1.14
Message-ID: <200610311433.k9VEXdAs026686@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26662

Modified Files:
	.cvsignore sources yum-utils.spec 
Log Message:

1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 03:32:28 -0000	1.6
+++ .cvsignore	31 Oct 2006 14:33:08 -0000	1.7
@@ -1 +1,2 @@
 yum-utils-1.0.tar.gz
+yum-utils-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 03:32:28 -0000	1.6
+++ sources	31 Oct 2006 14:33:08 -0000	1.7
@@ -1 +1,2 @@
 e9af7d38f47e5d2cd945790061fa5f8b  yum-utils-1.0.tar.gz
+53ba387a337b605c5490eac8229da32d  yum-utils-1.0.1.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/FC-6/yum-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yum-utils.spec	5 Oct 2006 11:47:29 -0000	1.13
+++ yum-utils.spec	31 Oct 2006 14:33:08 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.0
-Release: 2%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
@@ -120,6 +120,16 @@
 This plugin adds a --ignore-broken to yum to make it possible to
 check packages for dependency problems and skip the one with problems.
 
+%package -n yum-priorities
+Summary: plugin to give priorities to packages from different repos 
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-priorities
+This plugin allows repositories to have different priorities. 
+Packages in a repository with a lower priority can't be overridden by packages
+from a repository with a higher priority even if repo has a later version.
+
 %prep
 %setup -q
 
@@ -129,7 +139,7 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities"
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -223,7 +233,19 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf
 /usr/lib/yum-plugins/skip-broken.*
 
+%files -n yum-priorities
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf
+/usr/lib/yum-plugins/priorities.*
+
+
 %changelog
+* Tue Oct 31 2006 Tim Lauridsen <tla at rasmil.dk>
+- mark it as 1.0.1
+
+* Fri Oct 27 2006 Tim Lauridsen <tla at rasmil.dk>
+- Added priorities plugin written by Daniel de Kok <danieldk at pobox.com> 
+
 * Wed Oct  4 2006 Seth Vidal <skvidal at linux.duke.edu>
 - mark it as 1.0
 - change requires for the packages to yum 3.0



From fedora-extras-commits at redhat.com  Tue Oct 31 14:39:47 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 31 Oct 2006 07:39:47 -0700
Subject: rpms/yum-utils/devel sources,1.6,1.7 yum-utils.spec,1.13,1.14
Message-ID: <200610311439.k9VEdlrA026783@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26765

Modified Files:
	sources yum-utils.spec 
Log Message:

update devel branch



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 03:32:28 -0000	1.6
+++ sources	31 Oct 2006 14:39:17 -0000	1.7
@@ -1 +1,2 @@
 e9af7d38f47e5d2cd945790061fa5f8b  yum-utils-1.0.tar.gz
+53ba387a337b605c5490eac8229da32d  yum-utils-1.0.1.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yum-utils.spec	5 Oct 2006 11:47:29 -0000	1.13
+++ yum-utils.spec	31 Oct 2006 14:39:17 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.0
-Release: 2%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
@@ -120,6 +120,16 @@
 This plugin adds a --ignore-broken to yum to make it possible to
 check packages for dependency problems and skip the one with problems.
 
+%package -n yum-priorities
+Summary: plugin to give priorities to packages from different repos 
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-priorities
+This plugin allows repositories to have different priorities. 
+Packages in a repository with a lower priority can't be overridden by packages
+from a repository with a higher priority even if repo has a later version.
+
 %prep
 %setup -q
 
@@ -129,7 +139,7 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities"
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -223,7 +233,19 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf
 /usr/lib/yum-plugins/skip-broken.*
 
+%files -n yum-priorities
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf
+/usr/lib/yum-plugins/priorities.*
+
+
 %changelog
+* Tue Oct 31 2006 Tim Lauridsen <tla at rasmil.dk>
+- mark it as 1.0.1
+
+* Fri Oct 27 2006 Tim Lauridsen <tla at rasmil.dk>
+- Added priorities plugin written by Daniel de Kok <danieldk at pobox.com> 
+
 * Wed Oct  4 2006 Seth Vidal <skvidal at linux.duke.edu>
 - mark it as 1.0
 - change requires for the packages to yum 3.0



From fedora-extras-commits at redhat.com  Tue Oct 31 14:46:56 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 31 Oct 2006 07:46:56 -0700
Subject: fedora-security/audit fc5,1.375,1.376 fc6,1.128,1.129
Message-ID: <200610311446.k9VEkucP026876@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26856/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-4572



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- fc5	30 Oct 2006 08:50:50 -0000	1.375
+++ fc5	31 Oct 2006 14:46:54 -0000	1.376
@@ -49,6 +49,7 @@
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
 CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4573 VULNERABLE (screen) #212057
+CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7) [since FEDORA-2006-976]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- fc6	30 Oct 2006 08:50:50 -0000	1.128
+++ fc6	31 Oct 2006 14:46:54 -0000	1.129
@@ -49,6 +49,7 @@
 CVE-2006-4600 version (openldap, fixed 2.3.25)
 CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4573 VULNERABLE (screen) #212057
+CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7)
 CVE-2006-4570 version (thunderbird, fixed 1.5.0.7)



From fedora-extras-commits at redhat.com  Tue Oct 31 14:57:46 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 31 Oct 2006 07:57:46 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.5,1.6
Message-ID: <200610311457.k9VEvkGg026939@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26923

Modified Files:
	international-time.spec 
Log Message:
* Tue Oct 31 2006 Tim Waugh <twaugh at redhat.com>
- Require desktop-file-utils, for scriptlets.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- international-time.spec	27 Oct 2006 09:34:30 -0000	1.5
+++ international-time.spec	31 Oct 2006 14:57:16 -0000	1.6
@@ -10,6 +10,7 @@
 BuildArch: 	noarch
 
 BuildRequires: 	desktop-file-utils >= 0.2.92
+Requires: 	desktop-file-utils >= 0.2.92
 Requires: 	pygtk2-libglade
 
 %description
@@ -66,6 +67,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Oct 31 2006 Tim Waugh <twaugh at redhat.com>
+- Require desktop-file-utils, for scriptlets.
+
 * Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.2
 - Better categories for the desktop file.
 



From fedora-extras-commits at redhat.com  Tue Oct 31 14:58:51 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 31 Oct 2006 07:58:51 -0700
Subject: rpms/international-time/FC-5 international-time.spec,1.3,1.4
Message-ID: <200610311458.k9VEwpEI026961@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26945

Modified Files:
	international-time.spec 
Log Message:
* Tue Oct 31 2006 Tim Waugh <twaugh at redhat.com>
- Require desktop-file-utils, for scriptlets.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-5/international-time.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- international-time.spec	31 Oct 2006 13:51:59 -0000	1.3
+++ international-time.spec	31 Oct 2006 14:58:20 -0000	1.4
@@ -10,6 +10,7 @@
 BuildArch: 	noarch
 
 BuildRequires: 	desktop-file-utils >= 0.2.92
+Requires: 	desktop-file-utils >= 0.2.92
 Requires: 	pygtk2-libglade
 
 %description
@@ -64,6 +65,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Oct 31 2006 Tim Waugh <twaugh at redhat.com>
+- Require desktop-file-utils, for scriptlets.
+
 * Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1.1
 - Update desktop database on installation.
 



From fedora-extras-commits at redhat.com  Tue Oct 31 15:00:51 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 31 Oct 2006 08:00:51 -0700
Subject: rpms/camE/devel camE.spec,1.12,1.13
Message-ID: <200610311500.k9VF0p6k026997@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/camE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26981

Modified Files:
	camE.spec 
Log Message:
Rebuild against new libcurl.



Index: camE.spec
===================================================================
RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- camE.spec	30 Aug 2006 09:17:59 -0000	1.12
+++ camE.spec	31 Oct 2006 15:00:21 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Rewrite of the xawtv webcam app, which adds imlib2 support
 Name: camE
 Version: 1.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://linuxbrit.co.uk/camE/
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Matthias Saou <http://freshrpms.net/> 1.9-8
+- Rebuild against new libcurl.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.9-7
 - FC6 rebuild.
 - Remove imlib2-devel build requirement, as giblib-devel requires it.



From fedora-extras-commits at redhat.com  Tue Oct 31 15:05:44 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 31 Oct 2006 08:05:44 -0700
Subject: rpms/xmlrpc-c/FC-6 xmlrpc-c.spec, 1.10, 1.11 sources, 1.5,
	1.6 0001-make-cmake-transition.txt, 1.1, 1.2
Message-ID: <200610311505.k9VF5iSk029998@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29978

Modified Files:
	xmlrpc-c.spec sources 0001-make-cmake-transition.txt 
Log Message:
updated to 1.06.06



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/xmlrpc-c.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmlrpc-c.spec	2 Oct 2006 15:02:03 -0000	1.10
+++ xmlrpc-c.spec	31 Oct 2006 15:05:14 -0000	1.11
@@ -4,8 +4,8 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.05
-Release:	%release_func 2
+Version:	1.06.06
+Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.06-1
+- updated to 1.06.06
+
 * Mon Oct  2 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-2
 - updated cmake patch
 - strip installed libraries


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2006 16:48:17 -0000	1.5
+++ sources	31 Oct 2006 15:05:14 -0000	1.6
@@ -1 +1 @@
-69f3644da7b8e9d13482c82838a4005a  xmlrpc-c-1.06.05.tgz
+ed508e56d11cb56188cf44a87d410f6c  xmlrpc-c-1.06.06.tgz


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/0001-make-cmake-transition.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-make-cmake-transition.txt	2 Oct 2006 15:02:03 -0000	1.1
+++ 0001-make-cmake-transition.txt	31 Oct 2006 15:05:14 -0000	1.2
@@ -68,7 +68,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.05" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.06" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.4")
 +set(XMLRPC_C_SOVERSION  "3")
 +



From fedora-extras-commits at redhat.com  Tue Oct 31 15:08:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Oct 2006 08:08:59 -0700
Subject: rpms/libtunepimp/devel libtunepimp.spec,1.22,1.23
Message-ID: <200610311508.k9VF8xPB030101@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30047

Modified Files:
	libtunepimp.spec 
Log Message:
* Tue Oct 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-4
- respin for curl update (fc7)



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libtunepimp.spec	12 Oct 2006 21:05:45 -0000	1.22
+++ libtunepimp.spec	31 Oct 2006 15:08:29 -0000	1.23
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -22,7 +22,6 @@
 BuildRequires: libmpcdec-devel
 
 BuildRequires: libofa-devel
-# These two are likely bogus (used just in examples/ ) -- Rex
 BuildRequires: curl-devel
 BuildRequires: expat-devel
 
@@ -134,6 +133,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-4
+- respin for curl update (fc7)
+
 * Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
 - rename python-libtunepimp -> python-tunepimp (to match python
   module name)



From fedora-extras-commits at redhat.com  Tue Oct 31 15:11:56 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 31 Oct 2006 08:11:56 -0700
Subject: rpms/moin/devel .cvsignore, 1.7, 1.8 moin.spec, 1.10, 1.11 sources, 
	1.7, 1.8
Message-ID: <200610311511.k9VFBuAF030187@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/moin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30167

Modified Files:
	.cvsignore moin.spec sources 
Log Message:
Update to 1.5.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Sep 2006 10:56:50 -0000	1.7
+++ .cvsignore	31 Oct 2006 15:11:26 -0000	1.8
@@ -1 +1 @@
-moin-1.5.5.tar.gz
+moin-1.5.6.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- moin.spec	18 Sep 2006 10:56:50 -0000	1.10
+++ moin.spec	31 Oct 2006 15:11:26 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
-Version: 1.5.5
+Version: 1.5.6
 Release: 1%{?dist}
 License: GPL
 Group:   Applications/Internet
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Matthias Saou <http://freshrpms.net/> 1.5.6-1
+- Update to 1.5.6.
+
 * Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 1.5.5-1
 - Update to 1.5.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Sep 2006 10:56:50 -0000	1.7
+++ sources	31 Oct 2006 15:11:26 -0000	1.8
@@ -1 +1 @@
-68308ef881057cd5d8f27504302ec7cc  moin-1.5.5.tar.gz
+b87046e39a13f749163a39e8ffa0e0f4  moin-1.5.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 15:48:11 2006
From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell))
Date: Tue, 31 Oct 2006 08:48:11 -0700
Subject: rpms/jigdo/devel jigdo.spec,1.4,1.5
Message-ID: <200610311548.k9VFmB4u030631@cvs-int.fedora.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/jigdo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30604

Modified Files:
	jigdo.spec 
Log Message:
Rebuild for curl update


Index: jigdo.spec
===================================================================
RCS file: /cvs/extras/rpms/jigdo/devel/jigdo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jigdo.spec	11 Sep 2006 19:47:52 -0000	1.4
+++ jigdo.spec	31 Oct 2006 15:47:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		jigdo
 Version:	0.7.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Ease distribution of large files over the Internet
 
 Group:		Applications/Internet
@@ -65,6 +65,12 @@
 %attr(0644,root,root) %{_mandir}/man[^3]/*
 
 %changelog
+* Tue Oct 31 2006 Ian Burrell <ianburrell at gmail.com> - 0.7.3-3
+- Rebuild for curl update
+
+* Mon Sep 11 2006 Ian Burrell <ianburrell at gmail.com> - 0.7.3-2
+- Rebuild for FC6
+
 * Sun Jun 25 2006 Ian Burrell <ianburrell at gmail> - 0.7.3-1
 - Update to 0.7.3
 - Remove obsolete patches



From fedora-extras-commits at redhat.com  Tue Oct 31 16:07:13 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 31 Oct 2006 09:07:13 -0700
Subject: rpms/xmlrpc-c/FC-5 0001-make-cmake-transition.txt, 1.1, 1.2 sources,
	1.4, 1.5 xmlrpc-c.spec, 1.4, 1.5
Message-ID: <200610311607.k9VG7DT5001428@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1360/FC-5

Modified Files:
	0001-make-cmake-transition.txt sources xmlrpc-c.spec 
Log Message:
updated to 1.06.06


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/0001-make-cmake-transition.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-make-cmake-transition.txt	2 Oct 2006 15:10:48 -0000	1.1
+++ 0001-make-cmake-transition.txt	31 Oct 2006 16:06:42 -0000	1.2
@@ -68,7 +68,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.05" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.06" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.4")
 +set(XMLRPC_C_SOVERSION  "3")
 +


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Oct 2006 15:10:48 -0000	1.4
+++ sources	31 Oct 2006 16:06:43 -0000	1.5
@@ -1 +1 @@
-69f3644da7b8e9d13482c82838a4005a  xmlrpc-c-1.06.05.tgz
+ed508e56d11cb56188cf44a87d410f6c  xmlrpc-c-1.06.06.tgz


Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/xmlrpc-c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmlrpc-c.spec	2 Oct 2006 15:10:48 -0000	1.4
+++ xmlrpc-c.spec	31 Oct 2006 16:06:43 -0000	1.5
@@ -4,8 +4,8 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.05
-Release:	%release_func 2
+Version:	1.06.06
+Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.06-1
+- updated to 1.06.06
+
 * Mon Oct  2 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-2
 - updated cmake patch
 - strip installed libraries



From fedora-extras-commits at redhat.com  Tue Oct 31 16:13:10 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 31 Oct 2006 09:13:10 -0700
Subject: fedora-security/audit fc5,1.376,1.377 fc6,1.129,1.130
Message-ID: <200610311613.k9VGDABV001484@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1461

Modified Files:
	fc5 fc6 
Log Message:
Note a new libX11 issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- fc5	31 Oct 2006 14:46:54 -0000	1.376
+++ fc5	31 Oct 2006 16:13:07 -0000	1.377
@@ -12,6 +12,7 @@
 CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
+CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- fc6	31 Oct 2006 14:46:54 -0000	1.129
+++ fc6	31 Oct 2006 16:13:07 -0000	1.130
@@ -12,6 +12,7 @@
 CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
+CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]



From fedora-extras-commits at redhat.com  Tue Oct 31 16:15:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 09:15:39 -0700
Subject: rpms/q/devel .cvsignore,1.3,1.4 q.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610311615.k9VGFdvf001541@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/q/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1513

Modified Files:
	.cvsignore q.spec sources 
Log Message:
new version 7.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/q/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Aug 2006 11:46:23 -0000	1.3
+++ .cvsignore	31 Oct 2006 16:15:09 -0000	1.4
@@ -1 +1 @@
-q-7.4.tar.gz
+q-7.5.tar.gz


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/devel/q.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- q.spec	30 Aug 2006 11:46:23 -0000	1.4
+++ q.spec	31 Oct 2006 16:15:09 -0000	1.5
@@ -1,11 +1,11 @@
 Name: 		q
-Version: 	7.4
+Version: 	7.5
 Release: 	1%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPL
-Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.4.tar.gz
+Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
+- new version 7.5
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.4-1
 - new version 7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/q/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Aug 2006 11:46:23 -0000	1.3
+++ sources	31 Oct 2006 16:15:09 -0000	1.4
@@ -1 +1 @@
-0b6ddd02028aee60f5ee1cd1f8cc008a  q-7.4.tar.gz
+d556ee55016ff9f3ce328bb7962157fe  q-7.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 16:29:57 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 31 Oct 2006 09:29:57 -0700
Subject: rpms/manaworld/devel manaworld.spec,1.4,1.5
Message-ID: <200610311629.k9VGTvco001789@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1737

Modified Files:
	manaworld.spec 
Log Message:
Rebuild for curl .so name change




Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/manaworld.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- manaworld.spec	15 Oct 2006 03:22:08 -0000	1.4
+++ manaworld.spec	31 Oct 2006 16:29:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           manaworld
 Version:        0.0.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        2D MMORPG world
 
 Group:          Amusements/Games
@@ -69,7 +69,10 @@
 
 
 %changelog
-* Sat Oct 14 2006 Wart <wart at kobold.org> 0.0.21
+* Tue Oct 31 2006 Wart <wart at kobold.org> 0.0.21-2
+- Rebuild for curl .so name change
+
+* Sat Oct 14 2006 Wart <wart at kobold.org> 0.0.21-1
 - Update to 0.0.21
 
 * Fri Sep 1 2006 Wart <wart at kobold.org> 0.0.20-2



From fedora-extras-commits at redhat.com  Tue Oct 31 16:30:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 09:30:02 -0700
Subject: rpms/gkrellm/devel .cvsignore, 1.2, 1.3 gkrellm.spec, 1.4,
	1.5 sources, 1.2, 1.3 gkrellm-2.2.9-hwmon.patch, 1.1,
	NONE gkrellm-2.2.9-libsensors.patch, 1.1, NONE
Message-ID: <200610311630.k9VGU2X1001796@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1760

Modified Files:
	.cvsignore gkrellm.spec sources 
Removed Files:
	gkrellm-2.2.9-hwmon.patch gkrellm-2.2.9-libsensors.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-1
- New upstream release 2.2.10
- Drop integrated lmsensors and sysfs sensors patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jul 2006 18:35:32 -0000	1.2
+++ .cvsignore	31 Oct 2006 16:29:31 -0000	1.3
@@ -1 +1 @@
-gkrellm-2.2.9.tar.bz2
+gkrellm-2.2.10.tar.bz2


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm.spec	4 Oct 2006 22:26:33 -0000	1.4
+++ gkrellm.spec	31 Oct 2006 16:29:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gkrellm
-Version:        2.2.9
-Release:        10%{?dist}
+Version:        2.2.10
+Release:        1%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPL
@@ -14,9 +14,7 @@
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-Patch5:         gkrellm-2.2.9-hwmon.patch
-Patch6:         gkrellm-2.2.9-libsensors.patch
-Patch7:         gkrellm-2.2.9-gkrellmd.conf.patch
+Patch5:         gkrellm-2.2.9-gkrellmd.conf.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 %ifarch %{ix86} x86_64
 BuildRequires:  lm_sensors-devel
@@ -63,14 +61,12 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1 -z .libdir
+%patch1 -p1 -z .config
+%patch2 -p1 -z .sansfont
+%patch3 -p1 -z .width
+%patch4 -p1 -z .libdir2
+%patch5 -p1 -z .conf-patch
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -184,6 +180,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-1
+- New upstream release 2.2.10
+- Drop integrated lmsensors and sysfs sensors patches
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.9-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jul 2006 18:35:32 -0000	1.2
+++ sources	31 Oct 2006 16:29:31 -0000	1.3
@@ -1 +1 @@
-5334155797901724f4eb46a82ad72395  gkrellm-2.2.9.tar.bz2
+57ef0525c0997ac2e7720712811f5a84  gkrellm-2.2.10.tar.bz2


--- gkrellm-2.2.9-hwmon.patch DELETED ---


--- gkrellm-2.2.9-libsensors.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 16:46:28 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 09:46:28 -0700
Subject: extras-buildsys/server PackageJob.py,1.54,1.55
Message-ID: <200610311646.k9VGkSbR001994@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1960/server

Modified Files:
	PackageJob.py 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	Patches by Joe Todaro <jstodaro at us.ibm.com>
	* server/PackageJob.py
		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,
			where the archjob key is filled in, but the archjob itself hasn't
			been created yet because it's not yet building




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- PackageJob.py	22 Jul 2006 15:07:12 -0000	1.54
+++ PackageJob.py	31 Oct 2006 16:46:21 -0000	1.55
@@ -707,7 +707,10 @@
     def _kill_all_archjobs(self, user_requested=False):
         self._archjobs_lock.acquire()
         for job in self._archjobs.values():
-            job.die(user_requested)
+            # During depsolve, self._archjobs will be populated with keys,
+            # but the values will be None since the archjobs aren't building yet.
+            if job != None:
+                job.die(user_requested)
         self._archjobs_lock.release()
 
     def wake(self):



From fedora-extras-commits at redhat.com  Tue Oct 31 16:46:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 09:46:23 -0700
Subject: extras-buildsys ChangeLog,1.211,1.212
Message-ID: <200610311646.k9VGkrNA001997@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1960

Modified Files:
	ChangeLog 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	Patches by Joe Todaro <jstodaro at us.ibm.com>
	* server/PackageJob.py
		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,
			where the archjob key is filled in, but the archjob itself hasn't
			been created yet because it's not yet building




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- ChangeLog	25 Oct 2006 17:34:30 -0000	1.211
+++ ChangeLog	31 Oct 2006 16:46:20 -0000	1.212
@@ -1,3 +1,11 @@
+2006-10-31  Dan Williams  <dcbw at redhat.com>
+
+	Patches by Joe Todaro <jstodaro at us.ibm.com>
+	* server/PackageJob.py
+		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,
+			where the archjob key is filled in, but the archjob itself hasn't
+			been created yet because it's not yet building
+
 2006-10-25  Dan Williams  <dcbw at redhat.com>
 
 	* www/template/main.psp



From fedora-extras-commits at redhat.com  Tue Oct 31 16:50:42 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 31 Oct 2006 09:50:42 -0700
Subject: rpms/camE/devel camE-1.9-curlopt.patch, NONE, 1.1 camE.spec, 1.13,
	1.14
Message-ID: <200610311650.k9VGogog002032@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/camE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2012

Modified Files:
	camE.spec 
Added Files:
	camE-1.9-curlopt.patch 
Log Message:
Add patch to remove obsolete CURLOPT_MUTE option.


camE-1.9-curlopt.patch:

--- NEW FILE camE-1.9-curlopt.patch ---
diff -Naupr camE-1.9.orig/webcam.c camE-1.9/webcam.c
--- camE-1.9.orig/webcam.c	2004-06-26 01:51:29.000000000 +0200
+++ camE-1.9/webcam.c	2006-10-31 17:44:10.000000000 +0100
@@ -987,8 +987,6 @@ ftp_upload(char *local,
     /* shut up completely */
     if (ftp_debug)
       curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1);
-    else
-      curl_easy_setopt(curl_handle, CURLOPT_MUTE, 1);
 
     curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1);
 


Index: camE.spec
===================================================================
RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- camE.spec	31 Oct 2006 15:00:21 -0000	1.13
+++ camE.spec	31 Oct 2006 16:50:12 -0000	1.14
@@ -7,6 +7,7 @@
 URL: http://linuxbrit.co.uk/camE/
 Source: http://linuxbrit.co.uk/downloads/camE-%{version}.tar.gz
 Patch0: camE-1.9-cflags.patch
+Patch1: camE-1.9-curlopt.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: giblib-devel, curl-devel, zlib-devel
 
@@ -17,7 +18,8 @@
 
 %prep
 %setup
-%patch -p1 -b .cflags
+%patch0 -p1 -b .cflags
+%patch1 -p1 -b .curlopt
 
 
 %build
@@ -43,6 +45,7 @@
 %changelog
 * Tue Oct 31 2006 Matthias Saou <http://freshrpms.net/> 1.9-8
 - Rebuild against new libcurl.
+- Add patch to remove obsolete CURLOPT_MUTE option.
 
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.9-7
 - FC6 rebuild.



From fedora-extras-commits at redhat.com  Tue Oct 31 17:00:50 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 10:00:50 -0700
Subject: rpms/libdap/devel libdap.spec,1.8,1.9
Message-ID: <200610311700.k9VH0o0e002246@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libdap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225

Modified Files:
	libdap.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-3
- rebuild for new libcurl soname



Index: libdap.spec
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libdap.spec	4 Oct 2006 22:47:27 -0000	1.8
+++ libdap.spec	31 Oct 2006 17:00:19 -0000	1.9
@@ -1,10 +1,8 @@
-
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
 Version: 3.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
-#Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz
 URL: http://www.opendap.org/
 
@@ -35,7 +33,9 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
-#
+# for the /usr/share/aclocal directory ownership
+Requires: automake
+
 %description devel
 This package contains all the files needed to develop applications that
 will use libdap.
@@ -44,7 +44,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -82,6 +82,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-3
+- rebuild for new libcurl soname
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.2-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 31 17:11:44 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 10:11:44 -0700
Subject: rpms/libnc-dap/devel libnc-dap.spec,1.11,1.12
Message-ID: <200610311711.k9VHBi1b005372@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnc-dap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5356

Modified Files:
	libnc-dap.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-5
- licence is LGPL since it cause the BSD code to be distributed as LGPL too



Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libnc-dap.spec	4 Oct 2006 22:45:20 -0000	1.11
+++ libnc-dap.spec	31 Oct 2006 17:11:14 -0000	1.12
@@ -1,14 +1,15 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
 Version: 3.6.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
 URL: http://www.opendap.org/
 
 Group: Development/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: LGPL/BSD
+# dncdump and netcdf headers are coverd by a BSD-like license
+License: LGPL
 BuildRequires: libdap-devel >= 3.7.0
 
 %description
@@ -18,14 +19,16 @@
 machines. Data served using DAP2 need not be stored in netcdf files 
 to be read using this replacement library.
 Also included in this package is the ncdump utility, also bundled with the
-original netcdf library, relinked with the library and thus able to read
-from DAP2 compatible servers.
+original netcdf library, renamed dncdump, relinked with the library and 
+thus able to read from DAP2 compatible servers.
 
 %package devel
 Summary: Static libraries and header files from libnc-dap
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libdap-devel >= 3.7.0
+# for /usr/share/aclocal owning
+Requires: automake
 
 %description devel
 This package contains all the files needed to develop applications that
@@ -35,7 +38,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -67,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-5
+- licence is LGPL since it cause the BSD code to be distributed as LGPL too
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.6.2-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 31 17:23:40 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 10:23:40 -0700
Subject: rpms/dap-server/devel dap-server.spec,1.19,1.20
Message-ID: <200610311723.k9VHNebp005608@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5592

Modified Files:
	dap-server.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.1-4
- rebuild for new libcurl soname (indirect dependency through libdap)



Index: dap-server.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dap-server.spec	4 Oct 2006 22:16:07 -0000	1.19
+++ dap-server.spec	31 Oct 2006 17:23:10 -0000	1.20
@@ -8,7 +8,7 @@
 Summary:         Basic request handling for OPeNDAP servers 
 Name:            dap-server
 Version:         3.7.1
-Release:         3%{?dist}
+Release:         4%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz
@@ -59,7 +59,7 @@
 %patch0
 
 %build
-%configure --with-cgidir=%{dap_cgidir} 
+%configure --with-cgidir=%{dap_cgidir} --disable-dependency-tracking
 #--with-cgiconfdir=%{dap_cgiconfdir}
 make %{?_smp_mflags}
 
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.1-4
+- rebuild for new libcurl soname (indirect dependency through libdap)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.1-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 31 17:31:42 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 31 Oct 2006 10:31:42 -0700
Subject: rpms/blender/devel blender.spec,1.32,1.33
Message-ID: <200610311731.k9VHVggh005704@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5680

Modified Files:
	blender.spec 
Log Message:
Fix broken deps


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- blender.spec	16 Oct 2006 20:49:20 -0000	1.32
+++ blender.spec	31 Oct 2006 17:31:11 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -160,6 +160,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Tue Oct 31 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-5
+- Rebuilt to fix broken deps
+
 * Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-4
 - /usr/lib/blender should own by the package
 



From fedora-extras-commits at redhat.com  Tue Oct 31 17:37:20 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 10:37:20 -0700
Subject: rpms/dap-netcdf_handler/devel dap-netcdf_handler.spec,1.8,1.9
Message-ID: <200610311737.k9VHbKXd005828@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-netcdf_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778

Modified Files:
	dap-netcdf_handler.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.3-3
- rebuild for new libcurl soname (indirect dependency through libdap)



Index: dap-netcdf_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/dap-netcdf_handler.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dap-netcdf_handler.spec	4 Oct 2006 22:46:37 -0000	1.8
+++ dap-netcdf_handler.spec	31 Oct 2006 17:36:50 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:         NetCDF 3 data handler for the OPeNDAP Data server
 Name:            dap-netcdf_handler
 Version:         3.7.3
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz
@@ -9,9 +9,6 @@
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   libdap-devel >= 3.7.0 netcdf-devel
-# Don't require dap-server as dap_nc_handler works without dap-server,
-# however dap_nc_handler should be of use only with dap-server in most cases.
-#Requires:        dap-server
 
 %description
 This is the netcdf data handler for our data server. It reads netcdf 3
@@ -22,7 +19,7 @@
 %setup -q -n netcdf_handler-%{version}
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -46,8 +43,11 @@
 %doc README
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.3-3
+- rebuild for new libcurl soname (indirect dependency through libdap)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.3-2
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.7.3-1
 - update to 3.7.3



From fedora-extras-commits at redhat.com  Tue Oct 31 17:39:54 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:39:54 -0700
Subject: rpms/python-zope-interface - New directory
Message-ID: <200610311739.k9VHdsW1005919@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915/python-zope-interface

Log Message:
Directory /cvs/extras/rpms/python-zope-interface added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 31 17:39:59 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:39:59 -0700
Subject: rpms/python-zope-interface/devel - New directory
Message-ID: <200610311739.k9VHdx52005933@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915/python-zope-interface/devel

Log Message:
Directory /cvs/extras/rpms/python-zope-interface/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 31 17:40:22 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:40:22 -0700
Subject: rpms/python-zope-interface Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610311740.k9VHeMw1005964@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5958

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-zope-interface


--- NEW FILE Makefile ---
# Top level Makefile for module python-zope-interface
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 31 17:40:27 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:40:27 -0700
Subject: rpms/python-zope-interface/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610311740.k9VHeR73005981@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5958/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-zope-interface


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 31 17:41:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:41:56 -0700
Subject: rpms/python-zope-interface import.log,1.1,1.2
Message-ID: <200610311741.k9VHfuE6006096@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6056

Modified Files:
	import.log 
Log Message:
auto-import python-zope-interface-3.0.1-6 on branch devel from python-zope-interface-3.0.1-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-zope-interface/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Oct 2006 17:40:21 -0000	1.1
+++ import.log	31 Oct 2006 17:41:26 -0000	1.2
@@ -0,0 +1 @@
+python-zope-interface-3_0_1-6:HEAD:python-zope-interface-3.0.1-6.src.rpm:1162316476



From fedora-extras-commits at redhat.com  Tue Oct 31 17:41:57 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:41:57 -0700
Subject: rpms/python-zope-interface/devel ZPL-2.1.txt, NONE,
	1.1 ZopeInterface-3.0.1-declbug.patch, NONE,
	1.1 python-zope-interface.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610311741.k9VHfvSF006100@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6056/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ZPL-2.1.txt ZopeInterface-3.0.1-declbug.patch 
	python-zope-interface.spec 
Log Message:
auto-import python-zope-interface-3.0.1-6 on branch devel from python-zope-interface-3.0.1-6.src.rpm


--- NEW FILE ZPL-2.1.txt ---
Zope Public License (ZPL) Version 2.1

A copyright notice accompanies this license document that identifies the
copyright holders.

This license has been certified as open source. It has also been designated
as GPL compatible by the Free Software Foundation (FSF).

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

   1. Redistributions in source code must retain the accompanying copyright
      notice, this list of conditions, and the following disclaimer.
   2. Redistributions in binary form must reproduce the accompanying copyright
      notice, this list of conditions, and the following disclaimer in the
      documentation and/or other materials provided with the distribution.
   3. Names of the copyright holders must not be used to endorse or promote
      products derived from this software without prior written permission from
      the copyright holders.
   4. The right to distribute this software or to use it for any purpose does
      not give you the right to use Servicemarks (sm) or Trademarks (tm) of the
      copyright holders. Use of them is covered by separate agreement with the
      copyright holders.
   5. If any files are modified, you must cause the modified files to carry
      prominent notices stating that you changed the files and the date of any
      change.

Disclaimer

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL THE COPYRIGHT HOLDERS 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.


ZopeInterface-3.0.1-declbug.patch:

--- NEW FILE ZopeInterface-3.0.1-declbug.patch ---
diff -urN ZopeInterface-3.0.1/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c ZopeInterface-3.0.1-declbug/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c
--- ZopeInterface-3.0.1/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c	2004-08-04 18:03:17.000000000 +0800
+++ ZopeInterface-3.0.1-declbug/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c	2005-08-23 08:05:27.376784740 +0800
@@ -70,7 +70,7 @@
   return 0;
 }
 
-extern PyTypeObject SpecType;   /* Forward */
+static PyTypeObject SpecType;   /* Forward */
 
 static PyObject *
 implementedByFallback(PyObject *cls)


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

Name:		python-zope-interface
Version:	3.0.1
Release:	6%{?dist}
Summary:	Zope interfaces package
Group:		Development/Libraries
License:	Zope Public License
URL:		http://zope.org/Products/ZopeInterface
Source0:	http://zope.org/Products/ZopeInterface/3.0.1final/ZopeInterface-%{version}.tgz
Source1:	ZPL-2.1.txt
Patch0:		ZopeInterface-3.0.1-declbug.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	python-devel

%description
This is a separate distribution of the zope.interface package used in Zope 3.

It includes a patch to fix compilation on gcc 4.x, as described here:
http://www.zope.org/Collectors/Zope3-dev/366/

%prep
%setup -n ZopeInterface-%{version} -q
%{__cp} -a %{SOURCE1} .
%patch0 -p1

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root  %{buildroot}

%check
cd ./build/lib.* && PYTHONPATH=$(pwd) %{__python} ./zope/testing/tests.py

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

%files
%defattr(-,root,root,-)
%doc README.txt ZPL-2.1.txt
%{python_sitearch}/zope/

%changelog
* Tue Oct 31 2006 Paul Howarth <paul at city-fan.org> 3.0.1-6
- add %%check section

* Wed Sep 20 2006 Paul Howarth <paul at city-fan.org> 3.0.1-5
- dispense with %%{pybasever} macro and python-abi dependency, not needed from
  FC4 onwards
- include ZPL 2.1 license text
- add reference in %%description to origin of patch
- change License: tag from "ZPL 2.1" to "Zope Public License" to shut rpmlint up

* Thu Aug 31 2006 Paul Howarth <paul at city-fan.org> 3.0.1-4
- files list simplified as .pyo files are no longer %%ghost-ed

* Tue May  9 2006 Paul Howarth <paul at city-fan.org> 3.0.1-3
- import from PyVault Repository
- rewrite in Fedora Extras style

* Tue Aug 23 2005 Jeff Pitman <symbiont+pyvault at berlios.de> 3.0.1-2
- add bug fix for gcc 4

* Mon Feb 07 2005 Jeff Pitman <symbiont+pyvault at berlios.de> 3.0.1-1
- new rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-zope-interface/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Oct 2006 17:40:27 -0000	1.1
+++ .cvsignore	31 Oct 2006 17:41:27 -0000	1.2
@@ -0,0 +1 @@
+ZopeInterface-3.0.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-zope-interface/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Oct 2006 17:40:27 -0000	1.1
+++ sources	31 Oct 2006 17:41:27 -0000	1.2
@@ -0,0 +1 @@
+114f302c2b132d43ad4e01d108b4d192  ZopeInterface-3.0.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 17:57:38 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 10:57:38 -0700
Subject: extras-buildsys ChangeLog,1.212,1.213
Message-ID: <200610311757.k9VHvcKV006316@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6285

Modified Files:
	ChangeLog 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	* server/PackageJob.py
		- Fixes for older python versions that don't have yum.Errors.* but
			yum-utils' repomd module instead
		- Fixes for Yum 3.x logging changes




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- ChangeLog	31 Oct 2006 16:46:20 -0000	1.212
+++ ChangeLog	31 Oct 2006 17:57:36 -0000	1.213
@@ -1,5 +1,12 @@
 2006-10-31  Dan Williams  <dcbw at redhat.com>
 
+	* server/PackageJob.py
+		- Fixes for older python versions that don't have yum.Errors.* but
+			yum-utils' repomd module instead
+		- Fixes for Yum 3.x logging changes
+
+2006-10-31  Dan Williams  <dcbw at redhat.com>
+
 	Patches by Joe Todaro <jstodaro at us.ibm.com>
 	* server/PackageJob.py
 		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,



From fedora-extras-commits at redhat.com  Tue Oct 31 17:57:39 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 10:57:39 -0700
Subject: extras-buildsys/server PackageJob.py,1.55,1.56
Message-ID: <200610311757.k9VHvdD5006320@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6285/server

Modified Files:
	PackageJob.py 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	* server/PackageJob.py
		- Fixes for older python versions that don't have yum.Errors.* but
			yum-utils' repomd module instead
		- Fixes for Yum 3.x logging changes




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- PackageJob.py	31 Oct 2006 16:46:21 -0000	1.55
+++ PackageJob.py	31 Oct 2006 17:57:36 -0000	1.56
@@ -32,12 +32,19 @@
 from plague import DebugUtils
 
 import yum
+use_repomd = False
 try:
     import repomd.mdErrors
+    use_repomd = True
 except ImportError:
     pass
-from yum.logger import Logger
 
+use_yum_logger = False
+try:
+    from yum.logger import Logger
+    use_yum_logger = True
+except ImportError:
+    pass
 
 CVS_CMD = "/usr/bin/cvs"
 MAKE_CMD = "/usr/bin/make"
@@ -497,10 +504,17 @@
 
             depsolve_root = os.path.dirname(yum_config) + '/'
             base.doConfigSetup(fn=yum_config, root=depsolve_root)
+
             threshold = 0
             if DEBUG:
                 threshold = 5
-            base.log = Logger(threshold=threshold, file_object=sys.stdout)
+            if use_yum_logger == True:
+                # For yum 2.x and earlier
+                base.log = logger.Logger(threshold=threshold, file_object=sys.stdout)
+            else:
+                # Use python logging module (yum 3.x and later)
+                base.doLoggingSetup(threshold, 1)
+
             try:
                 base.doRepoSetup()
             except yum.Errors.RepoError, exc:
@@ -528,14 +542,18 @@
             for dep in srpm.requiresList():
                 if dep.startswith("rpmlib("):
                     continue
-                try:
-                    pkg = base.returnPackageByDep(dep)
-                except repomd.mdErrors.PackageSackError, exc:
-                    raise DepError(str(exc))
-                except yum.Errors.PackageSackError, exc:
-                    raise DepError(str(exc))
-                except yum.Errors.YumBaseError, exc:
-                    raise DepError(str(exc))
+                if use_repomd:
+                    try:
+                        pkg = base.returnPackageByDep(dep)
+                    except repomd.mdErrors.PackageSackError, exc:
+                        raise DepError(str(exc))
+                else:
+                    try:
+                        pkg = base.returnPackageByDep(dep)
+                    except yum.Errors.PackageSackError, exc:
+                        raise DepError(str(exc))
+                    except yum.Errors.YumBaseError, exc:
+                        raise DepError(str(exc))
         except DepError, exc:
             self._last_depsolve_error = str(exc)
             print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(exc))



From fedora-extras-commits at redhat.com  Tue Oct 31 18:10:51 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 11:10:51 -0700
Subject: extras-buildsys/common ssl-client-test.py, NONE,
	1.1 ssl-server-test.py, NONE, 1.1
Message-ID: <200610311810.k9VIApYL009717@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9665/common

Added Files:
	ssl-client-test.py ssl-server-test.py 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

    * common/ssl-client-test.py
      common/ssl-server-test.py
        - Two utilities to test the functionality of SSLConnection class
        and the SSL server/client classes




--- NEW FILE ssl-client-test.py ---
import threading
import time
import random
import OpenSSL
import socket
import SSLCommon
import SSLConnection
import sys, os
import urllib
import base64
import types


client_start = False

threadlist_lock = threading.Lock()
threadlist = {}
timed_out = 0

class TestClient(threading.Thread):
    def __init__(self, certs, num):
        self._ctx = SSLCommon.CreateSSLContext(certs)
        self._timeout = 20
        self._host = "localhost"
        self._port = 8888
        self.num = i
        threading.Thread.__init__(self)

    def get_host_info(self, host):
        x509 = {}
        if isinstance(host, types.TupleType):
            host, x509 = host

        import urllib
        auth, host = urllib.splituser(host)

        if auth:
            import base64
            auth = base64.encodestring(urllib.unquote(auth))
            auth = string.join(string.split(auth), "") # get rid of whitespace
            extra_headers = [
                ("Authorization", "Basic " + auth)
                ]
        else:
            extra_headers = None

        return host, extra_headers, x509

    def _make_connection(self):
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
        con = OpenSSL.SSL.Connection(self._ctx, sock)
        sock = SSLConnection.SSLConnection(con)
        sock.connect((self._host, self._port))
        return sock

    def run(self):
        request = "ping" * 40

        while not client_start:
            time.sleep(0.05)
        i = 0
        while i < 5:
            reply = None
            try:
                sock = self._make_connection()

                # Send request
                sock.sendall(request)

                # Wait for response
                print "Waiting for response"
                reply = sock.recv(1024)
                sock.close()
            except OpenSSL.SSL.Error, e:
                reply = "OpenSSL Error (%s)" % e
            except socket.error, e:
                reply = "Socket error (%s)" % e
            except socket.timeout, e:
                reply = "Socket timeout (%s)" % e
                threadlist_lock.acquire()
                timed_out = timed_out + 1
                threadlist_lock.release()
            print "TRY(%d / %d): %s" % (self.num, i, reply)
            time.sleep(0.05)
            i = i + 1
        threadlist_lock.acquire()
        del threadlist[self]
        threadlist_lock.release()


if __name__ == '__main__':
    if len(sys.argv) < 4:
        print "Usage: python %s key_and_cert ca_cert peer_ca_cert" % sys.argv[0]
        sys.exit(1)

    certs = {}
    certs['key_and_cert'] = sys.argv[1]
    certs['ca_cert'] = sys.argv[2]
    certs['peer_ca_cert'] = sys.argv[3]

    i = 100
    while i > 0:
        t = TestClient(certs, i)
        threadlist[t] = None
        print "Created thread %d." % i
        t.start()
        i = i - 1

    time.sleep(3)
    print "Unleashing threads."
    client_start = True
    while True:
        try:
            time.sleep(0.25)
            threadlist_lock.acquire()
            if len(threadlist) == 0:
                break
            threadlist_lock.release()
        except KeyboardInterrupt:
            os._exit(0)
    print "All done. (%d timed out)" % timed_out



--- NEW FILE ssl-server-test.py ---
import os, sys
import socket
import time
import SSLCommon
import SocketServer

response = "pong" * 20

class ReqHandler(SocketServer.StreamRequestHandler):
    def handle(self):
        print "Starting handler"
        # Read the request
        string = self.rfile.read(100)
        if len(string) > 0:
            print "request was: '%s' (%d)" % (string, len(string))
        else:
            print "request was zero-length"
        # Write the response
        self.wfile.write(response)

if __name__ == '__main__':
    if len(sys.argv) < 4:
        print "Usage: python %s key_and_cert ca_cert peer_ca_cert" % sys.argv[0]
        sys.exit(1)

    certs = {}
    certs['key_and_cert'] = sys.argv[1]
    certs['ca_cert'] = sys.argv[2]
    certs['peer_ca_cert'] = sys.argv[3]

    print "Starting the server."
    server = SSLCommon.PlgBaseSSLServer(('localhost', 8888), ReqHandler, certs)
    server.serve_forever()




From fedora-extras-commits at redhat.com  Tue Oct 31 18:10:45 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 11:10:45 -0700
Subject: extras-buildsys ChangeLog,1.213,1.214
Message-ID: <200610311811.k9VIBFmS009739@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9665

Modified Files:
	ChangeLog 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

    * common/ssl-client-test.py
      common/ssl-server-test.py
        - Two utilities to test the functionality of SSLConnection class
        and the SSL server/client classes




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- ChangeLog	31 Oct 2006 17:57:36 -0000	1.213
+++ ChangeLog	31 Oct 2006 18:10:42 -0000	1.214
@@ -1,5 +1,12 @@
 2006-10-31  Dan Williams  <dcbw at redhat.com>
 
+    * common/ssl-client-test.py
+      common/ssl-server-test.py
+        - Two utilities to test the functionality of SSLConnection class
+        and the SSL server/client classes
+
+2006-10-31  Dan Williams  <dcbw at redhat.com>
+
 	* server/PackageJob.py
 		- Fixes for older python versions that don't have yum.Errors.* but
 			yum-utils' repomd module instead



From fedora-extras-commits at redhat.com  Tue Oct 31 18:27:53 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 11:27:53 -0700
Subject: rpms/q/devel q-7.5-curlopt.patch,NONE,1.1 q.spec,1.5,1.6
Message-ID: <200610311827.k9VIRrQP010678@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/q/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10629

Modified Files:
	q.spec 
Added Files:
	q-7.5-curlopt.patch 
Log Message:
patch for curloptions

q-7.5-curlopt.patch:

--- NEW FILE q-7.5-curlopt.patch ---
--- q-7.5/modules/curl/curl.c.curlopt	2006-10-31 19:19:44.000000000 +0100
+++ q-7.5/modules/curl/curl.c	2006-10-31 19:24:10.000000000 +0100
@@ -313,9 +313,9 @@
 #if LIBCURL_VERSION_NUM < 0x070a00
 #define CURLOPT_NOSIGNAL (-1)
 #endif
-#if LIBCURL_VERSION_NUM < 0x070402
+
 #define CURLOPT_PASSWDFUNCTION (-1)
-#endif
+
 #if LIBCURL_VERSION_NUM < 0x070702
 #define CURLOPT_HEADERFUNCTION (-1)
 #endif
@@ -1006,10 +1006,6 @@
 	cb = (int(*)())progress_cb;
 	dataopt = CURLOPT_PROGRESSDATA;
 	break;
-      case CURLOPT_PASSWDFUNCTION:
-	cb = (int(*)())passwd_cb;
-	dataopt = CURLOPT_PASSWDDATA;
-	break;
       case CURLOPT_HEADERFUNCTION:
 	cb = (int(*)())header_cb;
 	dataopt = CURLOPT_WRITEHEADER;


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/devel/q.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- q.spec	31 Oct 2006 16:15:09 -0000	1.5
+++ q.spec	31 Oct 2006 18:27:23 -0000	1.6
@@ -1,11 +1,12 @@
 Name: 		q
 Version: 	7.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPL
 Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
+Patch0:		q-7.5-curlopt.patch
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
@@ -64,6 +65,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i 's|/usr/sbin/apxs2|/usr/sbin/apxs -I../src -L../src|' mod_q/Makefile
 sed -i 's|@libtool@|libtool|' src/Makefile.in
 
@@ -154,6 +156,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-2
+- patch for curl options
+
 * Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
 - new version 7.5
 



From fedora-extras-commits at redhat.com  Tue Oct 31 18:31:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 11:31:42 -0700
Subject: rpms/q/FC-5 .cvsignore,1.3,1.4 q.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200610311831.k9VIVgfA011018@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/q/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10950/FC-5

Modified Files:
	.cvsignore q.spec sources 
Log Message:
new version 7.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Aug 2006 11:46:22 -0000	1.3
+++ .cvsignore	31 Oct 2006 18:31:12 -0000	1.4
@@ -1 +1 @@
-q-7.4.tar.gz
+q-7.5.tar.gz


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/q.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- q.spec	30 Aug 2006 11:46:22 -0000	1.3
+++ q.spec	31 Oct 2006 18:31:12 -0000	1.4
@@ -1,11 +1,11 @@
 Name: 		q
-Version: 	7.4
+Version: 	7.5
 Release: 	1%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPL
-Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.4.tar.gz
+Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
+- new version 7.5
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.4-1
 - new version 7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Aug 2006 11:46:22 -0000	1.3
+++ sources	31 Oct 2006 18:31:12 -0000	1.4
@@ -1 +1 @@
-0b6ddd02028aee60f5ee1cd1f8cc008a  q-7.4.tar.gz
+d556ee55016ff9f3ce328bb7962157fe  q-7.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 18:31:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 11:31:43 -0700
Subject: rpms/q/FC-6 .cvsignore,1.3,1.4 q.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610311831.k9VIVhvS011026@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/q/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10950/FC-6

Modified Files:
	.cvsignore q.spec sources 
Log Message:
new version 7.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Aug 2006 11:46:23 -0000	1.3
+++ .cvsignore	31 Oct 2006 18:31:13 -0000	1.4
@@ -1 +1 @@
-q-7.4.tar.gz
+q-7.5.tar.gz


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/q.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- q.spec	30 Aug 2006 11:46:23 -0000	1.4
+++ q.spec	31 Oct 2006 18:31:13 -0000	1.5
@@ -1,11 +1,11 @@
 Name: 		q
-Version: 	7.4
+Version: 	7.5
 Release: 	1%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPL
-Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.4.tar.gz
+Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
+- new version 7.5
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.4-1
 - new version 7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Aug 2006 11:46:23 -0000	1.3
+++ sources	31 Oct 2006 18:31:13 -0000	1.4
@@ -1 +1 @@
-0b6ddd02028aee60f5ee1cd1f8cc008a  q-7.4.tar.gz
+d556ee55016ff9f3ce328bb7962157fe  q-7.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 18:37:38 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 11:37:38 -0700
Subject: rpms/mod_fcgid/devel .cvsignore, 1.2, 1.3 configuration.htm, 1.1,
	1.2 doc.htm, 1.1, 1.2 mod_fcgid.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610311837.k9VIbcBw011431@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/mod_fcgid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11373

Modified Files:
	.cvsignore configuration.htm doc.htm mod_fcgid.spec sources 
Log Message:
Update to 2.0
Source is now hosted at sourceforge.net
Update docs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 13:08:59 -0000	1.2
+++ .cvsignore	31 Oct 2006 18:37:08 -0000	1.3
@@ -1 +1 @@
-mod_fcgid.1.10.tar.gz
+mod_fcgid.2.0.tar.gz


Index: configuration.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/configuration.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configuration.htm	6 Sep 2006 13:08:59 -0000	1.1
+++ configuration.htm	31 Oct 2006 18:37:08 -0000	1.2
@@ -9,62 +9,62 @@
 
 <body>
 
-<p><b><a name="regular fastcgi"></a>This is a for regular fastcgi.&nbsp;</b><p>LoadModule fcgid_module           
+<p><b><a name="regular fastcgi"></a>This is a for regular fastcgi.&nbsp;</b><p>LoadModule fcgid_module              
 modules/mod_fcgid.so<p>
-&lt;Location /fcgid><br>         
-&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>         
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>         
-&nbsp;&nbsp;&nbsp; allow from all<br>         
+&lt;Location /fcgid><br>            
+&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>            
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>            
+&nbsp;&nbsp;&nbsp; allow from all<br>            
 &lt;/Location&gt;<p>
 &nbsp;
 <hr>
-<p><b><a name="suEXEC"></a>This is for suEXEC. Please get more information about suEXEC <a href="http://httpd.apache.org/docs-2.0/suexec.html">here</a>.&nbsp;</b><p>LoadModule fcgid_module            
+<p><b><a name="suEXEC"></a>This is for suEXEC. Please get more information about suEXEC <a href="http://httpd.apache.org/docs-2.0/suexec.html">here</a>.&nbsp;</b><p>LoadModule fcgid_module               
 modules/mod_fcgid.so<p>
-&lt;Location /fcgid&gt;<br>         
-&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>         
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>         
-&nbsp;&nbsp;&nbsp; allow from all<br>         
+&lt;Location /fcgid&gt;<br>            
+&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>            
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>            
+&nbsp;&nbsp;&nbsp; allow from all<br>            
 &lt;/Location&gt;<p>
-&lt;VirtualHost 192.168.1.89><br>         
-&nbsp;&nbsp;&nbsp; ServerAdmin <a href="mailto:webmaster at host.foo.com">webmaster at host.foo.com<br>        
-</a>&nbsp;&nbsp;&nbsp; DocumentRoot /usr/local/apache2/htdocs/<br>         
-&nbsp;&nbsp;&nbsp; ServerName host.foo.com<br>         
-&nbsp;&nbsp;&nbsp; SuexecUserGroup pqf pqf<br>         
+&lt;VirtualHost 192.168.1.89><br>            
+&nbsp;&nbsp;&nbsp; ServerAdmin <a href="mailto:webmaster at host.foo.com">webmaster at host.foo.com<br>           
+</a>&nbsp;&nbsp;&nbsp; DocumentRoot /usr/local/apache2/htdocs/<br>            
+&nbsp;&nbsp;&nbsp; ServerName host.foo.com<br>            
+&nbsp;&nbsp;&nbsp; SuexecUserGroup pqf pqf<br>            
 &lt;/VirtualHost&gt;<p>
 ??
 <hr>
-<p><b><a name="PHP"></a>This is for fastcgi-mode PHP (UNIX)</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>  
-&lt;Directory /usr/local/apache2/htdocs/php><br>         
-&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>         
-&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/bin/php .php<br>         
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>         
-&nbsp;&nbsp;&nbsp; allow from all<br>         
-&lt;/Directory><p><b>This works too:</b><p>LoadModule fcgid_module         
+<p><b><a name="PHP"></a>This is for fastcgi-mode PHP (UNIX)</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>     
+&lt;Directory /usr/local/apache2/htdocs/php><br>            
+&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>            
+&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/bin/php .php<br>            
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>            
+&nbsp;&nbsp;&nbsp; allow from all<br>            
+&lt;/Directory><p><b>This works too:</b><p>LoadModule fcgid_module            
 modules/mod_fcgid.so&nbsp;<p>
-AddHandler fcgid-script .php<br>        
-&lt;Directory /usr/local/apache2/htdocs/php&gt;<br>         
-&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/bin/php .php<br>         
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>         
-&nbsp;&nbsp;&nbsp; allow from all<br>         
+AddHandler fcgid-script .php<br>           
+&lt;Directory /usr/local/apache2/htdocs/php&gt;<br>            
+&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/bin/php .php<br>            
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>            
+&nbsp;&nbsp;&nbsp; allow from all<br>            
 &lt;/Directory&gt;<p><b># Please make sure:<br>    
 # php is configured with --enable-fastcgi option<br>    
 # check error_log(with debug level), if  
 any thing goes wrong</b> 
 <hr>
-<p><b><a name="suPHP"></a>This is for suPHP&nbsp; ( UNIX )</b>      
-<p>LoadModule fcgid_module modules/mod_fcgid.so<br>    
+<p><b><a name="suPHP"></a>This is for suPHP&nbsp; ( UNIX )</b>         
+<p>LoadModule fcgid_module modules/mod_fcgid.so<br>       
 <br>
-&lt;VirtualHost *:80><br>    
-&nbsp;&nbsp;&nbsp; ServerName test2.example.com<br>    
-&nbsp;&nbsp;&nbsp; DocumentRoot /usr/local/apache2/htdocs/test2.example.com/<br>    
-&nbsp;&nbsp;&nbsp; SuexecUserGroup pqf pqf<br>    
+&lt;VirtualHost *:80><br>       
+&nbsp;&nbsp;&nbsp; ServerName test2.example.com<br>       
+&nbsp;&nbsp;&nbsp; DocumentRoot /usr/local/apache2/htdocs/test2.example.com/<br>       
+&nbsp;&nbsp;&nbsp; SuexecUserGroup pqf pqf<br>       
 &lt;/VirtualHost><br>
 <br>
-&lt;Directory /usr/local/apache2/htdocs/test2.example.com/><br>    
-&nbsp;&nbsp;&nbsp; AddHandler fcgid-script .php<br>    
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>    
-&nbsp;&nbsp;&nbsp; allow from all<br>    
-&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php<br>    
+&lt;Directory /usr/local/apache2/htdocs/test2.example.com/><br>       
+&nbsp;&nbsp;&nbsp; AddHandler fcgid-script .php<br>       
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>       
+&nbsp;&nbsp;&nbsp; allow from all<br>       
+&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php<br>       
 &lt;/Directory></p>
 <p>   
 <b>   
@@ -79,23 +79,89 @@
 
 <hr>
 <p><br>
-<b><a name="PHP-Windows"></a>This is for fastcgi-mode PHP ( Windows )</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>  
-&lt;Directory &quot;C:/Apache2/htdocs/php/&quot;&gt;<br>  
-&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>  
-&nbsp;&nbsp;&nbsp; Options execCGI<br>  
-&nbsp;&nbsp;&nbsp; AllowOverride None<br>  
-&nbsp;&nbsp;&nbsp; Order allow,deny<br>  
-&nbsp;&nbsp;&nbsp; Allow from all<br>  
-&nbsp;&nbsp;&nbsp; FCGIWrapper &quot;c:/php/php.exe&quot; .php<br>  
-&lt;/Directory><p><b>This works too:</b><p>LoadModule fcgid_module modules/mod_fcgid.so&nbsp;<p>
-AddHandler fcgid-script .php<br>
-&lt;Directory &quot;C:/Apache2/htdocs/php/&quot;&gt;<br> 
-&nbsp;&nbsp;&nbsp; FCGIWrapper &quot;c:/php/php.exe&quot; .php<br> 
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br> 
-&nbsp;&nbsp;&nbsp; allow from all<br> 
+<b><a name="PHP-Windows"></a>This is for fastcgi-mode PHP ( Windows )</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>     
+&lt;Directory &quot;C:/Apache2/htdocs/php/&quot;&gt;<br>     
+&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>     
+&nbsp;&nbsp;&nbsp; Options execCGI<br>     
+&nbsp;&nbsp;&nbsp; AllowOverride None<br>     
+&nbsp;&nbsp;&nbsp; Order allow,deny<br>     
+&nbsp;&nbsp;&nbsp; Allow from all<br>     
+&nbsp;&nbsp;&nbsp; FCGIWrapper &quot;c:/php/php.exe&quot; .php<br>     
+&lt;/Directory><p><b>This works too:</b><p>LoadModule fcgid_module modules/mod_fcgid.so&nbsp;<p>   
+AddHandler fcgid-script .php<br>   
+&lt;Directory &quot;C:/Apache2/htdocs/php/&quot;&gt;<br>    
+&nbsp;&nbsp;&nbsp; FCGIWrapper &quot;c:/php/php.exe&quot; .php<br>    
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>    
+&nbsp;&nbsp;&nbsp; allow from all<br>    
 &lt;/Directory&gt;<br>
 
 <hr>
+<p><b><a name="Authenticator"></a>This is for Authenticator</b></p>  
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p>&lt;Location /fcgid><br> 
+    SetHandler fcgid-script<br> 
+    Options ExecCGI<br> 
+    allow from all<br> 
+    AuthType Basic<br> 
+    AuthName ProtectedRealm<br> 
+    FastCgiAuthenticator /some/path/authenticator<br> 
+    require valid-user<br> 
+&lt;/Location><br>
+</p>
+<p><b>Another configuration: <a name="FastCgiAuthenticatorAuthoritative">FastCgiAuthenticatorAuthoritative</a> 
+(default On)</b></p>
+<p>Setting the <code>FastCgiAuthenticatorAuthoritative</code> directive 
+explicitly to <em>Off</em> allows authentication to be passed on to lower level 
+modules</p>
+
+<hr>
+<p><b><a name="Authorizer"></a>This is for Authorizer</b></p>  
+
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p>&lt;Location /fcgid><br> 
+    SetHandler fcgid-script<br> 
+    Options ExecCGI<br> 
+    allow from all<br> 
+    AuthType Basic<br> 
+    AuthName ProtectedRealm<br> 
+    FastCgiAuthorizer /some/place/Authorizer<br> 
+&lt;/Location></p>
+
+<p><b>Another configuration: <a name="FastCgiAuthorizerAuthoritative">FastCgiAuthorizerAuthoritative</a> 
+(default On)</b></p>
+
+<p>Setting the <code>FastCgiAuthorizerAuthoritative</code> directive explicitly 
+to <em>Off</em> allows authorization to be passed on to lower level modules</p>
+
+<hr>
+<p><b><a name="AccessChecker"></a>This is for AccessChecker</b></p>  
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p>&lt;Location /fcgid><br> 
+    SetHandler fcgid-script<br> 
+    Options ExecCGI<br> 
+    allow from all<br> 
+    FastCgiAccessChecker /some/place/access-checker<br> 
+&lt;/Location><br>
+</p>
+<p><b>Another configuration: </b><a name="FastCgiAccessCheckerAuthoritative"><b>FastCgiAccessCheckerAuthoritative</b></a><b> 
+(default On)</b></p>
+<p>Setting the <code>FastCgiAccessCheckerAuthoritative</code> directive 
+explicitly to <em>Off</em> allows access checking to be passed on to lower level 
+modules</p>
+<p>??</p>
+<p>??</p>
+
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
 <p>??</p>
 <p>??</p>
 <p>??</p>


Index: doc.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/doc.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doc.htm	6 Sep 2006 13:08:59 -0000	1.1
+++ doc.htm	31 Oct 2006 18:37:08 -0000	1.2
@@ -51,7 +51,10 @@
 (non-PHP, non-Ruby, non-Python)&nbsp;</a><p><a href="configuration.htm#suEXEC">Configuration
 for suEXEC fastcgi</a><p><a href="configuration.htm#PHP">Configuration for PHP
 (UNIX)</a><p><a href="configuration.htm#suPHP">Configuration for suPHP (UNIX)</a><p><a href="configuration.htm#PHP-Windows">Configuration
-for PHP (Windows)</a><p>&nbsp;
+for PHP (Windows)</a><p><a href="configuration.htm#Authenticator">Configuration
+for Authenticator</a><p><a href="configuration.htm#Authorizer">Configuration
+for Authorizer</a><p><a href="configuration.htm#AccessChecker">Configuration
+for AccessChecker</a><p>&nbsp;
 <hr>
 <ul>
   <li><h2><b><font size="4">There are
@@ -90,9 +93,16 @@
 fastcgi application.&nbsp;<p><b>IPCCommTimeout n (20 seconds)</b><p>The communication
 timeout to a fastcgi application. Please increase this value if your CGI have a
 slow initialization or slow respond.<p><b>OutputBufferSize n (64k bytes)</b><p>CGI
-output cache buffer size.<p><b>PHP_Fix_Pathinfo_Enable</b><b> n(n=0/1, default 0)</b><p>If
+output cache buffer size.<p><b>PHP_Fix_Pathinfo_Enable</b><b>  n(n=0/1, default 0)</b><p>If
 you are using PHP and set cgi.fix_pathinfo=1 in php.ini, set
-PHP_Fix_Pathinfo_Enable 1.
+PHP_Fix_Pathinfo_Enable 1.<p><b>MaxRequestsPerProcess n (-1)</b><p>(Added in
+version 1.11, patch from Robert L Mathews)<p>Adds a MaxRequestsPerProcess parameter that allows mod_fcgid to
+exit after handling a certain number of requests, similar to the existing ProcessLifeTime option.&nbsp;<p>This solves a problem with PHP in FastCGI mode. By default, PHP stops
+accepting new FastCGI connections after handling 500 requests; unfortunately, there is a potential race condition during the PHP cleanup code in which
+PHP can be shutting down but still have the socket open, so mod_fcgid under heavy load can send request number 501 to PHP and have it "accepted", but then
+PHP appears to simply exit, causing errors.<p>If you are using PHP, you should
+set it to 500. -1 mean fastcgi process will not exit no matter how many requests
+it has handled.<br>
 
 </td>
 


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_fcgid.spec	6 Sep 2006 13:47:08 -0000	1.2
+++ mod_fcgid.spec	31 Oct 2006 18:37:08 -0000	1.3
@@ -10,13 +10,13 @@
 %endif
 
 Name:           mod_fcgid
-Version:        1.10
-Release:        7%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Apache2 module for high-performance server-side scripting 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://fastcgi.coremail.cn/
-Source0:        http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz
+Source0:        http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
 Source1:        fcgid.conf
 Source2:        fastcgi.te
 Source3:        fastcgi.fc
@@ -144,6 +144,11 @@
 %endif
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 2.0-1
+- Update to 2.0
+- Source is now hosted at sourceforge.net
+- Update docs
+
 * Wed Sep  6 2006 Paul Howarth <paul at city-fan.org> 1.10-7
 - Include the right README* files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 13:08:59 -0000	1.2
+++ sources	31 Oct 2006 18:37:08 -0000	1.3
@@ -1 +1 @@
-6c36b18548ca64864ed3dd4cb759062f  mod_fcgid.1.10.tar.gz
+3aa51f1e293e6d881028295a23021dae  mod_fcgid.2.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 19:14:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 12:14:52 -0700
Subject: rpms/gaim-gadugadu/FC-6 dead.package,NONE,1.1
Message-ID: <200610311914.k9VJEq5o016315@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16308/FC-6

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


--- NEW FILE dead.package ---
Obsolete package.



From fedora-extras-commits at redhat.com  Tue Oct 31 19:14:57 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 12:14:57 -0700
Subject: rpms/gaim-gadugadu/devel dead.package,NONE,1.1
Message-ID: <200610311914.k9VJEv6P016332@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16308/devel

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


--- NEW FILE dead.package ---
Obsolete package.



From fedora-extras-commits at redhat.com  Tue Oct 31 19:18:07 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 12:18:07 -0700
Subject: rpms/gaim-gadugadu/FC-6 Makefile, 1.1, NONE gaim-gadugadu.spec, 1.1,
	NONE gaim2-PIE.patch, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610311918.k9VJI7KW016490@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16484/FC-6

Removed Files:
	Makefile gaim-gadugadu.spec gaim2-PIE.patch sources 
Log Message:
Removed files


--- Makefile DELETED ---


--- gaim-gadugadu.spec DELETED ---


--- gaim2-PIE.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:18:07 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 12:18:07 -0700
Subject: rpms/gaim-gadugadu/devel Makefile, 1.1, NONE gaim-gadugadu.spec, 1.1,
	NONE gaim2-PIE.patch, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610311918.k9VJI79K016505@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16484/devel

Removed Files:
	Makefile gaim-gadugadu.spec gaim2-PIE.patch sources 
Log Message:
Removed files


--- Makefile DELETED ---


--- gaim-gadugadu.spec DELETED ---


--- gaim2-PIE.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:37:10 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 31 Oct 2006 12:37:10 -0700
Subject: rpms/w3c-markup-validator/FC-5
	w3c-markup-validator-0.7.3-html401.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-syspaths.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-xhtml1.patch, NONE,
	1.1 w3c-markup-validator.spec, 1.10,
	1.11 w3c-markup-validator-0.7.2-html401.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-syspaths.patch, 1.1, NONE
Message-ID: <200610311937.k9VJbA2l017433@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/FC-5

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.3-html401.patch 
	w3c-markup-validator-0.7.3-syspaths.patch 
	w3c-markup-validator-0.7.3-xhtml1.patch 
Removed Files:
	w3c-markup-validator-0.7.2-html401.patch 
	w3c-markup-validator-0.7.2-syspaths.patch 
Log Message:
* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
- Reference HTML 4.01 DTDs directly instead of making all system catalogs
  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
- Use system XHTML 1.0 DTDs.


w3c-markup-validator-0.7.3-html401.patch:

--- NEW FILE w3c-markup-validator-0.7.3-html401.patch ---
--- validator-0.7.3/htdocs/sgml-lib/sgml.soc~	2005-07-26 06:22:32.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/sgml.soc	2006-10-31 01:16:21.000000000 +0200
@@ -41,19 +41,19 @@
 PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN"	REC-html40-19980424/frameset.dtd
 
 	-- HTML 4.01 --
-PUBLIC "-//W3C//DTD HTML 4.01//EN"		REC-html401-19991224/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	REC-html401-19991224/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	REC-html401-19991224/frameset.dtd
-PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	REC-html401-19991224/HTMLspecial.ent
-PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//DTD HTML 4.01//EN"		/usr/share/sgml/html/4.01/strict.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	/usr/share/sgml/html/4.01/loose.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	/usr/share/sgml/html/4.01/frameset.dtd
+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	/usr/share/sgml/html/4.01/HTMLspecial.ent
+PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 	-- ISO-HTML --
 PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN"	ISO-HTML/15445.dtd
 PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN"	ISO-HTML/15445.dtd
-PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 
         -- Do not prefer document type name over a SYSTEM Identifier. --

w3c-markup-validator-0.7.3-syspaths.patch:

--- NEW FILE w3c-markup-validator-0.7.3-syspaths.patch ---
--- validator-0.7.3/httpd/cgi-bin/check~	2006-10-23 09:01:01.000000000 +0300
+++ validator-0.7.3/httpd/cgi-bin/check	2006-10-31 01:35:06.000000000 +0200
@@ -658,6 +658,7 @@
   #
   # Tell onsgmls about the SGML Library.
   $ENV{SGML_SEARCH_PATH} = $CFG->{Paths}->{SGML}->{Library};
+  $ENV{SGML_SEARCH_PATH} .= ":/usr/share/xml:/usr/share/sgml";
 
   #
   # Set the command to execute.

w3c-markup-validator-0.7.3-xhtml1.patch:

--- NEW FILE w3c-markup-validator-0.7.3-xhtml1.patch ---
--- validator-0.7.3/htdocs/sgml-lib/xml.soc~	2006-10-11 09:30:52.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/xml.soc	2006-10-31 01:30:03.000000000 +0200
@@ -36,17 +36,17 @@
        "REC-xhtml11-20010531/xhtml11-model-1.mod"
 
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "REC-xhtml1-20020801/xhtml1-strict.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-strict.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "REC-xhtml1-20020801/xhtml1-transitional.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-transitional.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-       "REC-xhtml1-20020801/xhtml1-frameset.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-frameset.dtd"
 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-lat1.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-lat1.ent"
 PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-symbol.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-symbol.ent"
 PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-special.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-special.ent"
 
 PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
        "REC-xhtml-basic-20001219/xhtml-basic10.dtd"


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/w3c-markup-validator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- w3c-markup-validator.spec	23 Oct 2006 21:13:24 -0000	1.10
+++ w3c-markup-validator.spec	31 Oct 2006 19:36:40 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -11,8 +11,9 @@
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
-Patch1:         %{name}-0.7.2-syspaths.patch
-Patch2:         %{name}-0.7.2-html401.patch
+Patch1:         %{name}-0.7.3-syspaths.patch
+Patch2:         %{name}-0.7.3-html401.patch
+Patch3:         %{name}-0.7.3-xhtml1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,8 @@
 Summary:        SGML and XML DTDs for the W3C Markup Validator
 Group:          Applications/Text
 Requires:       sgml-common
-Requires:       html401-dtds
+Requires:       html401-dtds /usr/share/sgml/html/4.01
+Requires:       xhtml1-dtds /usr/share/sgml/xhtml1/xhtml1-20020801/DTD
 
 %description    libs
 SGML and XML DTDs for the W3C Markup Validator.
@@ -38,10 +40,12 @@
 %prep
 %setup -q -a 1 -n validator-%{version}
 rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
+rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801
 mv validator-%{version}/htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p2
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -117,6 +121,11 @@
 
 
 %changelog
+* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
+- Reference HTML 4.01 DTDs directly instead of making all system catalogs
+  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
+- Use system XHTML 1.0 DTDs.
+
 * Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
 - 0.7.3, feedback and undebian patches applied upstream.
 - Use "W3C License" as the License tag to appease rpmlint.


--- w3c-markup-validator-0.7.2-html401.patch DELETED ---


--- w3c-markup-validator-0.7.2-syspaths.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:37:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 31 Oct 2006 12:37:11 -0700
Subject: rpms/w3c-markup-validator/FC-6
	w3c-markup-validator-0.7.3-html401.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-syspaths.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-xhtml1.patch, NONE,
	1.1 w3c-markup-validator.spec, 1.11,
	1.12 w3c-markup-validator-0.7.2-html401.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-syspaths.patch, 1.1, NONE
Message-ID: <200610311937.k9VJbB7o017437@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/FC-6

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.3-html401.patch 
	w3c-markup-validator-0.7.3-syspaths.patch 
	w3c-markup-validator-0.7.3-xhtml1.patch 
Removed Files:
	w3c-markup-validator-0.7.2-html401.patch 
	w3c-markup-validator-0.7.2-syspaths.patch 
Log Message:
* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
- Reference HTML 4.01 DTDs directly instead of making all system catalogs
  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
- Use system XHTML 1.0 DTDs.


w3c-markup-validator-0.7.3-html401.patch:

--- NEW FILE w3c-markup-validator-0.7.3-html401.patch ---
--- validator-0.7.3/htdocs/sgml-lib/sgml.soc~	2005-07-26 06:22:32.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/sgml.soc	2006-10-31 01:16:21.000000000 +0200
@@ -41,19 +41,19 @@
 PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN"	REC-html40-19980424/frameset.dtd
 
 	-- HTML 4.01 --
-PUBLIC "-//W3C//DTD HTML 4.01//EN"		REC-html401-19991224/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	REC-html401-19991224/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	REC-html401-19991224/frameset.dtd
-PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	REC-html401-19991224/HTMLspecial.ent
-PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//DTD HTML 4.01//EN"		/usr/share/sgml/html/4.01/strict.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	/usr/share/sgml/html/4.01/loose.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	/usr/share/sgml/html/4.01/frameset.dtd
+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	/usr/share/sgml/html/4.01/HTMLspecial.ent
+PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 	-- ISO-HTML --
 PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN"	ISO-HTML/15445.dtd
 PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN"	ISO-HTML/15445.dtd
-PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 
         -- Do not prefer document type name over a SYSTEM Identifier. --

w3c-markup-validator-0.7.3-syspaths.patch:

--- NEW FILE w3c-markup-validator-0.7.3-syspaths.patch ---
--- validator-0.7.3/httpd/cgi-bin/check~	2006-10-23 09:01:01.000000000 +0300
+++ validator-0.7.3/httpd/cgi-bin/check	2006-10-31 01:35:06.000000000 +0200
@@ -658,6 +658,7 @@
   #
   # Tell onsgmls about the SGML Library.
   $ENV{SGML_SEARCH_PATH} = $CFG->{Paths}->{SGML}->{Library};
+  $ENV{SGML_SEARCH_PATH} .= ":/usr/share/xml:/usr/share/sgml";
 
   #
   # Set the command to execute.

w3c-markup-validator-0.7.3-xhtml1.patch:

--- NEW FILE w3c-markup-validator-0.7.3-xhtml1.patch ---
--- validator-0.7.3/htdocs/sgml-lib/xml.soc~	2006-10-11 09:30:52.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/xml.soc	2006-10-31 01:30:03.000000000 +0200
@@ -36,17 +36,17 @@
        "REC-xhtml11-20010531/xhtml11-model-1.mod"
 
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "REC-xhtml1-20020801/xhtml1-strict.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-strict.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "REC-xhtml1-20020801/xhtml1-transitional.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-transitional.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-       "REC-xhtml1-20020801/xhtml1-frameset.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-frameset.dtd"
 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-lat1.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-lat1.ent"
 PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-symbol.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-symbol.ent"
 PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-special.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-special.ent"
 
 PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
        "REC-xhtml-basic-20001219/xhtml-basic10.dtd"


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/w3c-markup-validator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- w3c-markup-validator.spec	23 Oct 2006 21:13:25 -0000	1.11
+++ w3c-markup-validator.spec	31 Oct 2006 19:36:40 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -11,8 +11,9 @@
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
-Patch1:         %{name}-0.7.2-syspaths.patch
-Patch2:         %{name}-0.7.2-html401.patch
+Patch1:         %{name}-0.7.3-syspaths.patch
+Patch2:         %{name}-0.7.3-html401.patch
+Patch3:         %{name}-0.7.3-xhtml1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,8 @@
 Summary:        SGML and XML DTDs for the W3C Markup Validator
 Group:          Applications/Text
 Requires:       sgml-common
-Requires:       html401-dtds
+Requires:       html401-dtds /usr/share/sgml/html/4.01
+Requires:       xhtml1-dtds /usr/share/sgml/xhtml1/xhtml1-20020801/DTD
 
 %description    libs
 SGML and XML DTDs for the W3C Markup Validator.
@@ -38,10 +40,12 @@
 %prep
 %setup -q -a 1 -n validator-%{version}
 rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
+rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801
 mv validator-%{version}/htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p2
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -117,6 +121,11 @@
 
 
 %changelog
+* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
+- Reference HTML 4.01 DTDs directly instead of making all system catalogs
+  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
+- Use system XHTML 1.0 DTDs.
+
 * Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
 - 0.7.3, feedback and undebian patches applied upstream.
 - Use "W3C License" as the License tag to appease rpmlint.


--- w3c-markup-validator-0.7.2-html401.patch DELETED ---


--- w3c-markup-validator-0.7.2-syspaths.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:37:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 31 Oct 2006 12:37:17 -0700
Subject: rpms/w3c-markup-validator/devel
	w3c-markup-validator-0.7.3-html401.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-syspaths.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-xhtml1.patch, NONE,
	1.1 w3c-markup-validator.spec, 1.11,
	1.12 w3c-markup-validator-0.7.2-html401.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-syspaths.patch, 1.1, NONE
Message-ID: <200610311937.k9VJbHmP017443@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/devel

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.3-html401.patch 
	w3c-markup-validator-0.7.3-syspaths.patch 
	w3c-markup-validator-0.7.3-xhtml1.patch 
Removed Files:
	w3c-markup-validator-0.7.2-html401.patch 
	w3c-markup-validator-0.7.2-syspaths.patch 
Log Message:
* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
- Reference HTML 4.01 DTDs directly instead of making all system catalogs
  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
- Use system XHTML 1.0 DTDs.


w3c-markup-validator-0.7.3-html401.patch:

--- NEW FILE w3c-markup-validator-0.7.3-html401.patch ---
--- validator-0.7.3/htdocs/sgml-lib/sgml.soc~	2005-07-26 06:22:32.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/sgml.soc	2006-10-31 01:16:21.000000000 +0200
@@ -41,19 +41,19 @@
 PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN"	REC-html40-19980424/frameset.dtd
 
 	-- HTML 4.01 --
-PUBLIC "-//W3C//DTD HTML 4.01//EN"		REC-html401-19991224/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	REC-html401-19991224/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	REC-html401-19991224/frameset.dtd
-PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	REC-html401-19991224/HTMLspecial.ent
-PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//DTD HTML 4.01//EN"		/usr/share/sgml/html/4.01/strict.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	/usr/share/sgml/html/4.01/loose.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	/usr/share/sgml/html/4.01/frameset.dtd
+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	/usr/share/sgml/html/4.01/HTMLspecial.ent
+PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 	-- ISO-HTML --
 PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN"	ISO-HTML/15445.dtd
 PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN"	ISO-HTML/15445.dtd
-PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 
         -- Do not prefer document type name over a SYSTEM Identifier. --

w3c-markup-validator-0.7.3-syspaths.patch:

--- NEW FILE w3c-markup-validator-0.7.3-syspaths.patch ---
--- validator-0.7.3/httpd/cgi-bin/check~	2006-10-23 09:01:01.000000000 +0300
+++ validator-0.7.3/httpd/cgi-bin/check	2006-10-31 01:35:06.000000000 +0200
@@ -658,6 +658,7 @@
   #
   # Tell onsgmls about the SGML Library.
   $ENV{SGML_SEARCH_PATH} = $CFG->{Paths}->{SGML}->{Library};
+  $ENV{SGML_SEARCH_PATH} .= ":/usr/share/xml:/usr/share/sgml";
 
   #
   # Set the command to execute.

w3c-markup-validator-0.7.3-xhtml1.patch:

--- NEW FILE w3c-markup-validator-0.7.3-xhtml1.patch ---
--- validator-0.7.3/htdocs/sgml-lib/xml.soc~	2006-10-11 09:30:52.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/xml.soc	2006-10-31 01:30:03.000000000 +0200
@@ -36,17 +36,17 @@
        "REC-xhtml11-20010531/xhtml11-model-1.mod"
 
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "REC-xhtml1-20020801/xhtml1-strict.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-strict.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "REC-xhtml1-20020801/xhtml1-transitional.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-transitional.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-       "REC-xhtml1-20020801/xhtml1-frameset.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-frameset.dtd"
 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-lat1.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-lat1.ent"
 PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-symbol.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-symbol.ent"
 PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-special.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-special.ent"
 
 PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
        "REC-xhtml-basic-20001219/xhtml-basic10.dtd"


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- w3c-markup-validator.spec	23 Oct 2006 21:13:31 -0000	1.11
+++ w3c-markup-validator.spec	31 Oct 2006 19:36:46 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -11,8 +11,9 @@
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
-Patch1:         %{name}-0.7.2-syspaths.patch
-Patch2:         %{name}-0.7.2-html401.patch
+Patch1:         %{name}-0.7.3-syspaths.patch
+Patch2:         %{name}-0.7.3-html401.patch
+Patch3:         %{name}-0.7.3-xhtml1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,8 @@
 Summary:        SGML and XML DTDs for the W3C Markup Validator
 Group:          Applications/Text
 Requires:       sgml-common
-Requires:       html401-dtds
+Requires:       html401-dtds /usr/share/sgml/html/4.01
+Requires:       xhtml1-dtds /usr/share/sgml/xhtml1/xhtml1-20020801/DTD
 
 %description    libs
 SGML and XML DTDs for the W3C Markup Validator.
@@ -38,10 +40,12 @@
 %prep
 %setup -q -a 1 -n validator-%{version}
 rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
+rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801
 mv validator-%{version}/htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p2
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -117,6 +121,11 @@
 
 
 %changelog
+* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
+- Reference HTML 4.01 DTDs directly instead of making all system catalogs
+  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
+- Use system XHTML 1.0 DTDs.
+
 * Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
 - 0.7.3, feedback and undebian patches applied upstream.
 - Use "W3C License" as the License tag to appease rpmlint.


--- w3c-markup-validator-0.7.2-html401.patch DELETED ---


--- w3c-markup-validator-0.7.2-syspaths.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:38:10 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 31 Oct 2006 12:38:10 -0700
Subject: rpms/moodss/devel .cvsignore,1.10,1.11 sources,1.11,1.12
Message-ID: <200610311938.k9VJcAVY017495@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17455

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2006 18:10:21 -0000	1.10
+++ .cvsignore	31 Oct 2006 19:37:39 -0000	1.11
@@ -1 +1 @@
-moodss-21.3.tar.bz2
+moodss-21.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2006 18:10:21 -0000	1.11
+++ sources	31 Oct 2006 19:37:40 -0000	1.12
@@ -1 +1 @@
-8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2
+3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 19:44:58 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 31 Oct 2006 12:44:58 -0700
Subject: rpms/moodss/devel moodss.spec,1.24,1.25
Message-ID: <200610311944.k9VJiwwa017879@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17819/devel

Modified Files:
	moodss.spec 
Log Message:
21.4 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- moodss.spec	24 Oct 2006 18:29:30 -0000	1.24
+++ moodss.spec	31 Oct 2006 19:44:28 -0000	1.25
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.3
+Version: 21.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Oct 25 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.4-1
+- 21.4 upstream release
+
 * Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
 - 21.3 upstream release
 



From fedora-extras-commits at redhat.com  Tue Oct 31 19:47:04 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 31 Oct 2006 12:47:04 -0700
Subject: rpms/moodss/FC-5 .cvsignore, 1.10, 1.11 moodss.spec, 1.23,
	1.24 sources, 1.11, 1.12
Message-ID: <200610311947.k9VJl4Wf018007@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17955

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.4 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2006 18:25:36 -0000	1.10
+++ .cvsignore	31 Oct 2006 19:46:33 -0000	1.11
@@ -1 +1 @@
-moodss-21.3.tar.bz2
+moodss-21.4.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/moodss.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- moodss.spec	24 Oct 2006 18:25:36 -0000	1.23
+++ moodss.spec	31 Oct 2006 19:46:33 -0000	1.24
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.3
+Version: 21.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Oct 25 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.4-1
+- 21.4 upstream release
+
 * Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
 - 21.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2006 18:25:36 -0000	1.11
+++ sources	31 Oct 2006 19:46:33 -0000	1.12
@@ -1 +1 @@
-8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2
+3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 19:47:49 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 31 Oct 2006 12:47:49 -0700
Subject: fedora-security/audit fc5,1.377,1.378 fc6,1.130,1.131
Message-ID: <200610311947.k9VJlnaF018097@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18071/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-5619



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- fc5	31 Oct 2006 16:13:07 -0000	1.377
+++ fc5	31 Oct 2006 19:47:47 -0000	1.378
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- fc6	31 Oct 2006 16:13:07 -0000	1.130
+++ fc6	31 Oct 2006 19:47:47 -0000	1.131
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360



From fedora-extras-commits at redhat.com  Tue Oct 31 19:52:55 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Tue, 31 Oct 2006 12:52:55 -0700
Subject: rpms/subversion-api-docs/FC-6 doxygen.conf, 1.1,
	1.2 subversion-api-docs.spec, 1.6, 1.7
Message-ID: <200610311952.k9VJqtO6018412@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18340

Modified Files:
	doxygen.conf subversion-api-docs.spec 
Log Message:
Prepare to push the button on 1.4.0.



Index: doxygen.conf
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/FC-6/doxygen.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doxygen.conf	9 Apr 2006 08:49:09 -0000	1.1
+++ doxygen.conf	31 Oct 2006 19:52:24 -0000	1.2
@@ -373,7 +373,7 @@
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
 # in the documentation.
 
-SHOW_DIRECTORIES       = YES
+SHOW_DIRECTORIES       = NO
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that 
 # doxygen should invoke to get the current version for each file (typically from the 


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/FC-6/subversion-api-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- subversion-api-docs.spec	16 Sep 2006 02:35:20 -0000	1.6
+++ subversion-api-docs.spec	31 Oct 2006 19:52:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		subversion-api-docs
-Version:	1.3.2
-Release:	2.1%{?dist}
+Version:	1.4.0
+Release:	1%{?dist}
 Summary:	Subversion API documentation
 
 Group:		Development/Tools
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Wed Nov 01 2006 Bojan Smojver <bojan at rexursive.com> 1.4.0-1
+- bump up to 1.4.0
+
 * Sat Sep 16 2006 Bojan Smojver <bojan at rexursive.com> 1.3.2-2.1
 - mass rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct 31 19:57:48 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 31 Oct 2006 12:57:48 -0700
Subject: rpms/moodss/FC-6 .cvsignore, 1.10, 1.11 moodss.spec, 1.24,
	1.25 sources, 1.11, 1.12
Message-ID: <200610311957.k9VJvmTb018632@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18584

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.4 upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2006 18:27:05 -0000	1.10
+++ .cvsignore	31 Oct 2006 19:57:18 -0000	1.11
@@ -1 +1 @@
-moodss-21.3.tar.bz2
+moodss-21.4.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/moodss.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- moodss.spec	24 Oct 2006 18:27:05 -0000	1.24
+++ moodss.spec	31 Oct 2006 19:57:18 -0000	1.25
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.3
+Version: 21.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Oct 25 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.4-1
+- 21.4 upstream release
+
 * Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
 - 21.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2006 18:27:05 -0000	1.11
+++ sources	31 Oct 2006 19:57:18 -0000	1.12
@@ -1 +1 @@
-8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2
+3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 20:02:54 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 31 Oct 2006 13:02:54 -0700
Subject: comps comps-fe5.xml.in,1.182,1.183
Message-ID: <200610312002.k9VK2sik022002@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21962

Modified Files:
	comps-fe5.xml.in 
Log Message:
Added sextractor and wcstools to fe5 comps



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- comps-fe5.xml.in	26 Oct 2006 05:53:58 -0000	1.182
+++ comps-fe5.xml.in	31 Oct 2006 20:02:24 -0000	1.183
@@ -269,7 +269,9 @@
       <packagereq type="optional">R-RScaLAPACK</packagereq>
       <packagereq type="optional">scalapack</packagereq>
       <packagereq type="optional">scrip</packagereq>
+      <packagereq type="optional">sextractor</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
+      <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Tue Oct 31 20:07:36 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 31 Oct 2006 13:07:36 -0700
Subject: comps comps-fe6.xml.in,1.205,1.206 comps-fe7.xml.in,1.3,1.4
Message-ID: <200610312007.k9VK7a9q022265@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22181

Modified Files:
	comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Added sextractor and wcstools to fe6 and fe7



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- comps-fe6.xml.in	26 Oct 2006 05:53:58 -0000	1.205
+++ comps-fe6.xml.in	31 Oct 2006 20:07:05 -0000	1.206
@@ -321,8 +321,10 @@
       <packagereq type="optional">rrdtool</packagereq>
       <packagereq type="optional">scalapack</packagereq>
       <packagereq type="optional">scrip</packagereq>
+      <packagereq type="optional">sextractor</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
       <packagereq type="optional">veusz</packagereq>
+      <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">xcircuit</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
     </packagelist>


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comps-fe7.xml.in	26 Oct 2006 05:53:58 -0000	1.3
+++ comps-fe7.xml.in	31 Oct 2006 20:07:05 -0000	1.4
@@ -321,8 +321,10 @@
       <packagereq type="optional">rrdtool</packagereq>
       <packagereq type="optional">scalapack</packagereq>
       <packagereq type="optional">scrip</packagereq>
+      <packagereq type="optional">sextractor</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
       <packagereq type="optional">veusz</packagereq>
+      <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">xcircuit</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
     </packagelist>



From fedora-extras-commits at redhat.com  Tue Oct 31 20:28:16 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 13:28:16 -0700
Subject: owners owners.list,1.1879,1.1880
Message-ID: <200610312028.k9VKSGkp022963@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22942

Modified Files:
	owners.list 
Log Message:
Add python-zope-interface


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1879
retrieving revision 1.1880
diff -u -r1.1879 -r1.1880
--- owners.list	30 Oct 2006 20:41:33 -0000	1.1879
+++ owners.list	31 Oct 2006 20:27:45 -0000	1.1880
@@ -1938,6 +1938,7 @@
 Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|
+Fedora Extras|python-zope-interface|Zope interfaces package|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|PyX|Python graphics package|mpeters at mac.com|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|tcallawa at redhat.com|extras-qa at fedoraproject.org|foolish at guezz.net,jpmahowald at gmail.com



From fedora-extras-commits at redhat.com  Tue Oct 31 20:30:23 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 31 Oct 2006 13:30:23 -0700
Subject: rpms/grip/FC-6 grip.spec,1.14,1.15
Message-ID: <200610312030.k9VKUNeY023029@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23001

Modified Files:
	grip.spec 
Log Message:
* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-14
- rebuilt for new curl



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/FC-6/grip.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- grip.spec	9 Sep 2006 17:18:55 -0000	1.14
+++ grip.spec	31 Oct 2006 20:29:53 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -74,6 +74,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-14
+- rebuilt for new curl
+
 * Sat Sep 09 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-13
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Oct 31 20:52:17 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 31 Oct 2006 13:52:17 -0700
Subject: rpms/fbida/FC-6 fbida.spec,1.18,1.19
Message-ID: <200610312052.k9VKqHVD024939@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24921

Modified Files:
	fbida.spec 
Log Message:
* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 2.06-3
- rebuilt for new curl



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-6/fbida.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fbida.spec	29 Sep 2006 05:49:48 -0000	1.18
+++ fbida.spec	31 Oct 2006 20:51:47 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -68,6 +68,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 2.06-3
+- rebuilt for new curl
+
 * Fri Sep 29 2006 Adrian Reber <adrian at lisas.de> - 2.06-2
 - obsoleted fbida-ida subpackage (#208457)
 



From fedora-extras-commits at redhat.com  Tue Oct 31 20:57:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 13:57:15 -0700
Subject: rpms/gaim-gadugadu/FC-6 dead.package,1.1,1.2
Message-ID: <200610312057.k9VKvF3C025146@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116/gaim-gadugadu/FC-6

Modified Files:
	dead.package 
Log Message:
Added more informations


Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/gaim-gadugadu/FC-6/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	31 Oct 2006 19:14:51 -0000	1.1
+++ dead.package	31 Oct 2006 20:56:44 -0000	1.2
@@ -1 +1,5 @@
 Obsolete package.
+
+Gadu-Gadu support is now included in gaim package, so gaim-gadugadu is unnecessary.
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209000



From fedora-extras-commits at redhat.com  Tue Oct 31 20:57:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 13:57:15 -0700
Subject: rpms/gaim-gadugadu/devel dead.package,1.1,1.2
Message-ID: <200610312057.k9VKvF38025149@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116/gaim-gadugadu/devel

Modified Files:
	dead.package 
Log Message:
Added more informations


Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/gaim-gadugadu/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	31 Oct 2006 19:14:57 -0000	1.1
+++ dead.package	31 Oct 2006 20:56:45 -0000	1.2
@@ -1 +1,5 @@
 Obsolete package.
+
+Gadu-Gadu support is now included in gaim package, so gaim-gadugadu is unnecessary.
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209000



From fedora-extras-commits at redhat.com  Tue Oct 31 21:16:39 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 31 Oct 2006 14:16:39 -0700
Subject: rpms/fbida/devel fbida.spec,1.18,1.19
Message-ID: <200610312116.k9VLGdRF028286@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28270

Modified Files:
	fbida.spec 
Log Message:
* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 2.06-3
- rebuilt for new curl



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fbida.spec	29 Sep 2006 05:49:48 -0000	1.18
+++ fbida.spec	31 Oct 2006 21:16:08 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -68,6 +68,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 2.06-3
+- rebuilt for new curl
+
 * Fri Sep 29 2006 Adrian Reber <adrian at lisas.de> - 2.06-2
 - obsoleted fbida-ida subpackage (#208457)
 



From fedora-extras-commits at redhat.com  Tue Oct 31 21:32:43 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 31 Oct 2006 14:32:43 -0700
Subject: rpms/grip/devel grip.spec,1.14,1.15
Message-ID: <200610312132.k9VLWh5g028428@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28407

Modified Files:
	grip.spec 
Log Message:
* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-14
- rebuilt for new curl



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- grip.spec	9 Sep 2006 17:18:55 -0000	1.14
+++ grip.spec	31 Oct 2006 21:32:13 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -74,6 +74,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-14
+- rebuilt for new curl
+
 * Sat Sep 09 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-13
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Oct 31 21:39:52 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 31 Oct 2006 14:39:52 -0700
Subject: rpms/pyicq-t/devel .cvsignore, 1.2, 1.3 pyicq-t.init, 1.1,
	1.2 pyicq-t.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610312139.k9VLdqkt028529@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/pyicq-t/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28507

Modified Files:
	.cvsignore pyicq-t.init pyicq-t.spec sources 
Log Message:
* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq
-t&relid=28)
- Fix init script to create subsys lock file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2006 23:42:07 -0000	1.2
+++ .cvsignore	31 Oct 2006 21:39:22 -0000	1.3
@@ -1 +1 @@
-pyicq-t-0.7b.tar.gz
+pyicq-t-0.8.tar.gz


Index: pyicq-t.init
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/pyicq-t.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyicq-t.init	5 Aug 2006 23:42:07 -0000	1.1
+++ pyicq-t.init	31 Oct 2006 21:39:22 -0000	1.2
@@ -12,7 +12,7 @@
         echo -n $"Starting ICQ transport: "
 	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
         RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
         echo
         return $RETVAL
 }


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/pyicq-t.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyicq-t.spec	8 Sep 2006 02:42:23 -0000	1.3
+++ pyicq-t.spec	31 Oct 2006 21:39:22 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           pyicq-t
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-0.7b.tar.gz
+Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -23,7 +23,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-Provides:	pyicqt
+Provides:       pyicqt
 Obsoletes:      pyicqt
 
 %description
@@ -45,7 +45,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n pyicq-t-0.7b
+%setup -q
 %patch0 -p0
 
 %build
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
+- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq-t&relid=28)
+- Fix init script to create subsys lock file
+
 * Thu Sep  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.7-5
 - Really no longer ghost *.pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2006 23:42:07 -0000	1.2
+++ sources	31 Oct 2006 21:39:22 -0000	1.3
@@ -1 +1 @@
-7de0df9311eb6923e6f59fdd914bb6ab  pyicq-t-0.7b.tar.gz
+0929aa4b726d8718e1b8c8cb900fa114  pyicq-t-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 21:42:59 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 31 Oct 2006 14:42:59 -0700
Subject: rpms/pyicq-t/FC-6 .cvsignore, 1.2, 1.3 pyicq-t.init, 1.1,
	1.2 pyicq-t.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610312142.k9VLgxvL028622@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/pyicq-t/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28598

Modified Files:
	.cvsignore pyicq-t.init pyicq-t.spec sources 
Log Message:
* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq
-t&relid=28)
- Fix init script to create subsys lock file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2006 23:42:07 -0000	1.2
+++ .cvsignore	31 Oct 2006 21:42:29 -0000	1.3
@@ -1 +1 @@
-pyicq-t-0.7b.tar.gz
+pyicq-t-0.8.tar.gz


Index: pyicq-t.init
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-6/pyicq-t.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyicq-t.init	5 Aug 2006 23:42:07 -0000	1.1
+++ pyicq-t.init	31 Oct 2006 21:42:29 -0000	1.2
@@ -12,7 +12,7 @@
         echo -n $"Starting ICQ transport: "
 	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
         RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
         echo
         return $RETVAL
 }


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-6/pyicq-t.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyicq-t.spec	8 Sep 2006 02:42:23 -0000	1.3
+++ pyicq-t.spec	31 Oct 2006 21:42:29 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           pyicq-t
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-0.7b.tar.gz
+Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -23,7 +23,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-Provides:	pyicqt
+Provides:       pyicqt
 Obsoletes:      pyicqt
 
 %description
@@ -45,7 +45,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n pyicq-t-0.7b
+%setup -q
 %patch0 -p0
 
 %build
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
+- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq-t&relid=28)
+- Fix init script to create subsys lock file
+
 * Thu Sep  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.7-5
 - Really no longer ghost *.pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2006 23:42:07 -0000	1.2
+++ sources	31 Oct 2006 21:42:29 -0000	1.3
@@ -1 +1 @@
-7de0df9311eb6923e6f59fdd914bb6ab  pyicq-t-0.7b.tar.gz
+0929aa4b726d8718e1b8c8cb900fa114  pyicq-t-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 21:45:25 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 31 Oct 2006 14:45:25 -0700
Subject: rpms/pyicq-t/FC-5 .cvsignore, 1.2, 1.3 pyicq-t.init, 1.1,
	1.2 pyicq-t.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610312145.k9VLjPJP028701@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/pyicq-t/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28669

Modified Files:
	.cvsignore pyicq-t.init pyicq-t.spec sources 
Log Message:
* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq
-t&relid=28)
- Fix init script to create subsys lock file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2006 23:42:07 -0000	1.2
+++ .cvsignore	31 Oct 2006 21:44:55 -0000	1.3
@@ -1 +1 @@
-pyicq-t-0.7b.tar.gz
+pyicq-t-0.8.tar.gz


Index: pyicq-t.init
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-5/pyicq-t.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyicq-t.init	5 Aug 2006 23:42:07 -0000	1.1
+++ pyicq-t.init	31 Oct 2006 21:44:55 -0000	1.2
@@ -12,7 +12,7 @@
         echo -n $"Starting ICQ transport: "
 	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
         RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
         echo
         return $RETVAL
 }


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-5/pyicq-t.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyicq-t.spec	8 Sep 2006 02:43:16 -0000	1.3
+++ pyicq-t.spec	31 Oct 2006 21:44:55 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           pyicq-t
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-0.7b.tar.gz
+Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -23,7 +23,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-Provides:	pyicqt
+Provides:       pyicqt
 Obsoletes:      pyicqt
 
 %description
@@ -45,7 +45,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n pyicq-t-0.7b
+%setup -q
 %patch0 -p0
 
 %build
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
+- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq-t&relid=28)
+- Fix init script to create subsys lock file
+
 * Thu Sep  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.7-5
 - Really no longer ghost *.pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2006 23:42:07 -0000	1.2
+++ sources	31 Oct 2006 21:44:55 -0000	1.3
@@ -1 +1 @@
-7de0df9311eb6923e6f59fdd914bb6ab  pyicq-t-0.7b.tar.gz
+0929aa4b726d8718e1b8c8cb900fa114  pyicq-t-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 21:46:32 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 31 Oct 2006 14:46:32 -0700
Subject: rpms/pyicq-t/FC-4 .cvsignore, 1.2, 1.3 pyicq-t.init, 1.1,
	1.2 pyicq-t.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610312146.k9VLkWaT028772@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/pyicq-t/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28750

Modified Files:
	.cvsignore pyicq-t.init pyicq-t.spec sources 
Log Message:
* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq
-t&relid=28)
- Fix init script to create subsys lock file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2006 23:42:07 -0000	1.2
+++ .cvsignore	31 Oct 2006 21:46:02 -0000	1.3
@@ -1 +1 @@
-pyicq-t-0.7b.tar.gz
+pyicq-t-0.8.tar.gz


Index: pyicq-t.init
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-4/pyicq-t.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyicq-t.init	5 Aug 2006 23:42:07 -0000	1.1
+++ pyicq-t.init	31 Oct 2006 21:46:02 -0000	1.2
@@ -12,7 +12,7 @@
         echo -n $"Starting ICQ transport: "
 	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
         RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
         echo
         return $RETVAL
 }


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-4/pyicq-t.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyicq-t.spec	8 Sep 2006 02:43:55 -0000	1.3
+++ pyicq-t.spec	31 Oct 2006 21:46:02 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           pyicq-t
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-0.7b.tar.gz
+Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -23,7 +23,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-Provides:	pyicqt
+Provides:       pyicqt
 Obsoletes:      pyicqt
 
 %description
@@ -45,7 +45,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n pyicq-t-0.7b
+%setup -q
 %patch0 -p0
 
 %build
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
+- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq-t&relid=28)
+- Fix init script to create subsys lock file
+
 * Thu Sep  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.7-5
 - Really no longer ghost *.pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2006 23:42:07 -0000	1.2
+++ sources	31 Oct 2006 21:46:02 -0000	1.3
@@ -1 +1 @@
-7de0df9311eb6923e6f59fdd914bb6ab  pyicq-t-0.7b.tar.gz
+0929aa4b726d8718e1b8c8cb900fa114  pyicq-t-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 22:36:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Oct 2006 15:36:28 -0700
Subject: rpms/gambas/devel gambas.spec,1.18,1.19
Message-ID: <200610312236.k9VMaS0T032141@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32124

Modified Files:
	gambas.spec 
Log Message:

Booooooooo!



Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gambas.spec	11 Sep 2006 01:44:17 -0000	1.18
+++ gambas.spec	31 Oct 2006 22:35:57 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.17
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -416,6 +416,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Tue Oct 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.17-4
+- a spoooky halloween bump for development
+
 * Sun Sep 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.17-3
 - disable x86_64, code is not (and likely never will be) 64bit clean
 



From fedora-extras-commits at redhat.com  Tue Oct 31 23:04:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 31 Oct 2006 16:04:33 -0700
Subject: rpms/gnome-applet-timer/FC-6 gnome-applet-timer.spec,1.7,1.8
Message-ID: <200610312304.k9VN4X6W002742@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2707/FC-6

Modified Files:
	gnome-applet-timer.spec 
Log Message:
fix of email adress


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-6/gnome-applet-timer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-applet-timer.spec	31 Oct 2006 02:11:21 -0000	1.7
+++ gnome-applet-timer.spec	31 Oct 2006 23:04:01 -0000	1.8
@@ -87,7 +87,7 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
-* Tue Oct 31 2006 Christoph Wickert <fedora wickert at arcor de> - 1.3.1-1
+* Tue Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 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



From fedora-extras-commits at redhat.com  Tue Oct 31 23:04:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 31 Oct 2006 16:04:34 -0700
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.7,1.8
Message-ID: <200610312304.k9VN4YJk002743@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2707/devel

Modified Files:
	gnome-applet-timer.spec 
Log Message:
fix of email adress


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-applet-timer.spec	31 Oct 2006 01:44:57 -0000	1.7
+++ gnome-applet-timer.spec	31 Oct 2006 23:04:04 -0000	1.8
@@ -87,7 +87,7 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
-* Tue Oct 31 2006 Christoph Wickert <fedora wickert at arcor de> - 1.3.1-1
+* Tue Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 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



From fedora-extras-commits at redhat.com  Tue Oct 31 23:11:47 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Oct 2006 16:11:47 -0700
Subject: rpms/cmake/devel cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.8,
	1.9
Message-ID: <200610312311.k9VNBl8o003139@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3114

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	11 Jul 2006 16:41:17 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:11:16 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cmake.spec	30 Aug 2006 02:26:07 -0000	1.8
+++ cmake.spec	31 Oct 2006 23:11:16 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-4
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Tue Oct 31 23:14:09 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Oct 2006 16:14:09 -0700
Subject: rpms/cmake/FC-5 cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.4,
	1.5
Message-ID: <200610312314.k9VNE9gq003223@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184/FC-5

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	31 Jul 2006 19:33:45 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:39 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cmake.spec	2 Aug 2006 17:55:32 -0000	1.4
+++ cmake.spec	31 Oct 2006 23:13:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Wed Aug  2 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-2
 - vim 7.0 now ships cmake files, so don't ship ours (bug #201018)
 - Add patch to Linux.cmake for Fortran soname support for plplot



From fedora-extras-commits at redhat.com  Tue Oct 31 23:14:10 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Oct 2006 16:14:10 -0700
Subject: rpms/cmake/FC-6 cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.8,
	1.9
Message-ID: <200610312314.k9VNEA8H003227@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184/FC-6

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	11 Jul 2006 16:41:17 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:40 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/cmake.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cmake.spec	30 Aug 2006 02:26:07 -0000	1.8
+++ cmake.spec	31 Oct 2006 23:13:40 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-4
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Tue Oct 31 23:16:03 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Oct 2006 16:16:03 -0700
Subject: rpms/cmake/FC-4 cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.6,
	1.7
Message-ID: <200610312316.k9VNG38N003262@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3241

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	31 Jul 2006 19:32:26 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:15:32 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/cmake.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cmake.spec	2 Aug 2006 17:54:37 -0000	1.6
+++ cmake.spec	31 Oct 2006 23:15:32 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Wed Aug  2 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-2
 - Add patch to Linux.cmake for Fortran soname support for plplot
 



From fedora-extras-commits at redhat.com  Sun Oct  1 01:32:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 30 Sep 2006 18:32:53 -0700
Subject: rpms/perl-Alien-wxWidgets/devel
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch, NONE,
	1.1 perl-Alien-wxWidgets.spec, 1.2, 1.3
Message-ID: <200610010132.k911WtOP009761@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9741

Modified Files:
	perl-Alien-wxWidgets.spec 
Added Files:
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch 
Log Message:
Patch to add /usr/lib64 to the library search path.

Alien-wxWidgets-0.21-Any_wx_config.pm.patch:

--- NEW FILE Alien-wxWidgets-0.21-Any_wx_config.pm.patch ---
diff -ruN Alien-wxWidgets-0.21-orig/inc/My/Build/Any_wx_config.pm Alien-wxWidgets-0.21/inc/My/Build/Any_wx_config.pm
--- Alien-wxWidgets-0.21-orig/inc/My/Build/Any_wx_config.pm	2006-08-27 16:21:49.000000000 +0100
+++ Alien-wxWidgets-0.21/inc/My/Build/Any_wx_config.pm	2006-10-01 02:27:40.000000000 +0100
@@ -116,7 +116,7 @@
     }
 
     my @paths = ( ( map { s/^-L//; $_ } grep { /^-L/ } split ' ', $libs ),
-                  qw(/usr/local/lib /usr/lib) );
+                  qw(/usr/local/lib /usr/lib /usr/lib64) );
 
     foreach ( split /\s+/, $libs ) {
         m{^-[lL]|/} && do { $config{link_libraries} .= " $_"; next; };


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Alien-wxWidgets.spec	28 Sep 2006 12:48:56 -0000	1.2
+++ perl-Alien-wxWidgets.spec	1 Oct 2006 01:32:52 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           perl-Alien-wxWidgets
 Version:        0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
+Patch0:         Alien-wxWidgets-0.21-Any_wx_config.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
+%patch0 -p1
 
 
 %build
@@ -51,6 +53,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-3
+- Patch to add /usr/lib64 to the library search path.
+
 * Thu Sep 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-2
 - This is a binary RPM (see bug #208007 comment #2).
 



From fedora-extras-commits at redhat.com  Sun Oct  1 01:48:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 30 Sep 2006 18:48:42 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-5
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch, NONE,
	1.1 perl-Alien-wxWidgets.spec, 1.2, 1.3
Message-ID: <200610010148.k911miIF009854@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834

Modified Files:
	perl-Alien-wxWidgets.spec 
Added Files:
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch 
Log Message:
Patch to add /usr/lib64 to the library search path.

Alien-wxWidgets-0.21-Any_wx_config.pm.patch:

--- NEW FILE Alien-wxWidgets-0.21-Any_wx_config.pm.patch ---
diff -ruN Alien-wxWidgets-0.21-orig/inc/My/Build/Any_wx_config.pm Alien-wxWidgets-0.21/inc/My/Build/Any_wx_config.pm
--- Alien-wxWidgets-0.21-orig/inc/My/Build/Any_wx_config.pm	2006-08-27 16:21:49.000000000 +0100
+++ Alien-wxWidgets-0.21/inc/My/Build/Any_wx_config.pm	2006-10-01 02:27:40.000000000 +0100
@@ -116,7 +116,7 @@
     }
 
     my @paths = ( ( map { s/^-L//; $_ } grep { /^-L/ } split ' ', $libs ),
-                  qw(/usr/local/lib /usr/lib) );
+                  qw(/usr/local/lib /usr/lib /usr/lib64) );
 
     foreach ( split /\s+/, $libs ) {
         m{^-[lL]|/} && do { $config{link_libraries} .= " $_"; next; };


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/perl-Alien-wxWidgets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Alien-wxWidgets.spec	28 Sep 2006 12:48:56 -0000	1.2
+++ perl-Alien-wxWidgets.spec	1 Oct 2006 01:48:42 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           perl-Alien-wxWidgets
 Version:        0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
+Patch0:         Alien-wxWidgets-0.21-Any_wx_config.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
+%patch0 -p1
 
 
 %build
@@ -51,6 +53,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-3
+- Patch to add /usr/lib64 to the library search path.
+
 * Thu Sep 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-2
 - This is a binary RPM (see bug #208007 comment #2).
 



From fedora-extras-commits at redhat.com  Sun Oct  1 04:20:42 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 30 Sep 2006 21:20:42 -0700
Subject: owners owners.list,1.1748,1.1749
Message-ID: <200610010420.k914Ki7d019098@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081/owners

Modified Files:
	owners.list 
Log Message:
No need to automatically CC: the extras-orphan account for ots, right? :)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -r1.1748 -r1.1749
--- owners.list	30 Sep 2006 20:33:40 -0000	1.1748
+++ owners.list	1 Oct 2006 04:20:41 -0000	1.1749
@@ -1155,7 +1155,7 @@
 Fedora Extras|osgcal|Adapts OpenSceneGraph to use Cal3D|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
 Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|otrs|The Open Ticket Request System|imlinux at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|ots|A text summarizer|peter at thecodergeek.com|extras-qa at fedoraproject.org|extras-orphan at fedoraproject.org
+Fedora Extras|ots|A text summarizer|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|overgod|Another Asteroid like game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|p0rn-comfort|Support programs for browsing image-gallery sites|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 04:41:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:41:27 -0700
Subject: rpms/evolution-bogofilter - New directory
Message-ID: <200610010441.k914fTdu019253@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19227/evolution-bogofilter

Log Message:
Directory /cvs/extras/rpms/evolution-bogofilter added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 04:41:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:41:28 -0700
Subject: rpms/evolution-bogofilter/devel - New directory
Message-ID: <200610010441.k914fU9h019256@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19227/evolution-bogofilter/devel

Log Message:
Directory /cvs/extras/rpms/evolution-bogofilter/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 04:41:36 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:41:36 -0700
Subject: rpms/evolution-bogofilter Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610010441.k914fcYB019300@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19272

Added Files:
	Makefile import.log 
Log Message:
Setup of module evolution-bogofilter


--- NEW FILE Makefile ---
# Top level Makefile for module evolution-bogofilter
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 04:41:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:41:37 -0700
Subject: rpms/evolution-bogofilter/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610010441.k914fdh6019303@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19272/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module evolution-bogofilter


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 04:42:01 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:42:01 -0700
Subject: rpms/evolution-bogofilter import.log,1.1,1.2
Message-ID: <200610010442.k914gXj1019370@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19336

Modified Files:
	import.log 
Log Message:
auto-import evolution-bogofilter-0.2.0-3.fc6 on branch devel from evolution-bogofilter-0.2.0-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/evolution-bogofilter/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 04:41:36 -0000	1.1
+++ import.log	1 Oct 2006 04:42:01 -0000	1.2
@@ -0,0 +1 @@
+evolution-bogofilter-0_2_0-3_fc6:HEAD:evolution-bogofilter-0.2.0-3.fc6.src.rpm:1159659718



From fedora-extras-commits at redhat.com  Sun Oct  1 04:42:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:42:02 -0700
Subject: rpms/evolution-bogofilter/devel evolution-bogofilter.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610010442.k914gY4l019374@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19336/devel

Modified Files:
	.cvsignore sources 
Added Files:
	evolution-bogofilter.spec 
Log Message:
auto-import evolution-bogofilter-0.2.0-3.fc6 on branch devel from evolution-bogofilter-0.2.0-3.fc6.src.rpm


--- NEW FILE evolution-bogofilter.spec ---
%define	evopluginver	%(pkg-config --list-all |grep evolution-plugin | sed -e "s/evolution-plugin-//g" | cut -d " " -f 1)

Name:		evolution-bogofilter
Summary:	A plugin for bogofilter support in evolution
Version: 	0.2.0
Release:	3%{?dist}
License:	GPL
Group:		Applications/Internet
URL:		http://people.altlinux.ru/~mhz/software/projects/bf-eplugin/
Source0:	http://people.altlinux.ru/~mhz/software/projects/bf-eplugin/bf-eplugin-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	evolution-devel, evolution-data-server-devel
BuildRequires:	pkgconfig
Requires:	bogofilter
Requires(post):	GConf2

%description
This plugin implements junk filtering for the Evolution mailer, provided by 
the bogofilter utility. Bogofilter (http://www.bogofilter.org) is a fast and 
nimble mail filter using a so-called Bayesian technique to classify junk and 
non-junk email.

%prep
%setup -q -n bf-eplugin-%{version}
%if "%{evopluginver}" != "2.6"
sed -i 's/evolution-plugin-2.6/evolution-plugin-%{evopluginver}/g' configure
%endif

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
rm -rf $RPM_BUILD_ROOT%{_libdir}/evolution/%{evopluginver}/plugins/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
SCHEMAS="bf-eplugin.schemas"
for S in $SCHEMAS; do
  gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
done

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%config(noreplace) %{_sysconfdir}/gconf/schemas/bf-eplugin.schemas
%{_libdir}/evolution/%{evopluginver}/plugins/*

%changelog
* Fri Sep 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.0-3
- add URL, even if it is a bit pointless
- add docs
- mark schemas as config
- change defattr to be more accurate

* Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.0-2
- add missing BR: evolution-data-server-devel

* Wed Jul 26 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.2.0-1
- Initial package for Fedora Extras.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evolution-bogofilter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 04:41:36 -0000	1.1
+++ .cvsignore	1 Oct 2006 04:42:02 -0000	1.2
@@ -0,0 +1 @@
+bf-eplugin-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evolution-bogofilter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 04:41:36 -0000	1.1
+++ sources	1 Oct 2006 04:42:02 -0000	1.2
@@ -0,0 +1 @@
+668f11a7f04a1af32b1077420854bd98  bf-eplugin-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 04:58:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 21:58:56 -0700
Subject: owners owners.list,1.1749,1.1750
Message-ID: <200610010458.k914wwS0019609@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19592

Modified Files:
	owners.list 
Log Message:

Add evolution-bogofilter.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1749
retrieving revision 1.1750
diff -u -r1.1749 -r1.1750
--- owners.list	1 Oct 2006 04:20:41 -0000	1.1749
+++ owners.list	1 Oct 2006 04:58:56 -0000	1.1750
@@ -350,6 +350,7 @@
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|evas|A hardware-accelerated canvas API|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|eventlog|Syslog-ng v2 support library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|evolution-bogofilter|A plugin for bogofilter support in evolution|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exiv2|Exif and Iptc metadata manipulation library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 05:00:54 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 30 Sep 2006 22:00:54 -0700
Subject: comps comps-fe5.xml.in,1.157,1.158 comps-fe6.xml.in,1.170,1.171
Message-ID: <200610010500.k9150uxq019655@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19636

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:

Evolution-bogofilter



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- comps-fe5.xml.in	28 Sep 2006 20:07:53 -0000	1.157
+++ comps-fe5.xml.in	1 Oct 2006 05:00:54 -0000	1.158
@@ -451,6 +451,7 @@
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">dillo</packagereq>
       <packagereq type="optional">drivel</packagereq>
+      <packagereq type="optional">evolution-bogofilter</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
       <packagereq type="optional">gaim-gaym</packagereq>
       <packagereq type="optional">gajim</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- comps-fe6.xml.in	28 Sep 2006 20:07:53 -0000	1.170
+++ comps-fe6.xml.in	1 Oct 2006 05:00:54 -0000	1.171
@@ -521,6 +521,7 @@
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">dillo</packagereq>
       <packagereq type="optional">drivel</packagereq>
+      <packagereq type="optional">evolution-bogofilter</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
       <packagereq type="optional">gajim</packagereq>
       <packagereq type="optional">galeon</packagereq>



From fedora-extras-commits at redhat.com  Sun Oct  1 09:43:24 2006
From: fedora-extras-commits at redhat.com (Frank Arnold (farnold))
Date: Sun,  1 Oct 2006 02:43:24 -0700
Subject: rpms/linux-libertine-fonts/devel .cvsignore, 1.4,
	1.5 linux-libertine-fonts.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200610010943.k919hQrw003856@cvs-int.fedora.redhat.com>

Author: farnold

Update of /cvs/extras/rpms/linux-libertine-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3835

Modified Files:
	.cvsignore linux-libertine-fonts.spec sources 
Log Message:
* Tue Oct 01 2006 Frank Arnold <frank at scirocco-5v-turbo.de> 2.2.0-1
- Updated to 2.2.0
- Removed ghosted cache file as it's no longer stored in tree
- Disabled generation of PDF files because fontforge will segfault
- Added OFL to License field



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Sep 2006 00:06:46 -0000	1.4
+++ .cvsignore	1 Oct 2006 09:43:23 -0000	1.5
@@ -1 +1 @@
-LinLibertineSRC-2.1.9.tgz
+LinLibertineSRC-2.2.0.tgz


Index: linux-libertine-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/linux-libertine-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-libertine-fonts.spec	20 Sep 2006 00:06:46 -0000	1.4
+++ linux-libertine-fonts.spec	1 Oct 2006 09:43:23 -0000	1.5
@@ -2,11 +2,11 @@
 %define fontdir         %{_datadir}/fonts/linux-libertine
 
 Name:          linux-libertine-fonts
-Version:       2.1.9
-Release:       2%{?dist}
+Version:       2.2.0
+Release:       1%{?dist}
 Summary:       Linux Libertine Open Fonts
 Group:         User Interface/X
-License:       GPL
+License:       OFL/GPL
 URL:           http://linuxlibertine.sf.net
 Source:        http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,8 +29,8 @@
 while ( i < \$argc )
   Open (\$argv[i], 1)
   Generate (\$fontname + ".ttf")
-  PrintSetup (5)
-  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
+# PrintSetup (5)
+# PrintFont (0, 0, "", \$fontname + "-sample.pdf")
   Close()
   i++
 endloop
@@ -43,10 +43,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -p -m 0644 *.ttf  $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,18 +64,23 @@
 
 %files
 %defattr(644,root,root,755)
-%doc Bugs ChangeLog.txt Readme *.pdf
+%doc Bugs Readme *.txt
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Tue Oct 01 2006 Frank Arnold <frank at scirocco-5v-turbo.de> 2.2.0-1
+- Updated to 2.2.0
+- Removed ghosted cache file as it's no longer stored in tree
+- Disabled generation of PDF files because fontforge will segfault
+- Added OFL to License field
+
 * Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> 2.1.9-2
-- Upload proper 2.9.1 sources and rebuild
+- Upload proper 2.1.9 sources and rebuild
 
 * Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> 2.1.9-1
-- Update to 2.9.1
+- Update to 2.1.9
 
 * Tue Aug 29 2006 Frank Arnold <frank at scirocco-5v-turbo.de> 2.1.0-1
 - Updated to 2.1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Sep 2006 00:06:46 -0000	1.4
+++ sources	1 Oct 2006 09:43:23 -0000	1.5
@@ -1 +1 @@
-18a516945e3b2e40bb34bacad3453b20  LinLibertineSRC-2.1.9.tgz
+7262729601f8e308a5a4c51b54a34057  LinLibertineSRC-2.2.0.tgz



From fedora-extras-commits at redhat.com  Sun Oct  1 12:04:35 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:04:35 -0700
Subject: rpms/newsx/devel - New directory
Message-ID: <200610011204.k91C4bTl019187@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19158/newsx/devel

Log Message:
Directory /cvs/extras/rpms/newsx/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 12:04:34 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:04:34 -0700
Subject: rpms/newsx - New directory
Message-ID: <200610011204.k91C4a7Y019181@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19158/newsx

Log Message:
Directory /cvs/extras/rpms/newsx added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 12:05:00 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:05:00 -0700
Subject: rpms/newsx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610011205.k91C52GT019236@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19203

Added Files:
	Makefile import.log 
Log Message:
Setup of module newsx


--- NEW FILE Makefile ---
# Top level Makefile for module newsx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 12:05:01 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:05:01 -0700
Subject: rpms/newsx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610011205.k91C54Oc019239@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19203/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module newsx


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 12:06:47 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:06:47 -0700
Subject: rpms/newsx import.log,1.1,1.2
Message-ID: <200610011206.k91C6nWW019309@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19275

Modified Files:
	import.log 
Log Message:
auto-import newsx-1.6-3 on branch devel from newsx-1.6-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/newsx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 12:04:59 -0000	1.1
+++ import.log	1 Oct 2006 12:06:47 -0000	1.2
@@ -0,0 +1 @@
+newsx-1_6-3:HEAD:newsx-1.6-3.src.rpm:1159704400



From fedora-extras-commits at redhat.com  Sun Oct  1 12:06:47 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:06:47 -0700
Subject: rpms/newsx/devel newsx-make.patch, NONE, 1.1 newsx.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610011206.k91C6nOF019316@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19275/devel

Modified Files:
	.cvsignore sources 
Added Files:
	newsx-make.patch newsx.spec 
Log Message:
auto-import newsx-1.6-3 on branch devel from newsx-1.6-3.src.rpm

newsx-make.patch:

--- NEW FILE newsx-make.patch ---
--- newsx-1.6/configure.ac.orig	2003-05-18 12:57:24.000000000 +0200
+++ newsx-1.6/configure.ac	2003-11-01 17:49:44.632034248 +0100
@@ -690,7 +690,6 @@
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MMAP
-AC_CHECK_LIB(nsl, main)
 AC_CHECK_LIB(inet, main)
 AC_CHECK_LIB(socket, main)
 AC_CHECK_LIB(gen, syslog)
@@ -719,7 +718,7 @@
     dnl Note that double inclusion of -lstorage seem to be required
     dnl on some systems to get the QIO-functions
     dnl
-    LIBS="$LIBS -linn -lstorage"
+    LIBS="$LIBS -linnhist -linn -lstorage"
     AC_CHECK_LIB(storage, IsToken, HAVE_LIBSTORAGE=1)
 
     dnl
@@ -774,7 +773,7 @@
     dnl Note that double inclusion of -lstorage seem to be required
     dnl on some systems to get the QIO-functions
     dnl
-    MORELIBS2="-lstorage $MORELIBS2 -lstorage"
+    MORELIBS2="-lstorage -linnhist $MORELIBS2 -lstorage"
     dnl BUG: remove...
     dnl LIBS="-lstorage $LIBS -lstorage"
     AC_DEFINE_UNQUOTED(HAVE_LIBSTORAGE, 1, [for INN 2.x: storage-API available?])
--- newsx-1.6/src/Makefile.am.orig	2003-05-18 12:57:24.000000000 +0200
+++ newsx-1.6/src/Makefile.am	2003-11-01 18:12:59.022054744 +0100
@@ -99,16 +99,16 @@
 
 # Prepare a place for newsx in the news spool: 
 install-exec-local:
-	if test ! -d ${INHOSTS} ; then \
-	    if test -d ${SPOOL}/in.hosts ; then \
+	if test ! -d $(DESTDIR)${INHOSTS} ; then \
+	    if test -d $(DESTDIR)${SPOOL}/in.hosts ; then \
 		echo The default location has changed, so we move ;\
 		echo the directory ${SPOOL}/in.hosts to ${INHOSTS} ;\
-		mv ${SPOOL}/in.hosts ${INHOSTS} ;\
+		mv $(DESTDIR)${SPOOL}/in.hosts $(DESTDIR)${INHOSTS} ;\
 	    else \
-		echo Creating directory ${INHOSTS} ;\
+		echo Creating directory $(DESTDIR)${INHOSTS} ;\
 		umask @INN_NEWSUMASK@ ;\
-		mkdir ${INHOSTS} ;\
-		chown ${NEWSUSER} ${INHOSTS} ;\
+		install -d $(DESTDIR)${INHOSTS} ;\
+		[ `id -u` -gt 0 ] || chown ${NEWSUSER} $(DESTDIR)${INHOSTS} ;\
 	    fi ;\
 	fi
 


--- NEW FILE newsx.spec ---
# $Revision: 1.5 $, $Date: 2006/07/28 17:49:36 $
Name:		newsx
Version:	1.6
Release:	3%{?dist}
License:	GPL
Summary:	NNTP news exchange utility
Summary(pl):	Narz??dzie do wymiany news??w po NNTP
Group:		Applications/Internet
Source0:	ftp://ftp.kvaleberg.com/pub/%{name}-%{version}.tar.gz
# Source0-md5:	ad9c76c53d5c7d21d86bec805fe8cd34
Patch0:		%{name}-make.patch
URL:		http://www.kvaleberg.com/newsx.html
BuildRequires:	inn-devel
BuildRequires:	automake
BuildRequires:	autoconf
Requires:	inn
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Newsx is an NNTP client that will connect to a remote NNTP server and
post outgoing news articles batched by the news system (e.g. INN), as
well as fetch incoming articles.

%description -l pl
Newsx jest klientem NNTP kt??ry ????czy si?? ze zdalnym serwerem i wysy??a
wychodz??ce artyku??y zgromadzone przez system news??w (np. INN) oraz
pobiera przychodz??ce artyku??y.

%prep
%setup -q
%patch0 -p1

%build
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
%configure

%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

%{__make} install \
	DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
%attr(755,root,root) %{_bindir}/*
%attr(770,root,news) %dir /var/spool/news/inhosts
%{_mandir}/man[158]/*

%changelog
* Fri Jul 27 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-3
- remove unnecessary Provides: tag

* Sun Apr 02 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-2
- fix BuildReqs

* Sat Jan 07 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-1
- FE compliance

* Sun Sep 25 2005 Dominik Mierzejewski <rpm at greysector.net>
- rebuilt for Fedora based on PLD specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 12:05:00 -0000	1.1
+++ .cvsignore	1 Oct 2006 12:06:47 -0000	1.2
@@ -0,0 +1 @@
+newsx-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 12:05:00 -0000	1.1
+++ sources	1 Oct 2006 12:06:47 -0000	1.2
@@ -0,0 +1 @@
+ad9c76c53d5c7d21d86bec805fe8cd34  newsx-1.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 12:09:48 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:09:48 -0700
Subject: owners owners.list,1.1750,1.1751
Message-ID: <200610011209.k91C9oM1019487@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19470

Modified Files:
	owners.list 
Log Message:
Add myself as the maintainer of newsx.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1750
retrieving revision 1.1751
diff -u -r1.1750 -r1.1751
--- owners.list	1 Oct 2006 04:58:56 -0000	1.1750
+++ owners.list	1 Oct 2006 12:09:48 -0000	1.1751
@@ -1095,6 +1095,7 @@
 Fedora Extras|new|A simple template system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
+Fedora Extras|newsx|NNTP news exchange utility|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 12:22:31 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:22:31 -0700
Subject: rpms/newsx/devel newsx.spec,1.1,1.2
Message-ID: <200610011222.k91CMXBY019531@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19514

Modified Files:
	newsx.spec 
Log Message:
- fix build on devel


Index: newsx.spec
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/newsx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newsx.spec	1 Oct 2006 12:06:47 -0000	1.1
+++ newsx.spec	1 Oct 2006 12:22:31 -0000	1.2
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 Name:		newsx
 Version:	1.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz??dzie do wymiany news??w po NNTP
@@ -35,7 +35,7 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure --with-history=%{_var}/lib/news/history
 
 %{__make} %{?_smp_mflags}
 
@@ -56,6 +56,9 @@
 %{_mandir}/man[158]/*
 
 %changelog
+* Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-4
+- fix build on devel
+
 * Fri Jul 27 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-3
 - remove unnecessary Provides: tag
 



From fedora-extras-commits at redhat.com  Sun Oct  1 12:27:49 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun,  1 Oct 2006 05:27:49 -0700
Subject: rpms/newsx/devel newsx.spec,1.2,1.3
Message-ID: <200610011227.k91CRp5W019609@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19592

Modified Files:
	newsx.spec 
Log Message:
- really fix build on devel


Index: newsx.spec
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/newsx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newsx.spec	1 Oct 2006 12:22:31 -0000	1.2
+++ newsx.spec	1 Oct 2006 12:27:49 -0000	1.3
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 Name:		newsx
 Version:	1.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz??dzie do wymiany news??w po NNTP
@@ -35,7 +35,7 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure --with-history=%{_var}/lib/news/history
+%configure --without-history
 
 %{__make} %{?_smp_mflags}
 
@@ -56,7 +56,7 @@
 %{_mandir}/man[158]/*
 
 %changelog
-* Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-4
+* Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-5
 - fix build on devel
 
 * Fri Jul 27 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-3



From fedora-extras-commits at redhat.com  Sun Oct  1 12:36:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:36:51 -0700
Subject: rpms/php-pear-Console-Getargs - New directory
Message-ID: <200610011236.k91CarCP019755@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19729/php-pear-Console-Getargs

Log Message:
Directory /cvs/extras/rpms/php-pear-Console-Getargs added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 12:36:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:36:51 -0700
Subject: rpms/php-pear-Console-Getargs/devel - New directory
Message-ID: <200610011236.k91Car3M019758@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19729/php-pear-Console-Getargs/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Console-Getargs/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 12:37:14 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:37:14 -0700
Subject: rpms/php-pear-Console-Getargs/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610011237.k91CbGWp019810@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19774/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Console-Getargs


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 12:37:14 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:37:14 -0700
Subject: rpms/php-pear-Console-Getargs Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200610011237.k91CbGSX019807@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19774

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Console-Getargs


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Console-Getargs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 12:38:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:38:04 -0700
Subject: rpms/php-pear-Console-Getargs import.log,1.1,1.2
Message-ID: <200610011238.k91Cc6Wb019883@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19848

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Console-Getargs-1.3.1-1.fc5 on branch devel from php-pear-Console-Getargs-1.3.1-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 12:37:13 -0000	1.1
+++ import.log	1 Oct 2006 12:38:04 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Console-Getargs-1_3_1-1_fc5:HEAD:php-pear-Console-Getargs-1.3.1-1.fc5.src.rpm:1159706275



From fedora-extras-commits at redhat.com  Sun Oct  1 12:38:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:38:04 -0700
Subject: rpms/php-pear-Console-Getargs/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-Console-Getargs.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610011238.k91Cc6n0019888@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19848/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-Console-Getargs.spec xml2changelog 
Log Message:
auto-import php-pear-Console-Getargs-1.3.1-1.fc5 on branch devel from php-pear-Console-Getargs-1.3.1-1.fc5.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     <http://www.php.net/software/>".

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

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

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see <http://www.php.net>.

PHP includes the Zend Engine, freely available at
<http://www.zend.com>.


--- NEW FILE php-pear-Console-Getargs.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Console_Getargs

Name:           php-pear-Console-Getargs
Version:        1.3.1
Release:        1%{?dist}
Summary:        Command-line arguments and parameters parser
Summary(fr):    Analyseur des arguments et param??tres en ligne de commande

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Console_Getargs
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php >= 4.1.0 php-pear(PEAR)

%description
The Console_Getargs package implements a Command Line arguments and
parameters parser for your CLI applications. It performs some basic
arguments validation and automatically creates a formatted help text,
based on the given configuration.
 
%description -l fr
L'extension Console_Getargs fournit un analyseur des arguments et des
param??tres pass??s ?? vos applications sur la ligne de commande. 
Il r??alise quelques validations simples des arguments et cr??e 
automatiquement un texte d'aide ?? partir de la configuration fournie.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml

%{__install} -m 644 -c %{SOURCE1} LICENSE

%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.

%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE docdir/examples
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Console/Getargs.php
%{pear_testdir}/%{pear_name}

%changelog
* Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
- generated specfile (pear make-rpm-spec) + cleaning
- generated CHANGELOG
- add LICENSE, french summary and description


--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 12:37:14 -0000	1.1
+++ .cvsignore	1 Oct 2006 12:38:04 -0000	1.2
@@ -0,0 +1 @@
+Console_Getargs-1.3.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 12:37:14 -0000	1.1
+++ sources	1 Oct 2006 12:38:04 -0000	1.2
@@ -0,0 +1 @@
+67b5918343fa24f3e311d159e168b5dc  Console_Getargs-1.3.1.tgz



From fedora-extras-commits at redhat.com  Sun Oct  1 12:40:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  1 Oct 2006 05:40:27 -0700
Subject: rpms/libcddb/devel .cvsignore, 1.5, 1.6 libcddb.spec, 1.19,
	1.20 sources, 1.6, 1.7
Message-ID: <200610011240.k91CeT6u019957@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libcddb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19936

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
* Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
- New upstream release 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 14:50:41 -0000	1.5
+++ .cvsignore	1 Oct 2006 12:40:27 -0000	1.6
@@ -1 +1 @@
-libcddb-1.2.1.tar.bz2
+libcddb-1.2.2.tar.bz2


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libcddb.spec	24 Sep 2006 06:35:52 -0000	1.19
+++ libcddb.spec	1 Oct 2006 12:40:27 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.2.1
-Release:	5%{?dist}
+Version:	1.2.2
+Release:	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://libcddb.sourceforge.net/
@@ -33,6 +33,9 @@
 
 %build
 %configure
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -66,6 +69,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
+- New upstream release 1.2.2
+
 * Sun Sep 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-5
 - Rebuild for new libcdio
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Aug 2005 14:50:41 -0000	1.6
+++ sources	1 Oct 2006 12:40:27 -0000	1.7
@@ -1 +1 @@
-2861fe1299da273fe68783abecc3fe62  libcddb-1.2.1.tar.bz2
+0735015d78b2d951fae3e2fcfb660591  libcddb-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 12:41:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  1 Oct 2006 05:41:13 -0700
Subject: rpms/libcddb/FC-5 .cvsignore, 1.5, 1.6 libcddb.spec, 1.17,
	1.18 sources, 1.6, 1.7
Message-ID: <200610011241.k91CfFAw020022@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libcddb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20001

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
* Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
- New upstream release 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 14:50:41 -0000	1.5
+++ .cvsignore	1 Oct 2006 12:41:13 -0000	1.6
@@ -1 +1 @@
-libcddb-1.2.1.tar.bz2
+libcddb-1.2.2.tar.bz2


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-5/libcddb.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libcddb.spec	23 Jul 2006 09:07:31 -0000	1.17
+++ libcddb.spec	1 Oct 2006 12:41:13 -0000	1.18
@@ -1,12 +1,11 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.2.1
-Release:	3%{?dist}
-
+Version:	1.2.2
+Release:	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://libcddb.sourceforge.net/
-Source0: 	http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2
+Source0: 	http://dl.sf.net/sourceforge/libcddb/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires:	pkgconfig libcdio-devel >= 0.67
 
@@ -14,6 +13,7 @@
 Libcddb is a library that implements the different protocols (CDDBP,
 HTTP, SMTP) to access data on a CDDB server (e.g http://freedb.org/).
 
+
 %package devel
 Summary:	Development files for libcddb
 Group:		Development/Libraries
@@ -33,13 +33,15 @@
 
 %build
 %configure
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
@@ -48,6 +50,7 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
@@ -66,6 +69,15 @@
 
 
 %changelog
+* Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
+- New upstream release 1.2.2
+
+* Sun Sep 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-5
+- Rebuild for new libcdio
+
+* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-4
+- FE6 Rebuild
+
 * Sun Jul 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-3
 - Taking over as maintainer since Anvil has other priorities
 - Long long due rebuild with new gcc for FC-5, it seems this may have already


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Aug 2005 14:50:41 -0000	1.6
+++ sources	1 Oct 2006 12:41:13 -0000	1.7
@@ -1 +1 @@
-2861fe1299da273fe68783abecc3fe62  libcddb-1.2.1.tar.bz2
+0735015d78b2d951fae3e2fcfb660591  libcddb-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 12:42:00 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 05:42:00 -0700
Subject: owners owners.list,1.1751,1.1752
Message-ID: <200610011242.k91Cg2om020083@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20066

Modified Files:
	owners.list 
Log Message:
	add php-pear-Console-Getargs



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1751
retrieving revision 1.1752
diff -u -r1.1751 -r1.1752
--- owners.list	1 Oct 2006 12:09:48 -0000	1.1751
+++ owners.list	1 Oct 2006 12:42:00 -0000	1.1752
@@ -1691,6 +1691,7 @@
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Auth-SASL|Abstraction of various SASL mechanism responses|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Benchmark|Framework to benchmark PHP scripts or function calls|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Console-Getargs|Command-line arguments and parameters parser|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Console-Table|Class that makes it easy to build console style tables|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:06 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:06 -0700
Subject: rpms/telepathy-filesystem - New directory
Message-ID: <200610011312.k91DC8Om023059@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23033/telepathy-filesystem

Log Message:
Directory /cvs/extras/rpms/telepathy-filesystem added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:07 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:07 -0700
Subject: rpms/telepathy-filesystem/devel - New directory
Message-ID: <200610011312.k91DC9Iq023062@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23033/telepathy-filesystem/devel

Log Message:
Directory /cvs/extras/rpms/telepathy-filesystem/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:22 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:22 -0700
Subject: rpms/telepathy-filesystem/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610011312.k91DCOSQ023109@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23078/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module telepathy-filesystem


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:21 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:21 -0700
Subject: rpms/telepathy-filesystem Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610011312.k91DCNN6023106@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23078

Added Files:
	Makefile import.log 
Log Message:
Setup of module telepathy-filesystem


--- NEW FILE Makefile ---
# Top level Makefile for module telepathy-filesystem
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:38 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:38 -0700
Subject: rpms/telepathy-filesystem/devel telepathy-filesystem.spec,NONE,1.1
Message-ID: <200610011312.k91DCe7T023161@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23135/devel

Added Files:
	telepathy-filesystem.spec 
Log Message:
auto-import telepathy-filesystem-0.0.1-1 on branch devel from telepathy-filesystem-0.0.1-1.src.rpm


--- NEW FILE telepathy-filesystem.spec ---
Name:           telepathy-filesystem
Version:        0.0.1
Release:        1%{?dist}
Summary:        Telepathy filesystem layout

Group:          System Environment/Base
License:        Public Domain
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       filesystem


%description
This package provides some directories which are required by other
packages which comprise the Telepathy release.  

%prep


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/telepathy/managers


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_datadir}/telepathy
%dir %{_datadir}/telepathy/managers


%changelog
* Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.1-1
- Initial FE spec.




From fedora-extras-commits at redhat.com  Sun Oct  1 13:12:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:12:37 -0700
Subject: rpms/telepathy-filesystem import.log,1.1,1.2
Message-ID: <200610011313.k91DD960023170@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23135

Modified Files:
	import.log 
Log Message:
auto-import telepathy-filesystem-0.0.1-1 on branch devel from telepathy-filesystem-0.0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/telepathy-filesystem/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 13:12:21 -0000	1.1
+++ import.log	1 Oct 2006 13:12:37 -0000	1.2
@@ -0,0 +1 @@
+telepathy-filesystem-0_0_1-1:HEAD:telepathy-filesystem-0.0.1-1.src.rpm:1159708380



From fedora-extras-commits at redhat.com  Sun Oct  1 13:16:53 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:16:53 -0700
Subject: owners owners.list,1.1752,1.1753
Message-ID: <200610011316.k91DGtAl023239@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23222

Modified Files:
	owners.list 
Log Message:
add telepathy-filesystem & telepathy-butterfly


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1752
retrieving revision 1.1753
diff -u -r1.1752 -r1.1753
--- owners.list	1 Oct 2006 12:42:00 -0000	1.1752
+++ owners.list	1 Oct 2006 13:16:53 -0000	1.1753
@@ -2092,7 +2092,9 @@
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcpick|A tcp stream sniffer, tracker and capturer|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|telepathy-butterfly|MSN connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|telepathy-filesystem|Telepathy filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tellico|A collection manager|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|terminus-font|Clean fixed width font|rhbugs at n-dimensional.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 13:17:43 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:17:43 -0700
Subject: rpms/telepathy-butterfly - New directory
Message-ID: <200610011317.k91DHjQ3023314@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288/telepathy-butterfly

Log Message:
Directory /cvs/extras/rpms/telepathy-butterfly added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 13:17:44 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:17:44 -0700
Subject: rpms/telepathy-butterfly/devel - New directory
Message-ID: <200610011317.k91DHk02023317@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288/telepathy-butterfly/devel

Log Message:
Directory /cvs/extras/rpms/telepathy-butterfly/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 13:17:52 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:17:52 -0700
Subject: rpms/telepathy-butterfly Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610011317.k91DHsew023362@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23334

Added Files:
	Makefile import.log 
Log Message:
Setup of module telepathy-butterfly


--- NEW FILE Makefile ---
# Top level Makefile for module telepathy-butterfly
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 13:17:53 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:17:53 -0700
Subject: rpms/telepathy-butterfly/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610011317.k91DHthY023365@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23334/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module telepathy-butterfly


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 13:18:12 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:18:12 -0700
Subject: rpms/telepathy-butterfly/devel telepathy-butterfly.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610011318.k91DIid6023438@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23398/devel

Modified Files:
	.cvsignore sources 
Added Files:
	telepathy-butterfly.spec 
Log Message:
auto-import telepathy-butterfly-0.1.0-1 on branch devel from telepathy-butterfly-0.1.0-1.src.rpm


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

Name:           telepathy-butterfly
Version:        0.1.0
Release:        1%{?dist}
Summary:        MSN connection manager for Telepathy

Group:          Applications/Communications
License:        GPL
URL:            http://telepathy.freedesktop.org/wiki/
Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	dbus-devel
BuildRequires:	pkgconfig

Requires:	python-telepathy
Requires:	pymsn
Requires:	dbus
Requires:	telepathy-filesystem


%description
An MSN connection manager that handles presence, personal messages,
and conversations


%prep
%setup -q


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_bindir}/%{name}
%{_datadir}/dbus-1/services/*.service
%{_datadir}/telepathy/managers/*.manager
%{python_sitelib}/*



%changelog
* Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.0-1
- Initial FE spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 13:17:53 -0000	1.1
+++ .cvsignore	1 Oct 2006 13:18:12 -0000	1.2
@@ -0,0 +1 @@
+telepathy-butterfly-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 13:17:53 -0000	1.1
+++ sources	1 Oct 2006 13:18:12 -0000	1.2
@@ -0,0 +1 @@
+425c5ea49c01a88b7b7eb144a52e6c54  telepathy-butterfly-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 13:18:11 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:18:11 -0700
Subject: rpms/telepathy-butterfly import.log,1.1,1.2
Message-ID: <200610011318.k91DIhSu023434@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23398

Modified Files:
	import.log 
Log Message:
auto-import telepathy-butterfly-0.1.0-1 on branch devel from telepathy-butterfly-0.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 13:17:52 -0000	1.1
+++ import.log	1 Oct 2006 13:18:11 -0000	1.2
@@ -0,0 +1 @@
+telepathy-butterfly-0_1_0-1:HEAD:telepathy-butterfly-0.1.0-1.src.rpm:1159708714



From fedora-extras-commits at redhat.com  Sun Oct  1 13:37:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  1 Oct 2006 06:37:34 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 telepathy-gabble.spec, 1.5, 1.6
Message-ID: <200610011337.k91DbaZ8023646@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23625

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Sun Oct  1 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
- Update to 0.3.7.
- Add requires on telepathy-filesystem.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 23:01:12 -0000	1.5
+++ .cvsignore	1 Oct 2006 13:37:34 -0000	1.6
@@ -1 +1 @@
-telepathy-gabble-0.3.6.tar.gz
+telepathy-gabble-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 23:01:12 -0000	1.5
+++ sources	1 Oct 2006 13:37:34 -0000	1.6
@@ -1 +1 @@
-c00abd483990efca44a4699e3f533505  telepathy-gabble-0.3.6.tar.gz
+f47b65038041173885b5dacdc0d9881e  telepathy-gabble-0.3.7.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- telepathy-gabble.spec	21 Sep 2006 23:01:12 -0000	1.5
+++ telepathy-gabble.spec	1 Oct 2006 13:37:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.6
+Version:        0.3.7
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -13,6 +13,8 @@
 BuildRequires:	dbus-glib-devel
 BuildRequires:	loudmouth-devel
 
+Requires:	telepathy-filesystem
+
 
 %description
 A Jabber/XMPP connection manager, that handles single and multi-user
@@ -42,12 +44,14 @@
 %doc COPYING AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/dbus-1/services/*.service
-%dir %{_datadir}/telepathy/
-%dir %{_datadir}/telepathy/managers/
 %{_datadir}/telepathy/managers/*.manager
 
 
 %changelog
+* Sun Oct  1 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
+- Update to 0.3.7.
+- Add requires on telepathy-filesystem.
+
 * Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.6-1
 - Update to 0.3.6.
 



From fedora-extras-commits at redhat.com  Sun Oct  1 13:54:52 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sun,  1 Oct 2006 06:54:52 -0700
Subject: rpms/libpng10/devel libpng10.spec,1.3,1.4
Message-ID: <200610011354.k91DssST023734@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libpng10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23717

Modified Files:
	libpng10.spec 
Log Message:
rebuild with latest toolchain



Index: libpng10.spec
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libpng10.spec	2 Aug 2006 07:18:24 -0000	1.3
+++ libpng10.spec	1 Oct 2006 13:54:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
 Version:	1.0.20
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	zlib License
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Sun Oct  1 2006 Paul Howarth <paul at city-fan.org> 1.0.20-4
+- rebuild with latest toolchain
+
 * Tue Aug  1 2006 Paul Howarth <paul at city-fan.org> 1.0.20-3
 - reenable %%{_smp_mflags}
 - use patched configure script rather than old Makefiles



From fedora-extras-commits at redhat.com  Sun Oct  1 14:39:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Oct 2006 07:39:02 -0700
Subject: rpms/ksensors/FC-5 ksensors-0.7.3-po.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 ksensors.spec, 1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200610011439.k91Ed4kA026891@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ksensors/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26850/FC-5

Modified Files:
	.cvsignore ksensors.spec sources 
Added Files:
	ksensors-0.7.3-po.patch 
Log Message:
* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-7
- Apply Debian -11 patchset for upstream radio button state fix,
  support for hddtemp with SCSI disks and more translations.


ksensors-0.7.3-po.patch:

--- NEW FILE ksensors-0.7.3-po.patch ---
--- ksensors-0.7.3/po/Makefile.in~	2004-08-19 00:39:08.000000000 +0300
+++ ksensors-0.7.3/po/Makefile.in	2006-10-01 00:08:46.000000000 +0300
@@ -255,8 +255,8 @@
 xdg_directorydir = @xdg_directorydir@
 #>- POFILES = AUTO
 #>+ 2
-POFILES = nl.po fr.po es.po de.po cs.po
-GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo
+POFILES = nl.po fr.po es.po de.po cs.po it.po pl.po sv.po
+GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo it.gmo pl.gmo sv.gmo
 subdir = po
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -431,6 +431,15 @@
 cs.gmo: cs.po
 	rm -f cs.gmo; $(GMSGFMT) -o cs.gmo $(srcdir)/cs.po
 	test ! -f cs.gmo || touch cs.gmo
+it.gmo: it.po
+	rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po
+	test ! -f it.gmo || touch it.gmo
+pl.gmo: pl.po
+	rm -f pl.gmo; $(GMSGFMT) -o pl.gmo $(srcdir)/pl.po
+	test ! -f pl.gmo || touch pl.gmo
+sv.gmo: sv.po
+	rm -f sv.gmo; $(GMSGFMT) -o sv.gmo $(srcdir)/sv.po
+	test ! -f sv.gmo || touch sv.gmo
 
 #>+ 3
 clean-nls:
@@ -438,7 +447,7 @@
 
 #>+ 10
 install-nls:
-	@for base in nl fr es de cs ; do \
+	@for base in nl fr es de cs it pl sv ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
 	  $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksensors/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 04:41:36 -0000	1.4
+++ .cvsignore	1 Oct 2006 14:39:02 -0000	1.5
@@ -1 +1,2 @@
 ksensors-0.7.3.tar.gz
+ksensors_0.7.3-11.diff.gz


Index: ksensors.spec
===================================================================
RCS file: /cvs/extras/rpms/ksensors/FC-5/ksensors.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ksensors.spec	15 Feb 2006 20:22:49 -0000	1.11
+++ ksensors.spec	1 Oct 2006 14:39:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ksensors
 Version:        0.7.3
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        KDE frontend to lm_sensors
 
 Group:          Applications/System
@@ -9,8 +9,11 @@
 Source0:        http://download.sf.net/ksensors/%{name}-%{version}.tar.gz
 Patch0:         %{name}-hddtemp-detect.patch
 Patch1:         %{name}-desktop.patch
+Patch2:         http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-11.diff.gz
+Patch3:         %{name}-0.7.3-po.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# lm_sensors available for these only; report a bug if something's missing
 ExclusiveArch:  %{ix86} x86_64 alpha
 BuildRequires:  kdelibs-devel
 BuildRequires:  lm_sensors-devel
@@ -27,6 +30,8 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
 %{__perl} -pi -e 's/\$\(kde_datadir\)/\$(datadir)/' src/sounds/Makefile.*
 
 
@@ -69,6 +74,13 @@
 
 
 %changelog
+* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-7
+- Apply Debian -11 patchset for upstream radio button state fix,
+  support for hddtemp with SCSI disks and more translations.
+
+* Wed Aug 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-6
+- Rebuild.
+
 * Wed Feb 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-5
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksensors/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 04:41:36 -0000	1.4
+++ sources	1 Oct 2006 14:39:02 -0000	1.5
@@ -1 +1,2 @@
 4f6c5d7dea5e637e772d17f1e547d6f1  ksensors-0.7.3.tar.gz
+b6b26cf4fb7c75a777139291440ad6fa  ksensors_0.7.3-11.diff.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 14:39:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Oct 2006 07:39:03 -0700
Subject: rpms/ksensors/devel ksensors-0.7.3-po.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 ksensors.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <200610011439.k91Ed5lQ026899@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ksensors/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26850/devel

Modified Files:
	.cvsignore ksensors.spec sources 
Added Files:
	ksensors-0.7.3-po.patch 
Log Message:
* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-7
- Apply Debian -11 patchset for upstream radio button state fix,
  support for hddtemp with SCSI disks and more translations.


ksensors-0.7.3-po.patch:

--- NEW FILE ksensors-0.7.3-po.patch ---
--- ksensors-0.7.3/po/Makefile.in~	2004-08-19 00:39:08.000000000 +0300
+++ ksensors-0.7.3/po/Makefile.in	2006-10-01 00:08:46.000000000 +0300
@@ -255,8 +255,8 @@
 xdg_directorydir = @xdg_directorydir@
 #>- POFILES = AUTO
 #>+ 2
-POFILES = nl.po fr.po es.po de.po cs.po
-GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo
+POFILES = nl.po fr.po es.po de.po cs.po it.po pl.po sv.po
+GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo it.gmo pl.gmo sv.gmo
 subdir = po
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -431,6 +431,15 @@
 cs.gmo: cs.po
 	rm -f cs.gmo; $(GMSGFMT) -o cs.gmo $(srcdir)/cs.po
 	test ! -f cs.gmo || touch cs.gmo
+it.gmo: it.po
+	rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po
+	test ! -f it.gmo || touch it.gmo
+pl.gmo: pl.po
+	rm -f pl.gmo; $(GMSGFMT) -o pl.gmo $(srcdir)/pl.po
+	test ! -f pl.gmo || touch pl.gmo
+sv.gmo: sv.po
+	rm -f sv.gmo; $(GMSGFMT) -o sv.gmo $(srcdir)/sv.po
+	test ! -f sv.gmo || touch sv.gmo
 
 #>+ 3
 clean-nls:
@@ -438,7 +447,7 @@
 
 #>+ 10
 install-nls:
-	@for base in nl fr es de cs ; do \
+	@for base in nl fr es de cs it pl sv ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
 	  $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksensors/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 04:41:36 -0000	1.4
+++ .cvsignore	1 Oct 2006 14:39:03 -0000	1.5
@@ -1 +1,2 @@
 ksensors-0.7.3.tar.gz
+ksensors_0.7.3-11.diff.gz


Index: ksensors.spec
===================================================================
RCS file: /cvs/extras/rpms/ksensors/devel/ksensors.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ksensors.spec	29 Aug 2006 21:43:17 -0000	1.12
+++ ksensors.spec	1 Oct 2006 14:39:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ksensors
 Version:        0.7.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        KDE frontend to lm_sensors
 
 Group:          Applications/System
@@ -9,6 +9,8 @@
 Source0:        http://download.sf.net/ksensors/%{name}-%{version}.tar.gz
 Patch0:         %{name}-hddtemp-detect.patch
 Patch1:         %{name}-desktop.patch
+Patch2:         http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-11.diff.gz
+Patch3:         %{name}-0.7.3-po.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # lm_sensors available for these only; report a bug if something's missing
@@ -28,6 +30,8 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
 %{__perl} -pi -e 's/\$\(kde_datadir\)/\$(datadir)/' src/sounds/Makefile.*
 
 
@@ -70,6 +74,10 @@
 
 
 %changelog
+* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-7
+- Apply Debian -11 patchset for upstream radio button state fix,
+  support for hddtemp with SCSI disks and more translations.
+
 * Wed Aug 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-6
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksensors/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 04:41:36 -0000	1.4
+++ sources	1 Oct 2006 14:39:03 -0000	1.5
@@ -1 +1,2 @@
 4f6c5d7dea5e637e772d17f1e547d6f1  ksensors-0.7.3.tar.gz
+b6b26cf4fb7c75a777139291440ad6fa  ksensors_0.7.3-11.diff.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 16:17:05 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun,  1 Oct 2006 09:17:05 -0700
Subject: rpms/pl/FC-5 .cvsignore, 1.10, 1.11 pl.spec, 1.30, 1.31 sources,
	1.10, 1.11
Message-ID: <200610011617.k91GH7qe000907@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv870/FC-5

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Sep 2006 23:05:09 -0000	1.10
+++ .cvsignore	1 Oct 2006 16:17:04 -0000	1.11
@@ -1,3 +1,3 @@
-pl-5.6.18.tar.gz
-userguide.html.tgz
+pl-5.6.20.tar.gz
 HTMLmanual.tar.gz
+userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/pl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pl.spec	1 Sep 2006 23:15:15 -0000	1.30
+++ pl.spec	1 Oct 2006 16:17:04 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.18
+Version:	5.6.20
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.18.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.20.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.20-1
+- new version 5.6.20
+
 * Sat Sep  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.18-1
 - updated to 5.6.18
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Sep 2006 23:05:09 -0000	1.10
+++ sources	1 Oct 2006 16:17:04 -0000	1.11
@@ -1,3 +1,3 @@
-32fc7336c9eed667e04d6cd2b7efb3bd  pl-5.6.18.tar.gz
+0f13bc81a83e29ef90dee6058f84d8ae  pl-5.6.20.tar.gz
+fd43b315a103de4a3c739ca699a9f2d5  HTMLmanual.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
-7e7fc9e384cf7babc872b6f5e539ea73  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 16:17:05 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun,  1 Oct 2006 09:17:05 -0700
Subject: rpms/pl/devel .cvsignore, 1.10, 1.11 pl.spec, 1.29, 1.30 sources,
	1.10, 1.11
Message-ID: <200610011617.k91GH7Co000913@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv870/devel

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Sep 2006 23:15:15 -0000	1.10
+++ .cvsignore	1 Oct 2006 16:17:05 -0000	1.11
@@ -1,3 +1,3 @@
-pl-5.6.18.tar.gz
-userguide.html.tgz
+pl-5.6.20.tar.gz
 HTMLmanual.tar.gz
+userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pl.spec	1 Sep 2006 23:15:15 -0000	1.29
+++ pl.spec	1 Oct 2006 16:17:05 -0000	1.30
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.18
+Version:	5.6.20
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.18.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.20.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Sun Oct  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.20-1
+- new version 5.6.20
+
 * Sat Sep  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.18-1
 - updated to 5.6.18
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Sep 2006 23:15:15 -0000	1.10
+++ sources	1 Oct 2006 16:17:05 -0000	1.11
@@ -1,3 +1,3 @@
-32fc7336c9eed667e04d6cd2b7efb3bd  pl-5.6.18.tar.gz
+0f13bc81a83e29ef90dee6058f84d8ae  pl-5.6.20.tar.gz
+fd43b315a103de4a3c739ca699a9f2d5  HTMLmanual.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
-7e7fc9e384cf7babc872b6f5e539ea73  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 16:22:24 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun,  1 Oct 2006 09:22:24 -0700
Subject: rpms/kita/devel kita-0.177.3-nonweak-symbol.patch, NONE,
	1.1 kita.spec, 1.5, 1.6
Message-ID: <200610011622.k91GMQda001037@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1017

Modified Files:
	kita.spec 
Added Files:
	kita-0.177.3-nonweak-symbol.patch 
Log Message:
* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
- Make common directory link again by symlink
- First remove undefined non-weak symbol related to Qt and KDE
  (still need fixes for Kita internal undefined symbol).


kita-0.177.3-nonweak-symbol.patch:

--- NEW FILE kita-0.177.3-nonweak-symbol.patch ---
--- ./kita-0.177.3/kita/src/bbs/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/bbs/Makefile.in	2006-09-28 02:08:03.000000000 +0900
@@ -353,7 +353,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitabbs.la: $(libkitabbs_la_OBJECTS) $(libkitabbs_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/board/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/board/Makefile.in	2006-09-28 02:21:26.000000000 +0900
@@ -370,7 +370,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitaboard.la: $(libkitaboard_la_OBJECTS) $(libkitaboard_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KPARTS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/image/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/image/Makefile.in	2006-09-28 02:54:57.000000000 +0900
@@ -357,7 +357,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitaimage.la: $(libkitaimage_la_OBJECTS) $(libkitaimage_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/libkita/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/libkita/Makefile.in	2006-09-28 03:12:51.000000000 +0900
@@ -411,7 +411,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkita.la: $(libkita_la_OBJECTS) $(libkita_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS) $(LIB_QT) $(QT_LDFLAGS) $(LIB_KDECORE) $(LIB_KFILE)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/prefs/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/prefs/Makefile.in	2006-09-28 03:20:04.000000000 +0900
@@ -358,7 +358,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitapref.la: $(libkitapref_la_OBJECTS) $(libkitapref_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/thread/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/thread/Makefile.in	2006-09-28 03:26:37.000000000 +0900
@@ -366,7 +366,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitathread.la: $(libkitathread_la_OBJECTS) $(libkitathread_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/write/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/write/Makefile.in	2006-09-28 03:35:14.000000000 +0900
@@ -358,7 +358,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitawrite.la: $(libkitawrite_la_OBJECTS) $(libkitawrite_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) 
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/devel/kita.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kita.spec	19 Sep 2006 13:16:41 -0000	1.5
+++ kita.spec	1 Oct 2006 16:22:23 -0000	1.6
@@ -3,8 +3,9 @@
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    9%{?dist}
+Release:    10%{?dist}
 Source:     http://keihanna.dl.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
+Patch0:     kita-0.177.3-nonweak-symbol.patch
 License:    GPL
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -24,13 +25,15 @@
 %prep
 %setup -q
 
-%build
+%patch0 -p2 -b .link
+
 %{__sed} -i.soname \
    -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
    -e 's|\([^a-zA-Z]\)kita\([\._][lL]\)|\1libkitamain\2|g' \
    -e 's|-avoid-version||' \
    kita/src/Makefile.in
 
+%build
 if [ %{_arch} == x86_64 ] ; then
    SUF=64
 else
@@ -51,7 +54,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-
 %{__sed} -i -e 's|Terminal=0|Terminal=false|' \
       %{buildroot}/%{name}.desktop
 
@@ -71,6 +73,7 @@
 %{__mkdir} DOC
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
+ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 
 # convert encoding
 for f in README README.2ch TODO ; do
@@ -108,6 +111,11 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
+- Make common directory link again by symlink
+- First remove undefined non-weak symbol related to Qt and KDE
+  (still need fixes for Kita internal undefined symbol).
+
 * Tue Sep 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-9
 - Again move HTML directory to the original.
 



From fedora-extras-commits at redhat.com  Sun Oct  1 16:23:23 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun,  1 Oct 2006 09:23:23 -0700
Subject: rpms/kita/FC-5 kita-0.177.3-nonweak-symbol.patch, NONE,
	1.1 kita.spec, 1.5, 1.6
Message-ID: <200610011623.k91GNQ8X001073@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kita/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1053

Modified Files:
	kita.spec 
Added Files:
	kita-0.177.3-nonweak-symbol.patch 
Log Message:
* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
- Make common directory link again by symlink
- First remove undefined non-weak symbol related to Qt and KDE
  (still need fixes for Kita internal undefined symbol).


kita-0.177.3-nonweak-symbol.patch:

--- NEW FILE kita-0.177.3-nonweak-symbol.patch ---
--- ./kita-0.177.3/kita/src/bbs/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/bbs/Makefile.in	2006-09-28 02:08:03.000000000 +0900
@@ -353,7 +353,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitabbs.la: $(libkitabbs_la_OBJECTS) $(libkitabbs_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitabbs_la_LDFLAGS) $(libkitabbs_la_OBJECTS) $(libkitabbs_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/board/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/board/Makefile.in	2006-09-28 02:21:26.000000000 +0900
@@ -370,7 +370,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitaboard.la: $(libkitaboard_la_OBJECTS) $(libkitaboard_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitaboard_la_LDFLAGS) $(libkitaboard_la_OBJECTS) $(libkitaboard_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KPARTS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/image/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/image/Makefile.in	2006-09-28 02:54:57.000000000 +0900
@@ -357,7 +357,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitaimage.la: $(libkitaimage_la_OBJECTS) $(libkitaimage_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitaimage_la_LDFLAGS) $(libkitaimage_la_OBJECTS) $(libkitaimage_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/libkita/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/libkita/Makefile.in	2006-09-28 03:12:51.000000000 +0900
@@ -411,7 +411,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkita.la: $(libkita_la_OBJECTS) $(libkita_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkita_la_LDFLAGS) $(libkita_la_OBJECTS) $(libkita_la_LIBADD) $(LIBS) $(LIB_QT) $(QT_LDFLAGS) $(LIB_KDECORE) $(LIB_KFILE)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/prefs/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/prefs/Makefile.in	2006-09-28 03:20:04.000000000 +0900
@@ -358,7 +358,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitapref.la: $(libkitapref_la_OBJECTS) $(libkitapref_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitapref_la_LDFLAGS) $(libkitapref_la_OBJECTS) $(libkitapref_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/thread/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/thread/Makefile.in	2006-09-28 03:26:37.000000000 +0900
@@ -366,7 +366,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitathread.la: $(libkitathread_la_OBJECTS) $(libkitathread_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitathread_la_LDFLAGS) $(libkitathread_la_OBJECTS) $(libkitathread_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KHTML)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- ./kita-0.177.3/kita/src/write/Makefile.in.link	2006-05-30 01:28:49.000000000 +0900
+++ ./kita-0.177.3/kita/src/write/Makefile.in	2006-09-28 03:35:14.000000000 +0900
@@ -358,7 +358,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libkitawrite.la: $(libkitawrite_la_OBJECTS) $(libkitawrite_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libkitawrite_la_LDFLAGS) $(libkitawrite_la_OBJECTS) $(libkitawrite_la_LIBADD) $(LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) 
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core


Index: kita.spec
===================================================================
RCS file: /cvs/extras/rpms/kita/FC-5/kita.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kita.spec	19 Sep 2006 13:18:20 -0000	1.5
+++ kita.spec	1 Oct 2006 16:23:23 -0000	1.6
@@ -3,8 +3,9 @@
 Summary:    2ch client for KDE
 Name:       kita
 Version:    %{version}
-Release:    9%{?dist}
+Release:    10%{?dist}
 Source:     http://keihanna.dl.sourceforge.jp/kita/20336/kita-%{version}.tar.gz
+Patch0:     kita-0.177.3-nonweak-symbol.patch
 License:    GPL
 URL:        http://sourceforge.jp/projects/kita/
 Group:      Applications/Internet
@@ -24,13 +25,15 @@
 %prep
 %setup -q
 
-%build
+%patch0 -p2 -b .link
+
 %{__sed} -i.soname \
    -e 's|^kita\([\._][lL]\)|libkitamain\1|' \
    -e 's|\([^a-zA-Z]\)kita\([\._][lL]\)|\1libkitamain\2|g' \
    -e 's|-avoid-version||' \
    kita/src/Makefile.in
 
+%build
 if [ %{_arch} == x86_64 ] ; then
    SUF=64
 else
@@ -51,7 +54,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-
 %{__sed} -i -e 's|Terminal=0|Terminal=false|' \
       %{buildroot}/%{name}.desktop
 
@@ -71,6 +73,7 @@
 %{__mkdir} DOC
 
 unlink %{buildroot}%{_datadir}/doc/HTML/en/kita/common
+ln -sf ../common %{buildroot}%{_datadir}/doc/HTML/en/kita/common
 
 # convert encoding
 for f in README README.2ch TODO ; do
@@ -108,6 +111,11 @@
 %{_datadir}/doc/HTML/en/kita/
 
 %changelog
+* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-10
+- Make common directory link again by symlink
+- First remove undefined non-weak symbol related to Qt and KDE
+  (still need fixes for Kita internal undefined symbol).
+
 * Tue Sep 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.177.3-9
 - Again move HTML directory to the original.
 



From fedora-extras-commits at redhat.com  Sun Oct  1 16:35:32 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:35:32 -0700
Subject: rpms/fwbackups - New directory
Message-ID: <200610011635.k91GZYZA001261@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1235/fwbackups

Log Message:
Directory /cvs/extras/rpms/fwbackups added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 16:35:33 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:35:33 -0700
Subject: rpms/fwbackups/devel - New directory
Message-ID: <200610011635.k91GZZFb001264@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1235/fwbackups/devel

Log Message:
Directory /cvs/extras/rpms/fwbackups/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  1 16:35:44 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:35:44 -0700
Subject: rpms/fwbackups Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610011635.k91GZkEx001313@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280

Added Files:
	Makefile import.log 
Log Message:
Setup of module fwbackups


--- NEW FILE Makefile ---
# Top level Makefile for module fwbackups
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  1 16:35:44 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:35:44 -0700
Subject: rpms/fwbackups/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610011635.k91GZkZv001316@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fwbackups


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  1 16:36:22 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:36:22 -0700
Subject: rpms/fwbackups import.log,1.1,1.2
Message-ID: <200610011636.k91GaODu001379@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1345

Modified Files:
	import.log 
Log Message:
auto-import fwbackups-1.42.1-2 on branch devel from fwbackups-1.42.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Oct 2006 16:35:44 -0000	1.1
+++ import.log	1 Oct 2006 16:36:22 -0000	1.2
@@ -0,0 +1 @@
+fwbackups-1_42_1-2:HEAD:fwbackups-1.42.1-2.src.rpm:1159720527



From fedora-extras-commits at redhat.com  Sun Oct  1 16:36:23 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:36:23 -0700
Subject: rpms/fwbackups/devel fwbackups.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610011636.k91GaPH7001384@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwbackups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1345/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fwbackups.spec 
Log Message:
auto-import fwbackups-1.42.1-2 on branch devel from fwbackups-1.42.1-2.src.rpm


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

Name:		fwbackups
Version:		1.42.1
Release:		2%{?dist}
BuildArch:	noarch
Summary:	A feature-rich user backup program

Group:		Applications/System
License:		GPL
URL:		http://www.diffingo.com/content/view/12/45/lang,en/
Source0:		http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:		desktop-file-utils
Requires:		pygtk2 pygtk2-libglade redhat-artwork usermode
#Provides:		fwbackups
%description
fwbackups is a user backups program that can run a backup on-the-spot based
on user-specified paths, or by it's automated backup feature which will backup
user-specified paths and backup them to an appropriate location automatically,
at a specified time and date.


%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT

#install -d -p -m755 etc/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/fwbackups
#install -d -p -m755 usr/lib/python2.4/site-packages/fwbackups ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups
#install -d -p -m755 usr/share/fwbackups ${RPM_BUILD_ROOT}%{_datadir}/fwbackups
#install -d -p -m755 ${RPM_BUILD_ROOT}%{_docdir}/fwbackups
#install -d -p -m755 ${RPM_BUILD_ROOT}%{_sbindir}
# This one we DO need because ln doesn't create the directories like install did
install -d -p -m755 ${RPM_BUILD_ROOT}%{_bindir}

install -D -p -m644 etc/fwbackups/fwbackups.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/fwbackups/fwbackups.conf

install -D -p -m444 usr/share/fwbackups/fwbackups.conf.default ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups.conf.default

install -D -p -m644 etc/pam.d/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwbackups
install -D -p -m644 etc/pam.d/fwbackups-run ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwbackups-run

install -D -p -m644 etc/security/console.apps/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwbackups
install -D -p -m644 etc/security/console.apps/fwbackups-run ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwbackups-run 



install -D -p -m755 usr/share/fwbackups/fwbackups-runapp.py ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups-runapp.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/__init__.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/__init__.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/Backuper.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/Backuper.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/BaseClasses.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/BaseClasses.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/Callbacks.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/Callbacks.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwbackups/shutil_modded.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/shutil_modded.py

install -D -p -m644 usr/share/fwbackups/fwbackups-new.glade ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups-new.glade

install -D -p -m755 usr/sbin/fwbackups ${RPM_BUILD_ROOT}%{_sbindir}/fwbackups
install -D -p -m755 usr/sbin/fwbackups-run ${RPM_BUILD_ROOT}%{_sbindir}/fwbackups-run

ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwbackups
ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwbackups-run

desktop-file-install --vendor fedora\
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
	--add-category X-Fedora\
	usr/share/applications/fwbackups.desktop
desktop-file-install --vendor fedora\
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
	--add-category X-Fedora\
	usr/share/applications/fwbackups-run.desktop

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/fwbackups
%dir %{_datadir}/fwbackups
%dir %{python_sitelib}/fwbackups

%{_bindir}/fwbackups
%{_bindir}/fwbackups-run
%{_sbindir}/fwbackups
%{_sbindir}/fwbackups-run
%{_datadir}/fwbackups/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/fwbackups/*

%config(noreplace) %{_sysconfdir}/fwbackups/fwbackups.conf
%config(noreplace) %{_sysconfdir}/security/console.apps/fwbackups
%config(noreplace) %{_sysconfdir}/security/console.apps/fwbackups-run
%config(noreplace) %{_sysconfdir}/pam.d/fwbackups
%config(noreplace) %{_sysconfdir}/pam.d/fwbackups-run

%doc README COPYING CHANGELOG

%changelog

* Sat Sep 30 2006 Stewart Adam <s.adam at diffingo.com> 1.42.1-2
- Match upstream md5sum
- Fix capitals in %%Source0 tag

* Tue Sep 26 2006 Stewart Adam <s.adam at diffingo.com> 1.42.1-1
- Clean up %%install section
- Don't install fwbackups.conf twice
- Make tarball match upstream
- Add the default configuration file to %%doc, and make it replaceable
- Update to version 1.42.1 (see CHANGELOG file for details on version changes)

* Thu Sep 21 2006 Stewart Adam <s.adam at diffingo.com> 1.42-5
- Add %%requires: pygtk2-libglade

* Wed Sep 13 2006 Stewart Adam <s.adam at diffingo.com> 1.42-4
- Fix the python_sitearch macro
- Update file paths
- Fix URL tag

* Wed Sep 06 2006 Stewart Adam <s.adam at diffingo.com> 1.42-3
- Made pam use 'include' statements and not the old pam_stack
- Use relative symlinks

* Sun Sep 03 2006 Stewart Adam <s.adam at diffingo.com> 1.42-2
- Added CHANGELOG file for detailed information on changes between versions
- Made this .spec and package files suitable for Fedora Extras submission

* Thu Aug 29 2006 Stewart Adam <s.adam at diffingo.com> 1.42-1
- Fixed errors when removing symbolic links
- Make listing files in RemoveOldBackups list files and directory names, not their contents

* Thu Aug 15 2006 Stewart Adam <s.adam at diffingo.com> 1.42-0
- Rebuild using sample .spec file from Fedora Extras
- Update to version 1.42 (see CHANGELOG file for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Oct 2006 16:35:44 -0000	1.1
+++ .cvsignore	1 Oct 2006 16:36:22 -0000	1.2
@@ -0,0 +1 @@
+fwbackups-1.42.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Oct 2006 16:35:44 -0000	1.1
+++ sources	1 Oct 2006 16:36:22 -0000	1.2
@@ -0,0 +1 @@
+bd0a4d63e0729fa3ed89eccb10fee2da  fwbackups-1.42.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  1 16:40:27 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sun,  1 Oct 2006 09:40:27 -0700
Subject: owners owners.list,1.1753,1.1754
Message-ID: <200610011640.k91GeTtd001465@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1448

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1753
retrieving revision 1.1754
diff -u -r1.1753 -r1.1754
--- owners.list	1 Oct 2006 13:16:53 -0000	1.1753
+++ owners.list	1 Oct 2006 16:40:27 -0000	1.1754
@@ -422,6 +422,7 @@
 Fedora Extras|fuse-emulator-utils|Utilities for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 17:18:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Oct 2006 10:18:26 -0700
Subject: owners owners.list,1.1754,1.1755
Message-ID: <200610011718.k91HISJw004687@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4667

Modified Files:
	owners.list 
Log Message:
Fix broken fwbackups entry.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1754
retrieving revision 1.1755
diff -u -r1.1754 -r1.1755
--- owners.list	1 Oct 2006 16:40:27 -0000	1.1754
+++ owners.list	1 Oct 2006 17:18:25 -0000	1.1755
@@ -422,7 +422,7 @@
 Fedora Extras|fuse-emulator-utils|Utilities for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org
+Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 19:23:16 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  1 Oct 2006 12:23:16 -0700
Subject: rpms/amarok/devel amarok.spec,1.60,1.61
Message-ID: <200610011923.k91JNIf0010822@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10797

Modified Files:
	amarok.spec 
Log Message:
rebuild


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- amarok.spec	15 Sep 2006 10:56:59 -0000	1.60
+++ amarok.spec	1 Oct 2006 19:23:16 -0000	1.61
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -239,6 +239,9 @@
 
 
 %changelog
+* Sun Oct 01 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-4
+- rebuild
+
 * Fri Sep 15 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-3
 - add patch for playlist encoding
 



From fedora-extras-commits at redhat.com  Sun Oct  1 21:36:53 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 14:36:53 -0700
Subject: rpms/geomview/devel .cvsignore, 1.12, 1.13 geomview.spec, 1.26,
	1.27 sources, 1.11, 1.12
Message-ID: <200610012136.k91LatXO019699@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19676

Modified Files:
	.cvsignore geomview.spec sources 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
- 1.8.2rc9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Sep 2006 20:21:37 -0000	1.12
+++ .cvsignore	1 Oct 2006 21:36:53 -0000	1.13
@@ -2,3 +2,4 @@
 orrery-0.9.3.tar.gz
 geomview-1.8.2-rc8.tar.bz2
 geomview.png
+geomview-1.8.2-rc9.tar.bz2


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- geomview.spec	7 Sep 2006 20:21:07 -0000	1.26
+++ geomview.spec	1 Oct 2006 21:36:53 -0000	1.27
@@ -3,17 +3,17 @@
 %define _with_orrery --with-orrery
 #define _with_maniview --with-maniview
 
-%define beta rc8
+%define beta rc9
 
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.20.%{beta}%{?dist}
+Release: 0.21.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
 Group:   Applications/Engineering
-Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
+Source0: http://osdn.dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
 #Source0: geomview-%{cvs}.tar.bz2
 #Source1: geomview-cvs_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,12 @@
 BuildRequires: desktop-file-utils
 BuildRequires: automake libtool
 BuildRequires: byacc flex
+# Until we have a generic BR: motif-devel -- Rex
+%if "%{?fedora}" > "5"
 BuildRequires: lesstif-devel
+%else
+BuildRequires: openmotif-devel
+%endif
 BuildRequires: xforms-devel
 BuildRequires: libGL-devel libGLU-devel
 %if "%{?fedora}" > "4"
@@ -271,8 +276,11 @@
 
 
 %changelog
-* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.20.rc9
-- BR: openmotif-devel -> lesstif-devel
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
+- 1.8.2rc9
+
+* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.20.rc8
+- fc6: BR: openmotif-devel -> lesstif-devel
 
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.19.rc8
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Aug 2006 14:23:14 -0000	1.11
+++ sources	1 Oct 2006 21:36:53 -0000	1.12
@@ -1,4 +1,4 @@
 f5588be3402850ed4cc9ef0dac48013a  geomview.png
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
-16ef195e606ecb8338dd239500cae55c  geomview-1.8.2-rc8.tar.bz2
+a8d62bdf60e385f36e0a59f4d8bec361  geomview-1.8.2-rc9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 21:54:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 14:54:51 -0700
Subject: rpms/geomview/FC-5 .cvsignore, 1.6, 1.7 geomview.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200610012154.k91Lsr7J020599@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20576

Modified Files:
	.cvsignore geomview.spec sources 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
- 1.8.2rc9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Aug 2006 15:42:44 -0000	1.6
+++ .cvsignore	1 Oct 2006 21:54:51 -0000	1.7
@@ -1,3 +1,5 @@
 maniview-2.0.0.tar.gz
 orrery-0.9.3.tar.gz
 geomview-1.8.2-rc8.tar.bz2
+geomview.png
+geomview-1.8.2-rc9.tar.bz2


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/geomview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geomview.spec	9 Aug 2006 14:21:35 -0000	1.14
+++ geomview.spec	1 Oct 2006 21:54:51 -0000	1.15
@@ -3,17 +3,17 @@
 %define _with_orrery --with-orrery
 #define _with_maniview --with-maniview
 
-%define beta rc8
+%define beta rc9
 
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.18.%{beta}%{?dist}
+Release: 0.21.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
 Group:   Applications/Engineering
-Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
+Source0: http://osdn.dl.sourceforge.net/sourceforge/geomview/geomview-%{version}-%{beta}.tar.bz2
 #Source0: geomview-%{cvs}.tar.bz2
 #Source1: geomview-cvs_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,12 @@
 BuildRequires: desktop-file-utils
 BuildRequires: automake libtool
 BuildRequires: byacc flex
+# Until we have a generic BR: motif-devel -- Rex
+%if "%{?fedora}" > "5"
+BuildRequires: lesstif-devel
+%else
 BuildRequires: openmotif-devel
+%endif
 BuildRequires: xforms-devel
 BuildRequires: libGL-devel libGLU-devel
 %if "%{?fedora}" > "4"
@@ -271,9 +276,18 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
+- 1.8.2rc9
+
+* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.20.rc8
+- fc6: BR: openmotif-devel -> lesstif-devel
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.19.rc8
+- fc6 respin
+
 * Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.18.rc8
 - rename (man/man1/)animate.1 -> geomview-animate.1 to avoid 
-  Conflicts: ImageMagick
+  Conflicts: ImageMagick (bug #202039)
 
 * Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.17.rc8
 - 1.8.2-rc8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Aug 2006 15:42:44 -0000	1.6
+++ sources	1 Oct 2006 21:54:51 -0000	1.7
@@ -1,4 +1,4 @@
 f5588be3402850ed4cc9ef0dac48013a  geomview.png
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
-16ef195e606ecb8338dd239500cae55c  geomview-1.8.2-rc8.tar.bz2
+a8d62bdf60e385f36e0a59f4d8bec361  geomview-1.8.2-rc9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 22:02:10 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  1 Oct 2006 15:02:10 -0700
Subject: owners owners.list,1.1755,1.1756
Message-ID: <200610012202.k91M2hPT023827@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23778

Modified Files:
	owners.list 
Log Message:
take over deskbar-applet


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1755
retrieving revision 1.1756
diff -u -r1.1755 -r1.1756
--- owners.list	1 Oct 2006 17:18:25 -0000	1.1755
+++ owners.list	1 Oct 2006 22:02:10 -0000	1.1756
@@ -272,7 +272,7 @@
 Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
 Fedora Extras|deltarpm|Create deltas between rpms|misa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
-Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|deutex|Doom wad manipulation tool|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|DevIL|A cross-platform image library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  1 22:03:15 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  1 Oct 2006 15:03:15 -0700
Subject: rpms/deskbar-applet/devel .cvsignore, 1.13, 1.14 deskbar-applet.spec,
	1.30, 1.31 sources, 1.13, 1.14
Message-ID: <200610012203.k91M3mbR023889@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.16.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 Aug 2006 05:28:02 -0000	1.13
+++ .cvsignore	1 Oct 2006 22:03:15 -0000	1.14
@@ -1 +1 @@
-deskbar-applet-2.15.91.tar.bz2
+deskbar-applet-2.16.0.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- deskbar-applet.spec	6 Sep 2006 19:15:08 -0000	1.30
+++ deskbar-applet.spec	1 Oct 2006 22:03:15 -0000	1.31
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.15.91
-Release:        5%{?dist}
+Version:        2.16.0
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -50,15 +50,7 @@
 install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT$hdir
 install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT$adir
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
-install -D -m 0644 -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*/apps/deskbar-applet.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
-rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora              \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora                       \
-    --add-category Utility                        \
-    --add-category Application                    \
-    data/%{name}.desktop
 
 %{find_lang} %{name}
 
@@ -96,17 +88,18 @@
 %{_libdir}/pkgconfig/%{name}.pc
 %{python_sitelib}/deskbar
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Oct  1 2006 Luke Macken <lmacken at redhat.com> - 2.16.0-1
+- 2.16.0
+
 * Wed Sep 06 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.15.91-5
 - rebuild for FC6
 - added BR on XML::Parser
 
 * Sat Aug 19 2006 Luke Macken <lmacken at redhat.com> 2.15.91-3
-- Instally desktop file correctly
+- Install desktop file correctly
 
 * Wed Aug 17 2006 Luke Macken <lmacken at redhat.com> 2.15.91-1
 - 2.15.91


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Aug 2006 05:28:02 -0000	1.13
+++ sources	1 Oct 2006 22:03:15 -0000	1.14
@@ -1 +1 @@
-2e3ee26af253286d2f0be845d42c023c  deskbar-applet-2.15.91.tar.bz2
+9f14a65f75142cd5b233bf9376a1f946  deskbar-applet-2.16.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  1 23:14:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:14:32 -0700
Subject: rpms/lyx/devel lyx-1.4.3-helpers.patch, 1.1, 1.2 lyx-qt.desktop, 1.1,
	1.2 lyx-xforms.desktop, 1.1, 1.2 lyx.desktop, 1.3, 1.4 lyx.spec,
	1.46, 1.47
Message-ID: <200610012314.k91NEY53028860@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28832

Modified Files:
	lyx-1.4.3-helpers.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.desktop lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils


lyx-1.4.3-helpers.patch:

Index: lyx-1.4.3-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-1.4.3-helpers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.3-helpers.patch	21 Sep 2006 15:26:46 -0000	1.1
+++ lyx-1.4.3-helpers.patch	1 Oct 2006 23:14:31 -0000	1.2
@@ -5,20 +5,20 @@
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
 -    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
-+    checkViewer('a Postscript previewer', ['evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
++    checkViewer('a Postscript previewer', ['xdg-open', 'evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""
  \Format ps         ps      Postscript             t  "%%"	""'''])
      #
 -    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
 -                            'xpdf', 'kpdf', 'kghostview'],
-+    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'evince', \
++    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'evince', \
 +                            'xpdf', 'kpdf', 'gsview', 'kghostview', 'gv', 'ghostview'],
          rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""
  \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""
  \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""'''])
      #
 -    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
-+    checkViewer('a DVI previewer', ['kdvi', 'xdvi'],
++    checkViewer('a DVI previewer', ['xdg-open', 'kdvi', 'xdvi'],
          rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""'])
      if ((os.name == 'nt' or sys.platform == 'cygwin') and
              checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
@@ -27,7 +27,7 @@
          addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""')
      #
 -    checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
-+    checkViewer('a HTML previewer', ['htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
++    checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
          rc_entry = [r'\Format html       html    HTML                   H  "%%"	""'])
      #
      # entried that do not need checkProg


Index: lyx-qt.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-qt.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-qt.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-qt.desktop	1 Oct 2006 23:14:31 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-qt
-GenericName=WYSIWYM document processor
-Comment=Lyx using Qt frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-qt
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Qt;Application;Office;WordProcessor;
 


Index: lyx-xforms.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-xforms.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-xforms.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-xforms.desktop	1 Oct 2006 23:14:31 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-xforms
-GenericName=WYSIWYM document processor
-Comment=Lyx using XForms frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-xforms
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lyx.desktop	20 Jan 2006 15:37:52 -0000	1.3
+++ lyx.desktop	1 Oct 2006 23:14:31 -0000	1.4
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX
-GenericName=WYSIWYM document processor
-Comment=WYSIWYM document processor
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lyx.spec	21 Sep 2006 15:26:46 -0000	1.46
+++ lyx.spec	1 Oct 2006 23:14:31 -0000	1.47
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -46,6 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
+Requires: xdg-utils
 ## Soft dependencies
 %if "%{?fedora}" > "3"
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -144,7 +145,7 @@
 # .desktop
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="fedora" \
+  --add-category="X-Fedora" --vendor="" \
   %{SOURCE21} %{SOURCE22}
 
 # generic/hicolor icon
@@ -219,6 +220,10 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+- sync .desktop files with upstream
+- use xdg-open as default helper, +Requires: xdg-utils
+
 * Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-1
 - 1.4.3
 



From fedora-extras-commits at redhat.com  Sun Oct  1 23:15:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:15:30 -0700
Subject: rpms/lyx/FC-5 lyx-1.4.3-helpers.patch, 1.1, 1.2 lyx-qt.desktop, 1.1,
	1.2 lyx-xforms.desktop, 1.1, 1.2 lyx.desktop, 1.3, 1.4 lyx.spec,
	1.42, 1.43
Message-ID: <200610012315.k91NFWhL028944@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28916

Modified Files:
	lyx-1.4.3-helpers.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.desktop lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils


lyx-1.4.3-helpers.patch:

Index: lyx-1.4.3-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-1.4.3-helpers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.3-helpers.patch	21 Sep 2006 15:43:12 -0000	1.1
+++ lyx-1.4.3-helpers.patch	1 Oct 2006 23:15:30 -0000	1.2
@@ -5,20 +5,20 @@
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
 -    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
-+    checkViewer('a Postscript previewer', ['evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
++    checkViewer('a Postscript previewer', ['xdg-open', 'evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""
  \Format ps         ps      Postscript             t  "%%"	""'''])
      #
 -    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
 -                            'xpdf', 'kpdf', 'kghostview'],
-+    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'evince', \
++    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'evince', \
 +                            'xpdf', 'kpdf', 'gsview', 'kghostview', 'gv', 'ghostview'],
          rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""
  \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""
  \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""'''])
      #
 -    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
-+    checkViewer('a DVI previewer', ['kdvi', 'xdvi'],
++    checkViewer('a DVI previewer', ['xdg-open', 'kdvi', 'xdvi'],
          rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""'])
      if ((os.name == 'nt' or sys.platform == 'cygwin') and
              checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
@@ -27,7 +27,7 @@
          addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""')
      #
 -    checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
-+    checkViewer('a HTML previewer', ['htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
++    checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
          rc_entry = [r'\Format html       html    HTML                   H  "%%"	""'])
      #
      # entried that do not need checkProg


Index: lyx-qt.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-qt.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-qt.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-qt.desktop	1 Oct 2006 23:15:30 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-qt
-GenericName=WYSIWYM document processor
-Comment=Lyx using Qt frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-qt
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Qt;Application;Office;WordProcessor;
 


Index: lyx-xforms.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-xforms.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-xforms.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-xforms.desktop	1 Oct 2006 23:15:30 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-xforms
-GenericName=WYSIWYM document processor
-Comment=Lyx using XForms frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-xforms
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lyx.desktop	20 Jan 2006 15:37:52 -0000	1.3
+++ lyx.desktop	1 Oct 2006 23:15:30 -0000	1.4
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX
-GenericName=WYSIWYM document processor
-Comment=WYSIWYM document processor
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- lyx.spec	21 Sep 2006 15:43:12 -0000	1.42
+++ lyx.spec	1 Oct 2006 23:15:30 -0000	1.43
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -46,6 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
+Requires: xdg-utils
 ## Soft dependencies
 %if "%{?fedora}" > "3"
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -144,7 +145,7 @@
 # .desktop
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="fedora" \
+  --add-category="X-Fedora" --vendor="" \
   %{SOURCE21} %{SOURCE22}
 
 # generic/hicolor icon
@@ -219,6 +220,10 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+- sync .desktop files with upstream
+- use xdg-open as default helper, +Requires: xdg-utils
+
 * Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-1
 - 1.4.3
 



From fedora-extras-commits at redhat.com  Sun Oct  1 23:16:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:16:01 -0700
Subject: rpms/lyx/FC-4 lyx-1.4.3-helpers.patch, 1.1, 1.2 lyx-qt.desktop, 1.1,
	1.2 lyx-xforms.desktop, 1.1, 1.2 lyx.desktop, 1.3, 1.4 lyx.spec,
	1.30, 1.31
Message-ID: <200610012316.k91NG3hT029033@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29003

Modified Files:
	lyx-1.4.3-helpers.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.desktop lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils


lyx-1.4.3-helpers.patch:

Index: lyx-1.4.3-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx-1.4.3-helpers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.3-helpers.patch	28 Sep 2006 12:35:35 -0000	1.1
+++ lyx-1.4.3-helpers.patch	1 Oct 2006 23:16:01 -0000	1.2
@@ -5,20 +5,20 @@
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
 -    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
-+    checkViewer('a Postscript previewer', ['evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
++    checkViewer('a Postscript previewer', ['xdg-open', 'evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""
  \Format ps         ps      Postscript             t  "%%"	""'''])
      #
 -    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
 -                            'xpdf', 'kpdf', 'kghostview'],
-+    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'evince', \
++    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'evince', \
 +                            'xpdf', 'kpdf', 'gsview', 'kghostview', 'gv', 'ghostview'],
          rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""
  \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""
  \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""'''])
      #
 -    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
-+    checkViewer('a DVI previewer', ['kdvi', 'xdvi'],
++    checkViewer('a DVI previewer', ['xdg-open', 'kdvi', 'xdvi'],
          rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""'])
      if ((os.name == 'nt' or sys.platform == 'cygwin') and
              checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
@@ -27,7 +27,7 @@
          addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""')
      #
 -    checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
-+    checkViewer('a HTML previewer', ['htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
++    checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
          rc_entry = [r'\Format html       html    HTML                   H  "%%"	""'])
      #
      # entried that do not need checkProg


Index: lyx-qt.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx-qt.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-qt.desktop	20 Jan 2006 17:51:39 -0000	1.1
+++ lyx-qt.desktop	1 Oct 2006 23:16:01 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-qt
-GenericName=WYSIWYM document processor
-Comment=Lyx using Qt frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-qt
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Qt;Application;Office;WordProcessor;
 


Index: lyx-xforms.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx-xforms.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-xforms.desktop	20 Jan 2006 17:51:39 -0000	1.1
+++ lyx-xforms.desktop	1 Oct 2006 23:16:01 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-xforms
-GenericName=WYSIWYM document processor
-Comment=Lyx using XForms frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-xforms
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lyx.desktop	20 Jan 2006 17:51:39 -0000	1.3
+++ lyx.desktop	1 Oct 2006 23:16:01 -0000	1.4
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX
-GenericName=WYSIWYM document processor
-Comment=WYSIWYM document processor
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- lyx.spec	28 Sep 2006 12:35:35 -0000	1.30
+++ lyx.spec	1 Oct 2006 23:16:01 -0000	1.31
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -46,6 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
+Requires: xdg-utils
 ## Soft dependencies
 %if "%{?fedora}" > "3"
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -144,7 +145,7 @@
 # .desktop
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="fedora" \
+  --add-category="X-Fedora" --vendor="" \
   %{SOURCE21} %{SOURCE22}
 
 # generic/hicolor icon
@@ -219,6 +220,10 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+- sync .desktop files with upstream
+- use xdg-open as default helper, +Requires: xdg-utils
+
 * Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-1
 - 1.4.3
 



From fedora-extras-commits at redhat.com  Sun Oct  1 23:55:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:55:58 -0700
Subject: rpms/lyx/devel lyx.spec,1.47,1.48 lyxrc.defaults.custom,1.2,NONE
Message-ID: <200610012356.k91Nu0pZ029213@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29196

Modified Files:
	lyx.spec 
Removed Files:
	lyxrc.defaults.custom 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- lyx.spec	1 Oct 2006 23:14:31 -0000	1.47
+++ lyx.spec	1 Oct 2006 23:55:58 -0000	1.48
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -211,16 +211,16 @@
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/lyx-qt
-%{_datadir}/applications/*-lyx-qt.desktop
+%{_datadir}/applications/*lyx-qt.desktop
 
 %files xforms
 %defattr(-,root,root,-)
 %{_bindir}/lyx-xforms
-%{_datadir}/applications/*-lyx-xforms.desktop
+%{_datadir}/applications/*lyx-xforms.desktop
 
 
 %changelog
-* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
 - sync .desktop files with upstream
 - use xdg-open as default helper, +Requires: xdg-utils
 


--- lyxrc.defaults.custom DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  1 23:56:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:56:14 -0700
Subject: rpms/lyx/FC-5 lyx.spec,1.43,1.44
Message-ID: <200610012356.k91NuGUv029274@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29256

Modified Files:
	lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- lyx.spec	1 Oct 2006 23:15:30 -0000	1.43
+++ lyx.spec	1 Oct 2006 23:56:13 -0000	1.44
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -211,16 +211,16 @@
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/lyx-qt
-%{_datadir}/applications/*-lyx-qt.desktop
+%{_datadir}/applications/*lyx-qt.desktop
 
 %files xforms
 %defattr(-,root,root,-)
 %{_bindir}/lyx-xforms
-%{_datadir}/applications/*-lyx-xforms.desktop
+%{_datadir}/applications/*lyx-xforms.desktop
 
 
 %changelog
-* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
 - sync .desktop files with upstream
 - use xdg-open as default helper, +Requires: xdg-utils
 



From fedora-extras-commits at redhat.com  Sun Oct  1 23:56:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Oct 2006 16:56:30 -0700
Subject: rpms/lyx/FC-4 lyx.spec,1.31,1.32
Message-ID: <200610012356.k91NuWpo029369@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29323

Modified Files:
	lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lyx.spec	1 Oct 2006 23:16:01 -0000	1.31
+++ lyx.spec	1 Oct 2006 23:56:30 -0000	1.32
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -211,16 +211,16 @@
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/lyx-qt
-%{_datadir}/applications/*-lyx-qt.desktop
+%{_datadir}/applications/*lyx-qt.desktop
 
 %files xforms
 %defattr(-,root,root,-)
 %{_bindir}/lyx-xforms
-%{_datadir}/applications/*-lyx-xforms.desktop
+%{_datadir}/applications/*lyx-xforms.desktop
 
 
 %changelog
-* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
 - sync .desktop files with upstream
 - use xdg-open as default helper, +Requires: xdg-utils
 



From fedora-extras-commits at redhat.com  Mon Oct  2 00:26:31 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Sun,  1 Oct 2006 17:26:31 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools-0.17-new-hdrs.patch, NONE, 
	1.1
Message-ID: <200610020026.k920QXZB032363@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32345

Added Files:
	netlabel_tools-0.17-new-hdrs.patch 
Log Message:
* Fri Sep 29 2006 James Antill <james at and.org> - 0.17-1
- Upgrade to latest upstream.


netlabel_tools-0.17-new-hdrs.patch:

--- NEW FILE netlabel_tools-0.17-new-hdrs.patch ---
--- netlabel_tools-0.16-orig/Makefile	2006-06-27 13:06:28.000000000 -0400
+++ netlabel_tools-0.16/Makefile	2006-08-29 16:42:09.000000000 -0400
@@ -43,8 +43,9 @@ INSTALL_SBIN_DIR = $(INSTALL_PREFIX)/sbi
 INSTALL_BIN_DIR = $(INSTALL_PREFIX)/bin
 INSTALL_MAN_DIR = $(INSTALL_PREFIX)/share/man
 
-OWNER = root
-GROUP = root
+# Mock doesn't allow this.
+#OWNER = root
+#GROUP = root
 
 #
 # targets
@@ -77,9 +78,9 @@ install: $(SUBDIRS)
 	@echo "INFO: installing files in $(INSTALL_PREFIX)"
 	@mkdir -p $(INSTALL_SBIN_DIR)
 	@mkdir -p $(INSTALL_MAN_DIR)/man8
-	@install -o $(OWNER) -g $(GROUP) -m 755 netlabelctl/netlabelctl \
+	@install -m 755 netlabelctl/netlabelctl \
 	 $(INSTALL_SBIN_DIR)/netlabelctl
-	@install -o $(OWNER) -g $(GROUP) -m 644 docs/man/netlabelctl.8 \
+	@install -m 644 docs/man/netlabelctl.8 \
 	 $(INSTALL_MAN_DIR)/man8
 
 clean:



From fedora-extras-commits at redhat.com  Mon Oct  2 00:28:43 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Sun,  1 Oct 2006 17:28:43 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools.spec,1.2,1.3
Message-ID: <200610020028.k920Sjfq032416@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32399

Modified Files:
	netlabel_tools.spec 
Log Message:
* Sun Oct  1 2006 James Antill <james at and.org> - 0.17-2
- Upgrade to latest upstream.



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netlabel_tools.spec	30 Sep 2006 07:08:50 -0000	1.2
+++ netlabel_tools.spec	2 Oct 2006 00:28:43 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}
@@ -45,7 +45,7 @@
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
-* Fri Sep 29 2006 James Antill <james at and.org> - 0.17-1
+* Sun Oct  1 2006 James Antill <james at and.org> - 0.17-2
 - Upgrade to latest upstream.
 
 * Tue Aug 29 2006 James Antill <james at and.org> - 0.16-5



From fedora-extras-commits at redhat.com  Mon Oct  2 02:25:50 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sun,  1 Oct 2006 19:25:50 -0700
Subject: rpms/lft/devel lft.spec,1.21,1.22
Message-ID: <200610020225.k922PqFC006018@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6001

Modified Files:
	lft.spec 
Log Message:
* Sun Oct 01 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1:2.5-6
- Rebuild due to gcc bug.



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lft.spec	19 Sep 2006 14:58:08 -0000	1.21
+++ lft.spec	2 Oct 2006 02:25:50 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          1
 Summary:        Alternate traceroute tool
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Oct 01 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1:2.5-6
+- Rebuild due to gcc bug.
+
 * Tue Sep 19 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1:2.5-5
 - Bump release for rebuild.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 02:46:33 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Sun,  1 Oct 2006 19:46:33 -0700
Subject: accounts2 fedoraPerson.schema,1.1,1.2
Message-ID: <200610020246.k922kX8U006110@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6092

Modified Files:
	fedoraPerson.schema 
Log Message:



Index: fedoraPerson.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraPerson.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedoraPerson.schema	27 Sep 2006 01:17:49 -0000	1.1
+++ fedoraPerson.schema	2 Oct 2006 02:46:31 -0000	1.2
@@ -4,7 +4,35 @@
 #for now this is the contents
 #ssh_key
 attributeType ( 2.5.4.41 NAME 'ssh_key'
-                DESC 'group name'
+                DESC 'ssh key for this memeber'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
\ No newline at end of file
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
+
+attributeType ( 2.5.4.41 NAME 'bugzilla_email'
+                DESC 'members preferred bugzilla email address'
+		EQUALITY caseIgnoreIA5Match
+		SUBSTR caseIgnoreIA5SubstringsMatch
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
+
+# fedoraPerson
+# The fedoraPerson represents people who are a member of the fedora project
+# in some way.  It is a structural class and inherits
+# from the inetOrgPerson class
+objectclass	( 2.16.840.1.113730.3.2.2
+    NAME 'fedoraPerson'
+	DESC 'A member of the fedoraproject group'
+    SUP inetOrgPerson
+    STRUCTURAL
+	MAY (
+		audio $ businessCategory $ carLicense $ departmentNumber $
+		displayName $ employeeNumber $ employeeType $ givenName $
+		homePhone $ homePostalAddress $ initials $ jpegPhoto $
+		labeledURI $ mail $ manager $ mobile $ o $ pager $
+		photo $ roomNumber $ secretary $ uid $ userCertificate $
+		x500uniqueIdentifier $ preferredLanguage $
+		userSMIMECertificate $ userPKCS12 )
+	)
+	MUST (
+		ssh_key $ bugzilla_email 
+	)



From fedora-extras-commits at redhat.com  Mon Oct  2 04:05:04 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:05:04 -0700
Subject: rpms/Inventor/devel .cvsignore, 1.3, 1.4 Inventor.spec, 1.33,
	1.34 sources, 1.3, 1.4
Message-ID: <200610020405.k9245agn012032@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
- Add make-var _PDFVIEWER.
- Backport to FC4.
- Fix path to chessboard.iv in chesschairs.iv.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2006 08:39:13 -0000	1.3
+++ .cvsignore	2 Oct 2006 04:05:04 -0000	1.4
@@ -1,2 +1,3 @@
 inventor-2.1.5-10.src.tar.gz
 Inventor-2.1.5-22.diff
+Inventor-2.1.5-23.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Inventor.spec	28 Sep 2006 08:39:13 -0000	1.33
+++ Inventor.spec	2 Oct 2006 04:05:04 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        22%{?dist}
+Release:        23%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,14 +14,22 @@
 License:        LGPL
 URL:            http://oss.sgi.com/projects/inventor/
 Source0:        ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
-Patch0:		Inventor-2.1.5-22.diff
+Patch0:		Inventor-2.1.5-23.diff.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{?fedora}" < "5"
+BuildRequires:  xorg-x11-Mesa-libGLU
+BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  xorg-x11-devel
+%endif
+
 BuildRequires:  libGLU-devel
+%if "%{?fedora}" >= "5"
 BuildRequires:	libGLw-devel
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
+%endif
 
 %if "%{?fedora}" >= "6"
 BuildRequires:	lesstif-devel
@@ -157,6 +165,8 @@
     < $i > $(basename $i .in)
 done
 
+rm -f data/models/scenes/chesschairs.iv
+
 %build
 # Inventor's build system wants us to install and build everything at once.
 rm -rf $RPM_BUILD_ROOT
@@ -171,7 +181,7 @@
   LSUBDIRS="lib libSoXt"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} BUILDMAN=1 \
-  LSUBDIRS="doc data apps"
+  LSUBDIRS="doc apps data"
 
 # convert Mentor and Toolmaker examples into a standalone package
 rm -rf devel-docs
@@ -284,6 +294,11 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
+- Add make-var _PDFVIEWER.
+- Backport to FC4.
+- Fix path to chessboard.iv in chesschairs.iv.
+
 * Thu Sep 25 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-22
 - Misc minor fixes.
 - Add dep to xmessage.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 08:39:13 -0000	1.3
+++ sources	2 Oct 2006 04:05:04 -0000	1.4
@@ -1,2 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
-6fa640c31471056a882c536a41040a71  Inventor-2.1.5-22.diff
+c8e1cbcc3ae9f51f97940b06d522bd47  Inventor-2.1.5-23.diff.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 04:06:41 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:06:41 -0700
Subject: rpms/Inventor/devel .cvsignore,1.4,1.5
Message-ID: <200610020406.k9246hBn012067@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12041

Modified Files:
	.cvsignore 
Log Message:
* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
- Add make-var _PDFVIEWER.
- Backport to FC4.
- Fix path to chessboard.iv in chesschairs.iv.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 04:05:04 -0000	1.4
+++ .cvsignore	2 Oct 2006 04:06:41 -0000	1.5
@@ -1,3 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
-Inventor-2.1.5-22.diff
 Inventor-2.1.5-23.diff.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 04:46:04 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:46:04 -0700
Subject: rpms/Inventor/FC-5 .cvsignore, 1.3, 1.4 Inventor.spec, 1.32,
	1.33 sources, 1.3, 1.4
Message-ID: <200610020446.k924k6oU012266@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12245

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
- Add make-var _PDFVIEWER.
- Backport to FC4.
- Fix path to chessboard.iv in chesschairs.iv.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2006 09:00:00 -0000	1.3
+++ .cvsignore	2 Oct 2006 04:46:03 -0000	1.4
@@ -1,2 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
-Inventor-2.1.5-22.diff
+Inventor-2.1.5-23.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/Inventor.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Inventor.spec	28 Sep 2006 09:00:00 -0000	1.32
+++ Inventor.spec	2 Oct 2006 04:46:03 -0000	1.33
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        22%{?dist}
+Release:        23%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,14 +14,22 @@
 License:        LGPL
 URL:            http://oss.sgi.com/projects/inventor/
 Source0:        ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
-Patch0:		Inventor-2.1.5-22.diff
+Patch0:		Inventor-2.1.5-23.diff.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{?fedora}" < "5"
+BuildRequires:  xorg-x11-Mesa-libGLU
+BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  xorg-x11-devel
+%endif
+
 BuildRequires:  libGLU-devel
+%if "%{?fedora}" >= "5"
 BuildRequires:	libGLw-devel
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
+%endif
 
 %if "%{?fedora}" >= "6"
 BuildRequires:	lesstif-devel
@@ -157,6 +165,8 @@
     < $i > $(basename $i .in)
 done
 
+rm -f data/models/scenes/chesschairs.iv
+
 %build
 # Inventor's build system wants us to install and build everything at once.
 rm -rf $RPM_BUILD_ROOT
@@ -171,7 +181,7 @@
   LSUBDIRS="lib libSoXt"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} BUILDMAN=1 \
-  LSUBDIRS="doc data apps"
+  LSUBDIRS="doc apps data"
 
 # convert Mentor and Toolmaker examples into a standalone package
 rm -rf devel-docs
@@ -284,6 +294,11 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
+- Add make-var _PDFVIEWER.
+- Backport to FC4.
+- Fix path to chessboard.iv in chesschairs.iv.
+
 * Thu Sep 25 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-22
 - Misc minor fixes.
 - Add dep to xmessage.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 09:00:00 -0000	1.3
+++ sources	2 Oct 2006 04:46:03 -0000	1.4
@@ -1,2 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
-6fa640c31471056a882c536a41040a71  Inventor-2.1.5-22.diff
+c8e1cbcc3ae9f51f97940b06d522bd47  Inventor-2.1.5-23.diff.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 04:52:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:52:12 -0700
Subject: rpms/Inventor/FC-4 Inventor-apps.diff, 1.1,
	NONE Inventor-makeManDirs.diff, 1.1, NONE Inventor-yacc.diff,
	1.1, NONE Inventor-SoPath.diff, 1.1,
	NONE Inventor-pkgconfig.diff, 1.1,
	NONE Inventor-libInventor.diff, 1.1, NONE Inventor-decal.diff,
	1.1, NONE
Message-ID: <200610020452.k924qE26012355@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12340

Removed Files:
	Inventor-apps.diff Inventor-makeManDirs.diff 
	Inventor-yacc.diff Inventor-SoPath.diff 
	Inventor-pkgconfig.diff Inventor-libInventor.diff 
	Inventor-decal.diff 
Log Message:
Remove.


--- Inventor-apps.diff DELETED ---


--- Inventor-makeManDirs.diff DELETED ---


--- Inventor-yacc.diff DELETED ---


--- Inventor-SoPath.diff DELETED ---


--- Inventor-pkgconfig.diff DELETED ---


--- Inventor-libInventor.diff DELETED ---


--- Inventor-decal.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 04:53:25 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:53:25 -0700
Subject: rpms/Inventor/FC-4 inventor_2.1.5-10-2.diff,1.1,NONE
Message-ID: <200610020453.k924rREg012391@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376

Removed Files:
	inventor_2.1.5-10-2.diff 
Log Message:
Remove.


--- inventor_2.1.5-10-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 04:54:10 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun,  1 Oct 2006 21:54:10 -0700
Subject: rpms/Inventor/FC-4 .cvsignore, 1.2, 1.3 Inventor.spec, 1.14,
	1.15 sources, 1.2, 1.3
Message-ID: <200610020454.k924sDQr012427@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:59:15 -0000	1.2
+++ .cvsignore	2 Oct 2006 04:54:10 -0000	1.3
@@ -1 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
+Inventor-2.1.5-23.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/Inventor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Inventor.spec	3 Aug 2005 04:06:39 -0000	1.14
+++ Inventor.spec	2 Oct 2006 04:54:10 -0000	1.15
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 
 Name:           Inventor
 Version:        2.1.5
-Release:        13%{?dist}
+Release:        23%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,31 +14,30 @@
 License:        LGPL
 URL:            http://oss.sgi.com/projects/inventor/
 Source0:        ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
-# Debian patch
-Patch0:         inventor_2.1.5-10-2.diff
-# fix broken GNUmakefiles
-Patch1:		Inventor-apps.diff
-# fixes one of the GNUmakefile bugs (currently unused)
-Patch2:		Inventor-libSoXt.diff
-# use bison
-Patch3:		Inventor-yacc.diff
-# use /bin/csh (Revert debian patch)
-Patch4:		Inventor-makeManDirs.diff
-# Add libdl to libInventor
-Patch5:		Inventor-libInventor.diff
-# Add libgl to Decal.so
-Patch6:		Inventor-decal.diff
-# Add pkgconfig support
-Patch7:		Inventor-pkgconfig.diff
-# Declare SoTempPath forward
-Patch8:		Inventor-SoPath.diff
+Patch0:		Inventor-2.1.5-23.diff.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{?fedora}" < "5"
 BuildRequires:  xorg-x11-Mesa-libGLU
 BuildRequires:  xorg-x11-Mesa-libGL
-BuildRequires:	xorg-x11-devel
-BuildRequires:	openmotif-devel freetype-devel libjpeg-devel
+BuildRequires:  xorg-x11-devel
+%endif
+
+BuildRequires:  libGLU-devel
+%if "%{?fedora}" >= "5"
+BuildRequires:	libGLw-devel
+# FIXME: Why is libXi required?
+BuildRequires: 	libXi-devel
+%endif
+
+%if "%{?fedora}" >= "6"
+BuildRequires:	lesstif-devel
+%else
+BuildRequires:	openmotif-devel
+%endif
+BuildRequires:	freetype-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	bison
 # Workaround to RH shipping bison with broken package dependencies
 BuildRequires:	m4
@@ -59,29 +58,37 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	xorg-x11-devel
+Requires:	libGLU-devel
 Requires:	freetype-devel libjpeg-devel
 
 %description    devel
 SGI Open Inventor (TM) development files.
 
 %package        -n InventorXt
-Summary:        SGI Open Inventor (TM) Motif bindings.
+Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	pkgconfig
+%if "%{?fedora}" >= "4"
+Requires:	%{_bindir}/xmessage
+%else
+Requires:	/usr/X11R6/bin/xmessage
+%endif
 
 %description    -n InventorXt
 SGI Open Inventor (TM) development files.
 
 %package        -n InventorXt-devel
-Summary:        SGI Open Inventor (TM) Motif bindings.
+Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
+%if "%{?fedora}" >= "6"
+Requires:	lesstif-devel
+%else
 Requires:	openmotif-devel
+%endif
 
 %description    -n InventorXt-devel
 SGI Open Inventor (TM) development files.
@@ -103,7 +110,7 @@
 
 %package	examples
 Summary:	SGI Open Inventor (TM) source code examples
-Group:		Development/Demos
+Group:		Development/Libraries
 # Should we once ship binary examples, this requirement can be dropped
 Requires:	InventorXt-devel
 
@@ -113,15 +120,8 @@
 
 %prep
 %setup -q -n inventor
-%patch0 -p1 -b .debian
-%patch1 -p0
-# %patch2 -p0 -b .orig
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
+find -name CVS | xargs rm -rf
+%patch0 -p0
 
 grep -Rl __ia64 lib* | while read a; do \
   sed -i -e 's,__ia64,__ia64__,g' \
@@ -165,12 +165,14 @@
     < $i > $(basename $i .in)
 done
 
+rm -f data/models/scenes/chesschairs.iv
+
 %build
 # Inventor's build system wants us to install and build everything at once.
 rm -rf $RPM_BUILD_ROOT
 export LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir}
 export VCOPTS="${RPM_OPT_FLAGS} -D_REENTRANT"
-export VCXXOPTS="${RPM_OPT_FLAGS} -D_REENTRANT"
+export VCXXOPTS="${RPM_OPT_FLAGS} -D_REENTRANT -D__STDC_FORMAT_MACROS"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} \
   LSUBDIRS="libimage tools libFL"
@@ -179,15 +181,13 @@
   LSUBDIRS="lib libSoXt"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} BUILDMAN=1 \
-  LSUBDIRS="doc data apps"
+  LSUBDIRS="doc apps data"
 
 # convert Mentor and Toolmaker examples into a standalone package
 rm -rf devel-docs
 cp -a apps/examples devel-docs
 cp -a make devel-docs
 pushd devel-docs > /dev/null
-find -name CVS | xargs rm -rf
-find \( -name '*~' -o -name '*.debian' \) -exec rm -f {} \;
 find -name 'GNUmakefile*' | while read a; do \
   b=`echo $a | sed 's,GNUmakefile.*$,,;s,^\./,,;s,[^/]*/,../,g;s,\/$,,;s,^$,.,'`
   sed -i -e "s,^IVDEPTH = .*$,IVDEPTH = $b," $a
@@ -294,6 +294,45 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
+- Add make-var _PDFVIEWER.
+- Backport to FC4.
+- Fix path to chessboard.iv in chesschairs.iv.
+
+* Thu Sep 25 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-22
+- Misc minor fixes.
+- Add dep to xmessage.
+- Use unified patch.
+- Rebuild against lesscrap.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-21
+- Mass rebuild.
+
+* Sun Feb 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-20
+- Rebuild.
+
+* Fri Dec 30 2005 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-19
+- Don't BR: libXau-devel (#176313 reported to be fixed).
+
+* Wed Dec 28 2005 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-18
+- Remove patch10 (#173879, #175251 are reported to be fixed).
+
+* Thu Dec 22 2005 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-17
+- Remove BR: libX11-devel (#173712 reported to be fixed).
+- Remove BR: libGL-devel (#175253 reported to be fixed).
+
+* Wed Dec 14 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-16
+- Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
+- Remove BR: xorg-x11-proto-devel (PR #175256).
+
+* Thu Dec 8 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-15
+- Further modular X fixes.
+- Reflect modular X pkgconfigs.
+
+* Thu Dec 8 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-14
+- Attempt to build against modular X.
+- Add Inventor-redhat-bugs patch.
+
 * Tue Aug 03 2005 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-13
 - Let PPC use standard RPM_OPT_FLAGS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:59:15 -0000	1.2
+++ sources	2 Oct 2006 04:54:10 -0000	1.3
@@ -1 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
+c8e1cbcc3ae9f51f97940b06d522bd47  Inventor-2.1.5-23.diff.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 06:12:12 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun,  1 Oct 2006 23:12:12 -0700
Subject: rpms/php-pear-Console-Getargs/FC-5 php-pear-Console-Getargs.spec,
	1.1, 1.2
Message-ID: <200610020612.k926CEoK018461@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18444

Modified Files:
	php-pear-Console-Getargs.spec 
Log Message:
	bump release to build under FC5



Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/php-pear-Console-Getargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Console-Getargs.spec	1 Oct 2006 12:38:04 -0000	1.1
+++ php-pear-Console-Getargs.spec	2 Oct 2006 06:12:12 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Console-Getargs
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
 



From fedora-extras-commits at redhat.com  Mon Oct  2 06:57:34 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:57:34 -0700
Subject: rpms/gnome-python2-gda - New directory
Message-ID: <200610020657.k926vaZn018702@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18676/gnome-python2-gda

Log Message:
Directory /cvs/extras/rpms/gnome-python2-gda added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 06:57:35 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:57:35 -0700
Subject: rpms/gnome-python2-gda/devel - New directory
Message-ID: <200610020657.k926vbTe018705@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18676/gnome-python2-gda/devel

Log Message:
Directory /cvs/extras/rpms/gnome-python2-gda/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 06:57:52 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:57:52 -0700
Subject: rpms/gnome-python2-gda Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610020657.k926vsUs018752@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18724

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnome-python2-gda


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-python2-gda
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 06:57:53 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:57:53 -0700
Subject: rpms/gnome-python2-gda/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610020658.k926vt2Y018755@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18724/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-python2-gda


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 06:59:01 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:59:01 -0700
Subject: rpms/gnome-python2-gda/devel gnome-python2-gda-configure.patch, NONE,
	1.1 gnome-python2-gda.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610020659.k926x3Jw018834@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18793/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-python2-gda-configure.patch gnome-python2-gda.spec 
Log Message:
auto-import gnome-python2-gda-2.14.2-2 on branch devel from gnome-python2-gda-2.14.2-2.src.rpm

gnome-python2-gda-configure.patch:

--- NEW FILE gnome-python2-gda-configure.patch ---
--- gnome-python-extras-2.14.0.orig/configure	2006-07-24 12:02:29.000000000 +0200
+++ gnome-python-extras-2.14.0/configure	2006-07-24 12:05:04.000000000 +0200
@@ -20972,6 +20972,7 @@
 
 
 
+build_gtkhtml2=false
 if $build_gtkhtml2; then
   BUILD_GTKHTML2_TRUE=
   BUILD_GTKHTML2_FALSE='#'
@@ -21037,6 +21038,7 @@
 fi
 
 
+build_eggtray=false
 if $build_eggtray; then
   BUILD_EGGTRAY_TRUE=
   BUILD_EGGTRAY_FALSE='#'
@@ -21115,6 +21117,7 @@
 fi
 
 
+build_eggrecent=false
 if $build_eggrecent; then
   BUILD_EGGRECENT_TRUE=
   BUILD_EGGRECENT_FALSE='#'
@@ -21382,6 +21385,7 @@
 
 
 
+build_gtkmozembed=false
 if $build_gtkmozembed; then
   BUILD_GTKMOZEMBED_TRUE=
   BUILD_GTKMOZEMBED_FALSE='#'
@@ -21449,6 +21453,7 @@
 fi
 
 
+build_gtkspell=false
 if $build_gtkspell; then
   BUILD_GTKSPELL_TRUE=
   BUILD_GTKSPELL_FALSE='#'
@@ -21513,6 +21518,7 @@
 fi
 
 
+build_gdl=false
 if $build_gdl; then
   BUILD_GDL_TRUE=
   BUILD_GDL_FALSE='#'
@@ -21649,6 +21655,7 @@
 fi
 
 
+build_gksu=false
 if $build_gksu; then
   BUILD_GKSU_TRUE=
   BUILD_GKSU_FALSE='#'
@@ -21720,6 +21727,7 @@
 fi
 
 
+build_gksuui=false
 if $build_gksuui; then
   BUILD_GKSUUI_TRUE=
   BUILD_GKSUUI_FALSE='#'


--- NEW FILE gnome-python2-gda.spec ---
%define pyver %(%{__python} -c "import sys; print sys.version[:3]")

%define glib_version 2.6.0
%define gtk_version 2.4.0
%define gnome_python_version 2.9.0
%define gda_version 1.2.0

Summary: PyGNOME Python extension module for interacting with gda
Name: gnome-python2-gda
Version: 2.14.2
Release: 2%{?dist}
License: LGPL
Group: Development/Languages
URL: http://developer.gnome.org
Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.14/gnome-python-extras-%{version}.tar.bz2
Patch0: gnome-python2-gda-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

Requires:  compat-libgda >= %{gda_version}
Requires: gnome-python2 >= %{gnome_python_version}
Requires: python-abi = %{pyver}
BuildRequires: gtk2-devel >= %{gtk_version}
BuildRequires: gnome-python2 >= %{gnome_python_version}
BuildRequires: compat-libgda-devel >= %{gda_version}
BuildRequires: python-devel
BuildRequires: pygtk2-devel


%description
The gnome-python-extra package contains the source packages for
additional Python bindings for GNOME. It should be used together with
gnome-python. This module contains a wrapper that allows the use of
gda via Python.


%package        devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       pygobject2-devel
Requires:       compat-libgda-devel


%description devel
This package contains the static libraries and header files needed for
developing gtkmm applications.


%prep
%setup -q -n gnome-python-extras-%{version}
%patch0 -p1 -b .configure


%build
%configure --disable-glib-test --disable-gtk-test --disable-dependency-tracking 
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;

rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/gnome-python-extras-2.0.pc
rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/gtk-2.0/egg
rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gksu
rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS COPYING COPYING.LGPL MAINTAINERS
%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gda.so
%{_datadir}/pygtk/2.0/defs/gda.defs


%files devel
%defattr(-,root,root,-)
%doc README ChangeLog
%{_libdir}/pkgconfig/pygda-1.2.pc
%{_includedir}/pygda-1.2


%changelog
* Mon Oct  2 2006 Denis Leroy <denis at poolshark.org> - 2.14.2-2
- Split for devel package

* Sun Oct  1 2006 Denis Leroy <denis at poolshark.org> - 2.14.2-1
- Update to upstream version 2.14.2

* Mon Jul 24 2006 Denis Leroy <denis at poolshark.org> - 2.14.0-1
- First draft, adapted from gnome-python2-extras from core



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 06:57:52 -0000	1.1
+++ .cvsignore	2 Oct 2006 06:59:01 -0000	1.2
@@ -0,0 +1 @@
+gnome-python-extras-2.14.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 06:57:52 -0000	1.1
+++ sources	2 Oct 2006 06:59:01 -0000	1.2
@@ -0,0 +1 @@
+039e1300368df17de9867685e9705091  gnome-python-extras-2.14.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 06:59:01 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  1 Oct 2006 23:59:01 -0700
Subject: rpms/gnome-python2-gda import.log,1.1,1.2
Message-ID: <200610020659.k926x3Dl018827@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18793

Modified Files:
	import.log 
Log Message:
auto-import gnome-python2-gda-2.14.2-2 on branch devel from gnome-python2-gda-2.14.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 06:57:52 -0000	1.1
+++ import.log	2 Oct 2006 06:59:00 -0000	1.2
@@ -0,0 +1 @@
+gnome-python2-gda-2_14_2-2:HEAD:gnome-python2-gda-2.14.2-2.src.rpm:1159772284



From fedora-extras-commits at redhat.com  Mon Oct  2 07:03:54 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  2 Oct 2006 00:03:54 -0700
Subject: owners owners.list,1.1756,1.1757
Message-ID: <200610020704.k9274TMR021714@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21697

Modified Files:
	owners.list 
Log Message:
Added gnome-python2-gda


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1756
retrieving revision 1.1757
diff -u -r1.1756 -r1.1757
--- owners.list	1 Oct 2006 22:02:10 -0000	1.1756
+++ owners.list	2 Oct 2006 07:03:54 -0000	1.1757
@@ -536,6 +536,7 @@
 Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-phone-manager|Desktop SMS and phone handler|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-ppp|A GNOME 2 WvDial frontend|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-python2-gda|PyGNOME Python extension for libgda access|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-schedule|A GTK+ based user interface for cron and at|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-telnet|A fancy GNOME telnet client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 08:15:21 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon,  2 Oct 2006 01:15:21 -0700
Subject: rpms/pdftohtml/FC-5 pdftohtml.spec,1.10,1.11
Message-ID: <200610020815.k928FNkV025037@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pdftohtml/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006/FC-5

Modified Files:
	pdftohtml.spec 
Log Message:
conflict with poppler-utils (bug 208790)


Index: pdftohtml.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftohtml/FC-5/pdftohtml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pdftohtml.spec	22 Feb 2006 08:34:00 -0000	1.10
+++ pdftohtml.spec	2 Oct 2006 08:15:21 -0000	1.11
@@ -1,14 +1,17 @@
-Name:		pdftohtml
-Version:	0.36
-Release:	7%{?dist}
-
-Summary:	PDF to HTML converter
-License:	GPL
-Group:		Applications/Text
-Url:		http://pdftohtml.sourceforge.net/
-Source0:	http://dl.sf.net/pdftohtml/pdftohtml-0.36.tar.gz
+Name:       pdftohtml
+Version:    0.36
+Release:    9%{?dist}
+
+Summary:    PDF to HTML converter
+License:    GPL
+Group:      Applications/Text
+Url:        http://pdftohtml.sourceforge.net/
+Source0:    http://dl.sf.net/pdftohtml/pdftohtml-0.36.tar.gz
 Patch0:     pdftohtml-0.36-gcc41.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Conflicts:  poppler-utils
+
 
 %description
 PDFTOHTML converts Portable Document Format (PDF) files to HTML
@@ -39,6 +42,12 @@
 %{_bindir}/%{name}
 
 %changelog
+* Mon Oct 02 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-9
+- conflicts with poppler-utils, which also provides /usr/bin/pdftohtml
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-8
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.36-7
 - rebuild 
 



From fedora-extras-commits at redhat.com  Mon Oct  2 08:15:22 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon,  2 Oct 2006 01:15:22 -0700
Subject: rpms/pdftohtml/devel pdftohtml.spec,1.11,1.12
Message-ID: <200610020815.k928FO9w025041@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pdftohtml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006/devel

Modified Files:
	pdftohtml.spec 
Log Message:
conflict with poppler-utils (bug 208790)


Index: pdftohtml.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftohtml/devel/pdftohtml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pdftohtml.spec	30 Aug 2006 15:57:54 -0000	1.11
+++ pdftohtml.spec	2 Oct 2006 08:15:22 -0000	1.12
@@ -1,6 +1,6 @@
 Name:       pdftohtml
 Version:    0.36
-Release:    8%{?dist}
+Release:    9%{?dist}
 
 Summary:    PDF to HTML converter
 License:    GPL
@@ -10,6 +10,9 @@
 Patch0:     pdftohtml-0.36-gcc41.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Conflicts:  poppler-utils
+
+
 %description
 PDFTOHTML converts Portable Document Format (PDF) files to HTML
 format. This release converts text and links. Bold and italic face are
@@ -39,6 +42,9 @@
 %{_bindir}/%{name}
 
 %changelog
+* Mon Oct 02 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-9
+- conflicts with poppler-utils, which also provides /usr/bin/pdftohtml
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-8
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  2 08:40:37 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:40:37 -0700
Subject: rpms/kbackup/devel kbackup-0.5.1.desktop.Encoding.patch, NONE,
	1.1 kbackup-0.5.1.docbook-fr.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 kbackup.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610020840.k928ed7S025200@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25173

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.1.desktop.Encoding.patch 
	kbackup-0.5.1.docbook-fr.patch 
Log Message:
New upstream version.

kbackup-0.5.1.desktop.Encoding.patch:

--- NEW FILE kbackup-0.5.1.desktop.Encoding.patch ---
--- src/kbackup.desktop.orig	2006-09-23 20:53:47.000000000 +0200
+++ src/kbackup.desktop	2006-09-25 18:53:43.000000000 +0200
@@ -1,15 +1,16 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Exec=kbackup %f
-Name=KBackup (Backup Program)
+Name=KBackup
 Comment=Backup your data with an easy to use user interface
 Icon=kbackup
 MimeType=text/x-kbp;
 Terminal=false
 Categories=System;KDE;X-SuSE-Backup;
 
-Name[de]=KBackup (Datensicherungs Programm)
+Name[de]=KBackup
 Comment[de]=Datensicherung mit einem einfach zu bedienended User Interface
 
-Name[fr]=KBackup (Programme de sauvegarde)
+Name[fr]=KBackup
 Comment[fr]=Sauvegarder vos donn??es avec une interface utilisateur facile ?? utiliser

kbackup-0.5.1.docbook-fr.patch:

--- NEW FILE kbackup-0.5.1.docbook-fr.patch ---
--- doc/fr/index.docbook.orig	2006-10-01 22:33:33.000000000 +0200
+++ doc/fr/index.docbook	2006-10-02 10:25:55.000000000 +0200
@@ -69,8 +69,8 @@
      and in the FDL itself on how to use it. -->
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2006-09-24</date>
-<releaseinfo>1.02.00</releaseinfo>
+<date>2006-10-01</date>
+<releaseinfo>1.03.00</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
@@ -196,7 +196,8 @@
 <para>
 &kbackup; enregistre dans un fichier profil une s??lection de tous les fichiers
 et r??pertoires inclus, les fichiers et r??pertoires exclus, le r??pertoire ou
-l'URL cible et le pr??fixe de l'archive.
+l'URL cible, le pr??fixe de l'archive et la taille maximum d'une tranche
+d'archive.
 </para>
 
 <para>
@@ -244,6 +245,16 @@
 Dans le menu Fichier/Configuration du profil, vous pouvez d??finir un pr??fixe
 pour l'archive diff??rent que la valeur par d??faut ??&nbsp;defaut&nbsp;??
 </para>
+
+<para>
+Vous pouvez ??galement d??finir la taille maximum d'une tranche d'archive.
+Cela permet donc de limiter la taille d'une tranche d'archive, m??me s'il
+reste de l'espace sur le p??riph??rique cible. Cela permet de cr??er des tranches
+d'archive qui peuvent ??tre ensuite grav??es sur un CD ou un DVD.
+Si vous avez explicitement limit?? la taille d'une archive, la taille disponible
+sera marqu??e par une ??&nbsp;*&nbsp;?? dans la fen??tre principale.
+</para>
+
 </sect1>
 
 <sect1 id="archive-compression">


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 10:49:08 -0000	1.2
+++ .cvsignore	2 Oct 2006 08:40:37 -0000	1.3
@@ -1 +1 @@
-kbackup-0.5.tar.bz2
+kbackup-0.5.1.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kbackup.spec	27 Sep 2006 09:01:03 -0000	1.2
+++ kbackup.spec	2 Oct 2006 08:40:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		kbackup
-Version:	0.5
-Release:	6%{?dist}
+Version:	0.5.1
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -10,12 +10,9 @@
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}.desktop.Encoding.patch
 Patch1:		%{name}-%{version}.fr.po.patch
+Patch2:		%{name}-%{version}.docbook-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Only for FC-4
-#Requires(post):		desktop-file-utils
-#Requires(postun):	desktop-file-utils
-
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 %description
@@ -37,7 +34,6 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
 
 %build
 %configure --disable-rpath
@@ -51,6 +47,7 @@
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor="" \
   --dir %{buildroot}%{_datadir}/applications/kde \
+  --add-category "Application" \
   --add-category "Utility" \
   --add-category "X-KDE-Utilities-File" \
   --add-category "X-Fedora" \
@@ -61,7 +58,9 @@
 # Fix absolute symlink
 %{__rm} -f %{buildroot}%{_docdir}/HTML/*/%{name}/common
 BKP_PWD=`pwd`
-for lang_dir in de en
+cd %{buildroot}%{_docdir}/HTML/en/%{name}/
+ln -s ../common .
+for lang_dir in de fr
 do
   cd %{buildroot}%{_docdir}/HTML/$lang_dir/%{name}/
   ln -s ../docs/common common
@@ -94,7 +93,15 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
-* Wed Sep 26 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-6
+* Mon Oct  2 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1
+  - New upstream tarball
+  - Update patch1
+  - Add new patch for french doc
+  - Add Application category in desktop file
+  - Fix symlink: english is the only language where common directory is in
+  LANG directory while for other, common is in LANG/docs directory
+
+* Wed Sep 27 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-6
   - Link the good directories
 
 * Tue Sep 26 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 10:49:08 -0000	1.2
+++ sources	2 Oct 2006 08:40:37 -0000	1.3
@@ -1 +1 @@
-94bb56ea9a048622c2bd2677e2e81e82  kbackup-0.5.tar.bz2
+9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 08:45:35 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:45:35 -0700
Subject: rpms/kbackup/devel kbackup.spec,1.3,1.4
Message-ID: <200610020845.k928jbZO025227@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25210

Modified Files:
	kbackup.spec 
Log Message:
Fix spec.


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbackup.spec	2 Oct 2006 08:40:37 -0000	1.3
+++ kbackup.spec	2 Oct 2006 08:45:35 -0000	1.4
@@ -34,6 +34,8 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %configure --disable-rpath



From fedora-extras-commits at redhat.com  Mon Oct  2 08:49:10 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:49:10 -0700
Subject: rpms/kbackup/FC-5 kbackup-0.5.1.desktop.Encoding.patch, NONE,
	1.1 kbackup-0.5.1.docbook-fr.patch, NONE,
	1.1 kbackup-0.5.1.fr.po.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 kbackup.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610020849.k928nCBD025308@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25278

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.1.desktop.Encoding.patch 
	kbackup-0.5.1.docbook-fr.patch kbackup-0.5.1.fr.po.patch 
Log Message:
New upstream version.

kbackup-0.5.1.desktop.Encoding.patch:

--- NEW FILE kbackup-0.5.1.desktop.Encoding.patch ---
--- src/kbackup.desktop.orig	2006-09-23 20:53:47.000000000 +0200
+++ src/kbackup.desktop	2006-09-25 18:53:43.000000000 +0200
@@ -1,15 +1,16 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Exec=kbackup %f
-Name=KBackup (Backup Program)
+Name=KBackup
 Comment=Backup your data with an easy to use user interface
 Icon=kbackup
 MimeType=text/x-kbp;
 Terminal=false
 Categories=System;KDE;X-SuSE-Backup;
 
-Name[de]=KBackup (Datensicherungs Programm)
+Name[de]=KBackup
 Comment[de]=Datensicherung mit einem einfach zu bedienended User Interface
 
-Name[fr]=KBackup (Programme de sauvegarde)
+Name[fr]=KBackup
 Comment[fr]=Sauvegarder vos donn??es avec une interface utilisateur facile ?? utiliser

kbackup-0.5.1.docbook-fr.patch:

--- NEW FILE kbackup-0.5.1.docbook-fr.patch ---
--- doc/fr/index.docbook.orig	2006-10-01 22:33:33.000000000 +0200
+++ doc/fr/index.docbook	2006-10-02 10:25:55.000000000 +0200
@@ -69,8 +69,8 @@
      and in the FDL itself on how to use it. -->
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2006-09-24</date>
-<releaseinfo>1.02.00</releaseinfo>
+<date>2006-10-01</date>
+<releaseinfo>1.03.00</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
@@ -196,7 +196,8 @@
 <para>
 &kbackup; enregistre dans un fichier profil une s??lection de tous les fichiers
 et r??pertoires inclus, les fichiers et r??pertoires exclus, le r??pertoire ou
-l'URL cible et le pr??fixe de l'archive.
+l'URL cible, le pr??fixe de l'archive et la taille maximum d'une tranche
+d'archive.
 </para>
 
 <para>
@@ -244,6 +245,16 @@
 Dans le menu Fichier/Configuration du profil, vous pouvez d??finir un pr??fixe
 pour l'archive diff??rent que la valeur par d??faut ??&nbsp;defaut&nbsp;??
 </para>
+
+<para>
+Vous pouvez ??galement d??finir la taille maximum d'une tranche d'archive.
+Cela permet donc de limiter la taille d'une tranche d'archive, m??me s'il
+reste de l'espace sur le p??riph??rique cible. Cela permet de cr??er des tranches
+d'archive qui peuvent ??tre ensuite grav??es sur un CD ou un DVD.
+Si vous avez explicitement limit?? la taille d'une archive, la taille disponible
+sera marqu??e par une ??&nbsp;*&nbsp;?? dans la fen??tre principale.
+</para>
+
 </sect1>
 
 <sect1 id="archive-compression">

kbackup-0.5.1.fr.po.patch:

--- NEW FILE kbackup-0.5.1.fr.po.patch ---
--- po/fr.po.orig	2006-10-01 22:33:33.000000000 +0200
+++ po/fr.po	2006-10-02 01:41:29.000000000 +0200
@@ -2,14 +2,13 @@
 # This file is put in the public domain.
 #
 # regis Floret <r.floret at laposte.net>, 2006.
-# Martin Koller <koller at etm.at>, 2006.
 # Alain PORTAL <aportal at univ-montp2.fr>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-10-01 20:10+0200\n"
-"PO-Revision-Date: 2006-09-27 11:19+0200\n"
+"PO-Revision-Date: 2006-10-02 01:39+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -311,7 +310,7 @@
 #: SettingsDialog.cxx:86 rc.cpp:15
 #, no-c-format
 msgid "Maximum Archive Slice Size:"
-msgstr ""
+msgstr "Taille maximum d'une tranche d'archive :"
 
 #: main.cxx:23
 msgid "An easy to use backup program"
@@ -340,3 +339,4 @@
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "regis <r.floret at laposte.net>"
+


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 10:49:08 -0000	1.2
+++ .cvsignore	2 Oct 2006 08:49:10 -0000	1.3
@@ -1 +1 @@
-kbackup-0.5.tar.bz2
+kbackup-0.5.1.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-5/kbackup.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kbackup.spec	27 Sep 2006 09:02:34 -0000	1.2
+++ kbackup.spec	2 Oct 2006 08:49:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		kbackup
-Version:	0.5
-Release:	6%{?dist}
+Version:	0.5.1
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -10,12 +10,9 @@
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}.desktop.Encoding.patch
 Patch1:		%{name}-%{version}.fr.po.patch
+Patch2:		%{name}-%{version}.docbook-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Only for FC-4
-#Requires(post):		desktop-file-utils
-#Requires(postun):	desktop-file-utils
-
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 %description
@@ -38,6 +35,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 %configure --disable-rpath
@@ -51,6 +49,7 @@
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor="" \
   --dir %{buildroot}%{_datadir}/applications/kde \
+  --add-category "Application" \
   --add-category "Utility" \
   --add-category "X-KDE-Utilities-File" \
   --add-category "X-Fedora" \
@@ -61,7 +60,9 @@
 # Fix absolute symlink
 %{__rm} -f %{buildroot}%{_docdir}/HTML/*/%{name}/common
 BKP_PWD=`pwd`
-for lang_dir in de en
+cd %{buildroot}%{_docdir}/HTML/en/%{name}/
+ln -s ../common .
+for lang_dir in de fr
 do
   cd %{buildroot}%{_docdir}/HTML/$lang_dir/%{name}/
   ln -s ../docs/common common
@@ -94,7 +95,15 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
-* Wed Sep 26 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-6
+* Mon Oct  2 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1
+  - New upstream tarball
+  - Update patch1
+  - Add new patch for french doc
+  - Add Application category in desktop file
+  - Fix symlink: english is the only language where common directory is in
+  LANG directory while for other, common is in LANG/docs directory
+
+* Wed Sep 27 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-6
   - Link the good directories
 
 * Tue Sep 26 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 10:49:08 -0000	1.2
+++ sources	2 Oct 2006 08:49:10 -0000	1.3
@@ -1 +1 @@
-94bb56ea9a048622c2bd2677e2e81e82  kbackup-0.5.tar.bz2
+9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 08:50:32 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:50:32 -0700
Subject: rpms/kbackup/devel kbackup-0.5.1.fr.po.patch,NONE,1.1
Message-ID: <200610020850.k928oYxw025387@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25365

Added Files:
	kbackup-0.5.1.fr.po.patch 
Log Message:
Add patch1.

kbackup-0.5.1.fr.po.patch:

--- NEW FILE kbackup-0.5.1.fr.po.patch ---
--- po/fr.po.orig	2006-10-01 22:33:33.000000000 +0200
+++ po/fr.po	2006-10-02 01:41:29.000000000 +0200
@@ -2,14 +2,13 @@
 # This file is put in the public domain.
 #
 # regis Floret <r.floret at laposte.net>, 2006.
-# Martin Koller <koller at etm.at>, 2006.
 # Alain PORTAL <aportal at univ-montp2.fr>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-10-01 20:10+0200\n"
-"PO-Revision-Date: 2006-09-27 11:19+0200\n"
+"PO-Revision-Date: 2006-10-02 01:39+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -311,7 +310,7 @@
 #: SettingsDialog.cxx:86 rc.cpp:15
 #, no-c-format
 msgid "Maximum Archive Slice Size:"
-msgstr ""
+msgstr "Taille maximum d'une tranche d'archive :"
 
 #: main.cxx:23
 msgid "An easy to use backup program"
@@ -340,3 +339,4 @@
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "regis <r.floret at laposte.net>"
+



From fedora-extras-commits at redhat.com  Mon Oct  2 08:55:16 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 01:55:16 -0700
Subject: rpms/kbackup/devel kbackup.spec,1.4,1.5
Message-ID: <200610020855.k928tIUr025432@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415

Modified Files:
	kbackup.spec 
Log Message:
Fix mistake.


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kbackup.spec	2 Oct 2006 08:45:35 -0000	1.4
+++ kbackup.spec	2 Oct 2006 08:55:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		kbackup
 Version:	0.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -95,6 +95,9 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Mon Oct  2 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.2
+  - Really add patch1
+
 * Mon Oct  2 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1
   - New upstream tarball
   - Update patch1



From fedora-extras-commits at redhat.com  Mon Oct  2 10:29:08 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon,  2 Oct 2006 03:29:08 -0700
Subject: rpms/pan/devel .cvsignore, 1.10, 1.11 pan.spec, 1.19, 1.20 sources, 
	1.10, 1.11
Message-ID: <200610021029.k92ATACv031740@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31716

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
Taking over orphaned package pan from mpeters.

New upstream release 0.115 from beta tree, with comment:

This is the last `big change' release before 1.0. The week's cuts the
memory overhead in large groups by almost two thirds compared to last
week's release! This is huge news for alt.binaries readers.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 May 2006 19:50:35 -0000	1.10
+++ .cvsignore	2 Oct 2006 10:29:08 -0000	1.11
@@ -1,2 +1 @@
-pan-0.98.tar.bz2
-pan-0.99.tar.bz2
+pan-0.115.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pan.spec	3 Jun 2006 10:07:14 -0000	1.19
+++ pan.spec	2 Oct 2006 10:29:08 -0000	1.20
@@ -1,19 +1,18 @@
-Summary: A GNOME/GTK+ news reader for X
-Name: pan
-Version: 0.99
-Release: 2%{?dist}
-Epoch: 1
-License: GPL
-Group: Applications/Internet
-Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2
-Patch0: pan-0.99-gi18n.patch
-URL: http://pan.rebelbase.com/
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
-BuildRequires: pcre-devel >= 5.0
-BuildRequires: gtkspell-devel >= 2.0.7
-BuildRequires: gettext
-BuildRequires: gmime-devel >= 2.1.0
+Summary:	A GNOME/GTK+ news reader for X
+Name:		pan
+Version:	0.115
+Release:	1%{?dist}
+Epoch:		1
+License:	GPL
+Group:		Applications/Internet
+Source0:	http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2
+URL:		http://pan.rebelbase.com/
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	desktop-file-utils
+BuildRequires:	pcre-devel >= 5.0
+BuildRequires:	gtkspell-devel >= 2.0.7
+BuildRequires:	gettext
+BuildRequires:	gmime-devel >= 2.1.0
 
 %description
 Pan is a newsreader which attempts to be pleasant to new and
@@ -27,39 +26,28 @@
 
 %prep
 %setup -q
-%patch0 -p0
-
-echo "StartupNotify=true" >> pan.desktop
-
-# fix debuginfo rpmlint errors
-for file in `find pan/gui -type f -name "*.cc"`; do
-  [ -x ${file} ] && chmod 644 ${file}
-done
-for file in `find pan/gui -type f -name "*.h"`; do
-  [ -x ${file} ] && chmod 644 ${file}
-done
-
 
+sed -i -e 's|StartupNotify=false|StartupNotify=true|' %{name}.desktop.in
 
 %build
 %configure 
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf %buildroot
-make DESTDIR=%buildroot install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
-install -d $RPM_BUILD_ROOT%_datadir/applications
-desktop-file-install $RPM_BUILD_ROOT%_datadir/gnome/apps/Internet/%{name}.desktop \
+install -d $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \
 --vendor=fedora \
 --add-category=Application \
 --add-category=Network \
 --add-category=X-Fedora \
---dir=$RPM_BUILD_ROOT%_datadir/applications \
+--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 --copy-name-to-generic-name \
 --delete-original
 
-%find_lang %name
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
@@ -67,11 +55,16 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/pan
+%{_bindir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/applications/fedora-pan.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Oct 02 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.115-1
+- Update to 0.115 (last `big change' release before 1.0)
+- removed unnecessary Patch0 pan-0.99-gi18n.patch
+- spec cleanups
+
 * Sat Jun 03 2006 Michael A. Peters <mpeters at mac.com> - 1:0.99-2
 - Patch0 to try and fix devel build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 May 2006 19:50:35 -0000	1.10
+++ sources	2 Oct 2006 10:29:08 -0000	1.11
@@ -1,2 +1 @@
-004dd79036b726e666cadcfd080fd515  pan-0.98.tar.bz2
-d67316c696298e37471bd3638828de67  pan-0.99.tar.bz2
+45174cd93f9b1b9e3466cd8a74436c23  pan-0.115.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 10:33:01 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon,  2 Oct 2006 03:33:01 -0700
Subject: owners owners.list,1.1757,1.1758
Message-ID: <200610021033.k92AX30l031831@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31808

Modified Files:
	owners.list 
Log Message:
Taking over orphaned package pan from mpeters.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1757
retrieving revision 1.1758
diff -u -r1.1757 -r1.1758
--- owners.list	2 Oct 2006 07:03:54 -0000	1.1757
+++ owners.list	2 Oct 2006 10:33:01 -0000	1.1758
@@ -1174,7 +1174,7 @@
 Fedora Extras|pam_ssh|PAM module for use with SSH keys and ssh-agent|pertusus at free.fr|extras-qa at fedoraproject.org|dmitry at butskoy.name
 Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|paman|Management tool for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
-Fedora Extras|pan|A GNOME/GTK+ news reader for X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|mpeters at mac.com
+Fedora Extras|pan|A GNOME/GTK+ news reader for X|alex at dalloz.de|extras-qa at fedoraproject.org|mpeters at mac.com
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|papyrus|A C++ canvas library similar to the Gnome canvas|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 10:41:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:41:19 -0700
Subject: rpms/perl-Wx/devel - New directory
Message-ID: <200610021041.k92AfLJo031917@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31888/perl-Wx/devel

Log Message:
Directory /cvs/extras/rpms/perl-Wx/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 10:41:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:41:18 -0700
Subject: rpms/perl-Wx - New directory
Message-ID: <200610021041.k92AfK6w031914@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31888/perl-Wx

Log Message:
Directory /cvs/extras/rpms/perl-Wx added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 10:41:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:41:35 -0700
Subject: rpms/perl-Wx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610021041.k92Afb3j031966@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31933

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Wx


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Wx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 10:41:36 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:41:36 -0700
Subject: rpms/perl-Wx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610021041.k92AfckI031969@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31933/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Wx


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 10:42:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:42:07 -0700
Subject: rpms/perl-Wx import.log,1.1,1.2
Message-ID: <200610021042.k92Ag9pj032030@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31997

Modified Files:
	import.log 
Log Message:
auto-import perl-Wx-0.57-2 on branch devel from perl-Wx-0.57-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 10:41:35 -0000	1.1
+++ import.log	2 Oct 2006 10:42:06 -0000	1.2
@@ -0,0 +1 @@
+perl-Wx-0_57-2:HEAD:perl-Wx-0.57-2.src.rpm:1159785719



From fedora-extras-commits at redhat.com  Mon Oct  2 10:42:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:42:07 -0700
Subject: rpms/perl-Wx/devel perl-Wx.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610021042.k92Ag9qU032035@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31997/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Wx.spec 
Log Message:
auto-import perl-Wx-0.57-2 on branch devel from perl-Wx-0.57-2.src.rpm


--- NEW FILE perl-Wx.spec ---
#
# Rebuild option:
#
#   --with testsuite         - run the test suite (requires X)
#

Name:           perl-Wx
Version:        0.57
Release:        2%{?dist}
Summary:        Interface to the wxWidgets cross-platform GUI toolkit

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Wx/
Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Wx-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  wxGTK-devel
BuildRequires:  perl(Alien::wxWidgets) >= 0.15
BuildRequires:  perl(Module::Info)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(YAML) >= 0.35
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Wx module is a wrapper for the wxWidgets (formerly known as
wxWindows) GUI toolkit.

This module comes with extensive documentation in HTML format;
you can download it from http://wxperl.sourceforge.net/.


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

chmod -c a-x README.txt docs/todo.txt samples/*/*.pl
find . -type f -name "*.pm" -o -name "*.h" -o -name "*.cpp" |
    xargs chmod -c a-x


# Provides: exclude perl(Wx)
cat <<__EOF__ > %{name}-perl.prov
#!/bin/sh
/usr/lib/rpm/perl.prov \$* | grep -v '^perl(Wx)$'
__EOF__
%define __perl_provides %{_builddir}/Wx-%{version}/%{name}-perl.prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
%{?_with_testsuite:make test}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README.txt docs/todo.txt wxpl.ico wxpl.xpm
%doc run samples/
%{_bindir}/*
%{perl_vendorarch}/Wx*
%{perl_vendorarch}/auto/Wx/
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3pm*


%changelog
* Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.57-2
- Filtered perl(Wx) duplicate provide.
- Corrected several file permission.

* Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.57-1
- Update to 0.57.

* Sun May 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.27-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 10:41:36 -0000	1.1
+++ .cvsignore	2 Oct 2006 10:42:07 -0000	1.2
@@ -0,0 +1 @@
+Wx-0.57.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 10:41:36 -0000	1.1
+++ sources	2 Oct 2006 10:42:07 -0000	1.2
@@ -0,0 +1 @@
+95689cae67e55eb62febe8f41751c1c2  Wx-0.57.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 10:46:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 03:46:42 -0700
Subject: owners owners.list,1.1758,1.1759
Message-ID: <200610021046.k92AkipV032195@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32178

Modified Files:
	owners.list 
Log Message:
New package: perl-Wx (#208009)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1758
retrieving revision 1.1759
diff -u -r1.1758 -r1.1759
--- owners.list	2 Oct 2006 10:33:01 -0000	1.1758
+++ owners.list	2 Oct 2006 10:46:42 -0000	1.1759
@@ -1667,6 +1667,7 @@
 Fedora Extras|perl-WWW-Bugzilla|Handles submission/update of bugzilla bugs via WWW::Mechanize|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Myspace|Access your myspace.com profile in Perl!|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Wx|Interface to the wxWidgets cross-platform GUI toolkit|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|zing at fastmail.fm|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Oct  2 11:24:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 04:24:26 -0700
Subject: rpms/clisp/FC-5 .cvsignore, 1.6, 1.7 clisp.spec, 1.16, 1.17 sources,
	1.7, 1.8
Message-ID: <200610021124.k92BOSAV004950@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4913/FC-5

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.40


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jul 2006 19:32:58 -0000	1.6
+++ .cvsignore	2 Oct 2006 11:24:25 -0000	1.7
@@ -1 +1 @@
-clisp-2.39.tar.bz2
+clisp-2.40.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/clisp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- clisp.spec	28 Jul 2006 18:34:56 -0000	1.16
+++ clisp.spec	2 Oct 2006 11:24:25 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.39
-Release: 	3%{?dist}
+Version:	2.40
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
-Source:		http://download.sourceforge.net/clisp/clisp-2.39.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -105,6 +105,7 @@
 %{_libdir}/clisp/full/lispinit.mem
 %{_libdir}/clisp/full/lisp.run
 %{_libdir}/clisp/data
+%{_datadir}/emacs/site-lisp/*
 
 
 %files devel
@@ -128,6 +129,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-1
+- new version 2.40
+
 * Fri Jul 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.39-3
 - changed url to canonical web page
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jul 2006 19:32:58 -0000	1.7
+++ sources	2 Oct 2006 11:24:25 -0000	1.8
@@ -1 +1 @@
-70ea408e7c9b69d5feb5e408084ecfff  clisp-2.39.tar.bz2
+87e9c4807a8fa3a9b6f7bc25e9e368a4  clisp-2.40.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 11:24:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 04:24:26 -0700
Subject: rpms/clisp/devel .cvsignore, 1.6, 1.7 clisp.spec, 1.17, 1.18 sources,
	1.7, 1.8
Message-ID: <200610021124.k92BOTSo004956@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4913/devel

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.40


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jul 2006 19:51:13 -0000	1.6
+++ .cvsignore	2 Oct 2006 11:24:26 -0000	1.7
@@ -1 +1 @@
-clisp-2.39.tar.bz2
+clisp-2.40.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- clisp.spec	27 Aug 2006 23:26:05 -0000	1.17
+++ clisp.spec	2 Oct 2006 11:24:26 -0000	1.18
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.39
-Release: 	4%{?dist}
+Version:	2.40
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
-Source:		http://download.sourceforge.net/clisp/clisp-2.39.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -105,6 +105,7 @@
 %{_libdir}/clisp/full/lispinit.mem
 %{_libdir}/clisp/full/lisp.run
 %{_libdir}/clisp/data
+%{_datadir}/emacs/site-lisp/*
 
 
 %files devel
@@ -128,6 +129,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-1
+- new version 2.40
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.39-4
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jul 2006 19:51:13 -0000	1.7
+++ sources	2 Oct 2006 11:24:26 -0000	1.8
@@ -1 +1 @@
-70ea408e7c9b69d5feb5e408084ecfff  clisp-2.39.tar.bz2
+87e9c4807a8fa3a9b6f7bc25e9e368a4  clisp-2.40.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 11:38:45 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 04:38:45 -0700
Subject: rpms/piklab/devel piklab-0.12.0.desktop.typo-fr.patch, NONE,
	1.1 piklab-0.12.0.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 piklab.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610021138.k92Bcl0u005137@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5108

Modified Files:
	.cvsignore piklab.spec sources 
Added Files:
	piklab-0.12.0.desktop.typo-fr.patch 
	piklab-0.12.0.x-desktop-fr.patch 
Log Message:
New upstream version.

piklab-0.12.0.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.0.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 DocPath=piklab/index.html
 Categories=QT;KDE;Development;IDE;Electronics;
-Comment=Integrated development environment for applications based on PIC microcontrollers.
-Comment[fr]=Environnement de d?velopement int?gr? pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de d??velopement int??gr?? pour applications ?? base de microcontr??leurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.0.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.0.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2006 16:44:24 -0000	1.2
+++ .cvsignore	2 Oct 2006 11:38:45 -0000	1.3
@@ -1 +1 @@
-piklab-0.11.3.tar.bz2
+piklab-0.12.0.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- piklab.spec	29 Sep 2006 16:44:24 -0000	1.1
+++ piklab.spec	2 Oct 2006 11:38:45 -0000	1.2
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.11.3
-Release:	5%{?dist}
+Version:	0.12.0
+Release:	1%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -17,7 +17,7 @@
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
 #Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
+#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
 Patch2:		%{name}-%{version}.desktop.typo-fr.patch
 Patch3:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +49,7 @@
 %setup -q
 
 #%patch0 -p0
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 
@@ -77,7 +77,6 @@
   --dir %{buildroot}%{_datadir}/applications/kde \
   --add-category "Application" \
   --add-category "X-Fedora" \
-  --remove-only-show-in="KDE" \
   --remove-key="Patterns" \
   src/data/app_data/%{name}.desktop
 
@@ -96,7 +95,7 @@
 ln -s ../common .
 cd $BKP_PWD
 
-#%find_lang %{name}
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -111,8 +110,7 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
 
-#%files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
@@ -126,6 +124,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
+  - New upstream version
+  - Remove patch1 that is no more needed
+
 * Fri Sep 29 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-5
   - Fix typo in pickit2.perms
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 16:44:24 -0000	1.2
+++ sources	2 Oct 2006 11:38:45 -0000	1.3
@@ -1 +1 @@
-0509671541cfc69a3c8b3ce95a9c3beb  piklab-0.11.3.tar.bz2
+2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 11:39:54 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 04:39:54 -0700
Subject: rpms/piklab/FC-5 piklab-0.12.0.desktop.typo-fr.patch, NONE,
	1.1 piklab-0.12.0.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 piklab.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610021139.k92BduJX005222@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5195

Modified Files:
	.cvsignore piklab.spec sources 
Added Files:
	piklab-0.12.0.desktop.typo-fr.patch 
	piklab-0.12.0.x-desktop-fr.patch 
Log Message:
New upstream version.

piklab-0.12.0.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.0.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 DocPath=piklab/index.html
 Categories=QT;KDE;Development;IDE;Electronics;
-Comment=Integrated development environment for applications based on PIC microcontrollers.
-Comment[fr]=Environnement de d?velopement int?gr? pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de d??velopement int??gr?? pour applications ?? base de microcontr??leurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.0.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.0.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2006 16:44:24 -0000	1.2
+++ .cvsignore	2 Oct 2006 11:39:54 -0000	1.3
@@ -1 +1 @@
-piklab-0.11.3.tar.bz2
+piklab-0.12.0.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- piklab.spec	29 Sep 2006 16:44:24 -0000	1.1
+++ piklab.spec	2 Oct 2006 11:39:54 -0000	1.2
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.11.3
-Release:	5%{?dist}
+Version:	0.12.0
+Release:	1%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -17,7 +17,7 @@
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
 #Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
+#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
 Patch2:		%{name}-%{version}.desktop.typo-fr.patch
 Patch3:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +49,7 @@
 %setup -q
 
 #%patch0 -p0
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 
@@ -77,7 +77,6 @@
   --dir %{buildroot}%{_datadir}/applications/kde \
   --add-category "Application" \
   --add-category "X-Fedora" \
-  --remove-only-show-in="KDE" \
   --remove-key="Patterns" \
   src/data/app_data/%{name}.desktop
 
@@ -96,7 +95,7 @@
 ln -s ../common .
 cd $BKP_PWD
 
-#%find_lang %{name}
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -111,8 +110,7 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
 
-#%files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
@@ -126,6 +124,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
+  - New upstream version
+  - Remove patch1 that is no more needed
+
 * Fri Sep 29 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-5
   - Fix typo in pickit2.perms
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 16:44:24 -0000	1.2
+++ sources	2 Oct 2006 11:39:54 -0000	1.3
@@ -1 +1 @@
-0509671541cfc69a3c8b3ce95a9c3beb  piklab-0.11.3.tar.bz2
+2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 12:06:00 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon,  2 Oct 2006 05:06:00 -0700
Subject: rpms/xplanet/devel xplanet.spec,1.10,1.11
Message-ID: <200610021206.k92C6WdN011793@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11679

Modified Files:
	xplanet.spec 
Log Message:
* Mon Oct  2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-2.1
- rebuild against newest gcc(-4.1.1-27 or -28)



Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/xplanet.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xplanet.spec	22 Sep 2006 14:43:24 -0000	1.10
+++ xplanet.spec	2 Oct 2006 12:05:59 -0000	1.11
@@ -50,6 +50,9 @@
 %{_datadir}/xplanet
 
 %changelog
+* Mon Oct  2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-2.1
+- rebuild against newest gcc(-4.1.1-27 or -28)
+
 * Fri Sep 22 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-2
 - bump release
 



From fedora-extras-commits at redhat.com  Mon Oct  2 12:07:35 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon,  2 Oct 2006 05:07:35 -0700
Subject: rpms/xplanet/devel xplanet.spec,1.11,1.12
Message-ID: <200610021207.k92C7bGB012096@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xplanet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12072

Modified Files:
	xplanet.spec 
Log Message:
fix release number


Index: xplanet.spec
===================================================================
RCS file: /cvs/extras/rpms/xplanet/devel/xplanet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xplanet.spec	2 Oct 2006 12:05:59 -0000	1.11
+++ xplanet.spec	2 Oct 2006 12:07:35 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Render a planetary image into an X window
 Name:		xplanet
 Version:	1.2.0
-Release:	2%{?dist}
+Release:	2.1%{?dist}
 
 License:	GPL
 Group:		Amusements/Graphics



From fedora-extras-commits at redhat.com  Mon Oct  2 12:13:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:13:30 -0700
Subject: rpms/libglade - New directory
Message-ID: <200610021213.k92CDWKC013255@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13221/libglade

Log Message:
Directory /cvs/extras/rpms/libglade added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 12:13:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:13:30 -0700
Subject: rpms/libglade/devel - New directory
Message-ID: <200610021213.k92CDWvq013260@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13221/libglade/devel

Log Message:
Directory /cvs/extras/rpms/libglade/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 12:13:51 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:13:51 -0700
Subject: rpms/libglade Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610021213.k92CDr3c013364@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13328

Added Files:
	Makefile import.log 
Log Message:
Setup of module libglade


--- NEW FILE Makefile ---
# Top level Makefile for module libglade
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 12:13:52 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:13:52 -0700
Subject: rpms/libglade/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610021213.k92CDs92013369@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13328/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libglade


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 12:15:11 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:15:11 -0700
Subject: rpms/libglade import.log,1.1,1.2
Message-ID: <200610021215.k92CFDMe013699@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13651

Modified Files:
	import.log 
Log Message:
auto-import libglade-0.17-19 on branch devel from libglade-0.17-19.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libglade/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 12:13:51 -0000	1.1
+++ import.log	2 Oct 2006 12:15:11 -0000	1.2
@@ -0,0 +1 @@
+libglade-0_17-19:HEAD:libglade-0.17-19.src.rpm:1159791299



From fedora-extras-commits at redhat.com  Mon Oct  2 12:15:12 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:15:12 -0700
Subject: rpms/libglade/devel libglade-0.16-fixquote.patch, NONE,
	1.1 libglade-0.17-clist-gettext.patch, NONE,
	1.1 libglade-0.17-gtkdoc.patch, NONE,
	1.1 libglade-0.17-non-weak-symbols.patch, NONE,
	1.1 libglade-0.17-underquoted.patch, NONE, 1.1 libglade.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610021215.k92CFE3N013716@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libglade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13651/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libglade-0.16-fixquote.patch libglade-0.17-clist-gettext.patch 
	libglade-0.17-gtkdoc.patch 
	libglade-0.17-non-weak-symbols.patch 
	libglade-0.17-underquoted.patch libglade.spec 
Log Message:
auto-import libglade-0.17-19 on branch devel from libglade-0.17-19.src.rpm

libglade-0.16-fixquote.patch:

--- NEW FILE libglade-0.16-fixquote.patch ---
--- libglade-0.16/libglade-xgettext.fixquote	Mon Aug 20 12:22:54 2001
+++ libglade-0.16/libglade-xgettext	Mon Aug 20 12:37:59 2001
@@ -104,6 +104,8 @@
 				fp.write(p)
 				length = length + 1 + len(p)
 			fp.write(' */\n')
+			str = string.replace (str, '\\', '\\\\')
+			str = string.replace (str, '"', '\\"')
 			if '\n' in str:
 				fp.write('  _(""\n')
 				lines = string.split(str, '\n')

libglade-0.17-clist-gettext.patch:

--- NEW FILE libglade-0.17-clist-gettext.patch ---
--- libglade-0.17/glade/glade-gtk.c.clist-gettext	Tue Apr 16 10:30:00 2002
+++ libglade-0.17/glade/glade-gtk.c	Tue Apr 16 10:30:48 2002
@@ -289,7 +289,7 @@
 			}
 			if (label) {
 				gtk_clist_set_column_title (GTK_CLIST(w), col,
-							    label);
+							    _(label));
 				/* get the GtkLabel, which is a child
 				 * of the alignment widget used as
 				 * title. */

libglade-0.17-gtkdoc.patch:

--- NEW FILE libglade-0.17-gtkdoc.patch ---
--- libglade-0.17/configure.in.gtkdoc	Wed Jan 23 16:10:42 2002
+++ libglade-0.17/configure.in	Wed Jan 23 16:11:04 2002
@@ -85,7 +85,7 @@
 
 GNOME_COMPILE_WARNINGS
 
-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
+AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, false, false)
 AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
 
 dnl gettext stuff ... there is no message catalog for libglade -- libglade

libglade-0.17-non-weak-symbols.patch:

--- NEW FILE libglade-0.17-non-weak-symbols.patch ---
--- libglade-0.17/glade/Makefile.am	2006-10-02 10:27:20.000000000 +0100
+++ libglade-0.17/glade/Makefile.am	2006-10-02 10:33:07.000000000 +0100
@@ -47,7 +47,7 @@
 libglade_la_LDFLAGS  = -version-info $(LTVERSION)
 
 libglade_gnome_la_SOURCES  = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD   = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD   = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
 libglade_gnome_la_LDFLAGS  = -version-info $(LTVERSION)
 
 libglade_bonobo_la_SOURCES  = glade-bonobo.c glade-build.h glade-xml.h
--- libglade-0.17/glade/Makefile.in	2006-10-02 10:28:06.000000000 +0100
+++ libglade-0.17/glade/Makefile.in	2006-10-02 10:43:03.000000000 +0100
@@ -176,7 +176,7 @@
 libglade_la_LDFLAGS = -version-info $(LTVERSION)
 
 libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
 libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION)
 
 libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h

libglade-0.17-underquoted.patch:

--- NEW FILE libglade-0.17-underquoted.patch ---
--- libglade-0.17/libglade.m4.underquoted	2004-08-06 14:23:18.440417729 +0100
+++ libglade-0.17/libglade.m4	2004-08-06 14:23:36.167030605 +0100
@@ -4,7 +4,7 @@
 dnl AM_PATH_LIBGLADE([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]])
 dnl Test to see if libglade is installed, and define LIBGLADE_CFLAGS, LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBGLADE,
+AC_DEFUN([AM_PATH_LIBGLADE],
 [dnl
 dnl Get the cflags and libraries from the libglade-config script
 dnl


--- NEW FILE libglade.spec ---
Summary:	Gnome-1 support library for loading user interfaces
Name:		libglade
Version:	0.17
Release:	19%{?dist}
Epoch:		1
License:	LGPL
Group:		System Environment/Libraries
URL:		http://www.jamesh.id.au/software/libglade/
Source0:	http://ftp.gnome.org/pub/GNOME/sources/libglade/%{version}/libglade-%{version}.tar.gz
Patch:		libglade-0.16-fixquote.patch
Patch1:		libglade-0.17-gtkdoc.patch
Patch2:		libglade-0.17-clist-gettext.patch
Patch3:		libglade-0.17-underquoted.patch
Patch4:		libglade-0.17-non-weak-symbols.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gnome-libs-devel >= 1:1.4.1.2
BuildRequires:	libxml-devel >= 1:1.8.16
BuildRequires:	autoconf, gettext, gtk-doc, libtool

%description
Libglade is a small library that allows a program to load its user interface
from am XML description at runtime. Libglade uses the XML file format used by
the GLADE user interface builder GLADE, so libglade acts as an alternative to
GLADE's code generation approach. Libglade also provides a simple interface
for connecting handlers to the various signals in the interface (on platforms
where the gmodule library works correctly, it is possible to connect all the
handlers with a single function call). Once the interface has been
instantiated, libglade gives no overhead, so other than the short initial
interface loading time, there is no performance tradeoff.

%package devel
Summary:	The files needed for libglade application development
Group:		Development/Libraries
Requires:	%{name} = %{epoch}:%{version}-%{release}
Requires:	gnome-libs-devel >= 1:1.4.1.2
Requires:	libxml-devel >= 1:1.8.16
Requires:	pkgconfig

%description devel
The libglade-devel package contains the libraries and include files
that you can use to develop libglade applications.

%prep
%setup -q -n %{name}-%{version}
%patch -p1 -b ".fixquote"
%patch1 -p1 -b .gtkdoc
%patch2 -p1 -b .clist-gettext
%patch3 -p1 -b .underquoted
%patch4 -p1 -b .non-weak-symbols

%build
%{__autoconf}
%configure --without-bonobo
%{__make} LIBTOOL=/usr/bin/libtool

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool install

# remove unpackaged files from the buildroot
%{__rm} -f %{buildroot}%{_libdir}/{libglade.a,libglade.la}
%{__rm} -f %{buildroot}%{_libdir}/{libglade-gnome.a,libglade-gnome.la}

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

%post	-p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,0755)
%doc AUTHORS ChangeLog NEWS README COPYING
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,0755)
%doc test-libglade.c
%doc *.glade
%{_bindir}/*
%{_libdir}/lib*.so
%{_includedir}/*
%{_datadir}/aclocal/*
%{_libdir}/libgladeConf.sh
%{_libdir}/pkgconfig/*.pc
%doc %{_datadir}/gnome/html/

%changelog
* Mon Oct  2 2006 Paul Howarth <paul at city-fan.org> 1:0.17-19
- add new buildreq libtool and use the system libtool instead of the bundled
  one to avoid /usr/lib64 rpaths
- add patch to fix non-weak-symbols issues in libglade-gnome.so
- include epoch in versioned gnome-libs-devel dependencies

* Sat Aug 26 2006 Paul Howarth <paul at city-fan.org> 1:0.17-18
- include epoch in versioned libxml-devel dependencies

* Mon Jul 10 2006 Paul Howarth <paul at city-fan.org> 1:0.17-17
- update URL
- add %%{?dist} tag
- remove explicit runtime library deps (rpm will generate what's needed)
- use Fedora Extras standard buildroot
- wrap description text at 80 columns
- add pkgconfig as dep of devel package
- use "make DESTDIR=%%{buildroot} install" instead of deprecated %%makeinstall
- add buildreqs autoconf, gettext, gtk-doc
- disable static libraries
- minor cosmetic spec file tweaks

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-16.2.1
- bump again for double-long bug on ppc(64)

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

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

* Wed Mar  2 2005 Matthias Clasen <mclasen at redhat.com> 1:0.17-16
- Replace Copyright: with License:
- rebuilt with gcc4

* Fri Aug  6 2004 Tim Waugh <twaugh at redhat.com> 1:0.17-15
- Fixed underquoted m4 definition.

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

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

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

* Sun Jun  8 2003 Tim Powers <timp at redhat.com> 1:0.17-12.1
- add epoch to versioned requires where needed
- built for RHEL

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

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

* Fri Jan  3 2003 Owen Taylor <otaylor at redhat.com> 1:0.17-10
- Own /usr/share/gnome/html (#73953, Enrico Scholz)

* Fri Dec 13 2002 Tim Powers <timp at redhat.com> 1:0.17-9
- remove buildrequires on autoconf-2.53
- remove unpackaged files from the buildroot

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

* Wed Jun 19 2002 Jeremy Katz <katzj at redhat.com>
- remove .la files

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

* Tue Apr 16 2002 Havoc Pennington <hp at redhat.com>
- patch from Harald to call gettext on clist column titles, #63338

* Tue Mar  5 2002 Havoc Pennington <hp at redhat.com>
- rebuild in new environment
- install .pc files, #59522
- fix more prefix/lib->libdir sort of things
- use autoconf-2.52 binary

* Wed Jan 23 2002 Havoc Pennington <hp at redhat.com>
- rebuild for db1 stuff
- fix some prefix/lib -> libdir sort of things
- use configure/makeinstall macros
- disable gtk-doc so we don't need an X display

* Fri Sep 21 2001 Havoc Pennington <hp at redhat.com>
- 0.17
- remove libtoolize for now to avoid running autoconf since it requires 2.52

* Mon Aug 20 2001 Jonathan Blandford <jrb at redhat.com>
- Escape strings, #51966

* Sun Jul 22 2001 Havoc Pennington <hp at redhat.com>
- add build requires, bug #49508

* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
- Bump release + rebuild.

* Tue Apr 17 2001 Jonathan Blandford <jrb at redhat.com>
- New Version.

* Thu Mar 01 2001 Owen Taylor <otaylor at redhat.com>
- Rebuild for GTK+-1.2.9 include paths

* Thu Feb 08 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- add libtoolize to make porting to new archs easy

* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
- 0.14
- added patch for gtk-doc scanner linkage

* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Thu Jun 29 2000 Owen Taylor <otaylor at redhat.com>
- specfile fixes

* Wed May 31 2000 Owen Taylor <otaylor at redhat.com>
- Upgraded to libglade-0.13
- Use %%makeinstall, since that is required when %%configure is used.

* Fri May 19 2000 Owen Taylor <otaylor at redhat.com>
- Upgraded to libglade-0.12

* Tue Sep 07 1999 Elliot Lee <sopwith at redhat.com>
- Updated RHL 6.1 package to libglade-0.5

* Sun Nov  1 1998 James Henstridge <james at daa.com.au>

- Updated the dependencies of the devel package, so users must have gtk+-devel.

* Sun Oct 25 1998 James Henstridge <james at daa.com.au>

- Initial release 0.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libglade/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 12:13:51 -0000	1.1
+++ .cvsignore	2 Oct 2006 12:15:12 -0000	1.2
@@ -0,0 +1 @@
+libglade-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libglade/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 12:13:51 -0000	1.1
+++ sources	2 Oct 2006 12:15:12 -0000	1.2
@@ -0,0 +1 @@
+38b2e2cfd813783fe157617813bfe3b3  libglade-0.17.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 12:20:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  2 Oct 2006 05:20:30 -0700
Subject: owners owners.list,1.1759,1.1760
Message-ID: <200610021220.k92CKWQJ014771@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14714

Modified Files:
	owners.list 
Log Message:
Add libglade



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1759
retrieving revision 1.1760
diff -u -r1.1759 -r1.1760
--- owners.list	2 Oct 2006 10:46:42 -0000	1.1759
+++ owners.list	2 Oct 2006 12:20:30 -0000	1.1760
@@ -846,6 +846,7 @@
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgeda|The library needed by gEDA applications|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
+Fedora Extras|libglade|Gnome-1 support library for loading user interfaces|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 12:32:23 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Mon,  2 Oct 2006 05:32:23 -0700
Subject: comps comps-fe5.xml.in,1.158,1.159
Message-ID: <200610021232.k92CWPuE016912@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16885

Modified Files:
	comps-fe5.xml.in 
Log Message:
klamav is added


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- comps-fe5.xml.in	1 Oct 2006 05:00:54 -0000	1.158
+++ comps-fe5.xml.in	2 Oct 2006 12:32:23 -0000	1.159
@@ -595,6 +595,7 @@
       <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kickpim</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
+      <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">knemo</packagereq>
       <packagereq type="optional">kompose</packagereq>



From fedora-extras-commits at redhat.com  Mon Oct  2 13:23:13 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 06:23:13 -0700
Subject: rpms/piklab/devel piklab.spec,1.2,1.3
Message-ID: <200610021323.k92DNFil021689@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21672

Modified Files:
	piklab.spec 
Log Message:
There is a translation in this new version;


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- piklab.spec	2 Oct 2006 11:38:45 -0000	1.2
+++ piklab.spec	2 Oct 2006 13:23:13 -0000	1.3
@@ -24,7 +24,7 @@
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
 # Needed for FC6
-BuildRequires:	ncurses-devel
+BuildRequires:	ncurses-devel, gettext
 
 %description
 Piklab is a graphic development environment for PIC and dsPIC microcontrollers.
@@ -124,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-2
+  - Add BR gettext since there is now translation
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
   - New upstream version
   - Remove patch1 that is no more needed



From fedora-extras-commits at redhat.com  Mon Oct  2 13:24:48 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 06:24:48 -0700
Subject: rpms/piklab/devel piklab.spec,1.3,1.4
Message-ID: <200610021324.k92DOob5021742@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21725

Modified Files:
	piklab.spec 
Log Message:
Fix release.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- piklab.spec	2 Oct 2006 13:23:13 -0000	1.3
+++ piklab.spec	2 Oct 2006 13:24:47 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 



From fedora-extras-commits at redhat.com  Mon Oct  2 13:25:25 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 06:25:25 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.2,1.3
Message-ID: <200610021325.k92DPR5X021805@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788

Modified Files:
	piklab.spec 
Log Message:
There is a translation in this new version.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- piklab.spec	2 Oct 2006 11:39:54 -0000	1.2
+++ piklab.spec	2 Oct 2006 13:25:25 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -24,7 +24,7 @@
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
 # Needed for FC6
-BuildRequires:	ncurses-devel
+BuildRequires:	ncurses-devel, gettext
 
 %description
 Piklab is a graphic development environment for PIC and dsPIC microcontrollers.
@@ -124,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-2
+  - Add BR gettext since there is now translation
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
   - New upstream version
   - Remove patch1 that is no more needed



From fedora-extras-commits at redhat.com  Mon Oct  2 13:38:05 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 06:38:05 -0700
Subject: rpms/telepathy-gabble/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 telepathy-gabble.spec, 1.3, 1.4
Message-ID: <200610021338.k92Dc7Bb022019@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21998

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
- Update to 0.3.7.
- Use -disable-loudmouth-versioning to build with stable version of loudmouth.
- Add requires on telepathy-filesystem.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2006 13:27:53 -0000	1.2
+++ .cvsignore	2 Oct 2006 13:38:05 -0000	1.3
@@ -1 +1 @@
-telepathy-gabble-0.3.1.tar.gz
+telepathy-gabble-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2006 13:27:53 -0000	1.2
+++ sources	2 Oct 2006 13:38:05 -0000	1.3
@@ -1 +1 @@
-feb6766c1d2f984f1f37ffc8889e6faa  telepathy-gabble-0.3.1.tar.gz
+f47b65038041173885b5dacdc0d9881e  telepathy-gabble-0.3.7.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-5/telepathy-gabble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-gabble.spec	9 Sep 2006 23:36:29 -0000	1.3
+++ telepathy-gabble.spec	2 Oct 2006 13:38:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.3.7
+Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -13,6 +13,8 @@
 BuildRequires:	dbus-glib
 BuildRequires:	loudmouth-devel
 
+Requires:	telepathy-filesystem
+
 
 %description
 A Jabber/XMPP connection manager, that handles single and multi-user
@@ -24,7 +26,7 @@
 
 
 %build
-%configure
+%configure --disable-loudmouth-versioning
 make %{?_smp_mflags}
 
 
@@ -42,12 +44,15 @@
 %doc COPYING AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/dbus-1/services/*.service
-%dir %{_datadir}/telepathy/
-%dir %{_datadir}/telepathy/managers/
 %{_datadir}/telepathy/managers/*.manager
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
+- Update to 0.3.7.
+- Use -disable-loudmouth-versioning to build with stable version of loudmouth.
+- Add requires on telepathy-filesystem.
+
 * Sat Sep  9 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.1-2
 - Add BR on dbus-glib.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 14:49:59 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 07:49:59 -0700
Subject: rpms/telepathy-butterfly/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 telepathy-butterfly.spec, 1.1, 1.2
Message-ID: <200610021450.k92Eo1DT025278@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25257

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2006 13:18:12 -0000	1.2
+++ .cvsignore	2 Oct 2006 14:49:58 -0000	1.3
@@ -1 +1 @@
-telepathy-butterfly-0.1.0.tar.gz
+telepathy-butterfly-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2006 13:18:12 -0000	1.2
+++ sources	2 Oct 2006 14:49:59 -0000	1.3
@@ -1 +1 @@
-425c5ea49c01a88b7b7eb144a52e6c54  telepathy-butterfly-0.1.0.tar.gz
+05fa11dc4221d456e068e77c3aecb897  telepathy-butterfly-0.1.1.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/telepathy-butterfly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telepathy-butterfly.spec	1 Oct 2006 13:18:12 -0000	1.1
+++ telepathy-butterfly.spec	2 Oct 2006 14:49:59 -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:           telepathy-butterfly
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1.
+
 * Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.0-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 14:51:26 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 07:51:26 -0700
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 telepathy-butterfly.spec, 1.1, 1.2
Message-ID: <200610021451.k92EpSH7025364@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25343

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2006 13:18:12 -0000	1.2
+++ .cvsignore	2 Oct 2006 14:51:26 -0000	1.3
@@ -1 +1 @@
-telepathy-butterfly-0.1.0.tar.gz
+telepathy-butterfly-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2006 13:18:12 -0000	1.2
+++ sources	2 Oct 2006 14:51:26 -0000	1.3
@@ -1 +1 @@
-425c5ea49c01a88b7b7eb144a52e6c54  telepathy-butterfly-0.1.0.tar.gz
+05fa11dc4221d456e068e77c3aecb897  telepathy-butterfly-0.1.1.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telepathy-butterfly.spec	1 Oct 2006 13:18:12 -0000	1.1
+++ telepathy-butterfly.spec	2 Oct 2006 14:51:26 -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:           telepathy-butterfly
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1.
+
 * Thu Sep 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.0-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 14:53:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:53:26 -0700
Subject: rpms/kdeartwork-extras - New directory
Message-ID: <200610021453.k92ErSmw025478@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25457/kdeartwork-extras

Log Message:
Directory /cvs/extras/rpms/kdeartwork-extras added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 14:53:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:53:27 -0700
Subject: rpms/kdeartwork-extras/devel - New directory
Message-ID: <200610021453.k92ErTYN025481@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25457/kdeartwork-extras/devel

Log Message:
Directory /cvs/extras/rpms/kdeartwork-extras/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 14:53:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:53:42 -0700
Subject: rpms/kdeartwork-extras Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610021453.k92EridE025535@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25502

Added Files:
	Makefile import.log 
Log Message:
Setup of module kdeartwork-extras


--- NEW FILE Makefile ---
# Top level Makefile for module kdeartwork-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 14:53:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:53:43 -0700
Subject: rpms/kdeartwork-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610021453.k92Erjad025538@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25502/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kdeartwork-extras


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 14:54:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:54:30 -0700
Subject: rpms/kdeartwork-extras import.log,1.1,1.2
Message-ID: <200610021454.k92EsWhl025605@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25571

Modified Files:
	import.log 
Log Message:
auto-import kdeartwork-extras-3.5.4-5 on branch devel from kdeartwork-extras-3.5.4-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 14:53:42 -0000	1.1
+++ import.log	2 Oct 2006 14:54:30 -0000	1.2
@@ -0,0 +1 @@
+kdeartwork-extras-3_5_4-5:HEAD:kdeartwork-extras-3.5.4-5.src.rpm:1159800865



From fedora-extras-commits at redhat.com  Mon Oct  2 14:54:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:54:31 -0700
Subject: rpms/kdeartwork-extras/devel kdeartwork-3.5.3-inherits.patch, NONE, 
	1.1 kdeartwork-extras.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610021454.k92EsX1E025612@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25571/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kdeartwork-3.5.3-inherits.patch kdeartwork-extras.spec 
Log Message:
auto-import kdeartwork-extras-3.5.4-5 on branch devel from kdeartwork-extras-3.5.4-5.src.rpm

kdeartwork-3.5.3-inherits.patch:

--- NEW FILE kdeartwork-3.5.3-inherits.patch ---
--- kdeartwork-3.5.3/IconThemes/kdeclassic/index.theme.Inherits	2006-05-22 13:01:15.000000000 -0500
+++ kdeartwork-3.5.3/IconThemes/kdeclassic/index.theme	2006-06-16 12:04:48.000000000 -0500
@@ -97,6 +97,7 @@
 LinkOverlay=link
 LockOverlay=lockoverlay
 ZipOverlay=zip
+Inherits=default
 DesktopDefault=32
 DesktopSizes=16,32,48,64
 ToolbarDefault=22


--- NEW FILE kdeartwork-extras.spec ---

# Fedora Reviews:
# core/icons - http://bugzilla.redhat.com/194279
# extras - http://bugzilla.redhat.com/196379

# NOTE: can only build *one* of the following at a time
#  core:   kdeartwork
#  extras: kdeartwork-extras
#  icons:  kdeartwork-icons 
#define core 1
%define extras 1
#define icons 1

Version: 3.5.4
Release: 5%{?dist}

%if "%{?core}" == "1"
Name:    kdeartwork 
Summary: Additional artwork (themes, sound themes, ...) for KDE 
# For (kde) opengl screensavers, workaround http://bugzilla.redhat.com/193741
#BuildRequires: libGL-devel libGLU-devel
Requires: kdebase
%endif

%if "%{?extras}" == "1"
Name:	 kdeartwork-extras
Summary: Artwork Extras, including xscreensaver-based screensavers
%define _with_xscreensaver --with-xscreensaver
%define xsc xscreensaver-extras xscreensaver-gl-extras
BuildRequires: %{xsc}
Requires:      %{xsc}
# split occured at 3.5.3-6
Conflicts: kdeartwork < 3.5.3-6
Requires: kdebase
%endif

%if "%{?icons}" == "1"
Name:    kdeartwork-icons
Summary: Additional icon themes, including: ikons, kdeclassic, kids, Locolor, slick. 
# included icon themes Inherits= from these
#Requires: %{_datadir}/icons/hicolor/index.theme
Requires: hicolor-icon-theme
Requires: %{_datadir}/icons/default/index.theme
## Consider making .noarch someday...  -- Rex
#BuildArch: noarch
## these speed the build process a wee bit
#define debug_package %{nil}
#define __spec_install_post %{nil}
#AutoReq: no
%endif

License: GPL
Group:   Amusements/Graphics
URL:     http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeartwork-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


# kdeclassic missing Inherits=
Patch1: kdeartwork-3.5.3-inherits.patch

BuildRequires: kdebase-devel >= 6:%{version}

## upstream patches
# fix GL issues, flickering, see http://bugs.kde.org/73813

%description
%{summary}.


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

%patch1 -p1 -b .inherits


%build
unset QTDIR || : ; source /etc/profile.d/qt.sh

%if "%{?icons:1}" != "1"
export DO_NOT_COMPILE="$DO_NOT_COMPILE IconThemes"
%endif

%configure \
  --includedir=%{_includedir}/kde \
  --with-extra-libs=%{_libdir} \
  --disable-rpath \
  --disable-gcc-hidden-visibility \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking --enable-final \
  %{?_with_xscreensaver} %{!?_with_xscreensaver:--without-xscreensaver}

%if "%{?core:1}" == "1"
make %{?_smp_mflags}
%endif

%if "%{?extras:1}" == "1"
make %{?_smp_mflags} -C kscreensaver/kxsconfig
%endif




%install
rm -rf $RPM_BUILD_ROOT

%if "%{?core:1}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT
%endif

%if "%{?extras:1}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT -C kscreensaver/kxsconfig
%endif

%if "%{?icons:1}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT -C IconThemes
%endif

# rpmdocs
for dir in IconThemes/* kscreensaver/kxsconfig kworldclock ; do
  for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do
    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
  done
done

## File lists
# locale's
%find_lang kdeartwork || touch kdeartwork.lang
# 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/*" >> kdeartwork.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  


%if "%{?core:1}" == "1"
%files -f kdeartwork.lang
%defattr(-,root,root,-)
%doc kwin-styles/smooth-blend/COPYING
%doc rpmdocs/kworldclock
%{_bindir}/*
%{_libdir}/kde3/plugins/styles/*
%{_libdir}/kde3/*.so
%{_libdir}/kde3/*.la
%{_datadir}/applnk/System/ScreenSavers/*.desktop
%{_datadir}/apps/kfiresaver/
%{_datadir}/apps/kscreensaver/
%{_datadir}/apps/kstyle/themes/*
%{_datadir}/apps/kwin/*
# note: kworldclock is from kdetoys
%{_datadir}/apps/kworldclock/
%{_datadir}/sounds/*
%{_datadir}/wallpapers/*
%{_datadir}/emoticons/*
%endif

%if "%{?icons:1}" == "1"
%files 
%defattr(-,root,root,-)
%doc kwin-styles/smooth-blend/COPYING
%doc rpmdocs/IconThemes/*
# own until something else sane, like filesystem, does 
# see rh bug http://bugzilla.redhat.com/bugzilla/195911
#dir %{_datadir}/icons
%{_datadir}/icons/ikons/
%{_datadir}/icons/kdeclassic/
%{_datadir}/icons/kids/
%{_datadir}/icons/Locolor/
%{_datadir}/icons/slick/

%post
for icon_theme in ikons kdeclassic kids Locolor slick ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done

%postun
for icon_theme in ikons kdeclassic kids Locolor slick ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%endif

%if "%{?extras:1}" == "1"
%files -f kdeartwork.lang
%defattr(-,root,root,-)
%doc rpmdocs/kscreensaver/kxsconfig
%{_bindir}/kxs*
%{_datadir}/applnk/System/ScreenSavers/*.desktop
%endif


%clean   
rm -rf $RPM_BUILD_ROOT


%changelog
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-5
- %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)

* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-4
- extras: drop (Build)Requires: xscreensaver-base

* Sat Sep 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-3
- use %%_foo style macros in %%changelog

* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-2
- used unversioned Requires: kdebase

* Tue Jul 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-1
- kde-3.5.4

* Mon Jun 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-6
- main(core), -icons, -extras subpkgs.
  -icons so we don't push ~11MB data on every pkg respin, and leave ability 
  to someday make it .noarch
  -extras for xscreensaver bits (see bug #195480)

* Fri Jun 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-5
- patch for kdeclassic missing Inherits=  (even though it *should* already
  implicity Inherits=hicolor ?)

* Wed Jun 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-4
- BR: libGL-devel libGLU-devel (workaround qt bug #193741)
- Group: System Environment/Desktop -> Amusements/Graphics
- drop unused %%?beta macro

* Tue Jun 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-3
- (Build)Requires: xscreensaver-base xscreensaver-extras xscreensaver-gl-extras
- icons: own %%_datadir/icons (until something else sane does, like filesystem)
- icons: drop Requires: kdelibs
- icons: Requires: hicolor-icon-theme, %%_datadir/icons/default/index.theme
- make work on legacy releases too

* Mon Jun 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-2
- cleanup for Extras
- %%doc: README

* Thu Jun 01 2006 Than Ngo <than at redhat.com> 3.5.3-1
- update to 3.5.3

* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-1
- update to 3.5.2

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.2
- bump again for double-long bug on ppc(64)

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

* 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

* Tue Nov 29 2005 Than Ngo <than at redhat.com> 3.5.0-1
- 3.5 final

* Tue Oct 25 2005 Than Ngo <than at redhat.com> 3.4.92-1
- update to 3.5 Beta 2

* Thu Oct 06 2005 Than Ngo <than at redhat.com> 3.4.91-1
- update to 3.5 Beta 1

* 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 
- configure script does not look the right xscreensaver dirs
  apply patch to fix this problem, #161312, thanks to Rex Dieter

* Tue Jun 28 2005 Than Ngo <than at redhat.com> 3.4.1-1
- 3.4.1

* Fri Mar 18 2005 Than Ngo <than at redhat.com> 3.4.0-1
- 3.4.0

* Fri Mar 04 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.2
- rebuilt against gcc-4.0.0-0.31

* Mon Feb 28 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
- KDE-3.4 Beta2

* Wed Dec 15 2004 Than Ngo <than at redhat.com> 3.3.2-0.3
- fix buildreq on xscreensaver-base

* Mon Dec 06 2004 Than Ngo <than at redhat.com> 3.3.2-0.2
- add correct paths for xscreensaver, xscreensaver-4.18-14 stores the
  config files and graphic hacks in %%_libdir/xscreensaver/config/hacks
  and %%_libexecdir/xscreensaver/hacks/

* Fri Dec 03 2004 Than Ngo <than at redhat.com> 3.3.2-0.1
- update to 3.3.2
- remove kdeartwork-3.3.1-kaleidescope.patch, it's included in 3.3.2

* Tue Nov 02 2004 Than Ngo <than at redhat.com> 3.3.1-3
- fix typo in configuration command.

* Mon Oct 18 2004 Than Ngo <than at redhat.com> 3.3.1-2
- rebuilt

* Wed Oct 13 2004 Than Ngo <than at redhat.com> 3.3.1-1
- update to 3.3.1

* Mon Aug 23 2004 Than Ngo <than at redhat.com> 3.3.0-1
- update to 3.3.0 release
- fix file conflict

* Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.3.0-0.1.rc2
- update to 3.3.0 rc2

* Mon Jun 21 2004 Than Ngo <than at redhat.com> 3.2.3-1
- update to 3.2.3

* Mon May 24 2004 Than Ngo <than at redhat.com> 3.2.2-3
- fix file conflict with other kde packages

* Mon May 24 2004 Than Ngo <than at redhat.com> 3.2.2-2
- fix file conflict with other kde packages

* Tue Apr 13 2004 Than Ngo <than at redhat.com> 3.2.2-1
- 3.2.2 release

* Thu Apr 08 2004 Than Ngo <than at redhat.com> 3.2.1-3
- fix file conflict with kdeedu

* Thu Apr 08 2004 Than Ngo <than at redhat.com> 3.2.1-2
- fix icontheme name, bug #119015

* Sun Mar 07 2004 Than Ngo <than at redhat.com> 3.2.1-1
- 3.2.1 release

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

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

* Thu Feb 05 2004 Than Ngo <than at redhat.com> 3.2.0-0.3
- 3.2.0 release
- build against qt 3.3.0

* Mon Jan 19 2004 Than Ngo <than at redhat.com> 3.1.95-0.1
- KDE 3.2 RC1

* Mon Dec 15 2003 Than Ngo <than at redhat.com> 3.1.94-0.2
- subpackage for icon

* Mon Dec 01 2003 Than Ngo <than at redhat.com> 3.1.94-0.1
- KDE 3.2 Beta 2

* Thu Nov 27 2003 Than Ngo <than at redhat.com> 3.1.93-0.2
- get rid of rpath

* Wed Nov 12 2003 Than Ngo <than at redhat.com> 3.1.93-0.1
- KDE 3.2 Beta1
- cleanup

* Tue Sep 30 2003 Than Ngo <than at redhat.com> 3.1.4-1
- 3.1.4

* Mon Sep 01 2003 Than Ngo <than at redhat.com> 3.1.3-3
- add requires xscreensaver

* Tue Aug 12 2003 Than Ngo <than at redhat.com> 3.1.3-2
- rebuilt

* Mon Aug 04 2003 Than Ngo <than at redhat.com> 3.1.3-1
- 3.1.3

* Thu Jun 26 2003 Than Ngo <than at redhat.com> 3.1.2-5
- rebuilt

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

* Thu May 22 2003 Than Ngo <than at redhat.com> 3.1.2-3
- get rid of buildrequires atomake15

* Mon May 19 2003 Than Ngo <than at redhat.com> 3.1.2-2
- 3.1.2

* Wed Mar 19 2003 Than Ngo <than at redhat.com> 3.1.1-1
- 3.1.1

* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
- debuginfo rebuild

* Fri Feb 21 2003 Than Ngo <than at redhat.com> 3.1-2
- get rid of gcc path from dependency_libs

* Tue Jan 28 2003 Than Ngo <than at redhat.com> 3.1-1
- 3.1 final

* Thu Jan 23 2003 Tim Powers <timp at redhat.com> 3.1-0.4
- rebuild

* Tue Jan 14 2003 Thomas Woerner <twoerner at redhat.com> 3.1-0.3
- removed size_t check
- excluded ia64

* Mon Jan 13 2003 Thomas Woerner <twoerner at redhat.com> 3.1-0.2
- rc6

* Wed Nov 27 2002 Than Ngo <than at redhat.com> 3.1-0.1
- update to 3.1 rc4
- get rid of sub packages

* Sun Nov 10 2002 Than Ngo <than at redhat.com> 3.0.5-1
- update to 3.0.5

* Thu Nov  7 2002 Than Ngo <than at redhat.com> 3.0.4-2
- fix some build problems

* Tue Oct 15 2002 Than Ngo <than at redhat.com> 3.0.4-1
- 3.0.4

* Fri Sep 13 2002 Than Ngo <than at redhat.com> 3.0.3-3.1
- Fixed to build on x86_64

* Mon Sep  2 2002 Than Ngo <than at redhat.com> 3.0.3-3
- Add BuildPrereq automake15

* Sun Aug 25 2002 Than Ngo <than at redhat.com> 3.0.3-2
- rebuild against new qt

* Mon Aug 12 2002 Than Ngo <than at redhat.com> 3.0.3-1
- 3.0.3

* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.2-3
- build using gcc-3.2-0.1

* Fri Jul 19 2002 Than Ngo <than at redhat.com> 3.0.2-2
- Fixed screen saver issue

* Tue Jul 09 2002 Than Ngo <than at redhat.com> 3.0.2-1
- 3.0.2
- use desktop-file-install

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

* Tue May 14 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.1-1
- 3.0.1

* Tue Apr 16 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-4
- Rebuild

* Wed Mar 27 2002 Than Ngo <than at redhat.com> 3.0.0-3
- final

* Thu Jan 31 2002 Bernhard Rossenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020129.2
- Remove KBlankscreen, it's in kdebase

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

* Tue Jan  8 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020108.1
- Add missing files

* Mon Jan  7 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020107.1
- Update

* Mon Jul 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010723.1
- Update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 14:53:43 -0000	1.1
+++ .cvsignore	2 Oct 2006 14:54:31 -0000	1.2
@@ -0,0 +1 @@
+kdeartwork-3.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 14:53:43 -0000	1.1
+++ sources	2 Oct 2006 14:54:31 -0000	1.2
@@ -0,0 +1 @@
+c7ff9048b9b68c976de08ed418598e40  kdeartwork-3.5.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 14:57:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 07:57:16 -0700
Subject: owners owners.list,1.1760,1.1761
Message-ID: <200610021457.k92EvITn025685@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25668

Modified Files:
	owners.list 
Log Message:
+kdeartwork-extras



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1760
retrieving revision 1.1761
diff -u -r1.1760 -r1.1761
--- owners.list	2 Oct 2006 12:20:30 -0000	1.1760
+++ owners.list	2 Oct 2006 14:57:16 -0000	1.1761
@@ -741,6 +741,7 @@
 Fedora Extras|kbackup|Back up your data in a simple, user friendly way|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|
 Fedora Extras|kchmviewer|CHM viewer|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|kdeartwork-extras|Artwork Extras, including xscreensaver-based screensavers|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdegraphics-extras|Extras for KDE graphics applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdemultimedia-extras|Extras for KDE multimedia applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 15:02:03 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  2 Oct 2006 08:02:03 -0700
Subject: rpms/xmlrpc-c/devel 0001-make-cmake-transition.txt, NONE,
	1.1 xmlrpc-c.spec, 1.9, 1.10 0003-make-cmake-transition.txt, 1.3, NONE
Message-ID: <200610021502.k92F2c1M028575@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28550

Modified Files:
	xmlrpc-c.spec 
Added Files:
	0001-make-cmake-transition.txt 
Removed Files:
	0003-make-cmake-transition.txt 
Log Message:
- updated cmake patch
- strip installed libraries



--- NEW FILE 0001-make-cmake-transition.txt ---
>From ca5754cd4b3f3fdf3b8b80bc2264aa4c1f2e76a4 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Mon, 2 Oct 2006 13:37:48 +0200
Subject: [PATCH] make -> cmake transition

---
 CMakeLists.txt                              |  236 +++++++++++++++++++++++++++
 cmake/try-attr.cc                           |    3 
 cmake/va-list-is-array.c                    |    9 +
 examples/CMakeLists.txt                     |   51 ++++++
 examples/config.h                           |    1 
 examples/cpp/CMakeLists.txt                 |   20 ++
 include/CMakeLists.txt                      |    3 
 include/xmlrpc-c/CMakeLists.txt             |   31 ++++
 include/xmlrpc-c/config.h.cmake             |    8 +
 lib/CMakeLists.txt                          |   12 +
 lib/abyss/CMakeLists.txt                    |    3 
 lib/abyss/src/CMakeLists.txt                |   62 +++++++
 lib/abyss/src/xmlrpc_abyss.pc.cmake         |   10 +
 lib/curl_transport/CMakeLists.txt           |    7 +
 lib/expat/CMakeLists.txt                    |    9 +
 lib/expat/gennmtab/CMakeLists.txt           |    3 
 lib/expat/xmlparse/CMakeLists.txt           |    7 +
 lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake |   10 +
 lib/expat/xmltok/CMakeLists.txt             |   20 ++
 lib/expat/xmltok/xmlrpc_xmltok.pc.cmake     |    9 +
 lib/libutil/CMakeLists.txt                  |   22 +++
 lib/libutil/xmlrpc_util.pc.cmake            |   10 +
 lib/libwww_transport/CMakeLists.txt         |    4 
 lib/util/CMakeLists.txt                     |   13 +
 lib/wininet_transport/CMakeLists.txt        |    4 
 src/CMakeLists.txt                          |  106 ++++++++++++
 src/cpp/CMakeLists.txt                      |   48 +++++
 src/cpp/xmlrpc++.pc.cmake                   |   11 +
 src/cpp/xmlrpc_client++.pc.cmake            |   11 +
 src/cpp/xmlrpc_cpp.pc.cmake                 |   11 +
 src/cpp/xmlrpc_server++.pc.cmake            |   11 +
 src/cpp/xmlrpc_server_abyss++.pc.cmake      |   11 +
 src/test/CMakeLists.txt                     |   27 +++
 src/xmlrpc.pc.cmake                         |   11 +
 src/xmlrpc_client.pc.cmake                  |   11 +
 src/xmlrpc_server.pc.cmake                  |   11 +
 src/xmlrpc_server_abyss.pc.cmake            |   11 +
 src/xmlrpc_server_cgi.pc.cmake              |   11 +
 tools/CMakeLists.txt                        |    9 +
 tools/binmode-rpc-kit/CMakeLists.txt        |    2 
 tools/turbocharger/CMakeLists.txt           |    1 
 tools/xml-rpc-api2cpp/CMakeLists.txt        |   15 ++
 tools/xmlrpc/CMakeLists.txt                 |   15 ++
 tools/xmlrpc/config.h                       |    1 
 tools/xmlrpc_transport/CMakeLists.txt       |    9 +
 tools/xmlrpc_transport/config.h             |    1 
 transport_config.h.cmake                    |   16 ++
 version.h.cmake                             |    2 
 xmlrpc-c-config                             |   38 ++++
 xmlrpc_config.h.cmake                       |   21 ++
 50 files changed, 988 insertions(+), 0 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..18b390d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,236 @@
+## -*- cmake -*-
+project(xmlrpc-c)
+include(UsePkgConfig)
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+
+set(XMLRPC_C_VERSION    "1.06.05" CACHE STRING "Version of xmlrpc-c")
+set(XMLRPC_C_LIBVERSION "3.6.4")
+set(XMLRPC_C_SOVERSION  "3")
+
+
+macro(ensc_set_bool NAME VALUE DESC)
+  set(${NAME} ${VALUE} CACHE BOOL ${DESC})
+  if(${NAME})
+    set(_${NAME} 1)
+  else(${NAME})
+    set(_${NAME} 0)
+  endif(${NAME})
+endmacro(ensc_set_bool)
+
+macro(ensc_pkgconfig COMP)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${COMP}.pc.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${COMP}.pc
+    @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${COMP}.pc
+    DESTINATION ${pkgconfdir})
+endmacro(ensc_pkgconfig)
+
+macro(ensc_pkgconfig_lib TARGET LIBS)
+  get_target_property(libtype ${TARGET} TYPE)
+  if("${libtype}" STREQUAL "STATIC_LIBRARY")
+    list(APPEND ${TARGET}_pkgconfig_libs "${LIBS}")
+  endif("${libtype}" STREQUAL "STATIC_LIBRARY")
+endmacro(ensc_pkgconfig_lib)
+
+macro(ensc_set_link_exe_flags)
+  ## HACK: libwww has broken inter-lib dependencies and '-Wl,--as-needed' fails with it
+  if(NOT MUST_BUILD_LIBWWW_CLIENT)
+    set_target_properties(${ARGV}
+      PROPERTIES
+      LINK_FLAGS ${XMLRPC_LINKER_FLAGS})
+  endif(NOT MUST_BUILD_LIBWWW_CLIENT)
+endmacro(ensc_set_link_exe_flags)
+
+
+###########
+if(WIN32)
+  find_program(WININET_CONFIG_EXECUTABLE wininet-config)
+
+  if(DEFINED MUST_BUILD_WININET_CLIENT)
+    set(tmp ${MUST_BUILD_WININET_CLIENT})
+  else(DEFINED MUST_BUILD_WININET_CLIENT)
+    if(WININET_CONFIG_EXECUTABLE)
+      set(tmp 1)
+    else(WININET_CONFIG_EXECUTABLE)
+      set(tmp 0)
+    endif(WININET_CONFIG_EXECUTABLE)
+  endif(DEFINED MUST_BUILD_WININET_CLIENT)
+else(WIN32)
+  set(tmp 0)
+endif(WIN32)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE WININET_VERSION)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --cflags  OUTPUT_VARIABLE WININET_CFLAGS)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --libs    OUTPUT_VARIABLE WININET_LDADD)
+  message(STATUS "Using WinInet ${WININET_VERSION} transport")
+endif(tmp)
+
+ensc_set_bool(MUST_BUILD_WININET_CLIENT ${tmp} "Set iff WinInet client transport shall be built")
+set(wininet_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/wininet_transport)
+
+###########
+pkgconfig(libcurl CURL_INCLUDE_DIR CURL_LINK_DIR CURL_LINK_FLAGS CURL_CFLAGS)
+if(DEFINED MUST_BUILD_CURL_CLIENT)
+  set(tmp ${MUST_BUILD_CURL_CLIENT})
+else(DEFINED MUST_BUILD_CURL_CLIENT)
+  if(CURL_LINK_FLAGS)
+    set(tmp 1)
+  else(CURL_LINK_FLAGS)
+    set(tmp 0)
+  endif(CURL_LINK_FLAGS)
+endif(DEFINED MUST_BUILD_CURL_CLIENT)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  STRING(REGEX REPLACE "\n" "" CURL_CFLAGS ${CURL_CFLAGS})	# HACK!!
+  message(STATUS "Using libcurl transport ${CURL_CFLAGS}")
+endif(tmp)
+ensc_set_bool(MUST_BUILD_CURL_CLIENT ${tmp} "Set iff Curl client transport shall be built")
+set(curl_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/curl_transport)
+
+###########
+find_program(LIBWWW_CONFIG_EXECUTABLE libwww-config)
+if(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+  set(tmp ${MUST_BUILD_LIBWWW_CLIENT})
+else(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+  if(LIBWWW_CONFIG_EXECUTABLE)
+    set(tmp 1)
+  else(LIBWWW_CONFIG_EXECUTABLE)
+    set(tmp 0)
+  endif(LIBWWW_CONFIG_EXECUTABLE)
+endif(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE LIBWWW_VERSION)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --libs    OUTPUT_VARIABLE LIBWWW_LIBS)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --cflags  OUTPUT_VARIABLE LIBWWW_CFLAGS)
+  message(STATUS "Using libwww ${LIBWWW_VERSION} transport")
+endif(tmp)
+ensc_set_bool(MUST_BUILD_LIBWWW_CLIENT ${tmp} "Set iff LibWWW client transport shall be built")
+set(libwww_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/libwww_transport)
+
+############
+
+set(ENABLE_CGI_SERVER      1 CACHE BOOL "Set iff CGI server shall be enabled")
+set(ENABLE_CPLUSPLUS       1 CACHE BOOL "Set iff C++ part shall be enabled")
+set(ENABLE_ABYSS_SERVER    1 CACHE BOOL "Set iff Abyss server shall be enabled")
+set(ENABLE_LIBXML2_BACKEND 1 CACHE BOOL "Set iff libxml2 backend shall be used")
+set(ENABLE_ABYSS_THREADS   1 CACHE BOOL "Use pthread")
+
+if(ENABLE_LIBXML2_BACKEND)
+  foreach(tmp libxml-2.0 libxml2 libxml)
+    if (NOT DEFINED libxml_pkgconfig)
+      pkgconfig(${tmp} LIBXML2_INCLUDE_DIR LIBXML2_LINK_DIR LIBXML2_LINK_FLAGS LIBXML2_CFLAGS)
+      if(LIBXML2_LINK_FLAGS)
+	set(libxml_pkgconfig ${tmp})
+      endif(LIBXML2_LINK_FLAGS)
+    endif(NOT DEFINED libxml_pkgconfig)
+  endforeach(tmp)
+endif(ENABLE_LIBXML2_BACKEND)
+
+
+####  <wchar.h> tests
+check_include_file(wchar.h _have_wchar_h)
+if(_have_wchar_h)
+  set(HAVE_WCHAR_H 1)
+else(_have_wchar_h)
+  set(HAVE_WCHAR_H 1)
+endif(_have_wchar_h)
+set(XMLRPC_HAVE_WCHAR   ${HAVE_WCHAR_H})
+set(HAVE_WCHAR_H_DEFINE ${HAVE_WCHAR_H})
+
+
+#######
+set(LINKER_AS_NEEDED  1 CACHE BOOL "Use the --as-needed linker option")
+if(LINKER_AS_NEEDED)
+  set(XMLRPC_LINKER_FLAGS "-Wl,--as-needed")
+endif(LINKER_AS_NEEDED)
+
+
+try_compile(HAVE_ATTR_UNUSED
+  ${CMAKE_BINARY_DIR}/
+  ${xmlrpc-c_SOURCE_DIR}/cmake/try-attr.cc
+  CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-DCMAKE_TEST_ATTR=__unused__)
+
+try_compile(VA_LIST_IS_NOT_ARRAY
+  ${CMAKE_BINARY_DIR}/
+  ${xmlrpc-c_SOURCE_DIR}/cmake/va-list-is-array.c)
+
+if(VA_LIST_IS_NOT_ARRAY)
+  set(VA_LIST_IS_ARRAY 0)
+  message(STATUS "va_list is not an array")
+else(VA_LIST_IS_NOT_ARRAY)
+  set(VA_LIST_IS_ARRAY 1)
+  message(STATUS "va_list is an array")
+endif(VA_LIST_IS_NOT_ARRAY)
+
+
+if(HAVE_ATTR_UNUSED)
+  set(ATTR_UNUSED "__attribute__((__unused__))")
+endif(HAVE_ATTR_UNUSED)
+
+if(WIN32)
+  set(DIRECTORY_SEPARATOR "\\")
+else(WIN32)
+  set(DIRECTORY_SEPARATOR "/")
+endif(WIN32)
+
+check_include_file(sys/filio.h HAVE_SYS_FILIO_H)
+check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
+check_function_exists(setenv HAVE_SETENV)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/xmlrpc_config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/xmlrpc_config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/version.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/version.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/transport_config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/transport_config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/include/xmlrpc-c/config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/include/xmlrpc-c/config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+
+include_directories(${xmlrpc-c_SOURCE_DIR}/include)
+include_directories(${xmlrpc-c_BINARY_DIR}/include)
+include_directories(${xmlrpc-c_SOURCE_DIR}/lib/util/include)
+include_directories(${xmlrpc-c_BINARY_DIR})
+
+add_custom_target(dist
+  rm -rf _dist && mkdir -p _dist/xmlrpc-c-${XMLRPC_C_VERSION}
+  COMMAND cp -a ${xmlrpc-c_SOURCE_DIR}/* _dist/xmlrpc-c-${XMLRPC_C_VERSION}/
+  COMMAND cd _dist && tar cjf ../xmlrpc-c-${XMLRPC_C_VERSION}.tar.bz2 xmlrpc-c-${XMLRPC_C_VERSION} --exclude=.git --exclude=CVS --exclude=.svn
+  )
+
+set(_lib       lib CACHE STRING "Basename of the library-directory; usually 'lib' or 'lib64' (on multilib archs)")
+set(_bin       bin CACHE STRING "Basename of the bin-directory; usually 'bin'")
+set(prefix     ${CMAKE_INSTALL_PREFIX})
+set(libdir     "${prefix}/${_lib}")
+set(bindir     "${prefix}/${_bin}")
+set(mandir     "${prefix}/share/man")
+set(pkgconfdir "${libdir}/pkgconfig")
+set(includedir "${prefix}/include")
+
+#############
+
+install(PROGRAMS xmlrpc-c-config DESTINATION ${_bin})
+
+enable_testing()
+
+add_subdirectory(lib)
+add_subdirectory(Windows)
+add_subdirectory(conf)
+add_subdirectory(doc)
+add_subdirectory(examples)
+add_subdirectory(include)
+add_subdirectory(src)
+add_subdirectory(tools)
diff --git a/cmake/try-attr.cc b/cmake/try-attr.cc
new file mode 100644
index 0000000..4668c5b
--- /dev/null
+++ b/cmake/try-attr.cc
@@ -0,0 +1,3 @@
+int x __attribute__((CMAKE_TEST_ATTR));
+
+int main() {}
diff --git a/cmake/va-list-is-array.c b/cmake/va-list-is-array.c
new file mode 100644
index 0000000..1ad0bab
--- /dev/null
+++ b/cmake/va-list-is-array.c
@@ -0,0 +1,9 @@
+#include <stdarg.h>
+
+void foo()
+{
+  va_list list1, list2;
+  list1 = list2;
+}
+
+int main() {}
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..9f18b0d
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,51 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+macro(ensc_add_example name ext class)
+  # HACK: avoid name collision of c and c++ program
+  if("${ext}" STREQUAL "cpp")
+    set(_target ${name}++)
+  else("${ext}" STREQUAL "cpp")
+    set(_target ${name})
+  endif("${ext}" STREQUAL "cpp")
+
+  add_executable(${_target} ${name}.${ext})
+  target_link_libraries(${_target} ${${class}_LIBS})
+  list(APPEND ${class}_TARGETS ${_target})
+  list(APPEND example_TARGETS ${_target})
+endmacro(ensc_add_example)
+
+if(ENABLE_CPLUSPLUS)
+  add_subdirectory(cpp)
+endif(ENABLE_CPLUSPLUS)
+
+
+
+if(MUST_BUILD_CLIENT)
+  set(client_LIBS xmlrpc_client)
+
+  ensc_add_example(auth_client              c client)
+  ensc_add_example(query-meerkat            c client)
+  ensc_add_example(synch_client             c client)
+  ensc_add_example(xmlrpc_sample_add_client c client)
+  ensc_add_example(xmlrpc_asynch_client     c client)
+endif(MUST_BUILD_CLIENT)
+
+if(ENABLE_CGI_SERVER)
+  set(cgi_server_LIBS xmlrpc_server_cgi)
+
+  ensc_add_example(xmlrpc_sample_add_server_cgi c cgi_server)
+endif(ENABLE_CGI_SERVER)
+
+if(ENABLE_ABYSS_SERVER)
+  set(abyss_server_LIBS xmlrpc_server_abyss)
+
+  ensc_add_example(xmlrpc_inetd_server      c abyss_server)
+  ensc_add_example(xmlrpc_socket_server     c abyss_server)
+  ensc_add_example(xmlrpc_loop_server       c abyss_server)
+  ensc_add_example(xmlrpc_sample_add_server c abyss_server)
+  ensc_add_example(xmlrpc_server_validatee  c abyss_server)
+endif(ENABLE_ABYSS_SERVER)
+
+ensc_set_link_exe_flags(${example_TARGETS})
diff --git a/examples/config.h b/examples/config.h
new file mode 100644
index 0000000..31d5f9b
--- /dev/null
+++ b/examples/config.h
@@ -0,0 +1 @@
+#include "../xmlrpc_config.h"
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
new file mode 100644
index 0000000..9fbea7e
--- /dev/null
+++ b/examples/cpp/CMakeLists.txt
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+if(ENABLE_ABYSS_SERVER)
+  set(abyss_serverxx_LIBS xmlrpc_server_abyss++)
+
+  ensc_add_example(xmlrpc_inetd_server cpp abyss_serverxx)
+endif(ENABLE_ABYSS_SERVER)
+
+if(MUST_BUILD_CLIENT)
+  set(abyss_clientxx_LIBS        xmlrpc_client++)
+  set(abyss_clientxx_legacy_LIBS xmlrpc_cpp)
+
+  ensc_add_example(xmlrpc_sample_add_client  cpp abyss_clientxx)
+  ensc_add_example(sample_add_client_complex cpp abyss_clientxx)
+
+  ensc_add_example(meerkat-app-list          cpp abyss_clientxx_legacy)
+endif(MUST_BUILD_CLIENT)
+
+
+ensc_set_link_exe_flags(${example_TARGETS})
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 0000000..ebfdba5
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+add_subdirectory(xmlrpc-c)
diff --git a/include/xmlrpc-c/CMakeLists.txt b/include/xmlrpc-c/CMakeLists.txt
new file mode 100644
index 0000000..903f623
--- /dev/null
+++ b/include/xmlrpc-c/CMakeLists.txt
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+list(APPEND headers
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+  util.h base.h abyss.h server.h
+  server_abyss.h server_w32httpsys.h oldxmlrpc.h)
+
+if(ENABLE_CPLUSPLUS)
+  list(APPEND headers
+    oldcppwrapper.hpp girerr.hpp girmem.hpp base.hpp
+    timeout.hpp xml.hpp registry.hpp server_abyss.hpp)
+endif(ENABLE_CPLUSPLUS)
+
+if(MUST_BUILD_CLIENT)
+  list(APPEND headers
+    client.h transport.h client_global.h)
+
+  if(ENABLE_CPLUSPLUS)
+    list(APPEND headers
+      client.hpp client_transport.hpp client_simple.hpp)
+  endif(ENABLE_CPLUSPLUS)
+endif(MUST_BUILD_CLIENT)
+
+if(ENABLE_CGI_SERVER)
+  list(APPEND headers
+    server_cgi.h)
+endif(ENABLE_CGI_SERVER)
+
+install(FILES
+  ${headers}
+  DESTINATION ${includedir}/xmlrpc-c)
diff --git a/include/xmlrpc-c/config.h.cmake b/include/xmlrpc-c/config.h.cmake
new file mode 100644
index 0000000..7b95a1d
--- /dev/null
+++ b/include/xmlrpc-c/config.h.cmake
@@ -0,0 +1,8 @@
+/* This file, part of XML-RPC For C/C++, is meant to
+   define characteristics of this particular installation
+   that the other <xmlrpc-c/...> header files need in order to
+   compile correctly when #included in a Xmlrpc-c user code.
+
+   Those header files #include this one.
+*/
+#define XMLRPC_HAVE_WCHAR		@HAVE_WCHAR_H@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
new file mode 100644
index 0000000..7f8f912
--- /dev/null
+++ b/lib/CMakeLists.txt
@@ -0,0 +1,12 @@
+## -*- cmake -*-
+
+add_subdirectory(abyss)
+add_subdirectory(libutil)
+add_subdirectory(util)
+add_subdirectory(curl_transport)
+add_subdirectory(libwww_transport)
+add_subdirectory(wininet_transport)
+
+if(NOT ENABLE_LIBXML2_BACKEND)
+  add_subdirectory(expat)
+endif(NOT ENABLE_LIBXML2_BACKEND)
diff --git a/lib/abyss/CMakeLists.txt b/lib/abyss/CMakeLists.txt
new file mode 100644
index 0000000..2358061
--- /dev/null
+++ b/lib/abyss/CMakeLists.txt
@@ -0,0 +1,3 @@
+## -*- cmake -*-
+
+SUBDIRS(src)
diff --git a/lib/abyss/src/CMakeLists.txt b/lib/abyss/src/CMakeLists.txt
new file mode 100644
index 0000000..a8fb5a9
--- /dev/null
+++ b/lib/abyss/src/CMakeLists.txt
@@ -0,0 +1,62 @@
+## -*- cmake -*-
+
+set(xmlrpc_abyss_SOURCES
+  abyss_info.h
+  channel.c
+  channel.h
+  chanswitch.c
+  chanswitch.h
+  conf.c
+  conn.c
+  conn.h
+  data.c
+  data.h
+  date.c
+  date.h
+  file.c
+  file.h
+  http.c
+  http.h
+  init.c
+  response.c
+  server.c
+  server.h
+  session.c
+  session.h
+  socket.c
+  socket.h
+  socket_unix.c
+  socket_unix.h
+  thread.h
+  token.c
+  token.h
+  trace.c
+  trace.h)
+
+if(ENABLE_ABYSS_THREADS)
+  list(APPEND xmlrpc_abyss_SOURCES thread_pthread.c)
+else(ENABLE_ABYSS_THREADS)
+  list(APPEND xmlrpc_abyss_SOURCES thread_fork.c)
+endif(ENABLE_ABYSS_THREADS)
+
+add_library(xmlrpc_abyss SHARED ${xmlrpc_abyss_SOURCES})
+target_link_libraries(xmlrpc_abyss xmlrpc_util)
+
+if(ENABLE_ABYSS_THREADS)
+  set_target_properties(xmlrpc_abyss PROPERTIES DEFINE_SYMBOL _THREAD)
+  target_link_libraries(xmlrpc_abyss pthread)
+  ensc_pkgconfig_lib(xmlrpc_abyss "-lpthread")
+endif(ENABLE_ABYSS_THREADS)
+
+install(TARGETS xmlrpc_abyss
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib}
+  ARCHIVE DESTINATION ${_lib})
+
+set_target_properties(xmlrpc_abyss
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+ensc_pkgconfig(xmlrpc_abyss)
diff --git a/lib/abyss/src/xmlrpc_abyss.pc.cmake b/lib/abyss/src/xmlrpc_abyss.pc.cmake
new file mode 100644
index 0000000..2a4f124
--- /dev/null
+++ b/lib/abyss/src/xmlrpc_abyss.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_abyss
+Description: XMLRPC Abyss base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_util
+Libs:   		-L${libdir} -lxmlrpc_abyss @xmlrpc_abyss_pkgconfig_libs@
+Cflags:
diff --git a/lib/curl_transport/CMakeLists.txt b/lib/curl_transport/CMakeLists.txt
new file mode 100644
index 0000000..3814f08
--- /dev/null
+++ b/lib/curl_transport/CMakeLists.txt
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_CURL_CLIENT)
+  list(APPEND transport_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc_curl_transport.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc_curl_transport.h)
+endif(MUST_BUILD_CURL_CLIENT)
diff --git a/lib/expat/CMakeLists.txt b/lib/expat/CMakeLists.txt
new file mode 100644
index 0000000..7397f52
--- /dev/null
+++ b/lib/expat/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/xmltok)
+
+add_subdirectory(gennmtab)
+add_subdirectory(xmlparse)
+add_subdirectory(xmltok)
+add_subdirectory(xmlwf)
diff --git a/lib/expat/gennmtab/CMakeLists.txt b/lib/expat/gennmtab/CMakeLists.txt
new file mode 100644
index 0000000..48a44da
--- /dev/null
+++ b/lib/expat/gennmtab/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+ADD_EXECUTABLE(gennmtab gennmtab.c)
diff --git a/lib/expat/xmlparse/CMakeLists.txt b/lib/expat/xmlparse/CMakeLists.txt
new file mode 100644
index 0000000..f87008a
--- /dev/null
+++ b/lib/expat/xmlparse/CMakeLists.txt
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+add_library(xmlrpc_xmlparse STATIC
+  xmlparse.c)
+target_link_libraries(xmlrpc_xmlparse xmlrpc_xmltok)
+
+ensc_pkgconfig(xmlrpc_xmlparse)
diff --git a/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
new file mode 100644
index 0000000..71d77da
--- /dev/null
+++ b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_xmlparse
+Description: XMLRPC xmlparse library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_xmltok
+Libs:   		-L${libdir} -lxmlrpc_xmlparse
+Cflags:
diff --git a/lib/expat/xmltok/CMakeLists.txt b/lib/expat/xmltok/CMakeLists.txt
new file mode 100644
index 0000000..c3247ad
--- /dev/null
+++ b/lib/expat/xmltok/CMakeLists.txt
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(xmlrpc_xmltok STATIC
+  xmltok.c xmlrole.c ${CMAKE_CURRENT_BINARY_DIR}/nametab.h)
+
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/nametab.h
+  PROPERTIES
+  OBJECT_DEPENDS gennmtab
+  GENERATED true)
+
+
+get_target_property(GENNMTAB_EXECUTABLE gennmtab LOCATION)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nametab.h
+  COMMAND ${GENNMTAB_EXECUTABLE} >nametab.h || { rm -f nametab.h\; false\; }
+  DEPENDS gennmtab)
+
+ensc_pkgconfig(xmlrpc_xmltok)
diff --git a/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake b/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
new file mode 100644
index 0000000..88e7ad8
--- /dev/null
+++ b/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
@@ -0,0 +1,9 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_xmltok
+Description: XMLRPC xmltok library
+Version:     @XMLRPC_C_VERSION@
+
+Libs:   	-L${libdir}
+Cflags:
diff --git a/lib/libutil/CMakeLists.txt b/lib/libutil/CMakeLists.txt
new file mode 100644
index 0000000..5e5d382
--- /dev/null
+++ b/lib/libutil/CMakeLists.txt
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+
+add_library(xmlrpc_util SHARED
+  casprintf.c
+  error.c
+  make_printable.c
+  memblock.c
+  resource.c
+  sleep.c)
+
+set_target_properties(xmlrpc_util
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+install(TARGETS xmlrpc_util
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib}
+  ARCHIVE DESTINATION ${_lib})
+
+ensc_pkgconfig(xmlrpc_util)
diff --git a/lib/libutil/xmlrpc_util.pc.cmake b/lib/libutil/xmlrpc_util.pc.cmake
new file mode 100644
index 0000000..98d24f4
--- /dev/null
+++ b/lib/libutil/xmlrpc_util.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_util
+Description: XMLRPC utility library
+Version:     @XMLRPC_C_VERSION@
+
+Libs:   	-L${libdir} -lxmlrpc_util
+Cflags:
diff --git a/lib/libwww_transport/CMakeLists.txt b/lib/libwww_transport/CMakeLists.txt
new file mode 100644
index 0000000..4744f9c
--- /dev/null
+++ b/lib/libwww_transport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_LIBWWW_CLIENT)
+endif(MUST_BUILD_LIBWWW_CLIENT)
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
new file mode 100644
index 0000000..be6ded2
--- /dev/null
+++ b/lib/util/CMakeLists.txt
@@ -0,0 +1,13 @@
+## -*- cmake -*-
+
+set(util_SOURCES
+  casprintf.c
+  cmdline_parser.c
+  getoptx.c
+  getoptx.h)
+
+if(WIN32)
+  list(APPEND util_SOURCES pthreadx_win32.c)
+endif(WIN32)
+
+add_library(util STATIC ${util_SOURCES})
diff --git a/lib/wininet_transport/CMakeLists.txt b/lib/wininet_transport/CMakeLists.txt
new file mode 100644
index 0000000..4f7408e
--- /dev/null
+++ b/lib/wininet_transport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_WININET_CLIENT)
+endif(MUST_BUILD_WININET_CLIENT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..b201fa1
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,106 @@
+# -*- cmake -*-
+
+if(ENABLE_LIBXML2_BACKEND)
+  set(xmlrpc_xml_parser xmlrpc_libxml2.c)
+  set(libxml_INCLUDES ${LIBXML2_CFLAGS})
+  set(libxml_LIBS     ${LIBXML2_LINK_FLAGS})
+  set(xmlrpc_pkgconfig_req ${libxml_pkgconfig})
+else(ENABLE_LIBXML2_BACKEND)
+  set(xmlrpc_xml_parser xmlrpc_expat.c)
+  set(libxml_INCLUDES -I${xmlrpc-c_SOURCE_DIR}/lib/expat/xmlparse)
+  set(libxml_LIBS xmlrpc_xmlparse)
+  set(xmlrpc_pkgconfig_req xmlrpc_xmlparse)
+endif(ENABLE_LIBXML2_BACKEND)
+
+if(MUST_BUILD_WININET_CLIENT)
+  set(client_wininet_CFLAGS "")
+  set(client_wininet_LIBS   "${WININET_LDADD}")
+  list(APPEND transport_SOURCES
+    ${wininet_srcdir}/xmlrpc_wininet_transport.c ${wininet_srcdir}/xmlrpc_wininet_transport.h)
+endif(MUST_BUILD_WININET_CLIENT)
+
+if(MUST_BUILD_LIBWWW_CLIENT)
+  set(client_libwww_CFLAGS "${LIBWWW_CFLAGS}")
+  set(client_libwww_LIBS   "${LIBWWW_LIBS}")
+  list(APPEND transport_SOURCES ${libwww_srcdir}/xmlrpc_libwww_transport.c ${libwww_srcdir}/xmlrpc_libwww_transport.h)
+endif(MUST_BUILD_LIBWWW_CLIENT)
+
+if(MUST_BUILD_CURL_CLIENT)
+  set(client_curl_CFLAGS ${CURL_CFLAGS})
+  set(client_curl_LIBS   ${CURL_LINK_FLAGS})
+  set(xmlrpc_client_pkgconfig_req libcurl)
+  list(APPEND transport_SOURCES ${curl_srcdir}/xmlrpc_curl_transport.c ${curl_srcdir}/xmlrpc_curl_transport.h)
+endif(MUST_BUILD_CURL_CLIENT)
+
+set(client_CFLAGS "-I${wininet_srcdir} -I${libwww_srcdir} -I${curl_srcdir} ${client_wininet_CFLAGS} ${client_libwww_CFLAGS} ${client_curl_CFLAGS}")
+set(client_LIBS   "${client_wininet_LIBS} ${client_libwww_LIBS} ${client_curl_LIBS}")
+
+
+add_subdirectory(cpp)
+add_subdirectory(test)
+
+
+
+### libxmlrpc.so
+add_library(xmlrpc SHARED
+  trace.c ${xmlrpc_xml_parser}
+  xmlrpc_data.c xmlrpc_datetime.c xmlrpc_array.c xmlrpc_struct.c
+  xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
+  xmlrpc_base64.c xmlrpc_utf8.c xmlrpc_authcookie.c)
+
+set_target_properties(xmlrpc
+  PROPERTIES
+  COMPILE_FLAGS ${libxml_INCLUDES})
+
+ensc_pkgconfig(xmlrpc)
+target_link_libraries(xmlrpc ${libxml_LIBS} xmlrpc_util)
+list(APPEND lib_TARGETS xmlrpc)
+
+### libxmlrpc_client.so
+add_library(xmlrpc_client SHARED
+  xmlrpc_client.c xmlrpc_client_global.c ${transport_SOURCES})
+
+target_link_libraries(xmlrpc_client xmlrpc ${client_LIBS})
+set_target_properties(xmlrpc_client
+  PROPERTIES
+  COMPILE_FLAGS "${client_CFLAGS}")
+list(APPEND lib_TARGETS xmlrpc_client)
+ensc_pkgconfig(xmlrpc_client)
+
+### libxmlrpc_server.so
+add_library(xmlrpc_server SHARED
+  registry.c system_method.c)
+target_link_libraries(xmlrpc_server xmlrpc)
+list(APPEND lib_TARGETS xmlrpc_server)
+ensc_pkgconfig(xmlrpc_server)
+
+
+### libxmlrpc_server_abyss.so
+add_library(xmlrpc_server_abyss SHARED
+  xmlrpc_server_abyss.c)
+target_link_libraries(xmlrpc_server_abyss xmlrpc_abyss xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server_abyss)
+ensc_pkgconfig(xmlrpc_server_abyss)
+
+
+
+### libxmlrpc_server_cgi.so
+add_library(xmlrpc_server_cgi SHARED
+  xmlrpc_server_cgi)
+target_link_libraries(xmlrpc_server_cgi xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server_cgi)
+ensc_pkgconfig(xmlrpc_server_cgi)
+
+
+install(TARGETS ${lib_TARGETS}
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib})
+
+set_target_properties(${lib_TARGETS}
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+
+enable_testing()
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
new file mode 100644
index 0000000..9ab2530
--- /dev/null
+++ b/src/cpp/CMakeLists.txt
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+####### libxmlrpc++.so
+add_library(xmlrpc++ SHARED
+  base64.cpp env_wrap.cpp fault.cpp girerr.cpp girmem.cpp
+  outcome.cpp param_list.cpp value.cpp xml.cpp)
+target_link_libraries(xmlrpc++ xmlrpc)
+list(APPEND lib_TARGETS xmlrpc++)
+ensc_pkgconfig(xmlrpc++)
+
+####### libxmlrpc_cpp.so
+add_library(xmlrpc_cpp            SHARED XmlRpcCpp)
+target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server xmlrpc_client)
+list(APPEND lib_TARGETS xmlrpc_cpp)
+ensc_pkgconfig(xmlrpc_cpp)
+
+####### libxmlrpc_server++.so
+add_library(xmlrpc_server++       SHARED registry.cpp)
+target_link_libraries(xmlrpc_server++ xmlrpc++ xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server++)
+ensc_pkgconfig(xmlrpc_server++)
+
+####### libxmlrpc_server_abyss++.so
+add_library(xmlrpc_server_abyss++ SHARED server_abyss.cpp)
+target_link_libraries(xmlrpc_server_abyss++ xmlrpc_server++ xmlrpc_server_abyss)
+list(APPEND lib_TARGETS xmlrpc_server_abyss++)
+ensc_pkgconfig(xmlrpc_server_abyss++)
+
+####### libxmlrpc_client++.so
+add_library(xmlrpc_client++       SHARED
+  client.cpp client_simple.cpp curl.cpp libwww.cpp wininet.cpp)
+set_target_properties(xmlrpc_client++
+  PROPERTIES
+  COMPILE_FLAGS "-I${wininet_srcdir} -I${libwww_srcdir} -I${curl_srcdir}")
+target_link_libraries(xmlrpc_client++ xmlrpc++ xmlrpc_client)
+list(APPEND lib_TARGETS xmlrpc_client++)
+ensc_pkgconfig(xmlrpc_client++)
+
+
+install(TARGETS ${lib_TARGETS}
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib})
+
+set_target_properties(${lib_TARGETS}
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
diff --git a/src/cpp/xmlrpc++.pc.cmake b/src/cpp/xmlrpc++.pc.cmake
new file mode 100644
index 0000000..cda7f56
--- /dev/null
+++ b/src/cpp/xmlrpc++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc++
+Description: XMLRPC C++ Base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc
+Libs:   		-L${libdir} -lxmlrpc++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_client++.pc.cmake b/src/cpp/xmlrpc_client++.pc.cmake
new file mode 100644
index 0000000..188b3a6
--- /dev/null
+++ b/src/cpp/xmlrpc_client++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_client++
+Description: XMLRPC C++ Client library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc++ xmlrpc_client
+Libs:   		-L${libdir} -lxmlrpc_client++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_cpp.pc.cmake b/src/cpp/xmlrpc_cpp.pc.cmake
new file mode 100644
index 0000000..b8f5af3
--- /dev/null
+++ b/src/cpp/xmlrpc_cpp.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_cpp
+Description: XMLRPC CPP library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc xmlrpc_server xmlrpc_client
+Libs:   		-L${libdir} -lxmlrpc_cpp
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_server++.pc.cmake b/src/cpp/xmlrpc_server++.pc.cmake
new file mode 100644
index 0000000..07b9e7b
--- /dev/null
+++ b/src/cpp/xmlrpc_server++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server++
+Description: XMLRPC C++ Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc++ xmlrpc_server
+Libs:   		-L${libdir} -lxmlrpc_server++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_server_abyss++.pc.cmake b/src/cpp/xmlrpc_server_abyss++.pc.cmake
new file mode 100644
index 0000000..d9eb456
--- /dev/null
+++ b/src/cpp/xmlrpc_server_abyss++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_abyss++
+Description: XMLRPC C++ Abyss-Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server_abyss xmlrpc_server++
+Libs:   		-L${libdir} -lxmlrpc_server_abyss++
+Cflags:		-I${includedir}
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
new file mode 100644
index 0000000..3deb9cb
--- /dev/null
+++ b/src/test/CMakeLists.txt
@@ -0,0 +1,27 @@
+# -*- cmake -*-
+
+set(test_SOURCES
+  test.c abyss.c cgi.c method_registry.c parse_xml.c serialize.c server_abyss.c
+  value.c xml_data.c)
+
+if(MUST_BUILD_CLIENT)
+  list(APPEND test_SOURCES client.c)
+  list(APPEND test_LIBS xmlrpc_client)
+else(MUST_BUILD_CLIENT)
+  list(APPEND test_SOURCES client_dummy.c)
+endif(MUST_BUILD_CLIENT)
+
+
+add_executable(src-test ${test_SOURCES})
+target_link_libraries(src-test xmlrpc_server_abyss util ${test_LIBS})
+
+add_executable(cgitest1 cgitest1.c)
+target_link_libraries(cgitest1 xmlrpc_server_cgi)
+
+add_custom_command(TARGET src-test
+  POST_BUILD
+  COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/data
+  COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR})
+
+enable_testing()
+add_test(runtests src-test)
diff --git a/src/xmlrpc.pc.cmake b/src/xmlrpc.pc.cmake
new file mode 100644
index 0000000..fd0c872
--- /dev/null
+++ b/src/xmlrpc.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc
+Description: XMLRPC base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	@xmlrpc_pkgconfig_req@ xmlrpc_util
+Libs:   		-L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_client.pc.cmake b/src/xmlrpc_client.pc.cmake
new file mode 100644
index 0000000..16bdd22
--- /dev/null
+++ b/src/xmlrpc_client.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_client
+Description: XMLRPC client library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc @xmlrpc_client_pkgconfig_req@
+Libs:   		-L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server.pc.cmake b/src/xmlrpc_server.pc.cmake
new file mode 100644
index 0000000..ca7224c
--- /dev/null
+++ b/src/xmlrpc_server.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server
+Description: XMLRPC Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc
+Libs:   		-L${libdir} -lxmlrpc_server
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server_abyss.pc.cmake b/src/xmlrpc_server_abyss.pc.cmake
new file mode 100644
index 0000000..7fbecc9
--- /dev/null
+++ b/src/xmlrpc_server_abyss.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_abyss
+Description: XMLRPC Server Abyss library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server xmlrpc_abyss
+Libs:   		-L${libdir} -lxmlrpc_server_abyss
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server_cgi.pc.cmake b/src/xmlrpc_server_cgi.pc.cmake
new file mode 100644
index 0000000..8042912
--- /dev/null
+++ b/src/xmlrpc_server_cgi.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_cgi
+Description: XMLRPC CGI-Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server
+Libs:   		-L${libdir} -lxmlrpc_server_cgi
+Cflags:		-I${includedir}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000..14010f4
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+add_subdirectory(binmode-rpc-kit)
+add_subdirectory(turbocharger)
+
+add_subdirectory(xmlrpc)
+add_subdirectory(xmlrpc_transport)
+
+add_subdirectory(xml-rpc-api2cpp )
diff --git a/tools/binmode-rpc-kit/CMakeLists.txt b/tools/binmode-rpc-kit/CMakeLists.txt
new file mode 100644
index 0000000..a707c75
--- /dev/null
+++ b/tools/binmode-rpc-kit/CMakeLists.txt
@@ -0,0 +1,2 @@
+# -*- cmake -*-
+
diff --git a/tools/turbocharger/CMakeLists.txt b/tools/turbocharger/CMakeLists.txt
new file mode 100644
index 0000000..342423d
--- /dev/null
+++ b/tools/turbocharger/CMakeLists.txt
@@ -0,0 +1 @@
+# -*- cmake -*-
diff --git a/tools/xml-rpc-api2cpp/CMakeLists.txt b/tools/xml-rpc-api2cpp/CMakeLists.txt
new file mode 100644
index 0000000..c759dec
--- /dev/null
+++ b/tools/xml-rpc-api2cpp/CMakeLists.txt
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+add_executable(xml-rpc-api2cpp
+  xml-rpc-api2cpp.cpp
+  DataType.cpp
+  XmlRpcFunction.cpp
+  XmlRpcClass.cpp
+  SystemProxy.cpp)
+target_link_libraries(xml-rpc-api2cpp xmlrpc_cpp xmlrpc_client xmlrpc_server)
+
+install(TARGETS xml-rpc-api2cpp
+  RUNTIME DESTINATION bin)
+
+install(FILES xml-rpc-api2cpp.1
+  DESTINATION ${mandir}/man1)
diff --git a/tools/xmlrpc/CMakeLists.txt b/tools/xmlrpc/CMakeLists.txt
new file mode 100644
index 0000000..976df30
--- /dev/null
+++ b/tools/xmlrpc/CMakeLists.txt
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+add_executable(tool-xmlrpc
+  xmlrpc.c
+  dumpvalue.c
+  dumpvalue.h)
+target_link_libraries(tool-xmlrpc xmlrpc_client util)
+
+set_target_properties(tool-xmlrpc
+  PROPERTIES OUTPUT_NAME xmlrpc)
+
+install(TARGETS tool-xmlrpc
+  DESTINATION ${_bin})
+
+ensc_set_link_exe_flags(tool-xmlrpc)
diff --git a/tools/xmlrpc/config.h b/tools/xmlrpc/config.h
new file mode 100644
index 0000000..7409aed
--- /dev/null
+++ b/tools/xmlrpc/config.h
@@ -0,0 +1 @@
+#include <xmlrpc_config.h>
diff --git a/tools/xmlrpc_transport/CMakeLists.txt b/tools/xmlrpc_transport/CMakeLists.txt
new file mode 100644
index 0000000..b73d7c0
--- /dev/null
+++ b/tools/xmlrpc_transport/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+add_executable(xmlrpc_transport xmlrpc_transport.c)
+target_link_libraries(xmlrpc_transport xmlrpc_client util)
+
+install(TARGETS xmlrpc_transport
+  DESTINATION ${_bin})
+
+ensc_set_link_exe_flags(xmlrpc_transport)
diff --git a/tools/xmlrpc_transport/config.h b/tools/xmlrpc_transport/config.h
new file mode 100644
index 0000000..7409aed
--- /dev/null
+++ b/tools/xmlrpc_transport/config.h
@@ -0,0 +1 @@
+#include <xmlrpc_config.h>
diff --git a/transport_config.h.cmake b/transport_config.h.cmake
new file mode 100644
index 0000000..1ec3cf6
--- /dev/null
+++ b/transport_config.h.cmake
@@ -0,0 +1,16 @@
+/* -*- c -*- */
+#define MUST_BUILD_WININET_CLIENT	@_MUST_BUILD_WININET_CLIENT@
+#define MUST_BUILD_LIBWWW_CLIENT	@_MUST_BUILD_LIBWWW_CLIENT@
+#define MUST_BUILD_CURL_CLIENT		@_MUST_BUILD_CURL_CLIENT@
+
+static char const * const XMLRPC_DEFAULT_TRANSPORT =
+#if MUST_BUILD_LIBWWW_CLIENT
+  "libwww"
+#elif MUST_BUILD_CURL_CLIENT
+  "curl"
+#elif MUST_BUILD_WININET_CLIENT
+  "wininet"
+#else
+#  error "no client XML transport configured"
+#endif
+  ;
diff --git a/version.h.cmake b/version.h.cmake
new file mode 100644
index 0000000..35beafc
--- /dev/null
+++ b/version.h.cmake
@@ -0,0 +1,2 @@
+/* This file was generated by a make rule */
+#define XMLRPC_C_VERSION "@XMLRPC_C_VERSION@"
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
index 0000000..e8ba549
--- /dev/null
+++ b/xmlrpc-c-config
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+comp=
+
+need_cxx=
+need_client=
+need_server=
+need_abyss=
+
+while test $# -gt 0; do
+    case $1 in
+      (c++)          		comp="$comp xmlrpc_cpp";;
+      (server-util)  		comp="$comp xmlrpc_server_util";;
+      (cgi-server)   		comp="$comp xmlrpc_server_cgi";;
+      (c++2)         		need_cxx=1;;
+      (abyss-server) 		need_abyss=1;;
+      (client|libwww-client)	need_client=1;;
+      (--) shift; break;;
+      (--*) break;;
+      (*)
+      echo "Unrecognized token '$1'"
+      exit 1
+      ;;
+    esac
+    shift
+done
+
+if test -z "$need_cxx"; then
+    test -z "$need_client" || comp="$comp xmlrpc_client"
+    test -z "$need_abyss"  || comp="$comp xmlrpc_abyss"
+    test -z "$need_server" || comp="$comp xmlrpc_server"
+else
+    test -z "$need_client" || comp="$comp xmlrpc_client++"
+    test -z "$need_abyss"  || comp="$comp xmlrpc_abyss++"
+    test -z "$need_server" || comp="$comp xmlrpc_server++"
+fi
+
+exec pkg-config "$@" $comp
diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake
new file mode 100644
index 0000000..98b37ef
--- /dev/null
+++ b/xmlrpc_config.h.cmake
@@ -0,0 +1,21 @@
+/* -*- c -*- */
+
+#ifndef H_XMLRPC_C_CONFIG_H
+
+#cmakedefine			HAVE_WCHAR_H
+#cmakedefine			HAVE_SETENV
+#define HAVE_SYS_IOCTL_H	0 at HAVE_SYS_IOCTL_H@
+
+#define VA_LIST_IS_ARRAY	@VA_LIST_IS_ARRAY@
+#define XMLRPC_HAVE_WCHAR	@XMLRPC_HAVE_WCHAR@
+#define ATTR_UNUSED		@ATTR_UNUSED@
+#define DIRECTORY_SEPARATOR	"@DIRECTORY_SEPARATOR@"
+
+#ifdef HAVE_WCHAR_H
+#  define HAVE_UNICODE_WCHAR	1
+#else
+#  define HAVE_UNICODE_WCHAR	0
+#endif
+
+
+#endif
-- 
1.4.2.1



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/xmlrpc-c.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmlrpc-c.spec	20 Sep 2006 18:45:55 -0000	1.9
+++ xmlrpc-c.spec	2 Oct 2006 15:02:03 -0000	1.10
@@ -5,14 +5,14 @@
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
 Version:	1.06.05
-Release:	%release_func 1
+Release:	%release_func 2
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
 Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
 Patch3:		xmlrpc-c-1.05-typo.patch
 Patch6:		xmlrpc-c-1.06.04-sizet.patch
-Patch100:	http://ensc.de/xmlrpc-c/0003-make-cmake-transition.txt
+Patch100:	http://ensc.de/xmlrpc-c/0001-make-cmake-transition.txt
 BuildRoot:	%_tmppath/%name-%version-%release-root
 #BuildRequires:	w3c-libwww-devel
 BuildRequires:	cmake
@@ -86,7 +86,9 @@
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-	
+
+chmod +x $RPM_BUILD_ROOT%_libdir/*.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,6 +123,10 @@
 
 
 %changelog
+* Mon Oct  2 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-2
+- updated cmake patch
+- strip installed libraries
+
 * Wed Sep 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-1
 - updated to 1.06.05
 - merged + updated patches


--- 0003-make-cmake-transition.txt DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 15:10:48 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  2 Oct 2006 08:10:48 -0700
Subject: rpms/xmlrpc-c/FC-5 xmlrpc-c-1.06.04-sizet.patch, NONE,
	1.1 0001-make-cmake-transition.txt, NONE, 1.1 xmlrpc-c.spec, 1.3,
	1.4 sources, 1.3, 1.4 xmlrpc-c-1.05-libtool.patch, 1.1,
	NONE xmlrpc-c-1.05-gcc41.patch, 1.1,
	NONE xmlrpc-c-1.05-buildsys.patch, 1.1,
	NONE xmlrpc-c-1.04-libxml2.patch, 1.1, NONE
Message-ID: <200610021510.k92FAoox028795@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28772

Modified Files:
	xmlrpc-c.spec sources 
Added Files:
	xmlrpc-c-1.06.04-sizet.patch 0001-make-cmake-transition.txt 
Removed Files:
	xmlrpc-c-1.05-libtool.patch xmlrpc-c-1.05-gcc41.patch 
	xmlrpc-c-1.05-buildsys.patch xmlrpc-c-1.04-libxml2.patch 
Log Message:
- updated to 1.06.05
- merged + updated patches
- patched the broken buildsystem
- disabled libwww backend explicitely


xmlrpc-c-1.06.04-sizet.patch:

--- NEW FILE xmlrpc-c-1.06.04-sizet.patch ---
2006-06-04  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* fixed a lot of format strings which produce

	  | warning: format '%d' expects type 'int', but argument 6 has type 'size_t'

          style warnings on x86_64 machines else

--- xmlrpc-c-1.05/lib/libutil/memblock.c.sizet	2005-09-23 04:17:23.000000000 +0200
+++ xmlrpc-c-1.05/lib/libutil/memblock.c	2006-06-04 19:02:10.000000000 +0200
@@ -73,7 +73,7 @@ xmlrpc_mem_block_init(xmlrpc_env *      
 
     blockP->_block = (void*) malloc(blockP->_allocated);
     if (!blockP->_block)
-        xmlrpc_faultf(envP, "Can't allocate %u-byte memory block",
+        xmlrpc_faultf(envP, "Can't allocate %zu-byte memory block",
                       blockP->_allocated);
 }
 
--- xmlrpc-c-1.05/src/xmlrpc_data.c.sizet	2006-01-03 07:48:59.000000000 +0100
+++ xmlrpc-c-1.05/src/xmlrpc_data.c	2006-06-04 19:06:02.000000000 +0200
@@ -288,7 +288,7 @@ xmlrpc_read_string(xmlrpc_env *         
         if (stringValue == NULL)
             xmlrpc_env_set_fault_formatted(
                 envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate space "
-                "for %u-character string", length);
+                "for %zu-character string", length);
         else {
             memcpy(stringValue, contents, length);
             stringValue[length] = '\0';
@@ -419,7 +419,7 @@ xmlrpc_read_string_w(xmlrpc_env *     co
         if (stringValue == NULL)
             xmlrpc_env_set_fault_formatted(
                 envP, XMLRPC_INTERNAL_ERROR, 
-                "Unable to allocate space for %u-byte string", 
+                "Unable to allocate space for %zu-byte string", 
                 length);
         else {
             memcpy(stringValue, wcontents, length * sizeof(wchar_t));
@@ -466,7 +466,7 @@ xmlrpc_read_string_w_lp(xmlrpc_env *    
             if (stringValue == NULL)
                 xmlrpc_env_set_fault_formatted(
                     envP, XMLRPC_INTERNAL_ERROR, 
-                    "Unable to allocate space for %u-byte string", 
+                    "Unable to allocate space for %zu-byte string", 
                     size);
             else {
                 memcpy(stringValue, wcontents, size * sizeof(wchar_t));
@@ -523,7 +523,7 @@ xmlrpc_read_base64(xmlrpc_env *         
         byteStringValue = malloc(size);
         if (byteStringValue == NULL)
             xmlrpc_env_set_fault_formatted(
-                envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %u bytes "
+                envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %zu bytes "
                 "for byte string.", size);
         else {
             memcpy(byteStringValue, contents, size);
--- xmlrpc-c-1.05/src/xmlrpc_datetime.c.sizet	2006-01-03 04:39:22.000000000 +0100
+++ xmlrpc-c-1.05/src/xmlrpc_datetime.c	2006-06-04 19:06:37.000000000 +0200
@@ -331,7 +331,7 @@ validateFormat(xmlrpc_env * const envP,
                const char * const t) {
 
     if (strlen(t) != 17)
-        xmlrpc_faultf(envP, "%u characters instead of 15.", strlen(t));
+        xmlrpc_faultf(envP, "%zu characters instead of 15.", strlen(t));
     else if (t[8] != 'T')
         xmlrpc_faultf(envP, "9th character is '%c', not 'T'", t[8]);
     else {
--- xmlrpc-c-1.05/src/xmlrpc_parse.c.sizet	2006-03-23 00:48:31.000000000 +0100
+++ xmlrpc-c-1.05/src/xmlrpc_parse.c	2006-06-04 19:10:00.000000000 +0200
@@ -57,7 +57,7 @@
     do \
         if (xml_element_children_size(elem) != (count)) \
             XMLRPC_FAIL3(env, XMLRPC_PARSE_ERROR, \
-             "Expected <%s> to have %d children, found %d", \
+             "Expected <%s> to have %d children, found %zd", \
                          xml_element_name(elem), (count), \
                          xml_element_children_size(elem)); \
     while (0)
@@ -595,7 +595,7 @@ parseMethodNameElement(xmlrpc_env *  con
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_PARSE_ERROR,
             "A <methodName> element should not have children.  "
-            "This one has %u of them.", xml_element_children_size(nameElemP));
+            "This one has %zu of them.", xml_element_children_size(nameElemP));
     else {
         const char * const cdata = xml_element_cdata(nameElemP);
 
@@ -654,7 +654,7 @@ parseCallChildren(xmlrpc_env *    const 
                     xmlrpc_env_set_fault_formatted(
                         envP, XMLRPC_PARSE_ERROR,
                         "<methodCall> has extraneous children, other than "
-                        "<methodName> and <params>.  Total child count = %u",
+                        "<methodName> and <params>.  Total child count = %zu",
                         callChildCount);
                     
                 if (envP->fault_occurred)
@@ -697,7 +697,7 @@ xmlrpc_parse_call(xmlrpc_env *    const 
     if (xmlLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
-            "XML-RPC request too large.  Max allowed is %u bytes",
+            "XML-RPC request too large.  Max allowed is %zu bytes",
             xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID));
     else {
         xml_element * callElemP;
@@ -773,7 +773,7 @@ parseFaultElement(xmlrpc_env *        co
     if (xml_element_children_size(faultElement) != 1)
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_PARSE_ERROR,
-            "<fault> element should have 1 child, but it has %u.",
+            "<fault> element should have 1 child, but it has %zu.",
             xml_element_children_size(faultElement));
     else {
         xml_element * const faultValueP =
@@ -869,7 +869,7 @@ parseMethodResponseElt(xmlrpc_env *     
     } else
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_PARSE_ERROR,
-            "<methodResponse> has %u children, should have 1.",
+            "<methodResponse> has %zu children, should have 1.",
             xml_element_children_size(methodResponseEltP));
 }
 
@@ -908,8 +908,8 @@ xmlrpc_parse_response2(xmlrpc_env *    c
     if (xmlDataLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
         xmlrpc_env_set_fault_formatted(
             envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
-            "XML-RPC response too large.  Our limit is %u characters.  "
-            "We got %u characters",
+            "XML-RPC response too large.  Our limit is %zu characters.  "
+            "We got %zu characters",
             xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID), xmlDataLen);
     else {
         xml_parse(envP, xmlData, xmlDataLen, &response);
--- xmlrpc-c-1.05/src/xmlrpc_server_abyss.c.sizet	2006-03-25 20:15:31.000000000 +0100
+++ xmlrpc-c-1.05/src/xmlrpc_server_abyss.c	2006-06-04 19:11:24.000000000 +0200
@@ -348,7 +348,7 @@ processCall(TSession *        const abys
     if (contentSize > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
         xmlrpc_env_set_fault_formatted(
             &env, XMLRPC_LIMIT_EXCEEDED_ERROR,
-            "XML-RPC request too large (%d bytes)", contentSize);
+            "XML-RPC request too large (%zd bytes)", contentSize);
     else {
         xmlrpc_mem_block *body;
         /* Read XML data off the wire. */


--- NEW FILE 0001-make-cmake-transition.txt ---
>From ca5754cd4b3f3fdf3b8b80bc2264aa4c1f2e76a4 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Mon, 2 Oct 2006 13:37:48 +0200
Subject: [PATCH] make -> cmake transition

---
 CMakeLists.txt                              |  236 +++++++++++++++++++++++++++
 cmake/try-attr.cc                           |    3 
 cmake/va-list-is-array.c                    |    9 +
 examples/CMakeLists.txt                     |   51 ++++++
 examples/config.h                           |    1 
 examples/cpp/CMakeLists.txt                 |   20 ++
 include/CMakeLists.txt                      |    3 
 include/xmlrpc-c/CMakeLists.txt             |   31 ++++
 include/xmlrpc-c/config.h.cmake             |    8 +
 lib/CMakeLists.txt                          |   12 +
 lib/abyss/CMakeLists.txt                    |    3 
 lib/abyss/src/CMakeLists.txt                |   62 +++++++
 lib/abyss/src/xmlrpc_abyss.pc.cmake         |   10 +
 lib/curl_transport/CMakeLists.txt           |    7 +
 lib/expat/CMakeLists.txt                    |    9 +
 lib/expat/gennmtab/CMakeLists.txt           |    3 
 lib/expat/xmlparse/CMakeLists.txt           |    7 +
 lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake |   10 +
 lib/expat/xmltok/CMakeLists.txt             |   20 ++
 lib/expat/xmltok/xmlrpc_xmltok.pc.cmake     |    9 +
 lib/libutil/CMakeLists.txt                  |   22 +++
 lib/libutil/xmlrpc_util.pc.cmake            |   10 +
 lib/libwww_transport/CMakeLists.txt         |    4 
 lib/util/CMakeLists.txt                     |   13 +
 lib/wininet_transport/CMakeLists.txt        |    4 
 src/CMakeLists.txt                          |  106 ++++++++++++
 src/cpp/CMakeLists.txt                      |   48 +++++
 src/cpp/xmlrpc++.pc.cmake                   |   11 +
 src/cpp/xmlrpc_client++.pc.cmake            |   11 +
 src/cpp/xmlrpc_cpp.pc.cmake                 |   11 +
 src/cpp/xmlrpc_server++.pc.cmake            |   11 +
 src/cpp/xmlrpc_server_abyss++.pc.cmake      |   11 +
 src/test/CMakeLists.txt                     |   27 +++
 src/xmlrpc.pc.cmake                         |   11 +
 src/xmlrpc_client.pc.cmake                  |   11 +
 src/xmlrpc_server.pc.cmake                  |   11 +
 src/xmlrpc_server_abyss.pc.cmake            |   11 +
 src/xmlrpc_server_cgi.pc.cmake              |   11 +
 tools/CMakeLists.txt                        |    9 +
 tools/binmode-rpc-kit/CMakeLists.txt        |    2 
 tools/turbocharger/CMakeLists.txt           |    1 
 tools/xml-rpc-api2cpp/CMakeLists.txt        |   15 ++
 tools/xmlrpc/CMakeLists.txt                 |   15 ++
 tools/xmlrpc/config.h                       |    1 
 tools/xmlrpc_transport/CMakeLists.txt       |    9 +
 tools/xmlrpc_transport/config.h             |    1 
 transport_config.h.cmake                    |   16 ++
 version.h.cmake                             |    2 
 xmlrpc-c-config                             |   38 ++++
 xmlrpc_config.h.cmake                       |   21 ++
 50 files changed, 988 insertions(+), 0 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..18b390d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,236 @@
+## -*- cmake -*-
+project(xmlrpc-c)
+include(UsePkgConfig)
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+
+set(XMLRPC_C_VERSION    "1.06.05" CACHE STRING "Version of xmlrpc-c")
+set(XMLRPC_C_LIBVERSION "3.6.4")
+set(XMLRPC_C_SOVERSION  "3")
+
+
+macro(ensc_set_bool NAME VALUE DESC)
+  set(${NAME} ${VALUE} CACHE BOOL ${DESC})
+  if(${NAME})
+    set(_${NAME} 1)
+  else(${NAME})
+    set(_${NAME} 0)
+  endif(${NAME})
+endmacro(ensc_set_bool)
+
+macro(ensc_pkgconfig COMP)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${COMP}.pc.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${COMP}.pc
+    @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${COMP}.pc
+    DESTINATION ${pkgconfdir})
+endmacro(ensc_pkgconfig)
+
+macro(ensc_pkgconfig_lib TARGET LIBS)
+  get_target_property(libtype ${TARGET} TYPE)
+  if("${libtype}" STREQUAL "STATIC_LIBRARY")
+    list(APPEND ${TARGET}_pkgconfig_libs "${LIBS}")
+  endif("${libtype}" STREQUAL "STATIC_LIBRARY")
+endmacro(ensc_pkgconfig_lib)
+
+macro(ensc_set_link_exe_flags)
+  ## HACK: libwww has broken inter-lib dependencies and '-Wl,--as-needed' fails with it
+  if(NOT MUST_BUILD_LIBWWW_CLIENT)
+    set_target_properties(${ARGV}
+      PROPERTIES
+      LINK_FLAGS ${XMLRPC_LINKER_FLAGS})
+  endif(NOT MUST_BUILD_LIBWWW_CLIENT)
+endmacro(ensc_set_link_exe_flags)
+
+
+###########
+if(WIN32)
+  find_program(WININET_CONFIG_EXECUTABLE wininet-config)
+
+  if(DEFINED MUST_BUILD_WININET_CLIENT)
+    set(tmp ${MUST_BUILD_WININET_CLIENT})
+  else(DEFINED MUST_BUILD_WININET_CLIENT)
+    if(WININET_CONFIG_EXECUTABLE)
+      set(tmp 1)
+    else(WININET_CONFIG_EXECUTABLE)
+      set(tmp 0)
+    endif(WININET_CONFIG_EXECUTABLE)
+  endif(DEFINED MUST_BUILD_WININET_CLIENT)
+else(WIN32)
+  set(tmp 0)
+endif(WIN32)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE WININET_VERSION)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --cflags  OUTPUT_VARIABLE WININET_CFLAGS)
+  exec_program(${WININET_CONFIG_EXECUTABLE} ARGS --libs    OUTPUT_VARIABLE WININET_LDADD)
+  message(STATUS "Using WinInet ${WININET_VERSION} transport")
+endif(tmp)
+
+ensc_set_bool(MUST_BUILD_WININET_CLIENT ${tmp} "Set iff WinInet client transport shall be built")
+set(wininet_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/wininet_transport)
+
+###########
+pkgconfig(libcurl CURL_INCLUDE_DIR CURL_LINK_DIR CURL_LINK_FLAGS CURL_CFLAGS)
+if(DEFINED MUST_BUILD_CURL_CLIENT)
+  set(tmp ${MUST_BUILD_CURL_CLIENT})
+else(DEFINED MUST_BUILD_CURL_CLIENT)
+  if(CURL_LINK_FLAGS)
+    set(tmp 1)
+  else(CURL_LINK_FLAGS)
+    set(tmp 0)
+  endif(CURL_LINK_FLAGS)
+endif(DEFINED MUST_BUILD_CURL_CLIENT)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  STRING(REGEX REPLACE "\n" "" CURL_CFLAGS ${CURL_CFLAGS})	# HACK!!
+  message(STATUS "Using libcurl transport ${CURL_CFLAGS}")
+endif(tmp)
+ensc_set_bool(MUST_BUILD_CURL_CLIENT ${tmp} "Set iff Curl client transport shall be built")
+set(curl_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/curl_transport)
+
+###########
+find_program(LIBWWW_CONFIG_EXECUTABLE libwww-config)
+if(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+  set(tmp ${MUST_BUILD_LIBWWW_CLIENT})
+else(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+  if(LIBWWW_CONFIG_EXECUTABLE)
+    set(tmp 1)
+  else(LIBWWW_CONFIG_EXECUTABLE)
+    set(tmp 0)
+  endif(LIBWWW_CONFIG_EXECUTABLE)
+endif(DEFINED MUST_BUILD_LIBWWW_CLIENT)
+
+if(tmp)
+  set(MUST_BUILD_CLIENT 1)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE LIBWWW_VERSION)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --libs    OUTPUT_VARIABLE LIBWWW_LIBS)
+  exec_program(${LIBWWW_CONFIG_EXECUTABLE} ARGS --cflags  OUTPUT_VARIABLE LIBWWW_CFLAGS)
+  message(STATUS "Using libwww ${LIBWWW_VERSION} transport")
+endif(tmp)
+ensc_set_bool(MUST_BUILD_LIBWWW_CLIENT ${tmp} "Set iff LibWWW client transport shall be built")
+set(libwww_srcdir ${xmlrpc-c_SOURCE_DIR}/lib/libwww_transport)
+
+############
+
+set(ENABLE_CGI_SERVER      1 CACHE BOOL "Set iff CGI server shall be enabled")
+set(ENABLE_CPLUSPLUS       1 CACHE BOOL "Set iff C++ part shall be enabled")
+set(ENABLE_ABYSS_SERVER    1 CACHE BOOL "Set iff Abyss server shall be enabled")
+set(ENABLE_LIBXML2_BACKEND 1 CACHE BOOL "Set iff libxml2 backend shall be used")
+set(ENABLE_ABYSS_THREADS   1 CACHE BOOL "Use pthread")
+
+if(ENABLE_LIBXML2_BACKEND)
+  foreach(tmp libxml-2.0 libxml2 libxml)
+    if (NOT DEFINED libxml_pkgconfig)
+      pkgconfig(${tmp} LIBXML2_INCLUDE_DIR LIBXML2_LINK_DIR LIBXML2_LINK_FLAGS LIBXML2_CFLAGS)
+      if(LIBXML2_LINK_FLAGS)
+	set(libxml_pkgconfig ${tmp})
+      endif(LIBXML2_LINK_FLAGS)
+    endif(NOT DEFINED libxml_pkgconfig)
+  endforeach(tmp)
+endif(ENABLE_LIBXML2_BACKEND)
+
+
+####  <wchar.h> tests
+check_include_file(wchar.h _have_wchar_h)
+if(_have_wchar_h)
+  set(HAVE_WCHAR_H 1)
+else(_have_wchar_h)
+  set(HAVE_WCHAR_H 1)
+endif(_have_wchar_h)
+set(XMLRPC_HAVE_WCHAR   ${HAVE_WCHAR_H})
+set(HAVE_WCHAR_H_DEFINE ${HAVE_WCHAR_H})
+
+
+#######
+set(LINKER_AS_NEEDED  1 CACHE BOOL "Use the --as-needed linker option")
+if(LINKER_AS_NEEDED)
+  set(XMLRPC_LINKER_FLAGS "-Wl,--as-needed")
+endif(LINKER_AS_NEEDED)
+
+
+try_compile(HAVE_ATTR_UNUSED
+  ${CMAKE_BINARY_DIR}/
+  ${xmlrpc-c_SOURCE_DIR}/cmake/try-attr.cc
+  CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-DCMAKE_TEST_ATTR=__unused__)
+
+try_compile(VA_LIST_IS_NOT_ARRAY
+  ${CMAKE_BINARY_DIR}/
+  ${xmlrpc-c_SOURCE_DIR}/cmake/va-list-is-array.c)
+
+if(VA_LIST_IS_NOT_ARRAY)
+  set(VA_LIST_IS_ARRAY 0)
+  message(STATUS "va_list is not an array")
+else(VA_LIST_IS_NOT_ARRAY)
+  set(VA_LIST_IS_ARRAY 1)
+  message(STATUS "va_list is an array")
+endif(VA_LIST_IS_NOT_ARRAY)
+
+
+if(HAVE_ATTR_UNUSED)
+  set(ATTR_UNUSED "__attribute__((__unused__))")
+endif(HAVE_ATTR_UNUSED)
+
+if(WIN32)
+  set(DIRECTORY_SEPARATOR "\\")
+else(WIN32)
+  set(DIRECTORY_SEPARATOR "/")
+endif(WIN32)
+
+check_include_file(sys/filio.h HAVE_SYS_FILIO_H)
+check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
+check_function_exists(setenv HAVE_SETENV)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/xmlrpc_config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/xmlrpc_config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/version.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/version.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/transport_config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/transport_config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+configure_file(${xmlrpc-c_SOURCE_DIR}/include/xmlrpc-c/config.h.cmake
+               ${xmlrpc-c_BINARY_DIR}/include/xmlrpc-c/config.h
+     	       ESCAPE_QUOTES @ONLY)
+
+
+include_directories(${xmlrpc-c_SOURCE_DIR}/include)
+include_directories(${xmlrpc-c_BINARY_DIR}/include)
+include_directories(${xmlrpc-c_SOURCE_DIR}/lib/util/include)
+include_directories(${xmlrpc-c_BINARY_DIR})
+
+add_custom_target(dist
+  rm -rf _dist && mkdir -p _dist/xmlrpc-c-${XMLRPC_C_VERSION}
+  COMMAND cp -a ${xmlrpc-c_SOURCE_DIR}/* _dist/xmlrpc-c-${XMLRPC_C_VERSION}/
+  COMMAND cd _dist && tar cjf ../xmlrpc-c-${XMLRPC_C_VERSION}.tar.bz2 xmlrpc-c-${XMLRPC_C_VERSION} --exclude=.git --exclude=CVS --exclude=.svn
+  )
+
+set(_lib       lib CACHE STRING "Basename of the library-directory; usually 'lib' or 'lib64' (on multilib archs)")
+set(_bin       bin CACHE STRING "Basename of the bin-directory; usually 'bin'")
+set(prefix     ${CMAKE_INSTALL_PREFIX})
+set(libdir     "${prefix}/${_lib}")
+set(bindir     "${prefix}/${_bin}")
+set(mandir     "${prefix}/share/man")
+set(pkgconfdir "${libdir}/pkgconfig")
+set(includedir "${prefix}/include")
+
+#############
+
+install(PROGRAMS xmlrpc-c-config DESTINATION ${_bin})
+
+enable_testing()
+
+add_subdirectory(lib)
+add_subdirectory(Windows)
+add_subdirectory(conf)
+add_subdirectory(doc)
+add_subdirectory(examples)
+add_subdirectory(include)
+add_subdirectory(src)
+add_subdirectory(tools)
diff --git a/cmake/try-attr.cc b/cmake/try-attr.cc
new file mode 100644
index 0000000..4668c5b
--- /dev/null
+++ b/cmake/try-attr.cc
@@ -0,0 +1,3 @@
+int x __attribute__((CMAKE_TEST_ATTR));
+
+int main() {}
diff --git a/cmake/va-list-is-array.c b/cmake/va-list-is-array.c
new file mode 100644
index 0000000..1ad0bab
--- /dev/null
+++ b/cmake/va-list-is-array.c
@@ -0,0 +1,9 @@
+#include <stdarg.h>
+
+void foo()
+{
+  va_list list1, list2;
+  list1 = list2;
+}
+
+int main() {}
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..9f18b0d
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,51 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+macro(ensc_add_example name ext class)
+  # HACK: avoid name collision of c and c++ program
+  if("${ext}" STREQUAL "cpp")
+    set(_target ${name}++)
+  else("${ext}" STREQUAL "cpp")
+    set(_target ${name})
+  endif("${ext}" STREQUAL "cpp")
+
+  add_executable(${_target} ${name}.${ext})
+  target_link_libraries(${_target} ${${class}_LIBS})
+  list(APPEND ${class}_TARGETS ${_target})
+  list(APPEND example_TARGETS ${_target})
+endmacro(ensc_add_example)
+
+if(ENABLE_CPLUSPLUS)
+  add_subdirectory(cpp)
+endif(ENABLE_CPLUSPLUS)
+
+
+
+if(MUST_BUILD_CLIENT)
+  set(client_LIBS xmlrpc_client)
+
+  ensc_add_example(auth_client              c client)
+  ensc_add_example(query-meerkat            c client)
+  ensc_add_example(synch_client             c client)
+  ensc_add_example(xmlrpc_sample_add_client c client)
+  ensc_add_example(xmlrpc_asynch_client     c client)
+endif(MUST_BUILD_CLIENT)
+
+if(ENABLE_CGI_SERVER)
+  set(cgi_server_LIBS xmlrpc_server_cgi)
+
+  ensc_add_example(xmlrpc_sample_add_server_cgi c cgi_server)
+endif(ENABLE_CGI_SERVER)
+
+if(ENABLE_ABYSS_SERVER)
+  set(abyss_server_LIBS xmlrpc_server_abyss)
+
+  ensc_add_example(xmlrpc_inetd_server      c abyss_server)
+  ensc_add_example(xmlrpc_socket_server     c abyss_server)
+  ensc_add_example(xmlrpc_loop_server       c abyss_server)
+  ensc_add_example(xmlrpc_sample_add_server c abyss_server)
+  ensc_add_example(xmlrpc_server_validatee  c abyss_server)
+endif(ENABLE_ABYSS_SERVER)
+
+ensc_set_link_exe_flags(${example_TARGETS})
diff --git a/examples/config.h b/examples/config.h
new file mode 100644
index 0000000..31d5f9b
--- /dev/null
+++ b/examples/config.h
@@ -0,0 +1 @@
+#include "../xmlrpc_config.h"
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
new file mode 100644
index 0000000..9fbea7e
--- /dev/null
+++ b/examples/cpp/CMakeLists.txt
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+if(ENABLE_ABYSS_SERVER)
+  set(abyss_serverxx_LIBS xmlrpc_server_abyss++)
+
+  ensc_add_example(xmlrpc_inetd_server cpp abyss_serverxx)
+endif(ENABLE_ABYSS_SERVER)
+
+if(MUST_BUILD_CLIENT)
+  set(abyss_clientxx_LIBS        xmlrpc_client++)
+  set(abyss_clientxx_legacy_LIBS xmlrpc_cpp)
+
+  ensc_add_example(xmlrpc_sample_add_client  cpp abyss_clientxx)
+  ensc_add_example(sample_add_client_complex cpp abyss_clientxx)
+
+  ensc_add_example(meerkat-app-list          cpp abyss_clientxx_legacy)
+endif(MUST_BUILD_CLIENT)
+
+
+ensc_set_link_exe_flags(${example_TARGETS})
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 0000000..ebfdba5
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+add_subdirectory(xmlrpc-c)
diff --git a/include/xmlrpc-c/CMakeLists.txt b/include/xmlrpc-c/CMakeLists.txt
new file mode 100644
index 0000000..903f623
--- /dev/null
+++ b/include/xmlrpc-c/CMakeLists.txt
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+list(APPEND headers
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+  util.h base.h abyss.h server.h
+  server_abyss.h server_w32httpsys.h oldxmlrpc.h)
+
+if(ENABLE_CPLUSPLUS)
+  list(APPEND headers
+    oldcppwrapper.hpp girerr.hpp girmem.hpp base.hpp
+    timeout.hpp xml.hpp registry.hpp server_abyss.hpp)
+endif(ENABLE_CPLUSPLUS)
+
+if(MUST_BUILD_CLIENT)
+  list(APPEND headers
+    client.h transport.h client_global.h)
+
+  if(ENABLE_CPLUSPLUS)
+    list(APPEND headers
+      client.hpp client_transport.hpp client_simple.hpp)
+  endif(ENABLE_CPLUSPLUS)
+endif(MUST_BUILD_CLIENT)
+
+if(ENABLE_CGI_SERVER)
+  list(APPEND headers
+    server_cgi.h)
+endif(ENABLE_CGI_SERVER)
+
+install(FILES
+  ${headers}
+  DESTINATION ${includedir}/xmlrpc-c)
diff --git a/include/xmlrpc-c/config.h.cmake b/include/xmlrpc-c/config.h.cmake
new file mode 100644
index 0000000..7b95a1d
--- /dev/null
+++ b/include/xmlrpc-c/config.h.cmake
@@ -0,0 +1,8 @@
+/* This file, part of XML-RPC For C/C++, is meant to
+   define characteristics of this particular installation
+   that the other <xmlrpc-c/...> header files need in order to
+   compile correctly when #included in a Xmlrpc-c user code.
+
+   Those header files #include this one.
+*/
+#define XMLRPC_HAVE_WCHAR		@HAVE_WCHAR_H@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
new file mode 100644
index 0000000..7f8f912
--- /dev/null
+++ b/lib/CMakeLists.txt
@@ -0,0 +1,12 @@
+## -*- cmake -*-
+
+add_subdirectory(abyss)
+add_subdirectory(libutil)
+add_subdirectory(util)
+add_subdirectory(curl_transport)
+add_subdirectory(libwww_transport)
+add_subdirectory(wininet_transport)
+
+if(NOT ENABLE_LIBXML2_BACKEND)
+  add_subdirectory(expat)
+endif(NOT ENABLE_LIBXML2_BACKEND)
diff --git a/lib/abyss/CMakeLists.txt b/lib/abyss/CMakeLists.txt
new file mode 100644
index 0000000..2358061
--- /dev/null
+++ b/lib/abyss/CMakeLists.txt
@@ -0,0 +1,3 @@
+## -*- cmake -*-
+
+SUBDIRS(src)
diff --git a/lib/abyss/src/CMakeLists.txt b/lib/abyss/src/CMakeLists.txt
new file mode 100644
index 0000000..a8fb5a9
--- /dev/null
+++ b/lib/abyss/src/CMakeLists.txt
@@ -0,0 +1,62 @@
+## -*- cmake -*-
+
+set(xmlrpc_abyss_SOURCES
+  abyss_info.h
+  channel.c
+  channel.h
+  chanswitch.c
+  chanswitch.h
+  conf.c
+  conn.c
+  conn.h
+  data.c
+  data.h
+  date.c
+  date.h
+  file.c
+  file.h
+  http.c
+  http.h
+  init.c
+  response.c
+  server.c
+  server.h
+  session.c
+  session.h
+  socket.c
+  socket.h
+  socket_unix.c
+  socket_unix.h
+  thread.h
+  token.c
+  token.h
+  trace.c
+  trace.h)
+
+if(ENABLE_ABYSS_THREADS)
+  list(APPEND xmlrpc_abyss_SOURCES thread_pthread.c)
+else(ENABLE_ABYSS_THREADS)
+  list(APPEND xmlrpc_abyss_SOURCES thread_fork.c)
+endif(ENABLE_ABYSS_THREADS)
+
+add_library(xmlrpc_abyss SHARED ${xmlrpc_abyss_SOURCES})
+target_link_libraries(xmlrpc_abyss xmlrpc_util)
+
+if(ENABLE_ABYSS_THREADS)
+  set_target_properties(xmlrpc_abyss PROPERTIES DEFINE_SYMBOL _THREAD)
+  target_link_libraries(xmlrpc_abyss pthread)
+  ensc_pkgconfig_lib(xmlrpc_abyss "-lpthread")
+endif(ENABLE_ABYSS_THREADS)
+
+install(TARGETS xmlrpc_abyss
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib}
+  ARCHIVE DESTINATION ${_lib})
+
+set_target_properties(xmlrpc_abyss
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+ensc_pkgconfig(xmlrpc_abyss)
diff --git a/lib/abyss/src/xmlrpc_abyss.pc.cmake b/lib/abyss/src/xmlrpc_abyss.pc.cmake
new file mode 100644
index 0000000..2a4f124
--- /dev/null
+++ b/lib/abyss/src/xmlrpc_abyss.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_abyss
+Description: XMLRPC Abyss base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_util
+Libs:   		-L${libdir} -lxmlrpc_abyss @xmlrpc_abyss_pkgconfig_libs@
+Cflags:
diff --git a/lib/curl_transport/CMakeLists.txt b/lib/curl_transport/CMakeLists.txt
new file mode 100644
index 0000000..3814f08
--- /dev/null
+++ b/lib/curl_transport/CMakeLists.txt
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_CURL_CLIENT)
+  list(APPEND transport_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc_curl_transport.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc_curl_transport.h)
+endif(MUST_BUILD_CURL_CLIENT)
diff --git a/lib/expat/CMakeLists.txt b/lib/expat/CMakeLists.txt
new file mode 100644
index 0000000..7397f52
--- /dev/null
+++ b/lib/expat/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/xmltok)
+
+add_subdirectory(gennmtab)
+add_subdirectory(xmlparse)
+add_subdirectory(xmltok)
+add_subdirectory(xmlwf)
diff --git a/lib/expat/gennmtab/CMakeLists.txt b/lib/expat/gennmtab/CMakeLists.txt
new file mode 100644
index 0000000..48a44da
--- /dev/null
+++ b/lib/expat/gennmtab/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+ADD_EXECUTABLE(gennmtab gennmtab.c)
diff --git a/lib/expat/xmlparse/CMakeLists.txt b/lib/expat/xmlparse/CMakeLists.txt
new file mode 100644
index 0000000..f87008a
--- /dev/null
+++ b/lib/expat/xmlparse/CMakeLists.txt
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+add_library(xmlrpc_xmlparse STATIC
+  xmlparse.c)
+target_link_libraries(xmlrpc_xmlparse xmlrpc_xmltok)
+
+ensc_pkgconfig(xmlrpc_xmlparse)
diff --git a/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
new file mode 100644
index 0000000..71d77da
--- /dev/null
+++ b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_xmlparse
+Description: XMLRPC xmlparse library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_xmltok
+Libs:   		-L${libdir} -lxmlrpc_xmlparse
+Cflags:
diff --git a/lib/expat/xmltok/CMakeLists.txt b/lib/expat/xmltok/CMakeLists.txt
new file mode 100644
index 0000000..c3247ad
--- /dev/null
+++ b/lib/expat/xmltok/CMakeLists.txt
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(xmlrpc_xmltok STATIC
+  xmltok.c xmlrole.c ${CMAKE_CURRENT_BINARY_DIR}/nametab.h)
+
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/nametab.h
+  PROPERTIES
+  OBJECT_DEPENDS gennmtab
+  GENERATED true)
+
+
+get_target_property(GENNMTAB_EXECUTABLE gennmtab LOCATION)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nametab.h
+  COMMAND ${GENNMTAB_EXECUTABLE} >nametab.h || { rm -f nametab.h\; false\; }
+  DEPENDS gennmtab)
+
+ensc_pkgconfig(xmlrpc_xmltok)
diff --git a/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake b/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
new file mode 100644
index 0000000..88e7ad8
--- /dev/null
+++ b/lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
@@ -0,0 +1,9 @@
+prefix=@prefix@
+libdir=@libdir@
+
+Name:        xmlrpc_xmltok
+Description: XMLRPC xmltok library
+Version:     @XMLRPC_C_VERSION@
+
+Libs:   	-L${libdir}
+Cflags:
diff --git a/lib/libutil/CMakeLists.txt b/lib/libutil/CMakeLists.txt
new file mode 100644
index 0000000..5e5d382
--- /dev/null
+++ b/lib/libutil/CMakeLists.txt
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+
+add_library(xmlrpc_util SHARED
+  casprintf.c
+  error.c
+  make_printable.c
+  memblock.c
+  resource.c
+  sleep.c)
+
+set_target_properties(xmlrpc_util
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+install(TARGETS xmlrpc_util
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib}
+  ARCHIVE DESTINATION ${_lib})
+
+ensc_pkgconfig(xmlrpc_util)
diff --git a/lib/libutil/xmlrpc_util.pc.cmake b/lib/libutil/xmlrpc_util.pc.cmake
new file mode 100644
index 0000000..98d24f4
--- /dev/null
+++ b/lib/libutil/xmlrpc_util.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_util
+Description: XMLRPC utility library
+Version:     @XMLRPC_C_VERSION@
+
+Libs:   	-L${libdir} -lxmlrpc_util
+Cflags:
diff --git a/lib/libwww_transport/CMakeLists.txt b/lib/libwww_transport/CMakeLists.txt
new file mode 100644
index 0000000..4744f9c
--- /dev/null
+++ b/lib/libwww_transport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_LIBWWW_CLIENT)
+endif(MUST_BUILD_LIBWWW_CLIENT)
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
new file mode 100644
index 0000000..be6ded2
--- /dev/null
+++ b/lib/util/CMakeLists.txt
@@ -0,0 +1,13 @@
+## -*- cmake -*-
+
+set(util_SOURCES
+  casprintf.c
+  cmdline_parser.c
+  getoptx.c
+  getoptx.h)
+
+if(WIN32)
+  list(APPEND util_SOURCES pthreadx_win32.c)
+endif(WIN32)
+
+add_library(util STATIC ${util_SOURCES})
diff --git a/lib/wininet_transport/CMakeLists.txt b/lib/wininet_transport/CMakeLists.txt
new file mode 100644
index 0000000..4f7408e
--- /dev/null
+++ b/lib/wininet_transport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+if(MUST_BUILD_WININET_CLIENT)
+endif(MUST_BUILD_WININET_CLIENT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..b201fa1
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,106 @@
+# -*- cmake -*-
+
+if(ENABLE_LIBXML2_BACKEND)
+  set(xmlrpc_xml_parser xmlrpc_libxml2.c)
+  set(libxml_INCLUDES ${LIBXML2_CFLAGS})
+  set(libxml_LIBS     ${LIBXML2_LINK_FLAGS})
+  set(xmlrpc_pkgconfig_req ${libxml_pkgconfig})
+else(ENABLE_LIBXML2_BACKEND)
+  set(xmlrpc_xml_parser xmlrpc_expat.c)
+  set(libxml_INCLUDES -I${xmlrpc-c_SOURCE_DIR}/lib/expat/xmlparse)
+  set(libxml_LIBS xmlrpc_xmlparse)
+  set(xmlrpc_pkgconfig_req xmlrpc_xmlparse)
+endif(ENABLE_LIBXML2_BACKEND)
+
+if(MUST_BUILD_WININET_CLIENT)
+  set(client_wininet_CFLAGS "")
+  set(client_wininet_LIBS   "${WININET_LDADD}")
+  list(APPEND transport_SOURCES
+    ${wininet_srcdir}/xmlrpc_wininet_transport.c ${wininet_srcdir}/xmlrpc_wininet_transport.h)
+endif(MUST_BUILD_WININET_CLIENT)
+
+if(MUST_BUILD_LIBWWW_CLIENT)
+  set(client_libwww_CFLAGS "${LIBWWW_CFLAGS}")
+  set(client_libwww_LIBS   "${LIBWWW_LIBS}")
+  list(APPEND transport_SOURCES ${libwww_srcdir}/xmlrpc_libwww_transport.c ${libwww_srcdir}/xmlrpc_libwww_transport.h)
+endif(MUST_BUILD_LIBWWW_CLIENT)
+
+if(MUST_BUILD_CURL_CLIENT)
+  set(client_curl_CFLAGS ${CURL_CFLAGS})
+  set(client_curl_LIBS   ${CURL_LINK_FLAGS})
+  set(xmlrpc_client_pkgconfig_req libcurl)
+  list(APPEND transport_SOURCES ${curl_srcdir}/xmlrpc_curl_transport.c ${curl_srcdir}/xmlrpc_curl_transport.h)
+endif(MUST_BUILD_CURL_CLIENT)
+
+set(client_CFLAGS "-I${wininet_srcdir} -I${libwww_srcdir} -I${curl_srcdir} ${client_wininet_CFLAGS} ${client_libwww_CFLAGS} ${client_curl_CFLAGS}")
+set(client_LIBS   "${client_wininet_LIBS} ${client_libwww_LIBS} ${client_curl_LIBS}")
+
+
+add_subdirectory(cpp)
+add_subdirectory(test)
+
+
+
+### libxmlrpc.so
+add_library(xmlrpc SHARED
+  trace.c ${xmlrpc_xml_parser}
+  xmlrpc_data.c xmlrpc_datetime.c xmlrpc_array.c xmlrpc_struct.c
+  xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
+  xmlrpc_base64.c xmlrpc_utf8.c xmlrpc_authcookie.c)
+
+set_target_properties(xmlrpc
+  PROPERTIES
+  COMPILE_FLAGS ${libxml_INCLUDES})
+
+ensc_pkgconfig(xmlrpc)
+target_link_libraries(xmlrpc ${libxml_LIBS} xmlrpc_util)
+list(APPEND lib_TARGETS xmlrpc)
+
+### libxmlrpc_client.so
+add_library(xmlrpc_client SHARED
+  xmlrpc_client.c xmlrpc_client_global.c ${transport_SOURCES})
+
+target_link_libraries(xmlrpc_client xmlrpc ${client_LIBS})
+set_target_properties(xmlrpc_client
+  PROPERTIES
+  COMPILE_FLAGS "${client_CFLAGS}")
+list(APPEND lib_TARGETS xmlrpc_client)
+ensc_pkgconfig(xmlrpc_client)
+
+### libxmlrpc_server.so
+add_library(xmlrpc_server SHARED
+  registry.c system_method.c)
+target_link_libraries(xmlrpc_server xmlrpc)
+list(APPEND lib_TARGETS xmlrpc_server)
+ensc_pkgconfig(xmlrpc_server)
+
+
+### libxmlrpc_server_abyss.so
+add_library(xmlrpc_server_abyss SHARED
+  xmlrpc_server_abyss.c)
+target_link_libraries(xmlrpc_server_abyss xmlrpc_abyss xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server_abyss)
+ensc_pkgconfig(xmlrpc_server_abyss)
+
+
+
+### libxmlrpc_server_cgi.so
+add_library(xmlrpc_server_cgi SHARED
+  xmlrpc_server_cgi)
+target_link_libraries(xmlrpc_server_cgi xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server_cgi)
+ensc_pkgconfig(xmlrpc_server_cgi)
+
+
+install(TARGETS ${lib_TARGETS}
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib})
+
+set_target_properties(${lib_TARGETS}
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
+
+
+enable_testing()
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
new file mode 100644
index 0000000..9ab2530
--- /dev/null
+++ b/src/cpp/CMakeLists.txt
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+####### libxmlrpc++.so
+add_library(xmlrpc++ SHARED
+  base64.cpp env_wrap.cpp fault.cpp girerr.cpp girmem.cpp
+  outcome.cpp param_list.cpp value.cpp xml.cpp)
+target_link_libraries(xmlrpc++ xmlrpc)
+list(APPEND lib_TARGETS xmlrpc++)
+ensc_pkgconfig(xmlrpc++)
+
+####### libxmlrpc_cpp.so
+add_library(xmlrpc_cpp            SHARED XmlRpcCpp)
+target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server xmlrpc_client)
+list(APPEND lib_TARGETS xmlrpc_cpp)
+ensc_pkgconfig(xmlrpc_cpp)
+
+####### libxmlrpc_server++.so
+add_library(xmlrpc_server++       SHARED registry.cpp)
+target_link_libraries(xmlrpc_server++ xmlrpc++ xmlrpc_server)
+list(APPEND lib_TARGETS xmlrpc_server++)
+ensc_pkgconfig(xmlrpc_server++)
+
+####### libxmlrpc_server_abyss++.so
+add_library(xmlrpc_server_abyss++ SHARED server_abyss.cpp)
+target_link_libraries(xmlrpc_server_abyss++ xmlrpc_server++ xmlrpc_server_abyss)
+list(APPEND lib_TARGETS xmlrpc_server_abyss++)
+ensc_pkgconfig(xmlrpc_server_abyss++)
+
+####### libxmlrpc_client++.so
+add_library(xmlrpc_client++       SHARED
+  client.cpp client_simple.cpp curl.cpp libwww.cpp wininet.cpp)
+set_target_properties(xmlrpc_client++
+  PROPERTIES
+  COMPILE_FLAGS "-I${wininet_srcdir} -I${libwww_srcdir} -I${curl_srcdir}")
+target_link_libraries(xmlrpc_client++ xmlrpc++ xmlrpc_client)
+list(APPEND lib_TARGETS xmlrpc_client++)
+ensc_pkgconfig(xmlrpc_client++)
+
+
+install(TARGETS ${lib_TARGETS}
+  RUNTIME DESTINATION ${_bin}
+  LIBRARY DESTINATION ${_lib})
+
+set_target_properties(${lib_TARGETS}
+  PROPERTIES
+  LINK_FLAGS ${XMLRPC_LINKER_FLAGS}
+  VERSION    ${XMLRPC_C_LIBVERSION}
+  SOVERSION  ${XMLRPC_C_SOVERSION})
diff --git a/src/cpp/xmlrpc++.pc.cmake b/src/cpp/xmlrpc++.pc.cmake
new file mode 100644
index 0000000..cda7f56
--- /dev/null
+++ b/src/cpp/xmlrpc++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc++
+Description: XMLRPC C++ Base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc
+Libs:   		-L${libdir} -lxmlrpc++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_client++.pc.cmake b/src/cpp/xmlrpc_client++.pc.cmake
new file mode 100644
index 0000000..188b3a6
--- /dev/null
+++ b/src/cpp/xmlrpc_client++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_client++
+Description: XMLRPC C++ Client library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc++ xmlrpc_client
+Libs:   		-L${libdir} -lxmlrpc_client++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_cpp.pc.cmake b/src/cpp/xmlrpc_cpp.pc.cmake
new file mode 100644
index 0000000..b8f5af3
--- /dev/null
+++ b/src/cpp/xmlrpc_cpp.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_cpp
+Description: XMLRPC CPP library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc xmlrpc_server xmlrpc_client
+Libs:   		-L${libdir} -lxmlrpc_cpp
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_server++.pc.cmake b/src/cpp/xmlrpc_server++.pc.cmake
new file mode 100644
index 0000000..07b9e7b
--- /dev/null
+++ b/src/cpp/xmlrpc_server++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server++
+Description: XMLRPC C++ Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc++ xmlrpc_server
+Libs:   		-L${libdir} -lxmlrpc_server++
+Cflags:		-I${includedir}
diff --git a/src/cpp/xmlrpc_server_abyss++.pc.cmake b/src/cpp/xmlrpc_server_abyss++.pc.cmake
new file mode 100644
index 0000000..d9eb456
--- /dev/null
+++ b/src/cpp/xmlrpc_server_abyss++.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_abyss++
+Description: XMLRPC C++ Abyss-Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server_abyss xmlrpc_server++
+Libs:   		-L${libdir} -lxmlrpc_server_abyss++
+Cflags:		-I${includedir}
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
new file mode 100644
index 0000000..3deb9cb
--- /dev/null
+++ b/src/test/CMakeLists.txt
@@ -0,0 +1,27 @@
+# -*- cmake -*-
+
+set(test_SOURCES
+  test.c abyss.c cgi.c method_registry.c parse_xml.c serialize.c server_abyss.c
+  value.c xml_data.c)
+
+if(MUST_BUILD_CLIENT)
+  list(APPEND test_SOURCES client.c)
+  list(APPEND test_LIBS xmlrpc_client)
+else(MUST_BUILD_CLIENT)
+  list(APPEND test_SOURCES client_dummy.c)
+endif(MUST_BUILD_CLIENT)
+
+
+add_executable(src-test ${test_SOURCES})
+target_link_libraries(src-test xmlrpc_server_abyss util ${test_LIBS})
+
+add_executable(cgitest1 cgitest1.c)
+target_link_libraries(cgitest1 xmlrpc_server_cgi)
+
+add_custom_command(TARGET src-test
+  POST_BUILD
+  COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/data
+  COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR})
+
+enable_testing()
+add_test(runtests src-test)
diff --git a/src/xmlrpc.pc.cmake b/src/xmlrpc.pc.cmake
new file mode 100644
index 0000000..fd0c872
--- /dev/null
+++ b/src/xmlrpc.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc
+Description: XMLRPC base library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	@xmlrpc_pkgconfig_req@ xmlrpc_util
+Libs:   		-L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_client.pc.cmake b/src/xmlrpc_client.pc.cmake
new file mode 100644
index 0000000..16bdd22
--- /dev/null
+++ b/src/xmlrpc_client.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_client
+Description: XMLRPC client library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc @xmlrpc_client_pkgconfig_req@
+Libs:   		-L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server.pc.cmake b/src/xmlrpc_server.pc.cmake
new file mode 100644
index 0000000..ca7224c
--- /dev/null
+++ b/src/xmlrpc_server.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server
+Description: XMLRPC Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc
+Libs:   		-L${libdir} -lxmlrpc_server
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server_abyss.pc.cmake b/src/xmlrpc_server_abyss.pc.cmake
new file mode 100644
index 0000000..7fbecc9
--- /dev/null
+++ b/src/xmlrpc_server_abyss.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_abyss
+Description: XMLRPC Server Abyss library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server xmlrpc_abyss
+Libs:   		-L${libdir} -lxmlrpc_server_abyss
+Cflags:		-I${includedir}
diff --git a/src/xmlrpc_server_cgi.pc.cmake b/src/xmlrpc_server_cgi.pc.cmake
new file mode 100644
index 0000000..8042912
--- /dev/null
+++ b/src/xmlrpc_server_cgi.pc.cmake
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name:        xmlrpc_server_cgi
+Description: XMLRPC CGI-Server library
+Version:     @XMLRPC_C_VERSION@
+
+Requires.private:	xmlrpc_server
+Libs:   		-L${libdir} -lxmlrpc_server_cgi
+Cflags:		-I${includedir}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000..14010f4
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+add_subdirectory(binmode-rpc-kit)
+add_subdirectory(turbocharger)
+
+add_subdirectory(xmlrpc)
+add_subdirectory(xmlrpc_transport)
+
+add_subdirectory(xml-rpc-api2cpp )
diff --git a/tools/binmode-rpc-kit/CMakeLists.txt b/tools/binmode-rpc-kit/CMakeLists.txt
new file mode 100644
index 0000000..a707c75
--- /dev/null
+++ b/tools/binmode-rpc-kit/CMakeLists.txt
@@ -0,0 +1,2 @@
+# -*- cmake -*-
+
diff --git a/tools/turbocharger/CMakeLists.txt b/tools/turbocharger/CMakeLists.txt
new file mode 100644
index 0000000..342423d
--- /dev/null
+++ b/tools/turbocharger/CMakeLists.txt
@@ -0,0 +1 @@
+# -*- cmake -*-
diff --git a/tools/xml-rpc-api2cpp/CMakeLists.txt b/tools/xml-rpc-api2cpp/CMakeLists.txt
new file mode 100644
index 0000000..c759dec
--- /dev/null
+++ b/tools/xml-rpc-api2cpp/CMakeLists.txt
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+add_executable(xml-rpc-api2cpp
+  xml-rpc-api2cpp.cpp
+  DataType.cpp
+  XmlRpcFunction.cpp
+  XmlRpcClass.cpp
+  SystemProxy.cpp)
+target_link_libraries(xml-rpc-api2cpp xmlrpc_cpp xmlrpc_client xmlrpc_server)
+
+install(TARGETS xml-rpc-api2cpp
+  RUNTIME DESTINATION bin)
+
+install(FILES xml-rpc-api2cpp.1
+  DESTINATION ${mandir}/man1)
diff --git a/tools/xmlrpc/CMakeLists.txt b/tools/xmlrpc/CMakeLists.txt
new file mode 100644
index 0000000..976df30
--- /dev/null
+++ b/tools/xmlrpc/CMakeLists.txt
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+add_executable(tool-xmlrpc
+  xmlrpc.c
+  dumpvalue.c
+  dumpvalue.h)
+target_link_libraries(tool-xmlrpc xmlrpc_client util)
+
+set_target_properties(tool-xmlrpc
+  PROPERTIES OUTPUT_NAME xmlrpc)
+
+install(TARGETS tool-xmlrpc
+  DESTINATION ${_bin})
+
+ensc_set_link_exe_flags(tool-xmlrpc)
diff --git a/tools/xmlrpc/config.h b/tools/xmlrpc/config.h
new file mode 100644
index 0000000..7409aed
--- /dev/null
+++ b/tools/xmlrpc/config.h
@@ -0,0 +1 @@
+#include <xmlrpc_config.h>
diff --git a/tools/xmlrpc_transport/CMakeLists.txt b/tools/xmlrpc_transport/CMakeLists.txt
new file mode 100644
index 0000000..b73d7c0
--- /dev/null
+++ b/tools/xmlrpc_transport/CMakeLists.txt
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+add_executable(xmlrpc_transport xmlrpc_transport.c)
+target_link_libraries(xmlrpc_transport xmlrpc_client util)
+
+install(TARGETS xmlrpc_transport
+  DESTINATION ${_bin})
+
+ensc_set_link_exe_flags(xmlrpc_transport)
diff --git a/tools/xmlrpc_transport/config.h b/tools/xmlrpc_transport/config.h
new file mode 100644
index 0000000..7409aed
--- /dev/null
+++ b/tools/xmlrpc_transport/config.h
@@ -0,0 +1 @@
+#include <xmlrpc_config.h>
diff --git a/transport_config.h.cmake b/transport_config.h.cmake
new file mode 100644
index 0000000..1ec3cf6
--- /dev/null
+++ b/transport_config.h.cmake
@@ -0,0 +1,16 @@
+/* -*- c -*- */
+#define MUST_BUILD_WININET_CLIENT	@_MUST_BUILD_WININET_CLIENT@
+#define MUST_BUILD_LIBWWW_CLIENT	@_MUST_BUILD_LIBWWW_CLIENT@
+#define MUST_BUILD_CURL_CLIENT		@_MUST_BUILD_CURL_CLIENT@
+
+static char const * const XMLRPC_DEFAULT_TRANSPORT =
+#if MUST_BUILD_LIBWWW_CLIENT
+  "libwww"
+#elif MUST_BUILD_CURL_CLIENT
+  "curl"
+#elif MUST_BUILD_WININET_CLIENT
+  "wininet"
+#else
+#  error "no client XML transport configured"
+#endif
+  ;
diff --git a/version.h.cmake b/version.h.cmake
new file mode 100644
index 0000000..35beafc
--- /dev/null
+++ b/version.h.cmake
@@ -0,0 +1,2 @@
+/* This file was generated by a make rule */
+#define XMLRPC_C_VERSION "@XMLRPC_C_VERSION@"
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
index 0000000..e8ba549
--- /dev/null
+++ b/xmlrpc-c-config
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+comp=
+
+need_cxx=
+need_client=
+need_server=
+need_abyss=
+
+while test $# -gt 0; do
+    case $1 in
+      (c++)          		comp="$comp xmlrpc_cpp";;
+      (server-util)  		comp="$comp xmlrpc_server_util";;
+      (cgi-server)   		comp="$comp xmlrpc_server_cgi";;
+      (c++2)         		need_cxx=1;;
+      (abyss-server) 		need_abyss=1;;
+      (client|libwww-client)	need_client=1;;
+      (--) shift; break;;
+      (--*) break;;
+      (*)
+      echo "Unrecognized token '$1'"
+      exit 1
+      ;;
+    esac
+    shift
+done
+
+if test -z "$need_cxx"; then
+    test -z "$need_client" || comp="$comp xmlrpc_client"
+    test -z "$need_abyss"  || comp="$comp xmlrpc_abyss"
+    test -z "$need_server" || comp="$comp xmlrpc_server"
+else
+    test -z "$need_client" || comp="$comp xmlrpc_client++"
+    test -z "$need_abyss"  || comp="$comp xmlrpc_abyss++"
+    test -z "$need_server" || comp="$comp xmlrpc_server++"
+fi
+
+exec pkg-config "$@" $comp
diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake
new file mode 100644
index 0000000..98b37ef
--- /dev/null
+++ b/xmlrpc_config.h.cmake
@@ -0,0 +1,21 @@
+/* -*- c -*- */
+
+#ifndef H_XMLRPC_C_CONFIG_H
+
+#cmakedefine			HAVE_WCHAR_H
+#cmakedefine			HAVE_SETENV
+#define HAVE_SYS_IOCTL_H	0 at HAVE_SYS_IOCTL_H@
+
+#define VA_LIST_IS_ARRAY	@VA_LIST_IS_ARRAY@
+#define XMLRPC_HAVE_WCHAR	@XMLRPC_HAVE_WCHAR@
+#define ATTR_UNUSED		@ATTR_UNUSED@
+#define DIRECTORY_SEPARATOR	"@DIRECTORY_SEPARATOR@"
+
+#ifdef HAVE_WCHAR_H
+#  define HAVE_UNICODE_WCHAR	1
+#else
+#  define HAVE_UNICODE_WCHAR	0
+#endif
+
+
+#endif
-- 
1.4.2.1



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/xmlrpc-c.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmlrpc-c.spec	4 Jun 2006 16:38:35 -0000	1.3
+++ xmlrpc-c.spec	2 Oct 2006 15:10:48 -0000	1.4
@@ -4,19 +4,18 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.05
-Release:	%release_func 1
+Version:	1.06.05
+Release:	%release_func 2
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
 Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
-Patch0:		xmlrpc-c-1.04-libxml2.patch
-Patch2:		xmlrpc-c-1.05-gcc41.patch
 Patch3:		xmlrpc-c-1.05-typo.patch
-Patch4:		xmlrpc-c-1.05-libtool.patch
-Patch5:		xmlrpc-c-1.05-buildsys.patch
+Patch6:		xmlrpc-c-1.06.04-sizet.patch
+Patch100:	http://ensc.de/xmlrpc-c/0001-make-cmake-transition.txt
 BuildRoot:	%_tmppath/%name-%version-%release-root
 #BuildRequires:	w3c-libwww-devel
+BuildRequires:	cmake
 BuildRequires:	curl-devel libxml2-devel
 
 %package devel
@@ -24,6 +23,7 @@
 Group:		Development/Libraries
 Requires:	%name = %version-%release
 Requires:	libxml2-devel curl-devel
+Requires:	pkgconfig
 
 %package apps
 Summary:	Sample XML-RPC applications
@@ -54,44 +54,40 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .libxml2
-%patch2 -p1 -b .gcc41
 %patch3 -p1 -b .typo
-%patch4 -p1 -b .libtool
-%patch5 -p1 -b .buildsys
+%patch6 -p1 -b .sizet
+
+cat %PATCH100 | patch -p1
+
+sed -i -e '/\(chan\|init\.c\)/d' lib/abyss/src/CMakeLists.txt
+sed -i -e 's!xmlrpc_decompose.c!xmlrpc_builddecomp.c!g;
+           s!xmlrpc_build.c!!g;' src/CMakeLists.txt
+sed -i -e 's! abyss.c!!g;' src/test/CMakeLists.txt
 
 ## not needed...
 rm doc/{INSTALL,configure_doc}
 
 
 %build
-%configure --enable-libxml2-backend --disable-libwww-client
-
-sed -i -e 's!-L/usr/%_lib\s\s*!!g;
-	   s!-L/usr/%_lib"!"!g;
-	   s!\(the_\S*rpath=\)\"..*\"!\1!g' xmlrpc-c-config
-
-%__make \
-	CFLAGS_COMMON="-DNDEBUG -fno-common $RPM_OPT_FLAGS"	\
-	CXXFLAGS_COMMON="-DNDEBUG $RPM_OPT_FLAGS"		\
-	#%{?_smp_mflags}
+mkdir fedora
+cd fedora
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+cmake .. \
+	-D_lib:STRING=%_lib			\
+	-DMUST_BUILD_CURL_CLIENT:BOOL=ON	\
+	-DMUST_BUILD_LIBWWW_CLIENT:BOOL=OFF	\
+        -DCMAKE_INSTALL_PREFIX:PATH=%_prefix	\
+        -DBUILD_SHARED_LIBS:BOOL=ON
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%__make DESTDIR="$RPM_BUILD_ROOT" install
-
-%__install -d -m0755 $RPM_BUILD_ROOT%_mandir/man1
+cd fedora
+make install DESTDIR=$RPM_BUILD_ROOT
 
-F=tools/xml-rpc-api2cpp/xml-rpc-api2cpp
-./libtool --mode=install %__install -p -m755 $F $RPM_BUILD_ROOT/%_bindir/
-%__install -p -m0644 $F.1 $RPM_BUILD_ROOT%_mandir/man1/
-
-for i in $RPM_BUILD_ROOT%_libdir/*.a; do
-	test ! -e "${i%%.a}.so" || rm -f $i
-done
-
-rm -f $RPM_BUILD_ROOT%_libdir/*.la
+chmod +x $RPM_BUILD_ROOT%_libdir/*.so
 
 
 %clean
@@ -112,6 +108,7 @@
 %defattr(-,root,root,-)
 %_bindir/xmlrpc-c-config
 %_includedir
+%_libdir/pkgconfig/*.pc
 %_libdir/*.so
 
 
@@ -126,6 +123,19 @@
 
 
 %changelog
+* Mon Oct  2 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-2
+- updated cmake patch
+- strip installed libraries
+
+* Wed Sep 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-1
+- updated to 1.06.05
+- merged + updated patches
+
+* Sat Sep 16 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.04-1
+- updated to 1.06.04
+- patched the broken buildsystem
+- disabled libwww backend explicitely
+
 * Sun Jun  4 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.05-1
 - updated to 1.05
 - updated patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jun 2006 16:38:35 -0000	1.3
+++ sources	2 Oct 2006 15:10:48 -0000	1.4
@@ -1 +1 @@
-60d59b39f13d21c3db9285274ea23bab  xmlrpc-c-1.05.tgz
+69f3644da7b8e9d13482c82838a4005a  xmlrpc-c-1.06.05.tgz


--- xmlrpc-c-1.05-libtool.patch DELETED ---


--- xmlrpc-c-1.05-gcc41.patch DELETED ---


--- xmlrpc-c-1.05-buildsys.patch DELETED ---


--- xmlrpc-c-1.04-libxml2.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 15:23:35 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 08:23:35 -0700
Subject: rpms/php-pear-PHP-CompatInfo/devel xml2changelog, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 php-pear-PHP-CompatInfo.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610021523.k92FNb97028991@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28969

Modified Files:
	.cvsignore php-pear-PHP-CompatInfo.spec sources 
Added Files:
	xml2changelog 
Log Message:
	upgrade to 1.4.0



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2006 15:30:31 -0000	1.2
+++ .cvsignore	2 Oct 2006 15:23:35 -0000	1.3
@@ -1 +1 @@
-PHP_CompatInfo-1.3.2.tgz
+PHP_CompatInfo-1.4.0.tgz


Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-PHP-CompatInfo.spec	12 Sep 2006 15:30:31 -0000	1.1
+++ php-pear-PHP-CompatInfo.spec	2 Oct 2006 15:23:35 -0000	1.2
@@ -2,7 +2,7 @@
 %define pear_name PHP_CompatInfo
 
 Name:           php-pear-PHP-CompatInfo
-Version:        1.3.2
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions n??cessaires ?? l'ex??cution d'un code
@@ -12,11 +12,12 @@
 URL:            http://pear.php.net/package/PHP_CompatInfo
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  dos2unix php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.3 php-pear(Console_Getopt) >= 1.2 php-pear(Console_Table) >= 1.0.5
+Requires:       php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.1 php-pear(Console_Table) >= 1.0.5
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -36,6 +37,7 @@
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
@@ -85,12 +87,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/tests %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
+%doc CHANGELOG LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/tests %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
 %{pear_phpdir}/PHP
 %{pear_xmldir}/%{pear_name}.xml
 %{_bindir}/pcicmd
 
 %changelog
+* Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
+- upgrade to 1.4.0
+- Change Requires from Console_Getopt to Console_Getargs
+
 * Mon Sep 11 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
 - generated specfile (pear make-rpm-spec) + cleaning
 - add french summary and description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2006 15:30:31 -0000	1.2
+++ sources	2 Oct 2006 15:23:35 -0000	1.3
@@ -1 +1 @@
-1198ca0995f7d75336b90d786253de5e  PHP_CompatInfo-1.3.2.tgz
+0e7da112542fa124f7b523cb09c7624a  PHP_CompatInfo-1.4.0.tgz



From fedora-extras-commits at redhat.com  Mon Oct  2 15:25:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon,  2 Oct 2006 08:25:41 -0700
Subject: rpms/kannel/devel .cvsignore, 1.3, 1.4 kannel.init, 1.1,
	1.2 kannel.spec, 1.11, 1.12 sources, 1.3,
	1.4 kannel-1.4.0-depend.patch, 1.1, NONE
Message-ID: <200610021525.k92FPhS4029057@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29032

Modified Files:
	.cvsignore kannel.init kannel.spec sources 
Removed Files:
	kannel-1.4.0-depend.patch 
Log Message:
Update kannel to 1.4.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 18:06:30 -0000	1.3
+++ .cvsignore	2 Oct 2006 15:25:40 -0000	1.4
@@ -1 +1 @@
-gateway-1.4.0.tar.bz2
+gateway-1.4.1.tar.bz2


Index: kannel.init
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kannel.init	17 Nov 2005 12:25:54 -0000	1.1
+++ kannel.init	2 Oct 2006 15:25:40 -0000	1.2
@@ -34,6 +34,10 @@
 	RETVAL_BEARER=$?
 	echo
 
+	# It seems like the bearerbox may need to settle before accepting
+	# connections from wapbox and smsbox
+	sleep 3s
+
 	# Starting wap and sms only makes sense if bearerbox is running
 	if [ $RETVAL_BEARER -eq 0 ]; then
 	  if grep "^group = wapbox" $config &>/dev/null; then


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kannel.spec	28 Aug 2006 11:24:21 -0000	1.11
+++ kannel.spec	2 Oct 2006 15:25:40 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.0
-Release: 9%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -9,15 +9,16 @@
 Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
-Patch: kannel-1.4.0-depend.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, flex, ImageMagick
-BuildRequires: libxml2-devel, openssl-devel, zlib-devel
-BuildRequires: pcre-devel
+BuildRequires: bison, byacc, flex
+BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
 # DB backends
-BuildRequires: sqlite2-devel
-# For the docs... I think we need transfig too, so disable for now.
-#BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+BuildRequires: sqlite-devel
+%{?_with_mysql:Buildrequires: mysql-devel}
+%{?_with_pgsql:Buildrequires: postgresql-devel}
+# For the docs...
+BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+BuildRequires: ImageMagick, transfig
 
 %description
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -47,15 +48,18 @@
 
 %prep
 %setup -n gateway-%{version}
-%patch -p0 -b .depend
 
 
 %build
 %configure \
-    --enable-start-stop-daemon \
     --enable-pcre \
-    --with-sqlite
-%{__make} %{?_smp_mflags}
+    --enable-docs \
+    --enable-start-stop-daemon \
+    %{?_with_mysql} \
+    --with-sqlite3 \
+    %{?_with_pgsql}
+# Remove %{?_smp_mflags} since the docs fail to build with it
+%{__make}
 
 
 %install
@@ -103,7 +107,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
 %attr(0640, kannel, kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
 %config %{_sysconfdir}/rc.d/init.d/kannel
@@ -121,6 +125,14 @@
 
 
 %changelog
+* Mon Oct  2 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-1
+- Update to 1.4.1.
+- Remove obsolete depend patch.
+- Add 3s sleep sfter bearerbox start to let it settle before connections.
+- Switch sqlite backend from sqlite2 to new sqlite3.
+- Add conditional --with mysql and pgsql rebuild support.
+- Re-enable building the doc since transfig is now available and include PDFs.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.0-9
 - FC6 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jan 2005 18:06:30 -0000	1.3
+++ sources	2 Oct 2006 15:25:40 -0000	1.4
@@ -1 +1 @@
-2ef0544002be48669d7f0f29f9f470de  gateway-1.4.0.tar.bz2
+ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2


--- kannel-1.4.0-depend.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 15:25:49 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 08:25:49 -0700
Subject: rpms/php-pear-PHP-CompatInfo/devel php-pear-PHP-CompatInfo.spec, 1.2,
	1.3
Message-ID: <200610021525.k92FPpH2029078@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29061

Modified Files:
	php-pear-PHP-CompatInfo.spec 
Log Message:
	



Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-PHP-CompatInfo.spec	2 Oct 2006 15:23:35 -0000	1.2
+++ php-pear-PHP-CompatInfo.spec	2 Oct 2006 15:25:49 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           php-pear-PHP-CompatInfo
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions n??cessaires ?? l'ex??cution d'un code
 



From fedora-extras-commits at redhat.com  Mon Oct  2 15:36:45 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 08:36:45 -0700
Subject: rpms/php-pear-PHP-CompatInfo/FC-5 .cvsignore, 1.2,
	1.3 php-pear-PHP-CompatInfo.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610021536.k92FalfQ029217@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29196

Modified Files:
	.cvsignore php-pear-PHP-CompatInfo.spec sources 
Log Message:
	ugrade to 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2006 15:30:31 -0000	1.2
+++ .cvsignore	2 Oct 2006 15:36:45 -0000	1.3
@@ -1 +1 @@
-PHP_CompatInfo-1.3.2.tgz
+PHP_CompatInfo-1.4.0.tgz


Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-PHP-CompatInfo.spec	12 Sep 2006 17:25:54 -0000	1.2
+++ php-pear-PHP-CompatInfo.spec	2 Oct 2006 15:36:45 -0000	1.3
@@ -2,8 +2,8 @@
 %define pear_name PHP_CompatInfo
 
 Name:           php-pear-PHP-CompatInfo
-Version:        1.3.2
-Release:        1%{?dist}.1
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions n??cessaires ?? l'ex??cution d'un code
 
@@ -12,11 +12,12 @@
 URL:            http://pear.php.net/package/PHP_CompatInfo
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  dos2unix php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.3 php-pear(Console_Getopt) >= 1.2 php-pear(Console_Table) >= 1.0.5
+Requires:       php-pear(PEAR) >= 1.4.3 php-pear(Console_Getargs) >= 1.3.1 php-pear(Console_Table) >= 1.0.5
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -36,6 +37,7 @@
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
@@ -85,14 +87,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/tests %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
+%doc CHANGELOG LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/tests %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
 %{pear_phpdir}/PHP
 %{pear_xmldir}/%{pear_name}.xml
 %{_bindir}/pcicmd
 
 %changelog
-* Tue Sep 12 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1.fc5.1
-- FC5 build
+* Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
+- upgrade to 1.4.0
+- Change Requires from Console_Getopt to Console_Getargs
 
 * Mon Sep 11 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
 - generated specfile (pear make-rpm-spec) + cleaning


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2006 15:30:31 -0000	1.2
+++ sources	2 Oct 2006 15:36:45 -0000	1.3
@@ -1 +1 @@
-1198ca0995f7d75336b90d786253de5e  PHP_CompatInfo-1.3.2.tgz
+0e7da112542fa124f7b523cb09c7624a  PHP_CompatInfo-1.4.0.tgz



From fedora-extras-commits at redhat.com  Mon Oct  2 15:38:17 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 08:38:17 -0700
Subject: rpms/php-pear-PHP-CompatInfo/FC-5 xml2changelog,NONE,1.1
Message-ID: <200610021538.k92FcJKf029283@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29267

Added Files:
	xml2changelog 
Log Message:
	



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>



From fedora-extras-commits at redhat.com  Mon Oct  2 15:59:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 08:59:16 -0700
Subject: rpms/maxima/devel maxima-5.10.0-xdg_open.patch, NONE,
	1.1 maxima.spec, 1.39, 1.40 maxima-5.9.2-htmlview.patch, 1.1, NONE
Message-ID: <200610021559.k92FxI98029534@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29514

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.10.0-xdg_open.patch 
Removed Files:
	maxima-5.9.2-htmlview.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-3
- htmlview -> xdg-open


maxima-5.10.0-xdg_open.patch:

--- NEW FILE maxima-5.10.0-xdg_open.patch ---
--- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2004-10-16 10:37:53.000000000 -0500
+++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-08-22 07:27:23.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- maxima.spec	27 Sep 2006 13:42:58 -0000	1.39
+++ maxima.spec	2 Oct 2006 15:59:16 -0000	1.40
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -44,7 +44,7 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.9.2-htmlview.patch
+Patch1: maxima-5.10.0-xdg_open.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
@@ -96,6 +96,8 @@
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
+Requires: xdg-open
+#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -180,7 +182,7 @@
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%patch1 -p1 -b .htmlview
+%patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
 %if "%{?fedora}" > "3"
@@ -384,6 +386,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-3
+- htmlview -> xdg-open
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17
 


--- maxima-5.9.2-htmlview.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 16:00:36 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 09:00:36 -0700
Subject: rpms/piklab/devel piklab.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610021600.k92G0cQB029619@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600

Modified Files:
	piklab.spec sources 
Log Message:
Upstream rebuilt tarball :-(


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- piklab.spec	2 Oct 2006 13:24:47 -0000	1.4
+++ piklab.spec	2 Oct 2006 16:00:36 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -124,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-3
+  - Upstream rebuilt tarball :-(
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-2
   - Add BR gettext since there is now translation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 11:38:45 -0000	1.3
+++ sources	2 Oct 2006 16:00:36 -0000	1.4
@@ -1 +1 @@
-2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2
+04d5aa820fadfe547951e1abfb651a1e  piklab-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 16:01:24 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon,  2 Oct 2006 09:01:24 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200610021601.k92G1xvA032497@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32456

Modified Files:
	piklab.spec sources 
Log Message:
Upstream rebuilt tarball :-(


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- piklab.spec	2 Oct 2006 13:25:25 -0000	1.3
+++ piklab.spec	2 Oct 2006 16:01:24 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -124,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-3
+  - Upstream rebuilt tarball :-(
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-2
   - Add BR gettext since there is now translation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 11:39:54 -0000	1.3
+++ sources	2 Oct 2006 16:01:24 -0000	1.4
@@ -1 +1 @@
-2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2
+04d5aa820fadfe547951e1abfb651a1e  piklab-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 16:01:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:01:44 -0700
Subject: rpms/maxima/devel maxima.spec,1.40,1.41
Message-ID: <200610021602.k92G2J6Q032539@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32478

Modified Files:
	maxima.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
- -gui: htmlview -> xdg-open,Requires: xdg-utils



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- maxima.spec	2 Oct 2006 15:59:16 -0000	1.40
+++ maxima.spec	2 Oct 2006 16:01:44 -0000	1.41
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -96,7 +96,7 @@
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
-Requires: xdg-open
+Requires: xdg-utils
 #Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
@@ -386,8 +386,8 @@
 
 
 %changelog
-* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-3
-- htmlview -> xdg-open
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
+- -gui: htmlview -> xdg-open,Requires: xdg-utils
 
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17



From fedora-extras-commits at redhat.com  Mon Oct  2 16:03:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:03:25 -0700
Subject: fedora-rpmdevtools rpmdevtools.spec, 1.16, 1.17 rpmdev-rmdevelrpms,
	1.1, 1.2
Message-ID: <200610021603.k92G3PwE032615@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32595

Modified Files:
	rpmdevtools.spec rpmdev-rmdevelrpms 
Log Message:
Treat yasm and *-static as devel packages in rmdevelrpms.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpmdevtools.spec	9 Sep 2006 17:04:18 -0000	1.16
+++ rpmdevtools.spec	2 Oct 2006 16:03:21 -0000	1.17
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.7
 
 Name:           rpmdevtools
-Version:        5.1
+Version:        5.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
+- Treat yasm and *-static as devel packages in rmdevelrpms.
+
 * Sat Sep  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.1-1
 - Re-add PHP PEAR spec template, more improvements to it (#198706,
   Christopher Stone, Remi Collet).


Index: rpmdev-rmdevelrpms
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-rmdevelrpms,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmdev-rmdevelrpms	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-rmdevelrpms	2 Oct 2006 16:03:21 -0000	1.2
@@ -24,10 +24,10 @@
 import getopt, os, re, rpm, stat, sys, types
 
 
-__version__ = "1.2"
+__version__ = "1.3"
 
 
-dev_re  = re.compile("-(?:de(?:buginfo|vel)|sdk)\\b", re.IGNORECASE)
+dev_re  = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE)
 test_re = re.compile("^perl-(?:Devel|ExtUtils|Test)-")
 lib_re1 = re.compile("^lib.+")
 lib_re2 = re.compile("-libs?$")
@@ -45,7 +45,7 @@
  "gcc-objc", "gcc32", "gcc34", "gcc34-c++", "gcc34-java", "gcc35", "gcc35-c++",
  "gcc4", "gcc4-c++", "gcc4-gfortran", "gettext", "glade", "glade2",
  "kernel-source", "kernel-sourcecode", "libtool", "m4", "nasm",
- "perl-Module-Build", "pkgconfig", "qt-designer", "swig", "texinfo",
+ "perl-Module-Build", "pkgconfig", "qt-designer", "swig", "texinfo", "yasm",
  )
 
 # zlib-devel: see #151622
@@ -109,12 +109,12 @@
 
 By default, the following packages are treated as development ones and are
 thus candidates for removal: any package whose name matches "-devel\\b",
-"-debuginfo\\b", or "-sdk\\b" (case insensitively) except gcc requirements;
-any package whose name starts with "perl-(Devel|ExtUtils|Test)-"; any package
-whose name starts with "compat-gcc"; packages in the internal list of known
-development oriented packages (see def_devpkgs in the source code); packages
-determined to be development ones based on some basic heuristic checks on the
-package\'s contents.
+"-debuginfo\\b", "-sdk\\b", or "-static\\b" (case insensitively) except gcc
+requirements; any package whose name starts with "perl-(Devel|ExtUtils|Test)-";
+any package whose name starts with "compat-gcc"; packages in the internal list
+of known development oriented packages (see def_devpkgs in the source code);
+packages determined to be development ones based on some basic heuristic
+checks on the package\'s contents.
 
 The default set of packages above is not intended to not reduce a system into
 a minimal clean build root, but to keep it usable for general purposes while



From fedora-extras-commits at redhat.com  Mon Oct  2 16:16:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:16:05 -0700
Subject: fedora-rpmdevtools check-buildroot, 1.6, 1.7 rpmdevtools.spec, 1.17,
	1.18
Message-ID: <200610021616.k92GG5bU032759@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32737

Modified Files:
	check-buildroot rpmdevtools.spec 
Log Message:
Skip *.jar.so.debug in check-buildroot (#208903).


Index: check-buildroot
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/check-buildroot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- check-buildroot	18 Aug 2005 06:04:06 -0000	1.6
+++ check-buildroot	2 Oct 2006 16:16:03 -0000	1.7
@@ -27,7 +27,7 @@
 
 find "$RPM_BUILD_ROOT" \! \( \
     -name '*.pyo' -o -name '*.pyc' -o -name '*.elc' -o -name '.packlist' \
-    \) -type f -print0 | \
+    -o -name '*.jar.so.debug' \) -type f -print0 | \
     LANG=C xargs -0r grep -F "$RPM_BUILD_ROOT" >$tmp
 
 test -s "$tmp" && {


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmdevtools.spec	2 Oct 2006 16:03:21 -0000	1.17
+++ rpmdevtools.spec	2 Oct 2006 16:16:03 -0000	1.18
@@ -121,6 +121,7 @@
 
 %changelog
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
+- Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.
 
 * Sat Sep  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.1-1



From fedora-extras-commits at redhat.com  Mon Oct  2 16:16:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:16:51 -0700
Subject: fedora-rpmdevtools configure.ac,1.4,1.5
Message-ID: <200610021616.k92GGpUW000343@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv324

Modified Files:
	configure.ac 
Log Message:
5.2.


Index: configure.ac
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.ac	9 Sep 2006 17:04:18 -0000	1.4
+++ configure.ac	2 Oct 2006 16:16:49 -0000	1.5
@@ -1,4 +1,4 @@
-AC_INIT(rpmdevtools, 5.1)
+AC_INIT(rpmdevtools, 5.2)
 AM_INIT_AUTOMAKE
 AC_PATH_PROG(HELP2MAN,help2man)
 AC_PATH_PROG(WGET,wget)



From fedora-extras-commits at redhat.com  Mon Oct  2 16:29:07 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:29:07 -0700
Subject: rpms/rpmdevtools/FC-5 .cvsignore, 1.3, 1.4 rpmdevtools.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610021629.k92GT9j0000494@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv453/FC-5

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
- Skip *.jar.so.debug in check-buildroot (#208903).
- Treat yasm and *-static as devel packages in rmdevelrpms.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2006 21:00:26 -0000	1.3
+++ .cvsignore	2 Oct 2006 16:29:07 -0000	1.4
@@ -1,2 +1,2 @@
 spectool-1.0.7.tar.bz2
-rpmdevtools-5.1.tar.bz2
+rpmdevtools-5.2.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/rpmdevtools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmdevtools.spec	12 Sep 2006 21:00:26 -0000	1.3
+++ rpmdevtools.spec	2 Oct 2006 16:29:07 -0000	1.4
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.7
 
 Name:           rpmdevtools
-Version:        5.1
+Version:        5.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,10 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
+- Skip *.jar.so.debug in check-buildroot (#208903).
+- Treat yasm and *-static as devel packages in rmdevelrpms.
+
 * Sat Sep  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.1-1
 - Re-add PHP PEAR spec template, more improvements to it (#198706,
   Christopher Stone, Remi Collet).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2006 21:00:26 -0000	1.4
+++ sources	2 Oct 2006 16:29:07 -0000	1.5
@@ -1,2 +1,2 @@
 e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-3034a8117ee8533b30f78deb7c06ff46  rpmdevtools-5.1.tar.bz2
+41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 16:29:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 09:29:08 -0700
Subject: rpms/rpmdevtools/devel .cvsignore, 1.3, 1.4 rpmdevtools.spec, 1.3, 
	1.4 sources, 1.4, 1.5
Message-ID: <200610021629.k92GTAn3000500@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv453/devel

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
- Skip *.jar.so.debug in check-buildroot (#208903).
- Treat yasm and *-static as devel packages in rmdevelrpms.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2006 21:00:26 -0000	1.3
+++ .cvsignore	2 Oct 2006 16:29:08 -0000	1.4
@@ -1,2 +1,2 @@
 spectool-1.0.7.tar.bz2
-rpmdevtools-5.1.tar.bz2
+rpmdevtools-5.2.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmdevtools.spec	12 Sep 2006 21:00:26 -0000	1.3
+++ rpmdevtools.spec	2 Oct 2006 16:29:08 -0000	1.4
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.7
 
 Name:           rpmdevtools
-Version:        5.1
+Version:        5.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,10 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
+- Skip *.jar.so.debug in check-buildroot (#208903).
+- Treat yasm and *-static as devel packages in rmdevelrpms.
+
 * Sat Sep  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.1-1
 - Re-add PHP PEAR spec template, more improvements to it (#198706,
   Christopher Stone, Remi Collet).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2006 21:00:26 -0000	1.4
+++ sources	2 Oct 2006 16:29:08 -0000	1.5
@@ -1,2 +1,2 @@
 e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-3034a8117ee8533b30f78deb7c06ff46  rpmdevtools-5.1.tar.bz2
+41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 16:29:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:29:31 -0700
Subject: rpms/libtunepimp/devel .cvsignore, 1.5, 1.6 libtunepimp.spec, 1.19, 
	1.20 sources, 1.5, 1.6
Message-ID: <200610021629.k92GTXoW000575@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv552

Modified Files:
	.cvsignore libtunepimp.spec sources 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
- 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Sep 2006 18:06:03 -0000	1.5
+++ .cvsignore	2 Oct 2006 16:29:30 -0000	1.6
@@ -1,2 +1,2 @@
 libtunepimp-0.4.3.tar.gz
-libtunepimp-0.5.1.tar.gz
+libtunepimp-0.5.2.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libtunepimp.spec	26 Sep 2006 18:06:03 -0000	1.19
+++ libtunepimp.spec	2 Oct 2006 16:29:30 -0000	1.20
@@ -1,8 +1,8 @@
 
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
-Version: 0.5.1
-Release: 2%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -10,14 +10,12 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://lists.musicbrainz.org/pipermail/musicbrainz-devel/2006-September/001856.html
-%define pkglibdir %{_libdir}/tunepimp-0.5
-Patch1: libtunepimp-0.5.1-PLUGIN_DIR.patch
+%define pkglibdir %{_libdir}/tunepimp
 
+BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: libvorbis-devel
 BuildRequires: flac-devel
-BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: zlib-devel
 BuildRequires: taglib-devel
 BuildRequires: readline-devel ncurses-devel
@@ -56,8 +54,6 @@
 %prep
 %setup -q -n libtunepimp-%{version}
 
-%patch1 -p1 -b .PLUGIN_DIR
-
 
 %build
 %configure \
@@ -111,6 +107,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
+- 0.5.2
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-2
 - drop -tools subpkg
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Sep 2006 18:06:03 -0000	1.5
+++ sources	2 Oct 2006 16:29:30 -0000	1.6
@@ -1 +1 @@
-51809faed41fb8f12be15846214abc3a  libtunepimp-0.5.1.tar.gz
+655b254539013f5e7fe50ac035c26dcb  libtunepimp-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 16:30:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:30:27 -0700
Subject: rpms/maxima/FC-5 maxima-5.10.0-xdg_open.patch, NONE, 1.1 maxima.spec,
	1.29, 1.30 maxima-5.9.2-htmlview.patch, 1.1, NONE
Message-ID: <200610021630.k92GUTl4000695@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv673

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.10.0-xdg_open.patch 
Removed Files:
	maxima-5.9.2-htmlview.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
- -gui: htmlview -> xdg-open,Requires: xdg-utils


maxima-5.10.0-xdg_open.patch:

--- NEW FILE maxima-5.10.0-xdg_open.patch ---
--- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2004-10-16 10:37:53.000000000 -0500
+++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-08-22 07:27:23.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- maxima.spec	27 Sep 2006 14:17:16 -0000	1.29
+++ maxima.spec	2 Oct 2006 16:30:27 -0000	1.30
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -44,7 +44,7 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.9.2-htmlview.patch
+Patch1: maxima-5.10.0-xdg_open.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
@@ -96,6 +96,8 @@
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
+Requires: xdg-utils
+#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -180,7 +182,7 @@
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%patch1 -p1 -b .htmlview
+%patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
 %if "%{?fedora}" > "3"
@@ -384,6 +386,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
+- -gui: htmlview -> xdg-open,Requires: xdg-utils
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17
 


--- maxima-5.9.2-htmlview.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 16:30:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:30:46 -0700
Subject: rpms/maxima/FC-4 maxima-5.10.0-xdg_open.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 maxima.spec, 1.23, 1.24 sources, 1.5,
	1.6 maxima-5.9.2-htmlview.patch, 1.1, NONE
Message-ID: <200610021630.k92GUmIV000766@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv741

Modified Files:
	.cvsignore maxima.spec sources 
Added Files:
	maxima-5.10.0-xdg_open.patch 
Removed Files:
	maxima-5.9.2-htmlview.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
- -gui: htmlview -> xdg-open,Requires: xdg-utils


maxima-5.10.0-xdg_open.patch:

--- NEW FILE maxima-5.10.0-xdg_open.patch ---
--- maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl.htmlview	2004-10-16 10:37:53.000000000 -0500
+++ maxima/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-08-22 07:27:23.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Apr 2006 17:32:12 -0000	1.5
+++ .cvsignore	2 Oct 2006 16:30:46 -0000	1.6
@@ -1,3 +1,3 @@
 maximabook-19-Sept-2004.pdf
 macref.pdf
-maxima-5.9.3.tar.gz
+maxima-5.10.0.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- maxima.spec	9 Jul 2006 19:15:27 -0000	1.23
+++ maxima.spec	2 Oct 2006 16:30:46 -0000	1.24
@@ -1,16 +1,21 @@
 
+%define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
+%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.3
+Version: 5.10.0
 
-Release: 5%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
-Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
+Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: %{ix86} x86_64 ppc
 
+%define maxima_ver %{version}%{?beta}
+
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
@@ -24,9 +29,9 @@
 
 %ifarch ppc
 %define default_lisp sbcl
-# clisp: http://bugzilla.redhat.com/bugzilla/166347
+# clisp: http://bugzilla.redhat.com/166347
 #define _enable_clisp --enable-clisp 
-# gcl:   http://bugzilla.redhat.com/bugzilla/167952
+# gcl:   http://bugzilla.redhat.com/167952
 #define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
@@ -39,17 +44,17 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.9.2-htmlview.patch
+Patch1: maxima-5.10.0-xdg_open.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.4-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
-Patch4: maxima-5.9.2-evince.patch
+Patch4: maxima-5.9.4-evince.patch
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
 # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
-Patch6: maxima-5.9.3-gcl-setarch.patch
+Patch6: maxima-5.9.4-gcl_setarch.patch
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -91,6 +96,8 @@
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
+Requires: xdg-utils
+#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -137,7 +144,7 @@
 BuildRequires: gcl
 Requires:  %{name} = %{version}
 %if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
+# See http://bugzilla.redhat.com/187647
 %define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
@@ -153,14 +160,14 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl 
+# almost any sbcl will do, but we want to be sure we're using the latest -- Rex
+BuildRequires: sbcl >= 0.9.17
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
 %if "%{?sbcl_ver}" >= "0.9"
-%define sbcl_ver2 >= %{sbcl_ver}
+Requires: sbcl = %{sbcl_ver}
 %endif
-Requires: sbcl %{?sbcl_ver2} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -170,12 +177,12 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{version}}
+%setup -q  -n %{name}%{!?cvs:-%{version}%{?beta}}
 
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%patch1 -p1 -b .htmlview
+%patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
 %if "%{?fedora}" > "3"
@@ -213,9 +220,9 @@
 
  install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf
 
- pushd info
-  texi2dvi --pdf maxima.texi
- popd
+# pushd info
+#  texi2dvi --pdf maxima.texi
+# popd
 
  pushd intromax
   pdflatex intromax.ltx
@@ -236,39 +243,34 @@
 # app icon
 install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/maxima.png
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" \
+  --add-category "X-Fedora" --vendor="fedora" \
   %{SOURCE2} 
 
-## emaxima
-# LaTeX style
+# emaxima LaTeX style
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.sty \
+cp -alf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/*.sty \
 	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
-# emacs
-install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/maxima/
-install -D -m644 -p %{SOURCE6} \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/maxima.el
-
-# xemacs
-install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/{maxima,site-start.d}
-cp -alf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.el \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs/*.lisp \
-	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/maxima/
-install -D -m644 -p %{SOURCE6} \
-	$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/maxima.el
+# (x)emacs
+install -D -m644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el
+
+for dir in %{emacs_sitelisp} %{xemacs_sitelisp} ; do
+  install -d -m755 $RPM_BUILD_ROOT$dir/{,site-start.d}
+  ln -s %{_datadir}/maxima/%{maxima_ver}/emacs $RPM_BUILD_ROOT$dir/maxima
+  for file in $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/*.el ; do
+    touch `dirname $file`/`basename $file .el`.elc
+  done
+  ln -s %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el $RPM_BUILD_ROOT$dir/site-start.d/
+  touch $RPM_BUILD_ROOT$dir/site-start.d/maxima-modes.elc
+done
 
 ## unwanted/unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
 rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
 # _enable_gcl: debuginfo (sometimes?) fails to get auto-created, so we'll help out
 touch debugfiles.list
@@ -292,6 +294,26 @@
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
+%triggerin -- emacs-common
+if [ -d %{emacs_sitelisp} ]; then
+  rm -rf %{emacs_sitelisp}/maxima   
+  ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs  %{emacs_sitelisp}/maxima ||:
+fi
+ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{emacs_sitelisp}/site-start.d/ ||:
+
+%triggerin -- xemacs-common
+if [ -d %{xemacs_sitelisp} ]; then
+  rm -rf %{xemacs_sitelisp}/maxima
+  ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs  %{xemacs_sitelisp}/maxima ||:
+fi
+ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||:
+
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
+
 
 
 %clean
@@ -300,72 +322,104 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README README.lisps
+%doc AUTHORS ChangeLog COPYING README README.lisps
 %doc doc/misc/ doc/implementation/
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %doc macref.pdf
-%doc %{_datadir}/maxima/%{version}/doc
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
-%dir %{_datadir}/maxima/%{version}
-%{_datadir}/maxima/%{version}/[a-c,f-r,t-w,y-z,A-Z]*
-%{_datadir}/maxima/%{version}/demo/
-%{_datadir}/maxima/%{version}/share/
+%dir %{_datadir}/maxima/%{maxima_ver}
+%{_datadir}/maxima/%{maxima_ver}/[a-c,f-r,t-w,y-z,A-Z]*
+%{_datadir}/maxima/%{maxima_ver}/demo/
+%doc %{_datadir}/maxima/%{maxima_ver}/doc
+%{_datadir}/maxima/%{maxima_ver}/share/
+%dir %{_libdir}/maxima/
+%dir %{_libdir}/maxima/%{maxima_ver}/
 %{_libexecdir}/maxima
 %{_infodir}/*.info*
 %{_mandir}/man1/maxima.*
-# emaxima     
-%{_datadir}/maxima/%{version}/emacs
-%{_datadir}/emacs/site-lisp/*
-%{_datadir}/xemacs/site-packages/*
 %{_datadir}/texmf/tex/latex/emaxima/
+%dir %{_datadir}/maxima/%{maxima_ver}/emacs
+%{_datadir}/maxima/%{maxima_ver}/emacs/emaxima.*
+%{_datadir}/maxima/%{maxima_ver}/emacs/*.el
+%ghost %{_datadir}/maxima/%{maxima_ver}/emacs/*.elc
+%dir %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/
+%{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/*.el
+%ghost %{emacs_sitelisp}
+%ghost %{xemacs_sitelisp}
 
 %files src
 %defattr(-,root,root,-)
-%{_datadir}/maxima/%{version}/src/
+%{_datadir}/maxima/%{maxima_ver}/src/
 
 %files gui
 %defattr(-,root,root,-)
 %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}/xmaxima
+%{_datadir}/maxima/%{maxima_ver}/xmaxima/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-clisp
+%{_libdir}/maxima/%{maxima_ver}/binary-clisp
 %endif
 
 %if "%{?_enable_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-cmucl
+%{_libdir}/maxima/%{maxima_ver}/binary-cmucl
 %endif
 
 %if "%{?_enable_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-gcl
+%{_libdir}/maxima/%{maxima_ver}/binary-gcl
 %endif
 
 %if "%{?_enable_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root,-)
-%dir %{_libdir}/maxima/
-%dir %{_libdir}/maxima/%{version}/
-%{_libdir}/maxima/%{version}/binary-sbcl
+%{_libdir}/maxima/%{maxima_ver}/binary-sbcl
 %endif
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
+- -gui: htmlview -> xdg-open,Requires: xdg-utils
+
+* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
+- respin for sbcl-0.9.17
+
+* Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-1
+- 5.10.0
+
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.10.rc4
+- respin for new(er) sbcl (#207063)
+
+* Wed Sep 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.8.rc4
+- 5.9.3.99rc4
+
+* Wed Sep 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.7.rc3
+- 5.9.3.99rc3
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.6.rc2
+- fc6 respin
+
+* Sun Aug 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.5.rc2
+- respin (against newer sbcl)
+
+* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.4.rc2
+- update gcl_setarch patch
+
+* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.3.rc2
+- 5.9.3.99rc2
+
+* Tue Aug 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.1.rc1
+- 5.9.3.99rc1
+- - %ghost (x)emacs site-lisp bits (hint from fedora-rpmdevtools)
+
 * Mon Jun 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-5
 - respin for sbcl-0.9.14 (and relax Requires = to >= )
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Apr 2006 17:32:12 -0000	1.5
+++ sources	2 Oct 2006 16:30:46 -0000	1.6
@@ -1,3 +1,3 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
-e6388632d91722bb0607914bdabc72f6  maxima-5.9.3.tar.gz
+1e7f5ecabf990f350c5f662f106d83b7  maxima-5.10.0.tar.gz


--- maxima-5.9.2-htmlview.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 16:55:41 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 09:55:41 -0700
Subject: rpms/maxima/devel maxima-5.10.0-xdg-utils.patch, NONE,
	1.1 maxima.spec, 1.41, 1.42 maxima-5.10.0-xdg_open.patch, 1.1,
	NONE maxima-5.9.4-evince.patch, 1.1, NONE
Message-ID: <200610021655.k92GthcO001049@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1029

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.10.0-xdg-utils.patch 
Removed Files:
	maxima-5.10.0-xdg_open.patch maxima-5.9.4-evince.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
- update xdg-utils patch (for .dvi handling too)


maxima-5.10.0-xdg-utils.patch:

--- NEW FILE maxima-5.10.0-xdg-utils.patch ---
--- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.xdg_open	2006-09-11 10:38:01.000000000 -0500
+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-10-02 11:46:43.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }
--- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl.xdg_open	2006-08-03 08:21:57.000000000 -0500
+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-10-02 11:48:30.000000000 -0500
@@ -143,9 +143,9 @@
     image/gif  netmath
     image/png  netmath
     image/jpeg netmath
-    application/postscript "ghostview -safer %s"
-    application/pdf "acroread %s"
-    application/x-dvi "xdvi %s"
+    application/postscript "xdg-open %s"
+    application/pdf "xdg-open %s"
+    application/x-dvi "xdg-open %s"
 }
 set maxima_priv(imagecounter) 0
 
--- maxima-5.10.0/src/plot.lisp.xdg_open	2006-08-26 06:13:40.000000000 -0500
+++ maxima-5.10.0/src/plot.lisp	2006-10-02 11:46:43.000000000 -0500
@@ -75,7 +75,7 @@
                         ((mlist) $plot_realpart nil)
                         ))
 
-(defvar $viewps_command  "(ghostview \"~a\")")
+(defvar $viewps_command  "(xdg-open \"~a\")")
 
 ;; $plot_realpart option is false by default but *plot-realpart* is true because coerce-float-fun
 ;; is used outside of plot package too.


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- maxima.spec	2 Oct 2006 16:01:44 -0000	1.41
+++ maxima.spec	2 Oct 2006 16:55:41 -0000	1.42
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -44,13 +44,11 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.10.0-xdg_open.patch
+Patch1: maxima-5.10.0-xdg-utils.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
 Patch3: maxima-5.9.4-sbcl-disable-debugger.patch
-# ghostview -> evince (ps/pdf viewer)
-Patch4: maxima-5.9.4-evince.patch
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
 # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
@@ -97,7 +95,6 @@
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
 Requires: xdg-utils
-#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -185,9 +182,6 @@
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
-%if "%{?fedora}" > "3"
-%patch4 -p1 -b .evince
-%endif
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -386,8 +380,11 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
+- update xdg-utils patch (for .dvi handling too)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
-- -gui: htmlview -> xdg-open,Requires: xdg-utils
+- -gui: htmlview -> xdg-open, Requires: xdg-utils
 
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17


--- maxima-5.10.0-xdg_open.patch DELETED ---


--- maxima-5.9.4-evince.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 17:04:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 10:04:40 -0700
Subject: rpms/libassuan/devel libassuan.spec,1.16,1.17
Message-ID: <200610021704.k92H4gLQ004185@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4142

Modified Files:
	libassuan.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.ne> - 0.9.0-3
- respin



Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libassuan.spec	26 Sep 2006 16:47:57 -0000	1.16
+++ libassuan.spec	2 Oct 2006 17:04:38 -0000	1.17
@@ -2,7 +2,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
 Version: 0.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPL
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.ne> - 0.9.0-3
+- respin
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net - 0.9.0-2
 - -devel: Provides: %%name-static
 - 0.9.0



From fedora-extras-commits at redhat.com  Mon Oct  2 17:06:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 10:06:27 -0700
Subject: rpms/factory/devel factory.spec,1.16,1.17
Message-ID: <200610021706.k92H6T1w004604@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4579

Modified Files:
	factory.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-10
- respin



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- factory.spec	28 Aug 2006 14:57:44 -0000	1.16
+++ factory.spec	2 Oct 2006 17:06:27 -0000	1.17
@@ -2,7 +2,7 @@
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
 Version: 2.0.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: GPL
 URL:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-10
+- respin
+
 * Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-9
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Mon Oct  2 17:08:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 10:08:37 -0700
Subject: rpms/libksba/devel libksba.spec,1.22,1.23
Message-ID: <200610021708.k92H8dsZ005122@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libksba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5094

Modified Files:
	libksba.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- respin



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libksba.spec	7 Sep 2006 20:01:42 -0000	1.22
+++ libksba.spec	2 Oct 2006 17:08:37 -0000	1.23
@@ -2,7 +2,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 1.0.0 
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.0-1
 - 1.0.0
 



From fedora-extras-commits at redhat.com  Mon Oct  2 17:10:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 10:10:45 -0700
Subject: rpms/libfac/devel libfac.spec,1.13,1.14
Message-ID: <200610021710.k92HAllo005569@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libfac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5544

Modified Files:
	libfac.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-7
- respin



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/devel/libfac.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libfac.spec	29 Aug 2006 17:44:21 -0000	1.13
+++ libfac.spec	2 Oct 2006 17:10:45 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: An extension to Singular-factory
 Name:    libfac
 Version: 2.0.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-7
+- respin
+
 * Tue Jul 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.5-6
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Mon Oct  2 17:12:46 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Mon,  2 Oct 2006 10:12:46 -0700
Subject: rpms/inotify-tools/devel .cvsignore, 1.4, 1.5 inotify-tools.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200610021712.k92HCmfY006009@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/inotify-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5958

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
Update to 2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2006 10:33:50 -0000	1.4
+++ .cvsignore	2 Oct 2006 17:12:46 -0000	1.5
@@ -1 +1 @@
-inotify-tools-2.4.tar.gz
+inotify-tools-2.5.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/inotify-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- inotify-tools.spec	9 Sep 2006 10:33:50 -0000	1.3
+++ inotify-tools.spec	2 Oct 2006 17:12:46 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.4
+Version:        2.5
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.5-1
+- Update to 2.5
+
 * Sat Sep  9 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.4-1
 - Update to 2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2006 10:33:50 -0000	1.4
+++ sources	2 Oct 2006 17:12:46 -0000	1.5
@@ -1 +1 @@
-dd27bea5289ac78dbd61afc5c2ebc6f3  inotify-tools-2.4.tar.gz
+80994b6637c9a4a94a1eddf2b8885603  inotify-tools-2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 17:14:30 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Mon,  2 Oct 2006 10:14:30 -0700
Subject: rpms/inotify-tools/FC-5 .cvsignore, 1.4, 1.5 inotify-tools.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610021714.k92HEWCQ006417@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/inotify-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6362

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
Update to 2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2006 10:35:07 -0000	1.4
+++ .cvsignore	2 Oct 2006 17:14:30 -0000	1.5
@@ -1 +1 @@
-inotify-tools-2.4.tar.gz
+inotify-tools-2.5.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/inotify-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- inotify-tools.spec	9 Sep 2006 10:35:07 -0000	1.3
+++ inotify-tools.spec	2 Oct 2006 17:14:30 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.4
+Version:        2.5
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.5-1
+- Update to 2.5
+
 * Sat Sep  9 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.4-1
 - Update to 2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2006 10:35:07 -0000	1.4
+++ sources	2 Oct 2006 17:14:30 -0000	1.5
@@ -1 +1 @@
-dd27bea5289ac78dbd61afc5c2ebc6f3  inotify-tools-2.4.tar.gz
+80994b6637c9a4a94a1eddf2b8885603  inotify-tools-2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 17:53:13 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon,  2 Oct 2006 10:53:13 -0700
Subject: comps comps-fe6.xml.in,1.171,1.172
Message-ID: <200610021753.k92HrFGV007989@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7972

Modified Files:
	comps-fe6.xml.in 
Log Message:
add all my packages: emelfm2, gnome-applet-timer, gnome-ppp and xfce4-*-plugins


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- comps-fe6.xml.in	1 Oct 2006 05:00:54 -0000	1.171
+++ comps-fe6.xml.in	2 Oct 2006 17:53:13 -0000	1.172
@@ -177,6 +177,7 @@
       <packagereq type="optional">qgit</packagereq>
       <packagereq type="optional">quilt</packagereq>
       <packagereq type="optional">rapidsvn</packagereq>
+      <packagereq type="optional">regexxer</packagereq>
       <packagereq type="optional">rpmdevtools</packagereq>
       <packagereq type="optional">rpmlint</packagereq>
       <packagereq type="optional">smarteiffel</packagereq>
@@ -447,6 +448,7 @@
       <packagereq type="optional">gnome-applet-netspeed</packagereq>
       <packagereq type="optional">gnome-applet-rhythmbox</packagereq>
       <packagereq type="optional">gnome-applet-sensors</packagereq>
+      <packagereq type="optional">gnome-applet-timer</packagereq>
       <packagereq type="optional">gnome-theme-clearlooks-bigpack</packagereq>
       <packagereq type="optional">gnome-themes-extras</packagereq>
       <packagereq type="optional">gnotime</packagereq>
@@ -527,6 +529,7 @@
       <packagereq type="optional">galeon</packagereq>
       <packagereq type="optional">gg2</packagereq>
       <packagereq type="optional">gnome-blog</packagereq>
+      <packagereq type="optional">gnome-ppp</packagereq>
       <packagereq type="optional">gnome-telnet</packagereq>
       <packagereq type="optional">gnome-translate</packagereq>
       <packagereq type="optional">gnubiff</packagereq>
@@ -888,6 +891,7 @@
       <packagereq type="optional">dkms</packagereq>
       <packagereq type="optional">ebtables</packagereq>
       <packagereq type="optional">ed2k_hash</packagereq>
+      <packagereq type="optional">emelfm2</packagereq>
       <packagereq type="optional">enca</packagereq>
       <packagereq type="optional">environment-modules</packagereq>
       <packagereq type="optional">epylog</packagereq>
@@ -1103,14 +1107,35 @@
       <packagereq type="default">xfce4-appfinder</packagereq>
       <packagereq type="default">xfce4-icon-theme</packagereq>
       <packagereq type="default">xfce4-iconbox</packagereq>
+      <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
       <packagereq type="default">xfce4-mixer</packagereq>
       <packagereq type="default">xfce4-systray</packagereq>
       <packagereq type="default">xfce4-trigger-launcher</packagereq>
       <packagereq type="default">xffm-icons</packagereq>
       <packagereq type="default">xfprint</packagereq>
       <packagereq type="optional">xfcalendar</packagereq>
+      <packagereq type="optional">xfce4-battery-plugin</packagereq>
+      <packagereq type="optional">xfce4-clipman-plugin</packagereq>
+      <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
+      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
+      <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
+      <packagereq type="optional">xfce4-genmon-plugin</packagereq>
+      <packagereq type="optional">xfce4-minicmd-plugin</packagereq>
+      <packagereq type="optional">xfce4-mount-plugin</packagereq>
+      <packagereq type="optional">xfce4-netload-plugin</packagereq>
+      <packagereq type="optional">xfce4-notes-plugin</packagereq>
+      <packagereq type="optional">xfce4-quicklauncher-plugin</packagereq>
+      <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
+      <packagereq type="optional">xfce4-sensors-plugin</packagereq>
+      <packagereq type="optional">xfce4-systemload-plugin</packagereq>
+      <packagereq type="optional">xfce4-taskmanager</packagereq>
       <packagereq type="optional">xfce4-toys</packagereq>
       <packagereq type="optional">xfwm4-themes</packagereq>
+      <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
+      <packagereq type="optional">xfce4-weather-plugin</packagereq>
+      <packagereq type="optional">xfce4-websearch-plugin</packagereq>
+      <packagereq type="optional">xfce4-xkb-plugin</packagereq>
+      <packagereq type="optional">xfce4-xmms-plugin</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Mon Oct  2 18:17:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:17:12 -0700
Subject: rpms/em8300-kmod/FC-5 em8300-oss-default.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 em8300-adv7170-wss.patch, 1.1, 1.2 em8300-kmod.spec,
	1.4, 1.5 sources, 1.2, 1.3 em8300-kmod-2617.patch, 1.1, NONE
Message-ID: <200610021817.k92IHE6d010986@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957

Modified Files:
	.cvsignore em8300-adv7170-wss.patch em8300-kmod.spec sources 
Added Files:
	em8300-oss-default.patch 
Removed Files:
	em8300-kmod-2617.patch 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0
- 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
- Patch to default to OSS for backwards compatibility.
- Drop early FC5 hacks.


em8300-oss-default.patch:

--- NEW FILE em8300-oss-default.patch ---
Default to OSS in 0.16.0-rc1 for backwards compatibility.

Index: modules/em8300_main.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_main.c,v
retrieving revision 1.116
diff -u -r1.116 em8300_main.c
--- modules/em8300_main.c	13 Sep 2006 15:34:37 -0000	1.116
+++ modules/em8300_main.c	15 Sep 2006 18:27:58 -0000
@@ -180,10 +180,10 @@
 	[ AUDIO_DRIVER_ALSA ] = "alsa",
 };
 
-#if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
-audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_ALSA };
-#elif defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
+#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
 audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_OSS };
+#elif defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
+audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_ALSA };
 #else
 audio_driver_t audio_driver_nr[EM8300_MAX] = { [ 0 ... EM8300_MAX-1 ] = AUDIO_DRIVER_OSSLIKE };
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2006 20:16:26 -0000	1.2
+++ .cvsignore	2 Oct 2006 18:17:12 -0000	1.3
@@ -1 +1 @@
-em8300-nofirmware-0.15.3.tar.gz
+em8300-nofirmware-0.16.0-rc1.tar.bz2

em8300-adv7170-wss.patch:

Index: em8300-adv7170-wss.patch
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-adv7170-wss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- em8300-adv7170-wss.patch	22 Jul 2006 20:16:26 -0000	1.1
+++ em8300-adv7170-wss.patch	2 Oct 2006 18:17:12 -0000	1.2
@@ -1,5 +1,5 @@
 http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Updated to apply as of 0.15.3+cvs20060626.
+Updated to apply as of 0.16.0-rc1.
 
 Index: em8300setup/em8300setup.c
 ===================================================================
@@ -7,7 +7,7 @@
 retrieving revision 1.5
 diff -u -r1.5 em8300setup.c
 --- em8300setup/em8300setup.c	19 Oct 2005 22:15:16 -0000	1.5
-+++ em8300setup/em8300setup.c	26 Jun 2006 13:44:47 -0000
++++ em8300setup/em8300setup.c	15 Sep 2006 18:15:00 -0000
 @@ -114,7 +114,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
@@ -79,10 +79,10 @@
 Index: include/linux/em8300.h
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
-retrieving revision 1.41
-diff -u -r1.41 em8300.h
---- include/linux/em8300.h	10 Apr 2006 22:31:14 -0000	1.41
-+++ include/linux/em8300.h	26 Jun 2006 13:44:48 -0000
+retrieving revision 1.42
+diff -u -r1.42 em8300.h
+--- include/linux/em8300.h	13 Sep 2006 15:28:36 -0000	1.42
++++ include/linux/em8300.h	15 Sep 2006 18:15:01 -0000
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -108,7 +108,7 @@
  #define EM8300_VIDEOMODE_PAL	0
  #define EM8300_VIDEOMODE_PAL60	1
  #define EM8300_VIDEOMODE_NTSC	2
-@@ -467,6 +478,7 @@
+@@ -465,6 +476,7 @@
  int em8300_control_ioctl(struct em8300_s *em, int cmd, unsigned long arg);
  int em8300_ioctl_setvideomode(struct em8300_s *em, int mode);
  int em8300_ioctl_setaspectratio(struct em8300_s *em, int ratio);
@@ -122,7 +122,7 @@
 retrieving revision 1.53
 diff -u -r1.53 adv717x.c
 --- modules/adv717x.c	12 May 2006 22:04:56 -0000	1.53
-+++ modules/adv717x.c	26 Jun 2006 13:44:48 -0000
++++ modules/adv717x.c	15 Sep 2006 18:15:01 -0000
 @@ -219,6 +219,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
@@ -249,14 +249,14 @@
 Index: modules/em8300_ioctl.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.50
-diff -u -r1.50 em8300_ioctl.c
---- modules/em8300_ioctl.c	10 Apr 2006 22:31:14 -0000	1.50
-+++ modules/em8300_ioctl.c	26 Jun 2006 13:44:48 -0000
-@@ -203,4 +203,17 @@
- 				return -EFAULT;
+retrieving revision 1.51
+diff -u -r1.51 em8300_ioctl.c
+--- modules/em8300_ioctl.c	13 Sep 2006 15:28:37 -0000	1.51
++++ modules/em8300_ioctl.c	15 Sep 2006 18:15:01 -0000
+@@ -183,6 +183,20 @@
  		}
  		break;
+ 
 +	case _IOC_NR(EM8300_IOCTL_SET_WSS):
 +		em8300_require_ucode(em);
 +
@@ -270,8 +270,11 @@
 +		}
 +
 +		break;
++
+ 	case _IOC_NR(EM8300_IOCTL_SET_PLAYMODE):
+ 		em8300_require_ucode(em);
  
-@@ -604,6 +619,52 @@
+@@ -617,6 +631,52 @@
  	return 0;
  }
  
@@ -330,7 +333,7 @@
 retrieving revision 1.8
 diff -u -r1.8 encoder.h
 --- modules/encoder.h	14 Jan 2002 21:41:31 -0000	1.8
-+++ modules/encoder.h	26 Jun 2006 13:44:48 -0000
++++ modules/encoder.h	15 Sep 2006 18:15:01 -0000
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -353,7 +356,7 @@
 retrieving revision 1.3
 diff -u -r1.3 em8300setup.1
 --- em8300setup/em8300setup.1	19 Oct 2005 22:15:16 -0000	1.3
-+++ em8300setup/em8300setup.1	26 Jun 2006 13:44:47 -0000
++++ em8300setup/em8300setup.1	15 Sep 2006 18:15:00 -0000
 @@ -26,6 +26,33 @@
  \fB-o\fR, \fB-w\fR
  Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- em8300-kmod.spec	15 Sep 2006 06:53:45 -0000	1.4
+++ em8300-kmod.spec	2 Oct 2006 18:17:12 -0000	1.5
@@ -9,32 +9,32 @@
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
 
-%define upvar ""
 %ifarch i686 ppc
-%define smpvar smp
+%define smp smp
 %endif
 %ifarch i686 x86_64
-%define xenvar xen xen0
-%define kdumpvar kdump
+%define xen xen xen0
+%define kdump kdump
 %endif
-%{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?xenvar} %{?kdumpvar}}
+%{!?kvariants: %define kvariants "" %{?smp} %{?xen} %{?kdump}}
 
 
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version:        0.15.3
-Release:        8.%(echo %{kverrel} | tr - _)
+Version:        0.16.0
+Release:        0.0.rc1.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
-Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
+#Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# with modules/em8300.uc removed
+Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
-Patch1:         %{name}-2617.patch
+Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sed >= 3.95
-
 ExclusiveArch:  i586 i686 x86_64 ppc
 
 %description
@@ -44,21 +44,21 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}
-%patch1 -p1
+cd %{kmod_name}-%{version}-rc1
 %patch0 -p0
-sed -i -e s/2,6,16/2,6,15/ modules/*.c # FC5 pre-2.6.16 marked as 2.6.15 hack
+%patch1 -p0
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
 done
 
 
 %build
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
     ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
-    make %{?_smp_mflags} V=1 KERNEL_LOCATION=$ks && \
+    make %{?_smp_mflags} V=1 KERNVER=$kv KERNEL_LOCATION=$ks && \
     cd ../..
 done
 
@@ -66,9 +66,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNEL_LOCATION=$ks MODINST=extra/%{kmod_name}
+        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
 done
 
 
@@ -77,6 +76,11 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0
+- 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
+- Patch to default to OSS for backwards compatibility.
+- Drop early FC5 hacks.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.15.3-8
 - Rebuild for kernel 2.6.17_1.2187_FC5.
 - Build for the xen variant too.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2006 20:16:26 -0000	1.2
+++ sources	2 Oct 2006 18:17:12 -0000	1.3
@@ -1 +1 @@
-7e19428a267f645e7d9023f4d2c24a2c  em8300-nofirmware-0.15.3.tar.gz
+969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2


--- em8300-kmod-2617.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 18:19:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:19:35 -0700
Subject: rpms/em8300/FC-5 em8300.console.perms, NONE, 1.1 .cvsignore, 1.2,
	1.3 em8300-adv7170-wss.patch, 1.1, 1.2 em8300.spec, 1.1,
	1.2 sources, 1.2, 1.3 em8300-README-console.perms, 1.1, NONE
Message-ID: <200610021819.k92IJbQ1011040@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11013

Modified Files:
	.cvsignore em8300-adv7170-wss.patch em8300.spec sources 
Added Files:
	em8300.console.perms 
Removed Files:
	em8300-README-console.perms 
Log Message:
* Sat Sep 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.2.rc1
- Install ALSA config file.
- Clean up no longer needed things from specfile.

* Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
- 0.16.0-rc1.
- Add console.perms snippet, commented out for now due to #206700.



--- NEW FILE em8300.console.perms ---
#<em8300>=/dev/em8300*
#<console>  0660 <em8300>     0660 root.video


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2006 20:14:05 -0000	1.2
+++ .cvsignore	2 Oct 2006 18:19:34 -0000	1.3
@@ -1 +1,2 @@
-em8300-nofirmware-0.15.3.tar.gz
+em8300-nofirmware-0.16.0-rc1.tar.bz2
+EM8300.conf

em8300-adv7170-wss.patch:

Index: em8300-adv7170-wss.patch
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-5/em8300-adv7170-wss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- em8300-adv7170-wss.patch	22 Jul 2006 20:14:05 -0000	1.1
+++ em8300-adv7170-wss.patch	2 Oct 2006 18:19:34 -0000	1.2
@@ -1,5 +1,5 @@
 http://sourceforge.net/mailarchive/forum.php?thread_id=6061108&forum_id=7173
-Updated to apply cleanly as of 0.15.2rc1.
+Updated to apply as of 0.16.0-rc1.
 
 Index: em8300setup/em8300setup.c
 ===================================================================
@@ -7,7 +7,7 @@
 retrieving revision 1.5
 diff -u -r1.5 em8300setup.c
 --- em8300setup/em8300setup.c	19 Oct 2005 22:15:16 -0000	1.5
-+++ em8300setup/em8300setup.c	5 Nov 2005 08:32:24 -0000
++++ em8300setup/em8300setup.c	15 Sep 2006 18:15:00 -0000
 @@ -114,7 +114,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
@@ -79,10 +79,10 @@
 Index: include/linux/em8300.h
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
-retrieving revision 1.39
-diff -u -r1.39 em8300.h
---- include/linux/em8300.h	19 Oct 2005 22:15:16 -0000	1.39
-+++ include/linux/em8300.h	5 Nov 2005 08:32:24 -0000
+retrieving revision 1.42
+diff -u -r1.42 em8300.h
+--- include/linux/em8300.h	13 Sep 2006 15:28:36 -0000	1.42
++++ include/linux/em8300.h	15 Sep 2006 18:15:01 -0000
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -108,7 +108,7 @@
  #define EM8300_VIDEOMODE_PAL	0
  #define EM8300_VIDEOMODE_PAL60	1
  #define EM8300_VIDEOMODE_NTSC	2
-@@ -455,6 +466,7 @@
+@@ -465,6 +476,7 @@
  int em8300_control_ioctl(struct em8300_s *em, int cmd, unsigned long arg);
  int em8300_ioctl_setvideomode(struct em8300_s *em, int mode);
  int em8300_ioctl_setaspectratio(struct em8300_s *em, int ratio);
@@ -119,11 +119,11 @@
 Index: modules/adv717x.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/adv717x.c,v
-retrieving revision 1.49
-diff -u -r1.49 adv717x.c
---- modules/adv717x.c	5 Nov 2005 01:12:13 -0000	1.49
-+++ modules/adv717x.c	5 Nov 2005 08:32:25 -0000
-@@ -192,6 +192,7 @@
+retrieving revision 1.53
+diff -u -r1.53 adv717x.c
+--- modules/adv717x.c	12 May 2006 22:04:56 -0000	1.53
++++ modules/adv717x.c	15 Sep 2006 18:15:01 -0000
+@@ -219,6 +219,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
  	int pd_adj_ntsc;
@@ -131,10 +131,10 @@
  
  	unsigned char config[32];
  	int configlen;
-@@ -398,6 +399,63 @@
+@@ -431,6 +432,63 @@
  		/* ADV7170/1 RGB sync: MR42 (register 4, bit 2) */
  		SET_REG(tmpconfig[ADV7170_REG_MR4], 2,
- 				ModeInfo[data->out_mode].sync_all);
+ 				mode_info[data->out_mode].conf.sync_all);
 +
 +		switch (data->wsscode) {
 +		case 0x08:
@@ -195,7 +195,7 @@
  		break;
  	}
  	/* ADV7170/1/5A/6A non-interlace: MR10 (register 1, bit 0) */
-@@ -559,6 +617,7 @@
+@@ -592,6 +650,7 @@
  	data->out_mode = output_mode_nr[em->card_nr];
  	if (data->out_mode < 0 || data->out_mode >= MODE_MAX)
  		data->out_mode = 0;
@@ -203,7 +203,7 @@
  
  	adv717x_setmode(ENCODER_MODE_PAL60, client);
  
-@@ -664,6 +723,42 @@
+@@ -697,6 +756,42 @@
  		data->enableoutput = (long int) arg;
  		adv717x_update(client);
  		break;
@@ -249,11 +249,11 @@
 Index: modules/em8300_ioctl.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.49
-diff -u -r1.49 em8300_ioctl.c
---- modules/em8300_ioctl.c	19 Oct 2005 22:15:16 -0000	1.49
-+++ modules/em8300_ioctl.c	5 Nov 2005 08:32:25 -0000
-@@ -204,6 +204,20 @@
+retrieving revision 1.51
+diff -u -r1.51 em8300_ioctl.c
+--- modules/em8300_ioctl.c	13 Sep 2006 15:28:37 -0000	1.51
++++ modules/em8300_ioctl.c	15 Sep 2006 18:15:01 -0000
+@@ -183,6 +183,20 @@
  		}
  		break;
  
@@ -271,10 +271,10 @@
 +
 +		break;
 +
- 	case _IOC_NR(EM8300_IOCTL_GET_AUDIOMODE):
+ 	case _IOC_NR(EM8300_IOCTL_SET_PLAYMODE):
  		em8300_require_ucode(em);
  
-@@ -590,6 +604,52 @@
+@@ -617,6 +631,52 @@
  	return 0;
  }
  
@@ -333,7 +333,7 @@
 retrieving revision 1.8
 diff -u -r1.8 encoder.h
 --- modules/encoder.h	14 Jan 2002 21:41:31 -0000	1.8
-+++ modules/encoder.h	5 Nov 2005 08:32:25 -0000
++++ modules/encoder.h	15 Sep 2006 18:15:01 -0000
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -356,7 +356,7 @@
 retrieving revision 1.3
 diff -u -r1.3 em8300setup.1
 --- em8300setup/em8300setup.1	19 Oct 2005 22:15:16 -0000	1.3
-+++ em8300setup/em8300setup.1	5 Nov 2005 08:32:24 -0000
++++ em8300setup/em8300setup.1	15 Sep 2006 18:15:00 -0000
 @@ -26,6 +26,33 @@
  \fB-o\fR, \fB-w\fR
  Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).


Index: em8300.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-5/em8300.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- em8300.spec	22 Jul 2006 20:14:05 -0000	1.1
+++ em8300.spec	2 Oct 2006 18:19:34 -0000	1.2
@@ -1,14 +1,18 @@
 Name:           em8300
-Version:        0.15.3
-Release:        4%{?dist}
+Version:        0.16.0
+Release:        0.2.rc1%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
-Source0:        http://download.sourceforge.net/dxr3/%{name}-nofirmware-%{version}.tar.gz
-Source1:        http://cachalot.mine.nu/src/dxr3/em8300-README-console.perms
+#Source0:        http://dl.sf.net/dxr3/%{name}-nofirmware-%{version}.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# with modules/em8300.uc removed
+Source0:        %{name}-nofirmware-%{version}-rc1.tar.bz2
+Source1:        %{name}.console.perms
 Source2:        http://cachalot.mine.nu/src/dxr3/em8300-README-modprobe.conf
+Source3:        http://dxr3.cvs.sourceforge.net/*checkout*/dxr3/em8300/modules/EM8300.conf
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,6 +20,8 @@
 BuildRequires:  desktop-file-utils
 Requires:       em8300-kmod >= %{version}
 Requires:       udev
+Requires:       %{_sysconfdir}/alsa/cards
+Requires:       %{_sysconfdir}/security/console.perms.d
 Requires(pre):  %{_sbindir}/groupadd
 Provides:       em8300-kmod-common = %{version}-%{release}
 
@@ -41,12 +47,11 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 %patch0
-install -pm 644 %{SOURCE1} README-console.perms
 install -pm 644 %{SOURCE2} README-modprobe.conf
+install -pm 644 %{SOURCE3} modules/EM8300.conf
 echo "Icon=redhat-sound_video" >> overlay/dxr3view.desktop
-sed -i -e 's/^install-data-am:.*/install-data-am:/' Makefile.*
 sed -i -e 's/microcode_extract.pl/em8300-mc_ex/' scripts/microcode_extract.pl
 
 
@@ -71,11 +76,14 @@
 install -Dpm 644 dhc/dhc.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/dhc.xpm
 
+install -Dpm 644 modules/EM8300.conf \
+  $RPM_BUILD_ROOT%{_sysconfdir}/alsa/cards/EM8300.conf
+
 install -Dpm 644 modules/em8300-udev.rules \
   $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-%{name}.rules
 
-# Already done by the modules and em8300setup:
-rm -f $RPM_BUILD_ROOT%{_datadir}/em8300/microcode_upload.pl
+install -Dpm 644 %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-%{name}.perms
 
 mv $RPM_BUILD_ROOT%{_datadir}/em8300/microcode_extract.pl \
   $RPM_BUILD_ROOT%{_bindir}/em8300-mc_ex
@@ -98,7 +106,9 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README* modules/README-modoptions
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
+%config(noreplace) %{_sysconfdir}/alsa/cards/EM8300.conf
 %{_bindir}/em8300setup
 %{_mandir}/man1/em8300setup.1*
 
@@ -119,6 +129,14 @@
 
 
 %changelog
+* Sat Sep 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.2.rc1
+- Install ALSA config file.
+- Clean up no longer needed things from specfile.
+
+* Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
+- 0.16.0-rc1.
+- Add console.perms snippet, commented out for now due to #206700.
+
 * Tue Jul 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.15.3-4
 - Require >= em8300-kmod, not = kmod-em8300 (#189400).
 - Move microcode extractor to -utils as em8300-mc_ex (like Debian) (#189400).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2006 20:14:05 -0000	1.2
+++ sources	2 Oct 2006 18:19:34 -0000	1.3
@@ -1 +1,2 @@
-7e19428a267f645e7d9023f4d2c24a2c  em8300-nofirmware-0.15.3.tar.gz
+969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b4936b2535abe48d2e8e866f63102b3c  EM8300.conf


--- em8300-README-console.perms DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  2 18:35:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:35:33 -0700
Subject: rpms/dvb-apps/devel dvb-apps.spec,1.8,1.9
Message-ID: <200610021835.k92IZZpS011217@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/dvb-apps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11200

Modified Files:
	dvb-apps.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.1-7
- Rebuild.



Index: dvb-apps.spec
===================================================================
RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dvb-apps.spec	23 Sep 2006 18:16:03 -0000	1.8
+++ dvb-apps.spec	2 Oct 2006 18:35:33 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           dvb-apps
 Version:        1.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Utility, demo and test applications using the Linux DVB API
 
 Group:          Applications/Multimedia
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.1-7
+- Rebuild.
+
 * Sat Sep 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.1-6
 - Include updated set of initial tuning data files from upstream hg (#203328).
 



From fedora-extras-commits at redhat.com  Mon Oct  2 18:36:30 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:36:30 -0700
Subject: rpms/em8300/devel em8300.spec,1.4,1.5
Message-ID: <200610021836.k92IaWW7011287@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11270

Modified Files:
	em8300.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
- Rebuild.



Index: em8300.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300/devel/em8300.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- em8300.spec	16 Sep 2006 12:58:06 -0000	1.4
+++ em8300.spec	2 Oct 2006 18:36:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           em8300
 Version:        0.16.0
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc1%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
+- Rebuild.
+
 * Sat Sep 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.2.rc1
 - Install ALSA config file.
 - Clean up no longer needed things from specfile.



From fedora-extras-commits at redhat.com  Mon Oct  2 18:37:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:37:39 -0700
Subject: rpms/kid3/devel kid3.spec,1.12,1.13
Message-ID: <200610021837.k92Ibffs011358@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kid3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11341

Modified Files:
	kid3.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-4
- Rebuild.



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kid3.spec	26 Sep 2006 21:46:49 -0000	1.12
+++ kid3.spec	2 Oct 2006 18:37:39 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           kid3
 Version:        0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-4
+- Rebuild.
+
 * Wed Sep 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-3
 - Disable musicbrainz support by default, not ready for tunepimp 0.5 yet.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 18:40:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:40:01 -0700
Subject: rpms/mach/devel mach.spec,1.9,1.10
Message-ID: <200610021840.k92Ie3bp011431@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11414

Modified Files:
	mach.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.0-3
- Rebuild.



Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/mach.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mach.spec	19 Sep 2006 20:07:12 -0000	1.9
+++ mach.spec	2 Oct 2006 18:40:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           mach
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        make a chroot
 
 Group:          Applications/System
@@ -96,6 +96,9 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.0-3
+- Rebuild.
+
 * Tue Sep 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.0-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 18:41:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:41:06 -0700
Subject: rpms/openct/devel openct.spec,1.17,1.18
Message-ID: <200610021841.k92If8X9011501@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11484

Modified Files:
	openct.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-2
- Rebuild.



Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openct.spec	23 Sep 2006 08:37:52 -0000	1.17
+++ openct.spec	2 Oct 2006 18:41:06 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           openct
 Version:        0.6.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-2
+- Rebuild.
+
 * Fri Sep 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-1
 - 0.6.9.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 18:42:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:42:06 -0700
Subject: rpms/xemacs/devel xemacs.spec,1.29,1.30
Message-ID: <200610021842.k92Ig82a011572@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11555

Modified Files:
	xemacs.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.27-5
- Rebuild.



Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xemacs.spec	20 Sep 2006 16:21:20 -0000	1.29
+++ xemacs.spec	2 Oct 2006 18:42:06 -0000	1.30
@@ -20,7 +20,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -491,6 +491,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.27-5
+- Rebuild.
+
 * Wed Sep 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.27-4
 - Disable graphical progress bar by default (#188973).
 - Make Wnn support optional at build time, disabled by default.



From fedora-extras-commits at redhat.com  Mon Oct  2 18:44:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Oct 2006 11:44:08 -0700
Subject: rpms/opensc/devel opensc.spec,1.17,1.18
Message-ID: <200610021844.k92IiA8r011643@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626

Modified Files:
	opensc.spec 
Log Message:
* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-4
- Rebuild.



Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- opensc.spec	26 Sep 2006 20:58:39 -0000	1.17
+++ opensc.spec	2 Oct 2006 18:44:08 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-4
+- Rebuild.
+
 * Tue Sep 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-3
 - Rebuild with new libassuan.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:04:07 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 12:04:07 -0700
Subject: rpms/python-telepathy/FC-5
	python-telepathy-connection-manager.patch, 
	NONE, 1.1 python-telepathy.spec, 1.1, 1.2
Message-ID: <200610021904.k92J4dcT014588@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14566

Modified Files:
	python-telepathy.spec 
Added Files:
	python-telepathy-connection-manager.patch 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
- Patch for connection manager.


python-telepathy-connection-manager.patch:

--- NEW FILE python-telepathy-connection-manager.patch ---
--- telepathy/client/managerregistry.py~	2006-08-17 17:28:49.000000000 +0200
+++ telepathy/client/managerregistry.py	2006-10-02 19:42:47.000000000 +0200
@@ -21,20 +21,19 @@
 The registry of managers takes the form of any number of .manager files, which
 are searched for in /usr/share/telepathy/services or in ~/.telepathy.
 
-.manager files should have an initial stanza of the form:
+The name of a manager is the filename minus the .manager suffix
+For example a file named gabble.manager implies that:
+  The name of the connmgr is 'gabble'
+  The object path is /org/freedesktop/Telepathy/ConnectionManager/gabble
+  The bus name is org.freedesktop.Telepathy.ConnectionManager.gabble
+
+The object path and bus names are formed by replacing $name with the connmgr
+name in the following templates:
+  Object path: /org/freedesktop/Telepathy/ConnectionManager/$name
+  Bus name: org.freedesktop.Telepathy.ConnectionManager.$name
 
-[ConnectionManager]
-Name = value
-BusName = value
-ObjectPath = value
-
-
-where:
-'Name' field sets the name of connection manager.
-'BusName' sets the D-Bus bus name of this connection manager.
-'ObjectPath' sets the D-Bus object path to the ConnectionManager object under this service.
-
-Then any number of proctol support declarators of the form:
+.manager files should contain any number of proctol support declarators
+of the form:
 
 [Protocol (name of supported protocol)]
 param-(parameter name) = signature flags
@@ -86,16 +85,16 @@
     def LoadManager(self, path):
         config = ConfigParser.SafeConfigParser()
         config.read(path)
-        connection_manager = dict(config.items("ConnectionManager"))
-
-        if "name" not in connection_manager.keys():
-            raise ConfigParser.NoOptionError("name", "ConnectionManager")
 
-        cm_name = connection_manager["name"]
-        self.services[cm_name] = connection_manager
+        cm_name = os.path.basename(path)[:-len(".manager")]
+        self.services[cm_name] = {
+            "name": cm_name,
+            "busname": "org.freedesktop.Telepathy.ConnectionManager.%s" % cm_name,
+            "objectpath": "/org/freedesktop/Telepathy/ConnectionManager/%s" % cm_name,
+        }
         protocols = {}
 
-        for section in set(config.sections()) - set(["ConnectionManager"]):
+        for section in set(config.sections()):
             if section.startswith('Protocol '):
                 proto_name = section[len('Protocol '):]
                 protocols[proto_name] = dict(config.items(section))


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/FC-5/python-telepathy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-telepathy.spec	8 Sep 2006 13:08:24 -0000	1.1
+++ python-telepathy.spec	2 Oct 2006 19:04:07 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           python-telepathy
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
+Patch0:		%{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q -n telepathy-python-%{version}
+%patch0 -b .connection-manager
 
 
 %build
@@ -43,6 +45,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
+- Patch for connection manager.
+
 * Sat Sep  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:07:06 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 12:07:06 -0700
Subject: rpms/python-telepathy/devel
	python-telepathy-connection-manager.patch, 
	NONE, 1.1 python-telepathy.spec, 1.1, 1.2
Message-ID: <200610021907.k92J78eW014740@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14720

Modified Files:
	python-telepathy.spec 
Added Files:
	python-telepathy-connection-manager.patch 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
- Patch for connection manager.


python-telepathy-connection-manager.patch:

--- NEW FILE python-telepathy-connection-manager.patch ---
--- telepathy/client/managerregistry.py~	2006-08-17 17:28:49.000000000 +0200
+++ telepathy/client/managerregistry.py	2006-10-02 19:42:47.000000000 +0200
@@ -21,20 +21,19 @@
 The registry of managers takes the form of any number of .manager files, which
 are searched for in /usr/share/telepathy/services or in ~/.telepathy.
 
-.manager files should have an initial stanza of the form:
+The name of a manager is the filename minus the .manager suffix
+For example a file named gabble.manager implies that:
+  The name of the connmgr is 'gabble'
+  The object path is /org/freedesktop/Telepathy/ConnectionManager/gabble
+  The bus name is org.freedesktop.Telepathy.ConnectionManager.gabble
+
+The object path and bus names are formed by replacing $name with the connmgr
+name in the following templates:
+  Object path: /org/freedesktop/Telepathy/ConnectionManager/$name
+  Bus name: org.freedesktop.Telepathy.ConnectionManager.$name
 
-[ConnectionManager]
-Name = value
-BusName = value
-ObjectPath = value
-
-
-where:
-'Name' field sets the name of connection manager.
-'BusName' sets the D-Bus bus name of this connection manager.
-'ObjectPath' sets the D-Bus object path to the ConnectionManager object under this service.
-
-Then any number of proctol support declarators of the form:
+.manager files should contain any number of proctol support declarators
+of the form:
 
 [Protocol (name of supported protocol)]
 param-(parameter name) = signature flags
@@ -86,16 +85,16 @@
     def LoadManager(self, path):
         config = ConfigParser.SafeConfigParser()
         config.read(path)
-        connection_manager = dict(config.items("ConnectionManager"))
-
-        if "name" not in connection_manager.keys():
-            raise ConfigParser.NoOptionError("name", "ConnectionManager")
 
-        cm_name = connection_manager["name"]
-        self.services[cm_name] = connection_manager
+        cm_name = os.path.basename(path)[:-len(".manager")]
+        self.services[cm_name] = {
+            "name": cm_name,
+            "busname": "org.freedesktop.Telepathy.ConnectionManager.%s" % cm_name,
+            "objectpath": "/org/freedesktop/Telepathy/ConnectionManager/%s" % cm_name,
+        }
         protocols = {}
 
-        for section in set(config.sections()) - set(["ConnectionManager"]):
+        for section in set(config.sections()):
             if section.startswith('Protocol '):
                 proto_name = section[len('Protocol '):]
                 protocols[proto_name] = dict(config.items(section))


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-telepathy.spec	8 Sep 2006 13:08:24 -0000	1.1
+++ python-telepathy.spec	2 Oct 2006 19:07:06 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           python-telepathy
 Version:        0.13.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
+Patch0:		{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q -n telepathy-python-%{version}
+%patch0 -b .connection-manager
 
 
 %build
@@ -43,6 +45,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
+- Patch for connection manager.
+
 * Sat Sep  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:10:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  2 Oct 2006 12:10:49 -0700
Subject: rpms/python-telepathy/devel python-telepathy.spec,1.2,1.3
Message-ID: <200610021910.k92JApfD014854@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14835

Modified Files:
	python-telepathy.spec 
Log Message:
* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-3
- Actually use the name variable for the patch.



Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-telepathy.spec	2 Oct 2006 19:07:06 -0000	1.2
+++ python-telepathy.spec	2 Oct 2006 19:10:49 -0000	1.3
@@ -2,14 +2,14 @@
 
 Name:           python-telepathy
 Version:        0.13.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
-Patch0:		{name}-connection-manager.patch
+Patch0:		%{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-3
+- Actually use the name variable for the patch.
+
 * Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-2
 - Patch for connection manager.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:10:53 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 12:10:53 -0700
Subject: rpms/clisp/devel clisp.spec,1.18,1.19
Message-ID: <200610021910.k92JAtP7014875@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14858

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- clisp.spec	2 Oct 2006 11:24:26 -0000	1.18
+++ clisp.spec	2 Oct 2006 19:10:53 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.40
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -20,7 +20,8 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	imake
-ExcludeArch:	ppc ppc64
+#ExcludeArch:	ppc ppc64
+ExcludeArch:	x86_64
 
 
 %description



From fedora-extras-commits at redhat.com  Mon Oct  2 19:37:42 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:37:42 -0700
Subject: rpms/cohoba - New directory
Message-ID: <200610021937.k92JbiPs015157@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15136/cohoba

Log Message:
Directory /cvs/extras/rpms/cohoba added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 19:37:43 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:37:43 -0700
Subject: rpms/cohoba/devel - New directory
Message-ID: <200610021937.k92Jbj3W015160@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15136/cohoba/devel

Log Message:
Directory /cvs/extras/rpms/cohoba/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 19:38:31 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:38:31 -0700
Subject: rpms/cohoba Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610021938.k92JcXlZ015219@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15186

Added Files:
	Makefile import.log 
Log Message:
Setup of module cohoba


--- NEW FILE Makefile ---
# Top level Makefile for module cohoba
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 19:38:32 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:38:32 -0700
Subject: rpms/cohoba/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610021938.k92JcYiW015222@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15186/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cohoba


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 19:38:50 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  2 Oct 2006 12:38:50 -0700
Subject: rpms/gai/devel gai.spec,1.20,1.21
Message-ID: <200610021938.k92JcqIv015260@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15240

Modified Files:
	gai.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gai.spec	18 Sep 2006 23:27:11 -0000	1.20
+++ gai.spec	2 Oct 2006 19:38:50 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -73,6 +73,9 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Tue Sep 19 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:39:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  2 Oct 2006 12:39:32 -0700
Subject: rpms/gai-pal/devel gai-pal.spec,1.14,1.15
Message-ID: <200610021939.k92JdY5w015346@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai-pal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15328

Modified Files:
	gai-pal.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gai-pal.spec	18 Sep 2006 23:28:01 -0000	1.14
+++ gai-pal.spec	2 Oct 2006 19:39:32 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:	GAI Pal applet
 Name:		gai-pal
 Version:	0.7
-Release: 10
+Release: 11
 Source0:	%{name}-%{version}.tar.bz2
 Patch0:		gai-pal-0.7-xosd-empty-msg.patch
 Patch1:		gai-pal-0.7-typo.patch
@@ -48,6 +48,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Tue Sep 19 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:39:42 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:39:42 -0700
Subject: rpms/cohoba import.log,1.1,1.2
Message-ID: <200610021939.k92JdiNu015417@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357

Modified Files:
	import.log 
Log Message:
auto-import cohoba-0.0.4-2 on branch devel from cohoba-0.0.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cohoba/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 19:38:31 -0000	1.1
+++ import.log	2 Oct 2006 19:39:42 -0000	1.2
@@ -0,0 +1 @@
+cohoba-0_0_4-2:HEAD:cohoba-0.0.4-2.src.rpm:1159817992



From fedora-extras-commits at redhat.com  Mon Oct  2 19:39:43 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:39:43 -0700
Subject: rpms/cohoba/devel cohoba-non-binary-in-usr-lib.patch, NONE,
	1.1 cohoba.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610021939.k92JdjBf015424@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/cohoba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cohoba-non-binary-in-usr-lib.patch cohoba.spec 
Log Message:
auto-import cohoba-0.0.4-2 on branch devel from cohoba-0.0.4-2.src.rpm

cohoba-non-binary-in-usr-lib.patch:

--- NEW FILE cohoba-non-binary-in-usr-lib.patch ---
--- cohoba/Makefile.in~	2006-09-29 08:33:06.000000000 +0200
+++ cohoba/Makefile.in	2006-09-29 08:33:58.000000000 +0200
@@ -242,7 +242,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SUBDIRS = bigbrother applet contacts common houston technobabble me
-cohobabindir = $(libdir)/cohoba
+cohobabindir = $(datadir)/cohoba
 cohobabin_SCRIPTS = cohoba-applet
 cohobadir = $(pythondir)/cohoba
 cohoba_PYTHON = \
--- data/Makefile.in~	2006-09-29 08:43:56.000000000 +0200
+++ data/Makefile.in	2006-09-29 08:45:19.000000000 +0200
@@ -291,7 +291,7 @@
 	accounts.glade \
 	main.glade
 
-cohobabindir = $(libdir)/cohoba
+cohobabindir = $(datadir)/cohoba
 
 #if GCONF_SCHEMAS_INSTALL
 #install-data-local: install-schemas


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

Name:           cohoba
Version:        0.0.4
Release:        2%{?dist}
Summary:        Cohoba is a GNOME interface for Telepathy. It aims to be innovative and simple

Group:          Applications/Communications
License:        GPL
URL:            http://telepathy.freedesktop.org/wiki/Cohoba
Source0:        http://telepathy.freedesktop.org/releases/cohoba/cohoba-0.0.4.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, perl-XML-Parser, GConf2, pygtk2-devel, glib2-devel, gnome-python2, gnome-python2-applet
Requires:       python-telepathy, gnome-python2-applet, pygtk2, python-ctypes, telepathy-filesystem

Patch1:		cohoba-non-binary-in-usr-lib.patch

%description
Gnome's interfaces for telepathy backend.
The aim of this project is to provide a D-Bus-based framework that unifies 
all forms of real time conversations, including, but not limited to, instant 
messaging, IRC and voice and video over IP. It aims to provide a simple 
interface to client applications allowing them to quickly implement code to 
make use of real time communication over any supported protocol. 

Cohoba is one of the gnome's interfaces for telepathy backend. It aims to be 
innovative and simple to use.

%prep
%setup -q
%patch1 -b .1-non-binary-in-usr-lib

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT 

chmod 644 AUTHORS COPYING README
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{python_sitelib}/cohoba/
%{_libdir}/bonobo/servers/Cohoba.server
%{_datadir}/cohoba/
%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Cohoba.TechnoBabbleChannelHandler.service
%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Houston.MissionControl.service
%{_datadir}/icons/hicolor/48x48/apps/cohoba.png
%{_datadir}/icons/hicolor/scalable/apps/cohoba.svg
%{_datadir}/telepathy/managers/org.freedesktop.Telepathy.Cohoba.BigBrotherChannelHandler.chandler
%{_datadir}/telepathy/managers/org.freedesktop.Telepathy.Cohoba.TechnoBabbleChannelHandler-voip.chandler
%{_datadir}/telepathy/managers/org.freedesktop.Telepathy.Cohoba.TechnoBabbleChannelHandler.chandler

%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 || :

%changelog
* Sun Oct 01 2006 Sander Hoentjen <sander at hoentjen.eu> - 0.0.4-2
- added Require telepathy-filesystem since we have files in %{_datadir}/telepathy/managers/

* Fri Sep 29 2006 Sander Hoentjen <sander at hoentjen.eu> - 0.0.4-1
- update to cohoba 0.0.4
- changed group to Applications/Communications
- added pygtk2, python-ctypes to Requires
- fixed ownership on %{_libdir}/cohoba/
- fixed cohoba only-non-binary-in-usr-lib

* Fri Sep 08 2006 Sander Hoentjen <sander at hoentjen.eu> - 0.0.3-2
- added requires gnome-python2-applet

* Thu Aug 31 2006 Sander Hoentjen <sander at hoentjen.eu> - 0.0.3-1
- created


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cohoba/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 19:38:32 -0000	1.1
+++ .cvsignore	2 Oct 2006 19:39:43 -0000	1.2
@@ -0,0 +1 @@
+cohoba-0.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cohoba/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 19:38:32 -0000	1.1
+++ sources	2 Oct 2006 19:39:43 -0000	1.2
@@ -0,0 +1 @@
+ddf2ae920bb123a0f19f0a404fb0ecae  cohoba-0.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 19:40:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  2 Oct 2006 12:40:12 -0700
Subject: rpms/sylpheed/devel sylpheed.spec,1.40,1.41
Message-ID: <200610021940.k92JeERJ015487@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15470

Modified Files:
	sylpheed.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sylpheed.spec	23 Sep 2006 08:28:36 -0000	1.40
+++ sylpheed.spec	2 Oct 2006 19:40:12 -0000	1.41
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -84,6 +84,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sat Sep 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.2.9-1
 - Update to 2.2.9 (also works around #201949).
 - New upstream URLs.



From fedora-extras-commits at redhat.com  Mon Oct  2 19:41:16 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  2 Oct 2006 12:41:16 -0700
Subject: rpms/aide/devel aide.spec,1.13,1.14
Message-ID: <200610021941.k92JfIWi015563@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15545

Modified Files:
	aide.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- aide.spec	11 Sep 2006 09:11:31 -0000	1.13
+++ aide.spec	2 Oct 2006 19:41:16 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Mon Sep 11 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Oct  2 19:43:41 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Mon,  2 Oct 2006 12:43:41 -0700
Subject: owners owners.list,1.1761,1.1762
Message-ID: <200610021943.k92JhhwA015635@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15618

Modified Files:
	owners.list 
Log Message:
added cohoba



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1761
retrieving revision 1.1762
diff -u -r1.1761 -r1.1762
--- owners.list	2 Oct 2006 14:57:16 -0000	1.1761
+++ owners.list	2 Oct 2006 19:43:41 -0000	1.1762
@@ -195,6 +195,7 @@
 Fedora Extras|cobbler|PXE, Xen, and Kickstart Provisioning|mdehaan at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|codeblocks|Code::Blocks C/C++ IDE|dan at danny.cz|extras-qa at fedoraproject.org|
 Fedora Extras|cogito|Cogito SCM based on git|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|cohoba|GNOME interface for Telepathy|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|coldet|3D Collision Detection Library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 19:56:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 12:56:09 -0700
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.10,
	1.11 perl-Config-Tiny.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <200610021956.k92JuB9u015756@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15735

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Update to 2.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Jul 2006 13:16:18 -0000	1.10
+++ .cvsignore	2 Oct 2006 19:56:08 -0000	1.11
@@ -1 +1 @@
-Config-Tiny-2.08.tar.gz
+Config-Tiny-2.10.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Config-Tiny.spec	16 Jul 2006 13:16:18 -0000	1.15
+++ perl-Config-Tiny.spec	2 Oct 2006 19:56:08 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.08
+Version:        2.10
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -39,7 +38,7 @@
 
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 
 %clean
@@ -54,6 +53,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.10-1
+- Updated to 2.10.
+
 * Sun Jul 16 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.08-1
 - Updated to 2.08.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Jul 2006 13:16:18 -0000	1.10
+++ sources	2 Oct 2006 19:56:08 -0000	1.11
@@ -1 +1 @@
-128b2a542923198a5e13b19b6dd6089d  Config-Tiny-2.08.tar.gz
+4db84e5ae2dbcdf7f0a36e64e43965cc  Config-Tiny-2.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 20:08:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 13:08:12 -0700
Subject: rpms/plt-scheme/devel plt-scheme.spec,1.27,1.28
Message-ID: <200610022008.k92K8Ets018793@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18776

Modified Files:
	plt-scheme.spec 
Log Message:



Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- plt-scheme.spec	28 Aug 2006 09:16:35 -0000	1.27
+++ plt-scheme.spec	2 Oct 2006 20:08:12 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        352
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -86,10 +86,13 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
-for i in ../%{_lib}/plt/bin/*
-do
+  for i in ../%{_lib}/plt/bin/*
+  do
     ln -sf $i .
-done
+  done
+  # binary planet conflicts with other packages
+  rm -f planet
+  ln -sf ../%{_lib}/plt/bin/planet plt-planet
 popd
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -135,6 +138,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 352-3
+- rename conflicting binary planet to plt-planet
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 352-2
 - Rebuild for FE6
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:10:46 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 13:10:46 -0700
Subject: rpms/plt-scheme/FC-5 plt-scheme.spec,1.26,1.27
Message-ID: <200610022010.k92KAmhT018858@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18841/FC-5

Modified Files:
	plt-scheme.spec 
Log Message:



Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-5/plt-scheme.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- plt-scheme.spec	28 Jul 2006 12:57:29 -0000	1.26
+++ plt-scheme.spec	2 Oct 2006 20:10:46 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        352
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -86,10 +86,13 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
-for i in ../%{_lib}/plt/bin/*
-do
+  for i in ../%{_lib}/plt/bin/*
+  do
     ln -sf $i .
-done
+  done
+  # binary planet conflicts with other packages
+  rm -f planet
+  ln -sf ../%{_lib}/plt/bin/planet plt-planet
 popd
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -135,6 +138,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 352-3
+- rename conflicting binary planet to plt-planet
+
 * Fri Jul 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 352-1
 - new version 352
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:31:45 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 13:31:45 -0700
Subject: rpms/abcm2ps/devel .cvsignore, 1.23, 1.24 abcm2ps.spec, 1.26,
	1.27 sources, 1.23, 1.24
Message-ID: <200610022031.k92KVlV0019061@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19040

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Aug 2006 10:17:04 -0000	1.23
+++ .cvsignore	2 Oct 2006 20:31:45 -0000	1.24
@@ -1,2 +1,2 @@
-abcm2ps-5.0.5.tar.gz
+abcm2ps-5.1.1.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- abcm2ps.spec	30 Aug 2006 10:17:04 -0000	1.26
+++ abcm2ps.spec	2 Oct 2006 20:31:45 -0000	1.27
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.0.5
+Version:        5.1.1
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.0.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.1.1-1
+- new version 5.1.1
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0.5-1
 - new version 5.0.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Aug 2006 10:17:04 -0000	1.23
+++ sources	2 Oct 2006 20:31:45 -0000	1.24
@@ -1,2 +1,2 @@
-323d89c00d8e82d26f7ad4598f5301c3  abcm2ps-5.0.5.tar.gz
+48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Oct  2 20:32:46 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Oct 2006 13:32:46 -0700
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.22, 1.23 abcm2ps.spec, 1.24,
	1.25 sources, 1.22, 1.23
Message-ID: <200610022032.k92KWmQo019129@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19108/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Aug 2006 10:17:04 -0000	1.22
+++ .cvsignore	2 Oct 2006 20:32:46 -0000	1.23
@@ -1,2 +1,2 @@
-abcm2ps-5.0.5.tar.gz
+abcm2ps-5.1.1.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/abcm2ps.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- abcm2ps.spec	30 Aug 2006 10:17:04 -0000	1.24
+++ abcm2ps.spec	2 Oct 2006 20:32:46 -0000	1.25
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.0.5
+Version:        5.1.1
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.0.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.1.1-1
+- new version 5.1.1
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0.5-1
 - new version 5.0.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Aug 2006 10:17:04 -0000	1.22
+++ sources	2 Oct 2006 20:32:46 -0000	1.23
@@ -1,2 +1,2 @@
-323d89c00d8e82d26f7ad4598f5301c3  abcm2ps-5.0.5.tar.gz
+48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Oct  2 20:40:23 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:40:23 -0700
Subject: rpms/aiccu/devel aiccu.spec,1.3,1.4
Message-ID: <200610022040.k92KePXO019254@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/aiccu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19237

Modified Files:
	aiccu.spec 
Log Message:
rebuild


Index: aiccu.spec
===================================================================
RCS file: /cvs/extras/rpms/aiccu/devel/aiccu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aiccu.spec	24 Sep 2006 04:34:20 -0000	1.3
+++ aiccu.spec	2 Oct 2006 20:40:23 -0000	1.4
@@ -9,7 +9,7 @@
 Summary:   AICCU - SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
 Version:   2006.07.25
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSDish
 Group:	   System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
@@ -73,6 +73,9 @@
 %{_sysconfdir}/init.d/aiccu
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <matt at domsch.com> 2006.07.25-2
+- rebuilt
+
 * Sat Sep 23 2006 Matt Domsch <matt at domsch.com> 2006.07.25-1
 - upgrade to latest upstream, drop all applied patches
 - add BR gnutls-devel now used for obtaining tunnel info



From fedora-extras-commits at redhat.com  Mon Oct  2 20:42:05 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:42:05 -0700
Subject: rpms/gpp/devel gpp.spec,1.4,1.5
Message-ID: <200610022042.k92Kg7vK019343@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19326

Modified Files:
	gpp.spec 
Log Message:
rebuild


Index: gpp.spec
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/gpp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gpp.spec	3 Sep 2006 01:52:02 -0000	1.4
+++ gpp.spec	2 Oct 2006 20:42:05 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:	GNOME Photo Printer
 Name:           gpp
 Version:	0.6.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.fogman.de/?GnomePhotoPrinter
 Source:         http://www.fogman.de/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{longname}.desktop
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <matt at domsch.com> 0.6.6-3
+- rebuilt
+
 * Sat Sep  2 2006 Matt Domsch <matt at domsch.com> 0.6.6-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:43:50 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:43:50 -0700
Subject: rpms/i810switch/devel i810switch.spec,1.8,1.9
Message-ID: <200610022043.k92KhqoW019436@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19416

Modified Files:
	i810switch.spec 
Log Message:
rebuild


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- i810switch.spec	3 Sep 2006 01:36:49 -0000	1.8
+++ i810switch.spec	2 Oct 2006 20:43:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -38,6 +38,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-5
+- rebuild
+
 * Sat Sep  2 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:45:10 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:45:10 -0700
Subject: rpms/perl-GnuPG-Interface/devel perl-GnuPG-Interface.spec,1.5,1.6
Message-ID: <200610022045.k92KjCIa019514@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19497

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:
rebuild


Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GnuPG-Interface.spec	3 Sep 2006 01:56:50 -0000	1.5
+++ perl-GnuPG-Interface.spec	2 Oct 2006 20:45:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        7%{?dist}
+Release:	8%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.33-8
+- rebuild
+
 * Sat Sep  2 2006 Matt Domsch <Matt_Domsch at dell.com> 0.33-7
 - rebuild for FC6
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:46:23 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  2 Oct 2006 13:46:23 -0700
Subject: rpms/ttywatch/devel ttywatch.spec,1.3,1.4
Message-ID: <200610022046.k92KkPPP019583@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/ttywatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19566

Modified Files:
	ttywatch.spec 
Log Message:
rebuild


Index: ttywatch.spec
===================================================================
RCS file: /cvs/extras/rpms/ttywatch/devel/ttywatch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ttywatch.spec	3 Sep 2006 01:39:14 -0000	1.3
+++ ttywatch.spec	2 Oct 2006 20:46:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name: ttywatch
 Version: 0.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Log output of arbitrarily many devices
 License: GPL
 Group: System Environment/Daemons
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> 0.14-7
+- rebuild
+
 * Sat Sep  2 2006 Matt Domsch <Matt_Domsch at dell.com> 0.14-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:48:47 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  2 Oct 2006 13:48:47 -0700
Subject: rpms/libmodelfile/devel libmodelfile.spec,1.2,1.3
Message-ID: <200610022048.k92Kmnqq019663@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/libmodelfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19646

Modified Files:
	libmodelfile.spec 
Log Message:
Rebuild for FE-6 gcc bug




Index: libmodelfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodelfile/devel/libmodelfile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmodelfile.spec	21 Sep 2006 05:42:02 -0000	1.2
+++ libmodelfile.spec	2 Oct 2006 20:48:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libmodelfile
 Version:        0.1.92
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for accessing various model file formats
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Sep 20 2006 Wart <wart at kobold.org> 0.1.92-4
+- Rebuild for FE-6 gcc bug
+
 * Wed Sep 20 2006 Wart <wart at kobold.org> 0.1.92-3
 - Change license to 'Distributable' until upstream cleans up the license
   text (BZ #198830)



From fedora-extras-commits at redhat.com  Mon Oct  2 20:49:13 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  2 Oct 2006 13:49:13 -0700
Subject: rpms/libmodelfile/devel libmodelfile.spec,1.3,1.4
Message-ID: <200610022049.k92KnF4f019686@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/libmodelfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19669

Modified Files:
	libmodelfile.spec 
Log Message:
Forgot to update the date in the changelog.  Oops!




Index: libmodelfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodelfile/devel/libmodelfile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmodelfile.spec	2 Oct 2006 20:48:47 -0000	1.3
+++ libmodelfile.spec	2 Oct 2006 20:49:13 -0000	1.4
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Wed Sep 20 2006 Wart <wart at kobold.org> 0.1.92-4
+* Mon Oct 2 2006 Wart <wart at kobold.org> 0.1.92-4
 - Rebuild for FE-6 gcc bug
 
 * Wed Sep 20 2006 Wart <wart at kobold.org> 0.1.92-3



From fedora-extras-commits at redhat.com  Mon Oct  2 20:53:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 13:53:56 -0700
Subject: rpms/xdg-utils/devel xdg-utils.spec,1.5,1.6
Message-ID: <200610022053.k92KrwY1019747@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19730

Modified Files:
	xdg-utils.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
- update %description (#208926)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdg-utils.spec	21 Sep 2006 02:05:31 -0000	1.5
+++ xdg-utils.spec	2 Oct 2006 20:53:56 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -35,15 +35,14 @@
 *  Distribution vendors can provide custom versions of these utilities
 
 The following scripts are provided at this time:
-* xdg-menu        Place a menu into the users menu structure
-* xdg-mime        Gather mime information about a file
-* xdg-open        Open a URL in the user's preferred application that
-                  handles the respective URL or file type
-* xdg-email       Open the users preferred email client,
-                  potentially with subject and other info filled in
-* xdg-copy        Copy one URI to another
-* xdg-su          Run a command as a different (usually root) user
-* xdg-screensaver Enable, disable, or suspend the screensaver
+* xdg-desktop-menu      Install desktop menu items
+* xdg-desktop-icon      Install icons to the desktop
+* xdg-icon-resource     Install icon resources
+* xdg-mime              Query information about file type handling and
+                        install descriptions for new file types
+* xdg-open              Open a file or URL in the user's preferred application
+* xdg-email             Send mail using the user's preferred e-mail composer
+* xdg-screensaver       Control the screensaver
 
 
 %prep
@@ -74,6 +73,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
+- update %%description (#208926)
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.8.rc1
 - 1.0rc1
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:54:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 13:54:19 -0700
Subject: rpms/xdg-utils/FC-5 xdg-utils.spec,1.5,1.6
Message-ID: <200610022054.k92KsLNS019808@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19791

Modified Files:
	xdg-utils.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
- update %description (#208926)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdg-utils.spec	21 Sep 2006 02:05:52 -0000	1.5
+++ xdg-utils.spec	2 Oct 2006 20:54:19 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -35,15 +35,14 @@
 *  Distribution vendors can provide custom versions of these utilities
 
 The following scripts are provided at this time:
-* xdg-menu        Place a menu into the users menu structure
-* xdg-mime        Gather mime information about a file
-* xdg-open        Open a URL in the user's preferred application that
-                  handles the respective URL or file type
-* xdg-email       Open the users preferred email client,
-                  potentially with subject and other info filled in
-* xdg-copy        Copy one URI to another
-* xdg-su          Run a command as a different (usually root) user
-* xdg-screensaver Enable, disable, or suspend the screensaver
+* xdg-desktop-menu      Install desktop menu items
+* xdg-desktop-icon      Install icons to the desktop
+* xdg-icon-resource     Install icon resources
+* xdg-mime              Query information about file type handling and
+                        install descriptions for new file types
+* xdg-open              Open a file or URL in the user's preferred application
+* xdg-email             Send mail using the user's preferred e-mail composer
+* xdg-screensaver       Control the screensaver
 
 
 %prep
@@ -74,6 +73,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
+- update %%description (#208926)
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.8.rc1
 - 1.0rc1
 



From fedora-extras-commits at redhat.com  Mon Oct  2 20:54:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Oct 2006 13:54:39 -0700
Subject: rpms/xdg-utils/FC-4 xdg-utils.spec,1.5,1.6
Message-ID: <200610022054.k92KsfDd019869@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19852

Modified Files:
	xdg-utils.spec 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
- update %description (#208926)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/xdg-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdg-utils.spec	21 Sep 2006 02:06:13 -0000	1.5
+++ xdg-utils.spec	2 Oct 2006 20:54:38 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -35,15 +35,14 @@
 *  Distribution vendors can provide custom versions of these utilities
 
 The following scripts are provided at this time:
-* xdg-menu        Place a menu into the users menu structure
-* xdg-mime        Gather mime information about a file
-* xdg-open        Open a URL in the user's preferred application that
-                  handles the respective URL or file type
-* xdg-email       Open the users preferred email client,
-                  potentially with subject and other info filled in
-* xdg-copy        Copy one URI to another
-* xdg-su          Run a command as a different (usually root) user
-* xdg-screensaver Enable, disable, or suspend the screensaver
+* xdg-desktop-menu      Install desktop menu items
+* xdg-desktop-icon      Install icons to the desktop
+* xdg-icon-resource     Install icon resources
+* xdg-mime              Query information about file type handling and
+                        install descriptions for new file types
+* xdg-open              Open a file or URL in the user's preferred application
+* xdg-email             Send mail using the user's preferred e-mail composer
+* xdg-screensaver       Control the screensaver
 
 
 %prep
@@ -74,6 +73,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
+- update %%description (#208926)
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.8.rc1
 - 1.0rc1
 



From fedora-extras-commits at redhat.com  Mon Oct  2 21:18:48 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Mon,  2 Oct 2006 14:18:48 -0700
Subject: rpms/libtorrent/devel libtorrent.spec,1.11,1.12
Message-ID: <200610022118.k92LIoh5022874@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22857

Modified Files:
	libtorrent.spec 
Log Message:
Bump EVR to fix broken upgrade path (BZ #208985)


Index: libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libtorrent.spec	29 Sep 2006 09:55:14 -0000	1.11
+++ libtorrent.spec	2 Oct 2006 21:18:48 -0000	1.12
@@ -2,7 +2,7 @@
 License:       GPL
 Group:         System Environment/Libraries
 Version:       0.10.2
-Release:       1%{?dist}
+Release:       3%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Oct 02 2006 Chris Chabot <chabotc at xs4all.nl> - 0.10.2-3
+- Bump EVR to fix broken upgrade path (BZ #208985)
+
 * Fri Sep 29 2006 Chris Chabot <chabotc at xs4all.nl> - 0.10.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Oct  2 21:24:32 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:24:32 -0700
Subject: rpms/wavbreaker - New directory
Message-ID: <200610022124.k92LOYba023012@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22986/wavbreaker

Log Message:
Directory /cvs/extras/rpms/wavbreaker added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 21:24:33 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:24:33 -0700
Subject: rpms/wavbreaker/devel - New directory
Message-ID: <200610022124.k92LOZuO023015@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22986/wavbreaker/devel

Log Message:
Directory /cvs/extras/rpms/wavbreaker/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 21:24:40 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:24:40 -0700
Subject: rpms/wavbreaker Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610022124.k92LOgww023062@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23031

Added Files:
	Makefile import.log 
Log Message:
Setup of module wavbreaker


--- NEW FILE Makefile ---
# Top level Makefile for module wavbreaker
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 21:24:41 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:24:41 -0700
Subject: rpms/wavbreaker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610022124.k92LOhqv023065@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23031/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wavbreaker


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 21:25:05 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:25:05 -0700
Subject: rpms/wavbreaker import.log,1.1,1.2
Message-ID: <200610022125.k92LP7bj023151@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23115

Modified Files:
	import.log 
Log Message:
auto-import wavbreaker-0.7-5 on branch devel from wavbreaker-0.7-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 21:24:40 -0000	1.1
+++ import.log	2 Oct 2006 21:25:05 -0000	1.2
@@ -0,0 +1 @@
+wavbreaker-0_7-5:HEAD:wavbreaker-0.7-5.src.rpm:1159824312



From fedora-extras-commits at redhat.com  Mon Oct  2 21:25:06 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:25:06 -0700
Subject: rpms/wavbreaker/devel
	wavbreaker-0.7-browsedir-set_current_folder-v2.patch, NONE,
	1.1 wavbreaker-icon.png, NONE, 1.1 wavbreaker.desktop, NONE,
	1.1 wavbreaker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610022125.k92LP8B2023158@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23115/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wavbreaker-0.7-browsedir-set_current_folder-v2.patch 
	wavbreaker-icon.png wavbreaker.desktop wavbreaker.spec 
Log Message:
auto-import wavbreaker-0.7-5 on branch devel from wavbreaker-0.7-5.src.rpm

wavbreaker-0.7-browsedir-set_current_folder-v2.patch:

--- NEW FILE wavbreaker-0.7-browsedir-set_current_folder-v2.patch ---
--- wavbreaker-0.7/src/wavbreaker.c.orig	2006-06-01 14:26:31.000000000 -0400
+++ wavbreaker-0.7/src/wavbreaker.c	2006-06-01 14:29:02.000000000 -0400
@@ -1203,11 +1203,15 @@
 
     if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
         char *filename;
+        char *dirname;
 
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 //        printf("filename: \"%s\"\n", filename);
         set_sample_filename(filename);
         g_free(filename);
+        dirname = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
+        saveas_set_dirname(dirname);
+        g_free(dirname);
         open_file();
     }
 
--- wavbreaker-0.7/src/browsedir.c.orig	2006-06-01 14:26:24.000000000 -0400
+++ wavbreaker-0.7/src/browsedir.c	2006-06-01 14:30:03.000000000 -0400
@@ -47,9 +47,9 @@
 
     dialog = gtk_file_chooser_dialog_new("Select Output Directory",
             GTK_WINDOW(parent_window), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN,
+            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK,
             GTK_RESPONSE_ACCEPT, NULL);
-    gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), callback_get_func());
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), callback_get_func());
 
     if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
         char *filename;


--- NEW FILE wavbreaker.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wavbreaker
GenericName=Wave File Splitter
Comment=Break a .wav file into multiple .wav files
Exec=wavbreaker
Icon=wavbreaker-icon.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;
Version=0.6.1
MimeType=audio/x-wav;


--- NEW FILE wavbreaker.spec ---
Summary:	Tool for splitting .wav files
Name:		wavbreaker
Version: 	0.7
Release: 	5%{?dist}
License: 	GPL
Group: 		Applications/Multimedia
URL: 		http://huli.org/wavbreaker/index.html
Source: 	http://huli.org/wavbreaker/%{name}-%{version}.tar.gz
Source1:	wavbreaker-icon.png
Source2:	wavbreaker.desktop
Patch:		wavbreaker-0.7-browsedir-set_current_folder-v2.patch
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gtk2-devel, libxml2-devel, desktop-file-utils, alsa-lib-devel
Requires(post):	desktop-file-utils
Requires(postun): desktop-file-utils

%description
This application's purpose in life is to take a wave file and break it 
up into multiple wave files. It makes a clean break at the correct 
position to burn the files to an audio cd without any dead air between 
the tracks. It will only read wave files, so use an appropriate tool to 
convert ogg, mp3, etc. files and then break them up.

%prep
%setup -q
%patch -p1

%build
%configure
make %{?_smp_mflags}

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

mkdir -p %{buildroot}%{_datadir}/pixmaps
install -p %{SOURCE1} %{buildroot}%{_datadir}/pixmaps

desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE2}

%clean
rm -rf %{buildroot}

%post
update-desktop-database %{_datadir}/applications &> /dev/null ||:

%postun
update-desktop-database %{_datadir}/applications &> /dev/null ||:

%files
%defattr(-,root,root,-)
%{_bindir}/wav*
%{_datadir}/wavbreaker
%{_datadir}/applications/*wavbreaker.desktop
%{_datadir}/pixmaps/wavbreaker-icon.png
%doc ChangeLog CONTRIBUTORS NEWS AUTHORS COPYING README TODO

%changelog
* Thu Jun 1 2006 Homer <dmaley at nc.rr.com> 0.7-5
- replaced wavbreaker-0.7-browsedir-set_current_folder.patch w/ 
  wavbreaker-0.7-browsedir-set_current_folder-v2.patch

* Tue May 30 2006 Homer <dmaley at nc.rr.com> 0.7-4
- added wavbreaker-0.7-browsedir-set_current_folder.patch

* Mon Apr 3 2006 Homer <dmaley at nc.rr.com> 0.7-3
- fixed %doc

* Tue Mar 21 2006 Homer <dmaley at nc.rr.com> 0.7-2
- added %doc

* Mon Feb 27 2006 Homer <dmaley at nc.rr.com> 0.7-1
- initial 0.7 build

* Mon Feb 20 2006 Homer <dmaley at nc.rr.com> 0.7a-1
- initial 0.7a build

* Mon Jan 25 2006 Homer <dmaley at nc.rr.com> 0.6.1-6
- default to ALSA

* Mon Dec 19 2005 Homer <dmaley at nc.rr.com> 0.6.1-5
- more .spec cleanup

* Fri Dec 9 2005 Homer <dmaley at nc.rr.com> 0.6.1-4
- continued .spec cleanup

* Wed Dec 7 2005 Homer <dmaley at nc.rr.com> 0.6.1-3
- cleaned up .spec based on Fedora Extras guidelines

* Mon Sep 12 2005 Homer <homerj at nc.rr.com> 0.6-homer.2
- fixed progress bar for save-as (wavbreaker-saveas-progress.patch)

* Thu Jun 2 2005 Homer <homerj at nc.rr.com> 0.6-homer.1
- rebuilt for 0.6.1 (bugfix release)

* Wed Jun 1 2005 Homer <homerj at nc.rr.com> 0.6-homer.1
- 0.6 released

* Wed May 23 2005 Homer <homerj at nc.rr.com> 0.6c-homer.2
- 0.6c (beta) release

* Wed May 19 2005 Homer <homerj at nc.rr.com> 0.6b-homer.3
- SPEC file clean-up

* Sat Feb 12 2005 Homer <homerj at nc.rr.com> 0.6b-homer.2
- appconfig.c: added remember-driver patch

* Tue Feb 8 2005 Homer <homerj at nc.rr.com> 0.6b-homer.1
- 0.6b (beta) release
- Makefile.am: added -lasound to wavbreaker_LDADD to fix compile error

* Fri Oct 29 2004 Homer <homerj at nc.rr.com> 0.5-homer.2
- attempted fix file closing bug (wavbreaker-fclose.patch)
- added BuildRequires for gtk2-devel

* Tue Jul 13 2004 Homer <homerj at nc.rr.com> 0.5-homer.1
- rebuilt for 0.5 release

* Thu Jul 1 2004 Homer <homerj at nc.rr.com> 0.4-homer.4
- actually fixed icon bug

* Thu Jul 1 2004 Homer <homerj at nc.rr.com> 0.4-homer.2
- (failed) attempt to fix icon bug

* Mon Jun 15 2004 Homer <homerj at nc.rr.com>
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 21:24:41 -0000	1.1
+++ .cvsignore	2 Oct 2006 21:25:06 -0000	1.2
@@ -0,0 +1 @@
+wavbreaker-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 21:24:41 -0000	1.1
+++ sources	2 Oct 2006 21:25:06 -0000	1.2
@@ -0,0 +1 @@
+6e5a776e124b8e02dd184b06bcce5c4a  wavbreaker-0.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 21:29:59 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 14:29:59 -0700
Subject: comps comps-fe6.xml.in,1.172,1.173 comps-fe5.xml.in,1.159,1.160
Message-ID: <200610022130.k92LU2m3023293@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23260

Modified Files:
	comps-fe6.xml.in comps-fe5.xml.in 
Log Message:
Add rawstudio to Graphics group



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- comps-fe6.xml.in	2 Oct 2006 17:53:13 -0000	1.172
+++ comps-fe6.xml.in	2 Oct 2006 21:29:59 -0000	1.173
@@ -588,6 +588,7 @@
       <packagereq type="optional">k3d</packagereq>
       <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">pydot</packagereq>
+      <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">showimg</packagereq>
       <packagereq type="optional">skencil</packagereq>


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- comps-fe5.xml.in	2 Oct 2006 12:32:23 -0000	1.159
+++ comps-fe5.xml.in	2 Oct 2006 21:29:59 -0000	1.160
@@ -511,6 +511,7 @@
       <packagereq type="optional">k3d</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>
+      <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">showimg</packagereq>
       <packagereq type="optional">skencil</packagereq>



From fedora-extras-commits at redhat.com  Mon Oct  2 21:33:27 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:33:27 -0700
Subject: owners owners.list,1.1762,1.1763
Message-ID: <200610022133.k92LXTVc023361@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344

Modified Files:
	owners.list 
Log Message:

Added miau (review BZ#208675)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1762
retrieving revision 1.1763
diff -u -r1.1762 -r1.1763
--- owners.list	2 Oct 2006 19:43:41 -0000	1.1762
+++ owners.list	2 Oct 2006 21:33:26 -0000	1.1763
@@ -1014,6 +1014,7 @@
 Fedora Extras|mgopen-fonts|Truetype greek fonts|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|mhash|Thread-safe hash algorithms library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|mhonarc|A Perl mail-to-HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|miau|Full-featured IRC bouncer|jima at beer.tclug.org|extras-qa at fedoraproject.org|
 Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|milter-regex|Sendmail milter plugin for regular expression filtering|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|mimedefang|E-Mail filtering framework using Sendmail's Milter interface|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 21:34:23 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:34:23 -0700
Subject: rpms/miau/devel - New directory
Message-ID: <200610022134.k92LYPPv023439@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23410/miau/devel

Log Message:
Directory /cvs/extras/rpms/miau/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 21:34:22 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:34:22 -0700
Subject: rpms/miau - New directory
Message-ID: <200610022134.k92LYOS0023436@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23410/miau

Log Message:
Directory /cvs/extras/rpms/miau added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 21:34:34 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:34:34 -0700
Subject: rpms/miau Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610022134.k92LYa59023488@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23455

Added Files:
	Makefile import.log 
Log Message:
Setup of module miau


--- NEW FILE Makefile ---
# Top level Makefile for module miau
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 21:34:34 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:34:34 -0700
Subject: rpms/miau/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610022134.k92LYaFg023491@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23455/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module miau


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 21:35:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:35:02 -0700
Subject: rpms/miau import.log,1.1,1.2
Message-ID: <200610022135.k92LZZm4023559@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23525

Modified Files:
	import.log 
Log Message:
auto-import miau-0.6.2-3 on branch devel from miau-0.6.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/miau/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 21:34:34 -0000	1.1
+++ import.log	2 Oct 2006 21:35:02 -0000	1.2
@@ -0,0 +1 @@
+miau-0_6_2-3:HEAD:miau-0.6.2-3.src.rpm:1159824897



From fedora-extras-commits at redhat.com  Mon Oct  2 21:35:03 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  2 Oct 2006 14:35:03 -0700
Subject: rpms/miau/devel miau.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610022135.k92LZZDs023563@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/miau/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23525/devel

Modified Files:
	.cvsignore sources 
Added Files:
	miau.spec 
Log Message:
auto-import miau-0.6.2-3 on branch devel from miau-0.6.2-3.src.rpm


--- NEW FILE miau.spec ---
Name:           miau
Version:        0.6.2
Release:        3%{?dist}
Summary:        Full-featured IRC bouncer

Group:          Applications/Internet
License:        GPL
URL:            http://miau.sourceforge.net/
Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
miau is a smart and versatile IRC-bouncing tool for *NIX. The difference 
between miau and other bouncers is that miau will go on IRC as soon as 
it is launched, guarding or attempting to get your nick. Control over 
the session can be taken as with other bouncers, by simply connecting to 
miau (and providing a password) like you would connect to a normal IRC 
server. On disconnect, miau is able to stay in the channels and to 
reintroduce them to your client on your next connect. Other handy 
features are message logging, flood protection, and DCC bouncing.

%prep
%setup -q


%build
COMMON="--enable-local --enable-dccbounce --enable-automode --enable-releasenick --enable-ctcp-replies --enable-mkpasswd --enable-uptime --enable-chanlog --enable-privlog --enable-onconnect  --enable-empty-awaymsg"
%configure \
    --enable-ipv6 \
    $COMMON
make %{?_smp_mflags}
mv src/%{name} src/%{name}-ipv6
%configure \
    $COMMON
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 \
    $RPM_BUILD_ROOT%{_infodir}
install -m 0755 src/%{name} $RPM_BUILD_ROOT%{_bindir}
install -m 0755 src/%{name}-ipv6 $RPM_BUILD_ROOT%{_bindir}
install -m 0644 doc/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
install -m 0644 doc/%{name}.info $RPM_BUILD_ROOT%{_infodir}


%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 AUTHORS ChangeLog COPYING misc/miaurc NEWS README TODO
%{_bindir}/%{name}
%{_bindir}/%{name}-ipv6
%{_mandir}/man1/%{name}.1*
%{_infodir}/%{name}.info*

%changelog
* Mon Oct 02 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.6.2-3
- Fixed scriptlets, added Reqs for install-info, removed INSTALL from docs

* Fri Sep 29 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.6.2-2
- Initial Fedora Extras RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/miau/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 21:34:34 -0000	1.1
+++ .cvsignore	2 Oct 2006 21:35:03 -0000	1.2
@@ -0,0 +1 @@
+miau-0.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/miau/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 21:34:34 -0000	1.1
+++ sources	2 Oct 2006 21:35:03 -0000	1.2
@@ -0,0 +1 @@
+8a7a8a80250a9a316a3dc9d6fb15ecbe  miau-0.6.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 21:49:43 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Mon,  2 Oct 2006 14:49:43 -0700
Subject: owners owners.list,1.1763,1.1764
Message-ID: <200610022149.k92Lnkpd023703@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23686/owners

Modified Files:
	owners.list 
Log Message:
added owners.list entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1763
retrieving revision 1.1764
diff -u -r1.1763 -r1.1764
--- owners.list	2 Oct 2006 21:33:26 -0000	1.1763
+++ owners.list	2 Oct 2006 21:49:43 -0000	1.1764
@@ -2218,6 +2218,7 @@
 Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wavpack|A completely open audiocodec|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|wcstools|Software utilities to display and manipulate the WCS of a FITS image|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  2 22:03:09 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:03:09 -0700
Subject: rpms/alleyoop - New directory
Message-ID: <200610022203.k92M3BaC026667@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26646/alleyoop

Log Message:
Directory /cvs/extras/rpms/alleyoop added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 22:03:10 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:03:10 -0700
Subject: rpms/alleyoop/devel - New directory
Message-ID: <200610022203.k92M3Cud026675@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26646/alleyoop/devel

Log Message:
Directory /cvs/extras/rpms/alleyoop/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  2 22:03:49 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:03:49 -0700
Subject: rpms/alleyoop/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610022203.k92M3pwa026722@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26691/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alleyoop


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  2 22:03:47 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:03:47 -0700
Subject: rpms/alleyoop Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610022203.k92M3nii026707@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26691

Added Files:
	Makefile import.log 
Log Message:
Setup of module alleyoop


--- NEW FILE Makefile ---
# Top level Makefile for module alleyoop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  2 22:05:17 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:05:17 -0700
Subject: rpms/alleyoop/devel alleyoop.desktop, NONE, 1.1 alleyoop.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610022205.k92M5JX6026799@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26763/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alleyoop.desktop alleyoop.spec 
Log Message:
auto-import alleyoop-0.9.3-2 on branch devel from alleyoop-0.9.3-2.src.rpm


--- NEW FILE alleyoop.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Alleyoop
GenericName=Memory Checker
Comment=Validate the memory usage of any program
Exec=alleyoop
Icon=gnome-devel.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Application;GNOME;Development;X-Fedora;
Version=0.9.0


--- NEW FILE alleyoop.spec ---
Name:       alleyoop
Version:    0.9.3
Release:    2%{?dist}
License:    GPL
Group:      Development/Tools
Summary:    Graphical front-end to the Valgrind memory checker for x86
URL:        http://alleyoop.sourceforge.net/
Source0:    http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:    alleyoop.desktop
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: valgrind >= 3.1.0
BuildRequires: libgnomeui-devel, gettext, intltool
BuildRequires: desktop-file-utils
BuildRequires: binutils-devel

Requires: valgrind >= 3.1.0
Requires: GConf2, scrollkeeper
# Limited to arches where valgrind exists
ExclusiveArch: %{ix86} x86_64

%description
Alleyoop is a graphical front-end to the increasingly popular Valgrind
memory checker for x86 GNU/ Linux using the Gtk+ widget set and other
GNOME libraries for the X Windows System.

Features include a right-click context menu to intelligently suppress
errors or launch an editor on the source file/jumping to the exact
line of the error condition. A searchbar at the top of the viewer can
be used to limit the viewable errors to those that match the regex
criteria entered. Also included is a fully functional Suppressions
editor.

%prep
%setup -q

%build
%configure --disable-install-schemas
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
make install DESTDIR=${RPM_BUILD_ROOT}
%find_lang %{name}

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

%post
export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
scrollkeeper-update -q

%postun
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
scrollkeeper-update -q

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%config %{_sysconfdir}/gconf/schemas/*.schemas
%{_bindir}/*
%{_datadir}/applications/*.desktop


%changelog
* Mon Oct 2 2006 Gianluca Sforna <giallu gmail com> 0.9.3-2
- address comments from review (BZ# 201417)

* Tue Aug 15 2006 Gianluca Sforna <giallu gmail com> 0.9.3-1
- version update
- add BRs: desktop-file-utils, intlutil

* Thu Aug 3 2006 Gianluca Sforna <giallu gmail com> 0.9.2-1
- version update
- dropped patches
- raised required valgrind version

* Thu Sep  1 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-3
- add BR: gettext
- "X-Desktop-File-Install-Version=0.4" removed from alleyop.desktop
- s/X-Windows/X Window System/ in %%description
- gconftool-2 --makefile-uninstall-rule code added in %%postun
- Requires for GConf2 and scrollkeeper added
- Patch to use --log-fd (new syntax)

* Thu Jul 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-2
- fix stupid typo in ExclusiveArch

* Wed Jul 27 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alleyoop/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Oct 2006 22:03:48 -0000	1.1
+++ .cvsignore	2 Oct 2006 22:05:16 -0000	1.2
@@ -0,0 +1 @@
+alleyoop-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alleyoop/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Oct 2006 22:03:48 -0000	1.1
+++ sources	2 Oct 2006 22:05:16 -0000	1.2
@@ -0,0 +1 @@
+b3a4703f60448c30122ca55fd00d1c0f  alleyoop-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 22:05:15 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:05:15 -0700
Subject: rpms/alleyoop import.log,1.1,1.2
Message-ID: <200610022205.k92M5lXw026857@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26763

Modified Files:
	import.log 
Log Message:
auto-import alleyoop-0.9.3-2 on branch devel from alleyoop-0.9.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alleyoop/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Oct 2006 22:03:45 -0000	1.1
+++ import.log	2 Oct 2006 22:05:15 -0000	1.2
@@ -0,0 +1 @@
+alleyoop-0_9_3-2:HEAD:alleyoop-0.9.3-2.src.rpm:1159826702



From fedora-extras-commits at redhat.com  Mon Oct  2 22:18:59 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  2 Oct 2006 15:18:59 -0700
Subject: owners owners.list,1.1764,1.1765
Message-ID: <200610022219.k92MJ1v4027024@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26985

Modified Files:
	owners.list 
Log Message:
Add alleyoop package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1764
retrieving revision 1.1765
diff -u -r1.1764 -r1.1765
--- owners.list	2 Oct 2006 21:49:43 -0000	1.1764
+++ owners.list	2 Oct 2006 22:18:59 -0000	1.1765
@@ -38,6 +38,7 @@
 Fedora Extras|alleggl|OpenGL support library for Allegro|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
 Fedora Extras|AllegroOGG|Ogg library for use with the Allegro game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|alleyoop|Graphical front-end to the Valgrind memory checker|giallu at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|alltray|Dock any application in the tray|denis at poolshark.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de



From fedora-extras-commits at redhat.com  Mon Oct  2 22:30:07 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon,  2 Oct 2006 15:30:07 -0700
Subject: rpms/gaim-otr/devel gaim-otr.spec,1.22,1.23
Message-ID: <200610022230.k92MU9V0027210@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27180

Modified Files:
	gaim-otr.spec 
Log Message:
* Mon Oct  2 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.2.20060921cvs
- rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: gaim-otr.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-otr/devel/gaim-otr.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gaim-otr.spec	22 Sep 2006 15:21:07 -0000	1.22
+++ gaim-otr.spec	2 Oct 2006 22:30:06 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Off-The-Record Messaging plugin for GAIM
 Name: gaim-otr
 Version: 3.0.1
-Release: 0.1.20060921cvs%{?dist}
+Release: 0.2.20060921cvs%{?dist}
 #Source: http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
 Source: %{name}-20060712.tar.gz
 Url: http://www.cypherpunks.ca/otr/
@@ -47,6 +47,9 @@
 %{_libdir}/gaim/gaim-otr.so
 
 %changelog
+* Mon Oct  2 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.2.20060921cvs
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.1.20060921cvs
 - Made an error in the cvs version number, breaking the upgrade path.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 22:49:15 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  2 Oct 2006 15:49:15 -0700
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.4,1.5
Message-ID: <200610022249.k92MnHKR027389@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27372

Modified Files:
	qcomicbook.spec 
Log Message:
New version to match FC5



Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qcomicbook.spec	20 Sep 2006 20:26:56 -0000	1.4
+++ qcomicbook.spec	2 Oct 2006 22:49:15 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -9,16 +9,12 @@
 Source: http://linux.bydg.org/~yogin/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
-#BuildArch: i686
 BuildRequires: qt-devel >= 3.3.1
 BuildRequires: imlib2-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXi-devel
 BuildRequires: desktop-file-utils
 
-#Requires: qt >= 3.3.1
-#Requires: imlib2
-
 %description
 QComicBook is a viewer for comic book archives: rar, cbr,
 zip, cbz, ace, cba,tar.gz, cbg, tar.bz2, cbb. QComicBook 
@@ -64,7 +60,7 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-1
+* Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-2
 - Bumped release to 0.3.3
 
 * Sun Sep 03 2006 Scott Baker <scott at perturb.org> - 0.3.2-6



From fedora-extras-commits at redhat.com  Mon Oct  2 22:49:39 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 15:49:39 -0700
Subject: rpms/multitail/devel multitail.spec,1.9,1.10
Message-ID: <200610022249.k92MnfjH027452@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27435

Modified Files:
	multitail.spec 
Log Message:
Rebuild.


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- multitail.spec	18 Sep 2006 18:48:11 -0000	1.9
+++ multitail.spec	2 Oct 2006 22:49:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           multitail
 Version:        4.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        View one or multiple files like tail but with multiple windows
 
 Group:          Applications/Text
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 4.2.0-2
+- Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
+
 * Mon Sep 18 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.2.0-1
 - Updated to release 4.2.0.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 22:51:54 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Oct 2006 15:51:54 -0700
Subject: rpms/perl-Cairo/devel perl-Cairo.spec,1.6,1.7
Message-ID: <200610022251.k92MpuN6027597@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27580

Modified Files:
	perl-Cairo.spec 
Log Message:
Rebuild.


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/perl-Cairo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Cairo.spec	26 Sep 2006 21:48:00 -0000	1.6
+++ perl-Cairo.spec	2 Oct 2006 22:51:54 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           perl-Cairo
 Version:        1.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the cairo library
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Oct  2 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-2
+- Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
+
 * Tue Sep 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-1
 - Update to 1.01.
 



From fedora-extras-commits at redhat.com  Mon Oct  2 22:54:46 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  2 Oct 2006 15:54:46 -0700
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.5,1.6
Message-ID: <200610022254.k92MsmxJ027786@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27766

Modified Files:
	qcomicbook.spec 
Log Message:
Build for FC6



Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qcomicbook.spec	2 Oct 2006 22:49:15 -0000	1.5
+++ qcomicbook.spec	2 Oct 2006 22:54:46 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -60,6 +60,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-3
+- Build on FC6
+
 * Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-2
 - Bumped release to 0.3.3
 



From fedora-extras-commits at redhat.com  Mon Oct  2 23:13:54 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  2 Oct 2006 16:13:54 -0700
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.8,
	1.9 NetworkManager-vpnc.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <200610022313.k92NDumh032217@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32183

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Log Message:
Update to CVS snapshot 060929. Some rpmlint cleanup


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 May 2006 05:12:51 -0000	1.8
+++ .cvsignore	2 Oct 2006 23:13:54 -0000	1.9
@@ -1,7 +1 @@
-NetworkManager-vpnc-0.2.tar.gz
-NetworkManager-vpnc-0.3.tar.gz
-NetworkManager-vpnc-0.5.0.tar.gz
-NetworkManager-vpnc-0.6.0.tar.gz
-NetworkManager-vpnc-0.6.2.tar.gz
-NetworkManager-vpnc-0.7.0.cvs20060521.tar.gz
-NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz
+NetworkManager-vpnc-0.7.0.cvs20060929.tar.gz


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NetworkManager-vpnc.spec	28 Sep 2006 23:30:45 -0000	1.16
+++ NetworkManager-vpnc.spec	2 Oct 2006 23:13:54 -0000	1.17
@@ -7,17 +7,19 @@
 %define cvs_snapshot 1
 
 %if %{cvs_snapshot}
-%define nm_vpnc_cvs_version	.cvs20060529
+%define nm_vpnc_cvs_version .cvs20060929
 %endif
 
-Summary: NetworkManager VPN integration for vpnc
-Name: NetworkManager-vpnc
-Version: 0.7.0
-Release: 0%{?nm_vpnc_cvs_version}.4%{?dist}
-License: GPL
-Group: System Environment/Base
-Source: %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
+Summary:   NetworkManager VPN integration for vpnc
+Name:      NetworkManager-vpnc
+Version:   0.7.0
+Release:   0%{?nm_vpnc_cvs_version}.1%{?dist}
+License:   GPL
+Group:     System Environment/Base
+URL:       http://www.gnome.org/projects/NetworkManager/
+Source:    %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
@@ -26,18 +28,18 @@
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: libpng-devel
-BuildRequires: perl(XML::Parser) gettext
-PreReq: /usr/bin/update-desktop-database
-PreReq: /usr/bin/gtk-update-icon-cache
+BuildRequires: intltool gettext
+
 Requires: gtk2             >= %{gtk2_version}
 Requires: dbus             >= %{dbus_version}
 Requires: NetworkManager   >= %{nm_version}
 Requires: vpnc             >= %{vpnc_version}
 Requires: shared-mime-info >= %{shared_mime_version}
 Requires: GConf2
-Requires: libgnomeui
 Requires: gnome-keyring
-Requires: libglade2
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 
 %description
 This package contains software for integrating the vpnc VPN software
@@ -48,19 +50,22 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
+rm -f %{buildroot}%{_libdir}/lib*.so
 
 %find_lang %{name}
 
+
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post
 /sbin/ldconfig
@@ -69,6 +74,7 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
+
 %postun
 /sbin/ldconfig
 /usr/bin/update-desktop-database > /dev/null
@@ -76,14 +82,15 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog
 %{_libdir}/lib*.so*
 %{_libexecdir}/nm-vpnc-auth-dialog
-%{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
-%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
+%config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
 %{_bindir}/nm-vpnc-service
 %{_bindir}/nm-vpnc-service-vpnc-helper
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
@@ -91,7 +98,11 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
-* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.4%{?dist}
+* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.1
+- Update to CVS snapshot 060929
+- Some rpmlint cleanups
+
+* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.4
 - Added XML::Parser BR
 
 * Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 May 2006 05:12:51 -0000	1.8
+++ sources	2 Oct 2006 23:13:54 -0000	1.9
@@ -1 +1 @@
-e49518b7932079ceaf4b358d6b0a727e  NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz
+882293dbed2f8af9c0cd61bc65fdaa3f  NetworkManager-vpnc-0.7.0.cvs20060929.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  2 23:29:43 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  2 Oct 2006 16:29:43 -0700
Subject: rpms/glibmm24/devel .cvsignore, 1.11, 1.12 glibmm.spec, 1.15,
	1.16 sources, 1.12, 1.13
Message-ID: <200610022329.k92NTjpr002032@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2001

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to 2.12.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Aug 2006 16:09:01 -0000	1.11
+++ .cvsignore	2 Oct 2006 23:29:43 -0000	1.12
@@ -1 +1 @@
-glibmm-2.12.0.tar.bz2
+glibmm-2.12.2.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glibmm.spec	28 Aug 2006 08:37:10 -0000	1.15
+++ glibmm.spec	2 Oct 2006 23:29:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           glibmm24
-Version:        2.12.0
-Release:        2
+Version:        2.12.2
+Release:        1
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Oct  2 2006 Denis Leroy <denis at poolshark.org> - 2.12.2-1
+- Update to 2.12.2
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 2.12.0-2
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Aug 2006 16:09:01 -0000	1.12
+++ sources	2 Oct 2006 23:29:43 -0000	1.13
@@ -1 +1 @@
-5f6c1ced9e2537f512d5b37f7f2f58ce  glibmm-2.12.0.tar.bz2
+a70be72261b19a080b1666e5e04fd43a  glibmm-2.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  2 23:52:22 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  2 Oct 2006 16:52:22 -0700
Subject: rpms/gtkmm24/devel .cvsignore, 1.9, 1.10 gtkmm.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200610022352.k92NqOYi004837@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to 2.10.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Aug 2006 16:38:55 -0000	1.9
+++ .cvsignore	2 Oct 2006 23:52:21 -0000	1.10
@@ -1 +1 @@
-gtkmm-2.10.0.tar.bz2
+gtkmm-2.10.2.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gtkmm.spec	28 Aug 2006 08:57:13 -0000	1.17
+++ gtkmm.spec	2 Oct 2006 23:52:21 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gtkmm24
-Version:        2.10.0
-Release:        3%{?dist}
+Version:        2.10.2
+Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 2.10.2-1
+- Update to 2.10.2
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 2.10.0-3
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Aug 2006 16:38:55 -0000	1.11
+++ sources	2 Oct 2006 23:52:21 -0000	1.12
@@ -1 +1 @@
-afdb26edc78060cbbb057df25f0416d3  gtkmm-2.10.0.tar.bz2
+b29ec706e544002d312cbefa0a65c446  gtkmm-2.10.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 00:51:54 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon,  2 Oct 2006 17:51:54 -0700
Subject: fedora-vote newelection.py,1.4,1.5 voting.py,1.10,1.11
Message-ID: <200610030051.k930ps7o009709@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/fedora/fedora-vote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9687

Modified Files:
	newelection.py voting.py 
Log Message:
* newelection.py: Set up the Fedora Ambassadors election.
* voting.py: Fix detection of double votes.  The code needed to detect
  votes per person *per election* rather than votes per person in any
  election.



Index: newelection.py
===================================================================
RCS file: /cvs/fedora/fedora-vote/newelection.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- newelection.py	21 Jun 2006 04:53:36 -0000	1.4
+++ newelection.py	3 Oct 2006 00:51:51 -0000	1.5
@@ -14,31 +14,39 @@
 dbHost = 'db1.fedora.phx.redhat.com'
 dbUser = 'electionsuser'
 
-electionName = 'FESCo 2006'
-start = '2006-06-22 00:00:00'
-end = '2006-07-02 23:59:59'
-seats = '13'
-
-votingGroups = ('cvsextras',)
-
-candidates = ('awjb',
-    'jwboyer',
-    'spot',
-    'rdieter',
-    'kevin',
-    'ausil',
-    'c4chris',
-    'katzj',
-    'mjk',
-    'toshio',
-    'thl',
-    'jpo',
-    'bpepple',
-    'mschwendt',
-    'scop',
-    'tibbs',
-    'wtogami',
-    'skvidal')
+electionName = 'Fedora Ambassadors 2006'
+start = '2006-09-21 00:00:00'
+end = '2006-09-27 23:59:59'
+#start = '2006-09-29 00:00:00'
+#end = '2006-10-05 23:59:59'
+seats = '7'
+
+votingGroups = ('ambassadors',)
+
+candidates = (
+    # Alex Maier
+    'amaier',
+    # Charles VINCHON
+    'cvinchon',
+    # Damien Durand
+    'splinux',
+    # David Nalley
+    'ke4qqq',
+    # Francesco Ugolini
+    'wmirror',
+    # Jack Aboutboul
+    'jaboutboul',
+    # Jeffrey Tadlock
+    'jeffreyt',
+    # Patrick W. Barnes
+    'nman64',
+    # Robert Whetsel
+    'rwhetsel',
+    # Rodrigo Padula
+    'rodrigop',
+    # Thomas Chung
+    'tchung'
+    )
 groupList = []
 candList = []
 


Index: voting.py
===================================================================
RCS file: /cvs/fedora/fedora-vote/voting.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- voting.py	22 Jun 2006 02:51:01 -0000	1.10
+++ voting.py	3 Oct 2006 00:51:51 -0000	1.11
@@ -137,7 +137,7 @@
                     ' accounts db' % username
 
         # Ask the voting db whether the userId has already voted
-        self.dbCmd.execute("select id from ballots where voter = '%s'" % userId)
+        self.dbCmd.execute("select id from ballots where voter = '%s' and election_id = '%s'" % (userId, self.electionId))
         if self.dbCmd.fetchall():
             return True
         return False



From fedora-extras-commits at redhat.com  Tue Oct  3 02:55:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:55:14 -0700
Subject: rpms/libmatheval - New directory
Message-ID: <200610030255.k932tGVj015885@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15864/libmatheval

Log Message:
Directory /cvs/extras/rpms/libmatheval added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 02:55:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:55:15 -0700
Subject: rpms/libmatheval/devel - New directory
Message-ID: <200610030255.k932tHlw015888@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15864/libmatheval/devel

Log Message:
Directory /cvs/extras/rpms/libmatheval/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 02:55:31 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:55:31 -0700
Subject: rpms/libmatheval Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610030255.k932tXWC015942@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15909

Added Files:
	Makefile import.log 
Log Message:
Setup of module libmatheval


--- NEW FILE Makefile ---
# Top level Makefile for module libmatheval
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct  3 02:55:32 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:55:32 -0700
Subject: rpms/libmatheval/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610030255.k932tY2G015945@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15909/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libmatheval


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct  3 02:56:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:56:06 -0700
Subject: rpms/libmatheval import.log,1.1,1.2
Message-ID: <200610030256.k932u8qS016012@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15978

Modified Files:
	import.log 
Log Message:
auto-import libmatheval-1.1.3-4 on branch devel from libmatheval-1.1.3-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmatheval/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Oct 2006 02:55:31 -0000	1.1
+++ import.log	3 Oct 2006 02:56:06 -0000	1.2
@@ -0,0 +1 @@
+libmatheval-1_1_3-4:HEAD:libmatheval-1.1.3-4.src.rpm:1159844161



From fedora-extras-commits at redhat.com  Tue Oct  3 02:56:07 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 19:56:07 -0700
Subject: rpms/libmatheval/devel libmatheval.spec, NONE,
	1.1 libmatheval_doc_add_info_dir.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610030256.k932u9aN016019@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmatheval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15978/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libmatheval.spec libmatheval_doc_add_info_dir.patch 
Log Message:
auto-import libmatheval-1.1.3-4 on branch devel from libmatheval-1.1.3-4.src.rpm


--- NEW FILE libmatheval.spec ---
Name:           libmatheval
Version:        1.1.3
Release:        4%{?dist}
Summary:        Library for parsing and evaluating symbolic expressions input as text

Group:          System Environment/Libraries
License:        GPL
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


%description
GNU libmatheval is a library (callable from C and Fortran) to parse
and evaluate symbolic expressions input as text.  It supports
expressions in any number of variables of arbitrary names, decimal and
symbolic constants, basic unary and binary operators, and elementary
mathematical functions.  In addition to parsing and evaluation,
libmatheval can also compute symbolic derivatives and output
expressions to strings.

%package devel
Summary:        Development files for libmatheval
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires(post):  /sbin/install-info
Requires(preun): /sbin/install-info

%description devel
This package contains the development files for libmatheval.


%prep
%setup -q
%patch0 -p0

%build
%configure F77=gfortran --disable-static
make %{?_smp_mflags}

%check
make check ||:


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_infodir}/dir


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun devel
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc NEWS 
%{_includedir}/*
%{_libdir}/*.so
%{_infodir}/libmatheval.info*


%changelog
* Sat Sep 23 2006  <ed at eh3.com> - 1.1.3-4
- add BR: texinfo

* Sat Sep 23 2006  <ed at eh3.com> - 1.1.3-3
- disable static libs and add check

* Thu Sep 21 2006  <ed at eh3.com> - 1.1.3-2
- add info dir patch

* Thu Sep 21 2006  <ed at eh3.com> - 1.1.3-1
- initial package creation


libmatheval_doc_add_info_dir.patch:

--- NEW FILE libmatheval_doc_add_info_dir.patch ---
--- doc/libmatheval.texi_ORIG	2006-09-21 10:03:24.000000000 -0400
+++ doc/libmatheval.texi	2006-09-21 10:06:50.000000000 -0400
@@ -9,6 +9,11 @@
 @include version.texi
 @syncodeindex fn cp
 
+ at dircategory Texinfo documentation system
+ at direntry
+* libmatheval: (libmatheval).           library for evaluating symbolic expressions
+ at end direntry
+
 @ifnottex
 This file documents GNU @code{libmatheval} library.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmatheval/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2006 02:55:32 -0000	1.1
+++ .cvsignore	3 Oct 2006 02:56:07 -0000	1.2
@@ -0,0 +1 @@
+libmatheval-1.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmatheval/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2006 02:55:32 -0000	1.1
+++ sources	3 Oct 2006 02:56:07 -0000	1.2
@@ -0,0 +1 @@
+e88b3429da2758c799e6fbc44ac87416  libmatheval-1.1.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 03:08:08 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon,  2 Oct 2006 20:08:08 -0700
Subject: owners owners.list,1.1765,1.1766
Message-ID: <200610030308.k9338Anx019044@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19023

Modified Files:
	owners.list 
Log Message:
add libmatheval



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1765
retrieving revision 1.1766
diff -u -r1.1765 -r1.1766
--- owners.list	2 Oct 2006 22:18:59 -0000	1.1765
+++ owners.list	3 Oct 2006 03:08:08 -0000	1.1766
@@ -872,6 +872,7 @@
 Fedora Extras|liblrdf|Library for manipulating RDF files describing LADSPA plugins|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libmatheval|Library for parsing and evaluating symbolic expressions input as text|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmatroska|An open Audio/Video container format|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmodelfile|Library for accessing various model file formats|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct  3 03:13:27 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon,  2 Oct 2006 20:13:27 -0700
Subject: rpms/openbox/devel openbox.spec,1.18,1.19
Message-ID: <200610030313.k933DTdE019177@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/openbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19160

Modified Files:
	openbox.spec 
Log Message:
Rebuilding to pick up unwind info generation fixes in new GCC


Index: openbox.spec
===================================================================
RCS file: /cvs/extras/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openbox.spec	20 Sep 2006 19:38:03 -0000	1.18
+++ openbox.spec	3 Oct 2006 03:13:27 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Mon Oct 02 2006 Peter Gordon <peter at thecodergeek.com> - 3.3.1-3
+- Rebuild to pick up unwind info generation fixes in new GCC
+
 * Wed Sep 20 2006 Peter Gordon <peter at thecodergeek.com> - 3.3.1-2
 - Allow building with startup-notification as an rpmbuild option (though it is
   disabled by default as recommended by upstream).



From fedora-extras-commits at redhat.com  Tue Oct  3 04:34:08 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon,  2 Oct 2006 21:34:08 -0700
Subject: rpms/gutenprint/devel gutenprint.spec,1.1,1.2
Message-ID: <200610030434.k934YA7h022370@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/gutenprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353

Modified Files:
	gutenprint.spec 
Log Message:



Index: gutenprint.spec
===================================================================
RCS file: /cvs/extras/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gutenprint.spec	30 Sep 2006 03:16:25 -0000	1.1
+++ gutenprint.spec	3 Oct 2006 04:34:07 -0000	1.2
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.0.0
-Release:        0.14%{?dist}
+Release:        0.15%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -379,6 +379,9 @@
 %{_datadir}/cups/model/gutenprint/5.0/zh_TW
 
 %changelog
+* Thu Oct 03 2006 Parag Nemade <panemade at gmail.com>- 5.0.0-0.15
+- Did some fix for tag issue
+
 * Thu Sep 29 2006 Parag Nemade <panemade at gmail.com>- 5.0.0-0.14
 - Removed unwanted .la files and made following files owned by 
   main package.



From fedora-extras-commits at redhat.com  Tue Oct  3 05:24:43 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:24:43 -0700
Subject: rpms/php-pear-PHPUnit/devel - New directory
Message-ID: <200610030524.k935OjPF025475@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/php-pear-PHPUnit/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-PHPUnit/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 05:24:42 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:24:42 -0700
Subject: rpms/php-pear-PHPUnit - New directory
Message-ID: <200610030524.k935Oi3F025472@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/php-pear-PHPUnit

Log Message:
Directory /cvs/extras/rpms/php-pear-PHPUnit added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 05:25:03 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:25:03 -0700
Subject: rpms/php-pear-PHPUnit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610030525.k935P5rQ025524@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25496

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-PHPUnit


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-PHPUnit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct  3 05:25:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:25:04 -0700
Subject: rpms/php-pear-PHPUnit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610030525.k935P6lp025527@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25496/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-PHPUnit


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct  3 05:25:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:25:48 -0700
Subject: rpms/php-pear-PHPUnit import.log,1.1,1.2
Message-ID: <200610030525.k935PpkA025599@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25565

Modified Files:
	import.log 
Log Message:
auto-import php-pear-PHPUnit-1.3.2-1.fc5 on branch devel from php-pear-PHPUnit-1.3.2-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Oct 2006 05:25:03 -0000	1.1
+++ import.log	3 Oct 2006 05:25:48 -0000	1.2
@@ -0,0 +1 @@
+php-pear-PHPUnit-1_3_2-1_fc5:HEAD:php-pear-PHPUnit-1.3.2-1.fc5.src.rpm:1159853141



From fedora-extras-commits at redhat.com  Tue Oct  3 05:25:49 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:25:49 -0700
Subject: rpms/php-pear-PHPUnit/devel php-pear-PHPUnit.spec, NONE,
	1.1 xml2changelog, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610030525.k935Pp38025604@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25565/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-PHPUnit.spec xml2changelog 
Log Message:
auto-import php-pear-PHPUnit-1.3.2-1.fc5 on branch devel from php-pear-PHPUnit-1.3.2-1.fc5.src.rpm


--- NEW FILE php-pear-PHPUnit.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name PHPUnit

Name:           php-pear-PHPUnit
Version:        1.3.2
Release:        1%{?dist}
Summary:        Regression testing framework for unit tests
Summary(fr):    Outils de test de r??gression pour les tests unitaires

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/PHPUnit
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php >= 4.3.0 php-pear(PEAR)

%description
PHPUnit is a regression testing framework used by the developer who
implements unit tests in PHP. This is the version to be used with PHP 4.

Developers should use PHPUnit2 with PHP5.

%description -l fr
PHPUnit est un outil de test de r??gression utilis?? par les d??veloppeurs
qui construise des tests unitaires en PHP. Cette version ??tait utilis??e
avec PHP4.

Les developpeurs devraient utiliser PHPUnit2 avec PHP5.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}

%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.

%install
rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc CHANGELOG
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/PHPUnit
%{pear_phpdir}/PHPUnit.php

%changelog
* Mon Oct  2 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
- generated specfile (pear make-rpm-spec) + cleaning
- add french summary and description


--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2006 05:25:03 -0000	1.1
+++ .cvsignore	3 Oct 2006 05:25:49 -0000	1.2
@@ -0,0 +1 @@
+PHPUnit-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2006 05:25:03 -0000	1.1
+++ sources	3 Oct 2006 05:25:49 -0000	1.2
@@ -0,0 +1 @@
+4b9dd2158e4035318481c93bbd59aaa5  PHPUnit-1.3.2.tgz



From fedora-extras-commits at redhat.com  Tue Oct  3 05:30:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon,  2 Oct 2006 22:30:55 -0700
Subject: owners owners.list,1.1766,1.1767
Message-ID: <200610030530.k935Uvfh025679@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25661

Modified Files:
	owners.list 
Log Message:
	Add php-pear-PHPUnit - Regression testing framework for unit tests



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1766
retrieving revision 1.1767
diff -u -r1.1766 -r1.1767
--- owners.list	3 Oct 2006 03:08:08 -0000	1.1766
+++ owners.list	3 Oct 2006 05:30:55 -0000	1.1767
@@ -1717,6 +1717,7 @@
 Fedora Extras|php-pear-PEAR-Command-Packaging|Create RPM spec files from PEAR modules|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHP-Compat|Provides missing functionality for older versions of PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHP-CompatInfo|Find out version and extensions required for a piece of code to run|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct  3 07:27:48 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 00:27:48 -0700
Subject: rpms/showimg/FC-4 showimg.spec,1.10,1.11
Message-ID: <200610030727.k937Roal031911@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31890

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- showimg.spec	1 Jun 2006 21:58:30 -0000	1.10
+++ showimg.spec	3 Oct 2006 07:27:47 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        7%{?dist}
+Release:        10%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,15 @@
 
 
 %changelog
+* Thu Sep 21 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-10
+- yep, just that
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-9
+- guess what...
+
+* Thu Jun 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-8
+- rebuild (again)
+
 * Thu Jun 01 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-7
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct  3 07:49:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:49:39 -0700
Subject: rpms/ivman/devel - New directory
Message-ID: <200610030749.k937nfhI032609@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32585/ivman/devel

Log Message:
Directory /cvs/extras/rpms/ivman/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 07:49:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:49:38 -0700
Subject: rpms/ivman - New directory
Message-ID: <200610030749.k937nedP032606@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32585/ivman

Log Message:
Directory /cvs/extras/rpms/ivman added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 07:49:59 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:49:59 -0700
Subject: rpms/ivman Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610030750.k937o15Y032658@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32630

Added Files:
	Makefile import.log 
Log Message:
Setup of module ivman


--- NEW FILE Makefile ---
# Top level Makefile for module ivman
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct  3 07:49:59 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:49:59 -0700
Subject: rpms/ivman/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610030750.k937o1FB032661@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32630/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ivman


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct  3 07:51:01 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:51:01 -0700
Subject: rpms/ivman import.log,1.1,1.2
Message-ID: <200610030751.k937p3tV032756@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32717

Modified Files:
	import.log 
Log Message:
auto-import ivman-0.6.12-1 on branch devel from ivman-0.6.12-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ivman/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Oct 2006 07:49:59 -0000	1.1
+++ import.log	3 Oct 2006 07:51:01 -0000	1.2
@@ -0,0 +1 @@
+ivman-0_6_12-1:HEAD:ivman-0.6.12-1.src.rpm:1159861642



From fedora-extras-commits at redhat.com  Tue Oct  3 07:51:01 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 00:51:01 -0700
Subject: rpms/ivman/devel ivman-0.6.12-daemon.patch, NONE,
	1.1 ivman-0.6.12-gnome-mount.patch, NONE,
	1.1 ivman-0.6.12-new_hal.patch, NONE, 1.1 ivman-initscript, NONE,
	1.1 ivman.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610030751.k937p3Zn032767@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/ivman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32717/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ivman-0.6.12-daemon.patch ivman-0.6.12-gnome-mount.patch 
	ivman-0.6.12-new_hal.patch ivman-initscript ivman.spec 
Log Message:
auto-import ivman-0.6.12-1 on branch devel from ivman-0.6.12-1.src.rpm

ivman-0.6.12-daemon.patch:

--- NEW FILE ivman-0.6.12-daemon.patch ---
--- ivman-0.6.12/src/IvmConfig/IvmConfigBase.xml.daemon	2006-04-18 09:48:11.000000000 +0200
+++ ivman-0.6.12/src/IvmConfig/IvmConfigBase.xml	2006-09-29 12:36:46.000000000 +0200
@@ -7,7 +7,7 @@
 
     <!-- Whether or not to give debugging output.  Warning, this is very
          verbose! -->
-    <ivm:Option name="debug" value="true" />
+    <ivm:Option name="debug" value="false" />
 
     <!-- whether or not system-wide ivman should sleep a little while before
          mounting volumes.  Default: true. -->
@@ -24,7 +24,7 @@
     <ivm:Option name="user" value="ivman" /> 
 
     <!-- group for Ivman to run as. Should have permissions to run 'pmount'. -->
-    <ivm:Option name="group" value="plugdev" />
+    <ivm:Option name="group" value="daemon" />
 
     <!-- mount command.  default is autodetected.  Must be specified with
          umountcommand. -->

ivman-0.6.12-gnome-mount.patch:

--- NEW FILE ivman-0.6.12-gnome-mount.patch ---
--- ivman-0.6.12/src/manager.c.gnome-mount	2006-04-18 09:48:11.000000000 +0200
+++ ivman-0.6.12/src/manager.c	2006-10-01 09:46:03.000000000 +0200
@@ -11,7 +11,7 @@
  * 
  * See http://www.troll.no/qpl for QPL licensing information.
  *
- * $Id: manager.c,v 1.74 2006/04/18 04:20:23 ro_han Exp $
+ * $Id: manager.c,v 1.76 2006/10/01 07:18:57 ro_han Exp $
  ************************************************************************/
 
 #define _GNU_SOURCE
@@ -266,11 +266,11 @@
 
     // Test if pmount-hal exists
     if ( usermode ) {
-        if ( !command_exists( "pmount-hal &> /dev/null" ) ) {
+        if ( !command_exists( "pmount-hal > /dev/null 2>&1" ) ) {
             DEBUG(_("pmount-hal was not found on your system.\n"));
         }
         else {
-            if ( !command_exists( "pumount &> /dev/null" ) ) {
+            if ( !command_exists( "pumount > /dev/null 2>&1" ) ) {
                 DEBUG(_("pmount-hal was found on your system, but pumount "
                         "wasn't!\n"));
             }
@@ -284,20 +284,33 @@
                 return;
             }
         }
+        // Test if gnome-mount exists
+        if ( !command_exists( "gnome-mount > /dev/null 2>&1" ) ) {
+            DEBUG(_("gnome-mount was not found on your system.\n"));
+        }
+        else {
+            DEBUG(_
+                  ("gnome-mount was found on your system. It will be "
+                   "used for mounting.\n"));
+            known_mount_command = "gnome-mount -h '$hal.info.udi$'";
+            unknown_mount_command = known_mount_command;
+            umount_command = "gnome-mount -u -d '$hal.block.device$'";
+            return;
+        }
     }
     else {
         DEBUG(_
-              ("pmount-hal detection skipped, as we are a root instance "
-               "of Ivman.  pmount-hal is only used for user instances.\n"));
+              ("pmount-hal/gnome-mount detection skipped, as we are a root instance "
+               "of Ivman.  pmount-hal/gnome-mount is only used for user instances.\n"));
     }
 
 
     // Now try looking for regular pmount.
-    if ( !command_exists( "pmount &> /dev/null" ) ) {
+    if ( !command_exists( "pmount > /dev/null 2>&1" ) ) {
         DEBUG(_("pmount was not found on your system.\n"));
     }
     else {
-        if ( !command_exists( "pumount &> /dev/null" ) ) {
+        if ( !command_exists( "pumount > /dev/null 2>&1" ) ) {
             DEBUG(_
                   ("pmount was found on your system, but pumount "
                    "wasn't!\n"));
@@ -323,7 +336,7 @@
                 g_string_append( pmount_umask_check, " --help | " );
             pmount_umask_check =
                 g_string_append( pmount_umask_check, GREP_PATH
-                                " -- '-u <' &> /dev/null");
+                                " -- '-u <' > /dev/null 2>&1");
 
             gboolean umask_accepted =
                 command_succeeds( pmount_umask_check->str );
@@ -366,12 +379,12 @@
 
 
     // At the bottom of the barrel is plain old mount ...
-    if ( !command_exists( "mount &> /dev/null" ) ) {
+    if ( !command_exists( "mount > /dev/null 2>&1" ) ) {
         DEBUG(_("mount was not found on your system.\n"));
     }
 
     else {
-        if ( !command_exists( "umount &> /dev/null" ) ) {
+        if ( !command_exists( "umount > /dev/null 2>&1" ) ) {
             DEBUG(_
                   ("mount was found on your system, but umount was "
                    "not!\n"));

ivman-0.6.12-new_hal.patch:

--- NEW FILE ivman-0.6.12-new_hal.patch ---
--- ivman-0.6.12/src/IvmConfig/IvmConfigCommon.c.hal	2006-10-01 09:42:45.000000000 +0200
+++ ivman-0.6.12/src/IvmConfig/IvmConfigCommon.c	2006-10-01 09:43:14.000000000 +0200
@@ -251,7 +251,6 @@
        of these being true is sufficient)
        1) volume is a disc with no data 
        2) storage.automount_enabled_hint = false on block.storage_device
-       3) volume.is_mounted == true
      */
     if (libhal_device_property_exists
         (hal_ctx, udi, "volume.disc.has_data", &dbus_error)
@@ -301,18 +300,6 @@
         }
         libhal_free_string(new_udi);
     }
-    
-    if (libhal_device_property_exists
-        (hal_ctx, udi, "volume.is_mounted", &dbus_error)
-        && (libhal_device_get_property_bool(hal_ctx, udi,
-                                            "volume.is_mounted",
-                                            &dbus_error)))
-    {
-        DEBUG(_("\
-Won't try to mount device %s, as it is already mounted"), device);
-        libhal_free_string(device);
-        return FALSE;
-    }
 
 
     // yay, we made it!!!


--- NEW FILE ivman-initscript ---
#!/bin/sh
#
# ivman         This script starts ivman deamon
#
# chkconfig: - 26 59
# description: This script starts and stops the ivman deamon
# processname: ivman
# pid /var/run/ivman.pid
# config: /etc/ivman/*
#
### BEGIN INIT INFO
# Provides: ivman
# Required-Start: haldaemon
# Required-Stop: haldaemon
# Default-Stop: 0 1 6
# Short-Description: ivman daemon to handle HAL events
# Description: Ivman is a generic handler for HAL events. \
#              It can be used to automount, run arbitrary commands when \
#              events or conditions occur or properties are modified on your hardware \
#              (e.g., run a command when you close your laptop's lid, run a command when \
#              a particular device is attached or a particular CD is inserted, etc).
### END INIT INFO

. /etc/init.d/functions

processname=ivman
servicename=ivman

# Sanity checks.
[ -x /usr/bin/ivman ] || exit 0

RETVAL=0

function ivman_start() {
	echo -n "Starting ivman daemon: "
	daemon --check $servicename $processname
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
		touch /var/lock/subsys/$servicename
		echo `/sbin/pidof $processname` > /var/run/ivman.pid
	fi
	return $RETVAL
}

function ivman_stop() {
        echo -n "Stopping ivman daemon: "

	killproc $servicename -TERM
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
		rm -f /var/lock/subsys/$servicename
		rm -f /var/run/ivman.pid
	fi
	return $RETVAL
}

function ivman_status() {
	status $processname
	RETVAL=$?
	return $RETVAL
}

case "$1" in
    start)
	ivman_start
	RETVAL=$?
	;;
    stop)
	ivman_stop
	RETVAL=$?
	;;
    restart|reload)
	ivman_stop
	sleep 1
	ivman_start
	RETVAL=$?
	;;
    condrestart)
	if [ -f /var/lock/subsys/$servicename ]; then
	    ivman_stop
	    sleep 1
	    ivman_start
	    RETVAL=$?
	fi
	;;
    status)
	ivman_status
	;;
    *)
	echo "Usage: $0 {start|stop|restart|reload|status|condrestart}"
	exit 1
	;;
esac

exit $RETVAL


--- NEW FILE ivman.spec ---
Name:           ivman
Version:        0.6.12
Release:        1%{?dist}
Summary:        Generic handler for HAL events

Group:          System Environment/Libraries
License:        GPL/QPL
URL:            http://ivman.sourceforge.net/
Source0:        http://ovh.dl.sourceforge.net/sourceforge/ivman/ivman-%{version}.tar.bz2
# taken from mandriva spec and modified
Source1:        ivman-initscript
Patch0:         ivman-0.6.12-daemon.patch
# patches from ivman cvs
# detect gnome-mount and remove bashisms from command calls
Patch1:         ivman-0.6.12-gnome-mount.patch
# fix automount for new hal
Patch2:         ivman-0.6.12-new_hal.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pkgconfig gettext
BuildRequires:  libxml2-devel glib2-devel dbus-glib-devel hal-devel
#Requires:       
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service

%description
Ivman is a generic handler for HAL events. Originally for automounting, 
it can now be used to run arbitrary commands when events or conditions 
occur or properties are modified on your hardware (e.g., run a command 
when you close your laptop's lid, run a command when a particular device 
is attached or a particular CD is inserted, etc).

To be able to mount devices automatically as a user, you should also 
install gnome-mount and/or pmount.

%prep
%setup -q
%patch0 -p1 -b .daemon
%patch1 -p1 -b .gnome-mount
%patch2 -p1 -b .hal


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT

%pre
useradd -r -s /sbin/nologin -d / -M -c 'Ivman user' -g daemon ivman &>/dev/null || :

%post
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ]; then
        /sbin/service %{name} stop >/dev/null 2>&1 || :
        /sbin/chkconfig --del %{name}
fi

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


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING* AUTHORS ChangeLog README TODO
%dir %{_sysconfdir}/ivman
%config(noreplace) %{_sysconfdir}/ivman/IvmConfig*.xml
%{_initrddir}/%{name}
%{_bindir}/ivman*
%{_mandir}/man5/IvmConfig*.5*
%{_mandir}/man8/ivman*.8*


%changelog
* Sun Sep 24 2006 Patrice Dumas <pertusus at free.fr> 0.6.12-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ivman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2006 07:49:59 -0000	1.1
+++ .cvsignore	3 Oct 2006 07:51:01 -0000	1.2
@@ -0,0 +1 @@
+ivman-0.6.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ivman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2006 07:49:59 -0000	1.1
+++ sources	3 Oct 2006 07:51:01 -0000	1.2
@@ -0,0 +1 @@
+031c763d6acc927bf2fefd7c6140247d  ivman-0.6.12.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 08:19:54 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue,  3 Oct 2006 01:19:54 -0700
Subject: owners owners.list,1.1767,1.1768
Message-ID: <200610030819.k938JuLx003351@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3334

Modified Files:
	owners.list 
Log Message:
add ivman


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1767
retrieving revision 1.1768
diff -u -r1.1767 -r1.1768
--- owners.list	3 Oct 2006 05:30:55 -0000	1.1767
+++ owners.list	3 Oct 2006 08:19:54 -0000	1.1768
@@ -707,6 +707,7 @@
 Fedora Extras|itcl|Object oriented extension to Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|itext|A Free Java-PDF library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|itk|Object oriented extension to Tk|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|ivman|Generic handler for HAL events|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|iwidgets|A set of useful widgets based on itcl and itk|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|jack-audio-connection-kit|The Jack Audio Connection Kit|andy at smile.org.ua|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct  3 08:47:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 01:47:17 -0700
Subject: rpms/gwenview/devel .cvsignore, 1.5, 1.6 gwenview.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200610030847.k938lot7003492@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3446/devel

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
update to 1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Nov 2005 21:41:35 -0000	1.5
+++ .cvsignore	3 Oct 2006 08:47:17 -0000	1.6
@@ -1 +1,2 @@
-gwenview-1.3.1.tar.bz2
+gwenview-1.4.0.tar.bz2
+gwenview-i18n-1.4.0.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gwenview.spec	30 Aug 2006 15:13:29 -0000	1.16
+++ gwenview.spec	3 Oct 2006 08:47:17 -0000	1.17
@@ -1,12 +1,13 @@
 Name:           gwenview
-Version:        1.3.1
-Release:        6%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.3.1.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
+Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
@@ -17,6 +18,10 @@
 BuildRequires:  libXt-devel
 %endif
 
+# Maybe I'll split it in the future
+Provides:       gwenview-i18n = %{version}-%{release}
+
+
 %description
 Gwenview is an image viewer for KDE.
 
@@ -26,7 +31,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 
 
 %build
@@ -37,6 +42,11 @@
 # --enable-final  \
 make %{?_smp_mflags}
 
+cd %{name}-i18n-%{version}
+%configure
+make %{?_smp_mflags}
+cd ..
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,8 +59,13 @@
   --add-category Viewer \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
+cd %{name}-i18n-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
 # Files list
 %find_lang %{name}
+
 # HTML help
 for lang_dir in $RPM_BUILD_ROOT%{_datadir}/doc/HTML/* ; do
   if [ -d $lang_dir ]; then
@@ -77,7 +92,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2005 21:41:35 -0000	1.5
+++ sources	3 Oct 2006 08:47:17 -0000	1.6
@@ -1 +1,2 @@
-0bea3ce1aa2dc704bf61f718d2d4308e  gwenview-1.3.1.tar.bz2
+82f15fca494ffd2aabad9828c5c66d94  gwenview-1.4.0.tar.bz2
+2b978ab4b76cbd4fb857d63100f0d5da  gwenview-i18n-1.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 08:47:15 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 01:47:15 -0700
Subject: rpms/gwenview/FC-5 .cvsignore, 1.5, 1.6 gwenview.spec, 1.15,
	1.16 sources, 1.5, 1.6
Message-ID: <200610030847.k938lmqJ003489@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3446/FC-5

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
update to 1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Nov 2005 21:41:35 -0000	1.5
+++ .cvsignore	3 Oct 2006 08:47:14 -0000	1.6
@@ -1 +1,2 @@
-gwenview-1.3.1.tar.bz2
+gwenview-1.4.0.tar.bz2
+gwenview-i18n-1.4.0.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/gwenview.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gwenview.spec	11 Apr 2006 06:14:30 -0000	1.15
+++ gwenview.spec	3 Oct 2006 08:47:15 -0000	1.16
@@ -1,12 +1,13 @@
 Name:           gwenview
-Version:        1.3.1
-Release:        5%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.3.1.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
+Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
@@ -17,6 +18,10 @@
 BuildRequires:  libXt-devel
 %endif
 
+# Maybe I'll split it in the future
+Provides:       gwenview-i18n = %{version}-%{release}
+
+
 %description
 Gwenview is an image viewer for KDE.
 
@@ -26,7 +31,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 
 
 %build
@@ -37,6 +42,11 @@
 # --enable-final  \
 make %{?_smp_mflags}
 
+cd %{name}-i18n-%{version}
+%configure
+make %{?_smp_mflags}
+cd ..
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,8 +59,13 @@
   --add-category Viewer \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
+cd %{name}-i18n-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
 # Files list
 %find_lang %{name}
+
 # HTML help
 for lang_dir in $RPM_BUILD_ROOT%{_datadir}/doc/HTML/* ; do
   if [ -d $lang_dir ]; then
@@ -77,7 +92,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*
@@ -95,6 +110,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.3.1-6
+- rebuild
+
 * Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-5
 - fix build outside the buildsystem (bug 188486)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2005 21:41:35 -0000	1.5
+++ sources	3 Oct 2006 08:47:15 -0000	1.6
@@ -1 +1,2 @@
-0bea3ce1aa2dc704bf61f718d2d4308e  gwenview-1.3.1.tar.bz2
+82f15fca494ffd2aabad9828c5c66d94  gwenview-1.4.0.tar.bz2
+2b978ab4b76cbd4fb857d63100f0d5da  gwenview-i18n-1.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 09:03:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 02:03:08 -0700
Subject: rpms/gwenview/FC-5 gwenview.spec,1.16,1.17
Message-ID: <200610030903.k9393eeA006462@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6430/FC-5

Modified Files:
	gwenview.spec 
Log Message:
missing BR: libexif-devel


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/gwenview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gwenview.spec	3 Oct 2006 08:47:15 -0000	1.16
+++ gwenview.spec	3 Oct 2006 09:03:07 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
+BuildRequires:  libexif-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
@@ -110,6 +111,12 @@
 
 
 %changelog
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-2
+- missing BR: libexif-devel
+
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-1
+- version 1.4.0
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.3.1-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct  3 09:03:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 02:03:12 -0700
Subject: rpms/gwenview/devel gwenview.spec,1.17,1.18
Message-ID: <200610030903.k9393kM3006465@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6430/devel

Modified Files:
	gwenview.spec 
Log Message:
missing BR: libexif-devel


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gwenview.spec	3 Oct 2006 08:47:17 -0000	1.17
+++ gwenview.spec	3 Oct 2006 09:03:12 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
+BuildRequires:  libexif-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
@@ -110,6 +111,12 @@
 
 
 %changelog
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-2
+- missing BR: libexif-devel
+
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-1
+- version 1.4.0
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.3.1-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct  3 09:06:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Oct 2006 02:06:26 -0700
Subject: rpms/wine/FC-5 .cvsignore, 1.22, 1.23 sources, 1.23, 1.24 wine.spec,
	1.35, 1.36
Message-ID: <200610030906.k9396SHP006642@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6605/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Sep 2006 14:15:05 -0000	1.22
+++ .cvsignore	3 Oct 2006 09:06:26 -0000	1.23
@@ -1 +1 @@
-wine-0.9.21-fe.tar.bz2
+wine-0.9.22-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Sep 2006 14:15:06 -0000	1.23
+++ sources	3 Oct 2006 09:06:26 -0000	1.24
@@ -1 +1 @@
-98232c907314f15b54d7f685ecfb5535  wine-0.9.21-fe.tar.bz2
+955338998d9fe4e0546212b97adbacd2  wine-0.9.22-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wine.spec	17 Sep 2006 14:15:06 -0000	1.35
+++ wine.spec	3 Oct 2006 09:06:26 -0000	1.36
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.21
+Version:	0.9.22
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.21-fe.tar.bz2
+Source0:        wine-0.9.22-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -371,6 +371,7 @@
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
 %{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/clusapi.dll.so
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
@@ -475,6 +476,7 @@
 %{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
@@ -686,6 +688,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.22-1
+- version upgrade
+
 * Sun Sep 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.21-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Oct  3 09:06:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Oct 2006 02:06:27 -0700
Subject: rpms/wine/devel .cvsignore, 1.22, 1.23 sources, 1.23, 1.24 wine.spec,
	1.35, 1.36
Message-ID: <200610030906.k9396TMt006648@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6605/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Sep 2006 14:15:07 -0000	1.22
+++ .cvsignore	3 Oct 2006 09:06:27 -0000	1.23
@@ -1 +1 @@
-wine-0.9.21-fe.tar.bz2
+wine-0.9.22-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Sep 2006 14:15:07 -0000	1.23
+++ sources	3 Oct 2006 09:06:27 -0000	1.24
@@ -1 +1 @@
-98232c907314f15b54d7f685ecfb5535  wine-0.9.21-fe.tar.bz2
+955338998d9fe4e0546212b97adbacd2  wine-0.9.22-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wine.spec	17 Sep 2006 14:15:07 -0000	1.35
+++ wine.spec	3 Oct 2006 09:06:27 -0000	1.36
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.21
+Version:	0.9.22
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.21-fe.tar.bz2
+Source0:        wine-0.9.22-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -371,6 +371,7 @@
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
 %{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/clusapi.dll.so
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
@@ -475,6 +476,7 @@
 %{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
@@ -686,6 +688,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.22-1
+- version upgrade
+
 * Sun Sep 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.21-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Oct  3 09:37:17 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Oct 2006 02:37:17 -0700
Subject: rpms/gtkwave/devel gtkwave.spec,1.23,1.24
Message-ID: <200610030937.k939bKEL006837@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6820

Modified Files:
	gtkwave.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtkwave.spec	22 Sep 2006 13:48:49 -0000	1.23
+++ gtkwave.spec	3 Oct 2006 09:37:17 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
 Version:		3.0.12
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
 URL:			http://home.nc.rr.com/gtkwave/
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 3.0.12-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 3.0.12-1
 - update to 3.0.12
 - create dummy libz/libbz2 Makefile.in files to ensure that config.h gets



From fedora-extras-commits at redhat.com  Tue Oct  3 09:38:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Oct 2006 02:38:56 -0700
Subject: rpms/gtorrentviewer/devel gtorrentviewer.spec,1.8,1.9
Message-ID: <200610030938.k939cwxc006903@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtorrentviewer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6886

Modified Files:
	gtorrentviewer.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: gtorrentviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/gtorrentviewer/devel/gtorrentviewer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtorrentviewer.spec	26 Sep 2006 14:27:38 -0000	1.8
+++ gtorrentviewer.spec	3 Oct 2006 09:38:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gtorrentviewer
 Version:	0.2b
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A GTK2-based viewer and editor for BitTorrent meta files
 Group:		Applications/Internet
 License:	GPL
@@ -59,6 +59,9 @@
 %{_mandir}/man1/gtorrentviewer.1*
 
 %changelog
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 0.2b-12
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Paul Howarth <paul at city-fan.org> 0.2b-11
 - drag and drop works with files but not URIs (#206262);
   apply patch from Denis Leroy to fix desktop file accordingly



From fedora-extras-commits at redhat.com  Tue Oct  3 09:40:17 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Oct 2006 02:40:17 -0700
Subject: rpms/lat/devel lat.spec,1.9,1.10
Message-ID: <200610030940.k939eJtA006973@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/lat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6952

Modified Files:
	lat.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: lat.spec
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/lat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lat.spec	27 Sep 2006 07:32:08 -0000	1.9
+++ lat.spec	3 Oct 2006 09:40:17 -0000	1.10
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.0.1
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPL
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 1.2.0.1-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Paul Howarth <paul at city-fan.org> 1.2.0.1-1
 - Update to 1.2.0.1
 - Update source URL



From fedora-extras-commits at redhat.com  Tue Oct  3 11:02:53 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue,  3 Oct 2006 04:02:53 -0700
Subject: fedora-security/audit fc5,1.342,1.343
Message-ID: <200610031102.k93B2rJH013126@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13108

Modified Files:
	fc5 
Log Message:
Note a gzip update


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- fc5	30 Sep 2006 21:23:03 -0000	1.342
+++ fc5	3 Oct 2006 11:02:47 -0000	1.343
@@ -51,11 +51,11 @@
 CVE-2006-4340 version (nss, fixed 3.11.3) [since FEDORA-2006-979]
 CVE-2006-4339 backport (openssl) [since FEDORA-2006-953]
 CVE-2006-4339 backport (openssl097a) [since FEDORA-2006-953]
-CVE-2006-4338 VULNERABLE (gzip) #207643
-CVE-2006-4337 VULNERABLE (gzip) #207643
-CVE-2006-4336 VULNERABLE (gzip) #207643
-CVE-2006-4335 VULNERABLE (gzip) #207643
-CVE-2006-4334 VULNERABLE (gzip) #207643
+CVE-2006-4338 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4337 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4336 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4335 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4334 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
 CVE-2006-4433 VULNERABLE (php, fixed 5.1.4)
 CVE-2006-4333 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
 CVE-2006-4332 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]



From fedora-extras-commits at redhat.com  Tue Oct  3 11:17:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Oct 2006 04:17:37 -0700
Subject: rpms/dillo/FC-5 dillo.spec,1.14,1.15
Message-ID: <200610031117.k93BHdc8013374@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dillo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13355

Modified Files:
	dillo.spec 
Log Message:
- fix #199852



Index: dillo.spec
===================================================================
RCS file: /cvs/extras/rpms/dillo/FC-5/dillo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dillo.spec	5 Jul 2006 08:11:06 -0000	1.14
+++ dillo.spec	3 Oct 2006 11:17:37 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           dillo
 Version:        0.8.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Very small and fast GUI web browser
 
@@ -24,6 +24,7 @@
 BuildRequires:  openssl-devel
 BuildRequires:  libXft-devel
 BuildRequires:  fltk-devel
+BuildRequires:  gettext
 Requires:       wget
 Provides:       webclient
 
@@ -105,6 +106,10 @@
 %{_libdir}/%{name}
 
 %changelog
+* Tue Oct 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.6-3
+- fix #199852
+
 * Tue Jul 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.6-2
 - fix some more aspects of #187691 (package now contains dillo and dillo-i18n)



From fedora-extras-commits at redhat.com  Tue Oct  3 11:19:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Oct 2006 04:19:08 -0700
Subject: rpms/dillo/devel dillo.spec,1.14,1.15
Message-ID: <200610031119.k93BJAJ7013447@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dillo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13430

Modified Files:
	dillo.spec 
Log Message:
- fix BR



Index: dillo.spec
===================================================================
RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dillo.spec	12 Sep 2006 07:14:16 -0000	1.14
+++ dillo.spec	3 Oct 2006 11:19:08 -0000	1.15
@@ -24,6 +24,7 @@
 BuildRequires:  openssl-devel
 BuildRequires:  libXft-devel
 BuildRequires:  fltk-devel
+BuildRequires:  gettext
 Requires:       wget
 Provides:       webclient
 



From fedora-extras-commits at redhat.com  Tue Oct  3 11:38:27 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 04:38:27 -0700
Subject: rpms/Inventor/FC-4 Inventor-libSoXt.diff,1.1,NONE
Message-ID: <200610031138.k93BcTDg013609@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13593

Removed Files:
	Inventor-libSoXt.diff 
Log Message:
Remove.


--- Inventor-libSoXt.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct  3 11:38:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 04:38:54 -0700
Subject: rpms/Inventor/FC-4 Inventor.spec,1.15,1.16
Message-ID: <200610031138.k93BcuZk013644@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13624

Modified Files:
	Inventor.spec 
Log Message:
* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
- Specfile cosmetics.
- Use %{_datadir}/Inventor instead of %{_datadir}/%{name}
- Fix dep on xmessage for FC4.
- Add %{_datadir}/Inventor/data/materials.
- Add %{_datadir}/Inventor/fonts.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/Inventor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Inventor.spec	2 Oct 2006 04:54:10 -0000	1.15
+++ Inventor.spec	3 Oct 2006 11:38:54 -0000	1.16
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -68,7 +68,7 @@
 Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" >= "5"
 Requires:	%{_bindir}/xmessage
 %else
 Requires:	/usr/X11R6/bin/xmessage
@@ -137,20 +137,20 @@
 -e 's,^_HDRTOP =.*$,_HDRTOP = %{_includedir}/Inventor,' \
 -e 's,^_MAN1DIR =.*$,_MAN1DIR = %{_mandir}/man1,' \
 -e 's,^_MAN3DIR =.*$,_MAN3DIR = %{_mandir}/man3,' \
--e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/%{name}/fonts,' \
--e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/%{name}/help,' \
--e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/%{name}/data/models,' \
--e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/%{name}/data/materials,' \
--e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/%{name}/data/textures,' \
+-e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/Inventor/fonts,' \
+-e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/Inventor/help,' \
+-e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/Inventor/data/models,' \
+-e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/Inventor/data/materials,' \
+-e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/Inventor/data/textures,' \
 -e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_libdir}/Inventor,' \
--e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
+-e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/Inventor/data/demos,' \
 -e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
 -e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
 make/ivcommondefs
 
 for i in apps/demos/*/*.RUNME; do \
   sed -i \
-    -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
+    -e 's,/usr/share/inventor/,%{_datadir}/Inventor/,g' \
     -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
     $i
 done
@@ -216,6 +216,10 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +239,8 @@
 %{_bindir}/ivnorm
 %{_bindir}/ivAddVP
 %{_libdir}/libInventor.so.*
+%dir %{_datadir}/Inventor
+%{_datadir}/Inventor/fonts
 %{_mandir}/man1/inventor.*
 %{_mandir}/man1/iv2toiv1.*
 %{_mandir}/man1/ivcat.*
@@ -264,7 +270,13 @@
 %{_mandir}/man1/SceneViewer.*
 %{_mandir}/man1/ivview.*
 %{_libdir}/libInventorXt.so.*
-%{_datadir}/%{name}
+%dir %{_datadir}/Inventor
+# Used by libInventorXt
+%{_datadir}/Inventor/help
+# Used by SceneViewer
+%dir %{_datadir}/Inventor/data
+%dir %{_datadir}/Inventor/data/materials
+%dir %{_datadir}/Inventor/data/textures
 
 %files -n InventorXt-devel
 %defattr(-,root,root,-)
@@ -276,15 +288,17 @@
 
 %files data
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/models
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/models
+%{_datadir}/Inventor/data/materials
+%{_datadir}/Inventor/data/textures
 
 %files demos
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/demos
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/demos
 %dir %{_libdir}/Inventor
 %{_libdir}/Inventor/[^e]*
 
@@ -294,6 +308,13 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
+- Specfile cosmetics.
+- Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name}
+- Fix dep on xmessage for FC4.
+- Add %%{_datadir}/Inventor/data/materials.
+- Add %%{_datadir}/Inventor/fonts.
+
 * Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
 - Add make-var _PDFVIEWER.
 - Backport to FC4.
@@ -375,7 +396,7 @@
 * Thu Jul 1 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.2
 - Adopt portions of Michael Schwendt's patch.
 - Fix hard-coded paths in apps/demos/*.RUNMEs.
-- Use %{_prefix}/lib instead of %{_libdir} to install the demos into.
+- Use %%{_prefix}/lib instead of %%{_libdir} to install the demos into.
 - Add make/ to devel docs.
 - Hack devel docs to be buildable.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 11:39:41 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 04:39:41 -0700
Subject: rpms/Inventor/devel Inventor.spec,1.34,1.35
Message-ID: <200610031139.k93BdhN6013705@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13688

Modified Files:
	Inventor.spec 
Log Message:
* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
- Specfile cosmetics.
- Use %{_datadir}/Inventor instead of %{_datadir}/%{name}
- Fix dep on xmessage for FC4.
- Add %{_datadir}/Inventor/data/materials.
- Add %{_datadir}/Inventor/fonts.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Inventor.spec	2 Oct 2006 04:05:04 -0000	1.34
+++ Inventor.spec	3 Oct 2006 11:39:41 -0000	1.35
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -68,7 +68,7 @@
 Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" >= "5"
 Requires:	%{_bindir}/xmessage
 %else
 Requires:	/usr/X11R6/bin/xmessage
@@ -137,20 +137,20 @@
 -e 's,^_HDRTOP =.*$,_HDRTOP = %{_includedir}/Inventor,' \
 -e 's,^_MAN1DIR =.*$,_MAN1DIR = %{_mandir}/man1,' \
 -e 's,^_MAN3DIR =.*$,_MAN3DIR = %{_mandir}/man3,' \
--e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/%{name}/fonts,' \
--e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/%{name}/help,' \
--e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/%{name}/data/models,' \
--e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/%{name}/data/materials,' \
--e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/%{name}/data/textures,' \
+-e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/Inventor/fonts,' \
+-e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/Inventor/help,' \
+-e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/Inventor/data/models,' \
+-e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/Inventor/data/materials,' \
+-e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/Inventor/data/textures,' \
 -e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_libdir}/Inventor,' \
--e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
+-e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/Inventor/data/demos,' \
 -e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
 -e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
 make/ivcommondefs
 
 for i in apps/demos/*/*.RUNME; do \
   sed -i \
-    -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
+    -e 's,/usr/share/inventor/,%{_datadir}/Inventor/,g' \
     -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
     $i
 done
@@ -216,6 +216,10 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +239,8 @@
 %{_bindir}/ivnorm
 %{_bindir}/ivAddVP
 %{_libdir}/libInventor.so.*
+%dir %{_datadir}/Inventor
+%{_datadir}/Inventor/fonts
 %{_mandir}/man1/inventor.*
 %{_mandir}/man1/iv2toiv1.*
 %{_mandir}/man1/ivcat.*
@@ -264,7 +270,13 @@
 %{_mandir}/man1/SceneViewer.*
 %{_mandir}/man1/ivview.*
 %{_libdir}/libInventorXt.so.*
-%{_datadir}/%{name}
+%dir %{_datadir}/Inventor
+# Used by libInventorXt
+%{_datadir}/Inventor/help
+# Used by SceneViewer
+%dir %{_datadir}/Inventor/data
+%dir %{_datadir}/Inventor/data/materials
+%dir %{_datadir}/Inventor/data/textures
 
 %files -n InventorXt-devel
 %defattr(-,root,root,-)
@@ -276,15 +288,17 @@
 
 %files data
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/models
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/models
+%{_datadir}/Inventor/data/materials
+%{_datadir}/Inventor/data/textures
 
 %files demos
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/demos
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/demos
 %dir %{_libdir}/Inventor
 %{_libdir}/Inventor/[^e]*
 
@@ -294,6 +308,13 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
+- Specfile cosmetics.
+- Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name}
+- Fix dep on xmessage for FC4.
+- Add %%{_datadir}/Inventor/data/materials.
+- Add %%{_datadir}/Inventor/fonts.
+
 * Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
 - Add make-var _PDFVIEWER.
 - Backport to FC4.
@@ -375,7 +396,7 @@
 * Thu Jul 1 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.2
 - Adopt portions of Michael Schwendt's patch.
 - Fix hard-coded paths in apps/demos/*.RUNMEs.
-- Use %{_prefix}/lib instead of %{_libdir} to install the demos into.
+- Use %%{_prefix}/lib instead of %%{_libdir} to install the demos into.
 - Add make/ to devel docs.
 - Hack devel docs to be buildable.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 11:40:35 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 04:40:35 -0700
Subject: rpms/Inventor/FC-5 Inventor.spec,1.33,1.34
Message-ID: <200610031140.k93BebVr013770@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13753

Modified Files:
	Inventor.spec 
Log Message:
* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
- Specfile cosmetics.
- Use %{_datadir}/Inventor instead of %{_datadir}/%{name}
- Fix dep on xmessage for FC4.
- Add %{_datadir}/Inventor/data/materials.
- Add %{_datadir}/Inventor/fonts.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/Inventor.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Inventor.spec	2 Oct 2006 04:46:03 -0000	1.33
+++ Inventor.spec	3 Oct 2006 11:40:35 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -68,7 +68,7 @@
 Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" >= "5"
 Requires:	%{_bindir}/xmessage
 %else
 Requires:	/usr/X11R6/bin/xmessage
@@ -137,20 +137,20 @@
 -e 's,^_HDRTOP =.*$,_HDRTOP = %{_includedir}/Inventor,' \
 -e 's,^_MAN1DIR =.*$,_MAN1DIR = %{_mandir}/man1,' \
 -e 's,^_MAN3DIR =.*$,_MAN3DIR = %{_mandir}/man3,' \
--e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/%{name}/fonts,' \
--e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/%{name}/help,' \
--e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/%{name}/data/models,' \
--e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/%{name}/data/materials,' \
--e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/%{name}/data/textures,' \
+-e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/Inventor/fonts,' \
+-e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/Inventor/help,' \
+-e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/Inventor/data/models,' \
+-e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/Inventor/data/materials,' \
+-e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/Inventor/data/textures,' \
 -e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_libdir}/Inventor,' \
--e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
+-e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/Inventor/data/demos,' \
 -e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
 -e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
 make/ivcommondefs
 
 for i in apps/demos/*/*.RUNME; do \
   sed -i \
-    -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
+    -e 's,/usr/share/inventor/,%{_datadir}/Inventor/,g' \
     -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
     $i
 done
@@ -216,6 +216,10 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +239,8 @@
 %{_bindir}/ivnorm
 %{_bindir}/ivAddVP
 %{_libdir}/libInventor.so.*
+%dir %{_datadir}/Inventor
+%{_datadir}/Inventor/fonts
 %{_mandir}/man1/inventor.*
 %{_mandir}/man1/iv2toiv1.*
 %{_mandir}/man1/ivcat.*
@@ -264,7 +270,13 @@
 %{_mandir}/man1/SceneViewer.*
 %{_mandir}/man1/ivview.*
 %{_libdir}/libInventorXt.so.*
-%{_datadir}/%{name}
+%dir %{_datadir}/Inventor
+# Used by libInventorXt
+%{_datadir}/Inventor/help
+# Used by SceneViewer
+%dir %{_datadir}/Inventor/data
+%dir %{_datadir}/Inventor/data/materials
+%dir %{_datadir}/Inventor/data/textures
 
 %files -n InventorXt-devel
 %defattr(-,root,root,-)
@@ -276,15 +288,17 @@
 
 %files data
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/models
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/models
+%{_datadir}/Inventor/data/materials
+%{_datadir}/Inventor/data/textures
 
 %files demos
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/demos
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/demos
 %dir %{_libdir}/Inventor
 %{_libdir}/Inventor/[^e]*
 
@@ -294,6 +308,13 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Tue Oct 03 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-24
+- Specfile cosmetics.
+- Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name}
+- Fix dep on xmessage for FC4.
+- Add %%{_datadir}/Inventor/data/materials.
+- Add %%{_datadir}/Inventor/fonts.
+
 * Mon Oct 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.1.5-23
 - Add make-var _PDFVIEWER.
 - Backport to FC4.
@@ -375,7 +396,7 @@
 * Thu Jul 1 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.2
 - Adopt portions of Michael Schwendt's patch.
 - Fix hard-coded paths in apps/demos/*.RUNMEs.
-- Use %{_prefix}/lib instead of %{_libdir} to install the demos into.
+- Use %%{_prefix}/lib instead of %%{_libdir} to install the demos into.
 - Add make/ to devel docs.
 - Hack devel docs to be buildable.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 12:11:29 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  3 Oct 2006 05:11:29 -0700
Subject: rpms/inotify-tools/devel .cvsignore, 1.5, 1.6 inotify-tools.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610031211.k93CBVW7016767@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/inotify-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16746

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
Update to 2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Oct 2006 17:12:46 -0000	1.5
+++ .cvsignore	3 Oct 2006 12:11:29 -0000	1.6
@@ -1 +1 @@
-inotify-tools-2.5.tar.gz
+inotify-tools-2.6.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/inotify-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inotify-tools.spec	2 Oct 2006 17:12:46 -0000	1.4
+++ inotify-tools.spec	3 Oct 2006 12:11:29 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.5
+Version:        2.6
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.6-1
+- Update to 2.6
+
 * Mon Oct  2 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.5-1
 - Update to 2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 17:12:46 -0000	1.5
+++ sources	3 Oct 2006 12:11:29 -0000	1.6
@@ -1 +1 @@
-80994b6637c9a4a94a1eddf2b8885603  inotify-tools-2.5.tar.gz
+4e3f876c4bac9d3cb520d81810832906  inotify-tools-2.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 12:15:33 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue,  3 Oct 2006 05:15:33 -0700
Subject: rpms/inotify-tools/FC-5 .cvsignore, 1.5, 1.6 inotify-tools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610031215.k93CFZVj016851@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/inotify-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16830

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
Update to 2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Oct 2006 17:14:30 -0000	1.5
+++ .cvsignore	3 Oct 2006 12:15:32 -0000	1.6
@@ -1 +1 @@
-inotify-tools-2.5.tar.gz
+inotify-tools-2.6.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/inotify-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inotify-tools.spec	2 Oct 2006 17:14:30 -0000	1.4
+++ inotify-tools.spec	3 Oct 2006 12:15:32 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.5
+Version:        2.6
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.6-1
+- Update to 2.6
+
 * Mon Oct  2 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.5-1
 - Update to 2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inotify-tools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 17:14:30 -0000	1.5
+++ sources	3 Oct 2006 12:15:32 -0000	1.6
@@ -1 +1 @@
-80994b6637c9a4a94a1eddf2b8885603  inotify-tools-2.5.tar.gz
+4e3f876c4bac9d3cb520d81810832906  inotify-tools-2.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 13:11:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 06:11:01 -0700
Subject: rpms/gpgme/devel gpgme.spec,1.19,1.20
Message-ID: <200610031311.k93DB3Cl019888@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19871

Modified Files:
	gpgme.spec 
Log Message:
* Tue Oct 03 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- respin



Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gpgme.spec	18 Sep 2006 19:34:24 -0000	1.19
+++ gpgme.spec	3 Oct 2006 13:11:01 -0000	1.20
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.1.2
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 
 License: LGPL
 Group:   Applications/System
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Tue Oct 03 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-6
 - fix gpgme-config --thread=pthread --cflags
 



From fedora-extras-commits at redhat.com  Tue Oct  3 14:49:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  3 Oct 2006 07:49:19 -0700
Subject: rpms/openvpn/devel .cvsignore, 1.13, 1.14 openvpn.spec, 1.22,
	1.23 sources, 1.13, 1.14
Message-ID: <200610031449.k93EnLKc024941@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24920

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta16.
Drop Paul's patch (in upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Sep 2006 18:55:50 -0000	1.13
+++ .cvsignore	3 Oct 2006 14:49:18 -0000	1.14
@@ -1,2 +1,2 @@
-openvpn-2.1_beta15.tar.gz
-openvpn-2.1_beta15.tar.gz.asc
+openvpn-2.1_beta16.tar.gz
+openvpn-2.1_beta16.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- openvpn.spec	12 Sep 2006 22:53:18 -0000	1.22
+++ openvpn.spec	3 Oct 2006 14:49:18 -0000	1.23
@@ -1,10 +1,10 @@
-%define prerelease beta15
+%define prerelease beta16
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.13%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.14%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 Source0:           http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -15,8 +15,6 @@
 Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
-# Avoid test hang (from Paul Howarth).
-Patch1:            openvpn-2.1_beta15-test-timeout.patch
 License:           GPL
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -45,7 +43,6 @@
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
 %patch0 -p0
-%patch1 -p1
 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 # %%doc items shouldn't be executable.
@@ -135,6 +132,10 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Mon Oct 02 2006 Steven Pritchard <steve at kspei.com> 2.1-0.14.beta16
+- Update to 2.1_beta16
+- Drop Paul's patch (in upstream)
+
 * Tue Sep 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.13.beta15
 - Update to 2.1_beta15
 - Add openvpn-2.1_beta15-test-timeout.patch to avoid test hang


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Sep 2006 18:55:50 -0000	1.13
+++ sources	3 Oct 2006 14:49:18 -0000	1.14
@@ -1,2 +1,2 @@
-2ddc1878c99ea3a9b348275338f7d502  openvpn-2.1_beta15.tar.gz
-7e62c63fb8205613ac8b99a4c788d576  openvpn-2.1_beta15.tar.gz.asc
+3a53f55dafcfa4aab9e408e36326e236  openvpn-2.1_beta16.tar.gz
+4529dc8c27ea67783b333dc586a909ef  openvpn-2.1_beta16.tar.gz.asc



From fedora-extras-commits at redhat.com  Tue Oct  3 15:19:38 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue,  3 Oct 2006 08:19:38 -0700
Subject: rpms/php-pear-PHPUnit/FC-5 php-pear-PHPUnit.spec,1.1,1.2
Message-ID: <200610031519.k93FJecO028167@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28148

Modified Files:
	php-pear-PHPUnit.spec 
Log Message:



Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/FC-5/php-pear-PHPUnit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-PHPUnit.spec	3 Oct 2006 05:25:49 -0000	1.1
+++ php-pear-PHPUnit.spec	3 Oct 2006 15:19:38 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-PHPUnit
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Regression testing framework for unit tests
 Summary(fr):    Outils de test de r??gression pour les tests unitaires
 



From fedora-extras-commits at redhat.com  Tue Oct  3 15:25:01 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue,  3 Oct 2006 08:25:01 -0700
Subject: rpms/gwenview/devel gwenview-1.4.0-libexif.patch, NONE,
	1.1 gwenview.spec, 1.18, 1.19
Message-ID: <200610031525.k93FP3eu028350@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28330

Modified Files:
	gwenview.spec 
Added Files:
	gwenview-1.4.0-libexif.patch 
Log Message:
add patch for latest libexif

gwenview-1.4.0-libexif.patch:

--- NEW FILE gwenview-1.4.0-libexif.patch ---
--- ./src/imageutils/jpeg-data.h.libexif	2006-10-03 16:55:17.000000000 +0200
+++ ./src/imageutils/jpeg-data.h	2006-10-03 16:55:41.000000000 +0200
@@ -22,7 +22,7 @@
 #define __JPEG_DATA_H__
 
 #include "jpeg-marker.h"
-#include "exif-data.h"
+#include "libexif/exif-data.h"
 
 #ifdef __cplusplus
 extern "C" {
--- ./src/imageutils/jpegcontent.cpp.libexif	2006-10-03 16:55:54.000000000 +0200
+++ ./src/imageutils/jpegcontent.cpp	2006-10-03 16:56:14.000000000 +0200
@@ -39,9 +39,9 @@
 #include <kdebug.h>
 
 // Exif
-#include "exif-data.h"
-#include "exif-ifd.h"
-#include "exif-utils.h"
+#include "libexif/exif-data.h"
+#include "libexif/exif-ifd.h"
+#include "libexif/exif-utils.h"
 
 // Local
 #include "imageutils/imageutils.h"


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gwenview.spec	3 Oct 2006 09:03:12 -0000	1.18
+++ gwenview.spec	3 Oct 2006 15:25:01 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,6 +8,8 @@
 URL:            http://gwenview.sf.net
 Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
 Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
+# Patch for libexif >= 0.6.13
+Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
@@ -33,6 +35,9 @@
 
 %prep
 %setup -q -a 1
+%if "%{fedora}" >= "6"
+%patch0 -p0
+%endif
 
 
 %build
@@ -111,6 +116,9 @@
 
 
 %changelog
+* Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-3
+- patch for latest libexif-devel
+
 * Tue Oct 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.0-2
 - missing BR: libexif-devel
 



From fedora-extras-commits at redhat.com  Tue Oct  3 16:44:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Oct 2006 09:44:12 -0700
Subject: rpms/clisp/devel clisp-2.40-doc.patch, NONE, 1.1 clisp.spec, 1.19,
	1.20
Message-ID: <200610031644.k93GiED0031747@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31727

Modified Files:
	clisp.spec 
Added Files:
	clisp-2.40-doc.patch 
Log Message:


clisp-2.40-doc.patch:

--- NEW FILE clisp-2.40-doc.patch ---
--- documentation.lisp	02 Oct 2006 06:01:24 -0400	1.26
+++ documentation.lisp	03 Oct 2006 10:47:23 -0400
@@ -4,7 +4,7 @@

 (in-package "CLOS")

-(defun function-documentation (x)
+(defun function-documentation (x &aux name)
   (cond ((typep-class x <standard-generic-function>)
          (std-gf-documentation x))
         ((eq (type-of x) 'FUNCTION) ; interpreted function?
@@ -12,8 +12,7 @@
         #+FFI ((eq (type-of x) 'ffi::foreign-function)
                (getf (sys::%record-ref x 5) :documentation))
         ((sys::closurep x) (sys::closure-documentation x))
-        ((let ((name (sys::subr-info x))) ; subr
-           (and name (get :documentation name))))
+        ((setq name (sys::subr-info x)) (get :documentation name)) ; subr
         (t (get :documentation (sys::%record-ref x 0)))))

 ;;; documentation
@@ -81,7 +80,7 @@
   (:method ((x slot-definition) (doc-type (eql 't)))
     (slot-definition-documentation x)))

-(defun set-function-documentation (x new-value)
+(defun set-function-documentation (x new-value &aux name)
   (cond ((typep-class x <standard-generic-function>)
          (setf (std-gf-documentation x) new-value))
         ((eq (type-of x) 'FUNCTION) ; interpreted function?
@@ -89,8 +88,8 @@
         #+FFI ((eq (type-of x) 'ffi::foreign-function)
                (setf (getf (sys::%record-ref x 5) :documentation) new-value))
         ((sys::closurep x) (sys::closure-set-documentation x new-value))
-        ((let ((name (sys::subr-info x))) ; subr
-           (and name (setf (get :documentation name) new-value))))
+        ((setq name (sys::subr-info x)) ; subr
+         (setf (get :documentation name) new-value))
         (t                      ; fsubr
          (setf (get :documentation (sys::%record-ref x 0)) new-value))))



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- clisp.spec	2 Oct 2006 19:10:53 -0000	1.19
+++ clisp.spec	3 Oct 2006 16:44:12 -0000	1.20
@@ -1,12 +1,13 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.40
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
 Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
+Patch0:		clisp-2.40-doc.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -20,8 +21,7 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	imake
-#ExcludeArch:	ppc ppc64
-ExcludeArch:	x86_64
+ExcludeArch:	ppc ppc64
 
 
 %description
@@ -57,6 +57,8 @@
 
 %prep
 %setup -q
+cd src
+%patch0
 
 
 %build
@@ -130,6 +132,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-3
+- Added patch for x86_64
+
 * Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-1
 - new version 2.40
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:04:25 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Oct 2006 10:04:25 -0700
Subject: rpms/clisp/FC-5 clisp-2.40-doc.patch,NONE,1.1 clisp.spec,1.17,1.18
Message-ID: <200610031704.k93H4RlZ002226@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2206/FC-5

Modified Files:
	clisp.spec 
Added Files:
	clisp-2.40-doc.patch 
Log Message:


clisp-2.40-doc.patch:

--- NEW FILE clisp-2.40-doc.patch ---
--- documentation.lisp	02 Oct 2006 06:01:24 -0400	1.26
+++ documentation.lisp	03 Oct 2006 10:47:23 -0400
@@ -4,7 +4,7 @@

 (in-package "CLOS")

-(defun function-documentation (x)
+(defun function-documentation (x &aux name)
   (cond ((typep-class x <standard-generic-function>)
          (std-gf-documentation x))
         ((eq (type-of x) 'FUNCTION) ; interpreted function?
@@ -12,8 +12,7 @@
         #+FFI ((eq (type-of x) 'ffi::foreign-function)
                (getf (sys::%record-ref x 5) :documentation))
         ((sys::closurep x) (sys::closure-documentation x))
-        ((let ((name (sys::subr-info x))) ; subr
-           (and name (get :documentation name))))
+        ((setq name (sys::subr-info x)) (get :documentation name)) ; subr
         (t (get :documentation (sys::%record-ref x 0)))))

 ;;; documentation
@@ -81,7 +80,7 @@
   (:method ((x slot-definition) (doc-type (eql 't)))
     (slot-definition-documentation x)))

-(defun set-function-documentation (x new-value)
+(defun set-function-documentation (x new-value &aux name)
   (cond ((typep-class x <standard-generic-function>)
          (setf (std-gf-documentation x) new-value))
         ((eq (type-of x) 'FUNCTION) ; interpreted function?
@@ -89,8 +88,8 @@
         #+FFI ((eq (type-of x) 'ffi::foreign-function)
                (setf (getf (sys::%record-ref x 5) :documentation) new-value))
         ((sys::closurep x) (sys::closure-set-documentation x new-value))
-        ((let ((name (sys::subr-info x))) ; subr
-           (and name (setf (get :documentation name) new-value))))
+        ((setq name (sys::subr-info x)) ; subr
+         (setf (get :documentation name) new-value))
         (t                      ; fsubr
          (setf (get :documentation (sys::%record-ref x 0)) new-value))))



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/clisp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- clisp.spec	2 Oct 2006 11:24:25 -0000	1.17
+++ clisp.spec	3 Oct 2006 17:04:24 -0000	1.18
@@ -1,12 +1,13 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.40
-Release: 	1%{?dist}
+Release: 	3%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
 Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
+Patch0:		clisp-2.40-doc.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -56,6 +57,8 @@
 
 %prep
 %setup -q
+cd src
+%patch0
 
 
 %build
@@ -129,6 +132,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-3
+- Added patch for x86_64
+
 * Mon Oct  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-1
 - new version 2.40
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:05:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:05:08 -0700
Subject: rpms/libmodplug/devel libmodplug-0.8-CVE-2006-4192.patch, NONE,
	1.1 libmodplug.spec, 1.10, 1.11
Message-ID: <200610031705.k93H5A7F002381@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmodplug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325/devel

Modified Files:
	libmodplug.spec 
Added Files:
	libmodplug-0.8-CVE-2006-4192.patch 
Log Message:
* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Apply patch for CVE-2006-4192 (from Debian).


libmodplug-0.8-CVE-2006-4192.patch:

--- NEW FILE libmodplug-0.8-CVE-2006-4192.patch ---
--- libmodplug-0.8/src/sndfile.cpp~	2006-03-20 05:22:32.000000000 +0200
+++ libmodplug-0.8/src/sndfile.cpp	2006-10-03 19:21:17.000000000 +0300
@@ -1081,7 +1081,7 @@
 {
 	UINT len = 0, mem = pIns->nLength+6;
 
-	if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0;
+	if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0;
 	if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH;
 	pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO);
 	if (nFlags & RSF_16BIT)


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/devel/libmodplug.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libmodplug.spec	28 Aug 2006 16:08:17 -0000	1.10
+++ libmodplug.spec	3 Oct 2006 17:05:08 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -8,6 +8,7 @@
 License:        Public Domain
 URL:            http://modplug-xmms.sourceforge.net/
 Source0:        http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8-CVE-2006-4192.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
 sed -i -e 's/\r//g' ChangeLog
 
@@ -66,6 +68,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-3
+- Apply patch for CVE-2006-4192 (from Debian).
+
 * Mon Aug 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:05:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:05:02 -0700
Subject: rpms/libmodplug/FC-4 libmodplug-0.8-CVE-2006-4192.patch, NONE,
	1.1 libmodplug.spec, 1.7, 1.8
Message-ID: <200610031705.k93H5Ymo002384@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmodplug/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325/FC-4

Modified Files:
	libmodplug.spec 
Added Files:
	libmodplug-0.8-CVE-2006-4192.patch 
Log Message:
* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Apply patch for CVE-2006-4192 (from Debian).


libmodplug-0.8-CVE-2006-4192.patch:

--- NEW FILE libmodplug-0.8-CVE-2006-4192.patch ---
--- libmodplug-0.8/src/sndfile.cpp~	2006-03-20 05:22:32.000000000 +0200
+++ libmodplug-0.8/src/sndfile.cpp	2006-10-03 19:21:17.000000000 +0300
@@ -1081,7 +1081,7 @@
 {
 	UINT len = 0, mem = pIns->nLength+6;
 
-	if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0;
+	if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0;
 	if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH;
 	pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO);
 	if (nFlags & RSF_16BIT)


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/FC-4/libmodplug.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libmodplug.spec	23 Aug 2005 16:09:03 -0000	1.7
+++ libmodplug.spec	3 Oct 2006 17:05:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -9,6 +9,7 @@
 URL:            http://modplug-xmms.sourceforge.net/
 Source0:        http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz
 Patch0:         %{name}-64bit.patch
+Patch1:         %{name}-0.8-CVE-2006-4192.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.7-4
+- Apply patch for CVE-2006-4192 (from Debian).
+
 * Tue Aug 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.7-3
 - Fix x86_64, thanks to Adam Goode (#166127).
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:05:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:05:03 -0700
Subject: rpms/libmodplug/FC-5 libmodplug-0.8-CVE-2006-4192.patch, NONE,
	1.1 libmodplug.spec, 1.9, 1.10
Message-ID: <200610031705.k93H5ZnL002387@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmodplug/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325/FC-5

Modified Files:
	libmodplug.spec 
Added Files:
	libmodplug-0.8-CVE-2006-4192.patch 
Log Message:
* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Apply patch for CVE-2006-4192 (from Debian).


libmodplug-0.8-CVE-2006-4192.patch:

--- NEW FILE libmodplug-0.8-CVE-2006-4192.patch ---
--- libmodplug-0.8/src/sndfile.cpp~	2006-03-20 05:22:32.000000000 +0200
+++ libmodplug-0.8/src/sndfile.cpp	2006-10-03 19:21:17.000000000 +0300
@@ -1081,7 +1081,7 @@
 {
 	UINT len = 0, mem = pIns->nLength+6;
 
-	if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0;
+	if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0;
 	if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH;
 	pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO);
 	if (nFlags & RSF_16BIT)


Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/FC-5/libmodplug.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libmodplug.spec	24 Mar 2006 20:36:37 -0000	1.9
+++ libmodplug.spec	3 Oct 2006 17:05:02 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.8
-Release:        1%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -8,6 +8,7 @@
 License:        Public Domain
 URL:            http://modplug-xmms.sourceforge.net/
 Source0:        http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8-CVE-2006-4192.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
 sed -i -e 's/\r//g' ChangeLog
 
@@ -66,6 +68,12 @@
 
 
 %changelog
+* Tue Oct  3 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-3
+- Apply patch for CVE-2006-4192 (from Debian).
+
+* Mon Aug 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-2
+- Rebuild.
+
 * Fri Mar 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.8-1
 - 0.8, 64bit patch included upstream.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:15:05 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue,  3 Oct 2006 10:15:05 -0700
Subject: rpms/lighttpd/devel lighttpd-1.4.12-fix.patch, NONE,
	1.1 lighttpd.spec, 1.26, 1.27
Message-ID: <200610031715.k93HF7hI002567@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544

Modified Files:
	lighttpd.spec 
Added Files:
	lighttpd-1.4.12-fix.patch 
Log Message:
Include fix for segfaults (lighttpd bug #876, changeset 1352).


lighttpd-1.4.12-fix.patch:

--- NEW FILE lighttpd-1.4.12-fix.patch ---
Index: /branches/lighttpd-1.4.x/src/connections.c
===================================================================
--- /branches/lighttpd-1.4.x/src/connections.c (revision 1345)
+++ /branches/lighttpd-1.4.x/src/connections.c (revision 1352)
@@ -953,5 +953,5 @@
 
 									last_chunk = lookahead_chunk;
-									last_offset = missing_chars + 1;
+									last_offset = missing_chars;
 
 									break;


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- lighttpd.spec	25 Sep 2006 15:48:21 -0000	1.26
+++ lighttpd.spec	3 Oct 2006 17:15:05 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.12
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -16,6 +16,7 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
+Patch1: lighttpd-1.4.12-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -67,6 +68,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
+%patch1 -p3 -b .fix
 
 
 %build
@@ -173,6 +175,9 @@
 
 
 %changelog
+* Tue Oct  3 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-3
+- Include fix for segfaults (lighttpd bug #876, changeset 1352).
+
 * Mon Sep 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-1
 - Update to 1.4.12 final.
 



From fedora-extras-commits at redhat.com  Tue Oct  3 17:20:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:20:12 -0700
Subject: fedora-security/audit fe3,1.18,1.19 fe4,1.74,1.75 fe5,1.80,1.81
Message-ID: <200610031720.k93HKC72002696@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2673

Modified Files:
	fe3 fe4 fe5 
Log Message:
Note CVE-2006-4192, CVE-2006-5111.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fe3	27 Sep 2006 19:05:52 -0000	1.18
+++ fe3	3 Oct 2006 17:20:09 -0000	1.19
@@ -2,7 +2,9 @@
 
 ** are items that need attention
 
+CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
+CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-3) #200545
 CVE-2006-3816 version (krusader, fixed 1.70.1) #200323


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- fe4	27 Sep 2006 19:15:49 -0000	1.74
+++ fe4	3 Oct 2006 17:20:09 -0000	1.75
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4943 ** (moodle) #206516
 CVE-2006-4942 ** (moodle) #206516
@@ -16,6 +17,7 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-4) #200545


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fe5	27 Sep 2006 19:15:49 -0000	1.80
+++ fe5	3 Oct 2006 17:20:09 -0000	1.81
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4943 ** (moodle) #206516
 CVE-2006-4942 ** (moodle) #206516
@@ -16,6 +17,7 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-5) #200545



From fedora-extras-commits at redhat.com  Tue Oct  3 17:41:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:41:15 -0700
Subject: fedora-security/audit fe3,1.19,1.20 fe4,1.75,1.76 fe5,1.81,1.82
Message-ID: <200610031741.k93HfFd8002786@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2764

Modified Files:
	fe3 fe4 fe5 
Log Message:
+CVE-2006-4247


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fe3	3 Oct 2006 17:20:09 -0000	1.19
+++ fe3	3 Oct 2006 17:41:12 -0000	1.20
@@ -4,6 +4,7 @@
 
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
+CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-3) #200545


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- fe4	3 Oct 2006 17:20:09 -0000	1.75
+++ fe4	3 Oct 2006 17:41:12 -0000	1.76
@@ -17,6 +17,7 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fe5	3 Oct 2006 17:20:09 -0000	1.81
+++ fe5	3 Oct 2006 17:41:12 -0000	1.82
@@ -17,6 +17,7 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4247 VULNERABLE (plone) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688



From fedora-extras-commits at redhat.com  Tue Oct  3 17:59:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Oct 2006 10:59:47 -0700
Subject: fedora-security/audit fe4,1.76,1.77 fe5,1.82,1.83
Message-ID: <200610031759.k93Hxlxl002927@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2907

Modified Files:
	fe4 fe5 
Log Message:
Note seamonkey < 1.0.5 issues.


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- fe4	3 Oct 2006 17:41:12 -0000	1.76
+++ fe4	3 Oct 2006 17:59:44 -0000	1.77
@@ -17,6 +17,13 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4571 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4570 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4568 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4566 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4565 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fe5	3 Oct 2006 17:41:12 -0000	1.82
+++ fe5	3 Oct 2006 17:59:44 -0000	1.83
@@ -17,6 +17,13 @@
 CVE-2006-4785 ** (moodle) #206516
 CVE-2006-4784 ** (moodle) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
+CVE-2006-4571 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4570 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 VULNERABLE (plone) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989



From fedora-extras-commits at redhat.com  Tue Oct  3 18:25:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  3 Oct 2006 11:25:04 -0700
Subject: rpms/cpanspec/devel .cvsignore, 1.11, 1.12 cpanspec.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200610031825.k93IP6S0006011@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5990

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.69.
Use _fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Jul 2006 01:10:07 -0000	1.11
+++ .cvsignore	3 Oct 2006 18:25:03 -0000	1.12
@@ -1 +1 @@
-cpanspec-1.68.tar.gz
+cpanspec-1.69.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpanspec.spec	17 Sep 2006 17:33:11 -0000	1.12
+++ cpanspec.spec	3 Oct 2006 18:25:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           cpanspec
-Version:        1.68
-Release:        2%{?dist}
+Version:        1.69
+Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
 Group:          Development/Tools
@@ -36,7 +36,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 # No tests.
 #%check
@@ -52,6 +52,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
+- Update to 1.69.
+- Use _fixperms macro instead of our own chmod incantation.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.68-2
 - Fix find option order.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jul 2006 01:10:07 -0000	1.11
+++ sources	3 Oct 2006 18:25:03 -0000	1.12
@@ -1 +1 @@
-7ba1c9f361fc61d22cbd694bd17fa53d  cpanspec-1.68.tar.gz
+ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 18:27:35 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  3 Oct 2006 11:27:35 -0700
Subject: rpms/cpanspec/FC-5 .cvsignore, 1.11, 1.12 cpanspec.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200610031827.k93IRbKq006138@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6115

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Sync with devel branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Jul 2006 01:12:24 -0000	1.11
+++ .cvsignore	3 Oct 2006 18:27:35 -0000	1.12
@@ -1 +1 @@
-cpanspec-1.68.tar.gz
+cpanspec-1.69.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cpanspec.spec	21 Jul 2006 01:12:24 -0000	1.11
+++ cpanspec.spec	3 Oct 2006 18:27:35 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.68
+Version:        1.69
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -34,9 +34,9 @@
 ./Build install destdir=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 # No tests.
 #%check
@@ -52,6 +52,13 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
+- Update to 1.69.
+- Use _fixperms macro instead of our own chmod incantation.
+
+* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.68-2
+- Fix find option order.
+
 * Thu Jul 20 2006 Steven Pritchard <steve at kspei.com> 1.68-1
 - Update to 1.68.
 - Include Changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jul 2006 01:12:24 -0000	1.11
+++ sources	3 Oct 2006 18:27:35 -0000	1.12
@@ -1 +1 @@
-7ba1c9f361fc61d22cbd694bd17fa53d  cpanspec-1.68.tar.gz
+ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 18:27:45 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 11:27:45 -0700
Subject: rpms/brasero - New directory
Message-ID: <200610031827.k93IRlDu006204@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6151/brasero

Log Message:
Directory /cvs/extras/rpms/brasero added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 18:27:46 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 11:27:46 -0700
Subject: rpms/brasero/devel - New directory
Message-ID: <200610031827.k93IRmRO006207@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6151/brasero/devel

Log Message:
Directory /cvs/extras/rpms/brasero/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct  3 18:28:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 11:28:05 -0700
Subject: rpms/brasero Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610031828.k93IS7Pw006267@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6232

Added Files:
	Makefile import.log 
Log Message:
Setup of module brasero


--- NEW FILE Makefile ---
# Top level Makefile for module brasero
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct  3 18:28:06 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 11:28:06 -0700
Subject: rpms/brasero/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610031828.k93IS8KJ006270@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6232/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module brasero


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct  3 18:28:08 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  3 Oct 2006 11:28:08 -0700
Subject: rpms/cpanspec/FC-4 .cvsignore, 1.11, 1.12 cpanspec.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200610031828.k93ISePT006305@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6266

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Sync with devel branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Jul 2006 01:12:23 -0000	1.11
+++ .cvsignore	3 Oct 2006 18:28:08 -0000	1.12
@@ -1 +1 @@
-cpanspec-1.68.tar.gz
+cpanspec-1.69.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cpanspec.spec	21 Jul 2006 01:12:23 -0000	1.11
+++ cpanspec.spec	3 Oct 2006 18:28:08 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.68
+Version:        1.69
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -34,9 +34,9 @@
 ./Build install destdir=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 # No tests.
 #%check
@@ -52,6 +52,13 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
+- Update to 1.69.
+- Use _fixperms macro instead of our own chmod incantation.
+
+* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.68-2
+- Fix find option order.
+
 * Thu Jul 20 2006 Steven Pritchard <steve at kspei.com> 1.68-1
 - Update to 1.68.
 - Include Changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jul 2006 01:12:23 -0000	1.11
+++ sources	3 Oct 2006 18:28:08 -0000	1.12
@@ -1 +1 @@
-7ba1c9f361fc61d22cbd694bd17fa53d  cpanspec-1.68.tar.gz
+ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct  3 18:32:54 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue,  3 Oct 2006 11:32:54 -0700
Subject: rpms/octave/devel .cvsignore, 1.10, 1.11 octave.spec, 1.47,
	1.48 sources, 1.10, 1.11 octave-2.9.8-misc.patch, 1.1, NONE
Message-ID: <200610031832.k93IWuSw006443@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6422

Modified Files:
	.cvsignore octave.spec sources 
Removed Files:
	octave-2.9.8-misc.patch 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Aug 2006 14:53:00 -0000	1.10
+++ .cvsignore	3 Oct 2006 18:32:54 -0000	1.11
@@ -1 +1 @@
-octave-2.9.8.tar.bz2
+octave-2.9.9.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- octave.spec	15 Sep 2006 15:53:25 -0000	1.47
+++ octave.spec	3 Oct 2006 18:32:54 -0000	1.48
@@ -1,13 +1,12 @@
 Name:           octave
-Version:        2.9.8
-Release:        2%{?dist}
+Version:        2.9.9
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
-Patch0:         octave-2.9.8-misc.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -50,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -125,6 +123,9 @@
 
 
 %changelog
+* Mon Oct  3 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.9-1
+- New release. Remove old patch.
+
 * Fri Sep 15 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.8-2
 - Fix this bug:
   https://www.cae.wisc.edu/pipermail/bug-octave/2006-September/000687.html


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Aug 2006 14:53:00 -0000	1.10
+++ sources	3 Oct 2006 18:32:54 -0000	1.11
@@ -1 +1 @@
-1ccc06e00de7e61cc92e245bd48024a6  octave-2.9.8.tar.bz2
+a76a6d88f414285472896a63e4282b7f  octave-2.9.9.tar.bz2


--- octave-2.9.8-misc.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct  3 19:07:38 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue,  3 Oct 2006 12:07:38 -0700
Subject: rpms/pessulus import.log,1.13,1.14
Message-ID: <200610031907.k93J7etU009592@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/pessulus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9559

Modified Files:
	import.log 
Log Message:
auto-import pessulus-2.16.1-1 on branch devel from pessulus-2.16.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pessulus/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	23 Sep 2006 15:21:17 -0000	1.13
+++ import.log	3 Oct 2006 19:07:38 -0000	1.14
@@ -10,3 +10,4 @@
 pessulus-2_15_91-2_fc6:HEAD:pessulus-2.15.91-2.fc6.src.rpm:1156785336
 pessulus-2_16_0-1_fc6:HEAD:pessulus-2.16.0-1.fc6.src.rpm:1157498558
 pessulus-2_16_0-4_fc6:HEAD:pessulus-2.16.0-4.fc6.src.rpm:1159024941
+pessulus-2_16_1-1:HEAD:pessulus-2.16.1-1.src.rpm:1159902444



From fedora-extras-commits at redhat.com  Tue Oct  3 19:07:39 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue,  3 Oct 2006 12:07:39 -0700
Subject: rpms/pessulus/devel .cvsignore, 1.6, 1.7 pessulus.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200610031907.k93J7fpK009598@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/pessulus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9559/devel

Modified Files:
	.cvsignore pessulus.spec sources 
Log Message:
auto-import pessulus-2.16.1-1 on branch devel from pessulus-2.16.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Sep 2006 23:22:01 -0000	1.6
+++ .cvsignore	3 Oct 2006 19:07:38 -0000	1.7
@@ -1 +1 @@
-pessulus-2.16.0.tar.bz2
+pessulus-2.16.1.tar.bz2


Index: pessulus.spec
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/pessulus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pessulus.spec	23 Sep 2006 15:21:18 -0000	1.12
+++ pessulus.spec	3 Oct 2006 19:07:38 -0000	1.13
@@ -1,9 +1,9 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define debug_package %{nil}
+%{!?python_sitearch: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 
 Name:	pessulus
-Version:	2.16.0
-Release:	4%{?dist}
+Version:	2.16.1
+Release:	1%{?dist}
 Summary:	A lockdown editor for GNOME
 
 Group:	Applications/System
@@ -11,7 +11,7 @@
 URL:	http://live.gnome.org/Pessulus
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildArch:      noarch
 
 BuildRequires:	gtk2-devel, pygtk2-devel, gnome-python2, gnome-python2-gconf, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2-devel, gettext-devel
 Requires: gnome-python2-gconf
@@ -35,7 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{python_sitearch}/Pessulus/*.py
+chmod +x $RPM_BUILD_ROOT%{python_sitelib}/Pessulus/*.py
 
 
 desktop-file-install --vendor fedora --delete-original \
@@ -52,11 +52,15 @@
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING ChangeLog
 %{_bindir}/%{name}
-%{python_sitearch}/Pessulus/
+%{python_sitelib}/Pessulus/
 %{_datadir}/applications/*.desktop
 %{_datadir}/%{name}
 
 %changelog
+* Sat Sep 23 2006 Damien Durand <splinux at fedoraproject.org> - 2.16.1-1
+- Upgrade to 2.16.1
+- Fixed #195819
+
 * Sat Sep 23 2006 Damien Durand <splinux at fedoraproject.org> - 2.16-4
 - Bumped release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Sep 2006 23:22:01 -0000	1.6
+++ sources	3 Oct 2006 19:07:38 -0000	1.7
@@ -1 +1 @@
-a87d325aafc4377d1749575bd6e9b44d  pessulus-2.16.0.tar.bz2
+884031b0ec1d1e6c15c3fd8f110541bb  pessulus-2.16.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 19:17:07 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:17:07 -0700
Subject: rpms/librsync/devel librsync.spec,1.12,1.13
Message-ID: <200610031917.k93JH9FC009763@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/librsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9746

Modified Files:
	librsync.spec 
Log Message:
Rebuilt



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- librsync.spec	25 Sep 2006 19:01:12 -0000	1.12
+++ librsync.spec	3 Oct 2006 19:17:07 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
+- rebuilt
+
 * Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
 - added an upstream patch to solve a lfs overflow (#207940)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:18:07 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:18:07 -0700
Subject: rpms/librsync/FC-5 librsync.spec,1.12,1.13
Message-ID: <200610031918.k93JI92k009793@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/librsync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9776

Modified Files:
	librsync.spec 
Log Message:
Rebuilt



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/FC-5/librsync.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- librsync.spec	25 Sep 2006 19:01:46 -0000	1.12
+++ librsync.spec	3 Oct 2006 19:18:07 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
+- rebuilt
+
 * Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
 - added an upstream patch to solve a lfs overflow (#207940)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:18:29 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:18:29 -0700
Subject: rpms/librsync/FC-4 librsync.spec,1.11,1.12
Message-ID: <200610031918.k93JIVjL009821@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/librsync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9804

Modified Files:
	librsync.spec 
Log Message:
Rebuilt



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/FC-4/librsync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- librsync.spec	25 Sep 2006 19:03:23 -0000	1.11
+++ librsync.spec	3 Oct 2006 19:18:29 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
+- rebuilt
+
 * Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
 - added an upstream patch to solve a lfs overflow (#207940)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:18:49 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:18:49 -0700
Subject: rpms/librsync/FC-3 librsync.spec,1.7,1.8
Message-ID: <200610031918.k93JIpxH009852@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/librsync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835

Modified Files:
	librsync.spec 
Log Message:
Rebuilt



Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/FC-3/librsync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- librsync.spec	25 Sep 2006 19:06:32 -0000	1.7
+++ librsync.spec	3 Oct 2006 19:18:49 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
+- rebuilt
+
 * Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
 - added an upstream patch to solve a lfs overflow (#207940)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:23:37 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:23:37 -0700
Subject: rpms/mimedefang/devel mimedefang.spec,1.1,1.2
Message-ID: <200610031923.k93JNd6K010078@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10058

Modified Files:
	mimedefang.spec 
Log Message:
Rebuilt



Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mimedefang.spec	16 Sep 2006 17:19:57 -0000	1.1
+++ mimedefang.spec	3 Oct 2006 19:23:37 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
 Version:           2.57
-Release:           4%{?dist}
+Release:           5%{?dist}
 License:           GPL
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -86,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 2.57-5
+- Rebuilt
+
 * Sat Sep 16 2006 Robert Scheck <robert at fedoraproject.org> 2.57-4
 - Removed two hardcoded versioned requirements (#196101 #c13)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:24:15 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue,  3 Oct 2006 12:24:15 -0700
Subject: rpms/mimedefang/FC-5 mimedefang.spec,1.1,1.2
Message-ID: <200610031924.k93JOHIA010148@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10131

Modified Files:
	mimedefang.spec 
Log Message:
Rebuilt



Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-5/mimedefang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mimedefang.spec	16 Sep 2006 17:19:57 -0000	1.1
+++ mimedefang.spec	3 Oct 2006 19:24:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
 Version:           2.57
-Release:           4%{?dist}
+Release:           5%{?dist}
 License:           GPL
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -86,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 2.57-5
+- Rebuilt
+
 * Sat Sep 16 2006 Robert Scheck <robert at fedoraproject.org> 2.57-4
 - Removed two hardcoded versioned requirements (#196101 #c13)
 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:36:52 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Tue,  3 Oct 2006 12:36:52 -0700
Subject: rpms/wavbreaker/devel wavbreaker-tooltips.patch, NONE,
	1.1 wavbreaker.spec, 1.1, 1.2
Message-ID: <200610031936.k93JastP010302@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10275

Modified Files:
	wavbreaker.spec 
Added Files:
	wavbreaker-tooltips.patch 
Log Message:
added simple tooltips fix


wavbreaker-tooltips.patch:

--- NEW FILE wavbreaker-tooltips.patch ---
--- wavbreaker-0.7/src/wavbreaker.c.orig	2006-10-03 14:57:07.000000000 -0400
+++ wavbreaker-0.7/src/wavbreaker.c	2006-10-03 14:58:37.000000000 -0400
@@ -2107,10 +2107,10 @@
 
 #ifdef HAVE_GTK_2_6
     gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_MEDIA_PLAY,
-                             "Quit wavbreaker", NULL,
+                             "Play Wave File", NULL,
                              G_CALLBACK(menu_play), main_window, -1);
     gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_MEDIA_STOP,
-                             "Quit wavbreaker", NULL,
+                             "Stop Playback", NULL,
                              G_CALLBACK(menu_stop), main_window, -1);
 #else
     icon = gtk_image_new_from_file(play_icon_filename);


Index: wavbreaker.spec
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/devel/wavbreaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wavbreaker.spec	2 Oct 2006 21:25:06 -0000	1.1
+++ wavbreaker.spec	3 Oct 2006 19:36:52 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Tool for splitting .wav files
 Name:		wavbreaker
 Version: 	0.7
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://huli.org/wavbreaker/index.html
@@ -9,6 +9,7 @@
 Source1:	wavbreaker-icon.png
 Source2:	wavbreaker.desktop
 Patch:		wavbreaker-0.7-browsedir-set_current_folder-v2.patch
+Patch1:		wavbreaker-tooltips.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, libxml2-devel, desktop-file-utils, alsa-lib-devel
 Requires(post):	desktop-file-utils
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
 
 %build
 %configure
@@ -59,6 +61,9 @@
 %doc ChangeLog CONTRIBUTORS NEWS AUTHORS COPYING README TODO
 
 %changelog
+* Tue Oct 3 2006 Homer <dmaley at nc.rr.com> 0.7-6
+- added wavbreaker-tooltips.patch
+
 * Thu Jun 1 2006 Homer <dmaley at nc.rr.com> 0.7-5
 - replaced wavbreaker-0.7-browsedir-set_current_folder.patch w/ 
   wavbreaker-0.7-browsedir-set_current_folder-v2.patch



From fedora-extras-commits at redhat.com  Tue Oct  3 19:45:43 2006
From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb))
Date: Tue,  3 Oct 2006 12:45:43 -0700
Subject: rpms/cowbell/devel cowbell.spec,1.5,1.6
Message-ID: <200610031945.k93JjjMM010400@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/cowbell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10383

Modified Files:
	cowbell.spec 
Log Message:
Don't replace %{_libdir}


Index: cowbell.spec
===================================================================
RCS file: /cvs/extras/rpms/cowbell/devel/cowbell.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cowbell.spec	15 Sep 2006 12:32:31 -0000	1.5
+++ cowbell.spec	3 Oct 2006 19:45:43 -0000	1.6
@@ -1,5 +1,3 @@
-%define _libdir /usr/lib
-
 Name:           cowbell
 Version:        0.2.7.1
 Release:        6%{?dist}
@@ -82,6 +80,8 @@
 
 
 %changelog
+* Tue Oct 03 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.7.1-7
+- Don't replace %{_libdir}
 * Fri Sep 15 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.7.1-6
 - Add missing gtk-sharp2-devel Builddep
 * Fri Sep 15 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.2.7.1-5



From fedora-extras-commits at redhat.com  Tue Oct  3 19:46:47 2006
From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb))
Date: Tue,  3 Oct 2006 12:46:47 -0700
Subject: rpms/cowbell/devel cowbell.spec,1.6,1.7
Message-ID: <200610031946.k93JknnW010453@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/cowbell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10436

Modified Files:
	cowbell.spec 
Log Message:
Don't replace %{_libdir}


Index: cowbell.spec
===================================================================
RCS file: /cvs/extras/rpms/cowbell/devel/cowbell.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cowbell.spec	3 Oct 2006 19:45:43 -0000	1.6
+++ cowbell.spec	3 Oct 2006 19:46:47 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           cowbell
 Version:        0.2.7.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Music organazier
 
 Group:         	Applications/Multimedia 



From fedora-extras-commits at redhat.com  Tue Oct  3 19:52:33 2006
From: fedora-extras-commits at redhat.com (Dave Maley (dmaley))
Date: Tue,  3 Oct 2006 12:52:33 -0700
Subject: rpms/wavbreaker/FC-5 wavbreaker-tooltips.patch, NONE,
	1.1 wavbreaker.spec, 1.1, 1.2
Message-ID: <200610031952.k93JqZj2010624@cvs-int.fedora.redhat.com>

Author: dmaley

Update of /cvs/extras/rpms/wavbreaker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10604

Modified Files:
	wavbreaker.spec 
Added Files:
	wavbreaker-tooltips.patch 
Log Message:
added simple tooltips fix


wavbreaker-tooltips.patch:

--- NEW FILE wavbreaker-tooltips.patch ---
--- wavbreaker-0.7/src/wavbreaker.c.orig	2006-10-03 14:57:07.000000000 -0400
+++ wavbreaker-0.7/src/wavbreaker.c	2006-10-03 14:58:37.000000000 -0400
@@ -2107,10 +2107,10 @@
 
 #ifdef HAVE_GTK_2_6
     gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_MEDIA_PLAY,
-                             "Quit wavbreaker", NULL,
+                             "Play Wave File", NULL,
                              G_CALLBACK(menu_play), main_window, -1);
     gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_MEDIA_STOP,
-                             "Quit wavbreaker", NULL,
+                             "Stop Playback", NULL,
                              G_CALLBACK(menu_stop), main_window, -1);
 #else
     icon = gtk_image_new_from_file(play_icon_filename);


Index: wavbreaker.spec
===================================================================
RCS file: /cvs/extras/rpms/wavbreaker/FC-5/wavbreaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wavbreaker.spec	2 Oct 2006 21:25:06 -0000	1.1
+++ wavbreaker.spec	3 Oct 2006 19:52:33 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Tool for splitting .wav files
 Name:		wavbreaker
 Version: 	0.7
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://huli.org/wavbreaker/index.html
@@ -9,6 +9,7 @@
 Source1:	wavbreaker-icon.png
 Source2:	wavbreaker.desktop
 Patch:		wavbreaker-0.7-browsedir-set_current_folder-v2.patch
+Patch1:		wavbreaker-tooltips.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, libxml2-devel, desktop-file-utils, alsa-lib-devel
 Requires(post):	desktop-file-utils
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
 
 %build
 %configure
@@ -59,6 +61,9 @@
 %doc ChangeLog CONTRIBUTORS NEWS AUTHORS COPYING README TODO
 
 %changelog
+* Tue Oct 3 2006 Homer <dmaley at nc.rr.com> 0.7-6
+- added wavbreaker-tooltips.patch
+
 * Thu Jun 1 2006 Homer <dmaley at nc.rr.com> 0.7-5
 - replaced wavbreaker-0.7-browsedir-set_current_folder.patch w/ 
   wavbreaker-0.7-browsedir-set_current_folder-v2.patch



From fedora-extras-commits at redhat.com  Tue Oct  3 20:00:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue,  3 Oct 2006 13:00:07 -0700
Subject: rpms/perl-Alien-wxWidgets/devel .cvsignore, 1.2,
	1.3 perl-Alien-wxWidgets.spec, 1.3, 1.4 sources, 1.2,
	1.3 Alien-wxWidgets-0.21-Any_wx_config.pm.patch, 1.1, NONE
Message-ID: <200610032000.k93K09Zg010802@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10755

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Removed Files:
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch 
Log Message:
- Update to 0.22.
- Avoid creation of the debuginfo package (#209180).
- Dropped patch Alien-wxWidgets-0.21-Any_wx_config.pm.patch
  (http://rt.cpan.org/Public/Bug/Display.html?id=21854).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:34:31 -0000	1.2
+++ .cvsignore	3 Oct 2006 20:00:07 -0000	1.3
@@ -1 +1 @@
-Alien-wxWidgets-0.21.tar.gz
+Alien-wxWidgets-0.22.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Alien-wxWidgets.spec	1 Oct 2006 01:32:52 -0000	1.3
+++ perl-Alien-wxWidgets.spec	3 Oct 2006 20:00:07 -0000	1.4
@@ -1,21 +1,23 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.21
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
-Patch0:         Alien-wxWidgets-0.21-Any_wx_config.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::Pluggable)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%define debug_package %{nil}
+
 %description
 "Alien::wxWidgets" can be used to detect and get configuration
 settings from an installed wxWidgets.
@@ -23,7 +25,6 @@
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
-%patch0 -p1
 
 
 %build
@@ -53,6 +54,12 @@
 
 
 %changelog
+* Tue Oct  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
+- Update to 0.22.
+- Avoid creation of the debuginfo package (#209180).
+- Dropped patch Alien-wxWidgets-0.21-Any_wx_config.pm.patch
+  (http://rt.cpan.org/Public/Bug/Display.html?id=21854).
+
 * Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-3
 - Patch to add /usr/lib64 to the library search path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:34:31 -0000	1.2
+++ sources	3 Oct 2006 20:00:07 -0000	1.3
@@ -1 +1 @@
-6975385d6e4d4d58c5d589c2a7077d23  Alien-wxWidgets-0.21.tar.gz
+98de414f8d378170ede6cf96a0e2f73e  Alien-wxWidgets-0.22.tar.gz


--- Alien-wxWidgets-0.21-Any_wx_config.pm.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct  3 20:10:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue,  3 Oct 2006 13:10:34 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-5 .cvsignore, 1.2,
	1.3 perl-Alien-wxWidgets.spec, 1.3, 1.4 sources, 1.2,
	1.3 Alien-wxWidgets-0.21-Any_wx_config.pm.patch, 1.1, NONE
Message-ID: <200610032010.k93KAaKN013806@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13785

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Removed Files:
	Alien-wxWidgets-0.21-Any_wx_config.pm.patch 
Log Message:
- Update to 0.22.
- Avoid creation of the debuginfo package (#209180).
- Dropped patch Alien-wxWidgets-0.21-Any_wx_config.pm.patch
  (http://rt.cpan.org/Public/Bug/Display.html?id=21854).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:34:31 -0000	1.2
+++ .cvsignore	3 Oct 2006 20:10:34 -0000	1.3
@@ -1 +1 @@
-Alien-wxWidgets-0.21.tar.gz
+Alien-wxWidgets-0.22.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/perl-Alien-wxWidgets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Alien-wxWidgets.spec	1 Oct 2006 01:48:42 -0000	1.3
+++ perl-Alien-wxWidgets.spec	3 Oct 2006 20:10:34 -0000	1.4
@@ -1,21 +1,23 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.21
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
-Patch0:         Alien-wxWidgets-0.21-Any_wx_config.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::Pluggable)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%define debug_package %{nil}
+
 %description
 "Alien::wxWidgets" can be used to detect and get configuration
 settings from an installed wxWidgets.
@@ -23,7 +25,6 @@
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
-%patch0 -p1
 
 
 %build
@@ -53,6 +54,12 @@
 
 
 %changelog
+* Tue Oct  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
+- Update to 0.22.
+- Avoid creation of the debuginfo package (#209180).
+- Dropped patch Alien-wxWidgets-0.21-Any_wx_config.pm.patch
+  (http://rt.cpan.org/Public/Bug/Display.html?id=21854).
+
 * Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-3
 - Patch to add /usr/lib64 to the library search path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:34:31 -0000	1.2
+++ sources	3 Oct 2006 20:10:34 -0000	1.3
@@ -1 +1 @@
-6975385d6e4d4d58c5d589c2a7077d23  Alien-wxWidgets-0.21.tar.gz
+98de414f8d378170ede6cf96a0e2f73e  Alien-wxWidgets-0.22.tar.gz


--- Alien-wxWidgets-0.21-Any_wx_config.pm.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct  3 20:34:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 13:34:56 -0700
Subject: rpms/jasper/FC-5 .cvsignore,1.2,1.3 jasper.spec,1.13,1.14
Message-ID: <200610032034.k93KYw0n013963@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13944

Modified Files:
	.cvsignore jasper.spec 
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
- memory leak (#207006)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:40:10 -0000	1.2
+++ .cvsignore	3 Oct 2006 20:34:55 -0000	1.3
@@ -1 +1,2 @@
+geojasper_src.zip
 jasper-1.701.0.zip


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-5/jasper.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jasper.spec	1 Mar 2006 18:16:10 -0000	1.13
+++ jasper.spec	3 Oct 2006 20:34:56 -0000	1.14
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 12%{?dist}
+Release: 15%{?dist}
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"
@@ -29,14 +29,16 @@
 Patch1: jasper-1.701.0-GL.patch
 # autoconf/automake bits of patch1
 Patch2: jasper-1.701.0-GL-ac.patch
+# memory leak, see
+# http://gyachi.sourceforge.net/download.shtml
+# http://ayttm.sourceforge.net/files.shtml
+# http://ayttm.sourceforge.net/jasper-memory-leak-1.701.0.patch.gz
+Patch3: jasper-1.701.0-memory_leak.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -56,6 +58,7 @@
 %setup -q -n %{name}-%{version}%{?geo:.GEO}
 
 %patch1 -p1 -b .GL
+%patch3 -p1 -b .memleak
 
 %if "%{?geo:1}" == "1"
 chmod +x configure configure.ac
@@ -93,7 +96,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/jiv
@@ -102,7 +105,7 @@
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
 %{_libdir}/lib*.so
@@ -118,6 +121,12 @@
 
 
 %changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
+- memory leak (#207006)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-13
+- fc6 respin
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-12
 - fixup build issues introduced by geojasper integration
 



From fedora-extras-commits at redhat.com  Tue Oct  3 20:35:50 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 13:35:50 -0700
Subject: rpms/jasper/FC-4 .cvsignore, 1.2, 1.3 jasper-1.701.0-GL.patch, 1.2, 
	1.3 jasper.spec, 1.7, 1.8
Message-ID: <200610032035.k93KZrdq014041@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14017

Modified Files:
	.cvsignore jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
- memory leak (#207006)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:40:10 -0000	1.2
+++ .cvsignore	3 Oct 2006 20:35:50 -0000	1.3
@@ -1 +1,2 @@
+geojasper_src.zip
 jasper-1.701.0.zip

jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper-1.701.0-GL.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper-1.701.0-GL.patch	31 Jan 2006 17:01:33 -0000	1.2
+++ jasper-1.701.0-GL.patch	3 Oct 2006 20:35:50 -0000	1.3
@@ -1,6 +1,6 @@
---- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
-+++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
-@@ -9465,7 +9465,7 @@
+--- jasper-1.701.0.GEO/configure.GL	2006-02-20 20:01:30.000000000 -0600
++++ jasper-1.701.0.GEO/configure	2006-02-24 07:40:46.000000000 -0600
+@@ -9464,7 +9464,7 @@
  OPENGL_LIBS=""
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jasper.spec	31 Jan 2006 17:01:33 -0000	1.7
+++ jasper.spec	3 Oct 2006 20:35:50 -0000	1.8
@@ -5,25 +5,40 @@
 # koffice
 # 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.701.0
-Release: 9%{?dist}
+Release: 15%{?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
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
+# autoconf/automake bits of patch1
+Patch2: jasper-1.701.0-GL-ac.patch
+# memory leak, see
+# http://gyachi.sourceforge.net/download.shtml
+# http://ayttm.sourceforge.net/files.shtml
+# http://ayttm.sourceforge.net/jasper-memory-leak-1.701.0.patch.gz
+Patch3: jasper-1.701.0-memory_leak.patch
 
+BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -40,12 +55,24 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?geo:.GEO}
 
 %patch1 -p1 -b .GL
+%patch3 -p1 -b .memleak
+
+%if "%{?geo:1}" == "1"
+chmod +x configure configure.ac
+%patch2 -p1 -b .GL-ac
+libtoolize --force
+aclocal
+autoconf
+autoheader
+automake -a
+%endif
 
 
 %build
+
 %configure \
   --enable-shared \
   --disable-static 
@@ -67,24 +94,20 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}*
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-# avoid conflict(s) with tomcat
-# not needed anymore, see bz #176773
-# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
-
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/jiv
 %{_bindir}/imginfo
-%{_bindir}/jasper*
+%{_bindir}/*jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*
-%{_includedir}/*
+%{_includedir}/jasper/
 %{_libdir}/lib*.so
 
 
@@ -98,6 +121,22 @@
 
 
 %changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
+- memory leak (#207006)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-13
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-12
+- fixup build issues introduced by geojasper integration
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-10
+- support/use geojasper (optional, default no)
+- fc5: gcc/glibc respin
+
+* Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
 - workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
   (#179464)



From fedora-extras-commits at redhat.com  Tue Oct  3 20:37:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 13:37:54 -0700
Subject: rpms/jasper/FC-4 jasper-1.701.0-GL-ac.patch, NONE,
	1.1 jasper-1.701.0-memory_leak.patch, NONE, 1.1 jasper.spec, 1.8, 1.9
Message-ID: <200610032037.k93KbuSj014118@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14095

Modified Files:
	jasper.spec 
Added Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-memory_leak.patch 
Log Message:
include patch this time


jasper-1.701.0-GL-ac.patch:

--- NEW FILE jasper-1.701.0-GL-ac.patch ---
--- jasper-1.701.0.GEO/configure.ac.GL	2006-02-20 19:58:02.000000000 -0600
+++ jasper-1.701.0.GEO/configure.ac	2006-02-24 07:40:38.000000000 -0600
@@ -242,7 +242,7 @@
 OPENGL_LIBS=""
 if test $ENABLE_OPENGL = yes; then
 	if test $HAVE_OPENGL = no; then
-		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
+		TMPLIBS="-lglut"
 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
 	fi

jasper-1.701.0-memory_leak.patch:

--- NEW FILE jasper-1.701.0-memory_leak.patch ---
diff -ur jasper-1.701.0/src/libjasper/base/jas_stream.c jasper-1.701.0-local/src/libjasper/base/jas_stream.c
--- jasper-1.701.0/src/libjasper/base/jas_stream.c	2004-02-09 07:04:40.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/base/jas_stream.c	2005-10-23 02:08:06.145589016 +0530
@@ -361,11 +361,11 @@
 	}
 	obj->fd = -1;
 	obj->flags = 0;
-	obj->pathname[0] = '\0';
+	strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	tmpnam(obj->pathname);
+	mkstemp(obj->pathname);
 
 	/* Open the underlying file. */
 	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
diff -ur jasper-1.701.0/src/libjasper/jpg/jpg_enc.c jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c
--- jasper-1.701.0/src/libjasper/jpg/jpg_enc.c	2004-02-09 07:04:41.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c	2005-10-23 02:09:02.526017888 +0530
@@ -331,6 +331,7 @@
 	rewind(output_file);
 	jpg_copyfiletostream(out, output_file);
 	fclose(output_file);
+	jas_matrix_destroy(src_mgr->data);
 	output_file = 0;
 
 	return 0;


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jasper.spec	3 Oct 2006 20:35:50 -0000	1.8
+++ jasper.spec	3 Oct 2006 20:37:54 -0000	1.9
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 15%{?dist}
+Release: 15%{?dist}.1
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"



From fedora-extras-commits at redhat.com  Tue Oct  3 20:38:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Oct 2006 13:38:20 -0700
Subject: rpms/jasper/FC-5 jasper-1.701.0-memory_leak.patch, NONE,
	1.1 jasper.spec, 1.14, 1.15
Message-ID: <200610032038.k93KcMUv014182@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14162

Modified Files:
	jasper.spec 
Added Files:
	jasper-1.701.0-memory_leak.patch 
Log Message:
include patch this time


jasper-1.701.0-memory_leak.patch:

--- NEW FILE jasper-1.701.0-memory_leak.patch ---
diff -ur jasper-1.701.0/src/libjasper/base/jas_stream.c jasper-1.701.0-local/src/libjasper/base/jas_stream.c
--- jasper-1.701.0/src/libjasper/base/jas_stream.c	2004-02-09 07:04:40.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/base/jas_stream.c	2005-10-23 02:08:06.145589016 +0530
@@ -361,11 +361,11 @@
 	}
 	obj->fd = -1;
 	obj->flags = 0;
-	obj->pathname[0] = '\0';
+	strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	tmpnam(obj->pathname);
+	mkstemp(obj->pathname);
 
 	/* Open the underlying file. */
 	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
diff -ur jasper-1.701.0/src/libjasper/jpg/jpg_enc.c jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c
--- jasper-1.701.0/src/libjasper/jpg/jpg_enc.c	2004-02-09 07:04:41.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c	2005-10-23 02:09:02.526017888 +0530
@@ -331,6 +331,7 @@
 	rewind(output_file);
 	jpg_copyfiletostream(out, output_file);
 	fclose(output_file);
+	jas_matrix_destroy(src_mgr->data);
 	output_file = 0;
 
 	return 0;


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-5/jasper.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jasper.spec	3 Oct 2006 20:34:56 -0000	1.14
+++ jasper.spec	3 Oct 2006 20:38:19 -0000	1.15
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 15%{?dist}
+Release: 15%{?dist}.1
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"



From fedora-extras-commits at redhat.com  Tue Oct  3 21:53:44 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 14:53:44 -0700
Subject: rpms/gdl/devel gdl.spec,1.16,1.17
Message-ID: <200610032153.k93LrkZi017452@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17433

Modified Files:
	gdl.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gdl.spec	19 Sep 2006 16:41:52 -0000	1.16
+++ gdl.spec	3 Oct 2006 21:53:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gdl
 Version:        0.9
-Release:        0.pre3%{?dist}
+Release:        0.pre3.1%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}pre2
-%patch -p1
+#%patch -p1
 
 
 %build
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.pre3.1
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 19 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.pre3
 - Rebuild for FC6
 - Add patch for specialization error caught by gcc 4.1.1



From fedora-extras-commits at redhat.com  Tue Oct  3 21:54:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 14:54:43 -0700
Subject: rpms/kdesvn/devel kdesvn.spec,1.20,1.21
Message-ID: <200610032154.k93LsjAL017528@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17508

Modified Files:
	kdesvn.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kdesvn.spec	19 Sep 2006 20:24:18 -0000	1.20
+++ kdesvn.spec	3 Oct 2006 21:54:43 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           kdesvn
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-1
 - Update to 0.9.3
 - Remove patch applied upstream



From fedora-extras-commits at redhat.com  Tue Oct  3 21:55:50 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 14:55:50 -0700
Subject: rpms/ncarg/devel ncarg.spec,1.6,1.7
Message-ID: <200610032155.k93LtqjA017589@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/ncarg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17572

Modified Files:
	ncarg.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: ncarg.spec
===================================================================
RCS file: /cvs/extras/rpms/ncarg/devel/ncarg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ncarg.spec	21 Sep 2006 20:51:51 -0000	1.6
+++ ncarg.spec	3 Oct 2006 21:55:50 -0000	1.7
@@ -1,16 +1,14 @@
 Name:           ncarg
-Version:        4.4.1
-Release:        5%{?dist}
+Version:        4.4.2
+Release:        2%{?dist}
 Summary:        A Fortran and C based software package for scientific visualization
 Group:          Development/Libraries
 License:        GPL
 URL:            http://ngwww.ucar.edu/ng4.4/index.html
-Source0:        http://ngwww.ucar.edu/ngbin/ncarg-4.4.1.src.tar.gz
+Source0:        http://ngwww.ucar.edu/ngbin/ncarg-%{version}.src.tar.gz
 Source1:        Site.local
 Source2:        ncarg.csh
 Source3:        ncarg.sh
-Patch1:         ncarg-4.4.1-config.patch
-Patch2:         ncarg-4.4.1-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran >= 4.1.0, hdf-devel, libjpeg-devel
@@ -30,8 +28,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .config
-%patch2 -p1 -b .include
 cp %{SOURCE1} config
 #Fix up the lib install dir
 sed -i -e s,/LIB/,/%{_lib}/, config/Site.local %{SOURCE2} %{SOURCE3}
@@ -107,6 +103,7 @@
 %{_bindir}/tgks0a
 %{_bindir}/tlocal
 %dir %{_libdir}/ncarg
+%{_libdir}/ncarg/ncarg/data/
 %{_libdir}/ncarg/ncarg/database/
 %{_libdir}/ncarg/ncarg/fontcaps/
 %{_libdir}/ncarg/ncarg/graphcaps/
@@ -127,6 +124,7 @@
 %{_libdir}/ncarg/libncarg_gks.a
 %{_libdir}/ncarg/libncarg_ras.a
 %{_libdir}/ncarg/libngmath.a
+%{_libdir}/ncarg/libsphere3.1_dp.a
 %{_libdir}/ncarg/ncarg/examples/
 %{_libdir}/ncarg/ncarg/tests/
 %{_libdir}/ncarg/ncarg/tutorial/
@@ -134,6 +132,13 @@
 
 
 %changelog
+* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Thu Sep 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-1
+- Update to 4.4.2
+- Use RPM_OPT_FLAGS during compile
+
 * Thu Sep 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-5
 - Add NCARG_LIB to ncarg.sh/ncarg.csh profile so ncargpath points to the right
   place (bug #207498).



From fedora-extras-commits at redhat.com  Tue Oct  3 21:56:47 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue,  3 Oct 2006 14:56:47 -0700
Subject: rpms/ctorrent/devel ctorrent.spec,1.3,1.4
Message-ID: <200610032156.k93LunY1017657@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/ctorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17638

Modified Files:
	ctorrent.spec 
Log Message:
- rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: ctorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/devel/ctorrent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ctorrent.spec	21 Sep 2006 18:18:53 -0000	1.3
+++ ctorrent.spec	3 Oct 2006 21:56:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name: ctorrent
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: BitTorrent Client written in C
 Group: Applications/Internet
 License: GPL
@@ -33,6 +33,9 @@
 %doc AUTHORS README NEWS
 
 %changelog
+* Tue Oct 03 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-1
 - update to 1.3.4
 - mass rebuild



From fedora-extras-commits at redhat.com  Tue Oct  3 21:59:30 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 14:59:30 -0700
Subject: rpms/ncarg/devel Site.local,1.1,1.2
Message-ID: <200610032159.k93LxWHS017736@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/ncarg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17719

Modified Files:
	Site.local 
Log Message:
Build with RPM_OPT_FLAGS



Index: Site.local
===================================================================
RCS file: /cvs/extras/rpms/ncarg/devel/Site.local,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Site.local	3 Feb 2006 17:12:53 -0000	1.1
+++ Site.local	3 Oct 2006 21:59:30 -0000	1.2
@@ -15,6 +15,8 @@
 
 
 
+#define CcOptions $(RPM_OPT_FLAGS)
+#define FcOptions $(RPM_OPT_FLAGS)
 #define BuildWithF90 TRUE
 #define FCompiler gfortran
 #define CtoFLibraries -lgfortran -lm



From fedora-extras-commits at redhat.com  Tue Oct  3 22:00:40 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue,  3 Oct 2006 15:00:40 -0700
Subject: rpms/openbabel/devel openbabel.spec,1.3,1.4
Message-ID: <200610032200.k93M0gGM017842@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/openbabel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17825

Modified Files:
	openbabel.spec 
Log Message:
- rebuilt for unwind info generation, broken in gcc-4.1.1-21


Index: openbabel.spec
===================================================================
RCS file: /cvs/extras/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openbabel.spec	20 Sep 2006 07:10:51 -0000	1.3
+++ openbabel.spec	3 Oct 2006 22:00:40 -0000	1.4
@@ -7,7 +7,7 @@
 
 Name: openbabel
 Version: 2.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Chemistry software file format converter
 License: GPL
 Group: Applications/File
@@ -182,6 +182,9 @@
 %{python_sitearch}/openbabel.py*
 
 %changelog
+* Tue Oct 03 2006 Dominik Mierzejewski <rpm at greysector.net> 2.0.2-5
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Dominik Mierzejewski <rpm at greysector.net> 2.0.2-4
 - .pyo files no longer ghosted
 - fix chicken-and-egg problem when building perl and python bindings



From fedora-extras-commits at redhat.com  Tue Oct  3 22:21:24 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 15:21:24 -0700
Subject: rpms/gdl/devel gdl.spec,1.17,1.18
Message-ID: <200610032221.k93MLRnI020837@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20820

Modified Files:
	gdl.spec 
Log Message:
Really apply the patch



Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gdl.spec	3 Oct 2006 21:53:44 -0000	1.17
+++ gdl.spec	3 Oct 2006 22:21:24 -0000	1.18
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}pre2
-#%patch -p1
+%patch -p1
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Oct  3 22:29:00 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 15:29:00 -0700
Subject: rpms/plplot/devel plplot.spec,1.20,1.21
Message-ID: <200610032229.k93MT2pv020953@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20936

Modified Files:
	plplot.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plplot.spec	25 Sep 2006 16:50:18 -0000	1.20
+++ plplot.spec	3 Oct 2006 22:29:00 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -347,6 +347,9 @@
 
 
 %changelog
+* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-6
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-5
 - Add needed Requires for -devel packages (bug #202168)
 - Patch .info rather than .texi, and actually apply



From fedora-extras-commits at redhat.com  Tue Oct  3 22:30:50 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Oct 2006 15:30:50 -0700
Subject: rpms/ruby-mysql/devel ruby-mysql.spec,1.4,1.5
Message-ID: <200610032230.k93MUqw9021050@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/ruby-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21028

Modified Files:
	ruby-mysql.spec 
Log Message:
rebuilt for unwind info generation, broken in gcc-4.1.1-21



Index: ruby-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-mysql/devel/ruby-mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ruby-mysql.spec	20 Sep 2006 17:45:09 -0000	1.4
+++ ruby-mysql.spec	3 Oct 2006 22:30:49 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ruby-mysql
 Version:        2.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Ruby interface to MySQL
 
 Group:          Development/Languages
@@ -39,6 +39,9 @@
 %{ruby_sitearchdir}/mysql.so
 
 %changelog
+* Wed Oct  3 2006 Orion Poplawski <orion at cora.nwra.com> - 2.7.1-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Orion Poplawski <orion at cora.nwra.com> - 2.7.1-1
 - Update to 2.7.1
 



From fedora-extras-commits at redhat.com  Tue Oct  3 22:59:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 15:59:10 -0700
Subject: rpms/brasero import.log,1.1,1.2
Message-ID: <200610032259.k93MxC7n021224@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21191

Modified Files:
	import.log 
Log Message:
auto-import brasero-0.4.4-3 on branch devel from brasero-0.4.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/brasero/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Oct 2006 18:28:05 -0000	1.1
+++ import.log	3 Oct 2006 22:59:09 -0000	1.2
@@ -0,0 +1 @@
+brasero-0_4_4-3:HEAD:brasero-0.4.4-3.src.rpm:1159916284



From fedora-extras-commits at redhat.com  Tue Oct  3 22:59:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 15:59:10 -0700
Subject: rpms/brasero/devel brasero.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610032259.k93MxCFt021229@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21191/devel

Modified Files:
	.cvsignore sources 
Added Files:
	brasero.spec 
Log Message:
auto-import brasero-0.4.4-3 on branch devel from brasero-0.4.4-3.src.rpm


--- NEW FILE brasero.spec ---

Name:      brasero
Version:   0.4.4
Release:   3%{?dist}
Summary:   Gnome CD/DVD burning application
Group:     Applications/Multimedia
License:   GPL
URL:       http://perso.orange.fr/bonfire/
Source0:   http://download.sourceforge.net/bonfire/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext intltool
BuildRequires:  desktop-file-utils
BuildRequires:  libgnomeui-devel >= 2.10.0
BuildRequires:  gstreamer-devel >= 0.10.6
BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
BuildRequires:  nautilus-cd-burner-devel >= 2.14.0
BuildRequires:  libnotify-devel >= 0.3.0
BuildRequires:  libbeagle-devel >= 0.1.1
BuildRequires:  totem-devel >= 1.2.0

Requires:  dvd+rw-tools
Requires:  cdrecord
Requires:  mkisofs
Requires:  cdda2wav
Requires:  cdrdao

Requires(post):    shared-mime-info
Requires(postun):  shared-mime-info


%description
Simple and easy to use CD/DVD burning application for the Gnome
desktop.


%prep
%setup -q


%build
%configure --disable-caches
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-category X-Fedora                        \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/gnome || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
fi
update-desktop-database &> /dev/null ||:


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/gnome || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
fi
update-desktop-database &> /dev/null ||:


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/brasero.desktop
%{_datadir}/pixmaps/*
%{_datadir}/icons/gnome/48x48/mimetypes/*
%{_datadir}/mime/packages/*


%changelog
* Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-3
- fixed homepage URL

* Tue Sep 26 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-2
- BRs cleanup

* Fri Sep 22 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-1
- First version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2006 18:28:05 -0000	1.1
+++ .cvsignore	3 Oct 2006 22:59:10 -0000	1.2
@@ -0,0 +1 @@
+brasero-0.4.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2006 18:28:05 -0000	1.1
+++ sources	3 Oct 2006 22:59:10 -0000	1.2
@@ -0,0 +1 @@
+1ef6ae66677ed9136634692d8bc1cc7a  brasero-0.4.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct  3 23:08:03 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue,  3 Oct 2006 16:08:03 -0700
Subject: owners owners.list,1.1768,1.1769
Message-ID: <200610032308.k93N85dW024215@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24198

Modified Files:
	owners.list 
Log Message:
Added brasero


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1768
retrieving revision 1.1769
diff -u -r1.1768 -r1.1769
--- owners.list	3 Oct 2006 08:19:54 -0000	1.1768
+++ owners.list	3 Oct 2006 23:08:02 -0000	1.1769
@@ -127,6 +127,7 @@
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|boo|Boo is an OO statically typed language for CLI|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|brandy|Brandy is a GPL implementation of BBC BASIC V|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|brasero|Gnome CD/DVD burning application|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora at leemhuis.info
 Fedora Extras|bsd-games|Collection of classic text-based games|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|bsdiff|Binary diff/patch utility|jnovy at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 03:39:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 20:39:05 -0700
Subject: rpms/perl-Data-Alias/FC-5 perl-Data-Alias.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610040339.k943d73B005494@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Alias/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/FC-5

Modified Files:
	perl-Data-Alias.spec sources 
Log Message:
update to 1.01



Index: perl-Data-Alias.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/FC-5/perl-Data-Alias.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Alias.spec	18 Aug 2006 01:40:05 -0000	1.2
+++ perl-Data-Alias.spec	4 Oct 2006 03:39:05 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Data-Alias
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.01
+Release:        1%{?dist}
 Summary:        Comprehensive set of aliasing operations
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,12 @@
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.01-1
+- update to 1.01
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0-3
+- bump for mass rebuild
+
 * Thu Aug 17 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2
 - bump for build & release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2006 01:38:56 -0000	1.2
+++ sources	4 Oct 2006 03:39:05 -0000	1.3
@@ -1 +1 @@
-390fc2fefbf3fa9bf30d482a46989953  Data-Alias-1.0.tar.gz
+5247906ae963ba3e3e4292b497d0d354  Data-Alias-1.01.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 03:39:06 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 20:39:06 -0700
Subject: rpms/perl-Data-Alias/devel .cvsignore, 1.2, 1.3 perl-Data-Alias.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610040339.k943d8Fa005500@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Alias/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/devel

Modified Files:
	.cvsignore perl-Data-Alias.spec sources 
Log Message:
update to 1.01



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2006 01:38:56 -0000	1.2
+++ .cvsignore	4 Oct 2006 03:39:06 -0000	1.3
@@ -1 +1 @@
-Data-Alias-1.0.tar.gz
+Data-Alias-1.01.tar.gz


Index: perl-Data-Alias.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/perl-Data-Alias.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Data-Alias.spec	1 Sep 2006 04:00:13 -0000	1.3
+++ perl-Data-Alias.spec	4 Oct 2006 03:39:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Data-Alias
-Version:        1.0
-Release:        3%{?dist}
+Version:        1.01
+Release:        1%{?dist}
 Summary:        Comprehensive set of aliasing operations
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -62,7 +62,10 @@
 
 
 %changelog
-* Thu Aug 31 2006 Chris Weyl <cweyl.drew.edu> 1.0-3
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.01-1
+- update to 1.01
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0-3
 - bump for mass rebuild
 
 * Thu Aug 17 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2006 01:38:56 -0000	1.2
+++ sources	4 Oct 2006 03:39:06 -0000	1.3
@@ -1 +1 @@
-390fc2fefbf3fa9bf30d482a46989953  Data-Alias-1.0.tar.gz
+5247906ae963ba3e3e4292b497d0d354  Data-Alias-1.01.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 03:39:04 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 20:39:04 -0700
Subject: rpms/perl-Data-Alias Makefile,1.1,1.2
Message-ID: <200610040339.k943danB005503@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-Alias
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444

Modified Files:
	Makefile 
Log Message:
update to 1.01



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Alias/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	18 Aug 2006 01:38:40 -0000	1.1
+++ Makefile	4 Oct 2006 03:39:04 -0000	1.2
@@ -2,6 +2,13 @@
 all : CVS/Root common-update
 	@cvs update
 
+# tag & build all non-legacy branches...
+build-all :
+	@echo WARNING: building for devel and FC-5
+	@sleep 5s
+	@cd FC-5  && test -f dead.package || ( make tag && make plague )
+	@cd devel && test -f dead.package || ( make tag && make plague )
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:13:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:13:57 -0700
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.2, 1.3 perl-Class-MOP.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610040413.k944DxCB008583@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8531/devel

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
Update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 23:34:55 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:13:57 -0000	1.3
@@ -1 +1 @@
-Class-MOP-0.34.tar.gz
+Class-MOP-0.35.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-MOP.spec	7 Sep 2006 23:35:29 -0000	1.2
+++ perl-Class-MOP.spec	4 Oct 2006 04:13:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Class-MOP
-Version:        0.34
-Release:        3%{?dist}
+Version:        0.35
+Release:        1%{?dist}
 Summary:        Class::MOP Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -52,11 +52,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README examples/
+%doc Changes README examples/ scripts/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
+- update to 0.35
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.34-3
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 23:34:55 -0000	1.2
+++ sources	4 Oct 2006 04:13:57 -0000	1.3
@@ -1 +1 @@
-88ae60fc9fe161598739f3de59d6932e  Class-MOP-0.34.tar.gz
+967208472643a15cfee9704b6ecb03eb  Class-MOP-0.35.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:13:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:13:51 -0700
Subject: rpms/perl-Class-MOP Makefile,1.1,1.2
Message-ID: <200610040414.k944ENcC008586@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8531

Modified Files:
	Makefile 
Log Message:
Update



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 23:34:28 -0000	1.1
+++ Makefile	4 Oct 2006 04:13:51 -0000	1.2
@@ -2,6 +2,13 @@
 all : CVS/Root common-update
 	@cvs update
 
+# tag & build all non-legacy branches...
+build-all :
+	@echo WARNING: building for devel and FC-5
+	@sleep 5s
+	@cd FC-5  && test -f dead.package || ( make tag && make plague )
+	@cd devel && test -f dead.package || ( make tag && make plague )
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:13:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:13:51 -0700
Subject: rpms/perl-Class-MOP/FC-5 perl-Class-MOP.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200610040414.k944ENQm008590@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8531/FC-5

Modified Files:
	perl-Class-MOP.spec sources 
Log Message:
Update



Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-5/perl-Class-MOP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-MOP.spec	7 Sep 2006 23:35:29 -0000	1.2
+++ perl-Class-MOP.spec	4 Oct 2006 04:13:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Class-MOP
-Version:        0.34
-Release:        3%{?dist}
+Version:        0.35
+Release:        1%{?dist}
 Summary:        Class::MOP Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -52,11 +52,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README examples/
+%doc Changes README examples/ scripts/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
+- update to 0.35
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.34-3
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 23:34:55 -0000	1.2
+++ sources	4 Oct 2006 04:13:51 -0000	1.3
@@ -1 +1 @@
-88ae60fc9fe161598739f3de59d6932e  Class-MOP-0.34.tar.gz
+967208472643a15cfee9704b6ecb03eb  Class-MOP-0.35.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:18:40 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:18:40 -0700
Subject: rpms/perl-SUPER Makefile,1.1,1.2
Message-ID: <200610040418.k944IgGO008716@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SUPER
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668

Modified Files:
	Makefile 
Log Message:
update 



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 22:50:31 -0000	1.1
+++ Makefile	4 Oct 2006 04:18:40 -0000	1.2
@@ -2,6 +2,13 @@
 all : CVS/Root common-update
 	@cvs update
 
+# tag & build all non-legacy branches...
+build-all :
+	@echo WARNING: building for devel and FC-5
+	@sleep 5s
+	@cd FC-5  && test -f dead.package || ( make tag && make plague )
+	@cd devel && test -f dead.package || ( make tag && make plague )
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:18:41 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:18:41 -0700
Subject: rpms/perl-SUPER/FC-5 perl-SUPER.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200610040418.k944IhsS008721@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SUPER/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668/FC-5

Modified Files:
	perl-SUPER.spec sources 
Log Message:
update 



Index: perl-SUPER.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/FC-5/perl-SUPER.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SUPER.spec	7 Sep 2006 23:06:00 -0000	1.2
+++ perl-SUPER.spec	4 Oct 2006 04:18:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SUPER
-Version:        1.14
-Release:        4%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Sane superclass method dispatcher
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,9 @@
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Sub::Identify)
 
+# not picked up due to use base
+Requires:       perl(Exporter)
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +55,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.15-1
+- update to 1.15
+- add explict requires on perl(Exporter); missed due to a use base construct
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.14-4
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 22:50:44 -0000	1.2
+++ sources	4 Oct 2006 04:18:40 -0000	1.3
@@ -1 +1 @@
-591389c353df308ee9e70d38f0e3570b  SUPER-1.14.tar.gz
+41e4bb405cfad7efe0da34f08fe5ee91  SUPER-1.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:18:41 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:18:41 -0700
Subject: rpms/perl-SUPER/devel .cvsignore, 1.2, 1.3 perl-SUPER.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610040418.k944Ih4k008727@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SUPER/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668/devel

Modified Files:
	.cvsignore perl-SUPER.spec sources 
Log Message:
update 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 22:50:44 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:18:41 -0000	1.3
@@ -1 +1 @@
-SUPER-1.14.tar.gz
+SUPER-1.15.tar.gz


Index: perl-SUPER.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/perl-SUPER.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SUPER.spec	7 Sep 2006 23:06:00 -0000	1.2
+++ perl-SUPER.spec	4 Oct 2006 04:18:41 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SUPER
-Version:        1.14
-Release:        4%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Sane superclass method dispatcher
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -16,6 +16,9 @@
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Sub::Identify)
 
+# not picked up due to use base
+Requires:       perl(Exporter)
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +55,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.15-1
+- update to 1.15
+- add explict requires on perl(Exporter); missed due to a use base construct
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.14-4
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SUPER/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 22:50:44 -0000	1.2
+++ sources	4 Oct 2006 04:18:41 -0000	1.3
@@ -1 +1 @@
-591389c353df308ee9e70d38f0e3570b  SUPER-1.14.tar.gz
+41e4bb405cfad7efe0da34f08fe5ee91  SUPER-1.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:24:22 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:24:22 -0700
Subject: rpms/perl-Moose Makefile,1.1,1.2
Message-ID: <200610040424.k944OOHB008881@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8833

Modified Files:
	Makefile 
Log Message:
Update to 0.13



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	8 Sep 2006 16:30:29 -0000	1.1
+++ Makefile	4 Oct 2006 04:24:22 -0000	1.2
@@ -2,6 +2,13 @@
 all : CVS/Root common-update
 	@cvs update
 
+# tag & build all non-legacy branches...
+build-all :
+	@echo WARNING: building for devel and FC-5
+	@sleep 5s
+	@cd FC-5  && test -f dead.package || ( make tag && make plague )
+	@cd devel && test -f dead.package || ( make tag && make plague )
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:24:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:24:23 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200610040424.k944OPNd008884@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8833/FC-5

Modified Files:
	perl-Moose.spec sources 
Log Message:
Update to 0.13



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Moose.spec	8 Sep 2006 16:31:03 -0000	1.2
+++ perl-Moose.spec	4 Oct 2006 04:24:23 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Moose
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- update to 0.13
+
 * Fri Sep 08 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.12-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2006 16:30:44 -0000	1.2
+++ sources	4 Oct 2006 04:24:23 -0000	1.3
@@ -1 +1 @@
-2357e2a18025f62d9068766298e7bbc6  Moose-0.12.tar.gz
+f3f4edbf510006ea7cc9cb3092eb4883  Moose-0.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:24:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:24:23 -0700
Subject: rpms/perl-Moose/devel .cvsignore, 1.2, 1.3 perl-Moose.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610040424.k944OQOt008890@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8833/devel

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
Update to 0.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2006 16:30:44 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:24:23 -0000	1.3
@@ -1 +1 @@
-Moose-0.12.tar.gz
+Moose-0.13.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Moose.spec	8 Sep 2006 16:31:03 -0000	1.2
+++ perl-Moose.spec	4 Oct 2006 04:24:23 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Moose
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- update to 0.13
+
 * Fri Sep 08 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.12-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2006 16:30:44 -0000	1.2
+++ sources	4 Oct 2006 04:24:23 -0000	1.3
@@ -1 +1 @@
-2357e2a18025f62d9068766298e7bbc6  Moose-0.12.tar.gz
+f3f4edbf510006ea7cc9cb3092eb4883  Moose-0.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:41:27 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:41:27 -0700
Subject: rpms/perl-POE-Component-Client-Keepalive Makefile,1.1,1.2
Message-ID: <200610040441.k944fTRv009132@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9084

Modified Files:
	Makefile 
Log Message:
update



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	26 Jul 2006 06:32:37 -0000	1.1
+++ Makefile	4 Oct 2006 04:41:27 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 04:41:28 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:41:28 -0700
Subject: rpms/perl-POE-Component-Client-Keepalive/FC-5
	perl-POE-Component-Client-Keepalive.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610040441.k944fUuE009137@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9084/FC-5

Modified Files:
	perl-POE-Component-Client-Keepalive.spec sources 
Log Message:
update



Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/FC-5/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-Client-Keepalive.spec	26 Jul 2006 06:36:00 -0000	1.2
+++ perl-POE-Component-Client-Keepalive.spec	4 Oct 2006 04:41:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-Keepalive
-Version:        0.0801        
-Release:        2%{?dist}
+Version:        0.0901        
+Release:        1%{?dist}
 Summary:        Manages and keeps alive client connections       
 
 Group:          Development/Libraries
@@ -32,10 +32,12 @@
 
 %install
 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 ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -58,6 +60,13 @@
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0901-1
+- update to 0.0901
+- minor spec tweaks
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0801-3
+- bump for mass rebuild
+
 * Tue Jul 25 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0801-2
 - import, bump & build for devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2006 06:32:46 -0000	1.2
+++ sources	4 Oct 2006 04:41:28 -0000	1.3
@@ -1 +1 @@
-79ea0242da708c7a8e190c00efdfccaf  POE-Component-Client-Keepalive-0.0801.tar.gz
+fab1ddd3e307b4ce3890a4708cfd04de  POE-Component-Client-Keepalive-0.0901.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:41:28 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:41:28 -0700
Subject: rpms/perl-POE-Component-Client-Keepalive/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Client-Keepalive.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200610040441.k944fUdV009141@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9084/devel

Modified Files:
	.cvsignore perl-POE-Component-Client-Keepalive.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2006 06:32:46 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:41:28 -0000	1.3
@@ -1 +1 @@
-POE-Component-Client-Keepalive-0.0801.tar.gz
+POE-Component-Client-Keepalive-0.0901.tar.gz


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-POE-Component-Client-Keepalive.spec	1 Sep 2006 04:18:34 -0000	1.3
+++ perl-POE-Component-Client-Keepalive.spec	4 Oct 2006 04:41:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-Keepalive
-Version:        0.0801        
-Release:        3%{?dist}
+Version:        0.0901        
+Release:        1%{?dist}
 Summary:        Manages and keeps alive client connections       
 
 Group:          Development/Libraries
@@ -32,10 +32,12 @@
 
 %install
 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 ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -58,6 +60,10 @@
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0901-1
+- update to 0.0901
+- minor spec tweaks
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0801-3
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-Keepalive/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2006 06:32:46 -0000	1.2
+++ sources	4 Oct 2006 04:41:28 -0000	1.3
@@ -1 +1 @@
-79ea0242da708c7a8e190c00efdfccaf  POE-Component-Client-Keepalive-0.0801.tar.gz
+fab1ddd3e307b4ce3890a4708cfd04de  POE-Component-Client-Keepalive-0.0901.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:58:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:58:36 -0700
Subject: rpms/perl-POE-Component-Client-HTTP/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Client-HTTP.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200610040459.k944x8ZU009318@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9272/devel

Modified Files:
	.cvsignore perl-POE-Component-Client-HTTP.spec sources 
Log Message:
Updates.  Oof!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jul 2006 03:52:07 -0000	1.2
+++ .cvsignore	4 Oct 2006 04:58:36 -0000	1.3
@@ -1 +1 @@
-POE-Component-Client-HTTP-0.77.tar.gz
+POE-Component-Client-HTTP-0.78.tar.gz


Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-POE-Component-Client-HTTP.spec	1 Sep 2006 04:18:18 -0000	1.4
+++ perl-POE-Component-Client-HTTP.spec	4 Oct 2006 04:58:36 -0000	1.5
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.77
-Release:        3%{?dist}
+Version:        0.78
+Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
 Group:          Development/Libraries
@@ -24,8 +24,14 @@
 BuildRequires:  perl
 BuildRequires:  perl(POE) >= 0.31, perl(HTTP::Request) >= 1.30
 BuildRequires:  perl(HTTP::Response) >= 1.37, perl(URI) >= 1.24
-BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0704
+BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0901
 BuildRequires:  dos2unix, sed
+
+# use base...
+Requires:       perl(POE::Filter), perl(POE::Filter::Stackable)
+# use POE qw{ ... }
+Requires:       perl(POE::Component::Client::Keepalive) >= 0.0901
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -45,10 +51,12 @@
 
 %install
 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 ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 cd examples
 dos2unix pcchget.perl
@@ -70,12 +78,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES* README examples
+%doc CHANGES* README examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
+- update to 0.78
+- minor spec tweaks
+- bump version BR on PoCo::Client::Keepalive to 0.0901 (tests fail otherwise)
+- ...and add explicit requires on the above (the way POE loads its PoCo's irks
+  me sometimes...)
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.77-3
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jul 2006 03:52:07 -0000	1.2
+++ sources	4 Oct 2006 04:58:36 -0000	1.3
@@ -1 +1 @@
-bca2c306d8c63535845b760883a13644  POE-Component-Client-HTTP-0.77.tar.gz
+093521d8c3a2b874fce1c04092e7159a  POE-Component-Client-HTTP-0.78.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:58:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:58:35 -0700
Subject: rpms/perl-POE-Component-Client-HTTP/FC-5
	perl-POE-Component-Client-HTTP.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610040459.k944x7iI009313@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9272/FC-5

Modified Files:
	perl-POE-Component-Client-HTTP.spec sources 
Log Message:
Updates.  Oof!



Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-Client-HTTP.spec	28 Jul 2006 03:58:05 -0000	1.2
+++ perl-POE-Component-Client-HTTP.spec	4 Oct 2006 04:58:35 -0000	1.3
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.77
-Release:        2%{?dist}
+Version:        0.78
+Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
 Group:          Development/Libraries
@@ -24,8 +24,14 @@
 BuildRequires:  perl
 BuildRequires:  perl(POE) >= 0.31, perl(HTTP::Request) >= 1.30
 BuildRequires:  perl(HTTP::Response) >= 1.37, perl(URI) >= 1.24
-BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0704
+BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0901
 BuildRequires:  dos2unix, sed
+
+# use base...
+Requires:       perl(POE::Filter), perl(POE::Filter::Stackable)
+# use POE qw{ ... }
+Requires:       perl(POE::Component::Client::Keepalive) >= 0.0901
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -45,10 +51,12 @@
 
 %install
 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 ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 cd examples
 dos2unix pcchget.perl
@@ -59,7 +67,7 @@
 # we don't have network access during the builds; fortunately these look to be
 # the only tests requiring it.  Failing that, the entire suite can be
 # disabled.
-%{?!_with_network_tests:rm t/01* t/02* t/09* t/11* t/50* t/54*}
+%{?!_with_network_tests:rm t/01* t/02* t/09* t/10* t/11* t/50* t/54*}
 
 make test
 
@@ -70,12 +78,26 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES* README examples
+%doc CHANGES* README examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
+- update to 0.78
+- minor spec tweaks
+- bump version BR on PoCo::Client::Keepalive to 0.0901 (tests fail otherwise)
+- ...and add explicit requires on the above (the way POE loads its PoCo's irks
+  me sometimes...)
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.77-3
+- bump for mass rebuild
+
+* Wed Aug 16 2006 Chris Weyl <cweyl at alumni.drew.edu> 
+- nixed t/10* due to mock build issues with reduced buildroot.  see BZ#202602.
+  This fix does not warrant a rebuild.
+
 * Thu Jul 27 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.77-2
 - bump for build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jul 2006 03:52:07 -0000	1.2
+++ sources	4 Oct 2006 04:58:35 -0000	1.3
@@ -1 +1 @@
-bca2c306d8c63535845b760883a13644  POE-Component-Client-HTTP-0.77.tar.gz
+093521d8c3a2b874fce1c04092e7159a  POE-Component-Client-HTTP-0.78.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 04:59:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 21:59:48 -0700
Subject: rpms/perl-POE-Component-Client-HTTP Makefile,1.1,1.2
Message-ID: <200610040459.k944xo3m009407@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9385

Modified Files:
	Makefile 
Log Message:
Add build-all target



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	28 Jul 2006 03:51:53 -0000	1.1
+++ Makefile	4 Oct 2006 04:59:47 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 05:01:03 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue,  3 Oct 2006 22:01:03 -0700
Subject: rpms/sshfp/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610040501.k94515wG011983@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/sshfp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9432

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sshfp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 19:31:04 -0000	1.2
+++ .cvsignore	4 Oct 2006 05:01:03 -0000	1.3
@@ -1 +1,2 @@
 sshfp-1.1.0.tar.gz
+sshfp-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sshfp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 19:31:04 -0000	1.2
+++ sources	4 Oct 2006 05:01:03 -0000	1.3
@@ -1 +1,2 @@
 a96cb60af373ab18c260cb1b202c6240  sshfp-1.1.0.tar.gz
+5424ed55c50d2038934940737680e8da  sshfp-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 05:02:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Oct 2006 22:02:01 -0700
Subject: owners owners.list,1.1769,1.1770
Message-ID: <200610040502.k9452Xod012319@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12276/owners

Modified Files:
	owners.list 
Log Message:
Unorphaning lua and freeglut


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1769
retrieving revision 1.1770
diff -u -r1.1769 -r1.1770
--- owners.list	3 Oct 2006 23:08:02 -0000	1.1769
+++ owners.list	4 Oct 2006 05:02:00 -0000	1.1770
@@ -411,7 +411,7 @@
 Fedora Extras|freedoom-freedm|Deathmatch levels for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|freehdl|A project to develop a free, open source, GPL'ed VHDL simulator for Linux|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|FreeWnn|Japanese input server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|petersen at redhat.com
@@ -978,7 +978,7 @@
 Fedora Extras|lrmi|Library for calling real mode BIOS routines|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|lsscsi|List SCSI devices (or hosts) and associated information|coldwell at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
-Fedora Extras|lua|A powerful light-weight programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|lua|A powerful light-weight programming language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|luks-tools|Utilities for working with LUKS-protected filesystems|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 05:02:30 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue,  3 Oct 2006 22:02:30 -0700
Subject: rpms/sshfp/devel sshfp.spec,1.1,1.2
Message-ID: <200610040503.k94534Yx012322@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/sshfp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12274

Modified Files:
	sshfp.spec 
Log Message:
* Wed Oct  4 2006 Paul Wouters <paul at xelerance.com> - 1.1.1-1
- Upgraded to 1.1.1



Index: sshfp.spec
===================================================================
RCS file: /cvs/extras/rpms/sshfp/devel/sshfp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sshfp.spec	30 Sep 2006 19:31:04 -0000	1.1
+++ sshfp.spec	4 Oct 2006 05:02:30 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Generate SSHFP DNS records from knownhosts files or ssh-keyscan
 Name: sshfp
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?dist}
 License: GPL
 Url:  ftp://ftp.xelerance.com/%{name}/
@@ -40,6 +40,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Wed Oct  4 2006 Paul Wouters <paul at xelerance.com> - 1.1.1-1
+- Upgraded to 1.1.1
+
 * Tue Sep 26 2006 Paul Wouters <paul at xelerance.com> - 1.1.0-1
 - Mistakingly ran the sha1() call on the uuencoded keyblob, which
   generated wrong SSHFP records.



From fedora-extras-commits at redhat.com  Wed Oct  4 05:04:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 22:04:54 -0700
Subject: rpms/perl-POE-Component-Server-SOAP/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Server-SOAP.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610040504.k9454uif012510@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SOAP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12422/devel

Modified Files:
	.cvsignore perl-POE-Component-Server-SOAP.spec sources 
Log Message:
update to 1.10




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Aug 2006 00:50:41 -0000	1.2
+++ .cvsignore	4 Oct 2006 05:04:53 -0000	1.3
@@ -1 +1 @@
-POE-Component-Server-SOAP-1.09.tar.gz
+POE-Component-Server-SOAP-1.10.tar.gz


Index: perl-POE-Component-Server-SOAP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/devel/perl-POE-Component-Server-SOAP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-POE-Component-Server-SOAP.spec	1 Sep 2006 04:20:15 -0000	1.3
+++ perl-POE-Component-Server-SOAP.spec	4 Oct 2006 05:04:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SOAP
-Version:        1.09
-Release:        3%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        Publish POE event handlers via SOAP over HTTP
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -36,7 +36,6 @@
 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 \;
 
@@ -50,11 +49,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README examples/
+%doc README Changes examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.10-1
+- update to 1.10 -- which _finally_ includes a Changes file :)
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.09-3
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Aug 2006 00:50:41 -0000	1.2
+++ sources	4 Oct 2006 05:04:53 -0000	1.3
@@ -1 +1 @@
-dcda3222ea8cf981c2aace003aa33733  POE-Component-Server-SOAP-1.09.tar.gz
+d56d0f94ca2ce45ff336ed43736747db  POE-Component-Server-SOAP-1.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 05:04:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 22:04:52 -0700
Subject: rpms/perl-POE-Component-Server-SOAP Makefile,1.1,1.2
Message-ID: <200610040504.k9454sT9012501@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SOAP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12422

Modified Files:
	Makefile 
Log Message:
update to 1.10




Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	19 Aug 2006 00:50:28 -0000	1.1
+++ Makefile	4 Oct 2006 05:04:52 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 05:04:53 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue,  3 Oct 2006 22:04:53 -0700
Subject: rpms/perl-POE-Component-Server-SOAP/FC-5
	perl-POE-Component-Server-SOAP.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610040505.k9454tHD012506@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SOAP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12422/FC-5

Modified Files:
	perl-POE-Component-Server-SOAP.spec sources 
Log Message:
update to 1.10




Index: perl-POE-Component-Server-SOAP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/FC-5/perl-POE-Component-Server-SOAP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-Server-SOAP.spec	19 Aug 2006 00:51:37 -0000	1.2
+++ perl-POE-Component-Server-SOAP.spec	4 Oct 2006 05:04:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SOAP
-Version:        1.09
-Release:        2%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        Publish POE event handlers via SOAP over HTTP
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -36,7 +36,6 @@
 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 \;
 
@@ -50,11 +49,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README examples/
+%doc README Changes examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.10-1
+- update to 1.10 -- which _finally_ includes a Changes file :)
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.09-3
+- bump for mass rebuild
+
 * Fri Aug 18 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.09-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SOAP/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Aug 2006 00:50:41 -0000	1.2
+++ sources	4 Oct 2006 05:04:53 -0000	1.3
@@ -1 +1 @@
-dcda3222ea8cf981c2aace003aa33733  POE-Component-Server-SOAP-1.09.tar.gz
+d56d0f94ca2ce45ff336ed43736747db  POE-Component-Server-SOAP-1.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 05:20:43 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 22:20:43 -0700
Subject: rpms/perl-Test-Inline/devel .cvsignore, 1.1,
	1.2 perl-Test-Inline.spec, 1.4, 1.5 sources, 1.1, 1.2
Message-ID: <200610040520.k945Kjet012828@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12807

Modified Files:
	.cvsignore perl-Test-Inline.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2005 14:17:21 -0000	1.1
+++ .cvsignore	4 Oct 2006 05:20:43 -0000	1.2
@@ -1 +1 @@
-Test-Inline-2.103.tar.gz
+Test-Inline-2.105.tar.gz


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/devel/perl-Test-Inline.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Inline.spec	5 Sep 2006 08:56:46 -0000	1.4
+++ perl-Test-Inline.spec	4 Oct 2006 05:20:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Test-Inline
-Version: 	2.103
-Release: 	4%{?dist}
+Version: 	2.105
+Release: 	1%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -14,7 +14,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
-BuildRequires: 	perl(Test::More) >= 0.47
+BuildRequires: 	perl(Test::More) >= 0.42
 BuildRequires: 	perl(Test::ClassAPI) >= 1.02
 BuildRequires: 	perl(File::Spec) >= 0.80
 BuildRequires: 	perl(List::Util) >= 1.11
@@ -68,6 +68,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-4
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2005 14:17:21 -0000	1.1
+++ sources	4 Oct 2006 05:20:43 -0000	1.2
@@ -1 +1 @@
-1d57bc056a0906bdf349700a6899c93e  Test-Inline-2.103.tar.gz
+4da55082abc873d655a94fdffc4b33df  Test-Inline-2.105.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:25:55 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:25:55 -0700
Subject: rpms/perl-Test-Inline/devel perl-Test-Inline.spec,1.5,1.6
Message-ID: <200610040625.k946PvZD015982@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15965

Modified Files:
	perl-Test-Inline.spec 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
- Activate AUTOMATED_TESTING (t/99_author.t).



Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/devel/perl-Test-Inline.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-Inline.spec	4 Oct 2006 05:20:43 -0000	1.5
+++ perl-Test-Inline.spec	4 Oct 2006 06:25:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Test-Inline
 Version: 	2.105
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -57,7 +57,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +68,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
+- Activate AUTOMATED_TESTING (t/99_author.t).
+
 * Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 06:36:05 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:36:05 -0700
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.13,
	1.14 perl-Params-Util.spec, 1.14, 1.15 sources, 1.13, 1.14
Message-ID: <200610040636.k946a75N016114@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16091

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Sep 2006 13:56:52 -0000	1.13
+++ .cvsignore	4 Oct 2006 06:36:05 -0000	1.14
@@ -1 +1 @@
-Params-Util-0.19.tar.gz
+Params-Util-0.20.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Params-Util.spec	18 Sep 2006 13:56:52 -0000	1.14
+++ perl-Params-Util.spec	4 Oct 2006 06:36:05 -0000	1.15
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.19
+Version: 	0.20
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
+- Upstream update.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.19-1
 - Upstream update.
 - Activate AUTOMATED_TESTING (t/99_author.t).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Sep 2006 13:56:52 -0000	1.13
+++ sources	4 Oct 2006 06:36:05 -0000	1.14
@@ -1 +1 @@
-c5d75b97f92fa232b2dadcc44595ca61  Params-Util-0.19.tar.gz
+33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:37:26 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:37:26 -0700
Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.13,
	1.14 perl-Params-Util.spec, 1.13, 1.14 sources, 1.13, 1.14
Message-ID: <200610040637.k946bS9a016183@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16162

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Sep 2006 13:58:43 -0000	1.13
+++ .cvsignore	4 Oct 2006 06:37:26 -0000	1.14
@@ -1 +1 @@
-Params-Util-0.19.tar.gz
+Params-Util-0.20.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Params-Util.spec	18 Sep 2006 13:58:43 -0000	1.13
+++ perl-Params-Util.spec	4 Oct 2006 06:37:26 -0000	1.14
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.19
+Version: 	0.20
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
+- Upstream update.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.19-1
 - Upstream update.
 - Activate AUTOMATED_TESTING (t/99_author.t).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Sep 2006 13:58:43 -0000	1.13
+++ sources	4 Oct 2006 06:37:26 -0000	1.14
@@ -1 +1 @@
-c5d75b97f92fa232b2dadcc44595ca61  Params-Util-0.19.tar.gz
+33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:40:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:40:12 -0700
Subject: rpms/perl-Test-Inline/FC-5 .cvsignore, 1.1,
	1.2 perl-Test-Inline.spec, 1.3, 1.4 sources, 1.1, 1.2
Message-ID: <200610040640.k946eEiL016252@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16230

Modified Files:
	.cvsignore perl-Test-Inline.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
- Activate AUTOMATED_TESTING (t/99_author.t).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2005 14:17:21 -0000	1.1
+++ .cvsignore	4 Oct 2006 06:40:12 -0000	1.2
@@ -1 +1 @@
-Test-Inline-2.103.tar.gz
+Test-Inline-2.105.tar.gz


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-5/perl-Test-Inline.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Test-Inline.spec	28 Feb 2006 23:30:54 -0000	1.3
+++ perl-Test-Inline.spec	4 Oct 2006 06:40:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		perl-Test-Inline
-Version: 	2.103
-Release: 	3%{?dist}
+Version: 	2.105
+Release: 	2%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -14,7 +14,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
-BuildRequires: 	perl(Test::More) >= 0.47
+BuildRequires: 	perl(Test::More) >= 0.42
 BuildRequires: 	perl(Test::ClassAPI) >= 1.02
 BuildRequires: 	perl(File::Spec) >= 0.80
 BuildRequires: 	perl(List::Util) >= 1.11
@@ -57,7 +57,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +68,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
+- Activate AUTOMATED_TESTING (t/99_author.t).
+
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-4
+- Mass rebuild.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2005 14:17:21 -0000	1.1
+++ sources	4 Oct 2006 06:40:12 -0000	1.2
@@ -1 +1 @@
-1d57bc056a0906bdf349700a6899c93e  Test-Inline-2.103.tar.gz
+4da55082abc873d655a94fdffc4b33df  Test-Inline-2.105.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:40:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:40:54 -0700
Subject: rpms/perl-Test-Inline/FC-4 perl-Test-Inline.spec,1.2,1.3
Message-ID: <200610040640.k946euN9016313@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16296

Modified Files:
	perl-Test-Inline.spec 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
- Activate AUTOMATED_TESTING (t/99_author.t).



Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-4/perl-Test-Inline.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Test-Inline.spec	7 Oct 2005 14:21:18 -0000	1.2
+++ perl-Test-Inline.spec	4 Oct 2006 06:40:54 -0000	1.3
@@ -1,5 +1,5 @@
 Name: 		perl-Test-Inline
-Version: 	2.103
+Version: 	2.105
 Release: 	2%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL or Artistic
@@ -14,7 +14,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
-BuildRequires: 	perl(Test::More) >= 0.47
+BuildRequires: 	perl(Test::More) >= 0.42
 BuildRequires: 	perl(Test::ClassAPI) >= 1.02
 BuildRequires: 	perl(File::Spec) >= 0.80
 BuildRequires: 	perl(List::Util) >= 1.11
@@ -57,7 +57,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +68,18 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-2
+- Activate AUTOMATED_TESTING (t/99_author.t).
+
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.105-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-4
+- Mass rebuild.
+
+* Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.103-3
+- Rebuild for perl-5.8.8.
+
 * Fri Oct  7 2005 Paul Howarth <paul at city-fan.org> - 2.103-2
 - Minor spec file cleanup
 - Add BR: perl(Test::Pod) for extra test coverage



From fedora-extras-commits at redhat.com  Wed Oct  4 06:48:50 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:48:50 -0700
Subject: rpms/perl-Test-Inline/FC-4 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200610040648.k946mqxf016389@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-Inline/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16370

Modified Files:
	.cvsignore sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2005 14:17:21 -0000	1.1
+++ .cvsignore	4 Oct 2006 06:48:50 -0000	1.2
@@ -1 +1 @@
-Test-Inline-2.103.tar.gz
+Test-Inline-2.105.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Inline/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2005 14:17:21 -0000	1.1
+++ sources	4 Oct 2006 06:48:50 -0000	1.2
@@ -1 +1 @@
-1d57bc056a0906bdf349700a6899c93e  Test-Inline-2.103.tar.gz
+4da55082abc873d655a94fdffc4b33df  Test-Inline-2.105.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 06:54:05 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  3 Oct 2006 23:54:05 -0700
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.13,
	1.14 perl-Params-Util.spec, 1.12, 1.13 sources, 1.13, 1.14
Message-ID: <200610040654.k946s7rO016454@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16433

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Sep 2006 14:12:08 -0000	1.13
+++ .cvsignore	4 Oct 2006 06:54:05 -0000	1.14
@@ -1 +1 @@
-Params-Util-0.19.tar.gz
+Params-Util-0.20.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Params-Util.spec	18 Sep 2006 14:12:08 -0000	1.12
+++ perl-Params-Util.spec	4 Oct 2006 06:54:05 -0000	1.13
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.19
+Version: 	0.20
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
+- Upstream update.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.19-1
 - Upstream update.
 - Activate AUTOMATED_TESTING (t/99_author.t).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Sep 2006 14:12:08 -0000	1.13
+++ sources	4 Oct 2006 06:54:05 -0000	1.14
@@ -1 +1 @@
-c5d75b97f92fa232b2dadcc44595ca61  Params-Util-0.19.tar.gz
+33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 07:15:46 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 00:15:46 -0700
Subject: rpms/alleyoop/FC-5 alleyoop.spec,1.1,1.2
Message-ID: <200610040715.k947FmBK019421@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/alleyoop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19404

Modified Files:
	alleyoop.spec 
Log Message:
Fix BRs for FC5



Index: alleyoop.spec
===================================================================
RCS file: /cvs/extras/rpms/alleyoop/FC-5/alleyoop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alleyoop.spec	2 Oct 2006 22:05:16 -0000	1.1
+++ alleyoop.spec	4 Oct 2006 07:15:46 -0000	1.2
@@ -12,7 +12,6 @@
 BuildRequires: valgrind >= 3.1.0
 BuildRequires: libgnomeui-devel, gettext, intltool
 BuildRequires: desktop-file-utils
-BuildRequires: binutils-devel
 
 Requires: valgrind >= 3.1.0
 Requires: GConf2, scrollkeeper



From fedora-extras-commits at redhat.com  Wed Oct  4 07:17:48 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 00:17:48 -0700
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.6,
	1.7 perl-DBIx-SearchBuilder.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200610040717.k947HoSX019511@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19490

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.45-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Apr 2006 03:46:34 -0000	1.6
+++ .cvsignore	4 Oct 2006 07:17:48 -0000	1.7
@@ -1 +1 @@
-DBIx-SearchBuilder-1.43.tar.gz
+DBIx-SearchBuilder-1.45.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-DBIx-SearchBuilder.spec	5 Sep 2006 09:33:45 -0000	1.10
+++ perl-DBIx-SearchBuilder.spec	4 Oct 2006 07:17:48 -0000	1.11
@@ -6,8 +6,8 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.43
-Release: 	2%{?dist}
+Version: 	1.45
+Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -89,6 +89,9 @@
 %endif
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.45-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-2
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Apr 2006 03:46:34 -0000	1.6
+++ sources	4 Oct 2006 07:17:48 -0000	1.7
@@ -1 +1 @@
-3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz
+ee933efdd1e0478a9dea0d9cc997b8d5  DBIx-SearchBuilder-1.45.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 07:20:00 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 00:20:00 -0700
Subject: rpms/perl-DBIx-SearchBuilder/FC-5 .cvsignore, 1.6,
	1.7 perl-DBIx-SearchBuilder.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200610040720.k947K2xa019583@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19562

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.45-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Apr 2006 03:58:06 -0000	1.6
+++ .cvsignore	4 Oct 2006 07:20:00 -0000	1.7
@@ -1 +1 @@
-DBIx-SearchBuilder-1.43.tar.gz
+DBIx-SearchBuilder-1.45.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBIx-SearchBuilder.spec	22 Apr 2006 03:58:06 -0000	1.9
+++ perl-DBIx-SearchBuilder.spec	4 Oct 2006 07:20:00 -0000	1.10
@@ -6,7 +6,7 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.43
+Version: 	1.45
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
@@ -89,6 +89,12 @@
 %endif
 
 %changelog
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.45-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-2
+- Mass rebuild.
+
 * Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Apr 2006 03:58:06 -0000	1.6
+++ sources	4 Oct 2006 07:20:00 -0000	1.7
@@ -1 +1 @@
-3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz
+ee933efdd1e0478a9dea0d9cc997b8d5  DBIx-SearchBuilder-1.45.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 08:55:11 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed,  4 Oct 2006 01:55:11 -0700
Subject: fedora-security/audit fc5,1.343,1.344 fc6,1.98,1.99
Message-ID: <200610040855.k948tBSS022855@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22819

Modified Files:
	fc5 fc6 
Log Message:
Bring up to date with updates



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- fc5	3 Oct 2006 11:02:47 -0000	1.343
+++ fc5	4 Oct 2006 08:55:08 -0000	1.344
@@ -1,8 +1,11 @@
-p to date CVE as of CVE email 20060928
-Up to date FC5 as of 20060928
+p to date CVE as of CVE email 20061003
+Up to date FC5 as of 20061003
 
 ** are items that need attention
 
+CVE-2006-5160 ignore (firefox) unverified
+CVE-2006-5159 ignore (firefox) unverified
+CVE-2006-5158 ** kernel
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) #208458
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)
@@ -51,11 +54,11 @@
 CVE-2006-4340 version (nss, fixed 3.11.3) [since FEDORA-2006-979]
 CVE-2006-4339 backport (openssl) [since FEDORA-2006-953]
 CVE-2006-4339 backport (openssl097a) [since FEDORA-2006-953]
-CVE-2006-4338 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4337 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4336 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4335 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4334 VULNERABLE (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4338 version (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4337 version (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4336 version (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4335 version (gzip) #207643 [since FEDORA-2006-993]
+CVE-2006-4334 version (gzip) #207643 [since FEDORA-2006-993]
 CVE-2006-4433 VULNERABLE (php, fixed 5.1.4)
 CVE-2006-4333 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
 CVE-2006-4332 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fc6	29 Sep 2006 09:24:29 -0000	1.98
+++ fc6	4 Oct 2006 08:55:08 -0000	1.99
@@ -1,9 +1,12 @@
-Up to date CVE as of CVE email 20060928
+Up to date CVE as of CVE email 20061003
 Up to date FC6 as of Test3
 Up to date dist-fc6 rawhide as of 20060929
 
 ** are items that need attention
 
+CVE-2006-5160 ignore (firefox) unverified
+CVE-2006-5159 ignore (firefox) unverified
+CVE-2006-5158 ** kernel
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18) [in rawhide]



From fedora-extras-commits at redhat.com  Wed Oct  4 09:16:41 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Wed,  4 Oct 2006 02:16:41 -0700
Subject: rpms/guichan/devel .cvsignore, 1.2, 1.3 guichan.spec, 1.2,
	1.3 sources, 
	1.2, 1.3 guichan-werror-cxxflag-disable.patch, 1.1, NONE
Message-ID: <200610040916.k949GhU0025816@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/guichan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25795

Modified Files:
	.cvsignore guichan.spec sources 
Removed Files:
	guichan-werror-cxxflag-disable.patch 
Log Message:
* Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
- Upstream update
- Add freeglut-devel BR for the new release
- Removed unusued patches for this new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2006 02:00:02 -0000	1.2
+++ .cvsignore	4 Oct 2006 09:16:41 -0000	1.3
@@ -1 +1 @@
-guichan-0.4.0-src.tar.gz
+guichan-0.5.0-src.tar.gz


Index: guichan.spec
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/guichan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- guichan.spec	13 Sep 2006 19:36:51 -0000	1.2
+++ guichan.spec	4 Oct 2006 09:16:41 -0000	1.3
@@ -1,16 +1,16 @@
 Name:           guichan
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Portable C++ GUI library for games using Allegro, SDL and OpenGL
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://guichan.sourceforge.net
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/guichan/%{name}-%{version}-src.tar.gz
-Patch0:         guichan-werror-cxxflag-disable.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  allegro-devel, SDL-devel, SDL_image-devel, libGL-devel
+BuildRequires:  freeglut-devel
 
 %description
 Guichan is a small, efficient C++ GUI library designed for games. It comes
@@ -28,10 +28,7 @@
 package is needed to build programs written using guichan.
 
 %prep
-%setup -q
-%patch -p1
-touch aclocal.m4 Makefile.in */Makefile.in */*/Makefile.in */*/*/Makefile.in
-touch include/config.hpp.in
+%setup -q -n %{name}-%{version}-src
 
 
 %build
@@ -61,6 +58,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_libdir}/libguichan.so.*
 %{_libdir}/libguichan_allegro.so.*
+%{_libdir}/libguichan_glut.so.*
 %{_libdir}/libguichan_opengl.so.*
 %{_libdir}/libguichan_sdl.so.*
 
@@ -73,6 +71,8 @@
 %{_libdir}/libguichan.so
 %{_libdir}/libguichan_allegro.a
 %{_libdir}/libguichan_allegro.so
+%{_libdir}/libguichan_glut.a
+%{_libdir}/libguichan_glut.so
 %{_libdir}/libguichan_opengl.a
 %{_libdir}/libguichan_opengl.so
 %{_libdir}/libguichan_sdl.a
@@ -80,6 +80,11 @@
 
 
 %changelog
+* Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
+- Upstream update
+- Add freeglut-devel BR for the new release
+- Removed unusued patches for this new version
+
 * Wed Sep 13 2006 Hugo Cisneiros <hugo at devin.com.br> 0.4.0-3
 - Rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guichan/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2006 02:00:02 -0000	1.2
+++ sources	4 Oct 2006 09:16:41 -0000	1.3
@@ -1 +1 @@
-f68b6c603c4fb3d70a8737f916214a35  guichan-0.4.0-src.tar.gz
+c9fcbcb360105247da06afc5c643e664  guichan-0.5.0-src.tar.gz


--- guichan-werror-cxxflag-disable.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 09:29:55 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Wed,  4 Oct 2006 02:29:55 -0700
Subject: rpms/guichan/FC-5 .cvsignore, 1.2, 1.3 guichan.spec, 1.1,
	1.2 sources, 
	1.2, 1.3 guichan-werror-cxxflag-disable.patch, 1.1, NONE
Message-ID: <200610040929.k949TvMk025970@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/guichan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25947

Modified Files:
	.cvsignore guichan.spec sources 
Removed Files:
	guichan-werror-cxxflag-disable.patch 
Log Message:
* Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
- Upstream update
- Add freeglut-devel BR for the new release
- Removed unusued patches for this new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guichan/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2006 02:00:02 -0000	1.2
+++ .cvsignore	4 Oct 2006 09:29:55 -0000	1.3
@@ -1 +1 @@
-guichan-0.4.0-src.tar.gz
+guichan-0.5.0-src.tar.gz


Index: guichan.spec
===================================================================
RCS file: /cvs/extras/rpms/guichan/FC-5/guichan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- guichan.spec	12 Jun 2006 02:00:02 -0000	1.1
+++ guichan.spec	4 Oct 2006 09:29:55 -0000	1.2
@@ -1,16 +1,16 @@
 Name:           guichan
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Portable C++ GUI library for games using Allegro, SDL and OpenGL
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://guichan.sourceforge.net
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/guichan/%{name}-%{version}-src.tar.gz
-Patch0:         guichan-werror-cxxflag-disable.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  allegro-devel, SDL-devel, SDL_image-devel, libGL-devel
+BuildRequires:  freeglut-devel
 
 %description
 Guichan is a small, efficient C++ GUI library designed for games. It comes
@@ -28,10 +28,7 @@
 package is needed to build programs written using guichan.
 
 %prep
-%setup -q
-%patch -p1
-touch aclocal.m4 Makefile.in */Makefile.in */*/Makefile.in */*/*/Makefile.in
-touch include/config.hpp.in
+%setup -q -n %{name}-%{version}-src
 
 
 %build
@@ -61,6 +58,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_libdir}/libguichan.so.*
 %{_libdir}/libguichan_allegro.so.*
+%{_libdir}/libguichan_glut.so.*
 %{_libdir}/libguichan_opengl.so.*
 %{_libdir}/libguichan_sdl.so.*
 
@@ -73,6 +71,8 @@
 %{_libdir}/libguichan.so
 %{_libdir}/libguichan_allegro.a
 %{_libdir}/libguichan_allegro.so
+%{_libdir}/libguichan_glut.a
+%{_libdir}/libguichan_glut.so
 %{_libdir}/libguichan_opengl.a
 %{_libdir}/libguichan_opengl.so
 %{_libdir}/libguichan_sdl.a
@@ -80,6 +80,14 @@
 
 
 %changelog
+* Wed Oct  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.5.0-1
+- Upstream update
+- Add freeglut-devel BR for the new release
+- Removed unusued patches for this new version
+
+* Wed Sep 13 2006 Hugo Cisneiros <hugo at devin.com.br> 0.4.0-3
+- Rebuilt for FC6
+
 * Sat Jun 10 2006 Hugo Cisneiros <hugo at devin.com.br> 0.4.0-2
 - Using libGL-devel instead of mesa-libGL-devel in BuildRequires
 - Put documentation under -devel instead of a whole -doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guichan/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2006 02:00:02 -0000	1.2
+++ sources	4 Oct 2006 09:29:55 -0000	1.3
@@ -1 +1 @@
-f68b6c603c4fb3d70a8737f916214a35  guichan-0.4.0-src.tar.gz
+c9fcbcb360105247da06afc5c643e664  guichan-0.5.0-src.tar.gz


--- guichan-werror-cxxflag-disable.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 10:11:43 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed,  4 Oct 2006 03:11:43 -0700
Subject: rpms/gnome-python2-gda/FC-5 .cvsignore, 1.2,
	1.3 gnome-python2-gda.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610041011.k94ABjBV029046@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29025

Modified Files:
	.cvsignore gnome-python2-gda.spec sources 
Log Message:
FC-5 version, based on current gnome-python2-extras in FC-5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2006 06:59:01 -0000	1.2
+++ .cvsignore	4 Oct 2006 10:11:43 -0000	1.3
@@ -1 +1 @@
-gnome-python-extras-2.14.2.tar.bz2
+gnome-python-extras-2.14.0.tar.bz2


Index: gnome-python2-gda.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/FC-5/gnome-python2-gda.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-python2-gda.spec	2 Oct 2006 06:59:01 -0000	1.1
+++ gnome-python2-gda.spec	4 Oct 2006 10:11:43 -0000	1.2
@@ -7,8 +7,8 @@
 
 Summary: PyGNOME Python extension module for interacting with gda
 Name: gnome-python2-gda
-Version: 2.14.2
-Release: 2%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: http://developer.gnome.org
@@ -88,12 +88,6 @@
 
 
 %changelog
-* Mon Oct  2 2006 Denis Leroy <denis at poolshark.org> - 2.14.2-2
-- Split for devel package
-
-* Sun Oct  1 2006 Denis Leroy <denis at poolshark.org> - 2.14.2-1
-- Update to upstream version 2.14.2
-
 * Mon Jul 24 2006 Denis Leroy <denis at poolshark.org> - 2.14.0-1
 - First draft, adapted from gnome-python2-extras from core
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 06:59:01 -0000	1.2
+++ sources	4 Oct 2006 10:11:43 -0000	1.3
@@ -1 +1 @@
-039e1300368df17de9867685e9705091  gnome-python-extras-2.14.2.tar.bz2
+e9390569e18a5e71da1ed9476fa750b3  gnome-python-extras-2.14.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 12:33:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:33:51 -0700
Subject: rpms/perl-PPI-Tester/devel - New directory
Message-ID: <200610041233.k94CXr2A003033@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3004/perl-PPI-Tester/devel

Log Message:
Directory /cvs/extras/rpms/perl-PPI-Tester/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 12:33:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:33:50 -0700
Subject: rpms/perl-PPI-Tester - New directory
Message-ID: <200610041233.k94CXqDV003030@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3004/perl-PPI-Tester

Log Message:
Directory /cvs/extras/rpms/perl-PPI-Tester added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 12:34:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:34:07 -0700
Subject: rpms/perl-PPI-Tester Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610041234.k94CY9Wj003083@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3049

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-PPI-Tester


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PPI-Tester
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct  4 12:34:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:34:08 -0700
Subject: rpms/perl-PPI-Tester/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610041234.k94CYAGB003087@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3049/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PPI-Tester


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct  4 12:34:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:34:37 -0700
Subject: rpms/perl-PPI-Tester import.log,1.1,1.2
Message-ID: <200610041235.k94CZ9Zr003161@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3115

Modified Files:
	import.log 
Log Message:
auto-import perl-PPI-Tester-0.06-2 on branch devel from perl-PPI-Tester-0.06-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI-Tester/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Oct 2006 12:34:07 -0000	1.1
+++ import.log	4 Oct 2006 12:34:37 -0000	1.2
@@ -0,0 +1 @@
+perl-PPI-Tester-0_06-2:HEAD:perl-PPI-Tester-0.06-2.src.rpm:1159965269



From fedora-extras-commits at redhat.com  Wed Oct  4 12:34:38 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:34:38 -0700
Subject: rpms/perl-PPI-Tester/devel perl-PPI-Tester.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610041235.k94CZApj003165@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PPI-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3115/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-PPI-Tester.spec 
Log Message:
auto-import perl-PPI-Tester-0.06-2 on branch devel from perl-PPI-Tester-0.06-2.src.rpm


--- NEW FILE perl-PPI-Tester.spec ---
#
# Rebuild option:
#
#   --with testsuite         - run the test suite (requires X)
#

Name:           perl-PPI-Tester
Version:        0.06
Release:        2%{?dist}
Summary:        A wxPerl-based interactive PPI debugger/tester

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/PPI-Tester/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-Tester-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::AutoInstall)
BuildRequires:  perl(PPI)
BuildRequires:  perl(Wx)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package implements a wxWindows desktop application which provides
the ability to interactively test the PPI perl parser.


%prep
%setup -q -n PPI-Tester-%{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/*


%check
%{?_with_testsuite:make test}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{_bindir}/*
%{perl_vendorlib}/PPI/
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3pm*


%changelog
* Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.06-2
- Added missing BR perl(ExtUtils::AutoInstall).
- Changed the build process: Build.PL -> Makefile.PL
  (Build.PL just requires Makefile.PL).

* Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.06-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI-Tester/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2006 12:34:08 -0000	1.1
+++ .cvsignore	4 Oct 2006 12:34:38 -0000	1.2
@@ -0,0 +1 @@
+PPI-Tester-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI-Tester/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2006 12:34:08 -0000	1.1
+++ sources	4 Oct 2006 12:34:38 -0000	1.2
@@ -0,0 +1 @@
+9fcad41d6b2e33cfdf4025eb29644fae  PPI-Tester-0.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:37:03 -0700
Subject: rpms/digikamimageplugins-doc - New directory
Message-ID: <200610041237.k94Cb5xo003319@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3293/digikamimageplugins-doc

Log Message:
Directory /cvs/extras/rpms/digikamimageplugins-doc added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:37:04 -0700
Subject: rpms/digikamimageplugins-doc/devel - New directory
Message-ID: <200610041237.k94Cb6Rl003322@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3293/digikamimageplugins-doc/devel

Log Message:
Directory /cvs/extras/rpms/digikamimageplugins-doc/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:37:13 -0700
Subject: rpms/digikamimageplugins-doc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610041237.k94CbFDq003366@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3338

Added Files:
	Makefile import.log 
Log Message:
Setup of module digikamimageplugins-doc


--- NEW FILE Makefile ---
# Top level Makefile for module digikamimageplugins-doc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:37:13 -0700
Subject: rpms/digikamimageplugins-doc/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610041237.k94CbGCF003369@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3338/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module digikamimageplugins-doc


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct  4 12:37:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 05:37:48 -0700
Subject: owners owners.list,1.1770,1.1771
Message-ID: <200610041237.k94CboPk003414@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3397

Modified Files:
	owners.list 
Log Message:
New package: perl-PPI-Tester (#208636)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1770
retrieving revision 1.1771
diff -u -r1.1770 -r1.1771
--- owners.list	4 Oct 2006 05:02:00 -0000	1.1770
+++ owners.list	4 Oct 2006 12:37:48 -0000	1.1771
@@ -1563,6 +1563,7 @@
 Fedora Extras|perl-POE-Wheel-Null|POE Wheel that does puts data nowhere, and sends nothing|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PPI-HTML|Generate syntax-hightlighted HTML for Perl using PPI|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PPI-Tester|A wxPerl-based interactive PPI debugger/tester|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,mpeters at mac.com



From fedora-extras-commits at redhat.com  Wed Oct  4 12:38:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:38:33 -0700
Subject: rpms/digikamimageplugins-doc import.log,1.1,1.2
Message-ID: <200610041238.k94CcZvq003468@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3430

Modified Files:
	import.log 
Log Message:
auto-import digikamimageplugins-doc-0.8.2-2 on branch devel from digikamimageplugins-doc-0.8.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins-doc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Oct 2006 12:37:13 -0000	1.1
+++ import.log	4 Oct 2006 12:38:32 -0000	1.2
@@ -0,0 +1 @@
+digikamimageplugins-doc-0_8_2-2:HEAD:digikamimageplugins-doc-0.8.2-2.src.rpm:1159965507



From fedora-extras-commits at redhat.com  Wed Oct  4 12:38:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:38:33 -0700
Subject: rpms/digikamimageplugins-doc/devel
	digikamimageplugins-doc-0.8.2-noarch.patch, NONE,
	1.1 digikamimageplugins-doc.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610041238.k94CcZkq003475@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3430/devel

Modified Files:
	.cvsignore sources 
Added Files:
	digikamimageplugins-doc-0.8.2-noarch.patch 
	digikamimageplugins-doc.spec 
Log Message:
auto-import digikamimageplugins-doc-0.8.2-2 on branch devel from digikamimageplugins-doc-0.8.2-2.src.rpm

digikamimageplugins-doc-0.8.2-noarch.patch:

--- NEW FILE digikamimageplugins-doc-0.8.2-noarch.patch ---
--- digikam-doc-0.8.2-r1/admin/configure.in.min.CANONICAL	2006-07-12 13:48:29.000000000 -0500
+++ digikam-doc-0.8.2-r1/admin/configure.in.min	2006-08-31 14:56:58.000000000 -0500
@@ -31,7 +31,7 @@
 unset CDPATH
 
 dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM 
+dnl AC_CANONICAL_SYSTEM 
 dnl Perform program name transformation
 AC_ARG_PROGRAM
 


--- NEW FILE digikamimageplugins-doc.spec ---

Name:		digikamimageplugins-doc
Version:	0.8.2
Release:	2%{?dist}	
Summary:	Documentation for digiKamimageplugins

Group:		Documentation
License:	GFDL
URL:		http://www.digikam.org/
Source0:	http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-doc-%{version}-r1.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

# Either use this patch or use ./configure --target below
# to trick this into a .noarch build -- Rex
Patch1:		digikamimageplugins-doc-0.8.2-noarch.patch

#BuildRequires:	automake libtool
BuildRequires:	kdelibs-devel
Requires:	digikamimageplugins = %{version}

%description
%{summary}.


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

#patch1 -p1 -b .noarch
#make -f admin/Makefile.common


%build
%configure --target=%{_build_cpu}

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
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



%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README


%changelog
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
- Release: use %%{?dist}
- Source: include URL that actually works

* Fri Sep 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
- 0.8.2 (first try)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins-doc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2006 12:37:13 -0000	1.1
+++ .cvsignore	4 Oct 2006 12:38:33 -0000	1.2
@@ -0,0 +1 @@
+digikamimageplugins-doc-0.8.2-r1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins-doc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2006 12:37:13 -0000	1.1
+++ sources	4 Oct 2006 12:38:33 -0000	1.2
@@ -0,0 +1 @@
+9735437a0f385e28c2179ea25965d78f  digikamimageplugins-doc-0.8.2-r1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 12:44:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 05:44:56 -0700
Subject: owners owners.list,1.1771,1.1772
Message-ID: <200610041244.k94CiwOo003565@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3548

Modified Files:
	owners.list 
Log Message:
+digikamimageplugins-doc



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1771
retrieving revision 1.1772
diff -u -r1.1771 -r1.1772
--- owners.list	4 Oct 2006 12:37:48 -0000	1.1771
+++ owners.list	4 Oct 2006 12:44:56 -0000	1.1772
@@ -286,6 +286,7 @@
 Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|digikam-doc|Documentation for the digiKam and Showfoto|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|digikamimageplugins|Plugins for Digikam|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|digikamimageplugins-doc|Documentation for digiKamimageplugins|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dillo|Very small and fast GUI web browser|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dircproxy|Detatchable IRC proxy server|jwilson at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 13:54:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 06:54:11 -0700
Subject: rpms/qt4/devel .cvsignore, 1.9, 1.10 qt4.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200610041354.k94DsD0h006952@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6931

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Sep 2006 15:31:48 -0000	1.9
+++ .cvsignore	4 Oct 2006 13:54:11 -0000	1.10
@@ -1,5 +1,5 @@
 clog
-qt41.spec
+OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
 qt-x11-opensource-src-4.2.0-rc1.tar.gz
-qt-x11-opensource-src-4.2.0-snapshot-20060927.tar.bz2
+qt-x11-opensource-src-4.2.0.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- qt4.spec	28 Sep 2006 15:31:48 -0000	1.23
+++ qt4.spec	4 Oct 2006 13:54:11 -0000	1.24
@@ -6,14 +6,14 @@
 #define preview -preview
 #define rel %{beta}
 
-%define snap 20060927
-%define beta snapshot-%{snap}
-%define rel  %{snap}
+#define snap 20060927
+#define beta snapshot-%{snap}
+#define rel  %{snap}
 
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.0
-Release: 0.9.%{rel}%{?dist}
+Release: 1%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -506,6 +506,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+- 4.2.0(final)
+
 * Thu Sep 28 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-0.9.20060927
 - update to 4.2.0-snapshot-20060927
 - update QDBus executable names


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Sep 2006 15:31:48 -0000	1.7
+++ sources	4 Oct 2006 13:54:11 -0000	1.8
@@ -1 +1 @@
-3b50147f1f6ab2efabd0b47587d67ab0  qt-x11-opensource-src-4.2.0-snapshot-20060927.tar.bz2
+2c062a125d5ca66397e3430ba537fbec  qt-x11-opensource-src-4.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 14:00:51 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed,  4 Oct 2006 07:00:51 -0700
Subject: rpms/rssowl/devel rssowl.script,1.7,1.8 rssowl.spec,1.14,1.15
Message-ID: <200610041400.k94E0rq2007033@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7011

Modified Files:
	rssowl.script rssowl.spec 
Log Message:
Rev -5. Updated for Eclipse update.



Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rssowl.script	4 Aug 2006 18:25:32 -0000	1.7
+++ rssowl.script	4 Oct 2006 14:00:51 -0000	1.8
@@ -10,6 +10,7 @@
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.4.1.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+
 
 


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rssowl.spec	19 Sep 2006 12:18:35 -0000	1.14
+++ rssowl.spec	4 Oct 2006 14:00:51 -0000	1.15
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2.2
-%define release 4%{?dist}
+%define release 5%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -23,14 +23,14 @@
 Requires:       jre >= 1.4.2-
 BuildRequires:  java-sdk >= 1.4.2
 BuildRequires:  ImageMagick
-BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.1.2
+BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
 BuildRequires:  libgconf-java
 BuildRequires:  ant, jpackage-utils >= 1.5
 BuildRequires:	dos2unix
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
+Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
 Requires:       libgconf-java
 Requires:       firefox
 BuildRequires:    desktop-file-utils
@@ -136,6 +136,10 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Oct  4 2006 Anthony Green <green at redhat.com> - 1.2.2-5
+- Update rssowl.script for Eclipse SDK 3.2.1.
+- Tweak Requires and BuildRequires for eclipse-platform.
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> - 1.2.2-4
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 14:20:39 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed,  4 Oct 2006 07:20:39 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 telepathy-gabble.spec, 1.6, 1.7
Message-ID: <200610041420.k94EKgir010083@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10062

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Wed Oct  4 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.9-1
- Update to 0.3.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2006 13:37:34 -0000	1.6
+++ .cvsignore	4 Oct 2006 14:20:39 -0000	1.7
@@ -1 +1 @@
-telepathy-gabble-0.3.7.tar.gz
+telepathy-gabble-0.3.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Oct 2006 13:37:34 -0000	1.6
+++ sources	4 Oct 2006 14:20:39 -0000	1.7
@@ -1 +1 @@
-f47b65038041173885b5dacdc0d9881e  telepathy-gabble-0.3.7.tar.gz
+7c373a8d441802e5b6a211701e894dfb  telepathy-gabble-0.3.9.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- telepathy-gabble.spec	1 Oct 2006 13:37:34 -0000	1.6
+++ telepathy-gabble.spec	4 Oct 2006 14:20:39 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.7
+Version:        0.3.9
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.9-1
+- Update to 0.3.9.
+
 * Sun Oct  1 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
 - Update to 0.3.7.
 - Add requires on telepathy-filesystem.



From fedora-extras-commits at redhat.com  Wed Oct  4 14:21:58 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed,  4 Oct 2006 07:21:58 -0700
Subject: owners owners.list,1.1772,1.1773
Message-ID: <200610041422.k94EM0UZ010140@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10105

Modified Files:
	owners.list 
Log Message:
Taking ownership of orphaned pam_keyring


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1772
retrieving revision 1.1773
diff -u -r1.1772 -r1.1773
--- owners.list	4 Oct 2006 12:44:56 -0000	1.1772
+++ owners.list	4 Oct 2006 14:21:58 -0000	1.1773
@@ -1175,7 +1175,7 @@
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|padevchooser|Control applet for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|alex at dalloz.de|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
-Fedora Extras|pam_keyring|A PAM module that executes gnome-keyring-daemon and unlocks the default keyring|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
+Fedora Extras|pam_keyring|A PAM module that executes gnome-keyring-daemon and unlocks the default keyring|denis at poolshark.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|pam_mount|A PAM module that can mount volumes for a user session|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pam_mysql| PAM module for auth UNIX users using MySQL data base|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pam_pkcs11|PKCS #11 PAM login module|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 14:39:45 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:39:45 -0700
Subject: rpms/sysprof/devel - New directory
Message-ID: <200610041439.k94EdlHc010277@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253/sysprof/devel

Log Message:
Directory /cvs/extras/rpms/sysprof/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 14:39:44 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:39:44 -0700
Subject: rpms/sysprof - New directory
Message-ID: <200610041439.k94EdkN2010274@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253/sysprof

Log Message:
Directory /cvs/extras/rpms/sysprof added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 14:40:06 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:40:06 -0700
Subject: rpms/sysprof Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610041440.k94Ee8LG010331@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10298

Added Files:
	Makefile import.log 
Log Message:
Setup of module sysprof


--- NEW FILE Makefile ---
# Top level Makefile for module sysprof
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct  4 14:40:07 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:40:07 -0700
Subject: rpms/sysprof/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610041440.k94Ee9SY010334@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10298/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sysprof


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct  4 14:40:55 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:40:55 -0700
Subject: rpms/sysprof import.log,1.1,1.2
Message-ID: <200610041440.k94EevHc010405@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371

Modified Files:
	import.log 
Log Message:
auto-import sysprof-1.0.3-4 on branch devel from sysprof-1.0.3-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sysprof/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Oct 2006 14:40:06 -0000	1.1
+++ import.log	4 Oct 2006 14:40:55 -0000	1.2
@@ -0,0 +1 @@
+sysprof-1_0_3-4:HEAD:sysprof-1.0.3-4.src.rpm:1159972846



From fedora-extras-commits at redhat.com  Wed Oct  4 14:40:56 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 07:40:56 -0700
Subject: rpms/sysprof/devel sysprof.desktop, NONE, 1.1 sysprof.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610041440.k94EewLA010410@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sysprof.desktop sysprof.spec 
Log Message:
auto-import sysprof-1.0.3-4 on branch devel from sysprof-1.0.3-4.src.rpm


--- NEW FILE sysprof.desktop ---
[Desktop Entry]
Version=0.9.4
Encoding=UTF-8
Name=Sysprof
Comment=a sampling CPU profiler
Exec=sysprof
Icon=sysprof-icon.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Development;Profiling;


--- NEW FILE sysprof.spec ---
Name:           sysprof      
Version:        1.0.3
Release:        4%{?dist}
Summary:        Sysprof is a sampling CPU profiler
Group:          Development/System
License:        GPL
URL:            http://www.daimi.au.dk/~sandmann/sysprof/
Source0:        http://www.daimi.au.dk/~sandmann/sysprof/sysprof-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1:        sysprof.desktop

# kmod related stuff
Provides:       sysprof-kmod-common = %{version}
Requires:       kmod-%{name} >= %{version}

BuildRequires:  gtk2-devel => 2.6
BuildRequires:  libglade2-devel
BuildRequires:  binutils-devel
BuildRequires:  desktop-file-utils


%description
Sysprof is a sampling CPU profiler for Linux that uses a kernel module
to profile the entire system, not just a single application.
Sysprof handles shared libraries and applications do not need to be
recompiled. In fact they don't even have to be restarted.

%prep
%setup -q


%build
%configure --disable-kernel-module
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         \
        --add-category X-Fedora                                 \
        %{SOURCE1}


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog
%{_bindir}/sysprof
%{_datadir}/pixmaps/sysprof-icon.png
%dir %{_datadir}/sysprof
%{_datadir}/sysprof/sysprof-icon.png
%{_datadir}/sysprof/sysprof.glade
%{_datadir}/applications/*.desktop

%changelog
* Tue Oct 2 2006 ianluca Sforna <giallu gmail com> 1.0.3-4
- add .desktop file

* Fri Sep 30 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
- versioned Provides
- add BR: binutils-devel

* Fri Sep 29 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
- own sysprof directory

* Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
- version update
- use standard %%configure macro

* Sun May 14 2006 Gianluca Sforna <giallu gmail com> 1.0.2-1
- Initial Version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2006 14:40:06 -0000	1.1
+++ .cvsignore	4 Oct 2006 14:40:56 -0000	1.2
@@ -0,0 +1 @@
+sysprof-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2006 14:40:06 -0000	1.1
+++ sources	4 Oct 2006 14:40:56 -0000	1.2
@@ -0,0 +1 @@
+8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 14:47:06 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed,  4 Oct 2006 07:47:06 -0700
Subject: rpms/mock/FC-5 mock.spec,1.21,1.22 sources,1.12,1.13
Message-ID: <200610041447.k94ElcEF010503@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10465/FC-5

Modified Files:
	mock.spec sources 
Log Message:
New upstream build



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mock.spec	30 Aug 2006 03:53:20 -0000	1.21
+++ mock.spec	4 Oct 2006 14:47:05 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.4
+Version: 0.6.5
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
+- new upstream version to fix #151255
+
 * Tue Aug 29 2006 Jesse Keating <jkeating at redhat.com> - 0.6.4-1
 - new upstream version to fix #204051
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2006 03:53:20 -0000	1.12
+++ sources	4 Oct 2006 14:47:05 -0000	1.13
@@ -1 +1 @@
-636f66c9d6d03e590c79c2d83fcf0b24  mock-0.6.4.tar.gz
+77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 14:47:06 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed,  4 Oct 2006 07:47:06 -0700
Subject: rpms/mock/devel .cvsignore, 1.9, 1.10 mock.spec, 1.22, 1.23 sources,
	1.12, 1.13
Message-ID: <200610041447.k94ElcJL010508@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10465/devel

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
New upstream build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Aug 2006 03:53:20 -0000	1.9
+++ .cvsignore	4 Oct 2006 14:47:06 -0000	1.10
@@ -1 +1 @@
-mock-0.6.4.tar.gz
+mock-0.6.5.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mock.spec	30 Aug 2006 03:53:20 -0000	1.22
+++ mock.spec	4 Oct 2006 14:47:06 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.4
+Version: 0.6.5
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
+- new upstream version to fix #151255
+
 * Tue Aug 29 2006 Jesse Keating <jkeating at redhat.com> - 0.6.4-1
 - new upstream version to fix #204051
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2006 03:53:20 -0000	1.12
+++ sources	4 Oct 2006 14:47:06 -0000	1.13
@@ -1 +1 @@
-636f66c9d6d03e590c79c2d83fcf0b24  mock-0.6.4.tar.gz
+77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 15:04:50 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed,  4 Oct 2006 08:04:50 -0700
Subject: rpms/rssowl/devel rssowl.spec,1.15,1.16
Message-ID: <200610041504.k94F4qvD013556@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13518

Modified Files:
	rssowl.spec 
Log Message:
Revision -6.  Fix build classpath for new eclipse.



Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rssowl.spec	4 Oct 2006 14:00:51 -0000	1.15
+++ rssowl.spec	4 Oct 2006 15:04:50 -0000	1.16
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2.2
-%define release 5%{?dist}
+%define release 6%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -60,7 +60,7 @@
 
 %build
 build-jar-repository -p lib swt-gtk-3.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
-ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.0.I20060605-1400.jar lib
+ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
 ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
 cd src
 ant deploy_linux
@@ -136,6 +136,9 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Oct  4 2006 Anthony Green <green at redhat.com> - 1.2.2-6
+- Fix build classpath.
+
 * Wed Oct  4 2006 Anthony Green <green at redhat.com> - 1.2.2-5
 - Update rssowl.script for Eclipse SDK 3.2.1.
 - Tweak Requires and BuildRequires for eclipse-platform.



From fedora-extras-commits at redhat.com  Wed Oct  4 15:23:23 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Oct 2006 08:23:23 -0700
Subject: rpms/paraview/devel paraview.spec,1.6,1.7
Message-ID: <200610041523.k94FNP5U013751@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13734

Modified Files:
	paraview.spec 
Log Message:
- Re-enable OSMESA support for FC6
- Enable python wrapping



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- paraview.spec	15 Sep 2006 22:08:51 -0000	1.6
+++ paraview.spec	4 Oct 2006 15:23:23 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, lam-devel
-BuildRequires:  libGLU-devel, libXt-devel
+BuildRequires:  libGLU-devel, libXt-devel, mesa-libOSMesa-devel
 BuildRequires:  python-devel, tk-devel, hdf5-devel
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
@@ -120,6 +120,8 @@
         -DTCL_LIBRARY:PATH=tcl \
         -DTK_LIBRARY:PATH=tk \
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
+        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
+        -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
         -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -128,9 +130,6 @@
         -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
-# Broken at the moment
-#        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
-#
 make
 popd
 mkdir fedora-mpi
@@ -151,9 +150,11 @@
         -DTCL_LIBRARY:PATH=tcl \
         -DTK_LIBRARY:PATH=tk \
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
+        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
         -DVTK_USE_MPI:BOOL=ON \
         -DMPI_INCLUDE_PATH:PATH=%{_includedir}/lam \
         -DMPI_LIBRARY:STRING="-L%{_libdir}/lam -llammpio -llammpi++ -llamf77mpi -lmpi -llam -laio -lutil -ldl" \
+        -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
         -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -162,9 +163,6 @@
         -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
-# Broken at the moment
-#        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
-#
 make
 
 
@@ -273,7 +271,7 @@
 %{_bindir}/pvbatch
 %{_bindir}/pvclient
 %{_bindir}/pvdataserver
-#%{_bindir}/pvpython
+%{_bindir}/pvpython
 %{_bindir}/pvrenderserver
 %{_bindir}/pvserver
 %{_datadir}/applications/fedora-paraview.desktop
@@ -287,7 +285,7 @@
 %{_bindir}/pvbatch-mpi
 %{_bindir}/pvclient-mpi
 %{_bindir}/pvdataserver-mpi
-#%{_bindir}/pvpython-mpi
+%{_bindir}/pvpython-mpi
 %{_bindir}/pvrenderserver-mpi
 %{_bindir}/pvserver-mpi
 %{_datadir}/applications/fedora-paraview-mpi.desktop
@@ -308,6 +306,10 @@
 
 
 %changelog
+* Wed Oct  4 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-2
+- Re-enable OSMESA support for FC6
+- Enable python wrapping
+
 * Fri Sep 15 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-1
 - Update to 2.4.4
 



From fedora-extras-commits at redhat.com  Wed Oct  4 15:35:56 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 08:35:56 -0700
Subject: rpms/OpenSceneGraph/devel sources,1.5,1.6 .cvsignore,1.5,1.6
Message-ID: <200610041535.k94FZwti013915@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13896

Modified Files:
	sources .cvsignore 
Log Message:
Reflect having uploaded OSG_OP_OT-1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2006 13:07:04 -0000	1.5
+++ sources	4 Oct 2006 15:35:56 -0000	1.6
@@ -1 +1,2 @@
 c140e0f53f577af6e807108dd1a8f65f  OSG_OP_OT-1.1.zip
+e08e0ef1f250dfc17122926ef00b1559  OSG_OP_OT-1.2.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2006 13:07:04 -0000	1.5
+++ .cvsignore	4 Oct 2006 15:35:56 -0000	1.6
@@ -1 +1,2 @@
 OSG_OP_OT-1.1.zip
+OSG_OP_OT-1.2.zip



From fedora-extras-commits at redhat.com  Wed Oct  4 15:38:32 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 08:38:32 -0700
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-1.2.diff,NONE,1.1
Message-ID: <200610041538.k94FcYIk013956@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938

Added Files:
	OpenSceneGraph-1.2.diff 
Log Message:
New.

OpenSceneGraph-1.2.diff:

--- NEW FILE OpenSceneGraph-1.2.diff ---
? diff
Index: OpenSceneGraph/Make/instexamplesrc
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/instexamplesrc,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/Make/instexamplesrc	4 Oct 2006 08:01:33 -0000	1.1.1.1
+++ OpenSceneGraph/Make/instexamplesrc	4 Oct 2006 10:49:35 -0000	1.1.1.1.2.1
@@ -32,7 +32,7 @@
             cd $TOPDIR/examples/$d
             [ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
             echo "         installing $d"
-            for f in `$MAKE __instfiles | grep -v $MAKE`
+            for f in `$MAKE __instfiles | grep -v $MAKE | grep -v Entering | grep -v Leaving`
            do
                 src=`echo $f | cut -f1 -d"="`
                 dst=`echo $f | cut -f2 -d"="`
Index: OpenSceneGraph/Make/libdefs
===================================================================
RCS file: OpenSceneGraph/Make/libdefs
diff -N OpenSceneGraph/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ OpenSceneGraph/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(VERSION_MAJOR)
+endif
+
Index: OpenSceneGraph/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- OpenSceneGraph/Make/makedefs	4 Oct 2006 10:12:01 -0000	1.1.1.3
+++ OpenSceneGraph/Make/makedefs	4 Oct 2006 11:02:09 -0000	1.1.1.2.2.2
@@ -354,14 +354,6 @@
       ARCHINST        = 
     endif
   else
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.0
-endif
-
-#    LDFLAGS         += `getconf LFS_LDFLAGS`
-#    DEF             += `getconf LFS_CFLAGS`
-
     LIBS            = -lstdc++
 #    DEF             += -W -Wall -fPIC -pipe -Woverloaded-virtual
     DEF             += -W -Wall -fPIC -pipe
Index: OpenSceneGraph/include/osg/Shader
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/include/osg/Shader,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -u -r1.1.1.2 -r1.1.1.2.2.1
--- OpenSceneGraph/include/osg/Shader	4 Oct 2006 08:07:18 -0000	1.1.1.2
+++ OpenSceneGraph/include/osg/Shader	4 Oct 2006 10:49:36 -0000	1.1.1.2.2.1
@@ -39,6 +39,8 @@
   * configuration.
   */
 
+class Program;
+
 class OSG_EXPORT Shader : public osg::Object
 {
     public:
Index: OpenSceneGraph/src/osgPlugins/gif/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	4 Oct 2006 08:01:33 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -5,15 +5,7 @@
 	ReaderWriterGIF.cpp\
 
 
-ifeq ($(OS),HP-UX)
 INC   += $(GIF_INCLUDE)
-else
-INC   += -I/usr/local/include\
-	 -I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-endif
-
 
 LIBS  += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS)
 
Index: OpenSceneGraph/src/osgPlugins/png/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/png/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/png/GNUmakefile	4 Oct 2006 08:01:34 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/png/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -5,14 +5,7 @@
         ReaderWriterPNG.cpp\
 
 LIBS  += $(OSG_LIBS) $(PNG_LIBS) $(OTHER_LIBS)
-ifneq ($(OS),HP-UX)
-INC  += -I/usr/local/include\
-	-I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-else
 INC += $(PNG_INCLUDE)
-endif
 
 TARGET_BASENAME = png
 include $(TOPDIR)/Make/cygwin_plugin_def
Index: OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	4 Oct 2006 08:01:34 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -6,12 +6,7 @@
 
 LIBS  += $(OSG_LIBS) $(TIFF_LIB) $(OTHER_LIBS)
 
-ifeq ($(OS),HP-UX)
 INC     += $(TIFF_INCLUDE)
-else
-INC     += -I/usr/local/include
-LDFLAGS += -L/usr/local/lib
-endif
 
 TARGET_BASENAME = tiff
 include $(TOPDIR)/Make/cygwin_plugin_def
Index: OpenThreads/Make/libdefs
===================================================================
RCS file: OpenThreads/Make/libdefs
diff -N OpenThreads/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ OpenThreads/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,3 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
Index: OpenThreads/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- OpenThreads/Make/makedefs	4 Oct 2006 10:12:04 -0000	1.1.1.3
+++ OpenThreads/Make/makedefs	4 Oct 2006 11:03:13 -0000	1.1.1.2.2.2
@@ -227,12 +227,6 @@
     ifeq (x$(CXX),x)
       CXX               = g++
     endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
-    ###DEF               += -fPIC
     OPTF              = -O2
     DBGF              = -ggdb -gstabs
     ifeq ($(SYSARCH),x86_64)
Index: OpenThreads/pthread_src/PThread.c++
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/pthread_src/PThread.c++,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.2 -r1.1.1.1.2.2
--- OpenThreads/pthread_src/PThread.c++	4 Oct 2006 10:12:04 -0000	1.1.1.2
+++ OpenThreads/pthread_src/PThread.c++	4 Oct 2006 11:03:13 -0000	1.1.1.1.2.2
@@ -572,27 +572,18 @@
 
     PThreadPrivateData *pd = static_cast<PThreadPrivateData *> (_prvData);
 
-    size_t defaultStackSize;
+    size_t defaultStackSize = 0;
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     if(defaultStackSize < pd->stackSize) {
 
 	pthread_attr_setstacksize( &thread_attr, pd->stackSize);
-	if(status != 0) {
-	    return status;
-	}
     }
 
     //-------------------------------------------------------------------------
     // Now get what we actually have...
     //
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     pd->stackSize = defaultStackSize;
 
Index: OpenThreads/pthread_src/PThreadPrivateData.h
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/pthread_src/PThreadPrivateData.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.2 -r1.1.1.1.2.2
--- OpenThreads/pthread_src/PThreadPrivateData.h	4 Oct 2006 10:12:04 -0000	1.1.1.2
+++ OpenThreads/pthread_src/PThreadPrivateData.h	4 Oct 2006 11:03:14 -0000	1.1.1.1.2.2
@@ -43,7 +43,7 @@
 
 private:
 
-    PThreadPrivateData() {};
+    PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {};
 
     virtual ~PThreadPrivateData() {};
 
Index: Producer/Make/libdefs
===================================================================
RCS file: Producer/Make/libdefs
diff -N Producer/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Producer/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
+
Index: Producer/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/Producer/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- Producer/Make/makedefs	4 Oct 2006 10:12:05 -0000	1.1.1.3
+++ Producer/Make/makedefs	4 Oct 2006 11:03:14 -0000	1.1.1.2.2.2
@@ -248,11 +248,6 @@
     ifeq (x$(CXX),x)
       CXX               = g++
     endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
     DEF               += -fPIC -pthread
     OPTF              = -O2
     DBGF              = -ggdb -gstabs
Index: Producer/include/Producer/Keyboard
===================================================================
RCS file: /var/cvs/local/OSG/Producer/include/Producer/Keyboard,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Producer/include/Producer/Keyboard	4 Oct 2006 08:01:36 -0000	1.1.1.1
+++ Producer/include/Producer/Keyboard	4 Oct 2006 10:49:37 -0000	1.1.1.1.2.1
@@ -539,6 +539,7 @@
         KeyboardKey    _key;
 };
 
+class KeyboardMouseImplementation;
 
 class PR_EXPORT Keyboard : public Producer::Referenced
 {
Index: debian/Doxyfile-openscenegraph
===================================================================
RCS file: debian/Doxyfile-openscenegraph
diff -N debian/Doxyfile-openscenegraph
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-openscenegraph	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = OpenSceneGraph
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = OpenSceneGraph/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = OpenSceneGraph/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/Doxyfile-openthreads
===================================================================
RCS file: debian/Doxyfile-openthreads
diff -N debian/Doxyfile-openthreads
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-openthreads	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = OpenThreads
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = OpenThreads/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = OpenThreads/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/Doxyfile-producer
===================================================================
RCS file: debian/Doxyfile-producer
diff -N debian/Doxyfile-producer
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-producer	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = Producer
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = Producer/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = Producer/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/osgexamples.1
===================================================================
RCS file: debian/osgexamples.1
diff -N debian/osgexamples.1
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/osgexamples.1	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,28 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH OpenSceneGraph 1 "2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+OpenSceneGraph examples \- set of examples program
+.SH SYNOPSIS
+.B program
+.RI --help
+.SH DESCRIPTION
+Use --help to figure out what the example does.
+See http://www.openscenegraph.org/ for more information.
+.SH AUTHOR
+This manual page was written by Loic Dachary <loic at gnu.org>
+for the Debian project (but may be used by others).



From fedora-extras-commits at redhat.com  Wed Oct  4 15:50:57 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 08:50:57 -0700
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.18,1.19
Message-ID: <200610041550.k94Fox2c014052@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14032

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
- Upstream update.
- Remove BR: flex bison.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- OpenSceneGraph.spec	5 Sep 2006 10:06:07 -0000	1.18
+++ OpenSceneGraph.spec	4 Oct 2006 15:50:57 -0000	1.19
@@ -5,11 +5,11 @@
 #
 
 %define apivers 1.0
-%define srcvers 1.1
+%define srcvers 1.2
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -21,7 +21,6 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	flex bison
 BuildRequires:  libGL-devel
 BuildRequires: 	libGLU-devel
 BuildRequires:	libXmu-devel
@@ -48,7 +47,7 @@
 
 %prep
 %setup -q -n OSG_OP_OT-%{srcvers}
-%patch0 -p1
+%patch0 -p0
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -392,7 +391,11 @@
 %{_includedir}/Producer
 
 %changelog
-* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - %{srcvers}-2
+* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
+- Upstream update.
+- Remove BR: flex bison.
+
+* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.1-2
 - Mass rebuild.
 
 * Thu Aug 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.1-1



From fedora-extras-commits at redhat.com  Wed Oct  4 15:51:22 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 08:51:22 -0700
Subject: rpms/OpenSceneGraph/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <200610041551.k94FpO9k014082@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14063

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
- Upstream update.
- Remove BR: flex bison.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Oct 2006 15:35:56 -0000	1.6
+++ .cvsignore	4 Oct 2006 15:51:22 -0000	1.7
@@ -1,2 +1 @@
-OSG_OP_OT-1.1.zip
 OSG_OP_OT-1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Oct 2006 15:35:56 -0000	1.6
+++ sources	4 Oct 2006 15:51:22 -0000	1.7
@@ -1,2 +1 @@
-c140e0f53f577af6e807108dd1a8f65f  OSG_OP_OT-1.1.zip
 e08e0ef1f250dfc17122926ef00b1559  OSG_OP_OT-1.2.zip



From fedora-extras-commits at redhat.com  Wed Oct  4 16:04:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  4 Oct 2006 09:04:19 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.5,1.6
Message-ID: <200610041604.k94G4LAV017259@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17225

Modified Files:
	em8300-kmod.spec 
Log Message:
* Wed Oct  4 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.18-1.2726.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- em8300-kmod.spec	23 Sep 2006 08:43:18 -0000	1.5
+++ em8300-kmod.spec	4 Oct 2006 16:04:16 -0000	1.6
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2689.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.18-1.2726.fc6.
+
 * Sat Sep 23 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.18-1.2689.fc6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 16:16:27 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 09:16:27 -0700
Subject: rpms/perl-POE-Component-SimpleLog/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-SimpleLog.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610041616.k94GGTnA018130@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-SimpleLog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18078/devel

Modified Files:
	.cvsignore perl-POE-Component-SimpleLog.spec sources 
Log Message:
update to 1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 18:58:36 -0000	1.2
+++ .cvsignore	4 Oct 2006 16:16:27 -0000	1.3
@@ -1 +1 @@
-POE-Component-SimpleLog-1.03.tar.gz
+POE-Component-SimpleLog-1.04.tar.gz


Index: perl-POE-Component-SimpleLog.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/devel/perl-POE-Component-SimpleLog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-POE-Component-SimpleLog.spec	1 Sep 2006 04:20:47 -0000	1.3
+++ perl-POE-Component-SimpleLog.spec	4 Oct 2006 16:16:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-SimpleLog
-Version:        1.03        
-Release:        2%{?dist}
+Version:        1.04
+Release:        1%{?dist}
 Summary:        A simple logging system for POE 
 
 Group:          Development/Libraries
@@ -41,11 +41,12 @@
 
 %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' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -58,12 +59,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc README Changes examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Oct 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
+- update to 1.04
+- misc spec cleanup 
+- add Changes, examples/ to %%doc
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-2
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 18:58:36 -0000	1.2
+++ sources	4 Oct 2006 16:16:27 -0000	1.3
@@ -1 +1 @@
-fc5d648853b82364ba92fccd0326e0bd  POE-Component-SimpleLog-1.03.tar.gz
+56c77a892da0a823b6e9f8d2a13aaa0b  POE-Component-SimpleLog-1.04.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 16:16:21 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 09:16:21 -0700
Subject: rpms/perl-POE-Component-SimpleLog Makefile,1.1,1.2
Message-ID: <200610041616.k94GGrFj018136@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-SimpleLog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18078

Modified Files:
	Makefile 
Log Message:
update to 1.04



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	9 Jul 2006 18:58:28 -0000	1.1
+++ Makefile	4 Oct 2006 16:16:21 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct  4 16:16:21 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 09:16:21 -0700
Subject: rpms/perl-POE-Component-SimpleLog/FC-5
	perl-POE-Component-SimpleLog.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610041616.k94GGreP018140@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-SimpleLog/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18078/FC-5

Modified Files:
	perl-POE-Component-SimpleLog.spec sources 
Log Message:
update to 1.04



Index: perl-POE-Component-SimpleLog.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/FC-5/perl-POE-Component-SimpleLog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-SimpleLog.spec	9 Jul 2006 19:06:59 -0000	1.2
+++ perl-POE-Component-SimpleLog.spec	4 Oct 2006 16:16:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-POE-Component-SimpleLog
-Version:        1.03        
+Version:        1.04
 Release:        1%{?dist}
 Summary:        A simple logging system for POE 
 
@@ -41,11 +41,12 @@
 
 %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' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -58,12 +59,20 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc README Changes examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Oct 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
+- update to 1.04
+- misc spec cleanup 
+- add Changes, examples/ to %%doc
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-2
+- bump for mass rebuild
+
 * Sun Jul  9 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-1
 - bump for build/release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-SimpleLog/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 18:58:36 -0000	1.2
+++ sources	4 Oct 2006 16:16:21 -0000	1.3
@@ -1 +1 @@
-fc5d648853b82364ba92fccd0326e0bd  POE-Component-SimpleLog-1.03.tar.gz
+56c77a892da0a823b6e9f8d2a13aaa0b  POE-Component-SimpleLog-1.04.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 16:26:19 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:26:19 -0700
Subject: rpms/sysprof-kmod - New directory
Message-ID: <200610041626.k94GQLJw018346@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18320/sysprof-kmod

Log Message:
Directory /cvs/extras/rpms/sysprof-kmod added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 16:26:20 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:26:20 -0700
Subject: rpms/sysprof-kmod/devel - New directory
Message-ID: <200610041626.k94GQMbl018349@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18320/sysprof-kmod/devel

Log Message:
Directory /cvs/extras/rpms/sysprof-kmod/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct  4 16:26:37 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:26:37 -0700
Subject: rpms/sysprof-kmod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610041626.k94GQdN6018398@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18365

Added Files:
	Makefile import.log 
Log Message:
Setup of module sysprof-kmod


--- NEW FILE Makefile ---
# Top level Makefile for module sysprof-kmod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct  4 16:26:38 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:26:38 -0700
Subject: rpms/sysprof-kmod/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610041626.k94GQefU018401@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18365/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sysprof-kmod


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct  4 16:27:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:27:26 -0700
Subject: rpms/sysprof-kmod import.log,1.1,1.2
Message-ID: <200610041627.k94GRSVQ018474@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18439

Modified Files:
	import.log 
Log Message:
auto-import sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6 on branch devel from sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Oct 2006 16:26:37 -0000	1.1
+++ import.log	4 Oct 2006 16:27:26 -0000	1.2
@@ -0,0 +1 @@
+sysprof-kmod-1_0_3-1_2_6_18_1_2689_fc6:HEAD:sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6.src.rpm:1159979236



From fedora-extras-commits at redhat.com  Wed Oct  4 16:27:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:27:26 -0700
Subject: rpms/sysprof-kmod/devel kmodtool, NONE,
	1.1 sysprof-avoid_depmod.patch, 
	NONE, 1.1 sysprof-kmod.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610041627.k94GRTsg018481@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18439/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kmodtool sysprof-avoid_depmod.patch sysprof-kmod.spec 
Log Message:
auto-import sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6 on branch devel from sysprof-kmod-1.0.3-1.2.6.18_1.2689.fc6.src.rpm


--- NEW FILE kmodtool ---
#!/bin/bash

# kmodtool - Helper script for building kernel module RPMs
# Copyright (c) 2003-2006 Ville Skytt?? <ville.skytta at iki.fi>,
#                         Thorsten Leemhuis <fedora at leemhuis.info>
#
# 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.

shopt -s extglob

myprog="kmodtool"
myver="0.10.11"
knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE))
kmod_name=
kver=
verrel=
variant=

get_verrel ()
{
  verrel=${1:-$(uname -r)}
  verrel=${verrel%%$knownvariants}
}

print_verrel ()
{
  get_verrel $@
  echo "${verrel}"
}

get_variant ()
{
  get_verrel $@
  variant=${1:-$(uname -r)}
  variant=${variant##$verrel}
  variant=${variant:-'""'}
}

print_variant ()
{
  get_variant $@
  echo "${variant}"
}


get_rpmtemplate ()
{
    local variant="${1}"
    local dashvariant="${variant:+-${variant}}"
    case "$verrel" in
        *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
        *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
    esac
    cat <<EOF
%package       -n kmod-${kmod_name}${dashvariant}
Summary:          ${kmod_name} kernel module(s)
Group:            System Environment/Kernel
Provides:         kernel-modules = ${verrel}${variant}
Provides:         ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         ${kdep}
Requires:         ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version}
Requires(post):   /sbin/depmod
Requires(postun): /sbin/depmod
BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
%description   -n kmod-${kmod_name}${dashvariant}
This package provides the ${kmod_name} kernel modules built for the Linux
kernel ${verrel}${variant} for the %{_target_cpu} family of processors.
%post          -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aeF /boot/System.map-${verrel}${variant} ${verrel}${variant} > /dev/null || :
%postun        -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
%files         -n kmod-${kmod_name}${dashvariant}
%defattr(644,root,root,755)
/lib/modules/${verrel}${variant}/extra/${kmod_name}/

EOF
}

print_rpmtemplate ()
{
  kmod_name="${1}"
  shift
  kver="${1}"
  get_verrel "${1}"
  shift
  if [ -z "${kmod_name}" ] ; then
    echo "Please provide the kmodule-name as first parameter." >&2
    exit 2
  elif [ -z "${kver}" ] ; then
    echo "Please provide the kver as second parameter." >&2
    exit 2
  elif [ -z "${verrel}" ] ; then
    echo "Couldn't find out the verrel." >&2
    exit 2
  fi

  for variant in "$@" ; do
    get_rpmtemplate "${variant}"
  done
}

usage ()
{
  cat <<EOF
You called: ${invocation}

Usage: ${myprog} <command> <option>+
 Commands:
  verrel <uname>                               
    - Get "base" version-release.
  variant <uname>                               
    - Get variant from uname.
  rpmtemplate <mainpgkname> <uname> <variants> 
    - Return a template for
  version  
    - Output version number and exit.
EOF
}

invocation="$(basename ${0}) $@"
while [ "${1}" ] ; do
  case "${1}" in
    verrel)
      shift
      print_verrel $@
      exit $?
      ;;
    variant)
      shift
      print_variant $@
      exit $?
      ;;
    rpmtemplate)
      shift
      print_rpmtemplate "$@"
      exit $?
      ;;
    version)
      echo "${myprog} ${myver}"
      exit 0
      ;;
    *)
      echo "Error: Unknown option '${1}'." >&2
      usage >&2
      exit 2
      ;;
  esac
done

# Local variables:
# mode: sh
# sh-indentation: 2
# indent-tabs-mode: nil
# End:
# ex: ts=2 sw=2 et

sysprof-avoid_depmod.patch:

--- NEW FILE sysprof-avoid_depmod.patch ---
Index: sysprof-1.0.2/module/Makefile
===================================================================
--- sysprof-1.0.2.orig/module/Makefile
+++ sysprof-1.0.2/module/Makefile
@@ -43,7 +43,6 @@ distdir:
 
 install:
 	$(KMAKE) modules_install
-	[ -e /sbin/depmod ] && /sbin/depmod
 
 install-data:
 install-exec:


--- NEW FILE sysprof-kmod.spec ---
# stuff to be implemented externally:
Source10: kmodtool
%define   kmodtool bash %{SOURCE10}
# end stuff to be ...

# hardcode for now:
%{!?kversion: %define kversion 2.6.18-1.2689.fc6}
# hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
# --define "kversion 2.6.16-1.2096_FC5"

%define kmod_name sysprof
%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)

%ifarch i686
%define pae PAE
%endif
%ifarch ppc
%define smp smp
%endif
%ifarch i686 x86_64 ia64
%define xen xen
%endif
%ifarch i686 x86_64 ppc64 ppc64iseries
%define kdump kdump
%endif
%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump}}
# hint: this can he overridden with "--define kvariant foo bar" on the rpmbuild command line, e.g.
# --define 'kvariant "" smp' 


Name:           %{kmod_name}-kmod
Version:        1.0.3
Release:        1.%(echo %{kverrel} | tr - _)
Summary:        Sysprof kernel module

Group:          System Environment/Kernel
License:        GPL
URL:            http://www.daimi.au.dk/~sandmann/sysprof/
Source0:        http://www.daimi.au.dk/~sandmann/sysprof/sysprof-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         %{kmod_name}-avoid_depmod.patch

ExclusiveArch:  i586 i686 x86_64 ppc


%description
Sysprof is a sampling CPU profiler for Linux that uses a
kernel module to profile the entire system, not just a 
single application. Sysprof handles shared libraries and 
applications do not need to be recompiled. In fact they 
don't even have to be restarted. 


# magic hidden here:
%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}

%prep
# to understand the magic better or to debug it, uncomment this:
#{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null
#sleep 5

%setup -q -c -T -a 0
pushd %{kmod_name}-%{version}*
%patch0 -p1 -b .patch0
# configure script breaks in mock builds (missing BRs), so we create here 
# a config.h with the needed symbol
echo '#define PACKAGE_VERSION "%{version}"' > config.h
popd

for kvariant in %{kvariants} ; do
    cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
done


%build
for kvariant in %{kvariants}
do
    ksrc=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
    cd _kmod_build_$kvariant/module
    make KDIR="${ksrc}" 
    cd ../..
done


%install
rm -rf $RPM_BUILD_ROOT
for kvariant in %{kvariants}
do
    cd _kmod_build_$kvariant/module
    ksrc=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
    export INSTALL_MOD_DIR=extra/%{kmod_name}
    export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
    make KDIR=${ksrc} install 
    cd ../..
done
# Temporarily executable for stripping, fixed later in %%files.
chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
- version update
- fixed rpmlint warning about summary 

* Sat May 13 2006 Gianluca Sforna <giallu gmail com> 1.0.2-2
- removed some unnecessary diffs from the template spec

* Sat May 13 2006 Gianluca Sforna <giallu gmail com> 1.0.2-1
- Initial Version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2006 16:26:38 -0000	1.1
+++ .cvsignore	4 Oct 2006 16:27:26 -0000	1.2
@@ -0,0 +1 @@
+sysprof-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2006 16:26:38 -0000	1.1
+++ sources	4 Oct 2006 16:27:26 -0000	1.2
@@ -0,0 +1 @@
+8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 16:37:46 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 09:37:46 -0700
Subject: owners owners.list,1.1773,1.1774
Message-ID: <200610041637.k94GbmuN018636@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18619

Modified Files:
	owners.list 
Log Message:
Add sysprof and sysprof-kmod



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1773
retrieving revision 1.1774
diff -u -r1.1773 -r1.1774
--- owners.list	4 Oct 2006 14:21:58 -0000	1.1773
+++ owners.list	4 Oct 2006 16:37:46 -0000	1.1774
@@ -2089,6 +2089,8 @@
 Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|sysconftool|Macros for aclocal to install configuration files|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|sysprof|A sampling CPU profiler|giallu at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|sysprof-kmod|Sysprof kernel module|giallu at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ankit644 at yahoo.com
 Fedora Extras|t1lib|PostScript Type 1 font rasterizer|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt



From fedora-extras-commits at redhat.com  Wed Oct  4 16:43:00 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed,  4 Oct 2006 09:43:00 -0700
Subject: rpms/php-pear-Console-Getargs/devel .cvsignore, 1.2,
	1.3 php-pear-Console-Getargs.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610041643.k94Gh2rD018762@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18741

Modified Files:
	.cvsignore php-pear-Console-Getargs.spec sources 
Log Message:
	update to 1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2006 12:38:04 -0000	1.2
+++ .cvsignore	4 Oct 2006 16:43:00 -0000	1.3
@@ -1 +1 @@
-Console_Getargs-1.3.1.tgz
+Console_Getargs-1.3.2.tgz


Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/php-pear-Console-Getargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Console-Getargs.spec	1 Oct 2006 12:38:04 -0000	1.1
+++ php-pear-Console-Getargs.spec	4 Oct 2006 16:43:00 -0000	1.2
@@ -2,7 +2,7 @@
 %define pear_name Console_Getargs
 
 Name:           php-pear-Console-Getargs
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
@@ -82,6 +82,9 @@
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Wed Oct  4 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
+- update to 1.3.2
+
 * Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
 - generated specfile (pear make-rpm-spec) + cleaning
 - generated CHANGELOG


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2006 12:38:04 -0000	1.2
+++ sources	4 Oct 2006 16:43:00 -0000	1.3
@@ -1 +1 @@
-67b5918343fa24f3e311d159e168b5dc  Console_Getargs-1.3.1.tgz
+de2421c4d6409d84678d07afa2b59651  Console_Getargs-1.3.2.tgz



From fedora-extras-commits at redhat.com  Wed Oct  4 16:44:39 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed,  4 Oct 2006 09:44:39 -0700
Subject: rpms/php-pear-Console-Getargs/FC-5 .cvsignore, 1.2,
	1.3 php-pear-Console-Getargs.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610041644.k94Gifso018834@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18813

Modified Files:
	.cvsignore php-pear-Console-Getargs.spec sources 
Log Message:
	update to 1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2006 12:38:04 -0000	1.2
+++ .cvsignore	4 Oct 2006 16:44:38 -0000	1.3
@@ -1 +1 @@
-Console_Getargs-1.3.1.tgz
+Console_Getargs-1.3.2.tgz


Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/php-pear-Console-Getargs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Console-Getargs.spec	2 Oct 2006 06:12:12 -0000	1.2
+++ php-pear-Console-Getargs.spec	4 Oct 2006 16:44:38 -0000	1.3
@@ -2,8 +2,8 @@
 %define pear_name Console_Getargs
 
 Name:           php-pear-Console-Getargs
-Version:        1.3.1
-Release:        1%{?dist}.1
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
 
@@ -82,6 +82,9 @@
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Wed Oct  4 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
+- update to 1.3.2
+
 * Thu Sep 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
 - generated specfile (pear make-rpm-spec) + cleaning
 - generated CHANGELOG


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Oct 2006 12:38:04 -0000	1.2
+++ sources	4 Oct 2006 16:44:38 -0000	1.3
@@ -1 +1 @@
-67b5918343fa24f3e311d159e168b5dc  Console_Getargs-1.3.1.tgz
+de2421c4d6409d84678d07afa2b59651  Console_Getargs-1.3.2.tgz



From fedora-extras-commits at redhat.com  Wed Oct  4 17:02:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  4 Oct 2006 10:02:30 -0700
Subject: rpms/scribus/devel .cvsignore, 1.11, 1.12 scribus.spec, 1.22,
	1.23 sources, 1.11, 1.12
Message-ID: <200610041703.k94H35EN021780@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21751

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Sep 2006 14:12:03 -0000	1.11
+++ .cvsignore	4 Oct 2006 17:02:30 -0000	1.12
@@ -1 +1 @@
-scribus-1.3.3.3.tar.bz2
+scribus-1.3.3.4.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scribus.spec	15 Sep 2006 14:12:03 -0000	1.22
+++ scribus.spec	4 Oct 2006 17:02:30 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           scribus
-Version:        1.3.3.3
+Version:        1.3.3.4
 Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
@@ -7,7 +7,7 @@
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://dl.sf.net/scribus/scribus-1.3.3.3.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.3.4.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +136,10 @@
 %{_includedir}/scribus/
 
 %changelog
+* Wed Oct 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.4-1
+- version upgrade
+
 * Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.3.3.3-1
 - version upgrade (#205962)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Sep 2006 14:12:03 -0000	1.11
+++ sources	4 Oct 2006 17:02:30 -0000	1.12
@@ -1 +1 @@
-cde9a4342697a69de60b017f59d32488  scribus-1.3.3.3.tar.bz2
+ccd7fb34a77b7e3d83e902fb3f5b731b  scribus-1.3.3.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 17:34:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 10:34:25 -0700
Subject: rpms/perl-Error/FC-5 .cvsignore, 1.9, 1.10 perl-Error.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200610041734.k94HYRqY022055@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22017/FC-5

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17005.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2006 18:40:52 -0000	1.9
+++ .cvsignore	4 Oct 2006 17:34:25 -0000	1.10
@@ -1 +1 @@
-Error-0.17004.tar.gz
+Error-0.17005.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/perl-Error.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Error.spec	4 Sep 2006 18:40:52 -0000	1.13
+++ perl-Error.spec	4 Oct 2006 17:34:25 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17004
+Version:        0.17005
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17005-1
+- Update to 0.17005.
+
 * Mon Sep  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17004-1
 - Update to 0.17004.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 18:40:52 -0000	1.9
+++ sources	4 Oct 2006 17:34:25 -0000	1.10
@@ -1 +1 @@
-4dfca8732331a4f79c6803c3bc6b722f  Error-0.17004.tar.gz
+59579d2eb0c5cae5d102db2b1110f875  Error-0.17005.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 17:34:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Oct 2006 10:34:26 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.9, 1.10 perl-Error.spec, 1.13, 
	1.14 sources, 1.9, 1.10
Message-ID: <200610041734.k94HYSEA022061@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22017/devel

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17005.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2006 18:40:53 -0000	1.9
+++ .cvsignore	4 Oct 2006 17:34:25 -0000	1.10
@@ -1 +1 @@
-Error-0.17004.tar.gz
+Error-0.17005.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Error.spec	4 Sep 2006 18:40:53 -0000	1.13
+++ perl-Error.spec	4 Oct 2006 17:34:25 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17004
+Version:        0.17005
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17005-1
+- Update to 0.17005.
+
 * Mon Sep  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17004-1
 - Update to 0.17004.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 18:40:53 -0000	1.9
+++ sources	4 Oct 2006 17:34:25 -0000	1.10
@@ -1 +1 @@
-4dfca8732331a4f79c6803c3bc6b722f  Error-0.17004.tar.gz
+59579d2eb0c5cae5d102db2b1110f875  Error-0.17005.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 18:03:09 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 11:03:09 -0700
Subject: owners owners.list,1.1774,1.1775
Message-ID: <200610041803.k94I3CBk025146@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25129

Modified Files:
	owners.list 
Log Message:
Orphan xffm 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1774
retrieving revision 1.1775
diff -u -r1.1774 -r1.1775
--- owners.list	4 Oct 2006 16:37:46 -0000	1.1774
+++ owners.list	4 Oct 2006 18:03:09 -0000	1.1775
@@ -2324,7 +2324,7 @@
 Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfdesktop|Desktop Manger for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xffm|Next generation filemanager and SMB network navigator for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xffm|Next generation filemanager and SMB network navigator for Xfce4|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xforms|An X11 toolkit library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|xfprint|Print dialog and printer manager for Xfce 4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfsdump|Backup and restore utilities for XFS filesystems|cattelan at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct  4 18:03:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 11:03:36 -0700
Subject: rpms/uw-imap/devel uw-imap.spec,1.16,1.17
Message-ID: <200610041804.k94I48hC025174@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25152

Modified Files:
	uw-imap.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
- libc-client: move c-client.cf here
- c-client.cf: +set new-folder-format same-as-inbox



Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- uw-imap.spec	26 Sep 2006 20:29:56 -0000	1.16
+++ uw-imap.spec	4 Oct 2006 18:03:36 -0000	1.17
@@ -1,19 +1,15 @@
 
-# Change the default connected directory from the user's home directory
-# to the named subdirectory of the user's home directory
-%define mail_subdirectory      Mail
-
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source:	 ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -25,27 +21,30 @@
 #define imap_libs	imap-libs
 
 # FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs
-%define sslcerts  %{expand:%(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)}
+%global sslcerts  %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)
 
 # imap -> uw-imap rename
 Obsoletes: imap < 1:%{version}
 
+Source10: c-client.cf
+
 # legacy/old pam setup, using pam_stack.so
-Source1: imap-legacy.pam
+Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source2: imap.pam
-Source3: imap-xinetd
-Source4: ipop2-xinetd
-Source5: ipop3-xinetd
-Source6: imaps-xinetd
-Source7: pop3s-xinetd
+Source22: imap.pam
+
+Source31: imap-xinetd
+Source32: ipop2-xinetd
+Source33: ipop3-xinetd
+Source34: imaps-xinetd
+Source35: pop3s-xinetd
+
 
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
 Patch9: imap-2002e-shared.patch
 Patch10: imap-2002e-authmd5.patch
-Patch11: imap-2006-mixproto.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -54,7 +53,6 @@
 # Prereq is shorter than separate Requires, Requires(post), Requires(postun)
 Prereq: xinetd
 Requires(post): openssl
-Requires(triggerpostun): sed >= 4.0
 
 %description
 The %{name} package provides UW server daemons for both the IMAP (Internet
@@ -112,14 +110,11 @@
 
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
-# use mix (instead of unix/mbox) folder format by default
-# its faster, allows (better) locking
-%patch11 -p1 -b .mixproto
 
-%if "%{?fedora}" > "4" || "%{?rhel}" > "5"
-install -p -m644 %{SOURCE2} imap.pam
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+install -p -m644 %{SOURCE21} imap.pam
 %else
-install -p -m644 %{SOURCE1} imap.pam
+install -p -m644 %{SOURCE22} imap.pam
 %endif
 
 
@@ -155,8 +150,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/
+
+%if "%{?_with_static:1}" == "1"
 install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/
 ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a
+%endif
 
 install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/
 ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so
@@ -182,25 +180,17 @@
 install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/imap
 install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pop
 
-install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap
-install -p -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps
-install -p -m644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2
-install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
-install -p -m644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
+install -p -m644 -D %{SOURCE31} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap
+install -p -m644 -D %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps
+install -p -m644 -D %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2
+install -p -m644 -D %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
+install -p -m644 -D %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
 
-# Generate ghost *.pem files
+# %ghost *.pem files
 mkdir -p $RPM_BUILD_ROOT%{sslcerts}/
 touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem
 
-# c-client.cf: mail_subdirectory
-cat > c-client.cf <<EOF
-I accept the risk of using UW-IMAP
-set mail-subdirectory %{mail_subdirectory}
-EOF
-install -p -m644 -D c-client.cf $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
-
-# include/omit static lib?
-%{!?_with_static:rm -f $RPM_BUILD_ROOT%{_libdir}/*.a }
+install -p -m644 -D %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
 
 # FIXME, do this on daemon startup -- Rex
@@ -234,15 +224,6 @@
 
 %postun -n %{imap_libs} -p /sbin/ldconfig
 
-%triggerpostun -- imap < 1:2004
-#if upgrading from old version, don't change/set (default) MailDir
-if [ -f %{_sysconfdir}/c-client.cf ]; then
-  if grep -q "^set mail-subdirectory %{mail_subdirectory}" %{_sysconfdir}/c-client.cf; then
-    sed -i -e 's/^set mail-subdirectory/\#set mail-subdirectory/g' \
-      %{_sysconfdir}/c-client.cf
-  fi
-fi
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -256,12 +237,11 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
-# These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s will fail after an upgrade
+# These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
 %config %{_sysconfdir}/xinetd.d/imaps
 %config %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
-%config(noreplace) %{_sysconfdir}/c-client.cf
 %{_mandir}/man8/*
 %{_sbindir}/ipop2d
 %{_sbindir}/ipop3d
@@ -277,6 +257,7 @@
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
+%config(noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
@@ -293,6 +274,13 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
+- libc-client: move c-client.cf here
+- c-client.cf: +set new-folder-format same-as-inbox
+
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-2
+- omit mixproto patch (lvn bug #1184)
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-1
 - imap-2006a
 - omit static lib (for now, at least)



From fedora-extras-commits at redhat.com  Wed Oct  4 18:04:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 11:04:13 -0700
Subject: rpms/uw-imap/devel c-client.cf,NONE,1.1
Message-ID: <200610041804.k94I4FSS025196@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25180

Added Files:
	c-client.cf 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
- libc-client: move c-client.cf here
- c-client.cf: +set new-folder-format same-as-inbox



--- NEW FILE c-client.cf ---
I accept the risk of using UW-IMAP
set new-folder-format same-as-inbox
set mail-subdirectory Mail 



From fedora-extras-commits at redhat.com  Wed Oct  4 18:11:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 11:11:55 -0700
Subject: rpms/uw-imap/FC-5 c-client.cf,NONE,1.1 uw-imap.spec,1.11,1.12
Message-ID: <200610041811.k94IBvmj025389@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25371

Modified Files:
	uw-imap.spec 
Added Files:
	c-client.cf 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
- libc-client: move c-client.cf here
- c-client.cf: +set new-folder-format same-as-inbox



--- NEW FILE c-client.cf ---
I accept the risk of using UW-IMAP
set new-folder-format same-as-inbox
set mail-subdirectory Mail 


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- uw-imap.spec	29 Sep 2006 18:02:19 -0000	1.11
+++ uw-imap.spec	4 Oct 2006 18:11:55 -0000	1.12
@@ -1,19 +1,15 @@
 
-# Change the default connected directory from the user's home directory
-# to the named subdirectory of the user's home directory
-%define mail_subdirectory      Mail
-
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source:	 ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -25,27 +21,30 @@
 #define imap_libs	imap-libs
 
 # FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs
-%define sslcerts  %{expand:%(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)}
+%global sslcerts  %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)
 
 # imap -> uw-imap rename
 Obsoletes: imap < 1:%{version}
 
+Source10: c-client.cf
+
 # legacy/old pam setup, using pam_stack.so
-Source1: imap-legacy.pam
+Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source2: imap.pam
-Source3: imap-xinetd
-Source4: ipop2-xinetd
-Source5: ipop3-xinetd
-Source6: imaps-xinetd
-Source7: pop3s-xinetd
+Source22: imap.pam
+
+Source31: imap-xinetd
+Source32: ipop2-xinetd
+Source33: ipop3-xinetd
+Source34: imaps-xinetd
+Source35: pop3s-xinetd
+
 
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
 Patch9: imap-2002e-shared.patch
 Patch10: imap-2002e-authmd5.patch
-Patch11: imap-2006-mixproto.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -54,7 +53,6 @@
 # Prereq is shorter than separate Requires, Requires(post), Requires(postun)
 Prereq: xinetd
 Requires(post): openssl
-Requires(triggerpostun): sed >= 4.0
 
 %description
 The %{name} package provides UW server daemons for both the IMAP (Internet
@@ -112,14 +110,11 @@
 
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
-# use mix (instead of unix/mbox) folder format by default
-# its faster, allows (better) locking
-%patch11 -p1 -b .mixproto
 
-%if "%{?fedora}" > "4" || "%{?rhel}" > "5"
-install -p -m644 %{SOURCE2} imap.pam
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+install -p -m644 %{SOURCE21} imap.pam
 %else
-install -p -m644 %{SOURCE1} imap.pam
+install -p -m644 %{SOURCE22} imap.pam
 %endif
 
 
@@ -155,8 +150,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/
+
+%if "%{?_with_static:1}" == "1"
 install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/
 ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a
+%endif
 
 install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/
 ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so
@@ -182,25 +180,17 @@
 install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/imap
 install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pop
 
-install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap
-install -p -m644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps
-install -p -m644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2
-install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
-install -p -m644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
+install -p -m644 -D %{SOURCE31} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap
+install -p -m644 -D %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps
+install -p -m644 -D %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2
+install -p -m644 -D %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
+install -p -m644 -D %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
 
-# Generate ghost *.pem files
+# %ghost *.pem files
 mkdir -p $RPM_BUILD_ROOT%{sslcerts}/
 touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem
 
-# c-client.cf: mail_subdirectory
-cat > c-client.cf <<EOF
-I accept the risk of using UW-IMAP
-set mail-subdirectory %{mail_subdirectory}
-EOF
-install -p -m644 -D c-client.cf $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
-
-# include/omit static lib?
-%{!?_with_static:rm -f $RPM_BUILD_ROOT%{_libdir}/*.a }
+install -p -m644 -D %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
 
 # FIXME, do this on daemon startup -- Rex
@@ -234,15 +224,6 @@
 
 %postun -n %{imap_libs} -p /sbin/ldconfig
 
-%triggerpostun -- imap < 1:2004
-#if upgrading from old version, don't change/set (default) MailDir
-if [ -f %{_sysconfdir}/c-client.cf ]; then
-  if grep -q "^set mail-subdirectory %{mail_subdirectory}" %{_sysconfdir}/c-client.cf; then
-    sed -i -e 's/^set mail-subdirectory/\#set mail-subdirectory/g' \
-      %{_sysconfdir}/c-client.cf
-  fi
-fi
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -256,12 +237,11 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
-# These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s will fail after an upgrade
+# These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
 %config %{_sysconfdir}/xinetd.d/imaps
 %config %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
-%config(noreplace) %{_sysconfdir}/c-client.cf
 %{_mandir}/man8/*
 %{_sbindir}/ipop2d
 %{_sbindir}/ipop3d
@@ -277,6 +257,7 @@
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
+%config(noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
@@ -293,6 +274,13 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
+- libc-client: move c-client.cf here
+- c-client.cf: +set new-folder-format same-as-inbox
+
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-2
+- omit mixproto patch (lvn bug #1184)
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-1
 - imap-2006a
 - omit static lib (for now, at least)



From fedora-extras-commits at redhat.com  Wed Oct  4 18:17:49 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 11:17:49 -0700
Subject: rpms/xffm/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE sources,
	1.4, NONE xffm-4.0.5-rpath.patch, 1.1,
	NONE xffm-4.2.0-menu.patch, 1.1, NONE xffm-4.2.0-rpath.patch,
	1.1, NONE xffm-4.2.1-static.patch, 1.1,
	NONE xffm-4.2.2-menu.patch, 1.1, NONE xffm-4.2.2-rpath.patch,
	1.1, NONE xffm-4.2.3-menu.patch, 1.1, NONE xffm.spec, 1.14, NONE
Message-ID: <200610041817.k94IHpXj025503@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25485

Added Files:
	dead.package 
Removed Files:
	Makefile sources xffm-4.0.5-rpath.patch xffm-4.2.0-menu.patch 
	xffm-4.2.0-rpath.patch xffm-4.2.1-static.patch 
	xffm-4.2.2-menu.patch xffm-4.2.2-rpath.patch 
	xffm-4.2.3-menu.patch xffm.spec 
Log Message:
Orphan xffm. Current version needs to be removed before Xfce 4.4 landing



--- NEW FILE dead.package ---
No longer in Xfce core. 
Upstream has changed dramatically. 
Package would need to be totally revamped, and perhaps split to the 
17 new packages that upstream produces. 


--- Makefile DELETED ---


--- sources DELETED ---


--- xffm-4.0.5-rpath.patch DELETED ---


--- xffm-4.2.0-menu.patch DELETED ---


--- xffm-4.2.0-rpath.patch DELETED ---


--- xffm-4.2.1-static.patch DELETED ---


--- xffm-4.2.2-menu.patch DELETED ---


--- xffm-4.2.2-rpath.patch DELETED ---


--- xffm-4.2.3-menu.patch DELETED ---


--- xffm.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 19:19:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:19:25 -0700
Subject: rpms/exiv2/devel exiv2-0.11-pkgconfig.patch, 1.1, 1.2 exiv2.spec,
	1.6, 1.7
Message-ID: <200610041919.k94JJRF4028783@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/exiv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28759

Modified Files:
	exiv2-0.11-pkgconfig.patch exiv2.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11-3
- respin


exiv2-0.11-pkgconfig.patch:

Index: exiv2-0.11-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/exiv2-0.11-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exiv2-0.11-pkgconfig.patch	19 Sep 2006 19:06:40 -0000	1.1
+++ exiv2-0.11-pkgconfig.patch	4 Oct 2006 19:19:25 -0000	1.2
@@ -1,12 +1,10 @@
 --- exiv2-0.11/config/exiv2.pc.in.pkgconfig	2006-06-15 02:27:50.000000000 -0500
-+++ exiv2-0.11/config/exiv2.pc.in	2006-09-19 13:54:00.000000000 -0500
-@@ -6,6 +6,7 @@
- Name: exiv2
++++ exiv2-0.11/config/exiv2.pc.in	2006-10-02 09:32:32.000000000 -0500
+@@ -7,5 +7,6 @@
  Description: Exif and IPTC metadata library and tools
  Version: @PACKAGE_VERSION@
--URL: http://www.exiv2.org
+ URL: http://www.exiv2.org
 -Libs: -L${libdir} -lexiv2 @LIBS@
-+#URL: http://www.exiv2.org
 +Libs: -L${libdir} -lexiv2
 +Libs.private: @LIBS@
  Cflags: -I${includedir}


Index: exiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- exiv2.spec	19 Sep 2006 19:21:34 -0000	1.6
+++ exiv2.spec	4 Oct 2006 19:19:25 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
 Version: 0.11
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -14,6 +14,7 @@
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
+# http://dev.robotbattle.com/bugs/view.php?id=489
 Patch3: exiv2-0.11-pkgconfig.patch
 
 
@@ -96,6 +97,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11-3
+- respin
+
 * Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11-2
 - BR: zlib-devel
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:20:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:20:46 -0700
Subject: rpms/libpqxx/devel libpqxx.spec,1.10,1.11
Message-ID: <200610041920.k94JKm7c028855@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28838

Modified Files:
	libpqxx.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-2 
- respin



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libpqxx.spec	20 Sep 2006 19:09:14 -0000	1.10
+++ libpqxx.spec	4 Oct 2006 19:20:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libpqxx
 Version:        2.6.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -36,7 +36,7 @@
 %setup -q
 
 %if "%{?fedora}" > "5"
-%patch1 -p1 -b .visibility
+#patch1 -p1 -b .visibility
 %endif
 
 %build
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-2 
+- respin
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-1
 - fc6+: drop -Werror (for now) 
 - include %%check section (not used, by default)



From fedora-extras-commits at redhat.com  Wed Oct  4 19:21:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:21:43 -0700
Subject: rpms/jasper/devel jasper.spec,1.16,1.17
Message-ID: <200610041921.k94JLjcu028925@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28908

Modified Files:
	jasper.spec 
Log Message:
respin



Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jasper.spec	18 Sep 2006 20:49:57 -0000	1.16
+++ jasper.spec	4 Oct 2006 19:21:42 -0000	1.17
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 15%{?dist}
+Release: 15%{?dist}.2
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"
@@ -37,11 +37,8 @@
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -124,6 +121,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
 - memory leak (#207006)
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:22:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:22:26 -0700
Subject: rpms/wxMaxima/devel wxMaxima.spec,1.3,1.4
Message-ID: <200610041922.k94JMSLp028986@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28969

Modified Files:
	wxMaxima.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- respin



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wxMaxima.spec	25 Sep 2006 16:41:48 -0000	1.3
+++ wxMaxima.spec	4 Oct 2006 19:22:26 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a
 - Requires: maxima >= 5.10



From fedora-extras-commits at redhat.com  Wed Oct  4 19:23:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:23:38 -0700
Subject: rpms/kphotoalbum/devel kphotoalbum.spec,1.5,1.6
Message-ID: <200610041923.k94JNeol029047@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kphotoalbum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29030

Modified Files:
	kphotoalbum.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.2-6
- respin
- drop deprecated Provides: kimdaba



Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kphotoalbum.spec	19 Sep 2006 19:28:07 -0000	1.5
+++ kphotoalbum.spec	4 Oct 2006 19:23:38 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -11,7 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kimdaba < %{version}
-Provides:  kimdaba = %{version}
+#Provides:  kimdaba = %{version}
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -109,6 +109,10 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.2-6
+- respin
+- drop deprecated Provides: kimdaba
+
 * Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.2-5
 - BR: exiv2-devel >= 0.11
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:37:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:37:03 -0700
Subject: rpms/libpqxx/devel libpqxx.spec,1.11,1.12
Message-ID: <200610041937.k94Jb5Tb029165@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29148

Modified Files:
	libpqxx.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-3
- respin



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libpqxx.spec	4 Oct 2006 19:20:46 -0000	1.11
+++ libpqxx.spec	4 Oct 2006 19:37:03 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libpqxx
 Version:        2.6.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
@@ -36,7 +36,7 @@
 %setup -q
 
 %if "%{?fedora}" > "5"
-#patch1 -p1 -b .visibility
+%patch1 -p1 -b .visibility
 %endif
 
 %build
@@ -78,7 +78,7 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-2 
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-3
 - respin
 
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.6.8-1



From fedora-extras-commits at redhat.com  Wed Oct  4 19:37:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:37:49 -0700
Subject: rpms/PyKDE/devel PyKDE.spec,1.4,1.5
Message-ID: <200610041937.k94Jbp0b029232@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29214

Modified Files:
	PyKDE.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.16.0-2 
- respin



Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PyKDE.spec	26 Sep 2006 20:19:02 -0000	1.4
+++ PyKDE.spec	4 Oct 2006 19:37:49 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.16.0-2 
+- respin
+
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.16.0-1
 - 3.16.0
 - no longer own %%_datadir/sip, sip-devel does now (#206633)



From fedora-extras-commits at redhat.com  Wed Oct  4 19:38:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:38:54 -0700
Subject: rpms/koffice/devel koffice.spec,1.41,1.42
Message-ID: <200610041938.k94Jcv64029306@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29289

Modified Files:
	koffice.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- 1.5.3-3
- respin



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- koffice.spec	20 Sep 2006 19:34:48 -0000	1.41
+++ koffice.spec	4 Oct 2006 19:38:54 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -786,6 +786,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- 1.5.3-3
+- respin
+
 * Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - 1.5.2-2
 - drop deprecated patches



From fedora-extras-commits at redhat.com  Wed Oct  4 19:42:57 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:42:57 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.11, 1.12 gnupg2.spec, 1.45,
	1.46 sources, 1.12, 1.13
Message-ID: <200610041942.k94Jgxhr029405@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29384

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-8
- respin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 20:16:09 -0000	1.11
+++ .cvsignore	4 Oct 2006 19:42:57 -0000	1.12
@@ -1,2 +1,3 @@
 gnupg-1.9.23.tar.bz2
 gnupg-1.9.23.tar.bz2.sig
+gnupg-1.9.91.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnupg2.spec	26 Sep 2006 20:16:09 -0000	1.45
+++ gnupg2.spec	4 Oct 2006 19:42:57 -0000	1.46
@@ -11,16 +11,13 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.23
-Release: 1%{?dist}
+Version: 1.9.22
+Release: 8%{?dist}
 
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
-#use mirror(s), since the primary site hardly ever works anymore
-#Source0: http://mirrors.rootmode.com/ftp.gnupg.org/alpha/gnupg/gnupg-%{version}.tar.bz2
-#Source1: http://mirrors.rootmode.com/ftp.gnupg.org/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +38,7 @@
 BuildRequires: libksba-devel >= 1.0.0
 
 BuildRequires: gettext
+BuildRequires: readline-devel ncurses-devel
 BuildRequires: openldap-devel
 BuildRequires: libusb-devel
 BuildRequires: pth-devel
@@ -100,7 +98,8 @@
   --disable-dependency-tracking \
   %{?_enable_gpg}
 
-make %{?_smp_mflags}
+# not smp-safe
+make 
 
 
 %check ||:
@@ -167,8 +166,14 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-8
+- respin
+
+* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.90-1
+- 1.9.90 (doesn't build, not released)
+
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.23-1
-- 1.9.23
+- 1.9.23 (doesn't build, not released)
 
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-7
 - gpg-agent-startup.sh: fix case where valid .gpg-agent-info exists


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Sep 2006 20:16:09 -0000	1.12
+++ sources	4 Oct 2006 19:42:57 -0000	1.13
@@ -1,2 +1,3 @@
+ccea28fbab26bcb01890f2687d71f900  gnupg-1.9.22.tar.bz2
+02ef9a70cfa097cfe11b33600adc2b72  gnupg-1.9.22.tar.bz2.sig
 916de7ac125b31c5df517c068ac51ecf  gnupg-1.9.23.tar.bz2.sig
-8d6208943862e4e654d326b24d96e2ae  gnupg-1.9.23.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 19:44:29 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed,  4 Oct 2006 12:44:29 -0700
Subject: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec, 1.11,
	1.12
Message-ID: <200610041944.k94JiVYR029477@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29456

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8 
- respin



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdemultimedia-extras.spec	26 Sep 2006 18:58:40 -0000	1.11
+++ kdemultimedia-extras.spec	4 Oct 2006 19:44:29 -0000	1.12
@@ -67,7 +67,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.4
-Release: 7%{?dist}%{?kde}
+Release: 8%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -469,6 +469,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8 
+- respin
+
 * Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
 - -extras: drop --with-musicbrainz (for now)
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:48:21 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 12:48:21 -0700
Subject: rpms/banner/devel banner.spec,1.3,1.4
Message-ID: <200610041948.k94JmNop029556@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/banner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29539

Modified Files:
	banner.spec 
Log Message:

Bump-n-build



Index: banner.spec
===================================================================
RCS file: /cvs/extras/rpms/banner/devel/banner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- banner.spec	19 Sep 2006 11:35:29 -0000	1.3
+++ banner.spec	4 Oct 2006 19:48:21 -0000	1.4
@@ -2,7 +2,7 @@
 Summary:		Prints a short string to the console in very large letters
 
 Version:		1.3.1
-Release:		3%{?dist}
+Release:		4%{?dist}
 
 Group:			Applications/Text
 License:		GPL
@@ -37,6 +37,9 @@
 %{_bindir}/banner
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.3.1-4
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.3.1-3
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:49:24 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 12:49:24 -0700
Subject: rpms/libdnet/devel libdnet.spec,1.3,1.4
Message-ID: <200610041949.k94JnQJ5029622@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/libdnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29602

Modified Files:
	libdnet.spec 
Log Message:

Bump-n-build



Index: libdnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libdnet/devel/libdnet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libdnet.spec	19 Sep 2006 15:01:34 -0000	1.3
+++ libdnet.spec	4 Oct 2006 19:49:24 -0000	1.4
@@ -2,7 +2,7 @@
 Name:		libdnet
 
 Version:	1.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	BSD-like
 Group:		System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.11-2
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.11-1
 - I should have checked for updates first
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:50:08 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 12:50:08 -0700
Subject: rpms/libstatgrab/devel libstatgrab.spec,1.5,1.6
Message-ID: <200610041950.k94JoAMl029645@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/libstatgrab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29628

Modified Files:
	libstatgrab.spec 
Log Message:

Bump-n-build



Index: libstatgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/devel/libstatgrab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libstatgrab.spec	19 Sep 2006 14:21:32 -0000	1.5
+++ libstatgrab.spec	4 Oct 2006 19:50:08 -0000	1.6
@@ -4,7 +4,7 @@
 Name:			libstatgrab
 
 Version:		0.13
-Release:		2%{?dist}
+Release:		3%{?dist}
 
 Source0:		http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}.nochmod.patch
@@ -127,6 +127,9 @@
 %{_bindir}/vm_stats
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.13-3
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 0.13-2
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 19:53:01 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 12:53:01 -0700
Subject: rpms/ngrep/devel ngrep.spec,1.4,1.5
Message-ID: <200610041953.k94Jr3KG029677@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/ngrep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29660

Modified Files:
	ngrep.spec 
Log Message:

Bump-n-build



Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/ngrep.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ngrep.spec	19 Sep 2006 11:39:55 -0000	1.4
+++ ngrep.spec	4 Oct 2006 19:53:01 -0000	1.5
@@ -5,7 +5,7 @@
 Summary:			Network layer grep tool
 
 Version:			1.44
-Release:			6%{?dist}
+Release:			7%{?dist}
 
 Group:				Applications/Internet
 License:			BSD-like
@@ -56,6 +56,9 @@
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.44-7
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.44-6
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 20:00:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 13:00:19 -0700
Subject: rpms/scanssh/devel scanssh.spec,1.4,1.5
Message-ID: <200610042000.k94K0Lcr029836@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/scanssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29815

Modified Files:
	scanssh.spec 
Log Message:

Bump-n-build



Index: scanssh.spec
===================================================================
RCS file: /cvs/extras/rpms/scanssh/devel/scanssh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scanssh.spec	19 Sep 2006 11:53:14 -0000	1.4
+++ scanssh.spec	4 Oct 2006 20:00:19 -0000	1.5
@@ -2,7 +2,7 @@
 Summary:		Fast SSH server and open proxy scanner
 
 Version:		2.1
-Release:		8%{?dist}
+Release:		9%{?dist}
 
 Group:			Applications/Internet
 License:		BSD
@@ -45,6 +45,9 @@
 %{_mandir}/man1/scanssh*
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.1-9
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 2.1-8
 - I suppose I need to port this one to FC6 now, huh?
 



From fedora-extras-commits at redhat.com  Wed Oct  4 20:01:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 13:01:02 -0700
Subject: rpms/bwm-ng/devel bwm-ng.spec,1.3,1.4
Message-ID: <200610042001.k94K14bn032274@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/bwm-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29842

Modified Files:
	bwm-ng.spec 
Log Message:

Bump-n-build



Index: bwm-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/bwm-ng/devel/bwm-ng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bwm-ng.spec	19 Sep 2006 11:38:32 -0000	1.3
+++ bwm-ng.spec	4 Oct 2006 20:01:02 -0000	1.4
@@ -4,7 +4,7 @@
 Name:			bwm-ng
 
 Version:		0.5
-Release:		7%{?dist}
+Release:		8%{?dist}
 
 License:		GPL
 Group:			Applications/System
@@ -54,6 +54,9 @@
 %{_mandir}/man1/bwm-ng.1*
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.5-8
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 0.5-7
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 20:02:17 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 13:02:17 -0700
Subject: rpms/rblcheck/devel rblcheck.spec,1.4,1.5
Message-ID: <200610042002.k94K2JBm032689@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/rblcheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32670

Modified Files:
	rblcheck.spec 
Log Message:

Bump-n-build



Index: rblcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/rblcheck/devel/rblcheck.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rblcheck.spec	19 Sep 2006 11:41:23 -0000	1.4
+++ rblcheck.spec	4 Oct 2006 20:02:17 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:	Command-line interface to RBL-style listings
 
 Version:	1.5
-Release:	11%{?dist}
+Release:	12%{?dist}
 
 Source0:	http://dl.sf.net/rblcheck/rblcheck-%{version}.tar.gz
 Source1:	rblcheckrc
@@ -69,6 +69,9 @@
 %config(noreplace) %{_sysconfdir}/rblcheckrc
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.5-12
+- Bump-n-build
+
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.5-11
 - Bump for FC6 rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 20:23:41 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed,  4 Oct 2006 13:23:41 -0700
Subject: rpms/xfce4-taskbar-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-taskbar-plugin.spec, 1.4, NONE
Message-ID: <200610042023.k94KNh34000446@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv430

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-taskbar-plugin.spec 
Log Message:
orphaning taskbar-plugin for Core 6


--- NEW FILE dead.package ---
Functionality of the taskbar-plugin has been integrated into xfce4-panel
in XFCE 4.4, this package ist officially orphanded upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-taskbar-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 20:27:26 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed,  4 Oct 2006 13:27:26 -0700
Subject: rpms/xfce4-windowlist-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-windowlist-plugin.spec, 1.4, NONE
Message-ID: <200610042027.k94KRS4p000514@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv498

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-windowlist-plugin.spec 
Log Message:
orphaning windowlist-plugin for Core 6


--- NEW FILE dead.package ---
Functionality of the windowlist-plugin has been integrated into xfce4-panel
in XFCE 4.4, this package ist officially orphanded upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-windowlist-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 20:30:36 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed,  4 Oct 2006 13:30:36 -0700
Subject: fedora-security/audit fc5,1.344,1.345 fc6,1.99,1.100
Message-ID: <200610042030.k94KUaBx000584@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv564

Modified Files:
	fc5 fc6 
Log Message:
Note a new nss_ldap issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- fc5	4 Oct 2006 08:55:08 -0000	1.344
+++ fc5	4 Oct 2006 20:30:32 -0000	1.345
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fc6	4 Oct 2006 08:55:08 -0000	1.99
+++ fc6	4 Oct 2006 20:30:32 -0000	1.100
@@ -4,6 +4,7 @@
 
 ** are items that need attention
 
+CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel



From fedora-extras-commits at redhat.com  Wed Oct  4 20:34:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed,  4 Oct 2006 13:34:53 -0700
Subject: rpms/xfce4-datetime-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-datetime-plugin.spec, 1.5, NONE
Message-ID: <200610042034.k94KYtOj000627@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv611

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-datetime-plugin.spec 
Log Message:
orphaning datetime-plugin for Core 6


--- NEW FILE dead.package ---
Functionality of the datetime-plugin has been integrated into xfce4-panel
in XFCE 4.4, this package ist officially orphanded upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-datetime-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct  4 21:05:30 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed,  4 Oct 2006 14:05:30 -0700
Subject: rpms/htop/devel .cvsignore, 1.6, 1.7 htop.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <200610042105.k94L5WNB003573@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3552

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
Update to 0.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Jul 2006 16:13:31 -0000	1.6
+++ .cvsignore	4 Oct 2006 21:05:29 -0000	1.7
@@ -1 +1 @@
-htop-0.6.3.tar.gz
+htop-0.6.4.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- htop.spec	16 Sep 2006 18:19:53 -0000	1.9
+++ htop.spec	4 Oct 2006 21:05:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           htop
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.4-1
+- Update to 0.6.4
+
 * Sat Sep 16 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.3-2
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Jul 2006 16:13:31 -0000	1.7
+++ sources	4 Oct 2006 21:05:29 -0000	1.8
@@ -1 +1 @@
-51255f2b3632888e7de511a5a47dd785  htop-0.6.3.tar.gz
+989905bb2559cf6404c1b8e8ffa48b15  htop-0.6.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 21:07:47 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed,  4 Oct 2006 14:07:47 -0700
Subject: rpms/htop/FC-5 .cvsignore, 1.6, 1.7 htop.spec, 1.8, 1.9 sources, 1.7,
	1.8
Message-ID: <200610042107.k94L7n7L003672@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3651

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
Update to 0.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Jul 2006 20:24:31 -0000	1.6
+++ .cvsignore	4 Oct 2006 21:07:46 -0000	1.7
@@ -1 +1 @@
-htop-0.6.3.tar.gz
+htop-0.6.4.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-5/htop.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- htop.spec	30 Jul 2006 20:24:31 -0000	1.8
+++ htop.spec	4 Oct 2006 21:07:46 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           htop
-Version:        0.6.3
+Version:        0.6.4
 Release:        1%{?dist}
 Summary:        Interactive process viewer
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.4-1
+- Update to 0.6.4
+
 * Sun Jul 30 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.3-1
 - Update to 0.6.3
 - Correct e-mail address in ChangeLog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Jul 2006 20:24:31 -0000	1.7
+++ sources	4 Oct 2006 21:07:46 -0000	1.8
@@ -1 +1 @@
-51255f2b3632888e7de511a5a47dd785  htop-0.6.3.tar.gz
+989905bb2559cf6404c1b8e8ffa48b15  htop-0.6.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 21:13:41 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 14:13:41 -0700
Subject: rpms/libdnet/devel libdnet.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610042113.k94LDhv4003825@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/libdnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3805

Modified Files:
	libdnet.spec sources 
Log Message:

Reverting to 1.10; 1.11 has some serious issues
(Epoch bump not needed because 1.11 never successfully built.)



Index: libdnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libdnet/devel/libdnet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libdnet.spec	4 Oct 2006 19:49:24 -0000	1.4
+++ libdnet.spec	4 Oct 2006 21:13:41 -0000	1.5
@@ -1,14 +1,14 @@
 Summary:	Simple portable interface to lowlevel networking routines
 Name:		libdnet
 
-Version:	1.11
-Release:	2%{?dist}
+Version:	1.10
+Release:	4%{?dist}
 
 License:	BSD-like
 Group:		System Environment/Libraries
 URL:		http://libdnet.sf.net/
 
-Source:		http://dl.sf.net/libdnet/libdnet-%{version}.tar.gz
+Source:		http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -75,11 +75,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
-* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.11-2
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.10-4
 - Bump-n-build
-
-* Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.11-1
-- I should have checked for updates first
+- Reverted to 1.10; 1.11 has some serious issues
 
 * Tue Sep 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 1.10-3
 - Bump for FC6 rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdnet/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2006 15:01:34 -0000	1.3
+++ sources	4 Oct 2006 21:13:41 -0000	1.4
@@ -1 +1 @@
-04c394ed8e1e7fc455456e79e908916d  libdnet-1.11.tar.gz
+416b765e9d9961501ac85e9a366fd219  libdnet-1.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct  4 21:35:44 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed,  4 Oct 2006 14:35:44 -0700
Subject: rpms/graphviz/devel graphviz.spec,1.27,1.28
Message-ID: <200610042135.k94LZkL8004091@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/graphviz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4072

Modified Files:
	graphviz.spec 
Log Message:

Bump-n-build



Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- graphviz.spec	18 Sep 2006 01:59:11 -0000	1.27
+++ graphviz.spec	4 Oct 2006 21:35:44 -0000	1.28
@@ -1,7 +1,8 @@
 # $Id$ $Revision$
 # graphviz.spec.  Generated from graphviz.spec.in by configure.
 
-# Keeping one conditional because I can't figure out what it's looking for!
+# Io is disabled because it's not (yet?) found in Fedora.
+# http://www.iolanguage.com/about/
 # - Jima
 %define _IO 0
 
@@ -11,7 +12,7 @@
 Summary:	Graph Visualization Tools
 Name:		graphviz
 Version:	2.8
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/Multimedia
 License:	CPL
 URL:		http://www.graphviz.org/
@@ -277,6 +278,9 @@
 if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
 
 %changelog
+* Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.8-5
+- Bump-n-build
+
 * Thu Sep 14 2006 Patrick "Jima" Laughton <jima at beer.tclug.org>	- 2.8-4
 - Fixing BZ#188148 & BZ#184171
 - Dropped the unified spec file logic; it complicated matters unnecessarily



From fedora-extras-commits at redhat.com  Wed Oct  4 21:56:00 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 14:56:00 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.1,1.2
Message-ID: <200610042156.k94Lu2HA004258@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4241

Modified Files:
	sysprof-kmod.spec 
Log Message:
fix kernel version string for -devel



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysprof-kmod.spec	4 Oct 2006 16:27:26 -0000	1.1
+++ sysprof-kmod.spec	4 Oct 2006 21:56:00 -0000	1.2
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2689.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:06:18 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 15:06:18 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.2,1.3
Message-ID: <200610042206.k94M6KgW007244@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7216

Modified Files:
	sysprof-kmod.spec 
Log Message:
Remove (not supported) ppc arch



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sysprof-kmod.spec	4 Oct 2006 21:56:00 -0000	1.2
+++ sysprof-kmod.spec	4 Oct 2006 22:06:18 -0000	1.3
@@ -41,7 +41,7 @@
 
 Patch0:         %{kmod_name}-avoid_depmod.patch
 
-ExclusiveArch:  i586 i686 x86_64 ppc
+ExclusiveArch:  i586 i686 x86_64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Oct  4 22:08:01 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 15:08:01 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.3,1.4
Message-ID: <200610042208.k94M83bQ007432@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7415

Modified Files:
	sysprof-kmod.spec 
Log Message:
bump EVR



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sysprof-kmod.spec	4 Oct 2006 22:06:18 -0000	1.3
+++ sysprof-kmod.spec	4 Oct 2006 22:08:01 -0000	1.4
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.3
-Release:        1.%(echo %{kverrel} | tr - _)
+Release:        2.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
+- Remove ppc arch
+
 * Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
 - version update
 - fixed rpmlint warning about summary 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:10:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:10:05 -0700
Subject: rpms/perl-Spreadsheet-ParseExcel/devel
	perl-Spreadsheet-ParseExcel.spec, 1.2, 1.3
Message-ID: <200610042210.k94MA74j007543@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Spreadsheet-ParseExcel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7526

Modified Files:
	perl-Spreadsheet-ParseExcel.spec 
Log Message:
automated bump and rebuild


Index: perl-Spreadsheet-ParseExcel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-ParseExcel/devel/perl-Spreadsheet-ParseExcel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Spreadsheet-ParseExcel.spec	26 Sep 2006 21:54:04 -0000	1.2
+++ perl-Spreadsheet-ParseExcel.spec	4 Oct 2006 22:10:05 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           perl-Spreadsheet-ParseExcel
 Version:        0.2603
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Get information from an Excel file
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.2603-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Steven Pritchard <steve at kspei.com> 0.2603-2
 - Fix find option order.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:12:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:12:48 -0700
Subject: rpms/perl-Imager/devel perl-Imager.spec,1.4,1.5
Message-ID: <200610042212.k94MCo69007609@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Imager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7592

Modified Files:
	perl-Imager.spec 
Log Message:
automated bump and rebuild


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/devel/perl-Imager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Imager.spec	26 Sep 2006 21:43:12 -0000	1.4
+++ perl-Imager.spec	4 Oct 2006 22:12:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Imager
 Version:        0.54
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Imager - Perl extension for Generating 24 bit Images
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.54-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Steven Pritchard <steve at kspei.com> 0.54-1
 - Update to 0.54.
 - Fix find option order.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:13:13 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:13:13 -0700
Subject: rpms/fftw/devel fftw.spec,1.17,1.18
Message-ID: <200610042213.k94MDFFM007673@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fftw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7656

Modified Files:
	fftw.spec 
Log Message:
automated bump and rebuild


Index: fftw.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw/devel/fftw.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fftw.spec	26 Sep 2006 20:04:05 -0000	1.17
+++ fftw.spec	4 Oct 2006 22:13:13 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fftw
 Version:        3.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
@@ -116,6 +116,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.2-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Quentin Spencer <qspencer at users.sf.net> 3.1.2-2
 - BuildRequires: pkgconfig for -devel (bug 206444).
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:13:38 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:13:38 -0700
Subject: rpms/seq24/devel seq24.spec,1.1,1.2
Message-ID: <200610042213.k94MDe1c007737@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/seq24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7720

Modified Files:
	seq24.spec 
Log Message:
automated bump and rebuild


Index: seq24.spec
===================================================================
RCS file: /cvs/extras/rpms/seq24/devel/seq24.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seq24.spec	26 Sep 2006 18:12:59 -0000	1.1
+++ seq24.spec	4 Oct 2006 22:13:38 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:      Real-time midi sequencer
 Name:         seq24
 Version:      0.8.7
-Release:      5%{?dist}
+Release:      6%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 URL:          http://www.filter24.org/seq24/
@@ -65,6 +65,9 @@
 %{_datadir}/icons/hicolor/64x64/apps/seq24.png
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.8.7-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Anthony Green <green at redhat.com> 0.8.7-5
 - Rename "dump" to "seq-dump".
 - Simplify description.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:14:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:14:03 -0700
Subject: rpms/ss5/devel ss5.spec,1.2,1.3
Message-ID: <200610042214.k94ME5IR007801@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ss5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784

Modified Files:
	ss5.spec 
Log Message:
automated bump and rebuild


Index: ss5.spec
===================================================================
RCS file: /cvs/extras/rpms/ss5/devel/ss5.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ss5.spec	26 Sep 2006 17:45:49 -0000	1.2
+++ ss5.spec	4 Oct 2006 22:14:03 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.5.9
-Release: 2 
+Release: 3 
 License: GPL 
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
@@ -69,6 +69,9 @@
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.5.9-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 *Tue Sep  26 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.5.9-2 released
         * Rebuild for FC-6



From fedora-extras-commits at redhat.com  Wed Oct  4 22:14:28 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:14:28 -0700
Subject: rpms/grace/devel grace.spec,1.13,1.14
Message-ID: <200610042214.k94MEUGT007865@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7848

Modified Files:
	grace.spec 
Log Message:
automated bump and rebuild


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- grace.spec	26 Sep 2006 17:28:53 -0000	1.13
+++ grace.spec	4 Oct 2006 22:14:28 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           grace
 Version:        5.1.20
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 5.1.20-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.20-5
 - Fix incomplete change from pixmap to icons.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:14:53 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:14:53 -0700
Subject: rpms/libetpan/devel libetpan.spec,1.12,1.13
Message-ID: <200610042214.k94MEtVi007929@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libetpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7912

Modified Files:
	libetpan.spec 
Log Message:
automated bump and rebuild


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libetpan.spec	26 Sep 2006 16:26:23 -0000	1.12
+++ libetpan.spec	4 Oct 2006 22:14:53 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           libetpan
 Version:        0.46
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
 Group:          System Environment/Libraries
@@ -65,6 +65,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.46-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.46-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct  4 22:15:17 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:15:17 -0700
Subject: rpms/gstreamer-python/devel gstreamer-python.spec,1.13,1.14
Message-ID: <200610042215.k94MFJeo007995@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gstreamer-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7978

Modified Files:
	gstreamer-python.spec 
Log Message:
automated bump and rebuild


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gstreamer-python.spec	26 Sep 2006 14:50:22 -0000	1.13
+++ gstreamer-python.spec	4 Oct 2006 22:15:17 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:           %{gstreamer}-python
 Version:        0.10.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
@@ -68,6 +68,9 @@
 %{_libdir}/pkgconfig/gst-python-%{majorminor}.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.10.5-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Denis Leroy <denis at poolshark.org> - 0.10.5-1
 - Update to 0.10.5
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:15:42 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:15:42 -0700
Subject: rpms/gcin/devel gcin.spec,1.8,1.9
Message-ID: <200610042215.k94MFixG008059@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8042

Modified Files:
	gcin.spec 
Log Message:
automated bump and rebuild


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gcin.spec	26 Sep 2006 14:36:38 -0000	1.8
+++ gcin.spec	4 Oct 2006 22:15:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2.6-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.6-1
 - update to 1.2.6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:16:07 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:16:07 -0700
Subject: rpms/dap-server/devel dap-server.spec,1.18,1.19
Message-ID: <200610042216.k94MG9DW008125@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dap-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8108

Modified Files:
	dap-server.spec 
Log Message:
automated bump and rebuild


Index: dap-server.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dap-server.spec	26 Sep 2006 09:10:02 -0000	1.18
+++ dap-server.spec	4 Oct 2006 22:16:07 -0000	1.19
@@ -8,7 +8,7 @@
 Summary:         Basic request handling for OPeNDAP servers 
 Name:            dap-server
 Version:         3.7.1
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.1-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Patrice Dumas <pertusus at free.fr> 3.7.1-2
 - install cgi files according to the FHS, owned by root
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:16:32 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:16:32 -0700
Subject: rpms/adns/devel adns.spec,1.9,1.10
Message-ID: <200610042216.k94MGYho008189@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8172

Modified Files:
	adns.spec 
Log Message:
automated bump and rebuild


Index: adns.spec
===================================================================
RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- adns.spec	26 Sep 2006 07:05:55 -0000	1.9
+++ adns.spec	4 Oct 2006 22:16:32 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		adns
 Version:	1.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 
 Summary:	Advanced, easy to use, asynchronous-capable DNS client library
 
@@ -110,6 +110,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Radek Vokal <rvokal at redhat.com> 1.2-4
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:16:57 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:16:57 -0700
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.1,1.2
Message-ID: <200610042216.k94MGxjl008253@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gtk-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8236

Modified Files:
	gtk-sharp.spec 
Log Message:
automated bump and rebuild


Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-sharp.spec	25 Sep 2006 21:00:08 -0000	1.1
+++ gtk-sharp.spec	4 Oct 2006 22:16:57 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPL
@@ -109,6 +109,9 @@
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.10-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0.10-10
 - some chmods for executables and text files
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:17:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:17:22 -0700
Subject: rpms/xchm/devel xchm.spec,1.6,1.7
Message-ID: <200610042217.k94MHOrp008317@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/xchm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8300

Modified Files:
	xchm.spec 
Log Message:
automated bump and rebuild


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchm.spec	25 Sep 2006 20:18:59 -0000	1.6
+++ xchm.spec	4 Oct 2006 22:17:22 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
 Version:        1.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPL
 Group:          Applications/Publishing
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
@@ -67,6 +67,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.9-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 Patrice Dumas <pertusus at free.fr> 1.9-5
 - install the icon for the chm file type
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:17:46 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:17:46 -0700
Subject: rpms/monodoc/devel monodoc.spec,1.15,1.16
Message-ID: <200610042217.k94MHmD0008381@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/monodoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8364

Modified Files:
	monodoc.spec 
Log Message:
automated bump and rebuild


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- monodoc.spec	25 Sep 2006 19:57:55 -0000	1.15
+++ monodoc.spec	4 Oct 2006 22:17:46 -0000	1.16
@@ -9,7 +9,7 @@
 Summary: The mono documentation system
 Name: monodoc
 Version: 1.1.17
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -67,6 +67,9 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.1.17-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-5
 - added libdir def to configure line
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:18:11 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:18:11 -0700
Subject: rpms/lash/devel lash.spec,1.6,1.7
Message-ID: <200610042218.k94MIDY5008451@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8434

Modified Files:
	lash.spec 
Log Message:
automated bump and rebuild


Index: lash.spec
===================================================================
RCS file: /cvs/extras/rpms/lash/devel/lash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lash.spec	25 Sep 2006 15:37:50 -0000	1.6
+++ lash.spec	4 Oct 2006 22:18:11 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:      LASH Audio Session Handler
 Name:         lash
 Version:      0.5.1
-Release:      9%{?dist}
+Release:      10%{?dist}
 License:      GPL
 Group:        System Environment/Libraries
 URL:          http://www.nongnu.org/lash/
@@ -135,6 +135,9 @@
 %{_libdir}/pkgconfig/lash*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.1-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 Anthony Green <green at redhat.com> 0.5.1-9
 - Update -texi-dir patch.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:18:36 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:18:36 -0700
Subject: rpms/exim/devel exim.spec,1.31,1.32
Message-ID: <200610042218.k94MIcJq008517@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8500

Modified Files:
	exim.spec 
Log Message:
automated bump and rebuild


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- exim.spec	25 Sep 2006 13:53:35 -0000	1.31
+++ exim.spec	4 Oct 2006 22:18:36 -0000	1.32
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.63
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -394,6 +394,9 @@
 %endif
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 4.63-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 David Woodhouse <dwmw2 at infradead.org> - 4.63-4
 - Set home_directory on lmtp_transport by default
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:19:01 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:19:01 -0700
Subject: rpms/gpsim/devel gpsim.spec,1.10,1.11
Message-ID: <200610042219.k94MJ3ob008581@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gpsim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8564

Modified Files:
	gpsim.spec 
Log Message:
automated bump and rebuild


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gpsim.spec	23 Sep 2006 17:09:55 -0000	1.10
+++ gpsim.spec	4 Oct 2006 22:19:01 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.21.11
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -82,6 +82,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.21.11-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.21.11-8
   - Add patch to fix a ktechlab crash, a ktechlab upstream contribution
     See http://ktechlab.org/download/gpsim.php



From fedora-extras-commits at redhat.com  Wed Oct  4 22:19:26 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:19:26 -0700
Subject: rpms/k3d/devel k3d.spec,1.6,1.7
Message-ID: <200610042219.k94MJSGw008645@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8628

Modified Files:
	k3d.spec 
Log Message:
automated bump and rebuild


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- k3d.spec	24 Sep 2006 22:12:31 -0000	1.6
+++ k3d.spec	4 Oct 2006 22:19:25 -0000	1.7
@@ -1,7 +1,7 @@
 
 Name:           k3d
 Version:        0.6.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.6.2.0-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 24 2006 Denis Leroy <denis at poolshark.org> - 0.6.2.0-1
 - Update to 0.6.2.0
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:19:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:19:50 -0700
Subject: rpms/gossip/devel gossip.spec,1.29,1.30
Message-ID: <200610042219.k94MJqUq008709@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8692

Modified Files:
	gossip.spec 
Log Message:
automated bump and rebuild


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gossip.spec	24 Sep 2006 18:54:23 -0000	1.29
+++ gossip.spec	4 Oct 2006 22:19:50 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           gossip
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.17-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 24 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.17-1
 - Update to 0.17.
 - Drop ChangeLog, since NEWS file is already packaged.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:20:15 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:20:15 -0700
Subject: rpms/nexuiz/devel nexuiz.spec,1.16,1.17
Message-ID: <200610042220.k94MKHTx008777@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/nexuiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8760

Modified Files:
	nexuiz.spec 
Log Message:
automated bump and rebuild


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nexuiz.spec	24 Sep 2006 17:29:26 -0000	1.16
+++ nexuiz.spec	4 Oct 2006 22:20:15 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 24 2006 Adrian Reber <adrian at lisas.de> - 2.1-1
 - updated to 2.1
 - removed basedir patch; now using a environment variable



From fedora-extras-commits at redhat.com  Wed Oct  4 22:20:39 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:20:39 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.1,1.2
Message-ID: <200610042220.k94MKfHN008841@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8824

Modified Files:
	eds-feed.spec 
Log Message:
automated bump and rebuild


Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eds-feed.spec	24 Sep 2006 13:17:21 -0000	1.1
+++ eds-feed.spec	4 Oct 2006 22:20:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -48,5 +48,8 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
 - Intial FE spec.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:21:04 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:21:04 -0700
Subject: rpms/kdiff3/devel kdiff3.spec,1.1,1.2
Message-ID: <200610042221.k94ML6hl008905@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/kdiff3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8888

Modified Files:
	kdiff3.spec 
Log Message:
automated bump and rebuild


Index: kdiff3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdiff3.spec	23 Sep 2006 20:18:56 -0000	1.1
+++ kdiff3.spec	4 Oct 2006 22:21:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           kdiff3
 Version:        0.9.90
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.90-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Aug 27 2006 Neal Becker <ndbecker2 at gmail.com> - 0.9.90-6
 - Untabify
 - --add-category X-Fedora



From fedora-extras-commits at redhat.com  Wed Oct  4 22:21:29 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:21:29 -0700
Subject: rpms/cfengine/devel cfengine.spec,1.21,1.22
Message-ID: <200610042221.k94MLVFJ008979@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8960

Modified Files:
	cfengine.spec 
Log Message:
automated bump and rebuild


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cfengine.spec	24 Sep 2006 12:05:51 -0000	1.21
+++ cfengine.spec	4 Oct 2006 22:21:29 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.1.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.21.tar.gz
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.21-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.21-1
 - update to upstream 2.1.21
 - remove unneeded ipv6 overflow patch (fixed in current version)



From fedora-extras-commits at redhat.com  Wed Oct  4 22:21:40 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed,  4 Oct 2006 15:21:40 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.4,1.5
Message-ID: <200610042221.k94MLg2Z009044@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8977

Modified Files:
	sysprof-kmod.spec 
Log Message:
bump EVR for rebuild



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof-kmod.spec	4 Oct 2006 22:08:01 -0000	1.4
+++ sysprof-kmod.spec	4 Oct 2006 22:21:40 -0000	1.5
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.3
-Release:        2.%(echo %{kverrel} | tr - _)
+Release:        3.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -103,8 +103,11 @@
 
 
 %changelog
+* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
+- rebuild
+
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
-- Remove ppc arch
+- remove (not supported) ppc arch
 
 * Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1
 - version update



From fedora-extras-commits at redhat.com  Wed Oct  4 22:21:54 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:21:54 -0700
Subject: rpms/gnash/devel gnash.spec,1.2,1.3
Message-ID: <200610042221.k94MLu0V009111@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9066

Modified Files:
	gnash.spec 
Log Message:
automated bump and rebuild


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnash.spec	24 Sep 2006 08:22:09 -0000	1.2
+++ gnash.spec	4 Oct 2006 22:21:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.7.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7.1-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 24 2006 Patrice Dumas <pertusus at free.fr> 0.7.1-8
 - plugin requires %{_libdir}/mozilla/plugins. Fix (incompletly and 
   temporarily, but there is no better solution yet) #207613



From fedora-extras-commits at redhat.com  Wed Oct  4 22:22:19 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:22:19 -0700
Subject: rpms/farsight/devel farsight.spec,1.1,1.2
Message-ID: <200610042222.k94MMLUa009206@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/farsight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9189

Modified Files:
	farsight.spec 
Log Message:
automated bump and rebuild


Index: farsight.spec
===================================================================
RCS file: /cvs/extras/rpms/farsight/devel/farsight.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- farsight.spec	24 Sep 2006 02:42:08 -0000	1.1
+++ farsight.spec	4 Oct 2006 22:22:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		farsight
 Version:	0.1.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A audio/video conferencing framework
 
 Group:		System Environment/Libraries
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.1.8-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.8-2
 - Use correct license (LGPL).
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:22:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:22:44 -0700
Subject: rpms/libpaper/devel libpaper.spec,1.3,1.4
Message-ID: <200610042222.k94MMklW009272@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libpaper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9255

Modified Files:
	libpaper.spec 
Log Message:
automated bump and rebuild


Index: libpaper.spec
===================================================================
RCS file: /cvs/extras/rpms/libpaper/devel/libpaper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libpaper.spec	24 Sep 2006 01:32:14 -0000	1.3
+++ libpaper.spec	4 Oct 2006 22:22:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		libpaper
 Version:	1.1.20
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Library and tools for handling papersize
 Group:		System Environment/Libraries
 License:	GPL
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.1.20-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.20-4
 - remove aclocal call
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:23:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:23:12 -0700
Subject: rpms/libcdio/devel libcdio.spec,1.18,1.19
Message-ID: <200610042223.k94MNECP009336@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libcdio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9319

Modified Files:
	libcdio.spec 
Log Message:
automated bump and rebuild


Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libcdio.spec	23 Sep 2006 21:51:39 -0000	1.18
+++ libcdio.spec	4 Oct 2006 22:23:12 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           libcdio
 Version:        0.77
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.77-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Adrian Reber <adrian at lisas.de> - 0.77-1
 - Updated to 0.77
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:23:39 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:23:39 -0700
Subject: rpms/gnokii/devel gnokii.spec,1.8,1.9
Message-ID: <200610042223.k94MNf2R009400@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9383

Modified Files:
	gnokii.spec 
Log Message:
automated bump and rebuild


Index: gnokii.spec
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnokii.spec	23 Sep 2006 21:48:48 -0000	1.8
+++ gnokii.spec	4 Oct 2006 22:23:39 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           gnokii
 Version:        0.6.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -261,6 +261,9 @@
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.6.14-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Linus Walleij <triad at df.lth.se> - 0.6.14-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:24:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:24:05 -0700
Subject: rpms/whatmask/devel whatmask.spec,1.1,1.2
Message-ID: <200610042224.k94MO7k2009465@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/whatmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448

Modified Files:
	whatmask.spec 
Log Message:
automated bump and rebuild


Index: whatmask.spec
===================================================================
RCS file: /cvs/extras/rpms/whatmask/devel/whatmask.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- whatmask.spec	23 Sep 2006 09:04:10 -0000	1.1
+++ whatmask.spec	4 Oct 2006 22:24:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           whatmask
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Convert between different netmask types and show information
 
 Group:          Applications/Internet
@@ -39,6 +39,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Tim Jackson <rpm at timj.co.uk> 1.2-3
 - Initial build for FE. Release number is due to fork of a previous private
   version.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:24:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:24:30 -0700
Subject: rpms/eventlog/devel eventlog.spec,1.2,1.3
Message-ID: <200610042224.k94MOWkT009530@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/eventlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9513

Modified Files:
	eventlog.spec 
Log Message:
automated bump and rebuild


Index: eventlog.spec
===================================================================
RCS file: /cvs/extras/rpms/eventlog/devel/eventlog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eventlog.spec	23 Sep 2006 18:43:33 -0000	1.2
+++ eventlog.spec	4 Oct 2006 22:24:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           eventlog
 Version:        0.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Syslog-ng v2 support library
 
 Group:          System Environment/Libraries
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.2.5-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Jul 16 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.2.5-1
 - Update to 0.25.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:24:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:24:55 -0700
Subject: rpms/gaim-galago/devel gaim-galago.spec,1.1,1.2
Message-ID: <200610042224.k94MOvMe009596@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gaim-galago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9579

Modified Files:
	gaim-galago.spec 
Log Message:
automated bump and rebuild


Index: gaim-galago.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/devel/gaim-galago.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-galago.spec	23 Sep 2006 18:23:53 -0000	1.1
+++ gaim-galago.spec	4 Oct 2006 22:24:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gaim-galago
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Galago feed plugin for Gaim
 
 Group:		System Environment/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Correct URL.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:25:19 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:25:19 -0700
Subject: rpms/octave-forge/devel octave-forge.spec,1.31,1.32
Message-ID: <200610042225.k94MPLQc009660@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9643

Modified Files:
	octave-forge.spec 
Log Message:
automated bump and rebuild


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- octave-forge.spec	23 Sep 2006 17:26:03 -0000	1.31
+++ octave-forge.spec	4 Oct 2006 22:25:19 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.07.09
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2006.07.09-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-6
 - Rebuild for updated libdap.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:25:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:25:44 -0700
Subject: rpms/libgalago-gtk/devel libgalago-gtk.spec,1.1,1.2
Message-ID: <200610042225.k94MPkjS009724@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libgalago-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9707

Modified Files:
	libgalago-gtk.spec 
Log Message:
automated bump and rebuild


Index: libgalago-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago-gtk/devel/libgalago-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgalago-gtk.spec	23 Sep 2006 16:23:38 -0000	1.1
+++ libgalago-gtk.spec	4 Oct 2006 22:25:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libgalago-gtk
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ widgets for the Galago presence framework
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Preserve timestamps of header files.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:26:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:26:08 -0700
Subject: rpms/bochs/devel bochs.spec,1.21,1.22
Message-ID: <200610042226.k94MQAYv009788@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9771

Modified Files:
	bochs.spec 
Log Message:
automated bump and rebuild


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bochs.spec	22 Sep 2006 20:25:58 -0000	1.21
+++ bochs.spec	4 Oct 2006 22:26:08 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           bochs
 Version:        2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPL
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.3-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-2
 - Add -debugger and -gdb sub packages which contain special versions of
   bochs compiled with the buildin debugger resp. the gdb-stub (bz 206508)



From fedora-extras-commits at redhat.com  Wed Oct  4 22:26:33 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:26:33 -0700
Subject: rpms/gkrellm/devel gkrellm.spec,1.3,1.4
Message-ID: <200610042226.k94MQZDW009852@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835

Modified Files:
	gkrellm.spec 
Log Message:
automated bump and rebuild


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gkrellm.spec	22 Sep 2006 20:21:07 -0000	1.3
+++ gkrellm.spec	4 Oct 2006 22:26:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.2.9
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPL
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.9-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.9-9
 - Fixup .desktop so that gkrellm actually gets shown in the menu (bz 206775)
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:26:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:26:58 -0700
Subject: rpms/smarteiffel/devel smarteiffel.spec,1.1,1.2
Message-ID: <200610042227.k94MR0ha009916@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/smarteiffel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9899

Modified Files:
	smarteiffel.spec 
Log Message:
automated bump and rebuild


Index: smarteiffel.spec
===================================================================
RCS file: /cvs/extras/rpms/smarteiffel/devel/smarteiffel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smarteiffel.spec	22 Sep 2006 19:26:55 -0000	1.1
+++ smarteiffel.spec	4 Oct 2006 22:26:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           smarteiffel
 Version:        2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The GNU Eiffel Compiler and Libraries
 
 Group:          Development/Languages
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.2-5
 - split off -doc subpackage
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:27:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:27:22 -0700
Subject: rpms/blktool/devel blktool.spec,1.3,1.4
Message-ID: <200610042227.k94MROap009980@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/blktool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9963

Modified Files:
	blktool.spec 
Log Message:
automated bump and rebuild


Index: blktool.spec
===================================================================
RCS file: /cvs/extras/rpms/blktool/devel/blktool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blktool.spec	22 Sep 2006 19:13:00 -0000	1.3
+++ blktool.spec	4 Oct 2006 22:27:22 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Block device settings tool
 Name: blktool
 Version: 4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://sourceforge.net/projects/gkernel/
@@ -40,6 +40,9 @@
 %{_mandir}/man8/blktool.*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 4-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Jeff Garzik <jgarzik at pobox.com> - 4-5
 - pre-FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:27:47 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:27:47 -0700
Subject: rpms/git/devel git.spec,1.20,1.21
Message-ID: <200610042227.k94MRnmH010042@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10025

Modified Files:
	git.spec 
Log Message:
automated bump and rebuild


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git.spec	22 Sep 2006 18:10:26 -0000	1.20
+++ git.spec	4 Oct 2006 22:27:47 -0000	1.21
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.4.2.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.4.2.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:28:11 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:28:11 -0700
Subject: rpms/autotrace/devel autotrace.spec,1.15,1.16
Message-ID: <200610042228.k94MSDYj010111@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10092

Modified Files:
	autotrace.spec 
Log Message:
automated bump and rebuild


Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- autotrace.spec	22 Sep 2006 16:15:42 -0000	1.15
+++ autotrace.spec	4 Oct 2006 22:28:11 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.31.1-14
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Quentin Spencer <qspencer at users.sourceforge.net> - 0.31.1-13
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:28:36 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:28:36 -0700
Subject: rpms/kicad/devel kicad.spec,1.3,1.4
Message-ID: <200610042228.k94MScNu010175@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/kicad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158

Modified Files:
	kicad.spec 
Log Message:
automated bump and rebuild


Index: kicad.spec
===================================================================
RCS file: /cvs/extras/rpms/kicad/devel/kicad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kicad.spec	22 Sep 2006 13:57:08 -0000	1.3
+++ kicad.spec	4 Oct 2006 22:28:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		kicad
 Version:	2006.08.28
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary: 	Electronic schematic diagrams and printed circuit board artwork
 Summary(fr): 	Saisie de sch??ma ??lectronique et trac?? de cicrcuit imprim??
 
@@ -243,6 +243,9 @@
 %{_datadir}/pixmaps/kicad_icon.png
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2006.08.28-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2006.08.28-1
   - New upstream version
   - Use macro style instead of variable style



From fedora-extras-commits at redhat.com  Wed Oct  4 22:29:01 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:29:01 -0700
Subject: rpms/SDL_gfx/devel SDL_gfx.spec,1.7,1.8
Message-ID: <200610042229.k94MT3jW010239@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SDL_gfx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10222

Modified Files:
	SDL_gfx.spec 
Log Message:
automated bump and rebuild


Index: SDL_gfx.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_gfx/devel/SDL_gfx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SDL_gfx.spec	22 Sep 2006 13:26:31 -0000	1.7
+++ SDL_gfx.spec	4 Oct 2006 22:29:01 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Graphic primitives, rotozoomer, framerate control and image filters
 Name: SDL_gfx
 Version: 2.0.13
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.ferzkopp.net/Software/SDL_gfx-2.0/
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.13-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Matthias Saou <http://freshrpms.net/> 2.0.13-6
 - Fix semicolons in header files (#207665).
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:29:26 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:29:26 -0700
Subject: rpms/ode/devel ode.spec,1.4,1.5
Message-ID: <200610042229.k94MTSPM010303@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10286

Modified Files:
	ode.spec 
Log Message:
automated bump and rebuild


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ode.spec	22 Sep 2006 12:33:04 -0000	1.4
+++ ode.spec	4 Oct 2006 22:29:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ode
 Version:        0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
 License:        BSD LGPL
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7-1
 - New upstream release 0.7
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:29:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:29:50 -0700
Subject: rpms/libifp/devel libifp.spec,1.7,1.8
Message-ID: <200610042229.k94MTqmx010367@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libifp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10350

Modified Files:
	libifp.spec 
Log Message:
automated bump and rebuild


Index: libifp.spec
===================================================================
RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libifp.spec	22 Sep 2006 09:57:04 -0000	1.7
+++ libifp.spec	4 Oct 2006 22:29:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libifp
 Version:        1.0.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A general-purpose library-driver for iRiver's iFP portable audio players
 
 Group:          System Environment/Base
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.0.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.0.2-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:30:15 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:30:15 -0700
Subject: rpms/FreeWnn/devel FreeWnn.spec,1.4,1.5
Message-ID: <200610042230.k94MUH9P010446@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/FreeWnn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10429

Modified Files:
	FreeWnn.spec 
Log Message:
automated bump and rebuild


Index: FreeWnn.spec
===================================================================
RCS file: /cvs/extras/rpms/FreeWnn/devel/FreeWnn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FreeWnn.spec	22 Sep 2006 07:48:42 -0000	1.4
+++ FreeWnn.spec	4 Oct 2006 22:30:15 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: A Japanese character set conversion system.
 Name: FreeWnn
 Version: %{majorversion}_a%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 Group: Applications/System
 License: Distributable
@@ -235,6 +235,9 @@
 %attr(755,root,root) %{_libdir}/libwnn.so.0.0.0
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> %{majorversion}_a%{patchlevel}-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Jens Petersen <petersen at redhat.com> - 2:1.1.1_a021-1
 - update to pl21
 - set version to 1.1.1 to be consistent with upstream number



From fedora-extras-commits at redhat.com  Wed Oct  4 22:30:43 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:30:43 -0700
Subject: rpms/fontforge/devel fontforge.spec,1.19,1.20
Message-ID: <200610042230.k94MUj0j010518@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501

Modified Files:
	fontforge.spec 
Log Message:
automated bump and rebuild


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fontforge.spec	22 Sep 2006 04:58:23 -0000	1.19
+++ fontforge.spec	4 Oct 2006 22:30:43 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:           fontforge
 Version:        20060822
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 20060822-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Kevin Fenzi <kevin at tummy.com> - 20060822-1
 - Update to 20060822
 - Remove unneeded patch



From fedora-extras-commits at redhat.com  Wed Oct  4 22:31:11 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:31:11 -0700
Subject: rpms/oooqs2/devel oooqs2.spec,1.1,1.2
Message-ID: <200610042231.k94MVDgo010584@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/oooqs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567

Modified Files:
	oooqs2.spec 
Log Message:
automated bump and rebuild


Index: oooqs2.spec
===================================================================
RCS file: /cvs/extras/rpms/oooqs2/devel/oooqs2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oooqs2.spec	30 Jul 2006 20:01:23 -0000	1.1
+++ oooqs2.spec	4 Oct 2006 22:31:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           oooqs2
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OpenOffice.org Quickstarter 2
 
 Group:          Applications/Productivity
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Jul 27 2006 Dennis Gilmore <dennis at ausil.us> - 1.0-2
 - Fix BR's  add russian desktop file translation patch
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:31:35 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:31:35 -0700
Subject: rpms/tuxpaint/devel tuxpaint.spec,1.11,1.12
Message-ID: <200610042231.k94MVbc2010648@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10631

Modified Files:
	tuxpaint.spec 
Log Message:
automated bump and rebuild


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tuxpaint.spec	22 Sep 2006 00:48:40 -0000	1.11
+++ tuxpaint.spec	4 Oct 2006 22:31:35 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           tuxpaint
 Version:        0.9.15b
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -71,6 +71,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.15b-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Steven Pritchard <steve at kspei.com> 1:0.9.15b-3
 - Explicitly link libpng.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:32:00 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:32:00 -0700
Subject: rpms/uuid/devel uuid.spec,1.3,1.4
Message-ID: <200610042232.k94MW23J010713@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/uuid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10696

Modified Files:
	uuid.spec 
Log Message:
automated bump and rebuild


Index: uuid.spec
===================================================================
RCS file: /cvs/extras/rpms/uuid/devel/uuid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uuid.spec	21 Sep 2006 21:18:06 -0000	1.3
+++ uuid.spec	4 Oct 2006 22:32:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           uuid
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -233,6 +233,9 @@
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Aug 28 2006 Steven Pritchard <steve at kspei.com> 1.5.1-1
 - Update to 1.5.1.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:32:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:32:25 -0700
Subject: rpms/clamav/devel clamav.spec,1.41,1.42
Message-ID: <200610042232.k94MWRTZ010777@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10760

Modified Files:
	clamav.spec 
Log Message:
automated bump and rebuild


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- clamav.spec	21 Sep 2006 18:27:43 -0000	1.41
+++ clamav.spec	4 Oct 2006 22:32:25 -0000	1.42
@@ -19,7 +19,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.88.4
-Release:	%release_func 3
+Release: %release_func 4
 
 License:	GPL
 Group:		Applications/File
@@ -446,6 +446,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.88.4-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.4-3
 - splitted SysV initscripts of -milter and -server into own subpackages
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:32:52 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:32:52 -0700
Subject: rpms/mysql-connector-java/devel mysql-connector-java.spec,1.2,1.3
Message-ID: <200610042232.k94MWsQm010841@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/mysql-connector-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10824

Modified Files:
	mysql-connector-java.spec 
Log Message:
automated bump and rebuild


Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-connector-java/devel/mysql-connector-java.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-connector-java.spec	21 Sep 2006 19:09:42 -0000	1.2
+++ mysql-connector-java.spec	4 Oct 2006 22:32:51 -0000	1.3
@@ -5,7 +5,7 @@
 Summary:           Official JDBC driver for MySQL
 Name:              mysql-connector-java
 Version:           3.1.12
-Release:           2%{?dist}
+Release:           3%{?dist}
 Epoch:             1 
 License:           GPL
 Group:             System Environment/Libraries
@@ -121,6 +121,9 @@
 %endif
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.12-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Igor Foox <ifoox at redhat.com> 1:3.1.12-2
 - Remove jpp string from release.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:33:16 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:33:16 -0700
Subject: rpms/pikdev/devel pikdev.spec,1.7,1.8
Message-ID: <200610042233.k94MXIwE010905@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pikdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10888

Modified Files:
	pikdev.spec 
Log Message:
automated bump and rebuild


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/pikdev.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pikdev.spec	21 Sep 2006 16:17:22 -0000	1.7
+++ pikdev.spec	4 Oct 2006 22:33:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.9.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	IDE for development of PICmicro based application (under Linux/KDE)
 Summary(fr):	EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC
 
@@ -103,6 +103,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.2-1
   - New upstream version
 * Fri Sep  1 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.1-3



From fedora-extras-commits at redhat.com  Wed Oct  4 22:33:41 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:33:41 -0700
Subject: rpms/perl-Device-SerialPort/devel perl-Device-SerialPort.spec, 1.1, 
	1.2
Message-ID: <200610042233.k94MXh1m010974@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Device-SerialPort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957

Modified Files:
	perl-Device-SerialPort.spec 
Log Message:
automated bump and rebuild


Index: perl-Device-SerialPort.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Device-SerialPort/devel/perl-Device-SerialPort.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Device-SerialPort.spec	21 Sep 2006 16:16:53 -0000	1.1
+++ perl-Device-SerialPort.spec	4 Oct 2006 22:33:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Device-SerialPort
 Version:        1.002
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Linux/POSIX emulation of Win32::SerialPort functions
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.002-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Orion Poplawski 1.002-2
 - Add TESTPORT=/dev/null for mock builds
 - License back to GPL or Artistic



From fedora-extras-commits at redhat.com  Wed Oct  4 22:34:06 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:34:06 -0700
Subject: rpms/opencv/devel opencv.spec,1.10,1.11
Message-ID: <200610042234.k94MY8OY011040@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/opencv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11021

Modified Files:
	opencv.spec 
Log Message:
automated bump and rebuild


Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- opencv.spec	21 Sep 2006 15:52:42 -0000	1.10
+++ opencv.spec	4 Oct 2006 22:34:05 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name:           opencv
 Version:        0.9.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.9-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.9.9-2
 - Stop configure.in from hacking CXXFLAGS.
 - Activate testsuite.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:34:31 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:34:31 -0700
Subject: rpms/gputils/devel gputils.spec,1.9,1.10
Message-ID: <200610042234.k94MYX97011109@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gputils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11087

Modified Files:
	gputils.spec 
Log Message:
automated bump and rebuild


Index: gputils.spec
===================================================================
RCS file: /cvs/extras/rpms/gputils/devel/gputils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gputils.spec	21 Sep 2006 15:41:45 -0000	1.9
+++ gputils.spec	4 Oct 2006 22:34:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gputils
 Version:	0.13.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Outils de d??veloppement pour les microcontr??leurs PIC (TM) de Microchip (TM)
 
@@ -54,6 +54,9 @@
 %{_mandir}/fr/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.13.4-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.13.4-1
   - New upstream version
   - Add french summary and description



From fedora-extras-commits at redhat.com  Wed Oct  4 22:34:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:34:55 -0700
Subject: rpms/showimg/devel showimg.spec,1.14,1.15
Message-ID: <200610042234.k94MYvU5011182@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11165

Modified Files:
	showimg.spec 
Log Message:
automated bump and rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- showimg.spec	21 Sep 2006 14:58:17 -0000	1.14
+++ showimg.spec	4 Oct 2006 22:34:55 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-10
 - yep, just that
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:35:15 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed,  4 Oct 2006 15:35:15 -0700
Subject: rpms/qps/devel .cvsignore, 1.11, 1.12 qps.spec, 1.11, 1.12 sources, 
	1.11, 1.12
Message-ID: <200610042235.k94MZHFf011253@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11223

Modified Files:
	.cvsignore qps.spec sources 
Log Message:
Update to 1.9.18.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2006 20:55:28 -0000	1.11
+++ .cvsignore	4 Oct 2006 22:35:15 -0000	1.12
@@ -1 +1 @@
-qps-1.9.18.5.tar.bz2
+qps-1.9.18.6.tar.bz2


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qps.spec	28 Aug 2006 20:55:28 -0000	1.11
+++ qps.spec	4 Oct 2006 22:35:15 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           qps
-Version:        1.9.18.5
+Version:        1.9.18.6
 Release:        1%{?dist}
 Summary:        Visual process status monitor
 
 Group:          Applications/System
 License:        GPL
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/3543/qps-1.9.18.5.tar.bz2
+Source0:        http://kldp.net/frs/download.php/3550/qps-1.9.18.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.6-1
+- Update to 1.9.18.6
+
 * Mon Aug 28 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.5-1
 - Update to 1.9.18.5
 - Fix mixed-use-of-spaces-and-tabs rpmlint warning


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2006 20:55:28 -0000	1.11
+++ sources	4 Oct 2006 22:35:15 -0000	1.12
@@ -1 +1 @@
-15f77d592df8ae5e24ed5a1747e85fdd  qps-1.9.18.5.tar.bz2
+a55fabf362991fd13d43e930209927ea  qps-1.9.18.6.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 22:35:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:35:20 -0700
Subject: rpms/mod_annodex/devel mod_annodex.spec,1.4,1.5
Message-ID: <200610042235.k94MZMRZ011274@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/mod_annodex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11257

Modified Files:
	mod_annodex.spec 
Log Message:
automated bump and rebuild


Index: mod_annodex.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_annodex/devel/mod_annodex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_annodex.spec	20 Sep 2006 18:57:23 -0000	1.4
+++ mod_annodex.spec	4 Oct 2006 22:35:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mod_annodex
 Version:        0.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Apache module for server-side support of annodex media
 
 Group:          System Environment/Daemons
@@ -70,6 +70,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.2.2-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.2-5
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:35:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:35:44 -0700
Subject: rpms/php-pecl-Fileinfo/devel php-pecl-Fileinfo.spec,1.1,1.2
Message-ID: <200610042235.k94MZk44011338@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/php-pecl-Fileinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11321

Modified Files:
	php-pecl-Fileinfo.spec 
Log Message:
automated bump and rebuild


Index: php-pecl-Fileinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-Fileinfo/devel/php-pecl-Fileinfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-Fileinfo.spec	21 Sep 2006 01:05:15 -0000	1.1
+++ php-pecl-Fileinfo.spec	4 Oct 2006 22:35:44 -0000	1.2
@@ -5,7 +5,7 @@
 Summary: 	Fileinfo is a PHP extension that wraps the libmagic library
 Name: 		php-pecl-Fileinfo
 Version: 	1.0.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	PHP License
 Group: 		Development/Languages
 URL: 		http://pecl.php.net/package/Fileinfo
@@ -57,6 +57,9 @@
 %{php_extdir}/fileinfo.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.3-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 17 2006 Brandon Holbrook <fedora AT theholbrooks DOT org> 1.0.3-2
 - Strict Requires: php_api
 - Grammatically correct Summary + Description



From fedora-extras-commits at redhat.com  Wed Oct  4 22:36:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:36:09 -0700
Subject: rpms/gnomesword/devel gnomesword.spec,1.12,1.13
Message-ID: <200610042236.k94MaBrT011440@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421

Modified Files:
	gnomesword.spec 
Log Message:
automated bump and rebuild


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnomesword.spec	20 Sep 2006 21:55:50 -0000	1.12
+++ gnomesword.spec	4 Oct 2006 22:36:09 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.6-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Deji Akingunola <dakingun at gmail.com> - 2.1.6-4
 - Add perl(XML::Parser) to the BRs
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:36:34 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:36:34 -0700
Subject: rpms/sword/devel sword.spec,1.10,1.11
Message-ID: <200610042236.k94MaaDZ011504@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487

Modified Files:
	sword.spec 
Log Message:
automated bump and rebuild


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sword.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sword.spec	20 Sep 2006 21:27:03 -0000	1.10
+++ sword.spec	4 Oct 2006 22:36:34 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           sword           
 Version:        1.5.8
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.8-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Deji Akingunola <dakingun at gmail.com> - 1.5.8-9
 - Take over from Michael A. Peters
 - Rebuild for FC6



From fedora-extras-commits at redhat.com  Wed Oct  4 22:36:59 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:36:59 -0700
Subject: rpms/grads/devel grads.spec,1.16,1.17
Message-ID: <200610042237.k94Mb14x011574@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11557

Modified Files:
	grads.spec 
Log Message:
automated bump and rebuild


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grads.spec	20 Sep 2006 21:25:39 -0000	1.16
+++ grads.spec	4 Oct 2006 22:36:59 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -107,6 +107,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.9b4-17
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 1.9b4-16
 - rebuild against libdap 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:37:23 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:37:23 -0700
Subject: rpms/rafkill/devel rafkill.spec,1.5,1.6
Message-ID: <200610042237.k94MbPoN011645@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/rafkill/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626

Modified Files:
	rafkill.spec 
Log Message:
automated bump and rebuild


Index: rafkill.spec
===================================================================
RCS file: /cvs/extras/rpms/rafkill/devel/rafkill.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rafkill.spec	20 Sep 2006 20:14:03 -0000	1.5
+++ rafkill.spec	4 Oct 2006 22:37:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           rafkill
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Top-down shooter with powerups
 Group:          Amusements/Games
 License:        GPL
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-3
 - Fix a crash when using the shattergun (bug 206823).
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:37:28 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed,  4 Oct 2006 15:37:28 -0700
Subject: rpms/qps/FC-5 .cvsignore, 1.11, 1.12 qps.spec, 1.11, 1.12 sources, 
	1.11, 1.12
Message-ID: <200610042237.k94MbUS7011674@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11651

Modified Files:
	.cvsignore qps.spec sources 
Log Message:
Update to 1.9.18.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2006 20:57:55 -0000	1.11
+++ .cvsignore	4 Oct 2006 22:37:28 -0000	1.12
@@ -1 +1 @@
-qps-1.9.18.5.tar.bz2
+qps-1.9.18.6.tar.bz2


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/qps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qps.spec	28 Aug 2006 20:57:55 -0000	1.11
+++ qps.spec	4 Oct 2006 22:37:28 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           qps
-Version:        1.9.18.5
+Version:        1.9.18.6
 Release:        1%{?dist}
 Summary:        Visual process status monitor
 
 Group:          Applications/System
 License:        GPL
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/3543/qps-1.9.18.5.tar.bz2
+Source0:        http://kldp.net/frs/download.php/3550/qps-1.9.18.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.6-1
+- Update to 1.9.18.6
+
 * Mon Aug 28 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 1.9.18.5-1
 - Update to 1.9.18.5
 - Fix mixed-use-of-spaces-and-tabs rpmlint warning


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2006 20:57:55 -0000	1.11
+++ sources	4 Oct 2006 22:37:28 -0000	1.12
@@ -1 +1 @@
-15f77d592df8ae5e24ed5a1747e85fdd  qps-1.9.18.5.tar.bz2
+a55fabf362991fd13d43e930209927ea  qps-1.9.18.6.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 22:37:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:37:48 -0700
Subject: rpms/libannodex/devel libannodex.spec,1.7,1.8
Message-ID: <200610042237.k94Mbohf011772@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libannodex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11751

Modified Files:
	libannodex.spec 
Log Message:
automated bump and rebuild


Index: libannodex.spec
===================================================================
RCS file: /cvs/extras/rpms/libannodex/devel/libannodex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libannodex.spec	20 Sep 2006 18:56:15 -0000	1.7
+++ libannodex.spec	4 Oct 2006 22:37:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libannodex
 Version:        0.7.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for annotating and indexing networked media
 
 Group:          System Environment/Libraries
@@ -103,6 +103,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7.3-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.7.4-4
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:38:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:38:12 -0700
Subject: rpms/python-twisted/devel python-twisted.spec,1.6,1.7
Message-ID: <200610042238.k94McEC0011836@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/python-twisted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11819

Modified Files:
	python-twisted.spec 
Log Message:
automated bump and rebuild


Index: python-twisted.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted/devel/python-twisted.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-twisted.spec	20 Sep 2006 18:57:47 -0000	1.6
+++ python-twisted.spec	4 Oct 2006 22:38:12 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Event-driven networking framework written in Python
 Name: python-twisted
 Version: 1.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: LGPL
 Group: Applications/Internet
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.0-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 1.3.0-5
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:38:40 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:38:40 -0700
Subject: rpms/libcmml/devel libcmml.spec,1.4,1.5
Message-ID: <200610042238.k94McgKk011900@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libcmml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11883

Modified Files:
	libcmml.spec 
Log Message:
automated bump and rebuild


Index: libcmml.spec
===================================================================
RCS file: /cvs/extras/rpms/libcmml/devel/libcmml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libcmml.spec	20 Sep 2006 18:56:38 -0000	1.4
+++ libcmml.spec	4 Oct 2006 22:38:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libcmml
 Version:        0.9.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for handling Continuous Media Markup Language
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.1-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.1-2
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:39:04 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:39:04 -0700
Subject: rpms/liboggz/devel liboggz.spec,1.8,1.9
Message-ID: <200610042239.k94Md6BB011964@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/liboggz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11947

Modified Files:
	liboggz.spec 
Log Message:
automated bump and rebuild


Index: liboggz.spec
===================================================================
RCS file: /cvs/extras/rpms/liboggz/devel/liboggz.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- liboggz.spec	20 Sep 2006 18:57:01 -0000	1.8
+++ liboggz.spec	4 Oct 2006 22:39:04 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           liboggz
 Version:        0.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple programming interface for Ogg files and streams
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.4-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.4-2
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct  4 22:39:29 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:39:29 -0700
Subject: rpms/gnet2/devel gnet2.spec,1.9,1.10
Message-ID: <200610042239.k94MdVmL012028@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnet2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011

Modified Files:
	gnet2.spec 
Log Message:
automated bump and rebuild


Index: gnet2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnet2/devel/gnet2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnet2.spec	20 Sep 2006 15:49:54 -0000	1.9
+++ gnet2.spec	4 Oct 2006 22:39:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gnet2
 Version:        2.0.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A simple network library built upon glib
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.7-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Tomas Mraz <tmraz at redhat.com> 2.0.7-8
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:39:54 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:39:54 -0700
Subject: rpms/xfce4-weather-plugin/devel xfce4-weather-plugin.spec,1.6,1.7
Message-ID: <200610042239.k94MdukR012092@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12075

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
automated bump and rebuild


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/xfce4-weather-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-weather-plugin.spec	8 Sep 2006 20:18:30 -0000	1.6
+++ xfce4-weather-plugin.spec	4 Oct 2006 22:39:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -40,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.9-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.9-7
 - Mass rebuild for Fedora Core 6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:40:18 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:40:18 -0700
Subject: rpms/perl-Gnome2-Canvas/devel perl-Gnome2-Canvas.spec,1.2,1.3
Message-ID: <200610042240.k94MeKQ4012160@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Gnome2-Canvas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12143

Modified Files:
	perl-Gnome2-Canvas.spec 
Log Message:
automated bump and rebuild


Index: perl-Gnome2-Canvas.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Canvas/devel/perl-Gnome2-Canvas.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Gnome2-Canvas.spec	20 Sep 2006 03:19:45 -0000	1.2
+++ perl-Gnome2-Canvas.spec	4 Oct 2006 22:40:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-Canvas
 Version:        1.002
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An engine for structured graphics in Gnome2
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.002-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.002-5
 - taking co-maintainership post-non-massrebuild
 - tweak %%files to properly own all directories under perl_vendorarch/auto/



From fedora-extras-commits at redhat.com  Wed Oct  4 22:40:43 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:40:43 -0700
Subject: rpms/python-enchant/devel python-enchant.spec,1.7,1.8
Message-ID: <200610042240.k94MejBA012224@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/python-enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12207

Modified Files:
	python-enchant.spec 
Log Message:
automated bump and rebuild


Index: python-enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-enchant.spec	20 Sep 2006 00:10:35 -0000	1.7
+++ python-enchant.spec	4 Oct 2006 22:40:43 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           python-enchant
 Version:        1.1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python bindings for Enchant spellchecking library
 
 Group:          Development/Languages
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.1.5-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1.5-4
 - Rebuild for FC-6.
 - Unghost .pyo files.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:41:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:41:09 -0700
Subject: rpms/t1utils/devel t1utils.spec,1.12,1.13
Message-ID: <200610042241.k94MfBlG012288@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/t1utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12269

Modified Files:
	t1utils.spec 
Log Message:
automated bump and rebuild


Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- t1utils.spec	20 Sep 2006 00:06:58 -0000	1.12
+++ t1utils.spec	4 Oct 2006 22:41:09 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		t1utils
 Version:	1.32
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.32-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.32-7
 - Rebuild for FC-6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:41:34 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:41:34 -0700
Subject: rpms/t1lib/devel t1lib.spec,1.12,1.13
Message-ID: <200610042241.k94MfaPa012352@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12335

Modified Files:
	t1lib.spec 
Log Message:
automated bump and rebuild


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- t1lib.spec	20 Sep 2006 00:04:22 -0000	1.12
+++ t1lib.spec	4 Oct 2006 22:41:34 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 5.1.0-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.0-7
 - Rebuild for FC-6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:41:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:41:58 -0700
Subject: rpms/rman/devel rman.spec,1.3,1.4
Message-ID: <200610042242.k94Mg0tB012416@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12399

Modified Files:
	rman.spec 
Log Message:
automated bump and rebuild


Index: rman.spec
===================================================================
RCS file: /cvs/extras/rpms/rman/devel/rman.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rman.spec	19 Sep 2006 23:57:55 -0000	1.3
+++ rman.spec	4 Oct 2006 22:41:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rman
 Version:	3.2 
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Converts man pages to various other formats
 
 Group:		System Environment/Base
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.2-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 3.2-4
 - Rebuild for FC-6.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:42:23 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:42:23 -0700
Subject: rpms/PyX/devel PyX.spec,1.3,1.4
Message-ID: <200610042242.k94MgPv9012480@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/PyX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12463

Modified Files:
	PyX.spec 
Log Message:
automated bump and rebuild


Index: PyX.spec
===================================================================
RCS file: /cvs/extras/rpms/PyX/devel/PyX.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PyX.spec	19 Sep 2006 23:52:07 -0000	1.3
+++ PyX.spec	4 Oct 2006 22:42:22 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           PyX
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python graphics package
 
 Group:          Applications/Publishing
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.9-2
 - Rebuild for FC-6.
 - Unghost .pyo files.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:42:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:42:50 -0700
Subject: rpms/tellico/devel tellico.spec,1.1,1.2
Message-ID: <200610042242.k94Mgq0V012544@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/tellico/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12527

Modified Files:
	tellico.spec 
Log Message:
automated bump and rebuild


Index: tellico.spec
===================================================================
RCS file: /cvs/extras/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tellico.spec	19 Sep 2006 23:21:06 -0000	1.1
+++ tellico.spec	4 Oct 2006 22:42:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tellico
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.2-1
 - Revert desktop file to original one, and drop vendor.
 - New upstream release.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:43:14 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:43:14 -0700
Subject: rpms/rdiff-backup/devel rdiff-backup.spec,1.12,1.13
Message-ID: <200610042243.k94MhGJq012608@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12591

Modified Files:
	rdiff-backup.spec 
Log Message:
automated bump and rebuild


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rdiff-backup.spec	19 Sep 2006 23:05:37 -0000	1.12
+++ rdiff-backup.spec	4 Oct 2006 22:43:14 -0000	1.13
@@ -3,7 +3,7 @@
 Version: 1.0.4
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
@@ -53,6 +53,9 @@
 %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.4-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> - 1.0.4-2
 - Build for fc6
 - No longer need to ghost pyo files (bug 205431)



From fedora-extras-commits at redhat.com  Wed Oct  4 22:43:40 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:43:40 -0700
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.3,1.4
Message-ID: <200610042243.k94MhglM012672@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12655

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
automated bump and rebuild


Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Readonly-XS.spec	19 Sep 2006 22:57:10 -0000	1.3
+++ perl-Readonly-XS.spec	4 Oct 2006 22:43:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Companion module for Readonly.pm
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.04-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-4
 - bump for mass rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:44:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:44:05 -0700
Subject: rpms/gnome-build/devel gnome-build.spec,1.3,1.4
Message-ID: <200610042244.k94Mi7CB012741@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnome-build/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12724

Modified Files:
	gnome-build.spec 
Log Message:
automated bump and rebuild


Index: gnome-build.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-build/devel/gnome-build.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-build.spec	19 Sep 2006 22:41:32 -0000	1.3
+++ gnome-build.spec	4 Oct 2006 22:44:05 -0000	1.4
@@ -1,7 +1,7 @@
 Name: gnome-build
 Summary: GNOME Build Framework
 Version: 0.1.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-build/0.1/%{name}-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %{_libdir}/libgbf-widgets-1.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.1.3-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-10
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:44:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:44:30 -0700
Subject: rpms/leafnode/devel leafnode.spec,1.9,1.10
Message-ID: <200610042244.k94MiWnm012807@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/leafnode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12790

Modified Files:
	leafnode.spec 
Log Message:
automated bump and rebuild


Index: leafnode.spec
===================================================================
RCS file: /cvs/extras/rpms/leafnode/devel/leafnode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- leafnode.spec	19 Sep 2006 22:41:33 -0000	1.9
+++ leafnode.spec	4 Oct 2006 22:44:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name: leafnode
 Version: 1.11.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: Leaf site offline NNTP server
 License: MIT, GPL, LGPL
@@ -94,6 +94,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.11.5-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> - 1.11.5-1
 - Take over maintainership (see bug 185883)
 - Update to 1.11.5-1



From fedora-extras-commits at redhat.com  Wed Oct  4 22:44:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:44:55 -0700
Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler.spec,1.11,1.12
Message-ID: <200610042244.k94MivL7012876@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dap-hdf4_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12859

Modified Files:
	dap-hdf4_handler.spec 
Log Message:
automated bump and rebuild


Index: dap-hdf4_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dap-hdf4_handler.spec	19 Sep 2006 22:39:03 -0000	1.11
+++ dap-hdf4_handler.spec	4 Oct 2006 22:44:55 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:         HDF4 data handler for the OPeNDAP Data server
 Name:            dap-hdf4_handler
 Version:         3.7.2
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz
@@ -37,6 +37,9 @@
 %doc README
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.2-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-2
 - update to 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:45:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:45:20 -0700
Subject: rpms/libnc-dap/devel libnc-dap.spec,1.10,1.11
Message-ID: <200610042245.k94MjMiO012942@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libnc-dap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12925

Modified Files:
	libnc-dap.spec 
Log Message:
automated bump and rebuild


Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libnc-dap.spec	19 Sep 2006 22:23:24 -0000	1.10
+++ libnc-dap.spec	4 Oct 2006 22:45:20 -0000	1.11
@@ -1,7 +1,7 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
 Version: 3.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
 URL: http://www.opendap.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.6.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-3
 - rebuild against libdap 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:45:46 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:45:46 -0700
Subject: rpms/vorbisgain/devel vorbisgain.spec,1.2,1.3
Message-ID: <200610042245.k94MjmJ2013006@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/vorbisgain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12989

Modified Files:
	vorbisgain.spec 
Log Message:
automated bump and rebuild


Index: vorbisgain.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbisgain/devel/vorbisgain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbisgain.spec	19 Sep 2006 22:22:42 -0000	1.2
+++ vorbisgain.spec	4 Oct 2006 22:45:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           vorbisgain
 Version:        0.34
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Adds tags to Ogg Vorbis files to adjust the volume
 
 Group:          Applications/Multimedia
@@ -42,6 +42,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.34-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.34-2
 - Rebuild for FC6.
 - Minor formatting changes.



From fedora-extras-commits at redhat.com  Wed Oct  4 22:46:13 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:46:13 -0700
Subject: rpms/dap-freeform_handler/devel dap-freeform_handler.spec,1.7,1.8
Message-ID: <200610042246.k94MkFvq013070@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dap-freeform_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13053

Modified Files:
	dap-freeform_handler.spec 
Log Message:
automated bump and rebuild


Index: dap-freeform_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/dap-freeform_handler.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dap-freeform_handler.spec	19 Sep 2006 22:22:09 -0000	1.7
+++ dap-freeform_handler.spec	4 Oct 2006 22:46:12 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:         FreeForm data handler for the OPeNDAP Data server
 Name:            dap-freeform_handler
 Version:         3.7.2
-Release:         1%{?dist}
+Release:         2%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/freeform_handler-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %doc COPYING COPYRIGHT NEWS README
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-1
 - update to 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:46:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Oct 2006 15:46:26 -0700
Subject: rpms/kdesvn/devel .cvsignore, 1.11, 1.12 kdesvn.spec, 1.21,
	1.22 sources, 1.11, 1.12
Message-ID: <200610042246.k94MkS7b013133@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13083

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
Update to 0.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Sep 2006 20:17:30 -0000	1.11
+++ .cvsignore	4 Oct 2006 22:46:26 -0000	1.12
@@ -1 +1 @@
-kdesvn-0.9.3.tar.bz2
+kdesvn-0.10.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kdesvn.spec	3 Oct 2006 21:54:43 -0000	1.21
+++ kdesvn.spec	4 Oct 2006 22:46:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           kdesvn
-Version:        0.9.3
-Release:        2%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -130,7 +130,10 @@
 
 
 %changelog
-* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-2
+* Wed Oct  4 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.10.0-1
+- Update to 0.10.0
+
+* Tue Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Sep 2006 20:17:30 -0000	1.11
+++ sources	4 Oct 2006 22:46:26 -0000	1.12
@@ -1 +1 @@
-542a70a1b158fb99757593cdeb263b2a  kdesvn-0.9.3.tar.bz2
+896d62ac8687236f05e984ba6cd69e6b  kdesvn-0.10.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct  4 22:46:37 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:46:37 -0700
Subject: rpms/dap-netcdf_handler/devel dap-netcdf_handler.spec,1.7,1.8
Message-ID: <200610042246.k94MkdWU013196@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dap-netcdf_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13176

Modified Files:
	dap-netcdf_handler.spec 
Log Message:
automated bump and rebuild


Index: dap-netcdf_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/dap-netcdf_handler.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dap-netcdf_handler.spec	19 Sep 2006 22:11:02 -0000	1.7
+++ dap-netcdf_handler.spec	4 Oct 2006 22:46:37 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:         NetCDF 3 data handler for the OPeNDAP Data server
 Name:            dap-netcdf_handler
 Version:         3.7.3
-Release:         1%{?dist}
+Release:         2%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %doc README
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.3-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.7.3-1
 - update to 3.7.3
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:47:02 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:47:02 -0700
Subject: rpms/z88dk/devel z88dk.spec,1.3,1.4
Message-ID: <200610042247.k94Ml4SC013264@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13247

Modified Files:
	z88dk.spec 
Log Message:
automated bump and rebuild


Index: z88dk.spec
===================================================================
RCS file: /cvs/extras/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- z88dk.spec	19 Sep 2006 21:28:10 -0000	1.3
+++ z88dk.spec	4 Oct 2006 22:47:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Artistic
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.6-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.6-9
 - rebuild
 - minor spec file changes



From fedora-extras-commits at redhat.com  Wed Oct  4 22:47:27 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:47:27 -0700
Subject: rpms/libdap/devel libdap.spec,1.7,1.8
Message-ID: <200610042247.k94MlTs2013331@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libdap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314

Modified Files:
	libdap.spec 
Log Message:
automated bump and rebuild


Index: libdap.spec
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libdap.spec	19 Sep 2006 21:12:00 -0000	1.7
+++ libdap.spec	4 Oct 2006 22:47:27 -0000	1.8
@@ -2,7 +2,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
 Version: 3.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz
@@ -82,6 +82,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-1
 - update to 3.7.2
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:47:51 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:47:51 -0700
Subject: rpms/lsscsi/devel lsscsi.spec,1.2,1.3
Message-ID: <200610042247.k94MlrMK013397@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lsscsi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13380

Modified Files:
	lsscsi.spec 
Log Message:
automated bump and rebuild


Index: lsscsi.spec
===================================================================
RCS file: /cvs/extras/rpms/lsscsi/devel/lsscsi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lsscsi.spec	19 Sep 2006 15:51:11 -0000	1.2
+++ lsscsi.spec	4 Oct 2006 22:47:51 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:        List SCSI devices (or hosts) and associated information
 Name:           lsscsi
 Version:        0.17
-Release:        3
+Release:        4
 License:        GPL
 Group:          Applications/System
 Source0:        http://www.torque.net/scsi/%{name}-%{version}.tgz
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.17-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 - Chip Coldwell <coldwell at redhat.com> 0.17-3
 - bump the EVR for FC6 rebuild
 * Mon Jul 17 2006 - Chip Coldwell <coldwell at redhat.com> 0.17-2



From fedora-extras-commits at redhat.com  Wed Oct  4 22:48:16 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:48:16 -0700
Subject: rpms/basket/devel basket.spec,1.7,1.8
Message-ID: <200610042248.k94MmI4C013463@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/basket/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13446

Modified Files:
	basket.spec 
Log Message:
automated bump and rebuild


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/basket.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- basket.spec	19 Sep 2006 14:45:12 -0000	1.7
+++ basket.spec	4 Oct 2006 22:48:16 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           basket
 Summary:        Notes taker for KDE
 Version:        0.5.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 URL:           	http://basket.kde.org/
 Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
 Patch0:         basket-0.5.0-64bits.patch
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
 - add explicit linking to libfam
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:48:41 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:48:41 -0700
Subject: rpms/liblrdf/devel liblrdf.spec,1.4,1.5
Message-ID: <200610042248.k94MmhRL013535@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/liblrdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13518

Modified Files:
	liblrdf.spec 
Log Message:
automated bump and rebuild


Index: liblrdf.spec
===================================================================
RCS file: /cvs/extras/rpms/liblrdf/devel/liblrdf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- liblrdf.spec	19 Sep 2006 12:19:42 -0000	1.4
+++ liblrdf.spec	4 Oct 2006 22:48:40 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:      Library for manipulating RDF files describing LADSPA plugins
 Name:         liblrdf
 Version:      0.4.0
-Release:      8%{?dist}
+Release:      9%{?dist}
 License:      GPL
 Group:        System Environment/Libraries
 URL:          http://lrdf.sourceforge.net/
@@ -56,6 +56,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.0-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.4.0-8
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:49:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:49:08 -0700
Subject: rpms/azureus/devel azureus.spec,1.36,1.37
Message-ID: <200610042249.k94MnA8T013607@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13590

Modified Files:
	azureus.spec 
Log Message:
automated bump and rebuild


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- azureus.spec	19 Sep 2006 12:22:31 -0000	1.36
+++ azureus.spec	4 Oct 2006 22:49:08 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -206,6 +206,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.5.0.0-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 2.5.0.0-2
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:49:33 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:49:33 -0700
Subject: rpms/dssi/devel dssi.spec,1.4,1.5
Message-ID: <200610042249.k94MnZhr013672@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13655

Modified Files:
	dssi.spec 
Log Message:
automated bump and rebuild


Index: dssi.spec
===================================================================
RCS file: /cvs/extras/rpms/dssi/devel/dssi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dssi.spec	19 Sep 2006 12:22:10 -0000	1.4
+++ dssi.spec	4 Oct 2006 22:49:32 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:      Disposable Soft Synth Interface
 Name:         dssi
 Version:      0.9.1
-Release:      9%{?dist}
+Release:      10%{?dist}
 License:      MIT
 Group:        Applications/Multimedia
 URL:          http://dssi.sourceforge.net/
@@ -90,6 +90,9 @@
 %{_libdir}/pkgconfig/dssi.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.1-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 18 2006 Anthony Green <green at redhat.com> 0.9.1-9
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:49:57 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:49:57 -0700
Subject: rpms/fluidsynth-dssi/devel fluidsynth-dssi.spec,1.3,1.4
Message-ID: <200610042249.k94Mnxtl013736@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fluidsynth-dssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13719

Modified Files:
	fluidsynth-dssi.spec 
Log Message:
automated bump and rebuild


Index: fluidsynth-dssi.spec
===================================================================
RCS file: /cvs/extras/rpms/fluidsynth-dssi/devel/fluidsynth-dssi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fluidsynth-dssi.spec	19 Sep 2006 12:21:48 -0000	1.3
+++ fluidsynth-dssi.spec	4 Oct 2006 22:49:57 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:    DSSI implementation of Fluidsynth
 Name:       fluidsynth-dssi
 Version:    0.9.1
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://dssi.sourceforge.net/download.html#FluidSynth-DSSI
@@ -40,6 +40,9 @@
 %{_libdir}/dssi/fluidsynth-dssi*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.1-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.9.1-6
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:50:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:50:30 -0700
Subject: rpms/hexter-dssi/devel hexter-dssi.spec,1.3,1.4
Message-ID: <200610042250.k94MoWDi013800@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/hexter-dssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13783

Modified Files:
	hexter-dssi.spec 
Log Message:
automated bump and rebuild


Index: hexter-dssi.spec
===================================================================
RCS file: /cvs/extras/rpms/hexter-dssi/devel/hexter-dssi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hexter-dssi.spec	19 Sep 2006 12:21:28 -0000	1.3
+++ hexter-dssi.spec	4 Oct 2006 22:50:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:      DSSI software synthesizer plugin emulating DX7
 Name:         hexter-dssi
 Version:      0.5.9
-Release:      5%{?dist}
+Release:      6%{?dist}
 URL:          http://dssi.sourceforge.net/hexter.html
 Source0:      http://easynews.dl.sourceforge.net/sourceforge/dssi/hexter-0.5.9.tar.gz
 License:      GPL
@@ -49,6 +49,9 @@
 %exclude %{_libdir}/dssi/hexter.la
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.9-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.5.9-5
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:50:54 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:50:54 -0700
Subject: rpms/liblo/devel liblo.spec,1.7,1.8
Message-ID: <200610042250.k94Mounk013864@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/liblo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13847

Modified Files:
	liblo.spec 
Log Message:
automated bump and rebuild


Index: liblo.spec
===================================================================
RCS file: /cvs/extras/rpms/liblo/devel/liblo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liblo.spec	19 Sep 2006 12:20:06 -0000	1.7
+++ liblo.spec	4 Oct 2006 22:50:54 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:      Open Sound Control library
 Name:         liblo
 Version:      0.23
-Release:      10%{?dist}
+Release:      11%{?dist}
 License:      GPL
 Group:        System Environment/Libraries
 URL:          http://liblo.sourceforge.net
@@ -64,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.23-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.23-10
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:51:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:51:20 -0700
Subject: rpms/kawa/devel kawa.spec,1.12,1.13
Message-ID: <200610042251.k94MpMaM013928@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13909

Modified Files:
	kawa.spec 
Log Message:
automated bump and rebuild


Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kawa.spec	19 Sep 2006 12:20:47 -0000	1.12
+++ kawa.spec	4 Oct 2006 22:51:20 -0000	1.13
@@ -5,7 +5,7 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -86,6 +86,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.8-10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 1:1.8-9
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:51:53 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:51:53 -0700
Subject: rpms/ardour/devel ardour.spec,1.4,1.5
Message-ID: <200610042251.k94Mptih013992@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ardour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13973

Modified Files:
	ardour.spec 
Log Message:
automated bump and rebuild


Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ardour.spec	19 Sep 2006 12:22:53 -0000	1.4
+++ ardour.spec	4 Oct 2006 22:51:53 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
 Version:       0.99.3
-Release:       6%{?dist}
+Release:       7%{?dist}
 Source:        http://ardour.org/files/releases/ardour-0.99.3.tar.bz2
 Source1:       ardour.png
 Source2:       ardour.desktop
@@ -110,6 +110,9 @@
 %{_datadir}/applications/*ardour.desktop
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.99.3-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.99.3-6
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:52:18 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:52:18 -0700
Subject: rpms/mxml/devel mxml.spec,1.4,1.5
Message-ID: <200610042252.k94MqKHK014056@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/mxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14039

Modified Files:
	mxml.spec 
Log Message:
automated bump and rebuild


Index: mxml.spec
===================================================================
RCS file: /cvs/extras/rpms/mxml/devel/mxml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mxml.spec	19 Sep 2006 12:19:21 -0000	1.4
+++ mxml.spec	4 Oct 2006 22:52:18 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:      Miniature XML development library
 Name:         mxml
 Version:      2.2.2
-Release:      6%{?dist}
+Release:      7%{?dist}
 License:      LGPL
 Group:        System Environment/Libraries
 URL:          http://www.easysw.com/~mike/mxml/
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/mxml.pc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.2-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 2.2.2-6
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:52:43 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:52:43 -0700
Subject: rpms/raptor/devel raptor.spec,1.5,1.6
Message-ID: <200610042252.k94MqjWM014120@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14103

Modified Files:
	raptor.spec 
Log Message:
automated bump and rebuild


Index: raptor.spec
===================================================================
RCS file: /cvs/extras/rpms/raptor/devel/raptor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- raptor.spec	19 Sep 2006 12:18:59 -0000	1.5
+++ raptor.spec	4 Oct 2006 22:52:43 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.9
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       LGPL or Apache License Version 2.0
 Group:         System Environment/Libraries
 Source:        http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.9.tar.gz
@@ -70,6 +70,9 @@
 %{_bindir}/raptor-config
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.4.9-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 1.4.9-4
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:53:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:53:08 -0700
Subject: rpms/itext/devel itext.spec,1.8,1.9
Message-ID: <200610042253.k94MrAtt014184@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/itext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14167

Modified Files:
	itext.spec 
Log Message:
automated bump and rebuild


Index: itext.spec
===================================================================
RCS file: /cvs/extras/rpms/itext/devel/itext.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- itext.spec	19 Sep 2006 12:21:08 -0000	1.8
+++ itext.spec	4 Oct 2006 22:53:07 -0000	1.9
@@ -3,7 +3,7 @@
 Summary:        A Free Java-PDF library
 Name:           itext
 Version:        1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MPL/LGPL
 URL:            http://www.lowagie.com/iText/
 Group:          Development/Libraries
@@ -113,6 +113,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> - 1.3-2
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:53:32 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:53:32 -0700
Subject: rpms/swh-plugins/devel swh-plugins.spec,1.10,1.11
Message-ID: <200610042253.k94MrYP1014248@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14231

Modified Files:
	swh-plugins.spec 
Log Message:
automated bump and rebuild


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- swh-plugins.spec	19 Sep 2006 12:18:12 -0000	1.10
+++ swh-plugins.spec	4 Oct 2006 22:53:32 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.15
-Release:      3%{?dist}
+Release:      4%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
@@ -38,6 +38,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.15-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.4.15-3
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:53:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:53:58 -0700
Subject: rpms/zynaddsubfx/devel zynaddsubfx.spec,1.7,1.8
Message-ID: <200610042254.k94Ms0Wl014312@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/zynaddsubfx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14295

Modified Files:
	zynaddsubfx.spec 
Log Message:
automated bump and rebuild


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/extras/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zynaddsubfx.spec	19 Sep 2006 12:16:53 -0000	1.7
+++ zynaddsubfx.spec	4 Oct 2006 22:53:57 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.2.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -148,6 +148,9 @@
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.1-13
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Anthony Green <green at redhat.com>  2.2.1-12
 - Fix release tag.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:54:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:54:22 -0700
Subject: rpms/sabayon/devel sabayon.spec,1.26,1.27
Message-ID: <200610042254.k94MsOUg014376@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14359

Modified Files:
	sabayon.spec 
Log Message:
automated bump and rebuild


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sabayon.spec	19 Sep 2006 09:50:25 -0000	1.26
+++ sabayon.spec	4 Oct 2006 22:54:22 -0000	1.27
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.12.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -258,6 +258,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.12.4-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Alexander Larsson <alexl at redhat.com> - 2.12.4-3
 - Rebuild with new toolchain
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:55:00 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:55:00 -0700
Subject: rpms/synce-trayicon/devel synce-trayicon.spec,1.6,1.7
Message-ID: <200610042255.k94Mt2S5014440@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14421

Modified Files:
	synce-trayicon.spec 
Log Message:
automated bump and rebuild


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/synce-trayicon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- synce-trayicon.spec	19 Sep 2006 07:11:35 -0000	1.6
+++ synce-trayicon.spec	4 Oct 2006 22:55:00 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
 Version:        0.9.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -55,6 +55,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.0-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.0-7
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 22:55:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:55:25 -0700
Subject: rpms/synce-software-manager/devel synce-software-manager.spec, 1.5, 
	1.6
Message-ID: <200610042255.k94MtRrn014504@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14487

Modified Files:
	synce-software-manager.spec 
Log Message:
automated bump and rebuild


Index: synce-software-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/devel/synce-software-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- synce-software-manager.spec	19 Sep 2006 06:44:46 -0000	1.5
+++ synce-software-manager.spec	4 Oct 2006 22:55:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           synce-software-manager
 Version:        0.9.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Software manager for use with synce
 
 Group:          Applications/Communications
@@ -64,6 +64,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.0-7
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.9.0-6
 - FE6 rebuild
 - fix BR



From fedora-extras-commits at redhat.com  Wed Oct  4 22:55:49 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:55:49 -0700
Subject: rpms/pengupop/devel pengupop.spec,1.4,1.5
Message-ID: <200610042255.k94MtpmP014568@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pengupop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14551

Modified Files:
	pengupop.spec 
Log Message:
automated bump and rebuild


Index: pengupop.spec
===================================================================
RCS file: /cvs/extras/rpms/pengupop/devel/pengupop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pengupop.spec	19 Sep 2006 00:41:19 -0000	1.4
+++ pengupop.spec	4 Oct 2006 22:55:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           pengupop
 Version:        2.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Networked Game in the vein of Move/Puzzle Bobble
 
 Group:          Amusements/Games
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.4-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 13 2006 Hugo Cisneiros <hugo at devin.com.br> 2.1.4-2
 - Rebuilt for FC6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:56:14 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:56:14 -0700
Subject: rpms/pdsh/devel pdsh.spec,1.8,1.9
Message-ID: <200610042256.k94MuGVl014632@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pdsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14615

Modified Files:
	pdsh.spec 
Log Message:
automated bump and rebuild


Index: pdsh.spec
===================================================================
RCS file: /cvs/extras/rpms/pdsh/devel/pdsh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pdsh.spec	19 Sep 2006 00:25:46 -0000	1.8
+++ pdsh.spec	4 Oct 2006 22:56:14 -0000	1.9
@@ -1,6 +1,6 @@
 Name: pdsh
 Version: 2.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Summary: Parallel remote shell program
 
@@ -433,6 +433,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.11-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Ben Woodard <woodard at redhat.com> 2.11-4
 - bump version for fc6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:56:43 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:56:43 -0700
Subject: rpms/galeon/devel galeon.spec,1.23,1.24
Message-ID: <200610042256.k94Mujb7014696@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14679

Modified Files:
	galeon.spec 
Log Message:
automated bump and rebuild


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- galeon.spec	18 Sep 2006 22:15:18 -0000	1.23
+++ galeon.spec	4 Oct 2006 22:56:43 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.3-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Denis Leroy <denis at poolshark.org> - 2.0.3-1
 - Update to 2.0.3
 - Removed x86_64 autoreconf



From fedora-extras-commits at redhat.com  Wed Oct  4 22:57:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:57:08 -0700
Subject: rpms/fatsort/devel fatsort.spec,1.6,1.7
Message-ID: <200610042257.k94MvAUk014760@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fatsort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14743

Modified Files:
	fatsort.spec 
Log Message:
automated bump and rebuild


Index: fatsort.spec
===================================================================
RCS file: /cvs/extras/rpms/fatsort/devel/fatsort.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fatsort.spec	18 Sep 2006 21:47:39 -0000	1.6
+++ fatsort.spec	4 Oct 2006 22:57:08 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           fatsort
 Version:        0.9.6.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Fatsort sorts the FAT of FAT16 and FAT32 filesystems
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.6.1-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Till Maas <opensource[AT]till.name> - 0.9.6.1-7
 - Fixing typos in changelog
 * Sat Sep 02 2006 Till Maas <opensource[AT]till.name> - 0.9.6.1-6



From fedora-extras-commits at redhat.com  Wed Oct  4 22:57:41 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:57:41 -0700
Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.17,1.18
Message-ID: <200610042257.k94MvhYG014824@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14807

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
automated bump and rebuild


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- R-RScaLAPACK.spec	18 Sep 2006 21:28:42 -0000	1.17
+++ R-RScaLAPACK.spec	4 Oct 2006 22:57:41 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: Freely distributable
 URL: http://cran.r-project.org/contrib
@@ -65,6 +65,9 @@
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.1-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-6
 - BR: lam-devel
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:58:06 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:58:06 -0700
Subject: rpms/gajim/devel gajim.spec,1.14,1.15
Message-ID: <200610042258.k94Mw8Mp014888@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871

Modified Files:
	gajim.spec 
Log Message:
automated bump and rebuild


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gajim.spec	18 Sep 2006 20:20:41 -0000	1.14
+++ gajim.spec	4 Oct 2006 22:58:06 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gajim
 Version:        0.10.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
@@ -80,6 +80,9 @@
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.10.1-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.10.1-2
 - Rebuild for FE6
 - Fix mixed-use-of-spaces-and-tabs rpmlint warning



From fedora-extras-commits at redhat.com  Wed Oct  4 22:58:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:58:30 -0700
Subject: rpms/util-vserver/devel util-vserver.spec,1.19,1.20
Message-ID: <200610042258.k94MwWCf014952@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14935

Modified Files:
	util-vserver.spec 
Log Message:
automated bump and rebuild


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- util-vserver.spec	18 Sep 2006 18:25:20 -0000	1.19
+++ util-vserver.spec	4 Oct 2006 22:58:30 -0000	1.20
@@ -21,7 +21,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.210
-Release:	%release_func 4
+Release: %release_func 5
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -351,6 +351,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.30.210-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-4
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:58:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:58:55 -0700
Subject: rpms/rekall/devel rekall.spec,1.16,1.17
Message-ID: <200610042258.k94MwvMk015018@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15001

Modified Files:
	rekall.spec 
Log Message:
automated bump and rebuild


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rekall.spec	18 Sep 2006 13:45:39 -0000	1.16
+++ rekall.spec	4 Oct 2006 22:58:55 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
@@ -255,6 +255,9 @@
 %{_libdir}/python*/site-packages/rkdcop.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.4.3-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-4
 - fix 64 bit, nuke -common, add new files
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:59:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:59:20 -0700
Subject: rpms/libsynaptics/devel libsynaptics.spec,1.3,1.4
Message-ID: <200610042259.k94MxMp0015085@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libsynaptics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15068

Modified Files:
	libsynaptics.spec 
Log Message:
automated bump and rebuild


Index: libsynaptics.spec
===================================================================
RCS file: /cvs/extras/rpms/libsynaptics/devel/libsynaptics.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsynaptics.spec	30 Aug 2006 03:14:32 -0000	1.3
+++ libsynaptics.spec	4 Oct 2006 22:59:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libsynaptics
 Version:        0.14.6b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Synaptics touchpad driver library
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.14.6b-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Aug 29 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.14.6b-3
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Wed Oct  4 22:59:45 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 15:59:45 -0700
Subject: rpms/liferea/devel liferea.spec,1.50,1.51
Message-ID: <200610042259.k94MxlUo015149@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15132

Modified Files:
	liferea.spec 
Log Message:
automated bump and rebuild


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- liferea.spec	18 Sep 2006 16:33:25 -0000	1.50
+++ liferea.spec	4 Oct 2006 22:59:45 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.23-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-1
 - Update to 1.0.23.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:00:10 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:00:10 -0700
Subject: rpms/cyrus-imapd/devel cyrus-imapd.spec,1.15,1.16
Message-ID: <200610042300.k94N0C8u015225@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15205

Modified Files:
	cyrus-imapd.spec 
Log Message:
automated bump and rebuild


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cyrus-imapd.spec	18 Sep 2006 15:04:32 -0000	1.15
+++ cyrus-imapd.spec	4 Oct 2006 23:00:10 -0000	1.16
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -806,6 +806,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.3.7-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 John Dennis <jdennis at redhat.com> - 2.3.7-3
 - bump rev for rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:00:42 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:00:42 -0700
Subject: rpms/filelight/devel filelight.spec,1.1,1.2
Message-ID: <200610042300.k94N0ijC015289@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/filelight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15272

Modified Files:
	filelight.spec 
Log Message:
automated bump and rebuild


Index: filelight.spec
===================================================================
RCS file: /cvs/extras/rpms/filelight/devel/filelight.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filelight.spec	17 Sep 2006 20:07:14 -0000	1.1
+++ filelight.spec	4 Oct 2006 23:00:42 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Graphical disk usage statistics
 Name: filelight
 Version: 1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 11 2006 Neal Becker <ndbecker2 at gmail.com> - 1.0-8
 - Add --delete-original to desktop-file-install
 - Add gtk-update-icon-cache



From fedora-extras-commits at redhat.com  Wed Oct  4 23:01:07 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:01:07 -0700
Subject: rpms/synce-gnomevfs/devel synce-gnomevfs.spec,1.5,1.6
Message-ID: <200610042301.k94N19Dg018124@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17781

Modified Files:
	synce-gnomevfs.spec 
Log Message:
automated bump and rebuild


Index: synce-gnomevfs.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/devel/synce-gnomevfs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- synce-gnomevfs.spec	18 Sep 2006 13:20:08 -0000	1.5
+++ synce-gnomevfs.spec	4 Oct 2006 23:01:07 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           synce-gnomevfs
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Gnome-vfs module for synce
 
 Group:          Applications/Communications
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.0-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.0-4
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 23:01:36 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:01:36 -0700
Subject: rpms/unshield/devel unshield.spec,1.4,1.5
Message-ID: <200610042301.k94N1cuj018222@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/unshield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18205

Modified Files:
	unshield.spec 
Log Message:
automated bump and rebuild


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/unshield.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unshield.spec	18 Sep 2006 12:56:44 -0000	1.4
+++ unshield.spec	4 Oct 2006 23:01:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           unshield
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
@@ -66,6 +66,9 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.5-4
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 23:02:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:02:09 -0700
Subject: rpms/dynamite/devel dynamite.spec,1.5,1.6
Message-ID: <200610042302.k94N2iwY018292@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dynamite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18271

Modified Files:
	dynamite.spec 
Log Message:
automated bump and rebuild


Index: dynamite.spec
===================================================================
RCS file: /cvs/extras/rpms/dynamite/devel/dynamite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dynamite.spec	18 Sep 2006 12:55:05 -0000	1.5
+++ dynamite.spec	4 Oct 2006 23:02:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           dynamite
 Version:        0.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Extract data compressed with PKWARE Data Compression Library
 
 Group:          Applications/Communications
@@ -55,6 +55,9 @@
 %{_datadir}/aclocal/dynamite.m4
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.1-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.1-5
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 23:03:18 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:03:18 -0700
Subject: rpms/licq/devel licq.spec,1.10,1.11
Message-ID: <200610042303.k94N3KIE018356@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18339

Modified Files:
	licq.spec 
Log Message:
automated bump and rebuild


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- licq.spec	18 Sep 2006 11:58:32 -0000	1.10
+++ licq.spec	4 Oct 2006 23:03:17 -0000	1.11
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 10
+Release: 11
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 Source1: licq-viewurl.sh
@@ -170,6 +170,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.2-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-10
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:03:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:03:50 -0700
Subject: rpms/jhead/devel jhead.spec,1.15,1.16
Message-ID: <200610042304.k94N4Oo6018423@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/jhead/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18403

Modified Files:
	jhead.spec 
Log Message:
automated bump and rebuild


Index: jhead.spec
===================================================================
RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jhead.spec	18 Sep 2006 10:09:29 -0000	1.15
+++ jhead.spec	4 Oct 2006 23:03:50 -0000	1.16
@@ -1,6 +1,6 @@
 Name: jhead
 Version: 2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tool for displaying EXIF data embedded in JPEG images
 Group: Applications/Multimedia
 License: Public Domain
@@ -37,6 +37,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.6-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 2.6-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:05:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:05:05 -0700
Subject: rpms/mtd-utils/devel mtd-utils.spec,1.5,1.6
Message-ID: <200610042305.k94N5cWC018488@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/mtd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18471

Modified Files:
	mtd-utils.spec 
Log Message:
automated bump and rebuild


Index: mtd-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/mtd-utils/devel/mtd-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mtd-utils.spec	18 Sep 2006 07:58:47 -0000	1.5
+++ mtd-utils.spec	4 Oct 2006 23:05:05 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Utilities for dealing with MTD (flash) devices
 Name: mtd-utils
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.linux-mtd.infradead.org/
@@ -37,6 +37,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 David Woodhouse <dwmw2 at infradead.org> - 1.0.1-1
 - Update to 1.0.1
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:06:10 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:06:10 -0700
Subject: rpms/kover/devel kover.spec,1.13,1.14
Message-ID: <200610042306.k94N6C6B018560@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/kover/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18543

Modified Files:
	kover.spec 
Log Message:
automated bump and rebuild


Index: kover.spec
===================================================================
RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kover.spec	18 Sep 2006 07:24:48 -0000	1.13
+++ kover.spec	4 Oct 2006 23:06:10 -0000	1.14
@@ -1,7 +1,7 @@
 Name: kover
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 2.9.6
-Release: 7
+Release: 8
 License: GPL
 Group: Applications/Publishing
 Source0 http://lisas.de/kover/kover-2.9.6.tar.gz
@@ -59,6 +59,9 @@
 %attr(755,root,root)%{_bindir}/cd-text
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.9.6-8
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 2.9.6-7
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:06:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:06:48 -0700
Subject: rpms/most/devel most.spec,1.12,1.13
Message-ID: <200610042306.k94N6ojk018679@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/most/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18662

Modified Files:
	most.spec 
Log Message:
automated bump and rebuild


Index: most.spec
===================================================================
RCS file: /cvs/extras/rpms/most/devel/most.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- most.spec	18 Sep 2006 07:06:20 -0000	1.12
+++ most.spec	4 Oct 2006 23:06:48 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: more, less, most
 Name: most
 Version: 4.10.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: ftp://space.mit.edu/pub/davis/most/
 Group: Applications/Text
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 4.10.2-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 4.10.2-4
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:07:13 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:07:13 -0700
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.13,1.14
Message-ID: <200610042307.k94N7F6b018743@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18726

Modified Files:
	milter-greylist.spec 
Log Message:
automated bump and rebuild


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- milter-greylist.spec	18 Sep 2006 06:32:54 -0000	1.13
+++ milter-greylist.spec	4 Oct 2006 23:07:13 -0000	1.14
@@ -24,7 +24,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	2.1.12
-Release:	%release_func 2
+Release: %release_func 3
 License:	BSD w/ advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -235,6 +235,9 @@
 %endif
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.12-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.12-2
 - updated to 2.1.12
 - use new fedora-usermgmt stuff



From fedora-extras-commits at redhat.com  Wed Oct  4 23:07:40 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:07:40 -0700
Subject: rpms/ip-sentinel/devel ip-sentinel.spec,1.11,1.12
Message-ID: <200610042307.k94N7gUu018807@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18790

Modified Files:
	ip-sentinel.spec 
Log Message:
automated bump and rebuild


Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ip-sentinel.spec	18 Sep 2006 06:25:59 -0000	1.11
+++ ip-sentinel.spec	4 Oct 2006 23:07:40 -0000	1.12
@@ -41,7 +41,7 @@
 Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
 Version:	0.12
-Release:	%release_func 8
+Release: %release_func 9
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.nongnu.org/ip-sentinel/
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.12-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.12-8
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:08:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:08:05 -0700
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.15,1.16
Message-ID: <200610042308.k94N87va018875@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18858

Modified Files:
	dhcp-forwarder.spec 
Log Message:
automated bump and rebuild


Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dhcp-forwarder.spec	18 Sep 2006 06:24:33 -0000	1.15
+++ dhcp-forwarder.spec	4 Oct 2006 23:08:05 -0000	1.16
@@ -24,7 +24,7 @@
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
-Release:	%release_func 10
+Release: %release_func 11
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-10
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:08:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:08:30 -0700
Subject: rpms/ninja/devel ninja.spec,1.9,1.10
Message-ID: <200610042308.k94N8WTn018948@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ninja/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18931

Modified Files:
	ninja.spec 
Log Message:
automated bump and rebuild


Index: ninja.spec
===================================================================
RCS file: /cvs/extras/rpms/ninja/devel/ninja.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ninja.spec	18 Sep 2006 05:39:45 -0000	1.9
+++ ninja.spec	4 Oct 2006 23:08:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name: ninja
 Version: 1.5.8.1
-Release: 5
+Release: 6
 License: GPL
 Summary: Text based Internet Relay Chat (IRC) client
 Group: Applications/Internet
@@ -58,6 +58,9 @@
 %doc README ChangeLog BUGS+TODO
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.8.1-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 16 2006 Adrian Reber <adrian at lisas.de> - 1.5.8.1-5
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:08:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:08:58 -0700
Subject: rpms/picocom/devel picocom.spec,1.1,1.2
Message-ID: <200610042309.k94N90Be019014@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/picocom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18997

Modified Files:
	picocom.spec 
Log Message:
automated bump and rebuild


Index: picocom.spec
===================================================================
RCS file: /cvs/extras/rpms/picocom/devel/picocom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- picocom.spec	17 Sep 2006 20:42:39 -0000	1.1
+++ picocom.spec	4 Oct 2006 23:08:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           picocom
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Minimal serial communications program
 
 Group:          Applications/Communications
@@ -45,6 +45,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.4-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 14 2006 Sean Reifschneider <jafo at tummy.com> 1.4-2
 - Incorporating changes from Fedora Extras review from denis at poolshark
   dot org and panemade at gmail dot com.



From fedora-extras-commits at redhat.com  Wed Oct  4 23:09:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:09:25 -0700
Subject: rpms/sblim-wbemcli/devel sblim-wbemcli.spec,1.4,1.5
Message-ID: <200610042309.k94N9RRM019079@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sblim-wbemcli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19062

Modified Files:
	sblim-wbemcli.spec 
Log Message:
automated bump and rebuild


Index: sblim-wbemcli.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/devel/sblim-wbemcli.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sblim-wbemcli.spec	17 Sep 2006 22:25:59 -0000	1.4
+++ sblim-wbemcli.spec	4 Oct 2006 23:09:24 -0000	1.5
@@ -9,7 +9,7 @@
 Summary: SBLIM WBEM Command Line Interface
 Name: sblim-wbemcli
 Version: 1.5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL
@@ -47,6 +47,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.1-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 
 * Mon Nov 21 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.5.1-1
   - Upgrade to version 1.5.1 (SSL V3 enforced, default CACERT).



From fedora-extras-commits at redhat.com  Wed Oct  4 23:09:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:09:50 -0700
Subject: rpms/sblim-cmpi-devel/devel sblim-cmpi-devel.spec,1.4,1.5
Message-ID: <200610042309.k94N9qDe019149@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sblim-cmpi-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19132

Modified Files:
	sblim-cmpi-devel.spec 
Log Message:
automated bump and rebuild


Index: sblim-cmpi-devel.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/devel/sblim-cmpi-devel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sblim-cmpi-devel.spec	17 Sep 2006 22:23:59 -0000	1.4
+++ sblim-cmpi-devel.spec	4 Oct 2006 23:09:50 -0000	1.5
@@ -13,7 +13,7 @@
 Summary: SBLIM CMPI Provider Development Support
 Name: sblim-cmpi-devel
 Version: 1.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL
@@ -55,5 +55,8 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.4-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Feb 09 2006 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.0.4-1
   - Initial RH/Fedora version



From fedora-extras-commits at redhat.com  Wed Oct  4 23:10:17 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:10:17 -0700
Subject: rpms/sblim-cmpi-base/devel sblim-cmpi-base.spec,1.4,1.5
Message-ID: <200610042310.k94NAJnC019213@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19194

Modified Files:
	sblim-cmpi-base.spec 
Log Message:
automated bump and rebuild


Index: sblim-cmpi-base.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sblim-cmpi-base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sblim-cmpi-base.spec	17 Sep 2006 22:23:09 -0000	1.4
+++ sblim-cmpi-base.spec	4 Oct 2006 23:10:17 -0000	1.5
@@ -12,7 +12,7 @@
 Summary: SBLIM Base Providers
 Name: sblim-cmpi-base
 Version: 1.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL
@@ -119,6 +119,9 @@
 %{_datadir}/sblim-testsuite
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.4-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 
 * Thu Nov 10 2005  <mihajlov at de.ibm.com> - 1.5.4-3
 - suppress error output in post scriptlets



From fedora-extras-commits at redhat.com  Wed Oct  4 23:14:01 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:14:01 -0700
Subject: rpms/ipe/devel ipe.spec,1.8,1.9
Message-ID: <200610042314.k94NE3UW019287@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ipe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19270

Modified Files:
	ipe.spec 
Log Message:
automated bump and rebuild


Index: ipe.spec
===================================================================
RCS file: /cvs/extras/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ipe.spec	26 Sep 2006 12:58:14 -0000	1.8
+++ ipe.spec	4 Oct 2006 23:14:01 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.13.%{preversion}%{?dist}
+Release:        0.14.%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
@@ -161,6 +161,9 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 6.0-0.14.pre27
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Tue Sep 26 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.13.pre27
 - Add BR: pkgconfig.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:17:30 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:17:30 -0700
Subject: rpms/XaraLX/devel XaraLX.spec,1.5,1.6
Message-ID: <200610042317.k94NHWxs019379@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/XaraLX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19362

Modified Files:
	XaraLX.spec 
Log Message:
automated bump and rebuild


Index: XaraLX.spec
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/devel/XaraLX.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XaraLX.spec	21 Sep 2006 22:21:40 -0000	1.5
+++ XaraLX.spec	4 Oct 2006 23:17:30 -0000	1.6
@@ -3,7 +3,7 @@
 Name:		XaraLX
 Summary: 	Vector/general purpose graphics utility
 Version:	0.7
-Release:	6%{?dist}.%{buildRev}
+Release:	7%{?dist}.%{buildRev}
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://downloads.xara.com/opensource/%{name}-%{version}%{buildRev}.tar.bz2
@@ -90,6 +90,9 @@
 %{_docdir}/XaraLX/examples
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-7.r1759
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-5.r1759
 - bump
 - added two BRs for autoreconf



From fedora-extras-commits at redhat.com  Wed Oct  4 23:19:23 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:19:23 -0700
Subject: rpms/libuninameslist/devel libuninameslist.spec,1.9,1.10
Message-ID: <200610042319.k94NJPgp019454@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/libuninameslist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19437

Modified Files:
	libuninameslist.spec 
Log Message:
automated bump and rebuild


Index: libuninameslist.spec
===================================================================
RCS file: /cvs/extras/rpms/libuninameslist/devel/libuninameslist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libuninameslist.spec	21 Sep 2006 04:57:35 -0000	1.9
+++ libuninameslist.spec	4 Oct 2006 23:19:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libuninameslist
 Version:        0.0
-Release:        5.20060907
+Release:        6.20060907
 
 Summary:        Library that provides Unicode names and annotations
 
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.0-6.20060907
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Wed Sep 20 2006 Kevin Fenzi <kevin at tummy.com> - 0.0-5.20060907
 - Take over maintainership. 
 - Update to 20060907



From fedora-extras-commits at redhat.com  Wed Oct  4 23:22:31 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:22:31 -0700
Subject: rpms/gaim-guifications/devel gaim-guifications.spec,1.6,1.7
Message-ID: <200610042322.k94NMXDd019536@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gaim-guifications/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19519

Modified Files:
	gaim-guifications.spec 
Log Message:
automated bump and rebuild


Index: gaim-guifications.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-guifications/devel/gaim-guifications.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-guifications.spec	19 Sep 2006 14:43:47 -0000	1.6
+++ gaim-guifications.spec	4 Oct 2006 23:22:31 -0000	1.7
@@ -13,7 +13,7 @@
 Summary:    Guifications Plugin for Gaim
 Name:       gaim-guifications
 Version:    2.13
-Release:    0.2.beta3%{?dist}
+Release:    0.3.beta3%{?dist}
 License:    GPL
 Group:      Applications/Internet
 Url:        http://guifications.sourceforge.net/Guifications/
@@ -53,6 +53,9 @@
 %{_datadir}/pixmaps/gaim/guifications
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.13-0.3.beta3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.13-0.2.beta3
 - keep this guy alive, bump to 2.13 beta3
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:25:47 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:25:47 -0700
Subject: rpms/jogl/devel jogl.spec,1.26,1.27
Message-ID: <200610042325.k94NPn47019621@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/jogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19604

Modified Files:
	jogl.spec 
Log Message:
automated bump and rebuild


Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jogl.spec	19 Sep 2006 05:14:22 -0000	1.26
+++ jogl.spec	4 Oct 2006 23:25:47 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           jogl
 Version:        1.0.0
-Release:        5.6.beta5%{?dist}
+Release:        5.7.beta5%{?dist}
 Summary:        Java bindings for the OpenGL API
 Epoch:          1
 
@@ -108,6 +108,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1:1.0.0-5.7.beta5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 1:1.0.0-5.6.beta5
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:28:37 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:28:37 -0700
Subject: rpms/jakarta-commons-cli/devel jakarta-commons-cli.spec,1.5,1.6
Message-ID: <200610042328.k94NSdN5019695@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/jakarta-commons-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19678

Modified Files:
	jakarta-commons-cli.spec 
Log Message:
automated bump and rebuild


Index: jakarta-commons-cli.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-cli/devel/jakarta-commons-cli.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jakarta-commons-cli.spec	19 Sep 2006 05:13:53 -0000	1.5
+++ jakarta-commons-cli.spec	4 Oct 2006 23:28:36 -0000	1.6
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release:        6jpp_9%{?dist}
+Release:        6jpp_10%{?dist}
 Epoch:          0
 Summary:        Command Line Interface Library for Java
 License:        Apache Software License
@@ -87,6 +87,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 0:1.0-6jpp_10
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 0:1.0-6jpp_9
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:31:34 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:31:34 -0700
Subject: rpms/fluidsynth/devel fluidsynth.spec,1.3,1.4
Message-ID: <200610042331.k94NVatS019794@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/fluidsynth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777

Modified Files:
	fluidsynth.spec 
Log Message:
automated bump and rebuild


Index: fluidsynth.spec
===================================================================
RCS file: /cvs/extras/rpms/fluidsynth/devel/fluidsynth.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fluidsynth.spec	19 Sep 2006 05:11:23 -0000	1.3
+++ fluidsynth.spec	4 Oct 2006 23:31:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
 Version:      1.0.7
-Release:      7.a%{?dist}
+Release:      8.a%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://download.savannah.gnu.org/releases/fluid/fluidsynth-1.0.7a.tar.gz
 License:      LGPL
@@ -85,6 +85,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 1.0.7-8.a
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> 1.0.7-7.a
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:36:24 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:36:24 -0700
Subject: rpms/orange/devel orange.spec,1.7,1.8
Message-ID: <200610042336.k94NaQFW019895@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/orange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19878

Modified Files:
	orange.spec 
Log Message:
automated bump and rebuild


Index: orange.spec
===================================================================
RCS file: /cvs/extras/rpms/orange/devel/orange.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- orange.spec	18 Sep 2006 14:11:58 -0000	1.7
+++ orange.spec	4 Oct 2006 23:36:24 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           orange
 Version:        0.3
-Release:        2.cvs20051118%{?dist}
+Release:        3.cvs20051118%{?dist}
 Summary:        Squeeze out installable Microsoft cabinet files
 
 Group:          Applications/Communications
@@ -73,6 +73,9 @@
 %{_includedir}/liborange.h
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.3-3.cvs20051118
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.3-2.cvs20051118
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Wed Oct  4 23:38:53 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:38:53 -0700
Subject: rpms/ebtables/devel ebtables.spec,1.13,1.14
Message-ID: <200610042338.k94Nct3i019974@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ebtables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19957

Modified Files:
	ebtables.spec 
Log Message:
automated bump and rebuild


Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ebtables.spec	18 Sep 2006 12:30:10 -0000	1.13
+++ ebtables.spec	4 Oct 2006 23:38:53 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.6.%{prever}%{?dist}
+Release:	0.7.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -80,6 +80,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.8-0.7.rc2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.6.rc2
 - fix versioning
 



From fedora-extras-commits at redhat.com  Wed Oct  4 23:40:59 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed,  4 Oct 2006 16:40:59 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.1,1.2
Message-ID: <200610042341.k94Nf1ks020052@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20035

Modified Files:
	Thunar.spec 
Log Message:
automated bump and rebuild


Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Thunar.spec	17 Sep 2006 22:55:50 -0000	1.1
+++ Thunar.spec	4 Oct 2006 23:40:59 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.5.rc1%{?dist}
+Release: 0.6.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -163,6 +163,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 0.4.0-0.6.rc1
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sat Sep 16 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.5.rc1
 - Remove duplicate thunar-sendto-email.desktop entry from files. 
 



From fedora-extras-commits at redhat.com  Thu Oct  5 01:26:19 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 18:26:19 -0700
Subject: rpms/perl-Readonly Makefile,1.1,1.2
Message-ID: <200610050126.k951QLBE026203@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155

Modified Files:
	Makefile 
Log Message:
- rework spec to use macros
- we now require perl(Readonly::XS)



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	8 Dec 2005 18:46:49 -0000	1.1
+++ Makefile	5 Oct 2006 01:26:18 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Thu Oct  5 01:26:19 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 18:26:19 -0700
Subject: rpms/perl-Readonly/FC-5 perl-Readonly.spec,1.1,1.2
Message-ID: <200610050126.k951QL0g026207@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155/FC-5

Modified Files:
	perl-Readonly.spec 
Log Message:
- rework spec to use macros
- we now require perl(Readonly::XS)



Index: perl-Readonly.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/FC-5/perl-Readonly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Readonly.spec	8 Dec 2005 18:48:05 -0000	1.1
+++ perl-Readonly.spec	5 Oct 2006 01:26:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Readonly
 Version:        1.03
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Facility for creating read-only scalars, arrays, hashes
 
 Group:          Development/Libraries
@@ -8,8 +8,12 @@
 URL:            http://search.cpan.org/dist/Readonly/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
+
+# perl-Readonly-XS builds for all current fedora architectures, so let's
+# require it.
+Requires:       perl(Readonly::XS)
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -34,20 +38,24 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{perl_vendorlib}/benchmark.pl .
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
+
+# make sure this goes where it should to be...
+mv %{buildroot}%{perl_vendorlib}/benchmark.pl .
+
 
 %check
 make test
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -58,6 +66,15 @@
 
 
 %changelog
+* Wed Oct 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-6
+- add explict requires on perl(Readonly::XS).  perl(Readonly::XS) is available
+  for all architectures fedora supports, so there's no good reason to not
+  require it.
+- spec file rework
+
+* Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-5
+- bump for mass rebuild
+
 * Thu Dec 08 2005 Michael A. Peters <mpeters at mac.com> - 1.03-3
 - Remove requires on perl-Readonly-XS
 



From fedora-extras-commits at redhat.com  Thu Oct  5 01:26:20 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed,  4 Oct 2006 18:26:20 -0700
Subject: rpms/perl-Readonly/devel perl-Readonly.spec,1.2,1.3
Message-ID: <200610050126.k951QMSa026211@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155/devel

Modified Files:
	perl-Readonly.spec 
Log Message:
- rework spec to use macros
- we now require perl(Readonly::XS)



Index: perl-Readonly.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/devel/perl-Readonly.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Readonly.spec	19 Sep 2006 22:56:20 -0000	1.2
+++ perl-Readonly.spec	5 Oct 2006 01:26:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Readonly
 Version:        1.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Facility for creating read-only scalars, arrays, hashes
 
 Group:          Development/Libraries
@@ -8,8 +8,12 @@
 URL:            http://search.cpan.org/dist/Readonly/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
+
+# perl-Readonly-XS builds for all current fedora architectures, so let's
+# require it.
+Requires:       perl(Readonly::XS)
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -34,20 +38,24 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{perl_vendorlib}/benchmark.pl .
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
+
+# make sure this goes where it should to be...
+mv %{buildroot}%{perl_vendorlib}/benchmark.pl .
+
 
 %check
 make test
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -58,6 +66,12 @@
 
 
 %changelog
+* Wed Oct 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-6
+- add explict requires on perl(Readonly::XS).  perl(Readonly::XS) is available
+  for all architectures fedora supports, so there's no good reason to not
+  require it.
+- spec file rework
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.03-5
 - bump for mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Oct  5 01:39:07 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 18:39:07 -0700
Subject: rpms/libxfce4util/devel libxfce4util.spec, 1.11, 1.12 sources, 1.5, 
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200610050139.k951d9mV026382@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26361

Modified Files:
	libxfce4util.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxfce4util.spec	30 Aug 2006 03:24:16 -0000	1.11
+++ libxfce4util.spec	5 Oct 2006 01:39:07 -0000	1.12
@@ -1,13 +1,12 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.2.3.2
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: BSD and LGPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.2/src/libxfce4util-4.2.3.2.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4util-4.3.99.1.tar.bz2
 Group: Development/Libraries
 Requires: glib2 >= 2.0.0
-Prereq: /sbin/ldconfig
 BuildRequires: glib2-devel >= 2.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +46,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog ChangeLog.pre-4.2.0 COPYING NEWS
 %{_libdir}/lib*.so.*
 %{_sbindir}/xfce4-kiosk-query
 
@@ -55,13 +55,25 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4
-%{_datadir}/xfce4/m4/
-%doc %{_datadir}/gtk-doc/html/libxfce4util
 
 %changelog
-* Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-3
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.4rc1/4.3.99.1
+- Remove unneeded PreReq
+- Added doc files
+
+* Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-2
 - Make devel package own includedir/xfce4 (fixes #203644)
 
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- upgrade to 4.3.90.1
+
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-2.fc5
 - Rebuild for fc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 06:12:10 -0000	1.5
+++ sources	5 Oct 2006 01:39:07 -0000	1.6
@@ -1 +1 @@
-2d312ba48da612501d6776f8b4a65797  libxfce4util-4.2.3.2.tar.gz
+5474fda120b0f28f3b86bee268467060  libxfce4util-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 06:12:10 -0000	1.5
+++ .cvsignore	5 Oct 2006 01:39:07 -0000	1.6
@@ -1 +1 @@
-libxfce4util-4.2.3.2.tar.gz
+libxfce4util-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 01:42:24 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 18:42:24 -0700
Subject: rpms/libxfcegui4/devel libxfcegui4.spec, 1.13, 1.14 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050142.k951gQOK026436@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415

Modified Files:
	libxfcegui4.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libxfcegui4.spec	30 Aug 2006 03:30:11 -0000	1.13
+++ libxfcegui4.spec	5 Oct 2006 01:42:24 -0000	1.14
@@ -1,13 +1,12 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.2.3
-Release: 6%{?dist}
+Version: 4.3.99.1
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/libxfcegui4-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Prereq: /sbin/ldconfig
 Requires: gtk2 >= 2.0.6
 Requires: libxfce4util >= %{version}
 BuildRequires: gtk2-devel >= 2.0.6
@@ -27,7 +26,6 @@
 Requires: %{name} = %{version}-%{release}
 Requires: gtk2-devel
 Requires: libxfce4util-devel
-Provides: libxfcegui4-devel
 
 %description devel
 This package includes the static libraries and header files you will need
@@ -58,18 +56,23 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING 
 %{_libdir}/lib*.so.*
-%{_libdir}/xfce4/modules/*.so*
-%{_datadir}/xfce4/*
+%{_datadir}/xfce4/xfce-svg-test.svg
 
 %files devel
 %defattr(-, root, root)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/*
-%{_datadir}/gtk-doc/html/libxfcegui4
 
 %changelog
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Add doc files
+- Remove useless Prereq
+- Remove useless Provides: libxfcegui4-devel
+
 * Sun Aug 27 2006 <kevin at tummy.com> - 4.2.3-6
 - fix .so included in main package instead of devel. (#203629)
 
@@ -101,7 +104,7 @@
 - remove stuff, remove version from dbh-devel buildreq
 
 * Wed Mar 16 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2
-- Fixed %files bug that wasn't packaging .so files
+- Fixed %%files bug that wasn't packaging .so files
 
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2005 19:36:55 -0000	1.4
+++ sources	5 Oct 2006 01:42:24 -0000	1.5
@@ -1 +1 @@
-5d2bae78c5ef66e914ae7a930bbdeb57  libxfcegui4-4.2.3.tar.gz
+519bca1ba08e51f03584ce6c007cd10d  libxfcegui4-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Nov 2005 19:36:55 -0000	1.4
+++ .cvsignore	5 Oct 2006 01:42:24 -0000	1.5
@@ -1 +1 @@
-libxfcegui4-4.2.3.tar.gz
+libxfcegui4-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 01:43:59 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 18:43:59 -0700
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.14,1.15
Message-ID: <200610050144.k951i1kL026465@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26447

Modified Files:
	libxfcegui4.spec 
Log Message:
Bump release for upgrade from testing repo



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libxfcegui4.spec	5 Oct 2006 01:42:24 -0000	1.14
+++ libxfcegui4.spec	5 Oct 2006 01:43:59 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.3.99.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
@@ -67,6 +67,9 @@
 %{_includedir}/xfce4/*
 
 %changelog
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel build
+
 * Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
 - Upgrade to 4.3.99.1
 - Add doc files



From fedora-extras-commits at redhat.com  Thu Oct  5 01:48:05 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 18:48:05 -0700
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec, 1.10, 1.11 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050148.k951m7Cm026535@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26514

Modified Files:
	libxfce4mcs.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxfce4mcs.spec	30 Aug 2006 03:33:12 -0000	1.10
+++ libxfce4mcs.spec	5 Oct 2006 01:48:05 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
-Version: 4.2.3
-Release: 6%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3/src/libxfce4mcs-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4mcs-4.3.99.1.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Prereq: /sbin/ldconfig
@@ -53,6 +53,7 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -60,11 +61,19 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/libxfce4mcs
-%{_datadir}/gtk-doc/html/libxfce4mcs
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-6
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1-1
+
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1.fc6
+- upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5.fc5
 - Rebuild for fc5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 15:57:28 -0000	1.4
+++ sources	5 Oct 2006 01:48:05 -0000	1.5
@@ -1 +1 @@
-b3244024bea7f5756f4c0f541bc24128  libxfce4mcs-4.2.3.tar.gz
+ad70646a4ef699d7adcd409339f78884  libxfce4mcs-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 15:57:28 -0000	1.4
+++ .cvsignore	5 Oct 2006 01:48:05 -0000	1.5
@@ -1 +1 @@
-libxfce4mcs-4.2.3.tar.gz
+libxfce4mcs-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:01:44 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:01:44 -0700
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec, 1.7, 1.8 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050202.k9522HJd029451@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29428

Modified Files:
	xfce-mcs-manager.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce-mcs-manager.spec	30 Aug 2006 03:35:27 -0000	1.7
+++ xfce-mcs-manager.spec	5 Oct 2006 02:01:44 -0000	1.8
@@ -1,10 +1,10 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-mcs-manager-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-manager-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: libxfce4mcs >= %{version}
@@ -46,11 +46,11 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc README TODO COPYING AUTHORS
+%doc ChangeLog COPYING AUTHORS
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/he
+%{_datadir}/xfce4/doc/it
 %{_datadir}/icons/*/*/apps/*.png
 %{_bindir}/*
 %{_datadir}/applications/*
@@ -61,8 +61,17 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Rebuild for fc6 
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1 
+- Update to 4.3.99.1
+
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1.fc6
+- Upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5 
 - Rebuild for fc5 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:12:10 -0000	1.4
+++ sources	5 Oct 2006 02:01:44 -0000	1.5
@@ -1 +1 @@
-029e7cc2b20a3de5f908483b4253f492  xfce-mcs-manager-4.2.3.tar.gz
+1a42226297b3b89f19bd17a6841f5c3a  xfce-mcs-manager-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:12:10 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:01:44 -0000	1.5
@@ -1 +1 @@
-xfce-mcs-manager-4.2.3.tar.gz
+xfce-mcs-manager-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:10:26 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:10:26 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec, 1.12, 1.13 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050210.k952ASP0029577@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29556

Modified Files:
	xfce4-panel.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-panel.spec	30 Aug 2006 04:17:58 -0000	1.12
+++ xfce4-panel.spec	5 Oct 2006 02:10:26 -0000	1.13
@@ -1,19 +1,18 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.2.3
-Release: 7%{?dist}
+Version: 4.3.99.1
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-panel-4.2.3.tar.gz
-# Change default for Fedora
-Patch0: panel-launchmail.patch
-Patch1: panel-htmlview.patch
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= %{version}
 Requires: libxfce4mcs >= %{version}
 Requires: xfce-mcs-manager >= %{version}
 Requires: libxml2 >= 2.4.0
+Requires: Terminal
+Requires: mousepad
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: xfce-mcs-manager-devel >= %{version}
@@ -22,16 +21,40 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
+# xfce4-iconbox isn't in Xfce 4.4
+Provides: xfce4-iconbox = %{version}-%{release}
+Obsoletes: xfce4-iconbox <= 4.2.3-4
+# xfce4-systray isn't in Xfce 4.4
+Provides: xfce4-systray = %{version}-%{release}
+Obsoletes: xfce4-systray <= 4.2.3-3
+# xfce4-toys isn't in Xfce 4.4
+Provides: xfce4-toys = %{version}-%{release}
+Obsoletes: xfce4-toys <= 4.2.3-3
+# xfce4-trigger-launcher isn't in Xfce 4.4
+Provides: xfce4-trigger-launcher = %{version}-%{release}
+Obsoletes: xfce4-trigger-launcher <= 4.2.3-3
+# xfce4-modemlights-plugin isn't in Xfce 4.4
+Provides: xfce4-modemlights-plugin = %{version}-%{release}
+Obsoletes: xfce4-modemlights-plugin <= 4.2.3-3
+# xfce4-showdesktop-plugin isn't in Xfce 4.4
+Provides: xfce4-showdesktop-plugin = %{version}-%{release}
+Obsoletes: xfce4-showdesktop-plugin <= 4.2.3-3
+# xfce4-taskbar-plugin isn't in Xfce 4.4
+Provides: xfce4-taskbar-plugin = %{version}-%{release}
+Obsoletes: xfce4-taskbar-plugin <= 4.2.3-3
+# xfce4-windowlist-plugin isn't in Xfce 4.4
+Provides: xfce4-windowlist-plugin = %{version}-%{release}
+Obsoletes: xfce4-windowlist-plugin <= 4.2.3-3
 
 %description
 This package includes the panel for the Xfce desktop environment
 
 %package devel
-Summary: developpment headers for xfce4-panel
+Summary: Development headers for xfce4-panel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: libxfce4util-devel >= 4.2.3.2-3
+Requires: libxfce4util-devel = %{version}
 
 %description devel
 This package includes the header files you will need to build
@@ -39,8 +62,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .launchmail
-%patch1 -p1 -b .htmlview
 
 %build
 %configure
@@ -51,39 +72,70 @@
 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
+mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins
 %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 README TODO ChangeLog NEWS NOTES COPYING AUTHORS
-/etc/xdg/xfce4
-%{_datadir}/xfce4/doc
+%doc README ChangeLog NEWS COPYING AUTHORS
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-10.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-menu-5.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-9.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/clock-14.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-7.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/systray-4.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-8.rc
+
 %{_libdir}/xfce4
+%{_libdir}/libxfce4panel.so.*
 %{_bindir}/*
-%{_datadir}/applications/*
+%{_libexecdir}/xfce4/panel-plugins
+%{_datadir}/xfce4/panel-plugins/
 %{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/xfce4/doc/C/xfce4-panel.html
+%{_datadir}/applications/xfce4-panel-manager.desktop
 
 %files devel
 %defattr(-, root, root)
 %{_libdir}/pkgconfig/*
-%{_includedir}/xfce4/panel
+%{_libdir}/libxfce4panel.so
+%{_datadir}/gtk-doc/html/libxfce4panel
+%{_includedir}/xfce4/libxfce4panel
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-7
-- Fix devel Requires to correct libxfce4util
-
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-6
-- Add back in correct include dir for devel subpackage
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add Requires for mousepad and Terminal
+- Bump for devel checkin
+
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Obsolete some more plugins who's functionality has been pulled in. 
+- Own the libexecdir/xfce4/panel-plugins for new plugins. 
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+- Add Provides/Obsoletes for xfce4-iconbox, xfce4-systray, xfce4-toys, xfce4-trigger-launcher
+- Fix typo in devel subpackage summary
+- Add post/postun ldconfig calls
+
+* Thu Aug 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-2
+- fix .so in main package
+- add Requires for libxfce4util-devel
+- don't own includedir/xfce4 (libxfce4util-devel should)
 
-* Thu Aug 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Don't own includedir/xfce4
-- Requires: libxfce4util-devel added to devel 
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2
+- Upgrade to 4.3.90.2
 
-* Mon Jun  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Add gettext to BuildRequires (fixes #194139)
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1.fc6
+- Upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
 - Rebuild for fc5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:35:32 -0000	1.4
+++ sources	5 Oct 2006 02:10:26 -0000	1.5
@@ -1 +1 @@
-3027c4601f208d290a988befed66a49f  xfce4-panel-4.2.3.tar.gz
+8647de295987605161c75650e4554fd8  xfce4-panel-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:35:32 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:10:26 -0000	1.5
@@ -1 +1 @@
-xfce4-panel-4.2.3.tar.gz
+xfce4-panel-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:11:56 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  4 Oct 2006 19:11:56 -0700
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.19,1.20
Message-ID: <200610050211.k952BwZ0029605@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29588

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Wed Oct 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
- Upstream update.
- Remove BR: flex bison.
- Drop osgfbo and osgpbuffer.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- OpenSceneGraph.spec	4 Oct 2006 15:50:57 -0000	1.19
+++ OpenSceneGraph.spec	5 Oct 2006 02:11:56 -0000	1.20
@@ -236,7 +236,9 @@
 %{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
+%if "%{version}" < "1.2"
 %{_bindir}/osgfbo
+%endif
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
 %{_bindir}/osggeodemo
@@ -260,7 +262,9 @@
 %{_bindir}/osgparametric
 %{_bindir}/osgparticle
 %{_bindir}/osgparticleeffects
+%if "%{version}" < "1.2"
 %{_bindir}/osgpbuffer
+%endif
 %{_bindir}/osgpick
 %{_bindir}/osgplanets
 %{_bindir}/osgpoints
@@ -391,9 +395,10 @@
 %{_includedir}/Producer
 
 %changelog
-* Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
+* Wed Oct 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-1
 - Upstream update.
 - Remove BR: flex bison.
+- Drop osgfbo and osgpbuffer.
 
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.1-2
 - Mass rebuild.



From fedora-extras-commits at redhat.com  Thu Oct  5 02:13:53 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:13:53 -0700
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec, 1.11, 1.12 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050213.k952Dt7B029678@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29657

Modified Files:
	gtk-xfce-engine.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gtk-xfce-engine.spec	30 Aug 2006 03:40:50 -0000	1.11
+++ gtk-xfce-engine.spec	5 Oct 2006 02:13:53 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
-Version: 2.2.8
-Release: 4%{?dist}
+Version: 2.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/gtk-xfce-engine-2.2.8.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/gtk-xfce-engine-2.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.0
@@ -31,15 +31,21 @@
 %files
 %defattr(-,root,root)
 %doc README COPYING AUTHORS
-%{_libdir}/gtk-2.0/2.*/engines
+%{_libdir}/gtk-2.0/2.10.0/engines
 %{_datadir}/*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 2.2.8-4
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.99.1-2
+- Bump release for devel checkin
 
-* Fri Jul 14 2006 Kevin Fenzi <kevin at tummy.com> - 2.2.8-3
-- Fix to build against the new gtk (fixes #198904)
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.99.1-1
+- Update to 2.3.99.1
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.90.2-1
+- Update to 2.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.90.1-1.fc6
+- update to 2.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 2.2.8-2.fc5
 - Rebuild for fc5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:39:40 -0000	1.4
+++ sources	5 Oct 2006 02:13:53 -0000	1.5
@@ -1 +1 @@
-430251478bc15ca6f4b71bdaf16cce5e  gtk-xfce-engine-2.2.8.tar.gz
+d5e9e9f5113268a1a3662ee420d064f7  gtk-xfce-engine-2.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:39:40 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:13:53 -0000	1.5
@@ -1 +1 @@
-gtk-xfce-engine-2.2.8.tar.gz
+gtk-xfce-engine-2.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:19:43 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:19:43 -0700
Subject: rpms/exo/devel exo.spec,1.16,1.17
Message-ID: <200610050219.k952Jjs2029731@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29714

Modified Files:
	exo.spec 
Log Message:
Bump release for devel checkin



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- exo.spec	7 Sep 2006 22:07:51 -0000	1.16
+++ exo.spec	5 Oct 2006 02:19:43 -0000	1.17
@@ -3,15 +3,13 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.10
-Release: 0.1.rc1%{?dist}
+Release: 0.4.rc1%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: Development/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.0
-BuildRequires: libxfcegui4-devel >= 4.2.0
 Requires: dbus-glib >= 0.22
 BuildRequires: dbus-devel >= 0.22
 BuildRequires: gtk-doc
@@ -21,6 +19,8 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: perl-URI
+BuildRequires: xfce-mcs-manager-devel
+BuildRequires: libxfce4util-devel
 
 %description
 Extension library for Xfce, targeted at application development.
@@ -29,11 +29,18 @@
 Summary: Development tools for exo library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libxfcegui4-devel
 
 %description devel
 Static libraries and header files for the exo library.
 
+%package -n python-exo
+Summary: Python tools for exo library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n python-exo
+Python libraries and header files for the exo library.
+
 %prep
 %setup -q -n %{name}-%{version}rc1
 
@@ -50,6 +57,8 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
+rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.a
 
 %find_lang libexo-0.3
 
@@ -61,7 +70,7 @@
 %postun -p /sbin/ldconfig
 
 %files -f libexo-0.3.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING
 %{_libdir}/lib*.so.*
 %{_datadir}/xfce4/helpers
@@ -83,25 +92,31 @@
 %{_datadir}/pixmaps/exo-0.3/exo-thumbnail-frame.png
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc %{_datadir}/gtk-doc/html/exo/
 %{_includedir}/exo*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/pygtk/*/defs/exo-*/
+
+%files -n python-exo
+%defattr(-, root, root,-)
 %{python_sitearch}/exo-*
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.4.rc1
+- Bump release for devel checkin
+
+* Thu Sep 28 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.3.rc1
+- Remove libxfce4gui/libxfce4gui-devel Requires/BuildRequires
+
 * Sun Sep  7 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.1.rc1
 - Upgrade to 0.3.1.10-0.1.rc1
 
 * Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.8-0.3.beta2
 - Add perl-URI BuildRequires
 
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.8-0.2.beta2
-- Rebuild for fc6
-
 * Wed Aug  2 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.8-0.1.beta2
 - Fix release numbering
 - General cleanup for devel push



From fedora-extras-commits at redhat.com  Thu Oct  5 02:24:48 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:24:48 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.2,1.3
Message-ID: <200610050224.k952Opsi030176@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30152

Modified Files:
	Thunar.spec 
Log Message:
Re-enable trash plugin in Xfce 4.4rc1



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Thunar.spec	4 Oct 2006 23:40:59 -0000	1.2
+++ Thunar.spec	5 Oct 2006 02:24:48 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.6.rc1%{?dist}
+Release: 0.7.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -145,9 +145,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/Thunar.png
 %{_datadir}/icons/hicolor/scalable/apps/Thunar.svg
 %{_datadir}/pixmaps/Thunar
-# disable trash plugin for now because it doesn't build with 4.3.2
-#%{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop
-#%{_libexecdir}/xfce4/panel-plugins/thunar-tpa
+%{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop
+%{_libexecdir}/xfce4/panel-plugins/thunar-tpa
 %{_mandir}/man1/Thunar.1*
 %dir %{_sysconfdir}/xdg/Thunar
 %config(noreplace) %{_sysconfdir}/xdg/Thunar/uca.xml
@@ -163,6 +162,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct 05 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.7.rc1
+- Re-enable trash plugin in Xfce 4.4rc1
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 0.4.0-0.6.rc1
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Oct  5 02:29:30 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:29:30 -0700
Subject: rpms/Terminal/devel Terminal.spec,1.11,1.12
Message-ID: <200610050229.k952TWOV030525@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30504

Modified Files:
	Terminal.spec 
Log Message:
Bump release for devel checkin



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Terminal.spec	7 Sep 2006 22:22:52 -0000	1.11
+++ Terminal.spec	5 Oct 2006 02:29:30 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.2.5.6
-Release: 0.1.rc1%{?dist}
+Release: 0.3.rc1%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Terminal-0.2.5.6rc1.tar.bz2
@@ -52,11 +52,17 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
-* Thu Sep  7 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.1.rc1
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.3.rc1
+- Bump release for devel checkin
+
+* Thu Sep  7 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.2.rc1
+- Bump release for xfce rc repo
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.1.rc1
 - Upgrade to 0.2.5.6-0.1.rc1
 
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.4-0.2.beta2
-- Rebuild for fc6
+* Sun Aug 13 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.4-0.2.beta2
+- Bump release for 4.4 beta repo
 
 * Wed Aug  2 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.4-0.1.beta2
 - Fix release



From fedora-extras-commits at redhat.com  Thu Oct  5 02:34:54 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:34:54 -0700
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec, 1.8, 1.9 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050234.k952YurC030657@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30636

Modified Files:
	xfce4-appfinder.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-appfinder.spec	30 Aug 2006 03:45:30 -0000	1.8
+++ xfce4-appfinder.spec	5 Oct 2006 02:34:54 -0000	1.9
@@ -1,24 +1,22 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.2.3
-Release: 4%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-appfinder-4.2.3.tar.gz
-Patch0: xfce4-appfinder-4.2.3-infocrash.patch
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-appfinder-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.3
-BuildRequires: libxfcegui4-devel >= 4.2.3
+Requires: libxfcegui4 >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: startup-notification-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
 
 %description
 xfce-appfinder shows system wide installed applications
 
 %prep
 %setup -q
-%patch0 -p1 -b .infocrash
 
 %build
 %configure
@@ -35,17 +33,24 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc README TODO ChangeLog NEWS COPYING AUTHORS
+%doc README TODO ChangeLog COPYING AUTHORS
 %{_bindir}/xfce4-appfinder
 %{_datadir}/applications/xfce4-appfinder.desktop
-%{_datadir}/pixmaps/xfce4-appfinder.png
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/he
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Rebuild for fc6 
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Remove 0 length NEWS file
+- Clean up macros in changelog
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Upgrade to 4.3.90.2
 
 * Thu May 18 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
 - Add patch to fix crash in information selection (fixes #192195)
@@ -70,11 +75,11 @@
 
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
-- Fixed %files section to not list lang files twice
+- Fixed %%files section to not list lang files twice
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+- Fixed to use %%find_lang
+- Removed generic INSTALL from %%doc
 - Fixed case on Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:47:58 -0000	1.4
+++ sources	5 Oct 2006 02:34:54 -0000	1.5
@@ -1 +1 @@
-fa6b9dd74114cb28c7352dd0e4592ce2  xfce4-appfinder-4.2.3.tar.gz
+576b6af7ed7223cbdbccf7df509b8c9f  xfce4-appfinder-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:47:58 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:34:54 -0000	1.5
@@ -1 +1 @@
-xfce4-appfinder-4.2.3.tar.gz
+xfce4-appfinder-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:38:13 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:38:13 -0700
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec, 1.9, 1.10 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050238.k952cFkY030707@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30686

Modified Files:
	xfce4-icon-theme.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-icon-theme.spec	30 Aug 2006 03:52:45 -0000	1.9
+++ xfce4-icon-theme.spec	5 Oct 2006 02:38:12 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-icon-theme-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -34,10 +34,21 @@
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %{_datadir}/*
+%exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+- Remove unused pc file
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.3-1
+- Update to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
 - Rebuild for fc5 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:57:23 -0000	1.4
+++ sources	5 Oct 2006 02:38:12 -0000	1.5
@@ -1 +1 @@
-484ff5a740de326d107ca34d16f161d3  xfce4-icon-theme-4.2.3.tar.gz
+ccdcd6aa7e03732347d785a826c81f84  xfce4-icon-theme-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:57:23 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:38:12 -0000	1.5
@@ -1 +1 @@
-xfce4-icon-theme-4.2.3.tar.gz
+xfce4-icon-theme-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:44:00 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:44:00 -0700
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec, 1.9, 1.10 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050244.k952i2Hr030766@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30740

Modified Files:
	xfce4-mixer.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-mixer.spec	30 Aug 2006 03:54:30 -0000	1.9
+++ xfce4-mixer.spec	5 Oct 2006 02:44:00 -0000	1.10
@@ -1,21 +1,21 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: BSD
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-mixer-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-mixer-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xfce4-panel >= 4.2.3
-BuildRequires: xfce4-panel-devel >= 4.2.3
-BuildRequires: libxfce4util-devel >= 4.2.3
-BuildRequires: libxfcegui4-devel >= 4.2.3
-BuildRequires: libxfce4mcs-devel >= 4.2.3
-BuildRequires: xfce-mcs-manager-devel >= 4.2.3
+Requires: xfce4-panel >= 4.3.99.1
+BuildRequires: xfce4-panel-devel >= 4.3.99.1
+BuildRequires: libxfce4util-devel >= 4.3.99.1
+BuildRequires: libxfcegui4-devel >= 4.3.99.1
+BuildRequires: libxfce4mcs-devel >= 4.3.99.1
+BuildRequires: xfce-mcs-manager-devel >= 4.3.99.1
 BuildRequires: libxml2-devel >= 2.4.0
 BuildRequires: startup-notification-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
 
 %description
 Volume control plugin for the Xfce 4 panel
@@ -43,11 +43,23 @@
 %{_bindir}/xfce4-mixer
 %{_libdir}/xfce4/*
 %{_datadir}/applications/xfce-mixer-settings.desktop
+%{_datadir}/xfce4/panel-plugins/xfce4-mixer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
+%{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Fix macros in changelog
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Upgrade to 4.3.90.2
+
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Upgrade to 4.3.90.1
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
 - Rebuild for fc5
@@ -75,8 +87,8 @@
 - Updated to 4.2.1 version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+- Fixed to use %%find_lang
+- Removed generic INSTALL from %%doc
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 17:01:31 -0000	1.4
+++ sources	5 Oct 2006 02:44:00 -0000	1.5
@@ -1 +1 @@
-b57fd602b3612fb84a92b124f3468511  xfce4-mixer-4.2.3.tar.gz
+5836282f9795d10b65d41564a923f677  xfce4-mixer-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 17:01:31 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:44:00 -0000	1.5
@@ -1 +1 @@
-xfce4-mixer-4.2.3.tar.gz
+xfce4-mixer-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:53:42 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:53:42 -0700
Subject: rpms/xfce4-session/devel xfce4-session.spec, 1.10, 1.11 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050253.k952riCX030836@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30815

Modified Files:
	xfce4-session.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-session.spec	30 Aug 2006 03:56:26 -0000	1.10
+++ xfce4-session.spec	5 Oct 2006 02:53:42 -0000	1.11
@@ -1,24 +1,25 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.2.3
-Release: 4%{?dist}
+Version: 4.3.99.1
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-session-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-session-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libxfcegui4 >= 4.2.3
-Requires: libxfce4mcs >= 4.2.3
-Requires: xfce-mcs-manager >= 4.2.3
+Requires: libxfcegui4 >= 4.3.99.1
+Requires: libxfce4mcs >= 4.3.99.1
+Requires: xfce-mcs-manager >= 4.3.99.1
 Requires: xorg-x11-server-utils
-BuildRequires: libxfcegui4-devel >= 4.2.3
-BuildRequires: libxfce4mcs-devel >= 4.2.3
-BuildRequires: xfce-mcs-manager-devel >= 4.2.3
+BuildRequires: libxfcegui4-devel >= 4.3.99.1
+BuildRequires: libxfce4mcs-devel >= 4.3.99.1
+BuildRequires: xfce-mcs-manager-devel >= 4.3.99.1
 BuildRequires: startup-notification-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
+Requires: fortune-mod
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
@@ -59,19 +60,37 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
-%{_datadir}/icons/*
-%{_datadir}/xfce4/*
+%{_datadir}/icons/hicolor/128x128/apps/xfce4-session.png
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-session.png
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-splash.png
+%{_datadir}/icons/hicolor/48x48/apps/xfsm-logout.png
+%{_datadir}/icons/hicolor/48x48/apps/xfsm-reboot.png
+%{_datadir}/icons/hicolor/48x48/apps/xfsm-shutdown.png
+%{_datadir}/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
+%{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
+%{_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}/xfce4/doc/*/images/*
+%{_datadir}/xfce4/doc/*/*.html
+%{_datadir}/xfce4/tips/tips
+%{_datadir}/xfce4/tips/tips.dat
 %{_libdir}/lib*.so.*
 %{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/splash/engines/libmice.*
 %{_libexecdir}/xfsm-shutdown-helper
 %{_mandir}/man1/*
-%{_sysconfdir}/xdg/xfce4-session/*
+%config(noreplace) %{_sysconfdir}/xdg/xfce4-session/xfce4-session.rc
+%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
 %defattr(-,root,root)
@@ -88,8 +107,25 @@
 %{_libexecdir}/balou-*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Bump release for devel checkin
+
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Don't own doc directories that xfdesktop owns. 
+
+* Sun Sep 17 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Only own icons, not any of the icon dirs. 
+
+* Tue Sep 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Add Requires for fortune-mod, needed for xfce4-tips
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Fix macros in changelog
+- Add post/postun ldconfig
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Upgrade to 4.3.90.2
 
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
 - Rebuild for fc5
@@ -122,8 +158,8 @@
 - Updated to 4.2.1 version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+- Fixed to use %%find_lang
+- Removed generic INSTALL from %%doc
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
 - Inital Fedora Extras version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 17:45:02 -0000	1.4
+++ sources	5 Oct 2006 02:53:42 -0000	1.5
@@ -1 +1 @@
-e3685ace007f065eadbd7acce6fa61e8  xfce4-session-4.2.3.tar.gz
+98c20381becc6fa84fae40be888b2ac7  xfce4-session-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 17:45:02 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:53:42 -0000	1.5
@@ -1 +1 @@
-xfce4-session-4.2.3.tar.gz
+xfce4-session-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 02:56:40 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 19:56:40 -0700
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec, 1.9, 1.10 sources,
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050256.k952ugJj030880@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30859

Modified Files:
	xfce-mcs-plugins.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce-mcs-plugins.spec	30 Aug 2006 04:04:25 -0000	1.9
+++ xfce-mcs-plugins.spec	5 Oct 2006 02:56:40 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
-Version: 4.2.3
-Release: 4%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-mcs-plugins-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2
 Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -47,20 +47,24 @@
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/he
+%{_datadir}/xfce4/doc/it
 %{_libdir}/xfce4/mcs-plugins/*
+%{_datadir}/xfce-mcs-plugins/shortcuts/default.xml
 %{_datadir}/applications/*
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
-- Rebuild for fc5
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
 
-* Tue Jan 31 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Added imake and libXt-devel BuildRequires for modular xorg
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:00:16 -0000	1.4
+++ sources	5 Oct 2006 02:56:40 -0000	1.5
@@ -1 +1 @@
-cdd1ca3ff7610a45658aa801b91da8dc  xfce-mcs-plugins-4.2.3.tar.gz
+98b0b149110056b93587c66852fc3194  xfce-mcs-plugins-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:00:16 -0000	1.4
+++ .cvsignore	5 Oct 2006 02:56:40 -0000	1.5
@@ -1 +1 @@
-xfce-mcs-plugins-4.2.3.tar.gz
+xfce-mcs-plugins-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:00:53 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:00:53 -0700
Subject: rpms/xfce-utils/devel xfce-utils.spec, 1.10, 1.11 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050300.k9530tOA030941@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30920

Modified Files:
	xfce-utils.spec sources .cvsignore 
Log Message:
Update to 4.4rc1/4.3.99.1



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce-utils.spec	30 Aug 2006 04:28:45 -0000	1.10
+++ xfce-utils.spec	5 Oct 2006 03:00:52 -0000	1.11
@@ -2,11 +2,11 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.2.3
-Release: 5%{?dist}
+Version: 4.3.99.1
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-utils-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-utils-4.3.99.1.tar.bz2
 Source1: xfce4.desktop
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -57,25 +57,47 @@
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %attr(0755,root,root) %{_sysconfdir}/xdg/xfce4
 %{_bindir}/*
-%{_libdir}/xfce4/mcs-plugins/*
 %{_datadir}/apps/switchdesk/*
-%{_datadir}/xfce4
+%{_datadir}/xfce4/AUTHORS
+%{_datadir}/xfce4/BSD
+%{_datadir}/xfce4/COPYING
+%{_datadir}/xfce4/GPL
+%{_datadir}/xfce4/INFO
+%{_datadir}/xfce4/INFO.ca
+%{_datadir}/xfce4/INFO.es
+%{_datadir}/xfce4/INFO.fi
+%{_datadir}/xfce4/INFO.fr
+%{_datadir}/xfce4/INFO.it
+%{_datadir}/xfce4/INFO.ja
+%{_datadir}/xfce4/INFO.ru
+%{_datadir}/xfce4/INFO.uk
+%{_datadir}/xfce4/INFO.vi
+%{_datadir}/xfce4/LGPL
+%{_datadir}/xfce4/doc/*/images/*
+%{_datadir}/xfce4/doc/*/*.html
+%{_datadir}/xfce4/doc/xfce-mouse.png
+%{_datadir}/xfce4/doc/xfce.css
 %{_datadir}/icons/*/*/*
-%{_datadir}/applications/*
 %{xsessiondir}/*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Bump release for devel checkin
 
-* Mon Jun  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Add gettext BuildRequires (fixes #194140)
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Don't own doc dirs (xfdesktop does)
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
-- Rebuild for fc5
+* Sun Sep 17 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Don't own datadir/xfce4 (xfwm4 already does)
 
-* Tue Jan 31 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Added imake and libXt-devel BuildRequires for modular xorg
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:30:23 -0000	1.4
+++ sources	5 Oct 2006 03:00:52 -0000	1.5
@@ -1 +1 @@
-8028266d03c5bae7c7ccbddd6656ea97  xfce-utils-4.2.3.tar.gz
+95448f642ee52cdb5ec20dc3c28dcc3b  xfce-utils-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:30:23 -0000	1.4
+++ .cvsignore	5 Oct 2006 03:00:52 -0000	1.5
@@ -1 +1 @@
-xfce-utils-4.2.3.tar.gz
+xfce-utils-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:04:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:04:47 -0700
Subject: rpms/xfdesktop/devel xfdesktop.spec, 1.12, 1.13 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050304.k9534mhI001385@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1361

Modified Files:
	xfdesktop.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfdesktop.spec	30 Aug 2006 04:09:08 -0000	1.12
+++ xfdesktop.spec	5 Oct 2006 03:04:46 -0000	1.13
@@ -1,13 +1,13 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.2.3
-Release: 5%{?dist}
+Version: 4.3.99.1
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfdesktop-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfdesktop-4.3.99.1.tar.bz2
 
 # Change default for Fedora
-Patch0: xfdesktop-image-4.2.1.patch
+Patch0: xfdesktop-image-4.3.90.1.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +24,10 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
+BuildRequires: exo-devel
+BuildRequires: Thunar-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: dbus-devel
 
 %description
 This package includes a desktop manager for the XFce Desktop Environment
@@ -56,27 +60,36 @@
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_sysconfdir}/xdg/xfce4/*
 %{_bindir}/*
-%{_datadir}/xfce4/*
 %{_libdir}/xfce4/mcs-plugins/*
+%{_libexecdir}/xfce4/panel-plugins/*
 %{_libdir}/xfce4/modules/*
-%{_libdir}/xfce4/panel-plugins/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/pixmaps/*
+%{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
+%{_datadir}/xfce4/doc
+%{_datadir}/xfce4/backdrops
+%{_datadir}/xfce4-menueditor/xfce4-menueditor.ui
 %{_mandir}/man1/*
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Bump release for devel checkin
 
-* Mon Jun  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Add gettext BuildRequires. (fixes #194142)
+* Sun Sep 17 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Don't own datadir/xfce4/panel-plugins as thats owned by xfce4-panel
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
-- Rebuild for fc5
+* Sat Sep  9 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Add exo, dbus-glib and Thunar-devel BuildRequires
 
-* Tue Jan 31 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Added imake and libXt-devel BuildRequires for modular xorg
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2
+- Update to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:17:05 -0000	1.4
+++ sources	5 Oct 2006 03:04:46 -0000	1.5
@@ -1 +1 @@
-0be57a574a654625d61281411fb6be55  xfdesktop-4.2.3.tar.gz
+ad4dc2ceeafe10ff69196e287f07090a  xfdesktop-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:17:05 -0000	1.4
+++ .cvsignore	5 Oct 2006 03:04:46 -0000	1.5
@@ -1 +1 @@
-xfdesktop-4.2.3.tar.gz
+xfdesktop-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:07:51 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:07:51 -0700
Subject: rpms/xfprint/devel xfprint.spec, 1.13, 1.14 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050307.k9537s01001484@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1463

Modified Files:
	xfprint.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfprint.spec	30 Aug 2006 04:21:12 -0000	1.13
+++ xfprint.spec	5 Oct 2006 03:07:51 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.2.3
-Release: 5%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: BSD
 URL: http://www.xfce.org
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfprint-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfprint-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -15,12 +15,21 @@
 BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: a2ps
 BuildRequires: cups-devel
+BuildRequires: gnutls-devel
 BuildRequires: gettext
 
 %description
 xfprint contains a print dialog and a printer manager for the
 Xfce 4 Desktop Environment
 
+%package devel
+Summary: Development tools for the Xfce xfprint manager
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Static libraries and header files for the Xfce xfprint library.
+
 %prep
 %setup -q
 
@@ -39,36 +48,47 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/xfprint-plugins/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/xfprint-plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post devel -p /sbin/ldconfig
+
+%postun devel -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc README ChangeLog NEWS COPYING AUTHORS NOTES
+%doc README ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/xfce4/mcs-plugins
 %{_libdir}/xfce4/xfprint-plugins
+%{_libdir}/*.so.*
 %{_datadir}/applications/*
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/he
 %{_datadir}/icons/hicolor/*/*/*
 
+%files devel
+%defattr(-, root, root)
+%{_includedir}/xfce4/libxfprint
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
+
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Rebuild for fc6 
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
 
-* Fri Jun 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Rebuild against new cups-devel to fix gnutls dependency
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
 
-* Wed Jun  7 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Add gettext BuildRequires (fixes #194147)
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Rebuild for fc5
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:25:56 -0000	1.4
+++ sources	5 Oct 2006 03:07:51 -0000	1.5
@@ -1 +1 @@
-64c983a6d7778cbd5d6c93ee1dbbd3f9  xfprint-4.2.3.tar.gz
+13657288cd3ffaaa8d3701bcb3d7740a  xfprint-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:25:56 -0000	1.4
+++ .cvsignore	5 Oct 2006 03:07:51 -0000	1.5
@@ -1 +1 @@
-xfprint-4.2.3.tar.gz
+xfprint-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:11:10 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:11:10 -0700
Subject: rpms/xfwm4/devel xfwm4.spec, 1.14, 1.15 sources, 1.5, 1.6 .cvsignore,
	1.5, 1.6
Message-ID: <200610050311.k953BCRw001560@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1538

Modified Files:
	xfwm4.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfwm4.spec	30 Aug 2006 04:06:08 -0000	1.14
+++ xfwm4.spec	5 Oct 2006 03:11:10 -0000	1.15
@@ -1,29 +1,32 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.2.3.2
-Release: 6%{?dist}
+Version: 4.3.99.1
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.2.3.2/src/xfwm4-4.2.3.2.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2
 
 # Change default for Fedora
-Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch
-Patch1: xfwm4-bluecurve.patch
+#Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch
+#Patch1: xfwm4-bluecurve.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: libxfce4mcs >= 4.2.3
-Requires: libxfcegui4 >= 4.2.3
-Requires: xfce-mcs-manager >= 4.2.3
-BuildRequires: libxfce4mcs-devel >= 4.2.3
-BuildRequires: libxfcegui4-devel >= 4.2.3
-BuildRequires: xfce-mcs-manager-devel >= 4.2.3
+Requires: libxfce4mcs >= 4.3.90.2
+Requires: libxfcegui4 >= 4.3.90.2
+Requires: xfce-mcs-manager >= 4.3.90.2
+BuildRequires: libxfce4mcs-devel >= 4.3.90.2
+BuildRequires: libxfcegui4-devel >= 4.3.90.2
+BuildRequires: xfce-mcs-manager-devel >= 4.3.90.2
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXext-devel
 BuildRequires: gettext intltool
+BuildRequires: libXcomposite-devel
+BuildRequires: libXdamage-devel
+BuildRequires: startup-notification-devel
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -31,8 +34,8 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .bluecurve-prep
-%patch1 -p1 -b .bluecurve
+#%patch0 -p1 -b .bluecurve-prep
+#%patch1 -p1 -b .bluecurve
 
 %build
 %configure
@@ -58,19 +61,35 @@
 %{_libdir}/xfce4/mcs-plugins/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/xfce4
+%dir %{_datadir}/xfce4
+%{_datadir}/xfce4/doc/*/images/*
+%{_datadir}/xfce4/doc/*/*.html
 %{_datadir}/xfwm4
 %{_datadir}/themes
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-6
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Bump release for devel checkin
 
-* Tue Jun  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-5
-- Add gettext and intltool to BuildRequires (fixes #194148)
+* Mon Oct  2 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Own the datadir/xfce4 directory
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-4.fc5
-- Rebuild for fc5
+* Mon Oct  2 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add libXcomposite-devel and libXdamage-devel BuildRequires
+- Add startup-notification-devel BuildRequires
+
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Don't own the xfce4 docdir. (xfdesktop does)
+
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Upgrade to 4.3.99.1
+- Fix macro in changelog
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Upgrade to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Upgrade 4.3.90.1
 
 * Thu Nov 17 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-3.fc5
 - Added libXpm-devel and libXext-devel BuildRequires
@@ -108,7 +127,7 @@
 - Updated to version 4.2.1
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Removed generic INSTALL from %doc
+- Removed generic INSTALL from %%doc
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 06:21:54 -0000	1.5
+++ sources	5 Oct 2006 03:11:10 -0000	1.6
@@ -1 +1 @@
-d73e89c50179ccb438c076b3b71d59a4  xfwm4-4.2.3.2.tar.gz
+ab8fcfdf496f093bbe711a7d853deb33  xfwm4-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 06:21:54 -0000	1.5
+++ .cvsignore	5 Oct 2006 03:11:10 -0000	1.6
@@ -1 +1 @@
-xfwm4-4.2.3.2.tar.gz
+xfwm4-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:13:39 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:13:39 -0700
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec, 1.8, 1.9 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610050313.k953Dfv8001604@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1583

Modified Files:
	xfwm4-themes.spec sources .cvsignore 
Log Message:
Upgrade to 4.4rc1/4.3.99.1



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfwm4-themes.spec	30 Aug 2006 04:07:47 -0000	1.8
+++ xfwm4-themes.spec	5 Oct 2006 03:13:39 -0000	1.9
@@ -1,10 +1,10 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
-Version: 4.2.3
-Release: 3%{?dist}
+Version: 4.3.99.1
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfwm4-themes-4.2.3.tar.gz
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-themes-4.3.99.1.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfwm4
@@ -35,11 +35,17 @@
 %{_datadir}/themes
 
 %changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3
-- Rebuild for fc6
+* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Bump release for devel checkin
 
-* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc5
-- Rebuild for fc5
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+
+* Wed Jul 12 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
+- Update to 4.3.90.2
+
+* Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1-1
+- Update to 4.3.90.1
 
 * Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
 - Update to 4.2.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:13:22 -0000	1.4
+++ sources	5 Oct 2006 03:13:39 -0000	1.5
@@ -1 +1 @@
-98dbf2f80f30206ca1bcaff9358bedfd  xfwm4-themes-4.2.3.tar.gz
+48f6171c4eed813770e211ccfad8aeaf  xfwm4-themes-4.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:13:22 -0000	1.4
+++ .cvsignore	5 Oct 2006 03:13:39 -0000	1.5
@@ -1 +1 @@
-xfwm4-themes-4.2.3.tar.gz
+xfwm4-themes-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:16:03 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:16:03 -0700
Subject: rpms/mousepad/devel mousepad.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200610050316.k953G5oa001683@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mousepad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1662

Modified Files:
	mousepad.spec sources .cvsignore 
Log Message:
Update to 0.2.8



Index: mousepad.spec
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/mousepad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mousepad.spec	3 Sep 2006 03:20:14 -0000	1.1
+++ mousepad.spec	5 Oct 2006 03:16:03 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           mousepad
-Version:        0.2.6
-Release:        2%{?dist}
+Version:        0.2.8
+Release:        1%{?dist}
 Summary:        Mousepad - A simple text editor for Xfce
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-4.3.90.2/src/mousepad-0.2.6.tar.bz2
+Source0:        http://www.xfce.org/archive/xfce-4.3.90.2/src/mousepad-0.2.8.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxfcegui4-devel
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/* 
 
 %changelog
+* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.8-1
+- Update to 0.2.8
+
 * Thu Aug 31 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.6-2
 - Add update-desktop-database
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2006 03:20:14 -0000	1.2
+++ sources	5 Oct 2006 03:16:03 -0000	1.3
@@ -1 +1 @@
-f8c23b1de6d23927729c477689883c38  mousepad-0.2.6.tar.bz2
+ad40c3b610123b7347094464a603e337  mousepad-0.2.8.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2006 03:20:14 -0000	1.2
+++ .cvsignore	5 Oct 2006 03:16:03 -0000	1.3
@@ -1 +1 @@
-mousepad-0.2.6.tar.bz2
+mousepad-0.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:19:31 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:19:31 -0700
Subject: rpms/xfcalendar/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.1, NONE sources, 1.4, NONE xfcalendar.spec, 1.9, NONE
Message-ID: <200610050319.k953JXng001715@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfcalendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1699

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfcalendar.spec 
Log Message:
xfcalendar has been re-named to 'orage' upstream. 
Marking this package as dead and importing as orage. 



--- NEW FILE dead.package ---
xfcalendar has be re-named to orage. 


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfcalendar.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:21:46 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:21:46 -0700
Subject: rpms/xfce4-iconbox/devel dead.package, NONE, 1.1 xfce4-iconbox.spec,
	1.9, NONE .cvsignore, 1.4, NONE sources, 1.4, NONE Makefile, 1.1, NONE
Message-ID: <200610050321.k953Lm9w001751@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-iconbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1735

Added Files:
	dead.package 
Removed Files:
	xfce4-iconbox.spec .cvsignore sources Makefile 
Log Message:
xfce4-iconbox has had all it's functionality moved to xfdesktop.



--- NEW FILE dead.package ---
xfce4-iconbox has had all it's functionality moved to xfdesktop. 


--- xfce4-iconbox.spec DELETED ---


--- .cvsignore DELETED ---


--- sources DELETED ---


--- Makefile DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:23:33 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:23:33 -0700
Subject: rpms/xfce4-systray/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.1, NONE sources, 1.4, NONE xfce4-systray.spec,
	1.9, NONE
Message-ID: <200610050323.k953NZQr001783@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-systray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1767

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfce4-systray.spec 
Log Message:
xfce4-systray has had all it's functionality moved into xfce4-panel. 



--- NEW FILE dead.package ---
xfce4-systray has had all it's functionality moved to xfce4-panel


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-systray.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:26:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:26:47 -0700
Subject: rpms/xfce4-toys/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.1, NONE sources, 1.4, NONE xfce4-toys.spec, 1.9, NONE
Message-ID: <200610050326.k953Qnta001817@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-toys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1801

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfce4-toys.spec 
Log Message:
xfce4-toys has had it's functionality moved into xfce4-panel



--- NEW FILE dead.package ---
xfce4-toys has had it's functionality moved into xfce4-panel


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-toys.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:28:01 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:28:01 -0700
Subject: rpms/xfce4-trigger-launcher/devel dead.package, NONE, 1.1 .cvsignore,
	1.4, NONE Makefile, 1.1, NONE sources, 1.4,
	NONE xfce4-trigger-launcher.spec, 1.9, NONE
Message-ID: <200610050328.k953S39n001849@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-trigger-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1833

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfce4-trigger-launcher.spec 
Log Message:
xfce4-trigger-launcher has had it's functionality moved into xfce4-panel



--- NEW FILE dead.package ---
xfce4-trigger-launcher has had it's functionality moved into xfce4-panel


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-trigger-launcher.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:31:37 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:31:37 -0700
Subject: rpms/orage - New directory
Message-ID: <200610050331.k953VddX001967@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1941/orage

Log Message:
Directory /cvs/extras/rpms/orage added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 03:31:37 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:31:37 -0700
Subject: rpms/orage/devel - New directory
Message-ID: <200610050331.k953Vd8F001970@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1941/orage/devel

Log Message:
Directory /cvs/extras/rpms/orage/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 03:31:48 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:31:48 -0700
Subject: rpms/orage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610050331.k953Voc3002022@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1986/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module orage


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:31:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:31:47 -0700
Subject: rpms/orage Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610050331.k953Vn5E002019@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1986

Added Files:
	Makefile import.log 
Log Message:
Setup of module orage


--- NEW FILE Makefile ---
# Top level Makefile for module orage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:32:29 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:32:29 -0700
Subject: rpms/orage import.log,1.1,1.2
Message-ID: <200610050332.k953WVCe002155@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2118

Modified Files:
	import.log 
Log Message:
auto-import orage-4.3.99.1-3.fc6 on branch devel from orage-4.3.99.1-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/orage/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 03:31:47 -0000	1.1
+++ import.log	5 Oct 2006 03:32:29 -0000	1.2
@@ -0,0 +1 @@
+orage-4_3_99_1-3_fc6:HEAD:orage-4.3.99.1-3.fc6.src.rpm:1160019145



From fedora-extras-commits at redhat.com  Thu Oct  5 03:32:30 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:32:30 -0700
Subject: rpms/orage/devel orage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610050332.k953WW5u002160@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2118/devel

Modified Files:
	.cvsignore sources 
Added Files:
	orage.spec 
Log Message:
auto-import orage-4.3.99.1-3.fc6 on branch devel from orage-4.3.99.1-3.fc6.src.rpm


--- NEW FILE orage.spec ---
Summary: Time-managing application for Xfce4
Name: orage
Version: 4.3.99.1
Release: 3%{?dist}
License: GPL
URL: http://www.xfce.org/
Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xfce-mcs-manager-devel
BuildRequires: libxfce4util-devel
BuildRequires: libxfcegui4-devel
BuildRequires: xfce4-panel-devel
BuildRequires: startup-notification-devel
BuildRequires: gettext
BuildRequires: dbh-devel
BuildRequires: desktop-file-utils

Provides: xfcalendar = %{version}-%{release}
Obsoletes: xfcalendar <= 4.2.3-1
# xfce4-datetime-plugin isn't in Xfce 4.4
Provides: xfce4-datetime-plugin = %{version}-%{release}
Obsoletes: xfce4-datetime-plugin <= 4.2.3-3

%description
Time-managing application for Xfce4

%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/%{_libdir}/xfce4/mcs-plugins/*.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
%find_lang %{name}

rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/xfcalendar.desktop

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        xfcalendar.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%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
%{_libexecdir}/xfce4/panel-plugins/orageclock
%{_datadir}/icons/hicolor/48x48/apps/xfcalendar.png
%{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
%{_datadir}/xfce4/panel-plugins/orageclock.desktop

%changelog
* Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
- Bump release for devel checkin

* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
- Obsolete xfce4-datetime-plugin

* Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
- Update to 4.3.99.1
- Added desktop files 

* Wed Aug 30 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-1
- Update to 4.3.90.2 and change name to orage

* Mon Nov  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-1.fc5
- Update to 4.2.3
- Added dist tag

* Tue May 17 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.2-1.fc4
- Update to 4.2.2

* Sat May  7 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-5.fc3
- Add missing dbh-devel buildrequires

* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-4.fc4
- lowercase Release

* Fri Mar 25 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-3.FC4
- Remove unneeded la/a files

* Sun Mar 20 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
- fix BuildRequires

* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
- Updated to 4.2.1 version

* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
- Fixed to use %find_lang
- Removed generic INSTALL from %doc
- Added BuildRequires for xfce-mcs-manager-devel

* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
- Inital Fedora Extras version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 03:31:48 -0000	1.1
+++ .cvsignore	5 Oct 2006 03:32:29 -0000	1.2
@@ -0,0 +1 @@
+orage-4.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 03:31:48 -0000	1.1
+++ sources	5 Oct 2006 03:32:29 -0000	1.2
@@ -0,0 +1 @@
+511dce3a93aa6e34973989e4441f23ec  orage-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 03:32:27 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed,  4 Oct 2006 20:32:27 -0700
Subject: rpms/yum-utils import.log,1.3,1.4
Message-ID: <200610050332.k953WxFq002204@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2086

Modified Files:
	import.log 
Log Message:
auto-import yum-utils-1.0-1 on branch devel from yum-utils-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 May 2006 02:10:50 -0000	1.3
+++ import.log	5 Oct 2006 03:32:27 -0000	1.4
@@ -1,2 +1,3 @@
 yum-utils-0_2-2:HEAD:yum-utils-0.2-2.src.rpm:1118518174
 yum-utils-0_6-1_fc5:HEAD:yum-utils-0.6-1.fc5.src.rpm:1146968022
+yum-utils-1_0-1:HEAD:yum-utils-1.0-1.src.rpm:1160019314



From fedora-extras-commits at redhat.com  Thu Oct  5 03:32:28 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed,  4 Oct 2006 20:32:28 -0700
Subject: rpms/yum-utils/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 yum-utils.spec, 1.9,
	1.10 yum-utils-0.6-fastestmirror-newapi.patch, 1.1,
	NONE yum-utils-0.6-repoquery-newapi.patch, 1.1, NONE
Message-ID: <200610050333.k953X0d1002209@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2086/devel

Modified Files:
	.cvsignore sources yum-utils.spec 
Removed Files:
	yum-utils-0.6-fastestmirror-newapi.patch 
	yum-utils-0.6-repoquery-newapi.patch 
Log Message:
auto-import yum-utils-1.0-1 on branch devel from yum-utils-1.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 May 2006 02:10:50 -0000	1.5
+++ .cvsignore	5 Oct 2006 03:32:28 -0000	1.6
@@ -1 +1 @@
-yum-utils-0.6.tar.gz
+yum-utils-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 May 2006 02:10:50 -0000	1.5
+++ sources	5 Oct 2006 03:32:28 -0000	1.6
@@ -1 +1 @@
-3ac019970ed334b530dc130da97e9851  yum-utils-0.6.tar.gz
+e9af7d38f47e5d2cd945790061fa5f8b  yum-utils-1.0.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- yum-utils.spec	1 Aug 2006 21:00:56 -0000	1.9
+++ yum-utils.spec	5 Oct 2006 03:32:28 -0000	1.10
@@ -1,16 +1,14 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 0.6
-Release: 5%{?dist}
+Version: 1.0
+Release: 1
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}-fastestmirror-newapi.patch
-Patch1: yum-utils-0.6-repoquery-newapi.patch
 URL: http://linux.duke.edu/yum/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: python, yum >= 2.5.1
+Requires: python >= 2.4 , yum >= 3.0
 
 %description
 yum-utils is a collection of utilities and examples for the yum package
@@ -20,7 +18,7 @@
 %package -n yum-updateonboot
 Summary: Run yum update on system boot
 Group: System Environment/Base
-Requires: python, yum >= 2.3.2
+Requires: python, yum >= 2.4
 Requires(pre): chkconfig
 Requires(post): chkconfig
 
@@ -32,7 +30,7 @@
 %package -n yum-changelog
 Summary: Yum plugin for viewing package changelogs before/after updating
 Group: System Environment/Base
-Requires: yum >= 2.3.4
+Requires: yum >= 3.0
 
 %description -n yum-changelog
 This plugin adds a command line option to allow viewing package changelog 
@@ -41,7 +39,7 @@
 %package -n yum-fastestmirror
 Summary: Yum plugin which chooses fastest repository from a mirrorlist
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-fastestmirror
 This plugin sorts each repository's mirrorlist by connection speed
@@ -50,7 +48,7 @@
 %package -n yum-fedorakmod
 Summary: Yum plugin to handle fedora kernel modules.
 Group: System Environment/Base
-Requires: yum >= 2.6.0
+Requires: yum >= 3.0
 
 %description -n yum-fedorakmod
 Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions 
@@ -60,7 +58,7 @@
 %package -n yum-protectbase
 Summary: Yum plugin to protect packages from certain repositories.
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-protectbase
 This plugin allows certain repositories to be protected. Packages in the
@@ -70,7 +68,7 @@
 %package -n yum-versionlock
 Summary: Yum plugin to lock specified packages from being updated
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-versionlock
 This plugin allows certain packages specified in a file to be protected from being updated by 
@@ -79,7 +77,7 @@
 %package -n yum-tsflags
 Summary: Yum plugin to add tsflags by a commandline option
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-tsflags
 This plugin allows you to specify optional transaction flags on the yum
@@ -88,7 +86,7 @@
 %package -n yum-kernel-module
 Summary: Yum plugin to handle kernel-module-foo type of kernel module
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-kernel-module
 This plugin handle installation of kernel-module-foo type of kernel modules when new version of 
@@ -98,16 +96,32 @@
 %package -n yum-downloadonly
 Summary: Yum plugin to add downloadonly command option
 Group: System Environment/Base
-Requires: yum >= 2.4.1
+Requires: yum >= 3.0
 
 %description -n yum-downloadonly
 This plugin adds a --downloadonly flag to yum so that yum will only download
 the packages and not install/update them.
 
+%package -n yum-allowdowngrade
+Summary: Yum plugin to enable manual downgrading of packages
+Group: System Environment/Base
+Requires: yum > 3.0
+
+%description -n yum-allowdowngrade
+This plugin adds a --allow-downgrade flag to yum to make it possible to
+manually downgrade packages to specific versions.
+
+%package -n yum-skip-broken
+Summary: Yum plugin to handle skiping packages with dependency problems
+Group: System Environment/Base
+Requires: yum > 3.0
+
+%description -n yum-skip-broken
+This plugin adds a --ignore-broken to yum to make it possible to
+check packages for dependency problems and skip the one with problems.
+
 %prep
 %setup -q
-%patch0
-%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -115,7 +129,7 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken"
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -140,7 +154,7 @@
 %defattr(-, root, root)
 %doc README 
 %doc COPYING
-%doc plugins/
+%doc plugins/README
 %{_bindir}/package-cleanup
 %{_bindir}/repoclosure
 %{_bindir}/repomanage
@@ -199,12 +213,29 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf
 /usr/lib/yum-plugins/downloadonly.*
 
+%files -n yum-allowdowngrade
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf
+/usr/lib/yum-plugins/allowdowngrade.*
+
+%files -n yum-skip-broken
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf
+/usr/lib/yum-plugins/skip-broken.*
+
 %changelog
-* Tue Aug  1 2006 Bill Nottingham <notting at redhat.com>
-- add patch to fix repoqeury to work with current yum api
+* Wed Oct  4 2006 Seth Vidal <skvidal at linux.duke.edu>
+- mark it as 1.0
+- change requires for the packages to yum 3.0
+
+* Wed Sep 27 2006 Tim Lauridsen <tla at rasmil.dk>
+- added skip-broken plugin
+
+* Tue Sep 05 2006 Panu Matilainen <pmatilai at laiskianen.org>
+- added allowdowngrade plugin
 
-* Thu Jul 28 2006 Luke Macken <lmacken at redhat.com>
-- Add patch to fix fastestmirror to work with new yum api
+* Sun Aug 13 2006 Seth Vidal <skvidal at linux.duke.edu>
+- fix the plugins/ doc issue
 
 * Sat May  6 2006 Seth Vidal <skvidal at linux.duke.edu>
 - bump version number


--- yum-utils-0.6-fastestmirror-newapi.patch DELETED ---


--- yum-utils-0.6-repoquery-newapi.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 03:34:37 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Wed,  4 Oct 2006 20:34:37 -0700
Subject: rpms/yum-utils/devel yum-utils.spec,1.10,1.11
Message-ID: <200610050334.k953YdVU002278@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260

Modified Files:
	yum-utils.spec 
Log Message:
dist tag




Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- yum-utils.spec	5 Oct 2006 03:32:28 -0000	1.10
+++ yum-utils.spec	5 Oct 2006 03:34:37 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.0
-Release: 1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 03:35:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  4 Oct 2006 20:35:15 -0700
Subject: owners owners.list,1.1775,1.1776
Message-ID: <200610050335.k953ZHuq002300@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283

Modified Files:
	owners.list 
Log Message:
Add orage Time-managing application for Xfce4
NOTE: this is just a re-name of the xfcalendar package upstream



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1775
retrieving revision 1.1776
diff -u -r1.1775 -r1.1776
--- owners.list	4 Oct 2006 18:03:09 -0000	1.1775
+++ owners.list	5 Oct 2006 03:35:14 -0000	1.1776
@@ -1160,6 +1160,7 @@
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
+Fedora Extras|orage|Time-managing application for Xfce4|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ORBit|CORBA Object Request Broker library for GNOME-1 compatibility|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|orpie|A fullscreen console-based RPN calculator|lists at forevermore.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct  5 04:58:08 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed,  4 Oct 2006 21:58:08 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.32, 1.33 git.spec, 1.20, 1.21 sources, 
	1.32, 1.33
Message-ID: <200610050458.k954wA2I005441@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5420

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	22 Sep 2006 18:11:40 -0000	1.32
+++ .cvsignore	5 Oct 2006 04:58:08 -0000	1.33
@@ -1 +1 @@
-git-1.4.2.1.tar.gz
+git-1.4.2.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git.spec	22 Sep 2006 18:11:40 -0000	1.20
+++ git.spec	5 Oct 2006 04:58:08 -0000	1.21
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.1
+Version: 	1.4.2.3
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
+- git-1.4.2.3
+
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	22 Sep 2006 18:11:40 -0000	1.32
+++ sources	5 Oct 2006 04:58:08 -0000	1.33
@@ -1 +1 @@
-3077983e34cea955b0f5cacb39b307e7  git-1.4.2.1.tar.gz
+3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 04:59:03 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed,  4 Oct 2006 21:59:03 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.32, 1.33 git.spec, 1.20, 1.21 sources, 
	1.32, 1.33
Message-ID: <200610050459.k954x5Rh005512@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5491

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	22 Sep 2006 18:13:01 -0000	1.32
+++ .cvsignore	5 Oct 2006 04:59:03 -0000	1.33
@@ -1 +1 @@
-git-1.4.2.1.tar.gz
+git-1.4.2.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git.spec	22 Sep 2006 18:13:01 -0000	1.20
+++ git.spec	5 Oct 2006 04:59:03 -0000	1.21
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.1
+Version: 	1.4.2.3
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
+- git-1.4.2.3
+
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	22 Sep 2006 18:13:01 -0000	1.32
+++ sources	5 Oct 2006 04:59:03 -0000	1.33
@@ -1 +1 @@
-3077983e34cea955b0f5cacb39b307e7  git-1.4.2.1.tar.gz
+3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 05:00:11 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed,  4 Oct 2006 22:00:11 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.32, 1.33 git.spec, 1.20, 1.21 sources, 
	1.32, 1.33
Message-ID: <200610050500.k9550Drh005599@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5578

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	22 Sep 2006 18:14:25 -0000	1.32
+++ .cvsignore	5 Oct 2006 05:00:10 -0000	1.33
@@ -1 +1 @@
-git-1.4.2.1.tar.gz
+git-1.4.2.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git.spec	22 Sep 2006 18:14:25 -0000	1.20
+++ git.spec	5 Oct 2006 05:00:10 -0000	1.21
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.1
+Version: 	1.4.2.3
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
+- git-1.4.2.3
+
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	22 Sep 2006 18:14:25 -0000	1.32
+++ sources	5 Oct 2006 05:00:10 -0000	1.33
@@ -1 +1 @@
-3077983e34cea955b0f5cacb39b307e7  git-1.4.2.1.tar.gz
+3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 05:02:54 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed,  4 Oct 2006 22:02:54 -0700
Subject: rpms/git/devel .cvsignore, 1.32, 1.33 git.spec, 1.21, 1.22 sources, 
	1.32, 1.33
Message-ID: <200610050503.k9553Sio008492@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8471

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	22 Sep 2006 18:10:26 -0000	1.32
+++ .cvsignore	5 Oct 2006 05:02:54 -0000	1.33
@@ -1 +1 @@
-git-1.4.2.1.tar.gz
+git-1.4.2.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.spec	4 Oct 2006 22:27:47 -0000	1.21
+++ git.spec	5 Oct 2006 05:02:54 -0000	1.22
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.1
-Release: 	2%{?dist}
+Version: 	1.4.2.3
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -136,8 +136,8 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.4.2.1-2
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
+- git-1.4.2.3
 
 * Fri Sep 22 2006 Chris Wright <chrisw at redhat.com> 1.4.2.1-1
 - git-1.4.2.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	22 Sep 2006 18:10:26 -0000	1.32
+++ sources	5 Oct 2006 05:02:54 -0000	1.33
@@ -1 +1 @@
-3077983e34cea955b0f5cacb39b307e7  git-1.4.2.1.tar.gz
+3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 06:29:55 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed,  4 Oct 2006 23:29:55 -0700
Subject: rpms/tor/devel .cvsignore,1.2,1.3 sources,1.2,1.3 tor.spec,1.3,1.4
Message-ID: <200610050629.k956TvsF011865@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11844

Modified Files:
	.cvsignore sources tor.spec 
Log Message:
updated to 0.1.1.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 06:27:27 -0000	1.2
+++ .cvsignore	5 Oct 2006 06:29:54 -0000	1.3
@@ -1 +1 @@
-tor-0.1.1.23.tar.gz
+tor-*.tar.*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 06:27:27 -0000	1.2
+++ sources	5 Oct 2006 06:29:54 -0000	1.3
@@ -1 +1,2 @@
-33ce7155f545c4d30cb846d7017cc6c2  tor-0.1.1.23.tar.gz
+28dea6a77a43b6e421e1bd7b2cc3d940  tor-0.1.1.24.tar.gz
+217c02c37858cf6048ba2b0a99d76014  tor-0.1.1.24.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tor.spec	30 Sep 2006 16:25:17 -0000	1.3
+++ tor.spec	5 Oct 2006 06:29:54 -0000	1.4
@@ -10,8 +10,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.1.1.23
-Release:	%release_func 5
+Version:	0.1.1.24
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.24-1
+- updated to 0.1.1.24
+
 * Sat Sep 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.23-5
 - updated to recent fedora-usermgmt
 - minor cleanups



From fedora-extras-commits at redhat.com  Thu Oct  5 06:59:18 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed,  4 Oct 2006 23:59:18 -0700
Subject: rpms/gnome-python2-gda/FC-5 gnome-python2-gda.spec,1.2,1.3
Message-ID: <200610050659.k956xKsP011998@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-python2-gda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11981

Modified Files:
	gnome-python2-gda.spec 
Log Message:
Fixed devel Requires for pygtk2


Index: gnome-python2-gda.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-gda/FC-5/gnome-python2-gda.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-python2-gda.spec	4 Oct 2006 10:11:43 -0000	1.2
+++ gnome-python2-gda.spec	5 Oct 2006 06:59:18 -0000	1.3
@@ -8,7 +8,7 @@
 Summary: PyGNOME Python extension module for interacting with gda
 Name: gnome-python2-gda
 Version: 2.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: http://developer.gnome.org
@@ -38,7 +38,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
-Requires:       pygobject2-devel
+Requires:       pygtk2-devel
 Requires:       compat-libgda-devel
 
 
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Wed Oct  4 2006 Denis Leroy <denis at poolshark.org> - 2.14.0-2
+- Fixed devel Requires for pygtk2
+
 * Mon Jul 24 2006 Denis Leroy <denis at poolshark.org> - 2.14.0-1
 - First draft, adapted from gnome-python2-extras from core
 



From fedora-extras-commits at redhat.com  Thu Oct  5 08:34:44 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 01:34:44 -0700
Subject: rpms/xfce4-showdesktop-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-showdesktop-plugin.spec, 1.4, NONE
Message-ID: <200610050834.k958Ykn5018496@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18480

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-showdesktop-plugin.spec 
Log Message:
orphaning taskbar-plugin for Core 6/XFCE 4.4


--- NEW FILE dead.package ---
Functionality of the showdesktop-plugin has been integrated into xfce4-panel
in XFCE 4.4, this package is officially orphanded upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-showdesktop-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 09:41:48 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 02:41:48 -0700
Subject: rpms/ghdl/devel ghdl-svn71.patch,NONE,1.1
Message-ID: <200610050941.k959fo4v021640@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21622

Added Files:
	ghdl-svn71.patch 
Log Message:
add patch for svn rev71


ghdl-svn71.patch:

--- NEW FILE ghdl-svn71.patch ---
diff -urN ghdl-0.25/vhdl/back_end.ads ghdl-0.26dev/vhdl/back_end.ads
--- ghdl-0.25/vhdl/back_end.ads	2005-09-22 23:07:25.000000000 +0200
+++ ghdl-0.26dev/vhdl/back_end.ads	2006-10-05 11:35:25.000000000 +0200
@@ -29,6 +29,14 @@
    Library_To_File_Name : Library_To_File_Name_Acc :=
      Default_Library_To_File_Name'Access;
 
+   --  Back-end options.
+   type Parse_Option_Acc is access function (Opt : String) return Boolean;
+   Parse_Option : Parse_Option_Acc := null;
+
+   --  Disp back-end option help.
+   type Disp_Option_Acc is access procedure;
+   Disp_Option : Disp_Option_Acc := null;
+
    --  UNIT is a design unit from parse.
    --  According to the current back-end, do what is necessary.
    --
@@ -46,8 +54,5 @@
    --  May be NULL for no additionnal checks.
    type Sem_Foreign_Acc is access procedure (Decl : Iir);
    Sem_Foreign : Sem_Foreign_Acc := null;
-
-   --procedure Finish_Compilation
-   --  (Unit : Iir_Design_Unit; Main : Boolean := False);
 end Back_End;
 
diff -urN ghdl-0.25/vhdl/bug.adb ghdl-0.26dev/vhdl/bug.adb
--- ghdl-0.25/vhdl/bug.adb	2005-11-18 02:34:12.000000000 +0100
+++ ghdl-0.26dev/vhdl/bug.adb	2006-10-05 11:35:25.000000000 +0200
@@ -70,7 +70,7 @@
       Put_Line
         (Standard_Error,
          "Please report this bug on http://gna.org/projects/ghdl");
-      Put_Line (Standard_Error, "GHDL version: " & Ghdl_Version);
+      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "In directory: " &
                 GNAT.Directory_Operations.Get_Current_Dir);
diff -urN ghdl-0.25/vhdl/canon.adb ghdl-0.26dev/vhdl/canon.adb
--- ghdl-0.25/vhdl/canon.adb	2006-07-29 06:42:30.000000000 +0200
+++ ghdl-0.26dev/vhdl/canon.adb	2006-10-05 11:35:25.000000000 +0200
@@ -847,22 +847,6 @@
       end loop;
    end Canon_Sequential_Stmts;
 
-   procedure Add_Driver_For_Signal (Driver_List : Iir_List;
-                                    Signal : Iir)
-   is
-      Choice : Iir;
-   begin
-      if Get_Kind (Signal) = Iir_Kind_Aggregate then
-         Choice := Get_Association_Choices_Chain (Signal);
-         while Choice /= Null_Iir loop
-            Add_Driver_For_Signal (Driver_List, Get_Associated (Choice));
-            Choice := Get_Chain (Choice);
-         end loop;
-      else
-         Add_Element (Driver_List, Get_Longuest_Static_Prefix (Signal));
-      end if;
-   end Add_Driver_For_Signal;
-
    -- Create a statement transform from concurrent_signal_assignment
    -- statement STMT (either selected or conditional).
    -- waveform transformation is not done.
@@ -895,9 +879,6 @@
       --      reserved word POSTPONED.
       Set_Postponed_Flag (Proc, Get_Postponed_Flag (Proc));
 
-      Set_Driver_List (Proc, Create_Iir_List);
-      Add_Driver_For_Signal (Get_Driver_List (Proc), Get_Target (Stmt));
-
       Canon_Extract_Sensitivity (Get_Target (Stmt), Sensitivity_List, True);
 
       if Canon_Flag_Expressions then
@@ -966,7 +947,6 @@
       Assoc_Chain : Iir;
       Assoc : Iir;
       Imp : Iir;
-      Driver_List : Iir_Driver_List;
       Inter : Iir;
       Sensitivity_List : Iir_List;
       Is_Sensitized : Boolean;
@@ -1014,7 +994,6 @@
          Get_Parameter_Association_Chain (Call),
          Call);
       Set_Parameter_Association_Chain (Call, Assoc_Chain);
-      Driver_List := Null_Iir_List;
       Assoc := Assoc_Chain;
 
       --  LRM93 9.3
@@ -1034,18 +1013,6 @@
                   Canon_Extract_Sensitivity
                     (Get_Actual (Assoc), Sensitivity_List, False);
                end if;
-               --  LRM 2.1.1.2 Signal Parameters
-               if Get_Kind (Inter) = Iir_Kind_Signal_Interface_Declaration
-                 and then Get_Mode (Inter) in Iir_Out_Modes
-               then
-                  if Driver_List = Null_Iir_List then
-                     Driver_List := Create_Iir_List;
-                     Set_Driver_List (Proc, Driver_List);
-                  end if;
-                  Add_Element
-                    (Driver_List,
-                     Get_Longuest_Static_Prefix (Get_Actual (Assoc)));
-               end if;
             when Iir_Kind_Association_Element_Open
               | Iir_Kind_Association_Element_By_Individual =>
                null;
diff -urN ghdl-0.25/vhdl/disp_tree.adb ghdl-0.26dev/vhdl/disp_tree.adb
--- ghdl-0.25/vhdl/disp_tree.adb	2005-10-26 14:31:21.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_tree.adb	2006-10-05 11:35:25.000000000 +0200
@@ -1023,8 +1023,6 @@
             Disp_Depth (Get_Subprogram_Depth (Tree));
             Header ("subprogram_body:");
             Disp_Tree_Flat (Get_Subprogram_Body (Tree), Ntab);
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("attribute_value_chain:");
             Disp_Tree_Flat_Chain (Get_Attribute_Value_Chain (Tree), Ntab);
          when Iir_Kind_Procedure_Body
@@ -1423,8 +1421,6 @@
                Header ("sensivity list:");
                Disp_Tree_List (Get_Sensitivity_List (Tree), Ntab, True);
             end if;
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("declaration_chain:");
             Disp_Tree_Chain (Get_Declaration_Chain (Tree), Ntab);
             Header ("process statements:");
diff -urN ghdl-0.25/vhdl/disp_vhdl.adb ghdl-0.26dev/vhdl/disp_vhdl.adb
--- ghdl-0.25/vhdl/disp_vhdl.adb	2006-07-09 03:55:28.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_vhdl.adb	2006-10-05 11:35:25.000000000 +0200
@@ -893,25 +893,6 @@
       Put_Line (";");
    end Disp_Object_Declaration;
 
-   procedure Disp_Driver_List (List: Iir_Driver_List; Indent : Count)
-   is
-      El: Iir;
-   begin
-      if List = Null_Iir_List or else Get_Nbr_Elements (List) = 0 then
-         return;
-      end if;
-      Set_Col (Indent);
-      Put_Line ("-- drivers needed for signals:");
-      for I in Natural loop
-         El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
-         Set_Col (Indent);
-         Put ("--   ");
-         Disp_Expression (El);
-         New_Line;
-      end loop;
-   end Disp_Driver_List;
-
    procedure Disp_Subprogram_Declaration (Subprg: Iir)
    is
       Indent: Count;
@@ -943,10 +924,6 @@
          when others =>
             raise Internal_Error;
       end case;
-
-      if Get_Kind (Subprg) = Iir_Kind_Procedure_Declaration then
-         Disp_Driver_List (Get_Driver_List (Subprg), Indent);
-      end if;
    end Disp_Subprogram_Declaration;
 
    procedure Disp_Subprogram_Body (Subprg : Iir)
@@ -1517,7 +1494,6 @@
       else
          New_Line;
       end if;
-      Disp_Driver_List (Get_Driver_List (Process), Start + Indentation);
       Disp_Declaration_Chain (Process, Start + Indentation);
       Set_Col (Start);
       Put_Line ("begin");
@@ -2312,10 +2288,10 @@
             Disp_Concurrent_Conditional_Signal_Assignment (An_Iir);
          when Iir_Kinds_Dyadic_Operator =>
             Disp_Dyadic_Operator (An_Iir);
-         when Iir_Kind_Signal_Interface_Declaration =>
+         when Iir_Kind_Signal_Interface_Declaration
+           | Iir_Kind_Signal_Declaration
+           | Iir_Kind_Object_Alias_Declaration =>
             Disp_Name_Of (An_Iir);
-         when Iir_Kind_Signal_Declaration =>
-            Disp_Identifier (An_Iir);
          when Iir_Kind_Enumeration_Literal =>
             Disp_Identifier (An_Iir);
          when Iir_Kind_Component_Instantiation_Statement =>
@@ -2330,8 +2306,11 @@
             Disp_Package_Declaration (An_Iir);
          when Iir_Kind_Wait_Statement =>
             Disp_Wait_Statement (An_Iir);
-         when Iir_Kind_Selected_Name =>
-            Disp_Name (An_Iir);
[...4096 lines suppressed...]
+         end if;
+         return Create_Var_Identifier_From_Buffer (L);
       end Create_Var_Identifier;
 
       function Create_Uniq_Identifier return Var_Ident_Type
@@ -22728,19 +23323,6 @@
          end case;
       end Translate_Succ_Pred_Attribute;
 
-      --  Read the boolean attribute (active or event) FIELD of simple signal
-      --  SIG.
-      function Read_Bool_Signal_Attribute (Sig : O_Enode; Field : O_Fnode)
-                                          return O_Enode
-      is
-         S : O_Enode;
-      begin
-         S := New_Convert_Ov (Sig, Ghdl_Signal_Ptr);
-         return New_Value
-           (New_Selected_Element (New_Access_Element (S), Field));
-         --Ghdl_Signal_Event_Node));
-      end Read_Bool_Signal_Attribute;
-
       type Bool_Sigattr_Data_Type is record
          Label : O_Snode;
          Field : O_Fnode;
@@ -22752,8 +23334,7 @@
          pragma Unreferenced (Targ_Type);
       begin
          Gen_Exit_When (Data.Label,
-                        Read_Bool_Signal_Attribute (New_Value (M2Lv (Targ)),
-                                                    Data.Field));
+                        New_Value (Get_Signal_Field (Targ, Data.Field)));
       end Bool_Sigattr_Non_Composite_Signal;
 
       function Bool_Sigattr_Prepare_Data_Composite
@@ -22819,7 +23400,7 @@
          if Get_Kind (Prefix_Type) in Iir_Kinds_Scalar_Type_Definition then
             --  Effecient handling for a scalar signal.
             Name := Chap6.Translate_Name (Prefix);
-            return Read_Bool_Signal_Attribute (New_Value (M2Lv (Name)), Field);
+            return New_Value (Get_Signal_Field (Name, Field));
          else
             --  Element per element handling for composite signals.
             Res := Create_Temp (Std_Boolean_Type_Node);
@@ -22839,13 +23420,14 @@
 
       function Translate_Event_Attribute (Attr : Iir) return O_Enode is
       begin
-         return Translate_Bool_Signal_Attribute (Attr, Ghdl_Signal_Event_Node);
+         return Translate_Bool_Signal_Attribute
+           (Attr, Ghdl_Signal_Event_Field);
       end Translate_Event_Attribute;
 
       function Translate_Active_Attribute (Attr : Iir) return O_Enode is
       begin
          return Translate_Bool_Signal_Attribute
-           (Attr, Ghdl_Signal_Active_Node);
+           (Attr, Ghdl_Signal_Active_Field);
       end Translate_Active_Attribute;
 
       --  Read signal value FIELD of signal SIG.
@@ -22862,11 +23444,20 @@
            (New_Unchecked_Address (New_Selected_Element (T, Field), S_Type));
       end Get_Signal_Value_Field;
 
+      function Get_Signal_Field (Sig : Mnode; Field : O_Fnode)
+                                return O_Lnode
+      is
+         S : O_Enode;
+      begin
+         S := New_Convert_Ov (New_Value (M2Lv (Sig)), Ghdl_Signal_Ptr);
+         return New_Selected_Element (New_Access_Element (S), Field);
+      end Get_Signal_Field;
+
       function Read_Last_Value (Sig : O_Enode; Sig_Type : Iir) return O_Enode
       is
       begin
          return New_Value (Get_Signal_Value_Field
-                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Node));
+                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Field));
       end Read_Last_Value;
 
       function Translate_Last_Value is new Chap7.Translate_Signal_Value
@@ -27031,39 +27622,53 @@
         (Chararray_Type, New_Unsigned_Literal (Ghdl_Index_Type, 8));
       New_Type_Decl (Get_Identifier ("__ghdl_scalar_bytes"),
                      Ghdl_Scalar_Bytes);
+
+      Ghdl_Signal_Ptr := New_Access_Type (O_Tnode_Null);
+      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+
       --  Type __signal_signal is record
       Start_Record_Type (Rec);
-      New_Record_Field (Rec, Ghdl_Signal_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Value_Field,
                         Get_Identifier ("value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Field,
                         Get_Identifier ("driving_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Field,
                         Get_Identifier ("last_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Field,
                         Get_Identifier ("last_event"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Field,
                         Get_Identifier ("last_active"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Chain_Field,
+                        Get_Identifier ("active_chain"),
+                        Ghdl_Signal_Ptr);
+      New_Record_Field (Rec, Ghdl_Signal_Event_Field,
                         Get_Identifier ("event"),
                         Std_Boolean_Type_Node);
-      New_Record_Field (Rec, Ghdl_Signal_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Field,
                         Get_Identifier ("active"),
                         Std_Boolean_Type_Node);
+      New_Record_Field (Rec, Ghdl_Signal_Has_Active_Field,
+                        Get_Identifier ("has_active"),
+                        Ghdl_Bool_Type);
       Finish_Record_Type (Rec, Ghdl_Signal_Type);
       New_Type_Decl (Get_Identifier ("__ghdl_signal"), Ghdl_Signal_Type);
 
-      Ghdl_Signal_Ptr := New_Access_Type (Ghdl_Signal_Type);
-      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+      Finish_Access_Type (Ghdl_Signal_Ptr, Ghdl_Signal_Type);
 
       Ghdl_Signal_Ptr_Ptr := New_Access_Type (Ghdl_Signal_Ptr);
       New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr_ptr"),
                      Ghdl_Signal_Ptr_Ptr);
 
+      New_Var_Decl (Ghdl_Signal_Active_Chain,
+                    Get_Identifier ("__ghdl_signal_active_chain"),
+                    O_Storage_External,
+                    Ghdl_Signal_Ptr);
+
       --  procedure __ghdl_signal_merge_rti
       --       (sig : ghdl_signal_ptr; rti : ghdl_rti_access)
       Start_Procedure_Decl
@@ -27305,6 +27910,17 @@
       New_Interface_Decl (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
       Finish_Subprogram_Decl (Interfaces, Ghdl_Process_Add_Driver);
 
+      --  procedure __ghdl_signal_direct_driver (sig : __ghdl_signal_ptr;
+      --                                         Drv : Ghdl_Ptr_type);
+      Start_Procedure_Decl
+        (Interfaces, Get_Identifier ("__ghdl_signal_direct_driver"),
+         O_Storage_External);
+      New_Interface_Decl
+        (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
+      New_Interface_Decl
+        (Interfaces, Param, Get_Identifier ("drv"), Ghdl_Ptr_Type);
+      Finish_Subprogram_Decl (Interfaces, Ghdl_Signal_Direct_Driver);
+
       declare
          procedure Create_Signal_Conversion (Name : String; Res : out O_Dnode)
          is
diff -urN ghdl-0.25/vhdl/translation.ads ghdl-0.26dev/vhdl/translation.ads
--- ghdl-0.25/vhdl/translation.ads	2006-08-02 06:13:50.000000000 +0200
+++ ghdl-0.26dev/vhdl/translation.ads	2006-10-05 11:35:23.000000000 +0200
@@ -61,6 +61,21 @@
    --  If set, do not generate code for unused implicit subprograms.
    Flag_Discard_Unused_Implicit : Boolean := False;
 
+   --  If set, dump drivers per process during compilation.
+   Flag_Dump_Drivers : Boolean := False;
+
+   --  If set, try to create direct drivers.
+   Flag_Direct_Drivers : Boolean := True;
+
+   --  If set, checks ranges (subtype ranges).
+   Flag_Range_Checks : Boolean := True;
+
+   --  If set, checks indexes (arrays index and slice).
+   Flag_Index_Checks : Boolean := True;
+
+   --  If set, do not create identifiers (for in memory compilation).
+   Flag_Discard_Identifiers : Boolean := False;
+
    type Foreign_Kind_Type is (Foreign_Unknown,
                               Foreign_Vhpidirect,
                               Foreign_Intrinsic);
diff -urN ghdl-0.25/vhdl/version.ads ghdl-0.26dev/vhdl/version.ads
--- ghdl-0.25/vhdl/version.ads	2006-08-11 05:15:55.000000000 +0200
+++ ghdl-0.26dev/vhdl/version.ads	2006-10-05 11:35:25.000000000 +0200
@@ -1,4 +1,5 @@
 package Version is
-   Ghdl_Version : constant String :=
-      "GHDL 0.25 (20060811) [Sokcho edition]";
+   Ghdl_Release : constant String :=
+      "GHDL 0.26dev (20060819) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.26dev";
 end Version;



From fedora-extras-commits at redhat.com  Thu Oct  5 09:52:10 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 02:52:10 -0700
Subject: rpms/ghdl/devel ghdl.spec,1.23,1.24
Message-ID: <200610050952.k959qCXU021686@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21669

Modified Files:
	ghdl.spec 
Log Message:
update to svn71



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ghdl.spec	27 Aug 2006 02:52:33 -0000	1.23
+++ ghdl.spec	5 Oct 2006 09:52:10 -0000	1.24
@@ -1,6 +1,6 @@
 %define gccver 4.1.1
 %define ghdlver 0.25
-%define ghdlsvnver 61
+%define ghdlsvnver 71
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.0
+- update to svn71
+
 * Sun Aug 27 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.61svn.0
 - update to svn61
 



From fedora-extras-commits at redhat.com  Thu Oct  5 09:56:34 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 02:56:34 -0700
Subject: rpms/ghdl/devel ghdl-svn71.patch,1.1,1.2
Message-ID: <200610050956.k959uacr021757@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21737

Modified Files:
	ghdl-svn71.patch 
Log Message:
add forgotten new file to the svn71 patch


ghdl-svn71.patch:

Index: ghdl-svn71.patch
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl-svn71.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghdl-svn71.patch	5 Oct 2006 09:41:47 -0000	1.1
+++ ghdl-svn71.patch	5 Oct 2006 09:56:34 -0000	1.2
@@ -2368,7 +2368,7 @@
  Use synthetizer rules for default bindings
 diff -urN ghdl-0.25/vhdl/Makefile.in ghdl-0.26dev/vhdl/Makefile.in
 --- ghdl-0.25/vhdl/Makefile.in	2006-08-11 05:16:14.000000000 +0200
-+++ ghdl-0.26dev/vhdl/Makefile.in	2006-10-05 11:38:11.000000000 +0200
++++ ghdl-0.26dev/vhdl/Makefile.in	2006-10-05 11:55:15.000000000 +0200
 @@ -520,6 +520,9 @@
  i386.o: $(GRTSRCDIR)/config/i386.S
  	$(CC) -c $(GRT_FLAGS) -o $@ $<
@@ -2727,6 +2727,190 @@
 -      Add_Element (Driver_List, Get_Longuest_Static_Prefix (Sig));
     end Sem_Add_Driver;
  end Sem_Stmts;
+diff -urN ghdl-0.25/vhdl/trans_analyzes.adb ghdl-0.26dev/vhdl/trans_analyzes.adb
+--- ghdl-0.25/vhdl/trans_analyzes.adb	1970-01-01 01:00:00.000000000 +0100
++++ ghdl-0.26dev/vhdl/trans_analyzes.adb	2006-10-05 11:35:23.000000000 +0200
+@@ -0,0 +1,163 @@
++with Iirs_Utils; use Iirs_Utils;
++with Iirs_Walk; use Iirs_Walk;
++with Disp_Vhdl;
++with Ada.Text_IO;
++with Errorout;
++
++package body Trans_Analyzes is
++   Driver_List : Iir_List;
++
++   Has_After : Boolean;
++   function Extract_Driver_Target (Target : Iir) return Walk_Status
++   is
++      Base : Iir;
++      Prefix : Iir;
++   begin
++      Base := Get_Object_Prefix (Target);
++      --  Assigment to subprogram interface does not create a driver.
++      if Get_Kind (Base) = Iir_Kind_Signal_Interface_Declaration
++        and then
++        Get_Kind (Get_Parent (Base)) = Iir_Kind_Procedure_Declaration
++      then
++         return Walk_Continue;
++      end if;
++
++      Prefix := Get_Longuest_Static_Prefix (Target);
++      Add_Element (Driver_List, Prefix);
++      if Has_After then
++         Set_After_Drivers_Flag (Base, True);
++      end if;
++      return Walk_Continue;
++   end Extract_Driver_Target;
++
++   function Extract_Driver_Stmt (Stmt : Iir) return Walk_Status
++   is
++      Status : Walk_Status;
++      We : Iir;
++   begin
++      case Get_Kind (Stmt) is
++         when Iir_Kind_Signal_Assignment_Statement =>
++            We := Get_Waveform_Chain (Stmt);
++            if We /= Null_Iir
++              and then Get_Chain (We) = Null_Iir
++              and then Get_Time (We) = Null_Iir
++              and then Get_Kind (Get_We_Value (We)) /= Iir_Kind_Null_Literal
++            then
++               Has_After := False;
++            else
++               Has_After := True;
++            end if;
++            Status := Walk_Assignment_Target
++              (Get_Target (Stmt), Extract_Driver_Target'Access);
++         when Iir_Kind_Procedure_Call_Statement =>
++            declare
++               Call : Iir;
++               Assoc : Iir;
++               Formal : Iir;
++               Inter : Iir;
++            begin
++               --  Very pessimist.
++               Has_After := True;
++
++               Call := Get_Procedure_Call (Stmt);
++               Assoc := Get_Parameter_Association_Chain (Call);
++               Inter := Get_Interface_Declaration_Chain
++                 (Get_Implementation (Call));
++               while Assoc /= Null_Iir loop
++                  Formal := Get_Formal (Assoc);
++                  if Formal = Null_Iir then
++                     Formal := Inter;
++                     Inter := Get_Chain (Inter);
++                  else
++                     Formal := Get_Base_Name (Formal);
++                  end if;
++                  if Get_Kind (Assoc)
++                    = Iir_Kind_Association_Element_By_Expression
++                    and then
++                    Get_Kind (Formal) = Iir_Kind_Signal_Interface_Declaration
++                    and then Get_Mode (Formal) /= Iir_In_Mode
++                  then
++                     Status := Extract_Driver_Target (Get_Actual (Assoc));
++                  end if;
++                  Assoc := Get_Chain (Assoc);
++               end loop;
++            end;
++         when others =>
++            null;
++      end case;
++      return Walk_Continue;
++   end Extract_Driver_Stmt;
++
++   procedure Extract_Drivers_Sequential_Stmt_Chain (Chain : Iir)
++   is
++      Status : Walk_Status;
++   begin
++      Status := Walk_Sequential_Stmt_Chain (Chain, Extract_Driver_Stmt'Access);
++   end Extract_Drivers_Sequential_Stmt_Chain;
++
++   procedure Extract_Drivers_Declaration_Chain (Chain : Iir)
++   is
++      Decl : Iir := Chain;
++   begin
++      while Decl /= Null_Iir loop
++
++         --  Only procedures and impure functions may contain assignment.
++         if Get_Kind (Decl) = Iir_Kind_Procedure_Body
++           or else (Get_Kind (Decl) = Iir_Kind_Function_Body
++                    and then
++                    Get_Pure_Flag (Get_Subprogram_Specification (Decl)))
++         then
++            Extract_Drivers_Declaration_Chain (Get_Declaration_Chain (Decl));
++            Extract_Drivers_Sequential_Stmt_Chain
++              (Get_Sequential_Statement_Chain (Decl));
++         end if;
++
++         Decl := Get_Chain (Decl);
++      end loop;
++   end Extract_Drivers_Declaration_Chain;
++
++   function Extract_Drivers (Proc : Iir) return Iir_List
++   is
++   begin
++      Driver_List := Create_Iir_List;
++      Extract_Drivers_Declaration_Chain (Get_Declaration_Chain (Proc));
++      Extract_Drivers_Sequential_Stmt_Chain
++              (Get_Sequential_Statement_Chain (Proc));
++
++      return Driver_List;
++   end Extract_Drivers;
++
++   procedure Free_Drivers_List (List : in out Iir_List)
++   is
++      El : Iir;
++   begin
++      for I in Natural loop
++         El := Get_Nth_Element (List, I);
++         exit when El = Null_Iir;
++         Set_After_Drivers_Flag (Get_Base_Name (El), False);
++      end loop;
++      Destroy_Iir_List (List);
++   end Free_Drivers_List;
++
++   procedure Dump_Drivers (Proc : Iir; List : Iir_List)
++   is
++      use Ada.Text_IO;
++      use Errorout;
++      El : Iir;
++   begin
++      Put_Line ("List of drivers for " & Disp_Node (Proc) & ":");
++      Put_Line (" (declared at " & Disp_Location (Proc) & ")");
++      for I in Natural loop
++         El := Get_Nth_Element (List, I);
++         exit when El = Null_Iir;
++         if Get_After_Drivers_Flag (Get_Base_Name (El)) then
++            Put ("*  ");
++         else
++            Put ("   ");
++         end if;
++         Disp_Vhdl.Disp_Vhdl (El);
++         New_Line;
++      end loop;
++   end Dump_Drivers;
++
++end Trans_Analyzes;
+diff -urN ghdl-0.25/vhdl/trans_analyzes.ads ghdl-0.26dev/vhdl/trans_analyzes.ads
+--- ghdl-0.25/vhdl/trans_analyzes.ads	1970-01-01 01:00:00.000000000 +0100
++++ ghdl-0.26dev/vhdl/trans_analyzes.ads	2006-10-05 11:35:23.000000000 +0200
+@@ -0,0 +1,13 @@
++with Iirs; use Iirs;
++
++package Trans_Analyzes is
++   --  Extract a list of drivers from PROC.
++   function Extract_Drivers (Proc : Iir) return Iir_List;
++
++   --  Free the list.
++   procedure Free_Drivers_List (List : in out Iir_List);
++
++   --  Dump list of drivers (LIST) for process PROC.
++   procedure Dump_Drivers (Proc : Iir; List : Iir_List);
++
++end Trans_Analyzes;
 diff -urN ghdl-0.25/vhdl/trans_be.adb ghdl-0.26dev/vhdl/trans_be.adb
 --- ghdl-0.25/vhdl/trans_be.adb	2006-08-02 05:57:46.000000000 +0200
 +++ ghdl-0.26dev/vhdl/trans_be.adb	2006-10-05 11:35:23.000000000 +0200



From fedora-extras-commits at redhat.com  Thu Oct  5 10:03:49 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:03:49 -0700
Subject: rpms/guiloader - New directory
Message-ID: <200610051003.k95A3pgp024755@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24732/guiloader

Log Message:
Directory /cvs/extras/rpms/guiloader added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 10:03:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:03:50 -0700
Subject: rpms/guiloader/devel - New directory
Message-ID: <200610051003.k95A3qxB024761@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24732/guiloader/devel

Log Message:
Directory /cvs/extras/rpms/guiloader/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 10:04:00 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:04:00 -0700
Subject: rpms/guiloader Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610051004.k95A427e024805@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24779

Added Files:
	Makefile import.log 
Log Message:
Setup of module guiloader


--- NEW FILE Makefile ---
# Top level Makefile for module guiloader
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 10:04:02 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:04:02 -0700
Subject: rpms/guiloader/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610051004.k95A449d024810@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24779/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module guiloader


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 10:04:35 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:04:35 -0700
Subject: rpms/guiloader/devel guiloader-2.8.0-soversion.patch, NONE,
	1.1 guiloader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610051004.k95A4bIP024886@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24848/devel

Modified Files:
	.cvsignore sources 
Added Files:
	guiloader-2.8.0-soversion.patch guiloader.spec 
Log Message:
auto-import guiloader-2.8.0-2 on branch devel from guiloader-2.8.0-2.src.rpm

guiloader-2.8.0-soversion.patch:

--- NEW FILE guiloader-2.8.0-soversion.patch ---
--- guiloader-2.8.0/guiloader/Makefile.in.orig	2006-09-12 10:54:56.000000000 +0200
+++ guiloader-2.8.0/guiloader/Makefile.in	2006-09-12 10:55:16.000000000 +0200
@@ -202,7 +202,6 @@
 	proxies.c proxies.h
 
 libguiloader_la_LIBADD = $(PKGS_LIBS)
-libguiloader_la_LDFLAGS = -no-undefined -avoid-version
 libguiloader_la_CPPFLAGS = $(PKGS_CFLAGS) $(GUILOADER_CFLAGS)
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guiloader.pc


--- NEW FILE guiloader.spec ---
Name:           guiloader
Version:        2.8.0
Release:        2%{?dist}
Summary:        Gideon GuiXml Loader Library

Group:          System Environment/Libraries
License:        GPL
URL:            http://gideon.sourceforge.net
Source0:        http://dl.sourceforge.net/gideon/%{name}-%{version}.tar.bz2
Patch0:         guiloader-2.8.0-soversion.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel >= 2.10.0
BuildRequires:  gtk2-devel >= 2.8.0


%description
GuiLoader is a high-performance and compact GuiXml loader
library. This library allows GTK+ applications to create GUI widgets
and objects at run-time from GuiXml resource files. GuiLoader is
written in C language as a GObject subclass and has a trivial
language-independent API. GuiLoader was designed to be easily wrapped
for any language that has GTK+ bindings.


%package devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       glib2-devel
Requires:       gtk2-devel
Requires:       pkgconfig


%description devel
This package contains the header files needed for developing %{name}
applications.


%prep
%setup -q
%patch0 -p1 -b .soversion


%build
%configure --disable-static --disable-dependency-tracking
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README
%{_libdir}/*.so.*


%files devel
%defattr(-, root, root, -)
%doc NEWS
%{_includedir}/guiloader
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 2.8.0-1
- Added pkgconfig devel Requires

* Sun Sep  3 2006 Denis Leroy <denis at poolshark.org> - 2.8.0-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guiloader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 10:04:02 -0000	1.1
+++ .cvsignore	5 Oct 2006 10:04:34 -0000	1.2
@@ -0,0 +1 @@
+guiloader-2.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guiloader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 10:04:02 -0000	1.1
+++ sources	5 Oct 2006 10:04:34 -0000	1.2
@@ -0,0 +1 @@
+98980d8c65e53f0f5288d1ebdb652b70  guiloader-2.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 10:04:32 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:04:32 -0700
Subject: rpms/guiloader import.log,1.1,1.2
Message-ID: <200610051005.k95A55XD024889@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24848

Modified Files:
	import.log 
Log Message:
auto-import guiloader-2.8.0-2 on branch devel from guiloader-2.8.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/guiloader/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 10:04:00 -0000	1.1
+++ import.log	5 Oct 2006 10:04:32 -0000	1.2
@@ -0,0 +1 @@
+guiloader-2_8_0-2:HEAD:guiloader-2.8.0-2.src.rpm:1160043671



From fedora-extras-commits at redhat.com  Thu Oct  5 10:14:44 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 03:14:44 -0700
Subject: owners owners.list,1.1776,1.1777
Message-ID: <200610051014.k95AEkHV025068@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25050

Modified Files:
	owners.list 
Log Message:
Added guiloader


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1776
retrieving revision 1.1777
diff -u -r1.1776 -r1.1777
--- owners.list	5 Oct 2006 03:35:14 -0000	1.1776
+++ owners.list	5 Oct 2006 10:14:44 -0000	1.1777
@@ -626,6 +626,7 @@
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtypist|GNU typing tutor|zing at fastmail.fm|extras-qa at fedoraproject.org|
 Fedora Extras|guichan|Portable C++ GUI library for games using Allegro, SDL and OpenGL|hugo at devin.com.br|extras-qa at fedoraproject.org|
+Fedora Extras|guiloader|Gideon GuiXml Loader Library|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gurlchecker|A GNOME link validity checker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gutenprint|Printer Drivers Package|panemade at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct  5 10:53:26 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 03:53:26 -0700
Subject: rpms/xfce4-battery-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-battery-plugin.spec, 1.5, 1.6
Message-ID: <200610051053.k95ArSnE025419@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25398

Modified Files:
	.cvsignore sources xfce4-battery-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2005 03:10:03 -0000	1.2
+++ .cvsignore	5 Oct 2006 10:53:26 -0000	1.3
@@ -1 +1 @@
-xfce4-battery-plugin-0.3.0.tar.gz
+xfce4-battery-plugin-0.4.90.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2005 03:10:03 -0000	1.2
+++ sources	5 Oct 2006 10:53:26 -0000	1.3
@@ -1 +1 @@
-04e121df1ff264281e56e12a8ff5f155  xfce4-battery-plugin-0.3.0.tar.gz
+4dd103909b3d5bb373c12b69da783a6c  xfce4-battery-plugin-0.4.90.2.tar.bz2


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-battery-plugin.spec	8 Sep 2006 18:36:48 -0000	1.5
+++ xfce4-battery-plugin.spec	5 Oct 2006 10:53:26 -0000	1.6
@@ -1,17 +1,18 @@
 Name:		xfce4-battery-plugin
-Version:	0.3.0
-Release:	7%{?dist}
+Version:	0.4.90.2
+Release:	3%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	LGPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	LGPL
+URL:		http://goodies.xfce.org/
+Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source1:	LGPL.%{name}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+BuildRequires:	xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -26,20 +27,31 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
-# replace wrong BSD license with a copy of LGPL
-%__cp %{SOURCE1} COPYING
+# replace wrong BSD license with a copy of LGPL (#173105)
+cp %{SOURCE1} COPYING
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
+- 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
 - Mass rebuild for Fedora Core 6.
 
@@ -52,10 +64,10 @@
 
 * Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Sat Nov 19 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-3
-- Use %{?_smp_mflags}.
+- Use {?_smp_mflags}.
 - Replace wrong BSD license with a copy of the GPL (#173105).
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-2



From fedora-extras-commits at redhat.com  Thu Oct  5 11:14:13 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 04:14:13 -0700
Subject: rpms/ghdl/devel ghdl.spec,1.24,1.25
Message-ID: <200610051114.k95BEFb6028620@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28603

Modified Files:
	ghdl.spec 
Log Message:
bump release



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ghdl.spec	5 Oct 2006 09:52:10 -0000	1.24
+++ ghdl.spec	5 Oct 2006 11:14:13 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.25
-Release: 0.%{ghdlsvnver}svn.0%{?dist}
+Release: 0.%{ghdlsvnver}svn.1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.1
+- bump release
+
 * Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.0
 - update to svn71
 



From fedora-extras-commits at redhat.com  Thu Oct  5 11:14:51 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  5 Oct 2006 04:14:51 -0700
Subject: rpms/amarok/FC-5 amarok.spec,1.60,1.61
Message-ID: <200610051114.k95BErwf028662@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28631/FC-5

Modified Files:
	amarok.spec 
Log Message:
add support for libmtp


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- amarok.spec	15 Sep 2006 10:56:58 -0000	1.60
+++ amarok.spec	5 Oct 2006 11:14:51 -0000	1.61
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    3%{?dist}
+Release:    5%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -33,6 +33,8 @@
 BuildRequires:  libgpod-devel
 # Creative Nomad Jukebox
 BuildRequires:  libnjb-devel
+# MTP players
+BuildRequires:  libmtp-devel
 ## Gstreamer engine
 #BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
 # Helix engine on archs where it is available
@@ -216,6 +218,9 @@
 # Creative Zen
 %{_datadir}/services/amarok_njb-mediadevice.desktop
 %{_libdir}/kde3/libamarok_njb-mediadevice.*
+# MTP players
+%{_datadir}/services/amarok_mtp-mediadevice.desktop
+%{_libdir}/kde3/libamarok_mtp-mediadevice.*
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
@@ -239,6 +244,12 @@
 
 
 %changelog
+* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-5
+- add libmtp support
+
+* Sun Oct 01 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-4
+- rebuild
+
 * Fri Sep 15 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-3
 - add patch for playlist encoding
 



From fedora-extras-commits at redhat.com  Thu Oct  5 11:14:52 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  5 Oct 2006 04:14:52 -0700
Subject: rpms/amarok/devel amarok.spec,1.61,1.62
Message-ID: <200610051114.k95BEsZ7028666@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28631/devel

Modified Files:
	amarok.spec 
Log Message:
add support for libmtp


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- amarok.spec	1 Oct 2006 19:23:16 -0000	1.61
+++ amarok.spec	5 Oct 2006 11:14:52 -0000	1.62
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    4%{?dist}
+Release:    5%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -33,6 +33,8 @@
 BuildRequires:  libgpod-devel
 # Creative Nomad Jukebox
 BuildRequires:  libnjb-devel
+# MTP players
+BuildRequires:  libmtp-devel
 ## Gstreamer engine
 #BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
 # Helix engine on archs where it is available
@@ -216,6 +218,9 @@
 # Creative Zen
 %{_datadir}/services/amarok_njb-mediadevice.desktop
 %{_libdir}/kde3/libamarok_njb-mediadevice.*
+# MTP players
+%{_datadir}/services/amarok_mtp-mediadevice.desktop
+%{_libdir}/kde3/libamarok_mtp-mediadevice.*
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
@@ -239,6 +244,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-5
+- add libmtp support
+
 * Sun Oct 01 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Oct  5 11:26:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:26:26 -0700
Subject: rpms/perl-Test-MockObject/FC-5 .cvsignore, 1.9,
	1.10 perl-Test-MockObject.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200610051126.k95BQSCB028906@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-MockObject/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28869/FC-5

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.07.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Apr 2006 15:55:23 -0000	1.9
+++ .cvsignore	5 Oct 2006 11:26:25 -0000	1.10
@@ -1 +1 @@
-Test-MockObject-1.06.tar.gz
+Test-MockObject-1.07.tar.gz


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/perl-Test-MockObject.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Test-MockObject.spec	21 Apr 2006 15:55:23 -0000	1.13
+++ perl-Test-MockObject.spec	5 Oct 2006 11:26:25 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.06
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
@@ -43,7 +42,6 @@
 
 
 %check
-mv t/developer/0-signature.t t/developer/0-signature.t.disable
 PERL_RUN_ALL_TESTS=1 ./Build test
 
 
@@ -55,10 +53,13 @@
 %defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/Test/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.07-1
+- Update to 1.07.
+
 * Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Apr 2006 15:55:23 -0000	1.9
+++ sources	5 Oct 2006 11:26:25 -0000	1.10
@@ -1 +1 @@
-3cef7884dd6fc6b15c35dd04697a8853  Test-MockObject-1.06.tar.gz
+197af22ac675405199693ed68f0959e1  Test-MockObject-1.07.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:26:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:26:26 -0700
Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.9,
	1.10 perl-Test-MockObject.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200610051126.k95BQSRo028912@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-MockObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28869/devel

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.07.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Apr 2006 15:42:13 -0000	1.9
+++ .cvsignore	5 Oct 2006 11:26:26 -0000	1.10
@@ -1 +1 @@
-Test-MockObject-1.06.tar.gz
+Test-MockObject-1.07.tar.gz


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Test-MockObject.spec	21 Apr 2006 15:42:13 -0000	1.13
+++ perl-Test-MockObject.spec	5 Oct 2006 11:26:26 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.06
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -10,7 +10,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
@@ -43,7 +42,6 @@
 
 
 %check
-mv t/developer/0-signature.t t/developer/0-signature.t.disable
 PERL_RUN_ALL_TESTS=1 ./Build test
 
 
@@ -55,10 +53,13 @@
 %defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/Test/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.07-1
+- Update to 1.07.
+
 * Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Apr 2006 15:42:13 -0000	1.9
+++ sources	5 Oct 2006 11:26:26 -0000	1.10
@@ -1 +1 @@
-3cef7884dd6fc6b15c35dd04697a8853  Test-MockObject-1.06.tar.gz
+197af22ac675405199693ed68f0959e1  Test-MockObject-1.07.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:32:24 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  5 Oct 2006 04:32:24 -0700
Subject: rpms/plone/devel .cvsignore, 1.10, 1.11 plone.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200610051132.k95BWQmv029138@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100/devel

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 209163, CVE-2006-4247


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jul 2006 16:19:31 -0000	1.10
+++ .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
@@ -1 +1,2 @@
 Plone-2.5.tar.gz
+PasswordResetTool-0.4.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plone.spec	30 Aug 2006 12:02:41 -0000	1.16
+++ plone.spec	5 Oct 2006 11:32:21 -0000	1.17
@@ -6,12 +6,13 @@
 
 Name:           plone
 Version:        2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
+Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 Patch0:         Plone-2.5-atxmlperms.patch
 
@@ -50,6 +51,10 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
+# Fixed version of PasswordResetTool
+rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +72,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
+- Update PasswordResetTool to fix CVE-2006-4247
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-3
 - Zope 2.9.4 went back to zope/lib/python on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jul 2006 16:19:31 -0000	1.10
+++ sources	5 Oct 2006 11:32:21 -0000	1.11
@@ -1 +1,2 @@
 0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
+df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:32:21 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu,  5 Oct 2006 04:32:21 -0700
Subject: rpms/plone/FC-5 .cvsignore, 1.10, 1.11 plone.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200610051132.k95BWsWJ029143@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100/FC-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 209163, CVE-2006-4247


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jul 2006 16:19:31 -0000	1.10
+++ .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
@@ -1 +1,2 @@
 Plone-2.5.tar.gz
+PasswordResetTool-0.4.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plone.spec	30 Aug 2006 12:02:37 -0000	1.16
+++ plone.spec	5 Oct 2006 11:32:21 -0000	1.17
@@ -6,12 +6,13 @@
 
 Name:           plone
 Version:        2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
+Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 Patch0:         Plone-2.5-atxmlperms.patch
 
@@ -50,6 +51,10 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
+# Fixed version of PasswordResetTool
+rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +72,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
+- Update PasswordResetTool to fix CVE-2006-4247
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-3
 - Zope 2.9.4 went back to zope/lib/python on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jul 2006 16:19:31 -0000	1.10
+++ sources	5 Oct 2006 11:32:21 -0000	1.11
@@ -1 +1,2 @@
 0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
+df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:42:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:42:59 -0700
Subject: rpms/perl-Module-CoreList/devel .cvsignore, 1.11,
	1.12 perl-Module-CoreList.spec, 1.14, 1.15 sources, 1.11, 1.12
Message-ID: <200610051143.k95Bh1xN029376@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-CoreList/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321/devel

Modified Files:
	.cvsignore perl-Module-CoreList.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2006 10:16:54 -0000	1.11
+++ .cvsignore	5 Oct 2006 11:42:59 -0000	1.12
@@ -1 +1 @@
-Module-CoreList-2.08.tar.gz
+Module-CoreList-2.09.tar.gz


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/perl-Module-CoreList.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Module-CoreList.spec	7 Sep 2006 10:16:54 -0000	1.14
+++ perl-Module-CoreList.spec	5 Oct 2006 11:42:59 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-Module-CoreList
-Version:        2.08
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Perl core modules indexed by perl versions
 
@@ -10,10 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(version)
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(version)
 
 %description
 Module::CoreList contains the hash of hashes %Module::CoreList::version,
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Thu Sep  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.08-1
 - Update to 2.08.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2006 10:16:54 -0000	1.11
+++ sources	5 Oct 2006 11:42:59 -0000	1.12
@@ -1 +1 @@
-d239fa54b06afda6e2a8e9db555493ad  Module-CoreList-2.08.tar.gz
+3a295781238521a100587748945506a5  Module-CoreList-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:42:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:42:52 -0700
Subject: rpms/perl-Module-CoreList/FC-4 .cvsignore, 1.11,
	1.12 perl-Module-CoreList.spec, 1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200610051143.k95BhP9p029381@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-CoreList/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321/FC-4

Modified Files:
	.cvsignore perl-Module-CoreList.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2006 10:16:52 -0000	1.11
+++ .cvsignore	5 Oct 2006 11:42:52 -0000	1.12
@@ -1 +1 @@
-Module-CoreList-2.08.tar.gz
+Module-CoreList-2.09.tar.gz


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/perl-Module-CoreList.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Module-CoreList.spec	7 Sep 2006 10:16:52 -0000	1.13
+++ perl-Module-CoreList.spec	5 Oct 2006 11:42:52 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Module-CoreList
-Version:        2.08
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Perl core modules indexed by perl versions
 
@@ -10,10 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(version)
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(version)
 
 %description
 Module::CoreList contains the hash of hashes %Module::CoreList::version,
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Thu Sep  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.08-1
 - Update to 2.08.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2006 10:16:52 -0000	1.11
+++ sources	5 Oct 2006 11:42:52 -0000	1.12
@@ -1 +1 @@
-d239fa54b06afda6e2a8e9db555493ad  Module-CoreList-2.08.tar.gz
+3a295781238521a100587748945506a5  Module-CoreList-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:42:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 04:42:53 -0700
Subject: rpms/perl-Module-CoreList/FC-5 .cvsignore, 1.11,
	1.12 perl-Module-CoreList.spec, 1.14, 1.15 sources, 1.11, 1.12
Message-ID: <200610051143.k95BhPi2029386@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-CoreList/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321/FC-5

Modified Files:
	.cvsignore perl-Module-CoreList.spec sources 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2006 10:16:53 -0000	1.11
+++ .cvsignore	5 Oct 2006 11:42:53 -0000	1.12
@@ -1 +1 @@
-Module-CoreList-2.08.tar.gz
+Module-CoreList-2.09.tar.gz


Index: perl-Module-CoreList.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-5/perl-Module-CoreList.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Module-CoreList.spec	7 Sep 2006 10:16:53 -0000	1.14
+++ perl-Module-CoreList.spec	5 Oct 2006 11:42:53 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-Module-CoreList
-Version:        2.08
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Perl core modules indexed by perl versions
 
@@ -10,10 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(version)
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(version)
 
 %description
 Module::CoreList contains the hash of hashes %Module::CoreList::version,
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
+- Update to 2.09.
+
 * Thu Sep  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.08-1
 - Update to 2.08.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2006 10:16:53 -0000	1.11
+++ sources	5 Oct 2006 11:42:53 -0000	1.12
@@ -1 +1 @@
-d239fa54b06afda6e2a8e9db555493ad  Module-CoreList-2.08.tar.gz
+3a295781238521a100587748945506a5  Module-CoreList-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 11:47:13 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu,  5 Oct 2006 04:47:13 -0700
Subject: rpms/yum-utils/devel yum-utils.spec,1.11,1.12
Message-ID: <200610051147.k95BlFm6029527@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29510

Modified Files:
	yum-utils.spec 
Log Message:

fix requires



Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yum-utils.spec	5 Oct 2006 03:34:37 -0000	1.11
+++ yum-utils.spec	5 Oct 2006 11:47:13 -0000	1.12
@@ -105,7 +105,7 @@
 %package -n yum-allowdowngrade
 Summary: Yum plugin to enable manual downgrading of packages
 Group: System Environment/Base
-Requires: yum > 3.0
+Requires: yum >= 3.0
 
 %description -n yum-allowdowngrade
 This plugin adds a --allow-downgrade flag to yum to make it possible to
@@ -114,7 +114,7 @@
 %package -n yum-skip-broken
 Summary: Yum plugin to handle skiping packages with dependency problems
 Group: System Environment/Base
-Requires: yum > 3.0
+Requires: yum >= 3.0
 
 %description -n yum-skip-broken
 This plugin adds a --ignore-broken to yum to make it possible to



From fedora-extras-commits at redhat.com  Thu Oct  5 11:47:29 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu,  5 Oct 2006 04:47:29 -0700
Subject: rpms/yum-utils/devel yum-utils.spec,1.12,1.13
Message-ID: <200610051147.k95BlVv3029550@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29533

Modified Files:
	yum-utils.spec 
Log Message:
bump release




Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yum-utils.spec	5 Oct 2006 11:47:13 -0000	1.12
+++ yum-utils.spec	5 Oct 2006 11:47:29 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 12:04:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Oct 2006 05:04:37 -0700
Subject: rpms/uw-imap/devel uw-imap.spec, 1.17, 1.18 imap-2006-mixproto.patch,
	1.1, NONE
Message-ID: <200610051204.k95C4dsr032576@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32559

Modified Files:
	uw-imap.spec 
Removed Files:
	imap-2006-mixproto.patch 
Log Message:
* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
- eek, pam.d/xinet.d bits were all mixed up, fixed.



Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- uw-imap.spec	4 Oct 2006 18:03:36 -0000	1.17
+++ uw-imap.spec	5 Oct 2006 12:04:36 -0000	1.18
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -28,18 +28,17 @@
 
 Source10: c-client.cf
 
-# legacy/old pam setup, using pam_stack.so
-Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source22: imap.pam
+Source21: imap.pam
+# legacy/old pam setup, using pam_stack.so
+Source22: imap-legacy.pam
 
 Source31: imap-xinetd
-Source32: ipop2-xinetd
-Source33: ipop3-xinetd
-Source34: imaps-xinetd
+Source32: imaps-xinetd
+Source33: ipop2-xinetd
+Source34: ipop3-xinetd
 Source35: pop3s-xinetd
 
-
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
@@ -274,6 +273,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
+- eek, pam.d/xinet.d bits were all mixed up, fixed.
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
 - libc-client: move c-client.cf here
 - c-client.cf: +set new-folder-format same-as-inbox


--- imap-2006-mixproto.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 12:06:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Oct 2006 05:06:19 -0700
Subject: rpms/uw-imap/FC-5 uw-imap.spec,1.12,1.13
Message-ID: <200610051206.k95C6L74032665@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32648

Modified Files:
	uw-imap.spec 
Log Message:
* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
- eek, pam.d/xinet.d bits were all mixed up, fixed.



Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- uw-imap.spec	4 Oct 2006 18:11:55 -0000	1.12
+++ uw-imap.spec	5 Oct 2006 12:06:19 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -28,18 +28,17 @@
 
 Source10: c-client.cf
 
-# legacy/old pam setup, using pam_stack.so
-Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source22: imap.pam
+Source21: imap.pam
+# legacy/old pam setup, using pam_stack.so
+Source22: imap-legacy.pam
 
 Source31: imap-xinetd
-Source32: ipop2-xinetd
-Source33: ipop3-xinetd
-Source34: imaps-xinetd
+Source32: imaps-xinetd
+Source33: ipop2-xinetd
+Source34: ipop3-xinetd
 Source35: pop3s-xinetd
 
-
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
@@ -274,6 +273,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
+- eek, pam.d/xinet.d bits were all mixed up, fixed.
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
 - libc-client: move c-client.cf here
 - c-client.cf: +set new-folder-format same-as-inbox



From fedora-extras-commits at redhat.com  Thu Oct  5 12:08:55 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:08:55 -0700
Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-clipman-plugin.spec, 1.4, 1.5
Message-ID: <200610051208.k95C8vi2000367@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv346

Modified Files:
	.cvsignore sources xfce4-clipman-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2005 04:32:10 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:08:55 -0000	1.3
@@ -1 +1 @@
-xfce4-clipman-plugin-0.4.1.tar.gz
+xfce4-clipman-plugin-0.5.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2005 04:32:10 -0000	1.2
+++ sources	5 Oct 2006 12:08:55 -0000	1.3
@@ -1 +1 @@
-664f6ca8500d8f240289c27d7bf4f419  xfce4-clipman-plugin-0.4.1.tar.gz
+039401e332277bd41d0cd51a0ec18d8a  xfce4-clipman-plugin-0.5.99.1.tar.bz2


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-clipman-plugin.spec	8 Sep 2006 18:38:52 -0000	1.4
+++ xfce4-clipman-plugin.spec	5 Oct 2006 12:08:55 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-clipman-plugin
-Version:	0.4.1
-Release:	7%{?dist}
+Version:	0.5.99.1
+Release:	3%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.1, libxfcegui4-devel >= 4.3.99.1, libxml2-devel
+BuildRequires:	libXt-devel, gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -26,17 +27,31 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%doc AUTHORS COPYING ChangeLog README THANKS
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
+- Update to 0.5.99.1.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Mass rebuild for Fedora Core 6.
 
@@ -48,7 +63,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:11:40 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:11:40 -0700
Subject: rpms/xfce4-cpugraph-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-cpugraph-plugin.spec, 1.5, 1.6
Message-ID: <200610051211.k95CBgIq000412@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391

Modified Files:
	.cvsignore sources xfce4-cpugraph-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:52:48 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:11:40 -0000	1.3
@@ -1 +1 @@
-xfce4-cpugraph-plugin-0.2.2.tar.gz
+xfce4-cpugraph-plugin-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Dec 2005 22:52:48 -0000	1.2
+++ sources	5 Oct 2006 12:11:40 -0000	1.3
@@ -1 +1 @@
-bde4c578ef469aade3f6b58a9bde8ec6  xfce4-cpugraph-plugin-0.2.2.tar.gz
+b2ff93a62845289c4a8ed7d45faa7a1f  xfce4-cpugraph-plugin-0.3.0.tar.bz2


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-cpugraph-plugin.spec	8 Sep 2006 18:40:22 -0000	1.5
+++ xfce4-cpugraph-plugin.spec	5 Oct 2006 12:11:40 -0000	1.6
@@ -1,16 +1,17 @@
 Name:		xfce4-cpugraph-plugin
-Version:	0.2.2
-Release:	7%{?dist}
+Version:	0.3
+Release:	3%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel  >= 4.3.20, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -18,7 +19,7 @@
 colors and the size of the plugin are customizable.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 %build
 %configure --disable-static
@@ -27,17 +28,27 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/xfce4/panel-plugins/*.so
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog README NEWS TODO
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-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
 - Mass rebuild for Fedora Core 6.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 12:13:39 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:13:39 -0700
Subject: rpms/xfce4-diskperf-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-diskperf-plugin.spec, 1.5, 1.6
Message-ID: <200610051213.k95CDfQE000465@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv443

Modified Files:
	.cvsignore sources xfce4-diskperf-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jan 2006 00:21:04 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:13:39 -0000	1.3
@@ -1 +1 @@
-xfce4-diskperf-plugin-1.5.tar.gz
+xfce4-diskperf-plugin-2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jan 2006 00:21:04 -0000	1.2
+++ sources	5 Oct 2006 12:13:39 -0000	1.3
@@ -1 +1 @@
-cb1b2637166b8a4355b3df85e593640f  xfce4-diskperf-plugin-1.5.tar.gz
+be819b14db68369f541a02f9a27e9dc5  xfce4-diskperf-plugin-2.0.tar.bz2


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-diskperf-plugin.spec	8 Sep 2006 18:44:42 -0000	1.5
+++ xfce4-diskperf-plugin.spec	5 Oct 2006 12:13:39 -0000	1.6
@@ -1,16 +1,17 @@
 Name:		xfce4-diskperf-plugin
-Version:	1.5
-Release:	7%{?dist}
+Version:	2.0
+Release:	3%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -26,7 +27,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,9 +34,20 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 2.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.5-7
 - Mass rebuild for Fedora Core 6.
 
@@ -48,7 +59,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:15:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:15:24 -0700
Subject: rpms/xfce4-fsguard-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-fsguard-plugin.spec, 1.4, 1.5
Message-ID: <200610051215.k95CFQSi000509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv488

Modified Files:
	.cvsignore sources xfce4-fsguard-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jan 2006 23:36:42 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:15:24 -0000	1.3
@@ -1 +1 @@
-xfce4-fsguard-plugin-0.2.1.tar.gz
+xfce4-fsguard-plugin-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jan 2006 23:36:42 -0000	1.2
+++ sources	5 Oct 2006 12:15:24 -0000	1.3
@@ -1 +1 @@
-6fa6c2b734ee8d4c0a5901f6d704b6c9  xfce4-fsguard-plugin-0.2.1.tar.gz
+27770ad4c4b737bfb0f3fb2457b33729  xfce4-fsguard-plugin-0.3.0.tar.bz2


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/xfce4-fsguard-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-fsguard-plugin.spec	8 Sep 2006 18:48:25 -0000	1.4
+++ xfce4-fsguard-plugin.spec	5 Oct 2006 12:15:24 -0000	1.5
@@ -1,17 +1,17 @@
 Name:		xfce4-fsguard-plugin
-Version:	0.2.1
-Release:	5%{?dist}
+Version:	0.3.0
+Release:	3%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -29,18 +29,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang xfce4-fsguard
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f xfce4-fsguard.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
+- Update to 0.3.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.2.1-5
 - Mass rebuild for Fedora Core 6.
 
@@ -52,7 +62,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-2
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:18:37 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:18:37 -0700
Subject: rpms/xfce4-genmon-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-genmon-plugin.spec, 1.4, 1.5
Message-ID: <200610051218.k95CIdcZ000554@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv533

Modified Files:
	.cvsignore sources xfce4-genmon-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:38:04 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-xfce4-genmon-plugin-1.1.tar.gz
+xfce4-genmon-plugin-2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Dec 2005 22:38:04 -0000	1.2
+++ sources	5 Oct 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-130be5e17d4ae41f86bbb952adb6a95d  xfce4-genmon-plugin-1.1.tar.gz
+c859720637f943032545d7b1428aa0b4  xfce4-genmon-plugin-2.0.tar.bz2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-genmon-plugin.spec	8 Sep 2006 18:50:18 -0000	1.4
+++ xfce4-genmon-plugin.spec	5 Oct 2006 12:18:36 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-genmon-plugin
-Version:	1.1
-Release:	7%{?dist}
+Version:	2.0
+Release:	3%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	LGPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -26,7 +27,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,9 +34,20 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 2.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.1-7
 - Mass rebuild for Fedora Core 6.
 
@@ -48,7 +59,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.1-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 1.1-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:20:45 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:20:45 -0700
Subject: rpms/xfce4-mailwatch-plugin/devel xfce4-mailwatch-plugin.spec, 1.3, 
	1.4
Message-ID: <200610051220.k95CKlEk000599@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mailwatch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv582

Modified Files:
	xfce4-mailwatch-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: xfce4-mailwatch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mailwatch-plugin/devel/xfce4-mailwatch-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mailwatch-plugin.spec	8 Sep 2006 18:53:57 -0000	1.3
+++ xfce4-mailwatch-plugin.spec	5 Oct 2006 12:20:44 -0000	1.4
@@ -1,13 +1,13 @@
 Name:		xfce4-mailwatch-plugin
 Version:	1.0.1
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	Mail Watcher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://spuriousinterrupt.org/projects/mailwatch
 Source0:	http://spuriousinterrupt.org/files/mailwatch/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
@@ -16,7 +16,7 @@
 %if "%fedora" > "4"
 BuildRequires:	gnutls-devel >= 1.2.0, libXt-devel
 %endif
-Requires:	xfce4-panel >= 4.2
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 Mailwatch is a plugin for the Xfce 4 panel. It is intended to replace the 
@@ -33,19 +33,18 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %clean
@@ -54,15 +53,20 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/icons/hicolor/48x48/apps/xfce-newmail.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce-nomail.png
-%{_datadir}/icons/hicolor/scalable/apps/xfce-newmail.svg
-%{_datadir}/icons/hicolor/scalable/apps/xfce-nomail.svg
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce-*mail.png
+%{_datadir}/icons/hicolor/scalable/apps/xfce-*mail.svg
 %{_datadir}/xfce4/doc/C/xfce4-mailwatch-plugin.html
 %{_datadir}/xfce4/doc/C/images/mailwatch-*.png
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-4
+- Bump release for devel checkin.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Mass rebuild for Fedora Core 6.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 12:23:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:23:23 -0700
Subject: rpms/xfce4-minicmd-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-minicmd-plugin.spec, 1.4, 1.5
Message-ID: <200610051223.k95CNQfE000677@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656

Modified Files:
	.cvsignore sources xfce4-minicmd-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2005 03:53:18 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:23:23 -0000	1.3
@@ -1 +1 @@
-xfce4-minicmd-plugin-0.3.0.tar.gz
+xfce4-minicmd-plugin-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2005 03:53:18 -0000	1.2
+++ sources	5 Oct 2006 12:23:23 -0000	1.3
@@ -1 +1 @@
-fe52a8ed8451ed41366d5b4abb2dbf9e  xfce4-minicmd-plugin-0.3.0.tar.gz
+8739e1b25432b2866efa078551c444fc  xfce4-minicmd-plugin-0.4.tar.bz2


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/xfce4-minicmd-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-minicmd-plugin.spec	8 Sep 2006 18:55:36 -0000	1.4
+++ xfce4-minicmd-plugin.spec	5 Oct 2006 12:23:23 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-minicmd-plugin
-Version:	0.3.0
-Release:	7%{?dist}
+Version:	0.4
+Release:	3%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -37,8 +38,19 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/xfce4/panel-plugins/*.so
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4-1
+- Update to 0.4 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-7
 - Mass rebuild for Fedora Core 6.
 
@@ -50,7 +62,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:29:38 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:29:38 -0700
Subject: rpms/xfce4-mount-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-mount-plugin.spec, 1.7, 1.8
Message-ID: <200610051229.k95CTe3l000719@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv698

Modified Files:
	.cvsignore sources xfce4-mount-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jan 2006 22:24:09 -0000	1.3
+++ .cvsignore	5 Oct 2006 12:29:38 -0000	1.4
@@ -1 +1 @@
-xfce4-mount-plugin-0.3.3.tar.bz2
+xfce4-mount-plugin-0.4.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jan 2006 22:24:09 -0000	1.3
+++ sources	5 Oct 2006 12:29:38 -0000	1.4
@@ -1 +1 @@
-94e0f1e0b5501d5a5ba7d137ca7e5be9  xfce4-mount-plugin-0.3.3.tar.bz2
+1333adf1c76d8f8b4c6f58bbcf43b6c6  xfce4-mount-plugin-0.4.8.tar.bz2


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-mount-plugin.spec	8 Sep 2006 18:59:41 -0000	1.7
+++ xfce4-mount-plugin.spec	5 Oct 2006 12:29:38 -0000	1.8
@@ -1,17 +1,17 @@
 Name:		xfce4-mount-plugin
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.8
+Release:	1%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext, intltool
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -26,18 +26,43 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce-mount.png
+%{_datadir}/icons/hicolor/scalable/apps/xfce-mount.svg
+
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.8-1
+- Update to 0.4.8.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
 - Mass rebuild for Fedora Core 6.
 
@@ -55,7 +80,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-2
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:36:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:36:53 -0700
Subject: rpms/xfce4-netload-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-netload-plugin.spec, 1.5,
	1.6 xfce4-netload-plugin-bufsize.patch, 1.2, NONE
Message-ID: <200610051236.k95Catwp000852@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831

Modified Files:
	.cvsignore sources xfce4-netload-plugin.spec 
Removed Files:
	xfce4-netload-plugin-bufsize.patch 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jan 2006 23:40:16 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:36:53 -0000	1.3
@@ -1 +1 @@
-xfce4-netload-plugin-0.3.3.tar.bz2
+xfce4-netload-plugin-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jan 2006 23:40:16 -0000	1.2
+++ sources	5 Oct 2006 12:36:53 -0000	1.3
@@ -1 +1 @@
-7a0483c77240200f1a918a1a3c5e0b33  xfce4-netload-plugin-0.3.3.tar.bz2
+a15ee479089ba7703c5dde33ff439573  xfce4-netload-plugin-0.4.0.tar.bz2


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-netload-plugin.spec	8 Sep 2006 20:11:45 -0000	1.5
+++ xfce4-netload-plugin.spec	5 Oct 2006 12:36:53 -0000	1.6
@@ -1,25 +1,23 @@
 Name:		xfce4-netload-plugin
-Version:	0.3.3
-Release:	7%{?dist}
+Version:	0.4.0
+Release:	3%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-Patch0:		xfce4-netload-plugin-bufsize.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A network-load monitor plugin for the Xfce panel.
 
 %prep
 %setup -q
-%patch0 -p0 -b .orig
 
 %build
 %configure --disable-static
@@ -28,18 +26,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang xfce4-netload
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f xfce4-netload.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-2
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Mass rebuild for Fedora Core 6.
 
@@ -55,7 +63,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-3
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
 - Initial Fedora Extras version.


--- xfce4-netload-plugin-bufsize.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 12:43:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:43:10 -0700
Subject: rpms/xfce4-notes-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-notes-plugin.spec, 1.4, 1.5
Message-ID: <200610051243.k95ChCER000908@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv887

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2005 03:46:11 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:43:10 -0000	1.3
@@ -1 +1 @@
-xfce4-notes-plugin-0.11.1.tar.gz
+xfce4-notes-plugin-1.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2005 03:46:11 -0000	1.2
+++ sources	5 Oct 2006 12:43:10 -0000	1.3
@@ -1 +1 @@
-bc663b4be052ba184898b553141f08e3  xfce4-notes-plugin-0.11.1.tar.gz
+e77f1150459d8ab6a1ae0d86af09f44c  xfce4-notes-plugin-1.3.99.1.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-notes-plugin.spec	8 Sep 2006 19:02:18 -0000	1.4
+++ xfce4-notes-plugin.spec	5 Oct 2006 12:43:10 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-notes-plugin
-Version:	0.11.1
-Release:	5%{?dist}
+Version:	1.3.99.1
+Release:	3%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.90.1, libxfcegui4-devel >= 4.3.90.1, libxml2-devel
+BuildRequires:	libXt-devel, gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -28,18 +29,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/*
+%doc AUTHORS COPYING ChangeLog README TODO
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_bindir}/xfce4-popup-notes
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.99.1-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.99.1-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Thu Sep 07 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.99.1-1
+- Update to 1.3.99.1.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.90.2-1
+- Update to 1.3.90.2 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.11.1-5
 - Mass rebuild for Fedora Core 6.
 
@@ -51,7 +66,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-2
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:48:13 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:48:13 -0700
Subject: rpms/xfce4-quicklauncher-plugin/devel .cvsignore, 1.2, 1.3 sources, 
	1.2, 1.3 xfce4-quicklauncher-plugin.spec, 1.4, 1.5
Message-ID: <200610051248.k95CmF2X000955@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv934

Modified Files:
	.cvsignore sources xfce4-quicklauncher-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jan 2006 17:57:59 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:48:12 -0000	1.3
@@ -1 +1 @@
-xfce4-quicklauncher-plugin-0.81.tar.gz
+xfce4-quicklauncher-plugin-1.9.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jan 2006 17:57:59 -0000	1.2
+++ sources	5 Oct 2006 12:48:12 -0000	1.3
@@ -1 +1 @@
-98231ea7afe226ca7cbdc5c51ea3d16e  xfce4-quicklauncher-plugin-0.81.tar.gz
+64353ee9f32f891f198297937454307b  xfce4-quicklauncher-plugin-1.9.2.tar.bz2


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-quicklauncher-plugin.spec	8 Sep 2006 19:04:03 -0000	1.4
+++ xfce4-quicklauncher-plugin.spec	5 Oct 2006 12:48:12 -0000	1.5
@@ -1,17 +1,17 @@
 Name:		xfce4-quicklauncher-plugin
-Version:	0.81
-Release:	5%{?dist}
+Version:	1.9.2
+Release:	1%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -19,8 +19,6 @@
 
 %prep
 %setup -q
-# fix permission of AUTHORS and COPYING
-%__chmod 0664 {AUTHORS,COPYING}
 
 %build
 %configure --disable-static
@@ -39,8 +37,19 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog TODO
 %{_libdir}/xfce4/panel-plugins/*.so
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-1
+- Update to 1.9.2.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 1.9.1 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.81-5
 - Mass rebuild for Fedora Core 6.
 
@@ -52,7 +61,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-2
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Fri Nov 18 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-1
 - Initial Fedora Extras release.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:53:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:53:53 -0700
Subject: rpms/xfce4-screenshooter-plugin/devel .cvsignore, 1.2, 1.3 sources, 
	1.2, 1.3 xfce4-screenshooter-plugin.spec, 1.4, 1.5
Message-ID: <200610051253.k95Crtv2001006@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv985

Modified Files:
	.cvsignore sources xfce4-screenshooter-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jan 2006 23:57:30 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:53:52 -0000	1.3
@@ -1 +1 @@
-xfce4-screenshooter-plugin-0.0.8.tar.gz
+xfce4-screenshooter-plugin-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jan 2006 23:57:30 -0000	1.2
+++ sources	5 Oct 2006 12:53:52 -0000	1.3
@@ -1 +1 @@
-b9195d25ae587ae3f48cd2b215cd45d3  xfce4-screenshooter-plugin-0.0.8.tar.gz
+d12746c635eb28207161a3da1585aa75  xfce4-screenshooter-plugin-1.0.0.tar.bz2


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-screenshooter-plugin.spec	8 Sep 2006 19:05:52 -0000	1.4
+++ xfce4-screenshooter-plugin.spec	5 Oct 2006 12:53:52 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-screenshooter-plugin
-Version:	0.0.8
-Release:	4%{?dist}
+Version:	1.0.0
+Release:	3%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -25,17 +26,27 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/xfce4/panel-plugins/*.so
+%doc AUTHORS COPYING ChangeLog README
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.0-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.0-1
+- Update to 1.0.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.0.8-4
 - Mass rebuild for Fedora Core 6.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 12:58:03 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 05:58:03 -0700
Subject: rpms/xfce4-sensors-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-sensors-plugin.spec, 1.5, 1.6
Message-ID: <200610051258.k95Cw6os001049@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1028

Modified Files:
	.cvsignore sources xfce4-sensors-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2006 20:48:34 -0000	1.2
+++ .cvsignore	5 Oct 2006 12:58:03 -0000	1.3
@@ -1 +1 @@
-xfce4-sensors-plugin-0.7.0.tar.bz2
+xfce4-sensors-plugin-0.10.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2006 20:48:34 -0000	1.2
+++ sources	5 Oct 2006 12:58:03 -0000	1.3
@@ -1 +1 @@
-10399ab7351c60e9e46e4d4375250157  xfce4-sensors-plugin-0.7.0.tar.bz2
+fa431e2b6bb0dd151047e05f7383a844  xfce4-sensors-plugin-0.10.0.tar.bz2


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/xfce4-sensors-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-sensors-plugin.spec	8 Sep 2006 19:08:19 -0000	1.5
+++ xfce4-sensors-plugin.spec	5 Oct 2006 12:58:03 -0000	1.6
@@ -1,17 +1,17 @@
 Name: 		xfce4-sensors-plugin
-Version: 	0.7.0
-Release: 	6%{?dist}
+Version: 	0.10.0
+Release: 	1%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
 License:	GPL
-URL: 		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser), lm_sensors-devel >= 2.8
+Requires:	xfce4-panel >= 4.3.99.1, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -27,18 +27,41 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce-sensors.png
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.10.0-1
+- Update to 0.10.0.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.9.0-2
+- Rebuild for XFCE 4.3.99.1.
+- BR perl(XML::Parser).
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.9.0-1
+- Update to 0.9.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.7.0-6
 - Mass rebuild for Fedora Core 6.
 
@@ -53,7 +76,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 12:59:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 05:59:45 -0700
Subject: rpms/spandsp - New directory
Message-ID: <200610051259.k95Cxln4001129@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1103/spandsp

Log Message:
Directory /cvs/extras/rpms/spandsp added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 12:59:46 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 05:59:46 -0700
Subject: rpms/spandsp/devel - New directory
Message-ID: <200610051259.k95CxmeK001132@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1103/spandsp/devel

Log Message:
Directory /cvs/extras/rpms/spandsp/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 13:00:04 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:00:04 -0700
Subject: rpms/spandsp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610051300.k95D06iI001189@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148

Added Files:
	Makefile import.log 
Log Message:
Setup of module spandsp


--- NEW FILE Makefile ---
# Top level Makefile for module spandsp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 13:00:04 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:00:04 -0700
Subject: rpms/spandsp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610051300.k95D06fY001192@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module spandsp


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 13:00:41 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:00:41 -0700
Subject: rpms/spandsp import.log,1.1,1.2
Message-ID: <200610051300.k95D0h4K001257@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1224

Modified Files:
	import.log 
Log Message:
auto-import spandsp-0.0.2-1.pre26 on branch devel from spandsp-0.0.2-1.pre26.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/spandsp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 13:00:04 -0000	1.1
+++ import.log	5 Oct 2006 13:00:41 -0000	1.2
@@ -0,0 +1 @@
+spandsp-0_0_2-1_pre26:HEAD:spandsp-0.0.2-1.pre26.src.rpm:1160053232



From fedora-extras-commits at redhat.com  Thu Oct  5 13:00:42 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:00:42 -0700
Subject: rpms/spandsp/devel spandsp.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610051300.k95D0ihk001262@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1224/devel

Modified Files:
	.cvsignore sources 
Added Files:
	spandsp.spec 
Log Message:
auto-import spandsp-0.0.2-1.pre26 on branch devel from spandsp-0.0.2-1.pre26.src.rpm


--- NEW FILE spandsp.spec ---
%define pre 26

Summary: A DSP library for telephony
Name: spandsp
Version: 0.0.2
Release: 1%{?pre:.pre%{pre}}
License: GPL
Group: System Environment/Libraries
URL: http://www.soft-switch.org/
Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}/spandsp-%{version}%{?pre:pre%{pre}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: audiofile-devel
BuildRequires: doxygen

%description
SpanDSP is a library of DSP functions for telephony, in the 8000
sample per second world of E1s, T1s, and higher order PCM channels. It
contains low level functions, such as basic filters. It also contains
higher level functions, such as cadenced supervisory tone detection,
and a complete software FAX machine. The software has been designed to
avoid intellectual property issues, using mature techniques where all
relevant patents have expired. See the file DueDiligence for important
information about these intellectual property issues.

%package devel
Summary: SpanDSP development files
Group: Development/Libraries
Requires: spandsp = %{version}-%{release}
Requires: libtiff-devel

%description devel
SpanDSP development files.

%prep
%setup -q

%{__sed} -i 's/\r//' ChangeLog
%{__sed} -i 's/\r//' AUTHORS
%{__sed} -i 's/\r//' DueDiligence

%build
%configure --enable-doc --disable-static --disable-rpath
make

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm %{buildroot}%{_libdir}/libspandsp.la

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc DueDiligence ChangeLog AUTHORS COPYING NEWS README 

%{_libdir}/libspandsp.so.*

%{_datadir}/spandsp

%files devel
%defattr(-,root,root,-)
%doc doc/api
%{_includedir}/spandsp.h
%{_includedir}/spandsp
%{_libdir}/libspandsp.so

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> - 0.0.2-1.pre26
- Update to 0.0.2pre26

* Mon Mar  6 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.2-1.pre25
- "Downgrade" to 0.0.2pre25 - 0.0.3 does not work with Asterisk.
- Don't use dos2unix, use sed.

* Mon Nov 14 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 0.0.3-0.3.pre6
- Update to 0.0.3pre6

* Mon Oct 24 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 0.0.3-0.2.pre4
- Changed Source0 to Source
- Changed setup0 to setup
- Added COPYING to doc in main package.
- Removed html API docs from main package.

* Tue Oct 18 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 0.0.3-0.1.pre4
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 13:00:04 -0000	1.1
+++ .cvsignore	5 Oct 2006 13:00:42 -0000	1.2
@@ -0,0 +1 @@
+spandsp-0.0.2pre26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 13:00:04 -0000	1.1
+++ sources	5 Oct 2006 13:00:42 -0000	1.2
@@ -0,0 +1 @@
+2b28a75b1d7c49616534bd7264317241  spandsp-0.0.2pre26.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 13:05:22 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:05:22 -0700
Subject: rpms/xfce4-systemload-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-systemload-plugin.spec, 1.4, 1.5
Message-ID: <200610051305.k95D5PnN004263@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4242

Modified Files:
	.cvsignore sources xfce4-systemload-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2005 22:34:40 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:05:22 -0000	1.3
@@ -1 +1 @@
-xfce4-systemload-plugin-0.3.6.tar.gz
+xfce4-systemload-plugin-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2005 22:34:40 -0000	1.2
+++ sources	5 Oct 2006 13:05:22 -0000	1.3
@@ -1 +1 @@
-fd73efa3bd7a73e3f5fdf8d4ed848c1f  xfce4-systemload-plugin-0.3.6.tar.gz
+70d4b15f0745adc34703272449fcef93  xfce4-systemload-plugin-0.4.0.tar.bz2


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/xfce4-systemload-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-systemload-plugin.spec	8 Sep 2006 19:11:39 -0000	1.4
+++ xfce4-systemload-plugin.spec	5 Oct 2006 13:05:22 -0000	1.5
@@ -1,17 +1,17 @@
 Name:		xfce4-systemload-plugin
-Version:	0.3.6
-Release:	7%{?dist}
+Version:	0.4.0
+Release:	3%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -27,18 +27,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang xfce4-systemload
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f xfce4-systemload.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
 - Mass rebuild for Fedora Core 6.
 
@@ -50,7 +60,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:08:22 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:08:22 -0700
Subject: rpms/xfce4-taskmanager/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-taskmanager.spec, 1.5, 1.6
Message-ID: <200610051308.k95D8OAk004346@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4325

Modified Files:
	.cvsignore sources xfce4-taskmanager.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2006 20:17:12 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:08:22 -0000	1.3
@@ -1 +1 @@
-xfce4-taskmanager-0.3.1.tar.gz
+xfce4-taskmanager-0.4.0-rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2006 20:17:12 -0000	1.2
+++ sources	5 Oct 2006 13:08:22 -0000	1.3
@@ -1 +1 @@
-f8b0370c6aa6046720b039fad932084d  xfce4-taskmanager-0.3.1.tar.gz
+6111d36a743ecef817b5589f90a3f869  xfce4-taskmanager-0.4.0-rc2.tar.bz2


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/xfce4-taskmanager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-taskmanager.spec	8 Sep 2006 19:29:10 -0000	1.5
+++ xfce4-taskmanager.spec	5 Oct 2006 13:08:22 -0000	1.6
@@ -1,24 +1,26 @@
 Name:		xfce4-taskmanager
-Version:	0.3.1
-Release:	5%{?dist}
+Version:	0.4.0
+Release:	0.1.rc2%{?dist}
 Summary:	Taskmanager for the Xfce desktop environment
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
+URL:		http://xfce4-taskmanager.nebulon.de
+Source0:	http://xfce4-taskmanager.nebulon.de/xfce4-taskmanager-0.4.0-rc2.tar.bz2
 Source1:	xfce4-taskmanager.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils, intltool
+BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils, perl(XML::Parser)
 
 %description
 A simple taskmanager for the Xfce desktop environment.
 
 %prep
-%setup -q
-# fix permissions of a file in the debug package
-%__chmod 0644 src/functions.c
+%setup -qn %{name}-%{version}-rc2
+# fix some permissons...
+chmod 0644 src/*.c
+chmod 0644 src/*.h
+chmod 0644 AUTHORS ChangeLog COPYING README TODO
 
 %build
 %configure
@@ -29,9 +31,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
-        --add-category X-Fedora					\
+desktop-file-install --vendor fedora				\
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
+	--add-category X-Fedora					\
 	--add-category Application				\
 	--add-category System					\
 	%{SOURCE1}
@@ -41,14 +43,21 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-0.1.rc2
+- Update to 0.4-rc2.
+- Add BR on perl(XML::Parser), drop intltool.
+
+* Mon Oct 02 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-6
+- Rebuild for XFCE 4.4.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-5
 - Mass rebuild for Fedora Core 6.
-- Fix defattr.
+- Fix %%defattr.
 
 * Sat Jun 03 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-4
 - Add intltool BR (#193444).
@@ -59,7 +68,7 @@
 * Thu Dec 15 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2
 - Initial Fedora Extras version.
 - Add xfce4-taskmanager.desktop.
-- Remove useless NEWS from %DOC.
+- Remove useless NEWS from %%doc.
 - Clean up specfile.
 
 * Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc4.cw



From fedora-extras-commits at redhat.com  Thu Oct  5 13:10:32 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:10:32 -0700
Subject: rpms/xfce4-taskmanager/devel xfce4-taskmanager.spec,1.6,1.7
Message-ID: <200610051310.k95DAYuq004388@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4371

Modified Files:
	xfce4-taskmanager.spec 
Log Message:
Bump release for devel checkin


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/xfce4-taskmanager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-taskmanager.spec	5 Oct 2006 13:08:22 -0000	1.6
+++ xfce4-taskmanager.spec	5 Oct 2006 13:10:32 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-taskmanager
 Version:	0.4.0
-Release:	0.1.rc2%{?dist}
+Release:	0.2.rc2%{?dist}
 Summary:	Taskmanager for the Xfce desktop environment
 
 Group:		User Interface/Desktops
@@ -48,6 +48,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-0.2.rc2
+- Bump release for devel checkin.
+
 * Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-0.1.rc2
 - Update to 0.4-rc2.
 - Add BR on perl(XML::Parser), drop intltool.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:13:00 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:13:00 -0700
Subject: rpms/xfce4-wavelan-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-wavelan-plugin.spec, 1.4, 1.5
Message-ID: <200610051313.k95DD2bZ004429@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4408

Modified Files:
	.cvsignore sources xfce4-wavelan-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2005 04:40:53 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:13:00 -0000	1.3
@@ -1 +1 @@
-xfce4-wavelan-plugin-0.4.1.tar.bz2
+xfce4-wavelan-plugin-0.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2005 04:40:53 -0000	1.2
+++ sources	5 Oct 2006 13:13:00 -0000	1.3
@@ -1 +1 @@
-5ca7df0f3bfe3ee67e2a1fd6c7b60eb0  xfce4-wavelan-plugin-0.4.1.tar.bz2
+7fb068184b08d6b5bd7bc6d7e4369971  xfce4-wavelan-plugin-0.5.3.tar.bz2


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/xfce4-wavelan-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-wavelan-plugin.spec	8 Sep 2006 20:15:54 -0000	1.4
+++ xfce4-wavelan-plugin.spec	5 Oct 2006 13:13:00 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		xfce4-wavelan-plugin
-Version:	0.4.1
-Release:	7%{?dist}
+Version:	0.5.3
+Release:	3%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -26,17 +27,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.3-3
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 0.5.3.1 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-7
 - Mass rebuild for Fedora Core 6.
 
@@ -48,7 +60,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:17:52 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu,  5 Oct 2006 06:17:52 -0700
Subject: rpms/libcdio/devel libcdio.spec,1.19,1.20
Message-ID: <200610051317.k95DHs11004488@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libcdio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4469

Modified Files:
	libcdio.spec 
Log Message:
* Thu Oct 05 2006 Adrian Reber <adrian at lisas.de> - 0.77-3
- disabled iso9660 test case (fails for some reason with date problems)
  this seems to be a known problem according to the ChangeLog



Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libcdio.spec	4 Oct 2006 22:23:12 -0000	1.19
+++ libcdio.spec	5 Oct 2006 13:17:52 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           libcdio
 Version:        0.77
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
@@ -66,7 +66,8 @@
 
 %check || :
 # disable test using local CDROM
-%{__sed} -i -e  "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" test/Makefile
+%{__sed} -i -e  "s/am__EXEEXT_1 =.*$/am__EXEEXT_1 =/g" \
+            -e  "s,testiso9660\$(EXEEXT) \\\,\\\,g" test/Makefile
 make check
 
 
@@ -108,6 +109,10 @@
 
 
 %changelog
+* Thu Oct 05 2006 Adrian Reber <adrian at lisas.de> - 0.77-3
+- disabled iso9660 test case (fails for some reason with date problems)
+  this seems to be a known problem according to the ChangeLog
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.77-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Oct  5 13:21:40 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:21:40 -0700
Subject: rpms/xfce4-weather-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 xfce4-weather-plugin.spec, 1.7, 1.8
Message-ID: <200610051321.k95DLgo5004568@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4547

Modified Files:
	.cvsignore sources xfce4-weather-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:42:43 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:21:40 -0000	1.3
@@ -1 +1 @@
-xfce4-weather-plugin-0.4.9.tar.gz
+xfce4-weather-plugin-0.5.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Dec 2005 22:42:43 -0000	1.2
+++ sources	5 Oct 2006 13:21:40 -0000	1.3
@@ -1 +1 @@
-1d5ba253c8eae5a9ad5e3d7002a0dae0  xfce4-weather-plugin-0.4.9.tar.gz
+dfc5b89a173b7da6fabe56bf73d41321  xfce4-weather-plugin-0.5.99.1.tar.bz2


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/xfce4-weather-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-weather-plugin.spec	4 Oct 2006 22:39:53 -0000	1.7
+++ xfce4-weather-plugin.spec	5 Oct 2006 13:21:40 -0000	1.8
@@ -1,17 +1,17 @@
 Name:		xfce4-weather-plugin
-Version:	0.4.9
-Release:	8%{?dist}
+Version:	0.5.99.1
+Release:	3%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+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.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -27,26 +27,49 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang xfce4-weather
+%find_lang %{name}
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f xfce4-weather.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/*
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-weather.png
+%{_datadir}/xfce4/weather
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.9-8
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
+- Update to 0.5.99.1.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Mass rebuild for Fedora Core 6.
 
-* Sat Jul 29 2006 Christoph Wickert <fedora at christoph-wickert de> - 0.4.9-6
+* Sat Jul 29 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.9-6
 - BuildRequire gettext (#193444)
 - Require xfce4-panel.
 
@@ -55,7 +78,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:24:47 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:24:47 -0700
Subject: rpms/xfce4-websearch-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-websearch-plugin.spec, 1.5, 1.6
Message-ID: <200610051324.k95DOnkO004612@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4591

Modified Files:
	.cvsignore sources xfce4-websearch-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2006 20:42:55 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:24:47 -0000	1.3
@@ -1 +1 @@
-xfce4-websearch-plugin-0.1.0.tar.gz
+xfce4-websearch-plugin-20060923svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2006 20:42:55 -0000	1.2
+++ sources	5 Oct 2006 13:24:47 -0000	1.3
@@ -1 +1 @@
-352ddd859ecd6649db34682a25012638  xfce4-websearch-plugin-0.1.0.tar.gz
+69931a7b4f4181bb80e2eca6c080649a  xfce4-websearch-plugin-20060923svn.tar.bz2


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/xfce4-websearch-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-websearch-plugin.spec	8 Sep 2006 19:18:19 -0000	1.5
+++ xfce4-websearch-plugin.spec	5 Oct 2006 13:24:47 -0000	1.6
@@ -1,25 +1,31 @@
-Name: 		xfce4-websearch-plugin
-Version: 	0.1.0
-Release: 	7%{?dist}
-Summary: 	Websearch plugin from the XFCE panel
+Name:		xfce4-websearch-plugin
+Version:	0.1.1
+Release:	0.2.20060923svn%{?dist}
+Summary:	Websearch plugin from the XFCE panel
 
-Group: 		User Interface/Desktops
+Group:		User Interface/Desktops
 License:	GPL
-URL: 		http://www.xfce.org/
-Source0: 	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:  gettext
-Requires:	xfce4-panel >= 4.2
+URL:		http://goodies.xfce.org/
+# Source0 was generated with the following commands:
+# svn co http://svn.xfce.org/svn/goodies/xfce4-websearch-plugin/trunk xfce4-websearch-plugin
+# tar -cjf xfce4-websearch-plugin-`date +%G%m%d`svn.tar.bz2 xfce4-websearch-plugin
+Source0:	%{name}-20060923svn.tar.bz2
+#Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	xfce4-panel-devel >= 4.3.0, libxfcegui4-devel >= 4.3.0, libxml2-devel
+BuildRequires:	gettext
+BuildRequires:	xfce4-dev-tools >= 4.3.90.2
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 Access searchengines from the XFCE panel.
 
 %prep
-%setup -q
+%setup -qn %{name}
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -36,8 +42,19 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_libdir}/xfce4/panel-plugins/*.so
+#%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- 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
+- Mass rebuild for Fedora Core 6.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-7
 - Mass rebuild for Fedora Core 6.
 
@@ -49,7 +66,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:26:40 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:26:40 -0700
Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xfce4-xkb-plugin.spec, 1.8, 1.9
Message-ID: <200610051326.k95DQhUg004667@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4646

Modified Files:
	.cvsignore sources xfce4-xkb-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2006 21:57:54 -0000	1.5
+++ .cvsignore	5 Oct 2006 13:26:40 -0000	1.6
@@ -1 +1 @@
-xfce4-xkb-plugin-0.3.5.tar.gz
+xfce4-xkb-plugin-20060923svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2006 21:57:54 -0000	1.5
+++ sources	5 Oct 2006 13:26:40 -0000	1.6
@@ -1 +1 @@
-0c92dd17579e102b40289c4bc83c5505  xfce4-xkb-plugin-0.3.5.tar.gz
+788a0a93b62fcdd33985a0a4fc5a1b64  xfce4-xkb-plugin-20060923svn.tar.bz2


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-xkb-plugin.spec	8 Sep 2006 19:21:34 -0000	1.8
+++ xfce4-xkb-plugin.spec	5 Oct 2006 13:26:40 -0000	1.9
@@ -1,20 +1,26 @@
 Name:		xfce4-xkb-plugin
-Version:	0.3.5
-Release:	3%{?dist}
+Version:	0.3.6
+Release:	0.2.20060923svn%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
+# Source0 was generated with the following commands:
+# svn co http://svn.xfce.org/svn/goodies/xfce4-websearch-plugin/trunk xfce4-websearch-plugin
+# tar -cjf xfce4-xkb-plugin-`date +%G%m%d`svn.tar.bz2 xfce4-xkb-plugin
+Source0:	%{name}-20060923svn.tar.bz2
+#Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:	gettext
+BuildRequires:	xfce4-dev-tools >= 4.3.90.2
 # for modular X
 %if "%{?fedora}" > "4"
-BuildRequires:  libXext-devel, libXpm-devel
+BuildRequires:	libXt-devel
 %endif
-Requires:	xfce4-panel >= 4.2
+Requires:	xfce4-panel >= 4.3.99.1
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -24,29 +30,37 @@
 XF86Config file or some other way (e.g. setxkbmap).
 
 %prep
-%setup -q
+%setup -qn %{name}
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
 %dir %{_datadir}/xfce4/xkb/
 %dir %{_datadir}/xfce4/xkb/flags
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.6-0.2.20060923svn
+- Bump release for devel checkin.
+
+* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.6-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.3.5-3
 - Mass rebuild for Fedora Core 6.
 
@@ -70,7 +84,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:28:11 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:28:11 -0700
Subject: rpms/xfce4-xmms-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-xmms-plugin.spec, 1.4, 1.5
Message-ID: <200610051328.k95DSDtu004720@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4697

Modified Files:
	.cvsignore sources xfce4-xmms-plugin.spec 
Log Message:
Update for XFCE 4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:48:01 -0000	1.2
+++ .cvsignore	5 Oct 2006 13:28:11 -0000	1.3
@@ -1 +1 @@
-xfce4-xmms-plugin-0.3.1.tar.bz2
+xfce4-xmms-plugin-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Dec 2005 22:48:01 -0000	1.2
+++ sources	5 Oct 2006 13:28:11 -0000	1.3
@@ -1 +1 @@
-0dac8795b192383c13b1d5cd072b754a  xfce4-xmms-plugin-0.3.1.tar.bz2
+d621fa744d534c17590848dc34884824  xfce4-xmms-plugin-0.4.2.tar.bz2


Index: xfce4-xmms-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/xfce4-xmms-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-xmms-plugin.spec	8 Sep 2006 19:25:03 -0000	1.4
+++ xfce4-xmms-plugin.spec	5 Oct 2006 13:28:11 -0000	1.5
@@ -1,17 +1,17 @@
 Name:		xfce4-xmms-plugin
-Version:	0.3.1
-Release:	7%{?dist}
+Version:	0.4.2
+Release:	2%{?dist}
 Summary:	XMMS plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
-URL:		http://xfce-goodies.berlios.de/
-Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext, xmms-devel >= 1.2
-Requires:	xfce4-panel >= 4.2, xmms >= 1.2
+URL:		http://goodies.xfce.org/
+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.20, libxfcegui4-devel >= 4.2.0, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser), xmms-devel >= 1.2
+Requires:	xfce4-panel >= 4.3.99.1, xmms >= 1.2
 
 %description
 Control XMMS from the Xfce panel.
@@ -26,7 +26,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
 %clean
@@ -35,10 +34,24 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/*
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/xfce4/xfce4-xmms-plugin
 
 %changelog
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-2
+- Bump release for devel checkin.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-1
+- Update to 0.4.2.
+
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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
+- Update to 0.4.0 on XFCE 4.3.90.2.
+
 * Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-7
 - Mass rebuild for Fedora Core 6.
 
@@ -50,7 +63,7 @@
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-4
 - Add libxfcegui4-devel BuildReqs.
-- Fix %defattr.
+- Fix %%defattr.
 
 * Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Thu Oct  5 13:29:55 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:29:55 -0700
Subject: rpms/xfce4-dev-tools - New directory
Message-ID: <200610051329.k95DTvBx004799@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4771/xfce4-dev-tools

Log Message:
Directory /cvs/extras/rpms/xfce4-dev-tools added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 13:29:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:29:56 -0700
Subject: rpms/xfce4-dev-tools/devel - New directory
Message-ID: <200610051330.k95DTwkh004802@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4771/xfce4-dev-tools/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-dev-tools/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 13:30:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:30:20 -0700
Subject: rpms/xfce4-dev-tools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610051330.k95DUM3t004869@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4834

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-dev-tools


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-dev-tools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 13:30:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:30:20 -0700
Subject: rpms/xfce4-dev-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610051330.k95DUMLk004872@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4834/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-dev-tools


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 13:31:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:31:04 -0700
Subject: rpms/xfce4-dev-tools import.log,1.1,1.2
Message-ID: <200610051331.k95DV69O004938@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4903

Modified Files:
	import.log 
Log Message:
auto-import xfce4-dev-tools-4.3.99.1-3.fc5 on branch devel from xfce4-dev-tools-4.3.99.1-3.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 13:30:19 -0000	1.1
+++ import.log	5 Oct 2006 13:31:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-dev-tools-4_3_99_1-3_fc5:HEAD:xfce4-dev-tools-4.3.99.1-3.fc5.src.rpm:1160055055



From fedora-extras-commits at redhat.com  Thu Oct  5 13:31:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:31:04 -0700
Subject: rpms/xfce4-dev-tools/devel xfce4-dev-tools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610051331.k95DV7RH004943@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4903/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-dev-tools.spec 
Log Message:
auto-import xfce4-dev-tools-4.3.99.1-3.fc5 on branch devel from xfce4-dev-tools-4.3.99.1-3.fc5.src.rpm


--- NEW FILE xfce4-dev-tools.spec ---
Name:		xfce4-dev-tools
Version:	4.3.99.1
Release:	3%{?dist}
Summary:	Xfce developer tools

Group:		Development/Tools
License:	GPL
URL:		http://xfce.org/~benny/projects/xfce4-dev-tools/
Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	glib2-devel, gettext-devel, gtk-doc, libtool, intltool, make
BuildArch:	noarch

%description
This package contains common tools required by Xfce developers and people
that want to build Xfce from SVN. In addition, this package contains the
Xfce developer's handbook.

%prep
%setup -q

%build
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}

mkdir $RPM_BUILD_ROOT%{_datadir}/aclocal/
install -m 644 m4macros/xdt*.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/ 

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog HACKING NEWS README
%{_bindir}/xdt-autogen
%dir %{_datadir}/xfce4
%{_datadir}/xfce4/dev-tools
%{_datadir}/aclocal/*

%changelog
* Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-3
- Require gettext-devel.
- Install m4 macros also to /usr/share/aclocal.

* Tue Oct 03 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-2
- Some more requires: glib2-devel, make and gtk-doc.
- Own %%{_datadir}/xfce4

* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-1
- Initial Fedora Extras release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 13:30:20 -0000	1.1
+++ .cvsignore	5 Oct 2006 13:31:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-dev-tools-4.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 13:30:20 -0000	1.1
+++ sources	5 Oct 2006 13:31:04 -0000	1.2
@@ -0,0 +1 @@
+dc6403caf82edfb896eb3878385b439a  xfce4-dev-tools-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct  5 13:50:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 06:50:29 -0700
Subject: owners owners.list,1.1777,1.1778
Message-ID: <200610051350.k95DoVn9005049@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5027

Modified Files:
	owners.list 
Log Message:
Adding spandsp.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1777
retrieving revision 1.1778
diff -u -r1.1777 -r1.1778
--- owners.list	5 Oct 2006 10:14:44 -0000	1.1777
+++ owners.list	5 Oct 2006 13:50:29 -0000	1.1778
@@ -2047,6 +2047,7 @@
 Fedora Extras|soundtracker|Sound module composer/player|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|source-highlight|Produces a document with syntax highlighting|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
+Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ghenry at suretecsystems.com



From fedora-extras-commits at redhat.com  Thu Oct  5 13:52:00 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 06:52:00 -0700
Subject: rpms/xfce4-dev-tools/devel xfce4-dev-tools.spec,1.1,1.2
Message-ID: <200610051352.k95Dq21I005088@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5069

Modified Files:
	xfce4-dev-tools.spec 
Log Message:
Some minor changes suggested in #209025


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-dev-tools.spec	5 Oct 2006 13:31:04 -0000	1.1
+++ xfce4-dev-tools.spec	5 Oct 2006 13:51:59 -0000	1.2
@@ -14,8 +14,7 @@
 
 %description
 This package contains common tools required by Xfce developers and people
-that want to build Xfce from SVN. In addition, this package contains the
-Xfce developer's handbook.
+that want to build Xfce from SVN.
 
 %prep
 %setup -q
@@ -29,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 
 mkdir $RPM_BUILD_ROOT%{_datadir}/aclocal/
-install -m 644 m4macros/xdt*.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/ 
+install -p -m 644 m4macros/xdt*.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/ 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,7 +38,7 @@
 %doc AUTHORS COPYING ChangeLog HACKING NEWS README
 %{_bindir}/xdt-autogen
 %dir %{_datadir}/xfce4
-%{_datadir}/xfce4/dev-tools
+%{_datadir}/xfce4/dev-tools/
 %{_datadir}/aclocal/*
 
 %changelog



From fedora-extras-commits at redhat.com  Thu Oct  5 14:36:13 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu,  5 Oct 2006 07:36:13 -0700
Subject: fedora-security/audit fc5,1.345,1.346 fc6,1.100,1.101
Message-ID: <200610051436.k95EaDrt008933@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8913

Modified Files:
	fc5 fc6 
Log Message:
Note a new mono issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- fc5	4 Oct 2006 20:30:32 -0000	1.345
+++ fc5	5 Oct 2006 14:36:11 -0000	1.346
@@ -7,6 +7,7 @@
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel
+CVE-2006-5072 VULNERABLE (mono) #209464
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) #208458
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fc6	4 Oct 2006 20:30:32 -0000	1.100
+++ fc6	5 Oct 2006 14:36:11 -0000	1.101
@@ -8,6 +8,7 @@
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel
+CVE-2006-5072 VULNERABLE (mono) bz#209467
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18) [in rawhide]



From fedora-extras-commits at redhat.com  Thu Oct  5 15:07:42 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu,  5 Oct 2006 08:07:42 -0700
Subject: fedora-release eula.txt, 1.2, 1.3 fedora-core.repo, 1.6,
	1.7 fedora-development.repo, 1.9,
	1.10 fedora-extras-development.repo, 1.7,
	1.8 fedora-extras.repo, 1.8, 1.9 fedora-release.spec, 1.30, 1.31
Message-ID: <200610051507.k95F7ghh012006@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11978

Modified Files:
	eula.txt fedora-core.repo fedora-development.repo 
	fedora-extras-development.repo fedora-extras.repo 
	fedora-release.spec 
Log Message:
Update for FC6 release



Index: eula.txt
===================================================================
RCS file: /cvs/fedora/fedora-release/eula.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eula.txt	8 Mar 2006 21:29:45 -0000	1.2
+++ eula.txt	5 Oct 2006 15:07:40 -0000	1.3
@@ -1,5 +1,5 @@
 			LICENSE AGREEMENT 
-			FEDORA(TM) CORE 5
+			FEDORA(TM) CORE 6
 
 This agreement governs the download, installation or use of the
 Software (as defined below) and any updates to the Software,


Index: fedora-core.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-core.repo	23 Jul 2006 19:12:05 -0000	1.6
+++ fedora-core.repo	5 Oct 2006 15:07:40 -0000	1.7
@@ -2,7 +2,7 @@
 name=Fedora Core $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-$releasever&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
 


Index: fedora-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-development.repo	23 Jul 2006 19:12:05 -0000	1.9
+++ fedora-development.repo	5 Oct 2006 15:07:40 -0000	1.10
@@ -27,7 +27,7 @@
 name=Fedora Core - Development
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-enabled=1
+enabled=0
 gpgcheck=0
 
 [development-debuginfo]


Index: fedora-extras-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-extras-development.repo	23 Jul 2006 19:12:05 -0000	1.7
+++ fedora-extras-development.repo	5 Oct 2006 15:07:40 -0000	1.8
@@ -13,7 +13,7 @@
 name=Fedora Extras - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=$basearch
-enabled=1
+enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
 


Index: fedora-extras.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-extras.repo	23 Jul 2006 19:12:05 -0000	1.8
+++ fedora-extras.repo	5 Oct 2006 15:07:40 -0000	1.9
@@ -2,7 +2,7 @@
 name=Fedora Extras $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-$releasever&arch=$basearch
-enabled=0
+enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
 


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fedora-release.spec	5 Sep 2006 16:22:48 -0000	1.30
+++ fedora-release.spec	5 Oct 2006 15:07:40 -0000	1.31
@@ -1,9 +1,9 @@
-%define release_name FC6 Test3
-%define release_version 5.92
+%define release_name Zod
+%define release_version 6
 
 Summary:	Fedora Core release files
 Name:		fedora-release
-Version:	5.92
+Version:	6
 Release:	1
 License:	GFDL
 Group:		System Environment/Base
@@ -64,6 +64,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Oct  5 2006 Jesse Keating <jkeating at redhat.com> - 6-1
+- Rebuild for Fedora Core 6 release
+
 * Tue Sep  5 2006 Jesse Keating <jkeating at redhat.com> - 5.92-1
 - Bump for FC6 Test3
 



From fedora-extras-commits at redhat.com  Thu Oct  5 16:12:08 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu,  5 Oct 2006 09:12:08 -0700
Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.17,1.18
Message-ID: <200610051612.k95GCAUE015181@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15164

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
Fix for 209369, leave .so link alone


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NetworkManager-vpnc.spec	2 Oct 2006 23:13:54 -0000	1.17
+++ NetworkManager-vpnc.spec	5 Oct 2006 16:12:07 -0000	1.18
@@ -13,7 +13,7 @@
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
 Version:   0.7.0
-Release:   0%{?nm_vpnc_cvs_version}.1%{?dist}
+Release:   0%{?nm_vpnc_cvs_version}.2%{?dist}
 License:   GPL
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -58,7 +58,6 @@
 
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
-rm -f %{buildroot}%{_libdir}/lib*.so
 
 %find_lang %{name}
 
@@ -98,6 +97,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.2
+- Leave .so link alone, needed by nm
+
 * Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.1
 - Update to CVS snapshot 060929
 - Some rpmlint cleanups



From fedora-extras-commits at redhat.com  Thu Oct  5 17:03:38 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu,  5 Oct 2006 10:03:38 -0700
Subject: fedora-release fedora-legacy.repo, 1.2, 1.3 fedora-release.spec,
	1.31, 1.32 fedora-updates-testing.repo, 1.6,
	1.7 fedora-updates.repo, 1.10, 1.11
Message-ID: <200610051703.k95H3cdc018397@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18373

Modified Files:
	fedora-legacy.repo fedora-release.spec 
	fedora-updates-testing.repo fedora-updates.repo 
Log Message:
use new mirrorlist cgi


Index: fedora-legacy.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-legacy.repo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-legacy.repo	20 Mar 2006 17:33:14 -0000	1.2
+++ fedora-legacy.repo	5 Oct 2006 17:03:31 -0000	1.3
@@ -1,13 +1,13 @@
 [legacy-updates]
 name=Fedora Legacy $releasever - $basearch - Updates
-mirrorlist=http://fedora.redhat.com/Download/mirrors/legacy-updates-released-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=legacy-updates-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy
 
 [legacy-testing]
 name=Fedora Legacy $releasever - $basearch - Updates Testing
-mirrorlist=http://fedora.redhat.com/Download/mirrors/legacy-updates-testing-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=legacy-updates-testing-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fedora-release.spec	5 Oct 2006 15:07:40 -0000	1.31
+++ fedora-release.spec	5 Oct 2006 17:03:31 -0000	1.32
@@ -4,7 +4,7 @@
 Summary:	Fedora Core release files
 Name:		fedora-release
 Version:	6
-Release:	1
+Release:	2
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -64,6 +64,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Oct  5 2006 Jesse Keating <jkeating at redhat.com> - 6-2
+- replace old mirror files with new mirrorlist cgi system
+
 * Thu Oct  5 2006 Jesse Keating <jkeating at redhat.com> - 6-1
 - Rebuild for Fedora Core 6 release
 


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-updates-testing.repo	29 Mar 2006 22:15:35 -0000	1.6
+++ fedora-updates-testing.repo	5 Oct 2006 17:03:31 -0000	1.7
@@ -1,7 +1,7 @@
 [updates-testing]
 name=Fedora Core $releasever - $basearch - Test Updates
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
@@ -9,7 +9,7 @@
 [updates-testing-debuginfo]
 name=Fedora Core $releasever - $basearch - Test Updates Debug
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/debug/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-debug-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
@@ -17,7 +17,7 @@
 [updates-testing-source]
 name=Fedora Core $releasever - Test Updates Source
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-source-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-updates.repo	29 Mar 2006 23:31:22 -0000	1.10
+++ fedora-updates.repo	5 Oct 2006 17:03:31 -0000	1.11
@@ -1,7 +1,7 @@
 [updates]
 name=Fedora Core $releasever - $basearch - Updates
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -9,7 +9,7 @@
 [updates-debuginfo]
 name=Fedora Core $releasever - $basearch - Updates - Debug
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/debug/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-debug-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -17,7 +17,7 @@
 [updates-source]
 name=Fedora Core $releasever - Updates Source
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/SRPMS/
-mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-source-fc$releasever
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-fc$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora



From fedora-extras-commits at redhat.com  Thu Oct  5 17:18:30 2006
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Thu,  5 Oct 2006 10:18:30 -0700
Subject: owners owners.list,1.1778,1.1779
Message-ID: <200610051718.k95HIWc8018560@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18543/owners

Modified Files:
	owners.list 
Log Message:
Changed my email address



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1778
retrieving revision 1.1779
diff -u -r1.1778 -r1.1779
--- owners.list	5 Oct 2006 13:50:29 -0000	1.1778
+++ owners.list	5 Oct 2006 17:18:29 -0000	1.1779
@@ -688,8 +688,8 @@
 Fedora Extras|imlib|An image loading and rendering library for X11R6|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
-Fedora Extras|initng|Programs which control basic system processes|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|initng-ifiles|Scripts for initng|daner964 at student.liu.se|extras-qa at fedoraproject.org|
+Fedora Extras|initng|Programs which control basic system processes|dm at mensa.se|extras-qa at fedoraproject.org|
+Fedora Extras|initng-ifiles|Scripts for initng|dm at mensa.se|extras-qa at fedoraproject.org|
 Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inotify-tools|Command line utilities for inotify|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct  5 17:53:08 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  5 Oct 2006 10:53:08 -0700
Subject: rpms/kawa/devel kawa.spec,1.13,1.14
Message-ID: <200610051753.k95HrAg3018831@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18805

Modified Files:
	kawa.spec 
Log Message:
Revision -11.  Add antlr to classpath for build.



Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kawa.spec	4 Oct 2006 22:51:20 -0000	1.13
+++ kawa.spec	5 Oct 2006 17:53:08 -0000	1.14
@@ -5,7 +5,7 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -18,6 +18,7 @@
 BuildRequires:    readline-devel
 BuildRequires:    ant >= 1.6
 BuildRequires:    ncurses-devel
+BuildRequires:    antlr
 BuildRequires:    servletapi5
 Requires:         servletapi5
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -43,7 +44,7 @@
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --enable-kawa-frontend
-export CLASSPATH=$(build-classpath servletapi5)
+export CLASSPATH=$(build-classpath servletapi5 antlr)
 ant
 
 # Override the Makefile for generating kawa.1, since it should be
@@ -86,8 +87,11 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 05 2006 Anthony Green <green at redhat.com> - 1:1.8-11
+- Add antlr to classpath for gjdoc.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.8-10
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Mon Sep 18 2006 Anthony Green <green at redhat.com> - 1:1.8-9
 - Fix release tag.



From fedora-extras-commits at redhat.com  Thu Oct  5 18:02:10 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  5 Oct 2006 11:02:10 -0700
Subject: rpms/liblrdf/devel liblrdf.spec,1.5,1.6
Message-ID: <200610051802.k95I2C7i021744@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/liblrdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21727

Modified Files:
	liblrdf.spec 
Log Message:
Revision -11.  Delete .la instead of %exclude it.



Index: liblrdf.spec
===================================================================
RCS file: /cvs/extras/rpms/liblrdf/devel/liblrdf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- liblrdf.spec	4 Oct 2006 22:48:40 -0000	1.5
+++ liblrdf.spec	5 Oct 2006 18:02:10 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:      Library for manipulating RDF files describing LADSPA plugins
 Name:         liblrdf
 Version:      0.4.0
-Release:      9%{?dist}
+Release:      10%{?dist}
 License:      GPL
 Group:        System Environment/Libraries
 URL:          http://lrdf.sourceforge.net/
@@ -33,7 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,12 +53,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/liblrdf.so
-%exclude %{_libdir}/liblrdf.la
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 05 2006 Anthony Green <green at redhat.com> 0.4.0-10
+- Delete .la file after installing it instead of using %%exclude.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.4.0-9
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.4.0-8
 - Fix release tag.



From fedora-extras-commits at redhat.com  Thu Oct  5 19:31:50 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu,  5 Oct 2006 12:31:50 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 telepathy-gabble.spec, 1.7, 1.8
Message-ID: <200610051931.k95JVq3m025713@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25692

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Oct  5 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-1
- Update to 0.3.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Oct 2006 14:20:39 -0000	1.7
+++ .cvsignore	5 Oct 2006 19:31:49 -0000	1.8
@@ -1 +1 @@
-telepathy-gabble-0.3.9.tar.gz
+telepathy-gabble-0.3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Oct 2006 14:20:39 -0000	1.7
+++ sources	5 Oct 2006 19:31:49 -0000	1.8
@@ -1 +1 @@
-7c373a8d441802e5b6a211701e894dfb  telepathy-gabble-0.3.9.tar.gz
+2d68597d5624d687ae0f67a8bd40be98  telepathy-gabble-0.3.10.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- telepathy-gabble.spec	4 Oct 2006 14:20:39 -0000	1.7
+++ telepathy-gabble.spec	5 Oct 2006 19:31:49 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.9
+Version:        0.3.10
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-1
+- Update to 0.3.10.
+
 * Wed Oct  4 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.9-1
 - Update to 0.3.9.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 19:54:02 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu,  5 Oct 2006 12:54:02 -0700
Subject: rpms/octave/FC-5 .cvsignore, 1.10, 1.11 octave.spec, 1.42,
	1.43 sources, 1.10, 1.11 octave-2.9.8-misc.patch, 1.1, NONE
Message-ID: <200610051954.k95Js4fo025861@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25840

Modified Files:
	.cvsignore octave.spec sources 
Removed Files:
	octave-2.9.8-misc.patch 
Log Message:
New release. New BuildRequires.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Aug 2006 16:19:20 -0000	1.10
+++ .cvsignore	5 Oct 2006 19:54:02 -0000	1.11
@@ -1 +1 @@
-octave-2.9.8.tar.bz2
+octave-2.9.9.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- octave.spec	15 Sep 2006 15:50:55 -0000	1.42
+++ octave.spec	5 Oct 2006 19:54:02 -0000	1.43
@@ -1,13 +1,12 @@
 Name:           octave
-Version:        2.9.8
-Release:        2%{?dist}
+Version:        2.9.9
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
-Patch0:         octave-2.9.8-misc.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -15,9 +14,9 @@
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/install-info
 BuildRequires:  bison flex less tetex gcc-gfortran lapack-devel blas-devel
-BuildRequires:  ncurses-devel zlib-devel libtermcap-devel hdf5-devel
+BuildRequires:  ncurses-devel zlib-devel libtermcap-devel hdf5-devel 
 BuildRequires:  readline-devel glibc-devel fftw-devel gperf ghostscript
-BuildRequires:  ufsparse-devel glpk-devel gnuplot desktop-file-utils
+BuildRequires:  ufsparse-devel glpk-devel gnuplot desktop-file-utils pcre-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -50,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -125,6 +123,10 @@
 
 
 %changelog
+* Thu Oct  5 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.9-1
+- New release.
+- BuildRequires: pcre-devel
+
 * Mon Sep 11 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.8-2
 - Fix this bug:
   https://www.cae.wisc.edu/pipermail/bug-octave/2006-September/000687.html


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Aug 2006 16:19:20 -0000	1.10
+++ sources	5 Oct 2006 19:54:02 -0000	1.11
@@ -1 +1 @@
-1ccc06e00de7e61cc92e245bd48024a6  octave-2.9.8.tar.bz2
+a76a6d88f414285472896a63e4282b7f  octave-2.9.9.tar.bz2


--- octave-2.9.8-misc.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:37 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel - New directory
Message-ID: <200610052046.k95Kkd5i029085@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29056/perl-POE-Component-DBIAgent/devel

Log Message:
Directory /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:36 -0700
Subject: rpms/perl-POE-Component-DBIAgent - New directory
Message-ID: <200610052046.k95Kkcwj029082@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29056/perl-POE-Component-DBIAgent

Log Message:
Directory /cvs/extras/rpms/perl-POE-Component-DBIAgent added to the repository




From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:41 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:41 -0700
Subject: rpms/perl-POE-Component-DBIAgent Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200610052046.k95KkhV5029125@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29092

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-POE-Component-DBIAgent


--- NEW FILE Makefile ---
# Top level Makefile for module perl-POE-Component-DBIAgent
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:42 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:42 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610052046.k95KkiOm029128@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29092/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-POE-Component-DBIAgent


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:50 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:50 -0700
Subject: rpms/perl-POE-Component-DBIAgent import.log,1.1,1.2
Message-ID: <200610052046.k95KkqQf029174@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141

Modified Files:
	import.log 
Log Message:
auto-import perl-POE-Component-DBIAgent-0.26-1.fc5 on branch devel from perl-POE-Component-DBIAgent-0.26-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Oct 2006 20:46:41 -0000	1.1
+++ import.log	5 Oct 2006 20:46:50 -0000	1.2
@@ -0,0 +1 @@
+perl-POE-Component-DBIAgent-0_26-1_fc5:HEAD:perl-POE-Component-DBIAgent-0.26-1.fc5.src.rpm:1160081209



From fedora-extras-commits at redhat.com  Thu Oct  5 20:46:50 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:46:50 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel
	perl-POE-Component-DBIAgent.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610052046.k95Kkq3l029179@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-POE-Component-DBIAgent.spec 
Log Message:
auto-import perl-POE-Component-DBIAgent-0.26-1.fc5 on branch devel from perl-POE-Component-DBIAgent-0.26-1.fc5.src.rpm


--- NEW FILE perl-POE-Component-DBIAgent.spec ---
Name:           perl-POE-Component-DBIAgent
Version:        0.26
Release:        1%{?dist}
Summary:        POE Component for running asynchronous DBI calls
# see tail of DBIAgent.pm
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/POE-Component-DBIAgent/
Source0:        http://www.cpan.org/authors/id/R/RD/RDB/POE-Component-DBIAgent-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(Class::MethodMaker), perl(DBI), perl(POE) >= 0.17

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
DBIAgent is your answer to non-blocking DBI in POE.

%prep
%setup -q -n POE-Component-DBIAgent-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Oct 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.26-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Oct 2006 20:46:41 -0000	1.1
+++ .cvsignore	5 Oct 2006 20:46:50 -0000	1.2
@@ -0,0 +1 @@
+POE-Component-DBIAgent-0.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Oct 2006 20:46:41 -0000	1.1
+++ sources	5 Oct 2006 20:46:50 -0000	1.2
@@ -0,0 +1 @@
+be7797ba7eb147c8a2f19c89806e1d4b  POE-Component-DBIAgent-0.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct  5 20:47:08 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:47:08 -0700
Subject: owners owners.list,1.1779,1.1780
Message-ID: <200610052047.k95KlA1t029226@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29209

Modified Files:
	owners.list 
Log Message:
added perl-POE-Component-DBIAgent


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1779
retrieving revision 1.1780
diff -u -r1.1779 -r1.1780
--- owners.list	5 Oct 2006 17:18:29 -0000	1.1779
+++ owners.list	5 Oct 2006 20:47:08 -0000	1.1780
@@ -1550,6 +1550,7 @@
 Fedora Extras|perl-POE-Component-Client-HTTP|A non-blocking/parallel web requests engine for POE|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-Client-Keepalive|Manages and keeps alive client connections|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-Client-LDAP|Async LDAP access for POE|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-POE-Component-DBIAgent|POE Component for running asynchronous DBI calls|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-IRC|A POE component for building IRC clients|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-JobQueue|Process a large number of tasks with a finite number of workers|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-POE-Component-Logger|A POE logger|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -2112,8 +2113,8 @@
 Fedora Extras|tcpick|A tcp stream sniffer, tracker and capturer|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-butterfly|MSN connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-filesystem|Telepathy filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tellico|A collection manager|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|terminus-font|Clean fixed width font|rhbugs at n-dimensional.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct  5 20:47:39 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:47:39 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel
	perl-POE-Component-DBIAgent.spec, 1.1, 1.2
Message-ID: <200610052047.k95Klf4w029254@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29237

Modified Files:
	perl-POE-Component-DBIAgent.spec 
Log Message:
release bump


Index: perl-POE-Component-DBIAgent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel/perl-POE-Component-DBIAgent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-POE-Component-DBIAgent.spec	5 Oct 2006 20:46:50 -0000	1.1
+++ perl-POE-Component-DBIAgent.spec	5 Oct 2006 20:47:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-DBIAgent
 Version:        0.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        POE Component for running asynchronous DBI calls
 # see tail of DBIAgent.pm
 License:        GPL or Artistic
@@ -47,5 +47,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.26-2
+- bump
+
 * Thu Oct 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.26-1
 - Specfile autogenerated by cpanspec 1.69.



From fedora-extras-commits at redhat.com  Thu Oct  5 20:50:49 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu,  5 Oct 2006 13:50:49 -0700
Subject: rpms/perl-POE-Component-DBIAgent/devel
	perl-POE-Component-DBIAgent.spec, 1.2, 1.3
Message-ID: <200610052050.k95KopBv029322@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29305

Modified Files:
	perl-POE-Component-DBIAgent.spec 
Log Message:
additional verbage in %descriptionwq


Index: perl-POE-Component-DBIAgent.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-DBIAgent/devel/perl-POE-Component-DBIAgent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-Component-DBIAgent.spec	5 Oct 2006 20:47:39 -0000	1.2
+++ perl-POE-Component-DBIAgent.spec	5 Oct 2006 20:50:49 -0000	1.3
@@ -17,6 +17,15 @@
 %description
 DBIAgent is your answer to non-blocking DBI in POE.
 
+DBIAgent forks off a configurable number of helper processes for
+running DBI queries.  The states that depend on the output of the
+queries only get called when there is data for them to process.  No
+more agonizing about query optimization in terms of milliseconds
+because the rest of your program will suffer.  Leave that to the
+operating system!  POE is designed for doing a lot of things
+concurrently.  Waiting isn't doing, it's waiting... :-)
+
+
 %prep
 %setup -q -n POE-Component-DBIAgent-%{version}
 



From fedora-extras-commits at redhat.com  Thu Oct  5 20:55:06 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu,  5 Oct 2006 13:55:06 -0700
Subject: fedora-security/audit fc5,1.346,1.347 fc6,1.101,1.102
Message-ID: <200610052055.k95Kt6vs029383@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29363/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-5174



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- fc5	5 Oct 2006 14:36:11 -0000	1.346
+++ fc5	5 Oct 2006 20:55:04 -0000	1.347
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fc6	5 Oct 2006 14:36:11 -0000	1.101
+++ fc6	5 Oct 2006 20:55:04 -0000	1.102
@@ -4,6 +4,7 @@
 
 ** are items that need attention
 
+CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified



From fedora-extras-commits at redhat.com  Thu Oct  5 21:08:47 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu,  5 Oct 2006 14:08:47 -0700
Subject: rpms/octave-forge/FC-5 octave-forge.spec,1.29,1.30
Message-ID: <200610052108.k95L8n8h032392@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32375

Modified Files:
	octave-forge.spec 
Log Message:
Rebuild for octave 2.9.9.


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- octave-forge.spec	28 Aug 2006 19:03:52 -0000	1.29
+++ octave-forge.spec	5 Oct 2006 21:08:47 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.07.09
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -20,7 +20,7 @@
 Patch2:         octave-forge-2006.07.09-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave >= 2.9.8 ImageMagick
+Requires:	octave >= 2.9.9 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-6
+- Rebuild for octave 2.9.9. 
+
 * Mon Aug 28 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-5
 - Rebuild. Previous build was inadvertently done against octave 2.9.7.
 



From fedora-extras-commits at redhat.com  Thu Oct  5 23:30:43 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  5 Oct 2006 16:30:43 -0700
Subject: rpms/ghdl/devel ghdl-svn73.patch, NONE, 1.1 ghdl.spec, 1.25,
	1.26 ghdl-svn61.patch, 1.1, NONE ghdl-svn71.patch, 1.2, NONE
Message-ID: <200610052330.k95NUkLN006714@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6690

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn73.patch 
Removed Files:
	ghdl-svn61.patch ghdl-svn71.patch 
Log Message:
update to svn73


ghdl-svn73.patch:

--- NEW FILE ghdl-svn73.patch ---
diff -urN ghdl-0.25/vhdl/back_end.ads ghdl-0.26dev/vhdl/back_end.ads
--- ghdl-0.25/vhdl/back_end.ads	2005-09-22 23:07:25.000000000 +0200
+++ ghdl-0.26dev/vhdl/back_end.ads	2006-10-05 11:35:25.000000000 +0200
@@ -29,6 +29,14 @@
    Library_To_File_Name : Library_To_File_Name_Acc :=
      Default_Library_To_File_Name'Access;
 
+   --  Back-end options.
+   type Parse_Option_Acc is access function (Opt : String) return Boolean;
+   Parse_Option : Parse_Option_Acc := null;
+
+   --  Disp back-end option help.
+   type Disp_Option_Acc is access procedure;
+   Disp_Option : Disp_Option_Acc := null;
+
    --  UNIT is a design unit from parse.
    --  According to the current back-end, do what is necessary.
    --
@@ -46,8 +54,5 @@
    --  May be NULL for no additionnal checks.
    type Sem_Foreign_Acc is access procedure (Decl : Iir);
    Sem_Foreign : Sem_Foreign_Acc := null;
-
-   --procedure Finish_Compilation
-   --  (Unit : Iir_Design_Unit; Main : Boolean := False);
 end Back_End;
 
diff -urN ghdl-0.25/vhdl/bug.adb ghdl-0.26dev/vhdl/bug.adb
--- ghdl-0.25/vhdl/bug.adb	2005-11-18 02:34:12.000000000 +0100
+++ ghdl-0.26dev/vhdl/bug.adb	2006-10-05 11:35:25.000000000 +0200
@@ -70,7 +70,7 @@
       Put_Line
         (Standard_Error,
          "Please report this bug on http://gna.org/projects/ghdl");
-      Put_Line (Standard_Error, "GHDL version: " & Ghdl_Version);
+      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "In directory: " &
                 GNAT.Directory_Operations.Get_Current_Dir);
diff -urN ghdl-0.25/vhdl/canon.adb ghdl-0.26dev/vhdl/canon.adb
--- ghdl-0.25/vhdl/canon.adb	2006-07-29 06:42:30.000000000 +0200
+++ ghdl-0.26dev/vhdl/canon.adb	2006-10-05 11:35:25.000000000 +0200
@@ -847,22 +847,6 @@
       end loop;
    end Canon_Sequential_Stmts;
 
-   procedure Add_Driver_For_Signal (Driver_List : Iir_List;
-                                    Signal : Iir)
-   is
-      Choice : Iir;
-   begin
-      if Get_Kind (Signal) = Iir_Kind_Aggregate then
-         Choice := Get_Association_Choices_Chain (Signal);
-         while Choice /= Null_Iir loop
-            Add_Driver_For_Signal (Driver_List, Get_Associated (Choice));
-            Choice := Get_Chain (Choice);
-         end loop;
-      else
-         Add_Element (Driver_List, Get_Longuest_Static_Prefix (Signal));
-      end if;
-   end Add_Driver_For_Signal;
-
    -- Create a statement transform from concurrent_signal_assignment
    -- statement STMT (either selected or conditional).
    -- waveform transformation is not done.
@@ -895,9 +879,6 @@
       --      reserved word POSTPONED.
       Set_Postponed_Flag (Proc, Get_Postponed_Flag (Proc));
 
-      Set_Driver_List (Proc, Create_Iir_List);
-      Add_Driver_For_Signal (Get_Driver_List (Proc), Get_Target (Stmt));
-
       Canon_Extract_Sensitivity (Get_Target (Stmt), Sensitivity_List, True);
 
       if Canon_Flag_Expressions then
@@ -966,7 +947,6 @@
       Assoc_Chain : Iir;
       Assoc : Iir;
       Imp : Iir;
-      Driver_List : Iir_Driver_List;
       Inter : Iir;
       Sensitivity_List : Iir_List;
       Is_Sensitized : Boolean;
@@ -1014,7 +994,6 @@
          Get_Parameter_Association_Chain (Call),
          Call);
       Set_Parameter_Association_Chain (Call, Assoc_Chain);
-      Driver_List := Null_Iir_List;
       Assoc := Assoc_Chain;
 
       --  LRM93 9.3
@@ -1034,18 +1013,6 @@
                   Canon_Extract_Sensitivity
                     (Get_Actual (Assoc), Sensitivity_List, False);
                end if;
-               --  LRM 2.1.1.2 Signal Parameters
-               if Get_Kind (Inter) = Iir_Kind_Signal_Interface_Declaration
-                 and then Get_Mode (Inter) in Iir_Out_Modes
-               then
-                  if Driver_List = Null_Iir_List then
-                     Driver_List := Create_Iir_List;
-                     Set_Driver_List (Proc, Driver_List);
-                  end if;
-                  Add_Element
-                    (Driver_List,
-                     Get_Longuest_Static_Prefix (Get_Actual (Assoc)));
-               end if;
             when Iir_Kind_Association_Element_Open
               | Iir_Kind_Association_Element_By_Individual =>
                null;
diff -urN ghdl-0.25/vhdl/disp_tree.adb ghdl-0.26dev/vhdl/disp_tree.adb
--- ghdl-0.25/vhdl/disp_tree.adb	2005-10-26 14:31:21.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_tree.adb	2006-10-05 11:35:25.000000000 +0200
@@ -1023,8 +1023,6 @@
             Disp_Depth (Get_Subprogram_Depth (Tree));
             Header ("subprogram_body:");
             Disp_Tree_Flat (Get_Subprogram_Body (Tree), Ntab);
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("attribute_value_chain:");
             Disp_Tree_Flat_Chain (Get_Attribute_Value_Chain (Tree), Ntab);
          when Iir_Kind_Procedure_Body
@@ -1423,8 +1421,6 @@
                Header ("sensivity list:");
                Disp_Tree_List (Get_Sensitivity_List (Tree), Ntab, True);
             end if;
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("declaration_chain:");
             Disp_Tree_Chain (Get_Declaration_Chain (Tree), Ntab);
             Header ("process statements:");
diff -urN ghdl-0.25/vhdl/disp_vhdl.adb ghdl-0.26dev/vhdl/disp_vhdl.adb
--- ghdl-0.25/vhdl/disp_vhdl.adb	2006-07-09 03:55:28.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_vhdl.adb	2006-10-05 11:35:25.000000000 +0200
@@ -893,25 +893,6 @@
       Put_Line (";");
    end Disp_Object_Declaration;
 
-   procedure Disp_Driver_List (List: Iir_Driver_List; Indent : Count)
-   is
-      El: Iir;
-   begin
-      if List = Null_Iir_List or else Get_Nbr_Elements (List) = 0 then
-         return;
-      end if;
-      Set_Col (Indent);
-      Put_Line ("-- drivers needed for signals:");
-      for I in Natural loop
-         El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
-         Set_Col (Indent);
-         Put ("--   ");
-         Disp_Expression (El);
-         New_Line;
-      end loop;
-   end Disp_Driver_List;
-
    procedure Disp_Subprogram_Declaration (Subprg: Iir)
    is
       Indent: Count;
@@ -943,10 +924,6 @@
          when others =>
             raise Internal_Error;
       end case;
-
-      if Get_Kind (Subprg) = Iir_Kind_Procedure_Declaration then
-         Disp_Driver_List (Get_Driver_List (Subprg), Indent);
-      end if;
    end Disp_Subprogram_Declaration;
 
    procedure Disp_Subprogram_Body (Subprg : Iir)
@@ -1517,7 +1494,6 @@
       else
          New_Line;
       end if;
-      Disp_Driver_List (Get_Driver_List (Process), Start + Indentation);
       Disp_Declaration_Chain (Process, Start + Indentation);
       Set_Col (Start);
       Put_Line ("begin");
@@ -2312,10 +2288,10 @@
             Disp_Concurrent_Conditional_Signal_Assignment (An_Iir);
          when Iir_Kinds_Dyadic_Operator =>
             Disp_Dyadic_Operator (An_Iir);
-         when Iir_Kind_Signal_Interface_Declaration =>
+         when Iir_Kind_Signal_Interface_Declaration
+           | Iir_Kind_Signal_Declaration
+           | Iir_Kind_Object_Alias_Declaration =>
             Disp_Name_Of (An_Iir);
-         when Iir_Kind_Signal_Declaration =>
-            Disp_Identifier (An_Iir);
          when Iir_Kind_Enumeration_Literal =>
             Disp_Identifier (An_Iir);
          when Iir_Kind_Component_Instantiation_Statement =>
@@ -2330,8 +2306,11 @@
             Disp_Package_Declaration (An_Iir);
          when Iir_Kind_Wait_Statement =>
             Disp_Wait_Statement (An_Iir);
-         when Iir_Kind_Selected_Name =>
-            Disp_Name (An_Iir);
[...4286 lines suppressed...]
+         end if;
+         return Create_Var_Identifier_From_Buffer (L);
       end Create_Var_Identifier;
 
       function Create_Uniq_Identifier return Var_Ident_Type
@@ -22728,19 +23323,6 @@
          end case;
       end Translate_Succ_Pred_Attribute;
 
-      --  Read the boolean attribute (active or event) FIELD of simple signal
-      --  SIG.
-      function Read_Bool_Signal_Attribute (Sig : O_Enode; Field : O_Fnode)
-                                          return O_Enode
-      is
-         S : O_Enode;
-      begin
-         S := New_Convert_Ov (Sig, Ghdl_Signal_Ptr);
-         return New_Value
-           (New_Selected_Element (New_Access_Element (S), Field));
-         --Ghdl_Signal_Event_Node));
-      end Read_Bool_Signal_Attribute;
-
       type Bool_Sigattr_Data_Type is record
          Label : O_Snode;
          Field : O_Fnode;
@@ -22752,8 +23334,7 @@
          pragma Unreferenced (Targ_Type);
       begin
          Gen_Exit_When (Data.Label,
-                        Read_Bool_Signal_Attribute (New_Value (M2Lv (Targ)),
-                                                    Data.Field));
+                        New_Value (Get_Signal_Field (Targ, Data.Field)));
       end Bool_Sigattr_Non_Composite_Signal;
 
       function Bool_Sigattr_Prepare_Data_Composite
@@ -22819,7 +23400,7 @@
          if Get_Kind (Prefix_Type) in Iir_Kinds_Scalar_Type_Definition then
             --  Effecient handling for a scalar signal.
             Name := Chap6.Translate_Name (Prefix);
-            return Read_Bool_Signal_Attribute (New_Value (M2Lv (Name)), Field);
+            return New_Value (Get_Signal_Field (Name, Field));
          else
             --  Element per element handling for composite signals.
             Res := Create_Temp (Std_Boolean_Type_Node);
@@ -22839,13 +23420,14 @@
 
       function Translate_Event_Attribute (Attr : Iir) return O_Enode is
       begin
-         return Translate_Bool_Signal_Attribute (Attr, Ghdl_Signal_Event_Node);
+         return Translate_Bool_Signal_Attribute
+           (Attr, Ghdl_Signal_Event_Field);
       end Translate_Event_Attribute;
 
       function Translate_Active_Attribute (Attr : Iir) return O_Enode is
       begin
          return Translate_Bool_Signal_Attribute
-           (Attr, Ghdl_Signal_Active_Node);
+           (Attr, Ghdl_Signal_Active_Field);
       end Translate_Active_Attribute;
 
       --  Read signal value FIELD of signal SIG.
@@ -22862,11 +23444,20 @@
            (New_Unchecked_Address (New_Selected_Element (T, Field), S_Type));
       end Get_Signal_Value_Field;
 
+      function Get_Signal_Field (Sig : Mnode; Field : O_Fnode)
+                                return O_Lnode
+      is
+         S : O_Enode;
+      begin
+         S := New_Convert_Ov (New_Value (M2Lv (Sig)), Ghdl_Signal_Ptr);
+         return New_Selected_Element (New_Access_Element (S), Field);
+      end Get_Signal_Field;
+
       function Read_Last_Value (Sig : O_Enode; Sig_Type : Iir) return O_Enode
       is
       begin
          return New_Value (Get_Signal_Value_Field
-                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Node));
+                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Field));
       end Read_Last_Value;
 
       function Translate_Last_Value is new Chap7.Translate_Signal_Value
@@ -27031,39 +27622,53 @@
         (Chararray_Type, New_Unsigned_Literal (Ghdl_Index_Type, 8));
       New_Type_Decl (Get_Identifier ("__ghdl_scalar_bytes"),
                      Ghdl_Scalar_Bytes);
+
+      Ghdl_Signal_Ptr := New_Access_Type (O_Tnode_Null);
+      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+
       --  Type __signal_signal is record
       Start_Record_Type (Rec);
-      New_Record_Field (Rec, Ghdl_Signal_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Value_Field,
                         Get_Identifier ("value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Field,
                         Get_Identifier ("driving_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Field,
                         Get_Identifier ("last_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Field,
                         Get_Identifier ("last_event"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Field,
                         Get_Identifier ("last_active"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Chain_Field,
+                        Get_Identifier ("active_chain"),
+                        Ghdl_Signal_Ptr);
+      New_Record_Field (Rec, Ghdl_Signal_Event_Field,
                         Get_Identifier ("event"),
                         Std_Boolean_Type_Node);
-      New_Record_Field (Rec, Ghdl_Signal_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Field,
                         Get_Identifier ("active"),
                         Std_Boolean_Type_Node);
+      New_Record_Field (Rec, Ghdl_Signal_Has_Active_Field,
+                        Get_Identifier ("has_active"),
+                        Ghdl_Bool_Type);
       Finish_Record_Type (Rec, Ghdl_Signal_Type);
       New_Type_Decl (Get_Identifier ("__ghdl_signal"), Ghdl_Signal_Type);
 
-      Ghdl_Signal_Ptr := New_Access_Type (Ghdl_Signal_Type);
-      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+      Finish_Access_Type (Ghdl_Signal_Ptr, Ghdl_Signal_Type);
 
       Ghdl_Signal_Ptr_Ptr := New_Access_Type (Ghdl_Signal_Ptr);
       New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr_ptr"),
                      Ghdl_Signal_Ptr_Ptr);
 
+      New_Var_Decl (Ghdl_Signal_Active_Chain,
+                    Get_Identifier ("__ghdl_signal_active_chain"),
+                    O_Storage_External,
+                    Ghdl_Signal_Ptr);
+
       --  procedure __ghdl_signal_merge_rti
       --       (sig : ghdl_signal_ptr; rti : ghdl_rti_access)
       Start_Procedure_Decl
@@ -27305,6 +27910,17 @@
       New_Interface_Decl (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
       Finish_Subprogram_Decl (Interfaces, Ghdl_Process_Add_Driver);
 
+      --  procedure __ghdl_signal_direct_driver (sig : __ghdl_signal_ptr;
+      --                                         Drv : Ghdl_Ptr_type);
+      Start_Procedure_Decl
+        (Interfaces, Get_Identifier ("__ghdl_signal_direct_driver"),
+         O_Storage_External);
+      New_Interface_Decl
+        (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
+      New_Interface_Decl
+        (Interfaces, Param, Get_Identifier ("drv"), Ghdl_Ptr_Type);
+      Finish_Subprogram_Decl (Interfaces, Ghdl_Signal_Direct_Driver);
+
       declare
          procedure Create_Signal_Conversion (Name : String; Res : out O_Dnode)
          is
diff -urN ghdl-0.25/vhdl/translation.ads ghdl-0.26dev/vhdl/translation.ads
--- ghdl-0.25/vhdl/translation.ads	2006-08-02 06:13:50.000000000 +0200
+++ ghdl-0.26dev/vhdl/translation.ads	2006-10-05 11:35:23.000000000 +0200
@@ -61,6 +61,21 @@
    --  If set, do not generate code for unused implicit subprograms.
    Flag_Discard_Unused_Implicit : Boolean := False;
 
+   --  If set, dump drivers per process during compilation.
+   Flag_Dump_Drivers : Boolean := False;
+
+   --  If set, try to create direct drivers.
+   Flag_Direct_Drivers : Boolean := True;
+
+   --  If set, checks ranges (subtype ranges).
+   Flag_Range_Checks : Boolean := True;
+
+   --  If set, checks indexes (arrays index and slice).
+   Flag_Index_Checks : Boolean := True;
+
+   --  If set, do not create identifiers (for in memory compilation).
+   Flag_Discard_Identifiers : Boolean := False;
+
    type Foreign_Kind_Type is (Foreign_Unknown,
                               Foreign_Vhpidirect,
                               Foreign_Intrinsic);
diff -urN ghdl-0.25/vhdl/version.ads ghdl-0.26dev/vhdl/version.ads
--- ghdl-0.25/vhdl/version.ads	2006-08-11 05:15:55.000000000 +0200
+++ ghdl-0.26dev/vhdl/version.ads	2006-10-05 11:35:25.000000000 +0200
@@ -1,4 +1,5 @@
 package Version is
-   Ghdl_Version : constant String :=
-      "GHDL 0.25 (20060811) [Sokcho edition]";
+   Ghdl_Release : constant String :=
+      "GHDL 0.26dev (20060819) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.26dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ghdl.spec	5 Oct 2006 11:14:13 -0000	1.25
+++ ghdl.spec	5 Oct 2006 23:30:43 -0000	1.26
@@ -1,11 +1,11 @@
 %define gccver 4.1.1
 %define ghdlver 0.25
-%define ghdlsvnver 71
+%define ghdlsvnver 73
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.25
-Release: 0.%{ghdlsvnver}svn.1%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Fri Oct  6 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.73svn.0
+- update to svn73
+
 * Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.1
 - bump release
 


--- ghdl-svn61.patch DELETED ---


--- ghdl-svn71.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 01:01:31 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:01:31 -0700
Subject: rpms/dirvish - New directory
Message-ID: <200610060101.k9611XMA012793@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12767/dirvish

Log Message:
Directory /cvs/extras/rpms/dirvish added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 01:01:32 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:01:32 -0700
Subject: rpms/dirvish/devel - New directory
Message-ID: <200610060101.k9611YGQ012796@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12767/dirvish/devel

Log Message:
Directory /cvs/extras/rpms/dirvish/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 01:02:12 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:02:12 -0700
Subject: rpms/dirvish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610060102.k9612EYj012848@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12814/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dirvish


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 01:02:11 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:02:11 -0700
Subject: rpms/dirvish Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610060102.k9612D2Y012842@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12814

Added Files:
	Makefile import.log 
Log Message:
Setup of module dirvish


--- NEW FILE Makefile ---
# Top level Makefile for module dirvish
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 01:03:39 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:03:39 -0700
Subject: rpms/dirvish/devel dirvish-1.2.1-install.patch, NONE,
	1.1 dirvish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610060103.k9613fqg012925@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12887/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dirvish-1.2.1-install.patch dirvish.spec 
Log Message:
auto-import dirvish-1.2.1-2 on branch devel from dirvish-1.2.1-2.src.rpm

dirvish-1.2.1-install.patch:

--- NEW FILE dirvish-1.2.1-install.patch ---
diff -Naur dirvish-1.2.1.original/install.sh dirvish-1.2.1/install.sh
--- dirvish-1.2.1.original/install.sh	2005-02-18 20:56:13.000000000 -0400
+++ dirvish-1.2.1/install.sh	2006-09-22 22:56:04.000000000 -0400
@@ -20,12 +20,12 @@
 	then
 		PERL=/usr/bin/perl
 	fi
-	echo $ECHO_N "perl to use ($PERL) $ECHO_C"
-	read ans
-	if [ -n "$ans" ] 
-	then
-		PERL="$ans"
-	fi
+#	echo $ECHO_N "perl to use ($PERL) $ECHO_C"
+#	read ans
+#	if [ -n "$ans" ] 
+#	then
+#		PERL="$ans"
+#	fi
 
 	until [ -n "$PREFIX_OK" ]
 	do
@@ -33,101 +33,101 @@
 		CONFDIR="/etc/dirvish"
 		MANDIR="/usr/share/man"
 
-		echo $ECHO_N "What installation prefix should be used? ($PREFIX) $ECHO_C"
-		read ans
-		if [ -n "$ans" ] 
-		then
-			PREFIX="$ans"
-                        # KHL 2005-02-18  == changed to = in "if" below
-			if [ "$PREFIX" = "/" ]
-			then
-				PREFIX=""
-			fi
-		fi
-		if [ -n "$PREFIX" -a  ! -d "$PREFIX" ]
-		then
-			echo $ECHO_N "$PREFIX doesn't exist, create it? (n) $ECHO_C"
-			read ans
-			if [ `expr "$ans" : '[yY]'` -ne 0 ]
-			then
+#		echo $ECHO_N "What installation prefix should be used? ($PREFIX) $ECHO_C"
+#		read ans
+#		if [ -n "$ans" ] 
+#		then
+#			PREFIX="$ans"
+#                        # KHL 2005-02-18  == changed to = in "if" below
+#			if [ "$PREFIX" = "/" ]
+#			then
+#				PREFIX=""
+#			fi
+#		fi
+#		if [ -n "$PREFIX" -a  ! -d "$PREFIX" ]
+#		then
+#			echo $ECHO_N "$PREFIX doesn't exist, create it? (n) $ECHO_C"
+#			read ans
+#			if [ `expr "$ans" : '[yY]'` -ne 0 ]
+#			then
 				CREATE_PREFIX="$PREFIX directory will be created"
 				PREFIX_OK="yes"
-			else
-				continue
-			fi
-		else
-			PREFIX_OK="yes"
-		fi
-
-		if [ -d "$PREFIX/sbin" ]
-		then
-			BINDIR=$PREFIX/sbin
-		else
+#			else
+#				continue
+#			fi
+#		else
+#			PREFIX_OK="yes"
+#		fi
+
+#		if [ -d "$PREFIX/sbin" ]
+#		then
+#			BINDIR=$PREFIX/sbin
+#		else
 			BINDIR=$PREFIX/bin
-		fi
+#		fi
 
-		if [ -d "$PREFIX/share/man" ]
-		then
+#		if [ -d "$PREFIX/share/man" ]
+#		then
 			MANDIR=$PREFIX/share/man
-		elif [ -d "$PREFIX/usr/share/man" ]
-		then
-			MANDIR=$PREFIX/usr/share/man
-		elif [ -d "$PREFIX/usr/man" ]
-		then
-			MANDIR="$PREFIX/usr/man" ]
-		else
-			MANDIR=$PREFIX/man
-		fi
-		if [ `expr "$PREFIX" : '.*dirvish.*'` -gt 0 ]
-		then
-			CONFDIR="$PREFIX/etc"
-		else
+#		elif [ -d "$PREFIX/usr/share/man" ]
+#		then
+#			MANDIR=$PREFIX/usr/share/man
+#		elif [ -d "$PREFIX/usr/man" ]
+#		then
+#			MANDIR="$PREFIX/usr/man" ]
+#		else
+#			MANDIR=$PREFIX/man
+#		fi
+#		if [ `expr "$PREFIX" : '.*dirvish.*'` -gt 0 ]
+#		then
+#			CONFDIR="$PREFIX/etc"
+#		else
 			CONFDIR="/etc/dirvish"
-		fi
+#		fi
 	done
 
 
-	echo $ECHO_N "Directory to install executables? ($BINDIR) $ECHO_C"
-	read ans
-	if [ -n "$ans" ] 
-	then
-		BINDIR="$ans"
-	fi
-
-	echo $ECHO_N "Directory to install MANPAGES? ($MANDIR) $ECHO_C"
-	read ans
-	if [ -n "$ans" ] 
-	then
-		MANDIR="$ans"
-	fi
-
-	echo $ECHO_N "Configuration directory ($CONFDIR) $ECHO_C"
-	read ans
-	if [ -n "$ans" ] 
-	then
-		CONFDIR="$ans"
-	fi
-
-	cat <<EOSTAT
-
-Perl executable to use is $PERL
-Dirvish executables to be installed in $BINDIR
-Dirvish manpages to be installed in $MANDIR
-Dirvish will expect its configuration files in $CONFDIR
-
-$CREATE_PREFIX
-
-EOSTAT
-
-	echo $ECHO_N "Is this correct? (no/yes/quit) $ECHO_C"
-	read ans
-	if [ `expr "$ans" : '[qQ]'` -ne 0 ]
-	then
-		exit
-	elif [ `expr "$ans" : '[yY]'` -ne 0 ]
-	then
+#	echo $ECHO_N "Directory to install executables? ($BINDIR) $ECHO_C"
+#	read ans
+#	if [ -n "$ans" ] 
+#	then
+#		BINDIR="$ans"
+#	fi
+#
+#	echo $ECHO_N "Directory to install MANPAGES? ($MANDIR) $ECHO_C"
+#	read ans
+#	if [ -n "$ans" ] 
+#	then
+#		MANDIR="$ans"
+#	fi
+#
+#	echo $ECHO_N "Configuration directory ($CONFDIR) $ECHO_C"
+#	read ans
+#	if [ -n "$ans" ] 
+#	then
+#		CONFDIR="$ans"
+#	fi
+#
+#	cat <<EOSTAT
+#
+#Perl executable to use is $PERL
+#Dirvish executables to be installed in $BINDIR
+#Dirvish manpages to be installed in $MANDIR
+#Dirvish will expect its configuration files in $CONFDIR
+#
+#$CREATE_PREFIX
+#
+#EOSTAT
+#
+#	echo $ECHO_N "Is this correct? (no/yes/quit) $ECHO_C"
+#	read ans
+#	if [ `expr "$ans" : '[qQ]'` -ne 0 ]
+#	then
+#		exit
+#	elif [ `expr "$ans" : '[yY]'` -ne 0 ]
+#	then
 		break
-	fi
+#	fi
 done
 
 HEADER="#!$PERL
@@ -148,10 +148,10 @@
 echo "Executables created."
 echo
 
-echo $ECHO_N "Install executables and manpages? (no/yes) $ECHO_C"
-read ans
-if [ `expr "$ans" : '[yY]'` -ne 0 ]
-then
+#echo $ECHO_N "Install executables and manpages? (no/yes) $ECHO_C"
+#read ans
+#if [ `expr "$ans" : '[yY]'` -ne 0 ]
+#then
 	echo
 	if [ -n "$CREATE_PREFIX" ]
 	then
@@ -174,10 +174,10 @@
 		mkdir -p "$MANDIR"
 	fi
 
-	if [ ! -d "$CONFDIR" ]
-	then
-		mkdir -p "$CONFDIR"
-	fi
+#	if [ ! -d "$CONFDIR" ]
+#	then
+#		mkdir -p "$CONFDIR"
+#	fi
 
 	for f in $EXECUTABLES
 	do
@@ -198,15 +198,15 @@
 	done
 	echo
 	echo "Installation complete"
-fi
+#fi
 
-echo $ECHO_N "Clean installation directory? (no/yes) $ECHO_C"
-read ans
-if [ `expr "$ans" : '[yY]'` -ne 0 ]
-then
+#echo $ECHO_N "Clean installation directory? (no/yes) $ECHO_C"
+#read ans
+#if [ `expr "$ans" : '[yY]'` -ne 0 ]
+#then
 	for f in $EXECUTABLES
 	do
 		rm $f
 	done
 	echo "Install directory cleaned."
-fi
+#fi


--- NEW FILE dirvish.spec ---
Name:           dirvish
Version:        1.2.1
Release:        2%{?dist}
Summary:        Fast, disk based, rotating network backup system

Group:          Applications/Archiving
License:        OSL
URL:            http://www.dirvish.org/
Source0:        http://www.dirvish.org/dirvish-%{version}.tgz
# converts the installer to work in unattended mode
Patch0:         dirvish-1.2.1-install.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       rsync

%description
Dirvish is a fast, disk based, rotating network backup system. With dirvish you
can maintain a set of complete images of your filesystems with unattended
creation and expiration. A dirvish backup vault is like a time machine for your
data. 


%prep
%setup -q
%patch0 -p1


%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/dirvish
PREFIX=$RPM_BUILD_ROOT%{_prefix} ./install.sh


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/dirvish
%{_bindir}/*
%{_mandir}/man5/*
%{_mandir}/man8/*
%doc CHANGELOG FAQ.html RELEASE.html TODO.html COPYING


%changelog
* Thu Oct 05 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-2
- Fix License field
- Add licence text
- Removed perl from BuildRequires

* Sat Sep 25 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-1
- Initial package release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dirvish/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 01:02:12 -0000	1.1
+++ .cvsignore	6 Oct 2006 01:03:38 -0000	1.2
@@ -0,0 +1 @@
+dirvish-1.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dirvish/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 01:02:12 -0000	1.1
+++ sources	6 Oct 2006 01:03:38 -0000	1.2
@@ -0,0 +1 @@
+892ec9333b19e623880cdb499443c11b  dirvish-1.2.1.tgz



From fedora-extras-commits at redhat.com  Fri Oct  6 01:03:37 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:03:37 -0700
Subject: rpms/dirvish import.log,1.1,1.2
Message-ID: <200610060104.k96149IJ012930@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12887

Modified Files:
	import.log 
Log Message:
auto-import dirvish-1.2.1-2 on branch devel from dirvish-1.2.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dirvish/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 01:02:11 -0000	1.1
+++ import.log	6 Oct 2006 01:03:37 -0000	1.2
@@ -0,0 +1 @@
+dirvish-1_2_1-2:HEAD:dirvish-1.2.1-2.src.rpm:1160096784



From fedora-extras-commits at redhat.com  Fri Oct  6 01:13:05 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:13:05 -0700
Subject: owners owners.list,1.1780,1.1781
Message-ID: <200610060113.k961D7RB013097@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13080

Modified Files:
	owners.list 
Log Message:
dirvish imported



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1780
retrieving revision 1.1781
diff -u -r1.1780 -r1.1781
--- owners.list	5 Oct 2006 20:47:08 -0000	1.1780
+++ owners.list	6 Oct 2006 01:13:05 -0000	1.1781
@@ -292,6 +292,7 @@
 Fedora Extras|dircproxy|Detatchable IRC proxy server|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dirmngr|Client for Managing/Downloading CRLs|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|dirvish|Fast, disk based, rotating network backup system|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com
 Fedora Extras|dnsmasq|A lightweight DHCP/caching DNS server|jima at beer.tclug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 01:26:13 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu,  5 Oct 2006 18:26:13 -0700
Subject: rpms/dirvish/devel dirvish.spec,1.1,1.2
Message-ID: <200610060126.k961QFJv013207@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13141

Modified Files:
	dirvish.spec 
Log Message:
Fix typo



Index: dirvish.spec
===================================================================
RCS file: /cvs/extras/rpms/dirvish/devel/dirvish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dirvish.spec	6 Oct 2006 01:03:38 -0000	1.1
+++ dirvish.spec	6 Oct 2006 01:26:13 -0000	1.2
@@ -48,7 +48,7 @@
 %changelog
 * Thu Oct 05 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-2
 - Fix License field
-- Add licence text
+- Add license text
 - Removed perl from BuildRequires
 
 * Sat Sep 25 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-1



From fedora-extras-commits at redhat.com  Fri Oct  6 01:37:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 18:37:15 -0700
Subject: rpms/libxfce4util/devel libxfce4util.spec,1.12,1.13
Message-ID: <200610060137.k961bH0p013331@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314

Modified Files:
	libxfce4util.spec 
Log Message:
Fix defattr



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libxfce4util.spec	5 Oct 2006 01:39:07 -0000	1.12
+++ libxfce4util.spec	6 Oct 2006 01:37:15 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD and LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4util-4.3.99.1.tar.bz2
@@ -45,18 +45,21 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog ChangeLog.pre-4.2.0 COPYING NEWS
 %{_libdir}/lib*.so.*
 %{_sbindir}/xfce4-kiosk-query
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 01:38:33 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 18:38:33 -0700
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.15,1.16
Message-ID: <200610060138.k961cZOH013401@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13384

Modified Files:
	libxfcegui4.spec 
Log Message:
Fix defattr



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libxfcegui4.spec	5 Oct 2006 01:43:59 -0000	1.15
+++ libxfcegui4.spec	6 Oct 2006 01:38:33 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
@@ -55,18 +55,21 @@
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING 
 %{_libdir}/lib*.so.*
 %{_datadir}/xfce4/xfce-svg-test.svg
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel build
 



From fedora-extras-commits at redhat.com  Fri Oct  6 01:55:58 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 18:55:58 -0700
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec,1.11,1.12
Message-ID: <200610060156.k961u0oL013538@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13521

Modified Files:
	libxfce4mcs.spec 
Log Message:
Fix defattr
remove unneeded prereq



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxfce4mcs.spec	5 Oct 2006 01:48:05 -0000	1.11
+++ libxfce4mcs.spec	6 Oct 2006 01:55:58 -0000	1.12
@@ -7,7 +7,6 @@
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4mcs-4.3.99.1.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Prereq: /sbin/ldconfig
 
 Requires: libxfce4util >= %{version}
 Requires: libxfcegui4 >= %{version}
@@ -52,17 +51,21 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/libxfce4mcs
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+- remove unneeded prereq
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 02:06:08 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:06:08 -0700
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec,1.8,1.9
Message-ID: <200610060206.k9626AwN016532@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16515

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
Add period to description
Fix defattr



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce-mcs-manager.spec	5 Oct 2006 02:01:44 -0000	1.8
+++ xfce-mcs-manager.spec	6 Oct 2006 02:06:08 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-manager-4.3.99.1.tar.bz2
@@ -15,7 +15,7 @@
 BuildRequires: libxfcegui4-devel >= %{version}
 
 %description
-This package includes a multi channel settings manager for Xfce4
+This package includes a multi channel settings manager for Xfce4.
 
 %package devel
 Summary: Header file to build xfce-mcs-manager plugins
@@ -45,7 +45,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc ChangeLog COPYING AUTHORS
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
@@ -56,11 +56,15 @@
 %{_datadir}/applications/*
 
 %files devel
-%defattr(-, root, root,0755)
+%defattr(-, root, root,-)
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add period to description
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 02:15:59 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:15:59 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.13,1.14
Message-ID: <200610060216.k962G17r016793@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16776

Modified Files:
	xfce4-panel.spec 
Log Message:
Add period to description
Fix defattr
Add gtk-update-icon-cache in post/postun



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-panel.spec	5 Oct 2006 02:10:26 -0000	1.13
+++ xfce4-panel.spec	6 Oct 2006 02:15:59 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.3.99.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
@@ -47,7 +47,7 @@
 Obsoletes: xfce4-windowlist-plugin <= 4.2.3-3
 
 %description
-This package includes the panel for the Xfce desktop environment
+This package includes the panel for the Xfce desktop environment.
 
 %package devel
 Summary: Development headers for xfce4-panel
@@ -79,12 +79,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
                                                                                           
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-10.rc
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
@@ -105,13 +111,18 @@
 %{_datadir}/applications/xfce4-panel-manager.desktop
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root,root,-)
 %{_libdir}/pkgconfig/*
 %{_libdir}/libxfce4panel.so
 %{_datadir}/gtk-doc/html/libxfce4panel
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Add period to description
+- Fix defattr
+- Add gtk-update-icon-cache in post/postun
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
 - Add Requires for mousepad and Terminal
 - Bump for devel checkin



From fedora-extras-commits at redhat.com  Fri Oct  6 02:27:27 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:27:27 -0700
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec,1.12,1.13
Message-ID: <200610060227.k962RTuJ016967@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16943

Modified Files:
	gtk-xfce-engine.spec 
Log Message:
Fix defattr



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gtk-xfce-engine.spec	5 Oct 2006 02:13:53 -0000	1.12
+++ gtk-xfce-engine.spec	6 Oct 2006 02:27:27 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
 Version: 2.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/gtk-xfce-engine-2.3.99.1.tar.bz2
@@ -29,12 +29,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README COPYING AUTHORS
 %{_libdir}/gtk-2.0/2.10.0/engines
 %{_datadir}/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 2.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 02:27:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:27:51 -0700
Subject: rpms/libsmi - New directory
Message-ID: <200610060227.k962RrgF017061@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17035/libsmi

Log Message:
Directory /cvs/extras/rpms/libsmi added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 02:27:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:27:51 -0700
Subject: rpms/libsmi/devel - New directory
Message-ID: <200610060227.k962Rrcw017064@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17035/libsmi/devel

Log Message:
Directory /cvs/extras/rpms/libsmi/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 02:28:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:28:06 -0700
Subject: rpms/libsmi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610060228.k962S88g017113@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17080

Added Files:
	Makefile import.log 
Log Message:
Setup of module libsmi


--- NEW FILE Makefile ---
# Top level Makefile for module libsmi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 02:28:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:28:07 -0700
Subject: rpms/libsmi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610060228.k962S9WM017116@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17080/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libsmi


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 02:28:55 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:28:55 -0700
Subject: rpms/libsmi import.log,1.1,1.2
Message-ID: <200610060228.k962Sv6f017184@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17150

Modified Files:
	import.log 
Log Message:
auto-import libsmi-0.4.5-2 on branch devel from libsmi-0.4.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsmi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 02:28:06 -0000	1.1
+++ import.log	6 Oct 2006 02:28:55 -0000	1.2
@@ -0,0 +1 @@
+libsmi-0_4_5-2:HEAD:libsmi-0.4.5-2.src.rpm:1160101728



From fedora-extras-commits at redhat.com  Fri Oct  6 02:28:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:28:56 -0700
Subject: rpms/libsmi/devel libsmi.spec, NONE, 1.1 smi.conf, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610060228.k962SwOc017189@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17150/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libsmi.spec smi.conf 
Log Message:
auto-import libsmi-0.4.5-2 on branch devel from libsmi-0.4.5-2.src.rpm


--- NEW FILE libsmi.spec ---
Name:           libsmi
Version:        0.4.5
Release:        2%{?dist}
Summary:        A library to access SMI MIB information

Group:          System Environment/Libraries
License:        BSD
URL:            http://www.ibr.cs.tu-bs.de/projects/libsmi/index.html
Source0:        ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/%{name}-%{version}.tar.gz
Source1:        smi.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtool
BuildRequires:  flex, bison
Requires:       gawk, wget

%description
Libsmi is a C library to access MIB module information through
a well defined API that hides the nasty details of locating
and parsing SMIv1/v2 MIB modules.

This package contains tools to check, dump, and convert MIB
definitions and a steadily maintained and revised archive
of all IETF and IANA maintained standard MIB modules.


%package devel
Summary:        Development environment for libsmi library
Group:          Development/Libraries
Requires:       %name = %version-%release
Requires:       automake
Requires:       pkgconfig

%description devel
Libsmi is a C library to access MIB module information through
a well defined API that hides the nasty details of locating
and parsing SMIv1/v2 MIB modules.

This package contains development files needed to develop
libsmi-based applications.


%prep
%setup -q


%build
%configure \
    --enable-smi \
    --enable-sming \
    --enable-shared \
    --disable-static
LIBTOOL=/usr/bin/libtool make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/smi.conf

rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la


%check
# fails a couple of tests (2 in {0.4.4, 0.4.5})
make check ||:


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%doc ANNOUNCE ChangeLog COPYING README THANKS TODO
%doc doc/draft-irtf-nmrg-sming-02.txt smi.conf-example
%config(noreplace) %{_sysconfdir}/smi.conf
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/mibs/
%{_datadir}/pibs/
%{_mandir}/man1/*.1*

%files devel
%{_datadir}/aclocal/libsmi.m4
%{_libdir}/pkgconfig/libsmi.pc
%{_libdir}/*.so
%{_includedir}/*
%{_mandir}/man3/*.3*


%changelog
* Fri Oct  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.4.5-2
- Handle rpath problems in 64-bit systems (#209522).

* Mon May 29 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.4.5-1
- Update to 0.4.5.

* Wed May 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.4.4-1
- Update to 0.4.4.

* Fri Apr  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.4.3-1
- First build.

# vim:set ai ts=4 sw=4 sts=4 et:


--- NEW FILE smi.conf ---
#
# smi.conf - Global/User SMI configuration file.
#
# See smi_config(3) for detailed information on configuration files.
#

# Extend (note the semicolon) the libsmi default module search path.
#path :/usr/local/share/mibs/sun
#path :/usr/local/share/mibs/cisco

# Add a private directory.
#path :/home/strauss/lib/mibs

# EXPERIMENTAL: Add a caching method (works only on UNIX systems). 
# NOTE: the cache directory must exist and permissions must be
# handled appropriately. A simple but insecure way is to apply
# a tmp flag to the directory (chmod 1777 /usr/local/share/mibs/cache).
#cache /usr/local/share/mibs/cache /usr/local/bin/smicache -d /usr/local/share/mibs/cache -p http://www.ibr.cs.tu-bs.de/projects/libsmi/smicache/

# Don't show any errors by default.
level 0

# Preload some basic SMIv2 modules.
load SNMPv2-SMI
load SNMPv2-TC
load SNMPv2-CONF

# Make smilint shout loud to report all errors and warnings.
smilint: level 9

# But please don't claim about any names longer than 32 chars.
# (note: this is the prefix of errors `namelength-32-module,
#  -type, -object, -enumeration, and -bit)
smilint: hide namelength-32

# Preloading some more modules for special applications.
tcpdump: load DISMAN-SCRIPT-MIB
tcpdump: load IF-MIB
smiquery: load IF-MIB



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsmi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 02:28:07 -0000	1.1
+++ .cvsignore	6 Oct 2006 02:28:56 -0000	1.2
@@ -0,0 +1 @@
+libsmi-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsmi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 02:28:07 -0000	1.1
+++ sources	6 Oct 2006 02:28:56 -0000	1.2
@@ -0,0 +1 @@
+c904b124bcaad692e04fdf2f0cff38bb  libsmi-0.4.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 02:30:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:30:59 -0700
Subject: owners owners.list,1.1781,1.1782
Message-ID: <200610060231.k962V1PZ017298@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17281

Modified Files:
	owners.list 
Log Message:
New package: libsmi (#209522)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1781
retrieving revision 1.1782
diff -u -r1.1781 -r1.1782
--- owners.list	6 Oct 2006 01:13:05 -0000	1.1781
+++ owners.list	6 Oct 2006 02:30:59 -0000	1.1782
@@ -926,6 +926,7 @@
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|libsmi|A library to access SMI MIB information|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|libspectrum|The ZX Spectrum library required for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at



From fedora-extras-commits at redhat.com  Fri Oct  6 02:31:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Oct 2006 19:31:49 -0700
Subject: rpms/libsmi/devel libsmi.spec,1.1,1.2
Message-ID: <200610060231.k962Vp3i017327@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/libsmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17310

Modified Files:
	libsmi.spec 
Log Message:
LIBTOOL is a make variable


Index: libsmi.spec
===================================================================
RCS file: /cvs/extras/rpms/libsmi/devel/libsmi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsmi.spec	6 Oct 2006 02:28:56 -0000	1.1
+++ libsmi.spec	6 Oct 2006 02:31:49 -0000	1.2
@@ -50,7 +50,7 @@
     --enable-sming \
     --enable-shared \
     --disable-static
-LIBTOOL=/usr/bin/libtool make %{?_smp_mflags}
+make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 
 
 %install



From fedora-extras-commits at redhat.com  Fri Oct  6 02:36:53 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:36:53 -0700
Subject: rpms/exo/devel exo.spec,1.17,1.18
Message-ID: <200610060236.k962atRm017402@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17385

Modified Files:
	exo.spec 
Log Message:
Added gtk-update-icon-cache



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- exo.spec	5 Oct 2006 02:19:43 -0000	1.17
+++ exo.spec	6 Oct 2006 02:36:53 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.10
-Release: 0.4.rc1%{?dist}
+Release: 0.5.rc1%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
@@ -65,9 +65,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
 
 %files -f libexo-0.3.lang
 %defattr(-,root,root,-)
@@ -105,6 +111,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.5.rc1
+- Added gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.4.rc1
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 02:50:50 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 19:50:50 -0700
Subject: rpms/Terminal/devel Terminal.spec,1.12,1.13
Message-ID: <200610060250.k962oq70017535@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17518

Modified Files:
	Terminal.spec 
Log Message:
Added gtk-update-icon-cache to post/postun



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Terminal.spec	5 Oct 2006 02:29:30 -0000	1.12
+++ Terminal.spec	6 Oct 2006 02:50:50 -0000	1.13
@@ -32,6 +32,14 @@
 %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 -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS HACKING THANKS
@@ -52,6 +60,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.4.rc1
+- Added gtk-update-icon-cache to post/postun
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.5.6-0.3.rc1
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 03:00:43 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 20:00:43 -0700
Subject: rpms/mousepad/devel mousepad.spec,1.2,1.3
Message-ID: <200610060300.k9630j1b017649@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mousepad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17632

Modified Files:
	mousepad.spec 
Log Message:
Fix typo in description



Index: mousepad.spec
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/mousepad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mousepad.spec	5 Oct 2006 03:16:03 -0000	1.2
+++ mousepad.spec	6 Oct 2006 03:00:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mousepad
 Version:        0.2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mousepad - A simple text editor for Xfce
 
 Group:          Applications/Editors
@@ -19,7 +19,7 @@
 Mousepad was to provide printing support, which would have been difficult
 for Leafpad for various reasons.
 
-Although some features are under development, currently Mousepad has folowing
+Although some features are under development, currently Mousepad has following
 features:
 
     * Complete support for UTF-8 text
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/* 
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.8-2
+- Fix typo in description 
+
 * Sun Sep  3 2006 Kevin Fenzi <kevin at tummy.com> - 0.2.8-1
 - Update to 0.2.8
 



From fedora-extras-commits at redhat.com  Fri Oct  6 03:08:33 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu,  5 Oct 2006 20:08:33 -0700
Subject: rpms/spandsp/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 spandsp.spec, 1.1, 1.2
Message-ID: <200610060308.k9638Zhq020675@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20653

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre23


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 13:00:42 -0000	1.2
+++ .cvsignore	6 Oct 2006 03:08:33 -0000	1.3
@@ -1 +1 @@
-spandsp-0.0.2pre26.tar.gz
+spandsp-0.0.3pre23.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 13:00:42 -0000	1.2
+++ sources	6 Oct 2006 03:08:33 -0000	1.3
@@ -1 +1 @@
-2b28a75b1d7c49616534bd7264317241  spandsp-0.0.2pre26.tar.gz
+09a2b0b8c53923fd7351a2026fa0c2ff  spandsp-0.0.3pre23.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spandsp.spec	5 Oct 2006 13:00:42 -0000	1.1
+++ spandsp.spec	6 Oct 2006 03:08:33 -0000	1.2
@@ -1,13 +1,13 @@
-%define pre 26
+%define pre 23
 
 Summary: A DSP library for telephony
 Name: spandsp
-Version: 0.0.2
+Version: 0.0.3
 Release: 1%{?pre:.pre%{pre}}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
-Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}/spandsp-%{version}%{?pre:pre%{pre}}.tar.gz
+Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtiff-devel
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.0.3-1.pre23
+- Update to 0.0.3pre23
+
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> - 0.0.2-1.pre26
 - Update to 0.0.2pre26
 



From fedora-extras-commits at redhat.com  Fri Oct  6 03:51:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 20:51:32 -0700
Subject: rpms/exo/devel exo.spec,1.18,1.19
Message-ID: <200610060351.k963pYiN020908@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20888

Modified Files:
	exo.spec 
Log Message:
Added libxfce4util-devel Requires for the devel package



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- exo.spec	6 Oct 2006 02:36:53 -0000	1.18
+++ exo.spec	6 Oct 2006 03:51:31 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.10
-Release: 0.5.rc1%{?dist}
+Release: 0.6.rc1%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
@@ -29,6 +29,7 @@
 Summary: Development tools for exo library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: libxfce4util-devel
 
 %description devel
 Static libraries and header files for the exo library.
@@ -111,6 +112,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.6.rc1
+- Added libxfce4util-devel Requires for the devel package
+
 * Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.1.10-0.5.rc1
 - Added gtk-update-icon-cache
 



From fedora-extras-commits at redhat.com  Fri Oct  6 05:29:21 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 22:29:21 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.14,1.15
Message-ID: <200610060529.k965TNln027819@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27802

Modified Files:
	xfce4-panel.spec 
Log Message:
Add Requires libxfcegui4-devel to devel package



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfce4-panel.spec	6 Oct 2006 02:15:59 -0000	1.14
+++ xfce4-panel.spec	6 Oct 2006 05:29:20 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
@@ -55,6 +55,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: libxfce4util-devel = %{version}
+Requires: libxfcegui4-devel = %{version}
 
 %description devel
 This package includes the header files you will need to build
@@ -118,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Add Requires libxfcegui4-devel to devel package
+
 * Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
 - Add period to description
 - Fix defattr



From fedora-extras-commits at redhat.com  Fri Oct  6 05:49:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 22:49:18 -0700
Subject: rpms/xfce4-battery-plugin/devel LGPL.xfce4-battery-plugin, NONE,
	1.1 LGPL, 1.1, NONE
Message-ID: <200610060549.k965nKvV028101@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28085

Added Files:
	LGPL.xfce4-battery-plugin 
Removed Files:
	LGPL 
Log Message:
rename LGPL to LGPL.xfce4-battery-plugin


--- NEW FILE LGPL.xfce4-battery-plugin ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS


--- LGPL DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 05:56:08 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 22:56:08 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.3,1.4
Message-ID: <200610060556.k965uApK028251@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28234

Modified Files:
	Thunar.spec 
Log Message:
Really re-enable the trash plugin.



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Thunar.spec	5 Oct 2006 02:24:48 -0000	1.3
+++ Thunar.spec	6 Oct 2006 05:56:08 -0000	1.4
@@ -63,10 +63,6 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/thunarx-1/*.la
 
-# remove the tpa plugin and desktop if it's present. 
-rm -f $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins/thunar-tpa
-rm -f $RPM_BUILD_ROOT/%{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop
-
 %find_lang Thunar
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-bulk-rename.desktop
@@ -162,6 +158,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct 05 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.8.rc1
+- Really re-enable the trash plugin. 
+
 * Thu Oct 05 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.7.rc1
 - Re-enable trash plugin in Xfce 4.4rc1
 



From fedora-extras-commits at redhat.com  Fri Oct  6 05:57:08 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 22:57:08 -0700
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec,1.9,1.10
Message-ID: <200610060557.k965vAE4028317@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28300

Modified Files:
	xfce4-appfinder.spec 
Log Message:
Add period to description
Fix defattr
Add gtk-update-icon-cache



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-appfinder.spec	5 Oct 2006 02:34:54 -0000	1.9
+++ xfce4-appfinder.spec	6 Oct 2006 05:57:08 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-appfinder-4.3.99.1.tar.bz2
@@ -13,7 +13,7 @@
 BuildRequires: gettext intltool
 
 %description
-xfce-appfinder shows system wide installed applications
+xfce-appfinder shows system wide installed applications.
 
 %prep
 %setup -q
@@ -31,8 +31,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO ChangeLog COPYING AUTHORS
 %{_bindir}/xfce4-appfinder
 %{_datadir}/applications/xfce4-appfinder.desktop
@@ -41,6 +49,11 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add period to description
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 05:59:03 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 22:59:03 -0700
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec,1.10,1.11
Message-ID: <200610060559.k965x5ru028383@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28366

Modified Files:
	xfce4-icon-theme.spec 
Log Message:
Fix defattr



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-icon-theme.spec	5 Oct 2006 02:38:12 -0000	1.10
+++ xfce4-icon-theme.spec	6 Oct 2006 05:59:03 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2
@@ -31,12 +31,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %{_datadir}/*
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr 
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:03:30 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:03:30 -0700
Subject: rpms/python-turbojson/devel - New directory
Message-ID: <200610060603.k9663WNF031413@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31382/python-turbojson/devel

Log Message:
Directory /cvs/extras/rpms/python-turbojson/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 06:03:29 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:03:29 -0700
Subject: rpms/python-turbojson - New directory
Message-ID: <200610060603.k9663VLY031405@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31382/python-turbojson

Log Message:
Directory /cvs/extras/rpms/python-turbojson added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 06:03:50 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:03:50 -0700
Subject: rpms/python-turbojson/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610060603.k9663qvY031499@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31464/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-turbojson


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 06:03:48 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:03:48 -0700
Subject: rpms/python-turbojson Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610060603.k9663oao031493@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31464

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-turbojson


--- NEW FILE Makefile ---
# Top level Makefile for module python-turbojson
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 06:04:15 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:04:15 -0700
Subject: rpms/python-turbojson/devel python-turbojson.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610060604.k9664HG3031602@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-turbojson.spec 
Log Message:
auto-import python-turbojson-0.9.9-2 on branch devel from python-turbojson-0.9.9-2.src.rpm


--- NEW FILE python-turbojson.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%define module turbojson

Name:           python-turbojson
Version:        0.9.9
Release:        2%{?dist}
Summary:        Python template plugin that supports json

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org/docs/plugins/template.html
Source0:        http://files.turbogears.org/eggs/TurboJson-%{version}-py2.4.egg
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

%description
This package provides a template engine plugin, allowing you
to easily use Json with TurboGears, Buffet or other systems
that support python.templating.engines.


%prep
%setup -q -c


%build


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/%{module}
mkdir -p %{buildroot}%{python_sitelib}/%{module}/tests
install -p -m 0644 %{module}/*.py %{buildroot}%{python_sitelib}/%{module}
install -p -m 0644 %{module}/tests/*.py %{buildroot}%{python_sitelib}/%{module}/tests
mkdir -p %{buildroot}%{python_sitelib}/TurboJson-%{version}-py%{pyver}.egg-info
install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TurboJson-%{version}-py%{pyver}.egg-info

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{python_sitelib}/%{module}/
%{python_sitelib}/TurboJson-%{version}-py%{pyver}.egg-info


%changelog
* Fri Oct  6 2006 Luke Macken <lmacken at redhat.com> 0.9.9-2
- Update source url

* Mon Sep 25 2006 Luke Macken <lmacken at redhat.com> 0.9.9-1
- 0.9.9
- Rename to python-turbojson
- Own the %%{python_sitelib/turbojson directory
- Install the EGG-INFO

* Sat Sep 16 2006 Luke Macken <lmacken at redhat.com> 0.9.8-1
- Initial creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-turbojson/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 06:03:49 -0000	1.1
+++ .cvsignore	6 Oct 2006 06:04:14 -0000	1.2
@@ -0,0 +1 @@
+TurboJson-0.9.9-py2.4.egg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-turbojson/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 06:03:49 -0000	1.1
+++ sources	6 Oct 2006 06:04:14 -0000	1.2
@@ -0,0 +1 @@
+d8053e4b4e7920305bb6a96bfba23164  TurboJson-0.9.9-py2.4.egg



From fedora-extras-commits at redhat.com  Fri Oct  6 06:04:13 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:04:13 -0700
Subject: rpms/python-turbojson import.log,1.1,1.2
Message-ID: <200610060604.k9664jdX031610@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbojson
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567

Modified Files:
	import.log 
Log Message:
auto-import python-turbojson-0.9.9-2 on branch devel from python-turbojson-0.9.9-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-turbojson/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 06:03:48 -0000	1.1
+++ import.log	6 Oct 2006 06:04:13 -0000	1.2
@@ -0,0 +1 @@
+python-turbojson-0_9_9-2:HEAD:python-turbojson-0.9.9-2.src.rpm:1160114771



From fedora-extras-commits at redhat.com  Fri Oct  6 06:04:58 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:04:58 -0700
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.10,1.11
Message-ID: <200610060605.k9665U7n031664@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31642

Modified Files:
	xfce4-mixer.spec 
Log Message:
Fix defattr
Add period to the end of description
Add gtk-update-icon-cache



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-mixer.spec	5 Oct 2006 02:44:00 -0000	1.10
+++ xfce4-mixer.spec	6 Oct 2006 06:04:58 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-mixer-4.3.99.1.tar.bz2
@@ -18,7 +18,7 @@
 BuildRequires: gettext intltool
 
 %description
-Volume control plugin for the Xfce 4 panel
+Volume control plugin for the Xfce 4 panel.
 
 %prep
 %setup -q
@@ -37,8 +37,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO ChangeLog NOTES COPYING AUTHORS NEWS
 %{_bindir}/xfce4-mixer
 %{_libdir}/xfce4/*
@@ -48,6 +56,11 @@
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+- Add period to the end of description
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:06:12 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:06:12 -0700
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.11,1.12
Message-ID: <200610060606.k9666EtO031728@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31711

Modified Files:
	xfce4-session.spec 
Log Message:
Fix defattr
Add gtk-update-icon-cache



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-session.spec	5 Oct 2006 02:53:42 -0000	1.11
+++ xfce4-session.spec	6 Oct 2006 06:06:11 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.3.99.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-session-4.3.99.1.tar.bz2
@@ -60,12 +60,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
@@ -93,20 +99,24 @@
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/xfce4/xfce4-session-4.2/libxfsm/*.h
 %{_libdir}/lib*.so
 %{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
 
 %files engines
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/themes/Default/balou/*
 %{_libdir}/xfce4/splash/engines/libbalou.*
 %{_libdir}/xfce4/splash/engines/libsimple.*
 %{_libexecdir}/balou-*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:08:29 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu,  5 Oct 2006 23:08:29 -0700
Subject: rpms/xfce4-cpugraph-plugin/devel xfce4-cpugraph-plugin.spec, 1.6,
	1.7
Message-ID: <200610060608.k9668VFu031853@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31836

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
correct sources version mismatch 0.3 -> 0.3.0


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-cpugraph-plugin.spec	5 Oct 2006 12:11:40 -0000	1.6
+++ xfce4-cpugraph-plugin.spec	6 Oct 2006 06:08:29 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		xfce4-cpugraph-plugin
-Version:	0.3
+Version:	0.3.0
 Release:	3%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
@@ -39,14 +39,14 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-3
+* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3-2
+* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 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-1
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 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



From fedora-extras-commits at redhat.com  Fri Oct  6 06:08:38 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:08:38 -0700
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.10,1.11
Message-ID: <200610060608.k9668exM031876@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31859

Modified Files:
	xfce-mcs-plugins.spec 
Log Message:
Fix defattr



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce-mcs-plugins.spec	5 Oct 2006 02:56:40 -0000	1.10
+++ xfce-mcs-plugins.spec	6 Oct 2006 06:08:38 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2
@@ -42,7 +42,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc README COPYING AUTHORS
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
@@ -54,6 +54,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:12:21 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  5 Oct 2006 23:12:21 -0700
Subject: owners owners.list,1.1782,1.1783
Message-ID: <200610060612.k966CNgT032056@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32039

Modified Files:
	owners.list 
Log Message:
own python-turbojson


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1782
retrieving revision 1.1783
diff -u -r1.1782 -r1.1783
--- owners.list	6 Oct 2006 02:30:59 -0000	1.1782
+++ owners.list	6 Oct 2006 06:12:21 -0000	1.1783
@@ -1880,6 +1880,7 @@
 Fedora Extras|python-telepathy|Python libraries for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-TestGears|Unit testing for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 06:16:57 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:16:57 -0700
Subject: rpms/xfce-utils/devel xfce-utils.spec,1.11,1.12
Message-ID: <200610060616.k966Gx43032124@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32107

Modified Files:
	xfce-utils.spec 
Log Message:
Fix defattr



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce-utils.spec	5 Oct 2006 03:00:52 -0000	1.11
+++ xfce-utils.spec	6 Oct 2006 06:16:57 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-utils-4.3.99.1.tar.bz2
@@ -53,7 +53,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %attr(0755,root,root) %{_sysconfdir}/xdg/xfce4
 %{_bindir}/*
@@ -81,6 +81,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:20:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:20:34 -0700
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.13,1.14
Message-ID: <200610060620.k966KalF032282@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32258

Modified Files:
	xfdesktop.spec 
Log Message:
Fix defattr
Add period to the end of description
Add gtk-update-icon-cache



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfdesktop.spec	5 Oct 2006 03:04:46 -0000	1.13
+++ xfdesktop.spec	6 Oct 2006 06:20:34 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfdesktop-4.3.99.1.tar.bz2
@@ -30,7 +30,7 @@
 BuildRequires: dbus-devel
 
 %description
-This package includes a desktop manager for the XFce Desktop Environment
+This package includes a desktop manager for the XFce Desktop Environment.
 
 %prep
 %setup -q
@@ -55,8 +55,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_sysconfdir}/xdg/xfce4/*
 %{_bindir}/*
@@ -73,6 +81,11 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Fix defattr
+- Add period to the end of description
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:25:42 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:25:42 -0700
Subject: rpms/xfdesktop/devel xfdesktop-image-4.3.90.1.patch,NONE,1.1
Message-ID: <200610060625.k966PiO5032548@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32530

Added Files:
	xfdesktop-image-4.3.90.1.patch 
Log Message:
Change default backdrop patch


xfdesktop-image-4.3.90.1.patch:

--- NEW FILE xfdesktop-image-4.3.90.1.patch ---
diff -Nur xfdesktop-4.3.90.1.orig/common/xfdesktop-common.h xfdesktop-4.3.90.1/common/xfdesktop-common.h
--- xfdesktop-4.3.90.1.orig/common/xfdesktop-common.h	2006-04-16 08:47:24.000000000 -0600
+++ xfdesktop-4.3.90.1/common/xfdesktop-common.h	2006-05-08 22:24:56.000000000 -0600
@@ -31,7 +31,8 @@
 #include <X11/Xlib.h>
 
 #define BACKDROP_CHANNEL         "BACKDROP"
-#define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-smoke.png"
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP         DATADIR "/backgrounds/images/default.png"
 #define LIST_TEXT                "# xfce backdrop list"
 #define XFDESKTOP_SELECTION_FMT  "XFDESKTOP_SELECTION_%d"
 #define XFDESKTOP_IMAGE_FILE_FMT "XFDESKTOP_IMAGE_FILE_%d"



From fedora-extras-commits at redhat.com  Fri Oct  6 06:31:05 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:31:05 -0700
Subject: rpms/xfprint/devel xfprint.spec,1.14,1.15
Message-ID: <200610060631.k966V7dv000312@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32763

Modified Files:
	xfprint.spec 
Log Message:
Fix defattr
Add gtk-update-icon-cache



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfprint.spec	5 Oct 2006 03:07:51 -0000	1.14
+++ xfprint.spec	6 Oct 2006 06:31:05 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://www.xfce.org
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfprint-4.3.99.1.tar.bz2
@@ -55,12 +55,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/xfce4/mcs-plugins
@@ -78,6 +84,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:33:27 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:33:27 -0700
Subject: rpms/xfwm4/devel xfwm4.spec,1.15,1.16
Message-ID: <200610060633.k966XTu1000380@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv362

Modified Files:
	xfwm4.spec 
Log Message:
Fix defattr
Add gtk-update-icon-cache



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfwm4.spec	5 Oct 2006 03:11:10 -0000	1.15
+++ xfwm4.spec	6 Oct 2006 06:33:27 -0000	1.16
@@ -1,15 +1,11 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2
 
-# Change default for Fedora
-#Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch
-#Patch1: xfwm4-bluecurve.patch
-
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,9 +30,6 @@
 %prep
 %setup -q
 
-#%patch0 -p1 -b .bluecurve-prep
-#%patch1 -p1 -b .bluecurve
-
 %build
 %configure
 
@@ -54,8 +47,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
 %{_bindir}/xfwm4
 %{_libdir}/xfce4/mcs-plugins/*
@@ -68,6 +69,10 @@
 %{_datadir}/themes
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:35:01 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:35:01 -0700
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec,1.9,1.10
Message-ID: <200610060635.k966Z3jb000447@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv430

Modified Files:
	xfwm4-themes.spec 
Log Message:
Fix defattr



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfwm4-themes.spec	5 Oct 2006 03:13:39 -0000	1.9
+++ xfwm4-themes.spec	6 Oct 2006 06:35:01 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
 Version: 4.3.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-themes-4.3.99.1.tar.bz2
@@ -30,11 +30,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO COPYING AUTHORS
 %{_datadir}/themes
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Fix defattr
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 06:37:23 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu,  5 Oct 2006 23:37:23 -0700
Subject: rpms/orage/devel orage.spec,1.1,1.2
Message-ID: <200610060637.k966bP6k000522@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv505

Modified Files:
	orage.spec 
Log Message:
Add period at the end of description. 
Fix defattr
Add gtk-update-icon-cache



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- orage.spec	5 Oct 2006 03:32:29 -0000	1.1
+++ orage.spec	6 Oct 2006 06:37:23 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: orage
 Version: 4.3.99.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
@@ -23,7 +23,7 @@
 Obsoletes: xfce4-datetime-plugin <= 4.2.3-3
 
 %description
-Time-managing application for Xfce4
+Time-managing application for Xfce4.
 
 %prep
 %setup -q
@@ -50,8 +50,16 @@
 %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 -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog COPYING AUTHORS
 %{_bindir}/orage
 %{_libdir}/xfce4/mcs-plugins/orage_plugin.so
@@ -64,6 +72,11 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
+- Add period at the end of description. 
+- Fix defattr
+- Add gtk-update-icon-cache
+
 * Wed Oct  4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
 - Bump release for devel checkin
 



From fedora-extras-commits at redhat.com  Fri Oct  6 07:25:09 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  6 Oct 2006 00:25:09 -0700
Subject: rpms/acpitool/FC-5 acpitool.spec,1.9,1.10
Message-ID: <200610060725.k967PBbp003956@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/acpitool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3910/FC-5

Modified Files:
	acpitool.spec 
Log Message:
* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
- set Group to Applications/System (fix #209230)



Index: acpitool.spec
===================================================================
RCS file: /cvs/extras/rpms/acpitool/FC-5/acpitool.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- acpitool.spec	28 Aug 2006 09:40:07 -0000	1.9
+++ acpitool.spec	6 Oct 2006 07:25:09 -0000	1.10
@@ -1,10 +1,10 @@
 Name: acpitool
 Version: 0.4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml
 Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz
 Summary: A command line ACPI client for Linux
-Group: Applications/Internet
+Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,20 +38,23 @@
 %{_mandir}/man1/acpitool*
 
 %changelog
-* Mon Aug 28 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.6-1
+* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
+- set Group to Applications/System (fix #209230)
+
+* Mon Aug 28 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-1
 - update to 0.4.6
 
-* Sun May 21 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.5-1
+* Sun May 21 2006 Patrice Dumas <pertusus at free.fr> 0.4.5-1
 - update to 0.4.5
 
-* Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.4-1.1
+* Thu Feb 16 2006 Patrice Dumas <pertusus at free.fr> 0.4.4-1.1
 - new version
 - remove now unneeded patch
 
-* Thu Nov 10 2005 Patrice Dumas <dumas at centre-cired.fr> - 0.3.0-3
+* Thu Nov 10 2005 Patrice Dumas <pertusus at free.fr> 0.3.0-3
 - add patch to avoid ignoring CXXFLAGS
 
-* Fri Nov  4 2005 Patrice Dumas <dumas at centre-cired.fr> - 0.3.0-2
+* Fri Nov  4 2005 Patrice Dumas <pertusus at free.fr> 0.3.0-2
 - update using fedora core conventions, some cleanings
 
 * Tue Aug 24 2004 Robert Ambrose <rna at muttsoft.com>



From fedora-extras-commits at redhat.com  Fri Oct  6 07:25:10 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  6 Oct 2006 00:25:10 -0700
Subject: rpms/acpitool/devel acpitool.spec,1.7,1.8
Message-ID: <200610060725.k967PCeA003960@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/acpitool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3910/devel

Modified Files:
	acpitool.spec 
Log Message:
* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
- set Group to Applications/System (fix #209230)



Index: acpitool.spec
===================================================================
RCS file: /cvs/extras/rpms/acpitool/devel/acpitool.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- acpitool.spec	28 Aug 2006 09:38:48 -0000	1.7
+++ acpitool.spec	6 Oct 2006 07:25:10 -0000	1.8
@@ -1,10 +1,10 @@
 Name: acpitool
 Version: 0.4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml
 Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz
 Summary: A command line ACPI client for Linux
-Group: Applications/Internet
+Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,20 +38,23 @@
 %{_mandir}/man1/acpitool*
 
 %changelog
-* Mon Aug 28 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.6-1
+* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
+- set Group to Applications/System (fix #209230)
+
+* Mon Aug 28 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-1
 - update to 0.4.6
 
-* Sun May 21 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.5-1
+* Sun May 21 2006 Patrice Dumas <pertusus at free.fr> 0.4.5-1
 - update to 0.4.5
 
-* Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.4-1.1
+* Thu Feb 16 2006 Patrice Dumas <pertusus at free.fr> 0.4.4-1.1
 - new version
 - remove now unneeded patch
 
-* Thu Nov 10 2005 Patrice Dumas <dumas at centre-cired.fr> - 0.3.0-3
+* Thu Nov 10 2005 Patrice Dumas <pertusus at free.fr> 0.3.0-3
 - add patch to avoid ignoring CXXFLAGS
 
-* Fri Nov  4 2005 Patrice Dumas <dumas at centre-cired.fr> - 0.3.0-2
+* Fri Nov  4 2005 Patrice Dumas <pertusus at free.fr> 0.3.0-2
 - update using fedora core conventions, some cleanings
 
 * Tue Aug 24 2004 Robert Ambrose <rna at muttsoft.com>



From fedora-extras-commits at redhat.com  Fri Oct  6 07:25:08 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  6 Oct 2006 00:25:08 -0700
Subject: rpms/acpitool/FC-3 acpitool.spec,1.4,1.5
Message-ID: <200610060725.k967PeuH003963@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/acpitool/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3910/FC-3

Modified Files:
	acpitool.spec 
Log Message:
* Fri Oct  6 2006 Patrice Dumas <pertusus at free.fr> 0.4.6-2
- set Group to Applications/System (fix #209230)



Index: acpitool.spec
===================================================================
RCS file: /cvs/extras/rpms/acpitool/FC-3/acpitool.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- acpitool.spec	21 May 2006 14:18:16 -0000	1.4
+++ acpitool.spec	6 Oct 2006 07:25:08 -0000	1.5
@@ -38,7 +38,7 @@
 %{_mandir}/man1/acpitool*
 
 %changelog
-* Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.5-1
+* Sun May 21 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.5-1
 - update to 0.4.5
 
 * Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.4.4-1.1



From fedora-extras-commits at redhat.com  Fri Oct  6 07:27:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  6 Oct 2006 00:27:53 -0700
Subject: rpms/xfce4-modemlights-plugin/devel dead.package, NONE, 1.1 Makefile,
	1.1, NONE sources, 1.2, NONE xfce4-modemlights-plugin.spec, 1.8, NONE
Message-ID: <200610060727.k967Ruwg004076@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4059

Added Files:
	dead.package 
Removed Files:
	Makefile sources xfce4-modemlights-plugin.spec 
Log Message:
orphaning modemlights-plugin for XFCE 4.4


--- NEW FILE dead.package ---
modemlighst plugin is not ported to XFCE 4.4 and seems to be orphande upstream.

--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-modemlights-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 07:30:40 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri,  6 Oct 2006 00:30:40 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.4,1.5
Message-ID: <200610060730.k967UgSH004150@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4126

Modified Files:
	Thunar.spec 
Log Message:
Obsolete xffm for now.



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Thunar.spec	6 Oct 2006 05:56:08 -0000	1.4
+++ Thunar.spec	6 Oct 2006 07:30:40 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.7.rc1%{?dist}
+Release: 0.9.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -25,6 +25,10 @@
 BuildRequires: GConf2-devel
 BuildRequires: gtk-doc
 
+# obsolete xffm to allow for smooth upgrades
+Provides: xffm = 4.2.4-1
+Obsoletes: xffm <= 4.2.3-5
+
 %description
 Thunar is a new modern file manager for the Xfce Desktop Environment. 
 It has been designed from the ground up to be fast and easy-to-use. 
@@ -158,6 +162,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct 06 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.9.rc1
+- Obsolete xffm for now. 
+
 * Thu Oct 05 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.8.rc1
 - Really re-enable the trash plugin. 
 



From fedora-extras-commits at redhat.com  Fri Oct  6 07:55:41 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri,  6 Oct 2006 00:55:41 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.15,1.16
Message-ID: <200610060755.k967thGt004371@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4354

Modified Files:
	xfce4-panel.spec 
Log Message:
Tweak Obsolete versions



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfce4-panel.spec	6 Oct 2006 05:29:20 -0000	1.15
+++ xfce4-panel.spec	6 Oct 2006 07:55:41 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.3.99.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
@@ -23,28 +23,28 @@
 BuildRequires: gettext
 # xfce4-iconbox isn't in Xfce 4.4
 Provides: xfce4-iconbox = %{version}-%{release}
-Obsoletes: xfce4-iconbox <= 4.2.3-4
+Obsoletes: xfce4-iconbox <= 4.2.3
 # xfce4-systray isn't in Xfce 4.4
 Provides: xfce4-systray = %{version}-%{release}
-Obsoletes: xfce4-systray <= 4.2.3-3
+Obsoletes: xfce4-systray <= 4.2.3
 # xfce4-toys isn't in Xfce 4.4
 Provides: xfce4-toys = %{version}-%{release}
-Obsoletes: xfce4-toys <= 4.2.3-3
+Obsoletes: xfce4-toys <= 4.2.3
 # xfce4-trigger-launcher isn't in Xfce 4.4
 Provides: xfce4-trigger-launcher = %{version}-%{release}
-Obsoletes: xfce4-trigger-launcher <= 4.2.3-3
+Obsoletes: xfce4-trigger-launcher <= 4.2.3
 # xfce4-modemlights-plugin isn't in Xfce 4.4
 Provides: xfce4-modemlights-plugin = %{version}-%{release}
-Obsoletes: xfce4-modemlights-plugin <= 4.2.3-3
+Obsoletes: xfce4-modemlights-plugin <= 0.1.1
 # xfce4-showdesktop-plugin isn't in Xfce 4.4
 Provides: xfce4-showdesktop-plugin = %{version}-%{release}
-Obsoletes: xfce4-showdesktop-plugin <= 4.2.3-3
+Obsoletes: xfce4-showdesktop-plugin <= 0.4.0
 # xfce4-taskbar-plugin isn't in Xfce 4.4
 Provides: xfce4-taskbar-plugin = %{version}-%{release}
-Obsoletes: xfce4-taskbar-plugin <= 4.2.3-3
+Obsoletes: xfce4-taskbar-plugin <= 0.2.2
 # xfce4-windowlist-plugin isn't in Xfce 4.4
 Provides: xfce4-windowlist-plugin = %{version}-%{release}
-Obsoletes: xfce4-windowlist-plugin <= 4.2.3-3
+Obsoletes: xfce4-windowlist-plugin <= 0.1.0
 
 %description
 This package includes the panel for the Xfce desktop environment.
@@ -119,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Fri Oct  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
+- Tweak Obsolete versions
+
 * Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
 - Add Requires libxfcegui4-devel to devel package
 



From fedora-extras-commits at redhat.com  Fri Oct  6 08:03:44 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  6 Oct 2006 01:03:44 -0700
Subject: fedora-security/audit fc6,1.102,1.103
Message-ID: <200610060803.k9683iEN007294@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7264

Modified Files:
	fc6 
Log Message:
Deal with mysql; this is waiting for an upstream release of 5.0.26 and
therefore will be dealt with after fc6 ships



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fc6	5 Oct 2006 20:55:04 -0000	1.102
+++ fc6	6 Oct 2006 08:03:40 -0000	1.103
@@ -67,8 +67,8 @@
 CVE-2006-4262 backport (cscope) 
 CVE-2006-4253 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
 CVE-2006-4253 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.25,5.1.12) bz#203428 [FC6Blocker]
-CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.25,5.1.12) bz#203434 [FC6Blocker]
+CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203428
+CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203434
 CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
 CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4146 backport (gdb)
@@ -77,7 +77,7 @@
 CVE-2006-4096 backport (bind)
 CVE-2006-4095 backport (bind)
 CVE-2006-4093 version (kernel, fixed 2.6.17.9, fixed 2.6.18-rc5)
-CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) bz#202675 [FC6Blocker]
+CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) bz#202675
 CVE-2006-4020 version (php, fixed 5.1.5)
 CVE-2006-4019 version (squirrelmail, fixed 1.4.8)
 CVE-2006-3918 version (httpd, fixed 2.2.2)



From fedora-extras-commits at redhat.com  Fri Oct  6 08:13:22 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri,  6 Oct 2006 01:13:22 -0700
Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.16,1.17
Message-ID: <200610060813.k968DOeE007447@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7430

Modified Files:
	xfce4-panel.spec 
Log Message:
List full old versions in Obsoletes



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfce4-panel.spec	6 Oct 2006 07:55:41 -0000	1.16
+++ xfce4-panel.spec	6 Oct 2006 08:13:22 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.3.99.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
@@ -23,28 +23,28 @@
 BuildRequires: gettext
 # xfce4-iconbox isn't in Xfce 4.4
 Provides: xfce4-iconbox = %{version}-%{release}
-Obsoletes: xfce4-iconbox <= 4.2.3
+Obsoletes: xfce4-iconbox <= 4.2.3-4.fc6
 # xfce4-systray isn't in Xfce 4.4
 Provides: xfce4-systray = %{version}-%{release}
-Obsoletes: xfce4-systray <= 4.2.3
+Obsoletes: xfce4-systray <= 4.2.3-3.fc6
 # xfce4-toys isn't in Xfce 4.4
 Provides: xfce4-toys = %{version}-%{release}
-Obsoletes: xfce4-toys <= 4.2.3
+Obsoletes: xfce4-toys <= 4.2.3-3.fc6
 # xfce4-trigger-launcher isn't in Xfce 4.4
 Provides: xfce4-trigger-launcher = %{version}-%{release}
-Obsoletes: xfce4-trigger-launcher <= 4.2.3
+Obsoletes: xfce4-trigger-launcher <= 4.2.3-3.fc6
 # xfce4-modemlights-plugin isn't in Xfce 4.4
 Provides: xfce4-modemlights-plugin = %{version}-%{release}
-Obsoletes: xfce4-modemlights-plugin <= 0.1.1
+Obsoletes: xfce4-modemlights-plugin <= 0.1.1-9.fc6
 # xfce4-showdesktop-plugin isn't in Xfce 4.4
 Provides: xfce4-showdesktop-plugin = %{version}-%{release}
-Obsoletes: xfce4-showdesktop-plugin <= 0.4.0
+Obsoletes: xfce4-showdesktop-plugin <= 0.4.0-7.fc6
 # xfce4-taskbar-plugin isn't in Xfce 4.4
 Provides: xfce4-taskbar-plugin = %{version}-%{release}
-Obsoletes: xfce4-taskbar-plugin <= 0.2.2
+Obsoletes: xfce4-taskbar-plugin <= 0.2.2-7.fc6
 # xfce4-windowlist-plugin isn't in Xfce 4.4
 Provides: xfce4-windowlist-plugin = %{version}-%{release}
-Obsoletes: xfce4-windowlist-plugin <= 0.1.0
+Obsoletes: xfce4-windowlist-plugin <= 0.1.0-7.fc6
 
 %description
 This package includes the panel for the Xfce desktop environment.
@@ -119,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Fri Oct  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-7
+- List full old versions in Obsoletes
+
 * Fri Oct  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
 - Tweak Obsolete versions
 



From fedora-extras-commits at redhat.com  Fri Oct  6 08:23:13 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  6 Oct 2006 01:23:13 -0700
Subject: fedora-security/audit fc5,1.347,1.348 fc6,1.103,1.104
Message-ID: <200610060823.k968ND0F007541@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7520

Modified Files:
	fc5 fc6 
Log Message:
A couple of days of updates



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- fc5	5 Oct 2006 20:55:04 -0000	1.347
+++ fc5	6 Oct 2006 08:23:10 -0000	1.348
@@ -1,8 +1,9 @@
-p to date CVE as of CVE email 20061003
-Up to date FC5 as of 20061003
+p to date CVE as of CVE email 20061005
+Up to date FC5 as of 20061005
 
 ** are items that need attention
 
+CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
@@ -10,11 +11,11 @@
 CVE-2006-5158 ** kernel
 CVE-2006-5072 VULNERABLE (mono) #209464
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
-CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) #208458
+CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)
 CVE-2006-4980 VULNERABLE (python) #208166
 CVE-2006-4925 ** openssh
-CVE-2006-4924 VULNERABLE (openssh) #207957
+CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fc6	6 Oct 2006 08:03:40 -0000	1.103
+++ fc6	6 Oct 2006 08:23:10 -0000	1.104
@@ -1,9 +1,10 @@
-Up to date CVE as of CVE email 20061003
+Up to date CVE as of CVE email 20061005
 Up to date FC6 as of Test3
 Up to date dist-fc6 rawhide as of 20060929
 
 ** are items that need attention
 
+CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified



From fedora-extras-commits at redhat.com  Fri Oct  6 08:24:42 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri,  6 Oct 2006 01:24:42 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.5,1.6
Message-ID: <200610060824.k968OiNM007567@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7550

Modified Files:
	Thunar.spec 
Log Message:
Tweak Obsoletes versions



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Thunar.spec	6 Oct 2006 07:30:40 -0000	1.5
+++ Thunar.spec	6 Oct 2006 08:24:42 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.9.rc1%{?dist}
+Release: 0.10.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -26,8 +26,8 @@
 BuildRequires: gtk-doc
 
 # obsolete xffm to allow for smooth upgrades
-Provides: xffm = 4.2.4-1
-Obsoletes: xffm <= 4.2.3-5
+Provides: xffm = 4.2.4
+Obsoletes: xffm <= 4.2.3-5.fc6
 
 %description
 Thunar is a new modern file manager for the Xfce Desktop Environment. 
@@ -162,6 +162,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct 06 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.10.rc1
+- Tweak Obsoletes versions
+
 * Fri Oct 06 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.9.rc1
 - Obsolete xffm for now. 
 



From fedora-extras-commits at redhat.com  Fri Oct  6 09:28:27 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:28:27 -0700
Subject: rpms/guiloader-c++ - New directory
Message-ID: <200610060928.k969STEL016194@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16173/guiloader-c++

Log Message:
Directory /cvs/extras/rpms/guiloader-c++ added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 09:28:27 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:28:27 -0700
Subject: rpms/guiloader-c++/devel - New directory
Message-ID: <200610060928.k969STZH016197@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16173/guiloader-c++/devel

Log Message:
Directory /cvs/extras/rpms/guiloader-c++/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 09:28:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:28:50 -0700
Subject: rpms/guiloader-c++ Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610060928.k969Sqiu016251@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16218

Added Files:
	Makefile import.log 
Log Message:
Setup of module guiloader-c++


--- NEW FILE Makefile ---
# Top level Makefile for module guiloader-c++
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 09:28:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:28:50 -0700
Subject: rpms/guiloader-c++/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610060928.k969Sqte016254@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16218/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module guiloader-c++


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 09:29:58 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:29:58 -0700
Subject: rpms/guiloader-c++ import.log,1.1,1.2
Message-ID: <200610060930.k969U041016325@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290

Modified Files:
	import.log 
Log Message:
auto-import guiloader-c++-2.8.0-2 on branch devel from guiloader-c++-2.8.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 09:28:49 -0000	1.1
+++ import.log	6 Oct 2006 09:29:58 -0000	1.2
@@ -0,0 +1 @@
+guiloader-c++-2_8_0-2:HEAD:guiloader-c++-2.8.0-2.src.rpm:1160126895



From fedora-extras-commits at redhat.com  Fri Oct  6 09:29:59 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:29:59 -0700
Subject: rpms/guiloader-c++/devel guiloader-c++-2.8.0-soversion.patch, NONE, 
	1.1 guiloader-c++.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610060930.k969U1F3016332@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290/devel

Modified Files:
	.cvsignore sources 
Added Files:
	guiloader-c++-2.8.0-soversion.patch guiloader-c++.spec 
Log Message:
auto-import guiloader-c++-2.8.0-2 on branch devel from guiloader-c++-2.8.0-2.src.rpm

guiloader-c++-2.8.0-soversion.patch:

--- NEW FILE guiloader-c++-2.8.0-soversion.patch ---
--- guiloader-c++-2.8.0/guiloader-c++/Makefile.in.orig	2006-09-12 11:01:54.000000000 +0200
+++ guiloader-c++-2.8.0/guiloader-c++/Makefile.in	2006-09-12 11:02:12.000000000 +0200
@@ -208,7 +208,6 @@
 	guiloader-c++_impl.cpp guiloader-c++_impl.h
 
 libguiloader_c___la_LIBADD = $(PKGS_LIBS)
-libguiloader_c___la_LDFLAGS = -no-undefined -avoid-version
 libguiloader_c___la_CPPFLAGS = $(PKGS_CFLAGS) $(GUILOADER_CPP_CFLAGS)
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guiloader-c++.pc


--- NEW FILE guiloader-c++.spec ---
Name:           guiloader-c++
Version:        2.8.0
Release:        2%{?dist}
Summary:        C++ Binding to GuiLoader Library

Group:          System Environment/Libraries
License:        GPL
URL:            http://gideon.sourceforge.net
Source0:        http://dl.sourceforge.net/gideon/%{name}-%{version}.tar.bz2
Patch0:         guiloader-c++-2.8.0-soversion.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  guiloader-devel >= 2.8.0
BuildRequires:  gtkmm24-devel >= 2.8.0


%description
GuiLoader/C++ is a C++ binding to GuiLoader library. It is a
convenience layer that simplifies development of GuiLoader based
applications written in C++ language by introducing exception safety,
binding GTK+ objects defined in GuiXml to C++ variables and type-safe
dynamic connection to signals.


%package devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       guiloader-devel
Requires:       gtkmm24-devel
Requires:       pkgconfig


%description devel
This package contains the header files needed for developing %{name}
applications.


%prep
%setup -q
%patch0 -p1 -b .soversion


%build
%configure --disable-static --disable-dependency-tracking
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README
%{_libdir}/libguiloader*.so.*


%files devel
%defattr(-, root, root, -)
%doc NEWS
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Fri Oct  6 2006 Denis Leroy <denis at poolshark.org> - 2.8.0-2
- Added pkgconfig devel Requires

* Sun Sep  3 2006 Denis Leroy <denis at poolshark.org> - 2.8.0-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 09:28:50 -0000	1.1
+++ .cvsignore	6 Oct 2006 09:29:59 -0000	1.2
@@ -0,0 +1 @@
+guiloader-c++-2.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 09:28:50 -0000	1.1
+++ sources	6 Oct 2006 09:29:59 -0000	1.2
@@ -0,0 +1 @@
+c66f7ef235cbc82f1a0b1dd5cdb14848  guiloader-c++-2.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct  6 09:41:30 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri,  6 Oct 2006 02:41:30 -0700
Subject: owners owners.list,1.1783,1.1784
Message-ID: <200610060941.k969fWdF016430@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16413

Modified Files:
	owners.list 
Log Message:
Added guiloader-c++


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1783
retrieving revision 1.1784
diff -u -r1.1783 -r1.1784
--- owners.list	6 Oct 2006 06:12:21 -0000	1.1783
+++ owners.list	6 Oct 2006 09:41:30 -0000	1.1784
@@ -628,6 +628,7 @@
 Fedora Extras|gtypist|GNU typing tutor|zing at fastmail.fm|extras-qa at fedoraproject.org|
 Fedora Extras|guichan|Portable C++ GUI library for games using Allegro, SDL and OpenGL|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|guiloader|Gideon GuiXml Loader Library|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|guiloader-c++|C++ Binding to GuiLoader Library|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gurlchecker|A GNOME link validity checker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gutenprint|Printer Drivers Package|panemade at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 10:38:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 03:38:48 -0700
Subject: rebuild-scripts - Imported sources
Message-ID: <200610061038.k96AcmwE019666@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19649

Log Message:
Import mass rebuild scripts.

Status:

Vendor Tag:	fedora
Release Tags:	start
		
N rebuild-scripts/nfswatch.spec
N rebuild-scripts/crack/Makefile
N rebuild-scripts/crack/import.log
N rebuild-scripts/crack/devel/crack-chris.patch
N rebuild-scripts/crack/devel/Makefile
N rebuild-scripts/crack/devel/.cvsignore
N rebuild-scripts/crack/devel/sources
N rebuild-scripts/crack/devel/crack.spec
N rebuild-scripts/crack/FC-4/branch
N rebuild-scripts/crack/FC-4/crack-chris.patch
N rebuild-scripts/crack/FC-4/Makefile
N rebuild-scripts/crack/FC-4/.cvsignore
N rebuild-scripts/crack/FC-4/sources
N rebuild-scripts/crack/FC-4/crack.spec
N rebuild-scripts/crack/FC-5/branch
N rebuild-scripts/crack/FC-5/crack-chris.patch
N rebuild-scripts/crack/FC-5/Makefile
N rebuild-scripts/crack/FC-5/.cvsignore
N rebuild-scripts/crack/FC-5/sources
N rebuild-scripts/crack/FC-5/crack.spec
N rebuild-scripts/crack/common/branches
N rebuild-scripts/crack/common/cvs-import.sh
N rebuild-scripts/crack/common/Makefile
N rebuild-scripts/crack/common/Makefile.common
N rebuild-scripts/crack/FC-3/branch
N rebuild-scripts/crack/FC-3/crack-chris.patch
N rebuild-scripts/crack/FC-3/Makefile
N rebuild-scripts/crack/FC-3/.cvsignore
N rebuild-scripts/crack/FC-3/sources
N rebuild-scripts/crack/FC-3/crack.spec
N rebuild-scripts/fedora-security/tools/package-release
N rebuild-scripts/fedora-security/audit/README
N rebuild-scripts/fedora-security/audit/fc5
N rebuild-scripts/fedora-security/audit/fe4
N rebuild-scripts/fedora-security/audit/fc4
N rebuild-scripts/fedora-security/audit/fe5
N rebuild-scripts/gambas/Makefile
N rebuild-scripts/gambas/import.log
N rebuild-scripts/gambas/devel/gambas-1.0.6-gcc4.patch
N rebuild-scripts/gambas/devel/gambas-1.0.6-dont-make-links.patch
N rebuild-scripts/gambas/devel/Makefile
N rebuild-scripts/gambas/devel/.cvsignore
N rebuild-scripts/gambas/devel/gambas.spec
N rebuild-scripts/gambas/devel/sources
N rebuild-scripts/gambas/devel/gambas-1.0.6-noopt.patch
N rebuild-scripts/gambas/common/branches
N rebuild-scripts/gambas/common/cvs-import.sh
N rebuild-scripts/gambas/common/Makefile
N rebuild-scripts/gambas/common/tobuild
N rebuild-scripts/gambas/common/Makefile.common
N rebuild-scripts/SIBsim4/Makefile
N rebuild-scripts/SIBsim4/import.log
N rebuild-scripts/SIBsim4/devel/Makefile
N rebuild-scripts/SIBsim4/devel/.cvsignore
N rebuild-scripts/SIBsim4/devel/sources
N rebuild-scripts/SIBsim4/devel/SIBsim4.spec
N rebuild-scripts/SIBsim4/FC-4/branch
N rebuild-scripts/SIBsim4/FC-4/Makefile
N rebuild-scripts/SIBsim4/FC-4/.cvsignore
N rebuild-scripts/SIBsim4/FC-4/sources
N rebuild-scripts/SIBsim4/FC-4/SIBsim4.spec
N rebuild-scripts/SIBsim4/FC-5/branch
N rebuild-scripts/SIBsim4/FC-5/Makefile
N rebuild-scripts/SIBsim4/FC-5/.cvsignore
N rebuild-scripts/SIBsim4/FC-5/sources
N rebuild-scripts/SIBsim4/FC-5/SIBsim4.spec
N rebuild-scripts/SIBsim4/common/branches
N rebuild-scripts/SIBsim4/common/cvs-import.sh
N rebuild-scripts/SIBsim4/common/Makefile
N rebuild-scripts/SIBsim4/common/Makefile.common
N rebuild-scripts/extras-CVSROOT/modules
N rebuild-scripts/extras-CVSROOT/checkoutlist
N rebuild-scripts/extras-CVSROOT/commit_prep2
N rebuild-scripts/extras-CVSROOT/config
N rebuild-scripts/extras-CVSROOT/Makefile
N rebuild-scripts/extras-CVSROOT/commitinfo
N rebuild-scripts/extras-CVSROOT/cvswrappers
N rebuild-scripts/extras-CVSROOT/taginfo
N rebuild-scripts/extras-CVSROOT/rcsinfo
N rebuild-scripts/extras-CVSROOT/superlog.pl
N rebuild-scripts/extras-CVSROOT/loginfo
N rebuild-scripts/extras-CVSROOT/verifymsg
N rebuild-scripts/extras-CVSROOT/editinfo
N rebuild-scripts/extras-CVSROOT/notify
N rebuild-scripts/rebuild_nag/pkg_nb.txt
N rebuild-scripts/rebuild_nag/lst4.txt
N rebuild-scripts/rebuild_nag/pkg_nb2.txt
N rebuild-scripts/rebuild_nag/pkg3.txt
N rebuild-scripts/rebuild_nag/pkg_nonag.txt
N rebuild-scripts/rebuild_nag/hist.txt
N rebuild-scripts/rebuild_nag/lst3.txt
N rebuild-scripts/rebuild_nag/lst.txt
N rebuild-scripts/rebuild_nag/pkg_sort.txt
N rebuild-scripts/rebuild_nag/not_rebuilt.txt
N rebuild-scripts/rebuild_nag/lst_auto.txt
N rebuild-scripts/rebuild_nag/pkg.txt
N rebuild-scripts/rebuild_nag/rebuildrpms.py
N rebuild-scripts/rebuild_nag/recent.txt
N rebuild-scripts/rebuild_nag/lst5.txt
N rebuild-scripts/rebuild_nag/pkg2.txt
N rebuild-scripts/rebuild_nag/pkg_nag.txt
N rebuild-scripts/rebuild_nag/pkg_noarch.txt
N rebuild-scripts/rebuild_nag/lst2.txt
N rebuild-scripts/nfswatch/Makefile
N rebuild-scripts/nfswatch/import.log
N rebuild-scripts/nfswatch/devel/nfswatch.spec
N rebuild-scripts/nfswatch/devel/Makefile
N rebuild-scripts/nfswatch/devel/.cvsignore
N rebuild-scripts/nfswatch/devel/sources
N rebuild-scripts/nfswatch/FC-4/branch
N rebuild-scripts/nfswatch/FC-4/nfswatch.spec
N rebuild-scripts/nfswatch/FC-4/Makefile
N rebuild-scripts/nfswatch/FC-4/.cvsignore
N rebuild-scripts/nfswatch/FC-4/sources
N rebuild-scripts/nfswatch/FC-5/branch
N rebuild-scripts/nfswatch/FC-5/nfswatch.spec
N rebuild-scripts/nfswatch/FC-5/Makefile
N rebuild-scripts/nfswatch/FC-5/.cvsignore
N rebuild-scripts/nfswatch/FC-5/sources
N rebuild-scripts/nfswatch/common/branches
N rebuild-scripts/nfswatch/common/cvs-import.sh
N rebuild-scripts/nfswatch/common/Makefile
N rebuild-scripts/nfswatch/common/Makefile.common
N rebuild-scripts/nfswatch/FC-3/branch
N rebuild-scripts/nfswatch/FC-3/nfswatch.spec
N rebuild-scripts/nfswatch/FC-3/Makefile
N rebuild-scripts/nfswatch/FC-3/.cvsignore
N rebuild-scripts/nfswatch/FC-3/sources
N rebuild-scripts/hmmer/Makefile
N rebuild-scripts/hmmer/import.log
N rebuild-scripts/hmmer/devel/Makefile
N rebuild-scripts/hmmer/devel/.cvsignore
N rebuild-scripts/hmmer/devel/sources
N rebuild-scripts/hmmer/devel/hmmer.spec
N rebuild-scripts/hmmer/FC-4/branch
N rebuild-scripts/hmmer/FC-4/Makefile
N rebuild-scripts/hmmer/FC-4/.cvsignore
N rebuild-scripts/hmmer/FC-4/sources
N rebuild-scripts/hmmer/FC-4/hmmer.spec
N rebuild-scripts/hmmer/common/branches
N rebuild-scripts/hmmer/common/cvs-import.sh
N rebuild-scripts/hmmer/common/Makefile
N rebuild-scripts/hmmer/common/Makefile.common
N rebuild-scripts/hmmer/FC-3/branch
N rebuild-scripts/hmmer/FC-3/Makefile
N rebuild-scripts/hmmer/FC-3/.cvsignore
N rebuild-scripts/hmmer/FC-3/sources
N rebuild-scripts/hmmer/FC-3/hmmer.spec
N rebuild-scripts/mock/Makefile
N rebuild-scripts/mock/import.log
N rebuild-scripts/mock/devel/Makefile
N rebuild-scripts/mock/devel/.cvsignore
N rebuild-scripts/mock/devel/sources
N rebuild-scripts/mock/devel/mock.spec
N rebuild-scripts/mock/FC-4/branch
N rebuild-scripts/mock/FC-4/Makefile
N rebuild-scripts/mock/FC-4/.cvsignore
N rebuild-scripts/mock/FC-4/sources
N rebuild-scripts/mock/FC-4/mock.spec
N rebuild-scripts/mock/common/branches
N rebuild-scripts/mock/common/cvs-import.sh
N rebuild-scripts/mock/common/Makefile
N rebuild-scripts/mock/common/tobuild
N rebuild-scripts/mock/common/Makefile.common
N rebuild-scripts/mock/FC-3/branch
N rebuild-scripts/mock/FC-3/Makefile
N rebuild-scripts/mock/FC-3/.cvsignore
N rebuild-scripts/mock/FC-3/sources
N rebuild-scripts/mock/FC-3/mock.spec
N rebuild-scripts/common/branches
N rebuild-scripts/common/cvs-import.sh
N rebuild-scripts/common/Makefile
N rebuild-scripts/common/Makefile.common
N rebuild-scripts/lagan/Makefile
N rebuild-scripts/lagan/import.log
N rebuild-scripts/lagan/devel/lagan12-chris.patch
N rebuild-scripts/lagan/devel/lagan.spec
N rebuild-scripts/lagan/devel/Makefile
N rebuild-scripts/lagan/devel/.cvsignore
N rebuild-scripts/lagan/devel/sources
N rebuild-scripts/lagan/FC-4/branch
N rebuild-scripts/lagan/FC-4/lagan12-chris.patch
N rebuild-scripts/lagan/FC-4/lagan.spec
N rebuild-scripts/lagan/FC-4/Makefile
N rebuild-scripts/lagan/FC-4/.cvsignore
N rebuild-scripts/lagan/FC-4/sources
N rebuild-scripts/lagan/common/branches
N rebuild-scripts/lagan/common/cvs-import.sh
N rebuild-scripts/lagan/common/Makefile
N rebuild-scripts/lagan/common/Makefile.common
N rebuild-scripts/dist-CVSROOT/modules
N rebuild-scripts/dist-CVSROOT/checkoutlist
N rebuild-scripts/dist-CVSROOT/config
N rebuild-scripts/dist-CVSROOT/commitinfo
N rebuild-scripts/dist-CVSROOT/cvswrappers
N rebuild-scripts/dist-CVSROOT/taginfo
N rebuild-scripts/dist-CVSROOT/rcsinfo
N rebuild-scripts/dist-CVSROOT/loginfo
N rebuild-scripts/dist-CVSROOT/verifymsg
N rebuild-scripts/dist-CVSROOT/editinfo
N rebuild-scripts/dist-CVSROOT/notify
N rebuild-scripts/comps/comps-fe6.xml
N rebuild-scripts/comps/comps-fe6.xml.in
N rebuild-scripts/comps/Makefile
N rebuild-scripts/comps/update-comps
N rebuild-scripts/comps/comps-cleanup.xsl
N rebuild-scripts/comps/comps-fe5.xml
N rebuild-scripts/comps/comps-fe5.xml.in
N rebuild-scripts/comps/po/POTFILES.in
N rebuild-scripts/comps/po/Makefile
N rebuild-scripts/comps/po/comps.pot
N rebuild-scripts/rebuild-scripts/check_rebuild2
N rebuild-scripts/rebuild-scripts/gen_rebuild_lst
N rebuild-scripts/rebuild-scripts/add_owner
N rebuild-scripts/rebuild-scripts/check_rebuild
N rebuild-scripts/rebuild-scripts/check_release
N rebuild-scripts/rebuild-scripts/rm_noarch
N rebuild-scripts/rebuild-scripts/buildcheck-extras-development.repo
N rebuild-scripts/rebuild-scripts/gen_nr_2
N rebuild-scripts/rebuild-scripts/bumpspecfile.py
N rebuild-scripts/rebuild-scripts/semi_auto_rebuild.txt
N rebuild-scripts/rebuild-scripts/buildcheck
N rebuild-scripts/owners/owners.list
N rebuild-scripts/status-report-scripts/log
N rebuild-scripts/status-report-scripts/tem
N rebuild-scripts/status-report-scripts/grabBZstats
N rebuild-scripts/status-report-scripts/out
N rebuild-scripts/status-report-scripts/parseBZbugList
N rebuild-scripts/status-report-scripts/check_owners
N rebuild-scripts/status-report-scripts/bzstat.gp
N rebuild-scripts/status-report-scripts/fileBZ
N rebuild-scripts/status-report-scripts/nagmail

No conflicts created by this import




From fedora-extras-commits at redhat.com  Fri Oct  6 12:37:18 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 05:37:18 -0700
Subject: rpms/renrot/devel .cvsignore, 1.7, 1.8 renrot.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <200610061237.k96CbKXs026340@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26319

Modified Files:
	.cvsignore renrot.spec sources 
Log Message:
update to last release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2006 03:55:43 -0000	1.7
+++ .cvsignore	6 Oct 2006 12:37:18 -0000	1.8
@@ -1 +1 @@
-renrot-0.24.tar.gz
+renrot-0.25.tar.gz


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/renrot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- renrot.spec	3 Sep 2006 03:55:43 -0000	1.8
+++ renrot.spec	6 Oct 2006 12:37:18 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		renrot
-Version:	0.24
+Version:	0.25
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -72,6 +72,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-1
+- update to 0.25
+
 * Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
 - update to 0.24
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2006 03:55:43 -0000	1.7
+++ sources	6 Oct 2006 12:37:18 -0000	1.8
@@ -1 +1 @@
-b7ac294ea36bcdcf989ee7718ace781b  renrot-0.24.tar.gz
+9fcf315764b92c8e11810e95d1f19c13  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 12:57:10 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 05:57:10 -0700
Subject: rpms/gnupg2/devel gnupg-1.9.91-readline.patch, NONE, 1.1 gnupg2.spec,
	1.46, 1.47 sources, 1.13, 1.14
Message-ID: <200610061257.k96CvCh9026472@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26450

Modified Files:
	gnupg2.spec sources 
Added Files:
	gnupg-1.9.91-readline.patch 
Log Message:
* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-1
- 1.9.91


gnupg-1.9.91-readline.patch:

--- NEW FILE gnupg-1.9.91-readline.patch ---
--- gnupg-1.9.91/common/gpgrlhelp.c.readline	2006-09-22 03:01:00.000000000 -0500
+++ gnupg-1.9.91/common/gpgrlhelp.c	2006-10-05 07:40:43.000000000 -0500
@@ -31,6 +31,7 @@
 
 #ifdef HAVE_LIBREADLINE
 #define GNUPG_LIBREADLINE_H_INCLUDED
+#include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #endif


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnupg2.spec	4 Oct 2006 19:42:57 -0000	1.46
+++ gnupg2.spec	6 Oct 2006 12:57:10 -0000	1.47
@@ -11,8 +11,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.22
-Release: 8%{?dist}
+Version: 1.9.91
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -25,6 +25,8 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
+# http://lists.gnupg.org/pipermail/gnupg-devel/2006-October/023237.html
+Patch1: gnupg-1.9.91-readline.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 
 Obsoletes: newpg < 0.9.5
@@ -32,7 +34,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 0.9.0
+BuildRequires: libassuan-devel >= 0.9.2
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -77,6 +79,7 @@
 %prep
 %setup -q -n gnupg-%{version}
 
+%patch1 -p1 -b .readline
 %patch2 -p1 -b .testverbose
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
@@ -149,6 +152,8 @@
 %{_bindir}/gpgkey2ssh
 %{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
+%{_bindir}/gpgsplit
+%{_bindir}/gpg-zip
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
@@ -157,6 +162,7 @@
 %{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
+%{_mandir}/man?/*
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
@@ -166,6 +172,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-1
+- 1.9.91
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-8
 - respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Oct 2006 19:42:57 -0000	1.13
+++ sources	6 Oct 2006 12:57:10 -0000	1.14
@@ -1,3 +1,2 @@
-ccea28fbab26bcb01890f2687d71f900  gnupg-1.9.22.tar.bz2
-02ef9a70cfa097cfe11b33600adc2b72  gnupg-1.9.22.tar.bz2.sig
-916de7ac125b31c5df517c068ac51ecf  gnupg-1.9.23.tar.bz2.sig
+1f79e05ebbda709234a6488cc8f02d82  gnupg-1.9.91.tar.bz2.sig
+fb6838f6e2e26e5f00271ce588fd080b  gnupg-1.9.91.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct  6 13:04:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 06:04:37 -0700
Subject: rpms/libassuan/devel .cvsignore, 1.5, 1.6 libassuan.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <200610061305.k96D59IQ029485@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29389

Modified Files:
	.cvsignore libassuan.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-1
- 0.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Sep 2006 16:47:57 -0000	1.5
+++ .cvsignore	6 Oct 2006 13:04:36 -0000	1.6
@@ -2,3 +2,4 @@
 libassuan-0.6.10.tar.gz.sig
 libassuan-0.9.0.tar.bz2
 libassuan-0.9.0.tar.bz2.sig
+libassuan-0.9.2.tar.bz2.sig


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libassuan.spec	2 Oct 2006 17:04:38 -0000	1.17
+++ libassuan.spec	6 Oct 2006 13:04:36 -0000	1.18
@@ -1,8 +1,8 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 0.9.0
-Release: 3%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 
 License: LGPL
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
@@ -33,9 +33,9 @@
 
 
 %build
-%ifarch x86_64
+#ifarch x86_64
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-%endif
+#endif
 %configure
 
 make %{?_smp_mflags}
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-1
+- 0.9.2
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.ne> - 0.9.0-3
 - respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Sep 2006 16:47:57 -0000	1.5
+++ sources	6 Oct 2006 13:04:36 -0000	1.6
@@ -1,2 +1,2 @@
-75e621bcc49ad6726e20facf3c214394  libassuan-0.9.0.tar.bz2
-4cd66a7d4c98950a78d53f2203a3dc37  libassuan-0.9.0.tar.bz2.sig
+727926633709ba7ce9bc721c3d4c0cbc  libassuan-0.9.2.tar.bz2.sig
+dfcfa3f26d49a38534c4a9e10e3bd770  libassuan-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct  6 13:05:20 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 06:05:20 -0700
Subject: rpms/renrot/FC-5 .cvsignore, 1.7, 1.8 renrot.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610061305.k96D5M1Q029550@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29528

Modified Files:
	.cvsignore renrot.spec sources 
Log Message:
updated


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2006 03:58:50 -0000	1.7
+++ .cvsignore	6 Oct 2006 13:05:20 -0000	1.8
@@ -1 +1 @@
-renrot-0.24.tar.gz
+renrot-0.25.tar.gz


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/renrot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- renrot.spec	3 Sep 2006 03:58:50 -0000	1.7
+++ renrot.spec	6 Oct 2006 13:05:20 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		renrot
-Version:	0.24
+Version:	0.25
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -72,6 +72,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-1
+- update to 0.25
+
 * Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
 - update to 0.24
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2006 03:58:50 -0000	1.7
+++ sources	6 Oct 2006 13:05:20 -0000	1.8
@@ -1 +1 @@
-b7ac294ea36bcdcf989ee7718ace781b  renrot-0.24.tar.gz
+9fcf315764b92c8e11810e95d1f19c13  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 13:22:18 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 06:22:18 -0700
Subject: rpms/renrot/devel renrot.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <200610061322.k96DMKgw029822@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29803

Modified Files:
	renrot.spec sources 
Log Message:
fix tarball upload


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/renrot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- renrot.spec	6 Oct 2006 12:37:18 -0000	1.9
+++ renrot.spec	6 Oct 2006 13:22:17 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		renrot
 Version:	0.25
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
 Summary:	A program to rename and rotate files according to EXIF tags
@@ -72,8 +72,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
-* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-1
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-2
 - update to 0.25
+- fix tarball
 
 * Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
 - update to 0.24


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Oct 2006 12:37:18 -0000	1.8
+++ sources	6 Oct 2006 13:22:17 -0000	1.9
@@ -1 +1 @@
-9fcf315764b92c8e11810e95d1f19c13  renrot-0.25.tar.gz
+a8cc96c9ebea8ecbf76c83d2d1b2dcbe  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 13:25:26 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 06:25:26 -0700
Subject: rpms/renrot/FC-5 renrot.spec,1.8,1.9 sources,1.8,1.9
Message-ID: <200610061325.k96DPSu0029897@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29878

Modified Files:
	renrot.spec sources 
Log Message:
fix tarball upload


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/renrot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- renrot.spec	6 Oct 2006 13:05:20 -0000	1.8
+++ renrot.spec	6 Oct 2006 13:25:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		renrot
 Version:	0.25
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
 Summary:	A program to rename and rotate files according to EXIF tags
@@ -72,8 +72,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
-* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-1
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-2
 - update to 0.25
+- fix tarball
 
 * Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
 - update to 0.24


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Oct 2006 13:05:20 -0000	1.8
+++ sources	6 Oct 2006 13:25:25 -0000	1.9
@@ -1 +1 @@
-9fcf315764b92c8e11810e95d1f19c13  renrot-0.25.tar.gz
+a8cc96c9ebea8ecbf76c83d2d1b2dcbe  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 13:27:54 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Fri,  6 Oct 2006 06:27:54 -0700
Subject: rpms/renrot/FC-4 .cvsignore, 1.5, 1.6 renrot.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200610061327.k96DRuB3029973@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/renrot/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29952

Modified Files:
	.cvsignore renrot.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Jul 2006 06:00:39 -0000	1.5
+++ .cvsignore	6 Oct 2006 13:27:54 -0000	1.6
@@ -1 +1 @@
-renrot-0.22.tar.gz
+renrot-0.25.tar.gz


Index: renrot.spec
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-4/renrot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- renrot.spec	18 Jul 2006 06:00:39 -0000	1.5
+++ renrot.spec	6 Oct 2006 13:27:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		renrot
-Version:	0.22
-Release:	1.0%{?dist}
+Version:	0.25
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
 Summary:	A program to rename and rotate files according to EXIF tags
@@ -41,6 +41,7 @@
 
 # install sample confuration files
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install -m644 etc/colors.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -m644 etc/copyright.tag $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -m644 etc/renrot.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -m644 etc/tags.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -65,11 +66,25 @@
 %{_bindir}/renrot
 %{_mandir}/man1/*.1*
 %dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/colors.conf
 %config(noreplace) %{_sysconfdir}/%{name}/copyright.tag
 %config(noreplace) %{_sysconfdir}/%{name}/renrot.conf
 %config(noreplace) %{_sysconfdir}/%{name}/tags.conf
 
 %changelog
+* Fri Oct 06 2006 Andy Shevchenko <andy at smile.org.ua> 0.25-2
+- update to 0.25
+- fix tarball
+
+* Sun Sep 03 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.24-1
+- update to 0.24
+
+* Tue Aug 22 2006 Andy Shevchenko <andy at smile.org.ua>
+- add colors.conf
+
+* Sat Aug 19 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.23-1
+- update to 0.23
+
 * Tue Jul 18 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.22-1.0
 - update to 0.22
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/renrot/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jul 2006 06:00:39 -0000	1.5
+++ sources	6 Oct 2006 13:27:54 -0000	1.6
@@ -1 +1 @@
-1df68b01b59f9150aaaebb71091cbc4d  renrot-0.22.tar.gz
+a8cc96c9ebea8ecbf76c83d2d1b2dcbe  renrot-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 13:40:48 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 06:40:48 -0700
Subject: owners owners.list,1.1784,1.1785
Message-ID: <200610061340.k96DeooI030089@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30072

Modified Files:
	owners.list 
Log Message:

Added alsa-oss (BZ#209144)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1784
retrieving revision 1.1785
diff -u -r1.1784 -r1.1785
--- owners.list	6 Oct 2006 09:41:30 -0000	1.1784
+++ owners.list	6 Oct 2006 13:40:48 -0000	1.1785
@@ -41,6 +41,7 @@
 Fedora Extras|alleyoop|Graphical front-end to the Valgrind memory checker|giallu at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|alltray|Dock any application in the tray|denis at poolshark.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|alsa-oss|Advanced Linux Sound Architecture (ALSA) wrapper for OSS|jima at beer.tclug.org|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de
 Fedora Extras|alsamixergui|GUI mixer for ALSA sound devices|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|altermime|Alter MIME-encoded mailpacks|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 13:50:40 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 06:50:40 -0700
Subject: rpms/alsa-oss/devel - New directory
Message-ID: <200610061350.k96DogRC030234@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30220/devel

Log Message:
Directory /cvs/extras/rpms/alsa-oss/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 14:10:31 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 07:10:31 -0700
Subject: rpms/alsa-oss/devel Makefile,NONE,1.1
Message-ID: <200610061410.k96EAXBJ000926@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv910/devel

Added Files:
	Makefile 
Log Message:

Weird b0rkage



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Fri Oct  6 14:11:15 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 07:11:15 -0700
Subject: rpms/alsa-oss/devel alsa-oss-1.0.12-aoss.patch, NONE,
	1.1 alsa-oss.spec, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610061411.k96EBH28001006@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv976/devel

Added Files:
	alsa-oss-1.0.12-aoss.patch alsa-oss.spec sources 
Log Message:
auto-import alsa-oss-1.0.12-3.fc6 on branch devel from alsa-oss-1.0.12-3.fc6.src.rpm

alsa-oss-1.0.12-aoss.patch:

--- NEW FILE alsa-oss-1.0.12-aoss.patch ---
--- alsa/aoss.in.orig	2005-10-27 14:34:18.000000000 -0400
+++ alsa/aoss.in	2006-04-02 15:53:53.000000000 -0400
@@ -5,9 +5,7 @@
 #	aoss <command> <command options and arguments>
 
 if [ -d /proc/asound ]; then
-  prefix=@prefix@
-  exec_prefix=@exec_prefix@
-  LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
+  LD_PRELOAD=@libdir@/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
 else
   exec "$@"
 fi


--- NEW FILE alsa-oss.spec ---
Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
Name:		alsa-oss
Version:	1.0.12
Release:	3%{?dist}
License:	GPL
Group:		Applications/Multimedia
URL:		http://www.alsa-project.org/
Source:		ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2
Patch:		%{name}-%{version}-aoss.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	alsa-lib-devel >= %{version}
%ifarch x86_64
BuildRequires:	automake, libtool
%endif

%description
This package contains the compatibility library and wrapper script for
running legacy OSS applications through ALSA. Unlike the kernel
driver, this has the advantage of supporting DMIX software mixing.

%package devel
Summary:	Headers for ALSA wrapper for OSS
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
%description devel
Header files for alsa-oss.

%prep
%setup -q
%patch0

%build
%ifarch x86_64
autoreconf -f -i
%endif
%configure \
%ifarch x86_64
	--disable-rpath \
%endif
	--disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/aoss
%{_libdir}/*.so.*
%{_mandir}/man?/*

%files devel
%defattr(-,root,root,-)
%doc oss-redir/README
%{_includedir}/*
%{_libdir}/*.a
%{_libdir}/*.so


%changelog
* Fri Oct 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-3
- Added conditionalized rpath fixes for x86_64 (thanks Denis!)
- Re-added *.a to -devel package
- Added %%defattr for -devel, added oss-redir/README as %%doc

* Thu Oct 05 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-2
- Adding --disable-static to configure
- Removing *.a from -devel package
- Adding name and version to patch
- Removing commented-out autoreconf line
- Forcibly deleting *.a files in %%install (why didn't it believe me?)

* Tue Oct 03 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-1
- Hijacked from stalled review (BZ#187706)
- Bumped to 1.0.12 for devel branch
- Removed Req for /sbin/ldconfig (unnecessary when using -p in scriptlets)
- Added dist tag!
- Made macros slightly more consistent
- Deleted .la files in %%install

* Sun Apr  2 2006 Michel Salim <michel.salim at gmail.com> 1.0.11-1.rc3
- Initial build.


--- NEW FILE sources ---
d4d18bbf63a866d6e065b90e16acd676  alsa-oss-1.0.12.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct  6 14:11:15 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Fri,  6 Oct 2006 07:11:15 -0700
Subject: rpms/alsa-oss import.log,1.2,1.3
Message-ID: <200610061411.k96EBlvu001014@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv976

Modified Files:
	import.log 
Log Message:
auto-import alsa-oss-1.0.12-3.fc6 on branch devel from alsa-oss-1.0.12-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alsa-oss/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Nov 2004 04:01:49 -0000	1.2
+++ import.log	6 Oct 2006 14:11:14 -0000	1.3
@@ -1 +1,2 @@
 alsa-oss-1_0_4-0_fdr_1_1:HEAD:alsa-oss-1.0.4-0.fdr.1.1.src.rpm:1099886509
+alsa-oss-1_0_12-3_fc6:HEAD:alsa-oss-1.0.12-3.fc6.src.rpm:1160143869



From fedora-extras-commits at redhat.com  Fri Oct  6 14:23:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:23:17 -0700
Subject: rpms/plib/devel plib-1.8.4-autorepeat.patch, NONE, 1.1 plib.spec,
	1.15, 1.16
Message-ID: <200610061423.k96ENJ2c001161@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/plib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1141

Modified Files:
	plib.spec 
Added Files:
	plib-1.8.4-autorepeat.patch 
Log Message:
* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-8
- Fix keypresses sometimes getting lost by alternative (better) keyboard
  autorepeat support
- Cleanup specfile


plib-1.8.4-autorepeat.patch:

--- NEW FILE plib-1.8.4-autorepeat.patch ---
--- plib-1.8.4/src/pw/pwX11.cxx.key	2006-10-05 19:56:42.000000000 +0200
+++ plib-1.8.4/src/pw/pwX11.cxx	2006-10-05 20:04:19.000000000 +0200
@@ -117,11 +117,19 @@
 static XTextProperty *titlePropertyPtr = NULL;
 
 static bool autoRepeat = false ;
+static bool haveFocus = false ;
 
 static void getEvents ();
 
 void pwSetAutoRepeatKey ( bool enable )
 {
+  if ( (autoRepeat != enable) && haveFocus )
+  {
+    if ( enable )
+      XAutoRepeatOn ( currDisplay ) ;
+    else
+      XAutoRepeatOff ( currDisplay ) ;
+  }
   autoRepeat = enable ;
 }
 
@@ -351,7 +359,7 @@
                        KeyPressMask        | KeyReleaseMask       |
 		       EnterWindowMask     | LeaveWindowMask      |
                        PointerMotionMask   | ButtonMotionMask     |
-                       VisibilityChangeMask ;
+                       VisibilityChangeMask| FocusChangeMask;
 
   attribs.background_pixmap = None ;
   attribs.background_pixel  = 0    ;
@@ -405,6 +413,10 @@
   XMapWindow       ( currDisplay, wmWindow ) ;
   glXMakeCurrent   ( currDisplay, currHandle, currContext ) ;
 
+  haveFocus = true;
+  if (!autoRepeat)
+    XAutoRepeatOff ( currDisplay ) ;
+
   pwSetCursor ( PW_CURSOR_LEFT ) ;
 
 #ifdef GL_MULTISAMPLE_FILTER_HINT_NV
@@ -717,8 +729,6 @@
 
 static void getEvents ()
 {
-  bool repeating = false ;
-  char keyflags [ 32 ] ;
   XEvent event ;
 
   insideCallback = true ;
@@ -770,6 +780,18 @@
           (*mpCB) ( event.xmotion.x, event.xmotion.y ) ;
         break ;
 
+      case FocusIn:
+        if ( !haveFocus && !autoRepeat )
+          XAutoRepeatOff ( currDisplay ) ;
+        haveFocus = true;
+        break;
+
+      case FocusOut:
+        if ( haveFocus && !autoRepeat )
+          XAutoRepeatOn ( currDisplay ) ;
+        haveFocus = false;
+        break;
+
       case ButtonRelease   :
         updown = PW_UP ;
         /* FALLTHROUGH */
@@ -792,23 +814,9 @@
 
       case KeyRelease      :
         updown = PW_UP ;
-
-        XQueryKeymap ( currDisplay, keyflags ) ;
-
-        repeating = ( ( keyflags [ event.xkey.keycode >> 3 ] &
-                          ( 1 << ( event.xkey.keycode & 7 ) ) ) != 0 ) ;
-
         /* FALLTHROUGH */
 
       case KeyPress        :
-        /*
-          Only generate a key up callback if the key is actually up
-          and not repeating.
-        */
-
-        if ( ! autoRepeat && repeating )
-          break ;
-
         XComposeStatus composeStatus ;
         char           asciiCode [ 32 ] ;
         KeySym         keySym ;
@@ -1021,10 +1029,14 @@
   if ( fsWindow != None )
     pwSetWindowed ( ) ;
 
+  if ( haveFocus && !autoRepeat )
+    XAutoRepeatOn ( currDisplay ) ;
+
   glXDestroyContext ( currDisplay, currContext ) ;
   XDestroyWindow    ( currDisplay, currHandle  ) ;
   XDestroyWindow    ( currDisplay, wmWindow    ) ;
   XCloseDisplay     ( currDisplay ) ;
+  haveFocus = false;
   currDisplay = NULL;
 }
 


Index: plib.spec
===================================================================
RCS file: /cvs/extras/rpms/plib/devel/plib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plib.spec	29 Aug 2006 05:58:00 -0000	1.15
+++ plib.spec	6 Oct 2006 14:23:16 -0000	1.16
@@ -1,18 +1,18 @@
-Summary: Set of portable libraries especially useful for games
-Name: plib
-Version: 1.8.4
-Release: 7%{?dist}
-License: LGPL
-Group: System Environment/Libraries
-URL: http://plib.sourceforge.net/
-Source: http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
-Patch0: plib-1.8.4-extraqualif.patch
-Patch1: plib-1.8.4-fullscreen.patch
-Patch2: plib-1.8.4-js.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, freeglut-devel, libpng-devel
-BuildRequires: libXext-devel, libXi-devel, libXmu-devel, libSM-devel
-Buildrequires: libXxf86vm-devel libXt-devel
+Name:           plib
+Version:        1.8.4
+Release:        8%{?dist}
+Summary:        Set of portable libraries especially useful for games
+Group:          System Environment/Libraries
+License:        LGPL
+URL:            http://plib.sourceforge.net/
+Source:         http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
+Patch0:         plib-1.8.4-extraqualif.patch
+Patch1:         plib-1.8.4-fullscreen.patch
+Patch2:         plib-1.8.4-js.patch
+Patch3:         plib-1.8.4-autorepeat.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  freeglut-devel libpng-devel libXext-devel libXi-devel
+Buildrequires:  libXmu-devel libSM-devel libXxf86vm-devel
 
 %description
 This is a set of OpenSource (LGPL) libraries that will permit programmers
@@ -23,10 +23,10 @@
 
 
 %package devel
-Summary: Set of portable libraries especially useful for games
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libGL-devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libGL-devel
 
 %description devel
 This package contains the header files and libraries needed to write
@@ -38,13 +38,14 @@
 %patch0 -p1 -b .extraqualif
 %patch1 -p1 -b .fs
 %patch2 -p1 -b .js
+%patch3 -p1 -b .autorepeat
 # for some reason this file has its x permission sets, which makes rpmlint cry
 chmod -x src/sg/sgdIsect.cxx
 
 
 %build
-%configure CXXFLAGS="%{optflags} -fPIC -DXF86VIDMODE"
-%{__make} %{?_smp_mflags} 
+%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DXF86VIDMODE"
+make %{?_smp_mflags} 
 # and below is a somewhat dirty hack inspired by debian to build shared libs
 # instead of static. Notice that the adding of -fPIC to CXXFLAGS above is part
 # of the hack.
@@ -75,16 +76,16 @@
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 # we don't want the static libs
-%{__rm} %{buildroot}%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 # instead do a DIY install of the shared libs we created
-%{__cp} -a `find . -name "libplib*.so*"` %{buildroot}%{_libdir}
+cp -a `find . -name "libplib*.so*"` $RPM_BUILD_ROOT%{_libdir}
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -93,17 +94,22 @@
 
 
 %files
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NOTICE README
 %{_libdir}/libplib*.so.%{version}
 
 %files devel
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libplib*.so
 
 
 %changelog
+* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-8
+- Fix keypresses sometimes getting lost by alternative (better) keyboard
+  autorepeat support
+- Cleanup specfile
+
 * Tue Aug 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-7
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Fri Oct  6 14:24:04 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:24:04 -0700
Subject: rpms/plib/FC-5 plib-1.8.4-autorepeat.patch, NONE, 1.1 plib.spec,
	1.12, 1.13
Message-ID: <200610061424.k96EO6uA001234@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/plib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1214

Modified Files:
	plib.spec 
Added Files:
	plib-1.8.4-autorepeat.patch 
Log Message:
* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-8
- Fix keypresses sometimes getting lost by alternative (better) keyboard
  autorepeat support
- Cleanup specfile


plib-1.8.4-autorepeat.patch:

--- NEW FILE plib-1.8.4-autorepeat.patch ---
--- plib-1.8.4/src/pw/pwX11.cxx.key	2006-10-05 19:56:42.000000000 +0200
+++ plib-1.8.4/src/pw/pwX11.cxx	2006-10-05 20:04:19.000000000 +0200
@@ -117,11 +117,19 @@
 static XTextProperty *titlePropertyPtr = NULL;
 
 static bool autoRepeat = false ;
+static bool haveFocus = false ;
 
 static void getEvents ();
 
 void pwSetAutoRepeatKey ( bool enable )
 {
+  if ( (autoRepeat != enable) && haveFocus )
+  {
+    if ( enable )
+      XAutoRepeatOn ( currDisplay ) ;
+    else
+      XAutoRepeatOff ( currDisplay ) ;
+  }
   autoRepeat = enable ;
 }
 
@@ -351,7 +359,7 @@
                        KeyPressMask        | KeyReleaseMask       |
 		       EnterWindowMask     | LeaveWindowMask      |
                        PointerMotionMask   | ButtonMotionMask     |
-                       VisibilityChangeMask ;
+                       VisibilityChangeMask| FocusChangeMask;
 
   attribs.background_pixmap = None ;
   attribs.background_pixel  = 0    ;
@@ -405,6 +413,10 @@
   XMapWindow       ( currDisplay, wmWindow ) ;
   glXMakeCurrent   ( currDisplay, currHandle, currContext ) ;
 
+  haveFocus = true;
+  if (!autoRepeat)
+    XAutoRepeatOff ( currDisplay ) ;
+
   pwSetCursor ( PW_CURSOR_LEFT ) ;
 
 #ifdef GL_MULTISAMPLE_FILTER_HINT_NV
@@ -717,8 +729,6 @@
 
 static void getEvents ()
 {
-  bool repeating = false ;
-  char keyflags [ 32 ] ;
   XEvent event ;
 
   insideCallback = true ;
@@ -770,6 +780,18 @@
           (*mpCB) ( event.xmotion.x, event.xmotion.y ) ;
         break ;
 
+      case FocusIn:
+        if ( !haveFocus && !autoRepeat )
+          XAutoRepeatOff ( currDisplay ) ;
+        haveFocus = true;
+        break;
+
+      case FocusOut:
+        if ( haveFocus && !autoRepeat )
+          XAutoRepeatOn ( currDisplay ) ;
+        haveFocus = false;
+        break;
+
       case ButtonRelease   :
         updown = PW_UP ;
         /* FALLTHROUGH */
@@ -792,23 +814,9 @@
 
       case KeyRelease      :
         updown = PW_UP ;
-
-        XQueryKeymap ( currDisplay, keyflags ) ;
-
-        repeating = ( ( keyflags [ event.xkey.keycode >> 3 ] &
-                          ( 1 << ( event.xkey.keycode & 7 ) ) ) != 0 ) ;
-
         /* FALLTHROUGH */
 
       case KeyPress        :
-        /*
-          Only generate a key up callback if the key is actually up
-          and not repeating.
-        */
-
-        if ( ! autoRepeat && repeating )
-          break ;
-
         XComposeStatus composeStatus ;
         char           asciiCode [ 32 ] ;
         KeySym         keySym ;
@@ -1021,10 +1029,14 @@
   if ( fsWindow != None )
     pwSetWindowed ( ) ;
 
+  if ( haveFocus && !autoRepeat )
+    XAutoRepeatOn ( currDisplay ) ;
+
   glXDestroyContext ( currDisplay, currContext ) ;
   XDestroyWindow    ( currDisplay, currHandle  ) ;
   XDestroyWindow    ( currDisplay, wmWindow    ) ;
   XCloseDisplay     ( currDisplay ) ;
+  haveFocus = false;
   currDisplay = NULL;
 }
 


Index: plib.spec
===================================================================
RCS file: /cvs/extras/rpms/plib/FC-5/plib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plib.spec	10 Jun 2006 13:27:39 -0000	1.12
+++ plib.spec	6 Oct 2006 14:24:04 -0000	1.13
@@ -1,18 +1,18 @@
-Summary: Set of portable libraries especially useful for games
-Name: plib
-Version: 1.8.4
-Release: 6%{?dist}
-License: LGPL
-Group: System Environment/Libraries
-URL: http://plib.sourceforge.net/
-Source: http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
-Patch0: plib-1.8.4-extraqualif.patch
-Patch1: plib-1.8.4-fullscreen.patch
-Patch2: plib-1.8.4-js.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, freeglut-devel, libpng-devel
-BuildRequires: libXext-devel, libXi-devel, libXmu-devel, libSM-devel
-Buildrequires: libXxf86vm-devel libXt-devel
+Name:           plib
+Version:        1.8.4
+Release:        8%{?dist}
+Summary:        Set of portable libraries especially useful for games
+Group:          System Environment/Libraries
+License:        LGPL
+URL:            http://plib.sourceforge.net/
+Source:         http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
+Patch0:         plib-1.8.4-extraqualif.patch
+Patch1:         plib-1.8.4-fullscreen.patch
+Patch2:         plib-1.8.4-js.patch
+Patch3:         plib-1.8.4-autorepeat.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  freeglut-devel libpng-devel libXext-devel libXi-devel
+Buildrequires:  libXmu-devel libSM-devel libXxf86vm-devel
 
 %description
 This is a set of OpenSource (LGPL) libraries that will permit programmers
@@ -23,10 +23,10 @@
 
 
 %package devel
-Summary: Set of portable libraries especially useful for games
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libGL-devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libGL-devel
 
 %description devel
 This package contains the header files and libraries needed to write
@@ -38,13 +38,14 @@
 %patch0 -p1 -b .extraqualif
 %patch1 -p1 -b .fs
 %patch2 -p1 -b .js
+%patch3 -p1 -b .autorepeat
 # for some reason this file has its x permission sets, which makes rpmlint cry
 chmod -x src/sg/sgdIsect.cxx
 
 
 %build
-%configure CXXFLAGS="%{optflags} -fPIC -DXF86VIDMODE"
-%{__make} %{?_smp_mflags} 
+%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DXF86VIDMODE"
+make %{?_smp_mflags} 
 # and below is a somewhat dirty hack inspired by debian to build shared libs
 # instead of static. Notice that the adding of -fPIC to CXXFLAGS above is part
 # of the hack.
@@ -75,16 +76,16 @@
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 # we don't want the static libs
-%{__rm} %{buildroot}%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 # instead do a DIY install of the shared libs we created
-%{__cp} -a `find . -name "libplib*.so*"` %{buildroot}%{_libdir}
+cp -a `find . -name "libplib*.so*"` $RPM_BUILD_ROOT%{_libdir}
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -93,17 +94,25 @@
 
 
 %files
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NOTICE README
 %{_libdir}/libplib*.so.%{version}
 
 %files devel
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libplib*.so
 
 
 %changelog
+* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-8
+- Fix keypresses sometimes getting lost by alternative (better) keyboard
+  autorepeat support
+- Cleanup specfile
+
+* Tue Aug 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-7
+- FE6 Rebuild
+
 * Sat Jun 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.8.4-6
 - Remove use of conditional BuildReqs dependent on %%fedora, this breaks
   when people try to rebuild the SRPM and don't have %fedora defined.



From fedora-extras-commits at redhat.com  Fri Oct  6 14:34:37 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:34:37 -0700
Subject: rpms/supertuxkart - New directory
Message-ID: <200610061434.k96EYdxu001400@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1379/supertuxkart

Log Message:
Directory /cvs/extras/rpms/supertuxkart added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 14:34:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:34:38 -0700
Subject: rpms/supertuxkart/devel - New directory
Message-ID: <200610061434.k96EYetb001403@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1379/supertuxkart/devel

Log Message:
Directory /cvs/extras/rpms/supertuxkart/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 14:34:57 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:34:57 -0700
Subject: rpms/supertuxkart Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610061434.k96EYxJn001459@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1426

Added Files:
	Makefile import.log 
Log Message:
Setup of module supertuxkart


--- NEW FILE Makefile ---
# Top level Makefile for module supertuxkart
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 14:34:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:34:58 -0700
Subject: rpms/supertuxkart/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610061435.k96EZ0A4001462@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1426/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module supertuxkart


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 14:36:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:36:10 -0700
Subject: owners owners.list,1.1785,1.1786
Message-ID: <200610061436.k96EaCeL001567@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1550

Modified Files:
	owners.list 
Log Message:
added supertuxkart


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1785
retrieving revision 1.1786
diff -u -r1.1785 -r1.1786
--- owners.list	6 Oct 2006 13:40:48 -0000	1.1785
+++ owners.list	6 Oct 2006 14:36:10 -0000	1.1786
@@ -2078,6 +2078,7 @@
 Fedora Extras|sunifdef|A commandline tool for simplifying the preprocessor conditionals in source code|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|superkaramba|Custom content on the desktop|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
+Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 14:37:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:37:01 -0700
Subject: rpms/supertuxkart import.log,1.1,1.2
Message-ID: <200610061437.k96Eb357001630@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586

Modified Files:
	import.log 
Log Message:
auto-import supertuxkart-0.2-3.fc6 on branch devel from supertuxkart-0.2-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 14:34:57 -0000	1.1
+++ import.log	6 Oct 2006 14:37:01 -0000	1.2
@@ -0,0 +1 @@
+supertuxkart-0_2-3_fc6:HEAD:supertuxkart-0.2-3.fc6.src.rpm:1160145502



From fedora-extras-commits at redhat.com  Fri Oct  6 14:37:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:37:02 -0700
Subject: rpms/supertuxkart/devel supertuxkart-0.2-gpmenu.patch, NONE,
	1.1 supertuxkart-0.2-joy1.patch, NONE,
	1.1 supertuxkart-0.2-joy2.patch, NONE,
	1.1 supertuxkart-0.2-joy3.patch, NONE,
	1.1 supertuxkart-fhs.patch, NONE,
	1.1 supertuxkart-fullscreen.patch, NONE,
	1.1 supertuxkart-images-legal.txt, NONE,
	1.1 supertuxkart-nomnm.patch, NONE, 1.1 supertuxkart.6, NONE,
	1.1 supertuxkart.desktop, NONE, 1.1 supertuxkart.png, NONE,
	1.1 supertuxkart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610061437.k96Eb4A4001649@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586/devel

Modified Files:
	.cvsignore sources 
Added Files:
	supertuxkart-0.2-gpmenu.patch supertuxkart-0.2-joy1.patch 
	supertuxkart-0.2-joy2.patch supertuxkart-0.2-joy3.patch 
	supertuxkart-fhs.patch supertuxkart-fullscreen.patch 
	supertuxkart-images-legal.txt supertuxkart-nomnm.patch 
	supertuxkart.6 supertuxkart.desktop supertuxkart.png 
	supertuxkart.spec 
Log Message:
auto-import supertuxkart-0.2-3.fc6 on branch devel from supertuxkart-0.2-3.fc6.src.rpm

supertuxkart-0.2-gpmenu.patch:

--- NEW FILE supertuxkart-0.2-gpmenu.patch ---
--- supertuxkart-0.2/src/gui/grand_prix_select.cpp~	2006-10-06 14:52:51.000000000 +0200
+++ supertuxkart-0.2/src/gui/grand_prix_select.cpp	2006-10-06 14:52:51.000000000 +0200
@@ -43,13 +43,15 @@
       std::string fullPath= "data/" + (std::string)*i;
       CupData *cup = new CupData(fullPath.c_str());
       allCups.push_back(cup);
-      int tmp=widgetSet -> state(menu_id, cup->getName().c_str(), GUI_SML, nId, 0);
-      if(nId==0) widgetSet->set_active(tmp);
+      if(nId==0)
+        widgetSet -> start(menu_id, cup->getName().c_str(), GUI_SML, nId, 0);
+      else
+        widgetSet -> state(menu_id, cup->getName().c_str(), GUI_SML, nId, 0);
       nId++;
     }   // if
   }   // for i
   widgetSet -> space(menu_id);
-  widgetSet -> start(menu_id,"Press <ESC> to go back", GUI_SML, -1);
+  widgetSet -> state(menu_id,"Press <ESC> to go back", GUI_SML, -1);
   widgetSet -> layout(menu_id, 0, 0);
   rect = widgetSet->rect(10, 10, config->width-20, 34, GUI_ALL, 10);
 }   // GrandPrixSelect

supertuxkart-0.2-joy1.patch:

--- NEW FILE supertuxkart-0.2-joy1.patch ---
--- supertuxkart-0.2/src/gui/race_gui.cpp.joy1	2006-10-06 11:25:23.000000000 +0200
+++ supertuxkart-0.2/src/gui/race_gui.cpp	2006-10-06 11:25:23.000000000 +0200
@@ -144,24 +144,6 @@
 } // keybd
 
 // -----------------------------------------------------------------------------
-void RaceGUI::stick(const int &whichAxis, const float &value){
-  KartControl controls;
-  controls.data[whichAxis] = value;
-  assert(world != NULL);
-  world -> getPlayerKart(0) -> incomingJoystick ( controls );
-}   // stick
-
-// -----------------------------------------------------------------------------
-void RaceGUI::joybuttons( int whichJoy, int hold, int presses, int releases ) {
-  KartControl controls;
-  controls.buttons = hold;
-  controls.presses = presses;
-  controls.releases = releases;
-  assert(world != NULL);
-  world -> getPlayerKart(whichJoy) -> incomingJoystick ( controls );
-}   // joybuttons
-
-// -----------------------------------------------------------------------------
 void RaceGUI::drawFPS () {
   if (++fpsCounter>=50) {
     fpsTimer.update();
--- supertuxkart-0.2/src/gui/race_gui.hpp.joy1	2006-09-07 12:08:13.000000000 +0200
+++ supertuxkart-0.2/src/gui/race_gui.hpp	2006-10-06 11:25:23.000000000 +0200
@@ -42,8 +42,6 @@
   void select() {}
   void keybd(int key);
   void point(int x, int y) { (void)x; (void)y; }
-  void stick     (const int &whichAxis, const float &value) ;
-  void joybuttons(int whichJoy, int hold, int presses, int releases ) ;
 
 private:
     ulClock   fpsTimer;
--- supertuxkart-0.2/src/plibdrv.cpp.joy1	2006-10-06 11:25:23.000000000 +0200
+++ supertuxkart-0.2/src/plibdrv.cpp	2006-10-06 11:30:25.000000000 +0200
@@ -27,6 +27,7 @@
 
 #include "gui/menu_manager.hpp"
 #include "kart_control.hpp"
+#include "world.hpp"
 
 /*********************************\
 *                                 *
@@ -79,13 +80,21 @@
       static KartControl controls;
       int prev_buttons = controls.buttons;
       joystick->read ( &controls.buttons, controls.data) ;
-      menu->stick( 0, controls.data[0]);
-      menu->stick( 1, controls.data[1]);
 
       int changed_states = prev_buttons ^ controls.buttons;
       controls.presses = controls.buttons & changed_states;
       controls.releases = !controls.buttons & changed_states;
-      menu->joybuttons(0, controls.buttons, controls.presses, controls.releases);
+      
+      if ( menu_manager->isCurrentMenu( MENUID_RACE ) )
+      {
+        world -> getPlayerKart(0) -> incomingJoystick ( controls );
+      }
+      else
+      {
+        menu->stick( 0, controls.data[0]);
+        menu->stick( 1, controls.data[1]);
+        menu->joybuttons(0, controls.buttons, controls.presses, controls.releases);
+      }
     }
   }
 }

supertuxkart-0.2-joy2.patch:

--- NEW FILE supertuxkart-0.2-joy2.patch ---
--- supertuxkart-0.2/src/player_kart.cpp~	2006-10-06 11:34:44.000000000 +0200
+++ supertuxkart-0.2/src/player_kart.cpp	2006-10-06 13:48:28.000000000 +0200
@@ -30,13 +30,16 @@
 // -----------------------------------------------------------------------------
 void PlayerKart::incomingJoystick  (const KartControl &ctrl) {
   //Steering keys(hold)
-  controls.lr      = -ctrl.data[0];
-  joystickWasMoved = fabsf(controls.lr)>0.01;
-  controls.accel   = -ctrl.data[1];
-  controls.brake   = player->getButton(KC_BRAKE)   & ctrl.buttons;
-  controls.wheelie = player->getButton(KC_WHEELIE) & ctrl.buttons;
+  joystickWasMoved = fabsf(ctrl.data[0])>0.01;
+  if ( joystickWasMoved )
+    controls.lr      = -ctrl.data[0];
+
+  if (fabsf(ctrl.data[1])>0.01)
+    controls.accel   = -ctrl.data[1];
 
   //One time press keys; these are cleared each frame so we don't have to
+  if (player->getButton(KC_BRAKE)  & ctrl.presses) controls.brake  = true;
+  if (player->getButton(KC_WHEELIE)& ctrl.presses) controls.wheelie= true;
   if (player->getButton(KC_RESCUE) & ctrl.presses) controls.rescue = true;
   if (player->getButton(KC_FIRE)   & ctrl.presses) controls.fire   = true;
   if (player->getButton(KC_JUMP)   & ctrl.presses) controls.jump   = true;
@@ -46,7 +49,9 @@
 // Only keys which must keep on working when still being pressed
 // are handled here, not 'one time action' keys like fire, ...
 void PlayerKart::handleKeyboard(float dt) {
-
+// Joystick steering values take precedence over keyboard, only
+// do the keyboard handling if joystick wasn't moved.
+if ( !joystickWasMoved ) {
   if(!config->newKeyboardStyle) {
     controls.lr = isKeyDown(player->getKey(KC_LEFT))  ?  1.0f 
                 : isKeyDown(player->getKey(KC_RIGHT)) ? -1.0f : 0.0f;
@@ -66,6 +71,7 @@
   }   // not old steering
     // clamp control value to be within  [-1,1]
   controls.lr = std::min(1.0f, std::max(-1.0f, controls.lr));
+}
 
   if(isKeyDown(player->getKey(KC_ACCEL)))   controls.accel   =  1.0f;
   if(isKeyDown(player->getKey(KC_BRAKE)))   controls.brake   =  true;
@@ -88,9 +94,7 @@
 
 // -----------------------------------------------------------------------------
 void PlayerKart::update(float dt) {
-  // Joystick values takes precedence over keyboard, only
-  // do the keyboard handling if joystick wasn't moved.
-  if(!joystickWasMoved) handleKeyboard(dt);
+  handleKeyboard(dt);
 
   if(world->getPhase()==World::START_PHASE) {
     if(controls.lr!=0.0 || controls.accel!=0.0 || controls.brake!=false ||

supertuxkart-0.2-joy3.patch:

--- NEW FILE supertuxkart-0.2-joy3.patch ---
--- supertuxkart-0.2/src/gui/main_menu.cpp~	2006-10-06 13:57:17.000000000 +0200
+++ supertuxkart-0.2/src/gui/main_menu.cpp	2006-10-06 13:57:17.000000000 +0200
@@ -99,4 +99,16 @@
 	}
 }
 
+void MainMenu::joybuttons( int whichJoy, int hold, int presses, int releases ) {
+  (void)whichJoy; (void)hold; (void)releases;
+
+  if( presses & 2 ) {
+    select();
+  }
+
+  if (presses & 1) {
+    menu_manager->pushMenu(MENUID_EXITGAME);
+  }
+}
+
 /* EOF */
--- supertuxkart-0.2/src/gui/main_menu.hpp~	2006-10-06 13:57:13.000000000 +0200
+++ supertuxkart-0.2/src/gui/main_menu.hpp	2006-10-06 13:57:13.000000000 +0200
@@ -30,6 +30,7 @@
 
 	void select();
 	void keybd(int key);
+	void joybuttons( int whichJoy, int hold, int presses, int releases );
 };
 
 #endif

supertuxkart-fhs.patch:

--- NEW FILE supertuxkart-fhs.patch ---
--- supertuxkart-0.2/src/Makefile.am.aap	2006-09-24 21:20:17.000000000 +0200
+++ supertuxkart-0.2/src/Makefile.am	2006-09-24 21:20:21.000000000 +0200
@@ -23,7 +23,7 @@
 libstatic_ssg_a_SOURCES  = static_ssg.cpp static_ssg.hpp
 libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
 
-AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
+AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
 supertuxkart_SOURCES =             main.cpp  			\
 	material.cpp		   material.hpp           	\
 	material_manager.cpp	   material_manager.hpp    	\
--- supertuxkart-0.2/src/Makefile.in.aap	2006-09-24 21:20:26.000000000 +0200
+++ supertuxkart-0.2/src/Makefile.in	2006-09-24 21:20:37.000000000 +0200
@@ -220,7 +220,7 @@
 noinst_LIBRARIES = libstatic_ssg.a
 libstatic_ssg_a_SOURCES = static_ssg.cpp static_ssg.hpp
 libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
+AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
 supertuxkart_SOURCES = main.cpp  			\
 	material.cpp		   material.hpp           	\
 	material_manager.cpp	   material_manager.hpp    	\

supertuxkart-fullscreen.patch:

--- NEW FILE supertuxkart-fullscreen.patch ---
--- supertuxkart-0.2/src/plibdrv.cpp.aap	2006-09-24 20:57:17.000000000 +0200
+++ supertuxkart-0.2/src/plibdrv.cpp	2006-09-24 21:06:54.000000000 +0200
@@ -37,6 +37,11 @@
 \*********************************/
 
 void keyfn ( int key, int updown, int, int ) {
+  if ( (updown == PW_DOWN) && (key == '\r') && (pwGetModifiers() & PW_ALT) )
+  {
+    pwToggleFullscreen () ;
+    return;
+  }
   puKeyboard ( key, updown ) ;
 }
 
@@ -91,7 +96,13 @@
 
 void keystroke ( int key, int updown, int, int ) {
   if ( updown == PW_DOWN )
+  {
+    if ( (key == '\r') && (pwGetModifiers() & PW_ALT) ) {
+      pwToggleFullscreen () ;
+      return;
+    }
     lastKeystroke = key ;
+  }
 
   keyIsDown [ key ] = (updown == PW_DOWN) ;
 }
@@ -122,6 +133,8 @@
 void InitPlib() {
   pwInit ( 0, 0, config->width, config->height,
 	   FALSE, "Super Tux Kart", TRUE, 0 ) ;
+  pwSetResizable ( FALSE );
+  pwSetFullscreen () ;
 
   puInit () ;
   ssgInit () ;
--- supertuxkart-0.2/src/gui/race_gui.cpp.noot	2006-09-24 22:01:07.000000000 +0200
+++ supertuxkart-0.2/src/gui/race_gui.cpp	2006-09-24 22:01:13.000000000 +0200
@@ -55,12 +55,16 @@
   fpsTimer.reset();
   fpsTimer.update();
   fpsTimer.setMaxDelta(1000);
-  
+
+  // Don't show the mouse in fullscreen mode during the race
+  pwSetCursorEx ( PW_CURSOR_LEFT, PW_CURSOR_NONE ) ;
 }   // RaceGUI
 
 // -----------------------------------------------------------------------------
 RaceGUI::~RaceGUI() {
 	//FIXME: does all that material stuff need freeing somehow?
+  // Show the mouse in fullscreen mode again
+  pwSetCursorEx ( PW_CURSOR_LEFT, PW_CURSOR_LEFT ) ;
 }   // ~Racegui
 
 // -----------------------------------------------------------------------------


--- NEW FILE supertuxkart-images-legal.txt ---
The following images where taken from: http://www.wpclipart.com/ a Public
Domain clipart collection and thus are in the publicdomain:
images/bananawrap.rgb
images/lunchbox.rgb
images/lunchbox2.rgb
"The cartoon-ish character" in images/adverts.rgb

---

Supertuxkart contains some images which are trademarkish or trademarked as
described below:

---

The tuxpaint logo (http://www.newbreedsoftware.com/tuxpaint/) in
images/adverts.rgb is copyrighted (GPL) and used with the permission of the
tuxpaint author:

Return-Path: <nbs at sonic.net>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 47893342 for j.w.r.degoede at hhs.nl; Thu, 01 Jun 2006 21:03:14 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62)
	(envelope-from <nbs at sonic.net>)
	id 1FlsRt-00011S-0a
	for j.w.r.degoede at hhs.nl; Thu, 01 Jun 2006 21:03:14 +0200
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham 
	version=3.1.0
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <nbs at sonic.net>)
	id 1FlsRs-00011O-Sl
	for j.w.r.degoede at hhs.nl; Thu, 01 Jun 2006 21:03:12 +0200
Received: from [64.142.19.5] (port=35242 helo=b.mail.sonic.net)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <nbs at sonic.net>)
	id 1FlsRs-00011C-83
	for j.w.r.degoede at hhs.nl; Thu, 01 Jun 2006 21:03:12 +0200
Received: from newshell.sonic.net (bolt.sonic.net [208.201.242.19])
	by b.mail.sonic.net (8.13.6/8.13.3) with ESMTP id k51J3BrW028314
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <j.w.r.degoede at hhs.nl>; Thu, 1 Jun 2006 12:03:11 -0700
Received: from bolt.sonic.net (IDENT:lshZbY61PF19/2FQrpB8Un0NwLi5Usne at localhost.localdomain [127.0.0.1])
	by newshell.sonic.net (8.13.6/8.12.1) with ESMTP id k51J3Bxf024586
	for <j.w.r.degoede at hhs.nl>; Thu, 1 Jun 2006 12:03:11 -0700
Received: (from nbs at localhost)
	by bolt.sonic.net (8.13.6/8.12.1/Submit) id k51J3ASY024585
	for j.w.r.degoede at hhs.nl; Thu, 1 Jun 2006 12:03:10 -0700
Date: Thu, 1 Jun 2006 12:03:10 -0700
From: Bill Kendrick <nbs at sonic.net>
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Subject: Re: Tuxpaint logo usage
Message-ID: <20060601190310.GA23533 at sonic.net>
References: <447F3547.2080802 at hhs.nl>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <447F3547.2080802 at hhs.nl>
User-Agent: Mutt/1.4.2.1i
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 01062006 #185874, status: clean


Hi Hans!  Yes, go for it!  Thanks! :)

-bill!


On Thu, Jun 01, 2006 at 08:43:19PM +0200, Hans de Goede wrote:
> Hi,
> 
> First a short intro. I'm a Linux enthousiast / programmer and a packager
> for Fedora Extras which is an online community that packages software in
> the native package format for Fedora Core a (well known) Linux distribution.
> 
> As such I'm currently in the progress of packaging tuxkart an opensource
> racing game, which is hosted and distributed from sf.net. One of the
> tracks on which you can race is an ordinary racing track with
> advertisement boards along the side. Currently these advertisements are
> a bit of a problem as they show logo's of big companies without their
> permission. Hence I'm currently busy replacing these logo's with
> something more suitable. I would like to use the tuxpaint logo as one of
> the advertisements. Because of this I'm here by asking your permission
> for the use of the tuxpaint logo.
> 
> The logo is in no way used to promote the game, it is shown as
> an add, so if they promote anything it is tuxpaint.
> 
> Thanks & Regards,
> 
> Hans de Goede
> 
> 
> 

-- 
-bill!
bill at newbreedsoftware.com
http://www.newbreedsoftware.com/

---

The Fedora images in images/adverts.rgb incorporate the Fedora
trademark. The Fedora trademark is a trademark or registered trademark of Red
Hat, Inc. in the United States and other countries and are used by
permission.

For more info see the COPYING file of the fedora-logos package:
/usr/share/doc/fedora-logos-<version>/COPYING on any Fedora system with the
fedora-logos package installed.

Below the usage permission notice as received by mail:

Return-Path: <gdk at redhat.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 47843849 for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:51:45 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTv7-0006MP-0j
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:51:45 +0200
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,
	SPF_PASS autolearn=ham version=3.1.0
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTv6-0006MM-TF
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:51:44 +0200
Received: from [66.187.233.31] (port=56045 helo=mx1.redhat.com)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTv6-0006Lj-EE
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:51:44 +0200
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGph8g001950
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:43 -0400
Received: from devserv.devel.redhat.com (devserv.devel.redhat.com [172.16.58.1])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGpha5026590
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:43 -0400
Received: from gdk.devel.redhat.com (gdk.devel.redhat.com [172.16.62.88])
	by devserv.devel.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGphwX015818
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:43 -0400
Received: from gdk.devel.redhat.com (localhost.localdomain [127.0.0.1])
	by gdk.devel.redhat.com (8.12.11/8.12.11) with ESMTP id k4VGp6vE007024
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:06 -0400
Received: from localhost (gdk at localhost)
	by gdk.devel.redhat.com (8.12.11/8.12.11/Submit) with ESMTP id k4VGp6jt007020
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:51:06 -0400
X-Authentication-Warning: gdk.devel.redhat.com: gdk owned process doing -bs
Date: Wed, 31 May 2006 12:51:06 -0400 (EDT)
From: Greg DeKoenigsberg <gdk at redhat.com>
X-X-Sender: gdk at gdk.devel.redhat.com
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Subject: Re: Usage of Fedora logo inside FE package
In-Reply-To: <4479F694.2010604 at hhs.nl>
Message-ID: <Pine.LNX.4.58.0605311250480.6876 at gdk.devel.redhat.com>
References: <4479F694.2010604 at hhs.nl>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 31052006 #185572, status: clean


Very cool, Hans.  I'll send your logo and agreement shortly.

--g

-------------------------------------------------------------
Greg DeKoenigsberg || Fedora Project || fedoraproject.org
Be an Ambassador || http://fedoraproject.org/wiki/Ambassadors
-------------------------------------------------------------

On Sun, 28 May 2006, Hans de Goede wrote:

> Hi,
> 
> I'm currently in the progress of packaging tuxkart a racing game. One of
> the tracks on which you can race is an ordinary racing track with
> advertisement boards along the side.
> 
> As shipped by upstream these advertisementboards contain advertisments
> for real product which clearly violates trademarks for those products.
> 
> As such I'm in the progress of replacing these advertisement and some
> other troublish artwork. I've currently (in my private copy) replaced a
> few of the advertisements with the fedora logo, which seems appropriate
> for a Fedora package. Because of this I would like to have your
> permission for using the logo in this way. Notice that I've copy and
> pasted the logo, I cannot just use the image-file from Fedora-logo's
> because that is not in the .rgb format, which tuxkart needs.
> 
> Thanks & Regards,
> 
> Hans
> 

Return-Path: <gdk at redhat.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 47843851 for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:52:52 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTwC-0006cu-3l
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:52:52 +0200
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTwB-0006cr-NX
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:52:52 +0200
Received: from [66.187.233.31] (port=56334 helo=mx1.redhat.com)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <gdk at redhat.com>)
	id 1FlTw4-0006ae-5Y
	for j.w.r.degoede at hhs.nl; Wed, 31 May 2006 18:52:50 +0200
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGqgMn002593
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:42 -0400
Received: from devserv.devel.redhat.com (devserv.devel.redhat.com [172.16.58.1])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGqgkf026872
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:42 -0400
Received: from gdk.devel.redhat.com (gdk.devel.redhat.com [172.16.62.88])
	by devserv.devel.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k4VGqelD015899
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:40 -0400
Received: from gdk.devel.redhat.com (localhost.localdomain [127.0.0.1])
	by gdk.devel.redhat.com (8.12.11/8.12.11) with ESMTP id k4VGq3G7007042
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:03 -0400
Received: from localhost (gdk at localhost)
	by gdk.devel.redhat.com (8.12.11/8.12.11/Submit) with ESMTP id k4VGq2pj007038
	for <j.w.r.degoede at hhs.nl>; Wed, 31 May 2006 12:52:03 -0400
X-Authentication-Warning: gdk.devel.redhat.com: gdk owned process doing -bs
Date: Wed, 31 May 2006 12:52:02 -0400 (EDT)
From: Greg DeKoenigsberg <gdk at redhat.com>
X-X-Sender: gdk at gdk.devel.redhat.com
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Subject: Logo approval 
Message-ID: <Pine.LNX.4.58.0605311251430.6876 at gdk.devel.redhat.com>
MIME-Version: 1.0
Content-Type: MULTIPART/Mixed; BOUNDARY="279730238-1135091034-1148579299=:2501"
Content-ID: <Pine.LNX.4.58.0605311251431.6876 at gdk.devel.redhat.com>
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 31052006 #185572, status: clean

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime at docserver.cac.washington.edu for more info.

--279730238-1135091034-1148579299=:2501
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
Content-ID: <Pine.LNX.4.58.0605311251432.6876 at gdk.devel.redhat.com>


Here are your logo files, in SVG format.  Convert them to whatever formats
you wish to use.  By using these logos, you're agreeing to the following
simple rules:
                                                                                
1. You won't alter the logos, and you'll adhere to the style guide.

2. You'll only use the logos to describe Fedora stuff.  (i.e. you won't 
take the logo and slap it on Debian stuff.  Common sense.)

3. You won't use the logo for anything hateful or stupid.

4. We reserve the right to disallow your use of the logo.

Thanks for all your help supporting Fedora.

--g

---------------------------------------------------------------
Greg DeKoenigsberg || Fedora Foundation || fedoraproject.org
Be an Ambassador || http://fedoraproject.org/wiki/Ambassadors

---

The PlanetPenguin Racer logo (http://projects.planetpenguin.de/racer/) in
images/adverts.rgb is copyrighted (GPL) and used with the permission of the
ppracer authors:

Return-Path: <volker at planetpenguin.de>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 47974844 for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:54 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62)
	(envelope-from <volker at planetpenguin.de>)
	id 1FnXgB-00060S-GG
	for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:54 +0200
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham 
	version=3.1.0
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.62)
	(envelope-from <volker at planetpenguin.de>)
	id 1FnXgB-00060K-99
	for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:51 +0200
Received: from [217.160.131.21] (port=37440 helo=p15104914.pureserver.info)
	by koko.hhs.nl with esmtp (Exim 4.62)
	(envelope-from <volker at planetpenguin.de>)
	id 1FnXgA-0005zz-NE
	for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:50 +0200
Received: from [192.168.0.242] (p5493D342.dip.t-dialin.net [84.147.211.66])
	(authenticated (0 bits))
	by p15104914.pureserver.info (8.11.3/8.11.3/SuSE Linux 8.11.1-0.5) with ESMTP id k569GoU14013
	for <j.w.r.degoede at hhs.nl>; Tue, 6 Jun 2006 11:16:50 +0200
Subject: Re: PPracer "logo" usage
From: Volker =?ISO-8859-1?Q?Str=F6bel?= <volker at planetpenguin.de>
To: Hans de Goede <j.w.r.degoede at hhs.nl>
In-Reply-To: <4482F398.8000306 at hhs.nl>
References: <4482F398.8000306 at hhs.nl>
Content-Type: text/plain
Date: Tue, 06 Jun 2006 11:14:08 +0200
Message-Id: <1149585248.6996.2.camel at localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.6.1 
Content-Transfer-Encoding: 7bit
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 06062006 #186743, status: clean

Hi,
sorry for the late reply.

It's ok with me to include the logo.
And nice to see, that someone finally replaces this old stuff with logos
from FOSS projects.

Regards,
Volker


Am Sonntag, den 04.06.2006, 16:52 +0200 schrieb Hans de Goede:
> Hi,
> 
> Did you receive my mail below? This is currently the last thing keeping
> me from releasing a tuxkart package for Fedora. If you don't want the
> ppracer logo included thats fine too, then I'll dig up some other
> graphics to put in there as "advertisements"
> 
> Regards,
> 
> Hans
> 
> p.s.
> 
> I've attached the "logo" as it will be included I did some gimp-ing to
> get it to be a little bit more square. Feel free to use it.
> 
> 
> ---
> 
> 
> Hi,
> 
> First a short intro. I'm a Linux enthousiast / programmer and a packager
> for Fedora Extras which is an online community that packages software in
> the native package format for Fedora Core a (well known) Linux distribution.
> 
> As such I'm currently in the progress of packaging tuxkart an opensource
> racing game, which is hosted and distributed from sf.net. One of the
> tracks on which you can race is an ordinary racing track with
> advertisement boards along the side. Currently these advertisements are
> a bit of a problem as they show logo's of big companies without their
> permission. Hence I'm currently busy replacing these logo's with
> something more suitable. I would like to use the ppracer "logo" *  as
> one of the advertisements. Because of this I'm here by asking your
> permission for the use of the ppracer logo.
> 
> The logo is in no way used to promote the game, it is shown as
> an add, so if it promotes anything it is ppracer.
> 
> Thanks & Regards,
> 
> Hans de Goede
> 
> * The yellow "planet penguin racer" text above the menu where the
> tuxracer logo used to be
> 

supertuxkart-nomnm.patch:

--- NEW FILE supertuxkart-nomnm.patch ---
--- supertuxkart-0.2/models/mnm.ac.nomnm	2006-05-04 00:14:38.000000000 +0200
+++ supertuxkart-0.2/models/mnm.ac	2006-09-24 21:11:28.000000000 +0200
@@ -5,7 +5,7 @@
 OBJECT poly
 name "rect"
 loc 0.0261096 0.0456918 0
-texture "../images/mnm.rgb"
+texture "../images/bananawrap.rgb"
 numvert 4
 -1 0 -0.6
 1 0 -0.6
--- supertuxkart-0.2/data/olivermath.loc.nomnm	2006-09-02 11:59:16.000000000 +0200
+++ supertuxkart-0.2/data/olivermath.loc	2006-09-24 21:10:00.000000000 +0200
@@ -20,8 +20,8 @@
 "backpack.ac",-12,5,{},0,{},{}
 "ruler_bridge.ac",60,20,{},0,{},{}
 "ruler_jump.ac",-20,20,{},160,{},{}
-"mnm.ac",50,10,{},0,{},{}
-"mnm.ac",-30,70,{},0,{},{}
+"bananawrap.ac",50,10,{},0,{},{}
+"bananawrap.ac",-30,70,{},0,{},{}
 "paperairplane.ac",0,80,{},-40,{},{}
 "teachersdesk.ac",40,75,{},0,{},{}
 "teachersdesk.ac",63,95,{},90,{},{}
--- supertuxkart-0.2/data/materials.dat.nomnm	2006-09-24 21:11:00.000000000 +0200
+++ supertuxkart-0.2/data/materials.dat	2006-09-24 21:11:07.000000000 +0200
@@ -45,7 +45,7 @@
 "grass.rgb"            N N     N      0.0     Y     N   0.1     N   N    N    N
 "track2.rgb"           N N     N      0.0     Y     N   1.0     N   N    N    N
 "zipper.rgb"           N N     N      0.0     N     N   1.0     N   Y    N    N
-"mnm.rgb"              Y Y     Y      0.5     N     N   1.0     N   Y    N    N
+"bananawrap.rgb"       Y Y     Y      0.5     N     N   1.0     N   Y    N    N
 "fuzzy.rgb"            Y Y     Y      0.2     N     N   0.5     Y   N    N    N
 "mriceblockshadow.rgb" Y Y     Y      0.0     N     N   1.0     Y   N    N    N
 "mriceblockicon.rgb"   Y Y     Y      0.0     N     N   1.0     Y   N    N    N
--- supertuxkart-0.2/src/sound.cpp~	2006-10-06 16:18:21.000000000 +0200
+++ supertuxkart-0.2/src/sound.cpp	2006-10-06 16:18:21.000000000 +0200
@@ -74,7 +74,8 @@
 
   //FIXME: The following 3 sounds are not used in the game yet.
   sfx[SOUND_BACK_MENU     ].fname = "wavs/tintagel/deselect_option.wav";
-  sfx[SOUND_SELECT_MENU   ].fname = "wavs/tintagel/select_option.wav";
+  //FIXME removed because copyrighted
+  //sfx[SOUND_SELECT_MENU   ].fname = "wavs/tintagel/select_option.wav";
   sfx[SOUND_MOVE_MENU     ].fname = "wavs/tintagel/move_option.wav";
 
   sfx[SOUND_FULL          ].fname = "wavs/tintagel/energy_bar_full.wav";
--- supertuxkart-0.2/src/sound.hpp~	2006-10-06 16:18:29.000000000 +0200
+++ supertuxkart-0.2/src/sound.hpp	2006-10-06 16:18:29.000000000 +0200
@@ -28,7 +28,7 @@
 		    SOUND_SHOT, SOUND_OW,     SOUND_WEE,   SOUND_EXPLOSION,
 		    SOUND_BZZT, SOUND_BEEP,
             SOUND_BACK_MENU, SOUND_USE_ANVIL, SOUND_USE_PARACHUTE,
-		    SOUND_SELECT_MENU, SOUND_MOVE_MENU, SOUND_FULL,
+		    SOUND_MOVE_MENU, SOUND_FULL,
 		    SOUND_PRESTART, SOUND_START, SOUND_MISSILE_LOCK,
 		    SOUND_TRAFFIC_JAM, NUM_SOUNDS};
 


--- NEW FILE supertuxkart.6 ---
.\" SuperTuxKart -- 3D GoKart racing game
.\" Copyright (c) 2001 Steve Baker, Daniel Kobras
.\" Copyright (c) 2006 The SuperTuxKart Team (See AUTHORS file)
.\"
.\" This manual page 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.
.\"
.\" This manual page was written especially for Debian Linux. It is based
.\" on information available from tuxkart's website at
.\" http://tuxkart.sourceforge.net
.\"
.TH SUPERTUXKART 6 "November 15, 2001"
.SH NAME
SuperTuxKart \- 3D GoKart racing game
.SH SYNOPSIS
.B supertuxkart
.SH DESCRIPTION
\fBsupertuxkart\fP is an arcade-style game where driving faster than your
opponents will do the trick. You're taking the role of Tux, the Linux mascot,
steering its go-kart around various courses, racing against computer-controlled
vehicles.
.PP
The main window that opens on startup provides a menu to select the racemode,
track to race on, the number of laps to go, etc. In the race, you can either
use a joystick, or the keyboard for steering.
.PP
During the race, several goodies can make your life easier while other gadgets
shall give you a really tough ride. Go for the arrow shaped red and black
zipper patches on the track, as they boost your cart onwards. The question mark
cubes hide some nice powerups. Beware of the big spinning banana's though, they
are yucky and slow you down. The herring coins on the other hand make for a
fine appetizer. Eat enough of them, and the next question mark cube might yield
not only one, but up to five powerups at once. Note that bad things happen at
once, while the good things (well, good for you...) need to be activated.
Here's the list of available extras:
.PP
.TP
.B Goodies
.TP
.I Missiles
Unguided but fast. If they hit anything, they explode impressively. The effect
on a cart is to stop it dead, so it has to accelerate again.
.TP
.I Homing missiles
Slower than the regular kind, but they track the nearest kart and are quite
hard to shake off.
.TP
.I Fuzzy blobs
Even slower still - a kart can outrun them quite easily. They ricochet off the
sides of the track and only explode when they hit a cart.
.TP
.I Magnets
If you activate a magnet then it hangs around for about 15 seconds. If anyone
comes within about 20 meters, you'll be pulled towards them and end up glued to
their tail until the magnet 'expires'. Great for catching up with someone -
hopeless for passing them.
.TP
.I Portable Zippers
These are just like the zipper patches on the track itself. They give you 
sudden acceleration and temporarily increase the top speed of your cart.
.TP
.B Badies
.TP
.I Parachute
This pops out the back of your cart and slows you down a little for a few
seconds only. Enough to drop you back one place if it's a close race though.
.TP
.I Anvil
Gets dragged behind your cart on a rope for an even shorter amount of time than
the parachute, but the drag effect is much stronger. Your cart hardly moves at
all.
.PP
.SH CONTROLS
.TP
.B \fRJoystick\fB Left/Right \fRor Key\fB Left/Right
Steer.
.TP
.B \fRJoystick\fB Button 1 \fRor Key\fB Up
Accelerate.
.TP
.B \fRJoystick\fB Button 2 \fRor Key\fB Down
Brake.
.TP
.B \fRJoystick\fB Button 3 \fRor Key\fB f
Use a special item (if you've collected one).
.TP
.B \fRJoystick\fB Button 4 \fRor Key\fB d
Ask to be rescued by Tinytux.
.TP
.B \fRJoystick\fB Button 5 \fRor Key\fB a
Pop a wheelie--makes you go really fast, but you'll be unable to steer.
.TP
.B \fRKey\fB Esc
Pop up or hide the menu.
.PP
.SH KNOWN BUGS
.PP
No drive-with-the-mouse support.
.PP
Slow performance on CPUs less than ~450MHz.
.PP
If you (or one of the computer players) goes off the edge of the
track, or calls for rescue then Tinytux doesn't always manage to
put you back onto the track correctly. If this happens, you may
need to goto the menu to restart the race.
.PP
Sometimes you can be pushed through a solid object if you are hit
by another player when in contact with the surface.
.PP
.SH ENVIRONMENT
.TP
.B MESA_GLX_FX
If this environment variable is set, the game's resolution
will switch from the default 640x480 to 320x240. This is mostly of interest
if you have a Voodoo-1/2 graphics card and usually set this variable to
fullscreen.
.TP
.B TUXKART_DATADIR
Path to the location of game data. Usually you don't have to mess with this
variable.
.TP
.B TUXKART_TRACKLIST
Path to the location of track data. Usually you don't have to mess with this
variable.
.PP
.SH AUTHOR
This manual page was written by Daniel Kobras <kobras at debian.org>,
for the Debian GNU/Linux system (but may be used by others). It was updated
for supertuxkart by Hans de Goede <j.w.r.degoede at hhs.nl> for the Fedora
GNU/Linux distribution.


--- NEW FILE supertuxkart.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Supertuxkart
Comment=3D go-kart racing game
Exec=supertuxkart
Icon=supertuxkart.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;


--- NEW FILE supertuxkart.spec ---
Name:           supertuxkart
Version:        0.2
Release:        3%{?dist}
Summary:        Kids 3D go-kart racing game featuring Tux
Group:          Amusements/Games
License:        GPL
URL:            http://supertuxkart.berlios.de/
# This is not the official upstream tarbal which can be found here:
# http://download.berlios.de/supertuxkart/SuperTuxKart-0.2.tar.bz2
# This version has some copyrighted / trademarked images and sounds removed,
# these are replaced with new ones from supertuxkart-alt-images.tar.gz
# see supertuxkart-images-legal.txt for the copyright/trademark info on the
# new ones. The following images and sounds where replaced:
# adverts.rgb, lunchbox.rgb, lunchbox2.rgb, mnm.rgb (with bananawrap.rgb),
# brick.rgb, explode.rgb, mathclasswest.rgb (pokemon poster removed),
# explode2.rgb (unused, removed), select_option.wav (unused, removed).
Source0:        %{name}-%{version}.tar.gz
Source1:        %{name}-alt-images.tar.gz
Source2:        %{name}.desktop
Source3:        %{name}.png
Source4:        %{name}.6
Source5:        %{name}-images-legal.txt
Patch0:         supertuxkart-fhs.patch
Patch1:         supertuxkart-fullscreen.patch
Patch2:         supertuxkart-nomnm.patch
Patch3:         supertuxkart-0.2-joy1.patch
Patch4:         supertuxkart-0.2-joy2.patch
Patch5:         supertuxkart-0.2-joy3.patch
Patch6:         supertuxkart-0.2-gpmenu.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  plib-devel libXt-devel desktop-file-utils
# Provide so that yum install tuxkart will work, obsolete for auto upgrade
Provides:       tuxkart = 0.4.0-6
Obsoletes:      tuxkart < 0.4.0-6

%description
3D go-kart racing game for kids with several famous OpenSource mascots
participating. Race as Tux against 3 computer players in many different fun
race courses (Standard race track, Dessert, Mathclass, etc). Full information
on how to add your own race courses is included. During the race you can pick
up powerups such as: (homing) missiles, magnets and portable zippers.


%prep
%setup -q
%patch0 -p1 -z .fhs
%patch1 -p1 -z .fs
%patch2 -p1 -z .nomnm
mv models/mnm.ac models/bananawrap.ac
%patch3 -p1 -z .joy1
%patch4 -p1 -z .joy2
%patch5 -p1 -z .joy3
%patch6 -p1 -z .gpmenu
tar xf %{SOURCE1}
cp %{SOURCE5} .
chmod -x AUTHORS CHANGES COPYING README TODO
# stop automake from rerunning because of our patches above
touch src/Makefile.in


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# easier then patching all the Makefile's
mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE3} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps

# add the manpage (courtesy of Debian)
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man6


%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 CHANGES COPYING README TODO %{name}-images-legal.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2-3
- replace some more coprighted images and sounds
- fix a bunch of joystick related bugs

* Mon Sep 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2-2
- rename images-legal.txt to supertuxkart-images-legal.txt
- add a changelog entry for the previous release (and this one)

* Mon Sep 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2-1
- initial Fedora Extras package (replacing regular tuxkart)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 14:34:57 -0000	1.1
+++ .cvsignore	6 Oct 2006 14:37:01 -0000	1.2
@@ -0,0 +1,2 @@
+supertuxkart-0.2.tar.gz
+supertuxkart-alt-images.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 14:34:57 -0000	1.1
+++ sources	6 Oct 2006 14:37:01 -0000	1.2
@@ -0,0 +1,2 @@
+2371aa8b3d9201c97fee901accbe7280  supertuxkart-0.2.tar.gz
+c0d4c9b055d2a95a006f60bff2058f37  supertuxkart-alt-images.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 14:47:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 07:47:25 -0700
Subject: rpms/tuxkart/devel dead.package, NONE, 1.1 images-legal.txt, 1.1,
	NONE sources, 1.2, NONE tuxkart-0.4.0-debian.patch, 1.1,
	NONE tuxkart-0.4.0-fhs.patch, 1.1,
	NONE tuxkart-0.4.0-fullscreen.patch, 1.1,
	NONE tuxkart-0.4.0-nomnm.patch, 1.1,
	NONE tuxkart-0.4.0-nounnecesarry-libs.patch, 1.1, NONE tuxkart.6,
	1.1, NONE tuxkart.desktop, 1.1, NONE tuxkart.png, 1.1,
	NONE tuxkart.spec, 1.3, NONE
Message-ID: <200610061447.k96ElR0w001793@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/tuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1777

Added Files:
	dead.package 
Removed Files:
	images-legal.txt sources tuxkart-0.4.0-debian.patch 
	tuxkart-0.4.0-fhs.patch tuxkart-0.4.0-fullscreen.patch 
	tuxkart-0.4.0-nomnm.patch 
	tuxkart-0.4.0-nounnecesarry-libs.patch tuxkart.6 
	tuxkart.desktop tuxkart.png tuxkart.spec 
Log Message:
Upstream is dead (or barely alive) project has been forked to
Supertuxkart. Supertuxkart is in FE now and tuxkart will automaticaly be
updated to Supertuxkart by yum.



--- NEW FILE dead.package ---
Upstream is dead (or barely alive) project has been forked to
Supertuxkart. Supertuxkart is in FE now and tuxkart will automaticaly be
updated to Supertuxkart by yum.


--- images-legal.txt DELETED ---


--- sources DELETED ---


--- tuxkart-0.4.0-debian.patch DELETED ---


--- tuxkart-0.4.0-fhs.patch DELETED ---


--- tuxkart-0.4.0-fullscreen.patch DELETED ---


--- tuxkart-0.4.0-nomnm.patch DELETED ---


--- tuxkart-0.4.0-nounnecesarry-libs.patch DELETED ---


--- tuxkart.6 DELETED ---


--- tuxkart.desktop DELETED ---


--- tuxkart.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 15:34:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 08:34:49 -0700
Subject: rpms/uw-imap/devel c-client.cf,1.1,1.2 uw-imap.spec,1.18,1.19
Message-ID: <200610061534.k96FYpaw004940@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4921

Modified Files:
	c-client.cf uw-imap.spec 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
- omit EOL whitespace from c-client.cf



Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/c-client.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- c-client.cf	4 Oct 2006 18:04:13 -0000	1.1
+++ c-client.cf	6 Oct 2006 15:34:48 -0000	1.2
@@ -1,3 +1,3 @@
 I accept the risk of using UW-IMAP
 set new-folder-format same-as-inbox
-set mail-subdirectory Mail 
+set mail-subdirectory Mail


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- uw-imap.spec	5 Oct 2006 12:04:36 -0000	1.18
+++ uw-imap.spec	6 Oct 2006 15:34:48 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -231,14 +231,15 @@
 %files
 %defattr(-,root,root,-)
 %doc docs/SSLBUILD
-%config %{_sysconfdir}/pam.d/imap
-%config %{_sysconfdir}/pam.d/pop
+%config(noreplace) %{_sysconfdir}/pam.d/imap
+%config(noreplace) %{_sysconfdir}/pam.d/pop
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
 # These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
-%config %{_sysconfdir}/xinetd.d/imaps
-%config %{_sysconfdir}/xinetd.d/pop3s
+# do this in a %trigger or something not here... -- Rex
+%config(noreplace) %{_sysconfdir}/xinetd.d/imaps
+%config(noreplace) %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
 %{_mandir}/man8/*
@@ -273,6 +274,12 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
+- omit EOL whitespace from c-client.cf
+
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-5
+- %%config(noreplace) all xinetd.d/pam.d bits
+
 * Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
 - eek, pam.d/xinet.d bits were all mixed up, fixed.
 



From fedora-extras-commits at redhat.com  Fri Oct  6 15:35:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 08:35:26 -0700
Subject: rpms/uw-imap/FC-5 c-client.cf, 1.1, 1.2 uw-imap.spec, 1.13,
	1.14 imap-2006-mixproto.patch, 1.1, NONE
Message-ID: <200610061535.k96FZSr8005008@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4989

Modified Files:
	c-client.cf uw-imap.spec 
Removed Files:
	imap-2006-mixproto.patch 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
- omit EOL whitespace from c-client.cf



Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/c-client.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- c-client.cf	4 Oct 2006 18:11:55 -0000	1.1
+++ c-client.cf	6 Oct 2006 15:35:26 -0000	1.2
@@ -1,3 +1,3 @@
 I accept the risk of using UW-IMAP
 set new-folder-format same-as-inbox
-set mail-subdirectory Mail 
+set mail-subdirectory Mail


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- uw-imap.spec	5 Oct 2006 12:06:19 -0000	1.13
+++ uw-imap.spec	6 Oct 2006 15:35:26 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -231,14 +231,15 @@
 %files
 %defattr(-,root,root,-)
 %doc docs/SSLBUILD
-%config %{_sysconfdir}/pam.d/imap
-%config %{_sysconfdir}/pam.d/pop
+%config(noreplace) %{_sysconfdir}/pam.d/imap
+%config(noreplace) %{_sysconfdir}/pam.d/pop
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
 # These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
-%config %{_sysconfdir}/xinetd.d/imaps
-%config %{_sysconfdir}/xinetd.d/pop3s
+# do this in a %trigger or something not here... -- Rex
+%config(noreplace) %{_sysconfdir}/xinetd.d/imaps
+%config(noreplace) %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
 %{_mandir}/man8/*
@@ -273,6 +274,12 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
+- omit EOL whitespace from c-client.cf
+
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-5
+- %%config(noreplace) all xinetd.d/pam.d bits
+
 * Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
 - eek, pam.d/xinet.d bits were all mixed up, fixed.
 


--- imap-2006-mixproto.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 15:46:11 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  6 Oct 2006 08:46:11 -0700
Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.11,1.12
Message-ID: <200610061546.k96FkDf4005100@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5083

Modified Files:
	scim-tomoe.spec 
Log Message:
Fix the release number.



Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-tomoe.spec	15 Sep 2006 15:40:20 -0000	1.11
+++ scim-tomoe.spec	6 Oct 2006 15:46:11 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           scim-tomoe
 Version:        0.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Oct 7 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2.0-6
+- fix the release number for upgrading install from FE5 to FE6.
+
 * Sat Sep 15 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2.0-5
 - mass rebuilding.
 



From fedora-extras-commits at redhat.com  Fri Oct  6 15:50:54 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri,  6 Oct 2006 08:50:54 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.3, 1.4 cobbler.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610061550.k96FouQq005191@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5170

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream bugfixes, updated to 0.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Sep 2006 18:27:15 -0000	1.3
+++ .cvsignore	6 Oct 2006 15:50:54 -0000	1.4
@@ -1,2 +1,3 @@
 cobbler-0.1.1.tar.gz
 cobbler-0.2.1.tar.gz
+cobbler-0.2.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cobbler.spec	29 Sep 2006 18:26:26 -0000	1.2
+++ cobbler.spec	6 Oct 2006 15:50:54 -0000	1.3
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.1
+Version: 0.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/page/Cobbler_%26_Koan_Provisioning_Tools
+Url: http://et.redhat.com/~mdehaan/cobbler
 
 %description
 
@@ -54,6 +54,12 @@
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
+* Fri Oct 6 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
+- Upstream bugfixes
+
+* Fri Sep 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.1-2
+- URL update
+
 * Thu Sep 28 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
 - Upstream pull of bugfixes and new remote system "enchant" feature
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Sep 2006 18:26:26 -0000	1.3
+++ sources	6 Oct 2006 15:50:54 -0000	1.4
@@ -1 +1 @@
-eacc7153af9e5deb81bbc11b49f663f6  cobbler-0.2.1.tar.gz
+63e4550219de15865d197a47ac00ecfd  cobbler-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 16:20:16 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:20:16 -0700
Subject: rpms/perl-Readonly-XS/FC-5 perl-Readonly-XS.spec,1.2,1.3
Message-ID: <200610061620.k96GKIEQ008339@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284/FC-5

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
Drop buildrequires on perl(Readonly); patch Makefile.PL to keep it from
complaining.  This should resolve the rather involved little loop I
inadvertently introduced some moments ago.



Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/FC-5/perl-Readonly-XS.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Readonly-XS.spec	9 Dec 2005 05:53:13 -0000	1.2
+++ perl-Readonly-XS.spec	6 Oct 2006 16:20:16 -0000	1.3
@@ -1,38 +1,43 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        3%{?dist}
-Summary:        Companion module for Readonly.pm
+Release:        6%{?dist}
+Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Readonly-XS/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-XS-%{version}.tar.gz
+Patch0:         makefile.pl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl(Readonly) >= 1.02
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Readonly) >= 1.02
 
+
 %description
-Readonly-XS is a companion module for Readonly.pm, to speed up read-only
-scalar variables
+Readonly::XS is a companion module for Readonly, to speed up read-only
+scalar variables.
+
 
 %prep
 %setup -q -n Readonly-XS-%{version}
+%patch0
 
 
 %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 f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -40,7 +45,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -52,6 +57,16 @@
 
 
 %changelog
+* Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-6
+- drop br on perl(Readonly), patch Makefile.PL as well
+- rework spec to use macros
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.04-5
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-4
+- bump for mass rebuild
+
 * Thu Dec 08 2005 Michael A. Peters <mpeters at mac.com> - 1.04-3
 - proper version on perl(Readonly) BuildRequires & Requires
 



From fedora-extras-commits at redhat.com  Fri Oct  6 16:20:15 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:20:15 -0700
Subject: rpms/perl-Readonly-XS Makefile,1.1,1.2
Message-ID: <200610061620.k96GKHNn008335@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284

Modified Files:
	Makefile 
Log Message:
Drop buildrequires on perl(Readonly); patch Makefile.PL to keep it from
complaining.  This should resolve the rather involved little loop I
inadvertently introduced some moments ago.



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	8 Dec 2005 19:12:28 -0000	1.1
+++ Makefile	6 Oct 2006 16:20:15 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Fri Oct  6 16:20:17 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:20:17 -0700
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.4,1.5
Message-ID: <200610061620.k96GKJJ2008343@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284/devel

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
Drop buildrequires on perl(Readonly); patch Makefile.PL to keep it from
complaining.  This should resolve the rather involved little loop I
inadvertently introduced some moments ago.



Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Readonly-XS.spec	4 Oct 2006 22:43:40 -0000	1.4
+++ perl-Readonly-XS.spec	6 Oct 2006 16:20:16 -0000	1.5
@@ -1,38 +1,43 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        5%{?dist}
-Summary:        Companion module for Readonly.pm
+Release:        6%{?dist}
+Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Readonly-XS/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-XS-%{version}.tar.gz
+Patch0:         makefile.pl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl(Readonly) >= 1.02
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Readonly) >= 1.02
 
+
 %description
-Readonly-XS is a companion module for Readonly.pm, to speed up read-only
-scalar variables
+Readonly::XS is a companion module for Readonly, to speed up read-only
+scalar variables.
+
 
 %prep
 %setup -q -n Readonly-XS-%{version}
+%patch0
 
 
 %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 f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -40,7 +45,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -52,8 +57,12 @@
 
 
 %changelog
+* Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-6
+- drop br on perl(Readonly), patch Makefile.PL as well
+- rework spec to use macros
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.04-5
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-4
 - bump for mass rebuild



From fedora-extras-commits at redhat.com  Fri Oct  6 16:21:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:21:51 -0700
Subject: rpms/perl-Readonly-XS/devel makefile.pl.patch,NONE,1.1
Message-ID: <200610061621.k96GLrVd008439@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8421

Added Files:
	makefile.pl.patch 
Log Message:
there's always something...

makefile.pl.patch:

--- NEW FILE makefile.pl.patch ---
--- Makefile.PL.orig	2006-10-06 08:44:30.403840967 -0700
+++ Makefile.PL	2006-10-06 08:44:42.180431002 -0700
@@ -5,7 +5,7 @@
 WriteMakefile(
     'NAME'		=> 'Readonly::XS',
     'VERSION_FROM'	=> 'XS.pm', # finds $VERSION
-    'PREREQ_PM'		=> {Readonly => 1.02}, # e.g., Module::Name => 1.1
+    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
       (AUTHOR     => 'Eric Roode <roode at cpan.org>') : ()),
     'LIBS'		=> [''], # e.g., '-lm'



From fedora-extras-commits at redhat.com  Fri Oct  6 16:23:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:23:45 -0700
Subject: rpms/perl-Readonly-XS/FC-5 makefile.pl.patch,NONE,1.1
Message-ID: <200610061623.k96GNlMc008551@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8533

Added Files:
	makefile.pl.patch 
Log Message:
there's always something...

makefile.pl.patch:

--- NEW FILE makefile.pl.patch ---
--- Makefile.PL.orig	2006-10-06 08:44:30.403840967 -0700
+++ Makefile.PL	2006-10-06 08:44:42.180431002 -0700
@@ -5,7 +5,7 @@
 WriteMakefile(
     'NAME'		=> 'Readonly::XS',
     'VERSION_FROM'	=> 'XS.pm', # finds $VERSION
-    'PREREQ_PM'		=> {Readonly => 1.02}, # e.g., Module::Name => 1.1
+    'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
       (AUTHOR     => 'Eric Roode <roode at cpan.org>') : ()),
     'LIBS'		=> [''], # e.g., '-lm'



From fedora-extras-commits at redhat.com  Fri Oct  6 16:27:20 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:27:20 -0700
Subject: rpms/perl-Readonly-XS/FC-5 perl-Readonly-XS.spec,1.3,1.4
Message-ID: <200610061627.k96GRMhG008639@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8608/FC-5

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
there's always something...


Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/FC-5/perl-Readonly-XS.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Readonly-XS.spec	6 Oct 2006 16:20:16 -0000	1.3
+++ perl-Readonly-XS.spec	6 Oct 2006 16:27:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-7
+- bump for missing patch...
+
 * Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-6
 - drop br on perl(Readonly), patch Makefile.PL as well
 - rework spec to use macros



From fedora-extras-commits at redhat.com  Fri Oct  6 16:27:21 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri,  6 Oct 2006 09:27:21 -0700
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.5,1.6
Message-ID: <200610061627.k96GRNfg008643@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8608/devel

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
there's always something...


Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Readonly-XS.spec	6 Oct 2006 16:20:16 -0000	1.5
+++ perl-Readonly-XS.spec	6 Oct 2006 16:27:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-7
+- bump for missing patch...
+
 * Fri Oct 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-6
 - drop br on perl(Readonly), patch Makefile.PL as well
 - rework spec to use macros



From fedora-extras-commits at redhat.com  Fri Oct  6 17:26:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 10:26:02 -0700
Subject: rpms/libtunepimp/FC-5 .cvsignore, 1.5, 1.6 libtunepimp.spec, 1.14, 
	1.15 sources, 1.4, 1.5 libtunepimp-0.4.3-PLUGIN_DIR.patch, 1.1, NONE
Message-ID: <200610061726.k96HQ4lF012001@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11980

Modified Files:
	.cvsignore libtunepimp.spec sources 
Removed Files:
	libtunepimp-0.4.3-PLUGIN_DIR.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
- 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Sep 2006 18:08:14 -0000	1.5
+++ .cvsignore	6 Oct 2006 17:26:02 -0000	1.6
@@ -1,2 +1,2 @@
-libtunepimp-0.4.3.tar.gz
-libtunepimp-0.5.1.tar.gz
+clog
+libtunepimp-0.5.2.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/libtunepimp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libtunepimp.spec	26 Sep 2006 18:08:14 -0000	1.14
+++ libtunepimp.spec	6 Oct 2006 17:26:02 -0000	1.15
@@ -1,8 +1,8 @@
 
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
-Version: 0.4.3
-Release: 7%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -10,25 +10,30 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://lists.musicbrainz.org/pipermail/musicbrainz-devel/2006-September/001856.html
 %define pkglibdir %{_libdir}/tunepimp
-Patch1: libtunepimp-0.4.3-PLUGIN_DIR.patch
 
-BuildRequires: readline-devel ncurses-devel
-BuildRequires: zlib-devel
 BuildRequires: libmusicbrainz-devel >= 2.1.0
-BuildRequires: flac-devel
+BuildRequires: readline-devel ncurses-devel
 BuildRequires: libvorbis-devel
+BuildRequires: flac-devel
+BuildRequires: zlib-devel
 BuildRequires: taglib-devel
+BuildRequires: readline-devel ncurses-devel
+BuildRequires: libmpcdec-devel
 
-%if "%{name}" == "libtunepimp"
-Obsoletes: libtunepimp3 < %{version}-%{release}
-Provides:  libtunepimp3 = %{version}-%{release}
-%endif
+BuildRequires: libofa-devel
+# These two are likely bogus (used just in examples/ ) -- Rex
+BuildRequires: curl-devel
+BuildRequires: expat-devel
 
 Obsoletes: libtunepimp-tools < %{version}-%{release}
 Provides:  libtunepimp-tools = %{version}-%{release}
 
+%if "%{name}" == "libtunepimp"
+Obsoletes: libtunepimp5 < %{version}-%{release}
+Provides:  libtunepimp5 = %{version}-%{release}
+%endif
+
 %description
 The TunePimp library is a development library geared towards developers 
 who wish to create MusicBrainz enabled tagging applications.
@@ -38,7 +43,7 @@
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 %if "%{name}" == "libtunepimp"
-Provides:  libtunepimp3-devel = %{version}-%{release}
+Provides:  libtunepimp5-devel = %{version}-%{release}
 %else
 Conflicts: libtunepimp-devel
 %endif
@@ -49,7 +54,6 @@
 %prep
 %setup -q -n libtunepimp-%{version}
 
-%patch1 -p1 -b .PLUGIN_DIR
 
 %build
 %configure \
@@ -83,16 +87,18 @@
 %doc AUTHORS COPYING ChangeLog TODO 
 # README omitted, it's mostly useless
 %doc README.LGPL
-%{_bindir}/tp_tagger
-%{_bindir}/trm
+%{_bindir}/puid
 %{_libdir}/lib*.so.*
-%dir %{pkglibdir}
+%dir %{pkglibdir}/
 %dir %{pkglibdir}/plugins/
 %{pkglibdir}/plugins/flac.tpp
 %{pkglibdir}/plugins/mpc.tpp
+%{pkglibdir}/plugins/speex.tpp
 %{pkglibdir}/plugins/vorbis.tpp
+%{pkglibdir}/plugins/tta.tpp
 %{pkglibdir}/plugins/wav.tpp
 %{pkglibdir}/plugins/wma.tpp
+%{pkglibdir}/plugins/wv.tpp
 
 %files devel
 %defattr(-,root,root,-)
@@ -101,12 +107,15 @@
 
 
 %changelog
-* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-7
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
+- 0.5.2
+
+* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-2
 - drop -tools subpkg
-- compat pkg-ready (libtunepimp3)
 
-* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-6
-- PLUGIN_DIR patch, fix lib64 issues
+* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-1
+- PLUGIN_DIR patch, fix lib64 issues, make parallel-installable
+  with libtunepimp-0.4
 
 * Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-3
 - BR: taglib-devel, readline-devel, ncurses-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2006 17:12:47 -0000	1.4
+++ sources	6 Oct 2006 17:26:02 -0000	1.5
@@ -1 +1 @@
-3b6ea2f378a81a39b4b64c1aaf4b6d51  libtunepimp-0.4.3.tar.gz
+655b254539013f5e7fe50ac035c26dcb  libtunepimp-0.5.2.tar.gz


--- libtunepimp-0.4.3-PLUGIN_DIR.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 17:32:25 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri,  6 Oct 2006 10:32:25 -0700
Subject: rpms/python-matplotlib/devel .cvsignore, 1.12,
	1.13 python-matplotlib.spec, 1.19, 1.20 sources, 1.12, 1.13
Message-ID: <200610061732.k96HWRmr012100@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12079

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Log Message:
Update to 0.87.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Sep 2006 21:34:02 -0000	1.12
+++ .cvsignore	6 Oct 2006 17:32:24 -0000	1.13
@@ -1 +1 @@
-matplotlib-0.87.5.tar.gz
+matplotlib-0.87.6.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-matplotlib.spec	15 Sep 2006 21:34:02 -0000	1.19
+++ python-matplotlib.spec	6 Oct 2006 17:32:24 -0000	1.20
@@ -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-matplotlib
-Version:        0.87.5
+Version:        0.87.6
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Fri Oct  6 2006 Orion Poplawski <orion at cora.nwra.com> 0.87.6-1
+- Update to 0.87.6
+
 * Thu Sep  7 2006 Orion Poplawski <orion at cora.nwra.com> 0.87.5-1
 - Update to 0.87.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Sep 2006 21:34:02 -0000	1.12
+++ sources	6 Oct 2006 17:32:24 -0000	1.13
@@ -1 +1 @@
-af3015ceae28ab385dbe9f30c6d2f83e  matplotlib-0.87.5.tar.gz
+30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 18:02:02 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Fri,  6 Oct 2006 11:02:02 -0700
Subject: rpms/kadu/devel kadu.spec,1.6,1.7
Message-ID: <200610061802.k96I24gb015079@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15056

Modified Files:
	kadu.spec 
Log Message:
* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.10.20060915svn
- Not rebuilding kadu-amarok on some archs



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kadu.spec	16 Sep 2006 10:14:41 -0000	1.6
+++ kadu.spec	6 Oct 2006 18:02:02 -0000	1.7
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.9.%{cvs_date}svn%{?dist}
+Release:	0.10.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -406,7 +406,9 @@
 
 %mod_files2 xmms
 
+%ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
+%endif
 
 %mod_files2 filedesc
 
@@ -448,6 +450,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.10.20060915svn
+- Not rebuilding kadu-amarok on some archs
+
 * Sat Sep 16 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.9.20060915svn
 - Update upstream to 20060915
 - Move themes to external spec file



From fedora-extras-commits at redhat.com  Fri Oct  6 18:45:48 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Fri,  6 Oct 2006 11:45:48 -0700
Subject: rpms/kadu/devel kadu.spec,1.7,1.8
Message-ID: <200610061845.k96IjoPM015351@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15334

Modified Files:
	kadu.spec 
Log Message:
* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.11.20060915svn
- Rpmbuild build error workaround.



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kadu.spec	6 Oct 2006 18:02:02 -0000	1.7
+++ kadu.spec	6 Oct 2006 18:45:48 -0000	1.8
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.10.%{cvs_date}svn%{?dist}
+Release:	0.11.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -284,6 +284,14 @@
 done
 #+
 
+%ifnarch ppc64 x86_64 s390 s390x ia64
+rm -rf %{_moddata}/amarok.desc
+rm -rf %{_modlib}/amarok.so
+rm -rf %{_modtrans}/amarok*.qm
+rm -rf %{_moddata}/data/amarok
+%endif
+
+
 desktop-file-install --vendor fedora				\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	--add-category X-Fedora					\
@@ -450,6 +458,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.11.20060915svn
+- Rpmbuild build error workaround.
+
 * Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.10.20060915svn
 - Not rebuilding kadu-amarok on some archs
 



From fedora-extras-commits at redhat.com  Fri Oct  6 19:08:52 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Fri,  6 Oct 2006 12:08:52 -0700
Subject: rpms/kadu/devel kadu.spec,1.8,1.9
Message-ID: <200610061908.k96J8sXH018410@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18389

Modified Files:
	kadu.spec 
Log Message:
* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.12.20060915svn
- Yet another fix...



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kadu.spec	6 Oct 2006 18:45:48 -0000	1.8
+++ kadu.spec	6 Oct 2006 19:08:52 -0000	1.9
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.11.%{cvs_date}svn%{?dist}
+Release:	0.12.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -285,10 +285,10 @@
 #+
 
 %ifnarch ppc64 x86_64 s390 s390x ia64
-rm -rf %{_moddata}/amarok.desc
-rm -rf %{_modlib}/amarok.so
-rm -rf %{_modtrans}/amarok*.qm
-rm -rf %{_moddata}/data/amarok
+rm -rf $RPM_BUILD_ROOT%{_moddata}/amarok.desc
+rm -rf $RPM_BUILD_ROOT%{_modlib}/amarok.so
+rm -rf $RPM_BUILD_ROOT%{_modtrans}/amarok*.qm
+rm -rf $RPM_BUILD_ROOT%{_moddata}/data/amarok
 %endif
 
 
@@ -458,6 +458,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.12.20060915svn
+- Yet another fix...
+
 * Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.11.20060915svn
 - Rpmbuild build error workaround.
 



From fedora-extras-commits at redhat.com  Fri Oct  6 19:35:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 12:35:26 -0700
Subject: rpms/uw-imap/devel .cvsignore, 1.4, 1.5 c-client.cf, 1.2,
	1.3 sources, 1.5, 1.6 uw-imap.spec, 1.19, 1.20
Message-ID: <200610061935.k96JZSXZ018561@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18538

Modified Files:
	.cvsignore c-client.cf sources uw-imap.spec 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
- imap-2006b
- %ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2006 20:29:56 -0000	1.4
+++ .cvsignore	6 Oct 2006 19:35:26 -0000	1.5
@@ -1,2 +1,3 @@
 imap-2006.tar.Z
 imap-2006a.tar.Z
+imap-2006b.tar.Z


Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/c-client.cf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- c-client.cf	6 Oct 2006 15:34:48 -0000	1.2
+++ c-client.cf	6 Oct 2006 19:35:26 -0000	1.3
@@ -1,3 +1 @@
-I accept the risk of using UW-IMAP
-set new-folder-format same-as-inbox
-set mail-subdirectory Mail
+# see imaprc.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Sep 2006 20:29:56 -0000	1.5
+++ sources	6 Oct 2006 19:35:26 -0000	1.6
@@ -1 +1 @@
-70b98056744f44aa52ccf4f668872b8e  imap-2006a.tar.Z
+6ba2c67118b7432d91999bcb5b227288  imap-2006b.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- uw-imap.spec	6 Oct 2006 15:34:48 -0000	1.19
+++ uw-imap.spec	6 Oct 2006 19:35:26 -0000	1.20
@@ -1,8 +1,8 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006a
-Release: 6%{?dist}
+Version: 2006b
+Release: 1%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -257,7 +257,7 @@
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
-%config(noreplace) %{_sysconfdir}/c-client.cf
+%ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
@@ -274,6 +274,10 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
+- imap-2006b
+- %%ghost %%config(missingok,noreplace) %%{_sysconfdir}/c-client.cf
+
 * Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
 - omit EOL whitespace from c-client.cf
 



From fedora-extras-commits at redhat.com  Fri Oct  6 19:36:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Oct 2006 12:36:16 -0700
Subject: rpms/uw-imap/FC-5 .cvsignore, 1.4, 1.5 c-client.cf, 1.2, 1.3 sources,
	1.4, 1.5 uw-imap.spec, 1.14, 1.15
Message-ID: <200610061936.k96JaIbZ018628@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18605

Modified Files:
	.cvsignore c-client.cf sources uw-imap.spec 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
- imap-2006b
- %ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Sep 2006 18:02:19 -0000	1.4
+++ .cvsignore	6 Oct 2006 19:36:15 -0000	1.5
@@ -1,2 +1,3 @@
 imap-2006.tar.Z
 imap-2006a.tar.Z
+imap-2006b.tar.Z


Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/c-client.cf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- c-client.cf	6 Oct 2006 15:35:26 -0000	1.2
+++ c-client.cf	6 Oct 2006 19:36:15 -0000	1.3
@@ -1,3 +1 @@
-I accept the risk of using UW-IMAP
-set new-folder-format same-as-inbox
-set mail-subdirectory Mail
+# see imaprc.txt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Sep 2006 18:02:19 -0000	1.4
+++ sources	6 Oct 2006 19:36:15 -0000	1.5
@@ -1 +1 @@
-70b98056744f44aa52ccf4f668872b8e  imap-2006a.tar.Z
+6ba2c67118b7432d91999bcb5b227288  imap-2006b.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- uw-imap.spec	6 Oct 2006 15:35:26 -0000	1.14
+++ uw-imap.spec	6 Oct 2006 19:36:15 -0000	1.15
@@ -1,8 +1,8 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006a
-Release: 6%{?dist}
+Version: 2006b
+Release: 1%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -257,7 +257,7 @@
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
-%config(noreplace) %{_sysconfdir}/c-client.cf
+%ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
@@ -274,6 +274,10 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
+- imap-2006b
+- %%ghost %%config(missingok,noreplace) %%{_sysconfdir}/c-client.cf
+
 * Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
 - omit EOL whitespace from c-client.cf
 



From fedora-extras-commits at redhat.com  Fri Oct  6 20:06:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:06:58 -0700
Subject: rpms/mirrormagic - New directory
Message-ID: <200610062007.k96K70AI021676@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21655/mirrormagic

Log Message:
Directory /cvs/extras/rpms/mirrormagic added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 20:06:59 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:06:59 -0700
Subject: rpms/mirrormagic/devel - New directory
Message-ID: <200610062007.k96K717W021679@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21655/mirrormagic/devel

Log Message:
Directory /cvs/extras/rpms/mirrormagic/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct  6 20:07:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:07:18 -0700
Subject: rpms/mirrormagic/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610062007.k96K7K0j021736@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21700/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mirrormagic


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct  6 20:07:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:07:18 -0700
Subject: rpms/mirrormagic Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610062007.k96K7K76021733@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21700

Added Files:
	Makefile import.log 
Log Message:
Setup of module mirrormagic


--- NEW FILE Makefile ---
# Top level Makefile for module mirrormagic
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct  6 20:08:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:08:42 -0700
Subject: rpms/mirrormagic import.log,1.1,1.2
Message-ID: <200610062009.k96K9EHl021838@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788

Modified Files:
	import.log 
Log Message:
auto-import mirrormagic-2.0.2-2.fc6 on branch devel from mirrormagic-2.0.2-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Oct 2006 20:07:17 -0000	1.1
+++ import.log	6 Oct 2006 20:08:42 -0000	1.2
@@ -0,0 +1 @@
+mirrormagic-2_0_2-2_fc6:HEAD:mirrormagic-2.0.2-2.fc6.src.rpm:1160165890



From fedora-extras-commits at redhat.com  Fri Oct  6 20:08:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:08:43 -0700
Subject: rpms/mirrormagic/devel mirrormagic-2.0.2-64bit.patch, NONE,
	1.1 mirrormagic-2.0.2-fixes.patch, NONE, 1.1 mirrormagic.desktop,
	NONE, 1.1 mirrormagic.png, NONE, 1.1 mirrormagic.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610062009.k96K9FFU021842@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/mirrormagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21788/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mirrormagic-2.0.2-64bit.patch mirrormagic-2.0.2-fixes.patch 
	mirrormagic.desktop mirrormagic.png mirrormagic.spec 
Log Message:
auto-import mirrormagic-2.0.2-2.fc6 on branch devel from mirrormagic-2.0.2-2.fc6.src.rpm

mirrormagic-2.0.2-64bit.patch:

--- NEW FILE mirrormagic-2.0.2-64bit.patch ---
--- mirrormagic-2.0.2/src/libgame/gadgets.c~	2006-09-30 03:21:56.000000000 +0200
+++ mirrormagic-2.0.2/src/libgame/gadgets.c	2006-09-30 03:21:56.000000000 +0200
@@ -301,11 +301,11 @@
 	break;
 
       case GDI_TYPE:
-	gi->type = va_arg(ap, unsigned long);
+	gi->type = va_arg(ap, int);
 	break;
 
       case GDI_STATE:
-	gi->state = va_arg(ap, unsigned long);
+	gi->state = va_arg(ap, int);
 	break;
 
       case GDI_CHECKED:

mirrormagic-2.0.2-fixes.patch:

--- NEW FILE mirrormagic-2.0.2-fixes.patch ---
diff -ur mirrormagic-2.0.2.orig/src/editor.c mirrormagic-2.0.2/src/editor.c
--- mirrormagic-2.0.2.orig/src/editor.c	2001-01-14 17:14:33.000000000 +0100
+++ mirrormagic-2.0.2/src/editor.c	2006-09-29 12:14:21.000000000 +0200
@@ -2751,7 +2751,7 @@
 	break;
       }
 
-      if (!LevelContainsPlayer)
+      if (!LevelContainsPlayer())
 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
@@ -2766,7 +2766,7 @@
       break;
 
     case GADGET_ID_TEST:
-      if (!LevelContainsPlayer)
+      if (!LevelContainsPlayer())
 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
diff -ur mirrormagic-2.0.2.orig/src/events.c mirrormagic-2.0.2/src/events.c
--- mirrormagic-2.0.2.orig/src/events.c	2001-01-14 17:14:33.000000000 +0100
+++ mirrormagic-2.0.2/src/events.c	2006-09-29 14:44:13.000000000 +0200
@@ -134,6 +134,13 @@
     case EVENT_CLIENTMESSAGE:
       HandleClientMessageEvent((ClientMessageEvent *) event);
       break;
+    
+#ifdef TARGET_SDL // hack SDL returns this when toggling fullscreen
+    case (Uint8)-1:
+      if (game_status == SETUP) // redraw the setup screen to update fs status
+        DrawSetupScreen();
+      break;
+#endif
 
     default:
       break;
diff -ur mirrormagic-2.0.2.orig/src/files.c mirrormagic-2.0.2/src/files.c
--- mirrormagic-2.0.2.orig/src/files.c	2002-03-18 04:09:16.000000000 +0100
+++ mirrormagic-2.0.2/src/files.c	2006-09-29 12:09:17.000000000 +0200
@@ -183,7 +183,7 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
-  char *data_dir = options.rw_base_directory;
+  char *data_dir = getUserDataDir();
   char *score_subdir = SCORES_DIRECTORY;
 
   if (score_dir)
diff -ur mirrormagic-2.0.2.orig/src/libgame/misc.c mirrormagic-2.0.2/src/libgame/misc.c
--- mirrormagic-2.0.2.orig/src/libgame/misc.c	2002-03-19 02:57:15.000000000 +0100
+++ mirrormagic-2.0.2/src/libgame/misc.c	2006-09-29 12:13:03.000000000 +0200
@@ -423,7 +423,6 @@
   options.server_host = NULL;
   options.server_port = 0;
   options.ro_base_directory = RO_BASE_PATH;
-  options.rw_base_directory = RW_BASE_PATH;
   options.level_directory = RO_BASE_PATH "/" LEVELS_DIRECTORY;
   options.serveronly = FALSE;
   options.network = FALSE;
@@ -492,9 +491,7 @@
       if (option_arg == NULL)
 	Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str);
 
-      /* this should be extended to separate options for ro and rw data */
       options.ro_base_directory = option_arg;
-      options.rw_base_directory = option_arg;
       if (option_arg == next_option)
 	options_left++;
 
diff -ur mirrormagic-2.0.2.orig/src/libgame/sdl.c mirrormagic-2.0.2/src/libgame/sdl.c
--- mirrormagic-2.0.2.orig/src/libgame/sdl.c	2002-03-19 04:10:37.000000000 +0100
+++ mirrormagic-2.0.2/src/libgame/sdl.c	2006-09-29 13:48:10.000000000 +0200
@@ -14,7 +14,7 @@
 #include "system.h"
 #include "sound.h"
 #include "misc.h"
-
+#include "../main.h"
 
 #if defined(TARGET_SDL)
 
@@ -930,6 +930,21 @@
       ((ButtonEvent *)event)->y = 0;
   }
 #endif
+  if (event->type == EVENT_KEYPRESS)
+  {
+    /* make alt + enter toggle fullscreen */
+    if ( (((KeyEvent *)event)->keysym.sym == KSYM_Return) &&
+         (((KeyEvent *)event)->keysym.mod == KMOD_LALT) )
+    {
+      if(SDL_WM_ToggleFullScreen(SDL_GetVideoSurface()))
+      {
+        video.fullscreen_enabled = !video.fullscreen_enabled;  
+        setup.fullscreen = video.fullscreen_enabled;
+      }
+      /* make this an invalid event so the enter has no further results */
+      event->type = -1;
+    }
+  }
 }
 
 #endif /* TARGET_SDL */
diff -ur mirrormagic-2.0.2.orig/src/libgame/system.h mirrormagic-2.0.2/src/libgame/system.h
--- mirrormagic-2.0.2.orig/src/libgame/system.h	2002-03-19 03:42:52.000000000 +0100
+++ mirrormagic-2.0.2/src/libgame/system.h	2006-09-29 12:13:06.000000000 +0200
@@ -154,7 +154,6 @@
   char *server_host;
   int server_port;
   char *ro_base_directory;
-  char *rw_base_directory;
   char *level_directory;
   boolean serveronly;
   boolean network;
diff -ur mirrormagic-2.0.2.orig/src/main.h mirrormagic-2.0.2/src/main.h
--- mirrormagic-2.0.2.orig/src/main.h	2003-06-07 18:04:37.000000000 +0200
+++ mirrormagic-2.0.2/src/main.h	2006-09-29 11:36:39.000000000 +0200
@@ -459,7 +459,6 @@
 #endif
 extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;
-extern struct JoystickInfo	joystick[];
 extern struct SetupInfo		setup;
 extern struct GameInfo		game;
 extern struct LaserInfo		laser;
diff -ur mirrormagic-2.0.2.orig/src/tools.c mirrormagic-2.0.2/src/tools.c
--- mirrormagic-2.0.2.orig/src/tools.c	2002-03-19 03:53:26.000000000 +0100
+++ mirrormagic-2.0.2/src/tools.c	2006-09-29 14:01:07.000000000 +0200
@@ -1310,6 +1310,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;


--- NEW FILE mirrormagic.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mirror Magic
Comment=Puzzle game where you steer a beam of light using mirrors
Exec=mirrormagic
Icon=mirrormagic.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;


--- NEW FILE mirrormagic.spec ---
Name:           mirrormagic
Version:        2.0.2
Release:        2%{?dist}
Summary:        Puzzle game where you steer a beam of light using mirrors
Group:          Amusements/Games
License:        GPL
URL:            http://www.artsoft.org/mirrormagic/
Source0:        http://www.artsoft.org/RELEASES/unix/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         %{name}-%{version}-fixes.patch
Patch1:         %{name}-%{version}-64bit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_image-devel SDL_mixer-devel desktop-file-utils

%description
MirrorMagic is a game where you shoot around obstacles to collect energy using
your beam. It is similar to "Mindbender" (Amiga) from the same author. The goal
is to work out how to get around obstacles to shoot energy containers with your
beam, thereby opening the path to the next level. Included are many levels
familiar from the games "Deflektor" and "Mindbender".


%prep
%setup -q
%patch0 -p1 -z .fixes
%patch1 -p1 -z .64bit


%build
make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name} \
  OPTIONS="$RPM_OPT_FLAGS" sdl


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
cp -a graphics levels music sounds $RPM_BUILD_ROOT%{_datadir}/%{name}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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 CHANGES COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sat Sep 30 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-2
- Add a patch which fixes running (startup) on 64 bit archs

* Fri Sep 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Oct 2006 20:07:18 -0000	1.1
+++ .cvsignore	6 Oct 2006 20:08:42 -0000	1.2
@@ -0,0 +1 @@
+mirrormagic-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 20:07:18 -0000	1.1
+++ sources	6 Oct 2006 20:08:42 -0000	1.2
@@ -0,0 +1 @@
+32fd3909c1e27f493d89bc2276da6744  mirrormagic-2.0.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct  6 20:09:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  6 Oct 2006 13:09:48 -0700
Subject: owners owners.list,1.1786,1.1787
Message-ID: <200610062009.k96K9oSg021903@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21886

Modified Files:
	owners.list 
Log Message:
added mirrormagic


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1786
retrieving revision 1.1787
diff -u -r1.1786 -r1.1787
--- owners.list	6 Oct 2006 14:36:10 -0000	1.1786
+++ owners.list	6 Oct 2006 20:09:47 -0000	1.1787
@@ -1030,6 +1030,7 @@
 Fedora Extras|mimedefang|E-Mail filtering framework using Sendmail's Milter interface|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|mirrormagic|Puzzle game where you steer a beam of light using mirrors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mlton|Optimizing compiler for Standard ML|adam at spicenitz.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct  6 20:13:18 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri,  6 Oct 2006 13:13:18 -0700
Subject: rpms/plplot/devel plplot.spec,1.21,1.22
Message-ID: <200610062013.k96KDKpa021950@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21933

Modified Files:
	plplot.spec 
Log Message:
- Rebuild for new octave API version



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plplot.spec	3 Oct 2006 22:29:00 -0000	1.21
+++ plplot.spec	6 Oct 2006 20:13:17 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -347,7 +347,10 @@
 
 
 %changelog
-* Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-6
+* Fri Oct  6 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-7
+- Rebuild for new octave API version
+
+* Tue Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-6
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Mon Sep 25 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-5



From fedora-extras-commits at redhat.com  Fri Oct  6 20:14:58 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri,  6 Oct 2006 13:14:58 -0700
Subject: rpms/plplot/FC-5 plplot.spec,1.18,1.19
Message-ID: <200610062015.k96KF0Wl022011@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21994

Modified Files:
	plplot.spec 
Log Message:
- Rebuild for new octave API version



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plplot.spec	25 Sep 2006 16:46:54 -0000	1.18
+++ plplot.spec	6 Oct 2006 20:14:58 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -347,6 +347,9 @@
 
 
 %changelog
+* Fri Oct  6 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-5
+- Rebuild for new octave API version
+
 * Mon Sep 25 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-4
 - Add needed Requires for -devel packages (bug #202168)
 - Add patch for info file to fix category



From fedora-extras-commits at redhat.com  Fri Oct  6 21:38:40 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 14:38:40 -0700
Subject: rpms/adns/devel needs.rebuild,1.1,NONE
Message-ID: <200610062138.k96Lcgvm025284@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25269

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 21:42:59 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 14:42:59 -0700
Subject: rpms/gcin/FC-4 needs.rebuild,1.1,NONE
Message-ID: <200610062143.k96Lh1x7025315@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25300

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 21:43:28 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 14:43:28 -0700
Subject: rpms/gcin/FC-3 needs.rebuild,1.1,NONE
Message-ID: <200610062143.k96LhUtH025341@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25326

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 22:15:06 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri,  6 Oct 2006 15:15:06 -0700
Subject: rpms/sysprof-kmod/FC-5 sysprof-kmod.spec,1.5,1.6
Message-ID: <200610062215.k96MF8UN028553@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28339

Modified Files:
	sysprof-kmod.spec 
Log Message:
Prepare for FC5 build



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sysprof-kmod.spec	4 Oct 2006 22:21:40 -0000	1.5
+++ sysprof-kmod.spec	6 Oct 2006 22:15:06 -0000	1.6
@@ -4,23 +4,18 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
+%{!?kversion: %define kversion 2.6.17-1.2187_FC5}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 
 %define kmod_name sysprof
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
 
-%ifarch i686
-%define pae PAE
-%endif
-%ifarch ppc
+%ifarch i686 ppc
 %define smp smp
 %endif
-%ifarch i686 x86_64 ia64
-%define xen xen
-%endif
-%ifarch i686 x86_64 ppc64 ppc64iseries
+%ifarch i686 x86_64
+%define xen xen xen0
 %define kdump kdump
 %endif
 %{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump}}



From fedora-extras-commits at redhat.com  Fri Oct  6 22:16:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri,  6 Oct 2006 15:16:26 -0700
Subject: rpms/sysprof/FC-5 sysprof.spec,1.1,1.2
Message-ID: <200610062216.k96MGSTO028576@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28559

Modified Files:
	sysprof.spec 
Log Message:
Prepare for FC5 build



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysprof.spec	4 Oct 2006 14:40:56 -0000	1.1
+++ sysprof.spec	6 Oct 2006 22:16:26 -0000	1.2
@@ -16,7 +16,6 @@
 
 BuildRequires:  gtk2-devel => 2.6
 BuildRequires:  libglade2-devel
-BuildRequires:  binutils-devel
 BuildRequires:  desktop-file-utils
 
 
@@ -60,7 +59,7 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Tue Oct 2 2006 ianluca Sforna <giallu gmail com> 1.0.3-4
+* Tue Oct 2 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
 - add .desktop file
 
 * Fri Sep 30 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3



From fedora-extras-commits at redhat.com  Fri Oct  6 22:22:05 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:22:05 -0700
Subject: rebuild-scripts - Imported sources
Message-ID: <200610062222.k96MM5X4028683@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644

Log Message:
Import rebuild-scripts (second try...)

Status:

Vendor Tag:	fedora
Release Tags:	start
		
N rebuild-scripts/check_rebuild2
N rebuild-scripts/gen_rebuild_lst
N rebuild-scripts/add_owner
N rebuild-scripts/check_rebuild
N rebuild-scripts/check_release
N rebuild-scripts/rm_noarch
N rebuild-scripts/buildcheck-extras-development.repo
N rebuild-scripts/gen_nr_2
N rebuild-scripts/bumpspecfile.py
N rebuild-scripts/semi_auto_rebuild.txt
N rebuild-scripts/buildcheck

No conflicts created by this import




From fedora-extras-commits at redhat.com  Fri Oct  6 22:45:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:45:20 -0700
Subject: rpms/daap-sharp/devel needs.rebuild,1.1,NONE
Message-ID: <200610062245.k96MjM0e029029@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/daap-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29014

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 22:47:00 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:47:00 -0700
Subject: rpms/pan/devel needs.rebuild,1.1,NONE
Message-ID: <200610062247.k96Ml235029060@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29045

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 22:48:45 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:48:45 -0700
Subject: rpms/python-adns/devel needs.rebuild,1.1,NONE
Message-ID: <200610062248.k96MmljD029088@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/python-adns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29073

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 22:49:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri,  6 Oct 2006 15:49:50 -0700
Subject: rpms/ss5/devel needs.rebuild,1.1,NONE
Message-ID: <200610062249.k96Mnqqo029114@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/ss5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29099

Removed Files:
	needs.rebuild 
Log Message:
Cleanup leftover needs.rebuild file.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct  6 23:49:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri,  6 Oct 2006 16:49:48 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.9,1.10
Message-ID: <200610062349.k96Nnoma032237@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32217

Modified Files:
	gdeskcal.spec 
Log Message:

Rebuild 
	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdeskcal.spec	10 Apr 2006 10:40:41 -0000	1.9
+++ gdeskcal.spec	6 Oct 2006 23:49:47 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        0.57.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sat Oct 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-6
+- rebuild
+
 * Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
 - rebuilt
 - minor spec changes



From fedora-extras-commits at redhat.com  Sat Oct  7 00:58:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri,  6 Oct 2006 17:58:46 -0700
Subject: owners owners.list,1.1787,1.1788
Message-ID: <200610070058.k970wmrV002893@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2876

Modified Files:
	owners.list 
Log Message:
fix supertuxkart entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1787
retrieving revision 1.1788
diff -u -r1.1787 -r1.1788
--- owners.list	6 Oct 2006 20:09:47 -0000	1.1787
+++ owners.list	7 Oct 2006 00:58:45 -0000	1.1788
@@ -2079,7 +2079,7 @@
 Fedora Extras|sunifdef|A commandline tool for simplifying the preprocessor conditionals in source code|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|superkaramba|Custom content on the desktop|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
-Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 01:46:59 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri,  6 Oct 2006 18:46:59 -0700
Subject: comps comps-fe6.xml.in,1.173,1.174
Message-ID: <200610070147.k971l1Z8006025@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6008

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add mirrormagic.


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- comps-fe6.xml.in	2 Oct 2006 21:29:59 -0000	1.173
+++ comps-fe6.xml.in	7 Oct 2006 01:46:58 -0000	1.174
@@ -371,6 +371,7 @@
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
       <packagereq type="optional">manaworld</packagereq>
+      <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>
       <packagereq type="optional">monsterz</packagereq>
       <packagereq type="optional">nazghul</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct  7 01:54:28 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri,  6 Oct 2006 18:54:28 -0700
Subject: rpms/konversation/devel .cvsignore, 1.4, 1.5 konversation.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200610070154.k971sUso006067@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6046

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
update to 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2006 12:00:11 -0000	1.4
+++ .cvsignore	7 Oct 2006 01:54:28 -0000	1.5
@@ -1 +1 @@
-konversation-1.0.tar.bz2
+konversation-1.0.1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- konversation.spec	14 Sep 2006 12:00:11 -0000	1.9
+++ konversation.spec	7 Oct 2006 01:54:28 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           konversation
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Fri Oct 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1
+- Upgrade to 1.0.1
+
 * Thu Sep 14 2006 Dennis Gilmore <dennis at ausil.us> - 1.0-1
 - Upgrade to 1.0 :)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2006 12:00:11 -0000	1.4
+++ sources	7 Oct 2006 01:54:28 -0000	1.5
@@ -1 +1 @@
-824bd7d2ac6a4164625dbae03d6d481e  konversation-1.0.tar.bz2
+60c2c5f94d4a916055db09728304b19f  konversation-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct  7 01:55:41 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri,  6 Oct 2006 18:55:41 -0700
Subject: rpms/konversation/FC-5 .cvsignore, 1.4, 1.5 konversation.spec, 1.8, 
	1.9 sources, 1.4, 1.5
Message-ID: <200610070155.k971thx8006138@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
update to 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2006 12:01:54 -0000	1.4
+++ .cvsignore	7 Oct 2006 01:55:41 -0000	1.5
@@ -1 +1 @@
-konversation-1.0.tar.bz2
+konversation-1.0.1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-5/konversation.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- konversation.spec	14 Sep 2006 12:01:54 -0000	1.8
+++ konversation.spec	7 Oct 2006 01:55:41 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           konversation
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Fri Oct 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1
+- Upgrade to 1.0.1
+
 * Thu Sep 14 2006 Dennis Gilmore <dennis at ausil.us> - 1.0-1
 - Upgrade to 1.0 :)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2006 12:01:54 -0000	1.4
+++ sources	7 Oct 2006 01:55:41 -0000	1.5
@@ -1 +1 @@
-824bd7d2ac6a4164625dbae03d6d481e  konversation-1.0.tar.bz2
+60c2c5f94d4a916055db09728304b19f  konversation-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct  7 02:18:56 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri,  6 Oct 2006 19:18:56 -0700
Subject: comps comps-fe5.xml.in,1.160,1.161 comps-fe6.xml.in,1.174,1.175
Message-ID: <200610070218.k972Iwws009137@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9111

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add some of my packages



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- comps-fe5.xml.in	2 Oct 2006 21:29:59 -0000	1.160
+++ comps-fe5.xml.in	7 Oct 2006 02:18:55 -0000	1.161
@@ -597,15 +597,19 @@
       <packagereq type="optional">kickpim</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>
+      <packagereq type="optional">kmobiletools</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">knemo</packagereq>
+      <packagereq type="optional">knetworkmanager</packagereq>
       <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kooldock</packagereq>
+      <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">krusader</packagereq>
       <packagereq type="optional">ksynaptics</packagereq>
       <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
+      <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- comps-fe6.xml.in	7 Oct 2006 01:46:58 -0000	1.174
+++ comps-fe6.xml.in	7 Oct 2006 02:18:55 -0000	1.175
@@ -684,10 +684,13 @@
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmenu-gnome</packagereq>
+      <packagereq type="optional">kmobiletools</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">knemo</packagereq>
+      <packagereq type="optional">knetworkmanager</packagereq>
       <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kooldock</packagereq>
+      <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">krusader</packagereq>
       <packagereq type="optional">ksensors</packagereq>
       <packagereq type="optional">kshutdown</packagereq>
@@ -695,6 +698,7 @@
       <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
+      <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct  7 03:39:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:39:50 -0700
Subject: rpms/comix - New directory
Message-ID: <200610070339.k973dq5d012473@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12452/comix

Log Message:
Directory /cvs/extras/rpms/comix added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 03:39:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:39:50 -0700
Subject: rpms/comix/devel - New directory
Message-ID: <200610070339.k973dqk2012476@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12452/comix/devel

Log Message:
Directory /cvs/extras/rpms/comix/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 03:40:07 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:40:07 -0700
Subject: rpms/comix Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610070340.k973eAP0012530@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12497

Added Files:
	Makefile import.log 
Log Message:
Setup of module comix


--- NEW FILE Makefile ---
# Top level Makefile for module comix
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 03:40:08 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:40:08 -0700
Subject: rpms/comix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610070340.k973eAjv012533@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12497/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module comix


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 03:40:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:40:40 -0700
Subject: rpms/comix import.log,1.1,1.2
Message-ID: <200610070341.k973fCgR012599@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12565

Modified Files:
	import.log 
Log Message:
auto-import comix-3.6-2 on branch devel from comix-3.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/comix/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 03:40:07 -0000	1.1
+++ import.log	7 Oct 2006 03:40:39 -0000	1.2
@@ -0,0 +1 @@
+comix-3_6-2:HEAD:comix-3.6-2.src.rpm:1160192433



From fedora-extras-commits at redhat.com  Sat Oct  7 03:40:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 20:40:40 -0700
Subject: rpms/comix/devel comix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610070341.k973fCE9012603@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12565/devel

Modified Files:
	.cvsignore sources 
Added Files:
	comix.spec 
Log Message:
auto-import comix-3.6-2 on branch devel from comix-3.6-2.src.rpm


--- NEW FILE comix.spec ---
Name:		comix
Version:	3.6
Release:	2%{?dist}
Summary:	A user-friendly, customizable image viewer

Group:		Amusements/Graphics
License:	GPL
URL:		http://comix.sourceforge.net/
Source0:	http://optusnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	pygtk2
BuildRequires:	python-imaging
BuildRequires:	desktop-file-utils
BuildRequires:	%{_bindir}/jpegtran
Requires:	pygtk2
Requires:	python-imaging
Requires:	%{_bindir}/jpegtran
Requires(pre):	GConf2
Requires(preun):	GConf2
Requires(post):	GConf2

%description
Comix is a user-friendly, customizable image viewer. 
It is specifically designed to handle comic books, but 
also serves as a generic viewer. It reads images in ZIP, 
RAR or tar archives (also gzip or bzip2 compressed) as 
well as plain image files. It is written in Python and 
uses GTK+ through the PyGTK bindings.

%prep
%setup -q

%build
%{__sed} -i -e 's|shutil.copy|shutil.copy2|' install.py

%{__sed} -e 's|\r||g' COPYING > COPYING.tmp && \
	( touch -r COPYING COPYING.tmp ; %{__mv} -f COPYING.tmp COPYING )
%{__rm} -f COPYING.tmp
	
iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp && \
	( touch -r ChangeLog ChangeLog.tmp ; %{__mv} -f ChangeLog.tmp ChangeLog )
%{__rm} -f ChangeLog.tmp

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}

export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%{__python} install.py --installdir $RPM_BUILD_ROOT%{_prefix} install

desktop-file-install \
	--vendor fedora \
	--delete-original \
	--add-category X-Fedora \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/mime/
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mime/packages
%{__install} -c -p -m644 mime/comix.xml \
	$RPM_BUILD_ROOT%{_datadir}/mime/packages/%{name}.xml

%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
%{__install} -c -p -m644 mime/comicbook.schemas \
	$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/%{name}.schemas

%find_lang %{name}

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%pre
[ "$1" -gt 1 ] || exit 0

export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`	
gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :

# If the schema file has ever been renamed::
# gconftool-2 --makefile-uninstall-rule \
# 	%{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :

killall -HUP gconfd-2 || :

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
killall -HUP gconfd-2 || :

touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :

%preun
[ "$1" -eq 0 ] || exit 0

export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
killall -HUP gconfd-2 || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING ChangeLog README

# Hey!! No package (required by this package) owns
# /etc/gconf /etc/gconf/schemas?
%dir %{_sysconfdir}/gconf
%dir %{_sysconfdir}/gconf/schemas
%{_sysconfdir}/gconf/schemas/%{name}.schemas

%{_bindir}/*

%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml

%{_mandir}/man1/*

%{_datadir}/icons/hicolor/*/apps/%{name}*
%{_datadir}/pixmaps/%{name}.png
%dir %{_datadir}/pixmaps/%{name}
%{_datadir}/pixmaps/%{name}/*.png


%changelog
* Fri Oct 06 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6-2
- Specify URL.

* Fri Oct 06 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6-1
- Initial packaging, importing to Fedora extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 03:40:08 -0000	1.1
+++ .cvsignore	7 Oct 2006 03:40:40 -0000	1.2
@@ -0,0 +1 @@
+comix-3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 03:40:08 -0000	1.1
+++ sources	7 Oct 2006 03:40:40 -0000	1.2
@@ -0,0 +1 @@
+2d6034c5c032fcb5fe257048d64364a8  comix-3.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 04:00:59 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 21:00:59 -0700
Subject: owners owners.list,1.1788,1.1789
Message-ID: <200610070401.k97411s0012793@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12762

Modified Files:
	owners.list 
Log Message:
add comix to owners.list


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1788
retrieving revision 1.1789
diff -u -r1.1788 -r1.1789
--- owners.list	7 Oct 2006 00:58:45 -0000	1.1788
+++ owners.list	7 Oct 2006 04:00:59 -0000	1.1789
@@ -204,6 +204,7 @@
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|comix|A user-friendly, customizable image viewer|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|commoncpp2|GNU Common C++ class framework|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|compat-erlang|Compatibility version of Erlang|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|compat-libgda|Library for writing gnome database programs|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 04:42:31 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri,  6 Oct 2006 21:42:31 -0700
Subject: rpms/paraview/devel paraview.spec,1.7,1.8
Message-ID: <200610070442.k974gXjg015780@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15761

Modified Files:
	paraview.spec 
Log Message:
- Install needed python libraries to get around make install bug



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- paraview.spec	4 Oct 2006 15:23:23 -0000	1.7
+++ paraview.spec	7 Oct 2006 04:42:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -183,6 +183,8 @@
 pushd fedora-mpi
 make install DESTDIR=$RPM_BUILD_ROOT
 #Get rid of useless man and cmake files
+install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/
+install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/*ICET*cmake
 cat > paraview-mpi.desktop <<EOF
@@ -217,6 +219,8 @@
 #Install the normal version
 pushd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
+install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4/
+install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4/
 cat > paraview.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
@@ -306,6 +310,9 @@
 
 
 %changelog
+* Fri Oct  6 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-3
+- Install needed python libraries to get around make install bug
+
 * Wed Oct  4 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-2
 - Re-enable OSMESA support for FC6
 - Enable python wrapping



From fedora-extras-commits at redhat.com  Sat Oct  7 04:57:52 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  6 Oct 2006 21:57:52 -0700
Subject: rpms/perl-Calendar-Simple/devel perl-Calendar-Simple.spec,1.4,1.5
Message-ID: <200610070457.k974vseu015873@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15856

Modified Files:
	perl-Calendar-Simple.spec 
Log Message:
* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
- chmod -x files with broken permissions.



Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/devel/perl-Calendar-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Calendar-Simple.spec	18 Sep 2006 13:33:52 -0000	1.4
+++ perl-Calendar-Simple.spec	7 Oct 2006 04:57:52 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
 Version:	1.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,6 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
+chmod -x COPYING lib/*/*.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
+- chmod -x files with broken permissions.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 04:58:43 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  6 Oct 2006 21:58:43 -0700
Subject: rpms/perl-Calendar-Simple/FC-5 perl-Calendar-Simple.spec,1.3,1.4
Message-ID: <200610070458.k974wjQa015934@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15917

Modified Files:
	perl-Calendar-Simple.spec 
Log Message:
* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
- chmod -x files with broken permissions.



Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-5/perl-Calendar-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Calendar-Simple.spec	18 Sep 2006 13:38:39 -0000	1.3
+++ perl-Calendar-Simple.spec	7 Oct 2006 04:58:43 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
 Version:	1.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,6 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
+chmod -x COPYING lib/*/*.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
+- chmod -x files with broken permissions.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 04:59:36 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri,  6 Oct 2006 21:59:36 -0700
Subject: rpms/perl-Calendar-Simple/FC-4 perl-Calendar-Simple.spec,1.3,1.4
Message-ID: <200610070459.k974xcWF015995@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15978

Modified Files:
	perl-Calendar-Simple.spec 
Log Message:
* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
- chmod -x files with broken permissions.



Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-4/perl-Calendar-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Calendar-Simple.spec	18 Sep 2006 13:39:00 -0000	1.3
+++ perl-Calendar-Simple.spec	7 Oct 2006 04:59:36 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
 Version:	1.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,6 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
+chmod -x COPYING lib/*/*.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
+- chmod -x files with broken permissions.
+
 * Mon Sep 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 05:15:30 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:15:30 -0700
Subject: rpms/wmctrl - New directory
Message-ID: <200610070515.k975FWlY019040@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19019/wmctrl

Log Message:
Directory /cvs/extras/rpms/wmctrl added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 05:15:30 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:15:30 -0700
Subject: rpms/wmctrl/devel - New directory
Message-ID: <200610070515.k975FWuO019043@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19019/wmctrl/devel

Log Message:
Directory /cvs/extras/rpms/wmctrl/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 05:15:43 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:15:43 -0700
Subject: rpms/wmctrl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610070515.k975FjNb019097@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19064

Added Files:
	Makefile import.log 
Log Message:
Setup of module wmctrl


--- NEW FILE Makefile ---
# Top level Makefile for module wmctrl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 05:15:44 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:15:44 -0700
Subject: rpms/wmctrl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610070515.k975Fk2F019100@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19064/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wmctrl


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 05:16:02 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:16:02 -0700
Subject: rpms/wmctrl import.log,1.1,1.2
Message-ID: <200610070516.k975G4pJ019161@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19128

Modified Files:
	import.log 
Log Message:
auto-import wmctrl-1.07-2.fc5 on branch devel from wmctrl-1.07-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 05:15:43 -0000	1.1
+++ import.log	7 Oct 2006 05:16:02 -0000	1.2
@@ -0,0 +1 @@
+wmctrl-1_07-2_fc5:HEAD:wmctrl-1.07-2.fc5.src.rpm:1160198158



From fedora-extras-commits at redhat.com  Sat Oct  7 05:16:02 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:16:02 -0700
Subject: rpms/wmctrl/devel wmctrl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610070516.k975G4SE019166@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/wmctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19128/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wmctrl.spec 
Log Message:
auto-import wmctrl-1.07-2.fc5 on branch devel from wmctrl-1.07-2.fc5.src.rpm


--- NEW FILE wmctrl.spec ---
Name:           wmctrl
Version:        1.07
Release:        2%{?dist}
Summary:        A command line tool to interact with an X Window Manager

Group:          User Interface/X
License:        GPL
URL:            http://sweb.cz/tripie/utils/wmctrl
Source0:        http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xorg-x11-proto-devel, libXmu-devel, glib2-devel

%description
 The wmctrl program is a UNIX/Linux command line tool to interact with an 
 EWMH/NetWM compatible X Window Manager. The tool provides command line access 
 to almost all the features defined in the EWMH specification. It can be used, 
 for example, to obtain information about the window manager, to get a detailed 
 list of desktops and managed windows, to switch and resize desktops, to make 
 windows full-screen, always-above or sticky, and to activate, close, move, 
 resize, maximize and minimize them. The command line access to these window 
 management functions makes it easy to automate and execute them from any 
 application that is able to run a command in response to an event. 


%prep
%setup -q 

%build
%configure 
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Wed Oct 04 2006 Michael Rice <errr[AT]errr-online.com> - 1.07-2
- Fix Summary per rpmlint warning
- Fix description per rpmlint warning
- Remove unneeded line from setup
- Remove NEWS from docs since it was empty
- Reformat Changlelog entrys in spec file due to bad formatting
- Changed Group to User Interface/X

* Wed Sep 27 2006 Michael Rice <errr[AT]errr-online.com> - 1.07-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 05:15:43 -0000	1.1
+++ .cvsignore	7 Oct 2006 05:16:02 -0000	1.2
@@ -0,0 +1 @@
+wmctrl-1.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmctrl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 05:15:43 -0000	1.1
+++ sources	7 Oct 2006 05:16:02 -0000	1.2
@@ -0,0 +1 @@
+1fe3c7a2caa6071e071ba34f587e1555  wmctrl-1.07.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 05:25:23 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 22:25:23 -0700
Subject: rpms/jd/devel jd.spec,1.3,1.4
Message-ID: <200610070525.k975PPKS019274@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19257

Modified Files:
	jd.spec 
Log Message:
* Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
- Add libSM-devel to BuildRequires.



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jd.spec	27 Sep 2006 14:43:24 -0000	1.3
+++ jd.spec	7 Oct 2006 05:25:22 -0000	1.4
@@ -15,7 +15,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         vendor        fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
@@ -49,6 +49,7 @@
 BuildRequires:  libtool automake
 BuildRequires:  openssl-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  libSM-devel
 Requires:       fonts-japanese
 
 
@@ -99,12 +100,12 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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
 
-* Tue Sep 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060926
-- cvs 2006-09-26
-
 * Mon Sep 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060921
 - Import to Fedora Extras.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 05:26:11 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri,  6 Oct 2006 22:26:11 -0700
Subject: rpms/jd/FC-5 jd.spec,1.2,1.3
Message-ID: <200610070526.k975QD1X019340@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19323

Modified Files:
	jd.spec 
Log Message:
* Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
- Add libSM-devel to BuildRequires.



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jd.spec	27 Sep 2006 14:44:48 -0000	1.2
+++ jd.spec	7 Oct 2006 05:26:11 -0000	1.3
@@ -15,7 +15,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         vendor        fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
@@ -49,6 +49,7 @@
 BuildRequires:  libtool automake
 BuildRequires:  openssl-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  libSM-devel
 Requires:       fonts-japanese
 
 
@@ -99,12 +100,12 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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
 
-* Tue Sep 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060926
-- cvs 2006-09-26
-
 * Mon Sep 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060921
 - Import to Fedora Extras.
 



From fedora-extras-commits at redhat.com  Sat Oct  7 05:28:34 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Fri,  6 Oct 2006 22:28:34 -0700
Subject: owners owners.list,1.1789,1.1790
Message-ID: <200610070528.k975SacS019419@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19384

Modified Files:
	owners.list 
Log Message:
adding my name as maintainer of wmctl  bug: 208422



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1789
retrieving revision 1.1790
diff -u -r1.1789 -r1.1790
--- owners.list	7 Oct 2006 04:00:59 -0000	1.1789
+++ owners.list	7 Oct 2006 05:28:34 -0000	1.1790
@@ -2258,6 +2258,7 @@
 Fedora Extras|wmacpi|Dockapp for laptop acpi/apm information|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wmctrl|A command line tool to interact with an X Window Manager|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|wmix|Dockapp mixer|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmx|A really simple window manager for X|somlo at cmu.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 06:40:06 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:40:06 -0700
Subject: owners owners.list,1.1790,1.1791
Message-ID: <200610070640.k976e8je022627@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22608/owners

Modified Files:
	owners.list 
Log Message:
Prepare to upload new package: sipsak


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1790
retrieving revision 1.1791
diff -u -r1.1790 -r1.1791
--- owners.list	7 Oct 2006 05:28:34 -0000	1.1790
+++ owners.list	7 Oct 2006 06:40:05 -0000	1.1791
@@ -2031,6 +2031,7 @@
 Fedora Extras|SIBsim4|Align expressed RNA sequences on a DNA template|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org|
+Fedora Extras|sipsak|SIP swiss army knife|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|sjasm|A z80 cross assembler|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 06:47:05 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:47:05 -0700
Subject: rpms/fuse/devel fuse-udev_rules.patch,1.4,1.5 fuse.spec,1.11,1.12
Message-ID: <200610070647.k976l8R8022727@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22667/fuse/devel

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule for FUSE

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse-udev_rules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-udev_rules.patch	13 Feb 2006 11:10:30 -0000	1.4
+++ fuse-udev_rules.patch	7 Oct 2006 06:47:05 -0000	1.5
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fuse.spec	12 Sep 2006 05:08:34 -0000	1.11
+++ fuse.spec	7 Oct 2006 06:47:05 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
+- Fixed udev-rule
+
 * Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-3%{?dist}
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Sat Oct  7 06:46:59 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:46:59 -0700
Subject: rpms/fuse/FC-4 fuse-udev_rules.patch,1.2,1.3 fuse.spec,1.6,1.7
Message-ID: <200610070647.k976lVma022731@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22667/fuse/FC-4

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule for FUSE

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse-udev_rules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fuse-udev_rules.patch	13 Feb 2006 12:23:49 -0000	1.2
+++ fuse-udev_rules.patch	7 Oct 2006 06:46:59 -0000	1.3
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse.spec	3 May 2006 08:56:04 -0000	1.6
+++ fuse.spec	7 Oct 2006 06:46:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,12 @@
 
 %changelog
 
+* Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
+- Fixed udev-rule
+
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-3%{?dist}
+- Rebuild for FC6
+
 * Wed May 03 2006 Peter Lemenkov <lemenkov at newmail.ru> 2.5.3-1%{?dist}
 - Update to 2.5.3
 



From fedora-extras-commits at redhat.com  Sat Oct  7 06:47:00 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:47:00 -0700
Subject: rpms/fuse/FC-5 fuse-udev_rules.patch,1.4,1.5 fuse.spec,1.10,1.11
Message-ID: <200610070647.k976lWn6022735@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22667/fuse/FC-5

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule for FUSE

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse-udev_rules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-udev_rules.patch	13 Feb 2006 11:10:30 -0000	1.4
+++ fuse-udev_rules.patch	7 Oct 2006 06:47:00 -0000	1.5
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fuse.spec	3 May 2006 08:58:07 -0000	1.10
+++ fuse.spec	7 Oct 2006 06:47:00 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,12 @@
 
 %changelog
 
+* Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
+- Fixed udev-rule
+
+* Tue Sep 12 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-3%{?dist}
+- Rebuild for FC6
+
 * Wed May 03 2006 Peter Lemenkov <lemenkov at newmail.ru> 2.5.3-1%{?dist}
 - Update to 2.5.3
 



From fedora-extras-commits at redhat.com  Sat Oct  7 06:55:19 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:55:19 -0700
Subject: rpms/sipsak - New directory
Message-ID: <200610070655.k976tLG4022926@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22900/sipsak

Log Message:
Directory /cvs/extras/rpms/sipsak added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 06:55:20 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:55:20 -0700
Subject: rpms/sipsak/devel - New directory
Message-ID: <200610070655.k976tM8o022929@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22900/sipsak/devel

Log Message:
Directory /cvs/extras/rpms/sipsak/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 06:55:53 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:55:53 -0700
Subject: rpms/sipsak Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610070655.k976ttaN022973@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22945

Added Files:
	Makefile import.log 
Log Message:
Setup of module sipsak


--- NEW FILE Makefile ---
# Top level Makefile for module sipsak
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 06:55:53 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:55:53 -0700
Subject: rpms/sipsak/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610070655.k976ttfO022976@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22945/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sipsak


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 06:56:48 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:56:48 -0700
Subject: rpms/sipsak import.log,1.1,1.2
Message-ID: <200610070657.k976vKYn023043@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23009

Modified Files:
	import.log 
Log Message:
auto-import sipsak-0.9.6-1 on branch devel from sipsak-0.9.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sipsak/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 06:55:52 -0000	1.1
+++ import.log	7 Oct 2006 06:56:48 -0000	1.2
@@ -0,0 +1 @@
+sipsak-0_9_6-1:HEAD:sipsak-0.9.6-1.src.rpm:1160204185



From fedora-extras-commits at redhat.com  Sat Oct  7 06:56:49 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri,  6 Oct 2006 23:56:49 -0700
Subject: rpms/sipsak/devel sipsak.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610070657.k976vLko023047@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipsak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23009/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sipsak.spec 
Log Message:
auto-import sipsak-0.9.6-1 on branch devel from sipsak-0.9.6-1.src.rpm


--- NEW FILE sipsak.spec ---
Summary:	SIP swiss army knife
Name:		sipsak
Version:	0.9.6
Release: 	1%{?dist}
License:	GPL
Group:		Applications/Communications
URL:		http://sipsak.org/
Source0:	http://download.berlios.de/sipsak/%{name}-%{version}-1.tar.gz
BuildRequires:	openssl-devel
#BuildRequires:	gnutls-devel
#BuildRequires:	ruli-devel
BuildRequires:	c-ares-devel
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
sipsak is a small command line tool for developers and
administrators of Session Initiation Protocol (SIP) applications.
It can be used for some simple tests on SIP applications and
devices.

%prep

%setup -q

%build
%configure --disable-gnutls
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
%{__rm} -f %{buildroot}/%{_libdir}/*.la

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

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Sun Sep 17 2006 Peter Lemenkov <lemenkov at gmail.com> 0.9.6-1
- Initial build for FE

* Wed Feb 08 2006 Oden Eriksson <oeriksson at mandriva.com> 0.9.6-1mdk
- 0.9.6
- disable gnutls support
- fix deps

* Sun Apr 24 2005 Oden Eriksson <oeriksson at mandriva.com> 0.8.12-1mdk
- initial Mandriva package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sipsak/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 06:55:53 -0000	1.1
+++ .cvsignore	7 Oct 2006 06:56:49 -0000	1.2
@@ -0,0 +1 @@
+sipsak-0.9.6-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sipsak/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 06:55:53 -0000	1.1
+++ sources	7 Oct 2006 06:56:49 -0000	1.2
@@ -0,0 +1 @@
+c4eb8e282902e75f4f040f09ea9d99d5  sipsak-0.9.6-1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 08:08:37 2006
From: fedora-extras-commits at redhat.com (Kushal Das (kushal))
Date: Sat,  7 Oct 2006 01:08:37 -0700
Subject: rpms/kphotobymail/devel .cvsignore, 1.2, 1.3 kphotobymail.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610070808.k9788dvT029053@cvs-int.fedora.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/kphotobymail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29032

Modified Files:
	.cvsignore kphotobymail.spec sources 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2006 20:01:59 -0000	1.2
+++ .cvsignore	7 Oct 2006 08:08:37 -0000	1.3
@@ -1 +1,2 @@
 kphotobymail-0.3.2.tar.gz
+kphotobymail-0.4.tar.gz


Index: kphotobymail.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/devel/kphotobymail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kphotobymail.spec	29 Sep 2006 20:01:59 -0000	1.1
+++ kphotobymail.spec	7 Oct 2006 08:08:37 -0000	1.2
@@ -2,9 +2,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		kphotobymail
-Version: 	0.3.2
-Release:	4%{?dist}
-Summary:	A PyQT based application for uploading photos to flickr account
+Version: 	0.4
+Release:	1%{?dist}
+Summary:	A PyQt based application for uploading photos to flickr account
 Group:		Applications/Internet
 License:	GPL
 URL:		http://kphotobymail.sourceforge.net/
@@ -16,7 +16,7 @@
 Requires:	python >= 2.4, PyQt >= 3.15
 
 %description
-Kphotobymail is a PyQT based application for uploading photos 
+Kphotobymail is a PyQt based application for uploading photos 
 to flickr account.You can also use it to send emails with photo 
 attachment on the fly.
 
@@ -57,6 +57,9 @@
 %{_datadir}/applications/fedora-kphotobymail.desktop
 
 %changelog
+* Sat Oct 07 2006 Kushal Das <kushal at fedoraproject.org> 0.4-1
+- new release
+
 * Fri Sep 29 2006 Kushal Das <kushal at fedoraproject.org> 0.3.2-4
 - spaces fixed, now having Tabs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 20:01:59 -0000	1.2
+++ sources	7 Oct 2006 08:08:37 -0000	1.3
@@ -1 +1,2 @@
 ea1faf6bc1e4a2ad7b381df34e0e8200  kphotobymail-0.3.2.tar.gz
+ee42c81260f329b3c90f0653af9014a8  kphotobymail-0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 08:28:20 2006
From: fedora-extras-commits at redhat.com (Kushal Das (kushal))
Date: Sat,  7 Oct 2006 01:28:20 -0700
Subject: rpms/kphotobymail/FC-5 kphotobymail.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200610070828.k978SMT8029159@cvs-int.fedora.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/kphotobymail/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29136

Modified Files:
	kphotobymail.spec sources 
Log Message:
New Release




Index: kphotobymail.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/FC-5/kphotobymail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kphotobymail.spec	29 Sep 2006 20:01:59 -0000	1.1
+++ kphotobymail.spec	7 Oct 2006 08:28:20 -0000	1.2
@@ -2,9 +2,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		kphotobymail
-Version: 	0.3.2
-Release:	4%{?dist}
-Summary:	A PyQT based application for uploading photos to flickr account
+Version: 	0.4
+Release:	1%{?dist}
+Summary:	A PyQt based application for uploading photos to flickr account
 Group:		Applications/Internet
 License:	GPL
 URL:		http://kphotobymail.sourceforge.net/
@@ -16,7 +16,7 @@
 Requires:	python >= 2.4, PyQt >= 3.15
 
 %description
-Kphotobymail is a PyQT based application for uploading photos 
+Kphotobymail is a PyQt based application for uploading photos 
 to flickr account.You can also use it to send emails with photo 
 attachment on the fly.
 
@@ -57,6 +57,9 @@
 %{_datadir}/applications/fedora-kphotobymail.desktop
 
 %changelog
+* Sat Oct 07 2006 Kushal Das <kushal at fedoraproject.org> 0.4-1
+- new release
+
 * Fri Sep 29 2006 Kushal Das <kushal at fedoraproject.org> 0.3.2-4
 - spaces fixed, now having Tabs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphotobymail/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 20:01:59 -0000	1.2
+++ sources	7 Oct 2006 08:28:20 -0000	1.3
@@ -1 +1,2 @@
 ea1faf6bc1e4a2ad7b381df34e0e8200  kphotobymail-0.3.2.tar.gz
+ee42c81260f329b3c90f0653af9014a8  kphotobymail-0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 09:00:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  7 Oct 2006 02:00:09 -0700
Subject: rpms/agave/FC-5 .cvsignore, 1.2, 1.3 agave.spec, 1.2, 1.3 sources,
	1.2, 1.3 agave-0.4.0-gcc41.patch, 1.1, NONE
Message-ID: <200610070900.k9790BFh029370@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/agave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29329/FC-5

Modified Files:
	.cvsignore agave.spec sources 
Removed Files:
	agave-0.4.0-gcc41.patch 
Log Message:
update to 0.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/agave/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jul 2006 15:43:07 -0000	1.2
+++ .cvsignore	7 Oct 2006 09:00:09 -0000	1.3
@@ -1 +1 @@
-agave-0.4.0.tar.bz2
+agave-0.4.1.tar.bz2


Index: agave.spec
===================================================================
RCS file: /cvs/extras/rpms/agave/FC-5/agave.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- agave.spec	23 Jul 2006 16:33:19 -0000	1.2
+++ agave.spec	7 Oct 2006 09:00:09 -0000	1.3
@@ -1,13 +1,12 @@
 Name:           agave
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Generate a variety of colorschemes from a single starting color
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://home.gna.org/colorscheme/
-Source0:        http://download.gna.org/colorscheme/releases/agave-0.4.0.tar.bz2
-Patch0:         agave-0.4.0-gcc41.patch
+Source0:        http://download.gna.org/colorscheme/releases/agave-0.4.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # see http://home.gna.org/colorscheme/downloads.shtml for buildreqs
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc41
 
 
 %build
@@ -86,6 +84,13 @@
 
 
 %changelog
+* Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.1-1
+- version 0.4.1
+- drop patch (applied upstream)
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
+- rebuild
+
 * Sun Jul 23 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-1
 - version 0.4.0
 - renamed to Agave


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/agave/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jul 2006 15:43:07 -0000	1.2
+++ sources	7 Oct 2006 09:00:09 -0000	1.3
@@ -1 +1 @@
-88a4f89acb62eab906b26803a760d7de  agave-0.4.0.tar.bz2
+e038138eff31a5286e1e41ac0e3b0f04  agave-0.4.1.tar.bz2


--- agave-0.4.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 09:00:10 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  7 Oct 2006 02:00:10 -0700
Subject: rpms/agave/devel .cvsignore, 1.2, 1.3 agave.spec, 1.3, 1.4 sources, 
	1.2, 1.3 agave-0.4.0-gcc41.patch, 1.1, NONE
Message-ID: <200610070900.k9790CNI029376@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/agave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29329/devel

Modified Files:
	.cvsignore agave.spec sources 
Removed Files:
	agave-0.4.0-gcc41.patch 
Log Message:
update to 0.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jul 2006 15:43:07 -0000	1.2
+++ .cvsignore	7 Oct 2006 09:00:09 -0000	1.3
@@ -1 +1 @@
-agave-0.4.0.tar.bz2
+agave-0.4.1.tar.bz2


Index: agave.spec
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/agave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- agave.spec	30 Aug 2006 14:22:34 -0000	1.3
+++ agave.spec	7 Oct 2006 09:00:09 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           agave
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Generate a variety of colorschemes from a single starting color
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://home.gna.org/colorscheme/
-Source0:        http://download.gna.org/colorscheme/releases/agave-0.4.0.tar.bz2
-Patch0:         agave-0.4.0-gcc41.patch
+Source0:        http://download.gna.org/colorscheme/releases/agave-0.4.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # see http://home.gna.org/colorscheme/downloads.shtml for buildreqs
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc41
 
 
 %build
@@ -86,6 +84,10 @@
 
 
 %changelog
+* Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.1-1
+- version 0.4.1
+- drop patch (applied upstream)
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.0-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jul 2006 15:43:07 -0000	1.2
+++ sources	7 Oct 2006 09:00:09 -0000	1.3
@@ -1 +1 @@
-88a4f89acb62eab906b26803a760d7de  agave-0.4.0.tar.bz2
+e038138eff31a5286e1e41ac0e3b0f04  agave-0.4.1.tar.bz2


--- agave-0.4.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  7 Oct 2006 02:01:08 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 sylpheed-claws.spec, 1.50, 1.51
Message-ID: <200610070901.k9791AU8032331@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29626/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	27 Sep 2006 15:21:50 -0000	1.25
+++ .cvsignore	7 Oct 2006 09:01:07 -0000	1.26
@@ -1 +1 @@
-sylpheed-claws-2.5.2.tar.bz2
+sylpheed-claws-2.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Sep 2006 15:21:50 -0000	1.26
+++ sources	7 Oct 2006 09:01:07 -0000	1.27
@@ -1 +1 @@
-a28001e212c0b536e7e8c4907243a3a2  sylpheed-claws-2.5.2.tar.bz2
+3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sylpheed-claws.spec	27 Sep 2006 15:21:50 -0000	1.50
+++ sylpheed-claws.spec	7 Oct 2006 09:01:07 -0000	1.51
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.2
+Version:        2.5.3
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.2.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -24,7 +24,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.45
+BuildRequires:  libetpan-devel >= 0.46
 BuildRequires:  libgnomeprintui22-devel
 
 %description
@@ -168,6 +168,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.3-1
+- version upgrade
+
 * Wed Sep 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  7 Oct 2006 02:01:08 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 sylpheed-claws.spec, 1.51, 1.52
Message-ID: <200610070901.k9791AHJ032335@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29626/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	27 Sep 2006 15:21:51 -0000	1.25
+++ .cvsignore	7 Oct 2006 09:01:08 -0000	1.26
@@ -1 +1 @@
-sylpheed-claws-2.5.2.tar.bz2
+sylpheed-claws-2.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Sep 2006 15:21:51 -0000	1.26
+++ sources	7 Oct 2006 09:01:08 -0000	1.27
@@ -1 +1 @@
-a28001e212c0b536e7e8c4907243a3a2  sylpheed-claws-2.5.2.tar.bz2
+3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sylpheed-claws.spec	27 Sep 2006 15:21:51 -0000	1.51
+++ sylpheed-claws.spec	7 Oct 2006 09:01:08 -0000	1.52
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.2
+Version:        2.5.3
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.2.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -24,7 +24,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.45
+BuildRequires:  libetpan-devel >= 0.46
 BuildRequires:  libgnomeprintui22-devel
 
 %description
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.3-1
+- version upgrade
+
 * Wed Sep 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  7 Oct 2006 02:01:07 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.21, 1.22 sources, 1.22,
	1.23 sylpheed-claws.spec, 1.45, 1.46
Message-ID: <200610070901.k9791dEo032359@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29626/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 Sep 2006 09:51:55 -0000	1.21
+++ .cvsignore	7 Oct 2006 09:01:06 -0000	1.22
@@ -1 +1 @@
-sylpheed-claws-2.5.2.tar.bz2
+sylpheed-claws-2.5.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Sep 2006 09:51:55 -0000	1.22
+++ sources	7 Oct 2006 09:01:06 -0000	1.23
@@ -1 +1 @@
-a28001e212c0b536e7e8c4907243a3a2  sylpheed-claws-2.5.2.tar.bz2
+3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sylpheed-claws.spec	30 Sep 2006 09:51:55 -0000	1.45
+++ sylpheed-claws.spec	7 Oct 2006 09:01:06 -0000	1.46
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        2.5.2
+Version:        2.5.3
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.2.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -179,6 +179,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.3-1
+- version upgrade
+
 * Wed Sep 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  7 Oct 2006 02:01:54 -0700
Subject: rpms/amarok/devel amarok.spec,1.62,1.63
Message-ID: <200610070901.k9791wZY032404@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32371/devel

Modified Files:
	amarok.spec 
Log Message:
rebuild for new libtunepimp


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- amarok.spec	5 Oct 2006 11:14:52 -0000	1.62
+++ amarok.spec	7 Oct 2006 09:01:54 -0000	1.63
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -244,6 +244,9 @@
 
 
 %changelog
+* Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
+- rebuild for new libtunepimp
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-5
 - add libmtp support
 



From fedora-extras-commits at redhat.com  Sat Oct  7 09:01:51 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  7 Oct 2006 02:01:51 -0700
Subject: rpms/amarok/FC-5 amarok.spec,1.61,1.62
Message-ID: <200610070902.k9792O3d032414@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32371/FC-5

Modified Files:
	amarok.spec 
Log Message:
rebuild for new libtunepimp


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- amarok.spec	5 Oct 2006 11:14:51 -0000	1.61
+++ amarok.spec	7 Oct 2006 09:01:50 -0000	1.62
@@ -5,7 +5,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -244,6 +244,9 @@
 
 
 %changelog
+* Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
+- rebuild for new libtunepimp
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-5
 - add libmtp support
 



From fedora-extras-commits at redhat.com  Sat Oct  7 09:22:21 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  7 Oct 2006 02:22:21 -0700
Subject: rpms/gdeskcal/devel needs.rebuild,1.1,NONE
Message-ID: <200610070922.k979MNcS032733@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32718

Removed Files:
	needs.rebuild 
Log Message:

removed needs.rebuild 
 	needs.rebuild 



--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 12:01:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 05:01:33 -0700
Subject: rpms/kdemultimedia-extras/FC-5 kdemultimedia-extras.spec,1.5,1.6
Message-ID: <200610071201.k97C1Zu1009737@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9719

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8
- -extras: own %_datadir/apps/juk/pics



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdemultimedia-extras.spec	28 Sep 2006 20:25:28 -0000	1.5
+++ kdemultimedia-extras.spec	7 Oct 2006 12:01:32 -0000	1.6
@@ -450,6 +450,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %dir %{_datadir}/apps/juk/
+%dir %{_datadir}/apps/juk/pics
 %endif
 
 %if "%{?nonfree}" == "1"
@@ -469,6 +470,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8
+- -extras: own %%_datadir/apps/juk/pics
+
 * Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
 - -extras: drop --with-musicbrainz (for now)
 



From fedora-extras-commits at redhat.com  Sat Oct  7 12:04:46 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat,  7 Oct 2006 05:04:46 -0700
Subject: rpms/tor/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 tor.spec,1.2,1.3
Message-ID: <200610071204.k97C4mP9009808@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9788

Modified Files:
	.cvsignore sources tor.spec 
Log Message:
updated to 0.1.1.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 06:27:27 -0000	1.2
+++ .cvsignore	7 Oct 2006 12:04:45 -0000	1.3
@@ -1 +1 @@
-tor-0.1.1.23.tar.gz
+tor-*.tar.*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 06:27:27 -0000	1.2
+++ sources	7 Oct 2006 12:04:45 -0000	1.3
@@ -1 +1,2 @@
-33ce7155f545c4d30cb846d7017cc6c2  tor-0.1.1.23.tar.gz
+28dea6a77a43b6e421e1bd7b2cc3d940  tor-0.1.1.24.tar.gz
+217c02c37858cf6048ba2b0a99d76014  tor-0.1.1.24.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/tor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tor.spec	26 Sep 2006 06:32:21 -0000	1.2
+++ tor.spec	7 Oct 2006 12:04:45 -0000	1.3
@@ -9,8 +9,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.1.1.23
-Release:	%release_func 4
+Version:	0.1.1.24
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Thu Oct  5 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.24-1
+- updated to 0.1.1.24
+
 * Tue Sep 26 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.23-4
 - first FE release (review #175433)
 



From fedora-extras-commits at redhat.com  Sat Oct  7 12:06:15 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat,  7 Oct 2006 05:06:15 -0700
Subject: rpms/tor/FC-5 tor-0.1.1.23.tar.gz.asc,1.1,NONE
Message-ID: <200610071206.k97C6HQZ009860@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837/FC-5

Removed Files:
	tor-0.1.1.23.tar.gz.asc 
Log Message:
cleanups; removed old *.asc file


--- tor-0.1.1.23.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 12:06:16 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat,  7 Oct 2006 05:06:16 -0700
Subject: rpms/tor/devel tor-0.1.1.23.tar.gz.asc,1.1,NONE
Message-ID: <200610071206.k97C6Iq4009863@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837/devel

Removed Files:
	tor-0.1.1.23.tar.gz.asc 
Log Message:
cleanups; removed old *.asc file


--- tor-0.1.1.23.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 12:07:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 05:07:27 -0700
Subject: rpms/kdemultimedia-extras/FC-5 kdemultimedia-extras.spec,1.6,1.7
Message-ID: <200610071207.k97C7Tq8009988@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9971

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
Release++



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdemultimedia-extras.spec	7 Oct 2006 12:01:32 -0000	1.6
+++ kdemultimedia-extras.spec	7 Oct 2006 12:07:27 -0000	1.7
@@ -67,7 +67,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.4
-Release: 7%{?dist}%{?kde}
+Release: 8%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"



From fedora-extras-commits at redhat.com  Sat Oct  7 14:38:32 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:38:32 -0700
Subject: rpms/spandsp/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 spandsp.spec, 1.2, 1.3
Message-ID: <200610071438.k97EcYsp016460@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16439

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2006 03:08:33 -0000	1.3
+++ .cvsignore	7 Oct 2006 14:38:32 -0000	1.4
@@ -1 +1 @@
-spandsp-0.0.3pre23.tgz
+spandsp-0.0.3pre24.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2006 03:08:33 -0000	1.3
+++ sources	7 Oct 2006 14:38:32 -0000	1.4
@@ -1 +1 @@
-09a2b0b8c53923fd7351a2026fa0c2ff  spandsp-0.0.3pre23.tgz
+1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spandsp.spec	6 Oct 2006 03:08:33 -0000	1.2
+++ spandsp.spec	7 Oct 2006 14:38:32 -0000	1.3
@@ -1,9 +1,9 @@
-%define pre 23
+%define pre 24
 
 Summary: A DSP library for telephony
 Name: spandsp
 Version: 0.0.3
-Release: 1%{?pre:.pre%{pre}}
+Release: 1%{?pre:.pre%{pre}}%{dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
@@ -73,7 +73,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.0.3-1.pre23
+* Sat Oct  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1.pre24
+- Update to 0.0.3pre24
+- Add dist tag.
+
+* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1.pre23
 - Update to 0.0.3pre23
 
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> - 0.0.2-1.pre26



From fedora-extras-commits at redhat.com  Sat Oct  7 14:41:22 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:41:22 -0700
Subject: rpms/spandsp/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 spandsp.spec, 1.2, 1.3
Message-ID: <200610071441.k97EfOHn016544@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16523

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2006 03:08:33 -0000	1.3
+++ .cvsignore	7 Oct 2006 14:41:22 -0000	1.4
@@ -1 +1 @@
-spandsp-0.0.3pre23.tgz
+spandsp-0.0.3pre24.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2006 03:08:33 -0000	1.3
+++ sources	7 Oct 2006 14:41:22 -0000	1.4
@@ -1 +1 @@
-09a2b0b8c53923fd7351a2026fa0c2ff  spandsp-0.0.3pre23.tgz
+1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/spandsp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spandsp.spec	6 Oct 2006 03:08:33 -0000	1.2
+++ spandsp.spec	7 Oct 2006 14:41:22 -0000	1.3
@@ -1,9 +1,9 @@
-%define pre 23
+%define pre 24
 
 Summary: A DSP library for telephony
 Name: spandsp
 Version: 0.0.3
-Release: 1%{?pre:.pre%{pre}}
+Release: 1%{?pre:.pre%{pre}}%{dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
@@ -73,7 +73,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.0.3-1.pre23
+* Sat Oct  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1.pre24
+- Update to 0.0.3pre24
+- Add dist tag.
+
+* Thu Oct  5 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1.pre23
 - Update to 0.0.3pre23
 
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> - 0.0.2-1.pre26



From fedora-extras-commits at redhat.com  Sat Oct  7 14:47:06 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:47:06 -0700
Subject: rpms/quodlibet/devel - New directory
Message-ID: <200610071447.k97El8a7016670@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16646/quodlibet/devel

Log Message:
Directory /cvs/extras/rpms/quodlibet/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 14:47:06 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:47:06 -0700
Subject: rpms/quodlibet - New directory
Message-ID: <200610071447.k97El8P0016667@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16646/quodlibet

Log Message:
Directory /cvs/extras/rpms/quodlibet added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 14:47:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:47:21 -0700
Subject: rpms/quodlibet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610071447.k97ElNY0016722@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16691/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module quodlibet


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 14:47:20 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:47:20 -0700
Subject: rpms/quodlibet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610071447.k97ElMSt016719@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16691

Added Files:
	Makefile import.log 
Log Message:
Setup of module quodlibet


--- NEW FILE Makefile ---
# Top level Makefile for module quodlibet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 14:48:12 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:48:12 -0700
Subject: rpms/quodlibet import.log,1.1,1.2
Message-ID: <200610071448.k97EmiVM016821@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16782

Modified Files:
	import.log 
Log Message:
auto-import quodlibet-0.23.1-1.fc6 on branch devel from quodlibet-0.23.1-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 14:47:20 -0000	1.1
+++ import.log	7 Oct 2006 14:48:12 -0000	1.2
@@ -0,0 +1 @@
+quodlibet-0_23_1-1_fc6:HEAD:quodlibet-0.23.1-1.fc6.src.rpm:1160232474



From fedora-extras-commits at redhat.com  Sat Oct  7 14:48:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:48:13 -0700
Subject: rpms/quodlibet/devel README.fedora, NONE,
	1.1 dl-quodlibet-plugins.sh, 
	NONE, 1.1 google.py, NONE, 1.1 quodlibet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610071448.k97Emj8i016825@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16782/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora dl-quodlibet-plugins.sh google.py quodlibet.spec 
Log Message:
auto-import quodlibet-0.23.1-1.fc6 on branch devel from quodlibet-0.23.1-1.fc6.src.rpm


--- NEW FILE README.fedora ---
There are a number of plugins packaged with the Fedora Extras Quod
Libet package that are not a part of the upstream Quod Libet release.
Some of them may have dependencies that are not available in Fedora
Core or Extras.  Some plugins may have bugs that prevent them from
working at all.  The plugins have been included to make the task of
getting all of the plugins downloaded and installed easier for the end
user.



--- NEW FILE dl-quodlibet-plugins.sh ---
#!/bin/bash

curdir=$(pwd)

pushd /var/tmp

#
# Set up directory structure
#

mkdir quodlibet-plugins-$$

pushd quodlibet-plugins-$$

#
# download plugins from Quod Libet SVN
#
plugin_revision=3702
plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"

svn -q export -r$plugin_revision $plugin_url

curl -o plugins/songsmenu/shell.2.py "http://www.sacredchao.net/quodlibet/attachment/wiki/Plugins/OpenInShell/shell.2.py?format=raw"

# get rid of any shebang lines

for plugin in `find plugins -name \*.py`
do
  sed -e '/^#!/,1d' $plugin > $plugin.tmp
  mv $plugin.tmp $plugin
done

tar cjf $curdir/quodlibet-plugins.tar.bz2 plugins

popd

rm -rf quodlibet-plugins-$$

popd


--- NEW FILE google.py ---
# Copyright 2006 Jeffrey C. Ollie <jeff at ocjtech.us>
#
# 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

GOOGLE_MUSICSEARCH_URL = "http://www.google.com/musicsearch?q=%s&res=%s"

from util import website
from urllib import quote
import gtk

from plugins.songsmenu import SongsMenuPlugin

class GoogleSearch(object):
    PLUGIN_ICON = gtk.STOCK_OPEN
    PLUGIN_VERSION = '0.0.1'

    def plugin_songs(self, songs):
        l = dict.fromkeys([song(self.k) for song in songs]).keys()
        for a in l:
            a = quote(str(a))
            website(GOOGLE_MUSICSEARCH_URL % (a, self.g))

class GoogleArtist(GoogleSearch, SongsMenuPlugin):
    PLUGIN_ID = 'Search for artist in Google'
    PLUGIN_NAME = _('Search for artist in Google')
    k = 'artist'
    g = k
    
class GoogleAlbum(GoogleSearch, SongsMenuPlugin):
    PLUGIN_ID = 'Search for album in Google'
    PLUGIN_NAME = _('Search for album in Google')
    k = 'album'
    g = k
    
class GoogleTitle(GoogleSearch, SongsMenuPlugin):
    PLUGIN_ID = 'Search for title in Google'
    PLUGIN_NAME = _('Search for title in Google')
    k = 'title'
    g = 'song'


--- NEW FILE quodlibet.spec ---
Name:           quodlibet
Version:        0.23.1
Release:        1%{?dist}
Summary:        A music management program

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.sacredchao.net/quodlibet
Source0:        http://www.sacredchao.net/~piman/software/quodlibet-%{version}.tar.gz
Source1:        dl-quodlibet-plugins.sh
Source2:        quodlibet-plugins.tar.bz2

# There is no upstream currently, as this plugin is the product of the Quod Libet packager
Source3:        google.py

Source4:        README.fedora

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  pygtk2-devel
BuildRequires:  python-ctypes
BuildRequires:  glib2-devel
BuildRequires:  gtk2-devel
BuildRequires:  gettext
BuildRequires:  intltool
BuildRequires:  desktop-file-utils
BuildRequires:  pkgconfig

Requires:       python-mutagen >= 1.5
Requires:       python >= 2.4
Requires:       pygtk2 >= 2.8
Requires:       gstreamer-python >= 0.10

# For tray icon plugin
Requires:       gnome-python2-libegg

# for Replay Gain plugin
Requires:       vorbisgain

%description
Quod Libet is a music management program. It provides several different ways
to view your audio library, as well as support for Internet radio and
audio feeds. It has extremely flexible metadata tag editing and searching
capabilities.

Ex Falso is a tag editor with the same tag editing interface as Quod Libet,
but it does not play files.

Supported file formats include Ogg Vorbis, MP3, FLAC, MOD/XM/IT, Musepack,
Wavpack, and MPEG-4 AAC.

%prep
%setup -q
cp %{S:4} .

%build

# we don't need _trayicon.so because the python libegg bindings are available
#pushd trayicon
#make trayicon.c
#CFLAGS="%{optflags}" %{__python} setup.py build
#cp build/lib*/trayicon.so ../_trayicon.so
#popd

pushd mmkeys
make mmkeyspy.c
CFLAGS="%{optflags}" %{__python} setup.py build
cp build/lib*/mmkeys.so ../_mmkeys.so
popd

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/quodlibet/

tar xfC %{S:2} %{buildroot}%{_datadir}/quodlibet/

cp %{S:3} %{buildroot}%{_datadir}/quodlibet/plugins/songsmenu

%ifarch x86_64 ppc64
make install PREFIX=/usr TODEP=lib64/quodlibet DESTDIR=%{buildroot}
%else
make install PREFIX=/usr TODEP=lib/quodlibet DESTDIR=%{buildroot}
%endif

rm -f %{buildroot}%{_datadir}/applications/*.desktop
make exfalso.desktop quodlibet.desktop
desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications              \
        --add-category X-Fedora                                 \
        exfalso.desktop
desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications              \
        --add-category X-Fedora                                 \
        quodlibet.desktop


%{find_lang} quodlibet

%clean
rm -rf %{buildroot}

%files -f quodlibet.lang
%defattr(-,root,root,-)
%doc COPYING HACKING NEWS README README.fedora

%{_bindir}/exfalso
%{_bindir}/quodlibet

%{_libdir}/quodlibet

%{_datadir}/applications/fedora-exfalso.desktop
%{_datadir}/applications/fedora-quodlibet.desktop

%{_datadir}/pixmaps/exfalso.png
%{_datadir}/pixmaps/quodlibet.png

%{_datadir}/quodlibet

%{_mandir}/man1/exfalso.1*
%{_mandir}/man1/quodlibet.1*

%changelog
* Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23.1-1
- Update to 0.23.1

* Thu Aug 24 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-5
- Include a README.fedora

* Thu Aug 17 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-4
- Instead of manually copying all of the plugins, pack them into a
  tarball and include a script for generating the tarball

* Wed Aug 16 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-3
- Make sure that %%{_libdir}/quodlibet/ is owned

* Tue Aug 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-2
- Convert tabs to spaces.
- Add shell plugin
- Get rid of some shebang lines.
- Add Google search plugin

* Fri Aug 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.23-1
- First version for Fedora Extras



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 14:47:21 -0000	1.1
+++ .cvsignore	7 Oct 2006 14:48:13 -0000	1.2
@@ -0,0 +1,2 @@
+quodlibet-0.23.1.tar.gz
+quodlibet-plugins.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 14:47:21 -0000	1.1
+++ sources	7 Oct 2006 14:48:13 -0000	1.2
@@ -0,0 +1,2 @@
+8b9d4f4dc0850b48cfe9b4b390722ef4  quodlibet-0.23.1.tar.gz
+4defba03c3f4b5f12b4c35331f4409fc  quodlibet-plugins.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct  7 14:55:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 07:55:26 -0700
Subject: owners owners.list,1.1791,1.1792
Message-ID: <200610071455.k97EtSI4016896@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16879

Modified Files:
	owners.list 
Log Message:
Adding quodlibet.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1791
retrieving revision 1.1792
diff -u -r1.1791 -r1.1792
--- owners.list	7 Oct 2006 06:40:05 -0000	1.1791
+++ owners.list	7 Oct 2006 14:55:26 -0000	1.1792
@@ -1923,6 +1923,7 @@
 Fedora Extras|quarry|A multi-purpose board-game GUI|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
 Fedora Extras|qucs|Circuit simulator|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
+Fedora Extras|quodlibet|A music management program|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|R|A language and environment for statistical computing and graphics|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|R-gnomeGUI|GNOME Console for R|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 14:59:19 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat,  7 Oct 2006 07:59:19 -0700
Subject: comps comps-fe6.xml.in,1.175,1.176
Message-ID: <200610071459.k97ExLUa016929@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16912

Modified Files:
	comps-fe6.xml.in 
Log Message:
add comix (currently for fc6)


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- comps-fe6.xml.in	7 Oct 2006 02:18:55 -0000	1.175
+++ comps-fe6.xml.in	7 Oct 2006 14:59:19 -0000	1.176
@@ -576,6 +576,7 @@
     <packagelist>
       <packagereq type="optional">agave</packagereq>
       <packagereq type="optional">blender</packagereq>
+      <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">digikam</packagereq>
       <packagereq type="optional">fontforge</packagereq>
       <packagereq type="optional">fyre</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct  7 15:11:20 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat,  7 Oct 2006 08:11:20 -0700
Subject: rpms/orage/devel orage.spec,1.2,1.3
Message-ID: <200610071511.k97FBM8Q019961@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19944

Modified Files:
	orage.spec 
Log Message:
Fix Obsoletes



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- orage.spec	6 Oct 2006 06:37:23 -0000	1.2
+++ orage.spec	7 Oct 2006 15:11:20 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: orage
 Version: 4.3.99.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
@@ -17,10 +17,10 @@
 BuildRequires: desktop-file-utils
 
 Provides: xfcalendar = %{version}-%{release}
-Obsoletes: xfcalendar <= 4.2.3-1
+Obsoletes: xfcalendar <= 4.2.3-3.fc6
 # xfce4-datetime-plugin isn't in Xfce 4.4
 Provides: xfce4-datetime-plugin = %{version}-%{release}
-Obsoletes: xfce4-datetime-plugin <= 4.2.3-3
+Obsoletes: xfce4-datetime-plugin <= 0.3.1-8.fc6
 
 %description
 Time-managing application for Xfce4.
@@ -72,6 +72,9 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Sat Oct  7 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
+- Fix Obsoletes
+
 * Thu Oct  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-4
 - Add period at the end of description. 
 - Fix defattr



From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:17 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:17 -0700
Subject: rpms/root-tail - New directory
Message-ID: <200610071525.k97FPJne020265@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20239/root-tail

Log Message:
Directory /cvs/extras/rpms/root-tail added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:17 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:17 -0700
Subject: rpms/root-tail/devel - New directory
Message-ID: <200610071525.k97FPJWS020268@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20239/root-tail/devel

Log Message:
Directory /cvs/extras/rpms/root-tail/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:27 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:27 -0700
Subject: rpms/root-tail Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610071525.k97FPTOS020317@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20284

Added Files:
	Makefile import.log 
Log Message:
Setup of module root-tail


--- NEW FILE Makefile ---
# Top level Makefile for module root-tail
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:27 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:27 -0700
Subject: rpms/root-tail/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610071525.k97FPT3n020320@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20284/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module root-tail


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:50 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:50 -0700
Subject: rpms/root-tail import.log,1.1,1.2
Message-ID: <200610071525.k97FPqlK020381@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20348

Modified Files:
	import.log 
Log Message:
auto-import root-tail-1.2-2.fc5 on branch devel from root-tail-1.2-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/root-tail/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 15:25:27 -0000	1.1
+++ import.log	7 Oct 2006 15:25:49 -0000	1.2
@@ -0,0 +1 @@
+root-tail-1_2-2_fc5:HEAD:root-tail-1.2-2.fc5.src.rpm:1160234745



From fedora-extras-commits at redhat.com  Sat Oct  7 15:25:50 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:25:50 -0700
Subject: rpms/root-tail/devel root-tail.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610071525.k97FPq7Y020386@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/root-tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20348/devel

Modified Files:
	.cvsignore sources 
Added Files:
	root-tail.spec 
Log Message:
auto-import root-tail-1.2-2.fc5 on branch devel from root-tail-1.2-2.fc5.src.rpm


--- NEW FILE root-tail.spec ---
Name:           root-tail
Version:        1.2
Release:        2%{?dist}
Summary:        Displays a given file anywhere on your X11 root window

Group:          User Interface/X
License:        GPL
URL:            http://www.goof.com/pcg/marc/root-tail.html
Source0:        http://www.goof.com/pcg/marc/data/root-tail-1.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  imake, xorg-x11-proto-devel, libXext-devel

%description
Displays a given file anywhere on your X11 root window, i.e. it is kind of 
tail -f for multiple files using your desktop background as output window.

%prep
%setup -q


%build
xmkmf -a
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
make install.man DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README 
%{_bindir}/*
%{_mandir}/man1/*



%changelog
* Thu Oct 05 2006 Michael Rice <errr[AT]errr-online.com> - 1.2-2
- Add rpm_opt_flags to make line for debug build

* Wed Oct 04 2006 Michael Rice <errr[AT]errr-online.com> - 1.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/root-tail/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 15:25:27 -0000	1.1
+++ .cvsignore	7 Oct 2006 15:25:50 -0000	1.2
@@ -0,0 +1 @@
+root-tail-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/root-tail/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 15:25:27 -0000	1.1
+++ sources	7 Oct 2006 15:25:50 -0000	1.2
@@ -0,0 +1 @@
+5a4b3c4c7ab3bed1f4575e9688aac5de  root-tail-1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 15:30:45 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 08:30:45 -0700
Subject: owners owners.list,1.1792,1.1793
Message-ID: <200610071530.k97FUlBX020466@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20430

Modified Files:
	owners.list 
Log Message:
Adding my self as maintainer bug: 209399



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1792
retrieving revision 1.1793
diff -u -r1.1792 -r1.1793
--- owners.list	7 Oct 2006 14:55:26 -0000	1.1792
+++ owners.list	7 Oct 2006 15:30:44 -0000	1.1793
@@ -1957,6 +1957,7 @@
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rogue|The original roguelike game|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|root-tail|An app to show log files on the root window|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|rosegarden4|MIDI, audio and notation editor|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 15:37:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sat,  7 Oct 2006 08:37:26 -0700
Subject: rpms/sysprof/FC-5 sysprof.spec,1.2,1.3
Message-ID: <200610071537.k97FbSDp020520@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20472/FC-5

Modified Files:
	sysprof.spec 
Log Message:
Do not build for ppc (the kmod does not support it)



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sysprof.spec	6 Oct 2006 22:16:26 -0000	1.2
+++ sysprof.spec	7 Oct 2006 15:37:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           sysprof      
 Version:        1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -18,6 +18,7 @@
 BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils
 
+ExclusiveArch:  i386 x86_64
 
 %description
 Sysprof is a sampling CPU profiler for Linux that uses a kernel module
@@ -59,6 +60,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
+- add ExclusiveArch to match sysprof-kmod supported archs
+
 * Tue Oct 2 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
 - add .desktop file
 



From fedora-extras-commits at redhat.com  Sat Oct  7 15:37:27 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sat,  7 Oct 2006 08:37:27 -0700
Subject: rpms/sysprof/devel sysprof.spec,1.1,1.2
Message-ID: <200610071537.k97FbT6c020524@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20472/devel

Modified Files:
	sysprof.spec 
Log Message:
Do not build for ppc (the kmod does not support it)



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysprof.spec	4 Oct 2006 14:40:56 -0000	1.1
+++ sysprof.spec	7 Oct 2006 15:37:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           sysprof      
 Version:        1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -19,6 +19,7 @@
 BuildRequires:  binutils-devel
 BuildRequires:  desktop-file-utils
 
+ExclusiveArch:  i386 x86_64
 
 %description
 Sysprof is a sampling CPU profiler for Linux that uses a kernel module
@@ -60,7 +61,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Tue Oct 2 2006 ianluca Sforna <giallu gmail com> 1.0.3-4
+* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
+- add ExclusiveArch to match sysprof-kmod supported archs
+
+* Tue Oct 2 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
 - add .desktop file
 
 * Fri Sep 30 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3



From fedora-extras-commits at redhat.com  Sat Oct  7 16:12:34 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat,  7 Oct 2006 09:12:34 -0700
Subject: comps comps-fe5.xml.in,1.161,1.162
Message-ID: <200610071612.k97GCaCF024419@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24402

Modified Files:
	comps-fe5.xml.in 
Log Message:
add comix also to FE5 comps


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- comps-fe5.xml.in	7 Oct 2006 02:18:55 -0000	1.161
+++ comps-fe5.xml.in	7 Oct 2006 16:12:33 -0000	1.162
@@ -499,6 +499,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">blender</packagereq>
+      <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">digikam</packagereq>
       <packagereq type="optional">fontforge</packagereq>
       <packagereq type="optional">fyre</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct  7 16:49:45 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Sat,  7 Oct 2006 09:49:45 -0700
Subject: rpms/kadu/devel kadu.spec,1.9,1.10
Message-ID: <200610071649.k97Gnl4f024623@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24606

Modified Files:
	kadu.spec 
Log Message:
* Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.13.20060915svn
- It should work now



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kadu.spec	6 Oct 2006 19:08:52 -0000	1.9
+++ kadu.spec	7 Oct 2006 16:49:44 -0000	1.10
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.12.%{cvs_date}svn%{?dist}
+Release:	0.13.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -283,15 +283,6 @@
 chmod a+x $binary
 done
 #+
-
-%ifnarch ppc64 x86_64 s390 s390x ia64
-rm -rf $RPM_BUILD_ROOT%{_moddata}/amarok.desc
-rm -rf $RPM_BUILD_ROOT%{_modlib}/amarok.so
-rm -rf $RPM_BUILD_ROOT%{_modtrans}/amarok*.qm
-rm -rf $RPM_BUILD_ROOT%{_moddata}/data/amarok
-%endif
-
-
 desktop-file-install --vendor fedora				\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	--add-category X-Fedora					\
@@ -414,8 +405,13 @@
 
 %mod_files2 xmms
 
+
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
+%ghost %{_modlib}/amarok.so
+%ghost %{_moddata}/amarok.desc
+%ghost %{_moddata}/data/amarok
+%ghost %{_modtrans}/amarok*
 %endif
 
 %mod_files2 filedesc
@@ -458,6 +454,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.13.20060915svn
+- It should work now
+
 * Fri Oct 06 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.12.20060915svn
 - Yet another fix...
 



From fedora-extras-commits at redhat.com  Sat Oct  7 17:05:30 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Sat,  7 Oct 2006 10:05:30 -0700
Subject: rpms/kadu/devel kadu.spec,1.10,1.11
Message-ID: <200610071705.k97H5WW2027683@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27666

Modified Files:
	kadu.spec 
Log Message:
* Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.14.20060915svn
- It really shoud work now



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kadu.spec	7 Oct 2006 16:49:44 -0000	1.10
+++ kadu.spec	7 Oct 2006 17:05:30 -0000	1.11
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.13.%{cvs_date}svn%{?dist}
+Release:	0.14.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -408,10 +408,14 @@
 
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
+
+%else
+
 %ghost %{_modlib}/amarok.so
 %ghost %{_moddata}/amarok.desc
 %ghost %{_moddata}/data/amarok
 %ghost %{_modtrans}/amarok*
+
 %endif
 
 %mod_files2 filedesc
@@ -454,6 +458,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.14.20060915svn
+- It really shoud work now
+
 * Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.13.20060915svn
 - It should work now
 



From fedora-extras-commits at redhat.com  Sat Oct  7 17:32:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat,  7 Oct 2006 10:32:27 -0700
Subject: rpms/perl-Email-Simple/FC-5 .cvsignore, 1.6,
	1.7 perl-Email-Simple.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200610071732.k97HWxBZ028150@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28112/FC-5

Modified Files:
	.cvsignore perl-Email-Simple.spec sources 
Log Message:
Update to 1.992.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Sep 2006 15:56:46 -0000	1.6
+++ .cvsignore	7 Oct 2006 17:32:26 -0000	1.7
@@ -1 +1 @@
-Email-Simple-1.990.tar.gz
+Email-Simple-1.992.tar.gz


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/perl-Email-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-Simple.spec	6 Sep 2006 15:56:46 -0000	1.5
+++ perl-Email-Simple.spec	7 Oct 2006 17:32:26 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-Simple
-Version:        1.990
+Version:        1.992
 Release:        1%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.992-1
+- Update to 1.992.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.990-1
 - Update to 1.990.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2006 15:56:46 -0000	1.6
+++ sources	7 Oct 2006 17:32:26 -0000	1.7
@@ -1 +1 @@
-c06d7b75862a8c20ea9b14116e17a5e3  Email-Simple-1.990.tar.gz
+901b2c7d2b978a0b31ca6b274282b852  Email-Simple-1.992.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 17:32:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat,  7 Oct 2006 10:32:27 -0700
Subject: rpms/perl-Email-Simple/devel .cvsignore, 1.7,
	1.8 perl-Email-Simple.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200610071732.k97HWxG7028155@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28112/devel

Modified Files:
	.cvsignore perl-Email-Simple.spec sources 
Log Message:
Update to 1.992.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Sep 2006 15:56:46 -0000	1.7
+++ .cvsignore	7 Oct 2006 17:32:27 -0000	1.8
@@ -1 +1 @@
-Email-Simple-1.990.tar.gz
+Email-Simple-1.992.tar.gz


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/perl-Email-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Simple.spec	6 Sep 2006 15:56:46 -0000	1.6
+++ perl-Email-Simple.spec	7 Oct 2006 17:32:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Simple
-Version:        1.990
+Version:        1.992
 Release:        1%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.992-1
+- Update to 1.992.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.990-1
 - Update to 1.990.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Sep 2006 15:56:46 -0000	1.7
+++ sources	7 Oct 2006 17:32:27 -0000	1.8
@@ -1 +1 @@
-c06d7b75862a8c20ea9b14116e17a5e3  Email-Simple-1.990.tar.gz
+901b2c7d2b978a0b31ca6b274282b852  Email-Simple-1.992.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 17:41:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat,  7 Oct 2006 10:41:50 -0700
Subject: rpms/perl-Error/FC-5 .cvsignore, 1.10, 1.11 perl-Error.spec, 1.14, 
	1.15 sources, 1.10, 1.11
Message-ID: <200610071741.k97Hfq8u028328@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28291/FC-5

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17006.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Oct 2006 17:34:25 -0000	1.10
+++ .cvsignore	7 Oct 2006 17:41:50 -0000	1.11
@@ -1 +1 @@
-Error-0.17005.tar.gz
+Error-0.17006.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/perl-Error.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Error.spec	4 Oct 2006 17:34:25 -0000	1.14
+++ perl-Error.spec	7 Oct 2006 17:41:50 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17005
+Version:        0.17006
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -11,6 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -49,6 +51,10 @@
 
 
 %changelog
+* Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17006-1
+- Update to 0.17006.
+- New build requirements: Test::Pod and Test::Pod::Coverage.
+
 * Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17005-1
 - Update to 0.17005.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Oct 2006 17:34:25 -0000	1.10
+++ sources	7 Oct 2006 17:41:50 -0000	1.11
@@ -1 +1 @@
-59579d2eb0c5cae5d102db2b1110f875  Error-0.17005.tar.gz
+fc9f7e5000d5607359e2ed03f6a9cf1c  Error-0.17006.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 17:41:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat,  7 Oct 2006 10:41:51 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.10, 1.11 perl-Error.spec, 1.14, 
	1.15 sources, 1.10, 1.11
Message-ID: <200610071741.k97HfrIm028334@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28291/devel

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17006.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Oct 2006 17:34:25 -0000	1.10
+++ .cvsignore	7 Oct 2006 17:41:51 -0000	1.11
@@ -1 +1 @@
-Error-0.17005.tar.gz
+Error-0.17006.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Error.spec	4 Oct 2006 17:34:25 -0000	1.14
+++ perl-Error.spec	7 Oct 2006 17:41:51 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17005
+Version:        0.17006
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -11,6 +11,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -49,6 +51,10 @@
 
 
 %changelog
+* Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17006-1
+- Update to 0.17006.
+- New build requirements: Test::Pod and Test::Pod::Coverage.
+
 * Wed Oct  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17005-1
 - Update to 0.17005.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Oct 2006 17:34:25 -0000	1.10
+++ sources	7 Oct 2006 17:41:51 -0000	1.11
@@ -1 +1 @@
-59579d2eb0c5cae5d102db2b1110f875  Error-0.17005.tar.gz
+fc9f7e5000d5607359e2ed03f6a9cf1c  Error-0.17006.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 18:02:15 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:02:15 -0700
Subject: rpms/python-eyed3 - New directory
Message-ID: <200610071802.k97I2JEv031428@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31419/python-eyed3

Log Message:
Directory /cvs/extras/rpms/python-eyed3 added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 18:02:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:02:20 -0700
Subject: rpms/python-eyed3/devel - New directory
Message-ID: <200610071802.k97I2OO8031449@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31419/python-eyed3/devel

Log Message:
Directory /cvs/extras/rpms/python-eyed3/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct  7 18:02:38 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:02:38 -0700
Subject: rpms/python-eyed3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610071802.k97I2faP031481@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31468

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-eyed3


--- NEW FILE Makefile ---
# Top level Makefile for module python-eyed3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct  7 18:02:41 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:02:41 -0700
Subject: rpms/python-eyed3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610071802.k97I2h9j031499@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31468/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-eyed3


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct  7 18:03:35 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:03:35 -0700
Subject: rpms/python-eyed3/devel python-eyed3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610071803.k97I3bd2031567@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31532/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-eyed3.spec 
Log Message:
auto-import python-eyed3-0.6.10-2 on branch devel from python-eyed3-0.6.10-2.src.rpm


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

Name:           python-eyed3
Version:        0.6.10
Release:        2%{?dist}
Summary:        Python module for processing ID3 tags

Group:          Development/Languages
License:        GPL
URL:            http://eyed3.nicfit.net/
Source0:        http://eyed3.nicfit.net/releases/eyeD3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python


%description
Aa Python module and program for processing ID3 tags. Information about
mp3 files(i.e bit rate, sample frequency, play time, etc.) is also
provided. The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.


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


%build
%configure
# Make isn't necessary.

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove dup & unnecessary docs
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/AUTHORS
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/COPYING.gz
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/ChangeLog.gz
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/README
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/eyeD3-%{version}/THANKS

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/eyeD3
%{_mandir}/man1/*.1.gz
%{python_sitelib}/*


%changelog
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.6.10-2
- Change BR to python.
- Remove unnecessary make in build section.

* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.6.10-1
- Initial FE spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Oct 2006 18:02:41 -0000	1.1
+++ .cvsignore	7 Oct 2006 18:03:35 -0000	1.2
@@ -0,0 +1 @@
+eyeD3-0.6.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Oct 2006 18:02:41 -0000	1.1
+++ sources	7 Oct 2006 18:03:35 -0000	1.2
@@ -0,0 +1 @@
+2f7ee6749b993faba3b5d10d9621d314  eyeD3-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 18:03:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:03:34 -0700
Subject: rpms/python-eyed3 import.log,1.1,1.2
Message-ID: <200610071804.k97I47Ij031570@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31532

Modified Files:
	import.log 
Log Message:
auto-import python-eyed3-0.6.10-2 on branch devel from python-eyed3-0.6.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Oct 2006 18:02:38 -0000	1.1
+++ import.log	7 Oct 2006 18:03:34 -0000	1.2
@@ -0,0 +1 @@
+python-eyed3-0_6_10-2:HEAD:python-eyed3-0.6.10-2.src.rpm:1160244230



From fedora-extras-commits at redhat.com  Sat Oct  7 18:06:28 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:06:28 -0700
Subject: owners owners.list,1.1793,1.1794
Message-ID: <200610071806.k97I6URf031693@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31676

Modified Files:
	owners.list 
Log Message:
Add python-eyed3


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1793
retrieving revision 1.1794
diff -u -r1.1793 -r1.1794
--- owners.list	7 Oct 2006 15:30:44 -0000	1.1793
+++ owners.list	7 Oct 2006 18:06:28 -0000	1.1794
@@ -1831,6 +1831,7 @@
 Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-elementtree|Fast XML parser and writer|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt
+Fedora Extras|python-eyed3|Python module for processing ID3 tags|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-feedparser|Parse RSS and Atom feeds in Python|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-formencode|FormEncode is a validation and form generation package.|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-fpconst|A Python module for handling IEEE 754 floating point special values|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct  7 18:49:10 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:49:10 -0700
Subject: rpms/libgalago/devel .cvsignore, 1.3, 1.4 libgalago.spec, 1.8,
	1.9 sources, 1.3, 1.4 libgalago-gettext.patch, 1.1, NONE
Message-ID: <200610071849.k97InCVu031946@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31925

Modified Files:
	.cvsignore libgalago.spec sources 
Removed Files:
	libgalago-gettext.patch 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
- Update to 0.5.2.
- Drop gettext patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 May 2006 23:53:22 -0000	1.3
+++ .cvsignore	7 Oct 2006 18:49:10 -0000	1.4
@@ -1 +1 @@
-libgalago-0.5.1.tar.bz2
+libgalago-0.5.2.tar.bz2


Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgalago.spec	29 Aug 2006 20:58:19 -0000	1.8
+++ libgalago.spec	7 Oct 2006 18:49:10 -0000	1.9
@@ -1,22 +1,18 @@
 Name:		libgalago
-Version:	0.5.1
-Release:	7%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.galago-project.org/
 Source0:	http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-gettext.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	check-devel
 BuildRequires:	gtk-doc
-BuildRequires:	autoconf
-BuildRequires:	libtool
-BuildRequires:	automake
 BuildRequires:	gettext-devel
 
 
@@ -43,8 +39,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gettext
-./autogen.sh
+
 
 %build
 %configure --enable-static=no --enable-gtk-doc
@@ -86,6 +81,10 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
+- Update to 0.5.2.
+- Drop gettext patch.
+
 * Tue Aug 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-7
 - Rebuild for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 May 2006 23:53:22 -0000	1.3
+++ sources	7 Oct 2006 18:49:10 -0000	1.4
@@ -1 +1 @@
-9ace3f93505626773b852d2ebbc7d5d6  libgalago-0.5.1.tar.bz2
+47f27f58dd8b0e46d9d2e037c51063ed  libgalago-0.5.2.tar.bz2


--- libgalago-gettext.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 18:56:56 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 11:56:56 -0700
Subject: rpms/gaim-galago/devel .cvsignore, 1.2, 1.3 gaim-galago.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200610071856.k97IuwNx032044@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gaim-galago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32023

Modified Files:
	.cvsignore gaim-galago.spec sources 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.
- Add version required for libgalago.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 18:23:53 -0000	1.2
+++ .cvsignore	7 Oct 2006 18:56:56 -0000	1.3
@@ -1 +1 @@
-gaim-galago-0.5.0.tar.bz2
+gaim-galago-0.5.1.tar.bz2


Index: gaim-galago.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/devel/gaim-galago.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaim-galago.spec	4 Oct 2006 22:24:55 -0000	1.2
+++ gaim-galago.spec	7 Oct 2006 18:56:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gaim-galago
-Version:        0.5.0
-Release:        3%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Galago feed plugin for Gaim
 
 Group:		System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim-devel
-BuildRequires:	libgalago-devel
+BuildRequires:	libgalago-devel >= 0.5.2
 
 Requires:	gaim
 Requires:	galago-daemon
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+- Add version required for libgalago.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 18:23:53 -0000	1.2
+++ sources	7 Oct 2006 18:56:56 -0000	1.3
@@ -1 +1 @@
-58788373f86dd9f4cdf1f4ee8c7045f0  gaim-galago-0.5.0.tar.bz2
+00f58de5aa7850cceac766757add921a  gaim-galago-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct  7 19:20:36 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 12:20:36 -0700
Subject: rpms/galago-daemon/devel .cvsignore, 1.2, 1.3 galago-daemon.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200610071920.k97JKcBp002619@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2597

Modified Files:
	.cvsignore galago-daemon.spec sources 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:35:03 -0000	1.2
+++ .cvsignore	7 Oct 2006 19:20:36 -0000	1.3
@@ -1 +1 @@
-galago-daemon-0.5.0.tar.bz2
+galago-daemon-0.5.1.tar.gz


Index: galago-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/devel/galago-daemon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- galago-daemon.spec	29 Aug 2006 21:12:16 -0000	1.5
+++ galago-daemon.spec	7 Oct 2006 19:20:36 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           galago-daemon
-Version:        0.5.0
-Release:        6%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Galago presence daemon
 
 Group:		System Environment/Daemons
 License:        GPL
 URL:		http://galago.sourceforge.net/
-Source0:        http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgalago-devel 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+
 * Tue Aug 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
 - Rebuilt for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2006 19:35:03 -0000	1.2
+++ sources	7 Oct 2006 19:20:36 -0000	1.3
@@ -1 +1 @@
-bc74c3ac8c18f4c1a44e43504c59a08f  galago-daemon-0.5.0.tar.bz2
+fdb81f938f86f380b127158ebb542279  galago-daemon-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 19:24:14 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  7 Oct 2006 12:24:14 -0700
Subject: rpms/python-vobject/devel .cvsignore, 1.3, 1.4 python-vobject.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610071924.k97JOGB5002702@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2681

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
0.4.3-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Aug 2006 17:02:21 -0000	1.3
+++ .cvsignore	7 Oct 2006 19:24:14 -0000	1.4
@@ -1 +1 @@
-vobject-0.4.1.tar.gz
+vobject-0.4.3.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/python-vobject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-vobject.spec	10 Sep 2006 19:03:06 -0000	1.3
+++ python-vobject.spec	7 Oct 2006 19:24:14 -0000	1.4
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.4.1 
-Release:        2%{?dist}
+Version:        0.4.3 
+Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
 Group:          Development/Languages
 License:        Apache Software License
 URL:            http://vobject.skyhouseconsulting.com/ 
-Source0:        http://vobject.skyhouseconsulting.com/vobject-0.4.1.tar.gz
+Source0:        http://vobject.skyhouseconsulting.com/vobject-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -73,6 +73,9 @@
 %{python_sitelib}/vobject*egg-info
 
 %changelog
+* Sat Oct 07 2006 James Bowes <jbowes at redhat.com> - 0.4.3-1
+- New version released.
+
 * Sun Sep 10 2006 James Bowes <jbowes at redhat.com> 0.4.1-2
 - Stop ghosting pyo files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2006 17:02:21 -0000	1.3
+++ sources	7 Oct 2006 19:24:14 -0000	1.4
@@ -1 +1 @@
-b12fbec4abd87c826b4627364bd1474d  vobject-0.4.1.tar.gz
+f6405e4620dfcc403f53b825d2eee529  vobject-0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 19:25:16 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  7 Oct 2006 12:25:16 -0700
Subject: rpms/python-vobject/FC-5 .cvsignore, 1.2, 1.3 python-vobject.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610071925.k97JPItC002773@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2752

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
0.4.3-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jun 2006 18:42:44 -0000	1.2
+++ .cvsignore	7 Oct 2006 19:25:16 -0000	1.3
@@ -1 +1 @@
-vobject-0.3.0.tar.gz
+vobject-0.4.3.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-5/python-vobject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-vobject.spec	10 Sep 2006 19:04:46 -0000	1.3
+++ python-vobject.spec	7 Oct 2006 19:25:16 -0000	1.4
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.4.1 
-Release:        2%{?dist}
+Version:        0.4.3 
+Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
 Group:          Development/Languages
 License:        Apache Software License
 URL:            http://vobject.skyhouseconsulting.com/ 
-Source0:        http://vobject.skyhouseconsulting.com/vobject-0.4.1.tar.gz
+Source0:        http://vobject.skyhouseconsulting.com/vobject-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -73,6 +73,9 @@
 %{python_sitelib}/vobject*egg-info
 
 %changelog
+* Sat Oct 07 2006 James Bowes <jbowes at redhat.com> - 0.4.3-1
+- New version released.
+
 * Sun Sep 10 2006 James Bowes <jbowes at redhat.com> 0.4.1-2
 - Stop ghosting pyo files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2006 17:04:54 -0000	1.3
+++ sources	7 Oct 2006 19:25:16 -0000	1.4
@@ -1 +1 @@
-b12fbec4abd87c826b4627364bd1474d  vobject-0.4.1.tar.gz
+f6405e4620dfcc403f53b825d2eee529  vobject-0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct  7 20:22:06 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sat,  7 Oct 2006 13:22:06 -0700
Subject: rpms/dogtail/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE dogtail-skip-None-children.patch, 1.1,
	NONE dogtail.spec, 1.4, NONE needs.rebuild, 1.1, NONE sources,
	1.2, NONE
Message-ID: <200610072022.k97KM8WR006004@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5988

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile dogtail-skip-None-children.patch 
	dogtail.spec needs.rebuild sources 
Log Message:
dogtail moved to core


--- NEW FILE dead.package ---
Moved to core


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- dogtail-skip-None-children.patch DELETED ---


--- dogtail.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 20:23:10 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sat,  7 Oct 2006 13:23:10 -0700
Subject: rpms/pyspi/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE pyspi-NULL-children.patch, 1.1, NONE pyspi.spec, 1.2,
	NONE sources, 1.2, NONE
Message-ID: <200610072023.k97KNCcI006036@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/pyspi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6020

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild pyspi-NULL-children.patch 
	pyspi.spec sources 
Log Message:
pyspi moved to core


--- NEW FILE dead.package ---
Moved to core


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- pyspi-NULL-children.patch DELETED ---


--- pyspi.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 20:27:06 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sat,  7 Oct 2006 13:27:06 -0700
Subject: rpms/gnome-applet-netmon/devel dead.package, NONE, 1.1 .cvsignore,
	1.1, NONE Makefile, 1.1, NONE gnome-applet-netmon.spec, 1.2,
	NONE needs.rebuild, 1.1,
	NONE netmon.schemas.in.vertical_layout.to.false.patch, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200610072027.k97KR83C006068@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/gnome-applet-netmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6052

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gnome-applet-netmon.spec needs.rebuild 
	netmon.schemas.in.vertical_layout.to.false.patch sources 
Log Message:
gnome-applet-netmon is dead upstream


--- NEW FILE dead.package ---
Upstream is dead


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gnome-applet-netmon.spec DELETED ---


--- needs.rebuild DELETED ---


--- netmon.schemas.in.vertical_layout.to.false.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct  7 23:36:09 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sat,  7 Oct 2006 16:36:09 -0700
Subject: comps comps-cleanup.xsl,1.1,1.2
Message-ID: <200610072336.k97NaBKm015779@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15762

Modified Files:
	comps-cleanup.xsl 
Log Message:
beautify warnings


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comps-cleanup.xsl	3 Sep 2006 10:41:57 -0000	1.1
+++ comps-cleanup.xsl	7 Oct 2006 23:36:09 -0000	1.2
@@ -6,7 +6,7 @@
      - keep a single package reference per group,
 
      Typical usage is:
-     $ xsltproc -o output-file comps.cleanup.xsl original-file
+     $ xsltproc -o output-file comps-cleanup.xsl original-file
 
      You can use the "novalid" xsltproc switch to kill the warning about
      Fedora not installing the comps DTD anywhere xsltproc can find it.
@@ -50,11 +50,13 @@
   </xsl:template>
 <!-- Warn about duplicate groups being merged -->
   <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="2">
-    <xsl:message>! Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+    <xsl:message>?????? Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+    <xsl:message>??</xsl:message>
   </xsl:template>
 <!-- Warn about duplicate categories being merged -->
   <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="2">
-    <xsl:message>! Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+    <xsl:message>?????? Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+    <xsl:message>??</xsl:message>
   </xsl:template>
 <!-- Sort packages within a group by class then name -->
   <xsl:template match="packagelist" priority="1">
@@ -83,20 +85,22 @@
   </xsl:template>
 <!-- Kill duplicate package entries -->
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
-    <xsl:message>! Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
+    <xsl:message>????????? Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
     <xsl:message>  Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
+    <xsl:message>??</xsl:message>
   </xsl:template>
 <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">
-    <xsl:message>! Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
+    <xsl:message>??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
+    <xsl:message>??</xsl:message>
   </xsl:template>
-<!-- Warn about packages referenced several times -->
-  <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-packages',text())[1])]" priority="1">
-    <xsl:message>o Package <xsl:value-of select="text()"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>
-  was referenced before:</xsl:message>
-    <xsl:for-each select="key('unique-packages',text())[generate-id(.) != generate-id(current())]">
-      <xsl:message> - <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
+<!-- Warn about packages referenced several times (at least twice;)) -->
+  <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
+    <xsl:message>??? Package <xsl:value-of select="text()"/> is referenced several times:</xsl:message>
+    <xsl:for-each select="key('unique-packages',text())">
+      <xsl:message> ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
+    <xsl:message>??</xsl:message>
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
       <xsl:apply-templates select="*|text()|comment()"/>



From fedora-extras-commits at redhat.com  Sun Oct  8 01:00:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 18:00:27 -0700
Subject: rpms/kid3/FC-5 kid3.spec,1.10,1.11
Message-ID: <200610080100.k9810U7O018949@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kid3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18932

Modified Files:
	kid3.spec 
Log Message:
* Sat Oct 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7-2
- Disable musicbrainz support by default, not ready for tunepimp 0.5 yet.



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-5/kid3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kid3.spec	29 Jun 2006 18:48:38 -0000	1.10
+++ kid3.spec	8 Oct 2006 01:00:27 -0000	1.11
@@ -1,6 +1,8 @@
+%bcond_with     tunepimp
+
 Name:           kid3
 Version:        0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
@@ -13,7 +15,9 @@
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
 BuildRequires:  flac-devel
+%if %{with tunepimp}
 BuildRequires:  libtunepimp-devel
+%endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  perl(File::Spec)
 
@@ -32,7 +36,11 @@
 
 %build
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-rpath --disable-dependency-tracking
+%configure \
+%if ! %{with tunepimp}
+  --disable-musicbrainz \
+%endif
+  --disable-rpath --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -81,6 +89,9 @@
 
 
 %changelog
+* Sat Oct 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7-2
+- Disable musicbrainz support by default, not ready for tunepimp 0.5 yet.
+
 * Thu Jun 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-1
 - 0.7, build with libtunepimp.
 - Patch to register as a handler for more media types.



From fedora-extras-commits at redhat.com  Sun Oct  8 01:02:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 18:02:47 -0700
Subject: rpms/kid3/FC-5 kid3.spec,1.11,1.12
Message-ID: <200610080103.k9813Mvm021829@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kid3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21810

Modified Files:
	kid3.spec 
Log Message:
hmm... bcond_with choked up 'make tag', do it manually.



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-5/kid3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kid3.spec	8 Oct 2006 01:00:27 -0000	1.11
+++ kid3.spec	8 Oct 2006 01:02:47 -0000	1.12
@@ -1,4 +1,5 @@
-%bcond_with     tunepimp
+#bcond_with     tunepimp
+%define with_tunepimp 0
 
 Name:           kid3
 Version:        0.7



From fedora-extras-commits at redhat.com  Sun Oct  8 01:06:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  7 Oct 2006 18:06:02 -0700
Subject: rpms/kid3/FC-5 kid3.spec,1.12,1.13
Message-ID: <200610080106.k981640G021930@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kid3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21913

Modified Files:
	kid3.spec 
Log Message:
s/with tunepimp/with_tunepimp/



Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-5/kid3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kid3.spec	8 Oct 2006 01:02:47 -0000	1.12
+++ kid3.spec	8 Oct 2006 01:06:02 -0000	1.13
@@ -16,7 +16,7 @@
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
 BuildRequires:  flac-devel
-%if %{with tunepimp}
+%if %{with_tunepimp}
 BuildRequires:  libtunepimp-devel
 %endif
 BuildRequires:  desktop-file-utils
@@ -38,7 +38,7 @@
 %build
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
 %configure \
-%if ! %{with tunepimp}
+%if ! %{with_tunepimp}
   --disable-musicbrainz \
 %endif
   --disable-rpath --disable-dependency-tracking



From fedora-extras-commits at redhat.com  Sun Oct  8 02:55:11 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 19:55:11 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.2,1.3
Message-ID: <200610080255.k982tDgm025470@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25453

Modified Files:
	eds-feed.spec 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
- Rebuild for new libgalago.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eds-feed.spec	4 Oct 2006 22:20:39 -0000	1.2
+++ eds-feed.spec	8 Oct 2006 02:55:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
+- Rebuild for new libgalago.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sun Oct  8 02:55:54 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat,  7 Oct 2006 19:55:54 -0700
Subject: rpms/libgalago-gtk/devel libgalago-gtk.spec,1.2,1.3
Message-ID: <200610080255.k982tuOr025536@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25519

Modified Files:
	libgalago-gtk.spec 
Log Message:
* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
- Rebuild for new libgalago.



Index: libgalago-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago-gtk/devel/libgalago-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgalago-gtk.spec	4 Oct 2006 22:25:44 -0000	1.2
+++ libgalago-gtk.spec	8 Oct 2006 02:55:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libgalago-gtk
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widgets for the Galago presence framework
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
+- Rebuild for new libgalago.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sun Oct  8 03:24:23 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat,  7 Oct 2006 20:24:23 -0700
Subject: rpms/pgp-tools/devel .cvsignore, 1.5, 1.6 pgp-tools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610080324.k983OtSN028624@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28603

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to 0.4.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jul 2006 17:31:21 -0000	1.5
+++ .cvsignore	8 Oct 2006 03:24:23 -0000	1.6
@@ -1 +1 @@
-signing-party_0.4.7.orig.tar.gz
+signing-party_0.4.8.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgp-tools.spec	10 Jul 2006 17:31:21 -0000	1.4
+++ pgp-tools.spec	8 Oct 2006 03:24:23 -0000	1.5
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -8,7 +8,11 @@
 URL:            http://pgp-tools.alioth.debian.org/
 # To check out the source tree from subversion, use this:
 # svn co svn://svn.debian.org/pgp-tools/trunk/ pgp-tools
-# You can also find source tarballs posted at
+# or to get a particular revision:
+# svn co svn://svn.debian.org/pgp-tools/tags/release-%{version} signing-party-%{version}
+# Then to make the tarball, use:
+# tar cvzf signing-party_%{version}.orig.tar.gz --exclude=.svn --exclude=debian signing-party-%{version}/
+# For some releases you may also find source tarballs posted at
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 Source0:	http://alioth.debian.org/download.php/1688/%{tarballname}_%{version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
@@ -48,12 +52,12 @@
 
 for file in `find $DIRS -type f -perm +0111 -print`
 do
-    install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
 done
 
 for man in `find $DIRS -type f -name "*.[0-9]" -print`
 do
-    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
 #  cleanup to leave docs only...
@@ -73,6 +77,13 @@
 
 
 %changelog
+* Sat Oct 07 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.8-1
+- upgrade to 0.4.8
+  - gpglist: do not die with with-fingerprint (Closes: debian #382019).
+  - gpg-key2ps: add --list-key to gpg call (works around debian #382794).
+  - caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
+    Gerfried Fuchs.
+
 * Mon Jul 10 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.7-1
 - upgrade to latest upstream
   - gpg-mailkeys: use right content-type for attached key,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jul 2006 17:31:21 -0000	1.5
+++ sources	8 Oct 2006 03:24:23 -0000	1.6
@@ -1 +1 @@
-b277efb28ae0b794d6e53a84f753682a  signing-party_0.4.7.orig.tar.gz
+61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 03:27:26 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat,  7 Oct 2006 20:27:26 -0700
Subject: rpms/pgp-tools/FC-5 .cvsignore, 1.5, 1.6 pgp-tools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610080327.k983RS9J028709@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28688

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to 0.4.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jul 2006 17:33:47 -0000	1.5
+++ .cvsignore	8 Oct 2006 03:27:26 -0000	1.6
@@ -1 +1 @@
-signing-party_0.4.7.orig.tar.gz
+signing-party_0.4.8.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/pgp-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgp-tools.spec	10 Jul 2006 17:33:47 -0000	1.4
+++ pgp-tools.spec	8 Oct 2006 03:27:26 -0000	1.5
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -8,7 +8,11 @@
 URL:            http://pgp-tools.alioth.debian.org/
 # To check out the source tree from subversion, use this:
 # svn co svn://svn.debian.org/pgp-tools/trunk/ pgp-tools
-# You can also find source tarballs posted at
+# or to get a particular revision:
+# svn co svn://svn.debian.org/pgp-tools/tags/release-%{version} signing-party-%{version}
+# Then to make the tarball, use:
+# tar cvzf signing-party_%{version}.orig.tar.gz --exclude=.svn --exclude=debian signing-party-%{version}/
+# For some releases you may also find source tarballs posted at
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 Source0:	http://alioth.debian.org/download.php/1688/%{tarballname}_%{version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
@@ -48,12 +52,12 @@
 
 for file in `find $DIRS -type f -perm +0111 -print`
 do
-    install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
 done
 
 for man in `find $DIRS -type f -name "*.[0-9]" -print`
 do
-    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
 #  cleanup to leave docs only...
@@ -73,6 +77,13 @@
 
 
 %changelog
+* Sat Oct 07 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.8-1
+- upgrade to 0.4.8
+  - gpglist: do not die with with-fingerprint (Closes: debian #382019).
+  - gpg-key2ps: add --list-key to gpg call (works around debian #382794).
+  - caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
+    Gerfried Fuchs.
+
 * Mon Jul 10 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.7-1
 - upgrade to latest upstream
   - gpg-mailkeys: use right content-type for attached key,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jul 2006 17:33:47 -0000	1.5
+++ sources	8 Oct 2006 03:27:26 -0000	1.6
@@ -1 +1 @@
-b277efb28ae0b794d6e53a84f753682a  signing-party_0.4.7.orig.tar.gz
+61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 03:28:34 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat,  7 Oct 2006 20:28:34 -0700
Subject: rpms/pgp-tools/FC-4 .cvsignore, 1.4, 1.5 pgp-tools.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610080328.k983SaTe028780@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28759

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to 0.4.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jul 2006 17:46:34 -0000	1.4
+++ .cvsignore	8 Oct 2006 03:28:34 -0000	1.5
@@ -1 +1 @@
-signing-party_0.4.7.orig.tar.gz
+signing-party_0.4.8.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/pgp-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pgp-tools.spec	10 Jul 2006 17:46:34 -0000	1.3
+++ pgp-tools.spec	8 Oct 2006 03:28:34 -0000	1.4
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -8,7 +8,11 @@
 URL:            http://pgp-tools.alioth.debian.org/
 # To check out the source tree from subversion, use this:
 # svn co svn://svn.debian.org/pgp-tools/trunk/ pgp-tools
-# You can also find source tarballs posted at
+# or to get a particular revision:
+# svn co svn://svn.debian.org/pgp-tools/tags/release-%{version} signing-party-%{version}
+# Then to make the tarball, use:
+# tar cvzf signing-party_%{version}.orig.tar.gz --exclude=.svn --exclude=debian signing-party-%{version}/
+# For some releases you may also find source tarballs posted at
 # http://alioth.debian.org/project/showfiles.php?group_id=30435
 Source0:	http://alioth.debian.org/download.php/1688/%{tarballname}_%{version}.orig.tar.gz
 # from svn debian/copyright, not included in tarballs.
@@ -48,12 +52,12 @@
 
 for file in `find $DIRS -type f -perm +0111 -print`
 do
-    install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
+	install -p -m755 $file $RPM_BUILD_ROOT%{_bindir} 
 done
 
 for man in `find $DIRS -type f -name "*.[0-9]" -print`
 do
-    install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
 #  cleanup to leave docs only...
@@ -73,6 +77,13 @@
 
 
 %changelog
+* Sat Oct 07 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.8-1
+- upgrade to 0.4.8
+  - gpglist: do not die with with-fingerprint (Closes: debian #382019).
+  - gpg-key2ps: add --list-key to gpg call (works around debian #382794).
+  - caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by
+    Gerfried Fuchs.
+
 * Mon Jul 10 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.7-1
 - upgrade to latest upstream
   - gpg-mailkeys: use right content-type for attached key,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jul 2006 17:46:34 -0000	1.4
+++ sources	8 Oct 2006 03:28:34 -0000	1.5
@@ -1 +1 @@
-b277efb28ae0b794d6e53a84f753682a  signing-party_0.4.7.orig.tar.gz
+61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 04:22:55 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 21:22:55 -0700
Subject: rpms/ejabberd/devel .cvsignore, 1.2, 1.3 ejabberd.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200610080422.k984Mv1D031844@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823

Modified Files:
	.cvsignore ejabberd.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2006 12:40:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 04:22:54 -0000	1.3
@@ -1 +1 @@
-ejabberd-1.1.1.tar.gz
+ejabberd-1.1.2.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejabberd.spec	29 Aug 2006 00:46:57 -0000	1.4
+++ ejabberd.spec	8 Oct 2006 04:22:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.1
-Release:        10%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 12:40:03 -0000	1.2
+++ sources	8 Oct 2006 04:22:54 -0000	1.3
@@ -1 +1 @@
-ef6fae4a3f9c7f807f21e9cd3dae195b  ejabberd-1.1.1.tar.gz
+5b947e19e18a6b554bf31d1c95176eb6  ejabberd-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 04:24:03 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 21:24:03 -0700
Subject: rpms/ejabberd/FC-5 .cvsignore, 1.2, 1.3 ejabberd.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610080424.k984O5KO031916@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31893

Modified Files:
	.cvsignore ejabberd.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2006 12:40:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 04:24:02 -0000	1.3
@@ -1 +1 @@
-ejabberd-1.1.1.tar.gz
+ejabberd-1.1.2.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejabberd.spec	3 Jul 2006 15:00:37 -0000	1.3
+++ ejabberd.spec	8 Oct 2006 04:24:02 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
+- Bump release and rebuild.
+
 * Mon Jul 3 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-9
 - Updated init script - should hopefully fix some problems with status & stop commands.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 12:40:03 -0000	1.2
+++ sources	8 Oct 2006 04:24:02 -0000	1.3
@@ -1 +1 @@
-ef6fae4a3f9c7f807f21e9cd3dae195b  ejabberd-1.1.1.tar.gz
+5b947e19e18a6b554bf31d1c95176eb6  ejabberd-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 04:24:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat,  7 Oct 2006 21:24:45 -0700
Subject: rpms/ejabberd/FC-4 .cvsignore, 1.2, 1.3 ejabberd.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610080424.k984OlH3032002@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31981

Modified Files:
	.cvsignore ejabberd.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2006 12:40:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 04:24:45 -0000	1.3
@@ -1 +1 @@
-ejabberd-1.1.1.tar.gz
+ejabberd-1.1.2.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/ejabberd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejabberd.spec	3 Jul 2006 15:02:46 -0000	1.3
+++ ejabberd.spec	8 Oct 2006 04:24:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
+- Bump release and rebuild.
+
 * Mon Jul 3 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-9
 - Updated init script - should hopefully fix some problems with status & stop commands.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 12:40:03 -0000	1.2
+++ sources	8 Oct 2006 04:24:45 -0000	1.3
@@ -1 +1 @@
-ef6fae4a3f9c7f807f21e9cd3dae195b  ejabberd-1.1.1.tar.gz
+5b947e19e18a6b554bf31d1c95176eb6  ejabberd-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 05:31:41 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat,  7 Oct 2006 22:31:41 -0700
Subject: rpms/zeroinstall-injector/FC-5 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 zeroinstall-injector.spec, 1.1,
	1.2 zeroinstall-injector-0.18.tar.gz.gpg, 1.1, NONE
Message-ID: <200610080531.k985Vix1002803@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2732/FC-5

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	zeroinstall-injector-0.18.tar.gz.gpg 
Log Message:
- Update to 0.23
- Rebuild for all releases



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Mar 2006 20:01:32 -0000	1.1
+++ .cvsignore	8 Oct 2006 05:31:41 -0000	1.2
@@ -0,0 +1 @@
+zeroinstall-injector-0.23.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Mar 2006 20:01:32 -0000	1.1
+++ sources	8 Oct 2006 05:31:41 -0000	1.2
@@ -0,0 +1 @@
+52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/zeroinstall-injector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zeroinstall-injector.spec	6 Mar 2006 20:02:53 -0000	1.1
+++ zeroinstall-injector.spec	8 Oct 2006 05:31:41 -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:    zeroinstall-injector
-Version: 0.18
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -54,13 +54,16 @@
 %ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml
+%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
 %{python_sitelib}/zeroinstall/*/*.py
 %{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> 0.23-1
+- Update to 0.23
+
 * Sun Mar  5 2006 Michel Salim <michel.salim at gmail.com> 0.18-4
 - Removed left-behind pushd and popd
 


--- zeroinstall-injector-0.18.tar.gz.gpg DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 05:31:42 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat,  7 Oct 2006 22:31:42 -0700
Subject: rpms/zeroinstall-injector/devel .cvsignore, 1.1, 1.2 sources, 1.1, 
	1.2 zeroinstall-injector.spec, 1.1, 1.2 needs.rebuild, 1.1,
	NONE zeroinstall-injector-0.18.tar.gz.gpg, 1.1, NONE
Message-ID: <200610080531.k985Vipo002809@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2732/devel

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	needs.rebuild zeroinstall-injector-0.18.tar.gz.gpg 
Log Message:
- Update to 0.23
- Rebuild for all releases



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Mar 2006 20:01:32 -0000	1.1
+++ .cvsignore	8 Oct 2006 05:31:42 -0000	1.2
@@ -0,0 +1 @@
+zeroinstall-injector-0.23.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Mar 2006 20:01:32 -0000	1.1
+++ sources	8 Oct 2006 05:31:42 -0000	1.2
@@ -0,0 +1 @@
+52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zeroinstall-injector.spec	6 Mar 2006 20:02:53 -0000	1.1
+++ zeroinstall-injector.spec	8 Oct 2006 05:31:42 -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:    zeroinstall-injector
-Version: 0.18
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -54,13 +54,16 @@
 %ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml
+%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
 %{python_sitelib}/zeroinstall/*/*.py
 %{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> 0.23-1
+- Update to 0.23
+
 * Sun Mar  5 2006 Michel Salim <michel.salim at gmail.com> 0.18-4
 - Removed left-behind pushd and popd
 


--- needs.rebuild DELETED ---


--- zeroinstall-injector-0.18.tar.gz.gpg DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 05:31:40 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat,  7 Oct 2006 22:31:40 -0700
Subject: rpms/zeroinstall-injector/FC-3 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 zeroinstall-injector.spec, 1.1,
	1.2 zeroinstall-injector-0.18.tar.gz.gpg, 1.1, NONE
Message-ID: <200610080532.k985WC2x002815@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2732/FC-3

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	zeroinstall-injector-0.18.tar.gz.gpg 
Log Message:
- Update to 0.23
- Rebuild for all releases



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Mar 2006 20:01:32 -0000	1.1
+++ .cvsignore	8 Oct 2006 05:31:39 -0000	1.2
@@ -0,0 +1 @@
+zeroinstall-injector-0.23.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Mar 2006 20:01:32 -0000	1.1
+++ sources	8 Oct 2006 05:31:39 -0000	1.2
@@ -0,0 +1 @@
+52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/zeroinstall-injector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zeroinstall-injector.spec	6 Mar 2006 20:02:53 -0000	1.1
+++ zeroinstall-injector.spec	8 Oct 2006 05:31:39 -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:    zeroinstall-injector
-Version: 0.18
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -54,13 +54,16 @@
 %ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml
+%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
 %{python_sitelib}/zeroinstall/*/*.py
 %{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> 0.23-1
+- Update to 0.23
+
 * Sun Mar  5 2006 Michel Salim <michel.salim at gmail.com> 0.18-4
 - Removed left-behind pushd and popd
 


--- zeroinstall-injector-0.18.tar.gz.gpg DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 05:31:41 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat,  7 Oct 2006 22:31:41 -0700
Subject: rpms/zeroinstall-injector/FC-4 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 zeroinstall-injector.spec, 1.1,
	1.2 zeroinstall-injector-0.18.tar.gz.gpg, 1.1, NONE
Message-ID: <200610080532.k985WDZk002820@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2732/FC-4

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	zeroinstall-injector-0.18.tar.gz.gpg 
Log Message:
- Update to 0.23
- Rebuild for all releases



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Mar 2006 20:01:32 -0000	1.1
+++ .cvsignore	8 Oct 2006 05:31:40 -0000	1.2
@@ -0,0 +1 @@
+zeroinstall-injector-0.23.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Mar 2006 20:01:32 -0000	1.1
+++ sources	8 Oct 2006 05:31:40 -0000	1.2
@@ -0,0 +1 @@
+52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/zeroinstall-injector.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zeroinstall-injector.spec	6 Mar 2006 20:02:53 -0000	1.1
+++ zeroinstall-injector.spec	8 Oct 2006 05:31: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:    zeroinstall-injector
-Version: 0.18
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -54,13 +54,16 @@
 %ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml
+%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
 %{python_sitelib}/zeroinstall/*/*.py
 %{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> 0.23-1
+- Update to 0.23
+
 * Sun Mar  5 2006 Michel Salim <michel.salim at gmail.com> 0.18-4
 - Removed left-behind pushd and popd
 


--- zeroinstall-injector-0.18.tar.gz.gpg DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 06:07:47 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:07:47 -0700
Subject: rpms/scrot/devel - New directory
Message-ID: <200610080607.k9867nlc005966@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5937/scrot/devel

Log Message:
Directory /cvs/extras/rpms/scrot/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  8 06:07:46 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:07:46 -0700
Subject: rpms/scrot - New directory
Message-ID: <200610080607.k9867mku005958@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5937/scrot

Log Message:
Directory /cvs/extras/rpms/scrot added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  8 06:07:58 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:07:58 -0700
Subject: rpms/scrot/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610080608.k98680th006022@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5982/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scrot


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct  8 06:07:57 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:07:57 -0700
Subject: rpms/scrot Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610080607.k9867xs7006015@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5982

Added Files:
	Makefile import.log 
Log Message:
Setup of module scrot


--- NEW FILE Makefile ---
# Top level Makefile for module scrot
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct  8 06:08:20 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:08:20 -0700
Subject: rpms/scrot import.log,1.1,1.2
Message-ID: <200610080608.k9868q6S006147@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6075

Modified Files:
	import.log 
Log Message:
auto-import scrot-0.8-2.fc5 on branch devel from scrot-0.8-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scrot/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Oct 2006 06:07:56 -0000	1.1
+++ import.log	8 Oct 2006 06:08:20 -0000	1.2
@@ -0,0 +1 @@
+scrot-0_8-2_fc5:HEAD:scrot-0.8-2.fc5.src.rpm:1160287695



From fedora-extras-commits at redhat.com  Sun Oct  8 06:08:21 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:08:21 -0700
Subject: rpms/scrot/devel scrot.spec, NONE, 1.1 scrot_Makefile_in.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610080608.k9868rn7006151@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/scrot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6075/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scrot.spec scrot_Makefile_in.patch 
Log Message:
auto-import scrot-0.8-2.fc5 on branch devel from scrot-0.8-2.fc5.src.rpm


--- NEW FILE scrot.spec ---
Name:           scrot 
Version:        0.8
Release:        2%{?dist}
Summary:        Screen-shot capture using Imlib 2

Group:          User Interface/X
License:        MIT
URL:            http://www.linuxbrit.co.uk/scrot/
Source0:        http://linuxbrit.co.uk/downloads/%{name}-%{version}.tar.gz
Patch1:         scrot_Makefile_in.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  imlib2-devel,libX11-devel,giblib-devel

%description
A nice and straightforward screen capture utility implementing the dynamic
loaders of imlib2.


%prep
%setup -q
%patch1

%build
%configure 
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/*
%{_mandir}/man1/*



%changelog
* Wed Oct 04 2006 Michael Rice <errr[AT]errr-online.com> - 0.8-2
- Fix project home page link
- Fix license from BSD to MIT
- Fix version info for Changelog entrys
- Remove datadir/name to fix dup doc entrys
- Fix patch for docs:
  removed the data docs from being installed by src

* Mon Sep 25 2006 Michael Rice <errr[AT]errr-online.com> - 0.8-1
- Initial RPM release

scrot_Makefile_in.patch:

--- NEW FILE scrot_Makefile_in.patch ---
--- Makefile.in	2003-06-23 07:13:33.000000000 -0500
+++ errr.Makefile.in	2006-10-04 12:31:00.000000000 -0500
@@ -81,11 +81,8 @@
 
 man_MANS = scrot.1
 
-docs_DATA = README AUTHORS ChangeLog TODO
-docsdir = $(prefix)/doc/scrot
-
-EXTRA_DIST =  scrot.spec scrot.1 $(docs_DATA)
 
+EXTRA_DIST =  scrot.spec scrot.1 
 
 SUBDIRS = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -194,25 +191,6 @@
 	@$(NORMAL_UNINSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
 
-install-docsDATA: $(docs_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(docsdir)
-	@list='$(docs_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docsdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docsdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-docsDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(docs_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(docsdir)/$$p; \
-	done
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scrot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Oct 2006 06:07:58 -0000	1.1
+++ .cvsignore	8 Oct 2006 06:08:21 -0000	1.2
@@ -0,0 +1 @@
+scrot-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scrot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Oct 2006 06:07:58 -0000	1.1
+++ sources	8 Oct 2006 06:08:21 -0000	1.2
@@ -0,0 +1 @@
+ccae904d225609571bdd3b03445c1e88  scrot-0.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 06:11:53 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Sat,  7 Oct 2006 23:11:53 -0700
Subject: owners owners.list,1.1794,1.1795
Message-ID: <200610080611.k986Btoj006231@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6214

Modified Files:
	owners.list 
Log Message:
Adding my self as mainatiner  bug: 208424



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1794
retrieving revision 1.1795
diff -u -r1.1794 -r1.1795
--- owners.list	7 Oct 2006 18:06:28 -0000	1.1794
+++ owners.list	8 Oct 2006 06:11:53 -0000	1.1795
@@ -2013,6 +2013,7 @@
 Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|scribus-templates|This package includes additional templates for Scribus|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de
 Fedora Extras|scrip|Spherical Coordinate Remapping and Interpolation Package|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|scrot|Screen-shot capture using Imlib2|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 07:24:22 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Sun,  8 Oct 2006 00:24:22 -0700
Subject: rpms/yumex/devel .cvsignore, 1.23, 1.24 sources, 1.31,
	1.32 yumex.spec, 1.35, 1.36
Message-ID: <200610080724.k987OOm9009454@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9433

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Development Release 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Sep 2006 17:27:24 -0000	1.23
+++ .cvsignore	8 Oct 2006 07:24:22 -0000	1.24
@@ -1 +1 @@
-yumex-1.1.3.tar.gz
+yumex-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	6 Sep 2006 17:27:24 -0000	1.31
+++ sources	8 Oct 2006 07:24:22 -0000	1.32
@@ -1 +1 @@
-ad65af5a6f9459a1f3b2cd7c4b686c41  yumex-1.1.3.tar.gz
+7c6d3ec4d113ca897f5889ebd3112757  yumex-1.1.4.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- yumex.spec	6 Sep 2006 17:27:24 -0000	1.35
+++ yumex.spec	8 Oct 2006 07:24:22 -0000	1.36
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.3
+Version:  1.1.4
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -16,7 +16,7 @@
 BuildRequires: intltool
 
 
-Requires: yum >= 2.9.6
+Requires: yum >= 3.0.0
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -67,6 +67,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 7 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-1.0
+- Development Release 1.1.4-1.0
+- Updated Requires: yum >= 2.9.6 to yum >= 3.0.0
 * Wed Sep 6 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.3-1.0
 - Development Release 1.1.3-1.0
 - Updated Requires: yum >= 2.9.5 to yum >= 2.9.6



From fedora-extras-commits at redhat.com  Sun Oct  8 08:25:44 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 01:25:44 -0700
Subject: comps comps-fe5.xml.in,1.162,1.163 comps-fe6.xml.in,1.176,1.177
Message-ID: <200610080825.k988Pk3r012543@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12524

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add alleyoop and sysprof to development-tools



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- comps-fe5.xml.in	7 Oct 2006 16:12:33 -0000	1.162
+++ comps-fe5.xml.in	8 Oct 2006 08:25:44 -0000	1.163
@@ -87,6 +87,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">abicheck</packagereq>
+      <packagereq type="optional">alleyoop</packagereq>
       <packagereq type="optional">aplus-fsf</packagereq>
       <packagereq type="optional">archmage</packagereq>
       <packagereq type="optional">asa</packagereq>
@@ -152,6 +153,7 @@
       <packagereq type="optional">srecord</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
+      <packagereq type="optional">sysprof</packagereq>
       <packagereq type="optional">tkcvs</packagereq>
       <packagereq type="optional">tla</packagereq>
       <packagereq type="optional">tolua++</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- comps-fe6.xml.in	7 Oct 2006 14:59:19 -0000	1.176
+++ comps-fe6.xml.in	8 Oct 2006 08:25:44 -0000	1.177
@@ -107,6 +107,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">abicheck</packagereq>
+      <packagereq type="optional">alleyoop</packagereq>
       <packagereq type="optional">aplus-fsf</packagereq>
       <packagereq type="optional">archmage</packagereq>
       <packagereq type="optional">asa</packagereq>
@@ -187,6 +188,7 @@
       <packagereq type="optional">svn2cl</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
+      <packagereq type="optional">sysprof</packagereq>
       <packagereq type="optional">tkcvs</packagereq>
       <packagereq type="optional">tla</packagereq>
       <packagereq type="optional">tolua++</packagereq>



From fedora-extras-commits at redhat.com  Sun Oct  8 09:04:25 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 02:04:25 -0700
Subject: comps comps-cleanup.xsl,1.2,1.3
Message-ID: <200610080904.k9894SuX015494@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15476

Modified Files:
	comps-cleanup.xsl 
Log Message:
work harder at preserving comments


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comps-cleanup.xsl	7 Oct 2006 23:36:09 -0000	1.2
+++ comps-cleanup.xsl	8 Oct 2006 09:04:25 -0000	1.3
@@ -13,7 +13,6 @@
      However without DTD there is no way to check the files completely.
 
      ?? Nicolas Mailhot <nim at fedoraproject dot org> 2006 -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="comps.dtd" doctype-public="-//Red Hat, Inc.//DTD Comps info//EN"/>
@@ -28,13 +27,20 @@
   <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
 <!-- Preserve most nodes -->
   <xsl:template match="*" priority="0">
+<!-- Group comments with the logically-following element -->
+    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="*|text()|comment()"/>
+      <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
   </xsl:template>
-<!-- Preserve attributes and comments -->
-  <xsl:template match="@*|comment()">
+<!-- Preserve attributes and text nodes -->
+  <xsl:template match="comment()|text()">
+    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
+    <xsl:copy/>
+  </xsl:template>
+<!-- Preserve attributes -->
+  <xsl:template match="@*">
     <xsl:copy/>
   </xsl:template>
 <!-- Sort groups by id -->
@@ -50,13 +56,11 @@
   </xsl:template>
 <!-- Warn about duplicate groups being merged -->
   <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="2">
-    <xsl:message>?????? Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
-    <xsl:message>??</xsl:message>
+    <xsl:message> ?????? Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
 <!-- Warn about duplicate categories being merged -->
   <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="2">
-    <xsl:message>?????? Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
-    <xsl:message>??</xsl:message>
+    <xsl:message> ?????? Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
 <!-- Sort packages within a group by class then name -->
   <xsl:template match="packagelist" priority="1">
@@ -87,23 +91,21 @@
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
     <xsl:message>????????? Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
     <xsl:message>  Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
-    <xsl:message>??</xsl:message>
   </xsl:template>
 <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">
-    <xsl:message>??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
-    <xsl:message>??</xsl:message>
+    <xsl:message>  ??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
   </xsl:template>
 <!-- Warn about packages referenced several times (at least twice;)) -->
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
-    <xsl:message>??? Package <xsl:value-of select="text()"/> is referenced several times:</xsl:message>
+    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in multiple groups:</xsl:message>
     <xsl:for-each select="key('unique-packages',text())">
-      <xsl:message> ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
+      <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
-    <xsl:message>??</xsl:message>
+    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="*|text()|comment()"/>
+      <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>



From fedora-extras-commits at redhat.com  Sun Oct  8 09:16:19 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun,  8 Oct 2006 02:16:19 -0700
Subject: rpms/codeblocks/devel .cvsignore, 1.2, 1.3 codeblocks-plugins.patch,
	1.1, 1.2 codeblocks.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610080916.k989GLhT015643@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15614

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3030
- change the install paths for plugins in the spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2006 20:21:13 -0000	1.2
+++ .cvsignore	8 Oct 2006 09:16:19 -0000	1.3
@@ -1 +1 @@
-codeblocks-svn2965.tar.bz2
+codeblocks-svn3030.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-plugins.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-plugins.patch	8 Oct 2006 09:16:19 -0000	1.2
@@ -1,255 +1,3 @@
-diff -Nru --exclude .svn codeblocks/src/plugins/astyle/Makefile.am codeblocks-devel/src/plugins/astyle/Makefile.am
---- codeblocks/src/plugins/astyle/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/astyle/Makefile.am	2006-07-23 09:41:41.000000000 +0200
-@@ -5,7 +5,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libastyle.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/autosave/Makefile.am codeblocks-devel/src/plugins/autosave/Makefile.am
---- codeblocks/src/plugins/autosave/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/autosave/Makefile.am	2006-07-23 09:42:45.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libautosave.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/classwizard/Makefile.am codeblocks-devel/src/plugins/classwizard/Makefile.am
---- codeblocks/src/plugins/classwizard/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/classwizard/Makefile.am	2006-07-23 09:42:59.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libclasswizard.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/codecompletion/Makefile.am codeblocks-devel/src/plugins/codecompletion/Makefile.am
---- codeblocks/src/plugins/codecompletion/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/codecompletion/Makefile.am	2006-07-23 09:43:20.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodecompletion.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/compilergcc/Makefile.am codeblocks-devel/src/plugins/compilergcc/Makefile.am
---- codeblocks/src/plugins/compilergcc/Makefile.am	2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/compilergcc/Makefile.am	2006-07-23 09:43:33.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- AM_CXXFLAGS = -DDEPSLIB_UNIX
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcompiler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/byogames/Makefile.am codeblocks-devel/src/plugins/contrib/byogames/Makefile.am
---- codeblocks/src/plugins/contrib/byogames/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/byogames/Makefile.am	2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libbyogames.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/cb_koders/Makefile.am codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am
---- codeblocks/src/plugins/contrib/cb_koders/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am	2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcb_koders.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codesnippets/Makefile.am codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am
---- codeblocks/src/plugins/contrib/codesnippets/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am	2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodesnippets.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codestat/Makefile.am codeblocks-devel/src/plugins/contrib/codestat/Makefile.am
---- codeblocks/src/plugins/contrib/codestat/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codestat/Makefile.am	2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodestat.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/dragscroll/Makefile.am codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am
---- codeblocks/src/plugins/contrib/dragscroll/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am	2006-07-23 09:45:14.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdragscroll.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/envvars/Makefile.am codeblocks-devel/src/plugins/contrib/envvars/Makefile.am
---- codeblocks/src/plugins/contrib/envvars/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/envvars/Makefile.am	2006-07-23 09:45:25.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- pkgdata_DATA = envvars.zip
- 
- lib_LTLIBRARIES = libenvvars.la
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/help_plugin/Makefile.am codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am
---- codeblocks/src/plugins/contrib/help_plugin/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am	2006-07-23 09:45:35.000000000 +0200
-@@ -3,7 +3,7 @@
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 		-include "sdk.h"
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libhelp_plugin.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/keybinder/Makefile.am codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am
---- codeblocks/src/plugins/contrib/keybinder/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am	2006-07-23 09:45:43.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libkeybinder.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/profiler/Makefile.am codeblocks-devel/src/plugins/contrib/profiler/Makefile.am
---- codeblocks/src/plugins/contrib/profiler/Makefile.am	2006-07-11 14:09:05.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/profiler/Makefile.am	2006-07-23 09:45:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libprofiler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/source_exporter/Makefile.am codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am
---- codeblocks/src/plugins/contrib/source_exporter/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am	2006-07-23 09:46:06.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/plugins/contrib/source_exporter/wxPdfDocument/include \
- 		-include "sdk.h"
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libexporter.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/wxSmith/Makefile.am codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am
---- codeblocks/src/plugins/contrib/wxSmith/Makefile.am	2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am	2006-07-23 09:46:17.000000000 +0200
-@@ -11,7 +11,7 @@
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 		-I$(top_srcdir)/src/sdk/propgrid/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libwxsmith.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/debuggergdb/Makefile.am codeblocks-devel/src/plugins/debuggergdb/Makefile.am
---- codeblocks/src/plugins/debuggergdb/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/debuggergdb/Makefile.am	2006-07-23 09:43:50.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/sdk/scripting/include \
-     	-I$(top_srcdir)/src/sdk/scripting/sqplus
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdebuggergdb.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/defaultmimehandler/Makefile.am codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am
---- codeblocks/src/plugins/defaultmimehandler/Makefile.am	2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am	2006-07-23 09:44:03.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdefaultmimehandler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/scriptedwizard/Makefile.am codeblocks-devel/src/plugins/scriptedwizard/Makefile.am
---- codeblocks/src/plugins/scriptedwizard/Makefile.am	2006-07-14 14:02:13.000000000 +0200
-+++ codeblocks-devel/src/plugins/scriptedwizard/Makefile.am	2006-07-23 09:44:14.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/sdk/scripting/include \
- 		-I$(top_srcdir)/src/sdk/scripting/sqplus
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libscriptedwizard.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/todo/Makefile.am codeblocks-devel/src/plugins/todo/Makefile.am
---- codeblocks/src/plugins/todo/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/todo/Makefile.am	2006-07-23 09:44:23.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libtodo.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/xpmanifest/Makefile.am codeblocks-devel/src/plugins/xpmanifest/Makefile.am
---- codeblocks/src/plugins/xpmanifest/Makefile.am	2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/xpmanifest/Makefile.am	2006-07-23 09:44:33.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libxpmanifest.la
- 
 diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
 --- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
 +++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks.spec	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks.spec	8 Oct 2006 09:16:19 -0000	1.2
@@ -1,9 +1,9 @@
-%define		rev	2965
-%define		date	20060909
+%define		rev	3030
+%define		date	20061007
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.9.%{date}svn%{rev}%{?dist}
+Release:	0.10.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -62,6 +62,17 @@
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null
 chmod a+x bootstrap src/update
 
+# fix the dir, where plugins are installed
+for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler scriptedwizard todo xpmanifest
+do
+	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
+done
+
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+do
+	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
+done
+
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -138,7 +149,7 @@
 %{plugindir}/libclasswizard.so
 %{plugindir}/libcodecompletion.so
 %{plugindir}/libcompiler.so
-%{plugindir}/libdebuggergdb.so
+%{plugindir}/libdebugger.so
 %{plugindir}/libdefaultmimehandler.so
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
@@ -161,13 +172,14 @@
 %{pkgdatadir}/templates/*
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
-%{pkgdatadir}/class_wizard.zip
-%{pkgdatadir}/code_completion.zip
-%{pkgdatadir}/compiler_gcc.zip
-%{pkgdatadir}/debugger_gdb.zip
+%{pkgdatadir}/classwizard.zip
+%{pkgdatadir}/codecompletion.zip
+%{pkgdatadir}/compiler.zip
+%{pkgdatadir}/debugger.zip
 %{pkgdatadir}/defaultmimehandler.zip
 %{pkgdatadir}/manager_resources.zip
 %{pkgdatadir}/resources.zip
+%{pkgdatadir}/scriptedwizard.zip
 %{pkgdatadir}/start_here.zip
 %{pkgdatadir}/todo.zip
 %{pkgdatadir}/tips.txt
@@ -180,10 +192,16 @@
 
 %files contrib
 %defattr(-,root,root)
+%{pkgdatadir}/byogames.zip
+%{pkgdatadir}/cb_koders.zip
+%{pkgdatadir}/codesnippets.zip
 %{pkgdatadir}/codestat.zip
+%{pkgdatadir}/dragscroll.zip
 %{pkgdatadir}/envvars.zip
+%{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
-%{pkgdatadir}/profiler.zip
+%{pkgdatadir}/keybinder.zip
+%{pkgdatadir}/CBProfiler.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -202,6 +220,10 @@
 
 
 %changelog
+* Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
+- update to revision 3030
+- change the install paths for plugins in the spec file
+
 * Wed Sep 13 2006 Dan Horak <dan[at]danny.cz> 1.0-0.9.20060909svn2965
 - do not require .svn directories for building
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2006 20:21:13 -0000	1.2
+++ sources	8 Oct 2006 09:16:19 -0000	1.3
@@ -1 +1 @@
-3d5cadadd3b22098966213dc21ff1515  codeblocks-svn2965.tar.bz2
+5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 09:16:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 02:16:44 -0700
Subject: comps comps-cleanup.xsl,1.3,1.4
Message-ID: <200610080916.k989GkGX015670@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15651

Modified Files:
	comps-cleanup.xsl 
Log Message:
sort groups in duplicate warnings


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comps-cleanup.xsl	8 Oct 2006 09:04:25 -0000	1.3
+++ comps-cleanup.xsl	8 Oct 2006 09:16:44 -0000	1.4
@@ -100,6 +100,7 @@
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
     <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in multiple groups:</xsl:message>
     <xsl:for-each select="key('unique-packages',text())">
+      <xsl:sort select="../../id/text()"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>



From fedora-extras-commits at redhat.com  Sun Oct  8 09:17:23 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  8 Oct 2006 02:17:23 -0700
Subject: owners owners.list,1.1795,1.1796
Message-ID: <200610080917.k989HPuW015729@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15708

Modified Files:
	owners.list 
Log Message:

Added mysql-connector-net 
 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1795
retrieving revision 1.1796
diff -u -r1.1795 -r1.1796
--- owners.list	8 Oct 2006 06:11:53 -0000	1.1795
+++ owners.list	8 Oct 2006 09:17:23 -0000	1.1796
@@ -1072,6 +1072,7 @@
 Fedora Extras|mxml|Miniature XML development library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|mysql-connector-java|Official JDBC driver for MySQL|ifoox at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|mysql-connector-net|Official dot net driver for MySQL|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|mysql-query-browser|A graphical tool for handling MySQL queries|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|nagios|Host/service/network monitoring program|imlinux at gmail.com|extras-qa at fedoraproject.org|wtogami at redhat.com



From fedora-extras-commits at redhat.com  Sun Oct  8 09:18:38 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun,  8 Oct 2006 02:18:38 -0700
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.2, 1.3 codeblocks-plugins.patch, 
	1.1, 1.2 codeblocks.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610080918.k989Ifoq015778@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15749

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3030
- change the install paths for plugins in the spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2006 20:21:13 -0000	1.2
+++ .cvsignore	8 Oct 2006 09:18:38 -0000	1.3
@@ -1 +1 @@
-codeblocks-svn2965.tar.bz2
+codeblocks-svn3030.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-plugins.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-plugins.patch	8 Oct 2006 09:18:38 -0000	1.2
@@ -1,255 +1,3 @@
-diff -Nru --exclude .svn codeblocks/src/plugins/astyle/Makefile.am codeblocks-devel/src/plugins/astyle/Makefile.am
---- codeblocks/src/plugins/astyle/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/astyle/Makefile.am	2006-07-23 09:41:41.000000000 +0200
-@@ -5,7 +5,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libastyle.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/autosave/Makefile.am codeblocks-devel/src/plugins/autosave/Makefile.am
---- codeblocks/src/plugins/autosave/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/autosave/Makefile.am	2006-07-23 09:42:45.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libautosave.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/classwizard/Makefile.am codeblocks-devel/src/plugins/classwizard/Makefile.am
---- codeblocks/src/plugins/classwizard/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/classwizard/Makefile.am	2006-07-23 09:42:59.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libclasswizard.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/codecompletion/Makefile.am codeblocks-devel/src/plugins/codecompletion/Makefile.am
---- codeblocks/src/plugins/codecompletion/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/codecompletion/Makefile.am	2006-07-23 09:43:20.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodecompletion.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/compilergcc/Makefile.am codeblocks-devel/src/plugins/compilergcc/Makefile.am
---- codeblocks/src/plugins/compilergcc/Makefile.am	2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/compilergcc/Makefile.am	2006-07-23 09:43:33.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- AM_CXXFLAGS = -DDEPSLIB_UNIX
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcompiler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/byogames/Makefile.am codeblocks-devel/src/plugins/contrib/byogames/Makefile.am
---- codeblocks/src/plugins/contrib/byogames/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/byogames/Makefile.am	2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libbyogames.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/cb_koders/Makefile.am codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am
---- codeblocks/src/plugins/contrib/cb_koders/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am	2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcb_koders.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codesnippets/Makefile.am codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am
---- codeblocks/src/plugins/contrib/codesnippets/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am	2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodesnippets.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codestat/Makefile.am codeblocks-devel/src/plugins/contrib/codestat/Makefile.am
---- codeblocks/src/plugins/contrib/codestat/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codestat/Makefile.am	2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libcodestat.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/dragscroll/Makefile.am codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am
---- codeblocks/src/plugins/contrib/dragscroll/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am	2006-07-23 09:45:14.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdragscroll.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/envvars/Makefile.am codeblocks-devel/src/plugins/contrib/envvars/Makefile.am
---- codeblocks/src/plugins/contrib/envvars/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/envvars/Makefile.am	2006-07-23 09:45:25.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- pkgdata_DATA = envvars.zip
- 
- lib_LTLIBRARIES = libenvvars.la
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/help_plugin/Makefile.am codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am
---- codeblocks/src/plugins/contrib/help_plugin/Makefile.am	2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am	2006-07-23 09:45:35.000000000 +0200
-@@ -3,7 +3,7 @@
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 		-include "sdk.h"
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libhelp_plugin.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/keybinder/Makefile.am codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am
---- codeblocks/src/plugins/contrib/keybinder/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am	2006-07-23 09:45:43.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libkeybinder.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/profiler/Makefile.am codeblocks-devel/src/plugins/contrib/profiler/Makefile.am
---- codeblocks/src/plugins/contrib/profiler/Makefile.am	2006-07-11 14:09:05.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/profiler/Makefile.am	2006-07-23 09:45:55.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libprofiler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/source_exporter/Makefile.am codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am
---- codeblocks/src/plugins/contrib/source_exporter/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am	2006-07-23 09:46:06.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/plugins/contrib/source_exporter/wxPdfDocument/include \
- 		-include "sdk.h"
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libexporter.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/wxSmith/Makefile.am codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am
---- codeblocks/src/plugins/contrib/wxSmith/Makefile.am	2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am	2006-07-23 09:46:17.000000000 +0200
-@@ -11,7 +11,7 @@
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include \
- 		-I$(top_srcdir)/src/sdk/propgrid/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libwxsmith.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/debuggergdb/Makefile.am codeblocks-devel/src/plugins/debuggergdb/Makefile.am
---- codeblocks/src/plugins/debuggergdb/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/debuggergdb/Makefile.am	2006-07-23 09:43:50.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/sdk/scripting/include \
-     	-I$(top_srcdir)/src/sdk/scripting/sqplus
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdebuggergdb.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/defaultmimehandler/Makefile.am codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am
---- codeblocks/src/plugins/defaultmimehandler/Makefile.am	2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am	2006-07-23 09:44:03.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libdefaultmimehandler.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/scriptedwizard/Makefile.am codeblocks-devel/src/plugins/scriptedwizard/Makefile.am
---- codeblocks/src/plugins/scriptedwizard/Makefile.am	2006-07-14 14:02:13.000000000 +0200
-+++ codeblocks-devel/src/plugins/scriptedwizard/Makefile.am	2006-07-23 09:44:14.000000000 +0200
-@@ -6,7 +6,7 @@
- 		-I$(top_srcdir)/src/sdk/scripting/include \
- 		-I$(top_srcdir)/src/sdk/scripting/sqplus
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libscriptedwizard.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/todo/Makefile.am codeblocks-devel/src/plugins/todo/Makefile.am
---- codeblocks/src/plugins/todo/Makefile.am	2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/todo/Makefile.am	2006-07-23 09:44:23.000000000 +0200
-@@ -4,7 +4,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libtodo.la
- 
-diff -Nru --exclude .svn codeblocks/src/plugins/xpmanifest/Makefile.am codeblocks-devel/src/plugins/xpmanifest/Makefile.am
---- codeblocks/src/plugins/xpmanifest/Makefile.am	2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/xpmanifest/Makefile.am	2006-07-23 09:44:33.000000000 +0200
-@@ -2,7 +2,7 @@
- 		-I$(top_srcdir)/src/sdk \
- 		-I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- 
- lib_LTLIBRARIES = libxpmanifest.la
- 
 diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
 --- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
 +++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks.spec	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks.spec	8 Oct 2006 09:18:38 -0000	1.2
@@ -1,9 +1,9 @@
-%define		rev	2965
-%define		date	20060909
+%define		rev	3030
+%define		date	20061007
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.9.%{date}svn%{rev}%{?dist}
+Release:	0.10.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -62,6 +62,17 @@
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null
 chmod a+x bootstrap src/update
 
+# fix the dir, where plugins are installed
+for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler scriptedwizard todo xpmanifest
+do
+	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
+done
+
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+do
+	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
+done
+
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -138,7 +149,7 @@
 %{plugindir}/libclasswizard.so
 %{plugindir}/libcodecompletion.so
 %{plugindir}/libcompiler.so
-%{plugindir}/libdebuggergdb.so
+%{plugindir}/libdebugger.so
 %{plugindir}/libdefaultmimehandler.so
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
@@ -161,13 +172,14 @@
 %{pkgdatadir}/templates/*
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
-%{pkgdatadir}/class_wizard.zip
-%{pkgdatadir}/code_completion.zip
-%{pkgdatadir}/compiler_gcc.zip
-%{pkgdatadir}/debugger_gdb.zip
+%{pkgdatadir}/classwizard.zip
+%{pkgdatadir}/codecompletion.zip
+%{pkgdatadir}/compiler.zip
+%{pkgdatadir}/debugger.zip
 %{pkgdatadir}/defaultmimehandler.zip
 %{pkgdatadir}/manager_resources.zip
 %{pkgdatadir}/resources.zip
+%{pkgdatadir}/scriptedwizard.zip
 %{pkgdatadir}/start_here.zip
 %{pkgdatadir}/todo.zip
 %{pkgdatadir}/tips.txt
@@ -180,10 +192,16 @@
 
 %files contrib
 %defattr(-,root,root)
+%{pkgdatadir}/byogames.zip
+%{pkgdatadir}/cb_koders.zip
+%{pkgdatadir}/codesnippets.zip
 %{pkgdatadir}/codestat.zip
+%{pkgdatadir}/dragscroll.zip
 %{pkgdatadir}/envvars.zip
+%{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
-%{pkgdatadir}/profiler.zip
+%{pkgdatadir}/keybinder.zip
+%{pkgdatadir}/CBProfiler.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -202,6 +220,10 @@
 
 
 %changelog
+* Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
+- update to revision 3030
+- change the install paths for plugins in the spec file
+
 * Wed Sep 13 2006 Dan Horak <dan[at]danny.cz> 1.0-0.9.20060909svn2965
 - do not require .svn directories for building
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2006 20:21:13 -0000	1.2
+++ sources	8 Oct 2006 09:18:38 -0000	1.3
@@ -1 +1 @@
-3d5cadadd3b22098966213dc21ff1515  codeblocks-svn2965.tar.bz2
+5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 09:44:18 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 02:44:18 -0700
Subject: comps comps-cleanup.xsl,1.4,1.5
Message-ID: <200610080944.k989iKhC015933@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15916

Modified Files:
	comps-cleanup.xsl 
Log Message:
learn to count packages


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comps-cleanup.xsl	8 Oct 2006 09:16:44 -0000	1.4
+++ comps-cleanup.xsl	8 Oct 2006 09:44:18 -0000	1.5
@@ -98,8 +98,9 @@
   </xsl:template>
 <!-- Warn about packages referenced several times (at least twice;)) -->
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
-    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in multiple groups:</xsl:message>
-    <xsl:for-each select="key('unique-packages',text())">
+    <xsl:variable name="dupes" select="key('unique-packages',text())"/>
+    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced by <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
+    <xsl:for-each select="$dupes">
       <xsl:sort select="../../id/text()"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:26:08 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 03:26:08 -0700
Subject: comps comps-cleanup.xsl,1.5,1.6
Message-ID: <200610081026.k98AQAoQ019100@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19056

Modified Files:
	comps-cleanup.xsl 
Log Message:
smarter sort


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comps-cleanup.xsl	8 Oct 2006 09:44:18 -0000	1.5
+++ comps-cleanup.xsl	8 Oct 2006 10:26:07 -0000	1.6
@@ -101,7 +101,7 @@
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
     <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced by <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
     <xsl:for-each select="$dupes">
-      <xsl:sort select="../../id/text()"/>
+      <xsl:sort select="translate(../../id/text(),$lcletters,$ucletters)"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:26:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Oct 2006 03:26:09 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.14, 
	1.15
Message-ID: <200610081026.k98AQBeB019118@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19052/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sylpheed-claws-plugins.spec	30 Sep 2006 09:38:23 -0000	1.14
+++ sylpheed-claws-plugins.spec	8 Oct 2006 10:26:08 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,7 +510,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-2
+- rebuild
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-1
 - version upgrade
 
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:26:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Oct 2006 03:26:09 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.19, 
	1.20
Message-ID: <200610081026.k98AQBba019122@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19052/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sylpheed-claws-plugins.spec	30 Sep 2006 09:38:23 -0000	1.19
+++ sylpheed-claws-plugins.spec	8 Oct 2006 10:26:09 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,7 +510,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-2
+- rebuild
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-1
 - version upgrade
 
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:26:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Oct 2006 03:26:10 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.20,
	1.21
Message-ID: <200610081026.k98AQCaa019126@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19052/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sylpheed-claws-plugins.spec	30 Sep 2006 09:38:29 -0000	1.20
+++ sylpheed-claws-plugins.spec	8 Oct 2006 10:26:10 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,7 +510,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-2
+- rebuild
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-1
 - version upgrade
 
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Sun Oct  8 10:29:36 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 03:29:36 -0700
Subject: comps comps-cleanup.xsl,1.6,1.7
Message-ID: <200610081029.k98ATcu6019196@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19179

Modified Files:
	comps-cleanup.xsl 
Log Message:
more message beautification


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- comps-cleanup.xsl	8 Oct 2006 10:26:07 -0000	1.6
+++ comps-cleanup.xsl	8 Oct 2006 10:29:36 -0000	1.7
@@ -90,7 +90,7 @@
 <!-- Kill duplicate package entries -->
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
     <xsl:message>????????? Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
-    <xsl:message>  Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
+    <xsl:message>    ??? Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
   </xsl:template>
 <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">



From fedora-extras-commits at redhat.com  Sun Oct  8 10:39:31 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 03:39:31 -0700
Subject: comps comps-cleanup.xsl,1.7,1.8
Message-ID: <200610081039.k98AdXJV019330@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19313

Modified Files:
	comps-cleanup.xsl 
Log Message:
more message beautification


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comps-cleanup.xsl	8 Oct 2006 10:29:36 -0000	1.7
+++ comps-cleanup.xsl	8 Oct 2006 10:39:31 -0000	1.8
@@ -90,7 +90,7 @@
 <!-- Kill duplicate package entries -->
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
     <xsl:message>????????? Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
-    <xsl:message>    ??? Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
+    <xsl:message>     ??? Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
   </xsl:template>
 <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">



From fedora-extras-commits at redhat.com  Sun Oct  8 10:51:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun,  8 Oct 2006 03:51:27 -0700
Subject: owners owners.list,1.1796,1.1797
Message-ID: <200610081051.k98ApTLN019436@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19419

Modified Files:
	owners.list 
Log Message:
added xfce4-dev-tools


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1796
retrieving revision 1.1797
diff -u -r1.1796 -r1.1797
--- owners.list	8 Oct 2006 09:17:23 -0000	1.1796
+++ owners.list	8 Oct 2006 10:51:27 -0000	1.1797
@@ -2312,6 +2312,7 @@
 Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-dev-tools|Xfce developer tools|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 10:59:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun,  8 Oct 2006 03:59:04 -0700
Subject: comps comps-fe6.xml.in,1.177,1.178
Message-ID: <200610081059.k98Ax6PA019476@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19459

Modified Files:
	comps-fe6.xml.in 
Log Message:
added xfce4-dev-tools


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- comps-fe6.xml.in	8 Oct 2006 08:25:44 -0000	1.177
+++ comps-fe6.xml.in	8 Oct 2006 10:59:04 -0000	1.178
@@ -195,6 +195,7 @@
       <packagereq type="optional">ucblogo</packagereq>
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">xbsql</packagereq>
+      <packagereq type="optional">xfce4-dev-tools</packagereq>
       <packagereq type="optional">yap</packagereq>
       <packagereq type="optional">yasm</packagereq>
     </packagelist>



From fedora-extras-commits at redhat.com  Sun Oct  8 11:14:57 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 04:14:57 -0700
Subject: comps comps-cleanup.xsl,1.8,1.9
Message-ID: <200610081114.k98BExAq022751@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22734

Modified Files:
	comps-cleanup.xsl 
Log Message:
sort attributes too


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- comps-cleanup.xsl	8 Oct 2006 10:39:31 -0000	1.8
+++ comps-cleanup.xsl	8 Oct 2006 11:14:57 -0000	1.9
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This stylesheet will:
-     - reorder and indent a comps file,
+     - reorder, indent and normalize a comps file,
      - merge duplicate groups and categories,
-     - warn about packages referenced multiple times,
-     - keep a single package reference per group,
+     - warn about packages referenced by multiple groups,
+     - kill multiple references to the same package within a group,
 
      Typical usage is:
      $ xsltproc -o output-file comps-cleanup.xsl original-file
 
-     You can use the "novalid" xsltproc switch to kill the warning about
+     You can use the ??????novalid xsltproc switch to kill the warning about
      Fedora not installing the comps DTD anywhere xsltproc can find it.
      However without DTD there is no way to check the files completely.
 
@@ -27,10 +27,15 @@
   <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
 <!-- Preserve most nodes -->
   <xsl:template match="*" priority="0">
+    <xsl:apply-templates select="." mode="normalize"/>
+  </xsl:template>
+  <xsl:template match="*" mode="normalize">
 <!-- Group comments with the logically-following element -->
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
-      <xsl:apply-templates select="@*"/>
+      <xsl:apply-templates select="@*">
+        <xsl:sort select="translate(name(),$lcletters,$ucletters)"/>
+      </xsl:apply-templates>
       <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
   </xsl:template>
@@ -104,10 +109,6 @@
       <xsl:sort select="translate(../../id/text(),$lcletters,$ucletters)"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>
     </xsl:for-each>
-    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="*|text()"/>
-    </xsl:copy>
+    <xsl:apply-templates select="." mode="normalize"/>
   </xsl:template>
 </xsl:stylesheet>



From fedora-extras-commits at redhat.com  Sun Oct  8 12:26:13 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 05:26:13 -0700
Subject: comps comps-cleanup.xsl,1.9,1.10
Message-ID: <200610081226.k98CQFUX031881@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864

Modified Files:
	comps-cleanup.xsl 
Log Message:
more normalization goodness


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- comps-cleanup.xsl	8 Oct 2006 11:14:57 -0000	1.9
+++ comps-cleanup.xsl	8 Oct 2006 12:26:12 -0000	1.10
@@ -13,7 +13,7 @@
      However without DTD there is no way to check the files completely.
 
      ?? Nicolas Mailhot <nim at fedoraproject dot org> 2006 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" extension-element-prefixes="exsl">
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="comps.dtd" doctype-public="-//Red Hat, Inc.//DTD Comps info//EN"/>
   <xsl:key name="unique-groups" match="/comps/group" use="id/text()"/>
@@ -25,6 +25,19 @@
   <xsl:key name="unique-group-entries" match="/comps/category/grouplist/groupid" use="concat(../../id/text(),'/',text())"/>
   <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz</xsl:variable>
   <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
+  <xsl:variable name="type-sort-order">
+    <unknown/>
+    <mandatory/>
+    <conditional/>
+    <default/>
+    <optional/>
+  </xsl:variable>
+  <xsl:variable name="attribute-sort-order">
+    <unknown/>
+    <type/>
+    <requires/>
+    <basearch/>
+  </xsl:variable>
 <!-- Preserve most nodes -->
   <xsl:template match="*" priority="0">
     <xsl:apply-templates select="." mode="normalize"/>
@@ -34,7 +47,7 @@
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="@*">
-        <xsl:sort select="translate(name(),$lcletters,$ucletters)"/>
+        <xsl:sort select="count(exsl:node-set($attribute-sort-order)/*[name() = name(current())]/preceding-sibling::*)" data-type="number"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
@@ -70,16 +83,8 @@
 <!-- Sort packages within a group by class then name -->
   <xsl:template match="packagelist" priority="1">
     <xsl:copy>
-      <xsl:apply-templates select="key('packages-by-group',../id/text())[@type = 'mandatory']">
-        <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="key('packages-by-group',../id/text())[@type = 'conditional']">
-        <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="key('packages-by-group',../id/text())[@type = 'default']">
-        <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="key('packages-by-group',../id/text())[@type = 'optional']">
+      <xsl:apply-templates select="key('packages-by-group',../id/text())">
+        <xsl:sort select="count(exsl:node-set($type-sort-order)/*[name() = current()/@type]/preceding-sibling::*)+1" data-type="number"/>
         <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
     </xsl:copy>



From fedora-extras-commits at redhat.com  Sun Oct  8 12:28:37 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 05:28:37 -0700
Subject: comps comps-fe6.xml.in,1.178,1.179
Message-ID: <200610081228.k98CSdre031917@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31900

Modified Files:
	comps-fe6.xml.in 
Log Message:
sort


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- comps-fe6.xml.in	8 Oct 2006 10:59:04 -0000	1.178
+++ comps-fe6.xml.in	8 Oct 2006 12:28:37 -0000	1.179
@@ -591,8 +591,8 @@
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>
-      <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">pydot</packagereq>
+      <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">showimg</packagereq>
@@ -1140,12 +1140,12 @@
       <packagereq type="optional">xfce4-systemload-plugin</packagereq>
       <packagereq type="optional">xfce4-taskmanager</packagereq>
       <packagereq type="optional">xfce4-toys</packagereq>
-      <packagereq type="optional">xfwm4-themes</packagereq>
       <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>
       <packagereq type="optional">xfce4-xkb-plugin</packagereq>
       <packagereq type="optional">xfce4-xmms-plugin</packagereq>
+      <packagereq type="optional">xfwm4-themes</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Sun Oct  8 12:29:52 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 05:29:52 -0700
Subject: comps comps-fe5.xml.in,1.163,1.164
Message-ID: <200610081229.k98CTsQD031943@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31924

Modified Files:
	comps-fe5.xml.in 
Log Message:
sort


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- comps-fe5.xml.in	8 Oct 2006 08:25:44 -0000	1.163
+++ comps-fe5.xml.in	8 Oct 2006 12:29:52 -0000	1.164
@@ -570,8 +570,7 @@
     <_description>Support for running programs written in the Java programming language.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
-    <packagelist>
-    </packagelist>
+    <packagelist/>
   </group>
   <group>
     <id>java-development</id>
@@ -839,8 +838,8 @@
       <packagereq type="optional">unison</packagereq>
       <packagereq type="optional">vnstat</packagereq>
       <packagereq type="optional">vpnc</packagereq>
-      <packagereq type="optional">wlassistant</packagereq>
       <packagereq type="optional">wine</packagereq>
+      <packagereq type="optional">wlassistant</packagereq>
       <packagereq type="optional">xsupplicant</packagereq>
       <packagereq type="optional">zidrav</packagereq>
     </packagelist>



From fedora-extras-commits at redhat.com  Sun Oct  8 12:43:46 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 05:43:46 -0700
Subject: comps comps-cleanup.xsl,1.10,1.11
Message-ID: <200610081243.k98Chm08031995@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31978

Modified Files:
	comps-cleanup.xsl 
Log Message:
warn about empty groups or categories


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- comps-cleanup.xsl	8 Oct 2006 12:26:12 -0000	1.10
+++ comps-cleanup.xsl	8 Oct 2006 12:43:46 -0000	1.11
@@ -61,23 +61,35 @@
   <xsl:template match="@*">
     <xsl:copy/>
   </xsl:template>
-<!-- Sort groups by id -->
+<!-- Sort groups by id, and categories by display order -->
   <xsl:template match="comps" priority="1">
+    <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="group">
         <xsl:sort select="translate(id/text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="category">
         <xsl:sort select="display_order/text()"/>
+        <xsl:sort select="translate(id/text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
     </xsl:copy>
   </xsl:template>
+<!-- Warn about empty groups -->
+  <xsl:template match="group[count(key('packages-by-group',id/text()))=0]" priority="2">
+    <xsl:message>????????? Empty group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/>!</xsl:message>
+    <xsl:apply-templates select="." mode="normalize"/>
+  </xsl:template>
 <!-- Warn about duplicate groups being merged -->
-  <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="2">
+  <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="3">
     <xsl:message> ?????? Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
+<!-- Warn about empty categories -->
+  <xsl:template match="category[count(key('groups-by-category',id/text()))=0]" priority="2">
+    <xsl:message>????????? Empty category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/>!</xsl:message>
+    <xsl:apply-templates select="." mode="normalize"/>
+  </xsl:template>
 <!-- Warn about duplicate categories being merged -->
-  <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="2">
+  <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="3">
     <xsl:message> ?????? Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
 <!-- Sort packages within a group by class then name -->



From fedora-extras-commits at redhat.com  Sun Oct  8 12:49:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun,  8 Oct 2006 05:49:03 -0700
Subject: rpms/perl-GD/devel perl-GD.spec,1.16,1.17
Message-ID: <200610081249.k98Cn5Ma032064@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GD/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32047

Modified Files:
	perl-GD.spec 
Log Message:
Removed a duplicate file (bdf_scripts/bdf2gdfont.PLS).


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-GD.spec	5 Sep 2006 13:22:39 -0000	1.16
+++ perl-GD.spec	8 Oct 2006 12:49:03 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-GD
 Version:        2.35
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -9,7 +9,6 @@
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
 BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel
@@ -27,8 +26,8 @@
 %setup -q -n GD-%{version}
 %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
   qd.pl demos/{*.{pl,cgi},truetype_test}
-chmod -v 644 bdf_scripts/* demos/*
-chmod -v 755 qd.pl
+chmod -c 644 bdf_scripts/* demos/*
+chmod -c 755 qd.pl
 
 
 %build
@@ -48,6 +47,9 @@
 %check
 make test
 
+# Remove duplicate file
+rm bdf_scripts/bdf2gdfont.PLS
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.35-2
+- Removed a duplicate file (bdf_scripts/bdf2gdfont.PLS).
+
 * Tue Sep  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.35-1
 - Update to 2.35.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 12:55:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun,  8 Oct 2006 05:55:08 -0700
Subject: rpms/perl-AppConfig/devel perl-AppConfig.spec,1.10,1.11
Message-ID: <200610081255.k98CtA4Y032161@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-AppConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32144

Modified Files:
	perl-AppConfig.spec 
Log Message:
Excluded the unversioned perl(AppConfig::State) provide.


Index: perl-AppConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig/devel/perl-AppConfig.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-AppConfig.spec	14 Aug 2006 01:07:33 -0000	1.10
+++ perl-AppConfig.spec	8 Oct 2006 12:55:08 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-AppConfig
 Version:        1.63
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for reading configuration files
 
 Group:          Development/Libraries
@@ -27,6 +27,14 @@
 %prep
 %setup -q -n AppConfig-%{version}
 
+# Provides: exclude perl(AppConfig::State)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(AppConfig::State)$'
+__EOF__
+%define __perl_provides %{_builddir}/AppConfig-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -57,6 +65,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.63-2
+- Excluded the unversioned perl(AppConfig::State) provide.
+
 * Thu Aug  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.63-1
 - Update to 1.63.
 - New upstream maintainer.



From fedora-extras-commits at redhat.com  Sun Oct  8 13:19:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  8 Oct 2006 06:19:06 -0700
Subject: rpms/libmcrypt/devel libmcrypt-2.5.7-aclocal_underquoted.patch, NONE,
	1.1 libmcrypt.spec, 1.4, 1.5
Message-ID: <200610081319.k98DJ8O5002729@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmcrypt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2709

Modified Files:
	libmcrypt.spec 
Added Files:
	libmcrypt-2.5.7-aclocal_underquoted.patch 
Log Message:
bz 209913 : libmcrypt.m4 in -devel and properly quote it


libmcrypt-2.5.7-aclocal_underquoted.patch:

--- NEW FILE libmcrypt-2.5.7-aclocal_underquoted.patch ---
--- libmcrypt-2.5.7/lib/libmcrypt.m4	2006-10-08 09:04:36.000000000 -0400
+++ libmcrypt-2.5.7/lib/libmcrypt.m4_ORIG	2006-10-08 08:57:00.000000000 -0400
@@ -14,7 +14,7 @@
 dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBMCRYPT,
+AC_DEFUN([AM_PATH_LIBMCRYPT],
 [dnl
 dnl Get the cflags and libraries from the libmcrypt-config script
 dnl
@@ -164,7 +164,7 @@
         printf("*** of LIBMCRYPT, but you can also set the LIBMCRYPT_CONFIG environment to point to the\n");
         printf("*** correct copy of libmcrypt-config. (In this case, you will have to\n");
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
+        printf("*** so that the correct libraries are found at run-time)\n");
       }
     }
   return 1;


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/devel/libmcrypt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmcrypt.spec	12 Sep 2006 23:11:17 -0000	1.4
+++ libmcrypt.spec	8 Oct 2006 13:19:06 -0000	1.5
@@ -1,12 +1,13 @@
 Name:		libmcrypt
 Version:	2.5.7
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz
 Patch0:		libmcrypt-2.5.7-nolibltdl.patch
+Patch1:		libmcrypt-2.5.7-aclocal_underquoted.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-static=yes
@@ -46,7 +48,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO
 %{_libdir}/*.so.*
-%{_datadir}/aclocal/libmcrypt.m4
 %{_mandir}/man3/*
 
 %files devel
@@ -56,8 +57,12 @@
 %{_includedir}/mcrypt.h
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Sun Oct  8 2006 Ed Hill <ed at eh3.com> 2.5.7-5
+- bz 209913 : libmcrypt.m4 in -devel and properly quote it
+
 * Tue Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.7-4
 - bump for FC-6
 



From fedora-extras-commits at redhat.com  Sun Oct  8 13:34:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 06:34:18 -0700
Subject: rpms/quarry/FC-5 .cvsignore, 1.2, 1.3 quarry.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610081334.k98DYKUH002928@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2857/FC-5

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
Update to 0.1.19


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 03:14:16 -0000	1.2
+++ .cvsignore	8 Oct 2006 13:34:17 -0000	1.3
@@ -1 +1 @@
-quarry-0.1.16.tar.bz2
+quarry-0.1.19.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/quarry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quarry.spec	2 Mar 2006 14:48:08 -0000	1.2
+++ quarry.spec	8 Oct 2006 13:34:17 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           quarry
-Version:        0.1.16
-Release:        2%{?dist}
+Version:        0.1.19
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
-#Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Source0:	quarry-%{version}.tar.bz2
+Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+#Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,12 +64,17 @@
 %doc AUTHORS ChangeLog COPYING COPYING-DOC NEWS README THANKS TODO
 %{_bindir}/quarry
 %{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/quarry.xml
+%{_datadir}/pixmaps/quarry.png
 #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
+- Update to 0.1.19
+
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.1.16-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2005 03:14:16 -0000	1.2
+++ sources	8 Oct 2006 13:34:17 -0000	1.3
@@ -1 +1 @@
-753a6d9aff05069fbd5a2c802cef5e19  quarry-0.1.16.tar.bz2
+15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 13:34:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 06:34:18 -0700
Subject: rpms/quarry/devel .cvsignore, 1.2, 1.3 quarry.spec, 1.2, 1.3 sources,
	1.2, 1.3 needs.rebuild, 1.1, NONE
Message-ID: <200610081334.k98DYK9s002934@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2857/devel

Modified Files:
	.cvsignore quarry.spec sources 
Removed Files:
	needs.rebuild 
Log Message:
Update to 0.1.19


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 03:14:16 -0000	1.2
+++ .cvsignore	8 Oct 2006 13:34:18 -0000	1.3
@@ -1 +1 @@
-quarry-0.1.16.tar.bz2
+quarry-0.1.19.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quarry.spec	2 Mar 2006 14:48:08 -0000	1.2
+++ quarry.spec	8 Oct 2006 13:34:18 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           quarry
-Version:        0.1.16
-Release:        2%{?dist}
+Version:        0.1.19
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
-#Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Source0:	quarry-%{version}.tar.bz2
+Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+#Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,12 +64,17 @@
 %doc AUTHORS ChangeLog COPYING COPYING-DOC NEWS README THANKS TODO
 %{_bindir}/quarry
 %{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/quarry.xml
+%{_datadir}/pixmaps/quarry.png
 #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
+- Update to 0.1.19
+
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.1.16-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2005 03:14:16 -0000	1.2
+++ sources	8 Oct 2006 13:34:18 -0000	1.3
@@ -1 +1 @@
-753a6d9aff05069fbd5a2c802cef5e19  quarry-0.1.16.tar.bz2
+15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 13:34:12 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 06:34:12 -0700
Subject: rpms/quarry/FC-4 .cvsignore, 1.2, 1.3 quarry.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610081334.k98DYiwb002945@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2857/FC-4

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
Update to 0.1.19


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 03:14:16 -0000	1.2
+++ .cvsignore	8 Oct 2006 13:34:12 -0000	1.3
@@ -1 +1 @@
-quarry-0.1.16.tar.bz2
+quarry-0.1.19.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/quarry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quarry.spec	17 Nov 2005 03:14:16 -0000	1.1
+++ quarry.spec	8 Oct 2006 13:34:12 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           quarry
-Version:        0.1.16
+Version:        0.1.19
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
-#Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Source0:	quarry-%{version}.tar.bz2
+Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+#Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,13 +64,21 @@
 %doc AUTHORS ChangeLog COPYING COPYING-DOC NEWS README THANKS TODO
 %{_bindir}/quarry
 %{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/quarry.xml
+%{_datadir}/pixmaps/quarry.png
 #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
-* Sun Nov 13 2005 Michel Salim <mcihel.salim[AT]gmail.com> - 0.1.16-1
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
+- Update to 0.1.19
+
+* Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.1.16-2
+- Rebuild for Fedora Extras 5
+
+* Sun Nov 13 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.1.16-1
 - New upstream version
 
 * Sun Sep  4 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.1.15-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2005 03:14:16 -0000	1.2
+++ sources	8 Oct 2006 13:34:12 -0000	1.3
@@ -1 +1 @@
-753a6d9aff05069fbd5a2c802cef5e19  quarry-0.1.16.tar.bz2
+15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 13:34:11 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 06:34:11 -0700
Subject: rpms/quarry/FC-3 .cvsignore, 1.2, 1.3 quarry.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610081334.k98DYhUU002940@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2857/FC-3

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
Update to 0.1.19


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 03:14:16 -0000	1.2
+++ .cvsignore	8 Oct 2006 13:34:11 -0000	1.3
@@ -1 +1 @@
-quarry-0.1.16.tar.bz2
+quarry-0.1.19.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/quarry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quarry.spec	17 Nov 2005 03:14:16 -0000	1.1
+++ quarry.spec	8 Oct 2006 13:34:11 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           quarry
-Version:        0.1.16
+Version:        0.1.19
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
-#Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Source0:	quarry-%{version}.tar.bz2
+Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+#Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,13 +64,21 @@
 %doc AUTHORS ChangeLog COPYING COPYING-DOC NEWS README THANKS TODO
 %{_bindir}/quarry
 %{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/quarry.xml
+%{_datadir}/pixmaps/quarry.png
 #%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
-* Sun Nov 13 2005 Michel Salim <mcihel.salim[AT]gmail.com> - 0.1.16-1
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
+- Update to 0.1.19
+
+* Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.1.16-2
+- Rebuild for Fedora Extras 5
+
+* Sun Nov 13 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.1.16-1
 - New upstream version
 
 * Sun Sep  4 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.1.15-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Nov 2005 03:14:16 -0000	1.2
+++ sources	8 Oct 2006 13:34:11 -0000	1.3
@@ -1 +1 @@
-753a6d9aff05069fbd5a2c802cef5e19  quarry-0.1.16.tar.bz2
+15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 13:54:42 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 06:54:42 -0700
Subject: comps comps-cleanup.xsl,1.11,1.12
Message-ID: <200610081354.k98DsiTp003194@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3177

Modified Files:
	comps-cleanup.xsl 
Log Message:
remove useless leftover


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- comps-cleanup.xsl	8 Oct 2006 12:43:46 -0000	1.11
+++ comps-cleanup.xsl	8 Oct 2006 13:54:42 -0000	1.12
@@ -96,7 +96,7 @@
   <xsl:template match="packagelist" priority="1">
     <xsl:copy>
       <xsl:apply-templates select="key('packages-by-group',../id/text())">
-        <xsl:sort select="count(exsl:node-set($type-sort-order)/*[name() = current()/@type]/preceding-sibling::*)+1" data-type="number"/>
+        <xsl:sort select="count(exsl:node-set($type-sort-order)/*[name() = current()/@type]/preceding-sibling::*)" data-type="number"/>
         <xsl:sort select="translate(text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
     </xsl:copy>



From fedora-extras-commits at redhat.com  Sun Oct  8 14:04:24 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  8 Oct 2006 07:04:24 -0700
Subject: rpms/gdeskcal/devel .cvsignore, 1.3, 1.4 gdeskcal.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200610081404.k98E4QL7006172@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6136/devel

Modified Files:
	.cvsignore gdeskcal.spec sources 
Log Message:
auto-import gdeskcal-1.0-2 on branch devel from gdeskcal-1.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:22:43 -0000	1.3
+++ .cvsignore	8 Oct 2006 14:04:24 -0000	1.4
@@ -1 +1 @@
-gDeskCal-0_57_1.tar.gz
+gDeskCal-1.0.tar.gz


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdeskcal.spec	6 Oct 2006 23:49:47 -0000	1.10
+++ gdeskcal.spec	8 Oct 2006 14:04:24 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           gdeskcal
-Version:        0.57.1
-Release:        6%{?dist}
+Version:        1.0
+Release:        2%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.pycage.de/software_gdeskcal.html
-Source0:        http://www.pycage.de/download/gDeskCal-0_57_1.tar.gz
+Source0:        http://www.pycage.de/download/gDeskCal-1.0.tar.gz
 Source1:        gdeskcal.png
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,42 +27,41 @@
 %setup -q -n gDeskCal-%{version}
 
 %build
-
+%configure
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p  ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/
-mkdir -p  ${RPM_BUILD_ROOT}/%{_datadir}
-cp -a code data po skins ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/
-cp -a locale ${RPM_BUILD_ROOT}/%{_datadir}/
-cp -a gdeskcal ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}
-mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}/
-ln -sf %{_libdir}/%{name}-%{version}/gdeskcal ${RPM_BUILD_ROOT}/%{_bindir}/
-install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gdeskcal.png
-%find_lang %{name}
-
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_bindir}
+cp -a code data ical skins %{buildroot}/%{_libdir}/%{name}/
+install -m0755 gdeskcal %{buildroot}/%{_libdir}/%{name}/gdeskcal-bin
+ln -sf %{_libdir}/%{name}/gdeskcal-bin %{buildroot}/%{_bindir}/%{name}
+install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   %{SOURCE2}
 
-
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README README.i18n README.skins
+%doc AUTHORS NEWS README 
 %{_bindir}/gdeskcal
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}
 
 
 %changelog
-* Sat Oct 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-6
-- rebuild
+* Sun Oct 08 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-2
+- Remove using the real makeinstall as it's broken
+
+* Sat Oct 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-1
+- bump to new version
 
 * Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:22:43 -0000	1.3
+++ sources	8 Oct 2006 14:04:24 -0000	1.4
@@ -1 +1 @@
-c2c1de1046e9026558c51e90fe6f8a9e  gDeskCal-0_57_1.tar.gz
+eddbf6387b9937c067e9c437f1abfacf  gDeskCal-1.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct  8 14:04:21 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  8 Oct 2006 07:04:21 -0700
Subject: rpms/gdeskcal import.log,1.6,1.7
Message-ID: <200610081404.k98E4sSQ006175@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6136

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-1.0-2 on branch devel from gdeskcal-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	10 Apr 2006 10:42:39 -0000	1.6
+++ import.log	8 Oct 2006 14:04:20 -0000	1.7
@@ -3,3 +3,4 @@
 gdeskcal-0_57_1-0_fdr_2_2:HEAD:gdeskcal-0.57.1-0.fdr.2.2.src.rpm:1099887779
 gdeskcal-0_57_1-5:HEAD:gdeskcal-0.57.1-5.src.rpm:1144665627
 gdeskcal-0_57_1-5:FC-5:gdeskcal-0.57.1-5.src.rpm:1144665747
+gdeskcal-1_0-2:HEAD:gdeskcal-1.0-2.src.rpm:1160316248



From fedora-extras-commits at redhat.com  Sun Oct  8 14:05:02 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 07:05:02 -0700
Subject: comps comps-cleanup.xsl,1.12,1.13
Message-ID: <200610081405.k98E54Jc006227@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6184

Modified Files:
	comps-cleanup.xsl 
Log Message:
referenced by hurts my eyes


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- comps-cleanup.xsl	8 Oct 2006 13:54:42 -0000	1.12
+++ comps-cleanup.xsl	8 Oct 2006 14:05:02 -0000	1.13
@@ -121,7 +121,7 @@
 <!-- Warn about packages referenced several times (at least twice;)) -->
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
-    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced by <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
+    <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
     <xsl:for-each select="$dupes">
       <xsl:sort select="translate(../../id/text(),$lcletters,$ucletters)"/>
       <xsl:message>     ??? <xsl:value-of select="@type"/> package in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/></xsl:message>



From fedora-extras-commits at redhat.com  Sun Oct  8 14:11:35 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 07:11:35 -0700
Subject: rpms/grhino/FC-4 .cvsignore, 1.4, 1.5 grhino.spec, 1.4, 1.5 sources,
	1.4, 1.5 grhino-Makefile-in.patch, 1.1, NONE
Message-ID: <200610081411.k98EBb1e006466@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396/FC-4

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 04:03:42 -0000	1.4
+++ .cvsignore	8 Oct 2006 14:11:35 -0000	1.5
@@ -1 +1 @@
-grhino-0.15.0-patched.tar.bz2
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grhino.spec	17 Nov 2005 04:03:42 -0000	1.4
+++ grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           grhino
-Version:        0.15.0
-Release:        4%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+#Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 
@@ -85,6 +85,12 @@
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
+
+* Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
+- Rebuild for Fedora Extras 5
+
 * Sun Nov 13 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.15.0-4
 - Reverted game name used in GTP protocol
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 04:03:42 -0000	1.4
+++ sources	8 Oct 2006 14:11:35 -0000	1.5
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 14:11:36 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 07:11:36 -0700
Subject: rpms/grhino/FC-5 .cvsignore, 1.4, 1.5 grhino.spec, 1.4, 1.5 sources,
	1.4, 1.5 grhino-Makefile-in.patch, 1.1, NONE
Message-ID: <200610081411.k98EBceg006470@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396/FC-5

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 03:27:43 -0000	1.4
+++ .cvsignore	8 Oct 2006 14:11:35 -0000	1.5
@@ -1 +1 @@
-grhino-0.15.0-patched.tar.bz2
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grhino.spec	2 Mar 2006 15:16:57 -0000	1.4
+++ grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           grhino
-Version:        0.15.0
-Release:        5%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+#Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
+
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 03:27:43 -0000	1.4
+++ sources	8 Oct 2006 14:11:35 -0000	1.5
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 14:11:36 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 07:11:36 -0700
Subject: rpms/grhino/devel .cvsignore, 1.4, 1.5 grhino.spec, 1.4, 1.5 sources,
	1.4, 1.5 grhino-Makefile-in.patch, 1.1, NONE needs.rebuild, 1.1, NONE
Message-ID: <200610081411.k98EBciT006476@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396/devel

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-Makefile-in.patch needs.rebuild 
Log Message:
Update to 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 03:27:43 -0000	1.4
+++ .cvsignore	8 Oct 2006 14:11:36 -0000	1.5
@@ -1 +1 @@
-grhino-0.15.0-patched.tar.bz2
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grhino.spec	2 Mar 2006 15:16:57 -0000	1.4
+++ grhino.spec	8 Oct 2006 14:11:36 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           grhino
-Version:        0.15.0
-Release:        5%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+#Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
+
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 03:27:43 -0000	1.4
+++ sources	8 Oct 2006 14:11:36 -0000	1.5
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 14:11:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun,  8 Oct 2006 07:11:34 -0700
Subject: rpms/grhino/FC-3 .cvsignore, 1.4, 1.5 grhino.spec, 1.3, 1.4 sources,
	1.4, 1.5 grhino-Makefile-in.patch, 1.1, NONE
Message-ID: <200610081412.k98EC6rG006483@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396/FC-3

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 03:37:15 -0000	1.4
+++ .cvsignore	8 Oct 2006 14:11:34 -0000	1.5
@@ -1 +1 @@
-grhino-0.15.0-patched.tar.bz2
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grhino.spec	17 Nov 2005 03:37:15 -0000	1.3
+++ grhino.spec	8 Oct 2006 14:11:34 -0000	1.4
@@ -1,15 +1,15 @@
 Name:           grhino
-Version:        0.15.0
-Release:        4%{?dist}
+Version:        0.15.2
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+#Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,7 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 
@@ -85,6 +85,12 @@
 
 
 %changelog
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
+
+* Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
+- Rebuild for Fedora Extras 5
+
 * Sun Nov 13 2005 Michel Salim <michel.salim[AT]gmail.com> - 0.15.0-4
 - Reverted game name used in GTP protocol
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 03:37:15 -0000	1.4
+++ sources	8 Oct 2006 14:11:34 -0000	1.5
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct  8 14:24:12 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  8 Oct 2006 07:24:12 -0700
Subject: rpms/libmcrypt/FC-4 libmcrypt-2.5.7-aclocal_underquoted.patch, NONE,
	1.1 libmcrypt.spec, 1.3, 1.4
Message-ID: <200610081424.k98EOEdH006633@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmcrypt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598/FC-4

Modified Files:
	libmcrypt.spec 
Added Files:
	libmcrypt-2.5.7-aclocal_underquoted.patch 
Log Message:
bz 209913 : libmcrypt.m4 in -devel and properly quote it


libmcrypt-2.5.7-aclocal_underquoted.patch:

--- NEW FILE libmcrypt-2.5.7-aclocal_underquoted.patch ---
--- libmcrypt-2.5.7/lib/libmcrypt.m4	2006-10-08 09:04:36.000000000 -0400
+++ libmcrypt-2.5.7/lib/libmcrypt.m4_ORIG	2006-10-08 08:57:00.000000000 -0400
@@ -14,7 +14,7 @@
 dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBMCRYPT,
+AC_DEFUN([AM_PATH_LIBMCRYPT],
 [dnl
 dnl Get the cflags and libraries from the libmcrypt-config script
 dnl
@@ -164,7 +164,7 @@
         printf("*** of LIBMCRYPT, but you can also set the LIBMCRYPT_CONFIG environment to point to the\n");
         printf("*** correct copy of libmcrypt-config. (In this case, you will have to\n");
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
+        printf("*** so that the correct libraries are found at run-time)\n");
       }
     }
   return 1;


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/FC-4/libmcrypt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmcrypt.spec	28 Feb 2006 22:43:47 -0000	1.3
+++ libmcrypt.spec	8 Oct 2006 14:24:12 -0000	1.4
@@ -1,12 +1,13 @@
 Name:		libmcrypt
 Version:	2.5.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz
 Patch0:		libmcrypt-2.5.7-nolibltdl.patch
+Patch1:		libmcrypt-2.5.7-aclocal_underquoted.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-static=yes
@@ -46,7 +48,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO
 %{_libdir}/*.so.*
-%{_datadir}/aclocal/libmcrypt.m4
 %{_mandir}/man3/*
 
 %files devel
@@ -56,8 +57,12 @@
 %{_includedir}/mcrypt.h
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Sun Oct  8 2006 Ed Hill <ed at eh3.com> 2.5.7-4
+- bz 209913 : libmcrypt.m4 in -devel and properly quote it
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.7-3
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Sun Oct  8 14:24:13 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  8 Oct 2006 07:24:13 -0700
Subject: rpms/libmcrypt/FC-5 libmcrypt-2.5.7-aclocal_underquoted.patch, NONE,
	1.1 libmcrypt.spec, 1.3, 1.4
Message-ID: <200610081424.k98EOFiZ006639@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libmcrypt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598/FC-5

Modified Files:
	libmcrypt.spec 
Added Files:
	libmcrypt-2.5.7-aclocal_underquoted.patch 
Log Message:
bz 209913 : libmcrypt.m4 in -devel and properly quote it


libmcrypt-2.5.7-aclocal_underquoted.patch:

--- NEW FILE libmcrypt-2.5.7-aclocal_underquoted.patch ---
--- libmcrypt-2.5.7/lib/libmcrypt.m4	2006-10-08 09:04:36.000000000 -0400
+++ libmcrypt-2.5.7/lib/libmcrypt.m4_ORIG	2006-10-08 08:57:00.000000000 -0400
@@ -14,7 +14,7 @@
 dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBMCRYPT,
+AC_DEFUN([AM_PATH_LIBMCRYPT],
 [dnl
 dnl Get the cflags and libraries from the libmcrypt-config script
 dnl
@@ -164,7 +164,7 @@
         printf("*** of LIBMCRYPT, but you can also set the LIBMCRYPT_CONFIG environment to point to the\n");
         printf("*** correct copy of libmcrypt-config. (In this case, you will have to\n");
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
+        printf("*** so that the correct libraries are found at run-time)\n");
       }
     }
   return 1;


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/FC-5/libmcrypt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmcrypt.spec	28 Feb 2006 22:43:53 -0000	1.3
+++ libmcrypt.spec	8 Oct 2006 14:24:13 -0000	1.4
@@ -1,12 +1,13 @@
 Name:		libmcrypt
 Version:	2.5.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz
 Patch0:		libmcrypt-2.5.7-nolibltdl.patch
+Patch1:		libmcrypt-2.5.7-aclocal_underquoted.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-static=yes
@@ -46,7 +48,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO
 %{_libdir}/*.so.*
-%{_datadir}/aclocal/libmcrypt.m4
 %{_mandir}/man3/*
 
 %files devel
@@ -56,8 +57,12 @@
 %{_includedir}/mcrypt.h
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Sun Oct  8 2006 Ed Hill <ed at eh3.com> 2.5.7-4
+- bz 209913 : libmcrypt.m4 in -devel and properly quote it
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.7-3
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Sun Oct  8 15:13:09 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun,  8 Oct 2006 08:13:09 -0700
Subject: rpms/dietlibc/devel dietlibc.spec,1.22,1.23
Message-ID: <200610081513.k98FDBDb009854@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837

Modified Files:
	dietlibc.spec 
Log Message:
reenabled PPC


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dietlibc.spec	15 Sep 2006 06:23:01 -0000	1.22
+++ dietlibc.spec	8 Oct 2006 15:13:09 -0000	1.23
@@ -27,7 +27,7 @@
 Summary:	Small libc implementation
 Name:		dietlibc
 Version:	0.30
-Release:	%release_func 2
+Release:	%release_func 3
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -39,14 +39,11 @@
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182118
-ExcludeArch:	ppc
-
-
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
 
+
 %description
 The diet libc is a libc that is optimized for small size. It can be
 used to create small statically linked binaries for Linux on alpha,
@@ -116,6 +113,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-3
+- reenabled PPC
+
 * Fri Sep 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Oct  8 15:35:58 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun,  8 Oct 2006 08:35:58 -0700
Subject: rpms/dietlibc/devel dietlibc.spec,1.23,1.24
Message-ID: <200610081536.k98Fa0oT010039@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10022

Modified Files:
	dietlibc.spec 
Log Message:
reverted last commit; PPC builds are still broken


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dietlibc.spec	8 Oct 2006 15:13:09 -0000	1.23
+++ dietlibc.spec	8 Oct 2006 15:35:58 -0000	1.24
@@ -27,7 +27,7 @@
 Summary:	Small libc implementation
 Name:		dietlibc
 Version:	0.30
-Release:	%release_func 3
+Release:	%release_func 2
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -39,11 +39,14 @@
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182118
+ExcludeArch:	ppc
+
+
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
 
-
 %description
 The diet libc is a libc that is optimized for small size. It can be
 used to create small statically linked binaries for Linux on alpha,
@@ -113,9 +116,6 @@
 
 
 %changelog
-* Sun Oct  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-3
-- reenabled PPC
-
 * Fri Sep 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Oct  8 15:56:43 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 08:56:43 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.6,1.7
Message-ID: <200610081556.k98FukSt010184@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10167

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.18-1.2747.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- em8300-kmod.spec	4 Oct 2006 16:04:16 -0000	1.6
+++ em8300-kmod.spec	8 Oct 2006 15:56:43 -0000	1.7
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2747.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.18-1.2747.fc6.
+
 * Wed Oct  4 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.18-1.2726.fc6.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 16:04:44 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sun,  8 Oct 2006 09:04:44 -0700
Subject: owners owners.list,1.1797,1.1798
Message-ID: <200610081604.k98G4k1Q013341@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322

Modified Files:
	owners.list 
Log Message:
Deorphan mediawiki (take 2) ...


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1797
retrieving revision 1.1798
diff -u -r1.1797 -r1.1798
--- owners.list	8 Oct 2006 10:51:27 -0000	1.1797
+++ owners.list	8 Oct 2006 16:04:43 -0000	1.1798
@@ -1011,7 +1011,7 @@
 Fedora Extras|mbuffer|Measuring Buffer is an enhanced version of buffer|alex at dalloz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
-Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|mercator|Terrain library for WorldForge client/server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 16:04:46 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Oct 2006 09:04:46 -0700
Subject: comps comps-fe6.xml.in,1.179,1.180
Message-ID: <200610081605.k98G5J5p013361@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13324

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add trac package to Development



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- comps-fe6.xml.in	8 Oct 2006 12:28:37 -0000	1.179
+++ comps-fe6.xml.in	8 Oct 2006 16:04:46 -0000	1.180
@@ -192,6 +192,7 @@
       <packagereq type="optional">tkcvs</packagereq>
       <packagereq type="optional">tla</packagereq>
       <packagereq type="optional">tolua++</packagereq>
+      <packagereq type="optional">trac</packagereq>
       <packagereq type="optional">ucblogo</packagereq>
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">xbsql</packagereq>



From fedora-extras-commits at redhat.com  Sun Oct  8 16:27:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 09:27:18 -0700
Subject: rpms/pcsc-tools/devel .cvsignore, 1.7, 1.8 pcsc-tools.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200610081627.k98GRK4o013518@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13497

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.7-1
- 1.4.7, Oct 8 smartcard_list.txt.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Sep 2006 22:13:13 -0000	1.7
+++ .cvsignore	8 Oct 2006 16:27:18 -0000	1.8
@@ -1,2 +1,2 @@
-pcsc-tools-1.4.6.tar.gz
+pcsc-tools-1.4.7.tar.gz
 smartcard_list.txt


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pcsc-tools.spec	1 Sep 2006 22:13:13 -0000	1.8
+++ pcsc-tools.spec	8 Oct 2006 16:27:18 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           pcsc-tools
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.7-1
+- 1.4.7, Oct 8 smartcard_list.txt.
+
 * Sat Sep  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.6-1
 - 1.4.6, Aug 30 smartcard_list.txt.
 - Drop pcsc-lite < 1.2.9 support.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Sep 2006 22:13:13 -0000	1.7
+++ sources	8 Oct 2006 16:27:18 -0000	1.8
@@ -1,2 +1,2 @@
-8210a13a6fbe320620cd4281f5d0531d  pcsc-tools-1.4.6.tar.gz
-1ad2ef2a200b0c7234ca4d4b1a1bd264  smartcard_list.txt
+fb4129779df83a0eb57e8bdf7fec1535  pcsc-tools-1.4.7.tar.gz
+371764708e8690d67f23af02c44320bb  smartcard_list.txt



From fedora-extras-commits at redhat.com  Sun Oct  8 16:29:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 09:29:02 -0700
Subject: rpms/pcsc-tools/FC-5 .cvsignore, 1.6, 1.7 pcsc-tools.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200610081629.k98GT4ZB013595@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13574

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.7-1
- 1.4.7, Oct 8 smartcard_list.txt.

* Sat Sep  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.6-1
- 1.4.6, Aug 30 smartcard_list.txt.
- Drop pcsc-lite < 1.2.9 support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 May 2006 17:48:38 -0000	1.6
+++ .cvsignore	8 Oct 2006 16:29:02 -0000	1.7
@@ -1 +1,2 @@
-pcsc-tools-1.4.5.tar.gz
+pcsc-tools-1.4.7.tar.gz
+smartcard_list.txt


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/pcsc-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pcsc-tools.spec	8 May 2006 17:48:38 -0000	1.7
+++ pcsc-tools.spec	8 Oct 2006 16:29:02 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           pcsc-tools
-Version:        1.4.5
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
@@ -7,11 +7,11 @@
 License:        GPL
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
-#Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
+Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  pcsc-lite-devel
+BuildRequires:  pcsc-lite-devel >= 1.2.9
 Requires:       pcsc-lite
 
 %description
@@ -25,13 +25,8 @@
 %prep
 %setup -q
 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
-if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then
-    sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c
-fi
-# cp %{SOURCE1} .
-for f in Changelog README smartcard_list.txt ; do
-    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
+cp %{SOURCE1} .
+f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
@@ -64,6 +59,13 @@
 
 
 %changelog
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.7-1
+- 1.4.7, Oct 8 smartcard_list.txt.
+
+* Sat Sep  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.6-1
+- 1.4.6, Aug 30 smartcard_list.txt.
+- Drop pcsc-lite < 1.2.9 support.
+
 * Mon May  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.5-1
 - 1.4.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 May 2006 17:48:38 -0000	1.6
+++ sources	8 Oct 2006 16:29:02 -0000	1.7
@@ -1 +1,2 @@
-706a6e3bcac08d62c44fb2cd1d561969  pcsc-tools-1.4.5.tar.gz
+fb4129779df83a0eb57e8bdf7fec1535  pcsc-tools-1.4.7.tar.gz
+371764708e8690d67f23af02c44320bb  smartcard_list.txt



From fedora-extras-commits at redhat.com  Sun Oct  8 16:29:57 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 09:29:57 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.7,1.8
Message-ID: <200610081629.k98GTxIg013665@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13646

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
- Don't use <linux/config.h>.
- Build for kernel 2.6.18-1.2747.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- em8300-kmod.spec	8 Oct 2006 15:56:43 -0000	1.7
+++ em8300-kmod.spec	8 Oct 2006 16:29:57 -0000	1.8
@@ -27,7 +27,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.2.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.3.rc1.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -52,6 +52,7 @@
 cd %{kmod_name}-%{version}-rc1
 %patch0 -p0
 %patch1 -p0
+sed -i -e 's|<linux/config\.h>|<linux/autoconf.h>|' modules/*.[hc]
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
@@ -81,8 +82,9 @@
 
 
 %changelog
-* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi>
-- Rebuild for kernel 2.6.18-1.2747.fc6.
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
+- Don't use <linux/config.h>.
+- Build for kernel 2.6.18-1.2747.fc6.
 
 * Wed Oct  4 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.18-1.2726.fc6.



From fedora-extras-commits at redhat.com  Sun Oct  8 16:34:58 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 09:34:58 -0700
Subject: comps comps-cleanup.xsl,1.13,1.14
Message-ID: <200610081635.k98GZ0vx013760@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13743

Modified Files:
	comps-cleanup.xsl 
Log Message:
be smarter if a package is both referenced in several groups and several times in a single group


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- comps-cleanup.xsl	8 Oct 2006 14:05:02 -0000	1.13
+++ comps-cleanup.xsl	8 Oct 2006 16:34:58 -0000	1.14
@@ -19,8 +19,8 @@
   <xsl:key name="unique-groups" match="/comps/group" use="id/text()"/>
   <xsl:key name="unique-categories" match="/comps/category" use="id/text()"/>
   <xsl:key name="packages-by-group" match="/comps/group/packagelist/packagereq" use="../../id/text()"/>
-  <xsl:key name="unique-packages" match="/comps/group/packagelist/packagereq" use="text()"/>
   <xsl:key name="unique-package-entries" match="/comps/group/packagelist/packagereq" use="concat(../../id/text(),'/',text())"/>
+  <xsl:key name="unique-packages" match="/comps/group/packagelist/packagereq[generate-id(.) = generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" use="text()"/>
   <xsl:key name="groups-by-category" match="/comps/category/grouplist/groupid" use="../../id/text()"/>
   <xsl:key name="unique-group-entries" match="/comps/category/grouplist/groupid" use="concat(../../id/text(),'/',text())"/>
   <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz</xsl:variable>
@@ -118,8 +118,8 @@
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">
     <xsl:message>  ??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
   </xsl:template>
-<!-- Warn about packages referenced several times (at least twice;)) -->
-  <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
+<!-- Warn about packages referenced several times -->
+  <xsl:template match="packagereq[count(key('unique-packages',text())) > 1 and generate-id(.) = generate-id(key('unique-packages',text())[1])]" priority="1">
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
     <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
     <xsl:for-each select="$dupes">



From fedora-extras-commits at redhat.com  Sun Oct  8 16:48:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Oct 2006 09:48:05 -0700
Subject: comps comps-cleanup.xsl,1.14,1.15
Message-ID: <200610081648.k98Gm7nR013816@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13799

Modified Files:
	comps-cleanup.xsl 
Log Message:
simplify a test


Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- comps-cleanup.xsl	8 Oct 2006 16:34:58 -0000	1.14
+++ comps-cleanup.xsl	8 Oct 2006 16:48:05 -0000	1.15
@@ -119,7 +119,7 @@
     <xsl:message>  ??? Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
   </xsl:template>
 <!-- Warn about packages referenced several times -->
-  <xsl:template match="packagereq[count(key('unique-packages',text())) > 1 and generate-id(.) = generate-id(key('unique-packages',text())[1])]" priority="1">
+  <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
     <xsl:message>  ??? Package <xsl:value-of select="text()"/> is referenced in <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
     <xsl:for-each select="$dupes">



From fedora-extras-commits at redhat.com  Sun Oct  8 17:07:50 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  8 Oct 2006 10:07:50 -0700
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 telepathy-butterfly.spec, 1.2, 1.3
Message-ID: <200610081707.k98H7q0s016771@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16750

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
- Update to 0.1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 14:51:26 -0000	1.3
+++ .cvsignore	8 Oct 2006 17:07:49 -0000	1.4
@@ -1 +1 @@
-telepathy-butterfly-0.1.1.tar.gz
+telepathy-butterfly-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 14:51:26 -0000	1.3
+++ sources	8 Oct 2006 17:07:49 -0000	1.4
@@ -1 +1 @@
-05fa11dc4221d456e068e77c3aecb897  telepathy-butterfly-0.1.1.tar.gz
+e52f238d9716b45961d28b424a9c0e6e  telepathy-butterfly-0.1.2.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- telepathy-butterfly.spec	2 Oct 2006 14:51:26 -0000	1.2
+++ telepathy-butterfly.spec	8 Oct 2006 17:07:49 -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:           telepathy-butterfly
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2.
+
 * Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
 - Update to 0.1.1.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 17:25:59 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  8 Oct 2006 10:25:59 -0700
Subject: rpms/telepathy-butterfly/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 telepathy-butterfly.spec, 1.2, 1.3
Message-ID: <200610081726.k98HQ1wY016911@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16890

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
- Update to 0.1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 14:49:58 -0000	1.3
+++ .cvsignore	8 Oct 2006 17:25:59 -0000	1.4
@@ -1 +1 @@
-telepathy-butterfly-0.1.1.tar.gz
+telepathy-butterfly-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 14:49:59 -0000	1.3
+++ sources	8 Oct 2006 17:25:59 -0000	1.4
@@ -1 +1 @@
-05fa11dc4221d456e068e77c3aecb897  telepathy-butterfly-0.1.1.tar.gz
+e52f238d9716b45961d28b424a9c0e6e  telepathy-butterfly-0.1.2.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-5/telepathy-butterfly.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- telepathy-butterfly.spec	2 Oct 2006 14:49:59 -0000	1.2
+++ telepathy-butterfly.spec	8 Oct 2006 17:25:59 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2.
+
 * Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
 - Update to 0.1.1.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 19:45:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 12:45:24 -0700
Subject: owners owners.list,1.1798,1.1799
Message-ID: <200610081945.k98JjQOs023293@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23276

Modified Files:
	owners.list 
Log Message:
gdeskcal -> pfj


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1798
retrieving revision 1.1799
diff -u -r1.1798 -r1.1799
--- owners.list	8 Oct 2006 16:04:43 -0000	1.1798
+++ owners.list	8 Oct 2006 19:45:23 -0000	1.1799
@@ -464,7 +464,7 @@
 Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gconvert|A desktop unit converter|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|gdeskcal|Eye-candy calendar for your desktop|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|paul at all-the-johnsons.co.uk
+Fedora Extras|gdeskcal|Eye-candy calendar for your desktop|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 20:00:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 13:00:34 -0700
Subject: fedora-security/audit fe5,1.83,1.84
Message-ID: <200610082000.k98K0YKi023367@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23349

Modified Files:
	fe5 
Log Message:
CVE-2006-4247 fixed in plone 2.5-4


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fe5	3 Oct 2006 17:59:44 -0000	1.83
+++ fe5	8 Oct 2006 20:00:31 -0000	1.84
@@ -24,7 +24,7 @@
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
-CVE-2006-4247 VULNERABLE (plone) #209163
+CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688



From fedora-extras-commits at redhat.com  Sun Oct  8 20:19:18 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun,  8 Oct 2006 13:19:18 -0700
Subject: fedora-accounts export-aliases.py,1.7,1.8
Message-ID: <200610082019.k98KJIe4026364@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26339

Modified Files:
	export-aliases.py 
Log Message:
Basic email alias checking provided by Ahmed Kamal



Index: export-aliases.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/export-aliases.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- export-aliases.py	21 Jun 2005 22:28:38 -0000	1.7
+++ export-aliases.py	8 Oct 2006 20:19:15 -0000	1.8
@@ -3,6 +3,7 @@
 import sys, os, errno
 import website
 import getopt
+import re
 
 opts, args = getopt.getopt(sys.argv[1:], '', ('usage', 'help'))
 if len(args) != 3 or ('--usage','') in opts or ('--help','') in opts:



From fedora-extras-commits at redhat.com  Sun Oct  8 20:26:41 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun,  8 Oct 2006 13:26:41 -0700
Subject: fedora-accounts export-aliases.py,1.8,1.9
Message-ID: <200610082026.k98KQfPx026393@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26375

Modified Files:
	export-aliases.py 
Log Message:
Changes made by Ahmed Kamal



Index: export-aliases.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/export-aliases.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- export-aliases.py	8 Oct 2006 20:19:15 -0000	1.8
+++ export-aliases.py	8 Oct 2006 20:26:39 -0000	1.9
@@ -36,8 +36,7 @@
 while 1:
     arow = dbc.fetchone()
     if not arow: break
-    x = arow[1].find('@')
-    if x >= 0 and arow[1][x:] != ('@' + local_domain):
+    if re.compile("^[A-Z0-9._-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$", re.IGNORECASE).match(arow[1]):
 	fh_aliases_new.write('%s: %s\n' % (arow[0], arow[1]))
 	fh_aliases_new.write('%s: %s\n' % (arow[2].replace(' ', '.').lower(), arow[0]))
 



From fedora-extras-commits at redhat.com  Sun Oct  8 20:33:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 13:33:47 -0700
Subject: rpms/opensc/devel opensc.spec,1.18,1.19
Message-ID: <200610082033.k98KXnYx026451@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26434

Modified Files:
	opensc.spec 
Log Message:
* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-5
- Rebuild with new libassuan.



Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- opensc.spec	2 Oct 2006 18:44:08 -0000	1.18
+++ opensc.spec	8 Oct 2006 20:33:47 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-5
+- Rebuild with new libassuan.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sun Oct  8 20:50:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Oct 2006 13:50:20 -0700
Subject: owners owners.list,1.1799,1.1800
Message-ID: <200610082050.k98KoMND026562@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26545

Modified Files:
	owners.list 
Log Message:
quarry, zeroinstall-injector reclaimed by michel.salim at gmail.com


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1799
retrieving revision 1.1800
diff -u -r1.1799 -r1.1800
--- owners.list	8 Oct 2006 19:45:23 -0000	1.1799
+++ owners.list	8 Oct 2006 20:50:20 -0000	1.1800
@@ -1922,7 +1922,7 @@
 Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|quadkonsole|Embeds Konsole kparts in a grid layout|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|quarry|A multi-purpose board-game GUI|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|quarry|A multi-purpose board-game GUI|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|qucs|Circuit simulator|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|quodlibet|A music management program|jeff at ocjtech.us|extras-qa at fedoraproject.org|
@@ -2398,7 +2398,7 @@
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 Fedora Extras|z88dk|Z80 cross compiler|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|zasx|Asteroid like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 21:11:48 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:11:48 -0700
Subject: rpms/glom - New directory
Message-ID: <200610082111.k98LBoli029603@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29575/glom

Log Message:
Directory /cvs/extras/rpms/glom added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  8 21:11:49 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:11:49 -0700
Subject: rpms/glom/devel - New directory
Message-ID: <200610082111.k98LBpsh029606@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29575/glom/devel

Log Message:
Directory /cvs/extras/rpms/glom/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct  8 21:16:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:16:50 -0700
Subject: rpms/glom import.log,1.1,1.2
Message-ID: <200610082116.k98LGqnJ029730@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29696

Modified Files:
	import.log 
Log Message:
auto-import glom-1.0.5-4 on branch devel from glom-1.0.5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glom/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Oct 2006 21:12:07 -0000	1.1
+++ import.log	8 Oct 2006 21:16:50 -0000	1.2
@@ -0,0 +1 @@
+glom-1_0_5-4:HEAD:glom-1.0.5-4.src.rpm:1160342110



From fedora-extras-commits at redhat.com  Sun Oct  8 21:16:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:16:50 -0700
Subject: rpms/glom/devel glom-1.0.5-poconfig.patch, NONE, 1.1 glom.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610082116.k98LGqsp029737@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29696/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glom-1.0.5-poconfig.patch glom.spec 
Log Message:
auto-import glom-1.0.5-4 on branch devel from glom-1.0.5-4.src.rpm

glom-1.0.5-poconfig.patch:

--- NEW FILE glom-1.0.5-poconfig.patch ---
--- glom-1.0.5/configure.in.orig	2006-10-04 19:32:11.000000000 -0700
+++ glom-1.0.5/configure.in	2006-10-04 19:32:24.000000000 -0700
@@ -21,6 +21,7 @@
 		   [The domain name to use with gettext.])
 
 ALL_LINGUAS="ca cs de en_CA en_GB es fi fr gu hu it nb ne nl pa pt pt_BR rw sq sv tr vi zh_CN"
+AC_SUBST(ALL_LINGUAS)
 
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])


--- NEW FILE glom.spec ---
%define major_version  1.0
%define minor_version  5

Name:           glom
Version:        %{major_version}.%{minor_version}
Release:        4%{?dist}
Summary:        Easy-to-use database designer and user interface

Group:          Applications/Databases
License:        GPL
URL:            http://www.glom.org/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2
Patch0:         glom-1.0.5-poconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  bakery-devel >= 2.4
BuildRequires:  desktop-file-utils gettext intltool
BuildRequires:  libgdamm-devel >= 1.3.7
BuildRequires:  python-devel
BuildRequires:  gnome-python2-gda-devel
BuildRequires:  libgnomecanvasmm26-devel >= 2.10
BuildRequires:  libgnome-devel >= 2.6.0
BuildRequires:  libxslt-devel >= 1.1.10
BuildRequires:  pygtk2-devel >= 2.6
BuildRequires:  iso-codes-devel
BuildRequires:  gnome-doc-utils
BuildRequires:  scrollkeeper
%ifarch x86_64
BuildRequires:  automake libtool
%endif

Requires:       compat-gda-postgres

Requires(post):   shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires(post):   scrollkeeper
Requires(postun): scrollkeeper


%description
Glom lets you design database systems - the database and the user
interface. Glom has high-level features such as relationships,
lookups, related fields, related records, calculated fields, drop-down
choices, searching, reports, users and groups. It has Numeric, Text,
Date, Time, Boolean, and Image field types. Glom systems require
almost no programming, but you may use Python for calculated fields or
buttons. Glom uses the PostgreSQL database backend.


%prep
%setup -q
%patch0 -p1 -b .poconfig


%build
%ifarch x86_64
autoreconf -f -i
%endif
%configure \
        --disable-dependency-tracking \
        --disable-static \
        --disable-update-mime-database \
        --disable-scrollkeeper \
        --disable-rpath
make %{?_smp_mflags}


%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}%{_libdir}/libglom.so

cat << EOF >> ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
MimeType=application/x-glom;
EOF

desktop-file-install --vendor fedora --delete-original     \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
  --add-category X-Fedora                                  \
  ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop


%clean
rm -rf ${RPM_BUILD_ROOT}


%post
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
/sbin/ldconfig


%postun
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
scrollkeeper-update -q || :
/sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_libdir}/lib%{name}.so.*
%{_libdir}/python2.4/site-packages/%{name}.so
%{_datadir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/gnome/help/%{name}
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/mime-info/*


%changelog
* Fri Oct  6 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-4
- fixed x86_64 spec, vfsmm patch no longer needed

* Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-3
- Added scrollkeeper db updates
- Added mime-type key to desktop file
- Added autoreconf and patch to fix rpath problem

* Wed Oct  4 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-2
- Fixed BRs
- Enabled scrollkeeper

* Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-1
- Update to 1.0.5

* Thu Aug  3 2006 Denis Leroy <denis at poolshark.org> - 1.0.4-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Oct 2006 21:12:08 -0000	1.1
+++ .cvsignore	8 Oct 2006 21:16:50 -0000	1.2
@@ -0,0 +1 @@
+glom-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Oct 2006 21:12:08 -0000	1.1
+++ sources	8 Oct 2006 21:16:50 -0000	1.2
@@ -0,0 +1 @@
+55e5b35d268e342ed5305e9c798856a4  glom-1.0.5.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 21:31:17 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 14:31:17 -0700
Subject: rpms/sysprof/devel sysprof.spec,1.2,1.3
Message-ID: <200610082131.k98LVJNL029935@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29896/devel

Modified Files:
	sysprof.spec 
Log Message:
ExclusiveArch: i386 -> %{ix86}



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sysprof.spec	7 Oct 2006 15:37:27 -0000	1.2
+++ sysprof.spec	8 Oct 2006 21:31:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           sysprof      
 Version:        1.0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -19,7 +19,7 @@
 BuildRequires:  binutils-devel
 BuildRequires:  desktop-file-utils
 
-ExclusiveArch:  i386 x86_64
+ExclusiveArch:  %{ix86} x86_64
 
 %description
 Sysprof is a sampling CPU profiler for Linux that uses a kernel module
@@ -61,6 +61,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-6
+- better to use ExclusiveArch %{ix86} (thanks Ville)
+
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
 - add ExclusiveArch to match sysprof-kmod supported archs
 



From fedora-extras-commits at redhat.com  Sun Oct  8 21:31:18 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 14:31:18 -0700
Subject: rpms/sysprof/FC-5 sysprof.spec,1.3,1.4
Message-ID: <200610082131.k98LVKXE029939@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29896/FC-5

Modified Files:
	sysprof.spec 
Log Message:
ExclusiveArch: i386 -> %{ix86}



Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sysprof.spec	7 Oct 2006 15:37:26 -0000	1.3
+++ sysprof.spec	8 Oct 2006 21:31:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sysprof      
 Version:        1.0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -18,7 +18,7 @@
 BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils
 
-ExclusiveArch:  i386 x86_64
+ExclusiveArch:  %{ix86} x86_64
 
 %description
 Sysprof is a sampling CPU profiler for Linux that uses a kernel module
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-6
+- better to use ExclusiveArch %{ix86} (thanks Ville)
+
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
 - add ExclusiveArch to match sysprof-kmod supported archs
 



From fedora-extras-commits at redhat.com  Sun Oct  8 21:34:48 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:34:48 -0700
Subject: owners owners.list,1.1800,1.1801
Message-ID: <200610082134.k98LYo46030065@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30042

Modified Files:
	owners.list 
Log Message:
Added glom


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1800
retrieving revision 1.1801
diff -u -r1.1800 -r1.1801
--- owners.list	8 Oct 2006 20:50:20 -0000	1.1800
+++ owners.list	8 Oct 2006 21:34:47 -0000	1.1801
@@ -518,6 +518,7 @@
 Fedora Extras|glipper|Glipper is a simple Clipboardmanager for the GNOME Desktop Environment|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|glitz|OpenGL image compositing library|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|glom|Database Designer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|glyph-keeper|Library for text rendering|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct  8 21:35:19 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 14:35:19 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.5,1.6
Message-ID: <200610082135.k98LZLEa030093@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30075

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild fo newer kernel



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sysprof-kmod.spec	4 Oct 2006 22:21:40 -0000	1.5
+++ sysprof-kmod.spec	8 Oct 2006 21:35:19 -0000	1.6
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2726.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2747.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.3
-Release:        3.%(echo %{kverrel} | tr - _)
+Release:        4.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
+- rebuild for kernel 2.6.18-1.2747
+
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Sun Oct  8 21:39:48 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  8 Oct 2006 14:39:48 -0700
Subject: rpms/glom/devel .cvsignore, 1.2, 1.3 glom.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610082139.k98Ldo2K030228@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30207

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2006 21:16:50 -0000	1.2
+++ .cvsignore	8 Oct 2006 21:39:47 -0000	1.3
@@ -1 +1 @@
-glom-1.0.5.tar.bz2
+glom-1.0.7.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glom.spec	8 Oct 2006 21:16:50 -0000	1.1
+++ glom.spec	8 Oct 2006 21:39:47 -0000	1.2
@@ -1,9 +1,9 @@
 %define major_version  1.0
-%define minor_version  5
+%define minor_version  7
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Sun Oct  8 2006 Denis Leroy <denis at poolshark.org> - 1.0.7-1
+- Update to 1.0.7
+
 * Fri Oct  6 2006 Denis Leroy <denis at poolshark.org> - 1.0.5-4
 - fixed x86_64 spec, vfsmm patch no longer needed
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2006 21:16:50 -0000	1.2
+++ sources	8 Oct 2006 21:39:47 -0000	1.3
@@ -1 +1 @@
-55e5b35d268e342ed5305e9c798856a4  glom-1.0.5.tar.bz2
+64a8e0a8214c7a3267b7d97caec65817  glom-1.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 21:39:57 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:39:57 -0700
Subject: rpms/gnome-phone-manager/devel .cvsignore, 1.2,
	1.3 gnome-phone-manager.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610082139.k98Ldx3d030251@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30203

Modified Files:
	.cvsignore gnome-phone-manager.spec sources 
Log Message:
Bump to 0.8 from upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2006 22:20:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 21:39:57 -0000	1.3
@@ -1 +1 @@
-gnome-phone-manager-0.7.tar.bz2
+gnome-phone-manager-0.8.tar.bz2


Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-phone-manager.spec	6 Sep 2006 05:51:08 -0000	1.2
+++ gnome-phone-manager.spec	8 Oct 2006 21:39:57 -0000	1.3
@@ -1,11 +1,10 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
-Version: 	0.7
-Release: 	5%{?dist}
+Version: 	0.8
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
-Patch0:		gnome-phone-manager-econtact.patch
 URL: 		http://usefulinc.com/software/phonemgr/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel
@@ -26,6 +25,9 @@
 BuildRequires:	desktop-file-utils
 # Included with source
 # BuildRequires:	gsmlib-devel
+# In 0.8 some ancient autotoolset was used in packaging :(
+BuildRequires:	autoconf
+BuildRequires:	automake
 
 
 %description
@@ -38,19 +40,25 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
+%{__rm} -f aclocal.m4
+aclocal
+automake --add-missing
+%{__rm} -f configure
+%{__rm} -rf autom4te*.cache/
+autoconf
 %configure
-# OK ugly hack but will go when we have g-p-m 0.8 or so...
-make %{?_smp_mflags} CPPFLAGS=-DHAVE_ECONTACTPHOTOTYPE
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang %{name}
-cp $RPM_BUILD_ROOT%{_datadir}/pixmaps/cellphone.png \
-  $RPM_BUILD_ROOT%{_datadir}/gnome-phone-manager/
+# This is fixing some bug..
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mv $RPM_BUILD_ROOT%{_datadir}/cellphone.png \
+   $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install \
   --delete-original \
   --vendor fedora \
@@ -71,6 +79,11 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1
+- New upstream version including patch.
+- The icon is an an even weirder place now!
+- Have to run som autotools on this one to get it working.
+
 * Tue Sep 5 2006 Linus Walleij <triad at df.lth.se> 0.7-5
 - Patch to compile with new version of E-D-S.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2006 22:20:03 -0000	1.2
+++ sources	8 Oct 2006 21:39:57 -0000	1.3
@@ -1 +1 @@
-951471bf5d6fe93fe550c60b6bdf58f9  gnome-phone-manager-0.7.tar.bz2
+1a645a23d8851e554b3809b71e2162f0  gnome-phone-manager-0.8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 21:41:29 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:41:29 -0700
Subject: rpms/gnome-phone-manager/FC-5 .cvsignore, 1.2,
	1.3 gnome-phone-manager.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610082141.k98LfVlU030369@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30348

Modified Files:
	.cvsignore gnome-phone-manager.spec sources 
Log Message:
Bump to new upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2006 22:20:03 -0000	1.2
+++ .cvsignore	8 Oct 2006 21:41:29 -0000	1.3
@@ -1 +1 @@
-gnome-phone-manager-0.7.tar.bz2
+gnome-phone-manager-0.8.tar.bz2


Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/gnome-phone-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-phone-manager.spec	11 Aug 2006 22:20:03 -0000	1.1
+++ gnome-phone-manager.spec	8 Oct 2006 21:41:29 -0000	1.2
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
-Version: 	0.7
-Release: 	4%{?dist}
+Version: 	0.8
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -25,6 +25,9 @@
 BuildRequires:	desktop-file-utils
 # Included with source
 # BuildRequires:	gsmlib-devel
+# In 0.8 some ancient autotoolset was used in packaging :(
+BuildRequires:	autoconf
+BuildRequires:	automake
 
 
 %description
@@ -39,6 +42,12 @@
 %setup -q
 
 %build
+%{__rm} -f aclocal.m4
+aclocal
+automake --add-missing
+%{__rm} -f configure
+%{__rm} -rf autom4te*.cache/
+autoconf
 %configure
 make %{?_smp_mflags}
 
@@ -46,8 +55,10 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang %{name}
-cp $RPM_BUILD_ROOT%{_datadir}/pixmaps/cellphone.png \
-  $RPM_BUILD_ROOT%{_datadir}/gnome-phone-manager/
+# This is fixing some bug..
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mv $RPM_BUILD_ROOT%{_datadir}/cellphone.png \
+   $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install \
   --delete-original \
   --vendor fedora \
@@ -68,6 +79,14 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1
+- New upstream version including patch.
+- The icon is an an even weirder place now!
+- Have to run som autotools on this one to get it working.
+
+* Tue Sep 5 2006 Linus Walleij <triad at df.lth.se> 0.7-5
+- Patch to compile with new version of E-D-S.
+
 * Thu Aug 10 2006 Linus Walleij <triad at df.lth.se> 0.7-4
 - Missing BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2006 22:20:03 -0000	1.2
+++ sources	8 Oct 2006 21:41:29 -0000	1.3
@@ -1 +1 @@
-951471bf5d6fe93fe550c60b6bdf58f9  gnome-phone-manager-0.7.tar.bz2
+1a645a23d8851e554b3809b71e2162f0  gnome-phone-manager-0.8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct  8 21:48:37 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:48:37 -0700
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.3,1.4
Message-ID: <200610082148.k98Lmd19030440@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30423

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Libtool slip.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-phone-manager.spec	8 Oct 2006 21:39:57 -0000	1.3
+++ gnome-phone-manager.spec	8 Oct 2006 21:48:37 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 # In 0.8 some ancient autotoolset was used in packaging :(
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libtool
 
 
 %description
@@ -79,6 +80,9 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+- Pick up libtool.
+
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1
 - New upstream version including patch.
 - The icon is an an even weirder place now!



From fedora-extras-commits at redhat.com  Sun Oct  8 21:49:34 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:49:34 -0700
Subject: rpms/gnome-phone-manager/FC-5 gnome-phone-manager.spec,1.2,1.3
Message-ID: <200610082149.k98LnaaL030501@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Libtool slip.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/gnome-phone-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-phone-manager.spec	8 Oct 2006 21:41:29 -0000	1.2
+++ gnome-phone-manager.spec	8 Oct 2006 21:49:34 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 # In 0.8 some ancient autotoolset was used in packaging :(
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libtool
 
 
 %description
@@ -79,6 +80,9 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+- Pick up libtool.
+
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1
 - New upstream version including patch.
 - The icon is an an even weirder place now!



From fedora-extras-commits at redhat.com  Sun Oct  8 21:57:42 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:57:42 -0700
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.4,1.5
Message-ID: <200610082157.k98Lviq2030576@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30559

Modified Files:
	gnome-phone-manager.spec 
Log Message:
intltool missed.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-phone-manager.spec	8 Oct 2006 21:48:37 -0000	1.4
+++ gnome-phone-manager.spec	8 Oct 2006 21:57:41 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
+BuildRequires:	intltool
 
 
 %description
@@ -81,6 +82,9 @@
 
 %changelog
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+- Pick up intltool.
+
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
 - Pick up libtool.
 
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1



From fedora-extras-commits at redhat.com  Sun Oct  8 21:58:32 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  8 Oct 2006 14:58:32 -0700
Subject: rpms/gnome-phone-manager/FC-5 gnome-phone-manager.spec,1.3,1.4
Message-ID: <200610082158.k98LwY9H030637@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30620

Modified Files:
	gnome-phone-manager.spec 
Log Message:
intltool missed.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/FC-5/gnome-phone-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-phone-manager.spec	8 Oct 2006 21:49:34 -0000	1.3
+++ gnome-phone-manager.spec	8 Oct 2006 21:58:32 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
+BuildRequires:	intltool
 
 
 %description
@@ -81,6 +82,9 @@
 
 %changelog
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+- Pick up intltool.
+
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
 - Pick up libtool.
 
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-1



From fedora-extras-commits at redhat.com  Sun Oct  8 22:08:26 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 15:08:26 -0700
Subject: rpms/sysprof-kmod/devel sysprof-config.patch, NONE,
	1.1 sysprof-kmod.spec, 1.6, 1.7
Message-ID: <200610082208.k98M8SIU001316@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1274

Modified Files:
	sysprof-kmod.spec 
Added Files:
	sysprof-config.patch 
Log Message:
patch out linux/config.h


sysprof-config.patch:

--- NEW FILE sysprof-config.patch ---
Index: sysprof-1.0.3/module/sysprof-module.c
===================================================================
--- sysprof-1.0.3/module/sysprof-module.c
+++ sysprof-1.0.3/module/sysprof-module.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <linux/config.h>
 #if !CONFIG_PROFILING
 # error Sysprof needs a kernel with profiling support compiled in.
 #endif


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sysprof-kmod.spec	8 Oct 2006 21:35:19 -0000	1.6
+++ sysprof-kmod.spec	8 Oct 2006 22:08:25 -0000	1.7
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.3
-Release:        4.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -40,6 +40,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         %{kmod_name}-avoid_depmod.patch
+Patch1:         %{kmod_name}-config.patch
 
 ExclusiveArch:  i586 i686 x86_64
 
@@ -63,6 +64,7 @@
 %setup -q -c -T -a 0
 pushd %{kmod_name}-%{version}*
 %patch0 -p1 -b .patch0
+%patch0 -p1 -b .patch1
 # configure script breaks in mock builds (missing BRs), so we create here 
 # a config.h with the needed symbol
 echo '#define PACKAGE_VERSION "%{version}"' > config.h
@@ -103,8 +105,9 @@
 
 
 %changelog
-* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-4
+* Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
 - rebuild for kernel 2.6.18-1.2747
+- add patch for linux/config.h include
 
 * Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
 - rebuild



From fedora-extras-commits at redhat.com  Sun Oct  8 22:24:10 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun,  8 Oct 2006 15:24:10 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.7,1.8
Message-ID: <200610082224.k98MOCVo001553@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1535

Modified Files:
	sysprof-kmod.spec 
Log Message:
cut&paste is bad...



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sysprof-kmod.spec	8 Oct 2006 22:08:25 -0000	1.7
+++ sysprof-kmod.spec	8 Oct 2006 22:24:10 -0000	1.8
@@ -64,7 +64,7 @@
 %setup -q -c -T -a 0
 pushd %{kmod_name}-%{version}*
 %patch0 -p1 -b .patch0
-%patch0 -p1 -b .patch1
+%patch1 -p1 -b .patch1
 # configure script breaks in mock builds (missing BRs), so we create here 
 # a config.h with the needed symbol
 echo '#define PACKAGE_VERSION "%{version}"' > config.h



From fedora-extras-commits at redhat.com  Mon Oct  9 01:13:47 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun,  8 Oct 2006 18:13:47 -0700
Subject: rpms/gcin/devel .cvsignore, 1.6, 1.7 gcin.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <200610090113.k991DnOY010954@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10933

Modified Files:
	.cvsignore gcin.spec sources 
Log Message:
update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Sep 2006 14:36:38 -0000	1.6
+++ .cvsignore	9 Oct 2006 01:13:47 -0000	1.7
@@ -1 +1 @@
-gcin-1.2.6.tar.bz2
+gcin-1.2.7.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcin.spec	4 Oct 2006 22:15:42 -0000	1.9
+++ gcin.spec	9 Oct 2006 01:13:47 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gcin
-Version:        1.2.6
-Release:        2%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
+ - update to 1.2.7
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.2.6-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Sep 2006 14:36:38 -0000	1.6
+++ sources	9 Oct 2006 01:13:47 -0000	1.7
@@ -1 +1 @@
-c3ac7d5114c27ea20e60263890f05b13  gcin-1.2.6.tar.bz2
+ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 01:15:50 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun,  8 Oct 2006 18:15:50 -0700
Subject: rpms/gcin/FC-5 .cvsignore, 1.6, 1.7 gcin.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <200610090115.k991Fqvc011026@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005

Modified Files:
	.cvsignore gcin.spec sources 
Log Message:
update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Sep 2006 14:40:37 -0000	1.6
+++ .cvsignore	9 Oct 2006 01:15:50 -0000	1.7
@@ -1 +1 @@
-gcin-1.2.6.tar.bz2
+gcin-1.2.7.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcin.spec	26 Sep 2006 14:40:37 -0000	1.9
+++ gcin.spec	9 Oct 2006 01:15:50 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.6
+Version:        1.2.7
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
+- update to 1.2.7
+
 * Tue Sep 26 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.6-1
 - update to 1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Sep 2006 14:40:37 -0000	1.6
+++ sources	9 Oct 2006 01:15:50 -0000	1.7
@@ -1 +1 @@
-c3ac7d5114c27ea20e60263890f05b13  gcin-1.2.6.tar.bz2
+ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 01:17:28 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun,  8 Oct 2006 18:17:28 -0700
Subject: rpms/gcin/FC-4 .cvsignore, 1.6, 1.7 gcin.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200610090117.k991HV9a011094@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11073

Modified Files:
	.cvsignore gcin.spec sources 
Log Message:
update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Sep 2006 14:43:00 -0000	1.6
+++ .cvsignore	9 Oct 2006 01:17:28 -0000	1.7
@@ -1 +1 @@
-gcin-1.2.6.tar.bz2
+gcin-1.2.7.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	26 Sep 2006 14:43:00 -0000	1.10
+++ gcin.spec	9 Oct 2006 01:17:28 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.6
+Version:        1.2.7
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
+- update to 1.2.7
+
 * Tue Sep 26 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.6-1
 - update to 1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Sep 2006 14:43:00 -0000	1.6
+++ sources	9 Oct 2006 01:17:28 -0000	1.7
@@ -1 +1 @@
-c3ac7d5114c27ea20e60263890f05b13  gcin-1.2.6.tar.bz2
+ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 01:18:27 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun,  8 Oct 2006 18:18:27 -0700
Subject: rpms/gcin/FC-3 .cvsignore, 1.6, 1.7 gcin.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <200610090118.k991IT0e011164@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11143

Modified Files:
	.cvsignore gcin.spec sources 
Log Message:
update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Sep 2006 14:45:09 -0000	1.6
+++ .cvsignore	9 Oct 2006 01:18:27 -0000	1.7
@@ -1 +1 @@
-gcin-1.2.6.tar.bz2
+gcin-1.2.7.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcin.spec	26 Sep 2006 14:45:09 -0000	1.9
+++ gcin.spec	9 Oct 2006 01:18:27 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.6
+Version:        1.2.7
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -97,6 +97,9 @@
 %{_libdir}/libgcin-im-client.so
 
 %changelog
+* Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
+- update to 1.2.7
+
 * Tue Sep 26 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.6-1
 - update to 1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Sep 2006 14:45:09 -0000	1.6
+++ sources	9 Oct 2006 01:18:27 -0000	1.7
@@ -1 +1 @@
-c3ac7d5114c27ea20e60263890f05b13  gcin-1.2.6.tar.bz2
+ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 04:22:09 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun,  8 Oct 2006 21:22:09 -0700
Subject: rpms/bzr/devel .cvsignore, 1.6, 1.7 bzr.spec, 1.9, 1.10 sources, 1.6,
	1.7
Message-ID: <200610090422.k994MBvf020503@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20482

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
- Update to 0.11
- New download location.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Sep 2006 16:13:07 -0000	1.6
+++ .cvsignore	9 Oct 2006 04:22:09 -0000	1.7
@@ -1 +1 @@
-bzr-0.10.tar.gz
+bzr-0.11.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzr.spec	17 Sep 2006 16:13:07 -0000	1.9
+++ bzr.spec	9 Oct 2006 04:22:09 -0000	1.10
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr
-Version:        0.10
+Version:        0.11
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.bazaar-ng.org/
-Source0:        http://www.bazaar-ng.org/pkg/%{name}-%{version}.tar.gz
+URL:            http://www.bazaar-vcs.org/
+Source0:        http://bazaar-vcs.org/releases/src/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -150,10 +150,18 @@
 %{python_sitelib}/bzrlib/util/effbot/org/*.pyc
 %{python_sitelib}/bzrlib/util/effbot/org/*.pyo
 
+%dir %{python_sitelib}/bzrlib/version_info_formats/
+%{python_sitelib}/bzrlib/version_info_formats/*.py
+%{python_sitelib}/bzrlib/version_info_formats/*.py?
+
 %dir %{python_sitelib}/bzrlib/tests
 %{python_sitelib}/bzrlib/tests/*
 
 %changelog
+* Thu Oct 08 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.11-1
+- Update to 0.11
+- New download location.
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10-1
 - 0.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Sep 2006 16:13:07 -0000	1.6
+++ sources	9 Oct 2006 04:22:09 -0000	1.7
@@ -1 +1 @@
-8a21693efe9b06bed04fa4e8a74b7e83  bzr-0.10.tar.gz
+94fced266d6da6ed298e4738ca7414e0  bzr-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 04:34:22 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun,  8 Oct 2006 21:34:22 -0700
Subject: rpms/bzr/FC-5 .cvsignore,1.6,1.7 bzr.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <200610090434.k994YOuW020627@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzr/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20606

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
- Update to 0.11
- New download location.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Sep 2006 02:35:12 -0000	1.6
+++ .cvsignore	9 Oct 2006 04:34:22 -0000	1.7
@@ -1 +1 @@
-bzr-0.10.tar.gz
+bzr-0.11.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/bzr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzr.spec	20 Sep 2006 02:35:12 -0000	1.9
+++ bzr.spec	9 Oct 2006 04:34:22 -0000	1.10
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr
-Version:        0.10
+Version:        0.11
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.bazaar-ng.org/
-Source0:        http://www.bazaar-ng.org/pkg/%{name}-%{version}.tar.gz
+URL:            http://www.bazaar-vcs.org/
+Source0:        http://bazaar-vcs.org/releases/src/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -150,10 +150,18 @@
 %{python_sitelib}/bzrlib/util/effbot/org/*.pyc
 %{python_sitelib}/bzrlib/util/effbot/org/*.pyo
 
+%dir %{python_sitelib}/bzrlib/version_info_formats/
+%{python_sitelib}/bzrlib/version_info_formats/*.py
+%{python_sitelib}/bzrlib/version_info_formats/*.py?
+
 %dir %{python_sitelib}/bzrlib/tests
 %{python_sitelib}/bzrlib/tests/*
 
 %changelog
+* Thu Oct 08 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.11-1
+- Update to 0.11
+- New download location.
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10-1
 - 0.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Sep 2006 02:35:12 -0000	1.6
+++ sources	9 Oct 2006 04:34:22 -0000	1.7
@@ -1 +1 @@
-8a21693efe9b06bed04fa4e8a74b7e83  bzr-0.10.tar.gz
+94fced266d6da6ed298e4738ca7414e0  bzr-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 04:36:30 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun,  8 Oct 2006 21:36:30 -0700
Subject: rpms/bzrtools/devel .cvsignore, 1.5, 1.6 bzrtools.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200610090436.k994aWl2020706@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20685

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
- Update to 0.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Sep 2006 16:20:20 -0000	1.5
+++ .cvsignore	9 Oct 2006 04:36:29 -0000	1.6
@@ -1 +1 @@
-bzrtools-0.10.0.tar.gz
+bzrtools-0.11.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzrtools.spec	17 Sep 2006 16:22:34 -0000	1.9
+++ bzrtools.spec	9 Oct 2006 04:36:29 -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:           bzrtools
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.11.0
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -14,7 +14,7 @@
 BuildArch:      noarch
 BuildRequires:  python
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:   bzr >= 0.10
+Requires:   bzr >= 0.11
 
 %description
 BzrTools is a collection of plugins for Bazaar-NG (bzr).  Among the included
@@ -57,6 +57,9 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.11.0-1
+- Update to 0.11.0
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10.0-2
 - 0.10.0
 
@@ -82,7 +85,7 @@
 - Fix rpmlint non-executable-script errors
 
 * Fri May 12 2006 Shahms E. King <shahms at shahms.com> 0.8.1-1
-- Add COPYING to %doc
+- Add COPYING to %%doc
 - Update to new upstream version
 - Require bzr 0.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Sep 2006 16:20:20 -0000	1.5
+++ sources	9 Oct 2006 04:36:29 -0000	1.6
@@ -1 +1 @@
-2d0aaadded251dc17678034e77f122d6  bzrtools-0.10.0.tar.gz
+8d34615bafbd40518e75509e7d3a8c04  bzrtools-0.11.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 04:38:17 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun,  8 Oct 2006 21:38:17 -0700
Subject: rpms/bzrtools/FC-5 .cvsignore, 1.5, 1.6 bzrtools.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200610090438.k994cJO7020777@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20756

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
- Update to 0.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2006 04:27:08 -0000	1.5
+++ .cvsignore	9 Oct 2006 04:38:16 -0000	1.6
@@ -1 +1 @@
-bzrtools-0.10.0.tar.gz
+bzrtools-0.11.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/bzrtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bzrtools.spec	20 Sep 2006 04:27:08 -0000	1.7
+++ bzrtools.spec	9 Oct 2006 04:38:16 -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:           bzrtools
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.11.0
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -14,7 +14,7 @@
 BuildArch:      noarch
 BuildRequires:  python
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:   bzr >= 0.10
+Requires:   bzr >= 0.11
 
 %description
 BzrTools is a collection of plugins for Bazaar-NG (bzr).  Among the included
@@ -57,6 +57,9 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.11.0-1
+- Update to 0.11.0
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10.0-2
 - 0.10.0
 
@@ -82,7 +85,7 @@
 - Fix rpmlint non-executable-script errors
 
 * Fri May 12 2006 Shahms E. King <shahms at shahms.com> 0.8.1-1
-- Add COPYING to %doc
+- Add COPYING to %%doc
 - Update to new upstream version
 - Require bzr 0.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2006 04:27:08 -0000	1.5
+++ sources	9 Oct 2006 04:38:16 -0000	1.6
@@ -1 +1 @@
-2d0aaadded251dc17678034e77f122d6  bzrtools-0.10.0.tar.gz
+8d34615bafbd40518e75509e7d3a8c04  bzrtools-0.11.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 07:06:21 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon,  9 Oct 2006 00:06:21 -0700
Subject: rpms/yumex/devel yumex.spec,1.36,1.37
Message-ID: <200610090706.k9976NN0030078@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061

Modified Files:
	yumex.spec 
Log Message:
Release 1.1.4-2.0


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- yumex.spec	8 Oct 2006 07:24:22 -0000	1.36
+++ yumex.spec	9 Oct 2006 07:06:21 -0000	1.37
@@ -1,6 +1,6 @@
 Name:     yumex
 Version:  1.1.4
-Release:  1.0%{?dist}
+Release:  2.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -16,7 +16,7 @@
 BuildRequires: intltool
 
 
-Requires: yum >= 3.0.0
+Requires: yum >= 3.0
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -67,7 +67,10 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Wed Oct 7 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-1.0
+* Mon Oct 9 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-2.0
+- Development Release 1.1.4-2.0
+- Updated Requires: yum >= 3.0.0 to yum >= 3.0
+* Sat Oct 7 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-1.0
 - Development Release 1.1.4-1.0
 - Updated Requires: yum >= 2.9.6 to yum >= 3.0.0
 * Wed Sep 6 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.3-1.0



From fedora-extras-commits at redhat.com  Mon Oct  9 07:35:58 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 00:35:58 -0700
Subject: rpms/k3d/devel k3d.spec,1.7,1.8
Message-ID: <200610090736.k997a0OP030212@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195

Modified Files:
	k3d.spec 
Log Message:
Update to 0.6.3.0


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- k3d.spec	4 Oct 2006 22:19:25 -0000	1.7
+++ k3d.spec	9 Oct 2006 07:35:58 -0000	1.8
@@ -1,7 +1,7 @@
 
 Name:           k3d
-Version:        0.6.2.0
-Release:        2%{?dist}
+Version:        0.6.3.0
+Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 0.6.3.0-1
+- Update to 0.6.3.0
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.6.2.0-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Mon Oct  9 07:36:40 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 00:36:40 -0700
Subject: rpms/k3d/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200610090736.k997agbD030249@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30230

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.6.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Sep 2006 22:12:31 -0000	1.5
+++ .cvsignore	9 Oct 2006 07:36:40 -0000	1.6
@@ -1 +1 @@
-k3d-0.6.2.0-src.tar.bz2
+k3d-0.6.3.0-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Sep 2006 22:12:31 -0000	1.5
+++ sources	9 Oct 2006 07:36:40 -0000	1.6
@@ -1 +1 @@
-a896cb31a0077805654ef8485f410e5c  k3d-0.6.2.0-src.tar.bz2
+6c96db4ee5fba3f9e8ccc37aca37d595  k3d-0.6.3.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 08:15:57 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:15:57 -0700
Subject: rpms/cpan2rpm/devel cpan2rpm.spec,1.5,1.6
Message-ID: <200610090815.k998FxoQ000878@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/cpan2rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv861

Modified Files:
	cpan2rpm.spec 
Log Message:
FC6 Rebuild.


Index: cpan2rpm.spec
===================================================================
RCS file: /cvs/extras/rpms/cpan2rpm/devel/cpan2rpm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpan2rpm.spec	24 Feb 2006 10:37:53 -0000	1.5
+++ cpan2rpm.spec	9 Oct 2006 08:15:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           cpan2rpm
 Version:        2.028
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Perl module packager
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 2.028-2
+- FC6 Rebuild
+
 * Fri Feb 24 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 2.028-1
 - New version
 



From fedora-extras-commits at redhat.com  Mon Oct  9 08:17:42 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:17:42 -0700
Subject: rpms/cpan2rpm/devel needs.rebuild,1.1,NONE
Message-ID: <200610090817.k998HiMn000966@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/cpan2rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv951

Removed Files:
	needs.rebuild 
Log Message:
removed needs.rebuild.


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:24:35 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:24:35 -0700
Subject: rpms/listen - New directory
Message-ID: <200610090824.k998Ob5q001046@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1020/listen

Log Message:
Directory /cvs/extras/rpms/listen added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 08:24:35 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:24:35 -0700
Subject: rpms/listen/devel - New directory
Message-ID: <200610090824.k998ObQg001049@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1020/listen/devel

Log Message:
Directory /cvs/extras/rpms/listen/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 08:24:55 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:24:55 -0700
Subject: rpms/listen Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610090824.k998OvI1001095@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1066

Added Files:
	Makefile import.log 
Log Message:
Setup of module listen


--- NEW FILE Makefile ---
# Top level Makefile for module listen
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:24:55 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:24:55 -0700
Subject: rpms/listen/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610090824.k998OvdD001098@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1066/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module listen


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:26:18 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:26:18 -0700
Subject: rpms/listen import.log,1.1,1.2
Message-ID: <200610090826.k998QKYW001174@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1141

Modified Files:
	import.log 
Log Message:
auto-import listen-0.5-3.beta1.fc5 on branch devel from listen-0.5-3.beta1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/listen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Oct 2006 08:24:54 -0000	1.1
+++ import.log	9 Oct 2006 08:26:18 -0000	1.2
@@ -0,0 +1 @@
+listen-0_5-3_beta1_fc5:HEAD:listen-0.5-3.beta1.fc5.src.rpm:1160382389



From fedora-extras-commits at redhat.com  Mon Oct  9 08:26:18 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:26:18 -0700
Subject: rpms/listen/devel listen.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610090826.k998QKcc001179@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1141/devel

Modified Files:
	.cvsignore sources 
Added Files:
	listen.spec 
Log Message:
auto-import listen-0.5-3.beta1.fc5 on branch devel from listen-0.5-3.beta1.fc5.src.rpm


--- NEW FILE listen.spec ---
Name:           listen
Version:        0.5
Release:        3.beta1%{?dist}
Summary:        A music manager and player for GNOME

Group:          Applications/Multimedia
License:        GPL
URL:            http://listengnome.free.fr
Source0:        %name-%{version}b1.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}b1-%{release}-root-%(%{__id_u} -n)


Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig  
Buildrequires: python-devel
BuildRequires: pygtk2-devel 
BuildRequires: gtk2-devel
Buildrequires: pkgconfig
Buildrequires: docbook2X
BuildRequires: gettext
Buildrequires: xorg-x11-server-Xvfb
Buildrequires: xorg-x11-xauth
Buildrequires: xorg-x11-fonts-base
Buildrequires: xorg-x11-fonts-misc
BuildRequires: gstreamer-python
BuildRequires: dbus-python
BuildRequires: python-sqlite2
BuildRequires: python-ctypes
BuildRequires: gnome-python2
BuildRequires: gnome-python2-extras
BuildRequires: gnome-python2-libegg
BuildRequires: python-ogg-devel
BuildRequires: python-vorbis
BuildRequires: python-sexy
BuildRequires: python-mutagen >= 1.6
BuildRequires: desktop-file-utils
# MusicBrainz support
BuildRequires: python-musicbrainz2 
BuildRequires: libtunepimp 
# optional requires an updated libgpod package from Core
#Requires: python-libgpod

%description
Listen is a music manager and player for GNOME
With listen you can:
* Play your favorite songs
* Manage your library
* Manage your ipod
* Make playlists
* Automatically or manually download album covers
* Automatically synchronize album covers with iPod
* Easily burn an audio CD
* Directly get informations from wikipedia when you play a song
* See the lyrics of a song
* Have statistics about your favorite songs, albums or artists
* Listen to web radio
* Submit your songs to Audioscrobbler
* Quick access to last.fm related file
With listen you will be able to:
 * Listen And Rip Audio CDs
 * Browse and listen songs on a DAAP share
 * Share you library via a DAAP share
 * Fill metadata with musicbrainz
 * Make smart playlists


%prep
%setup -q -n %{name}-%{version}b1
# the path is hardcoded in the Makefile
%{__sed} -i 's/local//' Makefile
# Under Fedora dockbook2x-man is renamed db2x_docbook2man
%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile

%build
# (misc) for import gtk, as gtk requires a X server to be imported
XDISPLAY=$(i=2; while [ -f /tmp/.X$i-lock ]; do i=$(($i+1)); done; echo $i)
# added - nolisten tcp -ac -terminate to fix build issue with mock
%{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
export DISPLAY=:$XDISPLAY
xauth add $DISPLAY . EE
make %{?_smp_mflags}



%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
# fixed rights of trackedit.glade thanks to Martin Sourada
chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
desktop-file-install --vendor fedora --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications      \
  --add-category X-Fedora                              \
  --remove-mime-type audio/mp3 \
  --remove-mime-type audio/x-mp3 \
  --remove-mime-type audio/mpeg \
  --remove-mime-type audio/x-mpeg \
  --remove-mime-type audio/mpeg3 \
  --remove-mime-type audio/x-mpeg-3 \
  --remove-mime-type application/x-id3 \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root,-)
%doc gpl.txt
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/%{name}/trackedit.glade
%{_datadir}/%{name}/img/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*.desktop

%changelog
* Sun Nov 08 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-3.beta1
- Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
 some enhancements to the spec (thanks M. Sourada), 

* Thu Nov 05 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5b1-2
- Added gettext and gtk2-devel as BR, fixed build issue with mock

* Fri Sep 08 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5b1-1
- Updated to 0.5 beta 1

* Sun Aug 20 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5.svn20060825-1
- Updated to 0.5.svn20060825 (0.5pre1)

* Thu May 25 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.4.3-4
- Added licence/copyright files and fixed some issues with rpmlint

* Thu May 25 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.4.3-3
- Add some patches to remove the dependency against libmad

* Thu May 25 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.4.3-2
- Some cleaning to the spec

* Thu May 11 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.4.3-1
- First packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Oct 2006 08:24:55 -0000	1.1
+++ .cvsignore	9 Oct 2006 08:26:18 -0000	1.2
@@ -0,0 +1 @@
+listen-0.5b1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Oct 2006 08:24:55 -0000	1.1
+++ sources	9 Oct 2006 08:26:18 -0000	1.2
@@ -0,0 +1 @@
+9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 08:26:33 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:26:33 -0700
Subject: rpms/html-xml-utils/devel html-xml-utils.spec, 1.1,
	1.2 needs.rebuild, 1.1, NONE
Message-ID: <200610090826.k998QZNg001228@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/html-xml-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1211

Modified Files:
	html-xml-utils.spec 
Removed Files:
	needs.rebuild 
Log Message:
FC6 Rebuild.


Index: html-xml-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/html-xml-utils/devel/html-xml-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- html-xml-utils.spec	14 Oct 2005 19:44:33 -0000	1.1
+++ html-xml-utils.spec	9 Oct 2006 08:26:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           html-xml-utils
 Version:        3.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A number of simple utilities for manipulating HTML and XML files
 
 Group:          Development/Tools
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 3.7-4
+- FC6 Rebuild
+
 * Mon Sep 26 2005 Gavin Henry <ghenry[AT]suretecsystems.com> - 3.7-3
 - Added README again, removed NEWS by mistake.
 


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:32:32 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:32:32 -0700
Subject: rpms/john/devel john.spec,1.8,1.9 needs.rebuild,1.1,NONE
Message-ID: <200610090832.k998WYwh001336@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/john/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1319

Modified Files:
	john.spec 
Removed Files:
	needs.rebuild 
Log Message:
FC6 Rebuild.


Index: john.spec
===================================================================
RCS file: /cvs/extras/rpms/john/devel/john.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- john.spec	22 May 2005 23:45:04 -0000	1.8
+++ john.spec	9 Oct 2006 08:32:32 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:          John the Ripper password cracker
 Name:             john
 Version:          1.6
-Release: 4
+Release:          5%{?dist} 
 
 URL:              http://www.openwall.com/john
 License:          GPL
@@ -55,6 +55,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Mon Oct 09 2006 Jeremy Katz <katzj at redhat.com> - 1.6-5
+- FC6 Rebuild
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.6-4
 - rebuild on all arches
 


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 08:34:24 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 01:34:24 -0700
Subject: owners owners.list,1.1801,1.1802
Message-ID: <200610090834.k998YQgt001402@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1385

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1801
retrieving revision 1.1802
diff -u -r1.1801 -r1.1802
--- owners.list	8 Oct 2006 21:34:47 -0000	1.1801
+++ owners.list	9 Oct 2006 08:34:24 -0000	1.1802
@@ -977,6 +977,7 @@
 Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 08:38:40 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:38:40 -0700
Subject: rpms/librsync/devel librsync.spec,1.13,1.14
Message-ID: <200610090838.k998cgbT001490@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/librsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1473

Modified Files:
	librsync.spec 
Log Message:
Another rebuild.


Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- librsync.spec	3 Oct 2006 19:17:07 -0000	1.13
+++ librsync.spec	9 Oct 2006 08:38:40 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry at suretecsystems.com> 0.9.7-8
+- rebuilt
+
 * Tue Oct 03 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-7
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Oct  9 08:45:49 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:45:49 -0700
Subject: rpms/pgadmin3/devel pgadmin3.spec,1.11,1.12
Message-ID: <200610090845.k998jpIi001588@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/pgadmin3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1571

Modified Files:
	pgadmin3.spec 
Log Message:
Rebuild.


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pgadmin3.spec	30 Aug 2006 07:06:19 -0000	1.11
+++ pgadmin3.spec	9 Oct 2006 08:45:49 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
 Version:	1.4.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 License:	Artistic
 Group:		Applications/Databases
@@ -47,6 +47,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry at suretecsystems.com> - 1.4.3-6
+- Rebuild for FC6
+
 * Tue Aug 29 2006 Gavin Henry <ghenry at suretecsystems.com> - 1.4.3-5
 - Should have Developement and keeping this version one ahead for
   upgrading in FC-6



From fedora-extras-commits at redhat.com  Mon Oct  9 08:48:35 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Mon,  9 Oct 2006 01:48:35 -0700
Subject: rpms/Sprog/devel Sprog.spec,1.7,1.8 needs.rebuild,1.1,NONE
Message-ID: <200610090848.k998mbOa001674@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/Sprog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1657

Modified Files:
	Sprog.spec 
Removed Files:
	needs.rebuild 
Log Message:
Rebuild for FC6


Index: Sprog.spec
===================================================================
RCS file: /cvs/extras/rpms/Sprog/devel/Sprog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Sprog.spec	1 Mar 2006 10:57:55 -0000	1.7
+++ Sprog.spec	9 Oct 2006 08:48:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -78,6 +78,9 @@
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Mon Oct 09 2006 Gavin Henry <ghenry at suretecsystems.com> - 0.14-12
+- Rebuild for FC6  
+
 * Wed Mar 01 2006 Gavin Henry <ghenry at suretecsystems.com> - 0.14-11
 - Added perl(Imager)  
 


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 09:02:02 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:02:02 -0700
Subject: rpms/listen/devel listen.spec,1.1,1.2
Message-ID: <200610090902.k9992YoE004643@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4619

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listen.spec	9 Oct 2006 08:26:18 -0000	1.1
+++ listen.spec	9 Oct 2006 09:02:02 -0000	1.2
@@ -85,8 +85,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \



From fedora-extras-commits at redhat.com  Mon Oct  9 09:10:54 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:10:54 -0700
Subject: rpms/listen/devel listen.spec,1.2,1.3
Message-ID: <200610090910.k999Aus7004839@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- listen.spec	9 Oct 2006 09:02:02 -0000	1.2
+++ listen.spec	9 Oct 2006 09:10:54 -0000	1.3
@@ -85,8 +85,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT/lib/%{name}/mmkeys.so
+chmod +x $RPM_BUILD_ROOT/lib/%{name}/listen.py
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \



From fedora-extras-commits at redhat.com  Mon Oct  9 09:18:13 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:18:13 -0700
Subject: rpms/listen/devel listen.spec,1.3,1.4
Message-ID: <200610090918.k999IF87004914@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4893

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- listen.spec	9 Oct 2006 09:10:54 -0000	1.3
+++ listen.spec	9 Oct 2006 09:18:13 -0000	1.4
@@ -85,8 +85,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT/lib/%{name}/mmkeys.so
-chmod +x $RPM_BUILD_ROOT/lib/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \



From fedora-extras-commits at redhat.com  Mon Oct  9 09:30:51 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:30:51 -0700
Subject: rpms/listen/devel listen.spec,1.4,1.5
Message-ID: <200610090930.k999Urgd005007@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4990

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- listen.spec	9 Oct 2006 09:18:13 -0000	1.4
+++ listen.spec	9 Oct 2006 09:30:51 -0000	1.5
@@ -85,8 +85,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
+chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \



From fedora-extras-commits at redhat.com  Mon Oct  9 09:39:42 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 02:39:42 -0700
Subject: rpms/listen/devel listen.spec,1.5,1.6
Message-ID: <200610090939.k999diLE005079@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5062

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- listen.spec	9 Oct 2006 09:30:51 -0000	1.5
+++ listen.spec	9 Oct 2006 09:39:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        3.beta1%{?dist}
+Release:        4.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -114,13 +114,16 @@
 %defattr(-,root,root,-)
 %doc gpl.txt
 %{_bindir}/%{name}
-%{_libdir}/%{name}/
+%{_prefix}/lib/%{name}/
 %{_datadir}/%{name}/trackedit.glade
 %{_datadir}/%{name}/img/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-4.beta1
+- fixed build issue on x86_64
+
 * Sun Nov 08 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 



From fedora-extras-commits at redhat.com  Mon Oct  9 10:09:01 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  9 Oct 2006 03:09:01 -0700
Subject: fedora-security/audit fc5,1.348,1.349
Message-ID: <200610091009.k99A91fi008142@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8124

Modified Files:
	fc5 
Log Message:
Weekend updates (only mono)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- fc5	6 Oct 2006 08:23:10 -0000	1.348
+++ fc5	9 Oct 2006 10:08:58 -0000	1.349
@@ -1,5 +1,5 @@
-p to date CVE as of CVE email 20061005
-Up to date FC5 as of 20061005
+p to date CVE as of CVE email 20061008
+Up to date FC5 as of 20061008
 
 ** are items that need attention
 
@@ -9,7 +9,7 @@
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 ** kernel
-CVE-2006-5072 VULNERABLE (mono) #209464
+CVE-2006-5072 backport (mono) #209464 [since FEDORA-2006-1012]
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)



From fedora-extras-commits at redhat.com  Mon Oct  9 10:31:30 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 03:31:30 -0700
Subject: rpms/listen/devel listen.spec,1.6,1.7
Message-ID: <200610091031.k99AVW2Q009002@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8972

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- listen.spec	9 Oct 2006 09:39:41 -0000	1.6
+++ listen.spec	9 Oct 2006 10:31:30 -0000	1.7
@@ -85,8 +85,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/listen.py
-chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/mmkeys.so
+%ifarch x86_64
+mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}
+%endif
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/trackedit.glade
 desktop-file-install --vendor fedora --delete-original \
@@ -114,7 +117,7 @@
 %defattr(-,root,root,-)
 %doc gpl.txt
 %{_bindir}/%{name}
-%{_prefix}/lib/%{name}/
+%{_libdir}/%{name}/
 %{_datadir}/%{name}/trackedit.glade
 %{_datadir}/%{name}/img/
 %{_datadir}/pixmaps/%{name}.png



From fedora-extras-commits at redhat.com  Mon Oct  9 10:40:21 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 03:40:21 -0700
Subject: rpms/listen/devel listen.spec,1.7,1.8
Message-ID: <200610091040.k99AeNJ3010296@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10262

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- listen.spec	9 Oct 2006 10:31:30 -0000	1.7
+++ listen.spec	9 Oct 2006 10:40:20 -0000	1.8
@@ -86,7 +86,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %ifarch x86_64
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}
+mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
 %endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so



From fedora-extras-commits at redhat.com  Mon Oct  9 10:54:55 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 03:54:55 -0700
Subject: rpms/listen/devel listen.spec,1.8,1.9
Message-ID: <200610091054.k99AsvIm012428@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12399

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- listen.spec	9 Oct 2006 10:40:20 -0000	1.8
+++ listen.spec	9 Oct 2006 10:54:55 -0000	1.9
@@ -86,6 +86,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %ifarch x86_64
+mkdir $RPM_BUILD_ROOT%{_libdir}/
 mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
 %endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py



From fedora-extras-commits at redhat.com  Mon Oct  9 11:03:28 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Mon,  9 Oct 2006 04:03:28 -0700
Subject: rpms/listen/devel listen.spec,1.9,1.10
Message-ID: <200610091103.k99B3wjF016635@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16535

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- listen.spec	9 Oct 2006 10:54:55 -0000	1.9
+++ listen.spec	9 Oct 2006 11:03:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        4.beta1%{?dist}
+Release:        5.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -125,8 +125,11 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-5.beta1
+- Moved /usr/lib/listen to /usr/lib64 on x86_64
+
 * Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-4.beta1
-- fixed build issue on x86_64
+- Fixed build issue on x86_64
 
 * Sun Nov 08 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,



From fedora-extras-commits at redhat.com  Mon Oct  9 11:18:54 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  9 Oct 2006 04:18:54 -0700
Subject: owners owners.list,1.1802,1.1803
Message-ID: <200610091118.k99BIuvT018938@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18877

Modified Files:
	owners.list 
Log Message:
sysprof - add upstream to initial CC list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1802
retrieving revision 1.1803
diff -u -r1.1802 -r1.1803
--- owners.list	9 Oct 2006 08:34:24 -0000	1.1802
+++ owners.list	9 Oct 2006 11:18:54 -0000	1.1803
@@ -2109,8 +2109,8 @@
 Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|sysconftool|Macros for aclocal to install configuration files|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
-Fedora Extras|sysprof|A sampling CPU profiler|giallu at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|sysprof-kmod|Sysprof kernel module|giallu at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|sysprof|A sampling CPU profiler|giallu at gmail.com|extras-qa at fedoraproject.org|sandmann at daimi.au.dk
+Fedora Extras|sysprof-kmod|Sysprof kernel module|giallu at gmail.com|extras-qa at fedoraproject.org|sandmann at daimi.au.dk
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ankit644 at yahoo.com
 Fedora Extras|t1lib|PostScript Type 1 font rasterizer|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt



From fedora-extras-commits at redhat.com  Mon Oct  9 11:21:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  9 Oct 2006 04:21:51 -0700
Subject: rpms/ClanLib/devel ClanLib-0.8.0-fullscreen.patch, NONE,
	1.1 ClanLib.spec, 1.7, 1.8
Message-ID: <200610091121.k99BLrbT019444@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19416

Modified Files:
	ClanLib.spec 
Added Files:
	ClanLib-0.8.0-fullscreen.patch 
Log Message:
* Sun Oct  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-3
- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
  window decoration show in fullscreen mode on certain videocards


ClanLib-0.8.0-fullscreen.patch:

--- NEW FILE ClanLib-0.8.0-fullscreen.patch ---
--- ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.h.fs	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.h	2006-10-08 21:45:19.000000000 +0200
@@ -195,20 +195,9 @@
 
 	//: X Event handler for the window
 	void on_xevent(XEvent &event);
-
-	//: True if currently in full screen mode.
-	bool fullscreen;
-
-	//: Width and height, if in full screen mode.
-	int fullscreen_width, fullscreen_height;
-
-	//: Bits per pixel in the openGL Context.
-	//: May not correspond to bit depth on screen
-	int glx_bpp;
-
-	//: Saved position of window when going fullscreen. This is the
-	//: position the window receives when leaving fullscreen again.
-	CL_Rect saved_position;
+	
+	//: Change resolution for fullscreen mode
+	void set_resolution();
 
 	// OpenGL compatible gc.
 	CL_GraphicContext gc;
@@ -221,19 +210,39 @@
 
 	static int disp_ref_count;
 
-	//: Handle to X11 window.
+	// We use 3 windows:
+	// -fs_window (for fullscreen)
+	// -wm_window (window managed)
+	// -window    (the real window)
+	// 2 of which will be created in create_window: wm_window and window.
+	// The fullscreen window gets (re)created when needed, because reusing
+	// it causes trouble.
+	// The real window uses wm_window as parent initially and will be
+	// reparened to the (freshly created) fullscreen window when requested
+	// and reparented back again when going back to windowed mode.
+	// Idea / concept of 3 windows borrowed from SDL. But somehow SDL
+	// manages to reuse the fullscreen window too.
 	Window window;
-
-	//: Attributes used to create window.
-	XSetWindowAttributes attributes;
+	Window wm_window;
+	Window fs_window;
 	
+	// width and height of the drawing window as specified by
+	// the caller, or as reported after a resize by the windowmanager
+	int width;
+	int height;
+
 	//: Whether we have window focus or not
 	bool focus;
+	
+	//: Is resizing allowed?
+	bool allow_resize;
 
 	//: Attributes to switch between windowed and fullscreen
 	int dotclock;
 	XF86VidModeModeInfo old_mode;
 	int old_x, old_y;
+	XVisualInfo *vi;
+	Colormap cmap;
 
 	//: X Event slot
 	CL_Slot slot_xevent;
--- ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.cpp.fs	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.cpp	2006-10-08 22:15:27.000000000 +0200
@@ -65,18 +65,15 @@
 CL_DisplayWindow_OpenGL::CL_DisplayWindow_OpenGL() :
 	left_ctrl_down(false), left_alt_down(false), left_shift_down(false),
 	right_ctrl_down(false), right_alt_down(false), right_shift_down(false),
-	fullscreen(false), fullscreen_width(0), fullscreen_height(0),
-	saved_position(0, 0, 0, 0),
 	context(0),
-	window(0)
+	window(None), wm_window(None), fs_window(None), width(0), height(0),
+	old_x(-1), old_y(-1)
 {
 	gc = CL_GraphicContext(new CL_GraphicContext_OpenGL(this));
 }
 
 CL_DisplayWindow_OpenGL::~CL_DisplayWindow_OpenGL()
 {
-	if(fullscreen)
-		set_windowed();
 	destroy_window();
 }
 
@@ -85,23 +82,17 @@
 
 int CL_DisplayWindow_OpenGL::get_width() const
 {
-	XWindowAttributes attr;
-	XGetWindowAttributes(disp, window, &attr);
-
-	return attr.width;
+	return width;
 }
 
 int CL_DisplayWindow_OpenGL::get_height() const
 {
-	XWindowAttributes attr;
-	XGetWindowAttributes(disp, window, &attr);
-
-	return attr.height;
+	return height;
 }
 
 bool CL_DisplayWindow_OpenGL::is_fullscreen() const
 {
-	return fullscreen;
+	return fs_window != None;
 }
 
 bool CL_DisplayWindow_OpenGL::has_focus() const
@@ -151,11 +142,9 @@
 	const CL_OpenGLWindowDescription_Generic *gl_desc = 0;
 	gl_desc = dynamic_cast<const CL_OpenGLWindowDescription_Generic*>(desc.impl.get());
 
-	fullscreen_width  = desc.get_size().width;
-	fullscreen_height = desc.get_size().height;
-
-	XVisualInfo *vi;
-	Colormap cmap;
+	width  = desc.get_size().width;
+	height = desc.get_size().height;
+	allow_resize = desc.get_allow_resize();
 
 	if (disp == 0)
 	{
@@ -230,7 +219,7 @@
 	
 	if (vi == NULL)
 	{
-		vi = glXChooseVisual(disp, window, gl_attribs_single);
+		vi = glXChooseVisual(disp, DefaultScreen(disp), gl_attribs_single);
 		printf("Requested visual not supported by your OpenGL implementation. Falling back on singlebuffered Visual!\n");
 	}
 
@@ -240,16 +229,17 @@
 	if( share_context == NULL )
 		share_context = context;
 
-	glXGetConfig(disp, vi, GLX_BUFFER_SIZE, &glx_bpp);
-
 	// create a color map
 	cmap = XCreateColormap( disp, RootWindow(disp, vi->screen), vi->visual, AllocNone);
 
+	XSetWindowAttributes attributes;
+
 	attributes.colormap = cmap;
+	attributes.background_pixel = XBlackPixel(disp, vi->screen);
 	attributes.border_pixel = 0;
 	attributes.override_redirect = False;
 
-	// create a window in window mode
+	// create a managed window
 	attributes.event_mask =
 		ExposureMask |
 		KeyPressMask |
@@ -258,18 +248,20 @@
 		ButtonReleaseMask |
 		StructureNotifyMask |
 		PointerMotionMask |
-		EnterWindowMask |
-		LeaveWindowMask |
+		PropertyChangeMask |
+		KeymapStateMask |
 		FocusChangeMask;
 
-	window = XCreateWindow(disp, RootWindow(disp, vi->screen),
-		0, 0, desc.get_size().width, desc.get_size().height, 0, vi->depth, InputOutput, vi->visual,
-		CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
-	
-	XSelectInput(disp, window,
-		FocusChangeMask | KeyPressMask | KeyReleaseMask
-		| PropertyChangeMask | StructureNotifyMask |
-		KeymapStateMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask);
+	wm_window = XCreateWindow(disp, RootWindow(disp, vi->screen),
+		0, 0, width, height, 0, vi->depth, InputOutput, vi->visual,
+		CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
+	
+	window = XCreateWindow(disp, wm_window,
+		0, 0, width, height, 0, vi->depth, InputOutput, vi->visual,
+		CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
+	
+	// Map the real / drawing window it won't appear untill the parent does
+	XMapWindow(disp, window);
 
 	// set title of window:
 	set_title(desc.get_title());
@@ -277,24 +269,24 @@
 	// setup size hints:
 	XSizeHints size_hints;
 	memset(&size_hints, 0, sizeof(XSizeHints));
-	size_hints.width       = desc.get_size().width;
-	size_hints.height      = desc.get_size().height;
-	size_hints.base_width  = desc.get_size().width;
-	size_hints.base_height = desc.get_size().height;
-	size_hints.min_width   = size_hints.width;
-	size_hints.min_height  = size_hints.height;
-	size_hints.max_width   = size_hints.width;
-	size_hints.max_height  = size_hints.height;
+	size_hints.width       = width;
+	size_hints.height      = height;
+	size_hints.base_width  = width;
+	size_hints.base_height = height;
+	size_hints.min_width   = width;
+	size_hints.min_height  = height;
+	size_hints.max_width   = width;
+	size_hints.max_height  = height;
 	size_hints.flags       = PSize|PBaseSize;
-	if (!desc.get_allow_resize()) size_hints.flags |= PMinSize | PMaxSize;
-	XSetWMNormalHints(disp, window, &size_hints);
+	if (!allow_resize) size_hints.flags |= PMinSize | PMaxSize;
+	XSetWMNormalHints(disp, wm_window, &size_hints);
 
 	// handle wm_delete_events if in windowed mode:
 	Atom wm_delete = XInternAtom(disp, "WM_DELETE_WINDOW", True);
-	XSetWMProtocols(disp, window, &wm_delete, 1);
+	XSetWMProtocols(disp, wm_window, &wm_delete, 1);
 
-	// make window visible:
-	XMapRaised(disp, window);
+	// make the managed window visible (and thus the real one too):
+	XMapRaised(disp, wm_window);
 
 	if (!glXIsDirect(disp, context))
 		printf("No hardware acceleration available. I hope you got a really fast machine..\n");
@@ -327,7 +319,7 @@
 	hidden_cursor = XCreatePixmapCursor(disp, cursor_bitmap, cursor_bitmap, &black_color, &black_color, 0,0 );
 	
 	if (desc.is_fullscreen())
-		set_fullscreen(desc.get_size().width, desc.get_size().height, desc.get_bpp(), desc.get_refresh_rate());
+		set_fullscreen(width, height, desc.get_bpp(), desc.get_refresh_rate());
 }
 
 void
@@ -476,7 +468,8 @@
 
 void CL_DisplayWindow_OpenGL::destroy_window()
 {
-	set_windowed();
+	if(fs_window != None)
+		set_windowed();
 
 	if (context)
 	{
@@ -493,8 +486,16 @@
 	mouse = CL_InputDevice();
 	get_ic()->clear();
 
-	if (window) XDestroyWindow(disp, window);
-	window = 0;
+	if (window != None)
+	{
+		XDestroyWindow(disp, window);
+		window = None;
+	}
+	if (wm_window != None)
+	{
+		XDestroyWindow(disp, wm_window);
+		wm_window = None;
+	}
 	
 	if (disp_ref_count > 0)
 	{
@@ -502,7 +503,7 @@
 		if (disp_ref_count == 0)
 		{
 			XCloseDisplay(disp);
-			disp = 0;
+			disp = NULL;
 		}
 	}
 }
@@ -530,180 +531,234 @@
 	glXSwapBuffers(disp, window);
 }
 
-void CL_DisplayWindow_OpenGL::set_fullscreen(int width, int height, int bpp, int refresh_rate)
+/* qsort comparison function for sorting the modes */
+static int cmpmodes(const void *va, const void *vb)
 {
-	if(fullscreen)
-		return;
-
-	// Vid-mode Switching
-	XF86VidModeModeLine cur_mode;
-
-	XF86VidModeGetModeLine(disp, 0, &dotclock, &cur_mode);
-
-	old_mode.dotclock   = dotclock;
-	old_mode.hdisplay   = cur_mode.hdisplay;
-	old_mode.hsyncstart = cur_mode.hsyncstart;
-	old_mode.hsyncend   = cur_mode.hsyncend;
-	old_mode.htotal     = cur_mode.htotal;
-	old_mode.vdisplay   = cur_mode.vdisplay;
-	old_mode.vsyncstart = cur_mode.vsyncstart;
-	old_mode.vsyncend   = cur_mode.vsyncend;
-	old_mode.vtotal     = cur_mode.vtotal;
-	old_mode.flags      = cur_mode.flags;
-	old_mode.privsize   = 0;
+	const XF86VidModeModeInfo *a = *(const XF86VidModeModeInfo **)va;
+	const XF86VidModeModeInfo *b = *(const XF86VidModeModeInfo **)vb;
+	if ( a->hdisplay == b->hdisplay )
+		return b->vdisplay - a->vdisplay;  
+	else
+		return b->hdisplay - a->hdisplay;
+}
 
-	int num_modes;
+void CL_DisplayWindow_OpenGL::set_resolution(void)
+{
+	int i, dotclock, mode_count, fs_width, fs_height;
 	XF86VidModeModeInfo **modes;
-	XF86VidModeGetAllModeLines(disp, 0, &num_modes, &modes);
+	XF86VidModeModeLine current_mode;
 
-	std::list<XF86VidModeModeInfo *> usable_modes;
-	for(int i = 0; i < num_modes; i++)
-	{
-		if(modes[i]->hdisplay == width && modes[i]->vdisplay == height)
-		{
-			CL_Log::log("debug", "Useable fullscreen mode found: %1x%2", width, height);
-			usable_modes.push_back(modes[i]);
-		}
-	}
-	
-	if (usable_modes.empty())
-	{
-		CL_Log::log("debug", "No useable fullscreen modes available!");
+	current_mode.privsize = 0;
+	XF86VidModeGetModeLine(disp, vi->screen, &dotclock, &current_mode);
+	if (!XF86VidModeGetAllModeLines(disp, 0, &mode_count, &modes))
+		mode_count = 0;
+
+	/* Search for an exact matching video mode.  */
+	for (i = 0; i < mode_count; i++) {
+		if ((modes[i]->hdisplay == width) && 
+		    (modes[i]->vdisplay == height))
+			break;
 	}
-	else 
-	{	
-		if(!width)
-			width = get_width();
-
-		if(!height)
-			height = get_height();
-	
-		if(!bpp)
-			bpp = glx_bpp;
-
-		//Hide Window
-		if (0)
-		{  // FIXME: allow_override doesn't play together with
-			// GrabPointer, not sure what is wrong but it simply doesn't
-			// work.
-			//
-			// The code outside the 'if(0)' as it is now, works mostly,
-			// however it doesn't work when the window or a part of it is
-			// outside of the screen, since the window isn't moved
-			// fullscreen will only show half the window, shouldn't be a
-			// problem for most of the time, but will be tricky if the
-			// window has equal size as the desktop.
 
-			// Move the window into the right position, this must happen
-			// BEFORE we remove control from the window manager
-			XMoveResizeWindow(disp, window, 0, 0, width, height);
-
-			// Move the mouse and switch moves
-			XWarpPointer(disp, None, None, 0, 0, 0, 0, width/2, height/2);
-
-			XUnmapWindow(disp, window);
-			{ // Wait for window to disapear
-				XEvent event;
-				do {
-					XMaskEvent(disp, StructureNotifyMask, &event);
-				} while ( (event.type != UnmapNotify) || (event.xunmap.event != window) );
+	/* Search for a non exact match (smallest bigger res). */
+	if (i == mode_count) {
+		int best_width = 0, best_height = 0;
+		qsort(modes, mode_count, sizeof(void *), cmpmodes);
+		for (i = mode_count-1; i > 0; i--) {
+			if ( ! best_width ) {
+				if ( (modes[i]->hdisplay >= width) &&
+				     (modes[i]->vdisplay >= height) ) {
+					best_width = modes[i]->hdisplay;
+					best_height = modes[i]->vdisplay;
+				}
+			} else {
+				if ( (modes[i]->hdisplay != best_width) ||
+				     (modes[i]->vdisplay != best_height) ) {
+					i++;
+					break;
+				}
 			}
-			// Turn off WM control
-			attributes.override_redirect = True;
-			XChangeWindowAttributes(disp, window, CWBorderPixel | CWColormap | CWOverrideRedirect, &attributes);
-
-			// Re-appear window
-			XMapRaised(disp, window);
 		}
+	}
 
-		// Get input focus
-		//XSetInputFocus(disp,window, RevertToNone, CurrentTime);
-		while (1) 
+	/* Switch video mode */
+	if (i >= 0)
+	{
+		if ((modes[i]->hdisplay != current_mode.hdisplay) ||
+		    (modes[i]->vdisplay != current_mode.vdisplay))
 		{
-			int result = XGrabPointer(disp, window, True, 0, 
-											  GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
-			if ( result == GrabSuccess ) {
-				break;
+			if (old_x == -1 && old_y == -1)
+			{
+				XF86VidModeModeLine *l =
+					(XF86VidModeModeLine *)((char *)
+						&old_mode +
+						sizeof(old_mode.dotclock));
+				*l = current_mode;
+				old_mode.dotclock = dotclock;
+				XF86VidModeGetViewPort(disp, vi->screen,
+					&old_x, &old_y);
 			}
-			CL_System::sleep(100);
+			XF86VidModeSwitchToMode(disp, vi->screen,
+				modes[i]);
 		}
+		fs_width  = modes[i]->hdisplay;
+		fs_height = modes[i]->vdisplay;
+	}
+	else
+	{
+		fs_width  = DisplayWidth(disp, vi->screen);
+		fs_height = DisplayHeight(disp, vi->screen);
+	}
 
-		XF86VidModeGetViewPort(disp, DefaultScreen(disp), &old_x, &old_y);
-
-		XF86VidModeSwitchToMode(disp, 0, *(usable_modes.begin()));
-		Window child_window;
-		int x, y;
-		// Get the windows absolute position (aka relative to
-		// the root window)
-		XTranslateCoordinates(disp, window, DefaultRootWindow(disp), 
-									 0, 0, &x, &y, &child_window);
-	
-		XF86VidModeSetViewPort(disp, DefaultScreen(disp), x, y);
-		
-		XSync(disp, True);
-
-		fullscreen = true;
+	/* center window */
+	XMoveWindow(disp, window, (fs_width - width) / 2,
+		(fs_height - height) / 2);
+
+	/* Lock mode switching.  */
+	XF86VidModeLockModeSwitch(disp, vi->screen, True);
+	       
+	/* Set viewport. */
+	XF86VidModeSetViewPort(disp, vi->screen, 0, 0);
+
+	/* clean up */
+	if (current_mode.privsize)
+	  XFree(current_mode.c_private);
+
+	if (mode_count)
+	{
+	  for (i = 0; i < mode_count; i++)
+	    if (modes[i]->privsize)
+	      XFree(modes[i]->c_private);
+	  XFree(modes);
 	}
 }
 
-void CL_DisplayWindow_OpenGL::set_windowed()
+void CL_DisplayWindow_OpenGL::set_fullscreen(int width, int height, int bpp, int refresh_rate)
 {
-	if(!fullscreen)
+	if(!width)
+		width = this->width;
+	if(!height)
+		height = this->height;
+		
+	set_size(width, height);
+	
+	if(fs_window != None)
+	{
+		set_resolution();
 		return;
+	}
 
-	if (0)
-	{ // FIXME: See FIXME in set_fullscreen
-		// Hide window
-		XUnmapWindow(disp, window);
-		XSync(disp, True);
-
-		// Turn on WM control 
-		attributes.override_redirect = False;
-		XChangeWindowAttributes(disp, window, CWBorderPixel | CWColormap | CWOverrideRedirect, &attributes);
-
-		XMoveResizeWindow(disp, window, 0, 0, fullscreen_width, fullscreen_height);
+	/* Create the fullscreen window */
+	XSetWindowAttributes attributes;
+	XEvent event;
+
+	attributes.override_redirect = True;
+	attributes.background_pixel = XBlackPixel(disp, vi->screen);
+	attributes.border_pixel = XBlackPixel(disp, vi->screen);
+	attributes.event_mask = StructureNotifyMask;
+	attributes.colormap = cmap;
 
-		XMapRaised(disp, window);
-		XSync(disp, True);
+	fs_window = XCreateWindow(disp, RootWindow(disp, vi->screen),
+	                             0, 0,
+	                             DisplayWidth(disp, vi->screen),
+	                             DisplayHeight(disp, vi->screen), 0,
+	                             vi->depth, InputOutput,
+	                             vi->visual, CWOverrideRedirect |
+	                             CWBackPixel | CWColormap | CWBorderPixel |
+	                             CWEventMask, &attributes);
+
+	/* Map the fullscreen window */
+	XMapRaised(disp, fs_window);
+	/* wait until we are mapped. (shamelessly borrowed from SDL) */
+	do {
+	  XMaskEvent(disp, StructureNotifyMask, &event); 
+	} while ( (event.type != MapNotify) || 
+	          (event.xmap.event != fs_window) );
+	/* Make sure we got to the top of the window stack */
+	XRaiseWindow(disp, fs_window);
+	
+	/* Reparent the real window */
+	XReparentWindow(disp, window, fs_window, 0, 0);
+
+	// Get input focus
+	//XSetInputFocus(disp,window, RevertToNone, CurrentTime);
+	while (1) 
+	{
+		int result = XGrabPointer(disp, window, True, 0, 
+										  GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
+		if ( result == GrabSuccess ) {
+			break;
+		}
+		CL_System::sleep(100);
 	}
 
-	fullscreen = false;
+	set_resolution();
+}
+
+void CL_DisplayWindow_OpenGL::set_windowed()
+{
+	if(fs_window == None)
+		return;
 
 	// Only restore mode if we ever switched mode.
 	if (old_x != -1 || old_y != -1)
 	{
-		XF86VidModeSwitchToMode(disp, 0, &old_mode);
-		XF86VidModeSetViewPort(disp, 0, old_x, old_y);
+		XF86VidModeSwitchToMode(disp, vi->screen, &old_mode);
+		XF86VidModeSetViewPort(disp, vi->screen, old_x, old_y);
+		old_x = old_y = -1;
 	}
 
 	XUngrabPointer(disp, CurrentTime);
 
-	XSync(disp, True);
+	/* Reparent the real window! */
+	XReparentWindow(disp, window, wm_window, 0, 0);
+	XUnmapWindow(disp, fs_window);
+	XDestroyWindow(disp, fs_window);
+	fs_window = None;
 }
 
 void CL_DisplayWindow_OpenGL::set_title(const std::string &title)
 {
-	XSetStandardProperties(disp, window, title.c_str(), title.c_str(), None, NULL, 0, NULL);
+	XSetStandardProperties(disp, wm_window, title.c_str(), title.c_str(), None, NULL, 0, NULL);
 }
 
 void CL_DisplayWindow_OpenGL::set_position(const CL_Rect &pos)
 {
 	set_position(pos.left, pos.top);
-	XResizeWindow(disp, window, pos.get_width(), pos.get_height());
 	set_size(pos.get_width(), pos.get_height());
 }
 
 void CL_DisplayWindow_OpenGL::set_position(int x, int y)
 {
-	XMoveWindow(disp, window, x, y);
+	XMoveWindow(disp, wm_window, x, y);
 }
 
 void CL_DisplayWindow_OpenGL::set_size(int width, int height)
 {
-	fullscreen_width = width;
-	fullscreen_height = height;
+	if((width == this->width) && (height == this->height))
+		return;
 
-	sig_resize(width, height);
+	// in order to resize a non resizable window we must change the hints
+	// as the window manager won't allow the resize otherwise.
+	if (!allow_resize)
+	{
+		XSizeHints size_hints;
+		memset(&size_hints, 0, sizeof(XSizeHints));
+		size_hints.width       = width;
+		size_hints.height      = height;
+		size_hints.base_width  = width;
+		size_hints.base_height = height;
+		size_hints.min_width   = width;
+		size_hints.min_height  = height;
+		size_hints.max_width   = width;
+		size_hints.max_height  = height;
+		size_hints.flags       = PSize|PBaseSize|PMinSize|PMaxSize;
+		XSetWMNormalHints(disp, wm_window, &size_hints);
+	}
+	XResizeWindow(disp, wm_window, width, height);
+	XResizeWindow(disp, window, width, height);
+	this->width  = width;
+	this->height = height;
 }
 
 void CL_DisplayWindow_OpenGL::set_buffer_count(int flipping_buffers)
@@ -772,7 +827,16 @@
 				#ifdef DEBUG
 					CL_Log::log("debug", "ConfigureNotify Event received");
 				#endif
-				set_size(event.xconfigure.width,event.xconfigure.height);
+				if (event.xconfigure.window == wm_window &&
+				    (event.xconfigure.width  != width ||
+				     event.xconfigure.height != height))
+				{
+					width  = event.xconfigure.width;
+					height = event.xconfigure.height;
+					XResizeWindow(disp, window, width,
+						 height);
+					sig_resize(event.xconfigure.width, event.xconfigure.height);
+				}
 				break;
 			case ClientMessage:
 				#ifdef DEBUG



Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClanLib.spec	28 Aug 2006 05:00:40 -0000	1.7
+++ ClanLib.spec	9 Oct 2006 11:21:51 -0000	1.8
@@ -1,11 +1,12 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          System Environment/Libraries
 License:        zlib License
 URL:            http://www.clanlib.org/
 Source0:        http://www.clanlib.org/download/releases-0.8/%{name}-%{version}.tgz
+Patch0:         ClanLib-0.8.0-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .fs 
 # fixup pc files
 sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in
 sed -i 's|Libs:   -L${libdir}|Libs:   -L${libdir}/%{name}-0.8|' \
@@ -80,6 +82,10 @@
 
 
 %changelog
+* Sun Oct  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-3
+- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
+  window decoration show in fullscreen mode on certain videocards
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-2
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct  9 11:49:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  9 Oct 2006 04:49:54 -0700
Subject: rpms/ClanLib/FC-5 ClanLib-0.8.0-fullscreen.patch, NONE,
	1.1 ClanLib.spec, 1.6, 1.7
Message-ID: <200610091149.k99Bnuja024202@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24174

Modified Files:
	ClanLib.spec 
Added Files:
	ClanLib-0.8.0-fullscreen.patch 
Log Message:
* Mon Oct  9 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.7.RC2
- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
  window decoration is shown in fullscreen mode on certain videocards


ClanLib-0.8.0-fullscreen.patch:

--- NEW FILE ClanLib-0.8.0-fullscreen.patch ---
--- ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.h.fs	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.h	2006-10-08 21:45:19.000000000 +0200
@@ -195,20 +195,9 @@
 
 	//: X Event handler for the window
 	void on_xevent(XEvent &event);
-
-	//: True if currently in full screen mode.
-	bool fullscreen;
-
-	//: Width and height, if in full screen mode.
-	int fullscreen_width, fullscreen_height;
-
-	//: Bits per pixel in the openGL Context.
-	//: May not correspond to bit depth on screen
-	int glx_bpp;
-
-	//: Saved position of window when going fullscreen. This is the
-	//: position the window receives when leaving fullscreen again.
-	CL_Rect saved_position;
+	
+	//: Change resolution for fullscreen mode
+	void set_resolution();
 
 	// OpenGL compatible gc.
 	CL_GraphicContext gc;
@@ -221,19 +210,39 @@
 
 	static int disp_ref_count;
 
-	//: Handle to X11 window.
+	// We use 3 windows:
+	// -fs_window (for fullscreen)
+	// -wm_window (window managed)
+	// -window    (the real window)
+	// 2 of which will be created in create_window: wm_window and window.
+	// The fullscreen window gets (re)created when needed, because reusing
+	// it causes trouble.
+	// The real window uses wm_window as parent initially and will be
+	// reparened to the (freshly created) fullscreen window when requested
+	// and reparented back again when going back to windowed mode.
+	// Idea / concept of 3 windows borrowed from SDL. But somehow SDL
+	// manages to reuse the fullscreen window too.
 	Window window;
-
-	//: Attributes used to create window.
-	XSetWindowAttributes attributes;
+	Window wm_window;
+	Window fs_window;
 	
+	// width and height of the drawing window as specified by
+	// the caller, or as reported after a resize by the windowmanager
+	int width;
+	int height;
+
 	//: Whether we have window focus or not
 	bool focus;
+	
+	//: Is resizing allowed?
+	bool allow_resize;
 
 	//: Attributes to switch between windowed and fullscreen
 	int dotclock;
 	XF86VidModeModeInfo old_mode;
 	int old_x, old_y;
+	XVisualInfo *vi;
+	Colormap cmap;
 
 	//: X Event slot
 	CL_Slot slot_xevent;
--- ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.cpp.fs	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/GL/GLX/display_window_opengl.cpp	2006-10-08 22:15:27.000000000 +0200
@@ -65,18 +65,15 @@
 CL_DisplayWindow_OpenGL::CL_DisplayWindow_OpenGL() :
 	left_ctrl_down(false), left_alt_down(false), left_shift_down(false),
 	right_ctrl_down(false), right_alt_down(false), right_shift_down(false),
-	fullscreen(false), fullscreen_width(0), fullscreen_height(0),
-	saved_position(0, 0, 0, 0),
 	context(0),
-	window(0)
+	window(None), wm_window(None), fs_window(None), width(0), height(0),
+	old_x(-1), old_y(-1)
 {
 	gc = CL_GraphicContext(new CL_GraphicContext_OpenGL(this));
 }
 
 CL_DisplayWindow_OpenGL::~CL_DisplayWindow_OpenGL()
 {
-	if(fullscreen)
-		set_windowed();
 	destroy_window();
 }
 
@@ -85,23 +82,17 @@
 
 int CL_DisplayWindow_OpenGL::get_width() const
 {
-	XWindowAttributes attr;
-	XGetWindowAttributes(disp, window, &attr);
-
-	return attr.width;
+	return width;
 }
 
 int CL_DisplayWindow_OpenGL::get_height() const
 {
-	XWindowAttributes attr;
-	XGetWindowAttributes(disp, window, &attr);
-
-	return attr.height;
+	return height;
 }
 
 bool CL_DisplayWindow_OpenGL::is_fullscreen() const
 {
-	return fullscreen;
+	return fs_window != None;
 }
 
 bool CL_DisplayWindow_OpenGL::has_focus() const
@@ -151,11 +142,9 @@
 	const CL_OpenGLWindowDescription_Generic *gl_desc = 0;
 	gl_desc = dynamic_cast<const CL_OpenGLWindowDescription_Generic*>(desc.impl.get());
 
-	fullscreen_width  = desc.get_size().width;
-	fullscreen_height = desc.get_size().height;
-
-	XVisualInfo *vi;
-	Colormap cmap;
+	width  = desc.get_size().width;
+	height = desc.get_size().height;
+	allow_resize = desc.get_allow_resize();
 
 	if (disp == 0)
 	{
@@ -230,7 +219,7 @@
 	
 	if (vi == NULL)
 	{
-		vi = glXChooseVisual(disp, window, gl_attribs_single);
+		vi = glXChooseVisual(disp, DefaultScreen(disp), gl_attribs_single);
 		printf("Requested visual not supported by your OpenGL implementation. Falling back on singlebuffered Visual!\n");
 	}
 
@@ -240,16 +229,17 @@
 	if( share_context == NULL )
 		share_context = context;
 
-	glXGetConfig(disp, vi, GLX_BUFFER_SIZE, &glx_bpp);
-
 	// create a color map
 	cmap = XCreateColormap( disp, RootWindow(disp, vi->screen), vi->visual, AllocNone);
 
+	XSetWindowAttributes attributes;
+
 	attributes.colormap = cmap;
+	attributes.background_pixel = XBlackPixel(disp, vi->screen);
 	attributes.border_pixel = 0;
 	attributes.override_redirect = False;
 
-	// create a window in window mode
+	// create a managed window
 	attributes.event_mask =
 		ExposureMask |
 		KeyPressMask |
@@ -258,18 +248,20 @@
 		ButtonReleaseMask |
 		StructureNotifyMask |
 		PointerMotionMask |
-		EnterWindowMask |
-		LeaveWindowMask |
+		PropertyChangeMask |
+		KeymapStateMask |
 		FocusChangeMask;
 
-	window = XCreateWindow(disp, RootWindow(disp, vi->screen),
-		0, 0, desc.get_size().width, desc.get_size().height, 0, vi->depth, InputOutput, vi->visual,
-		CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
-	
-	XSelectInput(disp, window,
-		FocusChangeMask | KeyPressMask | KeyReleaseMask
-		| PropertyChangeMask | StructureNotifyMask |
-		KeymapStateMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask);
+	wm_window = XCreateWindow(disp, RootWindow(disp, vi->screen),
+		0, 0, width, height, 0, vi->depth, InputOutput, vi->visual,
+		CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
+	
+	window = XCreateWindow(disp, wm_window,
+		0, 0, width, height, 0, vi->depth, InputOutput, vi->visual,
+		CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect | CWEventMask, &attributes);
+	
+	// Map the real / drawing window it won't appear untill the parent does
+	XMapWindow(disp, window);
 
 	// set title of window:
 	set_title(desc.get_title());
@@ -277,24 +269,24 @@
 	// setup size hints:
 	XSizeHints size_hints;
 	memset(&size_hints, 0, sizeof(XSizeHints));
-	size_hints.width       = desc.get_size().width;
-	size_hints.height      = desc.get_size().height;
-	size_hints.base_width  = desc.get_size().width;
-	size_hints.base_height = desc.get_size().height;
-	size_hints.min_width   = size_hints.width;
-	size_hints.min_height  = size_hints.height;
-	size_hints.max_width   = size_hints.width;
-	size_hints.max_height  = size_hints.height;
+	size_hints.width       = width;
+	size_hints.height      = height;
+	size_hints.base_width  = width;
+	size_hints.base_height = height;
+	size_hints.min_width   = width;
+	size_hints.min_height  = height;
+	size_hints.max_width   = width;
+	size_hints.max_height  = height;
 	size_hints.flags       = PSize|PBaseSize;
-	if (!desc.get_allow_resize()) size_hints.flags |= PMinSize | PMaxSize;
-	XSetWMNormalHints(disp, window, &size_hints);
+	if (!allow_resize) size_hints.flags |= PMinSize | PMaxSize;
+	XSetWMNormalHints(disp, wm_window, &size_hints);
 
 	// handle wm_delete_events if in windowed mode:
 	Atom wm_delete = XInternAtom(disp, "WM_DELETE_WINDOW", True);
-	XSetWMProtocols(disp, window, &wm_delete, 1);
+	XSetWMProtocols(disp, wm_window, &wm_delete, 1);
 
-	// make window visible:
-	XMapRaised(disp, window);
+	// make the managed window visible (and thus the real one too):
+	XMapRaised(disp, wm_window);
 
 	if (!glXIsDirect(disp, context))
 		printf("No hardware acceleration available. I hope you got a really fast machine..\n");
@@ -327,7 +319,7 @@
 	hidden_cursor = XCreatePixmapCursor(disp, cursor_bitmap, cursor_bitmap, &black_color, &black_color, 0,0 );
 	
 	if (desc.is_fullscreen())
-		set_fullscreen(desc.get_size().width, desc.get_size().height, desc.get_bpp(), desc.get_refresh_rate());
+		set_fullscreen(width, height, desc.get_bpp(), desc.get_refresh_rate());
 }
 
 void
@@ -476,7 +468,8 @@
 
 void CL_DisplayWindow_OpenGL::destroy_window()
 {
-	set_windowed();
+	if(fs_window != None)
+		set_windowed();
 
 	if (context)
 	{
@@ -493,8 +486,16 @@
 	mouse = CL_InputDevice();
 	get_ic()->clear();
 
-	if (window) XDestroyWindow(disp, window);
-	window = 0;
+	if (window != None)
+	{
+		XDestroyWindow(disp, window);
+		window = None;
+	}
+	if (wm_window != None)
+	{
+		XDestroyWindow(disp, wm_window);
+		wm_window = None;
+	}
 	
 	if (disp_ref_count > 0)
 	{
@@ -502,7 +503,7 @@
 		if (disp_ref_count == 0)
 		{
 			XCloseDisplay(disp);
-			disp = 0;
+			disp = NULL;
 		}
 	}
 }
@@ -530,180 +531,234 @@
 	glXSwapBuffers(disp, window);
 }
 
-void CL_DisplayWindow_OpenGL::set_fullscreen(int width, int height, int bpp, int refresh_rate)
+/* qsort comparison function for sorting the modes */
+static int cmpmodes(const void *va, const void *vb)
 {
-	if(fullscreen)
-		return;
-
-	// Vid-mode Switching
-	XF86VidModeModeLine cur_mode;
-
-	XF86VidModeGetModeLine(disp, 0, &dotclock, &cur_mode);
-
-	old_mode.dotclock   = dotclock;
-	old_mode.hdisplay   = cur_mode.hdisplay;
-	old_mode.hsyncstart = cur_mode.hsyncstart;
-	old_mode.hsyncend   = cur_mode.hsyncend;
-	old_mode.htotal     = cur_mode.htotal;
-	old_mode.vdisplay   = cur_mode.vdisplay;
-	old_mode.vsyncstart = cur_mode.vsyncstart;
-	old_mode.vsyncend   = cur_mode.vsyncend;
-	old_mode.vtotal     = cur_mode.vtotal;
-	old_mode.flags      = cur_mode.flags;
-	old_mode.privsize   = 0;
+	const XF86VidModeModeInfo *a = *(const XF86VidModeModeInfo **)va;
+	const XF86VidModeModeInfo *b = *(const XF86VidModeModeInfo **)vb;
+	if ( a->hdisplay == b->hdisplay )
+		return b->vdisplay - a->vdisplay;  
+	else
+		return b->hdisplay - a->hdisplay;
+}
 
-	int num_modes;
+void CL_DisplayWindow_OpenGL::set_resolution(void)
+{
+	int i, dotclock, mode_count, fs_width, fs_height;
 	XF86VidModeModeInfo **modes;
-	XF86VidModeGetAllModeLines(disp, 0, &num_modes, &modes);
+	XF86VidModeModeLine current_mode;
 
-	std::list<XF86VidModeModeInfo *> usable_modes;
-	for(int i = 0; i < num_modes; i++)
-	{
-		if(modes[i]->hdisplay == width && modes[i]->vdisplay == height)
-		{
-			CL_Log::log("debug", "Useable fullscreen mode found: %1x%2", width, height);
-			usable_modes.push_back(modes[i]);
-		}
-	}
-	
-	if (usable_modes.empty())
-	{
-		CL_Log::log("debug", "No useable fullscreen modes available!");
+	current_mode.privsize = 0;
+	XF86VidModeGetModeLine(disp, vi->screen, &dotclock, &current_mode);
+	if (!XF86VidModeGetAllModeLines(disp, 0, &mode_count, &modes))
+		mode_count = 0;
+
+	/* Search for an exact matching video mode.  */
+	for (i = 0; i < mode_count; i++) {
+		if ((modes[i]->hdisplay == width) && 
+		    (modes[i]->vdisplay == height))
+			break;
 	}
-	else 
-	{	
-		if(!width)
-			width = get_width();
-
-		if(!height)
-			height = get_height();
-	
-		if(!bpp)
-			bpp = glx_bpp;
-
-		//Hide Window
-		if (0)
-		{  // FIXME: allow_override doesn't play together with
-			// GrabPointer, not sure what is wrong but it simply doesn't
-			// work.
-			//
-			// The code outside the 'if(0)' as it is now, works mostly,
-			// however it doesn't work when the window or a part of it is
-			// outside of the screen, since the window isn't moved
-			// fullscreen will only show half the window, shouldn't be a
-			// problem for most of the time, but will be tricky if the
-			// window has equal size as the desktop.
 
-			// Move the window into the right position, this must happen
-			// BEFORE we remove control from the window manager
-			XMoveResizeWindow(disp, window, 0, 0, width, height);
-
-			// Move the mouse and switch moves
-			XWarpPointer(disp, None, None, 0, 0, 0, 0, width/2, height/2);
-
-			XUnmapWindow(disp, window);
-			{ // Wait for window to disapear
-				XEvent event;
-				do {
-					XMaskEvent(disp, StructureNotifyMask, &event);
-				} while ( (event.type != UnmapNotify) || (event.xunmap.event != window) );
+	/* Search for a non exact match (smallest bigger res). */
+	if (i == mode_count) {
+		int best_width = 0, best_height = 0;
+		qsort(modes, mode_count, sizeof(void *), cmpmodes);
+		for (i = mode_count-1; i > 0; i--) {
+			if ( ! best_width ) {
+				if ( (modes[i]->hdisplay >= width) &&
+				     (modes[i]->vdisplay >= height) ) {
+					best_width = modes[i]->hdisplay;
+					best_height = modes[i]->vdisplay;
+				}
+			} else {
+				if ( (modes[i]->hdisplay != best_width) ||
+				     (modes[i]->vdisplay != best_height) ) {
+					i++;
+					break;
+				}
 			}
-			// Turn off WM control
-			attributes.override_redirect = True;
-			XChangeWindowAttributes(disp, window, CWBorderPixel | CWColormap | CWOverrideRedirect, &attributes);
-
-			// Re-appear window
-			XMapRaised(disp, window);
 		}
+	}
 
-		// Get input focus
-		//XSetInputFocus(disp,window, RevertToNone, CurrentTime);
-		while (1) 
+	/* Switch video mode */
+	if (i >= 0)
+	{
+		if ((modes[i]->hdisplay != current_mode.hdisplay) ||
+		    (modes[i]->vdisplay != current_mode.vdisplay))
 		{
-			int result = XGrabPointer(disp, window, True, 0, 
-											  GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
-			if ( result == GrabSuccess ) {
-				break;
+			if (old_x == -1 && old_y == -1)
+			{
+				XF86VidModeModeLine *l =
+					(XF86VidModeModeLine *)((char *)
+						&old_mode +
+						sizeof(old_mode.dotclock));
+				*l = current_mode;
+				old_mode.dotclock = dotclock;
+				XF86VidModeGetViewPort(disp, vi->screen,
+					&old_x, &old_y);
 			}
-			CL_System::sleep(100);
+			XF86VidModeSwitchToMode(disp, vi->screen,
+				modes[i]);
 		}
+		fs_width  = modes[i]->hdisplay;
+		fs_height = modes[i]->vdisplay;
+	}
+	else
+	{
+		fs_width  = DisplayWidth(disp, vi->screen);
+		fs_height = DisplayHeight(disp, vi->screen);
+	}
 
-		XF86VidModeGetViewPort(disp, DefaultScreen(disp), &old_x, &old_y);
-
-		XF86VidModeSwitchToMode(disp, 0, *(usable_modes.begin()));
-		Window child_window;
-		int x, y;
-		// Get the windows absolute position (aka relative to
-		// the root window)
-		XTranslateCoordinates(disp, window, DefaultRootWindow(disp), 
-									 0, 0, &x, &y, &child_window);
-	
-		XF86VidModeSetViewPort(disp, DefaultScreen(disp), x, y);
-		
-		XSync(disp, True);
-
-		fullscreen = true;
+	/* center window */
+	XMoveWindow(disp, window, (fs_width - width) / 2,
+		(fs_height - height) / 2);
+
+	/* Lock mode switching.  */
+	XF86VidModeLockModeSwitch(disp, vi->screen, True);
+	       
+	/* Set viewport. */
+	XF86VidModeSetViewPort(disp, vi->screen, 0, 0);
+
+	/* clean up */
+	if (current_mode.privsize)
+	  XFree(current_mode.c_private);
+
+	if (mode_count)
+	{
+	  for (i = 0; i < mode_count; i++)
+	    if (modes[i]->privsize)
+	      XFree(modes[i]->c_private);
+	  XFree(modes);
 	}
 }
 
-void CL_DisplayWindow_OpenGL::set_windowed()
+void CL_DisplayWindow_OpenGL::set_fullscreen(int width, int height, int bpp, int refresh_rate)
 {
-	if(!fullscreen)
+	if(!width)
+		width = this->width;
+	if(!height)
+		height = this->height;
+		
+	set_size(width, height);
+	
+	if(fs_window != None)
+	{
+		set_resolution();
 		return;
+	}
 
-	if (0)
-	{ // FIXME: See FIXME in set_fullscreen
-		// Hide window
-		XUnmapWindow(disp, window);
-		XSync(disp, True);
-
-		// Turn on WM control 
-		attributes.override_redirect = False;
-		XChangeWindowAttributes(disp, window, CWBorderPixel | CWColormap | CWOverrideRedirect, &attributes);
-
-		XMoveResizeWindow(disp, window, 0, 0, fullscreen_width, fullscreen_height);
+	/* Create the fullscreen window */
+	XSetWindowAttributes attributes;
+	XEvent event;
+
+	attributes.override_redirect = True;
+	attributes.background_pixel = XBlackPixel(disp, vi->screen);
+	attributes.border_pixel = XBlackPixel(disp, vi->screen);
+	attributes.event_mask = StructureNotifyMask;
+	attributes.colormap = cmap;
 
-		XMapRaised(disp, window);
-		XSync(disp, True);
+	fs_window = XCreateWindow(disp, RootWindow(disp, vi->screen),
+	                             0, 0,
+	                             DisplayWidth(disp, vi->screen),
+	                             DisplayHeight(disp, vi->screen), 0,
+	                             vi->depth, InputOutput,
+	                             vi->visual, CWOverrideRedirect |
+	                             CWBackPixel | CWColormap | CWBorderPixel |
+	                             CWEventMask, &attributes);
+
+	/* Map the fullscreen window */
+	XMapRaised(disp, fs_window);
+	/* wait until we are mapped. (shamelessly borrowed from SDL) */
+	do {
+	  XMaskEvent(disp, StructureNotifyMask, &event); 
+	} while ( (event.type != MapNotify) || 
+	          (event.xmap.event != fs_window) );
+	/* Make sure we got to the top of the window stack */
+	XRaiseWindow(disp, fs_window);
+	
+	/* Reparent the real window */
+	XReparentWindow(disp, window, fs_window, 0, 0);
+
+	// Get input focus
+	//XSetInputFocus(disp,window, RevertToNone, CurrentTime);
+	while (1) 
+	{
+		int result = XGrabPointer(disp, window, True, 0, 
+										  GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
+		if ( result == GrabSuccess ) {
+			break;
+		}
+		CL_System::sleep(100);
 	}
 
-	fullscreen = false;
+	set_resolution();
+}
+
+void CL_DisplayWindow_OpenGL::set_windowed()
+{
+	if(fs_window == None)
+		return;
 
 	// Only restore mode if we ever switched mode.
 	if (old_x != -1 || old_y != -1)
 	{
-		XF86VidModeSwitchToMode(disp, 0, &old_mode);
-		XF86VidModeSetViewPort(disp, 0, old_x, old_y);
+		XF86VidModeSwitchToMode(disp, vi->screen, &old_mode);
+		XF86VidModeSetViewPort(disp, vi->screen, old_x, old_y);
+		old_x = old_y = -1;
 	}
 
 	XUngrabPointer(disp, CurrentTime);
 
-	XSync(disp, True);
+	/* Reparent the real window! */
+	XReparentWindow(disp, window, wm_window, 0, 0);
+	XUnmapWindow(disp, fs_window);
+	XDestroyWindow(disp, fs_window);
+	fs_window = None;
 }
 
 void CL_DisplayWindow_OpenGL::set_title(const std::string &title)
 {
-	XSetStandardProperties(disp, window, title.c_str(), title.c_str(), None, NULL, 0, NULL);
+	XSetStandardProperties(disp, wm_window, title.c_str(), title.c_str(), None, NULL, 0, NULL);
 }
 
 void CL_DisplayWindow_OpenGL::set_position(const CL_Rect &pos)
 {
 	set_position(pos.left, pos.top);
-	XResizeWindow(disp, window, pos.get_width(), pos.get_height());
 	set_size(pos.get_width(), pos.get_height());
 }
 
 void CL_DisplayWindow_OpenGL::set_position(int x, int y)
 {
-	XMoveWindow(disp, window, x, y);
+	XMoveWindow(disp, wm_window, x, y);
 }
 
 void CL_DisplayWindow_OpenGL::set_size(int width, int height)
 {
-	fullscreen_width = width;
-	fullscreen_height = height;
+	if((width == this->width) && (height == this->height))
+		return;
 
-	sig_resize(width, height);
+	// in order to resize a non resizable window we must change the hints
+	// as the window manager won't allow the resize otherwise.
+	if (!allow_resize)
+	{
+		XSizeHints size_hints;
+		memset(&size_hints, 0, sizeof(XSizeHints));
+		size_hints.width       = width;
+		size_hints.height      = height;
+		size_hints.base_width  = width;
+		size_hints.base_height = height;
+		size_hints.min_width   = width;
+		size_hints.min_height  = height;
+		size_hints.max_width   = width;
+		size_hints.max_height  = height;
+		size_hints.flags       = PSize|PBaseSize|PMinSize|PMaxSize;
+		XSetWMNormalHints(disp, wm_window, &size_hints);
+	}
+	XResizeWindow(disp, wm_window, width, height);
+	XResizeWindow(disp, window, width, height);
+	this->width  = width;
+	this->height = height;
 }
 
 void CL_DisplayWindow_OpenGL::set_buffer_count(int flipping_buffers)
@@ -772,7 +827,16 @@
 				#ifdef DEBUG
 					CL_Log::log("debug", "ConfigureNotify Event received");
 				#endif
-				set_size(event.xconfigure.width,event.xconfigure.height);
+				if (event.xconfigure.window == wm_window &&
+				    (event.xconfigure.width  != width ||
+				     event.xconfigure.height != height))
+				{
+					width  = event.xconfigure.width;
+					height = event.xconfigure.height;
+					XResizeWindow(disp, window, width,
+						 height);
+					sig_resize(event.xconfigure.width, event.xconfigure.height);
+				}
 				break;
 			case ClientMessage:
 				#ifdef DEBUG



Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/FC-5/ClanLib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClanLib.spec	26 Jul 2006 11:24:34 -0000	1.6
+++ ClanLib.spec	9 Oct 2006 11:49:54 -0000	1.7
@@ -3,13 +3,14 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
 Version:        0.8.0
-Release:        0.6.%{pre_version}%{?dist}
+Release:        0.7.%{pre_version}%{?dist}
 Group:          System Environment/Libraries
 License:        zlib License
 URL:            http://www.clanlib.org/
 Source0:        http://www.clanlib.org/download/releases-0.8/%{name}-%{version}-%{pre_version}.tgz
 Patch0:         ClanLib-0.8.0-gcc41.patch
 Patch1:         ClanLib-0.8.0-grave_key.patch
+Patch2:         ClanLib-0.8.0-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
@@ -36,6 +37,7 @@
 %setup -q -n %{name}-%{version}-%{pre_version}
 %patch0 -p1 -z .gcc41
 %patch1 -p1 -z .grave
+%patch2 -p1 -z .fs 
 # fixup pc files
 sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in
 sed -i 's|Libs:   -L${libdir}|Libs:   -L${libdir}/%{name}-0.8|' \
@@ -86,6 +88,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.7.RC2
+- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
+  window decoration is shown in fullscreen mode on certain videocards
+
 * Wed Jul 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.6.RC2
 - Add missing Requires: pkgconfig to -devel package
 



From fedora-extras-commits at redhat.com  Mon Oct  9 12:21:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon,  9 Oct 2006 05:21:28 -0700
Subject: rpms/jd/devel .cvsignore,1.4,1.5 jd.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <200610091221.k99CLUE7031863@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31842

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
- 1.8.0 beta a061009



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2006 14:43:24 -0000	1.4
+++ .cvsignore	9 Oct 2006 12:21:27 -0000	1.5
@@ -1 +1 @@
-jd-1.7.0-060927.tgz
+jd-1.8.0-beta061009.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jd.spec	7 Oct 2006 05:25:22 -0000	1.4
+++ jd.spec	9 Oct 2006 12:21:27 -0000	1.5
@@ -8,21 +8,21 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      1.7.0
-%define         strtag        060927
-%define         repoid        21934
+%define         main_ver      1.8.0
+%define         strtag        beta061009
+%define         repoid        22118
 
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    1
 %define         vendor        fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
 
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 
 %if %{pre_release}
 %define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
@@ -100,6 +100,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
+- 1.8.0 beta a061009
+
 * Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
 - Add libSM-devel to BuildRequires.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2006 14:43:24 -0000	1.4
+++ sources	9 Oct 2006 12:21:27 -0000	1.5
@@ -1 +1 @@
-ef051b189a3fa482e6527552e13b084c  jd-1.7.0-060927.tgz
+b71195e64e520b745885120b2d77c5c2  jd-1.8.0-beta061009.tgz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:07:35 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon,  9 Oct 2006 06:07:35 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.3,1.4 jd.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200610091307.k99D7bZL002778@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2757

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
- 1.8.0 beta a061009



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Sep 2006 14:44:48 -0000	1.3
+++ .cvsignore	9 Oct 2006 13:07:35 -0000	1.4
@@ -1 +1 @@
-jd-1.7.0-060927.tgz
+jd-1.8.0-beta061009.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jd.spec	7 Oct 2006 05:26:11 -0000	1.3
+++ jd.spec	9 Oct 2006 13:07:35 -0000	1.4
@@ -8,21 +8,21 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      1.7.0
-%define         strtag        060927
-%define         repoid        21934
+%define         main_ver      1.8.0
+%define         strtag        beta061009
+%define         repoid        22118
 
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    1
 %define         vendor        fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
 
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 
 %if %{pre_release}
 %define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
@@ -100,6 +100,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
+- 1.8.0 beta a061009
+
 * Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
 - Add libSM-devel to BuildRequires.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Sep 2006 14:44:48 -0000	1.3
+++ sources	9 Oct 2006 13:07:35 -0000	1.4
@@ -1 +1 @@
-ef051b189a3fa482e6527552e13b084c  jd-1.7.0-060927.tgz
+b71195e64e520b745885120b2d77c5c2  jd-1.8.0-beta061009.tgz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:16:53 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 06:16:53 -0700
Subject: rpms/ortp/devel .cvsignore, 1.4, 1.5 ortp.spec, 1.9, 1.10 sources,
	1.4, 1.5 ortp-0.8.1-Werror.patch, 1.1, NONE
Message-ID: <200610091316.k99DGt2v002882@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2860

Modified Files:
	.cvsignore ortp.spec sources 
Removed Files:
	ortp-0.8.1-Werror.patch 
Log Message:
Update to 0.11.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2006 07:32:41 -0000	1.4
+++ .cvsignore	9 Oct 2006 13:16:53 -0000	1.5
@@ -1 +1 @@
-ortp-0.8.1.tar.gz
+ortp-0.11.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ortp.spec	30 Aug 2006 14:46:53 -0000	1.9
+++ ortp.spec	9 Oct 2006 13:16:53 -0000	1.10
@@ -1,18 +1,14 @@
 Name:           ortp
-Version:        0.8.1
-Release:        3%{?dist}
+Version:        0.11.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://www.linphone.org/ortp/
-Source0:        http://www.linphone.org/ortp/sources/%{name}-%{version}.tar.gz
-Patch0:         ortp-0.8.1-Werror.patch
+URL:            http://www.linphone.org/index.php/v2/code_review/ortp
+Source0:        http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glib2-devel >= 2.0.0
-#Requires:       
-
 %description
 oRTP is a C library that implements RTP (RFC3550).
 
@@ -26,7 +22,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .Werror
 
 %build
 %configure --disable-static
@@ -53,6 +48,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.0-1
+- Update to 0.11.0
+- Remove ortp-0.8.1-Werror.patch
+
 * Wed Aug 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8.1-3
 - Bump release and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jan 2006 07:32:41 -0000	1.4
+++ sources	9 Oct 2006 13:16:53 -0000	1.5
@@ -1 +1 @@
-5d8a8da638aec3a80214d64e0c7929af  ortp-0.8.1.tar.gz
+c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz


--- ortp-0.8.1-Werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 13:27:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  9 Oct 2006 06:27:50 -0700
Subject: rpms/gtkwave/devel .cvsignore, 1.22, 1.23 gtkwave.spec, 1.24,
	1.25 sources, 1.22, 1.23
Message-ID: <200610091327.k99DRqAJ002981@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2960

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Sep 2006 13:48:49 -0000	1.22
+++ .cvsignore	9 Oct 2006 13:27:49 -0000	1.23
@@ -1 +1 @@
-gtkwave-3.0.12.tar.gz
+gtkwave-3.0.13.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtkwave.spec	3 Oct 2006 09:37:17 -0000	1.24
+++ gtkwave.spec	9 Oct 2006 13:27:49 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.12
-Release:		2%{?dist}
+Version:		3.0.13
+Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
 URL:			http://home.nc.rr.com/gtkwave/
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
+- update to 3.0.13
+
 * Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 3.0.12-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Sep 2006 13:48:49 -0000	1.22
+++ sources	9 Oct 2006 13:27:49 -0000	1.23
@@ -1 +1 @@
-6508795d132dd7efa8a720fd30d86659  gtkwave-3.0.12.tar.gz
+e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:29:00 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  9 Oct 2006 06:29:00 -0700
Subject: rpms/gtkwave/FC-5 .cvsignore, 1.22, 1.23 gtkwave.spec, 1.22,
	1.23 sources, 1.22, 1.23
Message-ID: <200610091329.k99DT2Ex003046@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3025

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Sep 2006 14:12:50 -0000	1.22
+++ .cvsignore	9 Oct 2006 13:29:00 -0000	1.23
@@ -1 +1 @@
-gtkwave-3.0.12.tar.gz
+gtkwave-3.0.13.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtkwave.spec	22 Sep 2006 14:12:50 -0000	1.22
+++ gtkwave.spec	9 Oct 2006 13:29:00 -0000	1.23
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.12
+Version:		3.0.13
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,12 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
+- update to 3.0.13
+
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 3.0.12-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 3.0.12-1
 - update to 3.0.12
 - create dummy libz/libbz2 Makefile.in files to ensure that config.h gets


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Sep 2006 14:12:50 -0000	1.22
+++ sources	9 Oct 2006 13:29:00 -0000	1.23
@@ -1 +1 @@
-6508795d132dd7efa8a720fd30d86659  gtkwave-3.0.12.tar.gz
+e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:29:40 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon,  9 Oct 2006 06:29:40 -0700
Subject: rpms/gtkwave/FC-4 .cvsignore, 1.22, 1.23 gtkwave.spec, 1.21,
	1.22 sources, 1.22, 1.23
Message-ID: <200610091329.k99DTg0E003111@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3090

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Sep 2006 14:13:29 -0000	1.22
+++ .cvsignore	9 Oct 2006 13:29:40 -0000	1.23
@@ -1 +1 @@
-gtkwave-3.0.12.tar.gz
+gtkwave-3.0.13.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtkwave.spec	22 Sep 2006 14:13:29 -0000	1.21
+++ gtkwave.spec	9 Oct 2006 13:29:40 -0000	1.22
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.12
+Version:		3.0.13
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,12 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
+- update to 3.0.13
+
+* Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 3.0.12-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 3.0.12-1
 - update to 3.0.12
 - create dummy libz/libbz2 Makefile.in files to ensure that config.h gets


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Sep 2006 14:13:29 -0000	1.22
+++ sources	9 Oct 2006 13:29:40 -0000	1.23
@@ -1 +1 @@
-6508795d132dd7efa8a720fd30d86659  gtkwave-3.0.12.tar.gz
+e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 13:46:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  9 Oct 2006 06:46:34 -0700
Subject: rpms/wxMaxima/devel wxMaxima-0.7.0a-mp.patch, NONE,
	1.1 wxMaxima.spec, 1.4, 1.5
Message-ID: <200610091346.k99DkaL2003244@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3224

Modified Files:
	wxMaxima.spec 
Added Files:
	wxMaxima-0.7.0a-mp.patch 
Log Message:
* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-2
- patch for proper maxima= entry in ~/.wxMaxima (#209992)


wxMaxima-0.7.0a-mp.patch:

--- NEW FILE wxMaxima-0.7.0a-mp.patch ---
--- wxMaxima-0.7.0a/src/wxMaxima.cpp.mp	2006-09-21 09:23:22.000000000 -0500
+++ wxMaxima-0.7.0a/src/wxMaxima.cpp	2006-10-09 08:35:10.000000000 -0500
@@ -1025,7 +1025,7 @@
   if (!have_config)
   {
     command = wxT("maxima");
-    config->Write(wxT("maxima"), &command);
+    config->Write(wxT("maxima"), command);
   }
 
   config->Read(wxT("parameters"), &parameters);


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wxMaxima.spec	4 Oct 2006 19:22:26 -0000	1.4
+++ wxMaxima.spec	9 Oct 2006 13:46:34 -0000	1.5
@@ -1,17 +1,16 @@
 
-# Fedora review
-# http://bugzilla.redhat.com/204832
-
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: wxMaxima-0.7.0a-mp.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
 BuildRequires: libxml2-devel
@@ -21,12 +20,14 @@
 Requires: maxima >= 5.10
 
 %description
-A Graphical user interface for the computer algebra system
+A Graphical user interface for the the computer algebra system
 Maxima using wxWidgets.
 
 %prep
 %setup -q
 
+%patch1 -p1 -b .mp
+
 sed -i -e "s|^Icon=.*|Icon=wxmaxima|" wxmaxima.desktop
 
 
@@ -88,15 +89,11 @@
 
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-- respin
+* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-2
+- patch for proper maxima= entry in ~/.wxMaxima (#209992)
 
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a
-- Requires: maxima >= 5.10
-
-* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-3
-- fix %%description typo
 
 * Tue Sep 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-2
 - update %%description, %%summary



From fedora-extras-commits at redhat.com  Mon Oct  9 13:47:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  9 Oct 2006 06:47:11 -0700
Subject: rpms/wxMaxima/FC-5 wxMaxima-0.7.0a-mp.patch, NONE, 1.1 wxMaxima.spec,
	1.3, 1.4
Message-ID: <200610091347.k99DlDDX003313@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3293

Modified Files:
	wxMaxima.spec 
Added Files:
	wxMaxima-0.7.0a-mp.patch 
Log Message:
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- respin


wxMaxima-0.7.0a-mp.patch:

--- NEW FILE wxMaxima-0.7.0a-mp.patch ---
--- wxMaxima-0.7.0a/src/wxMaxima.cpp.mp	2006-09-21 09:23:22.000000000 -0500
+++ wxMaxima-0.7.0a/src/wxMaxima.cpp	2006-10-09 08:35:10.000000000 -0500
@@ -1025,7 +1025,7 @@
   if (!have_config)
   {
     command = wxT("maxima");
-    config->Write(wxT("maxima"), &command);
+    config->Write(wxT("maxima"), command);
   }
 
   config->Read(wxT("parameters"), &parameters);


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/FC-5/wxMaxima.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wxMaxima.spec	26 Sep 2006 14:09:29 -0000	1.3
+++ wxMaxima.spec	9 Oct 2006 13:47:11 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- respin
+
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a
 - Requires: maxima >= 5.10



From fedora-extras-commits at redhat.com  Mon Oct  9 14:02:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  9 Oct 2006 07:02:24 -0700
Subject: rpms/wxMaxima/devel wxMaxima.spec,1.5,1.6
Message-ID: <200610091402.k99E2Qic006450@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6433

Modified Files:
	wxMaxima.spec 
Log Message:
* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
- (re)fix typo in %description



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wxMaxima.spec	9 Oct 2006 13:46:34 -0000	1.5
+++ wxMaxima.spec	9 Oct 2006 14:02:24 -0000	1.6
@@ -1,8 +1,11 @@
 
+# Fedora review
+# http://bugzilla.redhat.com/204832
+
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -20,7 +23,7 @@
 Requires: maxima >= 5.10
 
 %description
-A Graphical user interface for the the computer algebra system
+A Graphical user interface for the computer algebra system
 Maxima using wxWidgets.
 
 %prep
@@ -89,11 +92,18 @@
 
 
 %changelog
+* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
+- (re)fix typo in %%description
+
 * Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-2
 - patch for proper maxima= entry in ~/.wxMaxima (#209992)
 
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a
+- Requires: maxima >= 5.10
+
+* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-3
+- fix %%description typo
 
 * Tue Sep 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-2
 - update %%description, %%summary



From fedora-extras-commits at redhat.com  Mon Oct  9 14:02:50 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  9 Oct 2006 07:02:50 -0700
Subject: rpms/wxMaxima/FC-5 wxMaxima.spec,1.4,1.5
Message-ID: <200610091403.k99E3OfC006515@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6498

Modified Files:
	wxMaxima.spec 
Log Message:
* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
- (re)fix typo in %description



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/FC-5/wxMaxima.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wxMaxima.spec	9 Oct 2006 13:47:11 -0000	1.4
+++ wxMaxima.spec	9 Oct 2006 14:02:50 -0000	1.5
@@ -5,13 +5,15 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 1%{?dist}.1
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: wxMaxima-0.7.0a-mp.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
 BuildRequires: libxml2-devel
@@ -27,6 +29,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .mp
+
 sed -i -e "s|^Icon=.*|Icon=wxmaxima|" wxmaxima.desktop
 
 
@@ -88,8 +92,11 @@
 
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-- respin
+* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
+- (re)fix typo in %%description
+
+* Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-2
+- patch for proper maxima= entry in ~/.wxMaxima (#209992)
 
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-1
 - 0.7.0a



From fedora-extras-commits at redhat.com  Mon Oct  9 14:07:19 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 07:07:19 -0700
Subject: rpms/ortp/FC-5 .cvsignore, 1.4, 1.5 ortp.spec, 1.8, 1.9 sources, 1.4,
	1.5 ortp-0.8.1-Werror.patch, 1.1, NONE
Message-ID: <200610091407.k99E7Loo006698@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6677

Modified Files:
	.cvsignore ortp.spec sources 
Removed Files:
	ortp-0.8.1-Werror.patch 
Log Message:
Update to 0.11.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2006 07:32:41 -0000	1.4
+++ .cvsignore	9 Oct 2006 14:07:19 -0000	1.5
@@ -1 +1 @@
-ortp-0.8.1.tar.gz
+ortp-0.11.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/ortp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ortp.spec	14 Feb 2006 05:02:43 -0000	1.8
+++ ortp.spec	9 Oct 2006 14:07:19 -0000	1.9
@@ -1,18 +1,14 @@
 Name:           ortp
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.11.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://www.linphone.org/ortp/
-Source0:        http://www.linphone.org/ortp/sources/%{name}-%{version}.tar.gz
-Patch0:         ortp-0.8.1-Werror.patch
+URL:            http://www.linphone.org/index.php/v2/code_review/ortp
+Source0:        http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glib2-devel >= 2.0.0
-#Requires:       
-
 %description
 oRTP is a C library that implements RTP (RFC3550).
 
@@ -26,7 +22,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .Werror
 
 %build
 %configure --disable-static
@@ -53,6 +48,13 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.0-1
+- Update to 0.11.0
+- Remove ortp-0.8.1-Werror.patch
+
+* Wed Aug 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8.1-3
+- Bump release and rebuild
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.1-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jan 2006 07:32:41 -0000	1.4
+++ sources	9 Oct 2006 14:07:19 -0000	1.5
@@ -1 +1 @@
-5d8a8da638aec3a80214d64e0c7929af  ortp-0.8.1.tar.gz
+c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz


--- ortp-0.8.1-Werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 14:33:46 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 07:33:46 -0700
Subject: rpms/ortp/devel ortp-0.11.0-Werror.patch, NONE, 1.1 ortp.spec, 1.10,
	1.11
Message-ID: <200610091433.k99EXmxY006929@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6909

Modified Files:
	ortp.spec 
Added Files:
	ortp-0.11.0-Werror.patch 
Log Message:
Adding -Werror patch back

ortp-0.11.0-Werror.patch:

--- NEW FILE ortp-0.11.0-Werror.patch ---
--- configure.orig	2006-10-09 09:20:54.000000000 -0500
+++ configure	2006-10-09 09:21:27.000000000 -0500
@@ -21285,10 +21285,6 @@
 _ACEOF
 
 
-if test $GCC = yes && test $wall_werror = yes;  then
-	CFLAGS="$CFLAGS -Werror "
-fi
-
 ORTPDEPS_LIBS="$ORTPDEPS_LIBS $PTHREAD_LIBS $PTHREAD_LDFLAGS"
 ORTPDEPS_CFLAGS="$ORTPDEPS_CFLAGS $PTHREAD_CFLAGS $ORTP_DEFS"
 CFLAGS="$CFLAGS $ORTP_DEFS"


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ortp.spec	9 Oct 2006 13:16:53 -0000	1.10
+++ ortp.spec	9 Oct 2006 14:33:45 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           ortp
 Version:        0.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.linphone.org/index.php/v2/code_review/ortp
 Source0:        http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-%{version}.tar.gz
+Patch0:		ortp-0.11.0-Werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-static
@@ -48,6 +50,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.11.0
+- Bring back -Werror patch (needed for building on PPC)
+
 * Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.0-1
 - Update to 0.11.0
 - Remove ortp-0.8.1-Werror.patch



From fedora-extras-commits at redhat.com  Mon Oct  9 14:50:27 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 07:50:27 -0700
Subject: rpms/gcdmaster/devel .cvsignore, 1.2, 1.3 gcdmaster.spec, 1.5,
	1.6 sources, 1.2, 1.3 gcdmaster-1.2.1-qualification.patch, 1.1, NONE
Message-ID: <200610091450.k99EoT1Q007267@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7246

Modified Files:
	.cvsignore gcdmaster.spec sources 
Removed Files:
	gcdmaster-1.2.1-qualification.patch 
Log Message:
- Update to 1.2.2, g++4 patch integrated upstream
- Removed makeinstall macro
- Added mime types to desktop file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2005 20:12:52 -0000	1.2
+++ .cvsignore	9 Oct 2006 14:50:27 -0000	1.3
@@ -1 +1 @@
-cdrdao-1.2.1.tar.bz2
+cdrdao-1.2.2.tar.bz2


Index: gcdmaster.spec
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/gcdmaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcdmaster.spec	28 Aug 2006 15:08:16 -0000	1.5
+++ gcdmaster.spec	9 Oct 2006 14:50:27 -0000	1.6
@@ -1,17 +1,16 @@
-Name:		gcdmaster
-Version:	1.2.1
-Release:        7%{?dist}
-Summary:	A Gnome2 Disk-At-Once (DAO) Audio CD writer
+Name:           gcdmaster
+Version:        1.2.2
+Release:        1%{?dist}
+Summary:        A Gnome2 Disk-At-Once (DAO) Audio CD writer
 
-Group:		Applications/Multimedia
-License:	GPL
+Group:          Applications/Multimedia
+License:        GPL
 URL:            http://cdrdao.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
-Patch0:         gcdmaster-1.2.1-qualification.patch
+Source0:        http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
 Requires:       cdrdao
-BuildRequires:	gtkmm24-devel
-BuildRequires:	libgnomeuimm26-devel
+BuildRequires:  gtkmm24-devel
+BuildRequires:  libgnomeuimm26-devel
 BuildRequires:  libsigc++20-devel
 BuildRequires:  libvorbis-devel >= 1.0
 BuildRequires:  desktop-file-utils
@@ -29,7 +28,7 @@
 
 %prep
 %setup -q -n cdrdao-%{version}
-%patch0 -p1 -b .qualification
+
 
 %build
 %configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support}
@@ -38,7 +37,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/cdrdao
 rm -f $RPM_BUILD_ROOT%{_bindir}/*toc*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrdao*
@@ -46,6 +45,10 @@
 rm -fr $RPM_BUILD_ROOT%{_datadir}/cdrdao 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+cat << EOF >> ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;
+EOF
+
 desktop-file-install \
   --vendor fedora \
   --mode 644 \
@@ -82,6 +85,11 @@
 %{_mandir}/man1/gcdmaster*
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.2-1
+- Update to 1.2.2, g++4 patch integrated upstream
+- Removed makeinstall macro
+- Added mime types to desktop file
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 1.2.1-7
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2005 20:12:52 -0000	1.2
+++ sources	9 Oct 2006 14:50:27 -0000	1.3
@@ -1 +1 @@
-f93f3e68ec5b53ec1a776df73a1def60  cdrdao-1.2.1.tar.bz2
+f0cbf36907406cb4f4c568f9e6669a34  cdrdao-1.2.2.tar.bz2


--- gcdmaster-1.2.1-qualification.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 14:52:53 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 07:52:53 -0700
Subject: rpms/ortp/FC-5 ortp-0.11.0-Werror.patch, NONE, 1.1 ortp.spec, 1.9,
	1.10
Message-ID: <200610091452.k99Eqthk007346@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326

Modified Files:
	ortp.spec 
Added Files:
	ortp-0.11.0-Werror.patch 
Log Message:
Add -Werror patch back

ortp-0.11.0-Werror.patch:

--- NEW FILE ortp-0.11.0-Werror.patch ---
--- configure.orig	2006-10-09 09:20:54.000000000 -0500
+++ configure	2006-10-09 09:21:27.000000000 -0500
@@ -21285,10 +21285,6 @@
 _ACEOF
 
 
-if test $GCC = yes && test $wall_werror = yes;  then
-	CFLAGS="$CFLAGS -Werror "
-fi
-
 ORTPDEPS_LIBS="$ORTPDEPS_LIBS $PTHREAD_LIBS $PTHREAD_LDFLAGS"
 ORTPDEPS_CFLAGS="$ORTPDEPS_CFLAGS $PTHREAD_CFLAGS $ORTP_DEFS"
 CFLAGS="$CFLAGS $ORTP_DEFS"


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/ortp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ortp.spec	9 Oct 2006 14:07:19 -0000	1.9
+++ ortp.spec	9 Oct 2006 14:52:52 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           ortp
 Version:        0.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.linphone.org/index.php/v2/code_review/ortp
 Source0:        http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-%{version}.tar.gz
+Patch0:		ortp-0.11.0-Werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-static
@@ -48,6 +50,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 0.11.0
+- Bring back -Werror patch (needed for building on PPC)
+
 * Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.0-1
 - Update to 0.11.0
 - Remove ortp-0.8.1-Werror.patch



From fedora-extras-commits at redhat.com  Mon Oct  9 15:06:03 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 08:06:03 -0700
Subject: rpms/gcdmaster/FC-5 .cvsignore, 1.2, 1.3 gcdmaster.spec, 1.3,
	1.4 sources, 1.2, 1.3 gcdmaster-1.2.1-qualification.patch, 1.1, NONE
Message-ID: <200610091506.k99F65Jf010396@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10373

Modified Files:
	.cvsignore gcdmaster.spec sources 
Removed Files:
	gcdmaster-1.2.1-qualification.patch 
Log Message:
- Update to 1.2.2
- g++4 patch removed, integrated upstream
- Added mime types to desktop file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2005 20:12:52 -0000	1.2
+++ .cvsignore	9 Oct 2006 15:06:03 -0000	1.3
@@ -1 +1 @@
-cdrdao-1.2.1.tar.bz2
+cdrdao-1.2.2.tar.bz2


Index: gcdmaster.spec
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/FC-5/gcdmaster.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcdmaster.spec	9 Aug 2006 06:29:32 -0000	1.3
+++ gcdmaster.spec	9 Oct 2006 15:06:03 -0000	1.4
@@ -1,17 +1,16 @@
-Name:		gcdmaster
-Version:	1.2.1
-Release:        5%{?dist}
-Summary:	A Gnome2 Disk-At-Once (DAO) Audio CD writer
+Name:           gcdmaster
+Version:        1.2.2
+Release:        1%{?dist}
+Summary:        A Gnome2 Disk-At-Once (DAO) Audio CD writer
 
-Group:		Applications/Multimedia
-License:	GPL
+Group:          Applications/Multimedia
+License:        GPL
 URL:            http://cdrdao.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
-Patch0:         gcdmaster-1.2.1-qualification.patch
+Source0:        http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
 Requires:       cdrdao
-BuildRequires:	gtkmm24-devel
-BuildRequires:	libgnomeuimm26-devel
+BuildRequires:  gtkmm24-devel
+BuildRequires:  libgnomeuimm26-devel
 BuildRequires:  libsigc++20-devel
 BuildRequires:  libvorbis-devel >= 1.0
 BuildRequires:  desktop-file-utils
@@ -29,7 +28,7 @@
 
 %prep
 %setup -q -n cdrdao-%{version}
-%patch0 -p1 -b .qualification
+
 
 %build
 %configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support}
@@ -38,7 +37,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/cdrdao
 rm -f $RPM_BUILD_ROOT%{_bindir}/*toc*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrdao*
@@ -46,6 +45,10 @@
 rm -fr $RPM_BUILD_ROOT%{_datadir}/cdrdao 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+cat << EOF >> ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;
+EOF
+
 desktop-file-install \
   --vendor fedora \
   --mode 644 \
@@ -82,6 +85,11 @@
 %{_mandir}/man1/gcdmaster*
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.2-1
+- Update to 1.2.2
+- g++4 patch removed, integrated upstream
+- Added mime types to desktop file
+
 * Wed Aug  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.1-5
 - Bumping up release to fix upgrade path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2005 20:12:52 -0000	1.2
+++ sources	9 Oct 2006 15:06:03 -0000	1.3
@@ -1 +1 @@
-f93f3e68ec5b53ec1a776df73a1def60  cdrdao-1.2.1.tar.bz2
+f0cbf36907406cb4f4c568f9e6669a34  cdrdao-1.2.2.tar.bz2


--- gcdmaster-1.2.1-qualification.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct  9 15:34:12 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon,  9 Oct 2006 08:34:12 -0700
Subject: owners owners.list,1.1803,1.1804
Message-ID: <200610091534.k99FYEEI010870@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10853

Modified Files:
	owners.list 
Log Message:

Unorphaning putty



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1803
retrieving revision 1.1804
diff -u -r1.1803 -r1.1804
--- owners.list	9 Oct 2006 11:18:54 -0000	1.1803
+++ owners.list	9 Oct 2006 15:34:11 -0000	1.1804
@@ -1794,7 +1794,7 @@
 Fedora Extras|pulseaudio|Improved Linux sound server|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|puppet|A configuration management tool|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pure-ftpd|Lightweight, fast and secure FTP server|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|jima at beer.tclug.org|extras-qa at fedoraproject.org|
 Fedora Extras|pwgen|Automatic password generation|jbowes at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pybliographer|A framework for working with bibliographic databases|z.kota at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 16:01:26 2006
From: fedora-extras-commits at redhat.com (Kushal Das (kushal))
Date: Mon,  9 Oct 2006 09:01:26 -0700
Subject: owners owners.list,1.1804,1.1805
Message-ID: <200610091601.k99G1Sjv013910@cvs-int.fedora.redhat.com>

Author: kushal

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11063

Modified Files:
	owners.list 
Log Message:
update owner's name for prozilla




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1804
retrieving revision 1.1805
diff -u -r1.1804 -r1.1805
--- owners.list	9 Oct 2006 15:34:11 -0000	1.1804
+++ owners.list	9 Oct 2006 16:01:25 -0000	1.1805
@@ -1786,7 +1786,7 @@
 Fedora Extras|prboom|GPL Doom game engine|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|prozilla|An advanced Linux download manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|prozilla|An advanced Linux download manager|kushaldas at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pstoedit|Translates PostScript into other vector formats|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 16:21:19 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  9 Oct 2006 09:21:19 -0700
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.6,1.7
Message-ID: <200610091621.k99GLLBN014140@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14107

Modified Files:
	qcomicbook.spec 
Log Message:
Update to build in FC6



Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qcomicbook.spec	2 Oct 2006 22:54:46 -0000	1.6
+++ qcomicbook.spec	9 Oct 2006 16:21:19 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -60,7 +60,7 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-3
+* Mon Oct 09 2006 Scott Baker <scott at perturb.org> - 0.3.3-4
 - Build on FC6
 
 * Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-2



From fedora-extras-commits at redhat.com  Mon Oct  9 16:29:41 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  9 Oct 2006 09:29:41 -0700
Subject: rpms/qcomicbook/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610091629.k99GThNj014221@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14202

Modified Files:
	.cvsignore sources 
Log Message:
Add the new .tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2006 17:57:06 -0000	1.2
+++ .cvsignore	9 Oct 2006 16:29:41 -0000	1.3
@@ -1 +1 @@
-qcomicbook-0.3.2.tar.gz
+qcomicbook-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2006 17:57:06 -0000	1.2
+++ sources	9 Oct 2006 16:29:41 -0000	1.3
@@ -1 +1 @@
-ab191878d0694c77c4e5dd1d22f3d14c  qcomicbook-0.3.2.tar.gz
+a52b768ccca632a820094739e6aaec36  qcomicbook-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 16:43:27 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Mon,  9 Oct 2006 09:43:27 -0700
Subject: rpms/qcomicbook/devel qcomicbook.spec,1.7,1.8
Message-ID: <200610091643.k99GhTKW014365@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14348

Modified Files:
	qcomicbook.spec 
Log Message:
Foo



Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qcomicbook.spec	9 Oct 2006 16:21:19 -0000	1.7
+++ qcomicbook.spec	9 Oct 2006 16:43:27 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
 Version: 0.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -60,7 +60,7 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-* Mon Oct 09 2006 Scott Baker <scott at perturb.org> - 0.3.3-4
+* Mon Oct 09 2006 Scott Baker <scott at perturb.org> - 0.3.3-5
 - Build on FC6
 
 * Tue Sep 20 2006 Scott Baker <scott at perturb.org> - 0.3.3-2



From fedora-extras-commits at redhat.com  Mon Oct  9 16:47:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon,  9 Oct 2006 09:47:43 -0700
Subject: rpms/apcupsd/devel apcupsd-httpd.conf, 1.1, 1.2 apcupsd.spec, 1.10,
	1.11
Message-ID: <200610091647.k99Gljcl014479@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420/devel

Modified Files:
	apcupsd-httpd.conf apcupsd.spec 
Log Message:
- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
  Patch from Clive Messer (clive at vacuumtube.org.uk)



Index: apcupsd-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-httpd.conf	4 Nov 2005 23:42:56 -0000	1.1
+++ apcupsd-httpd.conf	9 Oct 2006 16:47:43 -0000	1.2
@@ -10,10 +10,10 @@
 # Change the ".example.com" to match your domain or modify
 # access rights to your needs to enable remote access also.
 #
-<Directory "/var/www/apcupsd/">
+<Directory "/var/www/apcupsd">
     DirectoryIndex upsstats.cgi
     AllowOverride None
-    Options ExecCGI
+    Options ExecCGI Indexes
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apcupsd.spec	30 Aug 2006 02:23:37 -0000	1.10
+++ apcupsd.spec	9 Oct 2006 16:47:43 -0000	1.11
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.12.4
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -143,6 +143,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-3
+- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
+  Patch from Clive Messer (clive at vacuumtube.org.uk)
+
 * Tue Aug 29 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-2
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Mon Oct  9 16:47:42 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon,  9 Oct 2006 09:47:42 -0700
Subject: rpms/apcupsd/FC-5 apcupsd-httpd.conf,1.1,1.2 apcupsd.spec,1.9,1.10
Message-ID: <200610091647.k99GliqT014474@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420/FC-5

Modified Files:
	apcupsd-httpd.conf apcupsd.spec 
Log Message:
- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
  Patch from Clive Messer (clive at vacuumtube.org.uk)



Index: apcupsd-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-5/apcupsd-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-httpd.conf	4 Nov 2005 23:42:56 -0000	1.1
+++ apcupsd-httpd.conf	9 Oct 2006 16:47:42 -0000	1.2
@@ -10,10 +10,10 @@
 # Change the ".example.com" to match your domain or modify
 # access rights to your needs to enable remote access also.
 #
-<Directory "/var/www/apcupsd/">
+<Directory "/var/www/apcupsd">
     DirectoryIndex upsstats.cgi
     AllowOverride None
-    Options ExecCGI
+    Options ExecCGI Indexes
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-5/apcupsd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apcupsd.spec	21 Aug 2006 16:43:00 -0000	1.9
+++ apcupsd.spec	9 Oct 2006 16:47:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.12.4
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -143,6 +143,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-2
+- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
+  Patch from Clive Messer (clive at vacuumtube.org.uk)  
+
 * Mon Aug 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-1
 - Update to 3.12.4
 



From fedora-extras-commits at redhat.com  Mon Oct  9 16:47:42 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon,  9 Oct 2006 09:47:42 -0700
Subject: rpms/apcupsd/FC-4 apcupsd-httpd.conf,1.1,1.2 apcupsd.spec,1.6,1.7
Message-ID: <200610091648.k99GmEgW014486@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420/FC-4

Modified Files:
	apcupsd-httpd.conf apcupsd.spec 
Log Message:
- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
  Patch from Clive Messer (clive at vacuumtube.org.uk)



Index: apcupsd-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/apcupsd-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-httpd.conf	4 Nov 2005 23:28:17 -0000	1.1
+++ apcupsd-httpd.conf	9 Oct 2006 16:47:41 -0000	1.2
@@ -10,10 +10,10 @@
 # Change the ".example.com" to match your domain or modify
 # access rights to your needs to enable remote access also.
 #
-<Directory "/var/www/apcupsd/">
+<Directory "/var/www/apcupsd">
     DirectoryIndex upsstats.cgi
     AllowOverride None
-    Options ExecCGI
+    Options ExecCGI Indexes
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/apcupsd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apcupsd.spec	21 Aug 2006 16:42:59 -0000	1.6
+++ apcupsd.spec	9 Oct 2006 16:47:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.12.4
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -143,6 +143,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-2
+- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
+  Patch from Clive Messer (clive at vacuumtube.org.uk)
+
 * Mon Aug 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-1
 - Update to 3.12.4
 



From fedora-extras-commits at redhat.com  Mon Oct  9 17:38:28 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  9 Oct 2006 10:38:28 -0700
Subject: rpms/snort/devel .cvsignore, 1.5, 1.6 snort.spec, 1.16, 1.17 sources,
	1.5, 1.6
Message-ID: <200610091738.k99HcU2U017783@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17754

Modified Files:
	.cvsignore snort.spec sources 
Log Message:
update to 2.6.0.2  and clean thing up somewhat.  make dynamic plugin saner 
actually have some plugins  not only the engine



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2006 02:32:27 -0000	1.5
+++ .cvsignore	9 Oct 2006 17:38:28 -0000	1.6
@@ -1 +1 @@
-snort-2.6.0.tar.gz
+snort-2.6.0.2.tar.gz


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- snort.spec	3 Sep 2006 03:40:21 -0000	1.16
+++ snort.spec	9 Oct 2006 17:38:28 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.6.0
-Release:        3%{?dist}
+Version:        2.6.0.2
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -159,7 +159,8 @@
 
 SNORT_BASE_CONFIG="--prefix=%{_prefix} \
                    --sysconfdir=%{_sysconfdir} \
-                   --with-libpcap-includes=/usr/include/pcap"
+                   --with-libpcap-includes=/usr/include/pcap \
+                   --enable-dynamicplugin"
 export LDFLAGS=-L/usr/lib64/mysql
 # there are some strange configure errors
 # when not doing a distclean between major builds.
@@ -173,6 +174,7 @@
 make %{?_smp_mflags}
 mv src/snort snort-plain
 mv src/dynamic-plugins/sf_engine/.libs/libsf_engine.so* .
+mv src/dynamic-preprocessors/build/usr/lib/snort_dynamicpreprocessor .
 make clean
 }
 
@@ -292,7 +294,7 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/etc/rc.d/init.d
 mkdir -p %{buildroot}%{_mandir}/man8
-mkdir -p %{buildroot}%{_libdir}/snort
+mkdir -p %{buildroot}%{_libdir}/snort/dynamicpreprocessor/
 
 {
 install snort-plain %{buildroot}%{_sbindir}/snort-plain
@@ -304,15 +306,33 @@
 install snort-snmp %{buildroot}%{_sbindir}/snort-snmp
 install snort-snmp+flexresp %{buildroot}%{_sbindir}/snort-snmp+flexresp
 install snort-bloat %{buildroot}%{_sbindir}/snort-bloat
+
+install libsf_engine.so %{buildroot}%{_libdir}/snort/dynamicengine
+install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine
+install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine
+
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
+
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
+install snort_dynamicpreprocessor/libsf_dns_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_dns_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
 }
 
-install libsf_engine.so %{buildroot}%{_libdir}/snort
 install snort.8 %{buildroot}%{_mandir}/man8
-install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
+install etc/generators  etc/gen-msg.map  etc/sid etc/sid-msg.map  etc/threshold.conf  etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
 install %{SOURCE1} %{buildroot}/etc/rc.d/init.d
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort/snort.conf
-
+perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf
+perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf
 
 %clean
 if [ -d %{buildroot} ]; then
@@ -324,6 +344,7 @@
 # make a symlink if there is no link
 ln -sf %{_sbindir}/snort-plain %{_sbindir}/snort
 /sbin/chkconfig --add snortd
+/sbin/ldconfig
 
 
 %preun
@@ -368,7 +389,7 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/* 
+%doc doc/* schemas/create_mysql schemas/create_postgresql 
 
 %attr(755,root,root) %{_sbindir}/snort-plain
 # handle compressed man pages.
@@ -404,6 +425,12 @@
 
 
 %changelog
+* Sun Oct 08 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-1
+- Update to 2.6.0.2
+- Realy add dynamic plugin
+- Make config know where the dynamic plugin is installed
+- add sql schema files to doc
+
 * Thu Jul 27 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0-3
 - add dynamic plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2006 02:32:27 -0000	1.5
+++ sources	9 Oct 2006 17:38:28 -0000	1.6
@@ -1 +1 @@
-88bb7f628e5bf1edc6409fbb126eaed0  snort-2.6.0.tar.gz
+5c094ff6d82db845a5f023e4a492103e  snort-2.6.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 18:00:34 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:00:34 -0700
Subject: rpms/gtkmm24/devel gtkmm.spec,1.18,1.19
Message-ID: <200610091801.k99I16NT020504@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17913/devel

Modified Files:
	gtkmm.spec 
Log Message:
simplified post and postun


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtkmm.spec	2 Oct 2006 23:52:21 -0000	1.18
+++ gtkmm.spec	9 Oct 2006 18:00:34 -0000	1.19
@@ -10,8 +10,6 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 BuildRequires:  glibmm24-devel >= 2.11.3
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel >= 1.5.2
@@ -70,12 +68,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files



From fedora-extras-commits at redhat.com  Mon Oct  9 18:00:34 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:00:34 -0700
Subject: rpms/gtkmm24/FC-5 gtkmm.spec,1.13,1.14
Message-ID: <200610091801.k99I17w1020527@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17913/FC-5

Modified Files:
	gtkmm.spec 
Log Message:
simplified post and postun


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-5/gtkmm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtkmm.spec	25 Jun 2006 23:50:05 -0000	1.13
+++ gtkmm.spec	9 Oct 2006 18:00:34 -0000	1.14
@@ -10,8 +10,6 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 BuildRequires:  glibmm24-devel >= 2.8.0
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel >= 1.10.0
@@ -68,12 +66,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files



From fedora-extras-commits at redhat.com  Mon Oct  9 18:21:18 2006
From: fedora-extras-commits at redhat.com (Matteo Ricchetti (mricchet))
Date: Mon,  9 Oct 2006 11:21:18 -0700
Subject: rpms/ss5/devel ss5.spec,1.3,1.4
Message-ID: <200610091821.k99ILKZ8021100@cvs-int.fedora.redhat.com>

Author: mricchet

Update of /cvs/extras/rpms/ss5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21083

Modified Files:
	ss5.spec 
Log Message:
Fix bug 209929


Index: ss5.spec
===================================================================
RCS file: /cvs/extras/rpms/ss5/devel/ss5.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ss5.spec	4 Oct 2006 22:14:03 -0000	1.3
+++ ss5.spec	9 Oct 2006 18:21:18 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.5.9
-Release: 3 
+Release: 4 
 License: GPL 
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
@@ -63,14 +63,18 @@
 %defattr(755,root,root)
 %{_localstatedir}/log/ss5
 
-%defattr(644,root,root)
+%defattr(0640,root,root)
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.conf
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.passwd
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
 
 %changelog
+*Mon Oct  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
+        * SS5-v3.5.9-4 released
+        * Fix security bug into spec file
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.5.9-3
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+        - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 *Tue Sep  26 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.5.9-2 released



From fedora-extras-commits at redhat.com  Mon Oct  9 18:24:47 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon,  9 Oct 2006 11:24:47 -0700
Subject: rpms/lincvs/devel crossvc.spec,1.1,1.2
Message-ID: <200610091824.k99IOnWD021229@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21212

Modified Files:
	crossvc.spec 
Log Message:
crossvc obsoletes lincvs


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/crossvc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crossvc.spec	27 Sep 2006 19:18:56 -0000	1.1
+++ crossvc.spec	9 Oct 2006 18:24:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.0
-Release:          1%{?dist}
+Release:          3%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -16,6 +16,9 @@
 BuildRequires:    desktop-file-utils
 Requires:         cvs >= 0:1.9.0
 
+Provides:         lincvs = %{version}-%{release}
+Obsoletes:        lincvs < 1.5.0
+
 %description
 CrossVC is a graphical Interface for the cvs client commandline tool 
 on the Unix and Windows platform. It allows ato load modules from a 
@@ -78,6 +81,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
+- Add Provides and Obsolete tag (#209917)
+
 * Wed Sep 27 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Oct  9 18:25:11 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:25:11 -0700
Subject: rpms/libglademm24/FC-5 .cvsignore, 1.5, 1.6 libglademm.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200610091825.k99IPDLE021295@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21272

Modified Files:
	.cvsignore libglademm.spec sources 
Log Message:
Update to 2.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Mar 2006 01:04:32 -0000	1.5
+++ .cvsignore	9 Oct 2006 18:25:11 -0000	1.6
@@ -1 +1 @@
-libglademm-2.6.2.tar.bz2
+libglademm-2.6.3.tar.bz2


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-5/libglademm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libglademm.spec	1 Mar 2006 01:04:32 -0000	1.9
+++ libglademm.spec	9 Oct 2006 18:25:11 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           libglademm24
-Version:        2.6.2
+Version:        2.6.3
 Release:        1
 
 Summary:        C++ wrapper for libglade
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-1
+- Update to 2.6.3
+
 * Tue Feb 28 2006 Denis Leroy <denis at poolshark.org> - 2.6.2-1
 - Update to version 2.6.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Mar 2006 01:04:32 -0000	1.5
+++ sources	9 Oct 2006 18:25:11 -0000	1.6
@@ -1 +1 @@
-431a7d04514cabe26fcaedd7767b6a93  libglademm-2.6.2.tar.bz2
+3dd3c3777c4407b8a330bd79089ddbfc  libglademm-2.6.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 18:25:36 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon,  9 Oct 2006 11:25:36 -0700
Subject: rpms/lincvs/FC-5 crossvc.spec,1.1,1.2
Message-ID: <200610091825.k99IPcNC021322@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21305

Modified Files:
	crossvc.spec 
Log Message:
crossvc obsoletes lincvs


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-5/crossvc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crossvc.spec	27 Sep 2006 19:16:17 -0000	1.1
+++ crossvc.spec	9 Oct 2006 18:25:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.0
-Release:          1%{?dist}
+Release:          3%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -16,6 +16,9 @@
 BuildRequires:    desktop-file-utils
 Requires:         cvs >= 0:1.9.0
 
+Provides:         lincvs = %{version}-%{release}
+Obsoletes:        lincvs < 1.5.0
+
 %description
 CrossVC is a graphical Interface for the cvs client commandline tool 
 on the Unix and Windows platform. It allows ato load modules from a 
@@ -78,6 +81,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
+- Add Provides and Obsolete tag (#209917)
+
 * Wed Sep 27 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Oct  9 18:27:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:27:05 -0700
Subject: rpms/glibmm24/FC-5 .cvsignore, 1.8, 1.9 glibmm.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200610091827.k99IR7pg021407@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glibmm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21386

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to 2.8.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Jun 2006 23:24:25 -0000	1.8
+++ .cvsignore	9 Oct 2006 18:27:05 -0000	1.9
@@ -1 +1 @@
-glibmm-2.8.9.tar.bz2
+glibmm-2.8.12.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/FC-5/glibmm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- glibmm.spec	25 Jun 2006 23:24:25 -0000	1.11
+++ glibmm.spec	9 Oct 2006 18:27:05 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           glibmm24
-Version:        2.8.9
+Version:        2.8.12
 Release:        1
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -77,6 +77,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.8.12-1
+- Update to 2.8.12
+
 * Sun Jun 25 2006 Denis Leroy <denis at poolshark.org> - 2.8.9-1
 - Update to 2.8.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jun 2006 23:24:25 -0000	1.9
+++ sources	9 Oct 2006 18:27:05 -0000	1.10
@@ -1 +1 @@
-6d23ba91546f51530421de5a1dc81fa8  glibmm-2.8.9.tar.bz2
+b414082d73c3bf08cafe4931565e10c0  glibmm-2.8.12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 18:27:52 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon,  9 Oct 2006 11:27:52 -0700
Subject: rpms/gtkmm24/FC-5 .cvsignore, 1.7, 1.8 gtkmm.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <200610091827.k99IRsUa021454@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21432

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to 2.8.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Jun 2006 23:30:29 -0000	1.7
+++ .cvsignore	9 Oct 2006 18:27:51 -0000	1.8
@@ -1 +1 @@
-gtkmm-2.8.8.tar.bz2
+gtkmm-2.8.9.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-5/gtkmm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gtkmm.spec	9 Oct 2006 18:00:34 -0000	1.14
+++ gtkmm.spec	9 Oct 2006 18:27:51 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           gtkmm24
-Version:        2.8.8
+Version:        2.8.9
 Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.8.9
+- Update to 2.8.9
+
 * Sun Jun 25 2006 Denis Leroy <denis at poolshark.org> - 2.8.8-1
 - Update to 2.8.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jun 2006 23:30:29 -0000	1.9
+++ sources	9 Oct 2006 18:27:51 -0000	1.10
@@ -1 +1 @@
-319a7847f67c5099a78afb495e148143  gtkmm-2.8.8.tar.bz2
+8462178accaf7a909eae0db53d181c32  gtkmm-2.8.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct  9 18:40:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  9 Oct 2006 11:40:06 -0700
Subject: owners owners.list,1.1805,1.1806
Message-ID: <200610091840.k99Ie89N021926@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21909

Modified Files:
	owners.list 
Log Message:
cpan2rpm, html-xml-utils, john, Sprog back to Gavin Henry (Till Maas added as co-maintainer of john due to info in Wiki).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1805
retrieving revision 1.1806
diff -u -r1.1805 -r1.1806
--- owners.list	9 Oct 2006 16:01:25 -0000	1.1805
+++ owners.list	9 Oct 2006 18:40:06 -0000	1.1806
@@ -226,7 +226,7 @@
 Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cowbell|Music Organizer|foolish at guezz.net|extras-qa at fedoraproject.org|
-Fedora Extras|cpan2rpm|Perl module packager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
+Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|cpanspec|RPM spec file generation utility|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org|
@@ -663,7 +663,7 @@
 Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|ht2html|The www.python.org Web site generator|ifoox at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|htb-util|Another tool to make your life easier with HTB|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ghenry at suretecsystems.com
+Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htmldoc|A tool for converting HTML source files into HTML, PostScript, or PDF|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -731,7 +731,7 @@
 Fedora Extras|jikes|A Java source file to bytecode compiler|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|jlint|Java program checker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|jogl|Java bindings for the OpenGL API|green at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|john|John the Ripper password cracker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ghenry at suretecsystems.com
+Fedora Extras|john|John the Ripper password cracker|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|opensource at till.name
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|jrtplib|JRTPLIB is an object-oriented RTP library written in C++|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -2066,7 +2066,7 @@
 Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ghenry at suretecsystems.com
+Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|imlinux at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|sqlite2|Embeddable SQL engine in a C library|imlinux at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|squidGuard|Filter, redirector and access controller plugin for squid|jwb at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 18:59:53 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  9 Oct 2006 11:59:53 -0700
Subject: rpms/snort/devel snort.spec,1.17,1.18
Message-ID: <200610091859.k99IxtFN022013@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21996

Modified Files:
	snort.spec 
Log Message:
disable smp



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- snort.spec	9 Oct 2006 17:38:28 -0000	1.17
+++ snort.spec	9 Oct 2006 18:59:52 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.6.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -171,7 +171,7 @@
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no 
-make %{?_smp_mflags}
+make
 mv src/snort snort-plain
 mv src/dynamic-plugins/sf_engine/.libs/libsf_engine.so* .
 mv src/dynamic-preprocessors/build/usr/lib/snort_dynamicpreprocessor .
@@ -185,7 +185,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-plain+flexresp
 make clean
 }
@@ -197,7 +197,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-mysql+flexresp
 make clean
 }
@@ -208,7 +208,7 @@
                               --with-postgresql=no \
                               --with-oracle=no \
                               --with-odbc=no
-make %{?_smp_mflags}
+make
 mv src/snort snort-mysql
 make clean
 }
@@ -222,7 +222,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-postgresql+flexresp
 make clean
 }
@@ -233,7 +233,7 @@
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no
-make %{?_smp_mflags}
+make
 mv src/snort snort-postgresql
 make clean
 }
@@ -247,7 +247,7 @@
                                     --with-snmp=/usr \
                                    --with-openssl
 
-make %{?_smp_mflags}
+make
 mv src/snort snort-snmp
 make clean
 }
@@ -262,7 +262,7 @@
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make %{?_smp_mflags}
+make
 mv src/snort snort-snmp+flexresp
  make clean
 }
@@ -276,7 +276,7 @@
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make %{?_smp_mflags}
+make
 mv src/snort snort-bloat
 make clean
 }
@@ -425,6 +425,9 @@
 
 
 %changelog
+* Mon Oct 09 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-2
+- disable smp  as it breaks build on the buildsys
+
 * Sun Oct 08 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-1
 - Update to 2.6.0.2
 - Realy add dynamic plugin



From fedora-extras-commits at redhat.com  Mon Oct  9 19:13:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon,  9 Oct 2006 12:13:47 -0700
Subject: rpms/Thunar/devel Thunar.spec,1.6,1.7
Message-ID: <200610091913.k99JDnrN025029@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25012

Modified Files:
	Thunar.spec 
Log Message:
Add shared-mime-info and xfce4-icon-theme as Requires (fixes #209592)



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Thunar.spec	6 Oct 2006 08:24:42 -0000	1.6
+++ Thunar.spec	9 Oct 2006 19:13:47 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Thunar File Manager
 Name: Thunar
 Version: 0.4.0
-Release: 0.10.rc1%{?dist}
+Release: 0.11.rc1%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
@@ -24,6 +24,8 @@
 BuildRequires: libxslt
 BuildRequires: GConf2-devel
 BuildRequires: gtk-doc
+Requires: shared-mime-info
+Requires: xfce4-icon-theme
 
 # obsolete xffm to allow for smooth upgrades
 Provides: xffm = 4.2.4
@@ -162,6 +164,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Oct 09 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.11.rc1
+- Add shared-mime-info and xfce4-icon-theme as Requires (fixes #209592)
+
 * Fri Oct 06 2006 Kevin Fenzi <kevin at tummy.com> - 0.4.0-0.10.rc1
 - Tweak Obsoletes versions
 



From fedora-extras-commits at redhat.com  Mon Oct  9 19:39:42 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  9 Oct 2006 12:39:42 -0700
Subject: rpms/snort/FC-5 snort.spec,1.11,1.12
Message-ID: <200610091939.k99JdiGr025269@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25252

Modified Files:
	snort.spec 
Log Message:
 update to 2.6.0.2



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/FC-5/snort.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- snort.spec	3 Sep 2006 03:44:46 -0000	1.11
+++ snort.spec	9 Oct 2006 19:39:42 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.6.0
-Release:        3%{?dist}
+Version:        2.6.0.2
+Release:        2%{?dist}
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -159,7 +159,8 @@
 
 SNORT_BASE_CONFIG="--prefix=%{_prefix} \
                    --sysconfdir=%{_sysconfdir} \
-                   --with-libpcap-includes=/usr/include/pcap"
+                   --with-libpcap-includes=/usr/include/pcap \
+                   --enable-dynamicplugin"
 export LDFLAGS=-L/usr/lib64/mysql
 # there are some strange configure errors
 # when not doing a distclean between major builds.
@@ -170,9 +171,10 @@
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no 
-make %{?_smp_mflags}
+make
 mv src/snort snort-plain
 mv src/dynamic-plugins/sf_engine/.libs/libsf_engine.so* .
+mv src/dynamic-preprocessors/build/usr/lib/snort_dynamicpreprocessor .
 make clean
 }
 
@@ -183,7 +185,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-plain+flexresp
 make clean
 }
@@ -195,7 +197,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-mysql+flexresp
 make clean
 }
@@ -206,7 +208,7 @@
                               --with-postgresql=no \
                               --with-oracle=no \
                               --with-odbc=no
-make %{?_smp_mflags}
+make
 mv src/snort snort-mysql
 make clean
 }
@@ -220,7 +222,7 @@
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make %{?_smp_mflags}
+make
 mv src/snort snort-postgresql+flexresp
 make clean
 }
@@ -231,7 +233,7 @@
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no
-make %{?_smp_mflags}
+make
 mv src/snort snort-postgresql
 make clean
 }
@@ -245,7 +247,7 @@
                                     --with-snmp=/usr \
                                    --with-openssl
 
-make %{?_smp_mflags}
+make
 mv src/snort snort-snmp
 make clean
 }
@@ -260,7 +262,7 @@
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make %{?_smp_mflags}
+make
 mv src/snort snort-snmp+flexresp
  make clean
 }
@@ -274,7 +276,7 @@
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make %{?_smp_mflags}
+make
 mv src/snort snort-bloat
 make clean
 }
@@ -292,7 +294,7 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/etc/rc.d/init.d
 mkdir -p %{buildroot}%{_mandir}/man8
-mkdir -p %{buildroot}%{_libdir}/snort
+mkdir -p %{buildroot}%{_libdir}/snort/dynamicpreprocessor/
 
 {
 install snort-plain %{buildroot}%{_sbindir}/snort-plain
@@ -304,15 +306,33 @@
 install snort-snmp %{buildroot}%{_sbindir}/snort-snmp
 install snort-snmp+flexresp %{buildroot}%{_sbindir}/snort-snmp+flexresp
 install snort-bloat %{buildroot}%{_sbindir}/snort-bloat
+
+install libsf_engine.so %{buildroot}%{_libdir}/snort/dynamicengine
+install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine
+install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine
+
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
+
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
+install snort_dynamicpreprocessor/libsf_dns_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_dns_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+install snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+
 }
 
-install libsf_engine.so %{buildroot}%{_libdir}/snort
 install snort.8 %{buildroot}%{_mandir}/man8
-install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
+install etc/generators  etc/gen-msg.map  etc/sid etc/sid-msg.map  etc/threshold.conf  etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
 install %{SOURCE1} %{buildroot}/etc/rc.d/init.d
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort/snort.conf
-
+perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf
+perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf
 
 %clean
 if [ -d %{buildroot} ]; then
@@ -324,6 +344,7 @@
 # make a symlink if there is no link
 ln -sf %{_sbindir}/snort-plain %{_sbindir}/snort
 /sbin/chkconfig --add snortd
+/sbin/ldconfig
 
 
 %preun
@@ -368,7 +389,7 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/* 
+%doc doc/* schemas/create_mysql schemas/create_postgresql 
 
 %attr(755,root,root) %{_sbindir}/snort-plain
 # handle compressed man pages.
@@ -404,6 +425,15 @@
 
 
 %changelog
+* Mon Oct 09 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-2
+- disable smp  as it breaks build on the buildsys
+
+* Sun Oct 08 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0.2-1
+- Update to 2.6.0.2
+- Realy add dynamic plugin
+- Make config know where the dynamic plugin is installed
+- add sql schema files to doc
+
 * Thu Jul 27 2006 Dennis Gilmore <dennis at ausil.us> - 2.6.0-3
 - add dynamic plugin
 



From fedora-extras-commits at redhat.com  Mon Oct  9 19:48:05 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  9 Oct 2006 12:48:05 -0700
Subject: rpms/snort/FC-5 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200610091948.k99Jm7AT025370@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25351

Modified Files:
	.cvsignore sources 
Log Message:
add the new source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snort/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2006 02:31:59 -0000	1.5
+++ .cvsignore	9 Oct 2006 19:48:05 -0000	1.6
@@ -1 +1 @@
-snort-2.6.0.tar.gz
+snort-2.6.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snort/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2006 02:31:59 -0000	1.5
+++ sources	9 Oct 2006 19:48:05 -0000	1.6
@@ -1 +1 @@
-88bb7f628e5bf1edc6409fbb126eaed0  snort-2.6.0.tar.gz
+5c094ff6d82db845a5f023e4a492103e  snort-2.6.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 20:24:04 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:24:04 -0700
Subject: rpms/oorexx - New directory
Message-ID: <200610092024.k99KO6Av028631@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28605/oorexx

Log Message:
Directory /cvs/extras/rpms/oorexx added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 20:24:05 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:24:05 -0700
Subject: rpms/oorexx/devel - New directory
Message-ID: <200610092024.k99KO7jh028634@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28605/oorexx/devel

Log Message:
Directory /cvs/extras/rpms/oorexx/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 20:24:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:24:20 -0700
Subject: rpms/oorexx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610092024.k99KOMdK028688@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28655

Added Files:
	Makefile import.log 
Log Message:
Setup of module oorexx


--- NEW FILE Makefile ---
# Top level Makefile for module oorexx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  9 20:24:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:24:21 -0700
Subject: rpms/oorexx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610092024.k99KON8r028691@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28655/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oorexx


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  9 20:33:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:33:12 -0700
Subject: rpms/oorexx import.log,1.1,1.2
Message-ID: <200610092033.k99KXEL8028869@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833

Modified Files:
	import.log 
Log Message:
auto-import oorexx-3.1.0-1 on branch devel from oorexx-3.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oorexx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Oct 2006 20:24:20 -0000	1.1
+++ import.log	9 Oct 2006 20:33:12 -0000	1.2
@@ -0,0 +1 @@
+oorexx-3_1_0-1:HEAD:oorexx-3.1.0-1.src.rpm:1160425985



From fedora-extras-commits at redhat.com  Mon Oct  9 20:33:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:33:13 -0700
Subject: rpms/oorexx/devel oorexx-paths.patch, NONE, 1.1 oorexx.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610092033.k99KXFGA028876@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	oorexx-paths.patch oorexx.spec 
Log Message:
auto-import oorexx-3.1.0-1 on branch devel from oorexx-3.1.0-1.src.rpm

oorexx-paths.patch:

--- NEW FILE oorexx-paths.patch ---
--- ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp.paths	2006-09-25 19:11:07.000000000 +0200
+++ ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp	2006-09-25 19:12:09.000000000 +0200
@@ -427,6 +427,9 @@
 //  fullname = (PSZ)string_data(imgpath);
 
 //if ( imgpath && fullname )                         /* seg faultn          */
+  if (fullname == 0) {
+    fullname = SearchFileName((PCHAR)"/usr/share/ooRexx/" BASEIMAGE, 'P');
+  }
   if ( fullname != OREF_NULL )
     image = fopen((PSZ)fullname, "rb");/* try to open the file              */
   else
--- ooRexx-3.1.0/Makefile.in.paths	2006-09-25 19:12:21.000000000 +0200
+++ ooRexx-3.1.0/Makefile.in	2006-09-25 19:14:15.000000000 +0200
@@ -60,7 +60,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -415,7 +415,7 @@
 			compile @REXXCAT@ rexx.img \
 			stamp-h.in cscope.files cscope.out $(distdir).tar.gz
 
-SUBDIRS = samples
+SUBDIRS =
 DIST_SUBDIRS = samples
 
 # This defines the current version of ooRexx
@@ -462,7 +462,7 @@
 samples_dir = $(top_srcdir)/samples
 samples_windows_dir = $(top_srcdir)/samples/windows
 samples_unix_dir = $(top_srcdir)/samples/unix
-catdir = $(prefix)/bin
+catdir = $(datadir)/ooRexx
 COMMON_CPPFLAGS = -DORX_VER=$(ORX_MAJOR) -DORX_REL=$(ORX_MINOR) -DORX_MOD=$(ORX_MOD_LVL) -DORX_FIX=0 \
                   -DORX_SYS_STR=\"@ORX_SYS_STR@\" \
                   -DORX_CATDIR=\"$(catdir)\" \
@@ -3170,7 +3170,7 @@
 	echo $(DESTDIR) is destdir
 	echo $(prefix) is prefix
 	echo $(install_sh_PROGRAM)
-	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(prefix)/bin/rexx.img
+	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(datadir)/ooRexx/rexx.img
 	if test -z "$(GENCAT)"; then \
 		echo "No rexx.cat to install"; \
 	else \
@@ -3181,9 +3181,9 @@
 	$(install_sh_SCRIPT) $(rexutils_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
 	for a in $(samples_dir)/*.rex; do \
 		bn=`basename $$a`; \
-		$(install_sh_SCRIPT) $$a $(DESTDIR)$(prefix)/share/ooRexx/$$bn; \
+		$(install_sh_SCRIPT) $$a $(DESTDIR)$(datadir)/ooRexx/$$bn; \
 	done;
-	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(prefix)/share/ooRexx/readme
+	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(datadir)/ooRexx/readme
 
 package:
 	./rexx $(top_srcdir)/platform/unix/makepkg.rex @PACKAGETYPE@ $(ORX_MAJOR).$(ORX_MINOR).$(ORX_MOD_LVL) $(target) $(prefix) $(DESTDIR)


--- NEW FILE oorexx.spec ---
Name:           oorexx
Version:        3.1.0
Release:        1%{?dist}
Summary:        Open Object Rexx

Group:          Development/Languages
License:        CPL
URL:            http://www.oorexx.org
Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-1.src.tar.gz
Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
Patch0:         oorexx-paths.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
Open Object Rexx is an object-oriented scripting language. The
language is designed for "non-programmer" type users, so it is easy to
learn and easy to use, and provides an excellent vehicle to enter the
world of object-oriented programming without much effort.

It extends the procedural way of programming with object-oriented
features that allow you to gradually change your programming style as
you learn more about objects.

%package libs
Summary:        Libraries for ooRexx
Group:          System Environment/Libraries

%description libs
Libraries for ooRexx.


%package docs
Summary:        Documentation for ooRexx
Group:          Development/Languages
Requires:       %{name} = %{version}-%{release}

%description docs
Documentation for ooRexx.


%package devel
Summary:        Header files and libraries for ooRexx
Group:          Development/Languages
Requires:       %{name} = %{version}-%{release}
Requires:       %{name}-libs = %{version}-%{release}

%description devel
Header files and libraries for ooRexx.


%prep
%setup -q -n ooRexx-%{version}
%setup1 -q -n ooRexx-%{version} -a1
%patch0 -p1 -b .paths


%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 '{}' ';'
rm -fr samples/**/.deps
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.csh
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.sh
mv $RPM_BUILD_ROOT%{_bindir}/rxftp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
mv $RPM_BUILD_ROOT%{_bindir}/rxregexp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
chmod 0644 $RPM_BUILD_ROOT%{_datadir}/ooRexx/*

# remove cruft
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/{*.rex,readme}
find . -name .deps | xargs rm -fr
rm -fr samples/windows

%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc CPLv1.0.txt README.txt readme.pdf
%{_bindir}/rexx
%{_bindir}/rexxc
%{_bindir}/rxdelipc
%{_bindir}/rxmigrate
%{_bindir}/rxqueue
%{_bindir}/rxsubcom
%{_datadir}/ooRexx
%{_mandir}/man*/*


%files docs
%defattr(-,root,root,-)
%doc rexxpg.pdf rexxref.pdf rxftp.pdf rxmath.pdf rxsock.pdf
%doc samples


%files devel
%defattr(-,root,root,-)
%{_includedir}/rexx.h
%{_libdir}/lib*.so
%{_bindir}/oorexx-config


%files libs
%defattr(-,root,root,-)
%doc CPLv1.0.txt
%{_libdir}/lib*.so.*


%changelog
* Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
- new version 3.1.0

* Tue May  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.0.0-1
- First Fedora release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Oct 2006 20:24:21 -0000	1.1
+++ .cvsignore	9 Oct 2006 20:33:13 -0000	1.2
@@ -0,0 +1,2 @@
+ooRexx-3.1.0-1.src.tar.gz
+ooRexx-docs-3.1.0-pdf.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Oct 2006 20:24:21 -0000	1.1
+++ sources	9 Oct 2006 20:33:13 -0000	1.2
@@ -0,0 +1,2 @@
+136ae4eb8df72557e10f193b980f9e9f  ooRexx-3.1.0-1.src.tar.gz
+17bc9188b858aedc579f57b7ded73260  ooRexx-docs-3.1.0-pdf.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 20:48:06 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:48:06 -0700
Subject: rpms/oorexx/devel oorexx.spec,1.1,1.2
Message-ID: <200610092048.k99Km8uc029418@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29400

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oorexx.spec	9 Oct 2006 20:33:13 -0000	1.1
+++ oorexx.spec	9 Oct 2006 20:48:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  sed
 
 
 %description
@@ -53,7 +54,7 @@
 %setup -q -n ooRexx-%{version}
 %setup1 -q -n ooRexx-%{version} -a1
 %patch0 -p1 -b .paths
-
+sed -i 's|-m32||' configure
 
 %build
 %configure --disable-static
@@ -119,6 +120,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-2
+- remove -m32 flag for compiling on 64-bit systems
+
 * Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
 - new version 3.1.0
 



From fedora-extras-commits at redhat.com  Mon Oct  9 20:55:01 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 13:55:01 -0700
Subject: owners owners.list,1.1806,1.1807
Message-ID: <200610092055.k99Kt3aq029555@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29535

Modified Files:
	owners.list 
Log Message:
added oorexx


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1806
retrieving revision 1.1807
diff -u -r1.1806 -r1.1807
--- owners.list	9 Oct 2006 18:40:06 -0000	1.1806
+++ owners.list	9 Oct 2006 20:55:01 -0000	1.1807
@@ -1154,6 +1154,7 @@
 Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ooo2txt|Convert OpenOffice documents to simple text|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|oooqs2|OpenOffice.org Quickstarter 2|dennis at ausil.us|extras-qa at fedoraproject.org|
+Fedora Extras|oorexx|Open Object Rexx|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|openalpp|Object Oriented version of OpenAL|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
 Fedora Extras|openbabel|Chemistry software file format converter|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 21:11:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:11:18 -0700
Subject: rpms/oorexx/devel oorexx.spec,1.2,1.3
Message-ID: <200610092111.k99LBKsO032613@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32596

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oorexx.spec	9 Oct 2006 20:48:06 -0000	1.2
+++ oorexx.spec	9 Oct 2006 21:11:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -11,6 +11,7 @@
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  sed
+BuildRequires:  /usr/include/gnu/stubs-32.h
 
 
 %description
@@ -54,7 +55,7 @@
 %setup -q -n ooRexx-%{version}
 %setup1 -q -n ooRexx-%{version} -a1
 %patch0 -p1 -b .paths
-sed -i 's|-m32||' configure
+
 
 %build
 %configure --disable-static
@@ -120,8 +121,10 @@
 
 
 %changelog
-* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-2
-- remove -m32 flag for compiling on 64-bit systems
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-3
+- Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
+  glibc32 correctly
+
 
 * Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
 - new version 3.1.0



From fedora-extras-commits at redhat.com  Mon Oct  9 21:15:14 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:15:14 -0700
Subject: rpms/abcMIDI/devel abcMIDI.spec,1.8,1.9
Message-ID: <200610092115.k99LFGvY032688@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32671

Modified Files:
	abcMIDI.spec 
Log Message:
new version 20061005


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcMIDI.spec	11 Sep 2006 14:58:07 -0000	1.8
+++ abcMIDI.spec	9 Oct 2006 21:15:14 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20060910
+Version:        20061005
 Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-09-10.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-05.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061005-1
+- new version 20061005
+
 * Mon Sep 11 2006 Gerard Milmeister <gemi at bluewin.ch> - 20060910-1
 - new version 20060910
 



From fedora-extras-commits at redhat.com  Mon Oct  9 21:17:50 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:17:50 -0700
Subject: rpms/abcMIDI/devel .cvsignore, 1.8, 1.9 abcMIDI.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200610092118.k99LIMj3000320@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32745/devel

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061005


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Sep 2006 14:58:07 -0000	1.8
+++ .cvsignore	9 Oct 2006 21:17:50 -0000	1.9
@@ -1 +1 @@
-abcMIDI-2006-09-10.zip
+abcMIDI-2006-10-05.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcMIDI.spec	9 Oct 2006 21:15:14 -0000	1.9
+++ abcMIDI.spec	9 Oct 2006 21:17:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           abcMIDI
 Version:        20061005
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Sep 2006 14:58:07 -0000	1.8
+++ sources	9 Oct 2006 21:17:50 -0000	1.9
@@ -1 +1 @@
-4adbe3b6ab3493c22592084ad96087a8  abcMIDI-2006-09-10.zip
+ddcee30163fecd9fbc4fbb72a934b4fa  abcMIDI-2006-10-05.zip



From fedora-extras-commits at redhat.com  Mon Oct  9 21:17:49 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:17:49 -0700
Subject: rpms/abcMIDI/FC-5 .cvsignore, 1.8, 1.9 abcMIDI.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200610092118.k99LILsK000315@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32745/FC-5

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061005


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Sep 2006 14:58:06 -0000	1.8
+++ .cvsignore	9 Oct 2006 21:17:49 -0000	1.9
@@ -1 +1 @@
-abcMIDI-2006-09-10.zip
+abcMIDI-2006-10-05.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcMIDI.spec	11 Sep 2006 14:58:06 -0000	1.7
+++ abcMIDI.spec	9 Oct 2006 21:17:49 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20060910
-Release:        1%{?dist}
+Version:        20061005
+Release:        2%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-09-10.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-05.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061005-1
+- new version 20061005
+
 * Mon Sep 11 2006 Gerard Milmeister <gemi at bluewin.ch> - 20060910-1
 - new version 20060910
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Sep 2006 14:58:06 -0000	1.8
+++ sources	9 Oct 2006 21:17:49 -0000	1.9
@@ -1 +1 @@
-4adbe3b6ab3493c22592084ad96087a8  abcMIDI-2006-09-10.zip
+ddcee30163fecd9fbc4fbb72a934b4fa  abcMIDI-2006-10-05.zip



From fedora-extras-commits at redhat.com  Mon Oct  9 21:24:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  9 Oct 2006 14:24:55 -0700
Subject: rpms/oorexx/devel oorexx.spec,1.3,1.4
Message-ID: <200610092124.k99LOvdd000439@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv422

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oorexx.spec	9 Oct 2006 21:11:18 -0000	1.3
+++ oorexx.spec	9 Oct 2006 21:24:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,8 +10,7 @@
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  sed
-BuildRequires:  /usr/include/gnu/stubs-32.h
+ExclusiveArch:  i386
 
 
 %description
@@ -121,10 +120,8 @@
 
 
 %changelog
-* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-3
-- Add BuildRequires: for gnu/stubs-32.h so that x86_64 builds pick up
-  glibc32 correctly
-
+* Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-4
+- Build exclusively on i386 for now
 
 * Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
 - new version 3.1.0



From fedora-extras-commits at redhat.com  Mon Oct  9 21:40:53 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:40:53 -0700
Subject: rpms/ruby-racc/devel - New directory
Message-ID: <200610092140.k99LetWe000718@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv689/ruby-racc/devel

Log Message:
Directory /cvs/extras/rpms/ruby-racc/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 21:40:52 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:40:52 -0700
Subject: rpms/ruby-racc - New directory
Message-ID: <200610092140.k99LesEH000715@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv689/ruby-racc

Log Message:
Directory /cvs/extras/rpms/ruby-racc added to the repository




From fedora-extras-commits at redhat.com  Mon Oct  9 21:41:11 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:41:11 -0700
Subject: rpms/ruby-racc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610092141.k99LfDex000767@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734

Added Files:
	Makefile import.log 
Log Message:
Setup of module ruby-racc


--- NEW FILE Makefile ---
# Top level Makefile for module ruby-racc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct  9 21:41:12 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:41:12 -0700
Subject: rpms/ruby-racc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610092141.k99LfEpf000770@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ruby-racc


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct  9 21:41:51 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:41:51 -0700
Subject: rpms/ruby-racc import.log,1.1,1.2
Message-ID: <200610092141.k99LfrkM000831@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv798

Modified Files:
	import.log 
Log Message:
auto-import ruby-racc-1.4.5-2 on branch devel from ruby-racc-1.4.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ruby-racc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Oct 2006 21:41:11 -0000	1.1
+++ import.log	9 Oct 2006 21:41:51 -0000	1.2
@@ -0,0 +1 @@
+ruby-racc-1_4_5-2:HEAD:ruby-racc-1.4.5-2.src.rpm:1160430101



From fedora-extras-commits at redhat.com  Mon Oct  9 21:41:52 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:41:52 -0700
Subject: rpms/ruby-racc/devel ruby-racc.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610092141.k99LfsVu000836@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-racc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv798/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ruby-racc.spec 
Log Message:
auto-import ruby-racc-1.4.5-2 on branch devel from ruby-racc-1.4.5-2.src.rpm


--- NEW FILE ruby-racc.spec ---
%define rname racc
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}


Summary: LALR(1) Parser Generator
Name: ruby-%{rname}
Version: 1.4.5
Release: 2%{?dist}
URL: http://i.loveruby.net/en/racc.html
Source0: http://i.loveruby.net/archive/racc/%{rname}-%{version}-all.tar.gz
License: LGPL
Group: Development/Tools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(abi) = 1.8
BuildRequires: ruby
BuildRequires: ruby(abi) = 1.8
Provides: ruby(racc) = 1.4.5
BuildArch: noarch 

%description
Racc is Ruby yACC. It is written in Ruby and generates ruby code.
Now almost all functions of yacc are implemented.

%prep
%setup -q -n %{rname}-%{version}-all 

%build
ruby setup.rb config --bin-dir=%{_bindir} --rb-dir=%{ruby_sitelib} --with=racc
ruby setup.rb setup

%install
rm -rf %buildroot
ruby setup.rb install --prefix=%buildroot

%check
cd packages/racc/test
ruby test.rb

%clean
rm -rf %buildroot

%files
%defattr(-,root,root)
%{ruby_sitelib}/racc
%{_bindir}/racc
%{_bindir}/racc2y
%{_bindir}/y2racc
%doc packages/racc/COPYING README.* packages/racc/NEWS.* packages/racc/doc.*

%changelog
* Fri Aug 11 2006 David Lutterkort <dlutter at redhat.com> - 1.4.5-2
- Brought in accordance with packaging guidelines
- Add %%check to run the tests

* Mon Feb  6 2006 David Lutterkort <dlutter at redhat.com> - 1.4.5-1
- Adapted for Fedora

* Sun Nov 21 2005 Pascal Terjan <pterjan at mandriva.org> 1.4.5-1mdk
- 1.4.5
- mkrel

* Sun Apr 17 2005 Pascal Terjan <pterjan at mandrake.org> 1.4.4-3mdk
- fix lib64

* Fri Oct 22 2004 Pascal Terjan <pterjan at mandrake.org> 1.4.4-2mdk
- rebuild

* Thu Dec 25 2003 Pascal Terjan <CMoi at tuxfamily.org> 1.4.4-1mdk 
- first mdk release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-racc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Oct 2006 21:41:12 -0000	1.1
+++ .cvsignore	9 Oct 2006 21:41:52 -0000	1.2
@@ -0,0 +1 @@
+racc-1.4.5-all.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-racc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Oct 2006 21:41:12 -0000	1.1
+++ sources	9 Oct 2006 21:41:52 -0000	1.2
@@ -0,0 +1 @@
+c23ee98abe79f051243adf04d4a82900  racc-1.4.5-all.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 21:43:52 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon,  9 Oct 2006 14:43:52 -0700
Subject: owners owners.list,1.1807,1.1808
Message-ID: <200610092143.k99Lhs8j000923@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv906

Modified Files:
	owners.list 
Log Message:
Added entry for ruby-racc


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1807
retrieving revision 1.1808
diff -u -r1.1807 -r1.1808
--- owners.list	9 Oct 2006 20:55:01 -0000	1.1807
+++ owners.list	9 Oct 2006 21:43:52 -0000	1.1808
@@ -1980,6 +1980,7 @@
 Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-mysql|A Ruby interface to MySQL|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-postgres|A Ruby interface to Postgres|dlutter at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ruby-racc|A Ruby LALR(1) Parser Generator|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-sqlite3|A Ruby interface to SQLite|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct  9 21:47:49 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon,  9 Oct 2006 14:47:49 -0700
Subject: rpms/lilypond/devel .cvsignore, 1.4, 1.5 lilypond.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200610092147.k99Llpgd001017@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv996

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Aug 2006 21:33:01 -0000	1.4
+++ .cvsignore	9 Oct 2006 21:47:48 -0000	1.5
@@ -1 +1 @@
-lilypond-2.8.6.tar.gz
+lilypond-2.8.7.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lilypond.spec	6 Sep 2006 19:38:51 -0000	1.4
+++ lilypond.spec	9 Oct 2006 21:47:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.8.6
-Release:	2%{?dist}
+Version:	2.8.7
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.7-1
+- New release.
+
 * Wed Sep  6 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.6-2
 - Rebuild for FC6
 - Update directory for vim.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Aug 2006 21:33:01 -0000	1.4
+++ sources	9 Oct 2006 21:47:48 -0000	1.5
@@ -1 +1 @@
-e1c2e8c337e7b46e8f4210882597deac  lilypond-2.8.6.tar.gz
+f2513f545adb211a256c21cc6b28ab3a  lilypond-2.8.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 21:50:10 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon,  9 Oct 2006 14:50:10 -0700
Subject: rpms/lilypond/FC-5 .cvsignore, 1.4, 1.5 lilypond.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200610092150.k99LoCZk001110@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1089

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Aug 2006 15:53:42 -0000	1.4
+++ .cvsignore	9 Oct 2006 21:50:10 -0000	1.5
@@ -1 +1 @@
-lilypond-2.8.6.tar.gz
+lilypond-2.8.7.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/lilypond.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lilypond.spec	6 Sep 2006 19:37:26 -0000	1.6
+++ lilypond.spec	9 Oct 2006 21:50:10 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.8.6
-Release:	2%{?dist}
+Version:	2.8.7
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.7-1
+- New release.
+
 * Wed Sep  6 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.6-2
 - Update directory for vim.
 - Don't ghost .pyo files, as per changes in packaging guidelines (bug 205387).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2006 15:53:42 -0000	1.4
+++ sources	9 Oct 2006 21:50:10 -0000	1.5
@@ -1 +1 @@
-e1c2e8c337e7b46e8f4210882597deac  lilypond-2.8.6.tar.gz
+f2513f545adb211a256c21cc6b28ab3a  lilypond-2.8.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct  9 22:28:36 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon,  9 Oct 2006 15:28:36 -0700
Subject: owners owners.list,1.1808,1.1809
Message-ID: <200610092228.k99MScE2004386@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4364

Modified Files:
	owners.list 
Log Message:
unorphaning mantis



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1808
retrieving revision 1.1809
diff -u -r1.1808 -r1.1809
--- owners.list	9 Oct 2006 21:43:52 -0000	1.1808
+++ owners.list	9 Oct 2006 22:28:35 -0000	1.1809
@@ -1006,7 +1006,7 @@
 Fedora Extras|manaworld|2D mmorpg game|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|manaworld-music|Music files for manaworld|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|manedit|GUI editor for creating man pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|mantis|A web-based bugtracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
+Fedora Extras|mantis|A web-based bugtracking system|giallu at gmail.com|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|mboxgrep|Displays e-mail messages matching a pattern|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 00:35:01 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:35:01 -0700
Subject: rpms/quarry/FC-3 gtp-client.diff,NONE,1.1 quarry.spec,1.2,1.3
Message-ID: <200610100035.k9A0ZYLY010894@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10820/FC-3

Modified Files:
	quarry.spec 
Added Files:
	gtp-client.diff 
Log Message:
Upstream patch for bug in string handling manifested in x86_64 build


gtp-client.diff:

--- NEW FILE gtp-client.diff ---
--- quarry-0.1.19/src/gtp/gtp-client.c.orig	2006-02-24 15:47:39.000000000 -0500
+++ quarry-0.1.19/src/gtp/gtp-client.c	2006-10-09 20:25:54.000000000 -0400
@@ -536,7 +536,7 @@
   game_format_position_list (GAME_GO, client->board_size, client->board_size,
 			     &buffer, handicap_stones);
   send_command (client, response_callback, user_data,
-		"set_free_handicap %s", buffer);
+		"set_free_handicap %s", buffer.string);
 
   string_buffer_dispose (&buffer);
 }
@@ -612,7 +612,7 @@
 
   send_command (client, response_callback, user_data,
 		client->protocol_version != 1 ? "play %s %s" : "%s %s",
-		COLOR_STRING (color), move_buffer);
+		COLOR_STRING (color), move_buffer.string);
 
   string_buffer_dispose (&move_buffer);
 }


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/quarry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quarry.spec	8 Oct 2006 13:34:11 -0000	1.2
+++ quarry.spec	10 Oct 2006 00:35:01 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           quarry
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+Patch0:		gtp-client.diff
 #Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-2
+- Incorporated upstream patch to fix gtp-client string handling
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
 - Update to 0.1.19
 



From fedora-extras-commits at redhat.com  Tue Oct 10 00:35:02 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:35:02 -0700
Subject: rpms/quarry/FC-4 gtp-client.diff,NONE,1.1 quarry.spec,1.2,1.3
Message-ID: <200610100035.k9A0ZY7L010897@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10820/FC-4

Modified Files:
	quarry.spec 
Added Files:
	gtp-client.diff 
Log Message:
Upstream patch for bug in string handling manifested in x86_64 build


gtp-client.diff:

--- NEW FILE gtp-client.diff ---
--- quarry-0.1.19/src/gtp/gtp-client.c.orig	2006-02-24 15:47:39.000000000 -0500
+++ quarry-0.1.19/src/gtp/gtp-client.c	2006-10-09 20:25:54.000000000 -0400
@@ -536,7 +536,7 @@
   game_format_position_list (GAME_GO, client->board_size, client->board_size,
 			     &buffer, handicap_stones);
   send_command (client, response_callback, user_data,
-		"set_free_handicap %s", buffer);
+		"set_free_handicap %s", buffer.string);
 
   string_buffer_dispose (&buffer);
 }
@@ -612,7 +612,7 @@
 
   send_command (client, response_callback, user_data,
 		client->protocol_version != 1 ? "play %s %s" : "%s %s",
-		COLOR_STRING (color), move_buffer);
+		COLOR_STRING (color), move_buffer.string);
 
   string_buffer_dispose (&move_buffer);
 }


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/quarry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quarry.spec	8 Oct 2006 13:34:12 -0000	1.2
+++ quarry.spec	10 Oct 2006 00:35:02 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           quarry
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+Patch0:		gtp-client.diff
 #Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-2
+- Incorporated upstream patch to fix gtp-client string handling
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
 - Update to 0.1.19
 



From fedora-extras-commits at redhat.com  Tue Oct 10 00:35:03 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:35:03 -0700
Subject: rpms/quarry/FC-5 gtp-client.diff,NONE,1.1 quarry.spec,1.3,1.4
Message-ID: <200610100035.k9A0ZZ18010900@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10820/FC-5

Modified Files:
	quarry.spec 
Added Files:
	gtp-client.diff 
Log Message:
Upstream patch for bug in string handling manifested in x86_64 build


gtp-client.diff:

--- NEW FILE gtp-client.diff ---
--- quarry-0.1.19/src/gtp/gtp-client.c.orig	2006-02-24 15:47:39.000000000 -0500
+++ quarry-0.1.19/src/gtp/gtp-client.c	2006-10-09 20:25:54.000000000 -0400
@@ -536,7 +536,7 @@
   game_format_position_list (GAME_GO, client->board_size, client->board_size,
 			     &buffer, handicap_stones);
   send_command (client, response_callback, user_data,
-		"set_free_handicap %s", buffer);
+		"set_free_handicap %s", buffer.string);
 
   string_buffer_dispose (&buffer);
 }
@@ -612,7 +612,7 @@
 
   send_command (client, response_callback, user_data,
 		client->protocol_version != 1 ? "play %s %s" : "%s %s",
-		COLOR_STRING (color), move_buffer);
+		COLOR_STRING (color), move_buffer.string);
 
   string_buffer_dispose (&move_buffer);
 }


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/quarry.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quarry.spec	8 Oct 2006 13:34:17 -0000	1.3
+++ quarry.spec	10 Oct 2006 00:35:03 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           quarry
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+Patch0:		gtp-client.diff
 #Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-2
+- Incorporated upstream patch to fix gtp-client string handling
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
 - Update to 0.1.19
 



From fedora-extras-commits at redhat.com  Tue Oct 10 00:35:04 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:35:04 -0700
Subject: rpms/quarry/devel gtp-client.diff,NONE,1.1 quarry.spec,1.3,1.4
Message-ID: <200610100035.k9A0ZamT010903@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10820/devel

Modified Files:
	quarry.spec 
Added Files:
	gtp-client.diff 
Log Message:
Upstream patch for bug in string handling manifested in x86_64 build


gtp-client.diff:

--- NEW FILE gtp-client.diff ---
--- quarry-0.1.19/src/gtp/gtp-client.c.orig	2006-02-24 15:47:39.000000000 -0500
+++ quarry-0.1.19/src/gtp/gtp-client.c	2006-10-09 20:25:54.000000000 -0400
@@ -536,7 +536,7 @@
   game_format_position_list (GAME_GO, client->board_size, client->board_size,
 			     &buffer, handicap_stones);
   send_command (client, response_callback, user_data,
-		"set_free_handicap %s", buffer);
+		"set_free_handicap %s", buffer.string);
 
   string_buffer_dispose (&buffer);
 }
@@ -612,7 +612,7 @@
 
   send_command (client, response_callback, user_data,
 		client->protocol_version != 1 ? "play %s %s" : "%s %s",
-		COLOR_STRING (color), move_buffer);
+		COLOR_STRING (color), move_buffer.string);
 
   string_buffer_dispose (&move_buffer);
 }


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quarry.spec	8 Oct 2006 13:34:18 -0000	1.3
+++ quarry.spec	10 Oct 2006 00:35:03 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           quarry
 Version:        0.1.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
+Patch0:		gtp-client.diff
 #Source0:	quarry-%{version}.tar.bz2
 #Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-2
+- Incorporated upstream patch to fix gtp-client string handling
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.1.19-1
 - Update to 0.1.19
 



From fedora-extras-commits at redhat.com  Tue Oct 10 00:42:07 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:42:07 -0700
Subject: owners owners.list,1.1809,1.1810
Message-ID: <200610100042.k9A0g9U6011140@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11123

Modified Files:
	owners.list 
Log Message:
Taking back my orphaned packages



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1809
retrieving revision 1.1810
diff -u -r1.1809 -r1.1810
--- owners.list	9 Oct 2006 22:28:35 -0000	1.1809
+++ owners.list	10 Oct 2006 00:42:07 -0000	1.1810
@@ -563,7 +563,7 @@
 Fedora Extras|gnubiff|A mail notification program|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnucap|The Gnu Circuit Analysis Package|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
-Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|gnugo|Text based go program|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gnustep-make|GNUstep makefile package|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
@@ -593,7 +593,7 @@
 Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|grepmail|Search mailboxes for a particular email|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|gresistor|Gnome resistor color code calculator|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|grhino|Reversi game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|grhino|Reversi game|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gstm|A front-end to ssh tunneling|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -1858,7 +1858,7 @@
 Fedora Extras|python-musicbrainz2|Library which provides access to the MusicBrainz Database|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-mutagen|Python module to handle audio metadata|mr.ecik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-myghty|A Python-based templating system derived from HTML::Mason|lmacken at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-nltk|Python-based Natural Language Toolkit|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|michel.salim at gmail.com
+Fedora Extras|python-nltk|Python-based Natural Language Toolkit|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-nose|A discovery-based unittest extension for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numarray|Python array manipulation and computational library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 00:45:00 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:45:00 -0700
Subject: rpms/python-nltk/devel python-nltk.spec, 1.1, 1.2 needs.rebuild, 1.1,
	NONE
Message-ID: <200610100045.k9A0j2BU011173@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11151

Modified Files:
	python-nltk.spec 
Removed Files:
	needs.rebuild 
Log Message:
Release bump for FE6



Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/devel/python-nltk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-nltk.spec	17 Nov 2005 05:22:25 -0000	1.1
+++ python-nltk.spec	10 Oct 2006 00:45:00 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-nltk
 Version:        1.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -64,5 +64,8 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 1.4.4-2
+- Rebuild for FE6
+
 * Sun Sep 11 2005 Michel Salim <michel.salim[AT]gmail.com> - 1.4.4-1
 - Initial package


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 00:55:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:55:34 -0700
Subject: rpms/gnugo/devel gnugo.spec,1.10,1.11 needs.rebuild,1.1,NONE
Message-ID: <200610100055.k9A0taIA011446@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gnugo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11429

Modified Files:
	gnugo.spec 
Removed Files:
	needs.rebuild 
Log Message:
Release bump for FE6



Index: gnugo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnugo/devel/gnugo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnugo.spec	2 Mar 2006 02:48:54 -0000	1.10
+++ gnugo.spec	10 Oct 2006 00:55:34 -0000	1.11
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> 3.6-5
+- Rebuild for FE6
+
 * Wed Mar  1 2006 Chris Ricker <kaboom at oobleck.net> 3.6-4
 - rebuild for FE 5
 - add dist tag


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 00:56:19 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 17:56:19 -0700
Subject: rpms/gnugo/devel gnugo.spec,1.11,1.12
Message-ID: <200610100056.k9A0uLWm011474@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gnugo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11457

Modified Files:
	gnugo.spec 
Log Message:
Actually bump revision number



Index: gnugo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnugo/devel/gnugo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnugo.spec	10 Oct 2006 00:55:34 -0000	1.11
+++ gnugo.spec	10 Oct 2006 00:56:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gnugo
 Version:        3.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Text based go program
 



From fedora-extras-commits at redhat.com  Tue Oct 10 01:06:57 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon,  9 Oct 2006 18:06:57 -0700
Subject: rpms/grhino/devel grhino.spec,1.5,1.6
Message-ID: <200610100106.k9A16xJ5014445@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14428

Modified Files:
	grhino.spec 
Log Message:
Add BuildRequire on gettext



Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	8 Oct 2006 14:11:36 -0000	1.5
+++ grhino.spec	10 Oct 2006 01:06:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -85,6 +86,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2
 



From fedora-extras-commits at redhat.com  Tue Oct 10 03:10:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 20:10:29 -0700
Subject: rpms/python-paramiko/devel .cvsignore, 1.5, 1.6 python-paramiko.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610100310.k9A3AVwD021087@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-paramiko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21066

Modified Files:
	.cvsignore python-paramiko.spec sources 
Log Message:
Update to 1.6.2. (Re: #207412)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2006 15:53:31 -0000	1.5
+++ .cvsignore	10 Oct 2006 03:10:29 -0000	1.6
@@ -1 +1 @@
-paramiko-1.6.1.zip
+paramiko-1.6.2.zip


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/python-paramiko.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paramiko.spec	16 Sep 2006 18:39:32 -0000	1.7
+++ python-paramiko.spec	10 Oct 2006 03:10:29 -0000	1.8
@@ -4,8 +4,8 @@
 %define srcname paramiko
 
 Name:           python-paramiko
-Version:        1.6.1
-Release:        3%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{python_sitelib}/paramiko/*.pyo
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
+- Update to 1.6.2
+
 * Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 1.6.1-3
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2006 15:53:31 -0000	1.5
+++ sources	10 Oct 2006 03:10:29 -0000	1.6
@@ -1 +1 @@
-8dbd556c0f6c8bb8bf8b97f0e05a910e  paramiko-1.6.1.zip
+d43879c86fcc100d199df425a3fcaf05  paramiko-1.6.2.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 03:11:19 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 20:11:19 -0700
Subject: rpms/python-paramiko/FC-5 .cvsignore, 1.5, 1.6 python-paramiko.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610100311.k9A3BLan021152@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-paramiko/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21131

Modified Files:
	.cvsignore python-paramiko.spec sources 
Log Message:
Update to 1.6.2. (Re: #207412)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2006 15:53:30 -0000	1.5
+++ .cvsignore	10 Oct 2006 03:11:18 -0000	1.6
@@ -1 +1 @@
-paramiko-1.6.1.zip
+paramiko-1.6.2.zip


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-5/python-paramiko.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paramiko.spec	16 Sep 2006 18:39:32 -0000	1.7
+++ python-paramiko.spec	10 Oct 2006 03:11:18 -0000	1.8
@@ -4,8 +4,8 @@
 %define srcname paramiko
 
 Name:           python-paramiko
-Version:        1.6.1
-Release:        3%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{python_sitelib}/paramiko/*.pyo
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
+- Update to 1.6.2
+
 * Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 1.6.1-3
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2006 15:53:30 -0000	1.5
+++ sources	10 Oct 2006 03:11:18 -0000	1.6
@@ -1 +1 @@
-8dbd556c0f6c8bb8bf8b97f0e05a910e  paramiko-1.6.1.zip
+d43879c86fcc100d199df425a3fcaf05  paramiko-1.6.2.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 03:12:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon,  9 Oct 2006 20:12:26 -0700
Subject: rpms/python-paramiko/FC-4 .cvsignore, 1.5, 1.6 python-paramiko.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610100312.k9A3CSwN021217@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-paramiko/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21196

Modified Files:
	.cvsignore python-paramiko.spec sources 
Log Message:
Update to 1.6.2. (Re: #207412)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2006 15:53:30 -0000	1.5
+++ .cvsignore	10 Oct 2006 03:12:26 -0000	1.6
@@ -1 +1 @@
-paramiko-1.6.1.zip
+paramiko-1.6.2.zip


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-4/python-paramiko.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paramiko.spec	16 Sep 2006 18:39:31 -0000	1.7
+++ python-paramiko.spec	10 Oct 2006 03:12:26 -0000	1.8
@@ -4,8 +4,8 @@
 %define srcname paramiko
 
 Name:           python-paramiko
-Version:        1.6.1
-Release:        3%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{python_sitelib}/paramiko/*.pyo
 
 %changelog
+* Mon Oct  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
+- Update to 1.6.2
+
 * Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 1.6.1-3
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2006 15:53:30 -0000	1.5
+++ sources	10 Oct 2006 03:12:26 -0000	1.6
@@ -1 +1 @@
-8dbd556c0f6c8bb8bf8b97f0e05a910e  paramiko-1.6.1.zip
+d43879c86fcc100d199df425a3fcaf05  paramiko-1.6.2.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 06:19:04 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:19:04 -0700
Subject: rpms/cogito/devel .cvsignore, 1.11, 1.12 cogito.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <200610100619.k9A6J63T030606@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30585

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 04:52:09 -0000	1.11
+++ .cvsignore	10 Oct 2006 06:19:04 -0000	1.12
@@ -1 +1 @@
-cogito-0.17.4.tar.gz
+cogito-0.18.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cogito.spec	26 Sep 2006 04:52:09 -0000	1.15
+++ cogito.spec	10 Oct 2006 06:19:04 -0000	1.16
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.17.4
+Version: 	0.18
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,7 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 1.1.0
+Requires: 	git-core >= 1.4.2
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
@@ -44,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
+- 0.18
+
 * Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.3-1
 - 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Sep 2006 04:52:09 -0000	1.11
+++ sources	10 Oct 2006 06:19:04 -0000	1.12
@@ -1 +1 @@
-7b8f7ba566770a147fcf367025883ed6  cogito-0.17.4.tar.gz
+d4c05b40b88265b0c5d0708ed2338787  cogito-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 06:21:48 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:21:48 -0700
Subject: rpms/cogito/FC-5 .cvsignore, 1.11, 1.12 cogito.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <200610100621.k9A6Lom5030752@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30726

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 04:54:03 -0000	1.11
+++ .cvsignore	10 Oct 2006 06:21:47 -0000	1.12
@@ -1 +1 @@
-cogito-0.17.4.tar.gz
+cogito-0.18.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/cogito.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cogito.spec	26 Sep 2006 04:54:03 -0000	1.14
+++ cogito.spec	10 Oct 2006 06:21:47 -0000	1.15
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.17.4
+Version: 	0.18
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,7 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 1.1.0
+Requires: 	git-core >= 1.4.2
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
@@ -44,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
+- 0.18
+
 * Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.4-1
 - 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Sep 2006 04:54:03 -0000	1.11
+++ sources	10 Oct 2006 06:21:47 -0000	1.12
@@ -1 +1 @@
-7b8f7ba566770a147fcf367025883ed6  cogito-0.17.4.tar.gz
+d4c05b40b88265b0c5d0708ed2338787  cogito-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 06:22:53 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:22:53 -0700
Subject: rpms/cogito/FC-4 .cvsignore, 1.11, 1.12 cogito.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <200610100622.k9A6Mtij030843@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30821

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 04:55:30 -0000	1.11
+++ .cvsignore	10 Oct 2006 06:22:53 -0000	1.12
@@ -1 +1 @@
-cogito-0.17.4.tar.gz
+cogito-0.18.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cogito.spec	26 Sep 2006 04:55:30 -0000	1.13
+++ cogito.spec	10 Oct 2006 06:22:53 -0000	1.14
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.17.4
+Version: 	0.18
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,7 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 1.1.0
+Requires: 	git-core >= 1.4.2
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
@@ -44,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
+- 0.18
+
 * Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.4-1
 - 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Sep 2006 04:55:30 -0000	1.11
+++ sources	10 Oct 2006 06:22:53 -0000	1.12
@@ -1 +1 @@
-7b8f7ba566770a147fcf367025883ed6  cogito-0.17.4.tar.gz
+d4c05b40b88265b0c5d0708ed2338787  cogito-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 06:24:21 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:24:21 -0700
Subject: rpms/cogito/FC-3 .cvsignore, 1.11, 1.12 cogito.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <200610100624.k9A6ON8g030926@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30905

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Sep 2006 04:56:56 -0000	1.11
+++ .cvsignore	10 Oct 2006 06:24:21 -0000	1.12
@@ -1 +1 @@
-cogito-0.17.4.tar.gz
+cogito-0.18.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cogito.spec	26 Sep 2006 04:56:56 -0000	1.13
+++ cogito.spec	10 Oct 2006 06:24:21 -0000	1.14
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.17.4
+Version: 	0.18
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,7 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 1.1.0
+Requires: 	git-core >= 1.4.2
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
@@ -44,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
+- 0.18
+
 * Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.4-1
 - 0.17.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Sep 2006 04:56:56 -0000	1.11
+++ sources	10 Oct 2006 06:24:21 -0000	1.12
@@ -1 +1 @@
-7b8f7ba566770a147fcf367025883ed6  cogito-0.17.4.tar.gz
+d4c05b40b88265b0c5d0708ed2338787  cogito-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 06:32:02 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon,  9 Oct 2006 23:32:02 -0700
Subject: rpms/cogito/devel cogito.spec,1.16,1.17
Message-ID: <200610100632.k9A6W4EB031034@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31015

Modified Files:
	cogito.spec 
Log Message:
minor specfile cleanup



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cogito.spec	10 Oct 2006 06:19:04 -0000	1.16
+++ cogito.spec	10 Oct 2006 06:32:02 -0000	1.17
@@ -47,13 +47,9 @@
 * Mon Oct 9 2006 Chris Wright <chrisw at redhat.com> 0.18-1
 - 0.18
 
-* Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.3-1
+* Mon Sep 25 2006 Chris Wright <chrisw at redhat.com> 0.17.4-1
 - 0.17.4
 
-* Thu Sep 14 2006 Chris Wright <chrisw at redhat.com> 0.17.3-2
-- rebuild for Fedora Extras 6
-
-%changelog
 * Wed Jun 28 2006 Chris Wright <chrisw at redhat.com> 0.17.3-1
 - 0.17.3
 



From fedora-extras-commits at redhat.com  Tue Oct 10 08:49:04 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 10 Oct 2006 01:49:04 -0700
Subject: rpms/oorexx/devel oorexx.spec,1.4,1.5
Message-ID: <200610100849.k9A8n6L4005081@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5064

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oorexx.spec	9 Oct 2006 21:24:54 -0000	1.4
+++ oorexx.spec	10 Oct 2006 08:49:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,7 +10,7 @@
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:  i386
+ExcludeArch:    x86_64
 
 
 %description
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-5
+- Exclude x86_64
+
 * Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-4
 - Build exclusively on i386 for now
 



From fedora-extras-commits at redhat.com  Tue Oct 10 09:11:13 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 02:11:13 -0700
Subject: rpms/k3d/devel .cvsignore,1.6,1.7 k3d.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <200610100911.k9A9BFek008100@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8079

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Oct 2006 07:36:40 -0000	1.6
+++ .cvsignore	10 Oct 2006 09:11:12 -0000	1.7
@@ -1 +1 @@
-k3d-0.6.3.0-src.tar.bz2
+k3d-0.6.3.1-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- k3d.spec	9 Oct 2006 07:35:58 -0000	1.8
+++ k3d.spec	10 Oct 2006 09:11:12 -0000	1.9
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.3.0
+Version:        0.6.3.1
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 0.6.3.1
+- Update to 0.6.3.1
+
 * Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 0.6.3.0-1
 - Update to 0.6.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Oct 2006 07:36:40 -0000	1.6
+++ sources	10 Oct 2006 09:11:12 -0000	1.7
@@ -1 +1 @@
-6c96db4ee5fba3f9e8ccc37aca37d595  k3d-0.6.3.0-src.tar.bz2
+7f5b53711a02779e3f9c036bcc21483a  k3d-0.6.3.1-src.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 10:05:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:05:12 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc - New directory
Message-ID: <200610101005.k9AA5Er0011292@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11262/nagios-plugins-snmp-disk-proc

Log Message:
Directory /cvs/extras/rpms/nagios-plugins-snmp-disk-proc added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 10:05:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:05:13 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc/devel - New directory
Message-ID: <200610101005.k9AA5Fjt011293@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11262/nagios-plugins-snmp-disk-proc/devel

Log Message:
Directory /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 10:05:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:05:32 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc Makefile, NONE, 1.1 import.log, 
	NONE, 1.1
Message-ID: <200610101005.k9AA5Yrs011395@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11335

Added Files:
	Makefile import.log 
Log Message:
Setup of module nagios-plugins-snmp-disk-proc


--- NEW FILE Makefile ---
# Top level Makefile for module nagios-plugins-snmp-disk-proc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 10:05:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:05:34 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610101005.k9AA5a7N011398@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11335/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nagios-plugins-snmp-disk-proc


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 10:06:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:06:08 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc import.log,1.1,1.2
Message-ID: <200610101006.k9AA6evq011468@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11431

Modified Files:
	import.log 
Log Message:
auto-import nagios-plugins-snmp-disk-proc-1.0-1 on branch devel from nagios-plugins-snmp-disk-proc-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 10:05:32 -0000	1.1
+++ import.log	10 Oct 2006 10:06:07 -0000	1.2
@@ -0,0 +1 @@
+nagios-plugins-snmp-disk-proc-1_0-1:HEAD:nagios-plugins-snmp-disk-proc-1.0-1.src.rpm:1160474760



From fedora-extras-commits at redhat.com  Tue Oct 10 10:06:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:06:08 -0700
Subject: rpms/nagios-plugins-snmp-disk-proc/devel
	nagios-plugins-snmp-disk-proc.spec, NONE,
	1.1 nagios-snmp-plugins-1.0-snmp_common.c.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610101006.k9AA6eBp011472@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11431/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nagios-plugins-snmp-disk-proc.spec 
	nagios-snmp-plugins-1.0-snmp_common.c.patch 
Log Message:
auto-import nagios-plugins-snmp-disk-proc-1.0-1 on branch devel from nagios-plugins-snmp-disk-proc-1.0-1.src.rpm


--- NEW FILE nagios-plugins-snmp-disk-proc.spec ---
%define nagios_plugins_dir %{_libdir}/nagios/plugins

Name:           nagios-plugins-snmp-disk-proc
Version:        1.0
Release:        1%{?dist}
Summary:        Nagios SNMP plugins to monitor remote disk and processes

Group:          Applications/System
License:        GPL
URL:            ftp://ftp.hometree.net/pub/nagios-snmp-plugins/index.html
Source:         ftp://ftp.hometree.net/pub/nagios-snmp-plugins/nagios-snmp-plugins-%{version}.tar.gz
Patch:          nagios-snmp-plugins-1.0-snmp_common.c.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf, automake
BuildRequires:  net-snmp-devel
BuildRequires:  openssl-devel
Requires:       nagios-plugins

%description
These plugins allow you to monitor disk space and running processes on
a remote machine via SNMP.


%prep
%setup -q -n nagios-snmp-plugins-%{version}
%patch -p1

%build
aclocal
autoheader
automake --add-missing
autoconf
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT/%{nagios_plugins_dir}
install -p -m 755 check_snmp_disk $RPM_BUILD_ROOT/%{nagios_plugins_dir}
install -p -m 755 check_snmp_proc $RPM_BUILD_ROOT/%{nagios_plugins_dir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING AUTHORS NEWS
%{nagios_plugins_dir}/check_snmp_disk
%{nagios_plugins_dir}/check_snmp_proc


%changelog
* Sat Aug 12 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-1
- Initial build.

nagios-snmp-plugins-1.0-snmp_common.c.patch:

--- NEW FILE nagios-snmp-plugins-1.0-snmp_common.c.patch ---
diff -ruN nagios-snmp-plugins-1.0-orig/snmp_common.c nagios-snmp-plugins-1.0/snmp_common.c
--- nagios-snmp-plugins-1.0-orig/snmp_common.c	2004-03-29 15:03:07.000000000 +0100
+++ nagios-snmp-plugins-1.0/snmp_common.c	2006-08-12 21:40:27.000000000 +0100
@@ -229,12 +229,14 @@
 
 void integer_callback(struct variable_list *vars, void **pnt)
 {
-  long *data = ((long *)(*pnt))++;
+  long *data = (long *)(*pnt);
 
   if(verbose)
     printf("%s: Found Integer Value %ld into %lx\n", bn, *vars->val.integer, data);
 
   *data = *vars->val.integer;
+
+  *pnt = ++data;
 }
 
 /**
@@ -245,7 +247,7 @@
 
 void string_callback(struct variable_list *vars, void **pnt)
 {
-  char **data = ((char **)(*pnt))++;
+  char **data = (char **)(*pnt);
   
   if(verbose)
     printf("%s: Putting String into %lx\n", bn, data);
@@ -258,5 +260,7 @@
   {
     *data = "";
   }
+
+  *pnt = ++data;
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 10:05:33 -0000	1.1
+++ .cvsignore	10 Oct 2006 10:06:08 -0000	1.2
@@ -0,0 +1 @@
+nagios-snmp-plugins-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins-snmp-disk-proc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 10:05:33 -0000	1.1
+++ sources	10 Oct 2006 10:06:08 -0000	1.2
@@ -0,0 +1 @@
+cf70e405718d016debe206d01f54262c  nagios-snmp-plugins-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 10:10:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 10 Oct 2006 03:10:08 -0700
Subject: owners owners.list,1.1810,1.1811
Message-ID: <200610101010.k9AAAAmt011589@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572

Modified Files:
	owners.list 
Log Message:
New package: nagios-plugins-snmp-disk-proc (#202324)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1810
retrieving revision 1.1811
diff -u -r1.1810 -r1.1811
--- owners.list	10 Oct 2006 00:42:07 -0000	1.1810
+++ owners.list	10 Oct 2006 10:10:07 -0000	1.1811
@@ -1079,6 +1079,7 @@
 Fedora Extras|nabi|Simple Hangul X Input Method|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|nagios|Host/service/network monitoring program|imlinux at gmail.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nagios-plugins|Host/service/network monitoring program plugins for Nagios|imlinux at gmail.com|extras-qa at fedoraproject.org|jpo at di.uminho.pt
+Fedora Extras|nagios-plugins-snmp-disk-proc|Nagios SNMP plugins to monitor remote disk and processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 10:29:18 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 10 Oct 2006 03:29:18 -0700
Subject: fedora-security/audit fc5,1.349,1.350 fc6,1.104,1.105
Message-ID: <200610101029.k9AATIUu013873@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13827/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-5158



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- fc5	9 Oct 2006 10:08:58 -0000	1.349
+++ fc5	10 Oct 2006 10:29:16 -0000	1.350
@@ -8,7 +8,7 @@
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
-CVE-2006-5158 ** kernel
+CVE-2006-5158 version (kernel, fixed 2.6.15)
 CVE-2006-5072 backport (mono) #209464 [since FEDORA-2006-1012]
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fc6	6 Oct 2006 08:23:10 -0000	1.104
+++ fc6	10 Oct 2006 10:29:16 -0000	1.105
@@ -9,7 +9,7 @@
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
-CVE-2006-5158 ** kernel
+CVE-2006-5158 version (kernel, fixed 2.6.15)
 CVE-2006-5072 VULNERABLE (mono) bz#209467
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]



From fedora-extras-commits at redhat.com  Tue Oct 10 11:28:25 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 10 Oct 2006 04:28:25 -0700
Subject: rpms/wcstools/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wcstools.spec, 1.3, 1.4 wcstools3-codewarn.patch, 1.1,
	1.2 wcstools3-tmpfile.patch, 1.1, NONE
Message-ID: <200610101128.k9ABSRlF018843@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18817

Modified Files:
	.cvsignore sources wcstools.spec wcstools3-codewarn.patch 
Removed Files:
	wcstools3-tmpfile.patch 
Log Message:
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 17:27:53 -0000	1.2
+++ .cvsignore	10 Oct 2006 11:28:24 -0000	1.3
@@ -1 +1 @@
-wcstools-3.6.5.tar.gz
+wcstools-3.6.6beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 17:27:53 -0000	1.2
+++ sources	10 Oct 2006 11:28:24 -0000	1.3
@@ -1 +1 @@
-9cd9bbbe1408c2d92728d8f039291fb3  wcstools-3.6.5.tar.gz
+cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/wcstools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wcstools.spec	4 Sep 2006 14:22:40 -0000	1.3
+++ wcstools.spec	10 Oct 2006 11:28:24 -0000	1.4
@@ -1,18 +1,16 @@
 Name: wcstools
-Version: 3.6.5
-Release: 3%{?dist}
+Version: 3.6.6
+Release: 0.1.beta%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
-Patch2: wcstools3-tmpfile.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 Wcstools is a set of software utilities, written in C, which create,
 display and manipulate the world coordinate system of a FITS or IRAF
@@ -35,7 +33,7 @@
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
 License: LGPL
-Requires: %{name} = %{version}-%{release}
+Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
 
@@ -43,7 +41,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all
@@ -74,6 +71,7 @@
 
 %files -n libwcs
 %defattr(-,root,root)
+%doc libwcs/COPYING
 %{_libdir}/*.so.*
 
 %files -n libwcs-devel
@@ -84,6 +82,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
+- New upstream source 3.6.6beta
 * Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
 - Rebuild.
 * Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/wcstools3-codewarn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wcstools3-codewarn.patch	26 Jun 2006 17:27:53 -0000	1.1
+++ wcstools3-codewarn.patch	10 Oct 2006 11:28:24 -0000	1.2
@@ -1,18 +1,17 @@
-diff -ur wcstools-3.6.5.orig/getdate.c wcstools-3.6.5/getdate.c
---- wcstools-3.6.5.orig/getdate.c	2006-06-22 01:46:49.000000000 +0200
-+++ wcstools-3.6.5/getdate.c	2006-06-23 10:23:36.000000000 +0200
-@@ -382,7 +382,7 @@
-     char outform[16];
-     char *fitsdate, *newfdate;
++++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
+--- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
+@@ -413,7 +413,7 @@
+     char *fitsdate, *newfdate, *stdate;
      char temp[64];
+     char fyear[16];
 -    char ts0[8];
 +    char ts0[9];
      char *tchar;
      int its, its1;
      time_t lts;
-diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c
---- wcstools-3.6.5.orig/libwcs/binread.c	2006-06-20 22:07:37.000000000 +0200
-+++ wcstools-3.6.5/libwcs/binread.c	2006-06-23 10:24:39.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
+--- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
 @@ -1358,7 +1358,7 @@
  	for (i = 0; i < nmag; i++) {
  	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
@@ -22,9 +21,9 @@
  	    st->xmag[i] = 0.01 * (double) st->mag[i];
  	    }
  	}
-diff -ur wcstools-3.6.5.orig/libwcs/catutil.c wcstools-3.6.5/libwcs/catutil.c
---- wcstools-3.6.5.orig/libwcs/catutil.c	2006-06-20 21:05:14.000000000 +0200
-+++ wcstools-3.6.5/libwcs/catutil.c	2006-06-23 10:29:31.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
+--- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
 @@ -722,7 +722,7 @@
  	    lname = 0;
  	else


--- wcstools3-tmpfile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 11:50:36 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 10 Oct 2006 04:50:36 -0700
Subject: rpms/mantis/devel mantis.spec, 1.11, 1.12 .cvsignore, 1.3,
	1.4 sources, 1.8, 1.9 needs.rebuild, 1.1, NONE
Message-ID: <200610101150.k9ABocix018977@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18956

Modified Files:
	mantis.spec .cvsignore sources 
Removed Files:
	needs.rebuild 
Log Message:
Update to 1.0.5



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mantis.spec	22 May 2006 06:31:09 -0000	1.11
+++ mantis.spec	10 Oct 2006 11:50:35 -0000	1.12
@@ -4,21 +4,20 @@
 %global cfgdir		%_sysconfdir/%name
 %global httpconfdir	%_sysconfdir/httpd/conf.d
 
-%{!?release_func:%global release_func() %1%{?dist}}
-
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	1.0.3
-Release:	%release_func 1
+Version:	1.0.5
+Release:	1%{dist}
 License:	GPL
 Group:		Applications/Internet
-URL:		http://mantisbt.sourceforge.net/
+URL:		http://www.mantisbugtracker.com/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%name-%version.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-1.0.0rc2-noadmin.patch
-BuildRoot:	%_tmppath/%name-%version-%release-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	diffutils
 Requires:	php
 Requires:	mantis-config
@@ -28,17 +27,15 @@
 Group:		Applications/Internet
 Source10:	mantis-httpd.conf
 Provides:	mantis-config = httpd
-Requires:	mantis = %version-%release
-Requires:	%httpconfdir
+Requires:	mantis = %{version}-%{release}
+Requires:	%{httpconfdir}
 Requires:	mod_ssl
 Requires(post):		httpd
 Requires(postun):	httpd
 
 
 %description
-Mantis is a web-based bugtracking system. It is in active development
-and is considered beta.
-
+Mantis is a web-based bugtracking system. 
 It is written in the PHP scripting language and requires the MySQL
 database and a webserver. Mantis has been installed on Windows, MacOS,
 OS/2, and a variety of Unix operating systems. Any web browser should
@@ -46,14 +43,12 @@
 GNU General Public License (GPL).
 
 %description config-httpd
-Mantis is a web-based bugtracking system. It is in active development
-and is considered beta.
-
+Mantis is a web-based bugtracking system.
 This package contains configuration-files for Apache httpd 2.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
@@ -63,25 +58,25 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "${RPM_BUILD_ROOT}"
 
-%__install -d -m755 $RPM_BUILD_ROOT%pkgdir
-%__install -d -m750 $RPM_BUILD_ROOT%cfgdir
+%{__install} -d -m755 ${RPM_BUILD_ROOT}%{pkgdir}
+%{__install} -d -m750 ${RPM_BUILD_ROOT}%{cfgdir}
 
-tar cf - . | tar xf - -C $RPM_BUILD_ROOT%pkgdir
+tar cf - . | tar xf - -C ${RPM_BUILD_ROOT}%{pkgdir}
 
 
-find $RPM_BUILD_ROOT \( \
+find ${RPM_BUILD_ROOT} \( \
 	-name '*.noexamplecom' -o -name '*.iis' -o -name '*.noadmin' -o -name '*.#.*' -o \
 	-name '.cvsignore' \
 	\) -print0 | xargs -0 rm -f
 
 ## Do not rename; the *existence* of this file will be checked to
 ## determine if mantis is offline
-mv $RPM_BUILD_ROOT%pkgdir/mantis_offline.php.sample $RPM_BUILD_ROOT%cfgdir/
-mv $RPM_BUILD_ROOT%pkgdir/config_inc.php.sample     $RPM_BUILD_ROOT%cfgdir/config_inc.php
+mv ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php.sample ${RPM_BUILD_ROOT}%{cfgdir}/
+mv ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php.sample     ${RPM_BUILD_ROOT}%{cfgdir}/config_inc.php
 
-for i in $(find $RPM_BUILD_ROOT -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
+for i in $(find ${RPM_BUILD_ROOT} -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
 	case $i in
 		(*.php)
 			if ! sed '1p;d' "$i" | grep -q '^#!'; then
@@ -95,27 +90,27 @@
 	esac
 done
 
-chmod -x $RPM_BUILD_ROOT%pkgdir/{doc/*,core/phpmailer/{README,LICENSE}}
+chmod -x ${RPM_BUILD_ROOT}%{pkgdir}/{doc/*,core/phpmailer/{README,LICENSE}}
 
-ln -s %cfgdir/config_inc.php	 $RPM_BUILD_ROOT%pkgdir/config_inc.php
-ln -s %cfgdir/mantis_offline.php $RPM_BUILD_ROOT%pkgdir/mantis_offline.php
+ln -s %{cfgdir}/config_inc.php	 ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php
+ln -s %{cfgdir}/mantis_offline.php ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php
 
 
 ## The httpd config-files
 function subst() {
-	f=$RPM_BUILD_ROOT$1
-	sed -e 's!/usr/share/mantis!%pkgdir!g' "$f" >"$f".tmp
+	f=${RPM_BUILD_ROOT}$1
+	sed -e 's!/usr/share/mantis!%{pkgdir}!g' "$f" >"$f".tmp
 	cmp -s "$f" "$f.tmp" || cat "$f.tmp" >"$f"
 	rm -f "$f.tmp"
 }
 
-%__install -d $RPM_BUILD_ROOT%httpconfdir
-%__install -p -m644 %SOURCE10 $RPM_BUILD_ROOT%httpconfdir/mantis.conf
-subst %httpconfdir/mantis.conf
+%{__install} -d ${RPM_BUILD_ROOT}%{httpconfdir}
+%{__install} -p -m644 %{SOURCE10} ${RPM_BUILD_ROOT}%{httpconfdir}/mantis.conf
+subst %{httpconfdir}/mantis.conf
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "${RPM_BUILD_ROOT}"
 
 
 %post config-httpd
@@ -127,17 +122,20 @@
 
 %files
 %defattr(-,root,root,-)
-%pkgdir
-%attr(-,root,apache) %dir %cfgdir
-%attr(0640,root,apache) %config(noreplace) %cfgdir/*
+%{pkgdir}
+%attr(-,root,apache) %dir %{cfgdir}
+%attr(0640,root,apache) %config(noreplace) %{cfgdir}/*
 
 
 %files config-httpd
 %defattr(-,root,root,-)
-%config(noreplace) %httpconfdir/*
+%config(noreplace) %{httpconfdir}/*
 
 
 %changelog
+* Tue Oct 10 2006 Gianluca Sforna <giallu gmail com> - 1.0.5-1
+- updated to 1.0.5
+
 * Sat May 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.0.3-1
 - updated to 1.0.3 (SECURITY)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Mar 2005 18:21:20 -0000	1.3
+++ .cvsignore	10 Oct 2006 11:50:35 -0000	1.4
@@ -1,2 +1 @@
-mantis-*.tar.gz
-mantis-*.*.rpm
+mantis_1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 May 2006 06:31:09 -0000	1.8
+++ sources	10 Oct 2006 11:50:35 -0000	1.9
@@ -1 +1 @@
-6c70d00da4cad5da2e0df387f474d3e4  mantis-1.0.3.tar.gz
+01c5fb87e5ac161a681471573711bcf6  mantis_1.0.5.tar.gz


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 12:01:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:01:50 -0700
Subject: rpms/libsigc++/FC-4 .cvsignore, 1.3, 1.4 libsigc++.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200610101201.k9AC1rJk022031@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22010

Modified Files:
	.cvsignore libsigc++.spec sources 
Log Message:
Update to 1.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Apr 2005 13:41:13 -0000	1.3
+++ .cvsignore	10 Oct 2006 12:01:50 -0000	1.4
@@ -1,2 +1 @@
-libsigc++-1.2.5.tar.gz
-libsigc++-1.2.5-autoregen.patch.bz2
+libsigc++-1.2.7.tar.bz2


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-4/libsigc++.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libsigc++.spec	12 Apr 2005 13:59:50 -0000	1.8
+++ libsigc++.spec	10 Oct 2006 12:01:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libsigc++
-Version:        1.2.5
-Release:        8
+Version:        1.2.7
+Release:        1
 Summary:        Typesafe signal framework for C++
 Group:          System Environment/Libraries
 License:        LGPL
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-1
+- Update to 1.2.7
+
 * Tue Apr 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.2.5-8
 - Add BR docbook-style-xsl and patch doc/manual to use it instead of
   an external http stylesheet.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Apr 2005 13:41:13 -0000	1.3
+++ sources	10 Oct 2006 12:01:50 -0000	1.4
@@ -1,2 +1 @@
-d0d1ffcae0eced97ef4f17ce0ba81352  libsigc++-1.2.5.tar.gz
-19a5d1a582805fd8c2dddfe6d3752a52  libsigc++-1.2.5-autoregen.patch.bz2
+212f48536019e1f003d2509b4c9b36df  libsigc++-1.2.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 12:05:58 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:05:58 -0700
Subject: rpms/libglademm24/FC-5 libglademm.spec,1.10,1.11
Message-ID: <200610101206.k9AC60oh022141@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22124

Modified Files:
	libglademm.spec 
Log Message:
Added dist tag


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-5/libglademm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libglademm.spec	9 Oct 2006 18:25:11 -0000	1.10
+++ libglademm.spec	10 Oct 2006 12:05:58 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libglademm24
 Version:        2.6.3
-Release:        1
+Release:        2%{?dist}
 
 Summary:        C++ wrapper for libglade
 
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-2
+- Added dist tag
+
 * Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-1
 - Update to 2.6.3
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:07:03 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:07:03 -0700
Subject: rpms/libglademm24/devel libglademm.spec,1.10,1.11
Message-ID: <200610101207.k9AC75E8022224@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22198

Modified Files:
	libglademm.spec 
Log Message:
Added dist tag


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libglademm.spec	28 Aug 2006 11:22:52 -0000	1.10
+++ libglademm.spec	10 Oct 2006 12:07:03 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libglademm24
 Version:        2.6.3
-Release:        1
+Release:        2%{?dist}
 
 Summary:        C++ wrapper for libglade
 
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-2
+- Added dist tag
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-1
 - Update to version 2.6.3
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:22:04 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:22:04 -0700
Subject: rpms/libsigc++/FC-4 libsigc++.spec, 1.9,
	1.10 libsigc++-1.2.5-pc-cflags.patch, 1.1, NONE
Message-ID: <200610101222.k9ACM6tU022407@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22390

Modified Files:
	libsigc++.spec 
Removed Files:
	libsigc++-1.2.5-pc-cflags.patch 
Log Message:
fixed source url, removed integrated patches, added dist tag


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-4/libsigc++.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsigc++.spec	10 Oct 2006 12:01:50 -0000	1.9
+++ libsigc++.spec	10 Oct 2006 12:22:03 -0000	1.10
@@ -1,21 +1,18 @@
 Name:           libsigc++
 Version:        1.2.7
-Release:        1
+Release:        2%{?dist}
 Summary:        Typesafe signal framework for C++
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://libsigc.sourceforge.net/
-Source0:        http://dl.sourceforge.net/libsigc/libsigc++-1.2.5.tar.gz
+Source0:        http://dl.sourceforge.net/libsigc/libsigc++-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
 BuildRequires:  doxygen
 BuildRequires:  libxslt docbook-style-xsl
 # for multilib fix
-Patch1:         libsigc++-1.2.5-pc-cflags.patch
-Patch2:         libsigc++-1.2.5-stylesheet.patch
-# patch created with: aclocal -I scripts ; libtoolize -c -f 
-# automake -a -c -f ; autoconf ; rm -rf autom4te.cache
-Patch3:         libsigc++-1.2.5-autoregen.patch.bz2
+Patch1:         libsigc++-1.2.5-stylesheet.patch
+
 
 %description
 This library implements a full callback system for use in widget libraries,
@@ -43,9 +40,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .pc-cflags
-%patch2 -p1 -b .stylesheet
-%patch3 -p1 -b .autoregen
+%patch1 -p1 -b .stylesheet
 
 
 
@@ -101,6 +96,11 @@
 
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-2
+- Fixed Source URL
+- Patches integrated upstream
+- Added dist tag
+
 * Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-1
 - Update to 1.2.7
 


--- libsigc++-1.2.5-pc-cflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 12:27:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:27:59 -0700
Subject: rpms/gift/FC-4 gift-0.11.8.1-fhs.patch,NONE,1.1 gift.spec,1.2,1.3
Message-ID: <200610101228.k9ACS13b022629@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609

Modified Files:
	gift.spec 
Added Files:
	gift-0.11.8.1-fhs.patch 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)


gift-0.11.8.1-fhs.patch:

--- NEW FILE gift-0.11.8.1-fhs.patch ---
--- gift-0.11.8.1/configure.ac.fhs	2004-11-26 14:31:05.000000000 -0600
+++ gift-0.11.8.1/configure.ac	2006-10-10 07:00:04.000000000 -0500
@@ -342,22 +342,22 @@
     AC_SUBST(prefix)
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 AC_SUBST(libgiftincdir)
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 AC_SUBST(plugindir)
 
-LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${prefix}/lib/giFT")
+LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${libdir}/giFT")
 
 giftdatadir=${prefix}/share/giFT
 AC_SUBST(giftdatadir)
 
 if test x$WIN32 != xyes; then
-    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/share/giFT")
+    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${datadir}/giFT")
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 AC_SUBST(giftperldir)
 
 dnl ###########################################################################
--- gift-0.11.8.1/configure.fhs	2004-11-27 15:12:59.000000000 -0600
+++ gift-0.11.8.1/configure	2006-10-10 07:01:03.000000000 -0500
@@ -25262,30 +25262,30 @@
 
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 
 
 cat >>gconfdefs.h <<_ACEOF
 #ifndef PLUGIN_DIR
-#define PLUGIN_DIR "${prefix}/lib/giFT"
+#define PLUGIN_DIR "${libdir}/giFT"
 #endif
 _ACEOF
 
-giftdatadir=${prefix}/share/giFT
+giftdatadir=${datadir}/giFT
 
 
 if test x$WIN32 != xyes; then
     cat >>gconfdefs.h <<_ACEOF
 #ifndef DATA_DIR
-#define DATA_DIR "${prefix}/share/giFT"
+#define DATA_DIR "${datadir}/giFT"
 #endif
 _ACEOF
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 
 
 


Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-4/gift.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gift.spec	6 Jan 2006 13:14:44 -0000	1.2
+++ gift.spec	10 Oct 2006 12:27:59 -0000	1.3
@@ -1,16 +1,12 @@
 
-%if "%{?fedora}" > "2"
+#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
 %define _enable_libmagic --enable-libmagic
-%endif
-
-%if "%{?rhel}" > "3"
-%define _enable_libmagic --enable-libmagic
-%endif
+#endif
 
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 4%{?dist} 
+Release: 6%{?dist}
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -19,12 +15,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gift-0.11.8.1-gcc4.patch
+# respect %_bindir,%_datadir,%_includedir,%_libdir
+# http://bugzilla.redhat.com/210114
+Patch2: gift-0.11.8.1-fhs.patch
 
 # Wrapper for auto-launch gift-setup for first-time users 
 Source1: giftd.sh
 
 BuildRequires: libtool
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
 BuildRequires: libtool-ltdl-devel
 %endif
 BuildRequires: libvorbis-devel
@@ -48,6 +47,7 @@
 %setup -q
 
 %patch1 -p1 -b .gcc4
+%patch2 -p1 -b .fhs
 
 
 %build
@@ -85,7 +85,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
+%doc AUTHORS COPYING HACKING QUICKSTART README TODO
 %{_bindir}/gift*
 %{_sbindir}/giftd
 %{_datadir}/giFT/
@@ -101,6 +101,15 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
+- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-5
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4.1
+- fc5: gcc/glibc respin
+
 * Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
 - giftd.sh (wrapper): pass on command-line params/options
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:34:23 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:34:23 -0700
Subject: rpms/libsigc++/FC-5 libsigc++.spec,1.11,1.12
Message-ID: <200610101234.k9ACYP4i022735@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22717

Modified Files:
	libsigc++.spec 
Log Message:
Added dist tag


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/FC-5/libsigc++.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsigc++.spec	28 Feb 2006 21:03:11 -0000	1.11
+++ libsigc++.spec	10 Oct 2006 12:34:23 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libsigc++
 Version:        1.2.7
-Release:        2
+Release:        3%{?dist} 
 Summary:        Typesafe signal framework for C++
 Group:          System Environment/Libraries
 License:        LGPL
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 1.2.7
+- Added dist tag
+
 * Tue Feb 28 2006 Denis Leroy <denis at poolshark.org> 1.2.7-2
 - Fixed sources file
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:34:57 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:34:57 -0700
Subject: rpms/libglademm24/FC-4 .cvsignore, 1.3, 1.4 libglademm.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200610101234.k9ACYxhq022810@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22789

Modified Files:
	.cvsignore libglademm.spec sources 
Log Message:
Update to 2.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Apr 2005 22:42:43 -0000	1.3
+++ .cvsignore	10 Oct 2006 12:34:56 -0000	1.4
@@ -1 +1 @@
-libglademm-2.6.0.tar.bz2
+libglademm-2.6.3.tar.bz2


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-4/libglademm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libglademm.spec	23 Jul 2006 12:07:45 -0000	1.8
+++ libglademm.spec	10 Oct 2006 12:34:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libglademm24
-Version:        2.6.0
-Release:        3
+Version:        2.6.3
+Release:        1{?dist}
 
 Summary:        C++ wrapper for libglade
 
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-1
+- Update to 2.6.3
+
 * Sun Jul 23 2006 Denis Leroy <denis at poolshark.org> - 2.6.0-3
 - Rebuild with gtkmm 2.6.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Apr 2005 22:42:43 -0000	1.3
+++ sources	10 Oct 2006 12:34:56 -0000	1.4
@@ -1 +1 @@
-be10dcaca106d4381dc339a39e2fe776  libglademm-2.6.0.tar.bz2
+3dd3c3777c4407b8a330bd79089ddbfc  libglademm-2.6.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 12:39:14 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 05:39:14 -0700
Subject: rpms/libglademm24/FC-4 libglademm.spec,1.9,1.10
Message-ID: <200610101239.k9ACdGGs022898@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libglademm24/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22881

Modified Files:
	libglademm.spec 
Log Message:
Fixed dist tag


Index: libglademm.spec
===================================================================
RCS file: /cvs/extras/rpms/libglademm24/FC-4/libglademm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libglademm.spec	10 Oct 2006 12:34:56 -0000	1.9
+++ libglademm.spec	10 Oct 2006 12:39:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libglademm24
 Version:        2.6.3
-Release:        1{?dist}
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for libglade
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:42:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:42:11 -0700
Subject: rpms/gift/FC-5 gift-0.11.8.1-fhs.patch,NONE,1.1 gift.spec,1.4,1.5
Message-ID: <200610101242.k9ACgDJR023097@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23077

Modified Files:
	gift.spec 
Added Files:
	gift-0.11.8.1-fhs.patch 
Log Message:
* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- fc5: gcc/glibc respin


gift-0.11.8.1-fhs.patch:

--- NEW FILE gift-0.11.8.1-fhs.patch ---
--- gift-0.11.8.1/configure.ac.fhs	2004-11-26 14:31:05.000000000 -0600
+++ gift-0.11.8.1/configure.ac	2006-10-10 07:00:04.000000000 -0500
@@ -342,22 +342,22 @@
     AC_SUBST(prefix)
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 AC_SUBST(libgiftincdir)
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 AC_SUBST(plugindir)
 
-LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${prefix}/lib/giFT")
+LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${libdir}/giFT")
 
 giftdatadir=${prefix}/share/giFT
 AC_SUBST(giftdatadir)
 
 if test x$WIN32 != xyes; then
-    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/share/giFT")
+    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${datadir}/giFT")
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 AC_SUBST(giftperldir)
 
 dnl ###########################################################################
--- gift-0.11.8.1/configure.fhs	2004-11-27 15:12:59.000000000 -0600
+++ gift-0.11.8.1/configure	2006-10-10 07:01:03.000000000 -0500
@@ -25262,30 +25262,30 @@
 
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 
 
 cat >>gconfdefs.h <<_ACEOF
 #ifndef PLUGIN_DIR
-#define PLUGIN_DIR "${prefix}/lib/giFT"
+#define PLUGIN_DIR "${libdir}/giFT"
 #endif
 _ACEOF
 
-giftdatadir=${prefix}/share/giFT
+giftdatadir=${datadir}/giFT
 
 
 if test x$WIN32 != xyes; then
     cat >>gconfdefs.h <<_ACEOF
 #ifndef DATA_DIR
-#define DATA_DIR "${prefix}/share/giFT"
+#define DATA_DIR "${datadir}/giFT"
 #endif
 _ACEOF
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 
 
 


Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-5/gift.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gift.spec	1 Mar 2006 16:40:36 -0000	1.4
+++ gift.spec	10 Oct 2006 12:42:11 -0000	1.5
@@ -1,16 +1,12 @@
 
-%if "%{?fedora}" > "2"
+#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
 %define _enable_libmagic --enable-libmagic
-%endif
-
-%if "%{?rhel}" > "3"
-%define _enable_libmagic --enable-libmagic
-%endif
+#endif
 
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 4%{?dist}.2
+Release: 6%{?dist}
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -19,12 +15,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gift-0.11.8.1-gcc4.patch
+# respect %_bindir,%_datadir,%_includedir,%_libdir
+# http://bugzilla.redhat.com/210114
+Patch2: gift-0.11.8.1-fhs.patch
 
 # Wrapper for auto-launch gift-setup for first-time users 
 Source1: giftd.sh
 
 BuildRequires: libtool
-%if "%{?fedora}" > "3"
+%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
 BuildRequires: libtool-ltdl-devel
 %endif
 BuildRequires: libvorbis-devel
@@ -48,6 +47,7 @@
 %setup -q
 
 %patch1 -p1 -b .gcc4
+%patch2 -p1 -b .fhs
 
 
 %build
@@ -85,7 +85,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
+%doc AUTHORS COPYING HACKING QUICKSTART README TODO
 %{_bindir}/gift*
 %{_sbindir}/giftd
 %{_datadir}/giFT/
@@ -101,7 +101,13 @@
 
 
 %changelog
-* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
+- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-5
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4.1
 - fc5: gcc/glibc respin
 
 * Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4



From fedora-extras-commits at redhat.com  Tue Oct 10 12:44:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:44:23 -0700
Subject: rpms/gift/devel gift.spec,1.5,1.6
Message-ID: <200610101244.k9ACiPJq023158@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23141

Modified Files:
	gift.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gift.spec	29 Aug 2006 17:35:06 -0000	1.5
+++ gift.spec	10 Oct 2006 12:44:23 -0000	1.6
@@ -6,7 +6,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -15,6 +15,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gift-0.11.8.1-gcc4.patch
+# respect %_bindir,%_datadir,%_includedir,%_libdir
+# http://bugzilla.redhat.com/210114
+Patch2: gift-0.11.8.1-fhs.patch
 
 # Wrapper for auto-launch gift-setup for first-time users 
 Source1: giftd.sh
@@ -44,6 +47,7 @@
 %setup -q
 
 %patch1 -p1 -b .gcc4
+%patch2 -p1 -b .fhs
 
 
 %build
@@ -81,7 +85,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
+%doc AUTHORS COPYING HACKING QUICKSTART README TODO
 %{_bindir}/gift*
 %{_sbindir}/giftd
 %{_datadir}/giFT/
@@ -97,10 +101,13 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
+- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-5
 - fc6 respin
 
-* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4.1
 - fc5: gcc/glibc respin
 
 * Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4



From fedora-extras-commits at redhat.com  Tue Oct 10 12:46:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:46:05 -0700
Subject: rpms/gift/devel gift-0.11.8.1-fhs.patch,NONE,1.1 gift.spec,1.6,1.7
Message-ID: <200610101246.k9ACk7pE023236@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216

Modified Files:
	gift.spec 
Added Files:
	gift-0.11.8.1-fhs.patch 
Log Message:
add missing patch


gift-0.11.8.1-fhs.patch:

--- NEW FILE gift-0.11.8.1-fhs.patch ---
--- gift-0.11.8.1/configure.ac.fhs	2004-11-26 14:31:05.000000000 -0600
+++ gift-0.11.8.1/configure.ac	2006-10-10 07:00:04.000000000 -0500
@@ -342,22 +342,22 @@
     AC_SUBST(prefix)
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 AC_SUBST(libgiftincdir)
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 AC_SUBST(plugindir)
 
-LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${prefix}/lib/giFT")
+LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${libdir}/giFT")
 
 giftdatadir=${prefix}/share/giFT
 AC_SUBST(giftdatadir)
 
 if test x$WIN32 != xyes; then
-    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/share/giFT")
+    LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${datadir}/giFT")
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 AC_SUBST(giftperldir)
 
 dnl ###########################################################################
--- gift-0.11.8.1/configure.fhs	2004-11-27 15:12:59.000000000 -0600
+++ gift-0.11.8.1/configure	2006-10-10 07:01:03.000000000 -0500
@@ -25262,30 +25262,30 @@
 
 fi
 
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
 
 
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
 
 
 cat >>gconfdefs.h <<_ACEOF
 #ifndef PLUGIN_DIR
-#define PLUGIN_DIR "${prefix}/lib/giFT"
+#define PLUGIN_DIR "${libdir}/giFT"
 #endif
 _ACEOF
 
-giftdatadir=${prefix}/share/giFT
+giftdatadir=${datadir}/giFT
 
 
 if test x$WIN32 != xyes; then
     cat >>gconfdefs.h <<_ACEOF
 #ifndef DATA_DIR
-#define DATA_DIR "${prefix}/share/giFT"
+#define DATA_DIR "${datadir}/giFT"
 #endif
 _ACEOF
 fi
 
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
 
 
 


Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gift.spec	10 Oct 2006 12:44:23 -0000	1.6
+++ gift.spec	10 Oct 2006 12:46:05 -0000	1.7
@@ -6,7 +6,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 
 License: GPL
 Group:	 System Environment/Daemons



From fedora-extras-commits at redhat.com  Tue Oct 10 12:48:28 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:48:28 -0700
Subject: rpms/xdg-utils/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xdg-utils.spec, 1.6, 1.7
Message-ID: <200610101248.k9ACmU8g023397@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23376

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
- 1.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 02:05:31 -0000	1.5
+++ .cvsignore	10 Oct 2006 12:48:28 -0000	1.6
@@ -1 +1,3 @@
+clog
 xdg-utils-1.0rc1.tgz
+xdg-utils-1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 02:05:31 -0000	1.5
+++ sources	10 Oct 2006 12:48:28 -0000	1.6
@@ -1 +1 @@
-db93227b8ccde3e7cb0ccd522b0167a6  xdg-utils-1.0rc1.tgz
+69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdg-utils.spec	2 Oct 2006 20:53:56 -0000	1.6
+++ xdg-utils.spec	10 Oct 2006 12:48:28 -0000	1.7
@@ -1,10 +1,8 @@
 
-%define beta rc1 
-
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.9.%{beta}%{?dist}
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -73,6 +71,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
+- 1.0(final)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
 - update %%description (#208926)
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:50:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:50:54 -0700
Subject: rpms/xdg-utils/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xdg-utils.spec, 1.6, 1.7
Message-ID: <200610101250.k9ACouJC023511@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23490

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
- 1.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 02:06:13 -0000	1.5
+++ .cvsignore	10 Oct 2006 12:50:53 -0000	1.6
@@ -1 +1,3 @@
+clog
 xdg-utils-1.0rc1.tgz
+xdg-utils-1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 02:06:13 -0000	1.5
+++ sources	10 Oct 2006 12:50:53 -0000	1.6
@@ -1 +1 @@
-db93227b8ccde3e7cb0ccd522b0167a6  xdg-utils-1.0rc1.tgz
+69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/xdg-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdg-utils.spec	2 Oct 2006 20:54:38 -0000	1.6
+++ xdg-utils.spec	10 Oct 2006 12:50:53 -0000	1.7
@@ -1,10 +1,8 @@
 
-%define beta rc1 
-
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.9.%{beta}%{?dist}
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -73,6 +71,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
+- 1.0(final)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
 - update %%description (#208926)
 



From fedora-extras-commits at redhat.com  Tue Oct 10 12:51:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 05:51:19 -0700
Subject: rpms/xdg-utils/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xdg-utils.spec, 1.6, 1.7
Message-ID: <200610101251.k9ACpLWI023580@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23559

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
- 1.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 02:05:52 -0000	1.5
+++ .cvsignore	10 Oct 2006 12:51:18 -0000	1.6
@@ -1 +1,3 @@
+clog
 xdg-utils-1.0rc1.tgz
+xdg-utils-1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 02:05:52 -0000	1.5
+++ sources	10 Oct 2006 12:51:18 -0000	1.6
@@ -1 +1 @@
-db93227b8ccde3e7cb0ccd522b0167a6  xdg-utils-1.0rc1.tgz
+69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdg-utils.spec	2 Oct 2006 20:54:19 -0000	1.6
+++ xdg-utils.spec	10 Oct 2006 12:51:18 -0000	1.7
@@ -1,10 +1,8 @@
 
-%define beta rc1 
-
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 0.9.%{beta}%{?dist}
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -73,6 +71,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
+- 1.0(final)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.rc1
 - update %%description (#208926)
 



From fedora-extras-commits at redhat.com  Tue Oct 10 13:05:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 10 Oct 2006 06:05:05 -0700
Subject: rpms/libsigc++/devel libsigc++.spec,1.12,1.13
Message-ID: <200610101305.k9AD57cT026593@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26568

Modified Files:
	libsigc++.spec 
Log Message:
Added dist tag


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++/devel/libsigc++.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libsigc++.spec	28 Aug 2006 09:53:35 -0000	1.12
+++ libsigc++.spec	10 Oct 2006 13:05:04 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           libsigc++
 Version:        1.2.7
-Release:        3
+Release:        4%{?dist}
 Summary:        Typesafe signal framework for C++
 Group:          System Environment/Libraries
 License:        LGPL
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-4
+- Added dist tag
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 1.2.7-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct 10 13:19:09 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 10 Oct 2006 06:19:09 -0700
Subject: fedora-security/audit fc5,1.350,1.351 fc6,1.105,1.106
Message-ID: <200610101319.k9ADJ9mp026792@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26771

Modified Files:
	fc5 fc6 
Log Message:
X.org issues need looking at



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- fc5	10 Oct 2006 10:29:16 -0000	1.350
+++ fc5	10 Oct 2006 13:19:06 -0000	1.351
@@ -1,8 +1,10 @@
-p to date CVE as of CVE email 20061008
-Up to date FC5 as of 20061008
+Up to date CVE as of CVE email 20061009
+Up to date FC5 as of 20061009
 
 ** are items that need attention
 
+CVE-2006-5215 ** (X.org, fixed 20060225?)
+CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
@@ -16,6 +18,7 @@
 CVE-2006-4980 VULNERABLE (python) #208166
 CVE-2006-4925 ** openssh
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
+CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- fc6	10 Oct 2006 10:29:16 -0000	1.105
+++ fc6	10 Oct 2006 13:19:06 -0000	1.106
@@ -1,9 +1,11 @@
-Up to date CVE as of CVE email 20061005
+p to date CVE as of CVE email 20061009
 Up to date FC6 as of Test3
 Up to date dist-fc6 rawhide as of 20060929
 
 ** are items that need attention
 
+CVE-2006-5215 ** (X.org, fixed 20060225?)
+CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
 CVE-2006-5170 VULNERABLE (nss_ldap)
@@ -17,6 +19,7 @@
 CVE-2006-4980 VULNERABLE (python) [backport in rawhide]
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
+CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Tue Oct 10 13:31:46 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 10 Oct 2006 06:31:46 -0700
Subject: rpms/lilypond-doc/devel .cvsignore, 1.4, 1.5 lilypond-doc.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610101331.k9ADVmuY026966@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26945

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Aug 2006 21:43:05 -0000	1.4
+++ .cvsignore	10 Oct 2006 13:31:46 -0000	1.5
@@ -1 +1 @@
-lilypond-2.8.6-1.documentation.tar.bz2
+lilypond-2.8.7-1.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/lilypond-doc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lilypond-doc.spec	10 Aug 2006 21:43:05 -0000	1.3
+++ lilypond-doc.spec	10 Oct 2006 13:31:46 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           lilypond-doc
-Version:        2.8.6
+Version:        2.8.7
 Release:	1%{?dist}
 Summary:        HTML documentation for LilyPond
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.7-1
+- New release.
+
 * Thu Aug 10 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.6-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Aug 2006 21:43:05 -0000	1.4
+++ sources	10 Oct 2006 13:31:46 -0000	1.5
@@ -1 +1 @@
-1e460125fcf9a7c2223e0282c99d32ac  lilypond-2.8.6-1.documentation.tar.bz2
+492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 13:35:34 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 10 Oct 2006 06:35:34 -0700
Subject: rpms/lilypond-doc/FC-5 .cvsignore, 1.4, 1.5 lilypond-doc.spec, 1.3, 
	1.4 sources, 1.4, 1.5
Message-ID: <200610101335.k9ADZaNl027054@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27033

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Aug 2006 15:56:56 -0000	1.4
+++ .cvsignore	10 Oct 2006 13:35:34 -0000	1.5
@@ -1 +1 @@
-lilypond-2.8.6-1.documentation.tar.bz2
+lilypond-2.8.7-1.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-5/lilypond-doc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lilypond-doc.spec	11 Aug 2006 15:56:56 -0000	1.3
+++ lilypond-doc.spec	10 Oct 2006 13:35:34 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           lilypond-doc
-Version:        2.8.6
+Version:        2.8.7
 Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.7-1
+- New release.
+
 * Fri Aug 11 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.8.6-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2006 15:56:56 -0000	1.4
+++ sources	10 Oct 2006 13:35:34 -0000	1.5
@@ -1 +1 @@
-1e460125fcf9a7c2223e0282c99d32ac  lilypond-2.8.6-1.documentation.tar.bz2
+492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 13:59:59 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 10 Oct 2006 06:59:59 -0700
Subject: rpms/ganymed-ssh2/devel .cvsignore, 1.2, 1.3 ganymed-ssh2.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610101400.k9AE01Cp027252@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230

Modified Files:
	.cvsignore ganymed-ssh2.spec sources 
Log Message:
Update to upstream release 210



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2006 01:48:12 -0000	1.2
+++ .cvsignore	10 Oct 2006 13:59:59 -0000	1.3
@@ -1 +1 @@
-ganymed-ssh2-build209.zip
+ganymed-ssh2-build210.zip


Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/devel/ganymed-ssh2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ganymed-ssh2.spec	28 Aug 2006 03:30:24 -0000	1.3
+++ ganymed-ssh2.spec	10 Oct 2006 13:59:59 -0000	1.4
@@ -2,8 +2,8 @@
 
 
 Name:           ganymed-ssh2
-Version:        209
-Release:        6%{?dist}
+Version:        210
+Release:        2%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
+- Update to upstream release 210
+
 * Sun Aug 27 2006 Robert Marcano <robert at marcanoonline.com> 209-6
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 01:48:12 -0000	1.2
+++ sources	10 Oct 2006 13:59:59 -0000	1.3
@@ -1 +1 @@
-b0ee2f0feeb5f4ae02c2d5269fe6e1e0  ganymed-ssh2-build209.zip
+abd0fb2acbfb5885e1ae3af8f1f6b31e  ganymed-ssh2-build210.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 14:15:42 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 10 Oct 2006 07:15:42 -0700
Subject: rpms/ganymed-ssh2/FC-5 .cvsignore, 1.2, 1.3 ganymed-ssh2.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200610101415.k9AEFiJQ030306@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30285

Modified Files:
	.cvsignore ganymed-ssh2.spec sources 
Log Message:
Update to upstream release 210



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2006 01:48:12 -0000	1.2
+++ .cvsignore	10 Oct 2006 14:15:42 -0000	1.3
@@ -1 +1 @@
-ganymed-ssh2-build209.zip
+ganymed-ssh2-build210.zip


Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/FC-5/ganymed-ssh2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ganymed-ssh2.spec	28 Jul 2006 10:59:45 -0000	1.2
+++ ganymed-ssh2.spec	10 Oct 2006 14:15:42 -0000	1.3
@@ -2,8 +2,8 @@
 
 
 Name:           ganymed-ssh2
-Version:        209
-Release:        5%{?dist}
+Version:        210
+Release:        2%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
+- Update to upstream release 210
+
+* Sun Aug 27 2006 Robert Marcano <robert at marcanoonline.com> 209-6
+- Rebuild
+
 * Fri Jul 28 2006 Robert Marcano <robert at marcanoonline.com> 209-5
 - Rebuilt to pick up the changes in GCJ (bug #200480)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 01:48:12 -0000	1.2
+++ sources	10 Oct 2006 14:15:42 -0000	1.3
@@ -1 +1 @@
-b0ee2f0feeb5f4ae02c2d5269fe6e1e0  ganymed-ssh2-build209.zip
+abd0fb2acbfb5885e1ae3af8f1f6b31e  ganymed-ssh2-build210.zip



From fedora-extras-commits at redhat.com  Tue Oct 10 14:17:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 10 Oct 2006 07:17:18 -0700
Subject: comps comps-fe5.xml.in,1.164,1.165 comps-fe6.xml.in,1.180,1.181
Message-ID: <200610101417.k9AEHKEa030372@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30353

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added oorexx


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- comps-fe5.xml.in	8 Oct 2006 12:29:52 -0000	1.164
+++ comps-fe5.xml.in	10 Oct 2006 14:17:18 -0000	1.165
@@ -138,6 +138,7 @@
       <packagereq type="optional">monotone</packagereq>
       <packagereq type="optional">nqc</packagereq>
       <packagereq type="optional">ocaml</packagereq>
+      <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">patchy</packagereq>
       <packagereq type="optional">pikdev</packagereq>
       <packagereq type="optional">pl</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- comps-fe6.xml.in	8 Oct 2006 16:04:46 -0000	1.180
+++ comps-fe6.xml.in	10 Oct 2006 14:17:18 -0000	1.181
@@ -166,6 +166,7 @@
       <packagereq type="optional">monotone</packagereq>
       <packagereq type="optional">nqc</packagereq>
       <packagereq type="optional">ocaml</packagereq>
+      <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">patchy</packagereq>
       <packagereq type="optional">perltidy</packagereq>
       <packagereq type="optional">pgadmin3</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 10 15:18:38 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:18:38 -0700
Subject: rpms/python-turbocheetah - New directory
Message-ID: <200610101518.k9AFIeP7001534@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1511/python-turbocheetah

Log Message:
Directory /cvs/extras/rpms/python-turbocheetah added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 15:18:39 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:18:39 -0700
Subject: rpms/python-turbocheetah/devel - New directory
Message-ID: <200610101518.k9AFIfK4001537@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1511/python-turbocheetah/devel

Log Message:
Directory /cvs/extras/rpms/python-turbocheetah/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 15:18:51 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:18:51 -0700
Subject: rpms/python-turbocheetah/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610101518.k9AFIrQx001599@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1561/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-turbocheetah


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 15:18:50 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:18:50 -0700
Subject: rpms/python-turbocheetah Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610101518.k9AFIqSg001596@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1561

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-turbocheetah


--- NEW FILE Makefile ---
# Top level Makefile for module python-turbocheetah
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 15:19:08 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:19:08 -0700
Subject: rpms/python-turbocheetah import.log,1.1,1.2
Message-ID: <200610101519.k9AFJACr001665@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1632

Modified Files:
	import.log 
Log Message:
auto-import python-turbocheetah-0.9.5-4 on branch devel from python-turbocheetah-0.9.5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-turbocheetah/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 15:18:50 -0000	1.1
+++ import.log	10 Oct 2006 15:19:08 -0000	1.2
@@ -0,0 +1 @@
+python-turbocheetah-0_9_5-4:HEAD:python-turbocheetah-0.9.5-4.src.rpm:1160493674



From fedora-extras-commits at redhat.com  Tue Oct 10 15:19:09 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:19:09 -0700
Subject: rpms/python-turbocheetah/devel python-turbocheetah.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610101519.k9AFJBIG001671@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1632/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-turbocheetah.spec 
Log Message:
auto-import python-turbocheetah-0.9.5-4 on branch devel from python-turbocheetah-0.9.5-4.src.rpm


--- NEW FILE python-turbocheetah.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%define module turbocheetah

Name:           python-turbocheetah
Version:        0.9.5
Release:        4%{?dist}
Summary:        TurboGears plugin to support use of Cheetah templates

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org/docs/plugins/template.html
Source0:        http://cheeseshop.python.org/packages/source/T/TurboCheetah/TurboCheetah-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools
Requires:       python-cheetah >= 1.0

%description
This package provides a template engine plugin, allowing you
to easily use Cheetah with TurboGears, Buffet and other tools that
support the python.templating.engines entry point.


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


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
rm -fr %{buildroot}/%{python_sitelib}/%{module}/tests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/%{module}/
%{python_sitelib}/TurboCheetah-%{version}-py%{pyver}.egg-info


%changelog
* Tue Oct 10 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-4
- Fix Source0
- Own %%{python_sitelib}/turbocheetah

* Fri Oct  6 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-3
- Add python-setuptools to BuildRequires
- Remove tests directory

* Sat Sep 30 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-2
- Rename to python-turbocheetah
- Install egg-info
- Add README

* Sat Sep 16 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-1
- Initial creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-turbocheetah/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 15:18:50 -0000	1.1
+++ .cvsignore	10 Oct 2006 15:19:09 -0000	1.2
@@ -0,0 +1 @@
+TurboCheetah-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-turbocheetah/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 15:18:50 -0000	1.1
+++ sources	10 Oct 2006 15:19:09 -0000	1.2
@@ -0,0 +1 @@
+52e12130302a218a8e3b925447041be4  TurboCheetah-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 15:19:22 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Oct 2006 08:19:22 -0700
Subject: owners owners.list,1.1811,1.1812
Message-ID: <200610101519.k9AFJONW001726@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1707

Modified Files:
	owners.list 
Log Message:
Add python-turbocheetah to owners list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1811
retrieving revision 1.1812
diff -u -r1.1811 -r1.1812
--- owners.list	10 Oct 2006 10:10:07 -0000	1.1811
+++ owners.list	10 Oct 2006 15:19:22 -0000	1.1812
@@ -1890,6 +1890,7 @@
 Fedora Extras|python-telepathy|Python libraries for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-TestGears|Unit testing for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-turbocheetah|TurboGears plugin to support use of Cheetah templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 15:40:07 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 10 Oct 2006 08:40:07 -0700
Subject: owners owners.list,1.1812,1.1813
Message-ID: <200610101540.k9AFe95H002098@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2081

Modified Files:
	owners.list 
Log Message:
Take ownership of fyre


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1812
retrieving revision 1.1813
diff -u -r1.1812 -r1.1813
--- owners.list	10 Oct 2006 15:19:22 -0000	1.1812
+++ owners.list	10 Oct 2006 15:40:07 -0000	1.1813
@@ -432,7 +432,7 @@
 Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|fyre|A tool for creating artwork from chaotic functions|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|fyre|A tool for creating artwork from chaotic functions|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 15:42:39 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 10 Oct 2006 08:42:39 -0700
Subject: rpms/fyre/devel .cvsignore, 1.2, 1.3 fyre.spec, 1.15, 1.16 sources, 
	1.2, 1.3 fyre-1.0.0-apps.patch, 1.1, NONE
Message-ID: <200610101542.k9AFgfSL002185@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2164

Modified Files:
	.cvsignore fyre.spec sources 
Removed Files:
	fyre-1.0.0-apps.patch 
Log Message:
* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.1-1
- Update to 1.0.1.
- Scriptlet cleanup.
- Drop app patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Mar 2005 16:33:15 -0000	1.2
+++ .cvsignore	10 Oct 2006 15:42:39 -0000	1.3
@@ -1 +1 @@
-fyre-1.0.0.tar.bz2
+fyre-1.0.1.tar.bz2


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fyre.spec	17 Sep 2006 20:45:05 -0000	1.15
+++ fyre.spec	10 Oct 2006 15:42:39 -0000	1.16
@@ -1,21 +1,31 @@
 Name:           fyre
-Version:        1.0.0
-Release:        15%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
+Summary:        Tool for creating artwork from chaotic functions
 
-Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://fyre.navi.cx/
-Source0:        http://flapjack.navi.cx/releases/fyre/fyre-1.0.0.tar.bz2
-Source1:        fyre-cluster.init
-Source2:        fyre.config
-Patch:          fyre-1.0.0-apps.patch
+Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
+Source1:        %{name}-cluster.init
+Source2:        %{name}.config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
-Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(preun): initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info
+BuildRequires:  libglade2-devel
+BuildRequires:	gnet2-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	shared-mime-info
+
+Requires(post): desktop-file-utils
+Requires(post):	shared-mime-info
+Requires(post):	/sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
+
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -24,60 +34,79 @@
 line interface for easy and efficient rendering of high-resolution, high
 quality images.
 
+
 %prep
 %setup -q
-%patch -p 1 -b .apps
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-desktop-file-install --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --add-category=GTK \
-  --delete-original \
+make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install --vendor fedora --delete-original	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
+  --add-category X-Fedora			        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/fyre-cluster
 install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/fyre
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null ||:
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
+
 %preun
 if [ $1 = 0 ]; then
- /sbin/chkconfig --del fyre-cluster
- /sbin/service fyre-cluster stop >> /dev/null
+	/sbin/service fyre-cluster stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del fyre-cluster
 fi
 
+
 %postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/*
+%{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/mimetypes/*
-%{_datadir}/mime/packages/*
-%{_datadir}/pixmaps/*
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-%{name}-animation.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/mime/packages/%{name}.xml
 %{_initrddir}/fyre-cluster
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1.
+- Scriptlet cleanup.
+- Drop app patch.
+
 * Mon Sep 18 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.0.0-15
 - rebuilt due to broken depends.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Mar 2005 16:33:15 -0000	1.2
+++ sources	10 Oct 2006 15:42:39 -0000	1.3
@@ -1 +1 @@
-5da821b3166d3de187cc7d84bb1dc4d3  fyre-1.0.0.tar.bz2
+3058bb171f76ced74f79d876f296ac6f  fyre-1.0.1.tar.bz2


--- fyre-1.0.0-apps.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 15:46:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:46:56 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200610101547.k9AFlSox002247@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2193/FC-5

Modified Files:
	perl-Moose.spec sources 
Log Message:
update to 0.14



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Moose.spec	4 Oct 2006 04:24:23 -0000	1.3
+++ perl-Moose.spec	10 Oct 2006 15:46:56 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -28,13 +28,6 @@
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
 
-# cpanspec autogenerated requires...
-#Requires:       perl(Class::MOP) >= 0.34
-#Requires:       perl(Sub::Exporter) >= 0.954
-#Requires:       perl(Sub::Install) >= 0.92
-#Requires:       perl(Sub::Name) >= 0.02
-#Requires:       perl(UNIVERSAL::require) >= 0.10
-
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -68,6 +61,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+- drop some cruft from the specfile
+
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update to 0.13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:24:23 -0000	1.3
+++ sources	10 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-f3f4edbf510006ea7cc9cb3092eb4883  Moose-0.13.tar.gz
+78839b212fb9712c37e60588042fc829  Moose-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 15:46:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:46:55 -0700
Subject: rpms/perl-Moose Makefile,1.2,1.3
Message-ID: <200610101547.k9AFlRHU002243@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2193

Modified Files:
	Makefile 
Log Message:
update to 0.14



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	4 Oct 2006 04:24:22 -0000	1.2
+++ Makefile	10 Oct 2006 15:46:55 -0000	1.3
@@ -2,12 +2,14 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
 # tag & build all non-legacy branches...
 build-all :
-	@echo WARNING: building for devel and FC-5
+	@echo NOTICE: building for ${BRANCHES}
 	@sleep 5s
-	@cd FC-5  && test -f dead.package || ( make tag && make plague )
-	@cd devel && test -f dead.package || ( make tag && make plague )
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
 
 common-update : common
 	@cd common && cvs update



From fedora-extras-commits at redhat.com  Tue Oct 10 15:46:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:46:57 -0700
Subject: rpms/perl-Moose/devel .cvsignore, 1.3, 1.4 perl-Moose.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200610101547.k9AFlTEH002252@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2193/devel

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
update to 0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 04:24:23 -0000	1.3
+++ .cvsignore	10 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-Moose-0.13.tar.gz
+Moose-0.14.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Moose.spec	4 Oct 2006 04:24:23 -0000	1.3
+++ perl-Moose.spec	10 Oct 2006 15:46:56 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -28,13 +28,6 @@
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
 
-# cpanspec autogenerated requires...
-#Requires:       perl(Class::MOP) >= 0.34
-#Requires:       perl(Sub::Exporter) >= 0.954
-#Requires:       perl(Sub::Install) >= 0.92
-#Requires:       perl(Sub::Name) >= 0.02
-#Requires:       perl(UNIVERSAL::require) >= 0.10
-
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -68,6 +61,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+- drop some cruft from the specfile
+
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update to 0.13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:24:23 -0000	1.3
+++ sources	10 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-f3f4edbf510006ea7cc9cb3092eb4883  Moose-0.13.tar.gz
+78839b212fb9712c37e60588042fc829  Moose-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 15:53:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:53:45 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.4,1.5
Message-ID: <200610101553.k9AFrl1J002353@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2322/FC-5

Modified Files:
	perl-Moose.spec 
Log Message:
update %%dscription


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Moose.spec	10 Oct 2006 15:46:56 -0000	1.4
+++ perl-Moose.spec	10 Oct 2006 15:53:45 -0000	1.5
@@ -33,6 +33,20 @@
 %description
 Moose is an extension of the Perl 5 object system.
 
+Yes, I know there has been an explosion recently of new ways to build
+objects in Perl 5, most of them based on inside-out objects and other
+such things. Moose is different because it is not a new object system
+for Perl 5, but instead an extension of the existing object system.
+
+Moose is built on top of Class::MOP, which is a metaclass system for
+Perl 5. This means that Moose not only makes building normal Perl 5
+objects better, but it also provides the power of metaclass programming.
+
+While Moose is very much inspired by Perl 6, it is not itself Perl
+6.  Instead, it is an OO system for Perl 5. I built Moose because I was
+tired or writing the same old boring Perl 5 OO code, and drooling over
+Perl 6 OO. So instead of switching to Ruby, I wrote Moose :)
+
 %prep
 %setup -q -n Moose-%{version}
 
@@ -64,6 +78,7 @@
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
 - update to 0.14
 - drop some cruft from the specfile
+- make %%description a touch more verbose :)
 
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update to 0.13



From fedora-extras-commits at redhat.com  Tue Oct 10 15:53:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 08:53:46 -0700
Subject: rpms/perl-Moose/devel perl-Moose.spec,1.4,1.5
Message-ID: <200610101553.k9AFrmAr002357@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2322/devel

Modified Files:
	perl-Moose.spec 
Log Message:
update %%dscription


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Moose.spec	10 Oct 2006 15:46:56 -0000	1.4
+++ perl-Moose.spec	10 Oct 2006 15:53:46 -0000	1.5
@@ -33,6 +33,20 @@
 %description
 Moose is an extension of the Perl 5 object system.
 
+Yes, I know there has been an explosion recently of new ways to build
+objects in Perl 5, most of them based on inside-out objects and other
+such things. Moose is different because it is not a new object system
+for Perl 5, but instead an extension of the existing object system.
+
+Moose is built on top of Class::MOP, which is a metaclass system for
+Perl 5. This means that Moose not only makes building normal Perl 5
+objects better, but it also provides the power of metaclass programming.
+
+While Moose is very much inspired by Perl 6, it is not itself Perl
+6.  Instead, it is an OO system for Perl 5. I built Moose because I was
+tired or writing the same old boring Perl 5 OO code, and drooling over
+Perl 6 OO. So instead of switching to Ruby, I wrote Moose :)
+
 %prep
 %setup -q -n Moose-%{version}
 
@@ -64,6 +78,7 @@
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
 - update to 0.14
 - drop some cruft from the specfile
+- make %%description a touch more verbose :)
 
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update to 0.13



From fedora-extras-commits at redhat.com  Tue Oct 10 15:54:32 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 10 Oct 2006 08:54:32 -0700
Subject: rpms/python-telepathy/devel .cvsignore, 1.2,
	1.3 python-telepathy.spec, 1.3, 1.4 sources, 1.2,
	1.3 python-telepathy-connection-manager.patch, 1.1, NONE
Message-ID: <200610101554.k9AFsZEr002467@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2446

Modified Files:
	.cvsignore python-telepathy.spec sources 
Removed Files:
	python-telepathy-connection-manager.patch 
Log Message:
* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.3-1
- Update to 0.13.3.
- Drop connection-manager patch, fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2006 13:08:24 -0000	1.2
+++ .cvsignore	10 Oct 2006 15:54:32 -0000	1.3
@@ -1 +1 @@
-telepathy-python-0.13.2.tar.gz
+telepathy-python-0.13.3.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-telepathy.spec	2 Oct 2006 19:10:49 -0000	1.3
+++ python-telepathy.spec	10 Oct 2006 15:54:32 -0000	1.4
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.13.2
-Release:        3%{?dist}
+Version:        0.13.3
+Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-%{version}.tar.gz
-Patch0:		%{name}-connection-manager.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q -n telepathy-python-%{version}
-%patch0 -b .connection-manager
 
 
 %build
@@ -45,6 +43,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.3-1
+- Update to 0.13.3.
+- Drop connection-manager patch, fixed upstream.
+
 * Mon Oct  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13.2-3
 - Actually use the name variable for the patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2006 13:08:24 -0000	1.2
+++ sources	10 Oct 2006 15:54:32 -0000	1.3
@@ -1 +1 @@
-4edb4167934be3fec5c27240aa8da28b  telepathy-python-0.13.2.tar.gz
+1ca0c6670d0feb827b45ecbfe46f1e8d  telepathy-python-0.13.3.tar.gz


--- python-telepathy-connection-manager.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 16:12:24 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Tue, 10 Oct 2006 09:12:24 -0700
Subject: rpms/kadu/devel kadu.spec,1.11,1.12
Message-ID: <200610101612.k9AGCQRk005577@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5560

Modified Files:
	kadu.spec 
Log Message:
* Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.15.20060915svn
- Another fix to not rebuilding kadu-amarok



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kadu.spec	7 Oct 2006 17:05:30 -0000	1.11
+++ kadu.spec	10 Oct 2006 16:12:24 -0000	1.12
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.14.%{cvs_date}svn%{?dist}
+Release:	0.15.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -244,7 +244,9 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
+%ifnarch ppc64 x86_64 s390 s390x ia64
 	module_amarok \
+%endif
 	module_filedesc \
 	module_spellchecker \
 	module_weather \
@@ -409,13 +411,6 @@
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
 
-%else
-
-%ghost %{_modlib}/amarok.so
-%ghost %{_moddata}/amarok.desc
-%ghost %{_moddata}/data/amarok
-%ghost %{_modtrans}/amarok*
-
 %endif
 
 %mod_files2 filedesc
@@ -458,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.15.20060915svn
+- Another fix to not rebuilding kadu-amarok
+
 * Sat Oct 07 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.14.20060915svn
 - It really shoud work now
 



From fedora-extras-commits at redhat.com  Tue Oct 10 16:21:29 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 10 Oct 2006 09:21:29 -0700
Subject: rpms/wcstools/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wcstools.spec, 1.2, 1.3 wcstools3-codewarn.patch, 1.1,
	1.2 wcstools3-tmpfile.patch, 1.1, NONE
Message-ID: <200610101621.k9AGLVf8005694@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5668

Modified Files:
	.cvsignore sources wcstools.spec wcstools3-codewarn.patch 
Removed Files:
	wcstools3-tmpfile.patch 
Log Message:
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 17:27:53 -0000	1.2
+++ .cvsignore	10 Oct 2006 16:21:29 -0000	1.3
@@ -1 +1 @@
-wcstools-3.6.5.tar.gz
+wcstools-3.6.6beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 17:27:53 -0000	1.2
+++ sources	10 Oct 2006 16:21:29 -0000	1.3
@@ -1 +1 @@
-9cd9bbbe1408c2d92728d8f039291fb3  wcstools-3.6.5.tar.gz
+cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/wcstools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wcstools.spec	4 Sep 2006 11:21:18 -0000	1.2
+++ wcstools.spec	10 Oct 2006 16:21:29 -0000	1.3
@@ -1,18 +1,16 @@
 Name: wcstools
-Version: 3.6.5
-Release: 2%{?dist}
+Version: 3.6.6
+Release: 0.1.beta%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
-Patch2: wcstools3-tmpfile.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 Wcstools is a set of software utilities, written in C, which create,
 display and manipulate the world coordinate system of a FITS or IRAF
@@ -35,7 +33,7 @@
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
 License: LGPL
-Requires: %{name} = %{version}-%{release}
+Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
 
@@ -43,7 +41,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all
@@ -74,6 +71,7 @@
 
 %files -n libwcs
 %defattr(-,root,root)
+%doc libwcs/COPYING
 %{_libdir}/*.so.*
 
 %files -n libwcs-devel
@@ -84,6 +82,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
+- New upstream source 3.6.6beta
 * Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
 - Corrected bug in edhead (patch2) (bug #204642).
 * Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/wcstools3-codewarn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wcstools3-codewarn.patch	26 Jun 2006 17:27:53 -0000	1.1
+++ wcstools3-codewarn.patch	10 Oct 2006 16:21:29 -0000	1.2
@@ -1,18 +1,17 @@
-diff -ur wcstools-3.6.5.orig/getdate.c wcstools-3.6.5/getdate.c
---- wcstools-3.6.5.orig/getdate.c	2006-06-22 01:46:49.000000000 +0200
-+++ wcstools-3.6.5/getdate.c	2006-06-23 10:23:36.000000000 +0200
-@@ -382,7 +382,7 @@
-     char outform[16];
-     char *fitsdate, *newfdate;
++++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
+--- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
+@@ -413,7 +413,7 @@
+     char *fitsdate, *newfdate, *stdate;
      char temp[64];
+     char fyear[16];
 -    char ts0[8];
 +    char ts0[9];
      char *tchar;
      int its, its1;
      time_t lts;
-diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c
---- wcstools-3.6.5.orig/libwcs/binread.c	2006-06-20 22:07:37.000000000 +0200
-+++ wcstools-3.6.5/libwcs/binread.c	2006-06-23 10:24:39.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
+--- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
 @@ -1358,7 +1358,7 @@
  	for (i = 0; i < nmag; i++) {
  	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
@@ -22,9 +21,9 @@
  	    st->xmag[i] = 0.01 * (double) st->mag[i];
  	    }
  	}
-diff -ur wcstools-3.6.5.orig/libwcs/catutil.c wcstools-3.6.5/libwcs/catutil.c
---- wcstools-3.6.5.orig/libwcs/catutil.c	2006-06-20 21:05:14.000000000 +0200
-+++ wcstools-3.6.5/libwcs/catutil.c	2006-06-23 10:29:31.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
+--- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
 @@ -722,7 +722,7 @@
  	    lname = 0;
  	else


--- wcstools3-tmpfile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 16:26:32 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 10 Oct 2006 09:26:32 -0700
Subject: rpms/wcstools/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wcstools.spec, 1.2, 1.3 wcstools3-codewarn.patch, 1.1,
	1.2 wcstools3-tmpfile.patch, 1.1, NONE
Message-ID: <200610101626.k9AGQY0M005804@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778

Modified Files:
	.cvsignore sources wcstools.spec wcstools3-codewarn.patch 
Removed Files:
	wcstools3-tmpfile.patch 
Log Message:
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 17:27:53 -0000	1.2
+++ .cvsignore	10 Oct 2006 16:26:31 -0000	1.3
@@ -1 +1 @@
-wcstools-3.6.5.tar.gz
+wcstools-3.6.6beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 17:27:53 -0000	1.2
+++ sources	10 Oct 2006 16:26:31 -0000	1.3
@@ -1 +1 @@
-9cd9bbbe1408c2d92728d8f039291fb3  wcstools-3.6.5.tar.gz
+cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-4/wcstools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wcstools.spec	4 Sep 2006 11:22:52 -0000	1.2
+++ wcstools.spec	10 Oct 2006 16:26:31 -0000	1.3
@@ -1,18 +1,16 @@
 Name: wcstools
-Version: 3.6.5
-Release: 2%{?dist}
+Version: 3.6.6
+Release: 0.1.beta%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
-Patch2: wcstools3-tmpfile.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 Wcstools is a set of software utilities, written in C, which create,
 display and manipulate the world coordinate system of a FITS or IRAF
@@ -35,7 +33,7 @@
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
 License: LGPL
-Requires: %{name} = %{version}-%{release}
+Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
 
@@ -43,7 +41,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all
@@ -74,6 +71,7 @@
 
 %files -n libwcs
 %defattr(-,root,root)
+%doc libwcs/COPYING
 %{_libdir}/*.so.*
 
 %files -n libwcs-devel
@@ -84,6 +82,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
+- New upstream source 3.6.6beta
 * Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
 - Corrected bug in edhead (patch2) (bug #204642).
 * Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-4/wcstools3-codewarn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wcstools3-codewarn.patch	26 Jun 2006 17:27:53 -0000	1.1
+++ wcstools3-codewarn.patch	10 Oct 2006 16:26:31 -0000	1.2
@@ -1,18 +1,17 @@
-diff -ur wcstools-3.6.5.orig/getdate.c wcstools-3.6.5/getdate.c
---- wcstools-3.6.5.orig/getdate.c	2006-06-22 01:46:49.000000000 +0200
-+++ wcstools-3.6.5/getdate.c	2006-06-23 10:23:36.000000000 +0200
-@@ -382,7 +382,7 @@
-     char outform[16];
-     char *fitsdate, *newfdate;
++++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
+--- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
+@@ -413,7 +413,7 @@
+     char *fitsdate, *newfdate, *stdate;
      char temp[64];
+     char fyear[16];
 -    char ts0[8];
 +    char ts0[9];
      char *tchar;
      int its, its1;
      time_t lts;
-diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c
---- wcstools-3.6.5.orig/libwcs/binread.c	2006-06-20 22:07:37.000000000 +0200
-+++ wcstools-3.6.5/libwcs/binread.c	2006-06-23 10:24:39.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
+--- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
 @@ -1358,7 +1358,7 @@
  	for (i = 0; i < nmag; i++) {
  	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
@@ -22,9 +21,9 @@
  	    st->xmag[i] = 0.01 * (double) st->mag[i];
  	    }
  	}
-diff -ur wcstools-3.6.5.orig/libwcs/catutil.c wcstools-3.6.5/libwcs/catutil.c
---- wcstools-3.6.5.orig/libwcs/catutil.c	2006-06-20 21:05:14.000000000 +0200
-+++ wcstools-3.6.5/libwcs/catutil.c	2006-06-23 10:29:31.000000000 +0200
+diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
+--- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
++++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
 @@ -722,7 +722,7 @@
  	    lname = 0;
  	else


--- wcstools3-tmpfile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 17:01:31 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Tue, 10 Oct 2006 10:01:31 -0700
Subject: rpms/kadu/FC-5 kadu.spec,1.5,1.6
Message-ID: <200610101701.k9AH1XGt008970@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8941

Modified Files:
	kadu.spec 
Log Message:
* Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.9.20060915svn
- Not rebuilding kadu-amarok on some archs



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kadu.spec	16 Sep 2006 10:20:48 -0000	1.5
+++ kadu.spec	10 Oct 2006 17:01:31 -0000	1.6
@@ -1,7 +1,7 @@
 %define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.8.%{cvs_date}svn%{?dist}
+Release:	0.9.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -244,7 +244,9 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
+%ifnarch ppc64 x86_64 s390 s390x ia64
 	module_amarok \
+%endif
 	module_filedesc \
 	module_spellchecker \
 	module_weather \
@@ -406,8 +408,11 @@
 
 %mod_files2 xmms
 
+%ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
 
+%endif
+
 %mod_files2 filedesc
 
 %mod_files2 spellchecker
@@ -448,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.9.20060915svn
+- Not rebuilding kadu-amarok on some archs
+
 * Sat Sep 16 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.8.20060915svn
 - Update upstream to 20060915
 - Move themes to external spec file



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:17 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:17 -0700
Subject: rpms/perl-SQL-Library - New directory
Message-ID: <200610101815.k9AIFJUT012350@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324/perl-SQL-Library

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Library added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:22 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:22 -0700
Subject: rpms/perl-SQL-Library Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610101815.k9AIFOCU012393@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12360

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-SQL-Library


--- NEW FILE Makefile ---
# Top level Makefile for module perl-SQL-Library
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:18 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:18 -0700
Subject: rpms/perl-SQL-Library/devel - New directory
Message-ID: <200610101815.k9AIFKuJ012353@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324/perl-SQL-Library/devel

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Library/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:23 -0700
Subject: rpms/perl-SQL-Library/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610101815.k9AIFPGa012396@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12360/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-SQL-Library


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:31 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:31 -0700
Subject: rpms/perl-SQL-Library import.log,1.1,1.2
Message-ID: <200610101815.k9AIFXun012442@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409

Modified Files:
	import.log 
Log Message:
auto-import perl-SQL-Library-0.0.3-1.fc5 on branch devel from perl-SQL-Library-0.0.3-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 18:15:22 -0000	1.1
+++ import.log	10 Oct 2006 18:15:30 -0000	1.2
@@ -0,0 +1 @@
+perl-SQL-Library-0_0_3-1_fc5:HEAD:perl-SQL-Library-0.0.3-1.fc5.src.rpm:1160504130



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:31 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:31 -0700
Subject: rpms/perl-SQL-Library/devel perl-SQL-Library.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610101815.k9AIFXcx012447@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-SQL-Library.spec 
Log Message:
auto-import perl-SQL-Library-0.0.3-1.fc5 on branch devel from perl-SQL-Library-0.0.3-1.fc5.src.rpm


--- NEW FILE perl-SQL-Library.spec ---
Name:           perl-SQL-Library
Version:        0.0.3
Release:        1%{?dist}
Summary:        Manage libraries of SQL easily 
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/SQL-Library/
Source0:        http://www.cpan.org/authors/id/D/DG/DGORLEY/SQL-Library-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a perl module for managing simple SQL libraries stored in
INI-like files.  It allows developers to maintain the SQL they require 
OUTSIDE of their perl code.

%prep
%setup -q -n SQL-Library-%{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}/*

# the better to doc it later...
cp t/sqltest.lib example.lib

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README example.lib
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0.3-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 18:15:23 -0000	1.1
+++ .cvsignore	10 Oct 2006 18:15:31 -0000	1.2
@@ -0,0 +1 @@
+SQL-Library-0.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 18:15:23 -0000	1.1
+++ sources	10 Oct 2006 18:15:31 -0000	1.2
@@ -0,0 +1 @@
+75b80cb27775bb61f90fbd5b835032ec  SQL-Library-0.0.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 18:15:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:15:51 -0700
Subject: owners owners.list,1.1813,1.1814
Message-ID: <200610101815.k9AIFrJ4012494@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12477

Modified Files:
	owners.list 
Log Message:
added perl-SQL-Library


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1813
retrieving revision 1.1814
diff -u -r1.1813 -r1.1814
--- owners.list	10 Oct 2006 15:40:07 -0000	1.1813
+++ owners.list	10 Oct 2006 18:15:51 -0000	1.1814
@@ -1601,6 +1601,7 @@
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract-Limit|Portable LIMIT Emulation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-SQL-Library|Manage libraries of SQL easily|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Statistics-Descriptive|Perl module of basic descriptive statistical functions|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1963,8 +1964,8 @@
 Fedora Extras|rman|Converts man pages to various other formats|mpeters at mac.com|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rogue|The original roguelike game|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|root-tail|An app to show log files on the root window|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
+Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rosegarden4|MIDI, audio and notation editor|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 18:16:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:16:11 -0700
Subject: rpms/perl-SQL-Library/devel perl-SQL-Library.spec,1.1,1.2
Message-ID: <200610101816.k9AIGDCh012522@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12505

Modified Files:
	perl-SQL-Library.spec 
Log Message:
release bump


Index: perl-SQL-Library.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/devel/perl-SQL-Library.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SQL-Library.spec	10 Oct 2006 18:15:31 -0000	1.1
+++ perl-SQL-Library.spec	10 Oct 2006 18:16:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Library
 Version:        0.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manage libraries of SQL easily 
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -48,5 +48,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0.3-2
+- bump
+
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.0.3-1
 - Specfile autogenerated by cpanspec 1.69.



From fedora-extras-commits at redhat.com  Tue Oct 10 18:17:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 11:17:48 -0700
Subject: rpms/perl-SQL-Library Makefile,1.1,1.2
Message-ID: <200610101817.k9AIHoKO012592@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Library
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12573

Modified Files:
	Makefile 
Log Message:
Add build-all target



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Library/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	10 Oct 2006 18:15:22 -0000	1.1
+++ Makefile	10 Oct 2006 18:17:48 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Tue Oct 10 18:24:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 10 Oct 2006 11:24:28 -0700
Subject: fedora-security/audit fe4,1.77,1.78 fe5,1.84,1.85
Message-ID: <200610101824.k9AIOS9u012730@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12705

Modified Files:
	fe4 fe5 
Log Message:
CVE-2006-5129 ** (moodle) #206516


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- fe4	3 Oct 2006 17:59:44 -0000	1.77
+++ fe4	10 Oct 2006 18:24:25 -0000	1.78
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4943 ** (moodle) #206516


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fe5	8 Oct 2006 20:00:31 -0000	1.84
+++ fe5	10 Oct 2006 18:24:25 -0000	1.85
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4943 ** (moodle) #206516



From fedora-extras-commits at redhat.com  Tue Oct 10 18:32:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 11:32:18 -0700
Subject: comps comps-fe5.xml.in,1.165,1.166 comps-fe6.xml.in,1.181,1.182
Message-ID: <200610101832.k9AIWKGw012857@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12838/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add mirrormagic, supertuxkart


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- comps-fe5.xml.in	10 Oct 2006 14:17:18 -0000	1.165
+++ comps-fe5.xml.in	10 Oct 2006 18:32:17 -0000	1.166
@@ -311,6 +311,7 @@
       <packagereq type="optional">lmarbles</packagereq>
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
+      <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>
       <packagereq type="optional">monsterz</packagereq>
       <packagereq type="optional">nazghul</packagereq>
@@ -342,12 +343,12 @@
       <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">sturmbahnfahrer</packagereq>
       <packagereq type="optional">supertux</packagereq>
+      <packagereq type="optional">supertuxkart</packagereq>
       <packagereq type="optional">tong</packagereq>
       <packagereq type="optional">torcs</packagereq>
       <packagereq type="optional">trackballs</packagereq>
       <packagereq type="optional">trackballs-music</packagereq>
       <packagereq type="optional">tremulous</packagereq>
-      <packagereq type="optional">tuxkart</packagereq>
       <packagereq type="optional">tuxpuck</packagereq>
       <packagereq type="optional">ularn</packagereq>
       <packagereq type="optional">uqm</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- comps-fe6.xml.in	10 Oct 2006 14:17:18 -0000	1.181
+++ comps-fe6.xml.in	10 Oct 2006 18:32:17 -0000	1.182
@@ -409,12 +409,12 @@
       <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">sturmbahnfahrer</packagereq>
       <packagereq type="optional">supertux</packagereq>
+      <packagereq type="optional">supertuxkart</packagereq>
       <packagereq type="optional">tong</packagereq>
       <packagereq type="optional">torcs</packagereq>
       <packagereq type="optional">trackballs</packagereq>
       <packagereq type="optional">trackballs-music</packagereq>
       <packagereq type="optional">tremulous</packagereq>
-      <packagereq type="optional">tuxkart</packagereq>
       <packagereq type="optional">tuxpuck</packagereq>
       <packagereq type="optional">ularn</packagereq>
       <packagereq type="optional">uqm</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 10 18:37:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 11:37:20 -0700
Subject: rpms/libassuan/devel libassuan-0.9.3-m4.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 libassuan.spec, 1.18, 1.19 sources, 1.6, 1.7
Message-ID: <200610101837.k9AIbMlR012910@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12886

Modified Files:
	.cvsignore libassuan.spec sources 
Added Files:
	libassuan-0.9.3-m4.patch 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-1
- 0.9.3
- BR: pth-devel, -devel: Requires: pth-devel


libassuan-0.9.3-m4.patch:

--- NEW FILE libassuan-0.9.3-m4.patch ---
--- libassuan-0.9.3/src/libassuan.m4.m4patch	2006-10-06 10:28:15.000000000 -0500
+++ libassuan-0.9.3/src/libassuan.m4	2006-10-10 08:33:12.000000000 -0500
@@ -125,8 +125,8 @@
 AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
 [ _AM_PATH_LIBASSUAN_COMMON($1,pth)
   if test $ok = yes; then
-    LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
-    LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+    LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags`
+    LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs`
     ifelse([$2], , :, [$2])
   else
     LIBASSUAN_PTH_CFLAGS=""
@@ -146,8 +146,8 @@
 AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
 [ _AM_PATH_LIBASSUAN_COMMON($1,pth)
   if test $ok = yes; then
-    LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
-    LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+    LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
+    LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
     ifelse([$2], , :, [$2])
   else
     LIBASSUAN_PTHREAD_CFLAGS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Oct 2006 13:04:36 -0000	1.6
+++ .cvsignore	10 Oct 2006 18:37:19 -0000	1.7
@@ -1,5 +1,5 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-0.9.0.tar.bz2
-libassuan-0.9.0.tar.bz2.sig
 libassuan-0.9.2.tar.bz2.sig
+libassuan-0.9.2.tar.bz2
+libassuan-0.9.3.tar.bz2.sig


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libassuan.spec	6 Oct 2006 13:04:36 -0000	1.18
+++ libassuan.spec	10 Oct 2006 18:37:19 -0000	1.19
@@ -1,7 +1,7 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 0.9.2
+Version: 0.9.3
 Release: 1%{?dist}
 
 License: LGPL
@@ -11,6 +11,10 @@
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: libassuan-0.9.3-m4.patch
+
+BuildRequires: pth-devel
+
 %description
 This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
 packages.
@@ -18,6 +22,7 @@
 %package devel
 Summary: GnuPG IPC library 
 Group: Development/Libraries
+Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 Provides: %{name}-static = %{version}-%{release}
@@ -31,6 +36,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .m4patch
+
 
 %build
 #ifarch x86_64
@@ -67,7 +74,7 @@
 
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_includedir}/*
@@ -77,6 +84,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-1
+- 0.9.3
+- BR: pth-devel, -devel: Requires: pth-devel
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.2-1
 - 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Oct 2006 13:04:36 -0000	1.6
+++ sources	10 Oct 2006 18:37:19 -0000	1.7
@@ -1,2 +1,2 @@
-727926633709ba7ce9bc721c3d4c0cbc  libassuan-0.9.2.tar.bz2.sig
-dfcfa3f26d49a38534c4a9e10e3bd770  libassuan-0.9.2.tar.bz2
+a2e3cb948de5159728e73d53529ae7ad  libassuan-0.9.3.tar.bz2.sig
+60add4aebf1961436da3a470d6ac833c  libassuan-0.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 10 18:40:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 11:40:19 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.47,1.48
Message-ID: <200610101840.k9AIeLIN013003@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12986

Modified Files:
	gnupg2.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-2
- --enable-selinux-support
- x86_64: --disable-optimization (to avoid gpg2 segfaults), for now



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnupg2.spec	6 Oct 2006 12:57:10 -0000	1.47
+++ gnupg2.spec	10 Oct 2006 18:40:19 -0000	1.48
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -28,13 +28,14 @@
 # http://lists.gnupg.org/pipermail/gnupg-devel/2006-October/023237.html
 Patch1: gnupg-1.9.91-readline.patch
 Patch2: gnupg-1.9.16-testverbose.patch
+Patch3: gnupg-1.9.91-dearmor.patch
 
 Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 0.9.2
+BuildRequires: libassuan-devel >= 0.9.3
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -81,6 +82,7 @@
 
 %patch1 -p1 -b .readline
 %patch2 -p1 -b .testverbose
+%patch3 -p1 -b .dearmor
 
 # 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,
@@ -98,8 +100,11 @@
 
 %configure \
   --disable-rpath \
-  --disable-dependency-tracking \
-  %{?_enable_gpg}
+  --enable-selinux-support \
+  %{?_enable_gpg} \
+%ifarch x86_64
+  --disable-optimization 
+%endif
 
 # not smp-safe
 make 
@@ -109,7 +114,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-make check ||:
+make -k check
 
 
 %install
@@ -172,6 +177,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-2
+- --enable-selinux-support
+- x86_64: --disable-optimization (to avoid gpg2 segfaults), for now
+
 * Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-1
 - 1.9.91
 



From fedora-extras-commits at redhat.com  Tue Oct 10 19:23:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 10 Oct 2006 12:23:19 -0700
Subject: rpms/alsa-oss/FC-5 .cvsignore, NONE, 1.1 alsa-oss-1.0.11-aoss.patch,
	NONE, 1.1 alsa-oss.spec, 1.1, 1.2 sources, 1.1,
	1.2 alsa-oss-1.0.12-aoss.patch, 1.1, NONE
Message-ID: <200610101923.k9AJNLGj016169@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/alsa-oss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16146

Modified Files:
	alsa-oss.spec sources 
Added Files:
	.cvsignore alsa-oss-1.0.11-aoss.patch 
Removed Files:
	alsa-oss-1.0.12-aoss.patch 
Log Message:

Rolled back to 1.0.11 to kinda-sorta match alsa-lib 1.0.11rc2 in FC-5



--- NEW FILE .cvsignore ---
alsa-oss-1.0.11.tar.bz2

alsa-oss-1.0.11-aoss.patch:

--- NEW FILE alsa-oss-1.0.11-aoss.patch ---
--- alsa/aoss.in.orig	2005-10-27 14:34:18.000000000 -0400
+++ alsa/aoss.in	2006-04-02 15:53:53.000000000 -0400
@@ -5,9 +5,7 @@
 #	aoss <command> <command options and arguments>
 
 if [ -d /proc/asound ]; then
-  prefix=@prefix@
-  exec_prefix=@exec_prefix@
-  LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
+  LD_PRELOAD=@libdir@/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
 else
   exec "$@"
 fi


Index: alsa-oss.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-oss/FC-5/alsa-oss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-oss.spec	6 Oct 2006 14:11:15 -0000	1.1
+++ alsa-oss.spec	10 Oct 2006 19:23:19 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
 Name:		alsa-oss
-Version:	1.0.12
-Release:	3%{?dist}
+Version:	1.0.11
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.alsa-project.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.11-1
+- Initial FC-5 SRPM, backported from devel (to kinda-sorta match alsa-lib)
+
 * Fri Oct 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-3
 - Added conditionalized rpath fixes for x86_64 (thanks Denis!)
 - Re-added *.a to -devel package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-oss/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Oct 2006 14:11:15 -0000	1.1
+++ sources	10 Oct 2006 19:23:19 -0000	1.2
@@ -1 +1 @@
-d4d18bbf63a866d6e065b90e16acd676  alsa-oss-1.0.12.tar.bz2
+3106c2d59a329263867fa3dd44133dda  alsa-oss-1.0.11.tar.bz2


--- alsa-oss-1.0.12-aoss.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 10 19:37:03 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 10 Oct 2006 12:37:03 -0700
Subject: rpms/stellarium/FC-5 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 stellarium.spec, 1.20, 1.21
Message-ID: <200610101937.k9AJb5CH016274@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253

Modified Files:
	.cvsignore sources stellarium.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Jul 2006 18:32:36 -0000	1.10
+++ .cvsignore	10 Oct 2006 19:37:03 -0000	1.11
@@ -1,2 +1,3 @@
 stellarium-0.8.1.tar.gz
 stellarium_user_guide-0.8.1-1.pdf
+stellarium-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Jul 2006 18:32:36 -0000	1.10
+++ sources	10 Oct 2006 19:37:03 -0000	1.11
@@ -1,2 +1,2 @@
-1a17e3dca472214e0863ea8621de321d  stellarium-0.8.1.tar.gz
 e83ca79bf904e03db869b314d72fd2a8  stellarium_user_guide-0.8.1-1.pdf
+8f4bcfcf6ad74ab57f1a9fc4f3927527  stellarium-0.8.2.tar.gz


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- stellarium.spec	4 Jul 2006 18:32:36 -0000	1.20
+++ stellarium.spec	10 Oct 2006 19:37:03 -0000	1.21
@@ -1,14 +1,14 @@
 Name:           stellarium
-Version:        0.8.1
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://stellarium.free.fr/
-Source0:        http://prdownloads.sf.net/stellarium/stellarium-%{version}.tar.gz
+Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
-Source2:        http://prdownloads.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
+Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -83,6 +83,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1
+- New upstream release
+
 * Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.1-1
 - New upstream release
 - Fix demaged PDF (#197301)



From fedora-extras-commits at redhat.com  Tue Oct 10 19:38:15 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 10 Oct 2006 12:38:15 -0700
Subject: rpms/stellarium/devel sources,1.10,1.11 stellarium.spec,1.22,1.23
Message-ID: <200610101938.k9AJcH96016338@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16319

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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Jul 2006 18:34:12 -0000	1.10
+++ sources	10 Oct 2006 19:38:15 -0000	1.11
@@ -1,2 +1,2 @@
-1a17e3dca472214e0863ea8621de321d  stellarium-0.8.1.tar.gz
 e83ca79bf904e03db869b314d72fd2a8  stellarium_user_guide-0.8.1-1.pdf
+8f4bcfcf6ad74ab57f1a9fc4f3927527  stellarium-0.8.2.tar.gz


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- stellarium.spec	3 Sep 2006 19:44:00 -0000	1.22
+++ stellarium.spec	10 Oct 2006 19:38:15 -0000	1.23
@@ -1,14 +1,14 @@
 Name:           stellarium
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://stellarium.free.fr/
-Source0:        http://prdownloads.sf.net/stellarium/stellarium-%{version}.tar.gz
+Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
-Source2:        http://prdownloads.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
+Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -83,8 +83,8 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
-* Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.1-2
-- Rebuild for FC-6
+* Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1
+- New upstream release
 
 * Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.1-1
 - New upstream release



From fedora-extras-commits at redhat.com  Tue Oct 10 20:18:48 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 10 Oct 2006 13:18:48 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.4, 1.5 cobbler.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610102018.k9AKIosO019601@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19573

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream updates




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Oct 2006 15:50:54 -0000	1.4
+++ .cvsignore	10 Oct 2006 20:18:47 -0000	1.5
@@ -1,3 +1,4 @@
 cobbler-0.1.1.tar.gz
 cobbler-0.2.1.tar.gz
 cobbler-0.2.2.tar.gz
+cobbler-0.2.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cobbler.spec	6 Oct 2006 15:50:54 -0000	1.3
+++ cobbler.spec	10 Oct 2006 20:18:47 -0000	1.4
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.2
+Version: 0.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/~mdehaan/cobbler
+Url: http://cobbler.et.redhat.com
 
 %description
 
@@ -54,6 +54,9 @@
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
+* Mon Oct 9 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
+- Upstream features (see CHANGELOG) & URL update
+
 * Fri Oct 6 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
 - Upstream bugfixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Oct 2006 15:50:54 -0000	1.4
+++ sources	10 Oct 2006 20:18:47 -0000	1.5
@@ -1 +1 @@
-63e4550219de15865d197a47ac00ecfd  cobbler-0.2.2.tar.gz
+90596f95025ec8180e1907cb2f768fa7  cobbler-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 20:19:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 13:19:15 -0700
Subject: rpms/gnupg2/devel gnupg-1.9.91-dearmor.patch, NONE, 1.1 gnupg2.spec,
	1.48, 1.49
Message-ID: <200610102019.k9AKJHAZ019663@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19605

Modified Files:
	gnupg2.spec 
Added Files:
	gnupg-1.9.91-dearmor.patch 
Log Message:
forgot patch


gnupg-1.9.91-dearmor.patch:

--- NEW FILE gnupg-1.9.91-dearmor.patch ---
--- gnupg-1.9.91/tests/openpgp/Makefile.am.dearmor	2006-09-27 09:09:43.000000000 -0500
+++ gnupg-1.9.91/tests/openpgp/Makefile.am	2006-10-10 13:24:13.000000000 -0500
@@ -63,7 +63,7 @@
 
 ./gpg_dearmor:
 	echo '#!/bin/sh' >./gpg_dearmor
-	echo "../../g10/gpg2 --no-options --no-greeting \
+	echo "../../g10/gpg2 --homedir . --no-options --no-greeting \
              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
 	chmod 755 ./gpg_dearmor
 
--- gnupg-1.9.91/tests/openpgp/Makefile.in.dearmor	2006-10-04 11:54:18.000000000 -0500
+++ gnupg-1.9.91/tests/openpgp/Makefile.in	2006-10-10 13:24:23.000000000 -0500
@@ -580,7 +580,7 @@
 
 ./gpg_dearmor:
 	echo '#!/bin/sh' >./gpg_dearmor
-	echo "../../g10/gpg2 --no-options --no-greeting \
+	echo "../../g10/gpg2 --homedir . --no-options --no-greeting \
              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
 	chmod 755 ./gpg_dearmor
 


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnupg2.spec	10 Oct 2006 18:40:19 -0000	1.48
+++ gnupg2.spec	10 Oct 2006 20:19:15 -0000	1.49
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -177,7 +177,7 @@
 
 
 %changelog
-* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-2
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-3
 - --enable-selinux-support
 - x86_64: --disable-optimization (to avoid gpg2 segfaults), for now
 



From fedora-extras-commits at redhat.com  Tue Oct 10 20:20:02 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 10 Oct 2006 13:20:02 -0700
Subject: rpms/koan/devel .cvsignore, 1.2, 1.3 koan.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200610102020.k9AKK4Wv019736@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19715

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream updates




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 20:15:39 -0000	1.2
+++ .cvsignore	10 Oct 2006 20:20:02 -0000	1.3
@@ -1 +1,2 @@
 koan-0.1.1.tar.gz
+koan-0.2.1.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- koan.spec	28 Sep 2006 21:29:17 -0000	1.4
+++ koan.spec	10 Oct 2006 20:20:02 -0000	1.5
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.1.1
-Release: 10%{?dist}
+Version: 0.2.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/page/Cobbler_%26_Koan_Provisioning_Tools
+Url: http://et.redhat.com/~mdehaan/cobbler
 
 %description
 
@@ -47,23 +47,35 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
-* Thu Sep 28 2006 - 0.1.1-10
-- Building build rev to keep FC-E happy
-* Thu Sep 28 2006 - 0.1.1-9
+* Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
+- Upstream features (see CHANGELOG)
+
+* Thu Sep 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-10
+- Bumping build rev for FC-E
+
+* Thu Sep 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-9
 - Excluding PPC since syslinux (gethostip) isn't available for ppc
-* Thu Sep 21 2006 - 0.1.1-8
+
+* Thu Sep 21 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-8
 - Added doc files to %doc, removed INSTALLED_FILES code
-* Wed Sep 20 2006 - 0.1.1-7
+
+* Wed Sep 20 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-7
 - Upstream updates
-* Fri Sep 15 2006 - 0.1.1-6
+
+* Fri Sep 15 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-6
 - Make koan own it's directory, add GPL "COPYING" file.
-* Wed Aug 16 2006 - 0.1.1-5
+
+* Wed Aug 16 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-5
 - Spec-file only changes for FC-Extras submission
-* Thu Jul 20 2006 - 0.1.1-4
+
+* Thu Jul 20 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-4
 - Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module.
-* Fri Jul 12 2006 - 0.1.1-3
+
+* Fri Jul 12 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-3
 - allow installing with per-system cobbler data in addition to per-profile
-* Thu Jul 09 2006 - 0.1.0-2
+
+* Thu Jul 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.0-2
 - rpm tweaks for Fedora Extras
-* Wed Jun 28 2006 - 0.1.0-1
+
+* Wed Jun 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.0-1
 - rpm genesis


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 21:26:18 -0000	1.3
+++ sources	10 Oct 2006 20:20:02 -0000	1.4
@@ -1 +1 @@
-d1b7df4a1fb022d345d79f3b182d769b  koan-0.1.1.tar.gz
+79137117f164586f4d7fd19f837bec33  koan-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 20:24:10 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:24:10 -0700
Subject: rpms/optipng - New directory
Message-ID: <200610102024.k9AKOCci019860@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19839/optipng

Log Message:
Directory /cvs/extras/rpms/optipng added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 20:24:10 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:24:10 -0700
Subject: rpms/optipng/devel - New directory
Message-ID: <200610102024.k9AKOCcM019863@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19839/optipng/devel

Log Message:
Directory /cvs/extras/rpms/optipng/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 20:24:32 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:24:32 -0700
Subject: rpms/optipng Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610102024.k9AKOYI8019917@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19884

Added Files:
	Makefile import.log 
Log Message:
Setup of module optipng


--- NEW FILE Makefile ---
# Top level Makefile for module optipng
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 20:24:32 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:24:32 -0700
Subject: rpms/optipng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610102024.k9AKOYS9019920@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19884/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module optipng


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 20:25:14 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:25:14 -0700
Subject: rpms/optipng/devel optipng-0.5.4-makefile.patch, NONE,
	1.1 optipng.spec, NONE, 1.1
Message-ID: <200610102025.k9AKPG5t019982@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19953/devel

Added Files:
	optipng-0.5.4-makefile.patch optipng.spec 
Log Message:
auto-import optipng-0.5.4-1 on branch devel from optipng-0.5.4-1.src.rpm

optipng-0.5.4-makefile.patch:

--- NEW FILE optipng-0.5.4-makefile.patch ---
diff -ru optipng-0.5.4.orig/lib/pngxtern/scripts/gcc.mak optipng-0.5.4/lib/pngxtern/scripts/gcc.mak
--- optipng-0.5.4.orig/lib/pngxtern/scripts/gcc.mak	2006-05-10 21:15:00.000000000 +0200
+++ optipng-0.5.4/lib/pngxtern/scripts/gcc.mak	2006-09-14 22:17:47.528801620 +0200
@@ -17,7 +17,9 @@
 CDEBUG = -g
 LDDEBUG =
 CRELEASE = -O2
-LDRELEASE = -s
+
+# remove -s from LDRELEASE to prevent stripping
+LDRELEASE = 
 CFLAGS = -Wall $(CRELEASE)
 LDFLAGS = $(LDRELEASE)
 LIBS = -lpng -lz -lm
@@ -37,7 +39,7 @@
 all: pngxtern$(A)
 
 .c$(O):
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) $<
+	$(CC) -c $(CFLAGS)  $<
 
 pngxtern$(A): $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff -ru optipng-0.5.4.orig/src/scripts/gcc.mak optipng-0.5.4/src/scripts/gcc.mak
--- optipng-0.5.4.orig/src/scripts/gcc.mak	2006-07-15 16:25:00.000000000 +0200
+++ optipng-0.5.4/src/scripts/gcc.mak	2006-09-14 22:17:06.910263120 +0200
@@ -13,30 +13,27 @@
 CC = gcc
 LD = $(CC)
 CFLAGS  = -O2 -Wall
-LDFLAGS = -s
+# remove -s from LDFLAGS to prevent stripping
+LDFLAGS = 
 
 OPTIPNG  = optipng$(EXE)
 ZLIB     = libz.a
 PNGLIB   = libpng.a
 PNGXLIB  = pngxtern.a
-ZMAK     = Makefile
-PNGMAK   = scripts/makefile.gcc
 PNGXMAK  = scripts/gcc.mak
-ZDIR     = ../lib/zlib
-PNGDIR   = ../lib/libpng
 PNGXDIR  = ../lib/pngxtern
 BACKHERE = ../../src
 
 OBJS = optipng.o opngio.o opngreduc.o cbitset.o osys.o strutil.o
-LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
+LIBS = $(PNGXDIR)/$(PNGXLIB)
 
 
 $(OPTIPNG): $(OBJS) $(LIBS)
-	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) $*.c
+	$(CC) -c $(CFLAGS) -I$(PNGXDIR) $*.c
 
 optipng.o  : optipng.c proginfo.h opng.h cexcept.h cbitset.h osys.h strutil.h
 opngio.o   : opngio.c opng.h
@@ -46,35 +43,23 @@
 strutil.o  : strutil.c strutil.h
 
 
-$(PNGXDIR)/$(PNGXLIB): $(ZDIR)/$(ZLIB) $(PNGDIR)/$(PNGLIB)
+$(PNGXDIR)/$(PNGXLIB):
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) $(PNGXLIB); \
 	cd $(BACKHERE)
 
-$(PNGDIR)/$(PNGLIB): $(ZDIR)/$(ZLIB)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) $(PNGLIB); \
-	cd $(BACKHERE)
-
-$(ZDIR)/$(ZLIB):
-	cd $(ZDIR); \
-	./configure; \
-	$(MAKE) -f $(ZMAK) $(ZLIB); \
-	cd $(BACKHERE)
-
-
 install: $(OPTIPNG)
-	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
-	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
-	- at rm -f ${bindir}/$(OPTIPNG)
-	- at rm -f ${man1dir}/optipng.1
-	cp -p $(OPTIPNG) ${bindir}
-	cp -p ../man/optipng.1 ${man1dir}
+	- at if [ ! -d ${DESTDIR}/${bindir} ]; then mkdir -p ${DESTDIR}/${bindir}; fi
+	- at if [ ! -d ${DESTDIR}/${man1dir} ]; then mkdir -p ${DESTDIR}/${man1dir}; fi
+	- at rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	- at rm -f ${DESTDIR}/${man1dir}/optipng.1
+	cp -p $(OPTIPNG) ${DESTDIR}/${bindir}
+	cp -p ../man/optipng.1 ${DESTDIR}/${man1dir}
 
 
 uninstall:
-	rm -f ${bindir}/$(OPTIPNG)
-	rm -f ${man1dir}/optipng.1
+	rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	rm -f ${DESTDIR}/${man1dir}/optipng.1
 
 
 clean:
@@ -82,9 +67,3 @@
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) clean; \
 	cd $(BACKHERE)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) clean; \
-	cd $(BACKHERE)
-	cd $(ZDIR); \
-	$(MAKE) -f $(ZMAK) clean; \
-	cd $(BACKHERE)


--- NEW FILE optipng.spec ---
Name:           optipng
Version:        0.5.4
Release:        1%{?dist}
Summary:        OptiPNG is a PNG optimizer and converter

Group:          Applications/Multimedia
License:        zlib/libpng
URL:            http://optipng.sourceforge.net/
Source0:        http://surfnet.dl.sourceforge.net/sourceforge/optipng/optipng-%{version}.tar.gz
Patch0:         optipng-0.5.4-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel libpng-devel

%description
OptiPNG is a PNG optimizer that recompresses image files to a smaller size,
without losing any information. This program also converts external formats
(BMP, GIF, PNM; TIFF support is coming up) to optimized PNG, and performs PNG
integrity checks and corrections. 


%prep
%setup -q
%patch0 -p1

%build
cd src/
make -f scripts/gcc.mak %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
cd src/
make -f scripts/gcc.mak install DESTDIR="$RPM_BUILD_ROOT"\
                                prefix="%{_prefix}" \
                                man1dir="%{_mandir}/man1"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt doc/*
%{_bindir}/optipng
%{_mandir}/man1/optipng.1.gz


%changelog
* Thu Sep 14 2006 Till Maas <opensource[AT]till.name> - 0.5.4-1
- version bump
- use system zlib and libpng
- link without "-s" flag for non-empty debuginfo
- use DESTDIR
* Fri Jul 28 2006 Till Maas <opensource[AT]till.name> - 0.5.3-1
- version bump
- Changed license tag back to zlib/libpng (#198616 rpmlint) 
- use $RPM_OPT_FLAGS instead of %%{optflags}
* Thu Jul 06 2006 Till Maas <opensource[AT]till.name> - 0.5.2-2
- Changed license tag from zlib/libpng to zlib
* Tue Jul 04 2006 Till Maas <opensource[AT]till.name> - 0.5.2-1
- Created from scratch for fedora extras



From fedora-extras-commits at redhat.com  Tue Oct 10 20:25:13 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:25:13 -0700
Subject: rpms/optipng import.log,1.1,1.2
Message-ID: <200610102025.k9AKPjG9019990@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19953

Modified Files:
	import.log 
Log Message:
auto-import optipng-0.5.4-1 on branch devel from optipng-0.5.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/optipng/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 20:24:31 -0000	1.1
+++ import.log	10 Oct 2006 20:25:13 -0000	1.2
@@ -0,0 +1 @@
+optipng-0_5_4-1:HEAD:optipng-0.5.4-1.src.rpm:1160511875



From fedora-extras-commits at redhat.com  Tue Oct 10 20:28:13 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:28:13 -0700
Subject: owners owners.list,1.1814,1.1815
Message-ID: <200610102028.k9AKSFo6020054@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20037

Modified Files:
	owners.list 
Log Message:
adding optipng



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1814
retrieving revision 1.1815
diff -u -r1.1814 -r1.1815
--- owners.list	10 Oct 2006 18:15:51 -0000	1.1814
+++ owners.list	10 Oct 2006 20:28:13 -0000	1.1815
@@ -1172,6 +1172,7 @@
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
+Fedora Extras|optipng|A PNG optimizer and converter|opensource at till.name|extras-qa at fedoraproject.org|
 Fedora Extras|orage|Time-managing application for Xfce4|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ORBit|CORBA Object Request Broker library for GNOME-1 compatibility|paul at city-fan.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 20:30:10 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:30:10 -0700
Subject: rpms/optipng/devel optipng.spec,1.1,1.2
Message-ID: <200610102030.k9AKUC5k020097@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20068

Modified Files:
	optipng.spec 
Log Message:
shorter summary



Index: optipng.spec
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/optipng.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- optipng.spec	10 Oct 2006 20:25:14 -0000	1.1
+++ optipng.spec	10 Oct 2006 20:30:10 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           optipng
 Version:        0.5.4
-Release:        1%{?dist}
-Summary:        OptiPNG is a PNG optimizer and converter
+Release:        2%{?dist}
+Summary:        A PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib/libpng
@@ -48,6 +48,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Till Maas <opensource[AT]till.name> - 0.5.4-2
+- shortening Summary
 * Thu Sep 14 2006 Till Maas <opensource[AT]till.name> - 0.5.4-1
 - version bump
 - use system zlib and libpng



From fedora-extras-commits at redhat.com  Tue Oct 10 20:33:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 10 Oct 2006 13:33:06 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.49,1.50
Message-ID: <200610102033.k9AKX8xS020174@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20157

Modified Files:
	gnupg2.spec 
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-4
- make check ||: (apparently checks return err even on success?)



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnupg2.spec	10 Oct 2006 20:19:15 -0000	1.49
+++ gnupg2.spec	10 Oct 2006 20:33:05 -0000	1.50
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.91
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -114,7 +114,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-make -k check
+make -k check ||:
 
 
 %install
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-4
+- make check ||: (apparently checks return err even on success?)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-3
 - --enable-selinux-support
 - x86_64: --disable-optimization (to avoid gpg2 segfaults), for now



From fedora-extras-commits at redhat.com  Tue Oct 10 20:33:59 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 10 Oct 2006 13:33:59 -0700
Subject: comps comps-fe6.xml.in,1.182,1.183
Message-ID: <200610102034.k9AKY1Ei020235@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218

Modified Files:
	comps-fe6.xml.in 
Log Message:
adding optipng




Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- comps-fe6.xml.in	10 Oct 2006 18:32:17 -0000	1.182
+++ comps-fe6.xml.in	10 Oct 2006 20:33:59 -0000	1.183
@@ -593,6 +593,7 @@
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>
+      <packagereq type="optional">optipng</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">rawstudio</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 10 21:01:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:01:32 -0700
Subject: rpms/ballbuster/devel - New directory
Message-ID: <200610102101.k9AL1YPf023366@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23331/ballbuster/devel

Log Message:
Directory /cvs/extras/rpms/ballbuster/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 21:01:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:01:31 -0700
Subject: rpms/ballbuster - New directory
Message-ID: <200610102101.k9AL1X0C023360@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23331/ballbuster

Log Message:
Directory /cvs/extras/rpms/ballbuster added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 10 21:01:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:01:53 -0700
Subject: rpms/ballbuster Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610102101.k9AL1uvV023407@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393

Added Files:
	Makefile import.log 
Log Message:
Setup of module ballbuster


--- NEW FILE Makefile ---
# Top level Makefile for module ballbuster
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 10 21:01:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:01:56 -0700
Subject: rpms/ballbuster/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610102101.k9AL1wnI023428@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ballbuster


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 10 21:03:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:03:58 -0700
Subject: owners owners.list,1.1815,1.1816
Message-ID: <200610102104.k9AL40U4023535@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23493

Modified Files:
	owners.list 
Log Message:
added ballbuster


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1815
retrieving revision 1.1816
diff -u -r1.1815 -r1.1816
--- owners.list	10 Oct 2006 20:28:13 -0000	1.1815
+++ owners.list	10 Oct 2006 21:03:58 -0000	1.1816
@@ -92,6 +92,7 @@
 Fedora Extras|azureus|A BitTorrent Client|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BackupPC|High-performance backup system|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|bakery|C++ framework for creating Gnome apps|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|ballbuster|Move the paddle to bounce the ball and break all the bricks|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|banshee|Music tool to easily import, manage, and play selections from your iPod|caillon at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 10 21:03:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:03:55 -0700
Subject: rpms/ballbuster import.log,1.1,1.2
Message-ID: <200610102104.k9AL4Sd0023538@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23482

Modified Files:
	import.log 
Log Message:
auto-import ballbuster-1.0-1 on branch devel from ballbuster-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Oct 2006 21:01:53 -0000	1.1
+++ import.log	10 Oct 2006 21:03:54 -0000	1.2
@@ -0,0 +1 @@
+ballbuster-1_0-1:HEAD:ballbuster-1.0-1.src.rpm:1160514817



From fedora-extras-commits at redhat.com  Tue Oct 10 21:03:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:03:56 -0700
Subject: rpms/ballbuster/devel ballbuster.desktop, NONE, 1.1 ballbuster.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610102104.k9AL4Swr023540@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23482/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ballbuster.desktop ballbuster.spec 
Log Message:
auto-import ballbuster-1.0-1 on branch devel from ballbuster-1.0-1.src.rpm


--- NEW FILE ballbuster.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Ball: Buster
Comment=Move the paddle to bounce the ball and break all the bricks
Exec=ballbuster
Icon=ballbuster.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;


--- NEW FILE ballbuster.spec ---
Name:           ballbuster
Version:        1.0
Release:        1%{?dist}
Summary:        Move the paddle to bounce the ball and break all the bricks
Group:          Amusements/Games
License:        LGPL
URL:            http://www.patrickavella.com/ballbuster.shtml
Source0:        http://www.patrickavella.com/BallBusterX.zip
Source1:        %{name}.desktop
Patch0:         ballbuster-unix.patch.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ClanLib-devel desktop-file-utils ImageMagick
Requires:       hicolor-icon-theme

%description
Game inspired by one of the great classics. The purpose of the game is to
remove all the bricks on the screen, by hitting them with a ball. You can
control the ball by bouncing it back at the bricks with a paddle which you
control with your mouse. The game features: A built in level editor, 20 power
ups and special effects (particle, alpha, rotating, and zooming).


%prep
%setup -q -c
%patch0 -p1 -z .unix
sed -i 's/\r//g' COPYING credits.txt ExtremeUpdates.txt manual.html html/*


%build
make %{?_smp_mflags} PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags clanCore-0.8`"
convert -transparent black icon1.ico %{name}.png


%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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 COPYING credits.txt ExtremeUpdates.txt manual.html html
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Tue Oct 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 21:01:56 -0000	1.1
+++ .cvsignore	10 Oct 2006 21:03:56 -0000	1.2
@@ -0,0 +1,2 @@
+BallBusterX.zip
+ballbuster-unix.patch.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 21:01:56 -0000	1.1
+++ sources	10 Oct 2006 21:03:56 -0000	1.2
@@ -0,0 +1,2 @@
+792c7ed1b8c62177ed043eb4955491fe  BallBusterX.zip
+3963c05ed48a7408c086f76bb9bf73e7  ballbuster-unix.patch.gz



From fedora-extras-commits at redhat.com  Tue Oct 10 21:08:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 10 Oct 2006 14:08:09 -0700
Subject: comps comps-fe5.xml.in,1.166,1.167 comps-fe6.xml.in,1.183,1.184
Message-ID: <200610102108.k9AL8BYP023708@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23689

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add ballbuster


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- comps-fe5.xml.in	10 Oct 2006 18:32:17 -0000	1.166
+++ comps-fe5.xml.in	10 Oct 2006 21:08:09 -0000	1.167
@@ -277,6 +277,7 @@
       <packagereq type="optional">abuse</packagereq>
       <packagereq type="optional">atomix</packagereq>
       <packagereq type="optional">auriferous</packagereq>
+      <packagereq type="optional">ballbuster</packagereq>
       <packagereq type="optional">blobwars</packagereq>
       <packagereq type="optional">bsd-games</packagereq>
       <packagereq type="optional">bygfoot</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- comps-fe6.xml.in	10 Oct 2006 20:33:59 -0000	1.183
+++ comps-fe6.xml.in	10 Oct 2006 21:08:09 -0000	1.184
@@ -339,6 +339,7 @@
       <packagereq type="optional">abuse</packagereq>
       <packagereq type="optional">atomix</packagereq>
       <packagereq type="optional">auriferous</packagereq>
+      <packagereq type="optional">ballbuster</packagereq>
       <packagereq type="optional">blobwars</packagereq>
       <packagereq type="optional">bsd-games</packagereq>
       <packagereq type="optional">bygfoot</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 10 22:09:55 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Tue, 10 Oct 2006 15:09:55 -0700
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.32,1.33
Message-ID: <200610102209.k9AM9wg2026899@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Randomly occurring graphics startup bug that has been dogging this package
is patched up.

Symptoms: Sometimes, but not always, when people installed nethack-vultures,
either vultureseye or vulturesclaw, but never both, would complain about a
graphics mismatch.  Reproducing this was sporadic.

Problem: To save space, the package symlinks directories that are a
duplicate on both the slashem and nethack branches.  Graphics used to be a
duplicate, but isn't any more.  This was known and was accounted for in the
specfile build process.  What wasn't accounted for was the behavior of RPM. 
Instead of removing the old directories on upgrade, it tries to overwrite
files with a simple copy of sorts.  Whatever mechanism it uses follows
symlinks, so if there was an old version of nethack-vultures on their
system, the installation of the different copies of slashem and nethack
graphics would overwrite each other in a single directory.  If it was a new
install, or an install over a version that had been corrected, there no
longer was a symlink, and thus two graphics directories were created and
used.

Solution: A pre tag removes the old graphics directory, symlink or not.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nethack-vultures.spec	15 Sep 2006 15:11:26 -0000	1.32
+++ nethack-vultures.spec	10 Oct 2006 22:09:55 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -119,6 +119,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
 [ $1 -eq 1 ] && \
@@ -127,7 +129,6 @@
 %postun
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
@@ -171,6 +172,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
+- Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.
+
 * Fri Sep 15 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-7
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct 10 22:09:50 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Tue, 10 Oct 2006 15:09:50 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.30,1.31
Message-ID: <200610102210.k9AMAOVJ026917@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Randomly occurring graphics startup bug that has been dogging this package
is patched up.

Symptoms: Sometimes, but not always, when people installed nethack-vultures,
either vultureseye or vulturesclaw, but never both, would complain about a
graphics mismatch.  Reproducing this was sporadic.

Problem: To save space, the package symlinks directories that are a
duplicate on both the slashem and nethack branches.  Graphics used to be a
duplicate, but isn't any more.  This was known and was accounted for in the
specfile build process.  What wasn't accounted for was the behavior of RPM. 
Instead of removing the old directories on upgrade, it tries to overwrite
files with a simple copy of sorts.  Whatever mechanism it uses follows
symlinks, so if there was an old version of nethack-vultures on their
system, the installation of the different copies of slashem and nethack
graphics would overwrite each other in a single directory.  If it was a new
install, or an install over a version that had been corrected, there no
longer was a symlink, and thus two graphics directories were created and
used.

Solution: A pre tag removes the old graphics directory, symlink or not.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nethack-vultures.spec	30 Aug 2006 04:46:54 -0000	1.30
+++ nethack-vultures.spec	10 Oct 2006 22:09:50 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -119,6 +119,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
 [ $1 -eq 1 ] && \
@@ -171,6 +173,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
+- Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.
+
 * Tue Aug 29 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-6
 - Attempting to stop graphics duplication.
 



From fedora-extras-commits at redhat.com  Tue Oct 10 22:09:47 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Tue, 10 Oct 2006 15:09:47 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.29,1.30
Message-ID: <200610102210.k9AMAKDZ026914@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Randomly occurring graphics startup bug that has been dogging this package
is patched up.

Symptoms: Sometimes, but not always, when people installed nethack-vultures,
either vultureseye or vulturesclaw, but never both, would complain about a
graphics mismatch.  Reproducing this was sporadic.

Problem: To save space, the package symlinks directories that are a
duplicate on both the slashem and nethack branches.  Graphics used to be a
duplicate, but isn't any more.  This was known and was accounted for in the
specfile build process.  What wasn't accounted for was the behavior of RPM. 
Instead of removing the old directories on upgrade, it tries to overwrite
files with a simple copy of sorts.  Whatever mechanism it uses follows
symlinks, so if there was an old version of nethack-vultures on their
system, the installation of the different copies of slashem and nethack
graphics would overwrite each other in a single directory.  If it was a new
install, or an install over a version that had been corrected, there no
longer was a symlink, and thus two graphics directories were created and
used.

Solution: A pre tag removes the old graphics directory, symlink or not.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nethack-vultures.spec	30 Aug 2006 04:46:48 -0000	1.29
+++ nethack-vultures.spec	10 Oct 2006 22:09:43 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -120,6 +120,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
 [ $1 -eq 1 ] && \
@@ -172,6 +174,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
+- Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.
+
 * Tue Aug 29 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-6
 - Attempting to stop graphics duplication.
 



From fedora-extras-commits at redhat.com  Tue Oct 10 22:09:52 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Tue, 10 Oct 2006 15:09:52 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures.spec,1.31,1.32
Message-ID: <200610102210.k9AMAPWF026920@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/FC-5

Modified Files:
	nethack-vultures.spec 
Log Message:
Randomly occurring graphics startup bug that has been dogging this package
is patched up.

Symptoms: Sometimes, but not always, when people installed nethack-vultures,
either vultureseye or vulturesclaw, but never both, would complain about a
graphics mismatch.  Reproducing this was sporadic.

Problem: To save space, the package symlinks directories that are a
duplicate on both the slashem and nethack branches.  Graphics used to be a
duplicate, but isn't any more.  This was known and was accounted for in the
specfile build process.  What wasn't accounted for was the behavior of RPM. 
Instead of removing the old directories on upgrade, it tries to overwrite
files with a simple copy of sorts.  Whatever mechanism it uses follows
symlinks, so if there was an old version of nethack-vultures on their
system, the installation of the different copies of slashem and nethack
graphics would overwrite each other in a single directory.  If it was a new
install, or an install over a version that had been corrected, there no
longer was a symlink, and thus two graphics directories were created and
used.

Solution: A pre tag removes the old graphics directory, symlink or not.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nethack-vultures.spec	30 Aug 2006 04:46:54 -0000	1.31
+++ nethack-vultures.spec	10 Oct 2006 22:09:51 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -119,6 +119,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
 [ $1 -eq 1 ] && \
@@ -171,6 +173,9 @@
 
 
 %changelog
+* Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
+- Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.
+
 * Tue Aug 29 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-6
 - Attempting to stop graphics duplication.
 



From fedora-extras-commits at redhat.com  Tue Oct 10 22:47:44 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Oct 2006 15:47:44 -0700
Subject: rpms/amavisd-new/devel README.quarantine, NONE, 1.1 amavisd.cron,
	NONE, 1.1 .cvsignore, 1.5, 1.6 amavisd-conf.patch, 1.3,
	1.4 amavisd-new.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200610102247.k9AMlkhc027384@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27356

Modified Files:
	.cvsignore amavisd-conf.patch amavisd-new.spec sources 
Added Files:
	README.quarantine amavisd.cron 
Log Message:
Update to 2.4.3.
Add quarantine directory and instructions for enabling it.
Add tmpwatch cron script.



--- NEW FILE README.quarantine ---
To enable quarantine support simply change the following line in
/etc/amavisd/amavisd.conf:

  $QUARANTINEDIR = undef;      # -Q

to

  $QUARANTINEDIR = "$MYHOME/quarantine";      # -Q

then restart amavisd.

The following will make the change for you:

  sed -i.orig -e '/\$QUARANTINEDIR =/s,undef,"$MYHOME/quarantine",' \
      /etc/amavisd/amavisd.conf

PLEASE NOTE:  This is intentionally a manual step.  Before turning on
the quarantine feature of amavisd-new, be sure that there is a
sufficient amount of free space on /var/spool/amavisd/quarantine.
"Sufficient" depends entirely on your environment.

In the default configuration, files in the quarantine directory will
be automatically deleted by tmpwatch after 30 days.  See
/etc/cron.daily/amavisd to adjust this behavior for your environment.


--- NEW FILE amavisd.cron ---
/usr/sbin/tmpwatch 24 /var/spool/amavisd/tmp
/usr/sbin/tmpwatch -d 720 /var/spool/amavisd/quarantine


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2006 00:03:29 -0000	1.5
+++ .cvsignore	10 Oct 2006 22:47:43 -0000	1.6
@@ -1 +1 @@
-amavisd-new-2.4.2.tar.gz
+amavisd-new-2.4.3.tar.gz

amavisd-conf.patch:

Index: amavisd-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amavisd-conf.patch	2 Aug 2006 16:43:17 -0000	1.3
+++ amavisd-conf.patch	10 Oct 2006 22:47:43 -0000	1.4
@@ -1,13 +1,13 @@
---- amavisd-new-2.4.2/amavisd.conf.orig	2006-06-27 06:31:50.000000000 -0500
-+++ amavisd-new-2.4.2/amavisd.conf	2006-07-31 17:31:00.000000000 -0500
+--- amavisd-new-2.4.3/amavisd.conf.orig	2006-10-01 19:02:13.000000000 -0500
++++ amavisd-new-2.4.3/amavisd.conf	2006-10-10 17:46:45.000000000 -0500
 @@ -14,23 +14,23 @@
  # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
  
  $max_servers = 2;            # num of pre-forked children (2..15 is common), -m
 -$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
 -$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
-+$daemon_user  = 'amavis';    # (no default;  customary: vscan or amavis), -u
-+$daemon_group = 'amavis';    # (no default;  customary: vscan or amavis), -g
++$daemon_user  = 'amavis';     # (no default;  customary: vscan or amavis), -u
++$daemon_group = 'amavis';     # (no default;  customary: vscan or amavis), -g
  
  $mydomain = 'example.com';   # a convenient default for other settings
  
@@ -46,7 +46,7 @@
  $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
  
  @addr_extension_virus_maps      = ('virus');
-@@ -111,10 +111,10 @@
+@@ -115,10 +115,10 @@
  # $notify_method  = 'smtp:[127.0.0.1]:10025';
  # $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
  
@@ -61,7 +61,7 @@
  
  # $os_fingerprint_method = 'p0f:127.0.0.1:2345';  # to query p0f-analyzer.pl
  
-@@ -306,10 +306,10 @@
+@@ -318,10 +318,10 @@
  # ['Sophos SAVI', \&sophos_savi ],
  
  # ### http://www.clamav.net/
@@ -73,6 +73,6 @@
 +  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
 +  qr/\bOK$/, qr/\bFOUND$/,
 +  qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
- # # NOTE: the easiest is to run clamd under the same user as amavisd; match the
- # # socket name (LocalSocket) in clamav.conf to the socket name in this entry
- # # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
+ # # NOTE: run clamd under the same user as amavisd, or run it under its own
+ # #   uid such as clamav, add user clamav to the amavis group, and then add
+ # #   AllowSupplementaryGroups to clamd.conf;


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amavisd-new.spec	29 Sep 2006 00:30:26 -0000	1.8
+++ amavisd-new.spec	10 Oct 2006 22:47:43 -0000	1.9
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.4.2
-Release:        4%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.4.3
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -12,6 +12,8 @@
 Source2:        amavis-clamd.conf
 Source3:        amavis-clamd.sysconfig
 Source4:        README.fedora
+Source5:        README.quarantine
+Source6:        amavisd.cron
 Patch0:         amavisd-conf.patch
 Patch1:         amavisd-init.patch
 Patch2:         amavisd-condrestart.patch
@@ -19,7 +21,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root/
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
-Requires:       tmpwatch
+Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
 Requires:       bzip2
 Requires:       gzip
 Requires:       arj
@@ -65,7 +67,7 @@
 (MTA) and one or more content checkers: virus scanners, and/or
 Mail::SpamAssassin Perl module. It is written in Perl, assuring high
 reliability, portability and maintainability. It talks to MTA via (E)SMTP
-or LMTP, or by using helper programs. No timing gaps exist in the design,
+or LMTP, or by using helper programs. No timing gaps exist in the design
 which could cause a mail loss.
 
 %prep
@@ -74,7 +76,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p0
-install -m644 %{SOURCE4} README_FILES/
+install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
 
 %build
 
@@ -101,7 +103,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd
 
-mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
+install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
+
+mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db,quarantine}
 touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
 mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/
 
@@ -135,16 +140,23 @@
 %config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
 %config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/clamd.amavisd
+%config(noreplace) %{_sysconfdir}/cron.daily/amavisd
 %{_sbindir}/amavisd
 %{_sbindir}/clamd.amavisd
 %{_bindir}/amavisd-*
 %dir %attr(700,amavis,amavis) /var/spool/amavisd
 %dir %attr(700,amavis,amavis) /var/spool/amavisd/tmp
 %dir %attr(700,amavis,amavis) /var/spool/amavisd/db
+%dir %attr(700,amavis,amavis) /var/spool/amavisd/quarantine
 %dir %attr(755,amavis,amavis) /var/run/amavisd
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Oct 10 2006 Steven Pritchard <steve at kspei.com> 2.4.3-1
+- Update to 2.4.3.
+- Add quarantine directory and instructions for enabling it.
+- Add tmpwatch cron script.
+
 * Thu Sep 28 2006 Steven Pritchard <steve at kspei.com> 2.4.2-4
 - Drop lha dependency and add arj.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2006 00:03:29 -0000	1.5
+++ sources	10 Oct 2006 22:47:43 -0000	1.6
@@ -1 +1 @@
-d750176de7481498ebd1011e08a488da  amavisd-new-2.4.2.tar.gz
+7c5f23b1cd523df31d10cf38150e8cea  amavisd-new-2.4.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 02:28:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:28:43 -0700
Subject: rpms/perl-Object-InsideOut/FC-5 perl-Object-InsideOut.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200610110228.k9B2Sk0V007329@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Object-InsideOut/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7279/FC-5

Modified Files:
	perl-Object-InsideOut.spec sources 
Log Message:
update to 2.06



Index: perl-Object-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/FC-5/perl-Object-InsideOut.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Object-InsideOut.spec	25 Sep 2006 19:35:04 -0000	1.6
+++ perl-Object-InsideOut.spec	11 Oct 2006 02:28:43 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Object-InsideOut
-Version:        2.02 
+Version:        2.06 
 Release:        1%{?dist}
 Summary:        Comprehensive inside-out object support module 
 
@@ -16,6 +16,7 @@
 BuildRequires:  perl
 BuildRequires:  perl(Exception::Class) >= 1.22
 BuildRequires:  perl(Want) >= 0.12
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 2.06-1
+- update to 2.06
+- add additional BRs: perl(Test::Pod[::Coverage])
+
 * Mon Sep 25 2006 Chris Weyl <cweyl at alumni.drew.edu> 2.02-1
 - update to 2.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Sep 2006 19:35:04 -0000	1.6
+++ sources	11 Oct 2006 02:28:43 -0000	1.7
@@ -1 +1 @@
-bc28852c041d0d14233f38d88aa2c3e9  Object-InsideOut-2.02.tar.gz
+e2d461cf6248f8b934e7b0d50ee403e9  Object-InsideOut-2.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 02:28:44 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:28:44 -0700
Subject: rpms/perl-Object-InsideOut/devel .cvsignore, 1.6,
	1.7 perl-Object-InsideOut.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200610110228.k9B2Skl4007335@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Object-InsideOut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7279/devel

Modified Files:
	.cvsignore perl-Object-InsideOut.spec sources 
Log Message:
update to 2.06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Sep 2006 19:35:05 -0000	1.6
+++ .cvsignore	11 Oct 2006 02:28:44 -0000	1.7
@@ -1 +1 @@
-Object-InsideOut-2.02.tar.gz
+Object-InsideOut-2.06.tar.gz


Index: perl-Object-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/perl-Object-InsideOut.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Object-InsideOut.spec	25 Sep 2006 19:35:05 -0000	1.6
+++ perl-Object-InsideOut.spec	11 Oct 2006 02:28:44 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Object-InsideOut
-Version:        2.02 
+Version:        2.06 
 Release:        1%{?dist}
 Summary:        Comprehensive inside-out object support module 
 
@@ -16,6 +16,7 @@
 BuildRequires:  perl
 BuildRequires:  perl(Exception::Class) >= 1.22
 BuildRequires:  perl(Want) >= 0.12
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 2.06-1
+- update to 2.06
+- add additional BRs: perl(Test::Pod[::Coverage])
+
 * Mon Sep 25 2006 Chris Weyl <cweyl at alumni.drew.edu> 2.02-1
 - update to 2.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Sep 2006 19:35:05 -0000	1.6
+++ sources	11 Oct 2006 02:28:44 -0000	1.7
@@ -1 +1 @@
-bc28852c041d0d14233f38d88aa2c3e9  Object-InsideOut-2.02.tar.gz
+e2d461cf6248f8b934e7b0d50ee403e9  Object-InsideOut-2.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 02:28:42 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:28:42 -0700
Subject: rpms/perl-Object-InsideOut Makefile,1.2,1.3
Message-ID: <200610110229.k9B2TGxS007338@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Object-InsideOut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7279

Modified Files:
	Makefile 
Log Message:
update to 2.06



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	25 Sep 2006 19:35:04 -0000	1.2
+++ Makefile	11 Oct 2006 02:28:42 -0000	1.3
@@ -2,17 +2,21 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 
 common : CVS/Root
 	@cvs checkout common
 
-# tag & build all non-legacy branches...
-build-all :
-	@cd FC-5 && make tag && make plague
-	@cd devel && test -f dead.package || ( make tag && make plague )
-
 CVS/Root :
 	@echo "ERROR: This does not look like a CVS checkout" && exit 1
 



From fedora-extras-commits at redhat.com  Wed Oct 11 02:40:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:40:36 -0700
Subject: rpms/perl-POE-Component-IRC/devel .cvsignore, 1.9,
	1.10 perl-POE-Component-IRC.spec, 1.10, 1.11 sources, 1.9, 1.10
Message-ID: <200610110240.k9B2ec9l007511@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459/devel

Modified Files:
	.cvsignore perl-POE-Component-IRC.spec sources 
Log Message:
update to 5.05



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 00:42:54 -0000	1.9
+++ .cvsignore	11 Oct 2006 02:40:36 -0000	1.10
@@ -1 +1 @@
-POE-Component-IRC-5.04.tar.gz
+POE-Component-IRC-5.05.tar.gz


Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/perl-POE-Component-IRC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-POE-Component-IRC.spec	30 Sep 2006 00:42:54 -0000	1.10
+++ perl-POE-Component-IRC.spec	11 Oct 2006 02:40:36 -0000	1.11
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        5.04 
+Version:        5.05
 Release:        1%{?dist}
 Summary:        A POE component for building IRC clients        
 
@@ -72,12 +72,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README* docs examples
+%doc Changes README* docs/ examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.05-1
+- update to 5.05
+- scratched head in confusion at versions in the last few changelogs
+
 * Fri Sep 29 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.54-1
 - update to 0.54
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 00:42:54 -0000	1.9
+++ sources	11 Oct 2006 02:40:36 -0000	1.10
@@ -1 +1 @@
-a79ef45b9163934497c74721ff8b5a7e  POE-Component-IRC-5.04.tar.gz
+ce082865e2c21e01a870c0b792649d5a  POE-Component-IRC-5.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 02:40:33 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:40:33 -0700
Subject: rpms/perl-POE-Component-IRC Makefile,1.2,1.3
Message-ID: <200610110241.k9B2f6OF007515@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459

Modified Files:
	Makefile 
Log Message:
update to 5.05



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	30 Sep 2006 00:42:52 -0000	1.2
+++ Makefile	11 Oct 2006 02:40:33 -0000	1.3
@@ -2,15 +2,14 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
 # tag & build all non-legacy branches...
-# this is clearly a non-optimal solution; to my knowledge there is no way to
-# currently determine if a branch is legacy or not (and this module is
-# frequently updated).  Correction on this point welcomed :)
 build-all :
-	@echo WARNING: building for devel and FC-5
+	@echo NOTICE: building for ${BRANCHES}
 	@sleep 5s
-	@cd FC-5  && test -f dead.package || ( make tag && make plague )
-	@cd devel && test -f dead.package || ( make tag && make plague )
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
 
 common-update : common
 	@cd common && cvs update



From fedora-extras-commits at redhat.com  Wed Oct 11 02:40:34 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 19:40:34 -0700
Subject: rpms/perl-POE-Component-IRC/FC-5 perl-POE-Component-IRC.spec, 1.10, 
	1.11 sources, 1.9, 1.10
Message-ID: <200610110241.k9B2f6A0007516@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459/FC-5

Modified Files:
	perl-POE-Component-IRC.spec sources 
Log Message:
update to 5.05



Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/FC-5/perl-POE-Component-IRC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-POE-Component-IRC.spec	30 Sep 2006 00:42:53 -0000	1.10
+++ perl-POE-Component-IRC.spec	11 Oct 2006 02:40:34 -0000	1.11
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        5.04 
+Version:        5.05
 Release:        1%{?dist}
 Summary:        A POE component for building IRC clients        
 
@@ -72,12 +72,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README* docs examples
+%doc Changes README* docs/ examples/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.05-1
+- update to 5.05
+- scratched head in confusion at versions in the last few changelogs
+
 * Fri Sep 29 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.54-1
 - update to 0.54
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 00:42:53 -0000	1.9
+++ sources	11 Oct 2006 02:40:34 -0000	1.10
@@ -1 +1 @@
-a79ef45b9163934497c74721ff8b5a7e  POE-Component-IRC-5.04.tar.gz
+ce082865e2c21e01a870c0b792649d5a  POE-Component-IRC-5.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 03:08:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 20:08:23 -0700
Subject: rpms/perl-POE-API-Peek Makefile,1.1,1.2
Message-ID: <200610110308.k9B38uiv010599@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-API-Peek
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545

Modified Files:
	Makefile 
Log Message:
 update to 1.0801



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	20 Sep 2006 00:10:01 -0000	1.1
+++ Makefile	11 Oct 2006 03:08:23 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Wed Oct 11 03:08:27 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 20:08:27 -0700
Subject: rpms/perl-POE-API-Peek/FC-5 perl-POE-API-Peek.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610110309.k9B390Qg010605@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-API-Peek/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/FC-5

Modified Files:
	perl-POE-API-Peek.spec sources 
Log Message:
 update to 1.0801



Index: perl-POE-API-Peek.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/FC-5/perl-POE-API-Peek.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-API-Peek.spec	20 Sep 2006 00:10:57 -0000	1.2
+++ perl-POE-API-Peek.spec	11 Oct 2006 03:08:27 -0000	1.3
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-API-Peek
-Version:        1.06
-Release:        2%{?dist}
+Version:        1.0801
+Release:        1%{?dist}
 Summary:        Peek into the internals of a running POE environment
 License:        BSD
 Group:          Development/Libraries
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0801-1
+- update to 1.0801
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Sep 2006 00:10:10 -0000	1.2
+++ sources	11 Oct 2006 03:08:27 -0000	1.3
@@ -1 +1 @@
-2655a284b329ad8036ab4de3bbdd7f14  POE-API-Peek-1.06.tar.gz
+0199c4bffaa846886c1ea0cacb004f8b  POE-API-Peek-1.0801.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 03:08:28 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 10 Oct 2006 20:08:28 -0700
Subject: rpms/perl-POE-API-Peek/devel .cvsignore, 1.2,
	1.3 perl-POE-API-Peek.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610110309.k9B390KR010606@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-API-Peek/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/devel

Modified Files:
	.cvsignore perl-POE-API-Peek.spec sources 
Log Message:
 update to 1.0801



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Sep 2006 00:10:10 -0000	1.2
+++ .cvsignore	11 Oct 2006 03:08:27 -0000	1.3
@@ -1 +1 @@
-POE-API-Peek-1.06.tar.gz
+POE-API-Peek-1.0801.tar.gz


Index: perl-POE-API-Peek.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/perl-POE-API-Peek.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-POE-API-Peek.spec	20 Sep 2006 00:10:57 -0000	1.2
+++ perl-POE-API-Peek.spec	11 Oct 2006 03:08:27 -0000	1.3
@@ -10,8 +10,8 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-API-Peek
-Version:        1.06
-Release:        2%{?dist}
+Version:        1.0801
+Release:        1%{?dist}
 Summary:        Peek into the internals of a running POE environment
 License:        BSD
 Group:          Development/Libraries
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.0801-1
+- update to 1.0801
+
 * Tue Sep 19 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Sep 2006 00:10:10 -0000	1.2
+++ sources	11 Oct 2006 03:08:27 -0000	1.3
@@ -1 +1 @@
-2655a284b329ad8036ab4de3bbdd7f14  POE-API-Peek-1.06.tar.gz
+0199c4bffaa846886c1ea0cacb004f8b  POE-API-Peek-1.0801.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 03:48:00 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:48:00 -0700
Subject: rpms/tenr-de-styles-pkg - New directory
Message-ID: <200610110348.k9B3m2j6011088@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11065/tenr-de-styles-pkg

Log Message:
Directory /cvs/extras/rpms/tenr-de-styles-pkg added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 03:48:00 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:48:00 -0700
Subject: rpms/tenr-de-styles-pkg/devel - New directory
Message-ID: <200610110348.k9B3m2Uv011091@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11065/tenr-de-styles-pkg/devel

Log Message:
Directory /cvs/extras/rpms/tenr-de-styles-pkg/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 03:48:16 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:48:16 -0700
Subject: rpms/tenr-de-styles-pkg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610110348.k9B3mI6Q011147@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11114

Added Files:
	Makefile import.log 
Log Message:
Setup of module tenr-de-styles-pkg


--- NEW FILE Makefile ---
# Top level Makefile for module tenr-de-styles-pkg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 11 03:48:17 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:48:17 -0700
Subject: rpms/tenr-de-styles-pkg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610110348.k9B3mJ6w011150@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11114/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tenr-de-styles-pkg


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 11 03:49:54 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:49:54 -0700
Subject: rpms/tenr-de-styles-pkg/devel tenr-de-styles-pkg.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610110349.k9B3nuSA011215@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11180/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tenr-de-styles-pkg.spec 
Log Message:
auto-import tenr-de-styles-pkg-1.0-2 on branch devel from tenr-de-styles-pkg-1.0-2.src.rpm


--- NEW FILE tenr-de-styles-pkg.spec ---
Name:           tenr-de-styles-pkg
Version:        1.0
Release:        2%{?dist}
Summary:        A collection of styles for fluxbox

Group:          Amusements/Graphics
License:        Creative Commons Attribution-ShareAlike 2.5
URL:            http://tenr.de
Source0:        http://tenr.de/files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch:      noarch
Requires:       fluxbox 

%define  _styledir %{_datadir}/%{name}-%{version}

%description
A collection of styles/themes for use with Fluxbox. All styles/themes are 
compatible with fluxStyle.

%prep
%setup -q
chmod -x styles/monochrom2..3/theme.cfg

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_styledir}/
cp -a styles $RPM_BUILD_ROOT%{_styledir}/

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README NEWS License
%dir %{_styledir}
%{_styledir}/*



%changelog
* Mon Oct 09 2006 Michael Rice <errr[AT]errr-online.com> - 1.0-2
- Fix name to remove the dot
- remove unneeded r from cp line
- resolved ownership of _styledir
- new source package from upstream with version

* Sun Oct 08 2006 Michael Rice <errr[AT]errr-online.com> - 1.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tenr-de-styles-pkg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Oct 2006 03:48:17 -0000	1.1
+++ .cvsignore	11 Oct 2006 03:49:54 -0000	1.2
@@ -0,0 +1 @@
+tenr-de-styles-pkg-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tenr-de-styles-pkg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Oct 2006 03:48:17 -0000	1.1
+++ sources	11 Oct 2006 03:49:54 -0000	1.2
@@ -0,0 +1 @@
+758323157d8a8fb98cb80d989342fd9c  tenr-de-styles-pkg-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 11 03:49:52 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:49:52 -0700
Subject: rpms/tenr-de-styles-pkg import.log,1.1,1.2
Message-ID: <200610110350.k9B3oOwU011218@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/tenr-de-styles-pkg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11180

Modified Files:
	import.log 
Log Message:
auto-import tenr-de-styles-pkg-1.0-2 on branch devel from tenr-de-styles-pkg-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tenr-de-styles-pkg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Oct 2006 03:48:16 -0000	1.1
+++ import.log	11 Oct 2006 03:49:52 -0000	1.2
@@ -0,0 +1 @@
+tenr-de-styles-pkg-1_0-2:HEAD:tenr-de-styles-pkg-1.0-2.src.rpm:1160538588



From fedora-extras-commits at redhat.com  Wed Oct 11 03:54:41 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 10 Oct 2006 20:54:41 -0700
Subject: owners owners.list,1.1816,1.1817
Message-ID: <200610110354.k9B3shRG011317@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11300

Modified Files:
	owners.list 
Log Message:
Adding my self as mainter of tenr-de-styles-pkg bug: 209959



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1816
retrieving revision 1.1817
diff -u -r1.1816 -r1.1817
--- owners.list	10 Oct 2006 21:03:58 -0000	1.1816
+++ owners.list	11 Oct 2006 03:54:41 -0000	1.1817
@@ -2139,6 +2139,7 @@
 Fedora Extras|telepathy-filesystem|Telepathy filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tellico|A collection manager|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
+Fedora Extras|tenr-de-styles-pkg|A collection of styles for fluxbox|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|terminus-font|Clean fixed width font|rhbugs at n-dimensional.de|extras-qa at fedoraproject.org|
 Fedora Extras|testdisk|Tool to check and undelete partition|grenier at cgsecurity.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 07:26:49 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:26:49 -0700
Subject: rpms/bitmap - New directory
Message-ID: <200610110726.k9B7QpBF023504@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23478/bitmap

Log Message:
Directory /cvs/extras/rpms/bitmap added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 07:26:49 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:26:49 -0700
Subject: rpms/bitmap/devel - New directory
Message-ID: <200610110726.k9B7QpsG023507@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23478/bitmap/devel

Log Message:
Directory /cvs/extras/rpms/bitmap/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 07:27:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:27:13 -0700
Subject: rpms/bitmap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610110727.k9B7RFR1023557@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23523

Added Files:
	Makefile import.log 
Log Message:
Setup of module bitmap


--- NEW FILE Makefile ---
# Top level Makefile for module bitmap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 11 07:27:14 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:27:14 -0700
Subject: rpms/bitmap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610110727.k9B7RGsY023560@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23523/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bitmap


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 11 07:28:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:28:00 -0700
Subject: rpms/bitmap import.log,1.1,1.2
Message-ID: <200610110728.k9B7S2ZX023633@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23598

Modified Files:
	import.log 
Log Message:
auto-import bitmap-1.0.2-3 on branch devel from bitmap-1.0.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bitmap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Oct 2006 07:27:13 -0000	1.1
+++ import.log	11 Oct 2006 07:28:00 -0000	1.2
@@ -0,0 +1 @@
+bitmap-1_0_2-3:HEAD:bitmap-1.0.2-3.src.rpm:1160551448



From fedora-extras-commits at redhat.com  Wed Oct 11 07:28:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:28:00 -0700
Subject: rpms/bitmap/devel bitmap.desktop, NONE, 1.1 bitmap.png, NONE,
	1.1 bitmap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610110728.k9B7S2WT023638@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/bitmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23598/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bitmap.desktop bitmap.png bitmap.spec 
Log Message:
auto-import bitmap-1.0.2-3 on branch devel from bitmap-1.0.2-3.src.rpm


--- NEW FILE bitmap.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Bitmap
GenericName=X Window Bitmaps Editor
Comment=xBitmap editor for the X Window System
Exec=bitmap
Icon=bitmap.png
Terminal=false
Type=Application
Categories=Application;Utility;


--- NEW FILE bitmap.spec ---
Name: bitmap
Version: 1.0.2
Release: 3%{?dist}
Summary: Bitmap editor and converter utilities for the X Window System
Group: User Interface/X
Url: http://www.x.org
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Source1: bitmap.desktop
Source2: bitmap.png
License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# the bitmap-devel corresponds only with bitmap files. They are needed
# by the base package, so this Provides is added
Provides: %{name}-devel = %{version}-%{release}
# other xorg apps are called like that
Provides: xorg-x11-%{name} = %{version}-%{release}
Provides: xorg-x11-%{name}-devel = %{version}-%{release}

# libXaw-devel requires libXmu-devel 
# libXmu-devel requires libX11-devel, libXt-devel, xorg-x11-util-macros
BuildRequires: xbitmaps-devel libXaw-devel libXext-devel
BuildRequires: desktop-file-utils pkgconfig
# also needed at runtime
Requires: xbitmaps

%description
Bitmap provides a bitmap editor and misc converter utilities for the X
Window System.

The package also includes files defining bitmaps associated with the 
Bitmap x11 editor.

%prep
%setup -q


%build
%configure --disable-dependency-tracking
make %{?_smp_mflags}


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

desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/


%clean
rm -rf %{buildroot}


%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,-)
# COPYING is a stub!
%doc ChangeLog
%{_bindir}/atobm
%{_bindir}/bmtoa
%{_bindir}/bitmap
%{_includedir}/X11/bitmaps/*
%{_datadir}/X11/app-defaults/Bitmap*
%{_datadir}/applications/*bitmap*
%{_datadir}/icons/hicolor/32x32/apps/bitmap.png
%{_mandir}/man1/*.1*

%changelog
* Tue Oct 10 2006 Patrice Dumas <pertusus at free.fr> 1.0.2-3
- use consistently %%{buildroot}
- provides xorg-x11-%%{name}-devel

* Mon Oct  9 2006 Patrice Dumas <pertusus at free.fr> 1.0.2-2
- buildrequires pkgconfig, libXext-devel

* Sun Sep  3 2006 Patrice Dumas <pertusus at free.fr> 1.0.2-1
- Packaged for fedora extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitmap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Oct 2006 07:27:14 -0000	1.1
+++ .cvsignore	11 Oct 2006 07:28:00 -0000	1.2
@@ -0,0 +1 @@
+bitmap-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitmap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Oct 2006 07:27:14 -0000	1.1
+++ sources	11 Oct 2006 07:28:00 -0000	1.2
@@ -0,0 +1 @@
+78e8ab5c1830e2cdfbff7a952162a5a7  bitmap-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 11 07:33:15 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 11 Oct 2006 00:33:15 -0700
Subject: owners owners.list,1.1817,1.1818
Message-ID: <200610110733.k9B7XHoq023766@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23749

Modified Files:
	owners.list 
Log Message:
add bitmap


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1817
retrieving revision 1.1818
diff -u -r1.1817 -r1.1818
--- owners.list	11 Oct 2006 03:54:41 -0000	1.1817
+++ owners.list	11 Oct 2006 07:33:15 -0000	1.1818
@@ -111,6 +111,7 @@
 Fedora Extras|bit|C++ classes for bit manipulations|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|bitbake|BitBake build tool|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|bitgtkmm|Gtkmm widgets for bit|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
+Fedora Extras|bitmap|Bitmap editor and converter utilities for the X Window System|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 09:42:18 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 11 Oct 2006 02:42:18 -0700
Subject: rpms/jack-audio-connection-kit/devel .cvsignore, 1.2,
	1.3 jack-audio-connection-kit.spec, 1.6, 1.7 sources, 1.2,
	1.3 jack-clock3.patch, 1.1, NONE
Message-ID: <200610110942.k9B9gKJ2029987@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29966

Modified Files:
	.cvsignore jack-audio-connection-kit.spec sources 
Removed Files:
	jack-clock3.patch 
Log Message:
update to 0.102.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2006 17:15:12 -0000	1.2
+++ .cvsignore	11 Oct 2006 09:42:17 -0000	1.3
@@ -1 +1 @@
-jack-audio-connection-kit-0.101.1.tar.gz
+jack-audio-connection-kit-0.102.20.tar.gz


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jack-audio-connection-kit.spec	29 Aug 2006 13:00:40 -0000	1.6
+++ jack-audio-connection-kit.spec	11 Oct 2006 09:42:17 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
-Version: 0.101.1
-Release: 13%{?dist}
+Version: 0.102.20
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
 Source1: %{name}-README.Fedora
-Patch0: http://lalists.stanford.edu/lad/2006/01/att-0167/jack-clock3.patch
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -48,11 +47,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .clock3
 
 %build
 # x86_64 issue reported by Rudolf Kastl (not checked, but not bad).
-# Also patch0 touches configure.ac.
 autoreconf --force --install
 
 %configure \
@@ -120,6 +117,10 @@
 %{_bindir}/jack_simple_client
 
 %changelog
+* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-1
+- update to 0.102.20
+- drop patch0 (already in mainstream)
+
 * Tue Aug 29 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.101.1-13
 - http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2006 17:15:12 -0000	1.2
+++ sources	11 Oct 2006 09:42:17 -0000	1.3
@@ -1 +1 @@
-bb25f7c1da5d488b70edcf39ff5a39b2  jack-audio-connection-kit-0.101.1.tar.gz
+d6881555a8b4c923b4ec706832f0d776  jack-audio-connection-kit-0.102.20.tar.gz


--- jack-clock3.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 09:56:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 11 Oct 2006 02:56:22 -0700
Subject: rpms/gentoo/FC-5 gentoo-0.11.56-lang.patch, NONE, 1.1 gentoo.spec,
	1.6, 1.7 gentoo-0.11.52-pomkinstalldirs.patch, 1.1, NONE
Message-ID: <200610110956.k9B9uOA0030106@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gentoo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30071/FC-5

Modified Files:
	gentoo.spec 
Added Files:
	gentoo-0.11.56-lang.patch 
Removed Files:
	gentoo-0.11.52-pomkinstalldirs.patch 
Log Message:
Fix translations (#210205).


gentoo-0.11.56-lang.patch:

--- NEW FILE gentoo-0.11.56-lang.patch ---
diff -Naupr gentoo-0.11.56.orig/po/LINGUAS gentoo-0.11.56/po/LINGUAS
--- gentoo-0.11.56.orig/po/LINGUAS	2004-12-27 09:08:49.000000000 +0100
+++ gentoo-0.11.56/po/LINGUAS	2006-10-11 11:49:53.000000000 +0200
@@ -1,2 +1,2 @@
 # Set of available languages for gentoo.
-de fr it ja_JP.UTF-8 pl ru_RU.cp1251 ru_RU.CP1251 ru_RU.KOI8-R ru_RU.koi8r ru_RU.UTF-8 ru_RU.utf8 sv
+de fr it ja pl ru sv


Index: gentoo.spec
===================================================================
RCS file: /cvs/extras/rpms/gentoo/FC-5/gentoo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gentoo.spec	6 Mar 2006 15:39:49 -0000	1.6
+++ gentoo.spec	11 Oct 2006 09:56:22 -0000	1.7
@@ -1,12 +1,12 @@
 Summary: Graphical file management program in GTK+ for Linux
 Name: gentoo
-Version: 0.11.55
-Release: 3%{?dist}
+Version: 0.11.56
+Release: 2%{?dist}
 License: GPL
 Group: Applications/File
 URL: http://www.obsession.se/gentoo/
 Source: http://dl.sf.net/gentoo/gentoo-%{version}.tar.gz
-Patch: gentoo-0.11.52-pomkinstalldirs.patch
+Patch0: gentoo-0.11.56-lang.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk+-devel, gamin-devel, desktop-file-utils
 
@@ -23,7 +23,13 @@
 
 %prep
 %setup
-%patch -p1 -b .pomkinstalldirs
+%patch0 -p1 -b .lang
+# Keep only UTF-8 translations. This requires the patch above and is easier
+# like this since it would bloat the patch for nothing.
+for lang in ja ru; do
+    %{__mv} po/${lang}_*.UTF-8.gmo po/${lang}.gmo
+    %{__mv} po/${lang}_*.UTF-8.po po/${lang}.po
+done
 
 
 %build
@@ -74,6 +80,14 @@
 
 
 %changelog
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-2
+- Fix translations (#210205).
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-1
+- Update to 0.11.56.
+- FC6 rebuild.
+- Drop pomkinstalldirs patch, this release fixes the problem.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.11.55-3
 - FC5 rebuild.
 


--- gentoo-0.11.52-pomkinstalldirs.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 09:56:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 11 Oct 2006 02:56:22 -0700
Subject: rpms/gentoo/devel gentoo-0.11.56-lang.patch, NONE, 1.1 gentoo.spec, 
	1.7, 1.8
Message-ID: <200610110956.k9B9uOUm030112@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gentoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30071/devel

Modified Files:
	gentoo.spec 
Added Files:
	gentoo-0.11.56-lang.patch 
Log Message:
Fix translations (#210205).


gentoo-0.11.56-lang.patch:

--- NEW FILE gentoo-0.11.56-lang.patch ---
diff -Naupr gentoo-0.11.56.orig/po/LINGUAS gentoo-0.11.56/po/LINGUAS
--- gentoo-0.11.56.orig/po/LINGUAS	2004-12-27 09:08:49.000000000 +0100
+++ gentoo-0.11.56/po/LINGUAS	2006-10-11 11:49:53.000000000 +0200
@@ -1,2 +1,2 @@
 # Set of available languages for gentoo.
-de fr it ja_JP.UTF-8 pl ru_RU.cp1251 ru_RU.CP1251 ru_RU.KOI8-R ru_RU.koi8r ru_RU.UTF-8 ru_RU.utf8 sv
+de fr it ja pl ru sv


Index: gentoo.spec
===================================================================
RCS file: /cvs/extras/rpms/gentoo/devel/gentoo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gentoo.spec	28 Aug 2006 09:43:39 -0000	1.7
+++ gentoo.spec	11 Oct 2006 09:56:22 -0000	1.8
@@ -1,11 +1,12 @@
 Summary: Graphical file management program in GTK+ for Linux
 Name: gentoo
 Version: 0.11.56
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/File
 URL: http://www.obsession.se/gentoo/
 Source: http://dl.sf.net/gentoo/gentoo-%{version}.tar.gz
+Patch0: gentoo-0.11.56-lang.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk+-devel, gamin-devel, desktop-file-utils
 
@@ -22,6 +23,13 @@
 
 %prep
 %setup
+%patch0 -p1 -b .lang
+# Keep only UTF-8 translations. This requires the patch above and is easier
+# like this since it would bloat the patch for nothing.
+for lang in ja ru; do
+    %{__mv} po/${lang}_*.UTF-8.gmo po/${lang}.gmo
+    %{__mv} po/${lang}_*.UTF-8.po po/${lang}.po
+done
 
 
 %build
@@ -72,6 +80,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-2
+- Fix translations (#210205).
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-1
 - Update to 0.11.56.
 - FC6 rebuild.



From fedora-extras-commits at redhat.com  Wed Oct 11 09:59:56 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 11 Oct 2006 02:59:56 -0700
Subject: rpms/gentoo/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610110959.k9B9xwcx030213@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gentoo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30194

Modified Files:
	.cvsignore sources 
Log Message:
Commit missing changes for the 0.11.55 -> 0.11.56 update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gentoo/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jun 2005 09:06:45 -0000	1.4
+++ .cvsignore	11 Oct 2006 09:59:56 -0000	1.5
@@ -1 +1 @@
-gentoo-0.11.55.tar.gz
+gentoo-0.11.56.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gentoo/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jun 2005 09:06:45 -0000	1.4
+++ sources	11 Oct 2006 09:59:56 -0000	1.5
@@ -1 +1 @@
-9f831c487168612a877ece90b9287c96  gentoo-0.11.55.tar.gz
+c28b003a29527813f47908d69d3f44d0  gentoo-0.11.56.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 10:05:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 11 Oct 2006 03:05:03 -0700
Subject: rpms/lighttpd/devel .cvsignore, 1.17, 1.18 lighttpd.spec, 1.27,
	1.28 sources, 1.17, 1.18 lighttpd-1.4.12-fix.patch, 1.1, NONE
Message-ID: <200610111005.k9BA5boE000770@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv710

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.4.12-fix.patch 
Log Message:
Update to 1.4.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 Sep 2006 15:48:21 -0000	1.17
+++ .cvsignore	11 Oct 2006 10:05:03 -0000	1.18
@@ -1 +1 @@
-lighttpd-1.4.12.tar.gz
+lighttpd-1.4.13.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- lighttpd.spec	3 Oct 2006 17:15:05 -0000	1.27
+++ lighttpd.spec	11 Oct 2006 10:05:03 -0000	1.28
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.12
-Release: 3%{?dist}
+Version: 1.4.13
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -16,7 +16,6 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
-Patch1: lighttpd-1.4.12-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -68,7 +67,6 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -p3 -b .fix
 
 
 %build
@@ -175,6 +173,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-1
+- Update to 1.4.13, which contains the previous fix.
+
 * Tue Oct  3 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-3
 - Include fix for segfaults (lighttpd bug #876, changeset 1352).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Sep 2006 15:48:21 -0000	1.17
+++ sources	11 Oct 2006 10:05:03 -0000	1.18
@@ -1 +1 @@
-8f6756452138f5da384251f849b329f2  lighttpd-1.4.12.tar.gz
+d775d6478391b95d841a1018c8db0b95  lighttpd-1.4.13.tar.gz


--- lighttpd-1.4.12-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 10:14:11 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 11 Oct 2006 03:14:11 -0700
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.7, 1.8
Message-ID: <200610111014.k9BAEDY4000929@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv911

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Possible fix build break


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jack-audio-connection-kit.spec	11 Oct 2006 09:42:17 -0000	1.7
+++ jack-audio-connection-kit.spec	11 Oct 2006 10:14:10 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -92,7 +92,6 @@
 %{_bindir}/jack_unload
 %{_bindir}/jack_bufsize
 %{_bindir}/jack_freewheel
-%{_bindir}/jack_transport
 %{_libdir}/jack/
 %{_mandir}/man1/jack*.1*
 %{_libdir}/libjack.so.*
@@ -117,9 +116,10 @@
 %{_bindir}/jack_simple_client
 
 %changelog
-* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-1
+* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2
 - update to 0.102.20
 - drop patch0 (already in mainstream)
+- no pack jack_transport (build error)
 
 * Tue Aug 29 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.101.1-13
 - http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



From fedora-extras-commits at redhat.com  Wed Oct 11 11:33:41 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 11 Oct 2006 04:33:41 -0700
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.8, 1.9
Message-ID: <200610111133.k9BBXhkv005291@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5265

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Another build break fix.


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jack-audio-connection-kit.spec	11 Oct 2006 10:14:10 -0000	1.8
+++ jack-audio-connection-kit.spec	11 Oct 2006 11:33:41 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2%{?dist}
+Release: 2.0%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
+#BuildRequires: libfreebob >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -114,12 +115,15 @@
 %{_bindir}/jack_showtime
 %{_bindir}/jack_monitor_client
 %{_bindir}/jack_simple_client
+%{_bindir}/jack_midiseq
+%{_bindir}/jack_midisine
 
 %changelog
-* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2
+* Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.0
 - update to 0.102.20
 - drop patch0 (already in mainstream)
 - no pack jack_transport (build error)
+- pack new JACK MIDI files
 
 * Tue Aug 29 2006 Andy Shevchenko <andriy at asplinux.com.ua> 0.101.1-13
 - http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



From fedora-extras-commits at redhat.com  Wed Oct 11 11:36:27 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 11 Oct 2006 04:36:27 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.11,1.12
Message-ID: <200610111136.k9BBaTIV005844@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5787

Modified Files:
	gdeskcal.spec 
Log Message:

Fix missing dep 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdeskcal.spec	8 Oct 2006 14:04:24 -0000	1.11
+++ gdeskcal.spec	11 Oct 2006 11:36:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils perl(XML::Parser)
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 



From fedora-extras-commits at redhat.com  Wed Oct 11 12:23:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 05:23:06 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.12, 1.13 gnupg2.spec, 1.50,
	1.51 sources, 1.14, 1.15
Message-ID: <200610111223.k9BCN8du016885@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-1
- 1.9.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Oct 2006 19:42:57 -0000	1.12
+++ .cvsignore	11 Oct 2006 12:23:06 -0000	1.13
@@ -1,3 +1,4 @@
 gnupg-1.9.23.tar.bz2
 gnupg-1.9.23.tar.bz2.sig
 gnupg-1.9.91.tar.bz2.sig
+gnupg-1.9.92.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnupg2.spec	10 Oct 2006 20:33:05 -0000	1.50
+++ gnupg2.spec	11 Oct 2006 12:23:06 -0000	1.51
@@ -11,8 +11,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.91
-Release: 4%{?dist}
+Version: 1.9.92
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -25,8 +25,6 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
-# http://lists.gnupg.org/pipermail/gnupg-devel/2006-October/023237.html
-Patch1: gnupg-1.9.91-readline.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 Patch3: gnupg-1.9.91-dearmor.patch
 
@@ -80,8 +78,7 @@
 %prep
 %setup -q -n gnupg-%{version}
 
-%patch1 -p1 -b .readline
-%patch2 -p1 -b .testverbose
+#patch2 -p1 -b .testverbose
 %patch3 -p1 -b .dearmor
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
@@ -177,6 +174,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-1
+- 1.9.92
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.91-4
 - make check ||: (apparently checks return err even on success?)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	6 Oct 2006 12:57:10 -0000	1.14
+++ sources	11 Oct 2006 12:23:06 -0000	1.15
@@ -1,2 +1,2 @@
-1f79e05ebbda709234a6488cc8f02d82  gnupg-1.9.91.tar.bz2.sig
-fb6838f6e2e26e5f00271ce588fd080b  gnupg-1.9.91.tar.bz2
+1d0b7ce8c5ff98976253e78a3e20c3a7  gnupg-1.9.92.tar.bz2.sig
+46fc473680ff5586184ddb53e7e18277  gnupg-1.9.92.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 11 13:14:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 06:14:00 -0700
Subject: rpms/nas/devel nas.spec,1.5,1.6
Message-ID: <200610111314.k9BDE2C4028702@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/nas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28678

Modified Files:
	nas.spec 
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
- don't rely-on/use potentially broken %_libdir/X11 symlink (#207180)



Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/devel/nas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nas.spec	11 Sep 2006 08:03:28 -0000	1.5
+++ nas.spec	11 Oct 2006 13:14:00 -0000	1.6
@@ -1,12 +1,16 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.8
-Release:	9%{?dist}
-#for FC>4
-BuildRequires:	imake bison flex libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
-#for FC4
-#BuildRequires: bison flex xorg-x11-devel 
-#ExcludeArch: x86_64
+Release:	10%{?dist}
+BuildRequires:	bison flex
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
+%define libdir_x11 %{_libdir}/X11
+%else
+BuildRequires: xorg-x11-devel 
+# don't rely on (potentially broken) /usr/lib/X11 symlink anyway
+%define libdir_x11 %{_prefix}/X11R6/lib/X11
+%endif
 
 URL:		http://nas.codebrilliance.com		
 
@@ -45,19 +49,24 @@
 %description devel
 Development files and the documentation
 
+
 %prep
 %setup -q -n nas-%{version}
 %patch0 -p1
 
+
 %build
 xmkmf
 make %{?_smp_mflags} World
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
-LIBDIR=%{_libdir}/X11  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
-install install.man
+
+make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
+  LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
+  install install.man
+
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
 install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nasd
 
@@ -93,7 +102,7 @@
 %{_mandir}/man5/*
 %{_libdir}/libaudio.so.2
 %{_libdir}/libaudio.so.2.4
-%{_libdir}/X11/AuErrorDB
+%{libdir_x11}/AuErrorDB
 %doc README BUGS FAQ HISTORY TODO
 
 %files devel
@@ -102,7 +111,11 @@
 %{_libdir}/libaudio.so
 %{_mandir}/man3/*
 
+
 %changelog 
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
+- don't rely-on/use potentially broken %%_libdir/X11 symlink (#207180)
+
 * Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-9%{?dist}
 - second rebuild for FC6
 



From fedora-extras-commits at redhat.com  Wed Oct 11 13:20:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 06:20:02 -0700
Subject: rpms/nas/FC-4 nas.spec,1.6,1.7
Message-ID: <200610111320.k9BDK4JM029625@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/nas/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29608

Modified Files:
	nas.spec 
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
- don't rely-on/use (potentially broken) %_libdir/X11 symlink (#207180)



Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/FC-4/nas.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nas.spec	24 Jul 2006 11:15:47 -0000	1.6
+++ nas.spec	11 Oct 2006 13:20:01 -0000	1.7
@@ -1,12 +1,16 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.8
-Release:	8%{?dist}
-#for FC>4
-#BuildRequires:	imake bison flex libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
-#for FC4
-BuildRequires: bison flex xorg-x11-devel 
-ExcludeArch: x86_64
+Release:	10%{?dist}
+BuildRequires:	bison flex
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
+%define libdir_x11 %{_libdir}/X11
+%else
+BuildRequires: xorg-x11-devel 
+# don't rely on (potentially broken) /usr/lib/X11 symlink anyway
+%define libdir_x11 %{_prefix}/X11R6/lib/X11
+%endif
 
 URL:		http://nas.codebrilliance.com		
 
@@ -45,19 +49,24 @@
 %description devel
 Development files and the documentation
 
+
 %prep
 %setup -q -n nas-%{version}
 %patch0 -p1
 
+
 %build
 xmkmf
 make %{?_smp_mflags} World
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
-LIBDIR=%{_libdir}/X11  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
-install install.man
+
+make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
+  LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
+  install install.man
+
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
 install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nasd
 
@@ -93,7 +102,7 @@
 %{_mandir}/man5/*
 %{_libdir}/libaudio.so.2
 %{_libdir}/libaudio.so.2.4
-%{_libdir}/X11/AuErrorDB
+%{libdir_x11}/AuErrorDB
 %doc README BUGS FAQ HISTORY TODO
 
 %files devel
@@ -102,7 +111,14 @@
 %{_libdir}/libaudio.so
 %{_mandir}/man3/*
 
+
 %changelog 
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
+- don't rely-on/use (potentially broken) %%_libdir/X11 symlink (#207180)
+
+* Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-9%{?dist}
+- second rebuild for FC6
+
 * Mon Jul 24 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-8%{?dist}
 - fix ugly output when starting the daemon
 



From fedora-extras-commits at redhat.com  Wed Oct 11 13:20:28 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 06:20:28 -0700
Subject: rpms/nas/FC-5 nas.spec,1.4,1.5
Message-ID: <200610111320.k9BDKUPv029693@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/nas/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29674

Modified Files:
	nas.spec 
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
- don't rely-on/use (potentially broken) %_libdir/X11 symlink (#207180)



Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/FC-5/nas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nas.spec	24 Jul 2006 11:00:31 -0000	1.4
+++ nas.spec	11 Oct 2006 13:20:28 -0000	1.5
@@ -1,12 +1,16 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.8
-Release:	8%{?dist}
-#for FC>4
-BuildRequires:	imake bison flex libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
-#for FC4
-#BuildRequires: bison flex xorg-x11-devel 
-#ExcludeArch: x86_64
+Release:	10%{?dist}
+BuildRequires:	bison flex
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
+%define libdir_x11 %{_libdir}/X11
+%else
+BuildRequires: xorg-x11-devel 
+# don't rely on (potentially broken) /usr/lib/X11 symlink anyway
+%define libdir_x11 %{_prefix}/X11R6/lib/X11
+%endif
 
 URL:		http://nas.codebrilliance.com		
 
@@ -45,19 +49,24 @@
 %description devel
 Development files and the documentation
 
+
 %prep
 %setup -q -n nas-%{version}
 %patch0 -p1
 
+
 %build
 xmkmf
 make %{?_smp_mflags} World
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
-LIBDIR=%{_libdir}/X11  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
-install install.man
+
+make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCROOT=%{_includedir} \
+  LIBDIR=%{libdir_x11}  SHLIBDIR=%{_libdir} USRLIBDIR=%{_libdir} MANPATH=%{_mandir} \
+  install install.man
+
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/nasd
 install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nasd
 
@@ -93,7 +102,7 @@
 %{_mandir}/man5/*
 %{_libdir}/libaudio.so.2
 %{_libdir}/libaudio.so.2.4
-%{_libdir}/X11/AuErrorDB
+%{libdir_x11}/AuErrorDB
 %doc README BUGS FAQ HISTORY TODO
 
 %files devel
@@ -102,7 +111,14 @@
 %{_libdir}/libaudio.so
 %{_mandir}/man3/*
 
+
 %changelog 
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.8-10
+- don't rely-on/use (potentially broken) %%_libdir/X11 symlink (#207180)
+
+* Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-9%{?dist}
+- second rebuild for FC6
+
 * Mon Jul 24 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.8-8%{?dist}
 - fix ugly output when starting the daemon
 



From fedora-extras-commits at redhat.com  Wed Oct 11 14:04:05 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Wed, 11 Oct 2006 07:04:05 -0700
Subject: rpms/mediawiki/devel .cvsignore, 1.4, 1.5 mediawiki.spec, 1.5,
	1.6 sources, 1.4, 1.5 needs.rebuild, 1.1, NONE
Message-ID: <200610111404.k9BE47Zv000371@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350

Modified Files:
	.cvsignore mediawiki.spec sources 
Removed Files:
	needs.rebuild 
Log Message:
Update mediawiki to 1.8.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Apr 2006 13:19:56 -0000	1.4
+++ .cvsignore	11 Oct 2006 14:04:05 -0000	1.5
@@ -1 +1 @@
-mediawiki-1.5.8.tar.gz
+mediawiki-1.8.0.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mediawiki.spec	3 Apr 2006 13:19:56 -0000	1.5
+++ mediawiki.spec	11 Oct 2006 14:04:05 -0000	1.6
@@ -1,8 +1,8 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.5.8
-Release:        1%{?dist}
+Version:        1.8.0
+Release:        2%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@
 Requires:       httpd
 Requires:       php >= 4.1.2
 Requires:	php-mysql
+Requires:	php-gd, diffutils, ImageMagick
 # to make sure the "apache" group is created before mediawiki is installed
 Requires(pre):  httpd
 
@@ -89,6 +90,10 @@
 
 
 %changelog
+* Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.0-2
+- Update to 1.8.0.
+- And php-gd, diffutils, ImageMagick as dependencies
+
 * Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
 - Update to upstream 1.5.8 (contains security fixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Apr 2006 13:19:56 -0000	1.4
+++ sources	11 Oct 2006 14:04:05 -0000	1.5
@@ -1 +1 @@
-1eef94157377fa8c3d049877a27c0163  mediawiki-1.5.8.tar.gz
+9141eba6b8faf17fe80edeb7699cfca4  mediawiki-1.8.0.tar.gz


--- needs.rebuild DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:16:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 07:16:26 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.51,1.52
Message-ID: <200610111416.k9BEGScV000615@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv595

Modified Files:
	gnupg2.spec 
Log Message:
* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-2
- fix file conflicts with gnupg



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnupg2.spec	11 Oct 2006 12:23:06 -0000	1.51
+++ gnupg2.spec	11 Oct 2006 14:16:26 -0000	1.52
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -95,6 +95,10 @@
 
 %build
 
+%ifarch x86_64
+#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O1|')"
+%endif
+
 %configure \
   --disable-rpath \
   --enable-selinux-support \
@@ -126,6 +130,15 @@
 
 %find_lang %{name}
 
+## NOTE:
+#file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+#file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+#file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+
+rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
+mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
+
+
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -138,7 +151,6 @@
   /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir ||:
 fi
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
@@ -154,8 +166,8 @@
 %{_bindir}/gpgkey2ssh
 %{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
-%{_bindir}/gpgsplit
-%{_bindir}/gpg-zip
+#{_bindir}/gpgsplit
+#{_bindir}/gpg-zip
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
@@ -168,12 +180,14 @@
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-2
+- fix file conflicts with gnupg
+
 * Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-1
 - 1.9.92
 



From fedora-extras-commits at redhat.com  Wed Oct 11 14:25:24 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:25:24 -0700
Subject: rpms/galago-filesystem - New directory
Message-ID: <200610111425.k9BEPQdi000833@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv807/galago-filesystem

Log Message:
Directory /cvs/extras/rpms/galago-filesystem added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 14:25:24 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:25:24 -0700
Subject: rpms/galago-filesystem/devel - New directory
Message-ID: <200610111425.k9BEPQ0G000836@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv807/galago-filesystem/devel

Log Message:
Directory /cvs/extras/rpms/galago-filesystem/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 14:25:44 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:25:44 -0700
Subject: rpms/galago-filesystem Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610111425.k9BEPkYx000885@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv852

Added Files:
	Makefile import.log 
Log Message:
Setup of module galago-filesystem


--- NEW FILE Makefile ---
# Top level Makefile for module galago-filesystem
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:25:45 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:25:45 -0700
Subject: rpms/galago-filesystem/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610111425.k9BEPlNJ000888@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv852/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module galago-filesystem


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:26:01 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:26:01 -0700
Subject: rpms/galago-filesystem/devel galago-filesystem.spec,NONE,1.1
Message-ID: <200610111426.k9BEQ3Nr000935@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv909/devel

Added Files:
	galago-filesystem.spec 
Log Message:
auto-import galago-filesystem-0.0.1-2 on branch devel from galago-filesystem-0.0.1-2.src.rpm


--- NEW FILE galago-filesystem.spec ---
Name:           galago-filesystem
Version:        0.0.1
Release:        2%{?dist}
Summary:        Galago filesystem layout

Group:          System Environment/Base
License:        Public Domain
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       filesystem

%description
This package provides some directories which are required by other
packages which comprise the Galago release.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/galago


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_libdir}/galago


%changelog
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.1-2
- Add build section to quiet rpmlint.

* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.1-1
- Initial FE spec.




From fedora-extras-commits at redhat.com  Wed Oct 11 14:26:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:26:00 -0700
Subject: rpms/galago-filesystem import.log,1.1,1.2
Message-ID: <200610111426.k9BEQXGG000943@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-filesystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv909

Modified Files:
	import.log 
Log Message:
auto-import galago-filesystem-0.0.1-2 on branch devel from galago-filesystem-0.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/galago-filesystem/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Oct 2006 14:25:44 -0000	1.1
+++ import.log	11 Oct 2006 14:26:00 -0000	1.2
@@ -0,0 +1 @@
+galago-filesystem-0_0_1-2:HEAD:galago-filesystem-0.0.1-2.src.rpm:1160576789



From fedora-extras-commits at redhat.com  Wed Oct 11 14:27:29 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:27:29 -0700
Subject: rpms/telepathy-feed/devel - New directory
Message-ID: <200610111427.k9BERVLP001047@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1018/telepathy-feed/devel

Log Message:
Directory /cvs/extras/rpms/telepathy-feed/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 14:27:28 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:27:28 -0700
Subject: rpms/telepathy-feed - New directory
Message-ID: <200610111427.k9BERUfo001044@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1018/telepathy-feed

Log Message:
Directory /cvs/extras/rpms/telepathy-feed added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 11 14:27:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:27:40 -0700
Subject: rpms/telepathy-feed Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610111427.k9BERgji001096@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1063

Added Files:
	Makefile import.log 
Log Message:
Setup of module telepathy-feed


--- NEW FILE Makefile ---
# Top level Makefile for module telepathy-feed
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:27:41 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:27:41 -0700
Subject: rpms/telepathy-feed/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610111427.k9BERhpx001099@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1063/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module telepathy-feed


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 11 14:28:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:28:14 -0700
Subject: rpms/telepathy-feed import.log,1.1,1.2
Message-ID: <200610111428.k9BESG6f001162@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1127

Modified Files:
	import.log 
Log Message:
auto-import telepathy-feed-0.13-1 on branch devel from telepathy-feed-0.13-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/telepathy-feed/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Oct 2006 14:27:40 -0000	1.1
+++ import.log	11 Oct 2006 14:28:14 -0000	1.2
@@ -0,0 +1 @@
+telepathy-feed-0_13-1:HEAD:telepathy-feed-0.13-1.src.rpm:1160576922



From fedora-extras-commits at redhat.com  Wed Oct 11 14:28:15 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:28:15 -0700
Subject: rpms/telepathy-feed/devel telepathy-feed.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610111428.k9BESHu3001167@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1127/devel

Modified Files:
	.cvsignore sources 
Added Files:
	telepathy-feed.spec 
Log Message:
auto-import telepathy-feed-0.13-1 on branch devel from telepathy-feed-0.13-1.src.rpm


--- NEW FILE telepathy-feed.spec ---
Name:           telepathy-feed
Version:        0.13
Release:        1%{?dist}
Summary:        A Galago feed for Telepathy

Group:          Applications/Communications
License:        LGPL
URL:            http://telepathy.freedesktop.org/wiki
Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtelepathy-devel
BuildRequires:  libgalago-devel

Requires:       galago-filesystem


%description
A Galago feed for Telepathy


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_libdir}/galago/%{name}


%changelog
* Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-1
- Initial FE spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-feed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Oct 2006 14:27:40 -0000	1.1
+++ .cvsignore	11 Oct 2006 14:28:14 -0000	1.2
@@ -0,0 +1 @@
+telepathy-feed-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-feed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Oct 2006 14:27:40 -0000	1.1
+++ sources	11 Oct 2006 14:28:14 -0000	1.2
@@ -0,0 +1 @@
+ff6273a82c96db813526ea599ac3b6ff  telepathy-feed-0.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 14:31:22 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:31:22 -0700
Subject: owners owners.list,1.1818,1.1819
Message-ID: <200610111431.k9BEVOGs001280@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1257

Modified Files:
	owners.list 
Log Message:
Add telepathy-feed & galago-filesystem


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1818
retrieving revision 1.1819
diff -u -r1.1818 -r1.1819
--- owners.list	11 Oct 2006 07:33:15 -0000	1.1818
+++ owners.list	11 Oct 2006 14:31:22 -0000	1.1819
@@ -446,6 +446,7 @@
 Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|galago-daemon|Galago presence daemon|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|galago-filesystem|Galago filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|galculator|GTK 2 based scientific calculator|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gallery2|Database-backed web photo gallery application|jwb at redhat.com|extras-qa at fedoraproject.org|
@@ -2137,6 +2138,7 @@
 Fedora Extras|tcpick|A tcp stream sniffer, tracker and capturer|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-butterfly|MSN connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|telepathy-feed|Galago feed for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-filesystem|Telepathy filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|telepathy-gabble|Jabber/XMPP connection manager for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tellico|A collection manager|jamatos at fc.up.pt|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 14:34:55 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 07:34:55 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.3,1.4
Message-ID: <200610111434.k9BEYvKt001501@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1483

Modified Files:
	eds-feed.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
- Require galago-filesystem.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eds-feed.spec	8 Oct 2006 02:55:11 -0000	1.3
+++ eds-feed.spec	11 Oct 2006 14:34:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -15,6 +15,7 @@
 BuildRequires:	libxml2-devel
 
 Requires:	galago-daemon
+Requires:	galago-filesystem
 
 
 %description
@@ -43,11 +44,13 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS
-%dir %{_libdir}/galago
 %{_libdir}/galago/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
+- Require galago-filesystem.
+
 * Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
 - Rebuild for new libgalago.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 14:47:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 07:47:31 -0700
Subject: rpms/qt4/FC-4 .cvsignore, 1.6, 1.7 qt4.spec, 1.12,
	1.13 qtconfig.desktop, 1.2, 1.3
Message-ID: <200610111447.k9BElXNu001894@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1873

Modified Files:
	.cvsignore qt4.spec qtconfig.desktop 
Log Message:
* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.1
- (re)enable -system-nas-sound on FC-4/x86_64



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Jul 2006 03:23:28 -0000	1.6
+++ .cvsignore	11 Oct 2006 14:47:31 -0000	1.7
@@ -1,5 +1,4 @@
 clog
+OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
-qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
-qt42.spec
-
+qt-x11-opensource-src-4.2.0.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qt4.spec	26 Jul 2006 03:23:28 -0000	1.12
+++ qt4.spec	11 Oct 2006 14:47:31 -0000	1.13
@@ -1,11 +1,11 @@
 
 # Fedora Review
-# http://bugzilla.redhat.com/bugzilla/188180
+# http://bugzilla.redhat.com/188180
 
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 8%{?dist}
+Release: 11%{?dist}.1
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -13,7 +13,7 @@
 Source0:  ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# search for assistant4 instead of (qt3's) assistant in $PATH 
+# search for assistant-qt4 instead of (qt3's) assistant in $PATH 
 Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
 
 Source10: qt4-wrapper.sh
@@ -27,26 +27,16 @@
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
-%define mysql  -no-sql-mysql 
-%if "%{?fedora}" > "3"
+#if "%{?fedora}" > "3" || "%{?rhel}" > "3"
 %define mysql  -plugin-sql-mysql
-%endif
-%if "%{?rhel}" > "3"
-%define mysql  -plugin-sql-mysql
-%endif
+#endif
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
 # 
-%if "%{?fedora}" > "4"
+#if "%{?fedora}" > "4"
 %define nas     -system-nas-sound
-%endif
-%if "%{?fedora}" == "4"
-# nas unavailable on fc4/x86_64
-%ifnarch x86_64
-%define nas     -system-nas-sound
-%endif
-%endif
+#endif
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -310,12 +300,12 @@
 pushd %{buildroot}%{qtdir}/bin 
 for i in *; do
   case "$i" in
-    qt3to4|uic3|rcc)
-      LINK=$i
+    assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
+      LINK=${i}-qt4
       ;;
     *)
-      LINK=${i}-qt4
-      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}	
+      LINK=${i}
+      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
       ;;
   esac
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -472,6 +462,16 @@
 
 
 %changelog
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.1
+- (re)enable -system-nas-sound on FC-4/x86_64
+
+* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11
+- backout xfixes mod(s), only applicable to 4.2 branch
+- cleanup bindir renames
+
+* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-9
+- ./configure -xfixes, BR: libXfixes-devel
+
 * Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
 - strip -laudio, -lglib-2.0 from .pc files
 


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qtconfig.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtconfig.desktop	5 Jul 2006 11:38:56 -0000	1.2
+++ qtconfig.desktop	11 Oct 2006 14:47:31 -0000	1.3
@@ -5,4 +5,4 @@
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Application;AdvancedSettings;Settings;



From fedora-extras-commits at redhat.com  Wed Oct 11 15:20:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 08:20:40 -0700
Subject: rpms/libgalago/FC-5 .cvsignore, 1.3, 1.4 libgalago.spec, 1.4,
	1.5 sources, 1.3, 1.4 libgalago-gettext.patch, 1.1, NONE
Message-ID: <200610111520.k9BFKgse005013@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4992

Modified Files:
	.cvsignore libgalago.spec sources 
Removed Files:
	libgalago-gettext.patch 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
- Update to 0.5.2.
- Drop gettext patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 May 2006 23:58:40 -0000	1.3
+++ .cvsignore	11 Oct 2006 15:20:40 -0000	1.4
@@ -1 +1 @@
-libgalago-0.5.1.tar.bz2
+libgalago-0.5.2.tar.bz2


Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgalago.spec	23 Jun 2006 15:07:36 -0000	1.4
+++ libgalago.spec	11 Oct 2006 15:20:40 -0000	1.5
@@ -1,22 +1,18 @@
 Name:		libgalago
-Version:	0.5.1
-Release:	3%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.galago-project.org/
 Source0:	http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-gettext.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-glib
 BuildRequires:	check-devel
 BuildRequires:	gtk-doc
-BuildRequires:	autoconf
-BuildRequires:	libtool
-BuildRequires:	automake
 BuildRequires:	gettext-devel
 
 
@@ -28,21 +24,21 @@
 
 
 %package devel
-Summary:	Development libraries and headers for libgalago
+Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	dbus-devel
 Requires:	dbus-glib
+Requires:	pkgconfig
 Requires:	%{name} = %{version}-%{release}
 
 
 %description devel
-Libararies and header file for developing against libgalago.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .gettext
-./autogen.sh
 
 
 %build
@@ -53,10 +49,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %find_lang %{name}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_datadir}/autopackage/skeletons/@galago.info/%{name}/skeleton.1
 
 
@@ -85,6 +81,10 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
+- Update to 0.5.2.
+- Drop gettext patch.
+
 * Fri Jun 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-3
 - Add BR for autoconf, libtool, & automake.
 - Add devel requires on pkgconfig.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 May 2006 23:58:40 -0000	1.3
+++ sources	11 Oct 2006 15:20:40 -0000	1.4
@@ -1 +1 @@
-9ace3f93505626773b852d2ebbc7d5d6  libgalago-0.5.1.tar.bz2
+47f27f58dd8b0e46d9d2e037c51063ed  libgalago-0.5.2.tar.bz2


--- libgalago-gettext.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 15:24:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 08:24:31 -0700
Subject: rpms/galago-daemon/FC-5 .cvsignore, 1.2, 1.3 galago-daemon.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610111524.k9BFOXiK005103@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/galago-daemon/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5082

Modified Files:
	.cvsignore galago-daemon.spec sources 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:35:03 -0000	1.2
+++ .cvsignore	11 Oct 2006 15:24:31 -0000	1.3
@@ -1 +1 @@
-galago-daemon-0.5.0.tar.bz2
+galago-daemon-0.5.1.tar.gz


Index: galago-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/FC-5/galago-daemon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- galago-daemon.spec	26 May 2006 00:34:53 -0000	1.2
+++ galago-daemon.spec	11 Oct 2006 15:24:31 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           galago-daemon
-Version:        0.5.0
-Release:        3%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Galago presence daemon
 
 Group:		System Environment/Daemons
 License:        GPL
 URL:		http://galago.sourceforge.net/
-Source0:        http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgalago-devel 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+
 * Thu May 25 2006 Brian Pepple <bdpepple at ameritech.net> - 0.5.0-3
 - Rebuild for new libgalago.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galago-daemon/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2006 19:35:03 -0000	1.2
+++ sources	11 Oct 2006 15:24:31 -0000	1.3
@@ -1 +1 @@
-bc74c3ac8c18f4c1a44e43504c59a08f  galago-daemon-0.5.0.tar.bz2
+fdb81f938f86f380b127158ebb542279  galago-daemon-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 15:30:51 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 08:30:51 -0700
Subject: rpms/gaim-galago/FC-5 .cvsignore, 1.2, 1.3 gaim-galago.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610111530.k9BFUr2g005278@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gaim-galago/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5257

Modified Files:
	.cvsignore gaim-galago.spec sources 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.
- Add version required for libgalago.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 18:23:53 -0000	1.2
+++ .cvsignore	11 Oct 2006 15:30:51 -0000	1.3
@@ -1 +1 @@
-gaim-galago-0.5.0.tar.bz2
+gaim-galago-0.5.1.tar.bz2


Index: gaim-galago.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/FC-5/gaim-galago.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaim-galago.spec	24 Sep 2006 05:07:54 -0000	1.2
+++ gaim-galago.spec	11 Oct 2006 15:30:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gaim-galago
-Version:        0.5.0
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Galago feed plugin for Gaim
 
 Group:		System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim
-BuildRequires:	libgalago-devel
+BuildRequires:	libgalago-devel >= 0.5.2
 
 Requires:	gaim
 Requires:	galago-daemon
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+- Add version required for libgalago.
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Correct URL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-galago/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 18:23:53 -0000	1.2
+++ sources	11 Oct 2006 15:30:51 -0000	1.3
@@ -1 +1 @@
-58788373f86dd9f4cdf1f4ee8c7045f0  gaim-galago-0.5.0.tar.bz2
+00f58de5aa7850cceac766757add921a  gaim-galago-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 11 15:58:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 08:58:34 -0700
Subject: rpms/libgalago/devel libgalago.spec,1.9,1.10
Message-ID: <200610111558.k9BFwaII005449@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5432

Modified Files:
	libgalago.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
- Have package own %libdir/galago.



Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgalago.spec	7 Oct 2006 18:49:10 -0000	1.9
+++ libgalago.spec	11 Oct 2006 15:58:34 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -53,6 +53,7 @@
 
 %find_lang %{name}
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/galago
 rm -f $RPM_BUILD_ROOT%{_datadir}/autopackage/skeletons/@galago.info/%{name}/skeleton.1
 
 
@@ -75,12 +76,16 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so
+%dir %{_libdir}/galago
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
+- Have package own %%libdir/galago.
+
 * Sat Oct  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2.
 - Drop gettext patch.



From fedora-extras-commits at redhat.com  Wed Oct 11 16:00:39 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 11 Oct 2006 09:00:39 -0700
Subject: rpms/gv/devel .cvsignore, 1.2, 1.3 gv.spec, 1.8, 1.9 sources, 1.2, 
	1.3 gv-3.6.1-resource.patch, 1.1, NONE
Message-ID: <200610111600.k9BG0fqD005550@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5527

Modified Files:
	.cvsignore gv.spec sources 
Removed Files:
	gv-3.6.1-resource.patch 
Log Message:
Update to 3.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 19:16:38 -0000	1.2
+++ .cvsignore	11 Oct 2006 16:00:39 -0000	1.3
@@ -1 +1 @@
-gv-3.6.1.tar.gz
+gv-3.6.2.tar.gz


Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/gv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gv.spec	30 Aug 2006 02:34:04 -0000	1.8
+++ gv.spec	11 Oct 2006 16:00:39 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
-Version: 3.6.1
-Release: 8%{?dist}
+Version: 3.6.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
 Requires: ghostscript
@@ -9,7 +9,6 @@
 Source0: ftp://ftp.gnu.org/gnu/gv/gv-%{version}.tar.gz
 Patch0: gv-3.5.8-buffer.patch
 Patch1: gv-3.6.1-pkglibdir.patch
-Patch2: gv-3.6.1-resource.patch
 BuildRequires: /usr/bin/makeinfo
 BuildRequires: Xaw3d-devel, /usr/bin/desktop-file-install
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,7 +28,6 @@
 %setup -q
 %patch0 -p1 -b .buffer
 %patch1 -p1 -b .pkglibdir
-%patch2 -p1 -b .resource
 
 
 %build
@@ -103,6 +101,9 @@
 %{_mandir}/man1/gv.*
 
 %changelog
+* Wed Oct 11 2006 Orion Poplawski <orion at cora.nwra.com> 3.6.2-1
+- Update to 3.6.2
+
 * Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> 3.6.1-8
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 19:16:38 -0000	1.2
+++ sources	11 Oct 2006 16:00:39 -0000	1.3
@@ -1 +1 @@
-ace080d647b70f46fca7946e9543b79e  gv-3.6.1.tar.gz
+dcdb2205cf0c61394419e015c7548df1  gv-3.6.2.tar.gz


--- gv-3.6.1-resource.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 16:00:44 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 09:00:44 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.4,1.5
Message-ID: <200610111600.k9BG0ka4005571@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5554

Modified Files:
	eds-feed.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-5
- Remove requires on galago-filesystem, libgalago owns directory.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eds-feed.spec	11 Oct 2006 14:34:54 -0000	1.4
+++ eds-feed.spec	11 Oct 2006 16:00:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -15,7 +15,6 @@
 BuildRequires:	libxml2-devel
 
 Requires:	galago-daemon
-Requires:	galago-filesystem
 
 
 %description
@@ -48,6 +47,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-5
+- Remove requires on galago-filesystem, libgalago owns directory.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-4
 - Require galago-filesystem.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 16:02:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 11 Oct 2006 09:02:43 -0700
Subject: rpms/gv/FC-5 .cvsignore, 1.2, 1.3 gv.spec, 1.7, 1.8 sources, 1.2,
	1.3 gv-3.6.1-resource.patch, 1.1, NONE
Message-ID: <200610111602.k9BG2jMQ008551@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8529

Modified Files:
	.cvsignore gv.spec sources 
Removed Files:
	gv-3.6.1-resource.patch 
Log Message:
Update to 3.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gv/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 19:16:38 -0000	1.2
+++ .cvsignore	11 Oct 2006 16:02:43 -0000	1.3
@@ -1 +1 @@
-gv-3.6.1.tar.gz
+gv-3.6.2.tar.gz


Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/FC-5/gv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gv.spec	13 Feb 2006 18:46:40 -0000	1.7
+++ gv.spec	11 Oct 2006 16:02:43 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
-Version: 3.6.1
-Release: 7%{?dist}
+Version: 3.6.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
 Requires: ghostscript
@@ -9,7 +9,6 @@
 Source0: ftp://ftp.gnu.org/gnu/gv/gv-%{version}.tar.gz
 Patch0: gv-3.5.8-buffer.patch
 Patch1: gv-3.6.1-pkglibdir.patch
-Patch2: gv-3.6.1-resource.patch
 BuildRequires: /usr/bin/makeinfo
 BuildRequires: Xaw3d-devel, /usr/bin/desktop-file-install
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -103,6 +102,9 @@
 %{_mandir}/man1/gv.*
 
 %changelog
+* Wed Oct 11 2006 Orion Poplawski <orion at cora.nwra.com> 3.6.2-1
+- Update to 3.6.2
+
 * Mon Feb 13 2006 Orion Poplawski <orion at cora.nwra.com> 3.6.1-7
 - Rebuild for gcc/glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gv/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 19:16:38 -0000	1.2
+++ sources	11 Oct 2006 16:02:43 -0000	1.3
@@ -1 +1 @@
-ace080d647b70f46fca7946e9543b79e  gv-3.6.1.tar.gz
+dcdb2205cf0c61394419e015c7548df1  gv-3.6.2.tar.gz


--- gv-3.6.1-resource.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 16:03:16 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 11 Oct 2006 09:03:16 -0700
Subject: rpms/gv/FC-5 gv.spec,1.8,1.9
Message-ID: <200610111603.k9BG3mDR008578@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8561

Modified Files:
	gv.spec 
Log Message:
Remove patch2



Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/FC-5/gv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gv.spec	11 Oct 2006 16:02:43 -0000	1.8
+++ gv.spec	11 Oct 2006 16:03:16 -0000	1.9
@@ -28,7 +28,6 @@
 %setup -q
 %patch0 -p1 -b .buffer
 %patch1 -p1 -b .pkglibdir
-%patch2 -p1 -b .resource
 
 
 %build



From fedora-extras-commits at redhat.com  Wed Oct 11 16:07:04 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 09:07:04 -0700
Subject: rpms/libgalago/FC-5 libgalago.spec,1.5,1.6
Message-ID: <200610111607.k9BG7631008712@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8695

Modified Files:
	libgalago.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
- Have package own %libdir/galago.



Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgalago.spec	11 Oct 2006 15:20:40 -0000	1.5
+++ libgalago.spec	11 Oct 2006 16:07:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -53,6 +53,7 @@
 
 %find_lang %{name}
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/galago
 rm -f $RPM_BUILD_ROOT%{_datadir}/autopackage/skeletons/@galago.info/%{name}/skeleton.1
 
 
@@ -75,12 +76,16 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so
+%dir %{_libdir}/galago
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
+- Have package own %%libdir/galago.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2.
 - Drop gettext patch.



From fedora-extras-commits at redhat.com  Wed Oct 11 16:13:01 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 09:13:01 -0700
Subject: rpms/telepathy-feed/devel telepathy-feed.spec,1.1,1.2
Message-ID: <200610111613.k9BGD3Hv008881@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8864

Modified Files:
	telepathy-feed.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-2
- Drop requires on galago-filesystem, libgalago will own directory.



Index: telepathy-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-feed/devel/telepathy-feed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telepathy-feed.spec	11 Oct 2006 14:28:14 -0000	1.1
+++ telepathy-feed.spec	11 Oct 2006 16:13:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           telepathy-feed
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Galago feed for Telepathy
 
 Group:          Applications/Communications
@@ -12,8 +12,6 @@
 BuildRequires:  libtelepathy-devel
 BuildRequires:  libgalago-devel
 
-Requires:       galago-filesystem
-
 
 %description
 A Galago feed for Telepathy
@@ -44,6 +42,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-2
+- Drop requires on galago-filesystem, libgalago will own directory.
+
 * Sun Oct  8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-1
 - Initial FE spec.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 16:41:18 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 09:41:18 -0700
Subject: rpms/eds-feed/FC-5 eds-feed.spec,1.2,1.3
Message-ID: <200610111641.k9BGfKqi009192@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9175

Modified Files:
	eds-feed.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
- Don't own %libdir/galago.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/FC-5/eds-feed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eds-feed.spec	26 Sep 2006 13:58:59 -0000	1.2
+++ eds-feed.spec	11 Oct 2006 16:41:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -41,10 +41,12 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS
-%dir %{_libdir}/galago
 %{_libdir}/galago/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
+- Don't own %%libdir/galago.
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
 - Intial FE spec.



From fedora-extras-commits at redhat.com  Wed Oct 11 17:17:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 10:17:42 -0700
Subject: rpms/qt4/FC-4 qt4.spec,1.13,1.14
Message-ID: <200610111717.k9BHHiGP012278@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12261

Modified Files:
	qt4.spec 
Log Message:
fix symlink handling



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qt4.spec	11 Oct 2006 14:47:31 -0000	1.13
+++ qt4.spec	11 Oct 2006 17:17:42 -0000	1.14
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 11%{?dist}.1
+Release: 11%{?dist}.2
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -297,15 +297,15 @@
 
 ## Make symlinks in %%_bindir
 mkdir -p %{buildroot}%{_bindir}
-pushd %{buildroot}%{qtdir}/bin 
+pushd %{buildroot}%{qtdir}/bin
 for i in *; do
-  case "$i" in
+  case "${i}" in
     assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
-      LINK=${i}-qt4
+      LINK="${i}-qt4"
+      ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
       ;;
     *)
-      LINK=${i}
-      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
+      LINK="${i}"
       ;;
   esac
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -462,7 +462,7 @@
 
 
 %changelog
-* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.1
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.2
 - (re)enable -system-nas-sound on FC-4/x86_64
 
 * Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11



From fedora-extras-commits at redhat.com  Wed Oct 11 17:32:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 10:32:06 -0700
Subject: rpms/libevent/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE libevent.spec, 1.2, NONE needs.rebuild,
	1.1, NONE sources, 1.2, NONE
Message-ID: <200610111732.k9BHW8Vr012403@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libevent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12387

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile libevent.spec needs.rebuild sources 
Log Message:
Moved to Core in FC6.



--- NEW FILE dead.package ---
Moved to Core in FC6.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- libevent.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 18:38:11 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 11:38:11 -0700
Subject: rpms/monotone/FC-5 .cvsignore, 1.9, 1.10 monotone.init, 1.6,
	1.7 monotone.spec, 1.16, 1.17 sources, 1.9, 1.10
Message-ID: <200610111838.k9BIcDZi015719@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15696

Modified Files:
	.cvsignore monotone.init monotone.spec sources 
Log Message:
0.30 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2006 20:25:17 -0000	1.9
+++ .cvsignore	11 Oct 2006 18:38:11 -0000	1.10
@@ -1 +1 @@
-monotone-0.28.tar.gz
+monotone-0.30.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monotone.init	3 Aug 2006 20:25:17 -0000	1.6
+++ monotone.init	11 Oct 2006 18:38:11 -0000	1.7
@@ -80,6 +80,7 @@
         echo -n $"Stopping monotone server: "
         killproc -p $MONOTONE_PIDFILE $MTSERVER
         RETVAL=$?
+	rm -f $MONOTONE_PIDFILE
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
         echo
         ;;
@@ -153,6 +154,7 @@
 	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
 	(umask 027
 	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db regenerate_rosters &&
 	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
 		success $"database check" ||
 		failure $"database check"


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- monotone.spec	3 Aug 2006 21:19:35 -0000	1.16
+++ monotone.spec	11 Oct 2006 18:38:11 -0000	1.17
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.28
-Release: 2%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -164,6 +164,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Roland McGrath <roland at redhat.com> - 0.30-1
+- Updated for 0.30 release.
+- Fix service script to work around buggy init.d/functions. (#198761)
+
 * Thu Aug  3 2006 Roland McGrath <roland at redhat.com> - 0.28-2
 - Updated for 0.28 release. (#198652)
 - Move server PID file into /var/run/monotone subdirectory. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2006 20:25:17 -0000	1.9
+++ sources	11 Oct 2006 18:38:11 -0000	1.10
@@ -1 +1 @@
-8c2e81152e12fed543a8702792232ed3  monotone-0.28.tar.gz
+94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 19:19:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Oct 2006 12:19:15 -0700
Subject: rpms/qt4/FC-5 .cvsignore, 1.6, 1.7 qt4.spec, 1.17,
	1.18 qtconfig.desktop, 1.2, 1.3 sources, 1.4, 1.5
Message-ID: <200610111919.k9BJJHgY019054@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19031

Modified Files:
	.cvsignore qt4.spec qtconfig.desktop sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Aug 2006 12:16:49 -0000	1.6
+++ .cvsignore	11 Oct 2006 19:19:15 -0000	1.7
@@ -1,5 +1,4 @@
 clog
-qt41.spec
+OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
-qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
-qt-x11-opensource-src-4.2.0-snapshot-20060821.tar.bz2
+qt-x11-opensource-src-4.2.0.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qt4.spec	28 Aug 2006 13:38:15 -0000	1.17
+++ qt4.spec	11 Oct 2006 19:19:15 -0000	1.18
@@ -2,15 +2,27 @@
 # Fedora Review
 # http://bugzilla.redhat.com/188180
 
+#define beta rc1
+#define preview -preview
+#define rel %{beta}
+
+#define snap 20060927
+#define beta snapshot-%{snap}
+#define rel  %{snap}
+
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.1.4
-Release: 11%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
 Url:   	 http://www.trolltech.com/products/qt/
-Source0:  ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz
+%if "%{?snap:1}" == "1"
+Source0: ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}%{?beta:-%{beta}}.tar.bz2
+%else
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.gz
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -27,27 +39,24 @@
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
-%define mysql  -no-sql-mysql 
-%if "%{?fedora}" > "3" || "%{?rhel}" > "3"
+#if "%{?fedora}" > "3" || "%{?rhel}" > "3"
 %define mysql  -plugin-sql-mysql
-%endif
+#endif
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
-# 
-%if "%{?fedora}" > "4"
-%define nas     -system-nas-sound
-%endif
-%if "%{?fedora}" == "4"
-# nas unavailable on fc4/x86_64
-%ifnarch x86_64
+
+# undefine to disable these
 %define nas     -system-nas-sound
-%endif
+# watch http://bugzilla.redhat.com/207923 so we may be able to include this on FC-5 someday
+%if "%{?fedora}" > "5"
+%define qdbus	-qdbus
+BuildRequires: dbus-devel >= 0.62
 %endif
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
-# See bug #196901
+# See http://bugzilla.redhat.com/196901
 %define qt_datadir %{_datadir}/%{qt_dirname}
 %define qt_docdir %{_docdir}/%{qt_dirname}
 %define qt_headerdir %{_includedir} 
@@ -73,10 +82,11 @@
 BuildRequires: libungif-devel
 BuildRequires: freetype-devel
 BuildRequires: zlib-devel
+BuildRequires: glib2-devel
 
 %define x_deps libGL-devel libGLU-devel
 %if "%{?fedora}" > "4"
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -106,6 +116,8 @@
 #BuildRequires: sqlite-devel
 %endif
 
+BuildConflicts: qt4-devel
+
 Obsoletes: %{name}-config < %{version}-%{release}
 Provides:  %{name}-config = %{version}-%{release}
 
@@ -190,16 +202,19 @@
 
 
 %prep
-%setup -q -n qt-x11-opensource-src-%{version}
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}
 
 %patch1 -p1 -b .assistant4
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-# add -fno-strict-aliasing, for now
-%if "%{?fedora}" > "4"
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%endif
+
+## Looks like we don't need this anymore -- Rex
+# add -fno-strict-aliasing, for now (fc6+)
+#if "%{?fedora}" > "5"
+#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+#endif
+
 # use $RPM_OPT_FLAGS for our platform
 %if "%{_lib}" == "lib64"
 %define platform linux-g++-64
@@ -207,10 +222,11 @@
 %define platform linux-g++
 %endif
 sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf
+sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/common/*.conf ||:
 
 # undefine QMAKE_STRIP, so we get useful -debuginfo pkgs
 sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|" mkspecs/linux-g++*/qmake.conf
-#sed -i  -e "s|= strip$|= |g" mkspecs/linux-g++*/qmake.conf
+sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|" mkspecs/common/*.conf ||:
 
 # set correct lib path
 if [ "%{_lib}" == "lib64" ] ; then
@@ -221,6 +237,11 @@
 
 %build
 
+# There's a bug in the qdbus build somewhere, but we'll hack around it here for now -- Rex
+%if "%{?qdbus}" == "-qdbus"
+LD_RUN_PATH=$(pwd)/lib;export LD_RUN_PATH
+%endif
+
 # build shared, threaded (default) libraries
 echo yes | ./configure -v \
   -prefix %{qtdir} \
@@ -240,6 +261,7 @@
   -qt-gif \
   -no-reduce-exports \
   -no-rpath \
+  -no-separate-debug-info \
   -sm \
   -stl \
   -system-libmng \
@@ -248,15 +270,18 @@
   -system-zlib \
   -tablet \
   -xcursor \
+  -xfixes \
   -xinerama \
   -xshape \
   -xrandr \
   -xrender \
   -xkb \
+  -glib \
+  %{?qdbus} %{!?qdbus:-no-qdbus} \
   %{?nas} %{!?nas:-no-nas-sound} \
-  %{?mysql}  %{?mysql_include} %{?mysql_ldflags} \
-  %{?psql}   \
-  %{?odbc}   \
+  %{?mysql} %{?mysql_include} %{?mysql_ldflags} \
+  %{?psql} \
+  %{?odbc} \
   %{?sqlite} 
 
 make %{?_smp_mflags}
@@ -277,7 +302,7 @@
 ## pkg-config
 # strip extraneous dirs/libraries -- Rex
 # safe ones
-for dep in -laudio -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
+for dep in -laudio -ldbus-1 -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
   -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
@@ -306,13 +331,13 @@
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{qtdir}/bin 
 for i in *; do
-  case "$i" in
+  case "${i}" in
     assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
-      LINK=${i}-qt4
+      LINK="${i}-qt4"
+      ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
       ;;
     *)
-      LINK=${i}
-      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
+      LINK="${i}"
       ;;
   esac
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -349,7 +374,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README* changes*
+%doc README* 
 %{!?beta:%doc OPENSOURCE-NOTICE.TXT}
 %{qtdir}/LICENSE.*
 %if "%{qt_libdir}" != "%{_libdir}"
@@ -360,6 +385,9 @@
 %dir %{qtdir}/bin/
 %dir %{qt_datadir}
 %{qt_libdir}/libQtCore.so.*
+%if "%{?qdbus}" == "-qdbus"
+%{qt_libdir}/libQtDBus.so.*
+%endif
 %{qt_libdir}/libQtNetwork.so.*
 %{qt_libdir}/libQtSql.so.*
 %{qt_libdir}/libQtTest.so.*
@@ -374,9 +402,12 @@
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%{qtdir}/plugins/accessible/
-%{qtdir}/plugins/imageformats/
-%{qtdir}/plugins/inputmethods/
+%if "%{version}" >= "4.2.0"
+%{qt_libdir}/libQtAssistantClient.so.*
+%endif
+%{qtdir}/plugins/*
+%exclude %{qtdir}/plugins/designer
+%exclude %{qtdir}/plugins/sqldrivers
 #-config bits
 %{qtdir}/bin/qt*config*
 %{_bindir}/qt*config*
@@ -391,12 +422,18 @@
 %{qtdir}/bin/qm2ts*
 %{_bindir}/qm2ts*
 %endif
+%if "%{?qdbus}" == "-qdbus"
+%{qtdir}/bin/qdbus*
+%{_bindir}/qdbus*
+%endif
+%{qtdir}/bin/pixeltool*
 %{qtdir}/bin/qmake*
 %{qtdir}/bin/qt3to4
 %{qtdir}/bin/rcc*
 %{qtdir}/bin/uic*
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
+%{_bindir}/pixeltool*
 %{_bindir}/moc*
 %{_bindir}/qmake*
 %{_bindir}/qt3to4
@@ -412,7 +449,7 @@
 %{qt_libdir}/libQtDesigner.so.*
 %{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
-# 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
+# remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
 %{qt_libdir}/libQt*.prl
 %{_libdir}/pkgconfig/*.pc
@@ -469,23 +506,45 @@
 
 
 %changelog
-* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11
-- backout xfixes mod(s), only applicable to 4.2 branch
-- cleanup bindir renames
+* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+- 4.2.0(final)
 
-* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-9
-- ./configure -xfixes, BR: libXfixes-devel
+* Thu Sep 28 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-0.9.20060927
+- update to 4.2.0-snapshot-20060927
+- update QDBus executable names
+- -x11: exclude plugins/designer (which belong to -devel)
+- BuildConflicts: qt4-devel
+- drop -fno-strict-aliasing hack (fc5+)
+
+* Wed Sep 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.8.rc1
+- qtconfig.desktop: Categories=+AdvancedSettings;Settings
+
+* Fri Sep 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.7.rc1
+- 4.2.0-rc1
+
+* Fri Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.6.20060821
+- update to 4.2.0-snapshot-20060821 (same as today's qt-copy)
+- -no-separate-debug-info
+- - ./configure -xfixes, BR: libXfixes-devel
+
+* Mon Aug 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.5.tp1
+- fix empty -debuginfo
+- use $RPM_OPT_FLAGS
 
-* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
-- strip -laudio, -lglib-2.0 from .pc files
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.4.tp1
+- strip -laudio, -ldbus-1, -lglib-2.0 from .pc files
 
-* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-7
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.3.tp1
 - -no-reduce-exports (for now)
 - -fno-strict-aliasing (fc5+)
 
-* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-6
-- make buildable on legacy releases
-- -system-nas-sound (bug #197937) 
+* Fri Jul 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.2.tp1
+- -system-nas-sound, BR: nas-devel (bug # 197937)
+- -qdbus (fc6+, BR: dbus-devel >= 0.62)
+- -glib (BR: glib2-devel)
+
+* Fri Jun 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.1.tp1
+- 4.2.0-tp1 (technology preview 1)
 
 * Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-5
 - make FHS-friendly (bug #196901)


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qtconfig.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtconfig.desktop	5 Jul 2006 11:38:23 -0000	1.2
+++ qtconfig.desktop	11 Oct 2006 19:19:15 -0000	1.3
@@ -5,4 +5,4 @@
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Application;AdvancedSettings;Settings;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2006 12:16:49 -0000	1.4
+++ sources	11 Oct 2006 19:19:15 -0000	1.5
@@ -1,2 +1 @@
-88f8c9c4622108baca2950baac3c02d6  qt-x11-opensource-src-4.1.4.tar.gz
-099a99d1b72b4be752fe0e211bc32dcf  qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
+2c062a125d5ca66397e3430ba537fbec  qt-x11-opensource-src-4.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 19:27:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:27:54 -0700
Subject: owners owners.list,1.1819,1.1820
Message-ID: <200610111927.k9BJRuJp019165@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19148

Modified Files:
	owners.list 
Log Message:
gtk2hs has been unorphaned for a while.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1819
retrieving revision 1.1820
diff -u -r1.1819 -r1.1820
--- owners.list	11 Oct 2006 14:31:22 -0000	1.1819
+++ owners.list	11 Oct 2006 19:27:54 -0000	1.1820
@@ -611,7 +611,7 @@
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|gtk2hs|A Haskell binding of Gtk+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|petersen at redhat.com
+Fedora Extras|gtk2hs|A Haskell binding of Gtk+|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtkdatabox|GTK+ widget for fast data display|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglarea2|An OpenGL GTK widget|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 19:32:12 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 12:32:12 -0700
Subject: rpms/monotone/FC-4 .cvsignore, 1.9, 1.10 monotone.init, 1.9,
	1.10 monotone.spec, 1.19, 1.20 sources, 1.9, 1.10
Message-ID: <200610111932.k9BJWipN019242@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19219

Modified Files:
	.cvsignore monotone.init monotone.spec sources 
Log Message:
0.30 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2006 20:28:04 -0000	1.9
+++ .cvsignore	11 Oct 2006 19:32:12 -0000	1.10
@@ -1 +1 @@
-monotone-0.28.tar.gz
+monotone-0.30.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- monotone.init	3 Aug 2006 20:28:04 -0000	1.9
+++ monotone.init	11 Oct 2006 19:32:12 -0000	1.10
@@ -80,6 +80,7 @@
         echo -n $"Stopping monotone server: "
         killproc -p $MONOTONE_PIDFILE $MTSERVER
         RETVAL=$?
+	rm -f $MONOTONE_PIDFILE
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
         echo
         ;;
@@ -153,6 +154,7 @@
 	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
 	(umask 027
 	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db regenerate_rosters &&
 	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
 		success $"database check" ||
 		failure $"database check"


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- monotone.spec	3 Aug 2006 22:23:54 -0000	1.19
+++ monotone.spec	11 Oct 2006 19:32:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.28
-Release: 2%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -164,6 +164,10 @@
 
 
 %changelog
+* Tue Oct 10 2006 Roland McGrath <roland at redhat.com> - 0.30-1
+- Updated for 0.30 release.
+- Fix service script to work around buggy init.d/functions. (#198761)
+
 * Thu Aug  3 2006 Roland McGrath <roland at redhat.com> - 0.28-2
 - Updated for 0.28 release. (#198652)
 - Move server PID file into /var/run/monotone subdirectory. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2006 20:28:04 -0000	1.9
+++ sources	11 Oct 2006 19:32:12 -0000	1.10
@@ -1 +1 @@
-8c2e81152e12fed543a8702792232ed3  monotone-0.28.tar.gz
+94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 19:33:15 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 12:33:15 -0700
Subject: rpms/monotone/devel .cvsignore, 1.9, 1.10 monotone.init, 1.6,
	1.7 monotone.spec, 1.16, 1.17 sources, 1.9, 1.10
Message-ID: <200610111933.k9BJXHTx019307@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19282

Modified Files:
	.cvsignore monotone.init monotone.spec sources 
Log Message:
0.30 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2006 20:28:49 -0000	1.9
+++ .cvsignore	11 Oct 2006 19:33:15 -0000	1.10
@@ -1 +1 @@
-monotone-0.28.tar.gz
+monotone-0.30.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monotone.init	3 Aug 2006 20:28:49 -0000	1.6
+++ monotone.init	11 Oct 2006 19:33:15 -0000	1.7
@@ -80,6 +80,7 @@
         echo -n $"Stopping monotone server: "
         killproc -p $MONOTONE_PIDFILE $MTSERVER
         RETVAL=$?
+	rm -f $MONOTONE_PIDFILE
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
         echo
         ;;
@@ -153,6 +154,7 @@
 	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
 	(umask 027
 	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db regenerate_rosters &&
 	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
 		success $"database check" ||
 		failure $"database check"


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- monotone.spec	8 Sep 2006 20:52:46 -0000	1.16
+++ monotone.spec	11 Oct 2006 19:33:15 -0000	1.17
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.28
-Release: 3%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -164,8 +164,9 @@
 
 
 %changelog
-* Fri Sep  8 2006 Roland McGrath <roland at redhat.com> - 0.28-3
-- FC6 mass rebuild
+* Tue Oct 10 2006 Roland McGrath <roland at redhat.com> - 0.30-1
+- Updated for 0.30 release.
+- Fix service script to work around buggy init.d/functions. (#198761)
 
 * Thu Aug  3 2006 Roland McGrath <roland at redhat.com> - 0.28-2
 - Updated for 0.28 release. (#198652)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2006 20:28:49 -0000	1.9
+++ sources	11 Oct 2006 19:33:15 -0000	1.10
@@ -1 +1 @@
-8c2e81152e12fed543a8702792232ed3  monotone-0.28.tar.gz
+94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 19:43:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:43:47 -0700
Subject: owners owners.list,1.1820,1.1821
Message-ID: <200610111943.k9BJhn09019411@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19394

Modified Files:
	owners.list 
Log Message:
libmatchbox, silky orphaned in http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1820
retrieving revision 1.1821
diff -u -r1.1820 -r1.1821
--- owners.list	11 Oct 2006 19:27:54 -0000	1.1820
+++ owners.list	11 Oct 2006 19:43:47 -0000	1.1821
@@ -883,7 +883,7 @@
 Fedora Extras|liblo|Open Sound Control library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|liblrdf|Library for manipulating RDF files describing LADSPA plugins|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmatheval|Library for parsing and evaluating symbolic expressions input as text|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmatroska|An open Audio/Video container format|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -2045,7 +2045,7 @@
 Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|SIBsim4|Align expressed RNA sequences on a DNA template|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
-Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|sipsak|SIP swiss army knife|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 19:52:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:52:03 -0700
Subject: rpms/silky/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1,
	NONE silky-0.5.4-desktop.patch, 1.1, NONE silky.spec, 1.6,
	NONE sources, 1.4, NONE
Message-ID: <200610111952.k9BJq5mS019538@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/silky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19505/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild silky-0.5.4-desktop.patch 
	silky.spec sources 
Log Message:
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html



--- NEW FILE dead.package ---
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- silky-0.5.4-desktop.patch DELETED ---


--- silky.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 19:52:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:52:02 -0700
Subject: rpms/silky/FC-5 dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 
	1.2, NONE branch, 1.1, NONE silky-0.5.4-desktop.patch, 1.1,
	NONE silky.spec, 1.6, NONE sources, 1.4, NONE
Message-ID: <200610111952.k9BJq4vd019535@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/silky/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19505/FC-5

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch silky-0.5.4-desktop.patch 
	silky.spec sources 
Log Message:
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html



--- NEW FILE dead.package ---
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- silky-0.5.4-desktop.patch DELETED ---


--- silky.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 19:54:19 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 12:54:19 -0700
Subject: rpms/monotone/FC-5 monotone.spec,1.17,1.18
Message-ID: <200610111954.k9BJsLaR019629@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19598/FC-5

Modified Files:
	monotone.spec 
Log Message:
update boost buildreq


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- monotone.spec	11 Oct 2006 18:38:11 -0000	1.17
+++ monotone.spec	11 Oct 2006 19:54:19 -0000	1.18
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
-BuildRequires: boost-devel >= 1.32.0
+BuildRequires: boost-devel >= 1.33.1
 %if 1
 %define bundled_sqlite yes
 %else



From fedora-extras-commits at redhat.com  Wed Oct 11 19:54:20 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Wed, 11 Oct 2006 12:54:20 -0700
Subject: rpms/monotone/devel monotone.spec,1.17,1.18
Message-ID: <200610111954.k9BJsMw1019633@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19598/devel

Modified Files:
	monotone.spec 
Log Message:
update boost buildreq


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- monotone.spec	11 Oct 2006 19:33:15 -0000	1.17
+++ monotone.spec	11 Oct 2006 19:54:20 -0000	1.18
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
-BuildRequires: boost-devel >= 1.32.0
+BuildRequires: boost-devel >= 1.33.1
 %if 1
 %define bundled_sqlite yes
 %else



From fedora-extras-commits at redhat.com  Wed Oct 11 19:54:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:54:26 -0700
Subject: rpms/libmatchbox/FC-5 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE libmatchbox.spec, 1.2,
	NONE sources, 1.2, NONE
Message-ID: <200610111954.k9BJsSLm019669@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmatchbox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19639/FC-5

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch libmatchbox.spec sources 
Log Message:
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html
(and never actually shipped in any FE repo?)



--- NEW FILE dead.package ---
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html
(and never actually shipped in any FE repo?)


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- libmatchbox.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 19:54:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 12:54:27 -0700
Subject: rpms/libmatchbox/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE libmatchbox.spec, 1.2,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610111954.k9BJsTuO019672@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libmatchbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19639/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile libmatchbox.spec needs.rebuild sources 
Log Message:
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html
(and never actually shipped in any FE repo?)



--- NEW FILE dead.package ---
http://www.redhat.com/archives/fedora-extras-list/2006-September/msg00404.html
(and never actually shipped in any FE repo?)


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- libmatchbox.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 20:04:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 13:04:23 -0700
Subject: rpms/icmpdn/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE icmpdn.spec, 1.1, NONE needs.rebuild,
	1.1, NONE sources, 1.2, NONE
Message-ID: <200610112004.k9BK4PmJ022640@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/icmpdn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22607/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile icmpdn.spec needs.rebuild sources 
Log Message:
Not shipped since FE4.



--- NEW FILE dead.package ---
Not shipped since FE4.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- icmpdn.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 20:04:22 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 13:04:22 -0700
Subject: rpms/icmpdn/FC-5 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE icmpdn.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200610112004.k9BK4OCc022637@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/icmpdn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22607/FC-5

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch icmpdn.spec sources 
Log Message:
Not shipped since FE4.



--- NEW FILE dead.package ---
Not shipped since FE4.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- icmpdn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 20:05:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 13:05:35 -0700
Subject: owners owners.list,1.1821,1.1822
Message-ID: <200610112005.k9BK5ba2022733@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22716

Modified Files:
	owners.list 
Log Message:
icmpdn has not been around since FE4.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1821
retrieving revision 1.1822
diff -u -r1.1821 -r1.1822
--- owners.list	11 Oct 2006 19:43:47 -0000	1.1821
+++ owners.list	11 Oct 2006 20:05:35 -0000	1.1822
@@ -681,7 +681,7 @@
 Fedora Extras|ibmonitor|Interactive bandwidth monitor|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|icecast|ShoutCast compatible streaming media server|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ices|Source streaming for Icecast|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|icmpdn|ICMP host name utilities|fredrik at dolda2000.com|extras-qa at fedoraproject.org|
+Fedora Extras|icmpdn|ICMP host name utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 11 20:06:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 13:06:20 -0700
Subject: rpms/libgalago-gtk/FC-5 libgalago-gtk.spec,1.1,1.2
Message-ID: <200610112006.k9BK6MZ6022761@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago-gtk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22744

Modified Files:
	libgalago-gtk.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
- Rebuild for new libgalago.



Index: libgalago-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago-gtk/FC-5/libgalago-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgalago-gtk.spec	23 Sep 2006 16:23:38 -0000	1.1
+++ libgalago-gtk.spec	11 Oct 2006 20:06:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libgalago-gtk
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ widgets for the Galago presence framework
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-3
+- Rebuild for new libgalago.
+
 * Sat Sep 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
 - Preserve timestamps of header files.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:24:23 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 11 Oct 2006 13:24:23 -0700
Subject: rpms/blender/FC-5 blender.spec,1.29,1.30
Message-ID: <200610112024.k9BKOPpd022895@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22878

Modified Files:
	blender.spec 
Log Message:
Fix wrote paths for locale


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-5/blender.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- blender.spec	17 Sep 2006 19:00:01 -0000	1.29
+++ blender.spec	11 Oct 2006 20:24:23 -0000	1.30
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	2%{?dist}.1
+Release: 	3%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -97,6 +97,12 @@
 
 cp -a release/scripts/bpydata ${RPM_BUILD_ROOT}/%{blenderlib}
 cp -a release/scripts ${RPM_BUILD_ROOT}/%{blenderlib}
+
+pushd bin/.blender/locale
+mv pt_br pt_BR
+mv zh_cn zh_CN
+popd
+
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
 
 install -p -D -m 644 release/scripts/*.py ${RPM_BUILD_ROOT}/%{blenderlib}
@@ -154,6 +160,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-3
+- Correct invalid locale paths (#210209)
+
 * Sun Sep 17 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-2.1
 - Rebuilt to solve broken update deps
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:27:26 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 11 Oct 2006 13:27:26 -0700
Subject: rpms/blender/devel blender.spec,1.30,1.31
Message-ID: <200610112027.k9BKRSnI022958@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22941

Modified Files:
	blender.spec 
Log Message:
Fix wrote paths for locale


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- blender.spec	13 Sep 2006 17:23:00 -0000	1.30
+++ blender.spec	11 Oct 2006 20:27:26 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -97,6 +97,12 @@
 
 cp -a release/scripts/bpydata ${RPM_BUILD_ROOT}/%{blenderlib}
 cp -a release/scripts ${RPM_BUILD_ROOT}/%{blenderlib}
+
+pushd bin/.blender/locale
+mv pt_br pt_BR
+mv zh_cn uh_CN
+popd
+
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
 
 install -p -D -m 644 release/scripts/*.py ${RPM_BUILD_ROOT}/%{blenderlib}
@@ -154,6 +160,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-3
+- Correct invalid locale paths (#210209)
+
 * Wed Sep 13 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-2
 - Update to new upstream release
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:33:04 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 11 Oct 2006 13:33:04 -0700
Subject: rpms/optipng/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200610112033.k9BKX6iE023082@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23058

Modified Files:
	.cvsignore sources 
Log Message:
fixing sources?



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Oct 2006 20:24:32 -0000	1.1
+++ .cvsignore	11 Oct 2006 20:33:03 -0000	1.2
@@ -0,0 +1 @@
+optipng-0.5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Oct 2006 20:24:32 -0000	1.1
+++ sources	11 Oct 2006 20:33:03 -0000	1.2
@@ -0,0 +1 @@
+8d989971e674a06b55e17fc5b70c41aa  optipng-0.5.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 20:33:59 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 11 Oct 2006 13:33:59 -0700
Subject: rpms/ejabberd/devel ejabberd.logrotate, 1.1, 1.2 ejabberd.spec, 1.5,
	1.6
Message-ID: <200610112034.k9BKY26Y023137@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23118

Modified Files:
	ejabberd.logrotate ejabberd.spec 
Log Message:
Fix logrotate script.


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd.logrotate	23 Jun 2006 12:40:03 -0000	1.1
+++ ejabberd.logrotate	11 Oct 2006 20:33:59 -0000	1.2
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log >/dev/null 2>/dev/null || true
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ejabberd.spec	8 Oct 2006 04:22:54 -0000	1.5
+++ ejabberd.spec	11 Oct 2006 20:33:59 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.2-2
+- Fix logrotate script (BZ#210366)
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:35:19 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 11 Oct 2006 13:35:19 -0700
Subject: rpms/ejabberd/FC-5 ejabberd.logrotate, 1.1, 1.2 ejabberd.spec, 1.4,
	1.5
Message-ID: <200610112035.k9BKZLuX023205@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23186

Modified Files:
	ejabberd.logrotate ejabberd.spec 
Log Message:
Fix logrotate script.


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd.logrotate	23 Jun 2006 12:40:03 -0000	1.1
+++ ejabberd.logrotate	11 Oct 2006 20:35:18 -0000	1.2
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log >/dev/null 2>/dev/null || true
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejabberd.spec	8 Oct 2006 04:24:02 -0000	1.4
+++ ejabberd.spec	11 Oct 2006 20:35:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.2-2
+- Fix logrotate script (BZ#210366)
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:36:08 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 11 Oct 2006 13:36:08 -0700
Subject: rpms/ejabberd/FC-4 ejabberd.logrotate, 1.1, 1.2 ejabberd.spec, 1.4,
	1.5
Message-ID: <200610112036.k9BKaAIL023275@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ejabberd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23256

Modified Files:
	ejabberd.logrotate ejabberd.spec 
Log Message:
Fix logrotate script.


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/ejabberd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd.logrotate	23 Jun 2006 12:40:03 -0000	1.1
+++ ejabberd.logrotate	11 Oct 2006 20:36:08 -0000	1.2
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log >/dev/null 2>/dev/null || true
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-4/ejabberd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejabberd.spec	8 Oct 2006 04:24:45 -0000	1.4
+++ ejabberd.spec	11 Oct 2006 20:36:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.2-2
+- Fix logrotate script (BZ#210366)
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:38:24 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 11 Oct 2006 13:38:24 -0700
Subject: rpms/optipng/devel optipng.spec,1.2,1.3
Message-ID: <200610112038.k9BKcQe3023345@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23328

Modified Files:
	optipng.spec 
Log Message:
bumping release to retag and build because source was not added correctly by import script



Index: optipng.spec
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/optipng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- optipng.spec	10 Oct 2006 20:30:10 -0000	1.2
+++ optipng.spec	11 Oct 2006 20:38:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           optipng
 Version:        0.5.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A PNG optimizer and converter
 
 Group:          Applications/Multimedia
@@ -48,6 +48,8 @@
 
 
 %changelog
+* Wed Oct 11 2006 Till Maas <opensource[AT]till.name> - 0.5.4-3
+- bumping release because of errors while importing to extras
 * Tue Oct 10 2006 Till Maas <opensource[AT]till.name> - 0.5.4-2
 - shortening Summary
 * Thu Sep 14 2006 Till Maas <opensource[AT]till.name> - 0.5.4-1



From fedora-extras-commits at redhat.com  Wed Oct 11 20:57:43 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 11 Oct 2006 13:57:43 -0700
Subject: rpms/lincvs/FC-5 crossvc.spec,1.2,1.3
Message-ID: <200610112057.k9BKvjqg023532@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23515

Modified Files:
	crossvc.spec 
Log Message:
Fix broken startup script


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-5/crossvc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crossvc.spec	9 Oct 2006 18:25:36 -0000	1.2
+++ crossvc.spec	11 Oct 2006 20:57:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -9,7 +9,7 @@
 URL:              http://www.lincvs.org
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cvs >= 0:1.9.0
 BuildRequires:    qt-devel >= 1:3.3
@@ -41,7 +41,7 @@
 
 cat <<'EOF' >lincvs.sh
 #!/bin/sh
-exec %{_libdir}/LinCVS/AppRun $@
+exec %{_libdir}/CrossVC/AppRun $@
 EOF
 
 %build
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-4
+- Fix startup script (#210309)
+
 * Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
 - Add Provides and Obsolete tag (#209917)
 



From fedora-extras-commits at redhat.com  Wed Oct 11 20:58:29 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 11 Oct 2006 13:58:29 -0700
Subject: rpms/lincvs/devel crossvc.spec,1.2,1.3
Message-ID: <200610112058.k9BKwVZ6023597@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23580

Modified Files:
	crossvc.spec 
Log Message:
Fix broken startup script


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/crossvc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crossvc.spec	9 Oct 2006 18:24:47 -0000	1.2
+++ crossvc.spec	11 Oct 2006 20:58:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -9,7 +9,7 @@
 URL:              http://www.lincvs.org
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cvs >= 0:1.9.0
 BuildRequires:    qt-devel >= 1:3.3
@@ -41,7 +41,7 @@
 
 cat <<'EOF' >lincvs.sh
 #!/bin/sh
-exec %{_libdir}/LinCVS/AppRun $@
+exec %{_libdir}/CrossVC/AppRun $@
 EOF
 
 %build
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-4
+- Fix startup script (#210309)
+
 * Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
 - Add Provides and Obsolete tag (#209917)
 



From fedora-extras-commits at redhat.com  Wed Oct 11 21:00:37 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:00:37 -0700
Subject: rpms/netmask/devel .cvsignore, 1.3, 1.4 netmask.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200610112100.k9BL0dv3023688@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23667

Modified Files:
	.cvsignore netmask.spec sources 
Log Message:
* Wed Oct 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.8-1
- 2.3.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netmask/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:53:47 -0000	1.3
+++ .cvsignore	11 Oct 2006 21:00:37 -0000	1.4
@@ -1 +1 @@
-netmask_2.3.7.tar.gz
+netmask_2.3.8.tar.gz


Index: netmask.spec
===================================================================
RCS file: /cvs/extras/rpms/netmask/devel/netmask.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- netmask.spec	2 Sep 2006 09:51:57 -0000	1.10
+++ netmask.spec	11 Oct 2006 21:00:37 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           netmask
-Version:        2.3.7
-Release:        6%{?dist}
+Version:        2.3.8
+Release:        1%{?dist}
 Summary:        Utility for determining network masks
 
 Group:          Applications/Internet
@@ -53,7 +53,7 @@
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
-if [ $1 -eq 0 ]; then
+if [ $1 -eq 0 ] ; then
   /sbin/install-info --delete %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 fi
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.8-1
+- 2.3.8.
+
 * Sat Sep  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.7-6
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netmask/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:53:47 -0000	1.3
+++ sources	11 Oct 2006 21:00:37 -0000	1.4
@@ -1 +1 @@
-6e1b1c0694296bbe37ba8cb6a4902436  netmask_2.3.7.tar.gz
+78e627fd1c014851ad144c31b2d882b0  netmask_2.3.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 21:06:59 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Wed, 11 Oct 2006 14:06:59 -0700
Subject: rpms/mediawiki/devel .cvsignore, 1.5, 1.6 mediawiki.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200610112107.k9BL71CU026761@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26740

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
Update mediawiki to 1.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Oct 2006 14:04:05 -0000	1.5
+++ .cvsignore	11 Oct 2006 21:06:58 -0000	1.6
@@ -1 +1 @@
-mediawiki-1.8.0.tar.gz
+mediawiki-1.8.1.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mediawiki.spec	11 Oct 2006 14:04:05 -0000	1.6
+++ mediawiki.spec	11 Oct 2006 21:06:58 -0000	1.7
@@ -1,8 +1,8 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        3%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
 Group:          Applications/Internet
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.1-3
+- Update to 1.8.1.
+
 * Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.0-2
 - Update to 1.8.0.
 - And php-gd, diffutils, ImageMagick as dependencies


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Oct 2006 14:04:05 -0000	1.5
+++ sources	11 Oct 2006 21:06:58 -0000	1.6
@@ -1 +1 @@
-9141eba6b8faf17fe80edeb7699cfca4  mediawiki-1.8.0.tar.gz
+9693c36a139715c9984495cb6ebc5646  mediawiki-1.8.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 11 21:30:57 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:30:57 -0700
Subject: rpms/alsa-firmware/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE alsa-firmware.spec, 1.5,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112130.k9BLUxdE027363@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/alsa-firmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/alsa-firmware/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile alsa-firmware.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- alsa-firmware.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:03 -0700
Subject: rpms/amaya/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.2, NONE amaya-9.1-64bits.patch, 1.6,
	NONE amaya-9.1-configure.diff, 1.2, NONE amaya.png, 1.1,
	NONE amaya.spec, 1.30, NONE needs.rebuild, 1.1, NONE sources,
	1.4, NONE
Message-ID: <200610112131.k9BLV5IR027395@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/amaya/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile amaya-9.1-64bits.patch 
	amaya-9.1-configure.diff amaya.png amaya.spec needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- amaya-9.1-64bits.patch DELETED ---


--- amaya-9.1-configure.diff DELETED ---


--- amaya.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:04 -0700
Subject: rpms/blam/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE blam-aclocal.m4-ngettext.patch, 1.1,
	NONE blam-gtk-sharp2-gecko-sharp2.patch, 1.1, NONE blam.spec,
	1.2, NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLV6Kv027398@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/blam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/blam/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile blam-aclocal.m4-ngettext.patch 
	blam-gtk-sharp2-gecko-sharp2.patch blam.spec needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- blam-aclocal.m4-ngettext.patch DELETED ---


--- blam-gtk-sharp2-gecko-sharp2.patch DELETED ---


--- blam.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:30:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:30:58 -0700
Subject: rpms/alsa-tools/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.2, NONE alsa-tools.spec, 1.10,
	NONE needs.rebuild, 1.1, NONE sources, 1.6, NONE
Message-ID: <200610112131.k9BLV0HX027366@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/alsa-tools/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile alsa-tools.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- alsa-tools.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:10 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:10 -0700
Subject: rpms/cfs/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 
	1.2, NONE cfs-1.4.1-rpm.patch, 1.1, NONE cfs-INSTALL, 1.2,
	NONE cfs-blowfish.patch, 1.1, NONE cfs-root.patch, 1.1,
	NONE cfs.spec, 1.12, NONE cfs_1.4.1-cfix.patch, 1.5,
	NONE cfs_1.4.1-opt.patch, 1.1, NONE cfs_1.4.1-ret.patch, 1.1,
	NONE cfsd.init, 1.1, NONE cfsd.sysconfig, 1.1, NONE mcrypt, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVChR027456@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/cfs/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile cfs-1.4.1-rpm.patch cfs-INSTALL 
	cfs-blowfish.patch cfs-root.patch cfs.spec 
	cfs_1.4.1-cfix.patch cfs_1.4.1-opt.patch cfs_1.4.1-ret.patch 
	cfsd.init cfsd.sysconfig mcrypt needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- cfs-1.4.1-rpm.patch DELETED ---


--- cfs-INSTALL DELETED ---


--- cfs-blowfish.patch DELETED ---


--- cfs-root.patch DELETED ---


--- cfs.spec DELETED ---


--- cfs_1.4.1-cfix.patch DELETED ---


--- cfs_1.4.1-opt.patch DELETED ---


--- cfs_1.4.1-ret.patch DELETED ---


--- cfsd.init DELETED ---


--- cfsd.sysconfig DELETED ---


--- mcrypt DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:12 -0700
Subject: rpms/ecore/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE ecore-0.9.9.023-noex.patch, 1.1,
	NONE ecore-0.9.9.023-novera.patch, 1.1, NONE ecore.spec, 1.5,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVE0V027460@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ecore/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/ecore/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile ecore-0.9.9.023-noex.patch 
	ecore-0.9.9.023-novera.patch ecore.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- ecore-0.9.9.023-noex.patch DELETED ---


--- ecore-0.9.9.023-novera.patch DELETED ---


--- ecore.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:10 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:10 -0700
Subject: rpms/camstream/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.2, NONE camstream-0.26.3-x86_64-asm.patch, 1.1,
	NONE camstream-makefiles.patch, 1.1, NONE camstream.desktop, 1.1,
	NONE camstream.png, 1.1, NONE camstream.spec, 1.11,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVC4r027451@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/camstream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/camstream/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile camstream-0.26.3-x86_64-asm.patch 
	camstream-makefiles.patch camstream.desktop camstream.png 
	camstream.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- camstream-0.26.3-x86_64-asm.patch DELETED ---


--- camstream-makefiles.patch DELETED ---


--- camstream.desktop DELETED ---


--- camstream.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:11 -0700
Subject: rpms/doulos-fonts/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE doulos-fonts.spec, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVDnx027459@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/doulos-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/doulos-fonts/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile doulos-fonts.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- doulos-fonts.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:17 -0700
Subject: rpms/edb/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 
	1.1, NONE edb.spec, 1.14, NONE needs.rebuild, 1.1, NONE sources,
	1.6, NONE
Message-ID: <200610112131.k9BLVKfq027491@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/edb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/edb/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile edb.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- edb.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:18 -0700
Subject: rpms/edje/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 
	1.1, NONE edje-0.5.0.023-novera.patch, 1.1, NONE edje.spec, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVKV5027494@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/edje/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/edje/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile edje-0.5.0.023-novera.patch edje.spec 
	needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- edje-0.5.0.023-novera.patch DELETED ---


--- edje.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:24 -0700
Subject: rpms/embryo/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE embryo.spec, 1.2, NONE needs.rebuild,
	1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVQ0B027552@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/embryo/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile embryo.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- embryo.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:26 -0700
Subject: rpms/fonttools/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE fonttools-20050315-20050624.patch, 1.1,
	NONE fonttools-unsigned-ranges.patch, 1.1, NONE fonttools.spec,
	1.4, NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVSDB027558@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fonttools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/fonttools/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile fonttools-20050315-20050624.patch 
	fonttools-unsigned-ranges.patch fonttools.spec needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- fonttools-20050315-20050624.patch DELETED ---


--- fonttools-unsigned-ranges.patch DELETED ---


--- fonttools.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:24 -0700
Subject: rpms/eet/devel dead.package, NONE, 1.1 .cvsignore, 1.5,
	NONE Makefile, 
	1.1, NONE eet-0.9.10.023-gcc4.patch, 1.1, NONE eet.spec, 1.8,
	NONE needs.rebuild, 1.1, NONE sources, 1.5, NONE
Message-ID: <200610112131.k9BLVQGl027547@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/eet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/eet/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile eet-0.9.10.023-gcc4.patch eet.spec 
	needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- eet-0.9.10.023-gcc4.patch DELETED ---


--- eet.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:25 -0700
Subject: rpms/evas/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 
	1.1, NONE evas-0.9.9.023-novera.patch, 1.1, NONE evas.spec, 1.5,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVRb9027555@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/evas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/evas/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile evas-0.9.9.023-novera.patch evas.spec 
	needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- evas-0.9.9.023-novera.patch DELETED ---


--- evas.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:32 -0700
Subject: rpms/gfontview/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE gfontview-0.5.0-gcc4.patch, 1.1,
	NONE gfontview-0.5.0-makefile.patch, 1.1, NONE gfontview.spec,
	1.3, NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVYOb027600@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gfontview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/gfontview/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gfontview-0.5.0-gcc4.patch 
	gfontview-0.5.0-makefile.patch gfontview.spec needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gfontview-0.5.0-gcc4.patch DELETED ---


--- gfontview-0.5.0-makefile.patch DELETED ---


--- gfontview.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:33 -0700
Subject: rpms/gourmet/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.1, NONE gourmet-0.10.1-hu.po.patch, 1.1,
	NONE gourmet-0.10.1-pt_BR.po.patch, 1.1, NONE gourmet.spec, 1.6,
	NONE needs.rebuild, 1.1, NONE nutritionDruid.glade, 1.1,
	NONE sources, 1.5, NONE
Message-ID: <200610112131.k9BLVZ8H027616@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gourmet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/gourmet/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gourmet-0.10.1-hu.po.patch 
	gourmet-0.10.1-pt_BR.po.patch gourmet.spec needs.rebuild 
	nutritionDruid.glade sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gourmet-0.10.1-hu.po.patch DELETED ---


--- gourmet-0.10.1-pt_BR.po.patch DELETED ---


--- gourmet.spec DELETED ---


--- needs.rebuild DELETED ---


--- nutritionDruid.glade DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:33 -0700
Subject: rpms/gtkhtml36/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE gtkhtml-3.3.0-crash.patch, 1.1,
	NONE gtkhtml36.spec, 1.3, NONE needs.rebuild, 1.1, NONE sources,
	1.2, NONE
Message-ID: <200610112131.k9BLVZgd027619@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/gtkhtml36/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gtkhtml-3.3.0-crash.patch gtkhtml36.spec 
	needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gtkhtml-3.3.0-crash.patch DELETED ---


--- gtkhtml36.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:34 -0700
Subject: rpms/gtranslator/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.2, NONE gtranslator.spec, 1.9,
	NONE needs.rebuild, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVaKM027622@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gtranslator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/gtranslator/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gtranslator.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gtranslator.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:40 -0700
Subject: rpms/lcdf-typetools/devel dead.package, NONE, 1.1 .cvsignore, 1.5, 
	NONE Makefile, 1.1, NONE lcdf-typetools.spec, 1.6,
	NONE needs.rebuild, 1.1, NONE sources, 1.5, NONE
Message-ID: <200610112131.k9BLVgYO027651@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lcdf-typetools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/lcdf-typetools/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile lcdf-typetools.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- lcdf-typetools.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:47 -0700
Subject: rpms/nucleo/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE nucleo-0.5-64bit.patch, 1.1, NONE nucleo-0.5-gcc.patch, 1.1,
	NONE nucleo.spec, 1.7, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVna7027704@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/nucleo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/nucleo/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild nucleo-0.5-64bit.patch 
	nucleo-0.5-gcc.patch nucleo.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- nucleo-0.5-64bit.patch DELETED ---


--- nucleo-0.5-gcc.patch DELETED ---


--- nucleo.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:40 -0700
Subject: rpms/lcov/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE lcov-1.4-gcda-suffix.patch, 1.1,
	NONE lcov-1.4-lcovrc.patch, 1.1, NONE lcov.spec, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVgNX027655@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lcov/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/lcov/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile lcov-1.4-gcda-suffix.patch 
	lcov-1.4-lcovrc.patch lcov.spec needs.rebuild sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- lcov-1.4-gcda-suffix.patch DELETED ---


--- lcov-1.4-lcovrc.patch DELETED ---


--- lcov.spec DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:46 -0700
Subject: rpms/MagicPoint/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE MagicPoint.spec, 1.3, NONE Makefile, 1.1,
	NONE magicpoint-1.08a-redhat.patch, 1.1,
	NONE magicpoint-1.09a-rpath.patch, 1.1,
	NONE magicpoint-1.10a-fix-gcc34.patch, 1.1,
	NONE magicpoint-1.10a-fix-usleep.patch, 1.1,
	NONE magicpoint-1.10a-longline.patch, 1.1,
	NONE magicpoint-1.11a-fix-gcc-warnings.patch, 1.1,
	NONE magicpoint-1.11b-fix-undefined-operation.patch, 1.1,
	NONE needs.rebuild, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVmEr027701@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/MagicPoint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/MagicPoint/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore MagicPoint.spec Makefile 
	magicpoint-1.08a-redhat.patch magicpoint-1.09a-rpath.patch 
	magicpoint-1.10a-fix-gcc34.patch 
	magicpoint-1.10a-fix-usleep.patch 
	magicpoint-1.10a-longline.patch 
	magicpoint-1.11a-fix-gcc-warnings.patch 
	magicpoint-1.11b-fix-undefined-operation.patch needs.rebuild 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- MagicPoint.spec DELETED ---


--- Makefile DELETED ---


--- magicpoint-1.08a-redhat.patch DELETED ---


--- magicpoint-1.09a-rpath.patch DELETED ---


--- magicpoint-1.10a-fix-gcc34.patch DELETED ---


--- magicpoint-1.10a-fix-usleep.patch DELETED ---


--- magicpoint-1.10a-longline.patch DELETED ---


--- magicpoint-1.11a-fix-gcc-warnings.patch DELETED ---


--- magicpoint-1.11b-fix-undefined-operation.patch DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:48 -0700
Subject: rpms/polyxmass-common/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE polyxmass-common.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVohu027707@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/polyxmass-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/polyxmass-common/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild polyxmass-common.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- polyxmass-common.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:55 -0700
Subject: rpms/repoml/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE repoml.spec,
	1.3, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVvTk027782@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/repoml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/repoml/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild repoml.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- repoml.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:54 -0700
Subject: rpms/polyxmass-doc/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE polyxmass-doc.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <200610112131.k9BLVuPM027772@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/polyxmass-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/polyxmass-doc/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild polyxmass-doc.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- polyxmass-doc.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:55 -0700
Subject: rpms/quadkonsole/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE quadkonsole.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610112131.k9BLVv9r027779@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/quadkonsole/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/quadkonsole/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild quadkonsole.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- quadkonsole.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:56 -0700
Subject: rpms/rkhunter/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1,
	NONE rkhunter-1.1.8-showfiles.patch, 1.1,
	NONE rkhunter-1.1.9-shared_man_search.patch, 1.1,
	NONE rkhunter-1.2.7-append_log.patch, 1.1,
	NONE rkhunter-1.2.7-datestamp.patch, 1.1,
	NONE rkhunter-1.2.7-group_log.patch, 1.1,
	NONE rkhunter-1.2.7-manpage.patch, 1.1,
	NONE rkhunter-1.2.8-app_check_default.patch, 1.1,
	NONE rkhunter-1.2.8-default_settings-conf.patch, 1.1,
	NONE rkhunter.spec, 1.9, NONE sources, 1.6, NONE
Message-ID: <200610112131.k9BLVwCa027785@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rkhunter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/rkhunter/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild 
	rkhunter-1.1.8-showfiles.patch 
	rkhunter-1.1.9-shared_man_search.patch 
	rkhunter-1.2.7-append_log.patch rkhunter-1.2.7-datestamp.patch 
	rkhunter-1.2.7-group_log.patch rkhunter-1.2.7-manpage.patch 
	rkhunter-1.2.8-app_check_default.patch 
	rkhunter-1.2.8-default_settings-conf.patch rkhunter.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- rkhunter-1.1.8-showfiles.patch DELETED ---


--- rkhunter-1.1.9-shared_man_search.patch DELETED ---


--- rkhunter-1.2.7-append_log.patch DELETED ---


--- rkhunter-1.2.7-datestamp.patch DELETED ---


--- rkhunter-1.2.7-group_log.patch DELETED ---


--- rkhunter-1.2.7-manpage.patch DELETED ---


--- rkhunter-1.2.8-app_check_default.patch DELETED ---


--- rkhunter-1.2.8-default_settings-conf.patch DELETED ---


--- rkhunter.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:31:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:31:53 -0700
Subject: rpms/polyxmass-data/devel dead.package, NONE, 1.1 .cvsignore, 1.2, 
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE polyxmass-data.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200610112132.k9BLVtir027762@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/polyxmass-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/polyxmass-data/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild polyxmass-data.spec sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- polyxmass-data.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:02 -0700
Subject: rpms/rpmDirectoryCheck/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1,
	NONE rpmDirectoryCheck.spec, 1.7, NONE sources, 1.2, NONE
Message-ID: <200610112132.k9BLW4sB027843@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmDirectoryCheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/rpmDirectoryCheck/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild rpmDirectoryCheck.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- rpmDirectoryCheck.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:04 -0700
Subject: rpms/straw/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE straw-desktop.patch, 1.1, NONE straw.spec, 1.7, NONE
Message-ID: <200610112132.k9BLW63l027862@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/straw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/straw/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources straw-desktop.patch 
	straw.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- straw-desktop.patch DELETED ---


--- straw.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:02 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:02 -0700
Subject: rpms/scim-chinese-standard/devel dead.package, NONE, 1.1 .cvsignore,
	1.2, NONE Makefile, 1.1, NONE needs.rebuild, 1.1,
	NONE scim-chinese-standard.spec, 1.6, NONE sources, 1.5, NONE
Message-ID: <200610112132.k9BLW4Oq027851@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/scim-chinese-standard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/scim-chinese-standard/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild scim-chinese-standard.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- scim-chinese-standard.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:18 -0700
Subject: rpms/system-config-control/devel dead.package, NONE, 1.1 .cvsignore,
	1.2, NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources,
	1.6, NONE system-config-control.spec, 1.7, NONE
Message-ID: <200610112132.k9BLWLPv027889@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/system-config-control/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources 
	system-config-control.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- system-config-control.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:04 -0700
Subject: rpms/spicctrl/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE spicctrl.spec, 1.3, NONE
Message-ID: <200610112132.k9BLW6JL027859@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/spicctrl/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources spicctrl.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- spicctrl.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:21 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:21 -0700
Subject: rpms/tetex-fontools/devel dead.package, NONE, 1.1 .cvsignore, 1.2, 
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE tetex-fontools.spec, 1.1, NONE
Message-ID: <200610112132.k9BLWN9G027900@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/tetex-fontools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/tetex-fontools/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources tetex-fontools.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- tetex-fontools.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:27 -0700
Subject: rpms/translate-toolkit/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources, 1.4,
	NONE translate-toolkit.spec, 1.7, NONE
Message-ID: <200610112132.k9BLWTNj027953@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/translate-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/translate-toolkit/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources 
	translate-toolkit.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- translate-toolkit.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:27 -0700
Subject: rpms/ttf2pt1/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE ttf2pt1-3.4.3-makefile.patch, 1.1,
	NONE ttf2pt1-3.4.3-manpages.patch, 1.1,
	NONE ttf2pt1-3.4.4-ft2.patch, 1.1, NONE ttf2pt1.spec, 1.8, NONE
Message-ID: <200610112132.k9BLWTaL027958@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ttf2pt1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/ttf2pt1/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources 
	ttf2pt1-3.4.3-makefile.patch ttf2pt1-3.4.3-manpages.patch 
	ttf2pt1-3.4.4-ft2.patch ttf2pt1.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- ttf2pt1-3.4.3-makefile.patch DELETED ---


--- ttf2pt1-3.4.3-manpages.patch DELETED ---


--- ttf2pt1-3.4.4-ft2.patch DELETED ---


--- ttf2pt1.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:28 -0700
Subject: rpms/v2strip/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE needs.rebuild, 1.1, NONE sources, 1.2,
	NONE v2strip.spec, 1.1, NONE
Message-ID: <200610112132.k9BLWU84027961@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/v2strip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/v2strip/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources v2strip.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- v2strip.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:29 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:29 -0700
Subject: rpms/zoo/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1, NONE sources, 1.3,
	NONE zoo-2.10-CAN-2005-2349.patch, 1.1,
	NONE zoo-2.10-febz-183426.patch, 1.1,
	NONE zoo-2.10-tempfile.patch, 1.1, NONE zoo-gcc.patch, 1.1,
	NONE zoo-return.patch, 1.1, NONE zoo-security_pathsize.patch,
	1.1, NONE zoo.patch, 1.1, NONE zoo.spec, 1.11, NONE
Message-ID: <200610112132.k9BLWV7h027964@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/zoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/zoo/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild sources 
	zoo-2.10-CAN-2005-2349.patch zoo-2.10-febz-183426.patch 
	zoo-2.10-tempfile.patch zoo-gcc.patch zoo-return.patch 
	zoo-security_pathsize.patch zoo.patch zoo.spec 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- sources DELETED ---


--- zoo-2.10-CAN-2005-2349.patch DELETED ---


--- zoo-2.10-febz-183426.patch DELETED ---


--- zoo-2.10-tempfile.patch DELETED ---


--- zoo-gcc.patch DELETED ---


--- zoo-return.patch DELETED ---


--- zoo-security_pathsize.patch DELETED ---


--- zoo.patch DELETED ---


--- zoo.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 21:46:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:46:05 -0700
Subject: comps comps-fe6.xml.in,1.184,1.185
Message-ID: <200610112146.k9BLk7JY028044@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28025

Modified Files:
	comps-fe6.xml.in 
Log Message:
Remove no longer available packages: amaya, camstream, cfs, fonttools,
gfontview, gourmet, lcov, MagicPoint, silky, straw, system-config-control



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- comps-fe6.xml.in	10 Oct 2006 21:08:09 -0000	1.184
+++ comps-fe6.xml.in	11 Oct 2006 21:46:05 -0000	1.185
@@ -13,7 +13,6 @@
       <packagereq type="optional">lat</packagereq>
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
-      <packagereq type="optional">system-config-control</packagereq>
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
   </group>
@@ -74,7 +73,6 @@
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">efont-unicode-bdf</packagereq>
-      <packagereq type="optional">fonttools</packagereq>
       <packagereq type="optional">FreeWnn</packagereq>
       <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">rss-glx</packagereq>
@@ -154,7 +152,6 @@
       <packagereq type="optional">ipython</packagereq>
       <packagereq type="optional">jam</packagereq>
       <packagereq type="optional">kuipc</packagereq>
-      <packagereq type="optional">lcov</packagereq>
       <packagereq type="optional">lightning</packagereq>
       <packagereq type="optional">lincvs</packagereq>
       <packagereq type="optional">lua</packagereq>
@@ -447,7 +444,6 @@
       <packagereq type="optional">byzanz</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">gdesklets</packagereq>
-      <packagereq type="optional">gfontview</packagereq>
       <packagereq type="optional">glipper</packagereq>
       <packagereq type="optional">glunarclock</packagereq>
       <packagereq type="optional">gmpc</packagereq>
@@ -517,7 +513,6 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="optional">amaya</packagereq>
       <packagereq type="optional">amsn</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">azureus</packagereq>
@@ -563,8 +558,6 @@
       <packagereq type="optional">putty</packagereq>
       <packagereq type="optional">rssowl</packagereq>
       <packagereq type="optional">screem</packagereq>
-      <packagereq type="optional">silky</packagereq>
-      <packagereq type="optional">straw</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
@@ -807,7 +800,6 @@
       <packagereq type="optional">glabels</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gnumeric</packagereq>
-      <packagereq type="optional">gourmet</packagereq>
       <packagereq type="optional">gramps</packagereq>
       <packagereq type="optional">grisbi</packagereq>
       <packagereq type="optional">gsview</packagereq>
@@ -815,7 +807,6 @@
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">lyx</packagereq>
-      <packagereq type="optional">MagicPoint</packagereq>
       <packagereq type="optional">notecase</packagereq>
       <packagereq type="optional">notemeister</packagereq>
       <packagereq type="optional">pybliographer</packagereq>
@@ -845,7 +836,6 @@
       <packagereq type="optional">bin2iso</packagereq>
       <packagereq type="optional">bmp</packagereq>
       <packagereq type="optional">camE</packagereq>
-      <packagereq type="optional">camstream</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
       <packagereq type="optional">easytag</packagereq>
@@ -895,7 +885,6 @@
       <packagereq type="optional">bochs</packagereq>
       <packagereq type="optional">cabextract</packagereq>
       <packagereq type="optional">cfengine</packagereq>
-      <packagereq type="optional">cfs</packagereq>
       <packagereq type="optional">chrpath</packagereq>
       <packagereq type="optional">conman</packagereq>
       <packagereq type="optional">connect-proxy</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 11 21:32:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 14:32:03 -0700
Subject: rpms/scribus-templates/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.2, NONE needs.rebuild, 1.1,
	NONE scribus-templates.spec, 1.7, NONE sources, 1.3, NONE
Message-ID: <200610112132.k9BLW5tg027858@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/scribus-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301/scribus-templates/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile needs.rebuild scribus-templates.spec 
	sources 
Log Message:
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild



--- NEW FILE dead.package ---
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- needs.rebuild DELETED ---


--- scribus-templates.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 11 22:35:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 15:35:37 -0700
Subject: rpms/libgalago/FC-5 libgalago.spec,1.6,1.7
Message-ID: <200610112235.k9BMZd42031217@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31200

Modified Files:
	libgalago.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-3
- Actually put the libdir in the correct package.



Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libgalago.spec	11 Oct 2006 16:07:04 -0000	1.6
+++ libgalago.spec	11 Oct 2006 22:35:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -71,18 +71,21 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_libdir}/%{name}.so.*
+%dir %{_libdir}/galago
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so
-%dir %{_libdir}/galago
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-3
+- Actually put the libdir in the correct package.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
 - Have package own %%libdir/galago.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 22:37:47 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 15:37:47 -0700
Subject: rpms/libgalago/devel libgalago.spec,1.10,1.11
Message-ID: <200610112237.k9BMbn8U031288@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libgalago/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31271

Modified Files:
	libgalago.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-3
- Actually put the libdir in the correct package.



Index: libgalago.spec
===================================================================
RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgalago.spec	11 Oct 2006 15:58:34 -0000	1.10
+++ libgalago.spec	11 Oct 2006 22:37:47 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -71,18 +71,21 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_libdir}/%{name}.so.*
+%dir %{_libdir}/galago
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so
-%dir %{_libdir}/galago
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_datadir}/gtk-doc/html/%{name}
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-3
+- Actually put the libdir in the correct package.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
 - Have package own %%libdir/galago.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 22:46:54 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 11 Oct 2006 15:46:54 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 telepathy-gabble.spec, 1.8, 1.9
Message-ID: <200610112246.k9BMkuDh031412@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31391

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.11-1
- Update to 0.3.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Oct 2006 19:31:49 -0000	1.8
+++ .cvsignore	11 Oct 2006 22:46:54 -0000	1.9
@@ -1 +1 @@
-telepathy-gabble-0.3.10.tar.gz
+telepathy-gabble-0.3.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Oct 2006 19:31:49 -0000	1.8
+++ sources	11 Oct 2006 22:46:54 -0000	1.9
@@ -1 +1 @@
-2d68597d5624d687ae0f67a8bd40be98  telepathy-gabble-0.3.10.tar.gz
+a76a36d33374e339a25760678e4baae9  telepathy-gabble-0.3.11.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- telepathy-gabble.spec	5 Oct 2006 19:31:49 -0000	1.8
+++ telepathy-gabble.spec	11 Oct 2006 22:46:54 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.10
+Version:        0.3.11
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.11-1
+- Update to 0.3.11.
+
 * Thu Oct  5 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.10-1
 - Update to 0.3.10.
 



From fedora-extras-commits at redhat.com  Wed Oct 11 23:00:58 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 11 Oct 2006 16:00:58 -0700
Subject: rpms/tclabc/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tclabc.spec,
	1.1, 1.2
Message-ID: <200610112301.k9BN10HU031753@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tclabc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31714/FC-5

Modified Files:
	.cvsignore sources tclabc.spec 
Log Message:
new version 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclabc/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Sep 2006 19:01:19 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:00:58 -0000	1.3
@@ -1 +1 @@
-tclabc-1.0.7.tar.gz
+tclabc-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclabc/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2006 19:01:19 -0000	1.2
+++ sources	11 Oct 2006 23:00:58 -0000	1.3
@@ -1 +1 @@
-34dbcb0177e11888d23ca7fa2304fb17  tclabc-1.0.7.tar.gz
+492cf4af7db7631204abfc70e43cb395  tclabc-1.0.8.tar.gz


Index: tclabc.spec
===================================================================
RCS file: /cvs/extras/rpms/tclabc/FC-5/tclabc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclabc.spec	28 Sep 2006 19:01:19 -0000	1.1
+++ tclabc.spec	11 Oct 2006 23:00:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tclabc
-Version:        1.0.7
-Release:        3%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        A Tcl interface and a Tk GUI to the ABC notation
 
 Group:          Applications/Multimedia
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.8-1
+- new version 1.0.8
+
 * Thu Sep 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-3
 - added BR alsa-lib-devel
 - converted files from iso-8859-1 to utf-8



From fedora-extras-commits at redhat.com  Wed Oct 11 23:00:59 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 11 Oct 2006 16:00:59 -0700
Subject: rpms/tclabc/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tclabc.spec,
	1.1, 1.2
Message-ID: <200610112301.k9BN11bw031761@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tclabc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31714/devel

Modified Files:
	.cvsignore sources tclabc.spec 
Log Message:
new version 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclabc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Sep 2006 19:01:19 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:00:59 -0000	1.3
@@ -1 +1 @@
-tclabc-1.0.7.tar.gz
+tclabc-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclabc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2006 19:01:19 -0000	1.2
+++ sources	11 Oct 2006 23:00:59 -0000	1.3
@@ -1 +1 @@
-34dbcb0177e11888d23ca7fa2304fb17  tclabc-1.0.7.tar.gz
+492cf4af7db7631204abfc70e43cb395  tclabc-1.0.8.tar.gz


Index: tclabc.spec
===================================================================
RCS file: /cvs/extras/rpms/tclabc/devel/tclabc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclabc.spec	28 Sep 2006 19:01:19 -0000	1.1
+++ tclabc.spec	11 Oct 2006 23:00:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tclabc
-Version:        1.0.7
-Release:        3%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        A Tcl interface and a Tk GUI to the ABC notation
 
 Group:          Applications/Multimedia
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.8-1
+- new version 1.0.8
+
 * Thu Sep 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-3
 - added BR alsa-lib-devel
 - converted files from iso-8859-1 to utf-8



From fedora-extras-commits at redhat.com  Wed Oct 11 23:15:20 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 11 Oct 2006 16:15:20 -0700
Subject: rpms/util-vserver/devel sources, 1.8, 1.9 util-vserver.spec, 1.20,
	1.21
Message-ID: <200610112315.k9BNFMse002381@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2362

Modified Files:
	sources util-vserver.spec 
Log Message:
updated to 0.30.211


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Jan 2006 20:08:43 -0000	1.8
+++ sources	11 Oct 2006 23:15:20 -0000	1.9
@@ -1,2 +1,2 @@
-1e8fff7cb6246d21ed029f082123019b  util-vserver-0.30.210.tar.bz2
-46625942d7064edeaa167ae5525694b7  util-vserver-0.30.210.tar.bz2.asc
+b0e8d503ba1cf5a7014eb41a72ec8fe2  util-vserver-0.30.211.tar.bz2
+400c5fad81a029dc88fb03485a9a503e  util-vserver-0.30.211.tar.bz2.asc


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- util-vserver.spec	4 Oct 2006 22:58:30 -0000	1.20
+++ util-vserver.spec	11 Oct 2006 23:15:20 -0000	1.21
@@ -20,8 +20,8 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.210
-Release: %release_func 5
+Version:	0.30.211
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -351,8 +351,11 @@
 
 
 %changelog
+* Thu Oct 12 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.211-1
+- updated to 0.30.211
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.30.210-5
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-4
 - rebuilt



From fedora-extras-commits at redhat.com  Wed Oct 11 23:34:26 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Wed, 11 Oct 2006 16:34:26 -0700
Subject: rpms/facter/devel .cvsignore, 1.2, 1.3 facter.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610112334.k9BNYSaj002538@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2517

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jul 2006 00:51:59 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:34:26 -0000	1.3
@@ -1 +1 @@
-facter-1.3.3.tgz
+facter-1.3.5.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- facter.spec	13 Sep 2006 09:32:14 -0000	1.2
+++ facter.spec	11 Oct 2006 23:34:26 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.3
-Release: 2%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
@@ -52,6 +52,12 @@
 
 
 %changelog
+* Tue Oct 10 2006 David Lutterkort <dlutter at redhat.com> - 1.3.5-1
+- New version
+
+* Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 1.3.4-1
+- New version
+
 * Wed Sep 13 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-2
 - Rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jul 2006 00:51:59 -0000	1.2
+++ sources	11 Oct 2006 23:34:26 -0000	1.3
@@ -1 +1 @@
-49c5e1a293138cb5b93667f82ae28e89  facter-1.3.3.tgz
+e7a6abaee07603cbd79a30cb9b55b484  facter-1.3.5.tgz



From fedora-extras-commits at redhat.com  Wed Oct 11 23:34:42 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 11 Oct 2006 16:34:42 -0700
Subject: rpms/util-vserver/FC-5 sources,1.8,1.9 util-vserver.spec,1.17,1.18
Message-ID: <200610112334.k9BNYiEY002598@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2575

Modified Files:
	sources util-vserver.spec 
Log Message:
updated to 0.30.211; added graphviz BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Jan 2006 20:08:43 -0000	1.8
+++ sources	11 Oct 2006 23:34:42 -0000	1.9
@@ -1,2 +1,2 @@
-1e8fff7cb6246d21ed029f082123019b  util-vserver-0.30.210.tar.bz2
-46625942d7064edeaa167ae5525694b7  util-vserver-0.30.210.tar.bz2.asc
+b0e8d503ba1cf5a7014eb41a72ec8fe2  util-vserver-0.30.211.tar.bz2
+400c5fad81a029dc88fb03485a9a503e  util-vserver-0.30.211.tar.bz2.asc


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-5/util-vserver.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- util-vserver.spec	20 Feb 2006 18:02:01 -0000	1.17
+++ util-vserver.spec	11 Oct 2006 23:34:42 -0000	1.18
@@ -19,8 +19,8 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.210
-Release:	%release_func 2
+Version:	0.30.211
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -36,7 +36,7 @@
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
-BuildRequires:	doxygen tetex-latex
+BuildRequires:	doxygen tetex-latex graphviz
 ## HACK; 'make check' fails there due to a kernel bug
 ## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389
 ExcludeArch:	ppc
@@ -350,6 +350,10 @@
 
 
 %changelog
+* Thu Oct 12 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.211-1
+- updated to 0.30.211
+- added graphviz BR
+
 * Mon Feb 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-2
 - rebuilt for FC5
 



From fedora-extras-commits at redhat.com  Wed Oct 11 23:35:58 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Wed, 11 Oct 2006 16:35:58 -0700
Subject: rpms/facter/FC-5 .cvsignore, 1.2, 1.3 facter.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610112336.k9BNa0Md002641@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2620

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jul 2006 00:51:59 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:35:58 -0000	1.3
@@ -1 +1 @@
-facter-1.3.3.tgz
+facter-1.3.5.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-5/facter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- facter.spec	12 Jul 2006 00:51:59 -0000	1.1
+++ facter.spec	11 Oct 2006 23:35:58 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.3
+Version: 1.3.5
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -52,6 +52,15 @@
 
 
 %changelog
+* Tue Oct 10 2006 David Lutterkort <dlutter at redhat.com> - 1.3.5-1
+- New version
+
+* Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 1.3.4-1
+- New version
+
+* Wed Sep 13 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-2
+- Rebuilt for FC6
+
 * Wed Jun 28 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-1
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jul 2006 00:51:59 -0000	1.2
+++ sources	11 Oct 2006 23:35:58 -0000	1.3
@@ -1 +1 @@
-49c5e1a293138cb5b93667f82ae28e89  facter-1.3.3.tgz
+e7a6abaee07603cbd79a30cb9b55b484  facter-1.3.5.tgz



From fedora-extras-commits at redhat.com  Wed Oct 11 23:38:17 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Wed, 11 Oct 2006 16:38:17 -0700
Subject: rpms/facter/FC-4 .cvsignore, 1.2, 1.3 facter.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610112338.k9BNcJEN002717@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2696

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jul 2006 00:51:59 -0000	1.2
+++ .cvsignore	11 Oct 2006 23:38:17 -0000	1.3
@@ -1 +1 @@
-facter-1.3.3.tgz
+facter-1.3.5.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-4/facter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- facter.spec	12 Jul 2006 00:51:59 -0000	1.1
+++ facter.spec	11 Oct 2006 23:38:17 -0000	1.2
@@ -2,7 +2,7 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.3
+Version: 1.3.5
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -52,6 +52,15 @@
 
 
 %changelog
+* Tue Oct 10 2006 David Lutterkort <dlutter at redhat.com> - 1.3.5-1
+- New version
+
+* Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 1.3.4-1
+- New version
+
+* Wed Sep 13 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-2
+- Rebuilt for FC6
+
 * Wed Jun 28 2006 David Lutterkort <dlutter at redhat.com> - 1.3.3-1
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jul 2006 00:51:59 -0000	1.2
+++ sources	11 Oct 2006 23:38:17 -0000	1.3
@@ -1 +1 @@
-49c5e1a293138cb5b93667f82ae28e89  facter-1.3.3.tgz
+e7a6abaee07603cbd79a30cb9b55b484  facter-1.3.5.tgz



From fedora-extras-commits at redhat.com  Thu Oct 12 00:18:39 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Wed, 11 Oct 2006 17:18:39 -0700
Subject: accounts2 fedoraGroup.schema, 1.1, 1.2 fedoraMembership.schema, 1.1,
	1.2 fedoraPerson.schema, 1.2, 1.3
Message-ID: <200610120018.k9C0Idfb005841@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5819

Modified Files:
	fedoraGroup.schema fedoraMembership.schema fedoraPerson.schema 
Log Message:
it actually loads in openldap now



Index: fedoraGroup.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraGroup.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedoraGroup.schema	27 Sep 2006 01:17:49 -0000	1.1
+++ fedoraGroup.schema	12 Oct 2006 00:18:37 -0000	1.2
@@ -7,29 +7,41 @@
 #joinmsg 
 
 
-attributeType ( 2.5.4.41 NAME 'owner'
+attributeType ( 2.5.444.10 NAME 'groupowner'
                 DESC 'group owner'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
 
-attributeType ( 2.5.4.41 NAME 'group_type'
+attributeType ( 2.5.444.11 NAME 'grouptype'
                 DESC 'the type of group'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'needs_sponsor'
+attributeType ( 2.5.444.12 NAME 'needssponsor'
                 DESC 'boolean indicating whether or not the group needs a sponsor'
-                EQUALITY caseIgnoreMatch
+                EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.4.41 NAME 'user_can_remove'
+attributeType ( 2.5.444.13 NAME 'usercanremove'
                 DESC 'boolean indicating whether or not the user can remove the group'
-                EQUALITY caseIgnoreMatch
+                EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.4.41 NAME 'joing_msg'
-                DESC message received upon joining the group'
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
\ No newline at end of file
+attributeType ( 2.5.444.14 NAME 'joinmsg'
+                DESC 'message received upon joining the group'
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
+
+
+objectclass	( 2.5.555.3
+    NAME 'fedoraGroup'
+	DESC 'A object describing a group entry'
+    STRUCTURAL
+	MAY (
+		joinmsg $ usercanremove $ grouptype $ needssponsor $ 
+		usercanremove )
+	)
+	MUST ( 
+		cn $ groupowner )


Index: fedoraMembership.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraMembership.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedoraMembership.schema	27 Sep 2006 01:17:49 -0000	1.1
+++ fedoraMembership.schema	12 Oct 2006 00:18:37 -0000	1.2
@@ -9,46 +9,61 @@
 #sponsor (points to the sponsor's DN) 
 #creation (date) 
 #approval (date) 
+#don't have a name use cn instead
+#attributeType ( 2.5.444.1 NAME 'name'
+#                DESC 'group name'
+#                EQUALITY caseIgnoreMatch
+#                SUBSTR caseIgnoreSubstringsMatch
+#                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'name'
-                DESC 'group name'
-                EQUALITY caseIgnoreMatch
-                SUBSTR caseIgnoreSubstringsMatch
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
-
-attributeType ( 2.5.4.41 NAME 'role_type'
+attributeType ( 2.5.444.2 NAME 'roletype'
                 DESC 'the type of membership role'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
 
 
-attributeType ( 2.5.4.41 NAME 'role_status'
+attributeType ( 2.5.444.15 NAME 'roledomain'
+                DESC 'the domain of this role'
+                EQUALITY caseIgnoreMatch
+                SUBSTR caseIgnoreSubstringsMatch
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
+
+attributeType ( 2.5.444.3 NAME 'rolestatus'
                 DESC 'the approval status of this role'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
 
 
-attributeType ( 2.5.4.41 NAME 'internal_comments'
+attributeType ( 2.5.444.4 NAME 'internalcomments'
                  DESC 'group membership comments'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
 
 
-attributeType ( 2.5.4.41 NAME 'sponsor'
+attributeType ( 2.5.444.5 NAME 'sponsor'
                 DESC 'membership sponsor'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
 
-attributeType ( 2.5.4.41 NAME 'creation_date'
-                DESC 'membership creation_date'
+attributeType ( 2.5.444.6 NAME 'creationdate'
+                DESC 'membership creation date'
                 EQUALITY integerMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
-attributeType ( 2.5.4.41 NAME 'approval_date'
-                DESC 'membership creation_date'
+attributeType ( 2.5.444.7 NAME 'approvaldate'
+                DESC 'membership approval date'
                 EQUALITY integerMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 	
 
 
-
+objectclass	( 2.5.555.2
+    NAME 'fedoraMembership'
+	DESC 'An object describing a persons memebership'
+    STRUCTURAL
+	MAY (
+		approvaldate $ creationdate $ approvaldate $ roletype $
+		rolestatus $ roledomain $ internalcomments $ sponsor )
+	)
+	MUST ( 
+		cn  )


Index: fedoraPerson.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraPerson.schema,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedoraPerson.schema	2 Oct 2006 02:46:31 -0000	1.2
+++ fedoraPerson.schema	12 Oct 2006 00:18:37 -0000	1.3
@@ -2,24 +2,24 @@
 #it is based on the inetOrgPerson shema, but has some spicific
 #attribues added onto it for use by the Account system
 #for now this is the contents
-#ssh_key
-attributeType ( 2.5.4.41 NAME 'ssh_key'
+#sshkey bugzillaemail
+attributeType ( 2.5.444.8 NAME 'sshkey'
                 DESC 'ssh key for this memeber'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'bugzilla_email'
-                DESC 'members preferred bugzilla email address'
-		EQUALITY caseIgnoreIA5Match
-		SUBSTR caseIgnoreIA5SubstringsMatch
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
+attributeType ( 2.5.444.9 NAME 'bugzillaemail'
+        DESC 'members preferred bugzilla email address'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # fedoraPerson
 # The fedoraPerson represents people who are a member of the fedora project
 # in some way.  It is a structural class and inherits
 # from the inetOrgPerson class
-objectclass	( 2.16.840.1.113730.3.2.2
+objectclass	( 2.5.555.1
     NAME 'fedoraPerson'
 	DESC 'A member of the fedoraproject group'
     SUP inetOrgPerson
@@ -34,5 +34,5 @@
 		userSMIMECertificate $ userPKCS12 )
 	)
 	MUST (
-		ssh_key $ bugzilla_email 
+		sshkey $ bugzillaemail 
 	)



From fedora-extras-commits at redhat.com  Thu Oct 12 00:26:49 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 11 Oct 2006 17:26:49 -0700
Subject: devel/qgo .cvsignore,1.5,1.6 qgo.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <200610120026.k9C0Qp5R005912@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/qgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5889

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/qgo/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Apr 2006 14:42:38 -0000	1.5
+++ .cvsignore	12 Oct 2006 00:26:48 -0000	1.6
@@ -1 +1 @@
-qgo-1.5-r1.tar.gz
+qgo-1.5.2.tar.gz


Index: qgo.spec
===================================================================
RCS file: /cvs/extras/devel/qgo/qgo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qgo.spec	11 Sep 2006 20:59:46 -0000	1.10
+++ qgo.spec	12 Oct 2006 00:26:48 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: Graphical Go client and SGF editor
 Name: qgo
-Version: 1.5r1
-Release: 2%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://qgo.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.5-r1.tar.gz
+Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.5.2.tar.gz
 Source1: qgo.desktop
 BuildRequires: libjpeg-devel libpng-devel qt-devel
 BuildRequires: desktop-file-utils
@@ -20,7 +20,7 @@
 qGo supports loading MGT and Jago XML format Go games.
 
 %prep
-%setup -q -n %{name}-1.5
+%setup -q -n %{name}-1.5.2
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
@@ -58,6 +58,9 @@
 %{_datadir}/mimelnk/text/sgf.desktop
 
 %changelog
+* Wed Oct 11 2006 Chris Ricker <kaboom at oobleck.net> 1.5.2-1
+- New upstream release
+
 * Mon Sep 11 2006 Chris Ricker <kaboom at oobleck.net> 1.5r1-2
 - Bump and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/qgo/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Apr 2006 14:42:38 -0000	1.5
+++ sources	12 Oct 2006 00:26:48 -0000	1.6
@@ -1 +1 @@
-1051f540aa4e1a83a29ec6be3896c2c2  qgo-1.5-r1.tar.gz
+a9767f2572fc8d8c5653726bbce402e0  qgo-1.5.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 03:21:53 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 11 Oct 2006 20:21:53 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/devel
	gnome-theme-clearlooks-bigpack.spec, 1.3, 1.4
Message-ID: <200610120321.k9C3LtPq016148@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16131

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Bump EVR, and rebuild for dist tag update along with some spacing cleanups


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-theme-clearlooks-bigpack.spec	23 Dec 2005 06:05:17 -0000	1.3
+++ gnome-theme-clearlooks-bigpack.spec	12 Oct 2006 03:21:53 -0000	1.4
@@ -1,16 +1,16 @@
-Name:           gnome-theme-clearlooks-bigpack
-Version:        0.6
-Release:        1%{?dist}
+Name:		gnome-theme-clearlooks-bigpack
+Version:	0.6
+Release:	2%{?dist}
 Summary:        Additional Clearlooks color schemes
 
-Group:          User Interface/Desktops
-License:        GPL
-URL:            http://www.gnome-look.org/content/show.php?content=25557
-Source0:        http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+Group:		User Interface/Desktops
+License:	GPL
+URL:		http://www.gnome-look.org/content/show.php?content=25557
+Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
-Requires:       gtk2-engines
+Requires:	gtk2-engines
 
 %description
 Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine.
@@ -33,6 +33,10 @@
 %{_datadir}/themes/*
 
 %changelog
+* Wed Oct 11 2006 Peter Gordon <peter at thecodergeek.com> 0.6-2
+- Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel)
+- Use hard tabs instead of spaces for the tags for simplicity
+
 * Fri Dec 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Thu Oct 12 06:37:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 23:37:53 -0700
Subject: rpms/perl-PAR-Dist/FC-5 .cvsignore, 1.10, 1.11 perl-PAR-Dist.spec, 
	1.14, 1.15 sources, 1.10, 1.11
Message-ID: <200610120638.k9C6cP0L025649@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-PAR-Dist/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25611/FC-5

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
* Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
- 0.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Sep 2006 13:42:56 -0000	1.10
+++ .cvsignore	12 Oct 2006 06:37:52 -0000	1.11
@@ -1 +1 @@
-PAR-Dist-0.19.tar.gz
+PAR-Dist-0.20.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/perl-PAR-Dist.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-PAR-Dist.spec	17 Sep 2006 13:42:56 -0000	1.14
+++ perl-PAR-Dist.spec	12 Oct 2006 06:37:52 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.19
+Version:        0.20
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
+- 0.20.
+
 * Sun Sep 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.19-1
 - 0.19.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Sep 2006 13:42:56 -0000	1.10
+++ sources	12 Oct 2006 06:37:52 -0000	1.11
@@ -1 +1 @@
-becaeb761fa8a576413b8aba429c742b  PAR-Dist-0.19.tar.gz
+471da0751f63f8f4ea609b8ea08de964  PAR-Dist-0.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 06:37:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 11 Oct 2006 23:37:53 -0700
Subject: rpms/perl-PAR-Dist/devel .cvsignore, 1.10, 1.11 perl-PAR-Dist.spec, 
	1.14, 1.15 sources, 1.10, 1.11
Message-ID: <200610120638.k9C6cQ6t025654@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-PAR-Dist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25611/devel

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
* Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
- 0.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Sep 2006 13:42:56 -0000	1.10
+++ .cvsignore	12 Oct 2006 06:37:53 -0000	1.11
@@ -1 +1 @@
-PAR-Dist-0.19.tar.gz
+PAR-Dist-0.20.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-PAR-Dist.spec	17 Sep 2006 13:42:56 -0000	1.14
+++ perl-PAR-Dist.spec	12 Oct 2006 06:37:53 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.19
+Version:        0.20
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
+- 0.20.
+
 * Sun Sep 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.19-1
 - 0.19.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Sep 2006 13:42:56 -0000	1.10
+++ sources	12 Oct 2006 06:37:53 -0000	1.11
@@ -1 +1 @@
-becaeb761fa8a576413b8aba429c742b  PAR-Dist-0.19.tar.gz
+471da0751f63f8f4ea609b8ea08de964  PAR-Dist-0.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 07:46:24 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 12 Oct 2006 00:46:24 -0700
Subject: rpms/fcron/devel fcron.README, 1.1, 1.2 fcron.LISEZMOI, 1.1,
	1.2 fcron.spec, 1.6, 1.7
Message-ID: <200610120746.k9C7kQVl028823@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/fcron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28802

Modified Files:
	fcron.README fcron.LISEZMOI fcron.spec 
Log Message:
Don't remove fcron user when erasing package.


Index: fcron.README
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.README	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.README	12 Oct 2006 07:46:24 -0000	1.2
@@ -7,4 +7,8 @@
 
   fcrontab /etc/crontab
 
-This should be done everytime the file is modified.
\ No newline at end of file
+This should be done everytime the file is modified.
+
+To remove definitively the fcron package, you'll have to remove the fcron
+user by hand, and the /var/spool/fcron directory which contains the
+binary fcrontabs.


Index: fcron.LISEZMOI
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.LISEZMOI,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.LISEZMOI	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.LISEZMOI	12 Oct 2006 07:46:24 -0000	1.2
@@ -9,4 +9,8 @@
 
   fcrontab /etc/crontab
 
-et de recommencer chaque fois que vous modifiez ce fichier.
\ No newline at end of file
+et de recommencer chaque fois que vous modifiez ce fichier.
+
+Enfin, si l'administrateur souhaite d??sintaller d??finitivement ce paquet,
+il devra supprimer ?? la main l'utilisateur fcron et le r??pertoire
+/var/spool/fcron qui contient entre autres les tables fcrontab binaires.


Index: fcron.spec
===================================================================
RCS file: /cvs/extras/rpms/fcron/devel/fcron.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fcron.spec	1 Sep 2006 23:22:09 -0000	1.6
+++ fcron.spec	12 Oct 2006 07:46:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		fcron
 Version:	3.0.1
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	A task scheduler
 Summary(fr):	Un ordonnanceur de t??ches
 Summary(it):	Uno schedulatore di processi
@@ -30,7 +30,6 @@
 Requires(pre):    /usr/sbin/useradd
 Requires(post):   /sbin/chkconfig, /sbin/service
 Requires(preun):  /sbin/chkconfig, /sbin/service
-Requires(postun): /usr/sbin/userdel
 
 %description
 Fcron is a scheduler. It aims at replacing Vixie Cron, so it implements most
@@ -130,16 +129,15 @@
   %{__mv} tmp $i
 done
 
-# rpmbuild insist that %ghost files exist?
+# rpmbuild insist that %ghost files exist
 %{__install} -d %{buildroot}%{_localstatedir}/run/
 touch %{buildroot}%{_localstatedir}/run/fcron.pid
-touch %{buildroot}%{_localstatedir}/run/fcron.fifo
 
 
 %pre
 if [ "$1" = "1" ]
 then
-  /usr/sbin/useradd -c "Fcron system user" -r fcron -d %{_localstatedir}/spool/fcron -s /bin/true
+  /usr/sbin/useradd -c "Fcron system user" -r fcron -d %{_localstatedir}/spool/fcron -s /bin/true &>/dev/null || :
 fi
 
 %post
@@ -153,13 +151,6 @@
   fi
 fi
 
-%postun
-if [ "$1" = "0" ]
-  then
-  # Remove user fcron
-  /usr/sbin/userdel fcron
-fi
-
 %preun
 if [ "$1" = "0" ]
 then
@@ -193,9 +184,13 @@
 %{_sbindir}/fcron-update-crontabs
 %dir %attr(770,fcron,fcron) %{_localstatedir}/spool/fcron
 %ghost %{_localstatedir}/run/fcron.pid
-%ghost %{_localstatedir}/run/fcron.fifo
 
 %changelog
+* Fri Oct 12 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 3.0.1-17
+  - Don't remove frcon user when erasing package
+  - Update doc accordingly
+  - Don't ghost fcron.fifo
+
 * Fri Sep  1 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 3.0.1-16
   - FE6 rebuild
 



From fedora-extras-commits at redhat.com  Thu Oct 12 07:46:55 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 12 Oct 2006 00:46:55 -0700
Subject: rpms/fcron/FC-4 fcron.README, 1.1, 1.2 fcron.LISEZMOI, 1.1,
	1.2 fcron.spec, 1.5, 1.6
Message-ID: <200610120746.k9C7kvZn028890@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/fcron/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28867

Modified Files:
	fcron.README fcron.LISEZMOI fcron.spec 
Log Message:
Don't remove fcron user when erasing package.


Index: fcron.README
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-4/fcron.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.README	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.README	12 Oct 2006 07:46:55 -0000	1.2
@@ -7,4 +7,8 @@
 
   fcrontab /etc/crontab
 
-This should be done everytime the file is modified.
\ No newline at end of file
+This should be done everytime the file is modified.
+
+To remove definitively the fcron package, you'll have to remove the fcron
+user by hand, and the /var/spool/fcron directory which contains the
+binary fcrontabs.


Index: fcron.LISEZMOI
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-4/fcron.LISEZMOI,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.LISEZMOI	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.LISEZMOI	12 Oct 2006 07:46:55 -0000	1.2
@@ -9,4 +9,8 @@
 
   fcrontab /etc/crontab
 
-et de recommencer chaque fois que vous modifiez ce fichier.
\ No newline at end of file
+et de recommencer chaque fois que vous modifiez ce fichier.
+
+Enfin, si l'administrateur souhaite d??sintaller d??finitivement ce paquet,
+il devra supprimer ?? la main l'utilisateur fcron et le r??pertoire
+/var/spool/fcron qui contient entre autres les tables fcrontab binaires.


Index: fcron.spec
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-4/fcron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fcron.spec	24 Aug 2006 18:23:52 -0000	1.5
+++ fcron.spec	12 Oct 2006 07:46:55 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		fcron
 Version:	3.0.1
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A task scheduler
 Summary(fr):	Un ordonnanceur de t??ches
 Summary(it):	Uno schedulatore di processi
@@ -30,7 +30,6 @@
 Requires(pre):    /usr/sbin/useradd
 Requires(post):   /sbin/chkconfig, /sbin/service
 Requires(preun):  /sbin/chkconfig, /sbin/service
-Requires(postun): /usr/sbin/userdel
 
 %description
 Fcron is a scheduler. It aims at replacing Vixie Cron, so it implements most
@@ -133,7 +132,6 @@
 # rpmbuild insist that %ghost files exist?
 %{__install} -d %{buildroot}%{_localstatedir}/run/
 touch %{buildroot}%{_localstatedir}/run/fcron.pid
-touch %{buildroot}%{_localstatedir}/run/fcron.fifo
 
 
 %pre
@@ -153,13 +151,6 @@
   fi
 fi
 
-%postun
-if [ "$1" = "0" ]
-  then
-  # Remove user fcron
-  /usr/sbin/userdel fcron
-fi
-
 %preun
 if [ "$1" = "0" ]
 then
@@ -193,9 +184,13 @@
 %{_sbindir}/fcron-update-crontabs
 %dir %attr(770,fcron,fcron) %{_localstatedir}/spool/fcron
 %ghost %{_localstatedir}/run/fcron.pid
-%ghost %{_localstatedir}/run/fcron.fifo
 
 %changelog
+* Fri Oct 12 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 3.0.1-16
+  - Don't remove frcon user when erasing package
+  - Update doc accordingly
+  - Don't ghost fcron.fifo
+
 * Thu Aug 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.1-15
   - Fix doc permissions (#200834).
 



From fedora-extras-commits at redhat.com  Thu Oct 12 07:47:22 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 12 Oct 2006 00:47:22 -0700
Subject: rpms/fcron/FC-5 fcron.README, 1.1, 1.2 fcron.LISEZMOI, 1.1,
	1.2 fcron.spec, 1.5, 1.6
Message-ID: <200610120747.k9C7lOAJ028957@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/fcron/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28936

Modified Files:
	fcron.README fcron.LISEZMOI fcron.spec 
Log Message:
Don't remove fcron user when erasing package.


Index: fcron.README
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-5/fcron.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.README	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.README	12 Oct 2006 07:47:21 -0000	1.2
@@ -7,4 +7,8 @@
 
   fcrontab /etc/crontab
 
-This should be done everytime the file is modified.
\ No newline at end of file
+This should be done everytime the file is modified.
+
+To remove definitively the fcron package, you'll have to remove the fcron
+user by hand, and the /var/spool/fcron directory which contains the
+binary fcrontabs.


Index: fcron.LISEZMOI
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-5/fcron.LISEZMOI,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcron.LISEZMOI	19 Jun 2006 11:55:08 -0000	1.1
+++ fcron.LISEZMOI	12 Oct 2006 07:47:21 -0000	1.2
@@ -9,4 +9,8 @@
 
   fcrontab /etc/crontab
 
-et de recommencer chaque fois que vous modifiez ce fichier.
\ No newline at end of file
+et de recommencer chaque fois que vous modifiez ce fichier.
+
+Enfin, si l'administrateur souhaite d??sintaller d??finitivement ce paquet,
+il devra supprimer ?? la main l'utilisateur fcron et le r??pertoire
+/var/spool/fcron qui contient entre autres les tables fcrontab binaires.


Index: fcron.spec
===================================================================
RCS file: /cvs/extras/rpms/fcron/FC-5/fcron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fcron.spec	24 Aug 2006 18:23:53 -0000	1.5
+++ fcron.spec	12 Oct 2006 07:47:21 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		fcron
 Version:	3.0.1
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A task scheduler
 Summary(fr):	Un ordonnanceur de t??ches
 Summary(it):	Uno schedulatore di processi
@@ -30,7 +30,6 @@
 Requires(pre):    /usr/sbin/useradd
 Requires(post):   /sbin/chkconfig, /sbin/service
 Requires(preun):  /sbin/chkconfig, /sbin/service
-Requires(postun): /usr/sbin/userdel
 
 %description
 Fcron is a scheduler. It aims at replacing Vixie Cron, so it implements most
@@ -133,7 +132,6 @@
 # rpmbuild insist that %ghost files exist?
 %{__install} -d %{buildroot}%{_localstatedir}/run/
 touch %{buildroot}%{_localstatedir}/run/fcron.pid
-touch %{buildroot}%{_localstatedir}/run/fcron.fifo
 
 
 %pre
@@ -153,13 +151,6 @@
   fi
 fi
 
-%postun
-if [ "$1" = "0" ]
-  then
-  # Remove user fcron
-  /usr/sbin/userdel fcron
-fi
-
 %preun
 if [ "$1" = "0" ]
 then
@@ -193,9 +184,13 @@
 %{_sbindir}/fcron-update-crontabs
 %dir %attr(770,fcron,fcron) %{_localstatedir}/spool/fcron
 %ghost %{_localstatedir}/run/fcron.pid
-%ghost %{_localstatedir}/run/fcron.fifo
 
 %changelog
+* Fri Oct 12 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 3.0.1-16
+  - Don't remove frcon user when erasing package
+  - Update doc accordingly
+  - Don't ghost fcron.fifo
+
 * Thu Aug 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.1-15
   - Fix doc permissions (#200834).
 



From fedora-extras-commits at redhat.com  Thu Oct 12 08:23:17 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Thu, 12 Oct 2006 01:23:17 -0700
Subject: rpms/lcov/devel .cvsignore, 1.3, 1.4 Makefile, 1.2,
	1.3 lcov-1.4-gcda-suffix.patch, 1.2, 1.3 lcov-1.4-lcovrc.patch,
	1.2, 1.3 lcov.spec, 1.2, 1.3 sources, 1.3, 1.4 dead.package, 1.1, NONE
Message-ID: <200610120823.k9C8NKJJ032089@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/lcov/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32056

Added Files:
	.cvsignore Makefile lcov-1.4-gcda-suffix.patch 
	lcov-1.4-lcovrc.patch lcov.spec sources 
Removed Files:
	dead.package 
Log Message:
Resurrect wrongly removed package.


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	12 Oct 2006 08:23:17 -0000	1.4
@@ -0,0 +1 @@
+lcov-1.4.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	12 Oct 2006 08:23:17 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: lcov
+# $Id$
+NAME := lcov
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

lcov-1.4-gcda-suffix.patch:

Index: lcov-1.4-gcda-suffix.patch
===================================================================
RCS file: lcov-1.4-gcda-suffix.patch
diff -N lcov-1.4-gcda-suffix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lcov-1.4-gcda-suffix.patch	12 Oct 2006 08:23:17 -0000	1.3
@@ -0,0 +1,34 @@
+--- lcov-1.4/bin/lcov.~1~	2005-03-02 08:24:50.000000000 -0800
++++ lcov-1.4/bin/lcov	2006-02-15 10:24:41.000000000 -0800
+@@ -331,8 +331,8 @@ get coverage data for a user space progr
+   -c, --capture                   Capture coverage data
+   -t, --test-name NAME            Specify test name to be stored with data
+   -o, --output-file FILENAME      Write data to FILENAME instead of stdout
+-  -d, --directory DIR             Use .da files in DIR instead of kernel
+-  -f, --follow                    Follow links when searching .da files
++  -d, --directory DIR             Use .da/.gcda files in DIR instead of kernel
++  -f, --follow                    Follow links when searching .da/.gcda files
+   -k, --kernel-directory KDIR     Capture kernel coverage data only from KDIR
+   -a, --add-tracefile FILE        Add contents of tracefiles
+   -e, --extract FILE PATTERN      Extract files matching PATTERN from FILE
+@@ -399,17 +399,17 @@ sub userspace_reset()
+ 
+ 	foreach $current_dir (@directory)
+ 	{
+-		info("Deleting all .da files in $current_dir and ".
++		info("Deleting all .da and .gcda files in $current_dir and ".
+ 		     "subdirectories\n");
+ 		if ($follow)
+ 		{
+ 			@file_list =
+-				`find $current_dir -follow -name \\*.da -type f 2>/dev/null`;
++				`find $current_dir -follow \\( -name \\*.gcda -o -name \\*.da \\) -type f 2>/dev/null`;
+ 		}
+ 		else
+ 		{
+ 			@file_list =
+-				`find $current_dir -name \\*.da -type f 2>/dev/null`;
++				`find $current_dir \\( -name \\*.gcda -o -name \\*.da \\) -type f 2>/dev/null`;
+ 		}
+ 		chomp(@file_list);
+ 		foreach (@file_list)

lcov-1.4-lcovrc.patch:

Index: lcov-1.4-lcovrc.patch
===================================================================
RCS file: lcov-1.4-lcovrc.patch
diff -N lcov-1.4-lcovrc.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lcov-1.4-lcovrc.patch	12 Oct 2006 08:23:17 -0000	1.3
@@ -0,0 +1,18 @@
+--- lcov-1.4/lcovrc.~1~	2005-03-02 08:24:47.000000000 -0800
++++ lcov-1.4/lcovrc	2006-02-13 19:09:02.000000000 -0800
+@@ -22,13 +22,13 @@ genhtml_overview_width = 80
+ # difference in lines between the position a user selected from the overview
+ # and the position the source code window is scrolled to (used by --frames
+ # option of genhtml)
+-genhtml_nav_resolution = 4;
++genhtml_nav_resolution = 4
+ 
+ # Clicking a line in the overview image should show the source code view at
+ # a position a bit further up so that the requested line is not the first
+ # line in the window. This number specifies that offset in lines (used by
+ # --frames option of genhtml)
+-genhtml_nav_offset = 10;
++genhtml_nav_offset = 10
+ 
+ # Do not remove unused test descriptions if non-zero (same as
+ # --keep-descriptions option of genhtml)


Index: lcov.spec
===================================================================
RCS file: lcov.spec
diff -N lcov.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lcov.spec	12 Oct 2006 08:23:17 -0000	1.3
@@ -0,0 +1,54 @@
+Name: lcov
+Version: 1.4
+Release: 2%{?dist}
+
+Summary: LTP GCOV extension code coverage tool
+Group: Development/Tools
+License: GPL
+
+URL: http://ltp.sourceforge.net/coverage/lcov.php
+Source0: http://dl.sourceforge.net/ltp/lcov-%{version}.tar.gz
+Patch1: lcov-1.4-lcovrc.patch
+Patch2: lcov-1.4-gcda-suffix.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+Requires: /usr/bin/gcov
+Requires: perl(GD::Image)
+
+%description
+LCOV is an extension of GCOV, a GNU tool which provides information
+about what parts of a program are actually executed (i.e. "covered")
+while running a particular test case. The extension consists of a set
+of PERL scripts which build on the textual GCOV output to implement
+HTML output and support for large projects.
+
+%prep
+%setup -q
+
+%patch1 -p1
+%patch2 -p1
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install PREFIX=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%config(noreplace) %attr(0644,root,root) /etc/lcovrc
+
+%changelog
+* Mon Feb 20 2006 Roland McGrath <roland at redhat.com> - 1.4-2
+- Fix lcov -z to look for .gcda (GCC >= 3.4) suffix as well as .da (old GCC).
+- Remove empty %%build from spec.
+- Fix URL for source tarball.
+
+* Mon Feb 13 2006 Roland McGrath <roland at redhat.com> - 1.4-1
+- Initial build, some spec bits snarfed from upstream.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	12 Oct 2006 08:23:17 -0000	1.4
@@ -0,0 +1 @@
+9ae93c6619ee60a9e89bd2da0e49ae4a  lcov-1.4.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 12 08:24:20 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Thu, 12 Oct 2006 01:24:20 -0700
Subject: owners owners.list,1.1822,1.1823
Message-ID: <200610120824.k9C8OMvB032122@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32105

Modified Files:
	owners.list 
Log Message:
Fix lcov wrongly marked as orphaned


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1822
retrieving revision 1.1823
diff -u -r1.1822 -r1.1823
--- owners.list	11 Oct 2006 20:05:35 -0000	1.1822
+++ owners.list	12 Oct 2006 08:24:20 -0000	1.1823
@@ -820,7 +820,7 @@
 Fedora Extras|lat|LDAP Administration Tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|mpeters at mac.com
 Fedora Extras|lcms|Color Management System|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|lcov|LTP GCOV extension code coverage tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roland at redhat.com
+Fedora Extras|lcov|LTP GCOV extension code coverage tool|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct 12 14:55:56 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 12 Oct 2006 07:55:56 -0700
Subject: rpms/abiword/devel abiword-2.4.5-fontconfig.patch, NONE,
	1.1 abiword.spec, 1.38, 1.39
Message-ID: <200610121455.k9CEtwDU018991@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18971

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.5-fontconfig.patch 
Log Message:
Fix 207294: abiword crashes at exit



abiword-2.4.5-fontconfig.patch:

--- NEW FILE abiword-2.4.5-fontconfig.patch ---
diff -r -u abiword-2.4.5.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.5/abi/src/af/xap/unix/xap_UnixApp.cpp
--- abiword-2.4.5.orig/abi/src/af/xap/unix/xap_UnixApp.cpp	2006-05-12 22:40:11.000000000 +0200
+++ abiword-2.4.5/abi/src/af/xap/unix/xap_UnixApp.cpp	2006-10-12 15:12:34.000000000 +0200
@@ -134,10 +134,6 @@
 	DELETEP(m_pUnixToolbarIcons);
 	
 	delete m_fontManager;
-
-#if FC_MINOR > 2
-	FcFini();
-#endif
 }
 
 bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue)


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- abiword.spec	11 Sep 2006 17:38:58 -0000	1.38
+++ abiword.spec	12 Oct 2006 14:55:56 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -45,6 +45,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.5-fontconfig.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -54,6 +55,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .fontconfig
 
 %build
 cd abi
@@ -135,6 +137,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.5-4.fc6
+- Fix bug 207294
+
 * Mon Sep 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.5-3.fc6
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Thu Oct 12 15:30:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 08:30:13 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.26, 1.27 sources, 1.27,
	1.28 sylpheed-claws.spec, 1.51, 1.52
Message-ID: <200610121530.k9CFUFts022181@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22112/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Oct 2006 09:01:07 -0000	1.26
+++ .cvsignore	12 Oct 2006 15:30:13 -0000	1.27
@@ -1 +1 @@
-sylpheed-claws-2.5.3.tar.bz2
+sylpheed-claws-2.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	7 Oct 2006 09:01:07 -0000	1.27
+++ sources	12 Oct 2006 15:30:13 -0000	1.28
@@ -1 +1 @@
-3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2
+ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sylpheed-claws.spec	7 Oct 2006 09:01:07 -0000	1.51
+++ sylpheed-claws.spec	12 Oct 2006 15:30:13 -0000	1.52
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.3
+Version:        2.5.5
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -168,6 +168,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.5-1
+- version upgrade
+
 * Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.3-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Oct 12 15:30:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 08:30:12 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.22, 1.23 sources, 1.23,
	1.24 sylpheed-claws.spec, 1.46, 1.47
Message-ID: <200610121530.k9CFUEkj022174@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22112/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	7 Oct 2006 09:01:06 -0000	1.22
+++ .cvsignore	12 Oct 2006 15:30:12 -0000	1.23
@@ -1 +1 @@
-sylpheed-claws-2.5.3.tar.bz2
+sylpheed-claws-2.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Oct 2006 09:01:06 -0000	1.23
+++ sources	12 Oct 2006 15:30:12 -0000	1.24
@@ -1 +1 @@
-3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2
+ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sylpheed-claws.spec	7 Oct 2006 09:01:06 -0000	1.46
+++ sylpheed-claws.spec	12 Oct 2006 15:30:12 -0000	1.47
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        2.5.3
+Version:        2.5.5
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -179,6 +179,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.5-1
+- version upgrade
+
 * Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.3-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Oct 12 15:30:14 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 08:30:14 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.26, 1.27 sources, 1.27,
	1.28 sylpheed-claws.spec, 1.52, 1.53
Message-ID: <200610121530.k9CFUG0p022187@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22112/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Oct 2006 09:01:08 -0000	1.26
+++ .cvsignore	12 Oct 2006 15:30:14 -0000	1.27
@@ -1 +1 @@
-sylpheed-claws-2.5.3.tar.bz2
+sylpheed-claws-2.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	7 Oct 2006 09:01:08 -0000	1.27
+++ sources	12 Oct 2006 15:30:14 -0000	1.28
@@ -1 +1 @@
-3e2f1d0d512943d42c3d884482612d79  sylpheed-claws-2.5.3.tar.bz2
+ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sylpheed-claws.spec	7 Oct 2006 09:01:08 -0000	1.52
+++ sylpheed-claws.spec	12 Oct 2006 15:30:14 -0000	1.53
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.3
+Version:        2.5.5
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.3.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.5-1
+- version upgrade
+
 * Sat Oct 07 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.3-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Oct 12 16:05:32 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Thu, 12 Oct 2006 09:05:32 -0700
Subject: rpms/listen/FC-5 listen.spec,1.10,1.11
Message-ID: <200610121605.k9CG5Y1i025400@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25324

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- listen.spec	9 Oct 2006 11:03:25 -0000	1.10
+++ listen.spec	12 Oct 2006 16:05:32 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        5.beta1%{?dist}
+Release:        6.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -28,15 +28,29 @@
 BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
-BuildRequires: python-ogg-devel
-BuildRequires: python-vorbis
 BuildRequires: python-sexy
 BuildRequires: python-mutagen >= 1.6
 BuildRequires: desktop-file-utils
+
+
+# added explicit Requires
+Requires: python-mutagen >= 1.6
+Requires: python 
+Requires: pygtk2 
+Requires: gstreamer-python 
+Requires: dbus-python
+Requires: python-sqlite2
+Requires: python-ctypes
+Requires: gnome-python2
+Requires: gnome-python2-extras
+Requires: gnome-python2-gtkmozembed
+Requires: gnome-python2-libegg
+Requires: python-sexy
 # MusicBrainz support
-BuildRequires: python-musicbrainz2 
-BuildRequires: libtunepimp 
+Requires: python-musicbrainz2 
+Requires: /usr/lib/libtunepimp.so.5
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
@@ -70,6 +84,8 @@
 %{__sed} -i 's/local//' Makefile
 # Under Fedora dockbook2x-man is renamed db2x_docbook2man
 %{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
+# enable the use of %{find_lang} macros
+%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -104,7 +120,7 @@
   --remove-mime-type audio/x-mpeg-3 \
   --remove-mime-type application/x-id3 \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +130,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc gpl.txt
 %{_bindir}/%{name}
@@ -125,6 +141,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Nov 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-6.beta1
+- Updated R & BR, now use the %{find_lang} macros
+
 * Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 



From fedora-extras-commits at redhat.com  Thu Oct 12 16:07:46 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Thu, 12 Oct 2006 09:07:46 -0700
Subject: rpms/listen/devel listen.spec,1.10,1.11
Message-ID: <200610121607.k9CG7mpP025486@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25465/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- listen.spec	9 Oct 2006 11:03:25 -0000	1.10
+++ listen.spec	12 Oct 2006 16:07:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        5.beta1%{?dist}
+Release:        6.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -28,15 +28,29 @@
 BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
-BuildRequires: python-ogg-devel
-BuildRequires: python-vorbis
 BuildRequires: python-sexy
 BuildRequires: python-mutagen >= 1.6
 BuildRequires: desktop-file-utils
+
+
+# added explicit Requires
+Requires: python-mutagen >= 1.6
+Requires: python 
+Requires: pygtk2 
+Requires: gstreamer-python 
+Requires: dbus-python
+Requires: python-sqlite2
+Requires: python-ctypes
+Requires: gnome-python2
+Requires: gnome-python2-extras
+Requires: gnome-python2-gtkmozembed
+Requires: gnome-python2-libegg
+Requires: python-sexy
 # MusicBrainz support
-BuildRequires: python-musicbrainz2 
-BuildRequires: libtunepimp 
+Requires: python-musicbrainz2 
+Requires: /usr/lib/libtunepimp.so.5
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
@@ -70,6 +84,8 @@
 %{__sed} -i 's/local//' Makefile
 # Under Fedora dockbook2x-man is renamed db2x_docbook2man
 %{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
+# enable the use of %{find_lang} macros
+%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -104,7 +120,7 @@
   --remove-mime-type audio/x-mpeg-3 \
   --remove-mime-type application/x-id3 \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +130,7 @@
 %postun -p /sbin/ldconfig
 
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc gpl.txt
 %{_bindir}/%{name}
@@ -125,6 +141,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Nov 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-6.beta1
+- Updated R & BR, now use the %{find_lang} macros
+
 * Mon Nov 09 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 



From fedora-extras-commits at redhat.com  Thu Oct 12 16:13:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 12 Oct 2006 09:13:56 -0700
Subject: comps comps-fe6.xml.in,1.185,1.186
Message-ID: <200610121613.k9CGDwTf025687@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25670

Modified Files:
	comps-fe6.xml.in 
Log Message:
lcov is back


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- comps-fe6.xml.in	11 Oct 2006 21:46:05 -0000	1.185
+++ comps-fe6.xml.in	12 Oct 2006 16:13:56 -0000	1.186
@@ -152,6 +152,7 @@
       <packagereq type="optional">ipython</packagereq>
       <packagereq type="optional">jam</packagereq>
       <packagereq type="optional">kuipc</packagereq>
+      <packagereq type="optional">lcov</packagereq>
       <packagereq type="optional">lightning</packagereq>
       <packagereq type="optional">lincvs</packagereq>
       <packagereq type="optional">lua</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 12 16:28:40 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Thu, 12 Oct 2006 09:28:40 -0700
Subject: rpms/bygfoot/devel .cvsignore, 1.2, 1.3 bygfoot.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610121628.k9CGSgZg025760@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/bygfoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25739

Modified Files:
	.cvsignore bygfoot.spec sources 
Log Message:
* Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
- Bump release to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 22:42:23 -0000	1.2
+++ .cvsignore	12 Oct 2006 16:28:40 -0000	1.3
@@ -1 +1 @@
-bygfoot-2.0.0.tar.bz2
+bygfoot-2.0.1.tar.bz2


Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/bygfoot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bygfoot.spec	4 Sep 2006 11:20:57 -0000	1.2
+++ bygfoot.spec	12 Oct 2006 16:28:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bygfoot
-Version:        2.0.0
-Release:        3%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Bygfoot Football Manager
 Group:          Amusements/Games
 License:        GPL
@@ -9,7 +9,7 @@
 Source3:        bygfoot.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
-BuildRequires:  pkgconfig gtk2-devel gettext
+BuildRequires:  gtk2-devel gettext
 
 %description
 Bygfoot is a small and simple graphical football
@@ -20,7 +20,7 @@
 of course try to be successful.
 
 %prep
-%setup -q -n %{name}-2.0
+%setup -q
 
 
 %build
@@ -49,8 +49,8 @@
 %{_datadir}/bygfoot
 %{_datadir}/applications/fedora-bygfoot.desktop
 %changelog
-* Mon Sep 04 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-3
-- FC6 rebuild
+* Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
+- Bump release to 2.0.1
 
 * Thu Aug 17 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-2
 - Small fix in %%files section


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 22:42:23 -0000	1.2
+++ sources	12 Oct 2006 16:28:40 -0000	1.3
@@ -1 +1 @@
-e5b7935c733cd39953256a0634e17784  bygfoot-2.0.0.tar.bz2
+c303ef5aff2c9d3f4e9d11dae1da685c  bygfoot-2.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 12 16:31:54 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Thu, 12 Oct 2006 09:31:54 -0700
Subject: rpms/bygfoot/devel bygfoot.spec,1.3,1.4
Message-ID: <200610121631.k9CGVulj025831@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/bygfoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25810

Modified Files:
	bygfoot.spec 
Log Message:
Accidentally I have removed FC-6 rebuild changelog entry



Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/devel/bygfoot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bygfoot.spec	12 Oct 2006 16:28:40 -0000	1.3
+++ bygfoot.spec	12 Oct 2006 16:31:53 -0000	1.4
@@ -52,6 +52,9 @@
 * Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
 - Bump release to 2.0.1
 
+* Mon Sep 04 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-3
+- FC6 rebuild
+
 * Thu Aug 17 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-2
 - Small fix in %%files section
 



From fedora-extras-commits at redhat.com  Thu Oct 12 16:34:18 2006
From: fedora-extras-commits at redhat.com (MichaÅ Bentkowski (ecik))
Date: Thu, 12 Oct 2006 09:34:18 -0700
Subject: rpms/bygfoot/FC-5 .cvsignore, 1.2, 1.3 bygfoot.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610121634.k9CGYK59025864@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/bygfoot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25843

Modified Files:
	.cvsignore bygfoot.spec sources 
Log Message:
* Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
- Bump release to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 22:42:23 -0000	1.2
+++ .cvsignore	12 Oct 2006 16:34:18 -0000	1.3
@@ -1 +1 @@
-bygfoot-2.0.0.tar.bz2
+bygfoot-2.0.1.tar.bz2


Index: bygfoot.spec
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/FC-5/bygfoot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bygfoot.spec	17 Aug 2006 22:42:23 -0000	1.1
+++ bygfoot.spec	12 Oct 2006 16:34:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           bygfoot
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Bygfoot Football Manager
 Group:          Amusements/Games
 License:        GPL
@@ -9,7 +9,7 @@
 Source3:        bygfoot.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
-BuildRequires:  pkgconfig gtk2-devel gettext
+BuildRequires:  gtk2-devel gettext
 
 %description
 Bygfoot is a small and simple graphical football
@@ -20,7 +20,7 @@
 of course try to be successful.
 
 %prep
-%setup -q -n %{name}-2.0
+%setup -q
 
 
 %build
@@ -49,6 +49,9 @@
 %{_datadir}/bygfoot
 %{_datadir}/applications/fedora-bygfoot.desktop
 %changelog
+* Thu Oct 12 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.1-1
+- Bump release to 2.0.1
+
 * Thu Aug 17 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 2.0.0-2
 - Small fix in %%files section
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bygfoot/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 22:42:23 -0000	1.2
+++ sources	12 Oct 2006 16:34:18 -0000	1.3
@@ -1 +1 @@
-e5b7935c733cd39953256a0634e17784  bygfoot-2.0.0.tar.bz2
+c303ef5aff2c9d3f4e9d11dae1da685c  bygfoot-2.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 12 16:39:22 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 12 Oct 2006 09:39:22 -0700
Subject: rpms/gtkmathview/devel gtkmathview.spec,1.7,1.8
Message-ID: <200610121639.k9CGdOo8025969@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/gtkmathview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25952

Modified Files:
	gtkmathview.spec 
Log Message:
Fix 206451




Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkmathview.spec	11 Sep 2006 08:59:38 -0000	1.7
+++ gtkmathview.spec	12 Oct 2006 16:39:22 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A MathML rendering library
 Name: gtkmathview
 Version: 0.7.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Libraries
 License: GPL
 Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Requires: gtk2-devel >= 2.2.1
 Requires: libxml2-devel >= 2.6.7
 Requires: popt >= 1.7.0 
+Requires: pkgconfig
 
 %description devel
 Libraries, headers, and support files needed for using gtkmathview.
@@ -74,6 +75,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> 0.7.6-5.fc6
+- Add pkgconfig to the -devel requires (bug 206451)
+
 * Mon Sep 16 2006 Marc Maurer <uwog at abisource.com> 0.7.6-4.fc6
 - Rebuild for FC 6
 



From fedora-extras-commits at redhat.com  Thu Oct 12 16:43:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 12 Oct 2006 09:43:00 -0700
Subject: rpms/libtelepathy/devel .cvsignore, 1.2, 1.3 libtelepathy.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610121643.k9CGh22h026069@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libtelepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26048

Modified Files:
	.cvsignore libtelepathy.spec sources 
Log Message:
* Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.38-1
- Update to 0.0.38.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2006 14:26:01 -0000	1.2
+++ .cvsignore	12 Oct 2006 16:43:00 -0000	1.3
@@ -1 +1 @@
-libtelepathy-0.0.37.tar.gz
+libtelepathy-0.0.38.tar.gz


Index: libtelepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/libtelepathy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtelepathy.spec	16 Sep 2006 14:26:01 -0000	1.1
+++ libtelepathy.spec	12 Oct 2006 16:43:00 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           libtelepathy
-Version:        0.0.37
+Version:        0.0.38
 Release:        1%{?dist}
 Summary:        A GLib library to ease writing telepathy clients
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.38-1
+- Update to 0.0.38.
+
 * Tue Sep 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.0.37-1
 - Update to 0.0.37.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2006 14:26:01 -0000	1.2
+++ sources	12 Oct 2006 16:43:00 -0000	1.3
@@ -1 +1 @@
-98cd5963b02396a7698b064cf5097dcd  libtelepathy-0.0.37.tar.gz
+145358f6275acf1ce3d7633f7865b7b9  libtelepathy-0.0.38.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 16:58:10 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 12 Oct 2006 09:58:10 -0700
Subject: rpms/util-vserver/FC-5 util-vserver.spec,1.18,1.19
Message-ID: <200610121658.k9CGwCwb026197@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26180

Modified Files:
	util-vserver.spec 
Log Message:
added ghostscript BR


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-5/util-vserver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- util-vserver.spec	11 Oct 2006 23:34:42 -0000	1.18
+++ util-vserver.spec	12 Oct 2006 16:58:09 -0000	1.19
@@ -36,7 +36,7 @@
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
-BuildRequires:	doxygen tetex-latex graphviz
+BuildRequires:	doxygen tetex-latex graphviz ghostscript
 ## HACK; 'make check' fails there due to a kernel bug
 ## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389
 ExcludeArch:	ppc
@@ -352,7 +352,7 @@
 %changelog
 * Thu Oct 12 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.211-1
 - updated to 0.30.211
-- added graphviz BR
+- added graphviz + ghostscript BR
 
 * Mon Feb 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-2
 - rebuilt for FC5



From fedora-extras-commits at redhat.com  Thu Oct 12 17:09:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 10:09:52 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.15, 
	1.16
Message-ID: <200610121709.k9CH9s1U029229@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sylpheed-claws-plugins.spec	8 Oct 2006 10:26:08 -0000	1.15
+++ sylpheed-claws-plugins.spec	12 Oct 2006 17:09:52 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-3
+- rebuild
+
 * Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-2
 - rebuild



From fedora-extras-commits at redhat.com  Thu Oct 12 17:09:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 10:09:53 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.20, 
	1.21
Message-ID: <200610121709.k9CH9tnH029231@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sylpheed-claws-plugins.spec	8 Oct 2006 10:26:09 -0000	1.20
+++ sylpheed-claws-plugins.spec	12 Oct 2006 17:09:53 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-3
+- rebuild
+
 * Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-2
 - rebuild



From fedora-extras-commits at redhat.com  Thu Oct 12 17:09:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 12 Oct 2006 10:09:54 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.21,
	1.22
Message-ID: <200610121709.k9CH9udw029235@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sylpheed-claws-plugins.spec	8 Oct 2006 10:26:10 -0000	1.21
+++ sylpheed-claws-plugins.spec	12 Oct 2006 17:09:54 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-3
+- rebuild
+
 * Sun Oct 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-2
 - rebuild



From fedora-extras-commits at redhat.com  Thu Oct 12 17:29:33 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:29:33 -0700
Subject: rpms/toped - New directory
Message-ID: <200610121729.k9CHTZbm029630@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29604/toped

Log Message:
Directory /cvs/extras/rpms/toped added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 12 17:29:33 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:29:33 -0700
Subject: rpms/toped/devel - New directory
Message-ID: <200610121729.k9CHTZMq029633@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29604/toped/devel

Log Message:
Directory /cvs/extras/rpms/toped/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 12 17:30:16 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:30:16 -0700
Subject: rpms/toped Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610121730.k9CHUIFS029700@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29670

Added Files:
	Makefile import.log 
Log Message:
Setup of module toped


--- NEW FILE Makefile ---
# Top level Makefile for module toped
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct 12 17:30:17 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:30:17 -0700
Subject: rpms/toped/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610121730.k9CHUJVW029703@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29670/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module toped


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct 12 17:32:46 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:32:46 -0700
Subject: rpms/toped import.log,1.1,1.2
Message-ID: <200610121732.k9CHWmF6029819@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29783

Modified Files:
	import.log 
Log Message:
auto-import toped-0.8.2-1 on branch devel from toped-0.8.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/toped/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Oct 2006 17:30:16 -0000	1.1
+++ import.log	12 Oct 2006 17:32:45 -0000	1.2
@@ -0,0 +1 @@
+toped-0_8_2-1:HEAD:toped-0.8.2-1.src.rpm:1160674545



From fedora-extras-commits at redhat.com  Thu Oct 12 17:32:46 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:32:46 -0700
Subject: rpms/toped/devel toped.desktop, NONE, 1.1 toped.spec, NONE,
	1.1 toped_32x32.png, NONE, 1.1 toped_64x64.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610121732.k9CHWmfG029824@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29783/devel

Modified Files:
	.cvsignore sources 
Added Files:
	toped.desktop toped.spec toped_32x32.png toped_64x64.png 
Log Message:
auto-import toped-0.8.2-1 on branch devel from toped-0.8.2-1.src.rpm


--- NEW FILE toped.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Toped
Exec=toped
Icon=toped
Type=Application
Terminal=false
GenericName=Toped, IC Layout Editor
Categories=Education;Science;Engineering;
X-Desktop-File-Install-Version=0.10

--- NEW FILE toped.spec ---
Name:           toped
Version:        0.8.2
Release:        1%{?dist}
Summary:        IC Layout Editor

License:        GPL
Group:          Applications/Engineering
URL:            http://www.toped.org.uk

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2

Source1:        %{name}.desktop
Source2:        toped_32x32.png
Source3:        toped_64x64.png

BuildRequires:  freeglut-devel wxGTK-devel desktop-file-utils


%description
Toped is an open source cross-platform IC layout editor,
based on openGL and wxWidgets.

#%package devel
#Summary:        Development files for toped
#Group:          Development/Libraries
#Requires:       %{name} = %{version}-%{release}

#%description devel
#Development files for toped, IC Layout Editor

%prep
%setup -q

%build
%configure       \
   --with-gtk    \
   --with-opengl \
   --with-regex  \
   --enable-threads
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}

%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install

%{__rm} -f %{buildroot}%{_libdir}/libtpd*.{a,la}

desktop-file-install --vendor fedora             \
  --add-category "Engineering"                   \
  --add-category "X-Fedora"                      \
  --dir %{buildroot}%{_datadir}/applications/    \
  %{SOURCE1}

%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/toped.png
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
%{__cp} -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/toped.png


#No translations
#%find_lang %{name}

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

%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_libdir}/libtpd*.so.0*
%{_datadir}/tll/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*x*/apps/toped.png

#%files devel
#%defattr(-,root,root,-)
#%doc NEWS TODO
%{_libdir}/libtpd_common.so
%{_libdir}/libtpd_DB.so
%{_libdir}/libtpd_parser.so

%Changelog
* Mon Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.2-1
- New upstream release 0.8.2
* Wed Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.1-2
- Icons received by upstream (by mail)

* Mon Sep 18 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.1-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Oct 2006 17:30:17 -0000	1.1
+++ .cvsignore	12 Oct 2006 17:32:46 -0000	1.2
@@ -0,0 +1 @@
+toped-0.8.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Oct 2006 17:30:17 -0000	1.1
+++ sources	12 Oct 2006 17:32:46 -0000	1.2
@@ -0,0 +1 @@
+31f6711a9b76f785a91a70167b0c6fab  toped-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 12 17:37:24 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 12 Oct 2006 10:37:24 -0700
Subject: fedora-release fedora-release.spec,1.32,1.33
Message-ID: <200610121737.k9CHbODt029921@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29903

Modified Files:
	fedora-release.spec 
Log Message:
fix up the release a bit


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fedora-release.spec	5 Oct 2006 17:03:31 -0000	1.32
+++ fedora-release.spec	12 Oct 2006 17:37:21 -0000	1.33
@@ -1,17 +1,16 @@
 %define release_name Zod
-%define release_version 6
 
 Summary:	Fedora Core release files
 Name:		fedora-release
 Version:	6
-Release:	2
+Release:	3
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
 Source:		fedora-release-%{version}.tar.gz
 Obsoletes:	redhat-release
 Provides:	redhat-release
-Requires:	fedora-release-notes >= %{release_version}
+Requires:	fedora-release-notes >= %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -26,7 +25,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc
-echo "Fedora Core release %{release_version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
+echo "Fedora Core release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
 cp $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
 echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue
 cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
@@ -64,6 +63,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Oct 12 2006 Jesse Keating <jkeating at redhat.com> - 6-3
+- version has to stay the same, safe to use.
+
 * Thu Oct  5 2006 Jesse Keating <jkeating at redhat.com> - 6-2
 - replace old mirror files with new mirrorlist cgi system
 



From fedora-extras-commits at redhat.com  Thu Oct 12 17:53:31 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:53:31 -0700
Subject: rpms/toped import.log,1.2,1.3
Message-ID: <200610121753.k9CHrX6m030100@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30067

Modified Files:
	import.log 
Log Message:
auto-import toped-0.8.2-2 on branch devel from toped-0.8.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/toped/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Oct 2006 17:32:45 -0000	1.2
+++ import.log	12 Oct 2006 17:53:30 -0000	1.3
@@ -1 +1,2 @@
 toped-0_8_2-1:HEAD:toped-0.8.2-1.src.rpm:1160674545
+toped-0_8_2-2:HEAD:toped-0.8.2-2.src.rpm:1160675810



From fedora-extras-commits at redhat.com  Thu Oct 12 17:53:31 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 10:53:31 -0700
Subject: rpms/toped/devel toped.spec,1.1,1.2
Message-ID: <200610121753.k9CHrXlm030104@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/toped/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30067/devel

Modified Files:
	toped.spec 
Log Message:
auto-import toped-0.8.2-2 on branch devel from toped-0.8.2-2.src.rpm


Index: toped.spec
===================================================================
RCS file: /cvs/extras/rpms/toped/devel/toped.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- toped.spec	12 Oct 2006 17:32:46 -0000	1.1
+++ toped.spec	12 Oct 2006 17:53:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           toped
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        IC Layout Editor
 
 License:        GPL
@@ -22,14 +22,6 @@
 Toped is an open source cross-platform IC layout editor,
 based on openGL and wxWidgets.
 
-#%package devel
-#Summary:        Development files for toped
-#Group:          Development/Libraries
-#Requires:       %{name} = %{version}-%{release}
-
-#%description devel
-#Development files for toped, IC Layout Editor
-
 %prep
 %setup -q
 
@@ -59,10 +51,13 @@
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
 %{__cp} -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/toped.png
 
-
 #No translations
 #%find_lang %{name}
 
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -71,32 +66,27 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-
 %postun
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README NEWS TODO
 %{_bindir}/%{name}
 %{_libdir}/libtpd*.so.0*
 %{_datadir}/tll/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
-#%files devel
-#%defattr(-,root,root,-)
-#%doc NEWS TODO
-%{_libdir}/libtpd_common.so
-%{_libdir}/libtpd_DB.so
-%{_libdir}/libtpd_parser.so
-
 %Changelog
+* Mon Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.2-2
+- Removed the devel package
+
 * Mon Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.2-1
 - New upstream release 0.8.2
+
 * Wed Sep 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.8.1-2
 - Icons received by upstream (by mail)
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:23:18 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 12 Oct 2006 11:23:18 -0700
Subject: rpms/enchant/devel .cvsignore, 1.8, 1.9 enchant.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200610121823.k9CINK4X000804@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv783

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
Update to 1.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 21:23:52 -0000	1.8
+++ .cvsignore	12 Oct 2006 18:23:18 -0000	1.9
@@ -1 +1 @@
-enchant-1.2.5.tar.gz
+enchant-1.3.0.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- enchant.spec	11 Sep 2006 12:35:21 -0000	1.12
+++ enchant.spec	12 Oct 2006 18:23:18 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.5
-Release: 3%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -63,6 +63,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> 1:1.3.0-1.fc6
+- Update to 1.3.0
+
 * Mon Sep 11 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-3.fc6
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 21:23:52 -0000	1.8
+++ sources	12 Oct 2006 18:23:18 -0000	1.9
@@ -1 +1 @@
-e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz
+f7edafae875616b83e7a17a7e5c2d585  enchant-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 18:25:43 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 12 Oct 2006 11:25:43 -0700
Subject: rpms/liferea/devel liferea-1.0.23-fedorafeed.patch, NONE,
	1.1 liferea.spec, 1.51, 1.52
Message-ID: <200610121825.k9CIPjEC000893@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv873

Modified Files:
	liferea.spec 
Added Files:
	liferea-1.0.23-fedorafeed.patch 
Log Message:
* Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-3
- Add patch to add Fedora default feeds. (#209301)


liferea-1.0.23-fedorafeed.patch:

--- NEW FILE liferea-1.0.23-fedorafeed.patch ---
diff -ur liferea-1.0.23.OLD/opml/feedlist.opml liferea-1.0.23/opml/feedlist.opml
--- liferea-1.0.23.OLD/opml/feedlist.opml	2006-02-04 20:10:05.000000000 -0500
+++ liferea-1.0.23/opml/feedlist.opml	2006-10-06 13:18:08.000000000 -0400
@@ -18,7 +18,13 @@
         <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
         <outline text="Slashdot" htmlUrl="http://slashdot.org"  xmlUrl="http://slashdot.org/slashdot.rss" />
         <outline text="TuxMobil" htmlUrl="http://tuxmobil.org" xmlUrl="http://tuxmobil.org/tuxmobil_rss.rdf" />      
-      </outline>	
+      </outline>
+      <outline text="Fedora">
+	<outline text="FedoraNews.org" htmlUrl="http://fedoranews.org/" xmlUrl="http://fedoranews.org/cms/taxonomy/term/15/0/feed" />
+	<outline text="Red Hat Magazine" htmlUrl="http://www.redhat.com/magazine/" xmlUrl="http://www.redhat.com/magazine/rss20.xml" />
+	<outline text="Fedora People" htmlUrl="http://fedoraproject.org/people/" xmlUrl="http://fedoraproject.org/people/rss20.xml" />
+	<outline text="Fedora Info" htmlUrl="http://fedoraproject.org/infofeed/" xmlUrl="http://fedoraproject.org/infofeed/rss20.xml" />
+      </outline>
     </outline>
     <outline text="Unread" title="Unread" description="Unread" type="vfolder" htmlUrl="" xmlUrl="vfolder">
       <outline type="rule" text="Read status" rule="unread" value="" additive="true"/>


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- liferea.spec	4 Oct 2006 22:59:45 -0000	1.51
+++ liferea.spec	12 Oct 2006 18:25:43 -0000	1.52
@@ -2,13 +2,14 @@
 
 Name:           liferea
 Version:        1.0.23
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-%{version}-fedorafeed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml2-devel
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .fedorafeed
 
 
 %build
@@ -108,6 +110,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-3
+- Add patch to add Fedora default feeds. (#209301)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.23-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:35:31 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 12 Oct 2006 11:35:31 -0700
Subject: rpms/enchant/FC-5 .cvsignore, 1.8, 1.9 enchant.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200610121835.k9CIZXq0001022@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv996

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
Update to 1.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 21:39:17 -0000	1.8
+++ .cvsignore	12 Oct 2006 18:35:31 -0000	1.9
@@ -1 +1 @@
-enchant-1.2.5.tar.gz
+enchant-1.3.0.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/enchant.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- enchant.spec	10 Apr 2006 21:43:15 -0000	1.12
+++ enchant.spec	12 Oct 2006 18:35:31 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.5
-Release: 2%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -63,6 +63,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> 1:1.3.0-1.fc5
+- Update to 1.3.0
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-2.fc5
 - Really add hspell support :X
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 21:39:17 -0000	1.8
+++ sources	12 Oct 2006 18:35:31 -0000	1.9
@@ -1 +1 @@
-e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz
+f7edafae875616b83e7a17a7e5c2d585  enchant-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 18:40:01 2006
From: fedora-extras-commits at redhat.com (Frank Büttner (frankb))
Date: Thu, 12 Oct 2006 11:40:01 -0700
Subject: rpms/qt4-qsa/FC-5 qsa-1.2.1-Qt4.2-preview.patch, NONE,
	1.1 qt4-qsa.spec, 1.3, 1.4
Message-ID: <200610121840.k9CIe34n001128@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1106

Modified Files:
	qt4-qsa.spec 
Added Files:
	qsa-1.2.1-Qt4.2-preview.patch 
Log Message:
- fix build for EMT64
- Try to bypass the broken paths in the Qt4 package.
  Not nice, but no other way until the Qt4 package will be corrected.
- compile QSA with Qt 4.2


qsa-1.2.1-Qt4.2-preview.patch:

--- NEW FILE qsa-1.2.1-Qt4.2-preview.patch ---
--- qsa-x11-opensource-1.2.1/configure2/configutils.cpp.preview	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configutils.cpp	2006-08-01 06:34:07.000000000 -0500
@@ -372,6 +372,8 @@
         qtLicense = Universal;
     } else if (qtEdition == QLatin1String("OpenSource")) {
         qtLicense = GPL;
+    } else if (qtEdition == QLatin1String("Preview")) {
+        qtLicense = GPL;
     } else {
         message(QLatin1String("\nQSA is not compatible with your Qt edition\n"));
         return false;


Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/FC-5/qt4-qsa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt4-qsa.spec	30 Jul 2006 00:56:35 -0000	1.3
+++ qt4-qsa.spec	12 Oct 2006 18:40:01 -0000	1.4
@@ -1,19 +1,28 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	14%{?dist}
-BuildRequires:	qt4-devel < 4.2 qt4-devel => 4.1.3-8
-Requires:	qt4 < 4.2
+Release:	16%{?dist}
+BuildRequires:	qt4-devel => 4.2
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
 License: 	GPL
 Group: 		Development/Libraries
 Source: 	ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz
+Patch0:		qsa-1.2.1-Qt4.2-preview.patch
 Buildroot: 	%{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) 
-%define qtinc %(qmake-qt4 -query QT_INSTALL_HEADERS)
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
+
+# fix the the broken include path
+%define qtinc %{qtdir}/include
+%ifarch x86_64
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64
+%else
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
+%endif
+
+#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS)
+#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
 
 %package devel
 Summary:	Development and doc files for qsa 
@@ -29,6 +38,7 @@
 
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
+%patch0 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -38,6 +48,7 @@
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
 ./configure -release -prefix %{qtdir}
+#./configure -release 
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -87,8 +98,18 @@
 %doc doc/html
 
 %changelog 
+* Mon Aug 07 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-16%{?dist}
+- fix build for EMT64
+
+* Mon Aug 07 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-15%{?dist}
+- Try to bypass the broken paths in the Qt4 package.
+  Not nice, but no other way until the Qt4 package will be corrected.
+
+* Wed Aug 02 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-14%{?dist}
+- try to compile QSA with Qt 4.2
+
 * Mon Jun 12 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-13%{?dist}
-- try again to fix the x86_64 build 
+- try agin to fix the x86_64 build 
 
 * Mon Jun 12 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-12%{?dist}
 - fix build for x86_64



From fedora-extras-commits at redhat.com  Thu Oct 12 18:43:15 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:43:15 -0700
Subject: rpms/libgeda import.log,1.6,1.7
Message-ID: <200610121843.k9CIhH3q001232@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1201

Modified Files:
	import.log 
Log Message:
auto-import libgeda-20060906-3 on branch FC-5 from libgeda-20060906-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgeda/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	10 Sep 2006 21:22:00 -0000	1.6
+++ import.log	12 Oct 2006 18:43:14 -0000	1.7
@@ -3,3 +3,4 @@
 libgeda-20060824-1:HEAD:libgeda-20060824-1.src.rpm:1157393328
 libgeda-20060906-1:FC-5:libgeda-20060906-1.src.rpm:1157923450
 libgeda-20060906-2:HEAD:libgeda-20060906-2.src.rpm:1157923568
+libgeda-20060906-3:FC-5:libgeda-20060906-3.src.rpm:1160678794



From fedora-extras-commits at redhat.com  Thu Oct 12 18:43:15 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:43:15 -0700
Subject: rpms/libgeda/FC-5 libgeda.spec,1.3,1.4
Message-ID: <200610121843.k9CIhHVf001236@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1201/FC-5

Modified Files:
	libgeda.spec 
Log Message:
auto-import libgeda-20060906-3 on branch FC-5 from libgeda-20060906-3.src.rpm


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/libgeda.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgeda.spec	10 Sep 2006 21:20:03 -0000	1.3
+++ libgeda.spec	12 Oct 2006 18:43:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:            libgeda
 Version:         20060906
-Release:         1%{?dist}
+Release:         3%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
@@ -59,7 +59,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 %{__rm} -f %{buildroot}%{_infodir}/dir
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %{__rm} -rf docs/Makefile*
@@ -75,7 +75,7 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_libdir}/libgeda.so.*
-
+%{_datadir}/gEDA/prolog.ps
 
 %files devel
 %defattr(-,root,root,-)
@@ -88,11 +88,16 @@
 %files doc
 %defattr(-, root, root, -)
 %doc docs/*
-%{_datadir}/gEDA/prolog.ps
-
 
 
 %Changelog
+* Wed Oct 11 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
+- Fixes Bug 210121 Printing does not produce correct post-script
+- Changed ownership of prolog.ps from libgeda-doc to libgeda
+
+* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
+- Rebuild for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
 - Upstream release 20060906
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:44:00 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:44:00 -0700
Subject: rpms/libgeda import.log,1.7,1.8
Message-ID: <200610121844.k9CIi2bZ001322@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1291

Modified Files:
	import.log 
Log Message:
auto-import libgeda-20060906-3 on branch devel from libgeda-20060906-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgeda/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	12 Oct 2006 18:43:14 -0000	1.7
+++ import.log	12 Oct 2006 18:44:00 -0000	1.8
@@ -4,3 +4,4 @@
 libgeda-20060906-1:FC-5:libgeda-20060906-1.src.rpm:1157923450
 libgeda-20060906-2:HEAD:libgeda-20060906-2.src.rpm:1157923568
 libgeda-20060906-3:FC-5:libgeda-20060906-3.src.rpm:1160678794
+libgeda-20060906-3:HEAD:libgeda-20060906-3.src.rpm:1160678840



From fedora-extras-commits at redhat.com  Thu Oct 12 18:44:01 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:44:01 -0700
Subject: rpms/libgeda/devel libgeda.spec,1.3,1.4
Message-ID: <200610121844.k9CIi3cA001326@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1291/devel

Modified Files:
	libgeda.spec 
Log Message:
auto-import libgeda-20060906-3 on branch devel from libgeda-20060906-3.src.rpm


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgeda.spec	10 Sep 2006 21:22:00 -0000	1.3
+++ libgeda.spec	12 Oct 2006 18:44:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:            libgeda
 Version:         20060906
-Release:         2%{?dist}
+Release:         3%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
@@ -59,7 +59,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 %{__rm} -f %{buildroot}%{_infodir}/dir
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %{__rm} -rf docs/Makefile*
@@ -75,7 +75,7 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_libdir}/libgeda.so.*
-
+%{_datadir}/gEDA/prolog.ps
 
 %files devel
 %defattr(-,root,root,-)
@@ -88,11 +88,13 @@
 %files doc
 %defattr(-, root, root, -)
 %doc docs/*
-%{_datadir}/gEDA/prolog.ps
-
 
 
 %Changelog
+* Wed Oct 11 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
+- Fixes Bug 210121 Printing does not produce correct post-script
+- Changed ownership of prolog.ps from libgeda-doc to libgeda
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
 - Rebuild for FC-6 devel
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:45:07 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:45:07 -0700
Subject: rpms/ngspice import.log,1.4,1.5
Message-ID: <200610121845.k9CIj9Fs001426@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1394

Modified Files:
	import.log 
Log Message:
auto-import ngspice-17-6 on branch FC-5 from ngspice-17-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ngspice/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	4 Sep 2006 08:56:44 -0000	1.4
+++ import.log	12 Oct 2006 18:45:07 -0000	1.5
@@ -1,3 +1,4 @@
 ngspice-17-4:HEAD:ngspice-17-4.src.rpm:1156958904
 ngspice-17-5:FC-5:ngspice-17-5.src.rpm:1157360280
 ngspice-17-5:HEAD:ngspice-17-5.src.rpm:1157360430
+ngspice-17-6:FC-5:ngspice-17-6.src.rpm:1160678907



From fedora-extras-commits at redhat.com  Thu Oct 12 18:45:08 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:45:08 -0700
Subject: rpms/ngspice/FC-5 ngspice-rework-17-spinit.patch, NONE,
	1.1 ngspice.spec, 1.2, 1.3
Message-ID: <200610121845.k9CIjAa8001432@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1394/FC-5

Modified Files:
	ngspice.spec 
Added Files:
	ngspice-rework-17-spinit.patch 
Log Message:
auto-import ngspice-17-6 on branch FC-5 from ngspice-17-6.src.rpm

ngspice-rework-17-spinit.patch:

--- NEW FILE ngspice-rework-17-spinit.patch ---
--- src/spinit.in	2005-05-10 23:52:58.000000000 +0200
+++ spinit.in	2006-09-19 21:35:14.000000000 +0200
@@ -10,13 +10,13 @@
 
 * For SPICE2 POLYs, edit the below line to point to the location 
 * of your codemode.
- at XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm
 
 * The other codemodels
- at XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm
 
 end
 unset __flag


Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/FC-5/ngspice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ngspice.spec	4 Sep 2006 08:54:15 -0000	1.2
+++ ngspice.spec	12 Oct 2006 18:45:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           5%{?dist}
+Release:           6%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,6 +10,8 @@
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:            ngspice-rework-17-spinit.patch
+
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -49,6 +51,17 @@
 %setup -q -n ng-spice-rework-%{version}
 
 %build
+%ifarch x86_64 sparc64 ppc64 amd64
+%{__cp} -p src/spinit.in src/spinit.in.ngspice
+cat src/spinit.in.ngspice | \
+sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+> src/spinit.in
+%endif
+
 %configure              \
     --enable-cider      \
     --enable-dot-global \
@@ -57,7 +70,10 @@
     --enable-xgraph     \
     --enable-xspice     \
     --with-x=yes        \
-    --with-readline=yes
+    --with-readline=yes \
+%ifarch x86_64 sparc64 ppc64 amd64
+  --enable-libsuffix=64 \
+%endif
 
 # make in xgraph with another flag first so
 # that we can correctly use Fedora compiler flags.
@@ -73,7 +89,7 @@
 chmod 644 src/frontend/*.{c,h}
 chmod 644 src/include/*.h
 
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 %{__rm} -f doc/Makefile*
 %{__rm} -f doc/ngspice.info*
 
@@ -81,7 +97,7 @@
 rm -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %post doc
 /sbin/install-info --quiet --info-dir=%{_infodir}/dir %{_infodir}/%{name}.info.gz >/dev/null 2>&1
@@ -104,15 +120,9 @@
 %{_bindir}/ngsconvert
 %{_bindir}/%{name}
 %{_bindir}/xgraph
-%dir %{_datadir}/ng-spice-rework
-%{_datadir}/ng-spice-rework/helpdir
-%{_datadir}/ng-spice-rework/scripts
-%dir %{_libdir}/spice/
-%{_libdir}/spice/analog.cm
-%{_libdir}/spice/digital.cm
-%{_libdir}/spice/spice2poly.cm
-%{_libdir}/spice/xtradev.cm
-%{_libdir}/spice/xtraevt.cm
+%{_datadir}/ng-spice-rework
+%{_libdir}/spice/
+
 
 
 %files doc
@@ -126,6 +136,9 @@
 
 
 %Changelog
+* Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
+- Testing on 64 bit arch 
+
 * Mon Sep 04 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-5
 - Added libXt-devel to include X headers
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:45:59 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:45:59 -0700
Subject: rpms/ngspice import.log,1.5,1.6
Message-ID: <200610121846.k9CIk1P6001524@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492

Modified Files:
	import.log 
Log Message:
auto-import ngspice-17-6 on branch devel from ngspice-17-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ngspice/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	12 Oct 2006 18:45:07 -0000	1.5
+++ import.log	12 Oct 2006 18:45:59 -0000	1.6
@@ -2,3 +2,4 @@
 ngspice-17-5:FC-5:ngspice-17-5.src.rpm:1157360280
 ngspice-17-5:HEAD:ngspice-17-5.src.rpm:1157360430
 ngspice-17-6:FC-5:ngspice-17-6.src.rpm:1160678907
+ngspice-17-6:HEAD:ngspice-17-6.src.rpm:1160678959



From fedora-extras-commits at redhat.com  Thu Oct 12 18:46:00 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:46:00 -0700
Subject: rpms/ngspice/devel ngspice-rework-17-spinit.patch, NONE,
	1.1 ngspice.spec, 1.2, 1.3
Message-ID: <200610121846.k9CIk2lW001530@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492/devel

Modified Files:
	ngspice.spec 
Added Files:
	ngspice-rework-17-spinit.patch 
Log Message:
auto-import ngspice-17-6 on branch devel from ngspice-17-6.src.rpm

ngspice-rework-17-spinit.patch:

--- NEW FILE ngspice-rework-17-spinit.patch ---
--- src/spinit.in	2005-05-10 23:52:58.000000000 +0200
+++ spinit.in	2006-09-19 21:35:14.000000000 +0200
@@ -10,13 +10,13 @@
 
 * For SPICE2 POLYs, edit the below line to point to the location 
 * of your codemode.
- at XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm
 
 * The other codemodels
- at XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm
 
 end
 unset __flag


Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ngspice.spec	4 Sep 2006 08:56:45 -0000	1.2
+++ ngspice.spec	12 Oct 2006 18:46:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           5%{?dist}
+Release:           6%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,6 +10,8 @@
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:            ngspice-rework-17-spinit.patch
+
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -49,6 +51,17 @@
 %setup -q -n ng-spice-rework-%{version}
 
 %build
+%ifarch x86_64 sparc64 ppc64 amd64
+%{__cp} -p src/spinit.in src/spinit.in.ngspice
+cat src/spinit.in.ngspice | \
+sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+> src/spinit.in
+%endif
+
 %configure              \
     --enable-cider      \
     --enable-dot-global \
@@ -57,7 +70,10 @@
     --enable-xgraph     \
     --enable-xspice     \
     --with-x=yes        \
-    --with-readline=yes
+    --with-readline=yes \
+%ifarch x86_64 sparc64 ppc64 amd64
+  --enable-libsuffix=64 \
+%endif
 
 # make in xgraph with another flag first so
 # that we can correctly use Fedora compiler flags.
@@ -73,7 +89,7 @@
 chmod 644 src/frontend/*.{c,h}
 chmod 644 src/include/*.h
 
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 %{__rm} -f doc/Makefile*
 %{__rm} -f doc/ngspice.info*
 
@@ -81,7 +97,7 @@
 rm -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %post doc
 /sbin/install-info --quiet --info-dir=%{_infodir}/dir %{_infodir}/%{name}.info.gz >/dev/null 2>&1
@@ -104,15 +120,9 @@
 %{_bindir}/ngsconvert
 %{_bindir}/%{name}
 %{_bindir}/xgraph
-%dir %{_datadir}/ng-spice-rework
-%{_datadir}/ng-spice-rework/helpdir
-%{_datadir}/ng-spice-rework/scripts
-%dir %{_libdir}/spice/
-%{_libdir}/spice/analog.cm
-%{_libdir}/spice/digital.cm
-%{_libdir}/spice/spice2poly.cm
-%{_libdir}/spice/xtradev.cm
-%{_libdir}/spice/xtraevt.cm
+%{_datadir}/ng-spice-rework
+%{_libdir}/spice/
+
 
 
 %files doc
@@ -126,6 +136,9 @@
 
 
 %Changelog
+* Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
+- Testing on 64 bit arch 
+
 * Mon Sep 04 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-5
 - Added libXt-devel to include X headers
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:47:09 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 12 Oct 2006 11:47:09 -0700
Subject: rpms/php-pear-Mail/devel .cvsignore, 1.3, 1.4 php-pear-Mail.spec,
	1.6, 1.7 sources, 1.3, 1.4 xml2changelog, 1.1, 1.2
Message-ID: <200610121847.k9CIlBUD001665@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1600

Modified Files:
	.cvsignore php-pear-Mail.spec sources xml2changelog 
Log Message:
	update to 1.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2006 10:24:23 -0000	1.3
+++ .cvsignore	12 Oct 2006 18:47:09 -0000	1.4
@@ -1 +1 @@
-Mail-1.1.13.tgz
+Mail-1.1.14.tgz


Index: php-pear-Mail.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/php-pear-Mail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-Mail.spec	16 Sep 2006 10:24:23 -0000	1.6
+++ php-pear-Mail.spec	12 Oct 2006 18:47:09 -0000	1.7
@@ -2,7 +2,7 @@
 %define pear_name Mail
 
 Name:           php-pear-Mail
-Version:        1.1.13
+Version:        1.1.14
 Release:        1%{?dist}
 Summary:        Class that provides multiple interfaces for sending emails
 Summary(fr):    Une Classe fournissant des interfaces pour envoyer des emails
@@ -50,8 +50,8 @@
 # Empty build section, most likely nothing required.
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Clean up unnecessary files
@@ -83,6 +83,9 @@
 %{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Thu Oct 12 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.14-1
+- update to 1.1.14
+
 * Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.13-1
 - regenerate SPEC with pear make-rpm-spec
 - remove PEAR from sumnary


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2006 10:24:23 -0000	1.3
+++ sources	12 Oct 2006 18:47:09 -0000	1.4
@@ -1 +1 @@
-087f63a04d95670fadc9e39948b09f8c  Mail-1.1.13.tgz
+e50da58b6b787b3903ce4d07dc791bb2  Mail-1.1.14.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	16 Sep 2006 10:24:23 -0000	1.1
+++ xml2changelog	12 Oct 2006 18:47:09 -0000	1.2
@@ -1,13 +1,28 @@
 <?php
 $prog=array_shift($_SERVER['argv']);
-if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml\n");
+if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
 $file=array_shift($_SERVER['argv']);
 
 ($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
-printf("* Version %s (%s) - %s\n\n%s\n\n",
-	$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
-foreach($xml->changelog->release as $rel)
+if ($xml['version'] >= "2"){ // Package.xml V 2.0
+	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);
+
+	foreach($xml->changelog->release as $rel)
+		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",
-		$rel->version, $rel->state, $rel->date, $rel->notes);
+		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+
+	foreach($xml->changelog->release as $rel)
+		printf("* Version %s (%s) - %s\n\n%s\n\n",
+			$rel->version, $rel->state, $rel->date, $rel->notes);
+}
 ?>



From fedora-extras-commits at redhat.com  Thu Oct 12 18:47:07 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:47:07 -0700
Subject: rpms/geda-gschem import.log,1.4,1.5
Message-ID: <200610121847.k9CIl9jA001649@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1604

Modified Files:
	import.log 
Log Message:
auto-import geda-gschem-20060906-3 on branch FC-5 from geda-gschem-20060906-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	10 Sep 2006 21:47:13 -0000	1.4
+++ import.log	12 Oct 2006 18:47:07 -0000	1.5
@@ -1,3 +1,4 @@
 geda-gschem-20060824-1:HEAD:geda-gschem-20060824-1.src.rpm:1157440721
 geda-gschem-20060906-1:FC-5:geda-gschem-20060906-1.src.rpm:1157924854
 geda-gschem-20060906-2:HEAD:geda-gschem-20060906-2.src.rpm:1157925079
+geda-gschem-20060906-3:FC-5:geda-gschem-20060906-3.src.rpm:1160679025



From fedora-extras-commits at redhat.com  Thu Oct 12 18:47:08 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:47:08 -0700
Subject: rpms/geda-gschem/FC-5 geda-gschem-ru.po.diff, NONE,
	1.1 geda-gschem.spec, 1.2, 1.3
Message-ID: <200610121847.k9CIlAmS001658@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1604/FC-5

Modified Files:
	geda-gschem.spec 
Added Files:
	geda-gschem-ru.po.diff 
Log Message:
auto-import geda-gschem-20060906-3 on branch FC-5 from geda-gschem-20060906-3.src.rpm

geda-gschem-ru.po.diff:

--- NEW FILE geda-gschem-ru.po.diff ---
--- po/ru.po	2006-09-07 05:05:17.000000000 +0200
+++ ru.po	2006-09-15 09:42:47.000000000 +0200
@@ -1,20 +1,21 @@
 # translation of ru.po to Russian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR Alexandre Pereira Nunes
-# Andy Shevchenko <andy at smile.org.ua>, 2003
 #
+# Andy Shevchenko <andy at smile.org.ua>, 2003, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-09-06 23:05-0400\n"
-"PO-Revision-Date: 2003-01-21 17:49+0200\n"
+"PO-Revision-Date: 2006-09-13 16:59+0300\n"
 "Last-Translator: Andy Shevchenko <andy at smile.org.ua>\n"
 "Language-Team: Russian <ru 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.0\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/rcstrings.c:2 src/x_print.c:342
 msgid "File"
@@ -145,14 +146,12 @@
 msgstr "?????????????? ??????????????..."
 
 #: src/rcstrings.c:35
-#, fuzzy
 msgid "Embed Component/Picture"
-msgstr "???????????????? ??????????????????"
+msgstr "???????????????? ??????????????????/??????????????????????"
 
 #: src/rcstrings.c:36
-#, fuzzy
 msgid "Unembed Component/Picture"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????/??????????????????????"
 
 #: src/rcstrings.c:37
 msgid "Update Component"
@@ -340,9 +339,8 @@
 msgstr "??????????????"
 
 #: src/rcstrings.c:87
-#, fuzzy
 msgid "Picture..."
-msgstr "????????????..."
+msgstr "??????????????????????..."
 
 #: src/rcstrings.c:89
 msgid "Hierarchy"
@@ -429,9 +427,8 @@
 msgstr "?????? ?????????? ????????????????..."
 
 #: src/rcstrings.c:112
-#, fuzzy
 msgid "Toggle Outline/Box"
-msgstr "???????????????????????? ?????????????? ????????????/????????"
+msgstr "?????????????????????? ?????????????? ????????????/????????"
 
 #: src/rcstrings.c:113
 msgid "Toggle Net Rubberband"
@@ -476,18 +473,17 @@
 msgstr "???????????? ???????????? ????????????????.\n"
 
 #: src/g_rc.c:106
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Found a version [%s%s] gschemrc file:\n"
 "[%s]\n"
 msgstr ""
-"?????????????? ???????????? [%s] ?????????? gschemrc:\n"
+"?????????????? ???????????? [%s%s] ?????????? gschemrc:\n"
 "[%s]\n"
 
 #: src/g_rc.c:109
 #, c-format
-msgid ""
-"While gschem is in ALPHA, please be sure that you have the latest rc file.\n"
+msgid "While gschem is in ALPHA, please be sure that you have the latest rc file.\n"
 msgstr ""
 "gschem ?????????????????? ?? ???????????? ALPHA, ?????????????????? ?????????????? ?????????????????? ???????????? rc-"
 "??????????.\n"
@@ -549,52 +545,50 @@
 msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? bus-ripper-size\n"
 
 #: src/g_rc.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ???????????? ?????????? [%d] ?????? ?????????????????? grid-dot-size\n"
 
 #: src/g_rc.c:1572
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ?????????????? [%d] ?????? ?????????????????? grid-fixed-threshold\n"
 
 #: src/g_rc.c:1616
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ???????????????? [%d] ?????? ?????????????????? add-attribute-offset\n"
 
 #: src/g_rc.c:1640
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
-msgstr "???????????????? ???????????????????? ?????????????? [%d] ?????? ?????????????????? undo-levels\n"
+msgstr "???????????????? ?????????? ???????????? [%d] ?????? ?????????????????? auto-save-interval\n"
 
 #: src/g_rc.c:1681
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? snap-size\n"
+msgstr "???????????????? ?????????????????? [%d] ?????? ?????????????????? mousepan-gain\n"
 
 #: src/g_rc.c:1704
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? snap-size\n"
+msgstr "???????????????? ?????????????????? [%d] ?????? ?????????????????? keyboardpan-gain\n"
 
 #: src/gschem.c:141 src/gschem.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "gEDA/gschem version %s%s\n"
-msgstr "???????????? gEDA/gschem %s\n"
+msgstr "???????????? gEDA/gschem %s%s\n"
 
 #: src/gschem.c:143 src/gschem.c:153
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
 "details.\n"
-msgstr ""
-"gEDA/gschem ???????????????????????? ?????? ????????????????; ???????????????? COPYING ?????? ????????????????????????.\n"
+msgstr "gEDA/gschem ???????????????????????? ?????? ????????????????; ???????????????? COPYING ?????? ????????????????????????.\n"
 
 #: src/gschem.c:145 src/gschem.c:155
 #, c-format
-msgid ""
-"This is free software, and you are welcome to redistribute it under certain\n"
+msgid "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 "?????? ?????????????????? ?????????????????????? ??????????????????????, ?? ?????? ?????????? ???????????????????????????? ?????? "
 "??????????????????\n"
@@ -690,9 +684,8 @@
 msgstr "?????????? ????????????????????????????"
 
 #: src/i_basic.c:144
-#, fuzzy
 msgid "Picture Mode"
-msgstr "?????????? ??????????????????"
+msgstr "?????????? ??????????????????????"
 
 #: src/i_basic.c:147
 msgid "Circle Mode"
@@ -715,14 +708,12 @@
 msgstr "??????????????????????"
 
 #: src/i_basic.c:159 src/i_callbacks.c:735 src/i_callbacks.c:754
-#, fuzzy
 msgid "Multiple Copy"
-msgstr "?????????????????????????? ??????????????????"
+msgstr "?????????????????????????? ??????????????????????"
 
 #: src/i_basic.c:162
-#, fuzzy
 msgid "Multiple Copy Mode"
-msgstr "?????????? ??????????????????????"
+msgstr "?????????? ???????????????????????????? ??????????????????????"
 
 #: src/i_basic.c:197
 msgid "Snap Off"
@@ -765,12 +756,12 @@
 
 #: src/i_callbacks.c:150
 msgid "Documentation commands not supported under MinGW.\n"
-msgstr ""
+msgstr "?????????????? ???????????????????????? ???? ???????????????????????????? ?? MinGW.\n"
 
 #: src/i_callbacks.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "New page created [%s]\n"
-msgstr "?????????? ???????????????? ?????????????? [%s]\n"
+msgstr "?????????????? ?????????? ???????????????? [%s]\n"
 
 #: src/i_callbacks.c:264
 msgid "New Window created\n"
@@ -795,9 +786,8 @@
 msgstr "???????????? ?????? ?????????????? ????????????????????"
 
 #: src/i_callbacks.c:408
-#, fuzzy
 msgid "Failed to Save All"
-msgstr "?????????????????? ??????"
+msgstr "???????????? ?????? ???????????????????? ??????????"
 
 #: src/i_callbacks.c:410
 msgid "Saved All"
@@ -904,9 +894,8 @@
 msgstr "???????????????? [%s]\n"
 
 #: src/i_callbacks.c:1909
-#, fuzzy
 msgid "Really revert page?"
-msgstr "???????????????????? ????????????????"
+msgstr "?????????????????????????? ???????????????????? ?????????????????"
 
 #: src/i_callbacks.c:1995 src/i_callbacks.c:2015 src/i_callbacks.c:2041
 #, c-format
@@ -1199,36 +1188,36 @@
 msgstr "????????????: ???????????? NULL ?? o_rotate_90!\n"
 
 #: src/o_misc.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "Component [%s] has been embedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? [%s] ?????? ?????? ??????????????\n"
 
 #: src/o_misc.c:600
-#, fuzzy, c-format
+#, c-format
 msgid "Picture [%s] has been embedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????????? [%s] ?????? ?????? ????????????????\n"
 
 #: src/o_misc.c:632
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
 "embedded\n"
-msgstr "???????????????????? ?????????? ?????????????????? [%s], ???? ?????????? ?????????????? ????????????????????.\n"
+msgstr "???????????????????? ?????????? ?????????????????? [%s], ???? ?????????? ?????????????? ????????????????????. ?????????????????? ?????? ?????? ??????????????\n"
 
 #: src/o_misc.c:643 src/o_misc.c:1608
 #, c-format
 msgid "More than one component found with name [%s]\n"
-msgstr ""
+msgstr "?????????????? ?????????? ???????????? ???????????????????? ?? ???????????? [%s]\n"
 
 #: src/o_misc.c:651
-#, fuzzy, c-format
+#, c-format
 msgid "Component [%s] has been successfully unembedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? [%s] ?????????????? ????????????????\n"
 
 #: src/o_misc.c:666
-#, fuzzy, c-format
+#, c-format
 msgid "Picture [%s] has been unembedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????????? [%s] ??????????????????\n"
 
 #: src/o_misc.c:702
 #, c-format
@@ -1245,32 +1234,31 @@
 
 #: src/o_misc.c:1603
 msgid "Could not unembedded component, could not find appropriate .sym file\n"
-msgstr ""
+msgstr "???????????????????? ?????????????????? ??????????????????, ???????????????????? ?????????? ?????????????????????????????? .sym-????????\n"
 
 #: src/o_misc.c:1604
-#, fuzzy
 msgid "Component still embedded and not updated\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? ?????? ?????? ?????????????? ?? ???? ????????????????\n"
 
 #: src/o_misc.c:1745
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
-msgstr ""
+msgstr "o_autosave_backups: ???????????????????? ???????????????? ?????????????? ?????? ?????????? ?????? %s."
 
 #: src/o_misc.c:1789
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ?????????? ????????????-???????????? ?????? ???????????????????? ?????????????????? ?????????? ?????????? [%s]\n"
 
 #: src/o_misc.c:1807
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ?????????? ???????????? ???????????? ?????? ???????????????????? ?????????? [%s]\n"
 
 #: src/o_misc.c:1812
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT save backup file [%s]\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ?????????????????? ?????????????????? ???????? [%s]\n"
 
 #: src/o_move.c:220
 #, c-format
@@ -1280,7 +1268,7 @@
 #: src/o_move.c:334
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
-msgstr ""
+msgstr "????! ?????????????? ?????????? ??????-????????, ???? ???????????? ???? ????????????????????!\n"
 
 #: src/o_move.c:355
 #, c-format
@@ -1304,16 +1292,16 @@
 
 #: src/o_picture.c:174 src/o_picture.c:838
 msgid "Please select a picture file."
-msgstr ""
+msgstr "????????????????????, ???????????????? ???????? ??????????????????????."
 
 #: src/o_picture.c:241 src/o_picture.c:750
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load picture: %s"
-msgstr "???????????????????? ?????????????????? ?????????????????? scm-???????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ??????????????????????: [%s]"
 
 #: src/o_picture.c:260
 msgid "Picture"
-msgstr ""
+msgstr "??????????????????????"
 
 #: src/o_picture.c:776 src/x_attribedit.c:153
 #, c-format
@@ -1342,9 +1330,9 @@
 msgstr "???? ?????????????????? ?????????????? ???????? ????????-???? ??????????????????????????????!\n"
 
 #: src/o_text.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "Tried to render text with an invalid angle: %d\n"
-msgstr "?????????????? ?????????????????? ?????????????????? ??????????: %d\n"
+msgstr "?????????????? ?????????????????? ???????????? ?? ???????????????? ??????????: %d\n"
 
 #: src/o_undo.c:320
 msgid "Undo/Redo disabled in rc file\n"
@@ -1364,11 +1352,21 @@
 "  -h            Help; this message\n"
 "\n"
 msgstr ""
+"??????????????????????????: %s [??????????] ????????_??????????1 ... ????????_??????????N\n"
+"  -q            ???????????? ???? ????????????????\n"
+"  -v            ???????????????? ?????????? ???????????????????? ??????????????????\n"
+"  -r ????????       ???????????????????????? ?? ???????????????? ?????????????????????????????????? ???????? ????????\n"
+"  -s ????????       ?????? ?????????? ?????????????? (guile)\n"
+"  -o ????????       ?????? ?????????????????? ?????????? (?????? ????????????)\n"
+"  -p            ?????????????????????????? ?????????????????????? ????????\n"
+"  -t            ???????????????? ?????????????????? ????????????????????\n"
+"  -h            ????????????; ?????? ??????????????????\n"
+"\n"
 
 #: src/x_attribedit.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Got invalid show option; defaulting to show both\n"
-msgstr "???????????????? ???????????????? ?????????? ??????????????????, ???????????????????????? ??????????"
+msgstr "???????????????? ???????????????? ?????????? ??????????????????, ?????????????????????????????? ???????????????? ??????????\n"
 
 #: src/x_attribedit.c:363
 msgid "Single Attribute Editor"
@@ -1498,9 +1496,8 @@
 msgstr "?????????????? ????????????"
 
 #: src/x_dialog.c:607
-#, fuzzy
 msgid "Edit Text Color"
-msgstr "???????????? ????????????"
+msgstr "???????????? ?????????? ????????????"
 
 #: src/x_dialog.c:619
 msgid "Edit Text Size"
@@ -1537,7 +1534,7 @@
 #: src/x_dialog.c:1498 src/x_dialog.c:1499 src/x_dialog.c:1500
 #: src/x_dialog.c:1501 src/x_dialog.c:1502 src/x_dialog.c:1510
 msgid "*unchanged*"
-msgstr ""
+msgstr "*????????????????????*"
 
 #: src/x_dialog.c:958
 msgid "Edit Line Width & Type"
@@ -1564,9 +1561,8 @@
 msgstr "??????????????"
 
 #: src/x_dialog.c:1103
-#, fuzzy
 msgid "Filled"
-msgstr "????????"
+msgstr "??????????????????"
 
 #: src/x_dialog.c:1104
 msgid "Mesh"
@@ -1597,14 +1593,13 @@
 msgstr "????????????2"
 
 #: src/x_dialog.c:1637
-#, fuzzy
 msgid ""
 "There are unsaved schematics!\n"
 "\n"
 "Are you sure?\n"
 "OK will discard ALL changes!"
 msgstr ""
-"?????????? ???? ??????????????????!\n"
+"?????????? ???? ???????? ??????????????????!\n"
 "\n"
 "???? ???????????????\n"
 "???? ?????????????? ?????? ??????????????????!"
@@ -1656,13 +1651,12 @@
 
 #: src/x_dialog.c:2515
 msgid "gEDA : GPL Electronic Design Automation"
-msgstr ""
-"gEDA: ?????????????? ?????????????????????????????????????? ???????????????????????????? ?????????????????????? ???????? (GPL)"
+msgstr "gEDA: ?????????????? ?????????????????????????????????????? ???????????????????????????? ?????????????????????? ???????? (GPL)"
 
 #: src/x_dialog.c:2523
-#, fuzzy, c-format
+#, c-format
 msgid "gschem version %s%s"
-msgstr "???????????? gschem %s"
+msgstr "???????????? gschem %s%s"
 
 #: src/x_dialog.c:2531
 msgid ""
@@ -1701,12 +1695,11 @@
 #: src/x_dialog.c:3097
 #, c-format
 msgid "Ran out of space in the hotkey buffer...\n"
-msgstr ""
+msgstr "???????????????????? ???????????????????????? ???????????? ?????????????? ????????????...\n"
 
 #: src/x_dialog.c:3174
-#, fuzzy
 msgid "Function : keystroke(s)"
-msgstr "?????????????? : "
+msgstr "?????????????? : ???????????????????? ????????????"
 
 #: src/x_dialog.c:3519
 msgid "Generic String"
@@ -1747,86 +1740,76 @@
 #: src/x_dialog.c:4011
 #, c-format
 msgid "Warning: negative numbers not allowed in the autonumber_text dialog\n"
-msgstr ""
+msgstr "????????????????????????????: ?????????????????????????? ???????????????? ???? ?????????????????????? ?? ?????????????? autonumber_text\n"
 
 #: src/x_dialog.c:4095
 msgid "Autonumber text"
 msgstr "???????????????????????????? ??????????"
 
 #: src/x_dialog.c:4101
-#, fuzzy
 msgid "selection"
-msgstr "??????????????"
+msgstr "??????????"
 
 #: src/x_dialog.c:4110
-#, fuzzy
 msgid "search text"
-msgstr "???????????????? ??????????"
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4138
 msgid "search focus"
-msgstr ""
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4151
-#, fuzzy
 msgid "selected objects"
-msgstr "???????????? ???????????????????????????? ????????????!\n"
+msgstr "?????????????? ??????????????"
 
 #: src/x_dialog.c:4154
-#, fuzzy
 msgid "current sheet"
-msgstr "???????????????? ????????"
+msgstr "?????????????? ????????"
 
 #: src/x_dialog.c:4157
 msgid "hierarchical sheets"
-msgstr ""
+msgstr "???????????????? ????????????"
 
 #: src/x_dialog.c:4169
-#, fuzzy
 msgid "unnumbered"
-msgstr "???????????????????????????? ??????????"
+msgstr "???? ??????????????????????????"
 
 #: src/x_dialog.c:4173
-#, fuzzy
 msgid "all"
-msgstr "??????"
+msgstr "??????"
 
 #: src/x_dialog.c:4182
-#, fuzzy
 msgid "options"
-msgstr "??????????????????"
+msgstr "??????????"
 
 #: src/x_dialog.c:4189
-#, fuzzy
 msgid "start number"
-msgstr "???????????? ???????????? ??????????"
+msgstr "?????????????????? ??????????"
 
 #: src/x_dialog.c:4202
 msgid "sort order"
-msgstr ""
+msgstr "?????????????? ????????????????????"
 
 #: src/x_dialog.c:4214
-#, fuzzy
 msgid "file order"
-msgstr "?????????? ????????????????????"
+msgstr "?????????????? ????????????"
 
 #: src/x_dialog.c:4217
 msgid "top down"
-msgstr ""
+msgstr "???????? ??????"
 
 #: src/x_dialog.c:4220
-#, fuzzy
 msgid "left right"
-msgstr "?????????????? ????????????"
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4223
 msgid "diagonal"
-msgstr ""
+msgstr "????????????????????????"
 
 #: src/x_fileselect.c:300
-#, fuzzy, c-format
+#, c-format
 msgid "Agg, could not open directory: %s\n"
-msgstr "???????????????????? ?????????????? ??????????????: %s\n"
+msgstr "????, ???????????????????? ?????????????? ??????????????: %s\n"
 
 #: src/x_fileselect.c:327
 #, c-format
@@ -1937,33 +1920,28 @@
 msgstr "?????? ??????????"
 
 #: src/x_fileselect.c:2261
-#, fuzzy
 msgid "Schematics"
-msgstr "sch - ??????????"
+msgstr "??????????"
 
 #: src/x_fileselect.c:2264
-#, fuzzy
 msgid "Symbols"
-msgstr "sym - ??????????????"
+msgstr "??????????????"
 
 #: src/x_fileselect.c:2267
-#, fuzzy
 msgid "Schematics and symbols"
-msgstr "sym/sch - ?????????? ?? ??????????????"
+msgstr "?????????? ?? ??????????????"
 
 #: src/x_fileselect.c:2271
-#, fuzzy
 msgid "All files"
-msgstr "* - ?????? ??????????"
+msgstr "?????? ??????????"
 
 #: src/x_fileselect.c:2343
-#, fuzzy
 msgid "Discard changes"
-msgstr "???????????????????? ???????????????????"
+msgstr "???????????????????? ??????????????????"
 
 #: src/x_image.c:291
 msgid "x_image_lowlevel: Unable to write PNG file.\n"
-msgstr ""
+msgstr "x_image_lowlevel: ???????????????????? ???????????????? PNG-????????.\n"
 
 #: src/x_image.c:295 src/x_image.c:326
 #, c-format
@@ -1977,7 +1955,7 @@
 
 #: src/x_image.c:307
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
-msgstr ""
+msgstr "x_image_lowlevel: ???????????????????? ???????????????? ?????????? ?????????????????????? ???? ???????? gschem.\n"
 
 #: src/x_image.c:415
 msgid "Write Image..."
@@ -2000,105 +1978,88 @@
 msgstr "????????????"
 
 #: src/x_menus.c:35
-#, fuzzy
 msgid "/Add Net"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ????????????????????"
 
 #: src/x_menus.c:36
-#, fuzzy
 msgid "/Add Attribute..."
-msgstr "????????????????/???????????????????????????? ??????????????"
+msgstr "/???????????????? ??????????????"
 
 #: src/x_menus.c:37
-#, fuzzy
 msgid "/Add Component..."
-msgstr "??????????????????..."
+msgstr "/???????????????? ??????????????????..."
 
 #: src/x_menus.c:38
-#, fuzzy
 msgid "/Add Bus"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ????????"
 
 #: src/x_menus.c:39
-#, fuzzy
 msgid "/Add Text"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ??????????"
 
 #: src/x_menus.c:41
-#, fuzzy
 msgid "/Zoom In"
-msgstr "??????????????????"
+msgstr "/??????????????????"
 
 #: src/x_menus.c:42
-#, fuzzy
 msgid "/Zoom Out"
-msgstr "??????????????????"
+msgstr "/??????????????????"
 
 #: src/x_menus.c:43
-#, fuzzy
 msgid "/Zoom Box"
-msgstr "?????????????? ?????? ??????????????????????????????"
+msgstr "/?????????????? ?????? ??????????????????????????????"
 
 #: src/x_menus.c:44
-#, fuzzy
 msgid "/Zoom Extents"
-msgstr "?????????????? ???? ??????????"
+msgstr "/?????????????? ???? ??????????"
 
 #: src/x_menus.c:46
-#, fuzzy
 msgid "/Select"
-msgstr "??????????????"
+msgstr "/??????????????"
 
 #: src/x_menus.c:47
-#, fuzzy
 msgid "/Edit..."
-msgstr "????????????..."
+msgstr "/????????????..."
 
 #: src/x_menus.c:48
-#, fuzzy
 msgid "/Copy"
-msgstr "????????????????????"
+msgstr "/????????????????????"
 
 #: src/x_menus.c:49
-#, fuzzy
 msgid "/Move"
-msgstr "??????????????????????"
+msgstr "/??????????????????????"
 
 #: src/x_menus.c:50
-#, fuzzy
 msgid "/Delete"
-msgstr "??????????????"
+msgstr "/??????????????"
 
 #: src/x_menus.c:53
-#, fuzzy
 msgid "/Down Schematic"
-msgstr "???????????? ??????????"
+msgstr "/???????????? ??????????"
 
 #: src/x_menus.c:54
-#, fuzzy
 msgid "/Down Symbol"
-msgstr "???????????? ??????????????"
+msgstr "/???????????? ??????????????"
 
 #: src/x_menus.c:55
-#, fuzzy
 msgid "/Up"
-msgstr "????????????"
+msgstr "/????????????"
 
 #: src/x_menus.c:329
 msgid "Tried to set the sensitivity on a non-existent menu item\n"
-msgstr ""
+msgstr "?????????????? ?????????????????? ???????????????????????????????? ?????? ?????????????????????????????? ???????????? ????????\n"
 
 #: src/x_menus.c:353
 msgid "Popup_menu_item_factory doesn't exist!\n"
-msgstr ""
+msgstr "Popup_menu_item_factory ???? ????????????????????!\n"
 
 #: src/x_menus.c:366
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
-msgstr ""
+msgstr "?????????????? ?????????????????? ???????????????????????????????? ?????? ?????????????????????????????? ???????????????????????????? menu_item\n"
 
 #: src/x_multiattrib.c:625
 msgid "Attributes with empty name are not allowed. Please set a name."
-msgstr ""
+msgstr "???????????????? ?? ???????????? ???????????? ??????????????????????. ????????????????????, ???????????????????? ??????."
 
 #: src/x_multiattrib.c:1131
 msgid "Show Value only"
@@ -2110,7 +2071,7 @@
 
 #: src/x_multiattrib.c:1159
 msgid "Duplicate"
-msgstr ""
+msgstr "??????????????????????"
 
 #: src/x_multiattrib.c:1276
 msgid "Edit Attributes"
@@ -2137,9 +2098,8 @@
 msgstr ""
 
 #: src/x_multiattrib.c:1464
-#, fuzzy
 msgid "Add Attribute"
-msgstr "????????????????/???????????????????????????? ??????????????"
+msgstr "???????????????? ??????????????"
 
 #: src/x_pagesel.c:267
 msgid "Discard Page"
@@ -2150,30 +2110,28 @@
 msgstr "???????????????? ??????????????"
 
 #: src/x_pagesel.c:448
-#, fuzzy
 msgid "Changed"
-msgstr "????????????????"
+msgstr "????????????????"
 
 #: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
-msgstr ""
+msgstr "???????????????? ???????????? ?????????????? ???? ?????????? ?????????? ?????? ???????????????????????????? ??????????..."
 
 #: src/x_preview.c:127
 msgid "x_preview_update_gtk24: Can't get pixbuf from preview struct.\n"
-msgstr ""
+msgstr "x_preview_update_gtk24: ???????????????????? ???????????????? ?????????? ?????????????????????? ???? ???????????????????? ??????????????????.\n"
 
 #: src/x_print.c:91
-#, fuzzy
 msgid "Save PostScript As..."
-msgstr "?????????????????? ???????????????? ??????..."
+msgstr "?????????????????? PostScript ??????..."
 
 #: src/x_print.c:188
 msgid "Extents with margins"
-msgstr ""
+msgstr "?????????????????? ?? ????????????"
 
 #: src/x_print.c:191
 msgid "Extents no margins"
-msgstr ""
+msgstr "?????????????????? ?????? ??????????"
 
 #: src/x_print.c:195
 msgid "Current Window"
@@ -2189,7 +2147,7 @@
 
 #: src/x_print.c:283
 msgid "Settings"
-msgstr ""
+msgstr "??????????????????"
 
 #: src/x_print.c:295
 msgid "Output paper size"
@@ -2204,17 +2162,16 @@
 msgstr "????????????????????"
 
 #: src/x_print.c:329
-#, fuzzy
 msgid "Destination"
-msgstr "????????????????????????"
+msgstr "????????????????????"
 
 #: src/x_print.c:368
 msgid "Command"
-msgstr ""
+msgstr "??????????????"
 
 #: src/x_print.c:690
 msgid "No print destination specified\n"
-msgstr ""
+msgstr "???? ?????????????? ???????????????????? ?????? ????????????\n"
 
 #: src/x_print.c:697
 #, c-format
@@ -2351,175 +2308,54 @@
 msgid "Pan/Cancel"
 msgstr "??????????/????????????"
 
-#~ msgid "OK"
-#~ msgstr "????"
-
-#~ msgid "Cancel"
-#~ msgstr "????????????"
-
-#~ msgid "Apply"
-#~ msgstr "??????????????????"
-
-#~ msgid "Find"
-#~ msgstr "??????????"
-
-#~ msgid "Done"
-#~ msgstr "????????????"
-
-#~ msgid "SaveAs"
-#~ msgstr "?????????????????? ??????"
+msgid "Image"
+msgstr "??????????????????????"
 
-#~ msgid "Write"
-#~ msgstr "????????????????"
-
-#~ msgid "Print"
-#~ msgstr "????????????"
-
-#~ msgid "Edit mode"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Move mode"
-#~ msgstr "?????????? ??????????????????????"
-
-#~ msgid "Copy mode"
-#~ msgstr "?????????? ??????????????????????"
-
-#~ msgid "Delete mode"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Rotate mode"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Mirror mode"
-#~ msgstr "?????????? ????????????????????????????"
-
-#, fuzzy
-#~ msgid "Invalid number of lines [%d] passed to output-vector-threshold\n"
-#~ msgstr "???????????????? ???????????????????? ?????????????? [%d] ?????? ?????????????????? undo-levels\n"
-
-#~ msgid "Comps"
-#~ msgstr "????????????????????"
-
-#~ msgid "Both"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "Image"
-#~ msgstr "????????????????"
-
-#~ msgid "Deattach"
-#~ msgstr "????????????????"
-
-#~ msgid "%s requires a string as a parameter\n"
-#~ msgstr "%s ?????????????? ???????????? ?? ???????????????? ??????????????????\n"
-
-#~ msgid "Invalid parameters to paper-sizes\n"
-#~ msgstr "???????????????? ?????????????????? ?? paper-sizes\n"
-
-#~ msgid "Cannot obtain the current directory!\n"
-#~ msgstr "???????????????????? ?????????? ?? ?????????????? ??????????????!\n"
-
-#~ msgid "Cannot get cwd!\n"
-#~ msgstr "???????????????????? ???????????????? ?????? ???????????????? ????????????????!\n"
-
-#~ msgid "ERROR: NULL object in o_embed!\n"
-#~ msgstr "????????????: ???????????? NULL ?? o_embed!\n"
-
-#~ msgid "Warning: two components with same refdes: %d\n"
-#~ msgstr "????????????????????????????: ?????? ???????????????????? ?? ???????????????????? refdes: %d\n"
-
-#~ msgid "Got an unexpected NULL in o_update_component\n"
-#~ msgstr "?????????????????????? NULL ?? o_update_component\n"
-
-#~ msgid "Invalid space specified, setting to 100\n"
-#~ msgstr "?????????????????? ???????????????? ????????????, ?????????????????????????????? ?? 100\n"
-
-#~ msgid "Invalid length specified, setting to 100\n"
-#~ msgstr "???????????????????? ???????????????? ??????????, ?????????????????????????????? ?? 100\n"
-
-#~ msgid "Autonumber text starting with:"
-#~ msgstr "???????????????????????????? ??????????, ???????????????????????? ??:"
-
-#~ msgid "Yes"
-#~ msgstr "????"
-
-#~ msgid "No"
-#~ msgstr "??????"
-
-#~ msgid "Add/Edit"
-#~ msgstr "????????????????/??????????????????????????"
-
-#~ msgid "Clear"
-#~ msgstr "????????????????"
-
-#~ msgid "Open Page"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Update Manager"
-#~ msgstr "???????????????? ????????????????"
-
-#~ msgid "Close Manager"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Read system-gschemrc file [%s]\n"
-#~ msgstr "???????????? ?????????? system-gschemrc [%s]\n"
-
-#, fuzzy
-#~ msgid "Did not find required system-gschemrc file [%s]\n"
-#~ msgstr "???????? system-gschemrc ???? ?????? ???????????? [%s]\n"
-
-#~ msgid "Read ~/.gEDA/gschemrc file [%s]\n"
-#~ msgstr "???????????? ?????????? ~/.gEDA/gschemrc [%s]\n"
-
-#, fuzzy
-#~ msgid "Did not find optional ~/.gEDA/gschemrc file [%s]\n"
-#~ msgstr "???????? ~/.gEDA/gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "Comps"
+msgstr "????????????????????"
 
-#~ msgid "Read local gschemrc file [%s]\n"
-#~ msgstr "???????????? ???????????????????? ?????????? gschemrc [%s]\n"
+msgid "Both"
+msgstr "??????"
 
-#, fuzzy
-#~ msgid "Did not find optional local gschemrc file [%s]\n"
-#~ msgstr "?????????????????? ???????? gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "OK"
+msgstr "????"
 
-#~ msgid "Read specified rc file [%s]\n"
-#~ msgstr "???????????? ???????????????????????? rc-?????????? [%s]\n"
+msgid "Apply"
+msgstr "??????????????????"
 
-#~ msgid "Did not find specified gschemrc file [%s]\n"
-#~ msgstr "?????????????????? ???????? gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "Cancel"
+msgstr "????????????"
 
-#~ msgid "Could not find any gschemrc file!\n"
-#~ msgstr "???????????????????? ?????????? ???? ???????????? ?????????? gschemrc!\n"
+msgid "Find"
+msgstr "??????????"
 
-#~ msgid "Could not find a gschemrc file\n"
-#~ msgstr "???????????????????? ?????????? ???????? gschemrc\n"
+msgid "Done"
+msgstr "????????????"
 
-#~ msgid "Invalid path [%s] passed to component-library\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? component-library\n"
+msgid "SaveAs"
+msgstr "?????????????????? ??????"
 
-#~ msgid "Invalid path [%s] passed to component-library-search\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? component-library-search\n"
+msgid "Write"
+msgstr "????????????????"
 
-#~ msgid "Invalid path [%s] passed to %s\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? %s\n"
+msgid "Print"
+msgstr "????????????"
 
-#~ msgid "Invalid path [%s] passed to source-library-search\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? source-library-search\n"
+msgid "Edit mode"
+msgstr "?????????? ????????????"
 
-#~ msgid "Invalid path [%s] passed to scheme-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? scheme-directory\n"
+msgid "Move mode"
+msgstr "?????????? ??????????????????????"
 
-#~ msgid "Invalid path [%s] passed to bitmap-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? bitmap-directory\n"
+msgid "Copy mode"
+msgstr "?????????? ??????????????????????"
 
-#~ msgid "Invalid path [%s] passed to font-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? font-directory\n"
+msgid "Delete mode"
+msgstr "?????????? ????????????????"
 
-#~ msgid "Ok"
-#~ msgstr "????"
+msgid "Rotate mode"
+msgstr "?????????? ????????????????"
 
-#~ msgid "Edit Component"
-#~ msgstr "?????????????????????????? ??????????????????"
+msgid "Mirror mode"
+msgstr "?????????? ????????????????????????????"
 
-#~ msgid "Limits"
-#~ msgstr "????????????????????????"


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-5/geda-gschem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-gschem.spec	10 Sep 2006 21:43:33 -0000	1.2
+++ geda-gschem.spec	12 Oct 2006 18:47:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             geda-gschem
 Version:          20060906
-Release:          1%{?dist}
+Release:          3%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
@@ -12,6 +12,9 @@
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
+# by Andy Shevchenko #206280
+Patch0:           geda-gschem-ru.po.diff
+
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
@@ -23,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b ru.po
 
 %build
 %{__cp} -p configure.ac configure.ac.gdgeda
@@ -130,11 +134,16 @@
 %{_datadir}/gEDA/gschem-lightbg
 %{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
-#%{_infodir}/gschemdoc.info*
 %{_mandir}/man1/gschem.*
-#%{_datadir}/gEDA/docs/man/gschem.html
+
 
 %Changelog
+* Fri Sep 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
+- patch for russian translation by Andy Shevchenko #206280
+
+* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
+- Rebuilt for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
 - Upstream release 20060906
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:48:13 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:48:13 -0700
Subject: rpms/geda-gschem import.log,1.5,1.6
Message-ID: <200610121848.k9CImFaQ001809@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1773

Modified Files:
	import.log 
Log Message:
auto-import geda-gschem-20060906-3 on branch devel from geda-gschem-20060906-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	12 Oct 2006 18:47:07 -0000	1.5
+++ import.log	12 Oct 2006 18:48:13 -0000	1.6
@@ -2,3 +2,4 @@
 geda-gschem-20060906-1:FC-5:geda-gschem-20060906-1.src.rpm:1157924854
 geda-gschem-20060906-2:HEAD:geda-gschem-20060906-2.src.rpm:1157925079
 geda-gschem-20060906-3:FC-5:geda-gschem-20060906-3.src.rpm:1160679025
+geda-gschem-20060906-3:HEAD:geda-gschem-20060906-3.src.rpm:1160679092



From fedora-extras-commits at redhat.com  Thu Oct 12 18:48:14 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Thu, 12 Oct 2006 11:48:14 -0700
Subject: rpms/geda-gschem/devel geda-gschem-ru.po.diff, NONE,
	1.1 geda-gschem.spec, 1.2, 1.3
Message-ID: <200610121848.k9CImGBM001816@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1773/devel

Modified Files:
	geda-gschem.spec 
Added Files:
	geda-gschem-ru.po.diff 
Log Message:
auto-import geda-gschem-20060906-3 on branch devel from geda-gschem-20060906-3.src.rpm

geda-gschem-ru.po.diff:

--- NEW FILE geda-gschem-ru.po.diff ---
--- po/ru.po	2006-09-07 05:05:17.000000000 +0200
+++ ru.po	2006-09-15 09:42:47.000000000 +0200
@@ -1,20 +1,21 @@
 # translation of ru.po to Russian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR Alexandre Pereira Nunes
-# Andy Shevchenko <andy at smile.org.ua>, 2003
 #
+# Andy Shevchenko <andy at smile.org.ua>, 2003, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-09-06 23:05-0400\n"
-"PO-Revision-Date: 2003-01-21 17:49+0200\n"
+"PO-Revision-Date: 2006-09-13 16:59+0300\n"
 "Last-Translator: Andy Shevchenko <andy at smile.org.ua>\n"
 "Language-Team: Russian <ru 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.0\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/rcstrings.c:2 src/x_print.c:342
 msgid "File"
@@ -145,14 +146,12 @@
 msgstr "?????????????? ??????????????..."
 
 #: src/rcstrings.c:35
-#, fuzzy
 msgid "Embed Component/Picture"
-msgstr "???????????????? ??????????????????"
+msgstr "???????????????? ??????????????????/??????????????????????"
 
 #: src/rcstrings.c:36
-#, fuzzy
 msgid "Unembed Component/Picture"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????/??????????????????????"
 
 #: src/rcstrings.c:37
 msgid "Update Component"
@@ -340,9 +339,8 @@
 msgstr "??????????????"
 
 #: src/rcstrings.c:87
-#, fuzzy
 msgid "Picture..."
-msgstr "????????????..."
+msgstr "??????????????????????..."
 
 #: src/rcstrings.c:89
 msgid "Hierarchy"
@@ -429,9 +427,8 @@
 msgstr "?????? ?????????? ????????????????..."
 
 #: src/rcstrings.c:112
-#, fuzzy
 msgid "Toggle Outline/Box"
-msgstr "???????????????????????? ?????????????? ????????????/????????"
+msgstr "?????????????????????? ?????????????? ????????????/????????"
 
 #: src/rcstrings.c:113
 msgid "Toggle Net Rubberband"
@@ -476,18 +473,17 @@
 msgstr "???????????? ???????????? ????????????????.\n"
 
 #: src/g_rc.c:106
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Found a version [%s%s] gschemrc file:\n"
 "[%s]\n"
 msgstr ""
-"?????????????? ???????????? [%s] ?????????? gschemrc:\n"
+"?????????????? ???????????? [%s%s] ?????????? gschemrc:\n"
 "[%s]\n"
 
 #: src/g_rc.c:109
 #, c-format
-msgid ""
-"While gschem is in ALPHA, please be sure that you have the latest rc file.\n"
+msgid "While gschem is in ALPHA, please be sure that you have the latest rc file.\n"
 msgstr ""
 "gschem ?????????????????? ?? ???????????? ALPHA, ?????????????????? ?????????????? ?????????????????? ???????????? rc-"
 "??????????.\n"
@@ -549,52 +545,50 @@
 msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? bus-ripper-size\n"
 
 #: src/g_rc.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid dot size [%d] passed to grid-dot-size\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ???????????? ?????????? [%d] ?????? ?????????????????? grid-dot-size\n"
 
 #: src/g_rc.c:1572
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid pixel spacing [%d] passed to grid-fixed-threshold\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ?????????????? [%d] ?????? ?????????????????? grid-fixed-threshold\n"
 
 #: src/g_rc.c:1616
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? text-size\n"
+msgstr "???????????????? ???????????????? [%d] ?????? ?????????????????? add-attribute-offset\n"
 
 #: src/g_rc.c:1640
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
-msgstr "???????????????? ???????????????????? ?????????????? [%d] ?????? ?????????????????? undo-levels\n"
+msgstr "???????????????? ?????????? ???????????? [%d] ?????? ?????????????????? auto-save-interval\n"
 
 #: src/g_rc.c:1681
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? snap-size\n"
+msgstr "???????????????? ?????????????????? [%d] ?????? ?????????????????? mousepan-gain\n"
 
 #: src/g_rc.c:1704
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
-msgstr "???????????????? ???????????? [%d] ?????? ?????????????????? snap-size\n"
+msgstr "???????????????? ?????????????????? [%d] ?????? ?????????????????? keyboardpan-gain\n"
 
 #: src/gschem.c:141 src/gschem.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "gEDA/gschem version %s%s\n"
-msgstr "???????????? gEDA/gschem %s\n"
+msgstr "???????????? gEDA/gschem %s%s\n"
 
 #: src/gschem.c:143 src/gschem.c:153
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
 "details.\n"
-msgstr ""
-"gEDA/gschem ???????????????????????? ?????? ????????????????; ???????????????? COPYING ?????? ????????????????????????.\n"
+msgstr "gEDA/gschem ???????????????????????? ?????? ????????????????; ???????????????? COPYING ?????? ????????????????????????.\n"
 
 #: src/gschem.c:145 src/gschem.c:155
 #, c-format
-msgid ""
-"This is free software, and you are welcome to redistribute it under certain\n"
+msgid "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 "?????? ?????????????????? ?????????????????????? ??????????????????????, ?? ?????? ?????????? ???????????????????????????? ?????? "
 "??????????????????\n"
@@ -690,9 +684,8 @@
 msgstr "?????????? ????????????????????????????"
 
 #: src/i_basic.c:144
-#, fuzzy
 msgid "Picture Mode"
-msgstr "?????????? ??????????????????"
+msgstr "?????????? ??????????????????????"
 
 #: src/i_basic.c:147
 msgid "Circle Mode"
@@ -715,14 +708,12 @@
 msgstr "??????????????????????"
 
 #: src/i_basic.c:159 src/i_callbacks.c:735 src/i_callbacks.c:754
-#, fuzzy
 msgid "Multiple Copy"
-msgstr "?????????????????????????? ??????????????????"
+msgstr "?????????????????????????? ??????????????????????"
 
 #: src/i_basic.c:162
-#, fuzzy
 msgid "Multiple Copy Mode"
-msgstr "?????????? ??????????????????????"
+msgstr "?????????? ???????????????????????????? ??????????????????????"
 
 #: src/i_basic.c:197
 msgid "Snap Off"
@@ -765,12 +756,12 @@
 
 #: src/i_callbacks.c:150
 msgid "Documentation commands not supported under MinGW.\n"
-msgstr ""
+msgstr "?????????????? ???????????????????????? ???? ???????????????????????????? ?? MinGW.\n"
 
 #: src/i_callbacks.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "New page created [%s]\n"
-msgstr "?????????? ???????????????? ?????????????? [%s]\n"
+msgstr "?????????????? ?????????? ???????????????? [%s]\n"
 
 #: src/i_callbacks.c:264
 msgid "New Window created\n"
@@ -795,9 +786,8 @@
 msgstr "???????????? ?????? ?????????????? ????????????????????"
 
 #: src/i_callbacks.c:408
-#, fuzzy
 msgid "Failed to Save All"
-msgstr "?????????????????? ??????"
+msgstr "???????????? ?????? ???????????????????? ??????????"
 
 #: src/i_callbacks.c:410
 msgid "Saved All"
@@ -904,9 +894,8 @@
 msgstr "???????????????? [%s]\n"
 
 #: src/i_callbacks.c:1909
-#, fuzzy
 msgid "Really revert page?"
-msgstr "???????????????????? ????????????????"
+msgstr "?????????????????????????? ???????????????????? ?????????????????"
 
 #: src/i_callbacks.c:1995 src/i_callbacks.c:2015 src/i_callbacks.c:2041
 #, c-format
@@ -1199,36 +1188,36 @@
 msgstr "????????????: ???????????? NULL ?? o_rotate_90!\n"
 
 #: src/o_misc.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "Component [%s] has been embedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? [%s] ?????? ?????? ??????????????\n"
 
 #: src/o_misc.c:600
-#, fuzzy, c-format
+#, c-format
 msgid "Picture [%s] has been embedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????????? [%s] ?????? ?????? ????????????????\n"
 
 #: src/o_misc.c:632
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
 "embedded\n"
-msgstr "???????????????????? ?????????? ?????????????????? [%s], ???? ?????????? ?????????????? ????????????????????.\n"
+msgstr "???????????????????? ?????????? ?????????????????? [%s], ???? ?????????? ?????????????? ????????????????????. ?????????????????? ?????? ?????? ??????????????\n"
 
 #: src/o_misc.c:643 src/o_misc.c:1608
 #, c-format
 msgid "More than one component found with name [%s]\n"
-msgstr ""
+msgstr "?????????????? ?????????? ???????????? ???????????????????? ?? ???????????? [%s]\n"
 
 #: src/o_misc.c:651
-#, fuzzy, c-format
+#, c-format
 msgid "Component [%s] has been successfully unembedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? [%s] ?????????????? ????????????????\n"
 
 #: src/o_misc.c:666
-#, fuzzy, c-format
+#, c-format
 msgid "Picture [%s] has been unembedded\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????????? [%s] ??????????????????\n"
 
 #: src/o_misc.c:702
 #, c-format
@@ -1245,32 +1234,31 @@
 
 #: src/o_misc.c:1603
 msgid "Could not unembedded component, could not find appropriate .sym file\n"
-msgstr ""
+msgstr "???????????????????? ?????????????????? ??????????????????, ???????????????????? ?????????? ?????????????????????????????? .sym-????????\n"
 
 #: src/o_misc.c:1604
-#, fuzzy
 msgid "Component still embedded and not updated\n"
-msgstr "?????????????????? ?????? ?????? ??????????????\n"
+msgstr "?????????????????? ?????? ?????? ?????????????? ?? ???? ????????????????\n"
 
 #: src/o_misc.c:1745
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
-msgstr ""
+msgstr "o_autosave_backups: ???????????????????? ???????????????? ?????????????? ?????? ?????????? ?????? %s."
 
 #: src/o_misc.c:1789
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ?????????? ????????????-???????????? ?????? ???????????????????? ?????????????????? ?????????? ?????????? [%s]\n"
 
 #: src/o_misc.c:1807
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ?????????? ???????????? ???????????? ?????? ???????????????????? ?????????? [%s]\n"
 
 #: src/o_misc.c:1812
-#, fuzzy, c-format
+#, c-format
 msgid "Could NOT save backup file [%s]\n"
-msgstr "???????????????????? ?????????????????? [%s]\n"
+msgstr "???????????????????? ?????????????????? ?????????????????? ???????? [%s]\n"
 
 #: src/o_move.c:220
 #, c-format
@@ -1280,7 +1268,7 @@
 #: src/o_move.c:334
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
-msgstr ""
+msgstr "????! ?????????????? ?????????? ??????-????????, ???? ???????????? ???? ????????????????????!\n"
 
 #: src/o_move.c:355
 #, c-format
@@ -1304,16 +1292,16 @@
 
 #: src/o_picture.c:174 src/o_picture.c:838
 msgid "Please select a picture file."
-msgstr ""
+msgstr "????????????????????, ???????????????? ???????? ??????????????????????."
 
 #: src/o_picture.c:241 src/o_picture.c:750
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load picture: %s"
-msgstr "???????????????????? ?????????????????? ?????????????????? scm-???????? [%s]\n"
+msgstr "???????????????????? ???????????????????? ??????????????????????: [%s]"
 
 #: src/o_picture.c:260
 msgid "Picture"
-msgstr ""
+msgstr "??????????????????????"
 
 #: src/o_picture.c:776 src/x_attribedit.c:153
 #, c-format
@@ -1342,9 +1330,9 @@
 msgstr "???? ?????????????????? ?????????????? ???????? ????????-???? ??????????????????????????????!\n"
 
 #: src/o_text.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "Tried to render text with an invalid angle: %d\n"
-msgstr "?????????????? ?????????????????? ?????????????????? ??????????: %d\n"
+msgstr "?????????????? ?????????????????? ???????????? ?? ???????????????? ??????????: %d\n"
 
 #: src/o_undo.c:320
 msgid "Undo/Redo disabled in rc file\n"
@@ -1364,11 +1352,21 @@
 "  -h            Help; this message\n"
 "\n"
 msgstr ""
+"??????????????????????????: %s [??????????] ????????_??????????1 ... ????????_??????????N\n"
+"  -q            ???????????? ???? ????????????????\n"
+"  -v            ???????????????? ?????????? ???????????????????? ??????????????????\n"
+"  -r ????????       ???????????????????????? ?? ???????????????? ?????????????????????????????????? ???????? ????????\n"
+"  -s ????????       ?????? ?????????? ?????????????? (guile)\n"
+"  -o ????????       ?????? ?????????????????? ?????????? (?????? ????????????)\n"
+"  -p            ?????????????????????????? ?????????????????????? ????????\n"
+"  -t            ???????????????? ?????????????????? ????????????????????\n"
+"  -h            ????????????; ?????? ??????????????????\n"
+"\n"
 
 #: src/x_attribedit.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Got invalid show option; defaulting to show both\n"
-msgstr "???????????????? ???????????????? ?????????? ??????????????????, ???????????????????????? ??????????"
+msgstr "???????????????? ???????????????? ?????????? ??????????????????, ?????????????????????????????? ???????????????? ??????????\n"
 
 #: src/x_attribedit.c:363
 msgid "Single Attribute Editor"
@@ -1498,9 +1496,8 @@
 msgstr "?????????????? ????????????"
 
 #: src/x_dialog.c:607
-#, fuzzy
 msgid "Edit Text Color"
-msgstr "???????????? ????????????"
+msgstr "???????????? ?????????? ????????????"
 
 #: src/x_dialog.c:619
 msgid "Edit Text Size"
@@ -1537,7 +1534,7 @@
 #: src/x_dialog.c:1498 src/x_dialog.c:1499 src/x_dialog.c:1500
 #: src/x_dialog.c:1501 src/x_dialog.c:1502 src/x_dialog.c:1510
 msgid "*unchanged*"
-msgstr ""
+msgstr "*????????????????????*"
 
 #: src/x_dialog.c:958
 msgid "Edit Line Width & Type"
@@ -1564,9 +1561,8 @@
 msgstr "??????????????"
 
 #: src/x_dialog.c:1103
-#, fuzzy
 msgid "Filled"
-msgstr "????????"
+msgstr "??????????????????"
 
 #: src/x_dialog.c:1104
 msgid "Mesh"
@@ -1597,14 +1593,13 @@
 msgstr "????????????2"
 
 #: src/x_dialog.c:1637
-#, fuzzy
 msgid ""
 "There are unsaved schematics!\n"
 "\n"
 "Are you sure?\n"
 "OK will discard ALL changes!"
 msgstr ""
-"?????????? ???? ??????????????????!\n"
+"?????????? ???? ???????? ??????????????????!\n"
 "\n"
 "???? ???????????????\n"
 "???? ?????????????? ?????? ??????????????????!"
@@ -1656,13 +1651,12 @@
 
 #: src/x_dialog.c:2515
 msgid "gEDA : GPL Electronic Design Automation"
-msgstr ""
-"gEDA: ?????????????? ?????????????????????????????????????? ???????????????????????????? ?????????????????????? ???????? (GPL)"
+msgstr "gEDA: ?????????????? ?????????????????????????????????????? ???????????????????????????? ?????????????????????? ???????? (GPL)"
 
 #: src/x_dialog.c:2523
-#, fuzzy, c-format
+#, c-format
 msgid "gschem version %s%s"
-msgstr "???????????? gschem %s"
+msgstr "???????????? gschem %s%s"
 
 #: src/x_dialog.c:2531
 msgid ""
@@ -1701,12 +1695,11 @@
 #: src/x_dialog.c:3097
 #, c-format
 msgid "Ran out of space in the hotkey buffer...\n"
-msgstr ""
+msgstr "???????????????????? ???????????????????????? ???????????? ?????????????? ????????????...\n"
 
 #: src/x_dialog.c:3174
-#, fuzzy
 msgid "Function : keystroke(s)"
-msgstr "?????????????? : "
+msgstr "?????????????? : ???????????????????? ????????????"
 
 #: src/x_dialog.c:3519
 msgid "Generic String"
@@ -1747,86 +1740,76 @@
 #: src/x_dialog.c:4011
 #, c-format
 msgid "Warning: negative numbers not allowed in the autonumber_text dialog\n"
-msgstr ""
+msgstr "????????????????????????????: ?????????????????????????? ???????????????? ???? ?????????????????????? ?? ?????????????? autonumber_text\n"
 
 #: src/x_dialog.c:4095
 msgid "Autonumber text"
 msgstr "???????????????????????????? ??????????"
 
 #: src/x_dialog.c:4101
-#, fuzzy
 msgid "selection"
-msgstr "??????????????"
+msgstr "??????????"
 
 #: src/x_dialog.c:4110
-#, fuzzy
 msgid "search text"
-msgstr "???????????????? ??????????"
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4138
 msgid "search focus"
-msgstr ""
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4151
-#, fuzzy
 msgid "selected objects"
-msgstr "???????????? ???????????????????????????? ????????????!\n"
+msgstr "?????????????? ??????????????"
 
 #: src/x_dialog.c:4154
-#, fuzzy
 msgid "current sheet"
-msgstr "???????????????? ????????"
+msgstr "?????????????? ????????"
 
 #: src/x_dialog.c:4157
 msgid "hierarchical sheets"
-msgstr ""
+msgstr "???????????????? ????????????"
 
 #: src/x_dialog.c:4169
-#, fuzzy
 msgid "unnumbered"
-msgstr "???????????????????????????? ??????????"
+msgstr "???? ??????????????????????????"
 
 #: src/x_dialog.c:4173
-#, fuzzy
 msgid "all"
-msgstr "??????"
+msgstr "??????"
 
 #: src/x_dialog.c:4182
-#, fuzzy
 msgid "options"
-msgstr "??????????????????"
+msgstr "??????????"
 
 #: src/x_dialog.c:4189
-#, fuzzy
 msgid "start number"
-msgstr "???????????? ???????????? ??????????"
+msgstr "?????????????????? ??????????"
 
 #: src/x_dialog.c:4202
 msgid "sort order"
-msgstr ""
+msgstr "?????????????? ????????????????????"
 
 #: src/x_dialog.c:4214
-#, fuzzy
 msgid "file order"
-msgstr "?????????? ????????????????????"
+msgstr "?????????????? ????????????"
 
 #: src/x_dialog.c:4217
 msgid "top down"
-msgstr ""
+msgstr "???????? ??????"
 
 #: src/x_dialog.c:4220
-#, fuzzy
 msgid "left right"
-msgstr "?????????????? ????????????"
+msgstr "?????????? ????????????"
 
 #: src/x_dialog.c:4223
 msgid "diagonal"
-msgstr ""
+msgstr "????????????????????????"
 
 #: src/x_fileselect.c:300
-#, fuzzy, c-format
+#, c-format
 msgid "Agg, could not open directory: %s\n"
-msgstr "???????????????????? ?????????????? ??????????????: %s\n"
+msgstr "????, ???????????????????? ?????????????? ??????????????: %s\n"
 
 #: src/x_fileselect.c:327
 #, c-format
@@ -1937,33 +1920,28 @@
 msgstr "?????? ??????????"
 
 #: src/x_fileselect.c:2261
-#, fuzzy
 msgid "Schematics"
-msgstr "sch - ??????????"
+msgstr "??????????"
 
 #: src/x_fileselect.c:2264
-#, fuzzy
 msgid "Symbols"
-msgstr "sym - ??????????????"
+msgstr "??????????????"
 
 #: src/x_fileselect.c:2267
-#, fuzzy
 msgid "Schematics and symbols"
-msgstr "sym/sch - ?????????? ?? ??????????????"
+msgstr "?????????? ?? ??????????????"
 
 #: src/x_fileselect.c:2271
-#, fuzzy
 msgid "All files"
-msgstr "* - ?????? ??????????"
+msgstr "?????? ??????????"
 
 #: src/x_fileselect.c:2343
-#, fuzzy
 msgid "Discard changes"
-msgstr "???????????????????? ???????????????????"
+msgstr "???????????????????? ??????????????????"
 
 #: src/x_image.c:291
 msgid "x_image_lowlevel: Unable to write PNG file.\n"
-msgstr ""
+msgstr "x_image_lowlevel: ???????????????????? ???????????????? PNG-????????.\n"
 
 #: src/x_image.c:295 src/x_image.c:326
 #, c-format
@@ -1977,7 +1955,7 @@
 
 #: src/x_image.c:307
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
-msgstr ""
+msgstr "x_image_lowlevel: ???????????????????? ???????????????? ?????????? ?????????????????????? ???? ???????? gschem.\n"
 
 #: src/x_image.c:415
 msgid "Write Image..."
@@ -2000,105 +1978,88 @@
 msgstr "????????????"
 
 #: src/x_menus.c:35
-#, fuzzy
 msgid "/Add Net"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ????????????????????"
 
 #: src/x_menus.c:36
-#, fuzzy
 msgid "/Add Attribute..."
-msgstr "????????????????/???????????????????????????? ??????????????"
+msgstr "/???????????????? ??????????????"
 
 #: src/x_menus.c:37
-#, fuzzy
 msgid "/Add Component..."
-msgstr "??????????????????..."
+msgstr "/???????????????? ??????????????????..."
 
 #: src/x_menus.c:38
-#, fuzzy
 msgid "/Add Bus"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ????????"
 
 #: src/x_menus.c:39
-#, fuzzy
 msgid "/Add Text"
-msgstr "???????????????? ??????????..."
+msgstr "/???????????????? ??????????"
 
 #: src/x_menus.c:41
-#, fuzzy
 msgid "/Zoom In"
-msgstr "??????????????????"
+msgstr "/??????????????????"
 
 #: src/x_menus.c:42
-#, fuzzy
 msgid "/Zoom Out"
-msgstr "??????????????????"
+msgstr "/??????????????????"
 
 #: src/x_menus.c:43
-#, fuzzy
 msgid "/Zoom Box"
-msgstr "?????????????? ?????? ??????????????????????????????"
+msgstr "/?????????????? ?????? ??????????????????????????????"
 
 #: src/x_menus.c:44
-#, fuzzy
 msgid "/Zoom Extents"
-msgstr "?????????????? ???? ??????????"
+msgstr "/?????????????? ???? ??????????"
 
 #: src/x_menus.c:46
-#, fuzzy
 msgid "/Select"
-msgstr "??????????????"
+msgstr "/??????????????"
 
 #: src/x_menus.c:47
-#, fuzzy
 msgid "/Edit..."
-msgstr "????????????..."
+msgstr "/????????????..."
 
 #: src/x_menus.c:48
-#, fuzzy
 msgid "/Copy"
-msgstr "????????????????????"
+msgstr "/????????????????????"
 
 #: src/x_menus.c:49
-#, fuzzy
 msgid "/Move"
-msgstr "??????????????????????"
+msgstr "/??????????????????????"
 
 #: src/x_menus.c:50
-#, fuzzy
 msgid "/Delete"
-msgstr "??????????????"
+msgstr "/??????????????"
 
 #: src/x_menus.c:53
-#, fuzzy
 msgid "/Down Schematic"
-msgstr "???????????? ??????????"
+msgstr "/???????????? ??????????"
 
 #: src/x_menus.c:54
-#, fuzzy
 msgid "/Down Symbol"
-msgstr "???????????? ??????????????"
+msgstr "/???????????? ??????????????"
 
 #: src/x_menus.c:55
-#, fuzzy
 msgid "/Up"
-msgstr "????????????"
+msgstr "/????????????"
 
 #: src/x_menus.c:329
 msgid "Tried to set the sensitivity on a non-existent menu item\n"
-msgstr ""
+msgstr "?????????????? ?????????????????? ???????????????????????????????? ?????? ?????????????????????????????? ???????????? ????????\n"
 
 #: src/x_menus.c:353
 msgid "Popup_menu_item_factory doesn't exist!\n"
-msgstr ""
+msgstr "Popup_menu_item_factory ???? ????????????????????!\n"
 
 #: src/x_menus.c:366
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
-msgstr ""
+msgstr "?????????????? ?????????????????? ???????????????????????????????? ?????? ?????????????????????????????? ???????????????????????????? menu_item\n"
 
 #: src/x_multiattrib.c:625
 msgid "Attributes with empty name are not allowed. Please set a name."
-msgstr ""
+msgstr "???????????????? ?? ???????????? ???????????? ??????????????????????. ????????????????????, ???????????????????? ??????."
 
 #: src/x_multiattrib.c:1131
 msgid "Show Value only"
@@ -2110,7 +2071,7 @@
 
 #: src/x_multiattrib.c:1159
 msgid "Duplicate"
-msgstr ""
+msgstr "??????????????????????"
 
 #: src/x_multiattrib.c:1276
 msgid "Edit Attributes"
@@ -2137,9 +2098,8 @@
 msgstr ""
 
 #: src/x_multiattrib.c:1464
-#, fuzzy
 msgid "Add Attribute"
-msgstr "????????????????/???????????????????????????? ??????????????"
+msgstr "???????????????? ??????????????"
 
 #: src/x_pagesel.c:267
 msgid "Discard Page"
@@ -2150,30 +2110,28 @@
 msgstr "???????????????? ??????????????"
 
 #: src/x_pagesel.c:448
-#, fuzzy
 msgid "Changed"
-msgstr "????????????????"
+msgstr "????????????????"
 
 #: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
-msgstr ""
+msgstr "???????????????? ???????????? ?????????????? ???? ?????????? ?????????? ?????? ???????????????????????????? ??????????..."
 
 #: src/x_preview.c:127
 msgid "x_preview_update_gtk24: Can't get pixbuf from preview struct.\n"
-msgstr ""
+msgstr "x_preview_update_gtk24: ???????????????????? ???????????????? ?????????? ?????????????????????? ???? ???????????????????? ??????????????????.\n"
 
 #: src/x_print.c:91
-#, fuzzy
 msgid "Save PostScript As..."
-msgstr "?????????????????? ???????????????? ??????..."
+msgstr "?????????????????? PostScript ??????..."
 
 #: src/x_print.c:188
 msgid "Extents with margins"
-msgstr ""
+msgstr "?????????????????? ?? ????????????"
 
 #: src/x_print.c:191
 msgid "Extents no margins"
-msgstr ""
+msgstr "?????????????????? ?????? ??????????"
 
 #: src/x_print.c:195
 msgid "Current Window"
@@ -2189,7 +2147,7 @@
 
 #: src/x_print.c:283
 msgid "Settings"
-msgstr ""
+msgstr "??????????????????"
 
 #: src/x_print.c:295
 msgid "Output paper size"
@@ -2204,17 +2162,16 @@
 msgstr "????????????????????"
 
 #: src/x_print.c:329
-#, fuzzy
 msgid "Destination"
-msgstr "????????????????????????"
+msgstr "????????????????????"
 
 #: src/x_print.c:368
 msgid "Command"
-msgstr ""
+msgstr "??????????????"
 
 #: src/x_print.c:690
 msgid "No print destination specified\n"
-msgstr ""
+msgstr "???? ?????????????? ???????????????????? ?????? ????????????\n"
 
 #: src/x_print.c:697
 #, c-format
@@ -2351,175 +2308,54 @@
 msgid "Pan/Cancel"
 msgstr "??????????/????????????"
 
-#~ msgid "OK"
-#~ msgstr "????"
-
-#~ msgid "Cancel"
-#~ msgstr "????????????"
-
-#~ msgid "Apply"
-#~ msgstr "??????????????????"
-
-#~ msgid "Find"
-#~ msgstr "??????????"
-
-#~ msgid "Done"
-#~ msgstr "????????????"
-
-#~ msgid "SaveAs"
-#~ msgstr "?????????????????? ??????"
+msgid "Image"
+msgstr "??????????????????????"
 
-#~ msgid "Write"
-#~ msgstr "????????????????"
-
-#~ msgid "Print"
-#~ msgstr "????????????"
-
-#~ msgid "Edit mode"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Move mode"
-#~ msgstr "?????????? ??????????????????????"
-
-#~ msgid "Copy mode"
-#~ msgstr "?????????? ??????????????????????"
-
-#~ msgid "Delete mode"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Rotate mode"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Mirror mode"
-#~ msgstr "?????????? ????????????????????????????"
-
-#, fuzzy
-#~ msgid "Invalid number of lines [%d] passed to output-vector-threshold\n"
-#~ msgstr "???????????????? ???????????????????? ?????????????? [%d] ?????? ?????????????????? undo-levels\n"
-
-#~ msgid "Comps"
-#~ msgstr "????????????????????"
-
-#~ msgid "Both"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "Image"
-#~ msgstr "????????????????"
-
-#~ msgid "Deattach"
-#~ msgstr "????????????????"
-
-#~ msgid "%s requires a string as a parameter\n"
-#~ msgstr "%s ?????????????? ???????????? ?? ???????????????? ??????????????????\n"
-
-#~ msgid "Invalid parameters to paper-sizes\n"
-#~ msgstr "???????????????? ?????????????????? ?? paper-sizes\n"
-
-#~ msgid "Cannot obtain the current directory!\n"
-#~ msgstr "???????????????????? ?????????? ?? ?????????????? ??????????????!\n"
-
-#~ msgid "Cannot get cwd!\n"
-#~ msgstr "???????????????????? ???????????????? ?????? ???????????????? ????????????????!\n"
-
-#~ msgid "ERROR: NULL object in o_embed!\n"
-#~ msgstr "????????????: ???????????? NULL ?? o_embed!\n"
-
-#~ msgid "Warning: two components with same refdes: %d\n"
-#~ msgstr "????????????????????????????: ?????? ???????????????????? ?? ???????????????????? refdes: %d\n"
-
-#~ msgid "Got an unexpected NULL in o_update_component\n"
-#~ msgstr "?????????????????????? NULL ?? o_update_component\n"
-
-#~ msgid "Invalid space specified, setting to 100\n"
-#~ msgstr "?????????????????? ???????????????? ????????????, ?????????????????????????????? ?? 100\n"
-
-#~ msgid "Invalid length specified, setting to 100\n"
-#~ msgstr "???????????????????? ???????????????? ??????????, ?????????????????????????????? ?? 100\n"
-
-#~ msgid "Autonumber text starting with:"
-#~ msgstr "???????????????????????????? ??????????, ???????????????????????? ??:"
-
-#~ msgid "Yes"
-#~ msgstr "????"
-
-#~ msgid "No"
-#~ msgstr "??????"
-
-#~ msgid "Add/Edit"
-#~ msgstr "????????????????/??????????????????????????"
-
-#~ msgid "Clear"
-#~ msgstr "????????????????"
-
-#~ msgid "Open Page"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Update Manager"
-#~ msgstr "???????????????? ????????????????"
-
-#~ msgid "Close Manager"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Read system-gschemrc file [%s]\n"
-#~ msgstr "???????????? ?????????? system-gschemrc [%s]\n"
-
-#, fuzzy
-#~ msgid "Did not find required system-gschemrc file [%s]\n"
-#~ msgstr "???????? system-gschemrc ???? ?????? ???????????? [%s]\n"
-
-#~ msgid "Read ~/.gEDA/gschemrc file [%s]\n"
-#~ msgstr "???????????? ?????????? ~/.gEDA/gschemrc [%s]\n"
-
-#, fuzzy
-#~ msgid "Did not find optional ~/.gEDA/gschemrc file [%s]\n"
-#~ msgstr "???????? ~/.gEDA/gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "Comps"
+msgstr "????????????????????"
 
-#~ msgid "Read local gschemrc file [%s]\n"
-#~ msgstr "???????????? ???????????????????? ?????????? gschemrc [%s]\n"
+msgid "Both"
+msgstr "??????"
 
-#, fuzzy
-#~ msgid "Did not find optional local gschemrc file [%s]\n"
-#~ msgstr "?????????????????? ???????? gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "OK"
+msgstr "????"
 
-#~ msgid "Read specified rc file [%s]\n"
-#~ msgstr "???????????? ???????????????????????? rc-?????????? [%s]\n"
+msgid "Apply"
+msgstr "??????????????????"
 
-#~ msgid "Did not find specified gschemrc file [%s]\n"
-#~ msgstr "?????????????????? ???????? gschemrc ???? ?????? ???????????? [%s]\n"
+msgid "Cancel"
+msgstr "????????????"
 
-#~ msgid "Could not find any gschemrc file!\n"
-#~ msgstr "???????????????????? ?????????? ???? ???????????? ?????????? gschemrc!\n"
+msgid "Find"
+msgstr "??????????"
 
-#~ msgid "Could not find a gschemrc file\n"
-#~ msgstr "???????????????????? ?????????? ???????? gschemrc\n"
+msgid "Done"
+msgstr "????????????"
 
-#~ msgid "Invalid path [%s] passed to component-library\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? component-library\n"
+msgid "SaveAs"
+msgstr "?????????????????? ??????"
 
-#~ msgid "Invalid path [%s] passed to component-library-search\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? component-library-search\n"
+msgid "Write"
+msgstr "????????????????"
 
-#~ msgid "Invalid path [%s] passed to %s\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? %s\n"
+msgid "Print"
+msgstr "????????????"
 
-#~ msgid "Invalid path [%s] passed to source-library-search\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? source-library-search\n"
+msgid "Edit mode"
+msgstr "?????????? ????????????"
 
-#~ msgid "Invalid path [%s] passed to scheme-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? scheme-directory\n"
+msgid "Move mode"
+msgstr "?????????? ??????????????????????"
 
-#~ msgid "Invalid path [%s] passed to bitmap-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? bitmap-directory\n"
+msgid "Copy mode"
+msgstr "?????????? ??????????????????????"
 
-#~ msgid "Invalid path [%s] passed to font-directory\n"
-#~ msgstr "???????????????? ???????? [%s] ?????? ?????????????????? font-directory\n"
+msgid "Delete mode"
+msgstr "?????????? ????????????????"
 
-#~ msgid "Ok"
-#~ msgstr "????"
+msgid "Rotate mode"
+msgstr "?????????? ????????????????"
 
-#~ msgid "Edit Component"
-#~ msgstr "?????????????????????????? ??????????????????"
+msgid "Mirror mode"
+msgstr "?????????? ????????????????????????????"
 
-#~ msgid "Limits"
-#~ msgstr "????????????????????????"


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/geda-gschem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-gschem.spec	10 Sep 2006 21:47:14 -0000	1.2
+++ geda-gschem.spec	12 Oct 2006 18:48:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             geda-gschem
 Version:          20060906
-Release:          2%{?dist}
+Release:          3%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
@@ -12,6 +12,9 @@
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
+# by Andy Shevchenko #206280
+Patch0:           geda-gschem-ru.po.diff
+
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
@@ -23,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b ru.po
 
 %build
 %{__cp} -p configure.ac configure.ac.gdgeda
@@ -130,11 +134,13 @@
 %{_datadir}/gEDA/gschem-lightbg
 %{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
-#%{_infodir}/gschemdoc.info*
 %{_mandir}/man1/gschem.*
-#%{_datadir}/gEDA/docs/man/gschem.html
+
 
 %Changelog
+* Fri Sep 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
+- patch for russian translation by Andy Shevchenko #206280
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
 - Rebuilt for FC-6 devel
 



From fedora-extras-commits at redhat.com  Thu Oct 12 18:48:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 12 Oct 2006 11:48:51 -0700
Subject: rpms/php-pear-Mail/FC-5 .cvsignore, 1.3, 1.4 php-pear-Mail.spec, 1.6,
	1.7 sources, 1.3, 1.4 xml2changelog, 1.1, 1.2
Message-ID: <200610121848.k9CImrmw001884@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1857

Modified Files:
	.cvsignore php-pear-Mail.spec sources xml2changelog 
Log Message:
	update to 1.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2006 14:07:55 -0000	1.3
+++ .cvsignore	12 Oct 2006 18:48:51 -0000	1.4
@@ -1 +1 @@
-Mail-1.1.13.tgz
+Mail-1.1.14.tgz


Index: php-pear-Mail.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/FC-5/php-pear-Mail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-Mail.spec	16 Sep 2006 14:07:55 -0000	1.6
+++ php-pear-Mail.spec	12 Oct 2006 18:48:51 -0000	1.7
@@ -2,7 +2,7 @@
 %define pear_name Mail
 
 Name:           php-pear-Mail
-Version:        1.1.13
+Version:        1.1.14
 Release:        1%{?dist}
 Summary:        Class that provides multiple interfaces for sending emails
 Summary(fr):    Une Classe fournissant des interfaces pour envoyer des emails
@@ -50,8 +50,8 @@
 # Empty build section, most likely nothing required.
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Clean up unnecessary files
@@ -83,6 +83,9 @@
 %{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Thu Oct 12 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.14-1
+- update to 1.1.14
+
 * Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.13-1
 - regenerate SPEC with pear make-rpm-spec
 - remove PEAR from sumnary


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2006 14:07:55 -0000	1.3
+++ sources	12 Oct 2006 18:48:51 -0000	1.4
@@ -1 +1 @@
-087f63a04d95670fadc9e39948b09f8c  Mail-1.1.13.tgz
+e50da58b6b787b3903ce4d07dc791bb2  Mail-1.1.14.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/FC-5/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	16 Sep 2006 14:07:55 -0000	1.1
+++ xml2changelog	12 Oct 2006 18:48:51 -0000	1.2
@@ -1,13 +1,28 @@
 <?php
 $prog=array_shift($_SERVER['argv']);
-if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml\n");
+if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
 $file=array_shift($_SERVER['argv']);
 
 ($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
-printf("* Version %s (%s) - %s\n\n%s\n\n",
-	$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
-foreach($xml->changelog->release as $rel)
+if ($xml['version'] >= "2"){ // Package.xml V 2.0
+	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);
+
+	foreach($xml->changelog->release as $rel)
+		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",
-		$rel->version, $rel->state, $rel->date, $rel->notes);
+		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+
+	foreach($xml->changelog->release as $rel)
+		printf("* Version %s (%s) - %s\n\n%s\n\n",
+			$rel->version, $rel->state, $rel->date, $rel->notes);
+}
 ?>



From fedora-extras-commits at redhat.com  Thu Oct 12 19:08:56 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Thu, 12 Oct 2006 12:08:56 -0700
Subject: rpms/smeg/devel dead.package,NONE,1.1
Message-ID: <200610121908.k9CJ8xU5005247@cvs-int.fedora.redhat.com>

Author: jpmahowa

Update of /cvs/extras/rpms/smeg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5231

Added Files:
	dead.package 
Log Message:
Renamed to alacarte


--- NEW FILE dead.package ---



From fedora-extras-commits at redhat.com  Thu Oct 12 19:11:15 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 12 Oct 2006 12:11:15 -0700
Subject: rpms/torque/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 torque.spec,
	1.12, 1.13 torque-2.1.0p0-mom_sync_jobs-fixes.patch, 1.1,
	NONE torque-2.1.0p0-sched-offbyone.patch, 1.1,
	NONE torque-2.1.2-pam-getpwnam.patch, 1.1, NONE
Message-ID: <200610121911.k9CJBHVp005304@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5283

Modified Files:
	.cvsignore sources torque.spec 
Removed Files:
	torque-2.1.0p0-mom_sync_jobs-fixes.patch 
	torque-2.1.0p0-sched-offbyone.patch 
	torque-2.1.2-pam-getpwnam.patch 
Log Message:
update to 2.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2006 23:22:12 -0000	1.7
+++ .cvsignore	12 Oct 2006 19:11:15 -0000	1.8
@@ -1 +1 @@
-torque-2.1.2.tar.gz
+torque-2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2006 23:22:12 -0000	1.7
+++ sources	12 Oct 2006 19:11:15 -0000	1.8
@@ -1 +1 @@
-f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
+0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- torque.spec	27 Aug 2006 22:11:44 -0000	1.12
+++ torque.spec	12 Oct 2006 19:11:15 -0000	1.13
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.2
+%define version 2.1.3
 #%%define snap 200604251602
-%define release 3
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -92,7 +92,6 @@
 Source5: xpbsmon.png
 Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.2-pam-getpwnam.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -122,7 +121,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
@@ -389,7 +387,7 @@
 %{_bindir}/pbs-config
 
 %package pam
-Summary: PAM module for PBS MOM nodes.
+Summary: PAM module for TORQUE MOM nodes
 Group: System Environment/Base
 
 %description pam
@@ -403,6 +401,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
+- bump to 2.1.3
+
 * Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 2.1.2-3
 - FC6 mass rebuild
 


--- torque-2.1.0p0-mom_sync_jobs-fixes.patch DELETED ---


--- torque-2.1.0p0-sched-offbyone.patch DELETED ---


--- torque-2.1.2-pam-getpwnam.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 12 19:43:29 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 12:43:29 -0700
Subject: rpms/nsd/devel .cvsignore, 1.4, 1.5 nsd.init, 1.3, 1.4 nsd.spec,
	1.13, 1.14 sources, 1.4, 1.5
Message-ID: <200610121943.k9CJhVjC005558@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5530

Modified Files:
	.cvsignore nsd.init nsd.spec sources 
Log Message:
* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
- Upgraded to 2.3.6
- Removed obsolete workaround in nsd.init
- Fixed spec file so daemon gets properly restarted on upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Jun 2006 23:29:56 -0000	1.4
+++ .cvsignore	12 Oct 2006 19:43:29 -0000	1.5
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.init	26 Jun 2006 23:36:14 -0000	1.3
+++ nsd.init	12 Oct 2006 19:43:29 -0000	1.4
@@ -26,11 +26,12 @@
 #ZONEC_VERBOSE=-v
 OTHER_NSD_OPTS=""
 
+#fixed in 2.3.6
 #work around for bug in nsd-2.3.x when no ipv6 is available
-if [ ! -d /proc/sys/net/ipv6/ ]
-then
-        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
-fi
+#if [ ! -d /proc/sys/net/ipv6/ ]
+#then
+#        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
+#fi
 
 # Source function library.
 . /etc/init.d/functions


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nsd.spec	12 Sep 2006 00:00:18 -0000	1.13
+++ nsd.spec	12 Oct 2006 19:43:29 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
-Release: 4%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -55,9 +55,6 @@
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -66,16 +63,22 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1
+  echo " preun "
+        /sbin/service %{name} stop 
         /sbin/chkconfig --del %{name} 
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-  /sbin/service %{name} condrestart 2>&1 >/dev/null
+  /sbin/service %{name} condrestart 
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Removed obsolete workaround in nsd.init
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Sep 11 2006 Paul Wouters <paul at xelerance.com> 2.3.5-4
 - Rebuild requested for PT_GNU_HASH support from gcc
 - Removed dbaccess.c from doc section


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jun 2006 23:27:34 -0000	1.4
+++ sources	12 Oct 2006 19:43:29 -0000	1.5
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 19:43:52 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Thu, 12 Oct 2006 12:43:52 -0700
Subject: rpms/musicbox import.log,1.3,1.4
Message-ID: <200610121944.k9CJiOuP005653@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/musicbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5610

Modified Files:
	import.log 
Log Message:
auto-import musicbox-0.2.3-5 on branch devel from musicbox-0.2.3-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/musicbox/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	28 Aug 2006 18:50:21 -0000	1.3
+++ import.log	12 Oct 2006 19:43:52 -0000	1.4
@@ -1,2 +1,3 @@
 musicbox-0_2_3-3_fc6:HEAD:musicbox-0.2.3-3.fc6.src.rpm:1148242931
 musicbox-0_2_3-4_fc6:HEAD:musicbox-0.2.3-4.fc6.src.rpm:1156791042
+musicbox-0_2_3-5:HEAD:musicbox-0.2.3-5.src.rpm:1160682228



From fedora-extras-commits at redhat.com  Thu Oct 12 19:43:53 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Thu, 12 Oct 2006 12:43:53 -0700
Subject: rpms/musicbox/devel musicbox.spec,1.2,1.3
Message-ID: <200610121944.k9CJiP60005656@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/musicbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5610/devel

Modified Files:
	musicbox.spec 
Log Message:
auto-import musicbox-0.2.3-5 on branch devel from musicbox-0.2.3-5.src.rpm


Index: musicbox.spec
===================================================================
RCS file: /cvs/extras/rpms/musicbox/devel/musicbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- musicbox.spec	28 Aug 2006 18:50:22 -0000	1.2
+++ musicbox.spec	12 Oct 2006 19:43:53 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           musicbox
 Version:	0.2.3        
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A simple one-file-at-a-time audio tag editor
 
 Group:          Applications/Multimedia
 License:        GPL
-URL:            http://subpop.net/?q=node/102
+URL:            http://link.stikipad.com/wiki/show/Musicbox
 Source0:        http://superb-east.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,6 +47,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 0.2.3-5
+- Fix URL and bump release
+
 * Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 0.2.3-4
 - Bump release
 



From fedora-extras-commits at redhat.com  Thu Oct 12 19:50:11 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 12 Oct 2006 12:50:11 -0700
Subject: rpms/torque/devel torque.spec,1.13,1.14
Message-ID: <200610121950.k9CJoDsT005793@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5776

Modified Files:
	torque.spec 
Log Message:
* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
- missing BR ncurses-devel and readline-devel



Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- torque.spec	12 Oct 2006 19:11:15 -0000	1.13
+++ torque.spec	12 Oct 2006 19:50:10 -0000	1.14
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.3
 #%%define snap 200604251602
-%define release 1
+%define release 2
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -97,7 +97,7 @@
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel, xauth
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -401,6 +401,9 @@
 
 
 %changelog
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
+- missing BR ncurses-devel and readline-devel
+
 * Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
 - bump to 2.1.3
 



From fedora-extras-commits at redhat.com  Thu Oct 12 20:07:05 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 12 Oct 2006 13:07:05 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 torque.spec,
	1.11, 1.12 torque-2.1.0p0-mom_sync_jobs-fixes.patch, 1.1,
	NONE torque-2.1.0p0-sched-offbyone.patch, 1.1,
	NONE torque-2.1.2-pam-getpwnam.patch, 1.1, NONE
Message-ID: <200610122007.k9CK77kH008840@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8819

Modified Files:
	.cvsignore sources torque.spec 
Removed Files:
	torque-2.1.0p0-mom_sync_jobs-fixes.patch 
	torque-2.1.0p0-sched-offbyone.patch 
	torque-2.1.2-pam-getpwnam.patch 
Log Message:
bump to 2.1.3 and missing BR ncurses-devel and readline-devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2006 23:40:13 -0000	1.7
+++ .cvsignore	12 Oct 2006 20:07:05 -0000	1.8
@@ -1 +1 @@
-torque-2.1.2.tar.gz
+torque-2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2006 23:40:13 -0000	1.7
+++ sources	12 Oct 2006 20:07:05 -0000	1.8
@@ -1 +1 @@
-f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
+0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- torque.spec	3 Aug 2006 05:51:13 -0000	1.11
+++ torque.spec	12 Oct 2006 20:07:05 -0000	1.12
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.2
+%define version 2.1.3
 #%%define snap 200604251602
 %define release 2
 
@@ -92,13 +92,12 @@
 Source5: xpbsmon.png
 Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.2-pam-getpwnam.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -122,7 +121,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
@@ -389,7 +387,7 @@
 %{_bindir}/pbs-config
 
 %package pam
-Summary: PAM module for PBS MOM nodes.
+Summary: PAM module for TORQUE MOM nodes
 Group: System Environment/Base
 
 %description pam
@@ -403,6 +401,15 @@
 
 
 %changelog
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
+- missing BR ncurses-devel and readline-devel
+
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
+- bump to 2.1.3
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 2.1.2-3
+- FC6 mass rebuild
+
 * Wed Aug  2 2006 Garrick Staples <garrick at usc.edu> 2.1.2-2
 - fix incorrect _pam_getpwnam_r usage in pam module
 


--- torque-2.1.0p0-mom_sync_jobs-fixes.patch DELETED ---


--- torque-2.1.0p0-sched-offbyone.patch DELETED ---


--- torque-2.1.2-pam-getpwnam.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 12 20:28:45 2006
From: fedora-extras-commits at redhat.com (Frank Büttner (frankb))
Date: Thu, 12 Oct 2006 13:28:45 -0700
Subject: rpms/qt4-qsa/devel qsa-1.2.1-QT_INSTALL.patch, NONE,
	1.1 qt4-qsa.spec, 1.7, 1.8
Message-ID: <200610122028.k9CKSlxd009191@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9171

Modified Files:
	qt4-qsa.spec 
Added Files:
	qsa-1.2.1-QT_INSTALL.patch 
Log Message:
fix bug 210544


qsa-1.2.1-QT_INSTALL.patch:

--- NEW FILE qsa-1.2.1-QT_INSTALL.patch ---
--- qsa-x11-opensource-1.2.1/configure2/configutils.cpp.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configutils.cpp	2006-08-07 12:23:12.000000000 -0500
@@ -178,9 +178,13 @@
 
 void copyQSAHeaders()
 {
+    QString *qtData = 0;
+    QString *qtHeaders = 0;
+    qtData = new QString(QT_INSTALL_DATA);
+    qtHeaders = new QString(QT_INSTALL_HEADERS);
     // install qmake feature file
-    mkDir(*qtDir + QLatin1String("mkspecs/features"));
-    copy(QLatin1String("src/qsa/qsa.prf"), *qtDir + QLatin1String("mkspecs/features/qsa.prf"));
+    mkDir(*qtData + QLatin1String("/mkspecs/features"));
+    copy(QLatin1String("src/qsa/qsa.prf"), *qtData + QLatin1String("/mkspecs/features/qsa.prf"));
 
     // install header files
     static const char *headers[11] = {
@@ -199,7 +203,7 @@
     for (int j = 0; j < int(sizeof(headers) / sizeof(char*)); ++j) {
         QString header = QLatin1String(headers[j]);
         QString target = header.mid(header.indexOf(QLatin1Char('/')) + 1);
-        symLink(QLatin1String("src/") + header, *qtDir + QLatin1String("include/") + target);
+        symLink(QLatin1String("src/") + header, *qtHeaders + QLatin1String("/") + target);
     }
 }
 
--- qsa-x11-opensource-1.2.1/configure2/configure2.pro.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configure2.pro	2006-08-07 12:11:53.000000000 -0500
@@ -3,6 +3,9 @@
 CONFIG += console
 INCLUDEPATH += .
 
+#QMAKE_CFLAGS   += -DQT_INSTALL_DATA=$$[QT_INSTALL_DATA] -DQT_INSTALL_HEADERS=$$[QT_INSTALL_HEADERS] -DQT_INSTALL_PREFIX=$$[QT_INSTALL_PREFIX]
+QMAKE_CXXFLAGS += -DQT_INSTALL_DATA=\\\"$$[QT_INSTALL_DATA]\\\" -DQT_INSTALL_HEADERS=\\\"$$[QT_INSTALL_HEADERS]\\\" -DQT_INSTALL_PREFIX=\\\"$$[QT_INSTALL_PREFIX]\\\"
+
 # Input
 SOURCES += main.cpp configutils.cpp
 HEADERS += configutils.h
--- qsa-x11-opensource-1.2.1/configure.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure	2006-08-07 12:02:05.000000000 -0500
@@ -31,6 +31,12 @@
 
 if [ -z $QTDIR ]
 then
+  QTDIR=`qmake -query QT_INSTALL_PREFIX`
+  export QTDIR
+fi
+
+if [ -z $QTDIR ]
+then
     echo "Can't find Qt library. No QTDIR set."
     exit 1
 else
@@ -55,7 +61,7 @@
 # build 2nd stage configure tool
 echo "Building 2nd stage configure"
 cd configure2
-qmake && make > /dev/null
+qmake && make 
 if [ $? -gt 0 -o ! -x configure2 ]; then
     exit 1
 fi
--- qsa-x11-opensource-1.2.1/src/qsa/qsa.pro.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/src/qsa/qsa.pro	2006-08-07 11:32:49.000000000 -0500
@@ -5,12 +5,25 @@
 TARGET = qsa
 
 isEmpty(QSA_INSTALL_PREFIX) {
-  QSA_BUILD_PREFIX=$$(QTDIR)
+  QSA_BUILD_PREFIX=$$[QT_INSTALL_PREFIX]
+  DESTDIR=$$[QT_INSTALL_LIBS]
+  headers.path = $$[QT_INSTALL_HEADERS]
+  target.path = $$[QT_INSTALL_LIBS]
+  prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
+  documentation.path = $$[QT_INSTALL_DOCS]/html
 } else {
   QSA_BUILD_PREFIX=../..
+  DESTDIR  	= $$QSA_BUILD_PREFIX/lib
+  headers.path = $$QSA_INSTALL_PREFIX/include
+  win32 {
+    target.path = $$QSA_INSTALL_PREFIX/bin
+  } else {
+    target.path = $$QSA_INSTALL_PREFIX/lib
+  }
+  prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features
+  documentation.path = $$QSA_INSTALL_PREFIX/doc/html
 }
 
-DESTDIR         = $$QSA_BUILD_PREFIX/lib
 DLLDESTDIR      = $$QSA_BUILD_PREFIX/bin
 
 HEADERS		= \
@@ -65,7 +78,7 @@
 DEFINES += QT_INTERNAL_ICONVIEW
 DEFINES += QT_INTERNAL_TABLE
 
-LIBS += -L$${QT_INSTALL_PREFIX}/lib
+LIBS += -L$$[QT_INSTALL_LIBS]
 
 mac:QMAKE_LFLAGS_PREBIND    = -prebind -seg1addr 0xBC000000
 
@@ -81,19 +94,9 @@
 		qsinputdialogfactory.h \
 		qsscript.h
 
-!isEmpty(QSA_INSTALL_PREFIX) {
-  headers.path = $$QSA_INSTALL_PREFIX/include
-  win32 {
-    target.path = $$QSA_INSTALL_PREFIX/bin
-  } else {
-    target.path = $$QSA_INSTALL_PREFIX/lib
-  }
-  prf.files = qsa.prf
-  prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features
-  documentation.files = ../../doc/html/*
-  documentation.path = $$QSA_INSTALL_PREFIX/doc/html
-  INSTALLS += headers target prf documentation
-}
+prf.files = qsa.prf
+documentation.files = ../../doc/HTML/*
+INSTALLS += headers target prf documentation
 
 KERNELDIR = ../kernel
 !noeditor {


Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt4-qsa.spec	11 Sep 2006 08:06:14 -0000	1.7
+++ qt4-qsa.spec	12 Oct 2006 20:28:45 -0000	1.8
@@ -2,31 +2,24 @@
 Summary:	Qt Script for Applications
 Version:	1.2.1
 Release:	17%{?dist}
-BuildRequires:	qt4-devel => 4.2
+BuildRequires:	qt4-devel 
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
 License: 	GPL
 Group: 		Development/Libraries
 Source: 	ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz
 Patch0:		qsa-1.2.1-Qt4.2-preview.patch
+Patch1:		qsa-1.2.1-QT_INSTALL.patch
 Buildroot: 	%{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) 
-
-# fix the the broken include path
-%define qtinc %{qtdir}/include
-%ifarch x86_64
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64
-%else
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
-%endif
-
-#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS)
-#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
+%define qtdir  %(qmake-qt4 -query QT_INSTALL_PREFIX)
+%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA)
+%define qtinc  %(qmake-qt4 -query QT_INSTALL_HEADERS)
+%define qtlib  %(qmake-qt4 -query QT_INSTALL_LIBS)
 
 %package devel
 Summary:	Development and doc files for qsa 
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Group:		Development/Libraries
 
 %description
@@ -39,6 +32,7 @@
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -47,8 +41,7 @@
 export QTLIB=%{qtlib}
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
-./configure -release -prefix %{qtdir}
-#./configure -release 
+./configure -release 
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -70,12 +63,6 @@
 install -p -m 644 src/ide/qsworkbench.h $RPM_BUILD_ROOT%{qtinc}/
 install -p -m 644 src/qsa/qsutilfactory.h  $RPM_BUILD_ROOT%{qtinc}/
 
-%if "%{_lib}" != "lib"
-test -d $RPM_BUILD_ROOT%{qtdir}/lib && \
-mkdir -p $RPM_BUILD_ROOT%{qtlib} && \
-mv $RPM_BUILD_ROOT%{qtdir}/lib/* $RPM_BUILD_ROOT%{qtlib}/
-%endif 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -93,13 +80,13 @@
 %defattr(0644,root,root)   
 %{qtinc}/*
 %{qtlib}/libqsa.so
-%{qtdir}/mkspecs/features/qsa.prf
+%{qtdata}/mkspecs/features/qsa.prf
 %doc examples
 %doc doc/html
 
 %changelog 
-* Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
-- second rebuild for FC6
+* Thu Oct 12 2006 Frank B??ttner <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
+- fix for bug 210544
 
 * Mon Aug 07 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-16%{?dist}
 - fix build for EMT64



From fedora-extras-commits at redhat.com  Thu Oct 12 20:35:08 2006
From: fedora-extras-commits at redhat.com (Frank Büttner (frankb))
Date: Thu, 12 Oct 2006 13:35:08 -0700
Subject: rpms/qt4-qsa/devel qt4-qsa.spec,1.8,1.9
Message-ID: <200610122035.k9CKZAAu009287@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9270

Modified Files:
	qt4-qsa.spec 
Log Message:
now the right file



Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt4-qsa.spec	12 Oct 2006 20:28:45 -0000	1.8
+++ qt4-qsa.spec	12 Oct 2006 20:35:08 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	17%{?dist}
+Release:	18%{?dist}
 BuildRequires:	qt4-devel 
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
@@ -85,9 +85,12 @@
 %doc doc/html
 
 %changelog 
-* Thu Oct 12 2006 Frank B??ttner <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
+* Thu Oct 12 2006 Frank B??ttner <frank-buettner at gmx.net> - 1.2.1-18%{?dist}
 - fix for bug 210544
 
+* Mon Sep 11 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
+- second rebuild for FC6
+
 * Mon Aug 07 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-16%{?dist}
 - fix build for EMT64
 



From fedora-extras-commits at redhat.com  Thu Oct 12 21:02:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 12 Oct 2006 14:02:38 -0700
Subject: rpms/libtunepimp/devel .cvsignore, 1.6, 1.7 libtunepimp.spec, 1.20,
	1.21
Message-ID: <200610122103.k9CL3BSA012617@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12576

Modified Files:
	.cvsignore libtunepimp.spec 
Log Message:
* Mon Oct 09 2006 Alex Lancaster <alexl[AT]users.sf.net> 0.5.2-2
- build python-libtunepimp subpackage (#209961)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Oct 2006 16:29:30 -0000	1.6
+++ .cvsignore	12 Oct 2006 21:02:35 -0000	1.7
@@ -1,2 +1,2 @@
-libtunepimp-0.4.3.tar.gz
+clog
 libtunepimp-0.5.2.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libtunepimp.spec	2 Oct 2006 16:29:30 -0000	1.20
+++ libtunepimp.spec	12 Oct 2006 21:02:35 -0000	1.21
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -26,6 +26,8 @@
 BuildRequires: curl-devel
 BuildRequires: expat-devel
 
+BuildRequires: python-devel
+
 Obsoletes: libtunepimp-tools < %{version}-%{release}
 Provides:  libtunepimp-tools = %{version}-%{release}
 
@@ -50,6 +52,20 @@
 %description devel
 %{summary}.
 
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%package -n python-%{name}
+Summary: Python bindings for developing programs that will use %{name} 
+Group:   Development/Libraries
+License: GPL
+#define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+#if "%{?python_ver}" > "2"
+#Requires: python-abi = %{python_ver}
+#endif
+%description -n python-%{name}
+%{summary}.
+
 
 %prep
 %setup -q -n libtunepimp-%{version}
@@ -63,12 +79,20 @@
 
 make %{?_smp_mflags} PLUGIN_DIR=%{pkglibdir}/plugins
 
+pushd python
+%{__python} setup.py build 
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
 
+pushd python
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+popd
+
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -105,8 +129,16 @@
 %{_includedir}/*
 %{_libdir}/lib*.so
 
+%files -n python-%{name}
+%defattr(-,root,root,-)
+%doc python/examples/trm.py
+%{python_sitelib}/tunepimp/
+
 
 %changelog
+* Mon Oct 09 2006 Alex Lancaster <alexl[AT]users.sf.net> 0.5.2-2
+- build python-libtunepimp subpackage (#209961)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
 - 0.5.2
 



From fedora-extras-commits at redhat.com  Thu Oct 12 21:02:49 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 12 Oct 2006 14:02:49 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 torque.spec,
	1.9, 1.10 torque-2.1.0p0-mom_sync_jobs-fixes.patch, 1.1,
	NONE torque-2.1.0p0-sched-offbyone.patch, 1.1,
	NONE torque-2.1.2-pam-getpwnam.patch, 1.1, NONE
Message-ID: <200610122103.k9CL3LMa012623@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12597

Modified Files:
	.cvsignore sources torque.spec 
Removed Files:
	torque-2.1.0p0-mom_sync_jobs-fixes.patch 
	torque-2.1.0p0-sched-offbyone.patch 
	torque-2.1.2-pam-getpwnam.patch 
Log Message:
bump to 2.1.3 and missing BR ncurses-devel and readline-devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2006 23:41:01 -0000	1.7
+++ .cvsignore	12 Oct 2006 21:02:48 -0000	1.8
@@ -1 +1 @@
-torque-2.1.2.tar.gz
+torque-2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2006 23:41:01 -0000	1.7
+++ sources	12 Oct 2006 21:02:48 -0000	1.8
@@ -1 +1 @@
-f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
+0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- torque.spec	3 Aug 2006 05:51:43 -0000	1.9
+++ torque.spec	12 Oct 2006 21:02:48 -0000	1.10
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.2
+%define version 2.1.3
 #%%define snap 200604251602
 %define release 2
 
@@ -92,13 +92,12 @@
 Source5: xpbsmon.png
 Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.2-pam-getpwnam.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -122,7 +121,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
@@ -389,7 +387,7 @@
 %{_bindir}/pbs-config
 
 %package pam
-Summary: PAM module for PBS MOM nodes.
+Summary: PAM module for TORQUE MOM nodes
 Group: System Environment/Base
 
 %description pam
@@ -403,6 +401,15 @@
 
 
 %changelog
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
+- missing BR ncurses-devel and readline-devel
+
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
+- bump to 2.1.3
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 2.1.2-3
+- FC6 mass rebuild
+
 * Wed Aug  2 2006 Garrick Staples <garrick at usc.edu> 2.1.2-2
 - fix incorrect _pam_getpwnam_r usage in pam module
 


--- torque-2.1.0p0-mom_sync_jobs-fixes.patch DELETED ---


--- torque-2.1.0p0-sched-offbyone.patch DELETED ---


--- torque-2.1.2-pam-getpwnam.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 12 21:05:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 12 Oct 2006 14:05:46 -0700
Subject: rpms/libtunepimp/devel libtunepimp.spec,1.21,1.22
Message-ID: <200610122105.k9CL5mqY012782@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12765

Modified Files:
	libtunepimp.spec 
Log Message:
* Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
- rename python-libtunepimp -> python-tunepimp (to match python
  module name)



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libtunepimp.spec	12 Oct 2006 21:02:35 -0000	1.21
+++ libtunepimp.spec	12 Oct 2006 21:05:45 -0000	1.22
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -52,10 +52,8 @@
 %description devel
 %{summary}.
 
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%package -n python-%{name}
+%package -n python-tunepimp
 Summary: Python bindings for developing programs that will use %{name} 
 Group:   Development/Libraries
 License: GPL
@@ -63,7 +61,7 @@
 #if "%{?python_ver}" > "2"
 #Requires: python-abi = %{python_ver}
 #endif
-%description -n python-%{name}
+%description -n python-tunepimp
 %{summary}.
 
 
@@ -129,13 +127,17 @@
 %{_includedir}/*
 %{_libdir}/lib*.so
 
-%files -n python-%{name}
+%files -n python-tunepimp
 %defattr(-,root,root,-)
 %doc python/examples/trm.py
 %{python_sitelib}/tunepimp/
 
 
 %changelog
+* Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
+- rename python-libtunepimp -> python-tunepimp (to match python
+  module name)
+
 * Mon Oct 09 2006 Alex Lancaster <alexl[AT]users.sf.net> 0.5.2-2
 - build python-libtunepimp subpackage (#209961)
 



From fedora-extras-commits at redhat.com  Thu Oct 12 21:07:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 12 Oct 2006 14:07:00 -0700
Subject: rpms/libtunepimp/FC-5 libtunepimp.spec,1.15,1.16
Message-ID: <200610122107.k9CL720Q012852@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12833

Modified Files:
	libtunepimp.spec 
Log Message:
* Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
- rename python-libtunepimp -> python-tunepimp (to match python
  module name)



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/libtunepimp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libtunepimp.spec	6 Oct 2006 17:26:02 -0000	1.15
+++ libtunepimp.spec	12 Oct 2006 21:07:00 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -26,6 +26,8 @@
 BuildRequires: curl-devel
 BuildRequires: expat-devel
 
+BuildRequires: python-devel
+
 Obsoletes: libtunepimp-tools < %{version}-%{release}
 Provides:  libtunepimp-tools = %{version}-%{release}
 
@@ -50,6 +52,18 @@
 %description devel
 %{summary}.
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%package -n python-tunepimp
+Summary: Python bindings for developing programs that will use %{name} 
+Group:   Development/Libraries
+License: GPL
+#define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+#if "%{?python_ver}" > "2"
+#Requires: python-abi = %{python_ver}
+#endif
+%description -n python-tunepimp
+%{summary}.
+
 
 %prep
 %setup -q -n libtunepimp-%{version}
@@ -63,12 +77,20 @@
 
 make %{?_smp_mflags} PLUGIN_DIR=%{pkglibdir}/plugins
 
+pushd python
+%{__python} setup.py build 
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
 
+pushd python
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+popd
+
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -105,8 +127,20 @@
 %{_includedir}/*
 %{_libdir}/lib*.so
 
+%files -n python-tunepimp
+%defattr(-,root,root,-)
+%doc python/examples/trm.py
+%{python_sitelib}/tunepimp/
+
 
 %changelog
+* Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
+- rename python-libtunepimp -> python-tunepimp (to match python
+  module name)
+
+* Mon Oct 09 2006 Alex Lancaster <alexl[AT]users.sf.net> 0.5.2-2
+- build python-libtunepimp subpackage (#209961)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-1
 - 0.5.2
 



From fedora-extras-commits at redhat.com  Thu Oct 12 21:09:05 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu, 12 Oct 2006 14:09:05 -0700
Subject: fedora-security/audit fc5,1.351,1.352 fc6,1.106,1.107
Message-ID: <200610122109.k9CL95Bx012926@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12906

Modified Files:
	fc5 fc6 
Log Message:
Note a new nspr CVE id


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- fc5	10 Oct 2006 13:19:06 -0000	1.351
+++ fc5	12 Oct 2006 21:09:03 -0000	1.352
@@ -18,6 +18,7 @@
 CVE-2006-4980 VULNERABLE (python) #208166
 CVE-2006-4925 ** openssh
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
+CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- fc6	10 Oct 2006 13:19:06 -0000	1.106
+++ fc6	12 Oct 2006 21:09:03 -0000	1.107
@@ -19,6 +19,7 @@
 CVE-2006-4980 VULNERABLE (python) [backport in rawhide]
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
+CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability



From fedora-extras-commits at redhat.com  Thu Oct 12 21:32:04 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Thu, 12 Oct 2006 14:32:04 -0700
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.11,
	1.12 epiphany-extensions.spec, 1.12, 1.13 sources, 1.11, 1.12
Message-ID: <200610122132.k9CLW7Zm013120@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Update to 2.16.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2006 20:20:33 -0000	1.11
+++ .cvsignore	12 Oct 2006 21:32:04 -0000	1.12
@@ -1 +1 @@
-epiphany-extensions-2.15.2.tar.bz2
+epiphany-extensions-2.16.0.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- epiphany-extensions.spec	29 Aug 2006 20:34:07 -0000	1.12
+++ epiphany-extensions.spec	12 Oct 2006 21:32:04 -0000	1.13
@@ -1,13 +1,13 @@
-%define ephy_major 2.15.92
+%define ephy_major 2.16.0
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 2.15.2
+Version: 2.16.0
 Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
-Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.14/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.16/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: epiphany-devel >= %{ephy_major}
@@ -51,6 +51,9 @@
 %{_libdir}/epiphany
 
 %changelog
+* Thu Oct 12 2006 Zack Cerza <zcerza at redhat.com> 2.16.0-1
+- Update to 2.16.0
+
 * Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 2.15.2-1
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2006 20:20:33 -0000	1.11
+++ sources	12 Oct 2006 21:32:04 -0000	1.12
@@ -1 +1 @@
-2ec568adefdec0b59d42153d38b9357b  epiphany-extensions-2.15.2.tar.bz2
+bbc9c67750380d31ad068dbd7335875a  epiphany-extensions-2.16.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 12 21:39:01 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 14:39:01 -0700
Subject: fedora-security/audit fc5,1.352,1.353 fc6,1.107,1.108
Message-ID: <200610122139.k9CLd1cF013198@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13176/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-4813



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- fc5	12 Oct 2006 21:09:03 -0000	1.352
+++ fc5	12 Oct 2006 21:38:59 -0000	1.353
@@ -19,6 +19,7 @@
 CVE-2006-4925 ** openssh
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
+CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fc6	12 Oct 2006 21:09:03 -0000	1.107
+++ fc6	12 Oct 2006 21:38:59 -0000	1.108
@@ -20,6 +20,7 @@
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
+CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability



From fedora-extras-commits at redhat.com  Thu Oct 12 21:42:15 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 14:42:15 -0700
Subject: fedora-security/audit fc5,1.353,1.354 fc6,1.108,1.109
Message-ID: <200610122142.k9CLgFh0013243@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13223/audit

Modified Files:
	fc5 fc6 
Log Message:
Sort CVE-2006-4808 and CVE-2006-4809 properly



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- fc5	12 Oct 2006 21:38:59 -0000	1.353
+++ fc5	12 Oct 2006 21:42:13 -0000	1.354
@@ -21,6 +21,8 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
+CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)
@@ -79,8 +81,6 @@
 CVE-2006-4253 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.25,5.1.12) #203427
 CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.25,5.1.12) #203432
-CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
-CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4146 backport (gdb) [since FEDORA-2006-975]
 CVE-2006-4145 version (kernel, fixed 2.6.17.10) [since FEDORA-2006-967] needs a better upstream fix
 CVE-2006-4144 backport (ImageMagick, fixed 6.2.9) #202773 [since FEDORA-2006-929]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fc6	12 Oct 2006 21:38:59 -0000	1.108
+++ fc6	12 Oct 2006 21:42:13 -0000	1.109
@@ -22,6 +22,8 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
+CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
@@ -75,8 +77,6 @@
 CVE-2006-4253 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
 CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203428
 CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203434
-CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
-CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4146 backport (gdb)
 CVE-2006-4145 version (kernel, fixed 2.6.17.10, fixed 2.6.18-rc5) needs a better upstream fix
 CVE-2006-4144 backport (ImageMagick, fixed 6.2.9)



From fedora-extras-commits at redhat.com  Thu Oct 12 21:43:48 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 14:43:48 -0700
Subject: fedora-security/audit fc5,1.354,1.355 fc6,1.109,1.110
Message-ID: <200610122143.k9CLhmAj013269@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-5174



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- fc5	12 Oct 2006 21:42:13 -0000	1.354
+++ fc5	12 Oct 2006 21:43:46 -0000	1.355
@@ -6,7 +6,7 @@
 CVE-2006-5215 ** (X.org, fixed 20060225?)
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
-CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
+CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fc6	12 Oct 2006 21:42:13 -0000	1.109
+++ fc6	12 Oct 2006 21:43:46 -0000	1.110
@@ -7,7 +7,7 @@
 CVE-2006-5215 ** (X.org, fixed 20060225?)
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
-CVE-2006-5174 VULNERABLE (kernel, fixed 2.6.19-rc1)
+CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified



From fedora-extras-commits at redhat.com  Thu Oct 12 21:52:51 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 14:52:51 -0700
Subject: fedora-security/audit fc5,1.355,1.356 fc6,1.110,1.111
Message-ID: <200610122152.k9CLqpxp013310@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13285/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-5173



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- fc5	12 Oct 2006 21:43:46 -0000	1.355
+++ fc5	12 Oct 2006 21:52:49 -0000	1.356
@@ -7,6 +7,7 @@
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
+CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fc6	12 Oct 2006 21:43:46 -0000	1.110
+++ fc6	12 Oct 2006 21:52:49 -0000	1.111
@@ -8,6 +8,7 @@
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
+CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
 CVE-2006-5170 VULNERABLE (nss_ldap)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified



From fedora-extras-commits at redhat.com  Thu Oct 12 22:07:29 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 12 Oct 2006 15:07:29 -0700
Subject: fedora-security/audit fc5,1.356,1.357 fc6,1.111,1.112
Message-ID: <200610122207.k9CM7TDr016269@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16249/audit

Modified Files:
	fc5 fc6 
Log Message:
The CVE-2006-4808/CVE-2006-4807 are actually CVE-2006-4808/CVE-2005-4807



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- fc5	12 Oct 2006 21:52:49 -0000	1.356
+++ fc5	12 Oct 2006 22:07:26 -0000	1.357
@@ -22,8 +22,6 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
-CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)
@@ -525,6 +523,8 @@
 CVE-2005-4811 version (kernel, fixed 2.6.13)
 CVE-2005-4809 ** firefox
 CVE-2005-4809 ** seamonkey
+CVE-2005-4808 ignore (binutils, gas fixed 20050714) this is a bug
+CVE-2005-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2005-4798 version (kernel, not 2.6)
 CVE-2005-4784 ignore (glibc) struct dirent is big enough
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fc6	12 Oct 2006 21:52:49 -0000	1.111
+++ fc6	12 Oct 2006 22:07:26 -0000	1.112
@@ -23,8 +23,6 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4808 ignore (binutils, gas fixed 20050714) this is a bug
-CVE-2006-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
@@ -462,6 +460,8 @@
 CVE-2006-0019 version (kdelibs, fixed 3.5.1)
 CVE-2005-4811 version (kernel, fixed 2.6.13)
 CVE-2005-4809 VULNERABLE (firefox)
+CVE-2005-4808 ignore (binutils, gas fixed 20050714) this is a bug
+CVE-2005-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2005-4798 version (kernel, not 2.6)
 CVE-2005-4784 ignore (glibc) struct dirent is big enough
 CVE-2005-4746 version (freeradius, fixed 1.0.5)



From fedora-extras-commits at redhat.com  Thu Oct 12 22:36:36 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:36:36 -0700
Subject: rpms/nsd/FC-4 nsd.spec,1.10,1.11
Message-ID: <200610122236.k9CMacOd016465@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16448

Modified Files:
	nsd.spec 
Log Message:
* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
- Upgraded to 2.3.6
- Fixed spec file so daemon gets properly restarted on upgrade



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsd.spec	27 Jun 2006 02:23:13 -0000	1.10
+++ nsd.spec	12 Oct 2006 22:36:35 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
-Release: 2%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -44,7 +44,7 @@
 
 %files 
 %defattr(-,root,root,-)
-%doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
+%doc README LICENSE NSD-DATABASE DIFFERENCES TODO RELNOTES REQUIREMENTS
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
@@ -55,9 +55,6 @@
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -76,6 +73,10 @@
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Jun 26 2006 Paul Wouters <paul at xelerance.com> - 2.3.5-2
 - Bump version for FC-x upgrade path
 



From fedora-extras-commits at redhat.com  Thu Oct 12 22:38:11 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:38:11 -0700
Subject: rpms/nsd/FC-3 nsd.spec,1.9,1.10
Message-ID: <200610122238.k9CMcDOB016533@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16516

Modified Files:
	nsd.spec 
Log Message:
* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
- Upgraded to 2.3.6
- Fixed spec file so daemon gets properly restarted on upgrade



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsd.spec	27 Jun 2006 01:01:15 -0000	1.9
+++ nsd.spec	12 Oct 2006 22:38:10 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
+Version: 2.3.6
 Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
@@ -55,9 +55,6 @@
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -76,6 +73,10 @@
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Jun 26 2006 Paul Wouters <paul at xelerance.com> - 2.3.5-1
 - Upgraded to nsd-2.3.5
 



From fedora-extras-commits at redhat.com  Thu Oct 12 22:39:18 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:39:18 -0700
Subject: rpms/nsd/FC-5 nsd.spec,1.9,1.10
Message-ID: <200610122239.k9CMdKHW016599@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16582

Modified Files:
	nsd.spec 
Log Message:
* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
- Upgraded to 2.3.6
- Fixed spec file so daemon gets properly restarted on upgrade



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/nsd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsd.spec	27 Jun 2006 03:38:26 -0000	1.9
+++ nsd.spec	12 Oct 2006 22:39:18 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
-Release: 2%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -55,9 +55,6 @@
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -76,6 +73,10 @@
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Jun 26 2006 Paul Wouters <paul at xelerance.com> - 2.3.5-2
 - Bump version for FC-x upgrade path
 



From fedora-extras-commits at redhat.com  Thu Oct 12 22:41:29 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:41:29 -0700
Subject: rpms/nsd/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610122241.k9CMfVj5016739@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16720

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2006 00:00:14 -0000	1.4
+++ .cvsignore	12 Oct 2006 22:41:28 -0000	1.5
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2006 00:00:14 -0000	1.4
+++ sources	12 Oct 2006 22:41:28 -0000	1.5
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:42:10 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:42:10 -0700
Subject: rpms/nsd/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200610122242.k9CMgCX6016779@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16760

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2006 00:52:44 -0000	1.5
+++ .cvsignore	12 Oct 2006 22:42:09 -0000	1.6
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2006 00:52:44 -0000	1.5
+++ sources	12 Oct 2006 22:42:09 -0000	1.6
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:42:52 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:42:52 -0700
Subject: rpms/nsd/FC-3 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200610122242.k9CMgs4J016819@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16800

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2006 01:01:15 -0000	1.5
+++ .cvsignore	12 Oct 2006 22:42:52 -0000	1.6
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2006 01:01:15 -0000	1.5
+++ sources	12 Oct 2006 22:42:52 -0000	1.6
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:45:16 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:45:16 -0700
Subject: rpms/nsd/FC-3 sources,1.6,1.7
Message-ID: <200610122245.k9CMjIlF016855@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16838

Modified Files:
	sources 
Log Message:
remote old source line



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Oct 2006 22:42:52 -0000	1.6
+++ sources	12 Oct 2006 22:45:16 -0000	1.7
@@ -1,2 +1 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:46:55 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:46:55 -0700
Subject: rpms/nsd/FC-3 nsd.spec,1.10,1.11
Message-ID: <200610122246.k9CMkvcP016892@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16875

Modified Files:
	nsd.spec 
Log Message:
bump version



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsd.spec	12 Oct 2006 22:38:10 -0000	1.10
+++ nsd.spec	12 Oct 2006 22:46:55 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -74,6 +74,9 @@
 
 %changelog
 * Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Bump version
+
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Fixed spec file so daemon gets properly restarted on upgrade
 



From fedora-extras-commits at redhat.com  Thu Oct 12 22:56:11 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:56:11 -0700
Subject: rpms/nsd/FC-4 nsd.spec,1.11,1.12 sources,1.6,1.7
Message-ID: <200610122256.k9CMuD1i017013@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16994

Modified Files:
	nsd.spec sources 
Log Message:
bump version.



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nsd.spec	12 Oct 2006 22:36:35 -0000	1.11
+++ nsd.spec	12 Oct 2006 22:56:11 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -74,6 +74,9 @@
 
 %changelog
 * Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Bump version
+
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Fixed spec file so daemon gets properly restarted on upgrade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Oct 2006 22:42:09 -0000	1.6
+++ sources	12 Oct 2006 22:56:11 -0000	1.7
@@ -1,2 +1 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 12 22:57:11 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 12 Oct 2006 15:57:11 -0700
Subject: rpms/nsd/FC-5 nsd.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <200610122257.k9CMvDSl017076@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17057

Modified Files:
	nsd.spec sources 
Log Message:
bump version



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/nsd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsd.spec	12 Oct 2006 22:39:18 -0000	1.10
+++ nsd.spec	12 Oct 2006 22:57:11 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -74,6 +74,9 @@
 
 %changelog
 * Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
+- Bump version
+
+* Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Fixed spec file so daemon gets properly restarted on upgrade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2006 22:41:28 -0000	1.5
+++ sources	12 Oct 2006 22:57:11 -0000	1.6
@@ -1,2 +1 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 00:29:35 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 12 Oct 2006 17:29:35 -0700
Subject: rpms/epiphany-extensions/FC-5 .cvsignore, 1.10,
	1.11 epiphany-extensions.spec, 1.9, 1.10 sources, 1.10, 1.11
Message-ID: <200610130029.k9D0Tbij023434@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23413

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Updating to 2.14.1.1 to fix a long-standing issue with the scroller extensions and recent GTK releases. (This resolves bug #193430.)
I've attempted to contact Chris via email twice and pinged him on Bugzilla multiple times so far with no success. :|




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Apr 2006 16:26:54 -0000	1.10
+++ .cvsignore	13 Oct 2006 00:29:35 -0000	1.11
@@ -1 +1 @@
-epiphany-extensions-2.14.0.1.tar.bz2
+epiphany-extensions-2.14.1.1.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/epiphany-extensions.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- epiphany-extensions.spec	16 Apr 2006 16:26:54 -0000	1.9
+++ epiphany-extensions.spec	13 Oct 2006 00:29:35 -0000	1.10
@@ -2,7 +2,7 @@
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 2.14.0.1
+Version: 2.14.1.1
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -21,7 +21,7 @@
 %setup -q
 
 %build
-%configure --disable-compiler-warnings
+%configure --disable-compiler-warnings --disable-scrollkeeper
 %{__make} %{?_smp_mflags}
 
 %install
@@ -32,13 +32,26 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun
+scrollkeeper-update -q || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog README NEWS
 %{_datadir}/epiphany-extensions
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/omf/%{name}
 %{_libdir}/epiphany
 
 %changelog
+* Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com> 2.14.1.1-1
+- Update to 2.14.1.1 (fixes bug #193430: Update to 2.14.1 to fix some
+  issues with the scroller extensions and newer gtk2 releases)
+
 * Sun Apr 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.0.1-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Apr 2006 16:26:54 -0000	1.10
+++ sources	13 Oct 2006 00:29:35 -0000	1.11
@@ -1 +1 @@
-1b8ec450167010b25bba48295b5808cf  epiphany-extensions-2.14.0.1.tar.bz2
+3e807a83f068e41ce34c3c653a3353b6  epiphany-extensions-2.14.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 01:44:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:44:14 -0700
Subject: rpms/itpp - New directory
Message-ID: <200610130144.k9D1iGQ9027011@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26984/itpp

Log Message:
Directory /cvs/extras/rpms/itpp added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 01:44:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:44:14 -0700
Subject: rpms/itpp/devel - New directory
Message-ID: <200610130144.k9D1iGII027014@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26984/itpp/devel

Log Message:
Directory /cvs/extras/rpms/itpp/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 01:44:30 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:44:30 -0700
Subject: rpms/itpp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610130144.k9D1iWPG027063@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035

Added Files:
	Makefile import.log 
Log Message:
Setup of module itpp


--- NEW FILE Makefile ---
# Top level Makefile for module itpp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 13 01:44:30 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:44:30 -0700
Subject: rpms/itpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610130144.k9D1iW5c027066@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module itpp


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 13 01:45:10 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:45:10 -0700
Subject: rpms/itpp import.log,1.1,1.2
Message-ID: <200610130145.k9D1jDUC027134@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27101

Modified Files:
	import.log 
Log Message:
auto-import itpp-3.10.5-7 on branch devel from itpp-3.10.5-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/itpp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Oct 2006 01:44:30 -0000	1.1
+++ import.log	13 Oct 2006 01:45:10 -0000	1.2
@@ -0,0 +1 @@
+itpp-3_10_5-7:HEAD:itpp-3.10.5-7.src.rpm:1160703907



From fedora-extras-commits at redhat.com  Fri Oct 13 01:45:11 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 12 Oct 2006 18:45:11 -0700
Subject: rpms/itpp/devel itpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610130145.k9D1jDm5027139@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27101/devel

Modified Files:
	.cvsignore sources 
Added Files:
	itpp.spec 
Log Message:
auto-import itpp-3.10.5-7 on branch devel from itpp-3.10.5-7.src.rpm


--- NEW FILE itpp.spec ---
Name:           itpp
Version:        3.10.5
Release:        7%{?dist}
Summary:        C++ library for math, signal/speech processing, and communications

Group:          System Environment/Libraries
License:        GPL
URL:            http://itpp.sourceforge.net/
Source0:        http://download.sourceforge.net/itpp/itpp-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-gfortran, atlas-devel, fftw-devel
BuildRequires:  tetex-latex
BuildRequires:  doxygen, ghostscript

%description
IT++ is a C++ library of mathematical, signal processing, speech
processing, and communications classes and functions.  The kernel of
the IT++ library is built upon templated vector and matrix classes
with many functions for their manipulation.  Such a kernel makes IT++
similar to Octave.  IT++ makes extensive use of existing open-source
libraries (but not only) for increased functionality, speed, and
accuracy.


%package devel
Summary:        Development files for itpp
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       fftw-devel, atlas-devel, gcc-gfortran

%description devel
This package contains the itpp header files, libs, and man pages.


%package doc
Summary:        Documentation for itpp
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description doc
This package contains the documentation for itpp.


%prep
%setup -q


%build
chmod 644 itpp/base/itpp_version.h
export LDFLAGS="-L/usr/lib/atlas -lstdc++"
export CPPFLAGS="-I/usr/include/atlas"
export F77=gfortran
%configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
  --with-docdir=%{_docdir}/%{name}-%{version} --disable-static
make %{?_smp_mflags}
#
#  remove unnecessary bits from itpp-config and itpp.pc
cat itpp-config | sed -e 's|-L[^ ]*gcc[^ ]*||g' |  \
    sed -e 's|-I[^ ]*||g' > itpp-config_new
mv -f itpp-config_new itpp-config
cat itpp.pc | sed -e 's|-L[^ ]*gcc[^ ]*||g' |  \
    sed -e 's|-I[^ ]*||g' > itpp.pc_new
mv -f itpp.pc_new itpp.pc


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
cp -p COPYING AUTHORS ChangeLog NEWS README TODO \
  $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT/


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/[A-Z]*
%{_libdir}/*.so.*
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_bindir}/%{name}-config

%files doc
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/html


%changelog
* Wed Oct 11 2006  Ed Hill <ed at eh3.com> - 3.10.5-7
- explicitly link with -lstdc++

* Tue Oct 10 2006  Ed Hill <ed at eh3.com> - 3.10.5-6
- fix unowned dir

* Sun Oct  8 2006  Ed Hill <ed at eh3.com> - 3.10.5-5
- fix permissions for itpp/base/itpp_version.h
- make sure we ship the license
- remove redundant BRs and add -devel BRs
- remove only the gcc bits from itpp-config and itpp.pc

* Sat Oct  7 2006  Ed Hill <ed at eh3.com> - 3.10.5-4
- disable dependency tracking to speed build, sanitize itpp.pc,
  and de-macro-ize an earlier changelog entry

* Sat Sep 23 2006  Ed Hill <ed at eh3.com> - 3.10.5-3
- disable static libs, add pkgconfig, and sanitize itpp-config

* Tue Sep 13 2006  Ed Hill <ed at eh3.com> - 3.10.5-2
- fix the html docs and add BuildRequires

* Tue Sep 12 2006  Ed Hill <ed at eh3.com> - 3.10.5-1
- initial version for Fedora Extras

* Mon Feb 13 2006  Adam Piatyszek  <ediap at users.sourceforge.net>
- Created subpackage `itpp-html-doc' with HTML documentation

* Fri Feb 10 2006  Adam Piatyszek  <ediap at users.sourceforge.net>
- Added missing *.a and *.m files

* Thu Feb 09 2006  Adam Piatyszek  <ediap at users.sourceforge.net>
- Changes in `Name', `Version' and `Release' definitions
- Removed distribution dependent release settings
- Added DESTDIR to make install command

* Wed Dec 28 2005  Adam Piatyszek  <ediap at users.sourceforge.net>
- Fixed `name' and `version' definitions
- Added `itpp-config' in files section

* Fri Dec 23 2005  Adam Piatyszek  <ediap at users.sourceforge.net>
- Initial spec file prepared


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Oct 2006 01:44:30 -0000	1.1
+++ .cvsignore	13 Oct 2006 01:45:11 -0000	1.2
@@ -0,0 +1 @@
+itpp-3.10.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Oct 2006 01:44:30 -0000	1.1
+++ sources	13 Oct 2006 01:45:11 -0000	1.2
@@ -0,0 +1 @@
+a4c9a13ff457ee168cec5edade272ff8  itpp-3.10.5.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 02:54:47 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 12 Oct 2006 19:54:47 -0700
Subject: owners owners.list,1.1823,1.1824
Message-ID: <200610130254.k9D2snSH030529@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30508

Modified Files:
	owners.list 
Log Message:
Adding myself as a co-maintainer for epiphany-extensions; received an OK for this from Chris via email. Thanks, Chris! :)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1823
retrieving revision 1.1824
diff -u -r1.1823 -r1.1824
--- owners.list	12 Oct 2006 08:24:20 -0000	1.1823
+++ owners.list	13 Oct 2006 02:54:46 -0000	1.1824
@@ -349,7 +349,7 @@
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|enigma|Clone of the ATARI game Oxyd|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|environment-modules|Provides dynamic modification of a user's environment|orion at cora.nwra.com|extras-qa at fedoraproject.org|
-Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org|peter at thecodergeek.com
 Fedora Extras|epydoc|Edward Loper's Python API documentation generation tool|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|epylog|New logs analyzer and parser|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|eric|Python IDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 13 03:22:54 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 12 Oct 2006 20:22:54 -0700
Subject: rpms/epiphany-extensions/FC-5 epiphany-extensions.spec,1.10,1.11
Message-ID: <200610130322.k9D3Mu7G001187@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1169

Modified Files:
	epiphany-extensions.spec 
Log Message:
A bunch of build and requirement fixes


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/epiphany-extensions.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- epiphany-extensions.spec	13 Oct 2006 00:29:35 -0000	1.10
+++ epiphany-extensions.spec	13 Oct 2006 03:22:54 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
 Version: 2.14.1.1
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
@@ -11,7 +11,11 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: epiphany-devel >= %{ephy_major}
+BuildRequires: gettext
+BuildRequires: perl(XML::Parser)
 Requires: epiphany >= %{ephy_major}
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Epiphany Extensions is a collection of extensions for Epiphany, the
@@ -26,7 +30,7 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT make install
+make DESTDIR=$RPM_BUILD_ROOT install
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %{name} --all-name
 
 %clean
@@ -38,7 +42,6 @@
 %postun
 scrollkeeper-update -q || :
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog README NEWS
@@ -48,6 +51,12 @@
 %{_libdir}/epiphany
 
 %changelog
+* Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com> 2.14.1.1-2
+- Add proper post/postun Requires: scrollkeeper
+- Add proper gettext requirements for build-time translations support 
+- Fix up %%files for the version update
+- DESTDIR is a make variable, not an external one
+
 * Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com> 2.14.1.1-1
 - Update to 2.14.1.1 (fixes bug #193430: Update to 2.14.1 to fix some
   issues with the scroller extensions and newer gtk2 releases)



From fedora-extras-commits at redhat.com  Fri Oct 13 03:50:02 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 12 Oct 2006 20:50:02 -0700
Subject: rpms/epiphany-extensions/devel epiphany-extensions.spec,1.13,1.14
Message-ID: <200610130350.k9D3o4Kr001328@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1311

Modified Files:
	epiphany-extensions.spec 
Log Message:
A couple of minor spec-only fixes; not worthy of an EVR bump and build though.


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- epiphany-extensions.spec	12 Oct 2006 21:32:04 -0000	1.13
+++ epiphany-extensions.spec	13 Oct 2006 03:50:02 -0000	1.14
@@ -11,7 +11,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: epiphany-devel >= %{ephy_major}
-BuildRequires: perl-XML-Parser
+BuildRequires: perl(XML::Parser)
 BuildRequires: gettext
 Requires: epiphany >= %{ephy_major}
 Requires(post): scrollkeeper
@@ -30,7 +30,7 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT make install
+make DESTDIR=$RPM_BUILD_ROOT install
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %{name} --all-name
 
 %clean
@@ -51,6 +51,10 @@
 %{_libdir}/epiphany
 
 %changelog
+* Thu Oct 12 2006 Peter Gordon <peter at thecodergeek.com>
+- Change perl-XML-Parser BR to perl(XML::Parser)
+- DESTDIR is a make variable, not an external one
+
 * Thu Oct 12 2006 Zack Cerza <zcerza at redhat.com> 2.16.0-1
 - Update to 2.16.0
 



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:17 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:17 -0700
Subject: rpms/perl-aliased - New directory
Message-ID: <200610130540.k9D5eJXb007842@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816/perl-aliased

Log Message:
Directory /cvs/extras/rpms/perl-aliased added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:22 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:22 -0700
Subject: rpms/perl-aliased Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610130540.k9D5eOCA007889@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7854

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-aliased


--- NEW FILE Makefile ---
# Top level Makefile for module perl-aliased
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:18 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:18 -0700
Subject: rpms/perl-aliased/devel - New directory
Message-ID: <200610130540.k9D5eKQV007845@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816/perl-aliased/devel

Log Message:
Directory /cvs/extras/rpms/perl-aliased/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:23 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:23 -0700
Subject: rpms/perl-aliased/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610130540.k9D5eP2N007892@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7854/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-aliased


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:37 -0700
Subject: rpms/perl-aliased import.log,1.1,1.2
Message-ID: <200610130540.k9D5edCt007959@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7924

Modified Files:
	import.log 
Log Message:
auto-import perl-aliased-0.20-1.fc5 on branch devel from perl-aliased-0.20-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Oct 2006 05:40:22 -0000	1.1
+++ import.log	13 Oct 2006 05:40:37 -0000	1.2
@@ -0,0 +1 @@
+perl-aliased-0_20-1_fc5:HEAD:perl-aliased-0.20-1.fc5.src.rpm:1160718036



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:35 -0700
Subject: owners owners.list,1.1824,1.1825
Message-ID: <200610130540.k9D5ebi2007939@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7899

Modified Files:
	owners.list 
Log Message:
added perl-aliased


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1824
retrieving revision 1.1825
diff -u -r1.1824 -r1.1825
--- owners.list	13 Oct 2006 02:54:46 -0000	1.1824
+++ owners.list	13 Oct 2006 05:40:35 -0000	1.1825
@@ -1223,6 +1223,7 @@
 Fedora Extras|perl-Algorithm-C3|Module for merging hierarchies using the C3 algorithm|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Algorithm-Dependency|Algorithmic framework for implementing dependency trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-aliased|Use shorter versions of class names|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Alien-wxWidgets|Building, finding and using wxWidgets binaries|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AnyData|Easy access to data in many formats|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com



From fedora-extras-commits at redhat.com  Fri Oct 13 05:40:38 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:40:38 -0700
Subject: rpms/perl-aliased/devel perl-aliased.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610130540.k9D5eeBr007964@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7924/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-aliased.spec 
Log Message:
auto-import perl-aliased-0.20-1.fc5 on branch devel from perl-aliased-0.20-1.fc5.src.rpm


--- NEW FILE perl-aliased.spec ---
Name:           perl-aliased
Version:        0.20
Release:        1%{?dist}
Summary:        Use shorter versions of class names
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/aliased/
Source0:        http://www.cpan.org/authors/id/O/OV/OVID/aliased-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Pod::Coverage), perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
aliased is simple in concept but is a rather handy module. It loads the
class you specify and exports into your namespace a subroutine that returns
the class name. You can explicitly alias the class to another name or, if
you prefer, you can do so implicitly. In the latter case, the name of the
subroutine is the last part of the class name. 

%prep
%setup -q -n aliased-%{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 README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Oct 09 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Oct 2006 05:40:23 -0000	1.1
+++ .cvsignore	13 Oct 2006 05:40:37 -0000	1.2
@@ -0,0 +1 @@
+aliased-0.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Oct 2006 05:40:23 -0000	1.1
+++ sources	13 Oct 2006 05:40:37 -0000	1.2
@@ -0,0 +1 @@
+0bfab0c5dcff5a4903e04feb22d37b9b  aliased-0.20.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 05:41:40 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 12 Oct 2006 22:41:40 -0700
Subject: rpms/perl-aliased/devel perl-aliased.spec,1.1,1.2
Message-ID: <200610130541.k9D5fg2q008029@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8012

Modified Files:
	perl-aliased.spec 
Log Message:
release bump


Index: perl-aliased.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/perl-aliased.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-aliased.spec	13 Oct 2006 05:40:37 -0000	1.1
+++ perl-aliased.spec	13 Oct 2006 05:41:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-aliased
 Version:        0.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Use shorter versions of class names
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -47,5 +47,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 12 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.20-2
+- bump
+
 * Mon Oct 09 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
 - Specfile autogenerated by cpanspec 1.69.



From fedora-extras-commits at redhat.com  Fri Oct 13 09:54:57 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri, 13 Oct 2006 02:54:57 -0700
Subject: rpms/mantis/FC-5 mantis.spec,1.11,1.12
Message-ID: <200610130954.k9D9sxWB021599@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21582

Modified Files:
	mantis.spec 
Log Message:
Update to 1.0.5



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/mantis.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mantis.spec	22 May 2006 06:32:40 -0000	1.11
+++ mantis.spec	13 Oct 2006 09:54:57 -0000	1.12
@@ -1,24 +1,23 @@
 # $Id$
 
-%global pkgdir		%_datadir/%name
-%global cfgdir		%_sysconfdir/%name
-%global httpconfdir	%_sysconfdir/httpd/conf.d
-
-%{!?release_func:%global release_func() %1%{?dist}}
+%global pkgdir		%{_datadir}/%{name}
+%global cfgdir		%{_sysconfdir}/%{name}
+%global httpconfdir	%{_sysconfdir}/httpd/conf.d
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	1.0.3
-Release:	%release_func 1
+Version:	1.0.5
+Release:	1%{dist}
 License:	GPL
 Group:		Applications/Internet
-URL:		http://mantisbt.sourceforge.net/
+URL:		http://www.mantisbugtracker.com/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%name-%version.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-1.0.0rc2-noadmin.patch
-BuildRoot:	%_tmppath/%name-%version-%release-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	diffutils
 Requires:	php
 Requires:	mantis-config
@@ -28,17 +27,15 @@
 Group:		Applications/Internet
 Source10:	mantis-httpd.conf
 Provides:	mantis-config = httpd
-Requires:	mantis = %version-%release
-Requires:	%httpconfdir
+Requires:	mantis = %{version}-%{release}
+Requires:	%{httpconfdir}
 Requires:	mod_ssl
 Requires(post):		httpd
 Requires(postun):	httpd
 
 
 %description
-Mantis is a web-based bugtracking system. It is in active development
-and is considered beta.
-
+Mantis is a web-based bugtracking system. 
 It is written in the PHP scripting language and requires the MySQL
 database and a webserver. Mantis has been installed on Windows, MacOS,
 OS/2, and a variety of Unix operating systems. Any web browser should
@@ -46,14 +43,12 @@
 GNU General Public License (GPL).
 
 %description config-httpd
-Mantis is a web-based bugtracking system. It is in active development
-and is considered beta.
-
+Mantis is a web-based bugtracking system.
 This package contains configuration-files for Apache httpd 2.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
@@ -63,25 +58,25 @@
 
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "${RPM_BUILD_ROOT}"
 
-%__install -d -m755 $RPM_BUILD_ROOT%pkgdir
-%__install -d -m750 $RPM_BUILD_ROOT%cfgdir
+%{__install} -d -m755 ${RPM_BUILD_ROOT}%{pkgdir}
+%{__install} -d -m750 ${RPM_BUILD_ROOT}%{cfgdir}
 
-tar cf - . | tar xf - -C $RPM_BUILD_ROOT%pkgdir
+tar cf - . | tar xf - -C ${RPM_BUILD_ROOT}%{pkgdir}
 
 
-find $RPM_BUILD_ROOT \( \
+find ${RPM_BUILD_ROOT} \( \
 	-name '*.noexamplecom' -o -name '*.iis' -o -name '*.noadmin' -o -name '*.#.*' -o \
 	-name '.cvsignore' \
 	\) -print0 | xargs -0 rm -f
 
 ## Do not rename; the *existence* of this file will be checked to
 ## determine if mantis is offline
-mv $RPM_BUILD_ROOT%pkgdir/mantis_offline.php.sample $RPM_BUILD_ROOT%cfgdir/
-mv $RPM_BUILD_ROOT%pkgdir/config_inc.php.sample     $RPM_BUILD_ROOT%cfgdir/config_inc.php
+mv ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php.sample ${RPM_BUILD_ROOT}%{cfgdir}/
+mv ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php.sample     ${RPM_BUILD_ROOT}%{cfgdir}/config_inc.php
 
-for i in $(find $RPM_BUILD_ROOT -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
+for i in $(find ${RPM_BUILD_ROOT} -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
 	case $i in
 		(*.php)
 			if ! sed '1p;d' "$i" | grep -q '^#!'; then
@@ -95,27 +90,27 @@
 	esac
 done
 
-chmod -x $RPM_BUILD_ROOT%pkgdir/{doc/*,core/phpmailer/{README,LICENSE}}
+chmod -x ${RPM_BUILD_ROOT}%{pkgdir}/{doc/*,core/phpmailer/{README,LICENSE}}
 
-ln -s %cfgdir/config_inc.php	 $RPM_BUILD_ROOT%pkgdir/config_inc.php
-ln -s %cfgdir/mantis_offline.php $RPM_BUILD_ROOT%pkgdir/mantis_offline.php
+ln -s %{cfgdir}/config_inc.php	 ${RPM_BUILD_ROOT}%{pkgdir}/config_inc.php
+ln -s %{cfgdir}/mantis_offline.php ${RPM_BUILD_ROOT}%{pkgdir}/mantis_offline.php
 
 
 ## The httpd config-files
 function subst() {
-	f=$RPM_BUILD_ROOT$1
-	sed -e 's!/usr/share/mantis!%pkgdir!g' "$f" >"$f".tmp
+	f=${RPM_BUILD_ROOT}$1
+	sed -e 's!/usr/share/mantis!%{pkgdir}!g' "$f" >"$f".tmp
 	cmp -s "$f" "$f.tmp" || cat "$f.tmp" >"$f"
 	rm -f "$f.tmp"
 }
 
-%__install -d $RPM_BUILD_ROOT%httpconfdir
-%__install -p -m644 %SOURCE10 $RPM_BUILD_ROOT%httpconfdir/mantis.conf
-subst %httpconfdir/mantis.conf
+%{__install} -d ${RPM_BUILD_ROOT}%{httpconfdir}
+%{__install} -p -m644 %{SOURCE10} ${RPM_BUILD_ROOT}%{httpconfdir}/mantis.conf
+subst %{httpconfdir}/mantis.conf
 
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf "${RPM_BUILD_ROOT}"
 
 
 %post config-httpd
@@ -127,17 +122,20 @@
 
 %files
 %defattr(-,root,root,-)
-%pkgdir
-%attr(-,root,apache) %dir %cfgdir
-%attr(0640,root,apache) %config(noreplace) %cfgdir/*
+%{pkgdir}
+%attr(-,root,apache) %dir %{cfgdir}
+%attr(0640,root,apache) %config(noreplace) %{cfgdir}/*
 
 
 %files config-httpd
 %defattr(-,root,root,-)
-%config(noreplace) %httpconfdir/*
+%config(noreplace) %{httpconfdir}/*
 
 
 %changelog
+* Tue Oct 10 2006 Gianluca Sforna <giallu gmail com> - 1.0.5-1
+- updated to 1.0.5
+
 * Sat May 20 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.0.3-1
 - updated to 1.0.3 (SECURITY)
 



From fedora-extras-commits at redhat.com  Fri Oct 13 09:59:11 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri, 13 Oct 2006 02:59:11 -0700
Subject: rpms/mantis/FC-5 sources,1.8,1.9
Message-ID: <200610130959.k9D9xD25021628@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21611

Modified Files:
	sources 
Log Message:
Update sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 May 2006 06:32:40 -0000	1.8
+++ sources	13 Oct 2006 09:59:10 -0000	1.9
@@ -1 +1 @@
-6c70d00da4cad5da2e0df387f474d3e4  mantis-1.0.3.tar.gz
+01c5fb87e5ac161a681471573711bcf6  mantis_1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 10:17:30 2006
From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc))
Date: Fri, 13 Oct 2006 03:17:30 -0700
Subject: owners owners.list,1.1825,1.1826
Message-ID: <200610131017.k9DAHW0q024742@cvs-int.fedora.redhat.com>

Author: markmc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24721

Modified Files:
	owners.list 
Log Message:
give sabayon to alex



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1825
retrieving revision 1.1826
diff -u -r1.1825 -r1.1826
--- owners.list	13 Oct 2006 05:40:35 -0000	1.1825
+++ owners.list	13 Oct 2006 10:17:30 -0000	1.1826
@@ -1994,7 +1994,7 @@
 Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|s3switch|Manage the output device on S3 Savage chips|paul at xelerance.com|extras-qa at fedoraproject.org|
-Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|alexl at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sage|OpenGL extensions library using SDL|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-cmpi-base|Standards Based Linux Instrumentation Base CMPI Providers for System-related CIM classes|hamzy at us.ibm.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 13 10:54:48 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 13 Oct 2006 03:54:48 -0700
Subject: rpms/clisp/devel .cvsignore, 1.7, 1.8 clisp.spec, 1.20, 1.21 sources,
	1.8, 1.9
Message-ID: <200610131054.k9DAsohf024879@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24858

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.41


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Oct 2006 11:24:26 -0000	1.7
+++ .cvsignore	13 Oct 2006 10:54:48 -0000	1.8
@@ -1 +1 @@
-clisp-2.40.tar.bz2
+clisp-2.41.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- clisp.spec	3 Oct 2006 16:44:12 -0000	1.20
+++ clisp.spec	13 Oct 2006 10:54:48 -0000	1.21
@@ -1,13 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.40
-Release: 	3%{?dist}
+Version:	2.41
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
-Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
-Patch0:		clisp-2.40-doc.patch
+Source:		http://download.sourceforge.net/clisp/clisp-2.41.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -57,8 +56,6 @@
 
 %prep
 %setup -q
-cd src
-%patch0
 
 
 %build
@@ -132,6 +129,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.41-1
+- new version 2.41
+
 * Tue Oct  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-3
 - Added patch for x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Oct 2006 11:24:26 -0000	1.8
+++ sources	13 Oct 2006 10:54:48 -0000	1.9
@@ -1 +1 @@
-87e9c4807a8fa3a9b6f7bc25e9e368a4  clisp-2.40.tar.bz2
+3a7a00e82ebeeb72a75a032f84c36c6c  clisp-2.41.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 10:57:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 13 Oct 2006 03:57:20 -0700
Subject: rpms/clisp/FC-5 .cvsignore, 1.7, 1.8 clisp.spec, 1.18, 1.19 sources,
	1.8, 1.9
Message-ID: <200610131057.k9DAvMa5024951@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24930/FC-5

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.41


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Oct 2006 11:24:25 -0000	1.7
+++ .cvsignore	13 Oct 2006 10:57:20 -0000	1.8
@@ -1 +1 @@
-clisp-2.40.tar.bz2
+clisp-2.41.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/clisp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- clisp.spec	3 Oct 2006 17:04:24 -0000	1.18
+++ clisp.spec	13 Oct 2006 10:57:20 -0000	1.19
@@ -1,13 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.40
-Release: 	3%{?dist}
+Version:	2.41
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://clisp.cons.org
-Source:		http://download.sourceforge.net/clisp/clisp-2.40.tar.bz2
-Patch0:		clisp-2.40-doc.patch
+Source:		http://download.sourceforge.net/clisp/clisp-2.41.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -57,8 +56,6 @@
 
 %prep
 %setup -q
-cd src
-%patch0
 
 
 %build
@@ -132,6 +129,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.41-1
+- new version 2.41
+
 * Tue Oct  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.40-3
 - Added patch for x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Oct 2006 11:24:25 -0000	1.8
+++ sources	13 Oct 2006 10:57:20 -0000	1.9
@@ -1 +1 @@
-87e9c4807a8fa3a9b6f7bc25e9e368a4  clisp-2.40.tar.bz2
+3a7a00e82ebeeb72a75a032f84c36c6c  clisp-2.41.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 14:27:48 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 13 Oct 2006 07:27:48 -0700
Subject: rpms/ktechlab/devel ktechlab-0.3-ppc-includes.patch, NONE,
	1.1 ktechlab.spec, 1.1, 1.2
Message-ID: <200610131427.k9DERoXD005681@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659

Modified Files:
	ktechlab.spec 
Added Files:
	ktechlab-0.3-ppc-includes.patch 
Log Message:
try to fix compilation on ppc

ktechlab-0.3-ppc-includes.patch:

--- NEW FILE ktechlab-0.3-ppc-includes.patch ---
--- ktechlab-0.3/src/electronics/port.cpp.headers	2006-01-01 22:51:37.000000000 +0900
+++ ktechlab-0.3/src/electronics/port.cpp	2006-10-13 23:17:27.000000000 +0900
@@ -13,10 +13,9 @@
 #include <kdebug.h>
 
 #include <errno.h>
-#include <fcntl.h>
+#include <linux/fcntl.h>
 #include <linux/ppdev.h>
-#include <sys/ioctl.h>
-#include <sys/io.h>
+#include <linux/ioctl.h>
 #include <unistd.h>
 
 //BEGIN class Port


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktechlab.spec	27 Sep 2006 17:22:50 -0000	1.1
+++ ktechlab.spec	13 Oct 2006 14:27:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -11,6 +11,7 @@
 
 Patch0:           ktechlab-0.3-pic.patch
 Patch1:           ktechlab-0.3.desktop.patch
+Patch2:           ktechlab-0.3-ppc-includes.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +43,9 @@
 
 %patch0 -p0 -b pic14.h
 %patch1 -p0 -b ktechlab.desktop
+%ifarch ppc
+%patch2 -p1 -b .ppc-includes
+%endif
 
 %build
 %configure --disable-rpath
@@ -93,6 +97,9 @@
 
 
 %Changelog
+* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4
+- Try to fix compilation on ppc.
+
 * Mon Sep 25 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3-3
 - Added gputils as requires
 



From fedora-extras-commits at redhat.com  Fri Oct 13 15:13:13 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 13 Oct 2006 08:13:13 -0700
Subject: rpms/ktechlab/devel ktechlab-0.3-ppc-includes.patch, 1.1,
	1.2 ktechlab.spec, 1.2, 1.3
Message-ID: <200610131513.k9DFDGdD008901@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8879

Modified Files:
	ktechlab-0.3-ppc-includes.patch ktechlab.spec 
Log Message:
again try ppc

ktechlab-0.3-ppc-includes.patch:

Index: ktechlab-0.3-ppc-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab-0.3-ppc-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktechlab-0.3-ppc-includes.patch	13 Oct 2006 14:27:48 -0000	1.1
+++ ktechlab-0.3-ppc-includes.patch	13 Oct 2006 15:13:13 -0000	1.2
@@ -1,15 +1,16 @@
 --- ktechlab-0.3/src/electronics/port.cpp.headers	2006-01-01 22:51:37.000000000 +0900
-+++ ktechlab-0.3/src/electronics/port.cpp	2006-10-13 23:17:27.000000000 +0900
-@@ -13,10 +13,9 @@
++++ ktechlab-0.3/src/electronics/port.cpp	2006-10-14 00:10:59.000000000 +0900
+@@ -13,11 +13,11 @@
  #include <kdebug.h>
  
  #include <errno.h>
 -#include <fcntl.h>
 +#include <linux/fcntl.h>
  #include <linux/ppdev.h>
--#include <sys/ioctl.h>
+ #include <sys/ioctl.h>
 -#include <sys/io.h>
-+#include <linux/ioctl.h>
  #include <unistd.h>
++#include <asm/ioctls.h>
  
  //BEGIN class Port
+ Port::Port()


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ktechlab.spec	13 Oct 2006 14:27:48 -0000	1.2
+++ ktechlab.spec	13 Oct 2006 15:13:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          4%{?dist}
+Release:          4.2%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -97,6 +97,9 @@
 
 
 %Changelog
+* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4.2
+- Again.
+
 * Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4
 - Try to fix compilation on ppc.
 



From fedora-extras-commits at redhat.com  Fri Oct 13 15:29:20 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 13 Oct 2006 08:29:20 -0700
Subject: rpms/ktechlab/devel ktechlab-0.3-ppc-includes.patch, 1.2,
	1.3 ktechlab.spec, 1.3, 1.4
Message-ID: <200610131529.k9DFTMkS009092@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9070

Modified Files:
	ktechlab-0.3-ppc-includes.patch ktechlab.spec 
Log Message:
again try ppcmake clog

ktechlab-0.3-ppc-includes.patch:

Index: ktechlab-0.3-ppc-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab-0.3-ppc-includes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ktechlab-0.3-ppc-includes.patch	13 Oct 2006 15:13:13 -0000	1.2
+++ ktechlab-0.3-ppc-includes.patch	13 Oct 2006 15:29:20 -0000	1.3
@@ -1,16 +1,10 @@
 --- ktechlab-0.3/src/electronics/port.cpp.headers	2006-01-01 22:51:37.000000000 +0900
-+++ ktechlab-0.3/src/electronics/port.cpp	2006-10-14 00:10:59.000000000 +0900
-@@ -13,11 +13,11 @@
- #include <kdebug.h>
- 
- #include <errno.h>
--#include <fcntl.h>
-+#include <linux/fcntl.h>
++++ ktechlab-0.3/src/electronics/port.cpp	2006-10-14 00:28:12.000000000 +0900
+@@ -16,7 +16,6 @@
+ #include <fcntl.h>
  #include <linux/ppdev.h>
  #include <sys/ioctl.h>
 -#include <sys/io.h>
  #include <unistd.h>
-+#include <asm/ioctls.h>
  
  //BEGIN class Port
- Port::Port()


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ktechlab.spec	13 Oct 2006 15:13:13 -0000	1.3
+++ ktechlab.spec	13 Oct 2006 15:29:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          4.2%{?dist}
+Release:          5%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -97,10 +97,7 @@
 
 
 %Changelog
-* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4.2
-- Again.
-
-* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-4
+* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-5
 - Try to fix compilation on ppc.
 
 * Mon Sep 25 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3-3



From fedora-extras-commits at redhat.com  Fri Oct 13 15:42:06 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 13 Oct 2006 08:42:06 -0700
Subject: rpms/ktechlab/FC-5 ktechlab-0.3-ppc-includes.patch, NONE,
	1.1 ktechlab.spec, 1.1, 1.2
Message-ID: <200610131542.k9DFg8bD009214@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ktechlab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9194

Modified Files:
	ktechlab.spec 
Added Files:
	ktechlab-0.3-ppc-includes.patch 
Log Message:
fix compilation on ppc

ktechlab-0.3-ppc-includes.patch:

--- NEW FILE ktechlab-0.3-ppc-includes.patch ---
--- ktechlab-0.3/src/electronics/port.cpp.headers	2006-01-01 22:51:37.000000000 +0900
+++ ktechlab-0.3/src/electronics/port.cpp	2006-10-14 00:28:12.000000000 +0900
@@ -16,7 +16,6 @@
 #include <fcntl.h>
 #include <linux/ppdev.h>
 #include <sys/ioctl.h>
-#include <sys/io.h>
 #include <unistd.h>
 
 //BEGIN class Port


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/FC-5/ktechlab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktechlab.spec	27 Sep 2006 17:22:50 -0000	1.1
+++ ktechlab.spec	13 Oct 2006 15:42:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          3%{?dist}
+Release:          5%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -11,6 +11,7 @@
 
 Patch0:           ktechlab-0.3-pic.patch
 Patch1:           ktechlab-0.3.desktop.patch
+Patch2:           ktechlab-0.3-ppc-includes.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +43,9 @@
 
 %patch0 -p0 -b pic14.h
 %patch1 -p0 -b ktechlab.desktop
+%ifarch ppc
+%patch2 -p1 -b .ppc-includes
+%endif
 
 %build
 %configure --disable-rpath
@@ -93,6 +97,9 @@
 
 
 %Changelog
+* Fri Oct 13 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-5
+- Try to fix compilation on ppc.
+
 * Mon Sep 25 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3-3
 - Added gputils as requires
 



From fedora-extras-commits at redhat.com  Fri Oct 13 17:27:40 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 10:27:40 -0700
Subject: rpms/ktorrent/devel .cvsignore, 1.5, 1.6 ktorrent.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200610131727.k9DHRgr2016152@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16131

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Update to version 2.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Aug 2006 18:34:47 -0000	1.5
+++ .cvsignore	13 Oct 2006 17:27:40 -0000	1.6
@@ -1 +1 @@
-ktorrent-2.0.2.tar.gz
+ktorrent-2.0.3.tar.gz


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ktorrent.spec	7 Sep 2006 18:10:30 -0000	1.13
+++ ktorrent.spec	13 Oct 2006 17:27:40 -0000	1.14
@@ -1,13 +1,13 @@
 %define desktopvendor fedora
 
 Name:           ktorrent
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
-Source0:        http://ktorrent.org/downloads/2.0.2/ktorrent-2.0.2.tar.gz
+Source0:        http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel
@@ -125,6 +125,9 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-1
+- Update to upstream version 2.0.3
+
 * Thu Sep 07 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.2-3
 - mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Aug 2006 18:34:47 -0000	1.5
+++ sources	13 Oct 2006 17:27:40 -0000	1.6
@@ -1 +1 @@
-6e6233e8f7104639f2929abeb7320333  ktorrent-2.0.2.tar.gz
+f0297ab9ead77ee11f9f46cffa904b89  ktorrent-2.0.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 17:28:38 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 10:28:38 -0700
Subject: rpms/ktorrent/FC-5 .cvsignore, 1.5, 1.6 ktorrent.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200610131728.k9DHSeAh016224@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16203

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Update to version 2.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Aug 2006 18:47:02 -0000	1.5
+++ .cvsignore	13 Oct 2006 17:28:38 -0000	1.6
@@ -1 +1 @@
-ktorrent-2.0.2.tar.gz
+ktorrent-2.0.3.tar.gz


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ktorrent.spec	7 Sep 2006 18:11:43 -0000	1.8
+++ ktorrent.spec	13 Oct 2006 17:28:38 -0000	1.9
@@ -1,13 +1,13 @@
 %define desktopvendor fedora
 
 Name:           ktorrent
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
-Source0:        http://ktorrent.org/downloads/2.0.2/ktorrent-2.0.2.tar.gz
+Source0:        http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel
@@ -125,6 +125,9 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-1
+- Update to upstream version 2.0.3
+
 * Thu Sep 07 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.2-3
 - mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Aug 2006 18:47:02 -0000	1.5
+++ sources	13 Oct 2006 17:28:38 -0000	1.6
@@ -1 +1 @@
-6e6233e8f7104639f2929abeb7320333  ktorrent-2.0.2.tar.gz
+f0297ab9ead77ee11f9f46cffa904b89  ktorrent-2.0.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 17:56:17 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 13 Oct 2006 10:56:17 -0700
Subject: rpms/vorbisgain/devel vorbisgain-spelling.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 sources, 1.2, 1.3 vorbisgain.spec, 1.3, 1.4
Message-ID: <200610131756.k9DHuJae016403@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/vorbisgain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16379

Modified Files:
	.cvsignore sources vorbisgain.spec 
Added Files:
	vorbisgain-spelling.patch 
Log Message:
* Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.36-1
- Update to 0.36.
- Add patch to fix spelling errors in manpage.


vorbisgain-spelling.patch:

--- NEW FILE vorbisgain-spelling.patch ---
diff -ur vorbisgain-0.36.OLD/vorbisgain.1 vorbisgain-0.36/vorbisgain.1
--- vorbisgain-0.36.OLD/vorbisgain.1	2005-02-06 12:40:19.000000000 -0500
+++ vorbisgain-0.36/vorbisgain.1	2006-10-13 13:42:01.000000000 -0400
@@ -70,7 +70,7 @@
 needed for a conversion, the file is not modified. The album peak tag is
 only created if
 .I -a
-is specified, and the album gain value is then checked for concistency.
+is specified, and the album gain value is then checked for consistency.
 Otherwise any album gain is converted without any checks.
 
 .IP "-d, --display-only"
@@ -100,7 +100,7 @@
 was configured with --enable-recursive.
 
 .IP "-s, --silent"
-Sliently skip any non-Vorbis files found. Vorbis files that can't be processed
+Silently skip any non-Vorbis files found. Vorbis files that can't be processed
 for some reason are skipped as well, though not silently. Default is to stop
 when such files are encountered.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vorbisgain/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 May 2006 16:12:55 -0000	1.2
+++ .cvsignore	13 Oct 2006 17:56:17 -0000	1.3
@@ -1 +1 @@
-vorbisgain-0.34.zip
+vorbisgain-0.36.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vorbisgain/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 May 2006 16:12:55 -0000	1.2
+++ sources	13 Oct 2006 17:56:17 -0000	1.3
@@ -1 +1 @@
-ee62352b74c610bb3eeddda038819fc8  vorbisgain-0.34.zip
+3c9df5028fa395aa98fdf0f58a5187b0  vorbisgain-0.36.zip


Index: vorbisgain.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbisgain/devel/vorbisgain.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vorbisgain.spec	4 Oct 2006 22:45:45 -0000	1.3
+++ vorbisgain.spec	13 Oct 2006 17:56:17 -0000	1.4
@@ -1,15 +1,18 @@
 Name:           vorbisgain
-Version:        0.34
-Release:        3%{?dist}
+Version:        0.36
+Release:        1%{?dist}
 Summary:        Adds tags to Ogg Vorbis files to adjust the volume
 
 Group:          Applications/Multimedia
 License:        LGPL
 URL:            http://sjeng.org/vorbisgain.html
 Source0:	http://sjeng.org/ftp/vorbis/%{name}-%{version}.zip
+Patch0:		%{name}-spelling.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Buildrequires:  libvorbis-devel libogg-devel
+BuildRequires:	libvorbis-devel
+BuildRequires:	libogg-devel
+
 
 %description
 VorbisGain is a utility that uses a psychoacoustic method to correct the
@@ -20,28 +23,39 @@
 Nowadays most good players such as ogg123, xmms and mplayer are already
 compatible. 
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .spelling
+
 
 %build
 chmod 755 configure
 %configure --enable-recursive
 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 NEWS README
 %{_bindir}/%{name}
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.36-1
+- Update to 0.36.
+- Add patch to fix spelling errors in manpage.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.34-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Fri Oct 13 18:25:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 13 Oct 2006 11:25:14 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 telepathy-gabble.spec, 1.9, 1.10
Message-ID: <200610131825.k9DIPGku019579@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19558

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.13-1
- Update to 0.3.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Oct 2006 22:46:54 -0000	1.9
+++ .cvsignore	13 Oct 2006 18:25:13 -0000	1.10
@@ -1 +1 @@
-telepathy-gabble-0.3.11.tar.gz
+telepathy-gabble-0.3.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Oct 2006 22:46:54 -0000	1.9
+++ sources	13 Oct 2006 18:25:13 -0000	1.10
@@ -1 +1 @@
-a76a36d33374e339a25760678e4baae9  telepathy-gabble-0.3.11.tar.gz
+5c450c77155aec13d4762b38b3ccb980  telepathy-gabble-0.3.13.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- telepathy-gabble.spec	11 Oct 2006 22:46:54 -0000	1.9
+++ telepathy-gabble.spec	13 Oct 2006 18:25:13 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.11
+Version:        0.3.13
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.13-1
+- Update to 0.3.13.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.11-1
 - Update to 0.3.11.
 



From fedora-extras-commits at redhat.com  Fri Oct 13 18:56:55 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Fri, 13 Oct 2006 11:56:55 -0700
Subject: kadischi kadischi.spec,1.44,1.45
Message-ID: <200610131856.k9DIutHS020132@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20113/kadischi

Modified Files:
	kadischi.spec 
Log Message:
Re-add glib2-devel for BuildRequires


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kadischi.spec	22 Sep 2006 14:05:03 -0000	1.44
+++ kadischi.spec	13 Oct 2006 18:56:53 -0000	1.45
@@ -2,7 +2,7 @@
 
 Name:           kadischi
 Version:        3.4
-Release:        3.%{alphatag}
+Release:        4.%{alphatag}
 Summary:        LiveCD generation utility 
 
 Group:          Applications/System
@@ -11,7 +11,7 @@
 Source0:        kadischi.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kudzu-devel intltool automake desktop-file-utils
+BuildRequires:  kudzu-devel intltool automake desktop-file-utils glib2-devel
 Requires:       anaconda busybox-anaconda syslinux mkisofs squashfs-tools
 Requires:       usermode gnome-python2-gtkhtml2
 AutoReqProv:    on
@@ -91,6 +91,10 @@
 %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo
 
 %changelog
+* Fri Oct 13 2006 <jasperhartline at adelphia.net> 3.4-3.20061013cvs
+- Add glib2-devel as BuildRequires.
+
+
 * Fri Sep 22 2006 <jasperhartline at adelphia.net> 3.4-3.20060922cvs
 - Remove glib2-devel and autoconf as BuildRequires.
 - Remove Python, PERL and e2fsprogs as Requires.



From fedora-extras-commits at redhat.com  Fri Oct 13 18:57:47 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Fri, 13 Oct 2006 11:57:47 -0700
Subject: rpms/sword/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610131857.k9DIvn0p020202@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20183

Modified Files:
	.cvsignore sources 
Log Message:
New Release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2005 11:54:45 -0000	1.2
+++ .cvsignore	13 Oct 2006 18:57:47 -0000	1.3
@@ -1 +1 @@
-sword-1.5.8.tar.gz
+sword-1.5.9-1.src.rpm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 11:54:45 -0000	1.2
+++ sources	13 Oct 2006 18:57:47 -0000	1.3
@@ -1 +1 @@
-c36398c84bfb044c0c66ef3ffcf29400  sword-1.5.8.tar.gz
+2718a640384bf378fc8d229514f8abbd  sword-1.5.9-1.src.rpm



From fedora-extras-commits at redhat.com  Fri Oct 13 19:32:36 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 13 Oct 2006 12:32:36 -0700
Subject: rpms/tinyerp/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tinyerp-client.patch, 1.6, 1.7 tinyerp-server.patch, 1.7,
	1.8 tinyerp.spec, 1.21, 1.22
Message-ID: <200610131932.k9DJWdJR023494@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23463

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream version 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Sep 2006 15:00:44 -0000	1.8
+++ .cvsignore	13 Oct 2006 19:32:36 -0000	1.9
@@ -1,2 +1,2 @@
-tinyerp-client-3.4.1.tar.gz
-tinyerp-server-3.4.1.tar.gz
+tinyerp-client-3.4.2.tar.gz
+tinyerp-server-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 15:00:44 -0000	1.8
+++ sources	13 Oct 2006 19:32:36 -0000	1.9
@@ -1,2 +1,2 @@
-dc81fc8d1e73f16570fd2ab42445f2f7  tinyerp-client-3.4.1.tar.gz
-7d4233217a6c34efa42e0afaa5a10d34  tinyerp-server-3.4.1.tar.gz
+962bb88bc7019d6dc3e8863889524e0f  tinyerp-client-3.4.2.tar.gz
+f360588ac94887c6fdf13c448c35fdc1  tinyerp-server-3.4.2.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp-client.patch	27 Sep 2006 15:00:44 -0000	1.6
+++ tinyerp-client.patch	13 Oct 2006 19:32:36 -0000	1.7
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.4.1.orig/bin/tinyerp-client.py tinyerp-client-3.4.1/bin/tinyerp-client.py
---- tinyerp-client-3.4.1.orig/bin/tinyerp-client.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-client-3.4.1/bin/tinyerp-client.py	2006-09-13 15:58:36.000000000 +0200
+diff -Nru tinyerp-client-3.4.2.orig/bin/tinyerp-client.py tinyerp-client-3.4.2/bin/tinyerp-client.py
+--- tinyerp-client-3.4.2.orig/bin/tinyerp-client.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-client-3.4.2/bin/tinyerp-client.py	2006-10-13 14:18:37.000000000 +0200
 @@ -73,14 +73,13 @@
  import pango
  

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp-server.patch	27 Sep 2006 15:00:44 -0000	1.7
+++ tinyerp-server.patch	13 Oct 2006 19:32:36 -0000	1.8
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-server-3.4.1.orig/setup.py tinyerp-server-3.4.1/setup.py
---- tinyerp-server-3.4.1.orig/setup.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-server-3.4.1/setup.py	2006-09-26 22:20:45.000000000 +0200
+diff -Nru tinyerp-server-3.4.2.orig/setup.py tinyerp-server-3.4.2/setup.py
+--- tinyerp-server-3.4.2.orig/setup.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-server-3.4.2/setup.py	2006-10-13 15:39:00.000000000 +0200
 @@ -28,11 +28,21 @@
  
  included_addons = [


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tinyerp.spec	27 Sep 2006 15:00:44 -0000	1.21
+++ tinyerp.spec	13 Oct 2006 19:32:36 -0000	1.22
@@ -20,7 +20,7 @@
 
 
 Name:		tinyerp
-Version:	3.4.1
+Version:	3.4.2
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Dan Horak <dan[at]danny.cz> 3.4.2-1
+- update to upstream version 3.4.2
+
 * Wed Sep 27 2006 Dan Horak <dan[at]danny.cz> 3.4.1-1
 - removed workaround for font path problems on devel
 - update to upstream version 3.4.1



From fedora-extras-commits at redhat.com  Fri Oct 13 19:34:56 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Fri, 13 Oct 2006 12:34:56 -0700
Subject: rpms/gnubiff import.log,1.4,1.5
Message-ID: <200610131934.k9DJYwu9023601@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23570

Modified Files:
	import.log 
Log Message:
auto-import gnubiff-2.2.2-3 on branch devel from gnubiff-2.2.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	28 Aug 2006 17:31:05 -0000	1.4
+++ import.log	13 Oct 2006 19:34:56 -0000	1.5
@@ -1,3 +1,4 @@
 gnubiff-2_2_1-2_fc6:HEAD:gnubiff-2.2.1-2.fc6.src.rpm:1148444627
 gnubiff-2_2_2-1:HEAD:gnubiff-2.2.2-1.src.rpm:1155081764
 gnubiff-2_2_2-2_fc6:HEAD:gnubiff-2.2.2-2.fc6.src.rpm:1156786285
+gnubiff-2_2_2-3:HEAD:gnubiff-2.2.2-3.src.rpm:1160768093



From fedora-extras-commits at redhat.com  Fri Oct 13 19:34:57 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Fri, 13 Oct 2006 12:34:57 -0700
Subject: rpms/gnubiff/devel gnubiff.spec,1.3,1.4
Message-ID: <200610131934.k9DJYxLL023605@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23570/devel

Modified Files:
	gnubiff.spec 
Log Message:
auto-import gnubiff-2.2.2-3 on branch devel from gnubiff-2.2.2-3.src.rpm


Index: gnubiff.spec
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/devel/gnubiff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnubiff.spec	28 Aug 2006 17:31:05 -0000	1.3
+++ gnubiff.spec	13 Oct 2006 19:34:56 -0000	1.4
@@ -1,6 +1,6 @@
 Name:	gnubiff
 Version:	2.2.2        
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A mail notification program
 
 Group:	Applications/Internet
@@ -64,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 13 2006 Damien Durand <splinux at fedoraproject.org> - 2.2.2-3
+- Bump Release
+
 * Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 2.2.2-2
 - Bump Release
 



From fedora-extras-commits at redhat.com  Fri Oct 13 19:37:12 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 13 Oct 2006 12:37:12 -0700
Subject: rpms/tinyerp/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tinyerp-client.patch, 1.6, 1.7 tinyerp-server.patch, 1.7,
	1.8 tinyerp.spec, 1.20, 1.21
Message-ID: <200610131937.k9DJbE9M023726@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23695

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream version 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Sep 2006 15:19:35 -0000	1.8
+++ .cvsignore	13 Oct 2006 19:37:12 -0000	1.9
@@ -1,2 +1,2 @@
-tinyerp-client-3.4.1.tar.gz
-tinyerp-server-3.4.1.tar.gz
+tinyerp-client-3.4.2.tar.gz
+tinyerp-server-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 15:19:35 -0000	1.8
+++ sources	13 Oct 2006 19:37:12 -0000	1.9
@@ -1,2 +1,2 @@
-dc81fc8d1e73f16570fd2ab42445f2f7  tinyerp-client-3.4.1.tar.gz
-7d4233217a6c34efa42e0afaa5a10d34  tinyerp-server-3.4.1.tar.gz
+962bb88bc7019d6dc3e8863889524e0f  tinyerp-client-3.4.2.tar.gz
+f360588ac94887c6fdf13c448c35fdc1  tinyerp-server-3.4.2.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-client.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp-client.patch	27 Sep 2006 15:19:35 -0000	1.6
+++ tinyerp-client.patch	13 Oct 2006 19:37:12 -0000	1.7
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.4.1.orig/bin/tinyerp-client.py tinyerp-client-3.4.1/bin/tinyerp-client.py
---- tinyerp-client-3.4.1.orig/bin/tinyerp-client.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-client-3.4.1/bin/tinyerp-client.py	2006-09-13 15:58:36.000000000 +0200
+diff -Nru tinyerp-client-3.4.2.orig/bin/tinyerp-client.py tinyerp-client-3.4.2/bin/tinyerp-client.py
+--- tinyerp-client-3.4.2.orig/bin/tinyerp-client.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-client-3.4.2/bin/tinyerp-client.py	2006-10-13 14:18:37.000000000 +0200
 @@ -73,14 +73,13 @@
  import pango
  

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp-server.patch	27 Sep 2006 15:19:35 -0000	1.7
+++ tinyerp-server.patch	13 Oct 2006 19:37:12 -0000	1.8
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-server-3.4.1.orig/setup.py tinyerp-server-3.4.1/setup.py
---- tinyerp-server-3.4.1.orig/setup.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-server-3.4.1/setup.py	2006-09-26 22:20:45.000000000 +0200
+diff -Nru tinyerp-server-3.4.2.orig/setup.py tinyerp-server-3.4.2/setup.py
+--- tinyerp-server-3.4.2.orig/setup.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-server-3.4.2/setup.py	2006-10-13 15:39:00.000000000 +0200
 @@ -28,11 +28,21 @@
  
  included_addons = [


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tinyerp.spec	27 Sep 2006 15:19:35 -0000	1.20
+++ tinyerp.spec	13 Oct 2006 19:37:12 -0000	1.21
@@ -20,7 +20,7 @@
 
 
 Name:		tinyerp
-Version:	3.4.1
+Version:	3.4.2
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Dan Horak <dan[at]danny.cz> 3.4.2-1
+- update to upstream version 3.4.2
+
 * Wed Sep 27 2006 Dan Horak <dan[at]danny.cz> 3.4.1-1
 - removed workaround for font path problems on devel
 - update to upstream version 3.4.1



From fedora-extras-commits at redhat.com  Fri Oct 13 19:41:04 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 13 Oct 2006 12:41:04 -0700
Subject: rpms/tinyerp/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tinyerp-client.patch, 1.6, 1.7 tinyerp-server.patch, 1.8,
	1.9 tinyerp.spec, 1.18, 1.19
Message-ID: <200610131941.k9DJf6bx023832@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23801

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream version 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Sep 2006 15:41:01 -0000	1.8
+++ .cvsignore	13 Oct 2006 19:41:04 -0000	1.9
@@ -1,2 +1,2 @@
-tinyerp-client-3.4.1.tar.gz
-tinyerp-server-3.4.1.tar.gz
+tinyerp-client-3.4.2.tar.gz
+tinyerp-server-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 15:41:01 -0000	1.8
+++ sources	13 Oct 2006 19:41:04 -0000	1.9
@@ -1,2 +1,2 @@
-dc81fc8d1e73f16570fd2ab42445f2f7  tinyerp-client-3.4.1.tar.gz
-7d4233217a6c34efa42e0afaa5a10d34  tinyerp-server-3.4.1.tar.gz
+962bb88bc7019d6dc3e8863889524e0f  tinyerp-client-3.4.2.tar.gz
+f360588ac94887c6fdf13c448c35fdc1  tinyerp-server-3.4.2.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp-client.patch	27 Sep 2006 15:41:01 -0000	1.6
+++ tinyerp-client.patch	13 Oct 2006 19:41:04 -0000	1.7
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.4.1.orig/bin/tinyerp-client.py tinyerp-client-3.4.1/bin/tinyerp-client.py
---- tinyerp-client-3.4.1.orig/bin/tinyerp-client.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-client-3.4.1/bin/tinyerp-client.py	2006-09-13 15:58:36.000000000 +0200
+diff -Nru tinyerp-client-3.4.2.orig/bin/tinyerp-client.py tinyerp-client-3.4.2/bin/tinyerp-client.py
+--- tinyerp-client-3.4.2.orig/bin/tinyerp-client.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-client-3.4.2/bin/tinyerp-client.py	2006-10-13 14:18:37.000000000 +0200
 @@ -73,14 +73,13 @@
  import pango
  

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyerp-server.patch	27 Sep 2006 15:41:01 -0000	1.8
+++ tinyerp-server.patch	13 Oct 2006 19:41:04 -0000	1.9
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-server-3.4.1.orig/setup.py tinyerp-server-3.4.1/setup.py
---- tinyerp-server-3.4.1.orig/setup.py	2006-09-12 15:00:39.000000000 +0200
-+++ tinyerp-server-3.4.1/setup.py	2006-09-26 22:20:45.000000000 +0200
+diff -Nru tinyerp-server-3.4.2.orig/setup.py tinyerp-server-3.4.2/setup.py
+--- tinyerp-server-3.4.2.orig/setup.py	2006-10-06 11:47:27.000000000 +0200
++++ tinyerp-server-3.4.2/setup.py	2006-10-13 15:39:00.000000000 +0200
 @@ -28,11 +28,21 @@
  
  included_addons = [


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tinyerp.spec	27 Sep 2006 15:41:01 -0000	1.18
+++ tinyerp.spec	13 Oct 2006 19:41:04 -0000	1.19
@@ -20,7 +20,7 @@
 
 
 Name:		tinyerp
-Version:	3.4.1
+Version:	3.4.2
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Dan Horak <dan[at]danny.cz> 3.4.2-1
+- update to upstream version 3.4.2
+
 * Wed Sep 27 2006 Dan Horak <dan[at]danny.cz> 3.4.1-1
 - removed workaround for font path problems on devel
 - update to upstream version 3.4.1



From fedora-extras-commits at redhat.com  Fri Oct 13 19:47:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 13 Oct 2006 12:47:23 -0700
Subject: rpms/perl-Email-Address/FC-5 .cvsignore, 1.5,
	1.6 perl-Email-Address.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610131947.k9DJlPTs024006@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23969/FC-5

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.871.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Aug 2006 16:16:48 -0000	1.5
+++ .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
@@ -1 +1 @@
-Email-Address-1.870.tar.gz
+Email-Address-1.871.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/perl-Email-Address.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Email-Address.spec	12 Aug 2006 16:16:49 -0000	1.4
+++ perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.870
+Version:        1.871
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.871-1
+- Update to 1.871.
+
 * Sat Aug 12 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.870-1
 - Update to 1.870.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Aug 2006 16:16:49 -0000	1.5
+++ sources	13 Oct 2006 19:47:23 -0000	1.6
@@ -1 +1 @@
-eaa85cdfc4184f8a13c1fbdbea56f579  Email-Address-1.870.tar.gz
+1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 19:47:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 13 Oct 2006 12:47:24 -0700
Subject: rpms/perl-Email-Address/devel .cvsignore, 1.5,
	1.6 perl-Email-Address.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610131947.k9DJlQmT024013@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23969/devel

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.871.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Aug 2006 16:16:49 -0000	1.5
+++ .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
@@ -1 +1 @@
-Email-Address-1.870.tar.gz
+Email-Address-1.871.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Email-Address.spec	12 Aug 2006 16:16:49 -0000	1.4
+++ perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.870
+Version:        1.871
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.871-1
+- Update to 1.871.
+
 * Sat Aug 12 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.870-1
 - Update to 1.870.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Aug 2006 16:16:49 -0000	1.5
+++ sources	13 Oct 2006 19:47:23 -0000	1.6
@@ -1 +1 @@
-eaa85cdfc4184f8a13c1fbdbea56f579  Email-Address-1.870.tar.gz
+1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 19:52:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 13 Oct 2006 12:52:32 -0700
Subject: rpms/perl-Email-MIME-ContentType/FC-5 .cvsignore, 1.2,
	1.3 perl-Email-MIME-ContentType.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610131953.k9DJr4uW024171@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24133/FC-5

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.011.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Apr 2006 03:13:32 -0000	1.2
+++ .cvsignore	13 Oct 2006 19:52:32 -0000	1.3
@@ -1 +1 @@
-Email-MIME-ContentType-1.01.tar.gz
+Email-MIME-ContentType-1.011.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Email-MIME-ContentType.spec	29 Apr 2006 03:13:32 -0000	1.1
+++ perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:32 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.01
+Version:        1.011
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.011-1
+- Update to 1.011.
+
 * Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Apr 2006 03:13:32 -0000	1.2
+++ sources	13 Oct 2006 19:52:32 -0000	1.3
@@ -1 +1 @@
-1aa682d2841f5d568416772bbaede1c9  Email-MIME-ContentType-1.01.tar.gz
+b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 19:52:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 13 Oct 2006 12:52:33 -0700
Subject: rpms/perl-Email-MIME-ContentType/devel .cvsignore, 1.2,
	1.3 perl-Email-MIME-ContentType.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610131953.k9DJr5tv024176@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24133/devel

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.011.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Apr 2006 03:13:32 -0000	1.2
+++ .cvsignore	13 Oct 2006 19:52:33 -0000	1.3
@@ -1 +1 @@
-Email-MIME-ContentType-1.01.tar.gz
+Email-MIME-ContentType-1.011.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Email-MIME-ContentType.spec	29 Apr 2006 03:13:32 -0000	1.1
+++ perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:33 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.01
+Version:        1.011
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.011-1
+- Update to 1.011.
+
 * Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Apr 2006 03:13:32 -0000	1.2
+++ sources	13 Oct 2006 19:52:33 -0000	1.3
@@ -1 +1 @@
-1aa682d2841f5d568416772bbaede1c9  Email-MIME-ContentType-1.01.tar.gz
+b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 19:56:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:56:33 -0700
Subject: rpms/libFoundation - New directory
Message-ID: <200610131956.k9DJuZQn024334@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24308/libFoundation

Log Message:
Directory /cvs/extras/rpms/libFoundation added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 19:56:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:56:33 -0700
Subject: rpms/libFoundation/devel - New directory
Message-ID: <200610131956.k9DJuZgI024337@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24308/libFoundation/devel

Log Message:
Directory /cvs/extras/rpms/libFoundation/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 13 19:56:59 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:56:59 -0700
Subject: rpms/libFoundation Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610131957.k9DJv1lI024386@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24353

Added Files:
	Makefile import.log 
Log Message:
Setup of module libFoundation


--- NEW FILE Makefile ---
# Top level Makefile for module libFoundation
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 13 19:57:00 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:57:00 -0700
Subject: rpms/libFoundation/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610131957.k9DJv2Ax024389@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24353/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libFoundation


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 13 19:58:44 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:58:44 -0700
Subject: rpms/libFoundation import.log,1.1,1.2
Message-ID: <200610131958.k9DJwk7I024467@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24434

Modified Files:
	import.log 
Log Message:
auto-import libFoundation-1.1.3-10.at on branch devel from libFoundation-1.1.3-10.at.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libFoundation/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Oct 2006 19:56:59 -0000	1.1
+++ import.log	13 Oct 2006 19:58:44 -0000	1.2
@@ -0,0 +1 @@
+libFoundation-1_1_3-10_at:HEAD:libFoundation-1.1.3-10.at.src.rpm:1160769513



From fedora-extras-commits at redhat.com  Fri Oct 13 19:58:45 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 12:58:45 -0700
Subject: rpms/libFoundation/devel libFoundation.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610131958.k9DJwlCO024472@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/libFoundation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24434/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libFoundation.spec 
Log Message:
auto-import libFoundation-1.1.3-10.at on branch devel from libFoundation-1.1.3-10.at.src.rpm


--- NEW FILE libFoundation.spec ---
Summary: A free implementation of OpenStep's Foundation Kit
Name: libFoundation
Version: 1.1.3
Release: 10%{?dist}
License: libFoundation license
Group: Development/Libraries
URL: http://www.opengroupware.org/
Source0: http://download.opengroupware.org/nightly/sources/releases/%{name}-%{version}-r155.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gnustep-make, gcc-objc

%description
libFoundation is a free and almost complete implementation of
Foundation Kit as defined by the OpenStep specifications, plus more
classes that come with the newest releases of OPENSTEP 4.x and
Rhapsody.

%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gnustep-make, gcc-objc

%description devel
This package contains the development files for %{name}.

%prep
%setup -q -n libfoundation

%build
LIBRARY_COMBO=fd source %{_datadir}/gnustep/makefiles/GNUstep.sh
CFLAGS="%{optflags}"; export CFLAGS
./configure
make

%install
rm -rf %{buildroot}
LIBRARY_COMBO=fd source %{_datadir}/gnustep/makefiles/GNUstep.sh
mkdir -p %{buildroot}$GNUSTEP_MAKEFILES/Additional %{buildroot}%{_libdir}
make install \
     GNUSTEP_INSTALLATION_DIR=%{buildroot}$GNUSTEP_SYSTEM_ROOT \
     INSTALL_ROOT_DIR=%{buildroot} \
     FHS_INSTALL_ROOT=%{buildroot}%{_prefix} \
     FHS_LIB_DIR=%{buildroot}%{_libdir}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS COPYING NEWS README* TODO
%{_bindir}/Defaults
%{_libdir}/libFoundation.so.*
%{_datadir}/libFoundation

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_datadir}/gnustep/makefiles/Additional/libFoundation.make
%{_libdir}/libFoundation.so

%changelog
* Wed Sep 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.3-10
- With the FHS changes some %%_includedir entries appeared as duplicates.

* Wed Aug  2 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.3-8
- Build against FHS'd gnustep-make.

* Wed Jul 19 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.3-6
- Split off a real libFoundation subpackage.

* Fri Jul 14 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.3-5
- Update to 1.1.3.

* Tue Jul 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.1.2-4
- Remove -lobjc-lf2 patches.

* Sun Mar 12 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libFoundation/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Oct 2006 19:57:00 -0000	1.1
+++ .cvsignore	13 Oct 2006 19:58:45 -0000	1.2
@@ -0,0 +1 @@
+libFoundation-1.1.3-r155.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libFoundation/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Oct 2006 19:57:00 -0000	1.1
+++ sources	13 Oct 2006 19:58:45 -0000	1.2
@@ -0,0 +1 @@
+7df921ab5705af28a75e62a3a8744cb6  libFoundation-1.1.3-r155.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 13 20:20:05 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 13 Oct 2006 13:20:05 -0700
Subject: owners owners.list,1.1826,1.1827
Message-ID: <200610132020.k9DKK7ep027540@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27523

Modified Files:
	owners.list 
Log Message:
Add libFoundation.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1826
retrieving revision 1.1827
diff -u -r1.1826 -r1.1827
--- owners.list	13 Oct 2006 10:17:30 -0000	1.1826
+++ owners.list	13 Oct 2006 20:20:05 -0000	1.1827
@@ -853,6 +853,7 @@
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libeXosip2|A library that hides the complexity of using the SIP protocol|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|libFoundation|A free implementation of OpenStep's Foundation Kit|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
 Fedora Extras|libfwbuilder|Firewall Builder API|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libgadu|Gadu-gadu protocol support library|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgalago|Galago presence library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 13 20:34:10 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 13 Oct 2006 13:34:10 -0700
Subject: rpms/moodle/devel .cvsignore, 1.3, 1.4 moodle.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200610132034.k9DKYDNF027696@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27670

Modified Files:
	.cvsignore moodle.spec sources 
Log Message:
Updated to release 1.6.3.  Added new source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Aug 2006 01:11:04 -0000	1.3
+++ .cvsignore	13 Oct 2006 20:34:10 -0000	1.4
@@ -1 +1,2 @@
 moodle-1.5.4.tgz
+moodle-1.6.3.tgz


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- moodle.spec	7 Sep 2006 20:35:41 -0000	1.5
+++ moodle.spec	13 Oct 2006 20:34:10 -0000	1.6
@@ -8,8 +8,8 @@
 %define with_spellcheck 0
 
 Name:           moodle
-Version:        1.5.4
-Release:        2%{?dist}
+Version:        1.6.3
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -22,8 +22,8 @@
 Source4:        moodle-cron
 Source5:        moodle.init
 Source6:        moodle-README-rpm
-Patch0:         moodle-1.5.2-mimetex-linux.patch
-Patch1:         moodle-1.5.2-mimetex-fedora.patch
+#Patch0:         moodle-1.5.2-mimetex-linux.patch
+#Patch1:         moodle-1.5.2-mimetex-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -640,15 +640,15 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .mimetex-linux
-%patch1 -p1 -b .mimetex-fedora
+#%patch0 -p1 -b .mimetex-linux
+#%patch1 -p1 -b .mimetex-fedora
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.pl -exec chmod a+x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.cgi -exec chmod a+x {} \;
 sed -i 's/\r//' README.txt
-sed -i 's/\r//' lib/editor/plugins/SpellChecker/spell-check-logic.cgi
+sed -i 's/\r//' lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -658,6 +658,7 @@
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
 mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
 cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
+cp -ad install/lang/* $RPM_BUILD_ROOT%{moodlewebdir}/lang/
 rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
 install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
 install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
@@ -688,11 +689,12 @@
 %{moodlewebdir}/[a-ce-km-z]*
 %doc %{moodlewebdir}/doc
 %{moodlewebdir}/lib
-%exclude %{moodlewebdir}/lib/editor/plugins/SpellChecker
+%exclude %{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %{moodlewebdir}/login
 %dir %{moodlewebdir}/lang
 %{moodlewebdir}/lang/en*
-%doc %{moodlewebdir}/lang/README
+%{moodlewebdir}/lang/[^e]*_utf8
+%doc %{moodlewebdir}/lang/README.txt
 %attr(-,apache,apache) %{moodledatadir}
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
@@ -702,11 +704,16 @@
 %if %{with_spellcheck}
 %files editor-spellcheck
 %defattr(-,root,root,-)
-%{moodlewebdir}/lib/editor/plugins/SpellChecker
+%{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %endif
 
 %changelog
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com - 1.5.4-2
+* Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
+- Major changes, update to 1.6.3
+- SpellChecker moved
+- Language install method has been changed (added a cp)
+
+* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> - 1.5.4-2
 - Release bump
 
 * Thu Aug 24 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.5.4-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Aug 2006 01:11:04 -0000	1.3
+++ sources	13 Oct 2006 20:34:10 -0000	1.4
@@ -1 +1,2 @@
 86cddfda2b6d9a08b37cc3a16bda1090  moodle-1.5.4.tgz
+2f9f3fcf83ab0f18c409f3a48e07eae2  moodle-1.6.3.tgz



From fedora-extras-commits at redhat.com  Fri Oct 13 21:36:45 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 14:36:45 -0700
Subject: rpms/ktorrent/devel ktorrent-2.0.3-znow.patch, NONE,
	1.1 ktorrent.spec, 1.14, 1.15
Message-ID: <200610132136.k9DLals9030951@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30931

Modified Files:
	ktorrent.spec 
Added Files:
	ktorrent-2.0.3-znow.patch 
Log Message:
patch for ppc build

ktorrent-2.0.3-znow.patch:

--- NEW FILE ktorrent-2.0.3-znow.patch ---
--- configure.origin	2006-10-13 23:22:00.394480000 +0200
+++ configure	2006-10-13 23:25:33.143776000 +0200
@@ -31299,7 +31299,7 @@
 
 #MIN_CONFIG(3.3)
 CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS $USE_EXCEPTIONS $USE_RTTI"
-LDFLAGS="$LDFLAGS -Wl -z now"
+LDFLAGS="$LDFLAGS -Wl,-z,now"
 
 
 # Check whether --enable-largefile or --disable-largefile was given.


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ktorrent.spec	13 Oct 2006 17:27:40 -0000	1.14
+++ ktorrent.spec	13 Oct 2006 21:36:44 -0000	1.15
@@ -2,12 +2,13 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
 Source0:        http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz
+Patch0:         ktorrent-2.0.3-znow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .znow
 
 %build
 %configure	--disable-rpath
@@ -125,8 +127,9 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-1
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-2
 - Update to upstream version 2.0.3
+- added znow patch for ppc
 
 * Thu Sep 07 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.2-3
 - mass rebuild



From fedora-extras-commits at redhat.com  Fri Oct 13 21:45:33 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 14:45:33 -0700
Subject: rpms/rsibreak/devel .cvsignore, 1.2, 1.3 rsibreak.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610132145.k9DLjZWr031060@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31039

Modified Files:
	.cvsignore rsibreak.spec sources 
Log Message:
update to version 0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 16:56:16 -0000	1.2
+++ .cvsignore	13 Oct 2006 21:45:32 -0000	1.3
@@ -1 +1 @@
-Rsibreak-0.7.1.tar.bz2
+Rsibreak-0.8.0.tar.bz2


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/rsibreak.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rsibreak.spec	7 Sep 2006 18:12:57 -0000	1.3
+++ rsibreak.spec	13 Oct 2006 21:45:32 -0000	1.4
@@ -1,13 +1,13 @@
 %define desktopvendor fedora
 
 Name:           rsibreak
-Version:        0.7.1
-Release:        3%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://www.rsibreak.org
-Source0:        http://www.rsibreak.org/images/e/e2/Rsibreak-0.7.1.tar.bz2
+Source0:        http://www.rsibreak.org/images/e/e0/Rsibreak-0.8.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel libXScrnSaver-devel desktop-file-utils gettext
@@ -24,8 +24,7 @@
 
 %build
 %configure	--disable-rpath
-#it does not work with the usual %{?_smp_mflags} on my machine!
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,27 +56,18 @@
 %doc AUTHORS ChangeLog COPYING NEWS TODO
 %{_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
-%{_datadir}/icons/hicolor/128x128/apps/rsibreak.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak0.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak1.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak2.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak3.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak4.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreakx.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/dcop.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/duringbreaks.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak0.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak1.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak2.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak3.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak4.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreakx.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/timings.png
+%{_docdir}/HTML/*/rsibreak
 
 %changelog
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 0.8.0-1
+- update to version 0.8
+
 * Tue Jun 20 2006 Roland Wolters <wolters.liste at gmx.net> 0.7.1-3
 - mass rebuild of devel branch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 16:56:16 -0000	1.2
+++ sources	13 Oct 2006 21:45:32 -0000	1.3
@@ -1 +1 @@
-7846a2122805b6da3cc050d4664a52df  Rsibreak-0.7.1.tar.bz2
+62a62ff2f405461cfbf978484fb2d62c  Rsibreak-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 21:48:57 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 14:48:57 -0700
Subject: rpms/ktorrent/devel ktorrent-2.0.3-znow.patch, 1.1,
	1.2 ktorrent.spec, 1.15, 1.16
Message-ID: <200610132148.k9DLmxjY031137@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31115

Modified Files:
	ktorrent-2.0.3-znow.patch ktorrent.spec 
Log Message:
a fixed patch

ktorrent-2.0.3-znow.patch:

Index: ktorrent-2.0.3-znow.patch
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent-2.0.3-znow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktorrent-2.0.3-znow.patch	13 Oct 2006 21:36:44 -0000	1.1
+++ ktorrent-2.0.3-znow.patch	13 Oct 2006 21:48:57 -0000	1.2
@@ -1,5 +1,5 @@
---- configure.origin	2006-10-13 23:22:00.394480000 +0200
-+++ configure	2006-10-13 23:25:33.143776000 +0200
+--- ktorrent-2.0.3/configure.origin	2006-10-13 23:22:00.394480000 +0200
++++ ktorrent-2.0.3/configure	2006-10-13 23:25:33.143776000 +0200
 @@ -31299,7 +31299,7 @@
  
  #MIN_CONFIG(3.3)


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ktorrent.spec	13 Oct 2006 21:36:44 -0000	1.15
+++ ktorrent.spec	13 Oct 2006 21:48:57 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
@@ -127,7 +127,7 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-2
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-3
 - Update to upstream version 2.0.3
 - added znow patch for ppc
 



From fedora-extras-commits at redhat.com  Fri Oct 13 21:58:29 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 14:58:29 -0700
Subject: rpms/rsibreak/FC-5 .cvsignore, 1.2, 1.3 rsibreak.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610132158.k9DLwVcS031235@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31214

Modified Files:
	.cvsignore rsibreak.spec sources 
Log Message:
update to version 0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 16:56:16 -0000	1.2
+++ .cvsignore	13 Oct 2006 21:58:29 -0000	1.3
@@ -1 +1 @@
-Rsibreak-0.7.1.tar.bz2
+Rsibreak-0.8.0.tar.bz2


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/FC-5/rsibreak.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rsibreak.spec	7 Sep 2006 18:13:48 -0000	1.3
+++ rsibreak.spec	13 Oct 2006 21:58:29 -0000	1.4
@@ -1,13 +1,13 @@
 %define desktopvendor fedora
 
 Name:           rsibreak
-Version:        0.7.1
-Release:        3%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://www.rsibreak.org
-Source0:        http://www.rsibreak.org/images/e/e2/Rsibreak-0.7.1.tar.bz2
+Source0:        http://www.rsibreak.org/images/e/e0/Rsibreak-0.8.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel libXScrnSaver-devel desktop-file-utils gettext
@@ -24,8 +24,7 @@
 
 %build
 %configure	--disable-rpath
-#it does not work with the usual %{?_smp_mflags} on my machine!
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,27 +56,18 @@
 %doc AUTHORS ChangeLog COPYING NEWS TODO
 %{_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
-%{_datadir}/icons/hicolor/128x128/apps/rsibreak.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak0.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak1.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak2.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak3.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreak4.png
-%{_datadir}/apps/rsibreak/icons/hicolor/16x16/actions/rsibreakx.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/dcop.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/duringbreaks.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak0.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak1.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak2.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak3.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreak4.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/rsibreakx.png
-%{_datadir}/apps/rsibreak/icons/hicolor/32x32/actions/timings.png
+%{_docdir}/HTML/*/rsibreak
 
 %changelog
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 0.8.0-1
+- update to version 0.8
+
 * Tue Jun 20 2006 Roland Wolters <wolters.liste at gmx.net> 0.7.1-3
 - mass rebuild of devel branch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 16:56:16 -0000	1.2
+++ sources	13 Oct 2006 21:58:29 -0000	1.3
@@ -1 +1 @@
-7846a2122805b6da3cc050d4664a52df  Rsibreak-0.7.1.tar.bz2
+62a62ff2f405461cfbf978484fb2d62c  Rsibreak-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 13 21:59:49 2006
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Fri, 13 Oct 2006 14:59:49 -0700
Subject: CVSROOT avail,1.36,1.37
Message-ID: <200610132159.k9DLxnBc031297@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279

Modified Files:
	avail 
Log Message:
Adding web editing privileges for glezos



Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- avail	21 Sep 2006 12:14:34 -0000	1.36
+++ avail	13 Oct 2006 21:59:46 -0000	1.37
@@ -21,7 +21,7 @@
 # Fedora Web site
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade,bjensen | web
-avail | havill,hp,nman64,ivazquez,jkeating | web
+avail | havill,hp,nman64,ivazquez,jkeating,glezos | web
 avail | katzj | web/html/About/Projects/anaconda-installer
 avail | blizzard,krh | web/html/About/Projects/desktop
 avail | sopwith,dwalsh,kwade | web/html/About/Projects



From fedora-extras-commits at redhat.com  Fri Oct 13 22:06:27 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 15:06:27 -0700
Subject: rpms/ktorrent/FC-5 ktorrent.spec,1.9,1.10
Message-ID: <200610132206.k9DM6T6w001806@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1789

Modified Files:
	ktorrent.spec 
Log Message:
Patch for ppc architecture


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ktorrent.spec	13 Oct 2006 17:28:38 -0000	1.9
+++ ktorrent.spec	13 Oct 2006 22:06:27 -0000	1.10
@@ -2,12 +2,13 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ktorrent.pwsp.net/
 Source0:        http://ktorrent.org/downloads/2.0.3/ktorrent-2.0.3.tar.gz
+Patch0:         ktorrent-2.0.3-znow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel kdelibs-devel desktop-file-utils gettext gmp-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .znow
 
 %build
 %configure	--disable-rpath
@@ -125,8 +127,9 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-1
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-3
 - Update to upstream version 2.0.3
+- added znow patch for ppc
 
 * Thu Sep 07 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.2-3
 - mass rebuild



From fedora-extras-commits at redhat.com  Fri Oct 13 22:13:20 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Fri, 13 Oct 2006 15:13:20 -0700
Subject: rpms/ktorrent/FC-5 ktorrent-2.0.3-znow.patch, NONE,
	1.1 ktorrent.spec, 1.10, 1.11
Message-ID: <200610132213.k9DMDMiA002228@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2200

Modified Files:
	ktorrent.spec 
Added Files:
	ktorrent-2.0.3-znow.patch 
Log Message:
actually added the patch

ktorrent-2.0.3-znow.patch:

--- NEW FILE ktorrent-2.0.3-znow.patch ---
--- ktorrent-2.0.3/configure.origin	2006-10-13 23:22:00.394480000 +0200
+++ ktorrent-2.0.3/configure	2006-10-13 23:25:33.143776000 +0200
@@ -31299,7 +31299,7 @@
 
 #MIN_CONFIG(3.3)
 CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS $USE_EXCEPTIONS $USE_RTTI"
-LDFLAGS="$LDFLAGS -Wl -z now"
+LDFLAGS="$LDFLAGS -Wl,-z,now"
 
 
 # Check whether --enable-largefile or --disable-largefile was given.


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/FC-5/ktorrent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ktorrent.spec	13 Oct 2006 22:06:27 -0000	1.10
+++ ktorrent.spec	13 Oct 2006 22:13:20 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
@@ -127,7 +127,7 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-3
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-4
 - Update to upstream version 2.0.3
 - added znow patch for ppc
 



From fedora-extras-commits at redhat.com  Sat Oct 14 09:35:59 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 14 Oct 2006 02:35:59 -0700
Subject: rpms/mediawiki/devel .cvsignore, 1.6, 1.7 mediawiki.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200610140936.k9E9a1wJ009732@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9711

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
Update to 1.8.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Oct 2006 21:06:58 -0000	1.6
+++ .cvsignore	14 Oct 2006 09:35:59 -0000	1.7
@@ -1 +1 @@
-mediawiki-1.8.1.tar.gz
+mediawiki-1.8.2.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mediawiki.spec	11 Oct 2006 21:06:58 -0000	1.7
+++ mediawiki.spec	14 Oct 2006 09:35:59 -0000	1.8
@@ -1,8 +1,8 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.8.1
-Release:        3%{?dist}
+Version:        1.8.2
+Release:        4%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
 Group:          Applications/Internet
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.2-4
+- Update to 1.8.2.
+
 * Wed Oct 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.1-3
 - Update to 1.8.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Oct 2006 21:06:58 -0000	1.6
+++ sources	14 Oct 2006 09:35:59 -0000	1.7
@@ -1 +1 @@
-9693c36a139715c9984495cb6ebc5646  mediawiki-1.8.1.tar.gz
+79113e7ea8d7e7c5437e633259af4a11  mediawiki-1.8.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 11:14:34 2006
From: fedora-extras-commits at redhat.com (Roland Wolters (liquidat))
Date: Sat, 14 Oct 2006 04:14:34 -0700
Subject: rpms/ktorrent/devel ktorrent.spec,1.16,1.17
Message-ID: <200610141114.k9EBEafJ016303@cvs-int.fedora.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16286

Modified Files:
	ktorrent.spec 
Log Message:
update minor number for fc5 -> devel update


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ktorrent.spec	13 Oct 2006 21:48:57 -0000	1.16
+++ ktorrent.spec	14 Oct 2006 11:14:34 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           ktorrent
 Version:        2.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A BitTorrent program for KDE
 Group:          Applications/Internet
 License:        GPL
@@ -127,7 +127,7 @@
 %{_datadir}/servicetypes/ktorrentplugin.desktop
 
 %changelog
-* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-3
+* Fri Oct 13 2006 Roland Wolters <wolters.liste at gmx.net> 2.0.3-4
 - Update to upstream version 2.0.3
 - added znow patch for ppc
 



From fedora-extras-commits at redhat.com  Sat Oct 14 11:20:43 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sat, 14 Oct 2006 04:20:43 -0700
Subject: rpms/bcm43xx-fwcutter/devel .cvsignore, 1.3,
	1.4 bcm43xx-fwcutter.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610141120.k9EBKjK6016394@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16373

Modified Files:
	.cvsignore bcm43xx-fwcutter.spec sources 
Log Message:
update to 005


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2006 06:42:40 -0000	1.3
+++ .cvsignore	14 Oct 2006 11:20:43 -0000	1.4
@@ -1 +1 @@
-bcm43xx-fwcutter-004.tar.bz2
+bcm43xx-fwcutter-005.tar.bz2


Index: bcm43xx-fwcutter.spec
===================================================================
RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/bcm43xx-fwcutter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bcm43xx-fwcutter.spec	11 Sep 2006 06:31:06 -0000	1.3
+++ bcm43xx-fwcutter.spec	14 Oct 2006 11:20:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bcm43xx-fwcutter
-Version:        004
-Release:        2%{?dist}
+Version:        005
+Release:        1%{?dist}
 Summary:        Firmware extraction tool for Broadcom wireless driver
 
 Group:          System Environment/Base
@@ -47,6 +47,9 @@
 %doc README README.Fedora modprobe.bcm43xx
 
 %changelog
+* Sat Oct 14 2006 David Woodhouse <dwmw2 at infradead.org> 005-1
+- Update to 005
+
 * Mon Sep 11 2006 David Woodhouse <dwmw2 at infradead.org> 004-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2006 06:42:40 -0000	1.3
+++ sources	14 Oct 2006 11:20:43 -0000	1.4
@@ -1 +1 @@
-6a6ab01b56b1e191fa54d60a015fecd9  bcm43xx-fwcutter-004.tar.bz2
+af9d7ce9794b00f0ee73d3a6bfb321ac  bcm43xx-fwcutter-005.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 14 11:38:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:38:07 -0700
Subject: rpms/fbg - New directory
Message-ID: <200610141138.k9EBc9Q7016588@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16562/fbg

Log Message:
Directory /cvs/extras/rpms/fbg added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 11:38:08 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:38:08 -0700
Subject: rpms/fbg/devel - New directory
Message-ID: <200610141138.k9EBcANU016593@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16562/fbg/devel

Log Message:
Directory /cvs/extras/rpms/fbg/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 11:38:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:38:23 -0700
Subject: rpms/fbg Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610141138.k9EBcPnl016639@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611

Added Files:
	Makefile import.log 
Log Message:
Setup of module fbg


--- NEW FILE Makefile ---
# Top level Makefile for module fbg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 14 11:38:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:38:24 -0700
Subject: rpms/fbg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610141138.k9EBcQAN016642@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fbg


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 14 11:39:37 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:39:37 -0700
Subject: rpms/fbg import.log,1.1,1.2
Message-ID: <200610141140.k9EBe9Io016734@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16695

Modified Files:
	import.log 
Log Message:
auto-import fbg-0.9-2.fc6 on branch devel from fbg-0.9-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fbg/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2006 11:38:23 -0000	1.1
+++ import.log	14 Oct 2006 11:39:37 -0000	1.2
@@ -0,0 +1 @@
+fbg-0_9-2_fc6:HEAD:fbg-0.9-2.fc6.src.rpm:1160826575



From fedora-extras-commits at redhat.com  Sat Oct 14 11:39:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:39:38 -0700
Subject: rpms/fbg/devel fbg-fixes.patch, NONE, 1.1 fbg.desktop, NONE,
	1.1 fbg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610141140.k9EBeA0n016740@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16695/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fbg-fixes.patch fbg.desktop fbg.spec 
Log Message:
auto-import fbg-0.9-2.fc6 on branch devel from fbg-0.9-2.fc6.src.rpm

fbg-fixes.patch:

--- NEW FILE fbg-fixes.patch ---
diff -ur fbg-0.9/configure fbg-0.9.new/configure
--- fbg-0.9/configure	2002-12-27 05:42:50.000000000 +0100
+++ fbg-0.9.new/configure	2006-10-11 21:51:32.000000000 +0200
@@ -6761,13 +6761,13 @@
 test "$prefix" = "NONE" && prefix=/usr/local
 test "$exec_prefix" = "NONE" && exec_prefix=$prefix
 
-eval FBGDATADIR="$prefix/games/$PACKAGE"
+eval FBGDATADIR="$prefix/share/$PACKAGE"
 cat >>confdefs.h <<_ACEOF
 #define FBGDATADIR "$FBGDATADIR"
 _ACEOF
 
 
-datadir="\$(prefix)/games"
+datadir="\$(prefix)/share"
 
 
           ac_config_files="$ac_config_files Makefile"
diff -ur fbg-0.9/configure.in fbg-0.9.new/configure.in
--- fbg-0.9/configure.in	2002-12-27 05:42:44.000000000 +0100
+++ fbg-0.9.new/configure.in	2006-10-11 21:51:32.000000000 +0200
@@ -125,11 +125,11 @@
 test "$prefix" = "NONE" && prefix=/usr/local
 test "$exec_prefix" = "NONE" && exec_prefix=$prefix
 
-eval FBGDATADIR="$prefix/games/$PACKAGE"
+eval FBGDATADIR="$prefix/share/$PACKAGE"
 AC_DEFINE_UNQUOTED(FBGDATADIR, "$FBGDATADIR")
 
-dnl Put data in $(prefix)/games/
-AC_SUBST(datadir, "\$(prefix)/games")
+dnl Put data in $(prefix)/share/
+AC_SUBST(datadir, "\$(prefix)/share")
 
 dnl Output Makefiles
 AC_OUTPUT(Makefile)
diff -ur fbg-0.9/src/fbgGame.cc fbg-0.9.new/src/fbgGame.cc
--- fbg-0.9/src/fbgGame.cc	2002-12-23 23:50:38.000000000 +0100
+++ fbg-0.9.new/src/fbgGame.cc	2006-10-13 15:33:21.000000000 +0200
@@ -217,8 +217,8 @@
 	else {
 		lastLine = SDL_GetTicks();
 		setPaused(true);
-		SDL_CreateThread(&fbgGame::removeLineGain, NULL);
-		if (light) SDL_CreateThread(&fbgGame::lightLineGainRedraw, NULL);
+		removeLineGainID = SDL_CreateThread(&fbgGame::removeLineGain, NULL);
+		if (light) lightLineGainRedrawID = SDL_CreateThread(&fbgGame::lightLineGainRedraw, NULL);
 	}
 
 	// Check for Game Over
@@ -381,6 +381,8 @@
 						setWantsToMove(false);
 					}
 				break;
+				default:
+				break;
 			}
 		break;
 		case SDL_KEYDOWN:
@@ -431,6 +433,8 @@
 						fbgGame::issue(EVT_REDRAW);
 					}
 				break;
+				default:
+				break;
 			}
 		break;
 		case SDL_QUIT:
@@ -438,6 +442,64 @@
 		break;
 		}
 	break;
+	case GAMEOVER:
+		switch (event.type) {
+		case SDL_USEREVENT:
+			switch (event.user.code) {
+			case EVT_REDRAW:
+				if (light) renderer.draw();	// Draw Scene (only necessary with the light renderer)
+			break;
+			}
+		break;
+		case SDL_KEYUP:
+			switch (event.key.keysym.sym) {
+				case SDLK_ESCAPE:
+					setState(QUIT);
+				break;
+				case SDLK_SPACE:
+				case SDLK_RETURN:
+					// restart the game on a key press
+					if (removeLineGainID) {
+						SDL_WaitThread(removeLineGainID, NULL);
+						removeLineGainID = NULL;
+					}
+					if (lightLineGainRedrawID) {
+						SDL_WaitThread(lightLineGainRedrawID, NULL);
+						lightLineGainRedrawID = NULL;
+					}
+
+					nextBlockIndex = rand()%blockSet.size();
+					cycleBlocks();
+
+					downHeld = false;leftHeld = false;rightHeld = false;
+					wantsToMove = false;
+
+					downStart = -1;lines = 0;level = 1; /*startLevel*/;score = 0;
+					curBlockAdjust = 40.0f;
+					setState(GAMEPLAY);
+
+					if (btype >= 0) lines = 25;
+					for (int row=0; row < 18; row++) {
+						for (int col=0; col < 10; col++)  {
+							if (btype >= 0 && row >= 18-btype*2) matrix[row][col] = rand()%2 ? 0 : rand()%(blockSet.size());
+							else matrix[row][col] = 0;
+						}
+					}
+					setLastDrop(SDL_GetTicks());
+					renderer.draw();
+				break;
+				default:
+				break;
+			}
+		break;
+		case SDL_VIDEOEXPOSE:
+			renderer.draw();
+		break;
+		case SDL_QUIT:
+			setState(QUIT);
+		break;
+		}
+	break;
 	default:
 		switch (event.type) {
 		case SDL_USEREVENT:
@@ -452,6 +514,8 @@
 			case SDLK_ESCAPE:
 				setState(QUIT);
 			break;
+			default:
+			break;
 			}
 		break;
 		case SDL_VIDEOEXPOSE:
@@ -489,6 +553,7 @@
 			while (SDL_PollEvent(&event)) {
 				processEvent(event);
 			}
+			SDL_Delay(1);
 		}
 	}
 }
diff -ur fbg-0.9/src/fbgMain.cc fbg-0.9.new/src/fbgMain.cc
--- fbg-0.9/src/fbgMain.cc	2002-12-23 23:50:38.000000000 +0100
+++ fbg-0.9.new/src/fbgMain.cc	2006-10-13 15:40:50.000000000 +0200
@@ -139,10 +139,11 @@
 	bool quit=false;
 	// Wait for a key press to start the game
 	bool keyPressed=false;
-	game.setLastDrop(SDL_GetTicks());
-	game.setState(BEGINWAIT);
+	// We want to begin straight away
+	//game.setState(BEGINWAIT);
 	game.getRenderer()->draw();
 	game.getRenderer()->draw();	// Draw twice for double buffering
+	game.setLastDrop(SDL_GetTicks());
 	
 	game.gameplayLoop();
 }
diff -ur fbg-0.9/src/fbgOpenGLRenderer.cc fbg-0.9.new/src/fbgOpenGLRenderer.cc
--- fbg-0.9/src/fbgOpenGLRenderer.cc	2002-12-23 23:50:38.000000000 +0100
+++ fbg-0.9.new/src/fbgOpenGLRenderer.cc	2006-10-13 12:20:45.000000000 +0200
@@ -645,18 +645,18 @@
 	glDisable(GL_LIGHTING);
 	glBindTexture(GL_TEXTURE_2D, gameover[0].getID());
 		glBegin(GL_TRIANGLE_STRIP);
-			glTexCoord2f(0.0f, 1.0f); glVertex3f(0.0f, -256.0f, 0.0f);
-			glTexCoord2f(0.0f, 0.0f); glVertex3f(0.0f, -512.0f, 0.0f);
-			glTexCoord2f(1.0f, 1.0f); glVertex3f(256.0f, -256.0f, 0.0f);
-			glTexCoord2f(1.0f, 0.0f); glVertex3f(256.0f, -512.0f, 0.0f);
-		glEnd();
-	glBindTexture(GL_TEXTURE_2D, gameover[1].getID());
-		glBegin(GL_TRIANGLE_STRIP);
 			glTexCoord2f(0.0f, 1.0f); glVertex3f(256.0f, -256.0f, 0.0f);
 			glTexCoord2f(0.0f, 0.0f); glVertex3f(256.0f, -512.0f, 0.0f);
 			glTexCoord2f(1.0f, 1.0f); glVertex3f(512.0f, -256.0f, 0.0f);
 			glTexCoord2f(1.0f, 0.0f); glVertex3f(512.0f, -512.0f, 0.0f);
 		glEnd();
+	glBindTexture(GL_TEXTURE_2D, gameover[1].getID());
+		glBegin(GL_TRIANGLE_STRIP);
+			glTexCoord2f(0.0f, 1.0f); glVertex3f(512.0f, -256.0f, 0.0f);
+			glTexCoord2f(0.0f, 0.0f); glVertex3f(512.0f, -512.0f, 0.0f);
+			glTexCoord2f(1.0f, 1.0f); glVertex3f(768.0f, -256.0f, 0.0f);
+			glTexCoord2f(1.0f, 0.0f); glVertex3f(768.0f, -512.0f, 0.0f);
+		glEnd();
 }
 void fbgOpenGLRenderer::drawGameplay() {
 	// Draw Matrix
diff -ur fbg-0.9/startfbg/startfbg.cc fbg-0.9.new/startfbg/startfbg.cc
--- fbg-0.9/startfbg/startfbg.cc	2002-12-23 23:50:38.000000000 +0100
+++ fbg-0.9.new/startfbg/startfbg.cc	2006-10-13 15:32:49.000000000 +0200
@@ -36,16 +36,23 @@
 
 IMPLEMENT_APP(fbglaunch)
 
-fbglaunchFrame::fbglaunchFrame(const char* argv0, const fbglaunch* newParent, const wxString& title, int w, int h) : wxFrame(NULL, -1, title, wxDefaultPosition, wxSize(w,h), wxSYSTEM_MENU | wxMINIMIZE_BOX | wxCAPTION) {
+static char *strconcat(const char *str1, const char *str2)
+{
+	static char buf[512];
+	snprintf(buf, sizeof(buf), "%s%s", str1, str2);
+	return buf;
+}
+
+fbglaunchFrame::fbglaunchFrame(const char* argv0, const fbglaunch* newParent, const wxString& title, int w, int h) : wxFrame(NULL, -1, title, wxDefaultPosition, wxSize(w,h), wxSYSTEM_MENU | wxCLOSE_BOX | wxMINIMIZE_BOX | wxCAPTION) {
 	// Set up PhysicsFS
 	PHYSFS_init(argv0);
 #ifdef WIN32
 	PHYSFS_addToSearchPath((wxString(PHYSFS_getBaseDir())+"data\\").c_str(), 1);
 	PHYSFS_addToSearchPath((wxString(PHYSFS_getUserDir())+"fbg\\data\\").c_str(), 1);
 #else
-	PHYSFS_addToSearchPath((wxString(PHYSFS_getUserDir())+".fbg/data/").c_str(), 1);
+	PHYSFS_addToSearchPath(strconcat(PHYSFS_getUserDir(), ".fbg/data/"), 1);
 	PHYSFS_addToSearchPath(FBGDATADIR "/data/", 1);
-	PHYSFS_addToSearchPath((wxString(PHYSFS_getBaseDir())+"data/").c_str(), 1);
+	PHYSFS_addToSearchPath(strconcat(PHYSFS_getBaseDir(), "data/"), 1);
 	PHYSFS_addToSearchPath("/usr/local/games/fbg/data/", 1);
 	PHYSFS_addToSearchPath("/usr/games/fbg/data/", 1);
 #endif
@@ -56,7 +63,7 @@
 		int end;
 		for (end=0; pk3list[i][end] != '\0'; end++);
 		if (pk3list[i][end-1] == '3' && pk3list[i][end-2] == 'k' && pk3list[i][end-3] == 'p' && pk3list[i][end-4] == '.') {
-			PHYSFS_addToSearchPath((wxString(PHYSFS_getRealDir(pk3list[i]))+pk3list[i]).c_str(), 1);
+			PHYSFS_addToSearchPath(strconcat(PHYSFS_getRealDir(pk3list[i]), pk3list[i]), 1);
 		}
 	}
 	PHYSFS_freeList(pk3list);
@@ -67,46 +74,46 @@
 	wxPanel* pan = new wxPanel(this, -1);
 	wxBoxSizer* top = new wxBoxSizer(wxVERTICAL);
 
-	wxStaticBoxSizer* graphBox = new wxStaticBoxSizer(new wxStaticBox(pan, -1, "Graphics Options"), wxVERTICAL);
+	wxStaticBoxSizer* graphBox = new wxStaticBoxSizer(new wxStaticBox(pan, -1, wxT("Graphics Options")), wxVERTICAL);
 		wxBoxSizer* themeBox = new wxBoxSizer(wxHORIZONTAL);
-			themeBox->Add(new wxStaticText(pan, ID_RES, "Theme:"), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
+			themeBox->Add(new wxStaticText(pan, ID_RES, wxT("Theme:")), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
 				int themeCount = 0;
 				int defaultThemeIndex = 0;
 				char** list = PHYSFS_enumerateFiles("themes");
 				for (int i=0; list[i] != NULL; i++) {
-					if (PHYSFS_isDirectory(wxString("themes/")+list[i])) themeCount++;
-					if (wxString(list[i]) == wxT("default")) defaultThemeIndex = themeCount-1;
+					if (PHYSFS_isDirectory(strconcat("themes/", list[i]))) themeCount++;
+					if (wxString(list[i], wxConvUTF8) == wxT("default")) defaultThemeIndex = themeCount-1;
 				}
-				wxString* themeChoices;
+				wxString* themeChoices = NULL;
 				if (themeCount > 0) {
 					themeChoices = new wxString[themeCount];
 					int currentTheme = 0;
 					for (int i=0; list[i] != NULL; i++) {
-						if (PHYSFS_isDirectory(wxString("themes/")+list[i])) themeChoices[currentTheme++] = wxString(list[i]);
+						if (PHYSFS_isDirectory(strconcat("themes/", list[i]))) themeChoices[currentTheme++] = wxString(list[i], wxConvUTF8);
 					}
 				}
 				PHYSFS_freeList(list);
 			themeMenu = new wxChoice(pan, ID_THEME, wxDefaultPosition, wxDefaultSize, themeCount, themeChoices);
-			delete themeChoices;
+			delete[] themeChoices;
 			themeMenu->SetSelection(defaultThemeIndex);
 			themeBox->Add(themeMenu, 0, wxALIGN_RIGHT);
 #ifdef ENABLE_SOUND
 		wxBoxSizer* musicBox = new wxBoxSizer(wxHORIZONTAL);
-			musicCheck = new wxCheckBox(pan, ID_MUSIC_CHECK, "Music");
+			musicCheck = new wxCheckBox(pan, ID_MUSIC_CHECK, wxT("Music"));
 			musicBox->Add(musicCheck, 1, wxALIGN_LEFT);
-			musicBox->Add(new wxStaticText(pan, -1, "File: ", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 1, wxALIGN_CENTER_VERTICAL);
+			musicBox->Add(new wxStaticText(pan, -1, wxT("File: "), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 1, wxALIGN_CENTER_VERTICAL);
 			int musicCount = 0;
 			int defaultMusicIndex = 0;
 			char** mList = PHYSFS_enumerateFiles("music");
 			for (int i=0; mList[i] != NULL; i++) {
 				musicCount++;
-				if (wxString(mList[i]) == wxT("typea.it")) defaultMusicIndex = musicCount-1;
+				if (wxString(mList[i], wxConvUTF8) == wxT("typea.it")) defaultMusicIndex = musicCount-1;
 			}
 			wxString* musicChoices;
 			if (musicCount > 0) {
 				musicChoices = new wxString[musicCount];
 				int currentMusic = 0;
-				for (int i=0; mList[i] != NULL; i++) musicChoices[currentMusic] = wxString(mList[i]);
+				for (int i=0; mList[i] != NULL; i++) musicChoices[currentMusic] = wxString(mList[i], wxConvUTF8);
 			}
 			PHYSFS_freeList(mList);
 			musicMenu = new wxChoice(pan, ID_MUSIC, wxDefaultPosition, wxDefaultSize, musicCount, musicChoices);
@@ -115,19 +122,19 @@
 			musicBox->Add(musicMenu, 0, wxALIGN_RIGHT);
 #endif
 		wxBoxSizer* resBox = new wxBoxSizer(wxHORIZONTAL);
-			resBox->Add(new wxStaticText(pan, ID_RES, "Resolution:"), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
-			wxString resChoices[4] = {"320x240", "640x480", "800x600", "1024x768"};
+			resBox->Add(new wxStaticText(pan, ID_RES, wxT("Resolution:")), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
+			wxString resChoices[4] = { wxT("320x240"), wxT("640x480"), wxT("800x600"), wxT("1024x768")};
 			resMenu = new wxChoice(pan, ID_RES, wxDefaultPosition, wxDefaultSize, 4, resChoices);
 			resMenu->SetSelection(1);
 			resBox->Add(resMenu, 0, wxALIGN_RIGHT);
 		wxBoxSizer* bppBox = new wxBoxSizer(wxHORIZONTAL);
-			bppBox->Add(new wxStaticText(pan, ID_BPP, "Color Depth:"), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
-			wxString bppChoices[3] = {"16", "24", "32"};
+			bppBox->Add(new wxStaticText(pan, ID_BPP, wxT("Color Depth:")), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
+			wxString bppChoices[3] = {wxT("16"), wxT("24"), wxT("32")};
 			bppMenu = new wxChoice(pan, ID_BPP, wxDefaultPosition, wxDefaultSize, 3, bppChoices);
 			bppMenu->SetSelection(2);
 			bppBox->Add(bppMenu, 0, wxALIGN_RIGHT);
 		wxBoxSizer* fsBox = new wxBoxSizer(wxHORIZONTAL);
-			fsCheck = new wxCheckBox(pan, ID_FS, "Run Fullscreen");
+			fsCheck = new wxCheckBox(pan, ID_FS, wxT("Run Fullscreen"));
 			fsBox->Add(fsCheck, 0, wxALIGN_LEFT);
 #ifdef WIN32
 			fsCheck->SetValue(true);
@@ -135,7 +142,7 @@
 			fsCheck->SetValue(false);
 #endif
 		wxBoxSizer* lightBox = new wxBoxSizer(wxHORIZONTAL);
-			lightCheck = new wxCheckBox(pan, ID_LIGHT, "\"Light\" Mode (uses less CPU)");
+			lightCheck = new wxCheckBox(pan, ID_LIGHT, wxT("\"Light\" Mode (uses less CPU)"));
 			lightBox->Add(lightCheck, 0, wxALIGN_LEFT);
 		graphBox->Add(themeBox, 0, wxEXPAND);
 #ifdef ENABLE_SOUND
@@ -145,19 +152,19 @@
 		graphBox->Add(bppBox, 0, wxEXPAND);
 		graphBox->Add(fsBox, 0, wxALIGN_LEFT);
 		graphBox->Add(lightBox, 0, wxALIGN_LEFT);
-	wxStaticBoxSizer* gameBox = new wxStaticBoxSizer(new wxStaticBox(pan, -1, "Gameplay Options"), wxVERTICAL);
+	wxStaticBoxSizer* gameBox = new wxStaticBoxSizer(new wxStaticBox(pan, -1, wxT("Gameplay Options")), wxVERTICAL);
 		wxBoxSizer* levelBox = new wxBoxSizer(wxHORIZONTAL);
-			levelBox->Add(new wxStaticText(pan, -1, "Starting Level:"), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
-			wxString levelChoices[10] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
+			levelBox->Add(new wxStaticText(pan, -1, wxT("Starting Level:")), 1, wxEXPAND|wxALIGN_CENTER_VERTICAL);
+			wxString levelChoices[10] = {wxT("0"), wxT("1"), wxT("2"), wxT("3"), wxT("4"), wxT("5"), wxT("6"), wxT("7"), wxT("8"), wxT("9")};
 			levelMenu = new wxChoice(pan, ID_LEVEL, wxDefaultPosition, wxDefaultSize, 10, levelChoices);
 			levelMenu->SetSelection(0);
 			levelBox->Add(levelMenu, 0, wxALIGN_RIGHT);
 		gameBox->Add(levelBox, 0, wxEXPAND);
 		wxBoxSizer* btypeBox = new wxBoxSizer(wxHORIZONTAL);
-			btypeCheck = new wxCheckBox(pan, ID_BTYPE_CHECK, "B-Type");
+			btypeCheck = new wxCheckBox(pan, ID_BTYPE_CHECK, wxT("B-Type"));
 			btypeBox->Add(btypeCheck, 1, wxALIGN_LEFT);
-			btypeBox->Add(new wxStaticText(pan, -1, "Height: ", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 1, wxALIGN_CENTER_VERTICAL);
-			wxString btypeChoices[9] = {"0", "1", "2", "3", "4", "5"};
+			btypeBox->Add(new wxStaticText(pan, -1, wxT("Height: "), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT), 1, wxALIGN_CENTER_VERTICAL);
+			wxString btypeChoices[9] = {wxT("0"), wxT("1"), wxT("2"), wxT("3"), wxT("4"), wxT("5")};
 			btypeMenu = new wxChoice(pan, ID_BTYPE, wxDefaultPosition, wxDefaultSize, 6, btypeChoices);
 			btypeMenu->Enable(false);
 			btypeMenu->SetSelection(0);
@@ -171,7 +178,7 @@
 #endif
 	top->Add(graphBox, 0, wxEXPAND|wxALL, 2);
 	top->Add(gameBox, 0, wxEXPAND|wxALL, 2);
-		playButton = new wxButton(pan, ID_PLAY, "Play Falling Block Game");
+		playButton = new wxButton(pan, ID_PLAY, wxT("Play Falling Block Game"));
 		pan->SetDefaultItem(playButton);
 	top->Add(playButton, 0, wxEXPAND|wxALL, 1);
 	pan->SetAutoLayout(true);
@@ -195,16 +202,16 @@
 END_EVENT_TABLE()
 
 bool fbglaunch::OnInit() {
-	frame = new fbglaunchFrame(argv[0], this, "Falling Block Game"/* " v" VERSION*/, 400, 400);
+	frame = new fbglaunchFrame((const char *)argv[0], this, wxT("Falling Block Game")/* " v" VERSION*/, 400, 400);
 	frame->Show(true);
 	SetTopWindow(frame);
 	return true;
 }
 
 void fbglaunchFrame::clickPlay(wxCommandEvent& evt) {
-	parent->launchFBG(wxString(PHYSFS_getBaseDir())+"fbg" FBG_EXTENSION, fsCheck->GetValue(), lightCheck->GetValue(), themeMenu->GetStringSelection(),
+	parent->launchFBG(wxT("fbg" FBG_EXTENSION), fsCheck->GetValue(), lightCheck->GetValue(), themeMenu->GetStringSelection(),
 #ifdef ENABLE_SOUND
-		(musicCheck->GetValue() ? musicMenu->GetStringSelection() : wxString("")),
+		(musicCheck->GetValue() ? musicMenu->GetStringSelection() : wxString(wxT(""))),
 #endif
 		bppMenu->GetStringSelection(), resMenu->GetStringSelection(), levelMenu->GetStringSelection(), (btypeMenu->IsEnabled() ? btypeMenu->GetStringSelection() : wxString(wxT("-1"))));
 }
@@ -223,19 +230,27 @@
 const wxString& music,
 #endif
 const wxString& bpp, const wxString& res, const wxString& level, const wxString& btype) const {
-	wxString cmd = "\""+fbgBin+"\"";
-	cmd += (fs ? " -f" : " -w");
-	if (light) cmd += " --light";
-	cmd += " -t " + theme;
-#ifdef ENABLE_SOUND
-	if (music != "") cmd += " -m " + music;
-	else cmd += " --no-music ";
-#endif
-	cmd += " -d " + bpp;
-	cmd += " -r " + res;
-	cmd += " -l " + level;
-	if (btype != "-1") cmd += " -b " + btype;
-	system(cmd);
+	const char *argv[16];
+	int argc = 0;
+	argv[argc++] = strdup(fbgBin.mb_str(wxConvUTF8));
+	argv[argc++] = fs ? "-f" : "-w";
+	if (light) argv[argc++] = "--light";
+	argv[argc++] = "-t"; argv[argc++] = strdup(theme.mb_str(wxConvUTF8));
+#ifdef ENABLE_SOUND
+	if (music != wxT("")) {
+		argv[argc++] = "-m"; argv[argc++] = strdup(music.mb_str(wxConvUTF8));
+	} else argv[argc++] = "--no-music";
+#endif
+	argv[argc++] = "-d"; argv[argc++] = strdup(bpp.mb_str(wxConvUTF8));
+	argv[argc++] = "-r"; argv[argc++] = strdup(res.mb_str(wxConvUTF8));
+	argv[argc++] = "-l"; argv[argc++] = strdup(level.mb_str(wxConvUTF8));
+	if (btype != wxT("-1")) {
+		argv[argc++] = "-b";
+		argv[argc++] = strdup(btype.mb_str(wxConvUTF8));
+	}
+	argv[argc++] = NULL; 
+	  
+	execvp(argv[0], (char * const*)argv);
 }
 
 int fbglaunch::OnExit() {


--- NEW FILE fbg.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Falling Block Game
Comment=Move falling blocks to make them form a complete row
Exec=fbglaunch
Icon=fbg.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;BlocksGame;


--- NEW FILE fbg.spec ---
Name:           fbg
Version:        0.9
Release:        2%{?dist}
Summary:        Falling Block Game
Group:          Amusements/Games
License:        GPL
URL:            http://fbg.sourceforge.net/
Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
Patch0:         fbg-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel physfs-devel mikmod-devel wxGTK-devel
BuildRequires:  desktop-file-utils ImageMagick
Requires:       hicolor-icon-theme

%description
Move and rotate variously shaped falling blocks to make them form a complete
row. Once a complete row has formed it will disappear. If you make incomplete
rows the screen will fill up and when it reaches the top the game is over.


%prep
%setup -q
%patch0 -p1 -z .fix
# sigh stop autoxxx from rerunning because of our patches above.
touch aclocal.m4
touch configure
touch `find -name Makefile.in`


%build
%configure
make %{?_smp_mflags}
convert startfbg/icon.xpm %{name}.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# rm make install installed docs as we install them with %doc
rm $RPM_BUILD_ROOT/usr/doc/fbg/COPYING $RPM_BUILD_ROOT/usr/doc/fbg/README

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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 ChangeLog COPYING README TODO
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_mandir}/man6/%{name}*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-2
- Correct license from LGPL to GPL

* Fri Oct 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fbg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2006 11:38:24 -0000	1.1
+++ .cvsignore	14 Oct 2006 11:39:38 -0000	1.2
@@ -0,0 +1 @@
+fbg-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fbg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Oct 2006 11:38:24 -0000	1.1
+++ sources	14 Oct 2006 11:39:38 -0000	1.2
@@ -0,0 +1 @@
+82db64d84b6172f5676fcff69d533881  fbg-0.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 11:52:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:52:09 -0700
Subject: comps comps-fe5.xml.in,1.167,1.168 comps-fe6.xml.in,1.186,1.187
Message-ID: <200610141152.k9EBqBRQ016874@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16855/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add fbg


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- comps-fe5.xml.in	10 Oct 2006 21:08:09 -0000	1.167
+++ comps-fe5.xml.in	14 Oct 2006 11:52:09 -0000	1.168
@@ -291,6 +291,7 @@
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
       <packagereq type="optional">enigma</packagereq>
+      <packagereq type="optional">fbg</packagereq>
       <packagereq type="optional">fillets-ng</packagereq>
       <packagereq type="optional">foobillard</packagereq>
       <packagereq type="optional">fortune-mod</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- comps-fe6.xml.in	12 Oct 2006 16:13:56 -0000	1.186
+++ comps-fe6.xml.in	14 Oct 2006 11:52:09 -0000	1.187
@@ -352,6 +352,7 @@
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
       <packagereq type="optional">enigma</packagereq>
+      <packagereq type="optional">fbg</packagereq>
       <packagereq type="optional">fillets-ng</packagereq>
       <packagereq type="optional">foobillard</packagereq>
       <packagereq type="optional">fortune-mod</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct 14 11:52:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 04:52:43 -0700
Subject: owners owners.list,1.1827,1.1828
Message-ID: <200610141152.k9EBqj6x016909@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16892

Modified Files:
	owners.list 
Log Message:
added fbg


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1827
retrieving revision 1.1828
diff -u -r1.1827 -r1.1828
--- owners.list	13 Oct 2006 20:20:05 -0000	1.1827
+++ owners.list	14 Oct 2006 11:52:43 -0000	1.1828
@@ -371,6 +371,7 @@
 Fedora Extras|farsight|A audio/video conferencing framework|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|fatsort|Fatsort sorts the FAT of FAT16 and FAT32 filesystems|opensource at till.name|extras-qa at fedoraproject.org|
 Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|fbg|Falling Block Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|fcron|A task scheduler|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 14 14:01:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 14 Oct 2006 07:01:16 -0700
Subject: rpms/perl-Email-MIME/devel .cvsignore, 1.5, 1.6 perl-Email-MIME.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610141401.k9EE1mMS026152@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26095/devel

Modified Files:
	.cvsignore perl-Email-MIME.spec sources 
Log Message:
Update to 1.853.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2006 15:48:57 -0000	1.5
+++ .cvsignore	14 Oct 2006 14:01:16 -0000	1.6
@@ -1 +1 @@
-Email-MIME-1.852.tar.gz
+Email-MIME-1.853.tar.gz


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/perl-Email-MIME.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Email-MIME.spec	6 Sep 2006 15:48:58 -0000	1.4
+++ perl-Email-MIME.spec	14 Oct 2006 14:01:16 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME
-Version:        1.852
+Version:        1.853
 Release:        1%{?dist}
 Summary:        Easy MIME message parsing
 
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Email::MIME::ContentType) >= 1.0
+BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
 BuildRequires:  perl(Email::Simple) >= 1.91
 BuildRequires:  perl(MIME::Types) >= 1.13
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.853-1
+- Update to 1.853.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.852-1
 - Update to 1.852.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2006 15:48:58 -0000	1.5
+++ sources	14 Oct 2006 14:01:16 -0000	1.6
@@ -1 +1 @@
-d22fb9a5442e4c8b759ad86b773d5114  Email-MIME-1.852.tar.gz
+ff4f3f7c3aefbd74cb56cb513797c9fd  Email-MIME-1.853.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 14:01:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 14 Oct 2006 07:01:12 -0700
Subject: rpms/perl-Email-MIME/FC-5 .cvsignore, 1.5, 1.6 perl-Email-MIME.spec,
	1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610141401.k9EE1jrH026147@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26095/FC-5

Modified Files:
	.cvsignore perl-Email-MIME.spec sources 
Log Message:
Update to 1.853.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2006 15:48:57 -0000	1.5
+++ .cvsignore	14 Oct 2006 14:01:10 -0000	1.6
@@ -1 +1 @@
-Email-MIME-1.852.tar.gz
+Email-MIME-1.853.tar.gz


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/perl-Email-MIME.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Email-MIME.spec	6 Sep 2006 15:48:57 -0000	1.4
+++ perl-Email-MIME.spec	14 Oct 2006 14:01:10 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME
-Version:        1.852
+Version:        1.853
 Release:        1%{?dist}
 Summary:        Easy MIME message parsing
 
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Email::MIME::ContentType) >= 1.0
+BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
 BuildRequires:  perl(Email::Simple) >= 1.91
 BuildRequires:  perl(MIME::Types) >= 1.13
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.853-1
+- Update to 1.853.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.852-1
 - Update to 1.852.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2006 15:48:57 -0000	1.5
+++ sources	14 Oct 2006 14:01:10 -0000	1.6
@@ -1 +1 @@
-d22fb9a5442e4c8b759ad86b773d5114  Email-MIME-1.852.tar.gz
+ff4f3f7c3aefbd74cb56cb513797c9fd  Email-MIME-1.853.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 14:21:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 14 Oct 2006 07:21:31 -0700
Subject: rpms/perl-Email-MIME-Modifier/FC-5 .cvsignore, 1.3,
	1.4 perl-Email-MIME-Modifier.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200610141422.k9EEM3kK026520@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444/FC-5

Modified Files:
	.cvsignore perl-Email-MIME-Modifier.spec sources 
Log Message:
Update to 1.440.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jul 2006 14:41:39 -0000	1.3
+++ .cvsignore	14 Oct 2006 14:21:31 -0000	1.4
@@ -1 +1 @@
-Email-MIME-Modifier-1.43.tar.gz
+Email-MIME-Modifier-1.440.tar.gz


Index: perl-Email-MIME-Modifier.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/FC-5/perl-Email-MIME-Modifier.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-Modifier.spec	14 Jul 2006 14:41:39 -0000	1.2
+++ perl-Email-MIME-Modifier.spec	14 Oct 2006 14:21:31 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME-Modifier
-Version:        1.43
+Version:        1.440
 Release:        1%{?dist}
 Summary:        Modify Email::MIME Objects Easily
 
@@ -13,7 +13,7 @@
 BuildRequires:  perl(Email::MessageID) >= 1.2
 BuildRequires:  perl(Email::MIME) >= 1.82
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
-BuildRequires:  perl(Email::MIME::ContentType) >= 1.0
+BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::Simple) >= 1.92
 BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.440-1
+- Update to 1.440.
+
 * Fri Jul 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.43-1
 - Update to 1.43.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jul 2006 14:41:39 -0000	1.3
+++ sources	14 Oct 2006 14:21:31 -0000	1.4
@@ -1 +1 @@
-63abff1a4c9d70bb3f0c521b6ff1a331  Email-MIME-Modifier-1.43.tar.gz
+28eec7eeac53007243a2055bf37a4c2c  Email-MIME-Modifier-1.440.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 14:21:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 14 Oct 2006 07:21:32 -0700
Subject: rpms/perl-Email-MIME-Modifier/devel .cvsignore, 1.3,
	1.4 perl-Email-MIME-Modifier.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200610141422.k9EEM41p026525@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444/devel

Modified Files:
	.cvsignore perl-Email-MIME-Modifier.spec sources 
Log Message:
Update to 1.440.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jul 2006 14:41:45 -0000	1.3
+++ .cvsignore	14 Oct 2006 14:21:31 -0000	1.4
@@ -1 +1 @@
-Email-MIME-Modifier-1.43.tar.gz
+Email-MIME-Modifier-1.440.tar.gz


Index: perl-Email-MIME-Modifier.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/perl-Email-MIME-Modifier.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-Modifier.spec	14 Jul 2006 14:41:45 -0000	1.2
+++ perl-Email-MIME-Modifier.spec	14 Oct 2006 14:21:31 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME-Modifier
-Version:        1.43
+Version:        1.440
 Release:        1%{?dist}
 Summary:        Modify Email::MIME Objects Easily
 
@@ -13,7 +13,7 @@
 BuildRequires:  perl(Email::MessageID) >= 1.2
 BuildRequires:  perl(Email::MIME) >= 1.82
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
-BuildRequires:  perl(Email::MIME::ContentType) >= 1.0
+BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::Simple) >= 1.92
 BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.440-1
+- Update to 1.440.
+
 * Fri Jul 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.43-1
 - Update to 1.43.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jul 2006 14:41:45 -0000	1.3
+++ sources	14 Oct 2006 14:21:31 -0000	1.4
@@ -1 +1 @@
-63abff1a4c9d70bb3f0c521b6ff1a331  Email-MIME-Modifier-1.43.tar.gz
+28eec7eeac53007243a2055bf37a4c2c  Email-MIME-Modifier-1.440.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 16:04:15 2006
From: fedora-extras-commits at redhat.com (Frank Büttner (frankb))
Date: Sat, 14 Oct 2006 09:04:15 -0700
Subject: rpms/qt4-qsa/devel qt4-qsa.spec,1.9,1.10
Message-ID: <200610141604.k9EG4mLx001153@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1120

Modified Files:
	qt4-qsa.spec 
Log Message:
back to old one because the patch for bug 210544 fails



Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt4-qsa.spec	12 Oct 2006 20:35:08 -0000	1.9
+++ qt4-qsa.spec	14 Oct 2006 16:04:15 -0000	1.10
@@ -1,21 +1,29 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	18%{?dist}
-BuildRequires:	qt4-devel 
+Release:	19%{?dist}
+BuildRequires:	qt4-devel
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
 License: 	GPL
 Group: 		Development/Libraries
 Source: 	ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz
 Patch0:		qsa-1.2.1-Qt4.2-preview.patch
-Patch1:		qsa-1.2.1-QT_INSTALL.patch
 Buildroot: 	%{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define qtdir  %(qmake-qt4 -query QT_INSTALL_PREFIX)
-%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA)
-%define qtinc  %(qmake-qt4 -query QT_INSTALL_HEADERS)
-%define qtlib  %(qmake-qt4 -query QT_INSTALL_LIBS)
+
+# fix the the broken include path
+%define qtinc %{qtdir}/include
+%ifarch x86_64
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64
+%else
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
+%endif
+
+#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS)
+#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
+
 
 %package devel
 Summary:	Development and doc files for qsa 
@@ -32,7 +40,6 @@
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -41,7 +48,8 @@
 export QTLIB=%{qtlib}
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
-./configure -release 
+./configure -release -prefix %{qtdir} 
+#./configure -release
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -63,6 +71,12 @@
 install -p -m 644 src/ide/qsworkbench.h $RPM_BUILD_ROOT%{qtinc}/
 install -p -m 644 src/qsa/qsutilfactory.h  $RPM_BUILD_ROOT%{qtinc}/
 
+%if "%{_lib}" != "lib"
+test -d $RPM_BUILD_ROOT%{qtdir}/lib && \
+mkdir -p $RPM_BUILD_ROOT%{qtlib} && \
+mv $RPM_BUILD_ROOT%{qtdir}/lib/* $RPM_BUILD_ROOT%{qtlib}/
+%endif
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -80,11 +94,14 @@
 %defattr(0644,root,root)   
 %{qtinc}/*
 %{qtlib}/libqsa.so
-%{qtdata}/mkspecs/features/qsa.prf
+%{qtdir}/mkspecs/features/qsa.prf
 %doc examples
 %doc doc/html
 
 %changelog 
+* Sat Oct 14 2006 Frank B??ttner  <frank-buettner at gmx.net> - 1.2.1-19%{?dist}
+- back to old one because the patch for bug 210544 fails
+
 * Thu Oct 12 2006 Frank B??ttner <frank-buettner at gmx.net> - 1.2.1-18%{?dist}
 - fix for bug 210544
 



From fedora-extras-commits at redhat.com  Sat Oct 14 16:09:53 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Sat, 14 Oct 2006 09:09:53 -0700
Subject: rpms/listen/FC-5 listen.spec,1.11,1.12
Message-ID: <200610141609.k9EG9t6Y001305@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1272/FC-5

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- listen.spec	12 Oct 2006 16:05:32 -0000	1.11
+++ listen.spec	14 Oct 2006 16:09:53 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        6.beta1%{?dist}
+Release:        7.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -46,11 +46,13 @@
 Requires: gnome-python2
 Requires: gnome-python2-extras
 Requires: gnome-python2-gtkmozembed
+Requires: gnome-python2-gtkhtml2
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
 Requires: python-musicbrainz2 
 Requires: /usr/lib/libtunepimp.so.5
+Requires: /usr/bin/puid
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
@@ -141,6 +143,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Nov 14 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-7.beta1
+- Updated R with gnome-python2-gtkhtml2
+
 * Thu Nov 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 



From fedora-extras-commits at redhat.com  Sat Oct 14 16:09:54 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Sat, 14 Oct 2006 09:09:54 -0700
Subject: rpms/listen/devel listen.spec,1.11,1.12
Message-ID: <200610141609.k9EG9uHb001309@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1272/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- listen.spec	12 Oct 2006 16:07:46 -0000	1.11
+++ listen.spec	14 Oct 2006 16:09:54 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        6.beta1%{?dist}
+Release:        7.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -46,11 +46,13 @@
 Requires: gnome-python2
 Requires: gnome-python2-extras
 Requires: gnome-python2-gtkmozembed
+Requires: gnome-python2-gtkhtml2
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
 Requires: python-musicbrainz2 
 Requires: /usr/lib/libtunepimp.so.5
+Requires: /usr/bin/puid
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
@@ -141,6 +143,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Nov 14 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-7.beta1
+- Updated R with gnome-python2-gtkhtml2
+
 * Thu Nov 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 



From fedora-extras-commits at redhat.com  Sat Oct 14 16:13:52 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 14 Oct 2006 09:13:52 -0700
Subject: rpms/gqview/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 gqview.spec,
	1.9, 1.10
Message-ID: <200610141613.k9EGDskB001365@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344

Modified Files:
	.cvsignore sources gqview.spec 
Log Message:
* Sat Oct 14 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.2-1
- update to 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 May 2005 21:23:33 -0000	1.5
+++ .cvsignore	14 Oct 2006 16:13:51 -0000	1.6
@@ -1 +1 @@
-gqview-2.0.1.tar.gz
+gqview-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 May 2005 21:23:33 -0000	1.6
+++ sources	14 Oct 2006 16:13:51 -0000	1.7
@@ -1 +1 @@
-acd8f1dad2b04389c1936adac1512e32  gqview-2.0.1.tar.gz
+0bb325001b3cea88c2487c84e06ba738  gqview-2.0.2.tar.gz


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gqview.spec	28 Aug 2006 10:35:14 -0000	1.9
+++ gqview.spec	14 Oct 2006 16:13:51 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Image browser and viewer
 Name:		gqview
-Version:	2.0.1
-Release: 4
+Version:	2.0.2
+Release: 1%{?dist}
 License:	GPL
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
@@ -76,7 +76,10 @@
 
 
 %changelog
-* Mon Aug 28 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sat Oct 14 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.2-1
+- update to 2.0.2
+
+* Mon Aug 28 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.1-4
 - rebuilt
 
 * Wed Feb 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.1-3



From fedora-extras-commits at redhat.com  Sat Oct 14 16:16:00 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Sat, 14 Oct 2006 09:16:00 -0700
Subject: rpms/listen/FC-5 listen.spec,1.12,1.13
Message-ID: <200610141616.k9EGG2n1001455@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1424/FC-5

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- listen.spec	14 Oct 2006 16:09:53 -0000	1.12
+++ listen.spec	14 Oct 2006 16:16:00 -0000	1.13
@@ -51,7 +51,8 @@
 Requires: python-sexy
 # MusicBrainz support
 Requires: python-musicbrainz2 
-Requires: /usr/lib/libtunepimp.so.5
+# broken and useless dependency
+#Requires: /usr/lib/libtunepimp.so.5
 Requires: /usr/bin/puid
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod



From fedora-extras-commits at redhat.com  Sat Oct 14 16:16:00 2006
From: fedora-extras-commits at redhat.com (Haïkel Guémar (hguemar))
Date: Sat, 14 Oct 2006 09:16:00 -0700
Subject: rpms/listen/devel listen.spec,1.12,1.13
Message-ID: <200610141616.k9EGG3AU001459@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1424/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- listen.spec	14 Oct 2006 16:09:54 -0000	1.12
+++ listen.spec	14 Oct 2006 16:16:00 -0000	1.13
@@ -51,7 +51,8 @@
 Requires: python-sexy
 # MusicBrainz support
 Requires: python-musicbrainz2 
-Requires: /usr/lib/libtunepimp.so.5
+# broken and useless dependency
+#Requires: /usr/lib/libtunepimp.so.5
 Requires: /usr/bin/puid
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod



From fedora-extras-commits at redhat.com  Sat Oct 14 17:04:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 14 Oct 2006 10:04:12 -0700
Subject: rpms/amavisd-new/devel amavisd-new.spec,1.9,1.10
Message-ID: <200610141704.k9EH4jPa004623@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4582

Modified Files:
	amavisd-new.spec 
Log Message:
Fix permissions on the cron.daily script.


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amavisd-new.spec	10 Oct 2006 22:47:43 -0000	1.9
+++ amavisd-new.spec	14 Oct 2006 17:04:11 -0000	1.10
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        1%{?prerelease:.%{prerelease}}%{?dist}
+Release:        2%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -104,7 +104,7 @@
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
-install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
+install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
 
 mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db,quarantine}
 touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
@@ -152,6 +152,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Sat Oct 14 2006 Steven Pritchard <steve at kspei.com> 2.4.3-2
+- Fix permissions on the cron.daily script.
+
 * Tue Oct 10 2006 Steven Pritchard <steve at kspei.com> 2.4.3-1
 - Update to 2.4.3.
 - Add quarantine directory and instructions for enabling it.



From fedora-extras-commits at redhat.com  Sat Oct 14 17:54:00 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sat, 14 Oct 2006 10:54:00 -0700
Subject: rpms/newsx/devel newsx.spec,1.3,1.4
Message-ID: <200610141754.k9EHs2Y7004860@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4843

Modified Files:
	newsx.spec 
Log Message:
- rename newsq to avoid conflict with leafnode
- simplify autotools invocation



Index: newsx.spec
===================================================================
RCS file: /cvs/extras/rpms/newsx/devel/newsx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newsx.spec	1 Oct 2006 12:27:49 -0000	1.3
+++ newsx.spec	14 Oct 2006 17:54:00 -0000	1.4
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 Name:		newsx
 Version:	1.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz??dzie do wymiany news??w po NNTP
@@ -31,10 +31,7 @@
 %patch0 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+autoreconf -f -i
 %configure --without-history
 
 %{__make} %{?_smp_mflags}
@@ -45,6 +42,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# avoid conflict with leafnode
+pushd $RPM_BUILD_ROOT
+mv .%{_bindir}/newsq .%{_bindir}/newsx-newsq
+mv .%{_mandir}/man1/newsq.1 .%{_mandir}/man1/newsx-newsq.1
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,6 +59,10 @@
 %{_mandir}/man[158]/*
 
 %changelog
+* Sat Oct 14 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-6
+- rename newsq to avoid conflict with leafnode
+- simplify autotools invocation
+
 * Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-5
 - fix build on devel
 



From fedora-extras-commits at redhat.com  Sat Oct 14 17:56:17 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sat, 14 Oct 2006 10:56:17 -0700
Subject: rpms/newsx/FC-5 newsx.spec,1.3,1.4
Message-ID: <200610141756.k9EHuJHL004936@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/newsx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4919

Modified Files:
	newsx.spec 
Log Message:
- rename newsq to avoid conflict with leafnode
- simplify autotools invocation



Index: newsx.spec
===================================================================
RCS file: /cvs/extras/rpms/newsx/FC-5/newsx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newsx.spec	1 Oct 2006 12:27:49 -0000	1.3
+++ newsx.spec	14 Oct 2006 17:56:17 -0000	1.4
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 Name:		newsx
 Version:	1.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Summary:	NNTP news exchange utility
 Summary(pl):	Narz??dzie do wymiany news??w po NNTP
@@ -31,10 +31,7 @@
 %patch0 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+autoreconf -f -i
 %configure --without-history
 
 %{__make} %{?_smp_mflags}
@@ -45,6 +42,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# avoid conflict with leafnode
+pushd $RPM_BUILD_ROOT
+mv .%{_bindir}/newsq .%{_bindir}/newsx-newsq
+mv .%{_mandir}/man1/newsq.1 .%{_mandir}/man1/newsx-newsq.1
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,6 +59,10 @@
 %{_mandir}/man[158]/*
 
 %changelog
+* Sat Oct 14 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-6
+- rename newsq to avoid conflict with leafnode
+- simplify autotools invocation
+
 * Sun Oct 01 2006 Dominik Mierzejewski <rpm at greysector.net> 1.6-5
 - fix build on devel
 



From fedora-extras-commits at redhat.com  Sat Oct 14 20:32:36 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 14 Oct 2006 13:32:36 -0700
Subject: rpms/lua/devel .cvsignore, 1.4, 1.5 lua.spec, 1.18, 1.19 sources,
	1.6, 1.7
Message-ID: <200610142032.k9EKWcSC014321@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lua/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14300

Modified Files:
	.cvsignore lua.spec sources 
Log Message:
* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-1
- New upstream release 5.1.1
- Fix detection of readline during compile (iow add readline support back)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 May 2006 07:01:54 -0000	1.4
+++ .cvsignore	14 Oct 2006 20:32:35 -0000	1.5
@@ -1 +1,2 @@
-lua-5.1-autotoolize-r1.patch.bz2
+lua-5.1.1.tar.gz
+lua-5.1.1-autotoolize.patch.gz


Index: lua.spec
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lua.spec	28 Aug 2006 04:24:13 -0000	1.18
+++ lua.spec	14 Oct 2006 20:32:35 -0000	1.19
@@ -1,16 +1,14 @@
 Name:           lua
-Version:        5.1
-Release:        7%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        Powerful light-weight programming language
-
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.lua.org/
 Source0:        http://www.lua.org/ftp/lua-%{version}.tar.gz
-Patch0:		lua-5.1-autotoolize-r1.patch.bz2
+Patch0:         lua-5.1.1-autotoolize.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  readline-devel, ncurses-devel
+BuildRequires:  readline-devel ncurses-devel
 
 %description
 Lua is a powerful light-weight programming language designed for
@@ -22,6 +20,7 @@
 memory management with garbage collection, making it ideal for
 configuration, scripting, and rapid prototyping.
 
+
 %package	devel
 Summary:	Development files for %{name}
 Group:		System Environment/Libraries
@@ -31,28 +30,27 @@
 %description	devel
 This package contains development files for %{name}.
 
+
 %prep
 %setup -q
-%patch0 -p1
-
-%build
+%patch0 -p1 -E
 # fix perms on auto files
 chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
 
-./autogen.sh
 
+%build
 %configure --with-readline
-
 make %{?_smp_mflags} 
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall 
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
 
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -67,11 +65,14 @@
 %{_includedir}/l*.h
 %{_includedir}/l*.hpp
 %{_libdir}/liblua.so
-%{_libdir}/*.a
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-1
+- New upstream release 5.1.1
+- Fix detection of readline during compile (iow add readline support back)
+
 * Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-7
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 May 2006 07:04:13 -0000	1.6
+++ sources	14 Oct 2006 20:32:35 -0000	1.7
@@ -1,2 +1,2 @@
-3e8dfe8be00a744cec2f9e766b2f2aee  lua-5.1.tar.gz
-9e6a9655694450e26aa4e01220dd3636  lua-5.1-autotoolize-r1.patch.bz2
+22f4f912f20802c11006fe9b84d5c461  lua-5.1.1.tar.gz
+d4116caee10a37951b413436f9e2a119  lua-5.1.1-autotoolize.patch.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 20:41:22 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 14 Oct 2006 13:41:22 -0700
Subject: rpms/aide/devel aide-0.12-getopt.patch, NONE, 1.1 .cvsignore, 1.7, 
	1.8 aide.spec, 1.14, 1.15 sources, 1.7, 1.8
Message-ID: <200610142041.k9EKfO53014412@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14388

Modified Files:
	.cvsignore aide.spec sources 
Added Files:
	aide-0.12-getopt.patch 
Log Message:
* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
- Update to 0.12 release.
- now offers --disable-static, so -no-static patch is obsolete
- fill last element of getopt struct array with zeroes


aide-0.12-getopt.patch:

--- NEW FILE aide-0.12-getopt.patch ---
Do what the manual says.

diff -Nur aide-0.12-orig/src/aide.c aide-0.12/src/aide.c
--- aide-0.12-orig/src/aide.c	2006-10-04 12:20:25.000000000 +0200
+++ aide-0.12/src/aide.c	2006-10-14 22:35:47.000000000 +0200
@@ -109,7 +109,7 @@
     { "update", no_argument, NULL, 'u'},
     { "config-check", no_argument, NULL, 'D'},
     { "compare", no_argument, NULL, 'E'},
-    { NULL }
+    { NULL, 0, NULL, 0 }
   };
 
   while(1){


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Sep 2006 09:11:31 -0000	1.7
+++ .cvsignore	14 Oct 2006 20:41:21 -0000	1.8
@@ -1 +1 @@
-aide-0.11.tar.gz
+aide-0.12.tar.gz


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aide.spec	2 Oct 2006 19:41:16 -0000	1.14
+++ aide.spec	14 Oct 2006 20:41:21 -0000	1.15
@@ -1,20 +1,26 @@
-%{?_with_static: %define nostatic 0}
-%{!?_with_static: %define nostatic 1}
+%{?_with_static: %define nostatic %nil }
+%{!?_with_static: %define nostatic --disable-static }
+
+# segfaults
+%{!?_with_curl: %{!?_without_curl: %define _without_curl --without-curl}}
 
 Summary: Intrusion detection environment
 Name: aide
-Version: 0.11
-Release: 3%{?dist}
+Version: 0.12
+Release: 1%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
 Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz
 Source1: aide.conf
 Source2: README.quickstart
-Patch0: aide-0.11-no-static.patch
+Patch0: aide-0.12-getopt.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
+%if "%{?_with_curl}x" != "x"
+Buildrequires: curl-devel
+%endif
 #Buildrequires: postgresql-devel libgcrypt-devel
 #(needs --with-psql and -lgcrypt in src/Makefile.in)
 
@@ -25,15 +31,15 @@
 
 %prep
 %setup -q
-%if 0%{nostatic}
-%patch0 -p1 -b .no-static
-%endif
+%patch0 -p1 -b .getopt
 
 
 %build
 %configure --with-config_file=%{_sysconfdir}/aide.conf \
            --with-zlib \
-           --with-mhash --enable-mhash
+           --with-mhash --enable-mhash \
+           %{?_with_curl} %{?_without_curl} \
+           %{?nostatic}
 
 # Adjust default database paths.
 perl -pi -e 's!%{_sysconfdir}/aide.db!%{_localstatedir}/lib/aide.db!' config.h
@@ -51,7 +57,6 @@
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide
 install -p %{SOURCE2} README.quickstart
-mkdir -p -m0755 $RPM_BUILD_ROOT%{_mandir}/ru/man{1,5}
 
 
 %clean
@@ -70,7 +75,12 @@
 
 
 %changelog
-* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
+- Update to 0.12 release.
+- now offers --disable-static, so -no-static patch is obsolete
+- fill last element of getopt struct array with zeroes
+
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-3
 - rebuilt
 
 * Mon Sep 11 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Sep 2006 09:11:31 -0000	1.7
+++ sources	14 Oct 2006 20:41:21 -0000	1.8
@@ -1 +1 @@
-9a44e5386b0355ef57c60f627ff4d085  aide-0.11.tar.gz
+fee8da9fe8ac4f78de1a237290ed3204  aide-0.12.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 20:41:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 14 Oct 2006 13:41:46 -0700
Subject: rpms/aide/devel aide-0.11-no-static.patch,1.3,NONE
Message-ID: <200610142041.k9EKfmiP014439@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14424

Removed Files:
	aide-0.11-no-static.patch 
Log Message:
* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
- Update to 0.12 release.
- now offers --disable-static, so -no-static patch is obsolete
- fill last element of getopt struct array with zeroes



--- aide-0.11-no-static.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 14 20:42:22 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 14 Oct 2006 13:42:22 -0700
Subject: rpms/aide/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200610142042.k9EKgOaq014483@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14464

Modified Files:
	.cvsignore sources 
Log Message:
* Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
- Update to 0.12 release.
- now offers --disable-static, so -no-static patch is obsolete
- fill last element of getopt struct array with zeroes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Oct 2006 20:41:21 -0000	1.8
+++ .cvsignore	14 Oct 2006 20:42:22 -0000	1.9
@@ -1 +1,2 @@
 aide-0.12.tar.gz
+aide-0.12.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Oct 2006 20:41:21 -0000	1.8
+++ sources	14 Oct 2006 20:42:22 -0000	1.9
@@ -1 +1,2 @@
 fee8da9fe8ac4f78de1a237290ed3204  aide-0.12.tar.gz
+1073f8839dc68c6e0ae1251dd2371584  aide-0.12.tar.gz.asc



From fedora-extras-commits at redhat.com  Sat Oct 14 20:55:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 14 Oct 2006 13:55:35 -0700
Subject: rpms/opensc/devel opensc.spec,1.19,1.20
Message-ID: <200610142055.k9EKtb0K014598@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14581

Modified Files:
	opensc.spec 
Log Message:
* Sat Oct 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-6
- Rebuild with new libassuan.



Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- opensc.spec	8 Oct 2006 20:33:47 -0000	1.19
+++ opensc.spec	14 Oct 2006 20:55:35 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-6
+- Rebuild with new libassuan.
+
 * Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.1-5
 - Rebuild with new libassuan.
 



From fedora-extras-commits at redhat.com  Sat Oct 14 21:18:11 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:18:11 -0700
Subject: rpms/XaraLX import.log,1.8,1.9
Message-ID: <200610142118.k9ELID2p017667@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/XaraLX
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17634

Modified Files:
	import.log 
Log Message:
auto-import XaraLX-0.7-8.r1763 on branch devel from XaraLX-0.7-8.r1763.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	21 Sep 2006 22:28:19 -0000	1.8
+++ import.log	14 Oct 2006 21:18:10 -0000	1.9
@@ -5,3 +5,4 @@
 XaraLX-0_7-5_r1742:HEAD:XaraLX-0.7-5.r1742.src.rpm:1157571588
 XaraLX-0_7-6_r1759:HEAD:XaraLX-0.7-6.r1759.src.rpm:1158877287
 XaraLX-0_7-6_r1759:FC-5:XaraLX-0.7-6.r1759.src.rpm:1158877686
+XaraLX-0_7-8_r1763:HEAD:XaraLX-0.7-8.r1763.src.rpm:1160860676



From fedora-extras-commits at redhat.com  Sat Oct 14 21:18:11 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:18:11 -0700
Subject: rpms/XaraLX/devel .cvsignore, 1.5, 1.6 XaraLX.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200610142118.k9ELIDqe017673@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/XaraLX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17634/devel

Modified Files:
	.cvsignore XaraLX.spec sources 
Log Message:
auto-import XaraLX-0.7-8.r1763 on branch devel from XaraLX-0.7-8.r1763.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 22:21:40 -0000	1.5
+++ .cvsignore	14 Oct 2006 21:18:11 -0000	1.6
@@ -1 +1 @@
-XaraLX-0.7r1759.tar.bz2
+XaraLX-0.7r1763.tar.bz2


Index: XaraLX.spec
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/devel/XaraLX.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XaraLX.spec	4 Oct 2006 23:17:30 -0000	1.6
+++ XaraLX.spec	14 Oct 2006 21:18:11 -0000	1.7
@@ -1,9 +1,9 @@
-%define buildRev r1759
+%define buildRev r1763
 
 Name:		XaraLX
 Summary: 	Vector/general purpose graphics utility
 Version:	0.7
-Release:	7%{?dist}.%{buildRev}
+Release:	8%{?dist}.%{buildRev}
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://downloads.xara.com/opensource/%{name}-%{version}%{buildRev}.tar.bz2
@@ -90,6 +90,9 @@
 %{_docdir}/XaraLX/examples
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-8.r1763
+- bump
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-7.r1759
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 22:21:40 -0000	1.5
+++ sources	14 Oct 2006 21:18:11 -0000	1.6
@@ -1 +1 @@
-7298bf9d3b8882f41d8290e5f030af27  XaraLX-0.7r1759.tar.bz2
+b9cbc4716601101956e0fe50b5717980  XaraLX-0.7r1763.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 14 21:19:27 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:19:27 -0700
Subject: rpms/XaraLX import.log,1.9,1.10
Message-ID: <200610142119.k9ELJTR9017768@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/XaraLX
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17735

Modified Files:
	import.log 
Log Message:
auto-import XaraLX-0.7-8.r1763 on branch FC-5 from XaraLX-0.7-8.r1763.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	14 Oct 2006 21:18:10 -0000	1.9
+++ import.log	14 Oct 2006 21:19:27 -0000	1.10
@@ -6,3 +6,4 @@
 XaraLX-0_7-6_r1759:HEAD:XaraLX-0.7-6.r1759.src.rpm:1158877287
 XaraLX-0_7-6_r1759:FC-5:XaraLX-0.7-6.r1759.src.rpm:1158877686
 XaraLX-0_7-8_r1763:HEAD:XaraLX-0.7-8.r1763.src.rpm:1160860676
+XaraLX-0_7-8_r1763:FC-5:XaraLX-0.7-8.r1763.src.rpm:1160860750



From fedora-extras-commits at redhat.com  Sat Oct 14 21:19:28 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:19:28 -0700
Subject: rpms/XaraLX/FC-5 .cvsignore, 1.5, 1.6 XaraLX.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200610142119.k9ELJUgv017774@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/XaraLX/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17735/FC-5

Modified Files:
	.cvsignore XaraLX.spec sources 
Log Message:
auto-import XaraLX-0.7-8.r1763 on branch FC-5 from XaraLX-0.7-8.r1763.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 22:28:20 -0000	1.5
+++ .cvsignore	14 Oct 2006 21:19:27 -0000	1.6
@@ -1 +1 @@
-XaraLX-0.7r1759.tar.bz2
+XaraLX-0.7r1763.tar.bz2


Index: XaraLX.spec
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/FC-5/XaraLX.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XaraLX.spec	21 Sep 2006 22:28:20 -0000	1.5
+++ XaraLX.spec	14 Oct 2006 21:19:27 -0000	1.6
@@ -1,9 +1,9 @@
-%define buildRev r1759
+%define buildRev r1763
 
 Name:		XaraLX
 Summary: 	Vector/general purpose graphics utility
 Version:	0.7
-Release:	6%{?dist}.%{buildRev}
+Release:	8%{?dist}.%{buildRev}
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://downloads.xara.com/opensource/%{name}-%{version}%{buildRev}.tar.bz2
@@ -90,6 +90,12 @@
 %{_docdir}/XaraLX/examples
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-8.r1763
+- bump
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.7-7.r1759
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7-5.r1759
 - bump
 - added two BRs for autoreconf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/XaraLX/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 22:28:20 -0000	1.5
+++ sources	14 Oct 2006 21:19:27 -0000	1.6
@@ -1 +1 @@
-7298bf9d3b8882f41d8290e5f030af27  XaraLX-0.7r1759.tar.bz2
+b9cbc4716601101956e0fe50b5717980  XaraLX-0.7r1763.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 14 21:28:24 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:28:24 -0700
Subject: rpms/perl-File-DesktopEntry - New directory
Message-ID: <200610142128.k9ELSQEc017927@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17901/perl-File-DesktopEntry

Log Message:
Directory /cvs/extras/rpms/perl-File-DesktopEntry added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:28:25 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:28:25 -0700
Subject: rpms/perl-File-DesktopEntry/devel - New directory
Message-ID: <200610142128.k9ELSRlN017930@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17901/perl-File-DesktopEntry/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-DesktopEntry/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:28:43 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:28:43 -0700
Subject: rpms/perl-File-DesktopEntry Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610142128.k9ELSjvR017977@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17948

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-DesktopEntry


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-DesktopEntry
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:28:44 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:28:44 -0700
Subject: rpms/perl-File-DesktopEntry/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610142128.k9ELSkNZ017980@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17948/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-DesktopEntry


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:29:24 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:29:24 -0700
Subject: rpms/perl-File-DesktopEntry import.log,1.1,1.2
Message-ID: <200610142129.k9ELTQPi018050@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18017

Modified Files:
	import.log 
Log Message:
auto-import perl-File-DesktopEntry-0.02-1 on branch devel from perl-File-DesktopEntry-0.02-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-DesktopEntry/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2006 21:28:43 -0000	1.1
+++ import.log	14 Oct 2006 21:29:24 -0000	1.2
@@ -0,0 +1 @@
+perl-File-DesktopEntry-0_02-1:HEAD:perl-File-DesktopEntry-0.02-1.src.rpm:1160861125



From fedora-extras-commits at redhat.com  Sat Oct 14 21:29:25 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:29:25 -0700
Subject: rpms/perl-File-DesktopEntry/devel perl-File-DesktopEntry.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610142129.k9ELTRVs018055@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-DesktopEntry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18017/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-DesktopEntry.spec 
Log Message:
auto-import perl-File-DesktopEntry-0.02-1 on branch devel from perl-File-DesktopEntry-0.02-1.src.rpm


--- NEW FILE perl-File-DesktopEntry.spec ---
Name:           perl-File-DesktopEntry
Version:        0.02
Release:        1%{?dist}
Summary:        Object to handle .desktop files
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-DesktopEntry/
Source0:        http://www.cpan.org/authors/id/P/PA/PARDUS/File-DesktopEntry/File-DesktopEntry-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is used to work with .desktop files. The format of these files
is specified by the freedesktop "Desktp Entry" specification. See
http://freedesktop.org/wiki/Standards_2fdesktop_2dentry_2dspec. For this
module version 0.9.4 of the specification was used.

%prep
%setup -q -n File-DesktopEntry-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Oct 11 2006 Patrice Dumas <pertusus at free.fr> 0.02-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-DesktopEntry/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2006 21:28:44 -0000	1.1
+++ .cvsignore	14 Oct 2006 21:29:25 -0000	1.2
@@ -0,0 +1 @@
+File-DesktopEntry-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-DesktopEntry/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Oct 2006 21:28:44 -0000	1.1
+++ sources	14 Oct 2006 21:29:25 -0000	1.2
@@ -0,0 +1 @@
+9c97efa062c04bcb86a0a6a3707355d1  File-DesktopEntry-0.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:30:55 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:30:55 -0700
Subject: rpms/monodoc import.log,1.23,1.24
Message-ID: <200610142131.k9ELVRSC018208@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18136

Modified Files:
	import.log 
Log Message:
auto-import monodoc-1.1.18-1 on branch FC-5 from monodoc-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/monodoc/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- import.log	6 Sep 2006 23:10:55 -0000	1.23
+++ import.log	14 Oct 2006 21:30:55 -0000	1.24
@@ -20,3 +20,4 @@
 monodoc-1_1_17-2:FC-5:monodoc-1.1.17-2.src.rpm:1157406088
 monodoc-1_1_17-3:HEAD:monodoc-1.1.17-3.src.rpm:1157584224
 monodoc-1_1_17-3:FC-5:monodoc-1.1.17-3.src.rpm:1157584285
+monodoc-1_1_18-1:FC-5:monodoc-1.1.18-1.src.rpm:1160861442



From fedora-extras-commits at redhat.com  Sat Oct 14 21:30:56 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:30:56 -0700
Subject: rpms/monodoc/FC-5 .cvsignore, 1.4, 1.5 monodoc.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <200610142131.k9ELVSvw018213@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18136/FC-5

Modified Files:
	.cvsignore monodoc.spec sources 
Log Message:
auto-import monodoc-1.1.18-1 on branch FC-5 from monodoc-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Aug 2006 21:58:19 -0000	1.4
+++ .cvsignore	14 Oct 2006 21:30:56 -0000	1.5
@@ -1 +1 @@
-monodoc-1.1.17.zip
+monodoc-1.1.18.zip


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/monodoc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- monodoc.spec	7 Sep 2006 20:32:02 -0000	1.14
+++ monodoc.spec	14 Oct 2006 21:30:56 -0000	1.15
@@ -8,8 +8,8 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.1.17
-Release: 5%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -43,7 +43,7 @@
 %endif
 
 %build
-%configure --libdir=%{monodir}
+%configure
 make 
 
 %install
@@ -67,7 +67,10 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
-* Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-5
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
+* Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-4
 - D'oh
 
 * Wed Sep 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Aug 2006 21:58:19 -0000	1.4
+++ sources	14 Oct 2006 21:30:56 -0000	1.5
@@ -1 +1 @@
-e4f904f23a0c7ca514403fb8ad86ff3e  monodoc-1.1.17.zip
+71981a3ed2c1eadd9ec0493c4b9f1bf1  monodoc-1.1.18.zip



From fedora-extras-commits at redhat.com  Sat Oct 14 21:32:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:32:40 -0700
Subject: rpms/monodoc import.log,1.24,1.25
Message-ID: <200610142133.k9ELXCcD018317@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18283

Modified Files:
	import.log 
Log Message:
auto-import monodoc-1.1.18-1 on branch devel from monodoc-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/monodoc/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- import.log	14 Oct 2006 21:30:55 -0000	1.24
+++ import.log	14 Oct 2006 21:32:39 -0000	1.25
@@ -21,3 +21,4 @@
 monodoc-1_1_17-3:HEAD:monodoc-1.1.17-3.src.rpm:1157584224
 monodoc-1_1_17-3:FC-5:monodoc-1.1.17-3.src.rpm:1157584285
 monodoc-1_1_18-1:FC-5:monodoc-1.1.18-1.src.rpm:1160861442
+monodoc-1_1_18-1:HEAD:monodoc-1.1.18-1.src.rpm:1160861543



From fedora-extras-commits at redhat.com  Sat Oct 14 21:32:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:32:40 -0700
Subject: rpms/monodoc/devel .cvsignore, 1.4, 1.5 monodoc.spec, 1.16,
	1.17 sources, 1.4, 1.5
Message-ID: <200610142133.k9ELXCCo018322@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18283/devel

Modified Files:
	.cvsignore monodoc.spec sources 
Log Message:
auto-import monodoc-1.1.18-1 on branch devel from monodoc-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Aug 2006 21:56:38 -0000	1.4
+++ .cvsignore	14 Oct 2006 21:32:40 -0000	1.5
@@ -1 +1 @@
-monodoc-1.1.17.zip
+monodoc-1.1.18.zip


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- monodoc.spec	4 Oct 2006 22:17:46 -0000	1.16
+++ monodoc.spec	14 Oct 2006 21:32:40 -0000	1.17
@@ -8,8 +8,8 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.1.17
-Release: 6%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -43,7 +43,7 @@
 %endif
 
 %build
-%configure --libdir=%{monodir}
+%configure
 make 
 
 %install
@@ -67,11 +67,8 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.1.17-6
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Mon Sep 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-5
-- added libdir def to configure line
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
 
 * Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-4
 - D'oh


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Aug 2006 21:56:38 -0000	1.4
+++ sources	14 Oct 2006 21:32:40 -0000	1.5
@@ -1 +1 @@
-e4f904f23a0c7ca514403fb8ad86ff3e  monodoc-1.1.17.zip
+71981a3ed2c1eadd9ec0493c4b9f1bf1  monodoc-1.1.18.zip



From fedora-extras-commits at redhat.com  Sat Oct 14 21:34:31 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:34:31 -0700
Subject: rpms/mod_mono import.log,1.3,1.4
Message-ID: <200610142135.k9ELZ3v1018421@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18385

Modified Files:
	import.log 
Log Message:
auto-import mod_mono-1.1.18-1 on branch devel from mod_mono-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Sep 2006 21:46:15 -0000	1.3
+++ import.log	14 Oct 2006 21:34:31 -0000	1.4
@@ -1,2 +1,3 @@
 mod_mono-1_1_17-3:HEAD:mod_mono-1.1.17-3.src.rpm:1157881161
 mod_mono-1_1_17-3:FC-5:mod_mono-1.1.17-3.src.rpm:1157924766
+mod_mono-1_1_18-1:HEAD:mod_mono-1.1.18-1.src.rpm:1160861659



From fedora-extras-commits at redhat.com  Sat Oct 14 21:34:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:34:32 -0700
Subject: rpms/mod_mono/devel .cvsignore, 1.2, 1.3 mod_mono.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610142135.k9ELZ4ea018426@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18385/devel

Modified Files:
	.cvsignore mod_mono.spec sources 
Log Message:
auto-import mod_mono-1.1.18-1 on branch devel from mod_mono-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 09:38:18 -0000	1.2
+++ .cvsignore	14 Oct 2006 21:34:31 -0000	1.3
@@ -1 +1 @@
-mod_mono-1.1.17.tar.gz
+mod_mono-1.1.18.tar.gz


Index: mod_mono.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_mono.spec	10 Sep 2006 09:38:18 -0000	1.1
+++ mod_mono.spec	14 Oct 2006 21:34:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name: mod_mono
-Version: 1.1.17
-Release: 3%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
 License: Apache Software License
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://go-mono.com/sources-latest/
@@ -46,6 +46,9 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
 * Fri Sep 08 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-3
 - Spec file fixes
 - Modified SOURCE0 and URL tags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 09:38:18 -0000	1.2
+++ sources	14 Oct 2006 21:34:31 -0000	1.3
@@ -1 +1 @@
-3f0408a350f6f55029b75f4332be171f  mod_mono-1.1.17.tar.gz
+4b4eaee10dc1a0231a81f64a19d59555  mod_mono-1.1.18.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:07 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:36:07 -0700
Subject: rpms/mod_mono import.log,1.4,1.5
Message-ID: <200610142136.k9ELa9Hh018562@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18527

Modified Files:
	import.log 
Log Message:
auto-import mod_mono-1.1.18-1 on branch FC-5 from mod_mono-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	14 Oct 2006 21:34:31 -0000	1.4
+++ import.log	14 Oct 2006 21:36:07 -0000	1.5
@@ -1,3 +1,4 @@
 mod_mono-1_1_17-3:HEAD:mod_mono-1.1.17-3.src.rpm:1157881161
 mod_mono-1_1_17-3:FC-5:mod_mono-1.1.17-3.src.rpm:1157924766
 mod_mono-1_1_18-1:HEAD:mod_mono-1.1.18-1.src.rpm:1160861659
+mod_mono-1_1_18-1:FC-5:mod_mono-1.1.18-1.src.rpm:1160861755



From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:08 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:36:08 -0700
Subject: rpms/mod_mono/FC-5 .cvsignore, 1.2, 1.3 mod_mono.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610142136.k9ELaAaQ018569@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18527/FC-5

Modified Files:
	.cvsignore mod_mono.spec sources 
Log Message:
auto-import mod_mono-1.1.18-1 on branch FC-5 from mod_mono-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 09:38:18 -0000	1.2
+++ .cvsignore	14 Oct 2006 21:36:07 -0000	1.3
@@ -1 +1 @@
-mod_mono-1.1.17.tar.gz
+mod_mono-1.1.18.tar.gz


Index: mod_mono.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/FC-5/mod_mono.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_mono.spec	10 Sep 2006 09:38:18 -0000	1.1
+++ mod_mono.spec	14 Oct 2006 21:36:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name: mod_mono
-Version: 1.1.17
-Release: 3%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
 License: Apache Software License
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://go-mono.com/sources-latest/
@@ -46,6 +46,9 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
 * Fri Sep 08 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-3
 - Spec file fixes
 - Modified SOURCE0 and URL tags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 09:38:18 -0000	1.2
+++ sources	14 Oct 2006 21:36:07 -0000	1.3
@@ -1 +1 @@
-3f0408a350f6f55029b75f4332be171f  mod_mono-1.1.17.tar.gz
+4b4eaee10dc1a0231a81f64a19d59555  mod_mono-1.1.18.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:15 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:36:15 -0700
Subject: rpms/perl-File-BaseDir - New directory
Message-ID: <200610142136.k9ELaHau018631@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18577/perl-File-BaseDir

Log Message:
Directory /cvs/extras/rpms/perl-File-BaseDir added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:16 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:36:16 -0700
Subject: rpms/perl-File-BaseDir/devel - New directory
Message-ID: <200610142136.k9ELaI9j018634@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18577/perl-File-BaseDir/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-BaseDir/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:33 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:36:33 -0700
Subject: rpms/perl-File-BaseDir Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610142136.k9ELaZCu018686@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18653

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-BaseDir


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-BaseDir
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:36:34 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:36:34 -0700
Subject: rpms/perl-File-BaseDir/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610142136.k9ELaato018689@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18653/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-BaseDir


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:37:08 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:37:08 -0700
Subject: rpms/perl-File-BaseDir/devel perl-File-BaseDir.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610142137.k9ELbArR018773@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18735/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-BaseDir.spec 
Log Message:
auto-import perl-File-BaseDir-0.02-1 on branch devel from perl-File-BaseDir-0.02-1.src.rpm


--- NEW FILE perl-File-BaseDir.spec ---
Name:           perl-File-BaseDir
Version:        0.02
Release:        1%{?dist}
Summary:        Use the freedesktop basedir spec
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-BaseDir/
Source0:        http://www.cpan.org/authors/id/P/PA/PARDUS/File-BaseDir/File-BaseDir-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::DesktopEntry)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module can be used to find directories and files as specified by the
XDG Base Directory Specification. It takes care of defaults and uses
File::Spec to make the output platform specific.

%prep
%setup -q -n File-BaseDir-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Oct 11 2006 Patrice Dumas <pertusus at free.fr> 0.02-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BaseDir/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2006 21:36:34 -0000	1.1
+++ .cvsignore	14 Oct 2006 21:37:08 -0000	1.2
@@ -0,0 +1 @@
+File-BaseDir-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BaseDir/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Oct 2006 21:36:34 -0000	1.1
+++ sources	14 Oct 2006 21:37:08 -0000	1.2
@@ -0,0 +1 @@
+00e2729f364d430350355250cb9007e0  File-BaseDir-0.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:37:07 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:37:07 -0700
Subject: rpms/perl-File-BaseDir import.log,1.1,1.2
Message-ID: <200610142137.k9ELb9Xg018768@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-BaseDir
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18735

Modified Files:
	import.log 
Log Message:
auto-import perl-File-BaseDir-0.02-1 on branch devel from perl-File-BaseDir-0.02-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BaseDir/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2006 21:36:33 -0000	1.1
+++ import.log	14 Oct 2006 21:37:07 -0000	1.2
@@ -0,0 +1 @@
+perl-File-BaseDir-0_02-1:HEAD:perl-File-BaseDir-0.02-1.src.rpm:1160861588



From fedora-extras-commits at redhat.com  Sat Oct 14 21:37:37 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:37:37 -0700
Subject: rpms/xsp/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xsp.spec, 1.11,
	1.12
Message-ID: <200610142137.k9ELbdll018859@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18820/FC-5

Modified Files:
	.cvsignore sources xsp.spec 
Log Message:
auto-import xsp-1.1.18-1 on branch FC-5 from xsp-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Aug 2006 21:59:36 -0000	1.6
+++ .cvsignore	14 Oct 2006 21:37:36 -0000	1.7
@@ -1 +1 @@
-xsp-1.1.17.tar.gz
+xsp-1.1.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2006 21:59:36 -0000	1.6
+++ sources	14 Oct 2006 21:37:36 -0000	1.7
@@ -1 +1 @@
-48988812f6bd57971f65a47d0f491412  xsp-1.1.17.tar.gz
+6c39f7cbdc2f7c59f25bedaf5495721a  xsp-1.1.18.tar.gz


Index: xsp.spec
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/xsp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xsp.spec	31 Aug 2006 21:59:36 -0000	1.11
+++ xsp.spec	14 Oct 2006 21:37:36 -0000	1.12
@@ -1,5 +1,5 @@
 Name:     	xsp
-Version: 	1.1.17
+Version: 	1.1.18
 Release:	1%{?dist}
 License:	BSD
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/xsp*
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
 * Thu Aug 31 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-1
 - bump to new version
 - added patches for architecture independance



From fedora-extras-commits at redhat.com  Sat Oct 14 21:37:36 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:37:36 -0700
Subject: rpms/xsp import.log,1.18,1.19
Message-ID: <200610142137.k9ELbc9N018853@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18820

Modified Files:
	import.log 
Log Message:
auto-import xsp-1.1.18-1 on branch FC-5 from xsp-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xsp/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- import.log	31 Aug 2006 22:01:30 -0000	1.18
+++ import.log	14 Oct 2006 21:37:36 -0000	1.19
@@ -15,3 +15,4 @@
 xsp-1_1_16_1-1:FC-5:xsp-1.1.16.1-1.src.rpm:1155503169
 xsp-1_1_17-1:FC-5:xsp-1.1.17-1.src.rpm:1157061563
 xsp-1_1_17-1:HEAD:xsp-1.1.17-1.src.rpm:1157061679
+xsp-1_1_18-1:FC-5:xsp-1.1.18-1.src.rpm:1160861838



From fedora-extras-commits at redhat.com  Sat Oct 14 21:41:47 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:41:47 -0700
Subject: rpms/perl-File-MimeInfo - New directory
Message-ID: <200610142141.k9ELfnuE020232@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20195/perl-File-MimeInfo

Log Message:
Directory /cvs/extras/rpms/perl-File-MimeInfo added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:41:48 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:41:48 -0700
Subject: rpms/perl-File-MimeInfo/devel - New directory
Message-ID: <200610142141.k9ELfoD2020238@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20195/perl-File-MimeInfo/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-MimeInfo/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 14 21:42:11 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:42:11 -0700
Subject: rpms/perl-File-MimeInfo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610142142.k9ELgDpV020412@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20364

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-MimeInfo


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-MimeInfo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:42:11 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:42:11 -0700
Subject: rpms/perl-File-MimeInfo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610142142.k9ELgD2i020419@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20364/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-MimeInfo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 14 21:42:51 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:42:51 -0700
Subject: rpms/perl-File-MimeInfo import.log,1.1,1.2
Message-ID: <200610142142.k9ELgrk6020688@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20640

Modified Files:
	import.log 
Log Message:
auto-import perl-File-MimeInfo-0.13-2 on branch devel from perl-File-MimeInfo-0.13-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2006 21:42:11 -0000	1.1
+++ import.log	14 Oct 2006 21:42:50 -0000	1.2
@@ -0,0 +1 @@
+perl-File-MimeInfo-0_13-2:HEAD:perl-File-MimeInfo-0.13-2.src.rpm:1160861931



From fedora-extras-commits at redhat.com  Sat Oct 14 21:42:51 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 14:42:51 -0700
Subject: rpms/perl-File-MimeInfo/devel
	perl-File-MimeInfo-0.13-no-ask-option.diff, NONE,
	1.1 perl-File-MimeInfo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610142142.k9ELgrTL020699@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20640/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-MimeInfo-0.13-no-ask-option.diff 
	perl-File-MimeInfo.spec 
Log Message:
auto-import perl-File-MimeInfo-0.13-2 on branch devel from perl-File-MimeInfo-0.13-2.src.rpm

perl-File-MimeInfo-0.13-no-ask-option.diff:

--- NEW FILE perl-File-MimeInfo-0.13-no-ask-option.diff ---
--- /usr/bin/mimeopen	2006-10-11 16:57:53.000000000 +0200
+++ mimeopen	2006-10-11 21:27:45.000000000 +0200
@@ -24,6 +24,7 @@
 	'magic-only'	=> ['M'],
 	'ask'		=> ['a'],
 	'ask-default'	=> ['d'],
+	'no-ask'	=> ['n'],
 );
 
 while ((@ARGV) && ($ARGV[0] =~ /^-/)) {
@@ -153,7 +154,10 @@
 	exit 6;
 }
 
-if ($args{ask}) {
+if ($args{'no-ask'}) {
+	$default = defined($default) ? $default : $other[0];
+}
+elsif ($args{ask}) {
 	$default = choose($mimetype, 0, grep defined($_), $default, @other);
 }
 elsif ($args{'ask-default'}) {
@@ -305,6 +309,12 @@
 
 Print the version of the program and exit.
 
+=item B<-n>, B<--no-ask>
+
+Don't ask the user which program to use. Choose the default program or the 
+first program known to handle the file mimetype. This does not set the 
+default application.
+
 =back
 
 =head1 BUGS


--- NEW FILE perl-File-MimeInfo.spec ---
Name:           perl-File-MimeInfo
Version:        0.13
Release:        2%{?dist}
Summary:        Determine file type and open application
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-MimeInfo/
Source0:        http://www.cpan.org/authors/id/P/PA/PARDUS/File-MimeInfo/File-MimeInfo-%{version}.tar.gz
Patch0:         perl-File-MimeInfo-0.13-no-ask-option.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::BaseDir) perl(File::DesktopEntry)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module can be used to determine the mime type of a file. It tries to
implement the freedesktop specification for a shared MIME database.

%prep
%setup -q -n File-MimeInfo-%{version}
%patch0

%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
%{_bindir}/mimeopen
%{_bindir}/mimetype
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Wed Oct 11 2006 Patrice Dumas <pertusus at free.fr> 0.13-2
- add an option to launch mimeopen non interactively

* Wed Oct 11 2006 Patrice Dumas <pertusus at free.fr> 0.13-1
- Specfile autogenerated by cpanspec 1.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2006 21:42:11 -0000	1.1
+++ .cvsignore	14 Oct 2006 21:42:51 -0000	1.2
@@ -0,0 +1 @@
+File-MimeInfo-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Oct 2006 21:42:11 -0000	1.1
+++ sources	14 Oct 2006 21:42:51 -0000	1.2
@@ -0,0 +1 @@
+f87b07e1608f4380bb3f53154ac671bb  File-MimeInfo-0.13.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 14 21:43:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:43:48 -0700
Subject: rpms/xsp import.log,1.19,1.20
Message-ID: <200610142144.k9ELiKhJ021240@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21038

Modified Files:
	import.log 
Log Message:
auto-import xsp-1.1.18-1 on branch devel from xsp-1.1.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xsp/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	14 Oct 2006 21:37:36 -0000	1.19
+++ import.log	14 Oct 2006 21:43:48 -0000	1.20
@@ -16,3 +16,4 @@
 xsp-1_1_17-1:FC-5:xsp-1.1.17-1.src.rpm:1157061563
 xsp-1_1_17-1:HEAD:xsp-1.1.17-1.src.rpm:1157061679
 xsp-1_1_18-1:FC-5:xsp-1.1.18-1.src.rpm:1160861838
+xsp-1_1_18-1:HEAD:xsp-1.1.18-1.src.rpm:1160862214



From fedora-extras-commits at redhat.com  Sat Oct 14 21:43:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 14:43:49 -0700
Subject: rpms/xsp/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xsp.spec, 1.11,
	1.12
Message-ID: <200610142144.k9ELiLNo021249@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21038/devel

Modified Files:
	.cvsignore sources xsp.spec 
Log Message:
auto-import xsp-1.1.18-1 on branch devel from xsp-1.1.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Aug 2006 22:01:31 -0000	1.6
+++ .cvsignore	14 Oct 2006 21:43:49 -0000	1.7
@@ -1 +1 @@
-xsp-1.1.17.tar.gz
+xsp-1.1.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2006 22:01:31 -0000	1.6
+++ sources	14 Oct 2006 21:43:49 -0000	1.7
@@ -1 +1 @@
-48988812f6bd57971f65a47d0f491412  xsp-1.1.17.tar.gz
+6c39f7cbdc2f7c59f25bedaf5495721a  xsp-1.1.18.tar.gz


Index: xsp.spec
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xsp.spec	31 Aug 2006 22:01:31 -0000	1.11
+++ xsp.spec	14 Oct 2006 21:43:49 -0000	1.12
@@ -1,5 +1,5 @@
 Name:     	xsp
-Version: 	1.1.17
+Version: 	1.1.18
 Release:	1%{?dist}
 License:	BSD
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/xsp*
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
+- bump
+
 * Thu Aug 31 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-1
 - bump to new version
 - added patches for architecture independance



From fedora-extras-commits at redhat.com  Sat Oct 14 22:01:46 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 14 Oct 2006 15:01:46 -0700
Subject: owners owners.list,1.1828,1.1829
Message-ID: <200610142202.k9EM2IJ5026067@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26048

Modified Files:
	owners.list 
Log Message:
add perl-File-DesktopEntry perl-File-BaseDir perl-File-MimeInfo


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1828
retrieving revision 1.1829
diff -u -r1.1828 -r1.1829
--- owners.list	14 Oct 2006 11:52:43 -0000	1.1828
+++ owners.list	14 Oct 2006 22:01:44 -0000	1.1829
@@ -1374,14 +1374,17 @@
 Fedora Extras|perl-ExtUtils-PkgConfig|Simplistic interface to pkg-config|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Feed-Find|Syndication feed auto-discovery|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-BaseDir|Use the freedesktop basedir spec|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,mpeters at mac.com
 Fedora Extras|perl-File-chdir|A more sensible way to change directories|ianburrell at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-DesktopEntry|Object to handle .desktop files|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Fetch|A generic file fetching mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule-PPI|Add support for PPI queries to File::Find::Rule|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-HomeDir|Get the home directory for yourself or other users|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-MMagic-XS|Guess file type with XS|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-MimeInfo|Determine file type and open application|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NFSLock|Perl module to do NFS (or not) locking|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-ReadBackwards|File::ReadBackwards Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Oct 14 22:16:03 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 15:16:03 -0700
Subject: rpms/monodoc/FC-5 monodoc.spec,1.15,1.16
Message-ID: <200610142216.k9EMG5mT026213@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26196

Modified Files:
	monodoc.spec 
Log Message:

FC5 fix 
 	monodoc.spec 



Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/monodoc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- monodoc.spec	14 Oct 2006 21:30:56 -0000	1.15
+++ monodoc.spec	14 Oct 2006 22:16:03 -0000	1.16
@@ -9,7 +9,7 @@
 Summary: The mono documentation system
 Name: monodoc
 Version: 1.1.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -43,7 +43,7 @@
 %endif
 
 %build
-%configure
+%configure --libdir=%{monodir}
 make 
 
 %install
@@ -67,6 +67,9 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-2
+- fc5 fix for pkgconfig
+
 * Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
 - bump
 



From fedora-extras-commits at redhat.com  Sat Oct 14 22:16:45 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 14 Oct 2006 15:16:45 -0700
Subject: rpms/monodoc/devel monodoc.spec,1.17,1.18
Message-ID: <200610142216.k9EMGlih026274@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26257

Modified Files:
	monodoc.spec 
Log Message:

FC5 fix 
 	monodoc.spec 



Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- monodoc.spec	14 Oct 2006 21:32:40 -0000	1.17
+++ monodoc.spec	14 Oct 2006 22:16:45 -0000	1.18
@@ -9,7 +9,7 @@
 Summary: The mono documentation system
 Name: monodoc
 Version: 1.1.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -43,7 +43,7 @@
 %endif
 
 %build
-%configure
+%configure --libdir=%{monodir}
 make 
 
 %install
@@ -67,6 +67,9 @@
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-2
+- fc5 fix for pkgconfig
+
 * Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.18-1
 - bump
 



From fedora-extras-commits at redhat.com  Sun Oct 15 00:23:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 14 Oct 2006 17:23:28 -0700
Subject: rpms/amavisd-new/FC-5 README.quarantine, NONE, 1.1 amavisd.cron,
	NONE, 1.1 .cvsignore, 1.5, 1.6 amavisd-conf.patch, 1.3,
	1.4 amavisd-new.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200610150023.k9F0NULD032528@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32500

Modified Files:
	.cvsignore amavisd-conf.patch amavisd-new.spec sources 
Added Files:
	README.quarantine amavisd.cron 
Log Message:
Sync with devel.


--- NEW FILE README.quarantine ---
To enable quarantine support simply change the following line in
/etc/amavisd/amavisd.conf:

  $QUARANTINEDIR = undef;      # -Q

to

  $QUARANTINEDIR = "$MYHOME/quarantine";      # -Q

then restart amavisd.

The following will make the change for you:

  sed -i.orig -e '/\$QUARANTINEDIR =/s,undef,"$MYHOME/quarantine",' \
      /etc/amavisd/amavisd.conf

PLEASE NOTE:  This is intentionally a manual step.  Before turning on
the quarantine feature of amavisd-new, be sure that there is a
sufficient amount of free space on /var/spool/amavisd/quarantine.
"Sufficient" depends entirely on your environment.

In the default configuration, files in the quarantine directory will
be automatically deleted by tmpwatch after 30 days.  See
/etc/cron.daily/amavisd to adjust this behavior for your environment.


--- NEW FILE amavisd.cron ---
/usr/sbin/tmpwatch 24 /var/spool/amavisd/tmp
/usr/sbin/tmpwatch -d 720 /var/spool/amavisd/quarantine


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2006 00:05:20 -0000	1.5
+++ .cvsignore	15 Oct 2006 00:23:28 -0000	1.6
@@ -1 +1 @@
-amavisd-new-2.4.2.tar.gz
+amavisd-new-2.4.3.tar.gz

amavisd-conf.patch:

Index: amavisd-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amavisd-conf.patch	2 Aug 2006 16:44:07 -0000	1.3
+++ amavisd-conf.patch	15 Oct 2006 00:23:28 -0000	1.4
@@ -1,13 +1,13 @@
---- amavisd-new-2.4.2/amavisd.conf.orig	2006-06-27 06:31:50.000000000 -0500
-+++ amavisd-new-2.4.2/amavisd.conf	2006-07-31 17:31:00.000000000 -0500
+--- amavisd-new-2.4.3/amavisd.conf.orig	2006-10-01 19:02:13.000000000 -0500
++++ amavisd-new-2.4.3/amavisd.conf	2006-10-10 17:46:45.000000000 -0500
 @@ -14,23 +14,23 @@
  # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
  
  $max_servers = 2;            # num of pre-forked children (2..15 is common), -m
 -$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
 -$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
-+$daemon_user  = 'amavis';    # (no default;  customary: vscan or amavis), -u
-+$daemon_group = 'amavis';    # (no default;  customary: vscan or amavis), -g
++$daemon_user  = 'amavis';     # (no default;  customary: vscan or amavis), -u
++$daemon_group = 'amavis';     # (no default;  customary: vscan or amavis), -g
  
  $mydomain = 'example.com';   # a convenient default for other settings
  
@@ -46,7 +46,7 @@
  $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
  
  @addr_extension_virus_maps      = ('virus');
-@@ -111,10 +111,10 @@
+@@ -115,10 +115,10 @@
  # $notify_method  = 'smtp:[127.0.0.1]:10025';
  # $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
  
@@ -61,7 +61,7 @@
  
  # $os_fingerprint_method = 'p0f:127.0.0.1:2345';  # to query p0f-analyzer.pl
  
-@@ -306,10 +306,10 @@
+@@ -318,10 +318,10 @@
  # ['Sophos SAVI', \&sophos_savi ],
  
  # ### http://www.clamav.net/
@@ -73,6 +73,6 @@
 +  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
 +  qr/\bOK$/, qr/\bFOUND$/,
 +  qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
- # # NOTE: the easiest is to run clamd under the same user as amavisd; match the
- # # socket name (LocalSocket) in clamav.conf to the socket name in this entry
- # # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
+ # # NOTE: run clamd under the same user as amavisd, or run it under its own
+ # #   uid such as clamav, add user clamav to the amavis group, and then add
+ # #   AllowSupplementaryGroups to clamd.conf;


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-new.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amavisd-new.spec	2 Aug 2006 16:44:07 -0000	1.6
+++ amavisd-new.spec	15 Oct 2006 00:23:28 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.4.2
+Version:        2.4.3
 Release:        2%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
@@ -12,6 +12,8 @@
 Source2:        amavis-clamd.conf
 Source3:        amavis-clamd.sysconfig
 Source4:        README.fedora
+Source5:        README.quarantine
+Source6:        amavisd.cron
 Patch0:         amavisd-conf.patch
 Patch1:         amavisd-init.patch
 Patch2:         amavisd-condrestart.patch
@@ -19,10 +21,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root/
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
-Requires:       tmpwatch
+Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
 Requires:       bzip2
 Requires:       gzip
-Requires:       lha
+Requires:       arj
 Requires:       cpio
 Requires:       freeze
 Requires:       lzop
@@ -65,7 +67,7 @@
 (MTA) and one or more content checkers: virus scanners, and/or
 Mail::SpamAssassin Perl module. It is written in Perl, assuring high
 reliability, portability and maintainability. It talks to MTA via (E)SMTP
-or LMTP, or by using helper programs. No timing gaps exist in the design,
+or LMTP, or by using helper programs. No timing gaps exist in the design
 which could cause a mail loss.
 
 %prep
@@ -74,7 +76,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p0
-install -m644 %{SOURCE4} README_FILES/
+install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
 
 %build
 
@@ -101,7 +103,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd
 
-mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
+install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
+
+mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db,quarantine}
 touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
 mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/
 
@@ -135,16 +140,32 @@
 %config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
 %config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/clamd.amavisd
+%config(noreplace) %{_sysconfdir}/cron.daily/amavisd
 %{_sbindir}/amavisd
 %{_sbindir}/clamd.amavisd
 %{_bindir}/amavisd-*
 %dir %attr(700,amavis,amavis) /var/spool/amavisd
 %dir %attr(700,amavis,amavis) /var/spool/amavisd/tmp
 %dir %attr(700,amavis,amavis) /var/spool/amavisd/db
+%dir %attr(700,amavis,amavis) /var/spool/amavisd/quarantine
 %dir %attr(755,amavis,amavis) /var/run/amavisd
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Sat Oct 14 2006 Steven Pritchard <steve at kspei.com> 2.4.3-2
+- Fix permissions on the cron.daily script.
+
+* Tue Oct 10 2006 Steven Pritchard <steve at kspei.com> 2.4.3-1
+- Update to 2.4.3.
+- Add quarantine directory and instructions for enabling it.
+- Add tmpwatch cron script.
+
+* Thu Sep 28 2006 Steven Pritchard <steve at kspei.com> 2.4.2-4
+- Drop lha dependency and add arj.
+
+* Sun Sep 17 2006 Steven Pritchard <steve at kspei.com> 2.4.2-3
+- Rebuild.
+
 * Wed Aug 02 2006 Steven Pritchard <steve at kspei.com> 2.4.2-2
 - Fix path to clamd socket in amavisd-conf.patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2006 00:05:20 -0000	1.5
+++ sources	15 Oct 2006 00:23:28 -0000	1.6
@@ -1 +1 @@
-d750176de7481498ebd1011e08a488da  amavisd-new-2.4.2.tar.gz
+7c5f23b1cd523df31d10cf38150e8cea  amavisd-new-2.4.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 01:44:25 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 18:44:25 -0700
Subject: rpms/libpri - New directory
Message-ID: <200610150144.k9F1iRme019802@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19776/libpri

Log Message:
Directory /cvs/extras/rpms/libpri added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 01:44:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 18:44:26 -0700
Subject: rpms/libpri/devel - New directory
Message-ID: <200610150144.k9F1iSKv019805@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19776/libpri/devel

Log Message:
Directory /cvs/extras/rpms/libpri/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 01:44:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 18:44:37 -0700
Subject: rpms/libpri Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610150144.k9F1idkD019854@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19821

Added Files:
	Makefile import.log 
Log Message:
Setup of module libpri


--- NEW FILE Makefile ---
# Top level Makefile for module libpri
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 15 01:44:38 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 18:44:38 -0700
Subject: rpms/libpri/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610150144.k9F1ieim019857@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19821/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libpri


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 15 03:08:34 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Sat, 14 Oct 2006 20:08:34 -0700
Subject: comps comps-fe5.xml.in,1.168,1.169 comps-fe6.xml.in,1.187,1.188
Message-ID: <200610150308.k9F38aT7026145@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26126

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
adding most of my packages to comps.xml, as requested


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- comps-fe5.xml.in	14 Oct 2006 11:52:09 -0000	1.168
+++ comps-fe5.xml.in	15 Oct 2006 03:08:34 -0000	1.169
@@ -242,6 +242,7 @@
       <packagereq type="optional">octave</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">openbabel</packagereq>
+      <packagereq type="optional">orpie</packagereq>
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
@@ -829,8 +830,10 @@
       <packagereq type="optional">qstat</packagereq>
       <packagereq type="optional">rdiff-backup</packagereq>
       <packagereq type="optional">rootsh</packagereq>
+      <packagereq type="optional">rsnapshot</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scrub</packagereq>
+      <packagereq type="optional">sec</packagereq>
       <packagereq type="optional">shorewall</packagereq>
       <packagereq type="optional">snort</packagereq>
       <packagereq type="optional">stripesnoop</packagereq>
@@ -876,6 +879,7 @@
       <packagereq type="optional">rtorrent</packagereq>
       <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">tin</packagereq>
+      <packagereq type="optional">yafc</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- comps-fe6.xml.in	14 Oct 2006 11:52:09 -0000	1.187
+++ comps-fe6.xml.in	15 Oct 2006 03:08:34 -0000	1.188
@@ -296,6 +296,7 @@
       <packagereq type="optional">octave</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">openbabel</packagereq>
+      <packagereq type="optional">orpie</packagereq>
       <packagereq type="optional">osiv</packagereq>
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
@@ -948,8 +949,10 @@
       <packagereq type="optional">qstat</packagereq>
       <packagereq type="optional">rdiff-backup</packagereq>
       <packagereq type="optional">rootsh</packagereq>
+      <packagereq type="optional">rsnapshot</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scrub</packagereq>
+      <packagereq type="optional">sec</packagereq>
       <packagereq type="optional">shorewall</packagereq>
       <packagereq type="optional">smart</packagereq>
       <packagereq type="optional">smart-gui</packagereq>
@@ -1006,6 +1009,7 @@
       <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">tin</packagereq>
       <packagereq type="optional">xprobe2</packagereq>
+      <packagereq type="optional">yafc</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Sun Oct 15 03:22:09 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 20:22:09 -0700
Subject: rpms/manaworld/devel .cvsignore, 1.3, 1.4 manaworld.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200610150322.k9F3MBJ3026201@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26180

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.21




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Jul 2006 02:21:33 -0000	1.3
+++ .cvsignore	15 Oct 2006 03:22:08 -0000	1.4
@@ -1 +1 @@
-tmw-0.0.20.tar.gz
+tmw-0.0.21.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/manaworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- manaworld.spec	2 Sep 2006 03:02:38 -0000	1.3
+++ manaworld.spec	15 Oct 2006 03:22:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           manaworld
-Version:        0.0.20
-Release:        2%{?dist}
+Version:        0.0.21
+Release:        1%{?dist}
 Summary:        2D MMORPG world
 
 Group:          Amusements/Games
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 0.0.21
+- Update to 0.0.21
+
 * Fri Sep 1 2006 Wart <wart at kobold.org> 0.0.20-2
 - Rebuild for Fedora Extras
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2006 02:21:33 -0000	1.3
+++ sources	15 Oct 2006 03:22:08 -0000	1.4
@@ -1 +1 @@
-fa6af4284774d12c98efd6d77bdd4bd7  tmw-0.0.20.tar.gz
+e13a748b8e279fa694db5eb14ac4a8a9  tmw-0.0.21.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 03:23:19 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 20:23:19 -0700
Subject: rpms/manaworld/FC-5 .cvsignore, 1.3, 1.4 manaworld.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610150323.k9F3NLmN026272@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26251

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.21




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Jul 2006 02:23:24 -0000	1.3
+++ .cvsignore	15 Oct 2006 03:23:19 -0000	1.4
@@ -1 +1 @@
-tmw-0.0.20.tar.gz
+tmw-0.0.21.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-5/manaworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- manaworld.spec	28 Jul 2006 02:23:24 -0000	1.2
+++ manaworld.spec	15 Oct 2006 03:23:19 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           manaworld
-Version:        0.0.20
+Version:        0.0.21
 Release:        1%{?dist}
 Summary:        2D MMORPG world
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 0.0.21
+- Update to 0.0.21
+
 * Thu Jul 27 2006 Wart <wart at kobold.org> 0.0.20-1
 - Update to 0.0.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2006 02:23:24 -0000	1.3
+++ sources	15 Oct 2006 03:23:19 -0000	1.4
@@ -1 +1 @@
-fa6af4284774d12c98efd6d77bdd4bd7  tmw-0.0.20.tar.gz
+e13a748b8e279fa694db5eb14ac4a8a9  tmw-0.0.21.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 03:51:12 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 20:51:12 -0700
Subject: rpms/libpri import.log,1.1,1.2
Message-ID: <200610150351.k9F3pEKX027234@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27196

Modified Files:
	import.log 
Log Message:
auto-import libpri-1.4.0-0.fc5.beta1 on branch devel from libpri-1.4.0-0.fc5.beta1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libpri/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2006 01:44:37 -0000	1.1
+++ import.log	15 Oct 2006 03:51:11 -0000	1.2
@@ -0,0 +1 @@
+libpri-1_4_0-0_fc5_beta1:HEAD:libpri-1.4.0-0.fc5.beta1.src.rpm:1160884263



From fedora-extras-commits at redhat.com  Sun Oct 15 03:51:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 20:51:13 -0700
Subject: rpms/libpri/devel libpri-optflags.patch, NONE, 1.1 libpri.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610150351.k9F3pFsL027241@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27196/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libpri-optflags.patch libpri.spec 
Log Message:
auto-import libpri-1.4.0-0.fc5.beta1 on branch devel from libpri-1.4.0-0.fc5.beta1.src.rpm

libpri-optflags.patch:

--- NEW FILE libpri-optflags.patch ---
Index: Makefile
===================================================================
--- Makefile	(revision 344)
+++ Makefile	(working copy)
@@ -38,7 +38,7 @@
 DYNAMIC_LIBRARY=libpri.so.1.0
 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
 DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes $(ALERTING) $(LIBPRI_COUNTERS) $(RPM_OPT_FLAGS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
 SOFLAGS = -Wl,-hlibpri.so.1.0


--- NEW FILE libpri.spec ---
Summary: An implementation of Primary Rate ISDN
Name: libpri
Version: 1.4.0
Release: 0%{?dist}.beta1
License: GPL
Group: System Environment/Libraries
URL: http://www.asterisk.org/

Source0: http://ftp.digium.com/pub/telephony/libpri/releases/libpri-%{version}-beta1.tar.gz
Patch0: libpri-optflags.patch

BuildRoot:  %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)

%description
libpri is a C implementation of the Primary Rate ISDN specification.
It was based on the Bellcore specification SR-NWT-002343 for National
ISDN.  As of May 12, 2001, it has been tested work with NI-2, Nortel
DMS-100, and Lucent 5E Custom protocols on switches from Nortel and
Lucent.

%package devel
Summary: Development files for libpri.
Group: Development/Libraries
Requires: libpri = %{version}-%{release}

%description devel
Development files for libpri.

%prep
%setup0 -q -n %{name}-%{version}-beta1
%patch0 -p0

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make INSTALL_PREFIX=%{buildroot} install
rm %{buildroot}%{_libdir}/libpri.a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files 
%defattr(-,root,root,-)
%doc LICENSE README
%{_libdir}/libpri.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/libpri.h
%{_libdir}/libpri.so

%changelog
* Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
- devel package needs to Require: main package

* Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-0.beta1
- Update to 1.4.0-beta1

* Fri Jun  2 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.3
- Update to 1.2.3
- Add dist tag to release
- Update source URL

* Wed Jan 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-1
- Update to 1.2.2.
- Fix the spelling of Paul Komkoff Jr.'s name.

* Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-4
- Eliminate the libpri-install.patch and other improvements based on suggestions from Paul Komkoff Jr.

* Thu Jan 12 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-3
- Fix building on 64 bit systems.

* Thu Jan 12 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-2
- Changed buildroot to meet FE packaging guidelines
- Don't forget docs
- Modify %%post so that ldconfig dep will be picked up automatically
- Add %%postun so that ldconfig gets run on uninstall
- Don't package the static library
- Changed $RPM_BUILD_ROOT to %%{buildroot} (yes, I know I was consistent before, but I prefer %%{buildroot})

* Wed Jan 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-1
- First version for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpri/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2006 01:44:38 -0000	1.1
+++ .cvsignore	15 Oct 2006 03:51:13 -0000	1.2
@@ -0,0 +1 @@
+libpri-1.4.0-beta1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpri/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2006 01:44:38 -0000	1.1
+++ sources	15 Oct 2006 03:51:13 -0000	1.2
@@ -0,0 +1 @@
+0df4aab74517ff425392cfafc6b97eab  libpri-1.4.0-beta1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 03:57:10 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 20:57:10 -0700
Subject: rpms/libpri/devel libpri.spec,1.1,1.2
Message-ID: <200610150357.k9F3vCEd027712@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27692

Modified Files:
	libpri.spec 
Log Message:
Fix a couple of oopses.


Index: libpri.spec
===================================================================
RCS file: /cvs/extras/rpms/libpri/devel/libpri.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libpri.spec	15 Oct 2006 03:51:13 -0000	1.1
+++ libpri.spec	15 Oct 2006 03:57:10 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: An implementation of Primary Rate ISDN
 Name: libpri
 Version: 1.4.0
-Release: 0%{?dist}.beta1
+Release: 1%{?dist}.beta1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.asterisk.org/
@@ -19,7 +19,7 @@
 Lucent.
 
 %package devel
-Summary: Development files for libpri.
+Summary: Development files for libpri
 Group: Development/Libraries
 Requires: libpri = %{version}-%{release}
 
@@ -56,6 +56,10 @@
 %{_libdir}/libpri.so
 
 %changelog
+* Sat Oct 14 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
+- Get rid of pesky "." in -devel summary.
+- Remove zaptel-devel BR
+
 * Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
 - devel package needs to Require: main package
 



From fedora-extras-commits at redhat.com  Sun Oct 15 04:02:27 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 14 Oct 2006 21:02:27 -0700
Subject: check-mirrors return-mirrorlist.py,1.16,1.17
Message-ID: <200610150402.k9F42Ri9030706@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30677

Modified Files:
	return-mirrorlist.py 
Log Message:
Fixed an issue where when defaulting to global lists a python trace would result



Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- return-mirrorlist.py	30 Aug 2006 02:21:16 -0000	1.16
+++ return-mirrorlist.py	15 Oct 2006 04:02:23 -0000	1.17
@@ -21,7 +21,7 @@
 # - Note, this script does have some dependancies on the file list
 #    This should be removed in later versions
 # - Top has SQL Injection issues. needs an isint()
-debug = False
+debug = True
 
 import os
 import sys
@@ -90,7 +90,10 @@
         if results == 0:
             if self.country != 'global':
                 print '# No results found for country: %s\n# Defaulting to global' % self.country
-                self.printMirrors(repo, arch, 'global')
+		#self.country='global'
+                self.countrySQL=''
+                self.printMirrors()
+                #self.printMirrors(self.repo, self.arch, 'global')
             else:
                 print '# no mirrors found, using default'
                 return False



From fedora-extras-commits at redhat.com  Sun Oct 15 04:05:51 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 14 Oct 2006 21:05:51 -0700
Subject: rpms/cairomm/devel .cvsignore, 1.4, 1.5 cairomm.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200610150405.k9F45rWn030753@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30730

Modified Files:
	.cvsignore cairomm.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Aug 2006 19:51:06 -0000	1.4
+++ .cvsignore	15 Oct 2006 04:05:50 -0000	1.5
@@ -1 +1 @@
-cairomm-1.2.0.tar.gz
+cairomm-1.2.2.tar.gz


Index: cairomm.spec
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/cairomm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cairomm.spec	28 Aug 2006 02:11:02 -0000	1.5
+++ cairomm.spec	15 Oct 2006 04:05:50 -0000	1.6
@@ -1,11 +1,11 @@
 Summary:          Cairomm is the C++ API for the cairo graphics library
 Name:             cairomm
-Version:          1.2.0
-Release:          4%{?dist}
-URL:		  http://www.cairographics.org
-License:	  LGPL
+Version:          1.2.2
+Release:          1%{?dist}
+URL:              http://www.cairographics.org
+License:          LGPL
 Group:            System Environment/Libraries
-Source:		  http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
+Source:           http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cairo-devel >= 1.2.0 pkgconfig
 
@@ -18,7 +18,7 @@
 Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       cairo-devel >= 1.0.4 pkgconfig
+Requires:       cairo-devel >= 1.2.0 pkgconfig
 
 %description    devel
 This package contains the libraries and header files needed for
@@ -57,6 +57,9 @@
 %doc ChangeLog reference
 
 %changelog
+* Sat Oct 14 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.2.2-1
+- New upstream release
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.2.0-4
 - Bumped release for make tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Aug 2006 19:51:06 -0000	1.4
+++ sources	15 Oct 2006 04:05:50 -0000	1.5
@@ -1 +1 @@
-ee326b8e7cb7eeb843fa56412eb162de  cairomm-1.2.0.tar.gz
+fabb040a5ff2cf0529af55ff46d22d2d  cairomm-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 04:08:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 14 Oct 2006 21:08:56 -0700
Subject: rpms/osgal/devel .cvsignore, 1.3, 1.4 osgal.spec, 1.4, 1.5 sources, 
	1.3, 1.4 osgal-20060714-link.patch, 1.1, NONE
Message-ID: <200610150408.k9F48wkS030844@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30817

Modified Files:
	.cvsignore osgal.spec sources 
Removed Files:
	osgal-20060714-link.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Sep 2006 22:04:13 -0000	1.3
+++ .cvsignore	15 Oct 2006 04:08:56 -0000	1.4
@@ -1 +1 @@
-osgal-cvs-20060714.tar.gz
+osgal-cvs-20060903.tar.gz


Index: osgal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/osgal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- osgal.spec	3 Sep 2006 21:08:38 -0000	1.4
+++ osgal.spec	15 Oct 2006 04:08:56 -0000	1.5
@@ -1,12 +1,11 @@
 Name:           osgal
-Version:        20060714
-Release:        2%{?dist}
+Version:        20060903
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.vrlab.umu.se/research/osgAL
 Source0:        http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz
-Patch0:         %{name}-%{version}-link.patch
 BuildRoot:      %{_tmppath}/%{name}-cvs-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  OpenSceneGraph-devel openalpp-devel freealut-devel libvorbis-devel
 BuildRequires:  libGL-devel autoconf automake libtool
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n %{name}-cvs-%{version}
-%patch0 -p0 -b .link~
 autoreconf --force --install
 
 # Fix rpmlint errors
@@ -64,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sat Oct 14 2006 Christopher Stone <chris.stone at gmail.com> 20060903-1
+- Upstream sync
+
 * Sun Sep 03 2006 Christopher Stone <chris.stone at gmail.com> 20060714-2
 - Add patch for better linking
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Sep 2006 22:04:13 -0000	1.3
+++ sources	15 Oct 2006 04:08:56 -0000	1.4
@@ -1 +1 @@
-5226c8db9159fe60dcf10829f91d1941  osgal-cvs-20060714.tar.gz
+92e67bc580900b9a98ba31e18b47c5f3  osgal-cvs-20060903.tar.gz


--- osgal-20060714-link.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 04:15:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 14 Oct 2006 21:15:10 -0700
Subject: rpms/osgal/FC-5 .cvsignore, 1.3, 1.4 osgal.spec, 1.4, 1.5 sources,
	1.3, 1.4 osgal-20060714-link.patch, 1.1, NONE
Message-ID: <200610150415.k9F4FCIX030984@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30963

Modified Files:
	.cvsignore osgal.spec sources 
Removed Files:
	osgal-20060714-link.patch 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgal/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Sep 2006 22:20:19 -0000	1.3
+++ .cvsignore	15 Oct 2006 04:15:09 -0000	1.4
@@ -1 +1 @@
-osgal-cvs-20060714.tar.gz
+osgal-cvs-20060903.tar.gz


Index: osgal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgal/FC-5/osgal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- osgal.spec	3 Sep 2006 21:22:36 -0000	1.4
+++ osgal.spec	15 Oct 2006 04:15:09 -0000	1.5
@@ -1,12 +1,11 @@
 Name:           osgal
-Version:        20060714
-Release:        2%{?dist}
+Version:        20060903
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.vrlab.umu.se/research/osgAL
 Source0:        http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz
-Patch0:         %{name}-%{version}-link.patch
 BuildRoot:      %{_tmppath}/%{name}-cvs-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  OpenSceneGraph-devel openalpp-devel freealut-devel libvorbis-devel
 BuildRequires:  libGL-devel autoconf automake libtool
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n %{name}-cvs-%{version}
-%patch0 -p0 -b .link~
 autoreconf --force --install
 
 # Fix rpmlint errors
@@ -64,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sat Oct 14 2006 Christopher Stone <chris.stone at gmail.com> 20060903-1
+- Upstream sync
+
 * Sun Sep 03 2006 Christopher Stone <chris.stone at gmail.com> 20060714-2
 - Add patch for better linking
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgal/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Sep 2006 22:20:19 -0000	1.3
+++ sources	15 Oct 2006 04:15:09 -0000	1.4
@@ -1 +1 @@
-5226c8db9159fe60dcf10829f91d1941  osgal-cvs-20060714.tar.gz
+92e67bc580900b9a98ba31e18b47c5f3  osgal-cvs-20060903.tar.gz


--- osgal-20060714-link.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 04:33:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 14 Oct 2006 21:33:13 -0700
Subject: rpms/libpri/devel libpri.spec,1.2,1.3
Message-ID: <200610150433.k9F4XjxX031093@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libpri/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31076

Modified Files:
	libpri.spec 
Log Message:
Fix lib paths for 64 bit systems.


Index: libpri.spec
===================================================================
RCS file: /cvs/extras/rpms/libpri/devel/libpri.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libpri.spec	15 Oct 2006 03:57:10 -0000	1.2
+++ libpri.spec	15 Oct 2006 04:33:12 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: An implementation of Primary Rate ISDN
 Name: libpri
 Version: 1.4.0
-Release: 1%{?dist}.beta1
+Release: 2%{?dist}.beta1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.asterisk.org/
@@ -29,6 +29,7 @@
 %prep
 %setup0 -q -n %{name}-%{version}-beta1
 %patch0 -p0
+%{__perl} -pi -e 's|\$\(INSTALL_BASE\)/lib|%{_libdir}|g' Makefile
 
 %build
 make %{?_smp_mflags}
@@ -56,6 +57,9 @@
 %{_libdir}/libpri.so
 
 %changelog
+* Sat Oct 14 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
+- Fix lib paths for 64 bit systems.
+
 * Sat Oct 14 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
 - Get rid of pesky "." in -devel summary.
 - Remove zaptel-devel BR



From fedora-extras-commits at redhat.com  Sun Oct 15 04:34:39 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 14 Oct 2006 21:34:39 -0700
Subject: check-mirrors mirrorStats.py,NONE,1.1
Message-ID: <200610150434.k9F4Yd90031159@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31142

Added Files:
	mirrorStats.py 
Log Message:
extracts specific information from the mirror logs for archive



--- NEW FILE mirrorStats.py ---
#!/usr/bin/python

# TODO: Determine if adding this to the returnmirrors script will impact
#       performance

import md5
import sqlite
import sys

debug = 0

def errorprint(error):
    print >> sys.stderr, error

def debugprint(debugmsg):
    if debug:
        print debugmsg
try:
	fp = open(sys.argv[1], 'r')
except:
	print 'please specify a valid filename'
	sys.exit(1)

try:
    for line in fp:
        ip = md5.new(line.split(' ')[0]).hexdigest()
        url = line.split(' ')[6]
	date = line.split(' ')[3]
        try: 
            args = url.split('?')[1].split('&')
        except:
            pass
        else:
            # Get our repo and arch flags
            for arg in args:
                if arg.split('=')[0].lower() == 'repo' and arg.split('=')[-1].lower() != 'repo':
                    repo = arg.split('=')[1].lower()
                if arg.split('=')[0].lower() == 'arch' and arg.split('=')[-1].lower() != 'arch':
                    arch = arg.split('=')[1].lower()
            print "%s %s %s %s" % (date, ip, repo, arch)
finally:
    fp.close()



From fedora-extras-commits at redhat.com  Sun Oct 15 05:17:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 22:17:23 -0700
Subject: rpms/bsd-games/devel bsd-games-2.17-banner-rename.patch, NONE,
	1.1 bsd-games.spec, 1.7, 1.8 config.params, 1.2, 1.3
Message-ID: <200610150517.k9F5HPiv001723@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1701

Modified Files:
	bsd-games.spec config.params 
Added Files:
	bsd-games-2.17-banner-rename.patch 
Log Message:
Add back the 'banner' program as 'vert-banner'



bsd-games-2.17-banner-rename.patch:

--- NEW FILE bsd-games-2.17-banner-rename.patch ---
--- banner/banner.6.orig	2006-10-14 21:24:31.000000000 -0700
+++ banner/banner.6	2006-10-14 21:25:12.000000000 -0700
@@ -30,10 +30,10 @@
 .\"	@(#)banner.6	8.2 (Berkeley) 4/29/95
 .\"
 .Dd April 29, 1995
-.Dt BANNER 6
+.Dt VERT-BANNER 6
 .Os
 .Sh NAME
-.Nm banner
+.Nm vert-banner
 .Nd print large banner on printer
 .Sh SYNOPSIS
 .Nm


Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bsd-games.spec	28 Aug 2006 13:46:53 -0000	1.7
+++ bsd-games.spec	15 Oct 2006 05:17:22 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -18,8 +18,9 @@
 Patch5: bsd-games-2.17-tetrisgid.patch
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
-# Add patch for monop->mpoly man page
+# Add patches for man page renames
 Patch8: bsd-games-2.17-monop-rename.patch
+Patch9: bsd-games-2.17-banner-rename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libtermcap-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
@@ -43,6 +44,7 @@
 %patch6 -p1 -b .hackgid
 %patch7 -p1 -b .phantasiagid
 %patch8 -p1 -b .monop.rename
+%patch9 -p0 -b .banner.rename
 
 %build
 # We include a templatized configuration settings file to set
@@ -76,6 +78,11 @@
 mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly
 mv $RPM_BUILD_ROOT/%{_mandir}/man6/monop.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/mpoly.6.gz
 
+# Change the binary name for banner to prevent a conflict with a Fedora
+# package with the same name
+mv $RPM_BUILD_ROOT/%{_bindir}/banner $RPM_BUILD_ROOT/%{_bindir}/vert-banner
+mv $RPM_BUILD_ROOT/%{_mandir}/man6/banner.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/vert-banner.6.gz
+
 # Remove this doc file.  We're copying it to a different location for Fedora.
 rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me
 
@@ -126,6 +133,7 @@
 %{_bindir}/snscore
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
+%{_bindir}/vert-banner
 %{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
@@ -153,6 +161,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 2.17-15
+- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> 2.17-14
 - Rebuild for Fedora Extras
 


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/config.params,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.params	1 May 2006 23:59:29 -0000	1.2
+++ config.params	15 Oct 2006 05:17:22 -0000	1.3
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@



From fedora-extras-commits at redhat.com  Sun Oct 15 05:35:21 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 22:35:21 -0700
Subject: rpms/bsd-games/FC-5 bsd-games.spec,1.4,1.5 config.params,1.2,1.3
Message-ID: <200610150535.k9F5ZN6g001839@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1820

Modified Files:
	bsd-games.spec config.params 
Log Message:
- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-5/bsd-games.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsd-games.spec	20 Jun 2006 21:54:34 -0000	1.4
+++ bsd-games.spec	15 Oct 2006 05:35:20 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -18,8 +18,9 @@
 Patch5: bsd-games-2.17-tetrisgid.patch
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
-# Add patch for monop->mpoly man page
+# Add patches for man page renames
 Patch8: bsd-games-2.17-monop-rename.patch
+Patch9: bsd-games-2.17-banner-rename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libtermcap-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
@@ -43,6 +44,7 @@
 %patch6 -p1 -b .hackgid
 %patch7 -p1 -b .phantasiagid
 %patch8 -p1 -b .monop.rename
+%patch9 -p0 -b .banner.rename
 
 %build
 # We include a templatized configuration settings file to set
@@ -76,6 +78,11 @@
 mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly
 mv $RPM_BUILD_ROOT/%{_mandir}/man6/monop.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/mpoly.6.gz
 
+# Change the binary name for banner to prevent a conflict with a Fedora
+# package with the same name
+mv $RPM_BUILD_ROOT/%{_bindir}/banner $RPM_BUILD_ROOT/%{_bindir}/vert-banner
+mv $RPM_BUILD_ROOT/%{_mandir}/man6/banner.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/vert-banner.6.gz
+
 # Remove this doc file.  We're copying it to a different location for Fedora.
 rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me
 
@@ -126,6 +133,7 @@
 %{_bindir}/snscore
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
+%{_bindir}/vert-banner
 %{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
@@ -153,6 +161,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 2.17-12
+- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
+
 * Tue Jun 20 2006 Wart <wart at kobold.org> 2.17-11
 - Added missing BR: flex, bison
 - Rename monop man page to match the renamed executable.


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-5/config.params,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.params	2 May 2006 00:12:02 -0000	1.2
+++ config.params	15 Oct 2006 05:35:20 -0000	1.3
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@



From fedora-extras-commits at redhat.com  Sun Oct 15 05:37:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 14 Oct 2006 22:37:48 -0700
Subject: rpms/bsd-games/FC-5 bsd-games-2.17-banner-rename.patch,NONE,1.1
Message-ID: <200610150537.k9F5boD7001913@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1895

Added Files:
	bsd-games-2.17-banner-rename.patch 
Log Message:
Patch to rename the banner executable name in the man page.



bsd-games-2.17-banner-rename.patch:

--- NEW FILE bsd-games-2.17-banner-rename.patch ---
--- banner/banner.6.orig	2006-10-14 21:24:31.000000000 -0700
+++ banner/banner.6	2006-10-14 21:25:12.000000000 -0700
@@ -30,10 +30,10 @@
 .\"	@(#)banner.6	8.2 (Berkeley) 4/29/95
 .\"
 .Dd April 29, 1995
-.Dt BANNER 6
+.Dt VERT-BANNER 6
 .Os
 .Sh NAME
-.Nm banner
+.Nm vert-banner
 .Nd print large banner on printer
 .Sh SYNOPSIS
 .Nm



From fedora-extras-commits at redhat.com  Sun Oct 15 07:44:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 00:44:53 -0700
Subject: rpms/lua/devel lua.spec,1.19,1.20
Message-ID: <200610150744.k9F7itsC008260@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lua/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8243

Modified Files:
	lua.spec 
Log Message:
* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-2
- Only link /usr/bin/lua with readline / do not link %{_libdir}/liblua-5.1.so
  with readline so that we don't cause any License troubles for packages
  linking against liblua-5.1.so, otherwise lua could drag the GPL only readline
  lib into the linking of non GPL apps.



Index: lua.spec
===================================================================
RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lua.spec	14 Oct 2006 20:32:35 -0000	1.19
+++ lua.spec	15 Oct 2006 07:44:53 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           lua
 Version:        5.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Powerful light-weight programming language
 Group:          Development/Languages
 License:        MIT
@@ -40,7 +40,9 @@
 
 %build
 %configure --with-readline
-make %{?_smp_mflags} 
+# hack so that only /usr/bin/lua gets linked with readline as it is the
+# only one which needs this and otherwise we get License troubles
+make %{?_smp_mflags} LIBS="-ldl" luac_LDADD="liblua.la -lm -ldl"
 
 
 %install
@@ -69,6 +71,12 @@
 
 
 %changelog
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-2
+- Only link /usr/bin/lua with readline / do not link %%{_libdir}/liblua-5.1.so
+  with readline so that we don't cause any License troubles for packages
+  linking against liblua-5.1.so, otherwise lua could drag the GPL only readline
+  lib into the linking of non GPL apps.
+
 * Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 5.1.1-1
 - New upstream release 5.1.1
 - Fix detection of readline during compile (iow add readline support back)



From fedora-extras-commits at redhat.com  Sun Oct 15 07:59:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 00:59:27 -0700
Subject: rpms/perl-PAR-Dist/FC-5 .cvsignore, 1.11, 1.12 perl-PAR-Dist.spec, 
	1.15, 1.16 sources, 1.11, 1.12
Message-ID: <200610150759.k9F7xTbv008467@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-PAR-Dist/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8430/FC-5

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.21-1
- 0.21.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Oct 2006 06:37:52 -0000	1.11
+++ .cvsignore	15 Oct 2006 07:59:27 -0000	1.12
@@ -1 +1 @@
-PAR-Dist-0.20.tar.gz
+PAR-Dist-0.21.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/perl-PAR-Dist.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-PAR-Dist.spec	12 Oct 2006 06:37:52 -0000	1.15
+++ perl-PAR-Dist.spec	15 Oct 2006 07:59:27 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.20
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.21-1
+- 0.21.
+
 * Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
 - 0.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Oct 2006 06:37:52 -0000	1.11
+++ sources	15 Oct 2006 07:59:27 -0000	1.12
@@ -1 +1 @@
-471da0751f63f8f4ea609b8ea08de964  PAR-Dist-0.20.tar.gz
+0cd2f70204c234905c8906057ae84e21  PAR-Dist-0.21.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 07:59:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 00:59:28 -0700
Subject: rpms/perl-PAR-Dist/devel .cvsignore, 1.11, 1.12 perl-PAR-Dist.spec, 
	1.15, 1.16 sources, 1.11, 1.12
Message-ID: <200610150759.k9F7xUxO008473@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-PAR-Dist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8430/devel

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.21-1
- 0.21.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Oct 2006 06:37:53 -0000	1.11
+++ .cvsignore	15 Oct 2006 07:59:28 -0000	1.12
@@ -1 +1 @@
-PAR-Dist-0.20.tar.gz
+PAR-Dist-0.21.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-PAR-Dist.spec	12 Oct 2006 06:37:53 -0000	1.15
+++ perl-PAR-Dist.spec	15 Oct 2006 07:59:28 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.20
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.21-1
+- 0.21.
+
 * Thu Oct 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.20-1
 - 0.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PAR-Dist/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Oct 2006 06:37:53 -0000	1.11
+++ sources	15 Oct 2006 07:59:28 -0000	1.12
@@ -1 +1 @@
-471da0751f63f8f4ea609b8ea08de964  PAR-Dist-0.20.tar.gz
+0cd2f70204c234905c8906057ae84e21  PAR-Dist-0.21.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 08:22:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 01:22:26 -0700
Subject: rpms/rpmlint/FC-5 rpmlint-0.78-svn-fixes.patch, NONE,
	1.1 rpmlint.config, 1.1, 1.2 rpmlint.spec, 1.25, 1.26
Message-ID: <200610150822.k9F8Mw39011595@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11554/FC-5

Modified Files:
	rpmlint.config rpmlint.spec 
Added Files:
	rpmlint-0.78-svn-fixes.patch 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-2
- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
- Filter messages about gpg-pubkeys for now.


rpmlint-0.78-svn-fixes.patch:

--- NEW FILE rpmlint-0.78-svn-fixes.patch ---
Index: TagsCheck.py
===================================================================
--- TagsCheck.py	(revision 1282)
+++ TagsCheck.py	(revision 1289)
@@ -595,7 +595,7 @@
                 if not ret:
                     printWarning(pkg, 'no-version-in-last-changelog')
                 elif version and release:
-                    srpm=pkg[rpm.RPMTAG_SOURCERPM]
+                    srpm = pkg[rpm.RPMTAG_SOURCERPM] or ''
                     # only check when source name correspond to name
                     if srpm[0:-8] == '%s-%s-%s' % (name, version, release):
                         expected=version + '-' + release
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1282)
+++ FilesCheck.py	(revision 1289)
@@ -228,8 +228,12 @@
 text_characters = "".join(map(chr, range(32, 127)) + list("\n\r\t\b"))
 _null_trans = string.maketrans("", "")
 
-def istextfile(f):
-    s=open(f).read(512)
+def istextfile(f, pkg):
+    try:
+        s = open(f).read(512)
+    except Exception, e: # eg. https://bugzilla.redhat.com/209876
+        printWarning(pkg, 'read-error', e)
+        return 0
 
     if "\0" in s:
         return 0
@@ -589,7 +593,7 @@
             if stat.S_ISREG(mode):
                 path=pkg.dirName() + '/' + f
                 if os.access(path, os.R_OK):
-                    if istextfile(path):
+                    if istextfile(path, pkg):
                         line=open(path).readline()
                         res=None
                         # ignore perl module shebang -- TODO: disputed...
@@ -917,6 +921,12 @@
 packaged as arch dependent, or something else.  Verify what the case is, and
 if there's no way to produce useful debuginfo out of it, disable creation of
 the debuginfo package.''',
+
+'read-error',
+'''This file could not be read.  A reason for this could be that the info about
+it in the rpm header indicates that it is supposed to be a readable normal file
+but it actually is not in the filesystem.  Because of this, some checks will
+be skipped.''',
 )
 
 # FilesCheck.py ends here
Index: Pkg.py
===================================================================
--- Pkg.py	(revision 1282)
+++ Pkg.py	(revision 1289)
@@ -58,17 +58,21 @@
 
 # utilities
 
+var_regex=re.compile('^(.*)\${?(\w+)}?(.*)$')
+
 def shell_var_value(var, script):
-    assign_regex=re.compile(re.escape(var) + '\s*=\s*(.+)\s*(#.*)*$',
+    assign_regex=re.compile('\\b' + re.escape(var) + '\s*=\s*(.+)\s*(#.*)*$',
                             re.MULTILINE)
     res=assign_regex.search(script)
     if res:
+        res2 = var_regex.search(res.group(1))
+        if res2:
+            if res2.group(2) == var: # infinite loop
+                return None
         return substitute_shell_vars(res.group(1), script)
     else:
         return None
 
-var_regex=re.compile('^(.*)\${?([^}]+)}?(.*)$')
-
 def substitute_shell_vars(val, script):
     res=var_regex.search(val)
     if res:
Index: rpmlint.py
===================================================================
--- rpmlint.py	(revision 1282)
+++ rpmlint.py	(revision 1289)
@@ -98,6 +98,8 @@
                     f=os.path.abspath(os.path.join(d, i))
                     st=os.stat(f)
                     if stat.S_ISREG(st[stat.ST_MODE]):
+                        if f[-4:] != '.rpm' and f[-4:] != '.spm':
+                            continue
                         try:
                             pkg=Pkg.Pkg(f, extract_dir)
                             runChecks(pkg)
Index: BinariesCheck.py
===================================================================
--- BinariesCheck.py	(revision 1282)
+++ BinariesCheck.py	(revision 1289)
@@ -32,7 +32,7 @@
     undef_regex=re.compile('^undefined symbol:\s+(\S+)')
     debug_file_regex=re.compile('\.debug$')
 
-    def __init__(self, pkg, path, file):
+    def __init__(self, pkg, path, file, is_ar):
         self.objdump_error=0
         self.needed=[]
         self.rpath=[]
@@ -75,7 +75,7 @@
 
         # undefined symbol check makes sense only for installed packages
         # skip debuginfo: https://bugzilla.redhat.com/190599
-        if not is_debug and isinstance(pkg, Pkg.InstalledPkg):
+        if not is_ar and not is_debug and isinstance(pkg, Pkg.InstalledPkg):
             # We could do this with objdump, but it's _much_ simpler with ldd.
             res = Pkg.getstatusoutput(('env', 'LC_ALL=C', 'ldd', '-d', '-r', path))
             if not res[0]:
@@ -89,7 +89,6 @@
 path_regex=re.compile('(.*/)([^/]+)')
 numeric_dir_regex=re.compile('/usr(?:/share)/man/man./(.*)\.[0-9](?:\.gz|\.bz2)')
 versioned_dir_regex=re.compile('[^.][0-9]')
-binary_regex=re.compile('ELF|current ar archive')
 usr_share=re.compile('^/usr/share/')
 etc=re.compile('^/etc/')
 not_stripped=re.compile('not stripped')
@@ -137,7 +136,7 @@
         binary_in_usr_lib=0
         has_usr_lib_file=0
 
-        res=srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM])
+        res = srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM] or '')
         if res:
             multi_pkg=(pkg.name != res.group(1))
         else:
@@ -149,7 +148,9 @@
                 break
 
         for i in info:
-            is_binary=binary_regex.search(i[1])
+            is_elf = string.find(i[1], 'ELF') != -1
+            is_ar = string.find(i[1], 'current ar archive') != -1
+            is_binary = is_elf or is_ar
 
             if is_binary:
                 binary=binary+1
@@ -175,7 +176,7 @@
                             printWarning(pkg, 'unstripped-binary-or-object', i[0])
 
                         # inspect binary file
-                        bin_info=BinaryInfo(pkg, pkg.dirName()+i[0], i[0])
+                        bin_info=BinaryInfo(pkg, pkg.dirName()+i[0], i[0], is_ar)
 
                         # so name in library
                         if so_regex.search(i[0]):
Index: I18NCheck.py
===================================================================
--- I18NCheck.py	(revision 1282)
+++ I18NCheck.py	(revision 1289)
@@ -99,7 +99,7 @@
         locales=[]                      # list of locales for this packages
         webapp=False
 
-        i18n_tags = pkg[HEADER_I18NTABLE]
+        i18n_tags = pkg[HEADER_I18NTABLE] or ()
         #i18n_files = pkg.langFiles()
 
         for i in i18n_tags:
Index: InitScriptCheck.py
===================================================================
--- InitScriptCheck.py	(revision 1282)
+++ InitScriptCheck.py	(revision 1289)
@@ -71,7 +71,10 @@
                 lsb_tags = {}
                 # check common error in file content
                 fd=open(pkg.dirName() + '/' + f, 'r')
-                for line in fd.readlines():
+                content = fd.readlines()
+                fd.close()
+                content_str = "".join(content)
+                for line in content:
                     line = line[:-1] # chomp
                     # TODO check if there is only one line like this
                     if line.startswith('### BEGIN INIT INFO'):
@@ -131,7 +134,7 @@
                         if name != basename:
                             error=1
                             if name[0] == '$':
-                                value=Pkg.substitute_shell_vars(name, line)
+                                value = Pkg.substitute_shell_vars(name, content_str)
                                 if value == basename:
                                     error=0
                             if error:


Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmlint.config	29 Jun 2006 20:29:39 -0000	1.1
+++ rpmlint.config	15 Oct 2006 08:22:26 -0000	1.2
@@ -55,3 +55,4 @@
 addFilter("-debuginfo no-documentation")
 addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
+addFilter(" gpg-pubkey ")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rpmlint.spec	23 Sep 2006 21:37:34 -0000	1.25
+++ rpmlint.spec	15 Oct 2006 08:22:26 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.78
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -10,6 +10,7 @@
 Source1:        %{name}.config
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
+Patch2:         %{name}-0.78-svn-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +32,7 @@
 %setup -q
 %patch0
 %patch1
+%patch2
 sed -i -e /MenuCheck/d Config.py
 
 
@@ -65,6 +67,10 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-2
+- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
+- Filter messages about gpg-pubkeys for now.
+
 * Sun Sep 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-1
 - 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
 - /etc/profile.d/* filtering no longer needed.



From fedora-extras-commits at redhat.com  Sun Oct 15 08:22:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 01:22:26 -0700
Subject: rpms/rpmlint/devel rpmlint-0.78-svn-fixes.patch, NONE,
	1.1 rpmlint.config, 1.3, 1.4 rpmlint.spec, 1.26, 1.27
Message-ID: <200610150822.k9F8Mwo9011599@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11554/devel

Modified Files:
	rpmlint.config rpmlint.spec 
Added Files:
	rpmlint-0.78-svn-fixes.patch 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-2
- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
- Filter messages about gpg-pubkeys for now.


rpmlint-0.78-svn-fixes.patch:

--- NEW FILE rpmlint-0.78-svn-fixes.patch ---
Index: TagsCheck.py
===================================================================
--- TagsCheck.py	(revision 1282)
+++ TagsCheck.py	(revision 1289)
@@ -595,7 +595,7 @@
                 if not ret:
                     printWarning(pkg, 'no-version-in-last-changelog')
                 elif version and release:
-                    srpm=pkg[rpm.RPMTAG_SOURCERPM]
+                    srpm = pkg[rpm.RPMTAG_SOURCERPM] or ''
                     # only check when source name correspond to name
                     if srpm[0:-8] == '%s-%s-%s' % (name, version, release):
                         expected=version + '-' + release
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1282)
+++ FilesCheck.py	(revision 1289)
@@ -228,8 +228,12 @@
 text_characters = "".join(map(chr, range(32, 127)) + list("\n\r\t\b"))
 _null_trans = string.maketrans("", "")
 
-def istextfile(f):
-    s=open(f).read(512)
+def istextfile(f, pkg):
+    try:
+        s = open(f).read(512)
+    except Exception, e: # eg. https://bugzilla.redhat.com/209876
+        printWarning(pkg, 'read-error', e)
+        return 0
 
     if "\0" in s:
         return 0
@@ -589,7 +593,7 @@
             if stat.S_ISREG(mode):
                 path=pkg.dirName() + '/' + f
                 if os.access(path, os.R_OK):
-                    if istextfile(path):
+                    if istextfile(path, pkg):
                         line=open(path).readline()
                         res=None
                         # ignore perl module shebang -- TODO: disputed...
@@ -917,6 +921,12 @@
 packaged as arch dependent, or something else.  Verify what the case is, and
 if there's no way to produce useful debuginfo out of it, disable creation of
 the debuginfo package.''',
+
+'read-error',
+'''This file could not be read.  A reason for this could be that the info about
+it in the rpm header indicates that it is supposed to be a readable normal file
+but it actually is not in the filesystem.  Because of this, some checks will
+be skipped.''',
 )
 
 # FilesCheck.py ends here
Index: Pkg.py
===================================================================
--- Pkg.py	(revision 1282)
+++ Pkg.py	(revision 1289)
@@ -58,17 +58,21 @@
 
 # utilities
 
+var_regex=re.compile('^(.*)\${?(\w+)}?(.*)$')
+
 def shell_var_value(var, script):
-    assign_regex=re.compile(re.escape(var) + '\s*=\s*(.+)\s*(#.*)*$',
+    assign_regex=re.compile('\\b' + re.escape(var) + '\s*=\s*(.+)\s*(#.*)*$',
                             re.MULTILINE)
     res=assign_regex.search(script)
     if res:
+        res2 = var_regex.search(res.group(1))
+        if res2:
+            if res2.group(2) == var: # infinite loop
+                return None
         return substitute_shell_vars(res.group(1), script)
     else:
         return None
 
-var_regex=re.compile('^(.*)\${?([^}]+)}?(.*)$')
-
 def substitute_shell_vars(val, script):
     res=var_regex.search(val)
     if res:
Index: rpmlint.py
===================================================================
--- rpmlint.py	(revision 1282)
+++ rpmlint.py	(revision 1289)
@@ -98,6 +98,8 @@
                     f=os.path.abspath(os.path.join(d, i))
                     st=os.stat(f)
                     if stat.S_ISREG(st[stat.ST_MODE]):
+                        if f[-4:] != '.rpm' and f[-4:] != '.spm':
+                            continue
                         try:
                             pkg=Pkg.Pkg(f, extract_dir)
                             runChecks(pkg)
Index: BinariesCheck.py
===================================================================
--- BinariesCheck.py	(revision 1282)
+++ BinariesCheck.py	(revision 1289)
@@ -32,7 +32,7 @@
     undef_regex=re.compile('^undefined symbol:\s+(\S+)')
     debug_file_regex=re.compile('\.debug$')
 
-    def __init__(self, pkg, path, file):
+    def __init__(self, pkg, path, file, is_ar):
         self.objdump_error=0
         self.needed=[]
         self.rpath=[]
@@ -75,7 +75,7 @@
 
         # undefined symbol check makes sense only for installed packages
         # skip debuginfo: https://bugzilla.redhat.com/190599
-        if not is_debug and isinstance(pkg, Pkg.InstalledPkg):
+        if not is_ar and not is_debug and isinstance(pkg, Pkg.InstalledPkg):
             # We could do this with objdump, but it's _much_ simpler with ldd.
             res = Pkg.getstatusoutput(('env', 'LC_ALL=C', 'ldd', '-d', '-r', path))
             if not res[0]:
@@ -89,7 +89,6 @@
 path_regex=re.compile('(.*/)([^/]+)')
 numeric_dir_regex=re.compile('/usr(?:/share)/man/man./(.*)\.[0-9](?:\.gz|\.bz2)')
 versioned_dir_regex=re.compile('[^.][0-9]')
-binary_regex=re.compile('ELF|current ar archive')
 usr_share=re.compile('^/usr/share/')
 etc=re.compile('^/etc/')
 not_stripped=re.compile('not stripped')
@@ -137,7 +136,7 @@
         binary_in_usr_lib=0
         has_usr_lib_file=0
 
-        res=srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM])
+        res = srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM] or '')
         if res:
             multi_pkg=(pkg.name != res.group(1))
         else:
@@ -149,7 +148,9 @@
                 break
 
         for i in info:
-            is_binary=binary_regex.search(i[1])
+            is_elf = string.find(i[1], 'ELF') != -1
+            is_ar = string.find(i[1], 'current ar archive') != -1
+            is_binary = is_elf or is_ar
 
             if is_binary:
                 binary=binary+1
@@ -175,7 +176,7 @@
                             printWarning(pkg, 'unstripped-binary-or-object', i[0])
 
                         # inspect binary file
-                        bin_info=BinaryInfo(pkg, pkg.dirName()+i[0], i[0])
+                        bin_info=BinaryInfo(pkg, pkg.dirName()+i[0], i[0], is_ar)
 
                         # so name in library
                         if so_regex.search(i[0]):
Index: I18NCheck.py
===================================================================
--- I18NCheck.py	(revision 1282)
+++ I18NCheck.py	(revision 1289)
@@ -99,7 +99,7 @@
         locales=[]                      # list of locales for this packages
         webapp=False
 
-        i18n_tags = pkg[HEADER_I18NTABLE]
+        i18n_tags = pkg[HEADER_I18NTABLE] or ()
         #i18n_files = pkg.langFiles()
 
         for i in i18n_tags:
Index: InitScriptCheck.py
===================================================================
--- InitScriptCheck.py	(revision 1282)
+++ InitScriptCheck.py	(revision 1289)
@@ -71,7 +71,10 @@
                 lsb_tags = {}
                 # check common error in file content
                 fd=open(pkg.dirName() + '/' + f, 'r')
-                for line in fd.readlines():
+                content = fd.readlines()
+                fd.close()
+                content_str = "".join(content)
+                for line in content:
                     line = line[:-1] # chomp
                     # TODO check if there is only one line like this
                     if line.startswith('### BEGIN INIT INFO'):
@@ -131,7 +134,7 @@
                         if name != basename:
                             error=1
                             if name[0] == '$':
-                                value=Pkg.substitute_shell_vars(name, line)
+                                value = Pkg.substitute_shell_vars(name, content_str)
                                 if value == basename:
                                     error=0
                             if error:


Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmlint.config	23 Sep 2006 21:37:35 -0000	1.3
+++ rpmlint.config	15 Oct 2006 08:22:26 -0000	1.4
@@ -55,3 +55,4 @@
 addFilter("-debuginfo no-documentation")
 addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
+addFilter(" gpg-pubkey ")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rpmlint.spec	23 Sep 2006 21:37:35 -0000	1.26
+++ rpmlint.spec	15 Oct 2006 08:22:26 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.78
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -10,6 +10,7 @@
 Source1:        %{name}.config
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
+Patch2:         %{name}-0.78-svn-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +32,7 @@
 %setup -q
 %patch0
 %patch1
+%patch2
 sed -i -e /MenuCheck/d Config.py
 
 
@@ -65,6 +67,10 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-2
+- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
+- Filter messages about gpg-pubkeys for now.
+
 * Sun Sep 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.78-1
 - 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
 - /etc/profile.d/* filtering no longer needed.



From fedora-extras-commits at redhat.com  Sun Oct 15 11:01:27 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sun, 15 Oct 2006 04:01:27 -0700
Subject: rpms/pan/devel .cvsignore, 1.11, 1.12 pan.spec, 1.20, 1.21 sources, 
	1.11, 1.12
Message-ID: <200610151102.k9FB24AO021257@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18311

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
Update to current upstream version 0.116 (beta tree)
Fixes build problem on x86_64: http://bugzilla.gnome.org/show_bug.cgi?id=358654




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Oct 2006 10:29:08 -0000	1.11
+++ .cvsignore	15 Oct 2006 11:01:27 -0000	1.12
@@ -1 +1 @@
-pan-0.115.tar.bz2
+pan-0.116.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pan.spec	2 Oct 2006 10:29:08 -0000	1.20
+++ pan.spec	15 Oct 2006 11:01:27 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.115
+Version:	0.116
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 15 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.116-1
+- Update to 0.116
+
 * Mon Oct 02 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.115-1
 - Update to 0.115 (last `big change' release before 1.0)
 - removed unnecessary Patch0 pan-0.99-gi18n.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Oct 2006 10:29:08 -0000	1.11
+++ sources	15 Oct 2006 11:01:27 -0000	1.12
@@ -1 +1 @@
-45174cd93f9b1b9e3466cd8a74436c23  pan-0.115.tar.bz2
+590587dea07f23f5e87562fdddd67d4a  pan-0.116.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 15 12:28:14 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:28:14 -0700
Subject: extras-buildsys/utils/pushscript/yum - New directory
Message-ID: <200610151228.k9FCSEZS030738@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30719/yum

Log Message:
Directory /cvs/fedora/extras-buildsys/utils/pushscript/yum added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 12:28:19 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:28:19 -0700
Subject: extras-buildsys/utils/pushscript/repomd - New directory
Message-ID: <200610151228.k9FCSJ8O030761@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/repomd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30719/repomd

Log Message:
Directory /cvs/fedora/extras-buildsys/utils/pushscript/repomd added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 12:28:20 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:28:20 -0700
Subject: extras-buildsys/utils/pushscript/rpmUtils - New directory
Message-ID: <200610151228.k9FCSKBw030766@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/rpmUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30719/rpmUtils

Log Message:
Directory /cvs/fedora/extras-buildsys/utils/pushscript/rpmUtils added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 12:30:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:30:46 -0700
Subject: extras-buildsys/utils/pushscript/repomd __init__.py, NONE,
	1.1 mdErrors.py, NONE, 1.1 mdUtils.py, NONE,
	1.1 packageObject.py, NONE, 1.1 packageSack.py, NONE,
	1.1 repoMDObject.py, NONE, 1.1 test.py, NONE, 1.1
Message-ID: <200610151230.k9FCUkkj030926@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/repomd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805/repomd

Added Files:
	__init__.py mdErrors.py mdUtils.py packageObject.py 
	packageSack.py repoMDObject.py test.py 
Log Message:
Add the patched yum 2.6.1 here, so we remove the dependency on the
system-installed one.




--- NEW FILE __init__.py ---


--- NEW FILE mdErrors.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University


import exceptions

class RepoMDError(exceptions.Exception):
    def __init__(self, args=None):
        exceptions.Exception.__init__(self)    
        self.args = args
        

class PackageSackError(exceptions.Exception):
    def __init__(self, args=None):
        exceptions.Exception.__init__(self)
        self.args = args


--- NEW FILE mdUtils.py ---
#!/usr/bin/python -tt

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

import rpm
import types

def rpmOutToStr(arg):
    if type(arg) != types.StringType:
    # and arg is not None:
        arg = str(arg)
        
    return arg
    

def compareEVR((e1, v1, r1), (e2, v2, r2)):
    # return 1: a is newer than b
    # 0: a and b are the same version
    # -1: b is newer than a
    e1 = rpmOutToStr(e1)
    v1 = rpmOutToStr(v1)
    r1 = rpmOutToStr(r1)
    e2 = rpmOutToStr(e2)
    v2 = rpmOutToStr(v2)
    r2 = rpmOutToStr(r2)
    #print '%s, %s, %s vs %s, %s, %s' % (e1, v1, r1, e2, v2, r2)
    rc = rpm.labelCompare((e1, v1, r1), (e2, v2, r2))
    #print '%s, %s, %s vs %s, %s, %s = %s' % (e1, v1, r1, e2, v2, r2, rc)
    return rc

def newestInList(pkgs):
    # return the newest in the list of packages
    ret = [ pkgs.pop() ]
    newest = ret[0].returnEVR()
    for pkg in pkgs:
        rc = compareEVR(pkg.returnEVR(), newest)
        if rc > 0:
            ret = [ pkg ]
            newest = pkg.returnEVR()
        elif rc == 0:
            ret.append(pkg)
    return ret

###########
# Title: Remove duplicates from a sequence
# Submitter: Tim Peters 
# From: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560                      
    
def unique(s):
    """Return a list of the elements in s, but without duplicates.

    For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3],
    unique("abcabc") some permutation of ["a", "b", "c"], and
    unique(([1, 2], [2, 3], [1, 2])) some permutation of
    [[2, 3], [1, 2]].

    For best speed, all sequence elements should be hashable.  Then
    unique() will usually work in linear time.

    If not possible, the sequence elements should enjoy a total
    ordering, and if list(s).sort() doesn't raise TypeError it's
    assumed that they do enjoy a total ordering.  Then unique() will
    usually work in O(N*log2(N)) time.

    If that's not possible either, the sequence elements must support
    equality-testing.  Then unique() will usually work in quadratic
    time.
    """

    n = len(s)
    if n == 0:
        return []

    # Try using a dict first, as that's the fastest and will usually
    # work.  If it doesn't work, it will usually fail quickly, so it
    # usually doesn't cost much to *try* it.  It requires that all the
    # sequence elements be hashable, and support equality comparison.
    u = {}
    try:
        for x in s:
            u[x] = 1
    except TypeError:
        del u  # move on to the next method
    else:
        return u.keys()

    # We can't hash all the elements.  Second fastest is to sort,
    # which brings the equal elements together; then duplicates are
    # easy to weed out in a single pass.
    # NOTE:  Python's list.sort() was designed to be efficient in the
    # presence of many duplicate elements.  This isn't true of all
    # sort functions in all languages or libraries, so this approach
    # is more effective in Python than it may be elsewhere.
    try:
        t = list(s)
        t.sort()
    except TypeError:
        del t  # move on to the next method
    else:
        assert n > 0
        last = t[0]
        lasti = i = 1
        while i < n:
            if t[i] != last:
                t[lasti] = last = t[i]
                lasti += 1
            i += 1
        return t[:lasti]

    # Brute force is all that's left.
    u = []
    for x in s:
        if x not in u:
            u.append(x)
    return u


--- NEW FILE packageObject.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

import mdUtils

# consider making an XMLPackageObject
# BasePackageObject - with just methods and the init'd storage dicts
# XMLPackageobject will be used to build the rpmXMLPAckageObject - which is 
# formatnode stuff for rpm.


class PackageObject:
    """Base Package Object - sets up the default storage dicts and the
       most common returns"""
       
    def __init__(self):
        self.simple = {} # simple things, name, arch, e,v,r, size, etc
        self.checksums = [] # (type, checksum, id(0,1)

    def __str__(self):
        return self.returnNevraPrintable()

    def returnSimple(self, varname):
        return self.simple[varname]

    def simpleItems(self):
        return self.simple.keys()            

    def returnID(self):
        return self.returnSimple('id')

    def returnPackageTuple(self):
        return (self.returnSimple('name'), self.returnSimple('arch'), 
                self.returnSimple('epoch'),self.returnSimple('version'), 
                self.returnSimple('release'))
        
    def returnNevraTuple(self):
        return (self.returnSimple('name'), self.returnSimple('epoch'), 
                self.returnSimple('version'),self.returnSimple('release'), 
                self.returnSimple('arch'))
    
    def returnNevraPrintable(self):
        """return printable string for the pkgname/object
           name - epoch:ver-rel.arch"""
        if self.returnSimple('epoch') == '0':
            string = '%s - %s-%s.%s' % (self.returnSimple('name'), 
                                        self.returnSimple('version'),
                                        self.returnSimple('release'), 
                                        self.returnSimple('arch'))
        else:
            string = '%s - %s:%s-%s.%s' % (self.returnSimple('name'), 
                                           self.returnSimple('epoch'), 
                                           self.returnSimple('version'), 
                                           self.returnSimple('release'), 
                                           self.returnSimple('arch'))
        return string                                           

    def returnEVR(self):
        """returns a tuple of epoch, ver, rel"""
        return (self.returnSimple('epoch'), self.returnSimple('version'), self.returnSimple('release'))
        
        return                            

    def returnChangelog(self):
        """return changelog entries"""
        return self.changelog

class XMLPackageObject(PackageObject):
    """inherits from PackageObject, does the functions to parse an xml package format
       file to pull packages in"""

    def __init__(self):
        PackageObject.__init__(self)
        
    def parseVersion(self, node):
        """takes a version element, returns a tuple of (epoch, ver, rel)"""
        epoch = node.GetAttribute('epoch')
        ver = node.GetAttribute('ver')
        rel = node.GetAttribute('rel')
        return (epoch, ver, rel)
        
    def parseChecksum(self, node):
        """takes a checksum element, returns a tuple of (type, checksum, 
           if it is the checksum to be used for the the package id)"""
           
        csumtype = node.GetAttribute('type')
        csumid = node.GetAttribute('pkgid')
        if csumid is None or csumid.upper() == 'NO':
            csumid = 0
        elif csumid.upper() == 'YES':
            csumid = 1
        else:
            #FIXME - raise an exception
            print 'broken csumid - invalid document'
            csumid = 0
        node.Read()
        csum = node.Value()
        return (csumtype, csum, csumid)
        
    def parseSize(self, node):
        """takes a size element, returns  package, 
           installed and archive size"""
           
        pkg = node.GetAttribute('package')
        installed = node.GetAttribute('installed')
        archive = node.GetAttribute('archive')
        return pkg, installed, archive

    def parseTime(self, node):
        """takes a time element, returns buildtime, filetime(mtime)"""
         
        build = node.GetAttribute('build')
        mtime = node.GetAttribute('file')
        return build, mtime

    def parseLocation(self, node):
        """takes a location element, returnsbase url path, relative path to package"""
        
        base = node.GetAttribute('base')
        relative = node.GetAttribute('href')
        return base, relative
        
    def parseSimple(self, node):
        """takes a simple unattributed CDATA element and returns its value"""
        if node.IsEmptyElement():
            return ''
        node.Read() # get the next node
        return node.Value()
        
    def readPkgNode(self, reader):
        """primary package node reading and dumping"""
        
        mydepth = reader.Depth()
        ret = reader.Read()        
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue

            if reader.NodeType() == 15 and reader.Depth() == mydepth:
                return
                
            if reader.NodeType() == 1:
                if reader.Depth() == mydepth:
                    #print 'oh crap - we are outside - how did that happen??'
                    return

                nodeName = reader.LocalName()

                if nodeName in ['name', 'arch', 'summary', 'description', 
                                'url', 'packager', 'buildtime', 'filetime']:
                                     
                    self.simple[nodeName] = self.parseSimple(reader)

                elif nodeName == 'version': 
                    (self.simple['epoch'], self.simple['version'], 
                     self.simple['release']) = self.parseVersion(reader)
            
                elif nodeName == 'size':
                    self.simple['packagesize'], self.simple['installedsize'], \
                     self.simple['archivesize'] = self.parseSize(reader)
            
                elif nodeName == 'time':
                    self.simple['buildtime'], self.simple['filetime'], = \
                     self.parseTime(reader)
                     
                
                elif nodeName == 'location':
                    self.simple['basepath'], self.simple['relativepath'] = \
                     self.parseLocation(reader)
    
                elif nodeName == 'checksum':
                    (sumtype, sumdata, sumid) = self.parseChecksum(reader)
                    self.checksums.append((sumtype, sumdata, sumid))
                    if sumid:
                        self.simple['id'] = sumdata
                    
                elif nodeName == 'format':
                    try:
                        self.readFormatNode(reader)
                    except AttributeError:
                        # FIXME - should raise an exception
                        print 'No method to handle format element'
                else:
                    pass
                    # FIXME - should raise an exception
                    print 'unknown element in package: %s' % nodeName
    
            ret = reader.Read()
            continue
    

class RpmBase:
    """return functions and storage for rpm-specific data"""

    def __init__(self):
        self.prco = {}
        self.prco['obsoletes'] = [] # (name, flag, (e,v,r))
        self.prco['conflicts'] = [] # (name, flag, (e,v,r))
        self.prco['requires'] = [] # (name, flag, (e,v,r))
        self.prco['provides'] = [] # (name, flag, (e,v,r))
        self.files = {}
        self.files['file'] = []
        self.files['dir'] = []
        self.files['ghost'] = []
        self.changelog = [] # (ctime, cname, ctext)
        self.licenses = []
    
    def returnPrco(self, prcotype):
        """return list of provides, requires, conflicts or obsoletes"""
        if self.prco.has_key(prcotype):
            return self.prco[prcotype]
        else:
            return []

    def checkPrco(self, prcotype, prcotuple):
        """returns 1 or 0 if the pkg contains the requested tuple/tuple range"""
        # get rid of simple cases - nothing
        if not self.prco.has_key(prcotype):
            return 0
        # exact match    
        if prcotuple in self.prco[prcotype]:
            return 1
        else:
            # make us look it up and compare
            (reqn, reqf, (reqe, reqv ,reqr)) = prcotuple
            if reqf is not None:
                if self.inPrcoRange(prcotype, prcotuple):
                    return 1
                else:
                    return 0
            else:
                for (n, f, (e, v, r)) in self.returnPrco(prcotype):
                    if reqn == n:
                        return 1

        return 0
                
    def inPrcoRange(self, prcotype, reqtuple):
        """returns true if the package has a the prco that satisfies 
           the reqtuple range, assume false.
           Takes: prcotype, requested prco tuple"""
        # we only ever get here if we have a versioned prco
        # nameonly shouldn't ever raise it
        (reqn, reqf, (reqe, reqv, reqr)) = reqtuple
        # find the named entry in pkgobj, do the comparsion
        for (n, f, (e, v, r)) in self.returnPrco(prcotype):
            if reqn == n:
                # found it
                if f != 'EQ':
                    # isn't this odd, it's not 'EQ' - it really should be
                    # use the pkgobj's evr for the comparison
                    (e, v, r) = self.returnEVR()
                # and you thought we were done having fun
                # if the requested release is left out then we have
                # to remove release from the package prco to make sure the match
                # is a success - ie: if the request is EQ foo 1:3.0.0 and we have 
                # foo 1:3.0.0-15 then we have to drop the 15 so we can match
                if reqr is None:
                    r = None
                if reqe is None:
                    e = None
                if reqv is None: # just for the record if ver is None then we're going to segfault
                    v = None
                rc = mdUtils.compareEVR((e, v, r), (reqe, reqv, reqr))
                
                if rc >= 1:
                    if reqf in ['GT', 'GE', 4, 12]:
                        return 1
                if rc == 0:
                    if reqf in ['GE', 'LE', 'EQ', 8, 10, 12]:
                        return 1
                if rc <= -1:
                    if reqf in ['LT', 'LE', 2, 10]:
                        return 1
        return 0
        
    def returnChangelog(self):
        """return changelog entries"""
        return self.changelog
        
    def returnFileEntries(self, ftype='file'):
        """return list of files based on type"""
        if self.files.has_key(ftype):
            return self.files[ftype]
        else:
            return []
            
    def returnFileTypes(self):
        """return list of types of files in the package"""
        return self.files.keys()
    
    
    
class RpmXMLPackageObject(XMLPackageObject, RpmBase):
    """used class - inherits from XMLPackageObject, which inherits from 
       Package Object also inherits from RpmBase for return functions"""
       
    def __init__(self, node, repoid):
        XMLPackageObject.__init__(self)
        RpmBase.__init__(self)

        self.simple['repoid'] = repoid

        self.readPkgNode(node)
        self.repoid = repoid

    def dumpPkg(self):
        fconv = { 'EQ':'=', 'LT':'<', 'LE':'<=',
                  'GT':'>', 'GE':'>='} 
        for item in self.simpleItems():
            print '%s = %s' % (item, self.returnSimple(item))
        for csum in self.checksums:
            print csum
        for thing in ['requires', 'provides', 'obsoletes', 'conflicts']:
            if len(self.prco[thing]) > 0:
                print '%s:' % thing
                for (n,f,(e,v,r)) in self.prco[thing]:
                    if f is None:
                        print '\t%s ' % n
                    else:
                        print '\t',
                        print n,
                        print fconv[f],
                        print '%s:%s-%s' %(e,v,r)
                print ''
                    
                    
    
    def readFormatNode(self, reader):
        """reads the <format> element and hands off the elements to be 
           parsed elsewhere"""
           
        mydepth = reader.Depth()
        ret = reader.Read()        
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue

            if reader.NodeType() == 15 and reader.Depth() == mydepth:
                return
                
            if reader.NodeType() == 1:
                if reader.Depth() == mydepth:
                    #print 'oh crap - we are outside - how did that happen??'
                    return

                nodeName = reader.LocalName()

                if nodeName in ['vendor', 'group', 'buildhost', 'sourcerpm']:
                    self.simple[nodeName] = self.parseSimple(reader)
                    
                elif nodeName == 'license':
                    self.licenses.append(self.parseSimple(reader))
                
                elif nodeName == 'header-range':
                    self.simple['hdrstart'], self.simple['hdrend'] = \
                     self.parseHdrRange(reader)
                
                elif nodeName in ['obsoletes', 'provides', 'requires', 'conflicts']:
                    objlist = self.parsePrco(reader)
                    self.prco[nodeName].extend(objlist)
                    
                elif nodeName == 'file':
                    self.loadFileEntry(reader)
                    
                    
                else:
                    # FIXME - should raise an exception
                    print 'unknown element in format: %s' % nodeName
                    #pass

            ret = reader.Read()
            continue

    
    def parseHdrRange(self, node):
        """parse header-range, returns (start, end) tuple"""
        
        start = node.GetAttribute('start')
        end = node.GetAttribute('end')
        return start, end
        
    def parsePrco(self, reader):
        """parse a provides,requires,obsoletes,conflicts element"""
        objlist = []
        mydepth = reader.Depth()
        ret = reader.Read()        
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue

            if reader.NodeType() == 15 and reader.Depth() == mydepth:
                return objlist
                
            if reader.NodeType() == 1:
                if reader.Depth() == mydepth:
                    #print 'oh crap - we are outside - how did that happen??'
                    return objlist

                prcoName = reader.LocalName()
                
                if prcoName == 'entry':
                    name = reader.GetAttribute('name')
                    flag = reader.GetAttribute('flags')
                    e = reader.GetAttribute('epoch')
                    v = reader.GetAttribute('ver')
                    r = reader.GetAttribute('rel')
                    pre = reader.GetAttribte('pre')
                    objlist.append((name, flag, (e, v, r), pre))

            ret = reader.Read()
            continue
            
        return objlist

    def loadFileEntry(self, node):
        """load a file/dir entry"""
        ftype = node.GetAttribute('type')
        node.Read() # content is file
        file = node.Value()
        if not ftype:
            ftype = 'file'
        if not self.files.has_key(ftype):
            self.files[ftype] = []
        #if file not in self.files[ftype]:
        self.files[ftype].append(file)

        return (ftype, file)
            
    def loadChangeLogEntry(self, node):
        """load changelog data"""
        time = node.GetAttribute('date')
        author = node.GetAttribute('author')
        node.Read()
        content = node.Value()
        self.changelog.append((time, author, content))
        


--- NEW FILE packageSack.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

import libxml2
from mdErrors import PackageSackError
import mdUtils

class PackageSack:
    """represents sets (sacks) of Package Objects"""
    def __init__(self):
        self.nevra = {} #nevra[(Name, Epoch, Version, Release, Arch)] = []
        self.obsoletes = {} #obs[obsoletename] = [pkg1, pkg2, pkg3] 
                 #the package lists are packages that obsolete the key name
        self.requires = {} #req[reqname] = [pkg1, pkg2, pkg3]
                 #the package lists are packages that require the key name
        self.provides = {} #ditto of above but for provides
        self.conflicts = {} #ditto of above but for conflicts
        self.filenames = {} # duh
        self.pkgsByRepo = {} #pkgsByRepo['repoid']= [pkg1, pkg2, pkg3]
        self.pkgsByID = {} #pkgsById[pkgid] = [pkg1, pkg2] (should really only ever be one value but
                           #you might have repos with the same package in them
        self.compatarchs = None # dict of compatible archs for addPackage
        self.indexesBuilt = 0
        
        
    def __len__(self):
        return len(self.simplePkgList())
    
    def __iter__(self):
        if hasattr(self.returnPackages(), '__iter__'):
            return self.returnPackages().__iter__()
        else:
            return iter(self.returnPackages())

    def _checkIndexes(self, failure='error'):
        """check to see if the indexes are built, if not do what failure demands
           either error out or build the indexes, default is to error out"""
           
        if not self.indexesBuilt:
            if failure == 'error':
                raise PackageSackError, 'Indexes not yet built, cannot search'
            elif failure == 'build':
                self.buildIndexes()

    def packagesByTuple(self, pkgtup):
        """return a list of package objects by (n,a,e,v,r) tuple"""
        (n,a,e,v,r) = pkgtup
        return self.searchNevra(name=n, arch=a, epoch=e, ver=v, rel=r)
        
    def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
        """return list of pkgobjects matching the nevra requested"""
        self._checkIndexes(failure='build')
        if self.nevra.has_key((name, epoch, ver, rel, arch)):
            return self.nevra[(name, epoch, ver, rel, arch)]
        else:
            return []
           
        
    def searchID(self, pkgid):
        """return list of packages based on pkgid"""
        self._checkIndexes(failure='build')        
        if self.pkgsByID.has_key(pkgid):
            return self.pkgsByID[pkgid]
        else:
            return []
            
    def searchRequires(self, name):
        """return list of package requiring the name (any evr and flag)"""
        self._checkIndexes(failure='build')        
        if self.requires.has_key(name):
            return self.requires[name]
        else:
            return []

    def searchProvides(self, name):
        """return list of package providing the name (any evr and flag)"""
        # FIXME - should this do a pkgobj.checkPrco((name, flag, (e,v,r,))??
        # has to do a searchFiles and a searchProvides for things starting with /
        self._checkIndexes(failure='build')        
        returnList = []
        if name[0] == '/':
             returnList.extend(self.searchFiles(name))
        if self.provides.has_key(name):
            returnList.extend(self.provides[name])
        return returnList

    def searchConflicts(self, name):
        """return list of package conflicting with the name (any evr and flag)"""
        self._checkIndexes(failure='build')        
        if self.conflicts.has_key(name):
            return self.conflicts[name]
        else:
            return []

    def searchObsoletes(self, name):
        """return list of package obsoleting the name (any evr and flag)"""
        self._checkIndexes(failure='build')        
        if self.obsoletes.has_key(name):
            return self.obsoletes[name]
        else:
            return []

    def returnObsoletes(self):
        """returns a dict of obsoletes dict[obsoleting pkgtuple] = [list of obs]"""
        obs = {}
        for po in self.returnPackages():
            pkgtuple = po.returnPackageTuple()
            if len(po.returnPrco('obsoletes')) == 0:
                continue

            if not obs.has_key(pkgtuple):
                obs[pkgtuple] = po.returnPrco('obsoletes')
            else:
                obs[pkgtuple].extend(po.returnPrco('obsoletes'))
        
        return obs
        
    def searchFiles(self, file):
        """return list of packages by filename
           FIXME - need to add regex match against keys in file list
        """
        self._checkIndexes(failure='build')
        if self.filenames.has_key(file):
            return self.filenames[file]
        else:
            return []

    def _addToDictAsList(self, dict, key, data):
        if not dict.has_key(key):
            dict[key] = []
        #if data not in dict[key]: - if I enable this the whole world grinds to a halt
        # need a faster way of looking for the object in any particular list
        dict[key].append(data)

    def _delFromListOfDict(self, dict, key, data):
        if not dict.has_key(key):
            dict[key] = []
        try:
            dict[key].remove(data)
        except ValueError:
            pass
            
        if len(dict[key]) == 0: # if it's an empty list of the dict, then kill it
            del dict[key]
            
            
    def addPackage(self, obj):
        """add a pkgobject to the packageSack"""

        repoid = obj.returnSimple('repoid')
        (name, epoch, ver, rel, arch) = obj.returnNevraTuple()
        
        if self.compatarchs:
            if self.compatarchs.has_key(arch):
                self._addToDictAsList(self.pkgsByRepo, repoid, obj)
        else:
            self._addToDictAsList(self.pkgsByRepo, repoid, obj)


    def buildIndexes(self):
        """builds the useful indexes for searching/querying the packageSack
           This should be called after all the necessary packages have been 
           added/deleted"""
        
        # blank out the indexes
        self.obsoletes = {}
        self.requires = {}
        self.provides = {}
        self.conflicts = {}
        self.filenames = {}
        self.nevra = {}
        self.pkgsByID = {}
        
        for repoid in self.pkgsByRepo.keys():
            for obj in self.pkgsByRepo[repoid]:
            # store the things provided just on name, not the whole require+version
            # this lets us reduce the set of pkgs to search when we're trying to depSolve
                for (n, fl, (e,v,r)) in obj.returnPrco('obsoletes'):
                    self._addToDictAsList(self.obsoletes, n, obj)
                for (n, fl, (e,v,r)) in obj.returnPrco('requires'):
                    self._addToDictAsList(self.requires, n, obj)
                for (n, fl, (e,v,r)) in obj.returnPrco('provides'):
                    self._addToDictAsList(self.provides, n, obj)
                for (n, fl, (e,v,r)) in obj.returnPrco('conflicts'):
                    self._addToDictAsList(self.conflicts, n, obj)
                for ftype in obj.returnFileTypes():
                    for file in obj.returnFileEntries(ftype):
                        self._addToDictAsList(self.filenames, file, obj)
                self._addToDictAsList(self.pkgsByID, obj.returnSimple('id'), obj)
                (name, epoch, ver, rel, arch) = obj.returnNevraTuple()
                self._addToDictAsList(self.nevra, (name, epoch, ver, rel, arch), obj)
                self._addToDictAsList(self.nevra, (name, None, None, None, None), obj)
        
        self.indexesBuilt = 1
        

        
    def delPackage(self, obj):
        """delete a pkgobject"""
        self._delFromListOfDict(self.pkgsByRepo, obj.returnSimple('repoid'), obj)
        if self.indexesBuilt: # if we've built indexes, delete it b/c we've just deleted something
            self.indexesBuilt = 0
        
    def returnPackages(self, repoid=None):
        """return list of all packages, takes optional repoid"""
        returnList = []
        if repoid is None:
            for repo in self.pkgsByRepo.keys():
                returnList.extend(self.pkgsByRepo[repo])
        else:
            try:
                returnList = self.pkgsByRepo[repoid]
            except KeyError:
                # nothing to return
                pass
        
        return returnList

    def returnNewestByNameArch(self, naTup=None):
        """return list of newest packages based on name, arch matching
           this means(in name.arch form): foo.i386 and foo.noarch are not 
           compared to each other for highest version only foo.i386 and 
           foo.i386 will be compared"""
        highdict = {}
        # If naTup is set, only iterate through packages that match that
        # name
        if (naTup):
            where = self.nevra.get((naTup[0],None,None,None,None))
            if (not where):
                raise PackageSackError, 'No Package Matching %s.%s' % naTup
        else:
            where = self.returnPackages()

        for pkg in where:
            (n, e, v ,r, a) = pkg.returnNevraTuple()
            if not highdict.has_key((n, a)):
                highdict[(n, a)] = pkg
            else:
                pkg2 = highdict[(n, a)]
                (e2, v2, r2) = pkg2.returnEVR()
                rc = mdUtils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[(n, a)] = pkg
        
        if naTup:
            if highdict.has_key(naTup):
                return highdict[naTup]
            else:
                raise PackageSackError, 'No Package Matching %s.%s' % naTup
        
        return highdict.values()
        
    def returnNewestByName(self, name=None):
        """return list of newest packages based on name matching
           this means(in name.arch form): foo.i386 and foo.noarch will
           be compared to each other for highest version"""
        highdict = {}
        for pkg in self.returnPackages():
            (n, e, v ,r, a) = pkg.returnNevraTuple()
            if not highdict.has_key(n):
                highdict[n] = []
                highdict[n].append(pkg)
            else:
                pkg2 = highdict[n][0]
                (e2, v2, r2) = pkg2.returnEVR()
                rc = mdUtils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[n] = [pkg]
                elif rc == 0:
                    highdict[n].append(pkg)
                
        if name:
            if highdict.has_key(name):
                return highdict[name]
            else:
                raise PackageSackError, 'No Package Matching  %s' % name
                
        return highdict.values()
           
    def simplePkgList(self, repoid=None):
        """returns a list of pkg tuples (n, a, e, v, r) optionally from a single repoid"""
        simplelist = []
        for pkg in self.returnPackages(repoid):
            simplelist.append(pkg.returnPackageTuple())
        return simplelist
                       
    def printPackages(self):
        for pkg in self.returnPackages():
            print pkg.returnNevraPrintable()

    def excludeArchs(self, archlist):
        """exclude incompatible arches. archlist is a list of compatible arches"""
        
        for pkg in self.returnPackages():
            if pkg.arch not in archlist:
                self.delPackage(pkg)



# packageSack should be a base class
# two derived classes could be DBPackageSack and XMLPackageSack
# one for importing this data from the localdb 
# another from XML metadata files

class XMLPackageSack(PackageSack):
    """Derived class from PackageSack to build list from XML metadata file. 
       Needs the Package Object Class passed to it for the Sack"""
    def __init__(self, pkgObjectClass):
        PackageSack.__init__(self)
        self.repoStatus = {} #[repoid]= [primary, filelist, other] (so you can tell 
                             #what things have been loaded or not - b/c w/o primary, 
                             #filelist and other really can't be loaded
        self.pkgObjectClass = pkgObjectClass                           

                
    def addFile(self, repoid, file, callback=None):
        """takes a repository id and an xml file. It populates whatever it can, 
           if you try to populate with a filelist or other metadata file 
           before the primary metadata you'll not like the results"""
        try:
            reader = libxml2.newTextReaderFilename(file)
        except libxml2.treeError:
            raise PackageSackError, "Invalid or non-existent file: %s" % (file)

        else:
            reader.Read()
            xmlfiletype=reader.Name() # - first node should be the type
            if xmlfiletype == 'metadata':
                if not self._checkRepoStatus(repoid, itemcheck='primary'):
                    self.loadPrimaryMD(reader, repoid, callback)

            elif xmlfiletype == 'filelists':
                if not self._checkRepoStatus(repoid, itemcheck='filelists'):
                    self.loadFileMD(reader, repoid, callback)

            elif xmlfiletype == 'otherdata':
                if not self._checkRepoStatus(repoid, itemcheck='other'):
                    self.loadOtherMD(reader, repoid, callback)

            else:
                print 'Error: other unknown root element %s' % xmlfiletype 


    def _checkRepoStatus(self, repoid, itemcheck='primary'):
        """return 1 if itemcheck is in repo"""
        if self.repoStatus.has_key(repoid):
            if itemcheck in self.repoStatus[repoid]:
                return 1
        return 0
            
    def loadPrimaryMD(self, reader, repoid, callback=None):
        """load all the data from the primary metadata xml file"""
        
        pkgcount = 9999 # big number
        current = 1
        if reader.HasAttributes():
            pkgcount = int(reader.GetAttribute('packages'))
            

        
        ret = reader.Read()
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue
            
            if reader.NodeType() == 1 and reader.Name() == 'package':
                if reader.HasAttributes():
                    if reader.GetAttribute('type') == 'rpm':
                        current+=1
                        po = self.pkgObjectClass(reader, repoid)
                        self.addPackage(po)
            if callback: callback(current, pkgcount, name=repoid)
            ret = reader.Read()
            continue

        # update the repoStatus                
        if not self.repoStatus.has_key(repoid):
            self.repoStatus[repoid] = []
        if not 'primary' in self.repoStatus[repoid]:
            self.repoStatus[repoid].append('primary')


    def loadFileMD(self, reader, repoid, callback=None):
        """load all the filelist metadata from the file"""

        pkgcount = 9999 # big number
        current = 1
        if reader.HasAttributes():
            pkgcount = int(reader.GetAttribute('packages'))

        ret = reader.Read()
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue
            
            if reader.NodeType() == 1 and reader.Name() == 'package':
                if reader.HasAttributes():
                    pkgid = reader.GetAttribute('pkgid')
                    pkgs = self.searchID(pkgid)
                    pkgmatch = 0
                    mydepth = reader.Depth()
                    current+=1

                    for pkg in pkgs:
                        if pkg.returnSimple('repoid') == repoid: # check for matching repo
                            reader.Read()
                            pkgmatch+=1
                            
                            while 1:
                                if reader.NodeType() == 15 and reader.Depth() == mydepth:
                                    break
                                    
                                elif reader.NodeType() == 14:
                                    ret = reader.Read()
                                    continue

                                elif reader.NodeType() == 1:
                                    if reader.LocalName() == 'file':
                                        (ftype, file) = pkg.loadFileEntry(reader)
                                        #self._addToDictAsList(self.filenames, file, pkg)

                                ret = reader.Read()
                                continue        

                    if pkgmatch < 1:
                        # FIXME - raise a warning? Emit error? bitch? moan?
                        pass

                               
            ret = reader.Read()
            if callback: callback(current, pkgcount, name=repoid) # give us some pretty output
            continue

        # update the repostatus
        if not 'filelist' in self.repoStatus[repoid]:
            self.repoStatus[repoid].append('filelist')
        # we've just added file items - build up the indexes again
        self.buildIndexes()
        
            
    def loadOtherMD(self, reader, repoid, callback=None):
        """load the changelog, etc data from the other.xml file"""

        pkgcount = 9999 # big number
        current = 1
        if reader.HasAttributes():
            pkgcount = int(reader.GetAttribute('packages'))

        ret = reader.Read()
        while ret:
            if reader.NodeType() == 14:
                ret = reader.Read()
                continue
            
            if reader.NodeType() == 1 and reader.Name() == 'package':
                current+=1
                if reader.HasAttributes():
                    pkgid = reader.GetAttribute('pkgid')
                    pkgs = self.searchID(pkgid)
                    pkgmatch = 0
                    mydepth = reader.Depth()
                    #current+=1
                    

                    for pkg in pkgs:
                        if pkg.returnSimple('repoid') == repoid: # check for matching repo
                            reader.Read()
                            pkgmatch+=1
                            
                            while 1:
                                if reader.NodeType() == 15 and reader.Depth() == mydepth:
                                    break
                                    
                                elif reader.NodeType() == 14:
                                    ret = reader.Read()                                                        
                                    continue

                                elif reader.NodeType() == 1:
                                    if reader.LocalName() == 'changelog':
                                        pkg.loadChangeLogEntry(reader)

                                ret = reader.Read()
                                continue        

                    if pkgmatch < 1:
                        # FIXME - raise a warning? Emit error? bitch? moan?
                        pass
            if callback: callback(current, pkgcount, name=repoid)
            ret = reader.Read()
            continue
                                        
        if not 'other' in self.repoStatus[repoid]:
            self.repoStatus[repoid].append('other')
        # we've just added file items - build up the indexes again
        self.buildIndexes()
        

class ListPackageSack(PackageSack):
    """Derived class from PackageSack to build new Sack from list of
       pkgObjects - like one returned from self.returnNewestByNameArch()
       or self.returnNewestByName()"""
       
    def __init__(self, Objlist=None):
        PackageSack.__init__(self)
        if Objlist is not None:
            self.addList(Objlist)
    
    def addList(self, ObjList):
        for pkgobj in ObjList:
            self.addPackage(pkgobj)
    


--- NEW FILE repoMDObject.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University


import libxml2
from mdErrors import RepoMDError


class RepoMD:
    """represents the repomd xml file"""
    def __init__(self, repoid, file):
        """takes a repoid and a filename for the repomd.xml"""
        
        self.repoid = repoid
        self.repoData = {}
        try:
            doc = libxml2.parseFile(file)
        except libxml2.parserError:
            raise RepoMDError, 'Error: could not parse file %s' % file
        root = doc.getRootElement()
        xmlfiletype = root.name
        node = root.children
        if xmlfiletype == 'repomd':
            self.loadRepoMD(node)
        else:
            raise RepoMDError, 'Error: other unknown root element %s' % xmlfiletype 
        doc.freeDoc()

    def _returnData(self, mdtype, request):
        """ return the data from the repository Data"""
        if self.repoData.has_key(mdtype):
            ds = self.repoData[mdtype]
            if ds.has_key(request):
                return ds[request]
            else:
                raise RepoMDError, "Error: request %s not in %s data" % (request, mdtype)
        else:
            raise RepoMDError, "Error: odd MDtype requested: %s" % mdtype
            
            
            
    
    def _storeRepoData(self, mdtype, dataname, data):
        """stores repository data
           mdtype = primary, filelists, other, group
           dataname = checksum, timestamp, basepath, relativepath
        """
        if self.repoData.has_key(mdtype):
            ds = self.repoData[mdtype]
            if not ds.has_key(dataname):
                ds[dataname] = data
            else:
                raise RepoMDError, "Warning: duplicate data of %s description inputted" % dataname
        else:
            raise RepoMDError, "Warning: odd mdtype being put in %s" % mdtype
            
                
                
                
    def loadRepoDataNode(self, node):
        """loads a repository data node into the class"""
        mdtype = node.prop('type') # get the 'type' property for the datanode
        if not self.repoData.has_key(mdtype):
            self.repoData[mdtype] = {}
            
        datanode = node.children            
        while datanode is not None:
            if datanode.type != 'element':
                datanode = datanode.next
                continue
            
            if datanode.name  == 'location':
                base = datanode.prop('base')
                relative = datanode.prop('href')    
                self._storeRepoData(mdtype, 'basepath', base)
                self._storeRepoData(mdtype, 'relativepath', relative)
            elif datanode.name == 'checksum':
                csumType = datanode.prop('type')
                csum = datanode.content
                self._storeRepoData(mdtype, 'checksum', (csumType, csum))
            elif datanode.name == 'timestamp':
                timestamp = datanode.content
                self._storeRepoData(mdtype, 'timestamp', timestamp)

            datanode = datanode.next    
            continue

    def loadRepoMD(self, node):
        """iterates through the data nodes and populates some simple data areas"""
                
        while node is not None:
            if node.type != 'element':
                node = node.next
                continue
            
            if node.name == 'data':
                self.loadRepoDataNode(node)
                    
            node = node.next
            continue
                
    def _checksum(self, mdtype):
        """returns a tuple of (checksum type, checksum) for the specified Metadata
           file"""
        return self._returnData(mdtype, 'checksum')
        
        
    def _location(self, mdtype):
        """returns location to specified metadata file, (base, relative)"""
        base = self._returnData(mdtype, 'basepath')
        relative = self._returnData(mdtype, 'relativepath')
        
        return (base, relative)
        
    def _timestamp(self, mdtype):
        """returns timestamp for specified metadata file"""
        return self._returnData(mdtype, 'timestamp')
        
    def otherChecksum(self):
        """returns a tuple of (checksum type, checksum) for the other Metadata file"""
        return self._checksum('other')
        
    def otherLocation(self):
        """returns location to other metadata file, (base, relative)"""
        return self._location('other')
        
    def otherTimestamp(self):
        """returns timestamp for other metadata file"""
        return self._timestamp('other')
        
    def primaryChecksum(self):
        """returns a tuple of (checksum type, checksum) for the primary Metadata file"""
        return self._checksum('primary')
        
    def primaryLocation(self):
        """returns location to primary metadata file, (base, relative)"""
        return self._location('primary')
        
    def primaryTimestamp(self):
        """returns timestamp for primary metadata file"""
        return self._timestamp('primary')

    def filelistsChecksum(self):
        """returns a tuple of (checksum type, checksum) for the filelists Metadata file"""
        return self._checksum('filelists')
        
    def filelistsLocation(self):
        """returns location to filelists metadata file, (base, relative)"""
        return self._location('filelists')
        
    def filelistsTimestamp(self):
        """returns timestamp for filelists metadata file"""
        return self._timestamp('filelists')

    def groupChecksum(self):
        """returns a tuple of (checksum type, checksum) for the group Metadata file"""
        return self._checksum('group')
        
    def groupLocation(self):
        """returns location to group metadata file, (base, relative)"""
        return self._location('group')
        
    def groupTimestamp(self):
        """returns timestamp for group metadata file"""
        return self._timestamp('group')

    def fileTypes(self):
        """return list of metadata file types available"""
        return self.repoData.keys()


--- NEW FILE test.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

# classes for parsing the metadata files for the new metadata format


# used with python -i :)
import sys
import os
import time
import rpm
import packageSack
import packageObject
import repoMDObject
import mdUtils
import mdErrors


def process(current, total, name=None):
    sys.stdout.write('\r' + ' ' * 80)
    sys.stdout.write('\rNode %d of %d' % (current, total))
    sys.stdout.flush()

if len(sys.argv) < 4:
    print 'test.py: /path/to/repo /other/repo somepackagename'
    sys.exit(1)
   
print time.time()
repos = sys.argv[1:3]
pkgSack = packageSack.XMLPackageSack(packageObject.RpmXMLPackageObject)
numid = 0
for repo in repos:
    numid+=1
    basepath = repo
    repomdxmlfile = os.path.join(basepath, 'repodata/repomd.xml')
    repoid = repo

    try:
        repodata = repoMDObject.RepoMD(repoid, repomdxmlfile)
    except mdErrors.RepoMDError, e:
        print >> sys.stderr, e
        sys.exit(1)
    
    (pbase, phref) = repodata.primaryLocation()
    (fbase, fhref) = repodata.filelistsLocation()
    (obase, ohref) = repodata.otherLocation()
    
    
    processlist = [phref]
    for file in processlist:
        print time.time()
        print 'importing %s from %s' % (file, repoid)
        complete = basepath + '/' + file
        try:
            pkgSack.addFile(repoid, complete, process)
        except mdErrors.PackageSackError, e:
            print >> sys.stderr, e
            sys.exit(1)
            
    print ' '
    print time.time()

for pkg in pkgSack.searchNevra(sys.argv[3]):
    print pkg
    for reqtup in pkg.returnPrco('requires'):
        (reqn, reqf, (reqe,reqv,reqr)) = reqtup
        # rpmlib deps should be handled on their own
        if reqn[:6] == 'rpmlib':
            continue
        # kill self providers, too
        if pkg.checkPrco('provides', reqtup):
            continue
            
        # get a list of all pkgs that match the reqn
        providers = pkgSack.searchProvides(reqn)
        if len(providers) == 0:
            print 'unresolved: %s  %s %s:%s-%s' % (reqn, reqf, reqe, reqv, reqr)
            continue

        if len(providers) == 1:
            if reqf is None:
                print '%s: %s from %s' % (reqn, providers[0], providers[0].returnSimple('relativepath'))
                continue

            # only one entry but we need to match out it out
            if providers[0].checkPrco('provides', reqtup):
                print '%s: %s from %s' % (reqn, providers[0], providers[0].returnSimple('relativepath'))
                continue

        
        output = '%s:' % reqn
        for prov in providers:
            if reqf is not None:
                if prov.checkPrco('provides', reqtup):
                    output = output + '||' + prov.__str__()
                else:
                    print '%s does not provide %s %s %s %s %s' % (prov, reqn, reqf, reqe, reqv, reqr)                
            else:
                output = output + '||' + prov.__str__()
                
        print output
print time.time()




From fedora-extras-commits at redhat.com  Sun Oct 15 12:30:47 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:30:47 -0700
Subject: extras-buildsys/utils/pushscript/yum Errors.py, NONE,
	1.1 __init__.py, NONE, 1.1 comps.py, NONE, 1.1 config.py, NONE,
	1.1 constants.py, NONE, 1.1 depsolve.py, NONE, 1.1 failover.py,
	NONE, 1.1 logger.py, NONE, 1.1 mdcache.py, NONE,
	1.1 mdparser.py, NONE, 1.1 misc.py, NONE, 1.1 packages.py,
	NONE, 1.1 parser.py, NONE, 1.1 pgpmsg.py, NONE, 1.1 plugins.py,
	NONE, 1.1 repos.py, NONE, 1.1 sqlitecache.py, NONE,
	1.1 sqlitesack.py, NONE, 1.1 transactioninfo.py, NONE,
	1.1 update_md.py, NONE, 1.1
Message-ID: <200610151230.k9FCUl0D030934@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805/yum

Added Files:
	Errors.py __init__.py comps.py config.py constants.py 
	depsolve.py failover.py logger.py mdcache.py mdparser.py 
	misc.py packages.py parser.py pgpmsg.py plugins.py repos.py 
	sqlitecache.py sqlitesack.py transactioninfo.py update_md.py 
Log Message:
Add the patched yum 2.6.1 here, so we remove the dependency on the
system-installed one.




--- NEW FILE Errors.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University



import exceptions


class YumBaseError(exceptions.Exception):
    def __init__(self, args=None):
        exceptions.Exception.__init__(self)    
        self.args = args

class LockError(YumBaseError):
    def __init__(self, errno, msg):
        YumBaseError.__init__(self)
        self.errno = errno
        self.msg = msg
        
class DepError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class RepoError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class ConfigError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args
    
class MiscError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class GroupsError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class InstallError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class UpdateError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args

class RemoveError(YumBaseError):
    def __init__(self, args=None):
        YumBaseError.__init__(self)
        self.args = args


--- NEW FILE __init__.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University


import os
import sys
import os.path
import rpm
import re
import fnmatch
import types
import errno
import time
import sre_constants
import glob


import Errors
import rpmUtils
import rpmUtils.updates
import rpmUtils.arch
import comps
import config
import parser
import repos
import misc
import transactioninfo
from urlgrabber.grabber import URLGrabError
import depsolve
import plugins


from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage
from repomd import mdErrors
from constants import *
from repomd.packageSack import ListPackageSack

__version__ = '2.6.1'

class YumBase(depsolve.Depsolve):
    """This is a primary structure and base class. It houses the objects and
       methods needed to perform most things in yum. It is almost an abstract
       class in that you will need to add your own class above it for most
       real use."""
    
    def __init__(self):
        depsolve.Depsolve.__init__(self)
        self.localdbimported = 0
        self.repos = repos.RepoStorage() # class of repositories
        if (not self.repos.sqlite):
            self.log(1,"Warning, could not load sqlite, falling back to pickle")

        # Start with plugins disabled
        self.disablePlugins()

        self.localPackages = [] # for local package handling 

    def _transactionDataFactory(self):
        """Factory method returning TransactionData object"""
        if self.conf.enable_group_conditionals:
            return transactioninfo.ConditionalTransactionData()
        return transactioninfo.TransactionData()

    def log(self, value, msg):
        """dummy log stub"""
        print msg

    def errorlog(self, value, msg):
        """dummy errorlog stub"""
        print >> sys.stderr, msg

    def filelog(self, value, msg):
        print msg
   
    def doGenericSetup(self, cache=0):
        """do a default setup for all the normal/necessary yum components,
           really just a shorthand for testing"""
        
        self.doConfigSetup()
        self.conf.cache = cache
        self.doTsSetup()
        self.doRpmDBSetup()
        self.doRepoSetup()
        self.doSackSetup()
        
    def doConfigSetup(self, fn='/etc/yum.conf', root='/'):
        """basic stub function for doing configuration setup"""
       
        self.conf = config.readMainConfig(fn, root)
        self.yumvar = self.conf.yumvar
        self.getReposFromConfig()

    def getReposFromConfig(self):
        """read in repositories from config main and .repo files"""

        reposlist = []

        # Check yum.conf for repositories
        for section in self.conf.cfg.sections():
            # All sections except [main] are repositories
            if section == 'main': 
                continue

            try:
                thisrepo = config.readRepoConfig(self.conf.cfg, section, self.conf)
            except (Errors.RepoError, Errors.ConfigError), e:
                self.errorlog(2, e)
            else:
                reposlist.append(thisrepo)

        # Read .repo files from directories specified by the reposdir option
        # (typically /etc/yum.repos.d and /etc/yum/repos.d)
        parser = config.IncludedDirConfigParser(vars=self.yumvar)
        for reposdir in self.conf.reposdir:
            if os.path.exists(self.conf.installroot+'/'+reposdir):
                reposdir = self.conf.installroot + '/' + reposdir

            if os.path.isdir(reposdir):
                #XXX: why can't we just pass the list of files?
                files = ' '.join(glob.glob('%s/*.repo' % reposdir))
                #XXX: error catching here
                parser.read(files)

        # Check sections in the .repo files that were just slurped up
        for section in parser.sections():
            try:
                thisrepo = config.readRepoConfig(parser, section, self.conf)
            except (Errors.RepoError, Errors.ConfigError), e:
                self.errorlog(2, e)
            else:
                reposlist.append(thisrepo)

        # Got our list of repo objects, add them to the repos collection
        for thisrepo in reposlist:
            try:
                self.repos.add(thisrepo)
            except Errors.RepoError, e: 
                self.errorlog(2, e)
                continue

    def disablePlugins(self):
        '''Disable yum plugins
        '''
        self.plugins = plugins.DummyYumPlugins()
    
    def doPluginSetup(self, optparser=None, types=None):
        '''Initialise and enable yum plugins. 

        If plugins are going to be used, this should be called soon after
        doConfigSetup() has been called.

        @param optparser: The OptionParser instance for this run (optional)
        @param types: A sequence specifying the types of plugins to load.
            This should be sequnce containing one or more of the
            yum.plugins.TYPE_...  constants. If None (the default), all plugins
            will be loaded.
        '''
        # Load plugins first as they make affect available config options
        self.plugins = plugins.YumPlugins(self, self.conf.pluginpath,
                optparser, types)

        # Process options registered by plugins
        self.plugins.parseopts(self.conf, self.repos.findRepos('*'))

        # Initialise plugins
        self.plugins.run('init')

    def doTsSetup(self):
        """setup all the transaction set storage items we'll need
           This can't happen in __init__ b/c we don't know our installroot
           yet"""
        
        if hasattr(self, 'read_ts'):
            return
            
        if not self.conf.installroot:
            raise Errors.YumBaseError, 'Setting up TransactionSets before config class is up'
        
        installroot = self.conf.installroot
        self.read_ts = rpmUtils.transaction.initReadOnlyTransaction(root=installroot)
        self.tsInfo = self._transactionDataFactory()
        self.rpmdb = rpmUtils.RpmDBHolder()
        self.initActionTs()
        
    def doRpmDBSetup(self):
        """sets up a holder object for important information from the rpmdb"""
        
        if not self.localdbimported:
            self.log(3, 'Reading Local RPMDB')
            self.rpmdb.addDB(self.read_ts)
            self.localdbimported = 1

    def closeRpmDB(self):
        """closes down the instances of the rpmdb we have wangling around"""
        if hasattr(self, 'rpmdb'):
            del self.rpmdb
            self.localdbimported = 0
        if hasattr(self, 'ts'):
            del self.ts.ts
            del self.ts
        if hasattr(self, 'read_ts'):
            del self.read_ts.ts
            del self.read_ts
        if hasattr(self, 'up'):
            del self.up
        if hasattr(self, 'comps'):
            self.comps.compiled = False
            

    def doRepoSetup(self, thisrepo=None):
        """grabs the repomd.xml for each enabled repository and sets up 
           the basics of the repository"""

        self.plugins.run('prereposetup')
        
        if thisrepo is None:
            repos = self.repos.listEnabled()
        else:
            repos = self.repos.findRepos(thisrepo)

        if len(repos) < 1:
            self.errorlog(0, 'No Repositories Available to Set Up')

        num = 1
        for repo in repos:
            if repo.repoXML is not None and len(repo.urls) > 0:
                num += 1
                continue
            if self.repos.callback:
                self.repos.callback.log(2, '%-68s [%d/%d]' % 
                                        (repo.id, num, len(repos)))
                
            try:
                repo.cache = self.conf.cache
                repo.baseurlSetup()
                repo.dirSetup()
                self.log(3, 'Baseurl(s) for repo: %s' % repo.urls)
            except Errors.RepoError, e:
                self.errorlog(0, '%s' % e)
                raise
                
            try:
                repo.getRepoXML(text=repo)
            except Errors.RepoError, e:
                self.errorlog(0, 'Cannot open/read repomd.xml file for repository: %s' % repo)
                self.errorlog(0, str(e))
                raise
            num += 1
            
            
        if self.repos.callback and len(repos) > 0:
            self.repos.callback.progressbar(num, len(repos), repo.id)
            
        self.plugins.run('postreposetup')

    def doSackSetup(self, archlist=None, thisrepo=None):
        """populates the package sacks for information from our repositories,
           takes optional archlist for archs to include"""
           
        if hasattr(self, 'pkgSack') and thisrepo is None:
            self.log(7, 'skipping reposetup, pkgsack exists')
            return
            
        if thisrepo is None:
            repos = self.repos.listEnabled()
        else:
            repos = self.repos.findRepos(thisrepo)
            
        self.log(3, 'Setting up Package Sacks')
        if not archlist:
            archlist = rpmUtils.arch.getArchList()

        archdict = {}
        for arch in archlist:
            archdict[arch] = 1

        self.repos.pkgSack.compatarchs = archdict
        self.repos.populateSack(which=repos)
        self.pkgSack = self.repos.pkgSack
        self.excludePackages()
        self.pkgSack.excludeArchs(archlist)

        for repo in repos:
            self.excludePackages(repo)
            self.includePackages(repo)
        self.plugins.run('exclude')
        self.pkgSack.buildIndexes()
        
    def doUpdateSetup(self):
        """setups up the update object in the base class and fills out the
           updates, obsoletes and others lists"""
        
        if hasattr(self, 'up'):
            return
            
        self.log(3, 'Building updates object')
        #FIXME - add checks for the other pkglists to see if we should
        # raise an error
        if not hasattr(self, 'pkgSack'):
            self.doRepoSetup()
            self.doSackSetup()
        
        self.up = rpmUtils.updates.Updates(self.rpmdb.getPkgList(),
                                           self.pkgSack.simplePkgList())
        if self.conf.debuglevel >= 6:
            self.up.debug = 1
            
        if self.conf.obsoletes:
            self.up.rawobsoletes = self.pkgSack.returnObsoletes()
            
        self.up.exactarch = self.conf.exactarch
        self.up.exactarchlist = self.conf.exactarchlist
        self.up.doUpdates()

        if self.conf.obsoletes:
            self.up.doObsoletes()

        self.up.condenseUpdates()
        
    
    def doGroupSetup(self):
        """create the groups object that will store the comps metadata
           finds the repos with groups, gets their comps data and merge it
           into the group object"""
        
        self.log(3, 'Getting group metadata')
        reposWithGroups = []
        for repo in self.repos.listGroupsEnabled():
            if repo.groups_added: # already added the groups from this repo
                reposWithGroups.append(repo)
                continue
                
            if repo.repoXML is None:
                raise Errors.RepoError, "Repository '%s' not yet setup" % repo
            try:
                groupremote = repo.repoXML.groupLocation()
            except mdErrors.RepoMDError, e:
                pass
            else:
                reposWithGroups.append(repo)
                
        # now we know which repos actually have groups files.
        overwrite = self.conf.overwrite_groups
        if not hasattr(self, 'comps'):
            self.comps = comps.Comps(overwrite_groups = overwrite)

        for repo in reposWithGroups:
            if repo.groups_added: # already added the groups from this repo
                continue
                
            self.log(4, 'Adding group file from repository: %s' % repo)
            groupfile = repo.getGroups()
            try:
                self.comps.add(groupfile)
            except Errors.GroupsError, e:
                self.errorlog(0, 'Failed to add groups file for repository: %s' % repo)
            else:
                repo.groups_added = True

        if self.comps.compscount == 0:
            raise Errors.GroupsError, 'No Groups Available in any repository'
        
        self.doRpmDBSetup()
        pkglist = self.rpmdb.getPkgList()
        self.comps.compile(pkglist)
        

    def doSackFilelistPopulate(self):
        """convenience function to populate the repos with the filelist metadata
           it also is simply to only emit a log if anything actually gets populated"""
        
        necessary = False
        for repo in self.repos.listEnabled():
            if 'filelists' in self.pkgSack.added[repo.id]:
                continue
            else:
                necessary = True
        
        if necessary:
            msg = 'Importing additional filelist information'
            self.log(2, msg)
            self.repos.populateSack(with='filelists')
           
    def buildTransaction(self):
        """go through the packages in the transaction set, find them in the
           packageSack or rpmdb, and pack up the ts accordingly"""
        self.plugins.run('preresolve')
        (rescode, restring) = self.resolveDeps()
        self.plugins.run('postresolve', rescode=rescode, restring=restring)

        if self.tsInfo.changed:
            (rescode, restring) = self.resolveDeps()
            
        return rescode, restring

    def runTransaction(self, cb):
        """takes an rpm callback object, performs the transaction"""

        self.plugins.run('pretrans')

        errors = self.ts.run(cb.callback, '')
        if errors:
            raise Errors.YumBaseError, errors

        if not self.conf.keepcache:
            self.cleanHeaders()
            self.cleanPackages()

        self.plugins.run('posttrans')
        
    def excludePackages(self, repo=None):
        """removes packages from packageSacks based on global exclude lists,
           command line excludes and per-repository excludes, takes optional 
           repo object to use."""
        
        # if not repo: then assume global excludes, only
        # if repo: then do only that repos' packages and excludes
        
        if not repo: # global only
            excludelist = self.conf.exclude
            repoid = None
        else:
            excludelist = repo.exclude
            repoid = repo.id

        if len(excludelist) == 0:
            return
        
        if not repo:
            self.log(2, 'Excluding Packages in global exclude list')
        else:
            self.log(2, 'Excluding Packages from %s' % repo.name)
            
        exactmatch, matched, unmatched = \
           parsePackages(self.pkgSack.returnPackages(repoid), excludelist, casematch=1)
        
        for po in exactmatch + matched:
            self.log(3, 'Excluding %s' % po)
            self.pkgSack.delPackage(po)
      
        self.log(2, 'Finished')

    def includePackages(self, repo):
        """removes packages from packageSacks based on list of packages, to include.
           takes repoid as a mandatory argument."""
        
        includelist = repo.includepkgs
        
        if len(includelist) == 0:
            return
        
        pkglist = self.pkgSack.returnPackages(repo.id)
        exactmatch, matched, unmatched = \
           parsePackages(pkglist, includelist, casematch=1)
        
        self.log(2, 'Reducing %s to included packages only' % repo.name)
        rmlist = []
        
        for po in pkglist:
            if po in exactmatch + matched:
                self.log(3, 'Keeping included package %s' % po)
                continue
            else:
                rmlist.append(po)
        
        for po in rmlist:
            self.log(3, 'Removing unmatched package %s' % po)
            self.pkgSack.delPackage(po)
            
        self.log(2, 'Finished')
        
    def doLock(self, lockfile):
        """perform the yum locking, raise yum-based exceptions, not OSErrors"""
        
        # if we're not root then we don't lock - just return nicely
        if self.conf.uid != 0:
            return
            
        root = self.conf.installroot
        lockfile = root + '/' + lockfile # lock in the chroot
        lockfile = os.path.normpath(lockfile) # get rid of silly preceding extra /
        
        mypid=str(os.getpid())    
        while not self._lock(lockfile, mypid, 0644):
            fd = open(lockfile, 'r')
            try: oldpid = int(fd.readline())
            except ValueError:
                # bogus data in the pid file. Throw away.
                self._unlock(lockfile)
            else:
                try: os.kill(oldpid, 0)
                except OSError, e:
                    if e[0] == errno.ESRCH:
                        # The pid doesn't exist
                        self._unlock(lockfile)
                    else:
                        # Whoa. What the heck happened?
                        msg = 'Unable to check if PID %s is active' % oldpid
                        raise Errors.LockError(1, msg)
                else:
                    # Another copy seems to be running.
                    msg = 'Existing lock %s: another copy is running. Aborting.' % lockfile
                    raise Errors.LockError(0, msg)
    
    def doUnlock(self, lockfile):
        """do the unlock for yum"""
        
        # if we're not root then we don't lock - just return nicely
        if self.conf.uid != 0:
            return
        
        root = self.conf.installroot
        lockfile = root + '/' + lockfile # lock in the chroot
        
        self._unlock(lockfile)
        
    def _lock(self, filename, contents='', mode=0777):
        lockdir = os.path.dirname(filename)
        try:
            if not os.path.exists(lockdir):
                os.makedirs(lockdir, mode=0755)
            fd = os.open(filename, os.O_EXCL|os.O_CREAT|os.O_WRONLY, mode)    
        except OSError, msg:
            if not msg.errno == errno.EEXIST: raise msg
            return 0
        else:
            os.write(fd, contents)
            os.close(fd)
            return 1
    
    def _unlock(self, filename):
        try:
            os.unlink(filename)
        except OSError, msg:
            pass


    def verifyPkg(self, fo, po, raiseError):
        """verifies the package is what we expect it to be
           raiseError  = defaults to 0 - if 1 then will raise
           a URLGrabError if the file does not check out.
           otherwise it returns false for a failure, true for success"""

        if type(fo) is types.InstanceType:
            fo = fo.filename

        for (csumtype, csum, csumid) in po.checksums:
            if csumid:
                checksum = csum
                checksumType = csumtype
                break
        try:
            self.verifyChecksum(fo, checksumType, checksum)
        except URLGrabError, e:
            if raiseError:
                raise
            else:
                return 0

        ylp = YumLocalPackage(self.read_ts, fo)
        if ylp.pkgtup != po.pkgtup:
            if raiseError:
                raise URLGrabError(-1, 'Package does not match intended download')
            else:
                return 0
        
        return 1
        
        
    def verifyChecksum(self, fo, checksumType, csum):
        """Verify the checksum of the file versus the 
           provided checksum"""

        try:
            filesum = misc.checksum(checksumType, fo)
        except Errors.MiscError, e:
            raise URLGrabError(-3, 'Could not perform checksum')
            
        if filesum != csum:
            raise URLGrabError(-1, 'Package does not match checksum')
        
        return 0
            
           
    def downloadPkgs(self, pkglist, callback=None):
        """download list of package objects handed to you, output based on
           callback, raise yum.Errors.YumBaseError on problems"""

        errors = {}
        self.plugins.run('predownload', pkglist=pkglist)
        repo_cached = False
        remote_pkgs = []
        for po in pkglist:
            if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
                continue
                    
            local = po.localPkg()
            if os.path.exists(local):
                cursize = os.stat(local)[6]
                totsize = int(po.size())
                try:
                    result = self.verifyPkg(local, po, raiseError=1)
                except URLGrabError, e: # fails the check
                    
                    repo = self.repos.getRepo(po.repoid)
                    if repo.cache:
                        repo_cached = True
                        msg = 'package fails checksum but caching is enabled for %s' % repo.id
                        if not errors.has_key(po): errors[po] = []
                        errors[po].append(msg)
                        
                    if cursize >= totsize: # keep it around for regetting
                        os.unlink(local)
                        
                else:
                    if result:
                        continue
                    else:
                        if cursize >= totsize: # keep it around for regetting
                            os.unlink(local)
            remote_pkgs.append(po)
            
            # caching is enabled and the package 
            # just failed to check out there's no 
            # way to save this, report the error and return
            if (self.conf.cache or repo_cached) and errors:
                return errors
                

        i = 0
        for po in remote_pkgs:
            i += 1
            repo = self.repos.getRepo(po.repoid)
            remote = po.returnSimple('relativepath')
            checkfunc = (self.verifyPkg, (po, 1), {})


            # FIXME - add check here to make sure we have the disk space
            # available to download the package. If we don't then politely
            # bail out with an informative message.
            # os.statvfs(repo's local path)[4]*[2] >= po.size
            try:
                text = '(%s/%s): %s' % (i, len(remote_pkgs),
                                        os.path.basename(remote))
                local = po.localPkg()
                mylocal = repo.get(relative=remote,
                                   local=local,
                                   checkfunc=checkfunc,
                                   text=text,
                                   cache=repo.http_caching != 'none',
                                   )
            except Errors.RepoError, e:
                if not errors.has_key(po):
                    errors[po] = []
                errors[po].append(str(e))
            else:
                po.localpath = mylocal
                if errors.has_key(po):
                    del errors[po]

        self.plugins.run('postdownload', pkglist=pkglist, errors=errors)

        return errors

    def verifyHeader(self, fo, po, raiseError):
        """check the header out via it's naevr, internally"""
        if type(fo) is types.InstanceType:
            fo = fo.filename
            
        try:
            hlist = rpm.readHeaderListFromFile(fo)
            hdr = hlist[0]
        except (rpm.error, IndexError):
            if raiseError:
                raise URLGrabError(-1, 'Header is not complete.')
            else:
                return 0
                
        yip = YumInstalledPackage(hdr) # we're using YumInstalledPackage b/c
                                       # it takes headers <shrug>
        if yip.pkgtup != po.pkgtup:
            if raiseError:
                raise URLGrabError(-1, 'Header does not match intended download')
            else:
                return 0
        
        return 1
        
    def downloadHeader(self, po):
        """download a header from a package object.
           output based on callback, raise yum.Errors.YumBaseError on problems"""

        if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
            return
                
        errors = {}
        local =  po.localHdr()
        start = po.returnSimple('hdrstart')
        end = po.returnSimple('hdrend')
        repo = self.repos.getRepo(po.repoid)
        remote = po.returnSimple('relativepath')
        if os.path.exists(local):
            try:
                result = self.verifyHeader(local, po, raiseError=1)
            except URLGrabError, e:
                # might add a check for length of file - if it is < 
                # required doing a reget
                try:
                    os.unlink(local)
                except OSError, e:
                    pass
            else:
                po.hdrpath = local
                return
        else:
            if self.conf.cache:
                raise Errors.RepoError, \
                'Header not in local cache and caching-only mode enabled. Cannot download %s' % remote
        
        if self.dsCallback: self.dsCallback.downloadHeader(po.name)
        
        try:
            checkfunc = (self.verifyHeader, (po, 1), {})
            hdrpath = repo.get(relative=remote, local=local, start=start,
                    reget=None, end=end, checkfunc=checkfunc, copy_local=1,
                    cache=repo.http_caching != 'none',
                    )
        except Errors.RepoError, e:
            saved_repo_error = e
            try:
                os.unlink(local)
            except OSError, e:
                raise Errors.RepoError, saved_repo_error
            else:
                raise
        else:
            po.hdrpath = hdrpath
            return

    def sigCheckPkg(self, po):
        '''Take a package object and attempt to verify GPG signature if required

        Returns (result, error_string) where result is
            0 - GPG signature verifies ok or verification is not required
            1 - GPG verification failed but installation of the right GPG key might help
            2 - Fatal GPG verifcation error, give up
        '''
        if hasattr(po, 'pkgtype') and po.pkgtype == 'local':
            check = self.conf.gpgcheck
            hasgpgkey = 0
        else:
            repo = self.repos.getRepo(po.repoid)
            check = repo.gpgcheck
            hasgpgkey = not not repo.gpgkey 
        
        if check:
            sigresult = rpmUtils.miscutils.checkSig(self.read_ts, po.localPkg())
            localfn = os.path.basename(po.localPkg())
            
            if sigresult == 0:
                result = 0
                msg = ''

            elif sigresult == 1:
                if hasgpgkey:
                    result = 1
                else:
                    result = 2
                msg = 'Public key for %s is not installed' % localfn

            elif sigresult == 2:
                result = 2
                msg = 'Problem opening package %s' % localfn

            elif sigresult == 3:
                if hasgpgkey:
                    result = 1
                else:
                    result = 2
                result = 1
                msg = 'Public key for %s is not trusted' % localfn

            elif sigresult == 4:
                result = 2 
                msg = 'Package %s is not signed' % localfn
            
        else:
            result =0
            msg = ''

        return result, msg
        
    def cleanHeaders(self):
        filelist = []
        ext = 'hdr'
        removed = 0
        for repo in self.repos.listEnabled():
            repo.dirSetup()
            path = repo.hdrdir
            filelist = misc.getFileList(path, ext, filelist)
            
        for hdr in filelist:
            try:
                os.unlink(hdr)
            except OSError, e:
                self.errorlog(0, 'Cannot remove header %s' % hdr)
                continue
            else:
                self.log(7, 'Header %s removed' % hdr)
                removed+=1
        msg = '%d headers removed' % removed
        return 0, [msg]

            
    def cleanPackages(self):
        filelist = []
        ext = 'rpm'
        removed = 0
        for repo in self.repos.listEnabled():
            repo.dirSetup()
            path = repo.pkgdir
            filelist = misc.getFileList(path, ext, filelist)
            
        for pkg in filelist:
            try:
                os.unlink(pkg)
            except OSError, e:
                self.errorlog(0, 'Cannot remove package %s' % pkg)
                continue
            else:
                self.log(7, 'Package %s removed' % pkg)
                removed+=1
        
        msg = '%d packages removed' % removed
        return 0, [msg]

    def cleanPickles(self):
        filelist = []
        ext = 'pickle'
        removed = 0
        for repo in self.repos.listEnabled():
            repo.dirSetup()
            path = repo.cachedir
            filelist = misc.getFileList(path, ext, filelist)
            
        for item in filelist:
            try:
                os.unlink(item)
            except OSError, e:
                self.errorlog(0, 'Cannot remove cache file %s' % item)
                continue
            else:
                self.log(7, 'Cache file %s removed' % item)
                removed+=1
        msg = '%d cache files removed' % removed
        return 0, [msg]
    
    def cleanSqlite(self):
        filelist = []
        ext = 'sqlite'
        removed = 0
        for repo in self.repos.listEnabled():
            repo.dirSetup()
            path = repo.cachedir
            filelist = misc.getFileList(path, ext, filelist)
            
        for item in filelist:
            try:
                os.unlink(item)
            except OSError, e:
                self.errorlog(0, 'Cannot remove sqlite cache file %s' % item)
                continue
            else:
                self.log(7, 'Cache file %s removed' % item)
                removed+=1
        msg = '%d cache files removed' % removed
        return 0, [msg]

    def cleanMetadata(self):
        filelist = []
        exts = ['xml.gz', 'xml', 'cachecookie']
        
        removed = 0
        for ext in exts:
            for repo in self.repos.listEnabled():
                repo.dirSetup()
                path = repo.cachedir
                filelist = misc.getFileList(path, ext, filelist)
            
        for item in filelist:
            try:
                os.unlink(item)
            except OSError, e:
                self.errorlog(0, 'Cannot remove metadata file %s' % item)
                continue
            else:
                self.log(7, 'metadata file %s removed' % item)
                removed+=1
        msg = '%d metadata files removed' % removed
        return 0, [msg]

    def doPackageLists(self, pkgnarrow='all'):
        """generates lists of packages, un-reduced, based on pkgnarrow option"""
        
        ygh = misc.GenericHolder()
        
        installed = []
        available = []
        updates = []
        obsoletes = []
        obsoletesTuples = []
        recent = []
        extras = []

        # list all packages - those installed and available, don't 'think about it'
        if pkgnarrow == 'all': 
            self.doRepoSetup()
            self.doRpmDBSetup()
            inst = self.rpmdb.getPkgList()
            for hdr in self.rpmdb.getHdrList():
                po = YumInstalledPackage(hdr)
                installed.append(po)

            if self.conf.showdupesfromrepos:
                avail = self.pkgSack.returnPackages()
            else:
                avail = self.pkgSack.returnNewestByNameArch()

            for pkg in avail:
                pkgtup = (pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)
                if pkgtup not in inst:
                    available.append(pkg)

        # produce the updates list of tuples
        elif pkgnarrow == 'updates':
            self.doRepoSetup()
            self.doRpmDBSetup()
            self.doUpdateSetup()
            for (n,a,e,v,r) in self.up.getUpdatesList():
                matches = self.pkgSack.searchNevra(name=n, arch=a, epoch=e, 
                                                   ver=v, rel=r)
                if len(matches) > 1:
                    updates.append(matches[0])
                    self.log(4, 'More than one identical match in sack for %s' % matches[0])
                elif len(matches) == 1:
                    updates.append(matches[0])
                else:
                    self.log(4, 'Nothing matches %s.%s %s:%s-%s from update' % (n,a,e,v,r))

        # installed only
        elif pkgnarrow == 'installed':
            self.doRpmDBSetup()
            for hdr in self.rpmdb.getHdrList():
                po = YumInstalledPackage(hdr)
                installed.append(po)
        
        # available in a repository
        elif pkgnarrow == 'available':
            self.doRepoSetup()
            self.doRpmDBSetup()
            inst = self.rpmdb.getPkgList()
            if self.conf.showdupesfromrepos:
                avail = self.pkgSack.returnPackages()
            else:
                avail = self.pkgSack.returnNewestByNameArch()

            for pkg in avail:
                pkgtup = (pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)
                if pkgtup not in inst:
                    available.append(pkg)

        # not in a repo but installed
        elif pkgnarrow == 'extras':
            # we must compare the installed set versus the repo set
            # anything installed but not in a repo is an extra
            self.doRepoSetup()
            self.doRpmDBSetup()
            avail = self.pkgSack.simplePkgList()
            for hdr in self.rpmdb.getHdrList():
                po = YumInstalledPackage(hdr)
                if po.pkgtup not in avail:
                    extras.append(po)

        # obsoleting packages (and what they obsolete)
        elif pkgnarrow == 'obsoletes':
            self.doRepoSetup()
            self.doRpmDBSetup()
            self.conf.obsoletes = 1
            self.doUpdateSetup()

            for (pkgtup, instTup) in self.up.getObsoletesTuples():
                (n,a,e,v,r) = pkgtup
                pkgs = self.pkgSack.searchNevra(name=n, arch=a, ver=v, rel=r, epoch=e)
                hdr = self.rpmdb.returnHeaderByTuple(instTup)[0] # the first one
                instpo = YumInstalledPackage(hdr)
                for po in pkgs:
                    obsoletes.append(po)
                    obsoletesTuples.append((po, instpo))
        
        # packages recently added to the repositories
        elif pkgnarrow == 'recent':
            now = time.time()
            recentlimit = now-(self.conf.recent*86400)
            ftimehash = {}
            self.doRepoSetup()
            if self.conf.showdupesfromrepos:
                avail = self.pkgSack.returnPackages()
            else:
                avail = self.pkgSack.returnNewestByNameArch()
            
            for po in avail:
                ftime = int(po.returnSimple('filetime'))
                if ftime > recentlimit:
                    if not ftimehash.has_key(ftime):
                        ftimehash[ftime] = [po]
                    else:
                        ftimehash[ftime].append(po)

            for sometime in ftimehash.keys():
                for po in ftimehash[sometime]:
                    recent.append(po)
        
        
        ygh.installed = installed
        ygh.available = available
        ygh.updates = updates
        ygh.obsoletes = obsoletes
        ygh.obsoletesTuples = obsoletesTuples
        ygh.recent = recent
        ygh.extras = extras

        
        return ygh

    def _refineSearchPattern(self, arg):
        """Takes a search string from the cli for Search or Provides
           and cleans it up so it doesn't make us vomit"""
        
        if re.match('.*[\*,\[,\],\{,\},\?,\+].*', arg):
            restring = fnmatch.translate(arg)
        else:
            restring = re.escape(arg)
            
        return restring
        
    def findDeps(self, pkgs):
        """Return the dependencies for a given package, as well
           possible solutions for those dependencies.
           
           Returns the deps as a dict  of:
             packageobject = [reqs] = [list of satisfying pkgs]"""
        
        results = {}
        self.doRepoSetup()
        self.doRpmDBSetup()

        avail = self.pkgSack.returnPackages()
        exactmatch, matched, unmatched = parsePackages(avail, pkgs)

        if len(unmatched) > 0:
            self.errorlog(0, 'No Match for arguments: %s' % unmatched)

        pkgs = misc.unique(exactmatch + matched)
        
        for pkg in pkgs:
            results[pkg] = {} 
            reqs = pkg.returnPrco('requires');
            reqs.sort()
            pkgresults = results[pkg] # shorthand so we don't have to do the
                                      # double bracket thing
            
            for req in reqs:
                (r,f,v) = req
                if r.startswith('rpmlib('):
                    continue
                
                satisfiers = []

                for po in self.whatProvides(r, f, v):
                    satisfiers.append(po)

                pkgresults[req] = satisfiers
        
        return results
    
    def searchGenerator(self, fields, criteria):
        """Generator method to lighten memory load for some searches.
           This is the preferred search function to use."""
        self.doRepoSetup()


        for string in criteria:
            restring = self._refineSearchPattern(string)
            try: crit_re = re.compile(restring, flags=re.I)
            except sre_constants.error, e:
                raise Errors.MiscError, \
                 'Search Expression: %s is an invalid Regular Expression.\n' % string
                  
            for po in self.pkgSack:
                tmpvalues = []
                for field in fields:
                    value = po.returnSimple(field)
                    if value and crit_re.search(value):
                        tmpvalues.append(value)
                
                if len(tmpvalues) > 0:
                    yield (po, tmpvalues)
        
        # do the same for installed pkgs
        
        self.doRpmDBSetup()        
        for hdr in self.rpmdb.getHdrList(): # this is more expensive so this is the  top op
            po = YumInstalledPackage(hdr)
            tmpvalues = []
            for string in criteria:
                restring = self._refineSearchPattern(string)
                
                try: crit_re = re.compile(restring, flags=re.I)
                except sre_constants.error, e:
                    raise Errors.MiscError, \
                     'Search Expression: %s is an invalid Regular Expression.\n' % string

                for field in fields:
                    value = po.returnSimple(field)
                    if type(value) is types.ListType: # this is annoying
                        value = str(value)
                    if value and crit_re.search(value):
                        tmpvalues.append(value)
                        
            if len(tmpvalues) > 0:
                yield (po, tmpvalues)        
        
    def searchPackages(self, fields, criteria, callback=None):
        """Search specified fields for matches to criteria
           optional callback specified to print out results
           as you go. Callback is a simple function of:
           callback(po, matched values list). It will 
           just return a dict of dict[po]=matched values list"""
        
        matches = {}
        match_gen = self.searchGenerator(fields, criteria)
        
        for (po, matched_strings) in match_gen:
            if callback:
                callback(po, matched_strings)
            if not matches.has_key(po):
                matches[po] = []
            
            matches[po].extend(matched_strings)
        
        return matches
    
    def searchPackageProvides(self, args, callback=None):
        
        self.doRepoSetup()
        matches = {}
        
        # search deps the simple way first
        for arg in args:
            self.log(4, 'searching the simple way')
            pkgs = self.returnPackagesByDep(arg)
            for po in pkgs:
                # if the match is already in the list, just skip it
                if matches.has_key(po):
                    continue
                
                matches[po] = [arg]
                if callback:
                    callback(po, [arg])
                

        # search pkgSack - fully populate the worthwhile metadata to search
        # if it even vaguely matches
        self.log(4, 'fully populating the necessary data')
        for arg in args:
            matched = 0
            globs = ['.*bin\/.*', '.*\/etc\/.*', '^\/usr\/lib\/sendmail$']
            for glob in globs:
                globc = re.compile(glob)
                if globc.match(arg):
                    matched = 1
            if not matched:
                self.doSackFilelistPopulate()

        for arg in args:
            # assume we have to search every package, unless we can refine the search set
            where = self.pkgSack
            
            # this is annoying. If the user doesn't use any glob or regex-like
            # or regexes then we can use the where 'like' search in sqlite
            # if they do use globs or regexes then we can't b/c the string
            # will no longer have much meaning to use it for matches
            
            if hasattr(self.pkgSack, 'searchAll'):
                if not re.match('.*[\*,\[,\],\{,\},\?,\+,\%].*', arg):
                    self.log(4, 'Using the like search on %s' % arg)
                    where = self.pkgSack.searchAll(arg, query_type='like')
            
            self.log(4, 'Searching %d packages' % len(where))
            self.log(4, 'refining the search expression of %s' % arg) 
            restring = self._refineSearchPattern(arg)
            self.log(4, 'refined search: %s' % restring)
            try: 
                arg_re = re.compile(restring, flags=re.I)
            except sre_constants.error, e:
                raise Errors.MiscError, \
                  'Search Expression: %s is an invalid Regular Expression.\n' % arg

            for po in where:
                self.log(5, 'searching package %s' % po)
                tmpvalues = []
                
                self.log(5, 'searching in file entries')
                for filetype in po.returnFileTypes():
                    for fn in po.returnFileEntries(ftype=filetype):
                        if arg_re.search(fn):
                            tmpvalues.append(fn)
                
                self.log(5, 'searching in provides entries')
                for (p_name, p_flag, (p_e, p_v, p_r)) in po.returnPrco('provides'):
                    if arg_re.search(p_name):
                        prov = po.prcoPrintable((p_name, p_flag, (p_e, p_v, p_r)))
                        tmpvalues.append(prov)

                if len(tmpvalues) > 0:
                    if not matches.has_key(po):
                        matches[po] = tmpvalues
                        if callback:
                            callback(po, tmpvalues)
                
        
        self.doRpmDBSetup()
        # installed rpms, too
        taglist = ['filenames', 'dirnames', 'provides']
        arg_re = []
        for arg in args:
            restring = self._refineSearchPattern(arg)

            try: reg = re.compile(restring, flags=re.I)
            except sre_constants.error, e:
                raise Errors.MiscError, \
                 'Search Expression: %s is an invalid Regular Expression.\n' % arg
            
            arg_re.append(reg)

        for hdr in self.rpmdb.getHdrList():
            po = YumInstalledPackage(hdr)
            tmpvalues = []
            searchlist = []
            for tag in taglist:
                tagdata = po.returnSimple(tag)
                if tagdata is None:
                    continue
                if type(tagdata) is types.ListType:
                    searchlist.extend(tagdata)
                else:
                    searchlist.append(tagdata)
            
            for reg in arg_re:
                for item in searchlist:
                    if reg.search(item):
                        tmpvalues.append(item)

            del searchlist

            if len(tmpvalues) > 0:
                if callback:
                    callback(po, tmpvalues)
                matches[po] = tmpvalues
            
            
        return matches

    def doGroupLists(self, uservisible=0):
        """returns two lists of groups, installed groups and available groups
           optional 'uservisible' bool to tell it whether or not to return
           only groups marked as uservisible"""
        
        
        installed = []
        available = []
        
        for grp in self.comps.groups:
            if grp.installed:
                if uservisible:
                    if grp.user_visible:
                        installed.append(grp)
                else:
                    installed.append(grp)
            else:
                if uservisible:
                    if grp.user_visible:
                        available.append(grp)
                else:
                    available.append(grp)
            
        return installed, available
    
    
    def groupRemove(self, grpid):
        """mark all the packages in this group to be removed"""
        
        txmbrs_used = []
        self.doGroupSetup()
        
        thisgroup = self.comps.return_group(grpid)
        if not thisgroup:
            raise Errors.GroupsError, "No Group named %s exists" % grpid

        thisgroup.toremove = True
        pkgs = thisgroup.packages
        for pkg in thisgroup.packages:
            txmbrs = self.remove(name=pkg)
            txmbrs_used.extend(txmbrs)
            for txmbr in txmbrs:
                txmbr.groups.append(thisgroup.groupid)
        
        return txmbrs_used

    def groupUnremove(self, grpid):
        """unmark any packages in the group from being removed"""
        
        self.doGroupSetup()

        thisgroup = self.comps.return_group(grpid)
        if not thisgroup:
            raise Errors.GroupsError, "No Group named %s exists" % grpid

        thisgroup.toremove = False
        pkgs = thisgroup.packages
        for pkg in thisgroup.packages:
            for txmbr in self.tsInfo:
                if txmbr.po.name == pkg and txmbr.po.state in TS_INSTALL_STATES:
                    try:
                        txmbr.groups.remove(grpid)
                    except ValueError:
                        self.log(4, "package %s was not marked in group %s" % (txmbr.po, grpid))
                        continue
                    
                    # if there aren't any other groups mentioned then remove the pkg
                    if len(txmbr.groups) == 0:
                        self.tsInfo.remove(txmbr.po.pkgtup)
        
        
    def selectGroup(self, grpid):
        """mark all the packages in the group to be installed
           returns a list of transaction members it added to the transaction 
           set"""
        
        txmbrs_used = []
        if not self.comps:
            self.doGroupSetup()
        
        if not self.comps.has_group(grpid):
            raise Errors.GroupsError, "No Group named %s exists" % grpid
            
        thisgroup = self.comps.return_group(grpid)
        
        if not thisgroup:
            raise Errors.GroupsError, "No Group named %s exists" % grpid
        
        if thisgroup.selected:
            return txmbrs_used
        
        thisgroup.selected = True
        
        pkgs = thisgroup.mandatory_packages.keys() + thisgroup.default_packages.keys()
        for pkg in pkgs:
            self.log(5, 'Adding package %s from group %s' % (pkg, thisgroup.groupid))
            try:
                txmbrs = self.install(name = pkg)
            except Errors.InstallError, e:
                self.log(3, 'No package named %s available to be installed' % pkg)
            else:
                txmbrs_used.extend(txmbrs)
                for txmbr in txmbrs:
                    txmbr.groups.append(thisgroup.groupid)
        
        if self.conf.enable_group_conditionals:
            for condreq, cond in thisgroup.conditional_packages.iteritems():
                if self._isPackageInstalled(cond):
                    try:
                        txmbrs = self.install(name = condreq)
                    except Errors.InstallError:
                        # we don't care if the package doesn't exist
                        continue
                    txmbrs_used.extend(txmbrs)
                    for txmbr in txmbrs:
                        txmbr.groups.append(thisgroup.groupid)
                    continue
                # Otherwise we hook into tsInfo.add
                pkgs = self.pkgSack.searchNevra(name=condreq)
                if pkgs:
                    pkgs = self.bestPackagesFromList(pkgs)
                if self.tsInfo.conditionals.has_key(cond):
                    self.tsInfo.conditionals[cond].extend(pkgs)
                else:
                    self.tsInfo.conditionals[cond] = pkgs

        return txmbrs_used

    def deselectGroup(self, grpid):
        """de-mark all the packages in the group for install"""
        if not self.comps:
            self.doGroupSetup()
        
        if not self.comps.has_group(grpid):
            raise Errors.GroupsError, "No Group named %s exists" % grpid
            
        thisgroup = self.comps.return_group(grpid)
        if not thisgroup:
            raise Errors.GroupsError, "No Group named %s exists" % grpid
        
        thisgroup.selected = False
        
        for pkgname in thisgroup.packages:
        
            for txmbr in self.tsInfo:
                if txmbr.po.name == pkgname and txmbr.po.state in TS_INSTALL_STATES:
                    try: 
                        txmbr.groups.remove(grpid)
                    except ValueError:
                        self.log(4, "package %s was not marked in group %s" % (txmbr.po, grpid))
                        continue
                    
                    # if there aren't any other groups mentioned then remove the pkg
                    if len(txmbr.groups) == 0:
                        self.tsInfo.remove(txmbr.po.pkgtup)

                    
        
    def getPackageObject(self, pkgtup):
        """retrieves a packageObject from a pkgtuple - if we need
           to pick and choose which one is best we better call out
           to some method from here to pick the best pkgobj if there are
           more than one response - right now it's more rudimentary."""
           
        
        (n,a,e,v,r) = pkgtup
        
        # look it up in the self.localPackages first:
        for po in self.localPackages:
            if po.pkgtup == pkgtup:
                return po
                
        pkgs = self.pkgSack.packagesByTuple(pkgtup)

        if len(pkgs) == 0:
            raise Errors.DepError, 'Package tuple %s could not be found in packagesack' % str(pkgtup)
            return None
            
        if len(pkgs) > 1: # boy it'd be nice to do something smarter here FIXME
            result = pkgs[0]
        else:
            result = pkgs[0] # which should be the only
        
            # this is where we could do something to figure out which repository
            # is the best one to pull from
        
        return result

    def getInstalledPackageObject(self, pkgtup):
        """returns a YumInstallPackage object for the pkgtup specified"""
        
        hdrs = self.rpmdb.returnHeaderByTuple(pkgtup)
        hdr = hdrs[0]
        po = YumInstalledPackage(hdr)
        return po
        
    def gpgKeyCheck(self):
        """checks for the presence of gpg keys in the rpmdb
           returns 0 if no keys returns 1 if keys"""

        gpgkeyschecked = self.conf.cachedir + '/.gpgkeyschecked.yum'
        if os.path.exists(gpgkeyschecked):
            return 1
            
        myts = rpmUtils.transaction.initReadOnlyTransaction(root=self.conf.installroot)
        myts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
        idx = myts.dbMatch('name', 'gpg-pubkey')
        keys = idx.count()
        del idx
        del myts
        
        if keys == 0:
            return 0
        else:
            mydir = os.path.dirname(gpgkeyschecked)
            if not os.path.exists(mydir):
                os.makedirs(mydir)
                
            fo = open(gpgkeyschecked, 'w')
            fo.close()
            del fo
            return 1

    def returnPackagesByDep(self, depstring):
        """Pass in a generic [build]require string and this function will 
           pass back the packages it finds providing that dep."""
        
        results = []
        self.doRepoSetup()
        # parse the string out
        #  either it is 'dep (some operator) e:v-r'
        #  or /file/dep
        #  or packagename
        depname = depstring
        depflags = None
        depver = None
        
        if depstring[0] != '/':
            # not a file dep - look at it for being versioned
            if re.search('[>=<]', depstring):  # versioned
                try:
                    depname, flagsymbol, depver = depstring.split()
                except ValueError, e:
                    raise Errors.YumBaseError, 'Invalid versioned dependency string, try quoting it.'
                if not SYMBOLFLAGS.has_key(flagsymbol):
                    raise Errors.YumBaseError, 'Invalid version flag'
                depflags = SYMBOLFLAGS[flagsymbol]
                
        sack = self.whatProvides(depname, depflags, depver)
        results = sack.returnPackages()
        return results
        

    def returnPackageByDep(self, depstring):
        """Pass in a generic [build]require string and this function will 
           pass back the best(or first) package it finds providing that dep."""
        
        try:
            pkglist = self.returnPackagesByDep(depstring)
        except Errors.YumBaseError, e:
            raise Errors.YumBaseError, 'No Package found for %s' % depstring
        
        result = self._bestPackageFromList(pkglist)
        if result is None:
            raise Errors.YumBaseError, 'No Package found for %s' % depstring
        
        return result

    def returnInstalledPackagesByDep(self, depstring):
        """Pass in a generic [build]require string and this function will 
           pass back the installed packages it finds providing that dep."""
        
        results = []
        self.doRpmDBSetup()
        # parse the string out
        #  either it is 'dep (some operator) e:v-r'
        #  or /file/dep
        #  or packagename
        depname = depstring
        depflags = None
        depver = None
        
        if depstring[0] != '/':
            # not a file dep - look at it for being versioned
            if re.search('[>=<]', depstring):  # versioned
                try:
                    depname, flagsymbol, depver = depstring.split()
                except ValueError, e:
                    raise Errors.YumBaseError, 'Invalid versioned dependency string, try quoting it.'
                if not SYMBOLFLAGS.has_key(flagsymbol):
                    raise Errors.YumBaseError, 'Invalid version flag'
                depflags = SYMBOLFLAGS[flagsymbol]
                
        pkglist = self.rpmdb.whatProvides(depname, depflags, depver)
        
        for pkgtup in pkglist:
            results.append(self.getInstalledPackageObject(pkgtup))
        
        return results


    def _bestPackageFromList(self, pkglist):
        """take list of package objects and return the best package object.
           If the list is empty, return None. 
           
           Note: this is not aware of multilib so make sure you're only
           passing it packages of a single arch group."""
        
        
        if len(pkglist) == 0:
            return None
            
        if len(pkglist) == 1:
            return pkglist[0]
        
        mysack = ListPackageSack()
        mysack.addList(pkglist)
        bestlist = mysack.returnNewestByNameArch() # get rid of all lesser vers
        
        best = bestlist[0]
        for pkg in bestlist[1:]:
            if len(pkg.name) < len(best.name): # shortest name silliness
                best = pkg
                continue
            elif len(pkg.name) > len(best.name):
                continue

            # compare arch
            arch = rpmUtils.arch.getBestArchFromList([pkg.arch, best.arch])
            if arch == pkg.arch:
                best = pkg
                continue

        return best

    def bestPackagesFromList(self, pkglist, arch=None):
        """Takes a list of packages, returns the best packages.
           This function is multilib aware so that it will not compare
           multilib to singlelib packages""" 
    
        returnlist = []
        compatArchList = rpmUtils.arch.getArchList(arch)
        multiLib = []
        singleLib = []
        for po in pkglist:
            if po.arch not in compatArchList:
                continue
            elif rpmUtils.arch.isMultiLibArch(arch=po.arch):
                multiLib.append(po)
            else:
                singleLib.append(po)
                
        # we should have two lists now - one of singleLib packages
        # one of multilib packages
        # go through each one and find the best package(s)
        for pkglist in [multiLib, singleLib]:
            best = self._bestPackageFromList(pkglist)
            if best is not None:
                returnlist.append(best)
        
        return returnlist


    def install(self, po=None, **kwargs):
        """try to mark for install the item specified. Uses provided package 
           object, if available. If not it uses the kwargs and gets the best
           packages from the keyword options provided 
           returns the list of txmbr of the items it installs
           
           """
        
        self.doRepoSetup()
        self.doSackSetup()
        self.doRpmDBSetup()
        self.doUpdateSetup()
        
        pkgs = []
        if po:
            if isinstance(po, YumAvailablePackage) or isinstance(po, YumLocalPackage):
                pkgs.append(po)
            else:
                raise Errors.InstallError, 'Package Object was not a package object instance'
            
        else:
            if not kwargs.keys():
                raise Errors.InstallError, 'Nothing specified to install'

            if kwargs.has_key('pattern'):
                exactmatch, matched, unmatched = \
                    parsePackages(self.pkgSack.returnPackages(),[kwargs['pattern']] , casematch=1)
                pkgs.extend(exactmatch)
                pkgs.extend(matched)

            else:
                nevra_dict = self._nevra_kwarg_parse(kwargs)

                pkgs = self.pkgSack.searchNevra(name=nevra_dict['name'],
                     epoch=nevra_dict['epoch'], arch=nevra_dict['arch'],
                     ver=nevra_dict['version'], rel=nevra_dict['release'])
                
                if pkgs:
                    pkgs = self.bestPackagesFromList(pkgs)

        if len(pkgs) == 0:
            #FIXME - this is where we could check to see if it already installed
            # for returning better errors
            raise Errors.InstallError, 'No package(s) available to install'
        
        # FIXME - lots more checking here
        #  - install instead of erase
        #  - better error handling/reporting
        
        tx_return = []
        for po in pkgs:
            if self.tsInfo.exists(pkgtup=po.pkgtup):
                self.log(4, 'Package: %s  - already in transaction set' % po)
                tx_return.extend(self.tsInfo.getMembers(pkgtup=po.pkgtup))
                continue
            
            # make sure this shouldn't be passed to update:
            if self.up.updating_dict.has_key(po.pkgtup):
                txmbrs = self.update(po=po)
                tx_return.extend(txmbrs)
                continue
            
            # make sure it's not already installed
            if self.rpmdb.installed(name=po.name, arch=po.arch, epoch=po.epoch,
                    rel=po.rel, ver=po.ver):
                self.errorlog(2, 'Package %s already installed and latest version' % po)
                continue
            
            # make sure we're not installing a package which is obsoleted by something
            # else in the repo
            thispkgobsdict = self.up.checkForObsolete([po.pkgtup])
            if thispkgobsdict.has_key(po.pkgtup):
                obsoleting = thispkgobsdict[po.pkgtup][0]
                obsoleting_pkg = self.getPackageObject(obsoleting)
                self.install(po=obsoleting_pkg)
                continue
                
            txmbr = self.tsInfo.addInstall(po)
            tx_return.append(txmbr)
        
        return tx_return

    
    def update(self, po=None, **kwargs):
        """try to mark for update the item(s) specified. 
            po is a package object - if that is there, mark it for update,
            if possible
            else use **kwargs to match the package needing update
            if nothing is specified at all then attempt to update everything
            
            returns the list of txmbr of the items it marked for update"""
        
        # do updates list
        # do obsoletes list
        
        # check for args - if no po nor kwargs, do them all
        # if po, do it, ignore all else
        # if no po do kwargs
        # uninstalled pkgs called for update get returned with errors in a list, maybe?

        self.doRepoSetup()
        self.doSackSetup()
        self.doRpmDBSetup()
        self.doUpdateSetup()
        updates = self.up.getUpdatesTuples()
        if self.conf.obsoletes:
            obsoletes = self.up.getObsoletesTuples(newest=1)
        else:
            obsoletes = []


        tx_return = []
        if not po and not kwargs.keys(): # update everything (the easy case)
            self.log(5, 'Updating Everything')
            for (obsoleting, installed) in obsoletes:
                obsoleting_pkg = self.getPackageObject(obsoleting)
                hdr = self.rpmdb.returnHeaderByTuple(installed)[0]
                installed_pkg =  YumInstalledPackage(hdr)
                txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
                self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
                tx_return.append(txmbr)
                
            for (new, old) in updates:
                if self.tsInfo.isObsoleted(pkgtup=old):
                    self.log(5, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s' % old)
                else:
                    updating_pkg = self.getPackageObject(new)
                    hdr = self.rpmdb.returnHeaderByTuple(old)[0]
                    updated_pkg = YumInstalledPackage(hdr)
                    txmbr = self.tsInfo.addUpdate(updating_pkg, updated_pkg)
                    tx_return.append(txmbr)
            
            return tx_return

        else:
            instpkgs = []
            availpkgs = []
            if po: # just a po
                if po.repoid == 'installed':
                    instpkgs.append(po)
                else:
                    availpkgs.append(po)
                
            else: # we have kwargs, sort them out.
                nevra_dict = self._nevra_kwarg_parse(kwargs)

                availpkgs = self.pkgSack.searchNevra(name=nevra_dict['name'],
                          epoch=nevra_dict['epoch'], arch=nevra_dict['arch'],
                        ver=nevra_dict['version'], rel=nevra_dict['release'])
                
                installed_tuples = self.rpmdb.returnTupleByKeyword(
                                name=nevra_dict['name'], epoch=nevra_dict['epoch'],
                                arch=nevra_dict['arch'], ver=nevra_dict['version'],
                                rel=nevra_dict['release'])
            
                for tup in installed_tuples:
                    hdr = self.rpmdb.returnHeaderByTuple(tup)[0]
                    installed_pkg =  YumInstalledPackage(hdr)
                    instpkgs.append(installed_pkg)
            
            # for any thing specified
            # get the list of available pkgs matching it (or take the po)
            # get the list of installed pkgs matching it (or take the po)
            # go through each list and look for:
               # things obsoleting it if it is an installed pkg
               # things it updates if it is an available pkg
               # things updating it if it is an installed pkg
               # in that order
               # all along checking to make sure we:
                # don't update something that's already been obsoleted
            
            # TODO: we should search the updates and obsoletes list and
            # mark the package being updated or obsoleted away appropriately
            # and the package relationship in the tsInfo
            
            for installed_pkg in instpkgs:
                if self.up.obsoleted_dict.has_key(installed_pkg.pkgtup) and self.conf.obsoletes:
                    obsoleting = self.up.obsoleted_dict[installed_pkg.pkgtup][0]
                    obsoleting_pkg = self.getPackageObject(obsoleting)
                    # FIXME check for what might be in there here
                    txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
                    self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
                    tx_return.append(txmbr)
            
            for available_pkg in availpkgs:
                if self.up.updating_dict.has_key(available_pkg.pkgtup):
                    updated = self.up.updating_dict[available_pkg.pkgtup][0]
                    if self.tsInfo.isObsoleted(updated):
                        self.log(5, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s' % updated)
                    else:
                        hdr = self.rpmdb.returnHeaderByTuple(updated)[0]
                        updated_pkg =  YumInstalledPackage(hdr)
                        txmbr = self.tsInfo.addUpdate(available_pkg, updated_pkg)
                        tx_return.append(txmbr)
                    
            for installed_pkg in instpkgs:
                if self.up.updatesdict.has_key(installed_pkg.pkgtup):
                    updating = self.up.updatesdict[installed_pkg.pkgtup][0]
                    updating_pkg = self.getPackageObject(updating)
                    if self.tsInfo.isObsoleted(installed_pkg.pkgtup):
                        self.log(5, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s' % installed_pkg.pkgtup)
                    else:
                        txmbr = self.tsInfo.addUpdate(updating_pkg, installed_pkg)
                        tx_return.append(txmbr)

        return tx_return
        
        
    def remove(self, po=None, **kwargs):
        """try to find and mark for remove the specified package(s) -
            if po is specified then that package object (if it is installed) 
            will be marked for removal.
            if no po then look at kwargs, if neither then raise an exception"""

        if not po and not kwargs.keys():
            raise Errors.RemoveError, 'Nothing specified to remove'
        
        self.doRpmDBSetup()
        tx_return = []
        pkgs = []
        
        if po:
            pkgs = [po]
        else:
            nevra_dict = self._nevra_kwarg_parse(kwargs)

            installed_tuples = self.rpmdb.returnTupleByKeyword(
                            name=nevra_dict['name'], epoch=nevra_dict['epoch'],
                            arch=nevra_dict['arch'], ver=nevra_dict['version'],
                            rel=nevra_dict['release'])

            for tup in installed_tuples:
                hdr = self.rpmdb.returnHeaderByTuple(tup)[0]
                installed_pkg =  YumInstalledPackage(hdr)
                pkgs.append(installed_pkg)

        
        if len(pkgs) == 0: # should this even be happening?
            self.errorlog(3, "No package matched to remove")

        for po in pkgs:
            txmbr = self.tsInfo.addErase(po)
            tx_return.append(txmbr)
        
        return tx_return

    def _nevra_kwarg_parse(self, kwargs):
            
        returndict = {}
        
        try: returndict['name'] = kwargs['name']
        except KeyError:  returndict['name'] = None

        try: returndict['epoch'] = kwargs['epoch']
        except KeyError: returndict['epoch'] = None

        try: returndict['arch'] = kwargs['arch']
        except KeyError: returndict['arch'] = None
        
        # get them as ver, version and rel, release - if someone
        # specifies one of each then that's kinda silly.
        try: returndict['version'] = kwargs['version']
        except KeyError: returndict['version'] = None
        if returndict['version'] is None:
            try: returndict['version'] = kwargs['ver']
            except KeyError: returndict['version'] = None

        try: returndict['release'] = kwargs['release']
        except KeyError: returndict['release'] = None
        if returndict['release'] is None:
            try: release = kwargs['rel']
            except KeyError: returndict['release'] = None
        
        return returndict

    def _isPackageInstalled(self, pkgname):
        # FIXME: Taken from anaconda/pirut 
        # clean up and make public
        installed = False
        if self.rpmdb.installed(name = pkgname):
            installed = True

        lst = self.tsInfo.matchNaevr(name = pkgname)
        for txmbr in lst:
            if txmbr.output_state in TS_INSTALL_STATES:
                return True
        if installed and len(lst) > 0:
            # if we get here, then it was installed, but it's in the tsInfo
            # for an erase or obsoleted --> not going to be installed at end
            return False
        return installed


--- NEW FILE comps.py ---
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University

import sys
from constants import *
from cElementTree import iterparse
import exceptions


lang_attr = '{http://www.w3.org/XML/1998/namespace}lang'

def parse_boolean(strng):
    if BOOLEAN_STATES.has_key(strng.lower()):
        return BOOLEAN_STATES[strng.lower()]
    else:
        return False

def parse_number(strng):
    return int(strng)

class CompsException(exceptions.Exception):
    pass
        
class Group(object):
    def __init__(self, elem=None):
        self.user_visible = True
        self.default = False
        self.selected = False
        self.name = ""
        self.description = ""
        self.translated_name = {}
        self.translated_description = {}
        self.mandatory_packages = {}
        self.optional_packages = {}
        self.default_packages = {}
        self.conditional_packages = {}
        self.langonly = None ## what the hell is this?
        self.groupid = None
        self.display_order = 1024
        self.installed = False
        self.toremove = False
        

        if elem:
            self.parse(elem)
        
    def __str__(self):
        return self.name
    
    def _packageiter(self):
        lst = self.mandatory_packages.keys() + \
              self.optional_packages.keys() + \
              self.default_packages.keys() + \
              self.conditional_packages.keys() 
        
        return lst
    
    packages = property(_packageiter)
    
    def nameByLang(self, lang):
        if self.translated_name.has_key[lang]:
            return self.translated_name[lang]
        else:
            return self.name


    def descriptionByLang(self, lang):
        if self.translated_description.has_key[lang]:
            return self.translated_description[lang]
        else:
            return self.description

    def parse(self, elem):
        for child in elem:

            if child.tag == 'id':
                id = child.text
                if self.groupid is not None:
                    raise CompsException
                self.groupid = id
            
            elif child.tag == 'name':
                text = child.text
                if text:
                    text = text.encode('utf8')
                
                lang = child.attrib.get(lang_attr)
                if lang:
                    self.translated_name[lang] = text
                else:
                    self.name = text
    
    
            elif child.tag == 'description':
                text = child.text
                if text:
                    text = text.encode('utf8')
                    
                lang = child.attrib.get(lang_attr)
                if lang:
                    self.translated_description[lang] = text
                else:
                    self.description = text
    
            elif child.tag == 'uservisible':
                self.user_visible = parse_boolean(child.text)
    
            elif child.tag == 'display_order':
                self.display_order = parse_number(child.text)

            elif child.tag == 'default':
                self.default = parse_boolean(child.text)
    
            elif child.tag == 'langonly': ## FIXME - what the hell is langonly?
                text = child.text
                if self.langonly is not None:
                    raise CompsException
                self.langonly = text
    
            elif child.tag == 'packagelist':
                self.parse_package_list(child)
    
    def parse_package_list(self, packagelist_elem):
        for child in packagelist_elem:
            if child.tag == 'packagereq':
                type = child.attrib.get('type')
                if not type:
                    type = u'mandatory'

                if type not in ('mandatory', 'default', 'optional', 'conditional'):
                    raise CompsException

                package = child.text
                if type == 'mandatory':
                    self.mandatory_packages[package] = 1
                elif type == 'default':
                    self.default_packages[package] = 1
                elif type == 'optional':
                    self.optional_packages[package] = 1
                elif type == 'conditional':
                    self.conditional_packages[package] = child.attrib.get('requires')



    def add(self, obj):
        """Add another group object to this object"""
    
        # we only need package lists and any translation that we don't already
        # have
        
        for pkg in obj.mandatory_packages.keys():
            self.mandatory_packages[pkg] = 1
        for pkg in obj.default_packages.keys():
            self.default_packages[pkg] = 1
        for pkg in obj.optional_packages.keys():
            self.optional_packages[pkg] = 1
        for pkg in obj.conditional_packages.keys():
            self.conditional_packages[pkg] = obj.conditional_packages[pkg]
        
        # name and description translations
        for lang in obj.translated_name.keys():
            if not self.translated_name.has_key(lang):
                self.translated_name[lang] = obj.translated_name[lang]
        
        for lang in obj.translated_description.keys():
            if not self.translated_description.has_key(lang):
                self.translated_description[lang] = obj.translated_description[lang]
        
        
        


class Category(object):
    def __init__(self, elem=None):
        self.name = ""
        self.categoryid = None
        self.description = ""
        self.translated_name = {}
        self.translated_description = {}
        self.display_order = 1024
        self._groups = {}        

        if elem:
            self.parse(elem)
            
    def __str__(self):
        return self.name
    
    def _groupiter(self):
        return self._groups.keys()
    
    groups = property(_groupiter)
    
    def parse(self, elem):
        for child in elem:
            if child.tag == 'id':
                id = child.text
                if self.categoryid is not None:
                    raise CompsException
                self.categoryid = id

            elif child.tag == 'name':
                text = child.text
                if text:
                    text = text.encode('utf8')
                    
                lang = child.attrib.get(lang_attr)
                if lang:
                    self.translated_name[lang] = text
                else:
                    self.name = text
    
            elif child.tag == 'description':
                text = child.text
                if text:
                    text = text.encode('utf8')
                    
                lang = child.attrib.get(lang_attr)
                if lang:
                    self.translated_description[lang] = text
                else:
                    self.description = text
            
            elif child.tag == 'grouplist':
                self.parse_group_list(child)

            elif child.tag == 'display_order':
                self.display_order = parse_number(child.text)

    def parse_group_list(self, grouplist_elem):
        for child in grouplist_elem:
            if child.tag == 'groupid':
                groupid = child.text
                self._groups[groupid] = 1

    def add(self, obj):
        """Add another category object to this object"""
    
        for grp in obj.groups:
            self._groups[grp] = 1
        
        # name and description translations
        for lang in obj.translated_name.keys():
            if not self.translated_name.has_key(lang):
                self.translated_name[lang] = obj.translated_name[lang]
        
        for lang in obj.translated_description.keys():
            if not self.translated_description.has_key(lang):
                self.translated_description[lang] = obj.translated_description[lang]

        
class Comps:
    def __init__(self, overwrite_groups=False):
        self._groups = {}
        self._categories = {}
        self.compscount = 0
        self.overwrite_groups = overwrite_groups
        self.compiled = False # have groups been compiled into avail/installed 
                              # lists, yet.


    def __sort_order(self, item1, item2):
        if item1.display_order > item2.display_order:
            return 1
        elif item1.display_order == item2.display_order:
            return 0
        else:
            return -1
    
    def get_groups(self):
        grps = self._groups.values()
        grps.sort(self.__sort_order)
        return grps
        
    def get_categories(self):
        cats = self._categories.values()
        cats.sort(self.__sort_order)
        return cats
        
    
    groups = property(get_groups)
    categories = property(get_categories)
    
    
    
    def has_group(self, grpid):
        exists = self.return_group(grpid)
            
        if exists:
            return True
            
        return False
    
    def return_group(self, grpid):
        if self._groups.has_key(grpid):
            return self._groups[grpid]
        
        # do matches against group names and ids, too
        for group in self.groups:
            names = [ group.name, group.groupid ]
            names.extend(group.translated_name.values())
            if grpid in names:
                return group

        
        return None


    def add(self, srcfile = None):
        if not srcfile:
            raise CompsException
            
        if type(srcfile) == type('str'):
            # srcfile is a filename string
            infile = open(srcfile, 'rt')
        else:
            # srcfile is a file object
            infile = srcfile
        
        self.compscount += 1
        self.compiled = False
        
        parser = iterparse(infile)

        for event, elem in parser:
            if elem.tag == "group":
                group = Group(elem)
                if self._groups.has_key(group.groupid):
                    thatgroup = self._groups[group.groupid]
                    thatgroup.add(group)
                else:
                    self._groups[group.groupid] = group

            if elem.tag == "category":
                category = Category(elem)
                if self._categories.has_key(category.categoryid):
                    thatcat = self._categories[category.categoryid]
                    thatcat.add(category)
                else:
                    self._categories[category.categoryid] = category
        
        del parser
        
    def compile(self, pkgtuplist):
        """ compile the groups into installed/available groups """
        
        # convert the tuple list to a simple dict of pkgnames
        inst_pkg_names = {}
        for (n,a,e,v,r) in pkgtuplist:
            inst_pkg_names[n] = 1
        

        for group in self.groups:
            # if there are mandatory packages in the group, then make sure
            # they're all installed.  if any are missing, then the group
            # isn't installed.
            if len(group.mandatory_packages.keys()) > 0:
                check_pkgs = group.mandatory_packages.keys()
                group.installed = True
                for pkgname in check_pkgs:
                    if not inst_pkg_names.has_key(pkgname):
                        group.installed = False
                        break
            # if it doesn't have any of those then see if it has ANY of the
            # optional/default packages installed.
            # If so - then the group is installed
            else:
                check_pkgs = group.optional_packages.keys() + group.default_packages.keys() + group.conditional_packages.keys()
                group.installed = False
                for pkgname in check_pkgs:
                    if inst_pkg_names.has_key(pkgname):
                        group.installed = True
                        break
        
        self.compiled = True

def main():

    try:
        print sys.argv[1]
        p = Comps()
        for srcfile in sys.argv[1:]:
            p.add(srcfile)

        for group in p.groups:
            print group
            for pkg in group.packages:
                print '  ' + pkg
        
        for category in p.categories:
            print category.name
            for group in category.groups:
                print '  ' + group
                
    except IOError:
        print >> sys.stderr, "newcomps.py: No such file:\'%s\'" % sys.argv[1]
        sys.exit(1)
        
if __name__ == '__main__':
    main()



--- NEW FILE config.py ---
#!/usr/bin/python -t

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2002 Duke University 

import os
import warnings
import rpm
import copy
import urlparse
import sys
from parser import IncludingConfigParser, IncludedDirConfigParser
from ConfigParser import NoSectionError, NoOptionError
import rpmUtils.transaction
import rpmUtils.arch
import Errors
from repos import Repository

class OptionData(object):
    '''
    Simple class to track state for a single option instance.
    '''
    def __init__(self, name, initial_value):
        self.name = name
        self.value = initial_value
        self.parser = None
        self.section = None

class Option(object):
    '''
    This class handles a single Yum configuration file option. Create
    subclasses for each type of supported configuration option.
    
    Python descriptor foo (__get__ and __set__) is used to make option
    definition easy and consise.
    '''

    def __init__(self, default=None):
        self._setattrname()
        self.inherit = False
        self.default = default

    def _setattrname(self):
        '''Calculate the internal attribute name used to store option state in
        configuration instances.
        '''
        self._attrname = '__opt%d' % id(self)

    def __get__(self, obj, objtype):
        '''Called when the option is read (via the descriptor protocol). 

        @param obj: The configuration instance to modify.
        @param objtype: The type of the config instance (not used).
        @return: The parsed option value or the default value if the value
            wasn't set in the configuration file.
        '''
        if obj is None:
            return self
        optdata = getattr(obj, self._attrname, None)
        if optdata == None:
            return None
        else:
            return optdata.value

    def __set__(self, obj, value):
        '''Called when the option is set (via the descriptor protocol). 

        @param obj: The configuration instance to modify.
        @param value: The value to set the option to.
        @return: Nothing.
        '''
        optdata = getattr(obj, self._attrname)
       
        # Only try to parse if its a string
        if isinstance(value, basestring):
            try:
                value = self.parse(value)
            except ValueError, e:
                # Add the field name onto the error
                raise ValueError('Error parsing %r: %s' % (optdata.name,
                    str(e)))

        optdata.value = value

        # Write string value back to parser instance if possible
        if optdata.parser != None:
            strvalue = self.tostring(value)
            optdata.parser.set(optdata.section, optdata.name, strvalue)

    def setup(self, obj, name):
        '''Initialise the option for a config instance. 
        This must be called before the option can be set or retrieved. 

        @param obj: BaseConfig (or subclass) instance.
        @param name: Name of the option.
        '''
        setattr(obj, self._attrname, OptionData(name, self.default))

    def setparser(self, obj, parser, section):
        '''Set the configuration parser for this option. This is required so
        that options can be written back to a configuration file.

        @param obj: BaseConfig (or subclass) instance.
        @param parser: ConfigParser (or subclass) where the option is read from.
        @param section: config file section where the option is from.
        '''
        optdata = getattr(obj, self._attrname)
        optdata.parser = parser
        optdata.section = section

    def clone(self):
        '''Return a safe copy of this Option instance
        '''
        new = copy.copy(self)
        new._setattrname()
        return new

    def parse(self, s):
        '''Parse the string value to the Option's native value.

        @param s: Raw string value to parse.
        @return: Validated native value.
    
        Will raise ValueError if there was a problem parsing the string.
        Subclasses should override this.
        '''
        return s

    def tostring(self, value):
        '''Convert the Option's native value to a string value.

        @param value: Native option value.
        @return: String representation of input.

        This does the opposite of the parse() method above.
        Subclasses should override this.
        '''
        return str(value)

def Inherit(option_obj):
    '''Clone an Option instance for the purposes of inheritance. The returned
    instance has all the same properties as the input Option and shares items
    such as the default value. Use this to avoid redefinition of reused
    options.

    @param option_obj: Option instance to inherit.
    @return: New Option instance inherited from the input.
    '''
    new_option = option_obj.clone()
    new_option.inherit = True
    return new_option

class ListOption(Option):

    def __init__(self, default=None):
        if default is None:
            default = []
        super(ListOption, self).__init__(default)

    def parse(self, s):
        """Converts a string from the config file to a workable list

        Commas and spaces are used as separators for the list
        """
        # we need to allow for the '\n[whitespace]' continuation - easier
        # to sub the \n with a space and then read the lines
        s = s.replace('\n', ' ')
        s = s.replace(',', ' ')
        return s.split()

    def tostring(self, value):
        return '\n '.join(value)

class UrlOption(Option):
    '''
    This option handles lists of URLs with validation of the URL scheme.
    '''

    def __init__(self, default=None, schemes=('http', 'ftp', 'file', 'https'), 
            allow_none=False):
        super(UrlOption, self).__init__(default)
        self.schemes = schemes
        self.allow_none = allow_none

    def parse(self, url):
        url = url.strip()

        # Handle the "_none_" special case
        if url.lower() == '_none_':
            if self.allow_none:
                return None
            else:
                raise ValueError('"_none_" is not a valid value')

        # Check that scheme is valid
        (s,b,p,q,f,o) = urlparse.urlparse(url)
        if s not in self.schemes:
            raise ValueError('URL must be %s not "%s"' % (self._schemelist(), s))

        return url

    def _schemelist(self):
        '''Return a user friendly list of the allowed schemes
        '''
        if len(self.schemes) < 1:
            return 'empty'
        elif len(self.schemes) == 1:
            return self.schemes[0]
        else:
            return '%s or %s' % (', '.join(self.schemes[:-1]), self.schemes[-1])

class UrlListOption(ListOption):
    '''
    Option for handling lists of URLs with validation of the URL scheme.
    '''

    def __init__(self, default=None, schemes=('http', 'ftp', 'file', 'https')):
        super(UrlListOption, self).__init__(default)

        # Hold a UrlOption instance to assist with parsing
        self._urloption = UrlOption(schemes=schemes)
        
    def parse(self, s):
        out = []
        for url in super(UrlListOption, self).parse(s):
            out.append(self._urloption.parse(url))
        return out


class IntOption(Option):
    def parse(self, s):
        try:
            return int(s)
        except (ValueError, TypeError), e:
            raise ValueError('invalid integer value')

class BoolOption(Option):
    def parse(self, s):
        s = s.lower()
        if s in ('0', 'no', 'false'):
            return False
        elif s in ('1', 'yes', 'true'):
            return True
        else:
            raise ValueError('invalid boolean value')

    def tostring(self, value):
        if value:
            return "yes"
        else:
            return "no"

class FloatOption(Option):
    def parse(self, s):
        try:
            return float(s.strip())
        except (ValueError, TypeError):
            raise ValueError('invalid float value')

class SelectionOption(Option):
    '''Handles string values where only specific values are allowed
    '''
    def __init__(self, default=None, allowed=()):
        super(SelectionOption, self).__init__(default)
        self._allowed = allowed
        
    def parse(self, s):
        if s not in self._allowed:
            raise ValueError('"%s" is not an allowed value' % s)
        return s

class BytesOption(Option):

    # Multipliers for unit symbols
    MULTS = {
        'k': 1024,
        'm': 1024*1024,
        'g': 1024*1024*1024,
    }

    def parse(self, s):
        """Parse a friendly bandwidth option to bytes

        The input should be a string containing a (possibly floating point)
        number followed by an optional single character unit. Valid units are
        'k', 'M', 'G'. Case is ignored.
       
        Valid inputs: 100, 123M, 45.6k, 12.4G, 100K, 786.3, 0
        Invalid inputs: -10, -0.1, 45.6L, 123Mb

        Return value will always be an integer

        1k = 1024 bytes.

        ValueError will be raised if the option couldn't be parsed.
        """
        if len(s) < 1:
            raise ValueError("no value specified")

        if s[-1].isalpha():
            n = s[:-1]
            unit = s[-1].lower()
            mult = self.MULTS.get(unit, None)
            if not mult:
                raise ValueError("unknown unit '%s'" % unit)
        else:
            n = s
            mult = 1
             
        try:
            n = float(n)
        except ValueError:
            raise ValueError("couldn't convert '%s' to number" % n)

        if n < 0:
            raise ValueError("bytes value may not be negative")

        return int(n * mult)

class ThrottleOption(BytesOption):

    def parse(self, s):
        """Get a throttle option. 

        Input may either be a percentage or a "friendly bandwidth value" as
        accepted by the BytesOption.

        Valid inputs: 100, 50%, 80.5%, 123M, 45.6k, 12.4G, 100K, 786.0, 0
        Invalid inputs: 100.1%, -4%, -500

        Return value will be a int if a bandwidth value was specified or a
        float if a percentage was given.

        ValueError will be raised if input couldn't be parsed.
        """
        if len(s) < 1:
            raise ValueError("no value specified")

        if s[-1] == '%':
            n = s[:-1]
            try:
                n = float(n)
            except ValueError:
                raise ValueError("couldn't convert '%s' to number" % n)
            if n < 0 or n > 100:
                raise ValueError("percentage is out of range")
            return n / 100.0
        else:
            return BytesOption.parse(self, s)


class BaseConfig(object):
    '''
    Base class for storing configuration definitions. Subclass when creating
    your own definitons.
    '''

    def __init__(self):
        self._section = None

        for name in self.iterkeys():
            option = self.optionobj(name)
            option.setup(self, name)

    def __str__(self):
        out = []
        out.append('[%s]' % self._section)
        for name, value in self.iteritems():
            out.append('%s: %r' % (name, value))
        return '\n'.join(out)

    def populate(self, parser, section, parent=None):
        '''Set option values from a INI file section.

        @param parser: ConfParser instance (or subclass)
        @param section: INI file section to read use.
        @param parent: Optional parent BaseConfig (or subclass) instance to use
            when doing option value inheritance.
        '''
        self._section = section
        self.cfg = parser           # Keep a reference to the parser

        for name in self.iterkeys():
            option = self.optionobj(name)
            value = None
            try:
                value = parser.get(section, name)
            except (NoSectionError, NoOptionError):
                # No matching option in this section, try inheriting
                if parent and option.inherit:
                    value = getattr(parent, name)
               
            option.setparser(self, parser, section)
            if value is not None:
                setattr(self, name, value)

    def optionobj(cls, name):
        '''Return the Option instance for the given name
        '''
        # Look for Option instances in this class and base classes so that
        # option inheritance works
        for klass in (cls,) + cls.__bases__:
            obj = klass.__dict__.get(name, None)
            if obj is not None:
                break

        if obj is not None and isinstance(obj, Option):
            return obj
        else:
            raise KeyError
    optionobj = classmethod(optionobj)

    def isoption(cls, name):
        '''Return True if the given name refers to a defined option 
        '''
        try:
            cls.optionobj(name)
            return True
        except KeyError:
            return False
    isoption = classmethod(isoption)

    def iterkeys(self):
        '''Yield the names of all defined options in the instance.
        '''
        for name, item in self.iteritems():
            yield name

    def iteritems(self):
        '''Yield (name, value) pairs for every option in the instance.

        The value returned is the parsed, validated option value.
        '''
        # Use dir() so that we see inherited options too
        for name in dir(self):
            if self.isoption(name):
                yield (name, getattr(self, name))

    def getConfigOption(self, option, default=None):
        warnings.warn('getConfigOption() will go away in a future version of Yum.\n'
                'Please access option values as attributes or using getattr().',
                DeprecationWarning)
        if hasattr(self, option):
            return getattr(self, option)
        return default

    def setConfigOption(self, option, value):
        warnings.warn('setConfigOption() will go away in a future version of Yum.\n'
                'Please set option values as attributes or using setattr().',
                DeprecationWarning)
        if hasattr(self, option):
            setattr(self, option, value)
        else:
            raise Errors.ConfigError, 'No such option %s' % option

class EarlyConf(BaseConfig):
    '''
    Configuration option definitions for yum.conf's [main] section that are
    required before the other [main] options can be parsed (mainly due to
    variable substitution).
    '''
    distroverpkg = Option('fedora-release')
    installroot = Option('/')

class YumConf(EarlyConf):
    '''
    Configuration option definitions for yum.conf\'s [main] section.

    Note: inherits options from EarlyConf too.
    '''

    debuglevel = IntOption(2)
    errorlevel = IntOption(2)
    retries = IntOption(10)
    recent = IntOption(7)

    cachedir = Option('/var/cache/yum')
    keepcache = BoolOption(True)
    logfile = Option('/var/log/yum.log')
    reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
    syslog_ident = Option()
    syslog_facility = Option('LOG_DAEMON')

    commands = ListOption()
    exclude = ListOption()
    failovermethod = Option('roundrobin')
    yumversion = Option('unversioned')
    proxy = UrlOption(schemes=('http', 'ftp', 'https'), allow_none=True)
    proxy_username = Option()
    proxy_password = Option()
    pluginpath = ListOption(['/usr/lib/yum-plugins'])
    installonlypkgs = ListOption(['kernel', 'kernel-bigmem',
            'kernel-enterprise','kernel-smp', 'kernel-modules', 'kernel-debug',
            'kernel-unsupported', 'kernel-source', 'kernel-devel'])
    kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
            'kernel-bigmem', 'kernel-BOOT'])
    exactarchlist = ListOption(['kernel', 'kernel-smp', 'glibc',
            'kernel-hugemem', 'kernel-enterprise', 'kernel-bigmem',
            'kernel-devel'])
    tsflags = ListOption()

    assumeyes = BoolOption(False)
    alwaysprompt = BoolOption(True)
    exactarch = BoolOption(True)
    tolerant = BoolOption(True)
    diskspacecheck = BoolOption(True)
    overwrite_groups = BoolOption(False)
    keepalive = BoolOption(True)
    gpgcheck = BoolOption(False)
    obsoletes = BoolOption(False)
    showdupesfromrepos = BoolOption(False)
    enabled = BoolOption(True)
    plugins = BoolOption(False)
    enablegroups = BoolOption(True)
    enable_group_conditionals = BoolOption(True)

    timeout = FloatOption(30.0)

    bandwidth = BytesOption(0)
    throttle = ThrottleOption(0)

    http_caching = SelectionOption('all', ('none', 'packages', 'all'))
    metadata_expire = IntOption(1800)   # time in seconds

class RepoConf(BaseConfig):
    '''
    Option definitions for repository INI file sections.
    '''
    name = Option()
    enabled = Inherit(YumConf.enabled)
    baseurl = UrlListOption()
    mirrorlist = UrlOption()
    gpgkey = UrlListOption()
    exclude = ListOption() 
    includepkgs = ListOption() 

    proxy = Inherit(YumConf.proxy)
    proxy_username = Inherit(YumConf.proxy_username)
    proxy_password = Inherit(YumConf.proxy_password)
    retries = Inherit(YumConf.retries)
    failovermethod = Inherit(YumConf.failovermethod)

    gpgcheck = Inherit(YumConf.gpgcheck)
    keepalive = Inherit(YumConf.keepalive)
    enablegroups = Inherit(YumConf.enablegroups)

    bandwidth = Inherit(YumConf.bandwidth)
    throttle = Inherit(YumConf.throttle)
    timeout = Inherit(YumConf.timeout)
    http_caching = Inherit(YumConf.http_caching)
    metadata_expire = Inherit(YumConf.metadata_expire)

def readMainConfig(configfile, root):
    '''Parse Yum's main configuration file

    @param configfile: Path to the configuration file to parse (typically
        '/etc/yum.conf').
    @param root: The base path to use for installation (typically '/')
    @return: Populated YumConf instance.
    '''

    # Read up config variables that are needed early to calculate substitution
    # variables
    EarlyConf.installroot.default = root
    earlyconf = EarlyConf()
    confparser = IncludingConfigParser()
    if not os.path.exists(configfile):
        raise Errors.ConfigError, 'No such config file %s' % configfile

    confparser.read(configfile)
    earlyconf.populate(confparser, 'main')

    # Set up substitution vars
    vars = _getEnvVar()
    vars['basearch'] = rpmUtils.arch.getBaseArch()          # FIXME make this configurable??
    vars['arch'] = rpmUtils.arch.getCanonArch()             # FIXME make this configurable??
    vars['releasever'] = _getsysver(earlyconf.installroot, earlyconf.distroverpkg)

    # Read [main] section
    yumconf = YumConf()
    confparser = IncludingConfigParser(vars=vars)
    confparser.read(configfile)
    yumconf.populate(confparser, 'main')

    # Apply the installroot to directory options
    for option in ('cachedir', 'logfile'):
        path = getattr(yumconf, option)
        setattr(yumconf, option, yumconf.installroot + path)
    
    # Check that plugin paths are all absolute
    for path in yumconf.pluginpath:
        if not path.startswith('/'):
            raise Errors.ConfigError("All plugin search paths must be absolute")

    # Add in some extra attributes which aren't actually configuration values 
    yumconf.yumvar = vars
    yumconf.uid = 0
    yumconf.cache = 0
    yumconf.progess_obj = None

    return yumconf

def readRepoConfig(parser, section, mainconf):
    '''Parse an INI file section for a repository.

    @param parser: ConfParser or similar to read INI file values from.
    @param section: INI file section to read.
    @param mainconf: ConfParser or similar for yum.conf.
    @return: Repository instance.
    '''

    conf = RepoConf()
    conf.populate(parser, section, mainconf)

    # Ensure that the repo name is set
    if not conf.name:
        conf.name = section
        print >> sys.stderr, \
            'Repository %r is missing name in configuration, using id' % section

    thisrepo = Repository(section)

    # Transfer attributes across
    #TODO: merge RepoConf and Repository 
    for k, v in conf.iteritems():
        if v or not hasattr(thisrepo, k):
            thisrepo.set(k, v)

    # Set attributes not from the config file
    thisrepo.basecachedir = mainconf.cachedir
    thisrepo.yumvar.update(mainconf.yumvar)
    thisrepo.cfg = parser

    return thisrepo

def getOption(conf, section, name, default, option):
    '''Convenience function to retrieve a parsed and converted value from a
    ConfigParser.

    @param conf: ConfigParser instance or similar
    @param section: Section name
    @param name: Option name
    @param default: Value to use if option is missing
    @param option: Option instance to use for conversion.
    @return: The parsed value or default if value was not present.

    Will raise ValueError if the option could not be parsed.
    '''
    try: 
        val = conf.get(section, name)
    except (NoSectionError, NoOptionError):
        return default
    return option.parse(val)

def _getEnvVar():
    '''Return variable replacements from the environment variables YUM0 to YUM9

    The result is intended to be used with parser.varReplace()
    '''
    yumvar = {}
    for num in range(0, 10):
        env = 'YUM%d' % num
        val = os.environ.get(env, '')
        if val:
            yumvar[env.lower()] = val
    return yumvar

def _getsysver(installroot, distroverpkg):
    '''Calculate the release version for the system.

    @param installroot: The value of the installroot option.
    @param distroverpkg: The value of the distroverpkg option.
    @return: The release version as a string (eg. '4' for FC4)
    '''
    ts = rpmUtils.transaction.initReadOnlyTransaction(root=installroot)
    ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
    idx = ts.dbMatch('provides', distroverpkg)
    # we're going to take the first one - if there is more than one of these
    # then the user needs a beating
    if idx.count() == 0:
        releasever = 'Null'
    else:
        hdr = idx.next()
        releasever = hdr['version']
        del hdr
    del idx
    del ts
    return releasever


#def main():
#    mainconf = readMainConfig('/etc/yum.conf', '/') 
#    repoconf = readRepoConfig(mainconf.cfg, 'core', mainconf)
#
#    print `repoconf.name`
#
#if __name__ == '__main__':
#    main()


--- NEW FILE constants.py ---
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


#Constants
#transaction set states
TS_UPDATE = 10
TS_INSTALL = 20
TS_TRUEINSTALL = 30
TS_ERASE = 40
TS_OBSOLETED = 50
TS_OBSOLETING = 60
TS_AVAILABLE = 70


TS_INSTALL_STATES = [TS_INSTALL, TS_TRUEINSTALL, TS_UPDATE, TS_OBSOLETING]
TS_REMOVE_STATES = [TS_ERASE, TS_OBSOLETED]

# Transaction Relationships
TR_UPDATES = 1
TR_UPDATEDBY = 2
TR_OBSOLETES = 3
TR_OBSOLETEDBY = 4
TR_DEPENDS = 5
TR_DEPENDSON = 6

# Transaction Member Sort Colors
# Each node in a topological sort is colored
# White nodes are unseen, black nodes are seen
# grey nodes are in progress
TX_WHITE = 0
TX_GREY = 1
TX_BLACK = 2

# package object file types
PO_FILE = 1
PO_DIR = 2
PO_GHOST = 3
PO_CONFIG = 4
PO_DOC = 5

# package object package types
PO_REMOTEPKG = 1
PO_LOCALPKG = 2
PO_INSTALLEDPKG = 3

# FLAGS
SYMBOLFLAGS = {'>':'GT', '<':'LT', '=': 'EQ', '==': 'EQ', '>=':'GE', '<=':'LE'}
LETTERFLAGS = {'GT':'>', 'LT':'<', 'EQ':'=', 'GE': '>=', 'LE': '<='}

# Constants for plugin config option registration
PLUG_OPT_STRING = 0
PLUG_OPT_INT = 1
PLUG_OPT_FLOAT = 2
PLUG_OPT_BOOL = 3

PLUG_OPT_WHERE_MAIN = 0
PLUG_OPT_WHERE_REPO = 1
PLUG_OPT_WHERE_ALL = 2

# boolean dict:
BOOLEAN_STATES = {'1': True, 'yes': True, 'true': True, 'on': True,
                  '0': False, 'no': False, 'false': False, 'off': False}


--- NEW FILE depsolve.py ---
#!/usr/bin/python -t
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 

import os
import os.path
import re
import types

import rpmUtils.transaction
import rpmUtils.miscutils
import rpmUtils.arch
from misc import unique
import rpm

from repomd.packageSack import ListPackageSack
from repomd.mdErrors import PackageSackError
from Errors import DepError, RepoError
from constants import *
import packages

class Depsolve(object):
    def __init__(self):
        packages.base = self
        self.dsCallback = None
    
    def initActionTs(self):
        """sets up the ts we'll use for all the work"""
        
        self.ts = rpmUtils.transaction.TransactionWrapper(self.conf.installroot)
        ts_flags_to_rpm = { 'noscripts': rpm.RPMTRANS_FLAG_NOSCRIPTS,
                            'notriggers': rpm.RPMTRANS_FLAG_NOTRIGGERS,
                            'nodocs': rpm.RPMTRANS_FLAG_NODOCS,
                            'test': rpm.RPMTRANS_FLAG_TEST,
                            'repackage': rpm.RPMTRANS_FLAG_REPACKAGE}
        
        self.ts.setFlags(0) # reset everything.
        
        for flag in self.conf.tsflags:
            if ts_flags_to_rpm.has_key(flag):
                self.ts.addTsFlag(ts_flags_to_rpm[flag])
            else:
                self.errorlog(0, 'Invalid tsflag in config file: %s' % flag)

    def whatProvides(self, name, flags, version):
        """searches the packageSacks for what provides the arguments
           returns a ListPackageSack of providing packages, possibly empty"""

        self.log(4, 'Searching pkgSack for dep: %s' % name)
        # we need to check the name - if it doesn't match:
        # /etc/* bin/* or /usr/lib/sendmail then we should fetch the 
        # filelists.xml for all repos to make the searchProvides more complete.
        if name[0] == '/':
            matched = 0
            globs = ['.*bin\/.*', '^\/etc\/.*', '^\/usr\/lib\/sendmail$']
            for glob in globs:
                globc = re.compile(glob)
                if globc.match(name):
                    matched = 1
            if not matched:
                self.doSackFilelistPopulate()
            
        pkgs = self.pkgSack.searchProvides(name)
        if flags == 0:
            flags = None
        

        if type(version) in (types.StringType, types.NoneType):
            (r_e, r_v, r_r) = rpmUtils.miscutils.stringToVersion(version)
        elif type(version) in (types.TupleType, types.ListType): # would this ever be a ListType?
            (r_e, r_v, r_r) = version
        
        defSack = ListPackageSack() # holder for items definitely providing this dep
        
        for po in pkgs:
            self.log(5, 'Potential match for %s from %s' % (name, po))
            if name[0] == '/' and r_v is None:
                # file dep add all matches to the defSack
                defSack.addPackage(po)
                continue

            if po.checkPrco('provides', (name, flags, (r_e, r_v, r_r))):
                defSack.addPackage(po)
                self.log(3, 'Matched %s to require for %s' % (po, name))
        
        return defSack
        
    def allowedMultipleInstalls(self, po):
        """takes a packageObject, returns 1 or 0 depending on if the package 
           should/can be installed multiple times with different vers
           like kernels and kernel modules, for example"""
           
        if po.name in self.conf.installonlypkgs:
            return 1
        
        provides = po.getProvidesNames()
        if filter (lambda prov: prov in self.conf.installonlypkgs, provides):
            return 1
        
        return 0

    def populateTs(self, test=0, keepold=1):
        """take transactionData class and populate transaction set"""

        if self.dsCallback: self.dsCallback.transactionPopulation()
        ts_elem = {}
        if keepold:
            for te in self.ts:
                epoch = te.E()
                if epoch is None:
                    epoch = '0'
                pkginfo = (te.N(), te.A(), epoch, te.V(), te.R())
                if te.Type() == 1:
                    mode = 'i'
                elif te.Type() == 2:
                    mode = 'e'
                
                ts_elem[(pkginfo, mode)] = 1
                
        for txmbr in self.tsInfo.getMembers():
            self.log(6, 'Member: %s' % txmbr)
            if txmbr.ts_state in ['u', 'i']:
                if ts_elem.has_key((txmbr.pkgtup, 'i')):
                    continue
                self.downloadHeader(txmbr.po)
                hdr = txmbr.po.returnLocalHeader()
                rpmfile = txmbr.po.localPkg()
                
                if txmbr.ts_state == 'u':
                    if self.allowedMultipleInstalls(txmbr.po):
                        self.log(5, '%s converted to install' % (txmbr.po))
                        txmbr.ts_state = 'i'
                        txmbr.output_state = TS_INSTALL

                
                self.ts.addInstall(hdr, (hdr, rpmfile), txmbr.ts_state)
                self.log(4, 'Adding Package %s in mode %s' % (txmbr.po, txmbr.ts_state))
                if self.dsCallback: 
                    self.dsCallback.pkgAdded(txmbr.pkgtup, txmbr.ts_state)
            
            elif txmbr.ts_state in ['e']:
                if ts_elem.has_key((txmbr.pkgtup, txmbr.ts_state)):
                    continue
                indexes = self.rpmdb.returnIndexByTuple(txmbr.pkgtup)
                for idx in indexes:
                    self.ts.addErase(idx)
                    if self.dsCallback: self.dsCallback.pkgAdded(txmbr.pkgtup, 'e')
                    self.log(4, 'Removing Package %s' % txmbr.po)
        

    def resolveDeps(self):

        CheckDeps = 1
        conflicts = 0
        missingdep = 0
        depscopy = []
        unresolveableloop = 0

        errors = []
        if self.dsCallback: self.dsCallback.start()

        while CheckDeps > 0:
            self.cheaterlookup = {} # short cache for some information we'd resolve
                                    # (needname, needversion) = pkgtup
            self.populateTs(test=1)
            if self.dsCallback: self.dsCallback.tscheck()
            deps = self.ts.check()

            
            if not deps:
                self.tsInfo.changed = False
                return (2, ['Success - deps resolved'])

            deps = unique(deps) # get rid of duplicate deps            
            if deps == depscopy:
                unresolveableloop += 1
                self.log(5, 'Identical Loop count = %d' % unresolveableloop)
                if unresolveableloop >= 2:
                    errors.append('Unable to satisfy dependencies')
                    for deptuple in deps:
                        ((name, version, release), (needname, needversion), flags, 
                          suggest, sense) = deptuple
                        if sense == rpm.RPMDEP_SENSE_REQUIRES:
                            msg = 'Package %s needs %s, this is not available.' % \
                                  (name, rpmUtils.miscutils.formatRequire(needname, 
                                                                          needversion, flags))
                        elif sense == rpm.RPMDEP_SENSE_CONFLICTS:
                            msg = 'Package %s conflicts with %s.' % \
                                  (name, rpmUtils.miscutils.formatRequire(needname, 
                                                                          needversion, flags))

                        errors.append(msg)
                    CheckDeps = 0
                    break
            else:
                unresolveableloop = 0

            depscopy = deps
            CheckDeps = 0


            # things to resolve
            self.log (3, '# of Deps = %d' % len(deps))
            depcount = 0
            for dep in deps:
                ((name, version, release), (needname, needversion), flags, suggest, sense) = dep
                depcount += 1
                self.log(5, '\nDep Number: %d/%d\n' % (depcount, len(deps)))
                if sense == rpm.RPMDEP_SENSE_REQUIRES: # requires
                    # if our packageSacks aren't here, then set them up
                    if not hasattr(self, 'pkgSack'):
                        self.doRepoSetup()
                        self.doSackSetup()
                    (checkdep, missing, conflict, errormsgs) = self._processReq(dep)
                    
                elif sense == rpm.RPMDEP_SENSE_CONFLICTS: # conflicts - this is gonna be short :)
                    (checkdep, missing, conflict, errormsgs) = self._processConflict(dep)
                    
                else: # wtf?
                    self.errorlog(0, 'Unknown Sense: %d' (sense))
                    continue

                missingdep += missing
                conflicts += conflict
                CheckDeps += checkdep
                for error in errormsgs:
                    if error not in errors:
                        errors.append(error)

            self.log(4, 'miss = %d' % missingdep)
            self.log(4, 'conf = %d' % conflicts)
            self.log(4, 'CheckDeps = %d' % CheckDeps)

            if CheckDeps > 0:
                if self.dsCallback: self.dsCallback.restartLoop()
                self.log(4, 'Restarting Loop')
            else:
                if self.dsCallback: self.dsCallback.end()
                self.log(4, 'Dependency Process ending')

            del deps

        self.tsInfo.changed = False
        if len(errors) > 0:
            return (1, errors)
        if len(self.tsInfo) > 0:
            return (2, ['Run Callback'])

    def _processReq(self, dep):
        """processes a Requires dep from the resolveDeps functions, returns a tuple
           of (CheckDeps, missingdep, conflicts, errors) the last item is an array
           of error messages"""
        
        CheckDeps = 0
        missingdep = 0
        conflicts = 0
        errormsgs = []
        
        ((name, version, release), (needname, needversion), flags, suggest, sense) = dep
        
        niceformatneed = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
        self.log(4, '%s requires: %s' % (name, niceformatneed))
        
        if self.dsCallback: self.dsCallback.procReq(name, niceformatneed)
        
        # is the requiring tuple (name, version, release) from an installed package?
        pkgs = []
        dumbmatchpkgs = self.rpmdb.returnTupleByKeyword(name=name, ver=version, rel=release)
        for pkgtuple in dumbmatchpkgs:
            self.log(6, 'Calling rpmdb.returnHeaderByTuple on %s.%s %s:%s-%s' % pkgtuple)
            hdrs = self.rpmdb.returnHeaderByTuple(pkgtuple)
            for hdr in hdrs:
                po = packages.YumInstalledPackage(hdr)
                if self.tsInfo.exists(po.pkgtup):
                    self.log(7, 'Skipping package already in Transaction Set: %s' % po)
                    continue
                if niceformatneed in po.requiresList():
                    pkgs.append(po)

        if len(pkgs) < 1: # requiring tuple is not in the rpmdb
            txmbrs = self.tsInfo.matchNaevr(name=name, ver=version, rel=release)
            if len(txmbrs) < 1:
                msg = 'Requiring package %s-%s-%s not in transaction set \
                                  nor in rpmdb' % (name, version, release)
                self.log(4, msg)
                errormsgs.append(msg)
                missingdep = 1
                CheckDeps = 0

            else:
                txmbr = txmbrs[0]
                self.log(4, 'Requiring package is from transaction set')
                if txmbr.ts_state == 'e':
                    msg = 'Requiring package %s is set to be erased,' % txmbr.name +\
                           'probably processing an old dep, restarting loop early.'
                    self.log(5, msg)
                    CheckDeps=1
                    missingdep=0
                    return (CheckDeps, missingdep, conflicts, errormsgs)
                    
                else:
                    self.log(4, 'Resolving for requiring package: %s-%s-%s in state %s' %
                                (name, version, release, txmbr.ts_state))
                    self.log(4, 'Resolving for requirement: %s' % 
                        rpmUtils.miscutils.formatRequire(needname, needversion, flags))
                    requirementTuple = (needname, flags, needversion)
                    # should we figure out which is pkg it is from the tsInfo?
                    requiringPkg = (name, version, release, txmbr.ts_state) 
                    CheckDeps, missingdep = self._requiringFromTransaction(requiringPkg, requirementTuple, errormsgs)
            
        if len(pkgs) > 0:  # requring tuple is in the rpmdb
            if len(pkgs) > 1:
                self.log(5, 'Multiple Packages match. %s-%s-%s' % (name, version, release))
                for po in pkgs:
                    # if one of them is (name, arch) already in the tsInfo somewhere, 
                    # pop it out of the list
                    (n,a,e,v,r) = po.pkgtup
                    thismode = self.tsInfo.getMode(name=n, arch=a)
                    if thismode is not None:
                        self.log(5, '   %s already in ts %s, skipping' % (po, thismode))
                        pkgs.remove(po)
                        continue
                    else:
                        self.log(5, '   %s' % po)
                    
            if len(pkgs) == 1:
                po = pkgs[0]
                self.log(5, 'Requiring package is installed: %s' % po)
            
            if len(pkgs) > 0:
                requiringPkg = pkgs[0] # take the first one, deal with the others (if there is one)
                                   # on another dep.
            else:
                self.errorlog(1, 'All pkgs in depset are also in tsInfo, this is wrong and bad')
                CheckDeps = 1
                return (CheckDeps, missingdep, conflicts, errormsgs)
            
            self.log(4, 'Resolving for installed requiring package: %s' % requiringPkg)
            self.log(4, 'Resolving for requirement: %s' % 
                rpmUtils.miscutils.formatRequire(needname, needversion, flags))
            
            requirementTuple = (needname, flags, needversion)
            
            CheckDeps, missingdep = self._requiringFromInstalled(requiringPkg.pkgtup,
                                                    requirementTuple, errormsgs)


        return (CheckDeps, missingdep, conflicts, errormsgs)


    def _requiringFromInstalled(self, requiringPkg, requirement, errorlist):
        """processes the dependency resolution for a dep where the requiring 
           package is installed"""
        
        # FIXME - should we think about dealing exclusively in package objects?
           
        (name, arch, epoch, ver, rel) = requiringPkg
        requiringPo = self.getInstalledPackageObject(requiringPkg)
        
        (needname, needflags, needversion) = requirement
        niceformatneed = rpmUtils.miscutils.formatRequire(needname, needversion, needflags)
        checkdeps = 0
        missingdep = 0
        
        # we must first find out why the requirement is no longer there
        # we must find out what provides/provided it from the rpmdb (if anything)
        # then check to see if that thing is being acted upon by the transaction set
        # if it is then we need to find out what is being done to it and act accordingly
        rpmdbNames = self.rpmdb.getNamePkgList()
        needmode = None # mode in the transaction of the needed pkg (if any)
        needpo = None
        providers = []
        
        if self.cheaterlookup.has_key((needname, needflags, needversion)):
            self.log(5, 'Needed Require has already been looked up, cheating')
            cheater_tup = self.cheaterlookup[(needname, needflags, needversion)]
            providers = [cheater_tup]
        
        elif needname in rpmdbNames:
            txmbrs = self.tsInfo.matchNaevr(name=needname)
            for txmbr in txmbrs:
                providers.append(txmbr.pkgtup)

        else:
            self.log(5, 'Needed Require is not a package name. Looking up: %s' % niceformatneed)
            providers = self.rpmdb.whatProvides(needname, needflags, needversion)
            
        for insttuple in providers:
            inst_str = '%s.%s %s:%s-%s' % insttuple
            (i_n, i_a, i_e, i_v, i_r) = insttuple
            self.log(5, 'Potential Provider: %s' % inst_str)
            thismode = self.tsInfo.getMode(name=i_n, arch=i_a, 
                            epoch=i_e, ver=i_v, rel=i_r)
                        
            if thismode is None and i_n in self.conf.exactarchlist:
                # check for mode by the same name+arch
                thismode = self.tsInfo.getMode(name=i_n, arch=i_a)
            
            if thismode is None and i_n not in self.conf.exactarchlist:
                # check for mode by just the name
                thismode = self.tsInfo.getMode(name=i_n)
            
            if thismode is not None:
                needmode = thismode
                try:
                    needpo = self.getInstalledPackageObject(insttuple)
                except KeyError:
                    needpo = self.getPackageObject(insttuple)
                self.cheaterlookup[(needname, needflags, needversion)] = insttuple
                self.log(5, 'Mode is %s for provider of %s: %s' % 
                            (needmode, niceformatneed, inst_str))
                break
                    
        self.log(5, 'Mode for pkg providing %s: %s' % (niceformatneed, needmode))
        
        if needmode in ['e']:
            self.log(5, 'TSINFO: %s package requiring %s marked as erase' %
                            (requiringPo, needname))
            txmbr = self.tsInfo.addErase(requiringPo)
            txmbr.setAsDep(po=needpo)
            checkdeps = 1
        
        if needmode in ['i', 'u']:
            self.doUpdateSetup()
            obslist = []
            # check obsoletes first
            if self.conf.obsoletes:
                if self.up.obsoleted_dict.has_key(requiringPo.pkgtup):
                    obslist = self.up.obsoleted_dict[requiringPo.pkgtup]
                    self.log(4, 'Looking for Obsoletes for %s' % requiringPo)
                
            if len(obslist) > 0:
                po = None
                for pkgtup in obslist:
                    po = self.getPackageObject(pkgtup)
                if po:
                    for (new, old) in self.up.getObsoletesTuples(): # FIXME query the obsoleting_list now?
                        if po.pkgtup == new:
                            txmbr = self.tsInfo.addObsoleting(po, requiringPo)
                            self.tsInfo.addObsoleted(requiringPo, po)
                            txmbr.setAsDep(po=needpo)
                            self.log(5, 'TSINFO: Obsoleting %s with %s to resolve dep.' % (requiringPo, po))
                            checkdeps = 1
                            return checkdeps, missingdep 
                
            
            # check updates second
            uplist = []                
            uplist = self.up.getUpdatesList(name=name)
            # if there's an update for the reqpkg, then update it
            
            po = None
            if len(uplist) > 0:
                if name not in self.conf.exactarchlist:
                    pkgs = self.pkgSack.returnNewestByName(name)
                    archs = {}
                    for pkg in pkgs:
                        (n,a,e,v,r) = pkg.pkgtup
                        archs[a] = pkg
                    a = rpmUtils.arch.getBestArchFromList(archs.keys())
                    po = archs[a]
                else:
                    po = self.pkgSack.returnNewestByNameArch((name,arch))[0]
                if po.pkgtup not in uplist:
                    po = None

            if po:
                for (new, old) in self.up.getUpdatesTuples():
                    if po.pkgtup == new:
                        txmbr = self.tsInfo.addUpdate(po, requiringPo)
                        txmbr.setAsDep(po=needpo)
                        self.log(5, 'TSINFO: Updating %s to resolve dep.' % po)
                checkdeps = 1
                
            else: # if there's no update then pass this over to requringFromTransaction()
                self.log(5, 'Cannot find an update path for dep for: %s' % niceformatneed)
                
                reqpkg = (name, ver, rel, None)
                return self._requiringFromTransaction(reqpkg, requirement, errorlist)
            

        if needmode is None:
            reqpkg = (name, ver, rel, None)
            if hasattr(self, 'pkgSack'):
                return self._requiringFromTransaction(reqpkg, requirement, errorlist)
            else:
                self.log(5, 'Unresolveable requirement %s for %s' % (niceformatneed, reqpkg_print))
                checkdeps = 0
                missingdep = 1


        return checkdeps, missingdep
        

    def _requiringFromTransaction(self, requiringPkg, requirement, errorlist):
        """processes the dependency resolution for a dep where requiring 
           package is in the transaction set"""
        
        (name, version, release, tsState) = requiringPkg
        (needname, needflags, needversion) = requirement
        checkdeps = 0
        missingdep = 0
        
        #~ - if it's not available from some repository:
        #~     - mark as unresolveable.
        #
        #~ - if it's available from some repo:
        #~    - if there is an another version of the package currently installed then
        #        - if the other version is marked in the transaction set
        #           - if it's marked as erase
        #              - mark the dep as unresolveable
         
        #           - if it's marked as update or install
        #              - check if the version for this requirement:
        #                  - if it is higher 
        #                       - mark this version to be updated/installed
        #                       - remove the other version from the transaction set
        #                       - tell the transaction set to be rebuilt
        #                  - if it is lower
        #                       - mark the dep as unresolveable
        #                   - if they are the same
        #                       - be confused but continue

        provSack = self.whatProvides(needname, needflags, needversion)

        # get rid of things that are already in the rpmdb - b/c it's pointless to use them here

        for pkg in provSack.returnPackages():
            if pkg.pkgtup in self.rpmdb.getPkgList(): # is it already installed?
                self.log(5, '%s is in providing packages but it is already installed, removing.' % pkg)
                provSack.delPackage(pkg)
                continue

            # we need to check to see, if we have anything similar to it (name-wise)
            # installed or in the ts, and this isn't a package that allows multiple installs
            # then if it's newer, fine - continue on, if not, then we're unresolveable
            # cite it and exit
        
            tspkgs = []
            if not self.allowedMultipleInstalls(pkg):
                (n, a, e, v, r) = pkg.pkgtup
                
                # from ts
                tspkgs = self.tsInfo.matchNaevr(name=pkg.name, arch=pkg.arch)
                for tspkg in tspkgs:
                    (tn, ta, te, tv, tr) = tspkg.pkgtup
                    rc = rpmUtils.miscutils.compareEVR((e, v, r), (te, tv, tr))
                    if rc < 0:
                        msg = 'Potential resolving package %s has newer instance in ts.' % pkg
                        self.log(5, msg)
                        provSack.delPackage(pkg)
                        continue
                
                # from rpmdb
                dbpkgs = self.rpmdb.returnTupleByKeyword(name=pkg.name, arch=pkg.arch)
                for dbpkgtup in dbpkgs:
                    (dn, da, de, dv, dr) = dbpkgtup
                    rc = rpmUtils.miscutils.compareEVR((e, v, r), (de, dv, dr))
                    if rc < 0:
                        msg = 'Potential resolving package %s has newer instance installed.' % pkg
                        self.log(5, msg)
                        provSack.delPackage(pkg)
                        continue

        if len(provSack) == 0: # unresolveable
            missingdep = 1
            msg = 'Missing Dependency: %s is needed by package %s' % \
            (rpmUtils.miscutils.formatRequire(needname, needversion, needflags),
                                                                   name)
            errorlist.append(msg)
            return checkdeps, missingdep
        
        # iterate the provSack briefly, if we find the package is already in the 
        # tsInfo then just skip this run
        for pkg in provSack.returnPackages():
            (n,a,e,v,r) = pkg.pkgtup
            pkgmode = self.tsInfo.getMode(name=n, arch=a, epoch=e, ver=v, rel=r)
            if pkgmode in ['i', 'u']:
                self.doUpdateSetup()
                self.log(5, '%s already in ts, skipping this one' % (n))
                checkdeps = 1
                return checkdeps, missingdep
        

        # find the best one 
        newest = provSack.returnNewestByNameArch()
        if len(newest) > 1: # there's no way this can be zero
            best = newest[0]
            for po in newest[1:]:
                if len(po.name) < len(best.name):
                    best = po
                elif len(po.name) == len(best.name):
                    # compare arch
                    arch = rpmUtils.arch.getBestArchFromList([po.arch, best.arch])
                    if arch == po.arch:
                        best = po
        elif len(newest) == 1:
            best = newest[0]
        
        if best.pkgtup in self.rpmdb.getPkgList(): # is it already installed?
            missingdep = 1
            checkdeps = 0
            msg = 'Missing Dependency: %s is needed by package %s' % (needname, name)
            errorlist.append(msg)
            return checkdeps, missingdep
        
                
            
        # FIXME - why can't we look up in the transaction set for the requiringPkg
        # and know what needs it that way and provide a more sensible dep structure in the txmbr
        if (best.name, best.arch) in self.rpmdb.getNameArchPkgList():
            self.log(3, 'TSINFO: Marking %s as update for %s' % (best, name))
            txmbr = self.tsInfo.addUpdate(best)
            txmbr.setAsDep()
        else:
            self.log(3, 'TSINFO: Marking %s as install for %s' % (best, name))
            txmbr = self.tsInfo.addInstall(best)
            txmbr.setAsDep()

        checkdeps = 1
        
        return checkdeps, missingdep


    def _processConflict(self, dep):
        """processes a Conflict dep from the resolveDeps() method"""
                
        CheckDeps = 0
        missingdep = 0
        conflicts = 0
        errormsgs = []
        

        ((name, version, release), (needname, needversion), flags, suggest, sense) = dep
        
        niceformatneed = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
        if self.dsCallback: self.dsCallback.procConflict(name, niceformatneed)
        
        # we should try to update out of the dep, if possible        
        # see which side of the conflict is installed and which is in the transaction Set
        needmode = self.tsInfo.getMode(name=needname)
        confmode = self.tsInfo.getMode(name=name, ver=version, rel=release)
        if confmode is None:
            confname = name
        elif needmode is None:
            confname = needname
        else:
            confname = name
            
        po = None        
        self.doUpdateSetup()
        uplist = self.up.getUpdatesList(name=confname)
        
        conftuple = self.rpmdb.returnTupleByKeyword(name=confname)
        if conftuple:
            (confname, confarch, confepoch, confver, confrel) = conftuple[0] # take the first one, probably the only one
                

            # if there's an update for the reqpkg, then update it
            if len(uplist) > 0:
                if confname not in self.conf.exactarchlist:
                    pkgs = self.pkgSack.returnNewestByName(confname)
                    archs = {}
                    for pkg in pkgs:
                        (n,a,e,v,r) = pkg.pkgtup
                        archs[a] = pkg
                    a = rpmUtils.arch.getBestArchFromList(archs.keys())
                    po = archs[a]
                else:
                    po = self.pkgSack.returnNewestByNameArch((confname,confarch))[0]
                if po.pkgtup not in uplist:
                    po = None

        if po:
            self.log(5, 'TSINFO: Updating %s to resolve conflict.' % po)
            txmbr = self.tsInfo.addUpdate(po)
            txmbr.setAsDep()
            CheckDeps = 1
            
        else:
            conf = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
            CheckDeps, conflicts = self._unresolveableConflict(conf, name, errormsgs)
            self.log(4, '%s conflicts: %s' % (name, conf))
        
        return (CheckDeps, missingdep, conflicts, errormsgs)

    def _unresolveableReq(self, req, name, namestate, errors):
        CheckDeps = 0
        missingdep = 1
        msg = 'Missing Dependency: %s needed for package %s (%s)' % (req, name, namestate)
        errors.append(msg)
        if self.dsCallback: self.dsCallback.unresolved(msg)
        return CheckDeps, missingdep

    def _unresolveableConflict(self, conf, name, errors):
        CheckDeps = 0
        conflicts = 1
        msg = '%s conflicts with %s' % (name, conf)
        errors.append(msg)
        return CheckDeps, conflicts


--- NEW FILE failover.py ---
#!/usr/bin/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
# (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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Jack Neely, NC State University

# Here we define a base class for failover methods.  The idea here is that each
# failover method uses a class derived from the base class so yum only has to
# worry about calling get_serverurl() and server_failed() and these classes will 
# figure out which URL to cough up based on the failover method.

import random

class baseFailOverMethod:

    def __init__(self, repo):
        self.repo = repo
        self.failures = 0
    
    def get_serverurl(self, i=None):
        """Returns a serverurl based on this failover method or None 
           if complete failure.  If i is given it is a direct index
           to pull a server URL from instead of using the failures 
           counter."""
        return None
        
    def server_failed(self):
        "Tells the failover method that the current server is failed."
        self.failures = self.failures + 1
        
    def reset(self, i=0):
        "Reset the failures counter to a given index."
        self.failures = i

    def get_index(self):
        """Returns the current number of failures which is also the
           index into the list this object represents.  ger_serverurl()
           should always be used to translate an index into a URL
           as this object may change how indexs map.  (See RoundRobin)"""

        return self.failures
   
    def len(self):
        """Returns the how many URLs we've got to cycle through."""

        return len(self.repo.urls)
        
            

class priority(baseFailOverMethod):

    """Chooses server based on the first success in the list."""
    
    def get_serverurl(self, i=None):
        "Returns a serverurl based on this failover method or None if complete failure."
        
        if i == None:
            index = self.failures
        else:
            index = i
        
        if index >= len(self.repo.urls):
            return None
        
        return self.repos.urls[index]
        
        
    
class roundRobin(baseFailOverMethod):

    """Chooses server based on a round robin."""
    
    def __init__(self, repo):
        baseFailOverMethod.__init__(self, repo)
        random.seed()
        self.offset = random.randint(0, 37)
    
    def get_serverurl(self, i=None):
        "Returns a serverurl based on this failover method or None if complete failure."

        if i == None:
            index = self.failures
        else:
            index = i
        
        if index >= len(self.repo.urls):
            return None
        
        rr = (index + self.offset) % len(self.repo.urls)
        return self.repo.urls[rr]   

# SDG


--- NEW FILE logger.py ---
"""
A module for convenient yet powerful file, console, and syslog logging

BASIC USAGE

  from logger import Logger

  log = Logger(threshold=0)    # create the log object and give it
                               # a threshold of 0
  log.log(2, 'all done')       # send a log of priority 2 (not printed)
  log(0, 'error: bandits!')    # send a log of priority 0 (printed)
  log.write(0, stringvar)      # do a raw write on the file object

DESCRIPTION

  Each logging object is given a threshold.  Any messages that are
  then sent to that object are logged only if their priority meets or
  exceeds the threshold.  Lower numerical priority means that a
  message is more important.  For example: if a log object has
  threshold 2, then all messages of priority 2, 1, 0, -1, etc will be
  logged, while those of priority 3, 4, etc. will not.  I suggest the
  following scale:
  
     LOG PRIORITY    MEANING
              -1     failure - cannot be ignored
               0     important message - printed in default mode
               1     informational message - printed with -v
               2     debugging information

        THRESHOLD    MEANING
              -1     quiet mode (-q) only failures are printed
               0     normal operation
               1     verbose mode (-v)
               2     debug mode (-vv or -d)

  It can be extended farther in both directions, but that is rarely
  useful.  It can also be shifted in either direction.  This might be
  useful if you want to supply the threshold directly on the command
  line but have trouble passing in negative numbers.  In that case,
  add 1 to all thresholds and priorities listed above.

CLASSES

  There are three primary classes defined in this module:

    Logger        Class for basic file and console logging
    SysLogger     Class for syslog logging
    LogContainer  Class for wrapping multiple other loggers together
                  for convenient use

  Instances of all of these support the same basic methods:

    obj.log(priority, message)   # log a message with smart formatting
    obj.write(priority, message) # log a string in a ver raw way
    obj(priority, message)       # shorthand for obj.log(...)

  Different classes support other methods as well, but this is what you
  will mostly use.


ADVANCED

  There are a number of options available for these classes.  These are
  documented below in the respective classes and methods.  Here is a
  list of some of the things you can do:

    * make a prefix contain a string which gets repeated for more
      important logs.  (prefix)
    * directly test if a log object WOULD log, so you can do
      complicated stuff, like efficient for loops. (test)
    * make the priority, threshold arbitrary objects, with a
      home-rolled test to see if it should log. (test)
    * give log containers a "master threshold" and define arbitrary
      behavior based on it.  Examples include:
      - only pass on messages of sufficient priority (ragardless of
        the thresholds of the log ojects).
      - only pass on messages to objects whose thresholds are
        (numerically) lower than the master threshold.

SEE ALSO

  Take a look at the examples at the end of this file in the test &
  demo section.

COMMENTS

  I welcome comments, questions, bug reports and requests... I'm very
  lonely. :)
"""

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

# Copyright 2001-2003 Michael D. Stenner

import sys
import string
# syslog is imported from within SysLogger.__init__

AUTHOR  = "Michael D. Stenner <mstenner at phy.duke.edu>"
VERSION = "0.7"
DATE    = "2003/09/20"
URL     = "http://linux.duke.edu/projects/mini/logger/"

class Logger:
    """A class for file-object logging
    
    USAGE:
      from logger import Logger

      log_obj = Logger(THRESHOLD)     # create the instance

      log_obj.log(3, 'message')       # log a message with priority 3
      log_obj(3, 'message')           # same thing
      log_obj(3, ['message'])         # same thing

      log_obj.test(3)                 # boolean - would a message of
                                      # this priority be printed?

      # a raw write call after the priority test, for writing
      # arbitrary text -- (this will not be followed by \\n)
      log_obj.write(3, 'thing\\nto\\nwrite')  

      # generate the prefix used for priority 3
      pr = log_obj.gen_prefix(3)

      # see the examples in the test section for more

    BASIC OPTIONS:

      There are a couple of basic options that are commonly needed.
      These are attribues of instances of class Logger.

        preprefix

          Text that will be printed at the start of each line of
          output (for log()ged, not write()en messages).  This might
          be your program's name, for example.

            log.preprefix = 'myprog'

          If preprefix is callable, then it will be called for each
          log and the returned value will be used.  This is useful for
          printing the current time.

            import time
            def printtime():
                return time.strftime('%m/%d/%y %H:%M:%S ',
                         time.localtime(time.time()))
            log.preprefix = printtime
      
        file_object

          This is the file object to which output is directed.  If it
          is None, then the logs are quietly dropped.

      There are other options described in the next section, but these
      are the most commonly used.

    ATTRIBUTES:
      (all of these are settable as keyword args to __init__)

      ATTRIBUTES   DEFAULT      DESCRIPTION
      ----------------------------------------------------------
      threshold    = 0          how verbose the program should be
      file_object  = sys.stderr file object to which output goes
      prefix       = ''         prefix string - repeated for more
                                important logs
      prefix_depth = 5          times prefix is repeated for logs
                                of priority 0.  Basically, set this
                                one larger than your highest log
                                priority.
      preprefix    = ''         string printed before the prefix
                                if callable, returned string will
                                be used (useful for printing time)
      postprefix   = ''         string printed after the prefix
      default      = 1          default priority to log at

    """

    def __init__(self,
                 threshold    = 0,
                 file_object  = sys.stderr,
                 prefix       = '',
                 prefix_depth = 5,
                 preprefix    = '',
                 postprefix   = '',
                 default      = 1):
        self.threshold    = threshold
        self.file_object  = file_object
        self.prefix       = prefix
        self.prefix_depth = prefix_depth
        self.preprefix    = preprefix
        self.postprefix   = postprefix
        self.default      = default

    def test(self, priority):

        """
        Return true if a log of the given priority would be printed.
        
        This can be overridden to do any test you like.  Specifically,
        priority and threshold need not be integers.  They can be
        arbitrary objects.  You need only override this method, and
        possibly gen_prefix.
        """

        return int(self.threshold) >= int(priority)
        
    def gen_prefix(self, priority):

        """
        Return the full prefix (including pre and post) for the
        given priority.

        If you use prefix and use a more complicated priority and
        verbosity (non-numerical), then you should either give the
        chosen object a __int__ method, or override this function.
        """
        
        if callable(self.preprefix): prefix = self.preprefix()
        else: prefix = self.preprefix

        if self.prefix:
            depth  = self.prefix_depth - int(priority)
            if depth < 1: depth = 1
            for i in range(0, depth):
                prefix = prefix + self.prefix

        return prefix + self.postprefix

    def log(self, priority, message=None):
        """
        Print a log message.  This prepends the prefix to each line
        and does some basic formatting.
        """
        p, m = self._use_default(priority, message)
        if self.test(p):
            if self.file_object is None: return
            if type(m) == type(''): # message is a string
                mlist = string.split(m, '\n')
                if mlist[-1] == '': del mlist[-1] # string ends in \n
            elif type(m) == type([]): # message is a list
                mlist = map(string.rstrip, m)
            else: mlist = [str(m)] # message is other type

            prefix = self.gen_prefix(p)
            for line in mlist:
                self.file_object.write(prefix + line + '\n')

    # make the objects callable
    __call__ = log

    def write(self, priority, message=None):
        """
        Print a log message.  In this case, 'message' must be a string
        as it will be passed directly to the file object's write method.
        """
        p, m = self._use_default(priority, message)
        if self.test(p):
            if self.file_object is None: return
            self.file_object.write(m)

    def _use_default(self, priority, message):
        """Substitute default priority if none was provided"""
        if message == None: return self.default, priority
        else: return priority, message

class SysLogger:
    """A class for file-object logging
    
    USAGE:
      For the most part, SysLogger instances are used just like Logger
      instances.  Notable exceptions:

        * prefixes aren't used (at least not as they are for Logger)
        * map_priority is pretty important because it controls
          conversion between Logger priorities and syslog priorities
        * although priority/threshold/test works the same, there is
          also maskpri and your syslog config which will limit what
          gets logged.  Keep this in mind if you see strange behavior.

      The most sensible use of this class will be will a LogContainer.
      You can create one Logger instance for writing to (say) stderr,
      a second for writing to a verbose log file, and a SysLogger
      instance for writing important things to syslog so your automated
      log-readers can see them.  Then you put them all in a log container
      for convenient access.  That would go something like this:

        from logger import Logger, SysLogger, LogContainer
        
        fo = open(file_log, 'w')
        file_logger    = Logger(4, file_object=fo) # print 4 and lower
        console_logger = Logger(1)                 # print 1 and lower
        syslog_logger  = SysLogger(0)              # print 0 and lower
        log = LogContainer([file_logger, console_logger, syslog_logger])

        log(3,  'some debugging message') # printed to file only
        log(1,  'some warning message')   # printed to file and console
        log(0,  'some error message')     # printed to all (ERR level)
        log(-1, 'major problem')          # printed to all (CRIT level)
      
    ATTRIBUTES:
      (all of these are settable as keyword args to __init__)

      ARGUMENT     DEFAULT      DESCRIPTION
      ----------------------------------------------------------
      threshold    = 0          identical to Logger threshold
      ident        = None       string prepended to each log, if None,
                                it will be taken from the program name
                                as it appears in sys.argv[0]
      logopt       = 0          syslog log options
      facility     = 'LOG_USER' syslog facility (it can be a string)
      maskpri      = 0          syslog priority bitmask
      default      = 1          default priority to log at

    """

    def __init__(self,
                 threshold    = 0,
                 ident        = None,
                 logopt       = 0,
                 facility     = 'LOG_USER',
                 maskpri      = 0,
                 default      = 1):
        # putting imports here is kinda icky, but I don't want to import
        # it if no SysLogger's are ever used.
        global syslog
        import syslog

        self.threshold    = threshold
        self.default      = default

        if ident is None:
            ind = string.rfind(sys.argv[0], '/')
            if ind == -1: ident = sys.argv[0]
            else: ident = sys.argv[0][ind+1:]

        if type(facility) == type(''):
            facility = getattr(syslog, facility)

        syslog.openlog(ident, logopt, facility)
        if maskpri: syslog.setlogmask(maskpri)
        
    def setlogmask(self, maskpri):
        """a (very) thin wrapper over the syslog setlogmask function"""
        return syslog.setlogmask(maskpri)

    def map_priority(self, priority):
        """Take a logger priority and return a syslog priority

        Here are the syslog priorities (from syslog.h):
          LOG_EMERG       0       /* system is unusable */
          LOG_ALERT       1       /* action must be taken immediately */
          LOG_CRIT        2       /* critical conditions */
          LOG_ERR         3       /* error conditions */
          LOG_WARNING     4       /* warning conditions */
          LOG_NOTICE      5       /* normal but significant condition */
          LOG_INFO        6       /* informational */
          LOG_DEBUG       7       /* debug-level messages */

        The syslog priority is simply equal to the logger priority plus 3.

           0 ->  0 + 3 =  3
          -5 -> -5 + 3 = -2  (which will be treated as 0)

        You can override this very simply.  Just do:

        def log_everything_emerg(priority): return 0
        log_obj.map_priority = log_everything_emerg

        The return value of this function does not need to be an integer or
        within the allowed syslog range (0 to 7).  It will be converted to
        an int and forced into this range if it lies outside it.
        """
        return priority + 3

    def test(self, priority):
        """
        Return true if a log of the given priority would be printed.
        
        This can be overridden to do any test you like.  Specifically,
        threshold and threshold need not be integers.  They can be
        arbitrary objects.  If you override this and use non-integer
        priorities, you will also need to override map_priority.
        """
        return int(self.threshold) >= int(priority)

    def log(self, priority, message=None):
        """
        Print a log message with some simple formatting.
        """
        p, m = self._use_default(priority, message)
        if self.test(p):
            if type(m) == type(''): # message is a string
                mlist = string.split(m, '\n')
                if mlist[-1] == '': del mlist[-1] # string ends in \n
            elif type(m) == type([]): # message is a list
                mlist = map(string.rstrip, m)
            else: mlist = [str(m)] # message is other type

            sp = int(self.map_priority(p))
            if sp < 0: sp = 0
            if sp > 7: sp = 7
            for line in mlist: syslog.syslog(sp, line)

    # make the objects callable
    __call__ = log

    def write(self, priority, message=None):
        """
        Print a log message.
        """
        p, m = self._use_default(priority, message)
        if self.test(p):
            sp = int(self.map_priority(p))
            if sp < 0: sp = 0
            if sp > 7: sp = 7
            
            # we must split based on newlines for syslog because
            # it doesn't deal with them well
            mlist = string.split(m, '\n')
            if mlist[-1] == '': del mlist[-1] # string ends in \n
            for message in mlist: syslog.syslog(sp, message)

    def _use_default(self, priority, message):
        """Substitute default priority if none was provided"""
        if message == None: return self.default, priority
        else: return priority, message

class LogContainer:
    """A class for consolidating calls to multiple sub-objects

    SUMMARY:
      If you want a program to log to multiple destinations, it might
      be convenient to use log containers.  A log container is an
      object which can hold several sub-log-objects (including other
      log containers).  When you log to a log container it passes the
      message on (with optional tests) to each of the log objects it
      contains.

    USAGE:

      The basic usage is very simple.  LogContainer's simply pass on
      logs to the contained Logger, SysLogger, or LogContainer
      objects.

        from logger import Logger, LogContainer

        log_1 = Logger(threshold=1, file_object=sys.stdout)
        log_2 = Logger(threshold=2, preprefix='LOG2')

        log = LogContainer([log_1, log_2])

        log(1, 'message')               # printed by log_1 and log_2
        log(2, 'message')               # only printed by log_2

      A more common example would be something like this:
      
        from logger import Logger, LogContainer

        system = Logger(threshold=1, file_object=logfile)
        debug  = Logger(threshold=5, file_object=sys.stdout)
        log = LogContainer([system, debug])

        log(3, 'sent to system and debug, but only debug will print it')
        log(0, 'very important, both will print it')

      In this mode, log containers are just shorthand for calling all
      contained objects with the same priority and message.

      When a log object is held in a container, it can still be used
      directly.  For example, you can still do

        debug(3, ['this will not be sent to the system log, even if its',
                  ' threshold is set very high'])

      (Yes, you can send lists of strings and they will be formatted
      on different lines.  The log methods are pretty smart.)

      There are more examples in the SysLogger docs.

    ATTRIBUTES:
      (all of these are settable as keyword args to __init__)

      ATTRIBUTES   DEFAULT      DESCRIPTION
      ----------------------------------------------------------
      list         = []         list of contained objects
      threshold    = None       meaning depends on test - by default
                                threshold has no effect
      default      = 1          default priority to log at

    """


    def __init__(self, list=[], threshold=None, default=1):
        self.list = list
        self.threshold = threshold
        self.default = default

    def add(self, log_obj):
        """Add a log object to the container."""
        self.list.append(log_obj)

    def log(self, priority, message=None):
        """Log a message to all contained log objects, depending on
        the results of test()
        """
        p, m = self._use_default(priority, message)
        for log_obj in self.list:
            if self.test(p, m, self.threshold, log_obj):
                log_obj.log(p, m)

    __call__ = log
    
    def write(self, priority, message=None):
        p, m = self._use_default(priority, message)
        for log_obj in self.list:
            if self.test(p, m, self.threshold, log_obj):
                log_obj.write(p, m)

    def _use_default(self, priority, message):
        """Substitute default priority if none was provided"""
        if message == None: return self.default, priority
        else: return priority, message

    def test(self, priority, message, threshold, log_obj):
        """Test which log objects should be passed a given message.

        This method is used to determine if a given message (and
        priority) should be passed on to a given log_obj.  The
        container's threshold is also provided.

        This method always returns 1, and is the default, meaning that
        all messages will get passed to all objects.  It is intended
        to be overridden if you want more complex behavior.  To
        override with your own function, just do something like:

          def hell_no(p, m, t, object): return 0
          container.test = hell_no
        """
        return 1

    def test_limit_priority(self, priority, message, threshold, log_obj):
        """Only pass on messages with sufficient priority compared to
        the master threshold.

          container = LogContainer([system, debug], threshold = 2)
          container.test = container.test_limit_priority
        """
        return priority <= threshold
    
    def test_limit_threshold(self, priority, message, threshold, log_obj):
        """Only pass on messages to log objects whose threshold is
        (numerically) lower than the master threshold.

          container = LogContainer([system, debug], threshold = 2)
          container.test = container.test_limit_threshold
        """
        return log_obj.threshold <= threshold
    
if __name__ == '__main__':
    ###### TESTING AND DEMONSTRATION

    threshold = 3
    print 'THRESHOLD = %s' % (threshold)
    log   = Logger(threshold,   preprefix = 'TEST  ')

    print " Lets log a few things!"
    for i in range(-2, 10): log(i, 'log priority %s' % (i))

    print "\n Now make it print the time for each log..."
    import time
    def printtime():
        return time.strftime('%m/%d/%y %H:%M:%S ',time.localtime(time.time()))
    log.preprefix = printtime

    print " and log a few more things"
    for i in range(-2, 10): log(i, 'log priority %s' % (i))
 
    print "\n now create another with a different prefix and priority..."
    print " and put them in a container..."
    log2 = Logger(threshold-2, preprefix = 'LOG2 ')
    cont = LogContainer([log, log2], threshold=0)
    cont.test = cont.test_limit_priority
    
    print " and log a bit more"
    for i in range(-2, 10): cont(i, 'log priority %s' % (i))

    print "\n OK, enough of the container... lets play with formatting"

    stuff = 'abcd\nefgh\nijkl'

    print "\n no trailing newline"
    log(stuff)

    print "\n with trailing newline"
    log(stuff + '\n') # should be the same because the log method
                      # takes care of the newline for you

    print "\n two trailing newlines"
    log(stuff + '\n\n') # should create a "blank" line.  If you use two
                        # newlines, it knows you really wanted one :)
    
    print "\n log JUST a newline"
    log('\n') # should create only a single "blank" line

    print "\n use the write method, with a trailing newline"
    log.write(stuff + '\n') # should just write with no prefix crap
                            # it will _NOT_ quietly tack on a newline

    print "\n print some complex object"
    log(1, {'key': 'value'}) # non-strings should be no trouble

    print "\n now set the file object to None (nothing should be printed)"
    log.file_object = None
    log("THIS SHOULD NOT BE PRINTED")
    log.write("THIS SHOULD NOT BE PRINTED")

    if not (sys.argv[1:] and sys.argv[1] == 'syslog'):
        print '\n skipping syslog test (because they would annoy your admin)'
        print ' add "syslog" to the command line to enable syslog tests'
        sys.exit(0)

    print '\n performing syslog tests'
    print ' creating logger with threshold: 3'
    slog = SysLogger(3, 'logger-test')

    print ' logging at (logger) priorities from -2 to 9 (but only'
    print ' priorities <= 3 should show up'
    for i in range(-2, 10): slog(i, 'log priority %s' % (i))

    print '\n now test the write() method'
    slog.write(0, 'first line\nsecond line\nthird line')


--- NEW FILE mdcache.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University 

import os
import sys
import libxml2
import cPickle

import Errors


class RepodataParser:
    def __init__(self, storedir, callback=None):
        self.storedir = storedir
        self.callback = callback
        self.repodata = {
            'metadata': {}, 
            'filelists': {},
            'otherdata': {}
        }
        self.debug = 0
    
        
    def debugprint(self, msg):
        if self.debug:
            print msg
        
    def _piklFileName(self, location, checksum):
        filename = os.path.basename(location)
        piklfile = os.path.join(self.storedir, filename)
        piklfile = '%s.%s.pickle' % (piklfile, checksum)
        self.debugprint('piklfile=%s' % piklfile)
        return piklfile

    def _pickle(self, outfile, obj):
        self.debugprint('Trying to pickle into %s' % outfile)
        try: outfh = open(outfile, 'w')
        except IOError, e: 
            raise cPickle.PicklingError(e)
        try: cPickle.dump(obj, outfh, cPickle.HIGHEST_PROTOCOL)
        except AttributeError: cPickle.dump(obj, outfh, 1)
        self.debugprint('Pickle successful!')
        outfh.close()

    def _unpickle(self, infile):
        self.debugprint('Trying to unpickle from %s' % infile)
        try: infh = open(infile)
        except IOError, e: raise cPickle.UnpicklingError(e)
        obj = cPickle.load(infh)
        infh.close()
        self.debugprint('Unpickle successful!')
        return obj

    def _killold(self, location):
        filename = os.path.basename(location)
        dirfiles = os.listdir(self.storedir)
        for dirfile in dirfiles:
            if dirfile[-7:] == '.pickle':
                if dirfile[:len(filename)] == filename:
                    oldpickle = os.path.join(self.storedir, dirfile)
                    self.debugprint('removing old pickle file %s' % oldpickle)
                    try: os.unlink(oldpickle)
                    except OSError:
                        ## Give an error or something
                        pass
        
    def _getGeneric(self, ident, location, checksum):
        databank = self.repodata[ident]
        if databank: return databank
        if checksum is None:
            ##
            # Pass checksum as None to ignore pickling. This will
            # Go straight to xml files.
            return self.parseDataFromXml(location)
        piklfile = self._piklFileName(location, checksum)
        try: 
            databank = self._unpickle(piklfile)
            self.repodata[ident] = databank
            return databank
        except cPickle.UnpicklingError, e: 
            self.debugprint('Could not unpickle: %s!' % e)
            databank = self.parseDataFromXml(location)
            self._killold(location)
            try: self._pickle(piklfile, databank)
            except cPickle.PicklingError:
                self.debugprint('Could not pickle %s data in %s' % (ident, piklfile))
            return databank
        
    def getPrimary(self, location, checksum):
        return self._getGeneric('metadata', location, checksum)

    def getFilelists(self, location, checksum):
        return self._getGeneric('filelists', location, checksum)

    def getOtherdata(self, location, checksum):
        return self._getGeneric('otherdata', location, checksum)

    def parseDataFromXml(self, fileloc):
        ## TODO: Fail sanely.
        self.debugprint('Parsing data from %s' % fileloc)
        reader = libxml2.newTextReaderFilename(fileloc)
        count = 0
        total = 9999
        mode = None
        databank = None
        while reader.Read():
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name in ('metadata', 'filelists', 'otherdata'):
                mode = name
                databank = self.repodata[mode]
                try: total = int(reader.GetAttribute('packages'))
                except ValueError: pass
            elif name == 'package':
                count += 1
                if mode == 'metadata':
                    obj = PrimaryEntry(reader)
                    pkgid = obj.checksum['value']
                    #if pkgid in databank.keys():
                    #    print 'double detected!'
                    #    print databank[pkgid].nevra, 'vs', obj.nevra
                    if pkgid: databank[pkgid] = obj
                elif mode == 'filelists':
                    pkgid = reader.GetAttribute('pkgid')
                    if pkgid:
                        obj = FilelistsEntry(reader)
                        databank[pkgid] = obj
                elif mode == 'otherdata':
                    pkgid = reader.GetAttribute('pkgid')
                    if pkgid:
                        obj = OtherEntry(reader)
                        databank[pkgid] = obj
                if self.callback: 
                    self.callback.progressbar(count, total, 'MD Read')
        self.debugprint('Parsed %s packages' % count)
        reader.Close()
        del reader
        return databank

class BaseEntry:
    def _props(self, reader):
        if not reader.HasAttributes(): return {}
        propdict = {}
        reader.MoveToFirstAttribute()
        while 1:
            propdict[reader.LocalName()] = reader.Value()
            if not reader.MoveToNextAttribute(): break
        reader.MoveToElement()
        return propdict
        
    def _value(self, reader):
        if reader.IsEmptyElement(): return ''
        val = ''
        while reader.Read():
            if reader.NodeType() == 3: val += reader.Value()
            else: break
        return val

    def _getFileEntry(self, reader):
        type = 'file'
        props = self._props(reader)
        if props.has_key('type'): type = props['type']
        value = self._value(reader)
        return (type, value)

class PrimaryEntry(BaseEntry):
    def __init__(self, reader):
        self.nevra = (None, None, None, None, None)
        self.checksum = {'type': None, 'pkgid': None, 'value': None}
        self.info = {
            'summary': None,
            'description': None,
            'packager': None,
            'url': None,
            'license': None,
            'vendor': None,
            'group': None,
            'buildhost': None,
            'sourcerpm': None
        }
        self.time = {'file': None, 'build': None}
        self.size = {'package': None, 'installed': None, 'archive': None}
        self.location = {'href': None, 'value': None, 'base': None}
        self.hdrange = {'start': None, 'end': None}
        self.prco = {}
        self.files = {}

        n = e = v = r = a = None
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == 'package':
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name == 'name': n = self._value(reader)
            elif name == 'arch': a = self._value(reader)
            elif name == 'version': 
                evr = self._props(reader)
                (e, v, r) = (evr['epoch'], evr['ver'], evr['rel'])
            elif name in ('summary', 'description', 'packager', 'url'): 
                self.info[name] = self._value(reader)
            elif name == 'checksum': 
                self.checksum = self._props(reader)
                self.checksum['value'] = self._value(reader)
            elif name == 'location': 
                self.location = self._props(reader)
                self.location['value'] = self._value(reader)
            elif name == 'time':
                self.time = self._props(reader)
            elif name == 'size':
                self.size = self._props(reader)
            elif name == 'format': self.setFormat(reader)
        self.nevra = (n, e, v, r, a)

    def dump(self):
        print 'nevra=%s,%s,%s,%s,%s' % self.nevra
        print 'checksum=%s' % self.checksum
        print 'info=%s' % self.info
        print 'time=%s' % self.time
        print 'size=%s' % self.size
        print 'location=%s' % self.location
        print 'hdrange=%s' % self.hdrange
        print 'prco=%s' % self.prco
        print 'files=%s' % self.files

    def setFormat(self, reader):
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == 'format':
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name in ('license', 'vendor', 'group', 'buildhost',
                        'sourcerpm'):
                self.info[name] = self._value(reader)
            elif name in ('provides', 'requires', 'conflicts', 
                          'obsoletes'):
                self.setPrco(reader)
            elif name == 'header-range':
                self.hdrange = self._props(reader)
            elif name == 'file':
                (type, value) = self._getFileEntry(reader)
                self.files[value] = type

    def setPrco(self, reader):
        members = []
        myname = reader.LocalName()
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == myname:
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            members.append(self._props(reader))
        self.prco[myname] = members

class FilelistsEntry(BaseEntry):
    def __init__(self, reader):
        self.files = {}
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == 'package':
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name == 'file':
                (type, value) = self._getFileEntry(reader)
                self.files[value] = type
                
    def dump(self):
        print 'files=%s' % self.files

class OtherEntry(BaseEntry):
    def __init__(self, reader):
        self.changelog = []
        while reader.Read():
            if reader.NodeType() == 15 and reader.LocalName() == 'package':
                break
            if reader.NodeType() != 1: continue
            name = reader.LocalName()
            if name == 'changelog':
                entry = self._props(reader)
                entry['value'] = self._value(reader)
                self.changelog.append(entry)

    def dump(self):
        print 'changelog=%s' % self.changelog

def test(level, repodir, storedir, checksum):
    import time
    primary = os.path.join(repodir, 'primary.xml')
    filelists = os.path.join(repodir, 'filelists.xml')
    otherdata = os.path.join(repodir, 'other.xml')
    tick = time.time()
    bigtick = tick
    rp = RepodataParser(storedir)
    rp.getPrimary(primary, checksum)
    print 'operation took: %d seconds' % (time.time() - tick)
    print 'primary has %s entries' % len(rp.repodata['metadata'].keys())
    tick = time.time()
    if level == 'filelists' or level == 'other':
        rp.getFilelists(filelists, checksum)
        print 'operation took: %d seconds' % (time.time() - tick)
        print 'filelists has %s entries' % len(rp.repodata['filelists'].keys())
        tick = time.time()
    if level == 'other':
        rp.getOtherdata(otherdata, checksum)
        print 'operation took: %d seconds' % (time.time() - tick)
        print 'otherdata has %s entries' % len(rp.repodata['otherdata'].keys())
    print
    print 'total operation time: %d seconds' % (time.time() - bigtick)

def testusage():
    print 'Usage: %s level repodir storedir checksum' % sys.argv[0]
    print 'level can be primary, filelists, other'
    print 'repodir is the location of .xml files'
    print 'storedir is where pickles will be saved'
    print 'checksum can be anything you want it to be'
    sys.exit(1)
    
if __name__ == '__main__':
    try: (level, repodir, storedir, checksum) = sys.argv[1:]
    except ValueError: testusage()
    if level not in ('primary', 'filelists', 'other'): testusage()
    if checksum == 'None': checksum = None
    test(level, repodir, storedir, checksum)


--- NEW FILE mdparser.py ---

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 

import gzip
from cElementTree import iterparse

try:
    from cStringIO import StringIO
except ImportError:
    from StringIO import StringIO

#TODO: document everything here

class MDParser:

    def __init__(self, filename):

        # Set up mapping of meta types to handler classes 
        handlers = {
            '{http://linux.duke.edu/metadata/common}metadata': PrimaryEntry,
            '{http://linux.duke.edu/metadata/filelists}filelists': FilelistsEntry,
            '{http://linux.duke.edu/metadata/other}otherdata': OtherEntry,
        }
            
        self.total = None
        self.count = 0
        self._handlercls = None

        # Read in type, set package node handler and get total number of
        # packages
        if filename[-3:] == '.gz': fh = gzip.open(filename, 'r')
        else: fh = open(filename, 'r')
        parser = iterparse(fh, events=('start', 'end'))
        self.reader = parser.__iter__()
        event, elem = self.reader.next()
        self._handlercls = handlers.get(elem.tag, None)
        if not self._handlercls:
            raise ValueError('Unknown repodata type "%s" in %s' % (
                elem.tag, filename))
        # Get the total number of packages
        total = elem.get('packages', None)
        self.total = total is None and None or int(total)

    def __iter__(self):
        return self

    def next(self):
        for event, elem in self.reader:
            if event == 'end' and elem.tag[-7:] == 'package':
                self.count += 1
                return self._handlercls(elem)
        raise StopIteration


class BaseEntry:
    def __init__(self, elem):
        self._p = {} 

    def __getitem__(self, k):
        return self._p[k]

    def keys(self):
        return self._p.keys()

    def values(self):
        return self._p.values()

    def has_key(self, k):
        return self._p.has_key(k)

    def __str__(self):
        out = StringIO()
        keys = self.keys()
        keys.sort()
        for k in keys:
            line = u'%s=%s\n' % (k, self[k])
            out.write(line.encode('utf8'))
        return out.getvalue()

    def _bn(self, qn):
        if qn.find('}') == -1: return qn 
        return qn.split('}')[1]
        
    def _prefixprops(self, elem, prefix):
        ret = {}
        for key in elem.attrib.keys():
            ret[prefix + '_' + self._bn(key)] = elem.attrib[key]
        return ret

class PrimaryEntry(BaseEntry):
    def __init__(self, elem):
        BaseEntry.__init__(self, elem)
        # Avoid excess typing :)
        p = self._p

        self.prco = {}
        self.files = {}

        for child in elem:
            name = self._bn(child.tag)
            if name in ('name', 'arch', 'summary', 'description', 'url', 
                    'packager'): 
                p[name] = child.text

            elif name == 'version': 
                p.update(child.attrib)

            elif name in ('time', 'size'):
                p.update(self._prefixprops(child, name))

            elif name in ('checksum', 'location'): 
                p.update(self._prefixprops(child, name))
                p[name + '_value'] = child.text
                if name == 'location' and not p.has_key("location_base"):
                    p["location_base"] = None
            
            elif name == 'format': 
                self.setFormat(child)

        p['pkgId'] = p['checksum_value']
        elem.clear()

    def setFormat(self, elem):

        # Avoid excessive typing :)
        p = self._p

        for child in elem:
            name = self._bn(child.tag)

            if name in ('license', 'vendor', 'group', 'buildhost',
                        'sourcerpm'):
                p[name] = child.text

            elif name in ('provides', 'requires', 'conflicts', 
                          'obsoletes'):
                self.prco[name] = self.getPrco(child)

            elif name == 'header-range':
                p.update(self._prefixprops(child, 'rpm_header'))

            elif name == 'file':
                type = child.get('type', 'file')
                path = child.text
                self.files[path] = type

    def getPrco(self, elem):
        members = []
        for child in elem:
            name = self._bn(child.tag)
            members.append(child.attrib)
        return members
        
        
class FilelistsEntry(BaseEntry):
    def __init__(self, elem):
        BaseEntry.__init__(self, elem)
        self._p['pkgId'] = elem.attrib['pkgid']
        self.files = {}
        for child in elem:
            name = self._bn(child.tag)
            if name == 'file':
                type = child.get('type', 'file')
                path = child.text
                self.files[path] = type
        elem.clear()
                
class OtherEntry(BaseEntry):
    def __init__(self, elem):
        BaseEntry.__init__(self, elem)
        self._p['pkgId'] = elem.attrib['pkgid']
        self._p['changelog'] = []
        for child in elem:
            name = self._bn(child.tag)
            if name == 'changelog':
                entry = child.attrib
                entry['value'] = child.text
                self._p['changelog'].append(entry)
        elem.clear()



def test():
    import sys

    parser = MDParser(sys.argv[1])

    for pkg in parser:
        print '-' * 40
        print pkg
        pass

    print 'read: %s packages (%s suggested)' % (parser.count, parser.total)

if __name__ == '__main__':
    test()


--- NEW FILE misc.py ---
import types
import string
import os
import os.path
from cStringIO import StringIO
import base64
import struct
import re
import pgpmsg
import tempfile
import glob
import rpm
import pwd
from stat import *

import rpmUtils
from Errors import MiscError

###########
# Title: Remove duplicates from a sequence
# Submitter: Tim Peters 
# From: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560                      
    
def unique(s):
    """Return a list of the elements in s, but without duplicates.

    For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3],
    unique("abcabc") some permutation of ["a", "b", "c"], and
    unique(([1, 2], [2, 3], [1, 2])) some permutation of
    [[2, 3], [1, 2]].

    For best speed, all sequence elements should be hashable.  Then
    unique() will usually work in linear time.

    If not possible, the sequence elements should enjoy a total
    ordering, and if list(s).sort() doesn't raise TypeError it's
    assumed that they do enjoy a total ordering.  Then unique() will
    usually work in O(N*log2(N)) time.

    If that's not possible either, the sequence elements must support
    equality-testing.  Then unique() will usually work in quadratic
    time.
    """

    n = len(s)
    if n == 0:
        return []

    # Try using a dict first, as that's the fastest and will usually
    # work.  If it doesn't work, it will usually fail quickly, so it
    # usually doesn't cost much to *try* it.  It requires that all the
    # sequence elements be hashable, and support equality comparison.
    u = {}
    try:
        for x in s:
            u[x] = 1
    except TypeError:
        del u  # move on to the next method
    else:
        return u.keys()

    # We can't hash all the elements.  Second fastest is to sort,
    # which brings the equal elements together; then duplicates are
    # easy to weed out in a single pass.
    # NOTE:  Python's list.sort() was designed to be efficient in the
    # presence of many duplicate elements.  This isn't true of all
    # sort functions in all languages or libraries, so this approach
    # is more effective in Python than it may be elsewhere.
    try:
        t = list(s)
        t.sort()
    except TypeError:
        del t  # move on to the next method
    else:
        assert n > 0
        last = t[0]
        lasti = i = 1
        while i < n:
            if t[i] != last:
                t[lasti] = last = t[i]
                lasti += 1
            i += 1
        return t[:lasti]

    # Brute force is all that's left.
    u = []
    for x in s:
        if x not in u:
            u.append(x)
    return u

def checksum(sumtype, file, CHUNK=2**16):
    """takes filename, hand back Checksum of it
       sumtype = md5 or sha
       filename = /path/to/file
       CHUNK=65536 by default"""
       
    # chunking brazenly lifted from Ryan Tomayko
    try:
        if type(file) is not types.StringType:
            fo = file # assume it's a file-like-object
        else:           
            fo = open(file, 'r', CHUNK)
            
        if sumtype == 'md5':
            import md5
            sum = md5.new()
        elif sumtype == 'sha':
            import sha
            sum = sha.new()
        else:
            raise MiscError, 'Error Checksumming file, bad checksum type %s' % sumtype
        chunk = fo.read
        while chunk: 
            chunk = fo.read(CHUNK)
            sum.update(chunk)

        if type(file) is types.StringType:
            fo.close()
            del fo
            
        return sum.hexdigest()
    except (IOError, OSError), e:
        raise MiscError, 'Error opening file for checksum: %s' % file

def getFileList(path, ext, filelist):
    """Return all files in path matching ext, store them in filelist, 
       recurse dirs return list object"""
    
    extlen = len(ext)
    try:
        dir_list = os.listdir(path)
    except OSError, e:
        raise MiscError, ('Error accessing directory %s, %s') % (path, e)
        
    for d in dir_list:
        if os.path.isdir(path + '/' + d):
            filelist = getFileList(path + '/' + d, ext, filelist)
        else:
            if string.lower(d[-extlen:]) == '%s' % (ext):
               newpath = os.path.normpath(path + '/' + d)
               filelist.append(newpath)
                    
    return filelist

class GenericHolder:
    """Generic Holder class used to hold other objects of known types
       It exists purely to be able to do object.somestuff, object.someotherstuff
       or object[key] and pass object to another function that will 
       understand it"""
       
    def __getitem__(self, item):
        if hasattr(self, item):
            return getattr(self, item)
        else:
            raise KeyError, item

def procgpgkey(rawkey):
    '''Convert ASCII armoured GPG key to binary
    '''
    # TODO: CRC checking? (will RPM do this anyway?)
    
    # Normalise newlines
    rawkey = re.compile('(\n|\r\n|\r)').sub('\n', rawkey)

    # Extract block
    block = StringIO()
    inblock = 0
    pastheaders = 0
    for line in rawkey.split('\n'):
        if line.startswith('-----BEGIN PGP PUBLIC KEY BLOCK-----'):
            inblock = 1
        elif inblock and line.strip() == '':
            pastheaders = 1
        elif inblock and line.startswith('-----END PGP PUBLIC KEY BLOCK-----'):
            # Hit the end of the block, get out
            break
        elif pastheaders and line.startswith('='):
            # Hit the CRC line, don't include this and stop
            break
        elif pastheaders:
            block.write(line+'\n')
  
    # Decode and return
    return base64.decodestring(block.getvalue())

def getgpgkeyinfo(rawkey):
    '''Return a dict of info for the given ASCII armoured key text

    Returned dict will have the following keys: 'userid', 'keyid', 'timestamp'

    Will raise ValueError if there was a problem decoding the key.
    '''
    # Catch all exceptions as there can be quite a variety raised by this call
    try:
        key = pgpmsg.decode_msg(rawkey)
    except Exception, e:
        raise ValueError(str(e))
    if key is None:
        raise ValueError('No key found in given key data')

    keyid_blob = key.public_key.key_id()

    info = {
        'userid': key.user_id,
        'keyid': struct.unpack('>Q', keyid_blob)[0],
        'timestamp': key.public_key.timestamp,
    }

    # Retrieve the timestamp from the matching signature packet 
    # (this is what RPM appears to do) 
    for userid in key.user_ids[0]:
        if not isinstance(userid, pgpmsg.signature):
            continue

        if userid.key_id() == keyid_blob:
            # Get the creation time sub-packet if available
            if hasattr(userid, 'hashed_subpaks'):
                tspkt = \
                    userid.get_hashed_subpak(pgpmsg.SIG_SUB_TYPE_CREATE_TIME)
                if tspkt != None:
                    info['timestamp'] = int(tspkt[1])
                    break
        
    return info

def keyIdToRPMVer(keyid):
    '''Convert an integer representing a GPG key ID to the hex version string
    used by RPM
    '''
    return "%08x" % (keyid & 0xffffffffL)


def keyInstalled(ts, keyid, timestamp):
    '''Return if the GPG key described by the given keyid and timestamp are
    installed in the rpmdb.  

    The keyid and timestamp should both be passed as integers.
    The ts is an rpm transaction set object

    Return values:
        -1      key is not installed
        0       key with matching ID and timestamp is installed
        1       key with matching ID is installed but has a older timestamp
        2       key with matching ID is installed but has a newer timestamp

    No effort is made to handle duplicates. The first matching keyid is used to 
    calculate the return result.
    '''
    # Convert key id to 'RPM' form
    keyid = keyIdToRPMVer(keyid)

    # Search
    for hdr in ts.dbMatch('name', 'gpg-pubkey'):
        if hdr['version'] == keyid:
            installedts = int(hdr['release'], 16)
            if installedts == timestamp:
                return 0
            elif installedts < timestamp:
                return 1    
            else:
                return 2

    return -1

def getCacheDir(tmpdir='/var/tmp'):
    """return a path to a valid and safe cachedir - only used when not running
       as root or when --tempcache is set"""
    
    uid = os.geteuid()
    try:
        usertup = pwd.getpwuid(uid)
        username = usertup[0]
    except KeyError:
        return None # if it returns None then, well, it's bollocksed

    # check for /var/tmp/yum-username-* - 
    prefix = 'yum-%s-' % username    
    dirpath = '%s/%s*' % (tmpdir, prefix)
    cachedirs = glob.glob(dirpath)
    
    for thisdir in cachedirs:
        stats = os.lstat(thisdir)
        if S_ISDIR(stats[0]) and S_IMODE(stats[0]) == 448 and stats[4] == uid:
            return thisdir

    # make the dir (tempfile.mkdtemp())
    cachedir = tempfile.mkdtemp(prefix=prefix, dir=tmpdir)
    return cachedir

def sortPkgObj(pkg1 ,pkg2):
    """sorts a list of yum package objects by name"""
    if pkg1.name > pkg2.name:
        return 1
    elif pkg1.name == pkg2.name:
        return 0
    else:
        return -1
        


--- NEW FILE packages.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University 
# Written by Seth Vidal <skvidal at phy.duke.edu>

import rpm
import os
import os.path
import misc
import re
import types
import fnmatch
import rpmUtils
import rpmUtils.arch
import rpmUtils.miscutils
import Errors

import repomd.packageObject

base=None

def buildPkgRefDict(pkgs):
    """take a list of pkg objects and return a dict the contains all the possible
       naming conventions for them eg: for (name,i386,0,1,1)
       dict[name] = (name, i386, 0, 1, 1)
       dict[name.i386] = (name, i386, 0, 1, 1)
       dict[name-1-1.i386] = (name, i386, 0, 1, 1)       
       dict[name-1] = (name, i386, 0, 1, 1)       
       dict[name-1-1] = (name, i386, 0, 1, 1)
       dict[0:name-1-1.i386] = (name, i386, 0, 1, 1)
       dict[name-0:1-1.i386] = (name, i386, 0, 1, 1)
       """
    pkgdict = {}
    for pkg in pkgs:
        pkgtup = (pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)
        (n, a, e, v, r) = pkgtup
        name = n
        nameArch = '%s.%s' % (n, a)
        nameVerRelArch = '%s-%s-%s.%s' % (n, v, r, a)
        nameVer = '%s-%s' % (n, v)
        nameVerRel = '%s-%s-%s' % (n, v, r)
        envra = '%s:%s-%s-%s.%s' % (e, n, v, r, a)
        nevra = '%s-%s:%s-%s.%s' % (n, e, v, r, a)
        for item in [name, nameArch, nameVerRelArch, nameVer, nameVerRel, envra, nevra]:
            if not pkgdict.has_key(item):
                pkgdict[item] = []
            pkgdict[item].append(pkg)
            
    return pkgdict
       
def parsePackages(pkgs, usercommands, casematch=0):
    """matches up the user request versus a pkg list:
       for installs/updates available pkgs should be the 'others list' 
       for removes it should be the installed list of pkgs
       takes an optional casematch option to determine if case should be matched
       exactly. Defaults to not matching."""

    pkgdict = buildPkgRefDict(pkgs)
    exactmatch = []
    matched = []
    unmatched = []
    for command in usercommands:
        if pkgdict.has_key(command):
            exactmatch.extend(pkgdict[command])
            del pkgdict[command]
        else:
            # anything we couldn't find a match for
            # could mean it's not there, could mean it's a wildcard
            if re.match('.*[\*,\[,\],\{,\},\?].*', command):
                trylist = pkgdict.keys()
                restring = fnmatch.translate(command)
                if casematch:
                    regex = re.compile(restring) # case sensitive
                else:
                    regex = re.compile(restring, flags=re.I) # case insensitive
                foundit = 0
                for item in trylist:
                    if regex.match(item):
                        matched.extend(pkgdict[item])
                        del pkgdict[item]
                        foundit = 1
 
                if not foundit:    
                    unmatched.append(command)
                    
            else:
                # we got nada
                unmatched.append(command)

    matched = misc.unique(matched)
    unmatched = misc.unique(unmatched)
    exactmatch = misc.unique(exactmatch)
    return exactmatch, matched, unmatched


# goal for the below is to have a packageobject that can be used by generic
# functions independent of the type of package - ie: installed or available
class YumAvailablePackage(repomd.packageObject.PackageObject, repomd.packageObject.RpmBase):
    """derived class for the repomd packageobject and RpmBase packageobject yum
       uses this for dealing with packages in a repository"""

    def __init__(self, pkgdict, repoid):
        repomd.packageObject.PackageObject.__init__(self)
        repomd.packageObject.RpmBase.__init__(self)
        
        self.importFromDict(pkgdict, repoid)
        # quick, common definitions
        self.name = self.returnSimple('name')
        self.epoch = self.returnSimple('epoch')
        self.version = self.returnSimple('version')
        self.release = self.returnSimple('release')
        self.ver = self.returnSimple('version')
        self.rel = self.returnSimple('release')
        self.arch = self.returnSimple('arch')
        self.repoid = self.returnSimple('repoid')
        self.pkgtup = self._pkgtup()
        self.state = None
        
    def size(self):
        return self.returnSimple('packagesize')

    def _pkgtup(self):
        return self.returnPackageTuple()

    def printVer(self):
        """returns a printable version string - including epoch, if it's set"""
        if self.epoch != '0':
            ver = '%s:%s-%s' % (self.epoch, self.version, self.release)
        else:
            ver = '%s-%s' % (self.version, self.release)
        
        return ver
    
    def compactPrint(self):
        ver = self.printVer()
        return "%s.%s %s" % (self.name, self.arch, ver)

    def returnLocalHeader(self):
        """returns an rpm header object from the package object's local
           header cache"""
        
        if os.path.exists(self.localHdr()):
            try: 
                hlist = rpm.readHeaderListFromFile(self.localHdr())
                hdr = hlist[0]
            except (rpm.error, IndexError):
                raise Errors.RepoError, 'Cannot open package header'
        else:
            raise Errors.RepoError, 'Package Header Not Available'

        return hdr

    def getProvidesNames(self):
        """returns a list of providesNames"""
        
        provnames = []
        prov = self.returnPrco('provides')
        
        for (name, flag, vertup) in prov:
            provnames.append(name)

        return provnames
       
    def localPkg(self):
        """return path to local package (whether it is present there, or not)"""
        if not hasattr(self, 'localpath'):
            repo = base.repos.getRepo(self.repoid)
            remote = self.returnSimple('relativepath')
            rpmfn = os.path.basename(remote)
            self.localpath = repo.pkgdir + '/' + rpmfn
        return self.localpath

    def localHdr(self):
        """return path to local cached Header file downloaded from package 
           byte ranges"""
           
        if not hasattr(self, 'hdrpath'):
            repo = base.repos.getRepo(self.repoid)
            pkgpath = self.returnSimple('relativepath')
            pkgname = os.path.basename(pkgpath)
            hdrname = pkgname[:-4] + '.hdr'
            self.hdrpath = repo.hdrdir + '/' + hdrname

        return self.hdrpath
    
    def prcoPrintable(self, prcoTuple):
        """convert the prco tuples into a nicer human string"""
        (name, flag, (e, v, r)) = prcoTuple
        flags = {'GT':'>', 'GE':'>=', 'EQ':'=', 'LT':'<', 'LE':'<='}
        if flag is None:
            return name
        
        base = '%s %s ' % (name, flags[flag])
        if e not in [0, '0', None]:
            base += '%s:' % e
        if v is not None:
            base += '%s' % v
        if r is not None:
            base += '-%s' % r
        
        return base
    
    def requiresList(self):
        """return a list of requires in normal rpm format"""
        
        reqlist = []
        
        for prcoTuple in self.returnPrco('requires'):
            prcostr = self.prcoPrintable(prcoTuple)
            reqlist.append(prcostr)
        
        return reqlist
        
    def importFromDict(self, pkgdict, repoid):
        """handles an mdCache package dictionary item to populate out 
           the package information"""
        
        self.simple['repoid'] = repoid
        # translates from the pkgdict, populating out the information for the
        # packageObject
        
        if hasattr(pkgdict, 'nevra'):
            (n, e, v, r, a) = pkgdict.nevra
            self.simple['name'] = n
            self.simple['epoch'] = e
            self.simple['version'] = v
            self.simple['arch'] = a
            self.simple['release'] = r
        
        if hasattr(pkgdict, 'time'):
            self.simple['buildtime'] = pkgdict.time['build']
            self.simple['filetime'] = pkgdict.time['file']
        
        if hasattr(pkgdict, 'size'):
            self.simple['packagesize'] = pkgdict.size['package']
            self.simple['archivesize'] = pkgdict.size['archive']
            self.simple['installedsize'] = pkgdict.size['installed']
        
        if hasattr(pkgdict, 'location'):
            if not pkgdict.location.has_key('base'):
                url = None
            elif pkgdict.location['base'] == '':
                url = None
            else:
                url = pkgdict.location['base']

            self.simple['basepath'] = url
            self.simple['relativepath'] = pkgdict.location['href']
        
        if hasattr(pkgdict, 'hdrange'):
            self.simple['hdrstart'] = pkgdict.hdrange['start']
            self.simple['hdrend'] = pkgdict.hdrange['end']
        
        if hasattr(pkgdict, 'info'):
            infodict = pkgdict.info
            for item in ['summary', 'description', 'packager', 'group',
                         'buildhost', 'sourcerpm', 'url', 'vendor']:
                self.simple[item] = infodict[item]
            
            self.licenses.append(infodict['license'])
        
        if hasattr(pkgdict, 'files'):
            for file in pkgdict.files.keys():
                ftype = pkgdict.files[file]
                if not self.files.has_key(ftype):
                    self.files[ftype] = []
                self.files[ftype].append(file)
        
        if hasattr(pkgdict, 'prco'):
            for rtype in pkgdict.prco.keys():
                for rdict in pkgdict.prco[rtype]:
                    name = rdict['name']
                    f = e = v = r  = None
                    if rdict.has_key('flags'): f = rdict['flags']
                    if rdict.has_key('epoch'): e = rdict['epoch']
                    if rdict.has_key('ver'): v = rdict['ver']
                    if rdict.has_key('rel'): r = rdict['rel']
                    self.prco[rtype].append((name, f, (e,v,r)))

        if hasattr(pkgdict, 'changelog'):
            for cdict in pkgdict.changelog:
                date = text = author = None
                if cdict.has_key('date'): date = cdict['date']
                if cdict.has_key('value'): text = cdict['value']
                if cdict.has_key('author'): author = cdict['author']
                self.changelog.append((date, author, text))
        
        if hasattr(pkgdict, 'checksum'):
            ctype = pkgdict.checksum['type']
            csum = pkgdict.checksum['value']
            csumid = pkgdict.checksum['pkgid']
            if csumid is None or csumid.upper() == 'NO':
                csumid = 0
            elif csumid.upper() == 'YES':
                csumid = 1
            else:
                csumid = 0
            self.checksums.append((ctype, csum, csumid))
            


class YumInstalledPackage(YumAvailablePackage):
    """super class for dealing with packages in the rpmdb"""
    def __init__(self, hdr):
        """hand in an rpm header, we'll assume it's installed and query from there"""
        self.hdr = hdr
        self.name = self.tagByName('name')
        self.arch = self.tagByName('arch')
        self.epoch = self.doepoch()
        self.version = self.tagByName('version')
        self.release = self.tagByName('release')
        self.ver = self.tagByName('version')
        self.rel = self.tagByName('release')
        self.pkgtup = self._pkgtup()
        self.repoid = 'installed'
        self.summary = self.tagByName('summary')
        self.description = self.tagByName('description')
        self.pkgid = self.tagByName(rpm.RPMTAG_SHA1HEADER)
        self.state = None
        
    def __str__(self):
        if self.epoch == '0':
            val = '%s - %s-%s.%s' % (self.name, self.version, self.release, 
                                        self.arch)
        else:
            val = '%s - %s:%s-%s.%s' % (self.name, self.epoch, self.version,
                                           self.release, self.arch)
        return val

    def tagByName(self, tag):
        data = self.hdr[tag]
        return data
    
    def doepoch(self):
        tmpepoch = self.hdr['epoch']
        if tmpepoch is None:
            epoch = '0'
        else:
            epoch = str(tmpepoch)
        
        return epoch
    
    def returnSimple(self, thing):
        if hasattr(self, thing):
            return getattr(self, thing)
        else:
            return self.tagByName(thing)

    def returnLocalHeader(self):
        return self.hdr


    def getProvidesNames(self):
        """returns a list of providesNames"""
        
        provnames = self.tagByName('providename')
        if type(provnames) is not types.ListType():
            if type(provnames) is types.StringType():
                provnames = [provnames]
            else:
                provnames = []

        return provnames

    def requiresList(self):
        """return a list of all of the strings of the package requirements"""
        reqlist = []
        names = self.hdr[rpm.RPMTAG_REQUIRENAME]
        flags = self.hdr[rpm.RPMTAG_REQUIREFLAGS]
        ver = self.hdr[rpm.RPMTAG_REQUIREVERSION]
        if names is not None:
            tmplst = zip(names, flags, ver)
        
        for (n, f, v) in tmplst:
            req = rpmUtils.miscutils.formatRequire(n, v, f)
            reqlist.append(req)
        
        return reqlist

    def _pkgtup(self):
        return (self.name, self.arch, self.epoch, self.version, self.release)
    
    def size(self):
        return self.tagByName('size')

    def printVer(self):
        """returns a printable version string - including epoch, if it's set"""
        if self.epoch != '0':
            ver = '%s:%s-%s' % (self.epoch, self.version, self.release)
        else:
            ver = '%s-%s' % (self.version, self.release)
        
        return ver
    
    def compactPrint(self):
        ver = self.printVer()
        return "%s.%s %s" % (self.name, self.arch, ver)
    

class YumLocalPackage(YumInstalledPackage):
    """Class to handle an arbitrary package from a file path
       this inherits most things from YumInstalledPackage because
       installed packages and an arbitrary package on disk act very
       much alike. init takes a ts instance and a filename/path 
       to the package."""

    def __init__(self, ts=None, filename=None):
        if ts is None:
            raise Errors.MiscError, \
                 'No Transaction Set Instance for YumLocalPackage instance creation'
        if filename is None:
            raise Errors.MiscError, \
                 'No Filename specified for YumLocalPackage instance creation'
                 
        self.pkgtype = 'local'
        self.localpath = filename
        self.repoid = filename
        try:
            self.hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.localpath)
        except rpmUtils.RpmUtilsError, e:
            raise Errors.MiscError, \
                'Could not open local rpm file: %s' % self.localpath
        self.name = self.tagByName('name')
        self.arch = self.tagByName('arch')
        self.epoch = self.doepoch()
        self.version = self.tagByName('version')
        self.release = self.tagByName('release')
        self.ver = self.tagByName('version')
        self.rel = self.tagByName('release')
        self.summary = self.tagByName('summary')
        self.description = self.tagByName('description')
        self.pkgtup = self._pkgtup()
        self.state = None
    
    def _pkgtup(self):
        return (self.name, self.arch, self.epoch, self.version, self.release)
    
    def localPkg(self):
        return self.localpath
    
        


            
        
    
    


--- NEW FILE parser.py ---
import re
import glob
import shlex
import string
import urlparse
import urlgrabber
import os.path
from ConfigParser import ConfigParser, NoSectionError, NoOptionError

#TODO: better handling of recursion
#TODO: ability to handle bare includes (ie. before first [section])
#TODO: avoid include line reordering on write

# The above 3 items are probably handled best by more separation between
# include functionality and ConfigParser. Delegate instead of subclass. See how
# this was done in the previous implementation.

#TODO: problem: interpolation tokens are lost when config files are rewritten
#       - workaround is to not set vars, not sure if this is ok
#       - maybe we should do interpolation at the Option level after all?
#       - preserve original uninterpolated value?
#TODO: separate $var interpolation into YumParser?

class IncludingConfigParser(ConfigParser):

    def __init__(self, vars=None, include="include"):
        """
        @param vars: A dictionary of subsitution variables.
        @param include: Name of option that lists files for inclusion
        """
        self.include = include

        # Dictionary of filenames -> included configparser objects
        self._fns = {}

        # Dictionary of sections -> filenames
        self._included = {}

        self.cwd = None
        ConfigParser.__init__(self, vars)

    def defaults(self):
        """Return a dictionary containing the instance-wide defaults."""
        return self._defaults

    def sections(self):
        """Return a list of the sections available in file and includes."""
        s = self.__sections()
        for included in self._included.keys():
            s.append(included)
        return s

    def has_section(self, section): 
        """Indicates whether the named section is present in 
        the configuration and includes."""
        if section in self.__sections() or section in self._included.keys():
            return True
        else:
            return False

    def has_option(self, section, option):
        if not self.has_section(section):
            raise NoSectionError(section)
        if section in self._included.keys():
            fn = self._included[section]
            return self._fns[fn].has_option(section, option)
        else:
            return ConfigParser.has_option(self,  section, option)
        
    def options(self, section):
        """Return a list of option names for the given section name"""
        if not self.has_section(section):
            raise NoSectionError(section)
        if section in self._included.keys():
            fn = self._included[section]
            return self._fns[fn].options(section)
        else:
            return ConfigParser.options(self,  section)

    def items(self, section):
        if not self.has_section(section):
            raise NoSectionError(section)
        if section in self._included.keys():
            fn = self._included[section]
            return self._fns[fn].items(section)
        else:
            return ConfigParser.items(self, section)

    def remove_section(self, section):
        if not self.has_section(section):
            raise NoSectionError(section)
        if section in self._included.keys():
            fn = self._included[section]
            return self._fns[fn].remove_section(section)
        else:
            return ConfigParser.remove_section(self, section)

    def add_include(self, section, fn):
        """Add a included file to config section"""
        if not self.has_section(section):
            raise NoSectionError(section)
        if not self.has_option(section, self.include):
            raise NoOptionError(self.include, section)
        inc = self.get(section, self.include)
        if fn in shlex.split(inc):
            return
        self._add_include(section, fn)

        
    def remove_include(self, section, fn):
        """Remove an included config parser"""
        if not self.has_section(section):
            raise NoSectionError(section)
        if not self.has_option(section, self.include):
            raise NoOptionError(self.include, section)
        #XXX: raise NoIncludeError???
        if not self._included.has_key(fn):
            return

    def __sections(self):
        return ConfigParser.sections(self) 

    def read(self, filenames):
        for filename in shlex.split(filenames):
            self.cwd = os.path.dirname(os.path.realpath(filename))
            ConfigParser.read(self,filename)
            self._readincludes()

    def readfp(self, fp, filename=None):
        ConfigParser.readfp(self, fp, filename)
        self._readincludes()

    def _add_include(self, section, filename):
        print '_add_include', section, filename
        c = IncludingConfigParser(self._defaults)

        # Be aware of URL style includes
        scheme, loc, path, params, qry, frag = urlparse.urlparse(filename, 'file')

        # Normalise file URLs
        if scheme == 'file':
            filename = path

        # Prepend current directory if absolute path wasn't given
        if scheme == 'file':
            if not filename.startswith(os.path.sep):
                filename = os.path.join(self.cwd, filename)

        c.readfp(urlgrabber.urlopen(filename), filename)

        # Keep track of included sections
        for includesection in c.sections():
            self._included[includesection] = filename
        self._fns[filename] = c

    def _remove_include(self, section, filename):
        inc = self.get(section, self.include)
        filenames = shlex.split(inc)
        if filename in filenames:
            filenames.remove(filename)
        self.set(section, self.include, string.join(filenames, ' '))
        self._included.pop(filename)

    def _readincludes(self):
        for section in ConfigParser.sections(self):
            if self.has_option(section, self.include):
                for filename in shlex.split(self.get(section, self.include)):
                    self._add_include(section, filename)
            
    def get(self, section, option, raw=False, vars=None):
        """Return section from file or included files"""
        if section in self._included:
            fn = self._included[section]
            return self._fns[fn].get(section, option, raw, vars)
        return ConfigParser.get(self, section, option, raw, vars)

    def set(self, section, option, value):
        if section in self._included:
            fn = self._included[section]
            return self._fns[fn].set(section, option, value)
        return ConfigParser.set(self, section, option, value)

    def write(self, fp):
        """Take a file object and write it"""

        # Don't call the parent write() method because it dumps out
        # self._defaults as its own section which isn't desirable here.

        # Write out the items for this file
        for section in self._sections:
            fp.write("[%s]\n" % section)
            for (key, value) in self._sections[section].items():
                if key == '__name__':
                    continue
                fp.write("%s = %s\n" % (key, str(value).replace('\n', '\n\t')))
            fp.write("\n")

        # Write out any included files
        for fn in self._fns.keys():
            # Only bother for files since we can't easily write back to much else.
            scheme = urlparse.urlparse(fn, 'file')[0]
            if scheme == 'file':
                inc = open(fn, 'w')
                self._fns[fn].write(inc)

    def _interpolate(self, section, option, rawval, vars):
        '''Perform $var subsitution (this overides the default %(..)s subsitution)

        Only the rawval and vars arguments are used. The rest are present for
        compatibility with the parent class.
        '''
        return varReplace(rawval, vars)


class IncludedDirConfigParser(IncludingConfigParser):
    """A conf.d recursive parser - supporting one level of included dirs"""

    def __init__(self, vars=None, includedir=None, includeglob="*.conf", include="include"):
        self.includeglob = includeglob
        self.includedir = includedir
        IncludingConfigParser.__init__(self, vars=vars, include=include)

    def read(self, filenames):
        for filename in shlex.split(filenames):
            IncludingConfigParser.read(self,filename)
            self._includedir()

    def _includedir(self):
        for section in ConfigParser.sections(self):
            if self.includedir:
                matches = glob.glob("%s/%s" % (self.includedir, self.includeglob))
                # glob dir, open files, include
                for match in matches:
                    if os.path.exists(match):
                        self._add_include(section, match)

    def add_include(self, section, filename):
        """Add a included file to config section"""
        if not self.has_section(section):
            raise NoSectionError(section)
        self._add_include(section, filename)


_KEYCRE = re.compile(r"\$(\w+)")

def varReplace(raw, vars):
    '''Perform variable replacement

    @param raw: String to perform substitution on.  
    @param vars: Dictionary of variables to replace. Key is variable name
        (without $ prefix). Value is replacement string.
    @return: Input raw string with substituted values.
    '''

    done = []                      # Completed chunks to return

    while raw:
        m = _KEYCRE.search(raw)
        if not m:
            done.append(raw)
            break

        # Determine replacement value (if unknown variable then preserve original)
        varname = m.group(1).lower()
        replacement = vars.get(varname, m.group())

        start, end = m.span()
        done.append(raw[:start])    # Keep stuff leading up to token
        done.append(replacement)    # Append replacement value
        raw = raw[end:]             # Continue with remainder of string

    return ''.join(done)


def _test():
    import sys

    p = IncludingConfigParser()
    p.read(sys.argv[1])

    p.set('one', 'a', '111')
    p.set('three', 'foo', 'bar')

    for section in p.sections():
        print '***', section
        for k, v in p.items(section):
            print '%s = %r' % (k, v)

    p.write(open(sys.argv[1], 'wt'))

if __name__ == '__main__':
    _test()



--- NEW FILE pgpmsg.py ---
##Copyright (C) 2003,2005  Jens B. Jorgensen <jbj1 at ultraemail.net>
##
##This program is free software; you can redistribute it and/or
##modify it under the terms of the GNU General Public License
##as published by the Free Software Foundation; either version 2
##of the License, or (at your option) any later version.
##
##This program is distributed in the hope that it will be useful,
##but WITHOUT ANY WARRANTY; without even the implied warranty of
##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
##GNU General Public License for more details.
##
##You should have received a copy of the GNU General Public License
##along with this program; if not, write to the Free Software
##Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
import string, struct, time, cStringIO, base64, types, md5, sha

debug = None

# Cypher Type Byte
# bits 7,6 of the CTB say what kind it is
# we only have reserved defined
CTB_76_NORMAL = 0x80
CTB_76_NEW = 0xc0
CTB_76_MASK = 0xc0

# CTB packet type, bits 5,4,3,2
CTB_PKTV2_MASK = 0x3c    # 1111 - mask for this field
CTB_PKT_MASK = 0x3f      # 111111 - all the lower bits

CTB_PKT_PK_ENC = 1       # 0001 - public-key encrypted session packet
CTB_PKT_SIG = 2          # 0010 - signature packet
CTB_PKT_SK_ENC = 3       # 0011 - symmetric-key encrypted session packet
CTB_PKT_OP_SIG = 4       # 0100 - one-pass signature packet
CTB_PKT_SK_CERT = 5      # 0101 - secret-key certificate packet
CTB_PKT_PK_CERT = 6      # 0110 - public-key certificate packet
CTB_PKT_SK_SUB = 7       # 0111 - secret-key subkey packet
CTB_PKT_COMPRESSED = 8   # 1000 - compressed data packet
CTB_PKT_ENC = 9          # 1001 - symmetric-key encrypted data packet
CTB_PKT_MARKER = 10      # 1010 - marker packet
CTB_PKT_LIT = 11         # 1011 - literal data packet
CTB_PKT_TRUST = 12       # 1100 - trust packet
CTB_PKT_USER_ID = 13     # 1101 - user id packet
CTB_PKT_PK_SUB = 14      # 1110 - public subkey packet

ctb_pkt_to_str = {
    CTB_PKT_PK_ENC : 'public-key encrypted session packet',
    CTB_PKT_SIG : 'signature packet',
    CTB_PKT_SK_ENC : 'symmetric-key encrypted session packet',
    CTB_PKT_OP_SIG : 'one-pass signature packet',
    CTB_PKT_SK_CERT : 'secret-key certificate packet',
    CTB_PKT_PK_CERT : 'public-key certificate packet',
    CTB_PKT_SK_SUB : 'secret-key subkey packet',
    CTB_PKT_COMPRESSED : 'compressed data packet',
    CTB_PKT_ENC : 'symmetric-key encrypted data packet',
    CTB_PKT_MARKER : 'marker packet',
    CTB_PKT_LIT : 'literal data packet',
    CTB_PKT_TRUST : 'trust packet',
    CTB_PKT_USER_ID : 'user id packet',
    CTB_PKT_PK_SUB : 'public subkey packet'
}


# CTB packet-length
CTB_PKT_LEN_MASK = 0x3   # 11 - mask

CTB_PKT_LEN_1 = 0        # 00 - 1 byte
CTB_PKT_LEN_2 = 1        # 01 - 2 bytes
CTB_PKT_LEN_4 = 2        # 10 - 4 bytes
CTB_PKT_LEN_UNDEF = 3    # 11 - no packet length supplied

# Algorithms

# Public Key Algorithms
ALGO_PK_RSA_ENC_OR_SIGN = 1        # RSA (Encrypt or Sign)
ALGO_PK_RSA_ENC_ONLY = 2           # RSA Encrypt-Only
ALGO_PK_RSA_SIGN_ONLY = 3          # RSA Sign-Only
ALGO_PK_ELGAMAL_ENC_ONLY = 16      # Elgamal (Encrypt-Only)
ALGO_PK_DSA = 17                   # DSA (Digital Signature Standard)
ALGO_PK_ELLIPTIC_CURVE = 18        # Elliptic Curve
ALGO_PK_ECDSA = 19                 # ECDSA
ALGO_PK_ELGAMAL_ENC_OR_SIGN = 20   # Elgamal (Encrypt or Sign)
ALGO_PK_DH = 21                    # Diffie-Hellman

algo_pk_to_str = {
    ALGO_PK_RSA_ENC_OR_SIGN : 'RSA (Encrypt or Sign)',
    ALGO_PK_RSA_ENC_ONLY : 'RSA Encrypt-Only',
    ALGO_PK_RSA_SIGN_ONLY : 'RSA Sign-Only',
    ALGO_PK_ELGAMAL_ENC_ONLY : 'Elgamal Encrypt-Only',
    ALGO_PK_DSA : 'DSA (Digital Signature Standard)',
    ALGO_PK_ELLIPTIC_CURVE : 'Elliptic Curve',
    ALGO_PK_ECDSA : 'ECDSA',
    ALGO_PK_ELGAMAL_ENC_OR_SIGN : 'Elgamal (Encrypt or Sign)',
    ALGO_PK_DH : 'Diffie-Hellman'
}    

# Symmetric Key Algorithms
ALGO_SK_PLAIN = 0 # Plaintext or unencrypted data
ALGO_SK_IDEA = 1 # IDEA
ALGO_SK_3DES = 2 # Triple-DES
ALGO_SK_CAST5 = 3 # CAST5
ALGO_SK_BLOWFISH = 4 # Blowfish
ALGO_SK_SAFER_SK128 = 5 # SAFER-SK128
ALGO_SK_DES_SK = 6 # DES/SK
ALGO_SK_AES_128 = 7 # AES 128-bit
ALGO_SK_AES_192 = 8 # AES 192-bit
ALGO_SK_AES_256 = 9 # AES 256-bit

algo_sk_to_str = {
    ALGO_SK_PLAIN : 'Plaintext or unencrypted data',
    ALGO_SK_IDEA : 'IDEA',
    ALGO_SK_3DES : 'Triple-DES',
    ALGO_SK_CAST5 : 'CAST5',
    ALGO_SK_BLOWFISH : 'Blowfish',
    ALGO_SK_SAFER_SK128 : 'SAFER-SK128',
    ALGO_SK_DES_SK : 'DES/SK',
    ALGO_SK_AES_128 : 'AES 128-bit',
    ALGO_SK_AES_192 : 'AES 192-bit',
    ALGO_SK_AES_256 : 'AES 256-bit'
}

# Compression Algorithms
ALGO_COMP_UNCOMP = 0 # Uncompressed
ALGO_COMP_ZIP = 1 # ZIP
ALGO_COMP_ZLIB = 2 # ZLIB

algo_comp_to_str = {
    ALGO_COMP_UNCOMP : 'Uncompressed',
    ALGO_COMP_ZIP : 'ZIP',
    ALGO_COMP_ZLIB : 'ZLIB'
}

# Hash Algorithms
ALGO_HASH_MD5 = 1                  # MD5
ALGO_HASH_SHA1 = 2                 # SHA1
ALGO_HASH_RIPEMD160 = 3            # RIPEMD160
ALGO_HASH_SHA_DBL = 4              # double-width SHA
ALGO_HASH_MD2 = 5                  # MD2
ALGO_HASH_TIGER192 = 6             # TIGER192
ALGO_HASH_HAVAL_5_160 = 7          # HAVAL-5-160

algo_hash_to_str = {
    ALGO_HASH_MD5 : 'MD5',
    ALGO_HASH_SHA1 : 'SHA1',
    ALGO_HASH_RIPEMD160 : 'RIPEMD160',
    ALGO_HASH_SHA_DBL : 'double-width SHA',
    ALGO_HASH_MD2 : 'MD2',
    ALGO_HASH_TIGER192 : 'TIGER192',
    ALGO_HASH_HAVAL_5_160 : 'HAVAL-5-160'
}

# Signature types
SIG_TYPE_DOCUMENT = 0x00           # document signature, binary image
SIG_TYPE_DOCUMENT_CANON = 0x01     # document signature, canonical text
SIG_TYPE_STANDALONE = 0x02         # signature over just subpackets
SIG_TYPE_PK_USER_GEN = 0x10        # public key packet and user ID packet, generic certification
SIG_TYPE_PK_USER_PER = 0x11        # public key packet and user ID packet, persona
SIG_TYPE_PK_USER_CAS = 0x12        # public key packet and user ID packet, casual certification
SIG_TYPE_PK_USER_POS = 0x13        # public key packet and user ID packet, positive certification
SIG_TYPE_SUBKEY_BIND = 0x18        # subkey binding
SIG_TYPE_KEY = 0x1F                # key signature
SIG_TYPE_KEY_REVOKE = 0x20      # key revocation
SIG_TYPE_SUBKEY_REVOKE = 0x28   # subkey revocation
SIG_TYPE_CERT_REVOKE = 0x30     # certificate revocation
SIG_TYPE_TIMESTAMP = 0x40       # timestamp

sig_type_to_str = {
    SIG_TYPE_DOCUMENT : 'document signature, binary image',
    SIG_TYPE_DOCUMENT_CANON : 'document signature, canonical text',
    SIG_TYPE_STANDALONE : 'signature over just subpackets',
    SIG_TYPE_PK_USER_GEN : 'public key packet and user ID packet, generic certification',
    SIG_TYPE_PK_USER_PER : 'public key packet and user ID packet, persona',
    SIG_TYPE_PK_USER_CAS : 'public key packet and user ID packet, casual certification',
    SIG_TYPE_PK_USER_POS : 'public key packet and user ID packet, positive certification',
    SIG_TYPE_SUBKEY_BIND : 'subkey binding',
    SIG_TYPE_KEY : 'key signature',
    SIG_TYPE_KEY_REVOKE : 'key revocation',
    SIG_TYPE_SUBKEY_REVOKE : 'subkey revocation',
    SIG_TYPE_CERT_REVOKE : 'certificate revocation',
    SIG_TYPE_TIMESTAMP : 'timestamp'
}

# Signature sub-packet types
SIG_SUB_TYPE_CREATE_TIME = 2        # signature creation time
SIG_SUB_TYPE_EXPIRE_TIME = 3        # signature expiration time
SIG_SUB_TYPE_EXPORT_CERT = 4        # exportable certification
SIG_SUB_TYPE_TRUST_SIG = 5          # trust signature
SIG_SUB_TYPE_REGEXP = 6             # regular expression
SIG_SUB_TYPE_REVOCABLE = 7          # revocable
SIG_SUB_TYPE_KEY_EXPIRE = 9         # key expiration time
SIG_SUB_TYPE_PLACEHOLDER = 10       # placeholder for backward compatibility
SIG_SUB_TYPE_PREF_SYMM_ALGO = 11    # preferred symmetric algorithms
SIG_SUB_TYPE_REVOKE_KEY = 12        # revocation key
SIG_SUB_TYPE_ISSUER_KEY_ID = 16     # issuer key ID
SIG_SUB_TYPE_NOTATION = 20          # notation data
SIG_SUB_TYPE_PREF_HASH_ALGO = 21    # preferred hash algorithms
SIG_SUB_TYPE_PREF_COMP_ALGO = 22    # preferred compression algorithms
SIG_SUB_TYPE_KEY_SRV_PREF = 23      # key server preferences
SIG_SUB_TYPE_PREF_KEY_SRVR = 24     # preferred key server
SIG_SUB_TYPE_PRIM_USER_ID = 25      # primary user id
SIG_SUB_TYPE_POLICY_URL = 26        # policy URL
SIG_SUB_TYPE_KEY_FLAGS = 27         # key flags
SIG_SUB_TYPE_SGNR_USER_ID = 28      # signer's user id
SIG_SUB_TYPE_REVOKE_REASON = 29     # reason for revocation

sig_sub_type_to_str = {
    SIG_SUB_TYPE_CREATE_TIME : 'signature creation time',
    SIG_SUB_TYPE_EXPIRE_TIME : 'signature expiration time',
    SIG_SUB_TYPE_EXPORT_CERT : 'exportable certification',
    SIG_SUB_TYPE_TRUST_SIG : 'trust signature',
    SIG_SUB_TYPE_REGEXP : 'regular expression',
    SIG_SUB_TYPE_REVOCABLE : 'revocable',
    SIG_SUB_TYPE_KEY_EXPIRE : 'key expiration time',
    SIG_SUB_TYPE_PLACEHOLDER : 'placeholder for backward compatibility',
    SIG_SUB_TYPE_PREF_SYMM_ALGO : 'preferred symmetric algorithms',
    SIG_SUB_TYPE_REVOKE_KEY : 'revocation key',
    SIG_SUB_TYPE_ISSUER_KEY_ID : 'issuer key ID',
    SIG_SUB_TYPE_NOTATION : 'notation data',
    SIG_SUB_TYPE_PREF_HASH_ALGO : 'preferred hash algorithms',
    SIG_SUB_TYPE_PREF_COMP_ALGO : 'preferred compression algorithms',
    SIG_SUB_TYPE_KEY_SRV_PREF : 'key server preferences',
    SIG_SUB_TYPE_PREF_KEY_SRVR : 'preferred key server',
    SIG_SUB_TYPE_PRIM_USER_ID : 'primary user id',
    SIG_SUB_TYPE_POLICY_URL : 'policy URL',
    SIG_SUB_TYPE_KEY_FLAGS : 'key flags',
    SIG_SUB_TYPE_SGNR_USER_ID : "signer's user id",
    SIG_SUB_TYPE_REVOKE_REASON : 'reason for revocation'
}

# in a signature subpacket there may be a revocation reason, these codes indicate
# the reason
REVOKE_REASON_NONE = 0              # No reason specified
REVOKE_REASON_SUPER = 0x01          # Key is superceded
REVOKE_REASON_COMPR = 0x02          # Key has been compromised
REVOKE_REASON_NOT_USED = 0x03       # Key is no longer used
REVOKE_REASON_ID_INVALID = 0x20     # user id information is no longer valid

revoke_reason_to_str = {
    REVOKE_REASON_NONE : 'No reason specified',
    REVOKE_REASON_SUPER : 'Key is superceded',
    REVOKE_REASON_COMPR : 'Key has been compromised',
    REVOKE_REASON_NOT_USED : 'Key is no longer used',
    REVOKE_REASON_ID_INVALID : 'user id information is no longer valid'
}

# These flags are used in a 'key flags' signature subpacket
KEY_FLAGS1_MAY_CERTIFY = 0x01 # This key may be used to certify other keys
KEY_FLAGS1_MAY_SIGN = 0x02 # This key may be used to sign data
KEY_FLAGS1_MAY_ENC_COMM = 0x04 # This key may be used to encrypt communications
KEY_FLAGS1_MAY_ENC_STRG = 0x08 # This key may be used to encrypt storage
KEY_FLAGS1_PRIV_MAYBE_SPLIT = 0x10 # Private component have be split through secret-sharing mech.
KEY_FLAGS1_GROUP = 0x80 # Private component may be among group

# A revocation key subpacket has these class values
REVOKE_KEY_CLASS_MAND = 0x80 # this bit must always be set
REVOKE_KEY_CLASS_SENS = 0x40 # sensitive

def get_whole_number(msg, idx, numlen) :
    """get_whole_number(msg, idx, numlen)
extracts a "whole number" field of length numlen from msg at index idx
returns (<whole number>, new_idx) where the whole number is a long integer
and new_idx is the index of the next element in the message"""
    n = 0L 
    while numlen > 0 :
        b = (struct.unpack("B", msg[idx:idx+1]))[0]
        n = n * 256L + long(b)
        idx = idx + 1
        numlen = numlen - 1
    return (n, idx)

def get_whole_int(msg, idx, numlen) :
    """get_whole_int(msg, idx, numlen)
same as get_whole_number but returns the number as an int for convenience"""
    n, idx = get_whole_number(msg, idx, numlen)
    return int(n), idx

def pack_long(l) :
    """pack_long(l)
    returns big-endian representation of unsigned long integer"""
    arr = []
    while l > 0 :
        arr.insert(0, struct.pack("B", l & 0xff))
        l >>= 8
    return ''.join(arr)
    
def pack_mpi(l) :
    """pack_mpi(l)
    returns the PGP Multi-Precision Integer representation of unsigned long integer"""
    s = pack_long(l)
    # the len is the number of bits, counting only from the MSB,
    # so we need to account for that
    bits = (len(s) - 1) * 8
    if len(s) > 0 :
        n = ord(s[0])
        while n != 0 :
            bits += 1
            n >>= 1
    else :
        bits = 0 # otherwise bits == -8
    return struct.pack(">H", bits) + s

def get_sig_subpak_len(msg, idx) :
    """get_sig_subpak_len(msg, idx)
extracts a signature subpacket length field
returns (subpak_len, new_idx)"""
    plen, idx = get_whole_int(msg, idx, 1)
    if plen < 192 :
        return plen, idx
    if plen < 255 :
        plen2, idx = get_whole_int(msg, idx, 1)
        return ((plen - 192) << 8) + plen2 + 192, idx
    return get_whole_int(msg, idx, 4)

def get_n_mpi(msg, idx) :
    """get_mpi(msg, idx)
    extracts a multi-precision integer field from the message msg at index idx
    returns (n, <mpi>, new_idx) where the mpi is a long integer and new_idx is
    the index of the next element in the message and n is the number of bits of
    precision in <mpi>"""
    ln, idx = get_whole_int(msg, idx, 2)
    return (ln,) + get_whole_number(msg, idx, (ln+7)/8)

def get_mpi(msg, idx) :
    """get_mpi(msg, idx)
extracts a multi-precision integer field from the message msg at index idx
returns (<mpi>, new_idx) where the mpi is a long integer and new_idx is
the index of the next element in the message"""
    l = get_n_mpi(msg, idx)
    return (l[1], l[2])

def str_to_hex(s) :
    return string.join(map(lambda x : string.zfill(hex(ord(x))[2:], 2), list(s)), '')

def duration_to_str(s) :
    if s == 0 :
        return 'never'
    secs = s % 60
    s = s / 60
    mins = s % 60
    s = s / 60
    hrs = s % 60
    s = s / 24
    days = s
    return '%d days %02d:%02d:%02d' % (days, hrs, mins, secs)

def map_to_str(m, vals) :
    slist = []
    # change to a list if it's a single value
    if type(vals) != types.ListType and type(vals) != types.TupleType :
        vals = list((vals,))
    for i in vals :
        if m.has_key(i) :
            slist.append(m[i])
        else :
            slist.append('unknown(' + str(i) + ')')
    return string.join(slist, ', ')

class pgp_packet :
    def __init__(self) :
        self.pkt_typ = None

    def __str__(self) :
        return map_to_str(ctb_pkt_to_str, self.pkt_typ)

class public_key(pgp_packet) :
    def __init__(self) :
        # just initialize the fields
        self.version = None
        self.pk_algo = None
        self.key_size = 0
        self.fingerprint_ = None # we cache this upon calculation

    def fingerprint(self) :
        # return cached value if we have it
        if self.fingerprint_ :
            return self.fingerprint_
        
        # otherwise calculate it now and cache it
        # v3 and v4 are calculated differently
        if self.version == 3 :
            h = md5.new()
            h.update(pack_long(self.pk_rsa_mod))
            h.update(pack_long(self.pk_rsa_exp))
            self.fingerprint_ = h.digest()
        elif self.version == 4 :
            # we hash what would be the whole PGP message containing
            # the pgp certificate
            h = sha.new()
            h.update('\x99')
            # we need to has the length of the packet as well
            buf = self.serialize()
            h.update(struct.pack(">H", len(buf)))
            h.update(buf)
            self.fingerprint_ = h.digest()
        else :
            raise RuntimeError("unknown public key version %d" % self.version)
        return self.fingerprint_

    def key_id(self) :
        if self.version == 3 :
            return pack_long(self.pk_rsa_mod & 0xffffffffffffffffL)
        elif self.version == 4 :
            return self.fingerprint()[-8:]

    def serialize(self) :
        chunks = []
        if self.version == 3 :
            chunks.append(struct.pack('>BIHB', self.version, int(self.timestamp), self.validity, self.pk_algo))
            chunks.append(pack_mpi(self.pk_rsa_mod))
            chunks.append(pack_mpi(self.pk_rsa_exp))
        elif self.version == 4 :
            chunks.append(struct.pack('>BIB', self.version, int(self.timestamp), self.pk_algo))
            if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
                chunks.append(pack_mpi(self.pk_rsa_mod))
                chunks.append(pack_mpi(self.pk_rsa_exp))
            elif self.pk_algo == ALGO_PK_DSA :
                chunks.append(pack_mpi(self.pk_dsa_prime_p))
                chunks.append(pack_mpi(self.pk_dsa_grp_ord_q))
                chunks.append(pack_mpi(self.pk_dsa_grp_gen_g))
                chunks.append(pack_mpi(self.pk_dsa_pub_key))
            elif self.pk_algo == ALGO_PK_ELGAMAL_ENC_OR_SIGN or self.pk_algo == ALGO_PK_ELGAMAL_ENC_ONLY :
                chunks.append(pack_mpi(self.pk_elgamal_prime_p))
                chunks.append(pack_mpi(self.pk_elgamal_grp_gen_g))
                chunks.append(pack_mpi(self.pk_elgamal_pub_key))
            else :
                raise RuntimeError("unknown public key algorithm %d" % (self.pk_algo))
        return ''.join(chunks)
    
    def deserialize(self, msg, idx, pkt_len) :
        idx_save = idx
        self.version, idx = get_whole_int(msg, idx, 1)
        if self.version != 2 and self.version != 3 and self.version != 4 :
            raise 'unknown public key packet version %d at %d' % (self.version, idx_save)
        if self.version == 2 : # map v2 into v3 for coding simplicity since they're structurally the same
            self.version = 3
        self.timestamp, idx = get_whole_number(msg, idx, 4)
        self.timestamp = float(self.timestamp)
        if self.version == 3 :
            self.validity, idx = get_whole_number(msg, idx, 2)
        self.pk_algo, idx = get_whole_int(msg, idx, 1)
        if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
            self.key_size, self.pk_rsa_mod, idx = get_n_mpi(msg, idx)
            self.pk_rsa_exp, idx = get_mpi(msg, idx)
        elif self.pk_algo == ALGO_PK_DSA :
            l1, self.pk_dsa_prime_p, idx = get_n_mpi(msg, idx)
            self.pk_dsa_grp_ord_q, idx = get_mpi(msg, idx)
            self.pk_dsa_grp_gen_g, idx = get_mpi(msg, idx)
            l2, self.pk_dsa_pub_key, idx = get_n_mpi(msg, idx)
            self.key_size = l1 + l2
        elif self.pk_algo == ALGO_PK_ELGAMAL_ENC_OR_SIGN or self.pk_algo == ALGO_PK_ELGAMAL_ENC_ONLY :
            self.key_size, self.pk_elgamal_prime_p, idx = get_n_mpi(msg, idx)
            self.pk_elgamal_grp_gen_g, idx = get_mpi(msg, idx)
            self.pk_elgamal_pub_key, idx = get_mpi(msg, idx)
        else :
            raise "unknown public key algorithm %d at %d" % (self.pk_algo, idx_save)

    def __str__(self) :
        sio = cStringIO.StringIO()
        sio.write(pgp_packet.__str__(self) + "\n")
        sio.write("version: " + str(self.version) + "\n")
        sio.write("timestamp: " + time.ctime(self.timestamp) + "\n")
        if self.version == 3 :
            sio.write("validity: " + time.ctime(self.timestamp + self.validity * 24 * 60 * 60) + "\n")
        sio.write("pubkey algo: " + algo_pk_to_str[self.pk_algo] + "\n")
        if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
            sio.write("pk_rsa_mod: " + hex(self.pk_rsa_mod) + "\n")
            sio.write("pk_rsa_exp: " + hex(self.pk_rsa_exp) + "\n")
        elif self.pk_algo == ALGO_PK_DSA :
            sio.write("pk_dsa_prime_p: " + hex(self.pk_dsa_prime_p) + "\n")
            sio.write("pk_dsa_grp_ord_q: " + hex(self.pk_dsa_grp_ord_q) + "\n")
            sio.write("pk_dsa_grp_gen_g: " + hex(self.pk_dsa_grp_gen_g) + "\n")
            sio.write("pk_dsa_pub_key: " + hex(self.pk_dsa_pub_key) + "\n")
        elif self.pk_algo == ALGO_PK_ELGAMAL_ENC_OR_SIGN or self.pk_algo == ALGO_PK_ELGAMAL_ENC_ONLY :
            sio.write("pk_elgamal_prime_p: " + hex(self.pk_elgamal_prime_p) + "\n")
            sio.write("pk_elgamal_grp_gen_g: " + hex(self.pk_elgamal_grp_gen_g) + "\n")
            sio.write("pk_elgamal_pub_key: " + hex(self.pk_elgamal_pub_key) + "\n")
        return sio.getvalue()

class user_id(pgp_packet) :
    def __init__(self) :
        # just initialize the fields
        id = None

    def deserialize(self, msg, idx, pkt_len) :
        self.id = msg[idx:idx + pkt_len]

    def __str__(self) :
        return pgp_packet.__str__(self) + "\n" + "id: " + self.id + "\n"

class signature(pgp_packet) :
    def __init__(self) :
        # just initialize the fields
        self.version = None
        self.sig_type = None
        self.pk_algo = None
        self.hash_algo = None
        self.hash_frag = None

    def key_id(self) :
        if self.version == 3 :
            return self.key_id_
        else :
            i = self.get_hashed_subpak(SIG_SUB_TYPE_ISSUER_KEY_ID)
            if i :
                return i[1]
            i = self.get_unhashed_subpak(SIG_SUB_TYPE_ISSUER_KEY_ID)
            if i :
                return i[1]
            return None

    def expiration(self) :
        if self.version != 4 :
            raise ValueError('v3 signatures don\'t have expirations')
        i = self.get_hashed_subpak(SIG_SUB_TYPE_KEY_EXPIRE)
        if i :
            return i[1]
        return 0 # if not present then it never expires

    def get_hashed_subpak(self, typ) :
        for i in self.hashed_subpaks :
            if i[0] == typ :
                return i
        return None
    
    def get_unhashed_subpak(self, typ) :
        for i in self.unhashed_subpaks :
            if i[0] == typ :
                return i
        return None
    
    def deserialize_subpacket(self, msg, idx) :
        sublen, idx = get_sig_subpak_len(msg, idx)
        subtype, idx = get_whole_int(msg, idx, 1)
        if subtype == SIG_SUB_TYPE_CREATE_TIME : # key creation time
            tm, idx = get_whole_number(msg, idx, 4)
            return (subtype, float(tm)), idx
        if subtype == SIG_SUB_TYPE_EXPIRE_TIME or subtype == SIG_SUB_TYPE_KEY_EXPIRE :
            s, idx = get_whole_int(msg, idx, 4)
            return (subtype, s), idx
        if subtype == SIG_SUB_TYPE_EXPORT_CERT or subtype == SIG_SUB_TYPE_REVOCABLE :
            bool, idx = get_whole_int(msg, idx, 1)
            return (subtype, bool), idx
        if subtype == SIG_SUB_TYPE_TRUST_SIG : # trust signature
            trust_lvl, idx = get_whole_int(msg, idx, 1)
            trust_amt, idx = get_whole_int(msg, idx, 1)
            return (subtype, trust_lvl, trust_amt), idx
        if subtype == SIG_SUB_TYPE_REGEXP : # regular expression
            expr = msg[idx:idx+sublen-1]
            idx = idx + sublen - 1
            return (subtype, expr), idx
        if subtype == SIG_SUB_TYPE_PREF_SYMM_ALGO or subtype == SIG_SUB_TYPE_PREF_HASH_ALGO or subtype == SIG_SUB_TYPE_PREF_COMP_ALGO or subtype == SIG_SUB_TYPE_KEY_FLAGS :
            algo_list = map(lambda x : ord(x), list(msg[idx:idx+sublen-1]))
            idx = idx + sublen - 1
            return (subtype, algo_list), idx
        if subtype == SIG_SUB_TYPE_REVOKE_KEY : # revocation key
            cls, idx = get_whole_int(msg, idx, 1)
            algo, idx = get_whole_int(msg, idx, 1)
            fprint = msg[idx:idx+20]
            idx = idx + 20
            return (subtype, cls, algo, fprint), idx
        if subtype == SIG_SUB_TYPE_ISSUER_KEY_ID : # issuer key ID
            k_id = msg[idx:idx+8]
            idx = idx + 8
            return (subtype, k_id), idx
        if subtype == SIG_SUB_TYPE_NOTATION : # notation data
            flg1, idx = get_whole_int(msg, idx, 1)
            flg2, idx = get_whole_int(msg, idx, 1)
            flg3, idx = get_whole_int(msg, idx, 1)
            flg4, idx = get_whole_int(msg, idx, 1)
            name_len, idx = get_whole_int(msg, idx, 2)
            val_len, idx = get_whole_int(msg, idx, 2)
            nam = msg[idx:idx+name_len]
            idx = idx + name_len
            val = msg[idx:idx+val_len]
            idx = idx + val_len
            return (subtype, flg1, flg2, flg3, flg4, nam, val), idx
        if subtype == SIG_SUB_TYPE_KEY_SRV_PREF : # key server preferences
            prefs = [ ord(x) for x in msg[idx:idx+sublen-1] ]
            idx = idx + sublen - 1
            return (subtype, prefs), idx
        if subtype == SIG_SUB_TYPE_PREF_KEY_SRVR : # preferred key server
            url = msg[idx:idx+sublen-1]
            idx = idx + sublen - 1
            return (subtype, url), idx
        if subtype == SIG_SUB_TYPE_PRIM_USER_ID : # primary user id
            bool, idx = get_whole_int(msg, idx, 1)
            return (subtype, bool), idx
        if subtype == SIG_SUB_TYPE_POLICY_URL : # policy URL
            url = msg[idx:idx+sublen-1]
            idx = idx + sublen - 1
            return (subtype, url), idx
        if subtype == SIG_SUB_TYPE_SGNR_USER_ID : # signer's user id
            signer_id = msg[idx:idx+sublen-1]
            idx = idx + sublen - 1
            return (subtype, signer_id), idx
        if subtype == SIG_SUB_TYPE_REVOKE_REASON : # reason for revocation
            rev_code, idx = get_whole_int(msg, idx, 1)
            reas_len = sublen - 2
            reas = msg[idx:idx+reas_len]
            idx = idx + reas_len
            return (subtype, rev_code, reas), idx
        # otherwise the subpacket is an unknown type, so we just pack the data in it
        dat = msg[idx:idx+sublen-1]
        idx = idx + sublen - 1
        return (subtype, dat), idx

    def is_primary_user_id(self) :
        """is_primary_user_id()
        returns true if this signature contains a primary user id subpacket with value true"""
        for i in self.hashed_subpaks :
            if i[0] == SIG_SUB_TYPE_PRIM_USER_ID :
                return i[1]
        return 0
    
    def subpacket_to_str(self, sp) :
        if sp[0] == SIG_SUB_TYPE_CREATE_TIME : # signature creation time
            return 'creation time: ' + time.ctime(sp[1])
        if sp[0] == SIG_SUB_TYPE_EXPIRE_TIME : # signature expiration time
            return 'signature expires: ' + duration_to_str(sp[1])
        if sp[0] == SIG_SUB_TYPE_EXPORT_CERT : # exportable certification
            if sp[1] :
                return 'signature exportable: TRUE'
            else :
                return 'signature exportable: FALSE'
        if sp[0] == SIG_SUB_TYPE_TRUST_SIG : # trust signature
            if sp[1] == 0 :
                return 'trust: ordinary'
            if sp[1] == 1 :
                return 'trust: introducer (%d)' % sp[2]
            if sp[1] == 2 :
                return 'trust: meta-introducer (%d)' % sp[2]
            return 'trust: %d %d' % (sp[1], sp[2])
        if sp[0] == SIG_SUB_TYPE_REGEXP : # regular expression
            return 'regexp: ' + sp[1]
        if sp[0] == SIG_SUB_TYPE_REVOCABLE : # revocable
            if sp[1] :
                return 'signature revocable: TRUE'
            else :
                return 'signature revocable: FALSE'
        if sp[0] == SIG_SUB_TYPE_KEY_EXPIRE : # key expiration time
            return 'key expires: ' + duration_to_str(sp[1])
        if sp[0] == SIG_SUB_TYPE_PREF_SYMM_ALGO : # preferred symmetric algorithms
            return 'preferred symmetric algorithms: ' + map_to_str(algo_sk_to_str, sp[1])
        if sp[0] == SIG_SUB_TYPE_REVOKE_KEY : # revocation key
            s = 'revocation key: '
            if sp[1] & REVOKE_KEY_CLASS_SEN :
                s = s + '(sensitive) '
            return s + map_to_str(algo_pk_to_str, sp[2]) + ' ' + str_to_hex(sp[3])
        if sp[0] == SIG_SUB_TYPE_ISSUER_KEY_ID : # issuer key ID
            return 'issuer key id: ' + str_to_hex(sp[1])
        if sp[0] == SIG_SUB_TYPE_NOTATION : # notation data
            return 'notation: flags(%d, %d, %d, %d) name(%s) value(%s)' % sp[1:]
        if sp[0] == SIG_SUB_TYPE_PREF_HASH_ALGO : # preferred hash algorithms
            return 'preferred hash algorithms: ' + map_to_str(algo_hash_to_str, sp[1])
        if sp[0] == SIG_SUB_TYPE_PREF_COMP_ALGO : # preferred compression algorithms
            return 'preferred compression algorithms: ' + map_to_str(algo_comp_to_str, sp[1])
        if sp[0] == SIG_SUB_TYPE_KEY_SRV_PREF : # key server preferences
            s = 'key server preferences: '
            prefs = []
            if sp[1][0] & 0x80 :
                prefs.append('No-modify')
            return s + string.join(prefs, ', ')
        if sp[0] == SIG_SUB_TYPE_PREF_KEY_SRVR : # preferred key server
            return 'preferred key server: %s' % sp[1]
        if sp[0] == SIG_SUB_TYPE_PRIM_USER_ID : # primary user id
            if sp[1] :
                return 'is primary user id'
            else :
                return 'is not primary user id'
        if sp[0] == SIG_SUB_TYPE_POLICY_URL : # policy URL
            return 'policy url: %s' % sp[1]
        if sp[0] == SIG_SUB_TYPE_KEY_FLAGS : # key flags
            flags = []
            flgs1 = 0
            if len(sp[1]) >= 1 :
                flgs1 = sp[1][0]
            if flgs1 & KEY_FLAGS1_MAY_CERTIFY :
                flags.append('may certify other keys')
            if flgs1 & KEY_FLAGS1_MAY_SIGN :
                flags.append('may sign data')
            if flgs1 & KEY_FLAGS1_MAY_ENC_COMM :
                flags.append('may encrypt communications')
            if flgs1 & KEY_FLAGS1_MAY_ENC_STRG :
                flags.append('may encrypt storage')
            if flgs1 & KEY_FLAGS1_PRIV_MAYBE_SPLIT :
                flags.append('private component may have been secret-sharing split')
            if flgs1 & KEY_FLAGS1_GROUP :
                flags.append('group key')
            return 'key flags: ' + string.join(flags, ', ')
        if sp[0] == SIG_SUB_TYPE_SGNR_USER_ID : # signer's user id
            return 'signer id: ' + sp[1]
        if sp[0] == SIG_SUB_TYPE_REVOKE_REASON : # reason for revocation
            reas = ''
            if revoke_reason_to_str.has_key(sp[1]) :
                reas = revoke_reason_to_str[sp[1]]
            return 'reason for revocation: %s, %s' % (reas, sp[2])
        # this means we don't know what the thing is so we just have raw data
        return 'unknown(%d): %s' % (sp[0], str_to_hex(sp[1]))

    def deserialize(self, msg, idx, pkt_len) :
        self.version, idx = get_whole_int(msg, idx, 1)
        if self.version == 2 :
            self.version = 3
        if self.version == 3 :
            hash_len, idx = get_whole_number(msg, idx, 1)
            self.sig_type, idx = get_whole_int(msg, idx, 1)
            self.timestamp, idx = get_whole_number(msg, idx, 4)
            self.timestamp = float(self.timestamp)
            self.key_id_ = msg[idx:idx+8]
            idx = idx + 8
            self.pk_algo, idx = get_whole_int(msg, idx, 1)
            self.hash_algo, idx = get_whole_int(msg, idx, 1)
        elif self.version == 4:
            self.sig_type, idx = get_whole_int(msg, idx, 1)
            self.pk_algo, idx = get_whole_int(msg, idx, 1)
            self.hash_algo, idx = get_whole_int(msg, idx, 1)
            sub_paks_len, idx = get_whole_int(msg, idx, 2)
            sub_paks_end = idx + sub_paks_len
            self.hashed_subpaks = []
            while idx < sub_paks_end :
                sp, idx = self.deserialize_subpacket(msg, idx)
                self.hashed_subpaks.append(sp)
            sub_paks_len, idx = get_whole_int(msg, idx, 2)
            sub_paks_end = idx + sub_paks_len
            self.unhashed_subpaks = []
            while idx < sub_paks_end :
                sp, idx = self.deserialize_subpacket(msg, idx)
                self.unhashed_subpaks.append(sp)
        else :
            raise 'unknown signature packet version %d at %d' % (self.version, idx)
        self.hash_frag, idx = get_whole_number(msg, idx, 2)
        if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
            self.rsa_sig, idx = get_mpi(msg, idx)
        elif self.pk_algo == ALGO_PK_DSA :
            self.dsa_sig_r, idx = get_mpi(msg, idx)
            self.dsa_sig_s, idx = get_mpi(msg, idx)
        else :
            raise 'unknown public-key algorithm (%d) in signature at %d' % (self.pk_algo, idx)
        return idx

    def __str__(self) :
        sio = cStringIO.StringIO()
        sio.write(pgp_packet.__str__(self) + "\n")
        sio.write("version: " + str(self.version) + "\n")
        sio.write("type: " + sig_type_to_str[self.sig_type] + "\n")
        if self.version == 3 :
            sio.write("timestamp: " + time.ctime(self.timestamp) + "\n")
            sio.write("key_id: " + str_to_hex(self.key_id_) + "\n")
        elif self.version == 4 :
            sio.write("hashed subpackets:\n")
            for i in self.hashed_subpaks :
                sio.write("    " + self.subpacket_to_str(i) + "\n")
            sio.write("unhashed subpackets:\n")
            for i in self.unhashed_subpaks :
                sio.write("    " + self.subpacket_to_str(i) + "\n")
        sio.write("hash_algo: " + algo_hash_to_str[self.hash_algo] + "\n")
        sio.write("hash_frag: " + hex(self.hash_frag) + "\n")
        if self.pk_algo == ALGO_PK_RSA_ENC_OR_SIGN or self.pk_algo == ALGO_PK_RSA_SIGN_ONLY :
            sio.write("pk_algo: RSA\n")
            sio.write("rsa_sig: " + hex(self.rsa_sig) + "\n")
        elif self.pk_algo == ALGO_PK_DSA :
            sio.write("pk_algo: DSA\n")
            sio.write("dsa_sig_r: " + hex(self.dsa_sig_r) + "\n")
            sio.write("dsa_sig_s: " + hex(self.dsa_sig_s) + "\n")
        return sio.getvalue()

#
# This class encapsulates an openpgp public "certificate", which is formed in a message as
# a series of PGP packets of certain types in certain orders
#

class pgp_certificate :
    def __init__(self) :
        self.version = None
        self.public_key = None
        self.revocation = None
        #self.user_id = None
        self.user_ids = []
        self.rvkd_user_ids = []

    def __str__(self) :
        sio = cStringIO.StringIO()
        sio.write("PGP Public Key Certificate v%d\n" % self.version)
        sio.write("Primary ID: %s\n" % self.user_id)
        sio.write(str(self.public_key))
        for uid in self.user_ids :
            sio.write(str(uid[0]))
            for sig in uid[1:] :
                sio.write("   " + str(sig))
        return sio.getvalue()
    
    def get_user_id(self):
        # take the LAST one in the list, not first
        # they appear to be ordered FIFO from the key and that means if you
        # added a key later then it won't show the one you expect
        return self.user_ids[-1][0].id
        
    user_id = property(get_user_id)
    
    def expiration(self) :
        if self.version == 3 :
            if self.public_key.validity == 0 :
                return 0
            return self.public_key.timestamp + self.public_key.validity * 24 * 60 * 60
        else : # self.version == 4
            # this is a bit more complex, we need to find the signature on the
            # key and get its expiration
            u_id = self.user_ids[0]
            for i in u_id[1:] :
                if i.sig_type == SIG_TYPE_PK_USER_GEN :
                    exp = i.expiration()
                    if exp == 0 :
                        return 0
                    return self.public_key.timestamp + exp
            return 0

    def key_size(self) :
        return 0
    
    def load(self, pkts) :
        """load(pkts)
Initialize the pgp_certificate with a list of OpenPGP packets. The list of packets will
be scanned to make sure they are valid for a pgp certificate."""
        
        # each certificate should begin with a public key packet
        if pkts[0].pkt_typ != CTB_PKT_PK_CERT :
            raise ValueError('first PGP packet should be a public-key packet, not %s' % map_to_str(ctb_pkt_to_str, pkts[0].pkt_typ))

        # all versions have a public key although in a v4 cert the main key is only
        # used for signing, never encryption
        self.public_key = pkts[0]

        # ok, then what's the version
        self.version = self.public_key.version

        # now the behavior splits a little depending on the version
        if self.version == 3 :
            pkt_idx = 1

            # second packet could be a revocation
            if pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                if pkts[pkt_idx].version != 3 :
                    raise ValueError('version 3 cert has version %d signature' % pkts[pkt_idx].version)
                if pkts[pkt_idx].sig_type != SIG_TYPE_KEY_REVOKE :
                    raise ValueError('v3 cert revocation sig has type %s' % map_to_str(sig_type_to_str, pkts[pkt_idx].sig_type))

                # ok, well at least the type is good, we'll assume the cert is
                # revoked
                self.revocation = pkts[pkt_idx]

                # increment the pkt_idx to go to the next one
                pkt_idx = pkt_idx + 1

            # the following packets are User ID, Signature pairs
            while pkt_idx < len(pkts) :
                # this packet is supposed to be a user id
                if pkts[pkt_idx].pkt_typ != CTB_PKT_USER_ID :
                    raise ValueError('pgp packet %d is not user id, is %s' % (pkt_idx, map_to_str(ctb_pkt_to_str, pkts[pkt_idx].pkt_typ)))

                user_id = [pkts[pkt_idx]]
                pkt_idx = pkt_idx + 1
                is_revoked = 0
                is_primary_user_id = 0

                # there may be a sequence of signatures following the user id which
                # bind it to the key
                while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                    if pkts[pkt_idx].sig_type not in (SIG_TYPE_PK_USER_GEN, SIG_TYPE_PK_USER_PER, SIG_TYPE_PK_USER_CAS, SIG_TYPE_PK_USER_POS, SIG_TYPE_CERT_REVOKE) :
                        raise ValueError('signature %d doesn\'t bind user_id to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))

                    if pkts[pkt_idx].version != 3 :
                        raise ValueError('version 3 cert has version %d signature' % pkts[pkt_idx].version)

                    user_id.append(pkts[pkt_idx])

                    # was the a revocation?
                    if pkts[pkt_idx].sig_type == SIG_TYPE_CERT_REVOKE :
                        is_revoked = 1

                    # is this a primary user id?
                    if not self.cert_id and pkts[pkt_idx].sig_type == SIG_TYPE_PK_USER_GEN :
                        is_primary_user_id = pkt_idx
                    pkt_idx = pkt_idx + 1

                # we get the cert id from the first sig that's a candidate for being
                # the primary user id
                if not self.cert_id and is_primary_user_id and not is_revoked :
                    # the cert type must be generic pubkey and user id
                    self.user_id = user_id[0].id

                # append the user ID and signature(s) onto a list
                if is_revoked :
                    self.rvkd_user_ids.append(user_id)
                else :
                    self.user_ids.append(user_id)

        else : # self.version == 4
            pkt_idx = 1
            self.direct_key_sigs = []
            self.subkeys = []
            self.rvkd_subkeys = []

            # second packet could be a revocation (or a direct key self signature)
            if pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                if pkts[pkt_idx].version != 4 :
                    raise ValueError('version 4 cert has version %d signature' % pkts[pkt_idx].version)
                if pkts[pkt_idx].sig_type == SIG_TYPE_KEY_REVOKE :
                    # ok, well at least the type is good, we'll assume the cert is
                    # revoked
                    self.revocation = pkts[pkt_idx]

                    # increment the pkt_idx to go to the next one
                    pkt_idx = pkt_idx + 1

            # there can then be a sequence of direct key signatures
            while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                if pkts[pkt_idx].sig_type != SIG_TYPE_KEY :
                    raise ValueError('v4 cert signature has type %s, supposed to be direct key' % map_to_str(sig_type_to_str, pkts[pkt_idx].sig_type))
                self.direct_key_sigs.append(pkts[pkt_idx])
                pkt_idx = pkt_idx + 1
                
            # the following packets are User ID, Signature... sets or subkey, signature... sets
            while pkt_idx < len(pkts) :
                
                # this packet is supposed to be a user id
                if pkts[pkt_idx].pkt_typ == CTB_PKT_USER_ID :
                    user_id = [pkts[pkt_idx]]
                    is_revoked = 0
                    is_primary_user_id = 0

                    pkt_idx = pkt_idx + 1

                    # there may be a sequence of signatures following the user id which
                    # bind it to the key
                    while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                        if pkts[pkt_idx].sig_type not in (SIG_TYPE_PK_USER_GEN, SIG_TYPE_PK_USER_PER, SIG_TYPE_PK_USER_CAS, SIG_TYPE_PK_USER_POS, SIG_TYPE_CERT_REVOKE) :
                            raise ValueError('signature %d doesn\'t bind user_id to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))
                        user_id.append(pkts[pkt_idx])

                        # was the a revocation?
                        if pkts[pkt_idx].sig_type == SIG_TYPE_CERT_REVOKE :
                            is_revoked = 1

                        # is this the primary user id?
                        if pkts[pkt_idx].version == 4 and pkts[pkt_idx].is_primary_user_id() :
                            is_primary_user_id = 1
                        pkt_idx = pkt_idx + 1

                    # append the user ID and signature(s) onto the list
                    if is_revoked :
                        self.rvkd_user_ids.append(user_id)
                    else :
                        if is_primary_user_id :
                            self.user_id = user_id[0].id
                        self.user_ids.append(user_id)

                elif pkts[pkt_idx].pkt_typ == CTB_PKT_PK_SUB :
                    # collect this list of subkey + signatures
                    subkey = [pkts[pkt_idx]]
                    pkt_idx = pkt_idx + 1
                    is_revoked = 0

                    # there may be a sequence of signatures following the user id which
                    # bind it to the key
                    while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
                        if pkts[pkt_idx].sig_type not in (SIG_TYPE_SUBKEY_BIND, SIG_TYPE_SUBKEY_REVOKE) :
                            raise ValueError('signature %d doesn\'t bind subkey to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))
                        subkey.append(pkts[pkt_idx])

                        # was this a revocation?
                        if pkts[pkt_idx].sig_type == SIG_TYPE_SUBKEY_REVOKE :
                            is_revoked = 1

                        pkt_idx = pkt_idx + 1

                    # append the user ID and signature(s) onto the list
                    if is_revoked :
                        self.rvkd_subkeys.append(subkey)
                    else :
                        self.subkeys.append(subkey)
                else :
                    raise ValueError('pgp packet %d is not user id or subkey, is %s' % (pkt_idx, map_to_str(ctb_pkt_to_str, pkts[pkt_idx].pkt_typ)))

        # did we get all the things we needed?
        #if not self.user_id :
        # just take the first valid user id we encountered then
        if len(self.user_ids) == 0 :
            raise ValueError('no user id packet was present in the cert')



def get_ctb(msg, idx) :
    """get_ctb(msg, idx)
extracts a the "cypher type bit" information from message msg at index idx
returns (type, len, new_idx) where type is the enumerated type of the packet,
len is the length of the packet, and new_idx is the index of the next element
in the message"""
    b, idx = get_whole_int(msg, idx, 1)
    if (b & CTB_76_MASK) == CTB_76_NORMAL :
        n_len = 0 # undefined length
        if (b & CTB_PKT_LEN_MASK) == CTB_PKT_LEN_1 :
            n_len = 1
        if (b & CTB_PKT_LEN_MASK) == CTB_PKT_LEN_2 :
            n_len = 2
        if (b & CTB_PKT_LEN_MASK) == CTB_PKT_LEN_4 :
            n_len = 4
        if (b & CTB_PKT_LEN_MASK) == CTB_PKT_LEN_UNDEF :
            n_len = 0
        pkt_len = 0
        if n_len > 0 :
            pkt_len, idx = get_whole_int(msg, idx, n_len)
        return (b & CTB_PKTV2_MASK) >> 2, pkt_len, idx
    elif (b & CTB_76_MASK) == CTB_76_NEW :
        plen, idx = get_whole_int(msg, idx, 1)
        if plen < 192 :
            return b & CTB_PKT_MASK, plen, idx
        if plen < 224 :
            plen2, idx = get_whole_int(msg, idx, 1)
            return b & CTB_PKT_MASK, ((plen - 192) << 8) + plen2 + 192, idx
        if plen == 255 :
            plen, idx = get_whole_int(msg, idx, 4)
            return b & CTB_PKT_MASK, plen, idx
        else :
            raise 'partial message bodies are not supported by this version (%d)', b
    else :
        raise "unknown (not \"normal\") cypher type bit %d at byte %d" % (b, idx)

def crc24(msg) :
    crc24_init = 0xb704ce
    crc24_poly = 0x1864cfb

    crc = crc24_init
    for i in list(msg) :
        crc = crc ^ (ord(i) << 16)
        for j in range(0, 8) :
            crc = crc << 1
            if crc & 0x1000000 :
                crc = crc ^ crc24_poly
    return crc & 0xffffff

def decode(msg) :
    # each message is a sequence of packets so we go through the message
    # and generate a list of packets and return that
    pkt_list = []
    idx = 0
    msg_len = len(msg)
    while idx < msg_len :
        pkt_typ, pkt_len, idx = get_ctb(msg, idx)
        pkt = None
        if pkt_typ == CTB_PKT_PK_CERT or pkt_typ == CTB_PKT_PK_SUB :
            pkt = public_key()

        elif pkt_typ == CTB_PKT_USER_ID :
            pkt = user_id()

        elif pkt_typ == CTB_PKT_SIG :
            pkt = signature()

        if pkt :
            pkt.pkt_typ = pkt_typ
            pkt.deserialize(msg, idx, pkt_len)
            if debug :
                debug.write(pkt.__str__() + "\n")
        else :
            raise 'unknown pgp packet type %d at %d' % (pkt_typ, idx)

        pkt_list.append(pkt)

        idx = idx + pkt_len
    return pkt_list

def decode_msg(msg) :
    # first we'll break the block up into lines and trim each line of any 
    # carriage return chars
    pgpkey_lines = map(lambda x : string.rstrip(x), string.split(msg, '\n'))

    # check out block
    in_block = 0
    in_data = 0
    
    block_buf = cStringIO.StringIO()
    for l in pgpkey_lines :
        if not in_block :
            if l == '-----BEGIN PGP PUBLIC KEY BLOCK-----' :
                in_block = 1
            continue

        # are we at the actual data yet?
        if not in_data :
            if len(l) == 0 :
                in_data = 1
            continue
        
        # are we at the checksum line?
        if l[0] == '=' :
            # get the checksum number
            csum = base64.decodestring(l[1:5])
            i = 0
            csum, i = get_whole_number(csum, i, 3)

            # convert the base64 cert data to binary data
            cert_msg = base64.decodestring(block_buf.getvalue())
            block_buf.close()

            # check the checksum
            if csum != crc24(cert_msg) :
                raise 'bad checksum on pgp message'

            # ok, the sum looks ok so we'll actually decode the thing
            pkt_list = decode(cert_msg)

            # turn it into a real cert
            cert = pgp_certificate()
            cert.load(pkt_list)
            return cert
        
        # add the data to our buffer then
        block_buf.write(l)

    return None


--- NEW FILE plugins.py ---
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University

import os
import glob
import imp
import atexit
from constants import *
import ConfigParser
import config 
import Errors

# XXX: break the API for how plugins define config file options
#   - they should just be able to manipulate the YumConf and RepoConf classes
#     directly, adding Option instances as required
#   - cleaner, more flexible and 
#   - update PLUGINS document
#   - will take care of the following existing TODOs:
# TODO: detect conflicts between builtin yum options and registered plugin
# options (will require refactoring of config.py)
# TODO: plugins should be able to specify convertor functions for config vars

# TODO: should plugin searchpath be affected by installroot option?

# TODO: cleaner method to query installed packages rather than exposing RpmDB
# (Panu?)

# TODO: consistent case of YumPlugins methods

# TODO: expose progress bar interface

# TODO: allow plugins to define new repository types

# TODO: check for *_hook methods that aren't supported

# TODO "log" slot? To allow plugins to do customised logging/history (say to a
# SQL db)

# TODO: multiversion plugin support

# TODO: config vars marked as PLUG_OPT_WHERE_ALL should inherit defaults from
#   the [main] setting if the user doesn't specify them

# TODO: allow plugins to extend shell commands

# TODO: allow plugins to extend commands (on the command line)

# TODO: More developer docs:  use epydoc as API begins to stablise

# TODO: test the API by implementing some crack from bugzilla
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=181 
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=270
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=310
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=431
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=88 (?)
#         - http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=396 (DONE)


# The API_VERSION constant defines the current plugin API version. It is used
# to decided whether or not plugins can be loaded. It is compared against the
# 'requires_api_version' attribute of each plugin. The version number has the
# format: "major_version.minor_version".
# 
# For a plugin to be loaded the major version required by the plugin must match
# the major version in API_VERSION. Additionally, the minor version in
# API_VERSION must be greater than or equal the minor version required by the
# plugin.
# 
# If a change to yum is made that break backwards compatibility wrt the plugin
# API, the major version number must be incremented and the minor version number
# reset to 0. If a change is made that doesn't break backwards compatibility,
# then the minor number must be incremented.
API_VERSION = '2.2'

# Plugin types
TYPE_CORE = 0
TYPE_INTERFACE = 1
ALL_TYPES = (TYPE_CORE, TYPE_INTERFACE)

# Mapping of slots to conduit classes
SLOT_TO_CONDUIT = {
    'config': 'ConfigPluginConduit',
    'init': 'InitPluginConduit',
    'predownload': 'DownloadPluginConduit',
    'postdownload': 'DownloadPluginConduit',
    'prereposetup': 'PreRepoSetupPluginConduit',
    'postreposetup': 'PostRepoSetupPluginConduit',
    'close': 'PluginConduit',
    'pretrans': 'MainPluginConduit',
    'posttrans': 'MainPluginConduit',
    'exclude': 'MainPluginConduit',
    'preresolve': 'DepsolvePluginConduit',
    'postresolve': 'DepsolvePluginConduit',
    }

# Enumerate all slot names
SLOTS = SLOT_TO_CONDUIT.keys()

class PluginYumExit(Exception):
    '''Used by plugins to signal that yum should stop
    '''

class YumPlugins:
    '''
    Manager class for Yum plugins.
    '''

    def __init__(self, base, searchpath, optparser=None, types=None):
        '''Initialise the instance.

        @param base: The
        @param searchpath: A list of paths to look for plugin modules.
        @param optparser: The OptionParser instance for this run (optional).
            Use to allow plugins to extend command line options.
        @param types: A sequence specifying the types of plugins to load.
            This should be sequnce containing one or more of the TYPE_...
            constants. If None (the default), all plugins will be loaded.
        '''

        self.searchpath = searchpath
        self.base = base
        self.optparser = optparser
        self.cmdline = (None, None)
        if not types:
            types = ALL_TYPES

        self._importplugins(types)

        self.opts = {}
        self.cmdlines = {}

        # Call close handlers when yum exit's
        atexit.register(self.run, 'close')

        # Let plugins register custom config file options
        self.run('config')

    def run(self, slotname, **kwargs):
        '''Run all plugin functions for the given slot.
        '''
        # Determine handler class to use
        conduitcls = SLOT_TO_CONDUIT.get(slotname, None)
        if conduitcls is None:
            raise ValueError('unknown slot name "%s"' % slotname)
        conduitcls = eval(conduitcls)       # Convert name to class object

        for modname, func in self._pluginfuncs[slotname]:
            self.base.log(3, 'Running "%s" handler for "%s" plugin' % (
                slotname, modname))
    
            _, conf = self._plugins[modname]
            func(conduitcls(self, self.base, conf, **kwargs))

    def _importplugins(self, types):
        '''Load plugins matching the given types.
        '''

        # Initialise plugin dict
        self._plugins = {}
        self._pluginfuncs = {}
        for slot in SLOTS:
            self._pluginfuncs[slot] = []

        # Import plugins 
        for dir in self.searchpath:
            if not os.path.isdir(dir):
                continue
            for modulefile in glob.glob('%s/*.py' % dir):
                self._loadplugin(modulefile, types)

    def _loadplugin(self, modulefile, types):
        '''Attempt to import a plugin module and register the hook methods it
        uses.
        '''
        dir, modname = os.path.split(modulefile)
        modname = modname.split('.py')[0]

        conf = self._getpluginconf(modname)
        if not conf or not config.getOption(conf, 'main', 'enabled', False,
                config.BoolOption()):
            self.base.log(3, '"%s" plugin is disabled' % modname)
            return

        fp, pathname, description = imp.find_module(modname, [dir])
        module = imp.load_module(modname, fp, pathname, description)

        # Check API version required by the plugin
        if not hasattr(module, 'requires_api_version'):
             raise Errors.ConfigError(
                'Plugin "%s" doesn\'t specify required API version' % modname
                )
        if not apiverok(API_VERSION, module.requires_api_version):
            raise Errors.ConfigError(
                'Plugin "%s" requires API %s. Supported API is %s.' % (
                    modname,
                    module.requires_api_version,
                    API_VERSION,
                    ))

        # Check plugin type against filter
        plugintypes = getattr(module, 'plugin_type', ALL_TYPES)
        if not isinstance(plugintypes, (list, tuple)):
            plugintypes = (plugintypes,)

        if len(plugintypes) < 1:
            return
        for plugintype in plugintypes:
            if plugintype not in types:
                return

        self.base.log(2, 'Loading "%s" plugin' % modname)

        # Store the plugin module and its configuration file
        if not self._plugins.has_key(modname):
            self._plugins[modname] = (module, conf)
        else:
            raise Errors.ConfigError('Two or more plugins with the name "%s" ' \
                    'exist in the plugin search path' % modname)
        
        for slot in SLOTS:
            funcname = slot+'_hook'
            if hasattr(module, funcname):
                self._pluginfuncs[slot].append(
                        (modname, getattr(module, funcname))
                        )

    def _getpluginconf(self, modname):
        '''Parse the plugin specific configuration file and return a
        IncludingConfigParser instance representing it. Returns None if there
        was an error reading or parsing the configuration file.
        '''
        #XXX: should this use installroot?
        conffilename = os.path.join('/etc/yum/pluginconf.d', modname+'.conf')

        try:
            parser = config.IncludingConfigParser()
            parser.read(conffilename)
        except ConfigParser.Error, e:
            raise Errors.ConfigError("Couldn't parse %s: %s" % (conffilename,
                str(e)))
        except IOError, e:
            self.base.log(2, str(e))
            return None

        return parser

    def registeropt(self, name, valuetype, where, default):
        '''Called from plugins to register a new config file option.

        @param name: Name of the new option.
        @param valuetype: Option type (PLUG_OPT_BOOL, PLUG_OPT_STRING ...)
        @param where: Where the option should be available in the config file.
            (PLUG_OPT_WHERE_MAIN, PLUG_OPT_WHERE_REPO, ...)
        @param default: Default value for the option if not set by the user.
        '''
        if self.opts.has_key(name):
            raise Errors.ConfigError('Plugin option conflict: ' \
                    'an option named "%s" has already been registered' % name
                    )
        self.opts[name] = (valuetype, where, default)

    def parseopts(self, conf, repos):
        '''Parse any configuration options registered by plugins

        @param conf: the yumconf instance holding Yum's global options
        @param repos: a list of all repository objects
        '''
        #XXX: with the new config stuff this is an ugly hack!
        # See first TODO at top of this file

        type2opt =  {
            PLUG_OPT_STRING: config.Option(),
            PLUG_OPT_INT: config.IntOption(),
            PLUG_OPT_BOOL: config.BoolOption(),
            PLUG_OPT_FLOAT: config.FloatOption(),
            }

        # Process [main] options first
        for name, (vtype, where, default) in self.opts.iteritems(): 
            if where in (PLUG_OPT_WHERE_MAIN, PLUG_OPT_WHERE_ALL):
                val = config.getOption(conf.cfg, 'main', name, default,
                        type2opt[vtype])
                setattr(conf, name, val)

        # Process repository level options
        for repo in repos:
            for name, (vtype, where, default) in self.opts.iteritems(): 
                if where in (PLUG_OPT_WHERE_REPO, PLUG_OPT_WHERE_ALL):
                    val = config.getOption(conf.cfg, repo.id, name, default,
                            type2opt[vtype])
                    repo.set(name, val)

    def setCmdLine(self, opts, commands):
        '''Set the parsed command line options so that plugins can access them
        '''
        self.cmdline = (opts, commands)


class DummyYumPlugins:
    '''
    This class provides basic emulation of the YumPlugins class. It exists so
    that calls to plugins.run() don't fail if plugins aren't in use.
    '''
    def run(self, *args, **kwargs):
        pass

    def setCmdLine(self, *args, **kwargs):
        pass

class PluginConduit:
    def __init__(self, parent, base, conf):
        self._parent = parent
        self._base = base
        self._conf = conf

    def info(self, level, msg):
        self._base.log(level, msg)

    def error(self, level, msg):
        self._base.errorlog(level, msg)

    def promptYN(self, msg):
        self.info(2, msg)
        if self._base.conf.assumeyes:
            return 1
        else:
            return self._base.userconfirm()

    def getYumVersion(self):
        import yum
        return yum.__version__

    def getOptParser(self):
        '''Return the optparse.OptionParser instance for this execution of Yum

        In the "config" and "init" slots a plugin may add extra options to this
        instance to extend the command line options that Yum exposes.

        In all other slots a plugin may only read the OptionParser instance.
        Any modification of the instance at this point will have no effect. 
        
        See the getCmdLine() method for details on how to retrieve the parsed
        values of command line options.

        @return: the global optparse.OptionParser instance used by Yum. May be
            None if an OptionParser isn't in use.
        '''
        return self._parent.optparser

    def confString(self, section, opt, default=None):
        '''Read a string value from the plugin's own configuration file

        @param section: Configuration file section to read.
        @param opt: Option name to read.
        @param default: Value to read if option is missing.
        @return: String option value read, or default if option was missing.
        '''
        return config.getOption(self._conf, section, opt, default,
                config.Option())

    def confInt(self, section, opt, default=None):
        '''Read an integer value from the plugin's own configuration file

        @param section: Configuration file section to read.
        @param opt: Option name to read.
        @param default: Value to read if option is missing.
        @return: Integer option value read, or default if option was missing or
            could not be parsed.
        '''
        return config.getOption(self._conf, section, opt, default,
                config.IntOption())

    def confFloat(self, section, opt, default=None):
        '''Read a float value from the plugin's own configuration file

        @param section: Configuration file section to read.
        @param opt: Option name to read.
        @param default: Value to read if option is missing.
        @return: Float option value read, or default if option was missing or
            could not be parsed.
        '''
        return config.getOption(self._conf, section, opt, default,
                config.FloatOption())

    def confBool(self, section, opt, default=None):
        '''Read a boolean value from the plugin's own configuration file

        @param section: Configuration file section to read.
        @param opt: Option name to read.
        @param default: Value to read if option is missing.
        @return: Boolean option value read, or default if option was missing or
            could not be parsed.
        '''
        return config.getOption(self._conf, section, opt, default,
                config.BoolOption())

class ConfigPluginConduit(PluginConduit):

    def registerOpt(self, *args, **kwargs):
        '''Register a yum configuration file option.

        Arguments are as for YumPlugins.registeropt().
        '''
        self._parent.registeropt(*args, **kwargs)


class InitPluginConduit(PluginConduit):

    def getConf(self):
        return self._base.conf

    def getRepos(self):
        '''Return Yum's container object for all configured repositories.

        @return: Yum's RepoStorage instance
        '''
        return self._base.repos

class PreRepoSetupPluginConduit(InitPluginConduit):

    def getCmdLine(self):
        '''Return parsed command line options.

        @return: (options, commands) as returned by OptionParser.parse_args()
        '''
        return self._parent.cmdline

    def getRpmDB(self):
        '''Return a representation of local RPM database. This allows querying
        of installed packages.

        @return: rpmUtils.RpmDBHolder instance
        '''
        self._base.doTsSetup()
        self._base.doRpmDBSetup()
        return self._base.rpmdb

class PostRepoSetupPluginConduit(PreRepoSetupPluginConduit):

    def getGroups(self):
        '''Return group information.

        @return: yum.comps.Comps instance
        '''
        self._base.doGroupSetup()
        return self._base.comps

class DownloadPluginConduit(PostRepoSetupPluginConduit):

    def __init__(self, parent, base, conf, pkglist, errors=None):
        PostRepoSetupPluginConduit.__init__(self, parent, base, conf)
        self._pkglist = pkglist
        self._errors = errors

    def getDownloadPackages(self):
        '''Return a list of package objects representing packages to be
        downloaded.
        '''
        return self._pkglist

    def getErrors(self):
        '''Return a dictionary of download errors. 
        
        The returned dictionary is indexed by package object. Each element is a
        list of strings describing the error.
        '''
        if not self._errors:
            return {}
        return self._errors

class MainPluginConduit(PostRepoSetupPluginConduit):

    def getPackages(self, repo=None):
        if repo:
            arg = repo.id
        else:
            arg = None
        return self._base.pkgSack.returnPackages(arg)

    def getPackageByNevra(self, nevra):
        '''Retrieve a package object from the packages loaded by Yum using
        nevra information 
        
        @param nevra: A tuple holding (name, epoch, version, release, arch)
            for a package
        @return: A PackageObject instance (or subclass)
        '''
        return self._base.getPackageObject(nevra)

    def delPackage(self, po):
        self._base.pkgSack.delPackage(po)

    def getTsInfo(self):
        return self._base.tsInfo

class DepsolvePluginConduit(MainPluginConduit):
    def __init__(self, parent, base, conf, rescode=None, restring=[]):
        MainPluginConduit.__init__(self, parent, base, conf)
        self.resultcode = rescode
        self.resultstring = restring

def parsever(apiver):
    maj, min = apiver.split('.')
    return int(maj), int(min)

def apiverok(a, b):
    '''Return true if API version "a" supports API version "b"
    '''
    a = parsever(a)
    b = parsever(b)

    if a[0] != b[0]:
        return 0

    if a[1] >= b[1]:
        return 1

    return 0


--- NEW FILE repos.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University 

import os
import os.path
import re
import fnmatch
import urlparse
import types
import time

import Errors
from urlgrabber.grabber import URLGrabber
import urlgrabber.mirror
from urlgrabber.grabber import URLGrabError
from repomd import repoMDObject
from repomd import mdErrors
from repomd import packageSack
from packages import YumAvailablePackage
import mdcache
import parser

_is_fnmatch_pattern = re.compile(r"[*?[]").search

class YumPackageSack(packageSack.PackageSack):
    """imports/handles package objects from an mdcache dict object"""
    def __init__(self, packageClass):
        packageSack.PackageSack.__init__(self)
        self.pc = packageClass
        self.added = {}
        
    def addDict(self, repoid, datatype, dataobj, callback=None):
        if self.added.has_key(repoid):
            if datatype in self.added[repoid]:
                return

        total = len(dataobj.keys())
        if datatype == 'metadata':
            current = 0        
            for pkgid in dataobj.keys():
                current += 1
                if callback: callback.progressbar(current, total, repoid)
                pkgdict = dataobj[pkgid]
                po = self.pc(pkgdict, repoid)
                po.simple['id'] = pkgid
                self._addToDictAsList(self.pkgsByID, pkgid, po)
                self.addPackage(po)
            
            if not self.added.has_key(repoid):
                self.added[repoid] = []
            self.added[repoid].append('metadata')
            # indexes will need to be rebuilt
            self.indexesBuilt = 0
            
        elif datatype in ['filelists', 'otherdata']:
            if self.added.has_key(repoid):
                if 'metadata' not in self.added[repoid]:
                    raise Errors.RepoError, '%s md for %s imported before primary' \
                           % (datatype, repoid)
            current = 0
            for pkgid in dataobj.keys():
                current += 1
                if callback: callback.progressbar(current, total, repoid)
                pkgdict = dataobj[pkgid]
                if self.pkgsByID.has_key(pkgid):
                    for po in self.pkgsByID[pkgid]:
                        po.importFromDict(pkgdict, repoid)

            self.added[repoid].append(datatype)
            # indexes will need to be rebuilt
            self.indexesBuilt = 0
        else:
            # umm, wtf?
            pass
            
class RepoStorage:
    """This class contains multiple repositories and core configuration data
       about them."""
       
    def __init__(self):
        self.repos = {} # list of repos by repoid pointing a repo object 
                        # of repo options/misc data
        self.callback = None # progress callback used for populateSack() for importing the xml files
        self.cache = 0
        # Check to see if we can import sqlite stuff
        try:
            import sqlitecache
            import sqlitesack
        except ImportError:
            self.sqlite = False
        else:
            self.sqlite = True
            self.sqlitecache = sqlitecache
            
        self._selectSackType()
    
    def _selectSackType(self):

        if (self.sqlite):
            import sqlitecache
            import sqlitesack
            self.pkgSack = sqlitesack.YumSqlitePackageSack(sqlitesack.YumAvailablePackageSqlite)
        else:
            self.pkgSack = YumPackageSack(YumAvailablePackage)
        
    def __str__(self):
        return str(self.repos.keys())
    

    def add(self, repoobj):
        if self.repos.has_key(repoobj.id):
            raise Errors.RepoError, 'Repository %s is listed more than once in the configuration' % (repoobj.id)
        self.repos[repoobj.id] = repoobj
        

    def delete(self, repoid):
        if self.repos.has_key(repoid):
            del self.repos[repoid]
            
    def sort(self):
        repolist = self.repos.values()
        repolist.sort()
        return repolist
        
    def getRepo(self, repoid):
        try:
            return self.repos[repoid]
        except KeyError, e:
            raise Errors.RepoError, \
                'Error getting repository data for %s, repository not found' % (repoid)

    def findRepos(self,pattern):
        """find all repositories matching fnmatch `pattern`"""

        result = []
        
        for item in pattern.split(','):
            item = item.strip()
            match = re.compile(fnmatch.translate(item)).match
            for name,repo in self.repos.items():
                if match(name):
                    result.append(repo)
        return result
        
    def disableRepo(self, repoid):
        """disable a repository from use
        
        fnmatch wildcards may be used to disable a group of repositories.
        returns repoid of disabled repos as list
        """
        repos = []
        if _is_fnmatch_pattern(repoid) or repoid.find(',') != -1:
            for repo in self.findRepos(repoid):
                repos.append(repo.id)
                repo.disable()
        else:
            thisrepo = self.getRepo(repoid)
            repos.append(thisrepo.id)
            thisrepo.disable()
        
        return repos
        
    def enableRepo(self, repoid):
        """enable a repository for use
        
        fnmatch wildcards may be used to enable a group of repositories.
        returns repoid of enables repos as list
        """
        repos = []
        if _is_fnmatch_pattern(repoid) or repoid.find(',') != -1:
            for repo in self.findRepos(repoid):
                repos.append(repo.id)
                repo.enable()
        else:
            thisrepo = self.getRepo(repoid)
            repos.append(thisrepo.id)
            thisrepo.enable()
        
        return repos
        
    def listEnabled(self):
        """return list of enabled repo objects"""
        returnlist = []
        for repo in self.repos.values():
            if repo.enabled:
                returnlist.append(repo)

        return returnlist

    def listGroupsEnabled(self):
        """return a list of repo objects that have groups enabled"""
        returnlist = []
        for repo in self.listEnabled():
            if repo.enablegroups:
                returnlist.append(repo)

        return returnlist

    def setCache(self, cacheval):
        """sets cache value in all repos"""
        self.cache = cacheval
        for repo in self.repos.values():
            repo.cache = cacheval

    def setCacheDir(self, cachedir):
        """sets the cachedir value in all repos"""

        for repo in self.repos.values():
            repo.basecachedir = cachedir

    def setProgressBar(self, obj):
        """set's the progress bar for downloading files from repos"""
        
        for repo in self.repos.values():
            repo.callback = obj
            repo.setupGrab()

    def setFailureCallback(self, obj):
        """set's the failure callback for all repos"""
        
        for repo in self.repos.values():
            repo.failure_obj = obj
            repo.setupGrab()
            
                
    def populateSack(self, which='enabled', with='metadata', callback=None, pickleonly=0):
        """This populates the package sack from the repositories, two optional 
           arguments: which='repoid, enabled, all'
                      with='metadata, filelists, otherdata, all'"""

        if not callback:
            callback = self.callback
        myrepos = []
        if which == 'enabled':
            myrepos = self.listEnabled()
        elif which == 'all':
            myrepos = self.repos.values()
        else:
            if type(which) == types.ListType:
                for repo in which:
                    if isinstance(repo, Repository):
                        myrepos.append(repo)
                    else:
                        repobj = self.getRepo(repo)
                        myrepos.append(repobj)
            elif type(which) == types.StringType:
                repobj = self.getRepo(which)
                myrepos.append(repobj)

        if with == 'all':
            data = ['metadata', 'filelists', 'otherdata']
        else:
            data = [ with ]
         
        for repo in myrepos:
            if not hasattr(repo, 'cacheHandler'):
                if (self.sqlite):
                    repo.cacheHandler = self.sqlitecache.RepodataParserSqlite(
                            storedir=repo.cachedir, 
                            repoid=repo.id,
                            callback=callback,
                            )
                else:
                    repo.cacheHandler = mdcache.RepodataParser(
                            storedir=repo.cachedir, 
                            callback=callback
                            )
            for item in data:
                if self.pkgSack.added.has_key(repo.id):
                    if item in self.pkgSack.added[repo.id]:
                        continue
                        
                if item == 'metadata':
                    xml = repo.getPrimaryXML()
                    (ctype, csum) = repo.repoXML.primaryChecksum()
                    dobj = repo.cacheHandler.getPrimary(xml, csum)
                    if not pickleonly:
                        self.pkgSack.addDict(repo.id, item, dobj, callback) 
                    del dobj
                        
                elif item == 'filelists':
                    xml = repo.getFileListsXML()
                    (ctype, csum) = repo.repoXML.filelistsChecksum()
                    dobj = repo.cacheHandler.getFilelists(xml, csum)
                    if not pickleonly:
                        self.pkgSack.addDict(repo.id, item, dobj, callback) 
                    del dobj
                        
                        
                elif item == 'otherdata':
                    xml = repo.getOtherXML()
                    (ctype, csum) = repo.repoXML.otherChecksum()
                    dobj = repo.cacheHandler.getOtherdata(xml, csum)
                    if not pickleonly:
                        self.pkgSack.addDict(repo.id, item, dobj, callback)
                    del dobj
                    
                        
                else:
                    # how odd, just move along
                    continue
            # get rid of all this stuff we don't need now
            del repo.cacheHandler
        
        
class Repository:
    """this is an actual repository object"""       

    def __init__(self, repoid):
        self.id = repoid
        self.name = repoid # name is repoid until someone sets it to a real name
        # some default (ish) things
        self.urls = []
        self.gpgcheck = 0
        self.enabled = 0
        self.enablegroups = 0
        self.groupsfilename = 'yumgroups.xml' # something some freaks might 
                                              # eventually want
        self.setkeys = []
        self.repoMDFile = 'repodata/repomd.xml'
        self.repoXML = None
        self.cache = 0
        self.callback = None # callback for the grabber
        self.failure_obj = None
        self.mirrorlist = None # filename/url of mirrorlist file
        self.mirrorlistparsed = 0
        self.baseurl = [] # baseurls from the config file
        self.yumvar = {} # empty dict of yumvariables for $string replacement
        self.proxy_password = None
        self.proxy_username = None
        self.proxy = None
        self._proxy_dict = {}
        self.metadata_cookie_fn = 'cachecookie'
        self.groups_added = False
        
        # throw in some stubs for things that will be set by the config class
        self.basecachedir = ""
        self.cachedir = ""
        self.pkgdir = ""
        self.hdrdir = ""

        # holder for stuff we've grabbed
        self.retrieved = { 'primary':0, 'filelists':0, 'other':0, 'groups':0 }

        
    def __cmp__(self, other):
        if self.id > other.id:
            return 1
        elif self.id < other.id:
            return -1
        else:
            return 0

    def __str__(self):
        return self.id

    def _checksum(self, sumtype, file, CHUNK=2**16):
        """takes filename, hand back Checksum of it
           sumtype = md5 or sha
           filename = /path/to/file
           CHUNK=65536 by default"""
           
        # chunking brazenly lifted from Ryan Tomayko
        try:
            if type(file) is not types.StringType:
                fo = file # assume it's a file-like-object
            else:           
                fo = open(file, 'r', CHUNK)
                
            if sumtype == 'md5':
                import md5
                sum = md5.new()
            elif sumtype == 'sha':
                import sha
                sum = sha.new()
            else:
                raise Errors.RepoError, 'Error Checksumming file, wrong \
                                         checksum type %s' % sumtype
            chunk = fo.read
            while chunk: 
                chunk = fo.read(CHUNK)
                sum.update(chunk)
    
            if type(file) is types.StringType:
                fo.close()
                del fo
                
            return sum.hexdigest()
        except (EnvironmentError, IOError, OSError):
            raise Errors.RepoError, 'Error opening file for checksum'
        
    def dump(self):
        output = '[%s]\n' % self.id
        vars = ['name', 'bandwidth', 'enabled', 'enablegroups', 
                 'gpgcheck', 'includepkgs', 'keepalive', 'proxy',
                 'proxy_password', 'proxy_username', 'exclude', 
                 'retries', 'throttle', 'timeout', 'mirrorlist', 
                 'cachedir', 'gpgkey', 'pkgdir', 'hdrdir']
        vars.sort()
        for attr in vars:
            output = output + '%s = %s\n' % (attr, getattr(self, attr))
        output = output + 'baseurl ='
        for url in self.urls:
            output = output + ' %s\n' % url
        
        return output
    
    def enable(self):
        self.baseurlSetup()
        self.set('enabled', 1)
    
    def disable(self):
        self.set('enabled', 0)
    
    def check(self):
        """self-check the repo information  - if we don't have enough to move
           on then raise a repo error"""
        if len(self.urls) < 1:
            raise Errors.RepoError, \
             'Cannot find a valid baseurl for repo: %s' % self.id
           
                
    def set(self, key, value):
        """sets a generic attribute of this repository"""
        self.setkeys.append(key)
        setattr(self, key, value)
        
    def unset(self, key):
        """delete an attribute of this repository"""
        self.setkeys.remove(key)
        delattr(self, key)
   
    def listSetKeys(self):
        return self.setkeys
    
    def doProxyDict(self):
        if self._proxy_dict:
            return
        
        self._proxy_dict = {} # zap it
        proxy_string = None
        if self.proxy not in [None, '_none_']:
            proxy_string = '%s' % self.proxy
            if self.proxy_username is not None:
                proxy_parsed = urlparse.urlsplit(self.proxy, allow_fragments=0)
                proxy_proto = proxy_parsed[0]
                proxy_host = proxy_parsed[1]
                proxy_rest = proxy_parsed[2] + '?' + proxy_parsed[3]
                proxy_string = '%s://%s@%s%s' % (proxy_proto,
                        self.proxy_username, proxy_host, proxy_rest)
                        
                if self.proxy_password is not None:
                    proxy_string = '%s://%s:%s@%s%s' % (proxy_proto,
                              self.proxy_username, self.proxy_password,
                              proxy_host, proxy_rest)
                                                 
        if proxy_string is not None:
            self._proxy_dict['http'] = proxy_string
            self._proxy_dict['https'] = proxy_string
            self._proxy_dict['ftp'] = proxy_string

    def setupGrab(self):
        """sets up the grabber functions with the already stocked in urls for
           the mirror groups"""

        if self.failovermethod == 'roundrobin':
            mgclass = urlgrabber.mirror.MGRandomOrder
        else:
            mgclass = urlgrabber.mirror.MirrorGroup
        
        
        self.grabfunc = URLGrabber(keepalive=self.keepalive, 
                                   bandwidth=self.bandwidth,
                                   retry=self.retries,
                                   throttle=self.throttle,
                                   progress_obj=self.callback,
                                   proxies = self.proxy_dict,
                                   failure_callback=self.failure_obj,
                                   timeout=self.timeout,
                                   reget='simple')
                                   
        self.grab = mgclass(self.grabfunc, self.urls)

    def dirSetup(self):
        """make the necessary dirs, if possible, raise on failure"""

        cachedir = os.path.join(self.basecachedir, self.id)
        pkgdir = os.path.join(cachedir, 'packages')
        hdrdir = os.path.join(cachedir, 'headers')
        self.set('cachedir', cachedir)
        self.set('pkgdir', pkgdir)
        self.set('hdrdir', hdrdir)
        cookie = self.cachedir + '/' + self.metadata_cookie_fn
        self.set('metadata_cookie', cookie)

        for dir in [self.cachedir, self.hdrdir, self.pkgdir]:
            if self.cache == 0:
                if os.path.exists(dir) and os.path.isdir(dir):
                    continue
                else:
                    try:
                        os.makedirs(dir, mode=0755)
                    except OSError, e:
                        raise Errors.RepoError, \
                            "Error making cache directory: %s error was: %s" % (dir, e)
            else:
                if not os.path.exists(dir):
                    raise Errors.RepoError, \
                        "Cannot access repository dir %s" % dir
 
    def baseurlSetup(self):
        """go through the baseurls and mirrorlists and populate self.urls 
           with valid ones, run  self.check() at the end to make sure it worked"""

        goodurls = []
        if self.mirrorlist and not self.mirrorlistparsed:
            mirrorurls = getMirrorList(self.mirrorlist, self.proxy_dict)
            self.mirrorlistparsed = 1
            for url in mirrorurls:
                url = parser.varReplace(url, self.yumvar)
                self.baseurl.append(url)

        for url in self.baseurl:
            url = parser.varReplace(url, self.yumvar)
            (s,b,p,q,f,o) = urlparse.urlparse(url)
            if s not in ['http', 'ftp', 'file', 'https']:
                print 'not using ftp, http[s], or file for repos, skipping - %s' % (url)
                continue
            else:
                goodurls.append(url)
                
        self.set('urls', goodurls)
        self.check()
        self.setupGrab() # update the grabber for the urls

    def get(self, url=None, relative=None, local=None, start=None, end=None,
            copy_local=0, checkfunc=None, text=None, reget='simple', cache=True):
        """retrieve file from the mirrorgroup for the repo
           relative to local, optionally get range from
           start to end, also optionally retrieve from a specific baseurl"""
           
        # if local or relative is None: raise an exception b/c that shouldn't happen
        # if url is not None - then do a grab from the complete url - not through
        # the mirror, raise errors as need be
        # if url is None do a grab via the mirror group/grab for the repo
        # return the path to the local file

        if cache:
            headers = None
        else:
            headers = (('Pragma', 'no-cache'),)

        if local is None or relative is None:
            raise Errors.RepoError, \
                  "get request for Repo %s, gave no source or dest" % self.id
                  
        if self.failure_obj:
            (f_func, f_args, f_kwargs) = self.failure_obj
            self.failure_obj = (f_func, f_args, f_kwargs)
        
        if self.cache == 1:
            if os.path.exists(local): # FIXME - we should figure out a way
                return local          # to run the checkfunc from here
                
            else: # ain't there - raise
                raise Errors.RepoError, \
                    "Caching enabled but no local cache of %s from %s" % (local,
                           self)

        if url is not None:
            ug = URLGrabber(keepalive = self.keepalive, 
                            bandwidth = self.bandwidth,
                            retry = self.retries,
                            throttle = self.throttle,
                            progres_obj = self.callback,
                            copy_local = copy_local,
                            reget = reget,
                            proxies = self.proxy_dict,
                            failure_callback = self.failure_obj,
                            timeout=self.timeout,
                            checkfunc=checkfunc,
                            http_headers=headers,
                            )
            
            remote = url + '/' + relative

            try:
                result = ug.urlgrab(remote, local,
                                    text=text,
                                    range=(start, end), 
                                    )
            except URLGrabError, e:
                raise Errors.RepoError, \
                    "failed to retrieve %s from %s\nerror was %s" % (relative, self.id, e)
              
        else:
            try:
                result = self.grab.urlgrab(relative, local,
                                           text = text,
                                           range = (start, end),
                                           copy_local=copy_local,
                                           reget = reget,
                                           checkfunc=checkfunc,
                                           http_headers=headers,
                                           )
            except URLGrabError, e:
                raise Errors.RepoError, "failure: %s from %s: %s" % (relative, self.id, e)
                
        return result
           
        
    def metadataCurrent(self):
        """Check if there is a metadata_cookie and check its age. If the 
        age of the cookie is less than metadata_expire time then return true
        else return False"""
        
        val = False
        if os.path.exists(self.metadata_cookie):
            cookie_info = os.stat(self.metadata_cookie)
            if cookie_info[8] + self.metadata_expire > time.time():
                val = True
        
        return val

    
    def setMetadataCookie(self):
        """if possible, set touch the metadata_cookie file"""
        
        check = self.metadata_cookie
        if not os.path.exists(self.metadata_cookie):
            check = self.cachedir
        
        if os.access(check, os.W_OK):
            fo = open(self.metadata_cookie, 'w+')
            fo.close()
            del fo
            
    def getRepoXML(self, text=None):
        """retrieve/check/read in repomd.xml from the repository"""

        remote = self.repoMDFile
        local = self.cachedir + '/repomd.xml'
        if self.repoXML is not None:
            return

        if self.cache or self.metadataCurrent():
            if not os.path.exists(local):
                raise Errors.RepoError, 'Cannot find repomd.xml file for %s' % (self)
            else:
                result = local
        else:
            checkfunc = (self._checkRepoXML, (), {})
            try:
                result = self.get(relative=remote,
                                  local=local,
                                  copy_local=1,
                                  text=text,
                                  reget=None,
                                  checkfunc=checkfunc,
                                  cache=self.http_caching == 'all')

            except URLGrabError, e:
                raise Errors.RepoError, 'Error downloading file %s: %s' % (local, e)
            
            # if we have a 'fresh' repomd.xml then update the cookie
            self.setMetadataCookie()

        try:
            self.repoXML = repoMDObject.RepoMD(self.id, result)
        except mdErrors.RepoMDError, e:
            raise Errors.RepoError, 'Error importing repomd.xml from %s: %s' % (self, e)
    
    def _checkRepoXML(self, fo):
        if type(fo) is types.InstanceType:
            filepath = fo.filename
        else:
            filepath = fo
        
        try:
            foo = repoMDObject.RepoMD(self.id, filepath)
        except mdErrors.RepoMDError, e:
            raise URLGrabError(-1, 'Error importing repomd.xml for %s: %s' % (self, e))


    def __getProxyDict(self):
        self.doProxyDict()
        if self._proxy_dict:
            return self._proxy_dict
        return None

    # consistent access to how proxy information should look (and ensuring
    # that it's actually determined for the repo)
    proxy_dict = property(__getProxyDict)

    def _checkMD(self, fn, mdtype):
        """check the metadata type against its checksum"""
        
        csumDict = { 'primary' : self.repoXML.primaryChecksum,
                     'filelists' : self.repoXML.filelistsChecksum,
                     'other' : self.repoXML.otherChecksum,
                     'group' : self.repoXML.groupChecksum }
                     
        csumMethod = csumDict[mdtype]
        
        (r_ctype, r_csum) = csumMethod() # get the remote checksum
        
        if type(fn) == types.InstanceType: # this is an urlgrabber check
            file = fn.filename
        else:
            file = fn
            
        try:
            l_csum = self._checksum(r_ctype, file) # get the local checksum
        except Errors.RepoError, e:
            raise URLGrabError(-3, 'Error performing checksum')
            
        if l_csum == r_csum: 
            return 1
        else:
            raise URLGrabError(-1, 'Metadata file does not match checksum')
        

        
    def _retrieveMD(self, mdtype):
        """base function to retrieve metadata files from the remote url
           returns the path to the local metadata file of a 'mdtype'
           mdtype can be 'primary', 'filelists', 'other' or 'group'."""
        locDict = { 'primary' : self.repoXML.primaryLocation,
                    'filelists' : self.repoXML.filelistsLocation,
                    'other' : self.repoXML.otherLocation,
                    'group' : self.repoXML.groupLocation }
        
        locMethod = locDict[mdtype]
        
        (r_base, remote) = locMethod()
        fname = os.path.basename(remote)
        local = self.cachedir + '/' + fname

        if self.retrieved.has_key(mdtype):
            if self.retrieved[mdtype]: # got it, move along
                return local

        if self.cache == 1:
            if os.path.exists(local):
                try:
                    self._checkMD(local, mdtype)
                except URLGrabError, e:
                    raise Errors.RepoError, \
                        "Caching enabled and local cache: %s does not match checksum" % local
                else:
                    return local
                    
            else: # ain't there - raise
                raise Errors.RepoError, \
                    "Caching enabled but no local cache of %s from %s" % (local,
                           self)
                           
        if os.path.exists(local):
            try:
                self._checkMD(local, mdtype)
            except URLGrabError, e:
                pass
            else:
                self.retrieved[mdtype] = 1
                return local # it's the same return the local one

        try:
            checkfunc = (self._checkMD, (mdtype,), {})
            local = self.get(relative=remote, local=local, copy_local=1,
                             checkfunc=checkfunc, reget=None, 
                             cache=self.http_caching == 'all')
        except URLGrabError, e:
            raise Errors.RepoError, \
                "Could not retrieve %s matching remote checksum from %s" % (local, self)
        else:
            self.retrieved[mdtype] = 1
            return local

    
    def getPrimaryXML(self):
        """this gets you the path to the primary.xml file, retrieving it if we 
           need a new one"""

        return self._retrieveMD('primary')
        
    
    def getFileListsXML(self):
        """this gets you the path to the filelists.xml file, retrieving it if we 
           need a new one"""

        return self._retrieveMD('filelists')

    def getOtherXML(self):
        return self._retrieveMD('other')

    def getGroups(self):
        """gets groups and returns group file path for the repository, if there 
           is none it returns None"""
        try:
            file = self._retrieveMD('group')
        except URLGrabError:
            file = None
        
        return file
        
        

def getMirrorList(mirrorlist, pdict = None):
    """retrieve an up2date-style mirrorlist file from a url, 
       we also s/$ARCH/$BASEARCH/ and move along
       returns a list of the urls from that file"""
       
    returnlist = []
    if hasattr(urlgrabber.grabber, 'urlopen'):
        urlresolver = urlgrabber.grabber
    else: 
        urlresolver = urllib
    
    scheme = urlparse.urlparse(mirrorlist)[0]
    if scheme == '':
        url = 'file://' + mirrorlist
    else:
        url = mirrorlist

    try:
        fo = urlresolver.urlopen(url, proxies=pdict)
    except urlgrabber.grabber.URLGrabError, e:
        fo = None

    if fo is not None: 
        content = fo.readlines()
        for line in content:
            if re.match('^\s*\#.*', line) or re.match('^\s*$', line):
                continue
            mirror = re.sub('\n$', '', line) # no more trailing \n's
            (mirror, count) = re.subn('\$ARCH', '$BASEARCH', mirror)
            returnlist.append(mirror)
    
    return returnlist



--- NEW FILE sqlitecache.py ---
#!/usr/bin/python -tt

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 

# TODO
# - Add support for multiple checksums per rpm (not required)

import os
import sqlite
import time
import mdparser
from sqlitesack import encodefiletypelist,encodefilenamelist

# This version refers to the internal structure of the sqlite cache files
# increasing this number forces all caches of a lower version number
# to be re-generated
dbversion = '7'

class RepodataParserSqlite:
    def __init__(self, storedir, repoid, callback=None):
        self.storedir = storedir
        self.callback = callback
        self.repodata = {
            'metadata': {},
            'filelists': {},
            'otherdata': {}
        }
        self.repoid = repoid
        self.debug = 0

    def loadCache(self,filename):
        """Load cache from filename, check if it is valid and that dbversion 
        matches the required dbversion"""
        db = sqlite.connect(filename)
        cur = db.cursor()
        cur.execute("select * from db_info")
        info = cur.fetchone()
        # If info is not in there this is an incompelete cache file
        # (this could happen when the user hits ctrl-c or kills yum
        # when the cache is being generated or updated)
        if (not info):
            raise sqlite.DatabaseError, "Incomplete database cache file"

        # Now check the database version
        if (info['dbversion'] != dbversion):
            self.log(2, "Warning: cache file is version %s, we need %s, will regenerate" % (
                info['dbversion'], dbversion))
            raise sqlite.DatabaseError, "Older version of yum sqlite"

        # This appears to be a valid database, return checksum value and 
        # database object
        return (info['checksum'],db)
        
    def getFilename(self,location):
        return location + '.sqlite'
            
    def getDatabase(self, location, cachetype):
        filename = self.getFilename(location)
        dbchecksum = ''
        # First try to open an existing database
        try:
            f = open(filename)
            (dbchecksum,db) = self.loadCache(filename)
        except (IOError,sqlite.DatabaseError,KeyError):
            # If it doesn't exist, create it
            db = self.makeSqliteCacheFile(filename,cachetype)
        return (db,dbchecksum)

    def _getbase(self, location, checksum, metadatatype):
        (db, dbchecksum) = self.getDatabase(location, metadatatype)
        # db should now contain a valid database object, check if it is
        # up to date
        if (checksum != dbchecksum):
            self.log(3, "%s sqlite cache needs updating, reading in metadata" % (metadatatype))
            parser = mdparser.MDParser(location)
            self.updateSqliteCache(db, parser, checksum, metadatatype)
        db.commit()
        return db

    def getPrimary(self, location, checksum):
        """Load primary.xml.gz from an sqlite cache and update it 
           if required"""
        return self._getbase(location, checksum, 'primary')

    def getFilelists(self, location, checksum):
        """Load filelist.xml.gz from an sqlite cache and update it if 
           required"""
        return self._getbase(location, checksum, 'filelists')

    def getOtherdata(self, location, checksum):
        """Load other.xml.gz from an sqlite cache and update it if required"""
        return self._getbase(location, checksum, 'other')
         
    def createTablesFilelists(self,db):
        """Create the required tables for filelists metadata in the sqlite 
           database"""
        cur = db.cursor()
        self.createDbInfo(cur)
        # This table is needed to match pkgKeys to pkgIds
        cur.execute("""CREATE TABLE packages(
            pkgKey INTEGER PRIMARY KEY,
            pkgId TEXT)
        """)
        cur.execute("""CREATE TABLE filelist(
            pkgKey INTEGER,
            dirname TEXT,
            filenames TEXT,
            filetypes TEXT)
        """)
        cur.execute("CREATE INDEX keyfile ON filelist (pkgKey)")
        cur.execute("CREATE INDEX pkgId ON packages (pkgId)")
    
    def createTablesOther(self,db):
        """Create the required tables for other.xml.gz metadata in the sqlite 
           database"""
        cur = db.cursor()
        self.createDbInfo(cur)
        # This table is needed to match pkgKeys to pkgIds
        cur.execute("""CREATE TABLE packages(
            pkgKey INTEGER PRIMARY KEY,
            pkgId TEXT)
        """)
        cur.execute("""CREATE TABLE changelog(
            pkgKey INTEGER,
            author TEXT,
            date TEXT,
            changelog TEXT)
        """)
        cur.execute("CREATE INDEX keychange ON changelog (pkgKey)")
        cur.execute("CREATE INDEX pkgId ON packages (pkgId)")
        
    def createTablesPrimary(self,db):
        """Create the required tables for primary metadata in the sqlite 
           database"""

        cur = db.cursor()
        self.createDbInfo(cur)
        # The packages table contains most of the information in primary.xml.gz

        q = 'CREATE TABLE packages(\n' \
            'pkgKey INTEGER PRIMARY KEY,\n'

        cols = []
        for col in PackageToDBAdapter.COLUMNS:
            cols.append('%s TEXT' % col)
        q += ',\n'.join(cols) + ')'

        cur.execute(q)

        # Create requires, provides, conflicts and obsoletes tables
        # to store prco data
        for t in ('requires','provides','conflicts','obsoletes'):
            cur.execute("""CREATE TABLE %s (
              name TEXT,
              flags TEXT,
              epoch TEXT,
              version TEXT,
              release TEXT,
              pkgKey TEXT)
            """ % (t))
        # Create the files table to hold all the file information
        cur.execute("""CREATE TABLE files (
            name TEXT,
            type TEXT,
            pkgKey TEXT)
        """)
        # Create indexes for faster searching
        cur.execute("CREATE INDEX packagename ON packages (name)")
        cur.execute("CREATE INDEX providesname ON provides (name)")
        cur.execute("CREATE INDEX packageId ON packages (pkgId)")
        db.commit()
    
    def createDbInfo(self,cur):
        # Create the db_info table, this contains sqlite cache metadata
        cur.execute("""CREATE TABLE db_info (
            dbversion TEXT,
            checksum TEXT)
        """)

    def insertHash(self,table,hash,cursor):
        """Insert the key value pairs in hash into a database table"""

        keys = hash.keys()
        values = hash.values()
        query = "INSERT INTO %s (" % (table)
        query += ",".join(keys)
        query += ") VALUES ("
        # Quote all values by replacing None with NULL and ' by ''
        for x in values:
            if (x == None):
              query += "NULL,"
            else:
              try:
                query += "'%s'," % (x.replace("'","''"))
              except AttributeError:
                query += "'%s'," % x
        # Remove the last , from query
        query = query[:-1]
        # And replace it with )
        query += ")"
        cursor.execute(query.encode('utf8'))
        return cursor.lastrowid
             
    def makeSqliteCacheFile(self, filename, cachetype):
        """Create an initial database in the given filename"""

        # If it exists, remove it as we were asked to create a new one
        if (os.path.exists(filename)):
            self.log(3, "Warning: cache already exists, removing old version")
            try:
                os.unlink(filename)
            except OSError:
                pass

        # Try to create the databse in filename, or use in memory when
        # this fails
        try:
            f = open(filename,'w')
            db = sqlite.connect(filename) 
        except IOError:
            self.log(1, "Warning could not create sqlite cache file, using in memory cache instead")
            db = sqlite.connect(":memory:")

        # The file has been created, now create the tables and indexes
        if (cachetype == 'primary'):
            self.createTablesPrimary(db)
        elif (cachetype == 'filelists'):
            self.createTablesFilelists(db)
        elif (cachetype == 'other'):
            self.createTablesOther(db)
        else:
            raise sqlite.DatabaseError, "Sorry don't know how to store %s" % (cachetype)
        return db

    def addPrimary(self, pkgId, package, cur):
        """Add a package to the primary cache"""
        # Store the package info into the packages table
        pkgKey = self.insertHash('packages', PackageToDBAdapter(package), cur)

        # Now store all prco data
        for ptype in package.prco:
            for entry in package.prco[ptype]:
                data = {
                    'pkgKey': pkgKey,
                    'name': entry.get('name'),
                    'flags': entry.get('flags'),
                    'epoch': entry.get('epoch'),
                    'version': entry.get('ver'),
                    'release': entry.get('rel'),
                }
                self.insertHash(ptype,data,cur)
        
        # Now store all file information
        for f in package.files:
            data = {
                'name': f,
                'type': package.files[f],
                'pkgKey': pkgKey,
            }
            self.insertHash('files',data,cur)

    def addFilelists(self, pkgId, package,cur):
        """Add a package to the filelists cache"""
        pkginfo = {'pkgId': pkgId}
        pkgKey = self.insertHash('packages',pkginfo, cur)
        dirs = {}
        for (filename,filetype) in package.files.iteritems():
            (dirname,filename) = (os.path.split(filename))
            if (dirs.has_key(dirname)):
                dirs[dirname]['files'].append(filename)
                dirs[dirname]['types'].append(filetype)
            else:
                dirs[dirname] = {}
                dirs[dirname]['files'] = [filename]
                dirs[dirname]['types'] = [filetype]

        for (dirname,dir) in dirs.items():
            data = {
                'pkgKey': pkgKey,
                'dirname': dirname,
                'filenames': encodefilenamelist(dir['files']),
                'filetypes': encodefiletypelist(dir['types'])
            }
            self.insertHash('filelist',data,cur)

    def addOther(self, pkgId, package,cur):
        pkginfo = {'pkgId': pkgId}
        pkgKey = self.insertHash('packages', pkginfo, cur)
        for entry in package['changelog']:
            data = {
                'pkgKey': pkgKey,
                'author': entry.get('author'),
                'date': entry.get('date'),
                'changelog': entry.get('value'),
            }
            self.insertHash('changelog', data, cur)

    def updateSqliteCache(self, db, parser, checksum, cachetype):
        """Update the sqlite cache by making it fit the packages described
        in dobj (info that has been read from primary.xml metadata) afterwards
        update the checksum of the database to checksum"""
       
        t = time.time()
        delcount = 0
        newcount = 0

        # We start be removing the old db_info, as it is no longer valid
        cur = db.cursor()
        cur.execute("DELETE FROM db_info") 

        # First create a list of all pkgIds that are in the database now
        cur.execute("SELECT pkgId, pkgKey from packages")
        currentpkgs = {}
        for pkg in cur.fetchall():
            currentpkgs[pkg['pkgId']] = pkg['pkgKey']

        if (cachetype == 'primary'):
            deltables = ("packages","files","provides","requires", 
                        "conflicts","obsoletes")
        elif (cachetype == 'filelists'):
            deltables = ("packages","filelist")
        elif (cachetype == 'other'):
            deltables = ("packages","changelog")
        else:
            raise sqlite.DatabaseError,"Unknown type %s" % (cachetype)
        
        # Add packages that are not in the database yet and build up a list of
        # all pkgids in the current metadata

        all_pkgIds = {}
        for package in parser:

            if self.callback is not None:
                self.callback.progressbar(parser.count, parser.total, self.repoid)

            pkgId = package['pkgId']
            all_pkgIds[pkgId] = 1

            # This package is already in the database, skip it now
            if (currentpkgs.has_key(pkgId)):
                continue

            # This is a new package, lets insert it
            newcount += 1
            if cachetype == 'primary':
                self.addPrimary(pkgId, package, cur)
            elif cachetype == 'filelists':
                self.addFilelists(pkgId, package, cur)
            elif cachetype == 'other':
                self.addOther(pkgId, package, cur)

        # Remove those which are not in dobj
        delpkgs = []
        for (pkgId, pkgKey) in currentpkgs.items():
            if not all_pkgIds.has_key(pkgId):
                delcount += 1
                delpkgs.append(str(pkgKey))
        delpkgs = "("+",".join(delpkgs)+")"
        for table in deltables:
            cur.execute("DELETE FROM "+table+ " where pkgKey in %s" % delpkgs)

        cur.execute("INSERT into db_info (dbversion,checksum) VALUES (%s,%s)",
                (dbversion,checksum))
        db.commit()
        self.log(2, "Added %s new packages, deleted %s old in %.2f seconds" % (
                newcount, delcount, time.time()-t))
        return db

    def log(self, level, msg):
        '''Log to callback (if set)
        '''
        if self.callback:
            self.callback.log(level, msg)

class PackageToDBAdapter:

    '''
    Adapt a PrimaryEntry instance to suit the sqlite database. 

    This hides certain attributes and converts some column names in order to
    decouple the parser implementation from the sqlite database schema.
    '''

    NAME_MAPS = {
        'rpm_package': 'package',
        'version': 'ver',
        'release': 'rel',
        'rpm_license': 'license',
        'rpm_vendor': 'vendor',
        'rpm_group': 'group',
        'rpm_buildhost': 'buildhost',
        'rpm_sourcerpm': 'sourcerpm',
        'rpm_packager': 'packager',
        }
    
    COLUMNS = (
            'pkgId',
            'name',
            'arch',
            'version',
            'epoch',
            'release',
            'summary',
            'description',
            'url',
            'time_file',
            'time_build',
            'rpm_license',
            'rpm_vendor',
            'rpm_group',
            'rpm_buildhost',
            'rpm_sourcerpm',
            'rpm_header_start',
            'rpm_header_end',
            'rpm_packager',
            'size_package',
            'size_installed',
            'size_archive',
            'location_href',
            'location_base',
            'checksum_type',
            'checksum_value',
            )

    def __init__(self, package):
        self._pkg = package

    def __getitem__(self, k):
        return self._pkg[self.NAME_MAPS.get(k, k)]

    def keys(self):
        return self.COLUMNS

    def values(self):
        out = []
        for k in self.keys():
            out.append(self[k])
        return out



--- NEW FILE sqlitesack.py ---
#!/usr/bin/python -tt

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 

#
# Implementation of the YumPackageSack class that uses an sqlite backend
#

import os
import os.path
import types
import repos
from packages import YumAvailablePackage
from repomd import mdUtils, mdErrors

# Simple subclass of YumAvailablePackage that can load 'simple headers' from
# the database when they are requested
class YumAvailablePackageSqlite(YumAvailablePackage):
    def __init__(self, pkgdict, repoid):
        YumAvailablePackage.__init__(self,pkgdict,repoid)
        self.sack = pkgdict.sack
        self.pkgId = pkgdict.pkgId
        self.simple['id'] = self.pkgId
        self.changelog = None
    
    def loadChangelog(self):
        if hasattr(self, 'dbusedother'):
            return
        self.dbusedother = 1
        self.changelog = self.sack.getChangelog(self.pkgId)

    def returnSimple(self, varname):
        if (not self.simple.has_key(varname) and not hasattr(self,'dbusedsimple')):
            # Make sure we only try once to get the stuff from the database
            self.dbusedsimple = 1
            details = self.sack.getPackageDetails(self.pkgId)
            self.importFromDict(details,self.simple['repoid'])

        return YumAvailablePackage.returnSimple(self,varname)

    def loadFiles(self):
        if (hasattr(self,'dbusedfiles')):
            return
        self.dbusedfiles = 1
        self.files = self.sack.getFiles(self.pkgId)

    def returnChangelog(self):
        self.loadChangelog()
        return YumAvailablePackage.returnChangelog(self)
            
    def returnFileEntries(self, ftype='file'):
        self.loadFiles()
        return YumAvailablePackage.returnFileEntries(self,ftype)
    
    def returnFileTypes(self):
        self.loadFiles()
        return YumAvailablePackage.returnFileTypes(self)

    def returnPrco(self, prcotype):
        if not self.prco[prcotype]:
           self.prco = self.sack.getPrco(self.pkgId, prcotype)
        return self.prco[prcotype]

class YumSqlitePackageSack(repos.YumPackageSack):
    """ Implementation of a PackageSack that uses sqlite cache instead of fully
    expanded metadata objects to provide information """

    def __init__(self, packageClass):
        # Just init as usual and create a dict to hold the databases
        repos.YumPackageSack.__init__(self,packageClass)
        self.primarydb = {}
        self.filelistsdb = {}
        self.otherdb = {}
        self.excludes = {}
        
    def buildIndexes(self):
        # We don't need these
        return

    def _checkIndexes(self, failure='error'):
        return

    # Remove a package
    # Because we don't want to remove a package from the database we just
    # add it to the exclude list
    def delPackage(self, obj):
        repoid = obj.repoid
        self.excludes[repoid][obj.pkgId] = 1

    def addDict(self, repoid, datatype, dataobj, callback=None):
        if (not self.excludes.has_key(repoid)): 
            self.excludes[repoid] = {}
        if datatype == 'metadata':
            if (self.primarydb.has_key(repoid)):
              return
            self.added[repoid] = ['primary']
            self.primarydb[repoid] = dataobj
        elif datatype == 'filelists':
            if (self.filelistsdb.has_key(repoid)):
              return
            self.added[repoid] = ['filelists']
            self.filelistsdb[repoid] = dataobj
        elif datatype == 'otherdata':
            if (self.otherdb.has_key(repoid)):
              return
            self.added[repoid] = ['otherdata']
            self.otherdb[repoid] = dataobj
        else:
            # We can not handle this yet...
            raise "Sorry sqlite does not support %s" % (datatype)
    
    def getChangelog(self,pkgId):
        result = []
        for (rep,cache) in self.otherdb.items():
            cur = cache.cursor()
            cur.execute("select changelog.date as date,\
                changelog.author as author,\
                changelog.changelog as changelog from packages,changelog where packages.pkgId = %s and packages.pkgKey = changelog.pkgKey",pkgId)
            for ob in cur.fetchall():
                result.append(( ob['date'],
                                ob['author'],
                                ob['changelog']
                              ))
        return result

    def getPrco(self,pkgId, prcotype=None):
        if prcotype is not None:
            result = {'requires': [], 'provides': [], 'obsoletes': [], 'conflicts': []}
        else:
            result = { prcotype: [] }
        for (rep, cache) in self.primarydb.items():
            cur = cache.cursor()
            for prco in result.keys():
                cur.execute("select %s.name as name, %s.version as version,\
                    %s.release as release, %s.epoch as epoch, %s.flags as flags\
                    from packages,%s\
                    where packages.pkgId = %s and packages.pkgKey = %s.pkgKey", prco, prco, prco, prco, prco, prco, pkgId, prco)
                for ob in cur.fetchall():
                    name = ob['name']
                    version = ob['version']
                    release = ob['release']
                    epoch = ob['epoch']
                    flags = ob['flags']
                    result[prco].append((name, flags, (epoch, version, release)))
        return result

    # Get all files for a certain pkgId from the filelists.xml metadata
    def getFiles(self,pkgId):
        for (rep,cache) in self.filelistsdb.items():
            found = False
            result = {}
            cur = cache.cursor()
            cur.execute("select filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames from packages,filelist\
                where packages.pkgId = %s and packages.pkgKey = filelist.pkgKey", pkgId)
            for ob in cur.fetchall():
                found = True
                dirname = ob['dirname']
                filetypes = decodefiletypelist(ob['filetypes'])
                filenames = decodefilenamelist(ob['filenames'])
                while(filenames):
                    if dirname:
                        filename = dirname+'/'+filenames.pop()
                    else:
                        filename = filenames.pop()
                    filetype = filetypes.pop()
                    result.setdefault(filetype,[]).append(filename)
            if (found):
                return result    
        return {}
            
    # Search packages that either provide something containing name
    # or provide a file containing name 
    def searchAll(self, name, query_type='like'):
        
        # This should never be called with a name containing a %
        assert(name.find('%') == -1)
        result = {}
        quotename = name.replace("'","''")
        (dirname,filename) = os.path.split(name)
        
        # check provides
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select DISTINCT packages.pkgId as pkgId from provides,packages where provides.name LIKE '%%%s%%' AND provides.pkgKey = packages.pkgKey" % quotename)
            for ob in cur.fetchall():
                if (self.excludes[rep].has_key(ob['pkgId'])):
                    continue

                pkgid = ob['pkgId']
                if not result.has_key(pkgid):
                    pkg = self.getPackageDetails(ob['pkgId'])
                    result[pkgid] = (self.pc(pkg,rep))
        
        # check filelists/dirlists
        for (rep,cache) in self.filelistsdb.items():
            querystrings = []
            # dirnames
            # just the dirname
            if dirname != '':
                tmp = "select packages.pkgId as pkgId,\
                filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames \
                from packages,filelist where \
                filelist.dirname LIKE '%%%s%%' \
                AND (filelist.pkgKey = packages.pkgKey)" % (dirname)
                querystrings.append(tmp)
                
            # look at full quotename
            tmp = "select packages.pkgId as pkgId,\
                filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames \
                from packages,filelist where \
                filelist.dirname LIKE '%%%s%%' \
                AND (filelist.pkgKey = packages.pkgKey)" % (quotename)
            querystrings.append(tmp)

            # filenames
            tmp = "select packages.pkgId as pkgId,\
                filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames \
                from packages,filelist where \
                filelist.filenames LIKE '%%%s%%'\
                AND (filelist.pkgKey = packages.pkgKey)" % (filename)
            
            querystrings.append(tmp)
        
            for querystring in querystrings:
                cur = cache.cursor()
                cur.execute("%s" % querystring)

                # cull the results for false positives
                for ob in cur.fetchall():
                    # Check if it is an actual match
                    # The query above can give false positives, when
                    # a package provides /foo/aaabar it will also match /foo/bar
                    if (self.excludes[rep].has_key(ob['pkgId'])):
                        continue
                    real = False
        
                    for filename in decodefilenamelist(ob['filenames']):
                        if (ob['dirname'] + '/' + filename).find(name) != -1:
                            real = True
                    if (not real):
                        continue

                    pkgid = ob['pkgId']
                    if not result.has_key(pkgid):
                        pkg = self.getPackageDetails(ob['pkgId'])
                        result[pkgid] = (self.pc(pkg,rep))

        return result.values()
    
    def returnObsoletes(self):
        obsoletes = {}
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select packages.name as name,\
                packages.pkgId as pkgId,\
                packages.arch as arch, packages.epoch as epoch,\
                packages.release as release, packages.version as version,\
                obsoletes.name as oname, obsoletes.epoch as oepoch,\
                obsoletes.release as orelease, obsoletes.version as oversion,\
                obsoletes.flags as oflags\
                from obsoletes,packages where obsoletes.pkgKey = packages.pkgKey")
            for ob in cur.fetchall():
                # If the package that is causing the obsoletes is excluded
                # continue without processing the obsoletes
                if (self.excludes[rep].has_key(ob['pkgId'])):
                    continue
                key = ( ob['name'],ob['arch'],
                        ob['epoch'],ob['version'],
                        ob['release'])
                (n,f,e,v,r) = ( ob['oname'],ob['oflags'],
                                ob['oepoch'],ob['oversion'],
                                ob['orelease'])

                obsoletes.setdefault(key,[]).append((n,f,(e,v,r)))

        return obsoletes

    def getPackageDetails(self,pkgId):
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select * from packages where pkgId = %s",pkgId)
            for ob in cur.fetchall():
                pkg = self.db2class(ob)
                return pkg

    def searchPrco(self, name, prcotype):
        """return list of packages having prcotype name (any evr and flag)"""
        results = []
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select * from %s where name = %s" , (prcotype, name))
            prcos = cur.fetchall()
            for res in prcos:
                cur.execute("select * from packages where pkgKey = %s" , (res['pkgKey']))
                for x in cur.fetchall():
                    pkg = self.db2class(x)
                    if (self.excludes[rep].has_key(pkg.pkgId)):
                        continue
                                            
                    # Add this provides to prco otherwise yum doesn't understand
                    # that it matches
                    pkg.prco = {prcotype: 
                      [
                      { 'name': res.name,
                        'flags': res.flags,
                        'rel': res.release,
                        'ver': res.version,
                        'epoch': res.epoch
                      }
                      ]
                    }
                    results.append(self.pc(pkg,rep))


        # If it's not a provides or a filename, we are done
        if (prcotype != "provides" or name.find('/') != 0):
            return results

        # If it is a filename, search the primary.xml file info
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select * from files where name = %s" , (name))
            files = cur.fetchall()
            for res in files:
                cur.execute("select * from packages where pkgKey = %s" , (res['pkgKey']))
                for x in cur.fetchall():
                    pkg = self.db2class(x)
                    if (self.excludes[rep].has_key(pkg.pkgId)):
                        continue
                                            
                    pkg.files = {name: res['type']}
                    results.append(self.pc(pkg,rep))

        # If it is a filename, search the files.xml file info
        for (rep,cache) in self.filelistsdb.items():
            cur = cache.cursor()
            (dirname,filename) = os.path.split(name)
            cur.execute("select packages.pkgId as pkgId,\
                filelist.dirname as dirname,\
                filelist.filetypes as filetypes,\
                filelist.filenames as filenames \
                from filelist,packages where dirname = %s AND filelist.pkgKey = packages.pkgKey" , (dirname))
            files = cur.fetchall()
            for res in files:
                if (self.excludes[rep].has_key(res['pkgId'])):
                    continue
                                        
                # If it matches the dirname, that doesnt mean it matches
                # the filename, check if it does
                if filename and \
                  not filename in res['filenames'].split('/'):
                    continue
                # If it matches we only know the packageId
                pkg = self.getPackageDetails(res['pkgId'])
                results.append(self.pc(pkg,rep))
        return results

    def searchProvides(self, name):
        """return list of packages providing name (any evr and flag)"""
        return self.searchPrco(name, "provides")
                
    def searchRequires(self, name):
        """return list of packages requiring name (any evr and flag)"""
        return self.searchPrco(name, "requires")

    def searchObsoletes(self, name):
        """return list of packages obsoleting name (any evr and flag)"""
        return self.searchPrco(name, "obsoletes")

    def searchConflicts(self, name):
        """return list of packages conflicting with name (any evr and flag)"""
        return self.searchPrco(name, "conflicts")

    # TODO this seems a bit ugly and hackish
    def db2class(self,db,nevra_only=False):
      class tmpObject:
        pass
      y = tmpObject()
      y.nevra = (db.name,db.epoch,db.version,db.release,db.arch)
      y.sack = self
      y.pkgId = db.pkgId
      if (nevra_only):
        return y
      y.hdrange = {'start': db.rpm_header_start,'end': db.rpm_header_end}
      y.location = {'href': db.location_href,'value': '', 'base': db.location_base}
      y.checksum = {'pkgid': 'YES','type': db.checksum_type, 
                    'value': db.checksum_value }
      y.time = {'build': db.time_build, 'file': db.time_file }
      y.size = {'package': db.size_package, 'archive': db.size_archive, 'installed': db.size_installed }
      y.info = {'summary': db.summary, 'description': db['description'],
                'packager': db.rpm_packager, 'group': db.rpm_group,
                'buildhost': db.rpm_buildhost, 'sourcerpm': db.rpm_sourcerpm,
                'url': db.url, 'vendor': db.rpm_vendor, 'license': db.rpm_license }
      return y

    def simplePkgList(self, repoid=None):
        """returns a list of pkg tuples (n, a, e, v, r) optionally from a single repoid"""
        simplelist = []
        for (rep,cache) in self.primarydb.items():
            if (repoid == None or repoid == rep):
                cur = cache.cursor()
                cur.execute("select pkgId,name,epoch,version,release,arch from packages")
                for pkg in cur.fetchall():
                    if (self.excludes[rep].has_key(pkg.pkgId)):
                        continue                        
                    simplelist.append((pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)) 
                    
        return simplelist

    def returnNewestByNameArch(self, naTup=None):
        # If naTup is set do it from the database otherwise use our parent's
        # returnNewestByNameArch
        if (not naTup):
            # TODO process excludes here
            return repos.YumPackageSack.returnNewestByNameArch(self, naTup)

        # First find all packages that fulfill naTup
        allpkg = []
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select pkgId,name,epoch,version,release,arch from packages where name=%s and arch=%s",naTup)
            for x in cur.fetchall():
                if (self.excludes[rep].has_key(x.pkgId)):
                    continue                    
                allpkg.append(self.pc(self.db2class(x,True),rep))
        
        # if we've got zilch then raise
        if not allpkg:
            raise mdErrors.PackageSackError, 'No Package Matching %s.%s' % naTup
        return mdUtils.newestInList(allpkg)

    def returnNewestByName(self, name=None):
        # If name is set do it from the database otherwise use our parent's
        # returnNewestByName
        if (not name):
            return repos.YumPackageSack.returnNewestByName(self, name)

        # First find all packages that fulfill name
        allpkg = []
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute("select pkgId,name,epoch,version,release,arch from packages where name=%s", name)
            for x in cur.fetchall():
                if (self.excludes[rep].has_key(x.pkgId)):
                    continue                    
                allpkg.append(self.pc(self.db2class(x,True),rep))
        
        # if we've got zilch then raise
        if not allpkg:
            raise mdErrors.PackageSackError, 'No Package Matching %s' % name
        return mdUtils.newestInList(allpkg)

    def returnPackages(self, repoid=None):
        """Returns a list of packages, only containing nevra information """
        returnList = []
        for (rep,cache) in self.primarydb.items():
            if (repoid == None or repoid == rep):
                cur = cache.cursor()
                cur.execute("select pkgId,name,epoch,version,release,arch from packages")
                for x in cur.fetchall():
                    if (self.excludes[rep].has_key(x.pkgId)):
                        continue                    
                    returnList.append(self.pc(self.db2class(x,True),rep))
        return returnList

    def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):        
        """return list of pkgobjects matching the nevra requested"""
        returnList = []
        
        # make sure some dumbass didn't pass us NOTHING to search on
        empty = True
        for arg in (name, epoch, ver, rel, arch):
            if arg:
                empty = False
        if empty:
            return returnList
        
        # make up our execute string
        q = "select * from packages WHERE"
        for (col, var) in [('name', name), ('epoch', epoch), ('version', ver),
                           ('arch', arch), ('release', rel)]:
            if var:
                if q[-5:] != 'WHERE':
                    q = q + ' AND %s = "%s"' % (col, var)
                else:
                    q = q + ' %s = "%s"' % (col, var)
            
        # Search all repositories            
        for (rep,cache) in self.primarydb.items():
            cur = cache.cursor()
            #cur.execute("select * from packages WHERE name = %s AND epoch = %s AND version = %s AND release = %s AND arch = %s" , (name,epoch,ver,rel,arch))
            cur.execute(q)
            for x in cur.fetchall():
                if (self.excludes[rep].has_key(x.pkgId)):
                    continue
                returnList.append(self.pc(self.db2class(x),rep))
        return returnList
    
    def excludeArchs(self, archlist):
        """excludes incompatible arches - archlist is a list of compat arches"""
        tmpstring = "select * from packages WHERE "
        for arch in archlist:
            tmpstring = tmpstring + 'arch != "%s" AND ' % arch
        
        last = tmpstring.rfind('AND') # clip that last AND
        querystring = tmpstring[:last]
        for (rep, cache) in self.primarydb.items():
            cur = cache.cursor()
            cur.execute(querystring)
            for x in cur.fetchall():
                obj = self.pc(self.db2class(x), rep)
                self.delPackage(obj)

# Simple helper functions

# Return a string representing filenamelist (filenames can not contain /)
def encodefilenamelist(filenamelist):
    return '/'.join(filenamelist)

# Return a list representing filestring (filenames can not contain /)
def decodefilenamelist(filenamestring):
    return filenamestring.split('/')

# Return a string representing filetypeslist
# filetypes should be file, dir or ghost
def encodefiletypelist(filetypelist):
    result = ''
    ft2string = {'file': 'f','dir': 'd','ghost': 'g'}
    for x in filetypelist:
        result += ft2string[x]
    return result

# Return a list representing filetypestring
# filetypes should be file, dir or ghost
def decodefiletypelist(filetypestring):
    string2ft = {'f':'file','d': 'dir','g': 'ghost'}
    return [string2ft[x] for x in filetypestring]



--- NEW FILE transactioninfo.py ---
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University
# Written by Seth Vidal

# TODOS: make all the package relationships deal with package objects
# search by package object for TransactionData, etc.
# provide a real TransactionData.remove(txmbr) method, It should 
# remove the given txmbr and iterate to remove all those in depedent relationships
# with the given txmbr. 

from constants import *

class TransactionData:
    """Data Structure designed to hold information on a yum Transaction Set"""
    def __init__(self):
        self.flags = []
        self.vsflags = []
        self.probFilterFlags = []
        self.root = '/'
        self.pkgdict = {} # key = pkgtup, val = list of TransactionMember obj
        self.debug = 0
        self.changed = False

    def __len__(self):
        return len(self.pkgdict.values())
        
    def __iter__(self):
        if hasattr(self.getMembers(), '__iter__'):
            return self.getMembers().__iter__()
        else:
            return iter(self.getMembers())

    def debugprint(self, msg):
        if self.debug:
            print msg


    def getMembers(self, pkgtup=None):
        """takes an optional package tuple and returns all transaction members 
           matching, no pkgtup means it returns all transaction members"""
        
        if pkgtup is None:
            returnlist = []
            for key in self.pkgdict.keys():
                returnlist.extend(self.pkgdict[key])
                
            return returnlist

        if self.pkgdict.has_key(pkgtup):
            return self.pkgdict[pkgtup]
        else:
            return []
            
    def getMode(self, name=None, arch=None, epoch=None, ver=None, rel=None):
        """returns the mode of the first match from the transaction set, 
           otherwise, returns None"""

        txmbrs = self.matchNaevr(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel)
        if len(txmbrs):
            return txmbrs[0].ts_state
        else:
            return None

    
    def matchNaevr(self, name=None, arch=None, epoch=None, ver=None, rel=None):
        """returns the list of packages matching the args above"""
        completelist = self.pkgdict.keys()
        removedict = {}
        returnlist = []
        returnmembers = []
        
        for pkgtup in completelist:
            (n, a, e, v, r) = pkgtup
            if name is not None:
                if name != n:
                    removedict[pkgtup] = 1
                    continue
            if arch is not None:
                if arch != a:
                    removedict[pkgtup] = 1
                    continue
            if epoch is not None:
                if epoch != e:
                    removedict[pkgtup] = 1
                    continue
            if ver is not None:
                if ver != v:
                    removedict[pkgtup] = 1
                    continue
            if rel is not None:
                if rel != r:
                    removedict[pkgtup] = 1
                    continue
        
        for pkgtup in completelist:
            if not removedict.has_key(pkgtup):
                returnlist.append(pkgtup)
        
        for matched in returnlist:
            returnmembers.extend(self.pkgdict[matched])

        return returnmembers

    def add(self, txmember):
        """add a package to the transaction"""
        
        if not self.pkgdict.has_key(txmember.pkgtup):
            self.pkgdict[txmember.pkgtup] = []
        else:
            self.debugprint("Package: %s.%s - %s:%s-%s already in ts" % txmember.pkgtup)
            for member in self.pkgdict[txmember.pkgtup]:
                if member.ts_state == txmember.ts_state:
                    self.debugprint("Package in same mode, skipping.")
                    return
        self.pkgdict[txmember.pkgtup].append(txmember)
        self.changed = True

    def remove(self, pkgtup):
        """remove a package from the transaction"""
        if not self.pkgdict.has_key(pkgtup):
            self.debugprint("Package: %s not in ts" %(pkgtup,))
            return
        for txmbr in self.pkgdict[pkgtup]:
            txmbr.po.state = None
        
        del self.pkgdict[pkgtup]
        self.changed = True        
    
    def exists(self, pkgtup):
        """tells if the pkg is in the class"""
        if self.pkgdict.has_key(pkgtup):
            if len(self.pkgdict[pkgtup]) != 0:
                return 1
        
        return 0

    def isObsoleted(self, pkgtup):
        """true if the pkgtup is marked to be obsoleted"""
        if self.exists(pkgtup):
            for txmbr in self.getMembers(pkgtup=pkgtup):
                if txmbr.output_state == TS_OBSOLETED:
                    return True
        
        return False
                
    def makelists(self):
        """returns lists of transaction Member objects based on mode:
           updated, installed, erased, obsoleted, depupdated, depinstalled
           deperased"""
           
        self.instgroups = []
        self.removedgroups = []
        self.removed = []
        self.installed = []
        self.updated = []
        self.obsoleted = []
        self.depremoved = []
        self.depinstalled = []
        self.depupdated = []
        
        for txmbr in self.getMembers():
            if txmbr.output_state == TS_UPDATE:
                if txmbr.isDep:
                    self.depupdated.append(txmbr)
                else:
                    self.updated.append(txmbr)
                    
            elif txmbr.output_state == TS_INSTALL or txmbr.output_state == TS_TRUEINSTALL:
                if txmbr.groups:
                    for g in txmbr.groups:
                        if g not in self.instgroups:
                            self.instgroups.append(g)
                if txmbr.isDep:
                    self.depinstalled.append(txmbr)
                else:
                    self.installed.append(txmbr)
            
            elif txmbr.output_state == TS_ERASE:
                for g in txmbr.groups:
                    if g not in self.instgroups:
                        self.removedgroups.append(g)
                if txmbr.isDep:
                    self.depremoved.append(txmbr)
                else:
                    self.removed.append(txmbr)
                    
            elif txmbr.output_state == TS_OBSOLETED:
                self.obsoleted.append(txmbr)
                
            elif txmbr.output_state == TS_OBSOLETING:
                self.installed.append(txmbr)
                
            else:
                pass
    
            self.updated.sort()
            self.installed.sort()
            self.removed.sort()
            self.obsoleted.sort()
            self.depupdated.sort()
            self.depinstalled.sort()
            self.depremoved.sort()
            self.instgroups.sort()
            self.removedgroups.sort()

    
    def addInstall(self, po):
        """adds a package as an install but in mode 'u' to the ts
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_AVAILABLE
        txmbr.output_state = TS_INSTALL
        txmbr.po.state = TS_INSTALL        
        txmbr.ts_state = 'u'
        txmbr.reason = 'user'
        self.add(txmbr)
        return txmbr

    def addTrueInstall(self, po):
        """adds a package as an install
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_AVAILABLE
        txmbr.output_state = TS_TRUEINSTALL
        txmbr.po.state = TS_INSTALL        
        txmbr.ts_state = 'i'
        txmbr.reason = 'user'
        self.add(txmbr)
        return txmbr
    

    def addErase(self, po):
        """adds a package as an erasure
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_INSTALL
        txmbr.output_state = TS_ERASE
        txmbr.po.state = TS_INSTALL
        txmbr.ts_state = 'e'
        self.add(txmbr)
        return txmbr

    def addUpdate(self, po, oldpo=None):
        """adds a package as an update
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_AVAILABLE
        txmbr.output_state = TS_UPDATE
        txmbr.po.state = TS_UPDATE        
        txmbr.ts_state = 'u'
        if oldpo:
            txmbr.relatedto.append((oldpo.pkgtup, 'updates'))
            txmbr.updates.append(oldpo)
        self.add(txmbr)
        return txmbr

    def addObsoleting(self, po, oldpo):
        """adds a package as an obsolete over another pkg
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_AVAILABLE
        txmbr.output_state = TS_OBSOLETING
        txmbr.po.state = TS_OBSOLETING
        txmbr.ts_state = 'u'
        txmbr.relatedto.append((oldpo, 'obsoletes'))
        txmbr.obsoletes.append(oldpo)
        self.add(txmbr)
        return txmbr

    def addObsoleted(self, po, obsoleting_po):
        """adds a package as being obsoleted by another pkg
           takes a packages object and returns a TransactionMember Object"""
    
        txmbr = TransactionMember(po)
        txmbr.current_state = TS_INSTALL
        txmbr.output_state =  TS_OBSOLETED
        txmbr.po.state = TS_OBSOLETED
        txmbr.ts_state = None
        txmbr.relatedto.append((obsoleting_po, 'obsoletedby'))
        txmbr.obsoleted_by.append(obsoleting_po)
        self.add(txmbr)
        return txmbr

class ConditionalTransactionData(TransactionData):
    """A transaction data implementing conditional package addition"""
    def __init__(self):
        # Key: package name to trigger condition
        # Value: list of package objects to add
        self.conditionals = {}
        TransactionData.__init__(self)

    def add(self, txmember):
        TransactionData.add(self, txmember)
        if self.conditionals.has_key(txmember.name):
            for po in self.conditionals[txmember.name]:
                condtxmbr = self.addInstall(po)
                condtxmbr.setAsDep(po=txmember.po)

class SortableTransactionData(ConditionalTransactionData):
    """A transaction data implementing topological sort on it's members"""
    def __init__(self):
        # Cache of sort
        self._sorted = []
        # Current dependency path
        self.path = []
        # List of loops
        self.loops = []
        ConditionalTransactionData.__init__(self)

    def _visit(self, txmbr):
        self.path.append(txmbr.name)
        txmbr.sortColour = TX_GREY
        for po in txmbr.depends_on:
            vertex = self.getMembers(pkgtup=po.pkgtup)[0]
            if vertex.sortColour == TX_GREY:
                self._doLoop(vertex.name)
            if vertex.sortColour == TX_WHITE:
                self._visit(vertex)
        txmbr.sortColour = TX_BLACK
        self._sorted.insert(0, txmbr.pkgtup)

    def _doLoop(self, name):
        self.path.append(name)
        loop = self.path[self.path.index(self.path[-1]):]
        if len(loop) > 2:
            self.loops.append(loop)

    def add(self, txmember):
        txmember.sortColour = TX_WHITE
        ConditionalTransactionData.add(self, txmember)
        self._sorted = []

    def remove(self, pkgtup):
        ConditionalTransactionData.remove(self, pkgtup)
        self._sorted = []

    def sort(self):
        if self._sorted:
            return self._sorted
        self._sorted = []
        # loop over all members
        for txmbr in self.getMembers():
            if txmbr.sortColour == TX_WHITE:
                self.path = [ ]
                self._visit(txmbr)
        self._sorted.reverse()
        return self._sorted

class TransactionMember:
    """Class to describe a Transaction Member (a pkg to be installed/
       updated/erased)."""
    
    def __init__(self, po):
        # holders for data
        self.po = po # package object
        self.current_state = None # where the package currently is (repo, installed)
        self.ts_state = None # what state to put it into in the transaction set
        self.output_state = None # what state to list if printing it
        self.isDep = 0
        self.reason = 'user' # reason for it to be in the transaction set
        self.process = None # 
        self.relatedto = [] # ([relatedpkgtup, relationship)]
        self.depends_on = []
        self.obsoletes = []
        self.obsoleted_by = []
        self.updates = []
        self.updated_by = []
        self.groups = [] # groups it's in
        self._poattr = ['pkgtup', 'repoid', 'name', 'arch', 'epoch', 'version',
                        'release']

        for attr in self._poattr:
            val = getattr(self.po, attr)
            setattr(self, attr, val)

    def setAsDep(self, po=None):
        """sets the transaction member as a dependency and maps the dep into the
           relationship list attribute"""
        
        self.isDep = 1
        if po:
            self.relatedto.append((po.pkgtup, 'dependson'))
            self.depends_on.append(po)

    def __cmp__(self, other):
        if self.name > other.name:
            return 1
        if self.name < other.name:
            return -1
        if self.name == other.name:
            return 0

    def __hash__(self):
        return hash(self.po.pkgtup)
            
    def __str__(self):
        return "%s.%s %s-%s-%s - %s" % (self.name, self.arch, self.epoch,
                                        self.version, self.release, self.ts_state)
        
    # This is the tricky part - how do we nicely setup all this data w/o going insane
    # we could make the txmember object be created from a YumPackage base object
    # we still may need to pass in 'groups', 'ts_state', 'output_state', 'reason', 'current_state'
    # and any related packages. A world of fun that will be, you betcha
    
    
    # definitions
    # current and output states are defined in constants
    # relationships are defined in constants
    # ts states are: u, i, e
    


--- NEW FILE update_md.py ---
#!/usr/bin/python -t

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2005 Duke University 


import sys
from cElementTree import iterparse
import exceptions



class UpdateNoticeException(exceptions.Exception):
    pass
    
    
class UpdateNotice(object):
    def __init__(self, elem=None):
        self.cves = []
        self.urls = []
        self.packages = []
        self.description = ''
        self.update_id = None
        self.distribution = None
        self.release_date = None
        self.status = None
        self.classification = None
        self.title = ''
        
        if elem:
            self.parse(elem)
    
    def __str__(self):
        cveinfo = pkglist = related = ''
        
        head = """
Class: %s
Status: %s
Distribution: %s
ID: %s
Release date: %s
Description: 
%s
        """ % (self.classification, self.status, self.distribution, 
               self.update_id, self.release_date, self.description)

        if self.urls:
            related = '\nRelated URLS:\n'
            for url in self.urls:
                related = related + '  %s\n' % url
        
        if self.cves:
            cveinfo = '\nResolves CVES:\n'
            for cve in self.cves:
                cveinfo = cveinfo + '  %s\n' % cve
        
        if self.packages:
            pkglist = '\nPackages: \n'
            for pkg in self.packages:
                pkgstring = '%s-%s-%s.%s\t\t%s\n' % (pkg['name'], pkg['ver'],
                                                    pkg['rel'], pkg['arch'],
                                                    pkg['pkgid'])
                pkglist = pkglist + pkgstring
        
        msg = head + related + cveinfo + pkglist
        
        return msg

    def parse(self, elem):
        if elem.tag == 'update':
            id = elem.attrib.get('id')
            if not id:
                raise UpdateNoticeException
            self.update_id = id
            
            self.release_date = elem.attrib.get('release_date')
            self.status = elem.attrib.get('status')
            c = elem.attrib.get('class')
            if not c:
                self.classification = 'update'
            else:
                self.classification = c

        for child in elem:

            if child.tag == 'cve':
                self.cves.append(child.text)

            elif child.tag == 'url':
                self.urls.append(child.text)
            
            elif child.tag == 'description':
                self.description = child.text
            
            elif child.tag == 'distribution':
                self.distribution = child.text
            
            elif child.tag == 'title':
                self.title = child.text

            elif child.tag == 'package':
                self.parse_package(child)
        
    def parse_package(self, elem):
        
        pkg = {}
        pkg['pkgid'] = elem.attrib.get('pkgid')
        pkg['name']  = elem.attrib.get('name')
        pkg['arch'] = elem.attrib.get('arch')
        for child in elem:
            if child.tag == 'version':
                pkg['ver'] = child.attrib.get('ver')
                pkg['rel'] = child.attrib.get('rel')
                pkg['epoch'] = child.attrib.get('epoch')
        
        self.packages.append(pkg)




class UpdateMetadata(object):
    def __init__(self):
        self._notices = {}
        
    def get_notices(self):
        return self._notices.values()

    notices = property(get_notices)
    
    def add(self, srcfile):
        if not srcfile:
            raise UpdateNoticeException
            
        if type(srcfile) == type('str'):
            infile = open(srcfile, 'rt')
        else:   # srcfile is a file object
            infile = srcfile
        
        parser = iterparse(infile)

        for event, elem in parser:
            if elem.tag == 'update':
                un = UpdateNotice(elem)
                if not self._notices.has_key(un.update_id):
                    self._notices[un.update_id] = un
                
            
        del parser
    
    def dump(self):
        for notice in self.notices:
            print notice


def main():

    try:
        print sys.argv[1]
        um = UpdateMetadata()
        for srcfile in sys.argv[1:]:
            um.add(srcfile)

        um.dump()
        
    except IOError:
        print >> sys.stderr, "update_md.py: No such file:\'%s\'" % sys.argv[1:]
        sys.exit(1)
        
if __name__ == '__main__':
    main()



From fedora-extras-commits at redhat.com  Sun Oct 15 12:30:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:30:46 -0700
Subject: extras-buildsys/utils/pushscript/rpmUtils __init__.py, NONE,
	1.1 arch.py, NONE, 1.1 miscutils.py, NONE, 1.1 oldUtils.py,
	NONE, 1.1 transaction.py, NONE, 1.1 updates.py, NONE, 1.1
Message-ID: <200610151230.k9FCUkUT030931@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript/rpmUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805/rpmUtils

Added Files:
	__init__.py arch.py miscutils.py oldUtils.py transaction.py 
	updates.py 
Log Message:
Add the patched yum 2.6.1 here, so we remove the dependency on the
system-installed one.




--- NEW FILE __init__.py ---
#!/usr/bin/python -tt

import rpm
import miscutils
import exceptions
import oldUtils


class RpmUtilsError(exceptions.Exception):
    def __init__(self, args=None):
        exceptions.Exception.__init__(self)
        self.args = args

    

# useful functions
def getHeadersByKeyword(ts, **kwargs):
    """return list of headers from the rpmdb matching a keyword
        ex: getHeadersByKeyword(name='foo', version='1', release='1')
    """
    lst = []
    # lifted from up2date - way to easy and useful NOT to steal - thanks adrian
    mi = ts.dbMatch()
    if kwargs.has_key('epoch'):
        del(kwargs['epoch']) # epochs don't work here for None/0/'0' reasons
        
    keywords = len(kwargs.keys())
    for hdr in mi:
        match = 0
        for keyword in kwargs.keys():
            if hdr[keyword] == kwargs[keyword]:
                match += 1
        if match == keywords:
            lst.append(hdr)
    del mi
    return lst
        
def getIndexesByKeyword(ts, **kwargs):
    """return list of headers Indexes from the rpmdb matching a keyword
        ex: getHeadersByKeyword(name='foo', version='1', release='1')
    """
    # THIS IS EXCRUCIATINGLY SLOW
    lst = []
    mi = ts.dbMatch()
    for keyword in kwargs.keys():
        mi.pattern(keyword, rpm.RPMMIRE_GLOB, kwargs[keyword])

    # we really shouldnt be getting multiples here, but what the heck
    for h in mi:
        instance = mi.instance()
        lst.append(instance)
    del mi
    return lst

class RpmDBHolder:
    def __init__(self):
        self.pkglists = []
        
    def addDB(self, ts):
        self.ts = ts
        self.match_on_index = 1
        
        try:
            # we need the find a known index so we can test if
            # rpm/rpm-python allows us to grab packages by db index.
            mi = self.ts.dbMatch()
            hdr = mi.next()
            known_index = mi.instance()
            mi = self.ts.dbMatch(0, known_index)
            hdr = mi.next()
        except (TypeError, StopIteration), e:
            self.match_on_index = 0
        else:
            self.match_on_index = 1
            
        self.indexdict = {}
        
        mi = self.ts.dbMatch()
        for hdr in mi:
            pkgtuple = self._hdr2pkgTuple(hdr)
            if not self.indexdict.has_key(pkgtuple):
                self.indexdict[pkgtuple] = []
            else:
                continue
            self.indexdict[pkgtuple].append(mi.instance())
            self.pkglists.append(pkgtuple)
        del mi
        
    def _hdr2pkgTuple(self, hdr):
        name = hdr['name']
        arch = hdr['arch']
        ver = str(hdr['version']) # convert these to strings to be sure
        rel = str(hdr['release'])
        epoch = hdr['epoch']
        if epoch is None:
            epoch = '0'
        else:
            epoch = str(epoch)
    
        return (name, arch, epoch, ver, rel)
    
    def getPkgList(self):
        return self.pkglists
    
    def getHdrList(self):
        hdrlist = []
        mi = self.ts.dbMatch()
        if mi:
            for hdr in mi:
                hdrlist.append(hdr)

        del mi
        return hdrlist
            
    def getNameArchPkgList(self):
        lst = []
        for (name, arch, epoch, ver, rel) in self.pkglists:
            lst.append((name, arch))
        
        return miscutils.unique(lst)
        
        
    def getNamePkgList(self):
        lst = []
        for (name, arch, epoch, ver, rel) in self.pkglists:
            lst.append(name)
            
        return miscutils.unique(lst)

    def returnNewestbyNameArch(self):
        """returns the newest set of pkgs based on 'name and arch'"""
        highdict = {}
        for (n, a, e, v, r) in self.pkglists:
            if not highdict.has_key((n, a)):
                highdict[(n, a)] = (e, v, r)
            else:
                (e2, v2, r2) = highdict[(n, a)]
                rc = miscutils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[(n, a)] = (e, v, r)
                    
        returns = []
        for (n, a) in highdict.keys():
            (e, v, r) = highdict[(n, a)]
            returns.append((n, a, e, v ,r))
            
        return returns
        
    def returnNewestbyName(self):
        """returns the newest set of pkgs based on name"""
        highdict = {}
        for (n, a, e, v, r) in self.pkglists:
            if not highdict.has_key(n):
                highdict[n] = (a, e, v, r)
            else:
                (a2, e2, v2, r2) = highdict[n]
                rc = miscutils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[n] = (a, e, v, r)
                    
        returns = []
        for n in highdict.keys():
            (a, e, v, r) = highdict[n]
            returns.append((n, a, e, v ,r))
            
        return returns
    
    def installed(self, name=None, arch=None, epoch=None, ver=None, rel=None):
        if len(self.returnTupleByKeyword(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel)) > 0:
            return 1
        return 0

    
    def returnTupleByKeyword(self, name=None, arch=None, epoch=None, ver=None, rel=None):
        """return a list of pkgtuples based on name, arch, epoch, ver and/or rel 
           matches."""
        
        completelist = self.getPkgList()
        removedict = {}
        returnlist = []
        
        for pkgtup in completelist:
            (n, a, e, v, r) = pkgtup
            if name is not None:
                if name != n:
                    removedict[pkgtup] = 1
                    continue
            if arch is not None:
                if arch != a:
                    removedict[pkgtup] = 1
                    continue
            if epoch is not None:
                if epoch != e:
                    removedict[pkgtup] = 1
                    continue
            if ver is not None:
                if ver != v:
                    removedict[pkgtup] = 1
                    continue
            if rel is not None:
                if rel != r:
                    removedict[pkgtup] = 1
                    continue
                    
        for pkgtup in completelist:
            if not removedict.has_key(pkgtup):
                returnlist.append(pkgtup)
        
        return returnlist

    def returnHeaderByTuple(self, pkgtuple):
        """returns a list of header(s) based on the pkgtuple provided"""
        (n, a, e, v, r) = pkgtuple
        
        if not self.match_on_index:
            lst = getHeadersByKeyword(self.ts, name=n, arch=a, epoch=e, version=v, 
                                  release=r)
            return lst
        else:
            idxs = self.returnIndexByTuple(pkgtuple)
            idx = idxs[0]
            mi = self.ts.dbMatch(0, idx)
            hdr = mi.next()
            return [hdr]

        
    def returnIndexByTuple(self, pkgtuple):
        return self.indexdict[pkgtuple]
    
    def whatProvides(self, provname, provflag, provver):
        """uses the ts in this class to return a list of pkgtuples that match
           the provide"""
        
        matches = []
        checkfileprov = 0
        
        if provname[0] == '/':
            checkfileprov = 1
            matchingFileHdrs = self.ts.dbMatch('basenames', provname)
            matchingHdrs = self.ts.dbMatch('provides', provname)            
        else:
            matchingHdrs = self.ts.dbMatch('provides', provname)

        # now we have the list of pkgs installed in the rpmdb that
        # have a the provname matching, now we need to find out
        # if any/all of them match the flag/ver set
        
        if checkfileprov and matchingFileHdrs.count() > 0:
            for matchhdr in matchingFileHdrs:
                pkgtuple = self._hdr2pkgTuple(matchhdr)
                matches.append(pkgtuple)
            del matchingFileHdrs
            return miscutils.unique(matches)

        if provflag in [0, None] or provver is None: # if we've got no ver or flag
                                                     # for comparison then they all match
            for matchhdr in matchingHdrs:
                pkgtuple = self._hdr2pkgTuple(matchhdr)
                matches.append(pkgtuple)
            del matchingHdrs
            return miscutils.unique(matches)
        
        for matchhdr in matchingHdrs:
            (pkg_n, pkg_a, pkg_e, pkg_v, pkg_r) = self._hdr2pkgTuple(matchhdr)
            pkgtuple = (pkg_n, pkg_a, pkg_e, pkg_v, pkg_r)
            # break the provver up into e-v-r (e:v-r)
            (prov_e, prov_v, prov_r) = miscutils.stringToVersion(provver)
            provtuple = (provname, provflag, (prov_e, prov_v, prov_r))
            # find the provide in the header 
            providelist = self._providesList(matchhdr)
            for (name, flag, ver) in providelist:
                if name != provname: # definitely not
                    continue

                match_n = name
                match_a = pkg_a # you got a better idea?
                if ver is not None:
                    (match_e, match_v, match_r) = miscutils.stringToVersion(ver)
                else:
                    match_e = pkg_e
                    match_v = pkg_v
                    match_r = pkg_r
                    
                matchtuple = (match_n, match_a, match_e, match_v, match_r)
                # This provides matches if the version is in the requested
                # range or the providing package provides the resource
                # without a version (meaning that it matches all EVR) 
                if miscutils.rangeCheck(provtuple, matchtuple) or (match_v == None):
                    matches.append(pkgtuple)
        del matchingHdrs
        return miscutils.unique(matches)
            
    def _providesList(self, hdr):
        lst = []
        names = hdr[rpm.RPMTAG_PROVIDENAME]
        flags = hdr[rpm.RPMTAG_PROVIDEFLAGS]
        vers = hdr[rpm.RPMTAG_PROVIDEVERSION]
        if names is not None:
            lst = zip(names, flags, vers)
        return miscutils.unique(lst)



--- NEW FILE arch.py ---
#!/usr/bin/python
#

import os

# dict mapping arch -> ( multicompat, best personality, biarch personality )
multilibArches = { "x86_64":  ( "athlon", "x86_64", "athlon" ),
                   "sparc64": ( "sparc", "sparc", "sparc64" ),
                   "ppc64":   ( "ppc", "ppc", "ppc64" ),
                   "s390x":   ( "s390", "s390x", "s390" ),
                   "ia64":    ( "i686", "ia64", "i686" )
                   }

arches = {
    # ia32
    "athlon": "i686",
    "i686": "i586",
    "i586": "i486",
    "i486": "i386",
    "i386": "noarch",
    
    # amd64
    "x86_64": "athlon",
    "amd64": "x86_64",
    "ia32e": "x86_64",
    
    # itanium
    "ia64": "i686",
    
    # ppc
    "ppc64pseries": "ppc64",
    "ppc64iseries": "ppc64",    
    "ppc64": "ppc",
    "ppc": "noarch",
    
    # s390{,x}
    "s390x": "s390",
    "s390": "noarch",
    
    # sparc
    "sparc64": "sparcv9",
    "sparcv9": "sparcv8",
    "sparcv8": "sparc",
    "sparc": "noarch",

    # alpha
    "alphaev6": "alphaev56",
    "alphaev56": "alphaev5",
    "alphaev5": "alpha",
    "alpha": "noarch",
    }

# this computes the difference between myarch and targetarch
def archDifference(myarch, targetarch):
    if myarch == targetarch:
        return 1
    if arches.has_key(myarch):
        ret = archDifference(arches[myarch], targetarch)
        if ret != 0:
            return ret + 1
        return 0
    return 0

def score(arch):
    return archDifference(canonArch, arch)

def isMultiLibArch(arch=None):
    """returns true if arch is a multilib arch, false if not"""
    if arch is None:
        arch = getCanonArch()

    if not arches.has_key(arch): # or we could check if it is noarch
        return 0
    
    if multilibArches.has_key(arch):
        return 1
        
    if multilibArches.has_key(arches[arch]):
        return 1
    
    return 0
    
def getBestArchFromList(archlist, myarch=None):
    """ 
        return the best arch from the list for myarch if - myarch is not given,
        then return the best arch from the list for the canonArch.
    """
    
    if myarch is None:
        myarch = getCanonArch()

    if len(archlist) == 0:
        return None
    
    thisarch = archlist[0]
    for arch in archlist[1:]:
        val1 = archDifference(myarch, thisarch)
        val2 = archDifference(myarch, arch)
        if val1 == 0 and val2 == 0:
           continue
        if val1 < val2:
            if val1 == 0:
                thisarch = arch                
        if val2 < val1:
            if val2 != 0:
                thisarch = arch
        if val1 == val2:
            pass
    
    # thisarch should now be our bestarch
    # one final check to make sure we're not returning a bad arch
    val = archDifference(myarch, thisarch)
    if val == 0:
        return None

    return thisarch
        
          
def getArchList(thisarch=None):
    # this returns a list of archs that are compatible with arch given
    if not thisarch:
        thisarch = getCanonArch()
    
    archlist = [thisarch]
    while arches.has_key(thisarch):
        thisarch = arches[thisarch]
        archlist.append(thisarch)
    
    return archlist
    
        

def getCanonX86Arch(arch):
    # only athlon vs i686 isn't handled with uname currently
    if arch != "i686":
        return arch

    # if we're i686 and AuthenticAMD, then we should be an athlon
    f = open("/proc/cpuinfo", "r")
    lines = f.readlines()
    f.close()
    for line in lines:
        if line.startswith("vendor") and line.find("AuthenticAMD") != -1:
            return "athlon"
        # i686 doesn't guarantee cmov, but we depend on it
        elif line.startswith("flags") and line.find("cmov") == -1:
            return "i586"

    return arch

def getCanonPPCArch(arch):
    # FIXME: should I do better handling for mac, etc?
    if arch != "ppc64":
        return arch

    machine = None
    f = open("/proc/cpuinfo", "r")
    lines = f.readlines()
    f.close()
    for line in lines:
        if line.find("machine") != -1:
            machine = line.split(':')[1]
            break
    if machine is None:
        return arch

    if machine.find("CHRP IBM") != -1:
        return "ppc64pseries"
    if machine.find("iSeries") != -1:
        return "ppc64iseries"
    return arch

def getCanonX86_64Arch(arch):
    if arch != "x86_64":
        return arch

    vendor = None
    f = open("/proc/cpuinfo", "r")
    lines = f.readlines()
    f.close()
    for line in lines:
        if line.startswith("vendor_id"):
            vendor = line.split(':')[1]
            break
    if vendor is None:
        return arch

    if vendor.find("Authentic AMD") != -1:
        return "amd64"
    if vendor.find("GenuineIntel") != -1:
        return "ia32e"
    return arch
        
def getCanonArch(skipRpmPlatform = 0):
    if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
        try:
            f = open("/etc/rpm/platform", "r")
            line = f.readline()
            f.close()
            (arch, vendor, opersys) = line.split("-", 2)
            return arch
        except:
            pass
        
    arch = os.uname()[4]

    if (len(arch) == 4 and arch[0] == "i" and arch[2:4] == "86"):
        return getCanonX86Arch(arch)

    if arch.startswith("ppc"):
        return getCanonPPCArch(arch)
    if arch == "x86_64":
        return getCanonX86_64Arch(arch)

    return arch

# this gets you the "compat" arch of a biarch pair
def getMultiArchInfo(arch = getCanonArch()):
    if multilibArches.has_key(arch):
        return multilibArches[arch]
    if arches.has_key(arch) and arches[arch] != "noarch":
        return getMultiArchInfo(arch = arches[arch])
    return None

# get the best usual userspace arch for the arch we're on.  this is
# our arch unless we're on an arch that uses the secondary as its
# userspace (eg ppc64, sparc64)
def getBestArch():
    arch = canonArch

    if arch == "sparc64":
        arch = "sparc"

    if arch.startswith("ppc64"):
        arch = "ppc"

    return arch

def getBaseArch(myarch=None):
    """returns 'base' arch for myarch, if specified, or canonArch if not.
       base arch is the arch before noarch in the arches dict if myarch is not
       a key in the multilibArches."""

    if not myarch:
        myarch = getCanonArch()

    if not arches.has_key(myarch): # this is dumb, but <shrug>
        return myarch

    if myarch == "sparc64":
        return "sparc"
    elif myarch.startswith("ppc64"):
        return "ppc"
        
    if isMultiLibArch(arch=myarch):
        if multilibArches.has_key(myarch):
            return myarch
        else:
            return arches[myarch]
    
    if arches.has_key(myarch):
        basearch = myarch
        value = arches[basearch]
        while value != 'noarch':
            basearch = value
            value = arches[basearch]
    
        return basearch
        
canonArch = getCanonArch()


--- NEW FILE miscutils.py ---
#!/usr/bin/python -tt

# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2003 Duke University

import string
import rpm
import types
import gzip
import os
import sys
import locale

import rpmUtils.transaction

def rpmOutToStr(arg):
    if type(arg) != types.StringType:
    # and arg is not None:
        arg = str(arg)
        
    return arg
    

def compareEVR((e1, v1, r1), (e2, v2, r2)):
    # return 1: a is newer than b
    # 0: a and b are the same version
    # -1: b is newer than a
    e1 = rpmOutToStr(e1)
    v1 = rpmOutToStr(v1)
    r1 = rpmOutToStr(r1)
    e2 = rpmOutToStr(e2)
    v2 = rpmOutToStr(v2)
    r2 = rpmOutToStr(r2)
    #print '%s, %s, %s vs %s, %s, %s' % (e1, v1, r1, e2, v2, r2)
    rc = rpm.labelCompare((e1, v1, r1), (e2, v2, r2))
    #print '%s, %s, %s vs %s, %s, %s = %s' % (e1, v1, r1, e2, v2, r2, rc)
    return rc

def checkSig(ts, package):
    """Takes a transaction set and a package, check it's sigs, 
    return 0 if they are all fine
    return 1 if the gpg key can't be found
    return 2 if the header is in someway damaged
    return 3 if the key is not trusted 
    return 4 if the pkg is not gpg or pgp signed"""
    
    value = 0
    currentflags = ts.setVSFlags(0)
    fdno = os.open(package, os.O_RDONLY)
    try:
        hdr = ts.hdrFromFdno(fdno)
    except rpm.error, e:
        if str(e) == "public key not availaiable":
            value = 1
        if str(e) == "public key not available":
            value = 1
        if str(e) == "public key not trusted":
            value = 3
        if str(e) == "error reading package header":
            value = 2
    else:
        error, siginfo = getSigInfo(hdr)
        if error == 101:
            os.close(fdno)
            del hdr
            value = 4
        else:
            del hdr

    try:
        os.close(fdno)
    except OSError, e: # if we're not opened, don't scream about it
        pass

    ts.setVSFlags(currentflags) # put things back like they were before
    return value

def getSigInfo(hdr):
    """checks signature from an hdr hand back signature information and/or
       an error code"""
       
    locale.setlocale(locale.LC_ALL, 'C')
    string = '%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|'
    siginfo = hdr.sprintf(string)
    if siginfo != '(none)':
        error = 0 
        sigtype, sigdate, sigid = siginfo.split(',')
    else:
        error = 101
        sigtype = 'MD5'
        sigdate = 'None'
        sigid = 'None'
        
    infotuple = (sigtype, sigdate, sigid)
    return error, infotuple

def pkgTupleFromHeader(hdr):
    """return a pkgtuple (n, a, e, v, r) from a hdr object, converts
       None epoch to 0, as well."""
   
    name = hdr['name']
    arch = hdr['arch']
    ver = hdr['version']
    rel = hdr['release']
    epoch = hdr['epoch']
    if epoch is None:
        epoch = '0'
    pkgtuple = (name, arch, epoch, ver, rel)
    return pkgtuple
    
    
def rangeCheck(reqtuple, pkgtuple):
    """returns true if the package epoch-ver-rel satisfy the range
       requested in the reqtuple:
       ex: foo >= 2.1-1"""
    # we only ever get here if we have a versioned prco
    # nameonly shouldn't ever raise it
    (reqn, reqf, (reqe, reqv, reqr)) = reqtuple
    (n, a, e, v, r) = pkgtuple
    #simple failures
    if reqn != n: return 0
    # and you thought we were done having fun
    # if the requested release is left out then we have
    # to remove release from the package prco to make sure the match
    # is a success - ie: if the request is EQ foo 1:3.0.0 and we have 
    # foo 1:3.0.0-15 then we have to drop the 15 so we can match
    if reqr is None:
        r = None
    if reqe is None:
        e = None
    if reqv is None: # just for the record if ver is None then we're going to segfault
        v = None
        
    rc = compareEVR((e, v, r), (reqe, reqv, reqr))
            
    if rc >= 1:
        if reqf in ['GT', 'GE', 4, 12]:
            return 1
    if rc == 0:
        if reqf in ['GE', 'LE', 'EQ', 8, 10, 12]:
            return 1
    if rc <= -1:
        if reqf in ['LT', 'LE', 2, 10]:
            return 1
    return 0

###########
# Title: Remove duplicates from a sequence
# Submitter: Tim Peters 
# From: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560                      
    
def unique(s):
    """Return a list of the elements in s, but without duplicates.

    For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3],
    unique("abcabc") some permutation of ["a", "b", "c"], and
    unique(([1, 2], [2, 3], [1, 2])) some permutation of
    [[2, 3], [1, 2]].

    For best speed, all sequence elements should be hashable.  Then
    unique() will usually work in linear time.

    If not possible, the sequence elements should enjoy a total
    ordering, and if list(s).sort() doesn't raise TypeError it's
    assumed that they do enjoy a total ordering.  Then unique() will
    usually work in O(N*log2(N)) time.

    If that's not possible either, the sequence elements must support
    equality-testing.  Then unique() will usually work in quadratic
    time.
    """

    n = len(s)
    if n == 0:
        return []

    # Try using a dict first, as that's the fastest and will usually
    # work.  If it doesn't work, it will usually fail quickly, so it
    # usually doesn't cost much to *try* it.  It requires that all the
    # sequence elements be hashable, and support equality comparison.
    u = {}
    try:
        for x in s:
            u[x] = 1
    except TypeError:
        del u  # move on to the next method
    else:
        return u.keys()

    # We can't hash all the elements.  Second fastest is to sort,
    # which brings the equal elements together; then duplicates are
    # easy to weed out in a single pass.
    # NOTE:  Python's list.sort() was designed to be efficient in the
    # presence of many duplicate elements.  This isn't true of all
    # sort functions in all languages or libraries, so this approach
    # is more effective in Python than it may be elsewhere.
    try:
        t = list(s)
        t.sort()
    except TypeError:
        del t  # move on to the next method
    else:
        assert n > 0
        last = t[0]
        lasti = i = 1
        while i < n:
            if t[i] != last:
                t[lasti] = last = t[i]
                lasti += 1
            i += 1
        return t[:lasti]

    # Brute force is all that's left.
    u = []
    for x in s:
        if x not in u:
            u.append(x)
    return u


def splitFilename(filename):
    """pass in a standard style rpm fullname and it returns
    a name, version, release, epoch, arch
    aka  foo-1.0-1.i386.rpm returns foo, 1.0, 1, i386
         1:bar-9-123a.ia64.rpm returns bar, 9, 123a, 1, ia64
    """

    if filename[-4:] == '.rpm':
        filename = filename[:-4]
       
    archIndex = string.rfind(filename, '.')
    arch = filename[archIndex+1:]

    relIndex = string.rfind(filename[:archIndex], '-')
    rel = filename[relIndex+1:archIndex]

    verIndex = string.rfind(filename[:relIndex], '-')
    ver = filename[verIndex+1:relIndex]

    epochIndex = string.find(filename, ':')
    if epochIndex == -1:
        epoch = ''
    else:
        epoch = filename[:epochIndex]
        
    name = filename[epochIndex + 1:verIndex]
    return name, ver, rel, epoch, arch


def rpm2cpio(fdno, out=sys.stdout, bufsize=2048):
    """Performs roughly the equivalent of rpm2cpio(8).
       Reads the package from fdno, and dumps the cpio payload to out,
       using bufsize as the buffer size."""
    ts = rpmUtils.transaction.initReadOnlyTransaction()
    hdr = ts.hdrFromFdno(fdno)
    del ts
    
    compr = hdr[rpm.RPMTAG_PAYLOADCOMPRESSOR] or 'gzip'
    #XXX FIXME
    #if compr == 'bzip2':
        # TODO: someone implement me!
    #el
    if compr != 'gzip':
        raise rpmUtils.RpmUtilsError, \
              'Unsupported payload compressor: "%s"' % compr
    f = gzip.GzipFile(None, 'rb', None, os.fdopen(fdno, 'rb', bufsize))
    while 1:
        tmp = f.read(bufsize)
        if tmp == "": break
        out.write(tmp)
    f.close()
                                                                                
def formatRequire (name, version, flags):
    s = name
    
    if flags:
        if flags & (rpm.RPMSENSE_LESS | rpm.RPMSENSE_GREATER |
                    rpm.RPMSENSE_EQUAL):
            s = s + " "
            if flags & rpm.RPMSENSE_LESS:
                s = s + "<"
            if flags & rpm.RPMSENSE_GREATER:
                s = s + ">"
            if flags & rpm.RPMSENSE_EQUAL:
                s = s + "="
            if version:
                s = "%s %s" %(s, version)
    return s
    
def stringToVersion(verstring):
    if verstring is None:
        return (None, None, None)
    i = string.find(verstring, ':')
    if i != -1:
        try:
            epoch = string.atol(verstring[:i])
        except ValueError:
            # look, garbage in the epoch field, how fun, kill it
            epoch = '0' # this is our fallback, deal
    else:
        epoch = '0'
    j = string.find(verstring, '-')
    if j != -1:
        if verstring[i + 1:j] == '':
            version = None
        else:
            version = verstring[i + 1:j]
        release = verstring[j + 1:]
    else:
        if verstring[i + 1:] == '':
            version = None
        else:
            version = verstring[i + 1:]
        release = None
    return (epoch, version, release)

def hdrFromPackage(ts, package):
    """hand back the rpm header or raise an Error if the pkg is fubar"""
    try:
        fdno = os.open(package, os.O_RDONLY)
    except OSError, e:
        raise rpmUtils.RpmUtilsError, 'Unable to open file'
    
    try:
        hdr = ts.hdrFromFdno(fdno)
    except rpm.error, e:
        os.close(fdno)
        raise rpmUtils.RpmUtilsError, "RPM Error opening Package"
    if type(hdr) != rpm.hdr:
        os.close(fdno)
        raise rpmUtils.RpmUtilsError, "RPM Error opening Package"
    
    os.close(fdno)
    return hdr


--- NEW FILE oldUtils.py ---
#!/usr/bin/python -tt

import rpm
import types
import os
import gzip
import sys
from gzip import write32u, FNAME


def _(msg):
    return msg
    

def checkheader(headerfile, name, arch):
    """check a header by opening it and comparing the results to the name and arch
       we believe it to be for. if it fails raise URLGrabError(-1)"""
    h = Header_Work(headerfile)
    fail = 0
    if h.hdr is None:
        fail = 1
    else:
        if name != h.name() or arch != h.arch():
            fail = 1
    if fail:
        raise URLGrabError(-1, _('Header cannot be opened or does not match %s, %s.') % (name, arch))
    return
    

def checkRpmMD5(package, urlgraberror=0):
    """take a package, check it out by trying to open it, return 1 if its good
       return 0 if it's not"""
    ts.sigChecking('md5')
    fdno = os.open(package, os.O_RDONLY)
    try:
        ts.hdrFromFdno(fdno)
    except rpm.error, e:
        good = 0
    else:
        good = 1
    os.close(fdno)
    ts.sigChecking('default')

    if urlgraberror:
        if not good:
            raise URLGrabError(-1, _('RPM %s fails md5 check') % (package)) 
        else:
            return
    else:
        return good

def checkSig(package):
    """ take a package, check it's sigs, return 0 if they are all fine, return 
    1 if the gpg key can't be found,  2 if the header is in someway damaged,
    3 if the key is not trusted, 4 if the pkg is not gpg or pgp signed"""
    ts.sigChecking('default')
    fdno = os.open(package, os.O_RDONLY)
    try:
        hdr = ts.hdrFromFdno(fdno)
    except rpm.error, e:
        if str(e) == "public key not availaiable":
            return 1
        if str(e) == "public key not available":
            return 1
        if str(e) == "public key not trusted":
            return 3
        if str(e) == "error reading package header":
            return 2
    else:
        error, siginfo = getSigInfo(hdr)
        if error == 101:
            os.close(fdno)
            del hdr
            return 4
        else:
            del hdr
    os.close(fdno)
    return 0

def getSigInfo(hdr):
    """checks if a computerhand back signature information and an error code"""
    string = '%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|'
    siginfo = hdr.sprintf(string)
    if siginfo != '(none)':
        error = 0 
        sigtype, sigdate, sigid = siginfo.split(',')
    else:
        error = 101
        sigtype = 'MD5'
        sigdate = 'None'
        sigid = 'None'
        
    infotuple = (sigtype, sigdate, sigid)
    return error, infotuple

def getProvides(header):
    provnames = []
    provides = header[rpm.RPMTAG_PROVIDENAME]
    if provides is None:
        pass
    elif type(provides) is types.ListType:
        provnames.extend(provides)
    else:
        provnames.append(provides)
    return provnames
    
def compareEVR((e1, v1, r1), (e2, v2, r2)):
    # return 1: a is newer than b 
    # 0: a and b are the same version 
    # -1: b is newer than a 
    def rpmOutToStr(arg):
        if type(arg) != types.StringType and arg != None:
            arg = str(arg)
        return arg
    e1 = rpmOutToStr(e1)
    v1 = rpmOutToStr(v1)
    r1 = rpmOutToStr(r1)
    e2 = rpmOutToStr(e2)
    v2 = rpmOutToStr(v2)
    r2 = rpmOutToStr(r2)
    rc = rpm.labelCompare((e1, v1, r1), (e2, v2, r2))
    log(6, '%s, %s, %s vs %s, %s, %s = %s' % (e1, v1, r1, e2, v2, r2, rc))
    return rc
    

def formatRequire (name, version, flags):
    if flags:
        if flags & (rpm.RPMSENSE_LESS | rpm.RPMSENSE_GREATER | rpm.RPMSENSE_EQUAL):
            name = name + ' '
        if flags & rpm.RPMSENSE_LESS:
            name = name + '<'
        if flags & rpm.RPMSENSE_GREATER:
            name = name + '>'
        if flags & rpm.RPMSENSE_EQUAL:
            name = name + '='
            name = name + ' %s' % version
    return name


def openrpmdb():
    try:
        db = rpm.TransactionSet(conf.installroot)
    except rpm.error, e:
        errorlog(0, _("Could not open RPM database for reading. Perhaps it is already in use?"))
    return db


# this is done to make the hdr writing _more_ sane for rsync users especially
__all__ = ["GzipFile","open"]

class GzipFile(gzip.GzipFile):
    def _write_gzip_header(self):
        self.fileobj.write('\037\213')             # magic header
        self.fileobj.write('\010')                 # compression method
        fname = self.filename[:-3]
        flags = 0
        if fname:
            flags = FNAME
        self.fileobj.write(chr(flags))
        write32u(self.fileobj, long(0))
        self.fileobj.write('\002')
        self.fileobj.write('\377')
        if fname:
            self.fileobj.write(fname + '\000')


def _gzipOpen(filename, mode="rb", compresslevel=9):
    return GzipFile(filename, mode, compresslevel)

class RPM_Base_Work:

    def _getTag(self, tag):
        if self.hdr is None:
            errorlog(0, _('Got an empty Header, something has gone wrong'))
            #FIXME should raise a yum error here
            sys.exit(1)
        return self.hdr[tag]
    
    def isSource(self):
        if self._getTag('sourcepackage') == 1:
            return 1
        else:
            return 0
        
    def name(self):
        return self._getTag('name')
        
    def arch(self):
        return self._getTag('arch')
        
    def epoch(self):
        return self._getTag('epoch')
    
    def version(self):
        return self._getTag('version')
        
    def release(self):
        return self._getTag('release')
        
    def evr(self):
        e = self._getTag('epoch')
        v = self._getTag('version')
        r = self._getTag('release')
        return (e, v, r)
        
    def nevra(self):
        n = self._getTag('name')
        e = self._getTag('epoch')
        v = self._getTag('version')
        r = self._getTag('release')
        a = self._getTag('arch')
        return (n, e, v, r, a)
    
    def writeHeader(self, headerdir, compress):
    # write the header out to a file with the format: name-epoch-ver-rel.arch.hdr
    # return the name of the file it just made - no real reason :)
        (name, epoch, ver, rel, arch) = self.nevra()
        if epoch is None:
            epoch = '0'
        if self.isSource():
            headerfn = "%s/%s-%s-%s-%s.src.hdr" % (headerdir, name, epoch, ver, rel)
        else:
            headerfn = "%s/%s-%s-%s-%s.%s.hdr" % (headerdir, name, epoch, ver, rel, arch)

        if compress:
            headerout = _gzipOpen(headerfn, "w")
        else:
            headerout = open(headerfn, "w")
        headerout.write(self.hdr.unload(1))
        headerout.close()
        return(headerfn)

class Header_Work(RPM_Base_Work):
    """for operating on hdrs in and out of the rpmdb
       if the first arg is a string then it's a filename
       otherwise it's an rpm hdr"""
    def __init__(self, header):
        if type(header) is types.StringType:
            try:
                fd = gzip.open(header, 'r')
                try: 
                    h = rpm.headerLoad(fd.read())
                except rpm.error, e:
                    errorlog(0,_('Damaged Header %s') % header)
                    h = None
            except IOError,e:
                fd = open(header, 'r')
                try:
                    h = rpm.headerLoad(fd.read())
                except rpm.error, e:
                    errorlog(0,_('Damaged Header %s') % header)
                    h = None
            except ValueError, e:
                errorlog(0,_('Damaged Header %s') % header)
                h = None
            except zlibError, e:
                errorlog(0,_('Damaged Header %s') % header)
                h = None
            fd.close()
        else:
            h = header
        self.hdr = h


class RPM_Work(RPM_Base_Work):
    def __init__(self, rpmfn):
        ts.setVSFlags(~(rpm._RPMVSF_NOSIGNATURES))
        fd = os.open(rpmfn, os.O_RDONLY)
        try:
            self.hdr = ts.hdrFromFdno(fd)
        except rpm.error, e:
            errorlog(0, _('Error opening rpm %s - error %s') % (rpmfn, e))
            self.hdr = None
        os.close(fd)
    
class Rpm_Ts_Work:
    """This should operate on groups of headers/matches/etc in the rpmdb - ideally it will 
    operate with a list of the Base objects above, so I can refer to any one object there
    not sure the best way to do this yet, more thinking involved"""
    def __init__(self, dbPath='/'):
        try:
            if conf.installroot:
                if conf.installroot != '/':
                    dbPath = conf.installroot
        except NameError, e:
            pass

        self.ts = rpm.TransactionSet(dbPath)
        
        self.methods = ['addInstall', 'addErase', 'run', 'check', 'order', 'hdrFromFdno',
                   'closeDB', 'dbMatch', 'setFlags', 'setVSFlags', 'setProbFilter']
                   
    def __getattr__(self, attribute):
        if attribute in self.methods:
            return getattr(self.ts, attribute)
        else:
            raise AttributeError, attribute
            
    def match(self, tag = None, search = None, mire = None):
        """hands back a list of Header_Work objects"""
        hwlist = []
        # hand back the whole list of hdrs
        if mire is None and tag is None and search is None:
            hdrlist = self.ts.dbMatch()
            
        else:
            #just do a non-mire'd search
            if mire == None:
                hdrlist = self.ts.dbMatch(tag, search)
            else:
                # mire search
                if mire == 'glob':
                    hdrlist = self.ts.dbMatch()
                    hdrlist.pattern(tag, rpm.RPMMIRE_GLOB, search)
                elif mire == 'regex':
                    hdrlist = self.ts.dbMatch()
                    hdrlist.pattern(tag, rpm.RPMMIRE_REGEX, search)
                elif mire == 'strcmp':
                    hdrlist = self.ts.dbMatch()
                    hdrlist.pattern(tag, rpm.RPMMIRE_STRCMP, search)
                else:
                    hdrlist = self.ts.dbMatch()
                    hdrlist.pattern(tag, rpm.RPMMIRE_DEFAULT, search)
        
        for hdr in hdrlist:
            hdrobj = Header_Work(hdr)
            hwlist.append(hdrobj)
        return hwlist
    
    def sigChecking(self, sig):
        """pass type of check you want to occur, default is to have them off"""
        if sig == 'md5':
            #turn off everything but md5 - and we need to the check the payload
            self.ts.setVSFlags(~(rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD))
        elif sig == 'none':
            # turn off everything - period
            self.ts.setVSFlags(~(rpm._RPMVSF_NOSIGNATURES))
        elif sig == 'default':
            # set it back to the default
            self.ts.setVSFlags(rpm.RPMVSF_DEFAULT)
        else:
            raise AttributeError, sig


--- NEW FILE transaction.py ---
#!/usr/bin/python

#
# Client code for Update Agent
# Copyright (c) 1999-2002 Red Hat, Inc.  Distributed under GPL.
#
#         Adrian Likins <alikins at redhat.com>
# Some Edits by Seth Vidal <skvidal at phy.duke.edu>
#
# a couple of classes wrapping up transactions so that we  
#    can share transactions instead of creating new ones all over
#

import rpm
import miscutils
from sets import Set

read_ts = None
ts = None

# wrapper/proxy class for rpm.Transaction so we can
# instrument it, etc easily
class TransactionWrapper:
    def __init__(self, root='/'):
        self.ts = rpm.TransactionSet(root)
        self._methods = ['dbMatch',
                         'check',
                         'order',
                         'addErase',
                         'addInstall',
                         'run',
                         'IDTXload',
                         'IDTXglob',
                         'rollback',
                         'pgpImportPubkey',
                         'pgpPrtPkts',
                         'Debug',
                         'setFlags',
                         'setVSFlags',
                         'setProbFilter',
                         'hdrFromFdno',
                         'next',
                         'clean']
        self.tsflags = []

    def __getattr__(self, attr):
        if attr in self._methods:
            return self.getMethod(attr)
        else:
            raise AttributeError, attr

    def __iter__(self):
        return self.ts
        
    def getMethod(self, method):
        # in theory, we can override this with
        # profile/etc info
        return getattr(self.ts, method)

    # push/pop methods so we dont lose the previous
    # set value, and we can potentiall debug a bit
    # easier
    def pushVSFlags(self, flags):
        self.tsflags.append(flags)
        self.ts.setVSFlags(self.tsflags[-1])

    def popVSFlags(self):
        del self.tsflags[-1]
        self.ts.setVSFlags(self.tsflags[-1])

    def addTsFlag(self, flag):
        curflags = self.ts.setFlags(0)
        self.ts.setFlags(curflags | flag)
        
    def test(self, cb, conf={}):
        """tests the ts we've setup, takes a callback function and a conf dict 
           for flags and what not"""
        #FIXME
        # I don't like this function - it should test, sure - but not
        # with this conf dict, we should be doing that beforehand and
        # we should be packing this information away elsewhere.
        self.addTsFlag(rpm.RPMTRANS_FLAG_TEST)
        if conf.has_key('diskspacecheck'):
            if conf['diskspacecheck'] == 0:
                self.ts.setProbFilter(rpm.RPMPROB_FILTER_DISKSPACE)
    
        tserrors = self.ts.run(cb.callback, '')
    
        reserrors = []
        if tserrors:
            for (descr, (etype, mount, need)) in tserrors:
                reserrors.append(descr)
        
        return reserrors
            
        
    def returnLeafNodes(self):
        """returns a list of package tuples (n,a,e,v,r) that are not required by
           any other package on the system"""
        
        req = {}
        orphan = []
    
        mi = self.dbMatch()
        if mi is None: # this is REALLY unlikely but let's just say it for the moment
            return orphan    
            
        for h in mi:
            tup = miscutils.pkgTupleFromHeader(h)    
            if not h[rpm.RPMTAG_REQUIRENAME]:
                continue
            for r in h[rpm.RPMTAG_REQUIRENAME]:
                if not req.has_key(r):
                    req[r] = Set()
                req[r].add(tup)
     
     
        mi = self.dbMatch()
        if mi is None:
            return orphan
     
        for h in mi:
            preq = 0
            tup = miscutils.pkgTupleFromHeader(h)
            for p in h[rpm.RPMTAG_PROVIDES] + h[rpm.RPMTAG_FILENAMES]:
                if req.has_key(p):
                    # Don't count a package that provides its require
                    s = req[p]
                    if len(s) > 1 or tup not in s:
                        preq = preq + 1
        
            if preq == 0:
                orphan.append(tup)
        
        return orphan

        
def initReadOnlyTransaction(root='/'):
    read_ts =  TransactionWrapper(root=root)
    read_ts.pushVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
    return read_ts



--- NEW FILE updates.py ---
#!/usr/bin/python -tt
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Copyright 2004 Duke University

import rpmUtils.miscutils
import rpmUtils.arch
import rpmUtils

class Updates:
    """This class computes and keeps track of updates and obsoletes.
       initialize, add installed packages, add available packages (both as
       unique lists of name, epoch, ver, rel, arch tuples), add an optional dict
       of obsoleting packages with obsoletes and what they obsolete ie:
        foo, i386, 0, 1.1, 1: bar >= 1.1."""

    def __init__(self, instlist, availlist):
        self.changeTup = [] # storage list tuple of updates or obsoletes
                            # (oldpkg, newpkg, ['update'|'obsolete'])

        self.installed = instlist # list of installed pkgs (n, a, e, v, r)
        self.available = availlist # list of available pkgs (n, a, e, v, r)
        self.rawobsoletes = {} # dict of obsoleting package->[what it obsoletes]
        self.exactarch = 1 # don't change archs by default
        self.exactarchlist = ['kernel', 'kernel-smp', 'glibc', 'kernel-hugemem',
                              'kernel-enterprise', 'kernel-bigmem', 'kernel-BOOT']
                              
        self.myarch = rpmUtils.arch.getCanonArch() # this is for debugging only 
                                                   # set this if you want to 
                                                   # test on some other arch
                                                   # otherwise leave it alone
        
        # make some dicts from installed and available
        self.installdict = self.makeNADict(self.installed, 1)
        self.availdict = self.makeNADict(self.available, 1)

        # holder for our updates dict
        self.updatesdict = {}
        #debug, ignore me
        self.debug = 0

    def debugprint(self, msg):
        if self.debug:
            print msg
        
    def makeNADict(self, pkglist, Nonelists):
        """return lists of (e,v,r) tuples as value of a dict keyed on (n, a)
            optionally will return a (n, None) entry with all the a for that
            n in tuples of (a,e,v,r)"""
            
        returndict = {}
        for (n, a, e, v, r) in pkglist:
            if not returndict.has_key((n, a)):
                returndict[(n, a)] = []
            returndict[(n, a)].append((e,v,r))

            if Nonelists:
                if not returndict.has_key((n, None)):
                    returndict[(n, None)] = []
                returndict[(n, None)].append((a, e, v, r))
            
        return returndict
                    

    def returnNewest(self, evrlist):
        """takes a list of (e, v, r) tuples and returns the newest one"""
        if len(evrlist)==0:
            raise rpmUtils.RpmUtilsError, "Zero Length List in returnNewest call"
            
        if len(evrlist)==1:
            return evrlist[0]
        
        (new_e, new_v, new_r) = evrlist[0] # we'll call the first ones 'newest'
        
        for (e, v, r) in evrlist[1:]:
            rc = rpmUtils.miscutils.compareEVR((e, v, r), (new_e, new_v, new_r))
            if rc > 0:
                new_e = e
                new_v = v
                new_r = r
        return (new_e, new_v, new_r)
         

    def returnHighestVerFromAllArchsByName(self, name, archlist, pkglist):
        """returns a list of package tuples in a list (n, a, e, v, r)
           takes a package name, a list of archs, and a list of pkgs in
           (n, a, e, v, r) form."""
        # go through list and throw out all pkgs not in archlist
        matchlist = []
        for (n, a, e, v, r) in pkglist:
            if name == n:
                if a in archlist:
                    matchlist.append((n, a, e, v, r))

        if len(matchlist) == 0:
            return []
            
        # get all the evr's in a tuple list for returning the highest
        verlist = []
        for (n, a, e, v, r) in matchlist:
            verlist.append((e,v,r))

        (high_e, high_v, high_r) = self.returnNewest(verlist)
            
        returnlist = []
        for (n, a, e, v, r) in matchlist:
            if (high_e, high_v, high_r) == (e, v, r):
                returnlist.append((n,a,e,v,r))
                
        return returnlist
           
    def condenseUpdates(self):
        """remove any accidental duplicates in updates"""
        
        for tup in self.updatesdict.keys():
            if len(self.updatesdict[tup]) > 1:
                mylist = self.updatesdict[tup]
                self.updatesdict[tup] = rpmUtils.miscutils.unique(mylist)
    
    
    def checkForObsolete(self, pkglist, newest=1):
        """accept a list of packages to check to see if anything obsoletes them
           return an obsoleted_dict in the format of makeObsoletedDict"""
           
        obsdict = {} # obseleting package > [obsoleted package]
        pkgdict = self.makeNADict(pkglist, 1)
        
        # this needs to keep arch in mind
        # if foo.i386 obsoletes bar
        # it needs to obsoletes bar.i386 preferentially, not bar.x86_64
        # if there is only one bar and only one foo then obsolete it, but try to
        # match the arch.
        
        # look through all the obsoleting packages look for multiple archs per name
        # if you find it look for the packages they obsolete
        # 
        for pkgtup in self.rawobsoletes.keys():
            (name, arch, epoch, ver, rel) = pkgtup
            for (obs_n, flag, (obs_e, obs_v, obs_r)) in self.rawobsoletes[(pkgtup)]:
                if flag in [None, 0]: # unversioned obsolete
                    if pkgdict.has_key((obs_n, None)):
                        for (rpm_a, rpm_e, rpm_v, rpm_r) in pkgdict[(obs_n, None)]:
                            if not obsdict.has_key(pkgtup):
                                obsdict[pkgtup] = []
                            obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))

                else: # versioned obsolete
                    if pkgdict.has_key((obs_n, None)):
                        for (rpm_a, rpm_e, rpm_v, rpm_r) in pkgdict[(obs_n, None)]:
                            if rpmUtils.miscutils.rangeCheck((obs_n, flag, (obs_e, \
                                                        obs_v, obs_r)), (obs_n,\
                                                        rpm_a, rpm_e, rpm_v, rpm_r)):
                                # make sure the obsoleting pkg is not already installed
                                if not obsdict.has_key(pkgtup):
                                    obsdict[pkgtup] = []
                                obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))
        
        obslist = obsdict.keys()
        if newest:
            obslist = self._reduceListNewestByNameArch(obslist)

        returndict = {}
        for new in obslist:
            for old in obsdict[new]:
                if not returndict.has_key(old):
                    returndict[old] = []
                returndict[old].append(new)
        
        return returndict
        
    def doObsoletes(self):
        """figures out what things available obsolete things installed, returns
           them in a dict attribute of the class."""

        obsdict = {} # obseleting package -> [obsoleted package]
        # this needs to keep arch in mind
        # if foo.i386 obsoletes bar
        # it needs to obsoletes bar.i386 preferentially, not bar.x86_64
        # if there is only one bar and only one foo then obsolete it, but try to
        # match the arch.
        
        # look through all the obsoleting packages look for multiple archs per name
        # if you find it look for the packages they obsolete
        # 
        for pkgtup in self.rawobsoletes.keys():
            (name, arch, epoch, ver, rel) = pkgtup
            for (obs_n, flag, (obs_e, obs_v, obs_r)) in self.rawobsoletes[(pkgtup)]:
                if flag in [None, 0]: # unversioned obsolete
                    if self.installdict.has_key((obs_n, None)):
                        for (rpm_a, rpm_e, rpm_v, rpm_r) in self.installdict[(obs_n, None)]:
                            # make sure the obsoleting pkg is not already installed
                            willInstall = 1
                            if self.installdict.has_key((name, None)):
                                for (ins_a, ins_e, ins_v, ins_r) in self.installdict[(name, None)]:
                                    pkgver = (epoch, ver, rel)
                                    installedver = (ins_e, ins_v, ins_r)
                                    if self.returnNewest((pkgver, installedver)) == installedver:
                                        willInstall = 0
                                        break
                            if willInstall:
                                if not obsdict.has_key(pkgtup):
                                    obsdict[pkgtup] = []
                                obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))

                else: # versioned obsolete
                    if self.installdict.has_key((obs_n, None)):
                        for (rpm_a, rpm_e, rpm_v, rpm_r) in self.installdict[(obs_n, None)]:
                            if rpmUtils.miscutils.rangeCheck((obs_n, flag, (obs_e, \
                                                        obs_v, obs_r)), (obs_n,\
                                                        rpm_a, rpm_e, rpm_v, rpm_r)):
                                # make sure the obsoleting pkg is not already installed
                                willInstall = 1
                                if self.installdict.has_key((name, None)):
                                    for (ins_a, ins_e, ins_v, ins_r) in self.installdict[(name, None)]:
                                        pkgver = (epoch, ver, rel)
                                        installedver = (ins_e, ins_v, ins_r)
                                        if self.returnNewest((pkgver, installedver)) == installedver:
                                            willInstall = 0
                                            break
                                if willInstall:
                                    if not obsdict.has_key(pkgtup):
                                        obsdict[pkgtup] = []
                                    obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))
           
        self.obsoletes = obsdict
        self.makeObsoletedDict()

    def makeObsoletedDict(self):
        """creates a dict of obsoleted packages -> [obsoleting package], this
           is to make it easier to look up what package obsoletes what item in 
           the rpmdb"""
        self.obsoleted_dict = {}
        for new in self.obsoletes.keys():
            for old in self.obsoletes[new]:
                if not self.obsoleted_dict.has_key(old):
                    self.obsoleted_dict[old] = []
                self.obsoleted_dict[old].append(new)
    
    def doUpdates(self):
        """check for key lists as populated then commit acts of evil to
           determine what is updated and/or obsoleted, populate self.updatesdict
        """
        
        
        # best bet is to chew through the pkgs and throw out the new ones early
        # then deal with the ones where there are a single pkg installed and a 
        # single pkg available
        # then deal with the multiples

        # we should take the whole list as a 'newlist' and remove those entries
        # which are clearly:
        #   1. updates 
        #   2. identical to the ones in ourdb
        #   3. not in our archdict at all
        
        simpleupdate = []
        complexupdate = []
        
        updatedict = {} # (old n, a, e, v, r) : [(new n, a, e, v, r)]
                        # make the new ones a list b/c while we _shouldn't_
                        # have multiple updaters, we might and well, it needs
                        # to be solved one way or the other <sigh>
        newpkgs = []
        newpkgs = self.availdict
        
        archlist = rpmUtils.arch.getArchList(self.myarch)
                
        for (n, a) in newpkgs.keys():
            # remove stuff not in our archdict
            # high log here
            if a is None:
                for (arch, e,v,r) in newpkgs[(n, a)]:
                    if arch not in archlist:
                        newpkgs[(n, a)].remove((arch, e,v,r))
                continue
                
            if a not in archlist:
                # high log here
                del newpkgs[(n, a)]
                continue

        # remove the older stuff - if we're doing an update we only want the
        # newest evrs                
        for (n, a) in newpkgs.keys():
            if a is None:
                continue

            (new_e,new_v,new_r) = self.returnNewest(newpkgs[(n, a)])
            for (e, v, r) in newpkgs[(n, a)]:
                if (new_e, new_v, new_r) != (e, v, r):
                    newpkgs[(n, a)].remove((e, v, r))

                
        for (n, a) in newpkgs.keys():
            if a is None: # the None archs are only for lookups
                continue
           
            # simple ones - look for exact matches or older stuff
            if self.installdict.has_key((n, a)):
                for (rpm_e, rpm_v, rpm_r) in self.installdict[(n, a)]:
                    try:
                        (e, v, r) = self.returnNewest(newpkgs[(n,a)])
                    except rpmUtils.RpmUtilsError:
                        continue
                    else:
                        rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
                        if rc <= 0:
                            try:
                                newpkgs[(n, a)].remove((e, v, r))
                            except ValueError:
                               pass

        # get rid of all the empty dict entries:
        for nakey in newpkgs.keys():
            if len(newpkgs[nakey]) == 0:
                del newpkgs[nakey]


        # ok at this point our newpkgs list should be thinned, we should have only
        # the newest e,v,r's and only archs we can actually use
        for (n, a) in newpkgs.keys():
            if a is None: # the None archs are only for lookups
                continue
    
            if self.installdict.has_key((n, None)):
                installarchs = []
                availarchs = []
                for (a, e, v ,r) in newpkgs[(n, None)]:
                    availarchs.append(a)
                for (a, e, v, r) in self.installdict[(n, None)]:
                    installarchs.append(a)

                if len(availarchs) > 1 or len(installarchs) > 1:
                    self.debugprint('putting %s in complex update' % n)
                    complexupdate.append(n)
                else:
                    #log(4, 'putting %s in simple update list' % name)
                    self.debugprint('putting %s in simple update' % n)
                    simpleupdate.append((n, a))

        # we have our lists to work with now
    
        # simple cases
        for (n, a) in simpleupdate:
            # try to be as precise as possible
            if n in self.exactarchlist:
                if self.installdict.has_key((n, a)):
                    (rpm_e, rpm_v, rpm_r) = self.returnNewest(self.installdict[(n, a)])
                    if newpkgs.has_key((n,a)):
                        (e, v, r) = self.returnNewest(newpkgs[(n, a)])
                        rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
                        if rc > 0:
                            # this is definitely an update - put it in the dict
                            if not updatedict.has_key((n, a, rpm_e, rpm_v, rpm_r)):
                                updatedict[(n, a, rpm_e, rpm_v, rpm_r)] = []
                            updatedict[(n, a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
    
            else:
                # we could only have 1 arch in our rpmdb and 1 arch of pkg 
                # available - so we shouldn't have to worry about the lists, here
                # we just need to find the arch of the installed pkg so we can 
                # check it's (e, v, r)
                (rpm_a, rpm_e, rpm_v, rpm_r) = self.installdict[(n, None)][0]
                if newpkgs.has_key((n, None)):
                    for (a, e, v, r) in newpkgs[(n, None)]:
                        rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
                        if rc > 0:
                            # this is definitely an update - put it in the dict
                            if not updatedict.has_key((n, rpm_a, rpm_e, rpm_v, rpm_r)):
                                updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)] = []
                            updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))


        # complex cases

        # we're multilib/biarch
        # we need to check the name.arch in two different trees
        # one for the multiarch itself and one for the compat arch
        # ie: x86_64 and athlon(i686-i386) - we don't want to descend
        # x86_64->i686 
        archlists = []
        if rpmUtils.arch.isMultiLibArch(arch=self.myarch):
            if rpmUtils.arch.multilibArches.has_key(self.myarch):
                biarches = [self.myarch]
            else:
                biarches = [self.myarch, rpmUtils.arch.arches[self.myarch]]

            multicompat = rpmUtils.arch.getMultiArchInfo(self.myarch)[0]
            multiarchlist = rpmUtils.arch.getArchList(multicompat)
            archlists = [ biarches, multiarchlist ]
        else:
            archlists = [ archlist ]
            
        for n in complexupdate:
            for thisarchlist in archlists:
                # we need to get the highest version and the archs that have it
                # of the installed pkgs            
                tmplist = []
                for (a, e, v, r) in self.installdict[(n, None)]:
                    tmplist.append((n, a, e, v, r))

                highestinstalledpkgs = self.returnHighestVerFromAllArchsByName(n,
                                         thisarchlist, tmplist)
                                         
                
                tmplist = []
                for (a, e, v, r) in newpkgs[(n, None)]:
                    tmplist.append((n, a, e, v, r))                        
                
                highestavailablepkgs = self.returnHighestVerFromAllArchsByName(n,
                                         thisarchlist, tmplist)

                hapdict = self.makeNADict(highestavailablepkgs, 0)
                hipdict = self.makeNADict(highestinstalledpkgs, 0)

                # now we have the two sets of pkgs
                if n in self.exactarchlist:
                    for (n, a) in hipdict:
                        if hapdict.has_key((n, a)):
                            self.debugprint('processing %s.%s' % (n, a))
                            # we've got a match - get our versions and compare
                            (rpm_e, rpm_v, rpm_r) = hipdict[(n, a)][0] # only ever going to be first one
                            (e, v, r) = hapdict[(n, a)][0] # there can be only one
                            rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
                            if rc > 0:
                                # this is definitely an update - put it in the dict
                                if not updatedict.has_key((n, a, rpm_e, rpm_v, rpm_r)):
                                    updatedict[(n, a, rpm_e, rpm_v, rpm_r)] = []
                                updatedict[(n, a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
                else:
                    self.debugprint('processing %s' % n)
                    # this is where we have to have an arch contest if there
                    # is more than one arch updating with the highest ver
                    instarchs = []
                    availarchs = []
                    for (n,a) in hipdict.keys():
                        instarchs.append(a)
                    for (n,a) in hapdict.keys():
                        availarchs.append(a)
                    
                    rpm_a = rpmUtils.arch.getBestArchFromList(instarchs, myarch=self.myarch)
                    a = rpmUtils.arch.getBestArchFromList(availarchs, myarch=self.myarch)

                    if rpm_a is None or a is None:
                        continue
                        
                    (rpm_e, rpm_v, rpm_r) = hipdict[(n, rpm_a)][0] # there can be just one
                    (e, v, r) = hapdict[(n, a)][0] # just one, I'm sure, I swear!

                    rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))

                    if rc > 0:
                        # this is definitely an update - put it in the dict
                        if not updatedict.has_key((n, rpm_a, rpm_e, rpm_v, rpm_r)):
                            updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)] = []
                        updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
                   
                   
        self.updatesdict = updatedict                    
        self.makeUpdatingDict()
        
    def makeUpdatingDict(self):
        """creates a dict of available packages -> [installed package], this
           is to make it easier to look up what package  will be updating what
           in the rpmdb"""
        self.updating_dict = {}
        for old in self.updatesdict.keys():
            for new in self.updatesdict[old]:
                if not self.updating_dict.has_key(new):
                    self.updating_dict[new] = []
                self.updating_dict[new].append(old)

    def reduceListByNameArch(self, pkglist, name=None, arch=None):
        """returns a set of pkg naevr tuples reduced based on name or arch"""
        returnlist = []
       
        if name or arch:
            for (n, a, e, v, r) in pkglist:
                if name:
                    if name == n:
                        returnlist.append((n, a, e, v, r))
                        continue
                if arch:
                    if arch == a:
                        returnlist.append((n, a, e, v, r))
                        continue
        else:
            returnlist = pkglist

        return returnlist
        
        
    def getUpdatesTuples(self, name=None, arch=None):
        """returns updates for packages in a list of tuples of:
          (updating naevr, installed naevr)"""
        returnlist = []
        for oldtup in self.updatesdict.keys():
            (old_n, old_a, old_e, old_v, old_r) = oldtup
            for newtup in self.updatesdict[oldtup]:
                returnlist.append((newtup, oldtup))
        
        tmplist = []
        if name:
            for ((n, a, e, v, r), oldtup) in returnlist:
                if name != n:
                    tmplist.append(((n, a, e, v, r), oldtup))
        if arch:
            for ((n, a, e, v, r), oldtup) in returnlist:
                if arch != a:
                    tmplist.append(((n, a, e, v, r), oldtup))

        for item in tmplist:
            try:
                returnlist.remove(item)
            except ValueError:
                pass
                
        return returnlist            

    def getUpdatesList(self, name=None, arch=None):
        """returns updating packages in a list of (naevr) tuples"""
        returnlist = []

        for oldtup in self.updatesdict.keys():
            for newtup in self.updatesdict[oldtup]:
                returnlist.append(newtup)
        
        returnlist = self.reduceListByNameArch(returnlist, name, arch)
        
        return returnlist
                
    def getObsoletesTuples(self, newest=0, name=None, arch=None):
        """returns obsoletes for packages in a list of tuples of:
           (obsoleting naevr, installed naevr). You can specify name and/or
           arch of the installed package to narrow the results.
           You can also specify newest=1 to get the set of newest pkgs (name, arch)
           sorted, that obsolete something"""
           
        tmplist = []
        obslist = self.obsoletes.keys()
        if newest:
            obslist = self._reduceListNewestByNameArch(obslist)
            
        for obstup in obslist:
            for rpmtup in self.obsoletes[obstup]:
                tmplist.append((obstup, rpmtup))
        
        returnlist = []
        if name or arch:
            for (obstup, (n, a, e, v, r)) in tmplist:
                if name:
                    if name == n:
                        returnlist.append((obstup, (n, a, e, v, r)))
                        continue
                if arch:
                    if arch == a:
                        returnlist.append((obstup, (n, a, e, v, r)))
                        continue
        else:
            returnlist = tmplist

        return returnlist
                        
           
           
    def getObsoletesList(self, newest=0, name=None, arch=None):
        """returns obsoleting packages in a list of naevr tuples of just the
           packages that obsolete something that is installed. You can specify
           name and/or arch of the obsoleting packaging to narrow the results.
           You can also specify newest=1 to get the set of newest pkgs (name, arch)
           sorted, that obsolete something"""
           
        tmplist = self.obsoletes.keys()
        if newest:
            tmplist = self._reduceListNewestByNameArch(tmplist)

        returnlist = self.reduceListByNameArch(tmplist, name, arch)
        
        return returnlist
    
    def getObsoletedList(self, newest=0, name=None):
        """returns a list of pkgtuples obsoleting the package in name"""
        returnlist = []
        for new in self.obsoletes.keys():
            for obstup in self.obsoletes[new]:
                (n, a, e, v, r) = obstup
                if n == name:
                    returnlist.append(new)
                    continue
        return returnlist


        
    def getOthersList(self, name=None, arch=None):
        """returns a naevr tuple of the packages that are neither installed
           nor an update - this may include something that obsoletes an installed
           package"""
        updates = {}
        inst = {}
        tmplist = []
        
        for pkgtup in self.getUpdatesList():
            updates[pkgtup] = 1
            
        for pkgtup in self.installed:
            inst[pkgtup] = 1
            
        for pkgtup in self.available:
            if not updates.has_key(pkgtup) and not inst.has_key(pkgtup):
                tmplist.append(pkgtup)

        returnlist = self.reduceListByNameArch(tmplist, name, arch)
        
        return returnlist
         


    def _reduceListNewestByNameArch(self, tuplelist):
        """return list of newest packages based on name, arch matching
           this means(in name.arch form): foo.i386 and foo.noarch are not 
           compared to each other for highest version only foo.i386 and 
           foo.i386 will be compared"""
        highdict = {}
        for pkgtup in tuplelist:
            (n, a, e, v, r) = pkgtup
            if not highdict.has_key((n, a)):
                highdict[(n, a)] = pkgtup
            else:
                pkgtup2 = highdict[(n, a)]
                (n2, a2, e2, v2, r2) = pkgtup2
                rc = rpmUtils.miscutils.compareEVR((e,v,r), (e2, v2, r2))
                if rc > 0:
                    highdict[(n, a)] = pkgtup
        
        return highdict.values()

            
#    def getProblems(self):
#        """return list of problems:
#           - Packages that are both obsoleted and updated.
#           - Packages that have multiple obsoletes.
#           - Packages that _still_ have multiple updates
#        """

             



From fedora-extras-commits at redhat.com  Sun Oct 15 12:30:40 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:30:40 -0700
Subject: extras-buildsys/utils/pushscript README,1.3,1.4
Message-ID: <200610151231.k9FCVATT030939@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805

Modified Files:
	README 
Log Message:
Add the patched yum 2.6.1 here, so we remove the dependency on the
system-installed one.




Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README	30 Sep 2006 19:00:16 -0000	1.3
+++ README	15 Oct 2006 12:30:38 -0000	1.4
@@ -5,9 +5,10 @@
 repodata dirs, we rmtree the dir in Utils.create_repository before running
 createrepo -> https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=595
 
-old yum Python modules : we use a newer/patched local copy (in the Extras
-repoclosure tree), so we have more recent code for Extras repoclosure and
-metadata things
+old yum Python modules : we use a newer/patched local copy (post yum 2.6.1
+with a patched "rpmUtils" and "yum" module), so we have more recent code
+for Extras repoclosure and metadata things and don't depend on a system-
+installed version which may break the API
 
 [...]
 



From fedora-extras-commits at redhat.com  Sun Oct 15 12:34:27 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:34:27 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.3,1.4
Message-ID: <200610151234.k9FCYRIU030969@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30951

Modified Files:
	MultiLib.py 
Log Message:
-



Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultiLib.py	30 Sep 2006 18:34:14 -0000	1.3
+++ MultiLib.py	15 Oct 2006 12:34:25 -0000	1.4
@@ -21,8 +21,6 @@
 
 import Utils, RepoSupport
 
-# TODO
-sys.path.insert(0,'/srv/extras-push/work/extras-repoclosure')
 import yum, yum.Errors
 from yum.packages import YumLocalPackage
 try:



From fedora-extras-commits at redhat.com  Sun Oct 15 12:37:22 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Oct 2006 05:37:22 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.4,1.5
Message-ID: <200610151237.k9FCbMQq031021@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31003

Modified Files:
	Push.py 
Log Message:
-



Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Push.py	29 Sep 2006 19:14:04 -0000	1.4
+++ Push.py	15 Oct 2006 12:37:20 -0000	1.5
@@ -27,7 +27,7 @@
 import Utils, MultiLib
 import RepoBuild, RepoManage, RepoView
 
-DEBUG = True
+DEBUG = False
 Utils.setdebug(DEBUG)
 
 # Lockfile name supported by plague for mutual exclusion during



From fedora-extras-commits at redhat.com  Sun Oct 15 13:16:50 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 15 Oct 2006 06:16:50 -0700
Subject: rpms/xfce4-datetime-plugin/devel Makefile, 1.2, 1.3 sources, 1.3,
	1.4 xfce4-datetime-plugin.spec, 1.6, 1.7 .cvsignore, 1.2,
	1.3 dead.package, 1.1, NONE
Message-ID: <200610151316.k9FDGqtR001706@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1683

Modified Files:
	.cvsignore 
Added Files:
	Makefile sources xfce4-datetime-plugin.spec 
Removed Files:
	dead.package 
Log Message:
unorphaning datetime-plugin, new upstream has ported it to Xfce 4.4


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	15 Oct 2006 13:16:50 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: xfce4-datetime-plugin
+# $Id$
+NAME := xfce4-datetime-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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	15 Oct 2006 13:16:50 -0000	1.4
@@ -0,0 +1 @@
+8a688b1add5615f581e82015de89a4bb  xfce4-datetime-plugin-0.4.0.tar.gz


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: xfce4-datetime-plugin.spec
diff -N xfce4-datetime-plugin.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xfce4-datetime-plugin.spec	15 Oct 2006 13:16:50 -0000	1.7
@@ -0,0 +1,74 @@
+Name:		xfce4-datetime-plugin
+Version:	0.4.0
+Release:	1%{?dist}
+Summary:	Date/time plugin for the Xfce panel
+
+Group:		User Interface/Desktops
+License:	GPL
+URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
+Source0:	http://xs4all.nl/~stacium/xfce/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel  >= 4.3.20, libxml2-devel
+BuildRequires:	gettext, perl(XML::Parser), dbus-devel >= 0.22
+Requires:	xfce4-panel >= 4.3.99.1
+
+%description
+An alternative clock plugin for the Xfce panel. A calendar appears when you 
+left-click on it.
+
+%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 -type f -name "*.la" -exec rm -f {} ';'
+%find_lang datetime
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f datetime.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog
+%{_libdir}/xfce4/panel-plugins/*.so
+%{_datadir}/xfce4/panel-plugins/*.desktop
+
+%changelog
+* Sun Oct 15 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+- Update to 0.4.0 on Xfce 4.4. RC1.
+- Fix %%defattr.
+
+* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-8
+- Mass rebuild for Fedora Core 6.
+
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-7
+- Require xfce4-panel.
+
+* Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Rebuild for Fedora Extras 5.
+
+* Tue Nov 29 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
+- Add libxfcegui4-devel BuildReqs.
+
+* Fri Nov 25 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-4
+- Rebuild with new source because of md5sum mismatch.
+
+* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
+- Initial Fedora Extras version.
+- Rebuild for XFCE 4.2.3.
+- disable-static instead of removing .a files.
+
+* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2.fc4.cw
+- Add libxml2 BuildReqs.
+
+* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc4.cw
+- Rebuild for Core 4.
+
+* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc3.cw
+- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Dec 2005 22:33:25 -0000	1.2
+++ .cvsignore	15 Oct 2006 13:16:50 -0000	1.3
@@ -1 +1 @@
-xfce4-datetime-plugin-0.3.1.tar.gz
+xfce4-datetime-plugin-0.4.0.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 13:17:54 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 06:17:54 -0700
Subject: rpms/ngspice import.log,1.6,1.7
Message-ID: <200610151317.k9FDHuYS001759@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1727

Modified Files:
	import.log 
Log Message:
auto-import ngspice-17-7 on branch FC-5 from ngspice-17-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ngspice/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	12 Oct 2006 18:45:59 -0000	1.6
+++ import.log	15 Oct 2006 13:17:54 -0000	1.7
@@ -3,3 +3,4 @@
 ngspice-17-5:HEAD:ngspice-17-5.src.rpm:1157360430
 ngspice-17-6:FC-5:ngspice-17-6.src.rpm:1160678907
 ngspice-17-6:HEAD:ngspice-17-6.src.rpm:1160678959
+ngspice-17-7:FC-5:ngspice-17-7.src.rpm:1160918447



From fedora-extras-commits at redhat.com  Sun Oct 15 13:17:55 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 06:17:55 -0700
Subject: rpms/ngspice/FC-5 ngspice.spec, 1.3,
	1.4 ngspice-rework-17-spinit.patch, 1.1, NONE
Message-ID: <200610151318.k9FDHvcj001764@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1727/FC-5

Modified Files:
	ngspice.spec 
Removed Files:
	ngspice-rework-17-spinit.patch 
Log Message:
auto-import ngspice-17-7 on branch FC-5 from ngspice-17-7.src.rpm


Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/FC-5/ngspice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ngspice.spec	12 Oct 2006 18:45:08 -0000	1.3
+++ ngspice.spec	15 Oct 2006 13:17:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           6%{?dist}
+Release:           7%{?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:            ngspice-rework-17-spinit.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -53,12 +51,12 @@
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
 %{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | \
-sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+cat src/spinit.in.ngspice | sed \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
 > src/spinit.in
 %endif
 
@@ -124,7 +122,6 @@
 %{_libdir}/spice/
 
 
-
 %files doc
 %defattr(-, root, root, -)
 %doc doc/ examples/ Stuarts_Poly_Notes FAQ
@@ -136,6 +133,9 @@
 
 
 %Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-7
+- Fixed src/spinit.in for 64 bit
+
 * Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
 - Testing on 64 bit arch 
 


--- ngspice-rework-17-spinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 13:19:21 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 15 Oct 2006 06:19:21 -0700
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.7,
	1.8
Message-ID: <200610151319.k9FDJNX2001860@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1816

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
cosmetical fix to make rpmlint happy


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-datetime-plugin.spec	15 Oct 2006 13:16:50 -0000	1.7
+++ xfce4-datetime-plugin.spec	15 Oct 2006 13:19:21 -0000	1.8
@@ -7,7 +7,7 @@
 License:	GPL
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://xs4all.nl/~stacium/xfce/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel  >= 4.3.20, libxml2-devel
 BuildRequires:	gettext, perl(XML::Parser), dbus-devel >= 0.22



From fedora-extras-commits at redhat.com  Sun Oct 15 13:32:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 06:32:48 -0700
Subject: rpms/libassetml/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE libassetml-gcompris.patch, 1.1, NONE libassetml.spec, 1.4,
	NONE sources, 1.2, NONE
Message-ID: <200610151332.k9FDWosZ002006@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1990

Added Files:
	dead.package 
Removed Files:
	Makefile libassetml-gcompris.patch libassetml.spec sources 
Log Message:
libassetml was only used by one package: gcompris. And gcompris has just
been updated to 8.1 which no longer uses libassetml. Hence I'm hereby
retiring libassetml. (Note that gcompris and libassetml have the same
upstream, so libassetml is retired upstream too).



--- NEW FILE dead.package ---
libassetml was only used by one package: gcompris. And gcompris has just
been updated to 8.1 which no longer uses libassetml. Hence I'm hereby
retiring libassetml. (Note that gcompris and libassetml have the same
upstream, so libassetml is retired upstream too).


--- Makefile DELETED ---


--- libassetml-gcompris.patch DELETED ---


--- libassetml.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 13:41:52 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 06:41:52 -0700
Subject: rpms/ngspice import.log,1.7,1.8
Message-ID: <200610151341.k9FDfscC002079@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2048

Modified Files:
	import.log 
Log Message:
auto-import ngspice-17-7 on branch devel from ngspice-17-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ngspice/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	15 Oct 2006 13:17:54 -0000	1.7
+++ import.log	15 Oct 2006 13:41:52 -0000	1.8
@@ -4,3 +4,4 @@
 ngspice-17-6:FC-5:ngspice-17-6.src.rpm:1160678907
 ngspice-17-6:HEAD:ngspice-17-6.src.rpm:1160678959
 ngspice-17-7:FC-5:ngspice-17-7.src.rpm:1160918447
+ngspice-17-7:HEAD:ngspice-17-7.src.rpm:1160919932



From fedora-extras-commits at redhat.com  Sun Oct 15 13:41:53 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 06:41:53 -0700
Subject: rpms/ngspice/devel ngspice.spec, 1.3,
	1.4 ngspice-rework-17-spinit.patch, 1.1, NONE
Message-ID: <200610151341.k9FDftxN002083@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ngspice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2048/devel

Modified Files:
	ngspice.spec 
Removed Files:
	ngspice-rework-17-spinit.patch 
Log Message:
auto-import ngspice-17-7 on branch devel from ngspice-17-7.src.rpm


Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ngspice.spec	12 Oct 2006 18:46:00 -0000	1.3
+++ ngspice.spec	15 Oct 2006 13:41:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           6%{?dist}
+Release:           7%{?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:            ngspice-rework-17-spinit.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -53,12 +51,12 @@
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
 %{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | \
-sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+cat src/spinit.in.ngspice | sed \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
 > src/spinit.in
 %endif
 
@@ -124,7 +122,6 @@
 %{_libdir}/spice/
 
 
-
 %files doc
 %defattr(-, root, root, -)
 %doc doc/ examples/ Stuarts_Poly_Notes FAQ
@@ -136,6 +133,9 @@
 
 
 %Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-7
+- Fixed src/spinit.in for 64 bit
+
 * Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
 - Testing on 64 bit arch 
 


--- ngspice-rework-17-spinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 13:50:04 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Sun, 15 Oct 2006 06:50:04 -0700
Subject: fedora-security/audit fc6,1.112,1.113
Message-ID: <200610151350.k9FDo5jS002152@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2130

Modified Files:
	fc6 
Log Message:
Bring up to date with latest rawhide spin; xpdf, openmotif, lha, kon2 have
all been removed.  A couple of bits left to investigate and then make sure
we sync with FC6 final package list



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fc6	12 Oct 2006 22:07:26 -0000	1.112
+++ fc6	15 Oct 2006 13:50:02 -0000	1.113
@@ -1,47 +1,47 @@
-p to date CVE as of CVE email 20061009
-Up to date FC6 as of Test3
-Up to date dist-fc6 rawhide as of 20060929
+Up to date CVE as of CVE email 20061014
+Up to date FC6 as of re20061014.0
 
 ** are items that need attention
 
+CVE-2006-5229 ** openssh
 CVE-2006-5215 ** (X.org, fixed 20060225?)
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
-CVE-2006-5170 VULNERABLE (nss_ldap)
+CVE-2006-5170 VULNERABLE (nss_ldap) **check rawhide version
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 version (kernel, fixed 2.6.15)
-CVE-2006-5072 VULNERABLE (mono) bz#209467
-CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
-CVE-2006-5051 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
-CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18) [in rawhide]
-CVE-2006-4980 VULNERABLE (python) [backport in rawhide]
+CVE-2006-5072 backport (mono)
+CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
+CVE-2006-5051 backport (openssh, fixed 4.4)
+CVE-2006-4997 version (kernel, fixed 2.6.18)
+CVE-2006-4980 backport (python)
 CVE-2006-4925 ignore (openssh) client crash only
-CVE-2006-4924 VULNERABLE (openssh, fixed 4.4) bz#208459 [FC6Blocker]
+CVE-2006-4924 backport (openssh, fixed 4.4)
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4790 VULNERABLE (gnutls, fixed 1.4.4) [backported to 1.4.1-2 in rawhide]
+CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
-CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) bz#206607 [in rawhide]
+CVE-2006-4624 version (mailman, fixed 2.1.9rc1)
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1)
 CVE-2006-4600 version (openldap, fixed 2.3.25)
-CVE-2006-4571 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4571 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4570 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4569 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4568 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4567 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4567 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4566 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4566 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4565 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4565 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
+CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
+CVE-2006-4571 version (firefox, fixed 1.5.0.7)
+CVE-2006-4570 version (thunderbird, fixed 1.5.0.7)
+CVE-2006-4569 version (firefox, fixed 1.5.0.7)
+CVE-2006-4568 version (firefox, fixed 1.5.0.7)
+CVE-2006-4567 version (firefox, fixed 1.5.0.7)
+CVE-2006-4567 version (thunderbird, fixed 1.5.0.7)
+CVE-2006-4566 version (firefox, fixed 1.5.0.7)
+CVE-2006-4566 version (thunderbird, fixed 1.5.0.7)
+CVE-2006-4565 version (firefox, fixed 1.5.0.7)
+CVE-2006-4565 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4561 VULNERABLE (firefox)
-CVE-2006-4538 VULNERABLE (kernel, fixed after 2.6.18-rc6) [in rawhide]
+CVE-2006-4538 version (kernel, fixed after 2.6.18-rc6)
 CVE-2006-4535 version (kernel, fixed 2.6.18-rc6)
 CVE-2006-4507 ignore (libtiff) can't reproduce
 CVE-2006-4486 version (php, fixed 5.1.6)
@@ -56,15 +56,15 @@
 CVE-2006-4434 ignore (sendmail, fixed 8.13.8) not exploitable
 CVE-2006-4433 version (php, fixed 5.1.4)
 CVE-2006-4380 version (mysql, fixed 4.1.13)
-CVE-2006-4343 VULNERABLE (openssl, fixed 0.9.8d) [rawhide]
-CVE-2006-4340 VULNERABLE (nss, fixed 3.11.3) bz#206608 [in rawhide]
+CVE-2006-4343 backport (openssl, fixed 0.9.8d)
+CVE-2006-4340 version (nss, fixed 3.11.3)
 CVE-2006-4339 backport (openssl, fixed 0.9.8c)
 CVE-2006-4339 backport (openssl097)
-CVE-2006-4338 VULNERABLE (gzip) [in rawhide]
-CVE-2006-4337 VULNERABLE (gzip) [in rawhide]
-CVE-2006-4336 VULNERABLE (gzip) [in rawhide]
-CVE-2006-4335 VULNERABLE (gzip) [in rawhide]
-CVE-2006-4334 VULNERABLE (gzip) [in rawhide]
+CVE-2006-4338 backport (gzip)
+CVE-2006-4337 backport (gzip)
+CVE-2006-4336 backport (gzip)
+CVE-2006-4335 backport (gzip)
+CVE-2006-4334 backport (gzip)
 CVE-2006-4433 version (php, fixed 5.1.4)
 CVE-2006-4333 version (wireshark, fixed 0.99.3)
 CVE-2006-4332 version (wireshark, fixed 0.99.3)
@@ -72,8 +72,8 @@
 CVE-2006-4330 version (wireshark, fixed 0.99.3)
 CVE-2006-4310 ignore (firefox) crash only
 CVE-2006-4262 backport (cscope) 
-CVE-2006-4253 VULNERABLE (firefox, fixed 1.5.0.7) [in rawhide]
-CVE-2006-4253 VULNERABLE (thunderbird, fixed 1.5.0.7) [in rawhide]
+CVE-2006-4253 version (firefox, fixed 1.5.0.7)
+CVE-2006-4253 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203428
 CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203434
 CVE-2006-4146 backport (gdb)
@@ -120,16 +120,16 @@
 CVE-2006-3743 backport (ImageMagick)
 CVE-2006-3742 backport (kdebase) inside kdebase-3.5.4-2-redhat.patch
 CVE-2006-3741 ignore (kernel, fixed 2.6.18-rc7) ia64 only
-CVE-2006-3740 VULNERABLE (libXfont, fixed 1.2.2) bz#206609 [in rawhide]
-CVE-2006-3739 VULNERABLE (libXfont, fixed 1.2.2) bz#206609 [in rawhide]
-CVE-2006-3738 VULNERABLE (openssl, fixed 0.9.8d) [in rawhide]
+CVE-2006-3740 version (libXfont, fixed 1.2.2)
+CVE-2006-3739 version (libXfont, fixed 1.2.2)
+CVE-2006-3738 backport (openssl, fixed 0.9.8d)
 CVE-2006-3731 ignore (firefox) just a user complicit crash
 CVE-2006-3694 version (ruby, fixed 1.8.5)
 CVE-2006-3677 version (firefox, fixed 1.5.0.5)
 CVE-2006-3677 version (thunderbird, fixed 1.5.0.5)
 CVE-2006-3672 ignore (konqueror) just a crash
 CVE-2006-3665 ignore (squirrelmail) don't enable register_globals!
-CVE-2006-3636 VULNERABLE (mailman, fixed 2.1.9) bz#206607 [in rawhide]
+CVE-2006-3636 version (mailman, fixed 2.1.9)
 CVE-2006-3634 ignore (kernel, fixed 2.6.17.8) s390 only
 CVE-2006-3632 version (wireshark, fixed 0.99.2)
 CVE-2006-3631 version (wireshark, fixed 0.99.2)
@@ -177,9 +177,9 @@
 CVE-2006-3016 version (php, fixed 5.1.3)
 CVE-2006-3011 ignore (php) safe mode isn't safe
 CVE-2006-3005 ignore (libjpeg) not a vuln
-CVE-2006-2941 VULNERABLE (mailman, fixed 2.1.9) bz#206607 [in rawhide]
-CVE-2006-2940 VULNERABLE (openssl, fixed 0.9.8d) [in rawhide]
-CVE-2006-2937 VULNERABLE (openssl, fixed 0.9.8d) [in rawhide]
+CVE-2006-2941 version (mailman, fixed 2.1.9)
+CVE-2006-2940 backport (openssl, fixed 0.9.8d)
+CVE-2006-2937 backport (openssl, fixed 0.9.8d)
 CVE-2006-2936 version (kernel, fixed 2.6.17.7)
 CVE-2006-2935 version (kernel, fixed 2.6.17.7)
 CVE-2006-2934 version (kernel, fixed 2.6.17.3)
@@ -359,7 +359,6 @@
 CVE-2006-1335 version (gnome-screensaver, fixed 2.14)
 CVE-2006-1296 version (beagle, fixed 0.2.4)
 CVE-2006-1273 ignore (firefox) this issue only affects IE
-CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues
 CVE-2006-1242 version (kernel, fixed 2.6.16.1)
 CVE-2006-1174 version (shadow-utils, fixed 4.0.3)
 CVE-2006-1173 version (sendmail, fixed 8.13.7)
@@ -417,7 +416,6 @@
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 version (fetchmail, fixed 6.3.2)
 CVE-2006-0301 version (poppler, fixed 0.4.5)
-CVE-2006-0301 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2006-0301 version (kdegraphics, fixed 3.5.2)
 CVE-2006-0300 version (tar, fixed 1.15.90 at least)
 CVE-2006-0299 version (thunderbird, fixed 1.5)
@@ -487,7 +485,6 @@
 CVE-2005-4153 version (mailman)
 CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html
 CVE-2005-4077 version (curl, fixed 7.15.1)
-CVE-2005-3964 backport (openmotif) from changelog
 CVE-2005-3962 version (perl, fixed 5.8.8)
 CVE-2005-3883 version (php, fixed 5.1.1 at least)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
@@ -515,27 +512,22 @@
 CVE-2005-3629 version (initscripts, fixed 8.29 at least)
 CVE-2005-3628 version (poppler, fixed 0.4.4)
 CVE-2005-3628 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3628 version (cups, fixed 1.2.0)
 CVE-2005-3627 version (poppler, fixed 0.4.4)
 CVE-2005-3627 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3627 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3627 backport (tetex)
 CVE-2005-3627 version (cups, fixed 1.2.0)
 CVE-2005-3626 version (poppler, fixed 0.4.4)
 CVE-2005-3626 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3626 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3626 backport (tetex)
 CVE-2005-3626 version (cups, fixed 1.2.0)
 CVE-2005-3625 version (poppler, fixed 0.4.4)
 CVE-2005-3625 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3625 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3625 backport (tetex)
 CVE-2005-3625 version (cups, fixed 1.2.0)
 CVE-2005-3624 version (poppler, fixed 0.4.4)
 CVE-2005-3624 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3624 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3624 backport (tetex)
 CVE-2005-3624 version (cups, fixed 1.2.0)
 CVE-2005-3623 version (kernel, fixed 2.6.14.5)
@@ -577,17 +569,14 @@
 CVE-2005-3241 version (wireshark, fixed 0.10.13)
 CVE-2005-3193 version (poppler, fixed 0.4.4)
 CVE-2005-3193 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3193 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3193 version (cups, fixed 1.2.0)
 CVE-2005-3192 version (poppler, fixed 0.4.4)
 CVE-2005-3192 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3192 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3192 version (cups, fixed 1.2.0)
 CVE-2005-3191 version (poppler, fixed 0.4.4)
 CVE-2005-3191 version (kdegraphics, fixed 3.5.1)
-CVE-2005-3191 backport (xpdf) xpdf-3.01pl2.patch
 CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3191 version (cups, fixed 1.2.0)
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
@@ -736,7 +725,6 @@
 CVE-2005-2100 version (kernel, not 2.6) not upstream only RHEL4
 CVE-2005-2099 version (kernel, fixed 2.6.12.5)
 CVE-2005-2098 version (kernel, fixed 2.6.12.5)
-CVE-2005-2097 version (xpdf, fixed 3.0.1)
 CVE-2005-2097 version (cups)
 CVE-2005-2096 version (rpm, fixed 4.4.2)
 CVE-2005-2096 backport (zlib, fixed 1.2.2.4)
@@ -901,7 +889,6 @@
 CVE-2005-0627 version (qt, fixed 3.3.4)
 CVE-2005-0626 version (squid, fixed 2.5.STABLE10)
 CVE-2005-0605 version (libXpm, fixed 3.5.4 at least)
-CVE-2005-0605 backport (openmotif)
 CVE-2005-0602 ignore (unzip, fixed 5.52) this is really expected behaviour
 CVE-2005-0596 version (php, fixed 5.0)
 CVE-2005-0593 version (firefox)
@@ -974,7 +961,6 @@
 CVE-2005-0209 version (kernel, fixed 2.6.11)
 CVE-2005-0208 version (gaim, fixed 1.1.4)
 CVE-2005-0207 version (kernel, fixed 2.6.11)
-CVE-2005-0206 version (xpdf) only bad patch for 2004-0888
 CVE-2005-0205 version (kdenetwork, not 3.3+)
 CVE-2005-0204 version (kernel) didn't affect upstream
 CVE-2005-0202 version (mailman, fixed 2.1.6)
@@ -1030,7 +1016,6 @@
 CVE-2005-0077 version (perl-DBI, fixed 1.48 at least)
 CVE-2005-0075 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0069 version (vim, fixed 7.0 at least)
-CVE-2005-0064 version (xpdf, fixed 3.0.1)
 CVE-2005-0064 version (tetex, fixed 3.0)
 CVE-2005-0064 version (kdegraphics, not 3.4)
 CVE-2005-0064 version (cups, fixed 1.2.2)
@@ -1152,7 +1137,6 @@
 CVE-2004-1139 version (wireshark, fixed 0.10.8)
 CVE-2004-1138 version (vim, fixed 6.3)
 CVE-2004-1137 version (kernel, fixed 2.6.10)
-CVE-2004-1125 version (xpdf, fixed 3.0.1)
 CVE-2004-1125 version (tetex, at least 3.0)
 CVE-2004-1125 version (kdegraphics, not 3.4)
 CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)
@@ -1223,7 +1207,6 @@
 CVE-2004-0923 version (cups, fixed 1.2.22)
 CVE-2004-0918 version (squid, fixed 2.4.STABLE7)
 CVE-2004-0914 version (xorg-x11, fixed after 6.8.1)
-CVE-2004-0914 backport (openmotif)
 CVE-2004-0909 version (thunderbird)
 CVE-2004-0909 version (firefox)
 CVE-2004-0907 version (thunderbird)
@@ -1231,8 +1214,6 @@
 CVE-2004-0906 version (thunderbird)
 CVE-2004-0906 version (firefox)
 CVE-2004-0891 version (gaim, fixed 1.0.2)
-CVE-2004-0889 version (xpdf, fixed 3.0.1)
-CVE-2004-0888 version (xpdf, fixed 3.0.1)
 CVE-2004-0888 version (tetex, fixed 3.0)
 CVE-2004-0888 version (kdegraphics, not 3.4)
 CVE-2004-0888 version (cups)
@@ -1285,8 +1266,6 @@
 CVE-2004-0779 version (firefox)
 CVE-2004-0778 version (cvs, fixed 1.11.17)
 CVE-2004-0772 version (krb5, fixed after 1.2.8)
-CVE-2004-0771 backport (lha) changelog
-CVE-2004-0769 backport (lha) changelog
 CVE-2004-0768 version (libpng, fixed 1.2.6)
 CVE-2004-0755 version (ruby, fixed 1.8.1)
 CVE-2004-0754 version (gaim, fixed 0.82)
@@ -1298,17 +1277,13 @@
 CVE-2004-0748 version (httpd, not 2.2)
 CVE-2004-0747 version (httpd, not 2.2)
 CVE-2004-0746 version (kde, fixed 3.3)
-CVE-2004-0745 backport (lha) changelog
 CVE-2004-0721 version (kdelibs, fixed 3.3)
 CVE-2004-0700 version (httpd, not 2.2)
-CVE-2004-0694 backport (lha) changelog
 CVE-2004-0693 version (qt, fixed 3.3.3)
 CVE-2004-0692 version (qt, fixed 3.3.3)
 CVE-2004-0691 version (qt, fixed 3.3.3)
 CVE-2004-0690 version (kdelibs, fixed after 3.2.3)
 CVE-2004-0689 version (kdelibs, fixed 3.3.0)
-CVE-2004-0688 version (openmotif)
-CVE-2004-0687 version (openmotif)
 CVE-2004-0686 version (samba, fixed 3.0.6)
 CVE-2004-0685 version (kernel, not 2.6)
 CVE-2004-0658 ignore (kernel) not a security issue
@@ -1392,8 +1367,6 @@
 CVE-2004-0365 version (wireshark, fixed 0.10.3)
 CVE-2004-0263 version (php, fixed 4.3.5)
 CVE-2004-0256 version (libtool, fixed 1.5.2)
-CVE-2004-0235 backport (lha) changelog
-CVE-2004-0234 backport (lha) changelog
 CVE-2004-0233 version (libutempter, fixed 0.5.5)
 CVE-2004-0232 version (mc, fixed 4.6.0)
 CVE-2004-0231 version (mc, fixed 4.6.0)
@@ -1577,7 +1550,6 @@
 CVE-2003-0459 version (kdelibs, not 3.2)
 CVE-2003-0455 version (ImageMagick)
 CVE-2003-0442 version (php, fixed 4.3.2)
-CVE-2003-0434 version (xpdf, fixed 2.02pl1)
 CVE-2003-0432 version (wireshark, fixed after 0.9.12)
 CVE-2003-0431 version (wireshark, fixed after 0.9.12)
 CVE-2003-0430 version (wireshark, fixed after 0.9.12)
@@ -1740,7 +1712,6 @@
 CVE-2002-1393 version (kde, fixed 3.0.5a)
 CVE-2002-1392 version (mgetty, fixed 1.1.29)
 CVE-2002-1391 version (mgetty, fixed 1.1.29)
-CVE-2002-1384 version (xpdf, fixed 2.02)
 CVE-2002-1384 version (cups, fixed 1.1.18)
 CVE-2002-1383 version (cups, fixed 1.1.18)
 CVE-2002-1380 version (kernel, not 2.6)
@@ -1794,7 +1765,6 @@
 CVE-2002-1160 version (pam) was our config
 CVE-2002-1157 version (httpd, not 2.0)
 CVE-2002-1156 version (httpd, fixed 2.0.43)
-CVE-2002-1155 backport (kon2) kon2-0.3.9b-bufover-fix.patch
 CVE-2002-1152 version (kdenetwork, fixed 3.0.3)
 CVE-2002-1151 version (kdenetwork, fixed 3.0.3a)
 CVE-2002-1148 version (tomcat, fixed 4.0.5)



From fedora-extras-commits at redhat.com  Sun Oct 15 14:05:51 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Sun, 15 Oct 2006 07:05:51 -0700
Subject: fedora-security/audit fc5,1.357,1.358 fc6,1.113,1.114
Message-ID: <200610151405.k9FE5qme005146@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5126

Modified Files:
	fc5 fc6 
Log Message:
Deal with the outstanding fc6 issues



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- fc5	12 Oct 2006 22:07:26 -0000	1.357
+++ fc5	15 Oct 2006 14:05:49 -0000	1.358
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5229 ** openssh
 CVE-2006-5215 ** (X.org, fixed 20060225?)
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fc6	15 Oct 2006 13:50:02 -0000	1.113
+++ fc6	15 Oct 2006 14:05:49 -0000	1.114
@@ -3,13 +3,17 @@
 
 ** are items that need attention
 
-CVE-2006-5229 ** openssh
-CVE-2006-5215 ** (X.org, fixed 20060225?)
-CVE-2006-5214 ** (X.org, fixed 20060225?)
+CVE-2006-5229 ignore (openssh) not reproduced
+CVE-2006-5215 version (xorg-x11-xdm)
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
+CVE-2006-5215 VULNERABLE (kdebase)
+CVE-2006-5214 version (xorg-x11-xdm)
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit)
+CVE-2006-5214 VULNERABLE (kdebase)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
-CVE-2006-5170 VULNERABLE (nss_ldap) **check rawhide version
+CVE-2006-5170 VULNERABLE (nss_ldap, fixed 183)
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
 CVE-2006-5158 version (kernel, fixed 2.6.15)



From fedora-extras-commits at redhat.com  Sun Oct 15 14:36:32 2006
From: fedora-extras-commits at redhat.com (Ahmed Kamal ElDin (ahmed))
Date: Sun, 15 Oct 2006 07:36:32 -0700
Subject: common - Imported sources
Message-ID: <200610151436.k9FEaWxH005320@cvs-int.fedora.redhat.com>

Author: ahmed

Update of /cvs/fedora/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5305

Log Message:
Importing syncmail with utf8 support

Status:

Vendor Tag:	AhmedKamal
Release Tags:	start
		
N common/syncmail_utf8.py
N common/common/syncmail_utf8.py

No conflicts created by this import




From fedora-extras-commits at redhat.com  Sun Oct 15 14:41:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 07:41:12 -0700
Subject: rpms/gcompris/devel gcompris-8.0-fullscreen.patch, NONE,
	1.1 gcompris-8.0-silence.patch, NONE,
	1.1 gcompris-8.0-warn.patch, NONE, 1.1 gcompris-8.1-icon.patch,
	NONE, 1.1 .cvsignore, 1.3, 1.4 gcompris.spec, 1.14, 1.15 sources,
	1.3, 1.4 U006A.ogg, 1.1, NONE gcompris-7.4-xf86vidmode.patch,
	1.4, NONE gcompris-7.4-xf86vidmode2.patch, 1.1,
	NONE gcompris-7.4-xf86vidmode3.patch, 1.1,
	NONE gcompris-click_on_letter.patch, 1.1,
	NONE gcompris-electric.patch, 1.1, NONE gcompris-nl.patch, 1.1,
	NONE gcompris-sys-assetml.patch, 1.1, NONE
Message-ID: <200610151441.k9FEfEUx005386@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.0-fullscreen.patch gcompris-8.0-silence.patch 
	gcompris-8.0-warn.patch gcompris-8.1-icon.patch 
Removed Files:
	U006A.ogg gcompris-7.4-xf86vidmode.patch 
	gcompris-7.4-xf86vidmode2.patch 
	gcompris-7.4-xf86vidmode3.patch gcompris-click_on_letter.patch 
	gcompris-electric.patch gcompris-nl.patch 
	gcompris-sys-assetml.patch 
Log Message:
* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.1-1
- New upstream release 8.1
- Drop most patches (integrated upstream)


gcompris-8.0-fullscreen.patch:

--- NEW FILE gcompris-8.0-fullscreen.patch ---
--- gcompris-8.0/src/gcompris/board_config.c~	2006-10-15 12:49:27.000000000 +0200
+++ gcompris-8.0/src/gcompris/board_config.c	2006-10-15 12:49:27.000000000 +0200
@@ -161,6 +161,11 @@
   /* init static values or callbacks */
   Confcallback = callback;
   hash_conf = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+  
+  /* Creating a config window will cause our main window to loose focus,
+     this tells the main window to ignore the next focus out event (and thus
+     stay in fullscreen mode if we're fullscreen). */
+  gc_ignore_next_focus_out();
 
   /* main configuration window */
   conf_window = \
--- gcompris-8.0/src/gcompris/gcompris.h~	2006-10-15 12:47:22.000000000 +0200
+++ gcompris-8.0/src/gcompris/gcompris.h	2006-10-15 12:47:22.000000000 +0200
@@ -114,6 +114,7 @@
 /* General */
 GnomeCanvas     *gc_get_canvas(void);
 GtkWidget	*gc_get_window(void);
+void		gc_ignore_next_focus_out(void);
 
 const gchar	*gc_locale_get(void);
 void		 gc_locale_set(gchar *locale);
--- gcompris-8.0/src/gcompris/gcompris.c~	2006-10-15 12:47:24.000000000 +0200
+++ gcompris-8.0/src/gcompris/gcompris.c	2006-10-15 12:47:24.000000000 +0200
@@ -247,7 +247,8 @@
   int window_x;
   int window_y;
   gboolean fullscreen_active;
-} XF86VidModeData = { { 0 }, { 0 }, 0, 0, 0, 0, FALSE };
+  int ignore_focus_out;
+} XF86VidModeData = { { 0 }, { 0 }, 0, 0, 0, 0, FALSE, 0 };
 
 static void xf86_vidmode_init( void );
 static void xf86_vidmode_set_fullscreen( int state );
@@ -394,6 +395,12 @@
   return window;
 }
 
+void gc_ignore_next_focus_out()
+{
+#ifdef XF86_VIDMODE
+  XF86VidModeData.ignore_focus_out++;
+#endif
+}
 
 GnomeCanvasItem *gc_set_background(GnomeCanvasGroup *parent, gchar *file)
 {
@@ -1325,8 +1332,11 @@
 static gint xf86_focus_changed(GtkWindow *window,
   GdkEventFocus *event, gpointer param)
 {
-  printf("focus change %d\n", (int)event->in);
-  if (properties->fullscreen)
+  printf("focus change %d, ignore: %d\n", (int)event->in,
+    XF86VidModeData.ignore_focus_out);
+  if (!event->in && XF86VidModeData.ignore_focus_out)
+    XF86VidModeData.ignore_focus_out--;
+  else if (properties->fullscreen)
     xf86_vidmode_set_fullscreen(event->in);
   /* Act as if we aren't there / aren't hooked up */
   return FALSE;

gcompris-8.0-silence.patch:

--- NEW FILE gcompris-8.0-silence.patch ---
--- gcompris-8.0/src/gcompris/gcompris.c~	2006-10-15 13:13:02.000000000 +0200
+++ gcompris-8.0/src/gcompris/gcompris.c	2006-10-15 13:13:02.000000000 +0200
@@ -1265,8 +1265,6 @@
   if (properties->noxf86vm || XF86VidModeData.fullscreen_active == state)
     return;
 
-  printf("setfullscreen %d\n", state);
-
   if (state)
     {
       if (!XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER(
@@ -1314,9 +1312,6 @@
   XF86VidModeData.window_x = event->x;
   XF86VidModeData.window_y = event->y;
 
-  printf("configure: %dx%d, fullscreen_active: %d\n", event->x, event->y,
-    (int)XF86VidModeData.fullscreen_active);
-
   if(XF86VidModeData.fullscreen_active) {
     if (gdk_pointer_grab(event->window, TRUE, 0, event->window, NULL,
           GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS)
@@ -1332,8 +1327,6 @@
 static gint xf86_focus_changed(GtkWindow *window,
   GdkEventFocus *event, gpointer param)
 {
-  printf("focus change %d, ignore: %d\n", (int)event->in,
-    XF86VidModeData.ignore_focus_out);
   if (!event->in && XF86VidModeData.ignore_focus_out)
     XF86VidModeData.ignore_focus_out--;
   else if (properties->fullscreen)

gcompris-8.0-warn.patch:

--- NEW FILE gcompris-8.0-warn.patch ---
--- gcompris-8.0/src/boards/chess.c~	2006-10-15 10:27:49.000000000 +0200
+++ gcompris-8.0/src/boards/chess.c	2006-10-15 10:27:49.000000000 +0200
@@ -1001,7 +1001,7 @@
 				   &len,
 				   &err);
 
-  g_warning("g_io_channel_read_line len=%d", len);
+  g_warning("g_io_channel_read_line len=%d", (int)len);
   if(status == G_IO_STATUS_ERROR)
     {
       g_warning("g_io_channel_read_chars error=%s",
--- gcompris-8.0/src/gcompris/board_config.c~	2006-10-15 12:00:50.000000000 +0200
+++ gcompris-8.0/src/gcompris/board_config.c	2006-10-15 12:00:50.000000000 +0200
@@ -194,7 +194,7 @@
   GcomprisProperties *properties = gc_prop_get();
   if (properties->fullscreen && !properties->noxf86vm)
     if (gdk_pointer_grab(gc_get_window()->window, TRUE, 0,
-			 GDK_WINDOW(gc_get_window()), NULL, GDK_CURRENT_TIME) !=
+			 gc_get_window()->window, NULL, GDK_CURRENT_TIME) !=
 	GDK_GRAB_SUCCESS)
       g_warning("Pointer grab failed");
 

gcompris-8.1-icon.patch:

--- NEW FILE gcompris-8.1-icon.patch ---
--- gcompris-8.1/src/gcompris/gcompris.c~	2006-10-15 14:44:14.000000000 +0200
+++ gcompris-8.1/src/gcompris/gcompris.c	2006-10-15 14:44:14.000000000 +0200
@@ -625,7 +625,7 @@
    * Set an icon for gcompris
    * ------------------------
    */
-  icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
+  icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL);
   if (!g_file_test (icon_file, G_FILE_TEST_EXISTS)) {
       /* Now check if this file is on the net */
       icon_file = gc_net_get_url_from_file("gcompris.png", NULL);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2006 10:32:43 -0000	1.3
+++ .cvsignore	15 Oct 2006 14:41:12 -0000	1.4
@@ -1,2 +1 @@
-gcompris-7.4.tar.gz
-gcompris-africa-patch.tar.gz
+gcompris-8.1.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gcompris.spec	28 Aug 2006 11:26:56 -0000	1.14
+++ gcompris.spec	15 Oct 2006 14:41:12 -0000	1.15
@@ -1,29 +1,23 @@
 Name:           gcompris
-Version:        7.4
-Release:        14%{?dist}
+Version:        8.1
+Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        gcompris.6
-Source2:        U006A.ogg
-Source3:        gcompris-africa-patch.tar.gz
-Patch1:         gcompris-sys-assetml.patch
-Patch2:         gcompris-nl.patch
-Patch3:         gcompris-electric.patch
-Patch4:         gcompris-click_on_letter.patch
-Patch5:         gcompris-7.4-xf86vidmode.patch
-Patch6:         gcompris-7.4-xf86vidmode2.patch
-Patch7:         gcompris-7.4-xf86vidmode3.patch
+Patch0:         gcompris-8.0-warn.patch
+Patch1:         gcompris-8.0-fullscreen.patch
+Patch2:         gcompris-8.0-silence.patch
+Patch3:         gcompris-8.1-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:  libgnomeui-devel sqlite-devel libassetml-devel python-devel
+Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
-Buildrequires:  xorg-x11-proto-devel
-Buildrequires:  gnome-python2-canvas python-sqlite2 texinfo texi2html
+Buildrequires:  xorg-x11-proto-devel python-sqlite2 texinfo texi2html
 Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
-Requires:       gnuchess gnucap tuxpaint gcompris-flags
-Requires:       gnome-python2-canvas python-sqlite2
+Requires:       gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
+Requires:       pygtk2 python-sqlite2
 Requires:       %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -82,114 +76,108 @@
 Developmental files for the core-engine library of GCompris
 
 
+%package sound-cs
+Summary:        GCompris voices in Tsjech
+Group:          Amusements/Games
+
+%description sound-cs
+Voice samples for the GCompris games in Tsjech.
+
+
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-da
-Voice samples for the GCompris games in Danish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Danish.
 
 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-de
-Voice samples for the GCompris games in German, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in German.
 
 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-en
-Voice samples for the GCompris games in English, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in English.
 
 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-es
-Voice samples for the GCompris games in Spanish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Spanish.
 
 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-fi
-Voice samples for the GCompris games in Finish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Finish.
 
 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-fr
-Voice samples for the GCompris games in French, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in French.
 
 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-hu
-Voice samples for the GCompris games in Hungarian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Hungarian.
 
 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-it
-Voice samples for the GCompris games in Italian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Italian.
+
+
+%package sound-mr
+Summary:        GCompris voices in Indian Marathi
+Group:          Amusements/Games
+
+%description sound-mr
+Voice samples for the GCompris games in Indian Marathi.
 
 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-nl
-Voice samples for the GCompris games in Dutch, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Dutch.
 
 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-pt
-Voice samples for the GCompris games in Portuguese, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Portuguese.
 
 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-ru
-Voice samples for the GCompris games in Russian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Russian.
 
 
 %package sound-sv
@@ -197,8 +185,15 @@
 Group:          Amusements/Games
 
 %description sound-sv
-Voice samples for the GCompris games in Swedish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Swedish.
+
+
+%package sound-tr
+Summary:        GCompris voices in Turk
+Group:          Amusements/Games
+
+%description sound-tr
+Voice samples for the GCompris games in Turk.
 
 
 %package sound-eu
@@ -206,8 +201,7 @@
 Group:          Amusements/Games
 
 %description sound-eu
-Voice samples for the GCompris games in Basque, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Basque.
 
 
 %package flags
@@ -215,56 +209,23 @@
 Group:          Amusements/Games
 
 %description flags
-Country flags for use with GCompris (60x40 PNG), these come with an assetml
-description so they could potentially be used by other packages.
+Country flags for use with GCompris (60x40 PNG).
 
 
 %prep
 %setup -q
-%patch1 -p1 -z .sysassetml -E
-# no backup files for this patch, otherwise they get installed under /usr/share
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1 -z .electric
-%patch4 -p1 -z .click_on_letter
-%patch5 -p1 -z .xf86vm
-%patch6 -p1 -z .xf86vm2
-%patch7 -p1 -z .xf86vm3
+%patch3 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
-# fix gnome.canvas deprecation warnings
-for i in src/boards/python.c `find src/boards/python -name "*.py"`; do
-   %{__sed} -i 's/gnome\.canvas/gnomecanvas/g' $i
-done
-# fix up broken dutch alphabet sounds
-pushd boards/sounds/nl/alphabet
-for i in U007{B..F}.ogg; do
-  mv $i `echo $i|%{__sed} s/7/6/`
-done
-cp %{SOURCE2} .
-popd
-# fix up missing dutch "ok zo" sound
-pushd boards/sounds/nl/misc
-cp ok.ogg check_answer.ogg
-popd
-# fixup african maps with files from CVS (BZ 197758)
-tar xfz %{SOURCE3}
-# these are no longer used
-rm boards/geography/africa/north_africa.xcf \
-  boards/geography/afrique/burundi.png \
-  boards/geography/afrique/djibouti.png \
-  boards/geography/afrique/equatorial_guinea.png \
-  boards/geography/afrique/gambia.png \
-  boards/geography/afrique/guinea_bissau.png \
-  boards/geography/afrique/lesotho.png \
-  boards/geography/afrique/rwanda.png \
-  boards/geography/afrique/sierra_leone.png \
-  boards/geography/afrique/swaziland.png
 
 
 %build
 # The configure check for python-gnome.canvas fails without X running,
 # --enable-py-build-only works around this
-%configure --enable-py-build-only
+%configure --enable-py-build-only --enable-gnet
 # we can't use %%{?_smp_mflags} because that breaks compilation!
 make 
 # Fixup the desktop files a bit, we don't use a patch because that breaks
@@ -353,6 +314,7 @@
 %{_datadir}/gcompris/boards/l*
 %{_datadir}/gcompris/boards/m*
 %{_datadir}/gcompris/boards/n*
+%{_datadir}/gcompris/boards/o*
 %{_datadir}/gcompris/boards/p*
 %{_datadir}/gcompris/boards/r*
 %{_datadir}/gcompris/boards/s*.xml
@@ -365,6 +327,7 @@
 %{_datadir}/gcompris/boards/sounds/chronos
 %{_datadir}/gcompris/boards/sounds/LuneRouge
 %{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE
+%{_datadir}/gcompris/boards/sounds/README
 %{_datadir}/gcompris/boards/submarine
 %{_datadir}/gcompris/boards/t*
 %{_datadir}/gcompris/boards/w*
@@ -385,9 +348,15 @@
 %{_libdir}/libgcompris-1.so
 %{_libdir}/pkgconfig/libgcompris-1.0.pc
 
+%files sound-cs
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/cs
+
 %files sound-da
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_da.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -395,7 +364,6 @@
 
 %files sound-de
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_de.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -403,7 +371,6 @@
 
 %files sound-en
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_en.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -411,7 +378,6 @@
 
 %files sound-es
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_es.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -419,7 +385,6 @@
 
 %files sound-fi
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_fi.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -427,7 +392,6 @@
 
 %files sound-fr
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_fr.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -435,7 +399,6 @@
 
 %files sound-hu
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_hu.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -443,15 +406,20 @@
 
 %files sound-it
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_it.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/it
 
+%files sound-mr
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/mr
+
 %files sound-nl
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_nl.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -459,15 +427,14 @@
 
 %files sound-pt
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_pt.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/pt
+%{_datadir}/gcompris/boards/sounds/pt_BR
 
 %files sound-ru
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_ru.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -475,15 +442,20 @@
 
 %files sound-sv
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_sv.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/sv
 
+%files sound-tr
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/tr
+
 %files sound-eu
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_eu.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -491,13 +463,16 @@
 
 %files flags
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_flags.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %{_datadir}/gcompris/boards/flags
 
 
 %changelog
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.1-1
+- New upstream release 8.1
+- Drop most patches (integrated upstream)
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-14
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2006 10:32:43 -0000	1.3
+++ sources	15 Oct 2006 14:41:12 -0000	1.4
@@ -1,2 +1 @@
-d80e55da21170a98d671c98b3e582cc3  gcompris-7.4.tar.gz
-bc3d9ba72b4dd9742859ec6b90d12056  gcompris-africa-patch.tar.gz
+439b70411ccdbd99c6391d6bfb5e6fb6  gcompris-8.1.tar.gz


--- U006A.ogg DELETED ---


--- gcompris-7.4-xf86vidmode.patch DELETED ---


--- gcompris-7.4-xf86vidmode2.patch DELETED ---


--- gcompris-7.4-xf86vidmode3.patch DELETED ---


--- gcompris-click_on_letter.patch DELETED ---


--- gcompris-electric.patch DELETED ---


--- gcompris-nl.patch DELETED ---


--- gcompris-sys-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 14:52:07 2006
From: fedora-extras-commits at redhat.com (Ahmed Kamal ElDin (ahmed))
Date: Sun, 15 Oct 2006 07:52:07 -0700
Subject: common/common syncmail_utf8.py,1.1.1.1,NONE
Message-ID: <200610151452.k9FEq74W005547@cvs-int.fedora.redhat.com>

Author: ahmed

Update of /cvs/fedora/common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5531

Removed Files:
	syncmail_utf8.py 
Log Message:
Cleaning unneeded files



--- syncmail_utf8.py DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 15:08:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 08:08:23 -0700
Subject: rpms/gcompris/devel gcompris.spec,1.15,1.16
Message-ID: <200610151508.k9FF8POq008543@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8526

Modified Files:
	gcompris.spec 
Log Message:
sigh, gcompris no longer uses gnome-python, but the stupid configure script still checks for it, so BR it for now


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcompris.spec	15 Oct 2006 14:41:12 -0000	1.15
+++ gcompris.spec	15 Oct 2006 15:08:23 -0000	1.16
@@ -14,8 +14,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
-Buildrequires:  xorg-x11-proto-devel python-sqlite2 texinfo texi2html
-Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
+Buildrequires:  gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html
+Buildrequires:  texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
 Requires:       gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
 Requires:       pygtk2 python-sqlite2
 Requires:       %{name}-libs = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sun Oct 15 15:48:17 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:48:17 -0700
Subject: rpms/crystal import.log,1.6,1.7
Message-ID: <200610151548.k9FFmJn0008960@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/crystal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8925

Modified Files:
	import.log 
Log Message:
auto-import crystal-1.0.2-1 on branch FC-5 from crystal-1.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crystal/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	2 Sep 2006 10:27:19 -0000	1.6
+++ import.log	15 Oct 2006 15:48:17 -0000	1.7
@@ -3,3 +3,4 @@
 crystal-1_0_1-2:FC-4:crystal-1.0.1-2.src.rpm:1151412331
 crystal-1_0_1-2:FC-5:crystal-1.0.1-2.src.rpm:1151412584
 crystal-1_0_1-3:HEAD:crystal-1.0.1-3.src.rpm:1157193059
+crystal-1_0_2-1:FC-5:crystal-1.0.2-1.src.rpm:1160927517



From fedora-extras-commits at redhat.com  Sun Oct 15 15:48:18 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:48:18 -0700
Subject: rpms/crystal/FC-5 .cvsignore, 1.2, 1.3 crystal.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610151548.k9FFmKAk008967@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/crystal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8925/FC-5

Modified Files:
	.cvsignore crystal.spec sources 
Log Message:
auto-import crystal-1.0.2-1 on branch FC-5 from crystal-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crystal/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 15:26:44 -0000	1.2
+++ .cvsignore	15 Oct 2006 15:48:18 -0000	1.3
@@ -1 +1 @@
-13969-crystal-1.0.1.tar.bz2
+13969-crystal-1.0.2.tar.bz2


Index: crystal.spec
===================================================================
RCS file: /cvs/extras/rpms/crystal/FC-5/crystal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crystal.spec	27 Jun 2006 12:48:40 -0000	1.2
+++ crystal.spec	15 Oct 2006 15:48:18 -0000	1.3
@@ -1,23 +1,23 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 %{?!theme:%define theme %{name}}
 
-Name:  	 crystal
-Version: 1.0.1
-Release: 2%{?dist}
-Summary: KDE window decoration
-
-License: GPL
-URL:	 http://www.kde-look.org/content/show.php?content=13969
-Source:	 http://www.kde-look.org/content/files/13969-%{name}-%{version}.tar.bz2
-Group: 	 User Interface/Desktops
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdebase-devel >= 6:3.5, qt-devel >= 3.3
-Requires: kdebase
+Name:          crystal
+Version:       1.0.2
+Release:       1%{?dist}
+Summary:       KDE window decoration
+
+License:       GPL
+URL:           http://www.kde-look.org/content/show.php?content=13969
+Source:        http://www.kde-look.org/content/files/13969-%{name}-%{version}.tar.bz2
+Group:         User Interface/Desktops
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: kdebase-devel >= 6:3.5
+Requires:      kdebase
 
 %description
-Crystal is a kwin window decoration theme, which offers you (pseudo) 
-TRANSPARENT titlebar, buttons and borders. It also has some little 
+Crystal is a kwin window decoration theme, which offers you (pseudo)
+TRANSPARENT titlebar, buttons and borders. It also has some little
 usuability enhancements.
 
 %prep
@@ -25,14 +25,14 @@
 
 %build
 %configure --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -45,7 +45,13 @@
 %{_libdir}/kde3/kwin*_%{theme}*.*
 
 
-%changelog
+%Changelog
+* Mon Oct 09 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.2-1
+- New upstream release 1.0.2
+
+* Sat Sep 02 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.1-3
+- Rebuild for FC6-devel
+
 * Tue Jun 27 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.1-2
 - added qt-devel as BR
 - dropping QTINC, QTLIB from %%build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crystal/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 15:26:44 -0000	1.2
+++ sources	15 Oct 2006 15:48:18 -0000	1.3
@@ -1 +1 @@
-a7205899e406285604adcd2727cd1d4c  13969-crystal-1.0.1.tar.bz2
+4979a4cbf74ca7f300bdfb2aaddc3e77  13969-crystal-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 15 15:48:48 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:48:48 -0700
Subject: rpms/crystal import.log,1.7,1.8
Message-ID: <200610151548.k9FFmoBw009058@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/crystal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9025

Modified Files:
	import.log 
Log Message:
auto-import crystal-1.0.2-1 on branch devel from crystal-1.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crystal/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	15 Oct 2006 15:48:17 -0000	1.7
+++ import.log	15 Oct 2006 15:48:48 -0000	1.8
@@ -4,3 +4,4 @@
 crystal-1_0_1-2:FC-5:crystal-1.0.1-2.src.rpm:1151412584
 crystal-1_0_1-3:HEAD:crystal-1.0.1-3.src.rpm:1157193059
 crystal-1_0_2-1:FC-5:crystal-1.0.2-1.src.rpm:1160927517
+crystal-1_0_2-1:HEAD:crystal-1.0.2-1.src.rpm:1160927548



From fedora-extras-commits at redhat.com  Sun Oct 15 15:48:49 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:48:49 -0700
Subject: rpms/crystal/devel .cvsignore, 1.2, 1.3 crystal.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610151548.k9FFmpPt009064@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/crystal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9025/devel

Modified Files:
	.cvsignore crystal.spec sources 
Log Message:
auto-import crystal-1.0.2-1 on branch devel from crystal-1.0.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crystal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 15:26:44 -0000	1.2
+++ .cvsignore	15 Oct 2006 15:48:49 -0000	1.3
@@ -1 +1 @@
-13969-crystal-1.0.1.tar.bz2
+13969-crystal-1.0.2.tar.bz2


Index: crystal.spec
===================================================================
RCS file: /cvs/extras/rpms/crystal/devel/crystal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crystal.spec	2 Sep 2006 10:27:20 -0000	1.3
+++ crystal.spec	15 Oct 2006 15:48:49 -0000	1.4
@@ -2,8 +2,8 @@
 %{?!theme:%define theme %{name}}
 
 Name:          crystal
-Version:       1.0.1
-Release:       3%{?dist}
+Version:       1.0.2
+Release:       1%{?dist}
 Summary:       KDE window decoration
 
 License:       GPL
@@ -12,7 +12,7 @@
 Group:         User Interface/Desktops
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdebase-devel >= 6:3.5, qt-devel >= 3.3
+BuildRequires: kdebase-devel >= 6:3.5
 Requires:      kdebase
 
 %description
@@ -25,11 +25,11 @@
 
 %build
 %configure --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -46,6 +46,9 @@
 
 
 %Changelog
+* Mon Oct 09 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.2-1
+- New upstream release 1.0.2
+
 * Sat Sep 02 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.0.1-3
 - Rebuild for FC6-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crystal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 15:26:44 -0000	1.2
+++ sources	15 Oct 2006 15:48:49 -0000	1.3
@@ -1 +1 @@
-a7205899e406285604adcd2727cd1d4c  13969-crystal-1.0.1.tar.bz2
+4979a4cbf74ca7f300bdfb2aaddc3e77  13969-crystal-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 15 15:51:06 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:51:06 -0700
Subject: rpms/kmenu-gnome import.log,1.3,1.4
Message-ID: <200610151551.k9FFpc0F009359@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9244

Modified Files:
	import.log 
Log Message:
auto-import kmenu-gnome-0.6.0.1-2 on branch FC-5 from kmenu-gnome-0.6.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	4 Sep 2006 22:10:21 -0000	1.3
+++ import.log	15 Oct 2006 15:51:06 -0000	1.4
@@ -1,2 +1,3 @@
 kmenu-gnome-0_6-3:HEAD:kmenu-gnome-0.6-3.src.rpm:1156174493
 kmenu-gnome-0_6-4:HEAD:kmenu-gnome-0.6-4.src.rpm:1157408049
+kmenu-gnome-0_6_0_1-2:FC-5:kmenu-gnome-0.6.0.1-2.src.rpm:1160927686



From fedora-extras-commits at redhat.com  Sun Oct 15 15:51:07 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:51:07 -0700
Subject: rpms/kmenu-gnome/FC-5 .cvsignore, 1.2, 1.3 kmenu-gnome.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610151551.k9FFpd5Y009364@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9244/FC-5

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Log Message:
auto-import kmenu-gnome-0.6.0.1-2 on branch FC-5 from kmenu-gnome-0.6.0.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2006 15:31:58 -0000	1.2
+++ .cvsignore	15 Oct 2006 15:51:07 -0000	1.3
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.tar.gz
+kmenu-gnome-0.6.0.1.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/kmenu-gnome.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmenu-gnome.spec	21 Aug 2006 15:31:58 -0000	1.1
+++ kmenu-gnome.spec	15 Oct 2006 15:51:07 -0000	1.2
@@ -1,14 +1,16 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6
-Release:    3%{?dist}
+Version:    0.6.0.1
+Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
-Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+#Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+#Use local tarball until new release to fix #208788:
+Source:     %{name}-%{version}.tar.gz
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,12 +32,10 @@
 mv %{name}/fc5-hide-bug196275.menu \
 %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275
-cp -r desktop-directories icons %{name} %{buildroot}%{_datadir}
+cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
 #Ignore dangling-relative-symlink warnings
 #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings
-( cd %{buildroot}%{_datadir}/desktop-directories
-ln -s kde-games-kidsgames.directory kde-games-kids.directory )
 ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps
 ln -s icon-office.png ooomain.png )
 ( cd %{buildroot}%{_icondir}/Bluecurve/24x24/apps
@@ -56,7 +56,7 @@
 ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
 ln -s ../../../gnome/48x48/apps/accessibility-directory.png .
-ln -s ../../../gnome/48x48/apps/gnome-system.png .
+#ln -s ../../../gnome/48x48/apps/gnome-system.png .
 ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/48x48/stock/net/stock_contact.png .
 ln -s ../../../gnome/48x48/stock/io/stock_print.png . )
@@ -82,14 +82,23 @@
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/%{name}.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/fc5-hide-bug196275.menu
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
 %{_datadir}/desktop-directories/*.directory
 %{_icondir}/Bluecurve/*/*/*.png
 %{_icondir}/crystalsvg/*/*/*.png
 %doc ChangeLog COPYING GPL LGPL README
 
-%changelog
+%Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6.0.1-2
+- Removed duplicate gnome-system.png
+
+* Thu Oct 05 2006 Ariszlo <ariszlo at gmail.com> - 0.6.0.1-1
+- Removed kde-games-kids.directory link to fix Fedora bug 208788
+- Preparing release 0.6.1
+
+* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6-4
+- Rebuild for FC6-devel
+
 * Sun Aug 13 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6-3
 - Added redhat-artwork as %%Requires and %%build
 - touching Bluecurve and crystalsvg folders


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2006 15:31:58 -0000	1.2
+++ sources	15 Oct 2006 15:51:07 -0000	1.3
@@ -1 +1 @@
-9b36e22fc02f022e35fae3241ec9d622  31025-kmenu-gnome-0.6.tar.gz
+b0759e688cafd1dcfbe6c34e9e533e33  kmenu-gnome-0.6.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 15:53:14 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:53:14 -0700
Subject: rpms/kmenu-gnome import.log,1.4,1.5
Message-ID: <200610151553.k9FFrGkt009546@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9513

Modified Files:
	import.log 
Log Message:
auto-import kmenu-gnome-0.6.0.1-2 on branch devel from kmenu-gnome-0.6.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	15 Oct 2006 15:51:06 -0000	1.4
+++ import.log	15 Oct 2006 15:53:14 -0000	1.5
@@ -1,3 +1,4 @@
 kmenu-gnome-0_6-3:HEAD:kmenu-gnome-0.6-3.src.rpm:1156174493
 kmenu-gnome-0_6-4:HEAD:kmenu-gnome-0.6-4.src.rpm:1157408049
 kmenu-gnome-0_6_0_1-2:FC-5:kmenu-gnome-0.6.0.1-2.src.rpm:1160927686
+kmenu-gnome-0_6_0_1-2:HEAD:kmenu-gnome-0.6.0.1-2.src.rpm:1160927814



From fedora-extras-commits at redhat.com  Sun Oct 15 15:53:15 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 15 Oct 2006 08:53:15 -0700
Subject: rpms/kmenu-gnome/devel .cvsignore, 1.2, 1.3 kmenu-gnome.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200610151553.k9FFrHsK009552@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9513/devel

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Log Message:
auto-import kmenu-gnome-0.6.0.1-2 on branch devel from kmenu-gnome-0.6.0.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2006 15:31:58 -0000	1.2
+++ .cvsignore	15 Oct 2006 15:53:15 -0000	1.3
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.tar.gz
+kmenu-gnome-0.6.0.1.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmenu-gnome.spec	4 Sep 2006 22:10:21 -0000	1.2
+++ kmenu-gnome.spec	15 Oct 2006 15:53:15 -0000	1.3
@@ -1,14 +1,16 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6
-Release:    4%{?dist}
+Version:    0.6.0.1
+Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
-Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+#Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+#Use local tarball until new release to fix #208788:
+Source:     %{name}-%{version}.tar.gz
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,8 +36,6 @@
 
 #Ignore dangling-relative-symlink warnings
 #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings
-( cd %{buildroot}%{_datadir}/desktop-directories
-ln -s kde-games-kidsgames.directory kde-games-kids.directory )
 ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps
 ln -s icon-office.png ooomain.png )
 ( cd %{buildroot}%{_icondir}/Bluecurve/24x24/apps
@@ -56,7 +56,7 @@
 ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
 ln -s ../../../gnome/48x48/apps/accessibility-directory.png .
-ln -s ../../../gnome/48x48/apps/gnome-system.png .
+#ln -s ../../../gnome/48x48/apps/gnome-system.png .
 ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/48x48/stock/net/stock_contact.png .
 ln -s ../../../gnome/48x48/stock/io/stock_print.png . )
@@ -89,6 +89,13 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6.0.1-2
+- Removed duplicate gnome-system.png
+
+* Thu Oct 05 2006 Ariszlo <ariszlo at gmail.com> - 0.6.0.1-1
+- Removed kde-games-kids.directory link to fix Fedora bug 208788
+- Preparing release 0.6.1
+
 * Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6-4
 - Rebuild for FC6-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2006 15:31:58 -0000	1.2
+++ sources	15 Oct 2006 15:53:15 -0000	1.3
@@ -1 +1 @@
-9b36e22fc02f022e35fae3241ec9d622  31025-kmenu-gnome-0.6.tar.gz
+b0759e688cafd1dcfbe6c34e9e533e33  kmenu-gnome-0.6.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 17:13:04 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 15 Oct 2006 10:13:04 -0700
Subject: rpms/allegro/devel allegro-4.2.0-multilib.patch, NONE,
	1.1 allegro-4.0.3-libdir.patch, 1.1, 1.2 allegro.spec, 1.36, 1.37
Message-ID: <200610151713.k9FHD7kx016522@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16497

Modified Files:
	allegro-4.0.3-libdir.patch allegro.spec 
Added Files:
	allegro-4.2.0-multilib.patch 
Log Message:
* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-18
- Multilib devel goodness (make allegro-devel i386 and x86_64 parallel
  installable)


allegro-4.2.0-multilib.patch:

--- NEW FILE allegro-4.2.0-multilib.patch ---
--- allegro-4.2.0/include/allegro/platform/alunixac.hin~	2006-10-15 18:45:00.000000000 +0200
+++ allegro-4.2.0/include/allegro/platform/alunixac.hin	2006-10-15 18:45:00.000000000 +0200
@@ -49,19 +49,25 @@
 #undef ALLEGRO_LINUX_VBEAF
 
 /* Define to enable Linux console VGA driver. */
-#undef ALLEGRO_LINUX_VGA
+#ifdef __i386__
+#define ALLEGRO_LINUX_VGA
+#endif
 
 /* Define if target machine is little endian. */
 #undef ALLEGRO_LITTLE_ENDIAN
 
 /* Define if assembler supports MMX. */
-#undef ALLEGRO_MMX
+#ifdef __i386__
+#define ALLEGRO_MMX
+#endif
 
 /* Define for Unix platforms, to use C convention for bank switching. */
 #undef ALLEGRO_NO_ASM
 
 /* Define if assembler supports SSE. */
-#undef ALLEGRO_SSE
+#ifdef __i386__
+#define ALLEGRO_SSE
+#endif
 
 /* Define if constructor attribute is supported. */
 #undef ALLEGRO_USE_CONSTRUCTOR

allegro-4.0.3-libdir.patch:

Index: allegro-4.0.3-libdir.patch
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro-4.0.3-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- allegro-4.0.3-libdir.patch	13 Feb 2005 22:10:46 -0000	1.1
+++ allegro-4.0.3-libdir.patch	15 Oct 2006 17:13:04 -0000	1.2
@@ -1,14 +1,29 @@
---- misc/allegro-config.in~	2003-04-19 10:08:10.000000000 +0300
-+++ misc/allegro-config.in	2005-02-13 23:31:31.602523235 +0200
-@@ -15,6 +15,7 @@
+--- allegro-4.2.0/misc/allegro-config.in.libdir	2005-11-05 17:40:11.000000000 +0100
++++ allegro-4.2.0/misc/allegro-config.in	2006-10-15 18:38:46.000000000 +0200
+@@ -15,13 +15,21 @@
  exec_prefix=$prefix
  exec_prefix_set=no
  include_prefix=@INCLUDE_PREFIX@
-+libdir=@libdir@
++arch=$(/bin/arch)
++if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \
++    -o "$arch" = "ia64" ];
++then
++    libdir="/usr/lib64"
++else
++    libdir="/usr/lib"
++fi
  
  static_libs=@LINK_WITH_STATIC_LIBS@
  lib_type=@LIB_TO_LINK@
-@@ -162,7 +163,7 @@
+ 
+ accepts_frameworks=no
+ 
+-allegro_ldflags="@LDFLAGS@"
++allegro_ldflags="-Wl,--export-dynamic "
+ allegro_libs="@LIBS@"
+ allegro_frameworks="@FRAMEWORKS@"
+ allegro_cflags=""
+@@ -178,7 +186,7 @@
  fi
  
  if test "$echo_libs" = "yes"; then
@@ -17,7 +32,7 @@
     if test "$static_libs" = "yes"; then
        echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
     else
-@@ -172,8 +173,8 @@
+@@ -192,8 +200,8 @@
  
  if test "$echo_env" = "yes"; then
     echo "export PATH=\$PATH:$prefix/bin"


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- allegro.spec	2 Sep 2006 06:36:24 -0000	1.36
+++ allegro.spec	15 Oct 2006 17:13:04 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -23,6 +23,7 @@
 Patch9:         allegro-4.2.0-no-execheap.patch
 Patch10:        allegro-4.2.0-nicevsync.patch
 Patch11:        allegro-4.2.0-noexecstack.patch
+Patch12:        allegro-4.2.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -127,7 +128,7 @@
 
 %prep
 %setup -q
-%patch1 -p0 -b .libdir
+%patch1 -p1 -b .libdir
 %patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
 %patch4 -p1 -z .digmid
@@ -138,6 +139,7 @@
 %patch9 -p1 -z .execheap
 %patch10 -p1 -z .nicevsync
 %patch11 -p1 -z .noexecstack
+%patch12 -p1 -z .multilib
 
 
 %build
@@ -228,6 +230,10 @@
 
 
 %changelog
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-18
+- Multilib devel goodness (make allegro-devel i386 and x86_64 parallel
+  installable)
+
 * Sat Sep  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-17
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Sun Oct 15 17:34:44 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:34:44 -0700
Subject: rpms/python-tgfastdata - New directory
Message-ID: <200610151734.k9FHYkfo016734@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/python-tgfastdata

Log Message:
Directory /cvs/extras/rpms/python-tgfastdata added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 17:34:44 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:34:44 -0700
Subject: rpms/python-tgfastdata/devel - New directory
Message-ID: <200610151734.k9FHYkxE016737@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/python-tgfastdata/devel

Log Message:
Directory /cvs/extras/rpms/python-tgfastdata/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 17:34:58 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:34:58 -0700
Subject: rpms/python-tgfastdata Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610151735.k9FHZ0Qo016781@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16753

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-tgfastdata


--- NEW FILE Makefile ---
# Top level Makefile for module python-tgfastdata
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 15 17:34:58 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:34:58 -0700
Subject: rpms/python-tgfastdata/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610151735.k9FHZ0cP016784@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16753/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-tgfastdata


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 15 17:35:19 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:35:19 -0700
Subject: rpms/python-tgfastdata import.log,1.1,1.2
Message-ID: <200610151735.k9FHZpcN016853@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16817

Modified Files:
	import.log 
Log Message:
auto-import python-tgfastdata-0.9a6-4 on branch devel from python-tgfastdata-0.9a6-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2006 17:34:57 -0000	1.1
+++ import.log	15 Oct 2006 17:35:18 -0000	1.2
@@ -0,0 +1 @@
+python-tgfastdata-0_9a6-4:HEAD:python-tgfastdata-0.9a6-4.src.rpm:1160933854



From fedora-extras-commits at redhat.com  Sun Oct 15 17:35:19 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:35:19 -0700
Subject: rpms/python-tgfastdata/devel python-tgfastdata.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610151735.k9FHZp8p016857@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16817/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-tgfastdata.spec 
Log Message:
auto-import python-tgfastdata-0.9a6-4 on branch devel from python-tgfastdata-0.9a6-4.src.rpm


--- NEW FILE python-tgfastdata.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%define module tgfastdata

Name:           python-tgfastdata
Version:        0.9a6
Release:        4%{?dist}
Summary:        Automatic user interface generation for TurboGears

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org/docs/plugins/template.html
Source0:        http://files.turbogears.org/eggs/TGFastData-%{version}-py2.4.egg
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch


%description
FastData is an extension to TurboGears which can provide automatic user
interface generation based upon an application's model objects.


%prep
%setup -q -c


%build


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}/%{module}{,/templates}
install -p -m 0644 %{module}/*.py %{buildroot}%{python_sitelib}/%{module}
install -p -m 0644 %{module}/templates/* %{buildroot}%{python_sitelib}/%{module}/templates

# Install the egg-info directory
mkdir -p %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{python_sitelib}/%{module}/
%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info

%changelog
* Tue Oct 14 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-4
- Fix Source0
- Own %%{python_sitelib}/%{module}
- Don't install unusable tests

* Tue Oct 10 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-3
- Remove TurboGears requirement

* Sat Sep 30 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-2
- Rename to python-tgfastdata
- Install egg-info

* Sun Sep 17 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-1
- Initial creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2006 17:34:58 -0000	1.1
+++ .cvsignore	15 Oct 2006 17:35:19 -0000	1.2
@@ -0,0 +1 @@
+TGFastData-0.9a6-py2.4.egg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2006 17:34:58 -0000	1.1
+++ sources	15 Oct 2006 17:35:19 -0000	1.2
@@ -0,0 +1 @@
+523bdd96bda2f505c2626051a95565d4  TGFastData-0.9a6-py2.4.egg



From fedora-extras-commits at redhat.com  Sun Oct 15 17:37:01 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 15 Oct 2006 10:37:01 -0700
Subject: owners owners.list,1.1829,1.1830
Message-ID: <200610151737.k9FHb3Yl016917@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16900

Modified Files:
	owners.list 
Log Message:
add python-tgfastdata to owners list


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1829
retrieving revision 1.1830
diff -u -r1.1829 -r1.1830
--- owners.list	14 Oct 2006 22:01:44 -0000	1.1829
+++ owners.list	15 Oct 2006 17:37:00 -0000	1.1830
@@ -1900,6 +1900,7 @@
 Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-telepathy|Python libraries for Telepathy|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-TestGears|Unit testing for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-tgfastdata|Automatic user interface generation for TurboGears|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbocheetah|TurboGears plugin to support use of Cheetah templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 15 17:50:26 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sun, 15 Oct 2006 10:50:26 -0700
Subject: fedora-release fedora-core.repo, 1.7, 1.8 fedora-development.repo,
	1.10, 1.11 fedora-extras-development.repo, 1.8,
	1.9 fedora-extras.repo, 1.9, 1.10 fedora-release.spec, 1.33, 1.34
Message-ID: <200610151750.k9FHoQw1017092@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17066

Modified Files:
	fedora-core.repo fedora-development.repo 
	fedora-extras-development.repo fedora-extras.repo 
	fedora-release.spec 
Log Message:
Build for next rawhide, fiddle the repos again



Index: fedora-core.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-core.repo	5 Oct 2006 15:07:40 -0000	1.7
+++ fedora-core.repo	15 Oct 2006 17:50:24 -0000	1.8
@@ -2,7 +2,7 @@
 name=Fedora Core $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-$releasever&arch=$basearch
-enabled=1
+enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
 


Index: fedora-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-development.repo	5 Oct 2006 15:07:40 -0000	1.10
+++ fedora-development.repo	15 Oct 2006 17:50:24 -0000	1.11
@@ -27,7 +27,7 @@
 name=Fedora Core - Development
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=0
 
 [development-debuginfo]


Index: fedora-extras-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-extras-development.repo	5 Oct 2006 15:07:40 -0000	1.8
+++ fedora-extras-development.repo	15 Oct 2006 17:50:24 -0000	1.9
@@ -13,7 +13,7 @@
 name=Fedora Extras - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=$basearch
-enabled=0
+enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
 


Index: fedora-extras.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-extras.repo	5 Oct 2006 15:07:40 -0000	1.9
+++ fedora-extras.repo	15 Oct 2006 17:50:24 -0000	1.10
@@ -2,7 +2,7 @@
 name=Fedora Extras $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-$releasever&arch=$basearch
-enabled=1
+enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
 


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fedora-release.spec	12 Oct 2006 17:37:21 -0000	1.33
+++ fedora-release.spec	15 Oct 2006 17:50:24 -0000	1.34
@@ -1,9 +1,9 @@
-%define release_name Zod
+%define release_name Rawhide
 
 Summary:	Fedora Core release files
 Name:		fedora-release
-Version:	6
-Release:	3
+Version:	6.89
+Release:	1
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -63,6 +63,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Sun Oct 15 2006 Jesse Keating <jkeating at redhat.com> - 6.89-1
+- Rebuild for rawhide
+
 * Thu Oct 12 2006 Jesse Keating <jkeating at redhat.com> - 6-3
 - version has to stay the same, safe to use.
 



From fedora-extras-commits at redhat.com  Sun Oct 15 18:11:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 15 Oct 2006 11:11:32 -0700
Subject: rpms/orage/devel orage.spec,1.3,1.4
Message-ID: <200610151811.k9FIBYTH020402@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20380

Modified Files:
	orage.spec 
Log Message:
xfce4-datetime-plugin is back, remove obsoletes and provides



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- orage.spec	7 Oct 2006 15:11:20 -0000	1.3
+++ orage.spec	15 Oct 2006 18:11:32 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Time-managing application for Xfce4
 Name: orage
 Version: 4.3.99.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
@@ -18,9 +18,6 @@
 
 Provides: xfcalendar = %{version}-%{release}
 Obsoletes: xfcalendar <= 4.2.3-3.fc6
-# xfce4-datetime-plugin isn't in Xfce 4.4
-Provides: xfce4-datetime-plugin = %{version}-%{release}
-Obsoletes: xfce4-datetime-plugin <= 0.3.1-8.fc6
 
 %description
 Time-managing application for Xfce4.
@@ -72,6 +69,9 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Sun Oct 15 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-6
+- xfce4-datetime-plugin is back, remove obsoletes and provides
+
 * Sat Oct  7 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-5
 - Fix Obsoletes
 



From fedora-extras-commits at redhat.com  Sun Oct 15 18:57:19 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 15 Oct 2006 11:57:19 -0700
Subject: comps comps-fe6.xml.in,1.188,1.189
Message-ID: <200610151857.k9FIvLlG020745@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20728

Modified Files:
	comps-fe6.xml.in 
Log Message:
remove obsolete xfce packages and add the new ones


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- comps-fe6.xml.in	15 Oct 2006 03:08:34 -0000	1.188
+++ comps-fe6.xml.in	15 Oct 2006 18:57:19 -0000	1.189
@@ -1115,18 +1115,17 @@
       <packagereq type="default">xfce-mcs-plugins</packagereq>
       <packagereq type="default">xfce4-appfinder</packagereq>
       <packagereq type="default">xfce4-icon-theme</packagereq>
-      <packagereq type="default">xfce4-iconbox</packagereq>
       <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
       <packagereq type="default">xfce4-mixer</packagereq>
-      <packagereq type="default">xfce4-systray</packagereq>
-      <packagereq type="default">xfce4-trigger-launcher</packagereq>
       <packagereq type="default">xffm-icons</packagereq>
       <packagereq type="default">xfprint</packagereq>
-      <packagereq type="optional">xfcalendar</packagereq>
+      <packagereq type="optional">mousepad</packagereq>
+      <packagereq type="optional">orage</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>
       <packagereq type="optional">xfce4-clipman-plugin</packagereq>
       <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
       <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
+      <packagereq type="optional">xfce4-datetime-plugin</packagereq>
       <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
       <packagereq type="optional">xfce4-genmon-plugin</packagereq>
       <packagereq type="optional">xfce4-minicmd-plugin</packagereq>



From fedora-extras-commits at redhat.com  Sun Oct 15 19:28:29 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 15 Oct 2006 12:28:29 -0700
Subject: rpms/stellarium/FC-5 stellarium.spec,1.21,1.22
Message-ID: <200610151928.k9FJSVp7023797@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23780

Modified Files:
	stellarium.spec 
Log Message:
Fix segfault on x64 systems


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- stellarium.spec	10 Oct 2006 19:37:03 -0000	1.21
+++ stellarium.spec	15 Oct 2006 19:28:29 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
+Patch1:	        stellarium-0.8.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -83,6 +85,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1.1
+- Fix segfault on x64 systems (#210525)
+
 * Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Oct 15 19:33:14 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 12:33:14 -0700
Subject: rpms/perl-Params-Coerce/FC-5 perl-Params-Coerce.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610151933.k9FJXG1D023928@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Params-Coerce/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23875/FC-5

Modified Files:
	perl-Params-Coerce.spec sources 
Log Message:
update to 0.14



Index: perl-Params-Coerce.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/FC-5/perl-Params-Coerce.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Params-Coerce.spec	7 Sep 2006 16:39:53 -0000	1.2
+++ perl-Params-Coerce.spec	15 Oct 2006 19:33:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Params-Coerce
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Allows your classes to do coercion of parameters
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -35,7 +35,6 @@
 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 \;
 
@@ -54,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-2
 - add additional verbosity to %%description 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 16:37:43 -0000	1.2
+++ sources	15 Oct 2006 19:33:14 -0000	1.3
@@ -1 +1 @@
-b87babce7c8c5869045fff7d1fc9958f  Params-Coerce-0.13.tar.gz
+a8439ea6777c9156424ef6dd74c83945  Params-Coerce-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 19:33:15 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 12:33:15 -0700
Subject: rpms/perl-Params-Coerce/devel .cvsignore, 1.2,
	1.3 perl-Params-Coerce.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610151933.k9FJXHrO023934@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Params-Coerce/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23875/devel

Modified Files:
	.cvsignore perl-Params-Coerce.spec sources 
Log Message:
update to 0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 16:37:43 -0000	1.2
+++ .cvsignore	15 Oct 2006 19:33:15 -0000	1.3
@@ -1 +1 @@
-Params-Coerce-0.13.tar.gz
+Params-Coerce-0.14.tar.gz


Index: perl-Params-Coerce.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/devel/perl-Params-Coerce.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Params-Coerce.spec	7 Sep 2006 16:39:53 -0000	1.2
+++ perl-Params-Coerce.spec	15 Oct 2006 19:33:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Params-Coerce
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Allows your classes to do coercion of parameters
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -35,7 +35,6 @@
 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 \;
 
@@ -54,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- update to 0.14
+
 * Thu Sep 07 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.13-2
 - add additional verbosity to %%description 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 16:37:43 -0000	1.2
+++ sources	15 Oct 2006 19:33:15 -0000	1.3
@@ -1 +1 @@
-b87babce7c8c5869045fff7d1fc9958f  Params-Coerce-0.13.tar.gz
+a8439ea6777c9156424ef6dd74c83945  Params-Coerce-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 19:33:13 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 12:33:13 -0700
Subject: rpms/perl-Params-Coerce Makefile,1.1,1.2
Message-ID: <200610151933.k9FJXF9f023923@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Params-Coerce
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23875

Modified Files:
	Makefile 
Log Message:
update to 0.14



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Coerce/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 16:37:32 -0000	1.1
+++ Makefile	15 Oct 2006 19:33:13 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Sun Oct 15 19:41:38 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 15 Oct 2006 12:41:38 -0700
Subject: rpms/stellarium/FC-5 stellarium-0.8.2-x64.patch, NONE,
	1.1 stellarium.spec, 1.22, 1.23
Message-ID: <200610151941.k9FJfeD3024038@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24018

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64.patch 
Log Message:
Added forgotten file to cvs

stellarium-0.8.2-x64.patch:

--- NEW FILE stellarium-0.8.2-x64.patch ---
--- stellarium-0.8.2/src/translator.cpp.org	2006-10-15 21:14:08.000000000 +0200
+++ stellarium-0.8.2/src/translator.cpp	2006-10-15 21:15:42.000000000 +0200
@@ -73,9 +73,9 @@
 	//change systemLangName to ISO 639 / ISO 3166.
 	unsigned int pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
-	       Translator::systemLangName.resize(pos);
+	       Translator::systemLangName.resize(pos+1);
 	pos = Translator::systemLangName.find('.', 0);
-	if(pos == 5) Translator::systemLangName.resize(pos);
+	if(pos == 5) Translator::systemLangName.resize(pos+1);
 }
 
 void Translator::reload()


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- stellarium.spec	15 Oct 2006 19:28:29 -0000	1.22
+++ stellarium.spec	15 Oct 2006 19:41:38 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -85,7 +85,7 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
-* Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1.1
+* Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1.2
 - Fix segfault on x64 systems (#210525)
 
 * Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1



From fedora-extras-commits at redhat.com  Sun Oct 15 20:23:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 13:23:20 -0700
Subject: rpms/lirc/devel lirc.spec, 1.17, 1.18 lirc-0.8.0-rpath64.patch, 1.1,
	NONE lirc-optflags.patch, 1.1, NONE
Message-ID: <200610152023.k9FKNMLV027201@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27184

Modified Files:
	lirc.spec 
Removed Files:
	lirc-0.8.0-rpath64.patch lirc-optflags.patch 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
- 0.8.1pre2, optflags patch no longer needed.



Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lirc.spec	28 Aug 2006 16:36:47 -0000	1.17
+++ lirc.spec	15 Oct 2006 20:23:20 -0000	1.18
@@ -1,6 +1,7 @@
 # TODO:
 # - caraca driver (req: caraca, http://caraca.sf.net/)
 # - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
+# - iguanaIR driver (req: http://iguanaworks.net/ir/usb/installation.shtml)
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
@@ -15,18 +16,16 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre1%{?dist}
+Release:        0.2.pre2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre1.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         %{name}-optflags.patch
-Patch1:         %{name}-0.8.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -82,13 +81,16 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-%{version}pre2
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
+for f in remotes/chronos/lircd.conf.chronos \
+    remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb ; do
+    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
+sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
 # *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
 %if ! %{with alsa}
 sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure*
@@ -198,6 +200,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
+- 0.8.1pre2, optflags patch no longer needed.
+
 * Mon Aug 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2.pre1
 - Rebuild.
 


--- lirc-0.8.0-rpath64.patch DELETED ---


--- lirc-optflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 20:24:14 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Oct 2006 13:24:14 -0700
Subject: rpms/lirc/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <200610152024.k9FKOG2x027238@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27219

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
- 0.8.1pre2, optflags patch no longer needed.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Jul 2006 09:02:42 -0000	1.11
+++ .cvsignore	15 Oct 2006 20:24:14 -0000	1.12
@@ -1 +1 @@
-lirc-0.8.1pre1.tar.bz2
+lirc-0.8.1pre2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Jul 2006 09:02:42 -0000	1.11
+++ sources	15 Oct 2006 20:24:14 -0000	1.12
@@ -1 +1 @@
-acb6340078bde9628f5ae848fec0583c  lirc-0.8.1pre1.tar.bz2
+c8c1f5f692222050bcbafbf1ba6a1217  lirc-0.8.1pre2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 15 21:08:51 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:08:51 -0700
Subject: rpms/libctl - New directory
Message-ID: <200610152108.k9FL8rCP030677@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30656/libctl

Log Message:
Directory /cvs/extras/rpms/libctl added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 21:08:52 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:08:52 -0700
Subject: rpms/libctl/devel - New directory
Message-ID: <200610152108.k9FL8ssu030680@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30656/libctl/devel

Log Message:
Directory /cvs/extras/rpms/libctl/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 21:09:05 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:09:05 -0700
Subject: rpms/libctl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610152109.k9FL97tw030737@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30704

Added Files:
	Makefile import.log 
Log Message:
Setup of module libctl


--- NEW FILE Makefile ---
# Top level Makefile for module libctl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 15 21:09:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:09:06 -0700
Subject: rpms/libctl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610152109.k9FL987H030740@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30704/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libctl


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 15 21:09:36 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:09:36 -0700
Subject: rpms/libctl import.log,1.1,1.2
Message-ID: <200610152109.k9FL9cvD030817@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30783

Modified Files:
	import.log 
Log Message:
auto-import libctl-3.0.2-4 on branch devel from libctl-3.0.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libctl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2006 21:09:05 -0000	1.1
+++ import.log	15 Oct 2006 21:09:36 -0000	1.2
@@ -0,0 +1 @@
+libctl-3_0_2-4:HEAD:libctl-3.0.2-4.src.rpm:1160946572



From fedora-extras-commits at redhat.com  Sun Oct 15 21:09:37 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun, 15 Oct 2006 14:09:37 -0700
Subject: rpms/libctl/devel libctl-3.0.2-undefined_nonweak_symbs.patch, NONE, 
	1.1 libctl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610152109.k9FL9dkH030824@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/libctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30783/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libctl-3.0.2-undefined_nonweak_symbs.patch libctl.spec 
Log Message:
auto-import libctl-3.0.2-4 on branch devel from libctl-3.0.2-4.src.rpm

libctl-3.0.2-undefined_nonweak_symbs.patch:

--- NEW FILE libctl-3.0.2-undefined_nonweak_symbs.patch ---
--- libctl-3.0.2/utils/Makefile.am	2006-04-01 23:04:47.000000000 -0500
+++ libctl-3.0.2_patched/utils/Makefile.am	2006-10-14 12:14:41.000000000 -0400
@@ -10,7 +10,7 @@
 
 libctlgeom_la_SOURCES = geom.c 
 nodist_libctlgeom_la_SOURCES = geom-ctl-io.c ctl-io.h
-libctlgeom_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
+libctlgeom_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ $(top_builddir)/src/libctl.la
 
 geomtst_SOURCES = geomtst.c
 geomtst_LDADD = libctlgeom.la $(top_builddir)/src/libctl.la


--- NEW FILE libctl.spec ---
Name:           libctl
Version:        3.0.2
Release:        4%{?dist}
Summary:        Guile-based support for flexible control files

Group:          System Environment/Libraries
License:        GPL
URL:            http://ab-initio.mit.edu/wiki/index.php/Libctl
Source0:        http://ab-initio.mit.edu/libctl/libctl-%{version}.tar.gz
Patch0:         libctl-3.0.2-undefined_nonweak_symbs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf, automake, libtool
BuildRequires:  gcc-gfortran, guile-devel
Requires:       guile

%description
The libctl package is a Guile-based library that provides support for
flexible control files in scientific simulations.

%package devel
Summary:        Development files for libctl
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package contains the development files for libctl.

%prep
%setup -q
%patch0 -p1

%build
autoreconf
%configure F77=gfortran --enable-shared --disable-static \
  --includedir=%{_includedir}/ctl
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS NEWS 
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc ChangeLog
%{_bindir}/gen-ctl-io
%{_includedir}/ctl
%{_libdir}/*.so
%{_mandir}/man1/*
%{_datadir}/libctl

%changelog
* Sat Oct 15 2006  Ed Hill <ed at eh3.com> - 3.0.2-4
- put headers in a subdir to avoid possible name collisions

* Sat Oct 14 2006  Ed Hill <ed at eh3.com> - 3.0.2-3
- disable static libs

* Sat Oct 14 2006  Ed Hill <ed at eh3.com> - 3.0.2-2
- fix undefined non-weak symbols in libctlgeom

* Wed Sep 20 2006  Ed Hill <ed at eh3.com> - 3.0.2-1
- initial package creation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libctl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2006 21:09:06 -0000	1.1
+++ .cvsignore	15 Oct 2006 21:09:36 -0000	1.2
@@ -0,0 +1 @@
+libctl-3.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libctl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2006 21:09:06 -0000	1.1
+++ sources	15 Oct 2006 21:09:36 -0000	1.2
@@ -0,0 +1 @@
+dff367aa94e68a507678f0f3d48b1165  libctl-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 21:55:04 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:55:04 -0700
Subject: rpms/xeuphoric - New directory
Message-ID: <200610152155.k9FLt6RX031300@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31274/xeuphoric

Log Message:
Directory /cvs/extras/rpms/xeuphoric added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 21:55:05 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:55:05 -0700
Subject: rpms/xeuphoric/devel - New directory
Message-ID: <200610152155.k9FLt7r5031303@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31274/xeuphoric/devel

Log Message:
Directory /cvs/extras/rpms/xeuphoric/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 15 21:55:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:55:32 -0700
Subject: rpms/xeuphoric/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610152155.k9FLtYf3031361@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31325/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xeuphoric


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 15 21:55:31 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:55:31 -0700
Subject: rpms/xeuphoric Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610152155.k9FLtXBD031358@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31325

Added Files:
	Makefile import.log 
Log Message:
Setup of module xeuphoric


--- NEW FILE Makefile ---
# Top level Makefile for module xeuphoric
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 15 21:57:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:57:01 -0700
Subject: rpms/xeuphoric/devel xeuphoric-config.patch, NONE,
	1.1 xeuphoric.desktop, NONE, 1.1 xeuphoric.png, NONE,
	1.1 xeuphoric.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610152157.k9FLv3WM031460@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31417/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xeuphoric-config.patch xeuphoric.desktop xeuphoric.png 
	xeuphoric.spec 
Log Message:
auto-import xeuphoric-0.18.2-5 on branch devel from xeuphoric-0.18.2-5.src.rpm

xeuphoric-config.patch:

--- NEW FILE xeuphoric-config.patch ---
--- xeuphoric-0.18.2/configure	2006-08-19 21:47:44.000000000 +0100
+++ xeuphoric-0.18.2/configure	2006-08-25 23:04:42.000000000 +0100
@@ -21,7 +21,7 @@
 
 set -e
 
-PREFIX=/usr/local
+PREFIX=/usr
 APPNAME=xeuphoric
 
 while [ "$#" -ne 0 ]


--- NEW FILE xeuphoric.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=xeuphoric
Comment=An ORIC home computer emulator
Icon=xeuphoric.png
Terminal=false
Type=Application
Categories=Application;Emulators;
Exec=xeuphoric



--- NEW FILE xeuphoric.spec ---
Summary: An X based ORIC emulator
Name: xeuphoric
Version: 0.18.2
Release: 5%{?dist}
License: GPL
Group: Applications/Emulators
Source0: http://www.teaser.fr/~amajorel/%{name}/%{name}-%{version}.tar.gz
URL: http://www.treaser.fr/~amajorel/%{name}
Source1: xeuphoric.desktop
Source2: xeuphoric.png
Patch0: xeuphoric-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: arts-devel libXext-devel desktop-file-utils
Requires: %{name}-roms
ExcludeArch: x86_64 ia64 ppc64
# excluded due to compilation problems - upstream developer changing RSN (me!)

%description
xeuphoric is an X based ORIC emulator which has full support for sound,
HIRES graphics, saving, loading and emulation of the original ORIC-1, Oric
Atmos (default) and the Telestat (which would have come next had Oric not
vanished under the waves!)

%package roms
Summary : ROMS required for %{name}
Group: Applications/Emulators
Requires: %{name} = %{version}-%{release}

%description roms
ROMS required to run %{name}

%prep
%setup -q 
%patch0 -p1
sed -i 's/\r//' doc/euphoric-0.99b/*
%{_bindir}/iconv -t UTF-8 docsrc/xeuphoric.1 -o docsrc/xeuphoric.1

%build
./configure
make CFLAGS="-DX11 %{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}/%{version}
mkdir -p %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/%{version}
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/pixmaps

install -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
cp docsrc/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
cp *.rom %{buildroot}%{_datadir}/%{name}/%{version}
cp %{SOURCE1} %{buildroot}%{_datadir}/applications
install -m 0644 .xeuphoricrc %{buildroot}%{_sysconfdir}/%{name}/%{version}/xeuphoricrc
install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png

desktop-file-install --vendor fedora \
    --dir %{buildroot}%{_datadir}/applications \
    --add-category X-Fedora \
    --delete-original \
    %{buildroot}%{_datadir}/applications/xeuphoric.desktop

%clean
rm -rf %{buildroot}

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

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

%files
%defattr(-,root,root)
%doc doc/euphoric-0.99b/* COPYING
%{_bindir}/%{name}
%{_mandir}/man1/*
%config (noreplace) %{_sysconfdir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png

%files roms
%{_datadir}/%{name}/

%changelog
* Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-5
- corrected iconv

* Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-4
- fixed sysconfdir issue
- added desktop file and desktop icon
- added post and postun
- added CFLAGS to the make line

* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-3
- created new ROM subpackage

* Sat Aug 26 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-2
- fixed sysconfdir problem

* Mon Aug 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-1
- Initial import into FE
- created datapath patch
- added own makeinstall as the provided one is broken



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xeuphoric/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2006 21:55:31 -0000	1.1
+++ .cvsignore	15 Oct 2006 21:57:01 -0000	1.2
@@ -0,0 +1 @@
+xeuphoric-0.18.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xeuphoric/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2006 21:55:31 -0000	1.1
+++ sources	15 Oct 2006 21:57:01 -0000	1.2
@@ -0,0 +1 @@
+4a2469ee45d6476350ffc0a92d165990  xeuphoric-0.18.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 15 21:57:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 14:57:01 -0700
Subject: rpms/xeuphoric import.log,1.1,1.2
Message-ID: <200610152157.k9FLv31X031453@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31417

Modified Files:
	import.log 
Log Message:
auto-import xeuphoric-0.18.2-5 on branch devel from xeuphoric-0.18.2-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xeuphoric/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Oct 2006 21:55:31 -0000	1.1
+++ import.log	15 Oct 2006 21:57:01 -0000	1.2
@@ -0,0 +1 @@
+xeuphoric-0_18_2-5:HEAD:xeuphoric-0.18.2-5.src.rpm:1160949409



From fedora-extras-commits at redhat.com  Sun Oct 15 22:00:32 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Sun, 15 Oct 2006 15:00:32 -0700
Subject: devel/common Makefile.common,1.36,1.37
Message-ID: <200610152200.k9FM0YaP031604@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31585

Modified Files:
	Makefile.common 
Log Message:
make plague-client check the path (otrs#227)


Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.common	12 Jun 2006 15:59:26 -0000	1.36
+++ Makefile.common	15 Oct 2006 22:00:32 -0000	1.37
@@ -88,7 +88,7 @@
 CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
-PLAGUE_CLIENT ?= /usr/bin/plague-client
+PLAGUE_CLIENT ?= $(which plague-client)
 
 # RPM with all the overrides in place; you can override this in your
 # .cvsextrasrc also, to use a default rpm setup



From fedora-extras-commits at redhat.com  Sun Oct 15 22:00:56 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 15 Oct 2006 15:00:56 -0700
Subject: owners owners.list,1.1830,1.1831
Message-ID: <200610152200.k9FM0wEC031625@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31608

Modified Files:
	owners.list 
Log Message:

Added xeuphoric to the list 
 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1830
retrieving revision 1.1831
diff -u -r1.1830 -r1.1831
--- owners.list	15 Oct 2006 17:37:00 -0000	1.1830
+++ owners.list	15 Oct 2006 22:00:56 -0000	1.1831
@@ -2323,6 +2323,7 @@
 Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xeuphoric|An oric emulator capable of emulating the full family|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 15 22:03:48 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Sun, 15 Oct 2006 15:03:48 -0700
Subject: devel/common Makefile.common,1.37,1.38
Message-ID: <200610152203.k9FM3oXF002062@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045

Modified Files:
	Makefile.common 
Log Message:
allow setting MOCKCFG (patch from Anthony Seward <seward AT mza DOT com> via otra)



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.common	15 Oct 2006 22:00:32 -0000	1.37
+++ Makefile.common	15 Oct 2006 22:03:48 -0000	1.38
@@ -39,6 +39,7 @@
 BUILDDIR ?= $(WORKDIR)
 RPMDIR ?= $(WORKDIR)
 MOCKDIR ?= $(WORKDIR)
+MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
 ## SOURCEDIR is special; it has to match the CVS checkout directory, 
 ## because the CVS checkout directory contains the patch files. So it basically 
 ## can't be overridden without breaking things. But we leave it a variable
@@ -240,7 +241,7 @@
 
 # test build in mock
 mockbuild : srpm
-	mock $(MOCKARGS) -r fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg --resultdir=$(MOCKDIR)/$(TAG) $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
+	mock $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(MOCKDIR)/$(TAG) $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
 
 # build for a particular arch
 $(ARCHES) : sources $(TARGETS)



From fedora-extras-commits at redhat.com  Sun Oct 15 22:10:38 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Sun, 15 Oct 2006 15:10:38 -0700
Subject: devel/mercurial mercurial.spec,1.12,1.13
Message-ID: <200610152210.k9FMAcCp002310@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/mercurial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2294

Modified Files:
	mercurial.spec 
Log Message:
dumb commit just to test syncmail still works


Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/devel/mercurial/mercurial.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mercurial.spec	29 Aug 2006 03:06:29 -0000	1.12
+++ mercurial.spec	15 Oct 2006 22:10:08 -0000	1.13
@@ -12,7 +12,7 @@
 %description
 Mercurial is a fast, lightweight source control management system designed 
 for efficient handling of very large distributed projects.
-
+ 
 %prep
 %setup -q
 



From fedora-extras-commits at redhat.com  Sun Oct 15 22:12:51 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Sun, 15 Oct 2006 15:12:51 -0700
Subject: devel/common cvs-import.sh,1.11,1.12
Message-ID: <200610152212.k9FMCpcb002342@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2321

Modified Files:
	cvs-import.sh 
Log Message:
eggs should be source files (lmacken)


Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/devel/common/cvs-import.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cvs-import.sh	19 Jun 2006 20:43:15 -0000	1.11
+++ cvs-import.sh	15 Oct 2006 22:12:21 -0000	1.12
@@ -320,7 +320,7 @@
 	case $f in 
 	    *.tar | *gz | *.bz2 | *.Z | *.zip | *.ZIP | \
 	    *.ttf | *.bin | *.tbz | *.pdf | *.rpm | \
-	    *.jar | *.war | *.db | *.cpio | *.jisp )
+	    *.jar | *.war | *.db | *.cpio | *.jisp | *.egg )
 		UPLOADFILES="$UPLOADFILES $f"
 		if [ -n "$(grep $f sources 2>/dev/null)" ] ; then
 		    # this file existed before with a different md5sum



From fedora-extras-commits at redhat.com  Sun Oct 15 23:24:46 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 16:24:46 -0700
Subject: rpms/scribes/devel scribes-configure.ac-no-python-depcheck.patch,
	NONE, 1.1 .cvsignore, 1.3, 1.4 scribes.spec, 1.7, 1.8 sources, 1.3,
	1.4 scribes-setup-install-gconf-schemas.patch, 1.1,
	NONE scribes-setup-no-dep-check.patch, 1.1,
	NONE scribes-setup-no-manual-gconf.patch, 1.1, NONE
Message-ID: <200610152324.k9FNOksW005774@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5750

Modified Files:
	.cvsignore scribes.spec sources 
Added Files:
	scribes-configure.ac-no-python-depcheck.patch 
Removed Files:
	scribes-setup-install-gconf-schemas.patch 
	scribes-setup-no-dep-check.patch 
	scribes-setup-no-manual-gconf.patch 
Log Message:
Update to new upstream version (0.2.9.87)

scribes-configure.ac-no-python-depcheck.patch:

--- NEW FILE scribes-configure.ac-no-python-depcheck.patch ---
--- configure.ac.orig	2006-10-15 14:04:26.000000000 -0700
+++ configure.ac	2006-10-15 14:06:14.000000000 -0700
@@ -3,8 +3,6 @@
 
 AC_INIT([scribes], [0.2.9.87], [<mystilleef at gmail.com>])
 
-AC_PREREQ(2.60)
-
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip])
@@ -22,9 +20,6 @@
 AM_GNU_GETTEXT_VERSION
 
 AM_PATH_PYTHON([2.4])
-AC_LANG([C])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [AC_MSG_RESULT([It worked])], [AC_MSG_ERROR([It failed])])
-
 AC_CONFIG_FILES([
 intl/Makefile
 po/Makefile.in


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jun 2006 04:28:55 -0000	1.3
+++ .cvsignore	15 Oct 2006 23:24:16 -0000	1.4
@@ -1 +1 @@
-scribes-0.2.5.tar.gz
+scribes-0.2.9.87.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scribes.spec	27 Aug 2006 22:41:05 -0000	1.7
+++ scribes.spec	15 Oct 2006 23:24:16 -0000	1.8
@@ -1,30 +1,43 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define python_module_name	Scribes
+%define python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.5
-Release:	5%{?dist}
+Version:	0.2.9.87
+Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
 URL:		http://scribes.sourceforge.net/           
 
-Source0:	http://openusability.org/download.php/93/%{name}-%{version}.tar.gz
-Patch0:		%{name}-setup-no-dep-check.patch
-Patch1:		%{name}-setup-install-gconf-schemas.patch
-Patch2:		%{name}-setup-no-manual-gconf.patch
-BuildArch:	noarch
+Source0:	http://heanet.dl.sourceforge.net/scribes/scribes-%{version}.tar.bz2
+Patch0:		%{name}-configure.ac-no-python-depcheck.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:	desktop-file-utils
-Requires:	gnome-python2-gtkspell >= 2.12
-Requires:	gnome-python2-gtksourceview >= 2.12
-Requires:	pygtk2 >= 2.8
+BuildRequires:	pkgconfig >= 0.9.0
+BuildRequires:	scrollkeeper
+BuildRequires:	autoconf
+BuildRequires:	gnome-doc-utils
+BuildRequires:	GConf2
+
+Requires:	dbus-python >= 0.60
+Requires:	pygobject2
+Requires:	pygtk2 >= 2.10
+Requires:	python >= 2.4
 Requires:	gnome-python2-gconf >= 2.12
-Requires(pre):		GConf2
-Requires(post):		GConf2
-Requires(post):		scrollkeeper
+Requires:	gnome-python2-gnomeprint >= 2.12
+Requires:	gnome-python2-gnomevfs >= 2.12
+Requires:	gnome-python2-gtksourceview >= 2.12
+Requires:	gnome-python2-gtkspell >= 2.12
+Requires:	PyXML
+Requires:	python-psyco
+
+Requires(pre):	GConf2
+Requires(post):	GConf2
+Requires(post):	scrollkeeper
 Requires(preun):	GConf2
 Requires(postun):	scrollkeeper
 
@@ -49,15 +62,22 @@
 In order to make use of its runtime documentation facilities, you will need to
 install Yelp.
 
+
 %prep
 %setup -q
+# Patch out the configure script's call to depcheck.py, since I've ensured
+# that the deps are satisfied and the depcheck.py script is happy on its own,
+# though fails when run through rpmbuild...
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
+# ..then recreate the configure script from the new configure.ac file...
+%{__autoconf}
+# ...and now configure it. Scrollkeeper and GConf schema stuff are disabled
+# since they'll be installed with the scriptlets.
+%configure --disable-scrollkeeper --disable-schemas-install
 
 
 %build
-%{__python} setup.py build
+make %{?_smp_mflags}
 
 
 %pre
@@ -70,15 +90,12 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%find_lang %{name}
+make DESTDIR=%{buildroot} install
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
-chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/findbar.py
-chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
 
 
 %post
@@ -87,6 +104,10 @@
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
 
 
 %clean
@@ -103,26 +124,38 @@
 
 %postun
 update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+scrollkeeper-update -q ||:
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG README TODO TRANSLATORS COPYING
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{python_sitelib}/%{python_module_name}
 %{_bindir}/%{name}
-%dir %{python_sitelib}/%{python_module_name}
-%{python_sitelib}/%{python_module_name}/*.py
-%{python_sitelib}/%{python_module_name}/*.pyc
-%{python_sitelib}/%{python_module_name}/*.pyo
+%{_bindir}/.scribesclient
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.svg
-%{_datadir}/application-registry/%{name}.application
 %{_datadir}/gnome/help/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
+- Update to new upstream version
+- Add patch to bypass failure in depcheck.py call:
+  + configure.ac-no-python-depcheck.patch
+- Drop old patches, no longer needed:
+  - setup-no-manual-gconf.patch
+  - setup-install-gconf-schemas.patch
+  - setup-no-dep-check.patch
+
 * Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.5-5
 - Mass FC6 rebuild
 
@@ -150,7 +183,8 @@
 - Thanks to Brian Pepple (Bug #189727).
 
 * Tue Apr 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.4.3-2
-- Added patch to remove unnecessary gconf foo in the setup.py script.
+- Added patch to remove unnecessary gconf foo in the setup.py script:
+  + setup-no-manual-gconf.patch
 - Fix a few spacing inconsistencies in the .spec file.
 
 * Sat Apr 22 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.4.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2006 04:28:55 -0000	1.3
+++ sources	15 Oct 2006 23:24:16 -0000	1.4
@@ -1 +1 @@
-5e9d0b7cda17069042e5d8e8c4f32692  scribes-0.2.5.tar.gz
+428458fd6f6a457b6e2d693f8cd1c6d3  scribes-0.2.9.87.tar.bz2


--- scribes-setup-install-gconf-schemas.patch DELETED ---


--- scribes-setup-no-dep-check.patch DELETED ---


--- scribes-setup-no-manual-gconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 15 23:49:32 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 16:49:32 -0700
Subject: rpms/scribes/devel scribes.spec,1.8,1.9
Message-ID: <200610152349.k9FNnWit005903@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5887

Modified Files:
	scribes.spec 
Log Message:
Silence a few rpmlint issues, reenable NLS build detection which was accidentally dropped in the 0.2.9.87-1 update.


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scribes.spec	15 Oct 2006 23:24:16 -0000	1.8
+++ scribes.spec	15 Oct 2006 23:49:02 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.87
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -18,6 +18,8 @@
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	pkgconfig >= 0.9.0
+BuildRequires:	gettext
+BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
 BuildRequires:	autoconf
 BuildRequires:	gnome-doc-utils
@@ -73,7 +75,7 @@
 %{__autoconf}
 # ...and now configure it. Scrollkeeper and GConf schema stuff are disabled
 # since they'll be installed with the scriptlets.
-%configure --disable-scrollkeeper --disable-schemas-install
+%configure --disable-scrollkeeper --disable-schemas-install --enable-nls
 
 
 %build
@@ -96,6 +98,9 @@
 	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
+chmod +x %{python_sitelib}/%{python_module_name}/syntax.py
+chmod +x %{python_sitelib}/%{python_module_name}/error.py
+chmod +x %{python_sitelib}/%{python_module_name}/license.py
 
 
 %post
@@ -147,6 +152,10 @@
 
 
 %changelog
+* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
+- Reenable NLS build detection (accidentally dropped in the 0.2.9.87-1 update)
+- Fix a few "non-executable file" rpmlint issues
+
 * Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
 - Update to new upstream version
 - Add patch to bypass failure in depcheck.py call:



From fedora-extras-commits at redhat.com  Mon Oct 16 00:08:32 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 17:08:32 -0700
Subject: rpms/scribes/devel scribes.spec,1.9,1.10
Message-ID: <200610160008.k9G08WvB008959@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8939

Modified Files:
	scribes.spec 
Log Message:
Fix the rpmlint issue fixing; tweak %files a bit


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scribes.spec	15 Oct 2006 23:49:02 -0000	1.9
+++ scribes.spec	16 Oct 2006 00:08:02 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.87
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -98,9 +98,9 @@
 	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
-chmod +x %{python_sitelib}/%{python_module_name}/syntax.py
-chmod +x %{python_sitelib}/%{python_module_name}/error.py
-chmod +x %{python_sitelib}/%{python_module_name}/license.py
+chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
+chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/error.py
+chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
 
 
 %post
@@ -139,7 +139,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitelib}/%{python_module_name}
+%{python_sitelib}/%{python_module_name}/
 %{_bindir}/%{name}
 %{_bindir}/.scribesclient
 %{_datadir}/%{name}/
@@ -152,6 +152,10 @@
 
 
 %changelog
+* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-3
+- Actually fix the rpmlint issues (adding the proper %%buildroot prefix)
+- Minor aesthetic change (add trailing slash to the python directory in the %%files section)
+
 * Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
 - Reenable NLS build detection (accidentally dropped in the 0.2.9.87-1 update)
 - Fix a few "non-executable file" rpmlint issues



From fedora-extras-commits at redhat.com  Mon Oct 16 01:55:38 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 18:55:38 -0700
Subject: rpms/scribes/devel scribes.spec,1.10,1.11
Message-ID: <200610160155.k9G1tcJU012294@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12278/scribes/devel

Modified Files:
	scribes.spec 
Log Message:
Fix dates in %changelog


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scribes.spec	16 Oct 2006 00:08:02 -0000	1.10
+++ scribes.spec	16 Oct 2006 01:55:08 -0000	1.11
@@ -152,15 +152,15 @@
 
 
 %changelog
-* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-3
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-3
 - Actually fix the rpmlint issues (adding the proper %%buildroot prefix)
 - Minor aesthetic change (add trailing slash to the python directory in the %%files section)
 
-* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
 - Reenable NLS build detection (accidentally dropped in the 0.2.9.87-1 update)
 - Fix a few "non-executable file" rpmlint issues
 
-* Sun Oct 25 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-1
 - Update to new upstream version
 - Add patch to bypass failure in depcheck.py call:
   + configure.ac-no-python-depcheck.patch



From fedora-extras-commits at redhat.com  Mon Oct 16 02:06:29 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 19:06:29 -0700
Subject: rpms/obmenu/devel obmenu-copy-default-xdg-menu.patch, NONE,
	1.1 obmenu.spec, 1.2, 1.3 obmenu-README.Fedora, 1.2, NONE
Message-ID: <200610160206.k9G26TTp015292@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/obmenu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15273

Modified Files:
	obmenu.spec 
Added Files:
	obmenu-copy-default-xdg-menu.patch 
Removed Files:
	obmenu-README.Fedora 
Log Message:
Add a patch from upstream to copy a default menu from /etc/xdg if one does not exist on the first run; remove README.Fedora file which explained that in the earlier release (1.0-2).

obmenu-copy-default-xdg-menu.patch:

--- NEW FILE obmenu-copy-default-xdg-menu.patch ---
--- obmenu.orig	2006-02-02 04:03:38.000000000 -0800
+++ obmenu	2006-10-15 18:49:44.000000000 -0700
@@ -470,6 +470,38 @@
 		if len(sys.argv) == 2:
 			# must be a path to a menu
 			self.menu_path = sys.argv[1]
+		elif len(sys.argv) == 1:
+			self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
+			##### HERE'S THE NEW CODE ######
+			if not os.path.isfile("%s/.config/openbox/menu.xml" % (os.getenv("HOME"))):				
+				if not os.path.isdir("%s/.config/" % (os.getenv("HOME"))):
+					try:
+						os.mkdir("%s/.config/" % (os.getenv("HOME")))
+					except:
+						print "Error: Can't create ~/.config directory!"
+						return
+					
+				if not os.path.isdir("%s/.config/openbox" % (os.getenv("HOME"))):
+					try:
+						os.mkdir("%s/.config/openbox" % (os.getenv("HOME")))
+					except:
+						print "Error: Can't create ~/.config/openbox directory!"
+						return
+			
+				if not os.path.isfile("/etc/xdg/openbox/menu.xml"):
+					print "Error: Couldn't find default menu file!"
+					return
+				
+				try:
+					orig = open("/etc/xdg/openbox/menu.xml", "r")
+					dest = open("%s/.config/openbox/menu.xml" % (os.getenv("HOME")), "w")
+					dest.write(orig.read())
+					orig.close()
+					dest.close()
+				except:
+					print "Error: Couldn't create default menu file!"
+					return
+			##### END OF NEW CODE ######
 		elif len(sys.argv) == 1:
 			self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
 		else:


Index: obmenu.spec
===================================================================
RCS file: /cvs/extras/rpms/obmenu/devel/obmenu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- obmenu.spec	4 Sep 2006 17:43:13 -0000	1.2
+++ obmenu.spec	16 Oct 2006 02:05:59 -0000	1.3
@@ -2,18 +2,21 @@
 
 Name:		obmenu
 Version:	1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A graphical menu editor for Openbox
-
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://obmenu.sourceforge.net/
+
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	%{name}-README.Fedora
 Source2:	%{name}.desktop
+Patch0:		%{name}-copy-default-xdg-menu.patch 
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
+
 Requires:	pygtk2-libglade
+
 BuildRequires:	desktop-file-utils
 
 %description
@@ -30,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -40,7 +44,6 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 chmod +x %{buildroot}%{python_sitelib}/obxml.py
-install -p -m 0644 %{SOURCE1} README.Fedora
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category	X-Fedora	\
@@ -52,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README README.Fedora
+%doc COPYING README
 %{_bindir}/%{name}
 %{_bindir}/obm-*
 %{_datadir}/%{name}/
@@ -63,11 +66,21 @@
 
 
 %changelog
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-3
+- Some minor aesthetic spec cleanups
+- Add a patch from upstream to copy the default /etx/xdg menu stuff if one
+  does not exist on the first run:
+  + copy-default-xdg-menu.patch
+- Drop unneeded README.Fedora file:
+  - README.Fedora
+
+
 * Fri Sep 01 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-2
 - Don't %%ghost the .pyo file(s) to comply with the new Extras Python
   packaging guidelines
-- Package a README.Fedora file
-- Package a .desktop file  
+- Package a README.Fedora file and a .desktop file:
+  + README.Fedora
+  + %{name}.desktop
 
 * Sun Jun 14 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-1
-- Initial packaging
\ No newline at end of file
+- Initial packaging


--- obmenu-README.Fedora DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 02:08:59 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 15 Oct 2006 19:08:59 -0700
Subject: rpms/obmenu/FC-5 obmenu-copy-default-xdg-menu.patch, NONE,
	1.1 obmenu.spec, 1.1, 1.2 obmenu-README.Fedora, 1.2, NONE
Message-ID: <200610160208.k9G28xbh015382@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/obmenu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15317

Modified Files:
	obmenu.spec 
Added Files:
	obmenu-copy-default-xdg-menu.patch 
Removed Files:
	obmenu-README.Fedora 
Log Message:
Add a patch from upstream to copy a default menu from /etc/xdg if one does not exist on the first run; remove README.Fedora file which explained that in the earlier release (1.0-2).

obmenu-copy-default-xdg-menu.patch:

--- NEW FILE obmenu-copy-default-xdg-menu.patch ---
--- obmenu.orig	2006-02-02 04:03:38.000000000 -0800
+++ obmenu	2006-10-15 18:49:44.000000000 -0700
@@ -470,6 +470,38 @@
 		if len(sys.argv) == 2:
 			# must be a path to a menu
 			self.menu_path = sys.argv[1]
+		elif len(sys.argv) == 1:
+			self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
+			##### HERE'S THE NEW CODE ######
+			if not os.path.isfile("%s/.config/openbox/menu.xml" % (os.getenv("HOME"))):				
+				if not os.path.isdir("%s/.config/" % (os.getenv("HOME"))):
+					try:
+						os.mkdir("%s/.config/" % (os.getenv("HOME")))
+					except:
+						print "Error: Can't create ~/.config directory!"
+						return
+					
+				if not os.path.isdir("%s/.config/openbox" % (os.getenv("HOME"))):
+					try:
+						os.mkdir("%s/.config/openbox" % (os.getenv("HOME")))
+					except:
+						print "Error: Can't create ~/.config/openbox directory!"
+						return
+			
+				if not os.path.isfile("/etc/xdg/openbox/menu.xml"):
+					print "Error: Couldn't find default menu file!"
+					return
+				
+				try:
+					orig = open("/etc/xdg/openbox/menu.xml", "r")
+					dest = open("%s/.config/openbox/menu.xml" % (os.getenv("HOME")), "w")
+					dest.write(orig.read())
+					orig.close()
+					dest.close()
+				except:
+					print "Error: Couldn't create default menu file!"
+					return
+			##### END OF NEW CODE ######
 		elif len(sys.argv) == 1:
 			self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
 		else:


Index: obmenu.spec
===================================================================
RCS file: /cvs/extras/rpms/obmenu/FC-5/obmenu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obmenu.spec	2 Sep 2006 17:37:07 -0000	1.1
+++ obmenu.spec	16 Oct 2006 02:08:29 -0000	1.2
@@ -2,18 +2,21 @@
 
 Name:		obmenu
 Version:	1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A graphical menu editor for Openbox
-
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://obmenu.sourceforge.net/
+
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	%{name}-README.Fedora
 Source2:	%{name}.desktop
+Patch0:		%{name}-copy-default-xdg-menu.patch 
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
+
 Requires:	pygtk2-libglade
+
 BuildRequires:	desktop-file-utils
 
 %description
@@ -30,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -40,7 +44,6 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 chmod +x %{buildroot}%{python_sitelib}/obxml.py
-cp %{SOURCE1} README.Fedora
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category	X-Fedora	\
@@ -52,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README README.Fedora
+%doc COPYING README
 %{_bindir}/%{name}
 %{_bindir}/obm-*
 %{_datadir}/%{name}/
@@ -63,11 +66,21 @@
 
 
 %changelog
+* Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-3
+- Some minor aesthetic spec cleanups
+- Add a patch from upstream to copy the default /etx/xdg menu stuff if one
+  does not exist on the first run:
+  + copy-default-xdg-menu.patch
+- Drop unneeded README.Fedora file:
+  - README.Fedora
+
+
 * Fri Sep 01 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-2
 - Don't %%ghost the .pyo file(s) to comply with the new Extras Python
   packaging guidelines
-- Package a README.Fedora file
-- Package a .desktop file  
+- Package a README.Fedora file and a .desktop file:
+  + README.Fedora
+  + %{name}.desktop
 
 * Sun Jun 14 2006 Peter Gordon <peter at thecodergeek.com> - 1.0-1
-- Initial packaging
\ No newline at end of file
+- Initial packaging


--- obmenu-README.Fedora DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 04:18:00 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:18:00 -0700
Subject: rpms/perl-Gnome2-GConf Makefile,1.1,1.2
Message-ID: <200610160418.k9G4I036021965@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-GConf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21911

Modified Files:
	Makefile 
Log Message:
update to 1.043



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	23 Aug 2006 03:28:36 -0000	1.1
+++ Makefile	16 Oct 2006 04:17:29 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Mon Oct 16 04:18:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:18:01 -0700
Subject: rpms/perl-Gnome2-GConf/FC-5 perl-Gnome2-GConf.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200610160418.k9G4I1Ed021967@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-GConf/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21911/FC-5

Modified Files:
	perl-Gnome2-GConf.spec sources 
Log Message:
update to 1.043



Index: perl-Gnome2-GConf.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/FC-5/perl-Gnome2-GConf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Gnome2-GConf.spec	5 Sep 2006 05:37:42 -0000	1.3
+++ perl-Gnome2-GConf.spec	16 Oct 2006 04:17:30 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Gnome2-GConf
-Version:        1.040
+Version:        1.043
 Release:        1%{?dist}
 Summary:        Perl wrappers for the GConf configuration engine
 License:        LGPL
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.043-1
+- update to 1.043
+
 * Mon Sep 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.040-1
 - update to 1.040
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2006 05:37:42 -0000	1.3
+++ sources	16 Oct 2006 04:17:30 -0000	1.4
@@ -1 +1 @@
-75c1c076f33ea84ea9281cd49b390a9f  Gnome2-GConf-1.040.tar.gz
+bc3fe822c5dc3324f42bd02a3d6933b7  Gnome2-GConf-1.043.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 04:18:06 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:18:06 -0700
Subject: rpms/perl-Gnome2-GConf/devel .cvsignore, 1.3,
	1.4 perl-Gnome2-GConf.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610160418.k9G4I6h7021974@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-GConf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21911/devel

Modified Files:
	.cvsignore perl-Gnome2-GConf.spec sources 
Log Message:
update to 1.043



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2006 05:37:42 -0000	1.3
+++ .cvsignore	16 Oct 2006 04:17:36 -0000	1.4
@@ -1 +1 @@
-Gnome2-GConf-1.040.tar.gz
+Gnome2-GConf-1.043.tar.gz


Index: perl-Gnome2-GConf.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/devel/perl-Gnome2-GConf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Gnome2-GConf.spec	5 Sep 2006 05:37:42 -0000	1.4
+++ perl-Gnome2-GConf.spec	16 Oct 2006 04:17:36 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Gnome2-GConf
-Version:        1.040
+Version:        1.043
 Release:        1%{?dist}
 Summary:        Perl wrappers for the GConf configuration engine
 License:        LGPL
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.043-1
+- update to 1.043
+
 * Mon Sep 04 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.040-1
 - update to 1.040
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-GConf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2006 05:37:42 -0000	1.3
+++ sources	16 Oct 2006 04:17:36 -0000	1.4
@@ -1 +1 @@
-75c1c076f33ea84ea9281cd49b390a9f  Gnome2-GConf-1.040.tar.gz
+bc3fe822c5dc3324f42bd02a3d6933b7  Gnome2-GConf-1.043.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 04:37:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:37:56 -0700
Subject: rpms/perl-Event/devel .cvsignore, 1.2, 1.3 perl-Event.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610160437.k9G4buQD022191@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22133/devel

Modified Files:
	.cvsignore perl-Event.spec sources 
Log Message:
update to 1.07



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jun 2006 19:13:59 -0000	1.2
+++ .cvsignore	16 Oct 2006 04:37:26 -0000	1.3
@@ -1 +1 @@
-Event-1.06.tar.gz
+Event-1.07.tar.gz


Index: perl-Event.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/perl-Event.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Event.spec	1 Sep 2006 04:13:38 -0000	1.3
+++ perl-Event.spec	16 Oct 2006 04:37:26 -0000	1.4
@@ -1,8 +1,6 @@
-# $Id$
-
 Name:           perl-Event
-Version:        1.06 
-Release:        2%{?dist}
+Version:        1.07
+Release:        1%{?dist}
 Summary:        Event loop processing
 
 Group:          Development/Libraries
@@ -58,11 +56,13 @@
 
 %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' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -75,13 +75,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo util LICENSE.* INSTALL
+%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo/ util/ LICENSE.* INSTALL
 %{perl_vendorarch}/auto/Event
 %{perl_vendorarch}/Event*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
+- update to 1.07
+
 * Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-2
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jun 2006 19:13:59 -0000	1.2
+++ sources	16 Oct 2006 04:37:26 -0000	1.3
@@ -1 +1 @@
-789cc8f0b011653cac6451cfef3053a8  Event-1.06.tar.gz
+34b6eaf0b3658cd800b7d8727be7e9c4  Event-1.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 04:37:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:37:55 -0700
Subject: rpms/perl-Event Makefile,1.1,1.2
Message-ID: <200610160437.k9G4btxU022182@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22133

Modified Files:
	Makefile 
Log Message:
update to 1.07



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	14 Jun 2006 19:13:41 -0000	1.1
+++ Makefile	16 Oct 2006 04:37:24 -0000	1.2
@@ -2,6 +2,15 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
+# tag & build all non-legacy branches...
+build-all :
+	@echo NOTICE: building for ${BRANCHES}
+	@sleep 5s
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
+
 common-update : common
 	@cd common && cvs update
 



From fedora-extras-commits at redhat.com  Mon Oct 16 04:37:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 15 Oct 2006 21:37:55 -0700
Subject: rpms/perl-Event/FC-5 perl-Event.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200610160437.k9G4btdn022186@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22133/FC-5

Modified Files:
	perl-Event.spec sources 
Log Message:
update to 1.07



Index: perl-Event.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/FC-5/perl-Event.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Event.spec	14 Jun 2006 19:19:06 -0000	1.2
+++ perl-Event.spec	16 Oct 2006 04:37:25 -0000	1.3
@@ -1,7 +1,5 @@
-# $Id$
-
 Name:           perl-Event
-Version:        1.06 
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Event loop processing
 
@@ -58,11 +56,13 @@
 
 %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' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -75,13 +75,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo util LICENSE.* INSTALL
+%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo/ util/ LICENSE.* INSTALL
 %{perl_vendorarch}/auto/Event
 %{perl_vendorarch}/Event*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Sun Oct 15 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
+- update to 1.07
+
+* Thu Aug 31 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-2
+- bump for mass rebuild
+
 * Wed Jun 14 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
 - add explicit provides: perl(Event) = version...  wasn't being picked up
   automagically for some reason


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jun 2006 19:13:59 -0000	1.2
+++ sources	16 Oct 2006 04:37:25 -0000	1.3
@@ -1 +1 @@
-789cc8f0b011653cac6451cfef3053a8  Event-1.06.tar.gz
+34b6eaf0b3658cd800b7d8727be7e9c4  Event-1.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 08:20:53 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon, 16 Oct 2006 01:20:53 -0700
Subject: rpms/piklab/devel piklab-0.12.1.desktop.typo-fr.patch, NONE,
	1.1 piklab-0.12.1.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610160820.k9G8KrpY002568@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544

Modified Files:
	.cvsignore sources 
Added Files:
	piklab-0.12.1.desktop.typo-fr.patch 
	piklab-0.12.1.x-desktop-fr.patch 
Log Message:
New upstream version

piklab-0.12.1.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.1.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 DocPath=piklab/index.html
 Categories=QT;KDE;Development;IDE;Electronics;
-Comment=Integrated development environment for applications based on PIC microcontrollers.
-Comment[fr]=Environnement de d?velopement int?gr? pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de d??velopement int??gr?? pour applications ?? base de microcontr??leurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.1.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.1.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 11:38:45 -0000	1.3
+++ .cvsignore	16 Oct 2006 08:20:22 -0000	1.4
@@ -1 +1 @@
-piklab-0.12.0.tar.bz2
+piklab-0.12.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Oct 2006 16:00:36 -0000	1.4
+++ sources	16 Oct 2006 08:20:22 -0000	1.5
@@ -1 +1 @@
-04d5aa820fadfe547951e1abfb651a1e  piklab-0.12.0.tar.bz2
+b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 08:22:45 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon, 16 Oct 2006 01:22:45 -0700
Subject: rpms/piklab/devel piklab.spec,1.5,1.6
Message-ID: <200610160822.k9G8MjEt002621@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2604

Modified Files:
	piklab.spec 
Log Message:
New upstream version


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- piklab.spec	2 Oct 2006 16:00:36 -0000	1.5
+++ piklab.spec	16 Oct 2006 08:22:14 -0000	1.6
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.0
-Release:	3%{?dist}
+Version:	0.12.1
+Release:	1%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -16,10 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-#Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
-Patch2:		%{name}-%{version}.desktop.typo-fr.patch
-Patch3:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-%{version}.desktop.typo-fr.patch
+Patch1:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -48,10 +46,8 @@
 %prep
 %setup -q
 
-#%patch0 -p0
-#%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%patch0 -p0
+%patch1 -p0
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -124,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct 16 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.1-1
+  - New upstream version
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-3
   - Upstream rebuilt tarball :-(
 



From fedora-extras-commits at redhat.com  Mon Oct 16 08:24:28 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon, 16 Oct 2006 01:24:28 -0700
Subject: rpms/piklab/FC-5 piklab-0.12.1.desktop.typo-fr.patch, NONE,
	1.1 piklab-0.12.1.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 piklab.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200610160824.k9G8OSbg002706@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2680

Modified Files:
	.cvsignore piklab.spec sources 
Added Files:
	piklab-0.12.1.desktop.typo-fr.patch 
	piklab-0.12.1.x-desktop-fr.patch 
Log Message:
New upstream version

piklab-0.12.1.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.1.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 DocPath=piklab/index.html
 Categories=QT;KDE;Development;IDE;Electronics;
-Comment=Integrated development environment for applications based on PIC microcontrollers.
-Comment[fr]=Environnement de d?velopement int?gr? pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de d??velopement int??gr?? pour applications ?? base de microcontr??leurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.1.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.1.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 11:39:54 -0000	1.3
+++ .cvsignore	16 Oct 2006 08:23:57 -0000	1.4
@@ -1 +1 @@
-piklab-0.12.0.tar.bz2
+piklab-0.12.1.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- piklab.spec	2 Oct 2006 16:01:24 -0000	1.4
+++ piklab.spec	16 Oct 2006 08:23:57 -0000	1.5
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.0
-Release:	3%{?dist}
+Version:	0.12.1
+Release:	1%{?dist}
 Summary:	Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):	IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -16,10 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-#Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
-Patch2:		%{name}-%{version}.desktop.typo-fr.patch
-Patch3:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-%{version}.desktop.typo-fr.patch
+Patch1:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -48,10 +46,8 @@
 %prep
 %setup -q
 
-#%patch0 -p0
-#%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%patch0 -p0
+%patch1 -p0
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -124,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct 16 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.1-1
+  - New upstream version
+
 * Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-3
   - Upstream rebuilt tarball :-(
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Oct 2006 16:01:24 -0000	1.4
+++ sources	16 Oct 2006 08:23:57 -0000	1.5
@@ -1 +1 @@
-04d5aa820fadfe547951e1abfb651a1e  piklab-0.12.0.tar.bz2
+b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 11:27:34 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 16 Oct 2006 04:27:34 -0700
Subject: rpms/ibmonitor/devel .cvsignore, 1.4, 1.5 ibmonitor.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200610161127.k9GBRY9D012789@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/ibmonitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12769

Modified Files:
	.cvsignore ibmonitor.spec sources 
Log Message:
* Mon Oct 16 2006 Adrian Reber <adrian at lisas.de> - 1.4-1
- updated to 1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Feb 2005 12:42:46 -0000	1.4
+++ .cvsignore	16 Oct 2006 11:27:04 -0000	1.5
@@ -1 +1 @@
-ibmonitor-1.3.tar.gz
+ibmonitor-1.4.tar.gz


Index: ibmonitor.spec
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/ibmonitor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ibmonitor.spec	18 Sep 2006 10:18:02 -0000	1.10
+++ ibmonitor.spec	16 Oct 2006 11:27:04 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           ibmonitor
-Version:        1.3
-Release:        4
+Version:        1.4
+Release:        1
 
 Summary:        Interactive bandwidth monitor
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://ibmonitor.sourceforge.net/
-Source0:        http://dl.sf.net/ibmonitor/ibmonitor-1.3.tar.gz
+Source0:        http://dl.sf.net/ibmonitor/ibmonitor-1.4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Adrian Reber <adrian at lisas.de> - 1.4-1
+- updated to 1.4
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 1.3-4
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Feb 2005 12:42:46 -0000	1.4
+++ sources	16 Oct 2006 11:27:04 -0000	1.5
@@ -1 +1 @@
-6f37ee0b00b62822823cdbabc9d7419e  ibmonitor-1.3.tar.gz
+b8522eda27381b4e65eed12bffd8adcd  ibmonitor-1.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 11:51:46 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:51:46 -0700
Subject: rpms/zaptel - New directory
Message-ID: <200610161151.k9GBpkNJ012959@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12955/zaptel

Log Message:
Directory /cvs/extras/rpms/zaptel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 11:51:51 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:51:51 -0700
Subject: rpms/zaptel/devel - New directory
Message-ID: <200610161151.k9GBppcQ012974@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12955/zaptel/devel

Log Message:
Directory /cvs/extras/rpms/zaptel/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 11:52:06 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:52:06 -0700
Subject: rpms/zaptel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610161152.k9GBq6LY013006@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13000

Added Files:
	Makefile import.log 
Log Message:
Setup of module zaptel


--- NEW FILE Makefile ---
# Top level Makefile for module zaptel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 16 11:52:12 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:52:12 -0700
Subject: rpms/zaptel/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610161152.k9GBqCI8013022@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13000/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zaptel


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 16 11:53:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:53:37 -0700
Subject: rpms/zaptel import.log,1.1,1.2
Message-ID: <200610161153.k9GBrbrl013128@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13087

Modified Files:
	import.log 
Log Message:
auto-import zaptel-1.4.0-2.beta1 on branch devel from zaptel-1.4.0-2.beta1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zaptel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Oct 2006 11:52:06 -0000	1.1
+++ import.log	16 Oct 2006 11:53:06 -0000	1.2
@@ -0,0 +1 @@
+zaptel-1_4_0-2_beta1:HEAD:zaptel-1.4.0-2.beta1.src.rpm:1160999578



From fedora-extras-commits at redhat.com  Mon Oct 16 11:53:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 04:53:37 -0700
Subject: rpms/zaptel/devel menuselect.makedeps, NONE, 1.1 menuselect.makeopts,
	NONE, 1.1 zaptel-1.4.0-beta1-makefile.patch, NONE,
	1.1 zaptel-1.4.0-beta1-udevzaptelowner.patch, NONE,
	1.1 zaptel.init, NONE, 1.1 zaptel.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610161153.k9GBrb4c013132@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13087/devel

Modified Files:
	.cvsignore sources 
Added Files:
	menuselect.makedeps menuselect.makeopts 
	zaptel-1.4.0-beta1-makefile.patch 
	zaptel-1.4.0-beta1-udevzaptelowner.patch zaptel.init 
	zaptel.spec 
Log Message:
auto-import zaptel-1.4.0-2.beta1 on branch devel from zaptel-1.4.0-2.beta1.src.rpm


--- NEW FILE menuselect.makedeps ---
MENUSELECT_DEPENDS_zttool=LIBNEWT 


--- NEW FILE menuselect.makeopts ---
MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb xpp_usb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode 
MENUSELECT_UTILS=sethdlc-new

zaptel-1.4.0-beta1-makefile.patch:

--- NEW FILE zaptel-1.4.0-beta1-makefile.patch ---
--- Makefile.orig	2006-10-11 20:26:26.000000000 -0500
+++ Makefile	2006-10-11 20:26:41.000000000 -0500
@@ -409,7 +409,7 @@
 		$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
 	$(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
 		$(LIB_DIR)/$(LTZ_SO)
-	if [ -z "$(INSTALL_PREFIX)" && -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
+	if [ -z "$(INSTALL_PREFIX)" -a -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled" ) ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
 
 install-include:
 	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h

zaptel-1.4.0-beta1-udevzaptelowner.patch:

--- NEW FILE zaptel-1.4.0-beta1-udevzaptelowner.patch ---
Index: build_tools/genudevrules
===================================================================
--- build_tools/genudevrules	(revision 1503)
+++ build_tools/genudevrules	(working copy)
@@ -22,10 +22,10 @@
 
 cat <<EOF
 # zaptel devices with ownership/permissions for running as non-root
-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="zaptel", GROUP="zaptel", MODE="0660"
 EOF


--- NEW FILE zaptel.init ---
#!/bin/sh
#
# zaptel        This shell script takes care of loading and unloading \
#               Zapata Telephony interfaces
# chkconfig: - 9 92
# description: The zapata telephony drivers allow you to use your linux \
# computer to accept incoming data and voice interfaces
#
# config: /etc/sysconfig/zaptel

initdir=/etc/rc.d/init.d

# Source function library.
. $initdir/functions || exit 0

# Source zaptel configuration.
[ -f /etc/sysconfig/zaptel ] && . /etc/sysconfig/zaptel

# Check that telephony is up.
[ "${TELEPHONY}" = "yes" ] || exit 0

[ -f /sbin/ztcfg ] || exit 0

[ -f /etc/zaptel.conf ] || exit 0

RETVAL=0

# See how we were called.
case "$1" in
    start)
	if [ ! -e /proc/zaptel/1 ]; then
		echo "No functioning zap hardware found in /proc/zaptel, loading ztdummy"
		action "Loading ztdummy:" modprobe ztdummy
	fi
	action "Running ztcfg: " /sbin/ztcfg
	RETVAL=$?

        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zaptel
        ;;
  stop)
	RETVAL=0

        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zaptel
        ;;
  restart)
	$0 stop
	$0 start
	;;
  reload)
	action "Reloading ztcfg: " /sbin/ztcfg
	RETVAL=$?
	;;
  status)
	echo "Status option unimplemented."
	RETVAL=$?
	;;
  *)
        echo "Usage: zaptel {start|stop|status|restart|reload}"
        exit 1
esac

exit $RETVAL



--- NEW FILE zaptel.spec ---
Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
Name: zaptel
Version: 1.4.0
Release: 2%{?dist}.beta1
License: GPL
Group: Applications/System
URL: http://www.digium.com/
Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta1.tar.gz
Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
Patch1:  zaptel-1.4.0-beta1-makefile.patch

Source1: menuselect.makedeps
Source2: menuselect.makeopts
Source3: zaptel.init

BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)

BuildRequires: newt-devel

Requires(pre): fedora-usermgmt

Requires(preun): /sbin/service
Requires(preun): /sbin/chkconfig

Requires(post): /sbin/chkconfig

Requires(postun): fedora-usermgmt

%description
Tools and libraries for using/configuring/monitoring Zapata telephony
interfaces.

%package lib
Summary:Library for using Zapata telephony interfaces
Group: Development/Libraries

%description lib
Library for using Zapata telephony interfaces.

%package utils
Summary: Tools for monitoring and testing Zapata telephony interfaces
Group: Development/Libraries
Requires: zaptel-lib = %{version}-%{release}

%description utils
Tools for monitoring and testing Zapata telephony interfaces.

%package devel
Summary: Development files for Zapata telephony interfaces
Group: Development/Libraries
Requires: zaptel-lib = %{version}-%{release}

%description devel
Development files for Zapata telephony interfaces.

%prep
%setup0 -q -n zaptel-%{version}-beta1

%patch0 -p0
%patch1 -p0

cp %{S:1} .
cp %{S:2} .
cp %{S:3} .

# convert some files to UTF-8
pushd doc
for f in zttool.8 ztcfg.8 ztmonitor.8
do
  iconv -f iso8859-1 -t utf-8 $f -o $f.tmp
  mv $f.tmp $f
done
popd

%build
pushd menuselect/mxml
%configure
popd

pushd menuselect
%configure
popd

%configure

make %{?_smp_mflags}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_initrddir}
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
mkdir -p %{buildroot}%{_sysconfdir}/udev/permissions.d
mkdir -p %{buildroot}%{_mandir}/man8
#mkdir -p %{buildroot}/lib/firmware

make install DYNFS=yes DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot} LIB_DIR=%{buildroot}%{_libdir}
make config DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot}  LIB_DIR=%{buildroot}%{_libdir}
make install-programs DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot}  LIB_DIR=%{buildroot}%{_libdir}

for f in fxotune fxstest ztdiag ztmonitor ztspeed zttest zttool
do
  mv %{buildroot}/sbin/$f %{buildroot}%{_sbindir}/$f
done

cp doc/fxotune.8 %{buildroot}%{_mandir}/man8
cp doc/ztmonitor.8 %{buildroot}%{_mandir}/man8
cp doc/ztspeed.8 %{buildroot}%{_mandir}/man8
cp doc/zttest.8 %{buildroot}%{_mandir}/man8

rm -f %{buildroot}%{_libdir}/libtonezone.a

%clean
rm -rf %{buildroot}

%post 
/usr/sbin/fedora-groupadd 29 -r zaptel &>/dev/null || :
/usr/sbin/fedora-useradd  29 -r -s /sbin/nologin -d / -M          \
                               -c 'Zapata Telephony' -g zaptel zaptel &>/dev/null || :
/sbin/chkconfig --add zaptel

%preun
if [ $1 -eq 0 ]; then
    /sbin/service zaptel stop >/dev/null 2>&1
    /sbin/chkconfig --del zaptel
fi

%post lib -p /sbin/ldconfig

%postun lib -p /sbin/ldconfig

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

%doc ChangeLog
%doc LICENSE
%doc README
%doc README.Astribank
%doc README.b410p
%doc README.fxotune
%doc README.fxsusb
%doc README.Linux26
%doc zaptel.conf.sample

%config(noreplace) %{_sysconfdir}/zaptel.conf
%config(noreplace) %{_sysconfdir}/sysconfig/zaptel
%config(noreplace) %{_sysconfdir}/modprobe.d/zaptel
%config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules

/sbin/ztcfg

%{_initrddir}/zaptel
%{_mandir}/man8/ztcfg.8*

%files lib
%defattr(-,root,root,-)
%{_libdir}/libtonezone.so.1
%{_libdir}/libtonezone.so.1.0

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

%{_sbindir}/fxotune
%{_sbindir}/fxstest
%{_sbindir}/ztdiag
%{_sbindir}/ztmonitor
%{_sbindir}/ztspeed
%{_sbindir}/zttest
%{_sbindir}/zttool

%{_mandir}/man8/fxotune.8*
%{_mandir}/man8/ztmonitor.8*
%{_mandir}/man8/ztspeed.8*
%{_mandir}/man8/zttest.8*
%{_mandir}/man8/zttool.8*

%files devel
%defattr(-,root,root,-)
%doc LICENSE
%{_includedir}/zaptel/tonezone.h
%{_includedir}/zaptel/zaptel.h
%{_libdir}/libtonezone.so

%changelog
* Sun Oct 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
- Don't package firmware until license can be figured out.

* Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
- Remove "Provides: zaptel-kmod-common"
- Don't load modules in initscript (except for possibly ztdummy) - leave that up to udev/hotplug.
- Drop ifup-hdlc - it requires sethdlc which isn't available.
- Move utilities to %%{_sbindir} rather than /sbin.
- Split libtonezone off into a separate lib package.
- Use 'zaptel' user/group to own device files.
- Add patch to fix minor makefile bug.

* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-0.beta1
- Update to 1.4.0-beta1

* Fri Jun  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.6-3
- Bump release and rebuild.

* Thu Apr 27 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.5-2
- Changed ownership of device nodes to "root" in udev rules file.
- Don't build sethdlc.

* Mon Mar 27 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.5-1
- Update to 1.2.5

* Wed Feb 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.4-1
- Update to 1.2.4

* Tue Jan 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.3-1
- Preserve timestamps when we install.
- Use custom init.d file that does all the fancy RH stuff.

* Mon Jan 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.3-1
- Update to 1.2.3.

* Mon Jan 23 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-3
- provide zaptel-kmod-common

* Wed Jan 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-2
- Bump release number.

* Wed Jan 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-1
- Update to 1.2.2.

* Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-2
- Devel subpackage needs to require main package.

* Wed Jan 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-1
- Initial version for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Oct 2006 11:52:12 -0000	1.1
+++ .cvsignore	16 Oct 2006 11:53:07 -0000	1.2
@@ -0,0 +1 @@
+zaptel-1.4.0-beta1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Oct 2006 11:52:12 -0000	1.1
+++ sources	16 Oct 2006 11:53:07 -0000	1.2
@@ -0,0 +1 @@
+6d2bae038c85770fd09a323f192cd682  zaptel-1.4.0-beta1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 13:18:11 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 06:18:11 -0700
Subject: rpms/scanbuttond - New directory
Message-ID: <200610161318.k9GDIB05019485@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481/scanbuttond

Log Message:
Directory /cvs/extras/rpms/scanbuttond added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 13:18:17 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 06:18:17 -0700
Subject: rpms/scanbuttond/devel - New directory
Message-ID: <200610161318.k9GDIHbl019499@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481/scanbuttond/devel

Log Message:
Directory /cvs/extras/rpms/scanbuttond/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 13:32:01 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 06:32:01 -0700
Subject: owners owners.list,1.1831,1.1832
Message-ID: <200610161332.k9GDW13F019749@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19557

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1831
retrieving revision 1.1832
diff -u -r1.1831 -r1.1832
--- owners.list	15 Oct 2006 22:00:56 -0000	1.1831
+++ owners.list	16 Oct 2006 13:31:31 -0000	1.1832
@@ -2008,6 +2008,7 @@
 Fedora Extras|sblim-testsuite|SBLIM automated testsuite scripts|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-wbemcli|WBEM Command Line Interface is a standalone, command line WBEM client|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scanbuttond|Scanner Button tools to SANE|panemade at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|scanssh|Fast SSH server and open proxy scanner|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 16 13:46:27 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 06:46:27 -0700
Subject: rpms/lighttpd/FC-5 .cvsignore, 1.15, 1.16 lighttpd.spec, 1.23,
	1.24 powered_by_fedora.png, 1.1, 1.2 sources, 1.15, 1.16
Message-ID: <200610161346.k9GDkRpL019871@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19841

Modified Files:
	.cvsignore lighttpd.spec powered_by_fedora.png sources 
Log Message:
Backport 1.4.13 bugfix update from devel to FC-5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	12 Jul 2006 17:39:10 -0000	1.15
+++ .cvsignore	16 Oct 2006 13:45:56 -0000	1.16
@@ -1 +1 @@
-lighttpd-1.4.11.tar.gz
+lighttpd-1.4.13.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/lighttpd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- lighttpd.spec	12 Jul 2006 17:39:10 -0000	1.23
+++ lighttpd.spec	16 Oct 2006 13:45:57 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.11
+Version: 1.4.13
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -173,6 +173,22 @@
 
 
 %changelog
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-1
+- Update to 1.4.13, which contains the previous fix.
+
+* Tue Oct  3 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-3
+- Include fix for segfaults (lighttpd bug #876, changeset 1352).
+
+* Mon Sep 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-1
+- Update to 1.4.12 final.
+
+* Fri Sep 22 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-0.1.r1332
+- Update to latest 1.4.12 pre-release, fixes SSL issues and other bugs.
+- Update powered_by_fedora.png to the new logo.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.11-2
+- FC6 rebuild.
+
 * Thu Mar  9 2006 Matthias Saou <http://freshrpms.net/> 1.4.11-1
 - Update to 1.4.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Jul 2006 17:39:10 -0000	1.15
+++ sources	16 Oct 2006 13:45:57 -0000	1.16
@@ -1 +1 @@
-f55eebb9815c94a7de35906bb557ecd3  lighttpd-1.4.11.tar.gz
+d775d6478391b95d841a1018c8db0b95  lighttpd-1.4.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 13:53:22 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 16 Oct 2006 06:53:22 -0700
Subject: rpms/nsd/devel nsd.spec,1.14,1.15
Message-ID: <200610161353.k9GDrMgY020056@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19464

Modified Files:
	nsd.spec 
Log Message:
bump for EVR



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nsd.spec	12 Oct 2006 19:43:29 -0000	1.14
+++ nsd.spec	16 Oct 2006 13:52:51 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -63,7 +63,6 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-  echo " preun "
         /sbin/service %{name} stop 
         /sbin/chkconfig --del %{name} 
 fi
@@ -74,6 +73,9 @@
 fi
 
 %changelog
+* Mon Oct 16 2006  Paul Wouters <paul at xelerance.com> 2.3.6-2
+- Bump version for upgrade path
+
 * Thu Oct 12 2006  Paul Wouters <paul at xelerance.com> 2.3.6-1
 - Upgraded to 2.3.6
 - Removed obsolete workaround in nsd.init



From fedora-extras-commits at redhat.com  Mon Oct 16 13:59:23 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Oct 2006 06:59:23 -0700
Subject: rpms/ufsparse/devel .cvsignore, 1.2, 1.3 sources, 1.8,
	1.9 ufsparse.spec, 1.15, 1.16
Message-ID: <200610161359.k9GDxNro020185@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20154

Modified Files:
	.cvsignore sources ufsparse.spec 
Log Message:
New version. Closes bug 210846.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 06:33:48 -0000	1.2
+++ .cvsignore	16 Oct 2006 13:58:52 -0000	1.3
@@ -1 +1 @@
-UFsparse.tar.gz
+SuiteSparse.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Sep 2006 14:00:08 -0000	1.8
+++ sources	16 Oct 2006 13:58:52 -0000	1.9
@@ -1 +1 @@
-1d36222397ceff76c92e4c870196011c  UFsparse.tar.gz
+bc01ef2f26e6ad3eed83b4ad62e46a68  SuiteSparse.tar.gz


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ufsparse.spec	8 Sep 2006 14:00:08 -0000	1.15
+++ ufsparse.spec	16 Oct 2006 13:58:52 -0000	1.16
@@ -1,12 +1,12 @@
 Name:           ufsparse
-Version:        2.1.0
+Version:        2.1.1
 Release:        1%{?dist}
-Summary:        University of Florida sparse matrix libraries
+Summary:        A collection of sparse matrix libraries
 
 Group:          System Environment/Libraries
 License:        Distributable
-URL:            http://www.cise.ufl.edu/research/sparse/UFsparse
-Source0:        http://www.cise.ufl.edu/research/sparse/UFsparse/v%{version}/UFsparse.tar.gz
+URL:            http://www.cise.ufl.edu/research/sparse/SuiteSparse
+Source0:        http://www.cise.ufl.edu/research/sparse/SuiteSparse/v%{version}/SuiteSparse.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -41,7 +41,7 @@
 
 
 %prep
-%setup -q -n UFsparse
+%setup -q -n SuiteSparse
 
 %build
 %define amd_version 2.0
@@ -54,7 +54,7 @@
 %define ccolamd_version_major 2
 %define cholmod_version 1.2
 %define cholmod_version_major 1
-%define colamd_version 2.5
+%define colamd_version 2.5.1
 %define colamd_version_major 2
 %define csparse_version 2.0.2
 %define csparse_version_major 2
@@ -62,7 +62,7 @@
 %define cxsparse_version_major 2
 %define klu_version 0.9
 %define klu_version_major 0
-%define ldl_version 1.3
+%define ldl_version 1.3.1
 %define ldl_version_major 1
 %define umfpack_version 5.0.1
 %define umfpack_version_major 5
@@ -272,6 +272,10 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Oct 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.1-1
+- New release, and package name change from UFsparse to SuiteSparse. Fixes
+  bug #210846. Keep the ufsparse package name for now.
+
 * Thu Sep  7 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.0-1
 - New release. Increment versions of some libraries.
 - Rearrange and clean up spec file so all definitions are in one place.



From fedora-extras-commits at redhat.com  Mon Oct 16 14:09:35 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon, 16 Oct 2006 07:09:35 -0700
Subject: rpms/moodle/FC-4 moodle.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610161409.k9GE9ZT9023338@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/FC-4

Modified Files:
	moodle.spec sources 
Log Message:
Upstream released new version





Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodle.spec	25 Aug 2006 03:24:56 -0000	1.4
+++ moodle.spec	16 Oct 2006 14:09:05 -0000	1.5
@@ -8,7 +8,7 @@
 %define with_spellcheck 0
 
 Name:           moodle
-Version:        1.5.4
+Version:        1.6.3
 Release:        1%{?dist}
 Summary:        A Course Management System
 
@@ -22,8 +22,8 @@
 Source4:        moodle-cron
 Source5:        moodle.init
 Source6:        moodle-README-rpm
-Patch0:         moodle-1.5.2-mimetex-linux.patch
-Patch1:         moodle-1.5.2-mimetex-fedora.patch
+#Patch0:         moodle-1.5.2-mimetex-linux.patch
+#Patch1:         moodle-1.5.2-mimetex-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -640,15 +640,15 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .mimetex-linux
-%patch1 -p1 -b .mimetex-fedora
+#%patch0 -p1 -b .mimetex-linux
+#%patch1 -p1 -b .mimetex-fedora
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.pl -exec chmod a+x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.cgi -exec chmod a+x {} \;
 sed -i 's/\r//' README.txt
-sed -i 's/\r//' lib/editor/plugins/SpellChecker/spell-check-logic.cgi
+sed -i 's/\r//' lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -658,6 +658,7 @@
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
 mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
 cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
+cp -ad install/lang/* $RPM_BUILD_ROOT%{moodlewebdir}/lang/
 rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
 install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
 install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
@@ -688,11 +689,12 @@
 %{moodlewebdir}/[a-ce-km-z]*
 %doc %{moodlewebdir}/doc
 %{moodlewebdir}/lib
-%exclude %{moodlewebdir}/lib/editor/plugins/SpellChecker
+%exclude %{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %{moodlewebdir}/login
 %dir %{moodlewebdir}/lang
 %{moodlewebdir}/lang/en*
-%doc %{moodlewebdir}/lang/README
+%{moodlewebdir}/lang/[^e]*_utf8
+%doc %{moodlewebdir}/lang/README.txt
 %attr(-,apache,apache) %{moodledatadir}
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
@@ -702,10 +704,18 @@
 %if %{with_spellcheck}
 %files editor-spellcheck
 %defattr(-,root,root,-)
-%{moodlewebdir}/lib/editor/plugins/SpellChecker
+%{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %endif
 
 %changelog
+* Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
+- Major changes, update to 1.6.3
+- SpellChecker moved
+- Language install method has been changed (added a cp)
+
+* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> - 1.5.4-2
+- Release bump
+
 * Thu Aug 24 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.5.4-1
 - Update to 1.5.4.
 - Remove SA18267.patch; not needed in 1.5.4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Aug 2006 03:24:56 -0000	1.3
+++ sources	16 Oct 2006 14:09:05 -0000	1.4
@@ -1 +1,2 @@
 86cddfda2b6d9a08b37cc3a16bda1090  moodle-1.5.4.tgz
+2f9f3fcf83ab0f18c409f3a48e07eae2  moodle-1.6.3.tgz



From fedora-extras-commits at redhat.com  Mon Oct 16 14:09:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon, 16 Oct 2006 07:09:36 -0700
Subject: rpms/moodle/FC-5 moodle.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610161409.k9GE9aUt023342@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297/FC-5

Modified Files:
	moodle.spec sources 
Log Message:
Upstream released new version





Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/moodle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodle.spec	25 Aug 2006 03:24:05 -0000	1.4
+++ moodle.spec	16 Oct 2006 14:09:05 -0000	1.5
@@ -8,7 +8,7 @@
 %define with_spellcheck 0
 
 Name:           moodle
-Version:        1.5.4
+Version:        1.6.3
 Release:        1%{?dist}
 Summary:        A Course Management System
 
@@ -22,8 +22,8 @@
 Source4:        moodle-cron
 Source5:        moodle.init
 Source6:        moodle-README-rpm
-Patch0:         moodle-1.5.2-mimetex-linux.patch
-Patch1:         moodle-1.5.2-mimetex-fedora.patch
+#Patch0:         moodle-1.5.2-mimetex-linux.patch
+#Patch1:         moodle-1.5.2-mimetex-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -640,15 +640,15 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .mimetex-linux
-%patch1 -p1 -b .mimetex-fedora
+#%patch0 -p1 -b .mimetex-linux
+#%patch1 -p1 -b .mimetex-fedora
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.pl -exec chmod a+x {} \;
 find $RPM_BUILD_DIR/%{name} -name \*.cgi -exec chmod a+x {} \;
 sed -i 's/\r//' README.txt
-sed -i 's/\r//' lib/editor/plugins/SpellChecker/spell-check-logic.cgi
+sed -i 's/\r//' lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -658,6 +658,7 @@
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
 mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
 cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
+cp -ad install/lang/* $RPM_BUILD_ROOT%{moodlewebdir}/lang/
 rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
 install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
 install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
@@ -688,11 +689,12 @@
 %{moodlewebdir}/[a-ce-km-z]*
 %doc %{moodlewebdir}/doc
 %{moodlewebdir}/lib
-%exclude %{moodlewebdir}/lib/editor/plugins/SpellChecker
+%exclude %{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %{moodlewebdir}/login
 %dir %{moodlewebdir}/lang
 %{moodlewebdir}/lang/en*
-%doc %{moodlewebdir}/lang/README
+%{moodlewebdir}/lang/[^e]*_utf8
+%doc %{moodlewebdir}/lang/README.txt
 %attr(-,apache,apache) %{moodledatadir}
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
@@ -702,10 +704,18 @@
 %if %{with_spellcheck}
 %files editor-spellcheck
 %defattr(-,root,root,-)
-%{moodlewebdir}/lib/editor/plugins/SpellChecker
+%{moodlewebdir}/lib/editor/htmlarea/plugins/SpellChecker
 %endif
 
 %changelog
+* Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
+- Major changes, update to 1.6.3
+- SpellChecker moved
+- Language install method has been changed (added a cp)
+
+* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> - 1.5.4-2
+- Release bump
+
 * Thu Aug 24 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.5.4-1
 - Update to 1.5.4.
 - Remove SA18267.patch; not needed in 1.5.4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Aug 2006 03:24:05 -0000	1.3
+++ sources	16 Oct 2006 14:09:05 -0000	1.4
@@ -1 +1,2 @@
 86cddfda2b6d9a08b37cc3a16bda1090  moodle-1.5.4.tgz
+2f9f3fcf83ab0f18c409f3a48e07eae2  moodle-1.6.3.tgz



From fedora-extras-commits at redhat.com  Mon Oct 16 14:27:58 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 16 Oct 2006 07:27:58 -0700
Subject: fedora-release fedora-release.spec,1.34,1.35
Message-ID: <200610161427.k9GERwOg023572@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23554

Modified Files:
	fedora-release.spec 
Log Message:
Just bump release, not version



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fedora-release.spec	15 Oct 2006 17:50:24 -0000	1.34
+++ fedora-release.spec	16 Oct 2006 14:27:55 -0000	1.35
@@ -2,8 +2,8 @@
 
 Summary:	Fedora Core release files
 Name:		fedora-release
-Version:	6.89
-Release:	1
+Version:	6
+Release:	89
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -63,6 +63,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Mon Oct 16 2006 Jesse Keating <jkeating at redhat.com> - 6-89
+- Keep version 6, bump release.  Saves from having to rebuild
+  release notes all the time
+
 * Sun Oct 15 2006 Jesse Keating <jkeating at redhat.com> - 6.89-1
 - Rebuild for rawhide
 



From fedora-extras-commits at redhat.com  Mon Oct 16 14:31:33 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 16 Oct 2006 07:31:33 -0700
Subject: devel/common Makefile.common,1.38,1.39
Message-ID: <200610161431.k9GEVXrB023648@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632

Modified Files:
	Makefile.common 
Log Message:
fix this (patch from mmcgrath)


Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.common	15 Oct 2006 22:03:48 -0000	1.38
+++ Makefile.common	16 Oct 2006 14:31:02 -0000	1.39
@@ -89,7 +89,7 @@
 CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
-PLAGUE_CLIENT ?= $(which plague-client)
+PLAGUE_CLIENT ?= $(shell which plague-client)
 
 # RPM with all the overrides in place; you can override this in your
 # .cvsextrasrc also, to use a default rpm setup



From fedora-extras-commits at redhat.com  Mon Oct 16 14:39:21 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 07:39:21 -0700
Subject: rpms/kannel/FC-5 .cvsignore, 1.3, 1.4 kannel.init, 1.1,
	1.2 kannel.spec, 1.10, 1.11 sources, 1.3,
	1.4 kannel-1.4.0-depend.patch, 1.1, NONE
Message-ID: <200610161439.k9GEdLxt023716@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23673/FC-5

Modified Files:
	.cvsignore kannel.init kannel.spec sources 
Removed Files:
	kannel-1.4.0-depend.patch 
Log Message:
Update FC5 kannel to 1.4.1 and make sure we keep sqlite2 support for FC5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 18:06:30 -0000	1.3
+++ .cvsignore	16 Oct 2006 14:38:51 -0000	1.4
@@ -1 +1 @@
-gateway-1.4.0.tar.bz2
+gateway-1.4.1.tar.bz2


Index: kannel.init
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/kannel.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kannel.init	17 Nov 2005 12:25:54 -0000	1.1
+++ kannel.init	16 Oct 2006 14:38:51 -0000	1.2
@@ -34,6 +34,10 @@
 	RETVAL_BEARER=$?
 	echo
 
+	# It seems like the bearerbox may need to settle before accepting
+	# connections from wapbox and smsbox
+	sleep 3s
+
 	# Starting wap and sms only makes sense if bearerbox is running
 	if [ $RETVAL_BEARER -eq 0 ]; then
 	  if grep "^group = wapbox" $config &>/dev/null; then


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/kannel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kannel.spec	6 Mar 2006 15:30:21 -0000	1.10
+++ kannel.spec	16 Oct 2006 14:38:51 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.0
-Release: 8%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -9,15 +9,20 @@
 Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
-Patch: kannel-1.4.0-depend.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, flex, ImageMagick
-BuildRequires: libxml2-devel, openssl-devel, zlib-devel
-BuildRequires: pcre-devel
-# DB backends
+BuildRequires: bison, byacc, flex
+BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
+# DB backends - Use sqlite2 up to FC5 and sqlite3 for FC6+ and non-Fedora
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: sqlite-devel
+%else
 BuildRequires: sqlite2-devel
-# For the docs... I think we need transfig too, so disable for now.
-#BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+%endif
+%{?_with_mysql:Buildrequires: mysql-devel}
+%{?_with_pgsql:Buildrequires: postgresql-devel}
+# For the docs...
+BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+BuildRequires: ImageMagick, transfig
 
 %description
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -47,15 +52,22 @@
 
 %prep
 %setup -n gateway-%{version}
-%patch -p0 -b .depend
 
 
 %build
 %configure \
-    --enable-start-stop-daemon \
     --enable-pcre \
-    --with-sqlite
-%{__make} %{?_smp_mflags}
+    --enable-docs \
+    --enable-start-stop-daemon \
+%if %{!?fedora:6}%{?fedora} >= 6
+    --with-sqlite3 \
+%else
+    --with-sqlite \
+%endif
+    %{?_with_mysql} \
+    %{?_with_pgsql}
+# Remove %{?_smp_mflags} since the docs fail to build with it
+%{__make}
 
 
 %install
@@ -103,7 +115,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
 %attr(0640, kannel, kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
 %config %{_sysconfdir}/rc.d/init.d/kannel
@@ -121,6 +133,20 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-2
+- Make sure we keep sqlite2 support for FC5 and below.
+
+* Mon Oct  2 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-1
+- Update to 1.4.1.
+- Remove obsolete depend patch.
+- Add 3s sleep sfter bearerbox start to let it settle before connections.
+- Switch sqlite backend from sqlite2 to new sqlite3.
+- Add conditional --with mysql and pgsql rebuild support.
+- Re-enable building the doc since transfig is now available and include PDFs.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.0-9
+- FC6 rebuild.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.4.0-8
 - FC5 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jan 2005 18:06:30 -0000	1.3
+++ sources	16 Oct 2006 14:38:51 -0000	1.4
@@ -1 +1 @@
-2ef0544002be48669d7f0f29f9f470de  gateway-1.4.0.tar.bz2
+ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2


--- kannel-1.4.0-depend.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 14:39:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 07:39:22 -0700
Subject: rpms/kannel/devel kannel.spec,1.12,1.13
Message-ID: <200610161439.k9GEdMKG023719@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23673/devel

Modified Files:
	kannel.spec 
Log Message:
Update FC5 kannel to 1.4.1 and make sure we keep sqlite2 support for FC5.



Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kannel.spec	2 Oct 2006 15:25:40 -0000	1.12
+++ kannel.spec	16 Oct 2006 14:38:52 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -12,8 +12,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, byacc, flex
 BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
-# DB backends
+# DB backends - Use sqlite2 up to FC5 and sqlite3 for FC6+ and non-Fedora
+%if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: sqlite-devel
+%else
+BuildRequires: sqlite2-devel
+%endif
 %{?_with_mysql:Buildrequires: mysql-devel}
 %{?_with_pgsql:Buildrequires: postgresql-devel}
 # For the docs...
@@ -55,8 +59,12 @@
     --enable-pcre \
     --enable-docs \
     --enable-start-stop-daemon \
-    %{?_with_mysql} \
+%if %{!?fedora:6}%{?fedora} >= 6
     --with-sqlite3 \
+%else
+    --with-sqlite \
+%endif
+    %{?_with_mysql} \
     %{?_with_pgsql}
 # Remove %{?_smp_mflags} since the docs fail to build with it
 %{__make}
@@ -125,6 +133,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-2
+- Make sure we keep sqlite2 support for FC5 and below.
+
 * Mon Oct  2 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-1
 - Update to 1.4.1.
 - Remove obsolete depend patch.



From fedora-extras-commits at redhat.com  Mon Oct 16 14:57:54 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Oct 2006 07:57:54 -0700
Subject: owners owners.list,1.1832,1.1833
Message-ID: <200610161457.k9GEvseY024027@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24011

Modified Files:
	owners.list 
Log Message:
Take ownership of gnonlin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1832
retrieving revision 1.1833
diff -u -r1.1832 -r1.1833
--- owners.list	16 Oct 2006 13:31:31 -0000	1.1832
+++ owners.list	16 Oct 2006 14:57:23 -0000	1.1833
@@ -561,7 +561,7 @@
 Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnomeradio|Graphical FM-Tuner program|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnomesword|GNOME-based Bible research tool|dakingun at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
+Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|bdpepple at ameritech.net|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnubg|A backgammon game and analyser|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnubiff|A mail notification program|splinux at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 16 15:13:36 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Oct 2006 08:13:36 -0700
Subject: rpms/ufsparse/FC-5 .cvsignore, 1.2, 1.3 sources, 1.7,
	1.8 ufsparse.spec, 1.14, 1.15
Message-ID: <200610161513.k9GFDatu027209@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27159

Modified Files:
	.cvsignore sources ufsparse.spec 
Log Message:
New version. URL change. Source tarball name change. Fix bug 210846. Rearrange spec file so all definitions are in one place.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 06:33:48 -0000	1.2
+++ .cvsignore	16 Oct 2006 15:13:05 -0000	1.3
@@ -1 +1 @@
-UFsparse.tar.gz
+SuiteSparse.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2006 14:06:45 -0000	1.7
+++ sources	16 Oct 2006 15:13:05 -0000	1.8
@@ -1 +1 @@
-7e635c3c6f6224439c96ca1ac9bb21e2  UFsparse.tar.gz
+bc01ef2f26e6ad3eed83b4ad62e46a68  SuiteSparse.tar.gz


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/FC-5/ufsparse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ufsparse.spec	16 Aug 2006 14:06:45 -0000	1.14
+++ ufsparse.spec	16 Oct 2006 15:13:05 -0000	1.15
@@ -1,12 +1,12 @@
 Name:           ufsparse
-Version:        2.0.0
+Version:        2.1.1
 Release:        1%{?dist}
-Summary:        University of Florida sparse matrix libraries
+Summary:        A collection of sparse matrix libraries
 
 Group:          System Environment/Libraries
 License:        Distributable
-URL:            http://www.cise.ufl.edu/research/sparse/UFsparse
-Source0:        http://www.cise.ufl.edu/research/sparse/UFsparse/v%{version}/UFsparse.tar.gz
+URL:            http://www.cise.ufl.edu/research/sparse/SuiteSparse
+Source0:        http://www.cise.ufl.edu/research/sparse/SuiteSparse/v%{version}/SuiteSparse.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -41,15 +41,45 @@
 
 
 %prep
-%setup -q -n UFsparse
+%setup -q -n SuiteSparse
 
 %build
 %define amd_version 2.0
 %define amd_version_major 2
-mkdir Devel
-mkdir Doc
-mkdir Lib
-mkdir Include
+%define btf_version 0.9
+%define btf_version_major 0
+%define camd_version 2.1
+%define camd_version_major 2
+%define ccolamd_version 2.5.1
+%define ccolamd_version_major 2
+%define cholmod_version 1.2
+%define cholmod_version_major 1
+%define colamd_version 2.5.1
+%define colamd_version_major 2
+%define csparse_version 2.0.2
+%define csparse_version_major 2
+%define cxsparse_version 2.0.2
+%define cxsparse_version_major 2
+%define klu_version 0.9
+%define klu_version_major 0
+%define ldl_version 1.3.1
+%define ldl_version_major 1
+%define umfpack_version 5.0.1
+%define umfpack_version_major 5
+### CHOLMOD can also be compiled to use the METIS library, but it is not
+### used here because its licensing terms exclude it from Fedora Extras.
+### To compile with METIS, define enable_metis as 1 below.
+%define enable_metis 0
+### CXSparse is a superset of CSparse, and the two share common header
+### names, so it does not make sense to build both. CXSparse is built
+### by default, but CSparse can be built instead by defining
+### enable_csparse as 1 below.
+%define enable_csparse 0
+
+mkdir Devel Devel/AMD Devel/CHOLMOD Devel/KLU Devel/LDL Devel/UMFPACK \
+	Doc Doc/AMD Doc/BTF Doc/CAMD Doc/CCOLAMD Doc/CHOLMOD Doc/COLAMD \
+	Doc/KLU Doc/LDL Doc/UMFPACK Lib Include
+
 pushd AMD
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
@@ -57,18 +87,10 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/AMD/
-  cp README.txt Doc/License Doc/ChangeLog ../Doc/AMD/
-  mkdir ../Devel/AMD/
+  cp README.txt Doc/License Doc/ChangeLog ../Doc/AMD
   cp Doc/*.pdf ../Devel/AMD/
 popd
-pushd Lib
-  ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
-  ln -sf libamd.so.%{amd_version} libamd.so
-popd
 
-%define btf_version 0.9
-%define btf_version_major 0
 pushd BTF
   pushd Lib
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" libbtf.a
@@ -76,16 +98,9 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/BTF/
-  cp README.txt Doc/lesser.txt ../Doc/BTF/
-popd
-pushd Lib
-  ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major}
-  ln -sf libbtf.so.%{btf_version} libbtf.so
+  cp README.txt Doc/lesser.txt ../Doc/BTF
 popd
 
-%define camd_version 2.1
-%define camd_version_major 2
 pushd CAMD
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
@@ -93,35 +108,19 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/CAMD/
   cp README.txt Doc/License Doc/ChangeLog ../Doc/CAMD
 popd
-pushd Lib
-  ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major}
-  ln -sf libcamd.so.%{camd_version} libcamd.so
-popd
 
-%define ccolamd_version 2.5
-%define ccolamd_version_major 2
 pushd CCOLAMD
   make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
   gcc -shared -Wl,-soname,libccolamd.so.%{ccolamd_version_major} -o libccolamd.so.%{ccolamd_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
-  mkdir ../Doc/CCOLAMD/
   cp README.txt lesser.txt ChangeLog ../Doc/CCOLAMD
 popd
 pushd Lib
-  ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major}
-  ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
 popd
 
-%define cholmod_version 1.1.1
-%define cholmod_version_major 1
-### CHOLMOD can also be compiled to use the METIS library, but it is not
-### used here because its licensing terms exclude it from Fedora Extras.
-### To compile with METIS, define enable_metis as 1 below.
-%define enable_metis 0
 %if "%{?enable_metis}" == "1"
 CHOLMOD_FLAGS="$RPM_OPT_FLAGS -I%{_includedir}/metis -fPIC"
 %else
@@ -129,49 +128,29 @@
 %endif
 pushd CHOLMOD
   pushd Lib
-    make  CFLAGS="$CHOLMOD_FLAGS"
+    make CFLAGS="$CHOLMOD_FLAGS"
     gcc -shared -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o ../Lib/libcholmod.so.%{cholmod_version} `ls *.o`
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/CHOLMOD
-  cp README.txt ../Doc/CHOLMOD/
+  cp README.txt ../Doc/CHOLMOD
   cp Cholesky/License.txt ../Doc/CHOLMOD/Cholesky_License.txt
   cp Core/License.txt ../Doc/CHOLMOD/Core_License.txt
   cp MatrixOps/License.txt ../Doc/CHOLMOD/MatrixOps_License.txt
   cp Partition/License.txt ../Doc/CHOLMOD/Partition_License.txt
   cp Supernodal/License.txt ../Doc/CHOLMOD/Supernodal_License.txt
-  mkdir ../Devel/CHOLMOD/
-  cp Doc/*.pdf ../Devel/CHOLMOD/
-popd
-pushd Lib
-  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
-  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so
+  cp Doc/*.pdf ../Devel/CHOLMOD
 popd
 
-%define colamd_version 2.5
-%define colamd_version_major 2
 pushd COLAMD
   make CFLAGS="$RPM_OPT_FLAGS -fPIC" library
   gcc -shared -Wl,-soname,libcolamd.so.%{colamd_version_major} -o libcolamd.so.%{colamd_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
-  mkdir ../Doc/COLAMD/
   cp README.txt ChangeLog ../Doc/COLAMD
 popd
-pushd Lib
-  ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major}
-  ln -sf libcolamd.so.%{colamd_version} libcolamd.so
-popd
 
-### CXSparse is a superset of CSparse, and the two share common header
-### names, so it does not make sense to build both. CXSparse is built
-### by default, but CSparse can be built instead by defining
-### enable_csparse as 1 below.
-%define enable_csparse 0
 %if "%{?enable_csparse}" == "1"
-%define csparse_version 2.0.1
-%define csparse_version_major 2
 pushd CSparse
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a
@@ -182,14 +161,8 @@
   mkdir ../Doc/CSparse/
   cp README.txt License.txt lesser.txt ../Doc/CSparse
 popd
-pushd Lib
-  ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major}
-  ln -sf libcsparse.so.%{csparse_version} libcsparse.so
-popd
 
 %else
-%define cxsparse_version 2.0.1
-%define cxsparse_version_major 2
 pushd CXSparse
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" libcxsparse.a
@@ -200,14 +173,8 @@
   mkdir ../Doc/CXSparse/
   cp README.txt License.txt lesser.txt ../Doc/CXSparse
 popd
-pushd Lib
-  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major}
-  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so
-popd
 %endif
 
-%define klu_version 0.9
-%define klu_version_major 0
 pushd KLU
   pushd Lib
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" libklu.a
@@ -215,34 +182,18 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/KLU/
-  cp README.txt Doc/lesser.txt ../Doc/KLU/
-  mkdir ../Devel/KLU/
-popd
-pushd Lib
-  ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
-  ln -sf libklu.so.%{klu_version} libklu.so
+  cp README.txt Doc/lesser.txt ../Doc/KLU
 popd
 
-%define ldl_version 1.3
-%define ldl_version_major 1
 pushd LDL
   make CFLAGS="$RPM_OPT_FLAGS -fPIC" libldl.a
   gcc -shared -Wl,-soname,libldl.so.%{ldl_version_major} -o libldl.so.%{ldl_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
-  mkdir ../Doc/LDL/
-  cp README.txt ChangeLog lesser.txt ../Doc/LDL/
-  mkdir ../Devel/LDL/
-  cp *.pdf *.ps ../Devel/LDL/
-popd
-pushd Lib
-  ln -sf libldl.so.%{ldl_version} libldl.so.%{ldl_version_major}
-  ln -sf libldl.so.%{ldl_version} libldl.so
+  cp README.txt ChangeLog lesser.txt ../Doc/LDL
+  cp *.pdf *.ps ../Devel/LDL
 popd
 
-%define umfpack_version 5.0
-%define umfpack_version_major 5
 pushd UMFPACK
   pushd Source
     make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
@@ -250,12 +201,34 @@
   popd
   cp Lib/*.a Lib/*.so* ../Lib
   cp Include/*.h ../Include
-  mkdir ../Doc/UMFPACK
   cp Doc/License Doc/ChangeLog Doc/lesser.txt README.txt ../Doc/UMFPACK
-  mkdir ../Devel/UMFPACK/
-  cp Doc/*.pdf ../Devel/UMFPACK/
+  cp Doc/*.pdf ../Devel/UMFPACK
 popd
+
 pushd Lib
+  ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
+  ln -sf libamd.so.%{amd_version} libamd.so
+  ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major}
+  ln -sf libbtf.so.%{btf_version} libbtf.so
+  ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major}
+  ln -sf libcamd.so.%{camd_version} libcamd.so
+  ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major}
+  ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
+  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
+  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so
+  ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major}
+  ln -sf libcolamd.so.%{colamd_version} libcolamd.so
+%if "%{?enable_csparse}" == "1"
+  ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major}
+  ln -sf libcsparse.so.%{csparse_version} libcsparse.so
+%else
+  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major}
+  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so
+%endif
+  ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
+  ln -sf libklu.so.%{klu_version} libklu.so
+  ln -sf libldl.so.%{ldl_version} libldl.so.%{ldl_version_major}
+  ln -sf libldl.so.%{ldl_version} libldl.so
   ln -sf libumfpack.so.%{umfpack_version} libumfpack.so.%{umfpack_version_major}
   ln -sf libumfpack.so.%{umfpack_version} libumfpack.so
 popd
@@ -299,6 +272,12 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Oct 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.1-1
+- New release, and package name change from UFsparse to SuiteSparse. Fixes
+  bug #210846. Keep the ufsparse package name for now.
+- Increment versions of some libraries.
+- Rearrange and clean up spec file so all definitions are in one place.
+
 * Wed Aug 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.0.0-1
 - New release.
 - Build newly added CAMD library.



From fedora-extras-commits at redhat.com  Mon Oct 16 15:28:55 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 16 Oct 2006 08:28:55 -0700
Subject: rpms/scanbuttond/devel Makefile,NONE,1.1
Message-ID: <200610161528.k9GFStOZ028125@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28120/devel

Added Files:
	Makefile 
Log Message:

Weird b0rkage.



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Mon Oct 16 15:32:15 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 16 Oct 2006 08:32:15 -0700
Subject: owners owners.list,1.1833,1.1834
Message-ID: <200610161532.k9GFWF56028230@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28196

Modified Files:
	owners.list 
Log Message:
Adding zaptel.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1833
retrieving revision 1.1834
diff -u -r1.1833 -r1.1834
--- owners.list	16 Oct 2006 14:57:23 -0000	1.1833
+++ owners.list	16 Oct 2006 15:31:45 -0000	1.1834
@@ -2419,6 +2419,7 @@
 Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 Fedora Extras|z88dk|Z80 cross compiler|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|zaptel|Tools and libraries for using/configuring/monitoring Zapata telephony interfaces|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|zasx|Asteroid like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 16 15:38:58 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Oct 2006 08:38:58 -0700
Subject: rpms/ginac/FC-5 .cvsignore, 1.4, 1.5 ginac.spec, 1.8, 1.9 sources,
	1.4, 1.5
Message-ID: <200610161538.k9GFcwca028343@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318

Modified Files:
	.cvsignore ginac.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Apr 2006 15:37:06 -0000	1.4
+++ .cvsignore	16 Oct 2006 15:38:28 -0000	1.5
@@ -1 +1 @@
-ginac-1.3.4.tar.bz2
+ginac-1.3.5.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/ginac.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ginac.spec	14 Apr 2006 15:37:06 -0000	1.8
+++ ginac.spec	16 Oct 2006 15:38:28 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           ginac
-Version:        1.3.4
+Version:        1.3.5
 Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
@@ -104,6 +104,9 @@
 %{_mandir}/man?/viewgar.1*
 
 %changelog
+* Mon Oct 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.5-1
+- New release.
+
 * Fri Apr 14 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.4-1
 - New release. Old patch removed.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Apr 2006 15:37:06 -0000	1.4
+++ sources	16 Oct 2006 15:38:28 -0000	1.5
@@ -1 +1 @@
-ed887e80cc119eeb07c0329990576446  ginac-1.3.4.tar.bz2
+2187bd0f79baf78514b5cbf737d67b01  ginac-1.3.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 15:44:03 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon, 16 Oct 2006 08:44:03 -0700
Subject: rpms/sysprof-kmod/FC-5 sysprof-kmod.spec,1.6,1.7
Message-ID: <200610161544.k9GFi3rb028498@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28481

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.18-1.2200.fc5



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sysprof-kmod.spec	6 Oct 2006 22:15:06 -0000	1.6
+++ sysprof-kmod.spec	16 Oct 2006 15:43:33 -0000	1.7
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.17-1.2187_FC5}
+%{!?kversion: %define kversion kernel-2.6.18-1.2200.fc5}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 
@@ -98,10 +98,13 @@
 
 
 %changelog
-* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
+* Mon Oct 16 2006 Gianluca Sforna <giallu gmail com>
+- rebuild for new kernel 2.6.18-1.2200.fc5
+
+* Thu Oct  5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-3
 - rebuild
 
-* Thu Oct 5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
+* Thu Oct  5 2006 Gianluca Sforna <giallu gmail com> 1.0.3-2
 - remove (not supported) ppc arch
 
 * Thu Jun 22 2006 Gianluca Sforna <giallu gmail com> 1.0.3-1



From fedora-extras-commits at redhat.com  Mon Oct 16 15:47:09 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 08:47:09 -0700
Subject: rpms/scanbuttond/devel buttonpressed.sh, NONE, 1.1 initscanner.sh, 
	NONE, 1.1 scanbuttond-0.2.3.diff, NONE, 1.1 scanbuttond.init,
	NONE, 1.1 scanbuttond.spec, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610161547.k9GFl99C028572@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28565/devel

Added Files:
	buttonpressed.sh initscanner.sh scanbuttond-0.2.3.diff 
	scanbuttond.init scanbuttond.spec sources 
Log Message:
auto-import scanbuttond-0.2.3-7 on branch devel from scanbuttond-0.2.3-7.src.rpm


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

# This script is started by scanbuttond whenever a scanner button has been pressed.
# Scanbuttond passes the following parameters to us:
# $1 ... the button number
# $2 ... the scanner's SANE device name, which comes in handy if there are two or 
#        more scanners. In this case we can pass the device name to SANE programs 
#        like scanimage.

TMPFILE="/tmp/scan.tiff"
LOCKFILE="/tmp/copy.lock"

case $1 in
	1)
		echo "button 1 has been pressed on $2"
		
		# This example turns your scanner+printer into a photocopier.
		# Fine-tuned for the Epson Perfection 2400, the HP LaserJet 1200 and
		# ISO A4 paper size so that the scanned document matches the printer
		# output as closely as possible.
		#
		# if [ -f $LOCKFILE ]; then
		#   echo "Error: Another scanning operation is currently in progress"
		#   exit
		# fi
		# touch $LOCKFILE
		# rm -f $TMPFILE
		 scanimage --device-name $2 -x 215 -y 297 1> /tmp/image.pnm
		 gimp /tmp/image.pnm
		# tiff2ps -z -w 8.27 -h 11.69 $TMPFILE | lpr
		# rm -f $LOCKFILE
		#
		;;
	2)
		echo "button 2 has been pressed on $2"
                 scanimage --device-name $2 -x 215 -y 297 1> /tmp/image.pnm
		 lpr /tmp/image.pnm	
		;;
	3)
		echo "button 3 has been pressed on $2"
                 scanimage --device-name $2 -x 215 -y 297 1> /tmp/image.pnm
	          evolution mailto:?attach=/tmp/image.pnm	
		;;
	4)
		echo "button 4 has been pressed on $2"
		;;
esac



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

# This script is executed whenever scanbuttond
# finds new devices.
# If your scanner needs a firmware upload or any other kind
# of special action to be taken on initialization, put
# the apropriate command here.

# Example:
 scanimage -n
# or
# sane-find-scanners


scanbuttond-0.2.3.diff:

--- NEW FILE scanbuttond-0.2.3.diff ---
diff -uNr scanbuttond-0.2.3.orig/backends/meta.conf scanbuttond-0.2.3/backends/meta.conf
--- scanbuttond-0.2.3.orig/backends/meta.conf	2006-02-15 17:43:54.000000000 +0100
+++ scanbuttond-0.2.3/backends/meta.conf	2006-10-10 10:11:05.000000000 +0200
@@ -1,6 +1,6 @@
-libscanbtnd-backend_epson.so
-libscanbtnd-backend_plustek.so
-libscanbtnd-backend_plustek_umax.so
-libscanbtnd-backend_snapscan.so
-libscanbtnd-backend_niash.so
-libscanbtnd-backend_mustek.so
+libscanbtnd-backend_epson.so.1
+libscanbtnd-backend_plustek.so.1
+libscanbtnd-backend_plustek_umax.so.1
+libscanbtnd-backend_snapscan.so.1
+libscanbtnd-backend_niash.so.1
+libscanbtnd-backend_mustek.so.1
diff -uNr scanbuttond-0.2.3.orig/scanbuttond.c scanbuttond-0.2.3/scanbuttond.c
--- scanbuttond-0.2.3.orig/scanbuttond.c	2006-02-17 00:23:53.000000000 +0100
+++ scanbuttond-0.2.3/scanbuttond.c	2006-10-10 10:14:23.000000000 +0200
@@ -32,7 +32,7 @@
 #include "scanbuttond/scanbuttond.h"
 #include "scanbuttond/loader.h"
 
-#define DEF_BACKEND_FILENAME		STRINGIFY(LIB_DIR) "/libscanbtnd-backend_meta.so"
+#define DEF_BACKEND_FILENAME		STRINGIFY(LIB_DIR) "/libscanbtnd-backend_meta.so.1"
 #define DEF_BUTTONPRESSED_SCRIPT	STRINGIFY(CFG_DIR) "/buttonpressed.sh"
 #define DEF_INITSCANNER_SCRIPT		STRINGIFY(CFG_DIR) "/initscanner.sh"
 #define DEF_POLL_DELAY			333000L


--- NEW FILE scanbuttond.init ---
#!/bin/bash
#
# Startup script for Scanbuttond
#
# chkconfig: - 98 54
# description: LISa is a small daemon which is intended to run on \
#              end user systems. It provides something like a \
#              "network neighbourhood", but only relying on the TCP/IP \
#              protocol stack, no smb or whatever.\
#              The information about the hosts in your "neighbourhood" \
#              is provided via TCP port 7741.
# processname: scanbuttond
# config: /etc/scanbuttond

# Source function library.
. /etc/rc.d/init.d/functions

# Source function library.
if [ -f /etc/init.d/functions ] ; then
  . /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ] ; then
  . /etc/rc.d/init.d/functions
else
  exit 0
fi

# Some definitions.
scanbuttond=/usr/bin/scanbuttond
prog=scanbuttond
RETVAL=0

#
start() {
        echo -n $"Starting $prog: "
        daemon $scanbuttond $OPTIONS
        RETVAL=$?
        echo
        if [ $RETVAL = 0 ] ; then
           touch /var/lock/subsys/scanbuttond
        else
           RETVAL=1
        fi
        return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $scanbuttond
	RETVAL=$?
	echo
	if [ $RETVAL = 0 ] ; then
           rm -f /var/lock/subsys/scanbuttond
        else
           RETVAL=1
        fi
        return $RETVAL
}

reload() {
	echo -n $"Reloading $prog: "
	killproc $scanbuttond -HUP
	RETVAL=$?
	echo
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        status $scanbuttond
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
        [ -f /var/lock/subsys/scanbuttond ] && restart
        ;;
  *)
	echo $"Usage: $prog {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


--- NEW FILE scanbuttond.spec ---
Name:            scanbuttond
Version:         0.2.3
Release:         7%{?dist}
Summary:         Scanner Button tools to SANE

Group:           System Environment/Libraries
License:         GPL
URL:             http://scanbuttond.sf.net
Source0:         http://easynews.dl.sourceforge.net/sourceforge/scanbuttond/%{name}-%{version}.tar.gz
Source1:         scanbuttond.init
Source2:         initscanner.sh
Source3:         buttonpressed.sh
Patch0:          scanbuttond-0.2.3.diff
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post):  /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun):/sbin/service
Requires(post):  /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires:   libusb-devel
#Requires:       sane-backends evolution cups

%description
Modern scanners usually have several front panel buttons which are intended to
trigger certain actions like copying, faxing or mailing the scanned document.
This daemon monitors the scanner's buttons and runs a shell script whenever one
of these buttons has been pressed. Because it is accessing the scanner directly
via libusb, there should be no conflicts with SANE or other scanner drivers:
scanbuttond simply won't touch the scanner hardware while you are using SANE.

%prep
%setup -q
%patch0 -p1

%build
%configure --libdir=%{_libdir}/scanbuttond
make  %{?_smp_mflags}

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

rm -rf %{buildroot}%{_libdir}/scanbuttond/*.{la,so}
mkdir -p -m 755 %{buildroot}%{_initrddir}
install -c -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/scanbuttond
rm -rf %{buildroot}%{_sysconfdir}/scanbuttond/*.sh
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/scanbuttond/
install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/scanbuttond/

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add scanbuttond


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

%preun
if [ $1 = 0 ]; then
 /sbin/service scanbuttond stop > /dev/null 2>&1 || :
 /sbin/chkconfig --del scanbuttond
fi

%files
%defattr(-,root,root)
%doc README COPYING AUTHORS ChangeLog
%{_bindir}/scanbuttond
%{_libdir}/scanbuttond
%config(noreplace) %{_sysconfdir}/scanbuttond/meta.conf
%{_sysconfdir}/scanbuttond
%{_initrddir}/scanbuttond


%changelog
* Tue Oct 12 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-7
- missing directory ownership Fixed

* Tue Oct 11 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-6
- Move libscanbtnd*so to %%{_libdir}/scanbuttond.
- Let the app dlopen *.so.1 instead of *.so.

* Tue Oct 10 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-5
- wrong preun call for ldconfig fix to postun

* Tue Oct 05 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-4
- Some SPEC file Fixes

* Tue Oct 03 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-3
- Chmod'd Source1-3 644, to avoid rpmlint error on SRPM
- Fixed error that installs Source1 *in* %%{_initrddir}/scannerbuttond/
- Renamed Source1 to scanbuttond.init

* Tue Oct 03 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-2
- Initial Release


--- NEW FILE sources ---
548e6451b398bd95d14f008b4d39ca79  scanbuttond-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 16:03:38 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 09:03:38 -0700
Subject: rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.5,1.6
Message-ID: <200610161603.k9GG3c50031714@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31685

Modified Files:
	em8300-kmod.spec 
Log Message:
* Mon Oct 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0.rc1
- Build for kernel 2.6.18-1.2200.fc5.
- Don't use <linux/config.h>.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- em8300-kmod.spec	2 Oct 2006 18:17:12 -0000	1.5
+++ em8300-kmod.spec	16 Oct 2006 16:03:07 -0000	1.6
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.17-1.2187_FC5}
+%{!?kversion: %define kversion 2.6.18-1.2200.fc5}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -47,6 +47,7 @@
 cd %{kmod_name}-%{version}-rc1
 %patch0 -p0
 %patch1 -p0
+sed -i -e 's|<linux/config\.h>|<linux/autoconf.h>|' modules/*.[hc]
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
@@ -76,7 +77,11 @@
 
 
 %changelog
-* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0
+* Mon Oct 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.0.rc1
+- Build for kernel 2.6.18-1.2200.fc5.
+- Don't use <linux/config.h>.
+
+* Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
 - Patch to default to OSS for backwards compatibility.
 - Drop early FC5 hacks.



From fedora-extras-commits at redhat.com  Mon Oct 16 16:08:25 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Mon, 16 Oct 2006 09:08:25 -0700
Subject: rpms/scanbuttond/devel scanbuttond.init, 1.1, 1.2 scanbuttond.spec, 
	1.1, 1.2
Message-ID: <200610161608.k9GG8Pd5031924@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31901/devel

Modified Files:
	scanbuttond.init scanbuttond.spec 
Log Message:



Index: scanbuttond.init
===================================================================
RCS file: /cvs/extras/rpms/scanbuttond/devel/scanbuttond.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scanbuttond.init	16 Oct 2006 15:47:09 -0000	1.1
+++ scanbuttond.init	16 Oct 2006 16:07:55 -0000	1.2
@@ -3,12 +3,9 @@
 # Startup script for Scanbuttond
 #
 # chkconfig: - 98 54
-# description: LISa is a small daemon which is intended to run on \
-#              end user systems. It provides something like a \
-#              "network neighbourhood", but only relying on the TCP/IP \
-#              protocol stack, no smb or whatever.\
-#              The information about the hosts in your "neighbourhood" \
-#              is provided via TCP port 7741.
+# description: scanbuttond is a small daemon which checks for supported scanners \
+#              when attached to system, it loads that respective backend so that \
+#              buttons on that scanners gets activated for their functionings.
 # processname: scanbuttond
 # config: /etc/scanbuttond
 


Index: scanbuttond.spec
===================================================================
RCS file: /cvs/extras/rpms/scanbuttond/devel/scanbuttond.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scanbuttond.spec	16 Oct 2006 15:47:09 -0000	1.1
+++ scanbuttond.spec	16 Oct 2006 16:07:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:            scanbuttond
 Version:         0.2.3
-Release:         7%{?dist}
+Release:         8%{?dist}
 Summary:         Scanner Button tools to SANE
 
 Group:           System Environment/Libraries
@@ -77,10 +77,13 @@
 
 
 %changelog
-* Tue Oct 12 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-7
+* Mon Oct 16 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-8
+- corrected scanbuttond.init which i hacked from lisa daemon 
+
+* Thu Oct 12 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-7
 - missing directory ownership Fixed
 
-* Tue Oct 11 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-6
+* Wed Oct 11 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-6
 - Move libscanbtnd*so to %%{_libdir}/scanbuttond.
 - Let the app dlopen *.so.1 instead of *.so.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 16:14:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 09:14:03 -0700
Subject: rpms/lighttpd/devel lighttpd.spec,1.28,1.29
Message-ID: <200610161614.k9GGE3ku032058@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32031

Modified Files:
	lighttpd.spec 
Log Message:
Minor build requirement changes.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- lighttpd.spec	11 Oct 2006 10:05:03 -0000	1.28
+++ lighttpd.spec	16 Oct 2006 16:13:33 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -21,7 +21,8 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++
+BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: readline-devel
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -173,6 +174,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-2
+- Remove gcc-c++ build req, it's part of the defaults.
+- Add readline-devel build req, needed on RHEL4.
+
 * Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-1
 - Update to 1.4.13, which contains the previous fix.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 16:20:11 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Oct 2006 09:20:11 -0700
Subject: rpms/gnonlin/devel gnonlin.spec,1.9,1.10
Message-ID: <200610161620.k9GGKB1W032148@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnonlin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32130

Modified Files:
	gnonlin.spec 
Log Message:
* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.10.5-3
- Unorphan & rebuild.
- Require gstreamer-plugins-base.
- Don't build static libraries.
- Bump minimum requirement for gst-plugins-base.



Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnonlin.spec	7 Sep 2006 21:25:17 -0000	1.9
+++ gnonlin.spec	16 Oct 2006 16:19:41 -0000	1.10
@@ -1,47 +1,62 @@
 %define		gst_req			0.10.8.1
-%define		gst_plugins_base_req	0.10.2
+%define		gst_plugins_base_req	0.10.4
 
 Name: 		gnonlin
 Version: 	0.10.5
-Release:	2
+Release:	3
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
 License: 	LGPL
 URL:		http://gnonlin.sourceforge.net/
-Source:		http://prdownloads.sourceforge.net/gnonlin/%{name}-%{version}.tar.gz
+Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: 	gstreamer-devel >= %{gst_req} gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
-Obsoletes: gnonlin-devel
+BuildRequires: 	gstreamer-devel >= %{gst_req}
+BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
+
+Requires:	gstreamer-plugins-base >= %{gst_plugins_base_req}
+Obsoletes:	gnonlin-devel
+
 
 %description
 Gnonlin is a library built on top of GStreamer (http://gstreamer.net)
 which provides support for writing non-linear audio and video editing
 applications. It introduces the concept of a timeline.
 
+
 %prep
 %setup -q
 
+
 %build
-%configure
+%configure --enable-static=no
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-%makeinstall
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_majorminor}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB README
-%{_libdir}/gstreamer-0.10/libgnl*
+%{_libdir}/gstreamer-0.10/libgnl.so
+
 
 %changelog
+* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.10.5-3
+- Unorphan & rebuild.
+- Require gstreamer-plugins-base.
+- Don't build static libraries.
+- Bump minimum requirement for gst-plugins-base.
+
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.5-2
 - rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 16:26:04 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon, 16 Oct 2006 09:26:04 -0700
Subject: rpms/sysprof-kmod/FC-5 sysprof-kmod.spec,1.7,1.8
Message-ID: <200610161626.k9GGQ4LA032375@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32332

Modified Files:
	sysprof-kmod.spec 
Log Message:
Damn cut&paste...



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sysprof-kmod.spec	16 Oct 2006 15:43:33 -0000	1.7
+++ sysprof-kmod.spec	16 Oct 2006 16:25:34 -0000	1.8
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion kernel-2.6.18-1.2200.fc5}
+%{!?kversion: %define kversion 2.6.18-1.2200.fc5}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Mon Oct 16 16:44:50 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 09:44:50 -0700
Subject: rpms/php-eaccelerator/FC-5 .cvsignore, 1.7,
	1.8 php-eaccelerator.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <200610161644.k9GGio8U032552@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/FC-5

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Log Message:
Update to 0.9.5 final.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Aug 2006 10:42:21 -0000	1.7
+++ .cvsignore	16 Oct 2006 16:44:19 -0000	1.8
@@ -1 +1 @@
-eaccelerator-0.9.5-rc1.tar.bz2
+eaccelerator-0.9.5.tar.bz2


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/php-eaccelerator.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- php-eaccelerator.spec	24 Aug 2006 10:42:21 -0000	1.12
+++ php-eaccelerator.spec	16 Oct 2006 16:44:19 -0000	1.13
@@ -1,10 +1,9 @@
 # Useful defaults when building in chroots on systems where PHP is unavailable
 %define default_extdir  %{_libdir}/php4
 %define default_apiver  20041225
-%define default_version 5.1.4
+%define default_version 5.1.6
 
 %define module_version 0.9.5
-%define prever         rc1
 
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir})
 %define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -17,14 +16,15 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 0.3.%{prever}%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.sourceforge.net/
-Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2
+Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2
 Patch0: eaccelerator-0.9.5-rc1-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: php-api = %{php_apiver}
+Requires: php = %{php_version}
 Provides: php-zend_extension
 Conflicts: php-mmcache
 BuildRequires: php, php-devel
@@ -38,7 +38,7 @@
 
 
 %prep
-%setup -n eaccelerator-%{module_version}-%{prever}
+%setup -n eaccelerator-%{module_version}
 %patch0 -p1 -b .config
 # Change paths in the example config, other values are changed by a patch
 %{__perl} -pi -e 's|/usr/lib/php4/|%{php_extdir}/|g;
@@ -75,6 +75,13 @@
 %{__rm} -rf %{buildroot}
 
 
+%preun
+# Upon last removal (not update), clean all cache files
+if [ $1 -eq 0 ]; then
+    rm -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
+fi
+
+
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING NEWS README*
@@ -85,6 +92,18 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-1
+- Update to 0.9.5 final.
+- Add cleanup of the cache directory upon package removal.
+
+* Thu Sep  7 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-0.4.rc1
+- Rebuild for PHP 5.1.6, eA still checks the exact PHP version it seems :-(
+- Put "Requires: php = %%{php_version}" back to avoid broken setups if/when
+  PHP gets updated.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 5.1.4_0.9.5-0.4.rc1
+- FC6 rebuild.
+
 * Tue Aug 22 2006 Matthias Saou <http://freshrpms.net/> 5.1.4_0.9.5-0.3.rc1
 - Update to 0.9.5-rc1.
 - Enable shared-memory, sessions and content-caching (#201319).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Aug 2006 10:42:21 -0000	1.7
+++ sources	16 Oct 2006 16:44:19 -0000	1.8
@@ -1 +1 @@
-5d03deb399f8f857d92dd092a2c69a87  eaccelerator-0.9.5-rc1.tar.bz2
+dad54af67488b83a2af6e30f661f613b  eaccelerator-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 16:44:50 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Oct 2006 09:44:50 -0700
Subject: rpms/php-eaccelerator/devel .cvsignore, 1.7,
	1.8 php-eaccelerator.spec, 1.22, 1.23 sources, 1.7, 1.8
Message-ID: <200610161644.k9GGiohO032555@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/devel

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Log Message:
Update to 0.9.5 final.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Aug 2006 12:34:56 -0000	1.7
+++ .cvsignore	16 Oct 2006 16:44:20 -0000	1.8
@@ -1 +1 @@
-eaccelerator-0.9.5-rc1.tar.bz2
+eaccelerator-0.9.5.tar.bz2


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- php-eaccelerator.spec	7 Sep 2006 12:21:59 -0000	1.22
+++ php-eaccelerator.spec	16 Oct 2006 16:44:20 -0000	1.23
@@ -4,7 +4,6 @@
 %define default_version 5.1.6
 
 %define module_version 0.9.5
-%define prever         rc1
 
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir})
 %define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -17,11 +16,11 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 0.4.%{prever}%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.sourceforge.net/
-Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2
+Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2
 Patch0: eaccelerator-0.9.5-rc1-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: php-api = %{php_apiver}
@@ -39,7 +38,7 @@
 
 
 %prep
-%setup -n eaccelerator-%{module_version}-%{prever}
+%setup -n eaccelerator-%{module_version}
 %patch0 -p1 -b .config
 # Change paths in the example config, other values are changed by a patch
 %{__perl} -pi -e 's|/usr/lib/php4/|%{php_extdir}/|g;
@@ -76,6 +75,13 @@
 %{__rm} -rf %{buildroot}
 
 
+%preun
+# Upon last removal (not update), clean all cache files
+if [ $1 -eq 0 ]; then
+    rm -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
+fi
+
+
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING NEWS README*
@@ -86,6 +92,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-1
+- Update to 0.9.5 final.
+- Add cleanup of the cache directory upon package removal.
+
 * Thu Sep  7 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-0.4.rc1
 - Rebuild for PHP 5.1.6, eA still checks the exact PHP version it seems :-(
 - Put "Requires: php = %%{php_version}" back to avoid broken setups if/when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Aug 2006 12:34:56 -0000	1.7
+++ sources	16 Oct 2006 16:44:20 -0000	1.8
@@ -1 +1 @@
-5d03deb399f8f857d92dd092a2c69a87  eaccelerator-0.9.5-rc1.tar.bz2
+dad54af67488b83a2af6e30f661f613b  eaccelerator-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 16 18:14:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:14:46 -0700
Subject: fedora-security/audit fe3,1.20,1.21 fe4,1.78,1.79 fe5,1.85,1.86
Message-ID: <200610161814.k9GIEkq9019520@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19498

Modified Files:
	fe3 fe4 fe5 
Log Message:
+CVE-????-???? VULNERABLE (clamav) #210973


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fe3	3 Oct 2006 17:41:12 -0000	1.20
+++ fe3	16 Oct 2006 18:14:43 -0000	1.21
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-????-???? VULNERABLE (clamav) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- fe4	10 Oct 2006 18:24:25 -0000	1.78
+++ fe4	16 Oct 2006 18:14:43 -0000	1.79
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-????-???? VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- fe5	10 Oct 2006 18:24:25 -0000	1.85
+++ fe5	16 Oct 2006 18:14:43 -0000	1.86
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-????-???? VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299



From fedora-extras-commits at redhat.com  Mon Oct 16 18:25:21 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:25:21 -0700
Subject: rpms/openct/devel openct.spec,1.18,1.19
Message-ID: <200610161825.k9GIPL7f019767@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19742

Modified Files:
	openct.spec 
Log Message:
* Mon Oct 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-3
- Fix udev rules for newer udev versions (#210868).



Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openct.spec	2 Oct 2006 18:41:06 -0000	1.18
+++ openct.spec	16 Oct 2006 18:24:51 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           openct
 Version:        0.6.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -57,6 +57,7 @@
 %setup -q
 sh bootstrap # avoid standard rpaths on lib64 archs
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
+sed -i -e 's|^BUS="|BUS=="|' etc/openct.udev
 
 
 %build
@@ -159,6 +160,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-3
+- Fix udev rules for newer udev versions (#210868).
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 18:29:17 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:29:17 -0700
Subject: rpms/pygpgme - New directory
Message-ID: <200610161829.k9GITHdV020091@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087/pygpgme

Log Message:
Directory /cvs/extras/rpms/pygpgme added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 18:29:23 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:29:23 -0700
Subject: rpms/pygpgme/devel - New directory
Message-ID: <200610161829.k9GITNQS020109@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087/pygpgme/devel

Log Message:
Directory /cvs/extras/rpms/pygpgme/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 18:29:35 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:29:35 -0700
Subject: rpms/pygpgme Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610161829.k9GITZDq020144@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20138

Added Files:
	Makefile import.log 
Log Message:
Setup of module pygpgme


--- NEW FILE Makefile ---
# Top level Makefile for module pygpgme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 16 18:29:41 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:29:41 -0700
Subject: rpms/pygpgme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610161829.k9GITfZ2020162@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20138/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pygpgme


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 16 18:30:31 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:30:31 -0700
Subject: rpms/pygpgme import.log,1.1,1.2
Message-ID: <200610161830.k9GIUVtN020280@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20216

Modified Files:
	import.log 
Log Message:
auto-import pygpgme-0.1-2 on branch devel from pygpgme-0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Oct 2006 18:29:35 -0000	1.1
+++ import.log	16 Oct 2006 18:30:01 -0000	1.2
@@ -0,0 +1 @@
+pygpgme-0_1-2:HEAD:pygpgme-0.1-2.src.rpm:1161023398



From fedora-extras-commits at redhat.com  Mon Oct 16 18:30:32 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 16 Oct 2006 11:30:32 -0700
Subject: rpms/pygpgme/devel pygpgme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610161830.k9GIUWog020282@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20216/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pygpgme.spec 
Log Message:
auto-import pygpgme-0.1-2 on branch devel from pygpgme-0.1-2.src.rpm


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

Name:           pygpgme
Version:        0.1
Release:        2%{?dist}
Summary:        Python module for working with OpenPGP messages

Group:          Development/Languages
License:        LGPL
URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel
BuildRequires:  gpgme-devel

%description
PyGPGME is a Python module that lets you sign, verify, encrypt and decrypt
files using the OpenPGP format.  It is built on top of GNU Privacy Guard and
the GPGME library.

%prep
%setup -q

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README PKG-INFO
%{python_sitearch}/gpgme/

%changelog
* Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
- Change URL to cheeseshop

* Sun Oct 08 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial build for Fedora Extras. 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Oct 2006 18:29:41 -0000	1.1
+++ .cvsignore	16 Oct 2006 18:30:02 -0000	1.2
@@ -0,0 +1 @@
+pygpgme-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Oct 2006 18:29:41 -0000	1.1
+++ sources	16 Oct 2006 18:30:02 -0000	1.2
@@ -0,0 +1 @@
+0878d866b6ee8a98a9003a81934ecee3  pygpgme-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 18:42:12 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 11:42:12 -0700
Subject: rpms/gnubiff/devel gnubiff.spec,1.4,1.5
Message-ID: <200610161842.k9GIgCYq020398@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20366/devel

Modified Files:
	gnubiff.spec 
Log Message:
auto-import gnubiff-2.2.2-4 on branch devel from gnubiff-2.2.2-4.src.rpm


Index: gnubiff.spec
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/devel/gnubiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnubiff.spec	13 Oct 2006 19:34:56 -0000	1.4
+++ gnubiff.spec	16 Oct 2006 18:41:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:	gnubiff
 Version:	2.2.2        
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A mail notification program
 
 Group:	Applications/Internet
@@ -10,7 +10,7 @@
 Source1:	%{name}.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gamin-devel, libglade2-devel, desktop-file-utils, gnome-panel-devel, openssl-devel  
+BuildRequires: gamin-devel, libglade2-devel, desktop-file-utils, gnome-panel-devel, openssl-devel, perl-XML-Parser  
 Requires(post): /sbin/install-info    
 Requires(preun): /sbin/install-info
 
@@ -64,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Oct 15 2006 Damien Durand <splinux at fedoraproject.org> - 2.2.2-4
+- Add perl-XML-Parser in BR
+
 * Thu Oct 13 2006 Damien Durand <splinux at fedoraproject.org> - 2.2.2-3
 - Bump Release
 



From fedora-extras-commits at redhat.com  Mon Oct 16 18:42:11 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 11:42:11 -0700
Subject: rpms/gnubiff import.log,1.5,1.6
Message-ID: <200610161842.k9GIgBfI020397@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20366

Modified Files:
	import.log 
Log Message:
auto-import gnubiff-2.2.2-4 on branch devel from gnubiff-2.2.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	13 Oct 2006 19:34:56 -0000	1.5
+++ import.log	16 Oct 2006 18:41:40 -0000	1.6
@@ -2,3 +2,4 @@
 gnubiff-2_2_2-1:HEAD:gnubiff-2.2.2-1.src.rpm:1155081764
 gnubiff-2_2_2-2_fc6:HEAD:gnubiff-2.2.2-2.fc6.src.rpm:1156786285
 gnubiff-2_2_2-3:HEAD:gnubiff-2.2.2-3.src.rpm:1160768093
+gnubiff-2_2_2-4:HEAD:gnubiff-2.2.2-4.src.rpm:1161024092



From fedora-extras-commits at redhat.com  Mon Oct 16 18:47:57 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:47:57 -0700
Subject: rpms/vdr - New directory
Message-ID: <200610161847.k9GIlvIm020504@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20500/vdr

Log Message:
Directory /cvs/extras/rpms/vdr added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 18:48:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:48:03 -0700
Subject: rpms/vdr/devel - New directory
Message-ID: <200610161848.k9GIm3h1020519@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20500/vdr/devel

Log Message:
Directory /cvs/extras/rpms/vdr/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 16 18:48:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:48:17 -0700
Subject: rpms/vdr Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610161848.k9GImHGb020552@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20546

Added Files:
	Makefile import.log 
Log Message:
Setup of module vdr


--- NEW FILE Makefile ---
# Top level Makefile for module vdr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 16 18:48:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:48:23 -0700
Subject: rpms/vdr/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610161848.k9GImNOM020575@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20546/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdr


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 16 18:48:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:48:55 -0700
Subject: owners owners.list,1.1834,1.1835
Message-ID: <200610161848.k9GImtbf020625@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20562

Modified Files:
	owners.list 
Log Message:
Add vdr (#190343).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1834
retrieving revision 1.1835
diff -u -r1.1834 -r1.1835
--- owners.list	16 Oct 2006 15:31:45 -0000	1.1834
+++ owners.list	16 Oct 2006 18:48:25 -0000	1.1835
@@ -2252,6 +2252,7 @@
 Fedora Extras|v2strip|ID3v2 tags remover|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at beer.tclug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 16 18:51:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:51:05 -0700
Subject: rpms/vdr import.log,1.1,1.2
Message-ID: <200610161851.k9GIp5sg020770@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714

Modified Files:
	import.log 
Log Message:
auto-import vdr-1.4.3-3 on branch devel from vdr-1.4.3-3.src.rpm
Initial import (#190343).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vdr/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Oct 2006 18:48:17 -0000	1.1
+++ import.log	16 Oct 2006 18:50:34 -0000	1.2
@@ -0,0 +1 @@
+vdr-1_4_3-3:HEAD:vdr-1.4.3-3.src.rpm:1161024623



From fedora-extras-commits at redhat.com  Mon Oct 16 18:51:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 11:51:05 -0700
Subject: rpms/vdr/devel vdr-1.4.1-dumpable.patch, NONE,
	1.1 vdr-1.4.1-paths.patch, NONE, 1.1 vdr-1.4.3-1.diff, NONE,
	1.1 vdr-README.package, NONE, 1.1 vdr-channel+epg.patch, NONE,
	1.1 vdr-commands.conf, NONE, 1.1 vdr-config.sh, NONE,
	1.1 vdr-reccmds.conf, NONE, 1.1 vdr-runvdr.sh, NONE,
	1.1 vdr-skincurses.conf, NONE, 1.1 vdr-sky.conf, NONE,
	1.1 vdr-udev.rules, NONE, 1.1 vdr.consoleperms, NONE,
	1.1 vdr.init, NONE, 1.1 vdr.spec, NONE, 1.1 vdr.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610161851.k9GIp5U2020774@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vdr-1.4.1-dumpable.patch vdr-1.4.1-paths.patch 
	vdr-1.4.3-1.diff vdr-README.package vdr-channel+epg.patch 
	vdr-commands.conf vdr-config.sh vdr-reccmds.conf vdr-runvdr.sh 
	vdr-skincurses.conf vdr-sky.conf vdr-udev.rules 
	vdr.consoleperms vdr.init vdr.spec vdr.sysconfig 
Log Message:
auto-import vdr-1.4.3-3 on branch devel from vdr-1.4.3-3.src.rpm
Initial import (#190343).

vdr-1.4.1-dumpable.patch:

--- NEW FILE vdr-1.4.1-dumpable.patch ---
--- vdr-1.4.1/vdr.c~	2006-06-04 12:04:47.000000000 +0300
+++ vdr-1.4.1/vdr.c	2006-07-16 18:15:11.000000000 +0300
@@ -102,9 +102,9 @@
         fprintf(stderr, "vdr: cannot set user id %u: %s\n", (unsigned int)user->pw_uid, strerror(errno));
         return false;
         }
-     if (prctl(PR_SET_DUMPABLE, 2, 0, 0, 0) < 0) {
+     if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) {
         fprintf(stderr, "vdr: warning - cannot set dumpable: %s\n", strerror(errno));
-        // always non-fatal, and will not work with kernel < 2.6.13
+        // non-fatal
         }
      }
   return true;

vdr-1.4.1-paths.patch:

--- NEW FILE vdr-1.4.1-paths.patch ---
--- vdr-1.4.1/epg2html.pl.orig	2006-04-17 15:19:08.000000000 +0300
+++ vdr-1.4.1/epg2html.pl	2006-07-01 13:30:16.000000000 +0300
@@ -2,12 +2,12 @@
 
 # A simple EPG to HTML converter
 #
-# Converts the EPG data written by 'vdr' into the file /video/epg.data
+# Converts the EPG data written by 'vdr' into the file __CACHEDIR__/epg.data
 # into a simple HTML programme listing, consisting of one file per channel
 # plus an 'index.htm' file. All output files are written into the current
 # directory.
 #
-# Usage: epg2html.pl < /video/epg.data
+# Usage: epg2html.pl < __CACHEDIR__/epg.data
 #
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
--- vdr-1.4.1/PLUGINS/src/sky/README.orig	2004-02-15 14:39:19.000000000 +0200
+++ vdr-1.4.1/PLUGINS/src/sky/README	2006-07-01 13:32:17.000000000 +0300
@@ -33,7 +33,7 @@
 data for each channel can be found (see below). Copy this file to your
 plugins config directory, in a subdirectory named 'sky', as in
 
-/video/plugins/sky/channels.conf.sky
+__CONFIGDIR__/plugins/sky/channels.conf.sky
 
 The Sky EPG is available on the Internet at http://www.bleb.org.
 The Perl script getskyepg.pl extracts the EPG data from these pages
--- vdr-1.4.1/vdr.c.orig	2006-06-04 12:04:47.000000000 +0300
+++ vdr-1.4.1/vdr.c	2006-07-01 13:30:16.000000000 +0300
@@ -379,7 +379,7 @@
                "                           there may be several -D options (default: all DVB\n"
                "                           devices will be used)\n"
                "  -E FILE,  --epgfile=FILE write the EPG data into the given FILE (default is\n"
-               "                           '%s' in the video directory)\n"
+               "                           __CACHEDIR__/%s)\n"
                "                           '-E-' disables this\n"
                "                           if FILE is a directory, the default EPG file will be\n"
                "                           created in that directory\n"
@@ -549,7 +549,7 @@
         EpgDataFileName = DEFAULTEPGDATAFILENAME;
         }
      else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
-        EpgDirectory = VideoDirectory;
+        EpgDirectory = "__CACHEDIR__";
      if (EpgDirectory)
         cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
      else
--- vdr-1.4.1/newplugin.orig	2006-04-24 20:18:41.000000000 +0300
+++ vdr-1.4.1/newplugin	2006-07-01 13:30:16.000000000 +0300
@@ -24,7 +24,7 @@
 $PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
 $PLUGIN_MAINENTRY = $PLUGIN_CLASS;
 
-$PLUGINS_SRC = "PLUGINS/src";
+$PLUGINS_SRC = ".";
 
 $README = qq
 {This is a "plugin" for the Video Disk Recorder (VDR).
--- vdr-1.4.1/vdr.1.orig	2006-04-30 11:55:12.000000000 +0300
+++ vdr-1.4.1/vdr.1	2006-07-01 13:30:16.000000000 +0300
@@ -45,7 +45,7 @@
 .TP
 .BI \-c\  dir ,\ \-\-config= dir
 Read config files from directory \fIdir\fR
-(default is to read them from the video directory).
+(default is to read them from __CONFIGDIR__).
 .TP
 .B \-d, \-\-daemon
 Run in daemon mode (implies \-\-no\-kbd).
@@ -56,7 +56,7 @@
 .TP
 .BI \-E\  file ,\ \-\-epgfile= file
 Write the EPG data into the given \fIfile\fR
-(default is \fI/video/epg.data\fR).
+(default is \fI__CACHEDIR__/epg.data\fR).
 Use \fB\-E\-\fR to disable this.
 If \fIfile\fR is a directory, the file \fIepg.data\fR
 will be created in that directory.
@@ -80,7 +80,7 @@
 LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7).
 .TP
 .BI \-L\  dir ,\ \-\-lib= dir
-Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).
+Search for plugins in directory \fIdir\fR (default is __PLUGINDIR__).
 There can be several \fB\-L\fR options with different \fIdir\fR values.
 Each of them will apply to the \fB\-P\fR options following it.
 .TP
@@ -139,7 +139,7 @@
 .TP
 .BI \-v\  dir ,\ \-\-video= dir
 Use \fIdir\fR as video directory.
-The default is \fI/video\fR.
+The default is \fI__VIDEODIR__\fR.
 .TP
 .B \-V, \-\-version
 Print version information and exit.

vdr-1.4.3-1.diff:

--- NEW FILE vdr-1.4.3-1.diff ---
diff -ruN vdr-1.4.3/CONTRIBUTORS vdr-1.4.3-1/CONTRIBUTORS
--- vdr-1.4.3/CONTRIBUTORS	2006-09-16 14:14:06.000000000 +0200
+++ vdr-1.4.3-1/CONTRIBUTORS	2006-10-07 15:59:21.000000000 +0200
@@ -1468,6 +1468,8 @@
  for reporting a problem with cPlugin::ConfigDirectory() in case a plugin calls it
  from a separate thread
  for reporting that an assignment in svdrp.c didn't use the cTimer::operator=())
+ for suggesting that the function cThread::Cancel() should only set 'running' to
+ false and not actually kill the thread if the special value -1 is given
 
 Sven Kreiensen <svenk at kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1821,6 +1823,8 @@
  the Makefile to avoid a crash in case a new version is installed on a running system
  for fixing handling video directory updates in case the timestamp of the .update
  file is in the future
+ for fixing handling video directory updates in case an other process has touched the
+ .update file after the last NeedsUpdate() check
 
 Marcel Schaeben <mts280 at gmx.de>
  for his "Easy Input" patch
@@ -2003,3 +2007,11 @@
 
 Martin Ostermann <martin at familie-ostermann.de>
  for fixing processing the PDCDescriptor in 'libsi' on big endian systems
+
+Boguslaw Juza <bogdan at uci.agh.edu.pl>
+ for reporting that there are stations that use blanks in the language codes
+ for reporting that events without an ExtendedEventDescriptor may get duplicate
+ information in their ShortText through the EPG bugfixes in case they are received
+ again
+ for reporting a problem with language codes of recorded audio tracks on channels with
+ multiple tracks
diff -ruN vdr-1.4.3/HISTORY vdr-1.4.3-1/HISTORY
--- vdr-1.4.3/HISTORY	2006-09-23 15:57:19.000000000 +0200
+++ vdr-1.4.3-1/HISTORY	2006-10-08 13:28:15.000000000 +0200
@@ -4930,3 +4930,23 @@
 2006-09-23: Version 1.4.3
 
 - Official release.
+
+2006-10-08: Version 1.4.3-1
+
+- The function cThread::Cancel() now only sets 'running' to false and does not
+  actually kill the thread if the special value -1 is given (suggested by Udo Richter).
+- Changed the I18nNormalizeLanguageCode() check to also allow blanks (and all other
+  printable characters) in the language codes (thanks to Boguslaw Juza for reporting
+  that there are stations that use blanks in these codes). Blanks are replaced with
+  underlines, so that all parts of VDR that rely on language codes to be one word
+  (without blanks) work as expected.
+- Now clearing an event's Title, ShortText and Description if there is no
+  ShortEventDescriptor or ExtendedEventDescriptor, respectively (thanks to Boguslaw
+  Juza for reporting that events without an ExtendedEventDescriptor may get
+  duplicate information in their ShortText through the EPG bugfixes in case they
+  are received again).
+- Fixed handling video directory updates in case an other process has touched the
+  .update file after the last NeedsUpdate() check (thanks to Petri Hintukainen).
+- Fixed handling language codes and descriptions of recorded audio tracks on channels
+  with multiple tracks where not all of them appear in the event data (reported by
+  Boguslaw Juza).
diff -ruN vdr-1.4.3/config.h vdr-1.4.3-1/config.h
--- vdr-1.4.3/config.h	2006-09-23 15:56:08.000000000 +0200
+++ vdr-1.4.3-1/config.h	2006-09-24 12:09:25.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.271 2006/09/23 13:56:08 kls Exp $
+ * $Id: config.h 1.272 2006/09/24 10:09:25 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.3"
+#define VDRVERSION  "1.4.3-1"
 #define VDRVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff -ruN vdr-1.4.3/eit.c vdr-1.4.3-1/eit.c
--- vdr-1.4.3/eit.c	2006-08-05 12:01:21.000000000 +0200
+++ vdr-1.4.3-1/eit.c	2006-10-07 14:32:24.000000000 +0200
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider at web.de> and Rolf Hakenes <hakenes at hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg at gmx.de>.
  *
- * $Id: eit.c 1.120 2006/08/05 10:01:21 kls Exp $
+ * $Id: eit.c 1.121 2006/10/07 12:32:24 kls Exp $
  */
 
 #include "eit.h"
@@ -234,10 +234,16 @@
             pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
             pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
+         else {
+            pEvent->SetTitle(NULL);
+            pEvent->SetShortText(NULL);
+            }
          if (ExtendedEventDescriptors) {
             char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
             pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
+         else
+            pEvent->SetDescription(NULL);
          }
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
diff -ruN vdr-1.4.3/epg.c vdr-1.4.3-1/epg.c
--- vdr-1.4.3/epg.c	2006-08-05 12:04:17.000000000 +0200
+++ vdr-1.4.3-1/epg.c	2006-10-07 15:47:28.000000000 +0200
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider at web.de> and Rolf Hakenes <hakenes at hippomi.de>.
  *
- * $Id: epg.c 1.79 2006/08/05 10:04:17 kls Exp $
+ * $Id: epg.c 1.80 2006/10/07 13:47:28 kls Exp $
  */
 
 #include "epg.h"
@@ -87,7 +87,8 @@
 tComponent *cComponents::GetComponent(int Index, uchar Stream, uchar Type)
 {
   for (int i = 0; i < numComponents; i++) {
-      if (components[i].stream == Stream && components[i].type == Type) {
+      // In case of an audio stream the 'type' check actually just distinguishes between "normal" and "Dolby Digital":
+      if (components[i].stream == Stream && (Stream != 2 || (components[i].type < 5) == (Type < 5))) {
          if (!Index--)
             return &components[i];
          }
diff -ruN vdr-1.4.3/epg.h vdr-1.4.3-1/epg.h
--- vdr-1.4.3/epg.h	2006-03-25 13:39:39.000000000 +0100
+++ vdr-1.4.3-1/epg.h	2006-10-07 15:47:19.000000000 +0200
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider at web.de> and Rolf Hakenes <hakenes at hippomi.de>.
  *
- * $Id: epg.h 1.34 2006/03/25 12:39:39 kls Exp $
+ * $Id: epg.h 1.35 2006/10/07 13:47:19 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -43,6 +43,7 @@
   void SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description);
   tComponent *Component(int Index) const { return (Index < numComponents) ? &components[Index] : NULL; }
   tComponent *GetComponent(int Index, uchar Stream, uchar Type); // Gets the Index'th component of Stream and Type, skipping other components
+                                                                 // In case of an audio stream the 'type' check actually just distinguishes between "normal" and "Dolby Digital"
   };
 
 class cSchedule;
diff -ruN vdr-1.4.3/i18n.c vdr-1.4.3-1/i18n.c
--- vdr-1.4.3/i18n.c	2006-09-16 11:08:30.000000000 +0200
+++ vdr-1.4.3-1/i18n.c	2006-10-08 10:50:30.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.282 2006/09/16 09:08:30 kls Exp $
+ * $Id: i18n.c 1.284 2006/10/08 08:50:30 kls Exp $
  *
  * Translations provided by:
  *
@@ -6243,12 +6243,31 @@
 
 const char *I18nNormalizeLanguageCode(const char *Code)
 {
-  if (Code[0] && !isalnum(Code[0]) || Code[1] && !isalnum(Code[1]) || Code[2] && !isalnum(Code[2])) {
-     // ISO 639 language codes are defined as alphabetical characters, but digits are apparently
-     // also used, for instance for "2ch"
-     //dsyslog("invalid language code: '%s'", Code);
-     return "???";
-     }
+  for (int i = 0; i < 3; i++) {
+      if (Code[i]) {
+         // ETSI EN 300 468 defines language codes as consisting of three letters
+         // according to ISO 639-2. This means that they are supposed to always consist
+         // of exactly three letters in the range a-z - no digits, UTF-8 or other
+         // funny characters. However, some broadcasters apparently don't have a
+         // copy of the DVB standard (or they do, but are perhaps unable to read it),
+         // so they put all sorts of non-standard stuff into the language codes,
+         // like nonsense as "2ch" or "A 1" (yes, they even go as far as using
+         // blanks!). Such things should go into the description of the EPG event's
+         // ComponentDescriptor.
+         // So, as a workaround for this broadcaster stupidity, let's ignore
+         // language codes with unprintable characters...
+         if (!isprint(Code[i])) {
+            //dsyslog("invalid language code: '%s'", Code);
+            return "???";
+            }
+         // ...and replace blanks with underlines (ok, this breaks the 'const'
+         // of the Code parameter - but hey, it's them who started this):
+         if (Code[i] == ' ')
+            *((char *)&Code[i]) = '_';
+         }
+      else
+         break;
+      }
   int n = I18nLanguageIndex(Code);
   return n >= 0 ? I18nLanguageCode(n) : Code;
 }
diff -ruN vdr-1.4.3/recording.c vdr-1.4.3-1/recording.c
--- vdr-1.4.3/recording.c	2006-09-16 14:12:34.000000000 +0200
+++ vdr-1.4.3-1/recording.c	2006-10-07 14:46:22.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.150 2006/09/16 12:12:34 kls Exp $
+ * $Id: recording.c 1.151 2006/10/07 12:46:22 kls Exp $
  */
 
 #include "recording.h"
@@ -941,8 +941,10 @@
 
 void cRecordings::TouchUpdate(void)
 {
+  bool needsUpdate = NeedsUpdate();
   TouchFile(UpdateFileName());
-  lastUpdate = time(NULL); // make sure we don't tigger ourselves
+  if (!needsUpdate)
+     lastUpdate = time(NULL); // make sure we don't tigger ourselves
 }
 
 bool cRecordings::NeedsUpdate(void)
diff -ruN vdr-1.4.3/thread.c vdr-1.4.3-1/thread.c
--- vdr-1.4.3/thread.c	2006-08-20 12:20:44.000000000 +0200
+++ vdr-1.4.3-1/thread.c	2006-09-24 14:54:47.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.57 2006/08/20 10:20:44 kls Exp $
+ * $Id: thread.c 1.58 2006/09/24 12:54:47 kls Exp $
  */
 
 #include "thread.h"
@@ -293,7 +293,7 @@
 void cThread::Cancel(int WaitSeconds)
 {
   running = false;
-  if (active) {
+  if (active && WaitSeconds > -1) {
      if (WaitSeconds > 0) {
         for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
             if (!Active())
diff -ruN vdr-1.4.3/thread.h vdr-1.4.3-1/thread.h
--- vdr-1.4.3/thread.h	2006-01-08 12:40:23.000000000 +0100
+++ vdr-1.4.3-1/thread.h	2006-09-24 12:10:37.000000000 +0200
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.36 2006/01/08 11:40:23 kls Exp $
+ * $Id: thread.h 1.37 2006/09/24 10:10:37 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -103,6 +103,8 @@
        ///< the Action() loop can finish in an orderly fashion and then waiting
        ///< up to WaitSeconds seconds for the thread to actually end. If the
        ///< thread doesn't end by itself, it is killed.
+       ///< If WaitSeconds is -1, only 'running' is set to false and Cancel()
+       ///< returns immediately, without killing the thread.
 public:
   cThread(const char *Description = NULL);
        ///< Creates a new thread.


--- NEW FILE vdr-README.package ---
This file describes various things about the VDR contained in this
package.

Installation layout
-------------------

As usual, "rpm -ql vdr" should give a fairly good picture where things
are installed.  The goal in this package is to make file locations be
natural to people who are used to packaged software, which causes
quite a bit of deviation from the upstream layout as of 1.4.x.  Also,
as usual, "rpm -qc vdr" lists configuration files.

Configuration
-------------

First, refer to "man 5 vdr" for general upstream VDR configuration
stuff.  Then, have a look at /etc/sysconfig/vdr.  The file is fairly
well documented, and among other things, is where one should specify
command line options to VDR itself.  The standard "vdr" init script
invokes /usr/sbin/runvdr, which reads /etc/sysconfig/vdr.

The init script and the runner load per-plugin configuration files
from the /etc/sysconfig/vdr-plugins.d directory for each found plugin.
Those files are sourced shell (bash) scripts, named like
<pluginname>.conf (so eg. for plugin libvdr-foo.*,
/etc/sysconfig/vdr-plugins.d/foo.conf is loaded).  Configure command
line options for each plugin in their respective config snippets, in
the PLUGIN_OPTIONS environment variable.

Additional plugins
------------------

While there's a bunch of pre-packaged plugins available, not
everything obviously is.  The plugin rpm specfiles are pretty simple
and very close to each other, so it is recommended to use them as
examples and roll packages of extra plugins.

If you wish to compile unpackaged local plugins, first make sure that
the vdr-devel package is installed.  Then, edit the plugin's Makefile
in the dir you extracted it into, changing VDRDIR to /usr/lib/vdr, or
/usr/lib64/vdr if you have a 64-bit system.  That's about it, the rest
should be set up automatically.  "make all" (or "make all
VDRDIR=/usr/lib*/vdr" if you don't want to edit the Makefile) in the
same dir will usually build the plugin and try to copy it into VDR's
plugin directory.  You'll probably need root access for the copy to
succeed.

If the plugin needs command line options, add them to
/etc/sysconfig/vdr-plugins.d/<pluginname>.conf into PLUGIN_OPTIONS
(see previous chapter).

vdr-channel+epg.patch:

--- NEW FILE vdr-channel+epg.patch ---
--- vdr-1.3.15/menu.c.old	2004-11-19 20:54:29.000000000 +0100
+++ vdr-1.3.15/menu.c	2004-11-19 20:58:47.000000000 +0100
@@ -368,11 +368,21 @@
 void cMenuChannelItem::Set(void)
 {
   char *buffer = NULL;
+  const cEvent *Event = NULL;
   if (!channel->GroupSep()) {
+     cSchedulesLock SchedulesLock;
+     const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
+     const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+     if (Schedule) {
+       Event = Schedule->GetPresentEvent();
+     }
+
      if (sortMode == csmProvider)
-        asprintf(&buffer, "%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
+        asprintf(&buffer, "%d\t%s - %s %c%s%c", channel->Number(), channel->Provider(), channel->Name(),
+			  Event ? '(' : ' ',Event ? Event->Title() : "", Event ? ')' : ' ');
      else
-        asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
+        asprintf(&buffer, "%d\t%s %c%s%c", channel->Number(), channel->Name(),
+			  Event ? '(' : ' ',Event ? Event->Title() : "", Event ? ')' : ' ');
      }
   else
      asprintf(&buffer, "---\t%s ----------------------------------------------------------------", channel->Name());


--- NEW FILE vdr-commands.conf ---
# Main menu commands for VDR.  See the vdr(5) manual page.

# To rip audio CD's with abcde, uncomment this.  See /etc/abcde.conf (or the
# -o option) for output format and other settings, and CDDA_TRANSPORT at
# https://bugzilla.redhat.com/166141
#
#Rip audio CD?: cd /srv/audio ; env CDDA_TRANSPORT=cooked abcde -Np


--- NEW FILE vdr-config.sh ---
#!/bin/bash

case "$1" in
    --version)
        pkg-config vdr --modversion
        ;;
    --*dir|--apiversion|--user|--group)
        pkg-config vdr --variable=${1#--}
        ;;
    *)
        echo "Error: unknown option '$1'." >&2
        exit 1
        ;;
esac


--- NEW FILE vdr-reccmds.conf ---
# Recording commands for VDR.  See the vdr(5) manual page.



--- NEW FILE vdr-runvdr.sh ---
#!/bin/bash

# runvdr - VDR launcher
#
# runvdr [VDROPTION]...

VDR=/usr/sbin/vdr
PLUGINDIR=/usr/lib/vdr
PLUGINVER=VDR_PLUGIN_VERSION

prog=$(basename $0)
log()
{
    [ -x /usr/bin/logger ] && \
        /usr/bin/logger -s -pdaemon.info -t"$prog" "$1" || echo "INFO: $1"
}

plugconf()
{
    local plugin="$1" PLUGIN_OPTIONS=
    if [ -e "/etc/sysconfig/vdr-plugins.d/$plugin.conf" ] ; then
        . "/etc/sysconfig/vdr-plugins.d/$plugin.conf"
    fi
    VDR_OPTIONS[${#VDR_OPTIONS[@]}]=-P
    if [ -z "$PLUGIN_OPTIONS" ] ; then
        VDR_OPTIONS[${#VDR_OPTIONS[@]}]="$plugin"
    else
        VDR_OPTIONS[${#VDR_OPTIONS[@]}]="$plugin $PLUGIN_OPTIONS"
    fi
}

build_cmdline()
{
    local file= plugin= p= libsuf=$1
    # Add "priority" plugins.
    if [ -n "$VDR_PLUGIN_ORDER" ] ; then
        for plugin in $VDR_PLUGIN_ORDER ; do
            if [ -e $PLUGINDIR/libvdr-${plugin}.so$libsuf ] ; then
                plugconf $plugin
            fi
        done
    fi
    # Add the rest available.
    for file in $PLUGINDIR/libvdr-*.so$libsuf ; do
        plugin=`basename $file | sed -e 's/^libvdr-\(.*\)\.so.*$/\1/'`
        if [ -n "$VDR_PLUGIN_ORDER" ] ; then
            for p in $VDR_PLUGIN_ORDER ; do
                if [ "$plugin" = "$p" ] ; then
                    # Already added.
                    continue 2
                fi
            done
        fi
        if [ -e "$file" ] ; then
            plugconf "$plugin"
        fi
    done
}

reload_dvb()
{
    modules=$(/sbin/lsmod | grep ^dvb_core | awk '{ print $4 }' | tr , ' ')
    /sbin/modprobe -r $modules dvb_core
    for module in $modules ; do
        /sbin/modprobe $module
    done
}

rc=
while true ; do

    VDR_OPTIONS=()
    if [ -n "$VDR_INIT" ] ; then
        [ -f /etc/sysconfig/vdr ] && . /etc/sysconfig/vdr
        if [ -n "$DAEMON_COREFILE_LIMIT" ] ; then
            ulimit -S -c $DAEMON_COREFILE_LIMIT >/dev/null 2>&1 && cd /tmp
        fi
        build_cmdline ${PLUGINVER:+.$PLUGINVER}
    fi

    $VDR "$@" "${VDR_OPTIONS[@]}"
    rc=$?

    # 137: "kill -KILL" eg in killproc(), others: "man vdr"
    case $rc in
        0|2|137)
            log "VDR exited with status $rc, exiting"
            break
            ;;
        *)
            log "VDR exited with status $rc, attempting restart"
            reload_dvb
            ;;
    esac

done

exit $rc


--- NEW FILE vdr-skincurses.conf ---
# Configuration snippet for vdr-skincurses                           -*- sh -*-
#
# Add command line options to pass to the skincurses plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-sky.conf ---
# Configuration snippet for vdr-sky                                  -*- sh -*-
#
# Add command line options to pass to the sky plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-udev.rules ---
# VDR friendly udev rules for DVB and other devices

# See also /etc/security/console.perms.d/*-vdr.perms and
# https://bugzilla.redhat.com/202132

# DVB devices
KERNEL=="dvb*", GROUP="VDR_GROUP", MODE="0660"

# Remote controller, serial port 1 (eg. vdr --rcu=/dev/ttyS0):
#KERNEL=="ttyS0", GROUP="VDR_GROUP", MODE="0660"

# Remote controller, /dev/input/event2 (using the remote plugin):
#KERNEL=="event2", GROUP="VDR_GROUP", MODE="0660"

# Example rule for predictable event device name (/dev/input/event-remote;
# reported to work with a Hauppauge Nexus-S, "name" needs to be adjusted to
# match the device name for other remote controllers):
#SUBSYSTEM=="input", SYSFS{../name}=="DVB on-card IR receiver", SYMLINK+="input/event-remote"


--- NEW FILE vdr.consoleperms ---
# VDR friendly permissions and ownerships for various devices.  These take
# effect at boot time as well as on console logins and logouts.  See also
# /etc/udev/rules.d/*-vdr.rules and https://bugzilla.redhat.com/202132

# DVB devices:
<vdrdvb>=/dev/dvb/adapter*/*
<console>  0660 <vdrdvb>     0660 root.VDR_GROUP

# Optical drives; uncomment/adjust if you want to use them with VDR:
#<vdroptical>=/dev/cdrom* /dev/cdrw* /dev/cdwriter* /dev/dvd*
#<console>  0660 <vdroptical> 0660 root.VDR_GROUP

# Remote controller, serial port 1 (eg. vdr --rcu=/dev/ttyS0):
#<vdrremote>=/dev/ttyS0
# Remote controller, /dev/input/event2 (using the remote plugin):
#<vdrremote>=/dev/input/event2
# Remote controller using the example in /etc/udev/rules.d/*-vdr.rules:
#<vdrremote>=/dev/input/event-remote
# Uncomment this if you have any <vdrremote>s above uncommented:
#<console>  0660 <vdrremote>    0660 root.VDR_GROUP


--- NEW FILE vdr.init ---
#!/bin/bash
#
# vdr          Video Disk Recorder
#
# chkconfig:   - 30 70
# description: Video Disk Recorder (VDR) implements a complete digital \
#              set-top-box and video recorder.  It can work with signals \
#              received from satellites (DVB-S) as well as cable (DVB-C) \
#              and terrestrial (DVB-T) signals.  At least one DVB card \
#              is required to run VDR.
# processname: vdr

# Source function library.
. /etc/rc.d/init.d/functions

prog=vdr
runner=/usr/sbin/runvdr

log()
{
    [ -x /usr/bin/logger ] && \
        /usr/bin/logger -s -pdaemon.error -t"$prog" "$1" || echo "$1"
}

checkconf()
{
    cfg=/etc/vdr/channels.conf
    if [ ! -s "$cfg" ] ; then
        failure
        echo
        log $"Error: no valid $cfg found."
        log $"Use \"scandvb -o vdr\" from the dvb-apps package to create one."
        return 6
    else
        chown VDR_USER:VDR_GROUP "$cfg" && chmod 644 "$cfg"
    fi
}

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting Video Disk Recorder ($prog): "
    checkconf || return $?
    VDR_INIT=1 daemon --check=$prog "$runner >/dev/null 2>&1 &"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping Video Disk Recorder ($prog): "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart)
        $1
        ;;
    reload|force-reload)
        restart
        ;;
    status)
        status $prog
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE vdr.spec ---
# TODO, maybe some day:
# - livebuffer patch, http://www.vdr-portal.de/board/thread.php?threadid=37309
# - channelfilter patch, http://www.u32.de/vdr.html#patches
# - UTF-8 patch

%define videodir  /srv/vdr
%define audiodir  /srv/audio
%define plugindir %{_libdir}/vdr
%define configdir %{_sysconfdir}/vdr
%define datadir   %{_datadir}/vdr
%define cachedir  %{_var}/cache/vdr
%define rundir    %{_var}/run/vdr
%define vardir    %{_var}/lib/vdr
%define vdr_user  vdr
%define vdr_group video
# From APIVERSION in config.h
%define apiver    1.4.3

Name:           vdr
Version:        1.4.3
Release:        3%{?dist}
Summary:        Video Disk Recorder

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.cadsoft.de/vdr/
Source0:        ftp://ftp.cadsoft.de/vdr/%{name}-%{version}.tar.bz2
Source1:        %{name}.init
Source2:        %{name}.sysconfig
Source4:        %{name}-udev.rules
Source5:        %{name}-reccmds.conf
Source6:        %{name}-commands.conf
Source7:        %{name}-runvdr.sh
Source8:        %{name}.consoleperms
Source9:        %{name}-config.sh
Source10:       %{name}-README.package
Source11:       %{name}-skincurses.conf
Source12:       %{name}-sky.conf
Patch0:         %{name}-channel+epg.patch
Patch1:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.3-1.ds.diff.gz
Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.3-liemikuutio-1.13.diff.gz
Patch3:         %{name}-1.4.1-paths.patch
Patch4:         %{name}-1.4.1-dumpable.patch
Patch10:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.3-1.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libjpeg-devel
BuildRequires:  libcap-devel
BuildRequires:  pkgconfig
BuildRequires:  perl(File::Spec)
Requires:       udev
Requires(pre):  %{_sbindir}/groupadd
Requires(pre):  %{_sbindir}/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Provides:       vdr(abi) = %{apiver}

%description
VDR implements a complete digital set-top-box and video recorder.
It can work with signals received from satellites (DVB-S) as well as
cable (DVB-C) and terrestrial (DVB-T) signals.  At least one DVB card
is required to run VDR.

%package        devel
Summary:        Development files for VDR
Group:          Development/Libraries
Requires:       pkgconfig
Provides:       vdr-devel(api) = %{apiver}

%description    devel
%{summary}.

%package        skincurses
Summary:        Shell window skin plugin for VDR
Group:          Applications/Multimedia
%if 0%{?_with_plugins:1}
BuildRequires:  ncurses-devel
%endif
Requires:       vdr(abi) = %{apiver}

%description    skincurses
The skincurses plugin implements a VDR skin that works in a shell
window, using only plain text output.

%package        sky
Summary:        Sky Digibox plugin for VDR
Group:          Applications/Multimedia
Requires:       vdr(abi) = %{apiver}

%description    sky
The sky plugin implements a new device for VDR, which is based on the
MPEG2 encoder card described at linuxtv.org/mpeg2/kfir.xml.  It allows
you to connect the analog a/v output of your Sky Digibox to VDR, so
that you can enjoy the full recording flexibility of VDR with your Sky
subscription.  You will need a Sky Digibox and a valid subscription in
order to use this plugin.


%prep
%setup -q
%patch0 -p1
%patch1 -p1
#patch -i debian/patches/02_latin-1.dpatch
patch -i debian/patches/02_plugin_missing.dpatch
patch -i debian/patches/02_reload.dpatch
# sort_options would be nice, but it conflicts with channel+epg which is nicer
#patch -i debian/patches/02_sort_options.dpatch
#patch -i debian/patches/03_no-data_timeout.dpatch
#patch -i debian/patches/03_settime_segfault.dpatch
#patch -i debian/patches/04_cmdsubmenu.dpatch
#patch -i debian/patches/05_nissl_dvbplayer.dpatch
#patch -i debian/patches/06_recording_readonly.dpatch
patch -i debian/patches/06_recording_scan_speedup.dpatch
patch -i debian/patches/07_blockify_define.dpatch
#patch -i debian/patches/09_increase_epgscan_timeout.dpatch
patch -i debian/patches/10_livelock.dpatch
patch -i debian/patches/11_atsc.dpatch
echo "DEFINES += -DHAVE_ATSC" >> Makefile
#patch -i debian/patches/12_skinclassic_icons.dpatch
#patch -i debian/patches/15_cut_compensate_start_time.dpatch
patch -i debian/patches/19_debian_osdbase_maxitems.dpatch
#patch -i debian/patches/opt-20_epgsearch.dpatch
#patch -i debian/patches/opt-20_liemikuutio.dpatch
patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch
patch -i debian/patches/opt-20_suspend.dpatch
#patch -i debian/patches/opt-20_vdr-timer-info.dpatch
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch10 -p1

# Fix up paths
sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c
sed -i \
  -e 's|__CACHEDIR__|%{cachedir}|'   \
  -e 's|__CONFIGDIR__|%{configdir}|' \
  -e 's|__PLUGINDIR__|%{plugindir}|' \
  -e 's|__VIDEODIR__|%{videodir}|'   \
  epg2html.pl vdr.1 vdr.c PLUGINS/src/sky/README

# Fix up man page section
sed -i -e 's/\bvdr\(\s*\)(1)/vdr\1(8)/' HISTORY UPDATE-1.2.0 vdr.5
sed -i -e 's/\bvdr\([\. ]\)1\b/vdr\18/' HISTORY vdr.1

for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 ; do
  iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
done

sed -i -e 's/epg2html.pl/epg2html/' CONTRIBUTORS HISTORY epg2html.pl
sed -i -e 's/svdrpsend.pl/svdrpsend/' HISTORY
sed -i -e 's/getskyepg.pl/getskyepg/' \
  PLUGINS/src/sky/{getskyepg.pl,README,HISTORY}

cp -p %{SOURCE5} reccmds.conf
sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf
# Unfortunately these can't have comments in them, so ship 'em empty.
cat /dev/null > channels.conf
cat /dev/null > remote.conf
cat /dev/null > setup.conf
cat /dev/null > timers.conf

install -pm 644 %{SOURCE10} README.package


%build

# Intentionally not using %{version} or %{apiver} here, see %check
vdrver=$(sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$/\1/p' config.h)
apiver=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' config.h)

cat << EOF > vdr.pc
videodir=%{videodir}
audiodir=%{audiodir}
plugindir=%{plugindir}
configdir=%{configdir}
datadir=%{datadir}
cachedir=%{cachedir}
rundir=%{rundir}
vardir=%{vardir}
user=%{vdr_user}
group=%{vdr_group}
apiversion=$apiver

Name: VDR
Description: Video Disk Recorder
Version: $vdrver
EOF

cat << EOF > Make.config
CC           = %{__cc}
CXX          = %{__cxx}

ifeq (\$(RPM_OPT_FLAGS),)
  CFLAGS     = $RPM_OPT_FLAGS
  CXXFLAGS   = $RPM_OPT_FLAGS -Wall -Woverloaded-virtual
else
  CFLAGS     = \$(RPM_OPT_FLAGS)
  CXXFLAGS   = \$(RPM_OPT_FLAGS) -Wall -Woverloaded-virtual
endif
ifdef PLUGIN
  CFLAGS    += -fPIC
  CXXFLAGS  += -fPIC
endif

PLUGINLIBDIR = \$(DESTDIR)\$(shell pkg-config vdr --variable=plugindir)
VIDEODIR     = \$(DESTDIR)\$(shell pkg-config vdr --variable=videodir)
LIBDIR       = \$(PLUGINLIBDIR)

VDR_USER     = %{vdr_user}
EOF

export PKG_CONFIG_PATH=$(pwd)
make %{?_smp_mflags} all include-dir
%if 0%{?_with_plugins:1}
make %{?_smp_mflags} -C PLUGINS/src/skincurses LIBDIR=. all
make %{?_smp_mflags} -C PLUGINS/src/sky        LIBDIR=. all
%endif


%install
rm -rf $RPM_BUILD_ROOT

abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }

install -Dpm 755 vdr $RPM_BUILD_ROOT%{_sbindir}/vdr

install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -pm 755 svdrpsend.pl $RPM_BUILD_ROOT%{_bindir}/svdrpsend
install -pm 755 epg2html.pl $RPM_BUILD_ROOT%{_bindir}/epg2html

install -Dpm 644 vdr.1 $RPM_BUILD_ROOT%{_mandir}/man8/vdr.8
install -Dpm 644 vdr.5 $RPM_BUILD_ROOT%{_mandir}/man5/vdr.5

install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 644 *.conf $RPM_BUILD_ROOT%{configdir}

install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d

install -dm 755 $RPM_BUILD_ROOT%{configdir}/themes
touch $RPM_BUILD_ROOT%{configdir}/themes/{classic,sttng}-default.theme

install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/vdr
sed -i \
  -e 's|/usr/sbin/|%{_sbindir}/|'  \
  -e 's|/etc/vdr/|%{configdir}/|g' \
  -e 's|VDR_USER|%{vdr_user}|'     \
  -e 's|VDR_GROUP|%{vdr_group}|'   \
  $RPM_BUILD_ROOT%{_initrddir}/vdr

install -pm 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/runvdr
sed -i \
  -e 's|/usr/sbin/|%{_sbindir}/|'                    \
  -e 's|/etc/sysconfig/|%{_sysconfdir}/sysconfig/|g' \
  -e 's|/usr/lib/vdr\b|%{plugindir}|'                \
  -e 's|VDR_PLUGIN_VERSION|%{apiver}|'               \
  $RPM_BUILD_ROOT%{_sbindir}/runvdr

install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
sed -e 's|/usr/lib/vdr/|%{plugindir}/|' < %{SOURCE2} \
  > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr

install -dm 755 $RPM_BUILD_ROOT%{videodir}
install -dm 755 $RPM_BUILD_ROOT%{audiodir}

install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
install -dm 755 $RPM_BUILD_ROOT%{cachedir}
touch $RPM_BUILD_ROOT%{cachedir}/epg.data
install -dm 755 $RPM_BUILD_ROOT%{datadir}/logos
install -dm 755 $RPM_BUILD_ROOT%{rundir}
install -dm 755 $RPM_BUILD_ROOT%{vardir}

install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE4} \
  > $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-%{name}.rules
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules

install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d
sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE8} \
  > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/95-%{name}.perms
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/*%{name}.perms

# devel
install -Dpm 644 vdr.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vdr.pc
install -pm 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vdr-config
install -pm 755 newplugin $RPM_BUILD_ROOT%{_bindir}/vdr-newplugin
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/vdr/include/vdr
install -pm 644 Make.config $RPM_BUILD_ROOT%{_libdir}/vdr
ln -s $(abs2rel %{_includedir}/vdr/config.h %{_libdir}/vdr) \
  $RPM_BUILD_ROOT%{_libdir}/vdr
install -dm 755 $RPM_BUILD_ROOT%{_includedir}/{vdr,libsi}
install -pm 644 *.h $RPM_BUILD_ROOT%{_includedir}/vdr
install -pm 644 libsi/*.h $RPM_BUILD_ROOT%{_includedir}/libsi

# plugins
%if 0%{?_with_plugins:1}
install -pm 755 PLUGINS/src/skincurses/libvdr-skincurses.so.%{apiver} \
  $RPM_BUILD_ROOT%{plugindir}
install -pm 644 %{SOURCE11} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/skincurses.conf
install -pm 755 PLUGINS/src/sky/libvdr-sky.so.%{apiver} \
  $RPM_BUILD_ROOT%{plugindir}
install -pm 644 %{SOURCE12} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/sky.conf
install -pm 755 PLUGINS/src/sky/getskyepg.pl \
  $RPM_BUILD_ROOT%{_bindir}/getskyepg
install -Dpm 644 PLUGINS/src/sky/channels.conf.sky \
  $RPM_BUILD_ROOT%{configdir}/plugins/sky/channels.conf.sky
%endif


%check
export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_libdir}/pkgconfig
if [ "$(pkg-config vdr --variable=apiversion)" != "%{apiver}" ] ; then
    echo "ERROR: API version mismatch in vdr.pc / package / config.h" ; exit 1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%pre
%{_sbindir}/groupadd -r video 2>/dev/null || :
%{_sbindir}/useradd -c "Video Disk Recorder" -d %{videodir} \
  -g %{vdr_group} -M -n -r -s /sbin/nologin %{vdr_user} 2>/dev/null || :

%post
/sbin/chkconfig --add vdr

%preun
if [ $1 -eq 0 ] ; then
    %{_initrddir}/vdr stop >/dev/null 2>&1 || :
    /sbin/chkconfig --del vdr
fi

%postun
[ $1 -gt 0 ] && %{_initrddir}/vdr try-restart >/dev/null || :


%files
%defattr(-,root,root,-)
%doc CONTRIBUTORS COPYING HISTORY* MANUAL README* UPDATE-1.[24].0
%config(noreplace) %{_sysconfdir}/sysconfig/vdr
%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
# Temporarily not noreplace for upgrade from 1.4.1-8 due to #202132
%config %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
%config %{_sysconfdir}/sysconfig/vdr-plugins.d/
%{_initrddir}/vdr
%{_bindir}/epg2html
%{_bindir}/svdrpsend
%{_sbindir}/runvdr
%{_sbindir}/vdr
%dir %{plugindir}/
%dir %{plugindir}/bin/
%{datadir}/
%{_mandir}/man[58]/vdr.[58]*
%defattr(-,%{vdr_user},%{vdr_group},-)
%dir %{rundir}/
%dir %{vardir}/
# TODO: tighten this (root:root ownership to some files/dirs)?
%dir %{configdir}/
%dir %{configdir}/plugins/
%dir %{configdir}/themes/
%ghost %{configdir}/themes/*.theme
%config(noreplace) %{configdir}/*.conf
%dir %{videodir}/
%dir %{audiodir}/
%dir %{cachedir}/
%ghost %{cachedir}/epg.data

%files devel
%defattr(-,root,root,-)
%doc COPYING PLUGINS.html
%{_bindir}/vdr-config
%{_bindir}/vdr-newplugin
%{_includedir}/libsi/
%{_includedir}/vdr/
%{_libdir}/pkgconfig/vdr.pc
%dir %{_libdir}/vdr/
%{_libdir}/vdr/Make.config
%{_libdir}/vdr/config.h

%if 0%{?_with_plugins:1}
%files skincurses
%defattr(-,root,root,-)
%doc PLUGINS/src/skincurses/COPYING PLUGINS/src/skincurses/HISTORY
%doc PLUGINS/src/skincurses/README
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/skincurses.conf
%{plugindir}/libvdr-skincurses.so.%{apiver}

%files sky
%defattr(-,root,root,-)
%doc PLUGINS/src/sky/COPYING PLUGINS/src/sky/HISTORY
%doc PLUGINS/src/sky/README PLUGINS/src/sky/lircd.conf.sky
%{_bindir}/getskyepg
%config(noreplace) %{configdir}/plugins/sky/channels.conf.sky
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/sky.conf
%{plugindir}/libvdr-sky.so.%{apiver}
%endif

%changelog
* Sun Oct 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.3-3
- Apply upstream 1.4.3-1 maintenance patch.
- Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13.
- Drop no longer needed README.plugins.d, README.package is enough (#190343).

* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.4.3-2
- rebuilt for unwind info generation, broken in gcc-4.1.1-21

* Sat Sep 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.3-1
- 1.4.3, 1.4.2-1.ds, liemikuutio 1.12.

* Sun Sep  3 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.2-2
- 1.4.2-1, liemikuutio 1.10.

* Sun Aug 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.2-1
- 1.4.2, syscall and maintenance patches applied upstream.

* Mon Aug 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-11
- Set device permissions in both console.perms and udev (#202132).
- Implement restart and DVB module reload functionality roughly like
  upstream runvdr does it.

* Fri Aug 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-10
- Fix build with recent kernel headers where _syscallX are no longer visible.
- Drop ia64 patch (superseded by the above) and the thread poison patch.

* Fri Aug 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-9
- Set device permissions using console.perms instead of udev rules
  to work around new pam trumping udev config (#202132).

* Sun Aug  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-8
- Apply upstream 1.4.1-3 maintenance patch.

* Sun Jul 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-7
- Apply upstream 1.4.1-2 maintenance patch.
- Use VFAT compatible recording names by default.

* Sun Jul 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-6
- Don't use %%bcond_with to appease buildsys.

* Sat Jul 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-5
- Update liemikuutio patch to 1.8.
- Patch dumpability to work with PR_SET_DUMPABLE changes in recent kernels,
  add corresponding warning to sysconfig snippet comment.

* Sat Jul  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-4
- Update liemikuutio patch to 1.7.
- Conditionally build the skincurses and sky plugins; disabled by default,
  rebuild with "--with plugins" to enable.
- Make symlinks relative.

* Fri Jun 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-3
- Move headers to %%{_includedir}.
- Add README.package to docs, describing some aspects of the package (#1063).
- Add LIBDIR to Make.config to ease local plugin builds (#1063).
- Update VDR_PLUGIN_ORDER in sysconfig snippet, loading potential output
  plugins before others.  See commentary in the file for details.
- Add example how to affect OSD time/date formats to sysconfig snippet.

* Sun Jun 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-2
- 1.4.1-1 + 1.4.1-1.ds.
- Drop glibc-kernheaders dependency from -devel too.
- Make -devel multilib friendly, add pkgconfig file.

* Sun Jun 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-1
- 1.4.1, liemikuutio 1.6.

* Mon May 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-5
- Address some review notes in #190343 comment 2:
- Add example udev rule for predictable remote control device naming.
- Drop glibc-kernheaders build dependency.
- Specfile cleanups.

* Sun May 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-4
- Apply upstream 1.4.0-2 maintenance patch.

* Sun May 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-3
- Apply upstream 1.4.0-1 maintenance patch.
- Drop unneeded version check from %%check.

* Mon May  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-2
- Sync with 1.4.0-1.ds.

* Sun Apr 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.0-1
- 1.4.0 + 1.3.48-1.ds, re-enable reload patch.

* Sun Apr 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.48-1
- 1.3.48, no need to rebuild plugins, woo-hoo!

* Mon Apr 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.47-1
- 1.3.47 + the usual patchwork.
- Trim pre-RLO %%changelog entries.
- Add vdr(abi) and vdr-devel(api) versioned Provides for plugin versioning
  and --version and --apiversion to vdr-config, see HISTORY.
- Use sed instead of perl for edits during the build.
- Temporarily disable reload/SIGUSR1 patch.

* Sun Apr  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.46-1
- 1.3.46 + the usual patchwork.

* Sun Mar 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.45-1
- 1.3.45 + 1.3.44-2.ds + Rofa's mute fix.

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Sun Mar  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.44-0.lvn.2
- Sync with 1.3.44-1.ds, apply Rolf Ahrenberg's readline fix.

* Wed Mar  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.44-0.lvn.1
- 1.3.44, include Marko M??kel??'s suspend patch.
- Move runvdr to %%{_sbindir} and make it option-compatible with the
  upstream one.  If VDR_INIT is non-empty in the environment, automatic
  command line building is enabled.  The init script still does that.
  Also makes the init script and runvdr easier to adapt to alternative
  init systems such as initng (#781).

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Tue Feb 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.43-0.lvn.2
- Sync with 1.3.43-1.ds.

* Sun Feb 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.43-0.lvn.1
- 1.3.43 + 1.3.42-2.ds + Rolf Ahrenberg's audiotracks patch.
- Drop Reinhard Ni??l's dvbplayer patch at least for now.

* Sun Feb  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.42-0.lvn.1
- 1.3.42; dumpable, menu-in-replay and constness patches applied upstream.
- Make udev rules work as expected with later udev versions.

* Sun Jan 29 2006 Ville Skytt?? <ville.skytta at iki.fi>
- 1.3.41; Finnish, EPG null title and LIRC reconnect patches
  applied/obsoleted upstream.
- Revert back to Udo Richter's more general purpose "menu in replay" patch.

* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.40-0.lvn.3
- Patch LIRC support to try to reconnect if lircd connection is lost.
- Update liemikuutio patch to 1.2.

* Mon Jan 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.40-0.lvn.2
- Replace EPG null title crash fix with upstream one.

* Sun Jan 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.40-0.lvn.1
- 1.3.40, key macro and SVDRP CLRE crash patches applied upstream.
- Replace menu tweak patch with one from Luca Olivetti.

* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.39-0.lvn.3
- Fix sysconfig stupidity introduced in 0.lvn.2, _only_ DAEMON_COREFILE_LIMIT
  was taken into account :P

* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.39-0.lvn.2
- Apply upstream key macro and SVDRP CLRE crash patches.
- Source sysconfig snippet again in init script (so that eg.
  DAEMON_COREFILE_LIMIT etc works as expected).

* Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.39-0.lvn.1
- 1.3.39 + the usual patch shuffling, kudos to Rolf Ahrenberg and Udo
  Richter.

* Wed Jan 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.38-0.lvn.4
- Apply upstream menu fix patch.
- Add some comments to sysconfig file.

* Tue Jan 10 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.38-0.lvn.3
- Sync with 1.3.38-2.ds.

* Mon Jan  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.38-0.lvn.2
- Sync with 1.3.38-1.ds.
- Remove references to the removed ca.conf from the manpage.

* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.38-0.lvn.1
- 1.3.38, su/capabilities stuff, low disk space crash, CAN-2005-0071,
  audio pids and timed recording deletion patches applied upstream.
- Patch to allow core dumps and startup script simplifications with the
  newly introduced set[ug]id functionality.
- Patch to fix gettid usage (includes).
- enAIO patchset replaced by liemikuutio 1.0.
- Updated Finnish translations.

* Wed Jan  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.37-0.lvn.3
- Fix syntax error in sysconfig file (#714, Scott Tsai).
- Change built-in default of epg.data location to %%{cachedir}, drop it
  from the sysconfig file and update docs.

* Sat Dec 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.37-0.lvn.2
- Apply "low disk space" message crash from Andreas Brachold.
- Apply upstream fix for 2nd audio pid and live DD on encrypted channels.
- Add (commented out) sysconfig and console.perms.d samples for setting and
  retaining VDR-friendly CD/DVD drive permissions.
- Sync with 1.3.37-1.ds.

* Mon Nov 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.37-0.lvn.1
- 1.3.37.

* Sat Nov 12 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.36-0.lvn.2
- Default config improvements.
- Sync with 1.3.36-1.ds.

* Sun Nov  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.36-0.lvn.1
- 1.3.36, recording end crash fix applied upstream.
- Don't load LIRC unconditionally, pass --lirc by default in sysconfig/vdr.

* Tue Nov  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.35-0.lvn.1
- 1.3.35 + Joachim Wilke's recording end crash fix; Finnish, daemon and
  infloop patches applied upstream.

* Sun Oct 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.34-0.lvn.2
- Update enAIO patch to 2.7.
- Apply daemon and menu infinite loop patches from Enrico Scholz.

* Fri Oct  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.34-0.lvn.1
- 1.3.34 + 1.3.34-1.ds + Rolf Ahrenberg's Finnish i18n fixes.

* Sun Sep 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.33-0.lvn.1
- 1.3.33.
- Sync with 1.3.32-1.ds.
- Apply enAIO patch.

* Fri Sep 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.32-0.lvn.2
- Fix init script on multilib archs (#596, Jussi Lehtola).

* Sun Sep 11 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.32-0.lvn.1
- 1.3.32, bunch of patches applied upstream.
- Drop main package dependency from -devel.

* Sun Aug 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.31-0.lvn.1
- 1.3.31 + upstream warnings fix + Reinhard Ni??l's patch bomb.
- Ship plugin creator script in -devel.

* Mon Aug 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.30-0.lvn.2
- Don't use stuff from the su/capabilities patch by default, it causes
  problems with getting core dumps if plugins crash.
- Simplify things by splitting stuff from init script to separate launcher.
- Sync with 1.3.30-1.ds, fix a warning in the svdrp grab patch.
- Add audio CD ripping example to commands.conf.

* Sun Aug 21 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.30-0.lvn.1
- 1.3.30, PPC/unaligned patch no longer needed.
- Tune default plugin load order, add muggle.
- Minor init script improvements.

* Wed Aug 17 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.29-0.lvn.2
- Sync with Darren Salt's 1.3.29-1.ds.
- Drop dvbplayer patch; no longer needed for recent recordings.
- Patch/hack (from reiserfsprogs) to fix PPC build (asm/unaligned.h).
- Start up earlier/shut down later by default at boot/shutdown.
- Add vardir for storing non-cache, non-video data; and audiodir for
  audio plugins.

* Mon Aug 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.29-0.lvn.1
- 1.3.29, Finnish patch applied upstream.

* Sat Aug 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.28-1.lvn.2
- Apply Rolf Ahrenberg's newest Finnish patch.
- Drop historical conflict with an old vdr-dxr3 snapshot.

* Thu Aug 11 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.28-1.lvn.1
- Truncate config files in more portable manner during build.


--- NEW FILE vdr.sysconfig ---
# System configuration for VDR                                       -*- sh -*-

# The "master" options.  Some examples of options you may want to set
# here are -r, -s, -t, and --rcu.  See the vdr(8) man page for more info.
#
VDR_OPTIONS=(--lirc --vfat)

# VDR_PLUGIN_ORDER is a space separated list of plugins that should be
# loaded in a specific order.  This affects eg. the order the plugins'
# menu entries are displayed OSD menus by default.  The plugins in this
# list don't need to be installed, but if they are, they will be loaded
# before other possibly installed plugins.  Note that it is recommended
# to load output plugins before others so that all necessary features are
# present when needed by other plugins at startup/shutdown.
#
VDR_PLUGIN_ORDER="
dxr3
softdevice
streamdev-client
xine
xinelibout
tvonscreen
osdteletext
subtitles
osdpip
femon
sudoku
dvd
externalplayer
mplayer
mp3
muggle
burn
"

# I18N settings; VDR doesn't work with UTF-8.
#
. /etc/sysconfig/i18n 2>/dev/null || :
LANG=${LANG%.UTF-8}
LC_ALL=${LC_ALL%.UTF-8}
LC_CTYPE=${LC_CTYPE%.UTF-8}
# LC_TIME affects how dates and times are displayed.
#export LC_TIME=fi_FI

# PATH where to find the internally used executables.
#
PATH="/usr/lib/vdr/bin:$PATH"

# For debugging: allow vdr to dump core.  Note that depending on the operating
# environment, core dumps from setuid processes may be a security issue.
#DAEMON_COREFILE_LIMIT="unlimited"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Oct 2006 18:48:23 -0000	1.1
+++ .cvsignore	16 Oct 2006 18:50:35 -0000	1.2
@@ -0,0 +1,3 @@
+vdr-1.4.3-liemikuutio-1.13.diff.gz
+vdr-1.4.3.tar.bz2
+vdr_1.4.3-1.ds.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Oct 2006 18:48:23 -0000	1.1
+++ sources	16 Oct 2006 18:50:35 -0000	1.2
@@ -0,0 +1,3 @@
+ed95f0e5844816d313edcb7f7231e06a  vdr-1.4.3-liemikuutio-1.13.diff.gz
+9bb82d1f090dad746d784d147dbb0126  vdr-1.4.3.tar.bz2
+a0f1441e534715a190e4507c2f58268f  vdr_1.4.3-1.ds.diff.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 19:11:07 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Oct 2006 12:11:07 -0700
Subject: comps comps-fe6.xml.in,1.189,1.190
Message-ID: <200610161911.k9GJB7m6023919@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23889

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add vdr (#190343).


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- comps-fe6.xml.in	15 Oct 2006 18:57:19 -0000	1.189
+++ comps-fe6.xml.in	16 Oct 2006 19:10:36 -0000	1.190
@@ -865,6 +865,7 @@
       <packagereq type="optional">tagtool</packagereq>
       <packagereq type="optional">tclabc</packagereq>
       <packagereq type="optional">ushare</packagereq>
+      <packagereq type="optional">vdr</packagereq>
       <packagereq type="optional">wmix</packagereq>
       <packagereq type="optional">xmms</packagereq>
       <packagereq type="optional">xmms-adplug</packagereq>



From fedora-extras-commits at redhat.com  Mon Oct 16 19:14:56 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 16 Oct 2006 12:14:56 -0700
Subject: rpms/eggdrop/devel eggdrop.spec,1.3,1.4
Message-ID: <200610161914.k9GJEuTP023981@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23965

Modified Files:
	eggdrop.spec 
Log Message:
Bumped because of libdns.so



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/devel/eggdrop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eggdrop.spec	3 Sep 2006 20:42:47 -0000	1.3
+++ eggdrop.spec	16 Oct 2006 19:14:26 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
+- Rebuild
+
 * Sun Sep 03 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-2
 - Rebuild for Fedora Core 6
 



From fedora-extras-commits at redhat.com  Mon Oct 16 19:16:03 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 16 Oct 2006 12:16:03 -0700
Subject: rpms/eggdrop/FC-5 eggdrop.spec,1.3,1.4
Message-ID: <200610161916.k9GJG369024022@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24001

Modified Files:
	eggdrop.spec 
Log Message:
Bumped because of libdns.so



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-5/eggdrop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eggdrop.spec	3 Sep 2006 20:52:20 -0000	1.3
+++ eggdrop.spec	16 Oct 2006 19:15:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
+- Rebuild
+
 * Sun Sep 03 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-2
 - Rebuild for Fedora Core 6
 



From fedora-extras-commits at redhat.com  Mon Oct 16 19:16:59 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 16 Oct 2006 12:16:59 -0700
Subject: rpms/eggdrop/FC-4 eggdrop.spec,1.3,1.4
Message-ID: <200610161916.k9GJGxhK024054@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24038

Modified Files:
	eggdrop.spec 
Log Message:
Bumped because of libdns.so



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-4/eggdrop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eggdrop.spec	3 Sep 2006 20:53:08 -0000	1.3
+++ eggdrop.spec	16 Oct 2006 19:16:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
+- Rebuild
+
 * Sun Sep 03 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-2
 - Rebuild for Fedora Core 6
 



From fedora-extras-commits at redhat.com  Mon Oct 16 19:22:17 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon, 16 Oct 2006 12:22:17 -0700
Subject: rpms/scribes/devel scribes.spec,1.11,1.12
Message-ID: <200610161922.k9GJMHEA024251@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24226

Modified Files:
	scribes.spec 
Log Message:
Say it with me now: Psyco is x86-only. Pysco is x86 only. Pysco is x86-only...


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scribes.spec	16 Oct 2006 01:55:08 -0000	1.11
+++ scribes.spec	16 Oct 2006 19:21:47 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.87
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -35,7 +35,9 @@
 Requires:	gnome-python2-gtksourceview >= 2.12
 Requires:	gnome-python2-gtkspell >= 2.12
 Requires:	PyXML
+%ifarch %ix86
 Requires:	python-psyco
+%endif
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -152,9 +154,14 @@
 
 
 %changelog
+* Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-4
+- Make the python-psyco requirement an %%ifarch conditional, as it's x86-only
+- Fix line length of earlier %%changelog entry
+
 * Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-3
 - Actually fix the rpmlint issues (adding the proper %%buildroot prefix)
-- Minor aesthetic change (add trailing slash to the python directory in the %%files section)
+- Minor aesthetic change (add trailing slash to the python directory in the
+  %%files section)
 
 * Sun Oct 15 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-2
 - Reenable NLS build detection (accidentally dropped in the 0.2.9.87-1 update)



From fedora-extras-commits at redhat.com  Mon Oct 16 20:00:06 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 13:00:06 -0700
Subject: rpms/gdmap import.log,1.4,1.5
Message-ID: <200610162000.k9GK06PF025267@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gdmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25228

Modified Files:
	import.log 
Log Message:
auto-import gdmap-0.7.5-6 on branch devel from gdmap-0.7.5-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdmap/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	28 Aug 2006 18:37:24 -0000	1.4
+++ import.log	16 Oct 2006 19:59:36 -0000	1.5
@@ -1,3 +1,4 @@
 gdmap-0_7_5-3:HEAD:gdmap-0.7.5-3.src.rpm:1152279556
 gdmap-0_7_5-4_fc6:HEAD:gdmap-0.7.5-4.fc6.src.rpm:1154110377
 gdmap-0_7_5-5_fc6:HEAD:gdmap-0.7.5-5.fc6.src.rpm:1156790265
+gdmap-0_7_5-6:HEAD:gdmap-0.7.5-6.src.rpm:1161028768



From fedora-extras-commits at redhat.com  Mon Oct 16 20:00:07 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 13:00:07 -0700
Subject: rpms/gdmap/devel gdmap.spec,1.3,1.4
Message-ID: <200610162000.k9GK07eE025270@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gdmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25228/devel

Modified Files:
	gdmap.spec 
Log Message:
auto-import gdmap-0.7.5-6 on branch devel from gdmap-0.7.5-6.src.rpm


Index: gdmap.spec
===================================================================
RCS file: /cvs/extras/rpms/gdmap/devel/gdmap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdmap.spec	28 Aug 2006 18:37:25 -0000	1.3
+++ gdmap.spec	16 Oct 2006 19:59:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:	gdmap
 Version:	0.7.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-6
+- Bumped
+
 * Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-5
 - Bump Release
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:06:48 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 13:06:48 -0700
Subject: rpms/glipper import.log,1.4,1.5
Message-ID: <200610162006.k9GK6mBG028332@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.89-5 on branch devel from glipper-0.89-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	28 Aug 2006 18:59:57 -0000	1.4
+++ import.log	16 Oct 2006 20:06:18 -0000	1.5
@@ -1,3 +1,4 @@
 glipper-0_89-2:HEAD:glipper-0.89-2.src.rpm:1152350750
 glipper-0_89-3_fc6:HEAD:glipper-0.89-3.fc6.src.rpm:1154108800
 glipper-0_89-4_fc6:HEAD:glipper-0.89-4.fc6.src.rpm:1156791617
+glipper-0_89-5:HEAD:glipper-0.89-5.src.rpm:1161029170



From fedora-extras-commits at redhat.com  Mon Oct 16 20:06:49 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 16 Oct 2006 13:06:49 -0700
Subject: rpms/glipper/devel glipper.spec,1.3,1.4
Message-ID: <200610162006.k9GK6nQt028335@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302/devel

Modified Files:
	glipper.spec 
Log Message:
auto-import glipper-0.89-5 on branch devel from glipper-0.89-5.src.rpm


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glipper.spec	28 Aug 2006 18:59:57 -0000	1.3
+++ glipper.spec	16 Oct 2006 20:06:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.89
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.89-5
+- Bumped
+
 * Mon Aug 28 2006 Damien Durand <splinux at fedoraproject.org> - 0.89-4
 - Bump release
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:38:02 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 16 Oct 2006 13:38:02 -0700
Subject: rpms/netlabel_tools/devel netlabel, NONE, 1.1 netlabel.rules, NONE, 
	1.1 netlabel_tools.spec, 1.3, 1.4
Message-ID: <200610162038.k9GKc2Lb028561@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28543

Modified Files:
	netlabel_tools.spec 
Added Files:
	netlabel netlabel.rules 
Log Message:
* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
- Add upstream patch.



--- NEW FILE netlabel ---
#!/bin/sh
#
# netlabel	Start CIPSO labeled networking
#
# chkconfig: - 09 91
# description:	Starts and stops CIPSO labeled networking
#
# config: /etc/netlabel.rules
#
# Return values according to LSB for all commands but status:
# 0 - success
# 1 - generic or unspecified error
# 2 - invalid or excess argument(s)
# 3 - unimplemented feature (e.g. "reload")
# 4 - insufficient privilege
# 5 - program is not installed
# 6 - program is not configured
# 7 - program is not running

PATH=/sbin:/bin:/usr/bin:/usr/sbin
VAR_SUBSYS_NETLABEL=/var/lock/subsys/netlabel
RULES=/etc/netlabel.rules

# Source function library.
. /etc/init.d/functions

# Check that we are root ... so non-root users stop here
test `id -u` = 0  || exit 4
test -x /sbin/netlabelctl || exit 5
test -f $RULES || exit 6

start() {
    ret_val="0"

    # Loop through rules
    while read LINE
    do
	# Skip comments and blank lines
	if echo $LINE | egrep '^#|^$' >/dev/null ; then
		continue
	fi
	/sbin/netlabelctl $LINE >/dev/null 2>&1
	ret="$?"
	if [ "$ret" != "0" ] ; then
		ret_val="$ret"
	fi
    done < $RULES
    touch $VAR_SUBSYS_NETLABEL
    return $ret_val
}

stop() {
    rm -f $VAR_SUBSYS_NETLABEL

    # Delete rules
    list=`/sbin/netlabelctl cipsov4 list 2>/dev/null`
    ret="$?"
    if [ x"$list" != "x" ] ; then
	for line in "$list"
	do
		/sbin/netlabelctl cipsov4 del "doi:$line" 2>/dev/null
    		ret="$?"
	done
    fi
    return $ret
}

status() {
    # Do not print status if lockfile is missing 
    if [ ! -f "$VAR_SUBSYS_NETLABEL" ]; then
	echo $"Netlabel is stopped."
	return 7
    fi

    # List rules
    /sbin/netlabelctl -p cipsov4 list 2>/dev/null
    ret1="$?"
    /sbin/netlabelctl -p mgmt list 2>/dev/null
    ret2="$?"

    if [ "$ret1" != "0" -o "$ret2" != "0" ] ; then
	return 1
    fi
    return 0
}

restart() {
    stop
    start
}

case "$1" in
    start)
	stop
	start
	RETVAL="$?"
	;;
    stop)
	stop
	RETVAL="$?"
	;;
    restart)
	restart
	RETVAL="$?"
	;;
    condrestart)
	[ -e "$VAR_SUBSYS_NETLABEL" ] && restart
	;;
    status)
	status
	RETVAL="$?"
	;;
    *)
	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	exit 3
	;;
esac

exit $RETVAL


--- NEW FILE netlabel.rules ---
# This file contains the rules for the Netlabel subsystem
# Each line contains just the arguments to the netlabel command

# creates a CIPSO/IPv4 definition using a DOI value of 1
cipsov4 add std doi:1 tags:1 levels:0=0,1=1,2=2 categories:0=0,1=1,2=2

# tell the NetLabel system to use this CIPSO/IPv4 defintion by default
mgmt add default protocol:cipsov4,1



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netlabel_tools.spec	2 Oct 2006 00:28:43 -0000	1.3
+++ netlabel_tools.spec	16 Oct 2006 20:37:32 -0000	1.4
@@ -4,14 +4,18 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}
 Source0: %{home_base_url}/%{name}-%{version}.tar.gz
-Patch: netlabel_tools-0.17-new-hdrs.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kernel-headers, libnl-devel
+Source1: netlabel
+Source2: netlabel.rules
+Patch1: netlabel_tools-0.17-new-hdrs.patch
+Patch2: netlabel_tools-27_28.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRequires: kernel-headers >= 2.6.18
+BuildRequires: libnl-devel
 
 %description
 NetLabel is a kernel subsystem which implements explicit packet labeling
@@ -23,7 +27,10 @@
 %prep 
 %setup -q -n %{name}-%{version}
 
-%patch -p1
+# Build fixes.
+%patch1 -p1
+# Upstream patch.
+%patch2 -p1
 
 %build
 # Don't use _smp_mflags, it's small and a hand crafted Makefile
@@ -34,6 +41,9 @@
 make INSTALL_PREFIX=${RPM_BUILD_ROOT} \
      INSTALL_MAN_DIR=${RPM_BUILD_ROOT}/usr/share/man \
      install
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
+install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/
+install -m 0640 %{SOURCE2} $RPM_BUILD_ROOT/etc/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,9 +52,17 @@
 %defattr(-,root,root)
 %doc docs/*.txt
 %attr(0755,root,root) /sbin/*
+%attr(0755,root,root) /etc/rc.d/init.d/netlabel
+%config(noreplace) %attr(640,root,root) /etc/netlabel.rules
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
+- Add upstream patch.
+
+* Sat Oct 14 2006 Steve Grubb <sgrubb at redhat.com> - 0.17-3
+- Add init scripts and default rules
+
 * Sun Oct  1 2006 James Antill <james at and.org> - 0.17-2
 - Upgrade to latest upstream.
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:43:21 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 16 Oct 2006 13:43:21 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools-27_28.patch,NONE,1.1
Message-ID: <200610162043.k9GKhLUJ028627@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28620

Added Files:
	netlabel_tools-27_28.patch 
Log Message:
* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
- Add upstream patch.


netlabel_tools-27_28.patch:

--- NEW FILE netlabel_tools-27_28.patch ---
Index: netlabelctl/cipsov4.c
===================================================================
--- netlabelctl/cipsov4.c	(revision 27)
+++ netlabelctl/cipsov4.c	(revision 28)
@@ -236,7 +236,7 @@
 	printf("STANDARD");
 	break;
       case CIPSO_V4_MAP_PASS:
-	printf("PASS_THROUGH\n");
+	printf("PASS_THROUGH");
 	break;
       default:
 	printf("UNKNOWN(%u)", mtype_list[iter]);
Index: netlabelctl/map.c
===================================================================
--- netlabelctl/map.c	(revision 27)
+++ netlabelctl/map.c	(revision 28)
@@ -224,8 +224,10 @@
         printf("UNKNOWN(%u)", domain_p[iter].proto_type);
         break;
       }
-      printf(" ");
+      if (iter + 1 < count)
+	printf(" ");
     }
+    printf("\n");
   }
 
  list_return:



From fedora-extras-commits at redhat.com  Mon Oct 16 20:45:14 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 16 Oct 2006 13:45:14 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools.spec,1.4,1.5
Message-ID: <200610162045.k9GKjEm8028697@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28676

Modified Files:
	netlabel_tools.spec 
Log Message:
* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
- Add upstream patch.



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netlabel_tools.spec	16 Oct 2006 20:37:32 -0000	1.4
+++ netlabel_tools.spec	16 Oct 2006 20:44:43 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}



From fedora-extras-commits at redhat.com  Mon Oct 16 20:49:50 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 16 Oct 2006 13:49:50 -0700
Subject: rpms/blender/devel blender.spec,1.31,1.32
Message-ID: <200610162049.k9GKnoCw028777@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28761

Modified Files:
	blender.spec 
Log Message:
/usr/lib/blender should own by blender


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- blender.spec	11 Oct 2006 20:27:26 -0000	1.31
+++ blender.spec	16 Oct 2006 20:49:20 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -156,10 +156,13 @@
 %{_datadir}/applications/fedora-blender.desktop
 %{_datadir}/pixmaps/*.png
 %{blenderlib}/
-%{plugins}/
+%{_libdir}/blender/
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-4
+- /usr/lib/blender should own by the package
+
 * Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-3
 - Correct invalid locale paths (#210209)
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:51:52 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 16 Oct 2006 13:51:52 -0700
Subject: rpms/blender/FC-5 blender.spec,1.30,1.31
Message-ID: <200610162051.k9GKpqSK028839@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28823

Modified Files:
	blender.spec 
Log Message:
/usr/lib/blender should own by blender


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-5/blender.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- blender.spec	11 Oct 2006 20:24:23 -0000	1.30
+++ blender.spec	16 Oct 2006 20:51:22 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -26,7 +26,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  esound-devel
 BuildRequires:  freeglut-devel
-BuildRequires:  gettext
+BuildRequires:  gettext-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libogg-devel
 BuildRequires:  libpng-devel
@@ -69,7 +69,7 @@
 # Don't use $RPM_OPT_FLAGS (see #199418)
 #
 
-scons %{?_smp_mflags} blenderplayer BF_QUIET=0 
+scons %{?_smp_mflags} blenderplayer BF_QUIET=0
 
 install -d release/plugins/include
 install -m 644 source/blender/blenpluginapi/*.h release/plugins/include
@@ -100,7 +100,7 @@
 
 pushd bin/.blender/locale
 mv pt_br pt_BR
-mv zh_cn zh_CN
+mv zh_cn uh_CN
 popd
 
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
@@ -156,22 +156,31 @@
 %{_datadir}/applications/fedora-blender.desktop
 %{_datadir}/pixmaps/*.png
 %{blenderlib}/
-%{plugins}/
+%{_libdir}/blender/
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-4
+- /usr/lib/blender should own by the package
+
 * Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-3
 - Correct invalid locale paths (#210209)
 
-* Sun Sep 17 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-2.1
-- Rebuilt to solve broken update deps
-
 * Wed Sep 13 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-2
-- Update to new upstream version
+- Update to new upstream release
 
-* Thu Aug 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-6
+* Tue Sep 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-10
+- Rebuild to solve broken deps
+
+* Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-9
+- Rebuild for FC-6
+
+* Thu Aug 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-7
 - Remove %%ghost for pyo files for fullfilling new packaging guidelines
 
+* Thu Aug 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-6
+- Rebuilt to solve broken deps
+
 * Wed Jul 26 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42-5
 - Fix symlink in blender-wrapper to locale
 



From fedora-extras-commits at redhat.com  Mon Oct 16 20:55:29 2006
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 16 Oct 2006 13:55:29 -0700
Subject: rpms/netlabel_tools/devel netlabel_tools.spec,1.5,1.6
Message-ID: <200610162055.k9GKtTQh028914@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28860

Modified Files:
	netlabel_tools.spec 
Log Message:
* Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
- Add upstream patch.
- s/p1/p0/ for upstream patch.



Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netlabel_tools.spec	16 Oct 2006 20:44:43 -0000	1.5
+++ netlabel_tools.spec	16 Oct 2006 20:54:59 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
 Version: 0.17
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: %{home_base_url}
@@ -30,7 +30,7 @@
 # Build fixes.
 %patch1 -p1
 # Upstream patch.
-%patch2 -p1
+%patch2 -p0
 
 %build
 # Don't use _smp_mflags, it's small and a hand crafted Makefile
@@ -59,6 +59,7 @@
 %changelog
 * Mon Oct 16 2006 James Antill <james at and.org> - 0.17-3
 - Add upstream patch.
+- s/p1/p0/ for upstream patch.
 
 * Sat Oct 14 2006 Steve Grubb <sgrubb at redhat.com> - 0.17-3
 - Add init scripts and default rules



From fedora-extras-commits at redhat.com  Mon Oct 16 21:06:02 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 16 Oct 2006 14:06:02 -0700
Subject: rpms/gpgme03/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE gpgme-0.3.16-macro.patch, 1.1,
	NONE gpgme-0.3.16-relocate.patch, 1.1,
	NONE gpgme-0.3.16-select.patch, 1.1,
	NONE gpgme-0.3.16-underquoted.patch, 1.1, NONE gpgme03.spec,
	1.15, NONE sources, 1.2, NONE
Message-ID: <200610162106.k9GL6296031904@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gpgme03/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31898/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gpgme-0.3.16-macro.patch 
	gpgme-0.3.16-relocate.patch gpgme-0.3.16-select.patch 
	gpgme-0.3.16-underquoted.patch gpgme03.spec sources 
Log Message:
mark dead


--- NEW FILE dead.package ---
2006-10-16 : no other package in FE needs this anymore


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gpgme-0.3.16-macro.patch DELETED ---


--- gpgme-0.3.16-relocate.patch DELETED ---


--- gpgme-0.3.16-select.patch DELETED ---


--- gpgme-0.3.16-underquoted.patch DELETED ---


--- gpgme03.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 21:09:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Oct 2006 14:09:56 -0700
Subject: rpms/R/FC-5 R.spec,1.16,1.17 sources,1.9,1.10
Message-ID: <200610162109.k9GL9uPK032045@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31980/FC-5

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.4.0



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/R.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- R.spec	3 Jun 2006 22:47:01 -0000	1.16
+++ R.spec	16 Oct 2006 21:09:26 -0000	1.17
@@ -1,5 +1,5 @@
 Name: R
-Version: 2.3.1
+Version: 2.4.0
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -8,7 +8,7 @@
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gfortran
-BuildRequires: gcc-c++, tetex-latex, texinfo 
+BuildRequires: gcc-c++, tetex-latex, texinfo
 BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel
 BuildRequires: tcl-devel, tk-devel
 BuildRequires: blas >= 3.0, pcre-devel, zlib-devel
@@ -22,14 +22,14 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = %{version}
-Provides: R-cluster = 1.11.0
+Provides: R-cluster = 1.11.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
-Provides: R-lattice = 0.13
+Provides: R-lattice = 0.14
 Provides: R-MASS = %{version}
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
@@ -40,7 +40,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.26
+Provides: R-survival = 2.29
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -219,7 +219,13 @@
 /sbin/ldconfig
 
 %changelog
-* Sat Jun  3 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-1
+* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump for 2.4.0
+
+* Wed Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-2
+- bump for FC-6
+
+* Fri Jun  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-1
 - bump to 2.3.1
 
 * Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
@@ -228,6 +234,9 @@
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-5
+- now BR is texinfo-tex, not texinfo in rawhide
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-4
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jun 2006 22:47:01 -0000	1.9
+++ sources	16 Oct 2006 21:09:26 -0000	1.10
@@ -1 +1 @@
-a1d6d8081af4c71006a6e5a3ed54e4da  R-2.3.1.tar.gz
+f32379469d8712e9f5dd6435d30127d3  R-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 21:09:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Oct 2006 14:09:57 -0700
Subject: rpms/R/devel .cvsignore,1.8,1.9 R.spec,1.18,1.19 sources,1.9,1.10
Message-ID: <200610162109.k9GL9vsD032050@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31980/devel

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

Bump to 2.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/R/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jun 2006 22:47:02 -0000	1.8
+++ .cvsignore	16 Oct 2006 21:09:27 -0000	1.9
@@ -5,3 +5,4 @@
 R-2.2.1.tar.gz
 R-2.3.0.tar.gz
 R-2.3.1.tar.gz
+R-2.4.0.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- R.spec	13 Sep 2006 21:45:09 -0000	1.18
+++ R.spec	16 Oct 2006 21:09:27 -0000	1.19
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.3.1
-Release: 2%{?dist}
+Version: 2.4.0
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -22,14 +22,14 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = %{version}
-Provides: R-cluster = 1.11.0
+Provides: R-cluster = 1.11.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
-Provides: R-lattice = 0.13
+Provides: R-lattice = 0.14
 Provides: R-MASS = %{version}
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
@@ -40,7 +40,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.26
+Provides: R-survival = 2.29
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump for 2.4.0
+
 * Wed Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-2
 - bump for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jun 2006 22:47:02 -0000	1.9
+++ sources	16 Oct 2006 21:09:27 -0000	1.10
@@ -1 +1 @@
-a1d6d8081af4c71006a6e5a3ed54e4da  R-2.3.1.tar.gz
+f32379469d8712e9f5dd6435d30127d3  R-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 21:26:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 16 Oct 2006 14:26:26 -0700
Subject: rpms/abcMIDI/devel .cvsignore, 1.9, 1.10 abcMIDI.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610162126.k9GLQQZo032282@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32245/devel

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061015


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Oct 2006 21:17:50 -0000	1.9
+++ .cvsignore	16 Oct 2006 21:25:56 -0000	1.10
@@ -1 +1 @@
-abcMIDI-2006-10-05.zip
+abcMIDI-2006-10-15.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcMIDI.spec	9 Oct 2006 21:17:50 -0000	1.10
+++ abcMIDI.spec	16 Oct 2006 21:25:56 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061005
-Release:        2%{?dist}
+Version:        20061015
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-05.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
+- new version 20061015
+
 * Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061005-1
 - new version 20061005
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Oct 2006 21:17:50 -0000	1.9
+++ sources	16 Oct 2006 21:25:56 -0000	1.10
@@ -1 +1 @@
-ddcee30163fecd9fbc4fbb72a934b4fa  abcMIDI-2006-10-05.zip
+747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip



From fedora-extras-commits at redhat.com  Mon Oct 16 21:26:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 16 Oct 2006 14:26:26 -0700
Subject: rpms/abcMIDI/FC-5 abcMIDI.spec,1.8,1.9
Message-ID: <200610162126.k9GLQQfm032277@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32245/FC-5

Modified Files:
	abcMIDI.spec 
Log Message:
new version 20061015


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcMIDI.spec	9 Oct 2006 21:17:49 -0000	1.8
+++ abcMIDI.spec	16 Oct 2006 21:25:55 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061005
-Release:        2%{?dist}
+Version:        20061015
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-05.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
+- new version 20061015
+
 * Mon Oct  9 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061005-1
 - new version 20061005
 



From fedora-extras-commits at redhat.com  Mon Oct 16 21:44:55 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 16 Oct 2006 14:44:55 -0700
Subject: rpms/abcMIDI/FC-5 .cvsignore, 1.9, 1.10 abcMIDI.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200610162144.k9GLitIB032486@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32466/FC-5

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061015


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Oct 2006 21:17:49 -0000	1.9
+++ .cvsignore	16 Oct 2006 21:44:25 -0000	1.10
@@ -1 +1 @@
-abcMIDI-2006-10-05.zip
+abcMIDI-2006-10-15.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcMIDI.spec	16 Oct 2006 21:25:55 -0000	1.9
+++ abcMIDI.spec	16 Oct 2006 21:44:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           abcMIDI
 Version:        20061015
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Oct 2006 21:17:49 -0000	1.9
+++ sources	16 Oct 2006 21:44:25 -0000	1.10
@@ -1 +1 @@
-ddcee30163fecd9fbc4fbb72a934b4fa  abcMIDI-2006-10-05.zip
+747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip



From fedora-extras-commits at redhat.com  Mon Oct 16 21:09:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Oct 2006 14:09:55 -0700
Subject: rpms/R/FC-4 R.spec,1.16,1.17 sources,1.9,1.10
Message-ID: <200610162109.k9GL9tGY032041@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31980/FC-4

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.4.0



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- R.spec	3 Jun 2006 22:47:01 -0000	1.16
+++ R.spec	16 Oct 2006 21:09:25 -0000	1.17
@@ -1,5 +1,5 @@
 Name: R
-Version: 2.3.1
+Version: 2.4.0
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -22,14 +22,14 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = %{version}
-Provides: R-cluster = 1.11.0
+Provides: R-cluster = 1.11.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
-Provides: R-lattice = 0.13
+Provides: R-lattice = 0.14
 Provides: R-MASS = %{version}
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
@@ -40,7 +40,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.26
+Provides: R-survival = 2.29
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -226,6 +226,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump for 2.4.0
+
 * Sat Jun  3 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-1
 - bump to 2.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jun 2006 22:47:01 -0000	1.9
+++ sources	16 Oct 2006 21:09:25 -0000	1.10
@@ -1 +1 @@
-a1d6d8081af4c71006a6e5a3ed54e4da  R-2.3.1.tar.gz
+f32379469d8712e9f5dd6435d30127d3  R-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 22:36:31 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 16 Oct 2006 15:36:31 -0700
Subject: rpms/torque/devel torque.spec,1.14,1.15
Message-ID: <200610162236.k9GMaUV0003246@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3229

Modified Files:
	torque.spec 
Log Message:
correct unowned directories


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- torque.spec	12 Oct 2006 19:50:10 -0000	1.14
+++ torque.spec	16 Oct 2006 22:36:00 -0000	1.15
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.3
 #%%define snap 200604251602
-%define release 2
+%define release 3
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -199,6 +199,7 @@
 %doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
 %{torquehomedir}/aux
 %{torquehomedir}/spool
 
@@ -288,7 +289,7 @@
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
 %endif
-%{torquehomedir}/mom_priv/*
+%{torquehomedir}/mom_priv
 %{torquehomedir}/mom_logs
 %{torquehomedir}/checkpoint
 %{torquehomedir}/undelivered
@@ -401,6 +402,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
+- correct unowned directories
+
 * Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
 - missing BR ncurses-devel and readline-devel
 



From fedora-extras-commits at redhat.com  Mon Oct 16 22:39:18 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 16 Oct 2006 15:39:18 -0700
Subject: rpms/nethack/devel nethack.spec,1.15,1.16
Message-ID: <200610162239.k9GMdIfD003329@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3309

Modified Files:
	nethack.spec 
Log Message:
* Mon Oct 16 2006 Luke Macken <lmacken at redhat.com> 3.4.3-12
- Own /usr/games/nethack-3.4.3




Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nethack.spec	3 Sep 2006 18:56:59 -0000	1.15
+++ nethack.spec	16 Oct 2006 22:38:48 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -118,12 +118,7 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
-%{nhgamedir}/NetHack.ad
-%{nhgamedir}/pet_mark.xbm
-%{nhgamedir}/rip.xpm
-%{nhgamedir}/x11tiles
-%{nhgamedir}/fonts/
-%{nhgamedir}/license
+%{nhgamedir}
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -134,6 +129,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Luke Macken <lmacken at redhat.com> 3.4.3-12
+- Own /usr/games/nethack-3.4.3
+
 * Sun Sep  3 2006 Luke Macken <lmacken at redhat.com> 3.4.3-11
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Mon Oct 16 22:40:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 15:40:31 -0700
Subject: rpms/cpanspec/devel .cvsignore, 1.12, 1.13 cpanspec.spec, 1.13,
	1.14 sources, 1.12, 1.13
Message-ID: <200610162240.k9GMeVQr003400@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3374

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Oct 2006 18:25:03 -0000	1.12
+++ .cvsignore	16 Oct 2006 22:40:01 -0000	1.13
@@ -1 +1 @@
-cpanspec-1.69.tar.gz
+cpanspec-1.69.1.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cpanspec.spec	3 Oct 2006 18:25:03 -0000	1.13
+++ cpanspec.spec	16 Oct 2006 22:40:01 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.69
+Version:        1.69.1
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -52,6 +52,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1.69.1-1
+- Update to 1.69.1.
+
 * Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
 - Update to 1.69.
 - Use _fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Oct 2006 18:25:03 -0000	1.12
+++ sources	16 Oct 2006 22:40:01 -0000	1.13
@@ -1 +1 @@
-ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz
+55ee5ad9c67feb428a86c57b495c5f1e  cpanspec-1.69.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 22:42:35 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 15:42:35 -0700
Subject: rpms/cpanspec/FC-5 .cvsignore, 1.12, 1.13 cpanspec.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <200610162242.k9GMgZ2l003481@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3454

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Oct 2006 18:27:35 -0000	1.12
+++ .cvsignore	16 Oct 2006 22:42:05 -0000	1.13
@@ -1 +1 @@
-cpanspec-1.69.tar.gz
+cpanspec-1.69.1.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpanspec.spec	3 Oct 2006 18:27:35 -0000	1.12
+++ cpanspec.spec	16 Oct 2006 22:42:05 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.69
+Version:        1.69.1
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -52,6 +52,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1.69.1-1
+- Update to 1.69.1.
+
 * Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
 - Update to 1.69.
 - Use _fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Oct 2006 18:27:35 -0000	1.12
+++ sources	16 Oct 2006 22:42:05 -0000	1.13
@@ -1 +1 @@
-ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz
+55ee5ad9c67feb428a86c57b495c5f1e  cpanspec-1.69.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 22:44:02 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 16 Oct 2006 15:44:02 -0700
Subject: rpms/nethack/FC-5 nethack.spec,1.13,1.14
Message-ID: <200610162244.k9GMi2Hq003575@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3538

Modified Files:
	nethack.spec 
Log Message:
* Mon Oct 16 2006 Luke Macken <lmacken at redhat.com> 3.4.3-12
- Own /usr/games/nethack-3.4.3
- Remove $RPM_BUILD_ROOT from %post (Bug #188008)




Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/FC-5/nethack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nethack.spec	15 Feb 2006 21:54:07 -0000	1.13
+++ nethack.spec	16 Oct 2006 22:43:31 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -101,7 +101,7 @@
         $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
 
 %post
-mkfontdir $RPM_BUILD_ROOT%{nhgamedir}/fonts
+mkfontdir %{nhgamedir}/fonts
 
 
 %clean
@@ -118,12 +118,7 @@
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover
-%{nhgamedir}/NetHack.ad
-%{nhgamedir}/pet_mark.xbm
-%{nhgamedir}/rip.xpm
-%{nhgamedir}/x11tiles
-%{nhgamedir}/fonts/
-%{nhgamedir}/license
+%{nhgamedir}
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
@@ -134,6 +129,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Luke Macken <lmacken at redhat.com> 3.4.3-12
+- Own /usr/games/nethack-3.4.3
+- Remove $RPM_BUILD_ROOT from %post (Bug #188008)
+
 * Wed Feb 15 2006 Luke Macken <lmacken at redhat.com> 3.4.3-9
 - Add nethack-3.4.3-guidebook.patch to fix issues with generating the Guidebook
   (this patch also removes the need for our groff dep)



From fedora-extras-commits at redhat.com  Mon Oct 16 22:44:30 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 15:44:30 -0700
Subject: rpms/cpanspec/FC-4 .cvsignore, 1.12, 1.13 cpanspec.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <200610162244.k9GMiUVo003619@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3557

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Oct 2006 18:28:08 -0000	1.12
+++ .cvsignore	16 Oct 2006 22:44:00 -0000	1.13
@@ -1 +1 @@
-cpanspec-1.69.tar.gz
+cpanspec-1.69.1.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpanspec.spec	3 Oct 2006 18:28:08 -0000	1.12
+++ cpanspec.spec	16 Oct 2006 22:44:00 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.69
+Version:        1.69.1
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -52,6 +52,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1.69.1-1
+- Update to 1.69.1.
+
 * Tue Oct 03 2006 Steven Pritchard <steve at kspei.com> 1.69-1
 - Update to 1.69.
 - Use _fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Oct 2006 18:28:08 -0000	1.12
+++ sources	16 Oct 2006 22:44:00 -0000	1.13
@@ -1 +1 @@
-ff2a7805606e400016661ad8d054f9a2  cpanspec-1.69.tar.gz
+55ee5ad9c67feb428a86c57b495c5f1e  cpanspec-1.69.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 22:51:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 15:51:20 -0700
Subject: rpms/perl-BerkeleyDB/devel .cvsignore, 1.6, 1.7 perl-BerkeleyDB.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200610162251.k9GMpKh2003705@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-BerkeleyDB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685

Modified Files:
	.cvsignore perl-BerkeleyDB.spec sources 
Log Message:
Update to 0.31.
Use fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Sep 2006 19:46:04 -0000	1.6
+++ .cvsignore	16 Oct 2006 22:50:50 -0000	1.7
@@ -1 +0,0 @@
-BerkeleyDB-0.30.tar.gz


Index: perl-BerkeleyDB.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-BerkeleyDB.spec	13 Sep 2006 19:46:04 -0000	1.12
+++ perl-BerkeleyDB.spec	16 Oct 2006 22:50:50 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-BerkeleyDB
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Perl extension for Berkeley DB version 2, 3 or 4
 License:        GPL or Artistic
@@ -39,7 +39,7 @@
 find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -56,6 +56,10 @@
 %{_bindir}/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.31-1
+- Update to 0.31.
+- Use fixperms macro instead of our own chmod incantation.
+
 * Wed Sep 13 2006 Steven Pritchard <steve at kspei.com> 0.30-1
 - Update to 0.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Sep 2006 19:46:04 -0000	1.6
+++ sources	16 Oct 2006 22:50:50 -0000	1.7
@@ -1 +0,0 @@
-031fd10471a8f2bf9ba84a4571ecd2fe  BerkeleyDB-0.30.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 23:20:42 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Oct 2006 16:20:42 -0700
Subject: rpms/contact-lookup-applet/devel .cvsignore, 1.8,
	1.9 contact-lookup-applet.spec, 1.19, 1.20 sources, 1.8,
	1.9 contact-lookup-applet-0.14-api.patch, 1.1, NONE
Message-ID: <200610162320.k9GNKgsV006993@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6972

Modified Files:
	.cvsignore contact-lookup-applet.spec sources 
Removed Files:
	contact-lookup-applet-0.14-api.patch 
Log Message:
* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
- Update to 0.15.
- Drop evolution api change patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 May 2006 18:46:32 -0000	1.8
+++ .cvsignore	16 Oct 2006 23:20:11 -0000	1.9
@@ -1 +1 @@
-contact-lookup-applet-0.14.tar.gz
+contact-lookup-applet-0.15.tar.gz


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- contact-lookup-applet.spec	17 Sep 2006 18:11:50 -0000	1.19
+++ contact-lookup-applet.spec	16 Oct 2006 23:20:11 -0000	1.20
@@ -1,13 +1,12 @@
 Name:		contact-lookup-applet
-Version:	0.14
-Release:	4%{?dist}
+Version:	0.15
+Release:	1%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
 License:	GPL
 URL:		http://www.burtonini.com/blog//computers/contact-lookup-applet-0.13
 Source0:	http://www.burtonini.com/computing/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}-api.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnome-panel-devel >= 2.9.4
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .photo
 
 
 %build
@@ -53,6 +51,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
+- Update to 0.15.
+- Drop evolution api change patch.
+
 * Sun Sep 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-4
 - Rebuild for FC6.
 - Add patch to fix build due to EContactPhoto API change.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 May 2006 18:46:32 -0000	1.8
+++ sources	16 Oct 2006 23:20:11 -0000	1.9
@@ -1 +1 @@
-53b7d3a55ce7f50dae06f2c896cb1677  contact-lookup-applet-0.14.tar.gz
+752272faae5f2e24be554627b1e95a8c  contact-lookup-applet-0.15.tar.gz


--- contact-lookup-applet-0.14-api.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 16 23:27:32 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 16 Oct 2006 16:27:32 -0700
Subject: status-report-scripts dircheck,NONE,1.1
Message-ID: <200610162327.k9GNRWaJ007114@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7089

Added Files:
	dircheck 
Log Message:
Add first-pass hack to find multiply-owned and unowned directories.



--- NEW FILE dircheck ---
#!/usr/bin/perl -w
#use strict 'vars';
use Getopt::Long;
use XML::Simple;
use XML::Twig;
use Data::Dumper;

my @checkfiles;
my @loadfiles;
our($verbose, $multiply, $unowned);

our %dirs;
our %files;

GetOptions('check=s' => \@checkfiles,
#       'load=s' => \@loadfiles,
       'verbose' => \$verbose,
       'multiplyowned' => \$multiply,
       'unowned' => \$unowned,
);
$|=1 if $verbose;
if (!$multiply && !$unowned) {
	$multiply = $unowned = 1;
}

#TODO:
# Parse filelists.xml.gz directly
# Accept command line args:
#   accept an rpm, get a listing of its files, and check those
#   auto-gzcat files ending in .gz
#   allow a filelists file to be loaded in but have no warnings generated
#   against it.
#     since we know the base distro will always be screwed but we may
#     still want to generate a report against a single package or against
#     another repo.

# Suck in data from the various files
$count = 1;
for $i (@checkfiles) {
	if ($i =~ /(.*):(.*)/) {
		$i = $1; $source = $2;
	}
	else {
		$source = $count if $count > 1;
	}
	print "Loading $i\n" if $verbose;
	open $fp, $i or die "Can't open $i: $!";
	read_xml_regexp($fp, $source);
	close $fp;
	$count++;
}

find_multiply_owned() if $multiply;
find_unowned() if $unowned;

exit 0;

sub find_multiply_owned {
	print "Finding multiply owned directories.\n" if $verbose;
	for $i (keys %dirs) {
		next if $i =~ m!/usr/lib/perl5/vendor_perl/5\..*/!;
		@d = uniq(@{$dirs{$i}});
		if (@d > 1) {
			print "$i is multiply owned:\n";
			for $j (@d) {
				print "\t$j\n";
			}
		}
	}
}

sub find_unowned {
	my($i, $j, $p);
	print "Finding unowned directories.\n" if $verbose;
	for $i (sort(keys %dirs, keys %files)) {
		next if $i eq '/';
		($parent) = $i =~ m!^(.*)/[^/]+$!;
		if (length($parent) && !$dirs{$parent}) {
			if ($files{$parent}) {
				print "Odd, parent directory of $i is a file (maybe a symlink).\n" if $verbose;
				next;
			}
			$unowned{$parent} ||= [];
			push @{$unowned{$parent}}, [$i, (@{$files{$i} || $dirs{$i}})];
		}
	}
	for $i (sort keys %unowned) {
		print "$i is unowned, occupied by:\n";
		for $j (@{$unowned{$i}}) {
			print "\t$j->[0], in package $j->[1]\n";
		}
	}
}

sub read_file_list {
	my ($fp, $source, $package) = @_;
	my (@l, $l);
	while (defined($l = <$fp>)) {
		@l = split(/\s+/, $l);
		if ($l[0] =~ /^d/) {
			print "dir: $l[8]\n";
		}
		else {
			print "file: $l[8]\n";
		}
	}
}

sub read_xml_simple {
	my ($fp, $source) = @_;
	my $kernelseen = 0;
	my ($l, $package, $xml);

	$xml = XMLin($fp, ForceArray => 1);

	for $package (@{$xml->{package}}) {
		print Dumper $package;
		$p = $package->{name}[0];
		$kernelseen++ if $p eq 'kernel';
		$p .= " ($source)" if $source;
	}
}

sub read_xml_twig {
	my ($fp, $source) = @_;
	my $kernelseen = 0;
	my ($l, $package, $xml);

	my $t = XML::Twig->new(twig_roots => { package => \&parse_package });
	print "Parsing." if $verbose;
	$t->parse($fp);
	$t->flush;

	sub parse_package {
		my ($t, $elt) = @_;
		print ".";# if $verbose;
		$p = $elt->att('name');
		$kernelseen++ if $p eq 'kernel';
		$p .= " ($source)" if $source;
		for $i ($elt->children) {
			next unless $i->tag eq 'file';
			$type = $i->att('type') || '';
			if ($type eq 'dir') {
				push @{$dirs{$i->text}}, "$p";
			}
#			else {
#				push @{$files{$i->text}}, $p;
#			}
		}
		$t->purge;
		1;
	};

}

sub read_xml_regexp {
	my ($fp, $source) = @_;
	my $kernelseen = 0;
	my ($l, $p);
	while (defined($l = <$fp>)) {
		@l = split(/(?<=>)\s*(?=<)/, $l);
		for $l (@l) {
			next unless length($l);
			if ($l =~ /package.*name=\"([^\"]+)/) {
				$p = $1;
				$p .= " ($source)" if $source;
				next;
			}
			elsif ($l =~ /file type=\"dir\">([^<]+)/) {
				$dirs{$1} ||= [];
				push @{$dirs{$1}}, $p;
			}
			elsif ($l =~ m!^\s*<file>(.*)</file>$!) {
				$files{$1} ||= [];
				push @{$files{$1}}, $p;
			}
		}
	}
}

sub uniq {
	my %seen;
	grep {!$seen{$_}++} @_;
}



From fedora-extras-commits at redhat.com  Mon Oct 16 23:33:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 16:33:57 -0700
Subject: rpms/perl-BerkeleyDB/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200610162333.k9GNXvMO007183@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-BerkeleyDB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7165

Modified Files:
	.cvsignore sources 
Log Message:
Fix broken sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Oct 2006 22:50:50 -0000	1.7
+++ .cvsignore	16 Oct 2006 23:33:26 -0000	1.8
@@ -0,0 +1 @@
+BerkeleyDB-0.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Oct 2006 22:50:50 -0000	1.7
+++ sources	16 Oct 2006 23:33:26 -0000	1.8
@@ -0,0 +1 @@
+48e2cf29d37f457a35eedc3104c41eac  BerkeleyDB-0.31.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 16 23:49:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 16:49:07 -0700
Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.13,1.14
Message-ID: <200610162349.k9GNn7S4007241@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-BerkeleyDB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7225

Modified Files:
	perl-BerkeleyDB.spec 
Log Message:
Rebuild.


Index: perl-BerkeleyDB.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-BerkeleyDB.spec	16 Oct 2006 22:50:50 -0000	1.13
+++ perl-BerkeleyDB.spec	16 Oct 2006 23:48:37 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-BerkeleyDB
 Version:        0.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for Berkeley DB version 2, 3 or 4
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.31-2
+- Rebuild.
+
 * Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.31-1
 - Update to 0.31.
 - Use fixperms macro instead of our own chmod incantation.



From fedora-extras-commits at redhat.com  Mon Oct 16 23:56:02 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Mon, 16 Oct 2006 16:56:02 -0700
Subject: comps comps-fe5.xml.in,1.169,1.170 comps-fe6.xml.in,1.190,1.191
Message-ID: <200610162356.k9GNu2jK007386@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7364

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add lineakd and associated plugin packages to comps.xml


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- comps-fe5.xml.in	15 Oct 2006 03:08:34 -0000	1.169
+++ comps-fe5.xml.in	16 Oct 2006 23:55:32 -0000	1.170
@@ -71,6 +71,9 @@
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">efont-unicode-bdf</packagereq>
       <packagereq type="optional">fonttools</packagereq>
+      <packagereq type="optional">lineak-defaultplugin</packagereq>
+      <packagereq type="optional">lineak-xosdplugin</packagereq>
+      <packagereq type="optional">lineakd</packagereq>
       <packagereq type="optional">rss-glx</packagereq>
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
@@ -615,6 +618,7 @@
       <packagereq type="optional">ksynaptics</packagereq>
       <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
+      <packagereq type="optional">lineak-kdeplugins</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">rekall</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- comps-fe6.xml.in	16 Oct 2006 19:10:36 -0000	1.190
+++ comps-fe6.xml.in	16 Oct 2006 23:55:32 -0000	1.191
@@ -75,6 +75,9 @@
       <packagereq type="optional">efont-unicode-bdf</packagereq>
       <packagereq type="optional">FreeWnn</packagereq>
       <packagereq type="optional">kinput2</packagereq>
+      <packagereq type="optional">lineak-defaultplugin</packagereq>
+      <packagereq type="optional">lineak-xosdplugin</packagereq>
+      <packagereq type="optional">lineakd</packagereq>
       <packagereq type="optional">rss-glx</packagereq>
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
@@ -701,6 +704,7 @@
       <packagereq type="optional">ksynaptics</packagereq>
       <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
+      <packagereq type="optional">lineak-kdeplugins</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">rekall</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 17 00:07:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 17:07:57 -0700
Subject: rpms/perl-CPANPLUS/devel .cvsignore, 1.4, 1.5 perl-CPANPLUS.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200610170007.k9H07vBe010375@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPANPLUS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10355

Modified Files:
	.cvsignore perl-CPANPLUS.spec sources 
Log Message:
Update to 0.076.
Fix find option order.
Use fixperms macro instead of our own chmod incantation.
Add #! line to cpanp-run-perl.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2006 00:50:48 -0000	1.4
+++ .cvsignore	17 Oct 2006 00:07:26 -0000	1.5
@@ -1 +1 @@
-CPANPLUS-0.074.tar.gz
+CPANPLUS-0.076.tar.gz


Index: perl-CPANPLUS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/perl-CPANPLUS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-CPANPLUS.spec	14 Sep 2006 00:50:48 -0000	1.4
+++ perl-CPANPLUS.spec	17 Oct 2006 00:07:26 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-CPANPLUS
-Version:        0.074
+Version:        0.076
 Release:        1%{?dist}
 Summary:        API & CLI access to the CPAN mirrors
 License:        GPL or Artistic
@@ -37,6 +37,8 @@
 sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
 chmod +x %{__perl_requires}
 
+perl -pi -e 'print "#!/usr/bin/perl\n\n" if ($. == 1)' bin/cpanp-run-perl
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor AUTOINSTALL=1
 make %{?_smp_mflags}
@@ -48,9 +50,9 @@
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -type f -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 %{?_with_check:make test}
@@ -67,6 +69,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.076-1
+- Update to 0.076.
+- Fix find option order.
+- Use fixperms macro instead of our own chmod incantation.
+- Add #! line to cpanp-run-perl.
+
 * Wed Sep 13 2006 Steven Pritchard <steve at kspei.com> 0.074-1
 - Update to 0.074.
 - Minor cleanup.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2006 00:50:48 -0000	1.4
+++ sources	17 Oct 2006 00:07:26 -0000	1.5
@@ -1 +1 @@
-d98bbb9229d4ee20017101bf1b6eb704  CPANPLUS-0.074.tar.gz
+a301bb6240ded8eea9f33ce7c8f969fb  CPANPLUS-0.076.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 00:32:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Oct 2006 17:32:20 -0700
Subject: rpms/gossip/devel .cvsignore, 1.15, 1.16 gossip.spec, 1.30,
	1.31 sources, 1.15, 1.16
Message-ID: <200610170032.k9H0WK4A010563@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10538

Modified Files:
	.cvsignore gossip.spec sources 
Log Message:
* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.18-1
- Update to 0.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Sep 2006 18:54:23 -0000	1.15
+++ .cvsignore	17 Oct 2006 00:31:50 -0000	1.16
@@ -1 +1 @@
-gossip-0.17.tar.bz2
+gossip-0.18.tar.bz2


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gossip.spec	4 Oct 2006 22:19:50 -0000	1.30
+++ gossip.spec	17 Oct 2006 00:31:50 -0000	1.31
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           gossip
-Version:        0.17
-Release:        2%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.18-1
+- Update to 0.18.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.17-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Sep 2006 18:54:23 -0000	1.15
+++ sources	17 Oct 2006 00:31:50 -0000	1.16
@@ -1 +1 @@
-7050f4b3ac281aa13f1a55fe41f28cb1  gossip-0.17.tar.bz2
+bb5be4bcb259c36c64e1809b665f7de6  gossip-0.18.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 17 00:39:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 17:39:28 -0700
Subject: rpms/perl-File-BOM/devel .cvsignore, 1.4, 1.5 perl-File-BOM.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200610170039.k9H0dSM2010653@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-BOM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10628

Modified Files:
	.cvsignore perl-File-BOM.spec sources 
Log Message:
Update to 0.14.
Reformat to match cpanspec output.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2006 21:35:51 -0000	1.4
+++ .cvsignore	17 Oct 2006 00:38:58 -0000	1.5
@@ -1 +1 @@
-File-BOM-0.12.tar.gz
+File-BOM-0.14.tar.gz


Index: perl-File-BOM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/perl-File-BOM.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-File-BOM.spec	26 Sep 2006 21:35:51 -0000	1.3
+++ perl-File-BOM.spec	17 Oct 2006 00:38:58 -0000	1.4
@@ -1,56 +1,54 @@
 Name:           perl-File-BOM
-Version:        0.12
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Utilities for handling Byte Order Marks
-
-Group:          Development/Libraries
 License:        GPL or Artistic
+Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/File-BOM/
 Source0:        http://www.cpan.org/authors/id/M/MA/MATTLAW/File-BOM-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Readonly) >= 0.06
 BuildRequires:  perl(Test::Exception) >= 0.20
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module provides functions for handling unicode byte order marks, which
 are to be found at the beginning of some files and streams.
 
-
 %prep
 %setup -q -n File-BOM-%{version}
 
-
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
 
-chmod -R u+w $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 README TODO Changes
+%doc Changes README TODO
 %{perl_vendorlib}/*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 0.14-1
+- Update to 0.14.
+- Reformat to match cpanspec output.
+
 * Tue Sep 26 2006 Steven Pritchard <steve at kspei.com> 0.12-1
 - Update to 0.12.
 - Canonicalize Source0 URL.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2006 21:35:51 -0000	1.4
+++ sources	17 Oct 2006 00:38:58 -0000	1.5
@@ -1 +1 @@
-9292b9b01d7924ee593dca7b813363ec  File-BOM-0.12.tar.gz
+e55642294d8ab369b4dda4e9d57c8e41  File-BOM-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 00:58:58 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 16 Oct 2006 17:58:58 -0700
Subject: rpms/perl-HTML-Mason/devel HTML-Mason-filter-provides.sh, NONE,
	1.1 HTML-Mason-filter-requires.sh, NONE, 1.1 .cvsignore, 1.4,
	1.5 perl-HTML-Mason.spec, 1.7, 1.8 sources, 1.4,
	1.5 filter-provides.sh, 1.1, NONE filter-requires.sh, 1.1, NONE
Message-ID: <200610170058.k9H0wwgK010808@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10786

Modified Files:
	.cvsignore perl-HTML-Mason.spec sources 
Added Files:
	HTML-Mason-filter-provides.sh HTML-Mason-filter-requires.sh 
Removed Files:
	filter-provides.sh filter-requires.sh 
Log Message:
Update to 1.34.
Use fixperms macro instead of our own chmod incantation.
Reformat a bit to more closely resemble current cpanspec output.
Rename filter-*.sh to HTML-Mason-filter-*.sh.



--- NEW FILE HTML-Mason-filter-provides.sh ---
#!/bin/sh

@@PERL_PROV@@ "$@" | sed -e '/^perl(MyApp::/d'


--- NEW FILE HTML-Mason-filter-requires.sh ---
#!/bin/sh

@@PERL_REQ@@ "$@" | sed -e '/^perl(MasonX::Request::PlusApacheSession)$/d'


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2006 22:15:39 -0000	1.4
+++ .cvsignore	17 Oct 2006 00:58:27 -0000	1.5
@@ -1 +1 @@
-HTML-Mason-1.33.tar.gz
+HTML-Mason-1.34.tar.gz


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-HTML-Mason.spec	17 Sep 2006 19:13:54 -0000	1.7
+++ perl-HTML-Mason.spec	17 Oct 2006 00:58:27 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Mason
-Version:        1.33
-Release:        3%{?dist}
+Version:        1.34
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
@@ -9,21 +9,13 @@
 Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/HTML-Mason-%{version}.tar.gz
 Source1:        perl-HTML-Mason.conf
 
-# Filter perl(MasonX::Request::PlusApacheSession).
-Source2:        filter-requires.sh
-%define __perl_requires %{SOURCE2}
-
-# Filter perl(MyApp::Mason) and perl(MyApp::MasonPlusSession).
-Source3:        filter-provides.sh
-%define __perl_provides %{SOURCE3}
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Cache::Cache) >= 1
 BuildRequires:  perl(Class::Container) >= 0.07
 BuildRequires:  perl(Exception::Class) >= 1.15
-BuildRequires:  perl(Params::Validate) >= 0.7
 BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Params::Validate) >= 0.7
 BuildRequires:  perl(mod_perl2)
 BuildRequires:  perl(HTML::Entities)
 Requires:       perl(Cache::Cache) >= 1
@@ -35,6 +27,16 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       %{_sysconfdir}/httpd/conf.d
 
+# Filter perl(MasonX::Request::PlusApacheSession).
+Source98:       HTML-Mason-filter-requires.sh
+%global real_perl_requires %{__perl_requires}
+%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
+
+# Filter perl(MyApp::Mason) and perl(MyApp::MasonPlusSession).
+Source99:       HTML-Mason-filter-provides.sh
+%global real_perl_provides %{__perl_provides}
+%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides
+
 %description
 Mason is a powerful Perl-based web site development and delivery
 engine. With Mason you can embed Perl code in your HTML and construct
@@ -45,6 +47,12 @@
 %prep
 %setup -q -n HTML-Mason-%{version}
 
+sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
+chmod +x %{__perl_requires}
+
+sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides}
+chmod +x %{__perl_provides}
+
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
@@ -55,7 +63,7 @@
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/*.README
 for file in $RPM_BUILD_ROOT%{_bindir}/convert*.pl ; do
@@ -73,11 +81,11 @@
 ./Build test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides}
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS Changes LICENSE README UPGRADE
+%doc Changes CREDITS LICENSE README UPGRADE
 %doc htdocs/ eg/ samples/
 %{_bindir}/mason*
 %{perl_vendorlib}/*
@@ -87,7 +95,13 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
-* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.33-3
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1:1.34-1
+- Update to 1.34.
+- Use fixperms macro instead of our own chmod incantation.
+- Reformat a bit to more closely resemble current cpanspec output.
+- Rename filter-*.sh to HTML-Mason-filter-*.sh.
+
+* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1:1.33-3
 - Fix find option order.
 
 * Thu Jun 08 2006 Steven Pritchard <steve at kspei.com> 1:1.33-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 May 2006 22:15:39 -0000	1.4
+++ sources	17 Oct 2006 00:58:27 -0000	1.5
@@ -1 +1 @@
-22c2cd76ed068630708175d570f97277  HTML-Mason-1.33.tar.gz
+a41b0fc3890f07a1b701950537f7543e  HTML-Mason-1.34.tar.gz


--- filter-provides.sh DELETED ---


--- filter-requires.sh DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 02:43:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:43:02 -0700
Subject: rpms/php-pear-DB-QueryTool - New directory
Message-ID: <200610170243.k9H2h2l5017371@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17367/php-pear-DB-QueryTool

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-QueryTool added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 02:43:08 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:43:08 -0700
Subject: rpms/php-pear-DB-QueryTool/devel - New directory
Message-ID: <200610170243.k9H2h8pG017387@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17367/php-pear-DB-QueryTool/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-QueryTool/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 02:43:20 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:43:20 -0700
Subject: rpms/php-pear-DB-QueryTool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170243.k9H2hKxA017422@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17416

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-DB-QueryTool


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-DB-QueryTool
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 02:43:26 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:43:26 -0700
Subject: rpms/php-pear-DB-QueryTool/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610170243.k9H2hQRN017440@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17416/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-DB-QueryTool


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 02:44:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:44:16 -0700
Subject: rpms/php-pear-DB-QueryTool import.log,1.1,1.2
Message-ID: <200610170244.k9H2iGIE017528@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17486

Modified Files:
	import.log 
Log Message:
auto-import php-pear-DB-QueryTool-1.0.3-1 on branch devel from php-pear-DB-QueryTool-1.0.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-QueryTool/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 02:43:20 -0000	1.1
+++ import.log	17 Oct 2006 02:43:46 -0000	1.2
@@ -0,0 +1 @@
+php-pear-DB-QueryTool-1_0_3-1:HEAD:php-pear-DB-QueryTool-1.0.3-1.src.rpm:1161053022



From fedora-extras-commits at redhat.com  Tue Oct 17 02:44:17 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:44:17 -0700
Subject: rpms/php-pear-DB-QueryTool/devel php-pear-DB-QueryTool.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610170244.k9H2iHL7017532@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-QueryTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17486/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-DB-QueryTool.spec 
Log Message:
auto-import php-pear-DB-QueryTool-1.0.3-1 on branch devel from php-pear-DB-QueryTool-1.0.3-1.src.rpm


--- NEW FILE php-pear-DB-QueryTool.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name DB_QueryTool

Name:           php-pear-DB-QueryTool
Version:        1.0.3
Release:        1%{?dist}
Summary:        An OO-interface for easily retrieving and modifying data in a DB

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/DB_QueryTool
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(DB) php-pear(Log)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This package is an OO-abstraction to the SQL-Query language, it provides
methods such as setWhere, setOrder, setGroup, setJoin, etc. to easily
build queries.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/DB/QueryTool*


%changelog
* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 1.0.3-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-QueryTool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 02:43:26 -0000	1.1
+++ .cvsignore	17 Oct 2006 02:43:47 -0000	1.2
@@ -0,0 +1 @@
+DB_QueryTool-1.0.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-QueryTool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 02:43:26 -0000	1.1
+++ sources	17 Oct 2006 02:43:47 -0000	1.2
@@ -0,0 +1 @@
+6b93afe58f4e5bdd2f198b2b6d7acefa  DB_QueryTool-1.0.3.tgz



From fedora-extras-commits at redhat.com  Tue Oct 17 02:46:32 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 19:46:32 -0700
Subject: owners owners.list,1.1835,1.1836
Message-ID: <200610170246.k9H2kWp4017623@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17592

Modified Files:
	owners.list 
Log Message:
php-pear-DB-QueryTool


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1835
retrieving revision 1.1836
diff -u -r1.1835 -r1.1836
--- owners.list	16 Oct 2006 18:48:25 -0000	1.1835
+++ owners.list	17 Oct 2006 02:46:02 -0000	1.1836
@@ -1733,6 +1733,7 @@
 Fedora Extras|php-pear-Console-Table|Class that makes it easy to build console style tables|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Log|Abstracted logging facility for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 03:01:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:01:30 -0700
Subject: rpms/php-pear-XML-Util - New directory
Message-ID: <200610170301.k9H31U4j020675@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20671/php-pear-XML-Util

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Util added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 03:01:33 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:01:33 -0700
Subject: rpms/php-pear-XML-Util/devel - New directory
Message-ID: <200610170301.k9H31XRR020688@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20671/php-pear-XML-Util/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Util/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 03:01:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:01:47 -0700
Subject: rpms/php-pear-XML-Util Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170301.k9H31lHF020760@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20754

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-XML-Util


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-XML-Util
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 03:01:55 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:01:55 -0700
Subject: rpms/php-pear-XML-Util/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610170301.k9H31tCf020777@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20754/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-XML-Util


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 03:02:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:02:56 -0700
Subject: rpms/php-pear-XML-Util import.log,1.1,1.2
Message-ID: <200610170302.k9H32uOk020852@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20820

Modified Files:
	import.log 
Log Message:
auto-import php-pear-XML-Util-1.1.1-1 on branch devel from php-pear-XML-Util-1.1.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 03:01:47 -0000	1.1
+++ import.log	17 Oct 2006 03:02:26 -0000	1.2
@@ -0,0 +1 @@
+php-pear-XML-Util-1_1_1-1:HEAD:php-pear-XML-Util-1.1.1-1.src.rpm:1161054141



From fedora-extras-commits at redhat.com  Tue Oct 17 03:02:57 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:02:57 -0700
Subject: rpms/php-pear-XML-Util/devel php-pear-XML-Util.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610170302.k9H32vdM020854@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20820/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-XML-Util.spec 
Log Message:
auto-import php-pear-XML-Util-1.1.1-1 on branch devel from php-pear-XML-Util-1.1.1-1.src.rpm


--- NEW FILE php-pear-XML-Util.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name XML_Util

Name:           php-pear-XML-Util
Version:        1.1.1
Release:        1%{?dist}
Summary:        XML utility class

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/XML_Util
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
Requires:       php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
XML_Util is a utility class that helps you working with (and especially
creating) XML documents.

All methods of XML_Util can be called statically, that means you do not have
to instantiate an XML_Util object to use the provided methods.

The funcionality of XML_Util ranges from validating an XML tag name (as there
are strict rules for tag and attribute names) to the creation of namespaced
XML tags. 


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Fix end of line encoding
dos2unix docdir/%{pear_name}/examples/example*.php

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/XML/Util.php


%changelog
* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 1.1.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 03:01:54 -0000	1.1
+++ .cvsignore	17 Oct 2006 03:02:27 -0000	1.2
@@ -0,0 +1 @@
+XML_Util-1.1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 03:01:54 -0000	1.1
+++ sources	17 Oct 2006 03:02:27 -0000	1.2
@@ -0,0 +1 @@
+528278996240d47a07e4273fb7bde841  XML_Util-1.1.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 17 03:05:07 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:05:07 -0700
Subject: owners owners.list,1.1836,1.1837
Message-ID: <200610170305.k9H357YR020904@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20888

Modified Files:
	owners.list 
Log Message:
php-pear-XML-Util


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1836
retrieving revision 1.1837
diff -u -r1.1836 -r1.1837
--- owners.list	17 Oct 2006 02:46:02 -0000	1.1836
+++ owners.list	17 Oct 2006 03:04:37 -0000	1.1837
@@ -1752,6 +1752,7 @@
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Parser|XML parsing class based on PHP's bundled expat|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-XML-Util|XML utility class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-apc|APC caches and optimizes PHP intermediate code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 03:15:46 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 16 Oct 2006 20:15:46 -0700
Subject: rpms/perl-Curses/devel .cvsignore, 1.3, 1.4 perl-Curses.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200610170315.k9H3FkcX021094@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21072

Modified Files:
	.cvsignore perl-Curses.spec sources 
Log Message:
bump to 1.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Aug 2006 22:23:37 -0000	1.3
+++ .cvsignore	17 Oct 2006 03:15:15 -0000	1.4
@@ -1 +1 @@
-Curses-1.14.tgz
+Curses-1.15.tgz


Index: perl-Curses.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/perl-Curses.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Curses.spec	27 Aug 2006 22:29:53 -0000	1.3
+++ perl-Curses.spec	17 Oct 2006 03:15:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Curses
-Version:        1.14
-Release:        2%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Perl bindings for ncurses
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 1.15-1
+- bump to 1.15
+
 * Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 1.14-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Aug 2006 22:23:37 -0000	1.3
+++ sources	17 Oct 2006 03:15:15 -0000	1.4
@@ -1 +1 @@
-d446947a39025e1a61512fd99ff8ff25  Curses-1.14.tgz
+6f3c5ea61cbbfabe15b0004febcb3a4d  Curses-1.15.tgz



From fedora-extras-commits at redhat.com  Tue Oct 17 03:18:39 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:18:39 -0700
Subject: rpms/php-pear-XML-Beautifier - New directory
Message-ID: <200610170318.k9H3IdHV021214@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21210/php-pear-XML-Beautifier

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Beautifier added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 03:18:45 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:18:45 -0700
Subject: rpms/php-pear-XML-Beautifier/devel - New directory
Message-ID: <200610170318.k9H3IjFL021228@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21210/php-pear-XML-Beautifier/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Beautifier/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 03:18:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:18:56 -0700
Subject: rpms/php-pear-XML-Beautifier Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170318.k9H3IuNq021259@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-XML-Beautifier


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-XML-Beautifier
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 03:19:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:19:02 -0700
Subject: rpms/php-pear-XML-Beautifier/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610170319.k9H3J2Dq021275@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-XML-Beautifier


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 03:19:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:19:51 -0700
Subject: rpms/php-pear-XML-Beautifier import.log,1.1,1.2
Message-ID: <200610170319.k9H3JpDM021348@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21315

Modified Files:
	import.log 
Log Message:
auto-import php-pear-XML-Beautifier-1.1-1 on branch devel from php-pear-XML-Beautifier-1.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Beautifier/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 03:18:56 -0000	1.1
+++ import.log	17 Oct 2006 03:19:21 -0000	1.2
@@ -0,0 +1 @@
+php-pear-XML-Beautifier-1_1-1:HEAD:php-pear-XML-Beautifier-1.1-1.src.rpm:1161055158



From fedora-extras-commits at redhat.com  Tue Oct 17 03:19:52 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:19:52 -0700
Subject: rpms/php-pear-XML-Beautifier/devel php-pear-XML-Beautifier.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610170319.k9H3JqRr021352@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Beautifier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21315/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-XML-Beautifier.spec 
Log Message:
auto-import php-pear-XML-Beautifier-1.1-1 on branch devel from php-pear-XML-Beautifier-1.1-1.src.rpm


--- NEW FILE php-pear-XML-Beautifier.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name XML_Beautifier

Name:           php-pear-XML-Beautifier
Version:        1.1
Release:        1%{?dist}
Summary:        Class to format XML documents

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/XML_Beautifier
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(XML_Util) php-pear(XML_Parser)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
XML_Beautifier is a package, that helps you making XML documents easier to
read for human beings.

It is able to add line-breaks, indentation, sorts attributes, convert tag
cases and wraps long comments. It recognizes tags, character data, comments,
XML declarations, processing instructions and external entities and is able
to format these tokens nicely.

The document is split into these tokens using the XML_Beautifier_Tokenizer
class and the expat parser. Then a renderer is used to create the string
representation of the document and formats it using the specified options.

Currently only one renderer is available, but as XML_Beautifier uses a
driver-based architecture, other renderers (like syntax-highlighting)
will follow soon. 


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/XML/Beautifier*


%changelog
* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 1.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Beautifier/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 03:19:02 -0000	1.1
+++ .cvsignore	17 Oct 2006 03:19:22 -0000	1.2
@@ -0,0 +1 @@
+XML_Beautifier-1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Beautifier/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 03:19:02 -0000	1.1
+++ sources	17 Oct 2006 03:19:22 -0000	1.2
@@ -0,0 +1 @@
+d121758edb840d9107debb26bb5837d7  XML_Beautifier-1.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 17 03:22:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 20:22:02 -0700
Subject: owners owners.list,1.1837,1.1838
Message-ID: <200610170322.k9H3M2qd021405@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21389

Modified Files:
	owners.list 
Log Message:
php-pear-XML-Beautifier


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1837
retrieving revision 1.1838
diff -u -r1.1837 -r1.1838
--- owners.list	17 Oct 2006 03:04:37 -0000	1.1837
+++ owners.list	17 Oct 2006 03:21:31 -0000	1.1838
@@ -1751,6 +1751,7 @@
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Parser|XML parsing class based on PHP's bundled expat|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Util|XML utility class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-apc|APC caches and optimizes PHP intermediate code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 03:47:14 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon, 16 Oct 2006 20:47:14 -0700
Subject: rpms/scribes/devel .cvsignore, 1.4,
	1.5 scribes-configure.ac-no-python-depcheck.patch, 1.1,
	1.2 scribes.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <200610170347.k9H3lE2d021584@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21545

Modified Files:
	.cvsignore scribes-configure.ac-no-python-depcheck.patch 
	scribes.spec sources 
Log Message:
New upstream version (0.2.9.88); don't hardcode a Pysco requirement (though note it in the %description)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 23:24:16 -0000	1.4
+++ .cvsignore	17 Oct 2006 03:46:43 -0000	1.5
@@ -1 +1 @@
-scribes-0.2.9.87.tar.bz2
+scribes-0.2.9.88.tar.bz2

scribes-configure.ac-no-python-depcheck.patch:

Index: scribes-configure.ac-no-python-depcheck.patch
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes-configure.ac-no-python-depcheck.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scribes-configure.ac-no-python-depcheck.patch	15 Oct 2006 23:24:16 -0000	1.1
+++ scribes-configure.ac-no-python-depcheck.patch	17 Oct 2006 03:46:43 -0000	1.2
@@ -1,21 +1,19 @@
---- configure.ac.orig	2006-10-15 14:04:26.000000000 -0700
-+++ configure.ac	2006-10-15 14:06:14.000000000 -0700
-@@ -3,8 +3,6 @@
- 
- AC_INIT([scribes], [0.2.9.87], [<mystilleef at gmail.com>])
+--- configure.ac.orig	2006-10-16 20:29:29.000000000 -0700
++++ configure.ac	2006-10-16 20:30:22.000000000 -0700
+@@ -3,7 +3,6 @@
  
+ AC_INIT([scribes], [0.2.9.88], [<mystilleef at gmail.com>])
+ GNOME_COMMON_INIT
 -AC_PREREQ(2.60)
--
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR([configure.ac])
  AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip])
-@@ -22,9 +20,6 @@
- AM_GNU_GETTEXT_VERSION
+ AM_MAINTAINER_MODE
+ 
+@@ -29,8 +28,6 @@
+ AM_GCONF_SOURCE_2
  
  AM_PATH_PYTHON([2.4])
 -AC_LANG([C])
--AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [AC_MSG_RESULT([It worked])], [AC_MSG_ERROR([It failed])])
--
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [], [AC_MSG_ERROR([Error: Dependency check failed])])
+ 
  AC_CONFIG_FILES([
- intl/Makefile
  po/Makefile.in


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scribes.spec	16 Oct 2006 19:21:47 -0000	1.12
+++ scribes.spec	17 Oct 2006 03:46:43 -0000	1.13
@@ -3,8 +3,8 @@
 %define python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.87
-Release:	4%{?dist}
+Version:	0.2.9.88
+Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -35,9 +35,6 @@
 Requires:	gnome-python2-gtksourceview >= 2.12
 Requires:	gnome-python2-gtkspell >= 2.12
 Requires:	PyXML
-%ifarch %ix86
-Requires:	python-psyco
-%endif
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -64,7 +61,8 @@
 ...and more are in development!
 
 In order to make use of its runtime documentation facilities, you will need to
-install Yelp.
+install Yelp. Also, you may install the python-psyco package (x86-only) for a
+boost in startup speed.
 
 
 %prep
@@ -103,6 +101,7 @@
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/error.py
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
+%find_lang %{name}
 
 
 %post
@@ -138,7 +137,7 @@
 scrollkeeper-update -q ||:
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{python_sitelib}/%{python_module_name}/
@@ -154,6 +153,14 @@
 
 
 %changelog
+* Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
+- Don't hardcode a Pysco requirement at all; but note that option in the
+  %%description for those on x86 who want it, since the %ifarch conditional
+  is done at build time, and a noarch package depending on an arch-specific
+  package which isn't available on all arches is a Bad Idea(TM)
+- Update to upstream version 0.2.9.88
+
+
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-4
 - Make the python-psyco requirement an %%ifarch conditional, as it's x86-only
 - Fix line length of earlier %%changelog entry


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 23:24:16 -0000	1.4
+++ sources	17 Oct 2006 03:46:43 -0000	1.5
@@ -1 +1 @@
-428458fd6f6a457b6e2d693f8cd1c6d3  scribes-0.2.9.87.tar.bz2
+cfcd7e4627b5ff4d77bf20bcd4b39535  scribes-0.2.9.88.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 17 03:50:10 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon, 16 Oct 2006 20:50:10 -0700
Subject: rpms/scribes/devel scribes.spec,1.13,1.14
Message-ID: <200610170350.k9H3oAAV021631@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21611

Modified Files:
	scribes.spec 
Log Message:
Very minor aesthetic fix


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scribes.spec	17 Oct 2006 03:46:43 -0000	1.13
+++ scribes.spec	17 Oct 2006 03:49:39 -0000	1.14
@@ -160,7 +160,6 @@
   package which isn't available on all arches is a Bad Idea(TM)
 - Update to upstream version 0.2.9.88
 
-
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-4
 - Make the python-psyco requirement an %%ifarch conditional, as it's x86-only
 - Fix line length of earlier %%changelog entry



From fedora-extras-commits at redhat.com  Tue Oct 17 05:10:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 22:10:02 -0700
Subject: rpms/poker-engine/devel .cvsignore, 1.5, 1.6 poker-engine.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200610170510.k9H5A2qU028200@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28178

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 17:06:08 -0000	1.5
+++ .cvsignore	17 Oct 2006 05:09:32 -0000	1.6
@@ -1 +1 @@
-poker-engine-1.0.18.tar.gz
+poker-engine-1.0.19.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/devel/poker-engine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- poker-engine.spec	12 Sep 2006 21:45:34 -0000	1.11
+++ poker-engine.spec	17 Oct 2006 05:09:32 -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:           poker-engine
-Version:        1.0.18
-Release:        2%{?dist}
+Version:        1.0.19
+Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 Group:          Development/Libraries
 License:        GPL
@@ -51,10 +51,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %doc %{_mandir}/man8/*.8.gz
 %{_sbindir}/pokerconfigupgrade
-%{_datadir}/%{name}/conf/*.xml
-%{python_sitelib}/pokerengine/*.py
-%{python_sitelib}/pokerengine/*.pyc
-%{python_sitelib}/pokerengine/*.pyo
+%{_datadir}/%{name}
+%{python_sitelib}/pokerengine
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %files devel
@@ -62,6 +61,10 @@
 %{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 1.0.19-1
+- Upstream sync
+- Own all directories created
+
 * Tue Sep 12 2006 Christopher Stone <chris.stone at gmail.com> 1.0.18-2
 - Reduce verbosity in %%check section
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 17:06:08 -0000	1.5
+++ sources	17 Oct 2006 05:09:32 -0000	1.6
@@ -1 +1 @@
-6b97b4421948cf1d8e1b123e22469832  poker-engine-1.0.18.tar.gz
+466024b92115f595ac7e4954edacefee  poker-engine-1.0.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 05:14:33 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 22:14:33 -0700
Subject: rpms/poker-engine/FC-5 .cvsignore, 1.5, 1.6 poker-engine.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200610170514.k9H5EXoK028270@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-engine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28250

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 17:21:29 -0000	1.5
+++ .cvsignore	17 Oct 2006 05:14:03 -0000	1.6
@@ -1 +1 @@
-poker-engine-1.0.18.tar.gz
+poker-engine-1.0.19.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/FC-5/poker-engine.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- poker-engine.spec	12 Sep 2006 21:45:33 -0000	1.10
+++ poker-engine.spec	17 Oct 2006 05:14:03 -0000	1.11
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           poker-engine
-Version:        1.0.18
-Release:        2%{?dist}
+Version:        1.0.19
+Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 Group:          Development/Libraries
 License:        GPL
@@ -51,10 +51,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %doc %{_mandir}/man8/*.8.gz
 %{_sbindir}/pokerconfigupgrade
-%{_datadir}/%{name}/conf/*.xml
-%{python_sitelib}/pokerengine/*.py
-%{python_sitelib}/pokerengine/*.pyc
-%{python_sitelib}/pokerengine/*.pyo
+%{_datadir}/%{name}
+%{python_sitelib}/pokerengine
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %files devel
@@ -62,6 +61,10 @@
 %{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 1.0.19-1
+- Upstream sync
+- Own all directories created
+
 * Tue Sep 12 2006 Christopher Stone <chris.stone at gmail.com> 1.0.18-2
 - Reduce verbosity in %%check section
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-engine/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 17:21:29 -0000	1.5
+++ sources	17 Oct 2006 05:14:03 -0000	1.6
@@ -1 +1 @@
-6b97b4421948cf1d8e1b123e22469832  poker-engine-1.0.18.tar.gz
+466024b92115f595ac7e4954edacefee  poker-engine-1.0.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 05:29:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 22:29:02 -0700
Subject: rpms/poker-eval/devel .cvsignore, 1.4, 1.5 poker-eval.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <200610170529.k9H5T2cl028364@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28344

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2006 17:02:29 -0000	1.4
+++ .cvsignore	17 Oct 2006 05:28:32 -0000	1.5
@@ -1 +1 @@
-poker-eval-132.0.tar.gz
+poker-eval-133.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- poker-eval.spec	29 Aug 2006 17:10:54 -0000	1.14
+++ poker-eval.spec	17 Oct 2006 05:28:32 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        132.0
-Release:        3%{?dist}
+Version:        133.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
@@ -26,22 +26,22 @@
 %setup -q
 
 # use examples/ directory for devel package %doc section
-%{__mkdir_p} tmp/examples && %{__cp} examples/*.c tmp/examples
-%{__rm} -f tmp/examples/getopt_w32.c
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
+rm -f tmp/examples/getopt_w32.c
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %check
-%{__make} %{?_smp_mflags} check
+make %{?_smp_mflags} check
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -60,6 +60,10 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 133.0-1
+- Upstream sync
+- Remove system macros
+
 * Tue Aug 29 2006 Christopher Stone <chris.stone at gmail.com> 132.0-3
 - Somehow the package name got messed up
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2006 17:02:29 -0000	1.4
+++ sources	17 Oct 2006 05:28:32 -0000	1.5
@@ -1 +1 @@
-03c2046b5bd6b1f116623b8bba067df8  poker-eval-132.0.tar.gz
+a0495760b99d224ac85f9f80e58c4fb5  poker-eval-133.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 05:30:37 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 16 Oct 2006 22:30:37 -0700
Subject: rpms/poker-eval/FC-5 .cvsignore, 1.4, 1.5 poker-eval.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200610170530.k9H5Ubsf028460@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28431

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2006 17:05:40 -0000	1.4
+++ .cvsignore	17 Oct 2006 05:30:07 -0000	1.5
@@ -1 +1 @@
-poker-eval-132.0.tar.gz
+poker-eval-133.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/poker-eval.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- poker-eval.spec	29 Aug 2006 17:05:40 -0000	1.11
+++ poker-eval.spec	17 Oct 2006 05:30:07 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           poker-eval
-Version:        132.0
+Version:        133.0
 Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
@@ -26,22 +26,22 @@
 %setup -q
 
 # use examples/ directory for devel package %doc section
-%{__mkdir_p} tmp/examples && %{__cp} examples/*.c tmp/examples
-%{__rm} -f tmp/examples/getopt_w32.c
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
+rm -f tmp/examples/getopt_w32.c
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %check
-%{__make} %{?_smp_mflags} check
+make %{?_smp_mflags} check
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -60,6 +60,16 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 133.0-1
+- Upstream sync
+- Remove system macros
+
+* Tue Aug 29 2006 Christopher Stone <chris.stone at gmail.com> 132.0-3
+- Somehow the package name got messed up
+
+* Tue Aug 29 2006 Christopher Stone <chris.stone at gmail.com> 132.0-2
+- Attempted a make tag before committing new sources
+
 * Tue Aug 29 2006 Christopher Stone <chris.stone at gmail.com> 132.0-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2006 17:05:40 -0000	1.4
+++ sources	17 Oct 2006 05:30:07 -0000	1.5
@@ -1 +1 @@
-03c2046b5bd6b1f116623b8bba067df8  poker-eval-132.0.tar.gz
+a0495760b99d224ac85f9f80e58c4fb5  poker-eval-133.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 06:39:44 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:39:44 -0700
Subject: rpms/openpbx - New directory
Message-ID: <200610170639.k9H6diAp031827@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823/openpbx

Log Message:
Directory /cvs/extras/rpms/openpbx added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 06:39:50 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:39:50 -0700
Subject: rpms/openpbx/devel - New directory
Message-ID: <200610170639.k9H6doRD031846@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823/openpbx/devel

Log Message:
Directory /cvs/extras/rpms/openpbx/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 06:40:01 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:40:01 -0700
Subject: rpms/openpbx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170640.k9H6e1t6031868@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31862

Added Files:
	Makefile import.log 
Log Message:
Setup of module openpbx


--- NEW FILE Makefile ---
# Top level Makefile for module openpbx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 06:40:06 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:40:06 -0700
Subject: rpms/openpbx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610170640.k9H6e6Xb031884@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31862/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openpbx


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 06:42:50 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 16 Oct 2006 23:42:50 -0700
Subject: rpms/python-turbocheetah/devel
	python-turbocheetah-0.9.5-setuptools.patch, NONE,
	1.1 python-turbocheetah.spec, 1.1, 1.2
Message-ID: <200610170642.k9H6go3a031953@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31934

Modified Files:
	python-turbocheetah.spec 
Added Files:
	python-turbocheetah-0.9.5-setuptools.patch 
Log Message:
python-turbocheetah-0.9.5-setuptools.patch

python-turbocheetah-0.9.5-setuptools.patch:

--- NEW FILE python-turbocheetah-0.9.5-setuptools.patch ---
--- setup.py.orig	2006-10-17 02:35:28.000000000 -0400
+++ setup.py	2006-10-17 02:35:38.000000000 -0400
@@ -13,7 +13,7 @@
     download_url="http://www.turbogears.org/download/",
     keywords=["python.templating.engines", "turbogears"],
     license="MIT",
-    install_requires = ["Cheetah >= 1.0"],
+    install_requires = [],
     zip_safe=False,
     packages=find_packages(),
     classifiers = [


Index: python-turbocheetah.spec
===================================================================
RCS file: /cvs/extras/rpms/python-turbocheetah/devel/python-turbocheetah.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-turbocheetah.spec	10 Oct 2006 15:19:09 -0000	1.1
+++ python-turbocheetah.spec	17 Oct 2006 06:42:20 -0000	1.2
@@ -5,13 +5,14 @@
 
 Name:           python-turbocheetah
 Version:        0.9.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        TurboGears plugin to support use of Cheetah templates
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org/docs/plugins/template.html
 Source0:        http://cheeseshop.python.org/packages/source/T/TurboCheetah/TurboCheetah-%{version}.tar.gz
+Patch0:         %{name}-%{version}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q -n TurboCheetah-%{version}
+%patch0
 
 
 %build
@@ -50,6 +52,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-5
+- python-turbocheetah-0.9.5-setuptools.patch
+
 * Tue Oct 10 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-4
 - Fix Source0
 - Own %%{python_sitelib}/turbocheetah



From fedora-extras-commits at redhat.com  Tue Oct 17 06:43:40 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:43:40 -0700
Subject: rpms/openpbx import.log,1.1,1.2
Message-ID: <200610170643.k9H6heu1032030@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31998

Modified Files:
	import.log 
Log Message:
auto-import openpbx-1.2-1.rc1.svn1979.fc6 on branch devel from openpbx-1.2-1.rc1.svn1979.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/openpbx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 06:40:00 -0000	1.1
+++ import.log	17 Oct 2006 06:43:10 -0000	1.2
@@ -0,0 +1 @@
+openpbx-1_2-1_rc1_svn1979_fc6:HEAD:openpbx-1.2-1.rc1.svn1979.fc6.src.rpm:1161067387



From fedora-extras-commits at redhat.com  Tue Oct 17 06:43:41 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 16 Oct 2006 23:43:41 -0700
Subject: rpms/openpbx/devel openpbx.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610170643.k9H6hfwB032034@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31998/devel

Modified Files:
	.cvsignore sources 
Added Files:
	openpbx.spec 
Log Message:
auto-import openpbx-1.2-1.rc1.svn1979.fc6 on branch devel from openpbx-1.2-1.rc1.svn1979.fc6.src.rpm


--- NEW FILE openpbx.spec ---
%define snap 1979

%bcond_with misdn
%bcond_without zaptel

%bcond_without	fedora

Name:		openpbx
Version:	1.2
Release:	1.rc1.svn%{snap}%{?dist}
Summary:	The Truly Open Source PBX

Group:		Applications/Internet
License:	GPL
URL:		http://www.openpbx.org/
# svn co -r %{snap} svn://svn.openpbx.org/openpbx/trunk openpbx
# tar cvfz openpbx-r%{snap}.tar.gz openpbx
Source0:	openpbx-r%{snap}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	spandsp-devel >= 0.0.3-1.pre24
BuildRequires:	%{?snap:libtool automake autoconf} zlib-devel
BuildRequires:	fedora-usermgmt-devel bluez-libs-devel openldap-devel
BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel
BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN}
BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel}

Requires:	/sbin/chkconfig
%{?FE_USERADD_REQ}

%description
OpenPBX is an Open Source PBX and telephony development platform that
can both replace a conventional PBX and act as a platform for developing
custom telephony applications for delivering dynamic content over a
telephone similarly to how one can deliver dynamic content through a
web browser using CGI and a web server.

OpenPBX talks to a variety of telephony hardware including BRI, PRI,
POTS, Bluetooth headsets and IP telephony clients using SIP and IAX
protocols protocol (e.g. ekiga or kphone).  For more information and a
current list of supported hardware, see www.openpbx.org.


%package devel
Group:		Applications/Internet
Summary:	Development package for %{name}
Requires:	%{name} = %{version}-%{release}

%description devel
Use this package for developing and building modules for OpenPBX


%package postgresql
Group:		Applications/Internet
Summary:	PostgreSQL support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description postgresql
This package contains modules for OpenPBX which make use of PostgreSQL.

%package odbc
Group:		Applications/Internet
Summary:	ODBC support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description odbc
This package contains modules for OpenPBX which make use of ODBC.

%package ldap
Group:		Applications/Internet
Summary:	LDAP support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description ldap
This package contains modules for OpenPBX which make use of LDAP.

%package bluetooth
Group:		Applications/Internet
Summary:	Bluetooth channel driver for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description bluetooth
This package contains a Bluetooth channel driver for OpenPBX, which
allows Bluetooth headsets and telephones to be used for communication.

%package capi
Group:		Applications/Internet
Summary:	CAPI channel driver for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description capi
This package contains a CAPI (Common ISDN API) channel driver for
OpenPBX, allowing CAPI devices to be used for making and receiving calls.

%package misdn
Group:		Applications/Internet
Summary:	mISDN channel driver for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description misdn
This package contains the mISDN channel driver for OpenPBX. mISDN is
the replacement modular ISDN stack for Linux, intended to be merged
into the 2.6 kernel.

%package zaptel
Group:		Applications/Internet
Summary:	Zaptel modules for OpenPBX
Requires:	%{name} = %{version}-%{release}
Requires:	zaptel >= 1.4.0-1

%description zaptel
This package contains the Zap channel driver and MeetMe application
for OpenPBX. Zaptel is Digium's telephony driver package.

%package jabber
Group:		Applications/Internet
Summary:	Jabber support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description jabber
This package contains Jabber protocol support for OpenPBX.

%package javascript
Group:		Applications/Internet
Summary:	JavaScript support for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description javascript
This package contains JavaScript support for OpenPBX.

%package alsa
Group:		Applications/Internet
Summary:	ALSA channel driver for OpenPBX
Requires:	%{name} = %{version}-%{release}

%description alsa
This package contains an ALSA console driver for OpenPBX, which allows
the local sound devices to be used for making and receiving calls.

%package ogi
Group:		Applications/Internet
Summary:	OpenPBX Gateway Interface
Requires:	%{name} = %{version}-%{release}

%description ogi
This package contains files support for the OpenPBX Gateway Interface; a
convenient interface between OpenPBX and external scripts or programs.


%prep
%setup -q -n openpbx

%build
%if 0%{?snap}
./bootstrap.sh
%endif
# res_sqlite seems to use internal functions of sqlite3 which don't 
# even _exist_ in current versions. Disable it until it's fixed.

%configure --with-directory-layout=lsb --with-chan_bluetooth \
	   --with-chan_fax --with-chan_capi --with-chan_alsa --with-app_ldap \
	   --disable-zaptel --enable-t38 --enable-postgresql --with-cdr-pgsql \
	   --with-res_config_pqsql --with-cdr-odbc --with-res_config_odbc \
	   --with-perl-shebang='#! /usr/bin/perl' --disable-builtin-sqlite3 \
	   --enable-javascript --with-res_js --enable-fast-install \
	   %{?with_misdn:--with-chan_misdn} \
	   %{?with_zaptel:--enable-zaptel} \
	   --enable-jabber --with-res_jabber # --with-res_sqlite

# Poxy fscking libtool is _such_ a pile of crap...
sed -i 's/^CC="gcc"/CC="gcc -Wl,--as-needed"/' libtool

# Poxy fscking autocrap isn't much better
sed -i 's:^/usr/bin/perl:#! /usr/bin/perl:' ogi/fastogi-test ogi/ogi-test.ogi

make %{?_smp_mflags} CCLD="gcc -Wl,--as-needed"

mkdir doc2
mv doc/README.{misdn,chan_capi,res_jabber,odbcstorage} doc2

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/openpbx.org/modules/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/openpbx.org/*.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/openpbx.org/*.la
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m0755 contrib/fedora/openpbx $RPM_BUILD_ROOT%{_initrddir}/openpbx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m0644 contrib/fedora/openpbx.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/openpbx

mv $RPM_BUILD_ROOT/%{_datadir}/openpbx.org/ogi/eogi-*test $RPM_BUILD_ROOT/%{_sbindir}

# More autocrap insanity. We can't just move confdefs.h into the openpbx/ subdir
# because then autocrap will add that subdir to the compiler's include path and
# many things break. So let's just clean up after it.
sed -i 's:"confdefs.h":<openpbx/confdefs.h>:' $RPM_BUILD_ROOT/%{_includedir}/openpbx/*.h
install -m0644 include/confdefs.h $RPM_BUILD_ROOT/%{_includedir}/openpbx/confdefs.h

%clean
rm -rf $RPM_BUILD_ROOT

%pre
%__fe_groupadd 30 -r openpbx &>/dev/null || :
%__fe_useradd  30 -r -s /sbin/nologin -d %{_sysconfdir}/openpbx.org -M \
                    -c 'OpenPBX user' -g openpbx openpbx &>/dev/null || :
%post
/sbin/chkconfig --add openpbx

%preun
test "$1" != 0 || /sbin/chkconfig --del openpbx

%postun
%__fe_userdel  openpbx &>/dev/null || :
%__fe_groupdel openpbx &>/dev/null || :

%pre zaptel
%{_sbindir}/usermod -G `id -G openpbx | tr " " , `,zaptel openpbx

%files
%defattr(-,root,root,-)
%doc COPYING CREDITS LICENSE BUGS AUTHORS SECURITY README HARDWARE
%doc doc/README.* doc/*.txt doc/*.html sample.call ChangeLog
%doc BUGS InstallGuide.txt
%config(noreplace) %{_sysconfdir}/logrotate.d/openpbx
%{_initrddir}/openpbx
%{_sbindir}/openpbx
%{_bindir}/smsq
%{_bindir}/streamplayer
%dir %{_libdir}/openpbx.org
%{_libdir}/openpbx.org/lib*.so.*
%dir %{_libdir}/openpbx.org/modules
%{_libdir}/openpbx.org/modules/*.so
%{_mandir}/man8/openpbx.8.gz
%dir %{_datadir}/openpbx.org
%dir %attr(0755,openpbx,openpbx) %{_sysconfdir}/openpbx.org
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/*
%attr(2755,openpbx,openpbx) %{_localstatedir}/spool/openpbx.org
%attr(0755,openpbx,openpbx) %{_localstatedir}/log/openpbx.org
%attr(0755,openpbx,openpbx) %{_localstatedir}/run/openpbx.org
# Unneeded
%exclude %{_sysconfdir}/openpbx.org/cdr_tds.conf
# Separately packaged
%exclude %{_libdir}/openpbx.org/modules/*pgsql.so
%exclude %{_libdir}/openpbx.org/modules/app_sql_postgres.so
%exclude %{_libdir}/openpbx.org/modules/app_ldap.so
%exclude %{_libdir}/openpbx.org/modules/cdr_odbc.so
%exclude %{_libdir}/openpbx.org/modules/chan_bluetooth.so
%exclude %{_libdir}/openpbx.org/modules/res_jabber.so
%exclude %{_libdir}/openpbx.org/modules/res_js.so
%exclude %{_libdir}/openpbx.org/modules/chan_alsa.so
%exclude %{_libdir}/openpbx.org/modules/res_ogi.so
%exclude %{_libdir}/openpbx.org/modules/chan_capi.so
%exclude %{_sysconfdir}/openpbx.org/cdr_pgsql.conf
%exclude %{_sysconfdir}/openpbx.org/cdr_odbc.conf
%exclude %{_sysconfdir}/openpbx.org/chan_bluetooth.conf
%exclude %{_sysconfdir}/openpbx.org/res_jabber.conf
%exclude %{_sysconfdir}/openpbx.org/alsa.conf
%exclude %{_sysconfdir}/openpbx.org/capi.conf
%if 0%{?with_misdn:1}
%exclude %{_libdir}/openpbx.org/modules/chan_misdn.so
%exclude %{_sysconfdir}/openpbx.org/misdn.conf
%endif
%if 0%{?with_zaptel:1}
%exclude %{_libdir}/openpbx.org/modules/chan_zap.so
%exclude %{_libdir}/openpbx.org/modules/app_meetme.so
%exclude %{_libdir}/openpbx.org/modules/app_flash.so
%exclude %{_sysconfdir}/openpbx.org/zapata.conf
%exclude %{_sysconfdir}/openpbx.org/meetme.conf
%endif

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/openpbx
%{_includedir}/openpbx/*.h
%{_libdir}/openpbx.org/lib*.so

%files postgresql
%{_libdir}/openpbx.org/modules/*pgsql.so
%{_libdir}/openpbx.org/modules/app_sql_postgres.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_pgsql.conf

%files odbc
%{_libdir}/openpbx.org/modules/cdr_odbc.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_odbc.conf
%doc doc2/README.odbcstorage

%files ldap
%{_libdir}/openpbx.org/modules/app_ldap.so

%files bluetooth
%{_libdir}/openpbx.org/modules/chan_bluetooth.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/chan_bluetooth.conf

%files capi
%{_libdir}/openpbx.org/modules/chan_capi.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/capi.conf
%doc doc2/README.chan_capi

%if 0%{?with_misdn:1}
%files misdn
%{_libdir}/openpbx.org/modules/chan_misdn.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/misdn.conf
%doc doc2/README.misdn
%endif

%if 0%{?with_zaptel:1}
%files zaptel
%{_libdir}/openpbx.org/modules/chan_zap.so
%{_libdir}/openpbx.org/modules/app_meetme.so
%{_libdir}/openpbx.org/modules/app_flash.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/zapata.conf
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/meetme.conf
%endif

%files jabber
%{_libdir}/openpbx.org/modules/res_jabber.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/res_jabber.conf
%doc doc2/README.res_jabber

%files javascript
%{_libdir}/openpbx.org/modules/res_js.so

%files alsa
%{_libdir}/openpbx.org/modules/chan_alsa.so
%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/alsa.conf

%files ogi
%{_libdir}/openpbx.org/modules/res_ogi.so
%dir %attr(0755,root,root) %{_datadir}/openpbx.org/ogi
%{_datadir}/openpbx.org/ogi/*
%{_sbindir}/eogi*

%changelog
* Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-1.rc1.svn1979
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 06:40:06 -0000	1.1
+++ .cvsignore	17 Oct 2006 06:43:10 -0000	1.2
@@ -0,0 +1 @@
+openpbx-r1979.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 06:40:06 -0000	1.1
+++ sources	17 Oct 2006 06:43:10 -0000	1.2
@@ -0,0 +1 @@
+b863cbd1e90338b05439267be3eccb44  openpbx-r1979.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 08:30:45 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:30:45 -0700
Subject: rpms/rpld - New directory
Message-ID: <200610170830.k9H8UjeA005967@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963/rpld

Log Message:
Directory /cvs/extras/rpms/rpld added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 08:30:50 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:30:50 -0700
Subject: rpms/rpld/devel - New directory
Message-ID: <200610170830.k9H8UoKh005981@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963/rpld/devel

Log Message:
Directory /cvs/extras/rpms/rpld/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 08:31:16 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:31:16 -0700
Subject: rpms/rpld Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610170831.k9H8VGYR006012@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6006

Added Files:
	Makefile import.log 
Log Message:
Setup of module rpld


--- NEW FILE Makefile ---
# Top level Makefile for module rpld
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 08:31:16 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:31:16 -0700
Subject: rpms/rpld/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610170831.k9H8VG5j006028@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6006/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rpld


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 08:32:48 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:32:48 -0700
Subject: rpms/rpld import.log,1.1,1.2
Message-ID: <200610170832.k9H8WmtO006111@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6076

Modified Files:
	import.log 
Log Message:
auto-import rpld-1.8-0.1.beta1 on branch devel from rpld-1.8-0.1.beta1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rpld/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 08:31:15 -0000	1.1
+++ import.log	17 Oct 2006 08:32:18 -0000	1.2
@@ -0,0 +1 @@
+rpld-1_8-0_1_beta1:HEAD:rpld-1.8-0.1.beta1.src.rpm:1161073922



From fedora-extras-commits at redhat.com  Tue Oct 17 08:32:51 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:32:51 -0700
Subject: rpms/rpld/devel rpld-1.8-makefile.patch, NONE, 1.1 rpld.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610170832.k9H8WpZk006113@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/rpld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6076/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rpld-1.8-makefile.patch rpld.spec 
Log Message:
auto-import rpld-1.8-0.1.beta1 on branch devel from rpld-1.8-0.1.beta1.src.rpm

rpld-1.8-makefile.patch:

--- NEW FILE rpld-1.8-makefile.patch ---
--- rpld-1.8/Makefile.orig	2001-11-01 09:30:36.000000000 -0600
+++ rpld-1.8/Makefile	2006-09-16 09:45:12.627495010 -0500
@@ -109,7 +109,7 @@
 # Stuff
 CC	 = gcc
 INCLUDES = 
-OPT	 = -O
+#OPT	 = -O
 CFLAGS   = ${OPT} ${INCLUDES} ${DEFINES}
 LIBS     = 
 LDFLAGS  =
@@ -212,11 +212,11 @@
 	cp $< $@
 
 install-prog:${PROG}
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${PROG} ${BINDIR}
+	${INSTALL} -c -m ${BINMODE} ${PROG} ${BINDIR}
 
 install-docs: doc
-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} rpld.${MAN8EXT} ${MAN8}/rpld.${MAN8EXT}
-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} rpld.conf.${MAN5EXT} ${MAN5}/rpld.conf.${MAN5EXT}
+	${INSTALL} -c -m ${MANMODE} rpld.${MAN8EXT} ${MAN8}/rpld.${MAN8EXT}
+	${INSTALL} -c -m ${MANMODE} rpld.conf.${MAN5EXT} ${MAN5}/rpld.conf.${MAN5EXT}
 
 ana:ana.c ${NIT}
 #linux-old-nit.c


--- NEW FILE rpld.spec ---
Name:           rpld
Version:        1.8
Release:        0.1.beta1%{?dist}
Summary:        RPL/RIPL remote boot daemon
Group:          System Environment/Daemons
License:        GPL
URL:            http://gimel.esc.cam.ac.uk/james/rpld/index.html
Source0:        http://gimel.esc.cam.ac.uk/james/rpld/src/rpld-1.8-beta-1.tar.gz
Patch0:         rpld_1.8beta1-6.diff.gz
Patch1:         rpld-1.8-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  byacc flex

%description
Daemon to net-boot IBM style RPL boot ROMs (this is not the
same as the Novell IPX-style RPL protocol, despite the
name).

%prep
%setup -q
%patch0 -p1

for I in debian/patches/* ;
do
  patch -p1 -i ${I}
done

%patch1 -p1

%build
make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
mv LICENCE LICENSE

%install
rm -rf $RPM_BUILD_ROOT
# mkdir -p $RPM_BUILD_ROOT/usr/{sbin,share/man/man{8,5}}
mkdir -p $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{8,5}}
make install DESTDIR=$RPM_BUILD_ROOT BINMODE=755 MANMODE=644

find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE INSTALL rpld.conf.sample
%{_sbindir}/*
%{_mandir}/man[^3]/*

%changelog
* Sat Oct 14 2006 Paul P Komkoff Jr <i at stingr.net> - 1.8-0.1.beta1
- Preparing for submission to fedora extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpld/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 08:31:16 -0000	1.1
+++ .cvsignore	17 Oct 2006 08:32:18 -0000	1.2
@@ -0,0 +1,2 @@
+rpld-1.8-beta-1.tar.gz
+rpld_1.8beta1-6.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpld/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 08:31:16 -0000	1.1
+++ sources	17 Oct 2006 08:32:18 -0000	1.2
@@ -0,0 +1,2 @@
+08a020c08a466378a99edb88ea98ba35  rpld-1.8-beta-1.tar.gz
+209d3079e933dd78b1cc04bf7b321c52  rpld_1.8beta1-6.diff.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 08:46:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 17 Oct 2006 01:46:10 -0700
Subject: rpms/soundconverter/devel .cvsignore, 1.5, 1.6 soundconverter.spec, 
	1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200610170846.k9H8kAXA006244@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6224

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 08:57:41 -0000	1.5
+++ .cvsignore	17 Oct 2006 08:45:39 -0000	1.6
@@ -1 +1 @@
-soundconverter-0.9.1.tar.gz
+soundconverter-0.9.2.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/soundconverter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- soundconverter.spec	8 Sep 2006 12:10:54 -0000	1.9
+++ soundconverter.spec	17 Oct 2006 08:45:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           soundconverter
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Denis Leroy <denis at poolshark.org> - 0.9.2-1
+- Update to 0.9.2
+
 * Fri Sep  8 2006 Denis Leroy <denis at poolshark.org> - 0.9.1-3
 - Fixed desktop install
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 08:57:41 -0000	1.5
+++ sources	17 Oct 2006 08:45:39 -0000	1.6
@@ -1 +1 @@
-2f261057fd07727454abe626722c4976  soundconverter-0.9.1.tar.gz
+ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 08:47:50 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 17 Oct 2006 01:47:50 -0700
Subject: owners owners.list,1.1838,1.1839
Message-ID: <200610170847.k9H8lojk006316@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6292

Modified Files:
	owners.list 
Log Message:
rpld - RPL/RIPL remote boot daemon



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1838
retrieving revision 1.1839
diff -u -r1.1838 -r1.1839
--- owners.list	17 Oct 2006 03:21:31 -0000	1.1838
+++ owners.list	17 Oct 2006 08:47:19 -0000	1.1839
@@ -1983,6 +1983,7 @@
 Fedora Extras|rosegarden4|MIDI, audio and notation editor|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|rpld|RPL/RIPL remote boot daemon|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|rpmdevtools|RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
 Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 08:49:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 17 Oct 2006 01:49:05 -0700
Subject: rpms/soundconverter/FC-5 .cvsignore, 1.5, 1.6 soundconverter.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200610170849.k9H8n5fm006350@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6330

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 09:43:48 -0000	1.5
+++ .cvsignore	17 Oct 2006 08:48:35 -0000	1.6
@@ -1 +1 @@
-soundconverter-0.9.1.tar.gz
+soundconverter-0.9.2.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/soundconverter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- soundconverter.spec	8 Sep 2006 09:43:48 -0000	1.6
+++ soundconverter.spec	17 Oct 2006 08:48:35 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           soundconverter
-Version:        0.9.1
+Version:        0.9.2
 Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Denis Leroy <denis at poolshark.org> - 0.9.2-1
+- Update to 0.9.2
+
 * Fri Sep  8 2006 Denis Leroy <denis at poolshark.org> - 0.9.1-1
 - Update to 0.9.1
 - Uses gstreamer 1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 09:43:48 -0000	1.5
+++ sources	17 Oct 2006 08:48:35 -0000	1.6
@@ -1 +1 @@
-2f261057fd07727454abe626722c4976  soundconverter-0.9.1.tar.gz
+ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 09:22:29 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 17 Oct 2006 02:22:29 -0700
Subject: rpms/mantis/FC-5 mantis.spec,1.12,1.13
Message-ID: <200610170922.k9H9MTAK009592@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9576

Modified Files:
	mantis.spec 
Log Message:
rebuild



Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/mantis.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mantis.spec	13 Oct 2006 09:54:57 -0000	1.12
+++ mantis.spec	17 Oct 2006 09:21:59 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:	Web-based bugtracking system
 Name:		mantis
 Version:	1.0.5
-Release:	1%{dist}
+Release:	1%{dist}.1
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.mantisbugtracker.com/
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Gianluca Sforna <giallu gmail com> - 1.0.5-1.1
+- rebuild
+
 * Tue Oct 10 2006 Gianluca Sforna <giallu gmail com> - 1.0.5-1
 - updated to 1.0.5
 



From fedora-extras-commits at redhat.com  Tue Oct 17 09:28:07 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 17 Oct 2006 02:28:07 -0700
Subject: rpms/soundconverter/FC-4 .cvsignore, 1.3, 1.4 soundconverter.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610170928.k9H9S7YU009737@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9715

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2005 09:19:57 -0000	1.3
+++ .cvsignore	17 Oct 2006 09:27:37 -0000	1.4
@@ -1 +1 @@
-soundconverter-0.8.1.tar.gz
+soundconverter-0.9.2.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/soundconverter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- soundconverter.spec	16 Nov 2005 04:49:54 -0000	1.4
+++ soundconverter.spec	17 Oct 2006 09:27:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           soundconverter
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -11,7 +11,14 @@
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
-Requires:       pygtk2 gstreamer-python gstreamer-plugins gnome-python2-gconf
+BuildRequires:  pygtk2
+BuildRequires:  intltool gettext
+
+Requires:       pygtk2
+Requires:       gstreamer-python
+Requires:       gstreamer-plugins
+Requires:       gnome-python2-gconf
+
 
 %description
 A simple sound converter application for the GNOME environment. It reads and
@@ -21,43 +28,40 @@
 %setup -q
 
 %build
-sed -i 's#^GLADE *=.*#GLADE="%{_datadir}/%{name}/%{name}.glade"#' soundconverter.py
-cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=SoundConverter
-Comment=Convert audio using GStreamer
-Exec=%{name}
-Terminal=false
-Type=Application
-Icon=%{name}.png
-Categories=AudioVideo;GTK;
-EOF
+%configure --disable-dependency-tracking
+make %{?_smp_mflags}
+sed -i 's#Icon=#Icon=%{_datadir}/%{name}/%{name}-logo.png#' data/%{name}.desktop
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0644 %{name}.glade $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.glade
-install -p -m 0644 logo.png $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -D -p -m 0755 soundconverter.py $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -D -p -m 0644 logo.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+make install DESTDIR=${RPM_BUILD_ROOT}
+%find_lang %{name}
+
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
-  %{name}.desktop
+  --delete-original \
+  ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
+%doc %{_mandir}/man1/%{name}*
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+
 
 %changelog
+* Tue Oct 17 2006 Denis Leroy <denis at poolshark.org> - 0.9.2-1
+- Update to 0.9.2
+
 * Tue Nov 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.1-2
 - Added gnome-python2-gconf to Requires (#173290)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2005 09:19:57 -0000	1.3
+++ sources	17 Oct 2006 09:27:37 -0000	1.4
@@ -1 +1 @@
-6bea010a5869d65e47d2506b2526087e  soundconverter-0.8.1.tar.gz
+ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 09:38:27 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 17 Oct 2006 02:38:27 -0700
Subject: fedora-security/audit fc5,1.358,1.359
Message-ID: <200610170938.k9H9cRpL009906@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9888/audit

Modified Files:
	fc5 
Log Message:
Update with FEDORA-2006-1022 (kernel)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- fc5	15 Oct 2006 14:05:49 -0000	1.358
+++ fc5	17 Oct 2006 09:38:25 -0000	1.359
@@ -8,7 +8,7 @@
 CVE-2006-5214 ** (X.org, fixed 20060225?)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
-CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
+CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield
 CVE-2006-5170 VULNERABLE (nss_ldap) #209361
 CVE-2006-5160 ignore (firefox) unverified
 CVE-2006-5159 ignore (firefox) unverified
@@ -16,7 +16,7 @@
 CVE-2006-5072 backport (mono) #209464 [since FEDORA-2006-1012]
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
-CVE-2006-4997 VULNERABLE (kernel, fixed 2.6.18)
+CVE-2006-4997 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022]
 CVE-2006-4980 VULNERABLE (python) #208166
 CVE-2006-4925 ** openssh
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
@@ -27,7 +27,7 @@
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)
 CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) #205652
-CVE-2006-4623 VULNERABLE (kernel, fixed 2.6.18-rc1)
+CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)
@@ -47,7 +47,7 @@
 CVE-2006-4565 VULNERABLE (mozilla)
 CVE-2006-4565 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4561 VULNERABLE (firefox)
-CVE-2006-4538 VULNERABLE (kernel)
+CVE-2006-4538 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] ia64 and sparc only
 CVE-2006-4535 version (kernel, fixed 2.6.17.12, fixed 2.6.18-rc6) [since FEDORA-2006-967]
 CVE-2006-4507 ignore (libtiff) can't reproduce
 CVE-2006-4486 VULNERABLE (php, fixed 5.1.6)
@@ -136,7 +136,7 @@
 CVE-2006-3744 backport (ImageMagick) #202193 [since FEDORA-2006-929]
 CVE-2006-3743 backport (ImageMagick) #202193 [since FEDORA-2006-929]
 CVE-2006-3742 backport (kdebase) #201507 [since FEDORA-2006-942]
-CVE-2006-3741 ignore (kernel, fixed 2.6.18-rc7) ia64 only
+CVE-2006-3741 version (kernel, fixed 2.6.18-rc7) [since FEDORA-2006-1022] ia64 only
 CVE-2006-3740 VULNERABLE (libXfont, fixed 1.2.2)
 CVE-2006-3739 VULNERABLE (libXfont, fixed 1.2.2)
 CVE-2006-3738 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
@@ -148,7 +148,7 @@
 CVE-2006-3672 ignore (konqueror) just a crash
 CVE-2006-3665 ignore (squirrelmail) don't enable register_globals!
 CVE-2006-3636 VULNERABLE (mailman, fixed 2.1.9)
-CVE-2006-3634 ignore (kernel, fixed 2.6.17.8) s390 only
+CVE-2006-3634 version (kernel, fixed 2.6.17.8) [since FEDORA-2006-906] s390 only
 CVE-2006-3632 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]
 CVE-2006-3631 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]
 CVE-2006-3630 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]



From fedora-extras-commits at redhat.com  Tue Oct 17 12:13:04 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 17 Oct 2006 05:13:04 -0700
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.8,1.9
Message-ID: <200610171213.k9HCD4om021484@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21466

Modified Files:
	sysprof-kmod.spec 
Log Message:
rebuild



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sysprof-kmod.spec	8 Oct 2006 22:24:10 -0000	1.8
+++ sysprof-kmod.spec	17 Oct 2006 12:12:34 -0000	1.9
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2747.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Gianluca Sforna <giallu gmail com>
+- rebuild for kernel 2.6.18-1.2798
+
 * Sun Oct 8 2006 Gianluca Sforna <giallu gmail com> 1.0.3-5
 - rebuild for kernel 2.6.18-1.2747
 - add patch for linux/config.h include



From fedora-extras-commits at redhat.com  Tue Oct 17 12:23:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 17 Oct 2006 05:23:08 -0700
Subject: rpms/OpenEXR/FC-5 OpenEXR-1.2.2-zlib.patch, 1.2, 1.3 OpenEXR.spec,
	1.8, 1.9
Message-ID: <200610171223.k9HCN8Vb021589@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21568

Modified Files:
	OpenEXR-1.2.2-zlib.patch OpenEXR.spec 
Log Message:
* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
- own %_docdir/OpenEXR-devel-%version (#210997)
- devel: Requires: pkgconfig
- update zlib patch (use Libs.private)


OpenEXR-1.2.2-zlib.patch:

Index: OpenEXR-1.2.2-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-5/OpenEXR-1.2.2-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenEXR-1.2.2-zlib.patch	19 Feb 2006 04:23:12 -0000	1.2
+++ OpenEXR-1.2.2-zlib.patch	17 Oct 2006 12:22:37 -0000	1.3
@@ -1,11 +1,12 @@
---- OpenEXR-1.2.2/OpenEXR.pc.in.zlib	2005-08-13 10:33:18.000000000 -0400
-+++ OpenEXR-1.2.2/OpenEXR.pc.in	2005-08-13 10:33:30.000000000 -0400
-@@ -7,5 +7,5 @@
+--- OpenEXR-1.2.2/OpenEXR.pc.in.zlib    2005-03-09 13:37:46.000000000 -0600
++++ OpenEXR-1.2.2/OpenEXR.pc.in 2006-10-17 07:07:17.000000000 -0500
+@@ -7,5 +7,6 @@
  Name: OpenEXR
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
 +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
++Libs.private: -lz
  Cflags: -I${OpenEXR_includedir}
 --- OpenEXR-1.2.2/Half/Makefile.am.165729	2004-02-05 23:22:01.000000000 -0600
 +++ OpenEXR-1.2.2/Half/Makefile.am	2006-02-09 22:42:18.000000000 -0600


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-5/OpenEXR.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OpenEXR.spec	19 Feb 2006 04:23:12 -0000	1.8
+++ OpenEXR.spec	17 Oct 2006 12:22:37 -0000	1.9
@@ -1,17 +1,21 @@
+
 Name:           OpenEXR
 Version:        1.2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.openexr.com/
-Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz
-Patch:          %{name}-1.2.2-zlib.patch
-Patch1:         %{name}-1.2.2-forwardfriend.patch
+Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fltk-devel >= 1.1 zlib-devel automake libtool autoconf
+Patch0:         OpenEXR-1.2.2-zlib.patch
+Patch1:         OpenEXR-1.2.2-forwardfriend.patch
+
+BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  zlib-devel
+BuildRequires:  automake libtool
 
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -21,52 +25,75 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 %description    devel
 This package contains headers and libraries required to build applications that
 use the OpenEXR format.
 
+
 %prep
 %setup -q
-%patch -p1 -b .zlib
+
+%patch0 -p1 -b .zlib
 %patch1 -p1 -b .forwardfriend
 ./bootstrap
 
+
 %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 \{\} \;
-install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-cp -a IlmImfExamples $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples/.deps
+
+# unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
+
+
+%check
+# Not enabled, by default, takes a *very* long time. -- Rex
+%{?_with_check:make check}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples
+%doc rpmdocs/examples 
 %{_datadir}/aclocal/*
-%{_includedir}/OpenEXR
-%{_libdir}/*.so
+%{_includedir}/OpenEXR/
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
+* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
+- own %%_docdir/OpenEXR-devel-%%version (#210997)
+- devel: Requires: pkgconfig
+- update zlib patch (use Libs.private)
+
 * Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-7
 - Further zlib fixes (#165729)
 



From fedora-extras-commits at redhat.com  Tue Oct 17 12:31:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 17 Oct 2006 05:31:22 -0700
Subject: rpms/OpenEXR/FC-4 OpenEXR-1.2.2-zlib.patch, 1.2, 1.3 OpenEXR.spec,
	1.7, 1.8
Message-ID: <200610171231.k9HCVMrO021683@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21662

Modified Files:
	OpenEXR-1.2.2-zlib.patch OpenEXR.spec 
Log Message:
* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
- own %_docdir/OpenEXR-devel-%version (#210997)
- devel: Requires: pkgconfig
- update zlib patch (use Libs.private)


OpenEXR-1.2.2-zlib.patch:

Index: OpenEXR-1.2.2-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR-1.2.2-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenEXR-1.2.2-zlib.patch	19 Feb 2006 04:23:06 -0000	1.2
+++ OpenEXR-1.2.2-zlib.patch	17 Oct 2006 12:30:52 -0000	1.3
@@ -1,11 +1,12 @@
---- OpenEXR-1.2.2/OpenEXR.pc.in.zlib	2005-08-13 10:33:18.000000000 -0400
-+++ OpenEXR-1.2.2/OpenEXR.pc.in	2005-08-13 10:33:30.000000000 -0400
-@@ -7,5 +7,5 @@
+--- OpenEXR-1.2.2/OpenEXR.pc.in.zlib    2005-03-09 13:37:46.000000000 -0600
++++ OpenEXR-1.2.2/OpenEXR.pc.in 2006-10-17 07:07:17.000000000 -0500
+@@ -7,5 +7,6 @@
  Name: OpenEXR
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
 +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
++Libs.private: -lz
  Cflags: -I${OpenEXR_includedir}
 --- OpenEXR-1.2.2/Half/Makefile.am.165729	2004-02-05 23:22:01.000000000 -0600
 +++ OpenEXR-1.2.2/Half/Makefile.am	2006-02-09 22:42:18.000000000 -0600


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OpenEXR.spec	19 Feb 2006 04:23:06 -0000	1.7
+++ OpenEXR.spec	17 Oct 2006 12:30:52 -0000	1.8
@@ -1,17 +1,21 @@
+
 Name:           OpenEXR
 Version:        1.2.2
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.openexr.com/
-Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz
-Patch:          %{name}-1.2.2-zlib.patch
-Patch1:         %{name}-1.2.2-forwardfriend.patch
+Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fltk-devel >= 1.1 zlib-devel automake libtool autoconf
+Patch0:         OpenEXR-1.2.2-zlib.patch
+Patch1:         OpenEXR-1.2.2-forwardfriend.patch
+
+BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  zlib-devel
+BuildRequires:  automake libtool
 
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -21,55 +25,81 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 %description    devel
 This package contains headers and libraries required to build applications that
 use the OpenEXR format.
 
+
 %prep
 %setup -q
-%patch -p1 -b .zlib
+
+%patch0 -p1 -b .zlib
 %patch1 -p1 -b .forwardfriend
 ./bootstrap
 
+
 %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 \{\} \;
-install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-cp -a IlmImfExamples $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples/.deps
+
+# unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
+
+
+%check
+# Not enabled, by default, takes a *very* long time. -- Rex
+%{?_with_check:make check}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples
+%doc rpmdocs/examples 
 %{_datadir}/aclocal/*
-%{_includedir}/OpenEXR
-%{_libdir}/*.so
+%{_includedir}/OpenEXR/
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
-* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
+- own %%_docdir/OpenEXR-devel-%%version (#210997)
+- devel: Requires: pkgconfig
+- update zlib patch (use Libs.private)
+
+* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-7
 - Further zlib fixes (#165729)
 
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+- Rebuild for Fedora Extras 5
+
 * Wed Aug 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-5
 - Remove *.a from %%files devel
 



From fedora-extras-commits at redhat.com  Tue Oct 17 12:35:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 17 Oct 2006 05:35:52 -0700
Subject: rpms/OpenEXR/FC-3 OpenEXR-1.2.2-zlib.patch, 1.2, 1.3 OpenEXR.spec,
	1.9, 1.10
Message-ID: <200610171235.k9HCZqYe021752@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21728

Modified Files:
	OpenEXR-1.2.2-zlib.patch OpenEXR.spec 
Log Message:
* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
- own %_docdir/OpenEXR-devel-%version (#210997)
- devel: Requires: pkgconfig
- update zlib patch (use Libs.private)


OpenEXR-1.2.2-zlib.patch:

Index: OpenEXR-1.2.2-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR-1.2.2-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenEXR-1.2.2-zlib.patch	19 Feb 2006 04:23:00 -0000	1.2
+++ OpenEXR-1.2.2-zlib.patch	17 Oct 2006 12:35:22 -0000	1.3
@@ -1,11 +1,12 @@
---- OpenEXR-1.2.2/OpenEXR.pc.in.zlib	2005-08-13 10:33:18.000000000 -0400
-+++ OpenEXR-1.2.2/OpenEXR.pc.in	2005-08-13 10:33:30.000000000 -0400
-@@ -7,5 +7,5 @@
+--- OpenEXR-1.2.2/OpenEXR.pc.in.zlib    2005-03-09 13:37:46.000000000 -0600
++++ OpenEXR-1.2.2/OpenEXR.pc.in 2006-10-17 07:07:17.000000000 -0500
+@@ -7,5 +7,6 @@
  Name: OpenEXR
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
 +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
++Libs.private: -lz
  Cflags: -I${OpenEXR_includedir}
 --- OpenEXR-1.2.2/Half/Makefile.am.165729	2004-02-05 23:22:01.000000000 -0600
 +++ OpenEXR-1.2.2/Half/Makefile.am	2006-02-09 22:42:18.000000000 -0600


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OpenEXR.spec	19 Feb 2006 04:23:00 -0000	1.9
+++ OpenEXR.spec	17 Oct 2006 12:35:22 -0000	1.10
@@ -1,16 +1,21 @@
+
 Name:           OpenEXR
 Version:        1.2.2
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.openexr.com/
-Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz
-Patch:          %{name}-1.2.2-zlib.patch
+Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fltk-devel >= 1.1 zlib-devel automake libtool autoconf
+Patch0:         OpenEXR-1.2.2-zlib.patch
+Patch1:         OpenEXR-1.2.2-forwardfriend.patch
+
+BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  zlib-devel
+BuildRequires:  automake libtool
 
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -20,60 +25,88 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 %description    devel
 This package contains headers and libraries required to build applications that
 use the OpenEXR format.
 
+
 %prep
 %setup -q
-%patch -p1 -b .zlib
+
+%patch0 -p1 -b .zlib
+%patch1 -p1 -b .forwardfriend
 ./bootstrap
 
+
 %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 \{\} \;
-install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-cp -a IlmImfExamples $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples/.deps
+
+# unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
+
+
+%check
+# Not enabled, by default, takes a *very* long time. -- Rex
+%{?_with_check:make check}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples
+%doc rpmdocs/examples 
 %{_datadir}/aclocal/*
-%{_includedir}/OpenEXR
-%{_libdir}/*.so
+%{_includedir}/OpenEXR/
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
-* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
+- own %%_docdir/OpenEXR-devel-%%version (#210997)
+- devel: Requires: pkgconfig
+- update zlib patch (use Libs.private)
+
+* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-7
 - Further zlib fixes (#165729)
 
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+- Rebuild for Fedora Extras 5
+
 * Wed Aug 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-5
 - Remove *.a from %%files devel
 
 * Tue Aug 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-4
 - Removed -devel dep on zlib-devel (#165729)
 - Added --disable-static to %%configure
+- Fixed build with GCC 4.0.1
 - Added .so links to -devel
 
 * Wed May 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-3



From fedora-extras-commits at redhat.com  Tue Oct 17 12:39:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 17 Oct 2006 05:39:18 -0700
Subject: rpms/tetex-unicode/devel tetex-unicode.spec,1.9,1.10
Message-ID: <200610171239.k9HCdIju021835@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/tetex-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21802/devel

Modified Files:
	tetex-unicode.spec 
Log Message:
use the same scriptlets as tetex


Index: tetex-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-unicode/devel/tetex-unicode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tetex-unicode.spec	31 Aug 2006 15:57:13 -0000	1.9
+++ tetex-unicode.spec	17 Oct 2006 12:38:47 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           tetex-unicode
 Version:        0
-Release:        6.20041017%{?dist}
+Release:        7.20041017%{?dist}
 
 Summary:        Unicode support for LaTeX
 
@@ -45,10 +45,10 @@
 
 
 %post
-texhash %{_datadir}/texmf >/dev/null 2>&1
+[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash >/dev/null 2>&1 || :
 
 %postun
-texhash %{_datadir}/texmf >/dev/null 2>&1
+[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash >/dev/null 2>&1 || :
 
 
 %files
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Aurelien Bompard <abompard at fedoraproject.org> 0-7.20041017
+- use the same scriptlets as the main tetex package
+
 * Thu Aug 31 2006 Aurelien Bompard <abompard at fedoraproject.org> 0-6.20041017
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct 17 12:39:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 17 Oct 2006 05:39:17 -0700
Subject: rpms/tetex-unicode/FC-5 tetex-unicode.spec,1.8,1.9
Message-ID: <200610171239.k9HCdHSj021832@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/tetex-unicode/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21802/FC-5

Modified Files:
	tetex-unicode.spec 
Log Message:
use the same scriptlets as tetex


Index: tetex-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-unicode/FC-5/tetex-unicode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tetex-unicode.spec	22 Feb 2006 16:14:35 -0000	1.8
+++ tetex-unicode.spec	17 Oct 2006 12:38:47 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           tetex-unicode
 Version:        0
-Release:        5.20041017%{?dist}
+Release:        7.20041017%{?dist}
 
 Summary:        Unicode support for LaTeX
 
@@ -45,10 +45,10 @@
 
 
 %post
-texhash %{_datadir}/texmf >/dev/null 2>&1
+[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash >/dev/null 2>&1 || :
 
 %postun
-texhash %{_datadir}/texmf >/dev/null 2>&1
+[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash >/dev/null 2>&1 || :
 
 
 %files
@@ -58,6 +58,12 @@
 
 
 %changelog
+* Tue Oct 17 2006 Aurelien Bompard <abompard at fedoraproject.org> 0-7.20041017
+- use the same scriptlets as the main tetex package
+
+* Thu Aug 31 2006 Aurelien Bompard <abompard at fedoraproject.org> 0-6.20041017
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0-5.20041017
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Oct 17 12:43:44 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 05:43:44 -0700
Subject: rpms/openpbx/devel openpbx.spec,1.1,1.2
Message-ID: <200610171243.k9HChiIv021946@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21923

Modified Files:
	openpbx.spec 
Log Message:
HAndle new mISDN package nicely


Index: openpbx.spec
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/openpbx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openpbx.spec	17 Oct 2006 06:43:10 -0000	1.1
+++ openpbx.spec	17 Oct 2006 12:43:14 -0000	1.2
@@ -24,7 +24,7 @@
 BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
 BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
 BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel
-BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN}
+BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN-devel}
 BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel}
 
 Requires:	/sbin/chkconfig
@@ -219,6 +219,9 @@
 %pre zaptel
 %{_sbindir}/usermod -G `id -G openpbx | tr " " , `,zaptel openpbx
 
+%pre misdn
+%{_sbindir}/usermod -G `id -G openpbx | tr " " , `,misdn openpbx
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING CREDITS LICENSE BUGS AUTHORS SECURITY README HARDWARE



From fedora-extras-commits at redhat.com  Tue Oct 17 12:44:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 17 Oct 2006 05:44:25 -0700
Subject: rpms/OpenEXR/FC-3 OpenEXR-1.2.2-forwardfriend.patch, NONE,
	1.1 OpenEXR.spec, 1.10, 1.11
Message-ID: <200610171244.k9HCiPdD021974@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21952

Modified Files:
	OpenEXR.spec 
Added Files:
	OpenEXR-1.2.2-forwardfriend.patch 
Log Message:
missed patch, respin


OpenEXR-1.2.2-forwardfriend.patch:

--- NEW FILE OpenEXR-1.2.2-forwardfriend.patch ---
--- OpenEXR-1.2.2/exrmaketiled/Image.h.gcc401	2005-08-14 15:36:02.000000000 -0400
+++ OpenEXR-1.2.2/exrmaketiled/Image.h	2005-08-14 15:36:14.000000000 -0400
@@ -49,6 +49,7 @@
 #include <string>
 #include <map>
 
+class Image;
 
 class ImageChannel
 {


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OpenEXR.spec	17 Oct 2006 12:35:22 -0000	1.10
+++ OpenEXR.spec	17 Oct 2006 12:43:55 -0000	1.11
@@ -1,7 +1,7 @@
 
 Name:           OpenEXR
 Version:        1.2.2
-Release:        8%{?dist}
+Release:        8%{?dist}.1
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries



From fedora-extras-commits at redhat.com  Tue Oct 17 13:47:16 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:47:16 -0700
Subject: rpms/mISDN - New directory
Message-ID: <200610171347.k9HDlGZ0025139@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25135/mISDN

Log Message:
Directory /cvs/extras/rpms/mISDN added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 13:47:22 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:47:22 -0700
Subject: rpms/mISDN/devel - New directory
Message-ID: <200610171347.k9HDlMQM025153@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25135/mISDN/devel

Log Message:
Directory /cvs/extras/rpms/mISDN/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 13:47:28 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:47:28 -0700
Subject: rpms/mISDN Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610171347.k9HDlS32025180@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25173

Added Files:
	Makefile import.log 
Log Message:
Setup of module mISDN


--- NEW FILE Makefile ---
# Top level Makefile for module mISDN
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 13:47:33 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:47:33 -0700
Subject: rpms/mISDN/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610171347.k9HDlXYd025199@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25173/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mISDN


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 13:48:36 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:48:36 -0700
Subject: rpms/mISDN import.log,1.1,1.2
Message-ID: <200610171348.k9HDmaVx025283@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25241

Modified Files:
	import.log 
Log Message:
auto-import mISDN-0-1.cvs20061010.fc6 on branch devel from mISDN-0-1.cvs20061010.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mISDN/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 13:47:28 -0000	1.1
+++ import.log	17 Oct 2006 13:48:05 -0000	1.2
@@ -0,0 +1 @@
+mISDN-0-1_cvs20061010_fc6:HEAD:mISDN-0-1.cvs20061010.fc6.src.rpm:1161092882



From fedora-extras-commits at redhat.com  Tue Oct 17 13:48:36 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue, 17 Oct 2006 06:48:36 -0700
Subject: rpms/mISDN/devel mISDN-libdir.patch, NONE, 1.1 mISDN-soname.patch, 
	NONE, 1.1 mISDN.rules, NONE, 1.1 mISDN.spec, NONE, 1.1 mISDNif.h,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610171348.k9HDma3d025287@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/mISDN/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25241/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mISDN-libdir.patch mISDN-soname.patch mISDN.rules mISDN.spec 
	mISDNif.h 
Log Message:
auto-import mISDN-0-1.cvs20061010.fc6 on branch devel from mISDN-0-1.cvs20061010.fc6.src.rpm

mISDN-libdir.patch:

--- NEW FILE mISDN-libdir.patch ---
? debugfiles.list
? debugsources.list
? example/misdnportinfo
? example/testlayer1
? include/linux
? tenovis/testlib
? tenovis/tstlib
Index: Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile	15 Aug 2006 18:57:31 -0000	1.6
+++ Makefile	17 Oct 2006 09:29:48 -0000
@@ -21,6 +21,9 @@ export mISDN_DIR
 INCLUDEDIR := $(mISDN_DIR)/include
 export INCLUDEDIR
 
+LIBDIR=/usr/lib
+export LIBDIR
+
 CFLAGS:= -g -Wall -O2 -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
 CFLAGS+= -D CLOSE_REPORT=1
 ifeq ($(shell uname -m),x86_64)
@@ -49,7 +52,7 @@ all: test_misdn_includes
 install_path:
 	mkdir -p $(INSTALL_PREFIX)/usr/bin/
 	mkdir -p $(INSTALL_PREFIX)/usr/include/mISDNuser/
-	mkdir -p $(INSTALL_PREFIX)/usr/lib/
+	mkdir -p $(INSTALL_PREFIX)/$(LIBDIR)
 
 
 install: install_path all
Index: i4lnet/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/i4lnet/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- i4lnet/Makefile	16 Aug 2006 21:37:11 -0000	1.2
+++ i4lnet/Makefile	17 Oct 2006 09:29:48 -0000
@@ -1,8 +1,8 @@
 all: libisdnnet.a libisdnnet.so
 
 install:
-	install -m 644 libisdnnet.so $(INSTALL_PREFIX)/usr/lib
-	install -m 644 libisdnnet.a $(INSTALL_PREFIX)/usr/lib
+	install -m 644 libisdnnet.so $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 644 libisdnnet.a $(INSTALL_PREFIX)/$(LIBDIR)
 	cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
 ISDNNETOBJ = net_if.o isdn_debug.o isdn_msg.o fsm.o net_l2.o tei.o net_l3.o \
Index: lib/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/lib/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- lib/Makefile	16 Aug 2006 21:37:12 -0000	1.4
+++ lib/Makefile	17 Oct 2006 09:29:48 -0000
@@ -2,8 +2,8 @@
 all: libmISDN.a libmISDN.so
 
 install:
-	install -m 644 libmISDN.so $(INSTALL_PREFIX)/usr/lib
-	install -m 644 libmISDN.a $(INSTALL_PREFIX)/usr/lib
+	install -m 644 libmISDN.so $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 644 libmISDN.a $(INSTALL_PREFIX)/$(LIBDIR)
 
 LIBMISDN_OBJS = device.o layer.o stack.o status.o
 
Index: suppserv/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/suppserv/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- suppserv/Makefile	16 Aug 2006 21:37:12 -0000	1.2
+++ suppserv/Makefile	17 Oct 2006 09:29:48 -0000
@@ -8,8 +8,8 @@ all: libsuppserv.a libsuppserv.so
 main: $(SUPPSERVOBJ)
 
 install:
-	install -m 644 libsuppserv.so $(INSTALL_PREFIX)/usr/lib
-	install -m 644 libsuppserv.a $(INSTALL_PREFIX)/usr/lib
+	install -m 644 libsuppserv.so $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 644 libsuppserv.a $(INSTALL_PREFIX)/$(LIBDIR)
 	cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
 libsuppserv.so: $(SUPPSERVOBJ)

mISDN-soname.patch:

--- NEW FILE mISDN-soname.patch ---
Index: i4lnet/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/i4lnet/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- i4lnet/Makefile	16 Aug 2006 21:37:11 -0000	1.2
+++ i4lnet/Makefile	17 Oct 2006 09:37:22 -0000
@@ -1,16 +1,21 @@
+SOMAJOR=0
+SOMINOR=0.0
+SOVERSION=$(SOMAJOR).$(SOMINOR)
 
-all: libisdnnet.a libisdnnet.so
+all: libisdnnet.a libisdnnet.so.$(SOVERSION)
 
 install:
-	install -m 644 libisdnnet.so $(INSTALL_PREFIX)/$(LIBDIR)
-	install -m 644 libisdnnet.a $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 755 libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
+	ln -sf libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libisdnnet.so.$(SOMAJOR)
+	ln -sf libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libisdnnet.so
+	install -m 644 libisdnnet.a $(INSTALL_PREFIX)/$(LIBDIR)
 	cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
 ISDNNETOBJ = net_if.o isdn_debug.o isdn_msg.o fsm.o net_l2.o tei.o net_l3.o \
 		manager.o tone.o bchannel.o g711.o
 
-libisdnnet.so: $(ISDNNETOBJ)
-	$(CC) -shared -Xlinker -x -o $@ $^
+libisdnnet.so.$(SOVERSION): $(ISDNNETOBJ)
+	$(CC) -shared -Xlinker -x -Wl,-soname,libisdnnet.so.$(SOMAJOR) -o $@ $^
 
 libisdnnet.a: $(ISDNNETOBJ)
 	ar cr $@ $^
Index: lib/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/lib/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- lib/Makefile	16 Aug 2006 21:37:12 -0000	1.4
+++ lib/Makefile	17 Oct 2006 09:37:22 -0000
@@ -1,14 +1,19 @@
+SOMAJOR=0
+SOMINOR=0.0
+SOVERSION=$(SOMAJOR).$(SOMINOR)
 
-all: libmISDN.a libmISDN.so
+all: libmISDN.a libmISDN.so.$(SOVERSION)
 
 install:
-	install -m 644 libmISDN.so $(INSTALL_PREFIX)/$(LIBDIR)
-	install -m 644 libmISDN.a $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 755 libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
+	ln -sf libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libmISDN.so.$(SOMAJOR)
+	ln -sf libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libmISDN.so
+	install -m 644 libmISDN.a $(INSTALL_PREFIX)/$(LIBDIR)
 
 LIBMISDN_OBJS = device.o layer.o stack.o status.o
 
-libmISDN.so: $(LIBMISDN_OBJS)
-	$(CC) -shared -Xlinker -x -o $@ $^
+libmISDN.so.$(SOVERSION): $(LIBMISDN_OBJS)
+	$(CC) -shared -Xlinker -x -Wl,-soname,libmISDN.so.$(SOMAJOR) -o $@ $^
 
 libmISDN.a: $(LIBMISDN_OBJS)
 	ar cr $@ $^
Index: suppserv/Makefile
===================================================================
RCS file: /i4ldev/mISDNuser/suppserv/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- suppserv/Makefile	16 Aug 2006 21:37:12 -0000	1.2
+++ suppserv/Makefile	17 Oct 2006 09:37:22 -0000
@@ -1,19 +1,24 @@
+SOMAJOR=0
+SOMINOR=0.0
+SOVERSION=$(SOMAJOR).$(SOMINOR)
 
 #CFLAGS += -DASN1_DEBUG
 
 SUPPSERVOBJ = asn1.o asn1_enc.o asn1_generic.o asn1_aoc.o asn1_basic_service.o asn1_comp.o asn1_diversion.o asn1_address.o fac.o
 
-all: libsuppserv.a libsuppserv.so
+all: libsuppserv.a libsuppserv.so.$(SOVERSION)
 
 main: $(SUPPSERVOBJ)
 
 install:
-	install -m 644 libsuppserv.so $(INSTALL_PREFIX)/$(LIBDIR)
-	install -m 644 libsuppserv.a $(INSTALL_PREFIX)/$(LIBDIR)
+	install -m 755 libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
+	ln -sf libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libsuppserv.so.$(SOMAJOR)
+	ln -sf libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libsuppserv.so
+	install -m 644 libsuppserv.a $(INSTALL_PREFIX)/$(LIBDIR)
 	cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
-libsuppserv.so: $(SUPPSERVOBJ)
-	$(CC) -shared -Xlinker -x -o $@ $^
+libsuppserv.so.$(SOVERSION): $(SUPPSERVOBJ)
+	$(CC) -shared -Xlinker -x -Wl,-soname,libsuppserv.so.$(SOMAJOR) -o $@ $^
 
 libsuppserv.a: $(SUPPSERVOBJ)
 	ar cr $@ $^


--- NEW FILE mISDN.rules ---
SUBSYSTEM=="mISDN-objects", KERNEL=="obj-0", NAME="mISDN", OWNER="misdn", GROUP="misdn", MODE="0660"


--- NEW FILE mISDN.spec ---
%define snap 20061010

# Don't build the debugging utils by default.
%bcond_with utils

Name:		mISDN
Version:	0
Release:	1.cvs%{snap}%{?dist}
Summary:	Userspace part of Modular ISDN stack

Group:		System Environment/Libraries
License:	LGPL
URL:		http://www.isdn4linux.de/mISDN/
# export CVSROOT=:pserver:anonymous:readonly at cvs.isdn4linux.de:/i4ldev
# cvs co -D%{snap} mISDNuser
Source0:	mISDNuser-20061010.tar.gz
# cvs co -D%{snap}  mISDN/include/linux/mISDNif.h
Source1:	mISDNif.h
Source2:	mISDN.rules
Patch0:		mISDN-libdir.patch
Patch1:		mISDN-soname.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(pre): fedora-usermgmt
Requires(postun): fedora-usermgmt

Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%package devel
Summary:	Development files Modular ISDN stack
Group:		System Environment/Libraries
Requires:	mISDN = %{version}-%{release}

%package utils
Summary:	Debugging utilities for Modular ISDN stack
Group:		Applications/System

%description
mISDN (modular ISDN) is intended to be the new ISDN stack for the
Linux 2.6 kernel, from the maintainer of the existing isdn4linux
code. This package contains the userspace libraries required to
interface directly to mISDN.

%description devel
mISDN (modular ISDN) is intended to be the new ISDN stack for the
Linux 2.6 kernel, from the maintainer of the existing isdn4linux
code. This package contains the development files for userspace
libraries required to interface to mISDN, needed for compiling
applications which use mISDN directly such as OpenPBX.

%description utils
mISDN (modular ISDN) is intended to be the new ISDN stack for the
Linux 2.6 kernel, from the maintainer of the existing isdn4linux
code. This package contains test utilities for mISDN.

%prep
%setup -q -n mISDNuser
%patch0 -p0
%patch1 -p0
mkdir include/linux
cp %SOURCE1 include/linux
rm -rf voip

%build
make %{?_smp_mflags} CFLAGS="-I`pwd`/include $RPM_OPT_FLAGS -fPIC" MISDNDIR=`pwd`


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL_PREFIX=$RPM_BUILD_ROOT MISDNDIR=`pwd` LIBDIR=%_libdir
mkdir $RPM_BUILD_ROOT/%{_includedir}/mISDNuser/linux
install -m0644 %SOURCE1 $RPM_BUILD_ROOT/%{_includedir}/mISDNuser/linux/mISDNif.h
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d
install -m0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/mISDN.rules

%clean
rm -rf $RPM_BUILD_ROOT

%post 
/sbin/ldconfig
/usr/sbin/fedora-groupadd 31 -r misdn &>/dev/null || :
/usr/sbin/fedora-useradd  31 -r -s /sbin/nologin -d / -M \
		-c 'Modular ISDN' -g misdn misdn &>/dev/null || :

%postun
/sbin/ldconfig
test "$1" != 0 || /usr/sbin/fedora-userdel  misdn &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel misdn &>/dev/null || :

%files 
%defattr(-,root,root,-)
%_libdir/*.so.*
%doc COPYING.LIB LICENSE
%config(noreplace) %{_sysconfdir}/udev/rules.d/mISDN.rules
%exclude %_bindir/*

%files devel
%defattr(-,root,root,-)
%_includedir/mISDNuser
%_libdir/*.so
%exclude %_libdir/*.a

%if 0%{?with_utils}
%files utils
%defattr(-,root,root,-)
%_bindir/*
%endif

%changelog
* Tue Oct 17 2006 David Woodhouse <dwmw2 at infradead.org> 0-1.cvs20061010
- Initial import


--- NEW FILE mISDNif.h ---
/* $Id: mISDNif.h,v 1.41 2006/10/09 12:51:33 crich Exp $
 *
 */

#ifndef mISDNIF_H
#define mISDNIF_H

#include <stdarg.h>
#include <linux/types.h>
#include <linux/errno.h>

/*
 * ABI Version 32 bit
 *
 * <16 bit> Major version
 *		- changed if any interface become backwards incompatible
 *
 * <16 bit> Minor version
 *              - changed if any interface is extended but backwards compatible
 *
 */
#define	MISDN_MAJOR_VERSION	5
#define	MISDN_MINOR_VERSION	0
#define	MISDN_VERSION		((MISDN_MAJOR_VERSION<<16) | MISDN_MINOR_VERSION)

#define MISDN_REVISION		"$Revision: 1.41 $"
#define MISDN_DATE		"$Date: 2006/10/09 12:51:33 $"

/* collect some statistics about the message queues */
//#define MISDN_MSG_STATS

/* primitives for information exchange
 * generell format
 * <8 bit reserved>
 * <4 bit flags>
 * <4 bit layer>
 * <8 bit command>
 * <8 bit subcommand>
 *
 */

#define MISDN_CMD_MASK	0xffffff00
#define MISDN_SUB_MASK	0x000000ff

/* SUBCOMMANDS */
#define REQUEST		0x80
#define CONFIRM		0x81
#define INDICATION	0x82
#define RESPONSE	0x83
#define SUB_ERROR	0xff

/* management */
#define MGR_FUNCTION	0x0f0000
#define MGR_GETOBJECT	0x0f0100
#define MGR_NEWOBJECT	0x0f0200
#define MGR_DELOBJECT	0x0f0300
#define MGR_NEWENTITY	0x0f0600
#define MGR_DELENTITY	0x0f0700
#define MGR_GETSTACK	0x0f1100
#define MGR_NEWSTACK	0x0f1200
#define MGR_DELSTACK	0x0f1300
#define MGR_SETSTACK	0x0f1400
#define MGR_CLEARSTACK	0x0f1500
#define MGR_REGLAYER	0x0f1600
#define MGR_UNREGLAYER	0x0f1700
#define MGR_SELCHANNEL	0x0f1800
#define MGR_SETSTACK_NW	0x0f1900
#define MGR_ADDSTPARA	0x0f1A00
#define MGR_CLRSTPARA	0x0f1B00
#define MGR_ADDLAYER	0x0f1C00
#define MGR_GETLAYER	0x0f2100
#define MGR_GETLAYERID	0x0f2200
#define MGR_NEWLAYER	0x0f2300
#define MGR_DELLAYER	0x0f2400
//#define MGR_CLONELAYER	0x0f2500
//#define MGR_GETIF	0x0f3100
//#define MGR_CONNECT	0x0f3200
//#define MGR_DISCONNECT	0x0f3300
//#define MGR_SETIF	0x0f3400
//#define MGR_ADDIF	0x0f3500
//#define MGR_QUEUEIF	0x0f3600
#define MGR_CTRLREADY	0x0f4100
#define MGR_STACKREADY	0x0f4200
#define MGR_STOPSTACK	0x0f4300
#define MGR_STARTSTACK	0x0f4400
#define MGR_RELEASE	0x0f4500
#define MGR_GETDEVICE	0x0f5100
#define MGR_DELDEVICE	0x0f5200
#define MGR_SETDEVOPT	0x0f5300
#define MGR_GETDEVOPT	0x0f5400
#define MGR_INITTIMER	0x0f8100
#define MGR_ADDTIMER	0x0f8200
#define MGR_DELTIMER	0x0f8300
#define MGR_REMOVETIMER	0x0f8400
#define MGR_TIMER	0x0f8800
#define MGR_CONTROL	0x0fe100
#define MGR_STATUS	0x0fe200
#define MGR_HASPROTOCOL	0x0fe300
#define MGR_EVALSTACK	0x0fe400
#define MGR_GLOBALOPT	0x0fe500
#define MGR_SHORTSTATUS	0x0fe600
#define MGR_LOADFIRM	0x0ff000
#define MGR_LOGDATA	0x0ff100
#define MGR_DEBUGDATA	0x0ff200
#define MGR_VERSION	0x0fff00

/* layer 1 <-> hardware */
#define PH_SIGNAL	0x000100
#define PH_CONTROL	0x000200
#define PH_STATUS	0x000300

/* PH_SIGNAL parameter */
#define INFO0		0x1000
#define INFO1		0x1100
#define INFO2		0x1200
#define INFO3_P8	0x1308
#define INFO3_P10	0x130a
#define INFO4_P8	0x1408
#define INFO4_P10	0x140a
#define D_RX_MON0	0x1800
#define D_TX_MON0	0x1801
#define D_RX_MON1	0x1810
#define D_TX_MON1	0x1811
#define LOSTFRAMING	0x1f00
#define ANYSIGNAL	0x1f01

/* PH_CONTROL parameter */
#define HW_RESET	0x0001
#define HW_POWERDOWN	0x0100
#define HW_POWERUP	0x0101
#define HW_DEACTIVATE	0x0200
#define HW_ACTIVATE	0x0201
#define HW_MOD_FRM	0x0400
#define HW_MOD_FRH	0x0401
#define HW_MOD_FTM	0x0402
#define HW_MOD_FTH	0x0403
#define HW_MOD_FTS	0x0404
#define HW_MOD_CONNECT	0x0410
#define HW_MOD_OK	0x0411
#define HW_MOD_NOCARR	0x0412
#define HW_MOD_FCERROR	0x0413
#define HW_MOD_READY	0x0414
#define HW_MOD_LASTDATA	0x0415
#define HW_MOD_SILENCE	0x0416
#define HW_FEATURES	0x04ff
#define HW_HFC_COEFF	0x0500
#define HW_LOS		0x0501
#define HW_LOS_OFF	0x0502
#define HW_AIS		0x0503
#define HW_AIS_OFF	0x0504
#define HW_SLIP_TX	0x0505
#define HW_SLIP_RX	0x0506
#define HW_PCM_CONN	0x0580
#define HW_PCM_DISC	0x0581
#define HW_CONF_JOIN	0x0582
#define HW_CONF_SPLIT	0x0583
#define HW_RECEIVE_OFF	0x0584
#define HW_RECEIVE_ON	0x0585
#define HW_SPL_LOOP_ON	0x0586
#define HW_SPL_LOOP_OFF	0x0587
#define HW_ECHOCAN_ON 	0x0588
#define HW_ECHOCAN_OFF 	0x0589
#define HW_TESTLOOP	0xFF00
#define HW_FIRM_START	0xFF10
#define HW_FIRM_DATA	0xFF11
#define HW_FIRM_END	0xFF12
#define HW_D_BLOCKED	0xFF20
#define HW_D_NOBLOCKED	0xFF21
#define HW_TESTRX_RAW	0xFF40
#define HW_TESTRX_HDLC	0xFF41
#define HW_TESTRX_OFF	0xFF4f
/* TOUCH TONE IS 0x20XX  XX "0"..."9", "A","B","C","D","*","#" */
#define DTMF_TONE_VAL	0x2000
#define DTMF_TONE_MASK	0x007F
#define DTMF_TONE_START	0x2100
#define DTMF_TONE_STOP	0x2200
#define CMX_CONF_JOIN	0x2300
#define CMX_CONF_SPLIT	0x2301
#define CMX_ECHO_ON	0x2302
#define CMX_ECHO_OFF	0x2303
#define CMX_RECEIVE_OFF	0x2304
#define CMX_RECEIVE_ON	0x2305
#define CMX_MIX_ON	0x2306
#define CMX_MIX_OFF	0x2307
#define TONE_PATT_ON	0x2310
#define TONE_PATT_OFF	0x2311
#define VOL_CHANGE_TX	0x2312
#define VOL_CHANGE_RX	0x2313
#define BF_ENABLE_KEY	0x2314
#define BF_DISABLE	0x2315
#define BF_ACCEPT	0x2316
#define BF_REJECT	0x2317
#define ECHOCAN_ON	0x2318
#define ECHOCAN_OFF	0x2319
#define HW_POTS_ON		0x1001
#define HW_POTS_OFF		0x1002
#define HW_POTS_SETMICVOL	0x1100
#define HW_POTS_SETSPKVOL	0x1101
#define HW_POTS_GETMICVOL	0x1110
#define HW_POTS_GETSPKVOL	0x1111

/* TONE_PATT_ON parameter */
#define TONE_OFF			0x0000
#define TONE_GERMAN_DIALTONE		0x0001
#define TONE_GERMAN_OLDDIALTONE		0x0002
#define TONE_AMERICAN_DIALTONE		0x0003
#define TONE_GERMAN_DIALPBX		0x0004
#define TONE_GERMAN_OLDDIALPBX		0x0005
#define TONE_AMERICAN_DIALPBX		0x0006
#define TONE_GERMAN_RINGING		0x0007
#define TONE_GERMAN_OLDRINGING		0x0008
#define TONE_AMERICAN_RINGPBX		0x000b
#define TONE_GERMAN_RINGPBX		0x000c
#define TONE_GERMAN_OLDRINGPBX		0x000d
#define TONE_AMERICAN_RINGING		0x000e
#define TONE_GERMAN_BUSY		0x000f
#define TONE_GERMAN_OLDBUSY		0x0010
#define TONE_AMERICAN_BUSY		0x0011
#define TONE_GERMAN_HANGUP		0x0012
#define TONE_GERMAN_OLDHANGUP		0x0013
#define TONE_AMERICAN_HANGUP		0x0014
#define TONE_SPECIAL_INFO		0x0015
#define TONE_GERMAN_GASSENBESETZT	0x0016
#define TONE_GERMAN_AUFSCHALTTON	0x0016

#define GLOBALOPT_INTERNAL_CTRL		0x0001
#define GLOBALOPT_EXTERNAL_EQUIPMENT	0x0002
#define GLOBALOPT_HANDSET		0x0004
#define GLOBALOPT_DTMF			0x0008
#define GLOBALOPT_SUPPLEMENTARY_SERVICE	0x0010
#define GLOBALOPT_CHANNEL_ALLOCATION	0x0020
#define GLOBALOPT_PARAMETER_B_CHANNEL	0x0040
#define GLOBALOPT_LINE_INTERCONNECT	0x0080


/* layer 1 */
#define PH_ACTIVATE	0x010100
#define PH_DEACTIVATE	0x010000
#define PH_DATA		0x110200
#define MPH_DEACTIVATE	0x011000
#define MPH_ACTIVATE	0x011100
#define MPH_INFORMATION	0x012000

/* layer 2 */
#define DL_ESTABLISH	0x020100
#define DL_RELEASE	0x020000
#define DL_DATA		0x120200
#define DL_UNITDATA	0x120300
#define MDL_UNITDATA	0x121200
#define MDL_ASSIGN	0x022100
#define MDL_REMOVE	0x022000
#define MDL_ERROR	0x023000
#define MDL_INFORMATION	0x024000
#define MDL_STATUS	0x028100
#define MDL_FINDTEI	0x028200

/* layer 3 */
#define CC_ALERTING		0x030100
#define CC_PROCEEDING		0x030200
#define CC_PROGRESS		0x030300
#define CC_SETUP		0x030500
#define CC_CONNECT		0x030700
#define CC_SETUP_ACKNOWLEDGE	0x030d00
#define CC_CONNECT_ACKNOWLEDGE	0x030f00
#define CC_USER_INFORMATION	0x032000
#define CC_SUSPEND_REJECT	0x032100
#define CC_RESUME_REJECT	0x032200
#define CC_HOLD			0x032400
#define CC_SUSPEND		0x032500
#define CC_RESUME		0x032600
#define CC_HOLD_ACKNOWLEDGE	0x032800
#define CC_SUSPEND_ACKNOWLEDGE	0x032d00
#define CC_RESUME_ACKNOWLEDGE	0x032e00
#define CC_HOLD_REJECT		0x033000
#define CC_RETRIEVE		0x033100
#define CC_RETRIEVE_ACKNOWLEDGE	0x033300
#define CC_RETRIEVE_REJECT	0x033700
#define CC_DISCONNECT		0x034500
#define CC_RESTART		0x034600
#define CC_RELEASE		0x034d00
#define CC_RELEASE_COMPLETE	0x035a00
#define CC_FACILITY		0x036200
#define CC_NOTIFY		0x036e00
#define CC_STATUS_ENQUIRY	0x037500
#define CC_INFORMATION		0x037b00
#define CC_STATUS		0x037d00

#define CC_NEW_CR		0x03f000
#define CC_RELEASE_CR		0x03f100
#define CC_TIMEOUT		0x03ff00

#define CC_B3_DATA		0x138600

#define CAPI_MESSAGE_REQUEST	0x040080

#define LAYER_MASK	0x0F0000
#define COMMAND_MASK	0x00FF00
#define SUBCOMMAND_MASK	0x0000FF
#define DATA_COMMAND	0x100000
#define CMD_IS_DATA(p)	(p & DATA_COMMAND)

/* short cuts layer 1 */
#define PH_ACTIVATE_REQ		(PH_ACTIVATE | REQUEST)
#define PH_ACTIVATE_IND		(PH_ACTIVATE | INDICATION)
#define PH_DEACTIVATE_IND	(PH_DEACTIVATE | INDICATION)
#define PH_DATA_REQ		(PH_DATA | REQUEST)
#define PH_DATA_IND		(PH_DATA | INDICATION)
#define PH_DATA_CNF		(PH_DATA | CONFIRM)
#define PH_DATA_RSP		(PH_DATA | RESPONSE)
#define MPH_ACTIVATE_REQ	(MPH_ACTIVATE | REQUEST)
#define MPH_DEACTIVATE_REQ	(MPH_DEACTIVATE | REQUEST)
#define MPH_INFORMATION_IND	(MPH_INFORMATION | INDICATION)

/* short cuts layer 2 */
#define DL_ESTABLISH_REQ	(DL_ESTABLISH | REQUEST)
#define DL_ESTABLISH_IND	(DL_ESTABLISH | INDICATION)
#define DL_ESTABLISH_CNF	(DL_ESTABLISH | CONFIRM)
#define DL_RELEASE_REQ		(DL_RELEASE | REQUEST)
#define DL_RELEASE_IND		(DL_RELEASE | INDICATION)
#define DL_RELEASE_CNF		(DL_RELEASE | CONFIRM)
#define DL_DATA_REQ		(DL_DATA | REQUEST)
#define DL_DATA_IND		(DL_DATA | INDICATION)
#define DL_UNITDATA_REQ		(DL_UNITDATA | REQUEST)
#define DL_UNITDATA_IND		(DL_UNITDATA | INDICATION)
#define MDL_ASSIGN_REQ		(MDL_ASSIGN | REQUEST)
#define MDL_ASSIGN_IND		(MDL_ASSIGN | INDICATION)
#define MDL_REMOVE_REQ		(MDL_REMOVE | REQUEST)
#define MDL_ERROR_IND		(MDL_ERROR | INDICATION)
#define MDL_ERROR_RSP		(MDL_ERROR | RESPONSE)
#define MDL_INFORMATION_IND	(MDL_INFORMATION | INDICATION)

/* protocol id */
#define ISDN_PID_NONE			0
#define ISDN_PID_ANY			0xffffffff
#define ISDN_PID_L0_TE_S0		0x00000001
#define ISDN_PID_L0_NT_S0		0x00000100
#define ISDN_PID_L0_TE_U		0x00000002
#define ISDN_PID_L0_NT_U		0x00000200
#define ISDN_PID_L0_TE_UP2		0x00000004
#define ISDN_PID_L0_NT_UP2		0x00000400
#define ISDN_PID_L0_TE_E1		0x00000008
#define ISDN_PID_L0_NT_E1		0x00000800
#define ISDN_PID_L0_IP_S0		0x00000010
#define ISDN_PID_L0_IP_E1		0x00000020
#define ISDN_PID_L0_LOOP		0x00000030
#define ISDN_PID_L1_TE_S0		0x01000001
#define ISDN_PID_L1_NT_S0		0x01000100
#define ISDN_PID_L1_TE_U		0x01000002
#define ISDN_PID_L1_NT_U		0x01000200
#define ISDN_PID_L1_TE_UP2		0x01000004
#define ISDN_PID_L1_NT_UP2		0x01000400
#define ISDN_PID_L1_TE_E1		0x01000008
#define ISDN_PID_L1_NT_E1		0x01000800
#define ISDN_PID_L2_LAPD		0x02000001
#define ISDN_PID_L2_LAPD_NET		0x02000002
/* Bit 15-0  reserved for CAPI defined protocols */
#define ISDN_PID_L0_B_IP		0x40000001
#define ISDN_PID_L1_B_64HDLC		0x41000001
#define ISDN_PID_L1_B_64TRANS		0x41000002
#define ISDN_PID_L1_B_V110_ASYNC	0x41000004
#define ISDN_PID_L1_B_V110_HDLC		0x41000008
#define ISDN_PID_L1_B_T30FAX		0x41000010
#define ISDN_PID_L1_B_64HDLC_INV	0x41000020
#define ISDN_PID_L1_B_56TRANS		0x41000040
#define ISDN_PID_L1_B_MODEM_ALL		0x41000080
#define ISDN_PID_L1_B_MODEM_ASYNC	0x41000100
#define ISDN_PID_L1_B_MODEM_HDLC	0x41000200
/* Bit 15-0  reserved for CAPI defined protocols */
#define ISDN_PID_L2_B_X75SLP		0x42000001
#define ISDN_PID_L2_B_TRANS		0x42000002
#define ISDN_PID_L2_B_TRANSDTMF		0x42300002
#define ISDN_PID_L2_B_RAWDEV		0x42400002
#define ISDN_PID_L2_B_SDLC		0x42000004
#define ISDN_PID_L2_B_LAPD		0x42000008
#define ISDN_PID_L2_B_T30		0x42000010
#define ISDN_PID_L2_B_PPP		0x42000020
#define ISDN_PID_L2_B_TRANSNOERR	0x42000040
#define ISDN_PID_L2_B_MODEM		0x42000080
#define ISDN_PID_L2_B_X75SLPV42BIS	0x42000100
#define ISDN_PID_L2_B_V120ASYNC		0x42000200
#define ISDN_PID_L2_B_V120ASYNCV42BIS	0x42000400
#define ISDN_PID_L2_B_V120TRANS		0x42000800
#define ISDN_PID_L2_B_LAPDFREESAPI	0x42001000
#define ISDN_PID_L3_B_TRANS		0x43000001
#define ISDN_PID_L3_B_T90NL		0x43000002
#define ISDN_PID_L3_B_X25DTE		0x43000004
#define ISDN_PID_L3_B_X25DCE		0x43000008
#define ISDN_PID_L3_B_T30		0x43000010
#define ISDN_PID_L3_B_T30EXT		0x43000020
#define ISDN_PID_L3_B_MODEM		0x43000080
/* Bit 15-0  reserved for CAPI defined protocols */
#define ISDN_PID_L3_B_DSP		0x43010000
#define ISDN_PID_L3_DSS1USER		0x03000001
#define ISDN_PID_L3_DSS1NET		0x03000100
#define ISDN_PID_L4_CAPI20		0x04000001
#define ISDN_PID_L4_B_CAPI20		0x44000001

#define ISDN_PID_BCHANNEL_BIT		0x40000000
#define ISDN_PID_LAYER_MASK		0x0f000000
#define ISDN_PID_LAYER(n)		(n<<24)
#define ISDN_PID_FEATURE_MASK		0x00F00000
#define ISDN_PID_IDX_MAX		23

#define ISDN_PID_L2_DF_PTP		0x00100000
#define ISDN_PID_L2_DF_MULT_TEI		0x00200000
#define	ISDN_PID_L3_DF_PTP		0x00100000
#define ISDN_PID_L3_DF_EXTCID		0x00200000
#define ISDN_PID_L3_DF_CRLEN2		0x00400000


// short message status
#define SSTATUS_ALL		0x0fffffff
#define SSTATUS_BROADCAST_BIT	0x10000000
#define SSTATUS_L1		0x01ffffff
#define SSTATUS_L2		0x02ffffff
#define SSTATUS_L1_DEACTIVATED	0x01000000
#define SSTATUS_L1_ACTIVATED	0x01000001
#define SSTATUS_L2_RELEASED	0x02000000
#define SSTATUS_L2_ESTABLISHED	0x02000001


#define mISDN_CORE_DEVICE	0
#define mISDN_RAW_DEVICE	128

#define FLG_mISDNPORT_BUSY	1
#define FLG_mISDNPORT_ENABLED	2
#define FLG_mISDNPORT_BLOCK	3
#define FLG_mISDNPORT_OPEN	4
#define FLG_mISDNPORT_ONEFRAME	5


/*
 * A "ENTITY" is a instance which assign id's with a none local
 * scope. A id has a local part (a range of ids which the instance
 * maintains) and the global ENTITY ID.
 * A instance which wan't to assign IDs have to request a unique
 * ENTITY ID with MGR_NEWENTITY | REQUEST.
 * If the instance is deleted or don't need this feature anymore
 * it has to delete the ENTITY with MGR_DELENTITY | REQUEST.
 * ENTITY ID 0xFFFF is a special one.
 * One example for using this is the L3/L4 process ID.
 */

#define MISDN_MAX_ENTITY	2048
#define MISDN_ENTITY_NONE	0x0000ffff
#define MISDN_ID_ENTITYMASK	0xffff0000
#define MISDN_ID_LOCALMASK	0x0000FFFF
#define MISDN_ID_ANY		0xffffffff
#define MISDN_ID_NONE		0xfffffffe
#define MISDN_ID_DUMMY		0xffff0001
#define MISDN_ID_GLOBAL		0xffff0002

#define MAX_LAYER_NR		7
#define ISDN_LAYER(n)		(1<<n)
#define LAYER_OUTRANGE(layer)	((layer<0) || (layer>MAX_LAYER_NR))

/* should be in sync with linux/kobject.h:KOBJ_NAME_LEN */
#define mISDN_MAX_IDLEN		20

#ifdef OBSOLETE
#define IF_NOACTIV	0x00000000
#define IF_DOWN		0x01000000
#define IF_UP		0x02000000
#define IF_CHAIN	0x04000000
#define IF_HANDSHAKE	0x08000000
#define IF_TYPEMASK	0x07000000
#define IF_ADDRMASK	0xF0FFFFFF
#define IF_IADDRMASK	0xF0FFFFFF
#define IF_CONTRMASK	0x000000FF
#define IF_CHILDMASK	0x1000FF00
#define IF_CLONEMASK	0x2000FF00
#define IF_INSTMASK	0x400F0000
#define IF_LAYERMASK	0x00F00000
#define IF_TYPE(i)	((i)->stat & IF_TYPEMASK)
#endif

/*
 * general ID layout for instance and stack id's
 * 3322 2222 2222 1111 1111 1100 0000 0000
 * 1098 7654 3210 9876 5432 1098 7654 3210
 * FFFF FFFF CCCC CCCC SSSS SSSS RRRR LLLL
 *
 * L (bit 03-00) Layer ID
 * R (bit 06-04) reserved (0)
 * U (bit 07)    user device id
 * S (bit 15-08) Stack ID/controller number
 * C (bit 23-16) Child/Clone ID
 * F (bit 31-24) Flags as defined below
 *
 */

#define FLG_MSG_DOWN	0x01000000
#define FLG_MSG_UP	0x02000000
#define FLG_MSG_TARGET	0x04000000
#define FLG_MSG_CLONED	0x08000000
#define FLG_CHILD_STACK	0x10000000
#define FLG_CLONE_STACK	0x20000000
#define FLG_INSTANCE	0x40000000
#define FLG_MSG_TAGGED	0x80000000
#define MSG_DIR_MASK	0x03000000
#define MSG_BROADCAST	0x03000000
#define MSG_TO_OWNER	0x00000000

#define CHILD_ID_INC	0x00010000
#define CHILD_ID_MAX	0x10FF0000
#define CHILD_ID_MASK	0x00FF0000
#define CLONE_ID_INC	0x00010000
#define CLONE_ID_MAX	0x20FF0000
#define CLONE_ID_MASK	0x00FF0000
#define STACK_ID_INC	0x00000100
#define STACK_ID_MAX	0x00007F00
#define STACK_ID_MASK	0x30FFFF00
#define MASTER_ID_MASK	0x0000FF00
#define LAYER_ID_INC	0x00000001
#define LAYER_ID_MAX	MAX_LAYER_NR
#define LAYER_ID_MASK	0x0000000F
#define FLG_ID_USER	0x00000080
#define INST_ID_MASK	0x70FFFFFF

#define DUMMY_CR_FLAG	0x7FFFFF00
// #define CONTROLER_MASK	0x0000FF

/* stack channel values */
#define CHANNEL_NUMBER	0x000000FF
#define CHANNEL_RXSLOT	0x0000FF00
#define CHANNEL_TXSLOT	0x00FF0000
#define CHANNEL_EXTINFO	0xFF000000
#define CHANNEL_NR_D	0x00000000
#define CHANNEL_NR_B1	0x00000001
#define CHANNEL_NR_B2	0x00000002
#define CHANNEL_EXT_PCM	0x01000000
#define CHANNEL_EXT_REV	0x02000000

/* instance/stack extentions */
#define EXT_STACK_CLONE 0x00000001
#define EXT_INST_CLONE	0x00000100
#define EXT_INST_MGR	0x00000200
#define EXT_INST_MIDDLE	0x00000400
#define EXT_INST_UNUSED 0x00000800
//#define EXT_IF_CHAIN	0x00010000
//#define EXT_IF_EXCLUSIV	0x00020000
//#define EXT_IF_CREATE	0x00040000
//#define EXT_IF_SPLIT	0x00080000

/* stack status flag */
#define mISDN_STACK_ACTION_MASK		0x0000ffff
#define mISDN_STACK_COMMAND_MASK	0x000f0000
#define mISDN_STACK_STATUS_MASK		0xfff00000
/* action bits 0-15 */
#define mISDN_STACK_WORK	0
#define mISDN_STACK_SETUP	1
#define mISDN_STACK_CLEARING	2
#define mISDN_STACK_RESTART	3
#define mISDN_STACK_WAKEUP	4
#define mISDN_STACK_ABORT	15
/* status bits 16-31 */
#define mISDN_STACK_STOPPED	16
#define mISDN_STACK_INIT	17
#define mISDN_STACK_THREADSTART	18
#define mISDN_STACK_ACTIVE	29
#define mISDN_STACK_RUNNING	30
#define mISDN_STACK_KILLED	31

/* special packet type */
#define PACKET_NOACK	250

/* limits for buffers */

#define MAX_PHONE_DIGIT		31
#define MAX_DFRAME_LEN		260
#define MAX_DATA_SIZE		2048
#define MAX_DATA_MEM		2080
#define MAX_HEADER_LEN		4
#define	DEFAULT_PORT_QUEUELEN	256
#define PORT_SKB_RESERVE	L3_EXTRA_SIZE
#define PORT_SKB_MINIMUM	128

/* structure for information exchange between layer/entity boundaries */

#define STATUS_INFO_L1	1
#define STATUS_INFO_L2	2

typedef struct _mISDN_head {
	u_int	addr;
	u_int	prim;
	int	dinfo;
	int	len;
}  __attribute__((packed)) mISDN_head_t;

#define mISDN_HEADER_LEN	sizeof(mISDN_head_t)

typedef struct _status_info {
	int	len;
	int	typ;
	u_char	info[120];
} status_info_t;

typedef struct _logdata {
	char    *head;
	char	*fmt;
	va_list args;
} logdata_t;

typedef struct _moditem {
	char	*name;
	int	protocol;
} moditem_t;

typedef struct _mISDN_pid {
	int	protocol[MAX_LAYER_NR +1];
	int	layermask;
	int	maxplen;
	/* 0 is defined as no prameter, all other values are offsets into pbuf
	 * so pbuf[0] is always unused */
	u16	param[MAX_LAYER_NR +1];
	u16	global;
	u16	pidx;
	u_char	*pbuf;
} mISDN_pid_t;

typedef struct _mISDN_stPara {
	int	maxdatalen;
	int	up_headerlen;
	int	down_headerlen;
} mISDN_stPara_t;

typedef struct _stack_info {
	u_int		id;
	mISDN_pid_t	pid;
	mISDN_stPara_t	para;
	u_int		extentions;
	u_int		mgr;
	u_int		master;
	u_int		clone;
	int		instcnt;
	int		inst[MAX_LAYER_NR +1];
	int		childcnt;
	u_int		child[2]; /* this is correct handled for PRI see get_stack_info() */
} stack_info_t;

typedef struct _layer_info {
	char		name[mISDN_MAX_IDLEN];
	int		object_id;
	int		extentions;
	u_int		id;
	u_int		st;
	u_int		clone;
	u_int		parent;
	mISDN_pid_t	pid;
} layer_info_t;

#ifdef OBSOLETE
typedef struct _interface_info {
	int		extentions;
	u_int		owner;
	u_int		peer;
	int		stat;
} interface_info_t;
#endif

typedef struct _channel_info {
	u_int		channel;
	union {
		u_int	id;
		void	*p;
	} st;
} channel_info_t;

/* l3 pointer arrays */

typedef struct _ie_info {
	u16	off	: 10,
		ridx	: 3,
		res1	: 1,
		cs_flg	: 1,
		repeated: 1;
} __attribute__((packed)) ie_info_t;

typedef struct _ie_val {
	u16	codeset	: 3,
		res1	: 5,
		val	: 8;
} __attribute__((packed)) ie_val_t;;

typedef struct _cs_info {
	u16	codeset	: 3,
		locked	: 1,
		res1	: 2,
		len	: 10;
} __attribute__((packed)) cs_info_t;

typedef struct _ie_info_ext {
	ie_info_t	ie;
	union {
		ie_val_t	v;
		cs_info_t	cs;
	};
} __attribute__((packed)) ie_info_ext_t;

typedef struct _Q931_info {
	u_char		type;
	u_char		crlen;
	u16		cr;
	ie_info_t	bearer_capability;
	ie_info_t	cause;
	ie_info_t	call_id;
	ie_info_t	call_state;
	ie_info_t	channel_id;
	ie_info_t	facility;
	ie_info_t	progress;
	ie_info_t	net_fac;
	ie_info_t	notify;
	ie_info_t	display;
	ie_info_t	date;
	ie_info_t	keypad;
	ie_info_t	signal;
	ie_info_t	info_rate;
	ie_info_t	end2end_transit;
	ie_info_t	transit_delay_sel;
	ie_info_t	pktl_bin_para;
	ie_info_t	pktl_window;
	ie_info_t	pkt_size;
	ie_info_t	closed_userg;
	ie_info_t	connected_nr;
	ie_info_t	connected_sub;
	ie_info_t	calling_nr;
	ie_info_t	calling_sub;
	ie_info_t	called_nr;
	ie_info_t	called_sub;
	ie_info_t	redirect_nr;
	ie_info_t	transit_net_sel;
	ie_info_t	restart_ind;
	ie_info_t	llc;
	ie_info_t	hlc;
	ie_info_t	useruser;
	ie_info_t	more_data;
	ie_info_t	sending_complete;
	ie_info_t	congestion_level;
	ie_info_t	comprehension_required;
	ie_info_ext_t	ext[8];
}  __attribute__((packed)) Q931_info_t;

#define L3_EXTRA_SIZE	sizeof(Q931_info_t)

#ifdef __KERNEL__
#include <linux/isdn_compat.h>
#include <linux/list.h>
#include <linux/skbuff.h>

typedef struct _mISDNobject	mISDNobject_t;
typedef struct _mISDNinstance	mISDNinstance_t;
typedef struct _mISDNstack	mISDNstack_t;
typedef struct _mISDNport	mISDNport_t;
typedef struct _mISDNdevice	mISDNdevice_t;
typedef int	(ctrl_func_t)(void *, u_int, void *);
typedef int	(if_func_t)(mISDNinstance_t *, struct sk_buff *);

#define mISDN_HEAD_P(s)		((mISDN_head_t *)&s->cb[0])
#define mISDN_HEAD_PRIM(s)	((mISDN_head_t *)&s->cb[0])->prim
#define mISDN_HEAD_DINFO(s)	((mISDN_head_t *)&s->cb[0])->dinfo

typedef struct _mISDN_headext {
	u_int	addr;
	u_int	prim;
	int	dinfo;
	void	*data[3];
	union {
		ctrl_func_t	*ctrl;
		if_func_t	*iff;
		void		*func;
	} func;
}  __attribute__((packed)) mISDN_headext_t;

#define mISDN_HEADEXT_P(s) ((mISDN_headext_t *)&s->cb[0])

/* Basic struct of a mISDN component */
struct _mISDNobject {
	struct list_head	list;
	char			*name;
	u_int			id;
	int			refcnt;
	mISDN_pid_t		DPROTO;
	mISDN_pid_t		BPROTO;
	ctrl_func_t		*own_ctrl;
	struct list_head	ilist;
	spinlock_t		lock;
	struct module		*owner;
	struct class_device	class_dev;
};

#ifdef OBSOLETE
/* the interface between two mISDNinstances */
struct _mISDNif {
	if_func_t		*func;
	void			*fdata;
	mISDNif_t		*clone;
	mISDNif_t		*predecessor;
	int			extentions;
	int			stat;
	mISDNstack_t		*st;
	mISDNinstance_t		*owner;
	mISDNinstance_t		*peer;
};
#endif

/* a instance of a mISDNobject */
struct _mISDNinstance {
	struct list_head	list;
	char			name[mISDN_MAX_IDLEN];
	int			extentions;
	u_int			id;
	int			regcnt;
	mISDN_pid_t		pid;
	mISDNstack_t		*st;
	mISDNobject_t		*obj;
	void			*privat;
	mISDNinstance_t		*clone;
	mISDNinstance_t		*parent;
	if_func_t		*function;
	spinlock_t		*hwlock;
	struct class_device	class_dev;
};

#ifdef OBSOLETE
/* a list of parallel (horizontal) mISDNinstances in the same layer
 * normally here is only one instance per layer only if the information
 * will be splitted here are more instances */
struct _mISDNlayer {
	struct list_head	list;
	mISDNinstance_t		*inst;
};
#endif
/* the STACK; a (vertical) chain of layers */
 
struct _mISDNstack {
	struct list_head	list;
	u_int			id;
	u_int			extentions;
	mISDN_pid_t		pid;
	mISDN_stPara_t		para;
	u_long			status;
	struct task_struct	*thread;
	struct semaphore	*notify;
	wait_queue_head_t	workq;
	struct sk_buff_head	msgq;
#ifdef MISDN_MSG_STATS
	u_int			msg_cnt;
	u_int			sleep_cnt;
	u_int			clone_cnt;
	u_int			stopped_cnt;
#endif
	mISDNinstance_t		*i_array[MAX_LAYER_NR + 1];
	struct list_head	prereg;
	mISDNinstance_t		*mgr;
	mISDNstack_t		*master;
	mISDNstack_t		*clone;
	mISDNstack_t		*parent;
	struct list_head	childlist;
	struct class_device	class_dev;
	/* temporary use */
	mISDN_pid_t		new_pid;
};

/* lowlevel read/write struct for the mISDNdevice */
struct _mISDNport {
	wait_queue_head_t	procq;
	spinlock_t		lock;
//	mISDNif_t		pif;
	u_long			Flag;
	struct sk_buff_head	queue;
	u_int			maxqlen;
};

/* the user interface to handle /dev/mISDN */
struct _mISDNdevice {
	struct list_head	list;
	int			minor;
	struct semaphore	io_sema;
	int			open_mode;
	mISDNport_t		rport;
	mISDNport_t		wport;
	struct list_head	layerlist;
	struct list_head	stacklist;
	struct list_head	timerlist;
	struct list_head	entitylist;
};

/* common helper functions */
extern int	mISDN_bprotocol2pid(void *, mISDN_pid_t *);
// extern int	mISDN_SetIF(mISDNinstance_t *, mISDNif_t *, u_int, void *, void *, void *);
// extern int	mISDN_ConnectIF(mISDNinstance_t *, mISDNinstance_t *);
// extern int	mISDN_DisConnectIF(mISDNinstance_t *, mISDNif_t *);
extern int	mISDN_queue_message(mISDNinstance_t *, u_int, struct sk_buff *);


/* global register/unregister functions */

extern int	mISDN_register(mISDNobject_t *obj);
extern int	mISDN_unregister(mISDNobject_t *obj);
extern int	mISDN_ctrl(void *, u_int, void *);

#endif /* __KERNEL__ */
#endif /* mISDNIF_H */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mISDN/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 13:47:33 -0000	1.1
+++ .cvsignore	17 Oct 2006 13:48:06 -0000	1.2
@@ -0,0 +1 @@
+mISDNuser-20061010.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mISDN/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 13:47:33 -0000	1.1
+++ sources	17 Oct 2006 13:48:06 -0000	1.2
@@ -0,0 +1 @@
+4a4f27ef94d36ca547bf047fa81dc766  mISDNuser-20061010.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 14:02:49 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 17 Oct 2006 07:02:49 -0700
Subject: rpms/konversation/devel konversation.spec,1.10,1.11
Message-ID: <200610171402.k9HE2nSq028365@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28338

Modified Files:
	konversation.spec 
Log Message:
add gettext as BR



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- konversation.spec	7 Oct 2006 01:54:28 -0000	1.10
+++ konversation.spec	17 Oct 2006 14:02:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           konversation
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils, gettext
 Requires:       kdebase >= 3.4
 
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-2
+- add gettext  as br  so translations get built correctly
+
 * Fri Oct 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1
 - Upgrade to 1.0.1
 



From fedora-extras-commits at redhat.com  Tue Oct 17 14:05:00 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 17 Oct 2006 07:05:00 -0700
Subject: rpms/konversation/FC-5 konversation.spec,1.9,1.10
Message-ID: <200610171405.k9HE50Xd028444@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28424

Modified Files:
	konversation.spec 
Log Message:
add gettext as BR



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-5/konversation.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- konversation.spec	7 Oct 2006 01:55:41 -0000	1.9
+++ konversation.spec	17 Oct 2006 14:04:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           konversation
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils, gettext
 Requires:       kdebase >= 3.4
 
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-2
+- add gettext  as br  so translations get built correctly
+
 * Fri Oct 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1
 - Upgrade to 1.0.1
 



From fedora-extras-commits at redhat.com  Tue Oct 17 14:44:59 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 07:44:59 -0700
Subject: rpms/rpy/devel rpy.spec,1.12,1.13
Message-ID: <200610171444.k9HEixG3029741@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29724

Modified Files:
	rpy.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
- Rebuild for new R-version.



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rpy.spec	14 Sep 2006 12:49:48 -0000	1.12
+++ rpy.spec	17 Oct 2006 14:44:29 -0000	1.13
@@ -1,21 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name: 		rpy
-Summary: 	Python interface to the R language
-Version:	0.4.6
-Release:	12%{?dist}
-Url:		http://rpy.sourceforge.net
-Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Patch1:         rpy-install-info.patch
-Patch2:		rpy-rversion.patch
-License:	GPL
-Group:		Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: rpy
+Summary: Python interface to the R language
+Version: 0.4.6
+Release: 13%{?dist}
+Url: http://rpy.sourceforge.net
+Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: rpy-install-info.patch
+Patch2: rpy-rversion.patch
+License: GPL
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
+BuildRequires: R, python-numeric, python-devel, texinfo, tetex
 
-Requires:	python-numeric
-Requires:	R = 2.3.1
+Requires: python-numeric
+Requires: R = 2.4.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
+- Rebuild for new R-version.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-12
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 14:49:37 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 17 Oct 2006 07:49:37 -0700
Subject: fedora-security/audit fc5,1.359,1.360
Message-ID: <200610171449.k9HEnb0P029816@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29793

Modified Files:
	fc5 
Log Message:
Catchup on fc5 issues; including bind rebase and Xsession issues (low)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- fc5	17 Oct 2006 09:38:25 -0000	1.359
+++ fc5	17 Oct 2006 14:49:34 -0000	1.360
@@ -1,11 +1,19 @@
-Up to date CVE as of CVE email 20061009
-Up to date FC5 as of 20061009
+Up to date CVE as of CVE email 20061016
+Up to date FC5 as of 20061016
 
 ** are items that need attention
 
-CVE-2006-5229 ** openssh
-CVE-2006-5215 ** (X.org, fixed 20060225?)
-CVE-2006-5214 ** (X.org, fixed 20060225?)
+CVE-2006-5298 ** mutt
+CVE-2006-5297 ** mutt
+CVE-2006-5229 ignore (openssh) reported not an issue
+CVE-2006-5215 VULNERABLE (xorg-x11-xdm)
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
+CVE-2006-5215 VULNERABLE (gdm)
+CVE-2006-5215 VULNERABLE (kdebase)
+CVE-2006-5214 VULNERABLE (xorg-x11-xdm)
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit)
+CVE-2006-5214 VULNERABLE (gdm)
+CVE-2006-5214 VULNERABLE (kdebase)
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield
@@ -84,8 +92,8 @@
 CVE-2006-4146 backport (gdb) [since FEDORA-2006-975]
 CVE-2006-4145 version (kernel, fixed 2.6.17.10) [since FEDORA-2006-967] needs a better upstream fix
 CVE-2006-4144 backport (ImageMagick, fixed 6.2.9) #202773 [since FEDORA-2006-929]
-CVE-2006-4096 backport (bind) [since FEDORA-2006-966] bind-9.3.2-rrsig.patch 
-CVE-2006-4095 backport (bind) [since FEDORA-2006-418] bind-9.3.2-bz173961.patch
+CVE-2006-4096 version (bind) [since FEDORA-2006-1024] was backport since FEDORA-2006-966
+CVE-2006-4095 version (bind) [since FEDORA-2006-418] was backport since FEDORA-2006-966
 CVE-2006-4093 version (kernel, fixed 2.6.17.9) [since FEDORA-2006-967]
 CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) #202247
 CVE-2006-4020 VULNERABLE (php) #201767



From fedora-extras-commits at redhat.com  Tue Oct 17 14:50:53 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 07:50:53 -0700
Subject: rpms/rpy/FC-5 rpy.spec,1.11,1.12
Message-ID: <200610171450.k9HEor3i029848@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29826

Modified Files:
	rpy.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
- Rebuild for new R-version.



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-5/rpy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpy.spec	4 Jun 2006 21:40:10 -0000	1.11
+++ rpy.spec	17 Oct 2006 14:50:23 -0000	1.12
@@ -1,21 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name: 		rpy
-Summary: 	Python interface to the R language
-Version:	0.4.6
-Release:	11%{?dist}
-Url:		http://rpy.sourceforge.net
-Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Patch1:         rpy-install-info.patch
-Patch2:		rpy-rversion.patch
-License:	GPL
-Group:		Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: rpy
+Summary: Python interface to the R language
+Version: 0.4.6
+Release: 13%{?dist}
+Url: http://rpy.sourceforge.net
+Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: rpy-install-info.patch
+Patch2: rpy-rversion.patch
+License: GPL
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
+BuildRequires: R, python-numeric, python-devel, texinfo, tetex
 
-Requires:	python-numeric
-Requires:	R = 2.3.1
+Requires: python-numeric
+Requires: R = 2.4.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -67,36 +67,42 @@
 
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-11
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
+- Rebuild for new R-version.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-12
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-11
 - Rebuild for R-2.3.1
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-10
 - BuildRequires tetex for "make pdf" (pdftex).
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-9
 - Fix detection of R version.
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-8
 - Rebuild for R-2.3.0
 
-* Fri Feb 17 2006 Alex Lancaster <alexl at users.sourceforge.net> - 0.4.6-7
+* Fri Feb 17 2006 Alex Lancaster <alexl[AT]users.sourceforge.net> - 0.4.6-7
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)
 
-* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-6
+* Thu Feb 16 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-6
 - Use a fixed value for R version.
 
-* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-5
+* Thu Feb 16 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-5
 - Set explicit dependency on exact version of R used to build the package. (bz#177078)
 
-* Tue Jan  3 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-4
+* Tue Jan  3 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-4
 - Update for R-2.2.1
 
-* Tue Oct 11 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-3
+* Tue Oct 11 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 
-* Mon Oct 10 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-2
+* Mon Oct 10 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-2
 - Rebuild for R-2.2.0
 
-* Thu Sep 15 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-1
+* Thu Sep 15 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Tue Oct 17 15:01:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 08:01:21 -0700
Subject: rpms/rpy/FC-4 rpy.spec,1.11,1.12
Message-ID: <200610171501.k9HF1LI0000384@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29979

Modified Files:
	rpy.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
- Rebuild for new R-version.



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpy.spec	4 Jun 2006 21:40:56 -0000	1.11
+++ rpy.spec	17 Oct 2006 15:00:51 -0000	1.12
@@ -1,21 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name: 		rpy
-Summary: 	Python interface to the R language
-Version:	0.4.6
-Release:	11%{?dist}
-Url:		http://rpy.sourceforge.net
-Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Patch1:         rpy-install-info.patch
-Patch2:		rpy-rversion.patch
-License:	GPL
-Group:		Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: rpy
+Summary: Python interface to the R language
+Version: 0.4.6
+Release: 13%{?dist}
+Url: http://rpy.sourceforge.net
+Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: rpy-install-info.patch
+Patch2: rpy-rversion.patch
+License: GPL
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
+BuildRequires: R, python-numeric, python-devel, texinfo, tetex
 
-Requires:	python-numeric
-Requires:	R = 2.3.1
+Requires: python-numeric
+Requires: R = 2.4.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -67,36 +67,42 @@
 
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-11
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-13
+- Rebuild for new R-version.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-12
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-11
 - Rebuild for R-2.3.1
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-10
 - BuildRequires tetex for "make pdf" (pdftex).
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-9
 - Fix detection of R version.
 
-* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
+* Wed Apr 26 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-8
 - Rebuild for R-2.3.0
 
-* Fri Feb 17 2006 Alex Lancaster <alexl at users.sourceforge.net> - 0.4.6-7
+* Fri Feb 17 2006 Alex Lancaster <alexl[AT]users.sourceforge.net> - 0.4.6-7
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)
 
-* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-6
+* Thu Feb 16 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-6
 - Use a fixed value for R version.
 
-* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-5
+* Thu Feb 16 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-5
 - Set explicit dependency on exact version of R used to build the package. (bz#177078)
 
-* Tue Jan  3 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-4
+* Tue Jan  3 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-4
 - Update for R-2.2.1
 
-* Tue Oct 11 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-3
+* Tue Oct 11 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 
-* Mon Oct 10 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-2
+* Mon Oct 10 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-2
 - Rebuild for R-2.2.0
 
-* Thu Sep 15 2005 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-1
+* Thu Sep 15 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.4.6-1
 - Initial package for Fedora Extras



From fedora-extras-commits at redhat.com  Tue Oct 17 15:08:09 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 17 Oct 2006 08:08:09 -0700
Subject: rpms/python-sexy/devel .cvsignore, 1.2, 1.3 python-sexy.spec, 1.2, 
	1.3 sources, 1.2, 1.3 python-sexy-license.patch, 1.1, NONE
Message-ID: <200610171508.k9HF89vl000560@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv537

Modified Files:
	.cvsignore python-sexy.spec sources 
Removed Files:
	python-sexy-license.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2006 18:59:15 -0000	1.2
+++ .cvsignore	17 Oct 2006 15:07:39 -0000	1.3
@@ -1 +1 @@
-sexy-python-0.1.8.tar.gz
+sexy-python-0.1.9.tar.gz


Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-sexy.spec	12 Sep 2006 19:21:03 -0000	1.2
+++ python-sexy.spec	17 Oct 2006 15:07:39 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define real_name sexy-python
 Name:           python-sexy
-Version:        0.1.8
-Release:        5%{?dist}
+Version:        0.1.9
+Release:        1%{?dist}
 
 Summary:        Python bindings to libsexy
 
@@ -14,10 +14,11 @@
 Patch0:		%{name}-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsexy-devel >= 0.1.8
+BuildRequires:  libsexy-devel >= 0.1.9
 BuildRequires:  python-devel >= 2
 BuildRequires:  pygtk2-devel >= 2.8.0
 BuildRequires:  libxml2-devel
+Requires:  libsexy-devel >= 0.1.9
 
 %description
 sexy-python is a set of Python bindings around libsexy.
@@ -25,7 +26,6 @@
 
 %prep
 %setup -q -n  %{real_name}-%{version}
-%patch0 -p0
 
 %build
 %configure --enable-docs
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Nov 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
+- updated to 0.1.9, license file issue has been fixed upstream
+
 * Tue Sep 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8-5
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2006 18:59:15 -0000	1.2
+++ sources	17 Oct 2006 15:07:39 -0000	1.3
@@ -1 +1 @@
-94273fc16a35123f1d3003f1080bf2c0  sexy-python-0.1.8.tar.gz
+313f11e98555b0e9eea28219564e5063  sexy-python-0.1.9.tar.gz


--- python-sexy-license.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 15:13:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 08:13:43 -0700
Subject: rpms/R-mAr/devel R-mAr.spec,1.5,1.6
Message-ID: <200610171513.k9HFDhOF000649@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-mAr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv633

Modified Files:
	R-mAr.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
- Rebuild for R 2.4.0.



Index: R-mAr.spec
===================================================================
RCS file: /cvs/extras/rpms/R-mAr/devel/R-mAr.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- R-mAr.spec	14 Sep 2006 12:52:16 -0000	1.5
+++ R-mAr.spec	17 Oct 2006 15:13:13 -0000	1.6
@@ -1,17 +1,19 @@
 %define packname mAr
 
-Summary:	 R module to evaluate functions for multivariate AutoRegressive analysis
-Name:		 R-%{packname}
-Version:	 1.1
-Release:	 6%{?dist}
-License:	 GPL version 2 or newer
-Group:		 Applications/Engineering
-Source0:	 ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-Source1:	 COPYING
-URL:		 http://cran.r-project.org/contrib
-Requires:	 R
-BuildRequires:	 R, tetex-latex
-BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: R module to evaluate functions for multivariate AutoRegressive analysis
+Name: R-%{packname}
+Version: 1.1
+Release: 7%{?dist}
+License: GPL version 2 or newer
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+Source1: COPYING
+URL: http://cran.r-project.org/contrib
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: R, tetex-latex
+
+Requires: R
 
 %define 	 debug_package %{nil}
 
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
+- Rebuild for R 2.4.0.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-6
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 15:15:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 08:15:43 -0700
Subject: rpms/R-mAr/FC-5 R-mAr.spec,1.4,1.5
Message-ID: <200610171515.k9HFFhoZ000729@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-mAr/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv713

Modified Files:
	R-mAr.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
- Rebuild for R 2.4.0.



Index: R-mAr.spec
===================================================================
RCS file: /cvs/extras/rpms/R-mAr/FC-5/R-mAr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-mAr.spec	4 Jun 2006 22:04:57 -0000	1.4
+++ R-mAr.spec	17 Oct 2006 15:15:13 -0000	1.5
@@ -1,17 +1,19 @@
 %define packname mAr
 
-Summary:	 R module to evaluate functions for multivariate AutoRegressive analysis
-Name:		 R-%{packname}
-Version:	 1.1
-Release:	 5%{?dist}
-License:	 GPL version 2 or newer
-Group:		 Applications/Engineering
-Source0:	 ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-Source1:	 COPYING
-URL:		 http://cran.r-project.org/contrib
-Requires:	 R
-BuildRequires:	 R, tetex-latex
-BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: R module to evaluate functions for multivariate AutoRegressive analysis
+Name: R-%{packname}
+Version: 1.1
+Release: 7%{?dist}
+License: GPL version 2 or newer
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+Source1: COPYING
+URL: http://cran.r-project.org/contrib
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: R, tetex-latex
+
+Requires: R
 
 %define 	 debug_package %{nil}
 
@@ -53,18 +55,24 @@
 
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-5
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-6
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-5
 - Rebuild for R-2.3.x
 
-* Thu Mar  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-4
+* Thu Mar  2 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-4
 - Disable building of debugging package.
 
-* Tue Oct 11 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-3
+* Tue Oct 11 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-3
 - Remove html index generation as it is now automatic.
 
-* Thu Oct  6 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-2
+* Thu Oct  6 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-2
 - Add check section, add tetex-latex to BulidRequires, and remove docs
   as they are packaged already.
 
-* Sun Aug 21 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-1
+* Sun Aug 21 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-1
 - Prepare for FE inclusion.



From fedora-extras-commits at redhat.com  Tue Oct 17 15:16:58 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 08:16:58 -0700
Subject: rpms/R-mAr/FC-4 R-mAr.spec,1.4,1.5
Message-ID: <200610171516.k9HFGw43000790@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-mAr/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv774

Modified Files:
	R-mAr.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
- Rebuild for R 2.4.0.



Index: R-mAr.spec
===================================================================
RCS file: /cvs/extras/rpms/R-mAr/FC-4/R-mAr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-mAr.spec	4 Jun 2006 22:05:41 -0000	1.4
+++ R-mAr.spec	17 Oct 2006 15:16:28 -0000	1.5
@@ -1,17 +1,19 @@
 %define packname mAr
 
-Summary:	 R module to evaluate functions for multivariate AutoRegressive analysis
-Name:		 R-%{packname}
-Version:	 1.1
-Release:	 5%{?dist}
-License:	 GPL version 2 or newer
-Group:		 Applications/Engineering
-Source0:	 ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-Source1:	 COPYING
-URL:		 http://cran.r-project.org/contrib
-Requires:	 R
-BuildRequires:	 R, tetex-latex
-BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: R module to evaluate functions for multivariate AutoRegressive analysis
+Name: R-%{packname}
+Version: 1.1
+Release: 7%{?dist}
+License: GPL version 2 or newer
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+Source1: COPYING
+URL: http://cran.r-project.org/contrib
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: R, tetex-latex
+
+Requires: R
 
 %define 	 debug_package %{nil}
 
@@ -53,18 +55,24 @@
 
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-5
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-7
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-6
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-5
 - Rebuild for R-2.3.x
 
-* Thu Mar  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-4
+* Thu Mar  2 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-4
 - Disable building of debugging package.
 
-* Tue Oct 11 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-3
+* Tue Oct 11 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-3
 - Remove html index generation as it is now automatic.
 
-* Thu Oct  6 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-2
+* Thu Oct  6 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-2
 - Add check section, add tetex-latex to BulidRequires, and remove docs
   as they are packaged already.
 
-* Sun Aug 21 2005 Jos?? Matos <jamatos at fc.up.pt> - 1.1-1
+* Sun Aug 21 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.1-1
 - Prepare for FE inclusion.



From fedora-extras-commits at redhat.com  Tue Oct 17 15:18:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 17 Oct 2006 08:18:26 -0700
Subject: rpms/python-sexy/devel python-sexy.spec,1.3,1.4
Message-ID: <200610171518.k9HFIQE1000858@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv840

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-sexy.spec	17 Oct 2006 15:07:39 -0000	1.3
+++ python-sexy.spec	17 Oct 2006 15:17:56 -0000	1.4
@@ -14,11 +14,11 @@
 Patch0:		%{name}-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsexy-devel >= 0.1.9
+BuildRequires:  libsexy-devel >= 0.1.10
 BuildRequires:  python-devel >= 2
 BuildRequires:  pygtk2-devel >= 2.8.0
 BuildRequires:  libxml2-devel
-Requires:  libsexy-devel >= 0.1.9
+Requires:  libsexy-devel >= 0.1.10
 
 %description
 sexy-python is a set of Python bindings around libsexy.



From fedora-extras-commits at redhat.com  Tue Oct 17 15:22:14 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 17 Oct 2006 08:22:14 -0700
Subject: rpms/TurboGears/devel TurboGears-1.0b1-setuptools.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 TurboGears.spec, 1.4, 1.5 sources, 1.3,
	1.4 TurboGears-0.8.9-setuptools.patch, 1.1, NONE
Message-ID: <200610171522.k9HFMEsq000974@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv926

Modified Files:
	.cvsignore TurboGears.spec sources 
Added Files:
	TurboGears-1.0b1-setuptools.patch 
Removed Files:
	TurboGears-0.8.9-setuptools.patch 
Log Message:
1.0b1

TurboGears-1.0b1-setuptools.patch:

--- NEW FILE TurboGears-1.0b1-setuptools.patch ---
--- setup.py.orig	2006-09-12 21:43:09.000000000 -0400
+++ setup.py	2006-09-12 21:43:25.000000000 -0400
@@ -34,21 +34,7 @@
 The latest development version is available in <a href="http://www.turbogears.org/svn/turbogears/trunk#egg=turbogears-dev">the TurboGears subversion repository</a>.""",
     url="http://www.turbogears.org",
     zip_safe=False,
-    install_requires = [
-        "TurboJson >= 0.9.9", 
-        "TurboCheetah >= 0.9.5",
-        "TurboKid >= 0.9.8",
-        "CherryPy >= 2.2.1,<3.0.0alpha",
-        "SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99",
-        "simplejson >= 1.3",
-        "elementtree >= 1.2.6", 
-        "PasteScript >= 0.9.7",
-        "cElementTree >= 1.0.5", 
-        "FormEncode >= 0.5.1",
-        "setuptools >= 0.6c2",
-        "RuleDispatch", 
-        "ConfigObj >= 4.3.2", 
-        "nose >= 0.9"],
+    install_requires = [],
     packages=find_packages(),
     include_package_data=True,
     exclude_package_data={"thirdparty" : ["*"]},


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jul 2006 18:53:18 -0000	1.3
+++ .cvsignore	17 Oct 2006 15:21:43 -0000	1.4
@@ -1 +1 @@
-TurboGears-0.8.9.tar.gz
+TurboGears-1.0b1.tar.gz


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurboGears.spec	4 Sep 2006 00:56:36 -0000	1.4
+++ TurboGears.spec	17 Oct 2006 15:21:43 -0000	1.5
@@ -1,72 +1,94 @@
 %{!?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)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        1.0b1
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
-URL:            http://www.turbogears.org/
-Source0:        http://www.turbogears.org/download/eggs/%{name}-%{version}.tar.gz
+URL:            http://www.turbogears.org
+Source0:        http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools >= 0.6a8 
-BuildRequires:  python-kid >= 0.8 python-TestGears >= 0.2
-BuildRequires:  python-formencode >= 0.4 python-cherrypy >= 2.1.0
-BuildRequires:  python-sqlobject >= 0.7
-BuildRequires:  python-json >= 3.3 python-elementtree >= 1.2.6
-Requires:       python-abi = %{pyver}
-Requires:       python-kid >= 0.8  python-cherrypy >= 2.1.0
-Requires:       python-sqlobject >= 0.7 python-formencode >= 0.4
+
+BuildRequires:  python-setuptools >= 0.6c2
+
+Requires:       python-kid >= 0.8  python-cherrypy >= 2.1.1
+Requires:       python-sqlobject >= 0.7 python-formencode >= 0.5.1
 Requires:       python-json >= 3.3 python-elementtree >= 1.2.6
-Requires:       python-setuptools >= 0.6a8 python-TestGears >= 0.2
+Requires:       python-setuptools >= 0.6a11
+Requires:       python-turbocheetah >= 0.9.5 python-turbojson >= 0.9.9 
+Requires:       python-turbokid >= 0.9.8 python-tgfastdata
+Requires:       python-simplejson >= 1.3 python-paste-script >= 0.9.7
+Requires:       python-configobj >= 4.3.2 python-ruledispatch
+Requires:       python-nose >= 0.9
 
 %description
-TurboGears takes the best components available and combines them into one
-easy-to-install, documented whole. TurboGears includes parts that join the
-pieces together and make them work together seamlessly, but doesn't obscure
-each included project. This allows you to take advantage of all existing
-documentation, articles, mailing lists and other resources that have built up
-in the communities for each project.
+TurboGears brings together four major pieces to create an
+easy to install, easy to use web megaframework. It covers
+everything from front end (MochiKit JavaScript for the browser,
+Kid for templates in Python) to the controllers (CherryPy) to
+the back end (SQLObject).
+
+The TurboGears project is focused on providing documentation
+and integration with these tools without losing touch
+with the communities that already exist around those tools.
+
+TurboGears is easy to use for a wide range of web applications.
+
 
 %prep
 %setup -q
-%patch0 -p1
-find docs -type f -exec chmod a-x {} \; -exec sed -i 's/\r//g' {} \;
+%patch0
+
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__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 --single-version-externally-managed
- 
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+# build the filelists
+for module in turbogears ; do
+    echo '%defattr (0644,root,root,0755)' > $module-pyfiles
+    find %{buildroot}%{python_sitelib}/$module -type d | \
+        sed 's:%{buildroot}\(.*\):%dir \1:' >> $module-pyfiles
+    find %{buildroot}%{python_sitelib}/$module -not -type d -not -name '*.pyo' \
+        | sed 's:%{buildroot}\(.*\):\1:' >> $module-pyfiles
+    find %{buildroot}%{python_sitelib}/$module -not -type d -name '*.pyo' | \
+        sed 's:%{buildroot}\(.*\):%ghost \1:' >> $module-pyfiles
+done
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files -f turbogears-pyfiles
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt docs LICENSE.txt
+%doc CHANGELOG.txt LICENSE.txt
 %{_bindir}/tg-admin
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
-%{python_sitelib}/turbogears
 
 %changelog
+* Mon Sep 11 2006 Luke Macken <lmacken at redhat.com> 1.0b1-1
+- 1.0b1
+
 * Sun Sep  3 2006 Luke Macken <lmacken at redhat.com> 0.8.9-4
 - Rebuild for FC6
 
 * Sun Jul  9 2006 Luke Macken <lmacken at redhat.com> 0.8.9-3
 - Require python-TestGears (bug #195370)
 
-* Thu Jul  6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-2
+* Thu Jul 6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-2
 - Add TurboGears-0.8.9-setuptools.patch
 
-* Thu Jul  6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-1
+* Thu Jul 6 2006 Luke Macken <lmacken at redhat.com> 0.8.9-1
 - Bump to 0.8.9
 - Remove TurboGears-0.8a5-optim.patch and TurboGears-0.8a5-setuptools.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jul 2006 18:53:18 -0000	1.3
+++ sources	17 Oct 2006 15:21:43 -0000	1.4
@@ -1 +1 @@
-65ae29ce01fd1e0bad4924b12b4c3706  TurboGears-0.8.9.tar.gz
+667a84671d1ce3639ba11d8e73462639  TurboGears-1.0b1.tar.gz


--- TurboGears-0.8.9-setuptools.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 15:22:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 17 Oct 2006 08:22:30 -0700
Subject: rpms/python-sexy/devel python-sexy.spec,1.4,1.5
Message-ID: <200610171522.k9HFMUf0001018@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv948

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-sexy.spec	17 Oct 2006 15:17:56 -0000	1.4
+++ python-sexy.spec	17 Oct 2006 15:22:00 -0000	1.5
@@ -10,8 +10,6 @@
 License:        LGPL
 URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/libsexy/sexy-python/sexy-python-%{version}.tar.gz
-#This will be removed when the license file will be fixed upstream
-Patch0:		%{name}-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsexy-devel >= 0.1.10



From fedora-extras-commits at redhat.com  Tue Oct 17 15:45:29 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 17 Oct 2006 08:45:29 -0700
Subject: rpms/libsexymm/devel .cvsignore, 1.2, 1.3 libsexymm.spec, 1.2,
	1.3 sources, 1.2, 1.3 libsexymm-license.patch, 1.1, NONE
Message-ID: <200610171545.k9HFjTml001282@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/libsexymm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1260

Modified Files:
	.cvsignore libsexymm.spec sources 
Removed Files:
	libsexymm-license.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsexymm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Aug 2006 22:31:34 -0000	1.2
+++ .cvsignore	17 Oct 2006 15:44:59 -0000	1.3
@@ -1 +1 @@
-libsexymm-0.1.7.tar.gz
+libsexymm-0.1.9.tar.gz


Index: libsexymm.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexymm/devel/libsexymm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsexymm.spec	12 Sep 2006 19:18:18 -0000	1.2
+++ libsexymm.spec	17 Oct 2006 15:44:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libsexymm
-Version:        0.1.7
-Release:        4%{?dist}
+Version:        0.1.9
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for libsexy
 
@@ -8,15 +8,13 @@
 License:        LGPL
 URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/libsexy/libsexymm/libsexymm-%{version}.tar.gz
-#This will be removed when the license file will be fixed upstream
-Patch0:		%{name}-license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  gtkmm24-devel >= 2.4.0
-BuildRequires:  libsexy-devel >= 0.1.7
+BuildRequires:  libsexy-devel >= 0.1.10
 BuildRequires: libxml2-devel
 
 %description
@@ -37,7 +35,6 @@
 
 %prep
 %setup -q -n libsexymm-%{version}
-%patch0 -p0
 
 
 %build
@@ -80,6 +77,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Nov 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
+- updated to 0.1.9, license file issue has been fixed upstream
+
 * Tue Sep 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.7-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsexymm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Aug 2006 22:31:34 -0000	1.2
+++ sources	17 Oct 2006 15:44:59 -0000	1.3
@@ -1 +1 @@
-cb01af4595000d9e192f5d9fcff5b742  libsexymm-0.1.7.tar.gz
+77c8ae69084e478a6b090ec6e5ae26bf  libsexymm-0.1.9.tar.gz


--- libsexymm-license.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 16:17:24 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:17:24 -0700
Subject: rpms/MegaMek - New directory
Message-ID: <200610171617.k9HGHOni004748@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4744/MegaMek

Log Message:
Directory /cvs/extras/rpms/MegaMek added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 16:17:30 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:17:30 -0700
Subject: rpms/MegaMek/devel - New directory
Message-ID: <200610171617.k9HGHUlW004762@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4744/MegaMek/devel

Log Message:
Directory /cvs/extras/rpms/MegaMek/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 16:17:45 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:17:45 -0700
Subject: rpms/MegaMek Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610171617.k9HGHjvd004793@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4787

Added Files:
	Makefile import.log 
Log Message:
Setup of module MegaMek


--- NEW FILE Makefile ---
# Top level Makefile for module MegaMek
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 16:17:51 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:17:51 -0700
Subject: rpms/MegaMek/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610171617.k9HGHpmE004809@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4787/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module MegaMek


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 16:26:40 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:26:40 -0700
Subject: rpms/MegaMek import.log,1.1,1.2
Message-ID: <200610171626.k9HGQeXH005017@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4980

Modified Files:
	import.log 
Log Message:
auto-import MegaMek-0.30.11-1 on branch devel from MegaMek-0.30.11-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/MegaMek/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 16:17:45 -0000	1.1
+++ import.log	17 Oct 2006 16:26:10 -0000	1.2
@@ -0,0 +1 @@
+MegaMek-0_30_11-1:HEAD:MegaMek-0.30.11-1.src.rpm:1161102356



From fedora-extras-commits at redhat.com  Tue Oct 17 16:26:41 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:26:41 -0700
Subject: rpms/MegaMek/devel MegaMek-directories.patch, NONE,
	1.1 MegaMek-icon.png, NONE, 1.1 MegaMek.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610171626.k9HGQfYV005021@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/rpms/MegaMek/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4980/devel

Modified Files:
	.cvsignore sources 
Added Files:
	MegaMek-directories.patch MegaMek-icon.png MegaMek.spec 
Log Message:
auto-import MegaMek-0.30.11-1 on branch devel from MegaMek-0.30.11-1.src.rpm

MegaMek-directories.patch:

--- NEW FILE MegaMek-directories.patch ---
diff -ur src.orig/megamek/client/bot/BotConfiguration.java src/megamek/client/bot/BotConfiguration.java
--- src.orig/megamek/client/bot/BotConfiguration.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/client/bot/BotConfiguration.java	2006-09-18 01:26:05.000000000 -0400
@@ -9,7 +9,7 @@
 
     static {
         try {
-            BotProperties.load(new FileInputStream("mmconf/bot.properties")); //$NON-NLS-1$
+            BotProperties.load(new FileInputStream(System.getProperty("user.home") + "/.megamek/mmconf/bot.properties")); //$NON-NLS-1$
         } catch (Exception e) {
             System.out.println("Bot properties could not be loaded, will use defaults"); //$NON-NLS-1$
         }
diff -ur src.orig/megamek/client/Client.java src/megamek/client/Client.java
--- src.orig/megamek/client/Client.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/client/Client.java	2006-09-18 01:30:01.000000000 -0400
@@ -922,7 +922,7 @@
                 case Packet.COMMAND_SEND_SAVEGAME:
                     String sFinalFile = (String)c.getObject(0);
                     try {
-                        File sDir = new File("savegames");
+                        File sDir = new File(System.getProperty("user.home") + "/.megamek/savegames");
                         if (!sDir.exists()) {
                             sDir.mkdir();
                         }
diff -ur src.orig/megamek/common/options/GameOptions.java src/megamek/common/options/GameOptions.java
--- src.orig/megamek/common/options/GameOptions.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/common/options/GameOptions.java	2006-09-18 01:26:15.000000000 -0400
@@ -41,7 +41,7 @@
 public class GameOptions extends AbstractOptions implements Serializable {
     static final long serialVersionUID = 5417081099101580392L;
 
-    private static final String GAME_OPTIONS_FILE_NAME = "mmconf/gameoptions.xml"; //$NON-NLS-1$
+    private static final String GAME_OPTIONS_FILE_NAME = System.getProperty("user.home") + "/.megamek/mmconf/gameoptions.xml"; //$NON-NLS-1$
     
     public GameOptions() {
         super();
diff -ur src.orig/megamek/common/preference/ClientPreferences.java src/megamek/common/preference/ClientPreferences.java
--- src.orig/megamek/common/preference/ClientPreferences.java	2006-09-18 01:20:31.000000000 -0400
+++ src/megamek/common/preference/ClientPreferences.java	2006-09-18 02:22:17.000000000 -0400
@@ -60,7 +60,27 @@
         store.setDefault(MAP_TILESET, "defaulthexset.txt");
         store.setDefault(MAX_PATHFINDER_TIME, MovePath.DEFAULT_PATHFINDER_TIME_LIMIT);
         store.setDefault(DATA_DIRECTORY,"data");
-        store.setDefault(LOG_DIRECTORY,"logs");
+        try {
+          File homeDataDir = new File(System.getProperty("user.home") + "/.megamek");
+          if (!homeDataDir.exists()) {
+            homeDataDir.mkdir();
+          }
+          File homeConfDir = new File(System.getProperty("user.home") + "/.megamek/mmconf");
+          if (!homeConfDir.exists()) {
+            homeConfDir.mkdir();
+          }
+          File homeSaveDir = new File(System.getProperty("user.home") + "/.megamek/savegames");
+          if (!homeSaveDir.exists()) {
+            homeSaveDir.mkdir();
+          }
+          File homeLogsDir = new File(System.getProperty("user.home") + "/.megamek/logs");
+          if (!homeLogsDir.exists()) {
+            homeLogsDir.mkdir();
+          }
+        } catch (Exception e) {
+          System.err.println("Unable to create " + System.getProperty("user.home") + "/.megamek directories");
+        }
+        store.setDefault(LOG_DIRECTORY,System.getProperty("user.home") + "/.megamek/logs");
         store.setDefault(MECH_DIRECTORY, store.getDefaultString(DATA_DIRECTORY) + File.separator + "mechfiles");
         store.setDefault(METASERVER_NAME, "http://www.damour.info/cgi-bin/james/metaserver");
         store.setDefault(GOAL_PLAYERS, 2);
diff -ur src.orig/megamek/common/preference/PreferenceManager.java src/megamek/common/preference/PreferenceManager.java
--- src.orig/megamek/common/preference/PreferenceManager.java	2006-09-18 01:20:31.000000000 -0400
+++ src/megamek/common/preference/PreferenceManager.java	2006-09-18 01:27:25.000000000 -0400
@@ -35,7 +35,7 @@
 
 public class PreferenceManager {
 
-    public static final String DEFAULT_CFG_FILE_NAME = "mmconf/clientsettings.xml";
+    public static final String DEFAULT_CFG_FILE_NAME = System.getProperty("user.home") + "/.megamek/mmconf/clientsettings.xml";
     public static final String CFG_FILE_OPTION_NAME = "cfgfilename";
     public static final String ROOT_NODE_NAME = "MegaMekSettings";
     public static final String CLIENT_SETTINGS_STORE_NAME = "ClientSettings";    
diff -ur src.orig/megamek/MegaMek.java src/megamek/MegaMek.java
--- src.orig/megamek/MegaMek.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/MegaMek.java	2006-09-18 01:29:28.000000000 -0400
@@ -361,7 +361,7 @@
 
     public void loadGame() {
         FileDialog fd = new FileDialog(frame, Messages.getString("MegaMek.SaveGameDialog.title"), FileDialog.LOAD); //$NON-NLS-1$
-        fd.setDirectory("savegames"); //$NON-NLS-1$
+        fd.setDirectory(System.getProperty("user.home") + "/.megamek/savegames"); //$NON-NLS-1$
         // limit file-list to savedgames only
         fd.setFilenameFilter(new FilenameFilter() {
             public boolean accept(File dir, String name) {
diff -ur src.orig/megamek/server/Server.java src/megamek/server/Server.java
--- src.orig/megamek/server/Server.java	2006-09-18 01:20:30.000000000 -0400
+++ src/megamek/server/Server.java	2006-09-18 01:30:41.000000000 -0400
@@ -673,7 +673,7 @@
         if (!sFinalFile.endsWith(".sav")) {
             sFinalFile = sFile + ".sav";
         }
-        sFinalFile = "savegames" + File.separator + sFinalFile;
+        sFinalFile = System.getProperty("user.home") + "/.megamek/savegames" + File.separator + sFinalFile;
         File f = new File(sFinalFile);
         try {
             ObjectInputStream ois = new ObjectInputStream(
@@ -699,7 +699,7 @@
             sFinalFile = sFile + ".sav";
         }
         try {
-            File sDir = new File("savegames");
+            File sDir = new File(System.getProperty("user.home") + "/.megamek/savegames");
             if (!sDir.exists()) {
                 sDir.mkdir();
             }


--- NEW FILE MegaMek.spec ---
# camel-case name at the request of the upstream maintainers.
Name:		MegaMek
Version:	0.30.11
Release:	1%{?dist}
Summary:	A portable, network-enabled BattleTech engine

Group:		Amusements/Games
License:	GPL
URL:		http://prdownloads.sourceforge.net/megamek/MegaMek-v0.30.11.zip
Source0:	MegaMek-v0.30.11.zip
# converted from data/images/misc/megamek-icon.gif
Source1:	MegaMek-icon.png
Patch0:		MegaMek-directories.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:		desktop-file-utils
BuildRequires:		java-gcj-compat-devel
Requires(post):		java-gcj-compat
Requires(postun):	java-gcj-compat
Provides:		megamek = %{version}-%{release}

%description
MegaMek is a community effort to implement the Classic BattleTech
rules in an operating-system-agnostic, network-enabled manner.

%prep
%setup -q -c -n MegaMek
%patch0 -p0
# remove included binaries and rebuild everything from source
rm -f MegaMek.exe MegaMek.jar
rm -f lib/TinyXML.jar lib/retroweaver-rt.jar
pushd src
  jar xf ../lib/Ostermiller.jar
  # remove hard-to-build sources that are not required
  rm -f com/Ostermiller/util/*CSV*
  rm -f com/Ostermiller/util/*CGI*
  rm -f com/Ostermiller/util/*Properties*
  rm -r com/Ostermiller/util/*Browser*
  rm -rf META-INF
  jar xf ../lib/PngEncoder.jar
  rm -rf META-INF
  rm -f LICENSE.txt PngEncoderB.html PngEncoder.html
  jar xf ../lib/TabPanel.jar
  rm -rf META-INF gov doc
  rm -f LICENSE README
  mv src/gov .
  rmdir src
  unzip -qq ../lib/tinyXML07-src.zip
  mv sources/*.java .
  mv sources/gd .
  rm -rf classes javadoc
  rmdir sources
  rm -f DevelopmentDiary-TinyXML.txt readme.txt gpl.txt
  jar xf ../lib/collections.jar
  rm -rf META-INF
  rm -f ../lib/collections.jar
  find -name \*.class | xargs rm -f
  rm -f ../lib/Ostermiller.jar ../lib/PngEncoder.jar
  rm -f ../lib/TabPanel.jar ../lib/tinyXML07-src.zip
  find -name .svn | xargs rm -rf
  cp ../l10n/megamek/client/*.properties megamek/client
  cp ../l10n/megamek/client/bot/*.properties megamek/client/bot
  cp ../l10n/megamek/common/*.properties megamek/common
  cp ../l10n/megamek/common/options/*.properties megamek/common/options
popd
find data docs mmconf -name .svn -print0 | xargs -0 rm -rf
find data docs mmconf -type f -print0 | xargs -0 chmod 644
find data docs mmconf -type d -print0 | xargs -0 chmod 755
rm -f mmconf/MegaMek.bat
mv docs/stats.pl .

%build
pushd src
  javac `find -name '*.java'`
  jar cf MegaMek.jar com gd gnu gov keypoint megamek *.class *.java
popd

cat > MegaMek.sh << EOF
#!/bin/sh

cd %{_datadir}/MegaMek
exec java -classpath %{_javadir}/MegaMek.jar megamek.MegaMek
EOF

cat > MegaMek.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=MegaMek
GenericName=A BattleTech engine
Comment=Play MegaMek
Exec=MegaMek
Icon=MegaMek-icon.png
Terminal=false
Type=Application
Categories=Game;BoardGame;
Version=%{version}
EOF

%install
rm -rf $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{_javadir}
install -pm 644 src/MegaMek.jar \
  $RPM_BUILD_ROOT%{_javadir}/MegaMek.jar

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/MegaMek
cp -r data docs mmconf $RPM_BUILD_ROOT%{_datadir}/MegaMek
install -pm 644 readme.txt \
  $RPM_BUILD_ROOT%{_datadir}/MegaMek/readme.txt

install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -pm 755 MegaMek.sh \
  $RPM_BUILD_ROOT%{_bindir}/MegaMek
install -pm 755 stats.pl \
  $RPM_BUILD_ROOT%{_bindir}/MegaMek-stats

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  MegaMek.desktop

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -pm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_datadir}/pixmaps/MegaMek-icon.png

%{_bindir}/aot-compile-rpm

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%files
%defattr(-,root,root,-)
%doc HACKING license.txt readme-German.txt readme.txt
%{_javadir}/MegaMek.jar
%{_datadir}/MegaMek
%{_bindir}/MegaMek
%{_bindir}/MegaMek-stats
%{_datadir}/applications/fedora-MegaMek.desktop
%{_datadir}/pixmaps/MegaMek-icon.png

%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/MegaMek.jar.*

%changelog
* Sat Sep 16 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.30.11-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/MegaMek/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 16:17:50 -0000	1.1
+++ .cvsignore	17 Oct 2006 16:26:11 -0000	1.2
@@ -0,0 +1 @@
+MegaMek-v0.30.11.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/MegaMek/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 16:17:50 -0000	1.1
+++ sources	17 Oct 2006 16:26:11 -0000	1.2
@@ -0,0 +1 @@
+9559f6d138f0b0854991a83cdba79b59  MegaMek-v0.30.11.zip



From fedora-extras-commits at redhat.com  Tue Oct 17 16:34:33 2006
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Tue, 17 Oct 2006 09:34:33 -0700
Subject: owners owners.list,1.1839,1.1840
Message-ID: <200610171634.k9HGYXTO005166@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5135

Modified Files:
	owners.list 
Log Message:
	* MegaMek: New component.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1839
retrieving revision 1.1840
diff -u -r1.1839 -r1.1840
--- owners.list	17 Oct 2006 08:47:19 -0000	1.1839
+++ owners.list	17 Oct 2006 16:34:02 -0000	1.1840
@@ -1019,6 +1019,7 @@
 Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org
+Fedora Extras|MegaMek|A portable, network-enabled BattleTech engine|fitzsim at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|mercator|Terrain library for WorldForge client/server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 16:38:02 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:38:02 -0700
Subject: rpms/R-waveslim/devel R-waveslim.spec,1.3,1.4
Message-ID: <200610171638.k9HGc2s8005255@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-waveslim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5200

Modified Files:
	R-waveslim.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
- Rebuild for R 2.4.0.



Index: R-waveslim.spec
===================================================================
RCS file: /cvs/extras/rpms/R-waveslim/devel/R-waveslim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- R-waveslim.spec	14 Sep 2006 12:56:40 -0000	1.3
+++ R-waveslim.spec	17 Oct 2006 16:37:32 -0000	1.4
@@ -1,18 +1,18 @@
 %define packname waveslim
 
-Summary:	R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
-Name:		R-%{packname}
-Version: 	1.5
-Release: 	4%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-URL:		http://www.image.ucar.edu/staff/whitcher/
+Summary: R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
+Name: R-%{packname}
+Version: 1.5
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+URL: http://www.image.ucar.edu/staff/whitcher/
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.9.0
-BuildRequires:	R >= 1.9.0, tetex-latex, gcc-gfortran
+Requires: R >= 1.9.0
+BuildRequires: R >= 1.9.0, tetex-latex, gcc-gfortran
 
 
 %description
@@ -54,6 +54,9 @@
 %doc DESCRIPTION
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
+- Rebuild for R 2.4.0.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-4
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 16:39:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:39:34 -0700
Subject: rpms/R-waveslim/FC-5 R-waveslim.spec,1.2,1.3
Message-ID: <200610171639.k9HGdYY4005320@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-waveslim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5304

Modified Files:
	R-waveslim.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
- Rebuild for R 2.4.0.



Index: R-waveslim.spec
===================================================================
RCS file: /cvs/extras/rpms/R-waveslim/FC-5/R-waveslim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-waveslim.spec	4 Jun 2006 22:07:59 -0000	1.2
+++ R-waveslim.spec	17 Oct 2006 16:39:03 -0000	1.3
@@ -1,18 +1,18 @@
 %define packname waveslim
 
-Summary:	R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
-Name:		R-%{packname}
-Version: 	1.5
-Release: 	3%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-URL:		http://www.image.ucar.edu/staff/whitcher/
+Summary: R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
+Name: R-%{packname}
+Version: 1.5
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+URL: http://www.image.ucar.edu/staff/whitcher/
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.9.0
-BuildRequires:	R >= 1.9.0, tetex-latex, gcc-gfortran
+Requires: R >= 1.9.0
+BuildRequires: R >= 1.9.0, tetex-latex, gcc-gfortran
 
 
 %description
@@ -54,11 +54,17 @@
 %doc DESCRIPTION
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.5-3
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-4
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-3
 - Rebuild for R-2.3.x
 
-* Wed Mar 08 2006 Jos?? Matos <jamatos at fc.up.pt> 1.5-2
+* Wed Mar 08 2006 Jos?? Matos <jamatos[AT]fc.up.pt> 1.5-2
 - Rename License to GPL only, add gfortran as BR, add DESCRIPTION to %%doc
 
-* Fri Mar 03 2006 Jos?? Matos <jamatos at fc.up.pt> 1.5-1
+* Fri Mar 03 2006 Jos?? Matos <jamatos[AT]fc.up.pt> 1.5-1
 - Initial package creation



From fedora-extras-commits at redhat.com  Tue Oct 17 16:41:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:41:23 -0700
Subject: rpms/R-waveslim/FC-4 R-waveslim.spec,1.2,1.3
Message-ID: <200610171641.k9HGfNX0005397@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-waveslim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5381

Modified Files:
	R-waveslim.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
- Rebuild for R 2.4.0.



Index: R-waveslim.spec
===================================================================
RCS file: /cvs/extras/rpms/R-waveslim/FC-4/R-waveslim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-waveslim.spec	4 Jun 2006 22:08:33 -0000	1.2
+++ R-waveslim.spec	17 Oct 2006 16:40:53 -0000	1.3
@@ -1,18 +1,18 @@
 %define packname waveslim
 
-Summary:	R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
-Name:		R-%{packname}
-Version: 	1.5
-Release: 	3%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-URL:		http://www.image.ucar.edu/staff/whitcher/
+Summary: R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing
+Name: R-%{packname}
+Version: 1.5
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+URL: http://www.image.ucar.edu/staff/whitcher/
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.9.0
-BuildRequires:	R >= 1.9.0, tetex-latex, gcc-gfortran
+Requires: R >= 1.9.0
+BuildRequires: R >= 1.9.0, tetex-latex, gcc-gfortran
 
 
 %description
@@ -54,11 +54,17 @@
 %doc DESCRIPTION
 
 %changelog
-* Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.5-3
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-5
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-4
+- Rebuild for FC6.
+
+* Sun Jun  4 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5-3
 - Rebuild for R-2.3.x
 
-* Wed Mar 08 2006 Jos?? Matos <jamatos at fc.up.pt> 1.5-2
+* Wed Mar 08 2006 Jos?? Matos <jamatos[AT]fc.up.pt> 1.5-2
 - Rename License to GPL only, add gfortran as BR, add DESCRIPTION to %%doc
 
-* Fri Mar 03 2006 Jos?? Matos <jamatos at fc.up.pt> 1.5-1
+* Fri Mar 03 2006 Jos?? Matos <jamatos[AT]fc.up.pt> 1.5-1
 - Initial package creation



From fedora-extras-commits at redhat.com  Tue Oct 17 16:44:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:44:46 -0700
Subject: rpms/R-wavethresh/devel R-wavethresh.spec,1.3,1.4
Message-ID: <200610171644.k9HGikQv005492@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-wavethresh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5469

Modified Files:
	R-wavethresh.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
- Rebuild for R 2.4.0.



Index: R-wavethresh.spec
===================================================================
RCS file: /cvs/extras/rpms/R-wavethresh/devel/R-wavethresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- R-wavethresh.spec	14 Sep 2006 13:07:24 -0000	1.3
+++ R-wavethresh.spec	17 Oct 2006 16:44:16 -0000	1.4
@@ -1,19 +1,19 @@
 %define packrel  9
 %define packname wavethresh
 
-Summary:	R module, Software to perform wavelet statistics and transforms
-Name:		R-%{packname}
-Version: 	2.2
-Release: 	4%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
-URL:		http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
+Summary: R module, Software to perform wavelet statistics and transforms
+Name: R-%{packname}
+Version: 2.2
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
+URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.4
-BuildRequires:	R >= 1.4, tetex-latex
+Requires: R >= 2.1
+BuildRequires: R >= 2.1, tetex-latex
 
 
 %description
@@ -48,6 +48,9 @@
 %doc DESCRIPTION
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
+- Rebuild for R 2.4.0.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos at fc.up.pt> - 2.2-4
 - New upstream version 2.2-9.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 16:46:09 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:46:09 -0700
Subject: rpms/R-wavethresh/FC-5 R-wavethresh.spec,1.3,1.4
Message-ID: <200610171646.k9HGk96u005575@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-wavethresh/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5538

Modified Files:
	R-wavethresh.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
- Rebuild for R 2.4.0.



Index: R-wavethresh.spec
===================================================================
RCS file: /cvs/extras/rpms/R-wavethresh/FC-5/R-wavethresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- R-wavethresh.spec	14 Sep 2006 13:08:27 -0000	1.3
+++ R-wavethresh.spec	17 Oct 2006 16:45:39 -0000	1.4
@@ -1,19 +1,19 @@
 %define packrel  9
 %define packname wavethresh
 
-Summary:	R module, Software to perform wavelet statistics and transforms
-Name:		R-%{packname}
-Version: 	2.2
-Release: 	4%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
-URL:		http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
+Summary: R module, Software to perform wavelet statistics and transforms
+Name: R-%{packname}
+Version: 2.2
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
+URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.4
-BuildRequires:	R >= 1.4, tetex-latex
+Requires: R >= 2.1
+BuildRequires: R >= 2.1, tetex-latex
 
 
 %description
@@ -48,6 +48,9 @@
 %doc DESCRIPTION
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
+- Rebuild for R 2.4.0.
+
 * Thu Sep 14 2006 Jos?? Matos <jamatos at fc.up.pt> - 2.2-4
 - New upstream version 2.2-9.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 16:47:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 17 Oct 2006 09:47:17 -0700
Subject: rpms/R-wavethresh/FC-4 R-wavethresh.spec,1.2,1.3
Message-ID: <200610171647.k9HGlHOv005664@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/R-wavethresh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5634

Modified Files:
	R-wavethresh.spec 
Log Message:
* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
- Rebuild for R 2.4.0.



Index: R-wavethresh.spec
===================================================================
RCS file: /cvs/extras/rpms/R-wavethresh/FC-4/R-wavethresh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-wavethresh.spec	4 Jun 2006 22:15:30 -0000	1.2
+++ R-wavethresh.spec	17 Oct 2006 16:46:47 -0000	1.3
@@ -1,19 +1,19 @@
-%define packrel  8
+%define packrel  9
 %define packname wavethresh
 
-Summary:	R module, Software to perform wavelet statistics and transforms
-Name:		R-%{packname}
-Version: 	2.2
-Release: 	3%{?dist}
-License:	GPL
-Group:		Applications/Engineering
-Source0:	ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
-URL:		http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
+Summary: R module, Software to perform wavelet statistics and transforms
+Name: R-%{packname}
+Version: 2.2
+Release: 5%{?dist}
+License: GPL
+Group: Applications/Engineering
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
+URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	R >= 1.4
-BuildRequires:	R >= 1.4, tetex-latex
+Requires: R >= 2.1
+BuildRequires: R >= 2.1, tetex-latex
 
 
 %description
@@ -48,6 +48,12 @@
 %doc DESCRIPTION
 
 %changelog
+* Tue Oct 17 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 2.2-5
+- Rebuild for R 2.4.0.
+
+* Thu Sep 14 2006 Jos?? Matos <jamatos at fc.up.pt> - 2.2-4
+- New upstream version 2.2-9.
+
 * Sun Jun  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 2.2-3
 - Rebuild for R-2.3.x
 



From fedora-extras-commits at redhat.com  Tue Oct 17 17:16:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:16:40 -0700
Subject: rpms/wallpapoz - New directory
Message-ID: <200610171716.k9HHGeYu009045@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9041/wallpapoz

Log Message:
Directory /cvs/extras/rpms/wallpapoz added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 17:16:45 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:16:45 -0700
Subject: rpms/wallpapoz/devel - New directory
Message-ID: <200610171716.k9HHGj7v009061@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9041/wallpapoz/devel

Log Message:
Directory /cvs/extras/rpms/wallpapoz/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 17:17:00 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:17:00 -0700
Subject: rpms/wallpapoz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610171717.k9HHH0Ys009092@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9086

Added Files:
	Makefile import.log 
Log Message:
Setup of module wallpapoz


--- NEW FILE Makefile ---
# Top level Makefile for module wallpapoz
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 17:17:06 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:17:06 -0700
Subject: rpms/wallpapoz/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610171717.k9HHH6G0009110@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9086/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wallpapoz


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 17:18:03 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:18:03 -0700
Subject: rpms/wallpapoz import.log,1.1,1.2
Message-ID: <200610171718.k9HHI36N009192@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9155

Modified Files:
	import.log 
Log Message:
auto-import wallpapoz-0.3-1 on branch devel from wallpapoz-0.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 17:17:00 -0000	1.1
+++ import.log	17 Oct 2006 17:17:33 -0000	1.2
@@ -0,0 +1 @@
+wallpapoz-0_3-1:HEAD:wallpapoz-0.3-1.src.rpm:1161105448



From fedora-extras-commits at redhat.com  Tue Oct 17 17:18:04 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:18:04 -0700
Subject: rpms/wallpapoz/devel wallpapoz.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610171718.k9HHI4vm009196@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9155/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wallpapoz.spec 
Log Message:
auto-import wallpapoz-0.3-1 on branch devel from wallpapoz-0.3-1.src.rpm


--- NEW FILE wallpapoz.spec ---
%define         srcurl          http://wallpapoz.akbarhome.com/
%define         icondir         %{_datadir}/icons/hicolor/128x128/apps

Name:           wallpapoz
Version:        0.3
Release:        1%{?dist}
Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool

Group:          User Interface/Desktops
License:        GPL
URL:            %{srcurl}
Source0:        %{srcurl}files/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  desktop-file-utils
Requires:       pygtk2-libglade

%description
This tool enables your Gnome desktop to have different 
wallpapers for different workspaces or virtual desktops.

%prep
%setup -q

%build
# some directory change
for f in src/*wall*.py ; do
   %{__sed} -i.dir \
      -e '/import sys/d' \
      -e '/xml_processing/s|^\(.*\)$|import sys\nsys.path.insert(0, %{_datadir}/%{name})\n\1|' \
      $f
   %{__sed} -i -e "s|%{_datadir}/%{name}|'%{_datadir}/%{name}'|" \
      $f
done

%{__sed} -i.dir \
   -e 's|-f daemon_wallpapoz.py|-f %{_bindir}/daemon_wallpapoz|g' \
   -e 's|\./daemon_wallpapoz.py\&|%{_bindir}/daemon_wallpapoz \&|' \
   src/wallpapoz.py

%{__sed} -i.rpmlint -e '1,3d' src/*processing.py

%{__sed} -i.dir \
   -e 's|Icon=.*|Icon=%{name}|' \
   -e 's|Exec=.*|Exec=%{name}|' \
   share/%{name}/%{name}.desktop

%install
%{__rm} -rf $RPM_BUILD_ROOT

# install by myself

for dir in %{_bindir} %{_datadir}/{applications,%{name},pixmaps} %{icondir} ; do
   %{__mkdir_p} $RPM_BUILD_ROOT$dir
done

for f in src/*%{name}.py ; do
   name=`basename $f | sed -e 's|.py$||'`
   %{__install} -c -p -m755 $f $RPM_BUILD_ROOT%{_bindir}/$name
done
%{__install} -c -p -m644 src/*processing.py $RPM_BUILD_ROOT%{_datadir}/%{name}/

pushd share/%{name}
%{__install} -c -p -m644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__install} -c -p -m644 %{name}.glade* $RPM_BUILD_ROOT%{_datadir}/%{name}/

desktop-file-install \
   --vendor fedora \
   --add-category Application \
   --add-category X-Fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{name}.desktop
popd

ln -sf ../../../../%{name}/%{name}.png $RPM_BUILD_ROOT%{icondir}

%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 AUTHORS COPYING NEWS README
%{_bindir}/*%{name}

%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*processing.py*
%{_datadir}/%{name}/%{name}.glade*
%{_datadir}/%{name}/%{name}.png

%{icondir}/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop

%changelog
* Thu Oct 12 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-1
- Initial packaging, importing to Fedora extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 17:17:06 -0000	1.1
+++ .cvsignore	17 Oct 2006 17:17:34 -0000	1.2
@@ -0,0 +1 @@
+wallpapoz-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 17:17:06 -0000	1.1
+++ sources	17 Oct 2006 17:17:34 -0000	1.2
@@ -0,0 +1 @@
+7b3c2189f24f3cee48acb4085944b7c4  wallpapoz-0.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 17 17:20:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:20:40 -0700
Subject: owners owners.list,1.1840,1.1841
Message-ID: <200610171720.k9HHKeVd009309@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9282

Modified Files:
	owners.list 
Log Message:
add wallpapoz to owners.list


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1840
retrieving revision 1.1841
diff -u -r1.1840 -r1.1841
--- owners.list	17 Oct 2006 16:34:02 -0000	1.1840
+++ owners.list	17 Oct 2006 17:20:09 -0000	1.1841
@@ -2272,6 +2272,7 @@
 Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|wallpapoz|Gnome Multi Backgrounds and Wallpapers Configuration Tool|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wavpack|A completely open audiocodec|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 17:27:33 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Tue, 17 Oct 2006 10:27:33 -0700
Subject: rpms/scanbuttond/devel scanbuttond.init, 1.2, 1.3 scanbuttond.spec, 
	1.2, 1.3
Message-ID: <200610171727.k9HHRXkJ009384@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/scanbuttond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9366/devel

Modified Files:
	scanbuttond.init scanbuttond.spec 
Log Message:
auto-import scanbuttond-0.2.3-9 on branch devel from scanbuttond-0.2.3-9.src.rpm


Index: scanbuttond.init
===================================================================
RCS file: /cvs/extras/rpms/scanbuttond/devel/scanbuttond.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scanbuttond.init	16 Oct 2006 16:07:55 -0000	1.2
+++ scanbuttond.init	17 Oct 2006 17:27:03 -0000	1.3
@@ -5,7 +5,8 @@
 # chkconfig: - 98 54
 # description: scanbuttond is a small daemon which checks for supported scanners \
 #              when attached to system, it loads that respective backend so that \
-#              buttons on that scanners gets activated for their functionings.
+#              buttons on that scanners gets activated for their functionings defined \
+#              in /etc/scanbuttond/buttonpressed.sh file.
 # processname: scanbuttond
 # config: /etc/scanbuttond
 


Index: scanbuttond.spec
===================================================================
RCS file: /cvs/extras/rpms/scanbuttond/devel/scanbuttond.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scanbuttond.spec	16 Oct 2006 16:07:55 -0000	1.2
+++ scanbuttond.spec	17 Oct 2006 17:27:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:            scanbuttond
 Version:         0.2.3
-Release:         8%{?dist}
+Release:         9%{?dist}
 Summary:         Scanner Button tools to SANE
 
 Group:           System Environment/Libraries
@@ -77,6 +77,10 @@
 
 
 %changelog
+* Mon Oct 16 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-9
+- Got CVS tagging problem as usual to me
+- so increasing release number
+
 * Mon Oct 16 2006 Parag Nemade <panemade at gmail.com>- 0.2.3-8
 - corrected scanbuttond.init which i hacked from lisa daemon 
 



From fedora-extras-commits at redhat.com  Tue Oct 17 17:32:51 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 17 Oct 2006 10:32:51 -0700
Subject: comps comps-fe6.xml.in,1.191,1.192
Message-ID: <200610171732.k9HHWp1F009552@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9535

Modified Files:
	comps-fe6.xml.in 
Log Message:
add wallpapoz to fe6.xml.in


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- comps-fe6.xml.in	16 Oct 2006 23:55:32 -0000	1.191
+++ comps-fe6.xml.in	17 Oct 2006 17:32:20 -0000	1.192
@@ -475,6 +475,7 @@
       <packagereq type="optional">smeg</packagereq>
       <packagereq type="optional">themes-backgrounds-gnome</packagereq>
       <packagereq type="optional">verbiste-gnome</packagereq>
+      <packagereq type="optional">wallpapoz</packagereq>
       <packagereq type="optional">wp_tray</packagereq>
       <packagereq type="optional">xscreensaver-extras-gss</packagereq>
       <packagereq type="optional">xscreensaver-gl-extras-gss</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 17 17:39:42 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 10:39:42 -0700
Subject: owners owners.list,1.1841,1.1842
Message-ID: <200610171739.k9HHdgrv009730@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9683

Modified Files:
	owners.list 
Log Message:
add libctl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1841
retrieving revision 1.1842
diff -u -r1.1841 -r1.1842
--- owners.list	17 Oct 2006 17:20:09 -0000	1.1841
+++ owners.list	17 Oct 2006 17:39:12 -0000	1.1842
@@ -838,6 +838,7 @@
 Fedora Extras|libbinio|A binary stream interface class library for C++|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libburn|Library for reading, mastering and writing optical discs|jkeating at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|libctl|Guile-based support for flexible control files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|libchmxx|C++ bindings for chmlib|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 17 17:52:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Oct 2006 10:52:33 -0700
Subject: comps comps-fe5.xml.in,1.170,1.171
Message-ID: <200610171752.k9HHqX8d009799@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9783

Modified Files:
	comps-fe5.xml.in 
Log Message:
Add vdr.


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- comps-fe5.xml.in	16 Oct 2006 23:55:32 -0000	1.170
+++ comps-fe5.xml.in	17 Oct 2006 17:52:03 -0000	1.171
@@ -773,6 +773,7 @@
       <packagereq type="optional">tagtool</packagereq>
       <packagereq type="optional">tclabc</packagereq>
       <packagereq type="optional">ushare</packagereq>
+      <packagereq type="optional">vdr</packagereq>
       <packagereq type="optional">xmms</packagereq>
       <packagereq type="optional">xmms-cdread</packagereq>
       <packagereq type="optional">xmms-flac</packagereq>



From fedora-extras-commits at redhat.com  Tue Oct 17 18:13:51 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 17 Oct 2006 11:13:51 -0700
Subject: fedora-security/audit fc5,1.360,1.361 fc6,1.114,1.115
Message-ID: <200610171813.k9HIDpRC012830@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12810/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-4342



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- fc5	17 Oct 2006 14:49:34 -0000	1.360
+++ fc5	17 Oct 2006 18:13:49 -0000	1.361
@@ -70,6 +70,7 @@
 CVE-2006-4434 ignore (sendmail, fixed 8.13.8) not exploitable
 CVE-2006-4380 version (mysql, fixed 4.1.13)
 CVE-2006-4343 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
+CVE-2006-4342 ignore (kernel) rhel3 only
 CVE-2006-4340 version (nss, fixed 3.11.3) [since FEDORA-2006-979]
 CVE-2006-4339 backport (openssl) [since FEDORA-2006-953]
 CVE-2006-4339 backport (openssl097a) [since FEDORA-2006-953]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fc6	15 Oct 2006 14:05:49 -0000	1.114
+++ fc6	17 Oct 2006 18:13:49 -0000	1.115
@@ -61,6 +61,7 @@
 CVE-2006-4433 version (php, fixed 5.1.4)
 CVE-2006-4380 version (mysql, fixed 4.1.13)
 CVE-2006-4343 backport (openssl, fixed 0.9.8d)
+CVE-2006-4342 ignore (kernel) rhel3 only
 CVE-2006-4340 version (nss, fixed 3.11.3)
 CVE-2006-4339 backport (openssl, fixed 0.9.8c)
 CVE-2006-4339 backport (openssl097)



From fedora-extras-commits at redhat.com  Tue Oct 17 18:31:51 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 17 Oct 2006 11:31:51 -0700
Subject: rpms/git/devel .cvsignore, 1.33, 1.34 git.spec, 1.22, 1.23 sources, 
	1.33, 1.34
Message-ID: <200610171831.k9HIVpHQ012927@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12907

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Oct 2006 05:02:54 -0000	1.33
+++ .cvsignore	17 Oct 2006 18:31:21 -0000	1.34
@@ -1 +1 @@
-git-1.4.2.3.tar.gz
+git-1.4.2.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- git.spec	5 Oct 2006 05:02:54 -0000	1.22
+++ git.spec	17 Oct 2006 18:31:21 -0000	1.23
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.3
+Version: 	1.4.2.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
+- git-1.4.2.4
+
 * Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
 - git-1.4.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Oct 2006 05:02:54 -0000	1.33
+++ sources	17 Oct 2006 18:31:21 -0000	1.34
@@ -1 +1 @@
-3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz
+285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 19:06:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Oct 2006 12:06:49 -0700
Subject: rpms/tagtool/devel tagtool-genre.patch, NONE, 1.1 tagtool.spec, 1.7,
	1.8
Message-ID: <200610171906.k9HJ6n9f016197@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/tagtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16159

Modified Files:
	tagtool.spec 
Added Files:
	tagtool-genre.patch 
Log Message:
* Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-9
- Add patch to fix genre ui bug. (#211145)


tagtool-genre.patch:

--- NEW FILE tagtool-genre.patch ---
diff -ur tagtool-0.12.2.OLD/src/tagtool.glade tagtool-0.12.2/src/tagtool.glade
--- tagtool-0.12.2.OLD/src/tagtool.glade	2005-05-26 11:12:54.000000000 -0400
+++ tagtool-0.12.2/src/tagtool.glade	2006-10-17 14:31:22.000000000 -0400
@@ -2797,7 +2797,7 @@
 					      <child>
 						<widget class="GtkCombo" id="combo_vor_genre">
 						  <property name="visible">True</property>
-						  <property name="value_in_list">True</property>
+						  <property name="value_in_list">False</property>
 						  <property name="allow_empty">True</property>
 						  <property name="case_sensitive">False</property>
 						  <property name="enable_arrow_keys">True</property>


Index: tagtool.spec
===================================================================
RCS file: /cvs/extras/rpms/tagtool/devel/tagtool.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tagtool.spec	31 Aug 2006 22:15:48 -0000	1.7
+++ tagtool.spec	17 Oct 2006 19:06:19 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		tagtool
 Version:	0.12.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Ogg Vorbis and MP3 tag manager
 
 Group:		Applications/Multimedia
@@ -8,6 +8,7 @@
 URL:		http://pwp.netcabo.pt/paol/tagtool/
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:		%{name}-contents.patch
+Patch2:		%{name}-genre.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libglade2-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch2 -p1 -b .genre
 %patch1 -p1 -b .contents
 
 
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-9
+- Add patch to fix genre ui bug. (#211145)
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-8
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Tue Oct 17 19:07:27 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 17 Oct 2006 12:07:27 -0700
Subject: rpms/yadex/FC-5 yadex.spec,1.2,1.3
Message-ID: <200610171907.k9HJ7RBG016282@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16191/FC-5

Modified Files:
	yadex.spec 
Log Message:
Add ownership of extra directory




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/FC-5/yadex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yadex.spec	10 Apr 2006 15:35:56 -0000	1.2
+++ yadex.spec	17 Oct 2006 19:06:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -92,6 +92,7 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}-%{version}
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/%{version}
 %config(noreplace) %{_sysconfdir}/%{name}/%{version}/%{name}.cfg
 %{_datadir}/%{name}
 %{_mandir}/man6/*
@@ -101,6 +102,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Wart <wart at kobold.org> 1.7.0-5
+- Own an extra directory
+
 * Mon Apr 10 2006 Wart <wart at kobold.org> 1.7.0-4
 - Update for modular x.org
 



From fedora-extras-commits at redhat.com  Tue Oct 17 19:07:27 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 17 Oct 2006 12:07:27 -0700
Subject: rpms/yadex/devel yadex.spec,1.3,1.4
Message-ID: <200610171907.k9HJ7RG4016285@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16191/devel

Modified Files:
	yadex.spec 
Log Message:
Add ownership of extra directory




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/yadex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yadex.spec	28 Aug 2006 03:38:00 -0000	1.3
+++ yadex.spec	17 Oct 2006 19:06:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -90,6 +90,7 @@
 %{_bindir}/%{name}
 %{_bindir}/%{name}-%{version}
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/%{version}
 %config(noreplace) %{_sysconfdir}/%{name}/%{version}/%{name}.cfg
 %{_datadir}/%{name}
 %{_mandir}/man6/*
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Wart <wart at kobold.org> 1.7.0-6
+- Own an extra directory
+
 * Sun Aug 27 2006 Wart <wart at kobold.org> 1.7.0-5
 - Rebuild for FC-6
 



From fedora-extras-commits at redhat.com  Tue Oct 17 19:08:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Oct 2006 12:08:48 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.8,1.9
Message-ID: <200610171908.k9HJ8m5q016315@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Oct 17 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.18-1.2798.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- em8300-kmod.spec	8 Oct 2006 16:29:57 -0000	1.8
+++ em8300-kmod.spec	17 Oct 2006 19:08:18 -0000	1.9
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2747.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.18-1.2798.fc6.
+
 * Sun Oct  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
 - Don't use <linux/config.h>.
 - Build for kernel 2.6.18-1.2747.fc6.



From fedora-extras-commits at redhat.com  Tue Oct 17 19:15:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Oct 2006 12:15:27 -0700
Subject: fedora-security/audit fe3,1.21,1.22 fe4,1.79,1.80 fe5,1.86,1.87
Message-ID: <200610171915.k9HJFRAd016487@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16465

Modified Files:
	fe3 fe4 fe5 
Log Message:
Add clamav CVE ids.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fe3	16 Oct 2006 18:14:43 -0000	1.21
+++ fe3	17 Oct 2006 19:15:24 -0000	1.22
@@ -2,11 +2,12 @@
 
 ** are items that need attention
 
-CVE-????-???? VULNERABLE (clamav) #210973
+CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
+CVE-2006-4182 VULNERABLE (clamav) #210973
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-3) #200545
 CVE-2006-3816 version (krusader, fixed 1.70.1) #200323


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- fe4	16 Oct 2006 18:14:43 -0000	1.79
+++ fe4	17 Oct 2006 19:15:24 -0000	1.80
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-????-???? VULNERABLE (clamav) #210973
+CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -28,6 +28,7 @@
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
+CVE-2006-4182 VULNERABLE (clamav) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-4) #200545


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- fe5	16 Oct 2006 18:14:43 -0000	1.86
+++ fe5	17 Oct 2006 19:15:24 -0000	1.87
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-????-???? VULNERABLE (clamav) #210973
+CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -28,6 +28,7 @@
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
+CVE-2006-4182 VULNERABLE (clamav) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-5) #200545



From fedora-extras-commits at redhat.com  Tue Oct 17 19:17:59 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Oct 2006 12:17:59 -0700
Subject: rpms/tagtool/FC-5 tagtool-genre.patch, NONE, 1.1 tagtool.spec, 1.6,
	1.7
Message-ID: <200610171917.k9HJHxaF016539@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/tagtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16519

Modified Files:
	tagtool.spec 
Added Files:
	tagtool-genre.patch 
Log Message:
* Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-7
- Add patch to fix genre ui bug. (#211145)


tagtool-genre.patch:

--- NEW FILE tagtool-genre.patch ---
diff -ur tagtool-0.12.2.OLD/src/tagtool.glade tagtool-0.12.2/src/tagtool.glade
--- tagtool-0.12.2.OLD/src/tagtool.glade	2005-05-26 11:12:54.000000000 -0400
+++ tagtool-0.12.2/src/tagtool.glade	2006-10-17 14:31:22.000000000 -0400
@@ -2797,7 +2797,7 @@
 					      <child>
 						<widget class="GtkCombo" id="combo_vor_genre">
 						  <property name="visible">True</property>
-						  <property name="value_in_list">True</property>
+						  <property name="value_in_list">False</property>
 						  <property name="allow_empty">True</property>
 						  <property name="case_sensitive">False</property>
 						  <property name="enable_arrow_keys">True</property>


Index: tagtool.spec
===================================================================
RCS file: /cvs/extras/rpms/tagtool/FC-5/tagtool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tagtool.spec	23 Jun 2006 14:31:01 -0000	1.6
+++ tagtool.spec	17 Oct 2006 19:17:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		tagtool
 Version:	0.12.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Ogg Vorbis and MP3 tag manager
 
 Group:		Applications/Multimedia
@@ -8,6 +8,7 @@
 URL:		http://pwp.netcabo.pt/paol/tagtool/
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:		%{name}-contents.patch
+Patch2:		%{name}-genre.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libglade2-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch2 -p1 -b .genre
 %patch1 -p1 -b .contents
 
 
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-7
+- Add patch to fix genre ui bug. (#211145)
+
 * Fri Jun 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-6
 - Add BR for perl(XML::Parser).
 



From fedora-extras-commits at redhat.com  Tue Oct 17 19:54:51 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 17 Oct 2006 12:54:51 -0700
Subject: rpms/ghdl/FC-5 ghdl-svn73.patch, NONE, 1.1 ghdl.spec, 1.17,
	1.18 ghdl-svn61.patch, 1.1, NONE
Message-ID: <200610171954.k9HJspte016806@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16785

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn73.patch 
Removed Files:
	ghdl-svn61.patch 
Log Message:
update to svn73


ghdl-svn73.patch:

--- NEW FILE ghdl-svn73.patch ---
diff -urN ghdl-0.25/vhdl/back_end.ads ghdl-0.26dev/vhdl/back_end.ads
--- ghdl-0.25/vhdl/back_end.ads	2005-09-22 23:07:25.000000000 +0200
+++ ghdl-0.26dev/vhdl/back_end.ads	2006-10-05 11:35:25.000000000 +0200
@@ -29,6 +29,14 @@
    Library_To_File_Name : Library_To_File_Name_Acc :=
      Default_Library_To_File_Name'Access;
 
+   --  Back-end options.
+   type Parse_Option_Acc is access function (Opt : String) return Boolean;
+   Parse_Option : Parse_Option_Acc := null;
+
+   --  Disp back-end option help.
+   type Disp_Option_Acc is access procedure;
+   Disp_Option : Disp_Option_Acc := null;
+
    --  UNIT is a design unit from parse.
    --  According to the current back-end, do what is necessary.
    --
@@ -46,8 +54,5 @@
    --  May be NULL for no additionnal checks.
    type Sem_Foreign_Acc is access procedure (Decl : Iir);
    Sem_Foreign : Sem_Foreign_Acc := null;
-
-   --procedure Finish_Compilation
-   --  (Unit : Iir_Design_Unit; Main : Boolean := False);
 end Back_End;
 
diff -urN ghdl-0.25/vhdl/bug.adb ghdl-0.26dev/vhdl/bug.adb
--- ghdl-0.25/vhdl/bug.adb	2005-11-18 02:34:12.000000000 +0100
+++ ghdl-0.26dev/vhdl/bug.adb	2006-10-05 11:35:25.000000000 +0200
@@ -70,7 +70,7 @@
       Put_Line
         (Standard_Error,
          "Please report this bug on http://gna.org/projects/ghdl");
-      Put_Line (Standard_Error, "GHDL version: " & Ghdl_Version);
+      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "In directory: " &
                 GNAT.Directory_Operations.Get_Current_Dir);
diff -urN ghdl-0.25/vhdl/canon.adb ghdl-0.26dev/vhdl/canon.adb
--- ghdl-0.25/vhdl/canon.adb	2006-07-29 06:42:30.000000000 +0200
+++ ghdl-0.26dev/vhdl/canon.adb	2006-10-05 11:35:25.000000000 +0200
@@ -847,22 +847,6 @@
       end loop;
    end Canon_Sequential_Stmts;
 
-   procedure Add_Driver_For_Signal (Driver_List : Iir_List;
-                                    Signal : Iir)
-   is
-      Choice : Iir;
-   begin
-      if Get_Kind (Signal) = Iir_Kind_Aggregate then
-         Choice := Get_Association_Choices_Chain (Signal);
-         while Choice /= Null_Iir loop
-            Add_Driver_For_Signal (Driver_List, Get_Associated (Choice));
-            Choice := Get_Chain (Choice);
-         end loop;
-      else
-         Add_Element (Driver_List, Get_Longuest_Static_Prefix (Signal));
-      end if;
-   end Add_Driver_For_Signal;
-
    -- Create a statement transform from concurrent_signal_assignment
    -- statement STMT (either selected or conditional).
    -- waveform transformation is not done.
@@ -895,9 +879,6 @@
       --      reserved word POSTPONED.
       Set_Postponed_Flag (Proc, Get_Postponed_Flag (Proc));
 
-      Set_Driver_List (Proc, Create_Iir_List);
-      Add_Driver_For_Signal (Get_Driver_List (Proc), Get_Target (Stmt));
-
       Canon_Extract_Sensitivity (Get_Target (Stmt), Sensitivity_List, True);
 
       if Canon_Flag_Expressions then
@@ -966,7 +947,6 @@
       Assoc_Chain : Iir;
       Assoc : Iir;
       Imp : Iir;
-      Driver_List : Iir_Driver_List;
       Inter : Iir;
       Sensitivity_List : Iir_List;
       Is_Sensitized : Boolean;
@@ -1014,7 +994,6 @@
          Get_Parameter_Association_Chain (Call),
          Call);
       Set_Parameter_Association_Chain (Call, Assoc_Chain);
-      Driver_List := Null_Iir_List;
       Assoc := Assoc_Chain;
 
       --  LRM93 9.3
@@ -1034,18 +1013,6 @@
                   Canon_Extract_Sensitivity
                     (Get_Actual (Assoc), Sensitivity_List, False);
                end if;
-               --  LRM 2.1.1.2 Signal Parameters
-               if Get_Kind (Inter) = Iir_Kind_Signal_Interface_Declaration
-                 and then Get_Mode (Inter) in Iir_Out_Modes
-               then
-                  if Driver_List = Null_Iir_List then
-                     Driver_List := Create_Iir_List;
-                     Set_Driver_List (Proc, Driver_List);
-                  end if;
-                  Add_Element
-                    (Driver_List,
-                     Get_Longuest_Static_Prefix (Get_Actual (Assoc)));
-               end if;
             when Iir_Kind_Association_Element_Open
               | Iir_Kind_Association_Element_By_Individual =>
                null;
diff -urN ghdl-0.25/vhdl/disp_tree.adb ghdl-0.26dev/vhdl/disp_tree.adb
--- ghdl-0.25/vhdl/disp_tree.adb	2005-10-26 14:31:21.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_tree.adb	2006-10-05 11:35:25.000000000 +0200
@@ -1023,8 +1023,6 @@
             Disp_Depth (Get_Subprogram_Depth (Tree));
             Header ("subprogram_body:");
             Disp_Tree_Flat (Get_Subprogram_Body (Tree), Ntab);
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("attribute_value_chain:");
             Disp_Tree_Flat_Chain (Get_Attribute_Value_Chain (Tree), Ntab);
          when Iir_Kind_Procedure_Body
@@ -1423,8 +1421,6 @@
                Header ("sensivity list:");
                Disp_Tree_List (Get_Sensitivity_List (Tree), Ntab, True);
             end if;
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("declaration_chain:");
             Disp_Tree_Chain (Get_Declaration_Chain (Tree), Ntab);
             Header ("process statements:");
diff -urN ghdl-0.25/vhdl/disp_vhdl.adb ghdl-0.26dev/vhdl/disp_vhdl.adb
--- ghdl-0.25/vhdl/disp_vhdl.adb	2006-07-09 03:55:28.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_vhdl.adb	2006-10-05 11:35:25.000000000 +0200
@@ -893,25 +893,6 @@
       Put_Line (";");
    end Disp_Object_Declaration;
 
-   procedure Disp_Driver_List (List: Iir_Driver_List; Indent : Count)
-   is
-      El: Iir;
-   begin
-      if List = Null_Iir_List or else Get_Nbr_Elements (List) = 0 then
-         return;
-      end if;
-      Set_Col (Indent);
-      Put_Line ("-- drivers needed for signals:");
-      for I in Natural loop
-         El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
-         Set_Col (Indent);
-         Put ("--   ");
-         Disp_Expression (El);
-         New_Line;
-      end loop;
-   end Disp_Driver_List;
-
    procedure Disp_Subprogram_Declaration (Subprg: Iir)
    is
       Indent: Count;
@@ -943,10 +924,6 @@
          when others =>
             raise Internal_Error;
       end case;
-
-      if Get_Kind (Subprg) = Iir_Kind_Procedure_Declaration then
-         Disp_Driver_List (Get_Driver_List (Subprg), Indent);
-      end if;
    end Disp_Subprogram_Declaration;
 
    procedure Disp_Subprogram_Body (Subprg : Iir)
@@ -1517,7 +1494,6 @@
       else
          New_Line;
       end if;
-      Disp_Driver_List (Get_Driver_List (Process), Start + Indentation);
       Disp_Declaration_Chain (Process, Start + Indentation);
       Set_Col (Start);
       Put_Line ("begin");
@@ -2312,10 +2288,10 @@
             Disp_Concurrent_Conditional_Signal_Assignment (An_Iir);
          when Iir_Kinds_Dyadic_Operator =>
             Disp_Dyadic_Operator (An_Iir);
-         when Iir_Kind_Signal_Interface_Declaration =>
+         when Iir_Kind_Signal_Interface_Declaration
+           | Iir_Kind_Signal_Declaration
+           | Iir_Kind_Object_Alias_Declaration =>
             Disp_Name_Of (An_Iir);
-         when Iir_Kind_Signal_Declaration =>
-            Disp_Identifier (An_Iir);
          when Iir_Kind_Enumeration_Literal =>
             Disp_Identifier (An_Iir);
          when Iir_Kind_Component_Instantiation_Statement =>
@@ -2330,8 +2306,11 @@
             Disp_Package_Declaration (An_Iir);
          when Iir_Kind_Wait_Statement =>
             Disp_Wait_Statement (An_Iir);
-         when Iir_Kind_Selected_Name =>
-            Disp_Name (An_Iir);
[...4286 lines suppressed...]
+         end if;
+         return Create_Var_Identifier_From_Buffer (L);
       end Create_Var_Identifier;
 
       function Create_Uniq_Identifier return Var_Ident_Type
@@ -22728,19 +23323,6 @@
          end case;
       end Translate_Succ_Pred_Attribute;
 
-      --  Read the boolean attribute (active or event) FIELD of simple signal
-      --  SIG.
-      function Read_Bool_Signal_Attribute (Sig : O_Enode; Field : O_Fnode)
-                                          return O_Enode
-      is
-         S : O_Enode;
-      begin
-         S := New_Convert_Ov (Sig, Ghdl_Signal_Ptr);
-         return New_Value
-           (New_Selected_Element (New_Access_Element (S), Field));
-         --Ghdl_Signal_Event_Node));
-      end Read_Bool_Signal_Attribute;
-
       type Bool_Sigattr_Data_Type is record
          Label : O_Snode;
          Field : O_Fnode;
@@ -22752,8 +23334,7 @@
          pragma Unreferenced (Targ_Type);
       begin
          Gen_Exit_When (Data.Label,
-                        Read_Bool_Signal_Attribute (New_Value (M2Lv (Targ)),
-                                                    Data.Field));
+                        New_Value (Get_Signal_Field (Targ, Data.Field)));
       end Bool_Sigattr_Non_Composite_Signal;
 
       function Bool_Sigattr_Prepare_Data_Composite
@@ -22819,7 +23400,7 @@
          if Get_Kind (Prefix_Type) in Iir_Kinds_Scalar_Type_Definition then
             --  Effecient handling for a scalar signal.
             Name := Chap6.Translate_Name (Prefix);
-            return Read_Bool_Signal_Attribute (New_Value (M2Lv (Name)), Field);
+            return New_Value (Get_Signal_Field (Name, Field));
          else
             --  Element per element handling for composite signals.
             Res := Create_Temp (Std_Boolean_Type_Node);
@@ -22839,13 +23420,14 @@
 
       function Translate_Event_Attribute (Attr : Iir) return O_Enode is
       begin
-         return Translate_Bool_Signal_Attribute (Attr, Ghdl_Signal_Event_Node);
+         return Translate_Bool_Signal_Attribute
+           (Attr, Ghdl_Signal_Event_Field);
       end Translate_Event_Attribute;
 
       function Translate_Active_Attribute (Attr : Iir) return O_Enode is
       begin
          return Translate_Bool_Signal_Attribute
-           (Attr, Ghdl_Signal_Active_Node);
+           (Attr, Ghdl_Signal_Active_Field);
       end Translate_Active_Attribute;
 
       --  Read signal value FIELD of signal SIG.
@@ -22862,11 +23444,20 @@
            (New_Unchecked_Address (New_Selected_Element (T, Field), S_Type));
       end Get_Signal_Value_Field;
 
+      function Get_Signal_Field (Sig : Mnode; Field : O_Fnode)
+                                return O_Lnode
+      is
+         S : O_Enode;
+      begin
+         S := New_Convert_Ov (New_Value (M2Lv (Sig)), Ghdl_Signal_Ptr);
+         return New_Selected_Element (New_Access_Element (S), Field);
+      end Get_Signal_Field;
+
       function Read_Last_Value (Sig : O_Enode; Sig_Type : Iir) return O_Enode
       is
       begin
          return New_Value (Get_Signal_Value_Field
-                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Node));
+                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Field));
       end Read_Last_Value;
 
       function Translate_Last_Value is new Chap7.Translate_Signal_Value
@@ -27031,39 +27622,53 @@
         (Chararray_Type, New_Unsigned_Literal (Ghdl_Index_Type, 8));
       New_Type_Decl (Get_Identifier ("__ghdl_scalar_bytes"),
                      Ghdl_Scalar_Bytes);
+
+      Ghdl_Signal_Ptr := New_Access_Type (O_Tnode_Null);
+      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+
       --  Type __signal_signal is record
       Start_Record_Type (Rec);
-      New_Record_Field (Rec, Ghdl_Signal_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Value_Field,
                         Get_Identifier ("value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Field,
                         Get_Identifier ("driving_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Field,
                         Get_Identifier ("last_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Field,
                         Get_Identifier ("last_event"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Field,
                         Get_Identifier ("last_active"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Chain_Field,
+                        Get_Identifier ("active_chain"),
+                        Ghdl_Signal_Ptr);
+      New_Record_Field (Rec, Ghdl_Signal_Event_Field,
                         Get_Identifier ("event"),
                         Std_Boolean_Type_Node);
-      New_Record_Field (Rec, Ghdl_Signal_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Field,
                         Get_Identifier ("active"),
                         Std_Boolean_Type_Node);
+      New_Record_Field (Rec, Ghdl_Signal_Has_Active_Field,
+                        Get_Identifier ("has_active"),
+                        Ghdl_Bool_Type);
       Finish_Record_Type (Rec, Ghdl_Signal_Type);
       New_Type_Decl (Get_Identifier ("__ghdl_signal"), Ghdl_Signal_Type);
 
-      Ghdl_Signal_Ptr := New_Access_Type (Ghdl_Signal_Type);
-      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+      Finish_Access_Type (Ghdl_Signal_Ptr, Ghdl_Signal_Type);
 
       Ghdl_Signal_Ptr_Ptr := New_Access_Type (Ghdl_Signal_Ptr);
       New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr_ptr"),
                      Ghdl_Signal_Ptr_Ptr);
 
+      New_Var_Decl (Ghdl_Signal_Active_Chain,
+                    Get_Identifier ("__ghdl_signal_active_chain"),
+                    O_Storage_External,
+                    Ghdl_Signal_Ptr);
+
       --  procedure __ghdl_signal_merge_rti
       --       (sig : ghdl_signal_ptr; rti : ghdl_rti_access)
       Start_Procedure_Decl
@@ -27305,6 +27910,17 @@
       New_Interface_Decl (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
       Finish_Subprogram_Decl (Interfaces, Ghdl_Process_Add_Driver);
 
+      --  procedure __ghdl_signal_direct_driver (sig : __ghdl_signal_ptr;
+      --                                         Drv : Ghdl_Ptr_type);
+      Start_Procedure_Decl
+        (Interfaces, Get_Identifier ("__ghdl_signal_direct_driver"),
+         O_Storage_External);
+      New_Interface_Decl
+        (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
+      New_Interface_Decl
+        (Interfaces, Param, Get_Identifier ("drv"), Ghdl_Ptr_Type);
+      Finish_Subprogram_Decl (Interfaces, Ghdl_Signal_Direct_Driver);
+
       declare
          procedure Create_Signal_Conversion (Name : String; Res : out O_Dnode)
          is
diff -urN ghdl-0.25/vhdl/translation.ads ghdl-0.26dev/vhdl/translation.ads
--- ghdl-0.25/vhdl/translation.ads	2006-08-02 06:13:50.000000000 +0200
+++ ghdl-0.26dev/vhdl/translation.ads	2006-10-05 11:35:23.000000000 +0200
@@ -61,6 +61,21 @@
    --  If set, do not generate code for unused implicit subprograms.
    Flag_Discard_Unused_Implicit : Boolean := False;
 
+   --  If set, dump drivers per process during compilation.
+   Flag_Dump_Drivers : Boolean := False;
+
+   --  If set, try to create direct drivers.
+   Flag_Direct_Drivers : Boolean := True;
+
+   --  If set, checks ranges (subtype ranges).
+   Flag_Range_Checks : Boolean := True;
+
+   --  If set, checks indexes (arrays index and slice).
+   Flag_Index_Checks : Boolean := True;
+
+   --  If set, do not create identifiers (for in memory compilation).
+   Flag_Discard_Identifiers : Boolean := False;
+
    type Foreign_Kind_Type is (Foreign_Unknown,
                               Foreign_Vhpidirect,
                               Foreign_Intrinsic);
diff -urN ghdl-0.25/vhdl/version.ads ghdl-0.26dev/vhdl/version.ads
--- ghdl-0.25/vhdl/version.ads	2006-08-11 05:15:55.000000000 +0200
+++ ghdl-0.26dev/vhdl/version.ads	2006-10-05 11:35:25.000000000 +0200
@@ -1,4 +1,5 @@
 package Version is
-   Ghdl_Version : constant String :=
-      "GHDL 0.25 (20060811) [Sokcho edition]";
+   Ghdl_Release : constant String :=
+      "GHDL 0.26dev (20060819) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.26dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-5/ghdl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ghdl.spec	28 Aug 2006 22:29:28 -0000	1.17
+++ ghdl.spec	17 Oct 2006 19:54:21 -0000	1.18
@@ -1,6 +1,6 @@
 %define gccver 4.1.1
 %define ghdlver 0.25
-%define ghdlsvnver 61
+%define ghdlsvnver 73
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Tue Oct 17 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.73svn.0
+- update to svn73
+
 * Tue Aug 29 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.61svn.0
 - update to svn61
 


--- ghdl-svn61.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 17 20:11:42 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 17 Oct 2006 13:11:42 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.5, 1.6 cobbler.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610172011.k9HKBgo0019867@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19842

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Oct 2006 20:18:47 -0000	1.5
+++ .cvsignore	17 Oct 2006 20:11:11 -0000	1.6
@@ -2,3 +2,4 @@
 cobbler-0.2.1.tar.gz
 cobbler-0.2.2.tar.gz
 cobbler-0.2.3.tar.gz
+cobbler-0.2.5.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cobbler.spec	10 Oct 2006 20:18:47 -0000	1.4
+++ cobbler.spec	17 Oct 2006 20:11:11 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.3
+Version: 0.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -28,19 +28,20 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %{_bindir}/cobbler
 %dir /etc/cobbler
+/etc/cobbler/*.ks
 /etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
@@ -54,6 +55,14 @@
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
+
+* Mon Oct 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
+- Upstream features and bugfixes (see CHANGELOG)
+- Packaged additional kickstart file and specfile cleanup
+
+* Thu Oct 12 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.4-1
+- Upstream features and bugfixes (see CHANGELOG)
+
 * Mon Oct 9 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
 - Upstream features (see CHANGELOG) & URL update
 
@@ -70,7 +79,7 @@
 - Lots of new PXE and dhcpd.conf upstream, elilo.efi now included.
 
 * Thu Sep 21 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-8
-- Added doc files to %doc, removed INSTALLED_FILES code
+- Added doc files to doc, removed INSTALLED_FILES code
 
 * Wed Sep 20 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-7
 - Upstream updates


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Oct 2006 20:18:47 -0000	1.5
+++ sources	17 Oct 2006 20:11:11 -0000	1.6
@@ -1 +1 @@
-90596f95025ec8180e1907cb2f768fa7  cobbler-0.2.3.tar.gz
+ac4be73942d50274648093510f119aaf  cobbler-0.2.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 20:35:45 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 17 Oct 2006 13:35:45 -0700
Subject: rpms/perl-IPC-Cmd/devel .cvsignore, 1.3, 1.4 perl-IPC-Cmd.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610172035.k9HKZjkB020082@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20062

Modified Files:
	.cvsignore perl-IPC-Cmd.spec sources 
Log Message:
Update to 0.32.
Use fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Sep 2006 01:08:52 -0000	1.3
+++ .cvsignore	17 Oct 2006 20:35:15 -0000	1.4
@@ -1 +1 @@
-IPC-Cmd-0.25.tar.gz
+IPC-Cmd-0.32.tar.gz


Index: perl-IPC-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/perl-IPC-Cmd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-IPC-Cmd.spec	17 Sep 2006 01:08:52 -0000	1.2
+++ perl-IPC-Cmd.spec	17 Oct 2006 20:35:15 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-IPC-Cmd
-Version:        0.25
+Version:        0.32
 Release:        1%{?dist}
 Summary:        Finding and running system commands made easy
 License:        GPL or Artistic
@@ -32,7 +32,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -47,6 +47,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.32-1
+- Update to 0.32.
+- Use fixperms macro instead of our own chmod incantation.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.25-1
 - Update to 0.25.
 - Fix find option order.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Sep 2006 01:08:52 -0000	1.3
+++ sources	17 Oct 2006 20:35:15 -0000	1.4
@@ -1 +1 @@
-69bb014822594266ca2cbd01aae54912  IPC-Cmd-0.25.tar.gz
+4a9828ce6bd63fedba46bca124743850  IPC-Cmd-0.32.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 20:40:18 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 17 Oct 2006 13:40:18 -0700
Subject: rpms/perl-Object-Accessor/devel .cvsignore, 1.5,
	1.6 perl-Object-Accessor.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200610172040.k9HKeIpB020282@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Object-Accessor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20201

Modified Files:
	.cvsignore perl-Object-Accessor.spec sources 
Log Message:
Update to 0.32.
Use fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2006 21:31:55 -0000	1.5
+++ .cvsignore	17 Oct 2006 20:39:47 -0000	1.6
@@ -1 +1 @@
-Object-Accessor-0.30.tar.gz
+Object-Accessor-0.32.tar.gz


Index: perl-Object-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/perl-Object-Accessor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Object-Accessor.spec	21 Sep 2006 21:31:55 -0000	1.5
+++ perl-Object-Accessor.spec	17 Oct 2006 20:39:47 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Object-Accessor
-Version:        0.30
+Version:        0.32
 Release:        1%{?dist}
 Summary:        Perl module that allows per object accessors
 License:        GPL or Artistic
@@ -30,7 +30,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -45,6 +45,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.32-1
+- Update to 0.32.
+- Use fixperms macro instead of our own chmod incantation.
+
 * Thu Sep 21 2006 Steven Pritchard <steve at kspei.com> 0.30-1
 - Update to 0.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2006 21:31:55 -0000	1.5
+++ sources	17 Oct 2006 20:39:47 -0000	1.6
@@ -1 +1 @@
-f90bbe941b5489ca228513a45840ee5a  Object-Accessor-0.30.tar.gz
+bb898baa4cee74cbacdb3fd116b29922  Object-Accessor-0.32.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 20:41:07 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:41:07 -0700
Subject: rpms/oki4linux - New directory
Message-ID: <200610172041.k9HKf7hQ020379@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20374/oki4linux

Log Message:
Directory /cvs/extras/rpms/oki4linux added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 20:41:13 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:41:13 -0700
Subject: rpms/oki4linux/devel - New directory
Message-ID: <200610172041.k9HKfDUZ020393@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20374/oki4linux/devel

Log Message:
Directory /cvs/extras/rpms/oki4linux/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 17 20:41:31 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:41:31 -0700
Subject: rpms/oki4linux Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610172041.k9HKfVWV020428@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20422

Added Files:
	Makefile import.log 
Log Message:
Setup of module oki4linux


--- NEW FILE Makefile ---
# Top level Makefile for module oki4linux
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 17 20:41:37 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:41:37 -0700
Subject: rpms/oki4linux/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610172041.k9HKfbcN020446@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20422/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oki4linux


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 17 20:43:46 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:43:46 -0700
Subject: rpms/oki4linux import.log,1.1,1.2
Message-ID: <200610172043.k9HKhkuw020580@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20541

Modified Files:
	import.log 
Log Message:
auto-import oki4linux-2.1gst-1 on branch devel from oki4linux-2.1gst-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oki4linux/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2006 20:41:31 -0000	1.1
+++ import.log	17 Oct 2006 20:43:16 -0000	1.2
@@ -0,0 +1 @@
+oki4linux-2_1gst-1:HEAD:oki4linux-2.1gst-1.src.rpm:1161117847



From fedora-extras-commits at redhat.com  Tue Oct 17 20:43:46 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 13:43:46 -0700
Subject: rpms/oki4linux/devel oki4linux-a4.patch, NONE,
	1.1 oki4linux-daemon.patch, NONE, 1.1 oki4linux.init, NONE,
	1.1 oki4linux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610172043.k9HKhkDL020584@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/oki4linux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20541/devel

Modified Files:
	.cvsignore sources 
Added Files:
	oki4linux-a4.patch oki4linux-daemon.patch oki4linux.init 
	oki4linux.spec 
Log Message:
auto-import oki4linux-2.1gst-1 on branch devel from oki4linux-2.1gst-1.src.rpm

oki4linux-a4.patch:

--- NEW FILE oki4linux-a4.patch ---
diff -Nura oki4linux.bef/src/main.c oki4linux/src/main.c
--- oki4linux.bef/src/main.c	2004-03-07 23:58:13.000000000 +0100
+++ oki4linux/src/main.c	2004-03-07 23:59:30.000000000 +0100
@@ -98,7 +98,7 @@
  * Global data set up by command line options.
  */
 static int verbose = 0;
-static int size_index = 4;	/* Letter paper is default */
+static int size_index = 0;	/* A4 paper is default */
 static char *output_name = NULL;	/* default output device file */
 
 static enum {
diff -Nura oki4linux.bef/src/oki4daemon oki4linux/src/oki4daemon
--- oki4linux.bef/src/oki4daemon	2004-03-07 23:58:13.000000000 +0100
+++ oki4linux/src/oki4daemon	2004-03-08 00:01:29.000000000 +0100
@@ -97,7 +97,7 @@
     my ($papersize, $darkness, $paperweight, $graphics, $manual);
 
     # override default in oki4drv
-    $papersize = 'letter';
+    $papersize = 'a4';
 
     # Step 2: read beginning of job, until no @FAKEOKI options
     my $firstline;

oki4linux-daemon.patch:

--- NEW FILE oki4linux-daemon.patch ---
diff -Nura oki4linux.dupa/src/oki4daemon oki4linux/src/oki4daemon
--- oki4linux.dupa/src/oki4daemon	2004-03-06 04:25:04.000000000 +0100
+++ oki4linux/src/oki4daemon	2004-03-06 04:28:27.000000000 +0100
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 
 # Simple named pipe daemon for oki4drv.
 
@@ -18,7 +18,7 @@
 # below...
 
 # If not in path
-my $oki4drv = '/usr/local/sbin/oki4drv';
+my $oki4drv = '/usr/sbin/oki4drv';
 
 # contents of 8min.rip from distribution.  You could use immediate.rip.
 my $sleepstring = '%-98765XBb

@@ -36,10 +36,13 @@
 $fifo = $opt_f if ($opt_f);
 
 if (! -p $fifo) {
-    system("mkfifo $fifo 0600") == 0
+    system("mkfifo $fifo -m0660") == 0
 	or die "Unable to make named pipe $fifo";
 }
 
+#system("chown lp.sys $fifo; chmod 660 $fifo") == 0
+#    or die "Unable to set ownerships/permissions for named pipe $fifo";
+
 # Step 1.5: dissociate, daemonize, &c...
 
 # TODO: Connect stderr/stdout to logger or something similar, and/or
@@ -48,7 +51,7 @@
 fork and exit;
 
 use Sys::Syslog qw(:DEFAULT setlogsock);
-setlogsock('unix');             # change to 'inet' for network logging
+setlogsock('inet');             # change to 'inet' for network logging
 openlog ('oki4daemon', 'pid,cons,ndelay', 'lpr') 
     or die 'Unable to open syslog';

diff -Nura oki4linux.dupa/src/oki4daemon oki4linux/src/oki4daemon 
--- oki4linux.dupa/src/oki4daemon	2004-03-06 05:34:04.000000000 +0100
+++ oki4linux/src/oki4daemon	2004-03-06 05:34:26.000000000 +0100
@@ -40,8 +40,8 @@
 	or die "Unable to make named pipe $fifo";
 }
 
-#system("chown lp.sys $fifo; chmod 660 $fifo") == 0
-#    or die "Unable to set ownerships/permissions for named pipe $fifo";
+system("chown root:lp $fifo; chmod 660 $fifo") == 0
+    or die "Unable to set ownerships/permissions for named pipe $fifo";
 
 # Step 1.5: dissociate, daemonize, &c...
 


--- NEW FILE oki4linux.init ---
#!/bin/sh
#
# oki4daemon	oki4daemon - printer driver daemon
#
# chkconfig:	2345 11 89
#
# description: oki4daemon - daemon developed by Grant Taylor to \
#              support the OKI 4w and compatible winprinters. \
#              These printers have high requirements concerning \
#              timing and therefore one cannot use their driver \
#              directly out of a printer spooler (CUPS, LPD). To \
#              solve this problem, one lets the spooler send the \
#              job to this deamon. Activate this daemon when you \
#              have one of these printers and set up a CUPS queue \
#              for your printer with "oki4w_install". Do not \
#              connect an OKI winprinter to a machine with high \
#              loads or high security demands.
#


# Source function library
. /etc/rc.d/init.d/functions

# Get service config - may override defaults
[ -f /etc/sysconfig/oki4daemon ] && . /etc/sysconfig/oki4daemon

# See how we were called.
case "$1" in
  start)
	# Check if the service is already running?
	if [ ! -f /var/lock/subsys/oki4daemon ]; then
		echo -n $"Starting oki4daemon: "
		daemon oki4daemon
		RETVAL=$?
		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/oki4daemon
		echo
	fi
	;;
  stop)
	if [ -f /var/lock/subsys/oki4daemon ]; then
		# Stop daemons.
		echo -n $"Stopping oki4daemon: "
		killproc oki4daemon
		rm -f /var/lock/subsys/oki4daemon
		echo
	fi
	;;
  restart)
	$0 stop
	$0 start
	exit $?
	;;
  reload)
	if [ -f /var/lock/subsys/oki4daemon ]; then
		echo -n $"Reloading oki4daemon: "
		killproc oki4daemon -HUP
		RETVAL=$?
		echo
	fi
	;;
  force-reload)
	# if program allows reloading without stopping
	$0 reload

	# or if it doesn't
	$0 restart

	exit $?
	;;
  status)
	status oki4daemon
	RETVAL=$?
	;;
  *)
	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
	exit 3
esac

exit $RETVAL

# This must be last line !
# vi:syntax=sh:tw=78:ts=8:sw=4


--- NEW FILE oki4linux.spec ---
Summary:	OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w printer driver
Summary(pl):	Sterownik do drukarek OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w
Name:		oki4linux
Version:	2.1gst
Release:	1%{?dist}
License:	BSD
Group:		System Environment/Daemons
URL:		http://www.linuxprinting.org/show_driver.cgi?driver=oki4drv
Source0:	http://www.linuxprinting.org/download/printing/%{name}-%{version}.tar.gz
# Source0-md5:	54c85488d2489d2431ce518916b20515
Source1:	%{name}.init
Patch0:		%{name}-daemon.patch
Patch1:		%{name}-a4.patch
Requires:	initscripts
Requires(post):	/sbin/chkconfig
Requires(preun):	/sbin/chkconfig
Requires:	ghostscript
BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)

%description
User space based driver for OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w
printers.

%description -l pl
Sterownik do drukarek OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w
zaimplementowany w przestrzeni u??ytkownika.

%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1

%build
pushd src
make clean
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sbindir},%{_initrddir},%{_mandir}/man1,/dev}

install -pm755 src/oki4drv	$RPM_BUILD_ROOT%{_sbindir}
install -pm755 src/oki4daemon	$RPM_BUILD_ROOT%{_sbindir}
install -pm644 src/oki4drv.man	$RPM_BUILD_ROOT%{_mandir}/man1/oki4drv.1
install -pm644 src/README.oki4daemon	./
install -pm644 src/readback.c	doc/
install -pm755 %{SOURCE1}	$RPM_BUILD_ROOT%{_initrddir}/oki4daemon
touch $RPM_BUILD_ROOT/dev/oki4drv

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add oki4daemon
if [ -f /var/lock/subsys/oki4daemon ]; then
	/etc/rc.d/init.d/oki4daemon restart 1>&2
else
	echo "Run \"/etc/rc.d/init.d/oki4daemon start\" to start oki4daemon daemon."
fi

%preun
if [ "$1" = "0" ]; then
	if [ -f /var/lock/subsys/oki4daemon ]; then
		/etc/rc.d/init.d/oki4daemon stop 1>&2
	fi
	/sbin/chkconfig --del oki4daemon
fi

%files
%defattr(644,root,root,755)
%doc ChangeLog COPYING README README.oki4daemon crack doc samples
%attr(755,root,root) %{_sbindir}/oki4d*
%attr(755,root,root) /etc/rc.d/init.d/oki4daemon
%{_mandir}/man1/oki4drv.1*
%attr(660,root,lp) %ghost /dev/oki4drv

%changelog
* Thu Oct 05 2006 Dominik Mierzejewski <rpm at greysector.net> 2.1gst-1
- adapted PLD spec
- FE compliance


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oki4linux/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2006 20:41:37 -0000	1.1
+++ .cvsignore	17 Oct 2006 20:43:16 -0000	1.2
@@ -0,0 +1 @@
+oki4linux-2.1gst.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oki4linux/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2006 20:41:37 -0000	1.1
+++ sources	17 Oct 2006 20:43:16 -0000	1.2
@@ -0,0 +1 @@
+54c85488d2489d2431ce518916b20515  oki4linux-2.1gst.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 20:47:25 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 17 Oct 2006 13:47:25 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.6, 1.7 cobbler.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200610172047.k9HKlPAj020720@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20686

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Oct 2006 20:11:11 -0000	1.6
+++ .cvsignore	17 Oct 2006 20:46:55 -0000	1.7
@@ -3,3 +3,4 @@
 cobbler-0.2.2.tar.gz
 cobbler-0.2.3.tar.gz
 cobbler-0.2.5.tar.gz
+cobbler-0.2.6.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cobbler.spec	17 Oct 2006 20:11:11 -0000	1.5
+++ cobbler.spec	17 Oct 2006 20:46:55 -0000	1.6
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.5
+Version: 0.2.6
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -10,7 +10,6 @@
 Requires: python >= 2.3
 Requires: httpd
 Requires: tftp-server
-Requires: python-cheetah
 Requires: pexpect
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
@@ -56,6 +55,9 @@
 
 %changelog
 
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
+- Upstream changes (see CHANGELOG), includes removing Cheetah as a require
+
 * Mon Oct 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
 - Upstream features and bugfixes (see CHANGELOG)
 - Packaged additional kickstart file and specfile cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Oct 2006 20:11:11 -0000	1.6
+++ sources	17 Oct 2006 20:46:55 -0000	1.7
@@ -1 +1 @@
-ac4be73942d50274648093510f119aaf  cobbler-0.2.5.tar.gz
+44f1e470bf40444b32be11393dee8e20  cobbler-0.2.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 21:26:59 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 17 Oct 2006 14:26:59 -0700
Subject: fedora-security/audit fc5,1.361,1.362 fc6,1.115,1.116
Message-ID: <200610172126.k9HLQxLL023935@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23915/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-5331



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- fc5	17 Oct 2006 18:13:49 -0000	1.361
+++ fc5	17 Oct 2006 21:26:56 -0000	1.362
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 ** mutt
 CVE-2006-5297 ** mutt
 CVE-2006-5229 ignore (openssh) reported not an issue


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fc6	17 Oct 2006 18:13:49 -0000	1.115
+++ fc6	17 Oct 2006 21:26:56 -0000	1.116
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)



From fedora-extras-commits at redhat.com  Tue Oct 17 21:33:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 17 Oct 2006 14:33:25 -0700
Subject: rpms/perl-IO-All/devel .cvsignore, 1.3, 1.4 perl-IO-All.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <200610172133.k9HLXPlA023999@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IO-All/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23979

Modified Files:
	.cvsignore perl-IO-All.spec sources 
Log Message:
Update to 0.36.
Use fixperms macro instead of our own chmod incantation.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-All/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 May 2006 00:17:53 -0000	1.3
+++ .cvsignore	17 Oct 2006 21:32:55 -0000	1.4
@@ -1 +1 @@
-IO-All-0.35.tar.gz
+IO-All-0.36.tar.gz


Index: perl-IO-All.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-All/devel/perl-IO-All.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-IO-All.spec	17 Sep 2006 20:46:31 -0000	1.6
+++ perl-IO-All.spec	17 Oct 2006 21:32:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-IO-All
-Version:        0.35
-Release:        4%{?dist}
+Version:        0.36
+Release:        1%{?dist}
 Summary:        IO::All Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -44,7 +44,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -59,6 +59,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.36-1
+- Update to 0.36.
+- Use fixperms macro instead of our own chmod incantation.
+
 * Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 0.35-4
 - Fix find option order.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-All/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 May 2006 00:17:53 -0000	1.3
+++ sources	17 Oct 2006 21:32:55 -0000	1.4
@@ -1 +1 @@
-feea9663b97eb78abac4d956dde72f08  IO-All-0.35.tar.gz
+e6d28db65f56936c641f68dcf2daa45f  IO-All-0.36.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 21:34:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Oct 2006 14:34:27 -0700
Subject: rpms/R-hdf5/FC-4 R-hdf5.spec,1.2,1.3
Message-ID: <200610172134.k9HLYRxT024088@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-hdf5/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24034/FC-4

Modified Files:
	R-hdf5.spec 
Log Message:

bump for R 2.4.0



Index: R-hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/R-hdf5/FC-4/R-hdf5.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-hdf5.spec	15 Sep 2006 16:22:46 -0000	1.2
+++ R-hdf5.spec	17 Oct 2006 21:33:57 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: R-%{packname}
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: GPL version 2 or later
 URL: http://cran.r-project.org/contrib
@@ -44,6 +44,9 @@
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Tue Oct 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-2
+- bump for R 2.4.0
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-1
 - bump to 1.6.4
 



From fedora-extras-commits at redhat.com  Tue Oct 17 21:34:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Oct 2006 14:34:28 -0700
Subject: rpms/R-hdf5/FC-5 R-hdf5.spec,1.2,1.3
Message-ID: <200610172134.k9HLYSal024091@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-hdf5/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24034/FC-5

Modified Files:
	R-hdf5.spec 
Log Message:

bump for R 2.4.0



Index: R-hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/R-hdf5/FC-5/R-hdf5.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-hdf5.spec	15 Sep 2006 16:22:46 -0000	1.2
+++ R-hdf5.spec	17 Oct 2006 21:33:58 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: R-%{packname}
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: GPL version 2 or later
 URL: http://cran.r-project.org/contrib
@@ -44,6 +44,9 @@
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Tue Oct 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-2
+- bump for R 2.4.0
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-1
 - bump to 1.6.4
 



From fedora-extras-commits at redhat.com  Tue Oct 17 21:34:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Oct 2006 14:34:34 -0700
Subject: rpms/R-hdf5/devel R-hdf5.spec,1.2,1.3
Message-ID: <200610172134.k9HLYYw6024094@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R-hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24034/devel

Modified Files:
	R-hdf5.spec 
Log Message:

bump for R 2.4.0



Index: R-hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/R-hdf5/devel/R-hdf5.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-hdf5.spec	15 Sep 2006 16:22:47 -0000	1.2
+++ R-hdf5.spec	17 Oct 2006 21:34:04 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: R-%{packname}
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: GPL version 2 or later
 URL: http://cran.r-project.org/contrib
@@ -44,6 +44,9 @@
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Tue Oct 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-2
+- bump for R 2.4.0
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.4-1
 - bump to 1.6.4
 



From fedora-extras-commits at redhat.com  Tue Oct 17 22:15:49 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 17 Oct 2006 15:15:49 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.7, 1.8 cobbler.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200610172215.k9HMFnI7027363@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27343

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Oct 2006 20:46:55 -0000	1.7
+++ .cvsignore	17 Oct 2006 22:15:18 -0000	1.8
@@ -4,3 +4,4 @@
 cobbler-0.2.3.tar.gz
 cobbler-0.2.5.tar.gz
 cobbler-0.2.6.tar.gz
+cobbler-0.2.7.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cobbler.spec	17 Oct 2006 20:46:55 -0000	1.6
+++ cobbler.spec	17 Oct 2006 22:15:18 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.6
+Version: 0.2.7
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -10,7 +10,6 @@
 Requires: python >= 2.3
 Requires: httpd
 Requires: tftp-server
-Requires: pexpect
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -55,7 +54,11 @@
 
 %changelog
 
-* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.7-1
+- Upstream changes (see CHANGELOG), includes removing pexpect as a require
+- This RPM now builds on RHEL4
+
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.6-1
 - Upstream changes (see CHANGELOG), includes removing Cheetah as a require
 
 * Mon Oct 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Oct 2006 20:46:55 -0000	1.7
+++ sources	17 Oct 2006 22:15:18 -0000	1.8
@@ -1 +1,2 @@
 44f1e470bf40444b32be11393dee8e20  cobbler-0.2.6.tar.gz
+41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 17 22:28:11 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Oct 2006 15:28:11 -0700
Subject: kadischi/livecd_generator kadischi.py,1.52,1.53
Message-ID: <200610172228.k9HMSBbU027519@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27500

Modified Files:
	kadischi.py 
Log Message:
Add missing format string.



Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kadischi.py	23 Sep 2006 13:42:33 -0000	1.52
+++ kadischi.py	17 Oct 2006 22:28:09 -0000	1.53
@@ -237,7 +237,7 @@
         # make iso
         ### Again. check for Grub or Isolinux configuration
         if bootloader == "grub":
-            print "[kadischi]: creating iso image" % isoimage
+            print "[kadischi]: creating iso image %s" % isoimage
             args = ["/usr/bin/mkisofs", "-quiet", "-R",
                 "-V", dist,
                 "-b", "boot/grub/stage2_eltorito",



From fedora-extras-commits at redhat.com  Wed Oct 18 00:53:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 17 Oct 2006 17:53:13 -0700
Subject: rpms/perl-HTML-Mason/devel .cvsignore, 1.5, 1.6 perl-HTML-Mason.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200610180053.k9I0rDrT001736@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1697

Modified Files:
	.cvsignore perl-HTML-Mason.spec sources 
Log Message:
Update to 1.35.
BR Test::Memory::Cycle for better test coverage.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2006 00:58:27 -0000	1.5
+++ .cvsignore	18 Oct 2006 00:52:43 -0000	1.6
@@ -1 +1 @@
-HTML-Mason-1.34.tar.gz
+HTML-Mason-1.35.tar.gz


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-HTML-Mason.spec	17 Oct 2006 00:58:27 -0000	1.8
+++ perl-HTML-Mason.spec	18 Oct 2006 00:52:43 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Mason
-Version:        1.34
+Version:        1.35
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
@@ -18,6 +18,7 @@
 BuildRequires:  perl(Params::Validate) >= 0.7
 BuildRequires:  perl(mod_perl2)
 BuildRequires:  perl(HTML::Entities)
+BuildRequires:  perl(Test::Memory::Cycle)
 Requires:       perl(Cache::Cache) >= 1
 Requires:       perl(Class::Container) >= 0.07
 Requires:       perl(Exception::Class) >= 1.15
@@ -95,6 +96,10 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 1:1.35-1
+- Update to 1.35.
+- BR Test::Memory::Cycle for better test coverage.
+
 * Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1:1.34-1
 - Update to 1.34.
 - Use fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2006 00:58:27 -0000	1.5
+++ sources	18 Oct 2006 00:52:43 -0000	1.6
@@ -1 +1 @@
-a41b0fc3890f07a1b701950537f7543e  HTML-Mason-1.34.tar.gz
+c09f77e2af500b51d22e0238c0534994  HTML-Mason-1.35.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 01:06:59 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:06:59 -0700
Subject: rpms/harminv - New directory
Message-ID: <200610180106.k9I16xso004876@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4872/harminv

Log Message:
Directory /cvs/extras/rpms/harminv added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 01:07:05 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:07:05 -0700
Subject: rpms/harminv/devel - New directory
Message-ID: <200610180107.k9I175wn004890@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4872/harminv/devel

Log Message:
Directory /cvs/extras/rpms/harminv/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 01:07:17 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:07:17 -0700
Subject: rpms/harminv Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610180107.k9I17HaK004923@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4915

Added Files:
	Makefile import.log 
Log Message:
Setup of module harminv


--- NEW FILE Makefile ---
# Top level Makefile for module harminv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 01:07:23 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:07:23 -0700
Subject: rpms/harminv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610180107.k9I17Nlw004945@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4915/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module harminv


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 01:08:21 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:08:21 -0700
Subject: rpms/harminv import.log,1.1,1.2
Message-ID: <200610180108.k9I18LOP005019@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4987

Modified Files:
	import.log 
Log Message:
auto-import harminv-1.3.1-5 on branch devel from harminv-1.3.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/harminv/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 01:07:17 -0000	1.1
+++ import.log	18 Oct 2006 01:07:51 -0000	1.2
@@ -0,0 +1 @@
+harminv-1_3_1-5:HEAD:harminv-1.3.1-5.src.rpm:1161133668



From fedora-extras-commits at redhat.com  Wed Oct 18 01:08:22 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:08:22 -0700
Subject: rpms/harminv/devel harminv.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610180108.k9I18Mpk005023@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4987/devel

Modified Files:
	.cvsignore sources 
Added Files:
	harminv.spec 
Log Message:
auto-import harminv-1.3.1-5 on branch devel from harminv-1.3.1-5.src.rpm


--- NEW FILE harminv.spec ---
Name:           harminv
Version:        1.3.1
Release:        5%{?dist}
Summary:        Program and library for solving the harmonic inversion problem

Group:          Applications/Engineering
License:        GPL
URL:            http://ab-initio.mit.edu/wiki/index.php/Harminv
Source0:        http://ab-initio.mit.edu/harminv/harminv-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-gfortran, atlas-devel

%description
Harminv is a free program (and accompanying library) to solve the
problem of "harmonic inversion."  Given a discrete, finite-length
signal that consists of a sum of finitely-many sinusoids (possibly
exponentially decaying), it determines the frequencies, decay
constants, amplitudes, and phases of those sinusoids.

%package devel
Summary:        Development files for harminv
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package contains the development files for harminv.


%prep
%setup -q

%build
export CFLAGS="-I/usr/include/atlas"
export LDFLAGS="-L/usr/lib/atlas"
export F77=gfortran
%configure --enable-shared --disable-static --with-cxx
make %{?_smp_mflags}
# cat harminv.pc | sed -e 's|-L[^ ]*gcc[^ ]*||g' > harminv.pc.NEW
# mv -f harminv.pc.NEW harminv.pc

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING README AUTHORS ChangeLog NEWS
%{_bindir}/harminv
%{_libdir}/*.so.*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%exclude %{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/*.so


%changelog
* Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-5
- remove pc file, manpage in main, and F77 as env var

* Sun Oct 15 2006  Ed Hill <ed at eh3.com> - 1.3.1-4
- include license copy in doc

* Sun Oct 15 2006  Ed Hill <ed at eh3.com> - 1.3.1-3
- sanitize harminv.pc

* Sun Oct 15 2006  Ed Hill <ed at eh3.com> - 1.3.1-2
- remove static libs and sanitize harminv.pc

* Wed Sep 20 2006  Ed Hill <ed at eh3.com> - 1.3.1-1
- initial package creation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 01:07:23 -0000	1.1
+++ .cvsignore	18 Oct 2006 01:07:52 -0000	1.2
@@ -0,0 +1 @@
+harminv-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 01:07:23 -0000	1.1
+++ sources	18 Oct 2006 01:07:52 -0000	1.2
@@ -0,0 +1 @@
+d3f49f1c90856b3b2e8b77dc4a99c37a  harminv-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 01:14:31 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 17 Oct 2006 18:14:31 -0700
Subject: owners owners.list,1.1842,1.1843
Message-ID: <200610180114.k9I1EVZ4005078@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5062

Modified Files:
	owners.list 
Log Message:
Add myself as the maintainer of oki4linux


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1842
retrieving revision 1.1843
diff -u -r1.1842 -r1.1843
--- owners.list	17 Oct 2006 17:39:12 -0000	1.1842
+++ owners.list	18 Oct 2006 01:14:01 -0000	1.1843
@@ -1159,6 +1159,7 @@
 Fedora Extras|ode|High performance library for simulating rigid body dynamics|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|hugo at devin.com.br
 Fedora Extras|ogre|Object-Oriented Graphics Rendering Engine library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|oki4linux|OKIPAGE (4w, 4w Plus, 6w, 8w, 8w Lite, 8z), OL400w printer driver|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ooo2txt|Convert OpenOffice documents to simple text|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|oooqs2|OpenOffice.org Quickstarter 2|dennis at ausil.us|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 01:19:34 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:19:34 -0700
Subject: owners owners.list,1.1843,1.1844
Message-ID: <200610180119.k9I1JYsI005122@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5106

Modified Files:
	owners.list 
Log Message:
add harminv



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1843
retrieving revision 1.1844
diff -u -r1.1843 -r1.1844
--- owners.list	18 Oct 2006 01:14:01 -0000	1.1843
+++ owners.list	18 Oct 2006 01:19:04 -0000	1.1844
@@ -645,6 +645,7 @@
 Fedora Extras|gxemul|Instruction-level machine emulator|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|hackedbox|The bastard son of Blackbox, a small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|haddock|Documentation tool for annotated Haskell source code|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr



From fedora-extras-commits at redhat.com  Wed Oct 18 01:36:10 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:36:10 -0700
Subject: rpms/harminv/devel harminv.spec,1.1,1.2
Message-ID: <200610180136.k9I1aAPZ005279@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5258

Modified Files:
	harminv.spec 
Log Message:
re-add blas-devel since it fails to build w/o it



Index: harminv.spec
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/harminv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- harminv.spec	18 Oct 2006 01:07:52 -0000	1.1
+++ harminv.spec	18 Oct 2006 01:35:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           harminv
 Version:        1.3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Program and library for solving the harmonic inversion problem
 
 Group:          Applications/Engineering
@@ -9,7 +9,7 @@
 Source0:        http://ab-initio.mit.edu/harminv/harminv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gcc-gfortran, atlas-devel
+BuildRequires:  gcc-gfortran, atlas-devel, blas-devel
 
 %description
 Harminv is a free program (and accompanying library) to solve the
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-6
+- re-add blas-devel since it fails to build without it
+
 * Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-5
 - remove pc file, manpage in main, and F77 as env var
 



From fedora-extras-commits at redhat.com  Wed Oct 18 01:37:51 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:37:51 -0700
Subject: rpms/pekwm - New directory
Message-ID: <200610180137.k9I1bpq5005373@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5369/pekwm

Log Message:
Directory /cvs/extras/rpms/pekwm added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 01:37:56 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:37:56 -0700
Subject: rpms/pekwm/devel - New directory
Message-ID: <200610180137.k9I1bu9G005387@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5369/pekwm/devel

Log Message:
Directory /cvs/extras/rpms/pekwm/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 01:38:05 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:38:05 -0700
Subject: rpms/pekwm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610180138.k9I1c52O005418@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5412

Added Files:
	Makefile import.log 
Log Message:
Setup of module pekwm


--- NEW FILE Makefile ---
# Top level Makefile for module pekwm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 01:38:10 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:38:10 -0700
Subject: rpms/pekwm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610180138.k9I1cASX005434@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5412/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pekwm


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 01:39:13 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:39:13 -0700
Subject: rpms/pekwm import.log,1.1,1.2
Message-ID: <200610180139.k9I1dDGQ005550@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5503

Modified Files:
	import.log 
Log Message:
auto-import pekwm-0.1.5-5.fc5 on branch devel from pekwm-0.1.5-5.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pekwm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 01:38:04 -0000	1.1
+++ import.log	18 Oct 2006 01:38:43 -0000	1.2
@@ -0,0 +1 @@
+pekwm-0_1_5-5_fc5:HEAD:pekwm-0.1.5-5.fc5.src.rpm:1161135518



From fedora-extras-commits at redhat.com  Wed Oct 18 01:39:14 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:39:14 -0700
Subject: rpms/pekwm/devel pekwm-xdg-menu.py, NONE, 1.1 pekwm.desktop, NONE, 
	1.1 pekwm.spec, NONE, 1.1 pekwm_configure.patch, NONE,
	1.1 pekwm_menu.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610180139.k9I1dEP5005554@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/pekwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5503/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pekwm-xdg-menu.py pekwm.desktop pekwm.spec 
	pekwm_configure.patch pekwm_menu.patch 
Log Message:
auto-import pekwm-0.1.5-5.fc5 on branch devel from pekwm-0.1.5-5.fc5.src.rpm


--- NEW FILE pekwm-xdg-menu.py ---
#!/usr/bin/env python
# vim: noexpandtab:ts=4:sts=4

"""Menu Generator for PekWM 
Generates a dynamic menu for PekWM using the freedesktop.org standards

Usage:

  Options:
  -l ..., --lang=...      create the menu using a language. Default = $LANG
  -h, --help              show this help

"""

__author__ = "Michael Rice , Rudolf Kastl , Antonio Gomes"
__version__ = "$Revision: 1.0 $"
__date__ = "$Date: 2006/10/12 18:20:10 $"
__license__ = "GPL"

import xdg.Menu,xdg.DesktopEntry
import getopt,os,sys

def usage():
	print __doc__

def checkWm(entry):
	if entry.DesktopEntry.getOnlyShowIn() != []:
		entry.Show = False
	if entry.DesktopEntry.getNotShowIn() != []:
		if isinstance(entry, xdg.Menu.MenuEntry):
			if wm in entry.DesktopEntry.getNotShowIn():
				entry.Show = False
			else:
				entry.Show = True 
	
def parseMenu(menu,depth=1):
    print "%s Submenu =  \"%s\" {" % ( (depth*"\t"), menu.getName().encode('utf8'), )
    depth += 1
    for entry in menu.getEntries():
		if isinstance(entry, xdg.Menu.Menu):
			parseMenu(entry,depth)
		elif isinstance(entry, xdg.Menu.MenuEntry):
		    checkWm(entry)
		    if entry.Show == False: continue
		    print "%sEntry = \"%s\" { Actions = \"Exec %s &\" }  " % ( (depth*"\t"), \
		      entry.DesktopEntry.getName().encode("utf8"), \
		  	  entry.DesktopEntry.getExec().split()[0]) 
		elif isinstance(entry,xdg.Menu.Separator):
			print "%sSeparator {}" % (depth*"\t")
		elif isinstance(entry.xdg.Menu.Header):
			print "%s%s" % ( (depth*"\t"), entry.Name )
	depth -= 1
	print "%s}" % (depth*"\t")
def main(argv):
	lang = os.getenv("LANG","C")
	try:
	    opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang="])
	except getopt.GetoptError:
	    usage()
		raise SystemExit
	for opt, arg in opts:
	    if opt in ("-h", "--help"):
		    usage()
			raise SystemExit
		elif opt in ("-l", "--lang"):
		    lang = arg
	
	menu=xdg.Menu.parse()
	print "Dynamic {"
	parseMenu(menu)
	print "}"

if __name__ == "__main__":
	main(sys.argv[1:])


--- NEW FILE pekwm.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=PekWM
Comment=Very small and fast window manger
Exec=pekwm
Terminal=False
TryExec=pekwm

[Window Manager]
SessionManaged=true
# vi: encoding=utf-8


--- NEW FILE pekwm.spec ---
Name:           pekwm
Version:        0.1.5
Release:        5%{?dist}
Summary:        The Pek Window Manager

Group:          User Interface/Desktops
License:        GPL
URL:            http://pekwm.org
Source0:        http://pekwm.org/files/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        pekwm-xdg-menu.py
Patch0:         pekwm_configure.patch
Patch2:         pekwm_menu.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel, xorg-x11-proto-devel, libXft-devel,libXpm-devel
BuildRequires:  libXrandr-devel, libXinerama-devel, libpng-devel, libjpeg-devel
BuildRequires:  pcre-devel
Requires:       pyxdg, procps, xprop

%description
A lightweight window manager with tabs based on aewm++.

%prep
%setup -q
%patch0
%patch2

sed -i s,"<BINDIR>",%{_bindir},g data/menu.in
sed -i s,"XftDrawString8","XftDrawStringUtf8", src/PFont.cc

%build
%configure --enable-shape \
           --enable-xinerama \
           --enable-xrandr \
           --enable-xft \
           --enable-image-xpm \
           --enable-image-jpeg \
           --enable-image-png  \
           --enable-menus \
           --enable-harbour \
           --enable-pcre \
           --x-includes=%{_includedir} \
           --x-libraries=%{_libdir} 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT scriptsdir=%{_bindir}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/xsessions/
install -m 0755 -p %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/pekwm-xdg-menu
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,755)
%doc AUTHORS ChangeLog
%{_bindir}/pekwm
%{_bindir}/pekwm-xdg-menu
%{_bindir}/pekwm_themeset.pl
%{_bindir}/pekwm_themeset.sh
%{_bindir}/pekwm_ws_menu.pl
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/themes/
%dir %{_datadir}/%{name}/themes/default
%{_datadir}/%{name}/themes/default/theme
%dir %{_sysconfdir}/%{name}
%{_datadir}/xsessions/%{name}.desktop
%config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/start
%config(noreplace) %{_sysconfdir}/%{name}/menu
%config(noreplace) %{_sysconfdir}/%{name}/keys
%config(noreplace) %{_sysconfdir}/%{name}/autoproperties
%config(noreplace) %{_sysconfdir}/%{name}/config
%config(noreplace) %{_sysconfdir}/%{name}/mouse
%config(noreplace) %{_sysconfdir}/%{name}/vars


%changelog
* Tue Oct 17 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-5
- Add UTF-8 support per: 
    http://adresh.com/pekwm/dev_docs/html/faq/answers.html#FAQ-1546

* Tue Oct 17 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-4
- Add dir datadir/name/themes/ for ownership
- Add BR for pcre
- Add Requires for use of pkill in a provided script
- Change summary & add a . to the description
- Change Requires to xprop and not xorg-x11-utils

* Mon Oct 16 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-3
- Move default configs into sysconfdir
- Fix double listing of sysconf stuff
- Place all scripts into bindir
- fix typo in menu_patch

* Fri Oct 13 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-2
- Add fedora compliant menu generator.
- Remake provided menu to use the pekwm-xdg-menu
- Add requires for pyxdg
- Rebuilt with pcre
- Add BR for jpeg, png, and xinerama

* Mon Oct 09 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-1
- Initial RPM release

pekwm_configure.patch:

--- NEW FILE pekwm_configure.patch ---
--- configure	2006-04-17 13:22:36.000000000 -0500
+++ configure.new	2006-10-09 14:19:21.000000000 -0500
@@ -4915,18 +4915,18 @@
   if test x$xft_config_exec_prefix != x ; then
      xft_config_args="$xft_config_args --exec-prefix=$xft_config_exec_prefix"
      if test x${XFT_CONFIG+set} != xset ; then
-       XFT_CONFIG=$xft_config_exec_prefix/bin/xft-config
+       XFT_CONFIG=$xft_config_exec_prefix/bin/pkg-config xft --cflags
      fi
   fi
   if test x$xft_config_prefix != x ; then
      xft_config_args="$xft_config_args --prefix=$xft_config_prefix"
      if test x${XFT_CONFIG+set} != xset ; then
-       XFT_CONFIG=$xft_config_prefix/bin/xft-config
+       XFT_CONFIG=$xft_config_prefix/bin/pkg-config xft --cflags
      fi
   fi
 
-  # Extract the first word of "xft-config", so it can be a program name with args.
-set dummy xft-config; ac_word=$2
+  # Extract the first word of "pkg-config xft --cflags", so it can be a program name with args.
+set dummy pkg-config xft --cflags; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XFT_CONFIG+set}" = set; then
@@ -5013,10 +5013,10 @@
           echo    ".$xft_wanted_micro_version."
           echo "***"
           echo "*** If you have already installed a sufficiently new version, this error"
-          echo "*** probably means that the wrong copy of the xft-config shell script is"
+          echo "*** probably means that the wrong copy of the pkg-config xft --cflags shell script is"
           echo "*** being found. The easiest way to fix this is to remove the old version"
           echo "*** of xft, but you can also set the XFT_CONFIG environment to point to the"
-          echo "*** correct copy of xft-config. (In this case, you will have to"
+          echo "*** correct copy of pkg-config xft --cflags. (In this case, you will have to"
           echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
           echo "*** so that the correct libraries are found at run-time)"
         fi
@@ -5031,8 +5031,8 @@
 #define HAVE_XFT
 _ACEOF
 
-			XFT_LIBS=`xft-config --libs`
-			XFT_CFLAGS=`xft-config --cflags`
+			XFT_LIBS=`pkg-config xft --cflags --libs`
+			XFT_CFLAGS=`pkg-config xft --cflags --cflags`
 			LIBS="$LIBS $XFT_LIBS"
 			CXXFLAGS="$CXXFLAGS $XFT_CFLAGS"
 			FEATURES="$FEATURES Xft";
@@ -5041,10 +5041,10 @@
      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
      if test "$XFT_CONFIG" = "no" ; then
-       echo "*** The xft-config script installed by xft could not be found"
+       echo "*** The pkg-config xft --cflags script installed by xft could not be found"
        echo "*** If xft was installed in PREFIX, make sure PREFIX/bin is in"
        echo "*** your path, or set the XFT_CONFIG environment variable to the"
-       echo "*** full path to xft-config."
+       echo "*** full path to pkg-config xft --cflags."
      fi
      XFT_CFLAGS=""
      XFT_LIBS=""

pekwm_menu.patch:

--- NEW FILE pekwm_menu.patch ---
--- data/menu.in	2006-04-17 13:22:21.000000000 -0500
+++ data/my_menu.in	2006-10-16 16:01:25.000000000 -0500
@@ -6,97 +6,33 @@
 RootMenu = "Pekwm" {
 	Entry = "Terminal" { Actions = "Exec $TERM &" }
 	Entry = "Run.." { Actions = "ShowCmdDialog" }
+  Entry = "Web Browser" { Actions = "Exec htmlview &" }
 
 	Separator {}
-
-	Submenu = "Editors" {
-		Entry = "vi" { Actions = "Exec $TERM -title vi -e vi &" }
-		Entry = "vim" { Actions = "Exec $TERM -title vim -e vim &" }
-		Entry = "gvim" { Actions = "Exec gvim &" }
-		Entry = "Emacs" { Actions = "Exec emacs &" }
-		Entry = "Emacs Terminal" { Actions = "Exec $TERM -title emacs -e emacs -nw &" }
-		Entry = "Kate" { Actions = "Exec kate &" }
-	}
-	Submenu = "Graphics" {
-		Entry = "display" { Actions = "Exec display &" }
-		Entry = "Gimp" { Actions = "Exec gimp &" }
-		Entry = "Gv" { Actions = "Exec gv &" }
-		Entry = "Xpdf" { Actions = "Exec xpdf &" }
-		Entry = "gqview" { Actions = "Exec gqview &" }
-	}
-	Submenu = "Multimedia" {
-		Entry = "Amarok" { Actions = "Exec amarok &" }
-		Entry = "Quod Libet" { Actions = "Exec quodlibet &" }
-		Entry = "Xmms" { Actions = "Exec xmms &" }
-		Entry = "MPlayer" { Actions = "Exec gmplayer &" }
-		Entry = "Xine" { Actions = "Exec xine &" }
-		Entry = "xawtv" { Actions = "Exec xawtv &" }
-		Entry = "Ogle" { actions = "exec ogle &" }
-		Entry = "alsamixer" { Actions = "Exec $TERM -title alsamixer -e alsamixer &" }
-	}
-	Submenu = "Utils" {
-		Entry = "XCalc" { Actions = "Exec xcalc &" }
-		Entry = "XMan" { Actions = "Exec xman &" }
-		Entry = "Xpdf" { Actions = "Exec xpdf &" }
-		Entry = "GGv" { Actions = "Exec ggv &" }
-		Entry = "Evince" { Actions = "Exec evince &" }
-		Entry = "gucharmap" { Actions = "Exec gucharmap &" }
-		Entry = "Gkrellm" { Actions = "Exec gkrellm &" }
-		Entry = "Gkrellm2" { Actions = "Exec gkrellm2 &" }
-		Entry = "ROX Filer" { Actions = "Exec rox &" }
-	}
-	Submenu = "WWW" {
-		Entry = "Dillo" { Actions = "Exec dillo &" }
-		Entry = "Konqueror" { Actions = "Exec konqueror &" }
-		Entry = "Mozilla" { Actions = "Exec mozilla &" }
-		Entry = "Firefox" { Actions = "Exec firefox &" }
-		Entry = "Mozilla Firefox" { Actions = "Exec mozilla-firefox &" }
-	}
-	Submenu = "FTP" {
-		Entry = "gftp" { Actions = "Exec gftp &" }
-		Entry = "lftp" { Actions = "Exec $TERM -title lftp -e lftp &" }
-	}
-	Submenu = "Communication" {
-		Entry = "Mutt" { Actions = "Exec $TERM -title mutt -e mutt &" }
-		Entry = "Pine" { Actions = "Exec $TERM -title pine -e pine &" }
-		Entry = "Thunderbird" { Actions = "Exec thunderbird &" }
-		Entry = "Mozilla Thunderbird" { Actions = "Exec mozilla-thunderbird &" }
-		Entry = "Evolution" { Actions = "Exec evolution &" }
-		Entry = "KMail" { Actions = "Exec kmail &" }
-		Entry = "Gaim" { Actions = "Exec gaim &" }
-		Entry = "Irssi" { Actions = "Exec $TERM -title irssi -e irssi &" }
-		Entry = "Kopete" { Actions = "Exec kopete &" }
-	}
-	Submenu = "Office" {
-		Entry = "KOffice Workspace" { Actions = "Exec koshell &" }
-		Entry = "OpenOffice" { Actions = "Exec ooffice &" }
-		Entry = "StarOffice" { Actions = "Exec soffice &" }
-	}
-	Submenu = "Development" {
-		Entry = "Anjuta" { Actions = "Exec anjuta &" }
-		Entry = "Eclipse" { Actions = "Exec eclipse &" }
-		Entry = "KDevelop" { Actions = "Exec kdevelop &" }
-	}
-
+  
+  Submenu = "Fedora Menu" {
+      Entry { Actions = "Dynamic <BINDIR>/pekwm-xdg-menu" }
+  }
+  
 	Separator {}
 
 	Submenu = "Go to" {
 		SubMenu = "Workspace" {
 			# Create goto menu once per pekwm config reload. The fast way that
 			# will work for most if not all users.
-			COMMAND = "<PREFIX>/scripts/pekwm_ws_menu.pl -n goto"
+			COMMAND = "<BINDIR>/pekwm_ws_menu.pl -n goto"
 			# Create goto menu every time the menu is opened. The slow way.
 			# This is what you want if you are using external tools to make
 			# the amount of workspaces something else than what you define in
 			# ~/.pekwm/config. You will know if you want this.
-			# Entry = "" { Actions = "Dynamic <PREFIX>/scripts/pekwm_ws_menu.pl goto" }
+			# Entry = "" { Actions = "Dynamic <BINDIR>/pekwm_ws_menu.pl goto" }
 		}
 		Entry = "Window.." { Actions = "ShowMenu GotoClient True" }
 	}
 	Submenu = "Pekwm" {
 		Submenu = "Themes" {
-			Entry { Actions = "Dynamic <PREFIX>/scripts/pekwm_themeset.pl <PREFIX>/themes" }
-			Entry { Actions = "Dynamic <PREFIX>/scripts/pekwm_themeset.pl ~/.pekwm/themes" }
+			Entry { Actions = "Dynamic <BINDIR>/pekwm_themeset.pl <PREFIX>/themes" }
+			Entry { Actions = "Dynamic <BINDIR>/pekwm_themeset.pl ~/.pekwm/themes" }
 		}
 		Entry = "Reload" { Actions = "Reload" }
 		Entry = "Restart" { Actions = "Restart" }
@@ -143,12 +79,12 @@
 	SubMenu = "Send To" {
 		# Create sendto menu once per pekwm config reload. The fast way that
 		# will work for most if not all users.
-		COMMAND = "<PREFIX>/scripts/pekwm_ws_menu.pl -n send"
+		COMMAND = "<BINDIR>/pekwm_ws_menu.pl -n send"
 		# Create sendto menu every time the menu is opened. The slow way.
 		# This is what you want if you are using external tools to make
 		# the amount of workspaces something else than what you define in
 		# ~/.pekwm/config. You will know if you want this.
-		# Entry = "" { Actions = "Dynamic <PREFIX>/scripts/pekwm_ws_menu.pl send" }
+		# Entry = "" { Actions = "Dynamic <BINDIR>/pekwm_ws_menu.pl send" }
 	}
 	Separator {}
 	Entry = "Close" { Actions = "Close" }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pekwm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 01:38:10 -0000	1.1
+++ .cvsignore	18 Oct 2006 01:38:43 -0000	1.2
@@ -0,0 +1 @@
+pekwm-0.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pekwm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 01:38:10 -0000	1.1
+++ sources	18 Oct 2006 01:38:43 -0000	1.2
@@ -0,0 +1 @@
+fe3e0d77250d27963991994f83ccb4ea  pekwm-0.1.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 01:42:19 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Tue, 17 Oct 2006 18:42:19 -0700
Subject: owners owners.list,1.1844,1.1845
Message-ID: <200610180142.k9I1gJhX005620@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5598

Modified Files:
	owners.list 
Log Message:
Adding my self as maintainer of pekwm bug: 210087



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1844
retrieving revision 1.1845
diff -u -r1.1844 -r1.1845
--- owners.list	18 Oct 2006 01:19:04 -0000	1.1844
+++ owners.list	18 Oct 2006 01:41:49 -0000	1.1845
@@ -1224,6 +1224,7 @@
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pdsh|Parallel remote shell program|woodard at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|pekwm|PekWM window manager|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|pengupop|Networked Game in the vein of Move/Puzzle Bobble|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Algorithm-Annotate|Represent a series of changes in annotate|ianburrell at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Algorithm-C3|Module for merging hierarchies using the C3 algorithm|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Oct 18 01:47:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 18:47:15 -0700
Subject: rpms/harminv/devel harminv.spec,1.2,1.3
Message-ID: <200610180147.k9I1lFT8005691@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5646

Modified Files:
	harminv.spec 
Log Message:
re-add lapack-devel since it fails to build without it



Index: harminv.spec
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/harminv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- harminv.spec	18 Oct 2006 01:35:40 -0000	1.2
+++ harminv.spec	18 Oct 2006 01:46:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           harminv
 Version:        1.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Program and library for solving the harmonic inversion problem
 
 Group:          Applications/Engineering
@@ -9,7 +9,7 @@
 Source0:        http://ab-initio.mit.edu/harminv/harminv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gcc-gfortran, atlas-devel, blas-devel
+BuildRequires:  gcc-gfortran, atlas-devel, blas-devel, lapack-devel
 
 %description
 Harminv is a free program (and accompanying library) to solve the
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-7
+- re-add lapack-devel since it fails to build without it
+
 * Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-6
 - re-add blas-devel since it fails to build without it
 



From fedora-extras-commits at redhat.com  Wed Oct 18 03:02:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 17 Oct 2006 20:02:30 -0700
Subject: rpms/prboom/devel .cvsignore, 1.7, 1.8 prboom.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200610180302.k9I32USn012565@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12522

Modified Files:
	.cvsignore prboom.spec sources 
Log Message:
Update to 2.4.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Aug 2006 23:18:46 -0000	1.7
+++ .cvsignore	18 Oct 2006 03:01:59 -0000	1.8
@@ -1 +1 @@
-prboom-2.4.5.tar.gz
+prboom-2.4.6.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- prboom.spec	2 Sep 2006 06:09:53 -0000	1.11
+++ prboom.spec	18 Oct 2006 03:01:59 -0000	1.12
@@ -1,14 +1,14 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.4.5
-Release:        2%{?dist}
+Version:        2.4.6
+Release:        1%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://prboom.sourceforge.net/
-Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.5.tar.gz
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -27,7 +27,6 @@
 %setup -q
 
 %build
-# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix='' --with-waddir=%{waddir}
 make %{?_smp_mflags}
 
@@ -59,6 +58,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Oct 17 2006 Wart <wart at kobold.org> 2.4.6-1
+- Update to 2.4.6
+
 * Fri Sep 1 2006 Wart <wart at kobold.org> 2.4.5-2
 - Rebuild for Fedora Extras 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2006 23:18:46 -0000	1.7
+++ sources	18 Oct 2006 03:01:59 -0000	1.8
@@ -1 +1 @@
-24381017240a9eda5da21af0ca046228  prboom-2.4.5.tar.gz
+0f60f3ad6a8dad5b2c6d4360f181ac22  prboom-2.4.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 03:05:25 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 17 Oct 2006 20:05:25 -0700
Subject: rpms/harminv/devel harminv.spec,1.3,1.4
Message-ID: <200610180305.k9I35PEx012649@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/harminv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12614

Modified Files:
	harminv.spec 
Log Message:
try w/o blas and lapack BRs and with sanitized dirs



Index: harminv.spec
===================================================================
RCS file: /cvs/extras/rpms/harminv/devel/harminv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- harminv.spec	18 Oct 2006 01:46:44 -0000	1.3
+++ harminv.spec	18 Oct 2006 03:04:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           harminv
 Version:        1.3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Program and library for solving the harmonic inversion problem
 
 Group:          Applications/Engineering
@@ -9,7 +9,7 @@
 Source0:        http://ab-initio.mit.edu/harminv/harminv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gcc-gfortran, atlas-devel, blas-devel, lapack-devel
+BuildRequires:  gcc-gfortran, atlas-devel
 
 %description
 Harminv is a free program (and accompanying library) to solve the
@@ -31,8 +31,8 @@
 %setup -q
 
 %build
-export CFLAGS="-I/usr/include/atlas"
-export LDFLAGS="-L/usr/lib/atlas"
+export CFLAGS="-I%{_includedir}/atlas"
+export LDFLAGS="-L%{_libdir}/atlas"
 export F77=gfortran
 %configure --enable-shared --disable-static --with-cxx
 make %{?_smp_mflags}
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-8
+- try w/o blas and lapack BRs and with sanitized dirs
+
 * Tue Oct 17 2006  Ed Hill <ed at eh3.com> - 1.3.1-7
 - re-add lapack-devel since it fails to build without it
 



From fedora-extras-commits at redhat.com  Wed Oct 18 04:10:25 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 17 Oct 2006 21:10:25 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.33, 1.34 git.spec, 1.21, 1.22 sources, 
	1.33, 1.34
Message-ID: <200610180410.k9I4APs8015895@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15875

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Oct 2006 04:58:08 -0000	1.33
+++ .cvsignore	18 Oct 2006 04:09:55 -0000	1.34
@@ -1 +1 @@
-git-1.4.2.3.tar.gz
+git-1.4.2.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.spec	5 Oct 2006 04:58:08 -0000	1.21
+++ git.spec	18 Oct 2006 04:09:55 -0000	1.22
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.3
+Version: 	1.4.2.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
+- git-1.4.2.4
+
 * Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
 - git-1.4.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Oct 2006 04:58:08 -0000	1.33
+++ sources	18 Oct 2006 04:09:55 -0000	1.34
@@ -1 +1 @@
-3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz
+285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 04:12:03 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 17 Oct 2006 21:12:03 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.33, 1.34 git.spec, 1.21, 1.22 sources, 
	1.33, 1.34
Message-ID: <200610180412.k9I4C3Vl015970@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15950

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Oct 2006 04:59:03 -0000	1.33
+++ .cvsignore	18 Oct 2006 04:11:33 -0000	1.34
@@ -1 +1 @@
-git-1.4.2.3.tar.gz
+git-1.4.2.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.spec	5 Oct 2006 04:59:03 -0000	1.21
+++ git.spec	18 Oct 2006 04:11:33 -0000	1.22
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.3
+Version: 	1.4.2.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
+- git-1.4.2.4
+
 * Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
 - git-1.4.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Oct 2006 04:59:03 -0000	1.33
+++ sources	18 Oct 2006 04:11:33 -0000	1.34
@@ -1 +1 @@
-3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz
+285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 04:15:05 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 17 Oct 2006 21:15:05 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.33, 1.34 git.spec, 1.21, 1.22 sources, 
	1.33, 1.34
Message-ID: <200610180415.k9I4F5Kt016045@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16025

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Oct 2006 05:00:10 -0000	1.33
+++ .cvsignore	18 Oct 2006 04:14:35 -0000	1.34
@@ -1 +1 @@
-git-1.4.2.3.tar.gz
+git-1.4.2.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git.spec	5 Oct 2006 05:00:10 -0000	1.21
+++ git.spec	18 Oct 2006 04:14:35 -0000	1.22
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.3
+Version: 	1.4.2.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
+- git-1.4.2.4
+
 * Wed Oct 4 2006 Chris Wright <chrisw at redhat.com> 1.4.2.3-1
 - git-1.4.2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Oct 2006 05:00:10 -0000	1.33
+++ sources	18 Oct 2006 04:14:35 -0000	1.34
@@ -1 +1 @@
-3b1de2bcf5123494d79b1b1b84e498fc  git-1.4.2.3.tar.gz
+285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 05:12:38 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 17 Oct 2006 22:12:38 -0700
Subject: rpms/python-myghty/devel python-myghty.spec,1.8,1.9
Message-ID: <200610180512.k9I5CcjX019252@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19219

Modified Files:
	python-myghty.spec 
Log Message:
1.1



Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-myghty.spec	4 Sep 2006 00:41:44 -0000	1.8
+++ python-myghty.spec	18 Oct 2006 05:12:08 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-myghty
-Version:        1.0.2
+Version:        1.1
 Release:        2%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Luke Macken <lmacken at redhat.com> 1.1-1
+- 1.1
+
 * Sun Sep  3 2006 Luke Macken <lmacken at redhat.com> 1.0.2-2
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Wed Oct 18 05:13:26 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 17 Oct 2006 22:13:26 -0700
Subject: rpms/python-myghty/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200610180513.k9I5DQeG019281@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19263

Modified Files:
	.cvsignore sources 
Log Message:
1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Aug 2006 05:03:00 -0000	1.7
+++ .cvsignore	18 Oct 2006 05:12:56 -0000	1.8
@@ -1 +1 @@
-Myghty-1.0.2.tar.gz
+Myghty-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Aug 2006 05:03:00 -0000	1.7
+++ sources	18 Oct 2006 05:12:56 -0000	1.8
@@ -1 +1 @@
-afe785fabe2ca1bf1d0a4b05bf439671  Myghty-1.0.2.tar.gz
+5865361811dca4054f1ec60ac32ee965  Myghty-1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 06:11:18 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 17 Oct 2006 23:11:18 -0700
Subject: rpms/yumex/FC-5 yumex.spec,1.29,1.30
Message-ID: <200610180611.k9I6BI7r022458@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22442

Modified Files:
	yumex.spec 
Log Message:
new 1.0.3-2.0 release, updated FC5 spec


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- yumex.spec	19 Jun 2006 08:53:32 -0000	1.29
+++ yumex.spec	18 Oct 2006 06:10:48 -0000	1.30
@@ -1,6 +1,6 @@
 Name:     yumex
-Version:  1.0.2
-Release:  1.0%{?dist}
+Version:  1.0.3
+Release:  2.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -13,11 +13,13 @@
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
+BuildRequires: intltool
 
 Requires: yum >= 2.4
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
+Conflicts: selinux-policy < 2.2.25-3.fc5
 
 %description
 Graphical User Interface for Yum.
@@ -65,6 +67,13 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 18 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.3-2.0
+- Added Conflicts: selinux-policy < 2.2.25-3.fc5 (#186227)
+- To avoid problems with fresh installed fc5 installation
+- There tries to update there systems.
+* Mon Jun 19 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.3-1.0
+- Release 1.0.3-1.0
+- Added BuildRequires: intltool
 * Wed May 10 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.2-1.0
 - Release 1.0.2-1.0
 * Wed May 3 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.1-1.0



From fedora-extras-commits at redhat.com  Wed Oct 18 06:22:12 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 17 Oct 2006 23:22:12 -0700
Subject: rpms/yumex/FC-5 .cvsignore, 1.23, 1.24 sources, 1.28,
	1.29 yumex.spec, 1.30, 1.31
Message-ID: <200610180622.k9I6MCNI022645@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22581

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
new 1.0.3-3.0 release, updated FC5 spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	19 Jun 2006 08:53:32 -0000	1.23
+++ .cvsignore	18 Oct 2006 06:21:42 -0000	1.24
@@ -1 +1 @@
-yumex-1.0.2.tar.gz
+yumex-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	19 Jun 2006 08:53:32 -0000	1.28
+++ sources	18 Oct 2006 06:21:42 -0000	1.29
@@ -1 +1 @@
-f1b9f442abd67ce12aa39bd973f51323  yumex-1.0.2.tar.gz
+512a4108e9c9a1d5c8ef5ac879a92cf0  yumex-1.0.3.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- yumex.spec	18 Oct 2006 06:10:48 -0000	1.30
+++ yumex.spec	18 Oct 2006 06:21:42 -0000	1.31
@@ -1,6 +1,6 @@
 Name:     yumex
 Version:  1.0.3
-Release:  2.0%{?dist}
+Release:  3.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 18 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.3-3.0
+- bumped the release for a new build
 * Wed Oct 18 2006 Tim Lauridsen <tla at rasmil.dk> - 1.0.3-2.0
 - Added Conflicts: selinux-policy < 2.2.25-3.fc5 (#186227)
 - To avoid problems with fresh installed fc5 installation



From fedora-extras-commits at redhat.com  Wed Oct 18 07:22:49 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 18 Oct 2006 00:22:49 -0700
Subject: rpms/clamav/devel clamav-0.88.4-visibility.patch, NONE,
	1.1 clamav.spec, 1.42, 1.43 sources, 1.19, 1.20
Message-ID: <200610180722.k9I7MndS025813@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25792

Modified Files:
	clamav.spec sources 
Added Files:
	clamav-0.88.4-visibility.patch 
Log Message:
- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
- added patch to set '__attribute__ ((visibility("hidden")))' for
  exported MD5_*() functions (fixes #202043)



clamav-0.88.4-visibility.patch:

--- NEW FILE clamav-0.88.4-visibility.patch ---
--- clamav-0.88.4/libclamav/md5.c.visibility	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.4/libclamav/md5.c	2006-08-11 08:19:02.000000000 +0200
@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da
 	return ptr;
 }
 
-void MD5_Init(MD5_CTX *ctx)
+void  __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx)
 {
 	ctx->a = 0x67452301;
 	ctx->b = 0xefcdab89;
@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx)
 	ctx->hi = 0;
 }
 
-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
 {
 	MD5_u32plus saved_lo;
 	unsigned long used, free;
@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data
 	memcpy(ctx->buffer, data, size);
 }
 
-void MD5_Final(unsigned char *result, MD5_CTX *ctx)
+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx)
 {
 	unsigned long used, free;
 


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- clamav.spec	4 Oct 2006 22:32:25 -0000	1.42
+++ clamav.spec	18 Oct 2006 07:22:18 -0000	1.43
@@ -18,8 +18,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.4
-Release: %release_func 4
+Version:	0.88.5
+Release: %release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -38,6 +38,7 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
+Patch23:	clamav-0.88.4-visibility.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -185,6 +186,7 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
+%patch23 -p1 -b .visibility
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
@@ -446,6 +448,11 @@
 
 
 %changelog
+* Wed Oct 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.5-1
+- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
+- added patch to set '__attribute__ ((visibility("hidden")))' for
+  exported MD5_*() functions (fixes #202043)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.88.4-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	9 Aug 2006 06:49:22 -0000	1.19
+++ sources	18 Oct 2006 07:22:18 -0000	1.20
@@ -1,2 +1,2 @@
-7759784aa4506b314e6543e0f2a8587b  clamav-0.88.4.tar.gz
-450d59c0a663b5986cda1105b85ae673  clamav-0.88.4.tar.gz.sig
+d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
+5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig



From fedora-extras-commits at redhat.com  Wed Oct 18 07:25:03 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 18 Oct 2006 00:25:03 -0700
Subject: rpms/clamav/FC-5 .cvsignore, 1.6, 1.7 clamav-0.88.4-visibility.patch,
	1.1, 1.2 clamav.spec, 1.37, 1.38 sources, 1.18, 1.19
Message-ID: <200610180725.k9I7P3MD025896@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25870

Modified Files:
	.cvsignore clamav-0.88.4-visibility.patch clamav.spec sources 
Log Message:
updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2005 17:16:39 -0000	1.6
+++ .cvsignore	18 Oct 2006 07:24:32 -0000	1.7
@@ -1,2 +1,2 @@
-clamav-*.tar.gz*
-clamav-*.*.rpm
+clamav-0.88.5.tar.gz
+clamav-0.88.5.tar.gz.sig

clamav-0.88.4-visibility.patch:

Index: clamav-0.88.4-visibility.patch
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/clamav-0.88.4-visibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamav-0.88.4-visibility.patch	11 Aug 2006 06:27:20 -0000	1.1
+++ clamav-0.88.4-visibility.patch	18 Oct 2006 07:24:32 -0000	1.2
@@ -5,7 +5,7 @@
  }
  
 -void MD5_Init(MD5_CTX *ctx)
-+void  __attribute__ ((visibility("hidden"))) MD5_Init(MD5_CTX *ctx)
++void  __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx)
  {
  	ctx->a = 0x67452301;
  	ctx->b = 0xefcdab89;
@@ -14,7 +14,7 @@
  }
  
 -void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
-+void __attribute__ ((visibility("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
++void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
  {
  	MD5_u32plus saved_lo;
  	unsigned long used, free;
@@ -23,7 +23,7 @@
  }
  
 -void MD5_Final(unsigned char *result, MD5_CTX *ctx)
-+void __attribute__ ((visibility("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx)
++void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx)
  {
  	unsigned long used, free;
  


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/clamav.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- clamav.spec	11 Aug 2006 06:27:20 -0000	1.37
+++ clamav.spec	18 Oct 2006 07:24:32 -0000	1.38
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.4
-Release:	%release_func 1.1
+Version:	0.88.5
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -434,6 +434,9 @@
 %endif	# _without_milter
 
 %changelog
+* Wed Oct 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.5-1
+- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
+
 * Fri Aug 11 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.4-2
 - added patch to set '__attribute__ ((visibility("hidden")))' for
   exported MD5_*() functions (fixes #202043)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Aug 2006 06:53:29 -0000	1.18
+++ sources	18 Oct 2006 07:24:32 -0000	1.19
@@ -1,2 +1,2 @@
-7759784aa4506b314e6543e0f2a8587b  clamav-0.88.4.tar.gz
-450d59c0a663b5986cda1105b85ae673  clamav-0.88.4.tar.gz.sig
+d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
+5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig



From fedora-extras-commits at redhat.com  Wed Oct 18 10:49:46 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 18 Oct 2006 03:49:46 -0700
Subject: rpms/gtkwave/devel gtkwave.spec, 1.25, 1.26 sources, 1.23,
	1.24 .cvsignore, 1.23, 1.24
Message-ID: <200610181049.k9IAnkNS002942@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2922

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
update to 3.0.14



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtkwave.spec	9 Oct 2006 13:27:49 -0000	1.25
+++ gtkwave.spec	18 Oct 2006 10:49:15 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.13
+Version:		3.0.14
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
+- update to 3.0.14
+
 * Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
 - update to 3.0.13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Oct 2006 13:27:49 -0000	1.23
+++ sources	18 Oct 2006 10:49:15 -0000	1.24
@@ -1 +1 @@
-e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz
+ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Oct 2006 13:27:49 -0000	1.23
+++ .cvsignore	18 Oct 2006 10:49:15 -0000	1.24
@@ -1 +1 @@
-gtkwave-3.0.13.tar.gz
+gtkwave-3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 11:07:00 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 18 Oct 2006 04:07:00 -0700
Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.23, 1.24 .cvsignore, 1.23,
	1.24 sources, 1.23, 1.24
Message-ID: <200610181107.k9IB70ZC006157@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6125

Modified Files:
	gtkwave.spec .cvsignore sources 
Log Message:
resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtkwave.spec	9 Oct 2006 13:29:00 -0000	1.23
+++ gtkwave.spec	18 Oct 2006 11:06:30 -0000	1.24
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.13
+Version:		3.0.14
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
+- update to 3.0.14
+
 * Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
 - update to 3.0.13
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Oct 2006 13:29:00 -0000	1.23
+++ .cvsignore	18 Oct 2006 11:06:30 -0000	1.24
@@ -1 +1 @@
-gtkwave-3.0.13.tar.gz
+gtkwave-3.0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Oct 2006 13:29:00 -0000	1.23
+++ sources	18 Oct 2006 11:06:30 -0000	1.24
@@ -1 +1 @@
-e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz
+ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 11:08:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 18 Oct 2006 04:08:19 -0700
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.22, 1.23 .cvsignore, 1.23,
	1.24 sources, 1.23, 1.24
Message-ID: <200610181108.k9IB8JD1006268@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6244

Modified Files:
	gtkwave.spec .cvsignore sources 
Log Message:
resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtkwave.spec	9 Oct 2006 13:29:40 -0000	1.22
+++ gtkwave.spec	18 Oct 2006 11:07:49 -0000	1.23
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.13
+Version:		3.0.14
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
+- update to 3.0.14
+
 * Mon Oct  9 2006 Paul Howarth <paul at city-fan.org> 3.0.13-1
 - update to 3.0.13
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Oct 2006 13:29:40 -0000	1.23
+++ .cvsignore	18 Oct 2006 11:07:49 -0000	1.24
@@ -1 +1 @@
-gtkwave-3.0.13.tar.gz
+gtkwave-3.0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Oct 2006 13:29:40 -0000	1.23
+++ sources	18 Oct 2006 11:07:49 -0000	1.24
@@ -1 +1 @@
-e194d13f3afe816873b76ea1e5cd81e8  gtkwave-3.0.13.tar.gz
+ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 11:35:48 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 04:35:48 -0700
Subject: rpms/kbibtex/FC-5 kbibtex-0.1.5.tar.bz2,NONE,1.1
Message-ID: <200610181135.k9IBZmtZ006453@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6448

Added Files:
	kbibtex-0.1.5.tar.bz2 
Log Message:
kbibtex-0.1.5 sources




--- NEW FILE kbibtex-0.1.5.tar.bz2 ---
BZh91AY&SY??>???????????????????????????????????????????:?Q?DH?
@
p?????????M?n?c??zNw}T????^>?C??].???r???B?+?
??
??}2?'??
=?J=?
?s?}?>.??
}??f??s?????
??|
+<]??J ???????C
??????^
?>?{??E???
?
?9{????u????.?k?2???wk???R??????
????
?????n???O???4?C??U{t?9??7?,	z?e?6sW?|????????&??@7??
j???tw\?@??p?b{???v?1?-?;?|v???\???
*`w^?
?
?	?kd????|???w???f7nl?.v;^U??????ll?3
0&#L#&F???i?di?H%4@ @@h
y??????i???!OOT?4?)?S??O?'???SO4??'???????5zMM<)??h??P???
?Lj=

?oCI?)???@?i$?OT?*6???Q?h?????)???I4{J6?SL)?
??eOS?O?????????a'?E??!	?uUMX??lg????(V#????Y???K?W???n?_????????O?s????4??m?Gsj?EW?XX??1?1'????e?Ej?jr4d??????{?_??olW
C\}
X?+?P
	#?????=oe,)?????P?Q?n?h\?|K4O???usa?w????Ce?>
?
*x^??x???,!K?u?-??D?la??~L2d0m????????/?????C??h@?1????[?w??C1AW6??^??q'?%?/?:??
?X`?~?Z?????Q??$??L???4`	
???@
???Qa?@???B"z??0?
w????X???}?@?s?'
hF?;@K??-#A??"@?? 
y???????s^????$? ?G?|N&?}$O??A 8????

?????????#?X???H???l?UO^[m?O?VJ???w0?'?r{?fk
???D??+"Mn???)#^
V?
?0??:uH?@Ay???|dW??,??o?o
p	??}??????.z????A??'????x=???/??|Fo???????9?g'????z????4?x(?Q
???A??_r
?Iw?>??]??:??S?Gq"????3?5?????#?yl4z???~??g????n^??B????
L?h?? ?????"?{
t}@?{'s?s?????
??@"T???]?I??{r?	?} ?(??;YF??QrB!Q?
????U?????.st????wH?xD%?+?????:ge:$??=?$r?l??B????F{??m???}_9?t??????\??DO???F #?D????)???+uD!
??
s%??
??;?qsoUH??TM?a[???zk????????K?T?}??[W?\T??????I???O??/I?5??",D?JDB(???????????ZwNX???O???d?a?????Zj?p%[???????? ????
??????r?t??y

IIi+?]d??nl??RVK????v?h??C?3W?co=?T?'???X?x???$R?e?B??H?z*
??# X??>???xa??R??f?-|x?t?/?????????&A?*K??#,1?G?,v???-??u???2tR^"F/??I
on????E????????H?
??a??S?>l???p?????z3????w
"e?'??}\???Z_??}?4?e?no)?-O??U?G??[?}???@tH	???C?
_?Hgz????&???<t?|??;?m????????<&2?P/47D??7?b????n?6????nZ???r?c?L??????c?%??o????????od???o??b??????_????}?h4<F???D1?\B?
??r?H??h?;np?x?????%??$
"?Y?[l??U????I
J{???	F[?y?`???????WP??	?? ?
?|{?1?5????U?>BG??K???/???????pK???G&1,??]A1?`???eD?Y??GOO???07????????????????h???U????????"g????M??L=?\=|???t??KD$??#??k?V???G$!m%I"??????? 22e?%??u,oyg?@}?1?;<?K?DB?'K???
??T???7AO??1??Ik?*?????????v????_?[???ow??o?Vr????),?!??%???:|???~????MaF???t??????~\?o-z#??V??3?1:?K???7\>t?k?WO?????O?;o??&#????~v???~/}?y???Pg?})??p???$yP(?d40??<G*s?????ef?E?Mn???HD??0??&T???
??*?MA?:?6?????J????'??M????Ux?F/?(}????t?[?.?5AR???'wg????
<?$?>?v???'?????
?
?g7?????t??e?V?????{o???W???????#	Q??Tl??}??2 ???_?*?ZQ?h??n??????w?~/?+????tA"
??=t??i??dR??K kA?CIr0??!???????????"
&???????_??N^??#m~	U????????dKJm???F??E}K????j???scnd?h?9Pb?5\?s?Q\?????h??sh?k??L??TF4L?\?????U????G??lh???F??????W-??1??+P?1T0???1????Ed???]$?6? HI!?g???z>??}???twxJ?4??<Ne7jp?G?{???\?M?)f?m?J???????Wo????S?0???e?L?,3??"	<???2?6Ee??H???}??????z??`?W?h?R???????.4???C?^l??E3?r&????Y???T????h7?o$}'?f??"<??R?????M?m????x?+?^??"?w?}^D??l??~-?:<	??B?;?N?{???*??#?l????'G?s??w=?P???d?f??OR?????L+gI??1-51??x??<??F2?C07?P?;?I?????b??Oa?1N?????/?q??U?????H??????v|??<G??_??v6??.S?Qj?j??(?S1????9j?r0?T/????AN??????????g????XW?~?p?????????????,?Q?B???.Y2??d?bh??#ai1
??
?l?e??R!S2???#l72?X?C?%?e#???icP??L??????Y?
??aB????E??8?J?I#????s?-r%??m???tS???y?8|?k?]?I???k??%'?0? ?e-???k??
???]:???&,??P`?*O??JI?? 
?b?G*?????Z?md%/????$??t?y?7?d%'b???og????
????ZQ?+.t?&	??4?????[_??*???Dl???3?7?BW:Q??M??Ms?v???C}o<;f??7h?????\XAIyJ??#???O???I???>'pwC?!;=??g????;??s'UTc? 65zg/?p?I??????t{???[?Wi2?re????b;].?*???K????X???3,?H?V??F%DF?y??Lh??r:?8?(=ZIj+m???B??z??]Y???(??2?????a??N??w8????23????!/_.????#de?OY?????#$?
??FT?5???Hb8????*/m?h????s+^?u???4LC??h???-)C??6?T?j+1:??$?X?/T???Ua?c??rv???
?8\?;$?wt?h??':I33??no????^&Q?0??%?(T??=?&???c????$Dd ?"k~????_???x?Mx???6??6?j?h?????k???1ch?FJ(LX???lZ6?5?? ??????v?????V????X;; ???w????l??|?P??UwJI
??+?=5????2?sL?h??I&????? ?SdC??????y??4????D?C8:???l:zIP)??o^?????b???????Z?d????b.?`?*e?Ko??[?????&"
T??
a??R???JJ?e???V????9????"%iD??S
?%?jA?G?.???????S?nO??|????????n?????S%T??????2??ilhR?
E7?n?'?2
C??C(>6V??<??
M?|m??1?%?dV?r??dr?0?X
;?????
m79?m4.??t??.<n)0Uas????{??9O?x?D?h?????C??????f???K:??L??@J5?g)&?H?\?m?K??:?7l???/y]??=?=Kr??P??)???.xfLvt???,g?[?h?5?-?[????W?????!! ycQ$?G{????????p?>????????1`?????)>????B?X??gBr^?O?2c='|?)???/??f???)?U
???e?????i?????.a??%?09I??s?m????J &?m0???yK???K???X??????jC??????e?y?<,????
?N2??'3
%B?}???o?q??S?????p???g-
?a???+Db`??*??7n?e?q???>???????"3?4H(????CKb?'V?L?G?!LmR??-?M???
?/]eU????B??!t?N???E????????][?S?w????y?(3?????//???^??.o=??s2??%
?f?????????6F?d???' ?(?? ????+???>)F7&h???z?? ?wA?4hYy?y???5?}??????B?{?????VU?:oRb???3??t?u??WUK??vwT?m???????tz???0?M(sX?C?y?x??#?k$??E?rj?????n??
???? ??(??"?;?}??X!???4?JI?&????d)"??y<"k>N?B?U'?7?r'*B?
*?A???y???E?G??$???.?C;?F????????,?&??r?????f????????t??{??g?v???f?Lb?tV??gV??H?? k'????}ix8???
??vA?????????u??%2.?????\???m??????-y6<c>F?>??}?q>????r[????}y?G?S?+nr?z???|{~*???joR.???4?e??YtH???zz?????4??v?o??s[???2?T??<DH17
??J\?n(?? uq?????I??_N???)"v?~?%?O???_^=????lrV??5A?SD??E???~??e?7!W?S/w?p??4s?'??6????i?{yj4??gI
f?zw.?|??>RQU??0?J??wS??g?o?????3??~x)[??JR??2???
??T?{??????Z??7?79?w$)?????W?	$??s?<T?Q?3h?Q?L?? ???:I>~???}w?o8~G;???g&????h=?'???
}??<?1?????~?(?/? {3
?^/?;??>??3N??I????vM~?????Pl{????????}?z&9??T?^???????????Z?foQ?C?]
?iT(V??Y?{?k???yYQ=??ZcmY
z?w??	???????z??c???????????C??,?k;r)?}????ZS9??????sV?i?3?b???L??KQ?V?9sUUUUv??n,E+kQ5.%V??????V-???&?a????b@??osv??t?L?"bj?c^??L??6???t??mP@++"??T
R[f`[???zv?????A???V??)
1dD??jJ?I?[????e2??z??uE??f?$?0????D?Z?q????????j??M??>?????}????????????AQN?"3t?WG^_??9ySA?V?R??=AC??????:??????]??
?@?) BBA???D"?Y?ko??o?_?o?~???OL????t????KuTL;??u???X??????%?????5NO4?O??I?v??????d?	
1??????O?w.~?;8%TC6??r?L/???Y?<??U66?no?c-??i]I?1???
?Bo???~'???G?S????9???%??#???j`%?n??s?????NN?w??j&??}?l!?A?$V?4*??<????\\???unn???`l????????3?r|!?=???l?:r??????n???q?@???u??F
D??h??*&ta??Y?	???????????)C?l?P?icPK???,?(?PN^|???c?mA/??&?	?	?["o</??^??
??s???)???7?8D?&??'$W??O???~??q?I?S?w?.]=>^???:?@????eu?y??4???@??g?v}?
???k?'J<8??6??????{????V??????!??;>??_?????QR??I??lv?h?y?????c??????M??)??B"???e??*?Hrh?????|??????)??K;?gi??y?n??s??pU??t?~Ru?m??????/`??	I?p?NL\cz?? Y???A??G?v2????<?
????T??D?b.d?{?????1g?`b????fx????}????$??BT`?c???p??k:K???a?j?D?O?&I
?????[t?k?:?[??r??????q??7????nG?|??36???G???F??l????2?67?C?bg5T??WR?N???????F.?"?????w???????K?l?7?nc?x?#q?A??%??~?????l??<???p|^?v?~??i?K??,N???evY?^?e???v??I???{4?m?r?.?H?G[?s%?(?)?????????*G~??h??%F5<?i??i???\@?Y?Q???.r??
?HB
( <??F
?,D?????X?????????'OJ4???????/?????_??????Q? ???	?q?	????
~??????P`????
?F???v?_SRj??????w?I???<?a??}??=!d????2??-??
W????
}e?????3??5???MwdN???w??%\????{`8??l
?????????LS??0?????????????a??D?m(l~Z0?Hh?;????
??
??Y?????L??/w?<??>??:???,?????\??l??\?e??????????/??onr\??|???PI?>?=??<&???C????Y??????? *?,?qF?I'??;???_?i
???#???N??C_???M]|.??1-H?:?~;?g8???m?/<??r????r~tk???:?M?T???????<??ch?q?w<?av?????
5?>?k?p}?=Z?????R??????/??+?A?)?]????/pV?Y??qYw1I??????????Fs??q??<p2????6	???dN??;?d4???+??Z?<
??5?????J??*?/??cH??e~GN\?.??????O?Ta/|Y??P?v?eV???ZG[?????*??D}?
??rY?R?|{?????`??9?;/\pk{?<??iPS??N?/??wn?g?G??r?R?????$??]Ip???DR\?
??u.???!????t?5dM??h??j??j^????VK??
R??$????p???
>??????#????P@
/ga??Cxi?,(????e??
y???V?}O???Y??D8??#?$m?/??*?%?C??0??f!?V????U??????????.?t?????"?E??Z????
_w?t??L,&????8??^?N???h???nI??r?-??????QS???=?2????+?b*?-i??
?z~?#?F?s?#??~?>?I???,??C?????\?7-?)^???+????`?????
?????x???`s?`
?????$?E\?h9*???#V?3?%???????K>?Q?s?
??vNo???J??{7+?????p??
?g??)?????Q???|?N/]r??]4??#Z?;??
?_?D??&!Q??U????\k?}??E??Q????????]p?
#??^?"!??E?$???????U???????1*-+?i????o???J?.F??D	???????{X?j?~?R?.F?v?(???U8???!G???d!??????m??)Q?|sH?.???z-s??8??8i"?g?o???????%??
:?6Bu???$w]I$J|"K??d????? ???*??g3f.|?=?%G?v???????fT?-Hg??v[0??????345???????
>x?05??Ko8??5??_??8?NQM??2}???t?,P????sr^?(??A\?T?_?????S[
?D?T?y/_????I{??? ??????Y?'? ?(???
R?CtX??Y?Z?LAB$72?'?
??!???r)0????N*???@!???Y????v??????e???????B?Y*e????|????{Fgl??5@?:u??]??El??i???]??8?Bc?b?s?]>?n8K???M_1??????C?????l?k??K???jw????N[M???G????p|}?T?????W????_B???$?QA???x.??o??E?E2???????k??@???8m:*@
??^y????
?@ElD
??E?????
C??>?{?????Q?aC?j'???,?O??<k?6|???O????f???????}?????~1??j1'?????/?C?Mo???????I????&?Rc??7?5Am?t??@
W????PO??????=?DC??
?Uh??#?Z???2V?V???mZ??5???P??@*H??;*??R?P?i????mF???kf??j???f?kX?i? T**?"J?QUU??`i
D?;???F ?q??*l??????|??KT???b????WE?????M
-??H???? oG?~??????e?eF???D`??D?Q???|????????A
???X?U??
@$
4?????????s
??`T?H??T??????D
e?`YDS1??F(?w?Q?{DF
???x???????
?4UXDe0Dfq??#^Y??????"?"9
?U#@??????#???q[??^	?????xA$?E(?Db?w?=?Bl?bc%N
0?BL????EBx?"BZ??v????]??4??d?v??!?C
6??Tf??
?Q??{?Kd0????m??J+%?Z??a?8I???ZS)!????$c3???????:?{E??2_o????/????k*}phHOkT?"~????????dS???????D???25????%?e??E?1???a?uKF?]??m?Z+v???Z?b??y?????nV1?Q???+??H?#?8>??"i?S?????zu?j4?-0$MD?????/?<????R??	???(????C,???&F?v?C7?(??????.??=????????s???VJ4?YiE??H?????}~????p?2???S?X'i??qRWW????rl?Rs??q?????!???y??<Rsy4?v?]iz
Wff??????1?j?.?
3?@J?
i??0x???U?pc?U$q?&????Z???
#I??!P?h?P???uy?????G???a+???OU>ca?<?OA1!k??-??#???2L?????{[?????K??u??y??2?A??B??l0?d?VX???e?T6?m[?Zo????F???{m???h??;??B??????????0?5E?+?(?<dg??gG????5$?!P`b?)ky?EG??8{????S:?7b?4??J?????_????b{??^?n???O???eX/?+
?.??????R?{???c????E"?,???i??? ??????
?@?FIxV	
?m]!eUZT?)?VL??;d*?g??n
???N?V?PI?Aa?X?d???T^[qX]???LH???0f$!J???d"?1??	d???????^?
%3g=k???"H?\(???I?????X??pI/N?R?o\g??m??k??????b?Z7.??A/??1?S??dG?Y)k
"?,
3??JU???T4???>?|4????@?J,?\???U!1?u???j[+[klO:}?z:?N?iq???aoY??e???.?7??D???*??zUY?DKD?|??w??
*?#??s????E-?Q??+?&?c'j@~?K?-?Y06?4N????'?'@x?A
H??eXl\??3?My??C???
??C
???????????(?ZZ??\?????>????]um??m???aKV??-ZZ???? ~?a,???<?@?4??=??K??
?1?8?
{?
b??1?w??n????Nr???V
;???n??"w??
0q?s?(""?+T?I??L?
???9 2?q?+??????<[????5??2jZ?????Km??m??m??im??m??-??[2?1?]???32??m??m-??????A??LJ????"T?*2?gh?]?
???rt????GG?????
T???+%?<}??????????}?~???w?|??6????u[;???m???(?e?%?s(od???#??????n#?i?Z?????J?"?E?m?%p?f??{?<?l????m??;d?Wlt/?c?o,?PE!)7k???y?|??$??(?M????brQ??????98??7??22y
m???=Q???Ji???_at.??zH?Nr??{>?m^v???M??,?W?????5U()??
??????????OsK?.H?????[?????S?;???-Y?o#w??}WYZW?m?=~w???Cl????????j?zf?@????t[?]	7??iH??6??	??"	;?h<n?z$??E:2?????????v/$J?f.??M??	DH???4??x?|[?w??<???0fUKz?
?&o?????#.|64m?p?#|?hci?5PT?f7???\??+S_(o?pov?8?;x?v?faD?)B
?  ?z?f???R?Y????W??,?
(?r?rF???*!?????t<?)?$ S?ar?n?7??Q?6?*o????'???=?
???9?????P=2{?1 ?'Hq:?d??F???YL
@8?Y$(?d:)????t?)???0??(???&??!?[??=?f??V??5$??K??????z~(???A???
%???u?K?s6"??*?
I??7?G?\?B~y???????=??;????0f???~0o?W??????????W?k???r?a?d?}???=?}??^?|?N???lyx?^?KNN?????{_??I?Q??}?????{???????b??O9?{^i???99ZD???F?????l'?F?"?EJn?A?^?N??
??24??t?3?????????????N2??j????:?Wo.????q????KW?g}??	)??Bcc~Dm??$??zRPv?"h????1??b?L????'?}?xJ??n?M/=?>(??T??{??%K??f?n??N???n	Jb?N???+D?h"CvJYN?
????[2?)????l?^UC??*?J!*?L??o?<?j+?y??%+R?qDe/DV????K9????9K????^?Y?1?&f?f????	??8B/???Th??W
?pl0:g??\?6r?A??G????$U???n?E???m8?xj?-????BE?W-????x?$?NOB7c>?i1??
???5o??8;+<q?D???btQ?Du'h??6?K?ZT??9???????w????Yq?3??'??3?J7j?"b^kCA$???????????????m?Q?i7T-3?????S[Y|?????[????$-i????R?S<{zJ??c;??????[M?0E?K????u??p??#???A?,s????????_?>?G??z<??&?????_Y??????J?UM2?Q>i$?Iir?m3[S-??S?k<?
d?d?$????q<>7<??f?D?@?:??&??fl?&?>!????/?3=??H?????J:E&?\2X7W5?t??????0Q?B???YATF|??(?}???x@?13o??????????????z?!?HLAB&?????AI
EW-??77?k~????^??6-?|mB??eT?X??D?7? qd??a?t2$?	&????q?.?????E+?Hx\???w*???dy?^?I??9#???=????lP???o???Yrv?x??
?<"?xX?
?
?x?$?0???!????B????O$T???-?J?m??????????WL???"|?	4??t???u<?~??l6Z??6??QD??X?us$?ZD?L\?gJ???V?Q?j}8E[
?f?*<??-?\?V??)??:??????aN\?yG????|G	b?X?u??p??`y?v?????9tO<?yQm."??v??????j???(???n??2;?????Y?x??G8A??5??N?UI]?K'')<X??~E?????????a?F??????d??iJ.p	???S?R%??????j\??e
_"??h??0??? ?>???@??0??\V?|?~?74Y8?4^8}>??r@?
	??!??CW?y[V?B?k?P?m?l???????Z3???b]?*U??
Zf?????????Lfyz??/l}?8????MI?2m????????Cw?EgT?c2??v,&qPz?xR-n????;,??K???UXC????r??~t?6?+?Y5eY???U???7??0?L??^?u8???!?Sw????i??Dg?X???P????g?s???m9j???'???8??O?;??OIp??t????U?'??=??w??Q???z?;??????V???T??????T??????W:???k6?>t?#?JU??????e?-I[m???,?+???ZF???Z?=?????w?bU????????r8)?E2Qg??'?7J???#{??J
KzK:7????
?	???y??pS=????v7????i?Z???4???^?mv?/4S????????N????????Y_}I?]??q??t?d'?'??????l??Q9?mi?r?q-b:6??)(v??;e?^??n
?_???H?????kg?g?iRL??:??k?#??:;SF??????????*K??~2
?D$???Hq?'????!????S???C?:?lYK??}?w\?<?4K??Rz??|??M???PeH)?M)???N?=k?Z??5???{??V??[m=????W$???Y?|??'7C??????dwtJh??q??u???v??~N?kJ?q2c;??9?2??XL?n??
Jdtt?????lml?8gl??S>??e0)<??n?MT??}i?jp??a???{???v?*x?2??N??J}*P:????P?<WM??)??	Z?B???IJL?J????iJ.?m9?eM????????????o??>?oi?a?c?P;???????Y??@???u
??+1#?Jh$??bV'????Z?_]g????v13VMV|I?@s;
F????????????Ei??L?
?j??$?????a????&b?+	&??????????????????6??"A0??3G@???g??????
??@zn"|6B?cu=si???[?MK?]?RA9?;"?2%Ql[??WY?;T:? C1?F????OL?N1WC???_?FhU???4U?^????+???-?y??3?L
???B2?	?U^?????~y???z3d?????*?p?9/!m?/?,&;????Z?????<?}?&/???g??C????A?p?
?'?cjem9?uq>?_QoD;?Pp?????????X?}?:Q#?????????'.?-??V?+?????V'?c&"??)??x?? ?$0?,???$??iv?b???g??K?<O~??z4??=??_??????G?????#???P???6?o_>R=b?x?~???A1????9?C?W???W?=?=???W????a???{I??6???????/?????
<|~?w???? ??^ns??H???w????C$??n8>???;?z????c?j??l?|?n?gs
P?t?o???P???E??Tm??XI???v???Zf?R8E?;~v|???]1?k\?l??n ??Q)?vyyG^jT?l?,??g9???0?Y%4??????????>?	?&???ON
*??}?????,;???4{???W??????Ny??|3?,????hH?l1??"?w??bG??6???/??mg?3vO	?:@?????.??=???
???D05????H?
r a
?b??TEZ?C?)@????z?!48?$5!?"t??????I?!H?? ??q?
Hx???????~Rp??
?&i?i???K?U
'u?????K?r???????WWj<=????
???{Q??p??f[^&?w?0???f|.??!?S?-9?{RhL?4?????c\????r9?R??S+
]?>??)0?&??XsK'?b?L??S????t??i?2L???<??[$Mi?}?f%?RY3?^	?K%??+z_???d??	?????"jK'*q0?r&??t$M?O?NT?s'*h?'?????mMII?))0L???}?kL?$?%??RD?K&?a1LS?,&??[%???f?,??+?D?LSA1L?
RP?H?"]0JQ
Oe.%?? ?%??	?hg???b??D
???&?\?u??hgVwD??????L_j?'S?2??
????VN????M?({a?`???@????gt[????W?0p??X?H?B {e?M??v???qo??D??%
0x?&=Ud????S?y????????r?RD?]????ge??%NO?E?:??2t?j???@HHw&%?????,????u?????w=?
??-?
i??3?#??????G??$?m?-B??
Wl7?`?M?yM?fOi[#5kL>?C??f?????d<?pr!??;?g'?#e??o&?]??^|]????%?????????????8	JZ??r#??<j0????*&L(??$9I?rUi??????%??*?&I?Q?Y?6o????a?Y;@')0?7?&??
<'rzGQ?dMI?LfD??AJ?
f??l???? o?g????C*4??>?P??K?????k?v?7?bD?????FBQ0
L8I?	K?	S?
????"c?????i
=?|8fi?=?]"Gj?A???J??^G.????K?L??@kV?BKl??9??n9??/
?^?2??????U/Af*
?D:???Pb?4+?z?J9O?

D??D8???y??g?7???7?????
?RP{v?O??K}v`fG??s?\???L???U???#???n?Z?lGH?i>I$?I$?H
B???
??v??nlw?L$??j????c??IY?d0g	?DE??(s3??mz??!???J?Z?k
?;?M??v??
???
?'_??-???????bp????????R:[?}?-ZJch-?~?????nT?37?????????Hi@@o?QuF?#7(?L?g??@`??E?t?zS#F[?
??N?h???5?k(?3??x!J??I????????1*)??#?!???-?W?=qh~?#????<???????9??t??2n??????a??G??*#9?z?[????t?(?????
???K?i??IM?;i?????6?&<???
?????q?\a?x4?I$
)????????yc?3o?w????????w{G?!?K??Mt??]?6?h??????vm?????O???? ????????X??zh7???e?Fh?01&?f}?n<???
?$?H&	?r?_
20S?2V??????v`tM??l???FAPR?14????????????=??????p3?I?B?s????}
?3
D?$?x2???DH????	
FH|??Q??	?vO??7*?UQ,-??Q????
6?uq?M$??N?????f?O.??6?\?M.!??	?a??Cg??i?y????w
???$???P????a??2?k????/?-	$|???????J????L?_?g,???}?=?u?$?Iz??>??bY?0
N??v????o?+?O???{??7S?rJ????~d?
??.C6?????5??R???????6?`?*?????8???.[????`fn7	J???p??? ?&W7??*7U+?y????????o7dE??
 ???
??R?_vc|?F?S36Y$?y????	??A?????j\`?/??ZBqh????7????????ur??t??N?:?2???
Ge?S??X???2?9??????.??H?2O??n??)??O???>?????p?&????f???Dz?????}?~~?D?w?/1??4????HY?R0BDd
?DC8?
l?z,???*???o?!J?I\????D???rK~
>?D?lH????v"B?Q?:))1a
8??N??K??JN:n;??)???.??O????T???????v????5?!?;?K?Tn??? ??kv?F=C??J2???x?{r?S???)?R????y???????^!a?g-???_Mw?;kz?0?????Y???????'???v???p7|St??????????????.?j????[Rg???\????J????z?F?<s6???????E???????e?~??????~?
/>???????0?=?`}?f??????5+???????(?????:s?#??'c?:????2 ?C$z;~??W??"?? r?JG?1:??!0?,?2oy???d)?UR?'?_t????x?e???2?Jn?33
?q???J???wco????./?1?Ps?y??ui????O'8zyB????c?	?VcwE?@?B%i??n??\?I,6PK?b??1w????
??????s?N	s?@?_<*N?h???????????}???#|?-+???h??p????=?~n???4?-:T??4
#4@??D?a?????????ug?????w?)&
L????"?-R w?V?????|?w"?nYn??????]??E??????a??nxs????u?1?*>?\?
M?#I7q????;???y;1?1??=?cnYZ??6Rs[???cy?z?{^A?? ?7$M#?>8c?Q?v??z?????F4????GH?q^?z?Nw????????o?#C??it????80w1??g(??q6?H=??x\?????Df?
?!??

z4*?|??M??????CU???v?w??M??Bq????bm6E1D~1?P???v\??a???G?????[???~??QF?????,?tK???g??g?&?Jv{????K?[L????9???M?ua	@???
`????75i
?????cj??_?s?b???????'v???????,1?V^??7
X??FX???Ro????~s????(	  ??M???L??Y???????KD?"?)??M????Zo?????: ?NZ?I0??"???r???P????;?g???=<??4?8H?e~????NS?`??qFG????n?:x?g?yjsZI?rsR???tT?<~=T??/?????v)?s?q?4c??[H??wp?????????????B?W??!???]??[????o)??????^??????j]??????#U?E??s7?8sd?dsyq?d?d}~??????6?_H?:?????`$<?N???3?3?M^?A??WS???????V	i#H}a??NB?;h??Aq?????<Y???g?L?X?z3`X?*w3O?????I i0
?H~????????|4??=7?t
'8g?L?u??n?'-?=??8?????a??F?
?=^????Q?????E}?q;P	6H,
: <?o?<x??'?v??X{???v???????~gS?y*?? ?z?
YO^a@?\2+(????zyu2BM???'?
?;R?U?<R?G?z\xvq?E7????;??I$??t?)?=????{??N\:s??
"???6;S
\?`@/???O4D;l??!??;4?b??,???+?%s?J?Vw`
4?Pn?2B7?HN?ji??_
TM?d???????6e??'?H??y???$?T???????(???F??????6lZ?lY?v????b???n]?f??Y?f????sX|P?jf??Xs???Gf?Gc?]??wq??w?wr?^??--??0?Ki~.]0?~I$p?l???Q?N~??"n??M???????5????hps??d??
?n+?C1?ca????wY??E?}?C?:B??5Iz~Zx???]
??D?u???5?Gf??:?7?i?{.o?????\X??-??x??[??3??	
?*??<k???_s4?+7??9????pZ]??k?xh:??zy???]yv$?$7b??f??D@?CA
??Kf?3M*t|??oS?f2a?;????.??9?e?????ue?1?G?????J?g*u?^??????
?^???Q??%???????[fr??z?$???<=???V?9=e?;?p??]Gmk-???t?x?L???VSkQ??????id?tt??c!???-??/Eg???V???D.1)Oy????8De??U????????n?[????vKo?M
??~??jW^?Nw.zq?/7^3o??c0??????yE
?r???2?????2/??E???R???</?%??V???#n F	"?N`????dKRY?:?????????,S???????k?F$??2????E?????)3????T?????,??????+?????00??>?=???n?i?o??[?????J???e???@?d?0?C??u?"??1S??1?u??Q?s??:?(??/????r???e??t??6????c??F???????O\/?I?g?*?%?k????4?>?{??!??9?L?S??8??F??P?}??????N??\7?c{m'G????qZ??
?%l??2???m???*????)?S>???????_<?<?uJ???[?t???xdu???S????>?O?fC??~???d? ??g??????g??v??y??H?F^?[??&?/oN!??j0?k????4w??3?8}?AH?M???	+;????S?9T??????K???????u????6?H?)HnI??
??.?U?
m1\|~l1J?4????6????b???%X???k????x?	J?)?
D??y?T?????'b?Y?]????????}???C? ?yb??$Y???P&?Q??????9,[??-^7mZP{{?*???6?
?5V?*?`1?a ????N2?????!????"B!???A??#p????CVr?r!?p#	6?B&}>??+??D??(?????_?{on}=??E?ka?????M????d??V???????7\eV?|~
?V????
_????Z?4??????h?9??|-???jo??;Q,?ff?????CLTm??
??Yo?k???5??
?i???Z&??1????jU?}&e?2???????
<4v?T3?I???????
'???8?Qg???2??1P?RT??G?n?]????sx4??m??UF9????|?
???;??????{c$??}??^p??T?c???
??1??*?0??`?d?b???)??)??)??)??)??)??6???&?f
b??ci?U.a?w?`??n??f?f?f?3S3!?fL?ZU70?30??Ssv??|?}?3w???,>??Bf???H?:?"1K?SV??%8?gVg?^ xMd?};:??@???m???T?U?4?e?Y???v????I?bf??e0??&+,H?80???8?Q?N?[??g>???\??/??????1"???q????f?S|???
??????u=??Y??Z[???>{?c??????)?>m??F(??|?a+?7oX?????68??u?????>?cx??V??+???c
??]M??[??G
?-?$??????;?Kwc?Y???????z??y?w/???,?????N???)?aS/?o??|???=???Cwx??9Ot>'?????????]?2???k?????nBM?8?|?0??C?{??6
??]2??`??@????$?o?M?y?S)??@w???
??w?S
?????????R?:5!mF???M?S?%.#?????&??2???????*=|?#cl?????o??{??Ix?I.KM:?????????s?Y?ma??1!?B?dz2?@??????????????! ?-?QF???VD?veF??
GC?????w>?-gu??????????R????????j????????~?++???}??Xww}??????:??(????3??I???(???9>?Aoc??k?j??{O??u?E(?2?c}??
k???GY4!!
X2????h?7g?I????'9?
??????????w?
????????%???m??}i??Yp]?1?.?+?ah??`,`HNZl?Cj?d?}n??1?!??qM???b6?$i)x???[??<??6\??q???M????N??????????f@???:?8???2:-???/=y??M?{?G??????z?;T?Fi??v??^??E?L&?*;??8^?y@?W)?????H???"~9???0?F:6?s?`?w? ?n????,????2?????s90?2??y|B??o@???90?J?;??&?t?C??c?uk?????J9Sz??!?]??My??kM???Q?N?D!?????oR?(???X??Q?.i?{=f??Y???????(:??({L;?5??M2?r?7?????5?k?^$??w????,/????Tpmj})?r??g?VHa??????c?)?c??|?{?tD??N?!??|d?C?I$????s???e????+??>('?l?ty??P?S
???u??]?e&??M?E?Z?F!(q??
?9?;??:.|5
????w#s3%?rRgM???o9???Go/???_ff~l??;A??
k6?t?dv??9?DbR?O/l?M????}]?%?g????o	?5N?1?ow?#????i{???????fwn_\???[??lnnuq?m??hT2???.?{??e?????M????|?-[?yB{?G??F	???s)u?g??Hd?!&I?a?I2?
[?vG?4???)?n???????>}?8???????a???q?	?4??-x???\?[?#}?x?k????%?5???????)?Q?IY%2r??a2	!2	
??Ci;?m+>??S#2RT wt???kx?N? 	?C??>?v??????5?/?wT?	34???G???R????H??Q?"3???%VW
??t??"<?X?0?C??4]??a????y??T??"F$JU???;???Y???s?9?$r????????X?n??*????/???E?[Li?J>?*VS?oyfgd??/V??C????x?????BYZX??oS?%?z?N?"?????D?e??Z)"?/Y?J?1???0??2?=L?G??^?Nw?Wx?-Kn],t?a?n3%
zl?
?v(???5??????[xm?C3&L???T?????V???m:?m_??o??0???@y8I????n??Q????S??A??m?_,?}?j??vG?}????L?ts?s?gW???FR?????G?????BOY????X????<^?u&C?Z7?,?n??3
?????FZ?"S?4?Y=[.??V??^?n?????yO??????gc?@?C?????)t?#s?&=:??0??1??T??
??????????7kLn???????????PK$?0?h??N?G???????oe@{O?GL?:????&??
????6???^?????!G)????????c??a.?y?	?63W??????1v?&??b?C?A&8i?Qp??
?>???1?H???u)h??2???{D????????"??ftM?SM?????????F/.??l?)??7??M?7dY@??<????/?w??Z?
????&"???B?$Nt???0?
???[r9k????)?Gc^?{?S<?w_8????N^??LN???F????n)?}fv??B>7?????Q=?m??????q)l???6?n?0??Ksk??????B????d???????W?O8?@:??:??+????*???K???z??=?G#su?Q&?)@J^?[?q?8?????z???L5?VN????? A#?o<??q???{t?i?3??2W?K?????S?}?h/??{r(??:+?????????R??u/$???2?????|?????I9??~????3
?]????7?t??????rLt??U?bcFJm??q?????k6>c????{ZR????o0QA<?y?Y???
??>???3SD??V????sz2:?=?????a;6????Eb_?oi?(S??Wv??s?*0??Z?????Y??el
3??\|?&????"?X"???D?f??\??_R?????????g???e??????q??????y?T?C'?????????!??Va??a?"}i??+???x?1h?@8?:nre`?y??t????l?r?Ht?
0??ab?l?????4?7???? ???nc?'?}G
4ss)K???8??
hka?b?1v9%.v&4w??@????4ET.
!?y{??g?E?h4H??eu???c??
?`
?
$l3?????+R?B
?h????7???xIcm"'?????q?2Y??
???8?d?]?b????????????33??????O????L??9?C????C???7????T????
i?????????>?;T?8?7????Iu??????N	?d????n?u???:?????????c?<\B??J?N?}?q??g%
??o>?*????P`?c?|$H?I???????*53???(r???X??^M4??????{??nQ?????RW??on??./????{G?j???m??=???x?{?O???g d????A?9y}p????
???p?3V&?:?I0??wz7O??:?????O?E?e????~??????Rzs?m?>????9?????W???wj????????~:w??o??!??g?_A???o
5p????I???~???????KS???????\??????=???5?????Wl? ?5???????Y????G??}???b?;l??3w???&?:>????=??????B_MI???|?r???????a??{
nm|??????c??R_4?JH?*???;q?????*????NUD???K???U???>s?.?y??A(????^j>???-??G????5?/??5?>??bC?r??H???+?i%??e?:?/<I}??6???MX?)51vB????=,R?}C[_W???????qa???y?9?fgU)?iXTw??&?????\?S,?$?:??
?Z}OX?????9??v??j?B}!?|?w??U?xO+?.?-?N??u?y??1~?q????W8q?b???????)?`????VTEf/?=?)?h???t?W,?N?U?[)"?Q??"~??????&?_~Uw??rj?)???????
??82?te??i2??P?F??????)????s??H3ff??y$?O`??;3????????t?`????})???W??????)x??u?n???5?^;????m???????{zT?1R?k?hGJ??????????&S?W(??j????\sZOY?]??|??1Y=????{?<n???c?????g?????o???F ???[=z???q?/???????k?st??????{?x7???z?=C?Nb$ ?Q??Ai??[)"em
???a????2????<?Ww?????E
??k?y=?}?????O?>0????{my???~}|?J?;??_?|?/?????A??S???;?j???}??M?w???o?E~i{*?:?????cSz
>????p?t?X?&????z?DcX^??+p????????|L;6??Dp?soy??a?y[?}X5?iK???5??o????D???f??g??r?d?????Hc???????_Uu????~&%??Yu???JO?/??!??30?=???A_?E?<???\??F??
~???e??h?????????t8?<???'??a?C?k??>?????=?E?$H0????Xi8?nO?^8)"?#y?
??C??=dW???????o????n??_h??~??????z>>?gO??C?L????Rq???????????+????[???g??6??????a??+??O?????????nP?]?????5????EI?L??O-????./??
.?x??)??@?, 8??Z???(/p????N??z9??t???N?????!???L???
?I????? @?????fX??L&M?B;??9/c???{?`$p???y???x??_???X???LW?n?????????F??????n
??8????H?@?>z}%?i???6???z?{?U???<??????????I?_=?????O?????.??A??2d?/?jM??2?t??%??2?f??&??????*?;?X?Zi
???+?G???+?z??It?9)	??(O??v?v}c|?p?hF?????D6?KKb}a????N
Q?E5,p#??}?????Z?-?v?#a??8
???w??U???}??q%??A?~?q?$?cm??=?rC???2????bk at F?%J???n?k?????=TG????d??NE?????I?0??(??
?(H0gj??mp?h????6^?E
???H@
>@?h??v??sY???U?1?8%?4?m?????????F?|v??rf??Y%??/??????r???K]?#??Nm??k=b?'?????z?
L????W,????
M??|7?????z?(?|[8???M<U????UUV???&??!??b???Wp????x?I??B?O??_(8{??02EdG  #?x-??
???=?? *h!
?)-
?k	?A,%???%?RB? XXV	,(???D???@@3V?e?)2P((???S2?f??)r??/?[F???&?I???KWiS7?????+*?" ?$,?B?)???????mI?ud??{?h?1	??
$a '????l???s)
&?
$d??$?AC0;IeD?	?h?1???????x?t??0}?????????N???c????/????b?*&0*%???.?#0|?=!??A?'E1
?u?h?????l?(y
M?"?d}?V1?????$????df\??muuc?K|g???i??O3????#???un9???yk?Z.?e??93I?'???],??l2?!0?$??
???~?f??N?-?S!.m??}???o$?O?d???{7W8?K??FBQ*.j?b??;m?]T???Ok?Wz:?(J?[?h?????3:????aO??o?K??????C?T?hp???J??AE?0??lXdd????F8?^? 0??u>???#G?????HHn?k?????S?c??H2f?]Z?A??????m)O??9l8??G?????? N??^??!Z?UPA??:??Q1????&??n??._?7????E?&?e?W}^v??e??'??g
RG???3?p???s??Xu???FtsfXJ7????h?????{????H????zr?`??l2?&??????t????&???8[	N{??:K?tLK?t]??Ot?f??lS??????)?E]????????m?8%?Y??i??[<V?
~U$??I1'yHe??? ?R#!?????h?????sq?!B???.?W^+?6????
???O/Z?+E?T>?9?9f???1??:3???J6v?B?~??F??
F+???????????=?l?K;%??5??=y???{m????#q?m?7??6??!f
C?}v'??l2??M{??x??W?f??c?p=Ob????Jx~L|P2??;????(???6?Uw???y???9?|?O??<N?_??>???y??\???/???????d??e]?H?b?W??7????Hh???,x?iz3?xL??K?~????o??8???[????~fg?#pwU?k??<2?'?
???wn???
?]?i??0Xd@
????s???=??:????????/???E????!h?????T{?I???>|U??y?|??/1
??m?{??Qu?C??~?V??????rt?s??^;S?#?/??
????{???????n'???-?&+??%I?G^?f6????y/?????????:??ZC??????8??????M??36&????c?^1?????n???O???;?(n?k?Nkjf&?hs????????4?????????P6???d?H$?B0??T"Q?e?{'?????oV??{7??????'go??I'=??K??>_<??69xM[??^??P?wYq????dp???i&x???.?5???????d~
?????+?LK?????????
????&)uuA-[????]???E?4?$?J>????W??'_w????f"????[??*??????.?B?=?Y?|n??.nh-????{?2MTC5??>??9=????
?
AE",?????2N\o_?=?-{o??_(??K????????????q??@6x?
?#:-
?.h?
v14????$????~??????U??? c???_0?&=_z???g?.M82lg?nh?V???)_?Ug??59??R\.~;h;?=~?_?k}?????E

ft??????Q?N4
LH? ?Yk!
?w??0 ???m|??|??y|l??I???M??N?X?)%?lLC?h]?'<=??q?
i??4?M?L?0?I	??0?B&H??Bf???$r3M?k?G??p?DN??p`??
3??@???o?PBv{9??&?OY??PL?@?tzb?a?:???LLS?Q)?wG?p&??
C(& 0rIZ")
??d????$.??0K.??-??5Y?????W*n?A????L?
/?c?;?,??/?????????
?W???????0????a????i?a?Bk?=F????????j??[ Y=?Ra??9?y8?j???9$?taz|z??3??K?Qr?Yg?????>??
l]jV????2?n?8?a??oW?;?h??J?Z?Q?*Tm'b9g6??z???????d???u?????Bhy?&???2*??FZ<91??^J??S?^?^???Q ????6??C????.SqM????J?90u'??x????d:????03??>????$9H?3yJ?-8.???j
y?T$?	???c?Z}7?VU5Bl?&???"0???l7?U{?t[?f*???????~?????????bFa?rM?F??m??m???-??m??m??Am?[m??m??m??mofm????bRaN$Hrsy?vl?]?rU`?????7?????????2e3V??1???????p??T<1EQb????-B???2Cc?[f??Wr??~a?!????X	????:ACBx%-??8???'=?&*??.L?????2?0I],??Sm??P5g??M?8b?????B????]1?
a>z????jF7]???v?K?a?v0q??(Vt???i?7
;$%.*?$?%v
?iD?Z?L(T??9??3M?????<??W$%?????C??	]??:Z???F?Tiy?}?{???j??<??K?h?tl?|,#Vm??p?N<!I?Hf?m?q?d?Y?
??j?^??%??d?97??Y???R????!
N???u#)??3??$0c???1|????Tg??9p???7T?D0??ee??G??#?O???????"5??+?9O???k???O?|Rr?
80??0?C?????~z????????????y?YO?k?3?????z?){??+???????+q?????{Y?=???DII+?e*????c??aE?C????i["??????f???)I?m???D?~?|??S2?	?I???????K???????IG)J+??A?;???i?6?V?ik}??>???~3?o??????Kz??=??k???5???????s?R?N??OT???v?????????L???1\7?s????????S)z=?8M<??	?v???E!SA?+>?AICV	e????d]?<[??\??!!)$???(d???k???????)Z?6?N?dZWhY=????I?r'?7?Q
>??????u??$??:L&???O7?QJ3Cr{?_q???p??h?s?X00?H^??QA???9\?6?Y?4????7V?:
Y?6U?
J??9R??Y?r
	-?RH????5)J<M?Ga???HCRD?-	???V???#???%T:??O(?!Sui?T?h????)?C?)?Bn????.)?r??;??33????)?^??;V?p????%???X?V/?i.4??y?????;???W?qIH??R?~??~??W"9D?"z?	???T%,D???BFw?{sk??3r?+????c??w???????,P????95eI?NS???$????f?nzR?t?mt ?;,??$?j????)fD????!?e?"??<(~<+??h????=??R???C????X*?i?C?%??BD?L???.
?ssf?f?????+Q?J'y!wkF???eX????J6?Noj?3{?:??#[^?-?<3?v?????zqP|??%???+b??8!?-(?{?,?z|?J???(????C??_??'T?s???w??s????????T$????m1?E???z?R9???y?d??[NX???? *>??%yU??	RPf?_????fQtM;t??K??g?P??[hs???S????-???"%??n1?!??oi?>??v??AI
?Y\??W:????p??????B????@v??y
?????????
?m?*?X}?????JxC??????????L??;2???4">?6c??D?????PSUS$?T???????????vn?Q?????@??nA;???????????????????S????????Z????????o?????Q?L?ZeD?,d?%,?SRm??'kk???C
X#F??KF??????6"fkI?<???j???!?YF?\?t')?@????*????????????l???y?a???,LO???p?.?"=???????A????ky??i?????#?A~o???r?????>?j?4??w?q?M0??i2?Q??C,??R?^?I?
\?q?H?.???U????CL??M????????i?????$?E???r9	??tq??d??6?;lm????9?????^?!???3?x??P?`??D??M?M$&?T??_???l?p?$??Z?0
c(;?0iM;[@cj3??o???\?qt
?@
?7^??I\?e??Pt?;?????$?j??)-"??i?*gN!i]?y??????ye???3????"?n{????]?????????Uo?=y;
??*?????V1y?<F???????-:????+OS;??????h?_N???2?U'Ywnd?i??
]9??%??~l??L????M?I1P0Uw??/???tO?j??????y?q?&????{?k}?L?????D?~;?\w??
?s??b&??????6?=???^???R??E???Af	F??h?4A!?I??d???4V?iFh?J%L???ffSASL??5!T?VII"f???2[$cA@	???s?N	??[Co?my?@$??RCy?????!?C?????????$????0OT?@Dy32???,?B"l?`[???D<p+2??????
_??@t`a??$?YG?????????a	???4NGM??%NH?UY???|R%?????N[?rA?4???7o???%?oD?M????	??]CQO}'D??"???{#??9???ppc??>'?z???=?_???V??{??.N??w?w?H>k??ZNY&=??
????x??;?_;v ???4D&o??<??oW??i?#????????X?
-???SM??r:o]?M{??"?????}????????q?dI8????(???MR???????????Cz?zT?z?yP????_??Dy????(7?X?]?0?/K??1?????	!??13o??\?S??G???7
???????xx\:?
??S??yf??????`$ ;?-?t????3???Q!p??%???D?0)?[??a??"??=????*???(?R????&?1c???????4?)E?I!?4??H??6?%%M

??Zjh%5?F?I??4?f??6???&??X"?Ja6?????Jf??`?Q?(EQB? ?FM	????Q
1?(?lU1%?,?b???DCa?,???da?6d?Q5?$?&L?	Q?????"?yNuy????D!
6?mMi??.???~??;lsL?wm??(???0??????U4???<??-?H?cY*%???4????ci?~??W???????V?bD?'?????p?A???!?????<???Q???????!!"I???I???	?????o9??9?+?;?y????c?wq?\e??5?QS??2
0????2HA3??-?0?a???????Zr???;W?_x?#7???_K???&~fv--?[?>???tU?x?Sx|????????:f??g?X???w\^?????z??n?a???B#w???R?????????l$?ISbj?M?6???L?y??m?I~T??)????[6??????m??#*??N5$dUF@?y??>m????%|?W??1? `?C??	tD??"
b(?	;??]L??L??EQE2?L?S)??e2?e2?L??ES(??E*?w]????
)???E2?L?Se?3}?7?S?m3u?;???d??!!$F????i	(?Lj`#??)Q?$??P?$???-SD??b??i?,?b+X?e?#4?)?4???h?b??+,mJDX
??X?%?e?Q?b1$?&l,??wd????????I?????(?W???Sd???$?%?#i??H??0c
,?i?$???1	?$?"??Ddh
??u???d?????"??Dm???f?HT???kQon?V?V?????V???DS6@?????Z?RT?&M?!$???U?????H???????6?"?,M5$????6?KY-Q4?E,?!$1B,??`???4???L?"?b???b?HTPi"?-??X?M?2??h?ci5(?6DF?2""?a&?V???d?U??l??J?????*6?
S*fI?F4h??E????j2K-AYaHQTTFM?%HZ???a2@??	A??L????????5?????NZy?t??0?????c????????{$3?)?
 ?I
?

??
?!??TPL?????g???0.?{=?=3?Y+????????I?iqT?????????Y2?a?hZp?x4?i?.??FOQV?F?,t1%??k0~
??0LO?,??|;?v?I?9?>FM?????[`??7????~_+?~????????;?
???T???!	?$???d??u?i??}Z[}?C??,????X?????{e?}%?i~X"0? 8?#????73????"p??F?Q?8??.????????$?;Q?n<??1|??u????2??-d???}??/?z?z?>N
G???}???&c??????M}?x???????Eb?8?'~?7?
N\?"?<???f!????:???????,?o?O??ZG??3y??????????w???????P`
p??1?"ED??%D!?<??9?
??^?W??_???????Mjs?"?J???C???	<?0=[wE???	-+?'????? xil?[?q?n??????6?#??????3??n_h????$???r?s?4r???????;??
???F?????s@>I%??????d??c????lt<??8?})?c???????????KJR??L?"1??c?Mm?`?(?????q?AW????qv}~?s????>??~??g????????F????}???^??&???<?\??n??N?????N?#??Y??gX????	V<?g??p??<?7-\?$??b?3e?7o?????1???????%?????:?i?Q?????I?A
??\???`??f:}v?J???]"s???M<?a: W?f???UH$?}???lop?o2??S???*???gyR{?O?i?|_??????_?y?????=??~?m=5??N?m????z???/?|??a??Mtz5Q??
??Z???dz3?P???:???
f$?Li???:?i?mH?]~%???>?Ym??Y?]?Q%?s???S?v?-?y????A?G/???VZ(????y????~=????z????U???????-???"#?9????????!!!$????u^</??????i??s?Jm????i?i]?????{u?f3??l????$?b?=????aO???.I
6?,,q????o????Zb}?_??6?P??????.dF?2oP!
?H??]$?g??#??v?n??9t9????x??&?,?<?)?SR6?k
<???!???wfc?o????
????Hq???C?V???M??#?}*^&?T[[?1??&????f?59???"H??4??D?L?p?J?????pF%,???J??
K??W????s????z??K???zw??V?u????/??9?????v??`S?n,;??D?$?????+?|
?%????)??'&z?SN?N?o??O??l?QO???d
?HY??

yu?mt??JM???4}?6M??=???&(k????C?????'R?E?????x?)???(h=/3??s
'??Fe??x,?K>,l?b?~??????VI+???F?Owj??k_?? ^???B?D??,?>???{_I??????u?@????U???Dj?$?+?????h?
?G???k??@???Sc,??uH!_????G?(\H??qju~w??
??@????????$????+?????=F?&???y??(?gxx?%,e??????,$????1?7M?Wa??M??%z?:??c
A;?5<???l?*?1????g????k??Cn9??:??05
??540??>??=e???DPDK
?Y??)B??v?e?R?J?:q?]T?J?zt??)?'I;?b???????M?:&=??b??<?KYp?????????#:????"&?\@??i?!?p\5{??????? ??d???^T?????|??c?b????F?R????nl"???.	?}????[z???4?\????v2?$U????R?]?B%?ze'??)t;??%????
??4?8?D?os]????????t?p????T	 @??fO???????=<"?L??F$-????A???Gt?R??6G|?j?{o???U?T$???????G???FCaU F$???s??S?????|????Ey???[?? &?*??????????4?@\?d?ZP??????B&	?d??	?@?e?L????&)lB$t?/?Z?|??h	??K%?
?9?*),?9?????*????'|a?|??p?8?3?!??IW?ff.??? ?(*U?)t??RRR_qb?5n1???9? ?0P?y?????ku'}??of+?XH?&??
?<J|?	?????Q?@?#?Q6SL#?aNUo?!?u?B???d at t??0
j37Q?
?t?????7??p
?H[??|G~LI?	5n,hR???e?????????????0?N????jx?Y#?j????%?V?j???T?k?*????O???lw???J??w?WL?p?dJ??
K)7??]?S???IuK??J8??

???????v:?1???:z?EN|[D??R
????Jz???^??L???9??#?SNS#??+|???:k?V???UR?K?_???N?????_?????o]p??"<?#q???~?????z???#6s)g??X?=?T?elO???:^{L?/?q??mi*???q*&?=k]?Y??????9{?a>ndV\W?=???X?$?,?W????S)`G?]&i???&?Ic,s???`?????PF,TU_??o?8??s?-????B???6???v=????????;?W?????????U?1$???>??&1???ggc?1?c?vv1?c?1?c;;;;;;?3???#,?N?/?>g??y?k???,??
?+rP?&1?H??:??~9)??j?A?6???a??
!?)??~&?w?D??????(?7j???7pT?O,n9??g??w9a[7???V?????o??H???r??F?I:?U>N??6?V??7???kh|h??'z?6?&?{p7?w??F??B
?????????i??gf?j,4???ty??j?^h??j??.??cM9????u?M?&?]??v??]C?9?.z???$?L?u?y?^
ov9?Af??!????????????[????.]?c??!Q?9??d?G???????u??????+N??y?$iSK?4>'? ?Z??D????N??????bQ,g?*?X?X??b?I???L?e:V"?w?Oc9D??Rd?5j."?????~gfjP??}?846??dn}?f??Z?dkf?Y???%h?E???|-^
w??]%???No?[??m??????fz~?	????+??^??m?O
??P=?U??D??S?4?V?(N?Io??"Q%?5???Yv???*D'?H??C???"s?Rz=r?T?ezf?s?H?????M?[?????yJJ?T?2??!d??X???!jL#u?????g?IM'?s??????s??5?5?zg???FDJ?Abo|t
b??n??=??Y?N??N^S?,??C??Qi??I?Trq?YJY?Ur?????X???y(|??5??81$?H?q8?n<???????????k???uFMe?	Sy???7?????
?|?	?8?X?/w??NQ?TT??UID?Y??$ZV??M?!
??	n??)??$V???QW??TV??????v???`V?Ig)i??R???m?1????%<i1H?Uc,??<??????C???;4?s??.??s?
f??????&pRKkJ?Tv??)I?wG$M????F???)??t????6?z?@=?q???w%(H??N?H?o??c???/??S??C?CB???????#Rd???8yI? sA?(@?o??J????:V"?w?O?t?Z??X?&d?&?EZ????!?+m?X???i>
%?E????9QJXD?Qw|??????W????&??M???^?j?
??W??IL?h?????x:;8i?????p?0?Q?
??i???j???Hxt???z???rS?b+Gy??1(?]_???????t
?j?????,?g?%:V"?w?O??(?%?w?Ti(H?G^????rO?`?a5D??????????a
?7?}??Y??w%??/K?????i??	?K??j??`?g??]e"????T=?#.}/?0/??????l?`?
??
/l???k!>
?????S~???_w??????|jP?u'L$???4|^La?|????u?`?{T?!In??y?t?'u???5&???????;??J~???,iDur??/A?????+????H?l?=??h??B?HL???e??
g?o???h?????N?x?q?96?2?YyN\???%9?????^J!??RD???K0{?G??
4???}??1??f?N?o@?????p?8
???g
?
??am?-????P
(??
??????%J`E"??t8N?~?????|??U????oj??n??>???g!
%?QZ??P?uHU5R??W???G???\??N?-b??????<L??6???	??d???IV%?%X?mA?????>6??'??????
????]?n?`?C?~?????{??6???(?P?"0?a9=??p?{?g????W\QT<?2???8z
X}? ?[?\6???S?
r?x??(??o???Oq?2???7?????????;??????`Uo^9???~?U&O???????+?`???l?
?x?@????![????{??_F???o?z???????/?????&p:_?9??PU
??q?+??????`?X,????????/??????>???p?X(,

?????????????{???	-?????Ji\?e??????r?????ON?z?t?)4e9?HP'J??????$???&?m???e?~????%?CCD??f??!?5?N?x?s?dF??E
I~F??4??Hx??fv???tTs??T?c)??X?z0?#?qL????n)??-??f??N???j??J?J?KS??H1{????????Q
??y?k?N???????	??
?I????U??H???{@??V+?c?I=??&~=??????T?yo????2???f4?y?0c?Y???p??$??g?= ? ^m?;}??!?5?~
[...1814 lines suppressed...]
??i-f%???Pv?E?G)W?????n?h??<?q0??KZ?*???.???M?V??M?m!<????jK????RCZ?\?????B
O??89??|??2/?_?f?g??O?#?q8i???3oW?v?{??]??s
??M?
??,L?,2??????:??Y??;.???FB0q?????'?c??gI??Y&r]%???$okxe#???????0Sv??
?????	j??V?k?ky?xfU?T?)Q6L?Q?i?]?0svihAKIU???mIL?5??m??Us\pw]???,??
g?S??H???A at p??8n?$F?9S:?y?<???l??t??k!r?fp?GU??f????H??\y?l5???2???o????????3??+?o?2?P;???<?g??S
?Sb???V?1	
/bs???`??#???N?|E3En=?AD?v?x0
??????Sa????y???0VSJ;m??????k?<????E??8???????u?M?????i ???3h?H?? ?
????????????I??????????????yC?{?
?????N??f)????c?????QT?c???$?;?????9??????/,`??????W??a???D???R????l?c??
?Y'6???Yn[kz???????????d??)??3~?h}
?8
6#???? ?b9w?K???j?*Z??
CR)????2??K?????\??????nI4d??n?jr

<?
?????
??dV?}???S???2h???)????Z??c?????=Wx??q<@??eTUQUUp?H??NUEJ???pC?h?J|1????ff?b!u??df&(Y??Lb????0?K? B??OI????ZrW??Q????59[?Q?
B???H5.????I?H?????
??I?J&d?0?	?G at v?J?li????Y???
??6r?vSUM???h"Q(???? B
iQ?;??b??0?P?N*%??r?h*??}?3????A?$X?4D|?????|\P? t&??N?u???[?&??Db
=???b?? ?$?s?A?
??b?W?7??&P??=j?1?X?L??????#v???oRCY?Or???rZ??\?
?ox?????????9??G?<<??#????a????~?S?:??x???.B=?lT??/?!???jWF
???S??M
?V?9T4M
????9?????9*
??j??-
???2?/J??GP8
??tX?]?C	???O???_?X e?
?#Bu???N?s?q3i2@????}?P6<?yu?8?F`j ???,??Z?,9w?h
6?????2:???aG\8^?N?????A??*D'4?I%?[^?r#??n
????v?!nP????? ??Ldn????B?#??8???????r2??P+ ?!??v?|??lu
??l8?!j?

{X<?\H?<;K?EVk??????!?>}????vpw ?@???2?//?$?,!_8NK?
FPTLU?F?21?F?,?f&?2???????i(%???4??`?[;?>*>???@??H????aMu?,S??
J?P`lup7?[a??l?&?;d???kj?Wb?U?
??A?????<???y ?t? ?0??#b"???????????n/P!?P???|??N??-A?-<
??#!
a??????Cy?BE???$`?9?)-?@??&??i?SLT54?????????7~?I???????sK???F
j?2B'???*?A??X?0K7z}jgG??/??Y??>??h?????]I??wgs<I???sq?????????v7?v?)???"|?T????i??aB??I?a"?cYVaj???s54%?yfOK??? ?8.??d?4a?-&q? ??????]K??n??R?<?K?,???K0???d8b:!(u
&`?
?=??0?????fM???
h?bH<$??,?F?cc???[)??q?????? y4)<G???=?dC???}?????``?(????Y????tbZ?;P?0??0 wB?C?$:Y?b?? ??}???W}?J-??;g^?p?o7???}?&CQ?h/??????A?q43?X?????+?@?1??fkbb????4??-?Q?;?{
??"?s?=a&??????e??????w??
?33e?x?UA??c'??4?? ?????h?5???`INY-?Z?}?	?$?RHI????????7?^?-?????????A??8s,?I??`?,??GE??B	D?	??f?`????@??2hd ?BQ7??.+3\??iQ??a????y??9??D??pq??R?=nm?"???+5??j&?X????*a???v????K???aYX?!0 ?4P)R?>???f?n????+`?mu?J??K?j?
????????D??l?}?\?????(7R"yX,???5
yd?y?`A?WX?B'?K?????????<??6??%R?)@O8L?Q'??yC?:?I>Q?Q??&&eIFC?KH?F??????$w????8??z~?+???$
}?6QA*?
?2rB	??\?}?9
?
?v	?.?t???dd?[vQ?]?v?Q?{p?????!?%J??h?i?$)%?=E?WH>l????RC?l0?????~??N?,???Eih?))\?p.????g??z|?x%?[v?j|#.P??'??O2
?`p??
G?D???????7
?,
LIZq??f3D????>??.E??=h{Y?H?U???l??b??$U?M`?`@??&h!?4???.?xP????????i?:??c}rd?????????c\?:VyM??$?p?<m?&?Y
d) ?6????7
,HD?????^!#?? ???????s+,?????9 ?????L?D?A6?z?=??/w?_<I???\?:P
???????????<??d?<qW?Bb????-e	??#G?qY???n??)??x??E?i?B???
u%??H?~???}>??$+E??4????`?Oi.???D8MF?,?0aR

}??"??5
? ?C?I???2??P???B??@Pr??P?=???G??a?h?7R "z??6H??f??9?0??D?&A?>a?`?1???xTFFt?[???H???????{???c??*!?????=gQ???@\??#????5d???_:|thjv?RKt?Bg?|?????Kv???;O?W?r?
9z?4I???"{?G???v????nh???^mn1?,?L??T?2>?x?U??E???v???^t???C}(:C?4??4? ?~?p?	z???|????JpxG?"?`???i??g1???@????????u0??Ug???s???`???????4F	?a:?X`Z=S??5 ???hN????? ??m=????,????W
?1??Nt?es?+??=?????d?-
????P?'??0
?HdD?
?u@?_oW"???Y?????J???b??*??Q?J?????a=??M??)|.??>?#????????????@??`o??Fc6??HZa???E??>?a?		??hQ?
2?3(2??Z$?2G?JP?-#B??????Y?8?0 :?!$??????N??G?D????2?=?????(???b{ ?vH???3?[?4B?
?
??O???	,CMYN?	t8(*?
??
?M-??0=?;???Ih??^??????W&?Q??????}DCt?AE?7??=?3h?\? ,XI?
!p?\3???GD??$h??	??????z?????ZN?|??=????1??dmRZ?5?g?G?lX?J?NW4G??R7?WS??y?#?$??-$O???????8???s?z?!	XU????N?6???j??L|??A{H??b:?????????9|)??)??)?6E?o??2	BB*
!????|sq??????'?)??2
??X"A?`I!?fR
~2??Rf'<?~/?M*)?xxH?byF
]?4?????*,(?????????b(Hf'???c??????@??@?D p?$??$>?G?O?^wk??~??l?=?D?ec?\_?>?3?????e???~?????
??;
7????"??4?_]s?03?(???;(???Y????	U??????f??o??"??/?(?????':???h?8?f|v?
3N??BB$ ???
L?*
?"???h&??}=?3?????EZDI?Xr@
?
%?\?????i?xBe~)?S????#???4???G?6?h??????a?T??"?!?k'??_4??"?7N????Q?a?,?pq??J/??8C?v5D?	ef H@V?pQBPDL#!????'??a?K&????/w??F
?k??J????{???c' p?y?l<b|D?9d  q??6r @iC?%?I`
??4?x2X?!H_?f
?ENG?x??J5??]??2E???'ds???&?s??d?$??F??SU![?a??G????S?O?|??#M?9`?X??YrF?.bX?q?
??F??R1?,???????ek??1==-?M?xa?Sg??'H~~?????J???h???h???g?A?D?"???<o?????Dzi&o????r?3Fc??JW?????]:??X?uUEe??t???C??(?%?uRo?,?E???>?z?*J}???k?;?IL??????t??`;???h?Y?!?'?!I?a??$??$H)??4HR9?j-X&+)kXi?? ??\0A?????*?+V$[$?
?`??0??5????p??W9???,Po0??fK}T?tI5Tx?	rf7%d?r?Bih??!????}S???<S?H"PUQJ??[?(?*???{=_?Op?~???QM&?0???;? ???#?Tzg40???
??A^]??$?2??
?z????Ro??jE?????1-Kr??@?c????????bbT????*???Z??P>?&WA(r?M??5?{	'?,LR<?}?8\C?$D?Q?&? ???`?????D?????}&?$??????Qx????#?#q??\e???<:????????y?JrIT???y7?J?A!?u???7CA&?
??0?=!????9?3????"8p>?9?????=	?
'f*?)L?D{`??^?{Ro????\>y?????H??#??????]y?g?T=NT??????'?c??Fj?c?}?Q?(?D??5??
r?R ?|l4^??v&?>B*?J??<????n?fN?`.k}?O???P?????t<?z
3?&??K#3g5?Y?2ucY??W$??`m4	??Yn??????&???X45?)?F??+e?L????U
P???
???6#Em???=x?6?????????0f
?y?!?7_????????L6?\|??_^?+?????g?(C?
R??lm??|	 ?M?Ci??Tu?|???a^qx???B97b??=y?	??i????????NO??6j'?
:1]??V	`???gp??0??=1!r?Fo??*Jl???B`??8?-&
?"n?85??th?8?JZ??c??,Cy??????4I?f?m?t? ?D8?AF?#??!??j	??????tN?"I?\????M'?????m????1)5???W?B???Q?
?????1????]]V?,?<?F???????C?t?2!?'?TAd??.?7???	KB???;??Q?#/[???8??[h?)+I?iKXa)<???n'f;%?0m?u?\n?2??)]r??????EF?Zq??&???x??f'Bf?a
>????r?!f3?>]??t?9dMv?s??7qM?????Z??0??1???
d`?q?????NY?Ca??? ??H?D??J8\??????l?F?k ????Y?+hC?:??,(W???????4??a?L?#???L??oH?q6?;????)????

E)"xRT?Lp???{`?n3??+E??eRIy?????f?????o\????'??`?t'?q??!??5j?k??9 r??M!????_V? ???G????s0????DT?

???l?j@#??[??.j??O???N]:?[ '9?
.?(1:???^?l???vl??f*p)?Y?????k#q??Cm#?=L??g^<;}????R?\?7?H,?8\/???"?????q
??!?i?e1??i?^c????;????>????8?n?
5j??????????P??a?
???????????,D3?~?????g??!Ty.P|t???????[?k?K?????o???;;?v?{???`@?0??u?????Z?
?sk/;=???m?????=?5]B@:?????P}?3??w???L:??H??????WF?nm??<Ck}?????|?????p?{$??m<????H?C+?@/??=????Q?%??#;???
	?d ?????
W,a1?Vv???T3?p?????W???%????v9'????(?!aC??
???J??k]???????????^	?Gu??c?B????vSN}?v???;?6?<Lc?8?um?PI????????~O|?z
?^I?^??i??N???X??????.&w?????I%j?o8??r?]?????Kw??n{p?????o??\?????x?x?B??G?>?A?18-?{?"?$d?
?????XB%#T8?,???>??H?[?????1??
?sxH????R?-W???B??3??09????$??
O"X6??3?j4#2????????Q??b??GV?pC????bX??????)????hd5A?P?g$4g?E	?+a???!?7\V{??
???"0?????????????7?O9=
?,???dFE????R<???y?#$?Ciw?y?*	?B??x???
??|: 78+?x??_<???????5e??.h???2??U<??"Q??J??V8????n?#lllq??j???$??cpn?j?u?j????
P5?
l??
??G????p??TDH?I?sv?8?'0??????:??
??Go??
?B?e?C\j6Q
#?!{?$????
??46??
?7<M!?#??9????;?Y|
gE?`?
??5?}W`?-??I32Y3M~Zg?D????g?.????>?q?8?0??
JF
???P[7)3e?????/~????@?
V??BgLp"??	3I?C????3????@???ai?G?#i??,?0a????gz
?!?_I????F-??L?*b9$??UJiY\F?nr,??s-?????7v??c[???E?+????r?N????t"o?o?	??!2V??F&\
???'w5?pqW?T*rc??K?"??Y???-?jqc1??k?*KN?Q?
[????2??G?????k|???<F?N???9Sx?QHc???????Pd?,?;?2CZL?????]?H?_??"?ge??~f,?/???g??3?%g?????????M??F?6?c?7b???X?!?F????M??dh???9~)W	?b??)???q,?O'I?#????Z??6c%?@]wc??R!
?4g?V4?VN??;dv?????z?n?42%??wt?C??ZM?3?????tg??h?s?80[ul??7??8?E????x?-?S<??$??Y1
r(??V]??@?"B???,?O???]???Y;3r?^,;`}?A??C
Q?O???.P/9{??a??5?q??x?wy""???+n???v??^c???Ya^|??S?K????n??;tL?????N??;|???kE9?A?^?{N???Q?[F&8^!?K2E???W?j??6?????zu?>z?-??'Bk?r??Uj,m?????m??onn\?????I?Hl?4???i???:,?qg?h=@,??5{??'
)?]?+h??9vg at N???d?
D???G??9?P?	?|B?&0???\?B?X?k8?a1?n??????hN???[A8???Lpe??F?
#2?V?E	??#)??-???????-?it?2[?A(1???A??????a?/;??????	???`??^5b?=8?vcD+??l??jv._????$??+?S?w??????{???f}>?jY??K\???????1??)????;9??NOC\L???]?
??b?????y??q??????&ug?
%??Y?W++b?)]??;KK&m??6Ce??d?Lx8?j[	`e?B7??Z|a?-L2,??//??xU#?&??R??cq?j y???(??Z??8;q?????~?D?c?M^mn??{.U??`)k??vh[;^%s??r[+?S7?j??>G:??<??1??c^bY??~??p?????\l??<n??*M??Y???z1p?????K???<????)S?GX?iG??n_?I???????2??x8?G}???????]??????z???|???zt=1N?;????U;ZU?????4?Gwc?C??{??lX!?$5???@?E?x??w)??(??]??
N?!???????????????K?)?S?=???L?-?hBBB?????`?F=O??p?!??p	=??8??k^/}Q3??Vh2*n????l9?;?Y?~5?????s&???h??^b9v~-????C?????? wW?$???r?"-?ml?-?,+b ?;Ge???Z???N??qsr??`U??Fx??$?8xf?n
?3?e?4?#mx???#7?z??^
8????]??X??C?i?a?Y??'?Y?~9X?.?Oz?;????????Q??U?]????;??j/6!?8??????7?1d? p?0u:??&b?"R?????y?@??%???w?9??C
??G??7u?8???LCA
"????
?|(
?????8s??un}?{?'???t?t?vk?L;???????i`H??
??T?Bf???????rd??Ff	O
3??;??w???h?8???f??H????(Y?&+?]?K??h????1?7EdF?XR??u@?L??
??1?`ji? ?E)H?
&??X?? 
?!??M"Hi????&[?Ci??"	? ??19?Q@???tT(V?B?
V??Dp
DY0,T6????h4??	?a??<?i??pRX	e
??@&^4\??2R?N?~?D?_?o?G??????`???y??b?,?>?~7L???Pg,+2?[??f.tQ?il9???Z???2?	?K'	??????F:?G?k???Sl???
??J????rc?l????6????P[7KC??q?a
25+??o5?Bj??y?k???J?p{???7??????@??~?+@???}R??2?n??u?H1M#`6mt?	kl?p!?3?H??!p
%???
??tw??A?L?'? ???Z????&v#??I?\,??(I??Z6m?yL?<??v??:?
,?]?#[?&???x???P?P?*?OT!?4xv^?7??;
????|?-??j??9??2???9C??o??????3[<?

?wq?T?MI????V#??&?X???"Q~?U????5Z?r?Gi??U&?2???+?{?/D?H?:??~???m?8?k?????tO=?be??#w?[?	g?g?-9*J??jgW??9?j????5????w?H?W??bq.??[{?i. ?<.???dc???G!?? ?{e???6*;J?`%	??|c?
?;?X?GU?Wx?
)@{??G??????O8???+TJ?????I?
?4?	4???:?"?????J ??I??=1?z
b?v\?w??FY?h7?9?
t????=h??????
??k?5O???I4?N??&??{??CET?? ?Z?hf?E??4xK?{Ff?????s???\}??=?s?|?S4Sp??W@{H???`??????<D?'???????~?????d9??:t???R ?!&???K??Q?d?p89c#3????5L?R?"X?u??0t?k???L??Vg)'???/R???-?1???/}Td91f%_F?3[34Ta[?R1? Qw{???)??y???8{h,?PHs8????? t?
!?????X?n?`?n??":q????????L|k?M??+?g??t8???&?L??,' ??Cp7F??>????????vU???yXT??L?0f????'w?*?Z|?e
??^????r?7????%??p?M??I[?.?C??????????,i???Hm???p?????dH=>E<?Ye??3?????*?
?|yw??6??R?h?
A??M?$oj+??fG/?OH?>???3??Q?*?Z)?b??Q??z??p^/?O7??RX?
5VP?vML?????1??TAL4EAST4
??.
F?J??_w??{x??? ?Kg T?Z%W??B????C?pA at P?J?c?@??l?O?m~8(m?!?=^>#Rw?d???0<?u??PH?.??s6Ei6?/?Q7?$?a???????Mci??&J?NM?????????4&?
???????m?4??m???"B)??^?9
????}k???U?z??<??2?{U?l,$?a?z?(??2?{p?Yp?6s????????>d????=??? {????7M?W?K??elGk?2
?????04$??u?hb??(?[#??OV,o?f'??'0org;???c?^????c?h?????j??l???w???q|?w???x??????D??G?w?)??g?????0???i,??3"[30N,?dDMDUV??3+&8%@F?X"?q??7??V?c8??cir??2????	B/'z??????y?k3i??Y??;x!J;?y(??~????HB2?1????&{?5F?n?K;?????-???????7?k????-
Q?6?f?+q?Z?=1?3e???j?j???:????P4sD3ms*?$????2I??jb??j??kQS;?
k???EUUU?5?0??*???IuD??b?(kT?R?C? ?3O?<Q?$?P???/?
??S?????q?bh??????Z????.?T?????7?G ???? ???????B!????ZS???>???mCn??"L ???3Px/???T???B?H?????x"A8??A?E]?D?p|???xJ?	? .?2C?:
??????^I?/??7=???
???
??????????@?
#	A??D]l[?3U1????%v?/&??*~??????????y??^N??2???c?!?????o??/??CX=??F??gD$?????i?<<}????????????aEJ(?XIp????|a???XY??t?ci?7??9??.PG?????s|
xE???[??????i+???0???/7?????4??P??y?E??<???
?A9_?ZaIZ????????!?:????NE?????S???iG_???OG??$a?}}2p4? ?G)????????????
??S???1???%?(???h?t&???????7G???%???p|?5i=r??!?t???t
f??AT???"{a?}g?<?I??e?d?B
?M??(???C?mc@??????K?c??qD??e?H?h???'@?"r?O? ?ME?V@??2??l?X?m??`??j.?,X
?~p???Vd ?|??	?{kD?c?c?q?p\fM??J?a
K??d?? ????
?hiW??m6??t_?g	Aq?SI?"?J{`?T??
%I
ZC`??cW
j?M?h??(~?@X??c????????
?j
A???#?v?O?1?C
=????;1?r???m????U;????????;c<v?lH??
s
?3??J??m??????aC3???tz?~L?	???
?J5IRm`2A?`????@0J?? Sx??5?jv'CUQ??@>~x????#?I?D
"0s?'v
??
3?=i????\????T?@?=~?
??+.?jQ?%;???ddbwJj at u
y%??>??$9 }???]?)r??????M??Eg
E?8?kC????y?HF???4?????B?;
;@];?/?w=??!?E
HG?M??K?w?S????????jC??ERP??A?X?+#T???4??]?ch?zf??M?
J??7P"P?!i?L?0????j?)?]??0??F at q#?;7>???r
N?c8hX?F5??`d????sq%q????!V???"b?4K??
x`?Ejw`?p<??\T1?A??8?Abd?0Q$*
_?@??"???????t??CtY?jG????L????!??#?6&??!?G#F????	M?q??????O????=%/?/#????I???????5&H#?`???a?????????IXu?!+??
?$?L*?U#?%??(>x???+x at GQ?L?;tL??????????o??>????S,?Vi<?[?????????Lj?'b?7??mo)?b1^|[?Tdbf?J?c???v???ePLm??e??4????dQ????p?>h?kS"#`?da\m?I?
`F?g???JLT?F?&??????????4??Y?TFc?i?z??l?2???q?F??!?
???2Wh#h???Z?9?bB	1?Rx?
C0?H %4?B8K??4?P?????-!@??C?r*?JN?.?]T
(P
??+BP?*?(?S?:h C?f?=???&x:aFV"
?D??>?A???1?UQ
$BRHSI???+?	,Or?????@zc?!"8
=?#

?#J?yf(??????!',0??1??i?"MZR??D?|n]??U{:c??q?K??sN?AI 6h??N
a?
??3??<?LRvG??)?3??-??~?????????=?"z:????'n??Tt?
(O(
Jd??QU?P5$?KSQEQML?D0B??"QUKJLL%??E?8R?q????EQCT(????$?
,7F????u?5??3;6?_0?MO?????a?"??bg'???a??
tfd??$?W??1??`q?h5?1?d??f(?/[7?????B'R+?83??a???.l???<H?]f?k??vDH@?=????#P?2?2(?
(??e???=7q}?
???+x?/c?l??$E>
???PkNr\?,U?DRa&??????&
?C@?h????Z???p`DB???&iM?q?l????vC@?M1??g'???CIE????????$E4!-.?A?\0??N\?V??q?{???5???4+????]2?1!??		4?:
?m?qL^KRm?-??j??????0?GNx?/H???\?p??s?%Dh??
?l?}+F^??B?(j???M
???7??[?@?H?c?GI0M????i?RR?jG?
?? ?]iN???
????$?
o????m4?T?f?????????&???u?)??a]?h??E??p??d??\UD~{??~?????h??????????T?iVRgm?a\???X???:25?Y??CC??????#Pm?!?,7w? \?g<?f?M5j??jE??5?71??u?OR"?lq'
??5???????b?j.???[?C;??????????ha?????FV3???0?N???S?Q44??=?anqji??a?#d0??tZ?S????L???`?&A?T??x??f?c?i?a????=>??;???2u????*p?_????*Q?'????5??b??$????HB?I~7}'%??U?%?t?8?5-????%??h?
?Q?????????d?I`?8E??????G?	????8???@?po1??_?6??? k????`EO$??{?D?r(???0?d?K??Pj? ?!?F&9?d	
?!B??0?^??h?f?c?????D?

x?????m?u~???\?9??$?????d?:??G????$K??,?;K*Y????0??? ???Z????h?A??
A???$7(???c?)??A?(_?-.?!?f??&?.?
9J???????'?fQ	?i??????2?????B,?Bs????Q?~$!I??'???#%
??4
??A???<l?%

??<???8A*?O???k
b?a?>??i'*h
@??? ?&?1r???!U?`sjrp@?S?l??v?R#?/???M?:a? ??i&b????|#?D?>o??????"?h?2MQXMLZ{"??1z??}|????????#???G3}qbG?t??`?$x+=?q?"!???n???'=???7?j3?}`v.Z???X
\?F???E?j"e????<_?1??????u???8??][d??W????w?>?T"???????q?lF?&?6?n?FZ?j????l?=?#????f?;?Kn?[9!_?????<?9w?#??t[@?+?J??$?LW?:,????C??`PYe???p4?="D0??u"??#2????`?:????V??q(?H??????q????t??????N???P?r????2?I* w?Ghs?]?0.?2?$)
"???6?#??\=??%????1g??5??7???+??@g8[?}????G????
??d???(??u
|2??;?7F?<
??X&????D?y$??]%6(<????????>?/^?}???!#??fz?N?'eY???E?????
?!???R?????(z}??|?!#T?:/?
@? ? ?? ?j?!b?(?
????b?Z" ?)Z??
????"?E?d!? JB???()???B??("???O???I&#??\?\Y'3??????????Q#?_H?????T W?@?!??b>wt:?DP-??Hn????~???????(??PGx???0Rl4
?z?Q?"&#	U?
(ja?$"FJ???R*
?(?????@z????##??'?
?????6?@?5. at m????f9??`??f????P?{?PFS?????/bo?@??@?!??Dx??.????0X?7?Z#\?????o??p?bq??L
?
`?$?.???
??rnFI?Ho:=?=5?/&m??1?9?52???????XEU4??
U
??f%?v???@dB?:???0wT??(C?[|%iu.??t
??SbK	?-
&??I??/??
??d???M???PH??bB`???Y??C??L\?F>????_q???????eA?
??kJ!????7?????"???DG?S???2*????????????&O?s="?Hv??$?c7b?o????u??"??+?H?%#??HS_$??D??k?82?2ImyFCEnLf"?"EZ""l?mQ??3R?
??,??e?Ae??A???P???1??q??B?p?/???????P?P?
????P?wK??&?????P?
???#??c???????????)?/??_?>???????
?9?1?$? F??????E,1?&?>???^R?E?o????E(??0P4??@5???m???B?+p??q??Fq?$"??m"????E?m??D??{?m???08	$?B??????x?g?????
b/g9??_=???vA??????3????/Z?y+??1?Re?i??tH?a.??KW??Jy_???LLQ??}???x?t?@??C?HK?????*I&4??@?9????y??]??s9??V?? Q?{????18&HU??zo&j??<?????
????c??Y
??sn???<?3??k*????*????{??W??=V1???????ME??????-k[]???8?S??RI3Q?
F?	?;???N.?a???;??&?Z??????????	??|??:?B??????T????S?j????$R??J?C?a?DI?"|???????A??&?	??
??x????
?;?e??,-D4cY??-Z???	?????'0?v0????[?a$?9A????4??>?e6?QZ"?b"Ld??H????C!?JDY??4?E2]K(??T???????1Rlj??n at J??1????+??q???`
 bg?????p??n&?G?
?
?L2Z
??2??x`@??"?m?3?6???rx?>V??8K?p??o?6/??H???S[??
????????',a]?Cie ?D?,R?6??e??R/	??8?&???]lh?
?{??w???????n??pH?????a??c??a???JR&?6?A(???]#S
SQDX??@K D%0U???L??-
????h???=)?v??!?T?o????"????DP^??????????<y
??o#[??XmxMDz?
*c?:Z?)??'t?4D<X
?37K
?/?hh?? (???{?F?\?'A at U???\g??N?G9?+H,??#M?ZR???:??q1??*??E!??X?4c`???6`]DF4?P?M:?a?6?
????Za%???
A?$
?g$??T?Q??6N??b??$???G??h?D?5&?%?X??W6	*t?J??X???1Z???7c@=z?`??:j??B<??????'?@;!
?BC???K??p?c(0??hG??)?4=?S!??F(U?=8?%x?8??&?`a&Yfc??????*????w
?????G???~93?OT?<5H)?
?(?U,O?`??3DD>?d?6 at q?N????05!TS?XH?rI.>??xF??}?????[k^???p?z??c"epD8	??+?4r?]?S?4)c"??QCu?r,rf????m?4???????Y!?????P=,GM?5@????G_?i$??7????F?l?@?-?i????P?4
E at d?<d?p???0g
??%::b??a?????? ?*?$
sA?,???R?G?H+??zg?
>K????R?/1?-??B?a2L???F~	:???&??x??H?>
%P????6"N0"hX|
??????|?e2~|2)
x,??~?Z??@??q?&
?3?AH@???kmMA?D???P?P0?Rp???Z??kM%??J?F??	?1??8e
?S5p??V?@5
???	?(+???P??
1??Y?S???a??2??I
(% $H????
??D?>???????hD???j??????Fb??J7]Cl????>??pP??OIbD +?t?=???CHd?"??u???k??????p[?=????Y?CLf??'?b??|?J?4\I?????Q"c??C$M??x?F??3???]R-R	??Vnw???av????;????7??????GM~j??>C??'??????K
?2F??b!??:a?Tj7kF
? ??L?R??t?`Z?F??#???=???P
,?B^?8???MEF???3t??h??7F??ZkT???vi?B8????-f????\?
.0g??-?O]2?+??????llmVIz`??'?rq*?N?3vU?w?%^?)??????_ ???d?r?????0?P????@?!?a?q?v?m??V??UZ???O#?p5?RErWp????w;????N??*xUH?9?????h??????>$>???????????##??<??4???M#N???#i?d?;?N??{?Ep??.?P??5T??-&eSw? ?%$????X?Ml\?????*??^???["?9??*;???C?_???(
oa2I{&???CM"^?d???vI:??F??jKc?<?R32?1vf?a[?	:???????m?????hv8?0?td??f?4?m0#lLi*?7Ir?????
+??w???C??LD??rnn)?Tf????????;????;??????U??k?1????E?5?:?>bf????S? ~???$?E[?"J9?????kp?=???
?@ZZ??CGP)??l7??x??f??JN?ibv)
y0q~,?.W?P?D?o:??U
?i/?/
 ?4!??$n?5,????B>?"????C??????y??"?Sg9?9???d????K?~B.??(w ?
?N????E#QV@??????'?A?|?)?oB
Y?MY?$?9???H^?!8???J??DBh?9?HLd?MX???x?@??C????
#:=?`???>????Y$?"?s?=???7@????l
?Bw|x???
7??????=_^?n????6??#`??!(|???AzN
g8???-0N?I?*?GR??J?DrZ?????4'??B57`?4???
??6?X5?H?!?.?Lve???????BGn????=#????????Z???[?? ???\?R|?O\Z?k???bjr??(???????2?H0,?
x?AAyFF&IY??1??Cy???l1u#?R???x?SQ!H?0?#3#&f?
F,
!
????	 
(?, B?b?%L??"hj%3H??P?u?P??(?@??f??????(?B?3???`???4???hx??S?P??f?pn3?Cn	?=0???PbBW\?l?
????SD??
?k0
??i3??q?Nq(?;9e??9
?k?;d#???????	?
??gQ????????(???QFX???????e1]??S\?G???i??+PwAU???s!?4?c??&<?T????l????6<x5J?P???v?,?:3M-&???(?Y-??2?
I??
-W??'[q<1?Y,??a?"?ZiGA?[\?????A?	a??#]???A6@|S	???0???????PeE!???h??*p?e|BQ??X?^?d?????A?C?#0puR?114???B?u????]?n$l?*;?5?	??????B#30#7?Z?Z?t"?D*??cb?v?W??A??????`cOC?Z??3#5
A??????????????
d???????5
?[???c0?

?h?????4v'$????6??14???y???q??&???$Ck?M
?R?'}*?
?%R$H<C?u0??Z???
?????;??6}?w??????D???H R_'K?C;5??????A?????gN??7t?8v[cb????j+??^b?;N ??????KHx?R??
r({??h??n<D18???%???D?b$?????&?-j??????
??i??V:1(?(?Iz??4?????q?U??!2K0??d?f???GR&H'????dh>xM<tb?M???B?C7?????? $x?z1?#z?ckI.?u!F????z0???3N???C??5:??????,???q0????????R???PR*??a?/??+4?#
D?e?vl???L?(?*%?*?3 ???ec?)jhK????wa?s????BP
H?S?q??"????????Z?b(&-F1-
Ljr?B#?0???A??2% ???0?
%?=??????????RR??.?
?
?{?>:????WP?&z?\?RA??????.?????S??9BbG?bC?????????G??$?j???G#A??????
?????X@??C*4
@?)J?
*1
b?/???????!?	"??`D?
???FD?05~P?
??
Ey
(L}???z??C;???~??a????MP??H?1HAJ?@A'?G?ve?31R???~?r^%HN??oB"
Z??e?`Z?9G??&C I???>a?k???A?B	If&????J??)?????????a??:?4`q?1h?5`????B\??wh?%???{
*	r:???b?m?P????~??q??)??	?X$fT%
?F`1@???????S???'?Z???UP??DEjZC??a? !??1!diq?)????????0
??	?w??ABHD??EU?a`H.?o
L?5'Cy?gq/4?s)????NT?"?G 6?%54???*{?_h?w??0????D??rY9WZ?D??rUp?mC??
?D??x?8&??w???. ?>y??????B?_???~?W??d~??3I????	L?PoY?????X?
X?" ?5Dj?j?b?T2?!??
????#?
?d	BC???
?F.?G" ??b
?!?$?.?????????6qb'???}????:g?k?c??0/???t????6/:&&?????w?8?%?L?N????4??9??W??
??]?2????FI??Wrw6H?q?????G0$(????9?M{s???E)?7	?'^??5??p4A?	OB?)???
-???hq?Lihb?%?/y???!?s?4??W?i??v?2cn?4&3N?j&????Q??CZ8?h??CK?s???ft??Q??GK?CR?'?C??q?G,????H??e?~??a??????X8?T?c?(?d8?.1 ????o57m[?31cM'S{?x??m??zg?n?|?`g8???y?B3x9p?b???!XK?oNL?
??????0c(&i-?????ar?uW?!E<M?>?u???%?
??FRWb??A
????#?uQ????P\"C8}?z?O????:?(@$aa?.I
Ja??Mq?x*??!?N???Q?Q}???N
E??<X_4BDN???M?I?AN???I?-?8I?fPJ? E#?B'??HR?T3(/?@`?'?<t?????z?????
?P??P
?<?V??L??-??Z???b????<
?cxd??DA%???
26?C?)H@?7??CtY?]?U????vG??dK????-9???A???i?k^??:?;????R?I?QX?~??w??)S?Y`;j?`????@??M??RRPUfg?=F-?{?
 }?Y	
E?H??A(q?$??(??|%??^??__????p&?5?X?	??N??????/;???0@4?lJ_???
???"n?"??dQ;m?xz???&??%?9?9?A??$?L=???.?&?,??@??a?? t?^??|&?i
?v=r??'`?+?% ???p??6????

?Q?1?E]g
????_MY$9?U??tbt??4??Q???Y:?d?p??nb?u?;?U,b*???;a?J????*?B??????u??:?????w??i)???b?\!??
??'1)??z=Q?9>?8???H?O?;3!J5l?1,#A?],lq???
?
?`?e?9n?i???????dh"??P*("?*?$)"??P(???\<??e
c?8f|?IAG???? L?????kZ???p20??y??DC????rM#????7?!??E@9v?????IT!?
n;X?
??T?A
)?d???2?/?k?\'???r???
s???BIH?H?????'"?F'???????}?E-p??????E???1?? ??5A???m8?'?????)L+?5??T?S????R9??1:???O	????$?5??4w?Q???l?9:?}>??8?*.???f.?-??2?R*??7cU:??mP at e0U?l???_?=j??t5?+?U??n^?}??x?R?/???? ??d????T~Z{r?-R?????h??d???a?3?i?$????c7 -?D?????t???l
y??6?(??
?Ut??,=n?!?`K*??-qw?c???f????????~Y0T????&???z?5??=???$?????
9s]Ae????OT?S?8??$??v!???!??#I?B??g
}>???d-p.T????BY?Zi0~?NH??#I??L??([??H0?l?V??Rc??2G,v?2????L|???7>b!i]??.?Q?`
Y#????!??b?$K??@5;k??Y???RV???]Q1}????!?`
`<k????/???2|Ui?RG?xk??
??&?????	e??&?
??h?H?B? '?PZ??????[=j?B`{
??t'?h??2qz??U?Y?O?????u??(??3??u\?&?r??&?????3?I-?`???Y6?4??CI2d????0h?'p?}??@0?p	;?3"t??x???u????%???a=??Sa?????|:??t{???:XFke?6HD?|?9
?B'????2/Tx??<? ^??>??Fda?@q3&?	????D?c??p2
?"!??v?L??*eQt?{-?b?B+??<?
?GH?????m??E	?JE?YB?!?TiM?V??A????5?-b	?g?!]?/$???K??fFC&(???????
33v??T?2lt~@??{???S?=??D??????d?PF??WH4=Nd????Od s????)?QI?'????D{us?v?H?j??n}R]?v???!?3??Z??B?uI?x??C???????o???Z??w?????????>3?z?????&???Bt??$/KT>ls???	y???h??H? ?*E$
|?9HMU?1?
??|>R?H??)???S'????F0??
4??%????w???P???n??i???????*?DDE?QE?2???|????Hi)?;?m_????Z{x?t%L!?)???
?Wcp???d???:????~?M)?:b?Z??.???I????a?\?????8B?$???.
z
D??V ??)?E^b?,?? ??.?	????N?i8?1T?
#%?#?????96??'Yl????6??(?F??9?????BE"M?L????J?????E???4??GwW]??0Nb?I$]?`??s????ES??,??0?(??$???????m???Q?????F??S??Q?`??VfZ~??v<0?S???!d?Y`j??"?
J?
?1$ll??2-?!??a??h2	28 th???x`V??f,!???'????b
aP???DED50EKQ$S
??5
??????hS?????%*d
a"???PF`?H??&?L?&3?$???K|bj
Y???5???B?8??8??!????7??JQn?zN[#me??Yd@???i?bf???\?7B4??pmX?????SFT??m:f?)????`x?!????dE)$N??1?@??h??X	)!?-???????>?nZ??<???]B??q?p??YX?S?8?8???ba?d????E<@w???v?f??U?A?"h?\??7?9?Q?
??a???.???]%?<b!@?R,E>?W??
?My%? qv?????h???B`;??zxO5fe????????KPV?mPP?5R?%??G??????gL???{???f??F??U?;;?G??&??????D"@8?
?n6?D!B8?
????m?a
5\c?d"??c?????
41?(??r??jk??I????W???CX&????
Of????I
0#"?0?b??bl?B-M
?q??J'
U?d-?i??~?6?-:?????!???i??}Jl?%%/r~?5???m???3?#?'???A?0?,?0?3???d?#??+?sj1??Q*H???FC?mwB?BE????
?X?z?C??MD?	?2x???+??

???y???>??F?/??r(iE@??L\P|s?2??0?\?%G(?rG

TH|??jK????v=[???f???)?x??
?e?>$??O|?"gB?5?l??=_??D?(*"??0(?82???@I?U?wQPD?
???i????o?d?8???&?????5?X!?
\??CD??8?DU`??,%ld?q????6?b8j'?|%?>
??X??Pu?,?
??EUN??h#	?Q?*???J?NFd`??4:???????RB*?	???????:t?4H?J H??G_?%??!(
J?Lb
L?"??'*,?rR$%??%O??Cc9jU???4d??k??? `o]?????O x?|{?6 at t?"??8??d????????$?{?yG@OI??y????T??Y215f`>???j8?????!??0????)????????m?;!]3)?????hChll)cFQ
???V???h{@???_3D?Z????p???3???A<qE?\?v.??pkUW??t???3??4??+??!?}??Y?????a???k??????q?KC??Km2	?@??P?)??????S?w<??=????km?|.t????,[xi????J	???n???3q???????]_w	??Tw!h|???]7H???3*^q?]???JfK??k?9ZEO/
??p???\W?c?/Z??_?UT<qi?~}?^l?Yq??
??????6???|????]>?????-Ox??&TwUg;????D??7??????0\?>#Z~?'l???<#M????s????^2??7??t?`xq????F	?+z???
??^?u5@??wq?7h?u???	mRo???????8??_h{??IIV;???)h??lF8u9?F,??[?	?R??C5]?B2??#.Tk?^Li??%e?D?6VZ"??"m4??GUEE2Q??T???wm:????????P??rgt???g3G?C??ND???????i????K??+?M'?N???r.??R?0?L3
	???T0I*?&x????????k?\&??t?43F??&??-?b???????gyHjG??L2?qY|?;?????a??I!{s??????[????t???~???
???????}?zZ9??Cy???5#???	.?Z?<Y?ixk[Q3/?}'P??I?y??S|0????ZR??9??%??9????fl??^??d?kL??X?? u^?x????Cu?q??'??????$
?????=>p?>}1h-?b?>??z??x?wD`o<9eI%,r??L?APJv?fo,??]?qX?????
?sj?3GB???F????	???/H?
 |Htg,?Hp??{&?tM??lB?W#???\;6@!?-???QpS??7I"8?z?A
???(6?3"@??B?=???<O???D??'3???Q?OA?*-????<}?x????z?Y????z?.??;??>?9Zh5?m?A-H???????b`V??=?n????k???m???3#??$?5????1?|"??|?9.?c??e???L?h?:?fdQ????4?k#?l?P?"s/H????????wf??\??EX??t;???PR8???=????h?o??????=
??m?????F?k<????I|?y????w???
B)??????s!=

bG.???}?R????V>/}???-8T;E????M?????!?r?Jv?=??B?r??g?t??g?V??i???{?????????k?????C??p???NE?!6y?C;????f?Seo>,???\?(O[N^!???????H1??? \]?=
s>???2?6???2?)?3EUh	??,q1???{~E2???,0-??]??J?9?r?????????Z,'Uq??n??H?v6v?DD??r?(??xQ?m?>d??8}??=?Ml?TP2F??Cez?Z??U??????&??8qQ&M?9IwuDN??f?s??z]
A?I$HjN??
?N	?,?
B?9?%?"r?dQ?U9/????G3Y??P?????H???7?Ly!?M????d?s??dj
?V?1X??n*????????;??)????p????T?LM
?dC????F?????m$3???:q?Mj??2?x?&X???nb????5?J'??????UEDPi?^???????Bk5c.?`?S?A ????d4Oh#?Y????=:???????s?,"]???????|?003?q???a????|:o?????"9??jx{t??tkmr?OC?J?[G
??i?]8?@????C)?|?????K?r?A???N????@?????M?04????t???]??
d?v0????P5
??
????7,UkH????~???4bz?2?GZ??E??Mg-"'??1??????S?U}?lwz2?GRx?? ?x?61????m\_???]TT_\???H	)?M???3???:]??oN??/???????????$??r
s?????	?R)??y????1?~3?^?Cy?{x?S<??	?;?l??LD??mA???g???5}???p?3??????/ncs!$?{??????i??
uc????{?
?Y?-? 0N??O?b4'?A??+???!???~?????????
?????dP?)+&?tw?r??????n7???!????2???m???5?=8?z?/?"??f,I???_?2?=(h??0?5Y??`X?O?$\???`1??C?7??@????f?j??SP??>?'y{???d??????g~If!?
A??D??c?Q?#?Vd??A?v???????x????QH3???$???Ht????N|?????*?s~??cXnAD??p???m30?6???k?WX??V?f*??-4Y?mB5&?????F]??G???I???7?'-!?I?bh??)????y?4aVF?f.?F?:p?3?????????c9Z??????Z!??zn2???H??@b??j$p???6X????`??(???8	?C??T@???O??????0????Pa]???jv?I??'??$?hxi????????
b??
??????K???????//4???????I?\??0r?h???b&??V?R?H%???%	E?E?P??M?e{H?(j?????'?<@Q?1??Fj?Zs??Y$???u
??K??|??>?(9?=\V?d?????#
??D?l??Ph?/?}??(??f??3z?^?$
?????#;???w?Jq;??.`?k}?Xy?j???>??"?????W?<???q??X?LtW^|??c???S?{?30???Ndwv?"??????????GJiI???&z????`JE?????
S????W;
?????^?qn-R??@y^;?=???	?c???`.??3*2 at J???XB???U7fn:??P?A\??(????F0-??`??
??
???,$?1f|???? r??J???Q??h??*???",?)?^?"&???c]???qy??,??H???K?Oy?J?
??K?n?,???}???oAL+?[?[gx
???C#?e?Y???ce?	^3????????/sq\=S??????9F$?)??/\????Y???+#(?S4???
???l???d(?vT???juw???b?f/{Z!?zD???f?]g??3?kV??Z??s??}?
Tq?{?t??x?aK7)?%????q]??d?+]5?c????;??u?U?7FK?^???'.?kS??vr?@?,?u
<?+?o@??p{?M?V6?"K&4?Smz????,?omo????K??62?-??;0?"7???????M???????????????K??&'?s???.\ut?1??Y?w?w???;???Y&?G?6????stqNe???'F???j??61???I5$3^???1{^?|<$?W{??-???'??/?c??F???e?Co??9?|?U)?LF?7??????????r?$C]<5?*@?D?????cE?7?I%D?I?`|?fs;??B??B???9?
W{x??;??q?FS??.???Gc??=q???w?Y?p?F??"???????????	E?????Y???e???Vww???vFl3-T?)?????
????????!?|
.?#??I?,0?k??jO???j???,?iz<)?$?????'R?,J=P?1?qh,???nk??z!?K?cN/e???4??????s?if??E?W/???g$Z?jtz8U???4???P??.:r??C??j??????	y??1??b?4??????????03??G?&???????k????]???????Gl;?	?l`?TM???9
?Q?h?6?8c08;?I?NM0?s7?b????)X?e70W&mX??FL?,g>??d?0?%n?r?x?E?i0??S?kM7R??G??q.?;
Z?`???9n?.?hi????o???????4???PWK?
??k%*fig`????4?a?y??u?I< vL?,<?
??-?n??k????fpK??!?k?-???fGI?;9?????w?x?????=?????q?%??
	""p?V??????????@???o????b?&?lBe???
J
?R?@?B???t???f*^$?4?
 <:E?b???C??Hr??ho?"
?"?v&????A?H??K?&<?/?=??????"??o5|??G??1??-m????Y`H????????O??T??f?9j4B{???CM$???????p???g
E?Ygb??3:}?????*?b-7a?g????h?lF??????1i????/$??h??j6??3?1#v???}A???<@PA0???????s?Kxez	???1?k?9sd\?|???L?????8D?$???Jt??4??vb`
I??pN??]?R"
a9z???
O?M%??j2???D?P?"A?P??#!
('???W?H|?
B??\?_q????@$@?}?$J z?S$5*}??

E
J;%?HnT?_????"?Jh? 
??889????5?#?a8?]???-k?O??P?a??N??a?M;?XqM(?8TT?
?@?>??1?????CC?]?lH?OVhaQ@|?``K?Io?^??2?????&n??",a?,????8{=7??j?x??
1#?A?-??
??mt?c?R?????RX?,PccY^J?V1?71????2JMXI?T??????Z?Q&??J?8???<?-?s?F?\

H??s???;?????`?????842p?R??"h?
????d????)bS?
?QDt???????CM
?*c ?%$V$J$R?(?????}
?p??`XA??,T????ab%??*?!QS-??PZ?{2???/?sD;???xb?????????SRM???Q?@>\????{??1?????TP??=??zS?h??;?$?%PQ=???R}(???*?=4???I?rhkAb??*p@?nG???
0i????B1&? ?
??.t?la-??p?S~8??B?	\*?G???S???K?????*?+=Y?&wKg.'13p???$7w)?PG?_63???\_?1????y??%a?E???????6 "g%V??Q??X"y??$??`f???C/2??T?!LJb?I??l?3i??9?0??]7????>?`'???j??v??'?tM??K?=??qLc?o??p3'&?b?,AN??w?
???6?????a*U%????L8???+???a???0?!b?':?w?ZU
`?????m??j?B?w????$?2]H??s?\SlN%??????Ml?????r?????wQV?? ??d??
?????
??????8??<M?
n??,B'?8?^?w???&
?j??y???"????"??X?`('yR??x??&:L??f?~?D)?Q????+ at wH????????:????9d????0?,?8?6E??R!????A???C2
??=???@l??
:????Ap?P(?|{35?Q	?1Z?NN??#U3z??????
??P?`??Kz(j?
JF??$??&?|a????#XdD??NIIzo??????O?/??
??R?9?
X?Ne?IKdNFc?F?#?*?X??$?@aS?$??z??zfs????"??P??8??_??$C???N???x?xCEL?s??????*(?"I??BB?y??T;??%?????????????lH??????B?3*F??O?HI??G?n?????f<?[
`??S???E2??U(?mH
??S??}?Zu?'??FIS?????_a??NO?*?????~x??{?????`??0?`d,??7Id@??!???
???=Y??5??)%11S???3 ?
5??fY??d?M?N??????0Xc?W?CPM%T???b???I?RUYpdq?Cd
??I?0,??Z4?????*???:?h???
F.T?IstX???j[?=Q?`v?gZ??h?5?M14??0i?K?5???%????.@??ka?|??QkUE??\?@???$t*A??,?
????
??????hPN??4?????7?b????
????? ??????2????b? "9???J?t`?;?Hu??6??@H?i??"@b?1?JhOn????cA=Wl]L???(?
S9?|}????F&9??l??h?J??#uK?gM?V?]?u
???(u?As??Wu??.?H'TA?'Hp?^e'?'X8d)?A?G?h??5K"???y????~G??Y 3W%T<???J?G\\????]??MZ??????\2??Y?=rq?b??N`<??T@`HB??2??D???X~?3?????*B ?)>Ff~K$3Fx?d9?1x??Ai:d???:?????M!???`??4?????(KXO???z?V??0???%?~?j_?$?Q
????F???Yda	?!Ai?Z?Fq?x????
SZ????K?wthI`YM?i?zD??(q???E<??jAO?'7????)?d?*Txd??*h`?v`w???k?o??????P12?' ??4??&B
??????3????S?L?CF?P??-2I(??N'.???D?2???L?#458?ba]a???u??????:??}(????;?v~??tR???R?H?:?N????????ut?Q-???!bM??Xf+??PE??Bak???2Be
??R????????????????'k
??;??X?$j?S?`b?)q????-E?8}??Ti??V*????Y?(?[?GA.?p?[?I???)??????g!0?"?"A?sT	
/E?1d?3??????w$S?	n	P



From fedora-extras-commits at redhat.com  Wed Oct 18 11:45:59 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 04:45:59 -0700
Subject: rpms/kbibtex/FC-5 kbibtex-0.1.5.tar.bz2,1.1,NONE
Message-ID: <200610181145.k9IBjxGV006519@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6514

Removed Files:
	kbibtex-0.1.5.tar.bz2 
Log Message:
removed source




--- kbibtex-0.1.5.tar.bz2 DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 18 11:52:05 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 04:52:05 -0700
Subject: rpms/kbibtex/FC-5 .cvsignore, 1.3, 1.4 kbibtex.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200610181152.k9IBq5nl006572@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6550

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to version 1.5.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Apr 2006 17:43:17 -0000	1.3
+++ .cvsignore	18 Oct 2006 11:51:35 -0000	1.4
@@ -1 +1 @@
-kbibtex-0.1.4.tar.bz2
+kbibtex-0.1.5.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kbibtex.spec	27 Apr 2006 17:43:17 -0000	1.4
+++ kbibtex.spec	18 Oct 2006 11:51:35 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		kbibtex
-Version:	0.1.4
+Version:	0.1.5
 Release:	1%{?dist}
 Summary:	A BibTeX editor for KDE  
 
@@ -114,6 +114,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
+- Update to 1.5.0
+
 * Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
 - Update to the version 0.1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Apr 2006 17:43:17 -0000	1.3
+++ sources	18 Oct 2006 11:51:35 -0000	1.4
@@ -1 +1 @@
-8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2
+83a8c1cade06837431b6ebe79d13ef7b  kbibtex-0.1.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 11:55:39 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 04:55:39 -0700
Subject: rpms/kbibtex/FC-4 .cvsignore, 1.3, 1.4 kbibtex.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610181155.k9IBtdBT006647@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6627

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to 0.1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Apr 2006 18:48:54 -0000	1.3
+++ .cvsignore	18 Oct 2006 11:55:09 -0000	1.4
@@ -1 +1 @@
-kbibtex-0.1.4.tar.bz2
+kbibtex-0.1.5.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/kbibtex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kbibtex.spec	27 Apr 2006 18:48:54 -0000	1.2
+++ kbibtex.spec	18 Oct 2006 11:55:09 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		kbibtex
-Version:	0.1.4
+Version:	0.1.5
 Release:	1%{?dist}
 Summary:	A BibTeX editor for KDE  
 
@@ -114,6 +114,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Wed Oct 16 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
+- Update to 0.1.5
+
 * Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
 - Update to the version 0.1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Apr 2006 18:48:54 -0000	1.3
+++ sources	18 Oct 2006 11:55:09 -0000	1.4
@@ -1 +1 @@
-8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2
+83a8c1cade06837431b6ebe79d13ef7b  kbibtex-0.1.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 12:05:50 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Wed, 18 Oct 2006 05:05:50 -0700
Subject: rpms/kbibtex/devel .cvsignore, 1.3, 1.4 kbibtex.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200610181205.k9IC5o9w009619@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9599

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to 0.1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Apr 2006 18:53:10 -0000	1.3
+++ .cvsignore	18 Oct 2006 12:05:17 -0000	1.4
@@ -1 +1 @@
-kbibtex-0.1.4.tar.bz2
+kbibtex-0.1.5.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kbibtex.spec	15 Sep 2006 07:04:54 -0000	1.5
+++ kbibtex.spec	18 Oct 2006 12:05:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		kbibtex
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	0.1.5
+Release:	1%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
@@ -114,6 +114,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
+- Update to 0.1.5
+
 * Fri Sep 15 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-2
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Apr 2006 18:53:10 -0000	1.3
+++ sources	18 Oct 2006 12:05:17 -0000	1.4
@@ -1 +1 @@
-8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2
+83a8c1cade06837431b6ebe79d13ef7b  kbibtex-0.1.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 13:23:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Oct 2006 06:23:20 -0700
Subject: rpms/wine/FC-5 .cvsignore, 1.23, 1.24 sources, 1.24, 1.25 wine.spec,
	1.36, 1.37
Message-ID: <200610181323.k9IDNKBA013076@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13039/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	3 Oct 2006 09:06:26 -0000	1.23
+++ .cvsignore	18 Oct 2006 13:22:50 -0000	1.24
@@ -1 +1 @@
-wine-0.9.22-fe.tar.bz2
+wine-0.9.23-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Oct 2006 09:06:26 -0000	1.24
+++ sources	18 Oct 2006 13:22:50 -0000	1.25
@@ -1 +1 @@
-955338998d9fe4e0546212b97adbacd2  wine-0.9.22-fe.tar.bz2
+6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wine.spec	3 Oct 2006 09:06:26 -0000	1.36
+++ wine.spec	18 Oct 2006 13:22:50 -0000	1.37
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.22
+Version:	0.9.23
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.22-fe.tar.bz2
+Source0:        wine-0.9.23-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -458,6 +458,7 @@
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
@@ -507,6 +508,7 @@
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/resutils.dll.so
 %{_libdir}/wine/riched20.dll.so
 %{_libdir}/wine/riched32.dll.so
 %{_libdir}/wine/rpcrt4.dll.so
@@ -688,6 +690,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.22-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct 18 13:23:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Oct 2006 06:23:21 -0700
Subject: rpms/wine/devel .cvsignore, 1.23, 1.24 sources, 1.24, 1.25 wine.spec,
	1.36, 1.37
Message-ID: <200610181323.k9IDNLWO013081@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13039/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	3 Oct 2006 09:06:27 -0000	1.23
+++ .cvsignore	18 Oct 2006 13:22:51 -0000	1.24
@@ -1 +1 @@
-wine-0.9.22-fe.tar.bz2
+wine-0.9.23-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Oct 2006 09:06:27 -0000	1.24
+++ sources	18 Oct 2006 13:22:51 -0000	1.25
@@ -1 +1 @@
-955338998d9fe4e0546212b97adbacd2  wine-0.9.22-fe.tar.bz2
+6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wine.spec	3 Oct 2006 09:06:27 -0000	1.36
+++ wine.spec	18 Oct 2006 13:22:51 -0000	1.37
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.22
+Version:	0.9.23
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.22-fe.tar.bz2
+Source0:        wine-0.9.23-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -458,6 +458,7 @@
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
@@ -507,6 +508,7 @@
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/resutils.dll.so
 %{_libdir}/wine/riched20.dll.so
 %{_libdir}/wine/riched32.dll.so
 %{_libdir}/wine/rpcrt4.dll.so
@@ -688,6 +690,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.22-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct 18 13:24:35 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Oct 2006 06:24:35 -0700
Subject: status-report-scripts parseBZbugList,1.51,1.52
Message-ID: <200610181324.k9IDOZn7013115@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13097

Modified Files:
	parseBZbugList 
Log Message:
Do away with the bzId_pkg.txt stuff.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- parseBZbugList	27 Sep 2006 23:21:04 -0000	1.51
+++ parseBZbugList	18 Oct 2006 13:24:32 -0000	1.52
@@ -18,9 +18,6 @@
 #     http://mirrors.kernel.org/fedora/core/development/SRPMS/)
 #   * the URL of packages available in the FC release repo (defaults to
 #     http://mirrors.kernel.org/fedora/core/5/source/SRPMS/)
-#   * the URL to a short list linking BZ ticket numbers with package names,
-#     used when the script can't deduce the package name automatically from
-#     the summary. (defaults to bzId_pkg.txt)
 #   * the owners.list file
 #   * the URL to a wiki page containing the list of migrated/retired packages
 #     (defaults to Extras/PackagesNoLongerInDevel)
@@ -53,14 +50,12 @@
   "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&version=4&version=5&version=devel&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED&bug_severity=security&bug_severity=high&bug_severity=normal&bug_severity=low&bug_severity=translation&bug_severity=regression&chfieldto=Now&negate0=1&field0-0-0=component&type0-0-0=equals&value0-0-0=Package%20Review&ctype=csv";
 
 my %opt;
-my @options = ( "help", "repourl=s", "bzid=s", "o=s", "d=s", "cvs=s",
+my @options = ( "help", "repourl=s", "o=s", "d=s", "cvs=s",
 		"comps=s", "currel=i", "firstrel=i" );
 
 $main::repourl = "http://mirrors.kernel.org/fedora";
 $main::discarded
   = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
-$main::bzid
-  = "http://fedoraproject.org/wiki/Extras/UsefulScripts?action=AttachFile&do=get&target=bzId_pkg.txt";
 $main::members
   = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
 $main::cvsDir = "/export/scratch/extras";
@@ -72,7 +67,6 @@
 # Override any default settings with arguments that the user has supplied
 $main::repourl = $opt{"repourl"} if defined $opt{"repourl"};
 $main::discarded = $opt{"d"} if defined $opt{"d"};
-$main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
 $main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
 $main::compsDir = $opt{"comps"} if defined $opt{"comps"};
 $main::currel = $opt{"currel"} if defined $opt{"currel"};
@@ -102,7 +96,6 @@
 my @CORE_DROPPED_SRPMS;
 my @COMPS;
 my @COMPS_M;
-my %NAME;
 my %OWN;
 my %OWN_DUP;
 my %OWN_CVS_RECENT;
@@ -133,17 +126,6 @@
   "php-pecl-sqlite" => 1,
   "wxPythonGTK2" => 1
 );
-if ($main::bzid ne "") {
-  local *IN;
-  open IN, "wget -nv -O - \"$main::bzid\"|"
-    or die "Failed to wget $main::bzid : $!";
-  while ( <IN> ) {
-    s/\s+$//;
-    my @F = split /\t/;
-    $NAME{$F[0]} = $F[1];
-  }
-  close IN;
-}
 if ($main::members ne "") {
   local *IN;
   open IN, "wget -nv -O - --no-check-certificate \"$main::members\"|"
@@ -346,9 +328,7 @@
     $F[11] = $F[10];
     $F[11] =~ s/^["]+//;
     $F[11] =~ s/["]+$//;
-    if (defined $NAME{$F[0]}) {
-      $F[10] = $NAME{$F[0]};
-    } elsif ($F[8] eq "Package Review") {
+    if ($F[8] eq "Package Review") {
       # Try to guess package name
       $F[10] =~ s/["]//g;
       $F[10] =~ s/^.*review\s+request:?\s+<?//i;
@@ -1021,8 +1001,6 @@
   print STDERR "Usage: $0 [options] <bugs list>
  where options are:
   -help           this help note
-  -bzid <url>     list associating bz ticket number with package name
-                  [$main::bzid]
   -comps <dir>    extras comps directory [$main::compsDir]
   -currel <int>   current Fedora release number [$main::currel]
   -cvs <dir>      extras CVS directory [$main::cvsDir]



From fedora-extras-commits at redhat.com  Wed Oct 18 13:51:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Oct 2006 06:51:12 -0700
Subject: status-report-scripts parseBZbugList,1.52,1.53
Message-ID: <200610181351.k9IDpCAj013317@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13299

Modified Files:
	parseBZbugList 
Log Message:
Stop using PackagesNoLongerInDevel.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- parseBZbugList	18 Oct 2006 13:24:32 -0000	1.52
+++ parseBZbugList	18 Oct 2006 13:51:10 -0000	1.53
@@ -19,8 +19,6 @@
 #   * the URL of packages available in the FC release repo (defaults to
 #     http://mirrors.kernel.org/fedora/core/5/source/SRPMS/)
 #   * the owners.list file
-#   * the URL to a wiki page containing the list of migrated/retired packages
-#     (defaults to Extras/PackagesNoLongerInDevel)
 #   * a full CVS checkout of Fedora Extras packages
 
 
@@ -54,8 +52,6 @@
 		"comps=s", "currel=i", "firstrel=i" );
 
 $main::repourl = "http://mirrors.kernel.org/fedora";
-$main::discarded
-  = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
 $main::members
   = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
 $main::cvsDir = "/export/scratch/extras";
@@ -66,7 +62,6 @@
 
 # Override any default settings with arguments that the user has supplied
 $main::repourl = $opt{"repourl"} if defined $opt{"repourl"};
-$main::discarded = $opt{"d"} if defined $opt{"d"};
 $main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
 $main::compsDir = $opt{"comps"} if defined $opt{"comps"};
 $main::currel = $opt{"currel"} if defined $opt{"currel"};
@@ -101,7 +96,6 @@
 my %OWN_CVS_RECENT;
 my %MEMBER;
 my %CVS_NO_OWNER;
-my %FC_INTEGRATED;
 my %PKG_LIST;
 my %BUG_LIST;
 my %MAINT_LIST;
@@ -137,27 +131,6 @@
   }
   close IN;
 }
-if ($main::discarded ne "") {
-  local *IN;
-  open IN, "wget -nv -O - \"$main::discarded\"|"
-    or die "Failed to wget $main::discarded : $!";
-  while ( <IN> ) {
-    last if /^<p>These FE packages became integrated into a FC package/;
-  }
-  while ( <IN> ) {
-    last if /^<pre>/;
-  }
-  while ( <IN> ) {
-    last if /^<\/pre>/;
-    s/[\r\n]+$//;
-    s/\s.*$//;
-    $FC_INTEGRATED{$_} = 1;
-  }
-  while ( <IN> ) {
-    # Read the rest to avoid a broken pipe...
-  }
-  close IN;
-}
 if (defined $opt{"o"}) {
   local *IN;
   my $prev;
@@ -195,9 +168,6 @@
 foreach my $k (keys %CORE_D) {
   $SRPMS{$k} = 1;
 }
-foreach my $k (keys %FC_INTEGRATED) {
-  $SRPMS{$k} = 1;
-}
 # Check comps files
 for my $i ($main::currel .. ($main::currel + 1)) {
   print STDERR "Looking for $main::compsDir/comps-fe$i.xml.in\n";
@@ -508,7 +478,7 @@
       $$s[2] = 1 if defined $OWN_CVS_RECENT{$k};
     }
     unless (defined $EXTRAS_D{$k}) {
-      if (defined($CORE_D{$k}) || defined($FC_INTEGRATED{$k})) {
+      if (defined($CORE_D{$k})) {
 	push @NPC, $k;
 	next;
       }
@@ -1004,8 +974,6 @@
   -comps <dir>    extras comps directory [$main::compsDir]
   -currel <int>   current Fedora release number [$main::currel]
   -cvs <dir>      extras CVS directory [$main::cvsDir]
-  -d <url>        list of migrated/discarded packages
-                  [$main::discarded]
   -firstrel <int> first Fedora release number [$main::firstrel]
   -o <file>       owners.list file
   -repourl <url>  Fedora core and extras SRPMS development repo base



From fedora-extras-commits at redhat.com  Wed Oct 18 14:07:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 18 Oct 2006 07:07:38 -0700
Subject: rpms/libassuan/devel libassuan-0.9.3-m4-2.patch, NONE,
	1.1 libassuan.spec, 1.19, 1.20
Message-ID: <200610181407.k9IE7cPf016335@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16316

Modified Files:
	libassuan.spec 
Added Files:
	libassuan-0.9.3-m4-2.patch 
Log Message:
* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-2
- another libassuan.m4 patch


libassuan-0.9.3-m4-2.patch:

--- NEW FILE libassuan-0.9.3-m4-2.patch ---
--- src/libassuan.m4~	2006-10-14 23:36:40.000000000 +0300
+++ src/libassuan.m4	2006-10-14 23:38:07.000000000 +0300
@@ -120,7 +120,7 @@
 
 dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION,
 dnl                      [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGSand LIBASSUAN_PTH_LIBS
+dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS
 dnl
 AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
 [ _AM_PATH_LIBASSUAN_COMMON($1,pth)
@@ -144,7 +144,7 @@
 dnl                           and LIBASSUAN_PTHREAD_LIBS
 dnl
 AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
-[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
+[ _AM_PATH_LIBASSUAN_COMMON($1,pthread)
   if test $ok = yes; then
     LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
     LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libassuan.spec	10 Oct 2006 18:37:19 -0000	1.19
+++ libassuan.spec	18 Oct 2006 14:07:08 -0000	1.20
@@ -2,7 +2,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
 Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: libassuan-0.9.3-m4.patch
+Patch2: libassuan-0.9.3-m4-2.patch
 
 BuildRequires: pth-devel
 
@@ -37,6 +38,7 @@
 %setup -q
 
 %patch1 -p1 -b .m4patch
+%patch2 -p0 -b .m4patch-2
 
 
 %build
@@ -56,6 +58,7 @@
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+
 %check || :
 make check
 
@@ -84,6 +87,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-2
+- another libassuan.m4 patch
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-1
 - 0.9.3
 - BR: pth-devel, -devel: Requires: pth-devel



From fedora-extras-commits at redhat.com  Wed Oct 18 14:41:52 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:41:52 -0700
Subject: rpms/luma - New directory
Message-ID: <200610181441.k9IEfq5i016600@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16596/luma

Log Message:
Directory /cvs/extras/rpms/luma added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 14:41:58 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:41:58 -0700
Subject: rpms/luma/devel - New directory
Message-ID: <200610181441.k9IEfwvm016614@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16596/luma/devel

Log Message:
Directory /cvs/extras/rpms/luma/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 14:42:15 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:42:15 -0700
Subject: rpms/luma Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610181442.k9IEgFXR016683@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16677

Added Files:
	Makefile import.log 
Log Message:
Setup of module luma


--- NEW FILE Makefile ---
# Top level Makefile for module luma
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 14:42:20 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:42:20 -0700
Subject: rpms/luma/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200610181442.k9IEgKUm016699@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16677/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module luma


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 14:42:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Oct 2006 07:42:55 -0700
Subject: owners owners.list,1.1845,1.1846
Message-ID: <200610181442.k9IEgtld016758@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16712

Modified Files:
	owners.list 
Log Message:
Fix sorting.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1845
retrieving revision 1.1846
diff -u -r1.1845 -r1.1846
--- owners.list	18 Oct 2006 01:41:49 -0000	1.1845
+++ owners.list	18 Oct 2006 14:42:25 -0000	1.1846
@@ -645,8 +645,8 @@
 Fedora Extras|gxemul|Instruction-level machine emulator|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|hackedbox|The bastard son of Blackbox, a small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|haddock|Documentation tool for annotated Haskell source code|petersen at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
+Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -839,12 +839,12 @@
 Fedora Extras|libbinio|A binary stream interface class library for C++|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libburn|Library for reading, mastering and writing optical discs|jkeating at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|libctl|Guile-based support for flexible control files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|libchmxx|C++ bindings for chmlib|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libconfuse|A configuration file parser library|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|libctl|Guile-based support for flexible control files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|libdaemon|libdaemon is a lightweight C library that eases the writing of UNIX daemons|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|libdap|The C++ DAP2 library from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
@@ -1388,8 +1388,8 @@
 Fedora Extras|perl-File-Find-Rule-PPI|Add support for PPI queries to File::Find::Rule|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-HomeDir|Get the home directory for yourself or other users|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-File-MMagic-XS|Guess file type with XS|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-MimeInfo|Determine file type and open application|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-File-MMagic-XS|Guess file type with XS|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NFSLock|Perl module to do NFS (or not) locking|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-ReadBackwards|File::ReadBackwards Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Oct 18 14:43:33 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:43:33 -0700
Subject: rpms/luma import.log,1.1,1.2
Message-ID: <200610181443.k9IEhXjA016815@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16773

Modified Files:
	import.log 
Log Message:
auto-import luma-2.3-8 on branch devel from luma-2.3-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/luma/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 14:42:15 -0000	1.1
+++ import.log	18 Oct 2006 14:43:03 -0000	1.2
@@ -0,0 +1 @@
+luma-2_3-8:HEAD:luma-2.3-8.src.rpm:1161182578



From fedora-extras-commits at redhat.com  Wed Oct 18 14:43:34 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:43:34 -0700
Subject: rpms/luma/devel luma-2.3-plugins.patch, NONE, 1.1 luma.desktop, NONE,
	1.1 luma.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610181443.k9IEhYOe016819@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/luma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16773/devel

Modified Files:
	.cvsignore sources 
Added Files:
	luma-2.3-plugins.patch luma.desktop luma.spec 
Log Message:
auto-import luma-2.3-8 on branch devel from luma-2.3-8.src.rpm

luma-2.3-plugins.patch:

--- NEW FILE luma-2.3-plugins.patch ---
--- luma-2.3/lib/luma/base/backend/PluginLoader.py.org	2006-03-14 17:16:25.000000000 +0100
+++ luma-2.3/lib/luma/base/backend/PluginLoader.py	2006-10-15 21:00:40.000000000 +0200
@@ -45,7 +45,7 @@
         self.PLUGINS = {}
         
         # get the base diretory of the plugins as a string
-        self.pluginBaseDir = os.path.join(environment.lumaInstallationPrefix,  "lib", "luma", "plugins")
+        self.pluginBaseDir = os.path.join(environment.lumaInstallationPrefix, "share",  "luma", "lib", "plugins")
         
         self.pluginDirList = []
         self.pluginDirList = self.getPluginList()


--- NEW FILE luma.desktop ---
[Desktop Entry]
Name=Luma
Comment=Tool for managing LDAP servers
Exec=luma
Terminal=false
Icon=luma.png
Type=Application
Encoding=UTF-8


--- NEW FILE luma.spec ---
%define lumadata %{_datadir}/luma
%define lumalib %{lumadata}/lib
%define plugins %{lumalib}/plugins

Name:		luma
Version:	2.3
Release: 	8%{?dist}
Summary:	A graphical tool for managing LDAP servers

Group:		Applications/System
License:	GPL
URL:		http://www.sourceforge.net/projects/luma
Source0:	http://prdowloads.sourceforge.net/luma/luma-%{version}.tar.bz2
Source1:	luma.desktop
Patch1:		luma-2.3-plugins.patch

BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python >= 2.3
BuildRequires:	PyQt >= 3.10
BuildRequires:	python-ldap >= 2.0.0
BuildRequires:	python-smbpasswd
BuildRequires:	desktop-file-utils

Requires:	python >= 2.3
Requires:	PyQt >= 3.10
Requires:	python-ldap >= 2.0.0
Requires:	python-smbpasswd
Requires:	desktop-file-utils

%description
Luma - a graphical tool for accessing and managing LDAP 
servers. It is written in Python, using PyQt and python-ldap. 
Plugin-support is included and useful widgets with LDAP-
functionality for easy creation of plugins are delivered.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 

%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_prefix}
./install.py --prefix=$RPM_BUILD_ROOT%{_prefix}

mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons

pushd ${RPM_BUILD_ROOT}/%{_prefix}/lib
mv luma ${RPM_BUILD_ROOT}/%{_datadir}/luma/lib
popd

pushd ${RPM_BUILD_ROOT}/%{_bindir}
ln -sf ../share/luma/lib/luma.py luma
popd
 
cp share/luma/icons/luma-64.png ${RPM_BUILD_ROOT}/%{_datadir}/icons/

# Desktop entry for luma-settings
desktop-file-install --vendor fedora \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
	--add-category System \
	--add-category Application \
	%{SOURCE1}

for i in 22 32 48 ; do # 16, 64, 128 do not have transparent bg...
  d=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
  install -dm 755 $d
  ln -s ../../../../luma/icons/luma-$i.png $d/luma.png
done

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/luma
%dir %{lumadata}

%{lumalib}/ 

%{lumadata}/doc/
%{lumadata}/icons/

%dir %{lumadata}/i18n/
%lang(br) %{lumadata}/i18n/*br.*
%lang(cs) %{lumadata}/i18n/*cs.*
%lang(de) %{lumadata}/i18n/*de.*
%lang(en) %{lumadata}/i18n/gb.png
%lang(es) %{lumadata}/i18n/*es.*
%lang(fr) %{lumadata}/i18n/*fr.*
%lang(it) %{lumadata}/i18n/*it.*
%lang(no) %{lumadata}/i18n/*no*
%lang(ru) %{lumadata}/i18n/*ru.*
%lang(sv) %{lumadata}/i18n/*sv.*

%{_datadir}/applications/fedora-luma.desktop
%{_datadir}/icons/luma-*.png
%{_datadir}/icons/hicolor/*/apps/*.png

%{_mandir}/man1/luma.1.gz

%doc LICENSE


%changelog
* Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-8
- Fix x64 problem

* Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-7
- Fix plugin loading problem

* Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-6
- Some changes on the desktop file.

* Thu Aug 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-5
- Remove %%ghost becouse new packaging guidelines.

* Wed Aug  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-4
- Move python files to %%{_datadir}/luma/lib

* Wed Jul 26 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3-3
- Add Requires
c- Add %%lang before language specific files
- Change versioning schema to upstream

* Tue Jul 25 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.3.0-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/luma/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 14:42:20 -0000	1.1
+++ .cvsignore	18 Oct 2006 14:43:04 -0000	1.2
@@ -0,0 +1 @@
+luma-2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/luma/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 14:42:20 -0000	1.1
+++ sources	18 Oct 2006 14:43:04 -0000	1.2
@@ -0,0 +1 @@
+c1f3a8033a047a7046848833445ed496  luma-2.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 18 14:50:52 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:50:52 -0700
Subject: owners owners.list,1.1846,1.1847
Message-ID: <200610181450.k9IEoqmR016946@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16917

Modified Files:
	owners.list 
Log Message:
Add luma to bugzilla


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1846
retrieving revision 1.1847
diff -u -r1.1846 -r1.1847
--- owners.list	18 Oct 2006 14:42:25 -0000	1.1846
+++ owners.list	18 Oct 2006 14:50:22 -0000	1.1847
@@ -985,6 +985,7 @@
 Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|luma|A graphical tool for managing LDAP servers|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 14:53:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 18 Oct 2006 07:53:03 -0700
Subject: rpms/jasper/FC-3 jasper-1.701.0-GL-ac.patch, NONE,
	1.1 jasper-1.701.0-memory_leak.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 jasper-1.701.0-GL.patch, 1.2, 1.3 jasper.spec, 1.6, 1.7
Message-ID: <200610181453.k9IEr3o9017005@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971

Modified Files:
	.cvsignore jasper-1.701.0-GL.patch jasper.spec 
Added Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-memory_leak.patch 
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
- memory leak (#207006)


jasper-1.701.0-GL-ac.patch:

--- NEW FILE jasper-1.701.0-GL-ac.patch ---
--- jasper-1.701.0.GEO/configure.ac.GL	2006-02-20 19:58:02.000000000 -0600
+++ jasper-1.701.0.GEO/configure.ac	2006-02-24 07:40:38.000000000 -0600
@@ -242,7 +242,7 @@
 OPENGL_LIBS=""
 if test $ENABLE_OPENGL = yes; then
 	if test $HAVE_OPENGL = no; then
-		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
+		TMPLIBS="-lglut"
 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
 	fi

jasper-1.701.0-memory_leak.patch:

--- NEW FILE jasper-1.701.0-memory_leak.patch ---
diff -ur jasper-1.701.0/src/libjasper/base/jas_stream.c jasper-1.701.0-local/src/libjasper/base/jas_stream.c
--- jasper-1.701.0/src/libjasper/base/jas_stream.c	2004-02-09 07:04:40.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/base/jas_stream.c	2005-10-23 02:08:06.145589016 +0530
@@ -361,11 +361,11 @@
 	}
 	obj->fd = -1;
 	obj->flags = 0;
-	obj->pathname[0] = '\0';
+	strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	tmpnam(obj->pathname);
+	mkstemp(obj->pathname);
 
 	/* Open the underlying file. */
 	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
diff -ur jasper-1.701.0/src/libjasper/jpg/jpg_enc.c jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c
--- jasper-1.701.0/src/libjasper/jpg/jpg_enc.c	2004-02-09 07:04:41.000000000 +0530
+++ jasper-1.701.0-local/src/libjasper/jpg/jpg_enc.c	2005-10-23 02:09:02.526017888 +0530
@@ -331,6 +331,7 @@
 	rewind(output_file);
 	jpg_copyfiletostream(out, output_file);
 	fclose(output_file);
+	jas_matrix_destroy(src_mgr->data);
 	output_file = 0;
 
 	return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:40:10 -0000	1.2
+++ .cvsignore	18 Oct 2006 14:52:33 -0000	1.3
@@ -1 +1,2 @@
+geojasper_src.zip
 jasper-1.701.0.zip

jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper-1.701.0-GL.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper-1.701.0-GL.patch	31 Jan 2006 18:27:57 -0000	1.2
+++ jasper-1.701.0-GL.patch	18 Oct 2006 14:52:33 -0000	1.3
@@ -1,6 +1,6 @@
---- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
-+++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
-@@ -9465,7 +9465,7 @@
+--- jasper-1.701.0.GEO/configure.GL	2006-02-20 20:01:30.000000000 -0600
++++ jasper-1.701.0.GEO/configure	2006-02-24 07:40:46.000000000 -0600
+@@ -9464,7 +9464,7 @@
  OPENGL_LIBS=""
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jasper.spec	31 Jan 2006 18:27:57 -0000	1.6
+++ jasper.spec	18 Oct 2006 14:52:33 -0000	1.7
@@ -5,25 +5,40 @@
 # koffice
 # 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.701.0
-Release: 9%{?dist}
+Release: 15%{?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
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
+# autoconf/automake bits of patch1
+Patch2: jasper-1.701.0-GL-ac.patch
+# memory leak, see
+# http://gyachi.sourceforge.net/download.shtml
+# http://ayttm.sourceforge.net/files.shtml
+# http://ayttm.sourceforge.net/jasper-memory-leak-1.701.0.patch.gz
+Patch3: jasper-1.701.0-memory_leak.patch
 
+BuildRequires: automake 
 BuildRequires: libjpeg-devel
-BuildRequires: freeglut-devel
-# workaround: 
-#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
-#  http://bugzilla.redhat.com/bugzilla/179464
-BuildRequires: libGL-devel libGLU-devel
+# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
+BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -40,12 +55,24 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?geo:.GEO}
 
 %patch1 -p1 -b .GL
+%patch3 -p1 -b .memleak
+
+%if "%{?geo:1}" == "1"
+chmod +x configure configure.ac
+%patch2 -p1 -b .GL-ac
+libtoolize --force
+aclocal
+autoconf
+autoheader
+automake -a
+%endif
 
 
 %build
+
 %configure \
   --enable-shared \
   --disable-static 
@@ -67,24 +94,20 @@
 rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}*
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-# avoid conflict(s) with tomcat
-# not needed anymore, see bz #176773
-# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
-
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/jiv
 %{_bindir}/imginfo
-%{_bindir}/jasper*
+%{_bindir}/*jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*
-%{_includedir}/*
+%{_includedir}/jasper/
 %{_libdir}/lib*.so
 
 
@@ -98,6 +121,22 @@
 
 
 %changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-15
+- memory leak (#207006)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-13
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-12
+- fixup build issues introduced by geojasper integration
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-10
+- support/use geojasper (optional, default no)
+- fc5: gcc/glibc respin
+
+* Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
 - workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
   (#179464)



From fedora-extras-commits at redhat.com  Wed Oct 18 14:55:29 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 18 Oct 2006 07:55:29 -0700
Subject: comps comps-fe5.xml.in,1.171,1.172 comps-fe6.xml.in,1.192,1.193
Message-ID: <200610181455.k9IEtTXJ017117@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17099

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add luma to comps.xml


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- comps-fe5.xml.in	17 Oct 2006 17:52:03 -0000	1.171
+++ comps-fe5.xml.in	18 Oct 2006 14:54:59 -0000	1.172
@@ -11,6 +11,7 @@
       <packagereq type="optional">gparted</packagereq>
       <packagereq type="optional">gsynaptics</packagereq>
       <packagereq type="optional">lat</packagereq>
+      <packagereq type="optional">luma</packagereq>
       <packagereq type="optional">qtparted</packagereq>
       <packagereq type="optional">system-config-control</packagereq>
       <packagereq type="optional">yumex</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- comps-fe6.xml.in	17 Oct 2006 17:32:20 -0000	1.192
+++ comps-fe6.xml.in	18 Oct 2006 14:54:59 -0000	1.193
@@ -11,6 +11,7 @@
       <packagereq type="optional">gparted</packagereq>
       <packagereq type="optional">gsynaptics</packagereq>
       <packagereq type="optional">lat</packagereq>
+      <packagereq type="optional">luma</packagereq>
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
       <packagereq type="optional">yumex</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 15:40:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:40:40 -0700
Subject: rpms/genius - New directory
Message-ID: <200610181540.k9IFeetr020390@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20386/genius

Log Message:
Directory /cvs/extras/rpms/genius added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 15:40:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:40:46 -0700
Subject: rpms/genius/devel - New directory
Message-ID: <200610181540.k9IFek8t020404@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20386/genius/devel

Log Message:
Directory /cvs/extras/rpms/genius/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 15:41:08 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:41:08 -0700
Subject: rpms/genius Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610181541.k9IFf8bW020435@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20429

Added Files:
	Makefile import.log 
Log Message:
Setup of module genius


--- NEW FILE Makefile ---
# Top level Makefile for module genius
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 15:41:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:41:13 -0700
Subject: rpms/genius/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610181541.k9IFfDDx020452@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20429/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module genius


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 15:44:15 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 18 Oct 2006 08:44:15 -0700
Subject: owners owners.list,1.1847,1.1848
Message-ID: <200610181544.k9IFiFuq020550@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481

Modified Files:
	owners.list 
Log Message:
Unorphan perl-Chart, perl-HTML-Template-Expr, perl-Net-SCP, perl-Net-SSH,
perl-String-ShellQuote, and perl-XML-XQL.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1847
retrieving revision 1.1848
diff -u -r1.1847 -r1.1848
--- owners.list	18 Oct 2006 14:50:22 -0000	1.1847
+++ owners.list	18 Oct 2006 15:43:45 -0000	1.1848
@@ -1260,7 +1260,7 @@
 Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-CGI-Untaint-email|Validate an email address|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Chart|Perl modules for producing many types of charts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Chart|Perl modules for producing many types of charts|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1429,7 +1429,7 @@
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-TableExtract|A Perl module for extracting content in HTML tables|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Body|HTTP Body Parser|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1533,10 +1533,10 @@
 Fedora Extras|perl-Net-LibIDN|Perl bindings for GNU LibIDN|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Patricia|Patricia Trie perl module for fast IP address lookups|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-SNMP|Object oriented interface to SNMP|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-SSH|Perl extension for secure shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-SSH-Perl|SSH (Secure Shell) client|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-XMPP|Net::XMPP - perl XMPP library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1623,7 +1623,7 @@
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Format|Sprintf-like string formatting capabilities with arbitrary format definitions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Exporter|Sophisticated exporter for custom-built routines|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Identify|Retrieve names of code references|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Install|Install subroutines into packages easily|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1717,7 +1717,7 @@
 Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-Stream|XML::Stream - streaming XML library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML-Parser-Syck|Perl Wrapper for the YAML Parser Extension: libsyck|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,oliver at linux-kernel.at
 Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 15:44:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:44:30 -0700
Subject: rpms/genius import.log,1.1,1.2
Message-ID: <200610181544.k9IFiU7F020559@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20516

Modified Files:
	import.log 
Log Message:
auto-import genius-0.7.6.1-3 on branch devel from genius-0.7.6.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/genius/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 15:41:07 -0000	1.1
+++ import.log	18 Oct 2006 15:44:00 -0000	1.2
@@ -0,0 +1 @@
+genius-0_7_6_1-3:HEAD:genius-0.7.6.1-3.src.rpm:1161186232



From fedora-extras-commits at redhat.com  Wed Oct 18 15:44:31 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 08:44:31 -0700
Subject: rpms/genius/devel genius.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610181544.k9IFiVll020563@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/genius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20516/devel

Modified Files:
	.cvsignore sources 
Added Files:
	genius.spec 
Log Message:
auto-import genius-0.7.6.1-3 on branch devel from genius-0.7.6.1-3.src.rpm


--- NEW FILE genius.spec ---
Name:           genius
Version:        0.7.6.1
Release:        3%{?dist}
Summary:        An arbitrary precision integer and multiple precision floatingpoint calculator

Group:          Applications/Engineering
License:        GPL
URL:            http://www.jirka.org/genius.html
Source0:        http://ftp.5z.com/pub/genius/genius-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vte-devel
BuildRequires:  readline-devel
BuildRequires:  gmp-devel
BuildRequires:  popt
BuildRequires:  pkgconfig
BuildRequires:  intltool
BuildRequires:  gtksourceview-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  desktop-file-utils
BuildRequires:  scrollkeeper
BuildRequires:  flex
BuildRequires:  gettext


%description
Genius is a calculator program similar in some aspects to BC, Matlab
or Maple. GEL is the name of its extension language, in fact, a large
part of the standard genius functions are written in GEL itself.


%package devel
Summary:        Development files for Genius
Group:          Applications/Engineering
Requires:       %{name} = %{version}-%{release}

%description devel
Development files for Genius.


%package -n gnome-genius
Summary:        GNOME frontend for Genius
Group:          Applications/Engineering
Requires:       %{name} = %{version}-%{release}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description -n gnome-genius
GNOME frontend for Genius.


%prep
%setup -q
sed -i "s|Mime-Type|MimeType|" src/gnome-genius.desktop*
find -name \*.c | xargs chmod 0644


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_libdir}
rm -f $RPM_BUILD_ROOT%{_datadir}/genius/plugins/test.plugin
rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
rm -rf $RPM_BUILD_ROOT%{_datadir}/mime/{subclasses,text,XMLnamespaces,aliases,globs,magic,mime.cache}
rm -rf $RPM_BUILD_ROOT/var
desktop-file-install \
    --vendor fedora \
    --add-category X-Fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/gnome-genius.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/genius
%{_datadir}/genius


%files devel
%defattr(-,root,root,-)
%{_includedir}/genius


%files -n gnome-genius
%defattr(-,root,root,-)
%{_bindir}/gnome-genius
%{_libexecdir}/*
%{_datadir}/omf/genius
%{_datadir}/gnome/help/genius
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/mime/packages/*
%{_datadir}/applications/*


%post -n gnome-genius
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database > /dev/null 2>&1 ||:
scrollkeeper-update -q -o %{_datadir}/omf/genius ||:
gtk-update-icon-cache -qf /usr/share/icons/hicolor &> /dev/null || :


%postun -n gnome-genius
if [ $1 -eq 0 ]; then
  update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
  update-desktop-database > /dev/null 2>&1 ||:
  scrollkeeper-update -q ||:
  gtk-update-icon-cache -qf /usr/share/icons/hicolor &> /dev/null || :
fi


%changelog
* Wed Oct 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.7.6.1-3
- Fixed Req and permissions

* Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.7.6.1-2
- Fixed BR

* Sun Oct 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.7.6.1-1
- first Fedora release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/genius/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 15:41:13 -0000	1.1
+++ .cvsignore	18 Oct 2006 15:44:01 -0000	1.2
@@ -0,0 +1 @@
+genius-0.7.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/genius/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 15:41:13 -0000	1.1
+++ sources	18 Oct 2006 15:44:01 -0000	1.2
@@ -0,0 +1 @@
+5af450d765dfff8465da47d227333c72  genius-0.7.6.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 15:45:03 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 08:45:03 -0700
Subject: rpms/cobbler/devel sources,1.8,1.9
Message-ID: <200610181545.k9IFj3Zu020616@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20558

Modified Files:
	sources 
Log Message:
Not needed, save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Oct 2006 22:15:18 -0000	1.8
+++ sources	18 Oct 2006 15:44:33 -0000	1.9
@@ -1,2 +1 @@
-44f1e470bf40444b32be11393dee8e20  cobbler-0.2.6.tar.gz
 41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 15:48:56 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 08:48:56 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.2, 1.3 cobbler.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610181548.k9IFmuC4020703@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20677

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Adding cobbler for FC-5 as well as FC-6, starting at 0.2.7




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 20:13:11 -0000	1.2
+++ .cvsignore	18 Oct 2006 15:48:26 -0000	1.3
@@ -1 +1,2 @@
 cobbler-0.1.1.tar.gz
+cobbler-0.2.7.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cobbler.spec	27 Sep 2006 20:13:11 -0000	1.1
+++ cobbler.spec	18 Oct 2006 15:48:26 -0000	1.2
@@ -2,18 +2,18 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.1.1
-Release: 8%{?dist}
+Version: 0.2.7
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
 Requires: tftp-server
-Requires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Url: http://et.redhat.com/page/Cobbler_%26_Koan_Provisioning_Tools
+ExcludeArch: ppc
+Url: http://cobbler.et.redhat.com
 
 %description
 
@@ -26,40 +26,84 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %{_bindir}/cobbler
+%dir /etc/cobbler
+/etc/cobbler/*.ks
+/etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
 %{python_sitelib}/cobbler/yaml/*.py*
 %{_mandir}/man1/cobbler.1.gz
+%dir /var/lib/cobbler
+%dir /var/www/cobbler
+/var/lib/cobbler/elilo-3.6-ia64.efi
 
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
-* Thu Sep 21 2006 - 0.1.1-8
-- Added doc files to %doc, removed INSTALLED_FILES code
-* Wed Sep 20 2006 - 0.1.1-7
+
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.7-1
+- Upstream changes (see CHANGELOG), includes removing pexpect as a require
+- This RPM now builds on RHEL4
+
+* Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.6-1
+- Upstream changes (see CHANGELOG), includes removing Cheetah as a require
+
+* Mon Oct 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.5-1
+- Upstream features and bugfixes (see CHANGELOG)
+- Packaged additional kickstart file and specfile cleanup
+
+* Thu Oct 12 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.4-1
+- Upstream features and bugfixes (see CHANGELOG)
+
+* Mon Oct 9 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
+- Upstream features (see CHANGELOG) & URL update
+
+* Fri Oct 6 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
+- Upstream bugfixes
+
+* Fri Sep 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.1-2
+- URL update
+
+* Thu Sep 28 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
+- Upstream pull of bugfixes and new remote system "enchant" feature
+
+* Fri Sep 22 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.0-1
+- Lots of new PXE and dhcpd.conf upstream, elilo.efi now included.
+
+* Thu Sep 21 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-8
+- Added doc files to doc, removed INSTALLED_FILES code
+
+* Wed Sep 20 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-7
 - Upstream updates
-* Fri Sep 15 2006 - 0.1.1-6
+
+* Fri Sep 15 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-6
 - Make koan own it's directory, add GPL "COPYING" file.
-* Wed Aug 16 2006 - 0.1.1-5
+
+* Wed Aug 16 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-5
 - Spec file tweaks only for FC-Extras
-* Thu Jul 20 2006 - 0.1.1-4
+
+* Thu Jul 20 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-4
 - Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module.
-* Wed Jul 12 2006 - 0.1.1-3
+
+* Wed Jul 12 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.1-3
 - Added templating support using Cheetah
-* Thu Jul 9 2006 - 0.1.0-2
+
+* Thu Jul 9 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.0-2
 - Fedora-Extras rpm spec tweaks
-* Tue Jun 28 2006 - 0.1.0-1
+
+* Tue Jun 28 2006 Michael DeHaan <mdehaan at redhat.com> - 0.1.0-1
 - rpm genesis
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Sep 2006 20:13:11 -0000	1.2
+++ sources	18 Oct 2006 15:48:26 -0000	1.3
@@ -1 +1,2 @@
 c48fc1ba04be7372537dc6483dea5de5  cobbler-0.1.1.tar.gz
+41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 15:49:41 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 18 Oct 2006 08:49:41 -0700
Subject: owners owners.list,1.1848,1.1849
Message-ID: <200610181549.k9IFnfdm020727@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20707

Modified Files:
	owners.list 
Log Message:
Add mISDN and OpenPBX


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1848
retrieving revision 1.1849
diff -u -r1.1848 -r1.1849
--- owners.list	18 Oct 2006 15:43:45 -0000	1.1848
+++ owners.list	18 Oct 2006 15:49:11 -0000	1.1849
@@ -1043,6 +1043,7 @@
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mirrormagic|Puzzle game where you steer a beam of light using mirrors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|mISDN|Userspace part of Modular ISDN stack|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mlton|Optimizing compiler for Standard ML|adam at spicenitz.org|extras-qa at fedoraproject.org|
@@ -1178,6 +1179,7 @@
 Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|openpbx|The Truly Open Source PBX|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 15:53:23 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 08:53:23 -0700
Subject: rpms/koan/FC-5 .cvsignore, 1.2, 1.3 koan.spec, 1.4, 1.5 sources, 1.3,
	1.4
Message-ID: <200610181553.k9IFrN5K020804@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20784

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Adding koan to FC-5, starting with koan 0.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 20:15:39 -0000	1.2
+++ .cvsignore	18 Oct 2006 15:52:53 -0000	1.3
@@ -1 +1,2 @@
 koan-0.1.1.tar.gz
+koan-0.2.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/koan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- koan.spec	28 Sep 2006 21:29:17 -0000	1.4
+++ koan.spec	18 Oct 2006 15:52:53 -0000	1.5
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.1.1
-Release: 10%{?dist}
+Version: 0.2.2
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/page/Cobbler_%26_Koan_Provisioning_Tools
+Url: http://et.redhat.com/~mdehaan/cobbler
 
 %description
 
@@ -47,23 +47,38 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
-* Thu Sep 28 2006 - 0.1.1-10
-- Building build rev to keep FC-E happy
-* Thu Sep 28 2006 - 0.1.1-9
+* Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
+- Upstream change -- support Python 2.3
+
+* Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
+- Upstream features (see CHANGELOG)
+
+* Thu Sep 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-10
+- Bumping build rev for FC-E
+
+* Thu Sep 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-9
 - Excluding PPC since syslinux (gethostip) isn't available for ppc
-* Thu Sep 21 2006 - 0.1.1-8
+
+* Thu Sep 21 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-8
 - Added doc files to %doc, removed INSTALLED_FILES code
-* Wed Sep 20 2006 - 0.1.1-7
+
+* Wed Sep 20 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-7
 - Upstream updates
-* Fri Sep 15 2006 - 0.1.1-6
+
+* Fri Sep 15 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-6
 - Make koan own it's directory, add GPL "COPYING" file.
-* Wed Aug 16 2006 - 0.1.1-5
+
+* Wed Aug 16 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-5
 - Spec-file only changes for FC-Extras submission
-* Thu Jul 20 2006 - 0.1.1-4
+
+* Thu Jul 20 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-4
 - Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module.
-* Fri Jul 12 2006 - 0.1.1-3
+
+* Fri Jul 12 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.1-3
 - allow installing with per-system cobbler data in addition to per-profile
-* Thu Jul 09 2006 - 0.1.0-2
+
+* Thu Jul 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.0-2
 - rpm tweaks for Fedora Extras
-* Wed Jun 28 2006 - 0.1.0-1
+
+* Wed Jun 28 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.1.0-1
 - rpm genesis


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 21:26:18 -0000	1.3
+++ sources	18 Oct 2006 15:52:53 -0000	1.4
@@ -1 +1,2 @@
 d1b7df4a1fb022d345d79f3b182d769b  koan-0.1.1.tar.gz
+8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 16:05:29 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 09:05:29 -0700
Subject: owners owners.list,1.1849,1.1850
Message-ID: <200610181605.k9IG5Tph023880@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23864

Modified Files:
	owners.list 
Log Message:
added genius


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1849
retrieving revision 1.1850
diff -u -r1.1849 -r1.1850
--- owners.list	18 Oct 2006 15:49:11 -0000	1.1849
+++ owners.list	18 Oct 2006 16:04:58 -0000	1.1850
@@ -484,6 +484,7 @@
 Fedora Extras|geda-utils|Several utilities for the gEDA project|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|genchemlab|A general chemistry lab simulation|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|genius|An arbitrary precision integer and multiple precision floatingpoint calculator|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gentium-fonts|SIL Gentium fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|GeoIP|C library for country/city/organization to IP address or hostname mapping|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 16:08:23 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 18 Oct 2006 09:08:23 -0700
Subject: rpms/python-basemap/devel .cvsignore, 1.7, 1.8 python-basemap.spec, 
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200610181608.k9IG8NY1024101@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24031

Modified Files:
	.cvsignore python-basemap.spec sources 
Log Message:
Update to upstream 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Sep 2006 19:53:08 -0000	1.7
+++ .cvsignore	18 Oct 2006 16:07:53 -0000	1.8
@@ -1 +1 @@
-basemap-0.9.2.tar.gz
+basemap-0.9.3.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-basemap.spec	7 Sep 2006 19:53:08 -0000	1.9
+++ python-basemap.spec	18 Oct 2006 16:07:53 -0000	1.10
@@ -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-basemap
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Orion Poplawski <orion at cora.nwra.com> 0.9.3-1
+- Update to upstream 0.9.3
+
 * Thu Sep  7 2006 Orion Poplawski <orion at cora.nwra.com> 0.9.2-1
 - Update to upstream 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Sep 2006 19:53:08 -0000	1.7
+++ sources	18 Oct 2006 16:07:53 -0000	1.8
@@ -1 +1 @@
-1b2f7f654c007ca5cd98fcd18b85df61  basemap-0.9.2.tar.gz
+1d02d6230286262a3bb6c11aad3f58ce  basemap-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 16:18:16 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 18 Oct 2006 09:18:16 -0700
Subject: rpms/openpbx/devel .cvsignore, 1.2, 1.3 openpbx.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610181618.k9IGIGu6024297@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24272

Modified Files:
	.cvsignore openpbx.spec sources 
Log Message:
build with mISDN and MySQL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Oct 2006 06:43:10 -0000	1.2
+++ .cvsignore	18 Oct 2006 16:17:46 -0000	1.3
@@ -1 +1 @@
-openpbx-r1979.tar.gz
+openpbx-r1984.tar.gz


Index: openpbx.spec
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/openpbx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openpbx.spec	17 Oct 2006 12:43:14 -0000	1.2
+++ openpbx.spec	18 Oct 2006 16:17:46 -0000	1.3
@@ -1,13 +1,13 @@
-%define snap 1979
+%define snap 1984
 
-%bcond_with misdn
+%bcond_without misdn
 %bcond_without zaptel
 
 %bcond_without	fedora
 
 Name:		openpbx
 Version:	1.2
-Release:	1.rc1.svn%{snap}%{?dist}
+Release:	2.rc1.svn%{snap}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -23,7 +23,7 @@
 BuildRequires:	fedora-usermgmt-devel bluez-libs-devel openldap-devel
 BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
 BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
-BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel
+BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel mysql-devel
 BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN-devel}
 BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel}
 
@@ -60,6 +60,14 @@
 %description postgresql
 This package contains modules for OpenPBX which make use of PostgreSQL.
 
+%package mysql
+Group:		Applications/Internet
+Summary:	MySQL support for OpenPBX
+Requires:	%{name} = %{version}-%{release}
+
+%description mysql
+This package contains modules for OpenPBX which make use of MySQL.
+
 %package odbc
 Group:		Applications/Internet
 Summary:	ODBC support for OpenPBX
@@ -167,7 +175,9 @@
 	   --enable-javascript --with-res_js --enable-fast-install \
 	   %{?with_misdn:--with-chan_misdn} \
 	   %{?with_zaptel:--enable-zaptel} \
-	   --enable-jabber --with-res_jabber # --with-res_sqlite
+	   --enable-jabber --with-res_jabber \
+	   --enable-mysql --with-res_config_mysql --with-cdr_mysql
+	   
 
 # Poxy fscking libtool is _such_ a pile of crap...
 sed -i 's/^CC="gcc"/CC="gcc -Wl,--as-needed"/' libtool
@@ -247,6 +257,7 @@
 %exclude %{_sysconfdir}/openpbx.org/cdr_tds.conf
 # Separately packaged
 %exclude %{_libdir}/openpbx.org/modules/*pgsql.so
+%exclude %{_libdir}/openpbx.org/modules/*mysql.so
 %exclude %{_libdir}/openpbx.org/modules/app_sql_postgres.so
 %exclude %{_libdir}/openpbx.org/modules/app_ldap.so
 %exclude %{_libdir}/openpbx.org/modules/cdr_odbc.so
@@ -257,6 +268,7 @@
 %exclude %{_libdir}/openpbx.org/modules/res_ogi.so
 %exclude %{_libdir}/openpbx.org/modules/chan_capi.so
 %exclude %{_sysconfdir}/openpbx.org/cdr_pgsql.conf
+%exclude %{_sysconfdir}/openpbx.org/*mysql.conf
 %exclude %{_sysconfdir}/openpbx.org/cdr_odbc.conf
 %exclude %{_sysconfdir}/openpbx.org/chan_bluetooth.conf
 %exclude %{_sysconfdir}/openpbx.org/res_jabber.conf
@@ -285,6 +297,10 @@
 %{_libdir}/openpbx.org/modules/app_sql_postgres.so
 %config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_pgsql.conf
 
+%files mysql
+%{_libdir}/openpbx.org/modules/*mysql.so
+%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/*mysql.conf
+
 %files odbc
 %{_libdir}/openpbx.org/modules/cdr_odbc.so
 %config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_odbc.conf
@@ -337,5 +353,8 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Wed Oct 18 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-2.rc1.svn1984
+- Build with mISDN and MySQL support
+
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-1.rc1.svn1979
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Oct 2006 06:43:10 -0000	1.2
+++ sources	18 Oct 2006 16:17:46 -0000	1.3
@@ -1 +1 @@
-b863cbd1e90338b05439267be3eccb44  openpbx-r1979.tar.gz
+8aed2d6afedbd13082d8ce4318b8f163  openpbx-r1984.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 18:21:29 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 11:21:29 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.3, 1.4 cobbler.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610181821.k9IILT24031236@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31196

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2006 15:48:26 -0000	1.3
+++ .cvsignore	18 Oct 2006 18:20:58 -0000	1.4
@@ -1,2 +1,3 @@
 cobbler-0.1.1.tar.gz
 cobbler-0.2.7.tar.gz
+cobbler-0.2.8.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cobbler.spec	18 Oct 2006 15:48:26 -0000	1.2
+++ cobbler.spec	18 Oct 2006 18:20:58 -0000	1.3
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.7
+Version: 0.2.8
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -54,6 +54,9 @@
 
 %changelog
 
+* Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.7-1
 - Upstream changes (see CHANGELOG), includes removing pexpect as a require
 - This RPM now builds on RHEL4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Oct 2006 15:48:26 -0000	1.3
+++ sources	18 Oct 2006 18:20:58 -0000	1.4
@@ -1,2 +1 @@
-c48fc1ba04be7372537dc6483dea5de5  cobbler-0.1.1.tar.gz
-41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz
+f6f86ccf17ad4bfbd167291cf748eb01  cobbler-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 18:23:30 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 11:23:30 -0700
Subject: rpms/cobbler/devel .cvsignore, 1.8, 1.9 cobbler.spec, 1.7,
	1.8 sources, 1.9, 1.10
Message-ID: <200610181823.k9IINUtC031332@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31312

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Oct 2006 22:15:18 -0000	1.8
+++ .cvsignore	18 Oct 2006 18:22:59 -0000	1.9
@@ -5,3 +5,4 @@
 cobbler-0.2.5.tar.gz
 cobbler-0.2.6.tar.gz
 cobbler-0.2.7.tar.gz
+cobbler-0.2.8.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cobbler.spec	17 Oct 2006 22:15:18 -0000	1.7
+++ cobbler.spec	18 Oct 2006 18:22:59 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.7
+Version: 0.2.8
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -54,6 +54,9 @@
 
 %changelog
 
+* Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1
+- Upstream changes (see CHANGELOG)
+
 * Tue Oct 17 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.7-1
 - Upstream changes (see CHANGELOG), includes removing pexpect as a require
 - This RPM now builds on RHEL4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Oct 2006 15:44:33 -0000	1.9
+++ sources	18 Oct 2006 18:22:59 -0000	1.10
@@ -1 +1 @@
-41f4ce321525dc56e7bbdef44917c02a  cobbler-0.2.7.tar.gz
+f6f86ccf17ad4bfbd167291cf748eb01  cobbler-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 18:44:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 18 Oct 2006 11:44:14 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.13, 1.14 gnupg2.spec, 1.52,
	1.53 sources, 1.15, 1.16 gnupg-1.9.91-readline.patch, 1.1, NONE
Message-ID: <200610181844.k9IIiEkE031494@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31471

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.91-readline.patch 
Log Message:
* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.93-1
- 1.9.93



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Oct 2006 12:23:06 -0000	1.13
+++ .cvsignore	18 Oct 2006 18:43:44 -0000	1.14
@@ -1,4 +1,2 @@
-gnupg-1.9.23.tar.bz2
-gnupg-1.9.23.tar.bz2.sig
-gnupg-1.9.91.tar.bz2.sig
-gnupg-1.9.92.tar.bz2.sig
+gnupg-1.9.93.tar.bz2
+gnupg-1.9.93.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnupg2.spec	11 Oct 2006 14:16:26 -0000	1.52
+++ gnupg2.spec	18 Oct 2006 18:43:44 -0000	1.53
@@ -11,8 +11,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.92
-Release: 2%{?dist}
+Version: 1.9.93
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -111,10 +111,8 @@
 make 
 
 
-%check ||:
-## Allows for better debugability (doesn't work, fixme)
-# echo "debug-allow-core-dumps" >> tests/gpgsm.conf
-# (sometimes?) expect one failure (reported upstream)
+%check
+# some gpg2 tests (still) FAIL
 make -k check ||:
 
 
@@ -134,7 +132,6 @@
 #file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
 #file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
 #file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-
 rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
 mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
 
@@ -185,6 +182,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.93-1
+- 1.9.93
+
 * Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-2
 - fix file conflicts with gnupg
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Oct 2006 12:23:06 -0000	1.15
+++ sources	18 Oct 2006 18:43:44 -0000	1.16
@@ -1,2 +1,2 @@
-1d0b7ce8c5ff98976253e78a3e20c3a7  gnupg-1.9.92.tar.bz2.sig
-46fc473680ff5586184ddb53e7e18277  gnupg-1.9.92.tar.bz2
+fc2d20e6e8aba396953768b503bf07fe  gnupg-1.9.93.tar.bz2.sig
+84b1af5b6c489fcbbbbf4f219aaf2526  gnupg-1.9.93.tar.bz2


--- gnupg-1.9.91-readline.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 18 19:03:20 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 18 Oct 2006 12:03:20 -0700
Subject: rpms/koan/devel .cvsignore, 1.3, 1.4 koan.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200610181903.k9IJ3Kkh002103@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2083

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Update koan to latest to fix EVR mail item




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 20:20:02 -0000	1.3
+++ .cvsignore	18 Oct 2006 19:02:50 -0000	1.4
@@ -1,2 +1,3 @@
 koan-0.1.1.tar.gz
 koan-0.2.1.tar.gz
+koan-0.2.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- koan.spec	10 Oct 2006 20:20:02 -0000	1.5
+++ koan.spec	18 Oct 2006 19:02:50 -0000	1.6
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.1
+Version: 0.2.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -47,6 +47,9 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
+- Upstream change -- support Python 2.3
+
 * Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.1-1
 - Upstream features (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Oct 2006 20:20:02 -0000	1.4
+++ sources	18 Oct 2006 19:02:50 -0000	1.5
@@ -1 +1 @@
-79137117f164586f4d7fd19f837bec33  koan-0.2.1.tar.gz
+8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 19:39:35 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 18 Oct 2006 12:39:35 -0700
Subject: fedora-security/audit fc5,1.362,1.363 fc6,1.116,1.117
Message-ID: <200610181939.k9IJdZIQ002408@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2388

Modified Files:
	fc5 fc6 
Log Message:
Note a new kdelibs issue.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- fc5	17 Oct 2006 21:26:56 -0000	1.362
+++ fc5	18 Oct 2006 19:39:32 -0000	1.363
@@ -32,6 +32,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4811 VULNERABLE (kdelibs) #211342
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 VULNERABLE (php)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fc6	17 Oct 2006 21:26:56 -0000	1.116
+++ fc6	18 Oct 2006 19:39:32 -0000	1.117
@@ -28,6 +28,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4811 VULNERABLE (kdelibs) #211347
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Wed Oct 18 19:41:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 18 Oct 2006 12:41:29 -0700
Subject: owners owners.list,1.1850,1.1851
Message-ID: <200610181941.k9IJfTVt002443@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2423

Modified Files:
	owners.list 
Log Message:
Adding libpri.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1850
retrieving revision 1.1851
diff -u -r1.1850 -r1.1851
--- owners.list	18 Oct 2006 16:04:58 -0000	1.1850
+++ owners.list	18 Oct 2006 19:40:58 -0000	1.1851
@@ -924,6 +924,7 @@
 Fedora Extras|libpng10|Old version of libpng, needed to run old binaries|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|libpolyxmass|Polymer chemistry-related functionalities|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|libpri|An implementation of Primary Rate ISDN|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|libqalculate|Multi-purpose calculator library|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libreadline-java|A Java wrapper around EditLine|ifoox at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libresample|A real-time library for audio sampling rate conversion|jeff at ocjtech.us|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 20:13:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 13:13:21 -0700
Subject: owners owners.list,1.1851,1.1852
Message-ID: <200610182013.k9IKDL8Q005544@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5526

Modified Files:
	owners.list 
Log Message:

Forgot to add libpaper, my bad.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1851
retrieving revision 1.1852
diff -u -r1.1851 -r1.1852
--- owners.list	18 Oct 2006 19:40:58 -0000	1.1851
+++ owners.list	18 Oct 2006 20:12:51 -0000	1.1852
@@ -921,6 +921,7 @@
 Fedora Extras|libosip2|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|libpano12|Library for manipulating panoramic images|bruno at postle.net|extras-qa at fedoraproject.org|
+Fedora Extras|libpaper|Library and tools for handling papersize|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libpng10|Old version of libpng, needed to run old binaries|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|libpolyxmass|Polymer chemistry-related functionalities|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 20:42:46 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 18 Oct 2006 13:42:46 -0700
Subject: rpms/anjuta import.log,1.22,1.23
Message-ID: <200610182042.k9IKgk1Z005829@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5761

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-8 on branch devel from anjuta-2.0.2-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- import.log	2 Sep 2006 16:30:32 -0000	1.22
+++ import.log	18 Oct 2006 20:42:16 -0000	1.23
@@ -19,3 +19,4 @@
 anjuta-1_2_4a-6:HEAD:anjuta-1.2.4a-6.src.rpm:1156690572
 anjuta-1_2_4a-7:HEAD:anjuta-1.2.4a-7.src.rpm:1157214546
 anjuta-1_2_4a-7:FC-5:anjuta-1.2.4a-7.src.rpm:1157214616
+anjuta-2_0_2-8:HEAD:anjuta-2.0.2-8.src.rpm:1161204122



From fedora-extras-commits at redhat.com  Wed Oct 18 20:42:47 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 18 Oct 2006 13:42:47 -0700
Subject: rpms/anjuta/devel anjuta2.spec, NONE, 1.1 .cvsignore, 1.6,
	1.7 sources, 1.6, 1.7 anjuta-1.2.4a-search.patch, 1.1,
	NONE anjuta-1.2.4a-watch-keys.patch, 1.1,
	NONE anjuta-export-dynamic.patch, 1.1,
	NONE anjuta-project_type.patch, 1.1, NONE anjuta.spec, 1.22, NONE
Message-ID: <200610182042.k9IKgls1005833@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5761/devel

Modified Files:
	.cvsignore sources 
Added Files:
	anjuta2.spec 
Removed Files:
	anjuta-1.2.4a-search.patch anjuta-1.2.4a-watch-keys.patch 
	anjuta-export-dynamic.patch anjuta-project_type.patch 
	anjuta.spec 
Log Message:
auto-import anjuta-2.0.2-8 on branch devel from anjuta-2.0.2-8.src.rpm


--- NEW FILE anjuta2.spec ---
Summary: Integrated Development Environment
Name:    anjuta
Version: 2.0.2
Release: 8%{?dist}
License: GPL
Group:   Development/Tools
URL:     http://www.anjuta.org
Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Epoch: 1

%description
Anjuta DevStudio is a versatile Integrated Development Environment (IDE)
on GNOME Desktop Environment and features a number of advanced
programming facilities. These include project management, application and
class wizards, an on-board interactive debugger, powerful source editor,
syntax highlighting, intellisense autocompletions, symbol navigation,
version controls, integrated GUI designing and other tools.

%package devel
Summary: Libraries and include files for Anjuta plugins development
Group:   Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libgnomeui-devel, libglade2-devel, pkgconfig

%description devel
Libraries, header files and API docs for developing Anjuta plugins

%package docs
Summary: Anjuta 2 documentation
Group: Documentation
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description docs
Anjuta 2 documentation

%prep
%setup -q
sed -i 's/\r//' doc/ScintillaDoc.html
%{_bindir}/iconv -t UTF-8 THANKS -o THANKS
%{_bindir}/iconv -t UTF-8 COPYING -o COPYING
%{_bindir}/iconv -t UTF-8 NEWS -o NEWS
%{_bindir}/iconv -t UTF-8 README -o README
chmod 644 scintilla/*.cxx
chmod 644 scintilla/*.h

%build
%configure --disable-static --disable-plugin-subversion --enable-nls
%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL="install -c -p" install
%find_lang %{name}

desktop-file-install --vendor fedora --delete-original \
  --dir %{buildroot}/%{_datadir}/applications      \
  --add-category X-Fedora                              \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig

%post docs
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :

%postun docs
scrollkeeper-update -q || :

%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc doc/ScintillaDoc.html
%{_bindir}/%{name}*
%{_bindir}/create_global_tags.sh
%{_bindir}/test_tm_buffer
%{_libdir}/lib%{name}*.so.*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}
%{_datadir}/doc/%{name}
%{_datadir}/application-registry/%{name}.applications
%{_datadir}/mime-info/%{name}.mime
%{_datadir}/mime-info/%{name}.keys
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/48x48/apps/anjuta*
%{_datadir}/icons/hicolor/scalable/apps/anjuta*
%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png
%{_mandir}/man1/anjuta*

%files docs
%defattr(-,root, root, -)
%{_datadir}/gnome/help/%{name}
%{_datadir}/omf/%{name}

%files devel
%defattr (-, root, root)
%{_includedir}/*%{name}*
%{_libdir}/pkgconfig/*%{name}*
%{_libdir}/lib%{name}*.so
%{_datadir}/gtk-doc/html/*%{name}*

%changelog
* Tue Oct 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-8
- fix the INSTALL line in install
- fixed encoding on text files
- removed two docs (not really needed)
- fixed ldconfig

* Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-7
- install keeps timestampe
- now keeps time stamps
- lots of BRs removed
- Moved docs Rs to the correct place
- fixed encodings

* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-6
- removed RPM_BUILD_ROOT
- fixed devel package
- altered update-mime-database
- fixed debuginfo permission problems
- altered R and BR

* Wed Oct 11 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-5
- re-enabled docs
- multiple spec fixes
- spec file clean
- added gtksourceview-devel and gtksourceview to BR and R

* Thu Jun 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-2
- Lotza fixes!

* Tue May 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-1
- bump to new version 

* Thu Apr 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-3
- removed the hack from anjuta (1.2.4a)
- added anjuta-docs subpackage

* Wed Apr 26 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-2
- removed smp_flags

* Tue Feb 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-1
- Initial import for FC
- Sanitised the spec file somewhat
- Removed .a and .la files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Apr 2006 23:26:25 -0000	1.6
+++ .cvsignore	18 Oct 2006 20:42:16 -0000	1.7
@@ -1 +1 @@
-anjuta-1.2.4a.tar.gz
+anjuta-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Apr 2006 23:26:25 -0000	1.6
+++ sources	18 Oct 2006 20:42:16 -0000	1.7
@@ -1 +1 @@
-7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz
+e0d1e216da809df32816d233d7c55165  anjuta-2.0.2.tar.gz


--- anjuta-1.2.4a-search.patch DELETED ---


--- anjuta-1.2.4a-watch-keys.patch DELETED ---


--- anjuta-export-dynamic.patch DELETED ---


--- anjuta-project_type.patch DELETED ---


--- anjuta.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 18 20:59:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Wed, 18 Oct 2006 13:59:28 -0700
Subject: rpms/abcMIDI/devel abcMIDI.spec,1.11,1.12
Message-ID: <200610182059.k9IKxSfI006058@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6037

Modified Files:
	abcMIDI.spec 
Log Message:



Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abcMIDI.spec	16 Oct 2006 21:25:56 -0000	1.11
+++ abcMIDI.spec	18 Oct 2006 20:58:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           abcMIDI
 Version:        20061015
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia



From fedora-extras-commits at redhat.com  Wed Oct 18 21:12:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:12:51 -0700
Subject: rpms/ser2net - New directory
Message-ID: <200610182112.k9ILCp7m009191@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9187/ser2net

Log Message:
Directory /cvs/extras/rpms/ser2net added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 21:12:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:12:56 -0700
Subject: rpms/ser2net/devel - New directory
Message-ID: <200610182112.k9ILCu30009205@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9187/ser2net/devel

Log Message:
Directory /cvs/extras/rpms/ser2net/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 18 21:13:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:13:33 -0700
Subject: rpms/ser2net Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610182113.k9ILDXZ6009236@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9230

Added Files:
	Makefile import.log 
Log Message:
Setup of module ser2net


--- NEW FILE Makefile ---
# Top level Makefile for module ser2net
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 18 21:13:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:13:39 -0700
Subject: rpms/ser2net/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610182113.k9ILDd7f009252@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9230/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ser2net


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 18 21:17:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:17:02 -0700
Subject: rpms/ser2net import.log,1.1,1.2
Message-ID: <200610182117.k9ILH2uB009335@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9300

Modified Files:
	import.log 
Log Message:
auto-import ser2net-2.3-3.fc6 on branch devel from ser2net-2.3-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ser2net/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Oct 2006 21:13:33 -0000	1.1
+++ import.log	18 Oct 2006 21:16:31 -0000	1.2
@@ -0,0 +1 @@
+ser2net-2_3-3_fc6:HEAD:ser2net-2.3-3.fc6.src.rpm:1161206179



From fedora-extras-commits at redhat.com  Wed Oct 18 21:17:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:17:02 -0700
Subject: rpms/ser2net/devel ser2net-2.3-initaddreload.patch, NONE,
	1.1 ser2net.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610182117.k9ILH2dW009339@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ser2net/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9300/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ser2net-2.3-initaddreload.patch ser2net.spec 
Log Message:
auto-import ser2net-2.3-3.fc6 on branch devel from ser2net-2.3-3.fc6.src.rpm

ser2net-2.3-initaddreload.patch:

--- NEW FILE ser2net-2.3-initaddreload.patch ---
--- ser2net-2.3/ser2net.init.BAD	2006-07-28 16:09:24.000000000 -0500
+++ ser2net-2.3/ser2net.init	2006-07-28 16:10:57.000000000 -0500
@@ -33,6 +33,17 @@
     return 0
 }
 
+reload() {
+        echo -n $"Reloading ser2net: "
+        if [ -n "`pidfileofproc ser2net`" ] ; then
+            killproc ser2net -HUP
+        else
+            failure $"Reloading ser2net"
+        fi
+        RETVAL=$?
+        echo
+}
+
 case "$1" in
 	start)
 	    start
@@ -49,6 +60,9 @@
 	    stop
 	    start
 	    ;;
+	reload)
+	    reload
+	    ;;
 	condrestart)
 	    if test "x`pidof ser2net`" != x; then
 		stop
@@ -57,7 +71,7 @@
 	    ;;
 	
 	*)
-	    echo "Usage: ser2net {start|stop|restart|condrestart|status}"
+	    echo "Usage: ser2net {start|stop|restart|reload|condrestart|status}"
 	    exit 1
 
 esac


--- NEW FILE ser2net.spec ---
Name:		ser2net
Summary: 	Proxy that allows tcp connections to serial ports
Version:	2.3
Release:	3%{?dist}
License:	GPL
Group:		Applications/System
Source0:	http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz
Patch0:		ser2net-2.3-initaddreload.patch
URL:		http://ser2net.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service

%description
ser2net provides a way for a user to connect from a network connection to a 
serial port. It provides all the serial port setup, a configuration file to 
configure the ports, a control login for modifying port parameters, 
monitoring ports, and controlling ports.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m0644 ser2net.conf $RPM_BUILD_ROOT%{_sysconfdir}
install ser2net.init $RPM_BUILD_ROOT%{_initrddir}/ser2net

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add ser2net

%preun
if test [ $1  = 0 ]; then
	/sbin/service ser2net stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del ser2net
fi

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

%files
%defattr(-,root,root)
%doc COPYING ChangeLog AUTHORS README
%attr(0755,root,root) %{_initrddir}/ser2net
%config(noreplace) %{_sysconfdir}/ser2net.conf
%{_sbindir}/ser2net
%{_mandir}/man8/ser2net*

%changelog
* Wed Oct 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-3
- fix typo

* Wed Oct  4 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-2
- fix initscript handling

* Fri Jul 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ser2net/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Oct 2006 21:13:39 -0000	1.1
+++ .cvsignore	18 Oct 2006 21:16:32 -0000	1.2
@@ -0,0 +1 @@
+ser2net-2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ser2net/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Oct 2006 21:13:39 -0000	1.1
+++ sources	18 Oct 2006 21:16:32 -0000	1.2
@@ -0,0 +1 @@
+5f83a3e8aec18331cb61069dccdfba47  ser2net-2.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 21:22:33 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 18 Oct 2006 14:22:33 -0700
Subject: comps comps-fe5.xml.in,1.172,1.173
Message-ID: <200610182122.k9ILMXCK009584@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9563

Modified Files:
	comps-fe5.xml.in 
Log Message:
Added manaworld game




Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- comps-fe5.xml.in	18 Oct 2006 14:54:59 -0000	1.172
+++ comps-fe5.xml.in	18 Oct 2006 21:22:03 -0000	1.173
@@ -318,6 +318,7 @@
       <packagereq type="optional">lmarbles</packagereq>
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
+      <packagereq type="optional">manaworld</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>
       <packagereq type="optional">monsterz</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 21:29:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 18 Oct 2006 14:29:19 -0700
Subject: owners owners.list,1.1852,1.1853
Message-ID: <200610182129.k9ILTJdV009661@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628

Modified Files:
	owners.list 
Log Message:

ser2net



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1852
retrieving revision 1.1853
diff -u -r1.1852 -r1.1853
--- owners.list	18 Oct 2006 20:12:51 -0000	1.1852
+++ owners.list	18 Oct 2006 21:28:49 -0000	1.1853
@@ -2061,6 +2061,7 @@
 Fedora Extras|sec|Simple Event Correlator|lists at forevermore.net|extras-qa at fedoraproject.org|
 Fedora Extras|seq24|Real-time midi sequencer|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ser|SIP Express Router|andreas at bawue.net|extras-qa at fedoraproject.org|
+Fedora Extras|ser2net|Proxy that allows tcp connections to serial ports|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|serpentine|Audio CD Burner|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|sextractor|Extract catalogs of sources from astronomical images|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
 Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 18 21:31:27 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 18 Oct 2006 14:31:27 -0700
Subject: comps comps-fe6.xml.in,1.193,1.194
Message-ID: <200610182131.k9ILVReJ009841@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9790

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add Thunar and Terminal, remove xffm



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- comps-fe6.xml.in	18 Oct 2006 14:54:59 -0000	1.193
+++ comps-fe6.xml.in	18 Oct 2006 21:30:57 -0000	1.194
@@ -1111,12 +1111,12 @@
       <packagereq type="mandatory">libxfce4mcs</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-session-engines</packagereq>
       <packagereq type="mandatory">xfdesktop</packagereq>
-      <packagereq type="mandatory">xffm</packagereq>
       <packagereq type="mandatory">xfwm4</packagereq>
       <packagereq type="default">xfce-mcs-manager</packagereq>
       <packagereq type="default">xfce-mcs-plugins</packagereq>
@@ -1124,15 +1124,15 @@
       <packagereq type="default">xfce4-icon-theme</packagereq>
       <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
       <packagereq type="default">xfce4-mixer</packagereq>
-      <packagereq type="default">xffm-icons</packagereq>
       <packagereq type="default">xfprint</packagereq>
       <packagereq type="optional">mousepad</packagereq>
       <packagereq type="optional">orage</packagereq>
+      <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>
       <packagereq type="optional">xfce4-clipman-plugin</packagereq>
       <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
-      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
       <packagereq type="optional">xfce4-datetime-plugin</packagereq>
+      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
       <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
       <packagereq type="optional">xfce4-genmon-plugin</packagereq>
       <packagereq type="optional">xfce4-minicmd-plugin</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 21:39:04 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 18 Oct 2006 14:39:04 -0700
Subject: comps comps-fe6.xml.in,1.194,1.195
Message-ID: <200610182139.k9ILd4TD009886@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9870

Modified Files:
	comps-fe6.xml.in 
Log Message:
add twinkle apg fwrestart munin p0f



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- comps-fe6.xml.in	18 Oct 2006 21:30:57 -0000	1.194
+++ comps-fe6.xml.in	18 Oct 2006 21:38:34 -0000	1.195
@@ -569,6 +569,7 @@
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
+      <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">valknut</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
       <packagereq type="optional">xchat-gnome</packagereq>
@@ -889,6 +890,7 @@
       <packagereq type="optional">aide</packagereq>
       <packagereq type="optional">airsnort</packagereq>
       <packagereq type="optional">apcupsd</packagereq>
+      <packagereq type="optional">apg</packagereq>
       <packagereq type="optional">apt</packagereq>
       <packagereq type="optional">arc</packagereq>
       <packagereq type="optional">arj</packagereq>
@@ -916,6 +918,7 @@
       <packagereq type="optional">freeze</packagereq>
       <packagereq type="optional">fuse</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
+      <packagereq type="optional">fwrestart</packagereq>
       <packagereq type="optional">ganglia</packagereq>
       <packagereq type="optional">ghasher</packagereq>
       <packagereq type="optional">ghex</packagereq>
@@ -942,11 +945,13 @@
       <packagereq type="optional">mmv</packagereq>
       <packagereq type="optional">moodss</packagereq>
       <packagereq type="optional">moomps</packagereq>
+      <packagereq type="optional">munin</packagereq>
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">netgo</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nomarch</packagereq>
       <packagereq type="optional">oddjob</packagereq>
+      <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
       <packagereq type="optional">par2cmdline</packagereq>
       <packagereq type="optional">pbzip2</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 21:48:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 18 Oct 2006 14:48:34 -0700
Subject: rpms/munin/devel munin-1.2.5-hddtemp_smartctl-config, NONE,
	1.1 munin-node.logrotate, NONE, 1.1 munin.logrotate, NONE,
	1.1 munin.spec, 1.9, 1.10 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200610182148.k9ILmYas010019@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.2.5-hddtemp_smartctl-config munin-node.logrotate 
	munin.logrotate 
Log Message:
Update to 1.2.5
Fix HD stats (fixes #205042)
Add in logrotate scripts that seem to have been dropped upstream



--- NEW FILE munin-1.2.5-hddtemp_smartctl-config ---
[hddtemp_smartctl]
user root


--- NEW FILE munin-node.logrotate ---
/var/log/munin/munin-node.log {
	daily
	missingok
	rotate 7
	compress
	copytruncate
	notifempty
	create 640 root adm
}


--- NEW FILE munin.logrotate ---
/var/log/munin/munin-update.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-graph.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-html.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-limits.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- munin.spec	28 Aug 2006 04:28:35 -0000	1.9
+++ munin.spec	18 Oct 2006 21:48:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.4
-Release:   10%{?dist}
+Version:   1.2.5
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -10,6 +10,9 @@
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
 Source1: munin-1.2.4-sendmail-config
+Source2: munin-1.2.5-hddtemp_smartctl-config
+Source3: munin-node.logrotate
+Source4: munin.logrotate
 Patch0: munin-1.2.4-cron.patch
 Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
@@ -17,8 +20,8 @@
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
+Requires(pre): fedora-usermgmt >= 0.7
+Requires(postun): fedora-usermgmt >= 0.7
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -104,8 +107,6 @@
 
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
-install -m0644 dists/debian/munin.logrotate %{buildroot}/etc/logrotate.d/munin
-install -m0644 dists/debian/munin-node.logrotate %{buildroot}/etc/logrotate.d/munin-node
 
 # 
 # remove the Sybase plugin for now, as they need perl modules 
@@ -127,6 +128,11 @@
 install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog
 # install config for sendmail under fedora
 install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
+# install config for hddtemp_smartctl
+install -m 0644 %{SOURCE2} %{buildroot}/etc/munin/plugin-conf.d/hddtemp_smartctl
+# install logrotate scripts
+install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
+install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -177,6 +183,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
+%{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
@@ -204,6 +211,7 @@
 %config(noreplace) /etc/munin/munin-node.conf
 %config(noreplace) /etc/munin/plugin-conf.d/munin-node
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
+%config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
 %config(noreplace) /etc/logrotate.d/munin-node
 /etc/rc.d/init.d/munin-node
 %config(noreplace) /etc/munin/plugins.conf
@@ -226,6 +234,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Tue Oct 17 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
+- Update to 1.2.5
+- Fix HD stats (fixes #205042)
+- Add in logrotate scripts that seem to have been dropped upstream
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-10
 - Rebuild for fc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2005 03:38:04 -0000	1.2
+++ sources	18 Oct 2006 21:48:04 -0000	1.3
@@ -1 +1 @@
-f91f5d96c01d8527db1d2f4b3f0f4cc5  munin_1.2.4.tar.gz
+e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2005 03:38:04 -0000	1.2
+++ .cvsignore	18 Oct 2006 21:48:04 -0000	1.3
@@ -1 +1 @@
-munin_1.2.4.tar.gz
+munin_1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 21:53:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 18 Oct 2006 14:53:08 -0700
Subject: comps comps-fe5.xml.in,1.173,1.174 comps-fe6.xml.in,1.195,1.196
Message-ID: <200610182153.k9ILr8hR010104@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10086

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add asymptote


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- comps-fe5.xml.in	18 Oct 2006 21:22:03 -0000	1.173
+++ comps-fe5.xml.in	18 Oct 2006 21:52:37 -0000	1.174
@@ -510,6 +510,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">asymptote</packagereq>
       <packagereq type="optional">blender</packagereq>
       <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">digikam</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- comps-fe6.xml.in	18 Oct 2006 21:38:34 -0000	1.195
+++ comps-fe6.xml.in	18 Oct 2006 21:52:37 -0000	1.196
@@ -583,6 +583,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">agave</packagereq>
+      <packagereq type="optional">asymptote</packagereq>
       <packagereq type="optional">blender</packagereq>
       <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">digikam</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 18 22:02:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 18 Oct 2006 15:02:56 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.11, 1.12 perl-Error.spec, 1.15, 
	1.16 sources, 1.11, 1.12
Message-ID: <200610182202.k9IM2uAa013103@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13078

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17007.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Oct 2006 17:41:51 -0000	1.11
+++ .cvsignore	18 Oct 2006 22:02:25 -0000	1.12
@@ -1 +1 @@
-Error-0.17006.tar.gz
+Error-0.17007.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Error.spec	7 Oct 2006 17:41:51 -0000	1.15
+++ perl-Error.spec	18 Oct 2006 22:02:25 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17006
+Version:        0.17007
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17007-1
+- Update to 0.17007.
+
 * Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17006-1
 - Update to 0.17006.
 - New build requirements: Test::Pod and Test::Pod::Coverage.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Oct 2006 17:41:51 -0000	1.11
+++ sources	18 Oct 2006 22:02:25 -0000	1.12
@@ -1 +1 @@
-fc9f7e5000d5607359e2ed03f6a9cf1c  Error-0.17006.tar.gz
+fd80f6b2d1f5d31529145301031795b4  Error-0.17007.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 18 22:12:02 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 18 Oct 2006 15:12:02 -0700
Subject: rpms/naim/FC-5 .cvsignore, 1.6, 1.7 naim.spec, 1.12, 1.13 sources,
	1.6, 1.7
Message-ID: <200610182212.k9IMC2o8013265@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/naim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13245

Modified Files:
	.cvsignore naim.spec sources 
Log Message:
* Wed Oct 18 2006 Luke Macken <lmacken at redhat.com> 0.11.8.2.1-1
- Update to 0.11.8.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Sep 2006 18:36:54 -0000	1.6
+++ .cvsignore	18 Oct 2006 22:11:32 -0000	1.7
@@ -1 +1 @@
-naim-0.11.8.2.tar.bz2
+naim-0.11.8.2.1.tar.bz2


Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-5/naim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- naim.spec	7 Sep 2006 01:57:46 -0000	1.12
+++ naim.spec	18 Oct 2006 22:11:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name: naim
-Version: 0.11.8.2
-Release: 5%{?dist}
+Version: 0.11.8.2.1
+Release: 1%{?dist}
 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client
 
 Group: Applications/Internet
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Oct 18 2006 Luke Macken <lmacken at redhat.com> 0.11.8.2.1-1
+- Update to 0.11.8.2.1
+
 * Wed Sep  6 2006 Luke Macken <lmacken at redhat.com>
 - Remove %%{?_smp_mflags} macro to fix ppc build issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Sep 2006 18:36:54 -0000	1.6
+++ sources	18 Oct 2006 22:11:32 -0000	1.7
@@ -1 +1 @@
-92bfbf60c4fd8f0eab4c4c6bbfe50422  naim-0.11.8.2.tar.bz2
+0f47e1927c00ed89cbce6d77486d884a  naim-0.11.8.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 03:08:15 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 18 Oct 2006 20:08:15 -0700
Subject: rpms/zaptel/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zaptel.spec,
	1.1, 1.2
Message-ID: <200610190308.k9J38F37029078@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29054

Modified Files:
	.cvsignore sources zaptel.spec 
Log Message:
Update to 1.4.0-beta2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2006 11:53:07 -0000	1.2
+++ .cvsignore	19 Oct 2006 03:07:45 -0000	1.3
@@ -1 +1 @@
-zaptel-1.4.0-beta1.tar.gz
+zaptel-1.4.0-beta2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2006 11:53:07 -0000	1.2
+++ sources	19 Oct 2006 03:07:45 -0000	1.3
@@ -1 +1 @@
-6d2bae038c85770fd09a323f192cd682  zaptel-1.4.0-beta1.tar.gz
+4fe09984245f3507d8050bad740e873a  zaptel-1.4.0-beta2.tar.gz


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/zaptel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zaptel.spec	16 Oct 2006 11:53:07 -0000	1.1
+++ zaptel.spec	19 Oct 2006 03:07:45 -0000	1.2
@@ -1,11 +1,11 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.0
-Release: 2%{?dist}.beta1
+Release: 3%{?dist}.beta2
 License: GPL
 Group: Applications/System
 URL: http://www.digium.com/
-Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta1.tar.gz
+Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta2.tar.gz
 Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
 Patch1:  zaptel-1.4.0-beta1-makefile.patch
 
@@ -54,7 +54,7 @@
 Development files for Zapata telephony interfaces.
 
 %prep
-%setup0 -q -n zaptel-%{version}-beta1
+%setup0 -q -n zaptel-%{version}-beta2
 
 %patch0 -p0
 %patch1 -p0
@@ -185,6 +185,9 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Wed Oct 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-3.beta2
+- Update to 1.4.0-beta2
+
 * Sun Oct 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
 - Don't package firmware until license can be figured out.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 03:09:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 18 Oct 2006 20:09:37 -0700
Subject: rpms/zaptel/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zaptel.spec,
	1.1, 1.2
Message-ID: <200610190309.k9J39bnO029152@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29132

Modified Files:
	.cvsignore sources zaptel.spec 
Log Message:
Update to 1.4.0-beta2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2006 11:53:07 -0000	1.2
+++ .cvsignore	19 Oct 2006 03:09:06 -0000	1.3
@@ -1 +1 @@
-zaptel-1.4.0-beta1.tar.gz
+zaptel-1.4.0-beta2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2006 11:53:07 -0000	1.2
+++ sources	19 Oct 2006 03:09:06 -0000	1.3
@@ -1 +1 @@
-6d2bae038c85770fd09a323f192cd682  zaptel-1.4.0-beta1.tar.gz
+4fe09984245f3507d8050bad740e873a  zaptel-1.4.0-beta2.tar.gz


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-5/zaptel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zaptel.spec	16 Oct 2006 11:53:07 -0000	1.1
+++ zaptel.spec	19 Oct 2006 03:09:06 -0000	1.2
@@ -1,11 +1,11 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.0
-Release: 2%{?dist}.beta1
+Release: 3%{?dist}.beta2
 License: GPL
 Group: Applications/System
 URL: http://www.digium.com/
-Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta1.tar.gz
+Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta2.tar.gz
 Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
 Patch1:  zaptel-1.4.0-beta1-makefile.patch
 
@@ -54,7 +54,7 @@
 Development files for Zapata telephony interfaces.
 
 %prep
-%setup0 -q -n zaptel-%{version}-beta1
+%setup0 -q -n zaptel-%{version}-beta2
 
 %patch0 -p0
 %patch1 -p0
@@ -185,6 +185,9 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Wed Oct 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-3.beta2
+- Update to 1.4.0-beta2
+
 * Sun Oct 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
 - Don't package firmware until license can be figured out.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 03:28:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 18 Oct 2006 20:28:11 -0700
Subject: rpms/perl-WWW-Myspace Makefile,1.3,1.4
Message-ID: <200610190328.k9J3SBZ7029318@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29271

Modified Files:
	Makefile 
Log Message:
update to 0.59



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	30 Sep 2006 00:37:05 -0000	1.3
+++ Makefile	19 Oct 2006 03:27:40 -0000	1.4
@@ -2,15 +2,14 @@
 all : CVS/Root common-update
 	@cvs update
 
+# for target build-all
+BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+
 # tag & build all non-legacy branches...
-# this is clearly a non-optimal solution; to my knowledge there is no way to
-# currently determine if a branch is legacy or not (and this module is
-# frequently updated).  Correction on this point welcomed :)
 build-all :
-	@echo WARNING: building for devel and FC-5
+	@echo NOTICE: building for ${BRANCHES}
 	@sleep 5s
-	@cd FC-5  && test -f dead.package || ( make tag && make plague )
-	@cd devel && test -f dead.package || ( make tag && make plague )
+	@for br in ${BRANCHES} ; do echo Building $$br ; cd $$br && test -f dead.package || make tag plague ; cd .. ; done
 
 common-update : common
 	@cd common && cvs update



From fedora-extras-commits at redhat.com  Thu Oct 19 03:28:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 18 Oct 2006 20:28:11 -0700
Subject: rpms/perl-WWW-Myspace/FC-5 perl-WWW-Myspace.spec, 1.10, 1.11 sources,
	1.10, 1.11
Message-ID: <200610190328.k9J3SBic029322@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29271/FC-5

Modified Files:
	perl-WWW-Myspace.spec sources 
Log Message:
update to 0.59



Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-5/perl-WWW-Myspace.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-WWW-Myspace.spec	30 Sep 2006 00:35:10 -0000	1.10
+++ perl-WWW-Myspace.spec	19 Oct 2006 03:27:41 -0000	1.11
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.58
+Version:  0.59
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
+- update to 0.59
+
 * Fri Sep 29 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.58-1
 - update to 0.58
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 00:35:10 -0000	1.10
+++ sources	19 Oct 2006 03:27:41 -0000	1.11
@@ -1 +1 @@
-bb2bbff40164df653217aadc38c757bc  WWW-Myspace-0.58.tar.gz
+324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 03:28:12 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 18 Oct 2006 20:28:12 -0700
Subject: rpms/perl-WWW-Myspace/devel .cvsignore, 1.10,
	1.11 perl-WWW-Myspace.spec, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200610190328.k9J3SCCp029327@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29271/devel

Modified Files:
	.cvsignore perl-WWW-Myspace.spec sources 
Log Message:
update to 0.59



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2006 00:35:11 -0000	1.10
+++ .cvsignore	19 Oct 2006 03:27:42 -0000	1.11
@@ -1 +1 @@
-WWW-Myspace-0.58.tar.gz
+WWW-Myspace-0.59.tar.gz


Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/perl-WWW-Myspace.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-WWW-Myspace.spec	30 Sep 2006 00:35:11 -0000	1.12
+++ perl-WWW-Myspace.spec	19 Oct 2006 03:27:42 -0000	1.13
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.58
+Version:  0.59
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
+- update to 0.59
+
 * Fri Sep 29 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.58-1
 - update to 0.58
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 00:35:11 -0000	1.10
+++ sources	19 Oct 2006 03:27:42 -0000	1.11
@@ -1 +1 @@
-bb2bbff40164df653217aadc38c757bc  WWW-Myspace-0.58.tar.gz
+324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 06:49:30 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:49:30 -0700
Subject: rpms/viaideinfo - New directory
Message-ID: <200610190649.k9J6nUfj006417@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413/viaideinfo

Log Message:
Directory /cvs/extras/rpms/viaideinfo added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 19 06:49:36 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:49:36 -0700
Subject: rpms/viaideinfo/devel - New directory
Message-ID: <200610190649.k9J6naId006431@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413/viaideinfo/devel

Log Message:
Directory /cvs/extras/rpms/viaideinfo/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 19 06:49:47 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:49:47 -0700
Subject: rpms/viaideinfo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610190649.k9J6nllx006462@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6456

Added Files:
	Makefile import.log 
Log Message:
Setup of module viaideinfo


--- NEW FILE Makefile ---
# Top level Makefile for module viaideinfo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct 19 06:49:53 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:49:53 -0700
Subject: rpms/viaideinfo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610190649.k9J6nrwZ006478@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6456/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module viaideinfo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct 19 06:50:42 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:50:42 -0700
Subject: rpms/viaideinfo import.log,1.1,1.2
Message-ID: <200610190650.k9J6ogZ7006552@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6518

Modified Files:
	import.log 
Log Message:
auto-import viaideinfo-0.4-1 on branch devel from viaideinfo-0.4-1.src.rpm
Initial import (review and approval in bug #211256)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Oct 2006 06:49:47 -0000	1.1
+++ import.log	19 Oct 2006 06:50:12 -0000	1.2
@@ -0,0 +1 @@
+viaideinfo-0_4-1:HEAD:viaideinfo-0.4-1.src.rpm:1161240609



From fedora-extras-commits at redhat.com  Thu Oct 19 06:50:43 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:50:43 -0700
Subject: rpms/viaideinfo/devel viaideinfo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610190650.k9J6ohJA006556@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6518/devel

Modified Files:
	.cvsignore sources 
Added Files:
	viaideinfo.spec 
Log Message:
auto-import viaideinfo-0.4-1 on branch devel from viaideinfo-0.4-1.src.rpm
Initial import (review and approval in bug #211256)


--- NEW FILE viaideinfo.spec ---
Name:		viaideinfo
Version:	0.4
Release:	1%{?dist}
Summary:	Displays the information of installed VIA IDE controllers 
Group:		Applications/System
License:	GPL
URL:		http://reactivated.net/software/viaideinfo

Source0:	http://reactivated.net/software/viaideinfo/viaideinfo-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch:	%{ix86}

BuildRequires:	pciutils-devel >= 2.2.0  

# Taken from the README
%description
This command-line application identifies VIA IDE controllers installed in the
computer, and displays various information/statistics regarding these. This
does not depend on the via82cxxx kernel IDE driver, and will work regardless of
whether it is present or not. All this information used to be available through
/proc/ide/via; however this file was removed in Linux 2.6.15 to reduce the
complexity of the IDE driver. Since it performs some basic port I/O, it must be
run as root.

Supported devices:
	VT82C576, VT82C586, VT82C586A, VT82C586B, VT82C596A, VT82C596B,
	VT82C686, VT82C686A, VT82C686B, VT8231, VT8233, VT8233C, VT8233A,
	VT8235, VT8237, VT8237A, VT8251, VT6410


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


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


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS  
%{_bindir}/%{name}
%{_mandir}/man8/%{name}.8.gz


%changelog
* Tue Oct 17 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Oct 2006 06:49:52 -0000	1.1
+++ .cvsignore	19 Oct 2006 06:50:13 -0000	1.2
@@ -0,0 +1 @@
+viaideinfo-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Oct 2006 06:49:52 -0000	1.1
+++ sources	19 Oct 2006 06:50:13 -0000	1.2
@@ -0,0 +1 @@
+e436a580eb8a047a0551cb996b11e6f5  viaideinfo-0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 06:53:08 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:53:08 -0700
Subject: owners owners.list,1.1853,1.1854
Message-ID: <200610190653.k9J6r8vP006614@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598

Modified Files:
	owners.list 
Log Message:
Adding viaideinfo entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1853
retrieving revision 1.1854
diff -u -r1.1853 -r1.1854
--- owners.list	18 Oct 2006 21:28:49 -0000	1.1853
+++ owners.list	19 Oct 2006 06:52:38 -0000	1.1854
@@ -2271,6 +2271,7 @@
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
+Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at beer.tclug.org|extras-qa at fedoraproject.org|
 Fedora Extras|vigra|Generic Programming for Computer Vision|bruno at postle.net|extras-qa at fedoraproject.org|
 Fedora Extras|vips|Library for processing large images|adam at spicenitz.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct 19 06:57:17 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 18 Oct 2006 23:57:17 -0700
Subject: comps comps-fe6.xml.in,1.196,1.197
Message-ID: <200610190657.k9J6vHKn006651@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6635/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add entry for viaideinfo


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- comps-fe6.xml.in	18 Oct 2006 21:52:37 -0000	1.196
+++ comps-fe6.xml.in	19 Oct 2006 06:56:47 -0000	1.197
@@ -982,6 +982,7 @@
       <packagereq type="optional">ttywatch</packagereq>
       <packagereq type="optional">unison</packagereq>
       <packagereq type="optional">upx</packagereq>
+      <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vnstat</packagereq>
       <packagereq type="optional">vpnc</packagereq>
       <packagereq type="optional">wifiroamd</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 07:30:15 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Oct 2006 00:30:15 -0700
Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec, 1.4, 1.5 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610190730.k9J7UF5R009747@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9705

Modified Files:
	perl-Math-Pari.spec sources .cvsignore 
Log Message:
Update to 2.010708
Fix argument order for find with -depth
Fix Source1 URL



Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Math-Pari.spec	30 Aug 2006 07:17:01 -0000	1.4
+++ perl-Math-Pari.spec	19 Oct 2006 07:29:44 -0000	1.5
@@ -9,17 +9,17 @@
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	2.010706
+Version:	2.010708
 # You'll need to replace pariversion with a hardcoded version number if you're
 # testing with a development version of PARI, as this expression evaluates
 # the latest version of GP/PARI the perl module was tested with.
 %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e')
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	Artistic or GPL
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
 Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz
-Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pariversion}.tgz
+Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pariversion}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -53,7 +53,7 @@
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
 /usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -73,6 +73,11 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 2.010708-1
+- Update to 2.010708
+- Fix argument order for find with -depth
+- Fix Source1 URL
+
 * Wed Aug 30 2006 Paul Howarth <paul at city-fan.org> 2.010706-2
 - FE6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jun 2006 09:13:07 -0000	1.4
+++ sources	19 Oct 2006 07:29:44 -0000	1.5
@@ -1,2 +1,2 @@
-5ed1fb49f246288a9899fa6ad1b7753c  Math-Pari-2.010706.tar.gz
+d06781230dc62eb75a88f5b509d55ac6  Math-Pari-2.010708.tar.gz
 357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jun 2006 09:13:07 -0000	1.4
+++ .cvsignore	19 Oct 2006 07:29:44 -0000	1.5
@@ -1,2 +1,2 @@
-Math-Pari-2.010706.tar.gz
+Math-Pari-2.010708.tar.gz
 pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Thu Oct 19 07:58:52 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Oct 2006 00:58:52 -0700
Subject: rpms/perl-Math-Pari/FC-5 perl-Math-Pari.spec, 1.4, 1.5 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610190758.k9J7wqVt009863@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9838

Modified Files:
	perl-Math-Pari.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/perl-Math-Pari.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Math-Pari.spec	2 Jun 2006 09:26:02 -0000	1.4
+++ perl-Math-Pari.spec	19 Oct 2006 07:58:22 -0000	1.5
@@ -9,7 +9,7 @@
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	2.010706
+Version:	2.010708
 # You'll need to replace pariversion with a hardcoded version number if you're
 # testing with a development version of PARI, as this expression evaluates
 # the latest version of GP/PARI the perl module was tested with.
@@ -19,7 +19,7 @@
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
 Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz
-Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pariversion}.tgz
+Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pariversion}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -53,7 +53,7 @@
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
 /usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -73,6 +73,14 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 2.010708-1
+- Update to 2.010708
+- Fix argument order for find with -depth
+- Fix Source1 URL
+
+* Wed Aug 30 2006 Paul Howarth <paul at city-fan.org> 2.010706-2
+- FE6 mass rebuild
+
 * Fri Jun  2 2006 Paul Howarth <paul at city-fan.org> 2.010706-1
 - Update to 2.010706
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jun 2006 09:26:02 -0000	1.4
+++ sources	19 Oct 2006 07:58:22 -0000	1.5
@@ -1,2 +1,2 @@
-5ed1fb49f246288a9899fa6ad1b7753c  Math-Pari-2.010706.tar.gz
+d06781230dc62eb75a88f5b509d55ac6  Math-Pari-2.010708.tar.gz
 357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jun 2006 09:26:02 -0000	1.4
+++ .cvsignore	19 Oct 2006 07:58:22 -0000	1.5
@@ -1,2 +1,2 @@
-Math-Pari-2.010706.tar.gz
+Math-Pari-2.010708.tar.gz
 pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Thu Oct 19 08:03:36 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Oct 2006 01:03:36 -0700
Subject: rpms/perl-Math-Pari/FC-4 perl-Math-Pari.spec, 1.3, 1.4 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200610190803.k9J83aFI012827@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12807

Modified Files:
	perl-Math-Pari.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/perl-Math-Pari.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Math-Pari.spec	2 Jun 2006 09:27:24 -0000	1.3
+++ perl-Math-Pari.spec	19 Oct 2006 08:03:06 -0000	1.4
@@ -9,7 +9,7 @@
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	2.010706
+Version:	2.010708
 # You'll need to replace pariversion with a hardcoded version number if you're
 # testing with a development version of PARI, as this expression evaluates
 # the latest version of GP/PARI the perl module was tested with.
@@ -19,7 +19,7 @@
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
 Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz
-Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pariversion}.tgz
+Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pariversion}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -53,7 +53,7 @@
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
 /usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -73,6 +73,14 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 2.010708-1
+- Update to 2.010708
+- Fix argument order for find with -depth
+- Fix Source1 URL
+
+* Wed Aug 30 2006 Paul Howarth <paul at city-fan.org> 2.010706-2
+- FE6 mass rebuild
+
 * Fri Jun  2 2006 Paul Howarth <paul at city-fan.org> 2.010706-1
 - Update to 2.010706
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jun 2006 09:27:24 -0000	1.4
+++ sources	19 Oct 2006 08:03:06 -0000	1.5
@@ -1,2 +1,2 @@
-5ed1fb49f246288a9899fa6ad1b7753c  Math-Pari-2.010706.tar.gz
+d06781230dc62eb75a88f5b509d55ac6  Math-Pari-2.010708.tar.gz
 357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jun 2006 09:27:24 -0000	1.4
+++ .cvsignore	19 Oct 2006 08:03:06 -0000	1.5
@@ -1,2 +1,2 @@
-Math-Pari-2.010706.tar.gz
+Math-Pari-2.010708.tar.gz
 pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:32:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:32:48 -0700
Subject: rpms/perl-Calendar-Simple/devel .cvsignore, 1.3,
	1.4 perl-Calendar-Simple.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200610190932.k9J9WmbQ017379@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17359

Modified Files:
	.cvsignore perl-Calendar-Simple.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Sep 2006 13:33:52 -0000	1.3
+++ .cvsignore	19 Oct 2006 09:32:18 -0000	1.4
@@ -1 +1 @@
-Calendar-Simple-1.14.tar.gz
+Calendar-Simple-1.17.tar.gz


Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/devel/perl-Calendar-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Calendar-Simple.spec	7 Oct 2006 04:57:52 -0000	1.5
+++ perl-Calendar-Simple.spec	19 Oct 2006 09:32:18 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
-Version:	1.14
-Release:	2%{?dist}
+Version:	1.17
+Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
-chmod -x COPYING lib/*/*.pm
+chmod -x lib/*/Simple.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -45,10 +45,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes COPYING README
+%{_bindir}/pcal
 %{perl_vendorlib}/Calendar
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
+- Upstream update.
+
 * Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
 - chmod -x files with broken permissions.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Sep 2006 13:33:52 -0000	1.3
+++ sources	19 Oct 2006 09:32:18 -0000	1.4
@@ -1 +1 @@
-b6a9fb7194b9657a8e3932032809fbc3  Calendar-Simple-1.14.tar.gz
+94acbe82b7b1f32293dfdb119b2cf765  Calendar-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:34:32 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:34:32 -0700
Subject: rpms/perl-Calendar-Simple/FC-5 .cvsignore, 1.3,
	1.4 perl-Calendar-Simple.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610190934.k9J9YWaB017445@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17423

Modified Files:
	.cvsignore perl-Calendar-Simple.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Sep 2006 13:38:39 -0000	1.3
+++ .cvsignore	19 Oct 2006 09:34:02 -0000	1.4
@@ -1 +1 @@
-Calendar-Simple-1.14.tar.gz
+Calendar-Simple-1.17.tar.gz


Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-5/perl-Calendar-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Calendar-Simple.spec	7 Oct 2006 04:58:43 -0000	1.4
+++ perl-Calendar-Simple.spec	19 Oct 2006 09:34:02 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
-Version:	1.14
-Release:	2%{?dist}
+Version:	1.17
+Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
-chmod -x COPYING lib/*/*.pm
+chmod -x lib/*/Simple.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -45,10 +45,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes COPYING README
+%{_bindir}/pcal
 %{perl_vendorlib}/Calendar
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
+- Upstream update.
+
 * Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
 - chmod -x files with broken permissions.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Sep 2006 13:38:39 -0000	1.3
+++ sources	19 Oct 2006 09:34:02 -0000	1.4
@@ -1 +1 @@
-b6a9fb7194b9657a8e3932032809fbc3  Calendar-Simple-1.14.tar.gz
+94acbe82b7b1f32293dfdb119b2cf765  Calendar-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:36:09 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:36:09 -0700
Subject: rpms/perl-Calendar-Simple/FC-4 .cvsignore, 1.3,
	1.4 perl-Calendar-Simple.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610190936.k9J9a9tS017512@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Calendar-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17491

Modified Files:
	.cvsignore perl-Calendar-Simple.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Sep 2006 13:39:00 -0000	1.3
+++ .cvsignore	19 Oct 2006 09:35:38 -0000	1.4
@@ -1 +1 @@
-Calendar-Simple-1.14.tar.gz
+Calendar-Simple-1.17.tar.gz


Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-4/perl-Calendar-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Calendar-Simple.spec	7 Oct 2006 04:59:36 -0000	1.4
+++ perl-Calendar-Simple.spec	19 Oct 2006 09:35:38 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
-Version:	1.14
-Release:	2%{?dist}
+Version:	1.17
+Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q -n Calendar-Simple-%{version}
-chmod -x COPYING lib/*/*.pm
+chmod -x lib/*/Simple.pm
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -45,10 +45,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes COPYING README
+%{_bindir}/pcal
 %{perl_vendorlib}/Calendar
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.17-1
+- Upstream update.
+
 * Sat Oct 07 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.14-2
 - chmod -x files with broken permissions.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Calendar-Simple/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Sep 2006 13:39:00 -0000	1.3
+++ sources	19 Oct 2006 09:35:38 -0000	1.4
@@ -1 +1 @@
-b6a9fb7194b9657a8e3932032809fbc3  Calendar-Simple-1.14.tar.gz
+94acbe82b7b1f32293dfdb119b2cf765  Calendar-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:39:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:39:39 -0700
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.14,
	1.15 perl-Params-Util.spec, 1.15, 1.16 sources, 1.14, 1.15
Message-ID: <200610190939.k9J9ddxM017585@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17565

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Oct 2006 06:36:05 -0000	1.14
+++ .cvsignore	19 Oct 2006 09:39:09 -0000	1.15
@@ -1 +1 @@
-Params-Util-0.20.tar.gz
+Params-Util-0.21.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Params-Util.spec	4 Oct 2006 06:36:05 -0000	1.15
+++ perl-Params-Util.spec	19 Oct 2006 09:39:09 -0000	1.16
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.20
+Version: 	0.21
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
+- Upstream update.
+
 * Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Oct 2006 06:36:05 -0000	1.14
+++ sources	19 Oct 2006 09:39:09 -0000	1.15
@@ -1 +1 @@
-33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz
+5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:41:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:41:05 -0700
Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.14,
	1.15 perl-Params-Util.spec, 1.14, 1.15 sources, 1.14, 1.15
Message-ID: <200610190941.k9J9f5YU017653@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17633

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Oct 2006 06:37:26 -0000	1.14
+++ .cvsignore	19 Oct 2006 09:40:35 -0000	1.15
@@ -1 +1 @@
-Params-Util-0.20.tar.gz
+Params-Util-0.21.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Params-Util.spec	4 Oct 2006 06:37:26 -0000	1.14
+++ perl-Params-Util.spec	19 Oct 2006 09:40:35 -0000	1.15
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.20
+Version: 	0.21
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
+- Upstream update.
+
 * Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Oct 2006 06:37:26 -0000	1.14
+++ sources	19 Oct 2006 09:40:35 -0000	1.15
@@ -1 +1 @@
-33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz
+5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 09:42:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 19 Oct 2006 02:42:36 -0700
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.14,
	1.15 perl-Params-Util.spec, 1.13, 1.14 sources, 1.14, 1.15
Message-ID: <200610190942.k9J9gaOt017755@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17730

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Oct 2006 06:54:05 -0000	1.14
+++ .cvsignore	19 Oct 2006 09:42:06 -0000	1.15
@@ -1 +1 @@
-Params-Util-0.20.tar.gz
+Params-Util-0.21.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Params-Util.spec	4 Oct 2006 06:54:05 -0000	1.13
+++ perl-Params-Util.spec	19 Oct 2006 09:42:06 -0000	1.14
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.20
+Version: 	0.21
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.21-1
+- Upstream update.
+
 * Wed Oct 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.20-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Oct 2006 06:54:05 -0000	1.14
+++ sources	19 Oct 2006 09:42:06 -0000	1.15
@@ -1 +1 @@
-33c4466239c97cc3e1063eff0577206c  Params-Util-0.20.tar.gz
+5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 10:11:12 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 03:11:12 -0700
Subject: rpms/glom/devel .cvsignore, 1.3, 1.4 glom.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200610191011.k9JABC7m020875@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20855

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.0, added omf directory


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 21:39:47 -0000	1.3
+++ .cvsignore	19 Oct 2006 10:10:41 -0000	1.4
@@ -1 +0,0 @@
-glom-1.0.7.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glom.spec	8 Oct 2006 21:39:47 -0000	1.2
+++ glom.spec	19 Oct 2006 10:10:41 -0000	1.3
@@ -1,5 +1,5 @@
-%define major_version  1.0
-%define minor_version  7
+%define major_version  1.2
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -75,11 +75,7 @@
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libglom.so
 
-cat << EOF >> ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
-MimeType=application/x-glom;
-EOF
-
-desktop-file-install --vendor fedora --delete-original     \
+desktop-file-install --vendor "" --delete-original         \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
   --add-category X-Fedora                                  \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
@@ -110,15 +106,20 @@
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/python2.4/site-packages/%{name}.so
 %{_datadir}/%{name}/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mime-info/*
+%{_datadir}/omf/%{name}
 
 
 %changelog
+* Wed Oct 18 2006 Denis Leroy <denis at poolshark.org> - 1.2.0-1
+- Update to 1.2.0
+- Added omf directory
+
 * Sun Oct  8 2006 Denis Leroy <denis at poolshark.org> - 1.0.7-1
 - Update to 1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 21:39:47 -0000	1.3
+++ sources	19 Oct 2006 10:10:41 -0000	1.4
@@ -1 +0,0 @@
-64a8e0a8214c7a3267b7d97caec65817  glom-1.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 10:17:13 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 03:17:13 -0700
Subject: rpms/glom/devel .cvsignore, 1.4, 1.5 glom.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200610191017.k9JAHDx7021038@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21018

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Rebuild with correct sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Oct 2006 10:10:41 -0000	1.4
+++ .cvsignore	19 Oct 2006 10:16:43 -0000	1.5
@@ -0,0 +1 @@
+glom-1.2.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glom.spec	19 Oct 2006 10:10:41 -0000	1.3
+++ glom.spec	19 Oct 2006 10:16:43 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Denis Leroy <denis at poolshark.org> - 1.2.0-2
+- Rebuild with correct sources files
+
 * Wed Oct 18 2006 Denis Leroy <denis at poolshark.org> - 1.2.0-1
 - Update to 1.2.0
 - Added omf directory


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Oct 2006 10:10:41 -0000	1.4
+++ sources	19 Oct 2006 10:16:43 -0000	1.5
@@ -0,0 +1 @@
+690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 10:22:12 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 03:22:12 -0700
Subject: rpms/glom/FC-5 .cvsignore, 1.3, 1.4 glom.spec, 1.2, 1.3 sources, 1.3,
	1.4
Message-ID: <200610191022.k9JAMCGs021190@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21155

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.0. Added omf directory


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 21:39:47 -0000	1.3
+++ .cvsignore	19 Oct 2006 10:21:41 -0000	1.4
@@ -1 +1 @@
-glom-1.0.7.tar.bz2
+glom-1.2.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/glom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glom.spec	8 Oct 2006 21:39:47 -0000	1.2
+++ glom.spec	19 Oct 2006 10:21:41 -0000	1.3
@@ -1,5 +1,5 @@
-%define major_version  1.0
-%define minor_version  7
+%define major_version  1.2
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -75,11 +75,7 @@
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libglom.so
 
-cat << EOF >> ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
-MimeType=application/x-glom;
-EOF
-
-desktop-file-install --vendor fedora --delete-original     \
+desktop-file-install --vendor "" --delete-original     \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
   --add-category X-Fedora                                  \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
@@ -110,15 +106,20 @@
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/python2.4/site-packages/%{name}.so
 %{_datadir}/%{name}/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mime-info/*
+%{_datadir}/omf/%{name}
 
 
 %changelog
+* Thu Oct 19 2006 Denis Leroy <denis at poolshark.org> - 1.2.0-1
+- Update to 1.2.0
+- Added omf directory
+
 * Sun Oct  8 2006 Denis Leroy <denis at poolshark.org> - 1.0.7-1
 - Update to 1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 21:39:47 -0000	1.3
+++ sources	19 Oct 2006 10:21:41 -0000	1.4
@@ -1 +1 @@
-64a8e0a8214c7a3267b7d97caec65817  glom-1.0.7.tar.bz2
+690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 13:55:19 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 19 Oct 2006 06:55:19 -0700
Subject: comps comps-fe5.xml.in,1.174,1.175 comps-fe6.xml.in,1.197,1.198
Message-ID: <200610191355.k9JDtJRm031902@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31884

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add a few sci/engr packages



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- comps-fe5.xml.in	18 Oct 2006 21:52:37 -0000	1.174
+++ comps-fe5.xml.in	19 Oct 2006 13:54:49 -0000	1.175
@@ -224,6 +224,7 @@
       <packagereq type="optional">atlas</packagereq>
       <packagereq type="optional">blacs</packagereq>
       <packagereq type="optional">blas</packagereq>
+      <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
@@ -234,6 +235,8 @@
       <packagereq type="optional">gnucap</packagereq>
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
+      <packagereq type="optional">gts</packagereq>
+      <packagereq type="optional">harminv</packagereq>
       <packagereq type="optional">hdf</packagereq>
       <packagereq type="optional">hdf5</packagereq>
       <packagereq type="optional">hmmer</packagereq>
@@ -241,12 +244,18 @@
       <packagereq type="optional">kst</packagereq>
       <packagereq type="optional">lagan</packagereq>
       <packagereq type="optional">lapack</packagereq>
+      <packagereq type="optional">libctl</packagereq>
+      <packagereq type="optional">libmatheval</packagereq>
       <packagereq type="optional">ncarg</packagereq>
+      <packagereq type="optional">nco</packagereq>
+      <packagereq type="optional">ncview</packagereq>
+      <packagereq type="optional">netcdf</packagereq>
       <packagereq type="optional">numpy</packagereq>
       <packagereq type="optional">octave</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">openbabel</packagereq>
       <packagereq type="optional">orpie</packagereq>
+      <packagereq type="optional">osiv</packagereq>
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
@@ -256,6 +265,7 @@
       <packagereq type="optional">R</packagereq>
       <packagereq type="optional">R-RScaLAPACK</packagereq>
       <packagereq type="optional">scalapack</packagereq>
+      <packagereq type="optional">scrip</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
     </packagelist>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- comps-fe6.xml.in	19 Oct 2006 06:56:47 -0000	1.197
+++ comps-fe6.xml.in	19 Oct 2006 13:54:49 -0000	1.198
@@ -283,6 +283,7 @@
       <packagereq type="optional">gresistor</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
       <packagereq type="optional">gts</packagereq>
+      <packagereq type="optional">harminv</packagereq>
       <packagereq type="optional">hdf</packagereq>
       <packagereq type="optional">hdf5</packagereq>
       <packagereq type="optional">hmmer</packagereq>
@@ -291,6 +292,8 @@
       <packagereq type="optional">kst</packagereq>
       <packagereq type="optional">lagan</packagereq>
       <packagereq type="optional">lapack</packagereq>
+      <packagereq type="optional">libctl</packagereq>
+      <packagereq type="optional">libmatheval</packagereq>
       <packagereq type="optional">ncarg</packagereq>
       <packagereq type="optional">nco</packagereq>
       <packagereq type="optional">ncview</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 14:06:41 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 07:06:41 -0700
Subject: rpms/galeon/devel galeon-2.0.3-flashfix.patch, NONE, 1.1 galeon.spec,
	1.24, 1.25
Message-ID: <200610191406.k9JE6fZT002481@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2455

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-flashfix.patch 
Log Message:
Fix for 210807 (flash crash). Made BR on gecko-devel

galeon-2.0.3-flashfix.patch:

--- NEW FILE galeon-2.0.3-flashfix.patch ---
--- galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.orig	2006-10-19 15:43:31.000000000 +0200
+++ galeon-2.0.3/mozilla/mozilla-embed-shell.cpp	2006-10-19 15:41:51.000000000 +0200
@@ -236,6 +236,9 @@
 
 	g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
 
+	/* Work-around Flash Player crash */
+	g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE);
+
 	g_string_free (new_path, TRUE);
 }
 


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- galeon.spec	4 Oct 2006 22:56:43 -0000	1.24
+++ galeon.spec	19 Oct 2006 14:06:10 -0000	1.25
@@ -1,17 +1,18 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
+Patch0:		galeon-2.0.3-flashfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	gnome-desktop-devel
-BuildRequires:	firefox-devel
+BuildRequires:	gecko-devel
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
@@ -32,13 +33,16 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
+%patch0 -p1 -b .flashfix
 
 
 %build
 %configure \
 	--disable-nautilus-view			\
 	--disable-werror                        \
-	--disable-schemas-install
+	--disable-schemas-install		\
+	--disable-dependency-tracking		\
+	--with-mozilla=firefox
 make %{?_smp_mflags}
 
 
@@ -106,6 +110,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Denis Leroy <denis at poolshark.org> - 2.0.3-3
+- Added patch to fix flash plugin crash
+- Make package depend on gecko-devel
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.0.3-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Oct 19 14:51:32 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 19 Oct 2006 07:51:32 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 telepathy-gabble.spec, 1.10, 1.11
Message-ID: <200610191451.k9JEpWMi002871@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2850

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
- Update to 0.4.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Oct 2006 18:25:13 -0000	1.10
+++ .cvsignore	19 Oct 2006 14:51:02 -0000	1.11
@@ -1 +1 @@
-telepathy-gabble-0.3.13.tar.gz
+telepathy-gabble-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Oct 2006 18:25:13 -0000	1.10
+++ sources	19 Oct 2006 14:51:02 -0000	1.11
@@ -1 +1 @@
-5c450c77155aec13d4762b38b3ccb980  telepathy-gabble-0.3.13.tar.gz
+dc78e31762fef419c6c64d2f8a82e012  telepathy-gabble-0.4.0.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- telepathy-gabble.spec	13 Oct 2006 18:25:13 -0000	1.10
+++ telepathy-gabble.spec	19 Oct 2006 14:51:02 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.3.13
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
+- Update to 0.4.0.
+
 * Fri Oct 13 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.13-1
 - Update to 0.3.13.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 15:03:54 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 08:03:54 -0700
Subject: rpms/soundconverter/devel .cvsignore, 1.6, 1.7 soundconverter.spec, 
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200610191503.k9JF3sGU005959@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5939

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Oct 2006 08:45:39 -0000	1.6
+++ .cvsignore	19 Oct 2006 15:03:24 -0000	1.7
@@ -1 +1 @@
-soundconverter-0.9.2.tar.gz
+soundconverter-0.9.3.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/soundconverter.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- soundconverter.spec	17 Oct 2006 08:45:39 -0000	1.10
+++ soundconverter.spec	19 Oct 2006 15:03:24 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           soundconverter
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Denis Leroy <denis at poolshark.org> - 0.9.3-1
+- Update to 0.9.3
+
 * Tue Oct 17 2006 Denis Leroy <denis at poolshark.org> - 0.9.2-1
 - Update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Oct 2006 08:45:39 -0000	1.6
+++ sources	19 Oct 2006 15:03:24 -0000	1.7
@@ -1 +1 @@
-ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz
+4f54b5b706c2f69924936f6bd5b0bcd6  soundconverter-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 15:25:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 19 Oct 2006 08:25:46 -0700
Subject: comps comps-fe5.xml.in,1.175,1.176 comps-fe6.xml.in,1.198,1.199
Message-ID: <200610191525.k9JFPkLT006245@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6227

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added genius


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- comps-fe5.xml.in	19 Oct 2006 13:54:49 -0000	1.175
+++ comps-fe5.xml.in	19 Oct 2006 15:25:16 -0000	1.176
@@ -231,6 +231,7 @@
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">geant321</packagereq>
+      <packagereq type="optional">genius</packagereq>	
       <packagereq type="optional">ghdl</packagereq>
       <packagereq type="optional">gnucap</packagereq>
       <packagereq type="optional">grads</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- comps-fe6.xml.in	19 Oct 2006 13:54:49 -0000	1.198
+++ comps-fe6.xml.in	19 Oct 2006 15:25:16 -0000	1.199
@@ -269,6 +269,7 @@
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">geant321</packagereq>
+      <packagereq type="optional">genius</packagereq>	
       <packagereq type="optional">geda-docs</packagereq>
       <packagereq type="optional">geda-example</packagereq>
       <packagereq type="optional">geda-gattrib</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 15:36:13 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Oct 2006 08:36:13 -0700
Subject: rpms/svn2cl/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 svn2cl.spec,
	1.3, 1.4
Message-ID: <200610191536.k9JFaDTU006586@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6548/FC-5

Modified Files:
	.cvsignore sources svn2cl.spec 
Log Message:
* Thu Oct 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8-1
- 0.8.
- Add (empty) %build section.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jun 2006 21:44:10 -0000	1.3
+++ .cvsignore	19 Oct 2006 15:35:43 -0000	1.4
@@ -1 +1 @@
-svn2cl-0.7.tar.gz
+svn2cl-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jun 2006 21:44:10 -0000	1.3
+++ sources	19 Oct 2006 15:35:43 -0000	1.4
@@ -1 +1 @@
-03806cf56c9a04739cc1120c23c1b2be  svn2cl-0.7.tar.gz
+240cb722c31823cd37c39361efbc37f1  svn2cl-0.8.tar.gz


Index: svn2cl.spec
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/FC-5/svn2cl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svn2cl.spec	1 Jun 2006 21:44:10 -0000	1.3
+++ svn2cl.spec	19 Oct 2006 15:35:43 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           svn2cl
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Create a ChangeLog from a Subversion log
 
@@ -25,6 +25,9 @@
 sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' svn2cl.sh
 
 
+%build
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
@@ -46,6 +49,13 @@
 
 
 %changelog
+* Thu Oct 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8-1
+- 0.8.
+- Add (empty) %%build section.
+
+* Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-2
+- Rebuild.
+
 * Fri Jun  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-1
 - 0.7.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 15:36:14 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Oct 2006 08:36:14 -0700
Subject: rpms/svn2cl/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 svn2cl.spec,
	1.4, 1.5
Message-ID: <200610191536.k9JFaEKw006591@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6548/devel

Modified Files:
	.cvsignore sources svn2cl.spec 
Log Message:
* Thu Oct 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8-1
- 0.8.
- Add (empty) %build section.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jun 2006 21:44:11 -0000	1.3
+++ .cvsignore	19 Oct 2006 15:35:44 -0000	1.4
@@ -1 +1 @@
-svn2cl-0.7.tar.gz
+svn2cl-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jun 2006 21:44:11 -0000	1.3
+++ sources	19 Oct 2006 15:35:44 -0000	1.4
@@ -1 +1 @@
-03806cf56c9a04739cc1120c23c1b2be  svn2cl-0.7.tar.gz
+240cb722c31823cd37c39361efbc37f1  svn2cl-0.8.tar.gz


Index: svn2cl.spec
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/svn2cl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- svn2cl.spec	15 Sep 2006 16:28:54 -0000	1.4
+++ svn2cl.spec	19 Oct 2006 15:35:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           svn2cl
-Version:        0.7
-Release:        2%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Create a ChangeLog from a Subversion log
 
 Group:          Development/Tools
@@ -25,6 +25,9 @@
 sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' svn2cl.sh
 
 
+%build
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
@@ -46,6 +49,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8-1
+- 0.8.
+- Add (empty) %%build section.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 16:28:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Oct 2006 09:28:27 -0700
Subject: rpms/libetpan/FC-3 .cvsignore, 1.8, 1.9 libetpan.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200610191628.k9JGSRbO009957@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/FC-3

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Apr 2006 21:40:09 -0000	1.8
+++ .cvsignore	19 Oct 2006 16:27:57 -0000	1.9
@@ -1 +1 @@
-libetpan-0.45.tar.gz
+libetpan-0.47.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libetpan.spec	5 Apr 2006 21:40:09 -0000	1.7
+++ libetpan.spec	19 Oct 2006 16:27:57 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.45
+Version:        0.47
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.1.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.47-1
+- version upgrade
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.45-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Apr 2006 21:40:09 -0000	1.8
+++ sources	19 Oct 2006 16:27:57 -0000	1.9
@@ -1 +1 @@
-0135cf6a9d97afb1f75001f514448836  libetpan-0.45.tar.gz
+bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 16:28:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Oct 2006 09:28:28 -0700
Subject: rpms/libetpan/FC-4 .cvsignore, 1.9, 1.10 libetpan.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200610191628.k9JGSSh7009962@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/FC-4

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:47:38 -0000	1.9
+++ .cvsignore	19 Oct 2006 16:27:58 -0000	1.10
@@ -1 +1 @@
-libetpan-0.46.tar.gz
+libetpan-0.47.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libetpan.spec	30 Sep 2006 09:47:38 -0000	1.8
+++ libetpan.spec	19 Oct 2006 16:27:58 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.46
+Version:        0.47
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.0.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.47-1
+- version upgrade
+
 * Sat Sep 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.46-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:47:38 -0000	1.9
+++ sources	19 Oct 2006 16:27:58 -0000	1.10
@@ -1 +1 @@
-afa4abd73665e1a46b0510c4f4efa9a9  libetpan-0.46.tar.gz
+bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 16:28:29 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Oct 2006 09:28:29 -0700
Subject: rpms/libetpan/FC-5 .cvsignore, 1.9, 1.10 libetpan.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200610191628.k9JGSTv4009967@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/FC-5

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Sep 2006 15:58:09 -0000	1.9
+++ .cvsignore	19 Oct 2006 16:27:59 -0000	1.10
@@ -1 +1 @@
-libetpan-0.46.tar.gz
+libetpan-0.47.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/libetpan.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libetpan.spec	26 Sep 2006 15:58:09 -0000	1.11
+++ libetpan.spec	19 Oct 2006 16:27:59 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.46
+Version:        0.47
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.0.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.47-1
+- version upgrade
+
 * Tue Sep 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.46-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Sep 2006 15:58:09 -0000	1.9
+++ sources	19 Oct 2006 16:27:59 -0000	1.10
@@ -1 +1 @@
-afa4abd73665e1a46b0510c4f4efa9a9  libetpan-0.46.tar.gz
+bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 16:28:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Oct 2006 09:28:30 -0700
Subject: rpms/libetpan/devel .cvsignore, 1.9, 1.10 libetpan.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200610191628.k9JGSUvk009972@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/devel

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Sep 2006 16:26:23 -0000	1.9
+++ .cvsignore	19 Oct 2006 16:28:00 -0000	1.10
@@ -1 +1 @@
-libetpan-0.46.tar.gz
+libetpan-0.47.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libetpan.spec	4 Oct 2006 22:14:53 -0000	1.13
+++ libetpan.spec	19 Oct 2006 16:28:00 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libetpan
-Version:        0.46
-Release:        2%{?dist}
+Version:        0.47
+Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
 Group:          System Environment/Libraries
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.0.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.47-1
+- version upgrade
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.46-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Sep 2006 16:26:23 -0000	1.9
+++ sources	19 Oct 2006 16:28:00 -0000	1.10
@@ -1 +1 @@
-afa4abd73665e1a46b0510c4f4efa9a9  libetpan-0.46.tar.gz
+bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 16:33:01 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 19 Oct 2006 09:33:01 -0700
Subject: comps comps-fe5.xml.in,1.176,1.177
Message-ID: <200610191633.k9JGX1Bl010079@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10063

Modified Files:
	comps-fe5.xml.in 
Log Message:
add wallpapoz to comps-fe5.xml.in


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- comps-fe5.xml.in	19 Oct 2006 15:25:16 -0000	1.176
+++ comps-fe5.xml.in	19 Oct 2006 16:32:30 -0000	1.177
@@ -422,6 +422,7 @@
       <packagereq type="optional">seahorse</packagereq>
       <packagereq type="optional">smeg</packagereq>
       <packagereq type="optional">themes-backgrounds-gnome</packagereq>
+      <packagereq type="optional">wallpapoz</packagereq>
       <packagereq type="optional">wp_tray</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Thu Oct 19 16:55:20 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 09:55:20 -0700
Subject: comps comps-fe6.xml.in,1.199,1.200
Message-ID: <200610191655.k9JGtK0i010354@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10338

Modified Files:
	comps-fe6.xml.in 
Log Message:
Finally got around to updating comps with my own packages


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- comps-fe6.xml.in	19 Oct 2006 15:25:16 -0000	1.199
+++ comps-fe6.xml.in	19 Oct 2006 16:54:49 -0000	1.200
@@ -280,6 +280,7 @@
       <packagereq type="optional">geda-utils</packagereq>
       <packagereq type="optional">ghdl</packagereq>
       <packagereq type="optional">gnucap</packagereq>
+      <packagereq type="optional">gpredict</packagereq>
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gresistor</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
@@ -309,6 +310,7 @@
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">pcb</packagereq>
+      <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>
       <packagereq type="optional">qcad</packagereq>
@@ -496,6 +498,7 @@
       <packagereq type="optional">anjuta</packagereq>
       <packagereq type="optional">anjuta-docs</packagereq>
       <packagereq type="optional">at-poke</packagereq>
+      <packagereq type="optional">bakery-devel</packagereq>
       <packagereq type="optional">bit-devel</packagereq>
       <packagereq type="optional">bitgtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
@@ -512,8 +515,13 @@
       <packagereq type="optional">gtkalog</packagereq>
       <packagereq type="optional">gtkdatabox</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
+      <packagereq type="optional">libglademm24-devel</packagereq>
+      <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
+      <packagereq type="optional">libgnomemm26-devel</packagereq>
+      <packagereq type="optional">libgnomeuimm26-devel</packagereq>
       <packagereq type="optional">libsexy-devel</packagereq>
       <packagereq type="optional">libsexymm-devel</packagereq>
+      <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">papyrus-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
     </packagelist>
@@ -573,6 +581,7 @@
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
+      <packagereq type="optional">transmission</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">valknut</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
@@ -602,6 +611,7 @@
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>
       <packagereq type="optional">optipng</packagereq>
+      <packagereq type="optional">pstoedit</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">rawstudio</packagereq>
@@ -774,6 +784,7 @@
       <packagereq type="optional">jabberd</packagereq>
       <packagereq type="optional">kannel</packagereq>
       <packagereq type="optional">l2tpd</packagereq>
+      <packagereq type="optional">NetworkManager-vpnc</packagereq>
       <packagereq type="optional">nsd</packagereq>
       <packagereq type="optional">oidentd</packagereq>
       <packagereq type="optional">openvpn</packagereq>
@@ -813,6 +824,7 @@
       <packagereq type="optional">dia</packagereq>
       <packagereq type="optional">gdeskcal</packagereq>
       <packagereq type="optional">glabels</packagereq>
+      <packagereq type="optional">glom</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gnumeric</packagereq>
       <packagereq type="optional">gramps</packagereq>
@@ -850,6 +862,7 @@
       <packagereq type="optional">audacity</packagereq>
       <packagereq type="optional">bin2iso</packagereq>
       <packagereq type="optional">bmp</packagereq>
+      <packagereq type="optional">brasero</packagereq>
       <packagereq type="optional">camE</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
@@ -958,6 +971,7 @@
       <packagereq type="optional">oddjob</packagereq>
       <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
+      <packagereq type="optional">pam_keyring</packagereq>
       <packagereq type="optional">par2cmdline</packagereq>
       <packagereq type="optional">pbzip2</packagereq>
       <packagereq type="optional">powerman</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 17:12:07 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 10:12:07 -0700
Subject: comps comps-fe5.xml.in,1.177,1.178
Message-ID: <200610191712.k9JHC7UE013422@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13404

Modified Files:
	comps-fe5.xml.in 
Log Message:
Updated my packages


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- comps-fe5.xml.in	19 Oct 2006 16:32:30 -0000	1.177
+++ comps-fe5.xml.in	19 Oct 2006 17:11:37 -0000	1.178
@@ -234,6 +234,7 @@
       <packagereq type="optional">genius</packagereq>	
       <packagereq type="optional">ghdl</packagereq>
       <packagereq type="optional">gnucap</packagereq>
+      <packagereq type="optional">gpredict</packagereq>
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gtkwave</packagereq>
       <packagereq type="optional">gts</packagereq>
@@ -259,6 +260,7 @@
       <packagereq type="optional">osiv</packagereq>
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
+      <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>
       <packagereq type="optional">qcad</packagereq>
@@ -436,6 +438,7 @@
       <packagereq type="optional">anjuta</packagereq>
       <packagereq type="optional">anjuta-docs</packagereq>
       <packagereq type="optional">at-poke</packagereq>
+      <packagereq type="optional">bakery-devel</packagereq>
       <packagereq type="optional">bit-devel</packagereq>
       <packagereq type="optional">bitgtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
@@ -445,14 +448,20 @@
       <packagereq type="optional">gconfmm26-devel</packagereq>
       <packagereq type="optional">glibmm24-devel</packagereq>
       <packagereq type="optional">gnome-common</packagereq>
+      <packagereq type="optional">gnome-python2-gda-devel</packagereq>
       <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
       <packagereq type="optional">gquilt</packagereq>
       <packagereq type="optional">gtk+extra</packagereq>
       <packagereq type="optional">gtkalog</packagereq>
       <packagereq type="optional">gtkdatabox</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
+      <packagereq type="optional">libglademm24-devel</packagereq>
+      <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
+      <packagereq type="optional">libgnomemm26-devel</packagereq>
+      <packagereq type="optional">libgnomeuimm26-devel</packagereq>
       <packagereq type="optional">libsexy-devel</packagereq>
       <packagereq type="optional">libsexymm-devel</packagereq>
+      <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">papyrus-devel</packagereq>
     </packagelist>
   </group>
@@ -510,6 +519,7 @@
       <packagereq type="optional">straw</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
+      <packagereq type="optional">transmission</packagereq>
       <packagereq type="optional">valknut</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
       <packagereq type="optional">xchat-gnome</packagereq>
@@ -535,6 +545,7 @@
       <packagereq type="optional">gwenview</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">k3d</packagereq>
+      <packagereq type="optional">pstoedit</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>
       <packagereq type="optional">rawstudio</packagereq>
@@ -693,6 +704,7 @@
       <packagereq type="optional">jabberd</packagereq>
       <packagereq type="optional">kannel</packagereq>
       <packagereq type="optional">l2tpd</packagereq>
+      <packagereq type="optional">NetworkManager-vpnc</packagereq>
       <packagereq type="optional">nsd</packagereq>
       <packagereq type="optional">openvpn</packagereq>
       <packagereq type="optional">puppet-server</packagereq>
@@ -725,6 +737,7 @@
       <packagereq type="optional">dia</packagereq>
       <packagereq type="optional">gdeskcal</packagereq>
       <packagereq type="optional">glabels</packagereq>
+      <packagereq type="optional">glom</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gnumeric</packagereq>
       <packagereq type="optional">gourmet</packagereq>
@@ -845,6 +858,7 @@
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nomarch</packagereq>
       <packagereq type="optional">oddjob</packagereq>
+      <packagereq type="optional">pam_keyring</packagereq>
       <packagereq type="optional">pbzip2</packagereq>
       <packagereq type="optional">puppet</packagereq>
       <packagereq type="optional">qstat</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 17:14:22 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 19 Oct 2006 10:14:22 -0700
Subject: comps comps-fe6.xml.in,1.200,1.201
Message-ID: <200610191714.k9JHEMHI013472@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13451

Modified Files:
	comps-fe6.xml.in 
Log Message:
Forgot gnome-python2-gda


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- comps-fe6.xml.in	19 Oct 2006 16:54:49 -0000	1.200
+++ comps-fe6.xml.in	19 Oct 2006 17:13:51 -0000	1.201
@@ -508,6 +508,7 @@
       <packagereq type="optional">gconfmm26-devel</packagereq>
       <packagereq type="optional">glibmm24-devel</packagereq>
       <packagereq type="optional">gnome-common</packagereq>
+      <packagereq type="optional">gnome-python2-gda-devel</packagereq>
       <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
       <packagereq type="optional">gquilt</packagereq>
       <packagereq type="optional">gtk+extra</packagereq>



From fedora-extras-commits at redhat.com  Thu Oct 19 17:25:03 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 10:25:03 -0700
Subject: rpms/bwidget/FC-5 .cvsignore, 1.2, 1.3 bwidget.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610191725.k9JHP3gp013572@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bwidget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13536/FC-5

Modified Files:
	.cvsignore bwidget.spec sources 
Log Message:
Update to 1.8.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bwidget/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Feb 2006 17:40:19 -0000	1.2
+++ .cvsignore	19 Oct 2006 17:24:33 -0000	1.3
@@ -1 +1 @@
-BWidget-1.7.0.tar.gz
+BWidget-1.8.0.tar.gz


Index: bwidget.spec
===================================================================
RCS file: /cvs/extras/rpms/bwidget/FC-5/bwidget.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bwidget.spec	13 Aug 2006 04:14:17 -0000	1.2
+++ bwidget.spec	19 Oct 2006 17:24:33 -0000	1.3
@@ -1,13 +1,12 @@
 Name:           bwidget
-Version:        1.7.0
-Release:        3%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Extended widget set for Tk
 
 Group:          Development/Libraries
 License:        Distributable
 URL:            http://tcllib.sourceforge.net/
-Source0:        http://download.sourceforge.net/tcllib/BWidget-1.7.0.tar.gz
-Patch0:         bwidget-1.7.0-colorchooser.patch
+Source0:        http://download.sourceforge.net/tcllib/BWidget-1.8.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q -n BWidget-%{version}
-%patch0 -p4
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %install
@@ -46,6 +44,10 @@
 %doc BWman/*.html
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.8.0-1
+- Update to 1.8.0
+- Remove patch that was accepted upstream
+
 * Fri Aug 11 2006 Wart <wart at kobold.org> 1.7.0-3
 - Add patch for adding a color selector to the font dialog (BZ #200809)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bwidget/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Feb 2006 17:40:19 -0000	1.2
+++ sources	19 Oct 2006 17:24:33 -0000	1.3
@@ -1 +1 @@
-d28c6b781dd06f09e55bbb3fccb1ee3c  BWidget-1.7.0.tar.gz
+bc590989cae539a9c78fda34e12e277e  BWidget-1.8.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 17:25:04 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 10:25:04 -0700
Subject: rpms/bwidget/devel .cvsignore, 1.2, 1.3 bwidget.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610191725.k9JHP4Tr013577@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bwidget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13536/devel

Modified Files:
	.cvsignore bwidget.spec sources 
Log Message:
Update to 1.8.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bwidget/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Feb 2006 17:40:19 -0000	1.2
+++ .cvsignore	19 Oct 2006 17:24:34 -0000	1.3
@@ -1 +1 @@
-BWidget-1.7.0.tar.gz
+BWidget-1.8.0.tar.gz


Index: bwidget.spec
===================================================================
RCS file: /cvs/extras/rpms/bwidget/devel/bwidget.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bwidget.spec	28 Aug 2006 16:48:50 -0000	1.3
+++ bwidget.spec	19 Oct 2006 17:24:34 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           bwidget
-Version:        1.7.0
-Release:        4%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Extended widget set for Tk
 
 Group:          Development/Libraries
 License:        Distributable
 URL:            http://tcllib.sourceforge.net/
-Source0:        http://download.sourceforge.net/tcllib/BWidget-1.7.0.tar.gz
-Patch0:         bwidget-1.7.0-colorchooser.patch
+Source0:        http://download.sourceforge.net/tcllib/BWidget-1.8.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q -n BWidget-%{version}
-%patch0 -p4
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %install
@@ -46,6 +44,10 @@
 %doc BWman/*.html
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.8.0-1
+- Update to 1.8.0
+- Remove patch that was accepted upstream
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> 1.7.0-4
 - Rebuild for Fedora Extras
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bwidget/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Feb 2006 17:40:19 -0000	1.2
+++ sources	19 Oct 2006 17:24:34 -0000	1.3
@@ -1 +1 @@
-d28c6b781dd06f09e55bbb3fccb1ee3c  BWidget-1.7.0.tar.gz
+bc590989cae539a9c78fda34e12e277e  BWidget-1.8.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 17:26:11 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 10:26:11 -0700
Subject: rpms/bwidget/devel bwidget-1.7.0-colorchooser.patch,1.1,NONE
Message-ID: <200610191726.k9JHQBTh013627@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bwidget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13622

Removed Files:
	bwidget-1.7.0-colorchooser.patch 
Log Message:
Patch accepted upstream.




--- bwidget-1.7.0-colorchooser.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 19 17:26:47 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 10:26:47 -0700
Subject: rpms/bwidget/FC-5 bwidget-1.7.0-colorchooser.patch,1.1,NONE
Message-ID: <200610191726.k9JHQl77013663@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bwidget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13658

Removed Files:
	bwidget-1.7.0-colorchooser.patch 
Log Message:
Patch accepted upstream




--- bwidget-1.7.0-colorchooser.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 19 17:27:28 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 19 Oct 2006 10:27:28 -0700
Subject: rpms/aalib/devel aalib.spec,1.14,1.15
Message-ID: <200610191727.k9JHRS2x013694@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/aalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13678

Modified Files:
	aalib.spec 
Log Message:
* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.10.rc6
- Rebuild with ncurses support



Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aalib.spec	28 Aug 2006 05:05:47 -0000	1.14
+++ aalib.spec	19 Oct 2006 17:26:58 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:        ASCII art library
 Name:           aalib
 Version:        1.4.0
-Release:        0.9.%{rc_subver}%{?dist}
+Release:        0.10.%{rc_subver}%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://aa-project.sourceforge.net/aalib/
@@ -13,7 +13,7 @@
 Patch2:         aalib-1.4rc5-bug149361.patch
 Patch3:         aalib-1.4rc5-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  slang-devel libXt-devel gpm-devel
+BuildRequires:  slang-devel libXt-devel gpm-devel ncurses-devel
 
 %description
 AA-lib is a low level gfx library just as many other libraries are. The
@@ -51,7 +51,7 @@
 
 
 %build
-%configure --disable-static
+%configure --disable-static  --with-curses-driver=yes --with-ncurses
 # 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
@@ -101,6 +101,9 @@
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.10.rc6
+- Rebuild with ncurses support
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-0.8.rc6
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Thu Oct 19 17:30:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 19 Oct 2006 10:30:22 -0700
Subject: owners owners.list,1.1854,1.1855
Message-ID: <200610191730.k9JHUMkC013846@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13799

Modified Files:
	owners.list 
Log Message:
taking ownership of aalib


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1854
retrieving revision 1.1855
diff -u -r1.1854 -r1.1855
--- owners.list	19 Oct 2006 06:52:38 -0000	1.1854
+++ owners.list	19 Oct 2006 17:29:52 -0000	1.1855
@@ -11,7 +11,7 @@
 #
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 Fedora Extras|915resolution|Intel video BIOS hack to support certain resolutions|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
-Fedora Extras|aalib|An ASCII art library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|aalib|An ASCII art library|garrick at usc.edu|extras-qa at fedoraproject.org|
 Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abcMIDI|ABC to/from MIDI conversion utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct 19 17:47:03 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 19 Oct 2006 10:47:03 -0700
Subject: rpms/comix/devel .cvsignore, 1.2, 1.3 comix.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200610191747.k9JHl32t013946@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13923

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
* Thu Oct 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.1-1
- 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 03:40:40 -0000	1.2
+++ .cvsignore	19 Oct 2006 17:46:33 -0000	1.3
@@ -1 +1 @@
-comix-3.6.tar.gz
+comix-3.6.1.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comix.spec	7 Oct 2006 03:40:40 -0000	1.1
+++ comix.spec	19 Oct 2006 17:46:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		comix
-Version:	3.6
-Release:	2%{?dist}
+Version:	3.6.1
+Release:	1%{?dist}
 Summary:	A user-friendly, customizable image viewer
 
 Group:		Amusements/Graphics
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.1-1
+- 3.6.1
+
 * Fri Oct 06 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6-2
 - Specify URL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 03:40:40 -0000	1.2
+++ sources	19 Oct 2006 17:46:33 -0000	1.3
@@ -1 +1 @@
-2d6034c5c032fcb5fe257048d64364a8  comix-3.6.tar.gz
+5ed7c540ed9434783c3cdb041912d41d  comix-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 17:49:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 19 Oct 2006 10:49:25 -0700
Subject: rpms/comix/FC-5 .cvsignore, 1.2, 1.3 comix.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610191749.k9JHnPQU014040@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14015

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
* Thu Oct 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.1-1
- 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 03:40:40 -0000	1.2
+++ .cvsignore	19 Oct 2006 17:48:55 -0000	1.3
@@ -1 +1 @@
-comix-3.6.tar.gz
+comix-3.6.1.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/FC-5/comix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comix.spec	7 Oct 2006 03:40:40 -0000	1.1
+++ comix.spec	19 Oct 2006 17:48:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		comix
-Version:	3.6
-Release:	2%{?dist}
+Version:	3.6.1
+Release:	1%{?dist}
 Summary:	A user-friendly, customizable image viewer
 
 Group:		Amusements/Graphics
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.1-1
+- 3.6.1
+
 * Fri Oct 06 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6-2
 - Specify URL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 03:40:40 -0000	1.2
+++ sources	19 Oct 2006 17:48:55 -0000	1.3
@@ -1 +1 @@
-2d6034c5c032fcb5fe257048d64364a8  comix-3.6.tar.gz
+5ed7c540ed9434783c3cdb041912d41d  comix-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 17:50:20 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 19 Oct 2006 10:50:20 -0700
Subject: rpms/aalib/devel aalib.spec,1.15,1.16
Message-ID: <200610191750.k9JHoKfF014105@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/aalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14089

Modified Files:
	aalib.spec 
Log Message:
* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.11.rc5
- incorrect subversion in previous two changelog entries



Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aalib.spec	19 Oct 2006 17:26:58 -0000	1.15
+++ aalib.spec	19 Oct 2006 17:49:49 -0000	1.16
@@ -3,7 +3,7 @@
 Summary:        ASCII art library
 Name:           aalib
 Version:        1.4.0
-Release:        0.10.%{rc_subver}%{?dist}
+Release:        0.11.%{rc_subver}%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://aa-project.sourceforge.net/aalib/
@@ -101,6 +101,9 @@
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.11.rc5
+- incorrect subversion in previous two changelog entries
+
 * Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.10.rc6
 - Rebuild with ncurses support
 



From fedora-extras-commits at redhat.com  Thu Oct 19 17:52:54 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 19 Oct 2006 10:52:54 -0700
Subject: rpms/clement/devel clement.spec,1.19,1.20
Message-ID: <200610191752.k9JHqsXu014189@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/clement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14166

Modified Files:
	clement.spec 
Log Message:
* Thu Oct 19 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1-210
- Remove errant repository.



Index: clement.spec
===================================================================
RCS file: /cvs/extras/rpms/clement/devel/clement.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- clement.spec	4 Sep 2006 17:15:11 -0000	1.19
+++ clement.spec	19 Oct 2006 17:52:23 -0000	1.20
@@ -1,6 +1,6 @@
 Name: clement
 Version: 2.1
-Release: 209.1%{?dist}
+Release: 210%{?dist}
 URL: http://www.clement.safe.ca
 License: GPL
 Summary: An application to filter and manage E-mail traffic
@@ -38,6 +38,10 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+# This package attempts to install a yum repository, which is terrible idea.
+# Remove it here.
+%{__rm} -rf %{buildroot}/%{_sysconfdir}/yum.repos.d
+
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -100,13 +104,15 @@
 
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
-%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
 
 
 %changelog
+* Thu Oct 19 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1-210
+- Remove errant repository.
+
 * Mon Sep  3 2006 Jean-Marc Pigeon <jmp at safe.ca> 2.1-209
 - Bug-Fix:
     * Fixed problem about undue relaying, was caused



From fedora-extras-commits at redhat.com  Thu Oct 19 18:09:49 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 19 Oct 2006 11:09:49 -0700
Subject: rpms/dnsmasq/devel .cvsignore, 1.5, 1.6 dnsmasq.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200610191809.k9JI9nKY017272@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17242

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

Update to 2.34, minor cleanup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Aug 2006 20:35:02 -0000	1.5
+++ .cvsignore	19 Oct 2006 18:09:19 -0000	1.6
@@ -1 +1 @@
-dnsmasq-2.33.tar.gz
+dnsmasq-2.34.tar.gz


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dnsmasq.spec	28 Aug 2006 17:03:59 -0000	1.11
+++ dnsmasq.spec	19 Oct 2006 18:09:19 -0000	1.12
@@ -1,14 +1,14 @@
 Name:           dnsmasq
-Version:        2.33
-Release:        2%{?dist}
+Version:        2.34
+Release:        1%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
-Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch
-Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch
+Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
+Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -90,6 +90,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
+- Hardcoded version in patches, as I'm getting tired of updating them
+- Update to 2.34
+
 * Mon Aug 28 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.33-2
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Aug 2006 20:35:02 -0000	1.5
+++ sources	19 Oct 2006 18:09:19 -0000	1.6
@@ -1 +1 @@
-45696461b6e6bc929273b1191ca50447  dnsmasq-2.33.tar.gz
+a40b79bec295bb4631b1c033cf0bbdf1  dnsmasq-2.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 18:19:08 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 19 Oct 2006 11:19:08 -0700
Subject: rpms/eclipse-gef/devel eclipse-gef.spec,1.1,1.2
Message-ID: <200610191819.k9JIJ83P017359@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-gef/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17343

Modified Files:
	eclipse-gef.spec 
Log Message:
* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-1
- 3.2.1.



Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-gef.spec	7 Sep 2006 17:57:16 -0000	1.1
+++ eclipse-gef.spec	19 Oct 2006 18:18:38 -0000	1.2
@@ -9,20 +9,20 @@
 %define major                   3
 %define minor                   2
 %define majmin                  %{major}.%{minor}
-%define micro                   0
+%define micro                   1
 %define eclipse_base            %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base        %{_libdir}/%{eclipse_name}
 
 Summary:        Graphical Editor Framework (GEF) plugin for Eclipse
 Name:           %{eclipse_name}-gef
 Version:        %{majmin}.%{micro}
-Release:        2
+Release:        1
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/gef/
 Requires:       eclipse-platform
 
-# # Here's how to generate the source drop for GEF 3.2.0:
+# # Here's how to generate the source drop for GEF 3.2.1:
 # #
 # mkdir -p temp/home && cd temp
 # touch home/.cvspass
@@ -80,7 +80,7 @@
 # 
 # popd
 # 
-# tar jcf eclipse-gef-fetched-src-3.2.0.tar.bz2 org.eclipse.releng.gefbuilder
+# tar jcf eclipse-gef-fetched-src-3.2.1.tar.bz2 org.eclipse.releng.gefbuilder
 
 Source0:        %{name}-fetched-src-%{version}.tar.bz2
 
@@ -102,7 +102,7 @@
 BuildArch:        noarch
 %endif
 
-Requires:       eclipse-platform >= 1:3.2.0
+Requires:       eclipse-platform >= 1:3.2.1
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
@@ -154,8 +154,6 @@
 # -DbaseLocation=$SDK: $SDK is a mirror of the system SDK dir that is writable by the process 
 #                      running the build. This let's the build "see" the jars and have a place to 
 #                      put the plugins that have just been built
-# -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts:  we need to specify this 
-#                                                                        because we are using 3.1.2 
 # -DskipFetch=true: don't fetch the sources 
 # -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
 java -cp $SDK/startup.jar                       \
@@ -253,6 +251,9 @@
 %doc %{eclipse_base}/features/org.eclipse.gef_*/epl-v10.html
 
 %changelog
+* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-1
+- 3.2.1.
+
 * Tue Aug 29 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-2
 - First release for Fedora.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 18:20:18 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 19 Oct 2006 11:20:18 -0700
Subject: rpms/dnsmasq/FC-5 dnsmasq.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200610191820.k9JIKIlS017383@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17339

Modified Files:
	dnsmasq.spec sources 
Log Message:

Update to 2.34, minor cleanup



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dnsmasq.spec	15 Aug 2006 20:52:31 -0000	1.6
+++ dnsmasq.spec	19 Oct 2006 18:19:48 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           dnsmasq
-Version:        2.33
+Version:        2.34
 Release:        1%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
@@ -7,8 +7,8 @@
 License:        GPL
 URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
-Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch
-Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch
+Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
+Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -90,6 +90,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
+- Hardcoded version in patches, as I'm getting tired of updating them
+- Update to 2.34
+
 * Tue Aug 15 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.33-1
 - Update
 - Added pkgconfig BuildReq due to reduced buildroot


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Aug 2006 20:52:31 -0000	1.5
+++ sources	19 Oct 2006 18:19:48 -0000	1.6
@@ -1 +1 @@
-45696461b6e6bc929273b1191ca50447  dnsmasq-2.33.tar.gz
+a40b79bec295bb4631b1c033cf0bbdf1  dnsmasq-2.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 18:22:00 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 19 Oct 2006 11:22:00 -0700
Subject: rpms/eclipse-gef/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610191822.k9JIM0Sj017452@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-gef/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17406

Modified Files:
	.cvsignore sources 
Log Message:
3.2.1 source.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 17:57:16 -0000	1.2
+++ .cvsignore	19 Oct 2006 18:21:29 -0000	1.3
@@ -1 +1 @@
-eclipse-gef-fetched-src-3.2.0.tar.bz2
+eclipse-gef-fetched-src-3.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 17:57:16 -0000	1.2
+++ sources	19 Oct 2006 18:21:29 -0000	1.3
@@ -1 +1 @@
-966bbdc00340b01a98802dd89e5a7af0  eclipse-gef-fetched-src-3.2.0.tar.bz2
+f0dea818826d71384df117ab8863e32c  eclipse-gef-fetched-src-3.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 19 18:31:21 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 11:31:21 -0700
Subject: rpms/tcllib/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tcllib.spec,
	1.6, 1.7
Message-ID: <200610191831.k9JIVLM6017653@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcllib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611/FC-5

Modified Files:
	.cvsignore sources tcllib.spec 
Log Message:
Update to 1.9




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcllib/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2005 23:16:09 -0000	1.3
+++ .cvsignore	19 Oct 2006 18:30:51 -0000	1.4
@@ -1 +1 @@
-tcllib-1.8.tar.gz
+tcllib-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcllib/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2005 23:12:25 -0000	1.3
+++ sources	19 Oct 2006 18:30:51 -0000	1.4
@@ -1 +1 @@
-d8bea3b18e51f551f1d529164a3215d1  tcllib-1.8.tar.gz
+17d9ae35b1c6fde1d79c5b1423416cd2  tcllib-1.9.tar.gz


Index: tcllib.spec
===================================================================
RCS file: /cvs/extras/rpms/tcllib/FC-5/tcllib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tcllib.spec	16 Feb 2006 05:54:22 -0000	1.6
+++ tcllib.spec	19 Oct 2006 18:30:51 -0000	1.7
@@ -1,10 +1,10 @@
 Summary: The standard Tcl library
 Name: tcllib
-Version: 1.8
-Release: 4%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 License: BSD-like
 Group: Development/Libraries
-Source: http://download.sourceforge.net/tcllib/tcllib-1.8.tar.gz
+Source: http://download.sourceforge.net/tcllib/tcllib-1.9.tar.gz
 URL: http://tcllib.sourceforge.net/
 BuildArchitectures: noarch
 Requires: tcl >= 8.3.1
@@ -18,35 +18,45 @@
 
 %prep
 %setup -q
+chmod -x modules/doctools/mpformats/fr.msg
 
 %install
 rm -rf $RPM_BUILD_ROOT
 echo 'not available' > modules/imap4/imap4.n
-%_bindir/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\
+%{_bindir}/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\
     -pkg-path $RPM_BUILD_ROOT/$(echo 'puts $tcl_library' | %_bindir/tclsh)/%name-%version\
     -nroff-path $RPM_BUILD_ROOT%_mandir/mann
 # install HTML documentation into specific modules sub-directories:
-cd modules
-    mkdir -p ../ftp; cp ftp/docs/*.html ../ftp/
-    for module in exif mime stooop struct textutil; do
-        mkdir -p ../$module && cp $module/*.html ../$module/;
-    done
-cd ..
+pushd modules
+cp ftp/docs/*.html ftp/
+for module in comm exif ftp mime stooop struct textutil; do
+    mkdir -p ../$module && cp $module/*.html ../$module/;
+done
+popd
 
-# Clean up rpmlint warnints
+# Clean up rpmlint warnings
 find $RPM_BUILD_ROOT/%{_datadir} -name \*.tcl -exec chmod 0644 {} \;
 
+iconv --from=ISO-8859-1 --to=UTF-8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n > $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n.utf8
+iconv --from=ISO-8859-1 --to=UTF-8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n > $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n.utf8
+mv $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n.utf8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n
+mv $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n.utf8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc PACKAGES README README-1.8.txt ChangeLog license.terms
+%doc support/releases/PACKAGES README support/releases/history/README-1.9.txt
+%doc ChangeLog license.terms
 %doc exif/ ftp/ mime/ stooop/ struct/ textutil/
 %{_datadir}/tcl*/%{name}-%{version}
 %{_mandir}/mann/*
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.9-1
+- Update to 1.9
+
 * Thu Feb 16 2006 Wart <wart at kobold.org> 1.8-4
 - Remove executable bits on the library files to clean up rpmlint
   warnings.



From fedora-extras-commits at redhat.com  Thu Oct 19 18:31:22 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 11:31:22 -0700
Subject: rpms/tcllib/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tcllib.spec,
	1.7, 1.8
Message-ID: <200610191831.k9JIVMxE017658@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcllib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611/devel

Modified Files:
	.cvsignore sources tcllib.spec 
Log Message:
Update to 1.9




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcllib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2005 23:16:09 -0000	1.3
+++ .cvsignore	19 Oct 2006 18:30:52 -0000	1.4
@@ -1 +1 @@
-tcllib-1.8.tar.gz
+tcllib-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcllib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2005 23:12:25 -0000	1.3
+++ sources	19 Oct 2006 18:30:52 -0000	1.4
@@ -1 +1 @@
-d8bea3b18e51f551f1d529164a3215d1  tcllib-1.8.tar.gz
+17d9ae35b1c6fde1d79c5b1423416cd2  tcllib-1.9.tar.gz


Index: tcllib.spec
===================================================================
RCS file: /cvs/extras/rpms/tcllib/devel/tcllib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tcllib.spec	28 Aug 2006 16:13:19 -0000	1.7
+++ tcllib.spec	19 Oct 2006 18:30:52 -0000	1.8
@@ -1,10 +1,10 @@
 Summary: The standard Tcl library
 Name: tcllib
-Version: 1.8
-Release: 5%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 License: BSD-like
 Group: Development/Libraries
-Source: http://download.sourceforge.net/tcllib/tcllib-1.8.tar.gz
+Source: http://download.sourceforge.net/tcllib/tcllib-1.9.tar.gz
 URL: http://tcllib.sourceforge.net/
 BuildArchitectures: noarch
 Requires: tcl >= 8.3.1
@@ -18,35 +18,45 @@
 
 %prep
 %setup -q
+chmod -x modules/doctools/mpformats/fr.msg
 
 %install
 rm -rf $RPM_BUILD_ROOT
 echo 'not available' > modules/imap4/imap4.n
-%_bindir/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\
+%{_bindir}/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\
     -pkg-path $RPM_BUILD_ROOT/$(echo 'puts $tcl_library' | %_bindir/tclsh)/%name-%version\
     -nroff-path $RPM_BUILD_ROOT%_mandir/mann
 # install HTML documentation into specific modules sub-directories:
-cd modules
-    mkdir -p ../ftp; cp ftp/docs/*.html ../ftp/
-    for module in exif mime stooop struct textutil; do
-        mkdir -p ../$module && cp $module/*.html ../$module/;
-    done
-cd ..
+pushd modules
+cp ftp/docs/*.html ftp/
+for module in comm exif ftp mime stooop struct textutil; do
+    mkdir -p ../$module && cp $module/*.html ../$module/;
+done
+popd
 
-# Clean up rpmlint warnints
+# Clean up rpmlint warnings
 find $RPM_BUILD_ROOT/%{_datadir} -name \*.tcl -exec chmod 0644 {} \;
 
+iconv --from=ISO-8859-1 --to=UTF-8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n > $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n.utf8
+iconv --from=ISO-8859-1 --to=UTF-8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n > $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n.utf8
+mv $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n.utf8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip.n
+mv $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n.utf8 $RPM_BUILD_ROOT/%{_mandir}/mann/docstrip_util.n
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc PACKAGES README README-1.8.txt ChangeLog license.terms
+%doc support/releases/PACKAGES README support/releases/history/README-1.9.txt
+%doc ChangeLog license.terms
 %doc exif/ ftp/ mime/ stooop/ struct/ textutil/
 %{_datadir}/tcl*/%{name}-%{version}
 %{_mandir}/mann/*
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.9-1
+- Update to 1.9
+
 * Mon Aug 21 2006 Wart <wart at kobold.org> 1.8-5
 - Rebuild for Fedora Extras
 



From fedora-extras-commits at redhat.com  Thu Oct 19 19:30:18 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Thu, 19 Oct 2006 12:30:18 -0700
Subject: rpms/aalib/FC-5 aalib.spec,1.12,1.13
Message-ID: <200610191930.k9JJUIRd020918@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/aalib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20878

Modified Files:
	aalib.spec 
Log Message:
Rebuild with ncurses support


Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/FC-5/aalib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aalib.spec	23 Jul 2006 08:16:38 -0000	1.12
+++ aalib.spec	19 Oct 2006 19:29:48 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:        ASCII art library
 Name:           aalib
 Version:        1.4.0
-Release:        0.8.%{rc_subver}%{?dist}
+Release:        0.11.%{rc_subver}%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://aa-project.sourceforge.net/aalib/
@@ -13,7 +13,7 @@
 Patch2:         aalib-1.4rc5-bug149361.patch
 Patch3:         aalib-1.4rc5-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  slang-devel libXt-devel gpm-devel
+BuildRequires:  slang-devel libXt-devel gpm-devel ncurses-devel
 
 %description
 AA-lib is a low level gfx library just as many other libraries are. The
@@ -51,7 +51,7 @@
 
 
 %build
-%configure --disable-static
+%configure --disable-static  --with-curses-driver=yes --with-ncurses
 # 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
@@ -101,6 +101,15 @@
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.11.rc5
+- incorrect subversion in previous two changelog entries
+
+* Thu Oct 19 2006 Garrick Staples <garrick at usc.edu> 1.4.0-0.10.rc6
+- Rebuild with ncurses support
+
+* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-0.8.rc6
+- FE6 Rebuild
+
 * Sun Jul 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-0.8.rc5
 - Taking over as maintainer since Anvil has other priorities
 - Long long due rebuild with new gcc for FC-5 (bug 185870)



From fedora-extras-commits at redhat.com  Thu Oct 19 20:19:48 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Oct 2006 13:19:48 -0700
Subject: rpms/stellarium/devel stellarium-0.8.2-x64.patch, NONE,
	1.1 stellarium.spec, 1.23, 1.24
Message-ID: <200610192019.k9JKJmp0024261@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64.patch 
Log Message:
Fix segfault on x64 systems

stellarium-0.8.2-x64.patch:

--- NEW FILE stellarium-0.8.2-x64.patch ---
--- stellarium-0.8.2/src/translator.cpp.org	2006-10-15 21:14:08.000000000 +0200
+++ stellarium-0.8.2/src/translator.cpp	2006-10-15 21:15:42.000000000 +0200
@@ -73,9 +73,9 @@
 	//change systemLangName to ISO 639 / ISO 3166.
 	unsigned int pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
-	       Translator::systemLangName.resize(pos);
+	       Translator::systemLangName.resize(pos+1);
 	pos = Translator::systemLangName.find('.', 0);
-	if(pos == 5) Translator::systemLangName.resize(pos);
+	if(pos == 5) Translator::systemLangName.resize(pos+1);
 }
 
 void Translator::reload()


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- stellarium.spec	10 Oct 2006 19:38:15 -0000	1.23
+++ stellarium.spec	19 Oct 2006 20:19:18 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
+Patch1:		stellarium-0.8.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -83,6 +85,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Thu Oct 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-2
+- Fix segfault on x64 systems (#210525)
+
 * Tue Oct 10 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Thu Oct 19 20:22:01 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 19 Oct 2006 13:22:01 -0700
Subject: rpms/liferea/devel .cvsignore, 1.35, 1.36 liferea.spec, 1.52,
	1.53 sources, 1.36, 1.37
Message-ID: <200610192022.k9JKM1I7024351@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24331

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
- Update to 1.0.24.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	18 Sep 2006 16:33:25 -0000	1.35
+++ .cvsignore	19 Oct 2006 20:21:31 -0000	1.36
@@ -1 +1 @@
-liferea-1.0.23.tar.gz
+liferea-1.0.24.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- liferea.spec	12 Oct 2006 18:25:43 -0000	1.52
+++ liferea.spec	19 Oct 2006 20:21:31 -0000	1.53
@@ -1,15 +1,15 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.23
-Release:        3%{?dist}
+Version:        1.0.24
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}-fedorafeed.patch
+Patch0:		%{name}-1.0.23-fedorafeed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml2-devel
@@ -56,7 +56,6 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
@@ -110,6 +109,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
+- Update to 1.0.24.
+
 * Thu Oct 12 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-3
 - Add patch to add Fedora default feeds. (#209301)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	18 Sep 2006 16:33:25 -0000	1.36
+++ sources	19 Oct 2006 20:21:31 -0000	1.37
@@ -1 +1 @@
-a29a9ecb2fe2ea2b7eac44795b5d3bc4  liferea-1.0.23.tar.gz
+f872d4ffd483cdcd4fe1f56dc86d5407  liferea-1.0.24.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 20:34:39 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 19 Oct 2006 13:34:39 -0700
Subject: rpms/eclipse-gef/devel eclipse-gef.spec,1.2,1.3
Message-ID: <200610192034.k9JKYdSb024566@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-gef/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24544

Modified Files:
	eclipse-gef.spec 
Log Message:
* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-2
- Fix buildroot (don't know how the wrong one slipped in).



Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-gef.spec	19 Oct 2006 18:18:38 -0000	1.2
+++ eclipse-gef.spec	19 Oct 2006 20:34:09 -0000	1.3
@@ -16,7 +16,7 @@
 Summary:        Graphical Editor Framework (GEF) plugin for Eclipse
 Name:           %{eclipse_name}-gef
 Version:        %{majmin}.%{micro}
-Release:        1
+Release:        2%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/gef/
@@ -104,7 +104,7 @@
 
 Requires:       eclipse-platform >= 1:3.2.1
 
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package        sdk
 Summary:        Eclipse GEF SDK
@@ -222,6 +222,9 @@
 %{_libdir}/gcj/%{name}/org.eclipse.draw2d_*
 %{_libdir}/gcj/%{name}/org.eclipse.gef_*
 %endif
+%doc %{eclipse_base}/readme/*
+%doc %{eclipse_base}/features/org.eclipse.gef_*/notice.html
+%doc %{eclipse_base}/features/org.eclipse.gef_*/epl-v10.html
 
 %files sdk
 %defattr(-,root,root)
@@ -246,11 +249,10 @@
 %{_libdir}/gcj/%{name}/org.eclipse.gef.examples.shapes_*
 %endif
 
-%doc %{eclipse_base}/readme/*
-%doc %{eclipse_base}/features/org.eclipse.gef_*/notice.html
-%doc %{eclipse_base}/features/org.eclipse.gef_*/epl-v10.html
-
 %changelog
+* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-2
+- Fix buildroot (don't know how the wrong one slipped in).
+
 * Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 3.2.1-1
 - 3.2.1.
 



From fedora-extras-commits at redhat.com  Thu Oct 19 21:19:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:19:20 -0700
Subject: rpms/perl-Alien-wxWidgets/devel .cvsignore, 1.3,
	1.4 perl-Alien-wxWidgets.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610192119.k9JLJKJs030748@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30728

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.23.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Oct 2006 20:00:07 -0000	1.3
+++ .cvsignore	19 Oct 2006 21:18:50 -0000	1.4
@@ -1 +1 @@
-Alien-wxWidgets-0.22.tar.gz
+Alien-wxWidgets-0.23.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Alien-wxWidgets.spec	3 Oct 2006 20:00:07 -0000	1.4
+++ perl-Alien-wxWidgets.spec	19 Oct 2006 21:18:50 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.22
+Version:        0.23
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
+- Update to 0.23.
+
 * Tue Oct  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
 - Update to 0.22.
 - Avoid creation of the debuginfo package (#209180).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Oct 2006 20:00:07 -0000	1.3
+++ sources	19 Oct 2006 21:18:50 -0000	1.4
@@ -1 +1 @@
-98de414f8d378170ede6cf96a0e2f73e  Alien-wxWidgets-0.22.tar.gz
+487dcec3fc7ef94c4247913883b5cc65  Alien-wxWidgets-0.23.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:23:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:23:28 -0700
Subject: rpms/perl-Email-Simple/devel .cvsignore, 1.8,
	1.9 perl-Email-Simple.spec, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <200610192123.k9JLNSfY030858@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30838

Modified Files:
	.cvsignore perl-Email-Simple.spec sources 
Log Message:
Update to 1.995.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Oct 2006 17:32:27 -0000	1.8
+++ .cvsignore	19 Oct 2006 21:22:58 -0000	1.9
@@ -1 +1 @@
-Email-Simple-1.992.tar.gz
+Email-Simple-1.995.tar.gz


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/perl-Email-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Email-Simple.spec	7 Oct 2006 17:32:27 -0000	1.7
+++ perl-Email-Simple.spec	19 Oct 2006 21:22:58 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Email-Simple
-Version:        1.992
+Version:        1.995
 Release:        1%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.995-1
+- Update to 1.995.
+
 * Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.992-1
 - Update to 1.992.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Oct 2006 17:32:27 -0000	1.8
+++ sources	19 Oct 2006 21:22:58 -0000	1.9
@@ -1 +1 @@
-901b2c7d2b978a0b31ca6b274282b852  Email-Simple-1.992.tar.gz
+6077eb2074fc883cab6b6eee68f344b3  Email-Simple-1.995.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:27:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:27:10 -0700
Subject: rpms/perl-Email-Simple/FC-5 .cvsignore, 1.7,
	1.8 perl-Email-Simple.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200610192127.k9JLRAOT030930@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30907

Modified Files:
	.cvsignore perl-Email-Simple.spec sources 
Log Message:
Update to 1.995.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Oct 2006 17:32:26 -0000	1.7
+++ .cvsignore	19 Oct 2006 21:26:40 -0000	1.8
@@ -1 +1 @@
-Email-Simple-1.992.tar.gz
+Email-Simple-1.995.tar.gz


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/perl-Email-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Simple.spec	7 Oct 2006 17:32:26 -0000	1.6
+++ perl-Email-Simple.spec	19 Oct 2006 21:26:40 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Simple
-Version:        1.992
+Version:        1.995
 Release:        1%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.995-1
+- Update to 1.995.
+
 * Sat Oct  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.992-1
 - Update to 1.992.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Oct 2006 17:32:26 -0000	1.7
+++ sources	19 Oct 2006 21:26:40 -0000	1.8
@@ -1 +1 @@
-901b2c7d2b978a0b31ca6b274282b852  Email-Simple-1.992.tar.gz
+6077eb2074fc883cab6b6eee68f344b3  Email-Simple-1.995.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:42:04 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:42:04 -0700
Subject: rpms/perl-Email-MIME/FC-5 .cvsignore, 1.6, 1.7 perl-Email-MIME.spec,
	1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200610192142.k9JLg4Tf031120@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081/FC-5

Modified Files:
	.cvsignore perl-Email-MIME.spec sources 
Log Message:
Update to 1.855.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Oct 2006 14:01:10 -0000	1.6
+++ .cvsignore	19 Oct 2006 21:41:34 -0000	1.7
@@ -1 +1 @@
-Email-MIME-1.853.tar.gz
+Email-MIME-1.855.tar.gz


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/perl-Email-MIME.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-MIME.spec	14 Oct 2006 14:01:10 -0000	1.5
+++ perl-Email-MIME.spec	19 Oct 2006 21:41:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME
-Version:        1.853
+Version:        1.855
 Release:        1%{?dist}
 Summary:        Easy MIME message parsing
 
@@ -12,7 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
-BuildRequires:  perl(Email::Simple) >= 1.91
+BuildRequires:  perl(Email::Simple) >= 1.995
 BuildRequires:  perl(MIME::Types) >= 1.13
 BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
@@ -60,6 +60,12 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.855-1
+- Update to 1.855.
+
+* Sun Oct 15 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.854-1
+- Update to 1.854.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.853-1
 - Update to 1.853.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Oct 2006 14:01:10 -0000	1.6
+++ sources	19 Oct 2006 21:41:34 -0000	1.7
@@ -1 +1 @@
-ff4f3f7c3aefbd74cb56cb513797c9fd  Email-MIME-1.853.tar.gz
+22b8b110fa3e10331cc703700d3c79cd  Email-MIME-1.855.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:42:04 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Oct 2006 14:42:04 -0700
Subject: rpms/perl-Email-MIME/devel .cvsignore, 1.6, 1.7 perl-Email-MIME.spec,
	1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200610192142.k9JLg4bq031125@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081/devel

Modified Files:
	.cvsignore perl-Email-MIME.spec sources 
Log Message:
Update to 1.855.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Oct 2006 14:01:16 -0000	1.6
+++ .cvsignore	19 Oct 2006 21:41:34 -0000	1.7
@@ -1 +1 @@
-Email-MIME-1.853.tar.gz
+Email-MIME-1.855.tar.gz


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/perl-Email-MIME.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-MIME.spec	14 Oct 2006 14:01:16 -0000	1.5
+++ perl-Email-MIME.spec	19 Oct 2006 21:41:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-MIME
-Version:        1.853
+Version:        1.855
 Release:        1%{?dist}
 Summary:        Easy MIME message parsing
 
@@ -12,7 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Email::MIME::ContentType) >= 1.011
 BuildRequires:  perl(Email::MIME::Encodings) >= 1.3
-BuildRequires:  perl(Email::Simple) >= 1.91
+BuildRequires:  perl(Email::Simple) >= 1.995
 BuildRequires:  perl(MIME::Types) >= 1.13
 BuildRequires:  perl(Test::Pod) >= 1.14
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
@@ -60,6 +60,12 @@
 
 
 %changelog
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.855-1
+- Update to 1.855.
+
+* Sun Oct 15 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.854-1
+- Update to 1.854.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.853-1
 - Update to 1.853.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Oct 2006 14:01:16 -0000	1.6
+++ sources	19 Oct 2006 21:41:34 -0000	1.7
@@ -1 +1 @@
-ff4f3f7c3aefbd74cb56cb513797c9fd  Email-MIME-1.853.tar.gz
+22b8b110fa3e10331cc703700d3c79cd  Email-MIME-1.855.tar.gz



From fedora-extras-commits at redhat.com  Thu Oct 19 21:44:03 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 19 Oct 2006 14:44:03 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.4,1.5
Message-ID: <200610192144.k9JLi3j4031230@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31212

Modified Files:
	MultiLib.py 
Log Message:
Ensure that debuginfo packages, which we want to copy, do exist
actually. :)



Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultiLib.py	15 Oct 2006 12:34:25 -0000	1.4
+++ MultiLib.py	19 Oct 2006 21:44:00 -0000	1.5
@@ -280,9 +280,10 @@
     for f in my.needed['debug']:
         srcfile = os.path.join(cfg.treedir,dist,srcarch,'debug',f)
         destfile = os.path.join(cfg.treedir,dist,targetarch,'debug',f)
-        if not os.path.exists(destfile):  # silent extra-check
-            Utils.install_link_or_copy(srcfile,destfile)
-            changed = True
+        if os.path.exists(srcfile):
+            if not os.path.exists(destfile):  # silent extra-check
+                Utils.install_link_or_copy(srcfile,destfile)
+                changed = True
         
     return changed
 



From fedora-extras-commits at redhat.com  Thu Oct 19 22:49:28 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 19 Oct 2006 15:49:28 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.5,1.6
Message-ID: <200610192249.k9JMnSID002042@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2024

Modified Files:
	MultiLib.py 
Log Message:
printing the debuginfo package name at this point is uninteresting


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MultiLib.py	19 Oct 2006 21:44:00 -0000	1.5
+++ MultiLib.py	19 Oct 2006 22:49:25 -0000	1.6
@@ -127,7 +127,6 @@
         if debugrpm not in pkglist:
             pkglist.append(debugrpm)
             missingdict[targetarch]['debug'] = pkglist
-            print ' +', debugrpm
         
     return
 



From fedora-extras-commits at redhat.com  Thu Oct 19 22:53:52 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 19 Oct 2006 15:53:52 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.6,1.7
Message-ID: <200610192253.k9JMrqI3002081@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2063

Modified Files:
	MultiLib.py 
Log Message:
improve one status message


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiLib.py	19 Oct 2006 22:49:25 -0000	1.6
+++ MultiLib.py	19 Oct 2006 22:53:49 -0000	1.7
@@ -110,13 +110,14 @@
         
         if not srcrpm:
             continue
-        
+
+        pkgbasefn = os.path.basename(fname)
+
         if targetarch in excludearch:
-            print 'Multi-compat, but ExcludeArch %s' % excludearch
+            print ' -', pkgbasefn, ': Multi-compat, but ExcludeArch %s' % excludearch
             continue
 
         # Save base file-names here.
-        pkgbasefn = os.path.basename(fname)
         missingdict.setdefault(targetarch,{})
         pkglist = missingdict[targetarch].setdefault('rpms',[])
         if pkgbasefn not in pkglist:



From fedora-extras-commits at redhat.com  Thu Oct 19 22:56:43 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 19 Oct 2006 15:56:43 -0700
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.7,1.8
Message-ID: <200610192256.k9JMuhkY002111@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2093

Modified Files:
	MultiLib.py 
Log Message:
improve one status message


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiLib.py	19 Oct 2006 22:53:49 -0000	1.7
+++ MultiLib.py	19 Oct 2006 22:56:40 -0000	1.8
@@ -284,6 +284,7 @@
             if not os.path.exists(destfile):  # silent extra-check
                 Utils.install_link_or_copy(srcfile,destfile)
                 changed = True
+    print 'done.'
         
     return changed
 



From fedora-extras-commits at redhat.com  Fri Oct 20 00:43:39 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:43:39 -0700
Subject: rpms/scribes-templates - New directory
Message-ID: <200610200043.k9K0hdiT008915@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8911/scribes-templates

Log Message:
Directory /cvs/extras/rpms/scribes-templates added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 00:43:45 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:43:45 -0700
Subject: rpms/scribes-templates/devel - New directory
Message-ID: <200610200043.k9K0hjat008929@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8911/scribes-templates/devel

Log Message:
Directory /cvs/extras/rpms/scribes-templates/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 00:43:56 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:43:56 -0700
Subject: rpms/scribes-templates Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610200043.k9K0hu8s008960@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8954

Added Files:
	Makefile import.log 
Log Message:
Setup of module scribes-templates


--- NEW FILE Makefile ---
# Top level Makefile for module scribes-templates
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 20 00:44:02 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:44:02 -0700
Subject: rpms/scribes-templates/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610200044.k9K0i2ZB008976@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8954/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scribes-templates


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 20 00:44:51 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:44:51 -0700
Subject: rpms/scribes-templates import.log,1.1,1.2
Message-ID: <200610200044.k9K0ipwX009054@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9021

Modified Files:
	import.log 
Log Message:
auto-import scribes-templates-20061017-2 on branch devel from scribes-templates-20061017-2.src.rpm
Initial import (review and approval in bug #211242)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Oct 2006 00:43:56 -0000	1.1
+++ import.log	20 Oct 2006 00:44:21 -0000	1.2
@@ -0,0 +1 @@
+scribes-templates-20061017-2:HEAD:scribes-templates-20061017-2.src.rpm:1161305058



From fedora-extras-commits at redhat.com  Fri Oct 20 00:44:52 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:44:52 -0700
Subject: rpms/scribes-templates/devel COPYING.Fedora, NONE,
	1.1 scribes-templates.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610200044.k9K0iqaV009058@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9021/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING.Fedora scribes-templates.spec 
Log Message:
auto-import scribes-templates-20061017-2 on branch devel from scribes-templates-20061017-2.src.rpm
Initial import (review and approval in bug #211242)


--- NEW FILE COPYING.Fedora ---
The contents of this package are released under the terms of the GPLv2, as
stated by Mystilleef (the Scribes upstream maintainer) in the following 
email:

Message-ID: <9605403b0610170337r4bd5e28cu5442e2f15d401467 at mail.gmail.com>
Date: Tue, 17 Oct 2006 06:37:03 -0400
From: Mystilleef <mystilleef at gmail.com>
To: "Peter Gordon" <peter at thecodergeek.com>
Subject: Re: Scribes Templates Tarball Versioning
In-Reply-To: <453472D8.2090606 at thecodergeek.com>

Hello Peter,

Scribes cannot automatically import templates. Users have to download
them and import them manually. Yes, the templates are all GPL.

Thanks

On 10/17/06, Peter Gordon <peter at thecodergeek.com> wrote:
> One more thing!
>
> These are all GPL'd, I presume? Would you please add a COPYING file or similar
> to the tarball to make that explicitly clear?
>
> Thanks, and sorry for bugging you about this so much! ^_^
>
> --
> Peter Gordon (codergeek42)


--- NEW FILE scribes-templates.spec ---
Name:		scribes-templates
Version:	20061017
Release:	2%{?dist}
Summary:	Templates ("Snippets") for the Scribes text editor
Group:		Applications/Editors
# Though the tarball does not mention it explicitly, Mystilleef (the upstream
# maintainer of Scribes) did state that these are GPL in an email message to
# me on 2006-10-17, a copy of which is contained in COPYING.Fedora. Future
# versions should contain an explicit COPYING file.
License:	GPL
URL:		http://scribes.sourceforge.net/template.html

Source0:	http://scribes.sourceforge.net/templates-%{version}.tar.bz2
Source1:	COPYING.Fedora

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArch:	noarch

# Scribes' template system was rewritten, so these will not work with earlier
# versions, and it needs scribes installed so that the parent directory in
# %%datadir will not be left unowned.
Requires:	scribes >= 0.2.9.87


%description
Scribes is a simple and sleek text editor for the the GNOME desktop. It focuses
on keeping the working environment free from distractions, and providing strong
automation of mundane, repetitive tasks. One of its greatest features is a
dynamic templating system (popularly called Snippets) to automate the creation
of various types of files following the same general format. This package
contains a collection of various pre-made templates for Scribes.


%prep
%setup -q -n "templates"
install -p -m 0644 %{SOURCE1} .

%build
# Nothing to build...


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/scribes/templates
install -p -m 0644 *-templates.xml %{buildroot}%{_datadir}/scribes/templates/


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING.Fedora
%{_datadir}/scribes/templates/


%changelog
* Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 20061017-2
- Make install invocations in %%install and %%prep keep timestamps ("-p")
- Remove empty %%pre/%%preun/%%post/%%postun
- (Thanks to Mamoru Tasaka in bug #211242)
 

* Tue Oct 17 2006 Peter Gordon <peter at thecodergeek.com> - 20061017-1
- Initial packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2006 00:44:01 -0000	1.1
+++ .cvsignore	20 Oct 2006 00:44:22 -0000	1.2
@@ -0,0 +1 @@
+templates-20061017.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2006 00:44:01 -0000	1.1
+++ sources	20 Oct 2006 00:44:22 -0000	1.2
@@ -0,0 +1 @@
+881f13d77207bdcc1fd959a283f220bb  templates-20061017.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 00:49:05 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:49:05 -0700
Subject: owners owners.list,1.1855,1.1856
Message-ID: <200610200049.k9K0n55s009198@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9174/owners

Modified Files:
	owners.list 
Log Message:
Add entry for scribes-templates


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1855
retrieving revision 1.1856
diff -u -r1.1855 -r1.1856
--- owners.list	19 Oct 2006 17:29:52 -0000	1.1855
+++ owners.list	20 Oct 2006 00:48:34 -0000	1.1856
@@ -2045,6 +2045,7 @@
 Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org|mystilleef at gmail.com
+Fedora Extras|scribes-templates|Templates ("Snippets") for the Scribes text editor|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|scribus-templates|This package includes additional templates for Scribus|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de
 Fedora Extras|scrip|Spherical Coordinate Remapping and Interpolation Package|ed at eh3.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 20 00:51:30 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:51:30 -0700
Subject: comps comps-fe6.xml.in,1.201,1.202
Message-ID: <200610200051.k9K0pUth009242@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9225/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add entry for scribes-templates


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- comps-fe6.xml.in	19 Oct 2006 17:13:51 -0000	1.201
+++ comps-fe6.xml.in	20 Oct 2006 00:51:00 -0000	1.202
@@ -232,6 +232,7 @@
       <packagereq type="optional">poedit</packagereq>
       <packagereq type="optional">scite</packagereq>
       <packagereq type="optional">scribes</packagereq>
+      <packagereq type="optional">scribes-templates</packagereq>
       <packagereq type="optional">TeXmacs</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Fri Oct 20 00:54:42 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 19 Oct 2006 17:54:42 -0700
Subject: comps comps-fe5.xml.in,1.178,1.179
Message-ID: <200610200054.k9K0sgPH009288@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9267/comps

Modified Files:
	comps-fe5.xml.in 
Log Message:
Add entry for viaideinfo now that it's branched and built for FC-5


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- comps-fe5.xml.in	19 Oct 2006 17:11:37 -0000	1.178
+++ comps-fe5.xml.in	20 Oct 2006 00:54:12 -0000	1.179
@@ -877,6 +877,7 @@
       <packagereq type="optional">tiobench</packagereq>
       <packagereq type="optional">ttywatch</packagereq>
       <packagereq type="optional">unison</packagereq>
+      <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vnstat</packagereq>
       <packagereq type="optional">vpnc</packagereq>
       <packagereq type="optional">wine</packagereq>



From fedora-extras-commits at redhat.com  Fri Oct 20 00:56:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:56:20 -0700
Subject: rpms/perl-Cache-Mmap - New directory
Message-ID: <200610200056.k9K0uKZJ009359@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9355/perl-Cache-Mmap

Log Message:
Directory /cvs/extras/rpms/perl-Cache-Mmap added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 00:56:26 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:56:26 -0700
Subject: rpms/perl-Cache-Mmap/devel - New directory
Message-ID: <200610200056.k9K0uQqG009373@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9355/perl-Cache-Mmap/devel

Log Message:
Directory /cvs/extras/rpms/perl-Cache-Mmap/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 00:57:06 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:57:06 -0700
Subject: rpms/perl-HTML-Template-Expr/devel perl-HTML-Template-Expr.spec, 1.6,
	1.7
Message-ID: <200610200057.k9K0v6l4009428@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9390

Modified Files:
	perl-HTML-Template-Expr.spec 
Log Message:
Rebuild.


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/perl-HTML-Template-Expr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-HTML-Template-Expr.spec	30 Aug 2006 15:46:53 -0000	1.6
+++ perl-HTML-Template-Expr.spec	20 Oct 2006 00:56:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template-Expr
 Version:        0.07
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Expression support extension for HTML::Template
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Steven Pritchard <steve at kspei.com> 0.07-3
+- Rebuild.
+
 * Wed Aug 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-2
 - Fix order of arguments to find(1).
 



From fedora-extras-commits at redhat.com  Fri Oct 20 00:57:14 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:57:14 -0700
Subject: rpms/perl-Cache-Mmap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610200057.k9K0vEv8009440@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9433

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Cache-Mmap


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Cache-Mmap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 20 00:57:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:57:20 -0700
Subject: rpms/perl-Cache-Mmap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610200057.k9K0vKuv009456@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9433/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Cache-Mmap


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 20 00:59:21 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:59:21 -0700
Subject: rpms/perl-Cache-Mmap import.log,1.1,1.2
Message-ID: <200610200059.k9K0xL2i009565@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9533

Modified Files:
	import.log 
Log Message:
auto-import perl-Cache-Mmap-0.09-1 on branch devel from perl-Cache-Mmap-0.09-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Mmap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Oct 2006 00:57:14 -0000	1.1
+++ import.log	20 Oct 2006 00:58:51 -0000	1.2
@@ -0,0 +1 @@
+perl-Cache-Mmap-0_09-1:HEAD:perl-Cache-Mmap-0.09-1.src.rpm:1161305903



From fedora-extras-commits at redhat.com  Fri Oct 20 00:59:22 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 17:59:22 -0700
Subject: rpms/perl-Cache-Mmap/devel perl-Cache-Mmap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610200059.k9K0xMwk009569@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Cache-Mmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9533/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Cache-Mmap.spec 
Log Message:
auto-import perl-Cache-Mmap-0.09-1 on branch devel from perl-Cache-Mmap-0.09-1.src.rpm


--- NEW FILE perl-Cache-Mmap.spec ---
Name:           perl-Cache-Mmap
Version:        0.09
Release:        1%{?dist}
Summary:        Shared data cache using memory mapped files
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Cache-Mmap/
Source0:        http://www.cpan.org/authors/id/P/PM/PMH/Cache-Mmap-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements a shared data cache, using memory mapped files. If
routines are provided which interact with the underlying data, access to
the cache is completely transparent, and the module handles all the details
of refreshing cache contents, and updating underlying data, if necessary.

%prep
%setup -q -n Cache-Mmap-%{version}
chmod a-x cmmtest

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes cmmtest README Todo
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Cache*
%{_mandir}/man3/*

%changelog
* Tue Oct 17 2006 Steven Pritchard <steve at kspei.com> 0.09-1
- Specfile autogenerated by cpanspec 1.69.1.
- Fix License.
- Drop execute bits on cmmtest (included as documentation).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Mmap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2006 00:57:20 -0000	1.1
+++ .cvsignore	20 Oct 2006 00:58:51 -0000	1.2
@@ -0,0 +1 @@
+Cache-Mmap-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Mmap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2006 00:57:20 -0000	1.1
+++ sources	20 Oct 2006 00:58:51 -0000	1.2
@@ -0,0 +1 @@
+fef44673771a0f1f14982ae719f57221  Cache-Mmap-0.09.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 01:04:35 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Oct 2006 18:04:35 -0700
Subject: owners owners.list,1.1856,1.1857
Message-ID: <200610200104.k9K14Zf4012522@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12506

Modified Files:
	owners.list 
Log Message:
Add perl-Cache-Mmap.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1856
retrieving revision 1.1857
diff -u -r1.1856 -r1.1857
--- owners.list	20 Oct 2006 00:48:34 -0000	1.1856
+++ owners.list	20 Oct 2006 01:04:04 -0000	1.1857
@@ -1254,6 +1254,7 @@
 Fedora Extras|perl-Business-Hours|Calculate business hours in a time period|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache|The Cache interfacel|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Cache-Mmap|Shared data cache using memory mapped files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache-Simple-TimedExpiry|Cache::Simple::TimedExpiry Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cairo|Perl interface to the cairo library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Calendar-Simple|Perl extension to create simple calendars|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Oct 20 01:19:10 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 18:19:10 -0700
Subject: rpms/skstream/devel .cvsignore, 1.2, 1.3 skstream.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200610200119.k9K1JAXj012695@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/skstream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12675

Modified Files:
	.cvsignore skstream.spec sources 
Log Message:
Update to 0.3.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skstream/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jul 2006 23:05:13 -0000	1.2
+++ .cvsignore	20 Oct 2006 01:18:39 -0000	1.3
@@ -1 +1 @@
-skstream-0.3.5.tar.gz
+skstream-0.3.6.tar.gz


Index: skstream.spec
===================================================================
RCS file: /cvs/extras/rpms/skstream/devel/skstream.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skstream.spec	28 Aug 2006 15:25:05 -0000	1.3
+++ skstream.spec	20 Oct 2006 01:18:39 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           skstream
-Version:        0.3.5
-Release:        4%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        C++ I/O library for WorldForge clients/servers
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://worldforge.org/dev/eng/libraries/skstream
-Source0:        http///dl.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cppunit-devel
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 0.3.6-1
+- Update to 0.3.6
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> 0.3.5-4
 - Rebuild for Fedora Extras
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skstream/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jul 2006 23:05:13 -0000	1.2
+++ sources	20 Oct 2006 01:18:39 -0000	1.3
@@ -1 +1 @@
-0c5ec89551bc0900b2e708992f321794  skstream-0.3.5.tar.gz
+eb135ad0c20fc6b0ac32fcc6c0c6671a  skstream-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 01:38:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 18:38:51 -0700
Subject: rpms/eris/devel eris.spec,1.7,1.8
Message-ID: <200610200138.k9K1cpNk012861@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/eris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12842

Modified Files:
	eris.spec 
Log Message:
Rebuild for newer version of skstream




Index: eris.spec
===================================================================
RCS file: /cvs/extras/rpms/eris/devel/eris.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eris.spec	28 Aug 2006 01:24:38 -0000	1.7
+++ eris.spec	20 Oct 2006 01:38:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           eris
 Version:        1.3.11
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Client-side session layer for Atlas-C++
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Wart <wart at kobold.org> 1.3.11-9
+- Rebuild for newer version of skstream
+
 * Sun Aug 27 2006 Wart <wart at kobold.org> 1.3.11-8
 - Rebuild for newer version of wfmath
 



From fedora-extras-commits at redhat.com  Fri Oct 20 01:42:21 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 19 Oct 2006 18:42:21 -0700
Subject: rpms/cyphesis/devel .cvsignore, 1.2, 1.3 cyphesis.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610200142.k9K1gLCO012973@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/cyphesis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12948

Modified Files:
	.cvsignore cyphesis.spec sources 
Log Message:
Update to 0.5.10




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2006 15:28:29 -0000	1.2
+++ .cvsignore	20 Oct 2006 01:41:50 -0000	1.3
@@ -1 +1 @@
-cyphesis-0.5.9.tar.gz
+cyphesis-0.5.10.tar.gz


Index: cyphesis.spec
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyphesis.spec	31 Aug 2006 15:28:29 -0000	1.1
+++ cyphesis.spec	20 Oct 2006 01:41:50 -0000	1.2
@@ -2,8 +2,8 @@
 %define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
 
 Name:           cyphesis
-Version:        0.5.9
-Release:        2%{?dist}
+Version:        0.5.10
+Release:        1%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 License:        GPL
@@ -12,18 +12,12 @@
 Source1:        cyphesis.te
 Source2:        cyphesis.if
 Source3:        cyphesis.fc
-Patch0:         cyphesis-0.5.8-postgresinit.patch
-Patch1:         cyphesis-0.5.8-init.patch
+Patch0:         cyphesis-0.5.8-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
 BuildRequires:  varconf-devel libsigc++20-devel mercator-devel skstream-devel
 BuildRequires:  postgresql-devel readline-devel avahi-devel
-
-%if "%{?fedora}" == "5"
-BuildRequires:  checkpolicy selinux-policy >= 2.2.40 m4 hardlink
-%else
 BuildRequires:  checkpolicy selinux-policy-devel hardlink
-%endif
 
 %if "%{selinux_policyver}" != ""
 Requires:       selinux-policy >= %{selinux_policyver}
@@ -56,15 +50,7 @@
 
 %prep
 %setup -q
-
-# It seems that the behavior of the postgres command 'createuser' 
-# became more interactive in FC6.  We need to update the
-# command line arguments to make it shut up.
-%if 0%{?fedora} >= 6
 %patch0
-%endif
-
-%patch1
 
 chmod a-x rulesets/basic/world/objects/*/*.py
 chmod a-x rulesets/basic/mind/dictlist.py


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2006 15:28:29 -0000	1.2
+++ sources	20 Oct 2006 01:41:50 -0000	1.3
@@ -1 +1 @@
-afb0a55d508b85e6152c4169caa432ff  cyphesis-0.5.9.tar.gz
+60879c8b91a19f572230f31d64b832e5  cyphesis-0.5.10.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 04:18:12 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 19 Oct 2006 21:18:12 -0700
Subject: rpms/liferea/FC-5 .cvsignore, 1.34, 1.35 liferea.spec, 1.47,
	1.48 sources, 1.35, 1.36
Message-ID: <200610200418.k9K4ICNn022538@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22518

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
- Update to 1.0.24.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	18 Sep 2006 16:35:06 -0000	1.34
+++ .cvsignore	20 Oct 2006 04:17:41 -0000	1.35
@@ -1 +1 @@
-liferea-1.0.23.tar.gz
+liferea-1.0.24.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- liferea.spec	18 Sep 2006 16:35:06 -0000	1.47
+++ liferea.spec	20 Oct 2006 04:17:41 -0000	1.48
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.23
+Version:        1.0.24
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -54,7 +54,6 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
@@ -108,6 +107,9 @@
 
 
 %changelog
+* Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
+- Update to 1.0.24.
+
 * Mon Sep 18 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.23-1
 - Update to 1.0.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	18 Sep 2006 16:35:06 -0000	1.35
+++ sources	20 Oct 2006 04:17:41 -0000	1.36
@@ -1 +1 @@
-a29a9ecb2fe2ea2b7eac44795b5d3bc4  liferea-1.0.23.tar.gz
+f872d4ffd483cdcd4fe1f56dc86d5407  liferea-1.0.24.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 07:17:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 00:17:52 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.27, 1.28 sources, 1.28,
	1.29 sylpheed-claws.spec, 1.53, 1.54
Message-ID: <200610200717.k9K7HqU1032068@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32047

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	12 Oct 2006 15:30:14 -0000	1.27
+++ .cvsignore	20 Oct 2006 07:17:22 -0000	1.28
@@ -1 +1 @@
-sylpheed-claws-2.5.5.tar.bz2
+sylpheed-claws-2.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Oct 2006 15:30:14 -0000	1.28
+++ sources	20 Oct 2006 07:17:22 -0000	1.29
@@ -1 +1 @@
-ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2
+f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sylpheed-claws.spec	12 Oct 2006 15:30:14 -0000	1.53
+++ sylpheed-claws.spec	20 Oct 2006 07:17:22 -0000	1.54
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.5
+Version:        2.5.6
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Thu Oct 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.6-1
+- version upgrade
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Oct 20 07:25:16 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 20 Oct 2006 00:25:16 -0700
Subject: rpms/audacious/devel audacious.spec,1.10,1.11
Message-ID: <200610200725.k9K7PGBO032148@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32132

Modified Files:
	audacious.spec 
Log Message:
- Add Obsoletes/Provides for BMP


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- audacious.spec	6 Sep 2006 20:17:34 -0000	1.10
+++ audacious.spec	20 Oct 2006 07:24:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -36,6 +36,9 @@
 Requires(post):  desktop-file-utils >= 0.9, /sbin/ldconfig
 Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
 
+Obsoletes:      bmp <= 0.9.7.1, bmp-flac2 <= 009
+Provides:       bmp = 0.9.7.1, bmp-flac2 = 009
+
 %description
 Audacious is a media player that currently uses a skinned
 user interface based on Winamp 2.x skins. It is based on ("forked off")
@@ -48,6 +51,9 @@
 Requires:       glib2-devel gtk2-devel gnome-vfs2-devel GConf2-devel
 Requires:       pkgconfig
 
+Obsoletes:      bmp-devel <= 0.9.7.1
+Provides:       bmp-devel = 0.9.7.1
+
 %description    devel
 Development files for Audacious
 
@@ -203,6 +209,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-2.fc6
+- Add Obsoletes/Provides for BMP
+
 * Wed Sep 06 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.2-1.fc6
 - Update to 1.1.2
 



From fedora-extras-commits at redhat.com  Fri Oct 20 08:15:18 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Fri, 20 Oct 2006 01:15:18 -0700
Subject: rpms/gcin/devel .cvsignore, 1.7, 1.8 gcin.spec, 1.10,
	1.11 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <200610200815.k9K8FItf002911@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2884

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:13:47 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:14:47 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	9 Oct 2006 01:13:47 -0000	1.10
+++ gcin.spec	20 Oct 2006 08:14:47 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -34,6 +34,9 @@
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
+echo "#!/bin/bash" > scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +51,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +100,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
  - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:14:47 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:13:47 -0000	1.7
+++ sources	20 Oct 2006 08:14:47 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 08:17:58 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Fri, 20 Oct 2006 01:17:58 -0700
Subject: rpms/gcin/FC-5 .cvsignore, 1.7, 1.8 gcin.spec, 1.10,
	1.11 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <200610200817.k9K8Hw1o002996@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2969

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:15:50 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:17:28 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	9 Oct 2006 01:15:50 -0000	1.10
+++ gcin.spec	20 Oct 2006 08:17:28 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -34,6 +34,9 @@
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
+echo "#!/bin/bash" > scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +51,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +100,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
 - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:17:28 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:15:50 -0000	1.7
+++ sources	20 Oct 2006 08:17:28 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 08:21:49 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 01:21:49 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.23, 1.24 sources, 1.24,
	1.25 sylpheed-claws.spec, 1.47, 1.48
Message-ID: <200610200821.k9K8LnPS003105@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	12 Oct 2006 15:30:12 -0000	1.23
+++ .cvsignore	20 Oct 2006 08:21:19 -0000	1.24
@@ -1 +1 @@
-sylpheed-claws-2.5.5.tar.bz2
+sylpheed-claws-2.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Oct 2006 15:30:12 -0000	1.24
+++ sources	20 Oct 2006 08:21:19 -0000	1.25
@@ -1 +1 @@
-ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2
+f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sylpheed-claws.spec	12 Oct 2006 15:30:12 -0000	1.47
+++ sylpheed-claws.spec	20 Oct 2006 08:21:19 -0000	1.48
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        2.5.5
+Version:        2.5.6
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -179,6 +179,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.6-1
+- version upgrade
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Oct 20 08:21:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 01:21:50 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.27, 1.28 sources, 1.28,
	1.29 sylpheed-claws.spec, 1.52, 1.53
Message-ID: <200610200821.k9K8LoYh003110@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	12 Oct 2006 15:30:13 -0000	1.27
+++ .cvsignore	20 Oct 2006 08:21:20 -0000	1.28
@@ -1 +1 @@
-sylpheed-claws-2.5.5.tar.bz2
+sylpheed-claws-2.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Oct 2006 15:30:13 -0000	1.28
+++ sources	20 Oct 2006 08:21:20 -0000	1.29
@@ -1 +1 @@
-ebd7e3cd97e58cb54558d5d2f7cfcf81  sylpheed-claws-2.5.5.tar.bz2
+f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sylpheed-claws.spec	12 Oct 2006 15:30:13 -0000	1.52
+++ sylpheed-claws.spec	20 Oct 2006 08:21:20 -0000	1.53
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.5
+Version:        2.5.6
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.5.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -168,6 +168,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.6-1
+- version upgrade
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Oct 20 08:22:45 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Fri, 20 Oct 2006 01:22:45 -0700
Subject: rpms/gcin/FC-4 .cvsignore, 1.7, 1.8 gcin.spec, 1.11,
	1.12 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <200610200822.k9K8MjDp003226@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3154

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:17:28 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:22:14 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	9 Oct 2006 01:17:28 -0000	1.11
+++ gcin.spec	20 Oct 2006 08:22:14 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -12,7 +12,6 @@
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
-Patch4:         gcin-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -29,11 +28,13 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
-%patch4 -p1 -b .x86_64
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
+echo "#!/bin/bash" > scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +49,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +98,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
 - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:22:14 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:17:28 -0000	1.7
+++ sources	20 Oct 2006 08:22:14 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 08:32:08 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Fri, 20 Oct 2006 01:32:08 -0700
Subject: rpms/gcin/FC-3 .cvsignore, 1.7, 1.8 gcin.spec, 1.10,
	1.11 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <200610200832.k9K8W8Ze003403@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3372

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:18:27 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:31:38 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	9 Oct 2006 01:18:27 -0000	1.10
+++ gcin.spec	20 Oct 2006 08:31:38 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -12,7 +12,6 @@
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
-Patch4:         gcin-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -29,11 +28,13 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
-%patch4 -p1 -b .x86_64
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
+echo "#!/bin/bash" > scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
+cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +49,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +98,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
 - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:31:38 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:18:27 -0000	1.7
+++ sources	20 Oct 2006 08:31:38 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 09:48:18 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 02:48:18 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.16, 
	1.17
Message-ID: <200610200948.k9K9mI7T006985@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6935/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sylpheed-claws-plugins.spec	12 Oct 2006 17:09:52 -0000	1.16
+++ sylpheed-claws-plugins.spec	20 Oct 2006 09:47:48 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-4
+- rebuild
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-3
 - rebuild



From fedora-extras-commits at redhat.com  Fri Oct 20 09:48:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 02:48:19 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.21, 
	1.22
Message-ID: <200610200948.k9K9mJUc006988@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6935/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sylpheed-claws-plugins.spec	12 Oct 2006 17:09:53 -0000	1.21
+++ sylpheed-claws-plugins.spec	20 Oct 2006 09:47:49 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-4
+- rebuild
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-3
 - rebuild



From fedora-extras-commits at redhat.com  Fri Oct 20 09:48:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 02:48:20 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.22,
	1.23
Message-ID: <200610200948.k9K9mKNq006991@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6935/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sylpheed-claws-plugins.spec	12 Oct 2006 17:09:54 -0000	1.22
+++ sylpheed-claws-plugins.spec	20 Oct 2006 09:47:50 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.5.2-4
+- rebuild
+
 * Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.5.2-3
 - rebuild



From fedora-extras-commits at redhat.com  Fri Oct 20 10:06:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:06:43 -0700
Subject: rpms/libopensync/FC-3 .cvsignore, 1.2, 1.3 libopensync-rpath.patch, 
	1.1, 1.2 libopensync.spec, 1.4, 1.5 sources, 1.2,
	1.3 libopensync-configure.patch, 1.1, NONE
Message-ID: <200610201006.k9KA6h8N010249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/FC-3

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:12 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:12 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync.spec	13 Dec 2005 13:46:20 -0000	1.4
+++ libopensync.spec	20 Oct 2006 10:06:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,7 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -19,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -42,7 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -51,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -100,10 +101,15 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-5
 - change handling of ld.so.conf files
 - patch configure for x86_64 python
+- add wrapper compile patch (no Werror)
 
 * Sun Dec 11 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:12 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:06:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:06:44 -0700
Subject: rpms/libopensync/FC-4 .cvsignore, 1.2, 1.3 libopensync-rpath.patch, 
	1.1, 1.2 libopensync.spec, 1.4, 1.5 sources, 1.2,
	1.3 libopensync-configure.patch, 1.1, NONE
Message-ID: <200610201006.k9KA6iI9010258@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/FC-4

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:13 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:13 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync.spec	13 Dec 2005 13:46:26 -0000	1.4
+++ libopensync.spec	20 Oct 2006 10:06:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,7 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -19,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -42,7 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -51,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -100,10 +101,15 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-5
 - change handling of ld.so.conf files
 - patch configure for x86_64 python
+- add wrapper compile patch (no Werror)
 
 * Sun Dec 11 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:13 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:06:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:06:44 -0700
Subject: rpms/libopensync/FC-5 .cvsignore, 1.2, 1.3 libopensync-rpath.patch, 
	1.1, 1.2 libopensync.spec, 1.6, 1.7 sources, 1.2,
	1.3 libopensync-configure.patch, 1.1,
	NONE libopensync-wrapper.patch, 1.1, NONE
Message-ID: <200610201006.k9KA6iI9010267@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/FC-5

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch libopensync-wrapper.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:14 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:14 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/libopensync.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libopensync.spec	15 Feb 2006 08:38:13 -0000	1.6
+++ libopensync.spec	20 Oct 2006 10:06:14 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        6%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,8 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
-Patch2:         libopensync-wrapper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -20,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -43,8 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
-%patch2
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -53,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -86,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -102,6 +101,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-6
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:14 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---


--- libopensync-wrapper.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:06:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:06:45 -0700
Subject: rpms/libopensync/devel .cvsignore, 1.2, 1.3 libopensync-rpath.patch,
	1.1, 1.2 libopensync.spec, 1.7, 1.8 sources, 1.2,
	1.3 libopensync-configure.patch, 1.1,
	NONE libopensync-wrapper.patch, 1.1, NONE
Message-ID: <200610201006.k9KA6j7o010276@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/devel

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch libopensync-wrapper.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:15 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:15 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync.spec	13 Sep 2006 11:42:46 -0000	1.7
+++ libopensync.spec	20 Oct 2006 10:06:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        7%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,8 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
-Patch2:         libopensync-wrapper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -20,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -43,8 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
-%patch2
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -53,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -86,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -102,6 +101,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-7
 - FE6 rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:15 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---


--- libopensync-wrapper.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:29:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:29:26 -0700
Subject: rpms/libopensync/FC-5 libopensync.spec,1.7,1.8
Message-ID: <200610201029.k9KATQ2E010629@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567/FC-5

Modified Files:
	libopensync.spec 
Log Message:
- fix BR



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-5/libopensync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync.spec	20 Oct 2006 10:06:14 -0000	1.7
+++ libopensync.spec	20 Oct 2006 10:28:56 -0000	1.8
@@ -19,6 +19,8 @@
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 OpenSync is a synchronization framework that is platform and distribution



From fedora-extras-commits at redhat.com  Fri Oct 20 10:29:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:29:24 -0700
Subject: rpms/libopensync/FC-3 libopensync.spec,1.5,1.6
Message-ID: <200610201029.k9KATOi4010625@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567/FC-3

Modified Files:
	libopensync.spec 
Log Message:
- fix BR



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync.spec	20 Oct 2006 10:06:12 -0000	1.5
+++ libopensync.spec	20 Oct 2006 10:28:54 -0000	1.6
@@ -19,6 +19,8 @@
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 OpenSync is a synchronization framework that is platform and distribution



From fedora-extras-commits at redhat.com  Fri Oct 20 10:29:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:29:25 -0700
Subject: rpms/libopensync/FC-4 libopensync.spec,1.5,1.6
Message-ID: <200610201029.k9KATP4Y010628@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567/FC-4

Modified Files:
	libopensync.spec 
Log Message:
- fix BR



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync.spec	20 Oct 2006 10:06:13 -0000	1.5
+++ libopensync.spec	20 Oct 2006 10:28:55 -0000	1.6
@@ -19,6 +19,8 @@
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 OpenSync is a synchronization framework that is platform and distribution



From fedora-extras-commits at redhat.com  Fri Oct 20 10:29:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:29:27 -0700
Subject: rpms/libopensync/devel libopensync.spec,1.8,1.9
Message-ID: <200610201029.k9KATRkV010632@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10567/devel

Modified Files:
	libopensync.spec 
Log Message:
- fix BR



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libopensync.spec	20 Oct 2006 10:06:15 -0000	1.8
+++ libopensync.spec	20 Oct 2006 10:28:56 -0000	1.9
@@ -19,6 +19,8 @@
 BuildRequires:  swig
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 OpenSync is a synchronization framework that is platform and distribution



From fedora-extras-commits at redhat.com  Fri Oct 20 10:58:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:58:20 -0700
Subject: rpms/multisync/FC-4 .cvsignore, 1.2, 1.3 multisync-rpath.patch, 1.1,
	1.2 multisync.spec, 1.2, 1.3 sources, 1.2,
	1.3 multisync-gui-svn151.patch, 1.1, NONE multisync-tool.patch,
	1.1, NONE multisync-werror.patch, 1.1, NONE
Message-ID: <200610201058.k9KAwKwd011023@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/FC-4

Modified Files:
	.cvsignore multisync-rpath.patch multisync.spec sources 
Removed Files:
	multisync-gui-svn151.patch multisync-tool.patch 
	multisync-werror.patch 
Log Message:
- version upgrade
- should fix #187288,#187319,#188250,#196412



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2006 09:11:47 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:57:50 -0000	1.3
@@ -1 +1,2 @@
-multisync-0.90.18.tar.gz
+multisync-gui-0.90.19.tar.gz
+msynctool-0.19.tar.gz

multisync-rpath.patch:

Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/multisync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisync-rpath.patch	13 Mar 2006 09:11:47 -0000	1.1
+++ multisync-rpath.patch	20 Oct 2006 10:57:50 -0000	1.2
@@ -1,6 +1,24 @@
---- tools/Makefile.am.orig	2005-11-29 14:43:23.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 14:46:18.000000000 +0100
-@@ -1,13 +1,13 @@
+--- msynctool-0.19/tools/Makefile.in.orig	2006-10-20 12:42:27.000000000 +0200
++++ msynctool-0.19/tools/Makefile.in	2006-10-20 12:43:04.000000000 +0200
+@@ -181,12 +181,12 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(top_srcdir)
+ INCLUDES = @PACKAGE_CFLAGS@
+ msynctool_SOURCES = msynctool.c
+-msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++msynctool_LDFLAGS = @PACKAGE_LIBS@
+ convcard_SOURCES = convcard.c
+-convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convcard_LDFLAGS = @PACKAGE_LIBS@
+ man_MANS = convcard.1 msynctool.1
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
+--- msynctool-0.19/tools/Makefile.am.orig	2006-10-20 12:42:24.000000000 +0200
++++ msynctool-0.19/tools/Makefile.am	2006-10-20 12:42:45.000000000 +0200
+@@ -1,16 +1,16 @@
  ## Process this file with automake to produce Makefile.in
  
 -AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
@@ -16,5 +34,7 @@
  
  convcard_SOURCES = convcard.c
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
-\ No newline at end of file
 +convcard_LDFLAGS = @PACKAGE_LIBS@
+ 
+ man_MANS = convcard.1 msynctool.1
+ 


Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/multisync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multisync.spec	17 Mar 2006 10:58:01 -0000	1.2
+++ multisync.spec	20 Oct 2006 10:57:50 -0000	1.3
@@ -1,19 +1,16 @@
 Name:           multisync
-Version:        0.90.18
-Release:        5%{?dist}
+Version:        0.90.19
+Release:        1%{?dist}
 Summary:        Calendar (and other PIM data) synchronization program
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-gui-%{version}.tar.gz
 Source1:        %{name}.desktop
+Source2:        msynctool-0.19.tar.gz
 Patch0:         multisync-rpath.patch
-# this is svn151 with a few fixes
-Patch1:         multisync-gui-svn151.patch
-Patch2:         multisync-werror.patch
-Patch3:         multisync-tool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -22,12 +19,15 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
 BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 MultiSync is a program to synchronize calendars, addressbooks and other PIM
 data between programs on your computer and other computers, mobile devices,
 PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC
 mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup.
+For proper use, please install the desired plugins found in the
+libopensync-plugin-* packages.
 
 %package gui
 Summary:  GUI interface for multisync
@@ -38,37 +38,31 @@
 Graphical User Interface for multisync
 
 %prep
-%setup -q
+%setup -q -n multisync-gui-%{version}
+tar xzvf %{SOURCE2}
 %patch0
-%patch1
-%patch2
-%patch3 -p1
 
 %build
 # both don't like smp flags so disable them for now
 
-NOCONFIGURE=true ./autogen.sh
-%configure --disable-static
+%configure --disable-static --disable-rpath
 %{__make}
 
 # build gui
-cd gui
-autoreconf -sfi 
+cd msynctool-0.19
 %configure --disable-static --disable-rpath
-# if we don't do a make clean here we only get a segfaulting binary
-%{__make} clean
 %{__make}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
-cd gui
+cd msynctool-0.19
 %makeinstall
 
-mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
-
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
+
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -80,17 +74,24 @@
 
 %files
 %defattr(-, root, root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc msynctool-0.19/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
 %{_bindir}/convcard
 %{_bindir}/msynctool
+%{_mandir}/man1/convcard*
+%{_mandir}/man1/msynctool*
 
 %files gui
 %defattr(-, root, root,-)
-%doc COPYING
+%doc AUTHORS COPYING ChangeLog README COPYING
 %{_bindir}/multisync
 %{_datadir}/applications/*desktop
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.90.19-1
+- version upgrade
+- should fix #187288,#187319,#196412
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.90.18-5
 - fix #185631


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2006 09:11:47 -0000	1.2
+++ sources	20 Oct 2006 10:57:50 -0000	1.3
@@ -1 +1,2 @@
-d55d8eaeecb825b87a25eeceaef92cb9  multisync-0.90.18.tar.gz
+57bfe0f3375c8d6d5a86cb861d1eeeea  multisync-gui-0.90.19.tar.gz
+5c7728254f2d634051af603e7d467832  msynctool-0.19.tar.gz


--- multisync-gui-svn151.patch DELETED ---


--- multisync-tool.patch DELETED ---


--- multisync-werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:58:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:58:21 -0700
Subject: rpms/multisync/FC-5 .cvsignore, 1.2, 1.3 multisync-rpath.patch, 1.1,
	1.2 multisync.spec, 1.2, 1.3 sources, 1.2,
	1.3 multisync-gui-svn151.patch, 1.1, NONE multisync-tool.patch,
	1.1, NONE multisync-werror.patch, 1.1, NONE
Message-ID: <200610201058.k9KAwLGi011032@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/FC-5

Modified Files:
	.cvsignore multisync-rpath.patch multisync.spec sources 
Removed Files:
	multisync-gui-svn151.patch multisync-tool.patch 
	multisync-werror.patch 
Log Message:
- version upgrade
- should fix #187288,#187319,#188250,#196412



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2006 09:11:47 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:57:51 -0000	1.3
@@ -1 +1,2 @@
-multisync-0.90.18.tar.gz
+multisync-gui-0.90.19.tar.gz
+msynctool-0.19.tar.gz

multisync-rpath.patch:

Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/multisync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisync-rpath.patch	13 Mar 2006 09:11:47 -0000	1.1
+++ multisync-rpath.patch	20 Oct 2006 10:57:51 -0000	1.2
@@ -1,6 +1,24 @@
---- tools/Makefile.am.orig	2005-11-29 14:43:23.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 14:46:18.000000000 +0100
-@@ -1,13 +1,13 @@
+--- msynctool-0.19/tools/Makefile.in.orig	2006-10-20 12:42:27.000000000 +0200
++++ msynctool-0.19/tools/Makefile.in	2006-10-20 12:43:04.000000000 +0200
+@@ -181,12 +181,12 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(top_srcdir)
+ INCLUDES = @PACKAGE_CFLAGS@
+ msynctool_SOURCES = msynctool.c
+-msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++msynctool_LDFLAGS = @PACKAGE_LIBS@
+ convcard_SOURCES = convcard.c
+-convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convcard_LDFLAGS = @PACKAGE_LIBS@
+ man_MANS = convcard.1 msynctool.1
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
+--- msynctool-0.19/tools/Makefile.am.orig	2006-10-20 12:42:24.000000000 +0200
++++ msynctool-0.19/tools/Makefile.am	2006-10-20 12:42:45.000000000 +0200
+@@ -1,16 +1,16 @@
  ## Process this file with automake to produce Makefile.in
  
 -AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
@@ -16,5 +34,7 @@
  
  convcard_SOURCES = convcard.c
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
-\ No newline at end of file
 +convcard_LDFLAGS = @PACKAGE_LIBS@
+ 
+ man_MANS = convcard.1 msynctool.1
+ 


Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/multisync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multisync.spec	17 Mar 2006 10:58:08 -0000	1.2
+++ multisync.spec	20 Oct 2006 10:57:51 -0000	1.3
@@ -1,19 +1,16 @@
 Name:           multisync
-Version:        0.90.18
-Release:        5%{?dist}
+Version:        0.90.19
+Release:        1%{?dist}
 Summary:        Calendar (and other PIM data) synchronization program
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-gui-%{version}.tar.gz
 Source1:        %{name}.desktop
+Source2:        msynctool-0.19.tar.gz
 Patch0:         multisync-rpath.patch
-# this is svn151 with a few fixes
-Patch1:         multisync-gui-svn151.patch
-Patch2:         multisync-werror.patch
-Patch3:         multisync-tool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -21,13 +18,18 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
+BuildRequires:  libopensync-plugin-gpe-devel
+BuildRequires:  libopensync-plugin-palm-devel
 BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 MultiSync is a program to synchronize calendars, addressbooks and other PIM
 data between programs on your computer and other computers, mobile devices,
 PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC
 mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup.
+For proper use, please install the desired plugins found in the
+libopensync-plugin-* packages.
 
 %package gui
 Summary:  GUI interface for multisync
@@ -38,37 +40,31 @@
 Graphical User Interface for multisync
 
 %prep
-%setup -q
+%setup -q -n multisync-gui-%{version}
+tar xzvf %{SOURCE2}
 %patch0
-%patch1
-%patch2
-%patch3 -p1
 
 %build
 # both don't like smp flags so disable them for now
 
-NOCONFIGURE=true ./autogen.sh
-%configure --disable-static
+%configure --disable-static --disable-rpath
 %{__make}
 
 # build gui
-cd gui
-autoreconf -sfi 
+cd msynctool-0.19
 %configure --disable-static --disable-rpath
-# if we don't do a make clean here we only get a segfaulting binary
-%{__make} clean
 %{__make}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
-cd gui
+cd msynctool-0.19
 %makeinstall
 
-mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
-
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
+
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -80,17 +76,24 @@
 
 %files
 %defattr(-, root, root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc msynctool-0.19/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
 %{_bindir}/convcard
 %{_bindir}/msynctool
+%{_mandir}/man1/convcard*
+%{_mandir}/man1/msynctool*
 
 %files gui
 %defattr(-, root, root,-)
-%doc COPYING
+%doc AUTHORS COPYING ChangeLog README COPYING
 %{_bindir}/multisync
 %{_datadir}/applications/*desktop
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.90.19-1
+- version upgrade
+- should fix #187288,#187319,#196412
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.90.18-5
 - fix #185631


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2006 09:11:47 -0000	1.2
+++ sources	20 Oct 2006 10:57:51 -0000	1.3
@@ -1 +1,2 @@
-d55d8eaeecb825b87a25eeceaef92cb9  multisync-0.90.18.tar.gz
+57bfe0f3375c8d6d5a86cb861d1eeeea  multisync-gui-0.90.19.tar.gz
+5c7728254f2d634051af603e7d467832  msynctool-0.19.tar.gz


--- multisync-gui-svn151.patch DELETED ---


--- multisync-tool.patch DELETED ---


--- multisync-werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 10:58:22 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 03:58:22 -0700
Subject: rpms/multisync/devel .cvsignore, 1.2, 1.3 multisync-rpath.patch, 1.1,
	1.2 multisync.spec, 1.4, 1.5 sources, 1.2,
	1.3 multisync-gui-svn151.patch, 1.1, NONE multisync-tool.patch,
	1.1, NONE multisync-werror.patch, 1.1, NONE
Message-ID: <200610201058.k9KAwMbF011041@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/devel

Modified Files:
	.cvsignore multisync-rpath.patch multisync.spec sources 
Removed Files:
	multisync-gui-svn151.patch multisync-tool.patch 
	multisync-werror.patch 
Log Message:
- version upgrade
- should fix #187288,#187319,#188250,#196412



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2006 09:11:47 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:57:52 -0000	1.3
@@ -1 +1,2 @@
-multisync-0.90.18.tar.gz
+multisync-gui-0.90.19.tar.gz
+msynctool-0.19.tar.gz

multisync-rpath.patch:

Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/multisync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisync-rpath.patch	13 Mar 2006 09:11:47 -0000	1.1
+++ multisync-rpath.patch	20 Oct 2006 10:57:52 -0000	1.2
@@ -1,6 +1,24 @@
---- tools/Makefile.am.orig	2005-11-29 14:43:23.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 14:46:18.000000000 +0100
-@@ -1,13 +1,13 @@
+--- msynctool-0.19/tools/Makefile.in.orig	2006-10-20 12:42:27.000000000 +0200
++++ msynctool-0.19/tools/Makefile.in	2006-10-20 12:43:04.000000000 +0200
+@@ -181,12 +181,12 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(top_srcdir)
+ INCLUDES = @PACKAGE_CFLAGS@
+ msynctool_SOURCES = msynctool.c
+-msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++msynctool_LDFLAGS = @PACKAGE_LIBS@
+ convcard_SOURCES = convcard.c
+-convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convcard_LDFLAGS = @PACKAGE_LIBS@
+ man_MANS = convcard.1 msynctool.1
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
+--- msynctool-0.19/tools/Makefile.am.orig	2006-10-20 12:42:24.000000000 +0200
++++ msynctool-0.19/tools/Makefile.am	2006-10-20 12:42:45.000000000 +0200
+@@ -1,16 +1,16 @@
  ## Process this file with automake to produce Makefile.in
  
 -AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
@@ -16,5 +34,7 @@
  
  convcard_SOURCES = convcard.c
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
-\ No newline at end of file
 +convcard_LDFLAGS = @PACKAGE_LIBS@
+ 
+ man_MANS = convcard.1 msynctool.1
+ 


Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/multisync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- multisync.spec	15 Sep 2006 06:38:27 -0000	1.4
+++ multisync.spec	20 Oct 2006 10:57:52 -0000	1.5
@@ -1,19 +1,16 @@
 Name:           multisync
-Version:        0.90.18
-Release:        6%{?dist}
+Version:        0.90.19
+Release:        1%{?dist}
 Summary:        Calendar (and other PIM data) synchronization program
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-gui-%{version}.tar.gz
 Source1:        %{name}.desktop
+Source2:        msynctool-0.19.tar.gz
 Patch0:         multisync-rpath.patch
-# this is svn151 with a few fixes
-Patch1:         multisync-gui-svn151.patch
-Patch2:         multisync-werror.patch
-Patch3:         multisync-tool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -29,6 +26,8 @@
 data between programs on your computer and other computers, mobile devices,
 PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC
 mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup.
+For proper use, please install the desired plugins found in the
+libopensync-plugin-* packages.
 
 %package gui
 Summary:  GUI interface for multisync
@@ -39,37 +38,31 @@
 Graphical User Interface for multisync
 
 %prep
-%setup -q
+%setup -q -n multisync-gui-%{version}
+tar xzvf %{SOURCE2}
 %patch0
-%patch1
-%patch2
-%patch3 -p1
 
 %build
 # both don't like smp flags so disable them for now
 
-NOCONFIGURE=true ./autogen.sh
-%configure --disable-static
+%configure --disable-static --disable-rpath
 %{__make}
 
 # build gui
-cd gui
-autoreconf -sfi 
+cd msynctool-0.19
 %configure --disable-static --disable-rpath
-# if we don't do a make clean here we only get a segfaulting binary
-%{__make} clean
 %{__make}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
-cd gui
+cd msynctool-0.19
 %makeinstall
 
-mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
-
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
+
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -81,17 +74,24 @@
 
 %files
 %defattr(-, root, root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc msynctool-0.19/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
 %{_bindir}/convcard
 %{_bindir}/msynctool
+%{_mandir}/man1/convcard*
+%{_mandir}/man1/msynctool*
 
 %files gui
 %defattr(-, root, root,-)
-%doc COPYING
+%doc AUTHORS COPYING ChangeLog README COPYING
 %{_bindir}/multisync
 %{_datadir}/applications/*desktop
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.90.19-1
+- version upgrade
+- should fix #187288,#187319,#196412
+
 * Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.90.18-6
 - FE6 rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2006 09:11:47 -0000	1.2
+++ sources	20 Oct 2006 10:57:52 -0000	1.3
@@ -1 +1,2 @@
-d55d8eaeecb825b87a25eeceaef92cb9  multisync-0.90.18.tar.gz
+57bfe0f3375c8d6d5a86cb861d1eeeea  multisync-gui-0.90.19.tar.gz
+5c7728254f2d634051af603e7d467832  msynctool-0.19.tar.gz


--- multisync-gui-svn151.patch DELETED ---


--- multisync-tool.patch DELETED ---


--- multisync-werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:07:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:07:06 -0700
Subject: rpms/libopensync-plugin-evolution2/FC-3 .cvsignore, 1.2,
	1.3 libopensync-plugin-evolution2.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201107.k9KB7691014276@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14203/FC-3

Modified Files:
	.cvsignore libopensync-plugin-evolution2.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:06:35 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-evolution2-0.18.tar.gz
+libopensync-plugin-evolution2-0.19.tar.gz


Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-3/libopensync-plugin-evolution2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-evolution2.spec	13 Dec 2005 14:57:50 -0000	1.2
+++ libopensync-plugin-evolution2.spec	20 Oct 2006 11:06:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:22:59 -0000	1.2
+++ sources	20 Oct 2006 11:06:35 -0000	1.3
@@ -1 +1 @@
-64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz
+c43a85a1d5ef3059eef8058b5ebe9f0a  libopensync-plugin-evolution2-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:07:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:07:06 -0700
Subject: rpms/libopensync-plugin-evolution2/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-evolution2.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201107.k9KB76qQ014279@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14203/FC-4

Modified Files:
	.cvsignore libopensync-plugin-evolution2.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:06:36 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-evolution2-0.18.tar.gz
+libopensync-plugin-evolution2-0.19.tar.gz


Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-4/libopensync-plugin-evolution2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-evolution2.spec	13 Dec 2005 14:57:50 -0000	1.2
+++ libopensync-plugin-evolution2.spec	20 Oct 2006 11:06:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:22:59 -0000	1.2
+++ sources	20 Oct 2006 11:06:36 -0000	1.3
@@ -1 +1 @@
-64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz
+c43a85a1d5ef3059eef8058b5ebe9f0a  libopensync-plugin-evolution2-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:07:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:07:07 -0700
Subject: rpms/libopensync-plugin-evolution2/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-evolution2.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200610201107.k9KB77KQ014284@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14203/FC-5

Modified Files:
	.cvsignore libopensync-plugin-evolution2.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:06:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-evolution2-0.18.tar.gz
+libopensync-plugin-evolution2-0.19.tar.gz


Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-5/libopensync-plugin-evolution2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync-plugin-evolution2.spec	21 Aug 2006 06:54:52 -0000	1.7
+++ libopensync-plugin-evolution2.spec	20 Oct 2006 11:06:37 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
-Version:        0.18
-Release:        8%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,11 +58,8 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
-* Mon Aug 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-8
-- bump
-
-* Fri Jun 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-7
-- bump
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
 
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-6
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:22:59 -0000	1.2
+++ sources	20 Oct 2006 11:06:37 -0000	1.3
@@ -1 +1 @@
-64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz
+c43a85a1d5ef3059eef8058b5ebe9f0a  libopensync-plugin-evolution2-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:07:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:07:08 -0700
Subject: rpms/libopensync-plugin-evolution2/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-evolution2.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200610201107.k9KB78m6014289@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14203/devel

Modified Files:
	.cvsignore libopensync-plugin-evolution2.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:06:38 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-evolution2-0.18.tar.gz
+libopensync-plugin-evolution2-0.19.tar.gz


Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/libopensync-plugin-evolution2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync-plugin-evolution2.spec	13 Sep 2006 13:20:22 -0000	1.7
+++ libopensync-plugin-evolution2.spec	20 Oct 2006 11:06:38 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
-Version:        0.18
-Release:        9%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-9
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:22:59 -0000	1.2
+++ sources	20 Oct 2006 11:06:38 -0000	1.3
@@ -1 +1 @@
-64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz
+c43a85a1d5ef3059eef8058b5ebe9f0a  libopensync-plugin-evolution2-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:24:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:24:26 -0700
Subject: rpms/libopensync-plugin-file/FC-3 .cvsignore, 1.2,
	1.3 libopensync-plugin-file.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201124.k9KBOQY7014691@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14589/FC-3

Modified Files:
	.cvsignore libopensync-plugin-file.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:23:56 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-file-0.18.tar.gz
+libopensync-plugin-file-0.19.tar.gz


Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-3/libopensync-plugin-file.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-file.spec	13 Dec 2005 15:09:38 -0000	1.2
+++ libopensync-plugin-file.spec	20 Oct 2006 11:23:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:28:03 -0000	1.2
+++ sources	20 Oct 2006 11:23:56 -0000	1.3
@@ -1 +1 @@
-a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz
+dad7ded0c3f5ec089e6efdb4bf5d7b4b  libopensync-plugin-file-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:24:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:24:27 -0700
Subject: rpms/libopensync-plugin-file/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-file.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201124.k9KBORYR014696@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14589/FC-4

Modified Files:
	.cvsignore libopensync-plugin-file.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:23:56 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-file-0.18.tar.gz
+libopensync-plugin-file-0.19.tar.gz


Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-4/libopensync-plugin-file.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-file.spec	13 Dec 2005 15:09:38 -0000	1.2
+++ libopensync-plugin-file.spec	20 Oct 2006 11:23:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:28:03 -0000	1.2
+++ sources	20 Oct 2006 11:23:56 -0000	1.3
@@ -1 +1 @@
-a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz
+dad7ded0c3f5ec089e6efdb4bf5d7b4b  libopensync-plugin-file-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:24:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:24:27 -0700
Subject: rpms/libopensync-plugin-file/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-file.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610201124.k9KBORWB014701@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14589/FC-5

Modified Files:
	.cvsignore libopensync-plugin-file.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:23:57 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-file-0.18.tar.gz
+libopensync-plugin-file-0.19.tar.gz


Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-5/libopensync-plugin-file.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-file.spec	16 Feb 2006 23:16:22 -0000	1.3
+++ libopensync-plugin-file.spec	20 Oct 2006 11:23:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
-Version:        0.18
-Release:        4%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:28:03 -0000	1.2
+++ sources	20 Oct 2006 11:23:57 -0000	1.3
@@ -1 +1 @@
-a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz
+dad7ded0c3f5ec089e6efdb4bf5d7b4b  libopensync-plugin-file-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:24:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:24:28 -0700
Subject: rpms/libopensync-plugin-file/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-file.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200610201124.k9KBOSK1014706@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14589/devel

Modified Files:
	.cvsignore libopensync-plugin-file.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:23:58 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-file-0.18.tar.gz
+libopensync-plugin-file-0.19.tar.gz


Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/libopensync-plugin-file.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-file.spec	13 Sep 2006 13:39:44 -0000	1.4
+++ libopensync-plugin-file.spec	20 Oct 2006 11:23:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-5
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:28:03 -0000	1.2
+++ sources	20 Oct 2006 11:23:58 -0000	1.3
@@ -1 +1 @@
-a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz
+dad7ded0c3f5ec089e6efdb4bf5d7b4b  libopensync-plugin-file-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:37:18 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 20 Oct 2006 04:37:18 -0700
Subject: rpms/quilt/devel .cvsignore, 1.7, 1.8 quilt.spec, 1.12, 1.13 sources,
	1.7, 1.8
Message-ID: <200610201137.k9KBbIG0015075@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15019/devel

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:
Update to latest quilt release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Apr 2006 16:24:14 -0000	1.7
+++ .cvsignore	20 Oct 2006 11:36:48 -0000	1.8
@@ -1 +1 @@
-quilt-0.45.tar.gz
+quilt-0.46.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/quilt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- quilt.spec	28 Aug 2006 00:24:23 -0000	1.12
+++ quilt.spec	20 Oct 2006 11:36:48 -0000	1.13
@@ -6,8 +6,8 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.45
-Release:	2%{?dist}
+Version:	0.46
+Release:	1%{?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)
@@ -61,6 +61,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 20 2006 - jwboyer at jdub.homelinux.org 0.46-1
+- Update to latest release
+
 * Sun Aug 27 2006 - jwboyer at jdub.homelinux.org 0.45-2
 - Bump and rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Apr 2006 16:24:14 -0000	1.7
+++ sources	20 Oct 2006 11:36:48 -0000	1.8
@@ -1 +1 @@
-5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz
+4508546d1ed0257ef7c128b6121b7208  quilt-0.46.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:37:17 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 20 Oct 2006 04:37:17 -0700
Subject: rpms/quilt/FC-5 .cvsignore, 1.7, 1.8 quilt.spec, 1.11, 1.12 sources,
	1.7, 1.8
Message-ID: <200610201137.k9KBbH5c015070@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15019/FC-5

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:
Update to latest quilt release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Apr 2006 16:24:14 -0000	1.7
+++ .cvsignore	20 Oct 2006 11:36:47 -0000	1.8
@@ -1 +1 @@
-quilt-0.45.tar.gz
+quilt-0.46.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/quilt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- quilt.spec	24 Apr 2006 16:24:14 -0000	1.11
+++ quilt.spec	20 Oct 2006 11:36:47 -0000	1.12
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.45
+Version:	0.46
 Release:	1%{?dist}
 Source:		http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz
 URL:		http://savannah.nongnu.org/projects/quilt
@@ -61,6 +61,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 20 2006 - jwboyer at jdub.homelinux.org 0.46-1
+- Update to latest release
+
 * Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Apr 2006 16:24:14 -0000	1.7
+++ sources	20 Oct 2006 11:36:47 -0000	1.8
@@ -1 +1 @@
-5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz
+4508546d1ed0257ef7c128b6121b7208  quilt-0.46.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:38:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:38:36 -0700
Subject: rpms/libopensync-plugin-gpe/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-gpe.spec, 1.1, 1.2 sources, 1.2,
	1.3 libopensync-plugin-gpe-Makefile.patch, 1.1, NONE
Message-ID: <200610201138.k9KBcaq6015215@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-gpe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123/FC-4

Modified Files:
	.cvsignore libopensync-plugin-gpe.spec sources 
Removed Files:
	libopensync-plugin-gpe-Makefile.patch 
Log Message:
- version upgade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Feb 2006 23:30:24 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:38:06 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-gpe-0.18.tar.gz
+libopensync-plugin-gpe-0.19.tar.gz


Index: libopensync-plugin-gpe.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-4/libopensync-plugin-gpe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-gpe.spec	27 Feb 2006 23:30:24 -0000	1.1
+++ libopensync-plugin-gpe.spec	20 Oct 2006 11:38:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-gpe
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        GPE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -58,6 +56,9 @@
 %{_includedir}/opensync-1.0/opensync/gpe_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Sun Feb 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - fix description
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Feb 2006 23:30:24 -0000	1.2
+++ sources	20 Oct 2006 11:38:06 -0000	1.3
@@ -1 +1 @@
-6b35732f34aad4becfc24ee500d32c9b  libopensync-plugin-gpe-0.18.tar.gz
+fcb08b2ea4944effc88360d568029efe  libopensync-plugin-gpe-0.19.tar.gz


--- libopensync-plugin-gpe-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:38:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:38:37 -0700
Subject: rpms/libopensync-plugin-gpe/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-gpe.spec, 1.1, 1.2 sources, 1.2,
	1.3 libopensync-plugin-gpe-Makefile.patch, 1.1, NONE
Message-ID: <200610201138.k9KBcbll015220@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-gpe/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123/FC-5

Modified Files:
	.cvsignore libopensync-plugin-gpe.spec sources 
Removed Files:
	libopensync-plugin-gpe-Makefile.patch 
Log Message:
- version upgade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Feb 2006 23:30:24 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:38:07 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-gpe-0.18.tar.gz
+libopensync-plugin-gpe-0.19.tar.gz


Index: libopensync-plugin-gpe.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-5/libopensync-plugin-gpe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-gpe.spec	27 Feb 2006 23:30:24 -0000	1.1
+++ libopensync-plugin-gpe.spec	20 Oct 2006 11:38:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-gpe
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        GPE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -58,6 +56,9 @@
 %{_includedir}/opensync-1.0/opensync/gpe_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Sun Feb 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - fix description
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Feb 2006 23:30:24 -0000	1.2
+++ sources	20 Oct 2006 11:38:07 -0000	1.3
@@ -1 +1 @@
-6b35732f34aad4becfc24ee500d32c9b  libopensync-plugin-gpe-0.18.tar.gz
+fcb08b2ea4944effc88360d568029efe  libopensync-plugin-gpe-0.19.tar.gz


--- libopensync-plugin-gpe-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:38:38 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:38:38 -0700
Subject: rpms/libopensync-plugin-gpe/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-gpe.spec, 1.2, 1.3 sources, 1.2,
	1.3 libopensync-plugin-gpe-Makefile.patch, 1.1, NONE
Message-ID: <200610201138.k9KBccws015225@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-gpe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123/devel

Modified Files:
	.cvsignore libopensync-plugin-gpe.spec sources 
Removed Files:
	libopensync-plugin-gpe-Makefile.patch 
Log Message:
- version upgade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Feb 2006 23:30:24 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:38:07 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-gpe-0.18.tar.gz
+libopensync-plugin-gpe-0.19.tar.gz


Index: libopensync-plugin-gpe.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/devel/libopensync-plugin-gpe.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-gpe.spec	13 Sep 2006 13:41:37 -0000	1.2
+++ libopensync-plugin-gpe.spec	20 Oct 2006 11:38:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-gpe
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        GPE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -58,6 +56,9 @@
 %{_includedir}/opensync-1.0/opensync/gpe_sync.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-gpe/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Feb 2006 23:30:24 -0000	1.2
+++ sources	20 Oct 2006 11:38:07 -0000	1.3
@@ -1 +1 @@
-6b35732f34aad4becfc24ee500d32c9b  libopensync-plugin-gpe-0.18.tar.gz
+fcb08b2ea4944effc88360d568029efe  libopensync-plugin-gpe-0.19.tar.gz


--- libopensync-plugin-gpe-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:42:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:42:17 -0700
Subject: rpms/libopensync-plugin-irmc/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-irmc.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200610201142.k9KBgHfX015452@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-irmc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15394/FC-5

Modified Files:
	.cvsignore libopensync-plugin-irmc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Feb 2006 00:37:14 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:41:47 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-irmc-0.18.tar.gz
+libopensync-plugin-irmc-0.19.tar.gz


Index: libopensync-plugin-irmc.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-5/libopensync-plugin-irmc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-irmc.spec	28 Feb 2006 23:09:26 -0000	1.4
+++ libopensync-plugin-irmc.spec	20 Oct 2006 11:41:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-irmc
-Version:        0.18
-Release:        6%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Irmc plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@
 %{_datadir}/opensync/defaults/irmc-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Mar 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-6
 - Bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Feb 2006 00:37:14 -0000	1.2
+++ sources	20 Oct 2006 11:41:47 -0000	1.3
@@ -1 +1 @@
-52f86db50d653f5af0adefeb76cf9a31  libopensync-plugin-irmc-0.18.tar.gz
+14451c845a69ec8a10815d34a2abcf61  libopensync-plugin-irmc-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:42:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:42:16 -0700
Subject: rpms/libopensync-plugin-irmc/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-irmc.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201142.k9KBgG4G015447@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-irmc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15394/FC-4

Modified Files:
	.cvsignore libopensync-plugin-irmc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Feb 2006 00:37:14 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:41:46 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-irmc-0.18.tar.gz
+libopensync-plugin-irmc-0.19.tar.gz


Index: libopensync-plugin-irmc.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-4/libopensync-plugin-irmc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-irmc.spec	5 Feb 2006 00:51:05 -0000	1.2
+++ libopensync-plugin-irmc.spec	20 Oct 2006 11:41:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-irmc
-Version:        0.18
-Release:        4%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Irmc plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@
 %{_datadir}/opensync/defaults/irmc-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Sun Feb 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Feb 2006 00:37:14 -0000	1.2
+++ sources	20 Oct 2006 11:41:46 -0000	1.3
@@ -1 +1 @@
-52f86db50d653f5af0adefeb76cf9a31  libopensync-plugin-irmc-0.18.tar.gz
+14451c845a69ec8a10815d34a2abcf61  libopensync-plugin-irmc-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:42:18 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:42:18 -0700
Subject: rpms/libopensync-plugin-irmc/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-irmc.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200610201142.k9KBgIxC015457@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-irmc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15394/devel

Modified Files:
	.cvsignore libopensync-plugin-irmc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Feb 2006 00:37:14 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:41:48 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-irmc-0.18.tar.gz
+libopensync-plugin-irmc-0.19.tar.gz


Index: libopensync-plugin-irmc.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/libopensync-plugin-irmc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync-plugin-irmc.spec	13 Sep 2006 13:44:34 -0000	1.7
+++ libopensync-plugin-irmc.spec	20 Oct 2006 11:41:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-irmc
-Version:        0.18
-Release:        8%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Irmc plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@
 %{_datadir}/opensync/defaults/irmc-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-8
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Feb 2006 00:37:14 -0000	1.2
+++ sources	20 Oct 2006 11:41:48 -0000	1.3
@@ -1 +1 @@
-52f86db50d653f5af0adefeb76cf9a31  libopensync-plugin-irmc-0.18.tar.gz
+14451c845a69ec8a10815d34a2abcf61  libopensync-plugin-irmc-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 11:47:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:47:07 -0700
Subject: rpms/libopensync-plugin-kdepim/FC-4
	libopensync-plugin-kdepim-Makefile.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libopensync-plugin-kdepim.spec, 1.3, 1.4 sources, 1.2,
	1.3 libopensync-plugin-kdepim-gcc41.patch, 1.1, NONE
Message-ID: <200610201147.k9KBl722015670@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-kdepim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15609/FC-4

Modified Files:
	.cvsignore libopensync-plugin-kdepim.spec sources 
Added Files:
	libopensync-plugin-kdepim-Makefile.patch 
Removed Files:
	libopensync-plugin-kdepim-gcc41.patch 
Log Message:
- version upgrade


libopensync-plugin-kdepim-Makefile.patch:

--- NEW FILE libopensync-plugin-kdepim-Makefile.patch ---
--- Makefile.in.orig	2006-10-20 11:34:30.000000000 +0200
+++ Makefile.in	2006-10-20 11:34:57.000000000 +0200
@@ -479,9 +479,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kdepim_lib.la: $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
 kdepim_sync.la: $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2006 20:58:42 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:46:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-kdepim-0.18.tar.gz
+libopensync-plugin-kdepim-0.19.tar.gz


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-4/libopensync-plugin-kdepim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-kdepim.spec	2 Mar 2006 22:21:15 -0000	1.3
+++ libopensync-plugin-kdepim.spec	20 Oct 2006 11:46:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-kdepim
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,13 +8,16 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         libopensync-plugin-kdepim-gcc41.patch
+Patch0:         libopensync-plugin-kdepim-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  kdepim-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 %{summary}
@@ -32,7 +35,7 @@
 %prep
 %setup -q
 %patch0
-
+autoreconf
 %build
 %configure --disable-rpath
 # smpflags sometimes screw up the build
@@ -56,8 +59,12 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/opensync/plugins/kdepim*.so
+%{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Thu Mar 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 - add gcc4.1 fixes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2006 20:58:42 -0000	1.2
+++ sources	20 Oct 2006 11:46:37 -0000	1.3
@@ -1 +1 @@
-96c43911a0fbdaff4920bbc0f4cd3816  libopensync-plugin-kdepim-0.18.tar.gz
+258defed0c5f8d39eac42f6c294c8f1c  libopensync-plugin-kdepim-0.19.tar.gz


--- libopensync-plugin-kdepim-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:47:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:47:08 -0700
Subject: rpms/libopensync-plugin-kdepim/FC-5
	libopensync-plugin-kdepim-Makefile.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libopensync-plugin-kdepim.spec, 1.3, 1.4 sources, 1.2,
	1.3 libopensync-plugin-kdepim-gcc41.patch, 1.1, NONE
Message-ID: <200610201147.k9KBl8xB015675@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-kdepim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15609/FC-5

Modified Files:
	.cvsignore libopensync-plugin-kdepim.spec sources 
Added Files:
	libopensync-plugin-kdepim-Makefile.patch 
Removed Files:
	libopensync-plugin-kdepim-gcc41.patch 
Log Message:
- version upgrade


libopensync-plugin-kdepim-Makefile.patch:

--- NEW FILE libopensync-plugin-kdepim-Makefile.patch ---
--- Makefile.in.orig	2006-10-20 11:34:30.000000000 +0200
+++ Makefile.in	2006-10-20 11:34:57.000000000 +0200
@@ -479,9 +479,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kdepim_lib.la: $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
 kdepim_sync.la: $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2006 20:58:42 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:46:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-kdepim-0.18.tar.gz
+libopensync-plugin-kdepim-0.19.tar.gz


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-5/libopensync-plugin-kdepim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-kdepim.spec	2 Mar 2006 22:21:15 -0000	1.3
+++ libopensync-plugin-kdepim.spec	20 Oct 2006 11:46:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-kdepim
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,13 +8,16 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         libopensync-plugin-kdepim-gcc41.patch
+Patch0:         libopensync-plugin-kdepim-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  kdepim-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 %{summary}
@@ -32,7 +35,7 @@
 %prep
 %setup -q
 %patch0
-
+autoreconf
 %build
 %configure --disable-rpath
 # smpflags sometimes screw up the build
@@ -56,8 +59,12 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/opensync/plugins/kdepim*.so
+%{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Thu Mar 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 - add gcc4.1 fixes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2006 20:58:42 -0000	1.2
+++ sources	20 Oct 2006 11:46:37 -0000	1.3
@@ -1 +1 @@
-96c43911a0fbdaff4920bbc0f4cd3816  libopensync-plugin-kdepim-0.18.tar.gz
+258defed0c5f8d39eac42f6c294c8f1c  libopensync-plugin-kdepim-0.19.tar.gz


--- libopensync-plugin-kdepim-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 11:47:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 04:47:13 -0700
Subject: rpms/libopensync-plugin-kdepim/devel
	libopensync-plugin-kdepim-Makefile.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libopensync-plugin-kdepim.spec, 1.4, 1.5 sources, 1.2,
	1.3 libopensync-plugin-kdepim-gcc41.patch, 1.1, NONE
Message-ID: <200610201147.k9KBlDJ4015680@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15609/devel

Modified Files:
	.cvsignore libopensync-plugin-kdepim.spec sources 
Added Files:
	libopensync-plugin-kdepim-Makefile.patch 
Removed Files:
	libopensync-plugin-kdepim-gcc41.patch 
Log Message:
- version upgrade


libopensync-plugin-kdepim-Makefile.patch:

--- NEW FILE libopensync-plugin-kdepim-Makefile.patch ---
--- Makefile.in.orig	2006-10-20 11:34:30.000000000 +0200
+++ Makefile.in	2006-10-20 11:34:57.000000000 +0200
@@ -479,9 +479,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 kdepim_lib.la: $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
 kdepim_sync.la: $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(plugindir) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
+	$(CXXLINK) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2006 20:58:42 -0000	1.2
+++ .cvsignore	20 Oct 2006 11:46:43 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-kdepim-0.18.tar.gz
+libopensync-plugin-kdepim-0.19.tar.gz


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-kdepim.spec	13 Sep 2006 13:48:11 -0000	1.4
+++ libopensync-plugin-kdepim.spec	20 Oct 2006 11:46:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-kdepim
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,13 +8,16 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         libopensync-plugin-kdepim-gcc41.patch
+Patch0:         libopensync-plugin-kdepim-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  kdepim-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 %{summary}
@@ -32,7 +35,7 @@
 %prep
 %setup -q
 %patch0
-
+autoreconf
 %build
 %configure --disable-rpath
 # smpflags sometimes screw up the build
@@ -56,8 +59,12 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/opensync/plugins/kdepim*.so
+%{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2006 20:58:42 -0000	1.2
+++ sources	20 Oct 2006 11:46:43 -0000	1.3
@@ -1 +1 @@
-96c43911a0fbdaff4920bbc0f4cd3816  libopensync-plugin-kdepim-0.18.tar.gz
+258defed0c5f8d39eac42f6c294c8f1c  libopensync-plugin-kdepim-0.19.tar.gz


--- libopensync-plugin-kdepim-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:37:23 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 20 Oct 2006 05:37:23 -0700
Subject: fedora-security/audit fc5,1.363,1.364
Message-ID: <200610201237.k9KCbNAY018983@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18965

Modified Files:
	fc5 
Log Message:
Note the PHP update


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- fc5	18 Oct 2006 19:39:32 -0000	1.363
+++ fc5	20 Oct 2006 12:37:20 -0000	1.364
@@ -31,7 +31,7 @@
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
-CVE-2006-4812 VULNERABLE (php)
+CVE-2006-4812 VULNERABLE (php) [since FEDORA-2006-1024]
 CVE-2006-4811 VULNERABLE (kdelibs) #211342
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
@@ -60,12 +60,12 @@
 CVE-2006-4538 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] ia64 and sparc only
 CVE-2006-4535 version (kernel, fixed 2.6.17.12, fixed 2.6.18-rc6) [since FEDORA-2006-967]
 CVE-2006-4507 ignore (libtiff) can't reproduce
-CVE-2006-4486 VULNERABLE (php, fixed 5.1.6)
-CVE-2006-4485 VULNERABLE (php, fixed 5.1.5)
-CVE-2006-4484 ignore (php, fixed 5.1.5)
+CVE-2006-4486 VULNERABLE (php, fixed 5.1.6) [since FEDORA-2006-1024]
+CVE-2006-4485 VULNERABLE (php, fixed 5.1.5) [since FEDORA-2006-1024]
+CVE-2006-4484 ignore (php, fixed 5.1.5) [since FEDORA-2006-1024]
 CVE-2006-4484 ignore (gd)
 CVE-2006-4483 ignore (php) not linux
-CVE-2006-4482 VULNERABLE (php, fixed 5.1.5) [#204995]
+CVE-2006-4482 VULNERABLE (php, fixed 5.1.5) [#204995] [since FEDORA-2006-1024]
 CVE-2006-4481 ignore (php) safe mode isn't safe
 CVE-2006-4455 ignore (xchat) client DoS
 CVE-2006-4447 ignore (xorg) not a security issue
@@ -99,7 +99,7 @@
 CVE-2006-4095 version (bind) [since FEDORA-2006-418] was backport since FEDORA-2006-966
 CVE-2006-4093 version (kernel, fixed 2.6.17.9) [since FEDORA-2006-967]
 CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) #202247
-CVE-2006-4020 VULNERABLE (php) #201767
+CVE-2006-4020 VULNERABLE (php) #201767 [since FEDORA-2006-1024]
 CVE-2006-4019 version (squirrelmail, fixed 1.4.8) #202196 [since FEDORA-2006-913]
 CVE-2006-3918 version httpd, fixed 2.2.2 [since FEDORA-2006-364]
 CVE-2006-3879 version (mikmod, not 3.1.6)



From fedora-extras-commits at redhat.com  Fri Oct 20 12:47:42 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:47:42 -0700
Subject: rpms/chkrootkit/devel chkrootkit-0.47-warnings.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 chkrootkit.spec, 1.15, 1.16 sources,
	1.5, 1.6 chkrootkit-0.46a-warnings.patch, 1.1, NONE
Message-ID: <200610201247.k9KClgkO019261@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19206

Modified Files:
	.cvsignore chkrootkit.spec sources 
Added Files:
	chkrootkit-0.47-warnings.patch 
Removed Files:
	chkrootkit-0.46a-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config


chkrootkit-0.47-warnings.patch:

--- NEW FILE chkrootkit-0.47-warnings.patch ---
diff -Nur chkrootkit-0.47-orig/chklastlog.c chkrootkit-0.47/chklastlog.c
--- chkrootkit-0.47-orig/chklastlog.c	2006-02-11 18:02:48.000000000 +0100
+++ chkrootkit-0.47/chklastlog.c	2006-10-20 14:31:43.000000000 +0200
@@ -164,7 +164,7 @@
             {
                 if (*uid > MAX_ID)
                 {
-                   fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", MAX_ID, *uid );
+                    fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", (long int)MAX_ID, (long int)*uid );
                    exit (1);
 
                 }
diff -Nur chkrootkit-0.47-orig/chkproc.c chkrootkit-0.47/chkproc.c
--- chkrootkit-0.47-orig/chkproc.c	2006-07-25 16:55:21.000000000 +0200
+++ chkrootkit-0.47/chkproc.c	2006-10-20 14:34:12.000000000 +0200
@@ -180,10 +180,8 @@
    if (pv < 1 || pv > PS_MAX)
       pv = 1;
    pscmd = ps_cmds[pv];
-/*  printf("pv = %d\n\r", pv); /* -- DEBUG */
 #endif
 
-/* printf("pscmd = %s\n\r", pscmd); /* -- DEBUG */ 
    if (!(ps = popen(pscmd, "r")))
    {
        perror("ps");
@@ -228,7 +226,6 @@
           p++;
       while (isspace(*p)) /* Skip spaces */
           p++;
-/*  printf(">>%s<<\n", p);  /* -- DEBUG */
       ret = atol(p);
       if ( ret < 0 || ret > MAX_PROCESSES )
       {
@@ -263,7 +260,6 @@
       }
 #endif
 
-/*      printf("%s\n", tmp_d_name); /* -- DEBUG */
       dirproc[atol(tmp_d_name)] = 1;
    }
    closedir(proc);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2005 21:17:14 -0000	1.5
+++ .cvsignore	20 Oct 2006 12:47:12 -0000	1.6
@@ -1 +1,2 @@
-chkrootkit-0.46a.tar.gz
+chkrootkit-0.47.tar.gz
+chkrootkit-0.47.tar.gz.sig


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/devel/chkrootkit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- chkrootkit.spec	28 Aug 2006 00:12:08 -0000	1.15
+++ chkrootkit.spec	20 Oct 2006 12:47:12 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           chkrootkit
-Version:        0.46a
-Release: 3%{?dist}
+Version:        0.47
+Release: 1%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD-like
@@ -14,7 +14,7 @@
 Patch1:         chkrootkit-0.44-getCMD.patch
 Patch2:         chkrootkit-0.44-inetd.patch
 Patch3:         chkrootkit-0.45-includes.patch
-Patch4:         chkrootkit-0.46a-warnings.patch
+Patch4:         chkrootkit-0.47-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -100,14 +100,18 @@
 %{_sbindir}/chkrootkit
 %{_bindir}/chkrootkit
 %{_bindir}/chkrootkitX
-%{_sysconfdir}/pam.d/chkrootkit
-%{_sysconfdir}/security/console.apps/chkrootkit
+%config(noreplace) %{_sysconfdir}/pam.d/chkrootkit
+%config(noreplace) %{_sysconfdir}/security/console.apps/chkrootkit
 %{_libdir}/%{name}-%{version}
 %{_datadir}/applications/fedora-chkrootkit.desktop
 %{_datadir}/pixmaps/chkrootkit.png
 
 
 %changelog
+* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
+- Update to 0.47.
+- mark PAM and consolehelper files in /etc as config
+
 * Mon Aug 28 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2005 21:17:14 -0000	1.5
+++ sources	20 Oct 2006 12:47:12 -0000	1.6
@@ -1 +1,2 @@
-b73fb9e365d2edcd031d65b16e965a18  chkrootkit-0.46a.tar.gz
+4c6455d202cef35395a673386e4bf01a  chkrootkit-0.47.tar.gz
+39d898c13e094d884237f7ad9f343895  chkrootkit-0.47.tar.gz.sig


--- chkrootkit-0.46a-warnings.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:51:57 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:51:57 -0700
Subject: rpms/chkrootkit/FC-5 .cvsignore, 1.5, 1.6 chkrootkit.spec, 1.14,
	1.15 sources, 1.5, 1.6 chkrootkit-0.46a-warnings.patch, 1.1, NONE
Message-ID: <200610201251.k9KCpvkK019411@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19326

Modified Files:
	.cvsignore chkrootkit.spec sources 
Removed Files:
	chkrootkit-0.46a-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2005 21:17:14 -0000	1.5
+++ .cvsignore	20 Oct 2006 12:51:26 -0000	1.6
@@ -1 +1,2 @@
-chkrootkit-0.46a.tar.gz
+chkrootkit-0.47.tar.gz
+chkrootkit-0.47.tar.gz.sig


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-5/chkrootkit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- chkrootkit.spec	25 Feb 2006 21:51:24 -0000	1.14
+++ chkrootkit.spec	20 Oct 2006 12:51:26 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           chkrootkit
-Version:        0.46a
-Release:        2%{?dist}
+Version:        0.47
+Release: 1%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD-like
@@ -14,7 +14,7 @@
 Patch1:         chkrootkit-0.44-getCMD.patch
 Patch2:         chkrootkit-0.44-inetd.patch
 Patch3:         chkrootkit-0.45-includes.patch
-Patch4:         chkrootkit-0.46a-warnings.patch
+Patch4:         chkrootkit-0.47-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -100,14 +100,18 @@
 %{_sbindir}/chkrootkit
 %{_bindir}/chkrootkit
 %{_bindir}/chkrootkitX
-%{_sysconfdir}/pam.d/chkrootkit
-%{_sysconfdir}/security/console.apps/chkrootkit
+%config(noreplace) %{_sysconfdir}/pam.d/chkrootkit
+%config(noreplace) %{_sysconfdir}/security/console.apps/chkrootkit
 %{_libdir}/%{name}-%{version}
 %{_datadir}/applications/fedora-chkrootkit.desktop
 %{_datadir}/pixmaps/chkrootkit.png
 
 
 %changelog
+* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
+- Update to 0.47.
+- mark PAM and consolehelper files in /etc as config
+
 * Sat Feb 25 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.46a-2
 - rebuilt for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2005 21:17:14 -0000	1.5
+++ sources	20 Oct 2006 12:51:26 -0000	1.6
@@ -1 +1,2 @@
-b73fb9e365d2edcd031d65b16e965a18  chkrootkit-0.46a.tar.gz
+4c6455d202cef35395a673386e4bf01a  chkrootkit-0.47.tar.gz
+39d898c13e094d884237f7ad9f343895  chkrootkit-0.47.tar.gz.sig


--- chkrootkit-0.46a-warnings.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:52:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 05:52:08 -0700
Subject: rpms/libopensync-plugin-palm/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-palm.spec, 1.4, 1.5 sources, 1.2,
	1.3 libopensync-plugin-palm-Makefile.patch, 1.1, NONE
Message-ID: <200610201252.k9KCq8XU019457@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/FC-5

Modified Files:
	.cvsignore libopensync-plugin-palm.spec sources 
Removed Files:
	libopensync-plugin-palm-Makefile.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
+++ .cvsignore	20 Oct 2006 12:51:38 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-palm-0.18.tar.gz
+libopensync-plugin-palm-0.19.tar.gz


Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-5/libopensync-plugin-palm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-palm.spec	21 Apr 2006 23:52:13 -0000	1.4
+++ libopensync-plugin-palm.spec	20 Oct 2006 12:51:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
-Version:        0.18
-Release:        4%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -60,7 +58,10 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
-* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
+* Fri Mar 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - bump
 
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 08:40:26 -0000	1.2
+++ sources	20 Oct 2006 12:51:38 -0000	1.3
@@ -1 +1 @@
-d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz
+b0bbf5f7e39ffe2a09275b4d5edc3e1d  libopensync-plugin-palm-0.19.tar.gz


--- libopensync-plugin-palm-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:52:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 05:52:07 -0700
Subject: rpms/libopensync-plugin-palm/FC-3 .cvsignore, 1.2,
	1.3 libopensync-plugin-palm.spec, 1.2, 1.3 sources, 1.2,
	1.3 libopensync-plugin-palm-Makefile.patch, 1.1, NONE
Message-ID: <200610201252.k9KCq7nq019445@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/FC-3

Modified Files:
	.cvsignore libopensync-plugin-palm.spec sources 
Removed Files:
	libopensync-plugin-palm-Makefile.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
+++ .cvsignore	20 Oct 2006 12:51:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-palm-0.18.tar.gz
+libopensync-plugin-palm-0.19.tar.gz


Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-3/libopensync-plugin-palm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-palm.spec	13 Dec 2005 15:12:11 -0000	1.2
+++ libopensync-plugin-palm.spec	20 Oct 2006 12:51:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -60,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 08:40:26 -0000	1.2
+++ sources	20 Oct 2006 12:51:37 -0000	1.3
@@ -1 +1 @@
-d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz
+b0bbf5f7e39ffe2a09275b4d5edc3e1d  libopensync-plugin-palm-0.19.tar.gz


--- libopensync-plugin-palm-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:52:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 05:52:08 -0700
Subject: rpms/libopensync-plugin-palm/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-palm.spec, 1.3, 1.4 sources, 1.2,
	1.3 libopensync-plugin-palm-Makefile.patch, 1.1, NONE
Message-ID: <200610201252.k9KCq8AO019451@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/FC-4

Modified Files:
	.cvsignore libopensync-plugin-palm.spec sources 
Removed Files:
	libopensync-plugin-palm-Makefile.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
+++ .cvsignore	20 Oct 2006 12:51:37 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-palm-0.18.tar.gz
+libopensync-plugin-palm-0.19.tar.gz


Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-4/libopensync-plugin-palm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-palm.spec	21 Apr 2006 23:52:12 -0000	1.3
+++ libopensync-plugin-palm.spec	20 Oct 2006 12:51:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -60,9 +58,15 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
-* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
+* Fri Mar 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - bump
 
+* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
+- Rebuild for Fedora Extras 
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 08:40:26 -0000	1.2
+++ sources	20 Oct 2006 12:51:37 -0000	1.3
@@ -1 +1 @@
-d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz
+b0bbf5f7e39ffe2a09275b4d5edc3e1d  libopensync-plugin-palm-0.19.tar.gz


--- libopensync-plugin-palm-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:52:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 05:52:09 -0700
Subject: rpms/libopensync-plugin-palm/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-palm.spec, 1.5, 1.6 sources, 1.2,
	1.3 libopensync-plugin-palm-Makefile.patch, 1.1, NONE
Message-ID: <200610201252.k9KCq942019462@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/devel

Modified Files:
	.cvsignore libopensync-plugin-palm.spec sources 
Removed Files:
	libopensync-plugin-palm-Makefile.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
+++ .cvsignore	20 Oct 2006 12:51:39 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-palm-0.18.tar.gz
+libopensync-plugin-palm-0.19.tar.gz


Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/libopensync-plugin-palm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync-plugin-palm.spec	13 Sep 2006 13:51:53 -0000	1.5
+++ libopensync-plugin-palm.spec	20 Oct 2006 12:51:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -60,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-5
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 08:40:26 -0000	1.2
+++ sources	20 Oct 2006 12:51:39 -0000	1.3
@@ -1 +1 @@
-d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz
+b0bbf5f7e39ffe2a09275b4d5edc3e1d  libopensync-plugin-palm-0.19.tar.gz


--- libopensync-plugin-palm-Makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:53:39 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:53:39 -0700
Subject: rpms/chkrootkit/FC-4 .cvsignore, 1.5, 1.6 chkrootkit.spec, 1.13,
	1.14 sources, 1.5, 1.6 chkrootkit-0.46a-warnings.patch, 1.1, NONE
Message-ID: <200610201253.k9KCrdOX019652@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19587

Modified Files:
	.cvsignore chkrootkit.spec sources 
Removed Files:
	chkrootkit-0.46a-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Nov 2005 13:05:41 -0000	1.5
+++ .cvsignore	20 Oct 2006 12:53:09 -0000	1.6
@@ -1 +1,2 @@
-chkrootkit-0.46a.tar.gz
+chkrootkit-0.47.tar.gz
+chkrootkit-0.47.tar.gz.sig


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-4/chkrootkit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chkrootkit.spec	29 Nov 2005 13:05:41 -0000	1.13
+++ chkrootkit.spec	20 Oct 2006 12:53:09 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           chkrootkit
-Version:        0.46a
-Release:        1%{?dist}
+Version:        0.47
+Release: 1%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD-like
@@ -14,7 +14,7 @@
 Patch1:         chkrootkit-0.44-getCMD.patch
 Patch2:         chkrootkit-0.44-inetd.patch
 Patch3:         chkrootkit-0.45-includes.patch
-Patch4:         chkrootkit-0.46a-warnings.patch
+Patch4:         chkrootkit-0.47-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -100,14 +100,18 @@
 %{_sbindir}/chkrootkit
 %{_bindir}/chkrootkit
 %{_bindir}/chkrootkitX
-%{_sysconfdir}/pam.d/chkrootkit
-%{_sysconfdir}/security/console.apps/chkrootkit
+%config(noreplace) %{_sysconfdir}/pam.d/chkrootkit
+%config(noreplace) %{_sysconfdir}/security/console.apps/chkrootkit
 %{_libdir}/%{name}-%{version}
 %{_datadir}/applications/fedora-chkrootkit.desktop
 %{_datadir}/pixmaps/chkrootkit.png
 
 
 %changelog
+* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
+- Update to 0.47.
+- mark PAM and consolehelper files in /etc as config
+
 * Thu Nov 10 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.46a-1
 - Update to 0.46a.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkrootkit/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Nov 2005 13:05:41 -0000	1.5
+++ sources	20 Oct 2006 12:53:09 -0000	1.6
@@ -1 +1,2 @@
-b73fb9e365d2edcd031d65b16e965a18  chkrootkit-0.46a.tar.gz
+4c6455d202cef35395a673386e4bf01a  chkrootkit-0.47.tar.gz
+39d898c13e094d884237f7ad9f343895  chkrootkit-0.47.tar.gz.sig


--- chkrootkit-0.46a-warnings.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 20 12:54:00 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:54:00 -0700
Subject: rpms/chkrootkit/FC-4 chkrootkit-0.47-warnings.patch,NONE,1.1
Message-ID: <200610201254.k9KCs0wU019675@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19668

Added Files:
	chkrootkit-0.47-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config


chkrootkit-0.47-warnings.patch:

--- NEW FILE chkrootkit-0.47-warnings.patch ---
diff -Nur chkrootkit-0.47-orig/chklastlog.c chkrootkit-0.47/chklastlog.c
--- chkrootkit-0.47-orig/chklastlog.c	2006-02-11 18:02:48.000000000 +0100
+++ chkrootkit-0.47/chklastlog.c	2006-10-20 14:31:43.000000000 +0200
@@ -164,7 +164,7 @@
             {
                 if (*uid > MAX_ID)
                 {
-                   fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", MAX_ID, *uid );
+                    fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", (long int)MAX_ID, (long int)*uid );
                    exit (1);
 
                 }
diff -Nur chkrootkit-0.47-orig/chkproc.c chkrootkit-0.47/chkproc.c
--- chkrootkit-0.47-orig/chkproc.c	2006-07-25 16:55:21.000000000 +0200
+++ chkrootkit-0.47/chkproc.c	2006-10-20 14:34:12.000000000 +0200
@@ -180,10 +180,8 @@
    if (pv < 1 || pv > PS_MAX)
       pv = 1;
    pscmd = ps_cmds[pv];
-/*  printf("pv = %d\n\r", pv); /* -- DEBUG */
 #endif
 
-/* printf("pscmd = %s\n\r", pscmd); /* -- DEBUG */ 
    if (!(ps = popen(pscmd, "r")))
    {
        perror("ps");
@@ -228,7 +226,6 @@
           p++;
       while (isspace(*p)) /* Skip spaces */
           p++;
-/*  printf(">>%s<<\n", p);  /* -- DEBUG */
       ret = atol(p);
       if ( ret < 0 || ret > MAX_PROCESSES )
       {
@@ -263,7 +260,6 @@
       }
 #endif
 
-/*      printf("%s\n", tmp_d_name); /* -- DEBUG */
       dirproc[atol(tmp_d_name)] = 1;
    }
    closedir(proc);



From fedora-extras-commits at redhat.com  Fri Oct 20 12:54:17 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 05:54:17 -0700
Subject: rpms/chkrootkit/FC-5 chkrootkit-0.47-warnings.patch,NONE,1.1
Message-ID: <200610201254.k9KCsHrK019700@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/chkrootkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19691

Added Files:
	chkrootkit-0.47-warnings.patch 
Log Message:
* Fri Oct 20 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.47-1
- Update to 0.47.
- mark PAM and consolehelper files in /etc as config


chkrootkit-0.47-warnings.patch:

--- NEW FILE chkrootkit-0.47-warnings.patch ---
diff -Nur chkrootkit-0.47-orig/chklastlog.c chkrootkit-0.47/chklastlog.c
--- chkrootkit-0.47-orig/chklastlog.c	2006-02-11 18:02:48.000000000 +0100
+++ chkrootkit-0.47/chklastlog.c	2006-10-20 14:31:43.000000000 +0200
@@ -164,7 +164,7 @@
             {
                 if (*uid > MAX_ID)
                 {
-                   fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", MAX_ID, *uid );
+                    fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", (long int)MAX_ID, (long int)*uid );
                    exit (1);
 
                 }
diff -Nur chkrootkit-0.47-orig/chkproc.c chkrootkit-0.47/chkproc.c
--- chkrootkit-0.47-orig/chkproc.c	2006-07-25 16:55:21.000000000 +0200
+++ chkrootkit-0.47/chkproc.c	2006-10-20 14:34:12.000000000 +0200
@@ -180,10 +180,8 @@
    if (pv < 1 || pv > PS_MAX)
       pv = 1;
    pscmd = ps_cmds[pv];
-/*  printf("pv = %d\n\r", pv); /* -- DEBUG */
 #endif
 
-/* printf("pscmd = %s\n\r", pscmd); /* -- DEBUG */ 
    if (!(ps = popen(pscmd, "r")))
    {
        perror("ps");
@@ -228,7 +226,6 @@
           p++;
       while (isspace(*p)) /* Skip spaces */
           p++;
-/*  printf(">>%s<<\n", p);  /* -- DEBUG */
       ret = atol(p);
       if ( ret < 0 || ret > MAX_PROCESSES )
       {
@@ -263,7 +260,6 @@
       }
 #endif
 
-/*      printf("%s\n", tmp_d_name); /* -- DEBUG */
       dirproc[atol(tmp_d_name)] = 1;
    }
    closedir(proc);



From fedora-extras-commits at redhat.com  Fri Oct 20 13:00:23 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 20 Oct 2006 06:00:23 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.5,1.6
Message-ID: <200610201300.k9KD0N14019816@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19786

Modified Files:
	Config_Extras.py 
Log Message:
Prepare some FC-6 updates.

Left to do:
 - alldists list: add '6'
 - multiwhitelists dict: uncomment new 'development' entry




Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Config_Extras.py	30 Sep 2006 18:52:16 -0000	1.5
+++ Config_Extras.py	20 Oct 2006 13:00:21 -0000	1.6
@@ -45,10 +45,11 @@
 archdict = {'3':['x86_64', 'i386'], 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386'],
+            '6':['ppc','x86_64', 'i386'],
             'development':['ppc','x86_64','i386'],
             }
 
-multilibdists = [ 'development', '5', '4', '3' ]
+multilibdists = [ 'development', '6', '5', '4', '3' ]
 
 # map: dist -> target arch -> list of pkg name regexp patterns
 # We don't check virtual package names, unless it's a virtual -devel pkg.
@@ -57,7 +58,7 @@
                }
 multiwhitelists = { 'development' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                # 'development' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
-               #'6' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
+               '6' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '5' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '4' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '3' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
@@ -67,6 +68,7 @@
 repomanage_keepdict = {'3': "'/\([^/]\+-\)\?kmod-'",
                        '4': "'/\([^/]\+-\)\?kmod-'",
                        '5': "'/\([^/]\+-\)\?kmod-'",
+                       '6': "'/\([^/]\+-\)\?kmod-'",
                        'development': "'/\([^/]\+-\)\?kmod-'",
                        }
 
@@ -83,6 +85,7 @@
 baserepos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'],
               '4' : ['fedora-core','fedora-core-updates','fedora-extras'],
               '5' : ['fedora-core','fedora-core-updates','fedora-extras'],
+              '6' : ['fedora-core','fedora-core-updates','fedora-extras'],
               'development' : ['fedora-core','fedora-extras']
               }
 
@@ -90,6 +93,7 @@
 testrepos = { '3' : ['fedora-core-updates-testing'],
               '4' : ['fedora-core-updates-testing'],
               '5' : ['fedora-core-updates-testing'],
+              '6' : ['fedora-core-updates-testing'],
               'development' : []
               }
 



From fedora-extras-commits at redhat.com  Fri Oct 20 13:02:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:02:19 -0700
Subject: rpms/libopensync-plugin-python/FC-3 .cvsignore, 1.2,
	1.3 libopensync-plugin-python.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201302.k9KD2Jb7022770@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822/FC-3

Modified Files:
	.cvsignore libopensync-plugin-python.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
+++ .cvsignore	20 Oct 2006 13:01:49 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-python-0.18.tar.gz
+libopensync-plugin-python-0.19.tar.gz


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-3/libopensync-plugin-python.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-python.spec	13 Dec 2005 15:55:28 -0000	1.2
+++ libopensync-plugin-python.spec	20 Oct 2006 13:01:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:36:46 -0000	1.2
+++ sources	20 Oct 2006 13:01:49 -0000	1.3
@@ -1 +1 @@
-8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz
+edfea3d97b55386f3a6cb4756cd17ec2  libopensync-plugin-python-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 13:02:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:02:28 -0700
Subject: rpms/libopensync-plugin-python/FC-5 .cvsignore, 1.2,
	1.3 libopensync-plugin-python.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610201302.k9KD2SHV022777@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822/FC-5

Modified Files:
	.cvsignore libopensync-plugin-python.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
+++ .cvsignore	20 Oct 2006 13:01:57 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-python-0.18.tar.gz
+libopensync-plugin-python-0.19.tar.gz


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-5/libopensync-plugin-python.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-python.spec	16 Feb 2006 23:20:36 -0000	1.3
+++ libopensync-plugin-python.spec	20 Oct 2006 13:01:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
-Version:        0.18
-Release:        4%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:36:46 -0000	1.2
+++ sources	20 Oct 2006 13:01:57 -0000	1.3
@@ -1 +1 @@
-8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz
+edfea3d97b55386f3a6cb4756cd17ec2  libopensync-plugin-python-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 13:02:31 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:02:31 -0700
Subject: rpms/libopensync-plugin-python/devel .cvsignore, 1.2,
	1.3 libopensync-plugin-python.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200610201302.k9KD2VLP022783@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822/devel

Modified Files:
	.cvsignore libopensync-plugin-python.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
+++ .cvsignore	20 Oct 2006 13:02:00 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-python-0.18.tar.gz
+libopensync-plugin-python-0.19.tar.gz


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/libopensync-plugin-python.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync-plugin-python.spec	13 Sep 2006 13:53:27 -0000	1.4
+++ libopensync-plugin-python.spec	20 Oct 2006 13:02:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-5
 - FE6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:36:46 -0000	1.2
+++ sources	20 Oct 2006 13:02:00 -0000	1.3
@@ -1 +1 @@
-8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz
+edfea3d97b55386f3a6cb4756cd17ec2  libopensync-plugin-python-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 13:02:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:02:28 -0700
Subject: rpms/libopensync-plugin-python/FC-4 .cvsignore, 1.2,
	1.3 libopensync-plugin-python.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610201302.k9KD2Srn022778@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822/FC-4

Modified Files:
	.cvsignore libopensync-plugin-python.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
+++ .cvsignore	20 Oct 2006 13:01:56 -0000	1.3
@@ -1 +1 @@
-libopensync-plugin-python-0.18.tar.gz
+libopensync-plugin-python-0.19.tar.gz


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-4/libopensync-plugin-python.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-python.spec	13 Dec 2005 15:55:28 -0000	1.2
+++ libopensync-plugin-python.spec	20 Oct 2006 13:01:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.19-1
+- version upgrade
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 14:36:46 -0000	1.2
+++ sources	20 Oct 2006 13:01:56 -0000	1.3
@@ -1 +1 @@
-8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz
+edfea3d97b55386f3a6cb4756cd17ec2  libopensync-plugin-python-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 13:09:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:09:55 -0700
Subject: rpms/multisync/FC-4 multisync.spec,1.3,1.4
Message-ID: <200610201309.k9KD9tfP023083@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23053/FC-4

Modified Files:
	multisync.spec 
Log Message:
- fix BR



Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/multisync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multisync.spec	20 Oct 2006 10:57:50 -0000	1.3
+++ multisync.spec	20 Oct 2006 13:09:25 -0000	1.4
@@ -18,6 +18,8 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
+BuildRequires:  libopensync-plugin-gpe-devel
+BuildRequires:  libopensync-plugin-palm-devel
 BuildRequires:  automake
 BuildRequires:  libtool
 



From fedora-extras-commits at redhat.com  Fri Oct 20 13:09:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:09:56 -0700
Subject: rpms/multisync/devel multisync.spec,1.5,1.6
Message-ID: <200610201309.k9KD9uCx023086@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/multisync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23053/devel

Modified Files:
	multisync.spec 
Log Message:
- fix BR



Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/devel/multisync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- multisync.spec	20 Oct 2006 10:57:52 -0000	1.5
+++ multisync.spec	20 Oct 2006 13:09:25 -0000	1.6
@@ -18,6 +18,8 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
+BuildRequires:  libopensync-plugin-gpe-devel
+BuildRequires:  libopensync-plugin-palm-devel
 BuildRequires:  automake
 BuildRequires:  libtool
 



From fedora-extras-commits at redhat.com  Fri Oct 20 13:44:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Oct 2006 06:44:12 -0700
Subject: rpms/koffice/devel koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.12, 
	1.13 koffice.spec, 1.42, 1.43 sources, 1.12, 1.13
Message-ID: <200610201344.k9KDiCCB023361@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23338

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.0.patch 
Log Message:
- version upgrade


koffice-1.6.0.patch:

--- NEW FILE koffice-1.6.0.patch ---
--- lib/kross/python/cxx/Objects.hxx.orig	2006-10-19 00:00:02.000000000 +0200
+++ lib/kross/python/cxx/Objects.hxx	2006-10-19 00:02:04.000000000 +0200
@@ -1938,8 +1938,8 @@
 			if(map.hasKey(key)) the_item = map.getItem(key);
 			};
 
-		~mapref<T>()
-			{}
+	//	~mapref<T>()
+	//		{};
 
 		// MapBase<T> stuff
 		// lvalue


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Aug 2006 09:15:26 -0000	1.12
+++ .cvsignore	20 Oct 2006 13:43:42 -0000	1.13
@@ -1 +1 @@
-koffice-1.5.2.tar.bz2
+koffice-1.6.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- koffice.spec	4 Oct 2006 19:38:54 -0000	1.42
+++ koffice.spec	20 Oct 2006 13:43:42 -0000	1.43
@@ -1,14 +1,14 @@
 Name:           koffice
-Version:        1.5.2
-Release:        3%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-1.5.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
 Source100:      koshell.png
-
+Patch0:         koffice-1.6.0.patch
 # stuff for the build configuration
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -216,6 +216,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -443,6 +444,8 @@
 %{_libdir}/kde3/libopencalcexport.*
 %{_libdir}/kde3/libopencalcimport.*
 %{_libdir}/kde3/libqproimport.*
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
 %{_datadir}/apps/kspread/
 %{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
@@ -516,6 +519,8 @@
 %{_libdir}/libkrita_rgb_f16half.so.*
 %{_libdir}/libkrita_rgb_f32.so.*
 %{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkrita_ycbcr_u16.so*
+%{_libdir}/libkrita_ycbcr_u8.so*
 %{_libdir}/libkritacolor.so.*
 %{_libdir}/libkritagrayscale.so.*
 %{_libdir}/libkritaimage.so.*
@@ -550,8 +555,6 @@
 %{_libdir}/kde3/kritatoolstar.*
 %{_libdir}/kde3/kritatooltransform.*
 %{_libdir}/kde3/libkritapart.*
-%{_libdir}/kde3/libkritamagickexport.*
-%{_libdir}/kde3/libkritamagickimport.*
 %{_libdir}/kde3/krita_cmyk_u16_plugin.*
 %{_libdir}/kde3/krita_gray_u16_plugin.*
 %{_libdir}/kde3/krita_lms_f32_plugin.*
@@ -569,7 +572,6 @@
 %{_libdir}/kde3/kritascripting.*
 %{_libdir}/kde3/kritaseparatechannels.*
 %{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasmearybrush.*
 %{_libdir}/kde3/kritasobelfilter.*
 %{_libdir}/kde3/kritatoolselectsimilar.*
 %{_libdir}/kde3/kritawetplugin.*
@@ -583,6 +585,21 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/krosskritacore.*
+%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
+%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
+%{_libdir}/kde3/kritablurfilter.*
+%{_libdir}/kde3/kritaextensioncolorsfilters.*
+%{_libdir}/kde3/kritafastcolortransfer.*
+%{_libdir}/kde3/kritalenscorrectionfilter.*
+%{_libdir}/kde3/kritamodifyselection.*
+%{_libdir}/kde3/kritanoisefilter.*
+%{_libdir}/kde3/kritarandompickfilter.*
+%{_libdir}/kde3/kritasubstrate.*
+%{_libdir}/kde3/kritatoolcurves.*
+%{_libdir}/kde3/kritatoolperspectivegrid.*
+%{_libdir}/kde3/kritatoolperspectivetransform.*
+%{_libdir}/kde3/kritaunsharpfilter.*
+%{_libdir}/kde3/kritawavefilter.*
 %{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -768,9 +785,11 @@
 %{_libdir}/kde3/libhancomwordimport.*
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libpowerpointimport.*
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_libdir}/kde3/libolefilter.*
 %{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
 
@@ -786,6 +805,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0
+- version upgrade
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - 1.5.3-3
 - respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Aug 2006 09:15:26 -0000	1.12
+++ sources	20 Oct 2006 13:43:42 -0000	1.13
@@ -1 +1 @@
-cbe9deeb7c811a6bb5a954989b25c1f2  koffice-1.5.2.tar.bz2
+e669cf19b2e1c7db7029c0772c527c0d  koffice-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 14:09:27 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Fri, 20 Oct 2006 07:09:27 -0700
Subject: rpms/listen/FC-5 listen.spec,1.13,1.14
Message-ID: <200610201409.k9KE9RXc026449@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26419/FC-5

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- listen.spec	14 Oct 2006 16:16:00 -0000	1.13
+++ listen.spec	20 Oct 2006 14:08:57 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        7.beta1%{?dist}
+Release:        8.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -89,6 +89,10 @@
 %{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
 # enable the use of %{find_lang} macros
 %{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%ifarch x86_64
+# correct a path issue that prevent Listen to be launched on a x86_64 box
+%{__sed} -i 's/lib\/listen/lib64\/listen/' listen
+%endif
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -138,12 +142,16 @@
 %doc gpl.txt
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
-%{_datadir}/%{name}/trackedit.glade
-%{_datadir}/%{name}/img/
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Fri Nov 20 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-8.beta1
+- Fixed a path issue that prevent Listen to be launched on x86_64 
+ systems. Now owns {_datadir}/%{name}
+
 * Sat Nov 14 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 



From fedora-extras-commits at redhat.com  Fri Oct 20 14:09:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Fri, 20 Oct 2006 07:09:28 -0700
Subject: rpms/listen/devel listen.spec,1.13,1.14
Message-ID: <200610201409.k9KE9SOa026452@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26419/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- listen.spec	14 Oct 2006 16:16:00 -0000	1.13
+++ listen.spec	20 Oct 2006 14:08:58 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        7.beta1%{?dist}
+Release:        8.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 
 Group:          Applications/Multimedia
@@ -89,6 +89,10 @@
 %{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
 # enable the use of %{find_lang} macros
 %{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%ifarch x86_64
+# correct a path issue that prevent Listen to be launched on a x86_64 box
+%{__sed} -i 's/lib\/listen/lib64\/listen/' listen
+%endif
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -138,12 +142,16 @@
 %doc gpl.txt
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
-%{_datadir}/%{name}/trackedit.glade
-%{_datadir}/%{name}/img/
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Fri Nov 20 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-8.beta1
+- Fixed a path issue that prevent Listen to be launched on x86_64 
+ systems. Now owns {_datadir}/%{name}
+
 * Sat Nov 14 2006 Ha??kel Gu??mar <karlthered at gmail.com> 0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 



From fedora-extras-commits at redhat.com  Fri Oct 20 14:33:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Fri, 20 Oct 2006 07:33:42 -0700
Subject: rpms/listen/FC-5 listen.spec,1.14,1.15
Message-ID: <200610201433.k9KEXgcg026772@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26742/FC-5

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- listen.spec	20 Oct 2006 14:08:57 -0000	1.14
+++ listen.spec	20 Oct 2006 14:33:11 -0000	1.15
@@ -91,7 +91,7 @@
 %{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
 %ifarch x86_64
 # correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen/lib64\/listen/' listen
+%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
 %endif
 
 %build



From fedora-extras-commits at redhat.com  Fri Oct 20 14:33:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Fri, 20 Oct 2006 07:33:43 -0700
Subject: rpms/listen/devel listen.spec,1.14,1.15
Message-ID: <200610201433.k9KEXhlu026775@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26742/devel

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- listen.spec	20 Oct 2006 14:08:58 -0000	1.14
+++ listen.spec	20 Oct 2006 14:33:12 -0000	1.15
@@ -91,7 +91,7 @@
 %{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
 %ifarch x86_64
 # correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen/lib64\/listen/' listen
+%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
 %endif
 
 %build



From fedora-extras-commits at redhat.com  Fri Oct 20 15:01:09 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 20 Oct 2006 08:01:09 -0700
Subject: rpms/lat/devel lat.spec, 1.10, 1.11 sources, 1.5, 1.6 .cvsignore,
	1.5, 1.6
Message-ID: <200610201501.k9KF19RK032633@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/lat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29683

Modified Files:
	lat.spec sources .cvsignore 
Log Message:
update to 1.2.1.1



Index: lat.spec
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/lat.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lat.spec	3 Oct 2006 09:40:17 -0000	1.10
+++ lat.spec	20 Oct 2006 15:00:39 -0000	1.11
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
-Version:            1.2.0.1
-Release:            2%{?dist}
+Version:            1.2.1.1
+Release:            1%{?dist}
 License:            GPL
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Fri Oct 20 2006 Paul Howarth <paul at city-fan.org> 1.2.1.1-1
+- Update to 1.2.1.1
+
 * Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 1.2.0.1-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Sep 2006 07:32:08 -0000	1.5
+++ sources	20 Oct 2006 15:00:39 -0000	1.6
@@ -1 +1 @@
-49211681138598392d10a4cfc2effd66  lat-1.2.0.1.tar.gz
+aea2b241321bd829f33d69813a842c6b  lat-1.2.1.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Sep 2006 07:32:08 -0000	1.5
+++ .cvsignore	20 Oct 2006 15:00:39 -0000	1.6
@@ -1 +1 @@
-lat-1.2.0.1.tar.gz
+lat-1.2.1.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 17:01:19 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:01:19 -0700
Subject: rpms/international-time - New directory
Message-ID: <200610201701.k9KH1JDL007731@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7727/international-time

Log Message:
Directory /cvs/extras/rpms/international-time added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 17:01:25 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:01:25 -0700
Subject: rpms/international-time/devel - New directory
Message-ID: <200610201701.k9KH1P1I007757@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7727/international-time/devel

Log Message:
Directory /cvs/extras/rpms/international-time/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 17:02:07 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:02:07 -0700
Subject: rpms/international-time Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610201702.k9KH273m007790@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784

Added Files:
	Makefile import.log 
Log Message:
Setup of module international-time


--- NEW FILE Makefile ---
# Top level Makefile for module international-time
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 20 17:02:14 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:02:14 -0700
Subject: rpms/international-time/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610201702.k9KH2EEG007808@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module international-time


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 20 17:03:40 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:03:40 -0700
Subject: rpms/international-time/devel international-time.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610201703.k9KH3eI3007886@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7850/devel

Modified Files:
	.cvsignore sources 
Added Files:
	international-time.spec 
Log Message:
auto-import international-time-0.0.2-2 on branch devel from international-time-0.0.2-2.src.rpm


--- NEW FILE international-time.spec ---
Summary: 	A tool for arranging times in advance with overseas colleagues
Name: 		international-time
Version: 	0.0.2
Release: 	2%{?dist}
License: 	GPL
Group: 		Applications/System
Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
Url:            http://cyberelk.net/tim/data/international-time/
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: 	noarch

BuildRequires: 	desktop-file-utils >= 0.2.92
Requires: 	pygtk2-libglade

%description
This is a graphical tool for converting a local "wall-clock" time into
UTC.  This is useful for arranging conference calls where participants
from other countries are expected

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

%build

%install
rm -rf %{buildroot}

cat >international-time.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=International Time
Comment=International Time Coordinator
Exec=/usr/bin/international-time
Terminal=false
Type=Application
EOF

mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/applications
install -m 0755 international-time.py %{buildroot}%{_bindir}/international-time
install -m 0644 international-time.glade %{buildroot}%{_datadir}/%{name}
desktop-file-install --vendor fedora \
  --dir %{buildroot}%{_datadir}/applications \
  --add-category X-Fedora \
  international-time.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/*

%changelog
* Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1
- 0.0.2.  More fixes from package review.

* Thu Oct 12 2006 Tim Waugh <twaugh at redhat.com> 0.0.1-2
- Fixes from package review.

* Thu Jul 27 2006 Tim Waugh <twaugh at redhat.com> 0.0.1-1
- Minor GUI change.

* Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com>
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/international-time/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2006 17:02:14 -0000	1.1
+++ .cvsignore	20 Oct 2006 17:03:09 -0000	1.2
@@ -0,0 +1 @@
+international-time-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/international-time/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2006 17:02:14 -0000	1.1
+++ sources	20 Oct 2006 17:03:09 -0000	1.2
@@ -0,0 +1 @@
+547469b393684f987a7e6656e6da66e0  international-time-0.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 17:03:37 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:03:37 -0700
Subject: rpms/international-time import.log,1.1,1.2
Message-ID: <200610201703.k9KH3bu3007882@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7850

Modified Files:
	import.log 
Log Message:
auto-import international-time-0.0.2-2 on branch devel from international-time-0.0.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/international-time/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Oct 2006 17:02:07 -0000	1.1
+++ import.log	20 Oct 2006 17:03:06 -0000	1.2
@@ -0,0 +1 @@
+international-time-0_0_2-2:HEAD:international-time-0.0.2-2.src.rpm:1161363770



From fedora-extras-commits at redhat.com  Fri Oct 20 17:07:10 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 20 Oct 2006 10:07:10 -0700
Subject: owners owners.list,1.1857,1.1858
Message-ID: <200610201707.k9KH7A9T008007@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7986/owners

Modified Files:
	owners.list 
Log Message:
international-time


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1857
retrieving revision 1.1858
diff -u -r1.1857 -r1.1858
--- owners.list	20 Oct 2006 01:04:04 -0000	1.1857
+++ owners.list	20 Oct 2006 17:06:40 -0000	1.1858
@@ -703,6 +703,7 @@
 Fedora Extras|initng-ifiles|Scripts for initng|dm at mensa.se|extras-qa at fedoraproject.org|
 Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inotify-tools|Command line utilities for inotify|gajownik at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|international-time|Utility for arranging international meeting times|twaugh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Oct 20 17:10:29 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 20 Oct 2006 10:10:29 -0700
Subject: rpms/enemies-of-carlotta/devel enemies-of-carlotta.spec,1.6,1.7
Message-ID: <200610201710.k9KHATxm008052@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/enemies-of-carlotta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036

Modified Files:
	enemies-of-carlotta.spec 
Log Message:

- Temporarily exclude the french man pages to evade an update
  conflict with man-pages-fr



Index: enemies-of-carlotta.spec
===================================================================
RCS file: /cvs/extras/rpms/enemies-of-carlotta/devel/enemies-of-carlotta.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- enemies-of-carlotta.spec	15 Sep 2006 07:37:40 -0000	1.6
+++ enemies-of-carlotta.spec	20 Oct 2006 17:09:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           enemies-of-carlotta
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple mailing list manager
 
 Group:          Applications/Internet
@@ -48,12 +48,16 @@
 %{_bindir}/enemies-of-carlotta
 %{_datadir}/%{name}
 %{_mandir}/man1/*
-%{_mandir}/fr/man1/*
+%exclude %{_mandir}/fr/man1/*
 %{_mandir}/es/man1/*
 
 
 
 %changelog
+* Fri Oct 20 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.2-3.fc6
+- Temporarily exclude the french man pages to evade an update
+  conflict with man-pages-fr
+
 * Thu Sep 15 2006 Ralf Ertzinger <ralf at skytale.net> 1.2.2-2.fc6
 - Update to 1.2.2
 



From fedora-extras-commits at redhat.com  Fri Oct 20 18:41:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 20 Oct 2006 11:41:11 -0700
Subject: rpms/fontforge/devel fontforge.spec, 1.20, 1.21 sources, 1.9,
	1.10 .cvsignore, 1.9, 1.10
Message-ID: <200610201841.k9KIfBKt011775@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11755

Modified Files:
	fontforge.spec sources .cvsignore 
Log Message:
Update to 20061019



Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fontforge.spec	4 Oct 2006 22:30:43 -0000	1.20
+++ fontforge.spec	20 Oct 2006 18:40:41 -0000	1.21
@@ -1,9 +1,9 @@
-%define docs_version 20060822
+%define docs_version 20061014
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20060822
-Release:        2%{?dist}
+Version:        20061019
+Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Fri Oct 20 2006 Kevin Fenzi <kevin at tummy.com> - 20061019-1
+- Update to 20061019
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 20060822-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Sep 2006 04:58:23 -0000	1.9
+++ sources	20 Oct 2006 18:40:41 -0000	1.10
@@ -1,2 +1,2 @@
-872a8013be82e322677f7c254101544d  fontforge_full-20060822.tar.bz2
-40f374cf43d57d8e8f29e7fe25bf8f39  fontforge_htdocs-20060822.tar.bz2
+17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
+c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Sep 2006 04:58:23 -0000	1.9
+++ .cvsignore	20 Oct 2006 18:40:41 -0000	1.10
@@ -1,2 +1,2 @@
-fontforge_full-20060822.tar.bz2
-fontforge_htdocs-20060822.tar.bz2
+fontforge_full-20061019.tar.bz2
+fontforge_htdocs-20061014.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 18:57:19 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Fri, 20 Oct 2006 11:57:19 -0700
Subject: rpms/libmtp/devel .cvsignore, 1.2, 1.3 libmtp.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610201857.k9KIvJgA011930@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11909

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 18:15:02 -0000	1.2
+++ .cvsignore	20 Oct 2006 18:56:49 -0000	1.3
@@ -1 +1 @@
-libmtp-0.0.20.tar.gz
+libmtp-0.0.21.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmtp.spec	27 Sep 2006 18:15:02 -0000	1.1
+++ libmtp.spec	20 Oct 2006 18:56:49 -0000	1.2
@@ -11,7 +11,7 @@
 #
 
 Name:           libmtp
-Version:        0.0.20
+Version:        0.0.21
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Oct 20 2006 Linus Walleij <triad at df.lth.se> 0.0.21-1
+- New upstream release.
+
 * Tue Sep 26 2006 Linus Walleij <triad at df.lth.se> 0.0.20-1
 - New upstream release.
 - Updated after review by Parag AN, Kevin Fenzi and Ralf Corsepius.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Sep 2006 18:15:02 -0000	1.2
+++ sources	20 Oct 2006 18:56:49 -0000	1.3
@@ -1 +1 @@
-0f79eb3b7ee672e1196d260a6dee5bcd  libmtp-0.0.20.tar.gz
+621b4590c3c0d09f3546ad67f39ef80b  libmtp-0.0.21.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 18:59:24 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Fri, 20 Oct 2006 11:59:24 -0700
Subject: rpms/libmtp/FC-5 .cvsignore, 1.2, 1.3 libmtp.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610201859.k9KIxOwC012018@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11988

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Sep 2006 18:15:02 -0000	1.2
+++ .cvsignore	20 Oct 2006 18:58:53 -0000	1.3
@@ -1 +1 @@
-libmtp-0.0.20.tar.gz
+libmtp-0.0.21.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/FC-5/libmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmtp.spec	27 Sep 2006 18:15:02 -0000	1.1
+++ libmtp.spec	20 Oct 2006 18:58:53 -0000	1.2
@@ -11,7 +11,7 @@
 #
 
 Name:           libmtp
-Version:        0.0.20
+Version:        0.0.21
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Oct 20 2006 Linus Walleij <triad at df.lth.se> 0.0.21-1
+- New upstream release.
+
 * Tue Sep 26 2006 Linus Walleij <triad at df.lth.se> 0.0.20-1
 - New upstream release.
 - Updated after review by Parag AN, Kevin Fenzi and Ralf Corsepius.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Sep 2006 18:15:02 -0000	1.2
+++ sources	20 Oct 2006 18:58:53 -0000	1.3
@@ -1 +1 @@
-0f79eb3b7ee672e1196d260a6dee5bcd  libmtp-0.0.20.tar.gz
+621b4590c3c0d09f3546ad67f39ef80b  libmtp-0.0.21.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 19:00:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 20 Oct 2006 12:00:32 -0700
Subject: rpms/fontforge/FC-5 fontforge.spec, 1.17, 1.18 sources, 1.8,
	1.9 .cvsignore, 1.8, 1.9
Message-ID: <200610201900.k9KJ0WC7012102@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fontforge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12036

Modified Files:
	fontforge.spec sources .cvsignore 
Log Message:
Update to 20061019
Sync up with devel



Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/fontforge.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fontforge.spec	13 Feb 2006 18:06:43 -0000	1.17
+++ fontforge.spec	20 Oct 2006 19:00:02 -0000	1.18
@@ -1,9 +1,9 @@
-%define docs_version 20060114
+%define docs_version 20061014
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20060125
-Release:        6%{?dist}
+Version:        20061019
+Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -11,8 +11,7 @@
 URL:            http://fontforge.sourceforge.net/
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
-Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tgz
-Patch1:         fontforge-20060125-glibccrash.patch
+Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -27,6 +26,7 @@
 BuildRequires:  libuninameslist-devel
 BuildRequires:  libXt-devel
 BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  gettext
 
 Obsoletes:      pfaedit
 Provides:       pfaedit
@@ -39,12 +39,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .glibccrash
 
 mkdir htdocs
-tar xzf %{SOURCE2} -C htdocs
+tar xjf %{SOURCE2} -C htdocs
 rm -rf htdocs/scripts
-chmod 644 htdocs/*
+chmod 644 htdocs/*.gif
+chmod 644 htdocs/*.html
+chmod 644 htdocs/*.png
 mkdir cidmaps
 tar xzf htdocs/cidmaps.tgz -C cidmaps
 
@@ -57,6 +58,7 @@
 
 %build
 export CPPFLAGS='-DDOCDIR=\"%{_docdir}/%{name}-%{version}/htdocs\"'
+export LIBS=-lgif
 %configure --with-regular-link --with-freetype-bytecode=no
 
 make %{?_smp_mflags}
@@ -110,6 +112,21 @@
 
 
 %changelog
+* Fri Oct 20 2006 Kevin Fenzi <kevin at tummy.com> - 20061019-1
+- Update to 20061019
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 20060822-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Thu Sep 21 2006 Kevin Fenzi <kevin at tummy.com> - 20060822-1
+- Update to 20060822
+- Remove unneeded patch
+- Add flag to compile right with giflib
+
+* Sun Jun 18 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-7
+- Add BuildRequires on gettext, to make sure the package builds in minimal
+  mock environments
+
 * Mon Feb 13 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-6
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Feb 2006 12:33:42 -0000	1.8
+++ sources	20 Oct 2006 19:00:02 -0000	1.9
@@ -1,2 +1,2 @@
-831ac5225b1a9b00b0b7bcf622c62fee  fontforge_full-20060125.tar.bz2
-78a9f24e14c3e89afb5b88622f675546  fontforge_htdocs-20060114.tgz
+17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
+c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Feb 2006 12:33:42 -0000	1.8
+++ .cvsignore	20 Oct 2006 19:00:02 -0000	1.9
@@ -1,2 +1,2 @@
-fontforge_full-20060125.tar.bz2
-fontforge_htdocs-20060114.tgz
+fontforge_full-20061019.tar.bz2
+fontforge_htdocs-20061014.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 20 19:03:20 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 20 Oct 2006 12:03:20 -0700
Subject: rpms/munin/FC-5 munin-1.2.5-hddtemp_smartctl-config, NONE,
	1.1 munin-node.logrotate, NONE, 1.1 munin.logrotate, NONE,
	1.1 munin.spec, 1.8, 1.9 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200610201903.k9KJ3KFB015089@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15053

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.2.5-hddtemp_smartctl-config munin-node.logrotate 
	munin.logrotate 
Log Message:
Update to 1.2.5
Fix HD stats (fixes #205042)
Add in logrotate scripts that seem to have been dropped upstream



--- NEW FILE munin-1.2.5-hddtemp_smartctl-config ---
[hddtemp_smartctl]
user root


--- NEW FILE munin-node.logrotate ---
/var/log/munin/munin-node.log {
	daily
	missingok
	rotate 7
	compress
	copytruncate
	notifempty
	create 640 root adm
}


--- NEW FILE munin.logrotate ---
/var/log/munin/munin-update.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-graph.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-html.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}

/var/log/munin/munin-limits.log {
        daily
        missingok
        rotate 7
        compress
        notifempty
        create 640 munin adm
}


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/munin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- munin.spec	28 Jun 2006 04:38:36 -0000	1.8
+++ munin.spec	20 Oct 2006 19:02:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.4
-Release:   9%{?dist}
+Version:   1.2.5
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -10,6 +10,9 @@
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
 Source1: munin-1.2.4-sendmail-config
+Source2: munin-1.2.5-hddtemp_smartctl-config
+Source3: munin-node.logrotate
+Source4: munin.logrotate
 Patch0: munin-1.2.4-cron.patch
 Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
@@ -17,8 +20,8 @@
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
-Requires(pre):		fedora-usermgmt >= 0.7
-Requires(postun):	fedora-usermgmt >= 0.7
+Requires(pre): fedora-usermgmt >= 0.7
+Requires(postun): fedora-usermgmt >= 0.7
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -104,8 +107,6 @@
 
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/
 install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
-install -m0644 dists/debian/munin.logrotate %{buildroot}/etc/logrotate.d/munin
-install -m0644 dists/debian/munin-node.logrotate %{buildroot}/etc/logrotate.d/munin-node
 
 # 
 # remove the Sybase plugin for now, as they need perl modules 
@@ -127,6 +128,11 @@
 install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog
 # install config for sendmail under fedora
 install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
+# install config for hddtemp_smartctl
+install -m 0644 %{SOURCE2} %{buildroot}/etc/munin/plugin-conf.d/hddtemp_smartctl
+# install logrotate scripts
+install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
+install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -177,6 +183,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
+%{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
@@ -204,6 +211,7 @@
 %config(noreplace) /etc/munin/munin-node.conf
 %config(noreplace) /etc/munin/plugin-conf.d/munin-node
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
+%config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
 %config(noreplace) /etc/logrotate.d/munin-node
 /etc/rc.d/init.d/munin-node
 %config(noreplace) /etc/munin/plugins.conf
@@ -226,6 +234,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Tue Oct 17 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
+- Update to 1.2.5
+- Fix HD stats (fixes #205042)
+- Add in logrotate scripts that seem to have been dropped upstream
+
 * Tue Jun 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-9
 - Re-enable snmp plugins now that perl-Net-SNMP is available (fixes 196588)
 - Thanks to Herbert Straub <herbert at linuxhacker.at> for patch. 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2005 03:38:04 -0000	1.2
+++ sources	20 Oct 2006 19:02:50 -0000	1.3
@@ -1 +1 @@
-f91f5d96c01d8527db1d2f4b3f0f4cc5  munin_1.2.4.tar.gz
+e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2005 03:38:04 -0000	1.2
+++ .cvsignore	20 Oct 2006 19:02:50 -0000	1.3
@@ -1 +1 @@
-munin_1.2.4.tar.gz
+munin_1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 19:39:45 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Fri, 20 Oct 2006 12:39:45 -0700
Subject: kadischi kadischi.spec,1.45,1.46
Message-ID: <200610201939.k9KJdjkP018981@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18960/kadischi

Modified Files:
	kadischi.spec 
Log Message:
Remove unneccessary Requires


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kadischi.spec	13 Oct 2006 18:56:53 -0000	1.45
+++ kadischi.spec	20 Oct 2006 19:39:43 -0000	1.46
@@ -13,7 +13,7 @@
 
 BuildRequires:  kudzu-devel intltool automake desktop-file-utils glib2-devel
 Requires:       anaconda busybox-anaconda syslinux mkisofs squashfs-tools
-Requires:       usermode gnome-python2-gtkhtml2
+Requires:       usermode
 AutoReqProv:    on
 
 %description
@@ -91,6 +91,10 @@
 %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo
 
 %changelog
+* Fri Oct 20 2006 <jasperhartline at adelphia.net> 3.4-4.20061020cvs
+- Removed gnome-python2-gtkhtml2 as Requires.
+
+
 * Fri Oct 13 2006 <jasperhartline at adelphia.net> 3.4-3.20061013cvs
 - Add glib2-devel as BuildRequires.
 



From fedora-extras-commits at redhat.com  Fri Oct 20 19:42:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:42:27 -0700
Subject: rpms/ntfs-3g - New directory
Message-ID: <200610201942.k9KJgRM1019111@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19107/ntfs-3g

Log Message:
Directory /cvs/extras/rpms/ntfs-3g added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 19:42:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:42:33 -0700
Subject: rpms/ntfs-3g/devel - New directory
Message-ID: <200610201942.k9KJgXPv019125@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19107/ntfs-3g/devel

Log Message:
Directory /cvs/extras/rpms/ntfs-3g/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 20 19:42:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:42:47 -0700
Subject: rpms/ntfs-3g Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610201942.k9KJglZQ019156@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19150

Added Files:
	Makefile import.log 
Log Message:
Setup of module ntfs-3g


--- NEW FILE Makefile ---
# Top level Makefile for module ntfs-3g
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 20 19:42:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:42:53 -0700
Subject: rpms/ntfs-3g/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610201942.k9KJgrL6019172@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19150/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ntfs-3g


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 20 19:44:05 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:44:05 -0700
Subject: rpms/ntfs-3g import.log,1.1,1.2
Message-ID: <200610201944.k9KJi5sS019252@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217

Modified Files:
	import.log 
Log Message:
auto-import ntfs-3g-0-0.3.20070920.fc6 on branch devel from ntfs-3g-0-0.3.20070920.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Oct 2006 19:42:47 -0000	1.1
+++ import.log	20 Oct 2006 19:43:34 -0000	1.2
@@ -0,0 +1 @@
+ntfs-3g-0-0_3_20070920_fc6:HEAD:ntfs-3g-0-0.3.20070920.fc6.src.rpm:1161373419



From fedora-extras-commits at redhat.com  Fri Oct 20 19:44:05 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 20 Oct 2006 12:44:05 -0700
Subject: rpms/ntfs-3g/devel ntfs-3g-20070920-BETA-noldconfig.patch, NONE,
	1.1 ntfs-3g.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610201944.k9KJi5cc019256@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ntfs-3g-20070920-BETA-noldconfig.patch ntfs-3g.spec 
Log Message:
auto-import ntfs-3g-0-0.3.20070920.fc6 on branch devel from ntfs-3g-0-0.3.20070920.fc6.src.rpm

ntfs-3g-20070920-BETA-noldconfig.patch:

--- NEW FILE ntfs-3g-20070920-BETA-noldconfig.patch ---
--- ntfs-3g-20070920-BETA/src/Makefile.in.BAD	2006-10-15 19:15:01.000000000 -0500
+++ ntfs-3g-20070920-BETA/src/Makefile.in	2006-10-15 19:15:08.000000000 -0500
@@ -579,7 +579,6 @@ libs:
 install-exec-hook:
 	$(INSTALL) -d $(DESTDIR)/sbin
 	$(LN_S) -f $(bindir)/ntfs-3g $(DESTDIR)/sbin/mount.ntfs-3g
-	ldconfig
 
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)$(man8dir)


--- NEW FILE ntfs-3g.spec ---
%define buildrev 20070920

Name:		ntfs-3g
Summary: 	Linux NTFS userspace driver 
Version:	0
Release:	0.3.%{buildrev}%{?dist}
License:	GPL
Group:		System Environment/Base
Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
Patch0:		ntfs-3g-20070920-BETA-noldconfig.patch
URL:		http://mlf.linux.rulez.org/mlf/ezaz/ntfs-3g-download.html
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	fuse-devel
Requires:	fuse
Epoch:		1

%description
The ntfs-3g driver is an open source, GPL licensed, third generation 
Linux NTFS driver. It provides full read-write access to NTFS, excluding 
access to encrypted files, writing compressed files, changing file 
ownership, access right.

Technically it???s based on and a major improvement to the third 
generation Linux NTFS driver, ntfsmount. The improvements include 
functionality, quality and performance enhancements.

ntfs-3g features are being merged to ntfsmount. In the meanwhile, 
ntfs-3g is currently the only free, as in either speech or beer, NTFS 
driver for Linux that supports unlimited file creation and deletion.

%package devel
Summary:	Development files and libraries for ntfs-3g
Group:		Development/Libraries
Requires:	%{name} = %{epoch}:%{version}-%{release}

%description devel
Headers and libraries for developing applications that use ntfs-3g 
functionality.

%prep
%setup -q -n %{name}-%{buildrev}-BETA
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la

# make the symlink an actual copy to avoid confusion
rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
/sbin/mount.ntfs-3g
%{_bindir}/ntfs-3g
%{_libdir}/libntfs-3g.so.*
%{_mandir}/man8/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/ntfs-3g/
%{_libdir}/libntfs-3g.so

%changelog
* Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.3.20070920
- add explicit Requires on fuse

* Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.2.20070920
- fixed versioning (bumped epoch, since it now shows as older)
- change sbin symlink to actual copy to be safe

* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.1.20070920-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2006 19:42:52 -0000	1.1
+++ .cvsignore	20 Oct 2006 19:43:35 -0000	1.2
@@ -0,0 +1 @@
+ntfs-3g-20070920-BETA.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2006 19:42:52 -0000	1.1
+++ sources	20 Oct 2006 19:43:35 -0000	1.2
@@ -0,0 +1 @@
+6382355a472c96e0ed9f4f62d4d9496f  ntfs-3g-20070920-BETA.tgz



From fedora-extras-commits at redhat.com  Fri Oct 20 22:31:56 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 20 Oct 2006 15:31:56 -0700
Subject: rpms/kst/devel .cvsignore,1.4,1.5 kst.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200610202231.k9KMVuBk028887@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28863

Modified Files:
	.cvsignore kst.spec sources 
Log Message:
Kst is now at version 1.3.1 (to fix a few bugs from 1.3.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2006 14:44:39 -0000	1.4
+++ .cvsignore	20 Oct 2006 22:31:25 -0000	1.5
@@ -1 +1 @@
-kst-1.3.0.tar.gz
+kst-1.3.1.tar.gz


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kst.spec	29 Sep 2006 23:56:34 -0000	1.8
+++ kst.spec	20 Oct 2006 22:31:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:       kst
-Version:    1.3.0
-Release:    2%{?dist}
+Version:    1.3.1
+Release:    1%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -211,6 +211,9 @@
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %changelog
+* Fri Oct 20 2006 Matthew Truch <matt at truch.net> - 1.3.1-1
+- Update to kst 1.3.1 bugfix release.
+
 * Fri Sep 29 2006 Matthew Truch <matt at truch.net> - 1.3.0-2
 - Bump release to maintain upgrade path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2006 14:44:39 -0000	1.4
+++ sources	20 Oct 2006 22:31:25 -0000	1.5
@@ -1 +1 @@
-3a3978eb498c456bb23c261dbd82d215  kst-1.3.0.tar.gz
+b18013223dc4cc2d1d0c8c4197bf8f97  kst-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 20 22:41:25 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Fri, 20 Oct 2006 15:41:25 -0700
Subject: accounts2 52fc-fedora-group.ldif, NONE,
	1.1 52fc-fedora-membership.ldif, NONE,
	1.1 52fc-fedora-person.ldif, NONE, 1.1
Message-ID: <200610202241.k9KMfPsb028965@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28946

Added Files:
	52fc-fedora-group.ldif 52fc-fedora-membership.ldif 
	52fc-fedora-person.ldif 
Log Message:
These changes were made for compatability with FDS



--- NEW FILE 52fc-fedora-group.ldif ---
#this is the fedora group schema file for use with the accounts system2
#it currently contains the following:
#owner (the owner's DN) 
#group_type 
#needs_sponsor 
#user_can_remove (will be handled by ACLs, but we need to clue the interface about it) #prerequisite_id (no idea what that is, so maybe not)  -- not included yet
#joinmsg 
dn: cn=schema
attributeTypes: ( 2.5.444.10 NAME 'groupowner' DESC 'group owner' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
attributeTypes: ( 2.5.444.11 NAME 'grouptype' DESC 'the type of group' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
attributeTypes: ( 2.5.444.12 NAME 'needssponsor' DESC 'boolean indicating whether or not the group needs a sponsor' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
attributeTypes: ( 2.5.444.13 NAME 'usercanremove' DESC 'boolean indicating whether or not the user can remove the group' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
attributeTypes: ( 2.5.444.14 NAME 'joinmsg' DESC 'message received upon joining the group' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
objectclasses:	( 2.5.555.3 NAME 'fedoraGroup' DESC 'A object describing a group entry' SUP top STRUCTURAL MUST ( cn $ groupowner ) MAY ( joinmsg $ usercanremove $ grouptype $ needssponsor $ usercanremove ) )



--- NEW FILE 52fc-fedora-membership.ldif ---
#this is the fedoraMembership shema file for use with the Account system
#check out http://www.openldap.org/doc/admin23/schema.html#Extending%20Schema 
#for more information
#for now this is the contents
#role_type 
#role_domain 
#role_status 
#internal_comments 
#sponsor (points to the sponsor's DN) 
#creation (date) 
#approval (date) 
#don't have a name use cn instead
#attributeType ( 2.5.444.1 NAME 'name'
#                DESC 'group name'
#                EQUALITY caseIgnoreMatch
#                SUBSTR caseIgnoreSubstringsMatch
#                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
dn: cn=schema
attributeTypes: ( 2.5.444.2 NAME 'roletype' DESC 'the type of membership role' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
attributeTypes: ( 2.5.444.15 NAME 'roledomain' DESC 'the domain of this role' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
attributeTypes: ( 2.5.444.3 NAME 'rolestatus' DESC 'the approval status of this role' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
attributeTypes: ( 2.5.444.4 NAME 'internalcomments' DESC 'group membership comments' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
attributeTypes: ( 2.5.444.5 NAME 'sponsor' DESC 'membership sponsor' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
attributeTypes: ( 2.5.444.6 NAME 'creationdate' DESC 'membership creation date' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
attributeTypes: ( 2.5.444.7 NAME 'approvaldate' DESC 'membership approval date' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
objectclasses:	( 2.5.555.2 NAME 'fedoraMembership' DESC 'An object describing a persons memebership' SUP top STRUCTURAL MUST ( cn  ) MAY ( approvaldate $ creationdate $ approvaldate $ roletype $ rolestatus $ roledomain $ internalcomments $ sponsor ) )


--- NEW FILE 52fc-fedora-person.ldif ---
#this is the fedoraPerson shema file for use with the Account system
#it is based on the inetOrgPerson shema, but has some spicific
#attribues added onto it for use by the Account system
#for now this is the contents
#sshkey bugzillaemail
dn: cn=schema
attributeTypes: ( 2.5.444.8 NAME 'sshkey' DESC 'ssh key for this member' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
attributeTypes: ( 2.5.444.9 NAME 'bugzillaemail' DESC 'members preferred bugzilla email address' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
# fedoraPerson
# The fedoraPerson represents people who are a member of the fedora project
# in some way.  It is a structural class and inherits
# from the inetOrgPerson class
objectclasses:	( 2.5.555.1 NAME 'fedoraPerson' DESC 'A member of the fedoraproject group' SUP inetOrgPerson STRUCTURAL MUST ( sshkey $ bugzillaemail ) )



From fedora-extras-commits at redhat.com  Fri Oct 20 23:56:51 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri, 20 Oct 2006 16:56:51 -0700
Subject: rpms/mantis/FC-4 mantis-0.19.5-unreleased.patch, NONE,
	1.1 mantis.spec, 1.8, 1.9
Message-ID: <200610202356.k9KNup2U032096@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32077

Modified Files:
	mantis.spec 
Added Files:
	mantis-0.19.5-unreleased.patch 
Log Message:
Add unreleased security patches from upsream CVS


mantis-0.19.5-unreleased.patch:

--- NEW FILE mantis-0.19.5-unreleased.patch ---
? mantis-0.19.5-unreleased.patch
Index: bug_view_advanced_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_advanced_page.php,v
retrieving revision 1.67
retrieving revision 1.67.6.1
diff -u -r1.67 -r1.67.6.1
--- bug_view_advanced_page.php	25 Oct 2004 19:59:12 -0000	1.67
+++ bug_view_advanced_page.php	1 Jan 2006 04:29:49 -0000	1.67.6.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: bug_view_advanced_page.php,v 1.67 2004/10/25 19:59:12 marcelloscata Exp $
+	# $Id: bug_view_advanced_page.php,v 1.67.6.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 
 	require_once( 'core.php' );
@@ -136,7 +136,7 @@
 	<!-- Category -->
 	<td>
 		<?php
-			$t_project_name = project_get_field( $t_bug->project_id, 'name' );
+			$t_project_name = string_display( project_get_field( $t_bug->project_id, 'name' ) );
 			echo "[$t_project_name] $t_bug->category";
 		?>
 	</td>
Index: bug_view_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_page.php,v
retrieving revision 1.70
retrieving revision 1.70.6.1
diff -u -r1.70 -r1.70.6.1
--- bug_view_page.php	17 Oct 2004 00:14:27 -0000	1.70
+++ bug_view_page.php	1 Jan 2006 04:29:49 -0000	1.70.6.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: bug_view_page.php,v 1.70 2004/10/17 00:14:27 thraxisp Exp $
+	# $Id: bug_view_page.php,v 1.70.6.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -138,7 +138,7 @@
 	<!-- Category -->
 	<td>
 		<?php
-			$t_project_name = project_get_field( $t_bug->project_id, 'name' );
+			$t_project_name = string_display( project_get_field( $t_bug->project_id, 'name' ) );
 			echo "[$t_project_name] $t_bug->category";
 		?>
 	</td>
Index: changelog_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/changelog_page.php,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -r1.9 -r1.9.6.1
--- changelog_page.php	25 Oct 2004 19:51:02 -0000	1.9
+++ changelog_page.php	1 Jan 2006 04:29:49 -0000	1.9.6.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: changelog_page.php,v 1.9 2004/10/25 19:51:02 marcelloscata Exp $
+	# $Id: changelog_page.php,v 1.9.6.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 
 	require_once( 'core.php' );
@@ -21,7 +21,7 @@
 		$t_version_name = version_get_field( $p_version_id, 'version' );
 		$t_project_name = project_get_field( $t_project_id, 'name' );
 
-		$t_release_title = $t_project_name . ' - ' . $t_version_name;
+		$t_release_title = string_display( $t_project_name ) . ' - ' . string_display( $t_version_name );
 		echo $t_release_title, '<br />';
 		echo str_pad( '', strlen( $t_release_title ), '=' ), '<br />';
 
@@ -56,7 +56,7 @@
 
 	$t_version_rows = version_get_all_rows( $f_project_id );
 
-	echo '<br /><span class="pagetitle">', $t_project_name, ' - ', lang_get( 'changelog' ), '</span><br /><br />';
+	echo '<br /><span class="pagetitle">', string_display( $t_project_name ), ' - ', lang_get( 'changelog' ), '</span><br /><br />';
 	echo '<tt>';
 
 	$i = 0;
Index: manage_proj_create.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_create.php,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- manage_proj_create.php	1 Dec 2004 12:45:22 -0000	1.6
+++ manage_proj_create.php	1 Jan 2006 04:29:49 -0000	1.6.4.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: manage_proj_create.php,v 1.6 2004/12/01 12:45:22 vboctor Exp $
+	# $Id: manage_proj_create.php,v 1.6.4.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php require_once( 'core.php' ) ?>
@@ -19,7 +19,7 @@
 	$f_status		= gpc_get_int( 'status' );
 	$f_file_path	= gpc_get_string( 'file_path', '' );
 
-	$t_project_id = project_create( $f_name, $f_description, $f_status, $f_view_state, $f_file_path );
+	$t_project_id = project_create( string_strip_tags( $f_name ), $f_description, $f_status, $f_view_state, $f_file_path );
 
 	if ( ( $f_view_state == VS_PRIVATE ) && ( false === current_user_is_administrator() ) ) {
 		$t_access_level = access_get_global_level();
Index: manage_user_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_user_page.php,v
retrieving revision 1.56.4.1
retrieving revision 1.56.4.2
diff -u -r1.56.4.1 -r1.56.4.2
--- manage_user_page.php	5 Dec 2005 10:49:06 -0000	1.56.4.1
+++ manage_user_page.php	5 Jan 2006 03:57:56 -0000	1.56.4.2
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: manage_user_page.php,v 1.56.4.1 2005/12/05 10:49:06 vboctor Exp $
+	# $Id: manage_user_page.php,v 1.56.4.2 2006/01/05 03:57:56 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -25,12 +25,31 @@
 	$f_save = gpc_get_bool( 'save' );
 	$f_prefix = strtoupper( gpc_get_string( 'prefix', config_get( 'default_manage_user_prefix' ) ) );
 
+	$t_user_table = config_get( 'mantis_user_table' );
 	$t_cookie_name = config_get( 'manage_cookie' );
 	$t_lock_image = '<img src="' . config_get( 'icon_path' ) . 'protected.gif" width="8" height="15" border="0" alt="' . lang_get( 'protected' ) . '" />';
 
+	# Clean up the form variables
+	if ( ! in_array( $f_sort, db_field_names( $t_user_table ) ) ) {
+        $c_sort = 'username';
+    } else {	 
+        $c_sort = addslashes($f_sort);
+    }
+
+	if ($f_dir == 'ASC') {
+		$c_dir = 'ASC';
+	} else {
+		$c_dir = 'DESC';
+	}
+
+	if ($f_hide == 0) { # a 0 will turn it off
+		$c_hide = 0;
+	} else {            # anything else (including 'on') will turn it on
+		$c_hide = 1;
+	}
 	# set cookie values for hide, sort by, and dir
 	if ( $f_save ) {
-		$t_manage_string = $f_hide.':'.$f_sort.':'.$f_dir;
+		$t_manage_string = $c_hide.':'.$c_sort.':'.$c_dir;
 		gpc_set_cookie( $t_cookie_name, $t_manage_string, true );
 	} else if ( !is_blank( gpc_get_cookie( $t_cookie_name, '' ) ) ) {
 		$t_manage_arr = explode( ':', gpc_get_cookie( $t_cookie_name ) );
@@ -49,20 +68,6 @@
 		}
 	}
 
-	# Clean up the form variables
-	$c_sort = addslashes($f_sort);
-
-	if ($f_dir == 'ASC') {
-		$c_dir = 'ASC';
-	} else {
-		$c_dir = 'DESC';
-	}
-
-	if ($f_hide == 0) { # a 0 will turn it off
-		$c_hide = 0;
-	} else {            # anything else (including 'on') will turn it on
-		$c_hide = 1;
-	}
 ?>
 <?php html_page_top1( lang_get( 'manage_users_link' ) ) ?>
 <?php html_page_top2() ?>
@@ -71,8 +76,6 @@
 
 <?php # New Accounts Form BEGIN ?>
 <?php
-	$t_user_table = config_get( 'mantis_user_table' );
-
 	$days_old = 7;
 	$query = "SELECT *
 		FROM $t_user_table
Index: print_all_bug_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/print_all_bug_page.php,v
retrieving revision 1.80
retrieving revision 1.80.10.1
diff -u -r1.80 -r1.80.10.1
--- print_all_bug_page.php	24 Jul 2004 14:31:43 -0000	1.80
+++ print_all_bug_page.php	1 Jan 2006 04:29:49 -0000	1.80.10.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: print_all_bug_page.php,v 1.80 2004/07/24 14:31:43 vboctor Exp $
+	# $Id: print_all_bug_page.php,v 1.80.10.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -75,7 +75,7 @@
 
 <table class="width100"><tr><td class="form-title">
 	<div class="center">
-		<?php echo config_get( 'window_title' ) . ' - ' . project_get_name( $t_project_id ); ?>
+		<?php echo config_get( 'window_title' ) . ' - ' . string_display( project_get_name( $t_project_id ) ); ?>
 	</div>
 </td></tr></table>
 
Index: print_bug_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/print_bug_page.php,v
retrieving revision 1.51
retrieving revision 1.51.10.1
diff -u -r1.51 -r1.51.10.1
--- print_bug_page.php	27 Aug 2004 00:29:54 -0000	1.51
+++ print_bug_page.php	1 Jan 2006 04:29:49 -0000	1.51.10.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: print_bug_page.php,v 1.51 2004/08/27 00:29:54 thraxisp Exp $
+	# $Id: print_bug_page.php,v 1.51.10.1 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -63,7 +63,7 @@
 <table class="width100" cellspacing="1">
 <tr>
 	<td class="form-title" colspan="6">
-		<div class="center"><?php echo config_get( 'window_title' ) . ' - ' . project_get_name( $v_project_id ) ?></div>
+		<div class="center"><?php echo config_get( 'window_title' ) . ' - ' . string_display( project_get_name( $v_project_id ) ) ?></div>
 	</td>
 </tr>
 <tr>
Index: query_store.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/query_store.php,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -r1.3 -r1.3.12.1
--- query_store.php	7 Jul 2004 20:30:13 -0000	1.3
+++ query_store.php	8 Jan 2006 14:42:25 -0000	1.3.12.1
@@ -19,7 +19,7 @@
 	auth_ensure_user_authenticated();
 	compress_enable();
 
-	$f_query_name = gpc_get_string( 'query_name' );
+	$f_query_name = string_strip_tags( gpc_get_string( 'query_name' ) );
 	$f_is_public = gpc_get_bool( 'is_public' );
 	$f_all_projects = gpc_get_bool( 'all_projects' );
 	
Index: query_store_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/query_store_page.php,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -r1.5 -r1.5.10.1
--- query_store_page.php	26 Jul 2004 12:06:23 -0000	1.5
+++ query_store_page.php	8 Jan 2006 14:42:25 -0000	1.5.10.1
@@ -38,7 +38,7 @@
 	} 
 	
 	# Check for an error
-	$t_error_msg = gpc_get_string( 'error_msg', null );
+	$t_error_msg = string_strip_tags( gpc_get_string( 'error_msg', null ) );
 	if ( $t_error_msg != null ) {
 		print "<br />$t_error_msg<br /><br />";
 	}
Index: view_all_set.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/view_all_set.php,v
retrieving revision 1.38.6.1
retrieving revision 1.38.6.2
diff -u -r1.38.6.1 -r1.38.6.2
--- view_all_set.php	10 Dec 2005 03:31:48 -0000	1.38.6.1
+++ view_all_set.php	18 Dec 2005 02:58:59 -0000	1.38.6.2
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: view_all_set.php,v 1.38.6.1 2005/12/10 03:31:48 thraxisp Exp $
+	# $Id: view_all_set.php,v 1.38.6.2 2005/12/18 02:58:59 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php require_once( 'core.php' ) ?>
@@ -134,7 +134,7 @@
 
 	# these are only single values, even when doing advanced filtering
 	$f_per_page				= gpc_get_int( 'per_page', -1 );
-	$f_highlight_changed	= gpc_get_string( 'highlight_changed', config_get( 'default_show_changed' ) );
+	$f_highlight_changed	= gpc_get_int( 'highlight_changed', config_get( 'default_show_changed' ) );
 	# sort direction
 	$f_sort					= gpc_get_string( 'sort', 'last_updated' );
 	$f_dir					= gpc_get_string( 'dir', 'DESC' );
Index: view_filters_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/view_filters_page.php,v
retrieving revision 1.22.6.1
retrieving revision 1.22.6.3
diff -u -r1.22.6.1 -r1.22.6.3
--- view_filters_page.php	10 Dec 2005 03:31:48 -0000	1.22.6.1
+++ view_filters_page.php	8 Jan 2006 15:37:51 -0000	1.22.6.3
@@ -24,11 +24,14 @@
 	html_page_top2();
 
 	$t_project_id = helper_get_current_project();
+	$t_current_user_access_level = current_user_get_access_level();
 	$t_target_field = gpc_get_string( 'target_field', '' );
 	$t_fields = array( 'priority', 'id', 'sponsorship_total', 'category', 'severity', 'status', 'last_updated', 'summary' );
 	$t_accessible_custom_fields_ids = array();
 	$t_accessible_custom_fields_names = array();
 	$t_accessible_custom_fields_values = array();
+	$t_custom_cols = 1;
+	$t_custom_rows = 0;
 
 	if ( ON == config_get( 'filter_by_custom_fields' ) ) {
 		$t_custom_cols = config_get( 'filter_custom_fields_per_row' );
@@ -104,8 +107,6 @@
 	
 	$t_current_user_access_level = current_user_get_access_level();
 	$t_filter_cols = 7;
-	$t_custom_cols = 1;
-	$t_custom_rows = 0;
 
 	$f_for_screen = gpc_get_bool( 'for_screen', true );
 
Index: core/database_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/database_api.php,v
retrieving revision 1.38
retrieving revision 1.38.4.1
diff -u -r1.38 -r1.38.4.1
--- core/database_api.php	9 Dec 2004 18:55:06 -0000	1.38
+++ core/database_api.php	5 Jan 2006 03:57:56 -0000	1.38.4.1
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: database_api.php,v 1.38 2004/12/09 18:55:06 thraxisp Exp $
+	# $Id: database_api.php,v 1.38.4.1 2006/01/05 03:57:56 thraxisp Exp $
 	# --------------------------------------------------------
 
 	### Database ###
@@ -175,6 +175,12 @@
 	}
 
 	# --------------------
+	function db_field_names( $p_table_name ) {
+		global $g_db;
+		return $g_db->MetaColumnNames( $p_table_name );
+	}
+
+	# --------------------
 	# Check if there is an index defined on the specified table/field and with
 	# the specified type.
 	#
@@ -236,6 +242,7 @@
 	# --------------------
 	# prepare a string before DB insertion
 	# @@@ should default be return addslashes( $p_string ); or generate an error
+	# @@@ Consider using ADODB escaping for all databases.
 	function db_prepare_string( $p_string ) {
 		global $g_db;
 		$t_db_type = config_get( 'db_type' );
@@ -246,11 +253,15 @@
 				return addslashes( $p_string );
 
 			case 'mysql':
-				return mysql_escape_string( $p_string );
+				# mysql_escape_string was deprecated in v4.3.0 
+				if ( php_version_at_least( '4.3.0' ) ) {
+					return mysql_real_escape_string( $p_string );
+				} else {
+					return mysql_escape_string( $p_string );
+				}
 
 			# For some reason mysqli_escape_string( $p_string ) always returns an empty
 			# string.  This is happening with PHP v5.0.2.
-			# @@@ Consider using ADODB escaping for all databases.
 			case 'mysqli':
 				$t_escaped = $g_db->qstr( $p_string, false );
 				return substr( $t_escaped, 1, strlen( $t_escaped ) - 2 );
Index: core/string_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/string_api.php,v
retrieving revision 1.62.4.1
retrieving revision 1.62.4.2
diff -u -r1.62.4.1 -r1.62.4.2
--- core/string_api.php	5 Dec 2005 12:12:05 -0000	1.62.4.1
+++ core/string_api.php	1 Jan 2006 04:29:49 -0000	1.62.4.2
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: string_api.php,v 1.62.4.1 2005/12/05 12:12:05 vboctor Exp $
+	# $Id: string_api.php,v 1.62.4.2 2006/01/01 04:29:49 thraxisp Exp $
 	# --------------------------------------------------------
 
 	$t_core_dir = dirname( __FILE__ ).DIRECTORY_SEPARATOR;
@@ -345,6 +345,45 @@
 	}
 
 	# --------------------
+	# strip all tags from a string
+	# This will remove HTML tags, javascript sections
+	# and white space. It will also convert some
+	# common HTML entities to their text equivalent.
+	function string_strip_tags( $p_string ) {
+		$t_search = array( 
+				'@<script[^>]*?>.*?</script>@si',	/* Strip out javascript */
+				'@<[\/\!]*?[^<>]*?>@si',			/* Strip out HTML tags */
+				'@([\r\n])[\s]+@',					/* Strip out white space */
+				'@&(quot|#34);@i',					/* Replace HTML entities */
+				'@&(amp|#38);@i',
+				'@&(lt|#60);@i',
+				'@&(gt|#62);@i',
+				'@&(nbsp|#160);@i',
+				'@&(iexcl|#161);@i',
+				'@&(cent|#162);@i',
+				'@&(pound|#163);@i',
+				'@&(copy|#169);@i',
+				'@&#(\d+);@e' );					/* evaluate as php */
+
+		$t_replace = array( 
+				'',
+				'',
+				'\1',
+				'"',
+				'&',
+				'<',
+				'>',
+				' ',
+				chr(161),
+				chr(162),
+				chr(163),
+				chr(169),
+				'chr(\1)' );
+
+		return preg_replace($t_search, $t_replace, $p_string);
+	}
+	
+	# --------------------
 	# This function looks for text with htmlentities
 	# like &lt;b&gt; and converts is into corresponding
 	# html <b> based on the configuration presets


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-4/mantis.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mantis.spec	23 Dec 2005 15:46:58 -0000	1.8
+++ mantis.spec	20 Oct 2006 23:56:20 -0000	1.9
@@ -9,7 +9,7 @@
 Summary:	Web-based bugtracking system
 Name:		mantis
 Version:	0.19.4
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		Applications/Internet
 URL:		http://mantisbt.sourceforge.net/
@@ -18,6 +18,8 @@
 Patch0:		mantis-0.19.2-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-0.19.2-noadmin.patch
+# unreleased patches from CVS. Could be removed after an eventual 0.19.5 release
+Patch3:		mantis-0.19.5-unreleased.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	diffutils
 Requires:	php
@@ -58,6 +60,7 @@
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
+%patch3 -p0 -b .unreleased
 
 chmod -x *.php sql/*
 rm -rf packages
@@ -154,6 +157,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Gianluca Sforna <giallu gmail com> 0.19.4-2
+- add unreleased security patches from CVS
+
 * Fri Dec 23 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.19.4-1
 - SECURITY: release 0.19.4
   * File Upload Vulnerability (TKADV2005-11-002) (thraxisp)



From fedora-extras-commits at redhat.com  Sat Oct 21 01:28:37 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 20 Oct 2006 18:28:37 -0700
Subject: rpms/torque/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 torque.spec,
	1.15, 1.16
Message-ID: <200610210128.k9L1SbSR006168@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6148

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
- bump to fix "Spool Job Race condition" on bugtraq



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Oct 2006 19:11:15 -0000	1.8
+++ .cvsignore	21 Oct 2006 01:28:07 -0000	1.9
@@ -1 +1 @@
-torque-2.1.3.tar.gz
+torque-2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Oct 2006 19:11:15 -0000	1.8
+++ sources	21 Oct 2006 01:28:07 -0000	1.9
@@ -1 +1 @@
-0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz
+9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- torque.spec	16 Oct 2006 22:36:00 -0000	1.15
+++ torque.spec	21 Oct 2006 01:28:07 -0000	1.16
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.3
+%define version 2.1.4
 #%%define snap 200604251602
-%define release 3
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -335,6 +335,7 @@
 Summary: Graphical clients for TORQUE
 Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: xpbs xpbsmon
+Provides: %{name}-x11tools
 %description gui
 %shared_description
 This package holds the graphical clients.
@@ -402,6 +403,9 @@
 
 
 %changelog
+* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
+- bump to fix "Spool Job Race condition" on bugtraq
+
 * Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
 - correct unowned directories
 



From fedora-extras-commits at redhat.com  Sat Oct 21 01:55:03 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 20 Oct 2006 18:55:03 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 torque.spec,
	1.12, 1.13
Message-ID: <200610210155.k9L1t3nk006435@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6415

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
- bump to fix "Spool Job Race condition" on bugtraq



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Oct 2006 20:07:05 -0000	1.8
+++ .cvsignore	21 Oct 2006 01:54:33 -0000	1.9
@@ -1 +1 @@
-torque-2.1.3.tar.gz
+torque-2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Oct 2006 20:07:05 -0000	1.8
+++ sources	21 Oct 2006 01:54:33 -0000	1.9
@@ -1 +1 @@
-0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz
+9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- torque.spec	12 Oct 2006 20:07:05 -0000	1.12
+++ torque.spec	21 Oct 2006 01:54:33 -0000	1.13
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.3
+%define version 2.1.4
 #%%define snap 200604251602
-%define release 2
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -199,6 +199,7 @@
 %doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
 %{torquehomedir}/aux
 %{torquehomedir}/spool
 
@@ -288,7 +289,7 @@
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
 %endif
-%{torquehomedir}/mom_priv/*
+%{torquehomedir}/mom_priv
 %{torquehomedir}/mom_logs
 %{torquehomedir}/checkpoint
 %{torquehomedir}/undelivered
@@ -334,6 +335,7 @@
 Summary: Graphical clients for TORQUE
 Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: xpbs xpbsmon
+Provides: %{name}-x11tools
 %description gui
 %shared_description
 This package holds the graphical clients.
@@ -401,6 +403,12 @@
 
 
 %changelog
+* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
+- bump to fix "Spool Job Race condition" on bugtraq
+
+* Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
+- correct unowned directories
+
 * Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
 - missing BR ncurses-devel and readline-devel
 



From fedora-extras-commits at redhat.com  Sat Oct 21 02:11:36 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 20 Oct 2006 19:11:36 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 torque.spec,
	1.10, 1.11
Message-ID: <200610210211.k9L2Baui009499@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9479

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
- bump to fix "Spool Job Race condition" on bugtraq



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Oct 2006 21:02:48 -0000	1.8
+++ .cvsignore	21 Oct 2006 02:11:06 -0000	1.9
@@ -1 +1 @@
-torque-2.1.3.tar.gz
+torque-2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Oct 2006 21:02:48 -0000	1.8
+++ sources	21 Oct 2006 02:11:06 -0000	1.9
@@ -1 +1 @@
-0b7217fa2512c8df2e4d4616d0fef29b  torque-2.1.3.tar.gz
+9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- torque.spec	12 Oct 2006 21:02:48 -0000	1.10
+++ torque.spec	21 Oct 2006 02:11:06 -0000	1.11
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.3
+%define version 2.1.4
 #%%define snap 200604251602
-%define release 2
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -199,6 +199,7 @@
 %doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
 %{torquehomedir}/aux
 %{torquehomedir}/spool
 
@@ -288,7 +289,7 @@
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
 %endif
-%{torquehomedir}/mom_priv/*
+%{torquehomedir}/mom_priv
 %{torquehomedir}/mom_logs
 %{torquehomedir}/checkpoint
 %{torquehomedir}/undelivered
@@ -334,6 +335,7 @@
 Summary: Graphical clients for TORQUE
 Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: xpbs xpbsmon
+Provides: %{name}-x11tools
 %description gui
 %shared_description
 This package holds the graphical clients.
@@ -401,6 +403,12 @@
 
 
 %changelog
+* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
+- bump to fix "Spool Job Race condition" on bugtraq
+
+* Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
+- correct unowned directories
+
 * Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
 - missing BR ncurses-devel and readline-devel
 



From fedora-extras-commits at redhat.com  Sat Oct 21 02:17:52 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 20 Oct 2006 19:17:52 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 torque.spec,
	1.9, 1.10
Message-ID: <200610210217.k9L2Hqck009566@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9545

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
- bump to fix "Spool Job Race condition" on bugtraq



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Aug 2006 23:42:04 -0000	1.7
+++ .cvsignore	21 Oct 2006 02:17:22 -0000	1.8
@@ -1 +1 @@
-torque-2.1.2.tar.gz
+torque-2.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Aug 2006 23:42:04 -0000	1.7
+++ sources	21 Oct 2006 02:17:22 -0000	1.8
@@ -1 +1 @@
-f1b37efb5d4770a0105c66294a05d140  torque-2.1.2.tar.gz
+9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- torque.spec	3 Aug 2006 05:52:26 -0000	1.9
+++ torque.spec	21 Oct 2006 02:17:22 -0000	1.10
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.2
+%define version 2.1.4
 #%%define snap 200604251602
-%define release 2
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -92,13 +92,12 @@
 Source5: xpbsmon.png
 Source6: README-localhost
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.2-pam-getpwnam.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -122,7 +121,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 
@@ -201,6 +199,7 @@
 %doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
 %{torquehomedir}/aux
 %{torquehomedir}/spool
 
@@ -290,7 +289,7 @@
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
 %endif
-%{torquehomedir}/mom_priv/*
+%{torquehomedir}/mom_priv
 %{torquehomedir}/mom_logs
 %{torquehomedir}/checkpoint
 %{torquehomedir}/undelivered
@@ -336,6 +335,7 @@
 Summary: Graphical clients for TORQUE
 Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: xpbs xpbsmon
+Provides: %{name}-x11tools
 %description gui
 %shared_description
 This package holds the graphical clients.
@@ -389,7 +389,7 @@
 %{_bindir}/pbs-config
 
 %package pam
-Summary: PAM module for PBS MOM nodes.
+Summary: PAM module for TORQUE MOM nodes
 Group: System Environment/Base
 
 %description pam
@@ -403,6 +403,21 @@
 
 
 %changelog
+* Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
+- bump to fix "Spool Job Race condition" on bugtraq
+
+* Mon Oct 16 2006 Garrick Staples <garrick at usc.edu> 2.1.3-3
+- correct unowned directories
+
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-2
+- missing BR ncurses-devel and readline-devel
+
+* Thu Oct 12 2006 Garrick Staples <garrick at usc.edu> 2.1.3-1
+- bump to 2.1.3
+
+* Sun Aug 27 2006 Garrick Staples <garrick at usc.edu> 2.1.2-3
+- FC6 mass rebuild
+
 * Wed Aug  2 2006 Garrick Staples <garrick at usc.edu> 2.1.2-2
 - fix incorrect _pam_getpwnam_r usage in pam module
 



From fedora-extras-commits at redhat.com  Sat Oct 21 03:39:30 2006
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Fri, 20 Oct 2006 20:39:30 -0700
Subject: owners owners.list,1.3,1.4
Message-ID: <200610210339.k9L3dUgw013015@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12997

Modified Files:
	owners.list 
Log Message:
Update BZ addresses for websites



Index: owners.list
===================================================================
RCS file: /cvs/fedora/owners/owners.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- owners.list	8 Dec 2005 21:56:19 -0000	1.3
+++ owners.list	21 Oct 2006 03:39:27 -0000	1.4
@@ -13,4 +13,4 @@
 Fedora Infrastructure|extras buildsys|For issues related to the Fedora Extras build system.|skvidal at phy.duke.edu|katzj at redhat.com|wtogami at redhat.com
 Fedora Infrastructure|other|Anything else|wtogami at redhat.com||sopwith at redhat.com
 Fedora Infrastructure|update system|The Fedora Core update system|lmacken at redhat.com|notting at redhat.com|
-Fedora Infrastructure|website|For issues related to the Fedora web site.|gdk at redhat.com|sopwith at redhat.com|wtogami at redhat.com
+Fedora Infrastructure|website|For issues related to the Fedora web site.|web-members at fedoraproject.org|sopwith at redhat.com|wtogami at redhat.com,gdk at redhat.com,nman64 at n-man.com



From fedora-extras-commits at redhat.com  Sat Oct 21 07:09:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 00:09:19 -0700
Subject: rpms/libpqxx/FC-5 .cvsignore, 1.5, 1.6 libpqxx.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200610210709.k9L79JuV026476@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpqxx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26433/FC-5

Modified Files:
	.cvsignore libpqxx.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Aug 2006 10:10:54 -0000	1.5
+++ .cvsignore	21 Oct 2006 07:08:48 -0000	1.6
@@ -1 +1,2 @@
 libpqxx-2.6.7.tar.gz
+libpqxx-2.6.8.tar.gz


Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-5/libpqxx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libpqxx.spec	3 Aug 2006 10:10:54 -0000	1.8
+++ libpqxx.spec	21 Oct 2006 07:08:48 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           libpqxx
-Version:        2.6.7
+Version:        2.6.8
 Release:        1%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://pqxx.org
-Source0:        http://thaiopensource.org/download/software/libpqxx/libpqxx-2.6.7.tar.gz
+Source0:        http://thaiopensource.org/download/software/libpqxx/libpqxx-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  postgresql-devel
@@ -55,7 +55,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-2.6.7.so
+%{_libdir}/libpqxx-*.so
 
 %files devel
 %doc README-UPGRADE
@@ -65,6 +65,9 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.6.8-1
+- version upgrade #209897
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.6.7-1
 - version upgrade
 - fix #192933


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Aug 2006 10:10:54 -0000	1.5
+++ sources	21 Oct 2006 07:08:48 -0000	1.6
@@ -1 +1 @@
-f66b41065a5e3103a348d378320999e4  libpqxx-2.6.7.tar.gz
+cb818ca7698955bcea8b7ba1b7962811  libpqxx-2.6.8.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 07:09:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 00:09:17 -0700
Subject: rpms/libpqxx/FC-4 .cvsignore, 1.5, 1.6 libpqxx.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200610210709.k9L79H75026471@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpqxx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26433/FC-4

Modified Files:
	.cvsignore libpqxx.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Aug 2006 10:10:54 -0000	1.5
+++ .cvsignore	21 Oct 2006 07:08:47 -0000	1.6
@@ -1 +1,2 @@
 libpqxx-2.6.7.tar.gz
+libpqxx-2.6.8.tar.gz


Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libpqxx.spec	3 Aug 2006 10:10:54 -0000	1.6
+++ libpqxx.spec	21 Oct 2006 07:08:47 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           libpqxx
-Version:        2.6.7
+Version:        2.6.8
 Release:        1%{?dist}
 Summary:        C++ client API for PostgreSQL
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://gborg.postgresql.org/project/libpqxx/projdisplay.php
-Source0:        ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.6.7.tar.gz
+Source0:        ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  postgresql-devel
@@ -55,7 +55,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION
-%{_libdir}/libpqxx-2.6.7.so
+%{_libdir}/libpqxx-*.so
 
 %files devel
 %doc README-UPGRADE
@@ -65,6 +65,9 @@
 %{_libdir}/pkgconfig/libpqxx.pc
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.6.8-1
+- version upgrade
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 2.6.7-1
 - version upgrade
 - fix #197933


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Aug 2006 10:10:54 -0000	1.5
+++ sources	21 Oct 2006 07:08:47 -0000	1.6
@@ -1 +1 @@
-f66b41065a5e3103a348d378320999e4  libpqxx-2.6.7.tar.gz
+cb818ca7698955bcea8b7ba1b7962811  libpqxx-2.6.8.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 07:52:29 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 00:52:29 -0700
Subject: rpms/koffice/FC-5 koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.12, 
	1.13 koffice.spec, 1.40, 1.41 sources, 1.12,
	1.13 koffice-admin-gcc4isok.patch, 1.1, NONE
Message-ID: <200610210752.k9L7qTbV026969@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26922/FC-5

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.0.patch 
Removed Files:
	koffice-admin-gcc4isok.patch 
Log Message:
- version upgrade


koffice-1.6.0.patch:

--- NEW FILE koffice-1.6.0.patch ---
--- lib/kross/python/cxx/Objects.hxx.orig	2006-10-19 00:00:02.000000000 +0200
+++ lib/kross/python/cxx/Objects.hxx	2006-10-19 00:02:04.000000000 +0200
@@ -1938,8 +1938,8 @@
 			if(map.hasKey(key)) the_item = map.getItem(key);
 			};
 
-		~mapref<T>()
-			{}
+	//	~mapref<T>()
+	//		{};
 
 		// MapBase<T> stuff
 		// lvalue


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Aug 2006 09:15:25 -0000	1.12
+++ .cvsignore	21 Oct 2006 07:51:58 -0000	1.13
@@ -1 +1 @@
-koffice-1.5.2.tar.bz2
+koffice-1.6.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- koffice.spec	3 Aug 2006 09:15:25 -0000	1.40
+++ koffice.spec	21 Oct 2006 07:51:58 -0000	1.41
@@ -1,64 +1,53 @@
 Name:           koffice
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-1.5.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
-Patch0:         koffice-admin-gcc4isok.patch
+Patch0:         koffice-1.6.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
-BuildRequires:  automake
-BuildRequires:  autoconf >= 2.53
 BuildRequires:  kdebase-devel
 BuildRequires:  kdelibs-devel
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  libart_lgpl-devel
-BuildRequires:  libidn-devel
-BuildRequires:  gamin-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  ImageMagick-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  libogg-devel
 BuildRequires:  openssl-devel
-BuildRequires:  esound-devel
-BuildRequires:  python-devel
+BuildRequires:  python-devel python
 BuildRequires:  pcre-devel
 BuildRequires:  libwpd-devel
 BuildRequires:  lcms-devel
 BuildRequires:  gettext-devel
 BuildRequires:  mysql-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  postgresql-devel
 BuildRequires:  perl
-BuildRequires:  python2-devel
 BuildRequires:  wv2-devel
 BuildRequires:  libpqxx-devel
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
-BuildRequires:  libacl-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  libexif-devel
 BuildRequires:  libGL-devel libGLU-devel
-BuildRequires:  libXi-devel
 BuildRequires:  readline-devel
-BuildRequires:  ruby ruby-devel
-
+BuildRequires:  ruby ruby-devel >= 1.8.2 
+%if "%{?fedora}" > "4"
+BuildRequires:  libXi-devel
+%endif
 %description
 KOffice - Integrated Office Suite
 KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
@@ -225,22 +214,23 @@
 
 %prep
 %setup -q
-%patch0 -p1
-
-# this will make sure that patch0 is considered
-make -f admin/Makefile.common
+%patch0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure --disable-rpath --disable-dependency-tracking --enable-shared \
---enable-fast-install --with-pic --disable-static \
---with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
---with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
---with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
+  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+  --enable-final
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -265,156 +255,41 @@
 #now take care of all the desktop files with desktop-file-utils
 #core
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/KThesaurus.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
-
-#kword
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kword.desktop
-
-#kspread
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kspread.desktop
-
-#kpresenter
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kpresenter.desktop
-
-#karbon
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/karbon.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
-#krita
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_magick.desktop
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_openexr.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_png.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_raw.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_tiff.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
-
-#kugar
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
-
-#kchart
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kchart.desktop
-
-#kformula
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kformula.desktop
-
-#kivio
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kivio.desktop
-
-#kexi
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kexi.desktop
-
-#kplato
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop
-
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
+%post core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
 
 %post kword -p /sbin/ldconfig
 %postun kword -p /sbin/ldconfig
@@ -496,15 +371,17 @@
 %{_libdir}/kde3/libkprkword.*
 %{_libdir}/kde3/libthesaurustool.*
 %{_libdir}/kde3/clipartthumbnail.*
-%{_datadir}/apps/koffice
+%{_datadir}/apps/koffice/
 %{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell
-%{_datadir}/apps/thesaurus
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
 %{_datadir}/config.kcfg/koshell.kcfg
-%{_datadir}/doc/HTML/en/koffice
-%{_datadir}/doc/HTML/en/koshell
-%{_datadir}/doc/HTML/en/thesaurus
-%{_datadir}/icons/*
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/services/clipartthumbnail.desktop
 %{_datadir}/services/kfile*.desktop
 %{_datadir}/services/kwmailmerge*.desktop
@@ -518,20 +395,20 @@
 %{_datadir}/servicetypes/koplugin.desktop
 %{_datadir}/servicetypes/kwmailmerge.desktop
 %{_datadir}/servicetypes/widgetfactory.desktop
-%{_datadir}/applications/fedora-KThesaurus.desktop
-%{_datadir}/applications/fedora-koshell.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublecombobox.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublelineedit.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
-%{_datadir}/apps/kross
+%{_datadir}/apps/kross/
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
 
 %files devel
 %{_includedir}/*
-%{_datadir}/doc/HTML/en/koffice-apidocs
-%{_libdir}/*.so
+%{_datadir}/doc/HTML/en/koffice-apidocs/
+%{_libdir}/lib*.so
 
 %files kword
 %defattr(-,root,root,-)
@@ -540,13 +417,13 @@
 %{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
-%{_datadir}/apps/kword
+%{_datadir}/apps/kword/
 %{_datadir}/doc/HTML/en/kword
 %{_datadir}/services/kword*.desktop
 %{_datadir}/services/kwserial*.desktop
 %{_datadir}/templates/TextDocument.desktop
 %{_datadir}/templates/.source/TextDocument.kwt
-%{_datadir}/applications/fedora-kword.desktop
+%{_datadir}/applications/kde/*kword.desktop
 
 %files kspread
 %defattr(-,root,root,-)
@@ -565,12 +442,14 @@
 %{_libdir}/kde3/libopencalcexport.*
 %{_libdir}/kde3/libopencalcimport.*
 %{_libdir}/kde3/libqproimport.*
-%{_datadir}/apps/kspread
-%{_datadir}/doc/HTML/en/kspread
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
+%{_datadir}/apps/kspread/
+%{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
 %{_datadir}/templates/SpreadSheet.desktop
 %{_datadir}/templates/.source/SpreadSheet.kst
-%{_datadir}/applications/fedora-kspread.desktop
+%{_datadir}/applications/kde/*kspread.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
@@ -589,12 +468,12 @@
 %{_libdir}/kde3/libkpresentersvgexport.*
 %{_libdir}/kde3/libkpresenterxbmexport.*
 %{_libdir}/kde3/libkpresenterxpmexport.*
-%{_datadir}/apps/kpresenter
-%{_datadir}/doc/HTML/en/kpresenter
+%{_datadir}/apps/kpresenter/
+%{_datadir}/doc/HTML/en/kpresenter/
 %{_datadir}/services/kpresenter*.desktop
 %{_datadir}/templates/Presentation.desktop
 %{_datadir}/templates/.source/Presentation.kpt
-%{_datadir}/applications/fedora-kpresenter.desktop
+%{_datadir}/applications/kde/*kpresenter.desktop
 
 %files karbon
 %defattr(-,root,root,-)
@@ -621,11 +500,11 @@
 %{_libdir}/kde3/libkarbonxcfexport.*
 %{_libdir}/kde3/libwmfexport.*
 %{_libdir}/kde3/libwmfimport.*
-%{_datadir}/apps/karbon
+%{_datadir}/apps/karbon/
 %{_datadir}/services/karbon*
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
-%{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/applications/kde/*karbon.desktop
 %{_datadir}/doc/HTML/en/karbon/
 
 %files krita
@@ -638,6 +517,8 @@
 %{_libdir}/libkrita_rgb_f16half.so.*
 %{_libdir}/libkrita_rgb_f32.so.*
 %{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkrita_ycbcr_u16.so*
+%{_libdir}/libkrita_ycbcr_u8.so*
 %{_libdir}/libkritacolor.so.*
 %{_libdir}/libkritagrayscale.so.*
 %{_libdir}/libkritaimage.so.*
@@ -672,8 +553,6 @@
 %{_libdir}/kde3/kritatoolstar.*
 %{_libdir}/kde3/kritatooltransform.*
 %{_libdir}/kde3/libkritapart.*
-%{_libdir}/kde3/libkritamagickexport.*
-%{_libdir}/kde3/libkritamagickimport.*
 %{_libdir}/kde3/krita_cmyk_u16_plugin.*
 %{_libdir}/kde3/krita_gray_u16_plugin.*
 %{_libdir}/kde3/krita_lms_f32_plugin.*
@@ -691,7 +570,6 @@
 %{_libdir}/kde3/kritascripting.*
 %{_libdir}/kde3/kritaseparatechannels.*
 %{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasmearybrush.*
 %{_libdir}/kde3/kritasobelfilter.*
 %{_libdir}/kde3/kritatoolselectsimilar.*
 %{_libdir}/kde3/kritawetplugin.*
@@ -705,12 +583,27 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/krosskritacore.*
-%{_datadir}/apps/krita
+%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
+%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
+%{_libdir}/kde3/kritablurfilter.*
+%{_libdir}/kde3/kritaextensioncolorsfilters.*
+%{_libdir}/kde3/kritafastcolortransfer.*
+%{_libdir}/kde3/kritalenscorrectionfilter.*
+%{_libdir}/kde3/kritamodifyselection.*
+%{_libdir}/kde3/kritanoisefilter.*
+%{_libdir}/kde3/kritarandompickfilter.*
+%{_libdir}/kde3/kritasubstrate.*
+%{_libdir}/kde3/kritatoolcurves.*
+%{_libdir}/kde3/kritatoolperspectivegrid.*
+%{_libdir}/kde3/kritatoolperspectivetransform.*
+%{_libdir}/kde3/kritaunsharpfilter.*
+%{_libdir}/kde3/kritawavefilter.*
+%{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita*.desktop
-%{_datadir}/apps/kritaplugins
-%{_datadir}/doc/HTML/en/krita
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
+%{_datadir}/doc/HTML/en/krita/
 %{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
@@ -725,13 +618,13 @@
 %{_libdir}/kde3/kugar.*
 %{_libdir}/kde3/libkudesignerpart.*
 %{_libdir}/kde3/libkugarpart.*
-%{_datadir}/apps/kudesigner
-%{_datadir}/apps/kugar
-%{_datadir}/doc/HTML/en/kugar
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/doc/HTML/en/kugar/
 %{_datadir}/services/kugar*.desktop
-%{_datadir}/applications/fedora-kugar.desktop
+%{_datadir}/applications/kde/*kugar.desktop
 # this not being fedorarized fixes #173086
-%{_datadir}/applnk/Office/kudesigner.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -773,10 +666,10 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/apps/kexi
+%{_datadir}/apps/kexi/
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/doc/HTML/en/kexi
-%{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/doc/HTML/en/kexi/
+%{_datadir}/applications/kde/*kexi.desktop
 %{_datadir}/services/kexidb_sqlite*driver.desktop
 
 %files kexi-driver-mysql
@@ -808,20 +701,20 @@
 %{_libdir}/kde3/libkchartmngexport.*
 %{_libdir}/kde3/libkchartxbmexport.*
 %{_libdir}/kde3/libkchartxpmexport.*
-%{_datadir}/apps/kchart
+%{_datadir}/apps/kchart/
 %{_datadir}/services/kchart*.desktop
-%{_datadir}/doc/HTML/en/kchart
-%{_datadir}/applications/fedora-kchart.desktop
+%{_datadir}/doc/HTML/en/kchart/
+%{_datadir}/applications/kde/*kchart.desktop
 
 %files kformula
 %defattr(-,root,root,-)
 %{_bindir}/kformula
 %{_libdir}/kde3/libkformulapart.*
 %{_libdir}/kde3/kformula.*
-%{_datadir}/apps/kformula
-%{_datadir}/doc/HTML/en/kformula
+%{_datadir}/apps/kformula/
+%{_datadir}/doc/HTML/en/kformula/
 %{_datadir}/services/kformula*.desktop
-%{_datadir}/applications/fedora-kformula.desktop
+%{_datadir}/applications/kde/*kformula.desktop
 
 %files kivio
 %defattr(-,root,root,-)
@@ -837,11 +730,11 @@
 %{_libdir}/kde3/libkiviotargettool.*
 %{_libdir}/kde3/libkiviotexttool.*
 %{_libdir}/kde3/libkiviozoomtool.*
-%{_datadir}/apps/kivio
+%{_datadir}/apps/kivio/
 %{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/doc/HTML/en/kivio
+%{_datadir}/doc/HTML/en/kivio/
 %{_datadir}/services/kivio*.desktop
-%{_datadir}/applications/fedora-kivio.desktop
+%{_datadir}/applications/kde/*kivio.desktop
 
 %files filters
 %defattr(-,root,root,-)
@@ -890,11 +783,13 @@
 %{_libdir}/kde3/libhancomwordimport.*
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libpowerpointimport.*
-%{_datadir}/apps/xsltfilter
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_libdir}/kde3/libolefilter.*
+%{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
 
 %files kplato
 %defattr(-,root,root,-)
@@ -902,12 +797,17 @@
 %{_libdir}/libkdeinit_kplato.so
 %{_libdir}/kde3/kplato.*
 %{_libdir}/kde3/libkplatopart.*
-%{_datadir}/apps/kplato
-%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/apps/kplato/
+%{_datadir}/doc/HTML/en/kplato/
 %{_datadir}/services/kplatopart.desktop
-%{_datadir}/applications/fedora-kplato.desktop
+%{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+- merge with rexe's edition of the devel spec (thanks again)
+
 * Wed Aug 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Aug 2006 09:15:25 -0000	1.12
+++ sources	21 Oct 2006 07:51:58 -0000	1.13
@@ -1 +1 @@
-cbe9deeb7c811a6bb5a954989b25c1f2  koffice-1.5.2.tar.bz2
+e669cf19b2e1c7db7029c0772c527c0d  koffice-1.6.0.tar.bz2


--- koffice-admin-gcc4isok.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 07:52:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 00:52:28 -0700
Subject: rpms/koffice/FC-4 koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 koffice.spec, 1.17, 1.18 sources, 1.9,
	1.10 koffice-admin-gcc4isok.patch, 1.1,
	NONE koffice-kexi-version.patch, 1.1, NONE
Message-ID: <200610210752.k9L7qSfs026964@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26922/FC-4

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.0.patch 
Removed Files:
	koffice-admin-gcc4isok.patch koffice-kexi-version.patch 
Log Message:
- version upgrade


koffice-1.6.0.patch:

--- NEW FILE koffice-1.6.0.patch ---
--- lib/kross/python/cxx/Objects.hxx.orig	2006-10-19 00:00:02.000000000 +0200
+++ lib/kross/python/cxx/Objects.hxx	2006-10-19 00:02:04.000000000 +0200
@@ -1938,8 +1938,8 @@
 			if(map.hasKey(key)) the_item = map.getItem(key);
 			};
 
-		~mapref<T>()
-			{}
+	//	~mapref<T>()
+	//		{};
 
 		// MapBase<T> stuff
 		// lvalue


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Aug 2006 09:15:24 -0000	1.9
+++ .cvsignore	21 Oct 2006 07:51:58 -0000	1.10
@@ -1 +1 @@
-koffice-1.5.2.tar.bz2
+koffice-1.6.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- koffice.spec	3 Aug 2006 09:15:24 -0000	1.17
+++ koffice.spec	21 Oct 2006 07:51:58 -0000	1.18
@@ -1,16 +1,16 @@
 Name:           koffice
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-1.5.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
-Patch0:         koffice-admin-gcc4isok.patch
+Patch0:         koffice-1.6.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -224,22 +224,23 @@
 
 %prep
 %setup -q
-%patch0 -p1
-
-# this will make sure that patch0 is considered
-make -f admin/Makefile.common
+%patch0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure --disable-rpath --disable-dependency-tracking --enable-shared \
---enable-fast-install --with-pic --disable-static \
---with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
---with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
---with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
+  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+  --enable-final
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -264,156 +265,41 @@
 #now take care of all the desktop files with desktop-file-utils
 #core
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/KThesaurus.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
-
-#kword
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kword.desktop
-
-#kspread
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kspread.desktop
-
-#kpresenter
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kpresenter.desktop
-
-#karbon
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/karbon.desktop
-
-#krita
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_magick.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_openexr.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_png.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_raw.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_tiff.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
-
-#kugar
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
-
-#kchart
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kchart.desktop
-
-#kformula
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kformula.desktop
-
-#kivio
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kivio.desktop
-
-#kexi
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kexi.desktop
-
-#kplato
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
+%post core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
 
 %post kword -p /sbin/ldconfig
 %postun kword -p /sbin/ldconfig
@@ -495,15 +381,17 @@
 %{_libdir}/kde3/libkprkword.*
 %{_libdir}/kde3/libthesaurustool.*
 %{_libdir}/kde3/clipartthumbnail.*
-%{_datadir}/apps/koffice
+%{_datadir}/apps/koffice/
 %{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell
-%{_datadir}/apps/thesaurus
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
 %{_datadir}/config.kcfg/koshell.kcfg
-%{_datadir}/doc/HTML/en/koffice
-%{_datadir}/doc/HTML/en/koshell
-%{_datadir}/doc/HTML/en/thesaurus
-%{_datadir}/icons/*
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/services/clipartthumbnail.desktop
 %{_datadir}/services/kfile*.desktop
 %{_datadir}/services/kwmailmerge*.desktop
@@ -517,20 +405,20 @@
 %{_datadir}/servicetypes/koplugin.desktop
 %{_datadir}/servicetypes/kwmailmerge.desktop
 %{_datadir}/servicetypes/widgetfactory.desktop
-%{_datadir}/applications/fedora-KThesaurus.desktop
-%{_datadir}/applications/fedora-koshell.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublecombobox.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublelineedit.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
-%{_datadir}/apps/kross
+%{_datadir}/apps/kross/
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
 
 %files devel
 %{_includedir}/*
-%{_datadir}/doc/HTML/en/koffice-apidocs
-%{_libdir}/*.so
+%{_datadir}/doc/HTML/en/koffice-apidocs/
+%{_libdir}/lib*.so
 
 %files kword
 %defattr(-,root,root,-)
@@ -539,13 +427,13 @@
 %{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
-%{_datadir}/apps/kword
-%{_datadir}/doc/HTML/en/kword
+%{_datadir}/apps/kword/
+%{_datadir}/doc/HTML/en/kword/
 %{_datadir}/services/kword*.desktop
 %{_datadir}/services/kwserial*.desktop
 %{_datadir}/templates/TextDocument.desktop
 %{_datadir}/templates/.source/TextDocument.kwt
-%{_datadir}/applications/fedora-kword.desktop
+%{_datadir}/applications/kde/*kword.desktop
 
 %files kspread
 %defattr(-,root,root,-)
@@ -564,12 +452,14 @@
 %{_libdir}/kde3/libopencalcexport.*
 %{_libdir}/kde3/libopencalcimport.*
 %{_libdir}/kde3/libqproimport.*
-%{_datadir}/apps/kspread
-%{_datadir}/doc/HTML/en/kspread
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
+%{_datadir}/apps/kspread/
+%{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
 %{_datadir}/templates/SpreadSheet.desktop
 %{_datadir}/templates/.source/SpreadSheet.kst
-%{_datadir}/applications/fedora-kspread.desktop
+%{_datadir}/applications/kde/*kspread.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
@@ -588,12 +478,12 @@
 %{_libdir}/kde3/libkpresentersvgexport.*
 %{_libdir}/kde3/libkpresenterxbmexport.*
 %{_libdir}/kde3/libkpresenterxpmexport.*
-%{_datadir}/apps/kpresenter
-%{_datadir}/doc/HTML/en/kpresenter
+%{_datadir}/apps/kpresenter/
+%{_datadir}/doc/HTML/en/kpresenter/
 %{_datadir}/services/kpresenter*.desktop
 %{_datadir}/templates/Presentation.desktop
 %{_datadir}/templates/.source/Presentation.kpt
-%{_datadir}/applications/fedora-kpresenter.desktop
+%{_datadir}/applications/kde/*kpresenter.desktop
 
 %files karbon
 %defattr(-,root,root,-)
@@ -620,11 +510,11 @@
 %{_libdir}/kde3/libkarbonxcfexport.*
 %{_libdir}/kde3/libwmfexport.*
 %{_libdir}/kde3/libwmfimport.*
-%{_datadir}/apps/karbon
+%{_datadir}/apps/karbon/
 %{_datadir}/services/karbon*
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
-%{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/applications/kde/*karbon.desktop
 %{_datadir}/doc/HTML/en/karbon/
 
 %files krita
@@ -637,6 +527,8 @@
 %{_libdir}/libkrita_rgb_f16half.so.*
 %{_libdir}/libkrita_rgb_f32.so.*
 %{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkrita_ycbcr_u16.so*
+%{_libdir}/libkrita_ycbcr_u8.so*
 %{_libdir}/libkritacolor.so.*
 %{_libdir}/libkritagrayscale.so.*
 %{_libdir}/libkritaimage.so.*
@@ -671,8 +563,6 @@
 %{_libdir}/kde3/kritatoolstar.*
 %{_libdir}/kde3/kritatooltransform.*
 %{_libdir}/kde3/libkritapart.*
-%{_libdir}/kde3/libkritamagickexport.*
-%{_libdir}/kde3/libkritamagickimport.*
 %{_libdir}/kde3/krita_cmyk_u16_plugin.*
 %{_libdir}/kde3/krita_gray_u16_plugin.*
 %{_libdir}/kde3/krita_lms_f32_plugin.*
@@ -690,7 +580,6 @@
 %{_libdir}/kde3/kritascripting.*
 %{_libdir}/kde3/kritaseparatechannels.*
 %{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasmearybrush.*
 %{_libdir}/kde3/kritasobelfilter.*
 %{_libdir}/kde3/kritatoolselectsimilar.*
 %{_libdir}/kde3/kritawetplugin.*
@@ -704,12 +593,27 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/krosskritacore.*
-%{_datadir}/apps/krita
+%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
+%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
+%{_libdir}/kde3/kritablurfilter.*
+%{_libdir}/kde3/kritaextensioncolorsfilters.*
+%{_libdir}/kde3/kritafastcolortransfer.*
+%{_libdir}/kde3/kritalenscorrectionfilter.*
+%{_libdir}/kde3/kritamodifyselection.*
+%{_libdir}/kde3/kritanoisefilter.*
+%{_libdir}/kde3/kritarandompickfilter.*
+%{_libdir}/kde3/kritasubstrate.*
+%{_libdir}/kde3/kritatoolcurves.*
+%{_libdir}/kde3/kritatoolperspectivegrid.*
+%{_libdir}/kde3/kritatoolperspectivetransform.*
+%{_libdir}/kde3/kritaunsharpfilter.*
+%{_libdir}/kde3/kritawavefilter.*
+%{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita*.desktop
-%{_datadir}/apps/kritaplugins
-%{_datadir}/doc/HTML/en/krita
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
+%{_datadir}/doc/HTML/en/krita/
 %{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
@@ -724,13 +628,13 @@
 %{_libdir}/kde3/kugar.*
 %{_libdir}/kde3/libkudesignerpart.*
 %{_libdir}/kde3/libkugarpart.*
-%{_datadir}/apps/kudesigner
-%{_datadir}/apps/kugar
-%{_datadir}/doc/HTML/en/kugar
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/doc/HTML/en/kugar/
 %{_datadir}/services/kugar*.desktop
-%{_datadir}/applications/fedora-kugar.desktop
+%{_datadir}/applications/kde/*kugar.desktop
 # this not being fedorarized fixes #173086
-%{_datadir}/applnk/Office/kudesigner.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -772,10 +676,10 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/apps/kexi
+%{_datadir}/apps/kexi/
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/doc/HTML/en/kexi
-%{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/doc/HTML/en/kexi/
+%{_datadir}/applications/kde/*kexi.desktop
 %{_datadir}/services/kexidb_sqlite*driver.desktop
 
 %files kexi-driver-mysql
@@ -807,20 +711,20 @@
 %{_libdir}/kde3/libkchartmngexport.*
 %{_libdir}/kde3/libkchartxbmexport.*
 %{_libdir}/kde3/libkchartxpmexport.*
-%{_datadir}/apps/kchart
+%{_datadir}/apps/kchart/
 %{_datadir}/services/kchart*.desktop
-%{_datadir}/doc/HTML/en/kchart
-%{_datadir}/applications/fedora-kchart.desktop
+%{_datadir}/doc/HTML/en/kchart/
+%{_datadir}/applications/kde/*kchart.desktop
 
 %files kformula
 %defattr(-,root,root,-)
 %{_bindir}/kformula
 %{_libdir}/kde3/libkformulapart.*
 %{_libdir}/kde3/kformula.*
-%{_datadir}/apps/kformula
-%{_datadir}/doc/HTML/en/kformula
+%{_datadir}/apps/kformula/
+%{_datadir}/doc/HTML/en/kformula/
 %{_datadir}/services/kformula*.desktop
-%{_datadir}/applications/fedora-kformula.desktop
+%{_datadir}/applications/kde/*kformula.desktop
 
 %files kivio
 %defattr(-,root,root,-)
@@ -836,11 +740,11 @@
 %{_libdir}/kde3/libkiviotargettool.*
 %{_libdir}/kde3/libkiviotexttool.*
 %{_libdir}/kde3/libkiviozoomtool.*
-%{_datadir}/apps/kivio
+%{_datadir}/apps/kivio/
 %{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/doc/HTML/en/kivio
+%{_datadir}/doc/HTML/en/kivio/
 %{_datadir}/services/kivio*.desktop
-%{_datadir}/applications/fedora-kivio.desktop
+%{_datadir}/applications/kde/*kivio.desktop
 
 %files filters
 %defattr(-,root,root,-)
@@ -889,11 +793,13 @@
 %{_libdir}/kde3/libhancomwordimport.*
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libpowerpointimport.*
-%{_datadir}/apps/xsltfilter
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_libdir}/kde3/libolefilter.*
+%{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
 
 %files kplato
 %defattr(-,root,root,-)
@@ -901,12 +807,17 @@
 %{_libdir}/libkdeinit_kplato.so
 %{_libdir}/kde3/kplato.*
 %{_libdir}/kde3/libkplatopart.*
-%{_datadir}/apps/kplato
-%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/apps/kplato/
+%{_datadir}/doc/HTML/en/kplato/
 %{_datadir}/services/kplatopart.desktop
-%{_datadir}/applications/fedora-kplato.desktop
+%{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+- merge with rexe's edition of the devel spec (thanks again)
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Aug 2006 09:15:24 -0000	1.9
+++ sources	21 Oct 2006 07:51:58 -0000	1.10
@@ -1 +1 @@
-cbe9deeb7c811a6bb5a954989b25c1f2  koffice-1.5.2.tar.bz2
+e669cf19b2e1c7db7029c0772c527c0d  koffice-1.6.0.tar.bz2


--- koffice-admin-gcc4isok.patch DELETED ---


--- koffice-kexi-version.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 08:21:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 01:21:10 -0700
Subject: rpms/wine/FC-3 .cvsignore, 1.19, 1.20 sources, 1.20, 1.21 wine.spec,
	1.27, 1.28
Message-ID: <200610210821.k9L8LALZ030248@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30212/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	17 Sep 2006 14:14:59 -0000	1.19
+++ .cvsignore	21 Oct 2006 08:20:40 -0000	1.20
@@ -1 +1 @@
-wine-0.9.21-fe.tar.bz2
+wine-0.9.23-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	17 Sep 2006 14:14:59 -0000	1.20
+++ sources	21 Oct 2006 08:20:40 -0000	1.21
@@ -1 +1 @@
-98232c907314f15b54d7f685ecfb5535  wine-0.9.21-fe.tar.bz2
+6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wine.spec	17 Sep 2006 14:14:59 -0000	1.27
+++ wine.spec	21 Oct 2006 08:20:40 -0000	1.28
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.21
+Version:	0.9.23
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.21-fe.tar.bz2
+Source0:        wine-0.9.23-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -359,6 +359,7 @@
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
 %{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/clusapi.dll.so
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
@@ -445,6 +446,7 @@
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
@@ -463,6 +465,7 @@
 %{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
@@ -493,6 +496,7 @@
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/resutils.dll.so
 %{_libdir}/wine/riched20.dll.so
 %{_libdir}/wine/riched32.dll.so
 %{_libdir}/wine/rpcrt4.dll.so
@@ -674,6 +678,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Sun Sep 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.21-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 08:21:11 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 01:21:11 -0700
Subject: rpms/wine/FC-4 .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 wine.spec,
	1.30, 1.31
Message-ID: <200610210821.k9L8LBlG030253@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30212/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	17 Sep 2006 14:15:00 -0000	1.20
+++ .cvsignore	21 Oct 2006 08:20:41 -0000	1.21
@@ -1 +1 @@
-wine-0.9.21-fe.tar.bz2
+wine-0.9.23-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	17 Sep 2006 14:15:00 -0000	1.21
+++ sources	21 Oct 2006 08:20:41 -0000	1.22
@@ -1 +1 @@
-98232c907314f15b54d7f685ecfb5535  wine-0.9.21-fe.tar.bz2
+6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wine.spec	17 Sep 2006 14:15:00 -0000	1.30
+++ wine.spec	21 Oct 2006 08:20:41 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.21
+Version:	0.9.23
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.21-fe.tar.bz2
+Source0:        wine-0.9.23-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -359,6 +359,7 @@
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
 %{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/clusapi.dll.so
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
@@ -445,6 +446,7 @@
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
@@ -463,6 +465,7 @@
 %{_libdir}/wine/msvideo.dll16
 %{_libdir}/wine/mswsock.dll.so
 %{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/nddeapi.dll.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
@@ -493,6 +496,7 @@
 %{_libdir}/wine/query.dll.so
 %{_libdir}/wine/rasapi16.dll16
 %{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/resutils.dll.so
 %{_libdir}/wine/riched20.dll.so
 %{_libdir}/wine/riched32.dll.so
 %{_libdir}/wine/rpcrt4.dll.so
@@ -674,6 +678,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Sun Sep 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.21-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:06:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:06:36 -0700
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wine-docs.spec, 1.20, 1.21
Message-ID: <200610210906.k9L96aJr000958@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/FC-3

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2006 04:12:23 -0000	1.17
+++ .cvsignore	21 Oct 2006 09:06:05 -0000	1.18
@@ -1 +1 @@
-wine-docs-0.9.20.tar.bz2
+wine-docs-0.9.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2006 04:12:23 -0000	1.17
+++ sources	21 Oct 2006 09:06:05 -0000	1.18
@@ -1 +1 @@
-770e081e2917d291294c157dda4856eb  wine-docs-0.9.20.tar.bz2
+8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wine-docs.spec	28 Aug 2006 04:12:23 -0000	1.20
+++ wine-docs.spec	21 Oct 2006 09:06:05 -0000	1.21
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.20
+Version:        0.9.23
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.20.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.20-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:06:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:06:36 -0700
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wine-docs.spec, 1.24, 1.25
Message-ID: <200610210906.k9L96aha000963@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/FC-4

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2006 04:12:24 -0000	1.17
+++ .cvsignore	21 Oct 2006 09:06:06 -0000	1.18
@@ -1 +1 @@
-wine-docs-0.9.20.tar.bz2
+wine-docs-0.9.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2006 04:12:24 -0000	1.17
+++ sources	21 Oct 2006 09:06:06 -0000	1.18
@@ -1 +1 @@
-770e081e2917d291294c157dda4856eb  wine-docs-0.9.20.tar.bz2
+8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wine-docs.spec	28 Aug 2006 04:12:24 -0000	1.24
+++ wine-docs.spec	21 Oct 2006 09:06:06 -0000	1.25
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.20
+Version:        0.9.23
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.20.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -51,6 +51,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.20-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:06:42 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:06:42 -0700
Subject: rpms/wine-docs/FC-5 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wine-docs.spec, 1.17, 1.18
Message-ID: <200610210906.k9L96gaw000968@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/FC-5

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2006 04:12:30 -0000	1.17
+++ .cvsignore	21 Oct 2006 09:06:12 -0000	1.18
@@ -1 +1 @@
-wine-docs-0.9.20.tar.bz2
+wine-docs-0.9.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2006 04:12:30 -0000	1.17
+++ sources	21 Oct 2006 09:06:12 -0000	1.18
@@ -1 +1 @@
-770e081e2917d291294c157dda4856eb  wine-docs-0.9.20.tar.bz2
+8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wine-docs.spec	28 Aug 2006 04:12:30 -0000	1.17
+++ wine-docs.spec	21 Oct 2006 09:06:12 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.20
+Version:        0.9.23
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.20.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.20-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:06:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:06:43 -0700
Subject: rpms/wine-docs/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 wine-docs.spec, 1.17, 1.18
Message-ID: <200610210906.k9L96hU5000973@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/devel

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Aug 2006 04:12:30 -0000	1.17
+++ .cvsignore	21 Oct 2006 09:06:13 -0000	1.18
@@ -1 +1 @@
-wine-docs-0.9.20.tar.bz2
+wine-docs-0.9.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Aug 2006 04:12:30 -0000	1.17
+++ sources	21 Oct 2006 09:06:13 -0000	1.18
@@ -1 +1 @@
-770e081e2917d291294c157dda4856eb  wine-docs-0.9.20.tar.bz2
+8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wine-docs.spec	28 Aug 2006 04:12:30 -0000	1.17
+++ wine-docs.spec	21 Oct 2006 09:06:13 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.20
+Version:        0.9.23
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.20.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.23-1
+- version upgrade
+
 * Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.20-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 21 09:16:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 02:16:07 -0700
Subject: owners owners.list,1.1858,1.1859
Message-ID: <200610210916.k9L9G7fQ001210@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1166

Modified Files:
	owners.list 
Log Message:
unorphan MagicPoint


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1858
retrieving revision 1.1859
diff -u -r1.1858 -r1.1859
--- owners.list	20 Oct 2006 17:06:40 -0000	1.1858
+++ owners.list	21 Oct 2006 09:15:36 -0000	1.1859
@@ -1011,7 +1011,7 @@
 Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|MagicPoint|X based presentation software|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org,byte at fedoraproject.org
+Fedora Extras|MagicPoint|X based presentation software|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|rms at 1407.org,byte at fedoraproject.org
 Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|man-pages-uk|Ukrainian man pages from the Linux Documentation Project|andy at smile.org.ua|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 21 09:29:21 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 21 Oct 2006 02:29:21 -0700
Subject: rpms/clamav/FC-3 clamav.spec,1.24,1.25 sources,1.16,1.17
Message-ID: <200610210929.k9L9TLmV001411@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1391

Modified Files:
	clamav.spec sources 
Log Message:
updated to 0.88.5


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- clamav.spec	9 Aug 2006 06:59:30 -0000	1.24
+++ clamav.spec	21 Oct 2006 09:28:51 -0000	1.25
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.4
+Version:	0.88.5
 Release:	%release_func 1
 
 License:	GPL
@@ -432,6 +432,9 @@
 %endif	# _without_milter
 
 %changelog
+* Sat Oct 21 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.5-1
+- updated to 0.88.5
+
 * Tue Aug  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.4-1
 - updated to 0.88.4 (SECURITY)
 - removed some superfluous %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Aug 2006 06:59:30 -0000	1.16
+++ sources	21 Oct 2006 09:28:51 -0000	1.17
@@ -1,2 +1,2 @@
-7759784aa4506b314e6543e0f2a8587b  clamav-0.88.4.tar.gz
-450d59c0a663b5986cda1105b85ae673  clamav-0.88.4.tar.gz.sig
+d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
+5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Oct 21 09:31:29 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 21 Oct 2006 02:31:29 -0700
Subject: rpms/clamav/FC-4 clamav.spec,1.34,1.35 sources,1.18,1.19
Message-ID: <200610210931.k9L9VTVt001510@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492

Modified Files:
	clamav.spec sources 
Log Message:
updated to 0.88.5


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- clamav.spec	9 Aug 2006 06:57:03 -0000	1.34
+++ clamav.spec	21 Oct 2006 09:30:58 -0000	1.35
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.4
+Version:	0.88.5
 Release:	%release_func 1
 
 License:	GPL
@@ -432,6 +432,9 @@
 %endif	# _without_milter
 
 %changelog
+* Sat Oct 21 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.5-1
+- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
+
 * Tue Aug  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.4-1
 - updated to 0.88.4 (SECURITY)
 - removed some superfluous %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Aug 2006 06:57:03 -0000	1.18
+++ sources	21 Oct 2006 09:30:58 -0000	1.19
@@ -1,2 +1,2 @@
-7759784aa4506b314e6543e0f2a8587b  clamav-0.88.4.tar.gz
-450d59c0a663b5986cda1105b85ae673  clamav-0.88.4.tar.gz.sig
+d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
+5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Oct 21 09:38:41 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:38:41 -0700
Subject: rpms/fluxbox/FC-3 fluxbox-xdg-menu.py, 1.2, 1.3 fluxbox.spec, 1.13, 
	1.14 fluxbox-menu.patch, 1.1, NONE
Message-ID: <200610210938.k9L9cfEF001650@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585/FC-3

Modified Files:
	fluxbox-xdg-menu.py fluxbox.spec 
Removed Files:
	fluxbox-menu.patch 
Log Message:
- fix #209347 and #187740
- fc{5,6} fix #196106 



Index: fluxbox-xdg-menu.py
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/fluxbox-xdg-menu.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fluxbox-xdg-menu.py	5 Apr 2006 21:19:28 -0000	1.2
+++ fluxbox-xdg-menu.py	21 Oct 2006 09:38:11 -0000	1.3
@@ -1,20 +1,34 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
+# vim: noexpandtab:ts=4:sts=4
+
 """Menu Generator for Fluxbox
 
 Generates a menu for Fluxbox using the freedesktop.org standards
 
-Usage: fluxbox-fdo-menugen.py [options]
+Usage: fluxbox-xdg-menu.py [options]
 
 Options:
   -l ..., --lang=...      create the menu using a language. Default = $LANG
   -h, --help              show this help
   -f ..., --file=...      output the menu into a file. Default = ~/.fluxbox/menu
-  --with-icons         do not put icons for applications in the menu
+  -t ..., --theme=...     what icon theme you want to use
+  --with-icons            put icons for applications in the menu
   --stdout                output the menu to standard output
+  --submenu               output to be used as an include/submenu with fluxbox
+  --with-backgrounds      creates a background menu. Default background_paths = 
+                          ~/.fluxbox/backgrounds, /usr/share/wallpapers,
+                          /usr/share/backgrounds
+  --backgrounds-only      do not regenerate menu, only do the bg menu.
+  --bg-path=              path to location to look for images 
+                          example: --bg-path=~/pics  
+			  may be used with --backgrounds-only but --bg-path= 
+			  must be first: --bg-path=~/some/path --backgrounds-only
 
+A nice example string to use: fluxbox-fdo-menugen.py --with-icons --with-backgrounds --bg-path=~/some/path
+To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --backgrounds-only
 """
 
-__author__ = "Rudolf Kastl , Antonio Gomes"
+__author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice"
 __version__ = "$Revision$"
 __date__ = "$Date$"
 __license__ = "GPL"
@@ -22,6 +36,7 @@
 
 import os,re,sys,glob,getopt
 import xdg.Menu,xdg.DesktopEntry,xdg.IconTheme
+from os.path import isfile
 
 def usage():
 	print __doc__
@@ -31,7 +46,7 @@
 [begin] (Fluxbox)
 	[exec] (Web Browser) {htmlview}
 	[exec] (Email) {evolution}
-	[exec] (Terminal) {gnome-terminal}
+	[exec] (Terminal) {$TERM}
 	[exec] (Irc) {xchat}
 	[separator]\n"""
 
@@ -78,66 +93,31 @@
 			else:
 				entry.Show = True 
 	
-#def findIcon(icon):
-#	"""Finds the path and filename for the given icon name
-#		e.g. gaim --> /usr/share/pixmaps/gaim.png
-#		e.g. fart.png --> /usr/share/pixmaps/fart.png
-#	"""
-#	if os.path.isfile(icon): return icon
-#	paths = ["~/.icons","/usr/share/pixmaps","/usr/share/icons"]
-#	for path in paths:
-#		for dirpath , dirnames, filenames in os.walk(os.path.expanduser(path)):
-#			for filename in filenames:
-#				pattern = '^%s\.(png|jpg|gif|xpm)' % icon # matches <filename>.<something>
-#				if icon == filename or re.search(pattern, filename):
-#					return os.path.join(dirpath,filename)
-
-
-def findIcon(icon):
+def findIcon(icon, theme):
 	"""Finds the path and filename for the given icon name
 		e.g. gaim --> /usr/share/pixmaps/gaim.png
 		e.g. fart.png --> /usr/share/pixmaps/fart.png
 	"""
-	global paths
-	global locs
-
-	# Case Icon=/path/to/file.extension
-	if os.path.isfile(icon): return icon
-
-
-	# Case Icon=file.extension	
-
-	if re.search("^\w+.*\.\w{3}$",icon):
-		names=[icon]
-	# Case Icon=file
-	elif re.search("^\w+.*$",icon):
-		names=[icon+".png",icon+".xpm",icon+".jpg"]
-	else:
-		names=[]
+	retval=str(xdg.IconTheme.getIconPath(icon, 48, theme))
+	if retval == "None":
+		retval=""
 
-	for path in paths:	
-		for name in names:
-			if (os.path.isfile(path+name)):
-				locs.append(path)
-				return (path+name).encode('utf8')
+	return (retval + "").encode('utf8')
 
-
-def parseMenu(menu,depth=1):
-	global wm
-	global use_icons
+def parseMenu(menu,wm,use_icons,theme,depth=1):
 	if use_icons:
-		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'), findIcon(menu.getIcon()) )
+		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'),  findIcon(menu.getIcon(), theme) )
 	else:
 		print "%s[submenu] (%s) " % ( (depth*"\t"), menu.getName().encode('utf8'), )
 	depth += 1
 	for entry in menu.getEntries():
 		if isinstance(entry, xdg.Menu.Menu):
-			parseMenu(entry,depth)
+			parseMenu(entry,wm,use_icons,theme,depth)
 		elif isinstance(entry, xdg.Menu.MenuEntry):
 			checkWm(entry,wm)
 			if entry.Show == False: continue
 			if use_icons:
-				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon()) )
+				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) )
 			else:
 				print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] )
 		elif isinstance(entry,xdg.Menu.Separator):
@@ -147,22 +127,77 @@
 	depth -= 1
 	print "%s[end]" % (depth*"\t")
 
+def get_bgimgs_and_parse(xPath):
+    try:
+        if isfile(os.path.expanduser("~/.fluxbox/bgmenu")) == True:
+            os.unlink(os.path.expanduser("~/.fluxbox/bgmenu"))
+    except OSError:
+        pass
+    h = {}
+    bg_paths =["~/.fluxbox/backgrounds","/usr/share/wallpapers",
+		"/usr/share/backgrounds","/usr/share/backgrounds/images"]
+    try:
+        if xPath == None:
+           pass
+        else:
+            bg_paths.append(xPath)
+    except(TypeError):
+        pass
+    for dir in bg_paths:
+        for imgpth in bg_paths:
+            try:
+                imgs = os.listdir(os.path.expanduser(imgpth))
+                for i in imgs:
+                    h[i] = imgpth
+            except (OSError):
+                pass
+    bgMenu = open(os.path.expanduser("~/.fluxbox/bgmenu"),'w+')
+    num = len(h)
+    countNum = 1
+    bgPagCk = 1
+    bgPgNum = 1
+    bgMenu.write( "[submenu] (Backgrounds)\n" )
+    bgMenu.write( "[submenu] (Backgrounds) {Set Your Background}\n" )
+    bgMenu.write("\t[exec]  (Random Image)  {fbsetbg -r ~/.fluxbox/backgrounds}\n")
+	types = ["png","jpg","jpeg","gif"]
+    for i in h.keys():
+	    try:
+		    t = i.split(".")[-1].lower()
+			if t in types:
+			    print "Hello"
+			    bgMenu.write( "\t[exec]\t("+ i +") {fbsetbg -f "+ h[i] + "/" + i +"}\n" )
+				countNum = countNum + 1
+				num = num - 1
+				bgPagCk = bgPagCk + 1
+				if bgPagCk == 26:
+				    bgPgNum = bgPgNum + 1
+					bgMenu.write("[end]\n[submenu] (Backgrounds " + str(bgPgNum) +") \
+						{Set Your Background}\n")
+					bgPagCk = 1
+				if num == 0:
+				    bgMenu.write( "[end]\n[end]\n" )
+					bgMenu.close()
+		except(KeyError):
+		    print h[i]
+		    pass
 
 def main(argv):
 # Setting the default values
-	global locs
-	locs=[]
-	global wm
 	wm = "fluxbox"
-	global file
 	file = "~/.fluxbox/menu"
-	global use_icons
 	use_icons = False
+    use_bg = False
+    bg_Xpath = False
+	theme = "gnome"
 	lang = os.getenv("LANG","C")
 	file = os.path.expanduser("~/.fluxbox/menu")
+	do_submenu = False
+	use_stdout = False
 	
 	try:
-		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout"])
+		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout",\
+			"theme=","submenu","with-backgrounds","backgrounds-only","bg-path="])
+
 	except getopt.GetoptError:
 		usage()
 		sys.exit(2)
@@ -175,50 +210,51 @@
 		elif opt in ("-f", "--file"):
 			file = os.path.expanduser(arg)
 		elif opt == '--with-icons':
-			use_icons = True		
-			global paths
-			locations = \
-			['/usr/share/pixmaps/', \
-			'/usr/share/icons/hicolor/24x24/apps/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/hicolor/48x48/apps/', \
-			'/usr/share/icons/hicolor/24x24/stock/generic/', \
-			'/usr/share/icons/HighContrastLargePrintInverse/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/16x16/apps/', \
-			'/usr/share/icons/crystalsvg/32x32/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/devices/', \
-			'/usr/share/icons/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/Bluecurve/24x24/stock/', \
-			'/usr/share/icons/Bluecurve/48x48/filesystems/']
-			paths=locations
-#			for path in locations:
-#				paths+=glob.glob(path+"/*/")+glob.glob(path+"/*/*/")
-#			print paths
+			use_icons = True
+		elif opt in ("-t", "--theme"):
+			theme = arg
+		elif opt == '--stdout':
+			use_stdout = True
 		elif opt == '--stdout':
 			file = sys.stdout
-
-
-	fsock = open(file,'w')
-	saveout = sys.stdout
-	sys.stdout = fsock
+		elif opt == '--bg-path':
+		    bg_Xpath = True
+			xPath = os.path.expanduser(arg)
+		elif opt == '--with-backgrounds':
+		    use_bg = True
+		elif opt == '--backgrounds-only':
+		    if bg_Xpath:
+			    get_bgimgs_and_parse(xPath)
+			else:
+			    get_bgimgs_and_parse(None)
+				raise SystemExit
+			  
+		elif opt == '--submenu':
+			do_submenu = True
+
+	if not use_stdout:
+		fsock = open(file,'w')
+		saveout = sys.stdout
+		sys.stdout = fsock
 
 	menu=xdg.Menu.parse()
 # is done automatically now
 #	menu.setLocale(lang)
 
-	print header()
-	parseMenu(menu)
-	print footer()
+	if not do_submenu:
+        print header()
+	parseMenu(menu,wm,use_icons,theme)
+	if not do_submenu and use_bg and bg_Xpath:
+	    get_bgimgs_and_parse(xPath) 
+	    print "[include] (~/.fluxbox/bgmenu)"
+	if not do_submenu and use_bg and not bg_Xpath:
+	    print "[include] (~/.fluxbox/bgmenu)"
+		get_bgimgs_and_parse(None)
+    if not do_submenu:
+        print footer()
+	if not use_stdout:
+		sys.stdout = saveout
 
-	sys.stdout = saveout
 #	print menu
 if __name__ == "__main__":
 	main(sys.argv[1:])
-
-#WindowMaker Reminder
-#>>> p=re.compile("(\).*),(\s*\))")
-#>>> p.search("((ola),(ola),)").groups()
-#('),(ola)', ')')
-


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-3/fluxbox.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fluxbox.spec	5 Apr 2006 21:19:28 -0000	1.13
+++ fluxbox.spec	21 Oct 2006 09:38:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -13,7 +13,6 @@
 Source2:        FluxBox
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
-Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -35,7 +34,6 @@
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure      --enable-xft \
@@ -80,6 +78,10 @@
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-2
+- fix #187740 and #209347
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15.1-1
 - version upgrade


--- fluxbox-menu.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 09:38:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:38:43 -0700
Subject: rpms/fluxbox/FC-5 fluxbox-xdg-menu.py, 1.1, 1.2 fluxbox.spec, 1.19, 
	1.20 fluxbox-menu.patch, 1.3, NONE
Message-ID: <200610210938.k9L9chge001658@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585/FC-5

Modified Files:
	fluxbox-xdg-menu.py fluxbox.spec 
Removed Files:
	fluxbox-menu.patch 
Log Message:
- fix #209347 and #187740
- fc{5,6} fix #196106 



Index: fluxbox-xdg-menu.py
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox-xdg-menu.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-xdg-menu.py	29 Nov 2005 15:56:10 -0000	1.1
+++ fluxbox-xdg-menu.py	21 Oct 2006 09:38:13 -0000	1.2
@@ -1,20 +1,34 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
+# vim: noexpandtab:ts=4:sts=4
+
 """Menu Generator for Fluxbox
 
 Generates a menu for Fluxbox using the freedesktop.org standards
 
-Usage: fluxbox-fdo-menugen.py [options]
+Usage: fluxbox-xdg-menu.py [options]
 
 Options:
   -l ..., --lang=...      create the menu using a language. Default = $LANG
   -h, --help              show this help
   -f ..., --file=...      output the menu into a file. Default = ~/.fluxbox/menu
-  --with-icons         do not put icons for applications in the menu
+  -t ..., --theme=...     what icon theme you want to use
+  --with-icons            put icons for applications in the menu
   --stdout                output the menu to standard output
+  --submenu               output to be used as an include/submenu with fluxbox
+  --with-backgrounds      creates a background menu. Default background_paths = 
+                          ~/.fluxbox/backgrounds, /usr/share/wallpapers,
+                          /usr/share/backgrounds
+  --backgrounds-only      do not regenerate menu, only do the bg menu.
+  --bg-path=              path to location to look for images 
+                          example: --bg-path=~/pics  
+			  may be used with --backgrounds-only but --bg-path= 
+			  must be first: --bg-path=~/some/path --backgrounds-only
 
+A nice example string to use: fluxbox-fdo-menugen.py --with-icons --with-backgrounds --bg-path=~/some/path
+To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --backgrounds-only
 """
 
-__author__ = "Rudolf Kastl , Antonio Gomes"
+__author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice"
 __version__ = "$Revision$"
 __date__ = "$Date$"
 __license__ = "GPL"
@@ -22,6 +36,7 @@
 
 import os,re,sys,glob,getopt
 import xdg.Menu,xdg.DesktopEntry,xdg.IconTheme
+from os.path import isfile
 
 def usage():
 	print __doc__
@@ -31,7 +46,7 @@
 [begin] (Fluxbox)
 	[exec] (Web Browser) {htmlview}
 	[exec] (Email) {evolution}
-	[exec] (Terminal) {gnome-terminal}
+	[exec] (Terminal) {$TERM}
 	[exec] (Irc) {xchat}
 	[separator]\n"""
 
@@ -78,66 +93,31 @@
 			else:
 				entry.Show = True 
 	
-#def findIcon(icon):
-#	"""Finds the path and filename for the given icon name
-#		e.g. gaim --> /usr/share/pixmaps/gaim.png
-#		e.g. fart.png --> /usr/share/pixmaps/fart.png
-#	"""
-#	if os.path.isfile(icon): return icon
-#	paths = ["~/.icons","/usr/share/pixmaps","/usr/share/icons"]
-#	for path in paths:
-#		for dirpath , dirnames, filenames in os.walk(os.path.expanduser(path)):
-#			for filename in filenames:
-#				pattern = '^%s\.(png|jpg|gif|xpm)' % icon # matches <filename>.<something>
-#				if icon == filename or re.search(pattern, filename):
-#					return os.path.join(dirpath,filename)
-
-
-def findIcon(icon):
+def findIcon(icon, theme):
 	"""Finds the path and filename for the given icon name
 		e.g. gaim --> /usr/share/pixmaps/gaim.png
 		e.g. fart.png --> /usr/share/pixmaps/fart.png
 	"""
-	global paths
-	global locs
-
-	# Case Icon=/path/to/file.extension
-	if os.path.isfile(icon): return icon
-
-
-	# Case Icon=file.extension	
-
-	if re.search("^\w+.*\.\w{3}$",icon):
-		names=[icon]
-	# Case Icon=file
-	elif re.search("^\w+.*$",icon):
-		names=[icon+".png",icon+".xpm",icon+".jpg"]
-	else:
-		names=[]
+	retval=str(xdg.IconTheme.getIconPath(icon, 48, theme))
+	if retval == "None":
+		retval=""
 
-	for path in paths:	
-		for name in names:
-			if (os.path.isfile(path+name)):
-				locs.append(path)
-				return (path+name).encode('utf8')
+	return (retval + "").encode('utf8')
 
-
-def parseMenu(menu,depth=1):
-	global wm
-	global use_icons
+def parseMenu(menu,wm,use_icons,theme,depth=1):
 	if use_icons:
-		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'), findIcon(menu.getIcon()) )
+		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'),  findIcon(menu.getIcon(), theme) )
 	else:
 		print "%s[submenu] (%s) " % ( (depth*"\t"), menu.getName().encode('utf8'), )
 	depth += 1
 	for entry in menu.getEntries():
 		if isinstance(entry, xdg.Menu.Menu):
-			parseMenu(entry,depth)
+			parseMenu(entry,wm,use_icons,theme,depth)
 		elif isinstance(entry, xdg.Menu.MenuEntry):
 			checkWm(entry,wm)
 			if entry.Show == False: continue
 			if use_icons:
-				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon()) )
+				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) )
 			else:
 				print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] )
 		elif isinstance(entry,xdg.Menu.Separator):
@@ -147,22 +127,77 @@
 	depth -= 1
 	print "%s[end]" % (depth*"\t")
 
+def get_bgimgs_and_parse(xPath):
+    try:
+        if isfile(os.path.expanduser("~/.fluxbox/bgmenu")) == True:
+            os.unlink(os.path.expanduser("~/.fluxbox/bgmenu"))
+    except OSError:
+        pass
+    h = {}
+    bg_paths =["~/.fluxbox/backgrounds","/usr/share/wallpapers",
+		"/usr/share/backgrounds","/usr/share/backgrounds/images"]
+    try:
+        if xPath == None:
+           pass
+        else:
+            bg_paths.append(xPath)
+    except(TypeError):
+        pass
+    for dir in bg_paths:
+        for imgpth in bg_paths:
+            try:
+                imgs = os.listdir(os.path.expanduser(imgpth))
+                for i in imgs:
+                    h[i] = imgpth
+            except (OSError):
+                pass
+    bgMenu = open(os.path.expanduser("~/.fluxbox/bgmenu"),'w+')
+    num = len(h)
+    countNum = 1
+    bgPagCk = 1
+    bgPgNum = 1
+    bgMenu.write( "[submenu] (Backgrounds)\n" )
+    bgMenu.write( "[submenu] (Backgrounds) {Set Your Background}\n" )
+    bgMenu.write("\t[exec]  (Random Image)  {fbsetbg -r ~/.fluxbox/backgrounds}\n")
+	types = ["png","jpg","jpeg","gif"]
+    for i in h.keys():
+	    try:
+		    t = i.split(".")[-1].lower()
+			if t in types:
+			    print "Hello"
+			    bgMenu.write( "\t[exec]\t("+ i +") {fbsetbg -f "+ h[i] + "/" + i +"}\n" )
+				countNum = countNum + 1
+				num = num - 1
+				bgPagCk = bgPagCk + 1
+				if bgPagCk == 26:
+				    bgPgNum = bgPgNum + 1
+					bgMenu.write("[end]\n[submenu] (Backgrounds " + str(bgPgNum) +") \
+						{Set Your Background}\n")
+					bgPagCk = 1
+				if num == 0:
+				    bgMenu.write( "[end]\n[end]\n" )
+					bgMenu.close()
+		except(KeyError):
+		    print h[i]
+		    pass
 
 def main(argv):
 # Setting the default values
-	global locs
-	locs=[]
-	global wm
 	wm = "fluxbox"
-	global file
 	file = "~/.fluxbox/menu"
-	global use_icons
 	use_icons = False
+    use_bg = False
+    bg_Xpath = False
+	theme = "gnome"
 	lang = os.getenv("LANG","C")
 	file = os.path.expanduser("~/.fluxbox/menu")
+	do_submenu = False
+	use_stdout = False
 	
 	try:
-		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout"])
+		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout",\
+			"theme=","submenu","with-backgrounds","backgrounds-only","bg-path="])
+
 	except getopt.GetoptError:
 		usage()
 		sys.exit(2)
@@ -175,50 +210,51 @@
 		elif opt in ("-f", "--file"):
 			file = os.path.expanduser(arg)
 		elif opt == '--with-icons':
-			use_icons = True		
-			global paths
-			locations = \
-			['/usr/share/pixmaps/', \
-			'/usr/share/icons/hicolor/24x24/apps/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/hicolor/48x48/apps/', \
-			'/usr/share/icons/hicolor/24x24/stock/generic/', \
-			'/usr/share/icons/HighContrastLargePrintInverse/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/16x16/apps/', \
-			'/usr/share/icons/crystalsvg/32x32/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/devices/', \
-			'/usr/share/icons/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/Bluecurve/24x24/stock/', \
-			'/usr/share/icons/Bluecurve/48x48/filesystems/']
-			paths=locations
-#			for path in locations:
-#				paths+=glob.glob(path+"/*/")+glob.glob(path+"/*/*/")
-#			print paths
+			use_icons = True
+		elif opt in ("-t", "--theme"):
+			theme = arg
+		elif opt == '--stdout':
+			use_stdout = True
 		elif opt == '--stdout':
 			file = sys.stdout
-
-
-	fsock = open(file,'w')
-	saveout = sys.stdout
-	sys.stdout = fsock
+		elif opt == '--bg-path':
+		    bg_Xpath = True
+			xPath = os.path.expanduser(arg)
+		elif opt == '--with-backgrounds':
+		    use_bg = True
+		elif opt == '--backgrounds-only':
+		    if bg_Xpath:
+			    get_bgimgs_and_parse(xPath)
+			else:
+			    get_bgimgs_and_parse(None)
+				raise SystemExit
+			  
+		elif opt == '--submenu':
+			do_submenu = True
+
+	if not use_stdout:
+		fsock = open(file,'w')
+		saveout = sys.stdout
+		sys.stdout = fsock
 
 	menu=xdg.Menu.parse()
 # is done automatically now
 #	menu.setLocale(lang)
 
-	print header()
-	parseMenu(menu)
-	print footer()
+	if not do_submenu:
+        print header()
+	parseMenu(menu,wm,use_icons,theme)
+	if not do_submenu and use_bg and bg_Xpath:
+	    get_bgimgs_and_parse(xPath) 
+	    print "[include] (~/.fluxbox/bgmenu)"
+	if not do_submenu and use_bg and not bg_Xpath:
+	    print "[include] (~/.fluxbox/bgmenu)"
+		get_bgimgs_and_parse(None)
+    if not do_submenu:
+        print footer()
+	if not use_stdout:
+		sys.stdout = saveout
 
-	sys.stdout = saveout
 #	print menu
 if __name__ == "__main__":
 	main(sys.argv[1:])
-
-#WindowMaker Reminder
-#>>> p=re.compile("(\).*),(\s*\))")
-#>>> p.search("((ola),(ola),)").groups()
-#('),(ola)', ')')
-


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fluxbox.spec	5 Apr 2006 21:19:35 -0000	1.19
+++ fluxbox.spec	21 Oct 2006 09:38:13 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -11,7 +11,6 @@
 Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.1.tar.bz2
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
-Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -42,7 +41,6 @@
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure      --enable-xft \
@@ -63,7 +61,7 @@
 
 # this is for Fedora Core
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
-install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
+install -m 0644 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
 install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu
 
 %clean
@@ -78,6 +76,10 @@
 %{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-2
+- fix #209347,#196106, and #187740
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15.1-1
 - version upgrade


--- fluxbox-menu.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 09:38:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:38:44 -0700
Subject: rpms/fluxbox/devel fluxbox-xdg-menu.py, 1.1, 1.2 fluxbox.spec, 1.20,
	1.21 fluxbox-menu.patch, 1.3, NONE
Message-ID: <200610210938.k9L9ciOr001662@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585/devel

Modified Files:
	fluxbox-xdg-menu.py fluxbox.spec 
Removed Files:
	fluxbox-menu.patch 
Log Message:
- fix #209347 and #187740
- fc{5,6} fix #196106 



Index: fluxbox-xdg-menu.py
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox-xdg-menu.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-xdg-menu.py	29 Nov 2005 15:56:10 -0000	1.1
+++ fluxbox-xdg-menu.py	21 Oct 2006 09:38:14 -0000	1.2
@@ -1,20 +1,34 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
+# vim: noexpandtab:ts=4:sts=4
+
 """Menu Generator for Fluxbox
 
 Generates a menu for Fluxbox using the freedesktop.org standards
 
-Usage: fluxbox-fdo-menugen.py [options]
+Usage: fluxbox-xdg-menu.py [options]
 
 Options:
   -l ..., --lang=...      create the menu using a language. Default = $LANG
   -h, --help              show this help
   -f ..., --file=...      output the menu into a file. Default = ~/.fluxbox/menu
-  --with-icons         do not put icons for applications in the menu
+  -t ..., --theme=...     what icon theme you want to use
+  --with-icons            put icons for applications in the menu
   --stdout                output the menu to standard output
+  --submenu               output to be used as an include/submenu with fluxbox
+  --with-backgrounds      creates a background menu. Default background_paths = 
+                          ~/.fluxbox/backgrounds, /usr/share/wallpapers,
+                          /usr/share/backgrounds
+  --backgrounds-only      do not regenerate menu, only do the bg menu.
+  --bg-path=              path to location to look for images 
+                          example: --bg-path=~/pics  
+			  may be used with --backgrounds-only but --bg-path= 
+			  must be first: --bg-path=~/some/path --backgrounds-only
 
+A nice example string to use: fluxbox-fdo-menugen.py --with-icons --with-backgrounds --bg-path=~/some/path
+To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --backgrounds-only
 """
 
-__author__ = "Rudolf Kastl , Antonio Gomes"
+__author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice"
 __version__ = "$Revision$"
 __date__ = "$Date$"
 __license__ = "GPL"
@@ -22,6 +36,7 @@
 
 import os,re,sys,glob,getopt
 import xdg.Menu,xdg.DesktopEntry,xdg.IconTheme
+from os.path import isfile
 
 def usage():
 	print __doc__
@@ -31,7 +46,7 @@
 [begin] (Fluxbox)
 	[exec] (Web Browser) {htmlview}
 	[exec] (Email) {evolution}
-	[exec] (Terminal) {gnome-terminal}
+	[exec] (Terminal) {$TERM}
 	[exec] (Irc) {xchat}
 	[separator]\n"""
 
@@ -78,66 +93,31 @@
 			else:
 				entry.Show = True 
 	
-#def findIcon(icon):
-#	"""Finds the path and filename for the given icon name
-#		e.g. gaim --> /usr/share/pixmaps/gaim.png
-#		e.g. fart.png --> /usr/share/pixmaps/fart.png
-#	"""
-#	if os.path.isfile(icon): return icon
-#	paths = ["~/.icons","/usr/share/pixmaps","/usr/share/icons"]
-#	for path in paths:
-#		for dirpath , dirnames, filenames in os.walk(os.path.expanduser(path)):
-#			for filename in filenames:
-#				pattern = '^%s\.(png|jpg|gif|xpm)' % icon # matches <filename>.<something>
-#				if icon == filename or re.search(pattern, filename):
-#					return os.path.join(dirpath,filename)
-
-
-def findIcon(icon):
+def findIcon(icon, theme):
 	"""Finds the path and filename for the given icon name
 		e.g. gaim --> /usr/share/pixmaps/gaim.png
 		e.g. fart.png --> /usr/share/pixmaps/fart.png
 	"""
-	global paths
-	global locs
-
-	# Case Icon=/path/to/file.extension
-	if os.path.isfile(icon): return icon
-
-
-	# Case Icon=file.extension	
-
-	if re.search("^\w+.*\.\w{3}$",icon):
-		names=[icon]
-	# Case Icon=file
-	elif re.search("^\w+.*$",icon):
-		names=[icon+".png",icon+".xpm",icon+".jpg"]
-	else:
-		names=[]
+	retval=str(xdg.IconTheme.getIconPath(icon, 48, theme))
+	if retval == "None":
+		retval=""
 
-	for path in paths:	
-		for name in names:
-			if (os.path.isfile(path+name)):
-				locs.append(path)
-				return (path+name).encode('utf8')
+	return (retval + "").encode('utf8')
 
-
-def parseMenu(menu,depth=1):
-	global wm
-	global use_icons
+def parseMenu(menu,wm,use_icons,theme,depth=1):
 	if use_icons:
-		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'), findIcon(menu.getIcon()) )
+		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'),  findIcon(menu.getIcon(), theme) )
 	else:
 		print "%s[submenu] (%s) " % ( (depth*"\t"), menu.getName().encode('utf8'), )
 	depth += 1
 	for entry in menu.getEntries():
 		if isinstance(entry, xdg.Menu.Menu):
-			parseMenu(entry,depth)
+			parseMenu(entry,wm,use_icons,theme,depth)
 		elif isinstance(entry, xdg.Menu.MenuEntry):
 			checkWm(entry,wm)
 			if entry.Show == False: continue
 			if use_icons:
-				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon()) )
+				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) )
 			else:
 				print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] )
 		elif isinstance(entry,xdg.Menu.Separator):
@@ -147,22 +127,77 @@
 	depth -= 1
 	print "%s[end]" % (depth*"\t")
 
+def get_bgimgs_and_parse(xPath):
+    try:
+        if isfile(os.path.expanduser("~/.fluxbox/bgmenu")) == True:
+            os.unlink(os.path.expanduser("~/.fluxbox/bgmenu"))
+    except OSError:
+        pass
+    h = {}
+    bg_paths =["~/.fluxbox/backgrounds","/usr/share/wallpapers",
+		"/usr/share/backgrounds","/usr/share/backgrounds/images"]
+    try:
+        if xPath == None:
+           pass
+        else:
+            bg_paths.append(xPath)
+    except(TypeError):
+        pass
+    for dir in bg_paths:
+        for imgpth in bg_paths:
+            try:
+                imgs = os.listdir(os.path.expanduser(imgpth))
+                for i in imgs:
+                    h[i] = imgpth
+            except (OSError):
+                pass
+    bgMenu = open(os.path.expanduser("~/.fluxbox/bgmenu"),'w+')
+    num = len(h)
+    countNum = 1
+    bgPagCk = 1
+    bgPgNum = 1
+    bgMenu.write( "[submenu] (Backgrounds)\n" )
+    bgMenu.write( "[submenu] (Backgrounds) {Set Your Background}\n" )
+    bgMenu.write("\t[exec]  (Random Image)  {fbsetbg -r ~/.fluxbox/backgrounds}\n")
+	types = ["png","jpg","jpeg","gif"]
+    for i in h.keys():
+	    try:
+		    t = i.split(".")[-1].lower()
+			if t in types:
+			    print "Hello"
+			    bgMenu.write( "\t[exec]\t("+ i +") {fbsetbg -f "+ h[i] + "/" + i +"}\n" )
+				countNum = countNum + 1
+				num = num - 1
+				bgPagCk = bgPagCk + 1
+				if bgPagCk == 26:
+				    bgPgNum = bgPgNum + 1
+					bgMenu.write("[end]\n[submenu] (Backgrounds " + str(bgPgNum) +") \
+						{Set Your Background}\n")
+					bgPagCk = 1
+				if num == 0:
+				    bgMenu.write( "[end]\n[end]\n" )
+					bgMenu.close()
+		except(KeyError):
+		    print h[i]
+		    pass
 
 def main(argv):
 # Setting the default values
-	global locs
-	locs=[]
-	global wm
 	wm = "fluxbox"
-	global file
 	file = "~/.fluxbox/menu"
-	global use_icons
 	use_icons = False
+    use_bg = False
+    bg_Xpath = False
+	theme = "gnome"
 	lang = os.getenv("LANG","C")
 	file = os.path.expanduser("~/.fluxbox/menu")
+	do_submenu = False
+	use_stdout = False
 	
 	try:
-		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout"])
+		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout",\
+			"theme=","submenu","with-backgrounds","backgrounds-only","bg-path="])
+
 	except getopt.GetoptError:
 		usage()
 		sys.exit(2)
@@ -175,50 +210,51 @@
 		elif opt in ("-f", "--file"):
 			file = os.path.expanduser(arg)
 		elif opt == '--with-icons':
-			use_icons = True		
-			global paths
-			locations = \
-			['/usr/share/pixmaps/', \
-			'/usr/share/icons/hicolor/24x24/apps/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/hicolor/48x48/apps/', \
-			'/usr/share/icons/hicolor/24x24/stock/generic/', \
-			'/usr/share/icons/HighContrastLargePrintInverse/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/16x16/apps/', \
-			'/usr/share/icons/crystalsvg/32x32/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/devices/', \
-			'/usr/share/icons/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/Bluecurve/24x24/stock/', \
-			'/usr/share/icons/Bluecurve/48x48/filesystems/']
-			paths=locations
-#			for path in locations:
-#				paths+=glob.glob(path+"/*/")+glob.glob(path+"/*/*/")
-#			print paths
+			use_icons = True
+		elif opt in ("-t", "--theme"):
+			theme = arg
+		elif opt == '--stdout':
+			use_stdout = True
 		elif opt == '--stdout':
 			file = sys.stdout
-
-
-	fsock = open(file,'w')
-	saveout = sys.stdout
-	sys.stdout = fsock
+		elif opt == '--bg-path':
+		    bg_Xpath = True
+			xPath = os.path.expanduser(arg)
+		elif opt == '--with-backgrounds':
+		    use_bg = True
+		elif opt == '--backgrounds-only':
+		    if bg_Xpath:
+			    get_bgimgs_and_parse(xPath)
+			else:
+			    get_bgimgs_and_parse(None)
+				raise SystemExit
+			  
+		elif opt == '--submenu':
+			do_submenu = True
+
+	if not use_stdout:
+		fsock = open(file,'w')
+		saveout = sys.stdout
+		sys.stdout = fsock
 
 	menu=xdg.Menu.parse()
 # is done automatically now
 #	menu.setLocale(lang)
 
-	print header()
-	parseMenu(menu)
-	print footer()
+	if not do_submenu:
+        print header()
+	parseMenu(menu,wm,use_icons,theme)
+	if not do_submenu and use_bg and bg_Xpath:
+	    get_bgimgs_and_parse(xPath) 
+	    print "[include] (~/.fluxbox/bgmenu)"
+	if not do_submenu and use_bg and not bg_Xpath:
+	    print "[include] (~/.fluxbox/bgmenu)"
+		get_bgimgs_and_parse(None)
+    if not do_submenu:
+        print footer()
+	if not use_stdout:
+		sys.stdout = saveout
 
-	sys.stdout = saveout
 #	print menu
 if __name__ == "__main__":
 	main(sys.argv[1:])
-
-#WindowMaker Reminder
-#>>> p=re.compile("(\).*),(\s*\))")
-#>>> p.search("((ola),(ola),)").groups()
-#('),(ola)', ')')
-


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fluxbox.spec	13 Sep 2006 04:31:23 -0000	1.20
+++ fluxbox.spec	21 Oct 2006 09:38:14 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -11,7 +11,6 @@
 Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.1.tar.bz2
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
-Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -42,7 +41,6 @@
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure      --enable-xft \
@@ -63,7 +61,7 @@
 
 # this is for Fedora Core
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
-install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
+install -m 0644 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/
 install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu
 
 %clean
@@ -78,6 +76,10 @@
 %{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-3
+- fix #209347,#196106, and #187740
+
 * Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15.1-2
 - FE6 rebuild


--- fluxbox-menu.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 09:38:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 02:38:43 -0700
Subject: rpms/fluxbox/FC-4 fluxbox-xdg-menu.py, 1.2, 1.3 fluxbox.spec, 1.17, 
	1.18 fluxbox-menu.patch, 1.1, NONE
Message-ID: <200610210938.k9L9chjC001654@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585/FC-4

Modified Files:
	fluxbox-xdg-menu.py fluxbox.spec 
Removed Files:
	fluxbox-menu.patch 
Log Message:
- fix #209347 and #187740
- fc{5,6} fix #196106 



Index: fluxbox-xdg-menu.py
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox-xdg-menu.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fluxbox-xdg-menu.py	5 Apr 2006 21:19:29 -0000	1.2
+++ fluxbox-xdg-menu.py	21 Oct 2006 09:38:12 -0000	1.3
@@ -1,20 +1,34 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
+# vim: noexpandtab:ts=4:sts=4
+
 """Menu Generator for Fluxbox
 
 Generates a menu for Fluxbox using the freedesktop.org standards
 
-Usage: fluxbox-fdo-menugen.py [options]
+Usage: fluxbox-xdg-menu.py [options]
 
 Options:
   -l ..., --lang=...      create the menu using a language. Default = $LANG
   -h, --help              show this help
   -f ..., --file=...      output the menu into a file. Default = ~/.fluxbox/menu
-  --with-icons         do not put icons for applications in the menu
+  -t ..., --theme=...     what icon theme you want to use
+  --with-icons            put icons for applications in the menu
   --stdout                output the menu to standard output
+  --submenu               output to be used as an include/submenu with fluxbox
+  --with-backgrounds      creates a background menu. Default background_paths = 
+                          ~/.fluxbox/backgrounds, /usr/share/wallpapers,
+                          /usr/share/backgrounds
+  --backgrounds-only      do not regenerate menu, only do the bg menu.
+  --bg-path=              path to location to look for images 
+                          example: --bg-path=~/pics  
+			  may be used with --backgrounds-only but --bg-path= 
+			  must be first: --bg-path=~/some/path --backgrounds-only
 
+A nice example string to use: fluxbox-fdo-menugen.py --with-icons --with-backgrounds --bg-path=~/some/path
+To update only the backgrounds: fluxbox-fdo-menugen.py --bg-path=~/some/path --backgrounds-only
 """
 
-__author__ = "Rudolf Kastl , Antonio Gomes"
+__author__ = "Rudolf Kastl , Antonio Gomes, Michael Rice"
 __version__ = "$Revision$"
 __date__ = "$Date$"
 __license__ = "GPL"
@@ -22,6 +36,7 @@
 
 import os,re,sys,glob,getopt
 import xdg.Menu,xdg.DesktopEntry,xdg.IconTheme
+from os.path import isfile
 
 def usage():
 	print __doc__
@@ -31,7 +46,7 @@
 [begin] (Fluxbox)
 	[exec] (Web Browser) {htmlview}
 	[exec] (Email) {evolution}
-	[exec] (Terminal) {gnome-terminal}
+	[exec] (Terminal) {$TERM}
 	[exec] (Irc) {xchat}
 	[separator]\n"""
 
@@ -78,66 +93,31 @@
 			else:
 				entry.Show = True 
 	
-#def findIcon(icon):
-#	"""Finds the path and filename for the given icon name
-#		e.g. gaim --> /usr/share/pixmaps/gaim.png
-#		e.g. fart.png --> /usr/share/pixmaps/fart.png
-#	"""
-#	if os.path.isfile(icon): return icon
-#	paths = ["~/.icons","/usr/share/pixmaps","/usr/share/icons"]
-#	for path in paths:
-#		for dirpath , dirnames, filenames in os.walk(os.path.expanduser(path)):
-#			for filename in filenames:
-#				pattern = '^%s\.(png|jpg|gif|xpm)' % icon # matches <filename>.<something>
-#				if icon == filename or re.search(pattern, filename):
-#					return os.path.join(dirpath,filename)
-
-
-def findIcon(icon):
+def findIcon(icon, theme):
 	"""Finds the path and filename for the given icon name
 		e.g. gaim --> /usr/share/pixmaps/gaim.png
 		e.g. fart.png --> /usr/share/pixmaps/fart.png
 	"""
-	global paths
-	global locs
-
-	# Case Icon=/path/to/file.extension
-	if os.path.isfile(icon): return icon
-
-
-	# Case Icon=file.extension	
-
-	if re.search("^\w+.*\.\w{3}$",icon):
-		names=[icon]
-	# Case Icon=file
-	elif re.search("^\w+.*$",icon):
-		names=[icon+".png",icon+".xpm",icon+".jpg"]
-	else:
-		names=[]
+	retval=str(xdg.IconTheme.getIconPath(icon, 48, theme))
+	if retval == "None":
+		retval=""
 
-	for path in paths:	
-		for name in names:
-			if (os.path.isfile(path+name)):
-				locs.append(path)
-				return (path+name).encode('utf8')
+	return (retval + "").encode('utf8')
 
-
-def parseMenu(menu,depth=1):
-	global wm
-	global use_icons
+def parseMenu(menu,wm,use_icons,theme,depth=1):
 	if use_icons:
-		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'), findIcon(menu.getIcon()) )
+		print "%s[submenu] (%s) <%s> " % ( (depth*"\t"), menu.getName().encode('utf8'),  findIcon(menu.getIcon(), theme) )
 	else:
 		print "%s[submenu] (%s) " % ( (depth*"\t"), menu.getName().encode('utf8'), )
 	depth += 1
 	for entry in menu.getEntries():
 		if isinstance(entry, xdg.Menu.Menu):
-			parseMenu(entry,depth)
+			parseMenu(entry,wm,use_icons,theme,depth)
 		elif isinstance(entry, xdg.Menu.MenuEntry):
 			checkWm(entry,wm)
 			if entry.Show == False: continue
 			if use_icons:
-				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon()) )
+				print "%s[exec] (%s) {%s} <%s> " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0], findIcon(entry.DesktopEntry.getIcon(), theme) )
 			else:
 				print "%s[exec] (%s) {%s} " % ( (depth*"\t"), entry.DesktopEntry.getName().encode("utf8"), entry.DesktopEntry.getExec().split()[0] )
 		elif isinstance(entry,xdg.Menu.Separator):
@@ -147,22 +127,77 @@
 	depth -= 1
 	print "%s[end]" % (depth*"\t")
 
+def get_bgimgs_and_parse(xPath):
+    try:
+        if isfile(os.path.expanduser("~/.fluxbox/bgmenu")) == True:
+            os.unlink(os.path.expanduser("~/.fluxbox/bgmenu"))
+    except OSError:
+        pass
+    h = {}
+    bg_paths =["~/.fluxbox/backgrounds","/usr/share/wallpapers",
+		"/usr/share/backgrounds","/usr/share/backgrounds/images"]
+    try:
+        if xPath == None:
+           pass
+        else:
+            bg_paths.append(xPath)
+    except(TypeError):
+        pass
+    for dir in bg_paths:
+        for imgpth in bg_paths:
+            try:
+                imgs = os.listdir(os.path.expanduser(imgpth))
+                for i in imgs:
+                    h[i] = imgpth
+            except (OSError):
+                pass
+    bgMenu = open(os.path.expanduser("~/.fluxbox/bgmenu"),'w+')
+    num = len(h)
+    countNum = 1
+    bgPagCk = 1
+    bgPgNum = 1
+    bgMenu.write( "[submenu] (Backgrounds)\n" )
+    bgMenu.write( "[submenu] (Backgrounds) {Set Your Background}\n" )
+    bgMenu.write("\t[exec]  (Random Image)  {fbsetbg -r ~/.fluxbox/backgrounds}\n")
+	types = ["png","jpg","jpeg","gif"]
+    for i in h.keys():
+	    try:
+		    t = i.split(".")[-1].lower()
+			if t in types:
+			    print "Hello"
+			    bgMenu.write( "\t[exec]\t("+ i +") {fbsetbg -f "+ h[i] + "/" + i +"}\n" )
+				countNum = countNum + 1
+				num = num - 1
+				bgPagCk = bgPagCk + 1
+				if bgPagCk == 26:
+				    bgPgNum = bgPgNum + 1
+					bgMenu.write("[end]\n[submenu] (Backgrounds " + str(bgPgNum) +") \
+						{Set Your Background}\n")
+					bgPagCk = 1
+				if num == 0:
+				    bgMenu.write( "[end]\n[end]\n" )
+					bgMenu.close()
+		except(KeyError):
+		    print h[i]
+		    pass
 
 def main(argv):
 # Setting the default values
-	global locs
-	locs=[]
-	global wm
 	wm = "fluxbox"
-	global file
 	file = "~/.fluxbox/menu"
-	global use_icons
 	use_icons = False
+    use_bg = False
+    bg_Xpath = False
+	theme = "gnome"
 	lang = os.getenv("LANG","C")
 	file = os.path.expanduser("~/.fluxbox/menu")
+	do_submenu = False
+	use_stdout = False
 	
 	try:
-		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout"])
+		opts, args = getopt.getopt(argv, "hf:dl:d", ["help","lang=","file=","with-icons","stdout",\
+			"theme=","submenu","with-backgrounds","backgrounds-only","bg-path="])
+
 	except getopt.GetoptError:
 		usage()
 		sys.exit(2)
@@ -175,50 +210,51 @@
 		elif opt in ("-f", "--file"):
 			file = os.path.expanduser(arg)
 		elif opt == '--with-icons':
-			use_icons = True		
-			global paths
-			locations = \
-			['/usr/share/pixmaps/', \
-			'/usr/share/icons/hicolor/24x24/apps/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/hicolor/48x48/apps/', \
-			'/usr/share/icons/hicolor/24x24/stock/generic/', \
-			'/usr/share/icons/HighContrastLargePrintInverse/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/16x16/apps/', \
-			'/usr/share/icons/crystalsvg/32x32/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/apps/', \
-			'/usr/share/icons/crystalsvg/48x48/devices/', \
-			'/usr/share/icons/', \
-			'/usr/share/icons/hicolor/32x32/apps/', \
-			'/usr/share/icons/Bluecurve/24x24/stock/', \
-			'/usr/share/icons/Bluecurve/48x48/filesystems/']
-			paths=locations
-#			for path in locations:
-#				paths+=glob.glob(path+"/*/")+glob.glob(path+"/*/*/")
-#			print paths
+			use_icons = True
+		elif opt in ("-t", "--theme"):
+			theme = arg
+		elif opt == '--stdout':
+			use_stdout = True
 		elif opt == '--stdout':
 			file = sys.stdout
-
-
-	fsock = open(file,'w')
-	saveout = sys.stdout
-	sys.stdout = fsock
+		elif opt == '--bg-path':
+		    bg_Xpath = True
+			xPath = os.path.expanduser(arg)
+		elif opt == '--with-backgrounds':
+		    use_bg = True
+		elif opt == '--backgrounds-only':
+		    if bg_Xpath:
+			    get_bgimgs_and_parse(xPath)
+			else:
+			    get_bgimgs_and_parse(None)
+				raise SystemExit
+			  
+		elif opt == '--submenu':
+			do_submenu = True
+
+	if not use_stdout:
+		fsock = open(file,'w')
+		saveout = sys.stdout
+		sys.stdout = fsock
 
 	menu=xdg.Menu.parse()
 # is done automatically now
 #	menu.setLocale(lang)
 
-	print header()
-	parseMenu(menu)
-	print footer()
+	if not do_submenu:
+        print header()
+	parseMenu(menu,wm,use_icons,theme)
+	if not do_submenu and use_bg and bg_Xpath:
+	    get_bgimgs_and_parse(xPath) 
+	    print "[include] (~/.fluxbox/bgmenu)"
+	if not do_submenu and use_bg and not bg_Xpath:
+	    print "[include] (~/.fluxbox/bgmenu)"
+		get_bgimgs_and_parse(None)
+    if not do_submenu:
+        print footer()
+	if not use_stdout:
+		sys.stdout = saveout
 
-	sys.stdout = saveout
 #	print menu
 if __name__ == "__main__":
 	main(sys.argv[1:])
-
-#WindowMaker Reminder
-#>>> p=re.compile("(\).*),(\s*\))")
-#>>> p.search("((ola),(ola),)").groups()
-#('),(ola)', ')')
-


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-4/fluxbox.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fluxbox.spec	5 Apr 2006 21:19:29 -0000	1.17
+++ fluxbox.spec	21 Oct 2006 09:38:12 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -13,7 +13,6 @@
 Source2:        FluxBox
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
-Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -35,7 +34,6 @@
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure      --enable-xft \
@@ -80,6 +78,10 @@
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-2
+- fix #187740 and #209347
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15.1-1
 - version upgrade


--- fluxbox-menu.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 10:12:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 03:12:01 -0700
Subject: rpms/koffice-langpack/FC-4 .cvsignore, 1.6,
	1.7 koffice-langpack.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200610211012.k9LAC1Rc004916@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice-langpack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4856/FC-4

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Aug 2006 10:10:42 -0000	1.6
+++ .cvsignore	21 Oct 2006 10:11:31 -0000	1.7
@@ -47,3 +47,35 @@
 koffice-l10n-uz-1.5.2.tar.bz2
 koffice-l10n-zh_CN-1.5.2.tar.bz2
 koffice-l10n-zh_TW-1.5.2.tar.bz2
+koffice-l10n-ca-1.6.0.tar.bz2
+koffice-l10n-cs-1.6.0.tar.bz2
+koffice-l10n-cy-1.6.0.tar.bz2
+koffice-l10n-da-1.6.0.tar.bz2
+koffice-l10n-de-1.6.0.tar.bz2
+koffice-l10n-el-1.6.0.tar.bz2
+koffice-l10n-en_GB-1.6.0.tar.bz2
+koffice-l10n-es-1.6.0.tar.bz2
+koffice-l10n-et-1.6.0.tar.bz2
+koffice-l10n-eu-1.6.0.tar.bz2
+koffice-l10n-fi-1.6.0.tar.bz2
+koffice-l10n-fr-1.6.0.tar.bz2
+koffice-l10n-hu-1.6.0.tar.bz2
+koffice-l10n-it-1.6.0.tar.bz2
+koffice-l10n-ja-1.6.0.tar.bz2
+koffice-l10n-lv-1.6.0.tar.bz2
+koffice-l10n-ms-1.6.0.tar.bz2
+koffice-l10n-nb-1.6.0.tar.bz2
+koffice-l10n-nl-1.6.0.tar.bz2
+koffice-l10n-pl-1.6.0.tar.bz2
+koffice-l10n-pt-1.6.0.tar.bz2
+koffice-l10n-pt_BR-1.6.0.tar.bz2
+koffice-l10n-ru-1.6.0.tar.bz2
+koffice-l10n-sk-1.6.0.tar.bz2
+koffice-l10n-sl-1.6.0.tar.bz2
+koffice-l10n-sr-1.6.0.tar.bz2
+koffice-l10n-sr at Latn-1.6.0.tar.bz2
+koffice-l10n-sv-1.6.0.tar.bz2
+koffice-l10n-tr-1.6.0.tar.bz2
+koffice-l10n-uk-1.6.0.tar.bz2
+koffice-l10n-zh_CN-1.6.0.tar.bz2
+koffice-l10n-zh_TW-1.6.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/koffice-langpack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- koffice-langpack.spec	3 Aug 2006 10:10:42 -0000	1.6
+++ koffice-langpack.spec	21 Oct 2006 10:11:31 -0000	1.7
@@ -1,60 +1,43 @@
 Name:           koffice-langpack
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-af-1.5.2.tar.bz2
-Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ar-1.5.2.tar.bz2
-Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bg-1.5.2.tar.bz2
-Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-br-1.5.2.tar.bz2
-Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bs-1.5.2.tar.bz2
-Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ca-1.5.2.tar.bz2
-Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cs-1.5.2.tar.bz2
-Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cy-1.5.2.tar.bz2
-Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-da-1.5.2.tar.bz2
-Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-de-1.5.2.tar.bz2
-Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-el-1.5.2.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-en_GB-1.5.2.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eo-1.5.2.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-es-1.5.2.tar.bz2
-Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-et-1.5.2.tar.bz2
-Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eu-1.5.2.tar.bz2
-Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fi-1.5.2.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fr-1.5.2.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ga-1.5.2.tar.bz2
-Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-he-1.5.2.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hi-1.5.2.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hu-1.5.2.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-is-1.5.2.tar.bz2
-Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-it-1.5.2.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ja-1.5.2.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-lt-1.5.2.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-mk-1.5.2.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nb-1.5.2.tar.bz2
-Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nl-1.5.2.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nn-1.5.2.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pl-1.5.2.tar.bz2
-Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt-1.5.2.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt_BR-1.5.2.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ro-1.5.2.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ru-1.5.2.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-se-1.5.2.tar.bz2
-Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sk-1.5.2.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sl-1.5.2.tar.bz2
-Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr-1.5.2.tar.bz2
-Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.2.tar.bz2
-Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sv-1.5.2.tar.bz2
-Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ta-1.5.2.tar.bz2
-Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tg-1.5.2.tar.bz2
-Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tr-1.5.2.tar.bz2
-Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uk-1.5.2.tar.bz2
-Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uz-1.5.2.tar.bz2
-Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_CN-1.5.2.tar.bz2
-Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ms-1.5.2.tar.bz2
-Source48:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_TW-1.5.2.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ca-1.6.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cs-1.6.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cy-1.6.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-da-1.6.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-de-1.6.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-el-1.6.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-en_GB-1.6.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-es-1.6.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-et-1.6.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-eu-1.6.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fi-1.6.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fr-1.6.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-hu-1.6.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-it-1.6.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ja-1.6.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-lv-1.6.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nb-1.6.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nl-1.6.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pl-1.6.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt-1.6.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt_BR-1.6.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ru-1.6.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sk-1.6.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sl-1.6.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr-1.6.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.6.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sv-1.6.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-tr-1.6.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-uk-1.6.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_CN-1.6.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ms-1.6.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_TW-1.6.0.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,46 +49,46 @@
 %description
 Language files for koffice
 
-%package af
-Summary:        Afrikaans language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description ar
-Provides additional arabic translations for koffice
+#%package af
+#Summary:        Afrikaans language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description ar
+#Provides additional arabic translations for koffice
+
+#%package bs
+#Summary:        Bosnian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description br
+#Provides additional breton translations for koffice
+
+
+#%package bg
+#Summary:        Bulgarian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%package bs
-Summary:        Bosnian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description br
-Provides additional breton translations for koffice
-
-
-%package bg
-Summary:        Bulgarian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description bg
-Provides additional bulgarian translations for koffice
+#%description bg
+#Provides additional bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
@@ -147,13 +130,13 @@
 %description de
 Provides additional german translations for koffice
 
-%package eo
-Summary:        Esperanto language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package eo
+#Summary:        Esperanto language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description eo
-Provides additional esperanto translations for koffice
+#%description eo
+#Provides additional esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
@@ -213,29 +196,29 @@
 %description fr
 Provides additional french translations for koffice
 
-%package ga
-Summary:        Irish language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package ga
+#Summary:        Irish language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description ga
+#Provides additional irish translations for koffice
+
+#%package he
+#Summary:        Hebrew language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description ga
-Provides additional irish translations for koffice
-
-%package he
-Summary:        Hebrew language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description hi
-Provides additional hindi translations for koffice
+#%description hi
+#Provides additional hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
@@ -245,13 +228,13 @@
 %description hu
 Provides additional hungarian translations for koffice
 
-%package is
-Summary:        Icelandic language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package is
+#Summary:        Icelandic language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description is
-Provides additional icelandic translations for koffice
+#%description is
+#Provides additional icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
@@ -269,21 +252,21 @@
 %description ja
 Provides additional japanese translations for koffice
 
-%package lt
-Summary:        Lithuanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description lt
-Provides additional lithuanian translations for koffice
-
-%package mk
-Summary:        Macedonian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package lt
+#Summary:        Lithuanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description lt
+#Provides additional lithuanian translations for koffice
+
+#%package mk
+#Summary:        Macedonian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description mk
-Provides additional macedonian translations for koffice
+#%description mk
+#Provides additional macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
@@ -309,13 +292,13 @@
 %description nl
 Provides additional dutch translations for koffice
 
-%package nn
-Summary:        Nynorsk language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package nn
+#Summary:        Nynorsk language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description nn
-Provides additional nynorsk translations for koffice
+#%description nn
+#Provides additional nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
@@ -349,20 +332,21 @@
 %description ru
 Provides additional russian translations for koffice
 
-%package ro
-Summary:        Romanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
+#%package ro
+#Summary:        Romanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description se
-Provides additional northern sami translations for koffice
+#%description se
+#Provides additional northern sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
@@ -404,21 +388,21 @@
 %description sv
 Provides additional Swedish translations for koffice
 
-%package ta
-Summary:        Tamil language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description ta
-Provides additional tamil translations for koffice
+#%package ta
+#Summary:        Tamil language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%package tg
-Summary:        Tajik language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description tg
-Provides additional tajik translations for koffice
+#%description tg
+#Provides additional tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
@@ -436,13 +420,13 @@
 %description uk
 Provides additional ukrainian translations for koffice
 
-%package uz
-Summary:        Uzbek language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package uz
+#Summary:        Uzbek language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description uz
-Provides additional uzbek translations for koffice
+#%description uz
+#Provides additional uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
@@ -460,11 +444,18 @@
 %description zh_TW
 Provides additional traditional chinese translations for koffice
 
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description lv
+Provides additional lativian translations for koffice
+
 %prep
 %{__mkdir_p} %{_builddir}/%{name}-%{version}
 cd %{_builddir}/%{name}-%{version}
 
-%{__tar} xjvf %{SOURCE0}
 %{__tar} xjvf %{SOURCE1}
 %{__tar} xjvf %{SOURCE2}
 %{__tar} xjvf %{SOURCE3}
@@ -497,28 +488,12 @@
 %{__tar} xjvf %{SOURCE30}
 %{__tar} xjvf %{SOURCE31}
 %{__tar} xjvf %{SOURCE32}
-%{__tar} xjvf %{SOURCE33}
-%{__tar} xjvf %{SOURCE34}
-%{__tar} xjvf %{SOURCE35}
-%{__tar} xjvf %{SOURCE36}
-%{__tar} xjvf %{SOURCE37}
-%{__tar} xjvf %{SOURCE38}
-%{__tar} xjvf %{SOURCE39}
-%{__tar} xjvf %{SOURCE40}
-%{__tar} xjvf %{SOURCE41}
-%{__tar} xjvf %{SOURCE42}
-%{__tar} xjvf %{SOURCE43}
-%{__tar} xjvf %{SOURCE44}
-%{__tar} xjvf %{SOURCE45}
-%{__tar} xjvf %{SOURCE46}
-%{__tar} xjvf %{SOURCE47}
-%{__tar} xjvf %{SOURCE48}
 
 %build
 # dont work: et
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -527,9 +502,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -554,26 +529,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files af
-%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%files ar
-%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-
-%files bg
-%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-
-%files br
-%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-
-%files bs
-%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
@@ -608,10 +563,6 @@
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
 
-%files eo
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-
 %files es
 %defattr(-,root,root,-)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
@@ -637,44 +588,24 @@
 %lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
 %lang(fr) %{_datadir}/doc/HTML/fr/*
 
-%files ga
-%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
-
-%files he
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-
-%files hi
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-
 %files hu
 %defattr(-,root,root,-)
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
 
-%files is
-%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
-
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
 %lang(it) %{_datadir}/doc/HTML/it/*
 
-%files ja
-%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%files lt
+%files lv
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
 
-%files mk
+%files ja
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
 %files ms
 %defattr(-,root,root,-)
@@ -689,11 +620,6 @@
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
 %lang(nl) %{_datadir}/doc/HTML/nl/*
 
-%files nn
-%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
-%lang(nn) %{_datadir}/apps/koffice/autocorrect/nn.xml
-
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
@@ -708,19 +634,11 @@
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %{_datadir}/doc/HTML/pt/*
 
-%files ro
-%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
-
 %files ru
 %defattr(-,root,root,-)
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %{_datadir}/doc/HTML/ru/*
 
-%files se
-%defattr(-,root,root,-)
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-
 %files sk
 %defattr(-,root,root,-)
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
@@ -745,14 +663,6 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/doc/HTML/sv/*
 
-%files ta
-%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-
-%files tg
-%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-
 %files tr
 %defattr(-,root,root,-)
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
@@ -761,10 +671,6 @@
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 
-%files uz
-%defattr(-,root,root,-)
-%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/*
-
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
@@ -774,6 +680,10 @@
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Aug 2006 10:10:42 -0000	1.6
+++ sources	21 Oct 2006 10:11:31 -0000	1.7
@@ -1,49 +1,32 @@
-c7a48bb275230d1152e29c67a869daee  koffice-l10n-af-1.5.2.tar.bz2
-a35e9b3f75265488ca400469f23a5a91  koffice-l10n-ar-1.5.2.tar.bz2
-b8be1348ffab32d826c358d44de68c5e  koffice-l10n-bg-1.5.2.tar.bz2
-fd0738d2c9538994de3573ec00964cf1  koffice-l10n-br-1.5.2.tar.bz2
-b7de9b93298aba597d9d8f8da038fc37  koffice-l10n-bs-1.5.2.tar.bz2
-8e3ff02096b6574cf337430924d5af98  koffice-l10n-ca-1.5.2.tar.bz2
-b8f83541b98ff0cb8361f797f665971c  koffice-l10n-cs-1.5.2.tar.bz2
-64782ef55dbdfbbc3672b613dc7f5faf  koffice-l10n-cy-1.5.2.tar.bz2
-58c13527c47dee445572d26141fd3269  koffice-l10n-da-1.5.2.tar.bz2
-ef007ab98ffe65ce072a9245f51b01e1  koffice-l10n-de-1.5.2.tar.bz2
-4392e652560adb8c83fe2aac9479fcb8  koffice-l10n-el-1.5.2.tar.bz2
-11b499953ae1616c589e793abc4e474b  koffice-l10n-en_GB-1.5.2.tar.bz2
-c7025f7d946342267943fd146a5cc19c  koffice-l10n-eo-1.5.2.tar.bz2
-fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc  koffice-l10n-es-1.5.2.tar.bz2
-fed89528182c0dc7baa2c50fee165270  koffice-l10n-et-1.5.2.tar.bz2
-3e15c7433f91486d8b76eefb19990a74  koffice-l10n-eu-1.5.2.tar.bz2
-de6a7a2b2b2edc1a4eaad7523b1bab39  koffice-l10n-fi-1.5.2.tar.bz2
-8f868a919c6ccb66b719196d3e842910  koffice-l10n-fr-1.5.2.tar.bz2
-b8b4d4cbb0ff29bc0da4954eb9ba4e13  koffice-l10n-ga-1.5.2.tar.bz2
-a0368a287bf2a3566b802ffe6de8b472  koffice-l10n-he-1.5.2.tar.bz2
-95a4edd9df2b1c4744ae0b590d68822a  koffice-l10n-hi-1.5.2.tar.bz2
-cd57e11f100ffabf6a3c72faa6433569  koffice-l10n-hu-1.5.2.tar.bz2
-e3b5ec6948dea217e79d3c692d3e3bd3  koffice-l10n-is-1.5.2.tar.bz2
-9658442039b455e52cf68599e3250f54  koffice-l10n-it-1.5.2.tar.bz2
-7eb7880c8e03a8c905a7bba06423fdde  koffice-l10n-ja-1.5.2.tar.bz2
-bf8fb56e3b2ab401d4b3ac9e19ad30f4  koffice-l10n-lt-1.5.2.tar.bz2
-8f9a9ccea194653be186517c0879fe8c  koffice-l10n-mk-1.5.2.tar.bz2
-617ab3344f714fa9109875bc50b79502  koffice-l10n-ms-1.5.2.tar.bz2
-02adef48c63e4a9f87fed63cefb19d1d  koffice-l10n-nb-1.5.2.tar.bz2
-9847ff8d7dbddf4c2f1ae4a6cb0694d1  koffice-l10n-nl-1.5.2.tar.bz2
-9926f8aa4449e839d40f97e7c621de96  koffice-l10n-nn-1.5.2.tar.bz2
-193d09145eea9136067676b6d74ab5f9  koffice-l10n-pl-1.5.2.tar.bz2
-f8d4e8990e1f24ef6076de1c9698458f  koffice-l10n-pt-1.5.2.tar.bz2
-bba591e0460c4a0169c07c3d5ae5b118  koffice-l10n-pt_BR-1.5.2.tar.bz2
-22d91909560288e7dd79a3db6e2aab42  koffice-l10n-ro-1.5.2.tar.bz2
-e0a809bf7c9202cf5eebaaa93999f4f3  koffice-l10n-ru-1.5.2.tar.bz2
-8fa484cd096f3f8461c054bad31c3601  koffice-l10n-se-1.5.2.tar.bz2
-a7dbf6b5fa42d0cdee1f0928cbaadfd0  koffice-l10n-sk-1.5.2.tar.bz2
-e5fe2c8a350ba2636f4bd8dd2168b017  koffice-l10n-sl-1.5.2.tar.bz2
-2717a1e1e1ff92d1e962e3b69625e906  koffice-l10n-sr-1.5.2.tar.bz2
-f7774ad33c0efb072653495894865e0e  koffice-l10n-sr at Latn-1.5.2.tar.bz2
-83f73110f60ef4b5f633e3cca0dd4e12  koffice-l10n-sv-1.5.2.tar.bz2
-3f0ce9e790415b90daf43c35736a62e7  koffice-l10n-ta-1.5.2.tar.bz2
-add764f98fd61d74bf0886f4bfe7808f  koffice-l10n-tg-1.5.2.tar.bz2
-6b7df893cae7725ca94979a4dcd73edf  koffice-l10n-tr-1.5.2.tar.bz2
-a31dc3319a452ae7d2d689ac50a73bb0  koffice-l10n-uk-1.5.2.tar.bz2
-259739c2bde6d4fb890915cf7f3358c9  koffice-l10n-uz-1.5.2.tar.bz2
-e2de60faab2bc7049e2b4af6827cbe8e  koffice-l10n-zh_CN-1.5.2.tar.bz2
-a39dcaf36d9361d2915399ee0dce0cc0  koffice-l10n-zh_TW-1.5.2.tar.bz2
+b90e14bd3508bcc030096496ea87683a  koffice-l10n-ca-1.6.0.tar.bz2
+21f9a7c3daf57aabf70111dded8a26a6  koffice-l10n-cs-1.6.0.tar.bz2
+b1d03624474b91becd3ff64647f45087  koffice-l10n-cy-1.6.0.tar.bz2
+d1532dc1107f01752a9eeeb362666289  koffice-l10n-da-1.6.0.tar.bz2
+21344257dcd9b418898fb5e348918171  koffice-l10n-de-1.6.0.tar.bz2
+c00bbbf55de2d5d8aa68916ef6618ee3  koffice-l10n-el-1.6.0.tar.bz2
+eb4582f359eaada24a1dd96443636219  koffice-l10n-en_GB-1.6.0.tar.bz2
+81db059841e59cfee6371d10b12e82d7  koffice-l10n-es-1.6.0.tar.bz2
+64b4dd81d61362599af0882d695dd175  koffice-l10n-et-1.6.0.tar.bz2
+c3c5dbfe0135896c41f749ff79c6744e  koffice-l10n-eu-1.6.0.tar.bz2
+738bf409e16c08018b75f672abcb94a4  koffice-l10n-fi-1.6.0.tar.bz2
+96a5871374f69c694be87e621f04f39e  koffice-l10n-fr-1.6.0.tar.bz2
+01ea831cfbd136fecb1c7de8826e97b9  koffice-l10n-hu-1.6.0.tar.bz2
+73f17287697e54e61237a8cf7f6fc75f  koffice-l10n-it-1.6.0.tar.bz2
+dd3f979c03f9bc4ae6393a54766b4a84  koffice-l10n-ja-1.6.0.tar.bz2
+af51669631e18feef464e8d6778a41ad  koffice-l10n-lv-1.6.0.tar.bz2
+259be59d9bfe0e7fba7d96c1b5740614  koffice-l10n-ms-1.6.0.tar.bz2
+ef631712fe58e8129823b0f53253e153  koffice-l10n-nb-1.6.0.tar.bz2
+b9c572b04701226fdce5e9ae5817177c  koffice-l10n-nl-1.6.0.tar.bz2
+aaa167a7881f383b88696d34fd1903a5  koffice-l10n-pl-1.6.0.tar.bz2
+c907923d13d2e2d15e09ac5be9259c96  koffice-l10n-pt-1.6.0.tar.bz2
+8d1be2180acdba3287c2936cc379b4c6  koffice-l10n-pt_BR-1.6.0.tar.bz2
+0b895c8a86f0b3c6f31903c906e0dd08  koffice-l10n-ru-1.6.0.tar.bz2
+3bdbfb8532c3a3422345ff8693544b29  koffice-l10n-sk-1.6.0.tar.bz2
+6dfa4b30a8d246a46dddef1e3933cf36  koffice-l10n-sl-1.6.0.tar.bz2
+69681fe0a95a61b88aa5b9ee226fc320  koffice-l10n-sr-1.6.0.tar.bz2
+8ce2f6edd23a43b079fbec9c20cfe516  koffice-l10n-sr at Latn-1.6.0.tar.bz2
+774efb0a9c02776c58ca6cfe1930d327  koffice-l10n-sv-1.6.0.tar.bz2
+d941eddab83cc8991d4f218854d25f64  koffice-l10n-tr-1.6.0.tar.bz2
+b29bea37e37917edb45cfde8c48b50f7  koffice-l10n-uk-1.6.0.tar.bz2
+a3fda356e170368d7fd88d0ce892307b  koffice-l10n-zh_CN-1.6.0.tar.bz2
+17ec8363abee3dd45c1a4c103b023ff3  koffice-l10n-zh_TW-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 10:12:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 03:12:02 -0700
Subject: rpms/koffice-langpack/FC-5 .cvsignore, 1.6,
	1.7 koffice-langpack.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200610211012.k9LAC25I004921@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice-langpack/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4856/FC-5

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Aug 2006 10:10:42 -0000	1.6
+++ .cvsignore	21 Oct 2006 10:11:32 -0000	1.7
@@ -47,3 +47,35 @@
 koffice-l10n-uz-1.5.2.tar.bz2
 koffice-l10n-zh_CN-1.5.2.tar.bz2
 koffice-l10n-zh_TW-1.5.2.tar.bz2
+koffice-l10n-ca-1.6.0.tar.bz2
+koffice-l10n-cs-1.6.0.tar.bz2
+koffice-l10n-cy-1.6.0.tar.bz2
+koffice-l10n-da-1.6.0.tar.bz2
+koffice-l10n-de-1.6.0.tar.bz2
+koffice-l10n-el-1.6.0.tar.bz2
+koffice-l10n-en_GB-1.6.0.tar.bz2
+koffice-l10n-es-1.6.0.tar.bz2
+koffice-l10n-et-1.6.0.tar.bz2
+koffice-l10n-eu-1.6.0.tar.bz2
+koffice-l10n-fi-1.6.0.tar.bz2
+koffice-l10n-fr-1.6.0.tar.bz2
+koffice-l10n-hu-1.6.0.tar.bz2
+koffice-l10n-it-1.6.0.tar.bz2
+koffice-l10n-ja-1.6.0.tar.bz2
+koffice-l10n-lv-1.6.0.tar.bz2
+koffice-l10n-ms-1.6.0.tar.bz2
+koffice-l10n-nb-1.6.0.tar.bz2
+koffice-l10n-nl-1.6.0.tar.bz2
+koffice-l10n-pl-1.6.0.tar.bz2
+koffice-l10n-pt-1.6.0.tar.bz2
+koffice-l10n-pt_BR-1.6.0.tar.bz2
+koffice-l10n-ru-1.6.0.tar.bz2
+koffice-l10n-sk-1.6.0.tar.bz2
+koffice-l10n-sl-1.6.0.tar.bz2
+koffice-l10n-sr-1.6.0.tar.bz2
+koffice-l10n-sr at Latn-1.6.0.tar.bz2
+koffice-l10n-sv-1.6.0.tar.bz2
+koffice-l10n-tr-1.6.0.tar.bz2
+koffice-l10n-uk-1.6.0.tar.bz2
+koffice-l10n-zh_CN-1.6.0.tar.bz2
+koffice-l10n-zh_TW-1.6.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/koffice-langpack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- koffice-langpack.spec	3 Aug 2006 10:10:42 -0000	1.7
+++ koffice-langpack.spec	21 Oct 2006 10:11:32 -0000	1.8
@@ -1,60 +1,43 @@
 Name:           koffice-langpack
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-af-1.5.2.tar.bz2
-Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ar-1.5.2.tar.bz2
-Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bg-1.5.2.tar.bz2
-Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-br-1.5.2.tar.bz2
-Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bs-1.5.2.tar.bz2
-Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ca-1.5.2.tar.bz2
-Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cs-1.5.2.tar.bz2
-Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cy-1.5.2.tar.bz2
-Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-da-1.5.2.tar.bz2
-Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-de-1.5.2.tar.bz2
-Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-el-1.5.2.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-en_GB-1.5.2.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eo-1.5.2.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-es-1.5.2.tar.bz2
-Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-et-1.5.2.tar.bz2
-Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eu-1.5.2.tar.bz2
-Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fi-1.5.2.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fr-1.5.2.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ga-1.5.2.tar.bz2
-Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-he-1.5.2.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hi-1.5.2.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hu-1.5.2.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-is-1.5.2.tar.bz2
-Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-it-1.5.2.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ja-1.5.2.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-lt-1.5.2.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-mk-1.5.2.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nb-1.5.2.tar.bz2
-Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nl-1.5.2.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nn-1.5.2.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pl-1.5.2.tar.bz2
-Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt-1.5.2.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt_BR-1.5.2.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ro-1.5.2.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ru-1.5.2.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-se-1.5.2.tar.bz2
-Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sk-1.5.2.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sl-1.5.2.tar.bz2
-Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr-1.5.2.tar.bz2
-Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.2.tar.bz2
-Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sv-1.5.2.tar.bz2
-Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ta-1.5.2.tar.bz2
-Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tg-1.5.2.tar.bz2
-Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tr-1.5.2.tar.bz2
-Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uk-1.5.2.tar.bz2
-Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uz-1.5.2.tar.bz2
-Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_CN-1.5.2.tar.bz2
-Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ms-1.5.2.tar.bz2
-Source48:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_TW-1.5.2.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ca-1.6.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cs-1.6.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cy-1.6.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-da-1.6.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-de-1.6.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-el-1.6.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-en_GB-1.6.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-es-1.6.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-et-1.6.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-eu-1.6.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fi-1.6.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fr-1.6.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-hu-1.6.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-it-1.6.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ja-1.6.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-lv-1.6.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nb-1.6.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nl-1.6.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pl-1.6.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt-1.6.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt_BR-1.6.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ru-1.6.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sk-1.6.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sl-1.6.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr-1.6.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.6.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sv-1.6.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-tr-1.6.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-uk-1.6.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_CN-1.6.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ms-1.6.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_TW-1.6.0.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,46 +49,46 @@
 %description
 Language files for koffice
 
-%package af
-Summary:        Afrikaans language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description ar
-Provides additional arabic translations for koffice
+#%package af
+#Summary:        Afrikaans language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description ar
+#Provides additional arabic translations for koffice
+
+#%package bs
+#Summary:        Bosnian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description br
+#Provides additional breton translations for koffice
+
+
+#%package bg
+#Summary:        Bulgarian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%package bs
-Summary:        Bosnian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description br
-Provides additional breton translations for koffice
-
-
-%package bg
-Summary:        Bulgarian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description bg
-Provides additional bulgarian translations for koffice
+#%description bg
+#Provides additional bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
@@ -147,13 +130,13 @@
 %description de
 Provides additional german translations for koffice
 
-%package eo
-Summary:        Esperanto language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package eo
+#Summary:        Esperanto language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description eo
-Provides additional esperanto translations for koffice
+#%description eo
+#Provides additional esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
@@ -213,29 +196,29 @@
 %description fr
 Provides additional french translations for koffice
 
-%package ga
-Summary:        Irish language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package ga
+#Summary:        Irish language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description ga
+#Provides additional irish translations for koffice
+
+#%package he
+#Summary:        Hebrew language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description ga
-Provides additional irish translations for koffice
-
-%package he
-Summary:        Hebrew language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description hi
-Provides additional hindi translations for koffice
+#%description hi
+#Provides additional hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
@@ -245,13 +228,13 @@
 %description hu
 Provides additional hungarian translations for koffice
 
-%package is
-Summary:        Icelandic language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package is
+#Summary:        Icelandic language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description is
-Provides additional icelandic translations for koffice
+#%description is
+#Provides additional icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
@@ -269,21 +252,21 @@
 %description ja
 Provides additional japanese translations for koffice
 
-%package lt
-Summary:        Lithuanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description lt
-Provides additional lithuanian translations for koffice
-
-%package mk
-Summary:        Macedonian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package lt
+#Summary:        Lithuanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description lt
+#Provides additional lithuanian translations for koffice
+
+#%package mk
+#Summary:        Macedonian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description mk
-Provides additional macedonian translations for koffice
+#%description mk
+#Provides additional macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
@@ -309,13 +292,13 @@
 %description nl
 Provides additional dutch translations for koffice
 
-%package nn
-Summary:        Nynorsk language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package nn
+#Summary:        Nynorsk language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description nn
-Provides additional nynorsk translations for koffice
+#%description nn
+#Provides additional nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
@@ -349,20 +332,21 @@
 %description ru
 Provides additional russian translations for koffice
 
-%package ro
-Summary:        Romanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
+#%package ro
+#Summary:        Romanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description se
-Provides additional northern sami translations for koffice
+#%description se
+#Provides additional northern sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
@@ -404,21 +388,21 @@
 %description sv
 Provides additional Swedish translations for koffice
 
-%package ta
-Summary:        Tamil language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description ta
-Provides additional tamil translations for koffice
+#%package ta
+#Summary:        Tamil language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%package tg
-Summary:        Tajik language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description tg
-Provides additional tajik translations for koffice
+#%description tg
+#Provides additional tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
@@ -436,13 +420,13 @@
 %description uk
 Provides additional ukrainian translations for koffice
 
-%package uz
-Summary:        Uzbek language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package uz
+#Summary:        Uzbek language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description uz
-Provides additional uzbek translations for koffice
+#%description uz
+#Provides additional uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
@@ -460,11 +444,18 @@
 %description zh_TW
 Provides additional traditional chinese translations for koffice
 
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description lv
+Provides additional lativian translations for koffice
+
 %prep
 %{__mkdir_p} %{_builddir}/%{name}-%{version}
 cd %{_builddir}/%{name}-%{version}
 
-%{__tar} xjvf %{SOURCE0}
 %{__tar} xjvf %{SOURCE1}
 %{__tar} xjvf %{SOURCE2}
 %{__tar} xjvf %{SOURCE3}
@@ -497,28 +488,12 @@
 %{__tar} xjvf %{SOURCE30}
 %{__tar} xjvf %{SOURCE31}
 %{__tar} xjvf %{SOURCE32}
-%{__tar} xjvf %{SOURCE33}
-%{__tar} xjvf %{SOURCE34}
-%{__tar} xjvf %{SOURCE35}
-%{__tar} xjvf %{SOURCE36}
-%{__tar} xjvf %{SOURCE37}
-%{__tar} xjvf %{SOURCE38}
-%{__tar} xjvf %{SOURCE39}
-%{__tar} xjvf %{SOURCE40}
-%{__tar} xjvf %{SOURCE41}
-%{__tar} xjvf %{SOURCE42}
-%{__tar} xjvf %{SOURCE43}
-%{__tar} xjvf %{SOURCE44}
-%{__tar} xjvf %{SOURCE45}
-%{__tar} xjvf %{SOURCE46}
-%{__tar} xjvf %{SOURCE47}
-%{__tar} xjvf %{SOURCE48}
 
 %build
 # dont work: et
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -527,9 +502,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -554,26 +529,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files af
-%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%files ar
-%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-
-%files bg
-%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-
-%files br
-%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-
-%files bs
-%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
@@ -608,10 +563,6 @@
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
 
-%files eo
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-
 %files es
 %defattr(-,root,root,-)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
@@ -637,44 +588,24 @@
 %lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
 %lang(fr) %{_datadir}/doc/HTML/fr/*
 
-%files ga
-%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
-
-%files he
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-
-%files hi
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-
 %files hu
 %defattr(-,root,root,-)
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
 
-%files is
-%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
-
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
 %lang(it) %{_datadir}/doc/HTML/it/*
 
-%files ja
-%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%files lt
+%files lv
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
 
-%files mk
+%files ja
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
 %files ms
 %defattr(-,root,root,-)
@@ -689,11 +620,6 @@
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
 %lang(nl) %{_datadir}/doc/HTML/nl/*
 
-%files nn
-%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
-%lang(nn) %{_datadir}/apps/koffice/autocorrect/nn.xml
-
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
@@ -708,19 +634,11 @@
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %{_datadir}/doc/HTML/pt/*
 
-%files ro
-%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
-
 %files ru
 %defattr(-,root,root,-)
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %{_datadir}/doc/HTML/ru/*
 
-%files se
-%defattr(-,root,root,-)
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-
 %files sk
 %defattr(-,root,root,-)
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
@@ -745,14 +663,6 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/doc/HTML/sv/*
 
-%files ta
-%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-
-%files tg
-%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-
 %files tr
 %defattr(-,root,root,-)
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
@@ -761,10 +671,6 @@
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 
-%files uz
-%defattr(-,root,root,-)
-%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/*
-
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
@@ -774,6 +680,10 @@
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Aug 2006 10:10:42 -0000	1.6
+++ sources	21 Oct 2006 10:11:32 -0000	1.7
@@ -1,49 +1,32 @@
-c7a48bb275230d1152e29c67a869daee  koffice-l10n-af-1.5.2.tar.bz2
-a35e9b3f75265488ca400469f23a5a91  koffice-l10n-ar-1.5.2.tar.bz2
-b8be1348ffab32d826c358d44de68c5e  koffice-l10n-bg-1.5.2.tar.bz2
-fd0738d2c9538994de3573ec00964cf1  koffice-l10n-br-1.5.2.tar.bz2
-b7de9b93298aba597d9d8f8da038fc37  koffice-l10n-bs-1.5.2.tar.bz2
-8e3ff02096b6574cf337430924d5af98  koffice-l10n-ca-1.5.2.tar.bz2
-b8f83541b98ff0cb8361f797f665971c  koffice-l10n-cs-1.5.2.tar.bz2
-64782ef55dbdfbbc3672b613dc7f5faf  koffice-l10n-cy-1.5.2.tar.bz2
-58c13527c47dee445572d26141fd3269  koffice-l10n-da-1.5.2.tar.bz2
-ef007ab98ffe65ce072a9245f51b01e1  koffice-l10n-de-1.5.2.tar.bz2
-4392e652560adb8c83fe2aac9479fcb8  koffice-l10n-el-1.5.2.tar.bz2
-11b499953ae1616c589e793abc4e474b  koffice-l10n-en_GB-1.5.2.tar.bz2
-c7025f7d946342267943fd146a5cc19c  koffice-l10n-eo-1.5.2.tar.bz2
-fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc  koffice-l10n-es-1.5.2.tar.bz2
-fed89528182c0dc7baa2c50fee165270  koffice-l10n-et-1.5.2.tar.bz2
-3e15c7433f91486d8b76eefb19990a74  koffice-l10n-eu-1.5.2.tar.bz2
-de6a7a2b2b2edc1a4eaad7523b1bab39  koffice-l10n-fi-1.5.2.tar.bz2
-8f868a919c6ccb66b719196d3e842910  koffice-l10n-fr-1.5.2.tar.bz2
-b8b4d4cbb0ff29bc0da4954eb9ba4e13  koffice-l10n-ga-1.5.2.tar.bz2
-a0368a287bf2a3566b802ffe6de8b472  koffice-l10n-he-1.5.2.tar.bz2
-95a4edd9df2b1c4744ae0b590d68822a  koffice-l10n-hi-1.5.2.tar.bz2
-cd57e11f100ffabf6a3c72faa6433569  koffice-l10n-hu-1.5.2.tar.bz2
-e3b5ec6948dea217e79d3c692d3e3bd3  koffice-l10n-is-1.5.2.tar.bz2
-9658442039b455e52cf68599e3250f54  koffice-l10n-it-1.5.2.tar.bz2
-7eb7880c8e03a8c905a7bba06423fdde  koffice-l10n-ja-1.5.2.tar.bz2
-bf8fb56e3b2ab401d4b3ac9e19ad30f4  koffice-l10n-lt-1.5.2.tar.bz2
-8f9a9ccea194653be186517c0879fe8c  koffice-l10n-mk-1.5.2.tar.bz2
-617ab3344f714fa9109875bc50b79502  koffice-l10n-ms-1.5.2.tar.bz2
-02adef48c63e4a9f87fed63cefb19d1d  koffice-l10n-nb-1.5.2.tar.bz2
-9847ff8d7dbddf4c2f1ae4a6cb0694d1  koffice-l10n-nl-1.5.2.tar.bz2
-9926f8aa4449e839d40f97e7c621de96  koffice-l10n-nn-1.5.2.tar.bz2
-193d09145eea9136067676b6d74ab5f9  koffice-l10n-pl-1.5.2.tar.bz2
-f8d4e8990e1f24ef6076de1c9698458f  koffice-l10n-pt-1.5.2.tar.bz2
-bba591e0460c4a0169c07c3d5ae5b118  koffice-l10n-pt_BR-1.5.2.tar.bz2
-22d91909560288e7dd79a3db6e2aab42  koffice-l10n-ro-1.5.2.tar.bz2
-e0a809bf7c9202cf5eebaaa93999f4f3  koffice-l10n-ru-1.5.2.tar.bz2
-8fa484cd096f3f8461c054bad31c3601  koffice-l10n-se-1.5.2.tar.bz2
-a7dbf6b5fa42d0cdee1f0928cbaadfd0  koffice-l10n-sk-1.5.2.tar.bz2
-e5fe2c8a350ba2636f4bd8dd2168b017  koffice-l10n-sl-1.5.2.tar.bz2
-2717a1e1e1ff92d1e962e3b69625e906  koffice-l10n-sr-1.5.2.tar.bz2
-f7774ad33c0efb072653495894865e0e  koffice-l10n-sr at Latn-1.5.2.tar.bz2
-83f73110f60ef4b5f633e3cca0dd4e12  koffice-l10n-sv-1.5.2.tar.bz2
-3f0ce9e790415b90daf43c35736a62e7  koffice-l10n-ta-1.5.2.tar.bz2
-add764f98fd61d74bf0886f4bfe7808f  koffice-l10n-tg-1.5.2.tar.bz2
-6b7df893cae7725ca94979a4dcd73edf  koffice-l10n-tr-1.5.2.tar.bz2
-a31dc3319a452ae7d2d689ac50a73bb0  koffice-l10n-uk-1.5.2.tar.bz2
-259739c2bde6d4fb890915cf7f3358c9  koffice-l10n-uz-1.5.2.tar.bz2
-e2de60faab2bc7049e2b4af6827cbe8e  koffice-l10n-zh_CN-1.5.2.tar.bz2
-a39dcaf36d9361d2915399ee0dce0cc0  koffice-l10n-zh_TW-1.5.2.tar.bz2
+b90e14bd3508bcc030096496ea87683a  koffice-l10n-ca-1.6.0.tar.bz2
+21f9a7c3daf57aabf70111dded8a26a6  koffice-l10n-cs-1.6.0.tar.bz2
+b1d03624474b91becd3ff64647f45087  koffice-l10n-cy-1.6.0.tar.bz2
+d1532dc1107f01752a9eeeb362666289  koffice-l10n-da-1.6.0.tar.bz2
+21344257dcd9b418898fb5e348918171  koffice-l10n-de-1.6.0.tar.bz2
+c00bbbf55de2d5d8aa68916ef6618ee3  koffice-l10n-el-1.6.0.tar.bz2
+eb4582f359eaada24a1dd96443636219  koffice-l10n-en_GB-1.6.0.tar.bz2
+81db059841e59cfee6371d10b12e82d7  koffice-l10n-es-1.6.0.tar.bz2
+64b4dd81d61362599af0882d695dd175  koffice-l10n-et-1.6.0.tar.bz2
+c3c5dbfe0135896c41f749ff79c6744e  koffice-l10n-eu-1.6.0.tar.bz2
+738bf409e16c08018b75f672abcb94a4  koffice-l10n-fi-1.6.0.tar.bz2
+96a5871374f69c694be87e621f04f39e  koffice-l10n-fr-1.6.0.tar.bz2
+01ea831cfbd136fecb1c7de8826e97b9  koffice-l10n-hu-1.6.0.tar.bz2
+73f17287697e54e61237a8cf7f6fc75f  koffice-l10n-it-1.6.0.tar.bz2
+dd3f979c03f9bc4ae6393a54766b4a84  koffice-l10n-ja-1.6.0.tar.bz2
+af51669631e18feef464e8d6778a41ad  koffice-l10n-lv-1.6.0.tar.bz2
+259be59d9bfe0e7fba7d96c1b5740614  koffice-l10n-ms-1.6.0.tar.bz2
+ef631712fe58e8129823b0f53253e153  koffice-l10n-nb-1.6.0.tar.bz2
+b9c572b04701226fdce5e9ae5817177c  koffice-l10n-nl-1.6.0.tar.bz2
+aaa167a7881f383b88696d34fd1903a5  koffice-l10n-pl-1.6.0.tar.bz2
+c907923d13d2e2d15e09ac5be9259c96  koffice-l10n-pt-1.6.0.tar.bz2
+8d1be2180acdba3287c2936cc379b4c6  koffice-l10n-pt_BR-1.6.0.tar.bz2
+0b895c8a86f0b3c6f31903c906e0dd08  koffice-l10n-ru-1.6.0.tar.bz2
+3bdbfb8532c3a3422345ff8693544b29  koffice-l10n-sk-1.6.0.tar.bz2
+6dfa4b30a8d246a46dddef1e3933cf36  koffice-l10n-sl-1.6.0.tar.bz2
+69681fe0a95a61b88aa5b9ee226fc320  koffice-l10n-sr-1.6.0.tar.bz2
+8ce2f6edd23a43b079fbec9c20cfe516  koffice-l10n-sr at Latn-1.6.0.tar.bz2
+774efb0a9c02776c58ca6cfe1930d327  koffice-l10n-sv-1.6.0.tar.bz2
+d941eddab83cc8991d4f218854d25f64  koffice-l10n-tr-1.6.0.tar.bz2
+b29bea37e37917edb45cfde8c48b50f7  koffice-l10n-uk-1.6.0.tar.bz2
+a3fda356e170368d7fd88d0ce892307b  koffice-l10n-zh_CN-1.6.0.tar.bz2
+17ec8363abee3dd45c1a4c103b023ff3  koffice-l10n-zh_TW-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 10:12:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Oct 2006 03:12:03 -0700
Subject: rpms/koffice-langpack/devel .cvsignore, 1.6,
	1.7 koffice-langpack.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200610211012.k9LAC3vu004926@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice-langpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4856/devel

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Aug 2006 10:10:48 -0000	1.6
+++ .cvsignore	21 Oct 2006 10:11:33 -0000	1.7
@@ -47,3 +47,35 @@
 koffice-l10n-uz-1.5.2.tar.bz2
 koffice-l10n-zh_CN-1.5.2.tar.bz2
 koffice-l10n-zh_TW-1.5.2.tar.bz2
+koffice-l10n-ca-1.6.0.tar.bz2
+koffice-l10n-cs-1.6.0.tar.bz2
+koffice-l10n-cy-1.6.0.tar.bz2
+koffice-l10n-da-1.6.0.tar.bz2
+koffice-l10n-de-1.6.0.tar.bz2
+koffice-l10n-el-1.6.0.tar.bz2
+koffice-l10n-en_GB-1.6.0.tar.bz2
+koffice-l10n-es-1.6.0.tar.bz2
+koffice-l10n-et-1.6.0.tar.bz2
+koffice-l10n-eu-1.6.0.tar.bz2
+koffice-l10n-fi-1.6.0.tar.bz2
+koffice-l10n-fr-1.6.0.tar.bz2
+koffice-l10n-hu-1.6.0.tar.bz2
+koffice-l10n-it-1.6.0.tar.bz2
+koffice-l10n-ja-1.6.0.tar.bz2
+koffice-l10n-lv-1.6.0.tar.bz2
+koffice-l10n-ms-1.6.0.tar.bz2
+koffice-l10n-nb-1.6.0.tar.bz2
+koffice-l10n-nl-1.6.0.tar.bz2
+koffice-l10n-pl-1.6.0.tar.bz2
+koffice-l10n-pt-1.6.0.tar.bz2
+koffice-l10n-pt_BR-1.6.0.tar.bz2
+koffice-l10n-ru-1.6.0.tar.bz2
+koffice-l10n-sk-1.6.0.tar.bz2
+koffice-l10n-sl-1.6.0.tar.bz2
+koffice-l10n-sr-1.6.0.tar.bz2
+koffice-l10n-sr at Latn-1.6.0.tar.bz2
+koffice-l10n-sv-1.6.0.tar.bz2
+koffice-l10n-tr-1.6.0.tar.bz2
+koffice-l10n-uk-1.6.0.tar.bz2
+koffice-l10n-zh_CN-1.6.0.tar.bz2
+koffice-l10n-zh_TW-1.6.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- koffice-langpack.spec	3 Aug 2006 10:10:48 -0000	1.7
+++ koffice-langpack.spec	21 Oct 2006 10:11:33 -0000	1.8
@@ -1,60 +1,43 @@
 Name:           koffice-langpack
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-af-1.5.2.tar.bz2
-Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ar-1.5.2.tar.bz2
-Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bg-1.5.2.tar.bz2
-Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-br-1.5.2.tar.bz2
-Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-bs-1.5.2.tar.bz2
-Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ca-1.5.2.tar.bz2
-Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cs-1.5.2.tar.bz2
-Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-cy-1.5.2.tar.bz2
-Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-da-1.5.2.tar.bz2
-Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-de-1.5.2.tar.bz2
-Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-el-1.5.2.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-en_GB-1.5.2.tar.bz2
-Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eo-1.5.2.tar.bz2
-Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-es-1.5.2.tar.bz2
-Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-et-1.5.2.tar.bz2
-Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-eu-1.5.2.tar.bz2
-Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fi-1.5.2.tar.bz2
-Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-fr-1.5.2.tar.bz2
-Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ga-1.5.2.tar.bz2
-Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-he-1.5.2.tar.bz2
-Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hi-1.5.2.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-hu-1.5.2.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-is-1.5.2.tar.bz2
-Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-it-1.5.2.tar.bz2
-Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ja-1.5.2.tar.bz2
-Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-lt-1.5.2.tar.bz2
-Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-mk-1.5.2.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nb-1.5.2.tar.bz2
-Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nl-1.5.2.tar.bz2
-Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-nn-1.5.2.tar.bz2
-Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pl-1.5.2.tar.bz2
-Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt-1.5.2.tar.bz2
-Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-pt_BR-1.5.2.tar.bz2
-Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ro-1.5.2.tar.bz2
-Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ru-1.5.2.tar.bz2
-Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-se-1.5.2.tar.bz2
-Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sk-1.5.2.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sl-1.5.2.tar.bz2
-Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr-1.5.2.tar.bz2
-Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.2.tar.bz2
-Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-sv-1.5.2.tar.bz2
-Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ta-1.5.2.tar.bz2
-Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tg-1.5.2.tar.bz2
-Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-tr-1.5.2.tar.bz2
-Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uk-1.5.2.tar.bz2
-Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-uz-1.5.2.tar.bz2
-Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_CN-1.5.2.tar.bz2
-Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-ms-1.5.2.tar.bz2
-Source48:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.2/src/koffice-l10n/koffice-l10n-zh_TW-1.5.2.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ca-1.6.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cs-1.6.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-cy-1.6.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-da-1.6.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-de-1.6.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-el-1.6.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-en_GB-1.6.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-es-1.6.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-et-1.6.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-eu-1.6.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fi-1.6.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-fr-1.6.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-hu-1.6.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-it-1.6.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ja-1.6.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-lv-1.6.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nb-1.6.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-nl-1.6.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pl-1.6.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt-1.6.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-pt_BR-1.6.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ru-1.6.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sk-1.6.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sl-1.6.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr-1.6.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.6.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-sv-1.6.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-tr-1.6.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-uk-1.6.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_CN-1.6.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-ms-1.6.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-l10n/koffice-l10n-zh_TW-1.6.0.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,46 +49,46 @@
 %description
 Language files for koffice
 
-%package af
-Summary:        Afrikaans language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description ar
-Provides additional arabic translations for koffice
+#%package af
+#Summary:        Afrikaans language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description ar
+#Provides additional arabic translations for koffice
+
+#%package bs
+#Summary:        Bosnian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
+
+#%description br
+#Provides additional breton translations for koffice
+
+
+#%package bg
+#Summary:        Bulgarian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%package bs
-Summary:        Bosnian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description br
-Provides additional breton translations for koffice
-
-
-%package bg
-Summary:        Bulgarian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description bg
-Provides additional bulgarian translations for koffice
+#%description bg
+#Provides additional bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
@@ -147,13 +130,13 @@
 %description de
 Provides additional german translations for koffice
 
-%package eo
-Summary:        Esperanto language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package eo
+#Summary:        Esperanto language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description eo
-Provides additional esperanto translations for koffice
+#%description eo
+#Provides additional esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
@@ -213,29 +196,29 @@
 %description fr
 Provides additional french translations for koffice
 
-%package ga
-Summary:        Irish language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package ga
+#Summary:        Irish language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description ga
+#Provides additional irish translations for koffice
+
+#%package he
+#Summary:        Hebrew language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description ga
-Provides additional irish translations for koffice
-
-%package he
-Summary:        Hebrew language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
-
-%description hi
-Provides additional hindi translations for koffice
+#%description hi
+#Provides additional hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
@@ -245,13 +228,13 @@
 %description hu
 Provides additional hungarian translations for koffice
 
-%package is
-Summary:        Icelandic language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package is
+#Summary:        Icelandic language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description is
-Provides additional icelandic translations for koffice
+#%description is
+#Provides additional icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
@@ -269,21 +252,21 @@
 %description ja
 Provides additional japanese translations for koffice
 
-%package lt
-Summary:        Lithuanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description lt
-Provides additional lithuanian translations for koffice
-
-%package mk
-Summary:        Macedonian language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package lt
+#Summary:        Lithuanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
+
+#%description lt
+#Provides additional lithuanian translations for koffice
+
+#%package mk
+#Summary:        Macedonian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description mk
-Provides additional macedonian translations for koffice
+#%description mk
+#Provides additional macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
@@ -309,13 +292,13 @@
 %description nl
 Provides additional dutch translations for koffice
 
-%package nn
-Summary:        Nynorsk language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package nn
+#Summary:        Nynorsk language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description nn
-Provides additional nynorsk translations for koffice
+#%description nn
+#Provides additional nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
@@ -349,20 +332,21 @@
 %description ru
 Provides additional russian translations for koffice
 
-%package ro
-Summary:        Romanian language pack for koffice
-Group:          Applications/Productivity
-Requires:       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}
+#%package ro
+#Summary:        Romanian language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%description se
-Provides additional northern sami translations for koffice
+#%description se
+#Provides additional northern sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
@@ -404,21 +388,21 @@
 %description sv
 Provides additional Swedish translations for koffice
 
-%package ta
-Summary:        Tamil language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description ta
-Provides additional tamil translations for koffice
+#%package ta
+#Summary:        Tamil language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       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}
 
-%package tg
-Summary:        Tajik language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
-
-%description tg
-Provides additional tajik translations for koffice
+#%description tg
+#Provides additional tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
@@ -436,13 +420,13 @@
 %description uk
 Provides additional ukrainian translations for koffice
 
-%package uz
-Summary:        Uzbek language pack for koffice
-Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+#%package uz
+#Summary:        Uzbek language pack for koffice
+#Group:          Applications/Productivity
+#Requires:       koffice-core >= %{version}
 
-%description uz
-Provides additional uzbek translations for koffice
+#%description uz
+#Provides additional uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
@@ -460,11 +444,18 @@
 %description zh_TW
 Provides additional traditional chinese translations for koffice
 
+%package lv
+Summary:        Lativian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description lv
+Provides additional lativian translations for koffice
+
 %prep
 %{__mkdir_p} %{_builddir}/%{name}-%{version}
 cd %{_builddir}/%{name}-%{version}
 
-%{__tar} xjvf %{SOURCE0}
 %{__tar} xjvf %{SOURCE1}
 %{__tar} xjvf %{SOURCE2}
 %{__tar} xjvf %{SOURCE3}
@@ -497,28 +488,12 @@
 %{__tar} xjvf %{SOURCE30}
 %{__tar} xjvf %{SOURCE31}
 %{__tar} xjvf %{SOURCE32}
-%{__tar} xjvf %{SOURCE33}
-%{__tar} xjvf %{SOURCE34}
-%{__tar} xjvf %{SOURCE35}
-%{__tar} xjvf %{SOURCE36}
-%{__tar} xjvf %{SOURCE37}
-%{__tar} xjvf %{SOURCE38}
-%{__tar} xjvf %{SOURCE39}
-%{__tar} xjvf %{SOURCE40}
-%{__tar} xjvf %{SOURCE41}
-%{__tar} xjvf %{SOURCE42}
-%{__tar} xjvf %{SOURCE43}
-%{__tar} xjvf %{SOURCE44}
-%{__tar} xjvf %{SOURCE45}
-%{__tar} xjvf %{SOURCE46}
-%{__tar} xjvf %{SOURCE47}
-%{__tar} xjvf %{SOURCE48}
 
 %build
 # dont work: et
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -527,9 +502,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \
-he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \
-sr at Latn sv ta tg tr uk uz zh_CN zh_TW; do
+for lang in ca cs cy da de el en_GB es et eu fi fr \
+hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr \
+sr at Latn sv tr uk zh_CN zh_TW; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -554,26 +529,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files af
-%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%files ar
-%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-
-%files bg
-%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-
-%files br
-%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-
-%files bs
-%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/apps/koffice/autocorrect/ca.xml
@@ -608,10 +563,6 @@
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/doc/HTML/en_GB/*
 
-%files eo
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-
 %files es
 %defattr(-,root,root,-)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
@@ -637,44 +588,24 @@
 %lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
 %lang(fr) %{_datadir}/doc/HTML/fr/*
 
-%files ga
-%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
-
-%files he
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
-
-%files hi
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-
 %files hu
 %defattr(-,root,root,-)
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(hu) %{_datadir}/apps/koffice/autocorrect/hu.xml
 
-%files is
-%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
-
 %files it
 %defattr(-,root,root,-)
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %{_datadir}/apps/koffice/autocorrect/it.xml
 %lang(it) %{_datadir}/doc/HTML/it/*
 
-%files ja
-%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%files lt
+%files lv
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
 
-%files mk
+%files ja
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 
 %files ms
 %defattr(-,root,root,-)
@@ -689,11 +620,6 @@
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
 %lang(nl) %{_datadir}/doc/HTML/nl/*
 
-%files nn
-%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
-%lang(nn) %{_datadir}/apps/koffice/autocorrect/nn.xml
-
 %files pl
 %defattr(-,root,root,-)
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
@@ -708,19 +634,11 @@
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %{_datadir}/doc/HTML/pt/*
 
-%files ro
-%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
-
 %files ru
 %defattr(-,root,root,-)
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %{_datadir}/doc/HTML/ru/*
 
-%files se
-%defattr(-,root,root,-)
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-
 %files sk
 %defattr(-,root,root,-)
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
@@ -745,14 +663,6 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/doc/HTML/sv/*
 
-%files ta
-%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-
-%files tg
-%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-
 %files tr
 %defattr(-,root,root,-)
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
@@ -761,10 +671,6 @@
 %defattr(-,root,root,-)
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 
-%files uz
-%defattr(-,root,root,-)
-%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/*
-
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
@@ -774,6 +680,10 @@
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
 
 %changelog
+* Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Aug 2006 10:10:48 -0000	1.6
+++ sources	21 Oct 2006 10:11:33 -0000	1.7
@@ -1,49 +1,32 @@
-c7a48bb275230d1152e29c67a869daee  koffice-l10n-af-1.5.2.tar.bz2
-a35e9b3f75265488ca400469f23a5a91  koffice-l10n-ar-1.5.2.tar.bz2
-b8be1348ffab32d826c358d44de68c5e  koffice-l10n-bg-1.5.2.tar.bz2
-fd0738d2c9538994de3573ec00964cf1  koffice-l10n-br-1.5.2.tar.bz2
-b7de9b93298aba597d9d8f8da038fc37  koffice-l10n-bs-1.5.2.tar.bz2
-8e3ff02096b6574cf337430924d5af98  koffice-l10n-ca-1.5.2.tar.bz2
-b8f83541b98ff0cb8361f797f665971c  koffice-l10n-cs-1.5.2.tar.bz2
-64782ef55dbdfbbc3672b613dc7f5faf  koffice-l10n-cy-1.5.2.tar.bz2
-58c13527c47dee445572d26141fd3269  koffice-l10n-da-1.5.2.tar.bz2
-ef007ab98ffe65ce072a9245f51b01e1  koffice-l10n-de-1.5.2.tar.bz2
-4392e652560adb8c83fe2aac9479fcb8  koffice-l10n-el-1.5.2.tar.bz2
-11b499953ae1616c589e793abc4e474b  koffice-l10n-en_GB-1.5.2.tar.bz2
-c7025f7d946342267943fd146a5cc19c  koffice-l10n-eo-1.5.2.tar.bz2
-fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc  koffice-l10n-es-1.5.2.tar.bz2
-fed89528182c0dc7baa2c50fee165270  koffice-l10n-et-1.5.2.tar.bz2
-3e15c7433f91486d8b76eefb19990a74  koffice-l10n-eu-1.5.2.tar.bz2
-de6a7a2b2b2edc1a4eaad7523b1bab39  koffice-l10n-fi-1.5.2.tar.bz2
-8f868a919c6ccb66b719196d3e842910  koffice-l10n-fr-1.5.2.tar.bz2
-b8b4d4cbb0ff29bc0da4954eb9ba4e13  koffice-l10n-ga-1.5.2.tar.bz2
-a0368a287bf2a3566b802ffe6de8b472  koffice-l10n-he-1.5.2.tar.bz2
-95a4edd9df2b1c4744ae0b590d68822a  koffice-l10n-hi-1.5.2.tar.bz2
-cd57e11f100ffabf6a3c72faa6433569  koffice-l10n-hu-1.5.2.tar.bz2
-e3b5ec6948dea217e79d3c692d3e3bd3  koffice-l10n-is-1.5.2.tar.bz2
-9658442039b455e52cf68599e3250f54  koffice-l10n-it-1.5.2.tar.bz2
-7eb7880c8e03a8c905a7bba06423fdde  koffice-l10n-ja-1.5.2.tar.bz2
-bf8fb56e3b2ab401d4b3ac9e19ad30f4  koffice-l10n-lt-1.5.2.tar.bz2
-8f9a9ccea194653be186517c0879fe8c  koffice-l10n-mk-1.5.2.tar.bz2
-617ab3344f714fa9109875bc50b79502  koffice-l10n-ms-1.5.2.tar.bz2
-02adef48c63e4a9f87fed63cefb19d1d  koffice-l10n-nb-1.5.2.tar.bz2
-9847ff8d7dbddf4c2f1ae4a6cb0694d1  koffice-l10n-nl-1.5.2.tar.bz2
-9926f8aa4449e839d40f97e7c621de96  koffice-l10n-nn-1.5.2.tar.bz2
-193d09145eea9136067676b6d74ab5f9  koffice-l10n-pl-1.5.2.tar.bz2
-f8d4e8990e1f24ef6076de1c9698458f  koffice-l10n-pt-1.5.2.tar.bz2
-bba591e0460c4a0169c07c3d5ae5b118  koffice-l10n-pt_BR-1.5.2.tar.bz2
-22d91909560288e7dd79a3db6e2aab42  koffice-l10n-ro-1.5.2.tar.bz2
-e0a809bf7c9202cf5eebaaa93999f4f3  koffice-l10n-ru-1.5.2.tar.bz2
-8fa484cd096f3f8461c054bad31c3601  koffice-l10n-se-1.5.2.tar.bz2
-a7dbf6b5fa42d0cdee1f0928cbaadfd0  koffice-l10n-sk-1.5.2.tar.bz2
-e5fe2c8a350ba2636f4bd8dd2168b017  koffice-l10n-sl-1.5.2.tar.bz2
-2717a1e1e1ff92d1e962e3b69625e906  koffice-l10n-sr-1.5.2.tar.bz2
-f7774ad33c0efb072653495894865e0e  koffice-l10n-sr at Latn-1.5.2.tar.bz2
-83f73110f60ef4b5f633e3cca0dd4e12  koffice-l10n-sv-1.5.2.tar.bz2
-3f0ce9e790415b90daf43c35736a62e7  koffice-l10n-ta-1.5.2.tar.bz2
-add764f98fd61d74bf0886f4bfe7808f  koffice-l10n-tg-1.5.2.tar.bz2
-6b7df893cae7725ca94979a4dcd73edf  koffice-l10n-tr-1.5.2.tar.bz2
-a31dc3319a452ae7d2d689ac50a73bb0  koffice-l10n-uk-1.5.2.tar.bz2
-259739c2bde6d4fb890915cf7f3358c9  koffice-l10n-uz-1.5.2.tar.bz2
-e2de60faab2bc7049e2b4af6827cbe8e  koffice-l10n-zh_CN-1.5.2.tar.bz2
-a39dcaf36d9361d2915399ee0dce0cc0  koffice-l10n-zh_TW-1.5.2.tar.bz2
+b90e14bd3508bcc030096496ea87683a  koffice-l10n-ca-1.6.0.tar.bz2
+21f9a7c3daf57aabf70111dded8a26a6  koffice-l10n-cs-1.6.0.tar.bz2
+b1d03624474b91becd3ff64647f45087  koffice-l10n-cy-1.6.0.tar.bz2
+d1532dc1107f01752a9eeeb362666289  koffice-l10n-da-1.6.0.tar.bz2
+21344257dcd9b418898fb5e348918171  koffice-l10n-de-1.6.0.tar.bz2
+c00bbbf55de2d5d8aa68916ef6618ee3  koffice-l10n-el-1.6.0.tar.bz2
+eb4582f359eaada24a1dd96443636219  koffice-l10n-en_GB-1.6.0.tar.bz2
+81db059841e59cfee6371d10b12e82d7  koffice-l10n-es-1.6.0.tar.bz2
+64b4dd81d61362599af0882d695dd175  koffice-l10n-et-1.6.0.tar.bz2
+c3c5dbfe0135896c41f749ff79c6744e  koffice-l10n-eu-1.6.0.tar.bz2
+738bf409e16c08018b75f672abcb94a4  koffice-l10n-fi-1.6.0.tar.bz2
+96a5871374f69c694be87e621f04f39e  koffice-l10n-fr-1.6.0.tar.bz2
+01ea831cfbd136fecb1c7de8826e97b9  koffice-l10n-hu-1.6.0.tar.bz2
+73f17287697e54e61237a8cf7f6fc75f  koffice-l10n-it-1.6.0.tar.bz2
+dd3f979c03f9bc4ae6393a54766b4a84  koffice-l10n-ja-1.6.0.tar.bz2
+af51669631e18feef464e8d6778a41ad  koffice-l10n-lv-1.6.0.tar.bz2
+259be59d9bfe0e7fba7d96c1b5740614  koffice-l10n-ms-1.6.0.tar.bz2
+ef631712fe58e8129823b0f53253e153  koffice-l10n-nb-1.6.0.tar.bz2
+b9c572b04701226fdce5e9ae5817177c  koffice-l10n-nl-1.6.0.tar.bz2
+aaa167a7881f383b88696d34fd1903a5  koffice-l10n-pl-1.6.0.tar.bz2
+c907923d13d2e2d15e09ac5be9259c96  koffice-l10n-pt-1.6.0.tar.bz2
+8d1be2180acdba3287c2936cc379b4c6  koffice-l10n-pt_BR-1.6.0.tar.bz2
+0b895c8a86f0b3c6f31903c906e0dd08  koffice-l10n-ru-1.6.0.tar.bz2
+3bdbfb8532c3a3422345ff8693544b29  koffice-l10n-sk-1.6.0.tar.bz2
+6dfa4b30a8d246a46dddef1e3933cf36  koffice-l10n-sl-1.6.0.tar.bz2
+69681fe0a95a61b88aa5b9ee226fc320  koffice-l10n-sr-1.6.0.tar.bz2
+8ce2f6edd23a43b079fbec9c20cfe516  koffice-l10n-sr at Latn-1.6.0.tar.bz2
+774efb0a9c02776c58ca6cfe1930d327  koffice-l10n-sv-1.6.0.tar.bz2
+d941eddab83cc8991d4f218854d25f64  koffice-l10n-tr-1.6.0.tar.bz2
+b29bea37e37917edb45cfde8c48b50f7  koffice-l10n-uk-1.6.0.tar.bz2
+a3fda356e170368d7fd88d0ce892307b  koffice-l10n-zh_CN-1.6.0.tar.bz2
+17ec8363abee3dd45c1a4c103b023ff3  koffice-l10n-zh_TW-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 11:14:58 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:14:58 -0700
Subject: rpms/autogen import.log,1.3,1.4
Message-ID: <200610211114.k9LBEwp7008561@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8529

Modified Files:
	import.log 
Log Message:
auto-import autogen-5.8.7-1 on branch devel from autogen-5.8.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/autogen/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Sep 2006 21:44:32 -0000	1.3
+++ import.log	21 Oct 2006 11:14:27 -0000	1.4
@@ -1,2 +1,3 @@
 autogen-5_8_5-6:HEAD:autogen-5.8.5-6.src.rpm:1157919650
 autogen-5_8_5-7:FC-5:autogen-5.8.5-7.src.rpm:1157924662
+autogen-5_8_7-1:HEAD:autogen-5.8.7-1.src.rpm:1161429254



From fedora-extras-commits at redhat.com  Sat Oct 21 11:14:59 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:14:59 -0700
Subject: rpms/autogen/devel .cvsignore, 1.2, 1.3 autogen.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610211114.k9LBExOo008566@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8529/devel

Modified Files:
	.cvsignore autogen.spec sources 
Log Message:
auto-import autogen-5.8.7-1 on branch devel from autogen-5.8.7-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 20:21:05 -0000	1.2
+++ .cvsignore	21 Oct 2006 11:14:28 -0000	1.3
@@ -1 +1 @@
-autogen-5.8.5.tar.bz2
+autogen-5.8.7.tar.bz2


Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/autogen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.spec	10 Sep 2006 21:37:04 -0000	1.2
+++ autogen.spec	21 Oct 2006 11:14:28 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
-Version: 5.8.5
-Release: 7%{?dist}
+Version: 5.8.7
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
+- bump to new version
+
 * Sun Sep 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.5-7
 - removed libopts and other autoopts conflicts
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 20:21:05 -0000	1.2
+++ sources	21 Oct 2006 11:14:28 -0000	1.3
@@ -1 +1 @@
-23d32772a119dbff4f3ce51a6331e06d  autogen-5.8.5.tar.bz2
+76599cc04f352512610191b13f3ce2a6  autogen-5.8.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 11:16:29 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:16:29 -0700
Subject: rpms/autogen import.log,1.4,1.5
Message-ID: <200610211116.k9LBGTf9008661@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8629

Modified Files:
	import.log 
Log Message:
auto-import autogen-5.8.7-1 on branch FC-5 from autogen-5.8.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/autogen/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	21 Oct 2006 11:14:27 -0000	1.4
+++ import.log	21 Oct 2006 11:15:59 -0000	1.5
@@ -1,3 +1,4 @@
 autogen-5_8_5-6:HEAD:autogen-5.8.5-6.src.rpm:1157919650
 autogen-5_8_5-7:FC-5:autogen-5.8.5-7.src.rpm:1157924662
 autogen-5_8_7-1:HEAD:autogen-5.8.7-1.src.rpm:1161429254
+autogen-5_8_7-1:FC-5:autogen-5.8.7-1.src.rpm:1161429346



From fedora-extras-commits at redhat.com  Sat Oct 21 11:16:30 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:16:30 -0700
Subject: rpms/autogen/FC-5 .cvsignore, 1.2, 1.3 autogen.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200610211116.k9LBGUIk008666@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8629/FC-5

Modified Files:
	.cvsignore autogen.spec sources 
Log Message:
auto-import autogen-5.8.7-1 on branch FC-5 from autogen-5.8.7-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 20:21:05 -0000	1.2
+++ .cvsignore	21 Oct 2006 11:16:00 -0000	1.3
@@ -1 +1 @@
-autogen-5.8.5.tar.bz2
+autogen-5.8.7.tar.bz2


Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/autogen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.spec	10 Sep 2006 21:44:33 -0000	1.2
+++ autogen.spec	21 Oct 2006 11:16:00 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
-Version: 5.8.5
-Release: 7%{?dist}
+Version: 5.8.7
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
+- bump to new version
+
 * Sun Sep 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.5-7
 - removed libopts and other autoopts conflicts
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 20:21:05 -0000	1.2
+++ sources	21 Oct 2006 11:16:00 -0000	1.3
@@ -1 +1 @@
-23d32772a119dbff4f3ce51a6331e06d  autogen-5.8.5.tar.bz2
+76599cc04f352512610191b13f3ce2a6  autogen-5.8.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 11:20:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:20:33 -0700
Subject: rpms/anjuta import.log,1.23,1.24
Message-ID: <200610211120.k9LBKXMa008876@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8840

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-8 on branch FC-5 from anjuta-2.0.2-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- import.log	18 Oct 2006 20:42:16 -0000	1.23
+++ import.log	21 Oct 2006 11:20:03 -0000	1.24
@@ -20,3 +20,4 @@
 anjuta-1_2_4a-7:HEAD:anjuta-1.2.4a-7.src.rpm:1157214546
 anjuta-1_2_4a-7:FC-5:anjuta-1.2.4a-7.src.rpm:1157214616
 anjuta-2_0_2-8:HEAD:anjuta-2.0.2-8.src.rpm:1161204122
+anjuta-2_0_2-8:FC-5:anjuta-2.0.2-8.src.rpm:1161429591



From fedora-extras-commits at redhat.com  Sat Oct 21 11:20:34 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 04:20:34 -0700
Subject: rpms/anjuta/FC-5 anjuta2.spec, NONE, 1.1 .cvsignore, 1.6,
	1.7 sources, 1.6, 1.7 anjuta-1.2.4a-search.patch, 1.1,
	NONE anjuta-1.2.4a-watch-keys.patch, 1.1,
	NONE anjuta-export-dynamic.patch, 1.1,
	NONE anjuta-project_type.patch, 1.1, NONE anjuta.spec, 1.21, NONE
Message-ID: <200610211120.k9LBKYSs008880@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8840/FC-5

Modified Files:
	.cvsignore sources 
Added Files:
	anjuta2.spec 
Removed Files:
	anjuta-1.2.4a-search.patch anjuta-1.2.4a-watch-keys.patch 
	anjuta-export-dynamic.patch anjuta-project_type.patch 
	anjuta.spec 
Log Message:
auto-import anjuta-2.0.2-8 on branch FC-5 from anjuta-2.0.2-8.src.rpm


--- NEW FILE anjuta2.spec ---
Summary: Integrated Development Environment
Name:    anjuta
Version: 2.0.2
Release: 8%{?dist}
License: GPL
Group:   Development/Tools
URL:     http://www.anjuta.org
Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Epoch: 1

%description
Anjuta DevStudio is a versatile Integrated Development Environment (IDE)
on GNOME Desktop Environment and features a number of advanced
programming facilities. These include project management, application and
class wizards, an on-board interactive debugger, powerful source editor,
syntax highlighting, intellisense autocompletions, symbol navigation,
version controls, integrated GUI designing and other tools.

%package devel
Summary: Libraries and include files for Anjuta plugins development
Group:   Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libgnomeui-devel, libglade2-devel, pkgconfig

%description devel
Libraries, header files and API docs for developing Anjuta plugins

%package docs
Summary: Anjuta 2 documentation
Group: Documentation
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description docs
Anjuta 2 documentation

%prep
%setup -q
sed -i 's/\r//' doc/ScintillaDoc.html
%{_bindir}/iconv -t UTF-8 THANKS -o THANKS
%{_bindir}/iconv -t UTF-8 COPYING -o COPYING
%{_bindir}/iconv -t UTF-8 NEWS -o NEWS
%{_bindir}/iconv -t UTF-8 README -o README
chmod 644 scintilla/*.cxx
chmod 644 scintilla/*.h

%build
%configure --disable-static --disable-plugin-subversion --enable-nls
%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL="install -c -p" install
%find_lang %{name}

desktop-file-install --vendor fedora --delete-original \
  --dir %{buildroot}/%{_datadir}/applications      \
  --add-category X-Fedora                              \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig

%post docs
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :

%postun docs
scrollkeeper-update -q || :

%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc doc/ScintillaDoc.html
%{_bindir}/%{name}*
%{_bindir}/create_global_tags.sh
%{_bindir}/test_tm_buffer
%{_libdir}/lib%{name}*.so.*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}
%{_datadir}/doc/%{name}
%{_datadir}/application-registry/%{name}.applications
%{_datadir}/mime-info/%{name}.mime
%{_datadir}/mime-info/%{name}.keys
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/48x48/apps/anjuta*
%{_datadir}/icons/hicolor/scalable/apps/anjuta*
%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png
%{_mandir}/man1/anjuta*

%files docs
%defattr(-,root, root, -)
%{_datadir}/gnome/help/%{name}
%{_datadir}/omf/%{name}

%files devel
%defattr (-, root, root)
%{_includedir}/*%{name}*
%{_libdir}/pkgconfig/*%{name}*
%{_libdir}/lib%{name}*.so
%{_datadir}/gtk-doc/html/*%{name}*

%changelog
* Tue Oct 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-8
- fix the INSTALL line in install
- fixed encoding on text files
- removed two docs (not really needed)
- fixed ldconfig

* Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-7
- install keeps timestampe
- now keeps time stamps
- lots of BRs removed
- Moved docs Rs to the correct place
- fixed encodings

* Sat Oct 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-6
- removed RPM_BUILD_ROOT
- fixed devel package
- altered update-mime-database
- fixed debuginfo permission problems
- altered R and BR

* Wed Oct 11 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-5
- re-enabled docs
- multiple spec fixes
- spec file clean
- added gtksourceview-devel and gtksourceview to BR and R

* Thu Jun 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-2
- Lotza fixes!

* Tue May 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-1
- bump to new version 

* Thu Apr 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-3
- removed the hack from anjuta (1.2.4a)
- added anjuta-docs subpackage

* Wed Apr 26 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-2
- removed smp_flags

* Tue Feb 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.1-1
- Initial import for FC
- Sanitised the spec file somewhat
- Removed .a and .la files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Apr 2006 23:27:32 -0000	1.6
+++ .cvsignore	21 Oct 2006 11:20:03 -0000	1.7
@@ -1 +1 @@
-anjuta-1.2.4a.tar.gz
+anjuta-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Apr 2006 23:27:32 -0000	1.6
+++ sources	21 Oct 2006 11:20:03 -0000	1.7
@@ -1 +1 @@
-7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz
+e0d1e216da809df32816d233d7c55165  anjuta-2.0.2.tar.gz


--- anjuta-1.2.4a-search.patch DELETED ---


--- anjuta-1.2.4a-watch-keys.patch DELETED ---


--- anjuta-export-dynamic.patch DELETED ---


--- anjuta-project_type.patch DELETED ---


--- anjuta.spec DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 13:30:08 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Sat, 21 Oct 2006 06:30:08 -0700
Subject: rpms/kst/FC-5 .cvsignore,1.4,1.5 kst.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200610211330.k9LDU8vR015319@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15280

Modified Files:
	.cvsignore kst.spec sources 
Log Message:
Upgrade to kst 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kst/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2006 14:41:07 -0000	1.4
+++ .cvsignore	21 Oct 2006 13:29:38 -0000	1.5
@@ -1 +1 @@
-kst-1.3.0.tar.gz
+kst-1.3.1.tar.gz


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/FC-5/kst.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kst.spec	27 Sep 2006 14:42:48 -0000	1.7
+++ kst.spec	21 Oct 2006 13:29:38 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       kst
-Version:    1.3.0
-Release:    2%{?dist}
+Version:    1.3.1
+Release:    1%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -211,6 +211,9 @@
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %changelog
+* Sat Oct 21 2006 Matthew Truch <matt at truch.net> - 1.3.1-1
+- Upgrade to 1.3.1 bugfix release.
+
 * Wed Sep 27 2006 Matthew Truch <matt at truch.net> - 1.3.0-2
 - Bump release due to tagging mis-hap.  No real changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kst/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2006 14:41:07 -0000	1.4
+++ sources	21 Oct 2006 13:29:38 -0000	1.5
@@ -1 +1 @@
-3a3978eb498c456bb23c261dbd82d215  kst-1.3.0.tar.gz
+b18013223dc4cc2d1d0c8c4197bf8f97  kst-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 13:58:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 06:58:01 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-5 .cvsignore, 1.3,
	1.4 perl-Alien-wxWidgets.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610211358.k9LDw16f015446@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15410/FC-5

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Oct 2006 20:10:34 -0000	1.3
+++ .cvsignore	21 Oct 2006 13:57:31 -0000	1.4
@@ -1 +1 @@
-Alien-wxWidgets-0.22.tar.gz
+Alien-wxWidgets-0.24.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/perl-Alien-wxWidgets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Alien-wxWidgets.spec	3 Oct 2006 20:10:34 -0000	1.4
+++ perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:31 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.22
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -16,6 +16,7 @@
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# No binaries in this package
 %define debug_package %{nil}
 
 %description
@@ -54,6 +55,12 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.24-1
+- Update to 0.24.
+
+* Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
+- Update to 0.23.
+
 * Tue Oct  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
 - Update to 0.22.
 - Avoid creation of the debuginfo package (#209180).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Oct 2006 20:10:34 -0000	1.3
+++ sources	21 Oct 2006 13:57:31 -0000	1.4
@@ -1 +1 @@
-98de414f8d378170ede6cf96a0e2f73e  Alien-wxWidgets-0.22.tar.gz
+40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 13:58:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 06:58:02 -0700
Subject: rpms/perl-Alien-wxWidgets/devel .cvsignore, 1.4,
	1.5 perl-Alien-wxWidgets.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200610211358.k9LDw2Vw015451@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15410/devel

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Oct 2006 21:18:50 -0000	1.4
+++ .cvsignore	21 Oct 2006 13:57:32 -0000	1.5
@@ -1 +1 @@
-Alien-wxWidgets-0.23.tar.gz
+Alien-wxWidgets-0.24.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Alien-wxWidgets.spec	19 Oct 2006 21:18:50 -0000	1.5
+++ perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:32 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.23
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -16,6 +16,7 @@
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# No binaries in this package
 %define debug_package %{nil}
 
 %description
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.24-1
+- Update to 0.24.
+
 * Thu Oct 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
 - Update to 0.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Oct 2006 21:18:50 -0000	1.4
+++ sources	21 Oct 2006 13:57:32 -0000	1.5
@@ -1 +1 @@
-487dcec3fc7ef94c4247913883b5cc65  Alien-wxWidgets-0.23.tar.gz
+40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:04:40 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 07:04:40 -0700
Subject: rpms/perl-Wx/FC-5 .cvsignore, 1.2, 1.3 perl-Wx.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610211404.k9LE4e3l018490@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18451/FC-5

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.59.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2006 10:42:07 -0000	1.2
+++ .cvsignore	21 Oct 2006 14:04:09 -0000	1.3
@@ -1 +1 @@
-Wx-0.57.tar.gz
+Wx-0.59.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/perl-Wx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Wx.spec	2 Oct 2006 10:42:07 -0000	1.1
+++ perl-Wx.spec	21 Oct 2006 14:04:09 -0000	1.2
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Wx
-Version:        0.57
-Release:        2%{?dist}
+Version:        0.59
+Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.15
+BuildRequires:  perl(Alien::wxWidgets) >= 0.22
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.59-1
+- Update to 0.59.
+
+* Fri Oct 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.58-1
+- Update to 0.58.
+
 * Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.57-2
 - Filtered perl(Wx) duplicate provide.
 - Corrected several file permission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 10:42:07 -0000	1.2
+++ sources	21 Oct 2006 14:04:09 -0000	1.3
@@ -1 +1 @@
-95689cae67e55eb62febe8f41751c1c2  Wx-0.57.tar.gz
+8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:04:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 07:04:42 -0700
Subject: rpms/perl-Wx/devel .cvsignore, 1.2, 1.3 perl-Wx.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610211404.k9LE4gQj018495@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18451/devel

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.59.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2006 10:42:07 -0000	1.2
+++ .cvsignore	21 Oct 2006 14:04:11 -0000	1.3
@@ -1 +1 @@
-Wx-0.57.tar.gz
+Wx-0.59.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Wx.spec	2 Oct 2006 10:42:07 -0000	1.1
+++ perl-Wx.spec	21 Oct 2006 14:04:11 -0000	1.2
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Wx
-Version:        0.57
-Release:        2%{?dist}
+Version:        0.59
+Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.15
+BuildRequires:  perl(Alien::wxWidgets) >= 0.22
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.59-1
+- Update to 0.59.
+
+* Fri Oct 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.58-1
+- Update to 0.58.
+
 * Sun Oct  1 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.57-2
 - Filtered perl(Wx) duplicate provide.
 - Corrected several file permission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 10:42:07 -0000	1.2
+++ sources	21 Oct 2006 14:04:11 -0000	1.3
@@ -1 +1 @@
-95689cae67e55eb62febe8f41751c1c2  Wx-0.57.tar.gz
+8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:31:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 07:31:08 -0700
Subject: rpms/perl-Log-Log4perl/FC-5 .cvsignore, 1.5,
	1.6 perl-Log-Log4perl.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610211431.k9LEV8xw018810@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774/FC-5

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.07.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jul 2006 15:53:56 -0000	1.5
+++ .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
@@ -1 +1 @@
-Log-Log4perl-1.06.tar.gz
+Log-Log4perl-1.07.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/perl-Log-Log4perl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Log-Log4perl.spec	21 Jul 2006 15:53:56 -0000	1.7
+++ perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.06
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -33,9 +33,9 @@
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
 %patch1 -p1
-find lib -name "*.pm" -exec chmod a-x {} ';'
+find lib -name "*.pm" -exec chmod -c a-x {} ';'
 %{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod a-x eg/* 
+chmod -c a-x eg/* 
 
 
 %build
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.07-1
+- Update to 1.07.
+
 * Fri Jul 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jul 2006 15:53:56 -0000	1.5
+++ sources	21 Oct 2006 14:30:38 -0000	1.6
@@ -1 +1 @@
-a7bda690ec0ad0bed457fa525e28034a  Log-Log4perl-1.06.tar.gz
+dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:31:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 21 Oct 2006 07:31:09 -0700
Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.5,
	1.6 perl-Log-Log4perl.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200610211431.k9LEV9cs018815@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774/devel

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.07.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jul 2006 15:54:02 -0000	1.5
+++ .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
@@ -1 +1 @@
-Log-Log4perl-1.06.tar.gz
+Log-Log4perl-1.07.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Log-Log4perl.spec	21 Jul 2006 15:54:02 -0000	1.7
+++ perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.06
+Version:        1.07
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -33,9 +33,9 @@
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
 %patch1 -p1
-find lib -name "*.pm" -exec chmod a-x {} ';'
+find lib -name "*.pm" -exec chmod -c a-x {} ';'
 %{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod a-x eg/* 
+chmod -c a-x eg/* 
 
 
 %build
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.07-1
+- Update to 1.07.
+
 * Fri Jul 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jul 2006 15:54:02 -0000	1.5
+++ sources	21 Oct 2006 14:30:38 -0000	1.6
@@ -1 +1 @@
-a7bda690ec0ad0bed457fa525e28034a  Log-Log4perl-1.06.tar.gz
+dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 14:40:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 07:40:09 -0700
Subject: rpms/MagicPoint/devel .cvsignore, 1.3, 1.4 MagicPoint.spec, 1.4,
	1.5 Makefile, 1.2, 1.3 magicpoint-1.09a-rpath.patch, 1.2,
	1.3 magicpoint-1.10a-fix-gcc34.patch, 1.2,
	1.3 magicpoint-1.10a-fix-usleep.patch, 1.2,
	1.3 magicpoint-1.10a-longline.patch, 1.2,
	1.3 magicpoint-1.11a-fix-gcc-warnings.patch, 1.2,
	1.3 magicpoint-1.11b-64bit.patch, NONE,
	1.1 magicpoint-1.11b-debian.patch, NONE,
	1.1 magicpoint-1.11b-embed.patch, NONE, 1.1 sources, 1.3,
	1.4 dead.package, 1.1, NONE
Message-ID: <200610211440.k9LEe95t019009@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/MagicPoint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18953

Added Files:
	.cvsignore MagicPoint.spec Makefile 
	magicpoint-1.09a-rpath.patch magicpoint-1.10a-fix-gcc34.patch 
	magicpoint-1.10a-fix-usleep.patch 
	magicpoint-1.10a-longline.patch 
	magicpoint-1.11a-fix-gcc-warnings.patch 
	magicpoint-1.11b-64bit.patch magicpoint-1.11b-debian.patch 
	magicpoint-1.11b-embed.patch sources 
Removed Files:
	dead.package 
Log Message:
* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.11b-4
- Unorphan
- Take some patches from Debian
- Actually make ./configure detect and use freetype1, it was testing for it
  but the test failed
- Package mgp2html and mgp2latex from the contrib dir 



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	21 Oct 2006 14:39:38 -0000	1.4
@@ -0,0 +1 @@
+magicpoint-1.11b.tar.gz


Index: MagicPoint.spec
===================================================================
RCS file: MagicPoint.spec
diff -N MagicPoint.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MagicPoint.spec	21 Oct 2006 14:39:38 -0000	1.5
@@ -0,0 +1,237 @@
+Name:           MagicPoint
+Version:        1.11b
+Release:        4%{?dist}
+Summary:        X based presentation software
+Group:          Applications/Productivity
+License:        BSD
+URL:            http://member.wide.ad.jp/wg/mgp/
+Source0:        ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/magicpoint-%{version}.tar.gz
+Patch0:         magicpoint-1.11b-debian.patch
+Patch1:         magicpoint-1.11b-64bit.patch
+Patch2:         magicpoint-1.09a-rpath.patch
+Patch3:         magicpoint-1.11a-fix-gcc-warnings.patch
+Patch4:         magicpoint-1.11b-embed.patch
+Patch6:         magicpoint-1.10a-longline.patch
+Patch10:        magicpoint-1.10a-fix-usleep.patch
+Patch11:        magicpoint-1.10a-fix-gcc34.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  freetype1-devel libungif-devel libpng-devel libmng-devel imake
+BuildRequires:  imlib-devel libXt-devel libXft-devel bison flex perl sharutils
+Requires:       sharutils
+Obsoletes:      mgp < %{version}-%{release}, magicpoint < %{version}-%{release}
+Provides:       mgp = %{version}-%{release}, magicpoint = %{version}-%{release}
+
+%description
+MagicPoint is an X11 based presentation tool. MagicPoint's
+presentation files (typically .mgp files) are plain text so you can
+create presentation files quickly with your favorite editor.
+
+
+%prep
+%setup -q -n magicpoint-%{version}
+%patch0 -p1
+%patch1 -p1 -z .64bit
+%patch2 -p1 -z .rpath
+%patch3 -p1 -z .warnings
+%patch4 -p1 -z .embed
+%patch6 -p1 -z .longline
+%patch10 -p1 -z .usleep
+%patch11 -p1 -z .gcc34
+# fix hopelessly broken way configure searches for libttf
+sed -i 's:$dir/lib:%{_libdir}:g' configure
+sed -i 's:$dir/include/freetype:/usr/include/freetype1/freetype:g' configure
+
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype1/freetype"
+%configure --enable-locale --enable-freetype --enable-freetype-charset16 \
+  --enable-xft2 --disable-vflib --enable-gif --enable-imlib
+xmkmf -a
+# LIBDIR is used by the makefile to determine where to install data files
+make CDEBUGFLAGS="$RPM_OPT_FLAGS" LIBDIR=%{_datadir}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install install.man DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_datadir}
+install -m 755 contrib/mgp2html.pl $RPM_BUILD_ROOT%{_bindir}/mgp2html
+install -m 755 contrib/mgp2latex.pl $RPM_BUILD_ROOT%{_bindir}/mgp2latex
+# stop these from ending up in %doc
+rm sample/.cvsignore sample/*akefile*
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYRIGHT README SYNTAX USAGE sample
+%{_bindir}/*
+%{_datadir}/mgp
+%{_mandir}/*/*
+
+
+%changelog
+* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.11b-4
+- Unorphan
+- Take some patches from Debian
+- Actually make ./configure detect and use freetype1, it was testing for it
+  but the test failed
+- Package mgp2html and mgp2latex from the contrib dir 
+
+* Fri Aug 5 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-3
+- Re-enable debuginfo builds
+- Ralf Corsepius watchful eyes fixes - cleaning up the spec
+
+* Thu Aug 4 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-2
+- Removed Patch12 to fix undefined operation
+- Bump spec to somewhat match work from Rui Miguel Silva Seabra <rms at 1407.org>
+- Remove requirement on VFlib2, seeing that we disable it in configure
+
+* Mon Sep 27 2004 Akira TAGOH <tagoh at redhat.com> - 1.11b-1
+- New upstream release.
+
+* Wed Sep 15 2004 Akira TAGOH <tagoh at redhat.com> - 1.11a-1
+- New upstream release.
+- magicpoint-1.11a-fix-gcc-warnings.patch: updated from 1.10a.
+- magicpoint-1.10a-fixtypo-opaque.patch: removed, it's no lnger needed.
+- magicpoint-1.10a-fix-ft2build.patch: removed, it's no longer needed.
+- magicpoint-1.10a-png.patch: removed, it's no longer needed.
+- XFree4.0-freetype.patch: removed, freetype1 is no longer available.
+
+* Mon Jun 21 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-10
+- magicpoint-1.10a-fix-gcc34.patch: applied to build with gcc 3.4.
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Feb 18 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-8
+- fix wrong license description. (#115947: Miloslav Trmac)
+- included COPYRIGHT file.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Feb 09 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-6
+- magicpoint-1.10a-fix-gcc-warnings2.patch: applied to fix gcc warnings (#115161)
+- magicpoint-1.10a-fix-ft2build.patch: applied to fix build error for freetype.
+- magicpoint-1.10a-fix-usleep.patch: applied to fix missing compile options.
+
+* Fri Nov 28 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-5
+- magicpoint-1.10a-fix-gcc-warnings.patch: updated for more gcc3 compliant. (#110773)
+
+* Fri Sep 19 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-4
+- added some missing BuildRequires.
+
+* Tue Sep 02 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-3
+- magicpoint-1.10a-fixtypo-opaque.patch: applied a patch to work the opaque.
+
+* Wed Aug 20 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-2
+- magicpoint-1.10a-longline.patch: fixed the freeze if the line is too long. (#100736)
+
+* Wed Jun 25 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-1
+- New upstream release.
+- removed the dependency of watanabe-vf due to the copyright issue.
+- add fontconfig-devel and XFree86-devel to BuildReqruies.
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu May 22 2003 Jeremy Katz <katzj at redhat.com> 1.09a-12
+- gcc 3.3 doesn't implement varargs.h, include stdarg.h instead
+
+* Fri Apr 18 2003 Akira TAGOH <tagoh at redhat.com> 1.09a-11
+- rebuild.
+
+* Fri Apr 18 2003 Akira TAGOH <tagoh at redhat.com> 1.09a-10
+- magicpoint-1.09a-rpath.patch: don't specify -rpath. (#65966)
+- magicpoint-1.09a-fix-gcc-warnings.patch: applied to fix gcc warnings. (#79642)
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 1.09a-8
+- add VFlib2-conf-ja >=2.25.6-8 as a requirement to fix bug 74105
+
+* Wed Nov 20 2002 Tim Powers <timp at redhat.com>
+- rebuild on all arches
+
+* Tue Jun 25 2002 Owen Taylor <otaylor at redhat.com>
+- Remove extraneous ttfonts dependency; VFlib already has that dependency
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon May 27 2002 Yukihiro Nakai <ynakai at redhat.com>
+- Remove .cvsignore file(#65241)
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Mar 26 2002 Yukihiro Nakai <ynakai at redhat.com>
+- Update to 1.09a
+
+* Tue Mar  5 2002 Jeremy Katz <katzj at redhat.com>
+- Add ttfonts to Requires (#24868)
+- rebuild in new environment
+
+* Thu Jan 31 2002 Bill Nottingham <notting at redhat.com>
+- rebuild in new environment
+
+* Wed Sep 05 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Add magicpoint to Obsoletes.
+
+* Tue Sep 04 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Add --enable-gif
+- Add watanabe-vf to Requires.
+
+* Wed Jul 18 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Delete require ttfont-ja
+
+* Mon Jul  9 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Rebuild against RHL7.2
+- Rename to MagicPoint
+- Update to 1.08a
+- Enable vflib
+
+* Wed Jan 24 2001 Tim Powers <timp at redhat.com>
+- fixed bug 24868
+
+* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
+- disable vflib to fix bug #15607
+
+* Wed Aug 2 2000 Tim Powers <timp at redhat.com>
+- rebuilt against libpng-1.0.8
+
+* Mon Jul 24 2000 Prospector <prospector at redhat.com>
+- rebuilt
+
+* Thu Jul 13 2000 Nalin Dahyabhai <nalin at redhat.com>
+- stop disabling freetype support
+
+* Mon Jul 10 2000 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Mon Jul 03 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Wed May 24 2000 Tim Powers <timp at redhat.com>
+- updated to 1.07a
+- cleaned up files list
+- using %%configure
+- fixed to use XFree86 4.0
+
+* Mon Jul 19 1999 Tim Powers <timp at redhat.com>
+- updated source to 1.05a 
+- built for 6.1
+
+* Thu Apr 15 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+
+* Fri Oct 08 1998 Michael Maher <mike at redhat.com> 
+- updated source to 1.04a
+- built for 5.2
+
+* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
+- built for PowerTools


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: MagicPoint
+# $Id$
+NAME := MagicPoint
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

magicpoint-1.09a-rpath.patch:

Index: magicpoint-1.09a-rpath.patch
===================================================================
RCS file: magicpoint-1.09a-rpath.patch
diff -N magicpoint-1.09a-rpath.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.09a-rpath.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,23 @@
+diff -ruN magicpoint-1.09a.orig/configure.in magicpoint-1.09a/configure.in
+--- magicpoint-1.09a.orig/configure.in	2003-04-18 16:49:30.000000000 +0900
++++ magicpoint-1.09a/configure.in	2003-04-18 17:14:12.000000000 +0900
+@@ -277,7 +277,7 @@
+ 		LIBS="$LIBS -L$i/lib"
+ 		OPTFLAGS="$OPTFLAGS -I$i/include"
+ 		AC_CHECK_LIB(mng, mng_initialize, 
+-			[LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
++			[LIBS="$LIBS -lmng"
+ 			 AC_DEFINE(MNG)], 
+ 		[AC_CHECK_LIB(mng, mng_readdisplay,
+ 			[LIBS="$LIBS -lmng -ljpeg"
+--- magicpoint-1.11b/configure~	2006-10-07 17:31:51.000000000 +0200
++++ magicpoint-1.11b/configure	2006-10-07 17:31:51.000000000 +0200
+@@ -4831,7 +4831,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_mng_mng_initialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_mng_mng_initialize" >&6
+ if test $ac_cv_lib_mng_mng_initialize = yes; then
+-  LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
++  LIBS="$LIBS -lmng"
+ 			 cat >>confdefs.h <<\_ACEOF
+ #define MNG 1
+ _ACEOF

magicpoint-1.10a-fix-gcc34.patch:

Index: magicpoint-1.10a-fix-gcc34.patch
===================================================================
RCS file: magicpoint-1.10a-fix-gcc34.patch
diff -N magicpoint-1.10a-fix-gcc34.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.10a-fix-gcc34.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,51 @@
+diff -ruN magicpoint-1.10a.orig/contrib/xwintoppm/dsimple.c magicpoint-1.10a/contrib/xwintoppm/dsimple.c
+--- magicpoint-1.10a.orig/contrib/xwintoppm/dsimple.c	2004-06-21 22:05:39.870925000 +0900
++++ magicpoint-1.10a/contrib/xwintoppm/dsimple.c	2004-06-21 22:05:32.567891488 +0900
+@@ -35,6 +35,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <stdio.h>
++#include <stdarg.h>
+ /*
+  * Other_stuff.h: Definitions of routines in other_stuff.
+  *
+@@ -55,6 +56,7 @@
+ void blip();
+ Window Window_With_Name();
+ void Fatal_Error();
++void outl(char *msg, ...);
+ 
+ /*
+  * Just_display: A group of routines designed to make the writting of simple
+@@ -496,12 +498,16 @@
+  */
+ /* VARARGS1 */
+ void
+-outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
+-     char *msg;
+-     char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
++outl(char *msg, ...)
+ {
++	va_list args;
++
+ 	fflush(stdout);
+-	fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
++
++	va_start(args, msg);
++	vfprintf(stderr, msg, args);
++	va_end(args);
++
+ 	fprintf(stderr, "\n");
+ 	fflush(stderr);
+ }
+diff -ruN magicpoint-1.10a.orig/contrib/xwintoppm/xwintoppm.c magicpoint-1.10a/contrib/xwintoppm/xwintoppm.c
+--- magicpoint-1.10a.orig/contrib/xwintoppm/xwintoppm.c	2004-06-21 22:05:39.871924000 +0900
++++ magicpoint-1.10a/contrib/xwintoppm/xwintoppm.c	2004-06-21 22:05:32.568891356 +0900
+@@ -138,6 +138,7 @@
+ 
+ extern int (*_XErrorFunction)();
+ extern int _XDefaultError();
++void Window_Dump(Window window, FILE *out);
+ 
+ static long parse_long (s)
+     char *s;

magicpoint-1.10a-fix-usleep.patch:

Index: magicpoint-1.10a-fix-usleep.patch
===================================================================
RCS file: magicpoint-1.10a-fix-usleep.patch
diff -N magicpoint-1.10a-fix-usleep.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.10a-fix-usleep.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,11 @@
+diff -ruN magicpoint-1.10a.orig/image/Imakefile.in magicpoint-1.10a/image/Imakefile.in
+--- magicpoint-1.10a.orig/image/Imakefile.in	2001-01-18 18:07:14.000000000 +0900
++++ magicpoint-1.10a/image/Imakefile.in	2004-02-09 11:10:02.127523603 +0900
+@@ -32,6 +32,7 @@
+ SpecialObjectRule(imagetypes.o,imagetypes.c,$(DEFS))
+ #SpecialObjectRule(png.o,png.c,$(DEFS) $(OPTFLAGS))
+ SpecialObjectRule(imlib_loader.o,imlib_loader.c,$(DEFS))
++SpecialObjectRule(send.o,send.c,$(DEFS) $(OPTFLAGS))
+ 
+ #ifndef NullParameter
+ #define  NullParameter 

magicpoint-1.10a-longline.patch:

Index: magicpoint-1.10a-longline.patch
===================================================================
RCS file: magicpoint-1.10a-longline.patch
diff -N magicpoint-1.10a-longline.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.10a-longline.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,63 @@
+diff -ruN magicpoint-1.10a.orig/draw.c magicpoint-1.10a/draw.c
+--- magicpoint-1.10a.orig/draw.c	2003-05-14 16:45:35.000000000 +0900
++++ magicpoint-1.10a/draw.c	2003-08-20 19:02:19.000000000 +0900
+@@ -4504,6 +4504,7 @@
+ 	char buf16[1024], *p16;
+ 	char out16[1024], *o16;
+ 	int ileft, oleft;
++	int forcefolding = 0;
+ #ifdef HAVE_ICONV
+ 	static iconv_t icv[3];
+ #endif
+@@ -4569,6 +4570,29 @@
+ 		if (isspace(*(p + len -1))) {
+ 		    XftTextExtents8(display, xft_font, (XftChar8 *)p, len -1, &extents);
+ 			if (state->width - state->leftfillpos / 2 - state->linewidth >= extents.xOff) goto nofolding;
++		} else {
++			/* the specified line might be too long. enforce to split the line in order to avoid the freeze. */
++			wchar_t *wcstr;
++			char *mbstr;
++			int wclength, mblength, i;
++
++			/* converting the strings to wchar to handle the multibyte characters correctly */
++			wcstr = (wchar_t *) malloc (sizeof (wchar_t) * (strlen (p) + 1));
++			wclength = mbstowcs (wcstr, p, len);
++			for (i = wclength - 1; i >= 1; i--) {
++				mbstr = (char *) malloc (sizeof (char) * (i + 1));
++				mblength = wcstombs (mbstr, wcstr, i);
++				XftTextExtents8 (display, xft_font, (XftChar8 *)p, mblength, &extents);
++				if (state->width - state->leftfillpos / 2 - state->linewidth < extents.xOff) {
++					free (mbstr);
++					free (wcstr);
++					len = mblength;
++					forcefolding = 1;
++					goto nofolding;
++				}
++				free (mbstr);
++			}
++			free (wcstr);
+ 		}
+ 
+ 		draw_line_end(state); 
+@@ -4588,9 +4612,20 @@
+ 	if (obj_new_xftfont(state, state->linewidth, 0, p, len, 
+ 				fontname, registry, char_size[caching], charset16, xft_font)){
+ 		state->linewidth += extents.xOff;
++		if (forcefolding == 1) {
++			draw_line_end (state);
++			draw_line_start (state);
++			state->linewidth = state->leftfillpos;
++		}
+ 		return p + len;
+-	} else
++	} else {
++		if (forcefolding == 1) {
++			draw_line_end (state);
++			draw_line_start (state);
++			state->linewidth = state->leftfillpos;
++		}
+ 		return NULL; 
++	}
+ }
+ static int
+ obj_new_xftfont(state, x, y, p, len, fontname, registry, size, charset16, xft_font)

magicpoint-1.11a-fix-gcc-warnings.patch:

Index: magicpoint-1.11a-fix-gcc-warnings.patch
===================================================================
RCS file: magicpoint-1.11a-fix-gcc-warnings.patch
diff -N magicpoint-1.11a-fix-gcc-warnings.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ magicpoint-1.11a-fix-gcc-warnings.patch	21 Oct 2006 14:39:38 -0000	1.3
@@ -0,0 +1,98 @@
+diff -ruN magicpoint-1.11a.orig/contrib/xwintoppm/dsimple.c magicpoint-1.11a/contrib/xwintoppm/dsimple.c
+--- magicpoint-1.11a.orig/contrib/xwintoppm/dsimple.c	1998-02-13 16:48:29.000000000 +0900
++++ magicpoint-1.11a/contrib/xwintoppm/dsimple.c	2004-09-15 21:09:10.000000000 +0900
+@@ -495,6 +495,7 @@
+  *       printf with up to 7 arguments.
+  */
+ /* VARARGS1 */
++void
+ outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
+      char *msg;
+      char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+diff -ruN magicpoint-1.11a.orig/contrib/xwintoppm/xwintoppm.c magicpoint-1.11a/contrib/xwintoppm/xwintoppm.c
+--- magicpoint-1.11a.orig/contrib/xwintoppm/xwintoppm.c	1998-08-26 14:30:16.000000000 +0900
++++ magicpoint-1.11a/contrib/xwintoppm/xwintoppm.c	2004-09-15 21:09:10.000000000 +0900
+@@ -281,6 +281,7 @@
+  *              writting.
+  */
+ 
++void
+ Window_Dump(window, out)
+      Window window;
+      FILE *out;
+@@ -716,9 +717,9 @@
+     return ncolors ;
+ }
+ 
+-_swapshort (bp, n)
+-    register char *bp;
+-    register unsigned n;
++void
++_swapshort (register char *bp,
++	    register unsigned n)
+ {
+     register char c;
+     register char *ep = bp + n;
+@@ -731,9 +732,9 @@
+     }
+ }
+ 
+-_swaplong (bp, n)
+-    register char *bp;
+-    register unsigned n;
++void
++_swaplong (register char *bp,
++	   register unsigned  n)
+ {
+     register char c;
+     register char *ep = bp + n;
+diff -ruN magicpoint-1.11a.orig/image/gif.c magicpoint-1.11a/image/gif.c
+--- magicpoint-1.11a.orig/image/gif.c	2000-03-07 15:59:56.000000000 +0900
++++ magicpoint-1.11a/image/gif.c	2004-09-15 21:09:11.000000000 +0900
+@@ -103,7 +103,7 @@
+ 			if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth ||
+ 			   GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) {
+ 				fprintf(stderr,
+-"Image %d is not confined to screen dimension, aborted.\n");
++"Image %d is not confined to screen dimension, aborted.\n", GifFile->ImageCount);
+ 				exit(-2);
+ 			}
+ 			if (GifFile->Image.Interlace) {
+@@ -200,8 +200,8 @@
+ 	if (gifp == NULL)
+ 		ret = 0;
+ 	else {
++		tellAboutImage(name, gifp);
+ 		DGifCloseFile(gifp);
+-		tellAboutImage(name);
+ 		ret = 1;
+ 	}
+ 	return ret;
+diff -ruN magicpoint-1.11a.orig/image/pbm.c magicpoint-1.11a/image/pbm.c
+--- magicpoint-1.11a.orig/image/pbm.c	1998-12-28 17:23:14.000000000 +0900
++++ magicpoint-1.11a/image/pbm.c	2004-09-15 21:05:27.000000000 +0900
+@@ -359,8 +359,10 @@
+        */
+ 
+       destptr = image->data;
+-      for (y = 0; y < size; y++)
+-	*(destptr++) = PM_SCALE(*destptr, maxval, 0xff);
++      for (y = 0; y < size; y++) {
++	*destptr = PM_SCALE(*destptr, maxval, 0xff);
++	destptr++;
++      }
+       break;
+ 
+     case ITRUE:
+diff -ruN magicpoint-1.11a.orig/image/png.c magicpoint-1.11a/image/png.c
+--- magicpoint-1.11a.orig/image/png.c	2001-04-11 17:37:00.000000000 +0900
++++ magicpoint-1.11a/image/png.c	2004-09-15 21:09:11.000000000 +0900
+@@ -44,7 +44,7 @@
+ #define PNG_CHECK_BYTES 4
+ 
+ int 
+-pngIdent(char *fullname, char *name) {}
++pngIdent(char *fullname, char *name) {return 0;}
+     
+ Image *
+ pngLoad(fullname, name, verbose)

magicpoint-1.11b-64bit.patch:

--- NEW FILE magicpoint-1.11b-64bit.patch ---
--- magicpoint-1.11b/draw.c.64bit	2006-10-21 13:29:24.000000000 +0200
+++ magicpoint-1.11b/draw.c	2006-10-21 13:27:28.000000000 +0200
@@ -4884,8 +4884,8 @@
 	char *registry;
 {
 	char *xfont;
-	static XftFont *last_xftfont;
-	static char lastfont[100];
+	static XftFont *last_xftfont = NULL;
+	static char lastfont[100] = "";
 	static int lastsize = 0;
 	XftFont *xftfont;
 	char *p, *p2;
@@ -4934,12 +4934,12 @@
 		    XFT_FAMILY, XftTypeString, font,
 		    XFT_ENCODING, XftTypeString, registry,
 		    XFT_STYLE, XftTypeString, style,
-		    XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
+		    XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL);
 	} else {
 		xftfont = XftFontOpen(display, screen,
 		    XFT_FAMILY, XftTypeString, font,
 		    XFT_ENCODING, XftTypeString, registry,
-		    XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
+		    XFT_PIXEL_SIZE, XftTypeDouble, (double)csize, NULL);
 	}
 	if (xftfont == 0) {
 		free(xfont);
@@ -4950,6 +4950,9 @@
 		fprintf(stderr, "using xftfont [%s] size: %d\n", lastfont,
 		    csize);
 	}
+	if (last_xftfont)
+		XftFontClose(display, last_xftfont);
+	
 	lastsize = csize;
 	last_xftfont = xftfont;
 	free(xfont);

magicpoint-1.11b-debian.patch:

--- NEW FILE magicpoint-1.11b-debian.patch ---
--- mgp-1.11b.orig/contrib/mgp2html.pl.in
+++ mgp-1.11b/contrib/mgp2html.pl.in
@@ -79,10 +79,18 @@
 
 &prologue;
 while (<>) {
-	s/\n$//;
+	s/[\n\r]*$//; # trim CR and LF
+	s/</&lt;/g; # escape < as &lt;
 
 	$_ = '' if (/^#/o);
 
+	# multiline processing (lines ending with '\')
+	while ((/\\$/) && (not eof())) {
+		$_=substr($_,0,-1); # cuts last char (should be '\')
+		$_=$_.<>; # concatenate next line
+		s/[\n\r]*$//; # trim CR and LF
+	}
+
 	if ($_ eq '' || $_ =~ /^[^%]/) {
 		$line++;
 		$cont = 0 if ($cont == 2);
@@ -103,6 +111,8 @@
 		next;
 	}
 
+        $cont = 0 if ($cont == 2);
+        $cont = 2 if ($cont == 1);
 	&cmds($_);
 }
 &pageepilogue;
@@ -152,14 +162,15 @@
 			if (!$doimage) {
 				# don't use images
 			} elsif (scalar(@dir) == 2 || scalar(@dir) == 3) {
-				print "<IMG SRC=\"$dir[1]\" ALT=\"$dir[1]\">\n";
+				&output("<IMG SRC=\"$dir[1]\" ALT=\"$dir[1]\">\n");
 			} elsif (scalar(@dir) == 4) {
 				# interpretation wrong
-				print "<IMG SRC=\"$dir[1]\" WIDTH=$dir[3]% HEIGHT=$dir[3]% ALT=\"$dir[1]\">\n";
+				&output("<IMG SRC=\"$dir[1]\" WIDTH=$dir[3]% HEIGHT=$dir[3]% ALT=\"$dir[1]\">\n");
 			} elsif (scalar(@dir) >= 5) {
 				# interpretation wrong
-				print "<IMG SRC=\"$dir[1]\" WIDTH=$dir[3]% HEIGHT=$dir[4]% ALT=\"$dir[1]\">\n";
+				&output("<IMG SRC=\"$dir[1]\" WIDTH=$dir[3]% HEIGHT=$dir[4]% ALT=\"$dir[1]\">\n");
 			}
+			$endline = "<BR>\n";
 		} elsif ($dir[0] eq 'nodefault') {
 			$nodefault++;
 		} elsif ($dir[0] =~ /^(left|leftfill|right|center)$/) {
--- mgp-1.11b.orig/contrib/mgpnet.in
+++ mgp-1.11b/contrib/mgpnet.in
@@ -32,7 +32,7 @@
 
 # configurations
 $tmpdir = '/tmp';
-$httpdatestr = "date '+\%a, \%d \%b \%Y \%H:\%M:\%S \%Z'";
+$httpdatestr = "env LC_ALL=C date '+\%a, \%d \%b \%Y \%H:\%M:\%S \%Z'";
 $seltimeout = 1;
 $refreshtimeout = 10;
 $debug = 0;
@@ -53,6 +53,7 @@
 		} while ($hostname =~ /^127\./);
 		close(IN);
 	};
+	$hostname =~ s/^addr://; # for GNU/Linux, by ukai
 	print "http://$hostname:$port/\n";
 	exit 0;
 }
@@ -150,19 +151,19 @@
 	vec($rin, fileno(S), 1) = 1;
 	vec($win, fileno(S), 1) = 1;
 	$ewin = $rin | $win;
-	print STDERR "waiting for connetion...\n" if ($debug);
+	print STDERR "waiting for connection...\n" if ($debug);
 	($nfound, $timeleft) = 
 		select($rout = $rin, $wout = $win, $eout = $ein, $seltimeout);
 	next if ($nfound <= 0);
 	if (vec($rout, fileno(S), 1)) {
-		print STDERR "accepting connetion...\n" if ($debug);
+		print STDERR "accepting connection...\n" if ($debug);
 		accept(NS, S) || do {
 			print STDERR "server: accept fail\n" if ($debug);
 			next;
 		};
 
 		$acceptstat++;
-		print STDERR "connetion accepted...\n" if ($debug);
+		print STDERR "connection accepted...\n" if ($debug);
 
 		$pid = fork;
 		if ($pid < 0) {
@@ -185,7 +186,7 @@
 	}
 }
 print STDERR "leaving MagicPoint Netserver...\n";
-print STDERR "accepted $acceptstat connetions so far.\n";
+print STDERR "accepted $acceptstat connections so far.\n";
 close(NS);
 close(S);
 unlink($imagefile);
@@ -256,7 +257,7 @@
 	$httpmethod = $httppath = $httpver = '';
 	($httpmethod, $httppath, $httpver) = split(/\s+/, $httpreq);
 	$httppath =~ s/http:\/\/[^:\/]+(:\d+)\//\//;
-	if ($httpver eq '' || $httpver eq 'HTTP/1.0') {
+	if ($httpver eq '' || $httpver =~ m'HTTP/1.[01]') {
 		;	# ok
 	} else {
 		&httpheader(501, $cthtml) if ($httpver);
@@ -350,7 +351,7 @@
 <HEAD><TITLE>File Not found</TITLE></HEAD>
 <BODY><H1>File Not found</H1>
 The requested URL $httppath was not found on this server.<P>
-Looks like a mitake in configuration.
+Looks like a mistake in configuration.
 Contact the administrator.<P>
 </BODY>
 EOF
@@ -415,7 +416,7 @@
 'XXX4', 'SO_REUSEPORT',	'XXX5', 'SOCK_STREAM',	'XXX6', 'WNOHANG',
 );
 	$tmpnam = &tmpname;
-	open(CPP, "| @CPP@ >$tmpnam") || return;
+	open(CPP, "| @CPP@ - >$tmpnam") || return;
 	print CPP "#include <sys/socket.h>\n";
 	print CPP "#include <sys/wait.h>\n";
 	foreach $tmp (keys %varnames) {
@@ -439,12 +440,19 @@
 		$havesinlen = 0; $sockaddr = 'S n a4 x8';
 	}
 
+	use Socket;
 	foreach $i (keys %varnames) {
 		if (@tmp2 = grep($_ =~ /^$i/, @tmp1)) {
 			$tmp = (split(/\s+/, @tmp2[0]))[1];
 			$tmp = oct($tmp) if ($tmp =~ /^0/);
-			next if ($tmp !~ /^[0-9]+$/);
-			eval "\$$varnames{$i} = \$tmp;";
+			if ($tmp =~ /^[0-9]+$/) {
+			    eval "\$$varnames{$i} = \$tmp;";
+			} else {
+			    # some constant defined by enum, so we can not
+			    # always use cpp as above. I believe use Socket
+			    # is more reliable in these days.
+			    eval "\$$varnames{$i} = &$varnames{$i};";
+			}
 		}
 	}
 }
--- mgp-1.11b.orig/README.lang
+++ mgp-1.11b/README.lang
@@ -16,6 +16,9 @@
 
 	%charset "iso8859-1"
 
+Note that this directive can be used after %page directive, that is,
+you can't use %charset directive in preamble.
+
 In the future, we will add more encodings to charset directive, like
 "iso2022-jp", or "euc-jp"
 
--- mgp-1.11b.orig/mgpembed.pl.in
+++ mgp-1.11b/mgpembed.pl.in
@@ -85,12 +85,20 @@
 			print OUT;
 			next;
 		}
-		if (/^%(.*)image\s+/i) {
-			$prefix = $1; $postfix = $';
-			if ($postfix =~ /\"([^"]*)\"/) { 
-                # "]*)\"/) { # (workaround for bug in Emacs Perl-syntax)
+		if (/^%(.*)image\s+([^,]+)/i) {
+			$a = $1; $fname0 = $fname = $2; $b = $';
+			if ($a =~ /new$/) {
+			    if ($fname =~ /\"([^"]*)\"$/) {
 				$fname = $1;
-			} elsif ($b =~ /^(\S+)/) {
+			    }
+			} else {
+			    if ($fname =~ /\s.*/) {
+				$b = $' . $b;
+			    }
+			}
+			if ($fname =~ /^\"([^"]*)\"/) {
+				$fname = $1;
+			} elsif ($fname =~ /^(\S+)/) {
 				$fname = $1;
 			}
 			$base = $fname;
@@ -106,10 +114,11 @@
 			}
 			$files{$base} = $fname;
 			$embfn = "EMBEDDIR/" . $base;
-			$postfix =~ s/\"$fname\"/\"$embfn\"/;
+			$fname0 =~ s/$fname/$embfn/;
 			print OUT '%';
-			print OUT "$prefix";
-			print OUT "image $postfix";
+			print OUT "$a";
+			print OUT "image $fname0";
+			print OUT "$b";
 		} elsif (/^%(.*)include\s+(\S+)(.*)$/i) {
 			$incfname = $2;
 			if ($incfname =~ /^\"(.+)\"$/) {
--- mgp-1.11b.orig/parse.c
+++ mgp-1.11b/parse.c
@@ -782,6 +782,10 @@
 				}
 			}
 		} else {
+#if 1 /* escape % by backslash */
+			if (buf[0] == 0x5c)
+				memcpy(&buf[0], &buf[1], strlen(buf));
+#endif
 			/* this is data */
 
 			/*
@@ -1091,6 +1099,7 @@
 				case CTL_TMFONT: tmpstr[4] = cp; break;
 #endif
 				case CTL_XFONT2:
+					define_font (cp);
 					if (strcmp(cp->ctc2_value2,
 							"iso8859-1") == 0) {
 						tmpstr[2] = cp;
@@ -1913,7 +1922,7 @@
 	int i;
 
 	/* find duplicated def */
-	for (i = 0; i < MAXFONTDEF; i++) {
+	for (i = 0; cp->ct_op != CTL_XFONT2 && i < MAXFONTDEF; i++) {
 		if (!fontdef_control[i])
 			continue;
 		if (strcmp(fontdef_control[i]->ctc_value,
@@ -1949,8 +1958,10 @@
 	for (i = 0; i < MAXFONTDEF; i++) {
 		if (!fontdef_control[i])
 			continue;
-		if (strcmp(fontdef_control[i]->ctc_value, font) == 0)
+		if (fontdef_control[i]->ct_op != CTL_XFONT2
+		    && strcmp(fontdef_control[i]->ctc_value, font) == 0) {
 			return fontdef_control[i];
+		}
 	}
 	return NULL;
 }
--- mgp-1.11b.orig/sample/sample-fr.mgp
+++ mgp-1.11b/sample/sample-fr.mgp
@@ -182,6 +182,8 @@
 this is test
 %endfilter
 
+	Pour voir cette feature (et les 2 slides prochains) il faut utiliser -U parce que c'est dangereux.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 
--- mgp-1.11b.orig/sample/sample-jp.mgp
+++ mgp-1.11b/sample/sample-jp.mgp
@@ -312,6 +312,9 @@
 %filter "rev"
 this is test
 %endfilter
+
+	$B$3$N%U%#!<%A%c!<$O4m$$$G$9$+$i(B -U $B$,I,MW$G$9!J<!$N#2%9%i%$%I$b!K(B
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 
--- mgp-1.11b.orig/sample/sample.mgp
+++ mgp-1.11b/sample/sample.mgp
@@ -229,6 +229,8 @@
 this is test
 %endfilter
 
+	Note the -U command line option is required to make this (un-secure) feature and the next two slides work.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 %bgrad 0 0 256 0 0 "white" "blue"

magicpoint-1.11b-embed.patch:

--- NEW FILE magicpoint-1.11b-embed.patch ---
--- magicpoint-1.11b/draw.c~	2006-10-21 15:48:48.000000000 +0200
+++ magicpoint-1.11b/draw.c	2006-10-21 15:48:48.000000000 +0200
@@ -3750,7 +3750,7 @@
 		target = parent;
 	}
 	XReparentWindow(display, child_window, window, x, y);
-#if 0
+#if 1
 	XDestroyWindow(display, target);
 #endif
 }


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Oct 2006 14:39:38 -0000	1.4
@@ -0,0 +1 @@
+2b627f17443842eb5009304864577a4c  magicpoint-1.11b.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 17:01:37 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:01:37 -0700
Subject: rpms/vkeybd - New directory
Message-ID: <200610211701.k9LH1bbF028210@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206/vkeybd

Log Message:
Directory /cvs/extras/rpms/vkeybd added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 17:01:42 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:01:42 -0700
Subject: rpms/vkeybd/devel - New directory
Message-ID: <200610211701.k9LH1gq2028226@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206/vkeybd/devel

Log Message:
Directory /cvs/extras/rpms/vkeybd/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 17:02:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:02:34 -0700
Subject: rpms/vkeybd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610211702.k9LH2YnT028266@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28258

Added Files:
	Makefile import.log 
Log Message:
Setup of module vkeybd


--- NEW FILE Makefile ---
# Top level Makefile for module vkeybd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 21 17:02:37 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:02:37 -0700
Subject: rpms/vkeybd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610211702.k9LH2bxi028282@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28258/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vkeybd


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 21 17:05:31 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:05:31 -0700
Subject: rpms/vkeybd import.log,1.1,1.2
Message-ID: <200610211705.k9LH5Vhv028408@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28353

Modified Files:
	import.log 
Log Message:
auto-import vkeybd-0.1.17a-1 on branch devel from vkeybd-0.1.17a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vkeybd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Oct 2006 17:02:34 -0000	1.1
+++ import.log	21 Oct 2006 17:05:01 -0000	1.2
@@ -0,0 +1 @@
+vkeybd-0_1_17a-1:HEAD:vkeybd-0.1.17a-1.src.rpm:1161450293



From fedora-extras-commits at redhat.com  Sat Oct 21 17:05:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:05:34 -0700
Subject: rpms/vkeybd/devel vkeybd-CFLAGS.patch, NONE, 1.1 vkeybd-lash-2.patch,
	NONE, 1.1 vkeybd-lash.patch, NONE, 1.1 vkeybd.desktop, NONE,
	1.1 vkeybd.png, NONE, 1.1 vkeybd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610211705.k9LH5Y2M028413@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/vkeybd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28353/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vkeybd-CFLAGS.patch vkeybd-lash-2.patch vkeybd-lash.patch 
	vkeybd.desktop vkeybd.png vkeybd.spec 
Log Message:
auto-import vkeybd-0.1.17a-1 on branch devel from vkeybd-0.1.17a-1.src.rpm

vkeybd-CFLAGS.patch:

--- NEW FILE vkeybd-CFLAGS.patch ---
--- Makefile.orig	2006-04-25 11:28:38.000000000 -0400
+++ Makefile	2006-04-25 11:31:19.000000000 -0400
@@ -84,7 +84,7 @@
 
 VKB_TCLFILE = $(VKBLIB_DIR)/vkeybd.tcl
 
-CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
+CFLAGS = -Wall $(RPM_OPT_FLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
 	-DVERSION_STR=\"$(VERSION)\"\
 	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)

vkeybd-lash-2.patch:

--- NEW FILE vkeybd-lash-2.patch ---
--- README~	2006-09-25 09:00:12.000000000 -0700
+++ README	2006-09-25 09:08:53.000000000 -0700
@@ -46,8 +46,8 @@
       To disable a device, set the value 0.  Do not undefine it.
       At least one of them must have non-zero value.
 
-  - USE_LADCCA
-      Supports LADCCA (http://pkl.net/~node/software/)
+  - USE_LASH
+      Supports LASH (http://www.nongnu.org/lash/)
       Set 1 to add the this support.
 
   - TCLLIB
@@ -106,7 +106,7 @@
 	device port.  This options makes vkeybd possible to "fake"
 	as a real MIDI device.
   --lash bool
-	Specify the support of LADCCA.  Give yes or no as the
+	Specify the support of LASH.  Give yes or no as the
 	argument.  The default value is no.
 
 OSS Sequencer Device Option:

vkeybd-lash.patch:

--- NEW FILE vkeybd-lash.patch ---
--- Makefile~	2006-04-25 07:00:14.000000000 -0400
+++ Makefile	2006-04-25 07:00:36.000000000 -0400
@@ -30,7 +30,7 @@
 USE_AWE = 1
 USE_MIDI = 1
 USE_ALSA = 1
-USE_LADCCA = 0
+USE_LASH = 0
 
 #
 # Tcl/Tk library -- depends on your distribution
@@ -68,14 +68,14 @@
 endif
 
 #
-# LADCCA stuff
+# LASH stuff
 #
-ifeq (1,$(USE_LADCCA))
-LADCCACFLAGS = $(shell pkg-config --cflags ladcca-1.0) \
-	       $(shell pkg-config --exists ladcca-1.0 && echo "-DHAVE_LADCCA" )
-LADCCALIBS   = $(shell pkg-config --libs ladcca-1.0)
-DEVICES += $(LADCCACFLAGS)
-EXTRALIB += $(LADCCALIBS)
+ifeq (1,$(USE_LASH))
+LASHCFLAGS = $(shell pkg-config --cflags lash-1.0) \
+	       $(shell pkg-config --exists lash-1.0 && echo "-DHAVE_LASH" )
+LASHLIBS   = $(shell pkg-config --libs lash-1.0)
+DEVICES += $(LASHCFLAGS)
+EXTRALIB += $(LASHLIBS)
 endif
 
 #----------------------------------------------------------------
@@ -87,7 +87,7 @@
 CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
 	-DVERSION_STR=\"$(VERSION)\"\
-	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LADCCACFLAGS)
+	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)
 
 TARGETS = vkeybd sftovkb
 
--- oper_alsa.c~	2006-04-25 06:59:53.000000000 -0400
+++ oper_alsa.c	2006-04-25 07:00:36.000000000 -0400
@@ -79,7 +79,7 @@
 	{"addr", "subscriber", "--addr client:port or 'subscriber' : ALSA sequencer destination"},
 	{"name", DEFAULT_NAME, "--name string : use the specified string as client/port names"},
 #ifdef HAVE_LADCCA	
-	{"ladcca", "no", "--ladcca <yes|no> : support LADCCA (default = no)"},
+	{"lash", "no", "--lash <yes|no> : support LASH (default = no)"},
 #endif
 	{NULL},
 };
@@ -100,7 +100,7 @@
 static int seq_client, seq_port;
 static int chan_no;
 
-#ifdef HAVE_LADCCA	
+#ifdef HAVE_LASH	
 static cca_client_t * cca_client = NULL;
 #endif
 
@@ -156,9 +156,9 @@
 	/* get my client id */
 	my_client = snd_seq_client_id(seq_handle);
 	
-	/* tell the ladcca server our client id */
-#ifdef HAVE_LADCCA
-	if ((var = Tcl_GetVar2(ip, "optvar", "ladcca", TCL_GLOBAL_ONLY)) != NULL) {
+	/* tell the lash server our client id */
+#ifdef HAVE_LASH
+	if ((var = Tcl_GetVar2(ip, "optvar", "lash", TCL_GLOBAL_ONLY)) != NULL) {
 		if (*var == 'y' || *var == 'Y' || *var == '1') {
 			cca_client = cca_init (cca_args,
 					       "vkeybd",
@@ -174,7 +174,7 @@
 			}
 		}
 	}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
  
 	/* set client info */
 	if ((var = Tcl_GetVar2(ip, "optvar", "name", TCL_GLOBAL_ONLY)) != NULL)
@@ -203,7 +203,7 @@
 	if (seq_client != SND_SEQ_ADDRESS_SUBSCRIBERS) {
 		/* subscribe to MIDI port */
 		if (
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
 		    !cca_enabled (cca_client) &&
 #endif
 		    snd_seq_connect_to(seq_handle, my_port, seq_client, seq_port) < 0) {
--- README~	2006-04-25 06:59:57.000000000 -0400
+++ README	2006-04-25 07:00:36.000000000 -0400
@@ -105,7 +105,7 @@
 	tk707 check the client/port name whether it is a valid MIDI
 	device port.  This options makes vkeybd possible to "fake"
 	as a real MIDI device.
-  --ladcca bool
+  --lash bool
 	Specify the support of LADCCA.  Give yes or no as the
 	argument.  The default value is no.
 
--- vkb.c~	2006-04-25 07:00:21.000000000 -0400
+++ vkb.c	2006-04-25 07:00:37.000000000 -0400
@@ -65,7 +65,7 @@
 static vkb_oper_t *oper;
 
 #ifdef HAVE_LADCCA	
-cca_args_t * cca_args = NULL;
+lash_args_t * lash_args = NULL;
 #endif
  
 /*
@@ -78,7 +78,7 @@
 	int c, nargc;
 
 #ifdef HAVE_LADCCA	
-	cca_args = cca_extract_args(&argc, &argv);
+	lash_args = lash_extract_args(&argc, &argv);
 #endif /* HAVE_LADCCA */
 
 	nargc = argc + 1;
--- vkb.h~	2006-04-25 07:00:29.000000000 -0400
+++ vkb.h	2006-04-25 07:00:37.000000000 -0400
@@ -24,7 +24,7 @@
 #include <tcl.h>
 
 #ifdef HAVE_LADCCA
-#include <ladcca/ladcca.h>
+#include <lash/lash.h>
 #endif
 
 #ifndef VKB_TCLFILE


--- NEW FILE vkeybd.desktop ---
[Desktop Entry]
Name=Vkeybd
Comment=Virtual MIDI keyboard
Icon=vkeybd.png
Exec=vkeybd
Terminal=false
StartupWMClass=vkeybd.tcl
Type=Application
Categories=Application;AudioVideo;
Encoding=UTF-8


--- NEW FILE vkeybd.spec ---
Summary:      Virtual MIDI keyboard
Name:         vkeybd
Version:      0.1.17a
Release:      1%{?dist}
License:      GPL
Group:        Applications/Multimedia
URL:          http://www.alsa-project.org/~iwai/alsa.html
Source0:      http://www.alsa-project.org/~iwai/vkeybd-0.1.17a.tar.bz2
Source1:      vkeybd.png
Source2:      vkeybd.desktop
Patch0:       vkeybd-lash.patch
Patch1:       vkeybd-CFLAGS.patch
Patch2:       vkeybd-lash-2.patch
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: tk-devel >= 8.4, tk-devel < 8.5
BuildRequires: lash-devel

BuildRequires: desktop-file-utils

Requires: tk >= 8.4, tk < 8.5, lash
Requires: hicolor-icon-theme

%description
This is a virtual keyboard for AWE, MIDI and ALSA drivers.
It's a simple fake of a MIDI keyboard on X-windows system.
Enjoy a music with your mouse and "computer" keyboard :-)

%prep
%setup -q -n vkeybd
%patch0 -p0
%patch1 -p0
%patch2 -p0

%build
make %{?_smp_mflags} USE_LADCCA=1 TCL_VERSION=8.4 PREFIX=%{_prefix}

%install
rm -rf $RPM_BUILD_ROOT
make USE_LADCCA=1 PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install
make USE_LADCCA=1 PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install-man
chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/*
chmod 755 $RPM_BUILD_ROOT/%{_datadir}/vkeybd/vkeybd.tcl

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/vkeybd.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE2}

%clean
rm -rf $RPM_BUILD_ROOT

%post
# update icon themes
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
# update icon themes
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_bindir}/vkeybd
%{_bindir}/sftovkb
%{_datadir}/vkeybd/
%{_mandir}/man1/*
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/vkeybd.png

%changelog
* Thu Oct 19 2006 Anthony Green <green at redhat.com> 0.1.17a-1
- Update sources.
- Remove jack-audio-connection-kit dependency, which is implied by
  lash dependency.

* Mon Sep 25 2006 Anthony Green <green at redhat.com> 0.1.17-8
- Tweak vkeybd.desktop file.
- Package ChangeLog.
- Clean up %%files.
- Move Categories to .desktop file.
- More LADCCA to LASH patching.
- Fix man page permissions.

* Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.1.17-7
- Remove Require(post,postun) for gtk2, as per the packaging
  guidelines.

* Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.1.17-6
- Remove my COPYING file.
- Don't use update-desktop-database.
- Clean up BuildRequires.
- Install the icon in the hicolor tree.
- Require hicolor-icon-theme.
- Don't Require tcl, since tk does that.
- Collar tk version requirements.
- Make vkeybd.tcl executable.
- Require(post,postun) gtk2 for gtk-update-icon-cache.

* Thu Jun  1 2006 Anthony Green <green at redhat.com> 0.1.17-5
- Add dist tag to Release.
- Build with _smp_mflags.
- Add GPL license file (COPYING).

* Tue Apr 25 2006 Anthony Green <green at redhat.com> 0.1.17-4
- Add Fernando Lopez-Lezcano's icon and related changes.
- Clean up macro usage.

* Tue Apr 25 2006 Anthony Green <green at redhat.com> 0.1.17-3
- Build with RPM_OPT_FLAGS with vkeybd-CFLAGS.patch.

* Sat Apr 22 2006 Anthony Green <green at redhat.com> 0.1.17-2
- Build for Fedora Extras.
- Port from ladcca to lash.
- Update description.

* Mon Dec 27 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.17-1
- updated to 0.1.17
- spec file cleanup
* Mon May 10 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added buildrequires, detect tcl version
* Tue Feb 24 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.15-1
- updated to 0.1.15
* Sat Jul 26 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.13a-1
- updated to 0.1.13a
- added menu entries
* Mon Dec 30 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.12-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vkeybd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Oct 2006 17:02:37 -0000	1.1
+++ .cvsignore	21 Oct 2006 17:05:04 -0000	1.2
@@ -0,0 +1 @@
+vkeybd-0.1.17a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vkeybd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Oct 2006 17:02:37 -0000	1.1
+++ sources	21 Oct 2006 17:05:04 -0000	1.2
@@ -0,0 +1 @@
+3def91f76f68203a275781d471c5b7e2  vkeybd-0.1.17a.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 17:11:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 10:11:34 -0700
Subject: owners owners.list,1.1859,1.1860
Message-ID: <200610211711.k9LHBYH3028568@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28552

Modified Files:
	owners.list 
Log Message:
Add vkeybd



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1859
retrieving revision 1.1860
diff -u -r1.1859 -r1.1860
--- owners.list	21 Oct 2006 09:15:36 -0000	1.1859
+++ owners.list	21 Oct 2006 17:11:04 -0000	1.1860
@@ -2279,6 +2279,7 @@
 Fedora Extras|vigra|Generic Programming for Computer Vision|bruno at postle.net|extras-qa at fedoraproject.org|
 Fedora Extras|vips|Library for processing large images|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|vkeybd|Virtual MIDI keyboard|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|vnc-reflector|A specialized, multiplexing vnc proxy server|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 21 17:42:12 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 21 Oct 2006 10:42:12 -0700
Subject: rpms/qemu/FC-3 qemu.spec,1.2,1.3
Message-ID: <200610211742.k9LHgCGU028701@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/qemu/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28670/FC-3

Modified Files:
	qemu.spec 
Log Message:
Fix BuildRoot to be in compliance with the packaging guidelines; fixes bug #194432


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-3/qemu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu.spec	13 Feb 2005 16:08:11 -0000	1.2
+++ qemu.spec	21 Oct 2006 17:41:42 -0000	1.3
@@ -8,7 +8,7 @@
 Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz
 Source1: qemu.init
 Patch0: qemu-0.6.1-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel
 PreReq: /sbin/chkconfig
 PreReq: /sbin/service
@@ -73,6 +73,9 @@
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com>
+- Fix BuildRoot to be in compliance with the Packaging Guidelines.
+
 * Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0.6.1-2
 - Package cleanup
 



From fedora-extras-commits at redhat.com  Sat Oct 21 17:42:13 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 21 Oct 2006 10:42:13 -0700
Subject: rpms/qemu/FC-4 qemu.spec,1.11,1.12
Message-ID: <200610211742.k9LHgDK5028704@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/qemu/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28670/FC-4

Modified Files:
	qemu.spec 
Log Message:
Fix BuildRoot to be in compliance with the packaging guidelines; fixes bug #194432


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qemu.spec	17 Mar 2006 11:13:27 -0000	1.11
+++ qemu.spec	21 Oct 2006 17:41:43 -0000	1.12
@@ -9,7 +9,7 @@
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-32
 PreReq: /sbin/chkconfig
 PreReq: /sbin/service
@@ -78,6 +78,9 @@
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com>
+- Fix BuildRoot to be in compliance with the Packaging Guidelines.
+
 * Fri Mar 17 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-3
 - Use -mcpu= instead of -mtune= on x86_64 too
 - Disable SPARC targets on x86_64, because dyngen doesn't like fnegs



From fedora-extras-commits at redhat.com  Sat Oct 21 19:03:52 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Sat, 21 Oct 2006 12:03:52 -0700
Subject: mock mock.spec,1.16.2.11,1.16.2.12 ChangeLog,1.8.2.2,1.8.2.3
Message-ID: <200610211903.k9LJ3qe3002702@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2682

Modified Files:
      Tag: mock-0-6-branch
	mock.spec ChangeLog 
Log Message:
fixed problem generating tarball


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.16.2.11
retrieving revision 1.16.2.12
diff -u -r1.16.2.11 -r1.16.2.12
--- mock.spec	11 Sep 2006 16:37:32 -0000	1.16.2.11
+++ mock.spec	21 Oct 2006 19:03:48 -0000	1.16.2.12
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.5
+Version: 0.6.6
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
+- bumped version to 0.6.6 (fixed tarball problem)
+
 * Mon Sep 11 2006 Clark Williams <williams at redhat.com> - 0.6.5-1
 - changed version number for patch from Karanbir Singh
   (rpm workaround on CentOS 4.4)


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/mock/ChangeLog,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- ChangeLog	11 Sep 2006 16:37:32 -0000	1.8.2.2
+++ ChangeLog	21 Oct 2006 19:03:48 -0000	1.8.2.3
@@ -1,3 +1,8 @@
+2006-10-21  Clark Williams  <williams at redhat.com>
+
+	* mock.spec
+	Bumped version to 0.6.6
+
 2006-09-11 11:21  jcwillia
 	* mock.py
 	added patch from Karanbir Singh to fix RPM problem in 



From fedora-extras-commits at redhat.com  Sat Oct 21 19:04:04 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Sat, 21 Oct 2006 12:04:04 -0700
Subject: mock Makefile,1.8.2.4,1.8.2.5
Message-ID: <200610211904.k9LJ44fL002726@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2708

Modified Files:
      Tag: mock-0-6-branch
	Makefile 
Log Message:
fixed problem generating tarball


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- Makefile	29 Aug 2006 19:55:58 -0000	1.8.2.4
+++ Makefile	21 Oct 2006 19:04:02 -0000	1.8.2.5
@@ -26,8 +26,8 @@
 	mkdir -p $(DESTDIR)/var/lib/mock
 	for d in $(SUBDIRS); do make  DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
 
-archive:
-	@rm -rf ${PKGNAME}-%{VERSION}.tar.gz
+archive: clean
+	@rm -rf ${PKGNAME}-*.tar.gz
 	@rm -rf /tmp/${PKGNAME}-$(VERSION) /tmp/${PKGNAME}
 	@dir=$$PWD; cd /tmp; cp -a $$dir ${PKGNAME}
 	@rm -rf /tmp/${PKGNAME}/${PKGNAME}-daily.spec /tmp/${PKGNAME}/build /tmp/${PKGNAME}/dist



From fedora-extras-commits at redhat.com  Sat Oct 21 19:41:42 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sat, 21 Oct 2006 12:41:42 -0700
Subject: rpms/libburn/devel .cvsignore, 1.2, 1.3 libburn.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610211941.k9LJfgO6003037@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/libburn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3017

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
0.2.2 release; add html docs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libburn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Aug 2006 02:42:02 -0000	1.2
+++ .cvsignore	21 Oct 2006 19:41:12 -0000	1.3
@@ -1 +1,2 @@
 libburn-0.2svn.tar.gz
+libburn-0.2.2.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/extras/rpms/libburn/devel/libburn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libburn.spec	8 Sep 2006 20:08:54 -0000	1.2
+++ libburn.spec	21 Oct 2006 19:41:12 -0000	1.3
@@ -1,18 +1,15 @@
-%define         mainver 0.2
-# define this as version gets overridden by the subpackage with its own version
-
 Name:           libburn
-Version:        0.2
-Release:        4.20060908svn%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libburn.pykix.org/
-Source0:        %{name}-%{version}svn.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake libtool intltool gettext 
+BuildRequires:  automake libtool intltool gettext doxygen graphviz
 #Requires:       
 
 %description
@@ -61,8 +58,7 @@
 %package -n     cdrskin
 Summary:        Limited cdrecord compatibility wrapper to ease migration to libburn
 Group:          Applications/Multimedia
-Version:        0.1.4
-Requires:       %{name} = %{mainver}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description -n cdrskin
 A limited cdrecord compatibility wrapper which allows to use some libburn 
@@ -70,13 +66,14 @@
 
 
 %prep
-%setup -n %{name}-%{mainver}svn -q
+%setup -q
 
 
 %build
-./bootstrap
+#./bootstrap
 %configure --disable-static
 make %{?_smp_mflags}
+doxygen doc/doxygen.conf
 
 
 %install
@@ -84,6 +81,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -102,7 +101,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT README
+%doc AUTHORS COPYING COPYRIGHT README doc/html
 %{_libdir}/%{name}*.so.*
 
 %files devel
@@ -131,6 +130,12 @@
 
 
 %changelog
+* Fri Oct 20 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-1
+- 0.2.2 release
+
+* Tue Sep 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2-5.20060808svn
+- Create doxygen docs
+
 * Fri Sep  8 2006 Jesse Keating <jkeating at redhat.com> - 0.2-4.20060808svn
 - rebuild with new snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libburn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 20:08:54 -0000	1.3
+++ sources	21 Oct 2006 19:41:12 -0000	1.4
@@ -1 +1 @@
-87ba6cf624ccc53b5b086a0e72b5d39c  libburn-0.2svn.tar.gz
+20d0903d6b3fc646d32888cc91b12376  libburn-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 20:01:27 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:01:27 -0700
Subject: rpms/GtkAda/FC-5 .cvsignore, 1.3, 1.4 GtkAda.spec, 1.15,
	1.16 sources, 1.3, 1.4 GtkAda-case-none.patch, 1.1,
	NONE GtkAda-pkgconfig.patch, 1.1, NONE
Message-ID: <200610212001.k9LK1RRJ006155@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3224

Modified Files:
	.cvsignore GtkAda.spec sources 
Removed Files:
	GtkAda-case-none.patch GtkAda-pkgconfig.patch 
Log Message:
new version 2.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 21:33:53 -0000	1.3
+++ .cvsignore	21 Oct 2006 20:00:54 -0000	1.4
@@ -1 +1 @@
-GtkAda-2.4.0.tgz
+GtkAda-gpl-2.8.0.tgz


Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- GtkAda.spec	17 Feb 2006 21:32:17 -0000	1.15
+++ GtkAda.spec	21 Oct 2006 20:00:54 -0000	1.16
@@ -1,13 +1,13 @@
 Name:		GtkAda
-Version:	2.4.0
-Release:	11%{?dist}
+Version:	2.8.0
+Release:	1%{?dist}
 
 Summary:	Ada95 graphical toolkit based on Gtk+
 
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://libre.act-europe.fr/GtkAda
-Source:         http://libre.act-europe.fr/GtkAda/GtkAda-2.4.0.tgz
+Source:         http://libre.act-europe.fr/GtkAda/GtkAda-gpl-2.8.0.tgz
 Patch0:		GtkAda-case-none.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
@@ -26,104 +26,90 @@
 %description
 GtkAda is an Ada95 graphical toolkit based on Gtk+, providing the
 complete set of Gtk+ widgets using the Object-Oriented features of
-this language. GtkAda supports the latest 2.4 stable releases.
+this language. GtkAda supports the latest 2.8 stable releases.
+
 
 %package devel
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}, perl
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 
 %description devel
 Development files for GtkAda.
 
+
 %prep
-%setup -q
-%patch0 -p1 -b .case-none
+%setup -q -n %{name}-gpl-%{version}
+
 
 %build
+# adapt opt flags to gnatmake
+GNAT_RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|--param=ssp-buffer-size=4||'`
+sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
-perl -pi -e 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-(
-    mkdir -p src/lib-obj;
-    cd src/lib-obj;
-)
+sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
 make
 make -C docs
 
+
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
+(make -C docs install prefix=$PWD/doc-install)
+
+# move shared libraries to standard place
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*
+mv $RPM_BUILD_ROOT%{_libdir}/gtkada/lib* $RPM_BUILD_ROOT%{_libdir}
 
 # make libraries executables, otherwise dependencies are not found
-chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*
+chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
+find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
-cp -a ${RPM_BUILD_ROOT}%{_datadir} .
-rm -fr ${RPM_BUILD_ROOT}%{_datadir}
-cp -a ${RPM_BUILD_ROOT}%{_prefix}/doc .
-rm -fr ${RPM_BUILD_ROOT}%{_prefix}/doc
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 ${RPM_BUILD_ROOT}%{_mandir}/man1)
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
 
 # this conflicts with gdialog from gnome-utils
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/gdialog
+rm -f $RPM_BUILD_ROOT%{_bindir}/gdialog
 
-rm -fr ${RPM_BUILD_ROOT}%{_prefix}/projects
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
-cp -a doc/GtkAda/gtkada_rm/*.info* ${RPM_BUILD_ROOT}%{_infodir}
-cp -a doc/GtkAda/gtkada_ug/*.info* ${RPM_BUILD_ROOT}%{_infodir}
-
-# prepare documentation in separate directory
-# in order to leave doc/GtkAda untouched
-rm -fr doc-install
-mkdir doc-install
-cp -fr doc/GtkAda/gtkada_rm doc/GtkAda/gtkada_ug doc-install
-rm -f doc-install/gtkada_rm/*.info*
-rm -f doc-install/gtkada_rm/*.ps
-rm -f doc-install/gtkada_rm/*.tex*
-rm -f doc-install/gtkada_rm/*.txt
-rm -f doc-install/gtkada_ug/*.info*
-rm -f doc-install/gtkada_ug/*.ps
-rm -f doc-install/gtkada_ug/*.tex*
-rm -f doc-install/gtkada_ug/*.txt
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
-%post devel
-/sbin/install-info %{_infodir}/gtkada_rm.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/gtkada_ug.info %{_infodir}/dir 2>/dev/null || :
-
-%preun devel
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/gtkada_rm.info %{_infodir}/dir 2>/dev/null || :
-  /sbin/install-info --delete %{_infodir}/gtkada_ug.info %{_infodir}/dir 2>/dev/null || :
-fi
 
 %files
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 %doc AUTHORS COPYING README
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_includedir}/gtkada
-%{_libdir}/lib*.a
+%{_libdir}/gtkada
+%{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_datadir}/gps
 %{_mandir}/man*/*
-%{_infodir}/*
-%doc share/gtkada/examples
-%doc doc-install/*
+%doc examples
+%doc doc-install/share/doc/gtkada/*
 %doc known-problems
 
+
 %changelog
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+- new version 2.8.0
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 21:33:53 -0000	1.3
+++ sources	21 Oct 2006 20:00:54 -0000	1.4
@@ -1 +1 @@
-31232d695ca40c3fb346fb34bc93ed3d  GtkAda-2.4.0.tgz
+e8ae05f6c3122b0c17555741688d47ed  GtkAda-gpl-2.8.0.tgz


--- GtkAda-case-none.patch DELETED ---


--- GtkAda-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:04:55 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:04:55 -0700
Subject: rpms/GtkAda/devel .cvsignore, 1.3, 1.4 GtkAda.spec, 1.17,
	1.18 sources, 1.3, 1.4 GtkAda-case-none.patch, 1.1,
	NONE GtkAda-pkgconfig.patch, 1.1, NONE
Message-ID: <200610212004.k9LK4ttX006200@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6177

Modified Files:
	.cvsignore GtkAda.spec sources 
Removed Files:
	GtkAda-case-none.patch GtkAda-pkgconfig.patch 
Log Message:
new version 2.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 21:33:53 -0000	1.3
+++ .cvsignore	21 Oct 2006 20:04:24 -0000	1.4
@@ -1 +1 @@
-GtkAda-2.4.0.tgz
+GtkAda-gpl-2.8.0.tgz


Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- GtkAda.spec	28 Aug 2006 11:21:55 -0000	1.17
+++ GtkAda.spec	21 Oct 2006 20:04:24 -0000	1.18
@@ -1,13 +1,13 @@
 Name:		GtkAda
-Version:	2.4.0
-Release:	13%{?dist}
+Version:	2.8.0
+Release:	1%{?dist}
 
 Summary:	Ada95 graphical toolkit based on Gtk+
 
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://libre.act-europe.fr/GtkAda
-Source:         http://libre.act-europe.fr/GtkAda/GtkAda-2.4.0.tgz
+Source:         http://libre.act-europe.fr/GtkAda/GtkAda-gpl-2.8.0.tgz
 Patch0:		GtkAda-case-none.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
@@ -28,104 +28,90 @@
 %description
 GtkAda is an Ada95 graphical toolkit based on Gtk+, providing the
 complete set of Gtk+ widgets using the Object-Oriented features of
-this language. GtkAda supports the latest 2.4 stable releases.
+this language. GtkAda supports the latest 2.8 stable releases.
+
 
 %package devel
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}, perl
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 
 %description devel
 Development files for GtkAda.
 
+
 %prep
-%setup -q
-%patch0 -p1 -b .case-none
+%setup -q -n %{name}-gpl-%{version}
+
 
 %build
+# adapt opt flags to gnatmake
+GNAT_RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|--param=ssp-buffer-size=4||'`
+sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
-perl -pi -e 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-(
-    mkdir -p src/lib-obj;
-    cd src/lib-obj;
-)
+sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
 make
 make -C docs
 
+
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
+(make -C docs install prefix=$PWD/doc-install)
+
+# move shared libraries to standard place
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*
+mv $RPM_BUILD_ROOT%{_libdir}/gtkada/lib* $RPM_BUILD_ROOT%{_libdir}
 
 # make libraries executables, otherwise dependencies are not found
-chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*
+chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
+find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
-cp -a ${RPM_BUILD_ROOT}%{_datadir} .
-rm -fr ${RPM_BUILD_ROOT}%{_datadir}
-cp -a ${RPM_BUILD_ROOT}%{_prefix}/doc .
-rm -fr ${RPM_BUILD_ROOT}%{_prefix}/doc
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 ${RPM_BUILD_ROOT}%{_mandir}/man1)
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
 
 # this conflicts with gdialog from gnome-utils
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/gdialog
+rm -f $RPM_BUILD_ROOT%{_bindir}/gdialog
 
-rm -fr ${RPM_BUILD_ROOT}%{_prefix}/projects
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
-cp -a doc/GtkAda/gtkada_rm/*.info* ${RPM_BUILD_ROOT}%{_infodir}
-cp -a doc/GtkAda/gtkada_ug/*.info* ${RPM_BUILD_ROOT}%{_infodir}
-
-# prepare documentation in separate directory
-# in order to leave doc/GtkAda untouched
-rm -fr doc-install
-mkdir doc-install
-cp -fr doc/GtkAda/gtkada_rm doc/GtkAda/gtkada_ug doc-install
-rm -f doc-install/gtkada_rm/*.info*
-rm -f doc-install/gtkada_rm/*.ps
-rm -f doc-install/gtkada_rm/*.tex*
-rm -f doc-install/gtkada_rm/*.txt
-rm -f doc-install/gtkada_ug/*.info*
-rm -f doc-install/gtkada_ug/*.ps
-rm -f doc-install/gtkada_ug/*.tex*
-rm -f doc-install/gtkada_ug/*.txt
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
-%post devel
-/sbin/install-info %{_infodir}/gtkada_rm.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/gtkada_ug.info %{_infodir}/dir 2>/dev/null || :
-
-%preun devel
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/gtkada_rm.info %{_infodir}/dir 2>/dev/null || :
-  /sbin/install-info --delete %{_infodir}/gtkada_ug.info %{_infodir}/dir 2>/dev/null || :
-fi
 
 %files
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 %doc AUTHORS COPYING README
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_includedir}/gtkada
-%{_libdir}/lib*.a
+%{_libdir}/gtkada
+%{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_datadir}/gps
 %{_mandir}/man*/*
-%{_infodir}/*
-%doc share/gtkada/examples
-%doc doc-install/*
+%doc examples
+%doc doc-install/share/doc/gtkada/*
 %doc known-problems
 
+
 %changelog
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+- new version 2.8.0
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-13
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 21:33:53 -0000	1.3
+++ sources	21 Oct 2006 20:04:24 -0000	1.4
@@ -1 +1 @@
-31232d695ca40c3fb346fb34bc93ed3d  GtkAda-2.4.0.tgz
+e8ae05f6c3122b0c17555741688d47ed  GtkAda-gpl-2.8.0.tgz


--- GtkAda-case-none.patch DELETED ---


--- GtkAda-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:07:21 -0700
Subject: rpms/magicor - New directory
Message-ID: <200610212007.k9LK7Lli006416@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6411/magicor

Log Message:
Directory /cvs/extras/rpms/magicor added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:07:27 -0700
Subject: rpms/magicor/devel - New directory
Message-ID: <200610212007.k9LK7Rwv006433@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6411/magicor/devel

Log Message:
Directory /cvs/extras/rpms/magicor/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:32 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:07:32 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.16,1.17
Message-ID: <200610212007.k9LK7WYt006450@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6366/FC-5

Modified Files:
	GtkAda.spec 
Log Message:
new version 2.8.0


Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- GtkAda.spec	21 Oct 2006 20:00:54 -0000	1.16
+++ GtkAda.spec	21 Oct 2006 20:07:02 -0000	1.17
@@ -1,14 +1,11 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	1%{?dist}
-
+Release:	2%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
-
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://libre.act-europe.fr/GtkAda
 Source:         http://libre.act-europe.fr/GtkAda/GtkAda-gpl-2.8.0.tgz
-Patch0:		GtkAda-case-none.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat



From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:33 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:07:33 -0700
Subject: rpms/GtkAda/devel GtkAda.spec,1.18,1.19
Message-ID: <200610212007.k9LK7XGC006454@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6366/devel

Modified Files:
	GtkAda.spec 
Log Message:
new version 2.8.0


Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- GtkAda.spec	21 Oct 2006 20:04:24 -0000	1.18
+++ GtkAda.spec	21 Oct 2006 20:07:03 -0000	1.19
@@ -1,14 +1,11 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	1%{?dist}
-
+Release:	2%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
-
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://libre.act-europe.fr/GtkAda
 Source:         http://libre.act-europe.fr/GtkAda/GtkAda-gpl-2.8.0.tgz
-Patch0:		GtkAda-case-none.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat



From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:40 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:07:40 -0700
Subject: rpms/magicor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610212007.k9LK7el7006470@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6464

Added Files:
	Makefile import.log 
Log Message:
Setup of module magicor


--- NEW FILE Makefile ---
# Top level Makefile for module magicor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:07:46 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:07:46 -0700
Subject: rpms/magicor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610212007.k9LK7kD3006486@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6464/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module magicor


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:12:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:12:24 -0700
Subject: rpms/magicor/devel magicor.desktop, NONE, 1.1 magicor.png, NONE,
	1.1 magicor.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610212012.k9LKCOBu006655@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/devel

Modified Files:
	.cvsignore sources 
Added Files:
	magicor.desktop magicor.png magicor.spec 
Log Message:
auto-import magicor-0.1-2.fc6 on branch devel from magicor-0.1-2.fc6.src.rpm


--- NEW FILE magicor.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Magicor
Comment=Push ice blocks around to extenguish all fires
Exec=magicor
Icon=magicor.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;LogicGame;


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

Name:           magicor
Version:        0.1
Release:        2%{?dist}
Summary:        Push ice blocks around to extenguish all fires
Group:          Amusements/Games
License:        Public Domain
URL:            http://magicor.sourceforge.net/
Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}.tar.gz
Source2:        %{name}.desktop
Source3:        %{name}.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       pygame hicolor-icon-theme

%description
The goal of the game is to annihilate all burning fires. You do this
by pushing blocks of ice until they collide with a burning fire.
When the ice blocks hit burning fire the block and the fire are destroyed.
Once all fires are extinguished the level is completed.


%prep
%setup -q -b 1
sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
  scripts/Magicor-LevelEditor.py
sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf


# %build
# nothing to build, python code + data only


%install
rm -rf $RPM_BUILD_ROOT
# We must do a DIY install as the makefile doesn't support installing into
# an install root
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE3} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%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 COPYRIGHT LICENSE README
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_bindir}/%{name}*
%{python_sitelib}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%changelog
* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
- Mark /etc/magicor.conf %%config(noreplace)

* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Oct 2006 20:07:45 -0000	1.1
+++ .cvsignore	21 Oct 2006 20:11:54 -0000	1.2
@@ -0,0 +1,2 @@
+magicor-0.1.tar.gz
+magicor-data-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Oct 2006 20:07:45 -0000	1.1
+++ sources	21 Oct 2006 20:11:54 -0000	1.2
@@ -0,0 +1,2 @@
+d5872a5fb0457af8c14a0c392b824c68  magicor-0.1.tar.gz
+0f9920721788147331d8e7d0a6d60a46  magicor-data-0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 21 20:12:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:12:24 -0700
Subject: rpms/magicor import.log,1.1,1.2
Message-ID: <200610212012.k9LKCOmf006651@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617

Modified Files:
	import.log 
Log Message:
auto-import magicor-0.1-2.fc6 on branch devel from magicor-0.1-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/magicor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Oct 2006 20:07:40 -0000	1.1
+++ import.log	21 Oct 2006 20:11:53 -0000	1.2
@@ -0,0 +1 @@
+magicor-0_1-2_fc6:HEAD:magicor-0.1-2.fc6.src.rpm:1161462141



From fedora-extras-commits at redhat.com  Sat Oct 21 20:21:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:21:25 -0700
Subject: owners owners.list,1.1860,1.1861
Message-ID: <200610212021.k9LKLPrt006743@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6720

Modified Files:
	owners.list 
Log Message:
added magicor


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1860
retrieving revision 1.1861
diff -u -r1.1860 -r1.1861
--- owners.list	21 Oct 2006 17:11:04 -0000	1.1860
+++ owners.list	21 Oct 2006 20:20:55 -0000	1.1861
@@ -989,7 +989,6 @@
 Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|luma|A graphical tool for managing LDAP servers|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -1002,6 +1001,7 @@
 Fedora Extras|lua|A powerful light-weight programming language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|luks-tools|Utilities for working with LUKS-protected filesystems|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
+Fedora Extras|luma|A graphical tool for managing LDAP servers|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|lzo|Data compression library with very fast (de)compression|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -1011,6 +1011,7 @@
 Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|magicor|Push ice blocks around to extenguish all fires|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|MagicPoint|X based presentation software|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|rms at 1407.org,byte at fedoraproject.org
 Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 21 20:27:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:27:40 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.17,1.18
Message-ID: <200610212027.k9LKRe7a006780@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6764

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- GtkAda.spec	21 Oct 2006 20:07:02 -0000	1.17
+++ GtkAda.spec	21 Oct 2006 20:27:10 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -60,7 +60,6 @@
 
 # make libraries executables, otherwise dependencies are not found
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
-find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 (cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
@@ -71,6 +70,8 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
+sed -i "s|/.*/usr/lib|/usr/lib|" %{_libdir}/gnat/*.gpr
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,6 +96,7 @@
 %{_libdir}/gtkada
 %{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/lib*.a
 %{_libdir}/pkgconfig/*
 %{_datadir}/gps
 %{_mandir}/man*/*



From fedora-extras-commits at redhat.com  Sat Oct 21 20:37:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Oct 2006 13:37:48 -0700
Subject: comps comps-fe5.xml.in,1.179,1.180 comps-fe6.xml.in,1.202,1.203
Message-ID: <200610212037.k9LKbmlr006883@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6864

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
add magicor


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- comps-fe5.xml.in	20 Oct 2006 00:54:12 -0000	1.179
+++ comps-fe5.xml.in	21 Oct 2006 20:37:17 -0000	1.180
@@ -331,6 +331,7 @@
       <packagereq type="optional">lmarbles</packagereq>
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
+      <packagereq type="optional">magicor</packagereq>
       <packagereq type="optional">manaworld</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- comps-fe6.xml.in	20 Oct 2006 00:51:00 -0000	1.202
+++ comps-fe6.xml.in	21 Oct 2006 20:37:17 -0000	1.203
@@ -387,6 +387,7 @@
       <packagereq type="optional">lmarbles</packagereq>
       <packagereq type="optional">lucidlife</packagereq>
       <packagereq type="optional">Maelstrom</packagereq>
+      <packagereq type="optional">magicor</packagereq>
       <packagereq type="optional">manaworld</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>



From fedora-extras-commits at redhat.com  Sat Oct 21 20:41:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 13:41:11 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.18,1.19
Message-ID: <200610212041.k9LKfBLT006931@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6903

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- GtkAda.spec	21 Oct 2006 20:27:10 -0000	1.18
+++ GtkAda.spec	21 Oct 2006 20:40:41 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -70,7 +70,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-sed -i "s|/.*/usr/lib|/usr/lib|" %{_libdir}/gnat/*.gpr
+sed -i "s|/.*/usr/lib|/usr/lib|" $RPM_BUILD_ROOT%{_libdir}/gnat/*.gpr
 
 
 %clean
@@ -106,7 +106,7 @@
 
 
 %changelog
-* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-4
 - new version 2.8.0
 
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0



From fedora-extras-commits at redhat.com  Sat Oct 21 20:52:11 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:52:11 -0700
Subject: rpms/libfreebob - New directory
Message-ID: <200610212052.k9LKqBlf007059@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055/libfreebob

Log Message:
Directory /cvs/extras/rpms/libfreebob added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 20:52:17 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:52:17 -0700
Subject: rpms/libfreebob/devel - New directory
Message-ID: <200610212052.k9LKqH3r007076@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055/libfreebob/devel

Log Message:
Directory /cvs/extras/rpms/libfreebob/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Oct 21 20:52:38 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:52:38 -0700
Subject: rpms/libfreebob Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610212052.k9LKqcvg007109@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7103

Added Files:
	Makefile import.log 
Log Message:
Setup of module libfreebob


--- NEW FILE Makefile ---
# Top level Makefile for module libfreebob
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:52:39 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:52:39 -0700
Subject: rpms/libfreebob/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610212052.k9LKqdKU007125@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7103/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libfreebob


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Oct 21 20:53:53 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:53:53 -0700
Subject: rpms/libfreebob import.log,1.1,1.2
Message-ID: <200610212053.k9LKrrS2007200@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7165

Modified Files:
	import.log 
Log Message:
auto-import libfreebob-1.0.0-3 on branch devel from libfreebob-1.0.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libfreebob/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Oct 2006 20:52:38 -0000	1.1
+++ import.log	21 Oct 2006 20:53:22 -0000	1.2
@@ -0,0 +1 @@
+libfreebob-1_0_0-3:HEAD:libfreebob-1.0.0-3.src.rpm:1161464009



From fedora-extras-commits at redhat.com  Sat Oct 21 20:53:53 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 13:53:53 -0700
Subject: rpms/libfreebob/devel libfreebob.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610212053.k9LKrrur007204@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/libfreebob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7165/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libfreebob.spec 
Log Message:
auto-import libfreebob-1.0.0-3 on branch devel from libfreebob-1.0.0-3.src.rpm


--- NEW FILE libfreebob.spec ---
Summary:       FreeBoB firewire audio driver library
Name:          libfreebob
Version:       1.0.0
Release:       3%{?dist}
License:       GPL
Group:         System Environment/Libraries
Source0:       http://surfnet.dl.sourceforge.net/sourceforge/freebob/libfreebob-%{version}.tar.bz2
URL:           http://freebob.sourceforge.net
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libavc1394-devel >= 0.5.3, libiec61883-devel, libraw1394-devel
BuildRequires: alsa-lib-devel libxml2-devel autoconf

%description
libfreebob implements a userland driver for BeBoB-based fireware audio
devices.

%package devel
Summary: Libraries, includes etc to develop with libfreebob
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
Libraries, includes etc to develop with libfreebob.

%prep
%setup -q
# Tweak libiec61883 build requirements.
perl -pi -e 's/1.1.0/1.0.0/' configure

%build
%configure --disable-static
make %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/libfreebob.pc
%{_includedir}/*

%changelog
* Sat Oct 21 2006 Anthony Green <green at redhat.com> 1.0.0-3
- Remove %%doc line from devel package.
- Remove trailing '.' from devel package summary.

* Wed Oct 11 2006 Anthony Green <green at redhat.com> 1.0.0-2
- Use upstream tarball release, not svn 1.0 release.
- Tweak %%files.
- Tweak libiec61883 build requirements in configure script.
- Don't generate configure script and remove some autotools dependencies.

* Sat Sep  9 2006 Anthony Green <green at redhat.com> 1.0-1
- Created.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfreebob/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Oct 2006 20:52:39 -0000	1.1
+++ .cvsignore	21 Oct 2006 20:53:23 -0000	1.2
@@ -0,0 +1 @@
+libfreebob-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfreebob/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Oct 2006 20:52:39 -0000	1.1
+++ sources	21 Oct 2006 20:53:23 -0000	1.2
@@ -0,0 +1 @@
+aa550528324a4dfb3cf7c9a90d83c694  libfreebob-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 21 21:08:56 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Oct 2006 14:08:56 -0700
Subject: owners owners.list,1.1861,1.1862
Message-ID: <200610212108.k9LL8ulj010280@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10262

Modified Files:
	owners.list 
Log Message:
Add libfreebob.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1861
retrieving revision 1.1862
diff -u -r1.1861 -r1.1862
--- owners.list	21 Oct 2006 20:20:55 -0000	1.1861
+++ owners.list	21 Oct 2006 21:08:26 -0000	1.1862
@@ -859,6 +859,7 @@
 Fedora Extras|libeXosip2|A library that hides the complexity of using the SIP protocol|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libFoundation|A free implementation of OpenStep's Foundation Kit|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
+Fedora Extras|libfreebob|FreeBob firewire audio driver library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libfwbuilder|Firewall Builder API|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libgadu|Gadu-gadu protocol support library|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgalago|Galago presence library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Oct 21 21:36:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 14:36:05 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.19,1.20
Message-ID: <200610212136.k9LLa5hL010391@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10375

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GtkAda.spec	21 Oct 2006 20:40:41 -0000	1.19
+++ GtkAda.spec	21 Oct 2006 21:35:35 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -45,13 +45,13 @@
 sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
 sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-make
+make incdir=%{_includedir}/gtkada alidir=%{_libdir}/gtkada
 make -C docs
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall incdir=$RPM_BUILD_ROOT%{_includedir}/gtkada alidir=$RPM_BUILD_ROOT%{_libdir}/gtkada
 (make -C docs install prefix=$PWD/doc-install)
 
 # move shared libraries to standard place
@@ -106,10 +106,10 @@
 
 
 %changelog
-* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-4
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-5
 - new version 2.8.0
 
-* Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0
+* Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-11
 - Rebuild for Fedora Extras 5
 
 * Thu Feb  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-10



From fedora-extras-commits at redhat.com  Sat Oct 21 22:24:18 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 15:24:18 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.20,1.21
Message-ID: <200610212224.k9LMOI0B013560@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13544

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- GtkAda.spec	21 Oct 2006 21:35:35 -0000	1.20
+++ GtkAda.spec	21 Oct 2006 22:23:47 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -37,7 +37,8 @@
 
 %prep
 %setup -q -n %{name}-gpl-%{version}
-
+sed -i "s|\$.prefix./lib|\$(libdir)|" projects/Makefile
+sed -i "s|\$prefix/lib|%{_libdir}|" projects/generate_prj.sh
 
 %build
 # adapt opt flags to gnatmake
@@ -70,7 +71,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-sed -i "s|/.*/usr/lib|/usr/lib|" $RPM_BUILD_ROOT%{_libdir}/gnat/*.gpr
+#sed -i "s|/.*/usr/lib|/usr/lib|" $RPM_BUILD_ROOT%{_libdir}/gnat/*.gpr
 
 
 %clean



From fedora-extras-commits at redhat.com  Sat Oct 21 22:41:03 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sat, 21 Oct 2006 15:41:03 -0700
Subject: rpms/torque/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 torque.spec, 1.16, 1.17
Message-ID: <200610212241.k9LMf3R2013737@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13717

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Oct 2006 01:28:07 -0000	1.9
+++ .cvsignore	21 Oct 2006 22:40:33 -0000	1.10
@@ -1 +1 @@
-torque-2.1.4.tar.gz
+torque-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Oct 2006 01:28:07 -0000	1.9
+++ sources	21 Oct 2006 22:40:33 -0000	1.10
@@ -1 +1 @@
-9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz
+88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- torque.spec	21 Oct 2006 01:28:07 -0000	1.16
+++ torque.spec	21 Oct 2006 22:40:33 -0000	1.17
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.4
+%define version 2.1.5
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
+- fixes "qsub -o /dev/null" regression
+
 * Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
 - bump to fix "Spool Job Race condition" on bugtraq
 



From fedora-extras-commits at redhat.com  Sat Oct 21 22:42:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 15:42:52 -0700
Subject: rpms/GtkAda/FC-5 GtkAda.spec,1.21,1.22
Message-ID: <200610212242.k9LMgqOe013821@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13781/FC-5

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/FC-5/GtkAda.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- GtkAda.spec	21 Oct 2006 22:23:47 -0000	1.21
+++ GtkAda.spec	21 Oct 2006 22:42:22 -0000	1.22
@@ -71,8 +71,6 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/examples
 
-#sed -i "s|/.*/usr/lib|/usr/lib|" $RPM_BUILD_ROOT%{_libdir}/gnat/*.gpr
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Sat Oct 21 22:42:53 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 21 Oct 2006 15:42:53 -0700
Subject: rpms/GtkAda/devel GtkAda.spec,1.19,1.20
Message-ID: <200610212242.k9LMgr1v013824@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/GtkAda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13781/devel

Modified Files:
	GtkAda.spec 
Log Message:



Index: GtkAda.spec
===================================================================
RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GtkAda.spec	21 Oct 2006 20:07:03 -0000	1.19
+++ GtkAda.spec	21 Oct 2006 22:42:23 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		GtkAda
 Version:	2.8.0
-Release:	2%{?dist}
+Release:	6%{?dist}
 Summary:	Ada95 graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPL
@@ -39,7 +39,8 @@
 
 %prep
 %setup -q -n %{name}-gpl-%{version}
-
+sed -i "s|\$.prefix./lib|\$(libdir)|" projects/Makefile
+sed -i "s|\$prefix/lib|%{_libdir}|" projects/generate_prj.sh
 
 %build
 # adapt opt flags to gnatmake
@@ -47,13 +48,13 @@
 sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure
 sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-make
+make incdir=%{_includedir}/gtkada alidir=%{_libdir}/gtkada
 make -C docs
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall incdir=$RPM_BUILD_ROOT%{_includedir}/gtkada alidir=$RPM_BUILD_ROOT%{_libdir}/gtkada
 (make -C docs install prefix=$PWD/doc-install)
 
 # move shared libraries to standard place
@@ -62,7 +63,6 @@
 
 # make libraries executables, otherwise dependencies are not found
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
-find $RPM_BUILD_ROOT%{_libdir} -name "*.a" | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 (cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
@@ -97,6 +97,7 @@
 %{_libdir}/gtkada
 %{_libdir}/gnat
 %{_libdir}/lib*.so
+%{_libdir}/lib*.a
 %{_libdir}/pkgconfig/*
 %{_datadir}/gps
 %{_mandir}/man*/*
@@ -106,7 +107,7 @@
 
 
 %changelog
-* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-1
+* Sat Oct 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.8.0-5
 - new version 2.8.0
 
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-13



From fedora-extras-commits at redhat.com  Sat Oct 21 22:48:39 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 21 Oct 2006 15:48:39 -0700
Subject: rpms/xeuphoric/devel xeuphoric.spec,1.1,1.2
Message-ID: <200610212248.k9LMmdfr013899@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13883

Modified Files:
	xeuphoric.spec 
Log Message:

removed ppc64 and added ppc to the ExcludeArch 
 	xeuphoric.spec 



Index: xeuphoric.spec
===================================================================
RCS file: /cvs/extras/rpms/xeuphoric/devel/xeuphoric.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xeuphoric.spec	15 Oct 2006 21:57:01 -0000	1.1
+++ xeuphoric.spec	21 Oct 2006 22:48:09 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: An X based ORIC emulator
 Name: xeuphoric
 Version: 0.18.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Emulators
 Source0: http://www.teaser.fr/~amajorel/%{name}/%{name}-%{version}.tar.gz
@@ -12,7 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: arts-devel libXext-devel desktop-file-utils
 Requires: %{name}-roms
-ExcludeArch: x86_64 ia64 ppc64
+ExcludeArch: x86_64 ia64 ppc
 # excluded due to compilation problems - upstream developer changing RSN (me!)
 
 %description
@@ -83,6 +83,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-6
+- changed ppc64 to ppc
+
 * Sun Oct 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.18.2-5
 - corrected iconv
 



From fedora-extras-commits at redhat.com  Sat Oct 21 23:28:00 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sat, 21 Oct 2006 16:28:00 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 torque.spec, 1.13, 1.14
Message-ID: <200610212328.k9LNS0lv016991@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Oct 2006 01:54:33 -0000	1.9
+++ .cvsignore	21 Oct 2006 23:27:30 -0000	1.10
@@ -1 +1 @@
-torque-2.1.4.tar.gz
+torque-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Oct 2006 01:54:33 -0000	1.9
+++ sources	21 Oct 2006 23:27:30 -0000	1.10
@@ -1 +1 @@
-9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz
+88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- torque.spec	21 Oct 2006 01:54:33 -0000	1.13
+++ torque.spec	21 Oct 2006 23:27:30 -0000	1.14
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.4
+%define version 2.1.5
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
+- fixes "qsub -o /dev/null" regression
+
 * Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
 - bump to fix "Spool Job Race condition" on bugtraq
 



From fedora-extras-commits at redhat.com  Sat Oct 21 23:29:32 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sat, 21 Oct 2006 16:29:32 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 torque.spec, 1.11, 1.12
Message-ID: <200610212329.k9LNTWwP017055@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17035

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Oct 2006 02:11:06 -0000	1.9
+++ .cvsignore	21 Oct 2006 23:29:02 -0000	1.10
@@ -1 +1 @@
-torque-2.1.4.tar.gz
+torque-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Oct 2006 02:11:06 -0000	1.9
+++ sources	21 Oct 2006 23:29:02 -0000	1.10
@@ -1 +1 @@
-9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz
+88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- torque.spec	21 Oct 2006 02:11:06 -0000	1.11
+++ torque.spec	21 Oct 2006 23:29:02 -0000	1.12
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.4
+%define version 2.1.5
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
+- fixes "qsub -o /dev/null" regression
+
 * Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
 - bump to fix "Spool Job Race condition" on bugtraq
 



From fedora-extras-commits at redhat.com  Sat Oct 21 23:30:16 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sat, 21 Oct 2006 16:30:16 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 torque.spec,
	1.10, 1.11
Message-ID: <200610212330.k9LNUGQR017145@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17103

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Oct 2006 02:17:22 -0000	1.8
+++ .cvsignore	21 Oct 2006 23:29:46 -0000	1.9
@@ -1 +1 @@
-torque-2.1.4.tar.gz
+torque-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Oct 2006 02:17:22 -0000	1.8
+++ sources	21 Oct 2006 23:29:46 -0000	1.9
@@ -1 +1 @@
-9c152280a4e120599f867dfaaba703f1  torque-2.1.4.tar.gz
+88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- torque.spec	21 Oct 2006 02:17:22 -0000	1.10
+++ torque.spec	21 Oct 2006 23:29:46 -0000	1.11
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.4
+%define version 2.1.5
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
+- fixes "qsub -o /dev/null" regression
+
 * Fri Oct 20 2006 Garrick Staples <garrick at usc.edu> 2.1.4-1
 - bump to fix "Spool Job Race condition" on bugtraq
 



From fedora-extras-commits at redhat.com  Sun Oct 22 01:43:37 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:43:37 -0700
Subject: rpms/thewidgetfactory - New directory
Message-ID: <200610220143.k9M1hbLV023427@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23423/thewidgetfactory

Log Message:
Directory /cvs/extras/rpms/thewidgetfactory added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 01:43:43 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:43:43 -0700
Subject: rpms/thewidgetfactory/devel - New directory
Message-ID: <200610220143.k9M1hh4q023441@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23423/thewidgetfactory/devel

Log Message:
Directory /cvs/extras/rpms/thewidgetfactory/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 01:43:54 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:43:54 -0700
Subject: rpms/thewidgetfactory Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610220143.k9M1hsou023472@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466

Added Files:
	Makefile import.log 
Log Message:
Setup of module thewidgetfactory


--- NEW FILE Makefile ---
# Top level Makefile for module thewidgetfactory
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 22 01:44:00 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:44:00 -0700
Subject: rpms/thewidgetfactory/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610220144.k9M1i0Hw023488@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module thewidgetfactory


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 22 01:44:54 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:44:54 -0700
Subject: rpms/thewidgetfactory import.log,1.1,1.2
Message-ID: <200610220144.k9M1isoU023600@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23538

Modified Files:
	import.log 
Log Message:
auto-import thewidgetfactory-0.2.1-2 on branch devel from thewidgetfactory-0.2.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/thewidgetfactory/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Oct 2006 01:43:54 -0000	1.1
+++ import.log	22 Oct 2006 01:44:24 -0000	1.2
@@ -0,0 +1 @@
+thewidgetfactory-0_2_1-2:HEAD:thewidgetfactory-0.2.1-2.src.rpm:1161481461



From fedora-extras-commits at redhat.com  Sun Oct 22 01:44:55 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:44:55 -0700
Subject: rpms/thewidgetfactory/devel thewidgetfactory.desktop, NONE,
	1.1 thewidgetfactory.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610220145.k9M1itR1023604@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/thewidgetfactory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23538/devel

Modified Files:
	.cvsignore sources 
Added Files:
	thewidgetfactory.desktop thewidgetfactory.spec 
Log Message:
auto-import thewidgetfactory-0.2.1-2 on branch devel from thewidgetfactory-0.2.1-2.src.rpm


--- NEW FILE thewidgetfactory.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=The Widget Factory
# It appears GenericName is not used at all
#GenericName=The Widget Factory
Comment=A tool for previewing GTK widgets
Exec=twf
# Icon not available, need to discuss with upstream maintainer
# Icon=thewidgetfactory.png
Terminal=false
Type=Application
Categories=Development;Tools;
Version=0.2.1


--- NEW FILE thewidgetfactory.spec ---
Name:           thewidgetfactory
Version:        0.2.1
Release:        2%{?dist}
Summary:        A tool for previewing GTK widgets

Group:          Development/Tools
License:        GPL 
URL:            http://www.stellingwerff.com/?page_id=10 
Source0:        http://www.stellingwerff.com/TheWidgetFactory/%{name}-%{version}.tar.gz
Source1:        thewidgetfactory.desktop 
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel, desktop-file-utils

%description
The Widget Factory is a program designed to show a wide range of widgets
on a single window.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README COPYING
%{_bindir}/twf
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Sat Oct 21 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> 0.2.1-2
 - Fixed permission on bin directory
 - Added desktop-file-utils for menu
* Fri Oct 20 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> 0.2.1-1
 - Initial creation 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thewidgetfactory/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2006 01:44:00 -0000	1.1
+++ .cvsignore	22 Oct 2006 01:44:25 -0000	1.2
@@ -0,0 +1 @@
+thewidgetfactory-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thewidgetfactory/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Oct 2006 01:44:00 -0000	1.1
+++ sources	22 Oct 2006 01:44:25 -0000	1.2
@@ -0,0 +1 @@
+60175721233c6f265326fcdc0334c269  thewidgetfactory-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 01:46:40 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 21 Oct 2006 18:46:40 -0700
Subject: rpms/viaideinfo/devel viaideinfo.spec,1.1,1.2
Message-ID: <200610220146.k9M1kefc023654@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23638/viaideinfo/devel

Modified Files:
	viaideinfo.spec 
Log Message:
Enable x86-64 building (upstream says its OK)


Index: viaideinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/devel/viaideinfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- viaideinfo.spec	19 Oct 2006 06:50:13 -0000	1.1
+++ viaideinfo.spec	22 Oct 2006 01:46:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		viaideinfo
 Version:	0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Displays the information of installed VIA IDE controllers 
 Group:		Applications/System
 License:	GPL
@@ -9,7 +9,7 @@
 Source0:	http://reactivated.net/software/viaideinfo/viaideinfo-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pciutils-devel >= 2.2.0  
 
@@ -55,5 +55,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-2
+- Enable building on x86_64 (It works fine on x86-64 Via-based systems too,
+  according to an email from the upstream maintainer.)
+
 * Tue Oct 17 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-1
 - Initial packaging



From fedora-extras-commits at redhat.com  Sun Oct 22 01:49:27 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 21 Oct 2006 18:49:27 -0700
Subject: rpms/viaideinfo/devel viaideinfo.spec,1.2,1.3
Message-ID: <200610220149.k9M1nRIA023740@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23719/viaideinfo/devel

Modified Files:
	viaideinfo.spec 
Log Message:
Bump release to fix CVS tagging issue


Index: viaideinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/devel/viaideinfo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- viaideinfo.spec	22 Oct 2006 01:46:10 -0000	1.2
+++ viaideinfo.spec	22 Oct 2006 01:48:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		viaideinfo
 Version:	0.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Displays the information of installed VIA IDE controllers 
 Group:		Applications/System
 License:	GPL
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-3
+- Bump release to fix CVS tagging issue
+
 * Sat Oct 21 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-2
 - Enable building on x86_64 (It works fine on x86-64 Via-based systems too,
   according to an email from the upstream maintainer.)



From fedora-extras-commits at redhat.com  Sun Oct 22 01:50:32 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:50:32 -0700
Subject: rpms/libassa - New directory
Message-ID: <200610220150.k9M1oWrA023807@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23803/libassa

Log Message:
Directory /cvs/extras/rpms/libassa added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 01:50:38 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:50:38 -0700
Subject: rpms/libassa/devel - New directory
Message-ID: <200610220150.k9M1ocWU023826@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23803/libassa/devel

Log Message:
Directory /cvs/extras/rpms/libassa/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 01:51:16 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:51:16 -0700
Subject: rpms/libassa Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610220151.k9M1pGSn023877@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23871

Added Files:
	Makefile import.log 
Log Message:
Setup of module libassa


--- NEW FILE Makefile ---
# Top level Makefile for module libassa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 22 01:51:20 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 21 Oct 2006 18:51:20 -0700
Subject: owners owners.list,1.1862,1.1863
Message-ID: <200610220151.k9M1pK9w023903@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23842

Modified Files:
	owners.list 
Log Message:
added thewidgetfactory


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1862
retrieving revision 1.1863
diff -u -r1.1862 -r1.1863
--- owners.list	21 Oct 2006 21:08:26 -0000	1.1862
+++ owners.list	22 Oct 2006 01:50:50 -0000	1.1863
@@ -2198,6 +2198,7 @@
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|thewidgetfactory|A tool for previewing widgets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 22 01:51:17 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:51:17 -0700
Subject: rpms/libassa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610220151.k9M1pH80023893@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23871/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libassa


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 22 01:53:18 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:53:18 -0700
Subject: rpms/libassa import.log,1.1,1.2
Message-ID: <200610220153.k9M1rIM5023968@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23936

Modified Files:
	import.log 
Log Message:
auto-import libassa-3.4.2-4 on branch devel from libassa-3.4.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassa/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Oct 2006 01:51:16 -0000	1.1
+++ import.log	22 Oct 2006 01:52:48 -0000	1.2
@@ -0,0 +1 @@
+libassa-3_4_2-4:HEAD:libassa-3.4.2-4.src.rpm:1161481953



From fedora-extras-commits at redhat.com  Sun Oct 22 01:53:19 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:53:19 -0700
Subject: rpms/libassa/devel libassa.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610220153.k9M1rJKb023972@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/libassa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23936/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libassa.spec 
Log Message:
auto-import libassa-3.4.2-4 on branch devel from libassa-3.4.2-4.src.rpm


--- NEW FILE libassa.spec ---
# -*- rpm-spec -*-
#===============================================================================
#
# ASSA library RPM spec file.
#
# RPM format: name-version-release.rpm
#
# $Id$
#===============================================================================

Summary:    C++ network-oriented application framework 
Name:       libassa
Version:    3.4.2
Release:    4
License:    LGPL
Group:      System Environment/Libraries
URL:        http://libassa.sourceforge.net/
Source:     http://dl.sf.net/sourceforge/libassa/libassa-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires: doxygen

#===============================================================================
# libassa package 
#===============================================================================

%description
This package is a C++ framework for writing network-based server and
client applications. It is a non-threaded implementation of Adaptive 
Communication Environment design patterns such as Reactor, Connector, 
Acceptor and others.

#===============================================================================
# libassa-devel package 
#===============================================================================

%package    devel
Summary:    Headers for developing programs with libassa library
Group:      Development/Libraries
Requires:   %{name} = %{version}-%{release}
Requires:   pkgconfig

%description devel
This package contains the headers that programmers will need to develop
applications which will use libassa Library.

#===============================================================================
# libassa-devel package 
#===============================================================================

%package    doc
Summary:    HTML formatted API documentation for libassa library.
Group:      Development/Libraries

%description doc
This package contains Doxygen-generated class reference of libassa Library.

#===============================================================================
# preparation section
#===============================================================================

%prep
%setup -q

#===============================================================================
# build section
#===============================================================================

%build
%configure \
    --disable-rpath      \
    --disable-static     \
    --enable-shared      \
    --disable-selftests  \
    --disable-examples

# Disable rpaths, because --disable-rpath is not supported yet.
sed -i 's|\(^hardcode_libdir_flag_spec=\).*|\1""|g' libtool
sed -i 's|\(^runpath_var=\)LD_RUN_PATH|\1DIE_RPATH_DIE|g' libtool

%{__make} %{?_smp_mflags}

#===============================================================================
# install section
#===============================================================================

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install

rm -rf __docdir ; mkdir __docdir
mv %{buildroot}%{_datadir}/doc/%{name}-%{version}/* __docdir

### Clean up buildroot
%{__rm} -f %{buildroot}%{_libdir}/*.la

%check
# FAIL: sighands.test
#make check

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

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

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/*.so.*


%files  devel
%defattr(-, root, root, -)
%{_bindir}/*
%{_includedir}/assa-3.4/
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so

%files doc
%defattr(-, root, root, -)
%doc __docdir/*.html __docdir/html/


%changelog
* Mon Oct 16 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.4.2-3
- disable rpaths
- disable static libs
- build tests and add %%check section for them
- BR doxygen and fix inclusion of HTML files
- execute /sbin/ldconfig in scriptlets directly
- don't use %%makeinstall

* Thu Oct 12 2006 Vladislav Grinchenko <vlg[AT]users.sourceforge.net> - 3.4.2-0
- Overall makeup to adhere to the RPM packaging guidelines.

* Wed Jul 19 2006 Vladislav Grinchenko <vlg[AT]users.sourceforge.net>
- disabled tests and examples in configure step

* Sun Mar 20 2005 Vladislav Grinchenko <vlg[AT]users.sourceforge.net>
- add distribution tag

* Tue Mar  1 2005 Vladislav Grinchenko <vlg[AT]users.sourceforge.net>
- fix documentation installation error

* Sun Dec 12 2004 Vladislav Grinchenko <vlg[AT]users.sourceforge.net>
- fix postrun spelling error

* Tue Aug  6 2002 Vladislav Grinchenko <vladg at erols.com>
- first public release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2006 01:51:17 -0000	1.1
+++ .cvsignore	22 Oct 2006 01:52:48 -0000	1.2
@@ -0,0 +1 @@
+libassa-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Oct 2006 01:51:17 -0000	1.1
+++ sources	22 Oct 2006 01:52:48 -0000	1.2
@@ -0,0 +1 @@
+380cf1e782d42bab2c58500965b2198b  libassa-3.4.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 01:59:48 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 18:59:48 -0700
Subject: owners owners.list,1.1863,1.1864
Message-ID: <200610220159.k9M1xmCJ024027@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24011

Modified Files:
	owners.list 
Log Message:
Added libassa entry (new package).



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1863
retrieving revision 1.1864
diff -u -r1.1863 -r1.1864
--- owners.list	22 Oct 2006 01:50:50 -0000	1.1863
+++ owners.list	22 Oct 2006 01:59:18 -0000	1.1864
@@ -835,6 +835,7 @@
 Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libapreq2|Apache HTTP request library|bojan at rexursive.com|extras-qa at fedoraproject.org|
+Fedora Extras|libassa|C++ network-oriented application framework|3rdshift at comcast.net|extras-qa at fedoraproject.org|
 Fedora Extras|libassetml|XML resource database library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libatomic_ops|Atomic memory update operations|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 22 02:02:37 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:02:37 -0700
Subject: rpms/granule - New directory
Message-ID: <200610220202.k9M22ba4026984@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26980/granule

Log Message:
Directory /cvs/extras/rpms/granule added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 02:02:46 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:02:46 -0700
Subject: rpms/granule/devel - New directory
Message-ID: <200610220202.k9M22k4c026995@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26980/granule/devel

Log Message:
Directory /cvs/extras/rpms/granule/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 02:03:16 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:03:16 -0700
Subject: rpms/granule Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610220203.k9M23GBL027029@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023

Added Files:
	Makefile import.log 
Log Message:
Setup of module granule


--- NEW FILE Makefile ---
# Top level Makefile for module granule
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 22 02:03:24 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:03:24 -0700
Subject: rpms/granule/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610220203.k9M23OVc027045@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module granule


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 22 02:05:05 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:05:05 -0700
Subject: rpms/granule import.log,1.1,1.2
Message-ID: <200610220205.k9M255wN027120@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27085

Modified Files:
	import.log 
Log Message:
auto-import granule-1.2.3-2 on branch devel from granule-1.2.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/granule/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Oct 2006 02:03:16 -0000	1.1
+++ import.log	22 Oct 2006 02:04:34 -0000	1.2
@@ -0,0 +1 @@
+granule-1_2_3-2:HEAD:granule-1.2.3-2.src.rpm:1161482660



From fedora-extras-commits at redhat.com  Sun Oct 22 02:05:07 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:05:07 -0700
Subject: rpms/granule/devel granule.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610220205.k9M257nd027124@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27085/devel

Modified Files:
	.cvsignore sources 
Added Files:
	granule.spec 
Log Message:
auto-import granule-1.2.3-2 on branch devel from granule-1.2.3-2.src.rpm


--- NEW FILE granule.spec ---
Summary:    Flashcards program based on Leitner methodology
Name:       granule
Version:    1.2.3
Release:    2
License:    GPL
Group:      Applications/Multimedia
URL:        http://granule.sourceforge.net/
Source:     http://dl.sf.net/sourceforge/granule/granule-%{version}.tar.gz 
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires: gtkmm24-devel >= 2.4.0
BuildRequires: libassa-devel
BuildRequires: libxml2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
# Only for the glib-gettextize and intltoolize hack.
BuildRequires: glib2-devel intltool

%description 
granule is a flashcard program that implements Leither cardfile
methodology for learing new words. It features both short-term and
long-term memory training capabilities with scheduling.


%prep
%setup -q


%build
glib-gettextize --copy --force
intltoolize --automake --copy --force
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
%find_lang %{name} --with-gnome

mkdir -p -m0755 ${RPM_BUILD_ROOT}%{_datadir}/granule/pixmaps
mkdir -p -m0755 ${RPM_BUILD_ROOT}%{_datadir}/granule/xml

install -p -m 0644 granule ${RPM_BUILD_ROOT}%{_datadir}/granule/
install -p -m 0644 pixmaps/*.png ${RPM_BUILD_ROOT}%{_datadir}/granule/pixmaps/
install -p -m 0644 *.dtd ${RPM_BUILD_ROOT}%{_datadir}/granule/xml/

desktop-file-install --vendor ""  \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications  \
        --add-category X-Fedora  \
        %{name}.desktop


%clean
%{__rm} -rf ${RPM_BUILD_ROOT}


%files -f %{name}.lang
%defattr(-,root,root, -)
%doc COPYING AUTHORS README ChangeLog NEWS 
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}/


%changelog
* Wed Oct 18 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.3-2
- Fix missing BR and remaining spec issues.

* Sat Oct 14 2006 Vladislav Grinchenko <vlg at users.sourceforge.net> - 1.2.3
- Overall makeup to adhere to the RPM packaging guidelines.

* Sun Nov  6 2005 Vladislav Grinchenko <vlg at users.sourceforge.net> 
- Fixed License tag

* Mon Jul  4 2005 Vladislav Grinchenko <vlg at users.sourceforge.net> 
- Changed XML dir.
 
* Thu Jun  3 2004 Vladislav Grinchenko <vlg at users.sourceforge.net> - 1.0.0
- Initial release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2006 02:03:24 -0000	1.1
+++ .cvsignore	22 Oct 2006 02:04:37 -0000	1.2
@@ -0,0 +1 @@
+granule-1.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Oct 2006 02:03:24 -0000	1.1
+++ sources	22 Oct 2006 02:04:37 -0000	1.2
@@ -0,0 +1 @@
+21b5210318b2836592d265e8b58c8740  granule-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 02:09:53 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 21 Oct 2006 19:09:53 -0700
Subject: owners owners.list,1.1864,1.1865
Message-ID: <200610220209.k9M29rj1027276@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27253

Modified Files:
	owners.list 
Log Message:
Added new project entry (granule).



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1864
retrieving revision 1.1865
diff -u -r1.1864 -r1.1865
--- owners.list	22 Oct 2006 01:59:18 -0000	1.1864
+++ owners.list	22 Oct 2006 02:09:23 -0000	1.1865
@@ -594,6 +594,7 @@
 Fedora Extras|grace|Numerical Data Processing and Visualization Tool|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|grads|Tool for easy acces, manipulation, and visualization of data|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|granule|Flashcards program based on Leitner methodology|3rdshift at comcast.net|extras-qa at fedoraproject.org|
 Fedora Extras|graphviz|Graph Visualization Tools|jima at beer.tclug.org|extras-qa at fedoraproject.org|ellson at research.att.com
 Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|grepmail|Search mailboxes for a particular email|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Oct 22 03:18:08 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sat, 21 Oct 2006 20:18:08 -0700
Subject: rpms/libburn/devel libburn.spec,1.3,1.4
Message-ID: <200610220318.k9M3I8qw030488@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/libburn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30472

Modified Files:
	libburn.spec 
Log Message:
We have an upstream tarball, actually point it it in the Source



Index: libburn.spec
===================================================================
RCS file: /cvs/extras/rpms/libburn/devel/libburn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libburn.spec	21 Oct 2006 19:41:12 -0000	1.3
+++ libburn.spec	22 Oct 2006 03:17:37 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           libburn
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libburn.pykix.org/
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://libburn-download.pykix.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake libtool intltool gettext doxygen graphviz
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-2
+- Point to a real URL in source, now that we have a tarball
+
 * Fri Oct 20 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-1
 - 0.2.2 release
 



From fedora-extras-commits at redhat.com  Sun Oct 22 03:26:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:26:49 -0700
Subject: rpms/ntfsprogs - New directory
Message-ID: <200610220326.k9M3QnrD030565@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30561/ntfsprogs

Log Message:
Directory /cvs/extras/rpms/ntfsprogs added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 03:26:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:26:55 -0700
Subject: rpms/ntfsprogs/devel - New directory
Message-ID: <200610220326.k9M3QtLv030579@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30561/ntfsprogs/devel

Log Message:
Directory /cvs/extras/rpms/ntfsprogs/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 22 03:27:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:27:08 -0700
Subject: rpms/ntfsprogs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610220327.k9M3R8QK030610@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30604

Added Files:
	Makefile import.log 
Log Message:
Setup of module ntfsprogs


--- NEW FILE Makefile ---
# Top level Makefile for module ntfsprogs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 22 03:27:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:27:13 -0700
Subject: rpms/ntfsprogs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610220327.k9M3RDe9030626@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30604/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ntfsprogs


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 22 03:28:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:28:27 -0700
Subject: rpms/ntfsprogs import.log,1.1,1.2
Message-ID: <200610220328.k9M3SRCx030698@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666

Modified Files:
	import.log 
Log Message:
auto-import ntfsprogs-1.13.1-3.fc6 on branch devel from ntfsprogs-1.13.1-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ntfsprogs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Oct 2006 03:27:07 -0000	1.1
+++ import.log	22 Oct 2006 03:27:57 -0000	1.2
@@ -0,0 +1 @@
+ntfsprogs-1_13_1-3_fc6:HEAD:ntfsprogs-1.13.1-3.fc6.src.rpm:1161487682



From fedora-extras-commits at redhat.com  Sun Oct 22 03:28:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:28:28 -0700
Subject: rpms/ntfsprogs/devel ntfsprogs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610220328.k9M3SSZw030702@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ntfsprogs.spec 
Log Message:
auto-import ntfsprogs-1.13.1-3.fc6 on branch devel from ntfsprogs-1.13.1-3.fc6.src.rpm


--- NEW FILE ntfsprogs.spec ---
Name:		ntfsprogs
Version:	1.13.1
Release:	3%{?dist}
Summary:	NTFS filesystem libraries and utilities
Source0:	http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.gz
License:	GPL
URL:		http://www.linux-ntfs.org/
Group:		System Environment/Base
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	glib2-devel, gnome-vfs2-devel, libtool
BuildRequires:	libgcrypt-devel, gnutls-devel

%description
The Linux-NTFS project (http://www.linux-ntfs.org/) aims to bring full support
for the NTFS filesystem to the Linux operating system.  The ntfsprogs package
currently consists of a library and utilities such as mkntfs, ntfscat, ntfsls, 
ntfsresize, and ntfsundelete (for a full list of included utilities see man 8 
ntfsprogs after installation).

%package gnomevfs
Summary:	NTFS GNOME virtual filesystem module
Group:		System Environment/Base
Requires:	%{name} = %{version}-%{release}
Requires:	glib2, gnome-vfs2

%description gnomevfs
This package contains the NTFS GNOME virtual filesystem (VFS) module which
allows GNOME VFS clients to seamlessly utilize the NTFS library (libntfs).

%package devel
Summary:	Headers and libraries for libntfs
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
This package includes the header files and libraries needed to link software
with the NTFS library (libntfs).

%prep
%setup -q

%build
# If we need to enable the fuse module, we'd change this.
# The ntfs-3g stuff is better than what is here currently, so we'll let people use it.
%configure --enable-gnome-vfs --disable-fuse-module --disable-static --enable-test --enable-crypto
make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} extra

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# the extra files have to be manually installed
install -m0755 ntfsprogs/ntfsdump_logfile $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfswipe $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfstruncate $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfsmove $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfsmftalloc $RPM_BUILD_ROOT%{_bindir}
install -m0755 ntfsprogs/ntfsdecrypt $RPM_BUILD_ROOT%{_bindir}

# We're not including ntfsmount, so we don't need the manpages
rm -rf $RPM_BUILD_ROOT%{_mandir}/man8/ntfsmount*

# Libtool files go bye bye
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.la

# Clear up symlink confusion by making a copy
rm -rf $RPM_BUILD_ROOT/sbin/mkfs.ntfs
cp -a $RPM_BUILD_ROOT%{_sbindir}/mkntfs $RPM_BUILD_ROOT/sbin/mkfs.ntfs

# runlist isn't really useful
rm -rf $RPM_BUILD_ROOT%{_bindir}/runlist

# Also, these static libs aren't really useful.
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.a

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO.include TODO.libntfs TODO.ntfsprogs 
%doc doc/attribute_definitions doc/attributes.txt doc/compression.txt doc/tunable_settings 
%doc doc/system_files.txt doc/system_security_descriptors.txt
%{_bindir}/*
%{_sbindir}/*
/sbin/mkfs.ntfs
%{_mandir}/man8/mkntfs.8*
%{_mandir}/man8/mkfs.ntfs.8*
%{_mandir}/man8/ntfs[^m][^o]*.8*
%{_libdir}/libntfs.*so.*

%files gnomevfs
%defattr(-,root,root,-)
%{_mandir}/man8/libntfs-gnomevfs.8*
%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so*
%config(noreplace) %{_sysconfdir}/gnome-vfs-2.0/modules/libntfs.conf

%files devel
%defattr(-,root,root,-)
%doc doc/CodingStyle doc/template.h doc/template.c
%{_includedir}/*
%{_libdir}/libntfs.so
%{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so.*

%changelog
* Sat Oct 21 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-3
- really fix rpath
- nuke static libs
- build the "extra" files and install them
- get rid of "runlist"

* Sat Oct 21 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-2
- enable crypto
- enable test suite
- use system libtool to eliminate rpath for lib64

* Fri Oct 20 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.13.1-1
- initial release for Fedora, deuglify upstream spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfsprogs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2006 03:27:13 -0000	1.1
+++ .cvsignore	22 Oct 2006 03:27:58 -0000	1.2
@@ -0,0 +1 @@
+ntfsprogs-1.13.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfsprogs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Oct 2006 03:27:13 -0000	1.1
+++ sources	22 Oct 2006 03:27:58 -0000	1.2
@@ -0,0 +1 @@
+23160eb8d34abe3d2a88cd6d054faa47  ntfsprogs-1.13.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 03:37:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 21 Oct 2006 20:37:28 -0700
Subject: owners owners.list,1.1865,1.1866
Message-ID: <200610220337.k9M3bSvS030980@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30960

Modified Files:
	owners.list 
Log Message:

ntfs-3g and ntfsprogs




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1865
retrieving revision 1.1866
diff -u -r1.1865 -r1.1866
--- owners.list	22 Oct 2006 02:09:23 -0000	1.1865
+++ owners.list	22 Oct 2006 03:36:58 -0000	1.1866
@@ -1153,6 +1153,8 @@
 Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora at leemhuis.info
 Fedora Extras|nqc|Not Quite C compiler for Lego's RCX bricks|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|nsd|NSD is a complete implementation of an authoritative DNS name server|paul at xelerance.com|extras-qa at fedoraproject.org|
+Fedora Extras|ntfs-3g|Linux NTFS userspace driver|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ntfsprogs|NTFS filesystem libraries and utilities|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ntl|High-performance algorithms for vectors, matrices, and polynomials|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|nucleo|Toolkit for exploring new uses of video|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|chris.stone at gmail.com
 Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 22 11:39:04 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 22 Oct 2006 04:39:04 -0700
Subject: rpms/python-reportlab/FC-3 python-reportlab.spec,1.5,1.6
Message-ID: <200610221139.k9MBd4Vr007516@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-reportlab/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7500

Modified Files:
	python-reportlab.spec 
Log Message:
sync this with FC-4 and fix incomplete FC-3 build


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/FC-3/python-reportlab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-reportlab.spec	7 Apr 2005 14:51:21 -0000	1.5
+++ python-reportlab.spec	22 Oct 2006 11:38:34 -0000	1.6
@@ -1,9 +1,9 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		python-reportlab
 Version:	1.20
-Release:	2.fc3
+Release:	3.fc3
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -12,6 +12,7 @@
 Source0:	http://www.reportlab.org/ftp/ReportLab_1_20.tgz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:	python-devel >= 2.2
 Requires:	python-abi = %{pyver}
@@ -34,9 +35,9 @@
 cd ./reportlab
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 
-rm -f ${RPM_BUILD_ROOT}%{python_sitearch}/reportlab/README
-rm -f ${RPM_BUILD_ROOT}%{python_sitearch}/reportlab/changes
-rm -f ${RPM_BUILD_ROOT}%{python_sitearch}/reportlab/license.txt
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
+rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,14 +46,19 @@
 %files
 %defattr(-,root,root,-)
 %doc reportlab/README reportlab/changes reportlab/license.txt
-%{python_sitearch}/*
+%{python_sitelib}/*
 
 
 %changelog
+* Mon May  9 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-3.fc3
+- Switchback to sitelib patch.
+- Make package noarch.
+
 * Thu Apr  7 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-2.fc3
 - Use python_sitearch to fix x86_64 build.
 
 * Wed Mar 30 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-1.fc3
+- Rebuild for Python 2.4.
 - Update to 1.20.
 - Switch to the new python macros for python-abi
 - Add dist tag.



From fedora-extras-commits at redhat.com  Sun Oct 22 12:12:45 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sun, 22 Oct 2006 05:12:45 -0700
Subject: rpms/pan/devel pan.spec,1.21,1.22
Message-ID: <200610221212.k9MCCjCl010641@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10624

Modified Files:
	pan.spec 
Log Message:
Update to current upstream release.

"This week's release improves download speed and has many mall bug fixes."




Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pan.spec	15 Oct 2006 11:01:27 -0000	1.21
+++ pan.spec	22 Oct 2006 12:12:15 -0000	1.22
@@ -1,6 +1,6 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.116
+Version:	0.117
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 22 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.117-1
+- Update to 0.117
+
 * Sun Oct 15 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.116-1
 - Update to 0.116
 



From fedora-extras-commits at redhat.com  Sun Oct 22 12:18:33 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sun, 22 Oct 2006 05:18:33 -0700
Subject: rpms/pan/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <200610221218.k9MCIXpr010712@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10694

Modified Files:
	.cvsignore sources 
Log Message:
Update to current upstream version.

"This week's release improves download speed and has many mall bug fixes."




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Oct 2006 11:01:27 -0000	1.12
+++ .cvsignore	22 Oct 2006 12:18:03 -0000	1.13
@@ -1 +1 @@
-pan-0.116.tar.bz2
+pan-0.117.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Oct 2006 11:01:27 -0000	1.12
+++ sources	22 Oct 2006 12:18:03 -0000	1.13
@@ -1 +1 @@
-590587dea07f23f5e87562fdddd67d4a  pan-0.116.tar.bz2
+0545c24799f675db73f77cd3fa0bffa0  pan-0.117.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 22 12:38:38 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Sun, 22 Oct 2006 05:38:38 -0700
Subject: rpms/yumex/devel .cvsignore, 1.24, 1.25 sources, 1.32,
	1.33 yumex.spec, 1.37, 1.38
Message-ID: <200610221238.k9MCccDo010883@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10835

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 1.1.5-1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	8 Oct 2006 07:24:22 -0000	1.24
+++ .cvsignore	22 Oct 2006 12:38:08 -0000	1.25
@@ -1 +1 @@
-yumex-1.1.4.tar.gz
+yumex-1.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	8 Oct 2006 07:24:22 -0000	1.32
+++ sources	22 Oct 2006 12:38:08 -0000	1.33
@@ -1 +1 @@
-7c6d3ec4d113ca897f5889ebd3112757  yumex-1.1.4.tar.gz
+028fd37ed2dc0f473d244465a2150fbd  yumex-1.1.5.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- yumex.spec	9 Oct 2006 07:06:21 -0000	1.37
+++ yumex.spec	22 Oct 2006 12:38:08 -0000	1.38
@@ -1,6 +1,6 @@
 Name:     yumex
-Version:  1.1.4
-Release:  2.0%{?dist}
+Version:  1.1.5
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-1.0
+- Development Release 1.1.5-1.0
 * Mon Oct 9 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-2.0
 - Development Release 1.1.4-2.0
 - Updated Requires: yum >= 3.0.0 to yum >= 3.0



From fedora-extras-commits at redhat.com  Sun Oct 22 13:48:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 22 Oct 2006 06:48:32 -0700
Subject: rpms/asymptote/FC-4 .cvsignore, 1.8, 1.9 asymptote.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200610221348.k9MDmWYF014262@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207/FC-4

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2006 16:01:23 -0000	1.8
+++ .cvsignore	22 Oct 2006 13:48:02 -0000	1.9
@@ -1 +1 @@
-asymptote-1.13.tar.gz
+asymptote-1.15.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/asymptote.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- asymptote.spec	6 Sep 2006 16:01:23 -0000	1.9
+++ asymptote.spec	22 Oct 2006 13:48:02 -0000	1.10
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.13
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2006 16:01:23 -0000	1.8
+++ sources	22 Oct 2006 13:48:02 -0000	1.9
@@ -1 +1 @@
-c1d2461ac846ab5e16c46fffd1dc1935  asymptote-1.13.tar.gz
+0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 13:48:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 22 Oct 2006 06:48:33 -0700
Subject: rpms/asymptote/devel .cvsignore, 1.8, 1.9 asymptote.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200610221348.k9MDmX2p014270@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207/devel

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2006 15:43:06 -0000	1.8
+++ .cvsignore	22 Oct 2006 13:48:03 -0000	1.9
@@ -1 +1 @@
-asymptote-1.13.tar.gz
+asymptote-1.15.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- asymptote.spec	6 Sep 2006 15:43:06 -0000	1.9
+++ asymptote.spec	22 Oct 2006 13:48:03 -0000	1.10
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.13
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2006 15:43:06 -0000	1.8
+++ sources	22 Oct 2006 13:48:03 -0000	1.9
@@ -1 +1 @@
-c1d2461ac846ab5e16c46fffd1dc1935  asymptote-1.13.tar.gz
+0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 13:48:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 22 Oct 2006 06:48:32 -0700
Subject: rpms/asymptote/FC-5 .cvsignore, 1.8, 1.9 asymptote.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200610221348.k9MDmWQi014267@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207/FC-5

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2006 16:01:26 -0000	1.8
+++ .cvsignore	22 Oct 2006 13:48:02 -0000	1.9
@@ -1 +1 @@
-asymptote-1.13.tar.gz
+asymptote-1.15.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/asymptote.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- asymptote.spec	6 Sep 2006 16:01:26 -0000	1.9
+++ asymptote.spec	22 Oct 2006 13:48:02 -0000	1.10
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.13
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
 - Update to 1.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2006 16:01:26 -0000	1.8
+++ sources	22 Oct 2006 13:48:02 -0000	1.9
@@ -1 +1 @@
-c1d2461ac846ab5e16c46fffd1dc1935  asymptote-1.13.tar.gz
+0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 15:09:13 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 22 Oct 2006 08:09:13 -0700
Subject: rpms/jd/devel .cvsignore,1.5,1.6 jd.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <200610221509.k9MF9DYC020576@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20556

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 12:21:27 -0000	1.5
+++ .cvsignore	22 Oct 2006 15:08:43 -0000	1.6
@@ -1 +1 @@
-jd-1.8.0-beta061009.tgz
+jd-1.8.0-cvs061022.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jd.spec	9 Oct 2006 12:21:27 -0000	1.5
+++ jd.spec	22 Oct 2006 15:08:43 -0000	1.6
@@ -4,19 +4,22 @@
 # enter return
 # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.jp:/cvsroot/jd4linux co jd
 # mv jd jd-%%{main_ver}-%%{strtag}
+# tar -cvz jd-%%{main_ver}-%%{strtag}.tgz jd-%%{main_ver}-%%{strtag}
 #
 ##########################################
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061009
+%define         strtag        cvs061022
 %define         repoid        22118
 
 
 # Defined by vendor
 #
 %define         vendor_rel    1
-%define         vendor        fedora
+# Tag name changed from vendor to vendorname so as not to
+# overwrite Vendor entry in Summary
+%define         vendorname    fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
@@ -41,8 +44,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -76,7 +79,7 @@
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 desktop-file-install \
-   --vendor %{vendor} \
+   --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category %{category} \
    %{name}.desktop
@@ -96,12 +99,15 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
-%{_datadir}/applications/%{vendor}-%{name}.desktop
+%{_datadir}/applications/%{vendorname}-%{name}.desktop
 %{icondir}/%{name}.png
 
 %changelog
+* 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 a061009
+- 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 12:21:27 -0000	1.5
+++ sources	22 Oct 2006 15:08:43 -0000	1.6
@@ -1 +1 @@
-b71195e64e520b745885120b2d77c5c2  jd-1.8.0-beta061009.tgz
+f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz



From fedora-extras-commits at redhat.com  Sun Oct 22 15:10:41 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sun, 22 Oct 2006 08:10:41 -0700
Subject: rpms/pan/devel pan.spec,1.22,1.23
Message-ID: <200610221510.k9MFAfOb020611@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20590

Modified Files:
	pan.spec 
Log Message:
Bump release to correct cvs committing mistake




Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pan.spec	22 Oct 2006 12:12:15 -0000	1.22
+++ pan.spec	22 Oct 2006 15:10:11 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
 Version:	0.117
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 22 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.117-2
+- Bump release to correct cvs commit mistake
+
 * Sun Oct 22 2006 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.117-1
 - Update to 0.117
 



From fedora-extras-commits at redhat.com  Sun Oct 22 15:11:27 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 22 Oct 2006 08:11:27 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.4,1.5 jd.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <200610221511.k9MFBR4f020675@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20646

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Oct 2006 13:07:35 -0000	1.4
+++ .cvsignore	22 Oct 2006 15:10:57 -0000	1.5
@@ -1 +1 @@
-jd-1.8.0-beta061009.tgz
+jd-1.8.0-cvs061022.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jd.spec	9 Oct 2006 13:07:35 -0000	1.4
+++ jd.spec	22 Oct 2006 15:10:57 -0000	1.5
@@ -4,19 +4,22 @@
 # enter return
 # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.jp:/cvsroot/jd4linux co jd
 # mv jd jd-%%{main_ver}-%%{strtag}
+# tar -cvz jd-%%{main_ver}-%%{strtag}.tgz jd-%%{main_ver}-%%{strtag}
 #
 ##########################################
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061009
+%define         strtag        cvs061022
 %define         repoid        22118
 
 
 # Defined by vendor
 #
 %define         vendor_rel    1
-%define         vendor        fedora
+# Tag name changed from vendor to vendorname so as not to
+# overwrite Vendor entry in Summary
+%define         vendorname    fedora
 %define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
@@ -41,8 +44,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -76,7 +79,7 @@
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 desktop-file-install \
-   --vendor %{vendor} \
+   --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category %{category} \
    %{name}.desktop
@@ -96,12 +99,15 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
-%{_datadir}/applications/%{vendor}-%{name}.desktop
+%{_datadir}/applications/%{vendorname}-%{name}.desktop
 %{icondir}/%{name}.png
 
 %changelog
+* 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 a061009
+- 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Oct 2006 13:07:35 -0000	1.4
+++ sources	22 Oct 2006 15:10:57 -0000	1.5
@@ -1 +1 @@
-b71195e64e520b745885120b2d77c5c2  jd-1.8.0-beta061009.tgz
+f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz



From fedora-extras-commits at redhat.com  Sun Oct 22 15:28:43 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 22 Oct 2006 08:28:43 -0700
Subject: rpms/python-reportlab/FC-3 python-reportlab.spec,1.6,1.7
Message-ID: <200610221528.k9MFShTk020806@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/python-reportlab/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20790

Modified Files:
	python-reportlab.spec 
Log Message:
apparently it still does not build on x86_64, will add more to bug #211766


Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/FC-3/python-reportlab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-reportlab.spec	22 Oct 2006 11:38:34 -0000	1.6
+++ python-reportlab.spec	22 Oct 2006 15:28:13 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		python-reportlab
 Version:	1.20
-Release:	3.fc3
+Release:	3.fc3.1
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -32,9 +32,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+# Hack. See spec changelog.
+mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}
+ln -s lib ${RPM_BUILD_ROOT}%{_prefix}/lib64
+
 cd ./reportlab
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 
+# Hack. See spec changelog.
+rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib64
+
 rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/README
 rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/changes
 rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/reportlab/license.txt
@@ -50,6 +58,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.20-3.fc3.1
+- Hack the spec to make this build as noarch on x86_64, too.
+
 * Mon May  9 2005 Brian Pepple <bdpepple at ameritech.net> - 1.20-3.fc3
 - Switchback to sitelib patch.
 - Make package noarch.



From fedora-extras-commits at redhat.com  Sun Oct 22 17:57:17 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 22 Oct 2006 10:57:17 -0700
Subject: rpms/dejavu-fonts import.log,1.87,1.88
Message-ID: <200610221757.k9MHvHXt027313@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27278

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.11-1.fc6 on branch devel from dejavu-fonts-2.11-1.fc6.src.rpm
2.11


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- import.log	24 Sep 2006 10:44:46 -0000	1.87
+++ import.log	22 Oct 2006 17:56:47 -0000	1.88
@@ -84,3 +84,4 @@
 dejavu-fonts-2_10-1_fc6:HEAD:dejavu-fonts-2.10-1.fc6.src.rpm:1158499493
 dejavu-fonts-2_10-1_fc5:FC-5:dejavu-fonts-2.10-1.fc5.src.rpm:1158500068
 dejavu-fonts-2_10_0-2_fc6:HEAD:dejavu-fonts-2.10.0-2.fc6.src.rpm:1159094676
+dejavu-fonts-2_11-1_fc6:HEAD:dejavu-fonts-2.11-1.fc6.src.rpm:1161539797



From fedora-extras-commits at redhat.com  Sun Oct 22 17:57:18 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 22 Oct 2006 10:57:18 -0700
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.23,
	1.24 dejavu-fonts-experimental-fontconfig.conf, 1.5,
	1.6 dejavu-fonts.spec, 1.46, 1.47 sources, 1.23,
	1.24 dejavu-fonts-condensed-fontconfig.conf, 1.1, NONE
Message-ID: <200610221757.k9MHvIlA027319@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27278/devel

Modified Files:
	.cvsignore dejavu-fonts-experimental-fontconfig.conf 
	dejavu-fonts.spec sources 
Removed Files:
	dejavu-fonts-condensed-fontconfig.conf 
Log Message:
auto-import dejavu-fonts-2.11-1.fc6 on branch devel from dejavu-fonts-2.11-1.fc6.src.rpm
2.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	17 Sep 2006 13:25:04 -0000	1.23
+++ .cvsignore	22 Oct 2006 17:56:48 -0000	1.24
@@ -1 +1 @@
-dejavu-sfd-2.10.tar.gz
+dejavu-sfd-2.11.tar.gz


Index: dejavu-fonts-experimental-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-experimental-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dejavu-fonts-experimental-fontconfig.conf	24 Sep 2006 10:44:47 -0000	1.5
+++ dejavu-fonts-experimental-fontconfig.conf	22 Oct 2006 17:56:48 -0000	1.6
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/58-dejavu-experimental.conf
+<!-- /etc/fonts/conf.d/61-dejavu-experimental.conf
 
      Define aliasing and other fontconfig settings for
      DejaVu experimental families
@@ -43,22 +43,14 @@
   </match>
 <!-- Assign generic name -->
   <alias>
-    <family>DejaVu Sans Condensed</family>
-    <default>
-      <family>condensed</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Serif Condensed</family>
-    <default>
-      <family>condensed</family>
-    </default>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans Condensed</family>
+    </prefer>
   </alias>
-<!-- Alias generic names -->
   <alias>
-    <family>condensed</family>
+    <family>serif</family>
     <prefer>
-      <family>DejaVu Sans Condensed</family>
       <family>DejaVu Serif Condensed</family>
     </prefer>
   </alias>


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- dejavu-fonts.spec	24 Sep 2006 10:44:47 -0000	1.46
+++ dejavu-fonts.spec	22 Oct 2006 17:56:48 -0000	1.47
@@ -2,7 +2,7 @@
 # This macro has the same value as %{version}, except when testing pre-release snapshots
 #%define alphatag        20060913svn1149
 
-%define archiveversion  2.10
+%define archiveversion  2.11
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 
@@ -11,8 +11,8 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.10.0
-Release:   2%{?dist}
+Version:   2.11
+Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -22,10 +22,8 @@
 Source1:   %{name}-fontconfig.conf
 # DejaVu fontconfig setup (experimental families)
 Source2:   %{name}-experimental-fontconfig.conf
-# Declare fontconfig condensed generic
-Source3:   %{name}-condensed-fontconfig.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fontforge
+BuildRequires: fontforge >= 20061019-1
 # The CPAN sources do not declare perl(Font::TTF)
 BuildRequires: perl-Font-TTF
 # Needed to compute unicode coverage
@@ -39,6 +37,9 @@
 Obsoletes: %{name}-makedefault < 2.9.0-1
 Obsoletes: %{name}-block < 2.9.0-1
 
+Provides: %{name}-makedefault = %{version}
+Provides: %{name}-fontconfig = %{version}
+
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -95,8 +96,7 @@
 # Fontconfig overrides for some scripts
 install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
 install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
-install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/58-dejavu-experimental.conf
-install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/41-condensed.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
 
 %clean
 /bin/rm -rf %{buildroot}
@@ -146,8 +146,7 @@
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config %{fontconfdir}/conf.d/41-condensed.conf
-%config %{fontconfdir}/conf.d/58-dejavu-experimental.conf
+%config %{fontconfdir}/conf.d/61-dejavu-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -155,6 +154,11 @@
 
 
 %changelog
+* Sun Oct 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.11
+- forget about the "condensed" generic, based on current feedback
+- new minimal fontforge BR
+
 * Sun Sep 24 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.10.0-2
 - rebuild with new fontforge snapshot


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Sep 2006 13:25:04 -0000	1.23
+++ sources	22 Oct 2006 17:56:48 -0000	1.24
@@ -1 +1 @@
-2d0c48afaba583833d90d30ff33d320a  dejavu-sfd-2.10.tar.gz
+64a34c66b1dbbdaccc108bd40a101d9c  dejavu-sfd-2.11.tar.gz


--- dejavu-fonts-condensed-fontconfig.conf DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 22 18:06:58 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 22 Oct 2006 11:06:58 -0700
Subject: rpms/dejavu-fonts import.log,1.88,1.89
Message-ID: <200610221806.k9MI6wVr030388@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30354

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.11-1.fc5 on branch FC-5 from dejavu-fonts-2.11-1.fc5.src.rpm
2.11


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- import.log	22 Oct 2006 17:56:47 -0000	1.88
+++ import.log	22 Oct 2006 18:06:28 -0000	1.89
@@ -85,3 +85,4 @@
 dejavu-fonts-2_10-1_fc5:FC-5:dejavu-fonts-2.10-1.fc5.src.rpm:1158500068
 dejavu-fonts-2_10_0-2_fc6:HEAD:dejavu-fonts-2.10.0-2.fc6.src.rpm:1159094676
 dejavu-fonts-2_11-1_fc6:HEAD:dejavu-fonts-2.11-1.fc6.src.rpm:1161539797
+dejavu-fonts-2_11-1_fc5:FC-5:dejavu-fonts-2.11-1.fc5.src.rpm:1161540378



From fedora-extras-commits at redhat.com  Sun Oct 22 18:06:59 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 22 Oct 2006 11:06:59 -0700
Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.19,
	1.20 dejavu-fonts-experimental-fontconfig.conf, 1.3,
	1.4 dejavu-fonts-fontconfig.conf, 1.4, 1.5 dejavu-fonts.spec,
	1.28, 1.29 sources, 1.19, 1.20
Message-ID: <200610221806.k9MI6xN2030395@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30354/FC-5

Modified Files:
	.cvsignore dejavu-fonts-experimental-fontconfig.conf 
	dejavu-fonts-fontconfig.conf dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.11-1.fc5 on branch FC-5 from dejavu-fonts-2.11-1.fc5.src.rpm
2.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	17 Sep 2006 13:34:39 -0000	1.19
+++ .cvsignore	22 Oct 2006 18:06:29 -0000	1.20
@@ -1 +1 @@
-dejavu-sfd-2.10.tar.gz
+dejavu-sfd-2.11.tar.gz


Index: dejavu-fonts-experimental-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-experimental-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dejavu-fonts-experimental-fontconfig.conf	17 Sep 2006 13:34:39 -0000	1.3
+++ dejavu-fonts-experimental-fontconfig.conf	22 Oct 2006 18:06:29 -0000	1.4
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/58-dejavu-experimental.conf
+<!-- /etc/fonts/conf.d/61-dejavu-experimental.conf
 
-     Define aliasing and other fontconfig stuff for DejaVu experimental
-     families
+     Define aliasing and other fontconfig settings for
+     DejaVu experimental families
 
      ?? 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-
-     $Id$
 -->
 <fontconfig>
 <!-- Declare substitutes -->
@@ -45,16 +43,16 @@
   </match>
 <!-- Assign generic name -->
   <alias>
-    <family>DejaVu Sans Condensed</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans Condensed</family>
+    </prefer>
   </alias>
   <alias>
-    <family>DejaVu Serif Condensed</family>
-    <default>
-      <family>serif</family>
-    </default>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu Serif Condensed</family>
+    </prefer>
   </alias>
 <!-- Turn off hinting at small sizes -->
   <match target="font">


Index: dejavu-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dejavu-fonts-fontconfig.conf	17 Sep 2006 13:34:39 -0000	1.4
+++ dejavu-fonts-fontconfig.conf	22 Oct 2006 18:06:29 -0000	1.5
@@ -2,11 +2,10 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/conf.d/58-dejavu.conf
 
-     Define aliasing and other fontconfig settings for DejaVu stable families
+     Define aliasing and other fontconfig settings for
+     DejaVu stable families
 
      ?? 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-
-     $Id$
 -->
 <fontconfig>
 <!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans
@@ -179,30 +178,24 @@
     </default>
   </alias>
 <!-- Alias generic names -->
-  <match>
-    <test name="family">
-      <string>sans-serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>monospace</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>DejaVu Sans Mono</family>
+    </prefer>
+  </alias>
 <!-- Turn off hinting at small sizes -->
   <match target="font">
     <test name="family">


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dejavu-fonts.spec	17 Sep 2006 13:34:39 -0000	1.28
+++ dejavu-fonts.spec	22 Oct 2006 18:06:29 -0000	1.29
@@ -2,7 +2,7 @@
 # This macro has the same value as %{version}, except when testing pre-release snapshots
 #%define alphatag        20060913svn1149
 
-%define archiveversion  2.10
+%define archiveversion  2.11
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 %define xsldir          %{_datadir}/xml/%{name}
@@ -12,28 +12,28 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.10
+Version:   2.11
 Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
 Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz
-# Make DejaVu fonts the default in Sans, Serif and Monospace
-Source1:   %{name}-makedefault.xsl
-#  Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi
-Source2:   %{name}-block.xsl
-Source3:   %{name}-unblock.xsl
 # DejaVu fontconfig setup
-Source4:   %{name}-fontconfig.conf
+Source1:   %{name}-fontconfig.conf
 # DejaVu fontconfig setup (experimental families)
-Source5:   %{name}-experimental-fontconfig.conf
+Source2:   %{name}-experimental-fontconfig.conf
+# Make DejaVu fonts the default in Sans, Serif and Monospace
+Source3:   %{name}-makedefault.xsl
+#  Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi
+Source4:   %{name}-block.xsl
+Source5:   %{name}-unblock.xsl
 # Substitute the glyphs of another font in DejaVu for Farsi
 Source6:   %{name}-persian-override.conf
 # Substitute the glyphs of another font in DejaVu for Arabic
 Source7:   %{name}-arabic-override.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fontforge
+BuildRequires: fontforge >= 20061019
 # The CPAN sources do not declare perl(Font::TTF)
 BuildRequires: perl-Font-TTF
 # Needed to compute unicode coverage
@@ -136,14 +136,14 @@
 
 #xsl
 install -d -m 755 %{buildroot}%{xsldir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/makedefault.xsl
-install -p -m 644 %{SOURCE2} %{buildroot}%{xsldir}/block.xsl
-install -p -m 644 %{SOURCE3} %{buildroot}%{xsldir}/unblock.xsl
+install -p -m 644 %{SOURCE3} %{buildroot}%{xsldir}/makedefault.xsl
+install -p -m 644 %{SOURCE4} %{buildroot}%{xsldir}/block.xsl
+install -p -m 644 %{SOURCE5} %{buildroot}%{xsldir}/unblock.xsl
 
 # Fontconfig overrides for some scripts
 install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
-install -m 0644 %{SOURCE5} %{buildroot}%{fontconfdir}/conf.d/58-dejavu-experimental.conf
+install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
 install -m 0644 %{SOURCE6} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-persian-override.conf
 install -m 0644 %{SOURCE7} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-arabic-override.conf
 
@@ -228,7 +228,7 @@
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config %{fontconfdir}/conf.d/58-dejavu-experimental.conf
+%config %{fontconfdir}/conf.d/61-dejavu-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -252,6 +252,10 @@
 
 
 %changelog
+* Sun Oct 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.11
+- new minimal fontforge BR
+
 * Sun Sep 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Sep 2006 13:34:39 -0000	1.19
+++ sources	22 Oct 2006 18:06:29 -0000	1.20
@@ -1 +1 @@
-2d0c48afaba583833d90d30ff33d320a  dejavu-sfd-2.10.tar.gz
+64a34c66b1dbbdaccc108bd40a101d9c  dejavu-sfd-2.11.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 22 23:43:58 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 16:43:58 -0700
Subject: fedora-updates-system README,NONE,1.1
Message-ID: <200610222343.k9MNhwmF014355@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-updates-system
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14338

Added Files:
	README 
Log Message:
Added basic readme file (empty_



--- NEW FILE README ---



From fedora-extras-commits at redhat.com  Mon Oct 23 01:05:54 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 22 Oct 2006 18:05:54 -0700
Subject: rpms/viaideinfo/FC-5 viaideinfo.spec,1.1,1.2
Message-ID: <200610230105.k9N15sWr021222@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/viaideinfo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21151

Modified Files:
	viaideinfo.spec 
Log Message:
Enable x86-64 building (upstream says its OK)


Index: viaideinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/viaideinfo/FC-5/viaideinfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- viaideinfo.spec	19 Oct 2006 06:50:13 -0000	1.1
+++ viaideinfo.spec	23 Oct 2006 01:05:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		viaideinfo
 Version:	0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Displays the information of installed VIA IDE controllers 
 Group:		Applications/System
 License:	GPL
@@ -9,7 +9,7 @@
 Source0:	http://reactivated.net/software/viaideinfo/viaideinfo-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pciutils-devel >= 2.2.0  
 
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Sun Oct 22 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-2 
+- Enable x86-64 build support
+
 * Tue Oct 17 2006 Peter Gordon <peter at thecodergeek.com> - 0.4-1
 - Initial packaging



From fedora-extras-commits at redhat.com  Mon Oct 23 01:32:44 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:32:44 -0700
Subject: rpms/moodle/FC-4 moodle.spec,1.5,1.6
Message-ID: <200610230132.k9N1WiRh021372@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21328/FC-4

Modified Files:
	moodle.spec 
Log Message:
Added php-mysql #208255


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- moodle.spec	16 Oct 2006 14:09:05 -0000	1.5
+++ moodle.spec	23 Oct 2006 01:32:14 -0000	1.6
@@ -28,7 +28,7 @@
 BuildArch:      noarch
 
 #BuildRequires:  
-Requires:       php-gd vixie-cron mimetex perl(lib)
+Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service



From fedora-extras-commits at redhat.com  Mon Oct 23 01:32:45 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:32:45 -0700
Subject: rpms/moodle/FC-5 moodle.spec,1.5,1.6
Message-ID: <200610230132.k9N1Wjmi021375@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21328/FC-5

Modified Files:
	moodle.spec 
Log Message:
Added php-mysql #208255


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/moodle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- moodle.spec	16 Oct 2006 14:09:05 -0000	1.5
+++ moodle.spec	23 Oct 2006 01:32:15 -0000	1.6
@@ -28,7 +28,7 @@
 BuildArch:      noarch
 
 #BuildRequires:  
-Requires:       php-gd vixie-cron mimetex perl(lib)
+Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service



From fedora-extras-commits at redhat.com  Mon Oct 23 01:32:51 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:32:51 -0700
Subject: rpms/moodle/devel moodle.spec,1.6,1.7
Message-ID: <200610230132.k9N1Wp4C021378@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21328/devel

Modified Files:
	moodle.spec 
Log Message:
Added php-mysql #208255


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- moodle.spec	13 Oct 2006 20:34:10 -0000	1.6
+++ moodle.spec	23 Oct 2006 01:32:21 -0000	1.7
@@ -28,7 +28,7 @@
 BuildArch:      noarch
 
 #BuildRequires:  
-Requires:       php-gd vixie-cron mimetex perl(lib)
+Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service



From fedora-extras-commits at redhat.com  Mon Oct 23 01:34:59 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:34:59 -0700
Subject: rpms/moodle/FC-5 moodle.spec,1.6,1.7
Message-ID: <200610230134.k9N1YxeK021464@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21414/FC-5

Modified Files:
	moodle.spec 
Log Message:
Forgot to bump release and add changelog


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/moodle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- moodle.spec	23 Oct 2006 01:32:15 -0000	1.6
+++ moodle.spec	23 Oct 2006 01:34:29 -0000	1.7
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
+- Added requires php-mysql
+
 * Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
 - Major changes, update to 1.6.3
 - SpellChecker moved



From fedora-extras-commits at redhat.com  Mon Oct 23 01:34:58 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:34:58 -0700
Subject: rpms/moodle/FC-4 moodle.spec,1.6,1.7
Message-ID: <200610230134.k9N1YwWs021461@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21414/FC-4

Modified Files:
	moodle.spec 
Log Message:
Forgot to bump release and add changelog


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- moodle.spec	23 Oct 2006 01:32:14 -0000	1.6
+++ moodle.spec	23 Oct 2006 01:34:28 -0000	1.7
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
+- Added requires php-mysql
+
 * Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
 - Major changes, update to 1.6.3
 - SpellChecker moved



From fedora-extras-commits at redhat.com  Mon Oct 23 01:35:00 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 22 Oct 2006 18:35:00 -0700
Subject: rpms/moodle/devel moodle.spec,1.7,1.8
Message-ID: <200610230135.k9N1Z0Wu021467@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21414/devel

Modified Files:
	moodle.spec 
Log Message:
Forgot to bump release and add changelog


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moodle.spec	23 Oct 2006 01:32:21 -0000	1.7
+++ moodle.spec	23 Oct 2006 01:34:29 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
+- Added requires php-mysql
+
 * Fri Oct 13 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-1
 - Major changes, update to 1.6.3
 - SpellChecker moved



From fedora-extras-commits at redhat.com  Mon Oct 23 02:30:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 22 Oct 2006 19:30:48 -0700
Subject: rpms/perl-POE-Component-IRC/devel .cvsignore, 1.10,
	1.11 perl-POE-Component-IRC.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <200610230230.k9N2Um6w024980@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24940/devel

Modified Files:
	.cvsignore perl-POE-Component-IRC.spec sources 
Log Message:
update to 5.07



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Oct 2006 02:40:36 -0000	1.10
+++ .cvsignore	23 Oct 2006 02:30:18 -0000	1.11
@@ -1 +1 @@
-POE-Component-IRC-5.05.tar.gz
+POE-Component-IRC-5.07.tar.gz


Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/perl-POE-Component-IRC.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-POE-Component-IRC.spec	11 Oct 2006 02:40:36 -0000	1.11
+++ perl-POE-Component-IRC.spec	23 Oct 2006 02:30:18 -0000	1.12
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        5.05
+Version:        5.07
 Release:        1%{?dist}
 Summary:        A POE component for building IRC clients        
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.07-1
+- update to 5.07
+
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.05-1
 - update to 5.05
 - scratched head in confusion at versions in the last few changelogs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 02:40:36 -0000	1.10
+++ sources	23 Oct 2006 02:30:18 -0000	1.11
@@ -1 +1 @@
-ce082865e2c21e01a870c0b792649d5a  POE-Component-IRC-5.05.tar.gz
+776f4e27fd605ea0b8064d42aad3fc9b  POE-Component-IRC-5.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:30:47 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 22 Oct 2006 19:30:47 -0700
Subject: rpms/perl-POE-Component-IRC/FC-5 perl-POE-Component-IRC.spec, 1.11, 
	1.12 sources, 1.10, 1.11
Message-ID: <200610230230.k9N2Ul9m024975@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-IRC/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24940/FC-5

Modified Files:
	perl-POE-Component-IRC.spec sources 
Log Message:
update to 5.07



Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/FC-5/perl-POE-Component-IRC.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-POE-Component-IRC.spec	11 Oct 2006 02:40:34 -0000	1.11
+++ perl-POE-Component-IRC.spec	23 Oct 2006 02:30:16 -0000	1.12
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-IRC
-Version:        5.05
+Version:        5.07
 Release:        1%{?dist}
 Summary:        A POE component for building IRC clients        
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.07-1
+- update to 5.07
+
 * Tue Oct 10 2006 Chris Weyl <cweyl at alumni.drew.edu> 5.05-1
 - update to 5.05
 - scratched head in confusion at versions in the last few changelogs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-IRC/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 02:40:34 -0000	1.10
+++ sources	23 Oct 2006 02:30:16 -0000	1.11
@@ -1 +1 @@
-ce082865e2c21e01a870c0b792649d5a  POE-Component-IRC-5.05.tar.gz
+776f4e27fd605ea0b8064d42aad3fc9b  POE-Component-IRC-5.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:37:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 22 Oct 2006 19:37:57 -0700
Subject: rpms/perl-POE-Component-Client-HTTP/FC-5
	perl-POE-Component-Client-HTTP.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610230237.k9N2bvWT025108@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25072/FC-5

Modified Files:
	perl-POE-Component-Client-HTTP.spec sources 
Log Message:
update to 0.79



Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-POE-Component-Client-HTTP.spec	4 Oct 2006 04:58:35 -0000	1.3
+++ perl-POE-Component-Client-HTTP.spec	23 Oct 2006 02:37:27 -0000	1.4
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.78
+Version:        0.79
 Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
@@ -25,6 +25,7 @@
 BuildRequires:  perl(POE) >= 0.31, perl(HTTP::Request) >= 1.30
 BuildRequires:  perl(HTTP::Response) >= 1.37, perl(URI) >= 1.24
 BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0901
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 BuildRequires:  dos2unix, sed
 
 # use base...
@@ -84,6 +85,10 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.79-1
+- update to 0.79-1
+- add pod test modules to BR
+
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
 - update to 0.78
 - minor spec tweaks


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:58:35 -0000	1.3
+++ sources	23 Oct 2006 02:37:27 -0000	1.4
@@ -1 +1 @@
-093521d8c3a2b874fce1c04092e7159a  POE-Component-Client-HTTP-0.78.tar.gz
+f873ef9a39958c6b5389e8e48577e9e2  POE-Component-Client-HTTP-0.79.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:37:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 22 Oct 2006 19:37:58 -0700
Subject: rpms/perl-POE-Component-Client-HTTP/devel .cvsignore, 1.3,
	1.4 perl-POE-Component-Client-HTTP.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200610230237.k9N2bwQi025113@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25072/devel

Modified Files:
	.cvsignore perl-POE-Component-Client-HTTP.spec sources 
Log Message:
update to 0.79



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 04:58:36 -0000	1.3
+++ .cvsignore	23 Oct 2006 02:37:28 -0000	1.4
@@ -1 +1 @@
-POE-Component-Client-HTTP-0.78.tar.gz
+POE-Component-Client-HTTP-0.79.tar.gz


Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-POE-Component-Client-HTTP.spec	4 Oct 2006 04:58:36 -0000	1.5
+++ perl-POE-Component-Client-HTTP.spec	23 Oct 2006 02:37:28 -0000	1.6
@@ -10,7 +10,7 @@
 # "make noarch" type scenario is the third one.
 
 Name:           perl-POE-Component-Client-HTTP
-Version:        0.78
+Version:        0.79
 Release:        1%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
@@ -25,6 +25,7 @@
 BuildRequires:  perl(POE) >= 0.31, perl(HTTP::Request) >= 1.30
 BuildRequires:  perl(HTTP::Response) >= 1.37, perl(URI) >= 1.24
 BuildRequires:  perl(POE::Component::Client::Keepalive) >= 0.0901
+BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 BuildRequires:  dos2unix, sed
 
 # use base...
@@ -84,6 +85,10 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.79-1
+- update to 0.79-1
+- add pod test modules to BR
+
 * Tue Oct 03 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.78-1
 - update to 0.78
 - minor spec tweaks


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-HTTP/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:58:36 -0000	1.3
+++ sources	23 Oct 2006 02:37:28 -0000	1.4
@@ -1 +1 @@
-093521d8c3a2b874fce1c04092e7159a  POE-Component-Client-HTTP-0.78.tar.gz
+f873ef9a39958c6b5389e8e48577e9e2  POE-Component-Client-HTTP-0.79.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:50:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 22 Oct 2006 19:50:17 -0700
Subject: rpms/qt4/devel .cvsignore, 1.10, 1.11 qt4.spec, 1.24, 1.25 sources, 
	1.8, 1.9
Message-ID: <200610230250.k9N2oHsb025238@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25218

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Oct 2006 13:54:11 -0000	1.10
+++ .cvsignore	23 Oct 2006 02:49:46 -0000	1.11
@@ -1,5 +1,5 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
-qt-x11-opensource-src-4.2.0-rc1.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
+qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- qt4.spec	4 Oct 2006 13:54:11 -0000	1.24
+++ qt4.spec	23 Oct 2006 02:49:46 -0000	1.25
@@ -12,7 +12,7 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.2.0
+Version: 4.2.1
 Release: 1%{?dist}
 
 License: GPL/QPL
@@ -56,7 +56,7 @@
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
-# See bug #196901
+# See http://bugzilla.redhat.com/196901
 %define qt_datadir %{_datadir}/%{qt_dirname}
 %define qt_docdir %{_docdir}/%{qt_dirname}
 %define qt_headerdir %{_includedir} 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Oct 2006 13:54:11 -0000	1.8
+++ sources	23 Oct 2006 02:49:46 -0000	1.9
@@ -1 +1 @@
-2c062a125d5ca66397e3430ba537fbec  qt-x11-opensource-src-4.2.0.tar.gz
+6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 02:52:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 22 Oct 2006 19:52:35 -0700
Subject: rpms/qt4/FC-5 .cvsignore, 1.7, 1.8 qt4.spec, 1.18, 1.19 sources, 1.5,
	1.6
Message-ID: <200610230252.k9N2qZuB025305@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25284

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Oct 2006 19:19:15 -0000	1.7
+++ .cvsignore	23 Oct 2006 02:52:05 -0000	1.8
@@ -2,3 +2,4 @@
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
+qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qt4.spec	11 Oct 2006 19:19:15 -0000	1.18
+++ qt4.spec	23 Oct 2006 02:52:05 -0000	1.19
@@ -12,7 +12,7 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.2.0
+Version: 4.2.1
 Release: 1%{?dist}
 
 License: GPL/QPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Oct 2006 19:19:15 -0000	1.5
+++ sources	23 Oct 2006 02:52:05 -0000	1.6
@@ -1 +1 @@
-2c062a125d5ca66397e3430ba537fbec  qt-x11-opensource-src-4.2.0.tar.gz
+6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 03:23:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 22 Oct 2006 20:23:48 -0700
Subject: rpms/qt4/FC-4 .cvsignore, 1.7, 1.8 qt4.spec, 1.14, 1.15 sources, 1.3,
	1.4
Message-ID: <200610230323.k9N3Nmiu028541@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28520

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-1
- 4.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Oct 2006 14:47:31 -0000	1.7
+++ .cvsignore	23 Oct 2006 03:23:17 -0000	1.8
@@ -1,4 +1,6 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
+qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qt4.spec	11 Oct 2006 17:17:42 -0000	1.14
+++ qt4.spec	23 Oct 2006 03:23:17 -0000	1.15
@@ -4,8 +4,8 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.1.4
-Release: 11%{?dist}.2
+Version: 4.1.5
+Release: 1%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -462,6 +462,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-1
+- 4.1.5
+
 * Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.2
 - (re)enable -system-nas-sound on FC-4/x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2006 18:36:33 -0000	1.3
+++ sources	23 Oct 2006 03:23:17 -0000	1.4
@@ -1 +1 @@
-88f8c9c4622108baca2950baac3c02d6  qt-x11-opensource-src-4.1.4.tar.gz
+4ef549ca642c57f3b217ee88670e56cb  qt-x11-opensource-src-4.1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 06:40:07 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Sun, 22 Oct 2006 23:40:07 -0700
Subject: rpms/yumex/devel yumex.spec,1.38,1.39
Message-ID: <200610230640.k9N6e7EZ005570@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5554

Modified Files:
	yumex.spec 
Log Message:
bump release for a new build


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- yumex.spec	22 Oct 2006 12:38:08 -0000	1.38
+++ yumex.spec	23 Oct 2006 06:39:36 -0000	1.39
@@ -1,6 +1,6 @@
 Name:     yumex
 Version:  1.1.5
-Release:  1.0%{?dist}
+Release:  2.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0
+- bumped release for new build
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-1.0
 - Development Release 1.1.5-1.0
 * Mon Oct 9 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.4-2.0



From fedora-extras-commits at redhat.com  Mon Oct 23 08:15:33 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 23 Oct 2006 01:15:33 -0700
Subject: fedora-security/audit fc5,1.364,1.365
Message-ID: <200610230815.k9N8FX7G011885@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11867

Modified Files:
	fc5 
Log Message:
Add mutt, fixup after php release



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- fc5	20 Oct 2006 12:37:20 -0000	1.364
+++ fc5	23 Oct 2006 08:15:29 -0000	1.365
@@ -1,11 +1,11 @@
-Up to date CVE as of CVE email 20061016
+Up to date CVE as of CVE email 20061022
 Up to date FC5 as of 20061016
 
 ** are items that need attention
 
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
-CVE-2006-5298 ** mutt
-CVE-2006-5297 ** mutt
+CVE-2006-5298 VULNERABLE (mutt)
+CVE-2006-5297 VULNERABLE (mutt)
 CVE-2006-5229 ignore (openssh) reported not an issue
 CVE-2006-5215 VULNERABLE (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
@@ -27,15 +27,15 @@
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022]
 CVE-2006-4980 VULNERABLE (python) #208166
-CVE-2006-4925 ** openssh
+CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
-CVE-2006-4812 VULNERABLE (php) [since FEDORA-2006-1024]
+CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 VULNERABLE (kdelibs) #211342
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
-CVE-2006-4625 VULNERABLE (php)
+CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
 CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) #205652
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
@@ -60,12 +60,12 @@
 CVE-2006-4538 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] ia64 and sparc only
 CVE-2006-4535 version (kernel, fixed 2.6.17.12, fixed 2.6.18-rc6) [since FEDORA-2006-967]
 CVE-2006-4507 ignore (libtiff) can't reproduce
-CVE-2006-4486 VULNERABLE (php, fixed 5.1.6) [since FEDORA-2006-1024]
-CVE-2006-4485 VULNERABLE (php, fixed 5.1.5) [since FEDORA-2006-1024]
-CVE-2006-4484 ignore (php, fixed 5.1.5) [since FEDORA-2006-1024]
+CVE-2006-4486 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
+CVE-2006-4485 version (php, fixed 5.1.5) [since FEDORA-2006-1024]
+CVE-2006-4484 version (php, fixed 5.1.5) [since FEDORA-2006-1024] also ignore
 CVE-2006-4484 ignore (gd)
 CVE-2006-4483 ignore (php) not linux
-CVE-2006-4482 VULNERABLE (php, fixed 5.1.5) [#204995] [since FEDORA-2006-1024]
+CVE-2006-4482 version (php, fixed 5.1.5) #204995 [since FEDORA-2006-1024]
 CVE-2006-4481 ignore (php) safe mode isn't safe
 CVE-2006-4455 ignore (xchat) client DoS
 CVE-2006-4447 ignore (xorg) not a security issue
@@ -81,7 +81,7 @@
 CVE-2006-4336 version (gzip) #207643 [since FEDORA-2006-993]
 CVE-2006-4335 version (gzip) #207643 [since FEDORA-2006-993]
 CVE-2006-4334 version (gzip) #207643 [since FEDORA-2006-993]
-CVE-2006-4433 VULNERABLE (php, fixed 5.1.4)
+CVE-2006-4433 version (php, fixed 5.1.4) [since FEDORA-2006-1024]
 CVE-2006-4333 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
 CVE-2006-4332 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
 CVE-2006-4331 version (wireshark, fixed 0.99.3) [since FEDORA-2006-936]
@@ -99,7 +99,7 @@
 CVE-2006-4095 version (bind) [since FEDORA-2006-418] was backport since FEDORA-2006-966
 CVE-2006-4093 version (kernel, fixed 2.6.17.9) [since FEDORA-2006-967]
 CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) #202247
-CVE-2006-4020 VULNERABLE (php) #201767 [since FEDORA-2006-1024]
+CVE-2006-4020 version (php) #201767 [since FEDORA-2006-1024]
 CVE-2006-4019 version (squirrelmail, fixed 1.4.8) #202196 [since FEDORA-2006-913]
 CVE-2006-3918 version httpd, fixed 2.2.2 [since FEDORA-2006-364]
 CVE-2006-3879 version (mikmod, not 3.1.6)
@@ -203,9 +203,9 @@
 CVE-2006-3081 version (mysql, fixed 5.1.18) [since FEDORA-2006-702]
 CVE-2006-3057 version (dhcdbd, fixed 1.14) [since FEDORA-2006-609]
 CVE-2006-3018 ignore (php, fixed 5.1.3) no verification of flaw
-CVE-2006-3017 VULNERABLE (php, fixed 5.1.3) #197379
-CVE-2006-3016 VULNERABLE (php, fixed 5.1.3)
-CVE-2006-3011 VULNERABLE (php) (safe mode isn't)
+CVE-2006-3017 version (php, fixed 5.1.3) #197379 [since FEDORA-2006-1024]
+CVE-2006-3016 version (php, fixed 5.1.3) [since FEDORA-2006-1024]
+CVE-2006-3011 version (php, fixed 5.1.5) [since FEDORA-2006-1024]
 CVE-2006-3005 ignore (libjpeg) not a vuln
 CVE-2006-2941 VULNERABLE (mailman, fixed 2.1.9)
 CVE-2006-2940 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
@@ -533,8 +533,8 @@
 CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0019 version (kdelibs, fixed 3.5.1)
 CVE-2005-4811 version (kernel, fixed 2.6.13)
-CVE-2005-4809 ** firefox
-CVE-2005-4809 ** seamonkey
+CVE-2005-4809 VULNERABLE (firefox)
+CVE-2005-4809 VULNERABLE (seamonkey)
 CVE-2005-4808 ignore (binutils, gas fixed 20050714) this is a bug
 CVE-2005-4807 ignore (binutils, gas fixed 20050721) this is a bug
 CVE-2005-4798 version (kernel, not 2.6)



From fedora-extras-commits at redhat.com  Mon Oct 23 08:18:15 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 23 Oct 2006 01:18:15 -0700
Subject: fedora-security/audit fc6,1.117,1.118
Message-ID: <200610230818.k9N8IFXT011930@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11912

Modified Files:
	fc6 
Log Message:
Bring up to date with GOLD and recent CVE



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fc6	18 Oct 2006 19:39:32 -0000	1.117
+++ fc6	23 Oct 2006 08:18:12 -0000	1.118
@@ -1,9 +1,11 @@
-Up to date CVE as of CVE email 20061014
-Up to date FC6 as of re20061014.0
+Up to date CVE as of CVE email 20061022
+Up to date FC6 as of GOLD
 
 ** are items that need attention
 
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
+CVE-2006-5298 VULNERABLE (mutt)
+CVE-2006-5297 VULNERABLE (mutt)
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)



From fedora-extras-commits at redhat.com  Mon Oct 23 09:08:08 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Mon, 23 Oct 2006 02:08:08 -0700
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.1,1.2
Message-ID: <200610230908.k9N988E5015094@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15066/devel

Modified Files:
	pulseaudio.spec 
Log Message:
Create the user and groups that PulseAudio wants as part of the RPM process.



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulseaudio.spec	28 Aug 2006 12:41:01 -0000	1.1
+++ pulseaudio.spec	23 Oct 2006 09:07:38 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -134,7 +134,7 @@
 %patch1 -p1
 
 %build
-%configure --disable-ltdl-install --disable-static --disable-rpath
+%configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
 make LIBTOOL=/usr/bin/libtool
 make doxygen
 
@@ -149,8 +149,23 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+groupadd -r pulse &>/dev/null || :
+useradd -r -c 'PulseAudio daemon' \
+    -s /sbin/nologin -d / -g pulse pulse &>/dev/null || :
+groupadd -r pulse-rt &>/dev/null || :
+groupadd -r pulse-access &>/dev/null || :
+
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ]; then
+    userdel pulse &>/dev/null || :
+    groupdel pulse &>/dev/null || :
+    groupdel pulse-rt &>/dev/null || :
+    groupdel pulse-access &>/dev/null || :
+fi
 
 %post lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -302,6 +317,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Wed Oct 23 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-2
+- Create user and groups for daemon.
+
 * Mon Aug 28 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-1
 - Upgrade to 0.9.5.
 



From fedora-extras-commits at redhat.com  Mon Oct 23 10:27:17 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Mon, 23 Oct 2006 03:27:17 -0700
Subject: rpms/pulseaudio/FC-5 pulseaudio.spec,1.1,1.2
Message-ID: <200610231027.k9NARH9j018541@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/pulseaudio/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18521

Modified Files:
	pulseaudio.spec 
Log Message:
Create the user and groups that PulseAudio wants as part of the RPM process.



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/pulseaudio/FC-5/pulseaudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulseaudio.spec	28 Aug 2006 12:41:01 -0000	1.1
+++ pulseaudio.spec	23 Oct 2006 10:26:47 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -134,7 +134,7 @@
 %patch1 -p1
 
 %build
-%configure --disable-ltdl-install --disable-static --disable-rpath
+%configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
 make LIBTOOL=/usr/bin/libtool
 make doxygen
 
@@ -149,8 +149,23 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+groupadd -r pulse &>/dev/null || :
+useradd -r -c 'PulseAudio daemon' \
+    -s /sbin/nologin -d / -g pulse pulse &>/dev/null || :
+groupadd -r pulse-rt &>/dev/null || :
+groupadd -r pulse-access &>/dev/null || :
+
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ]; then
+    userdel pulse &>/dev/null || :
+    groupdel pulse &>/dev/null || :
+    groupdel pulse-rt &>/dev/null || :
+    groupdel pulse-access &>/dev/null || :
+fi
 
 %post lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -302,6 +317,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Wed Oct 23 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-2
+- Create user and groups for daemon.
+
 * Mon Aug 28 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-1
 - Upgrade to 0.9.5.
 



From fedora-extras-commits at redhat.com  Mon Oct 23 11:24:38 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 04:24:38 -0700
Subject: extras-buildsys/utils/pushscript extras-repoprune, NONE,
	1.1 RepoPrune.py, NONE, 1.1 README, 1.4, 1.5 Push.py, 1.5,
	1.6 extras-repomanage, 1.1, NONE RepoManage.py, 1.1, NONE
Message-ID: <200610231124.k9NBOcBF022696@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22665

Modified Files:
	README Push.py 
Added Files:
	extras-repoprune RepoPrune.py 
Removed Files:
	extras-repomanage RepoManage.py 
Log Message:
Replace "repomanage" usage with repoprune. It not just gets rid
of obsolete and forgotten sub-packages, but is also 4x faster. 



--- NEW FILE extras-repoprune ---
#!/usr/bin/python -t
# 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

cfg = 'Extras'

if __name__ == '__main__':
    import os, sys, errno
    if len(sys.argv) < 2:
        print 'Usage: %s <release>\n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)
    cmd = os.path.join(sys.path[0],'RepoPrune.py')
    args = [cmd]+[cfg]+sys.argv[1:]
    os.execvp(cmd,args)


--- NEW FILE RepoPrune.py ---
#!/usr/bin/python -t
# -*- mode: Python; indent-tabs-mode: nil; -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

import errno, os, sys
import fnmatch, re
import rpmUtils.transaction, rpmUtils.miscutils

import Utils

DEBUG = False
Utils.setdebug(DEBUG)

def pruneRepo(keep,whitelist,srcdir,bindirlist):
    ts = rpmUtils.transaction.initReadOnlyTransaction()
    changed = False
    
    # Create list of src.rpm files.
    # We don't use "glob", so sub-directories are supported.
    print 'Expiring (keep=%d):' % keep, srcdir
    srcfiles = []
    for root, dirs, files in os.walk(srcdir):
            for f in fnmatch.filter(files,'*.src.rpm'):
                srcfiles.append(os.path.join(root,f))
    if not len(srcfiles):
        print '  Nothing found.'
        return changed
    assert srcfiles[0].startswith(srcdir)

    # Create map: rpm %name -> list of tuples (filename,name,e,v,r)
    newestsrcrpms = {}
    for f in srcfiles:
        hdr = rpmUtils.miscutils.hdrFromPackage(ts,f)
        n = hdr['name']
        v = hdr['version']
        r = hdr['release']
        e = hdr['epoch']
        if e is None:
            e = 0
        newestsrcrpms.setdefault(n,[])
        newestsrcrpms[n].append((f,n,e,v,r))

    # Now purge old src.rpm unless their %name matches a white-list pattern.
    for l in newestsrcrpms.values():
        x = len(l)

        if x > 1:
            # White-listing.
            (f,n,e,v,r) = l[0]
            keepthis = False
            for r in whitelist:
                if re.compile(r).search(n):
                    keepthis = True
                    break
            if keepthis:
                print '  Skipping',n
                continue

            def sortByEVR(fnevr1, fnevr2):
                (f1,n1,e1,v1,r1) = fnevr1
                (f2,n2,e2,v2,r2) = fnevr2
                rc = rpmUtils.miscutils.compareEVR((e1,v1,r1),(e2,v2,r2))
                if rc == 0:
                    return 0
                if rc > 0:
                    return -1
                if rc < 0:
                    return 1
            
            l.sort(sortByEVR)  # highest first in list
        
        oldies = []
        if len(l) > abs(keep):
            oldies = l[keep:]
        for (f,n,e,v,r) in oldies:
            print '  Removing', os.path.basename(f)
            srcfiles.remove(f)
            if not DEBUG:
                os.remove(f)
            changed = True

    if not len(srcfiles):
        print 'WARNING: No src.rpms left. Stopping here.'
        return changed

    # Examine binary repository directories and remove everything which
    # is missing its corresponding src.rpm.
    for bindir in bindirlist:
        print 'Pruning:', bindir
        for root, dirs, files in os.walk(bindir):
            for f in fnmatch.filter(files,'*.rpm'):
                fullname = os.path.join(root,f)
                hdr = rpmUtils.miscutils.hdrFromPackage(ts,fullname)
                sourcerpm = hdr['sourcerpm']
                if not sourcerpm.endswith('.rpm'):
                    continue
                if not os.path.join(srcdir,sourcerpm) in srcfiles:
                    print '  Removing', f
                    if not DEBUG:
                        os.remove(fullname)
                    changed = True
    return changed


def main(cfg,dist):
    assert rpmUtils.miscutils.compareEVR((1,2,3),(1,2,0)) > 0
    assert rpmUtils.miscutils.compareEVR((0,1,2),(0,1,2)) == 0
    assert rpmUtils.miscutils.compareEVR((1,2,3),(4,0,99)) < 0

    keep = (dist == 'development') and 1 or 2
    whitelist = cfg.repoprune_keepdict[dist]

    srcdir = os.path.join(cfg.treedir,dist,'SRPMS')
    bindirs = []
    for arch in cfg.archdict[dist]:  # list of repo archs
        bindirs.append(os.path.join(cfg.treedir,dist,arch))
        
    return pruneRepo(keep,whitelist,srcdir,bindirs)


if __name__ == '__main__':
    if len(sys.argv) < 3:
        print 'Usage: %s <project> <release> [release]...\n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)

    cfg = Utils.load_config_module(sys.argv[1])

    Utils.signer_gid_check(cfg.signersgid)
    os.umask(cfg.signersumask)
    
    for dist in sys.argv[2:]:
        if not cfg.archdict.has_key(dist):
            print "No distribution release named '%s' found" % dist
            sys.exit(errno.EINVAL)
        main(cfg,dist)
    sys.exit(0)


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README	15 Oct 2006 12:30:38 -0000	1.4
+++ README	23 Oct 2006 11:24:35 -0000	1.5
@@ -14,16 +14,19 @@
 
 Scripts we need in $PATH:
 
-extras-push          -> pushscript/extras-push
-extras-repobuild     -> pushscript/extras-repobuild
-extras-repomanage    -> pushscript/extras-repomanage
-extras-repoview      -> pushscript/extras-repoview
-extras-sync          -> pushscript/extras-sync
+  extras-push          -> pushscript/extras-push
+  extras-sync          -> pushscript/extras-sync
 
-rc-modified          -> extras-repoclosure/rc-modified
-rc-report.py         -> extras-repoclosure
-rc-run.py            -> extras-buildsys/utils/rc-run.py
-rc-run-all.py        -> rc-run.py
+  rc-modified          -> extras-repoclosure/rc-modified
+  rc-report.py         -> extras-repoclosure/rc-report.py
+  rc-run.py            -> extras-buildsys/utils/rc-run.py
+  rc-run-all.py        -> rc-run.py
 
-upgradecheck.py
+  upgradecheck.py
+
+Optional:
+
+  extras-repobuild     -> pushscript/extras-repobuild
+  extras-repoview      -> pushscript/extras-repoview
+  extras-repoprune     -> pushscript/extras-repoprune
 


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Push.py	15 Oct 2006 12:37:20 -0000	1.5
+++ Push.py	23 Oct 2006 11:24:35 -0000	1.6
@@ -25,7 +25,7 @@
 import time
 
 import Utils, MultiLib
-import RepoBuild, RepoManage, RepoView
+import RepoBuild, RepoPrune, RepoView
 
 DEBUG = False
 Utils.setdebug(DEBUG)
@@ -616,8 +616,8 @@
         changed = diststopush
 
     for dist in changed:
-        if cfg.opts.repomanage:
-            RepoManage.main(cfg,dist)
+        if cfg.opts.repoprune:
+            RepoPrune.main(cfg,dist)
         RepoBuild.main(cfg,dist)
 
     # TODO: multilib resolver hook


--- extras-repomanage DELETED ---


--- RepoManage.py DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 11:25:18 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 04:25:18 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.6,1.7
Message-ID: <200610231125.k9NBPIhi022720@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22702

Modified Files:
	Config_Extras.py 
Log Message:
adjust config from repomanage -> repoprune



Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Config_Extras.py	20 Oct 2006 13:00:21 -0000	1.6
+++ Config_Extras.py	23 Oct 2006 11:25:15 -0000	1.7
@@ -26,7 +26,7 @@
 
 class opts:
     mail = True
-    repomanage = True
+    repoprune = True
     repoview = True
     signkeycheck = True
     doublesync = False
@@ -64,13 +64,13 @@
                '3' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                }
 
-# packages to exclude from being repomanaged: dist => shell quoted path regexp
-repomanage_keepdict = {'3': "'/\([^/]\+-\)\?kmod-'",
-                       '4': "'/\([^/]\+-\)\?kmod-'",
-                       '5': "'/\([^/]\+-\)\?kmod-'",
-                       '6': "'/\([^/]\+-\)\?kmod-'",
-                       'development': "'/\([^/]\+-\)\?kmod-'",
-                       }
+# packages to exclude from being pruned: dist => Python regexp list
+repoprune_keepdict = {'3': ["-kmod$"],
+                      '4': ["-kmod$"],
+                      '5': ["-kmod$"],
+                      '6': ["-kmod$"],
+                      'development': ["-kmod$"],
+                      }
 
 # repository symlinks to remove/create since they confuse createrepo
 repobuild_linkdict = {}
@@ -121,8 +121,6 @@
 #repoview = '/usr/bin/repoview'
 repoview = '/srv/extras-push/work/repoview'
 
-repomanage = '/usr/bin/repomanage'
-
 #post_cmds = []
 post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
              'nohup rc-run-all.py &'



From fedora-extras-commits at redhat.com  Mon Oct 23 11:40:09 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 04:40:09 -0700
Subject: rpms/gtk-gnutella/FC-5 .cvsignore, 1.4, 1.5 gtk-gnutella.spec, 1.6, 
	1.7 sources, 1.4, 1.5
Message-ID: <200610231140.k9NBe9ZX022810@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22790

Modified Files:
	.cvsignore gtk-gnutella.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Feb 2006 13:09:00 -0000	1.4
+++ .cvsignore	23 Oct 2006 11:39:38 -0000	1.5
@@ -1 +1 @@
-gtk-gnutella-0.96.1.tar.bz2
+gtk-gnutella-0.96.2.tar.bz2


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk-gnutella.spec	24 Feb 2006 13:09:00 -0000	1.6
+++ gtk-gnutella.spec	23 Oct 2006 11:39:38 -0000	1.7
@@ -1,7 +1,7 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.1
+Version: 0.96.2
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.2-1
+- update to 0.96.2
+
 * Fri Feb 24 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.1-1
 - update to 0.96.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Feb 2006 13:09:00 -0000	1.4
+++ sources	23 Oct 2006 11:39:38 -0000	1.5
@@ -1 +1 @@
-6529379cc105c1e98f501a67e8e875fd  gtk-gnutella-0.96.1.tar.bz2
+a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 23 11:50:23 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 04:50:23 -0700
Subject: rpms/dvdisaster/FC-5 .cvsignore, 1.3, 1.4 dvdisaster.spec, 1.13,
	1.14 sources, 1.6, 1.7 dvdisaster-0.70.2a.patch, 1.1,
	NONE dvdisaster-0.70.2b.patch, 1.1, NONE
Message-ID: <200610231150.k9NBoN71022927@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22902

Modified Files:
	.cvsignore dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.70.2a.patch dvdisaster-0.70.2b.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Jan 2006 14:02:39 -0000	1.3
+++ .cvsignore	23 Oct 2006 11:49:53 -0000	1.4
@@ -1 +1 @@
-dvdisaster-0.65.tar.bz2
+dvdisaster-0.70.2.tar.bz2


Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dvdisaster.spec	11 Sep 2006 12:30:43 -0000	1.13
+++ dvdisaster.spec	23 Oct 2006 11:49:53 -0000	1.14
@@ -1,13 +1,11 @@
 Name: dvdisaster
 Summary: Additional error protection for CD/DVD media
-Version: 0.70.1
+Version: 0.70.2
 Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
-Patch0: dvdisaster-0.70.2a.patch
-Patch1: dvdisaster-0.70.2b.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,9 +40,7 @@
 
 
 %prep
-%setup -q -n %{name}-0.70
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 
 %build
@@ -112,6 +108,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-1
+- update to 0.70.2
+
 * Fri Sep 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.1-1
 - update to 0.70.1
 - add two upstream's pre-0.70.2 patches.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Sep 2006 13:50:21 -0000	1.6
+++ sources	23 Oct 2006 11:49:53 -0000	1.7
@@ -1 +1 @@
-350b76ccaf2c8f08dcd26643ec359614  dvdisaster-0.70.1.tar.bz2
+59f3137c337f8a00a4739c8e77713fbd  dvdisaster-0.70.2.tar.bz2


--- dvdisaster-0.70.2a.patch DELETED ---


--- dvdisaster-0.70.2b.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 11:55:59 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 04:55:59 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.7,1.8
Message-ID: <200610231155.k9NBtxKL023064@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23044

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtk-gnutella.spec	23 Oct 2006 11:39:38 -0000	1.7
+++ gtk-gnutella.spec	23 Oct 2006 11:55:28 -0000	1.8
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc, groff
+BuildRequires: libxml2-devel, byacc, groff, gettext
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Mon Oct 23 12:01:40 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 05:01:40 -0700
Subject: rpms/dvdisaster/devel dvdisaster.spec, 1.13, 1.14 sources, 1.6,
	1.7 dvdisaster-0.70.2a.patch, 1.1, NONE dvdisaster-0.70.2b.patch,
	1.1, NONE
Message-ID: <200610231201.k9NC1eNY026065@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25960

Modified Files:
	dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.70.2a.patch dvdisaster-0.70.2b.patch 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dvdisaster.spec	11 Sep 2006 12:29:54 -0000	1.13
+++ dvdisaster.spec	23 Oct 2006 12:01:10 -0000	1.14
@@ -1,13 +1,11 @@
 Name: dvdisaster
 Summary: Additional error protection for CD/DVD media
-Version: 0.70.1
+Version: 0.70.2
 Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
-Patch0: dvdisaster-0.70.2a.patch
-Patch1: dvdisaster-0.70.2b.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,9 +40,7 @@
 
 
 %prep
-%setup -q -n %{name}-0.70
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 
 %build
@@ -112,6 +108,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-1
+- update to 0.70.2
+
 * Fri Sep 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.1-1
 - update to 0.70.1
 - add two upstream's pre-0.70.2 patches.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Sep 2006 13:49:19 -0000	1.6
+++ sources	23 Oct 2006 12:01:10 -0000	1.7
@@ -1 +1 @@
-350b76ccaf2c8f08dcd26643ec359614  dvdisaster-0.70.1.tar.bz2
+59f3137c337f8a00a4739c8e77713fbd  dvdisaster-0.70.2.tar.bz2


--- dvdisaster-0.70.2a.patch DELETED ---


--- dvdisaster-0.70.2b.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 12:04:47 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 05:04:47 -0700
Subject: rpms/gtk-gnutella/devel gtk-gnutella.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200610231204.k9NC4lYR026124@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26106

Modified Files:
	gtk-gnutella.spec sources 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-gnutella.spec	1 Sep 2006 14:11:30 -0000	1.8
+++ gtk-gnutella.spec	23 Oct 2006 12:04:16 -0000	1.9
@@ -1,8 +1,8 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.1
-Release: 3%{?dist}
+Version: 0.96.2
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.2-1
+- update to 0.96.2
+
 * Fri Sep  1 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96.1-3
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Feb 2006 13:09:00 -0000	1.4
+++ sources	23 Oct 2006 12:04:16 -0000	1.5
@@ -1 +1 @@
-6529379cc105c1e98f501a67e8e875fd  gtk-gnutella-0.96.1.tar.bz2
+a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 23 12:28:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Oct 2006 05:28:18 -0700
Subject: rpms/perl-PadWalker/devel .cvsignore, 1.2, 1.3 perl-PadWalker.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610231228.k9NCSIID026339@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PadWalker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
Update to 1.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 May 2006 21:17:41 -0000	1.2
+++ .cvsignore	23 Oct 2006 12:27:48 -0000	1.3
@@ -1 +1 @@
-PadWalker-1.0.tar.gz
+PadWalker-1.1.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/perl-PadWalker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-PadWalker.spec	10 Sep 2006 15:47:26 -0000	1.2
+++ perl-PadWalker.spec	23 Oct 2006 12:27:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-PadWalker
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Play with other peoples' lexical variables
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.1-1
+- Update to 1.1.
+
 * Sun Sep 10 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.0-2
 - Rebuild for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2006 21:17:41 -0000	1.2
+++ sources	23 Oct 2006 12:27:48 -0000	1.3
@@ -1 +1 @@
-05d684ce2f17ef4f058ec2e912b5f95c  PadWalker-1.0.tar.gz
+193821660d7da7a5944776e21fceda7e  PadWalker-1.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 12:49:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Oct 2006 05:49:10 -0700
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.7,
	1.8 perl-HTTP-Server-Simple.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200610231249.k9NCnA68026475@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26455

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.23.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Jun 2006 22:22:48 -0000	1.7
+++ .cvsignore	23 Oct 2006 12:48:40 -0000	1.8
@@ -1 +1 @@
-HTTP-Server-Simple-0.20.tar.gz
+HTTP-Server-Simple-0.23.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-HTTP-Server-Simple.spec	20 Jun 2006 22:22:48 -0000	1.8
+++ perl-HTTP-Server-Simple.spec	23 Oct 2006 12:48:40 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.20
+Version:        0.23
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(URI::Escape)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
+- Update to 0.23.
+
 * Tue Jun 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
 - Update to 0.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Jun 2006 22:22:48 -0000	1.7
+++ sources	23 Oct 2006 12:48:40 -0000	1.8
@@ -1 +1 @@
-31b88af89c4966183bf6e95ca2b40050  HTTP-Server-Simple-0.20.tar.gz
+5d410b9585c4c09426a6d6d14d0af6b1  HTTP-Server-Simple-0.23.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 12:52:30 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 05:52:30 -0700
Subject: rpms/php-extras/FC-5 php-extras.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200610231252.k9NCqU25026539@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26521

Modified Files:
	php-extras.spec sources 
Log Message:



Index: php-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/php-extras/FC-5/php-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-extras.spec	22 Jun 2006 11:48:48 -0000	1.6
+++ php-extras.spec	23 Oct 2006 12:52:00 -0000	1.7
@@ -14,15 +14,15 @@
 %define list	%{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql}
 
 
-%define extdir	%(php-config --extension-dir 2>/dev/null || echo be_happy_mock)
-%define apiver	%(( phpize --version 2>/dev/null || echo 'PHP Api Version: be_happy_mock' ) | sed -n '/PHP Api Version/ s/.*:[ 	]*//p')
+%global extdir	%(php-config --extension-dir 2>/dev/null || echo "undefined")
+%global apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
 
 Name: php-extras
 Summary: Additional PHP modules from the standard PHP distribution
-#Version: %(php-config --version)
-Version: 5.1.4
-Release: 2%{?dist}
+#Version: %(php-config --version 2>/dev/null || echo 0)
+Version: 5.1.6
+Release: 1%{?dist}
 Group: Development/Languages
 License: The PHP License
 URL: http://www.php.net/
@@ -117,7 +117,7 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign"
 
 
 for mod in %{list}
@@ -251,6 +251,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.6-1
+- update to 5.1.6
+
 * Thu Jun 22 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.4-2
 - auto-detect extdir and apiver again (needed for x86_64)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-extras/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jun 2006 16:56:08 -0000	1.3
+++ sources	23 Oct 2006 12:52:00 -0000	1.4
@@ -1 +1 @@
-4b7c93c9730ef7807f59732697470dad  php-5.1.4.tar.gz
+04d6166552289eaeff771f5ec953b065  php-5.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 12:59:30 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 05:59:30 -0700
Subject: rpms/dvdisaster/FC-5 dvdisaster.spec,1.14,1.15
Message-ID: <200610231259.k9NCxU9i026599@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26583

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvdisaster.spec	23 Oct 2006 11:49:53 -0000	1.14
+++ dvdisaster.spec	23 Oct 2006 12:59:00 -0000	1.15
@@ -68,6 +68,14 @@
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh
 
+pushd $RPM_BUILD_ROOT%{_mandir}
+for i in `find . -type f -name "*.[1-9]"`
+do
+    sed -i "s,$RPM_BUILD_ROOT,,g" $i
+done
+popd
+
+
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 



From fedora-extras-commits at redhat.com  Mon Oct 23 13:29:35 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 23 Oct 2006 06:29:35 -0700
Subject: rpms/dvdisaster/devel dvdisaster.spec,1.14,1.15
Message-ID: <200610231329.k9NDTZdm029722@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29706

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvdisaster.spec	23 Oct 2006 12:01:10 -0000	1.14
+++ dvdisaster.spec	23 Oct 2006 13:29:04 -0000	1.15
@@ -68,6 +68,14 @@
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh
 
+pushd $RPM_BUILD_ROOT%{_mandir}
+for i in `find . -type f -name "*.[1-9]"`
+do
+    sed -i "s,$RPM_BUILD_ROOT,,g" $i
+done
+popd
+
+
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 



From fedora-extras-commits at redhat.com  Mon Oct 23 13:35:32 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 23 Oct 2006 06:35:32 -0700
Subject: fedora-security/audit fc5,1.365,1.366 fc6,1.118,1.119
Message-ID: <200610231335.k9NDZWp2029832@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29812

Modified Files:
	fc5 fc6 
Log Message:
CVE-2006-4811 is really a qt issue.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- fc5	23 Oct 2006 08:15:29 -0000	1.365
+++ fc5	23 Oct 2006 13:35:30 -0000	1.366
@@ -32,7 +32,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
-CVE-2006-4811 VULNERABLE (kdelibs) #211342
+CVE-2006-4811 VULNERABLE (qt) #211342
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fc6	23 Oct 2006 08:18:12 -0000	1.118
+++ fc6	23 Oct 2006 13:35:30 -0000	1.119
@@ -30,7 +30,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4811 VULNERABLE (kdelibs) #211347
+CVE-2006-4811 VULNERABLE (qt) #211347
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Mon Oct 23 14:13:08 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 23 Oct 2006 07:13:08 -0700
Subject: devel/common branches,1.4,1.5
Message-ID: <200610231413.k9NED8kl000546@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv530

Modified Files:
	branches 
Log Message:
add fc6 and fc7 branch bits


Index: branches
===================================================================
RCS file: /cvs/extras/devel/common/branches,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- branches	16 Mar 2006 20:25:32 -0000	1.4
+++ branches	23 Oct 2006 14:12:37 -0000	1.5
@@ -6,4 +6,5 @@
 FC-3:fc3:.fc3:fedora:3
 FC-4:fc4:.fc4:fedora:4
 FC-5:fc5:.fc5:fedora:5
-devel:devel:.fc6:fedora:6
+FC-6:fc6:.fc6:fedora:6
+devel:devel:.fc7:fedora:7



From fedora-extras-commits at redhat.com  Mon Oct 23 14:32:33 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Mon, 23 Oct 2006 07:32:33 -0700
Subject: fedora-security/audit fc6,1.119,1.120
Message-ID: <200610231432.k9NEWXfp003501@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/audit

Modified Files:
	fc6 
Log Message:
Update CVE-2002-0704



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fc6	23 Oct 2006 13:35:30 -0000	1.119
+++ fc6	23 Oct 2006 14:32:31 -0000	1.120
@@ -1811,7 +1811,7 @@
 CVE-2002-0715 version (squid, fixed 2.4.STABLE6)
 CVE-2002-0714 version (squid, fixed 2.4.STABLE6)
 CVE-2002-0713 version (squid, fixed 2.4.STABLE6)
-CVE-2002-0704 ** kernel http://www.netfilter.org/security/2002-04-02-icmp-dnat.html
+CVE-2002-0704 version (kernel, fixed 2.6.11)
 CVE-2002-0702 version (dhcpd, fixed 3.0.1)
 CVE-2002-0684 version (glibc, fixed afted 2.2.5)
 CVE-2002-0682 version (tomcat, fixed 4.1.3)



From fedora-extras-commits at redhat.com  Mon Oct 23 19:51:05 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 23 Oct 2006 12:51:05 -0700
Subject: rpms/bitlbee - New directory
Message-ID: <200610231951.k9NJp5wP021059@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21055/bitlbee

Log Message:
Directory /cvs/extras/rpms/bitlbee added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 23 19:51:11 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 23 Oct 2006 12:51:11 -0700
Subject: rpms/bitlbee/devel - New directory
Message-ID: <200610231951.k9NJpBv0021073@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21055/bitlbee/devel

Log Message:
Directory /cvs/extras/rpms/bitlbee/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 23 20:41:31 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 13:41:31 -0700
Subject: rpms/gcstar - New directory
Message-ID: <200610232041.k9NKfVYh024515@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24511/gcstar

Log Message:
Directory /cvs/extras/rpms/gcstar added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 23 20:41:37 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 13:41:37 -0700
Subject: rpms/gcstar/devel - New directory
Message-ID: <200610232041.k9NKfbnL024529@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24511/gcstar/devel

Log Message:
Directory /cvs/extras/rpms/gcstar/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 23 20:52:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 23 Oct 2006 13:52:11 -0700
Subject: fedora-security/audit fe4,1.80,1.81 fe5,1.87,1.88
Message-ID: <200610232052.k9NKqBIT024736@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24711

Modified Files:
	fe4 fe5 
Log Message:
Catch up with mantis updates.


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fe4	17 Oct 2006 19:15:24 -0000	1.80
+++ fe4	23 Oct 2006 20:52:08 -0000	1.81
@@ -101,7 +101,7 @@
 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
 CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
 CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
-CVE-2006-1577 VULNERABLE (mantis) bz#191089
+CVE-2006-1577 ** (mantis) bz#191089
 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
 CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem)
 CVE-2006-1531 version (seamonkey, fixed 1.0.1)
@@ -116,15 +116,15 @@
 CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
 CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7)
 CVE-2006-0847 version (python-cherrypy, fixed 2.1.1)
-CVE-2006-0841 VULNERABLE (mantis) bz#191089
-CVE-2006-0840 VULNERABLE (mantis) bz#191089
+CVE-2006-0841 ** (mantis) bz#191089
+CVE-2006-0840 backport (mantis, fixed 0.19.4-2) bz#191089
 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297
 CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
 CVE-2006-0760 version (lighttpd, fixed 1.4.10)
 CVE-2006-0749 version (seamonkey, fixed 1.0)
 CVE-2006-0748 version (seamonkey, fixed 1.0.1)
-CVE-2006-0665 VULNERABLE (mantis) bz#191089
-CVE-2006-0664 VULNERABLE (mantis) bz#191089
+CVE-2006-0665 backport (mantis, fixed 0.19.4-2) bz#191089
+CVE-2006-0664 ** (mantis) bz#191089
 CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097
 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
 CVE-2006-0322 version (mediawiki, fixed 1.5.8)


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- fe5	17 Oct 2006 19:15:24 -0000	1.87
+++ fe5	23 Oct 2006 20:52:08 -0000	1.88
@@ -106,7 +106,7 @@
 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
 CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
 CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
-CVE-2006-1577 VULNERABLE (mantis) bz#191089
+CVE-2006-1577 version (mantis, fixed 1.0.5) bz#191089
 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
 CVE-2006-1550 version (dia, fixed 0.95) bz#187556
 CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem)



From fedora-extras-commits at redhat.com  Mon Oct 23 20:55:37 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 13:55:37 -0700
Subject: owners owners.list,1.1866,1.1867
Message-ID: <200610232055.k9NKtb9s024883@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24862

Modified Files:
	owners.list 
Log Message:
Added gcstar



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1866
retrieving revision 1.1867
diff -u -r1.1866 -r1.1867
--- owners.list	22 Oct 2006 03:36:58 -0000	1.1866
+++ owners.list	23 Oct 2006 20:55:07 -0000	1.1867
@@ -468,6 +468,7 @@
 Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gconvert|A desktop unit converter|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|gcstar|Personal collections manager|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 23 21:13:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 23 Oct 2006 14:13:54 -0700
Subject: rpms/w3c-markup-validator/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 w3c-markup-validator.spec, 1.9,
	1.10 w3c-markup-validator-0.7.2-feedback.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-undebian.patch, 1.1, NONE
Message-ID: <200610232113.k9NLDsre028316@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28231/FC-5

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Removed Files:
	w3c-markup-validator-0.7.2-feedback.patch 
	w3c-markup-validator-0.7.2-undebian.patch 
Log Message:
* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
- 0.7.3, feedback and undebian patches applied upstream.
- Use "W3C License" as the License tag to appease rpmlint.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Feb 2006 17:14:14 -0000	1.4
+++ .cvsignore	23 Oct 2006 21:13:24 -0000	1.5
@@ -1,2 +1,2 @@
-validator-0_7_2.tar.gz
-sgml-lib-0_7_2.tar.gz
+validator-0_7_3.tar.gz
+sgml-lib-0_7_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2006 17:14:14 -0000	1.4
+++ sources	23 Oct 2006 21:13:24 -0000	1.5
@@ -1,2 +1,2 @@
-5a0a1fdcdbdd1856d8776f95a3156e26  validator-0_7_2.tar.gz
-2d86fd1a66f599acc6aa2267b86cd1ec  sgml-lib-0_7_2.tar.gz
+8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
+ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/w3c-markup-validator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- w3c-markup-validator.spec	15 Sep 2006 15:54:08 -0000	1.9
+++ w3c-markup-validator.spec	23 Oct 2006 21:13:24 -0000	1.10
@@ -1,20 +1,18 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.2
-Release:        4%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
-License:        W3C Software License
+License:        W3C License
 URL:            http://validator.w3.org/
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
 Patch1:         %{name}-0.7.2-syspaths.patch
 Patch2:         %{name}-0.7.2-html401.patch
-Patch3:         %{name}-0.7.2-feedback.patch
-Patch4:         %{name}-0.7.2-undebian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,8 +42,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
-%patch3 -p1
-%patch4 -p0
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -121,6 +117,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
+- 0.7.3, feedback and undebian patches applied upstream.
+- Use "W3C License" as the License tag to appease rpmlint.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.2-4
 - Fix feedback view, remove references to Debian (#206617).
 


--- w3c-markup-validator-0.7.2-feedback.patch DELETED ---


--- w3c-markup-validator-0.7.2-undebian.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 21:13:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 23 Oct 2006 14:13:55 -0700
Subject: rpms/w3c-markup-validator/FC-6 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 w3c-markup-validator.spec, 1.10,
	1.11 w3c-markup-validator-0.7.2-feedback.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-undebian.patch, 1.1, NONE
Message-ID: <200610232113.k9NLDtAY028321@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28231/FC-6

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Removed Files:
	w3c-markup-validator-0.7.2-feedback.patch 
	w3c-markup-validator-0.7.2-undebian.patch 
Log Message:
* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
- 0.7.3, feedback and undebian patches applied upstream.
- Use "W3C License" as the License tag to appease rpmlint.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Feb 2006 17:14:14 -0000	1.4
+++ .cvsignore	23 Oct 2006 21:13:25 -0000	1.5
@@ -1,2 +1,2 @@
-validator-0_7_2.tar.gz
-sgml-lib-0_7_2.tar.gz
+validator-0_7_3.tar.gz
+sgml-lib-0_7_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2006 17:14:14 -0000	1.4
+++ sources	23 Oct 2006 21:13:25 -0000	1.5
@@ -1,2 +1,2 @@
-5a0a1fdcdbdd1856d8776f95a3156e26  validator-0_7_2.tar.gz
-2d86fd1a66f599acc6aa2267b86cd1ec  sgml-lib-0_7_2.tar.gz
+8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
+ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/w3c-markup-validator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- w3c-markup-validator.spec	15 Sep 2006 15:51:40 -0000	1.10
+++ w3c-markup-validator.spec	23 Oct 2006 21:13:25 -0000	1.11
@@ -1,20 +1,18 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.2
-Release:        4%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
-License:        W3C Software License
+License:        W3C License
 URL:            http://validator.w3.org/
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
 Patch1:         %{name}-0.7.2-syspaths.patch
 Patch2:         %{name}-0.7.2-html401.patch
-Patch3:         %{name}-0.7.2-feedback.patch
-Patch4:         %{name}-0.7.2-undebian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,8 +42,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
-%patch3 -p1
-%patch4 -p0
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -121,6 +117,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
+- 0.7.3, feedback and undebian patches applied upstream.
+- Use "W3C License" as the License tag to appease rpmlint.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.2-4
 - Fix feedback view, remove references to Debian (#206617).
 


--- w3c-markup-validator-0.7.2-feedback.patch DELETED ---


--- w3c-markup-validator-0.7.2-undebian.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 21:13:56 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:13:56 -0700
Subject: rpms/libopts/devel .cvsignore, 1.2, 1.3 libopts.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200610232113.k9NLDuSO028327@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238/devel

Modified Files:
	.cvsignore libopts.spec sources 
Log Message:
auto-import libopts-27.4-1 on branch devel from libopts-27.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2006 12:33:35 -0000	1.2
+++ .cvsignore	23 Oct 2006 21:13:26 -0000	1.3
@@ -1 +1 @@
-libopts-27.1.tar.gz
+libopts-27.4.tar.bz2


Index: libopts.spec
===================================================================
RCS file: /cvs/extras/rpms/libopts/devel/libopts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopts.spec	16 Sep 2006 20:29:39 -0000	1.5
+++ libopts.spec	23 Oct 2006 21:13:26 -0000	1.6
@@ -1,10 +1,10 @@
 Summary: Options library for autogen
 Name: libopts
-Version: 27.1
-Release: 7%{?dist}
+Version: 27.4
+Release: 1%{?dist}
 License: LGPL or BSD
 Group: Development/Libraries
-Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz
+Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.bz2
 URL: http://autogen.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,8 +64,8 @@
 %{_includedir}/autoopts
 
 %changelog
-* Sat Sep 16 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-7
-- rebuild
+* Mon Oct 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.4-1
+- bump to new version
 
 * Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-6
 - changed __infodir to _infodir 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2006 12:33:35 -0000	1.2
+++ sources	23 Oct 2006 21:13:26 -0000	1.3
@@ -1 +1 @@
-50a546ee14d866819afd502e809c8095  libopts-27.1.tar.gz
+d3199c049a38c26d71c164e0d6ee4d43  libopts-27.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 23 21:13:55 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:13:55 -0700
Subject: rpms/libopts import.log,1.6,1.7
Message-ID: <200610232114.k9NLDtHB028322@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238

Modified Files:
	import.log 
Log Message:
auto-import libopts-27.4-1 on branch devel from libopts-27.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopts/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	3 Sep 2006 21:21:56 -0000	1.6
+++ import.log	23 Oct 2006 21:13:25 -0000	1.7
@@ -3,3 +3,4 @@
 libopts-27_1-5:HEAD:libopts-27.1-5.src.rpm:1142811579
 libopts-27_1-6:HEAD:libopts-27.1-6.src.rpm:1144238404
 libopts-27_1-6:FC-5:libopts-27.1-6.src.rpm:1157318521
+libopts-27_4-1:HEAD:libopts-27.4-1.src.rpm:1161637988



From fedora-extras-commits at redhat.com  Mon Oct 23 21:14:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 23 Oct 2006 14:14:01 -0700
Subject: rpms/w3c-markup-validator/devel .cvsignore, 1.4, 1.5 sources, 1.4, 
	1.5 w3c-markup-validator.spec, 1.10,
	1.11 w3c-markup-validator-0.7.2-feedback.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-undebian.patch, 1.1, NONE
Message-ID: <200610232114.k9NLE1s5028334@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28231/devel

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Removed Files:
	w3c-markup-validator-0.7.2-feedback.patch 
	w3c-markup-validator-0.7.2-undebian.patch 
Log Message:
* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
- 0.7.3, feedback and undebian patches applied upstream.
- Use "W3C License" as the License tag to appease rpmlint.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Feb 2006 17:14:14 -0000	1.4
+++ .cvsignore	23 Oct 2006 21:13:31 -0000	1.5
@@ -1,2 +1,2 @@
-validator-0_7_2.tar.gz
-sgml-lib-0_7_2.tar.gz
+validator-0_7_3.tar.gz
+sgml-lib-0_7_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2006 17:14:14 -0000	1.4
+++ sources	23 Oct 2006 21:13:31 -0000	1.5
@@ -1,2 +1,2 @@
-5a0a1fdcdbdd1856d8776f95a3156e26  validator-0_7_2.tar.gz
-2d86fd1a66f599acc6aa2267b86cd1ec  sgml-lib-0_7_2.tar.gz
+8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
+ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- w3c-markup-validator.spec	15 Sep 2006 15:51:40 -0000	1.10
+++ w3c-markup-validator.spec	23 Oct 2006 21:13:31 -0000	1.11
@@ -1,20 +1,18 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.2
-Release:        4%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
-License:        W3C Software License
+License:        W3C License
 URL:            http://validator.w3.org/
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
 Patch1:         %{name}-0.7.2-syspaths.patch
 Patch2:         %{name}-0.7.2-html401.patch
-Patch3:         %{name}-0.7.2-feedback.patch
-Patch4:         %{name}-0.7.2-undebian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,8 +42,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
-%patch3 -p1
-%patch4 -p0
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -121,6 +117,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
+- 0.7.3, feedback and undebian patches applied upstream.
+- Use "W3C License" as the License tag to appease rpmlint.
+
 * Fri Sep 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.2-4
 - Fix feedback view, remove references to Debian (#206617).
 


--- w3c-markup-validator-0.7.2-feedback.patch DELETED ---


--- w3c-markup-validator-0.7.2-undebian.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 23 21:16:02 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:16:02 -0700
Subject: rpms/libopts import.log,1.7,1.8
Message-ID: <200610232116.k9NLG2bM028562@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28526

Modified Files:
	import.log 
Log Message:
auto-import libopts-27.4-1 on branch FC-5 from libopts-27.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopts/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	23 Oct 2006 21:13:25 -0000	1.7
+++ import.log	23 Oct 2006 21:15:32 -0000	1.8
@@ -4,3 +4,4 @@
 libopts-27_1-6:HEAD:libopts-27.1-6.src.rpm:1144238404
 libopts-27_1-6:FC-5:libopts-27.1-6.src.rpm:1157318521
 libopts-27_4-1:HEAD:libopts-27.4-1.src.rpm:1161637988
+libopts-27_4-1:FC-5:libopts-27.4-1.src.rpm:1161638119



From fedora-extras-commits at redhat.com  Mon Oct 23 21:16:03 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:16:03 -0700
Subject: rpms/libopts/FC-5 .cvsignore, 1.2, 1.3 libopts.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200610232116.k9NLG3AO028567@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28526/FC-5

Modified Files:
	.cvsignore libopts.spec sources 
Log Message:
auto-import libopts-27.4-1 on branch FC-5 from libopts-27.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2006 12:33:35 -0000	1.2
+++ .cvsignore	23 Oct 2006 21:15:33 -0000	1.3
@@ -1 +1 @@
-libopts-27.1.tar.gz
+libopts-27.4.tar.bz2


Index: libopts.spec
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-5/libopts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopts.spec	5 Apr 2006 12:00:16 -0000	1.4
+++ libopts.spec	23 Oct 2006 21:15:33 -0000	1.5
@@ -1,10 +1,10 @@
 Summary: Options library for autogen
 Name: libopts
-Version: 27.1
-Release: 6%{?dist}
+Version: 27.4
+Release: 1%{?dist}
 License: LGPL or BSD
 Group: Development/Libraries
-Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz
+Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.bz2
 URL: http://autogen.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +64,9 @@
 %{_includedir}/autoopts
 
 %changelog
+* Mon Oct 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.4-1
+- bump to new version
+
 * Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-6
 - changed __infodir to _infodir 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2006 12:33:35 -0000	1.2
+++ sources	23 Oct 2006 21:15:33 -0000	1.3
@@ -1 +1 @@
-50a546ee14d866819afd502e809c8095  libopts-27.1.tar.gz
+d3199c049a38c26d71c164e0d6ee4d43  libopts-27.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 23 21:27:55 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 14:27:55 -0700
Subject: rpms/gcstar/devel Makefile,NONE,1.1
Message-ID: <200610232127.k9NLRtH1029004@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28999

Added Files:
	Makefile 
Log Message:
Setup of gcstar



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'



From fedora-extras-commits at redhat.com  Mon Oct 23 21:29:17 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 23 Oct 2006 14:29:17 -0700
Subject: rpms/autogen/FC-5 autogen.spec,1.3,1.4
Message-ID: <200610232129.k9NLTHAZ029065@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29027

Modified Files:
	autogen.spec 
Log Message:

Rebuild against newer libopts 
 	autogen.spec 



Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/autogen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.spec	21 Oct 2006 11:16:00 -0000	1.3
+++ autogen.spec	23 Oct 2006 21:28:47 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Mon Oct 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-2
+- rebuild for newer libopts
+
 * Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
 - bump to new version
 



From fedora-extras-commits at redhat.com  Mon Oct 23 21:29:30 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 23 Oct 2006 14:29:30 -0700
Subject: rpms/gcstar/devel gcstar.spec,NONE,1.1 sources,NONE,1.1
Message-ID: <200610232129.k9NLTU34029086@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29081/devel

Added Files:
	gcstar.spec sources 
Log Message:
auto-import gcstar-0.5.0-3 on branch devel from gcstar-0.5.0-3.src.rpm


--- NEW FILE gcstar.spec ---
Name:           gcstar
Version:        0.5.0
Release:        3%{?dist}
Summary:        Personal collections manager

Group:          Applications/Databases
License:        GPL
URL:            http://www.gcstar.org/
Source0:        http://download.gna.org/gcstar/gcstar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:    desktop-file-utils
Requires:         perl-Gtk2

%define desktop_vendor fedora

%description
GCstar is an application for managing your personal collections.
Detailed information on each item can be automatically retrieved
from the internet and you can store additional data, depending on
the collection type. And also who you've lent your them to. You
may also search and filter your collection by criteria.

%prep
%setup -q -n gcstar


%build

%install
rm -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{_prefix}
%{__install} -d %{buildroot}%{_bindir}
%{__install} bin/gcstar %{buildroot}%{_bindir}
%{__install} -d %{buildroot}%{_libdir}
%{__cp} -a lib/gcstar %{buildroot}%{_libdir}
%{__install} -d %{buildroot}%{_datadir}
%{__cp} -a share/gcstar %{buildroot}%{_datadir}
%{__install} -d %{buildroot}%{_mandir}/man1
%{__install} man/gcstar.1 %{buildroot}%{_mandir}/man1
gzip %{buildroot}%{_mandir}/man1/gcstar.1

# Install menu entry
%{__cat} > %{name}.desktop << EOF
[Desktop Entry]
Name=GCstar
Comment=Manage your collections
GenericName=Personal collections manager
Exec=gcstar
Icon=%{_datadir}/gcstar/icons/gcstar_64x64.png
Terminal=false
Type=Application
MimeType=application/x-gcstar
Categories=Application;Office;
Encoding=UTF-8
EOF

%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install \
    --vendor %{desktop_vendor} \
    --dir %{buildroot}%{_datadir}/applications  \
    %{name}.desktop

#Mime Type
%{__cat} > %{name}.xml <<EOF
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
        <mime-type type="application/x-gcstar">
                <comment>GCstar collection</comment>
                <glob pattern="*.gcs"/>
        </mime-type>
</mime-info>
EOF

%{__mkdir_p} %{buildroot}%{_datadir}/mime/packages
cp %{name}.xml %{buildroot}%{_datadir}/mime/packages


%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :

%files
%defattr(-,root,root)
%doc CHANGELOG README LICENSE
%{_libdir}/gcstar
%{_datadir}/gcstar
%{_mandir}/man1/gcstar.1.gz
%attr(0755,root,root) %{_bindir}/gcstar
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml

%changelog
* Sun Oct 22 2006 Tian <tian at c-sait.net> - 0.5.0-3
  - Restored BuildRequires
* Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-2
  - Changed desktop vendor
  - Removed desktop-file-utils and shared-mime-info from required
  - Fixed icon path in desktop file
* Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-1
  - First Fedora Extras version.


--- NEW FILE sources ---
12ba75fe2f3091c1ccd03864424a34e2  gcstar-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 21:53:09 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 14:53:09 -0700
Subject: rpms/aide/devel aide-0.12-rh-bugfixes.patch, NONE, 1.1 aide.spec,
	1.15, 1.16
Message-ID: <200610232153.k9NLr9HQ030084@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30049

Modified Files:
	aide.spec 
Added Files:
	aide-0.12-rh-bugfixes.patch 
Log Message:
* Mon Oct 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-2
- Add "memory leaks and performance updates" patch as posted
  to aide-devel by Steve Grubb.


aide-0.12-rh-bugfixes.patch:

--- NEW FILE aide-0.12-rh-bugfixes.patch ---
Hi,

This patch removes a couple unnecessary memsets, fixes some memory leaks
associated with strlastslash usage, fixes some memory leaks in populate_tree,
and moves a couple assignments closer to where they are used in case they are
not needed.

-Steve


diff -ur aide-0.12_rc1.orig/src/base64.c aide-0.12_rc1/src/base64.c
--- aide-0.12_rc1.orig/src/base64.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/base64.c	2006-10-16 13:43:08.000000000 -0400
@@ -103,8 +103,6 @@
   }
   outbuf = (char *)malloc(sizeof(char)*B64_BUF);
   
-  memset((void*)outbuf,0,B64_BUF);
-  
   /* Initialize working pointers */
   inb = src;
   i = 0;
@@ -191,11 +189,9 @@
     return NULL;
 
 
-
   /* Initialize working pointers */
   inb = src;
   outbuf = (byte *)malloc(sizeof(byte)*B64_BUF);
-  memset(outbuf,0,sizeof(byte)*B64_BUF);
 
   l = 0;
   triple = 0;
diff -ur aide-0.12_rc1.orig/src/commandconf.c aide-0.12_rc1/src/commandconf.c
--- aide-0.12_rc1.orig/src/commandconf.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/commandconf.c	2006-10-16 13:43:08.000000000 -0400
@@ -240,11 +240,11 @@
 {
   int retval=0;
   int c=0;
-  char* tmp=NULL;
   int err=0;
-  int* domd=0;
+  int* domd=NULL;
   url_t* db_url=NULL;
 #ifdef WITH_MHASH
+  char* tmp=NULL;
   MHASH* md=NULL;
   void* key=NULL;
   int keylen;
@@ -401,7 +401,7 @@
 
 int check_db_order(DB_FIELD* d,int size, DB_FIELD a)
 {
-  int i=0;
+  int i;
   for(i=0;i<size;i++){
     if(d[i]==a)
       return RETFAIL;
diff -ur aide-0.12_rc1.orig/src/gen_list.c aide-0.12_rc1/src/gen_list.c
--- aide-0.12_rc1.orig/src/gen_list.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/gen_list.c	2006-10-16 14:09:49.000000000 -0400
@@ -229,8 +229,7 @@
 {
     if( r!=NULL ){
         node->conf_lineno = r->conf_lineno;  
-        node->rx=(char*)malloc(strlen(r->rx)+1);
-        strcpy(node->rx,r->rx);
+        node->rx=strdup(r->rx);
     } else {
         node->conf_lineno = -1;
         node->rx=NULL;
@@ -265,13 +264,17 @@
     if(isrx){
       parent=get_seltree_node(tree,tmprxtok);
     }else {
-      parent=get_seltree_node(tree,strlastslash(path));
+      char* dirn=strlastslash(path);
+      parent=get_seltree_node(tree,dirn);
+      free(dirn);
     }      
     if(parent==NULL){
       if(isrx){
 	parent=new_seltree_node(tree,tmprxtok,isrx,r);
       }else {
-	parent=new_seltree_node(tree,strlastslash(path),isrx,r);
+        char* dirn=strlastslash(path);
+        parent=new_seltree_node(tree,dirn,isrx,r);
+        free(dirn);
       }
     }
     free(tmprxtok);
@@ -306,8 +309,7 @@
     error(240,"Handling %s with %c \"%s\" with node \"%s\"\n",rxtok,type,curr_rule->rx,curnode->path);
 	
     
-    /* We have to add '^' to the first charaster of string... 
-     *
+    /* We have to add '^' to the first character of string... 
      */
 
     data=(char*)malloc(strlen(curr_rule->rx)+1+1);
@@ -1518,9 +1520,14 @@
 	if((add=check_rxtree(old->filename,tree,&attr))>0){
 	  add_file_to_tree(tree,old,DB_OLD,0,attr);
 	  i++;
-	}else if(!initdbwarningprinted){
-	  error(3,_("WARNING: Old db contains a file that shouldn\'t be there, run --init or --update\n"));
-	  initdbwarningprinted=1;
+	}else{
+          free_db_line(old);
+          free(old);
+          old=NULL;
+          if(!initdbwarningprinted){
+	    error(3,_("WARNING: Old db contains a file that shouldn\'t be there, run --init or --update\n"));
+	    initdbwarningprinted=1;
+	  }
 	}
 	if(i<100){
 	  old=db_readline(DB_OLD);
@@ -1543,6 +1550,10 @@
 	if((add=check_rxtree(new->filename,tree,&attr))>0){
 	  add_file_to_tree(tree,new,DB_NEW,0,attr);
 	  i++;
+	} else {
+          free_db_line(new);
+          free(new);
+          new=NULL;
 	}
 	if(i<100){
 	  new=db_readline(DB_NEW);
@@ -1568,6 +1579,8 @@
 	}
 	if((conf->action&DO_INIT)&&!(conf->action&DO_COMPARE)){
 	  free_db_line(new);
+          free(new);
+          new=NULL;
 	}
 	if(i<100){
 	  new=db_readline(DB_DISK);
diff -ur aide-0.12_rc1.orig/src/symboltable.c aide-0.12_rc1/src/symboltable.c
--- aide-0.12_rc1.orig/src/symboltable.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/symboltable.c	2006-10-16 13:43:08.000000000 -0400
@@ -34,13 +34,13 @@
     return NULL;
   }
 
-  l=item->prev;
   p=item;
   while(p!=NULL){
     if (strcmp(s,((symba*)p->data)->name)==0) return p;
     p=p->next;
   }
     
+  l=item->prev;
   while(l!=NULL){
     /* Insert bug to here return l-> return p */
     if (strcmp(s,((symba*)l->data)->name)==0) return l; 



Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aide.spec	14 Oct 2006 20:41:21 -0000	1.15
+++ aide.spec	23 Oct 2006 21:52:39 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
@@ -15,6 +15,7 @@
 Source1: aide.conf
 Source2: README.quickstart
 Patch0: aide-0.12-getopt.patch
+Patch1: aide-0.12-rh-bugfixes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .getopt
+%patch1 -p1 -b .rh-bugfixes
 
 
 %build
@@ -75,6 +77,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-2
+- Add "memory leaks and performance updates" patch as posted
+  to aide-devel by Steve Grubb.
+
 * Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
 - Update to 0.12 release.
 - now offers --disable-static, so -no-static patch is obsolete



From fedora-extras-commits at redhat.com  Mon Oct 23 22:03:27 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 23 Oct 2006 15:03:27 -0700
Subject: rpms/libburn/FC-5 libburn.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200610232203.k9NM3RLG000838@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/libburn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv806/FC-5

Modified Files:
	libburn.spec sources 
Log Message:
Release new version on FC-6 and FC-5.



Index: libburn.spec
===================================================================
RCS file: /cvs/extras/rpms/libburn/FC-5/libburn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libburn.spec	8 Sep 2006 20:08:53 -0000	1.2
+++ libburn.spec	23 Oct 2006 22:02:55 -0000	1.3
@@ -1,18 +1,15 @@
-%define         mainver 0.2
-# define this as version gets overridden by the subpackage with its own version
-
 Name:           libburn
-Version:        0.2
-Release:        4.20060908svn%{?dist}
+Version:        0.2.2
+Release:        2%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libburn.pykix.org/
-Source0:        %{name}-%{version}svn.tar.gz
+Source0:        http://libburn-download.pykix.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake libtool intltool gettext 
+BuildRequires:  automake libtool intltool gettext doxygen graphviz
 #Requires:       
 
 %description
@@ -61,8 +58,7 @@
 %package -n     cdrskin
 Summary:        Limited cdrecord compatibility wrapper to ease migration to libburn
 Group:          Applications/Multimedia
-Version:        0.1.4
-Requires:       %{name} = %{mainver}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description -n cdrskin
 A limited cdrecord compatibility wrapper which allows to use some libburn 
@@ -70,13 +66,14 @@
 
 
 %prep
-%setup -n %{name}-%{mainver}svn -q
+%setup -q
 
 
 %build
-./bootstrap
+#./bootstrap
 %configure --disable-static
 make %{?_smp_mflags}
+doxygen doc/doxygen.conf
 
 
 %install
@@ -84,6 +81,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -102,7 +101,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT README
+%doc AUTHORS COPYING COPYRIGHT README doc/html
 %{_libdir}/%{name}*.so.*
 
 %files devel
@@ -131,6 +130,15 @@
 
 
 %changelog
+* Sat Oct 21 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-2
+- Point to a real URL in source, now that we have a tarball
+
+* Fri Oct 20 2006 Jesse Keating <jkeating at redhat.com> - 0.2-2-1
+- 0.2.2 release
+
+* Tue Sep 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2-5.20060808svn
+- Create doxygen docs
+
 * Fri Sep  8 2006 Jesse Keating <jkeating at redhat.com> - 0.2-4.20060808svn
 - rebuild with new snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libburn/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 20:08:53 -0000	1.3
+++ sources	23 Oct 2006 22:02:55 -0000	1.4
@@ -1 +1 @@
-87ba6cf624ccc53b5b086a0e72b5d39c  libburn-0.2svn.tar.gz
+20d0903d6b3fc646d32888cc91b12376  libburn-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 23 22:06:55 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 23 Oct 2006 15:06:55 -0700
Subject: owners owners.list,1.1867,1.1868
Message-ID: <200610232206.k9NM6tM7001086@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1017

Modified Files:
	owners.list 
Log Message:
Added bitlbee



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1867
retrieving revision 1.1868
diff -u -r1.1867 -r1.1868
--- owners.list	23 Oct 2006 20:55:07 -0000	1.1867
+++ owners.list	23 Oct 2006 22:06:25 -0000	1.1868
@@ -111,6 +111,7 @@
 Fedora Extras|bit|C++ classes for bit manipulations|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|bitbake|BitBake build tool|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|bitgtkmm|Gtkmm widgets for bit|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
+Fedora Extras|bitlbee|IRC to other chat networks gateway|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|bitmap|Bitmap editor and converter utilities for the X Window System|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 23 23:00:24 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 16:00:24 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.7,1.8
Message-ID: <200610232300.k9NN0Olx001905@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1877

Modified Files:
	Config_Extras.py 
Log Message:
FC-6 branch


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Config_Extras.py	23 Oct 2006 11:25:15 -0000	1.7
+++ Config_Extras.py	23 Oct 2006 23:00:19 -0000	1.8
@@ -40,7 +40,7 @@
 rundir = top_workdir+'/extras-push-rundir'
 cachedir = rundir+'/mdcache'
 
-alldists = [ 'development', '5', '4', '3' ] # also the order in build reports
+alldists = [ 'development', '6', '5', '4', '3' ] # also the order in build reports
 
 archdict = {'3':['x86_64', 'i386'], 
             '4':['ppc','x86_64', 'i386'],
@@ -56,8 +56,7 @@
 # black-list takes precedence over white-list
 multiblacklists = { 'development' : { 'x86_64' : [] },
                }
-multiwhitelists = { 'development' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
-               # 'development' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+multiwhitelists = { 'development' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
                '6' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '5' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },
                '4' : { 'x86_64' : [ 'wine', 'wine-arts', 'wine-devel' ] },



From fedora-extras-commits at redhat.com  Mon Oct 23 23:04:44 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 16:04:44 -0700
Subject: rpms/aide/FC-6 aide-0.12-rh-bugfixes.patch, NONE, 1.1 aide.spec,
	1.15, 1.16
Message-ID: <200610232304.k9NN4iJX004910@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4891

Modified Files:
	aide.spec 
Added Files:
	aide-0.12-rh-bugfixes.patch 
Log Message:
* Mon Oct 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-2
- Add "memory leaks and performance updates" patch as posted
  to aide-devel by Steve Grubb.


aide-0.12-rh-bugfixes.patch:

--- NEW FILE aide-0.12-rh-bugfixes.patch ---
Hi,

This patch removes a couple unnecessary memsets, fixes some memory leaks
associated with strlastslash usage, fixes some memory leaks in populate_tree,
and moves a couple assignments closer to where they are used in case they are
not needed.

-Steve


diff -ur aide-0.12_rc1.orig/src/base64.c aide-0.12_rc1/src/base64.c
--- aide-0.12_rc1.orig/src/base64.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/base64.c	2006-10-16 13:43:08.000000000 -0400
@@ -103,8 +103,6 @@
   }
   outbuf = (char *)malloc(sizeof(char)*B64_BUF);
   
-  memset((void*)outbuf,0,B64_BUF);
-  
   /* Initialize working pointers */
   inb = src;
   i = 0;
@@ -191,11 +189,9 @@
     return NULL;
 
 
-
   /* Initialize working pointers */
   inb = src;
   outbuf = (byte *)malloc(sizeof(byte)*B64_BUF);
-  memset(outbuf,0,sizeof(byte)*B64_BUF);
 
   l = 0;
   triple = 0;
diff -ur aide-0.12_rc1.orig/src/commandconf.c aide-0.12_rc1/src/commandconf.c
--- aide-0.12_rc1.orig/src/commandconf.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/commandconf.c	2006-10-16 13:43:08.000000000 -0400
@@ -240,11 +240,11 @@
 {
   int retval=0;
   int c=0;
-  char* tmp=NULL;
   int err=0;
-  int* domd=0;
+  int* domd=NULL;
   url_t* db_url=NULL;
 #ifdef WITH_MHASH
+  char* tmp=NULL;
   MHASH* md=NULL;
   void* key=NULL;
   int keylen;
@@ -401,7 +401,7 @@
 
 int check_db_order(DB_FIELD* d,int size, DB_FIELD a)
 {
-  int i=0;
+  int i;
   for(i=0;i<size;i++){
     if(d[i]==a)
       return RETFAIL;
diff -ur aide-0.12_rc1.orig/src/gen_list.c aide-0.12_rc1/src/gen_list.c
--- aide-0.12_rc1.orig/src/gen_list.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/gen_list.c	2006-10-16 14:09:49.000000000 -0400
@@ -229,8 +229,7 @@
 {
     if( r!=NULL ){
         node->conf_lineno = r->conf_lineno;  
-        node->rx=(char*)malloc(strlen(r->rx)+1);
-        strcpy(node->rx,r->rx);
+        node->rx=strdup(r->rx);
     } else {
         node->conf_lineno = -1;
         node->rx=NULL;
@@ -265,13 +264,17 @@
     if(isrx){
       parent=get_seltree_node(tree,tmprxtok);
     }else {
-      parent=get_seltree_node(tree,strlastslash(path));
+      char* dirn=strlastslash(path);
+      parent=get_seltree_node(tree,dirn);
+      free(dirn);
     }      
     if(parent==NULL){
       if(isrx){
 	parent=new_seltree_node(tree,tmprxtok,isrx,r);
       }else {
-	parent=new_seltree_node(tree,strlastslash(path),isrx,r);
+        char* dirn=strlastslash(path);
+        parent=new_seltree_node(tree,dirn,isrx,r);
+        free(dirn);
       }
     }
     free(tmprxtok);
@@ -306,8 +309,7 @@
     error(240,"Handling %s with %c \"%s\" with node \"%s\"\n",rxtok,type,curr_rule->rx,curnode->path);
 	
     
-    /* We have to add '^' to the first charaster of string... 
-     *
+    /* We have to add '^' to the first character of string... 
      */
 
     data=(char*)malloc(strlen(curr_rule->rx)+1+1);
@@ -1518,9 +1520,14 @@
 	if((add=check_rxtree(old->filename,tree,&attr))>0){
 	  add_file_to_tree(tree,old,DB_OLD,0,attr);
 	  i++;
-	}else if(!initdbwarningprinted){
-	  error(3,_("WARNING: Old db contains a file that shouldn\'t be there, run --init or --update\n"));
-	  initdbwarningprinted=1;
+	}else{
+          free_db_line(old);
+          free(old);
+          old=NULL;
+          if(!initdbwarningprinted){
+	    error(3,_("WARNING: Old db contains a file that shouldn\'t be there, run --init or --update\n"));
+	    initdbwarningprinted=1;
+	  }
 	}
 	if(i<100){
 	  old=db_readline(DB_OLD);
@@ -1543,6 +1550,10 @@
 	if((add=check_rxtree(new->filename,tree,&attr))>0){
 	  add_file_to_tree(tree,new,DB_NEW,0,attr);
 	  i++;
+	} else {
+          free_db_line(new);
+          free(new);
+          new=NULL;
 	}
 	if(i<100){
 	  new=db_readline(DB_NEW);
@@ -1568,6 +1579,8 @@
 	}
 	if((conf->action&DO_INIT)&&!(conf->action&DO_COMPARE)){
 	  free_db_line(new);
+          free(new);
+          new=NULL;
 	}
 	if(i<100){
 	  new=db_readline(DB_DISK);
diff -ur aide-0.12_rc1.orig/src/symboltable.c aide-0.12_rc1/src/symboltable.c
--- aide-0.12_rc1.orig/src/symboltable.c	2006-10-16 13:31:43.000000000 -0400
+++ aide-0.12_rc1/src/symboltable.c	2006-10-16 13:43:08.000000000 -0400
@@ -34,13 +34,13 @@
     return NULL;
   }
 
-  l=item->prev;
   p=item;
   while(p!=NULL){
     if (strcmp(s,((symba*)p->data)->name)==0) return p;
     p=p->next;
   }
     
+  l=item->prev;
   while(l!=NULL){
     /* Insert bug to here return l-> return p */
     if (strcmp(s,((symba*)l->data)->name)==0) return l; 



Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/FC-6/aide.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aide.spec	14 Oct 2006 20:41:21 -0000	1.15
+++ aide.spec	23 Oct 2006 23:04:08 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
@@ -15,6 +15,7 @@
 Source1: aide.conf
 Source2: README.quickstart
 Patch0: aide-0.12-getopt.patch
+Patch1: aide-0.12-rh-bugfixes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .getopt
+%patch1 -p1 -b .rh-bugfixes
 
 
 %build
@@ -75,6 +77,10 @@
 
 
 %changelog
+* Mon Oct 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-2
+- Add "memory leaks and performance updates" patch as posted
+  to aide-devel by Steve Grubb.
+
 * Sat Oct 07 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12-1
 - Update to 0.12 release.
 - now offers --disable-static, so -no-static patch is obsolete



From fedora-extras-commits at redhat.com  Mon Oct 23 23:07:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Oct 2006 16:07:20 -0700
Subject: rpms/qt4/FC-4 qt4.spec,1.15,1.16
Message-ID: <200610232307.k9NN7Kgl005085@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5035

Modified Files:
	qt4.spec 
Log Message:
* Mon Oct 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-2
- fix qm2ts conflict with qt-devel



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt4.spec	23 Oct 2006 03:23:17 -0000	1.15
+++ qt4.spec	23 Oct 2006 23:06:49 -0000	1.16
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -300,7 +300,7 @@
 pushd %{buildroot}%{qtdir}/bin
 for i in *; do
   case "${i}" in
-    assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
+    assistant|designer|linguist|lrelease|lupdate|moc|qm2ts|qmake|qtconfig|qtdemo|uic)
       LINK="${i}-qt4"
       ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
       ;;
@@ -462,6 +462,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-2
+- fix qm2ts conflict with qt-devel
+
 * Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-1
 - 4.1.5
 



From fedora-extras-commits at redhat.com  Mon Oct 23 23:08:42 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 23 Oct 2006 16:08:42 -0700
Subject: rpms/aide/FC-6 aide.spec,1.16,1.17
Message-ID: <200610232308.k9NN8gg3005193@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/aide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5157

Modified Files:
	aide.spec 
Log Message:
hit make tag right after FC-6 branch


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/FC-6/aide.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aide.spec	23 Oct 2006 23:04:08 -0000	1.16
+++ aide.spec	23 Oct 2006 23:08:11 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.12
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System



From fedora-extras-commits at redhat.com  Mon Oct 23 23:08:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Oct 2006 16:08:45 -0700
Subject: rpms/qt4/FC-5 qt4.spec,1.20,1.21
Message-ID: <200610232308.k9NN8jLW005200@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5176

Modified Files:
	qt4.spec 
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use respun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt4.spec	23 Oct 2006 23:07:46 -0000	1.20
+++ qt4.spec	23 Oct 2006 23:08:15 -0000	1.21
@@ -510,7 +510,7 @@
 
 %changelog
 * Mon Oct 23 2006 Rex Dieter 4.2.1-2
-- use repun upstream 4.2.1 tarball
+- use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1



From fedora-extras-commits at redhat.com  Mon Oct 23 23:08:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Oct 2006 16:08:46 -0700
Subject: rpms/qt4/FC-5 .cvsignore, 1.8, 1.9 qt4.spec, 1.19, 1.20 sources, 1.6,
	1.7
Message-ID: <200610232308.k9NN8kSh005205@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5129

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use repun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Oct 2006 02:52:05 -0000	1.8
+++ .cvsignore	23 Oct 2006 23:07:46 -0000	1.9
@@ -1,5 +1,6 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
 qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt4.spec	23 Oct 2006 02:52:05 -0000	1.19
+++ qt4.spec	23 Oct 2006 23:07:46 -0000	1.20
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -84,11 +84,14 @@
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps}
+BuildRequires: %{x_deps} %{?x_deps_GL_hack}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
@@ -149,7 +152,7 @@
 Summary: API documentation, demos and example programs for %{name}
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}_%{release}
+Provides: %{name}-assistant = %{version}-%{release}
 # For docs -> doc rename, temporary, since it was a short-lived subpkg
 #Obsoletes: %{name}-docs < %{version}-%{release}
 #Provides:  %{name}-docs = %{version}-%{release}
@@ -506,6 +509,13 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+- use repun upstream 4.2.1 tarball
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1
+- 4.2.1
+
 * Wed Oct 04 2006 Rex Dieter 4.2.0-1
 - 4.2.0(final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Oct 2006 02:52:05 -0000	1.6
+++ sources	23 Oct 2006 23:07:46 -0000	1.7
@@ -1 +1 @@
-6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz
+2ab1c88084f55b94809f025a8503bf18  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:20:46 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 23 Oct 2006 17:20:46 -0700
Subject: rpms/puppet/FC-4 .cvsignore, 1.7, 1.8 puppet.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610240020.k9O0Kksv010499@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10209

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 14:08:28 -0000	1.7
+++ .cvsignore	24 Oct 2006 00:20:16 -0000	1.8
@@ -1 +1 @@
-puppet-0.19.3.tgz
+puppet-0.20.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-4/puppet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- puppet.spec	26 Sep 2006 14:08:28 -0000	1.7
+++ puppet.spec	24 Oct 2006 00:20:16 -0000	1.8
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.19.3
+Version: 0.20.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 23 2006 David Lutterkort <dlutter at redhat.com> - 0.20.0-1
+- New version
+
 * Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 0.19.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 14:08:28 -0000	1.7
+++ sources	24 Oct 2006 00:20:16 -0000	1.8
@@ -1 +1 @@
-c3a15c89f5108bccc0547acbfb5eca41  puppet-0.19.3.tgz
+0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:21:58 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 23 Oct 2006 17:21:58 -0700
Subject: rpms/puppet/FC-5 .cvsignore, 1.7, 1.8 puppet.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610240021.k9O0LwxG010573@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10552

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 14:06:18 -0000	1.7
+++ .cvsignore	24 Oct 2006 00:21:28 -0000	1.8
@@ -1 +1 @@
-puppet-0.19.3.tgz
+puppet-0.20.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- puppet.spec	26 Sep 2006 14:06:18 -0000	1.7
+++ puppet.spec	24 Oct 2006 00:21:28 -0000	1.8
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.19.3
+Version: 0.20.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 23 2006 David Lutterkort <dlutter at redhat.com> - 0.20.0-1
+- New version
+
 * Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 0.19.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 14:06:18 -0000	1.7
+++ sources	24 Oct 2006 00:21:28 -0000	1.8
@@ -1 +1 @@
-c3a15c89f5108bccc0547acbfb5eca41  puppet-0.19.3.tgz
+0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:23:39 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 23 Oct 2006 17:23:39 -0700
Subject: rpms/puppet/FC-6 .cvsignore, 1.7, 1.8 puppet.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610240023.k9O0NdwH010645@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10624

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 14:03:26 -0000	1.7
+++ .cvsignore	24 Oct 2006 00:23:09 -0000	1.8
@@ -1 +1 @@
-puppet-0.19.3.tgz
+puppet-0.20.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/puppet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- puppet.spec	26 Sep 2006 14:03:26 -0000	1.7
+++ puppet.spec	24 Oct 2006 00:23:09 -0000	1.8
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.19.3
+Version: 0.20.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 23 2006 David Lutterkort <dlutter at redhat.com> - 0.20.0-1
+- New version
+
 * Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 0.19.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 14:03:26 -0000	1.7
+++ sources	24 Oct 2006 00:23:09 -0000	1.8
@@ -1 +1 @@
-c3a15c89f5108bccc0547acbfb5eca41  puppet-0.19.3.tgz
+0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:26:51 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 23 Oct 2006 17:26:51 -0700
Subject: rpms/puppet/devel .cvsignore, 1.7, 1.8 puppet.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200610240026.k9O0QpnA010721@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10700

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 14:03:26 -0000	1.7
+++ .cvsignore	24 Oct 2006 00:26:21 -0000	1.8
@@ -1 +1 @@
-puppet-0.19.3.tgz
+puppet-0.20.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/puppet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- puppet.spec	26 Sep 2006 14:03:26 -0000	1.7
+++ puppet.spec	24 Oct 2006 00:26:21 -0000	1.8
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.19.3
+Version: 0.20.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 23 2006 David Lutterkort <dlutter at redhat.com> - 0.20.0-1
+- New version
+
 * Tue Sep 26 2006 David Lutterkort <dlutter at redhat.com> - 0.19.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 14:03:26 -0000	1.7
+++ sources	24 Oct 2006 00:26:21 -0000	1.8
@@ -1 +1 @@
-c3a15c89f5108bccc0547acbfb5eca41  puppet-0.19.3.tgz
+0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 00:55:02 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 23 Oct 2006 17:55:02 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 telepathy-gabble.spec, 1.11, 1.12
Message-ID: <200610240055.k9O0t2x2011021@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10996

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Oct 2006 14:51:02 -0000	1.11
+++ .cvsignore	24 Oct 2006 00:54:32 -0000	1.12
@@ -1 +1 @@
-telepathy-gabble-0.4.0.tar.gz
+telepathy-gabble-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 14:51:02 -0000	1.11
+++ sources	24 Oct 2006 00:54:32 -0000	1.12
@@ -1 +1 @@
-dc78e31762fef419c6c64d2f8a82e012  telepathy-gabble-0.4.0.tar.gz
+e08f4e1f361165635128c5996d71e2b9  telepathy-gabble-0.4.1.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- telepathy-gabble.spec	19 Oct 2006 14:51:02 -0000	1.11
+++ telepathy-gabble.spec	24 Oct 2006 00:54:32 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
+- Update to 0.4.1.
+
 * Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0.
 



From fedora-extras-commits at redhat.com  Tue Oct 24 01:10:32 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 23 Oct 2006 18:10:32 -0700
Subject: rpms/telepathy-gabble/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 telepathy-gabble.spec, 1.11, 1.12
Message-ID: <200610240110.k9O1AWOb014120@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14100

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Oct 2006 14:51:02 -0000	1.11
+++ .cvsignore	24 Oct 2006 01:10:02 -0000	1.12
@@ -1 +1 @@
-telepathy-gabble-0.4.0.tar.gz
+telepathy-gabble-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 14:51:02 -0000	1.11
+++ sources	24 Oct 2006 01:10:02 -0000	1.12
@@ -1 +1 @@
-dc78e31762fef419c6c64d2f8a82e012  telepathy-gabble-0.4.0.tar.gz
+e08f4e1f361165635128c5996d71e2b9  telepathy-gabble-0.4.1.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/telepathy-gabble.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- telepathy-gabble.spec	19 Oct 2006 14:51:02 -0000	1.11
+++ telepathy-gabble.spec	24 Oct 2006 01:10:02 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
+- Update to 0.4.1.
+
 * Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0.
 



From fedora-extras-commits at redhat.com  Tue Oct 24 04:35:53 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Oct 2006 21:35:53 -0700
Subject: rpms/csound/devel csound-5.03.0-disable-atsa.patch, NONE,
	1.1 csound-5.03.0-gstabs-disable-option.patch, NONE,
	1.1 csound-5.03.0-no-usr-local.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 csound-5.03.0-enable-fluidsynth.patch, 1.1, 1.2 csound.spec,
	1.2, 1.3 sources, 1.2, 1.3 csound-5.03.0-no-gstabs.patch, 1.1,
	NONE csound-5.03.0-printf-redef.patch, 1.1,
	NONE csound-5.03.0-uninitialized.patch, 1.1, NONE
Message-ID: <200610240435.k9O4Zrcd024439@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24405

Modified Files:
	.cvsignore csound-5.03.0-enable-fluidsynth.patch csound.spec 
	sources 
Added Files:
	csound-5.03.0-disable-atsa.patch 
	csound-5.03.0-gstabs-disable-option.patch 
	csound-5.03.0-no-usr-local.patch 
Removed Files:
	csound-5.03.0-no-gstabs.patch csound-5.03.0-printf-redef.patch 
	csound-5.03.0-uninitialized.patch 
Log Message:
* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
- Drop csound-5.03.0-uninitialized.patch, upstream
- Drop csound-5.03.0-printf-redef.patch, upstream
- CVS snapshot to grab some updated opcodes and fixes
- Make disabling -gstabs an option for better upstream palatability
- Disable atsa; it breaks the build for some unknown reason



csound-5.03.0-disable-atsa.patch:

--- NEW FILE csound-5.03.0-disable-atsa.patch ---
diff -ru Csound5.03.0/SConstruct /tmp/Csound5.03.0/SConstruct
--- Csound5.03.0/SConstruct	2006-10-23 16:07:41.000000000 -0400
+++ /tmp/Csound5.03.0/SConstruct	2006-08-11 09:23:01.000000000 -0400
@@ -1422,7 +1365,6 @@
 
 if (commonEnvironment['buildUtilities'] != '0'):
     utils = [
-        ['atsa',        'util/atsa_main.c'    ],
         ['cvanal',      'util/cvl_main.c'     ],
         ['dnoise',      'util/dnoise_main.c'  ],
         ['envext',      'util/env_main.c'     ],

csound-5.03.0-gstabs-disable-option.patch:

--- NEW FILE csound-5.03.0-gstabs-disable-option.patch ---
--- Csound5.03.0/SConstruct.gstabs-disable-option	2006-10-23 15:36:38.000000000 -0400
+++ Csound5.03.0/SConstruct	2006-10-23 15:39:28.000000000 -0400
@@ -161,6 +161,9 @@
 opts.Add('noDebug',
     'Build without debugging information.',
     '0')
+opts.Add('disableGStabs',
+    'Set to 1 if you want to turn off GStabs debug info support, which may break some architectures',
+    '0')
 opts.Add('gcc3opt',
     'Enable gcc 3.3.x or later optimizations for the specified CPU architecture (e.g. pentium3); implies noDebug.',
     '0')
@@ -289,7 +292,10 @@
     commonEnvironment.Prepend(CCFLAGS = ['-g', '-O2'])
   else:
     if not withMSVC():
-      commonEnvironment.Prepend(CCFLAGS = ['-g', '-gstabs', '-O2'])
+      debug_opts = ['-g', '-O2']
+      if commonEnvironment['disableGStabs'] == '0':
+        debug_opts.append('-gstabs')
+      commonEnvironment.Prepend(CCFLAGS = debug_opts)
 else:
   commonEnvironment.Prepend(CCFLAGS = ['-O2'])
 if commonEnvironment['useGprof'] == '1':

csound-5.03.0-no-usr-local.patch:

--- NEW FILE csound-5.03.0-no-usr-local.patch ---
--- Csound5.03.0/SConstruct.no-usr-local	2006-10-23 15:42:27.000000000 -0400
+++ Csound5.03.0/SConstruct	2006-10-23 15:43:31.000000000 -0400
@@ -307,10 +307,10 @@
 if commonEnvironment['buildRelease'] == '0':
     commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
 if commonEnvironment['Word64'] == '1':
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
     commonEnvironment.Append(CCFLAGS = ['-fPIC'])
 else:
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
 
 if commonEnvironment['useDouble'] == '0':
     print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
@@ -325,14 +325,12 @@
 
 if getPlatform() == 'linux':
     commonEnvironment.Append(CCFLAGS = "-DLINUX")
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
     commonEnvironment.Append(CPPPATH = '/usr/include')
     commonEnvironment.Append(CPPPATH = '/usr/X11R6/include')
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
 elif getPlatform() == 'darwin':
     commonEnvironment.Append(CCFLAGS = "-DMACOSX")
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     if commonEnvironment['useAltivec'] == '1':
         print 'CONFIGURATION DECISION using Altivec optmisation'
@@ -343,7 +341,6 @@
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
     if not withMSVC():
-        commonEnvironment.Append(CPPPATH = '/usr/local/include')
         commonEnvironment.Append(CPPPATH = '/usr/include')
         commonEnvironment.Append(CCFLAGS = "-mthreads")
     else:
@@ -351,15 +348,14 @@
 
 if getPlatform() == 'linux':
     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
-    pythonIncludePath = [path1, path2]
+    pythonIncludePath = [path1]
     pythonLinkFlags = []
     if commonEnvironment['Word64'] == '1':
         tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
+        pythonLibraryPath = ['/usr/lib64', tmp]
     else:
         tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
+        pythonLibraryPath = ['/usr/lib', tmp]
     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
 elif getPlatform() == 'darwin':
     pyBasePath = '/System/Library/Frameworks/Python.Framework'


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Sep 2006 18:09:14 -0000	1.2
+++ .cvsignore	24 Oct 2006 04:35:22 -0000	1.3
@@ -1,2 +1,3 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
+Csound5.03_src-cvs20061023.tar.bz2

csound-5.03.0-enable-fluidsynth.patch:

Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-enable-fluidsynth.patch	5 Sep 2006 18:09:14 -0000	1.1
+++ csound-5.03.0-enable-fluidsynth.patch	24 Oct 2006 04:35:22 -0000	1.2
@@ -1,16 +1,16 @@
---- Csound5.03.0/SConstruct.enable-fluidsynth	2006-08-11 09:23:01.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-08-30 13:48:19.000000000 -0400
-@@ -212,6 +212,9 @@
- opts.Add('buildOSXGUI',
-     'On OSX, set to 1 to build the basic GUI frontend',
+--- Csound5.03.0/SConstruct.enable-fluidsynth	2006-10-21 11:03:22.000000000 -0400
++++ Csound5.03.0/SConstruct	2006-10-23 15:36:10.000000000 -0400
+@@ -225,6 +225,9 @@
      '0')
+ opts.Add('isWinNT', 'On windows, if win2000 or NT is used',
+           '%d' % withMSVC())
 +opts.Add('useFluidsynth',
 +    'Set to 1 if you want OSC support',
 +    '0')
  
  # Define the common part of the build environment.
  # This section also sets up customized options for third-party libraries, which
-@@ -405,6 +408,7 @@
+@@ -426,6 +429,7 @@
  pdhfound = configure.CheckHeader("m_pd.h", language = "C")
  tclhfound = configure.CheckHeader("tcl.h", language = "C")
  luaFound = configure.CheckHeader("lua.h", language = "C")
@@ -18,7 +18,7 @@
  swigFound = 'swig' in commonEnvironment['TOOLS']
  print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
  pythonFound = configure.CheckHeader("Python.h", language = "C")
-@@ -1187,7 +1191,7 @@
+@@ -1228,7 +1232,7 @@
  
  # FLUIDSYNTH OPCODES
  


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound.spec	8 Sep 2006 14:59:23 -0000	1.2
+++ csound.spec	24 Oct 2006 04:35:22 -0000	1.3
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0:     http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src.tgz
+Source0:     http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061023.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -36,10 +36,10 @@
 # cvs -z9 -d :pserver:anonymous at csound.cvs.sourceforge.net:/cvsroot/csound checkout -P -r csound-5_03_0 manual
 Source1: Csound5.03_manual.tgz
 
-Patch0: csound-5.03.0-uninitialized.patch
-Patch1: csound-5.03.0-printf-redef.patch
-Patch2: csound-5.03.0-enable-fluidsynth.patch
-Patch3: csound-5.03.0-no-gstabs.patch
+Patch0: csound-5.03.0-enable-fluidsynth.patch
+Patch1: csound-5.03.0-gstabs-disable-option.patch
+Patch2: csound-5.03.0-no-usr-local.patch
+Patch3: csound-5.03.0-disable-atsa.patch
 
 
 %description
@@ -161,10 +161,11 @@
 
 %prep
 %setup -q -n Csound5.03.0
-%patch0 -p1 -b .uninitialized
-%patch1 -p1 -b .printf-redef
-%patch2 -p1 -b .enable-fluidsynth
-%patch3 -p1 -b .no-gstabs
+%patch0 -p1 -b .enable-fluidsynth
+%patch1 -p1 -b .gstabs-disable-option
+%patch2 -p1 -b .no-usr-local
+%patch3 -p1 -b .disable-atsa
+
 tar xf %{SOURCE1}
 
 %build
@@ -174,6 +175,11 @@
       frontends/fltk_gui/CsoundGlobalSettings.cpp
 
 scons dynamicCsoundLibrary=1 \
+      buildRelease=0 \
+      noDebug=0 \
+      disableGStabs=1 \
+      buildInterfaces=1 \
+      useALSA=1 \
       usePortAudio=0 \
       usePortMIDI=0 \
       useOSC=1 \
@@ -186,6 +192,7 @@
       buildTclcsound=1 \
       buildJavaWrapper=1 \
       buildDSSI=1 \
+      buildUtilities=1 \
       prefix=%{_prefix} \
       customCCFLAGS="%{optflags}" \
       customCXXFLAGS="%{optflags}" \
@@ -268,6 +275,8 @@
 %{_bindir}/scsort
 %{_bindir}/sndinfo
 %{_bindir}/srconv
+%{_bindir}/pv_export
+%{_bindir}/pv_import
 %{_libdir}/lib%{name}.so.5.1
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/xmg/*.xmg
@@ -298,6 +307,9 @@
 %{_libdir}/%{name}/plugins/libudprecv.so
 %{_libdir}/%{name}/plugins/libudpsend.so
 %{_libdir}/%{name}/plugins/libvbap.so
+%{_libdir}/%{name}/plugins/libharmon.so
+%{_libdir}/%{name}/plugins/libugakbari.so
+%{_libdir}/%{name}/plugins/libvaops.so
 %{_libdir}/%{name}/plugins/opcodes.dir
 
 %files devel
@@ -364,6 +376,13 @@
 %doc tutorial/*.py
 
 %changelog
+* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
+- Drop csound-5.03.0-uninitialized.patch, upstream
+- Drop csound-5.03.0-printf-redef.patch, upstream
+- CVS snapshot to grab some updated opcodes and fixes
+- Make disabling -gstabs an option for better upstream palatability
+- Disable atsa; it breaks the build for some unknown reason
+
 * Fri Sep  8 2006 Dan Williams <dcbw at redhat.com> 5.03.0-3
 - csound-5.03.0-no-gstabs.patch added; produce dwarf2 like everyone else
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2006 18:09:14 -0000	1.2
+++ sources	24 Oct 2006 04:35:22 -0000	1.3
@@ -1,2 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-15801aef4abce5efb8975b201aa900a2  Csound5.03_src.tgz
+58b8a3f2f7729387acb7cd365191a979  Csound5.03_src-cvs20061023.tar.bz2


--- csound-5.03.0-no-gstabs.patch DELETED ---


--- csound-5.03.0-printf-redef.patch DELETED ---


--- csound-5.03.0-uninitialized.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 24 05:31:49 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 23 Oct 2006 22:31:49 -0700
Subject: rpms/jd/devel .cvsignore,1.6,1.7 jd.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <200610240531.k9O5Vnl1027891@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27869

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Oct 2006 15:08:43 -0000	1.6
+++ .cvsignore	24 Oct 2006 05:31:18 -0000	1.7
@@ -1 +1 @@
-jd-1.8.0-cvs061022.tgz
+jd-1.8.0-beta061023.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jd.spec	22 Oct 2006 15:08:43 -0000	1.6
+++ jd.spec	24 Oct 2006 05:31:18 -0000	1.7
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061022
-%define         repoid        22118
+%define         strtag        beta061023
+%define         repoid        22352
 
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Oct 2006 15:08:43 -0000	1.6
+++ sources	24 Oct 2006 05:31:18 -0000	1.7
@@ -1 +1 @@
-f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz
+31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 05:33:11 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 23 Oct 2006 22:33:11 -0700
Subject: rpms/jd/FC-6 .cvsignore,1.6,1.7 jd.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <200610240533.k9O5XBI4027946@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27924

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Oct 2006 15:08:43 -0000	1.6
+++ .cvsignore	24 Oct 2006 05:32:41 -0000	1.7
@@ -1 +1 @@
-jd-1.8.0-cvs061022.tgz
+jd-1.8.0-beta061023.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jd.spec	22 Oct 2006 15:08:43 -0000	1.6
+++ jd.spec	24 Oct 2006 05:32:41 -0000	1.7
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061022
-%define         repoid        22118
+%define         strtag        beta061023
+%define         repoid        22352
 
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Oct 2006 15:08:43 -0000	1.6
+++ sources	24 Oct 2006 05:32:41 -0000	1.7
@@ -1 +1 @@
-f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz
+31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 05:34:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 23 Oct 2006 22:34:38 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.5,1.6 jd.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <200610240534.k9O5YcRu027991@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27971

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2006 15:10:57 -0000	1.5
+++ .cvsignore	24 Oct 2006 05:34:08 -0000	1.6
@@ -1 +1 @@
-jd-1.8.0-cvs061022.tgz
+jd-1.8.0-beta061023.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jd.spec	22 Oct 2006 15:10:57 -0000	1.5
+++ jd.spec	24 Oct 2006 05:34:08 -0000	1.6
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061022
-%define         repoid        22118
+%define         strtag        beta061023
+%define         repoid        22352
 
 
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2006 15:10:57 -0000	1.5
+++ sources	24 Oct 2006 05:34:08 -0000	1.6
@@ -1 +1 @@
-f5897ca43e1a31972b217a61b2027afb  jd-1.8.0-cvs061022.tgz
+31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 05:43:33 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 23 Oct 2006 22:43:33 -0700
Subject: rpms/gaim-gaym/devel .cvsignore, 1.2, 1.3 gaim-gaym.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610240543.k9O5hXbw028211@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28182

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
update to SVN snapshot that can deal with gaim2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 May 2006 15:43:16 -0000	1.2
+++ .cvsignore	24 Oct 2006 05:43:03 -0000	1.3
@@ -1 +1 @@
-qrc-0.96.tgz
+qrc-0.96-289svn.tar.gz


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-gaym.spec	16 May 2006 15:43:16 -0000	1.1
+++ gaim-gaym.spec	24 Oct 2006 05:43:03 -0000	1.2
@@ -1,21 +1,29 @@
-# $Id$
-
-# make sure we require the correct versions of gaim
-%define gaim_min 1:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
-%define gaim_max 1:2.0.0
+# make sure we require the correct versions of gaim 
+%define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
+%define gaim_max 2:3.0.0
+
+%define gaimsrcver 2.0.0beta3
+
+# it's not quite 0.97, but it's definitely:
+#   branch:      fork-for-gaim-2
+#   svn release: 289
+%define alphatag 289svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        2%{?dist}
+Release:        3%{?alphatag:.1.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://groups.yahoo.com/group/gaymplugin/
-Source0:        http://download.berlios.de/qrc/qrc-%{version}.tgz
+Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz
+Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gaim < %{gaim_max}, gtk2-devel
+BuildRequires:  gaim-devel < %{gaim_max}, gtk2-devel
+%{?alphatag:BuildRequires: autoconf, automake, libtool, pkgconfig}
+
 Requires:       gaim >= %{gaim_min}, gaim < %{gaim_max}
 
 %description
@@ -27,10 +35,22 @@
 and less than %{gaim_max}.
 
 %prep
-%setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version} -T -D -a 1
+%setup -q -n fork-for-gaim-2
+%setup -q -n fork-for-gaim-2 -T -D -a 1
+
 
+# copy the needed headers to the right places...
+for i in gaym/src bot-challenger gaym-extras/src ; do
+    cp gaim-%{gaimsrcver}/src/internal.h $i
+    cp gaim-%{gaimsrcver}/src/prefix.h   $i
+done
+
+rm -rf gaim-%{gaimsrcver}
 
 %build
+autoreconf --force --install
 %configure --enable-display_options
 make %{?_smp_mflags}
 
@@ -56,6 +76,11 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.1.289svn
+- pull in header files not included in gaim-devel
+- switch to SVN branch fork-for-gaim-2, rev 289
+- pull in all the auto* stuff we now need for a devel snapshot
+
 * Mon May  8 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-2
 - dropped explicit requires: gtk2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2006 15:43:16 -0000	1.2
+++ sources	24 Oct 2006 05:43:03 -0000	1.3
@@ -1 +1 @@
-f846fdc07c2e38e74f8e27c58cdde37a  qrc-0.96.tgz
+34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 06:05:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 23 Oct 2006 23:05:37 -0700
Subject: rpms/gaim-gaym/devel .cvsignore, 1.3, 1.4 gaim-gaym.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200610240605.k9O65bUD031299@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
*sigh*



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Oct 2006 05:43:03 -0000	1.3
+++ .cvsignore	24 Oct 2006 06:05:07 -0000	1.4
@@ -1 +1,2 @@
 qrc-0.96-289svn.tar.gz
+gaim-2.0.0beta3.tar.bz2


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaim-gaym.spec	24 Oct 2006 05:43:03 -0000	1.2
+++ gaim-gaym.spec	24 Oct 2006 06:05:07 -0000	1.3
@@ -11,7 +11,7 @@
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.1.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.2.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.2.289svn
+- it helps to upload all sources to the lookaside cache.
+
 * Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.1.289svn
 - pull in header files not included in gaim-devel
 - switch to SVN branch fork-for-gaim-2, rev 289


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Oct 2006 05:43:03 -0000	1.3
+++ sources	24 Oct 2006 06:05:07 -0000	1.4
@@ -1 +1,2 @@
 34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz
+c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 06:12:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 23 Oct 2006 23:12:54 -0700
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200610240612.k9O6CsOi031438@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31413

Modified Files:
	gaim-gaym.spec sources 
Log Message:
update to svn snapshot



Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-gaym.spec	16 May 2006 15:43:16 -0000	1.1
+++ gaim-gaym.spec	24 Oct 2006 06:12:24 -0000	1.2
@@ -1,21 +1,29 @@
-# $Id$
-
-# make sure we require the correct versions of gaim
-%define gaim_min 1:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
-%define gaim_max 1:2.0.0
+# make sure we require the correct versions of gaim 
+%define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
+%define gaim_max 2:3.0.0
+
+%define gaimsrcver 2.0.0beta3
+
+# it's not quite 0.97, but it's definitely:
+#   branch:      fork-for-gaim-2
+#   svn release: 289
+%define alphatag 289svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        2%{?dist}
+Release:        3%{?alphatag:.2.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://groups.yahoo.com/group/gaymplugin/
-Source0:        http://download.berlios.de/qrc/qrc-%{version}.tgz
+Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz
+Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gaim < %{gaim_max}, gtk2-devel
+BuildRequires:  gaim-devel < %{gaim_max}, gtk2-devel
+%{?alphatag:BuildRequires: autoconf, automake, libtool, pkgconfig}
+
 Requires:       gaim >= %{gaim_min}, gaim < %{gaim_max}
 
 %description
@@ -27,10 +35,22 @@
 and less than %{gaim_max}.
 
 %prep
-%setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version} -T -D -a 1
+%setup -q -n fork-for-gaim-2
+%setup -q -n fork-for-gaim-2 -T -D -a 1
+
 
+# copy the needed headers to the right places...
+for i in gaym/src bot-challenger gaym-extras/src ; do
+    cp gaim-%{gaimsrcver}/src/internal.h $i
+    cp gaim-%{gaimsrcver}/src/prefix.h   $i
+done
+
+rm -rf gaim-%{gaimsrcver}
 
 %build
+autoreconf --force --install
 %configure --enable-display_options
 make %{?_smp_mflags}
 
@@ -56,6 +76,14 @@
 
 
 %changelog
+* Mon Oct 23 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.2.289svn
+- it helps to upload all sources to the lookaside cache.
+
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.1.289svn
+- pull in header files not included in gaim-devel
+- switch to SVN branch fork-for-gaim-2, rev 289
+- pull in all the auto* stuff we now need for a devel snapshot
+
 * Mon May  8 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-2
 - dropped explicit requires: gtk2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2006 15:43:16 -0000	1.2
+++ sources	24 Oct 2006 06:12:24 -0000	1.3
@@ -1 +1,2 @@
-f846fdc07c2e38e74f8e27c58cdde37a  qrc-0.96.tgz
+34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz
+c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 06:27:48 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Oct 2006 23:27:48 -0700
Subject: rpms/testdisk/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 testdisk.spec, 1.7, 1.8
Message-ID: <200610240627.k9O6RmIn031788@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31768

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update TestDisk to 6.5 version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 11:01:46 -0000	1.4
+++ .cvsignore	24 Oct 2006 06:27:17 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 11:01:46 -0000	1.4
+++ sources	24 Oct 2006 06:27:17 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testdisk.spec	28 Aug 2006 18:13:24 -0000	1.7
+++ testdisk.spec	24 Oct 2006 06:27:17 -0000	1.8
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	3%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
 * Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Tue Oct 24 06:36:59 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Oct 2006 23:36:59 -0700
Subject: rpms/testdisk/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 testdisk.spec, 1.7, 1.8
Message-ID: <200610240636.k9O6axh1031881@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31861

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
Update TestDisk to 6.5 version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 13:45:41 -0000	1.4
+++ .cvsignore	24 Oct 2006 06:36:29 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 13:45:41 -0000	1.4
+++ sources	24 Oct 2006 06:36:29 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-5/testdisk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testdisk.spec	21 Jun 2006 13:45:41 -0000	1.7
+++ testdisk.spec	24 Oct 2006 06:36:29 -0000	1.8
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	2%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,12 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
+* Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
+- Rebuild for Fedora Extras 6
+
 * Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-2
 - FC3 and FC4 has a release of 2, need to align
 



From fedora-extras-commits at redhat.com  Tue Oct 24 07:35:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 24 Oct 2006 00:35:49 -0700
Subject: rpms/smbldap-tools/devel smbldap-tools-0.9.2-config.patch, 1.1,
	1.2 smbldap-tools.spec, 1.2, 1.3
Message-ID: <200610240735.k9O7ZnlI002612@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2590

Modified Files:
	smbldap-tools-0.9.2-config.patch smbldap-tools.spec 
Log Message:
Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
A consequence of this is that the package can no longer be noarch
Install smbldap_tools.pm without unnecessary exec bits
Fix example idmapdn entry in config file


smbldap-tools-0.9.2-config.patch:

Index: smbldap-tools-0.9.2-config.patch
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/devel/smbldap-tools-0.9.2-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smbldap-tools-0.9.2-config.patch	24 Mar 2006 07:15:06 -0000	1.1
+++ smbldap-tools-0.9.2-config.patch	24 Oct 2006 07:35:18 -0000	1.2
@@ -1,5 +1,5 @@
---- smbldap.conf	2006-01-27 10:52:27.000000000 +0000
-+++ smbldap.conf	2006-01-27 11:34:20.000000000 +0000
+--- smbldap.conf	2006-10-24 08:06:27.000000000 +0100
++++ smbldap.conf	2006-10-24 08:08:46.000000000 +0100
 @@ -34,12 +34,12 @@
  
  # Put your own SID. To obtain this number do: "net getlocalsid".
@@ -43,7 +43,7 @@
  
  # Where are stored Computers
  # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
-@@ -112,7 +112,7 @@
+@@ -112,10 +112,10 @@
  # Where are stored Groups
  # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
  # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
@@ -51,4 +51,8 @@
 +groupsdn="ou=Group,${suffix}"
  
  # Where are stored Idmap entries (used if samba is a domain member server)
- # Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
+-# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
++# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
+ # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
+ idmapdn="ou=Idmap,${suffix}"
+ 


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smbldap-tools.spec	22 Sep 2006 11:21:25 -0000	1.2
+++ smbldap-tools.spec	24 Oct 2006 07:35:18 -0000	1.3
@@ -1,16 +1,21 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
 Source:		http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz
 Patch0:		smbldap-tools-0.9.2-config.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildArch:	noarch
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
+#BuildArch:	noarch
+ExcludeArch:	x86_64
+# Debuginfo package would be empty as there are no binaries in this package
+%define debug_package %{nil}
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -36,7 +41,7 @@
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 %{__install} -d -m0755 %{buildroot}%{perl_vendorlib}
 %{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}
-%{__install} -p -m0755 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
+%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
 %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
 %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
 
@@ -64,6 +69,12 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
+- Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
+- A consequence of this is that the package can no longer be noarch
+- Install smbldap_tools.pm without unnecessary exec bits
+- Fix example idmapdn entry in config file
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 0.9.2-3
 - Require IO::Socket::SSL to ensure we have SSL support even if perl-LDAP
   doesn't enforce this dependency (#122066, #207430)
@@ -82,7 +93,7 @@
 * Tue Jan 17 2006 Paul Howarth <paul at city-fan.org> 0.9.1-2
 - Unpack tarball quietly
 - Clean up file list
-- Put smbldap_tools.pm in %{perl_vendorlib} rather than %{_sbindir}
+- Put smbldap_tools.pm in %%{perl_vendorlib} rather than %%{_sbindir}
 - Add %%{?dist} tag
 
 * Sat Jun 04 2005 Dag Wieers <dag at wieers.com> - 0.9.1-1 - 3108+/dag



From fedora-extras-commits at redhat.com  Tue Oct 24 07:37:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 24 Oct 2006 00:37:50 -0700
Subject: rpms/smbldap-tools/FC-6 smbldap-tools-0.9.2-config.patch, 1.1,
	1.2 smbldap-tools.spec, 1.2, 1.3
Message-ID: <200610240737.k9O7boJN002699@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2666

Modified Files:
	smbldap-tools-0.9.2-config.patch smbldap-tools.spec 
Log Message:
resync with devel

smbldap-tools-0.9.2-config.patch:

Index: smbldap-tools-0.9.2-config.patch
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/FC-6/smbldap-tools-0.9.2-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smbldap-tools-0.9.2-config.patch	24 Mar 2006 07:15:06 -0000	1.1
+++ smbldap-tools-0.9.2-config.patch	24 Oct 2006 07:37:19 -0000	1.2
@@ -1,5 +1,5 @@
---- smbldap.conf	2006-01-27 10:52:27.000000000 +0000
-+++ smbldap.conf	2006-01-27 11:34:20.000000000 +0000
+--- smbldap.conf	2006-10-24 08:06:27.000000000 +0100
++++ smbldap.conf	2006-10-24 08:08:46.000000000 +0100
 @@ -34,12 +34,12 @@
  
  # Put your own SID. To obtain this number do: "net getlocalsid".
@@ -43,7 +43,7 @@
  
  # Where are stored Computers
  # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
-@@ -112,7 +112,7 @@
+@@ -112,10 +112,10 @@
  # Where are stored Groups
  # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
  # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
@@ -51,4 +51,8 @@
 +groupsdn="ou=Group,${suffix}"
  
  # Where are stored Idmap entries (used if samba is a domain member server)
- # Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
+-# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
++# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
+ # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
+ idmapdn="ou=Idmap,${suffix}"
+ 


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/FC-6/smbldap-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smbldap-tools.spec	22 Sep 2006 11:21:25 -0000	1.2
+++ smbldap-tools.spec	24 Oct 2006 07:37:19 -0000	1.3
@@ -1,16 +1,21 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
 Source:		http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz
 Patch0:		smbldap-tools-0.9.2-config.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildArch:	noarch
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
+#BuildArch:	noarch
+ExcludeArch:	x86_64
+# Debuginfo package would be empty as there are no binaries in this package
+%define debug_package %{nil}
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -36,7 +41,7 @@
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 %{__install} -d -m0755 %{buildroot}%{perl_vendorlib}
 %{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}
-%{__install} -p -m0755 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
+%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
 %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
 %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
 
@@ -64,6 +69,12 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
+- Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
+- A consequence of this is that the package can no longer be noarch
+- Install smbldap_tools.pm without unnecessary exec bits
+- Fix example idmapdn entry in config file
+
 * Fri Sep 22 2006 Paul Howarth <paul at city-fan.org> 0.9.2-3
 - Require IO::Socket::SSL to ensure we have SSL support even if perl-LDAP
   doesn't enforce this dependency (#122066, #207430)
@@ -82,7 +93,7 @@
 * Tue Jan 17 2006 Paul Howarth <paul at city-fan.org> 0.9.1-2
 - Unpack tarball quietly
 - Clean up file list
-- Put smbldap_tools.pm in %{perl_vendorlib} rather than %{_sbindir}
+- Put smbldap_tools.pm in %%{perl_vendorlib} rather than %%{_sbindir}
 - Add %%{?dist} tag
 
 * Sat Jun 04 2005 Dag Wieers <dag at wieers.com> - 0.9.1-1 - 3108+/dag



From fedora-extras-commits at redhat.com  Tue Oct 24 07:39:31 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:39:31 -0700
Subject: rpms/bitlbee - New directory
Message-ID: <200610240739.k9O7dVn6002800@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/bitlbee

Log Message:
Directory /cvs/extras/rpms/bitlbee added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 07:39:37 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:39:37 -0700
Subject: rpms/bitlbee/devel - New directory
Message-ID: <200610240739.k9O7dbr3002814@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/bitlbee/devel

Log Message:
Directory /cvs/extras/rpms/bitlbee/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 07:39:56 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:39:56 -0700
Subject: rpms/bitlbee/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610240739.k9O7duwv002865@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2841/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bitlbee


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 24 07:39:55 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:39:55 -0700
Subject: rpms/bitlbee Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610240739.k9O7dtKx002847@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2841

Added Files:
	Makefile import.log 
Log Message:
Setup of module bitlbee


--- NEW FILE Makefile ---
# Top level Makefile for module bitlbee
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 24 07:41:11 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:41:11 -0700
Subject: rpms/bitlbee import.log,1.1,1.2
Message-ID: <200610240741.k9O7fBTg002969@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2928

Modified Files:
	import.log 
Log Message:
auto-import bitlbee-1.0.3-5 on branch devel from bitlbee-1.0.3-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Oct 2006 07:39:55 -0000	1.1
+++ import.log	24 Oct 2006 07:40:40 -0000	1.2
@@ -0,0 +1 @@
+bitlbee-1_0_3-5:HEAD:bitlbee-1.0.3-5.src.rpm:1161675633



From fedora-extras-commits at redhat.com  Tue Oct 24 07:41:11 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 24 Oct 2006 00:41:11 -0700
Subject: rpms/bitlbee/devel bitlbee-1.0.3-cflags.patch, NONE,
	1.1 bitlbee-1.0.3-socklen.patch, NONE, 1.1 bitlbee.spec, NONE,
	1.1 bitlbee.xinetd, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610240741.k9O7fBY7002973@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2928/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bitlbee-1.0.3-cflags.patch bitlbee-1.0.3-socklen.patch 
	bitlbee.spec bitlbee.xinetd 
Log Message:
auto-import bitlbee-1.0.3-5 on branch devel from bitlbee-1.0.3-5.src.rpm

bitlbee-1.0.3-cflags.patch:

--- NEW FILE bitlbee-1.0.3-cflags.patch ---
Bug #171: [PATCH] Environment variable CFLAGS isn't honored
--------------------------------------+-------------------------------------
 Reporter:  robert at fedoraproject.org  |        Owner:
     Type:  defect                    |       Status:  new
 Priority:  normal                    |    Milestone:
Component:  BitlBee                   |      Version:  1.0.3
 Keywords:                            |   Irc_client:  Client-independent
       Os:  Linux                     |   Os_version:
--------------------------------------+-------------------------------------
BitlBee currently doesn't honor passed CFLAGS, neither in 'CFLAGS="foo"
./configure' nor at 'make CFLAGS="foo"'. Last one will break BitlBee while
compiling completely. Following patch resolves the issue (especially for
vendors like Fedora, Mandrake etc). Thanks to wilmer and lucumo for
figgering out a suitable and working solution.

Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/171

--- bitlbee-1.0.3/configure		2006-06-24 16:00:43.000000000 +0200
+++ bitlbee-1.0.3/configure.rsc		2006-06-26 16:03:59.000000000 +0200
@@ -111,7 +111,11 @@
 	echo 'DEBUG=1' >> Makefile.settings
 	echo '#define DEBUG' >> config.h
 else
-	echo 'CFLAGS=-O3' >> Makefile.settings
+	if [ -n "$CFLAGS" ]; then
+		echo CFLAGS="$CFLAGS" >> Makefile.settings
+	else
+		echo CFLAGS="-O3" >> Makefile.settings
+	fi
 fi
 
 echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings

bitlbee-1.0.3-socklen.patch:

--- NEW FILE bitlbee-1.0.3-socklen.patch ---
Bug #200: bitlbee.c:41: warning: passing argument 3 of 'accept' from
          incompatible pointer type
--------------------------------------+-------------------------------------
 Reporter:  anonymous                 |        Owner:
     Type:  defect                    |       Status:  new
 Priority:  minor                     |    Milestone:
Component:  BitlBee                   |      Version:  1.0.3
 Keywords:                            |   Irc_client:  Client-independent
       Os:  Public server             |   Os_version:  Fedora Core 4
--------------------------------------+-------------------------------------
on x86_64 I get: 

bitlbee.c:41: warning: passing argument 3 of 'accept' from incompatible
pointer type 

This is because the type for size has been set to size_t instead of socklen_t.

Setting it to socklen_t resolved this for me.

paul at cypherpunks.ca

Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/200

--- bitlbee-1.0.3/bitlbee.c		2006-06-24 16:00:43.000000000 +0200
+++ bitlbee-1.0.3/bitlbee.c.socklen	2006-09-23 22:42:59.000000000 +0200
@@ -35,7 +35,7 @@
 
 gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data )
 {
-	size_t size = sizeof( struct sockaddr_in );
+	socklen_t size = sizeof( struct sockaddr_in );
 	struct sockaddr_in conn_info;
 	int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, 
 		                     &size );


--- NEW FILE bitlbee.spec ---
Summary:           IRC to other chat networks gateway
Name:              bitlbee
Version:           1.0.3
Release:           5%{?dist}
License:           GPL
Group:             System Environment/Daemons
URL:               http://www.bitlbee.org/
Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
Source1:           bitlbee.xinetd
Patch0:            bitlbee-1.0.3-cflags.patch
Patch1:            bitlbee-1.0.3-socklen.patch
Requires:          xinetd
Requires(pre):     /usr/sbin/useradd
Requires(preun):   /sbin/service
BuildRequires:     glib2-devel, libxslt
%if 0%{?rhl}%{?fedora}%{?rhel}
BuildRequires:     gnutls-devel
%else
BuildRequires:     openssl-devel
%endif
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Bitlbee is an IRC to other chat networks gateway. Bitlbee can be used as
an IRC server which forwards everything you say to people on other chat
networks like MSN/ICQ/Jabber.

%prep
%setup -q
%patch0 -p1 -b .cflags
%patch1 -p1 -b .socklen

perl -pi.make -e '
                s|\$\(BINDIR\)|\$(sbindir)|g;
                s|\$\(DATADIR\)|\$(datadir)/%{name}|g;
                s|\$\(ETCDIR\)|\$(sysconfdir)/%{name}|g;
                s|\$\(MANDIR\)|\$(mandir)|g;
        ' Makefile */Makefile */*/Makefile

%build
CFLAGS="$RPM_OPT_FLAGS" ./configure \
        --prefix=%{_prefix} \
        --bindir=%{_sbindir} \
        --etcdir=%{_sysconfdir}/%{name} \
        --mandir=%{_mandir} \
        --datadir=%{_datadir}/%{name} \
        --config=%{_localstatedir}/lib/%{name} \
        --strip=0 \
%if 0%{?rhl}%{?fedora}%{?rhel}
        --ssl=gnutls
%else
        --ssl=openssl
%endif

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib/%{name},%{_mandir}/man8}

install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/

%pre
%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} -M -c "BitlBee User" %{name} > /dev/null 2>&1 || :

%preun
if [ $1 -eq 0 ]; then
  /sbin/service xinetd condrestart > /dev/null 2>&1 || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
%doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
%{_sbindir}/%{name}
%{_datadir}/%{name}/
%{_mandir}/man?/%{name}*
%attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}

%changelog
* Sat Oct 21 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-5
- Create a bitlbee user and condrestart xinetd instead of reload

* Fri Aug 04 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-4
- Switched to gnutls per default for SSL support (#196591 #c12)

* Mon Jun 26 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-3
- Added patch for using CFLAGS env (#196591 #c4, upstream #171)

* Sun Jun 25 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-2
- Changes to match with Fedora Packaging Guidelines (#196591)

* Sun Jun 25 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-1
- Upgrade to 1.0.3

* Sun Apr 02 2006 Robert Scheck <robert at fedoraproject.org> 1.0.2-1
- Upgrade to 1.0.2

* Sun Jan 15 2006 Robert Scheck <robert at fedoraproject.org> 1.0.1-1
- Upgrade to 1.0.1

* Wed Dec 28 2005 Robert Scheck <robert at fedoraproject.org> 1.0-2
- Rebuilt against gcc 4.1

* Mon Dec 05 2005 Robert Scheck <robert at fedoraproject.org> 1.0-1
- Upgrade to 1.0

* Sat Nov 12 2005 Robert Scheck <robert at fedoraproject.org> 0.92-4
- Rebuilt against openssl 0.9.8a

* Sun Aug 28 2005 Robert Scheck <robert at fedoraproject.org> 0.92-3
- Added patch, that allows specifying the Jabber server manually
- Don't start bitlbee per default as xinetd service

* Sun Jul 03 2005 Robert Scheck <robert at fedoraproject.org> 0.92-2
- Added patch giving ICQ/AIM support for typing notifications

* Fri Jul 01 2005 Robert Scheck <robert at fedoraproject.org> 0.92-1
- Upgrade to 0.92
- Initial spec file for Fedora Core


--- NEW FILE bitlbee.xinetd ---
# default: off
# description: bitlbee is an IRC gateway to other IM networks.
service ircd
{
	disable = yes
	socket_type	= stream
	protocol	= tcp
	wait		= no
	user		= bitlbee
	bind		= 127.0.0.1
	server		= /usr/sbin/bitlbee
	type		= UNLISTED
	port		= 6667
	log_on_failure	+= USERID
}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Oct 2006 07:39:56 -0000	1.1
+++ .cvsignore	24 Oct 2006 07:40:41 -0000	1.2
@@ -0,0 +1 @@
+bitlbee-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Oct 2006 07:39:56 -0000	1.1
+++ sources	24 Oct 2006 07:40:41 -0000	1.2
@@ -0,0 +1 @@
+e46682d54cbd6265dd4436b3b6838d63  bitlbee-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 08:53:18 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Tue, 24 Oct 2006 01:53:18 -0700
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.9, 1.10
Message-ID: <200610240853.k9O8rI5U006582@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6566

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
close #211751


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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jack-audio-connection-kit.spec	11 Oct 2006 11:33:41 -0000	1.9
+++ jack-audio-connection-kit.spec	24 Oct 2006 08:52:48 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2.0%{?dist}
+Release: 2.1%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,7 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-#BuildRequires: libfreebob >= 1.0.0
+BuildRequires: libfreebob >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -55,6 +55,7 @@
 
 %configure \
     --with-html-dir=%{_docdir} \
+    --enable-freebob \
     --disable-oss \
     --disable-portaudio \
     --with-default-tmpdir=/dev/shm
@@ -119,6 +120,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Oct 24 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.1
+- rebuild with libfreebob (should closed #211751)
+
 * Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.0
 - update to 0.102.20
 - drop patch0 (already in mainstream)



From fedora-extras-commits at redhat.com  Tue Oct 24 09:27:50 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Tue, 24 Oct 2006 02:27:50 -0700
Subject: rpms/jack-audio-connection-kit/FC-6 jack-audio-connection-kit.spec, 
	1.9, 1.10
Message-ID: <200610240927.k9O9Ro98009915@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9899

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
close #211751


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/FC-6/jack-audio-connection-kit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jack-audio-connection-kit.spec	11 Oct 2006 11:33:41 -0000	1.9
+++ jack-audio-connection-kit.spec	24 Oct 2006 09:27:20 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2.0%{?dist}
+Release: 2.1%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,7 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-#BuildRequires: libfreebob >= 1.0.0
+BuildRequires: libfreebob >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -55,6 +55,7 @@
 
 %configure \
     --with-html-dir=%{_docdir} \
+    --enable-freebob \
     --disable-oss \
     --disable-portaudio \
     --with-default-tmpdir=/dev/shm
@@ -119,6 +120,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Oct 24 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.1
+- rebuild with libfreebob (should closed #211751)
+
 * Wed Oct 11 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.0
 - update to 0.102.20
 - drop patch0 (already in mainstream)



From fedora-extras-commits at redhat.com  Tue Oct 24 09:32:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 24 Oct 2006 02:32:10 -0700
Subject: rpms/NetworkManager-vpnc/devel
	NetworkManager-vpnc-0.7.0-gppasswd.patch, NONE,
	1.1 NetworkManager-vpnc.spec, 1.18, 1.19
Message-ID: <200610240932.k9O9WANk010008@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9989

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	NetworkManager-vpnc-0.7.0-gppasswd.patch 
Log Message:
Added patch to support saving group password only

NetworkManager-vpnc-0.7.0-gppasswd.patch:

--- NEW FILE NetworkManager-vpnc-0.7.0-gppasswd.patch ---
--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c	2006-10-21 15:03:55.000000000 +0200
@@ -33,13 +33,39 @@
 
 #define VPN_SERVICE "org.freedesktop.NetworkManager.vpnc"
 
-static GSList *
-lookup_pass (const char *vpn_name, const char *vpn_service, gboolean *is_session)
+struct keyring_data {
+	const char* password;
+	const char* group_password;
+	gboolean is_session;
+};
+
+void keyring_data_init(struct keyring_data* d)
 {
-	GSList *passwords;
-	GList *keyring_result;
+	d->password = NULL;
+	d->group_password = NULL;
+	d->is_session = FALSE;
+}
 
-	passwords = NULL;
+void keyring_data_free(struct keyring_data* d)
+{
+	/* For security reasons, Make sure to clear the data before freeing */
+	if (d->password) {
+		memset((void*)d->password, 0, strlen(d->password));
+		g_free((void*)d->password);
+		d->password = NULL;
+	}
+	if (d->group_password) {
+		memset((void*)d->group_password, 0, strlen(d->group_password));
+		g_free((void*)d->group_password);
+		d->group_password = NULL;
+	}
+}
+ 
+
+gboolean
+lookup_pass (const char *vpn_name, const char *vpn_service, struct keyring_data* kd)
+{
+	GList *keyring_result;
 
 	if (gnome_keyring_find_network_password_sync (g_get_user_name (),     /* user */
 						      NULL,                   /* domain */
@@ -51,40 +77,32 @@
 						      &keyring_result) != GNOME_KEYRING_RESULT_OK)
 		return FALSE;
 
-	if (keyring_result != NULL && g_list_length (keyring_result) == 2) {
-		char *password;
-		char *group_password;
-		GnomeKeyringNetworkPasswordData *data1 = keyring_result->data;
-		GnomeKeyringNetworkPasswordData *data2 = (g_list_next (keyring_result))->data;
+	char *password = NULL;
+	char *group_password = NULL;
+	GList* i;
+
+	for (i = keyring_result; i; i = g_list_next(i)) {
+		GnomeKeyringNetworkPasswordData *data = i->data;
+
+		if (data) {
+			if (strcmp (data->object, "group_password") == 0) {
+				group_password = data->password;
+			} else if (strcmp (data->object, "password") == 0) {
+				password = data->password;
+			}
 
-		password = NULL;
-		group_password = NULL;
-
-		if (strcmp (data1->object, "group_password") == 0) {
-			group_password = data1->password;
-		} else if (strcmp (data1->object, "password") == 0) {
-			password = data1->password;
-		}
-
-		if (strcmp (data2->object, "group_password") == 0) {
-			group_password = data2->password;
-		} else if (strcmp (data2->object, "password") == 0) {
-			password = data2->password;
+			kd->is_session = (strcmp (data->keyring, "session") == 0);
 		}
+	}
 
-		if (password != NULL && group_password != NULL) {
-			passwords = g_slist_append (passwords, g_strdup (group_password));
-			passwords = g_slist_append (passwords, g_strdup (password));
-			if (strcmp (data1->keyring, "session") == 0)
-				*is_session = TRUE;
-			else
-				*is_session = FALSE;
-		}
+	if (password)
+		kd->password = g_strdup(password);
+	if (group_password)
+		kd->group_password = g_strdup(group_password);
 
-		gnome_keyring_network_password_list_free (keyring_result);
-	}
+	gnome_keyring_network_password_list_free (keyring_result);
 
-	return passwords;
+	return TRUE;
 }
 
 static void save_vpn_password (const char *vpn_name, const char *vpn_service, const char *keyring, 
@@ -93,6 +111,7 @@
 	guint32 item_id;
 	GnomeKeyringResult keyring_result;
 
+	if (password) {
 	keyring_result = gnome_keyring_set_network_password_sync (keyring,
 								  g_get_user_name (),
 								  NULL,
@@ -107,6 +126,7 @@
 	{
 		g_warning ("Couldn't store password in keyring, code %d", (int) keyring_result);
 	}
+	}
 
 	keyring_result = gnome_keyring_set_network_password_sync (keyring,
 								  g_get_user_name (),
@@ -125,38 +145,20 @@
 	}
 }
 
-static GSList *
-get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry)
+gboolean
+get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry, struct keyring_data* kdata)
 {
-	GSList          *result;
-	char            *prompt;
+	char		*prompt;
 	GtkWidget	*dialog;
-	char            *keyring_password;
-	char            *keyring_group_password;
-	gboolean         keyring_is_session;
-	GSList          *keyring_result;
 	GnomeTwoPasswordDialogRemember remember;
 
-	result = NULL;
-	keyring_password = NULL;
-	keyring_group_password = NULL;
-	keyring_result = NULL;
-
-	g_return_val_if_fail (vpn_name != NULL, NULL);
+	g_return_val_if_fail (vpn_name != NULL, FALSE);
 
 	/* Use the system user name, since the VPN might have a different user name */
-	if (!retry) {
-		if ((result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-			return result;
-		}
-	} else {
-		if ((keyring_result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-			keyring_group_password = g_strdup ((char *) keyring_result->data);
-			keyring_password = g_strdup ((char *) (g_slist_next (keyring_result))->data);
-		}
-		g_slist_foreach (keyring_result, (GFunc)g_free, NULL);
-		g_slist_free (keyring_result);
-	}
+	gboolean has_keyring = lookup_pass (vpn_name, vpn_service, kdata);
+
+	if (!retry && has_keyring && kdata->password)
+		return TRUE;
 
 	prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name);
 	dialog = gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE);
@@ -169,21 +171,24 @@
 	gnome_two_password_dialog_set_password_secondary_label (GNOME_TWO_PASSWORD_DIALOG (dialog), _("_Group Password:"));
 	/* use the same keyring storage options as from the items we put in the entry boxes */
 	remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING;
-	if (keyring_result != NULL) {
-		if (keyring_is_session)
+	if (has_keyring) {
+		if (!kdata->password && kdata->group_password)
+			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
+		else if (kdata->is_session)
 			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
 		else
-			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;				
+			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
 	}
+
 	gnome_two_password_dialog_set_remember (GNOME_TWO_PASSWORD_DIALOG (dialog), remember);
 
-	/* if retrying, put in the passwords from the keyring */
-	if (keyring_password != NULL) {
-		gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_password);
-	}
-	if (keyring_group_password != NULL) {
-		gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_group_password);
-	}
+/* if retrying, put in the passwords from the keyring */
+	if (kdata->password)
+		gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), kdata->password);
+
+	if (kdata->group_password)
+		gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog),
+								  kdata->group_password);
 
 	gtk_widget_show (dialog);
 
@@ -192,18 +197,21 @@
 		char *password;
 		char *group_password;
 
-		password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
-		group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
-		result = g_slist_append (result, group_password);
-		result = g_slist_append (result, password);
+		keyring_data_free(kdata);
+
+		kdata->password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
+		kdata->group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
 
 		switch (gnome_two_password_dialog_get_remember (GNOME_TWO_PASSWORD_DIALOG (dialog)))
 		{
 			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION:
-				save_vpn_password (vpn_name, vpn_service, "session", password, group_password);
+				save_vpn_password (vpn_name, vpn_service, "session", kdata->password, kdata->group_password);
+				break;
+			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
+				save_vpn_password (vpn_name, vpn_service, NULL, NULL, kdata->group_password);
 				break;
 			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER:
-				save_vpn_password (vpn_name, vpn_service, NULL, password, group_password);
+				save_vpn_password (vpn_name, vpn_service, NULL, kdata->password, kdata->group_password);
 				break;
 			default:
 				break;
@@ -211,12 +219,9 @@
 
 	}
 
-	g_free (keyring_password);
-	g_free (keyring_group_password);
-
 	gtk_widget_destroy (dialog);
 
-	return result;
+	return TRUE;
 }
 
 int 
@@ -262,22 +267,28 @@
 	gnome_program_init ("nm-vpnc-auth-dialog", VERSION, LIBGNOMEUI_MODULE,
 			    argc, argv, 
 			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+
+	struct keyring_data kdata;
+	gboolean success = FALSE;
+
+	keyring_data_init(&kdata);
 	  
-	passwords = get_passwords (vpn_name, vpn_service, retry);
-	if (passwords == NULL)
+	if (! get_passwords (vpn_name, vpn_service, retry, &kdata))
 		goto out;
 
+	if (!kdata.password || !kdata.group_password)
+		goto out;
+
+	success = TRUE;
 	/* dump the passwords to stdout */
-	for (i = passwords; i != NULL; i = g_slist_next (i)) {
-		char *password = (char *) i->data;
-		printf ("%s\n", password);
-	}
+	printf ("%s\n", kdata.group_password);
+	printf ("%s\n", kdata.password);
+
 	printf ("\n\n");
 	/* for good measure, flush stdout since Kansas is going Bye-Bye */
 	fflush (stdout);
 
-	g_slist_foreach (passwords, (GFunc)g_free, NULL);
-	g_slist_free (passwords);
+	keyring_data_free(&kdata);
 
 	/* wait for data on stdin  */
 	fread (buf, sizeof (char), sizeof (buf), stdin);
@@ -285,5 +296,5 @@
 out:
 	g_option_context_free (context);
 
-	return passwords != NULL ? 0 : 1;
+	return success ? 0 : 1;
 }
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h	2006-10-21 15:01:12.000000000 +0200
@@ -57,6 +57,7 @@
 typedef enum {
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION,
+	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP,
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER
 } GnomeTwoPasswordDialogRemember;
 
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c	2006-10-21 15:01:12.000000000 +0200
@@ -68,6 +68,7 @@
 	
 	GtkWidget *remember_session_button;
 	GtkWidget *remember_forever_button;
+	GtkWidget *remember_group_forever_button;
 
 	GtkWidget *radio_vbox;
 	GtkWidget *connect_with_no_userpass_button;
@@ -465,11 +466,15 @@
 		gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session"));
 	password_dialog->details->remember_forever_button =
 		gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring"));
+	password_dialog->details->remember_group_forever_button =
+		gtk_check_button_new_with_mnemonic (_("S_ave group password in keyring"));
 
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, 
 			    TRUE, TRUE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, 
 			    TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_forever_button, 
+			    TRUE, TRUE, 6);
 
 
 	gnome_two_password_dialog_set_username (password_dialog, username);
@@ -689,9 +694,11 @@
 	if (show_remember) {
 		gtk_widget_show (password_dialog->details->remember_session_button);
 		gtk_widget_show (password_dialog->details->remember_forever_button);
+		gtk_widget_show (password_dialog->details->remember_group_forever_button);
 	} else {
 		gtk_widget_hide (password_dialog->details->remember_session_button);
 		gtk_widget_hide (password_dialog->details->remember_forever_button);
+		gtk_widget_hide (password_dialog->details->remember_group_forever_button);
 	}
 }
 
@@ -699,30 +706,38 @@
 gnome_two_password_dialog_set_remember      (GnomeTwoPasswordDialog         *password_dialog,
 					 GnomeTwoPasswordDialogRemember  remember)
 {
-	gboolean session, forever;
+	gboolean session, forever, group;
 
 	session = FALSE;
 	forever = FALSE;
+	group = FALSE;
 	if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) {
 		session = TRUE;
 	} else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){
 		forever = TRUE;
+	} else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP){
+		group = TRUE;
 	}
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button),
 				      session);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button),
 				      forever);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button),
+				      group);
 }
 
 GnomeTwoPasswordDialogRemember
 gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog         *password_dialog)
 {
-	gboolean session, forever;
+	gboolean session, forever, group;
 
 	session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button));
 	forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button));
+	group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button));
 	if (forever) {
 		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
+	} else if (group) {
+		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
 	} else if (session) {
 		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
 	}


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- NetworkManager-vpnc.spec	5 Oct 2006 16:12:07 -0000	1.18
+++ NetworkManager-vpnc.spec	24 Oct 2006 09:31:40 -0000	1.19
@@ -13,11 +13,12 @@
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
 Version:   0.7.0
-Release:   0%{?nm_vpnc_cvs_version}.2%{?dist}
+Release:   0%{?nm_vpnc_cvs_version}.3%{?dist}
 License:   GPL
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
+Patch0:    NetworkManager-vpnc-0.7.0-gppasswd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gppasswd
 
 %build
 %configure
@@ -97,6 +99,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Sat Oct 21 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.3
+- Added patch to support saving group password only
+
 * Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.2
 - Leave .so link alone, needed by nm
 



From fedora-extras-commits at redhat.com  Tue Oct 24 11:48:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 04:48:13 -0700
Subject: rpms/qt4/FC-6 .cvsignore, 1.11, 1.12 qt4.spec, 1.25, 1.26 sources,
	1.9, 1.10
Message-ID: <200610241148.k9OBmDfQ017461@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17435

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use respun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Oct 2006 02:49:46 -0000	1.11
+++ .cvsignore	24 Oct 2006 11:47:42 -0000	1.12
@@ -1,5 +1,6 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
 qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/qt4.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qt4.spec	23 Oct 2006 02:49:46 -0000	1.25
+++ qt4.spec	24 Oct 2006 11:47:42 -0000	1.26
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -84,11 +84,14 @@
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps}
+BuildRequires: %{x_deps} %{?x_deps_GL_hack}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
@@ -149,7 +152,7 @@
 Summary: API documentation, demos and example programs for %{name}
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}_%{release}
+Provides: %{name}-assistant = %{version}-%{release}
 # For docs -> doc rename, temporary, since it was a short-lived subpkg
 #Obsoletes: %{name}-docs < %{version}-%{release}
 #Provides:  %{name}-docs = %{version}-%{release}
@@ -506,6 +509,13 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+- use respun upstream 4.2.1 tarball
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1
+- 4.2.1
+
 * Wed Oct 04 2006 Rex Dieter 4.2.0-1
 - 4.2.0(final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Oct 2006 02:49:46 -0000	1.9
+++ sources	24 Oct 2006 11:47:42 -0000	1.10
@@ -1 +1 @@
-6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz
+2ab1c88084f55b94809f025a8503bf18  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 12:29:10 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 05:29:10 -0700
Subject: rpms/xdg-utils/devel xdg-utils-1.0-mimeopen.patch, NONE,
	1.1 xdg-utils.spec, 1.7, 1.8
Message-ID: <200610241229.k9OCTAnh020614@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20595

Modified Files:
	xdg-utils.spec 
Added Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
- prefer mimeopen as generic default (#210797)


xdg-utils-1.0-mimeopen.patch:

--- NEW FILE xdg-utils-1.0-mimeopen.patch ---
--- xdg-utils-1.0/scripts/xdg-open.mimeopen	2006-10-17 22:55:02.000000000 +0200
+++ xdg-utils-1.0/scripts/xdg-open	2006-10-17 22:55:15.000000000 +0200
@@ -360,6 +360,15 @@
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        else
+            exit_failure_operation_failed
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdg-utils.spec	10 Oct 2006 12:48:28 -0000	1.7
+++ xdg-utils.spec	24 Oct 2006 12:28:39 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,14 +11,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Not really used (yet)
-#BuildRequires: xmlto
-
 Requires: desktop-file-utils
 ## kde-config
-#Requires: kdelibs
-# update-gtk-icon-cache
-#Requires: gtk2
+#Requires(hint): kdelibs
+## update-gtk-icon-cache
+#Requires(hint): gtk2
+## generic default
+#Requires(hint): mimeopen
 
 
 %description
@@ -71,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
+- prefer mimeopen as generic default (#210797)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
 - 1.0(final)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 12:30:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 05:30:12 -0700
Subject: rpms/xdg-utils/FC-6 xdg-utils-1.0-mimeopen.patch, NONE,
	1.1 xdg-utils.spec, 1.7, 1.8
Message-ID: <200610241230.k9OCUClC020703@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20667

Modified Files:
	xdg-utils.spec 
Added Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
- prefer mimeopen as generic default (#210797)


xdg-utils-1.0-mimeopen.patch:

--- NEW FILE xdg-utils-1.0-mimeopen.patch ---
--- xdg-utils-1.0/scripts/xdg-open.mimeopen	2006-10-17 22:55:02.000000000 +0200
+++ xdg-utils-1.0/scripts/xdg-open	2006-10-17 22:55:15.000000000 +0200
@@ -360,6 +360,15 @@
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        else
+            exit_failure_operation_failed
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-6/xdg-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdg-utils.spec	10 Oct 2006 12:48:28 -0000	1.7
+++ xdg-utils.spec	24 Oct 2006 12:29:42 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,14 +11,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Not really used (yet)
-#BuildRequires: xmlto
-
 Requires: desktop-file-utils
 ## kde-config
-#Requires: kdelibs
-# update-gtk-icon-cache
-#Requires: gtk2
+#Requires(hint): kdelibs
+## update-gtk-icon-cache
+#Requires(hint): gtk2
+## generic default
+#Requires(hint): mimeopen
 
 
 %description
@@ -71,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
+- prefer mimeopen as generic default (#210797)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
 - 1.0(final)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 12:52:35 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Tue, 24 Oct 2006 05:52:35 -0700
Subject: rpms/libfwbuilder/devel .cvsignore, 1.6, 1.7 libfwbuilder.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200610241252.k9OCqZqV020963@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943

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

- Update to the 2.1.6 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Apr 2006 09:54:02 -0000	1.6
+++ .cvsignore	24 Oct 2006 12:52:05 -0000	1.7
@@ -1 +1 @@
-libfwbuilder-2.0.12.tar.gz
+libfwbuilder-2.1.6.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libfwbuilder.spec	11 Sep 2006 08:35:12 -0000	1.13
+++ libfwbuilder.spec	24 Oct 2006 12:52:05 -0000	1.14
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        2.0.12
-Release:        3%{?dist}
+Version:        2.1.6
+Release:        0.0.beta%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -37,10 +37,10 @@
 
 %files  devel
 %defattr(-, root, root)
-%{_bindir}/libfwbuilder-config-2
-%dir %{_includedir}/fwb-2.0/
-%{_includedir}/fwb-2.0/fwbuilder
-%{_includedir}/fwb-2.0/fwcompiler
+%{_bindir}/libfwbuilder-config-2.1
+%dir %{_includedir}/fwb-2.1/
+%{_includedir}/fwb-2.1/fwbuilder
+%{_includedir}/fwb-2.1/fwcompiler
 
 
 %prep
@@ -49,12 +49,6 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-#
-# configure does not pass our CXXFLAGS to the build process,
-# which kind of sucks.
-# There has to be a less ugly way to do this.
-#
-perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
 
 %configure \
     --enable-auto-docdir \
@@ -62,11 +56,6 @@
     --disable-static  \
     --enable-shared \
     --disable-dependency-tracking
-#
-# configure thinks we have a usable libresolv, when in fact we do
-# not (according to the definiton used by libfwbuilder, that is)
-#
-perl -pi -e 's,#define HAVE_GOODLIBRESOLV 1,/* #undef HAVE_GOODLIBRESOLV */,' src/fwbuilder/libfwbuilder-config.h
 make all
 
 
@@ -88,6 +77,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Ralf Ertzinger <ralf at skytale.net> 2.1.6-0.0.beta.fc7
+- Update to the 2.1.6 beta
+
 * Mon Sep 11 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-3.fc6
 - Bumped and rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Apr 2006 09:54:02 -0000	1.6
+++ sources	24 Oct 2006 12:52:05 -0000	1.7
@@ -1 +1 @@
-09834a242ad0f8aaae80c44ee4937c43  libfwbuilder-2.0.12.tar.gz
+34a5f0c2ae1c5cc45287e4b53ba23816  libfwbuilder-2.1.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 12:58:42 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Tue, 24 Oct 2006 05:58:42 -0700
Subject: rpms/fwbuilder/devel .cvsignore, 1.7, 1.8 fwbuilder.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200610241258.k9OCwgov021059@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21039

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

- Update to beta release 2.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 May 2006 16:52:05 -0000	1.7
+++ .cvsignore	24 Oct 2006 12:58:12 -0000	1.8
@@ -1 +1 @@
-fwbuilder-2.0.12.tar.gz
+fwbuilder-2.1.6.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fwbuilder.spec	11 Sep 2006 08:49:49 -0000	1.14
+++ fwbuilder.spec	24 Oct 2006 12:58:12 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.0.12
-Release:        2%dist
+Version:        2.1.6
+Release:        0.0.beta%{?dist}
 
 License:        GPL
 Group:          Applications/System
@@ -13,6 +13,7 @@
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  libfwbuilder-devel = %{version}
+BuildRequires:  /usr/bin/rename
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for
@@ -30,12 +31,22 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+
 #
-# configure does not pass our CXXFLAGS to the build process,
-# which kind of sucks.
-# There has to be a less ugly way to do this.
+# The beta releases are meant to be installed in parallel, we do
+# not want that. So we have to mangle some filenames
 #
-perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
+perl -pi -e 's,(fwb(?:edit|lookup|uilder|_ipf|_ipfw|_ipt|_pf))21,$1,' \
+    doc/doc.pro \
+    src/ipf/ipf.pro \
+    src/fwbedit/fwbedit.pro \
+    src/gui/gui.pro \
+    src/pf/pf.pro \
+    src/fwblookup/fwblookup.pro \
+    src/ipt/ipt.pro \
+    src/ipfw/ipfw.pro
+
+/usr/bin/rename 21.1 .1 doc/*21.1
 
 %configure \
     --with-templatedir=%{_datadir}/fwbuilder \
@@ -49,7 +60,7 @@
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 # Add an icon for the menu system
-install -Dpm 644 src/gui/icons/firewall_48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fwbuilder.png
+install -Dpm 644 src/gui/icons/firewall_64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/fwbuilder.png
 
 # Add menu entry
 desktop-file-install --vendor fedora               \
@@ -75,45 +86,17 @@
 %{_bindir}/fwbuilder
 %{_bindir}/fwblookup
 %{_bindir}/fwbedit
-%{_bindir}/fwb_install
-%{_bindir}/fwb_compile_all
 %doc doc/AUTHORS
 %doc doc/COPYING
 %doc doc/Credits
 %doc doc/ChangeLog
 %doc doc/PatchAcceptancePolicy.txt
 %doc doc/README.floppyfw
-%doc doc/ReleaseNotes_2_0.html
-%doc doc/ReleaseNotes_2_0.txt
-%doc doc/ReleaseNotes_2.0.1.html
-%doc doc/ReleaseNotes_2.0.1.txt
-%doc doc/ReleaseNotes_2.0.2.html
-%doc doc/ReleaseNotes_2.0.2.txt
-%doc doc/ReleaseNotes_2.0.3.html
-%doc doc/ReleaseNotes_2.0.3.txt
-%doc doc/ReleaseNotes_2.0.4.html
-%doc doc/ReleaseNotes_2.0.4.txt
-%doc doc/ReleaseNotes_2.0.5.html
-%doc doc/ReleaseNotes_2.0.5.txt
-%doc doc/ReleaseNotes_2.0.6.html
-%doc doc/ReleaseNotes_2.0.6.txt
-%doc doc/ReleaseNotes_2.0.7.html
-%doc doc/ReleaseNotes_2.0.7.txt
-%doc doc/ReleaseNotes_2.0.8.html
-%doc doc/ReleaseNotes_2.0.8.txt
-%doc doc/ReleaseNotes_2.0.9.html
-%doc doc/ReleaseNotes_2.0.9.txt
-%doc doc/ReleaseNotes_2.0.10.html
-%doc doc/ReleaseNotes_2.0.10.txt
-%doc doc/ReleaseNotes_2.0.11.html
-%doc doc/ReleaseNotes_2.0.11.txt
-%doc doc/ReleaseNotes_2.0.12.html
-%doc doc/ReleaseNotes_2.0.12.txt
+%doc doc/ReleaseNotes_*.txt
+%doc doc/ReleaseNotes_*.html
 %{_mandir}/man1/fwbuilder.1*
 %{_mandir}/man1/fwblookup.1*
 %{_mandir}/man1/fwbedit.1*
-%{_mandir}/man1/fwb_install.1*
-%{_mandir}/man1/fwb_compile_all.1*
 
 
 %package pf
@@ -176,6 +159,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Tue Oct 24 2006 Ralf Ertzinger <ralf at skytale.net> 2.1.6-0.0.beta.fc7
+- Update to beta release 2.1.6
+
 * Mon Sep 11 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-2.fc6
 - Bumped and rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 May 2006 16:52:05 -0000	1.7
+++ sources	24 Oct 2006 12:58:12 -0000	1.8
@@ -1 +1 @@
-43149297f4a64b19ad3fa519cfff2326  fwbuilder-2.0.12.tar.gz
+12638ce0987c87dd81cc54a8c5b906bb  fwbuilder-2.1.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 13:12:50 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:12:50 -0700
Subject: rpms/ren - New directory
Message-ID: <200610241312.k9ODCo3v024175@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24171/ren

Log Message:
Directory /cvs/extras/rpms/ren added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 13:12:56 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:12:56 -0700
Subject: rpms/ren/devel - New directory
Message-ID: <200610241312.k9ODCuc4024189@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24171/ren/devel

Log Message:
Directory /cvs/extras/rpms/ren/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 13:13:16 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:13:16 -0700
Subject: rpms/ren Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610241313.k9ODDGTQ024220@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24214

Added Files:
	Makefile import.log 
Log Message:
Setup of module ren


--- NEW FILE Makefile ---
# Top level Makefile for module ren
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 24 13:13:22 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:13:22 -0700
Subject: rpms/ren/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610241313.k9ODDMcY024238@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24214/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ren


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 24 13:14:31 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:14:31 -0700
Subject: rpms/ren import.log,1.1,1.2
Message-ID: <200610241314.k9ODEVcK024320@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24283

Modified Files:
	import.log 
Log Message:
auto-import ren-1.0-11 on branch devel from ren-1.0-11.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ren/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Oct 2006 13:13:16 -0000	1.1
+++ import.log	24 Oct 2006 13:14:01 -0000	1.2
@@ -0,0 +1 @@
+ren-1_0-11:HEAD:ren-1.0-11.src.rpm:1161695760



From fedora-extras-commits at redhat.com  Tue Oct 24 13:14:32 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:14:32 -0700
Subject: rpms/ren/devel ren-1.0.Wall.patch, NONE, 1.1 ren.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610241314.k9ODEWq2024324@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ren/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24283/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ren-1.0.Wall.patch ren.spec 
Log Message:
auto-import ren-1.0-11 on branch devel from ren-1.0-11.src.rpm

ren-1.0.Wall.patch:

--- NEW FILE ren-1.0.Wall.patch ---
diff -N -r -u ren-1.0-old/ren.c ren-1.0/ren.c
--- ren-1.0-old/ren.c	1997-10-28 05:32:44.000000000 +0000
+++ ren-1.0/ren.c	2006-06-23 10:22:34.000000000 +0100
@@ -3,6 +3,8 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define direct dirent
 
@@ -27,26 +29,22 @@
 #define NODEL 2
 #define ABORTDEL 3
 
-extern int alphasort();
-extern int scandir();
-extern qsort();
-
-static procargs();
+static int procargs();
 static int procdir();
 static int checkpats();
 static int getreps();
 static int scan();
 static char *makerep();
-static checkcollisons();
+static int checkcollisons();
 static int mycmp();
-static checkdeletes();
-static int bsearch();
+static int checkdeletes();
+static int ren_bsearch();
 static char** breakcycles();
-static dorenames();
+static int dorenames();
 
 static char tempprefix[] = "renTMP";
 
-main(argc, argv)
+int main(argc, argv)
 	int argc;
 	char *(argv[]);
 {
@@ -69,7 +67,7 @@
 }
 
 
-static procargs(argc, argv, pverbose, pdelstyle, pfrom_pat, pto_pat, ppath)
+static int procargs(argc, argv, pverbose, pdelstyle, pfrom_pat, pto_pat, ppath)
 	int argc;
 	char *(argv[]);
 	int *pverbose, *pdelstyle;
@@ -124,10 +122,11 @@
 	}
 	else
 		*ppath = ".";
+	return 0;
 }
 
 
-static checkpats(from_pat, to_pat)
+static int checkpats(from_pat, to_pat)
 	char *from_pat, *to_pat;
 {
 	char *p;
@@ -171,6 +170,7 @@
 				break;
 		}
 	}
+	return 0;
 }
 
 
@@ -340,7 +340,7 @@
 }
 
 
-static checkcollisons(reps, nreps)
+static int checkcollisons(reps, nreps)
 	REP *reps;
 	int nreps;
 {
@@ -361,6 +361,7 @@
 			fputs("Aborting, no renames done.\n", stderr);
 			exit(1);
 		}
+	return 0;
 }
 
 
@@ -371,7 +372,7 @@
 }
 
 
-static checkdeletes(reps, dot, filrep, nfils, delstyle)
+static int checkdeletes(reps, dot, filrep, nfils, delstyle)
 	REP *reps;
 	struct direct *(dot[]);
 	REP *(filrep[]);
@@ -386,7 +387,7 @@
 		for (cur = reps; cur != NULL; cur = cur->nextrep) {
 			if (cur->status == FORGET)
 				continue;
-			if ((i = bsearch(cur->repname, dot, nfils)) >= 0) {
+			if ((i = ren_bsearch(cur->repname, dot, nfils)) >= 0) {
 				if (filrep[i] == NULL && cur->mustdel < 0) {
 					cur->dofirst = NULL;
 					if (delstyle == QUIETDEL)
@@ -437,10 +438,12 @@
 			}
 		}
 	} while (recheck);
+
+	return 0;
 }
 
 
-static int bsearch(s, dlist, n)
+static int ren_bsearch(s, dlist, n)
 	char *s;
 	struct direct *(dlist[]);
 	int n;
@@ -484,7 +487,7 @@
 				exit(1);
 			}
 		}
-		if (pred == cur)
+		if (pred == cur) {
 			if (cur->dofirst == cur)
 				cur->status = FORGET;
 			else {
@@ -503,12 +506,15 @@
 				cur->dofirst = NULL;
 				cur->nextrep = pred;
 			}
+		}
 	}
 	return(tempnames);
+
+	return 0;
 }
 
 
-static dorenames(reps, dot, tempnames, verbose)
+static int dorenames(reps, dot, tempnames, verbose)
 	REP *reps;
 	struct direct *(dot[]);
 	char *(tempnames[]);
@@ -548,4 +554,5 @@
 			}
 		}
 	} while (skipped);
+	return 0;
 }


--- NEW FILE ren.spec ---
Summary: Rename multiple files
Name: ren
Version: 1.0
Release: 11%{?dist}
License: Public Domain
Group: Applications/File
Source: ftp://sunsite.unc.edu/pub/Linux/utils/file/ren-1.0.tar.gz
Patch0: ren-1.0.Wall.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://linux.maruhn.com/sec/ren.html

%description
Whereas mv can rename (as opposed to move) only one file at a time,
ren can rename many files according to search and replacement
patterns, ala VMS and MS-DOS (but better). ren checks for replacement name
collisions and handles rename chains (1 goes to 2 goes to 3 etc.)
gracefully.

%prep
%setup -q
%patch0 -p1

%build
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
#there is no install script included in the upstream Makefile
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_mandir}/man1/
install -m 755 ren %{buildroot}/%{_bindir}
install -m 644 ren.1 %{buildroot}/%{_mandir}/man1/


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{_mandir}/man1/ren.1*
%{_bindir}/ren

%changelog

* Fri Sep 22 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-11
- "freshly" included source did not have correct timestamps. Fixed.

* Fri Sep 22 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-10
- the included tar.gz file did not match the md5sum from upstrean. recreated the src.rpm with a freshly downloaded one

* Fri Sep 22 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-9
- cosmetic fixes

* Thu Jul 27 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-8
- fix generation of debuginfo package

* Wed Jun 28 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-7
- cleanup (%%defattr, %%make)

* Thu Jun 23 2006 lonely wolf <wolfy at pcnet.ro> - 1.0-6
- minor spec cleaning

* Fri Jun 23 2006 Alan Iwi <A.M.Iwi at rl.ac.uk>
- buildroot
- man file is gzipped and is in %%{_mandir}/man1
- patch0: changes to ensure a clean build with gcc -Wall

* Sun Aug 30 1998 W. L. Estes <wlestes at uncg.edu>
- fix docdir permissions

* Sat Aug 01 1998 W. L. Estes <wlestes at hamlet.uncg.edu>
- buildroot
- drop patch to Makefile
- relocateable
- defattr in filelist


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ren/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Oct 2006 13:13:22 -0000	1.1
+++ .cvsignore	24 Oct 2006 13:14:02 -0000	1.2
@@ -0,0 +1 @@
+ren-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ren/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Oct 2006 13:13:22 -0000	1.1
+++ sources	24 Oct 2006 13:14:02 -0000	1.2
@@ -0,0 +1 @@
+245453453a8bd1c0bf7d03880b97d632  ren-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 13:31:08 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 24 Oct 2006 06:31:08 -0700
Subject: owners owners.list,1.1868,1.1869
Message-ID: <200610241331.k9ODV8lZ024498@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24433/owners

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1868
retrieving revision 1.1869
diff -u -r1.1868 -r1.1869
--- owners.list	23 Oct 2006 22:06:25 -0000	1.1868
+++ owners.list	24 Oct 2006 13:30:38 -0000	1.1869
@@ -1989,6 +1989,7 @@
 Fedora Extras|regexxer|A nifty GUI search/replace tool|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|regionset|Reads/sets the region code of DVD drives|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|rekall|A KDE database front-end application|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ren|Rename multiple files|wolfy at nobugconsulting.ro|extras-qa at fedoraproject.org|
 Fedora Extras|renrot|A program to rename and rotate files according to EXIF tags|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|repoml|Tools and data for working with RepoML files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 24 15:48:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 08:48:54 -0700
Subject: rpms/xdg-utils/devel xdg-utils.spec,1.8,1.9
Message-ID: <200610241548.k9OFmskc031391@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31375

Modified Files:
	xdg-utils.spec 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
- actually *use* mimeopen patch (#210797)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xdg-utils.spec	24 Oct 2006 12:28:39 -0000	1.8
+++ xdg-utils.spec	24 Oct 2006 15:48:23 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,13 +11,16 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+Patch1: xdg-utils-1.0-mimeopen.patch
+
 Requires: desktop-file-utils
 ## kde-config
 #Requires(hint): kdelibs
 ## update-gtk-icon-cache
 #Requires(hint): gtk2
-## generic default
-#Requires(hint): mimeopen
+## mimeopen generic default
+#Requires(hint): %{_bindir}/mimeopen
+#Requires(hint): perl-File-MimeInfo 
 
 
 %description
@@ -45,6 +48,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch1 -p1 -b .mimeopen
+
 
 %build
 %configure
@@ -70,6 +75,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
+- actually *use* mimeopen patch (#210797)
+
 * Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
 - prefer mimeopen as generic default (#210797)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:00:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 09:00:39 -0700
Subject: rpms/xdg-utils/FC-6 xdg-utils.spec,1.8,1.9
Message-ID: <200610241600.k9OG0daR031678@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31651

Modified Files:
	xdg-utils.spec 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
- actually *use* mimeopen patch (#210797)



Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-6/xdg-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xdg-utils.spec	24 Oct 2006 12:29:42 -0000	1.8
+++ xdg-utils.spec	24 Oct 2006 16:00:09 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,13 +11,16 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+Patch1: xdg-utils-1.0-mimeopen.patch
+
 Requires: desktop-file-utils
 ## kde-config
 #Requires(hint): kdelibs
 ## update-gtk-icon-cache
 #Requires(hint): gtk2
-## generic default
-#Requires(hint): mimeopen
+## mimeopen generic default
+#Requires(hint): %{_bindir}/mimeopen
+#Requires(hint): perl-File-MimeInfo 
 
 
 %description
@@ -45,6 +48,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch1 -p1 -b .mimeopen
+
 
 %build
 %configure
@@ -70,6 +75,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
+- actually *use* mimeopen patch (#210797)
+
 * Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
 - prefer mimeopen as generic default (#210797)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:02:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 24 Oct 2006 09:02:16 -0700
Subject: rpms/xdg-utils/FC-5 xdg-utils-1.0-mimeopen.patch, NONE,
	1.1 xdg-utils.spec, 1.7, 1.8
Message-ID: <200610241602.k9OG2G0N002200@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2179

Modified Files:
	xdg-utils.spec 
Added Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
- actually *use* mimeopen patch (#210797)


xdg-utils-1.0-mimeopen.patch:

--- NEW FILE xdg-utils-1.0-mimeopen.patch ---
--- xdg-utils-1.0/scripts/xdg-open.mimeopen	2006-10-17 22:55:02.000000000 +0200
+++ xdg-utils-1.0/scripts/xdg-open	2006-10-17 22:55:15.000000000 +0200
@@ -360,6 +360,15 @@
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        else
+            exit_failure_operation_failed
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdg-utils.spec	10 Oct 2006 12:51:18 -0000	1.7
+++ xdg-utils.spec	24 Oct 2006 16:01:45 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,14 +11,16 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Not really used (yet)
-#BuildRequires: xmlto
+Patch1: xdg-utils-1.0-mimeopen.patch
 
 Requires: desktop-file-utils
 ## kde-config
-#Requires: kdelibs
-# update-gtk-icon-cache
-#Requires: gtk2
+#Requires(hint): kdelibs
+## update-gtk-icon-cache
+#Requires(hint): gtk2
+## mimeopen generic default
+#Requires(hint): %{_bindir}/mimeopen
+#Requires(hint): perl-File-MimeInfo 
 
 
 %description
@@ -46,6 +48,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch1 -p1 -b .mimeopen
+
 
 %build
 %configure
@@ -71,6 +75,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
+- actually *use* mimeopen patch (#210797)
+
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
+- prefer mimeopen as generic default (#210797)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
 - 1.0(final)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:10:41 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Tue, 24 Oct 2006 09:10:41 -0700
Subject: rpms/testdisk/FC-6 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610241610.k9OGAfTn002436@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2392

Modified Files:
	.cvsignore sources 
Log Message:
Update TestDisk & PhotoRec to version 6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 11:01:46 -0000	1.4
+++ .cvsignore	24 Oct 2006 16:10:11 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 11:01:46 -0000	1.4
+++ sources	24 Oct 2006 16:10:11 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 16:18:08 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Tue, 24 Oct 2006 09:18:08 -0700
Subject: rpms/testdisk/FC-6 testdisk.spec,1.7,1.8
Message-ID: <200610241618.k9OGI8sF002520@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2498

Modified Files:
	testdisk.spec 
Log Message:
TestDisk & PhotoRec 6.5



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-6/testdisk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testdisk.spec	28 Aug 2006 18:13:24 -0000	1.7
+++ testdisk.spec	24 Oct 2006 16:17:38 -0000	1.8
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	3%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
 * Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:26:11 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:26:11 -0700
Subject: rpms/hatari - New directory
Message-ID: <200610241626.k9OGQBCa002637@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2633/hatari

Log Message:
Directory /cvs/extras/rpms/hatari added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 16:26:12 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:26:12 -0700
Subject: rpms/hatari/devel - New directory
Message-ID: <200610241626.k9OGQCam002651@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2633/hatari/devel

Log Message:
Directory /cvs/extras/rpms/hatari/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 24 16:26:33 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:26:33 -0700
Subject: rpms/hatari Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610241626.k9OGQXTq002682@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2676

Added Files:
	Makefile import.log 
Log Message:
Setup of module hatari


--- NEW FILE Makefile ---
# Top level Makefile for module hatari
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 24 16:26:39 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:26:39 -0700
Subject: rpms/hatari/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610241626.k9OGQdZO002706@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2676/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hatari


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 24 16:27:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 24 Oct 2006 09:27:19 -0700
Subject: rpms/dnsmasq/devel dnsmasq.spec,1.12,1.13
Message-ID: <200610241627.k9OGRJK0002768@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2703

Modified Files:
	dnsmasq.spec 
Log Message:

* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
- Fixed BZ#212005
- Moved %%postun scriptlet to %%post, where it made more sense
- Render scriptlets safer
- Minor cleanup for consistency



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dnsmasq.spec	19 Oct 2006 18:09:19 -0000	1.12
+++ dnsmasq.spec	24 Oct 2006 16:26:49 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -63,19 +63,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add dnsmasq
+if [ "$1" = "2" ]; then # if we're being upgraded
+    /sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
+else # if we're being installed
+    /sbin/chkconfig --add dnsmasq
+fi
 
 %preun
-if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
-    service dnsmasq stop >/dev/null 2>&1
+if [ "$1" = "0" ]; then     # execute this only if we are NOT doing an upgrade
+    /sbin/service dnsmasq stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dnsmasq
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-    service dnsmasq restart >/dev/null 2>&1
-fi
-
 
 %files
 %defattr(-,root,root,-)
@@ -90,6 +89,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
+- Fixed BZ#212005
+- Moved %%postun scriptlet to %%post, where it made more sense
+- Render scriptlets safer
+- Minor cleanup for consistency
+
 * Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
 - Hardcoded version in patches, as I'm getting tired of updating them
 - Update to 2.34



From fedora-extras-commits at redhat.com  Tue Oct 24 16:28:18 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:28:18 -0700
Subject: rpms/hatari import.log,1.1,1.2
Message-ID: <200610241628.k9OGSIDq002827@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2786

Modified Files:
	import.log 
Log Message:
auto-import hatari-0.90-5 on branch devel from hatari-0.90-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hatari/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Oct 2006 16:26:33 -0000	1.1
+++ import.log	24 Oct 2006 16:27:48 -0000	1.2
@@ -0,0 +1 @@
+hatari-0_90-5:HEAD:hatari-0.90-5.src.rpm:1161707258



From fedora-extras-commits at redhat.com  Tue Oct 24 16:28:19 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:28:19 -0700
Subject: rpms/hatari/devel hatari-0.90-nobinstrip.patch, NONE, 1.1 hatari.png,
	NONE, 1.1 hatari.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200610241628.k9OGSJeJ002831@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/rpms/hatari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2786/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hatari-0.90-nobinstrip.patch hatari.png hatari.spec 
Log Message:
auto-import hatari-0.90-5 on branch devel from hatari-0.90-5.src.rpm

hatari-0.90-nobinstrip.patch:

--- NEW FILE hatari-0.90-nobinstrip.patch ---
Common subdirectories: hatari-0.90.orig/doc and hatari-0.90/doc
Common subdirectories: hatari-0.90.orig/Hatari.xcodeproj and hatari-0.90/Hatari.xcodeproj
diff -u hatari-0.90.orig/Makefile.cnf.in hatari-0.90/Makefile.cnf.in
--- hatari-0.90.orig/Makefile.cnf.in	2006-10-23 12:16:52.000000000 +0200
+++ hatari-0.90/Makefile.cnf.in	2006-10-23 12:17:19.000000000 +0200
@@ -51,5 +51,5 @@
 
 # Program used for "make install"
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
Common subdirectories: hatari-0.90.orig/src and hatari-0.90/src


--- NEW FILE hatari.spec ---
Summary: An Atari ST emulator suitable for playing games
Name: hatari
Version: 0.90
Release: 5%{?dist}
License: GPL
Group: Applications/Emulators
URL: http://hatari.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
Source1: hatari.png
Patch0: hatari-0.90-nobinstrip.patch
BuildRequires: SDL-devel >= 1.2.0, zlib-devel, desktop-file-utils
Requires: hicolor-icon-theme

%description
Hatari is an Atari-ST and STE emulator for Linux. More precisely, it 
is an adaption of the WinSTon source code to Linux, using the UAE CPU
core instead of the original, non-portable assembler CPU core. 

Unlike other ST emulators which concentrate on desktop compatibility,
it is suitable for playing games.

%prep
%setup -q
%patch -p1

%build
%configure --datadir=%{_datadir}/hatari
make

# README.tos
cat >doc/README.tos <<EOF
To run the emulator a TOS ROM image is needed. EmuTOS, a free implementation 
of TOS, is shipped with hatari. 

EmuTOS is a single-user single-tasking operating system for the 32 bit Atari
computers and emulators. It can be used as a replacement for the TOS images
typically needed today for using emulators and it is also running on some
real hardware, like the Atari Mega STE. All the source code is open and
free, licensed under the GNU General Public License (GPL). A copy of the GNU 
GPL can be found in the gpl.txt file.

EmuTOS has its home at sourceforge:
http://sourceforge.net/projects/emutos

Hatari is shipped with tos.img ROM image that is identical to etos256us.img 
from the binary package of version 0.8.1 available at sourceforge:
http://dl.sourceforge.net/sourceforge/emutos/emutos256k-0.8.1.zip
EOF

# Build desktop icon
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=Hatari
Comment=Atari ST emulator
Exec=%{name}
Icon=%{name}.png
Terminal=false
Type=Application
Categories=Application;Emulators;
Version=%{version}
EOF

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 
install -d -m 755 %{buildroot}%{_mandir}/man1
install -m 644 doc/hatari.1 %{buildroot}%{_mandir}/man1

# install desktop file and icon
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora         \
  --dir %{buildroot}%{_datadir}/applications \
  --add-category X-Fedora                    \
  %{name}.desktop
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
cp %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps

%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)
%{_bindir}/hatari
%{_datadir}/hatari
%{_mandir}/man1/hatari.1*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc gpl.txt readme.txt doc/{*.txt,*.html,images}
%doc doc/README.tos

%changelog
* Mon Oct 23 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-5%{?dist}
- added a patch not to strip binaries during make install
- added hicolor-icon-theme to Requires

* Sat Oct 21 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-4%{?dist}
- added README.tos to explain that Hatari is shipped with EmuTOS

* Fri Oct 20 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-3%{?dist}
- new release for FE migration

* Sun Oct 08 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-2%{?dist}
- replaced %%_mandir with %%{_mandir}
- full URL is now specified in the Source tag
- added .desktop file and icons

* Sat Sep 30 2006 Andrea Musuruane <musuruan at gmail.com> 0.90-1%{?dist}
- initial package




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hatari/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Oct 2006 16:26:38 -0000	1.1
+++ .cvsignore	24 Oct 2006 16:27:48 -0000	1.2
@@ -0,0 +1 @@
+hatari-0.90.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hatari/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Oct 2006 16:26:38 -0000	1.1
+++ sources	24 Oct 2006 16:27:48 -0000	1.2
@@ -0,0 +1 @@
+2e5d1e329ebbf6c75ccab8c4f9a78f11  hatari-0.90.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 16:36:52 2006
From: fedora-extras-commits at redhat.com (Andrea Musuruane (musuruan))
Date: Tue, 24 Oct 2006 09:36:52 -0700
Subject: owners owners.list,1.1869,1.1870
Message-ID: <200610241636.k9OGaqRW002992@cvs-int.fedora.redhat.com>

Author: musuruan

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2972

Modified Files:
	owners.list 
Log Message:
Added hatari package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1869
retrieving revision 1.1870
diff -u -r1.1869 -r1.1870
--- owners.list	24 Oct 2006 13:30:38 -0000	1.1869
+++ owners.list	24 Oct 2006 16:36:22 -0000	1.1870
@@ -758,6 +758,7 @@
 Fedora Extras|kasablanca|Graphical FTP client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|katapult|Faster access to applications, bookmarks, and other items|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
+Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kbackup|Back up your data in a simple, user friendly way|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Oct 24 16:37:40 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 24 Oct 2006 09:37:40 -0700
Subject: rpms/dnsmasq/FC-6 dnsmasq.spec,1.12,1.13
Message-ID: <200610241637.k9OGbeKk003042@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3003

Modified Files:
	dnsmasq.spec 
Log Message:

* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2          
- Fixed BZ#212005                                                               
- Moved %%postun scriptlet to %%post, where it made more sense                  
- Render scriptlets safer                                                       
- Minor cleanup for consistency                                                 



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-6/dnsmasq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dnsmasq.spec	19 Oct 2006 18:09:19 -0000	1.12
+++ dnsmasq.spec	24 Oct 2006 16:37:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -63,19 +63,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add dnsmasq
+if [ "$1" = "2" ]; then # if we're being upgraded
+    /sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
+else # if we're being installed
+    /sbin/chkconfig --add dnsmasq
+fi
 
 %preun
-if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
-    service dnsmasq stop >/dev/null 2>&1
+if [ "$1" = "0" ]; then     # execute this only if we are NOT doing an upgrade
+    /sbin/service dnsmasq stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dnsmasq
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-    service dnsmasq restart >/dev/null 2>&1
-fi
-
 
 %files
 %defattr(-,root,root,-)
@@ -90,6 +89,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
+- Fixed BZ#212005
+- Moved %%postun scriptlet to %%post, where it made more sense
+- Render scriptlets safer
+- Minor cleanup for consistency
+
 * Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
 - Hardcoded version in patches, as I'm getting tired of updating them
 - Update to 2.34



From fedora-extras-commits at redhat.com  Tue Oct 24 16:37:53 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 24 Oct 2006 09:37:53 -0700
Subject: rpms/php-pecl-zip/devel .cvsignore, 1.6, 1.7 php-pecl-zip.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200610241637.k9OGbrKa003047@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3022

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	Update to 1.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 15:43:06 -0000	1.6
+++ .cvsignore	24 Oct 2006 16:37:23 -0000	1.7
@@ -1 +1 @@
-zip-1.7.4.tgz
+zip-1.7.5.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/php-pecl-zip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-zip.spec	28 Sep 2006 15:43:06 -0000	1.6
+++ php-pecl-zip.spec	24 Oct 2006 16:37:23 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.4
+Version:      1.7.5
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Tue Oct 24 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Wed Sep 27 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 15:43:06 -0000	1.6
+++ sources	24 Oct 2006 16:37:23 -0000	1.7
@@ -1 +1 @@
-dccdc45aef30e9759deb6f93dd863dfd  zip-1.7.4.tgz
+e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz



From fedora-extras-commits at redhat.com  Tue Oct 24 16:39:39 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 24 Oct 2006 09:39:39 -0700
Subject: rpms/dnsmasq/FC-5 dnsmasq.spec,1.7,1.8
Message-ID: <200610241639.k9OGddXX003153@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3126

Modified Files:
	dnsmasq.spec 
Log Message:

* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2          
- Fixed BZ#212005                                                               
- Moved %%postun scriptlet to %%post, where it made more sense                  
- Render scriptlets safer                                                       
- Minor cleanup for consistency                                                 



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dnsmasq.spec	19 Oct 2006 18:19:48 -0000	1.7
+++ dnsmasq.spec	24 Oct 2006 16:39:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -63,19 +63,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add dnsmasq
+if [ "$1" = "2" ]; then # if we're being upgraded
+    /sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
+else # if we're being installed
+    /sbin/chkconfig --add dnsmasq
+fi
 
 %preun
-if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
-    service dnsmasq stop >/dev/null 2>&1
+if [ "$1" = "0" ]; then     # execute this only if we are NOT doing an upgrade
+    /sbin/service dnsmasq stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dnsmasq
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-    service dnsmasq restart >/dev/null 2>&1
-fi
-
 
 %files
 %defattr(-,root,root,-)
@@ -90,6 +89,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-2
+- Fixed BZ#212005
+- Moved %%postun scriptlet to %%post, where it made more sense
+- Render scriptlets safer
+- Minor cleanup for consistency
+
 * Thu Oct 19 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.34-1
 - Hardcoded version in patches, as I'm getting tired of updating them
 - Update to 2.34



From fedora-extras-commits at redhat.com  Tue Oct 24 16:43:37 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Tue, 24 Oct 2006 09:43:37 -0700
Subject: rpms/testdisk/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 testdisk.spec, 1.5, 1.6
Message-ID: <200610241643.k9OGhbPt003264@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3228/FC-3

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
TestDisk & PhotoRec 6.5 in FC-3 & FC-4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 11:07:01 -0000	1.4
+++ .cvsignore	24 Oct 2006 16:43:07 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 11:07:01 -0000	1.4
+++ sources	24 Oct 2006 16:43:07 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-3/testdisk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testdisk.spec	21 Jun 2006 13:26:18 -0000	1.5
+++ testdisk.spec	24 Oct 2006 16:43:07 -0000	1.6
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	2%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,15 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
+* Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
+- Rebuild for Fedora Extras 6
+
+* Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-2
+- FC3 and FC4 has a release of 2, need to align
+
 * Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Tue Oct 24 16:43:38 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Tue, 24 Oct 2006 09:43:38 -0700
Subject: rpms/testdisk/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 testdisk.spec, 1.5, 1.6
Message-ID: <200610241643.k9OGhcmh003269@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3228/FC-4

Modified Files:
	.cvsignore sources testdisk.spec 
Log Message:
TestDisk & PhotoRec 6.5 in FC-3 & FC-4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2006 13:38:34 -0000	1.4
+++ .cvsignore	24 Oct 2006 16:43:08 -0000	1.5
@@ -1 +1 @@
-testdisk-6.4.tar.bz2
+testdisk-6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2006 13:38:34 -0000	1.4
+++ sources	24 Oct 2006 16:43:08 -0000	1.5
@@ -1 +1 @@
-188c2216c76f2fe4db8eae1ea033188a  testdisk-6.4.tar.bz2
+58cb6ebd95d524775720646a7bb79354  testdisk-6.5.tar.bz2


Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-4/testdisk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testdisk.spec	21 Jun 2006 13:31:26 -0000	1.5
+++ testdisk.spec	24 Oct 2006 16:43:08 -0000	1.6
@@ -3,8 +3,8 @@
 Summary(fr):	Outil pour v?rifier et restorer des partitions
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
-Version:	6.4
-Release:	2%{?dist}
+Version:	6.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -37,7 +37,7 @@
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -57,6 +57,15 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Oct 24 2006 Christophe Grenier <grenier at cgsecurity.org> 6.5-1
+- Update to latest version
+
+* Mon Aug 28 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-3
+- Rebuild for Fedora Extras 6
+
+* Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-2
+- FC3 and FC4 has a release of 2, need to align
+
 * Wed Jun 21 2006 Christophe Grenier <grenier at cgsecurity.org> 6.4-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Tue Oct 24 17:29:41 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 24 Oct 2006 10:29:41 -0700
Subject: rpms/highlight/devel .cvsignore, 1.6, 1.7 highlight.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <200610241729.k9OHTf32006515@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6487

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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Mar 2006 16:31:13 -0000	1.6
+++ .cvsignore	24 Oct 2006 17:29:10 -0000	1.7
@@ -1 +1 @@
-highlight-2.4.5.tar.gz
+highlight-2.4.8.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- highlight.spec	3 Sep 2006 19:29:02 -0000	1.16
+++ highlight.spec	24 Oct 2006 17:29:10 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.7
-Release:	2%{?dist}
+Version:	2.4.8
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
+- New upstream release
+
 * Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-2
 - Rebuilt for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jul 2006 19:00:09 -0000	1.7
+++ sources	24 Oct 2006 17:29:10 -0000	1.8
@@ -1 +1 @@
-43557684e05d6d2a1144bffcf9f30871  highlight-2.4.7.tar.gz
+8ffb1d62ef449ecf5ffef1f6931a3d16  highlight-2.4.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 17:32:32 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 24 Oct 2006 10:32:32 -0700
Subject: rpms/highlight/FC-5 highlight.spec,1.15,1.16 sources,1.7,1.8
Message-ID: <200610241732.k9OHWWav006598@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6579

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


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- highlight.spec	4 Jul 2006 18:58:13 -0000	1.15
+++ highlight.spec	24 Oct 2006 17:32:01 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.7
+Version:	2.4.8
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -49,6 +49,12 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
+- New upstream release
+
+* Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-2
+- Rebuilt for FC-6
+
 * Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jul 2006 18:58:13 -0000	1.7
+++ sources	24 Oct 2006 17:32:01 -0000	1.8
@@ -1 +1 @@
-43557684e05d6d2a1144bffcf9f30871  highlight-2.4.7.tar.gz
+8ffb1d62ef449ecf5ffef1f6931a3d16  highlight-2.4.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 17:35:08 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 24 Oct 2006 10:35:08 -0700
Subject: rpms/highlight/FC-6 highlight.spec,1.16,1.17 sources,1.7,1.8
Message-ID: <200610241735.k9OHZ8Ic006660@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6642

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


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-6/highlight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- highlight.spec	3 Sep 2006 19:29:02 -0000	1.16
+++ highlight.spec	24 Oct 2006 17:34:38 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.7
-Release:	2%{?dist}
+Version:	2.4.8
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
+- New upstream release
+
 * Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-2
 - Rebuilt for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jul 2006 19:00:09 -0000	1.7
+++ sources	24 Oct 2006 17:34:38 -0000	1.8
@@ -1 +1 @@
-43557684e05d6d2a1144bffcf9f30871  highlight-2.4.7.tar.gz
+8ffb1d62ef449ecf5ffef1f6931a3d16  highlight-2.4.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 18:10:51 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:10:51 -0700
Subject: rpms/moodss/devel .cvsignore,1.9,1.10 sources,1.10,1.11
Message-ID: <200610241810.k9OIApWU009836@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9818

Modified Files:
	.cvsignore sources 
Log Message:
upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2006 21:34:56 -0000	1.9
+++ .cvsignore	24 Oct 2006 18:10:21 -0000	1.10
@@ -1,3 +1 @@
-moodss-21.0.tar.bz2
-moodss-21.1.tar.bz2
-moodss-21.2.tar.bz2
+moodss-21.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Apr 2006 21:34:56 -0000	1.10
+++ sources	24 Oct 2006 18:10:21 -0000	1.11
@@ -1,3 +1 @@
-1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
-f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
-8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2
+8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:13:04 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:13:04 -0700
Subject: rpms/moomps/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200610241813.k9OID4Gl009872@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9854

Modified Files:
	.cvsignore sources 
Log Message:
upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 21:37:06 -0000	1.8
+++ .cvsignore	24 Oct 2006 18:12:34 -0000	1.9
@@ -1,3 +1 @@
-moomps-5.4.tar.bz2
-moomps-5.5.tar.bz2
-moomps-5.6.tar.bz2
+moomps-5.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 21:37:06 -0000	1.8
+++ sources	24 Oct 2006 18:12:34 -0000	1.9
@@ -1,3 +1 @@
-37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
-249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
-f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2
+47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:26:07 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:26:07 -0700
Subject: rpms/moodss/FC-5 .cvsignore, 1.9, 1.10 moodss.spec, 1.22,
	1.23 sources, 1.10, 1.11
Message-ID: <200610241826.k9OIQ7M1009991@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9968

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.3 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2006 21:51:17 -0000	1.9
+++ .cvsignore	24 Oct 2006 18:25:36 -0000	1.10
@@ -1,3 +1 @@
-moodss-21.0.tar.bz2
-moodss-21.1.tar.bz2
-moodss-21.2.tar.bz2
+moodss-21.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/moodss.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- moodss.spec	10 Apr 2006 21:51:17 -0000	1.22
+++ moodss.spec	24 Oct 2006 18:25:36 -0000	1.23
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.2
+Version: 21.3
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,12 @@
 
 
 %changelog
+* Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
+- 21.3 upstream release
+
+* Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-2
+- rebuild for Fedora Extras 6
+
 * Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-1
 - 21.2 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Apr 2006 21:51:17 -0000	1.10
+++ sources	24 Oct 2006 18:25:36 -0000	1.11
@@ -1,3 +1 @@
-1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
-f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
-8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2
+8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:27:36 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:27:36 -0700
Subject: rpms/moodss/FC-6 .cvsignore, 1.9, 1.10 moodss.spec, 1.23,
	1.24 sources, 1.10, 1.11
Message-ID: <200610241827.k9OIRaSd010044@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10002

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.3 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Apr 2006 21:34:56 -0000	1.9
+++ .cvsignore	24 Oct 2006 18:27:05 -0000	1.10
@@ -1,3 +1 @@
-moodss-21.0.tar.bz2
-moodss-21.1.tar.bz2
-moodss-21.2.tar.bz2
+moodss-21.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/moodss.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- moodss.spec	8 Sep 2006 21:12:44 -0000	1.23
+++ moodss.spec	24 Oct 2006 18:27:05 -0000	1.24
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.2
-Release: 2%{?dist}
+Version: 21.3
+Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
+- 21.3 upstream release
+
 * Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-2
 - rebuild for Fedora Extras 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Apr 2006 21:34:56 -0000	1.10
+++ sources	24 Oct 2006 18:27:05 -0000	1.11
@@ -1,3 +1 @@
-1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
-f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
-8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2
+8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:30:00 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:30:00 -0700
Subject: rpms/moodss/devel moodss.spec,1.23,1.24
Message-ID: <200610241830.k9OIU022010181@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10156

Modified Files:
	moodss.spec 
Log Message:
21.3 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- moodss.spec	8 Sep 2006 21:12:44 -0000	1.23
+++ moodss.spec	24 Oct 2006 18:29:30 -0000	1.24
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.2
-Release: 2%{?dist}
+Version: 21.3
+Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
+- 21.3 upstream release
+
 * Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-2
 - rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Tue Oct 24 18:51:01 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:51:01 -0700
Subject: rpms/moomps/devel moomps.spec,1.13,1.14
Message-ID: <200610241851.k9OIp1CC010337@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10321

Modified Files:
	moomps.spec 
Log Message:
5.7 upstream release.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- moomps.spec	8 Sep 2006 22:46:34 -0000	1.13
+++ moomps.spec	24 Oct 2006 18:50:31 -0000	1.14
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.6
-Release: 2%{?dist}
+Version: 5.7
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Oct 1 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.7-1
+- 5.7 upstream release
+
 * Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-2
 - rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Tue Oct 24 18:52:27 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:52:27 -0700
Subject: rpms/moomps/FC-5 .cvsignore, 1.8, 1.9 moomps.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200610241852.k9OIqRNx010365@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10343

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.7 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 22:05:25 -0000	1.8
+++ .cvsignore	24 Oct 2006 18:51:57 -0000	1.9
@@ -1,3 +1 @@
-moomps-5.4.tar.bz2
-moomps-5.5.tar.bz2
-moomps-5.6.tar.bz2
+moomps-5.7.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- moomps.spec	10 Apr 2006 22:05:25 -0000	1.12
+++ moomps.spec	24 Oct 2006 18:51:57 -0000	1.13
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.6
+Version: 5.7
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Sat Oct 1 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.7-1
+- 5.7 upstream release
+
+* Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-2
+- rebuild for Fedora Extras 6
+
 * Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-1
 - 5.6 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 22:05:25 -0000	1.8
+++ sources	24 Oct 2006 18:51:57 -0000	1.9
@@ -1,3 +1 @@
-37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
-249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
-f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2
+47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:54:45 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 24 Oct 2006 11:54:45 -0700
Subject: rpms/moomps/FC-6 .cvsignore, 1.8, 1.9 moomps.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200610241854.k9OIsjPI010465@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10439

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.7 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 21:37:06 -0000	1.8
+++ .cvsignore	24 Oct 2006 18:54:15 -0000	1.9
@@ -1,3 +1 @@
-moomps-5.4.tar.bz2
-moomps-5.5.tar.bz2
-moomps-5.6.tar.bz2
+moomps-5.7.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/moomps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- moomps.spec	8 Sep 2006 22:46:34 -0000	1.13
+++ moomps.spec	24 Oct 2006 18:54:15 -0000	1.14
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.6
-Release: 2%{?dist}
+Version: 5.7
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Oct 1 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.7-1
+- 5.7 upstream release
+
 * Fri Sep 8 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-2
 - rebuild for Fedora Extras 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 21:37:06 -0000	1.8
+++ sources	24 Oct 2006 18:54:15 -0000	1.9
@@ -1,3 +1 @@
-37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
-249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
-f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2
+47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 24 18:56:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 24 Oct 2006 11:56:41 -0700
Subject: rpms/tuxpaint/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tuxpaint.spec, 1.12, 1.13
Message-ID: <200610241856.k9OIufYl010532@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10512

Modified Files:
	.cvsignore sources tuxpaint.spec 
Log Message:
Update to 0.9.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jun 2006 17:54:54 -0000	1.5
+++ .cvsignore	24 Oct 2006 18:56:11 -0000	1.6
@@ -1 +1 @@
-tuxpaint-0.9.15b.tar.gz
+tuxpaint-0.9.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jun 2006 17:54:54 -0000	1.5
+++ sources	24 Oct 2006 18:56:11 -0000	1.6
@@ -1 +1 @@
-04995631e0922570a0d5c2216d943941  tuxpaint-0.9.15b.tar.gz
+467ef64c7f81f9f3755ae2ceebe97f48  tuxpaint-0.9.16.tar.gz


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tuxpaint.spec	4 Oct 2006 22:31:35 -0000	1.12
+++ tuxpaint.spec	24 Oct 2006 18:56:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           tuxpaint
-Version:        0.9.15b
-Release:        4%{?dist}
+Version:        0.9.16
+Release:        1%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -71,6 +71,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Oct 24 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-1
+- Update to 0.9.16.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.15b-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 24 19:31:28 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 12:31:28 -0700
Subject: rpms/cobbler/FC-6 .cvsignore, 1.9, 1.10 cobbler.spec, 1.8,
	1.9 sources, 1.10, 1.11
Message-ID: <200610241931.k9OJVSd4013758@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13731

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Oct 2006 18:22:59 -0000	1.9
+++ .cvsignore	24 Oct 2006 19:30:58 -0000	1.10
@@ -6,3 +6,4 @@
 cobbler-0.2.6.tar.gz
 cobbler-0.2.7.tar.gz
 cobbler-0.2.8.tar.gz
+cobbler-0.2.9.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cobbler.spec	18 Oct 2006 18:22:59 -0000	1.8
+++ cobbler.spec	24 Oct 2006 19:30:58 -0000	1.9
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.8
+Version: 0.2.9
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -54,6 +54,9 @@
 
 %changelog
 
+* Tue Oct 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	18 Oct 2006 18:22:59 -0000	1.10
+++ sources	24 Oct 2006 19:30:58 -0000	1.11
@@ -1 +1 @@
-f6f86ccf17ad4bfbd167291cf748eb01  cobbler-0.2.8.tar.gz
+f2e55873a395b71b199d39501f51944e  cobbler-0.2.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 19:38:24 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 12:38:24 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.4, 1.5 cobbler.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200610241938.k9OJcO0S013922@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13897

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Oct 2006 18:20:58 -0000	1.4
+++ .cvsignore	24 Oct 2006 19:37:54 -0000	1.5
@@ -1,3 +1,4 @@
 cobbler-0.1.1.tar.gz
 cobbler-0.2.7.tar.gz
 cobbler-0.2.8.tar.gz
+cobbler-0.2.9.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cobbler.spec	18 Oct 2006 18:20:58 -0000	1.3
+++ cobbler.spec	24 Oct 2006 19:37:54 -0000	1.4
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.8
+Version: 0.2.9
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -54,6 +54,9 @@
 
 %changelog
 
+* Tue Oct 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Oct 2006 18:20:58 -0000	1.4
+++ sources	24 Oct 2006 19:37:54 -0000	1.5
@@ -1 +1 @@
-f6f86ccf17ad4bfbd167291cf748eb01  cobbler-0.2.8.tar.gz
+f2e55873a395b71b199d39501f51944e  cobbler-0.2.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 19:40:29 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 12:40:29 -0700
Subject: rpms/koan/FC-6 .cvsignore, 1.4, 1.5 koan.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200610241940.k9OJeTdM014000@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13973

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream changes (see CHANGELOG)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Oct 2006 19:02:50 -0000	1.4
+++ .cvsignore	24 Oct 2006 19:39:58 -0000	1.5
@@ -1,3 +1,4 @@
 koan-0.1.1.tar.gz
 koan-0.2.1.tar.gz
 koan-0.2.2.tar.gz
+koan-0.2.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/koan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- koan.spec	18 Oct 2006 19:02:50 -0000	1.6
+++ koan.spec	24 Oct 2006 19:39:58 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.2
+Version: 0.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/~mdehaan/cobbler
+Url: http://cobbler.et.redhat.com/
 
 %description
 
@@ -26,14 +26,14 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -47,6 +47,13 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Tue Oct 24 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
+- Upstream changes (see CHANGELOG)
+
+* Wed Oct 18 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-2
+- Use __python instead of python, test RPM dir before deletion
+- Update URLs
+
 * Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
 - Upstream change -- support Python 2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Oct 2006 19:02:50 -0000	1.5
+++ sources	24 Oct 2006 19:39:58 -0000	1.6
@@ -1 +1 @@
-8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz
+34974b122210c2027e27da6524feffae  koan-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 19:42:18 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 12:42:18 -0700
Subject: rpms/koan/FC-5 .cvsignore, 1.3, 1.4 koan.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <200610241942.k9OJgIpR014044@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14018

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream changes (see CHANGELOG)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2006 15:52:53 -0000	1.3
+++ .cvsignore	24 Oct 2006 19:41:48 -0000	1.4
@@ -1,2 +1,3 @@
 koan-0.1.1.tar.gz
 koan-0.2.2.tar.gz
+koan-0.2.3.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/koan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- koan.spec	18 Oct 2006 15:52:53 -0000	1.5
+++ koan.spec	24 Oct 2006 19:41:48 -0000	1.6
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.2
+Version: 0.2.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -13,7 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-Url: http://et.redhat.com/~mdehaan/cobbler
+Url: http://cobbler.et.redhat.com/
 
 %description
 
@@ -26,14 +26,14 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -47,6 +47,13 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Tue Oct 24 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
+- Upstream changes (see CHANGELOG)
+
+* Wed Oct 18 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-2
+- Use __python instead of python, test RPM dir before deletion
+- Update URLs
+
 * Mon Oct 09 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.2-1
 - Upstream change -- support Python 2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Oct 2006 15:52:53 -0000	1.4
+++ sources	24 Oct 2006 19:41:48 -0000	1.5
@@ -1,2 +1,3 @@
 d1b7df4a1fb022d345d79f3b182d769b  koan-0.1.1.tar.gz
 8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz
+34974b122210c2027e27da6524feffae  koan-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 19:48:58 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 24 Oct 2006 12:48:58 -0700
Subject: fedora-security/audit fc5,1.366,1.367 fc6,1.120,1.121
Message-ID: <200610241948.k9OJmwGo014099@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14079

Modified Files:
	fc5 fc6 
Log Message:
Note a new screen issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- fc5	23 Oct 2006 13:35:30 -0000	1.366
+++ fc5	24 Oct 2006 19:48:55 -0000	1.367
@@ -39,6 +39,7 @@
 CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) #205652
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
+CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7) [since FEDORA-2006-976]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- fc6	23 Oct 2006 14:32:31 -0000	1.120
+++ fc6	24 Oct 2006 19:48:55 -0000	1.121
@@ -37,6 +37,7 @@
 CVE-2006-4624 version (mailman, fixed 2.1.9rc1)
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1)
 CVE-2006-4600 version (openldap, fixed 2.3.25)
+CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7)
 CVE-2006-4570 version (thunderbird, fixed 1.5.0.7)



From fedora-extras-commits at redhat.com  Tue Oct 24 20:17:59 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 24 Oct 2006 13:17:59 -0700
Subject: rpms/tuxpaint-stamps/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tuxpaint-stamps.spec, 1.1, 1.2
Message-ID: <200610242017.k9OKHxAR017252@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/tuxpaint-stamps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17218

Modified Files:
	.cvsignore sources tuxpaint-stamps.spec 
Log Message:
Update to 2006.10.21.
Remove a little extra whitespace in the spec.
Just include docs/*.txt.
Use version macro in Source0 URL.
Use "install-all" target.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint-stamps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2006 01:04:32 -0000	1.2
+++ .cvsignore	24 Oct 2006 20:17:29 -0000	1.3
@@ -1 +1 @@
-tuxpaint-stamps-2005.11.25.tar.gz
+tuxpaint-stamps-2006.10.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint-stamps/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2006 01:04:32 -0000	1.2
+++ sources	24 Oct 2006 20:17:29 -0000	1.3
@@ -1 +1 @@
-6edf92504b1b9f9943e3b28011738691  tuxpaint-stamps-2005.11.25.tar.gz
+ea2cc00cf268ad2c59f1f27673e1c0ff  tuxpaint-stamps-2006.10.21.tar.gz


Index: tuxpaint-stamps.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint-stamps/devel/tuxpaint-stamps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxpaint-stamps.spec	14 Sep 2006 01:04:32 -0000	1.1
+++ tuxpaint-stamps.spec	24 Oct 2006 20:17:29 -0000	1.2
@@ -1,14 +1,12 @@
 Name:           tuxpaint-stamps
-Version:        2005.11.25
+Version:        2006.10.21
 Release:        1%{?dist}
 Summary:        Extra stamp files for tuxpaint
-
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.tuxpaint.org/
-Source0:        http://dl.sourceforge.net/tuxpaint/tuxpaint-stamps-2005.11.25.tar.gz
+Source0:        http://dl.sourceforge.net/tuxpaint/tuxpaint-stamps-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  python gettext
 Requires:       tuxpaint
@@ -16,7 +14,6 @@
 %description
 This package is a collection of 'rubber stamps' for Tux Paint's "Stamp" tool.
 
-
 %prep
 %setup -q
 
@@ -32,7 +29,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/tuxpaint/stamps
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make install-all PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 pushd po
 for file in *.po ; do
@@ -44,14 +41,12 @@
 
 %find_lang %{name}
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc docs/CHANGES.txt docs/CONTRIBUTORS.txt docs/COPYING.txt docs/README.txt docs/TODO.txt
+%doc docs/*.txt
 %lang(el) %doc docs/el
 %lang(es) %doc docs/es
 %lang(fr) %doc docs/fr
@@ -59,9 +54,13 @@
 %defattr(0644,root,root,0755)
 %{_datadir}/tuxpaint/stamps/*
 
-
-
 %changelog
+* Tue Oct 24 2006 Steven Pritchard <steve at kspei.com> 2006.10.21-1
+- Update to 2006.10.21.
+- Remove a little extra whitespace in the spec.
+- Just include docs/*.txt.
+- Use version macro in Source0 URL.
+- Use "install-all" target.
+
 * Mon Aug 28 2006 Wart <wart at kobold dot org> 2005.11.25-1
 - Initial Fedora Extras package
-



From fedora-extras-commits at redhat.com  Tue Oct 24 20:26:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 24 Oct 2006 13:26:21 -0700
Subject: rpms/imlib2/devel .cvsignore, 1.5, 1.6 imlib2.spec, 1.22,
	1.23 sources, 1.6, 1.7
Message-ID: <200610242026.k9OKQL8n017349@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17329

Modified Files:
	.cvsignore imlib2.spec sources 
Log Message:
* Tue Oct 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
- New upstream release 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jul 2006 09:07:44 -0000	1.5
+++ .cvsignore	24 Oct 2006 20:25:51 -0000	1.6
@@ -1 +1 @@
-imlib2-1.2.2.tar.gz
+imlib2-1.3.0.tar.gz


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- imlib2.spec	28 Aug 2006 14:11:38 -0000	1.22
+++ imlib2.spec	24 Oct 2006 20:25:51 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
-Version:	1.2.2
-Release:	2%{?dist}
+Version:	1.3.0
+Release:	1%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.enlightenment.org/Libraries/Imlib2/
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
+- New upstream release 1.3.0
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-2
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jul 2006 09:07:44 -0000	1.6
+++ sources	24 Oct 2006 20:25:51 -0000	1.7
@@ -1 +1 @@
-07b2a7745ddd3c7c4480b50cb916174c  imlib2-1.2.2.tar.gz
+00b724fc6d2dcfa3045bb6a554bb2c8a  imlib2-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 20:28:21 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 24 Oct 2006 13:28:21 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py, 1.8, 1.9 Push.py,
	1.6, 1.7 RepoBuild.py, 1.2, 1.3 Utils.py, 1.2, 1.3 MultiLib.py,
	1.8, 1.9
Message-ID: <200610242028.k9OKSLW2017418@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17389

Modified Files:
	Config_Extras.py Push.py RepoBuild.py Utils.py MultiLib.py 
Log Message:
Utils.py:
- make the create_repo* helper functions more flexible
- add reusable *repodirs functions

RepoBuild.py, MultiLib.py:
- use the modified Utils.create_repository()

Push.py, Config_*.py:
- make it possible to divert signed packages and install them into
  a place outside the default repository
- use new Utils.*repodirs() functions




Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Config_Extras.py	23 Oct 2006 23:00:19 -0000	1.8
+++ Config_Extras.py	24 Oct 2006 20:28:19 -0000	1.9
@@ -74,6 +74,9 @@
 # repository symlinks to remove/create since they confuse createrepo
 repobuild_linkdict = {}
 
+diversion_dict = { 'mugshot' : stagesdir+'/fedora-extras'+'/mugshot',
+                   }
+
 # For RepoSupport.py features (TODO: use rpmUtils?)
 targetarchs = { 'i386' : 'i686',
                 'x86_64' : 'x86_64',


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Push.py	23 Oct 2006 11:24:35 -0000	1.6
+++ Push.py	24 Oct 2006 20:28:19 -0000	1.7
@@ -292,11 +292,11 @@
     pass
 
 
-def push(dist,needsignroot,destroot,name,pkgrelroot):
+def push(dist,needsignroot,destroot,name,pkgrelroot,buildreport=True):
     """push the files found within a single package build-results directory"""
     rollback = []
     try:
-        push_with_rollback(rollback,dist,needsignroot,destroot,name,pkgrelroot)
+        push_with_rollback(rollback,dist,needsignroot,destroot,name,pkgrelroot,buildreport)
     except:
         print 'ERROR: Rollback:', rollback
         for f in rollback:
@@ -309,7 +309,7 @@
         raise
 
 
-def push_with_rollback(rollback,dist,needsignroot,destroot,name,pkgrelroot):
+def push_with_rollback(rollback,dist,needsignroot,destroot,name,pkgrelroot,buildreport):
     print '  %s-%s' % (name,os.path.basename(pkgrelroot))
     
     filedict = {}
@@ -401,7 +401,8 @@
     # Mark successfully signed packages as PUSHED.
     mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
     rollback = []
-    rundirfile.write(buildreportinfo)
+    if buildreport:
+        rundirfile.write(buildreportinfo)
     rundirfile.close()
     
 
@@ -413,13 +414,11 @@
     distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
     needsignroot = os.path.join(cfg.stagesdir, distdir)
     destroot = os.path.join(cfg.treedir, dist)
+    if not DEBUG and not os.path.exists(destroot):
+        os.makedirs(destroot)
     changed = False
     
-    repodirs = [os.path.join(destroot, 'SRPMS')]
-    for arch in cfg.archdict[dist]:
-        repodirs.append(os.path.join(destroot, arch))
-        repodirs.append(os.path.join(destroot, arch, 'debug'))
-    for repodir in repodirs:
+    for repodir in Utils.get_std_repodirs(cfg,dist,destroot):
         # We check for changes already here in case the repo has changed
         # due to external activities such as removing files etc, and will
         # recheck it again later if needed when we're done with this sign
@@ -484,8 +483,17 @@
         results = get_build_results(signtmpdir)
         for (name,pkgrelroots) in results:
             for pkgrelroot in pkgrelroots:
+                if name in cfg.diversion_dict:  # install this elsewhere?
+                    buildreport = False
+                    targetroot = os.path.join(cfg.diversion_dict[name],dist)
+                    if os.path.exists(targetroot):
+                        shutil.rmtree(targetroot)
+                    Utils.make_std_repodirs(cfg,dist,targetroot)
+                else:
+                    buildreport = True
+                    targetroot = destroot
                 try:
-                    push(dist,needsignroot,destroot,name,pkgrelroot)
+                    push(dist,needsignroot,targetroot,name,pkgrelroot,buildreport)
                 except PushWarning, e:
                     print e
     except:
@@ -497,7 +505,7 @@
 
     # All done, now check if something changed unless we already know it did:
     if not changed:
-        for repodir in repodirs:
+        for repodir in Utils.get_std_repodirs(cfg,dist,destroot):
             changed = Utils.is_repo_changed(repodir)
             if changed:
                 Utils.debugprint("Dist %s (%s) was changed" % (dist, repodir))


Index: RepoBuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoBuild.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepoBuild.py	29 Sep 2006 23:53:41 -0000	1.2
+++ RepoBuild.py	24 Oct 2006 20:28:19 -0000	1.3
@@ -23,16 +23,18 @@
         print "No distribution release named '%s' found" % dist
         sys.exit(errno.EINVAL)
 
-    Utils.create_src_repo(cfg,dist)  # source rpms
+    reporoot = os.path.join(cfg.treedir, dist)
+    repodir = os.path.join(reporoot,'SRPMS')
+    Utils.create_repository(cfg,repodir,debuginfo=False)  # source rpms
 
     # get rid of symlinks that are in the way (of createrepo)
     for link in cfg.repobuild_linkdict.get(dist) or []:
-        flink = os.path.join(cfg.treedir, dist, link)
+        flink = os.path.join(reporoot, link)
         if os.path.exists(flink):
             os.unlink(flink)
 
     for arch in cfg.archdict[dist]:
-        Utils.create_arch_repo(cfg,dist,arch)  # binary+debuginfo rpms
+        Utils.create_repository(cfg,os.path.join(reporoot,arch))  # binary+debuginfo rpms
 
     # recreate symlinks
     for link in cfg.repobuild_linkdict.get(dist) or []:


Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Utils.py	29 Sep 2006 16:23:13 -0000	1.2
+++ Utils.py	24 Oct 2006 20:28:19 -0000	1.3
@@ -111,8 +111,9 @@
         install_copy(src,dest)
 
 
-def create_repository(cfg,repodir):
-    """create/update repository metadata for a given directory"""
+def create_repository(cfg,repodir,debuginfo=True):
+    """create/update repository metadata for a given directory and
+    consider a 'debug' sub-repository by default"""
 
     print 'Creating repository %s' % repodir
     
@@ -131,26 +132,17 @@
     if os.path.exists( os.path.join(repodir,compsname) ):
         compsarg = '-g %s ' % compsname
     excludearg = ''
-    if os.path.exists( os.path.join(repodir,'debug') ):
+    if debuginfo and os.path.exists( os.path.join(repodir,'debug') ):
         excludearg = "-x \'*debuginfo*\'"
     cmd = '%s -c %s -q %s %s %s' % (cfg.createrepo, cfg.cr_cachedir, compsarg, excludearg, repodir)
     run_and_check(cmd)
-
-
-def create_arch_repo(cfg,dist,arch):
-    """create/update repository metadata for a given dist+arch pair and
-its 'debug' sub-directory, if available"""
-    repodir = os.path.join(cfg.treedir, dist, arch)
-    create_repository(cfg,repodir)
-    # If there's a debug subdir, make that a repo, too.
-    dbg_repodir = os.path.join(repodir, 'debug')
-    if os.path.exists(dbg_repodir):
-        create_repository(cfg,dbg_repodir)
-
-
-def create_src_repo(cfg,dist):
-    """create/update repository metadata for a given dist"""
-    create_repository( cfg, os.path.join(cfg.treedir,dist,'SRPMS') )
+    if debuginfo:
+        # If there's a debug subdir, make that a repo, too.
+        dbg_repodir = os.path.join(repodir, 'debug')
+        if os.path.exists(dbg_repodir):
+            print 'Creating repository %s' % dbg_repodir
+            cmd = '%s -c %s -q %s' % (cfg.createrepo, cfg.cr_cachedir, dbg_repodir)
+            run_and_check(cmd)
 
 
 def is_repo_changed(repodir):
@@ -183,6 +175,24 @@
     return False
 
 
+def get_std_repodirs(cfg,dist,reporoot):
+    """return list of all repository directories (below reporoot) for
+    this distribution version"""
+    repodirs = [os.path.join(reporoot,'SRPMS')]
+    for arch in cfg.archdict[dist]:
+        repodirs.append(os.path.join(reporoot,arch))
+        repodirs.append(os.path.join(reporoot,arch,'debug'))
+    return repodirs
+
+
+def make_std_repodirs(cfg,dist,reporoot):
+    """create all repository directories (below reporoot) for
+    this distribution version, if they don't exist"""
+    for repodir in get_std_repodirs(cfg,dist,reporoot):
+        if not DEBUG and not os.path.exists(repodir):
+            os.makedirs(repodir)
+
+                     
 def fix_mdcache_access(workdir,cachedir):
 # Work around explicit directory mode 0755 in yum/repos.py (that
 # is too restrictive for our extras_signers group) and an utime


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MultiLib.py	19 Oct 2006 22:56:40 -0000	1.8
+++ MultiLib.py	24 Oct 2006 20:28:19 -0000	1.9
@@ -296,7 +296,7 @@
         for arch in cfg.archdict[dist]:  # list of repo archs
             changedagain = resolveMissing(cfg,dist,arch)
             if changedagain:
-                Utils.create_arch_repo(cfg,dist,arch)
+                Utils.create_repository(cfg,os.path.join(cfg.treedir,dist,arch))
 
 
 if __name__ == '__main__':



From fedora-extras-commits at redhat.com  Tue Oct 24 21:55:57 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 14:55:57 -0700
Subject: rpms/cobbler/FC-6 .cvsignore, 1.10, 1.11 cobbler.spec, 1.9,
	1.10 sources, 1.11, 1.12
Message-ID: <200610242155.k9OLtvTH021224@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21189

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + adding some config files as (noreplace)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2006 19:30:58 -0000	1.10
+++ .cvsignore	24 Oct 2006 21:55:27 -0000	1.11
@@ -7,3 +7,4 @@
 cobbler-0.2.7.tar.gz
 cobbler-0.2.8.tar.gz
 cobbler-0.2.9.tar.gz
+cobbler-0.3.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cobbler.spec	24 Oct 2006 19:30:58 -0000	1.9
+++ cobbler.spec	24 Oct 2006 21:55:27 -0000	1.10
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.9
+Version: 0.3.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,8 +39,9 @@
 %defattr(-,root,root)
 %{_bindir}/cobbler
 %dir /etc/cobbler
-/etc/cobbler/*.ks
-/etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.ks
+%config(noreplace) /etc/cobbler/kickstart_fc5.ks
+%config(noreplace) /etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -54,7 +55,12 @@
 
 %changelog
 
-* Tue Oct 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
+* Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.0-1
+- Upstream changes (see CHANGELOG)
+- Marked files in /etc/cobbler as config
+- Marked /etc/cobbler/dhcpd.template as noreplace 
+
+* Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
 - Upstream changes (see CHANGELOG)
 
 * Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2006 19:30:58 -0000	1.11
+++ sources	24 Oct 2006 21:55:27 -0000	1.12
@@ -1 +1 @@
-f2e55873a395b71b199d39501f51944e  cobbler-0.2.9.tar.gz
+e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 21:58:42 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 24 Oct 2006 14:58:42 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.5, 1.6 cobbler.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610242158.k9OLwgw6021295@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG) plus moving some config files to (noreplace)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Oct 2006 19:37:54 -0000	1.5
+++ .cvsignore	24 Oct 2006 21:58:12 -0000	1.6
@@ -2,3 +2,4 @@
 cobbler-0.2.7.tar.gz
 cobbler-0.2.8.tar.gz
 cobbler-0.2.9.tar.gz
+cobbler-0.3.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cobbler.spec	24 Oct 2006 19:37:54 -0000	1.4
+++ cobbler.spec	24 Oct 2006 21:58:12 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.9
+Version: 0.3.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,8 +39,9 @@
 %defattr(-,root,root)
 %{_bindir}/cobbler
 %dir /etc/cobbler
-/etc/cobbler/*.ks
-/etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.ks
+%config(noreplace) /etc/cobbler/kickstart_fc5.ks
+%config(noreplace) /etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -54,7 +55,12 @@
 
 %changelog
 
-* Tue Oct 29 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
+* Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.0-1
+- Upstream changes (see CHANGELOG)
+- Marked files in /etc/cobbler as config
+- Marked /etc/cobbler/dhcpd.template as noreplace 
+
+* Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.9-1
 - Upstream changes (see CHANGELOG)
 
 * Wed Oct 18 2006 Michael DeHaan <mdehaan at redhat.com> - 0.2.8-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Oct 2006 19:37:54 -0000	1.5
+++ sources	24 Oct 2006 21:58:12 -0000	1.6
@@ -1 +1 @@
-f2e55873a395b71b199d39501f51944e  cobbler-0.2.9.tar.gz
+e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 24 22:38:39 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 15:38:39 -0700
Subject: rpms/pygpgme/devel pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242238.k9OMcdY1024524@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24500

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/devel/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:38:09 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Tue Oct 24 22:41:41 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 24 Oct 2006 15:41:41 -0700
Subject: extras-buildsys/utils/pushscript Utils.py,1.3,1.4
Message-ID: <200610242241.k9OMffK6024591@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24572

Modified Files:
	Utils.py 
Log Message:
"help" old createrepo here too


Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Utils.py	24 Oct 2006 20:28:19 -0000	1.3
+++ Utils.py	24 Oct 2006 22:41:38 -0000	1.4
@@ -136,11 +136,16 @@
         excludearg = "-x \'*debuginfo*\'"
     cmd = '%s -c %s -q %s %s %s' % (cfg.createrepo, cfg.cr_cachedir, compsarg, excludearg, repodir)
     run_and_check(cmd)
+    
     if debuginfo:
         # If there's a debug subdir, make that a repo, too.
         dbg_repodir = os.path.join(repodir, 'debug')
         if os.path.exists(dbg_repodir):
             print 'Creating repository %s' % dbg_repodir
+            rpdata = os.path.join(dbg_repodir, 'repodata')  # see above
+            debugprint('removing tree %s' % rpdata)
+            if os.path.exists(rpdata) and not DEBUG:
+                shutil.rmtree(rpdata)
             cmd = '%s -c %s -q %s' % (cfg.createrepo, cfg.cr_cachedir, dbg_repodir)
             run_and_check(cmd)
 



From fedora-extras-commits at redhat.com  Tue Oct 24 22:46:30 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 15:46:30 -0700
Subject: rpms/pygpgme/FC-6 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242246.k9OMkUd9024641@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24622

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-6/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:46:00 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Tue Oct 24 22:51:03 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 15:51:03 -0700
Subject: rpms/pygpgme/FC-5 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242251.k9OMp3nm024721@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24702

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-5/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:50:33 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Tue Oct 24 22:57:31 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 15:57:31 -0700
Subject: rpms/pygpgme/FC-4 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242257.k9OMvVAQ024796@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24777

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-4/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:57:00 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Tue Oct 24 23:00:50 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 24 Oct 2006 16:00:50 -0700
Subject: rpms/pygpgme/FC-3 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec,
	1.1, 1.2
Message-ID: <200610242300.k9ON0oBw024887@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24864

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-3/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 23:00:20 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 



From fedora-extras-commits at redhat.com  Wed Oct 25 00:34:09 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 17:34:09 -0700
Subject: rpms/torque/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 torque.spec, 1.17, 1.18
Message-ID: <200610250034.k9P0Y9Ir031802@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31782

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Oct 2006 22:40:33 -0000	1.10
+++ .cvsignore	25 Oct 2006 00:33:38 -0000	1.11
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2006 22:40:33 -0000	1.10
+++ sources	25 Oct 2006 00:33:38 -0000	1.11
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- torque.spec	21 Oct 2006 22:40:33 -0000	1.17
+++ torque.spec	25 Oct 2006 00:33:38 -0000	1.18
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:03:45 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 18:03:45 -0700
Subject: rpms/torque/FC-6 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 torque.spec, 1.17, 1.18
Message-ID: <200610250103.k9P13jYN002395@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2367

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Oct 2006 22:40:33 -0000	1.10
+++ .cvsignore	25 Oct 2006 01:03:14 -0000	1.11
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2006 22:40:33 -0000	1.10
+++ sources	25 Oct 2006 01:03:14 -0000	1.11
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-6/torque.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- torque.spec	21 Oct 2006 22:40:33 -0000	1.17
+++ torque.spec	25 Oct 2006 01:03:14 -0000	1.18
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:05:45 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 18:05:45 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 torque.spec, 1.14, 1.15
Message-ID: <200610250105.k9P15jkk002463@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2443

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Oct 2006 23:27:30 -0000	1.10
+++ .cvsignore	25 Oct 2006 01:05:14 -0000	1.11
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2006 23:27:30 -0000	1.10
+++ sources	25 Oct 2006 01:05:14 -0000	1.11
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- torque.spec	21 Oct 2006 23:27:30 -0000	1.14
+++ torque.spec	25 Oct 2006 01:05:14 -0000	1.15
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:06:44 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 18:06:44 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 torque.spec, 1.12, 1.13
Message-ID: <200610250106.k9P16i0C002530@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2507

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Oct 2006 23:29:02 -0000	1.10
+++ .cvsignore	25 Oct 2006 01:06:13 -0000	1.11
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2006 23:29:02 -0000	1.10
+++ sources	25 Oct 2006 01:06:13 -0000	1.11
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- torque.spec	21 Oct 2006 23:29:02 -0000	1.12
+++ torque.spec	25 Oct 2006 01:06:13 -0000	1.13
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:07:48 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 24 Oct 2006 18:07:48 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 torque.spec, 1.11, 1.12
Message-ID: <200610250107.k9P17mYY002650@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2630

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Oct 2006 23:29:46 -0000	1.9
+++ .cvsignore	25 Oct 2006 01:07:18 -0000	1.10
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Oct 2006 23:29:46 -0000	1.9
+++ sources	25 Oct 2006 01:07:18 -0000	1.10
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f  torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- torque.spec	21 Oct 2006 23:29:46 -0000	1.11
+++ torque.spec	25 Oct 2006 01:07:18 -0000	1.12
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.5
+%define version 2.1.6
 #%%define snap 200604251602
 %define release 1
 
@@ -403,6 +403,9 @@
 
 
 %changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
 * Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
 - fixes "qsub -o /dev/null" regression
 



From fedora-extras-commits at redhat.com  Wed Oct 25 01:44:45 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 24 Oct 2006 18:44:45 -0700
Subject: rpms/nagios-plugins/FC-4 nagios-plugins.spec, 1.14, 1.15 sources,
	1.4, 1.5
Message-ID: <200610250144.k9P1ijSb002904@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840/FC-4

Modified Files:
	nagios-plugins.spec sources 
Log Message:
upstream released new version
Added software raid check
Added check_apt
removed check_ide_smart



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-4/nagios-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nagios-plugins.spec	29 Sep 2006 17:12:52 -0000	1.14
+++ nagios-plugins.spec	25 Oct 2006 01:44:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.3
-Release: 20%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -55,6 +55,14 @@
 %description all
 This package provides all Nagios plugins.
 
+%package apt
+Summary: Nagios Plugin - check_apt
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description apt
+Provides check_apt support for Nagios.
+
 %package breeze
 Summary: Nagios Plugin - check_breeze
 Group: Applications/System
@@ -174,13 +182,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-%package ide_smart
-Summary: Nagios Plugin - check_ide_smart
-Group: Applications/System
-Requires: nagios-plugins = %{version}-%{release}
+#%package ide_smart
+#Summary: Nagios Plugin - check_ide_smart
+#Group: Applications/System
+#Requires: nagios-plugins = %{version}-%{release}
 
-%description ide_smart
-Provides check_ide_smart support for Nagios.
+#%description ide_smart
+#Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -214,6 +222,14 @@
 %description ldap
 Provides check_ldap and check_ldaps support for Nagios.
 
+%package linux_raid
+Summary: Nagios Plugin - check_linux_raid
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description linux_raid
+Provides check_linux_raid (software raid) support for Nagios.
+
 %package load
 Summary: Nagios Plugin - check_load
 Group: Applications/System
@@ -499,9 +515,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-cd plugins
-make check_ide_smart
-cd ..
+#cd plugins
+#make check_ide_smart
+#cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -509,7 +525,8 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -524,6 +541,10 @@
 
 %files all
 
+%files apt
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_apt
+
 %files breeze
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
@@ -576,12 +597,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-%files ide_smart
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+#%files ide_smart
+#%defattr(-,root,root,-)
+#%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
-%defattr(4750,root,root,-)
+%defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
@@ -601,6 +622,10 @@
 %{_libdir}/nagios/plugins/check_ldap
 %{_libdir}/nagios/plugins/check_ldaps
 
+%files linux_raid
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_linux_raid.pl
+
 %files load
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_load
@@ -717,7 +742,6 @@
 %{_libdir}/nagios/plugins/check_simap
 %{_libdir}/nagios/plugins/check_spop
 %{_libdir}/nagios/plugins/check_ssmtp
-%{_libdir}/nagios/plugins/check_udp2
 
 %files time
 %defattr(-,root,root,-)
@@ -749,11 +773,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Fri Sep 29 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-20
-- check_icmp is now suid root as per #208232
-
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-19
-- Rebuild for FC6
+* Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
+- Upstream new version
+- Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
+- Added check_apt
+- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 15:04:24 -0000	1.4
+++ sources	25 Oct 2006 01:44:15 -0000	1.5
@@ -1 +1 @@
-2c40fc69d51cc979e85150870a1daa93  nagios-plugins-1.4.3.tar.gz
+e27849f268ab04014bfbbd19d9af1333  nagios-plugins-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 01:44:46 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 24 Oct 2006 18:44:46 -0700
Subject: rpms/nagios-plugins/FC-6 nagios-plugins.spec, 1.18, 1.19 sources,
	1.4, 1.5
Message-ID: <200610250144.k9P1ikd0002912@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840/FC-6

Modified Files:
	nagios-plugins.spec sources 
Log Message:
upstream released new version
Added software raid check
Added check_apt
removed check_ide_smart



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-6/nagios-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nagios-plugins.spec	29 Sep 2006 17:12:53 -0000	1.18
+++ nagios-plugins.spec	25 Oct 2006 01:44:16 -0000	1.19
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.3
-Release: 20%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -55,6 +55,14 @@
 %description all
 This package provides all Nagios plugins.
 
+%package apt
+Summary: Nagios Plugin - check_apt
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description apt
+Provides check_apt support for Nagios.
+
 %package breeze
 Summary: Nagios Plugin - check_breeze
 Group: Applications/System
@@ -174,13 +182,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-%package ide_smart
-Summary: Nagios Plugin - check_ide_smart
-Group: Applications/System
-Requires: nagios-plugins = %{version}-%{release}
+#%package ide_smart
+#Summary: Nagios Plugin - check_ide_smart
+#Group: Applications/System
+#Requires: nagios-plugins = %{version}-%{release}
 
-%description ide_smart
-Provides check_ide_smart support for Nagios.
+#%description ide_smart
+#Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -214,6 +222,14 @@
 %description ldap
 Provides check_ldap and check_ldaps support for Nagios.
 
+%package linux_raid
+Summary: Nagios Plugin - check_linux_raid
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description linux_raid
+Provides check_linux_raid (software raid) support for Nagios.
+
 %package load
 Summary: Nagios Plugin - check_load
 Group: Applications/System
@@ -499,9 +515,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-cd plugins
-make check_ide_smart
-cd ..
+#cd plugins
+#make check_ide_smart
+#cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -509,7 +525,8 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -524,6 +541,10 @@
 
 %files all
 
+%files apt
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_apt
+
 %files breeze
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
@@ -576,12 +597,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-%files ide_smart
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+#%files ide_smart
+#%defattr(-,root,root,-)
+#%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
-%defattr(4750,root,root,-)
+%defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
@@ -601,6 +622,10 @@
 %{_libdir}/nagios/plugins/check_ldap
 %{_libdir}/nagios/plugins/check_ldaps
 
+%files linux_raid
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_linux_raid.pl
+
 %files load
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_load
@@ -717,7 +742,6 @@
 %{_libdir}/nagios/plugins/check_simap
 %{_libdir}/nagios/plugins/check_spop
 %{_libdir}/nagios/plugins/check_ssmtp
-%{_libdir}/nagios/plugins/check_udp2
 
 %files time
 %defattr(-,root,root,-)
@@ -749,11 +773,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Fri Sep 29 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-20
-- check_icmp is now suid root as per #208232
-
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-19
-- Rebuild for FC6
+* Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
+- Upstream new version
+- Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
+- Added check_apt
+- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 15:04:30 -0000	1.4
+++ sources	25 Oct 2006 01:44:16 -0000	1.5
@@ -1 +1 @@
-2c40fc69d51cc979e85150870a1daa93  nagios-plugins-1.4.3.tar.gz
+e27849f268ab04014bfbbd19d9af1333  nagios-plugins-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 01:44:46 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 24 Oct 2006 18:44:46 -0700
Subject: rpms/nagios-plugins/FC-5 nagios-plugins.spec, 1.14, 1.15 sources,
	1.4, 1.5
Message-ID: <200610250144.k9P1ikBK002908@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840/FC-5

Modified Files:
	nagios-plugins.spec sources 
Log Message:
upstream released new version
Added software raid check
Added check_apt
removed check_ide_smart



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-5/nagios-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nagios-plugins.spec	29 Sep 2006 17:12:53 -0000	1.14
+++ nagios-plugins.spec	25 Oct 2006 01:44:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.3
-Release: 20%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -55,6 +55,14 @@
 %description all
 This package provides all Nagios plugins.
 
+%package apt
+Summary: Nagios Plugin - check_apt
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description apt
+Provides check_apt support for Nagios.
+
 %package breeze
 Summary: Nagios Plugin - check_breeze
 Group: Applications/System
@@ -174,13 +182,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-%package ide_smart
-Summary: Nagios Plugin - check_ide_smart
-Group: Applications/System
-Requires: nagios-plugins = %{version}-%{release}
+#%package ide_smart
+#Summary: Nagios Plugin - check_ide_smart
+#Group: Applications/System
+#Requires: nagios-plugins = %{version}-%{release}
 
-%description ide_smart
-Provides check_ide_smart support for Nagios.
+#%description ide_smart
+#Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -214,6 +222,14 @@
 %description ldap
 Provides check_ldap and check_ldaps support for Nagios.
 
+%package linux_raid
+Summary: Nagios Plugin - check_linux_raid
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description linux_raid
+Provides check_linux_raid (software raid) support for Nagios.
+
 %package load
 Summary: Nagios Plugin - check_load
 Group: Applications/System
@@ -499,9 +515,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-cd plugins
-make check_ide_smart
-cd ..
+#cd plugins
+#make check_ide_smart
+#cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -509,7 +525,8 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -524,6 +541,10 @@
 
 %files all
 
+%files apt
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_apt
+
 %files breeze
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
@@ -576,12 +597,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-%files ide_smart
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+#%files ide_smart
+#%defattr(-,root,root,-)
+#%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
-%defattr(4750,root,root,-)
+%defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
@@ -601,6 +622,10 @@
 %{_libdir}/nagios/plugins/check_ldap
 %{_libdir}/nagios/plugins/check_ldaps
 
+%files linux_raid
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_linux_raid.pl
+
 %files load
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_load
@@ -717,7 +742,6 @@
 %{_libdir}/nagios/plugins/check_simap
 %{_libdir}/nagios/plugins/check_spop
 %{_libdir}/nagios/plugins/check_ssmtp
-%{_libdir}/nagios/plugins/check_udp2
 
 %files time
 %defattr(-,root,root,-)
@@ -749,11 +773,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Fri Sep 29 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-20
-- check_icmp is now suid root as per #208232
-
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-19
-- Rebuild for FC6
+* Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
+- Upstream new version
+- Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
+- Added check_apt
+- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 15:04:24 -0000	1.4
+++ sources	25 Oct 2006 01:44:15 -0000	1.5
@@ -1 +1 @@
-2c40fc69d51cc979e85150870a1daa93  nagios-plugins-1.4.3.tar.gz
+e27849f268ab04014bfbbd19d9af1333  nagios-plugins-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 01:44:47 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 24 Oct 2006 18:44:47 -0700
Subject: rpms/nagios-plugins/devel .cvsignore, 1.4, 1.5 nagios-plugins.spec, 
	1.18, 1.19 sources, 1.4, 1.5
Message-ID: <200610250144.k9P1ilTl002917@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840/devel

Modified Files:
	.cvsignore nagios-plugins.spec sources 
Log Message:
upstream released new version
Added software raid check
Added check_apt
removed check_ide_smart



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2006 15:04:30 -0000	1.4
+++ .cvsignore	25 Oct 2006 01:44:17 -0000	1.5
@@ -1 +1 @@
-nagios-plugins-1.4.3.tar.gz
+nagios-plugins-1.4.4.tar.gz


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nagios-plugins.spec	29 Sep 2006 17:12:53 -0000	1.18
+++ nagios-plugins.spec	25 Oct 2006 01:44:17 -0000	1.19
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.3
-Release: 20%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -55,6 +55,14 @@
 %description all
 This package provides all Nagios plugins.
 
+%package apt
+Summary: Nagios Plugin - check_apt
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description apt
+Provides check_apt support for Nagios.
+
 %package breeze
 Summary: Nagios Plugin - check_breeze
 Group: Applications/System
@@ -174,13 +182,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-%package ide_smart
-Summary: Nagios Plugin - check_ide_smart
-Group: Applications/System
-Requires: nagios-plugins = %{version}-%{release}
+#%package ide_smart
+#Summary: Nagios Plugin - check_ide_smart
+#Group: Applications/System
+#Requires: nagios-plugins = %{version}-%{release}
 
-%description ide_smart
-Provides check_ide_smart support for Nagios.
+#%description ide_smart
+#Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -214,6 +222,14 @@
 %description ldap
 Provides check_ldap and check_ldaps support for Nagios.
 
+%package linux_raid
+Summary: Nagios Plugin - check_linux_raid
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description linux_raid
+Provides check_linux_raid (software raid) support for Nagios.
+
 %package load
 Summary: Nagios Plugin - check_load
 Group: Applications/System
@@ -499,9 +515,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-cd plugins
-make check_ide_smart
-cd ..
+#cd plugins
+#make check_ide_smart
+#cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -509,7 +525,8 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -524,6 +541,10 @@
 
 %files all
 
+%files apt
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_apt
+
 %files breeze
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
@@ -576,12 +597,12 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-%files ide_smart
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+#%files ide_smart
+#%defattr(-,root,root,-)
+#%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
-%defattr(4750,root,root,-)
+%defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
@@ -601,6 +622,10 @@
 %{_libdir}/nagios/plugins/check_ldap
 %{_libdir}/nagios/plugins/check_ldaps
 
+%files linux_raid
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_linux_raid.pl
+
 %files load
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_load
@@ -717,7 +742,6 @@
 %{_libdir}/nagios/plugins/check_simap
 %{_libdir}/nagios/plugins/check_spop
 %{_libdir}/nagios/plugins/check_ssmtp
-%{_libdir}/nagios/plugins/check_udp2
 
 %files time
 %defattr(-,root,root,-)
@@ -749,11 +773,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Fri Sep 29 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-20
-- check_icmp is now suid root as per #208232
-
-* Thu Sep 07 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-19
-- Rebuild for FC6
+* Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
+- Upstream new version
+- Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
+- Added check_apt
+- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 15:04:30 -0000	1.4
+++ sources	25 Oct 2006 01:44:17 -0000	1.5
@@ -1 +1 @@
-2c40fc69d51cc979e85150870a1daa93  nagios-plugins-1.4.3.tar.gz
+e27849f268ab04014bfbbd19d9af1333  nagios-plugins-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 05:26:20 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 24 Oct 2006 22:26:20 -0700
Subject: rpms/php-pecl-zip/FC-6 .cvsignore, 1.6, 1.7 php-pecl-zip.spec, 1.6, 
	1.7 sources, 1.6, 1.7
Message-ID: <200610250526.k9P5QKI5015911@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15891

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	update to 1.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 15:43:06 -0000	1.6
+++ .cvsignore	25 Oct 2006 05:25:50 -0000	1.7
@@ -1 +1 @@
-zip-1.7.4.tgz
+zip-1.7.5.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/php-pecl-zip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-zip.spec	28 Sep 2006 15:43:06 -0000	1.6
+++ php-pecl-zip.spec	25 Oct 2006 05:25:50 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.4
+Version:      1.7.5
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Tue Oct 24 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Wed Sep 27 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 15:43:06 -0000	1.6
+++ sources	25 Oct 2006 05:25:50 -0000	1.7
@@ -1 +1 @@
-dccdc45aef30e9759deb6f93dd863dfd  zip-1.7.4.tgz
+e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz



From fedora-extras-commits at redhat.com  Wed Oct 25 05:27:59 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 24 Oct 2006 22:27:59 -0700
Subject: rpms/php-pecl-zip/FC-5 .cvsignore, 1.6, 1.7 php-pecl-zip.spec, 1.5, 
	1.6 sources, 1.6, 1.7
Message-ID: <200610250527.k9P5RxF6015981@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15961

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	update to 1.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 15:44:35 -0000	1.6
+++ .cvsignore	25 Oct 2006 05:27:29 -0000	1.7
@@ -1 +1 @@
-zip-1.7.4.tgz
+zip-1.7.5.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/php-pecl-zip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-zip.spec	28 Sep 2006 15:44:35 -0000	1.5
+++ php-pecl-zip.spec	25 Oct 2006 05:27:29 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.4
+Version:      1.7.5
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Tue Oct 24 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Wed Sep 27 2006 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 15:44:35 -0000	1.6
+++ sources	25 Oct 2006 05:27:29 -0000	1.7
@@ -1 +1 @@
-dccdc45aef30e9759deb6f93dd863dfd  zip-1.7.4.tgz
+e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz



From fedora-extras-commits at redhat.com  Wed Oct 25 06:34:18 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 24 Oct 2006 23:34:18 -0700
Subject: rpms/libopts import.log,1.8,1.9
Message-ID: <200610250634.k9P6YIUx019249@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217

Modified Files:
	import.log 
Log Message:
auto-import libopts-27.4-1 on branch FC-6 from libopts-27.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopts/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	23 Oct 2006 21:15:32 -0000	1.8
+++ import.log	25 Oct 2006 06:33:47 -0000	1.9
@@ -5,3 +5,4 @@
 libopts-27_1-6:FC-5:libopts-27.1-6.src.rpm:1157318521
 libopts-27_4-1:HEAD:libopts-27.4-1.src.rpm:1161637988
 libopts-27_4-1:FC-5:libopts-27.4-1.src.rpm:1161638119
+libopts-27_4-1:FC-6:libopts-27.4-1.src.rpm:1161758017



From fedora-extras-commits at redhat.com  Wed Oct 25 06:34:19 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 24 Oct 2006 23:34:19 -0700
Subject: rpms/libopts/FC-6 .cvsignore, 1.2, 1.3 libopts.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200610250634.k9P6YJUC019252@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217/FC-6

Modified Files:
	.cvsignore libopts.spec sources 
Log Message:
auto-import libopts-27.4-1 on branch FC-6 from libopts-27.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2006 12:33:35 -0000	1.2
+++ .cvsignore	25 Oct 2006 06:33:49 -0000	1.3
@@ -1 +1 @@
-libopts-27.1.tar.gz
+libopts-27.4.tar.bz2


Index: libopts.spec
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-6/libopts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopts.spec	16 Sep 2006 20:29:39 -0000	1.5
+++ libopts.spec	25 Oct 2006 06:33:49 -0000	1.6
@@ -1,10 +1,10 @@
 Summary: Options library for autogen
 Name: libopts
-Version: 27.1
-Release: 7%{?dist}
+Version: 27.4
+Release: 1%{?dist}
 License: LGPL or BSD
 Group: Development/Libraries
-Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz
+Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.bz2
 URL: http://autogen.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,8 +64,8 @@
 %{_includedir}/autoopts
 
 %changelog
-* Sat Sep 16 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-7
-- rebuild
+* Mon Oct 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.4-1
+- bump to new version
 
 * Wed Apr 5 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 27.1-6
 - changed __infodir to _infodir 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopts/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2006 12:33:35 -0000	1.2
+++ sources	25 Oct 2006 06:33:49 -0000	1.3
@@ -1 +1 @@
-50a546ee14d866819afd502e809c8095  libopts-27.1.tar.gz
+d3199c049a38c26d71c164e0d6ee4d43  libopts-27.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 06:36:55 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 24 Oct 2006 23:36:55 -0700
Subject: rpms/autogen/FC-6 autogen.spec,1.3,1.4
Message-ID: <200610250636.k9P6atjk019350@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19333

Modified Files:
	autogen.spec 
Log Message:

Rebuild 
 	autogen.spec 



Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-6/autogen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.spec	21 Oct 2006 11:14:28 -0000	1.3
+++ autogen.spec	25 Oct 2006 06:36:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Wed Oct 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-2
+- rebuild
+
 * Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
 - bump to new version
 



From fedora-extras-commits at redhat.com  Wed Oct 25 06:41:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 24 Oct 2006 23:41:54 -0700
Subject: rpms/koffice/devel koffice.spec,1.43,1.44
Message-ID: <200610250641.k9P6fs5G019428@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19412

Modified Files:
	koffice.spec 
Log Message:
- bump



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- koffice.spec	20 Oct 2006 13:43:42 -0000	1.43
+++ koffice.spec	25 Oct 2006 06:41:24 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -805,8 +805,12 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- bump
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.6.0
+1.6.0-1
 - version upgrade
 
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>



From fedora-extras-commits at redhat.com  Wed Oct 25 07:17:57 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 25 Oct 2006 00:17:57 -0700
Subject: rpms/eggdrop/devel eggdrop.spec,1.4,1.5
Message-ID: <200610250717.k9P7Hvad022604@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22588

Modified Files:
	eggdrop.spec 
Log Message:
Rebuild



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/devel/eggdrop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eggdrop.spec	16 Oct 2006 19:14:26 -0000	1.4
+++ eggdrop.spec	25 Oct 2006 07:17:27 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Oct 25 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-4
+- Rebuild
+
 * Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct 25 07:18:58 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 25 Oct 2006 00:18:58 -0700
Subject: rpms/eggdrop/FC-6 eggdrop.spec,1.4,1.5
Message-ID: <200610250718.k9P7IwEK022631@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22615

Modified Files:
	eggdrop.spec 
Log Message:
Rebuild



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-6/eggdrop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eggdrop.spec	16 Oct 2006 19:14:26 -0000	1.4
+++ eggdrop.spec	25 Oct 2006 07:18:27 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Oct 25 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-4
+- Rebuild
+
 * Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct 25 07:19:56 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 25 Oct 2006 00:19:56 -0700
Subject: rpms/eggdrop/FC-5 eggdrop.spec,1.4,1.5
Message-ID: <200610250719.k9P7Ju4X022659@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22643

Modified Files:
	eggdrop.spec 
Log Message:
Rebuild



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-5/eggdrop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eggdrop.spec	16 Oct 2006 19:15:33 -0000	1.4
+++ eggdrop.spec	25 Oct 2006 07:19:25 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Oct 25 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-4
+- Rebuild
+
 * Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct 25 07:20:53 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 25 Oct 2006 00:20:53 -0700
Subject: rpms/eggdrop/FC-4 eggdrop.spec,1.4,1.5
Message-ID: <200610250720.k9P7Krni022690@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22670

Modified Files:
	eggdrop.spec 
Log Message:
Rebuild



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/FC-4/eggdrop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eggdrop.spec	16 Oct 2006 19:16:29 -0000	1.4
+++ eggdrop.spec	25 Oct 2006 07:20:22 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
@@ -62,6 +62,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Oct 25 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-4
+- Rebuild
+
 * Mon Oct 16 2006 Robert Scheck <robert at fedoraproject.org> 1.6.18-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Oct 25 07:38:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 00:38:18 -0700
Subject: upgradecheck upgradecheck-core+extras.conf, 1.3,
	1.4 upgradecheck-extras.conf, 1.2, 1.3 upgradecheck.py, 1.26, 1.27
Message-ID: <200610250738.k9P7cIMF022991@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22969

Modified Files:
	upgradecheck-core+extras.conf upgradecheck-extras.conf 
	upgradecheck.py 
Log Message:
Update for FC6.


Index: upgradecheck-core+extras.conf
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck-core+extras.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upgradecheck-core+extras.conf	2 Sep 2006 11:54:42 -0000	1.3
+++ upgradecheck-core+extras.conf	25 Oct 2006 07:38:15 -0000	1.4
@@ -17,6 +17,10 @@
 
 [FC6]
 name=FC6
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/source/SRPMS/
+
+[FC7]
+name=FC7
 baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/
 
 [FL3-updates]
@@ -31,6 +35,10 @@
 name=FC5-updates
 baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/SRPMS/
 
+[FC6-updates]
+name=FC6-updates
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/SRPMS/
+
 [FE3]
 name=FE3
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/3/SRPMS/
@@ -48,5 +56,10 @@
 
 [FE6]
 name=FE6
+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/6/SRPMS/
+baseurl=file:///srv/rpmbuild/extras/tree/extras/6/SRPMS/
+
+[FE7]
+name=FE7
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/SRPMS/
 baseurl=file:///srv/rpmbuild/extras/tree/extras/development/SRPMS/


Index: upgradecheck-extras.conf
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck-extras.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upgradecheck-extras.conf	2 Sep 2006 11:54:42 -0000	1.2
+++ upgradecheck-extras.conf	25 Oct 2006 07:38:15 -0000	1.3
@@ -20,5 +20,10 @@
 
 [6]
 name=6
+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/6/SRPMS/
+baseurl=file:///srv/rpmbuild/extras/tree/extras/6/SRPMS/
+
+[7]
+name=7
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/SRPMS/
 baseurl=file:///srv/rpmbuild/extras/tree/extras/development/SRPMS/


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- upgradecheck.py	23 Sep 2006 11:15:57 -0000	1.26
+++ upgradecheck.py	25 Oct 2006 07:38:15 -0000	1.27
@@ -40,7 +40,7 @@
 # and all repos containing that number in their id's will be associated with
 # the corresponding distro version.  For example, repo id "foo9bar" will be
 # associated with distro "9".
-dists = ('3', '4', '5', '6')
+dists = ('3', '4', '5', '6', '7')
 
 # Architectures to operate on.
 archs = rpmUtils.arch.getArchList('src')
@@ -52,6 +52,7 @@
     'koffice': (('FL3-updates', 'FE4'),
                 ('FL3-updates', 'FE5'),
                 ('FL3-updates', 'FE6'),
+                ('FL3-updates', 'FE7'),
                 ),
     }
 



From fedora-extras-commits at redhat.com  Wed Oct 25 08:20:51 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Oct 2006 01:20:51 -0700
Subject: rpms/yumex/FC-6 .cvsignore, 1.25, 1.26 sources, 1.33,
	1.34 yumex.spec, 1.39, 1.40
Message-ID: <200610250820.k9P8KpSu026295@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26275

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 1.1.6-0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	22 Oct 2006 12:38:08 -0000	1.25
+++ .cvsignore	25 Oct 2006 08:20:21 -0000	1.26
@@ -1 +1 @@
-yumex-1.1.5.tar.gz
+yumex-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	22 Oct 2006 12:38:08 -0000	1.33
+++ sources	25 Oct 2006 08:20:21 -0000	1.34
@@ -1 +1 @@
-028fd37ed2dc0f473d244465a2150fbd  yumex-1.1.5.tar.gz
+7691f5b61017917fdbef102da170ba2f  yumex-1.1.6.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/yumex.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- yumex.spec	23 Oct 2006 06:39:36 -0000	1.39
+++ yumex.spec	25 Oct 2006 08:20:21 -0000	1.40
@@ -1,6 +1,6 @@
 Name:     yumex
-Version:  1.1.5
-Release:  2.0%{?dist}
+Version:  1.1.6
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.6-1.0
+- Development Release 1.1.6-1.0
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0
 - bumped release for new build
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-1.0



From fedora-extras-commits at redhat.com  Wed Oct 25 08:25:45 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Oct 2006 01:25:45 -0700
Subject: rpms/yumex/devel sources,1.33,1.34 yumex.spec,1.39,1.40
Message-ID: <200610250825.k9P8PjWo026369@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26351

Modified Files:
	sources yumex.spec 
Log Message:
Release 1.1.6-0.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	22 Oct 2006 12:38:08 -0000	1.33
+++ sources	25 Oct 2006 08:25:15 -0000	1.34
@@ -1 +1 @@
-028fd37ed2dc0f473d244465a2150fbd  yumex-1.1.5.tar.gz
+7691f5b61017917fdbef102da170ba2f  yumex-1.1.6.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- yumex.spec	23 Oct 2006 06:39:36 -0000	1.39
+++ yumex.spec	25 Oct 2006 08:25:15 -0000	1.40
@@ -1,6 +1,6 @@
 Name:     yumex
-Version:  1.1.5
-Release:  2.0%{?dist}
+Version:  1.1.6
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.6-1.0
+- Development Release 1.1.6-1.0
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0
 - bumped release for new build
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-1.0



From fedora-extras-commits at redhat.com  Wed Oct 25 09:22:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:22:00 -0700
Subject: rpms/vdradmin-am - New directory
Message-ID: <200610250922.k9P9M01k029841@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836/vdradmin-am

Log Message:
Directory /cvs/extras/rpms/vdradmin-am added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 09:22:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:22:05 -0700
Subject: rpms/vdradmin-am/devel - New directory
Message-ID: <200610250922.k9P9M5XO029862@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29836/vdradmin-am/devel

Log Message:
Directory /cvs/extras/rpms/vdradmin-am/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 09:22:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:22:25 -0700
Subject: rpms/vdradmin-am Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610250922.k9P9MPce029898@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29892

Added Files:
	Makefile import.log 
Log Message:
Setup of module vdradmin-am


--- NEW FILE Makefile ---
# Top level Makefile for module vdradmin-am
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 25 09:22:31 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:22:31 -0700
Subject: rpms/vdradmin-am/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610250922.k9P9MV1C029917@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29892/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdradmin-am


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 25 09:24:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:24:06 -0700
Subject: rpms/vdradmin-am import.log,1.1,1.2
Message-ID: <200610250924.k9P9O6Ol030029@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29977

Modified Files:
	import.log 
Log Message:
auto-import vdradmin-am-3.4.7-2 on branch devel from vdradmin-am-3.4.7-2.src.rpm
Initial import (#211043).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Oct 2006 09:22:25 -0000	1.1
+++ import.log	25 Oct 2006 09:23:36 -0000	1.2
@@ -0,0 +1 @@
+vdradmin-am-3_4_7-2:HEAD:vdradmin-am-3.4.7-2.src.rpm:1161768207



From fedora-extras-commits at redhat.com  Wed Oct 25 09:24:07 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:24:07 -0700
Subject: rpms/vdradmin-am/devel vdradmin-am-3.4.5a-proctitle.patch, NONE,
	1.1 vdradmin-am-3.4.7-config.patch, NONE,
	1.1 vdradmin-am-httpd.conf, NONE, 1.1 vdradmin-am.init, NONE,
	1.1 vdradmin-am.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610250924.k9P9O7BA030033@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29977/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vdradmin-am-3.4.5a-proctitle.patch 
	vdradmin-am-3.4.7-config.patch vdradmin-am-httpd.conf 
	vdradmin-am.init vdradmin-am.spec 
Log Message:
auto-import vdradmin-am-3.4.7-2 on branch devel from vdradmin-am-3.4.7-2.src.rpm
Initial import (#211043).

vdradmin-am-3.4.5a-proctitle.patch:

--- NEW FILE vdradmin-am-3.4.5a-proctitle.patch ---
--- vdradmind.pl~	2006-05-09 16:09:37.000000000 +0300
+++ vdradmind.pl	2006-05-18 18:31:38.000000000 +0300
@@ -35,6 +35,7 @@
     $0 =~ /(^.*\/)/;
     $EXENAME  = $0;
     $BASENAME = $1;
+    $0 = "vdradmind";
     unshift(@INC, "/usr/share/vdradmin/lib");
     unshift(@INC, $BASENAME . "lib/");
 }

vdradmin-am-3.4.7-config.patch:

--- NEW FILE vdradmin-am-3.4.7-config.patch ---
--- vdradmind.pl~	2006-09-29 12:02:29.000000000 +0300
+++ vdradmind.pl	2006-09-29 19:27:55.000000000 +0300
@@ -89,7 +89,7 @@
 
 #use warnings;
 
-my $SEARCH_FILES_IN_SYSTEM    = 0;
+my $SEARCH_FILES_IN_SYSTEM    = 1;
 my $VDR_MAX_SVDRP_LENGTH      = 10000;                        # validate this value
 my $SUPPORTED_LOCALE_PREFIXES = "^(cs|de|en|es|fi|fr|nl|ru)_";
 
@@ -112,7 +112,7 @@
 my %CONFIG;
 $CONFIG{LOGLEVEL}             = 81;                # 32799
 $CONFIG{LOGGING}              = 0;
-$CONFIG{LOGFILE}              = "vdradmind.log";
+$CONFIG{LOGFILE}              = "vdradmin/vdradmind.log";
 $CONFIG{MOD_GZIP}             = 0;
 $CONFIG{CACHE_TIMEOUT}        = 60;
 $CONFIG{CACHE_LASTUPDATE}     = 0;
@@ -128,7 +128,7 @@
 $CONFIG{LOCAL_NET}  = "0.0.0.0/32";
 $CONFIG{VIDEODIR}   = "/video";
 $CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}";
-$CONFIG{EPGIMAGES}  = "$CONFIG{VIDEODIR}/epgimages";
+$CONFIG{EPGIMAGES}  = "/var/lib/vdradmin/epgimages";
 $CONFIG{VDRVFAT}    = 1;
 
 #
@@ -189,9 +189,9 @@
 
 #
 $CONFIG{AT_SENDMAIL}    = 0;                       # set to 1 and set all the "MAIL_" things if you want email notification on new autotimers.
-$CONFIG{MAIL_FROM}      = "from\@address.tld";
+chomp($CONFIG{MAIL_FROM} = 'vdradmin@' . (`hostname -f 2>/dev/null` || "localhost.localdomain"));
 $CONFIG{MAIL_TO}        = "your\@email.address";
-$CONFIG{MAIL_SERVER}    = "your.email.server";
+$CONFIG{MAIL_SERVER}    = "localhost";
 $CONFIG{MAIL_AUTH_USER} = "";
 $CONFIG{MAIL_AUTH_PASS} = "";
 
@@ -247,10 +247,10 @@
     $USER_CSS      = "${BASENAME}user.css";
     bindtextdomain("vdradmin", "${BASENAME}locale");
 } else {
-    $ETCDIR        = "/etc/vdradmin";
+    $ETCDIR        = "/var/lib/vdradmin";
     $TEMPLATEDIR   = "/usr/share/vdradmin/template";
     $LOGFILE       = "/var/log/$CONFIG{LOGFILE}";
-    $PIDFILE       = "/var/run/vdradmind.pid";
+    $PIDFILE       = "/var/run/vdradmin/vdradmind.pid";
     $CONFFILE      = "${ETCDIR}/vdradmind.conf";
     $AT_FILENAME   = "${ETCDIR}/vdradmind.at";
     $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
@@ -284,7 +284,7 @@
     EVAL_PERL    => 1,               # evaluate Perl code blocks
     CACHE_SIZE   => 10000,           # Tuning for Templates
     COMPILE_EXT  => 'cache',         # Tuning for Templates
-    COMPILE_DIR  => '/tmp',          # Tuning for Templates
+    COMPILE_DIR  => '/var/cache/vdradmin', # Tuning for Templates
     VARIABLES    => $Xtemplate_vars,
 
     #DEBUG        => DEBUG_ALL,


--- NEW FILE vdradmin-am-httpd.conf ---
#                                                                -*- apache -*-
# vdradmin - WWW interface for the Video Disk Recorder (VDR)
#
# This is an optional config file for proxying vdradmin with Apache.
# Copy to /etc/httpd/conf.d to do that.
#
# Note: with SELinux in enforcing mode, the httpd_can_network_connect
# SELinux boolean must be on, otherwise httpd won't be able to connect to
# the proxied port below.  See the setsebool(8) manual page or use the
# "Allow HTTPD to connect to the network" option in the
# system-config-securitylevel UI.
#

<IfModule mod_proxy.c>
  ProxyPass /vdradmin/ http://127.0.0.1:8001/
  ProxyPassReverse /vdradmin/ http://127.0.0.1:8001/
  <Location /vdradmin/>
    AddDefaultCharset Off
  </Location>
</IfModule>


--- NEW FILE vdradmin-am.init ---
#!/bin/sh
#
# vdradmind    WWW interface daemon for VDR
#
# chkconfig:   - 92 08
# description: WWW interface daemon for VDR.
# processname: vdradmind
# config:      /etc/vdr/vdradmind.conf
# pidfile:     /var/run/vdr/vdradmind.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0

exec="/usr/sbin/vdradmind"
prog=$(basename $exec)

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting $prog: "
    daemon --user vdradmin "$exec >/dev/null 2>&1"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        restart
        ;;
    reload)
        exit 3 # LSB: not implemented
        ;;
    status)
        status $prog
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
        exit 2
esac


--- NEW FILE vdradmin-am.spec ---
%define cachedir  %(vdr-config --cachedir  2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define videodir  %(vdr-config --videodir  2>/dev/null || echo ERROR)

Name:           vdradmin-am
Version:        3.4.7
Release:        2%{?dist}
Summary:        Web interface for VDR

Group:          Applications/Internet
License:        GPL
URL:            http://andreas.vdr-developer.org/en/
Source0:        http://andreas.vdr-developer.org/download/%{name}-%{version}.tar.bz2
Source1:        %{name}.init
Source2:        %{name}-httpd.conf
Patch0:         %{name}-3.4.5a-proctitle.patch
Patch1:         %{name}-3.4.7-config.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  vdr-devel >= 1.3.27-0.4
BuildRequires:  gettext
BuildRequires:  perl(Locale::gettext)
Requires:       perl(Locale::gettext)
Requires(pre):  %{_sbindir}/groupadd
Requires(pre):  %{_sbindir}/useradd

%description
VDRAdmin-AM is a web interface for managing VDR.


%prep
%setup -q
%patch0
%patch1
%{__perl} -pi -e \
  's|"/video"|"%{videodir}"| ;
   s|^(\$CONFIG\{VDRCONFDIR\}\s*=\s*")[^"]*(.*)|$1%{configdir}$2| ;
   s|\$CONFIG\{VIDEODIR\}/epg\.data|%{cachedir}/epg.data|' \
  vdradmind.pl
%{__perl} -pi -e \
  's/vdradmind\.pl/vdradmind/g ; s/(TH vdradmin )1/${1}8/' vdradmind.pl.1
for f in CREDITS HISTORY ; do
  iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
install -pm 644 %{SOURCE2} .


%build
%{__perl} -pe \
  's|^\s*\$CONFFILE\s*=.*|\$CONFFILE = "vdradmind.conf";| ;
   s|^.*COMPILE_DIR.*$|| ;
   s|/usr/share/vdradmin/template|./template|' \
  vdradmind.pl > vdradmind.tmp
%{__perl} ./vdradmind.tmp --config < /dev/null
./make.sh po


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 vdradmind.pl $RPM_BUILD_ROOT%{_sbindir}/vdradmind
install -Dpm 644 vdradmind.pl.1 $RPM_BUILD_ROOT%{_mandir}/man8/vdradmind.8
install -dm 755 $RPM_BUILD_ROOT/usr/share/vdradmin/epgimages
cp -pR template $RPM_BUILD_ROOT/usr/share/vdradmin
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
install -Dpm 640 vdradmind.conf $RPM_BUILD_ROOT/var/lib/vdradmin/vdradmind.conf
install -dm 755 $RPM_BUILD_ROOT/var/{cache,log,run}/vdradmin
install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/vdradmind
chmod 755 $RPM_BUILD_ROOT%{_initrddir}/vdradmind
%find_lang vdradmin


%clean
rm -rf $RPM_BUILD_ROOT


%pre
%{_sbindir}/groupadd -r vdradmin 2>/dev/null || :
%{_sbindir}/useradd -c "VDR web interface" -d /var/lib/vdradmin \
  -g vdradmin -M -n -r -s /sbin/nologin vdradmin 2>/dev/null || :

%post
/sbin/chkconfig --add vdradmind

%preun
if [ $1 -eq 0 ] ; then
    %{_initrddir}/vdradmind stop >/dev/null || :
    /sbin/chkconfig --del vdradmind
fi

%postun
if [ $1 -gt 0 ] ; then
    rm -rf /var/cache/vdradmin/*
    %{_initrddir}/vdradmind try-restart >/dev/null || :
fi


%files -f vdradmin.lang
%defattr(-,root,root,-)
%doc COPYING CREDITS FAQ HISTORY INSTALL README* contrib/*example convert.pl
%doc %{name}-httpd.conf
%{_initrddir}/vdradmind
%{_sbindir}/vdradmind
/usr/share/vdradmin/
%{_mandir}/man8/vdradmind.8*
%defattr(-,vdradmin,vdradmin,-)
%dir /var/cache/vdradmin/
%dir /var/lib/vdradmin/
%config(noreplace) /var/lib/vdradmin/vdradmind.conf
/var/log/vdradmin/
%dir /var/run/vdradmin/


%changelog
* Tue Oct 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-2
- Move compiled templates to /var/cache/vdradmin, clean them up on upgrades.
- Drop no longer needed Obsoletes and Provides.
- Prune pre-3.4.4 changelog entries.

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-1
- 3.4.7.
- Install optional Apache proxy snippet as doc, not in-place.

* Tue Sep 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.6-3
- Redirect stdin and stdout to /dev/null in the init script.

* Sun Jul 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.6-2
- Improve default config, enable VFAT compatiblity by default.

* Fri Jul 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.6-1
- 3.4.6.
- Clean up no longer relevant upgrade compat from %%post.

* Thu May 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.5a-1
- 3.4.5a.

* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.4-1
- 3.4.4.

* Thu Mar 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.4-0.1.rc
- 3.4.4rc.

* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.4-0.1.beta2
- 3.4.4beta2.

* Wed Mar  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.4-0.1.beta
- 3.4.4beta.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Oct 2006 09:22:31 -0000	1.1
+++ .cvsignore	25 Oct 2006 09:23:37 -0000	1.2
@@ -0,0 +1 @@
+vdradmin-am-3.4.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Oct 2006 09:22:31 -0000	1.1
+++ sources	25 Oct 2006 09:23:37 -0000	1.2
@@ -0,0 +1 @@
+b3f862dfa078bdef05b52a841850c65a  vdradmin-am-3.4.7.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 09:26:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:26:24 -0700
Subject: rpms/vdradmin-am/devel vdradmin-am.spec,1.1,1.2
Message-ID: <200610250926.k9P9QOBw030098@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30077

Modified Files:
	vdradmin-am.spec 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-3
- Improve description (#211043).



Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdradmin-am.spec	25 Oct 2006 09:23:37 -0000	1.1
+++ vdradmin-am.spec	25 Oct 2006 09:25:54 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           vdradmin-am
 Version:        3.4.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Web interface for VDR
 
 Group:          Applications/Internet
@@ -26,7 +26,8 @@
 Requires(pre):  %{_sbindir}/useradd
 
 %description
-VDRAdmin-AM is a web interface for managing VDR.
+VDRAdmin-AM is a web interface for managing VDR.  You will need access
+to a local or remote VDR install to use this package.
 
 
 %prep
@@ -113,6 +114,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-3
+- Improve description (#211043).
+
 * Tue Oct 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.4.7-2
 - Move compiled templates to /var/cache/vdradmin, clean them up on upgrades.
 - Drop no longer needed Obsoletes and Provides.



From fedora-extras-commits at redhat.com  Wed Oct 25 09:36:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 02:36:25 -0700
Subject: owners owners.list,1.1870,1.1871
Message-ID: <200610250936.k9P9aP9J030231@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30214

Modified Files:
	owners.list 
Log Message:
+vdradmin-am (#211043)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1870
retrieving revision 1.1871
diff -u -r1.1870 -r1.1871
--- owners.list	24 Oct 2006 16:36:22 -0000	1.1870
+++ owners.list	25 Oct 2006 09:35:54 -0000	1.1871
@@ -2283,6 +2283,7 @@
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 25 09:45:33 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 25 Oct 2006 02:45:33 -0700
Subject: fedora-security/audit fc5,1.367,1.368 fc6,1.121,1.122
Message-ID: <200610250945.k9P9jXHg030308@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30288

Modified Files:
	fc5 fc6 
Log Message:
Updates from cve mails and pushes



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- fc5	24 Oct 2006 19:48:55 -0000	1.367
+++ fc5	25 Oct 2006 09:45:31 -0000	1.368
@@ -1,11 +1,11 @@
-Up to date CVE as of CVE email 20061022
-Up to date FC5 as of 20061016
+Up to date CVE as of CVE email 20061024
+Up to date FC5 as of 20061024
 
 ** are items that need attention
 
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
-CVE-2006-5298 VULNERABLE (mutt)
-CVE-2006-5297 VULNERABLE (mutt)
+CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
+CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5229 ignore (openssh) reported not an issue
 CVE-2006-5215 VULNERABLE (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
@@ -32,11 +32,11 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
-CVE-2006-4811 VULNERABLE (qt) #211342
+CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
-CVE-2006-4624 VULNERABLE (mailman, fixed 2.1.9rc1) #205652
+CVE-2006-4624 version (mailman, fixed 2.1.9rc1) #205652 [since FEDORA-2006-1013]
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
 CVE-2006-4573 VULNERABLE (screen) #212057
@@ -159,7 +159,7 @@
 CVE-2006-3677 VULNERABLE (mozilla)
 CVE-2006-3672 ignore (konqueror) just a crash
 CVE-2006-3665 ignore (squirrelmail) don't enable register_globals!
-CVE-2006-3636 VULNERABLE (mailman, fixed 2.1.9)
+CVE-2006-3636 version (mailman, fixed 2.1.9) [since FEDORA-2006-1013]
 CVE-2006-3634 version (kernel, fixed 2.6.17.8) [since FEDORA-2006-906] s390 only
 CVE-2006-3632 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]
 CVE-2006-3631 version (ethereal, fixed wireshark-0.99.2) [since FEDORA-2006-860]
@@ -208,7 +208,7 @@
 CVE-2006-3016 version (php, fixed 5.1.3) [since FEDORA-2006-1024]
 CVE-2006-3011 version (php, fixed 5.1.5) [since FEDORA-2006-1024]
 CVE-2006-3005 ignore (libjpeg) not a vuln
-CVE-2006-2941 VULNERABLE (mailman, fixed 2.1.9)
+CVE-2006-2941 version (mailman, fixed 2.1.9) [since FEDORA-2006-1013]
 CVE-2006-2940 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
 CVE-2006-2937 backport (openssl, fixed 0.9.8d) [since FEDORA-2006-1004]
 CVE-2006-2936 version (kernel, fixed 2.6.16.27, fixed 2.6.17.7) [since FEDORA-2006-906]
@@ -1653,6 +1653,7 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
+CVE-2003-1307 ** mod_php
 CVE-2003-1303 version (php, fixed 4.3.3)
 CVE-2003-1302 version (php, fixed 4.3.1)
 CVE-2003-1295 version (xscreensaver)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fc6	24 Oct 2006 19:48:55 -0000	1.121
+++ fc6	25 Oct 2006 09:45:31 -0000	1.122
@@ -1,11 +1,11 @@
-Up to date CVE as of CVE email 20061022
-Up to date FC6 as of GOLD
+Up to date CVE as of CVE email 20061024
+Up to date FC6 as of 20061024
 
 ** are items that need attention
 
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
-CVE-2006-5298 VULNERABLE (mutt)
-CVE-2006-5297 VULNERABLE (mutt)
+CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
+CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
@@ -30,7 +30,7 @@
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
-CVE-2006-4811 VULNERABLE (qt) #211347
+CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Wed Oct 25 09:52:36 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 25 Oct 2006 02:52:36 -0700
Subject: rpms/NetworkManager-vpnc/FC-6
	NetworkManager-vpnc-0.7.0-gppasswd.patch, NONE,
	1.1 NetworkManager-vpnc.spec, 1.18, 1.19
Message-ID: <200610250952.k9P9qacd030377@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/NetworkManager-vpnc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30357

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	NetworkManager-vpnc-0.7.0-gppasswd.patch 
Log Message:
Added patch to support saving group password only

NetworkManager-vpnc-0.7.0-gppasswd.patch:

--- NEW FILE NetworkManager-vpnc-0.7.0-gppasswd.patch ---
--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c	2006-10-21 15:03:55.000000000 +0200
@@ -33,13 +33,39 @@
 
 #define VPN_SERVICE "org.freedesktop.NetworkManager.vpnc"
 
-static GSList *
-lookup_pass (const char *vpn_name, const char *vpn_service, gboolean *is_session)
+struct keyring_data {
+	const char* password;
+	const char* group_password;
+	gboolean is_session;
+};
+
+void keyring_data_init(struct keyring_data* d)
 {
-	GSList *passwords;
-	GList *keyring_result;
+	d->password = NULL;
+	d->group_password = NULL;
+	d->is_session = FALSE;
+}
 
-	passwords = NULL;
+void keyring_data_free(struct keyring_data* d)
+{
+	/* For security reasons, Make sure to clear the data before freeing */
+	if (d->password) {
+		memset((void*)d->password, 0, strlen(d->password));
+		g_free((void*)d->password);
+		d->password = NULL;
+	}
+	if (d->group_password) {
+		memset((void*)d->group_password, 0, strlen(d->group_password));
+		g_free((void*)d->group_password);
+		d->group_password = NULL;
+	}
+}
+ 
+
+gboolean
+lookup_pass (const char *vpn_name, const char *vpn_service, struct keyring_data* kd)
+{
+	GList *keyring_result;
 
 	if (gnome_keyring_find_network_password_sync (g_get_user_name (),     /* user */
 						      NULL,                   /* domain */
@@ -51,40 +77,32 @@
 						      &keyring_result) != GNOME_KEYRING_RESULT_OK)
 		return FALSE;
 
-	if (keyring_result != NULL && g_list_length (keyring_result) == 2) {
-		char *password;
-		char *group_password;
-		GnomeKeyringNetworkPasswordData *data1 = keyring_result->data;
-		GnomeKeyringNetworkPasswordData *data2 = (g_list_next (keyring_result))->data;
+	char *password = NULL;
+	char *group_password = NULL;
+	GList* i;
+
+	for (i = keyring_result; i; i = g_list_next(i)) {
+		GnomeKeyringNetworkPasswordData *data = i->data;
+
+		if (data) {
+			if (strcmp (data->object, "group_password") == 0) {
+				group_password = data->password;
+			} else if (strcmp (data->object, "password") == 0) {
+				password = data->password;
+			}
 
-		password = NULL;
-		group_password = NULL;
-
-		if (strcmp (data1->object, "group_password") == 0) {
-			group_password = data1->password;
-		} else if (strcmp (data1->object, "password") == 0) {
-			password = data1->password;
-		}
-
-		if (strcmp (data2->object, "group_password") == 0) {
-			group_password = data2->password;
-		} else if (strcmp (data2->object, "password") == 0) {
-			password = data2->password;
+			kd->is_session = (strcmp (data->keyring, "session") == 0);
 		}
+	}
 
-		if (password != NULL && group_password != NULL) {
-			passwords = g_slist_append (passwords, g_strdup (group_password));
-			passwords = g_slist_append (passwords, g_strdup (password));
-			if (strcmp (data1->keyring, "session") == 0)
-				*is_session = TRUE;
-			else
-				*is_session = FALSE;
-		}
+	if (password)
+		kd->password = g_strdup(password);
+	if (group_password)
+		kd->group_password = g_strdup(group_password);
 
-		gnome_keyring_network_password_list_free (keyring_result);
-	}
+	gnome_keyring_network_password_list_free (keyring_result);
 
-	return passwords;
+	return TRUE;
 }
 
 static void save_vpn_password (const char *vpn_name, const char *vpn_service, const char *keyring, 
@@ -93,6 +111,7 @@
 	guint32 item_id;
 	GnomeKeyringResult keyring_result;
 
+	if (password) {
 	keyring_result = gnome_keyring_set_network_password_sync (keyring,
 								  g_get_user_name (),
 								  NULL,
@@ -107,6 +126,7 @@
 	{
 		g_warning ("Couldn't store password in keyring, code %d", (int) keyring_result);
 	}
+	}
 
 	keyring_result = gnome_keyring_set_network_password_sync (keyring,
 								  g_get_user_name (),
@@ -125,38 +145,20 @@
 	}
 }
 
-static GSList *
-get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry)
+gboolean
+get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry, struct keyring_data* kdata)
 {
-	GSList          *result;
-	char            *prompt;
+	char		*prompt;
 	GtkWidget	*dialog;
-	char            *keyring_password;
-	char            *keyring_group_password;
-	gboolean         keyring_is_session;
-	GSList          *keyring_result;
 	GnomeTwoPasswordDialogRemember remember;
 
-	result = NULL;
-	keyring_password = NULL;
-	keyring_group_password = NULL;
-	keyring_result = NULL;
-
-	g_return_val_if_fail (vpn_name != NULL, NULL);
+	g_return_val_if_fail (vpn_name != NULL, FALSE);
 
 	/* Use the system user name, since the VPN might have a different user name */
-	if (!retry) {
-		if ((result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-			return result;
-		}
-	} else {
-		if ((keyring_result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-			keyring_group_password = g_strdup ((char *) keyring_result->data);
-			keyring_password = g_strdup ((char *) (g_slist_next (keyring_result))->data);
-		}
-		g_slist_foreach (keyring_result, (GFunc)g_free, NULL);
-		g_slist_free (keyring_result);
-	}
+	gboolean has_keyring = lookup_pass (vpn_name, vpn_service, kdata);
+
+	if (!retry && has_keyring && kdata->password)
+		return TRUE;
 
 	prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name);
 	dialog = gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE);
@@ -169,21 +171,24 @@
 	gnome_two_password_dialog_set_password_secondary_label (GNOME_TWO_PASSWORD_DIALOG (dialog), _("_Group Password:"));
 	/* use the same keyring storage options as from the items we put in the entry boxes */
 	remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING;
-	if (keyring_result != NULL) {
-		if (keyring_is_session)
+	if (has_keyring) {
+		if (!kdata->password && kdata->group_password)
+			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
+		else if (kdata->is_session)
 			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
 		else
-			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;				
+			remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
 	}
+
 	gnome_two_password_dialog_set_remember (GNOME_TWO_PASSWORD_DIALOG (dialog), remember);
 
-	/* if retrying, put in the passwords from the keyring */
-	if (keyring_password != NULL) {
-		gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_password);
-	}
-	if (keyring_group_password != NULL) {
-		gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_group_password);
-	}
+/* if retrying, put in the passwords from the keyring */
+	if (kdata->password)
+		gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), kdata->password);
+
+	if (kdata->group_password)
+		gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog),
+								  kdata->group_password);
 
 	gtk_widget_show (dialog);
 
@@ -192,18 +197,21 @@
 		char *password;
 		char *group_password;
 
-		password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
-		group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
-		result = g_slist_append (result, group_password);
-		result = g_slist_append (result, password);
+		keyring_data_free(kdata);
+
+		kdata->password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
+		kdata->group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
 
 		switch (gnome_two_password_dialog_get_remember (GNOME_TWO_PASSWORD_DIALOG (dialog)))
 		{
 			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION:
-				save_vpn_password (vpn_name, vpn_service, "session", password, group_password);
+				save_vpn_password (vpn_name, vpn_service, "session", kdata->password, kdata->group_password);
+				break;
+			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
+				save_vpn_password (vpn_name, vpn_service, NULL, NULL, kdata->group_password);
 				break;
 			case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER:
-				save_vpn_password (vpn_name, vpn_service, NULL, password, group_password);
+				save_vpn_password (vpn_name, vpn_service, NULL, kdata->password, kdata->group_password);
 				break;
 			default:
 				break;
@@ -211,12 +219,9 @@
 
 	}
 
-	g_free (keyring_password);
-	g_free (keyring_group_password);
-
 	gtk_widget_destroy (dialog);
 
-	return result;
+	return TRUE;
 }
 
 int 
@@ -262,22 +267,28 @@
 	gnome_program_init ("nm-vpnc-auth-dialog", VERSION, LIBGNOMEUI_MODULE,
 			    argc, argv, 
 			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+
+	struct keyring_data kdata;
+	gboolean success = FALSE;
+
+	keyring_data_init(&kdata);
 	  
-	passwords = get_passwords (vpn_name, vpn_service, retry);
-	if (passwords == NULL)
+	if (! get_passwords (vpn_name, vpn_service, retry, &kdata))
 		goto out;
 
+	if (!kdata.password || !kdata.group_password)
+		goto out;
+
+	success = TRUE;
 	/* dump the passwords to stdout */
-	for (i = passwords; i != NULL; i = g_slist_next (i)) {
-		char *password = (char *) i->data;
-		printf ("%s\n", password);
-	}
+	printf ("%s\n", kdata.group_password);
+	printf ("%s\n", kdata.password);
+
 	printf ("\n\n");
 	/* for good measure, flush stdout since Kansas is going Bye-Bye */
 	fflush (stdout);
 
-	g_slist_foreach (passwords, (GFunc)g_free, NULL);
-	g_slist_free (passwords);
+	keyring_data_free(&kdata);
 
 	/* wait for data on stdin  */
 	fread (buf, sizeof (char), sizeof (buf), stdin);
@@ -285,5 +296,5 @@
 out:
 	g_option_context_free (context);
 
-	return passwords != NULL ? 0 : 1;
+	return success ? 0 : 1;
 }
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h	2006-10-21 15:01:12.000000000 +0200
@@ -57,6 +57,7 @@
 typedef enum {
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION,
+	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP,
 	GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER
 } GnomeTwoPasswordDialogRemember;
 
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig	2006-10-21 15:01:07.000000000 +0200
+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c	2006-10-21 15:01:12.000000000 +0200
@@ -68,6 +68,7 @@
 	
 	GtkWidget *remember_session_button;
 	GtkWidget *remember_forever_button;
+	GtkWidget *remember_group_forever_button;
 
 	GtkWidget *radio_vbox;
 	GtkWidget *connect_with_no_userpass_button;
@@ -465,11 +466,15 @@
 		gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session"));
 	password_dialog->details->remember_forever_button =
 		gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring"));
+	password_dialog->details->remember_group_forever_button =
+		gtk_check_button_new_with_mnemonic (_("S_ave group password in keyring"));
 
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, 
 			    TRUE, TRUE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, 
 			    TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_forever_button, 
+			    TRUE, TRUE, 6);
 
 
 	gnome_two_password_dialog_set_username (password_dialog, username);
@@ -689,9 +694,11 @@
 	if (show_remember) {
 		gtk_widget_show (password_dialog->details->remember_session_button);
 		gtk_widget_show (password_dialog->details->remember_forever_button);
+		gtk_widget_show (password_dialog->details->remember_group_forever_button);
 	} else {
 		gtk_widget_hide (password_dialog->details->remember_session_button);
 		gtk_widget_hide (password_dialog->details->remember_forever_button);
+		gtk_widget_hide (password_dialog->details->remember_group_forever_button);
 	}
 }
 
@@ -699,30 +706,38 @@
 gnome_two_password_dialog_set_remember      (GnomeTwoPasswordDialog         *password_dialog,
 					 GnomeTwoPasswordDialogRemember  remember)
 {
-	gboolean session, forever;
+	gboolean session, forever, group;
 
 	session = FALSE;
 	forever = FALSE;
+	group = FALSE;
 	if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) {
 		session = TRUE;
 	} else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){
 		forever = TRUE;
+	} else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP){
+		group = TRUE;
 	}
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button),
 				      session);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button),
 				      forever);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button),
+				      group);
 }
 
 GnomeTwoPasswordDialogRemember
 gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog         *password_dialog)
 {
-	gboolean session, forever;
+	gboolean session, forever, group;
 
 	session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button));
 	forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button));
+	group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button));
 	if (forever) {
 		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
+	} else if (group) {
+		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
 	} else if (session) {
 		return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
 	}


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-6/NetworkManager-vpnc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- NetworkManager-vpnc.spec	5 Oct 2006 16:12:07 -0000	1.18
+++ NetworkManager-vpnc.spec	25 Oct 2006 09:52:06 -0000	1.19
@@ -13,11 +13,12 @@
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
 Version:   0.7.0
-Release:   0%{?nm_vpnc_cvs_version}.2%{?dist}
+Release:   0%{?nm_vpnc_cvs_version}.3%{?dist}
 License:   GPL
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
+Patch0:    NetworkManager-vpnc-0.7.0-gppasswd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -47,6 +48,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gppasswd
+
 
 %build
 %configure
@@ -97,6 +100,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Wed Oct 25 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.3
+- Added patch to support saving group password only
+
 * Thu Oct  5 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.2
 - Leave .so link alone, needed by nm
 



From fedora-extras-commits at redhat.com  Wed Oct 25 10:36:50 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 25 Oct 2006 03:36:50 -0700
Subject: rpms/fmio/devel README.fedora,1.1,1.2
Message-ID: <200610251036.k9PAaouC001194@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/fmio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1178

Modified Files:
	README.fedora 
Log Message:
README.Fedora minor update


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/fmio/devel/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	7 Sep 2006 05:27:25 -0000	1.1
+++ README.fedora	25 Oct 2006 10:36:19 -0000	1.2
@@ -10,3 +10,6 @@
 can start fmrinit in the startup script like /etc/rc.d/rc.local. Second, you
 may start it once after login in the system. And runing fmio twice will do the
 job too. Choose a method that'll suit you best.
+
+If you like to use native fmio's driver you should switch on setuid bit and
+choose any driver you want.



From fedora-extras-commits at redhat.com  Wed Oct 25 10:55:35 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 25 Oct 2006 03:55:35 -0700
Subject: rpms/international-time/devel international-time.spec,1.1,1.2
Message-ID: <200610251055.k9PAtZ4i001407@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1389

Modified Files:
	international-time.spec 
Log Message:
* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
- Update desktop database on installation.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/devel/international-time.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- international-time.spec	20 Oct 2006 17:03:09 -0000	1.1
+++ international-time.spec	25 Oct 2006 10:55:05 -0000	1.2
@@ -48,6 +48,14 @@
 %clean
 rm -rf %{buildroot}
 
+%post
+/usr/bin/update-desktop-database &>/dev/null ||:
+
+%postun
+if [ "$1" = "0" ]; then
+  /usr/bin/update-desktop-database &>/dev/null ||:
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -56,6 +64,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
+- Update desktop database on installation.
+
 * Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1
 - 0.0.2.  More fixes from package review.
 



From fedora-extras-commits at redhat.com  Wed Oct 25 11:19:47 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Oct 2006 04:19:47 -0700
Subject: rpms/koffice/FC-4 koffice.spec,1.18,1.19
Message-ID: <200610251119.k9PBJlf3004816@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756/FC-4

Modified Files:
	koffice.spec 
Log Message:
- fix #212145: add missing BR for krita pdf support



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- koffice.spec	21 Oct 2006 07:51:58 -0000	1.18
+++ koffice.spec	25 Oct 2006 11:19:17 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -57,6 +57,7 @@
 BuildRequires:  xorg-x11-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel
+BuildRequires:  poppler-devel
 
 %description
 KOffice - Integrated Office Suite
@@ -592,6 +593,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/libkritapdfimport.*
 %{_libdir}/kde3/krosskritacore.*
 %{_libdir}/kde3/krita_ycbcr_u16_plugin.*
 %{_libdir}/kde3/krita_ycbcr_u8_plugin.*
@@ -813,6 +815,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- fix #212145: add missing BR for krita pdf support
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.6.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct 25 11:19:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Oct 2006 04:19:50 -0700
Subject: rpms/koffice/devel koffice.spec,1.44,1.45
Message-ID: <200610251119.k9PBJoph004823@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756/devel

Modified Files:
	koffice.spec 
Log Message:
- fix #212145: add missing BR for krita pdf support



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- koffice.spec	25 Oct 2006 06:41:24 -0000	1.44
+++ koffice.spec	25 Oct 2006 11:19:20 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -44,6 +44,7 @@
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel >= 1.8.2 
+BuildRequires:  poppler-devel
 %if "%{?fedora}" > "4"
 BuildRequires:  libXi-devel
 %endif
@@ -584,6 +585,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/libkritapdfimport.*
 %{_libdir}/kde3/krosskritacore.*
 %{_libdir}/kde3/krita_ycbcr_u16_plugin.*
 %{_libdir}/kde3/krita_ycbcr_u8_plugin.*
@@ -806,6 +808,10 @@
 
 %changelog
 * Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-3
+- fix #212145: add missing BR for krita pdf support
+
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.6.0-2
 - bump
 



From fedora-extras-commits at redhat.com  Wed Oct 25 11:19:49 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Oct 2006 04:19:49 -0700
Subject: rpms/koffice/FC-6 koffice.spec,1.43,1.44
Message-ID: <200610251119.k9PBJn8e004820@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756/FC-6

Modified Files:
	koffice.spec 
Log Message:
- fix #212145: add missing BR for krita pdf support



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/koffice.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- koffice.spec	20 Oct 2006 13:43:42 -0000	1.43
+++ koffice.spec	25 Oct 2006 11:19:19 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -44,6 +44,7 @@
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel >= 1.8.2 
+BuildRequires:  poppler-devel
 %if "%{?fedora}" > "4"
 BuildRequires:  libXi-devel
 %endif
@@ -584,6 +585,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/libkritapdfimport.*
 %{_libdir}/kde3/krosskritacore.*
 %{_libdir}/kde3/krita_ycbcr_u16_plugin.*
 %{_libdir}/kde3/krita_ycbcr_u8_plugin.*
@@ -805,8 +807,12 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- fix #212145: add missing BR for krita pdf support
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.6.0
+1.6.0-1
 - version upgrade
 
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net>



From fedora-extras-commits at redhat.com  Wed Oct 25 11:19:48 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Oct 2006 04:19:48 -0700
Subject: rpms/koffice/FC-5 koffice.spec,1.41,1.42
Message-ID: <200610251119.k9PBJml6004819@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756/FC-5

Modified Files:
	koffice.spec 
Log Message:
- fix #212145: add missing BR for krita pdf support



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- koffice.spec	21 Oct 2006 07:51:58 -0000	1.41
+++ koffice.spec	25 Oct 2006 11:19:18 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -45,6 +45,7 @@
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel >= 1.8.2 
+BuildRequires:  poppler-devel
 %if "%{?fedora}" > "4"
 BuildRequires:  libXi-devel
 %endif
@@ -582,6 +583,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/libkritapdfimport.*
 %{_libdir}/kde3/krosskritacore.*
 %{_libdir}/kde3/krita_ycbcr_u16_plugin.*
 %{_libdir}/kde3/krita_ycbcr_u8_plugin.*
@@ -803,6 +805,10 @@
 %{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- fix #212145: add missing BR for krita pdf support
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.6.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Oct 25 12:22:49 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 05:22:49 -0700
Subject: fedora-rpmdevtools configure.ac,1.5,1.6 rpmdevtools.spec,1.18,1.19
Message-ID: <200610251222.k9PCMnYr008237@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8217

Modified Files:
	configure.ac rpmdevtools.spec 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
- Update spectool to 1.0.8, fixes #212108.



Index: configure.ac
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.ac	2 Oct 2006 16:16:49 -0000	1.5
+++ configure.ac	25 Oct 2006 12:22:46 -0000	1.6
@@ -1,4 +1,4 @@
-AC_INIT(rpmdevtools, 5.2)
+AC_INIT(rpmdevtools, 5.3)
 AM_INIT_AUTOMAKE
 AC_PATH_PROG(HELP2MAN,help2man)
 AC_PATH_PROG(WGET,wget)


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpmdevtools.spec	2 Oct 2006 16:16:03 -0000	1.18
+++ rpmdevtools.spec	25 Oct 2006 12:22:46 -0000	1.19
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.



From fedora-extras-commits at redhat.com  Wed Oct 25 12:26:37 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 05:26:37 -0700
Subject: rpms/rpmdevtools/devel .cvsignore, 1.4, 1.5 rpmdevtools.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <200610251226.k9PCQbbs008356@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8281/devel

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
- Update spectool to 1.0.8, fixes #212108.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 16:29:08 -0000	1.4
+++ .cvsignore	25 Oct 2006 12:26:07 -0000	1.5
@@ -1,2 +1,2 @@
-spectool-1.0.7.tar.bz2
-rpmdevtools-5.2.tar.bz2
+rpmdevtools-5.3.tar.bz2
+spectool-1.0.8.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmdevtools.spec	2 Oct 2006 16:29:08 -0000	1.4
+++ rpmdevtools.spec	25 Oct 2006 12:26:07 -0000	1.5
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 16:29:08 -0000	1.5
+++ sources	25 Oct 2006 12:26:07 -0000	1.6
@@ -1,2 +1,2 @@
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2
+4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
+42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 12:26:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 05:26:35 -0700
Subject: rpms/rpmdevtools/FC-5 .cvsignore, 1.4, 1.5 rpmdevtools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610251226.k9PCQZsq008346@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8281/FC-5

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
- Update spectool to 1.0.8, fixes #212108.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 16:29:07 -0000	1.4
+++ .cvsignore	25 Oct 2006 12:26:05 -0000	1.5
@@ -1,2 +1,2 @@
-spectool-1.0.7.tar.bz2
-rpmdevtools-5.2.tar.bz2
+rpmdevtools-5.3.tar.bz2
+spectool-1.0.8.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/rpmdevtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmdevtools.spec	2 Oct 2006 16:29:07 -0000	1.4
+++ rpmdevtools.spec	25 Oct 2006 12:26:05 -0000	1.5
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 16:29:07 -0000	1.5
+++ sources	25 Oct 2006 12:26:05 -0000	1.6
@@ -1,2 +1,2 @@
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2
+4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
+42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 12:26:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 05:26:36 -0700
Subject: rpms/rpmdevtools/FC-6 .cvsignore, 1.4, 1.5 rpmdevtools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200610251226.k9PCQanw008351@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmdevtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8281/FC-6

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
- Update spectool to 1.0.8, fixes #212108.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 16:29:08 -0000	1.4
+++ .cvsignore	25 Oct 2006 12:26:06 -0000	1.5
@@ -1,2 +1,2 @@
-spectool-1.0.7.tar.bz2
-rpmdevtools-5.2.tar.bz2
+rpmdevtools-5.3.tar.bz2
+spectool-1.0.8.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-6/rpmdevtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmdevtools.spec	2 Oct 2006 16:29:08 -0000	1.4
+++ rpmdevtools.spec	25 Oct 2006 12:26:06 -0000	1.5
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmdevtools/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Oct 2006 16:29:08 -0000	1.5
+++ sources	25 Oct 2006 12:26:06 -0000	1.6
@@ -1,2 +1,2 @@
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2
+4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
+42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 12:28:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 05:28:25 -0700
Subject: rpms/jd/devel jd.spec,1.7,1.8
Message-ID: <200610251228.k9PCSPsC008391@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8374

Modified Files:
	jd.spec 
Log Message:
* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Respin



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jd.spec	24 Oct 2006 05:31:18 -0000	1.7
+++ jd.spec	25 Oct 2006 12:27:54 -0000	1.8
@@ -28,7 +28,7 @@
 %define         pre_release   1
 
 %if %{pre_release}
-%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
+%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}.1
 %else
 %define         rel           %{vendor_rel}%{?dist}
 %endif
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Respin
+
 * 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
 



From fedora-extras-commits at redhat.com  Wed Oct 25 12:29:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 05:29:22 -0700
Subject: rpms/jd/devel jd.spec,1.8,1.9
Message-ID: <200610251229.k9PCTMTl008418@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8402

Modified Files:
	jd.spec 
Log Message:
fix date


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jd.spec	25 Oct 2006 12:27:54 -0000	1.8
+++ jd.spec	25 Oct 2006 12:28:52 -0000	1.9
@@ -103,7 +103,7 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Respin
 
 * Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.2.beta061023



From fedora-extras-commits at redhat.com  Wed Oct 25 13:01:16 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 25 Oct 2006 06:01:16 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.7,1.8
Message-ID: <200610251301.k9PD1Gi2011606@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11579

Modified Files:
	Push.py 
Log Message:
Push.py


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Push.py	24 Oct 2006 20:28:19 -0000	1.7
+++ Push.py	25 Oct 2006 13:01:11 -0000	1.8
@@ -344,6 +344,14 @@
     # if it is a noarch package, copy2 it to all arch locations
     # if it is a debuginfo package, move it into the 'debug' dir for that arch
 
+    if len(filedict['srpm']) > 1:
+        mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
+        buildreportinfo = 'Invalid build-job: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        if buildreport:
+            rundirfile.write(buildreportinfo)
+        rundirfile.close()
+        raise PushWarning, 'WARNING: %s ' % pkg_fn
+    
     package = filedict['srpm'][0]
     (n,a,e,v,r) = naevr(package)
     pkg_fn = os.path.basename(package)
@@ -356,6 +364,10 @@
         buildreportinfo = '%s-%s-%s\n' % (n,v,r)
     else:  # src.rpm published before, exclude entire build job
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
+        buildreportinfo = 'Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        if buildreport:
+            rundirfile.write(buildreportinfo)
+        rundirfile.close()
         raise PushWarning, 'WARNING: %s published before' % pkg_fn
 
     for package in filedict['rpm'] + filedict['debuginfo']:



From fedora-extras-commits at redhat.com  Wed Oct 25 13:07:57 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Oct 2006 06:07:57 -0700
Subject: rpms/yumex/devel sources,1.34,1.35 yumex.spec,1.40,1.41
Message-ID: <200610251307.k9PD7vm4011774@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11716/devel

Modified Files:
	sources yumex.spec 
Log Message:
Release 1.1.7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	25 Oct 2006 08:25:15 -0000	1.34
+++ sources	25 Oct 2006 13:07:27 -0000	1.35
@@ -1 +1 @@
-7691f5b61017917fdbef102da170ba2f  yumex-1.1.6.tar.gz
+307104c00fb4b00c140c353d38d42b6b  yumex-1.1.7.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- yumex.spec	25 Oct 2006 08:25:15 -0000	1.40
+++ yumex.spec	25 Oct 2006 13:07:27 -0000	1.41
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.6
+Version:  1.1.7
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.7-1.0
+- Development Release 1.1.7-1.0
 * Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.6-1.0
 - Development Release 1.1.6-1.0
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0



From fedora-extras-commits at redhat.com  Wed Oct 25 13:07:56 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Oct 2006 06:07:56 -0700
Subject: rpms/yumex/FC-6 .cvsignore, 1.26, 1.27 sources, 1.34,
	1.35 yumex.spec, 1.40, 1.41
Message-ID: <200610251307.k9PD7uv6011770@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11716/FC-6

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 1.1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	25 Oct 2006 08:20:21 -0000	1.26
+++ .cvsignore	25 Oct 2006 13:07:26 -0000	1.27
@@ -1 +1 @@
-yumex-1.1.6.tar.gz
+yumex-1.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	25 Oct 2006 08:20:21 -0000	1.34
+++ sources	25 Oct 2006 13:07:26 -0000	1.35
@@ -1 +1 @@
-7691f5b61017917fdbef102da170ba2f  yumex-1.1.6.tar.gz
+307104c00fb4b00c140c353d38d42b6b  yumex-1.1.7.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/yumex.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- yumex.spec	25 Oct 2006 08:20:21 -0000	1.40
+++ yumex.spec	25 Oct 2006 13:07:26 -0000	1.41
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.6
+Version:  1.1.7
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.7-1.0
+- Development Release 1.1.7-1.0
 * Wed Oct 25 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.6-1.0
 - Development Release 1.1.6-1.0
 * Sun Oct 22 2006 Tim Lauridsen <tla at rasmil.dk> - 1.1.5-2.0



From fedora-extras-commits at redhat.com  Wed Oct 25 13:15:47 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:15:47 -0700
Subject: rpms/fluxstyle - New directory
Message-ID: <200610251315.k9PDFlcK011978@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11974/fluxstyle

Log Message:
Directory /cvs/extras/rpms/fluxstyle added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 13:15:53 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:15:53 -0700
Subject: rpms/fluxstyle/devel - New directory
Message-ID: <200610251315.k9PDFr4b011992@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11974/fluxstyle/devel

Log Message:
Directory /cvs/extras/rpms/fluxstyle/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 13:16:05 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:16:05 -0700
Subject: rpms/fluxstyle Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610251316.k9PDG5Dp012023@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12017

Added Files:
	Makefile import.log 
Log Message:
Setup of module fluxstyle


--- NEW FILE Makefile ---
# Top level Makefile for module fluxstyle
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 25 13:16:05 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:16:05 -0700
Subject: rpms/fluxstyle/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610251316.k9PDG5pk012041@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12017/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fluxstyle


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 25 13:17:00 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:17:00 -0700
Subject: rpms/fluxstyle import.log,1.1,1.2
Message-ID: <200610251317.k9PDH0NX012119@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12086

Modified Files:
	import.log 
Log Message:
auto-import fluxstyle-1.0.1-1 on branch devel from fluxstyle-1.0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Oct 2006 13:16:05 -0000	1.1
+++ import.log	25 Oct 2006 13:16:29 -0000	1.2
@@ -0,0 +1 @@
+fluxstyle-1_0_1-1:HEAD:fluxstyle-1.0.1-1.src.rpm:1161782186



From fedora-extras-commits at redhat.com  Wed Oct 25 13:17:00 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:17:00 -0700
Subject: rpms/fluxstyle/devel fluxstyle.desktop, NONE, 1.1 fluxstyle.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610251317.k9PDH0CV012123@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12086/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fluxstyle.desktop fluxstyle.spec 
Log Message:
auto-import fluxstyle-1.0.1-1 on branch devel from fluxstyle-1.0.1-1.src.rpm


--- NEW FILE fluxstyle.desktop ---
[Desktop Entry]
Encoding=UTF-8
Version=1.0.1
Type=Application
Name=Fluxstyle
Comment=Graphical style manager for fluxbox
TryExec=fluxStyle
Exec=fluxStyle
Icon=fluxmetal.png
Categories=Application;GTK;System;Utilities;


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

Name:           fluxstyle
Version:        1.0.1
Release:        1%{?dist}
Summary:        A graphical style manager for Fluxbox

Group:          User Interface/X
License:        GPL
URL:            http://fluxstyle.berlios.de
Source0:        http://errr-online.com/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1:        fluxstyle.desktop

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python >= 2.3, pygtk2-libglade, pygtk2, desktop-file-utils
# Im not sure how which of these requires is really needed... the fluxbox for sure 
# (version of flux is important due to a bug in pre .9.15) 
# but considering yum has to have python is making it a require really needed?
Requires:       python >= 2.3, pygtk2 >= 2.4, pygtk2-libglade, fluxbox >= 0.9.15  

%description
fluxstyle is a graphical style manager for the fluxbox window manager.
fluxstyle is written in python using pygtk and glade, you can use it
to preview, add, remove and apply styles in fluxbox.

%prep
%setup -q

sed -i s,"mini-fluxbox6.png","../images/mini-fluxbox6.png", images/main.glade
sed -i s,"fluxmetal.png","../images/fluxmetal.png", images/main.glade
%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

desktop-file-install --vendor  fedora \
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
    --add-category X-Fedora  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
cp images/fluxmetal.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

#clean up docs
rm -rf %{buildroot}%{_datadir}/%{name}/docs
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/Changelog docs/LICENSE docs/README
%{_bindir}/fluxStyle

%dir %{python_sitelib}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/glade/
%dir %{_datadir}/%{name}/images/
%dir %{_datadir}/icons/hicolor/48x48/apps

%{python_sitelib}/%{name}/parseConfig.py
%{python_sitelib}/%{name}/errorMessage.py 
%{python_sitelib}/%{name}/findStyles.py
%{python_sitelib}/%{name}/__init__.py
%{python_sitelib}/%{name}/*.pyc
%{python_sitelib}/%{name}/*.pyo

%{_datadir}/%{name}/glade/main.glade
%{_datadir}/%{name}/images/*.png
%{_datadir}/%{name}/images/none.jpg
%{_datadir}/applications/fedora-fluxstyle.desktop
%{_datadir}/icons/hicolor/48x48/apps/fluxmetal.png

%changelog
* Sun Oct 22 2006 Michael Rice <errr[AT]errr-online.com> - 1.0.1-1
- Version bump
- Fix Mime in .desktop file

* Thu Oct 19 2006 Michael Rice <errr[AT]errr-online.com> - 1.0-3
- Remove ghost from *.pyo
- Remove CFLAGS for noarch
- Remove python site search

* Wed Oct 18 2006 Michael Rice <errr[AT]errr-online.com> - 1.0-2
- Submission to extras for review
- Add .desktop file

* Wed Sep 20 2006 Michael Rice <errr at errr-online.com> - 1.0-1
- Build for fc5 fluxstyle-1.0-1

* Tue Apr 11 2006 Michael Rice <errr at errr-online.com> - 1.0
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Oct 2006 13:16:05 -0000	1.1
+++ .cvsignore	25 Oct 2006 13:16:30 -0000	1.2
@@ -0,0 +1 @@
+fluxstyle-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Oct 2006 13:16:05 -0000	1.1
+++ sources	25 Oct 2006 13:16:30 -0000	1.2
@@ -0,0 +1 @@
+f06e121439e67750a2913c91acd205a1  fluxstyle-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 13:20:20 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 06:20:20 -0700
Subject: owners owners.list,1.1871,1.1872
Message-ID: <200610251320.k9PDKKo0012184@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12164

Modified Files:
	owners.list 
Log Message:
Adding my self as maintainer of fluxstyle bug: 211548



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1871
retrieving revision 1.1872
diff -u -r1.1871 -r1.1872
--- owners.list	25 Oct 2006 09:35:54 -0000	1.1871
+++ owners.list	25 Oct 2006 13:19:50 -0000	1.1872
@@ -401,6 +401,7 @@
 Fedora Extras|flumotion|flumotion - the Fluendo Streaming Server|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|fluxbox|Fluxbox is a windowmanager that is based on Blackbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fluxconf|Configuration utility for fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|fluxstyle|Style Manager for fluxbox|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|fmio|FM radio card manipulation utility|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fontforge|An outline and bitmap font editor|kevin at tummy.com|extras-qa at fedoraproject.org|roozbeh at farsiweb.info



From fedora-extras-commits at redhat.com  Wed Oct 25 13:43:20 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 25 Oct 2006 06:43:20 -0700
Subject: rpms/zaptel/devel menuselect.makeopts,1.1,1.2 zaptel.spec,1.2,1.3
Message-ID: <200610251343.k9PDhKWw012333@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12315

Modified Files:
	menuselect.makeopts zaptel.spec 
Log Message:
* Wed Oct 25 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 1.4.0-4.beta2
- Compile sethdlc and package related bits.
- Remove some readmes that aren't applicable to library/userland




Index: menuselect.makeopts
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/menuselect.makeopts,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menuselect.makeopts	16 Oct 2006 11:53:07 -0000	1.1
+++ menuselect.makeopts	25 Oct 2006 13:42:50 -0000	1.2
@@ -1,2 +1,2 @@
 MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb xpp_usb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode 
-MENUSELECT_UTILS=sethdlc-new
+MENUSELECT_UTILS=


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/zaptel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zaptel.spec	19 Oct 2006 03:07:45 -0000	1.2
+++ zaptel.spec	25 Oct 2006 13:42:50 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.0
-Release: 3%{?dist}.beta2
+Release: 4%{?dist}.beta2
 License: GPL
 Group: Applications/System
 URL: http://www.digium.com/
@@ -92,6 +92,7 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
 mkdir -p %{buildroot}%{_sysconfdir}/udev/permissions.d
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -136,10 +137,9 @@
 %defattr(-,root,root,-)
 
 %doc ChangeLog
+%doc ifcfg-hdlc0
 %doc LICENSE
 %doc README
-%doc README.Astribank
-%doc README.b410p
 %doc README.fxotune
 %doc README.fxsusb
 %doc README.Linux26
@@ -150,7 +150,10 @@
 %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel
 %config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules
 
+%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc
 /sbin/ztcfg
+/sbin/sethdlc
+/sbin/sethdlc-new
 
 %{_initrddir}/zaptel
 %{_mandir}/man8/ztcfg.8*
@@ -185,6 +188,10 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Wed Oct 25 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 1.4.0-4.beta2
+- Compile sethdlc and package related bits.
+- Remove some readmes that aren't applicable to library/userland
+
 * Wed Oct 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-3.beta2
 - Update to 1.4.0-beta2
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:03:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 25 Oct 2006 07:03:33 -0700
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.20,1.21
Message-ID: <200610251403.k9PE3Xmt015395@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kipi-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369

Modified Files:
	kipi-plugins.spec 
Log Message:
* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.1.2-2
- rebuild against new(er) imlib2



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kipi-plugins.spec	29 Aug 2006 18:57:20 -0000	1.20
+++ kipi-plugins.spec	25 Oct 2006 14:03:02 -0000	1.21
@@ -2,7 +2,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group:   Applications/Multimedia
@@ -14,8 +14,6 @@
 BuildRequires: libkipi-devel
 BuildRequires: kdelibs-devel 
 ## slideshow plugin
-# shouldn't qt-devel Req these?  I think so, see http://bugzilla.redhat.com/193741
-#BuildRequires: libGL-devel libGLU-devel
 BuildRequires: imlib2-devel
 ## acquireimages, jpeglossless and rawconverter plugins
 BuildRequires: libtiff-devel
@@ -23,14 +21,11 @@
 BuildRequires: gphoto2-devel 
 ## jpeglossless plugin
 BuildRequires: libkexif-devel
-BuildRequires: ImageMagick-c++-devel
 # gr, -c++-devel doesn't Req: -devel on *some* distro/releases
-BuildRequires: ImageMagick-devel
+BuildRequires: ImageMagick-c++-devel ImageMagick-devel
 ## htmlexport plugin
-BuildRequires: libxslt-devel
-BuildRequires: libxml2-devel >= 2.6
-# bogus extra dep from libxslt.la
-BuildRequires: libgcrypt-devel 
+# libgcrypt is a bogus extra dep from libxslt.la
+BuildRequires: libxml2-devel libxslt-devel libgcrypt-devel 
 
 ## (mostly) Essential
 Requires: ImageMagick 
@@ -92,7 +87,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -156,6 +150,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.1.2-2
+- rebuild against new(er) imlib2
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.1.2-1
 - 0.1.2
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:14:03 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 25 Oct 2006 07:14:03 -0700
Subject: fedora-security/audit fc5,1.368,1.369 fc6,1.122,1.123
Message-ID: <200610251414.k9PEE3n1015591@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15571

Modified Files:
	fc5 fc6 
Log Message:
Give bugs for CVE-2006-5214/5



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- fc5	25 Oct 2006 09:45:31 -0000	1.368
+++ fc5	25 Oct 2006 14:14:00 -0000	1.369
@@ -7,14 +7,14 @@
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5229 ignore (openssh) reported not an issue
-CVE-2006-5215 VULNERABLE (xorg-x11-xdm)
-CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
-CVE-2006-5215 VULNERABLE (gdm)
-CVE-2006-5215 VULNERABLE (kdebase)
-CVE-2006-5214 VULNERABLE (xorg-x11-xdm)
-CVE-2006-5214 VULNERABLE (xorg-x11-xinit)
-CVE-2006-5214 VULNERABLE (gdm)
-CVE-2006-5214 VULNERABLE (kdebase)
+CVE-2006-5215 VULNERABLE (xorg-x11-xdm) bz#212167
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
+CVE-2006-5215 VULNERABLE (gdm) bz#212168
+CVE-2006-5215 VULNERABLE (kdebase) bz#212166
+CVE-2006-5214 VULNERABLE (xorg-x11-xdm) bz#212167
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
+CVE-2006-5214 VULNERABLE (gdm) bz#212168
+CVE-2006-5214 VULNERABLE (kdebase) bz#212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fc6	25 Oct 2006 09:45:31 -0000	1.122
+++ fc6	25 Oct 2006 14:14:00 -0000	1.123
@@ -8,11 +8,11 @@
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
-CVE-2006-5215 VULNERABLE (xorg-x11-xinit)
-CVE-2006-5215 VULNERABLE (kdebase)
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
+CVE-2006-5215 VULNERABLE (kdebase) bz#212166
 CVE-2006-5214 version (xorg-x11-xdm)
-CVE-2006-5214 VULNERABLE (xorg-x11-xinit)
-CVE-2006-5214 VULNERABLE (kdebase)
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
+CVE-2006-5214 VULNERABLE (kdebase) bz#212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield



From fedora-extras-commits at redhat.com  Wed Oct 25 14:29:16 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 25 Oct 2006 07:29:16 -0700
Subject: fedora-security/audit fc5,1.369,1.370
Message-ID: <200610251429.k9PETGV5015813@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15795

Modified Files:
	fc5 
Log Message:
Was a symlink on FC5



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- fc5	25 Oct 2006 14:14:00 -0000	1.369
+++ fc5	25 Oct 2006 14:29:13 -0000	1.370
@@ -9,11 +9,9 @@
 CVE-2006-5229 ignore (openssh) reported not an issue
 CVE-2006-5215 VULNERABLE (xorg-x11-xdm) bz#212167
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5215 VULNERABLE (gdm) bz#212168
 CVE-2006-5215 VULNERABLE (kdebase) bz#212166
 CVE-2006-5214 VULNERABLE (xorg-x11-xdm) bz#212167
 CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5214 VULNERABLE (gdm) bz#212168
 CVE-2006-5214 VULNERABLE (kdebase) bz#212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only



From fedora-extras-commits at redhat.com  Wed Oct 25 14:40:11 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 25 Oct 2006 07:40:11 -0700
Subject: rpms/zaptel/FC-6 menuselect.makeopts,1.1,1.2 zaptel.spec,1.2,1.3
Message-ID: <200610251440.k9PEeBoI015935@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/zaptel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15915

Modified Files:
	menuselect.makeopts zaptel.spec 
Log Message:
* Wed Oct 25 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 1.4.0-4.beta2
- Compile sethdlc and package related bits.
- Remove some readmes that aren't applicable to library/userland




Index: menuselect.makeopts
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-6/menuselect.makeopts,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menuselect.makeopts	16 Oct 2006 11:53:07 -0000	1.1
+++ menuselect.makeopts	25 Oct 2006 14:39:41 -0000	1.2
@@ -1,2 +1,2 @@
 MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb xpp_usb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode 
-MENUSELECT_UTILS=sethdlc-new
+MENUSELECT_UTILS=


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-6/zaptel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zaptel.spec	19 Oct 2006 03:07:45 -0000	1.2
+++ zaptel.spec	25 Oct 2006 14:39:41 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.0
-Release: 3%{?dist}.beta2
+Release: 4%{?dist}.beta2
 License: GPL
 Group: Applications/System
 URL: http://www.digium.com/
@@ -92,6 +92,7 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
 mkdir -p %{buildroot}%{_sysconfdir}/udev/permissions.d
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -136,10 +137,9 @@
 %defattr(-,root,root,-)
 
 %doc ChangeLog
+%doc ifcfg-hdlc0
 %doc LICENSE
 %doc README
-%doc README.Astribank
-%doc README.b410p
 %doc README.fxotune
 %doc README.fxsusb
 %doc README.Linux26
@@ -150,7 +150,10 @@
 %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel
 %config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules
 
+%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc
 /sbin/ztcfg
+/sbin/sethdlc
+/sbin/sethdlc-new
 
 %{_initrddir}/zaptel
 %{_mandir}/man8/ztcfg.8*
@@ -185,6 +188,10 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Wed Oct 25 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 1.4.0-4.beta2
+- Compile sethdlc and package related bits.
+- Remove some readmes that aren't applicable to library/userland
+
 * Wed Oct 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-3.beta2
 - Update to 1.4.0-beta2
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:40:44 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 07:40:44 -0700
Subject: rpms/highlight/FC-6 highlight.spec,1.17,1.18
Message-ID: <200610251440.k9PEei4O015961@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15939

Modified Files:
	highlight.spec 
Log Message:
Rebuid bc buildsys failure


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-6/highlight.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- highlight.spec	24 Oct 2006 17:34:38 -0000	1.17
+++ highlight.spec	25 Oct 2006 14:40:13 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.4.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Wed Oct 25 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1.1
+- Rebuilt
+
 * Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:53:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 25 Oct 2006 07:53:57 -0700
Subject: rpms/ntfs-3g/FC-5 ntfs-3g.spec,1.1,1.2
Message-ID: <200610251453.k9PErv4d016135@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052/FC-5

Modified Files:
	ntfs-3g.spec 
Log Message:

add missing Provides to make life easier for people



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-5/ntfs-3g.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntfs-3g.spec	20 Oct 2006 19:43:35 -0000	1.1
+++ ntfs-3g.spec	25 Oct 2006 14:53:27 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.3.%{buildrev}%{?dist}
+Release:	0.4.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -13,6 +13,8 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 Epoch:		1
+Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
 The ntfs-3g driver is an open source, GPL licensed, third generation 
@@ -75,6 +77,9 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Oct 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.4.20070920
+- add some extra Provides
+
 * Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.3.20070920
 - add explicit Requires on fuse
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:53:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 25 Oct 2006 07:53:59 -0700
Subject: rpms/ntfs-3g/devel ntfs-3g.spec,1.1,1.2
Message-ID: <200610251453.k9PErxbY016141@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052/devel

Modified Files:
	ntfs-3g.spec 
Log Message:

add missing Provides to make life easier for people



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntfs-3g.spec	20 Oct 2006 19:43:35 -0000	1.1
+++ ntfs-3g.spec	25 Oct 2006 14:53:29 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.3.%{buildrev}%{?dist}
+Release:	0.4.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -13,6 +13,8 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 Epoch:		1
+Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
 The ntfs-3g driver is an open source, GPL licensed, third generation 
@@ -75,6 +77,9 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Oct 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.4.20070920
+- add some extra Provides
+
 * Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.3.20070920
 - add explicit Requires on fuse
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:54:01 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 07:54:01 -0700
Subject: rpms/highlight/FC-5 highlight.spec,1.16,1.17
Message-ID: <200610251454.k9PEs1YV016144@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16107

Modified Files:
	highlight.spec 
Log Message:
Rebuild bc. buildsys failure


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- highlight.spec	24 Oct 2006 17:32:01 -0000	1.16
+++ highlight.spec	25 Oct 2006 14:53:31 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.4.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Wed Oct 25 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1.1
+- Rebuilt
+
 * Mon Oct 23 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.8-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Wed Oct 25 14:53:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 25 Oct 2006 07:53:58 -0700
Subject: rpms/ntfs-3g/FC-6 ntfs-3g.spec,1.1,1.2
Message-ID: <200610251453.k9PErw0r016138@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052/FC-6

Modified Files:
	ntfs-3g.spec 
Log Message:

add missing Provides to make life easier for people



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/ntfs-3g.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntfs-3g.spec	20 Oct 2006 19:43:35 -0000	1.1
+++ ntfs-3g.spec	25 Oct 2006 14:53:28 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.3.%{buildrev}%{?dist}
+Release:	0.4.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -13,6 +13,8 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 Epoch:		1
+Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
 The ntfs-3g driver is an open source, GPL licensed, third generation 
@@ -75,6 +77,9 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Oct 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.4.20070920
+- add some extra Provides
+
 * Mon Oct 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:0-0.3.20070920
 - add explicit Requires on fuse
 



From fedora-extras-commits at redhat.com  Wed Oct 25 15:11:58 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 25 Oct 2006 08:11:58 -0700
Subject: rpms/kompose/devel kompose.spec,1.5,1.6
Message-ID: <200610251511.k9PFBw3K019358@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kompose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19342

Modified Files:
	kompose.spec 
Log Message:
Rebuild for new imlib2



Index: kompose.spec
===================================================================
RCS file: /cvs/extras/rpms/kompose/devel/kompose.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kompose.spec	5 Sep 2006 20:06:22 -0000	1.5
+++ kompose.spec	25 Oct 2006 15:11:28 -0000	1.6
@@ -1,7 +1,7 @@
 Name: kompose
 Summary: Provides a full screen view of all open windows
 Version: 0.5.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: User Interface/X
 Url: http://kompose.berlios.de
@@ -67,6 +67,9 @@
 %{_datadir}/pixmaps/kompose.png
 
 %changelog
+* Wed Oct 25 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-7
+- Rebuild for new imlib2
+
 * Tue Aug 29 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-6
 - Revert to 0.5.3 and rebuild for FC6.  0.5.4 does not compile
 



From fedora-extras-commits at redhat.com  Wed Oct 25 16:13:36 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 09:13:36 -0700
Subject: rpms/csound/devel csound-5.03.0-remote-fixes.patch, NONE,
	1.1 csound.spec, 1.3, 1.4
Message-ID: <200610251613.k9PGDahq022610@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22591

Modified Files:
	csound.spec 
Added Files:
	csound-5.03.0-remote-fixes.patch 
Log Message:
* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
- Fix the remote plugin's local IP address read code, add more error checking



csound-5.03.0-remote-fixes.patch:

--- NEW FILE csound-5.03.0-remote-fixes.patch ---
--- Csound5.03.0/OOps/remote.c.remote-debug	2006-10-23 08:18:21.000000000 -0400
+++ Csound5.03.0/OOps/remote.c	2006-10-25 12:08:20.000000000 -0400
@@ -36,15 +36,18 @@
 
 #define ST(x)   (((REMOTE_GLOBALS*) ((CSOUND*)csound)->remoteGlobals)->x)
 
+void remote_Cleanup(CSOUND *csound);
+
+
 void remoteRESET(CSOUND *csound)
 {
     csound->remoteGlobals = NULL;
 }
 
  /* get the IPaddress of this machine */
-static void getIpAddress(char *ipaddr, char *ifname)
+static int getIpAddress(char *ipaddr, char *ifname)
 {
-
+    int ret = -1;
 #ifdef WIN32
     /* VL 12/10/06: something needs to go here */
     /* gethostbyname is the real answer; code below id unsafe */
@@ -57,25 +60,26 @@
 memset(&sin, 0, sizeof (struct sockaddr_in));
 memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
 strcpy(ipaddr, inet_ntoa (sin.sin_addr));
+ret = 0;
 
 #else
     struct ifreq ifr;
-    int fd, i;
-    unsigned char val;
+    int fd;
 
     fd = socket(AF_INET,SOCK_DGRAM, 0);
     if (fd >= 0) {
       strcpy(ifr.ifr_name, ifname);
 
       if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
-        for( i=2; i<6; i++){
-          val = (unsigned char)ifr.ifr_ifru.ifru_addr.sa_data[i];
-          sprintf(ipaddr, "%s%d%s", ipaddr, val, i==5?"":".");
-        }
+        char *local;
+        local = inet_ntoa(((struct sockaddr_in *)(&ifr.ifr_addr))->sin_addr);
+        strcpy(ipaddr, local);
+        ret = 0;
       }
     }
     close(fd);
 #endif
+    return ret;
 }
 
 char remoteID(CSOUND *csound)
@@ -84,31 +88,83 @@
     return ST(ipadrs)[len-1];
 }
 
-static void callox(CSOUND *csound)
+static int callox(CSOUND *csound)
 {
-    if (csound->remoteGlobals == NULL)
+    if (csound->remoteGlobals == NULL) {
       csound->remoteGlobals = csound->Calloc(csound, sizeof(REMOTE_GLOBALS));
+      if (csound->remoteGlobals == NULL) {
+        csound->Message(csound, Str("insufficient memory to initialize remote"
+                        " globals."));
+        goto error;
+      }
+    }
 
     ST(socksout) = (SOCK*)csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(SOCK));
+    if (ST(socksout) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize outgoing "
+                      "socket table."));
+      goto error;
+    }
     ST(socksin) = (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(socksin) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize incoming "
+                      "socket table."));
+      goto error;
+    }
     ST(insrfd_list) =
       (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(insrfd_list) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "insrfd_list."));
+      goto error;
+    }
     ST(chnrfd_list) =
       (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(chnrfd_list) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "chnrfd_list."));
+      goto error;
+    }
     ST(insrfd) = (int*) csound->Calloc(csound,(size_t)129 * sizeof(int));
+    if (ST(insrfd) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "insrfd table."));
+      goto error;
+    }
     ST(chnrfd) = (int*) csound->Calloc(csound,(size_t)17 * sizeof(int));
+    if (ST(chnrfd) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "chnrfd table."));
+      goto error;
+    }
     ST(ipadrs) = (char*) csound->Calloc(csound,(size_t)15 * sizeof(char));
+    if (ST(ipadrs) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "local ip address."));
+      goto error;
+    }
+
+	/* get IP adrs of this machine */
+	/* FIXME: don't hardcode eth0 */
+    if (getIpAddress(ST(ipadrs), "eth0") < 0) {
+      csound->Message(csound, Str("unable to get local ip address."));
+      goto error;
+    }
+
+	return 0;
 
-    getIpAddress(ST(ipadrs), "eth0"); /* get IP adrs of this machine */
+error:
+    /* Clean up anything we may have allocated before running out of memory */
+    remote_Cleanup(csound);
+    return -1;
 }
 
 /* Cleanup the above; called from musmon csoundCleanup */
 void remote_Cleanup(CSOUND *csound)
 {
     int fd;
-/*     if (csound->remoteGlobals == NULL) return; */
-    if (ST(socksout) == NULL) return;     /* if nothing allocated, return */
-    else {
+    if (csound->remoteGlobals == NULL) return;
+    if (ST(socksout) != NULL) {
       SOCK *sop = ST(socksout), *sop_end = sop + MAXREMOTES;
       for ( ; sop < sop_end; sop++)
         if ((fd = sop->rfd) > 0)
@@ -285,7 +341,12 @@
 {   /*      INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 3) {
       csound->InitError(csound, Str("missing instr nos"));
       return 0;
@@ -327,7 +388,12 @@
 {   /*      INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 2) {
       csound->InitError(csound, Str("missing instr nos"));
       return NOTOK;
@@ -357,7 +423,12 @@
 {                                            /* INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 3) {
       csound->InitError(csound, Str("missing channel nos"));
       return NOTOK;
@@ -396,7 +467,12 @@
 {                                         /*       INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
     
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 2) {
       csound->InitError(csound, Str("missing channel nos"));
       return NOTOK;


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csound.spec	24 Oct 2006 04:35:22 -0000	1.3
+++ csound.spec	25 Oct 2006 16:13:06 -0000	1.4
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       4%{?dist}
+Release:       5%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -40,6 +40,7 @@
 Patch1: csound-5.03.0-gstabs-disable-option.patch
 Patch2: csound-5.03.0-no-usr-local.patch
 Patch3: csound-5.03.0-disable-atsa.patch
+Patch4: csound-5.03.0-remote-fixes.patch
 
 
 %description
@@ -165,6 +166,7 @@
 %patch1 -p1 -b .gstabs-disable-option
 %patch2 -p1 -b .no-usr-local
 %patch3 -p1 -b .disable-atsa
+%patch4 -p1 -b .remote-fixes
 
 tar xf %{SOURCE1}
 
@@ -376,6 +378,9 @@
 %doc tutorial/*.py
 
 %changelog
+* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
+- Fix the remote plugin's local IP address read code, add more error checking
+
 * Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
 - Drop csound-5.03.0-uninitialized.patch, upstream
 - Drop csound-5.03.0-printf-redef.patch, upstream



From fedora-extras-commits at redhat.com  Wed Oct 25 16:18:51 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 25 Oct 2006 09:18:51 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.1,1.2
Message-ID: <200610251618.k9PGIpRq022698@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22678

Modified Files:
	international-time.spec 
Log Message:
* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
- Update desktop database on installation.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- international-time.spec	20 Oct 2006 17:03:09 -0000	1.1
+++ international-time.spec	25 Oct 2006 16:18:21 -0000	1.2
@@ -48,6 +48,14 @@
 %clean
 rm -rf %{buildroot}
 
+%post
+/usr/bin/update-desktop-database &>/dev/null ||:
+
+%postun
+if [ "$1" = "0" ]; then
+  /usr/bin/update-desktop-database &>/dev/null ||:
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -56,6 +64,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
+- Update desktop database on installation.
+
 * Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1
 - 0.0.2.  More fixes from package review.
 



From fedora-extras-commits at redhat.com  Wed Oct 25 16:19:45 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 25 Oct 2006 09:19:45 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.2,1.3
Message-ID: <200610251619.k9PGJja4022723@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22704

Modified Files:
	international-time.spec 
Log Message:
0.0.2-2.1


Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- international-time.spec	25 Oct 2006 16:18:21 -0000	1.2
+++ international-time.spec	25 Oct 2006 16:19:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: 	A tool for arranging times in advance with overseas colleagues
 Name: 		international-time
 Version: 	0.0.2
-Release: 	2%{?dist}
+Release: 	2%{?dist}.1
 License: 	GPL
 Group: 		Applications/System
 Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
@@ -64,7 +64,7 @@
 %{_datadir}/applications/*
 
 %changelog
-* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1
 - Update desktop database on installation.
 
 * Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1



From fedora-extras-commits at redhat.com  Wed Oct 25 16:50:32 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:50:32 -0700
Subject: rpms/crossvc - New directory
Message-ID: <200610251650.k9PGoWCV023068@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23064/crossvc

Log Message:
Directory /cvs/extras/rpms/crossvc added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 16:50:37 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:50:37 -0700
Subject: rpms/crossvc/devel - New directory
Message-ID: <200610251650.k9PGobGt023082@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23064/crossvc/devel

Log Message:
Directory /cvs/extras/rpms/crossvc/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 16:50:54 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:50:54 -0700
Subject: rpms/crossvc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610251650.k9PGossm023113@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23107

Added Files:
	Makefile import.log 
Log Message:
Setup of module crossvc


--- NEW FILE Makefile ---
# Top level Makefile for module crossvc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 25 16:51:00 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:51:00 -0700
Subject: rpms/crossvc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200610251651.k9PGp0Zs023130@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23107/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crossvc


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 25 16:52:13 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:52:13 -0700
Subject: rpms/crossvc import.log,1.1,1.2
Message-ID: <200610251652.k9PGqD7h023213@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23178

Modified Files:
	import.log 
Log Message:
auto-import crossvc-1.5.0-4.fc6 on branch devel from crossvc-1.5.0-4.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crossvc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Oct 2006 16:50:54 -0000	1.1
+++ import.log	25 Oct 2006 16:51:43 -0000	1.2
@@ -0,0 +1 @@
+crossvc-1_5_0-4_fc6:HEAD:crossvc-1.5.0-4.fc6.src.rpm:1161795094



From fedora-extras-commits at redhat.com  Wed Oct 25 16:52:14 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:52:14 -0700
Subject: rpms/crossvc/devel crossvc.desktop, NONE, 1.1 crossvc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610251652.k9PGqEJu023217@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23178/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crossvc.desktop crossvc.spec 
Log Message:
auto-import crossvc-1.5.0-4.fc6 on branch devel from crossvc-1.5.0-4.fc6.src.rpm


--- NEW FILE crossvc.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=CrossVC
Comment=Graphical CVS Client (QT)
Exec=crossvc
Icon=crossvc.xpm
Terminal=false
StartupNotify=true
Type=Application
Categories=Application;Development;


--- NEW FILE crossvc.spec ---
Name:             crossvc
Version:          1.5.0
Release:          4%{?dist}

Summary:          Graphical CVS Client

Group:            Development/Tools
License:          GPL
URL:              http://www.lincvs.org
Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
Source1:          crossvc.desktop
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:    cvs >= 0:1.9.0
BuildRequires:    qt-devel >= 1:3.3
BuildRequires:    desktop-file-utils
Requires:         cvs >= 0:1.9.0

Provides:         lincvs = %{version}-%{release}
Obsoletes:        lincvs < 1.5.0

%description
CrossVC is a graphical Interface for the cvs client commandline tool 
on the Unix and Windows platform. It allows ato load modules from a 
server (checkout), create modules on the server (import), as well as 
checking the state of directories and individual files or 
updating them. Basic operations like add, remove and commit are 
supported as matter of course, just like showing the actual differences 
between the server version and the local sandbox, graphical display of 
the version tree, and manifoldy graphical support of project maintenance. 
All actions are logged on the cvs server (configurable via history), 
and are therewith comprehensible.

To keep CrossVC independent of the cvs version, CrossVC uses the local 
but separat installed cvs and therewith always should work with the 
latest version.


%prep
%setup -q -n CrossVC

cat <<'EOF' >lincvs.sh
#!/bin/sh
exec %{_libdir}/CrossVC/AppRun $@
EOF

%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
qmake -o Makefile lincvs.pro
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
%makeinstall
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps

cp -Rpa CrossVC ${RPM_BUILD_ROOT}%{_libdir}
cp -p CrossVC/AppIcon.xpm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/crossvc.xpm

install -p -D -m0755 lincvs.sh ${RPM_BUILD_ROOT}%{_bindir}/crossvc

desktop-file-install --vendor fedora                \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
  --add-category X-Fedora-Extra	                    \
  %{SOURCE1}


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS doc/README THANKS doc/SSH-HOWTO.txt doc/PROXY-HOWTO.txt doc/FAQ.txt
%attr(755,root,root) %{_bindir}/crossvc
%{_libdir}/CrossVC
%{_datadir}/pixmaps/crossvc.xpm
%{_datadir}/applications/fedora-crossvc.desktop


%changelog
* Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-4
- Fix startup script (#210309)

* Mon Oct  9 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-3
- Add Provides and Obsolete tag (#209917)

* Wed Sep 27 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-1
- New upstream release

* Tue Feb 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.4.4-1
- Update to 1.4.4

* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 1.4.1-1
- update to 1.4.1
- BR desktop-file-utils (#156234)

* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.4.0-0.3.rc2
- rebuild on all arches

* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt

* Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.4.0-0.1.rc2
- Fix for x86_64.

* Sat Feb 12 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.4.0-0.rc2
- 1.4.0-rc2.

* Sat Apr 05 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:1.1.5-0.fdr.4
- Added XFree86-devel to BuildRequires.
- Changed group to Development/Tools.
- Changed desktop category to Developement.

* Wed Apr 02 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.1.5-0.fdr.3
- Spec rebuilt after willy-nilly deletion of old one.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Oct 2006 16:51:00 -0000	1.1
+++ .cvsignore	25 Oct 2006 16:51:44 -0000	1.2
@@ -0,0 +1 @@
+crossvc-1.5.0-0-generic-src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Oct 2006 16:51:00 -0000	1.1
+++ sources	25 Oct 2006 16:51:44 -0000	1.2
@@ -0,0 +1 @@
+1c491bcaa92458e770227a7b5a62fad8  crossvc-1.5.0-0-generic-src.tgz



From fedora-extras-commits at redhat.com  Wed Oct 25 16:54:30 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 25 Oct 2006 09:54:30 -0700
Subject: rpms/lincvs/devel dead.package, NONE, 1.1 crossvc.desktop, 1.1,
	NONE crossvc.spec, 1.3, NONE sources, 1.6, NONE
Message-ID: <200610251654.k9PGsUo9023287@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23282

Added Files:
	dead.package 
Removed Files:
	crossvc.desktop crossvc.spec sources 
Log Message:
Renamed lincvs into crossvc


--- NEW FILE dead.package ---
Package was renamed into crossvc.


--- crossvc.desktop DELETED ---


--- crossvc.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Oct 25 17:22:03 2006
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Wed, 25 Oct 2006 10:22:03 -0700
Subject: fedora-security/audit fc5,1.370,1.371 fc6,1.123,1.124
Message-ID: <200610251722.k9PHM3KS026491@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26470

Modified Files:
	fc5 fc6 
Log Message:
ImageMagick overrun issues



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- fc5	25 Oct 2006 14:29:13 -0000	1.370
+++ fc5	25 Oct 2006 17:22:00 -0000	1.371
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- fc6	25 Oct 2006 14:14:00 -0000	1.123
+++ fc6	25 Oct 2006 17:22:00 -0000	1.124
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]



From fedora-extras-commits at redhat.com  Wed Oct 25 17:33:34 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 10:33:34 -0700
Subject: extras-buildsys/www/template main.psp,1.3.4.1,1.3.4.2
Message-ID: <200610251733.k9PHXY0U026610@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26573/www/template

Modified Files:
      Tag: STABLE_0_4
	main.psp 
Log Message:
2006-10-25  Dan Williams  <dcbw at redhat.com>

	* www/template/main.psp
		- Fix cross-site scripting vulnerability by stripping the provided
			email address quite harshly




Index: main.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- main.psp	24 Nov 2005 22:39:09 -0000	1.3.4.1
+++ main.psp	25 Oct 2006 17:33:31 -0000	1.3.4.2
@@ -2,6 +2,7 @@
 <%
 import time
 import os
+import urllib, cgi
 from plague import XMLRPCServerProxy
 from OpenSSL import SSL
 
@@ -18,7 +19,20 @@
 if form.has_key('action'):
     action = str(form['action'])
 if form.has_key('email'):
-    user_email = str(form['email'])
+    user_email = ''
+    unsafe = str(form['email'])
+    a = urllib.unquote(unsafe)
+    a = urllib.unquote(a)
+    if a == urllib.unquote(a):
+        safe = ''
+        for item in a:
+            if item != '>' and item != '<' and item != '/' and item != '\\' and item != ')' and item != '(' and item != "'" and item != '"' and item != '%':
+                safe = safe + item
+        user_email = cgi.escape(safe)
+    else:
+        # No email for you, too many quote levels
+        user_email = "error"
+    # endif
 
 # endif
 %>



From fedora-extras-commits at redhat.com  Wed Oct 25 17:33:33 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 10:33:33 -0700
Subject: extras-buildsys ChangeLog,1.126.2.48,1.126.2.49
Message-ID: <200610251733.k9PHXXxY026604@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26573

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-10-25  Dan Williams  <dcbw at redhat.com>

	* www/template/main.psp
		- Fix cross-site scripting vulnerability by stripping the provided
			email address quite harshly




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.48
retrieving revision 1.126.2.49
diff -u -r1.126.2.48 -r1.126.2.49
--- ChangeLog	2 Jun 2006 14:59:17 -0000	1.126.2.48
+++ ChangeLog	25 Oct 2006 17:33:31 -0000	1.126.2.49
@@ -1,3 +1,9 @@
+2006-10-25  Dan Williams  <dcbw at redhat.com>
+
+	* www/template/main.psp
+		- Fix cross-site scripting vulnerability by stripping the provided
+			email address quite harshly
+
 2006-06-02  Dan Williams  <dcbw at redhat.com>
 
     Patch from Michael Schwendt <bugs.michael at gmx.net>



From fedora-extras-commits at redhat.com  Wed Oct 25 17:34:32 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 10:34:32 -0700
Subject: extras-buildsys ChangeLog,1.210,1.211
Message-ID: <200610251734.k9PHYWvA026661@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26630

Modified Files:
	ChangeLog 
Log Message:
2006-10-25  Dan Williams  <dcbw at redhat.com>

	* www/template/main.psp
		- Fix cross-site scripting vulnerability by stripping the provided
			email address quite harshly




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- ChangeLog	26 Jul 2006 00:32:35 -0000	1.210
+++ ChangeLog	25 Oct 2006 17:34:30 -0000	1.211
@@ -1,3 +1,9 @@
+2006-10-25  Dan Williams  <dcbw at redhat.com>
+
+	* www/template/main.psp
+		- Fix cross-site scripting vulnerability by stripping the provided
+			email address quite harshly
+
 2006-07-25  Dan Williams  <dcbw at redhat.com>
 
     Patch from Dennis Gilmore <dennis at ausil.us>



From fedora-extras-commits at redhat.com  Wed Oct 25 17:34:33 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 25 Oct 2006 10:34:33 -0700
Subject: extras-buildsys/www/template main.psp,1.4,1.5
Message-ID: <200610251734.k9PHYX9m026667@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26630/www/template

Modified Files:
	main.psp 
Log Message:
2006-10-25  Dan Williams  <dcbw at redhat.com>

	* www/template/main.psp
		- Fix cross-site scripting vulnerability by stripping the provided
			email address quite harshly




Index: main.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- main.psp	25 Nov 2005 04:45:18 -0000	1.4
+++ main.psp	25 Oct 2006 17:34:30 -0000	1.5
@@ -2,6 +2,7 @@
 <%
 import time
 import os
+import urllib, cgi
 from plague import XMLRPCServerProxy
 from OpenSSL import SSL
 
@@ -18,7 +19,20 @@
 if form.has_key('action'):
     action = str(form['action'])
 if form.has_key('email'):
-    user_email = str(form['email'])
+    user_email = ''
+    unsafe = str(form['email'])
+    a = urllib.unquote(unsafe)
+    a = urllib.unquote(a)
+    if a == urllib.unquote(a):
+        safe = ''
+        for item in a:
+            if item != '>' and item != '<' and item != '/' and item != '\\' and item != ')' and item != '(' and item != "'" and item != '"' and item != '%':
+                safe = safe + item
+        user_email = cgi.escape(safe)
+    else:
+        # No email for you, too many quote levels
+        user_email = "error"
+    # endif
 
 # endif
 %>



From fedora-extras-commits at redhat.com  Wed Oct 25 18:31:03 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 11:31:03 -0700
Subject: rpms/jd/devel jd.spec,1.9,1.10
Message-ID: <200610251831.k9PIV3s1029983@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29963

Modified Files:
	jd.spec 
Log Message:
* 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.



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jd.spec	25 Oct 2006 12:28:52 -0000	1.9
+++ jd.spec	25 Oct 2006 18:30:33 -0000	1.10
@@ -16,7 +16,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -28,7 +28,7 @@
 %define         pre_release   1
 
 %if %{pre_release}
-%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}.1
+%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
 %else
 %define         rel           %{vendor_rel}%{?dist}
 %endif
@@ -78,10 +78,13 @@
 
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
+# desktop-file-tools 0.10->0.11 change
+# 0.11 no longer accepts Applications, X-Fedora, X-RedHat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --add-category %{category} \
+   --remove-category %{category} \
+   --remove-category Application \
    %{name}.desktop
 
 %clean
@@ -103,8 +106,9 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Respin
+* 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



From fedora-extras-commits at redhat.com  Wed Oct 25 18:32:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 11:32:25 -0700
Subject: rpms/jd/devel jd.spec,1.10,1.11
Message-ID: <200610251832.k9PIWPd7030018@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30001

Modified Files:
	jd.spec 
Log Message:
remove category fix


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jd.spec	25 Oct 2006 18:30:33 -0000	1.10
+++ jd.spec	25 Oct 2006 18:31:54 -0000	1.11
@@ -83,7 +83,7 @@
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --remove-category %{category} \
+   --remove-category X-Red-Hat-Base \
    --remove-category Application \
    %{name}.desktop
 



From fedora-extras-commits at redhat.com  Wed Oct 25 18:33:58 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 11:33:58 -0700
Subject: rpms/jd/devel jd.spec,1.11,1.12
Message-ID: <200610251833.k9PIXwWg030057@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30029

Modified Files:
	jd.spec 
Log Message:
again small fix


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jd.spec	25 Oct 2006 18:31:54 -0000	1.11
+++ jd.spec	25 Oct 2006 18:33:28 -0000	1.12
@@ -79,7 +79,7 @@
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 # desktop-file-tools 0.10->0.11 change
-# 0.11 no longer accepts Applications, X-Fedora, X-RedHat-Base
+# 0.11 no longer accepts Applications, X-Fedora, X-Red-Hat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \



From fedora-extras-commits at redhat.com  Wed Oct 25 18:34:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 11:34:50 -0700
Subject: rpms/jd/devel jd.spec,1.12,1.13
Message-ID: <200610251834.k9PIYoLr030084@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30068

Modified Files:
	jd.spec 
Log Message:
oops...


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jd.spec	25 Oct 2006 18:33:28 -0000	1.12
+++ jd.spec	25 Oct 2006 18:34:20 -0000	1.13
@@ -79,7 +79,7 @@
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 # desktop-file-tools 0.10->0.11 change
-# 0.11 no longer accepts Applications, X-Fedora, X-Red-Hat-Base
+# 0.11 no longer accepts Application, X-Fedora, X-Red-Hat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \



From fedora-extras-commits at redhat.com  Wed Oct 25 18:43:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 25 Oct 2006 11:43:33 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.14, 1.15 gnupg2.spec, 1.53,
	1.54 sources, 1.16, 1.17
Message-ID: <200610251843.k9PIhXfQ030215@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30192

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.94-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	18 Oct 2006 18:43:44 -0000	1.14
+++ .cvsignore	25 Oct 2006 18:43:03 -0000	1.15
@@ -1,2 +1,2 @@
-gnupg-1.9.93.tar.bz2
-gnupg-1.9.93.tar.bz2.sig
+gnupg-1.9.94.tar.bz2
+gnupg-1.9.94.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnupg2.spec	18 Oct 2006 18:43:44 -0000	1.53
+++ gnupg2.spec	25 Oct 2006 18:43:03 -0000	1.54
@@ -11,7 +11,7 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.93
+Version: 1.9.94
 Release: 1%{?dist}
 
 License: GPL
@@ -95,8 +95,9 @@
 
 %build
 
+# see --disable-optimization below
 %ifarch x86_64
-#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O1|')"
+#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O0|')"
 %endif
 
 %configure \
@@ -182,6 +183,8 @@
 
 
 %changelog
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.94-1
+
 * Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.93-1
 - 1.9.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Oct 2006 18:43:44 -0000	1.16
+++ sources	25 Oct 2006 18:43:03 -0000	1.17
@@ -1,2 +1,2 @@
-fc2d20e6e8aba396953768b503bf07fe  gnupg-1.9.93.tar.bz2.sig
-84b1af5b6c489fcbbbbf4f219aaf2526  gnupg-1.9.93.tar.bz2
+1da8c928948800efa2a13d4aecb8d013  gnupg-1.9.94.tar.bz2
+18c269ffc15801ee62e1add2644391ec  gnupg-1.9.94.tar.bz2.sig



From fedora-extras-commits at redhat.com  Wed Oct 25 19:29:23 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 25 Oct 2006 12:29:23 -0700
Subject: rpms/rrdtool/devel rrdtool.spec,1.23,1.24
Message-ID: <200610251929.k9PJTN6G001031@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1015

Modified Files:
	rrdtool.spec 
Log Message:
Add tcl sub-package (#203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rrdtool.spec	5 Sep 2006 15:04:47 -0000	1.23
+++ rrdtool.spec	25 Oct 2006 19:28:53 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -85,6 +85,18 @@
 The %{name}-php package includes a dynamic shared object (DSO) that adds
 RRDtool bindings to the PHP HTML-embedded scripting language.
 
+%package tcl
+Summary: Tcl RRDtool bindings
+Group: Development/Languages
+BuildRequires: tcl-devel >= 8.0
+Requires: tcl >= 8.0
+Requires: %{name} = %{version}-%{release}
+Obsoletes: tcl-%{name} < %{version}-%{release}
+Provides: tcl-%{name} = %{version}-%{release}
+
+%description tcl
+The %{name}-tcl package includes RRDtool bindings for Tcl.
+
 %prep
 %setup -q
 %setup -q -T -D -a 1
@@ -105,6 +117,8 @@
 %configure \
     --disable-static \
     --with-pic \
+    --enable-tcl-site \
+    --with-tcllib=%{_libdir} \
     --with-perl-options='INSTALLDIRS="vendor"'
 
 # Fix another rpath issue
@@ -221,7 +235,16 @@
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
 %{php_extdir}/rrdtool.so
 
+%files tcl
+%defattr(-,root,root,-)
+%doc bindings/tcl/README
+%{_libdir}/tclrrd*.so
+%{_libdir}/rrdtool/*.tcl
+
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-5
+- Add tcl sub-package (#203275)
+
 * Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-4
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Wed Oct 25 19:35:52 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 25 Oct 2006 12:35:52 -0700
Subject: rpms/rrdtool/FC-6 rrdtool.spec,1.23,1.24
Message-ID: <200610251935.k9PJZqrI001165@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1149

Modified Files:
	rrdtool.spec 
Log Message:
Add tcl sub-package (#203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-6/rrdtool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rrdtool.spec	5 Sep 2006 15:04:47 -0000	1.23
+++ rrdtool.spec	25 Oct 2006 19:35:22 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -85,6 +85,18 @@
 The %{name}-php package includes a dynamic shared object (DSO) that adds
 RRDtool bindings to the PHP HTML-embedded scripting language.
 
+%package tcl
+Summary: Tcl RRDtool bindings
+Group: Development/Languages
+BuildRequires: tcl-devel >= 8.0
+Requires: tcl >= 8.0
+Requires: %{name} = %{version}-%{release}
+Obsoletes: tcl-%{name} < %{version}-%{release}
+Provides: tcl-%{name} = %{version}-%{release}
+
+%description tcl
+The %{name}-tcl package includes RRDtool bindings for Tcl.
+
 %prep
 %setup -q
 %setup -q -T -D -a 1
@@ -105,6 +117,8 @@
 %configure \
     --disable-static \
     --with-pic \
+    --enable-tcl-site \
+    --with-tcllib=%{_libdir} \
     --with-perl-options='INSTALLDIRS="vendor"'
 
 # Fix another rpath issue
@@ -221,7 +235,16 @@
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
 %{php_extdir}/rrdtool.so
 
+%files tcl
+%defattr(-,root,root,-)
+%doc bindings/tcl/README
+%{_libdir}/tclrrd*.so
+%{_libdir}/rrdtool/*.tcl
+
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-5
+- Add tcl sub-package (#203275)
+
 * Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-4
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Wed Oct 25 19:38:18 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 25 Oct 2006 12:38:18 -0700
Subject: rpms/rrdtool/FC-5 rrdtool.spec,1.23,1.24
Message-ID: <200610251938.k9PJcIqq001242@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1225

Modified Files:
	rrdtool.spec 
Log Message:
Add tcl sub-package (#203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rrdtool.spec	2 Aug 2006 14:43:16 -0000	1.23
+++ rrdtool.spec	25 Oct 2006 19:37:47 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.15
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -85,6 +85,18 @@
 The %{name}-php package includes a dynamic shared object (DSO) that adds
 RRDtool bindings to the PHP HTML-embedded scripting language.
 
+%package tcl
+Summary: Tcl RRDtool bindings
+Group: Development/Languages
+BuildRequires: tcl-devel >= 8.0
+Requires: tcl >= 8.0
+Requires: %{name} = %{version}-%{release}
+Obsoletes: tcl-%{name} < %{version}-%{release}
+Provides: tcl-%{name} = %{version}-%{release}
+
+%description tcl
+The %{name}-tcl package includes RRDtool bindings for Tcl.
+
 %prep
 %setup -q
 %setup -q -T -D -a 1
@@ -105,6 +117,8 @@
 %configure \
     --disable-static \
     --with-pic \
+    --enable-tcl-site \
+    --with-tcllib=%{_libdir} \
     --with-perl-options='INSTALLDIRS="vendor"'
 
 # Fix another rpath issue
@@ -221,7 +235,19 @@
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
 %{php_extdir}/rrdtool.so
 
+%files tcl
+%defattr(-,root,root,-)
+%doc bindings/tcl/README
+%{_libdir}/tclrrd*.so
+%{_libdir}/rrdtool/*.tcl
+
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-5
+- Add tcl sub-package (#203275)
+
+* Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-4
+- Rebuild for new glibc
+
 * Wed Aug 02 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-3
 - One more addition to initrrdtool patch, to fully revert
   and correct upstream changeset 839



From fedora-extras-commits at redhat.com  Wed Oct 25 19:47:32 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 25 Oct 2006 12:47:32 -0700
Subject: rpms/koan/FC-6 .cvsignore, 1.5, 1.6 koan.spec, 1.7, 1.8 sources, 1.6,
	1.7
Message-ID: <200610251947.k9PJlWf6001368@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + changed description




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Oct 2006 19:39:58 -0000	1.5
+++ .cvsignore	25 Oct 2006 19:47:02 -0000	1.6
@@ -2,3 +2,4 @@
 koan-0.2.1.tar.gz
 koan-0.2.2.tar.gz
 koan-0.2.3.tar.gz
+koan-0.2.4.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/koan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- koan.spec	24 Oct 2006 19:39:58 -0000	1.7
+++ koan.spec	25 Oct 2006 19:47:02 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -18,8 +18,8 @@
 %description
 
 Koan stands for kickstart-over-a-network and allows for both
-network provisioning of new Xen guests and destructive re-provisioning of
-any existing system.  For use with a boot-server configured with
+network provisioning of new virtualized guests and destructive re-provisioning 
+of any existing system.  For use with a boot-server configured with
 'cobbler'
 
 %prep
@@ -47,6 +47,10 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Wed Oct 25 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.4-1
+- Upstream changes (see CHANGELOG)
+- Description update
+
 * Tue Oct 24 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Oct 2006 19:39:58 -0000	1.6
+++ sources	25 Oct 2006 19:47:02 -0000	1.7
@@ -1 +1 @@
-34974b122210c2027e27da6524feffae  koan-0.2.3.tar.gz
+621686ed88229afd513e2a3340aba484  koan-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 19:50:05 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 25 Oct 2006 12:50:05 -0700
Subject: rpms/koan/FC-5 .cvsignore, 1.4, 1.5 koan.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200610251950.k9PJo5O8001444@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1424

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + description change




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Oct 2006 19:41:48 -0000	1.4
+++ .cvsignore	25 Oct 2006 19:49:34 -0000	1.5
@@ -1,3 +1,4 @@
 koan-0.1.1.tar.gz
 koan-0.2.2.tar.gz
 koan-0.2.3.tar.gz
+koan-0.2.4.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/koan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- koan.spec	24 Oct 2006 19:41:48 -0000	1.6
+++ koan.spec	25 Oct 2006 19:49:34 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -18,8 +18,8 @@
 %description
 
 Koan stands for kickstart-over-a-network and allows for both
-network provisioning of new Xen guests and destructive re-provisioning of
-any existing system.  For use with a boot-server configured with
+network provisioning of new virtualized guests and destructive re-provisioning 
+of any existing system.  For use with a boot-server configured with
 'cobbler'
 
 %prep
@@ -47,6 +47,10 @@
 %doc AUTHORS COPYING CHANGELOG README NEWS
 
 %changelog
+* Wed Oct 25 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.4-1
+- Upstream changes (see CHANGELOG)
+- Description update
+
 * Tue Oct 24 2006 - Michael DeHaan <mdehaan at redhat.com> - 0.2.3-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Oct 2006 19:41:48 -0000	1.5
+++ sources	25 Oct 2006 19:49:34 -0000	1.6
@@ -1,3 +1 @@
-d1b7df4a1fb022d345d79f3b182d769b  koan-0.1.1.tar.gz
-8bcd6432b32c280b2aea6f1eb78e5ddd  koan-0.2.2.tar.gz
-34974b122210c2027e27da6524feffae  koan-0.2.3.tar.gz
+621686ed88229afd513e2a3340aba484  koan-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 19:55:17 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 25 Oct 2006 12:55:17 -0700
Subject: rpms/cobbler/FC-6 .cvsignore, 1.11, 1.12 cobbler.spec, 1.10,
	1.11 sources, 1.12, 1.13
Message-ID: <200610251955.k9PJtHh4001508@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1488

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + description change




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Oct 2006 21:55:27 -0000	1.11
+++ .cvsignore	25 Oct 2006 19:54:47 -0000	1.12
@@ -8,3 +8,4 @@
 cobbler-0.2.8.tar.gz
 cobbler-0.2.9.tar.gz
 cobbler-0.3.0.tar.gz
+cobbler-0.3.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cobbler.spec	24 Oct 2006 21:55:27 -0000	1.10
+++ cobbler.spec	25 Oct 2006 19:54:47 -0000	1.11
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.0
+Version: 0.3.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -17,10 +17,7 @@
 
 %description
 
-Cobbler is a command line tool for simplified configuration of provisioning
-servers.  It is also accessible as a Python library.  Cobbler supports PXE,
-Xen, and re-provisioning an existing Linux system via auto-kickstart.  The
-last two modes require 'koan' to be run on the remote system.
+Cobbler is a command line tool for configuration of boot/provisioning servers.  It is also accessible as a Python library.  Cobbler supports PXE, provisioning virtualized ("virt") images, and reinstalling machines that are already up and running (over SSH).  The last two modes require a helper tool called 'koan' that integrates with cobbler.  Cobbler's advanced features include importing distributions from rsync mirrors, kickstart templating, and managing dhcpd.conf.
 
 %prep
 %setup -q
@@ -55,6 +52,10 @@
 
 %changelog
 
+* Wed Oct 25 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.1-1
+- Upstream changes (see CHANGELOG)
+- Updated description
+
 * Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.0-1
 - Upstream changes (see CHANGELOG)
 - Marked files in /etc/cobbler as config


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Oct 2006 21:55:27 -0000	1.12
+++ sources	25 Oct 2006 19:54:47 -0000	1.13
@@ -1 +1 @@
-e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz
+0899462306f7da1e1423bd1fdaf679a1  cobbler-0.3.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 19:57:20 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Wed, 25 Oct 2006 12:57:20 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.6, 1.7 cobbler.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200610251957.k9PJvK0B001579@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1559

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream changes (see CHANGELOG) + description change




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Oct 2006 21:58:12 -0000	1.6
+++ .cvsignore	25 Oct 2006 19:56:50 -0000	1.7
@@ -3,3 +3,4 @@
 cobbler-0.2.8.tar.gz
 cobbler-0.2.9.tar.gz
 cobbler-0.3.0.tar.gz
+cobbler-0.3.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cobbler.spec	24 Oct 2006 21:58:12 -0000	1.5
+++ cobbler.spec	25 Oct 2006 19:56:50 -0000	1.6
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.0
+Version: 0.3.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -17,10 +17,7 @@
 
 %description
 
-Cobbler is a command line tool for simplified configuration of provisioning
-servers.  It is also accessible as a Python library.  Cobbler supports PXE,
-Xen, and re-provisioning an existing Linux system via auto-kickstart.  The
-last two modes require 'koan' to be run on the remote system.
+Cobbler is a command line tool for configuration of boot/provisioning servers.  It is also accessible as a Python library.  Cobbler supports PXE, provisioning virtualized ("virt") images, and reinstalling machines that are already up and running (over SSH).  The last two modes require a helper tool called 'koan' that integrates with cobbler.  Cobbler's advanced features include importing distributions from rsync mirrors, kickstart templating, and managing dhcpd.conf.
 
 %prep
 %setup -q
@@ -55,6 +52,10 @@
 
 %changelog
 
+* Wed Oct 25 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.1-1
+- Upstream changes (see CHANGELOG)
+- Updated description
+
 * Tue Oct 24 2006 Michael DeHaan <mdehaan at redhat.com> - 0.3.0-1
 - Upstream changes (see CHANGELOG)
 - Marked files in /etc/cobbler as config


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Oct 2006 21:58:12 -0000	1.6
+++ sources	25 Oct 2006 19:56:50 -0000	1.7
@@ -1 +1,2 @@
 e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz
+0899462306f7da1e1423bd1fdaf679a1  cobbler-0.3.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 20:03:40 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 25 Oct 2006 13:03:40 -0700
Subject: rpms/basket/FC-5 .cvsignore, 1.2, 1.3 basket.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200610252003.k9PK3ejR004684@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/basket/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627/FC-5

Modified Files:
	.cvsignore basket.spec sources 
Log Message:
version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 16:11:00 -0000	1.2
+++ .cvsignore	25 Oct 2006 20:03:10 -0000	1.3
@@ -1 +1 @@
-basket-0.5.0.tar.gz
+basket-0.6.0.tar.gz


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-5/basket.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- basket.spec	21 Feb 2006 17:03:44 -0000	1.3
+++ basket.spec	25 Oct 2006 20:03:10 -0000	1.4
@@ -1,15 +1,14 @@
 Name:           basket
 Summary:        Notes taker for KDE
-Version:        0.5.0
-Release:        5%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 URL:           	http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
-Patch0:         basket-0.5.0-64bits.patch
+Source0:        http://basket.kde.org/downloads/basket-0.6.0.tar.gz
 License:        GPL
 
 Group:          Applications/Productivity
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs-devel, desktop-file-utils
+BuildRequires:  kdelibs-devel, desktop-file-utils, gamin-devel
 Requires:       kdebase >= 3.0
 
 %description
@@ -21,7 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bits
 
 
 %build
@@ -37,18 +35,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{find_lang} %{name}
-
 # Icons: use hicolor instead of crystalsvg
 mv $RPM_BUILD_ROOT%{_datadir}/icons/{crystalsvg,hicolor}
 
 # Menu
-# fix encoding
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop \
-        > $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop
-# install desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -60,6 +50,16 @@
         --add-category KDE \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%{find_lang} %{name}
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  lang=$(basename $lang_dir)
+  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+done
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -83,13 +83,34 @@
 %doc README AUTHORS COPYING ChangeLog NEWS TODO
 %{_bindir}/basket
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/actions/*.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/apps/basket
-%{_datadir}/doc/HTML/*/basket
-
+%{_libdir}/kde3/kcm_basket.*
+%{_libdir}/kde3/libbasketpart.*
+%{_libdir}/libbasketcommon.so
+%{_datadir}/services/*.desktop
 
 
 %changelog
+* Wed Oct 25 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.6.0-1
+- version 0.6.0
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
+- add explicit linking to libfam
+
+* Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-8
+- rebuild
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-7
+- BR: gamin-devel
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-6
+- rebuild
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.5.0-5
 - rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 16:11:00 -0000	1.2
+++ sources	25 Oct 2006 20:03:10 -0000	1.3
@@ -1 +1 @@
-1495261da3dbfc243a8340cd9c5723c2  basket-0.5.0.tar.gz
+968072a1c1dce84a0c6f8b72bd9b65b8  basket-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 20:03:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 25 Oct 2006 13:03:44 -0700
Subject: rpms/basket/devel .cvsignore, 1.2, 1.3 basket.spec, 1.8, 1.9 sources,
	1.2, 1.3
Message-ID: <200610252003.k9PK3ipu004688@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/basket/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627/devel

Modified Files:
	.cvsignore basket.spec sources 
Log Message:
version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 16:11:00 -0000	1.2
+++ .cvsignore	25 Oct 2006 20:03:14 -0000	1.3
@@ -1 +1 @@
-basket-0.5.0.tar.gz
+basket-0.6.0.tar.gz


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/basket.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- basket.spec	4 Oct 2006 22:48:16 -0000	1.8
+++ basket.spec	25 Oct 2006 20:03:14 -0000	1.9
@@ -1,10 +1,9 @@
 Name:           basket
 Summary:        Notes taker for KDE
-Version:        0.5.0
-Release:        10%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 URL:           	http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
-Patch0:         basket-0.5.0-64bits.patch
+Source0:        http://basket.kde.org/downloads/basket-0.6.0.tar.gz
 License:        GPL
 
 Group:          Applications/Productivity
@@ -21,8 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bits
-sed -i.orig -e 's/^basket_LDADD = \(.*\)$/basket_LDADD = -lfam \1/g' src/Makefile.in
 
 
 %build
@@ -38,18 +35,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{find_lang} %{name}
-
 # Icons: use hicolor instead of crystalsvg
 mv $RPM_BUILD_ROOT%{_datadir}/icons/{crystalsvg,hicolor}
 
 # Menu
-# fix encoding
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop \
-        > $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop
-# install desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -61,6 +50,16 @@
         --add-category KDE \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%{find_lang} %{name}
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  lang=$(basename $lang_dir)
+  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+done
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -84,15 +83,21 @@
 %doc README AUTHORS COPYING ChangeLog NEWS TODO
 %{_bindir}/basket
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/actions/*.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/apps/basket
-%{_datadir}/doc/HTML/*/basket
-
+%{_libdir}/kde3/kcm_basket.*
+%{_libdir}/kde3/libbasketpart.*
+%{_libdir}/libbasketcommon.so
+%{_datadir}/services/*.desktop
 
 
 %changelog
+* Wed Oct 25 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.6.0-1
+- version 0.6.0
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
 - add explicit linking to libfam


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/basket/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 16:11:00 -0000	1.2
+++ sources	25 Oct 2006 20:03:14 -0000	1.3
@@ -1 +1 @@
-1495261da3dbfc243a8340cd9c5723c2  basket-0.5.0.tar.gz
+968072a1c1dce84a0c6f8b72bd9b65b8  basket-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 20:03:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 25 Oct 2006 13:03:44 -0700
Subject: rpms/basket/FC-6 .cvsignore, 1.2, 1.3 basket.spec, 1.8, 1.9 sources,
	1.2, 1.3
Message-ID: <200610252003.k9PK3iCC004690@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/basket/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627/FC-6

Modified Files:
	.cvsignore basket.spec sources 
Log Message:
version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 16:11:00 -0000	1.2
+++ .cvsignore	25 Oct 2006 20:03:12 -0000	1.3
@@ -1 +1 @@
-basket-0.5.0.tar.gz
+basket-0.6.0.tar.gz


Index: basket.spec
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-6/basket.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- basket.spec	4 Oct 2006 22:48:16 -0000	1.8
+++ basket.spec	25 Oct 2006 20:03:12 -0000	1.9
@@ -1,10 +1,9 @@
 Name:           basket
 Summary:        Notes taker for KDE
-Version:        0.5.0
-Release:        10%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 URL:           	http://basket.kde.org/
-Source0:        http://basket.kde.org/downloads/basket-0.5.0.tar.gz
-Patch0:         basket-0.5.0-64bits.patch
+Source0:        http://basket.kde.org/downloads/basket-0.6.0.tar.gz
 License:        GPL
 
 Group:          Applications/Productivity
@@ -21,8 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bits
-sed -i.orig -e 's/^basket_LDADD = \(.*\)$/basket_LDADD = -lfam \1/g' src/Makefile.in
 
 
 %build
@@ -38,18 +35,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{find_lang} %{name}
-
 # Icons: use hicolor instead of crystalsvg
 mv $RPM_BUILD_ROOT%{_datadir}/icons/{crystalsvg,hicolor}
 
 # Menu
-# fix encoding
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop \
-        > $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.badencoding.desktop
-# install desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -61,6 +50,16 @@
         --add-category KDE \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%{find_lang} %{name}
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  lang=$(basename $lang_dir)
+  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+done
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -84,15 +83,21 @@
 %doc README AUTHORS COPYING ChangeLog NEWS TODO
 %{_bindir}/basket
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/actions/*.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/apps/basket
-%{_datadir}/doc/HTML/*/basket
-
+%{_libdir}/kde3/kcm_basket.*
+%{_libdir}/kde3/libbasketpart.*
+%{_libdir}/libbasketcommon.so
+%{_datadir}/services/*.desktop
 
 
 %changelog
+* Wed Oct 25 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.6.0-1
+- version 0.6.0
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.5.0-10
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.5.0-9
 - add explicit linking to libfam


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/basket/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 16:11:00 -0000	1.2
+++ sources	25 Oct 2006 20:03:12 -0000	1.3
@@ -1 +1 @@
-1495261da3dbfc243a8340cd9c5723c2  basket-0.5.0.tar.gz
+968072a1c1dce84a0c6f8b72bd9b65b8  basket-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 20:04:16 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 25 Oct 2006 13:04:16 -0700
Subject: comps comps-fe7.xml.in,NONE,1.1
Message-ID: <200610252004.k9PK4GQs004705@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4700

Added Files:
	comps-fe7.xml.in 
Log Message:
Copy over comps-fe6.xml.in for FC-7


--- NEW FILE comps-fe7.xml.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
<comps>
  <group>
    <id>admin-tools</id>
    <_name>Administration Tools</_name>
    <_description>This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">gparted</packagereq>
      <packagereq type="optional">gsynaptics</packagereq>
      <packagereq type="optional">lat</packagereq>
      <packagereq type="optional">luma</packagereq>
      <packagereq type="optional">pessulus</packagereq>
      <packagereq type="optional">qtparted</packagereq>
      <packagereq type="optional">yumex</packagereq>
    </packagelist>
  </group>
  <group>
    <id>arabic-support</id>
    <_name>Arabic Support</_name>
    <_description>This group is a collection of tools and resources of Arabic environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">dejavu-fonts</packagereq>
      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
    </packagelist>
  </group>
  <group>
    <id>armenian-support</id>
    <_name>Armenian Support</_name>
    <_description>This group is a collection of tools and resources of Armenian environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">dejavu-fonts</packagereq>
      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
    </packagelist>
  </group>
  <group>
    <id>authoring-and-publishing</id>
    <_name>Authoring and Publishing</_name>
    <_description>These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">BibTool</packagereq>
      <packagereq type="optional">conglomerate</packagereq>
      <packagereq type="optional">docbook2X</packagereq>
      <packagereq type="optional">html401-dtds</packagereq>
      <packagereq type="optional">kile</packagereq>
      <packagereq type="optional">lilypond</packagereq>
      <packagereq type="optional">lout</packagereq>
      <packagereq type="optional">ooo2txt</packagereq>
      <packagereq type="optional">python-docutils</packagereq>
      <packagereq type="optional">scribus</packagereq>
      <packagereq type="optional">tetex-eurofont</packagereq>
      <packagereq type="optional">tetex-prosper</packagereq>
      <packagereq type="optional">w3c-markup-validator</packagereq>
    </packagelist>
  </group>
  <group>
    <id>base-x</id>
    <_name>X Window System</_name>
    <_description>Install this group of packages to use the base graphical (X) user interface.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">alltray</packagereq>
      <packagereq type="optional">aterm</packagereq>
      <packagereq type="optional">Canna</packagereq>
      <packagereq type="optional">dejavu-fonts</packagereq>
      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
      <packagereq type="optional">efont-unicode-bdf</packagereq>
      <packagereq type="optional">FreeWnn</packagereq>
      <packagereq type="optional">kinput2</packagereq>
      <packagereq type="optional">lineak-defaultplugin</packagereq>
      <packagereq type="optional">lineak-xosdplugin</packagereq>
      <packagereq type="optional">lineakd</packagereq>
      <packagereq type="optional">rss-glx</packagereq>
      <packagereq type="optional">rss-glx-xscreensaver</packagereq>
      <packagereq type="optional">rxvt</packagereq>
      <packagereq type="optional">workrave</packagereq>
      <packagereq type="optional">xdaliclock</packagereq>
      <packagereq type="optional">xkeycaps</packagereq>
      <packagereq type="optional">xlockmore</packagereq>
      <packagereq type="optional">xscreensaver-base</packagereq>
      <packagereq type="optional">xscreensaver-extras</packagereq>
      <packagereq type="optional">xscreensaver-gl-extras</packagereq>
    </packagelist>
  </group>
  <group>
    <id>czech-support</id>
    <_name>Czech Support</_name>
    <_description>This group is a collection of tools and resources of Czech environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-dict-cs_CZ</packagereq>
    </packagelist>
  </group>
  <group>
    <id>development-tools</id>
    <_name>Development Tools</_name>
    <_description>These tools include core development tools such as automake, gcc, perl, python, and debuggers.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abicheck</packagereq>
      <packagereq type="optional">alleyoop</packagereq>
      <packagereq type="optional">aplus-fsf</packagereq>
      <packagereq type="optional">archmage</packagereq>
      <packagereq type="optional">asa</packagereq>
      <packagereq type="optional">bazaar</packagereq>
      <packagereq type="optional">bigloo</packagereq>
      <packagereq type="optional">bzr</packagereq>
      <packagereq type="optional">ccache</packagereq>
      <packagereq type="optional">clips</packagereq>
      <packagereq type="optional">clips-doc</packagereq>
      <packagereq type="optional">clips-xclips</packagereq>
      <packagereq type="optional">clisp</packagereq>
      <packagereq type="optional">cmake</packagereq>
      <packagereq type="optional">codeblocks</packagereq>
      <packagereq type="optional">cogito</packagereq>
      <packagereq type="optional">colordiff</packagereq>
      <packagereq type="optional">cpan2rpm</packagereq>
      <packagereq type="optional">cpanspec</packagereq>
      <packagereq type="optional">cppunit</packagereq>
      <packagereq type="optional">cproto</packagereq>
      <packagereq type="optional">curry</packagereq>
      <packagereq type="optional">cvs2cl</packagereq>
      <packagereq type="optional">cvs2svn</packagereq>
      <packagereq type="optional">cvsgraph</packagereq>
      <packagereq type="optional">cvsplot</packagereq>
      <packagereq type="optional">cvsps</packagereq>
      <packagereq type="optional">cvsweb</packagereq>
      <packagereq type="optional">darcs</packagereq>
      <packagereq type="optional">epydoc</packagereq>
      <packagereq type="optional">erlang</packagereq>
      <packagereq type="optional">flasm</packagereq>
      <packagereq type="optional">fpc</packagereq>
      <packagereq type="optional">ftnchek</packagereq>
      <packagereq type="optional">gauche</packagereq>
      <packagereq type="optional">gforth</packagereq>
      <packagereq type="optional">ghc</packagereq>
      <packagereq type="optional">git</packagereq>
      <packagereq type="optional">gphpedit</packagereq>
      <packagereq type="optional">gprolog</packagereq>
      <packagereq type="optional">gpsim</packagereq>
      <packagereq type="optional">gputils</packagereq>
      <packagereq type="optional">haddock</packagereq>
      <packagereq type="optional">highlight</packagereq>
      <packagereq type="optional">hugs98</packagereq>
      <packagereq type="optional">ipython</packagereq>
      <packagereq type="optional">jam</packagereq>
      <packagereq type="optional">kuipc</packagereq>
      <packagereq type="optional">lcov</packagereq>
      <packagereq type="optional">lightning</packagereq>
      <packagereq type="optional">lincvs</packagereq>
      <packagereq type="optional">lua</packagereq>
      <packagereq type="optional">mach</packagereq>
      <packagereq type="optional">mcrypt</packagereq>
      <packagereq type="optional">meld</packagereq>
      <packagereq type="optional">mercurial</packagereq>
      <packagereq type="optional">mock</packagereq>
      <packagereq type="optional">monotone</packagereq>
      <packagereq type="optional">nqc</packagereq>
      <packagereq type="optional">ocaml</packagereq>
      <packagereq type="optional">oorexx</packagereq>
      <packagereq type="optional">patchy</packagereq>
      <packagereq type="optional">perltidy</packagereq>
      <packagereq type="optional">pgadmin3</packagereq>
      <packagereq type="optional">pikdev</packagereq>
      <packagereq type="optional">pl</packagereq>
      <packagereq type="optional">plt-scheme</packagereq>
      <packagereq type="optional">pscan</packagereq>
      <packagereq type="optional">pylint</packagereq>
      <packagereq type="optional">q</packagereq>
      <packagereq type="optional">qgit</packagereq>
      <packagereq type="optional">quilt</packagereq>
      <packagereq type="optional">rapidsvn</packagereq>
      <packagereq type="optional">regexxer</packagereq>
      <packagereq type="optional">rpmdevtools</packagereq>
      <packagereq type="optional">rpmlint</packagereq>
      <packagereq type="optional">smarteiffel</packagereq>
      <packagereq type="optional">splint</packagereq>
      <packagereq type="optional">Sprog</packagereq>
      <packagereq type="optional">srecord</packagereq>
      <packagereq type="optional">svn2cl</packagereq>
      <packagereq type="optional">svnmailer</packagereq>
      <packagereq type="optional">sysconftool</packagereq>
      <packagereq type="optional">sysprof</packagereq>
      <packagereq type="optional">tkcvs</packagereq>
      <packagereq type="optional">tla</packagereq>
      <packagereq type="optional">tolua++</packagereq>
      <packagereq type="optional">trac</packagereq>
      <packagereq type="optional">ucblogo</packagereq>
      <packagereq type="optional">utrac</packagereq>
      <packagereq type="optional">xbsql</packagereq>
      <packagereq type="optional">xfce4-dev-tools</packagereq>
      <packagereq type="optional">yap</packagereq>
      <packagereq type="optional">yasm</packagereq>
    </packagelist>
  </group>
  <group>
    <id>dialup</id>
    <_name>Dialup Networking Support</_name>
    <description/>
    <default>true</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">pptp</packagereq>
    </packagelist>
  </group>
  <group>
    <id>editors</id>
    <_name>Editors</_name>
    <_description>Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <grouplist>
      <groupreq>base</groupreq>
      <metapkg type="optional">xemacs</metapkg>
    </grouplist>
    <packagelist>
      <packagereq type="optional">gobby</packagereq>
      <packagereq type="optional">jed</packagereq>
      <packagereq type="optional">leafpad</packagereq>
      <packagereq type="optional">nedit</packagereq>
      <packagereq type="optional">poedit</packagereq>
      <packagereq type="optional">scite</packagereq>
      <packagereq type="optional">scribes</packagereq>
      <packagereq type="optional">scribes-templates</packagereq>
      <packagereq type="optional">TeXmacs</packagereq>
    </packagelist>
  </group>
  <group>
    <id>education</id>
    <_name>Educational Software</_name>
    <_description>Educational software for learning</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">childsplay</packagereq>
      <packagereq type="optional">drgeo</packagereq>
      <packagereq type="optional">drgeo-doc</packagereq>
      <packagereq type="optional">gcompris</packagereq>
      <packagereq type="optional">gperiodic</packagereq>
      <packagereq type="optional">gtypist</packagereq>
      <packagereq type="optional">stellarium</packagereq>
      <packagereq type="optional">tuxtype2</packagereq>
    </packagelist>
  </group>
  <group>
    <id>engineering-and-scientific</id>
    <_name>Engineering and Scientific</_name>
    <_description>This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">atlas</packagereq>
      <packagereq type="optional">blacs</packagereq>
      <packagereq type="optional">blas</packagereq>
      <packagereq type="optional">cdo</packagereq>
      <packagereq type="optional">cernlib-utils</packagereq>
      <packagereq type="optional">dx</packagereq>
      <packagereq type="optional">dx-samples</packagereq>
      <packagereq type="optional">galculator</packagereq>
      <packagereq type="optional">gdl</packagereq>
      <packagereq type="optional">geant321</packagereq>
      <packagereq type="optional">genius</packagereq>	
      <packagereq type="optional">geda-docs</packagereq>
      <packagereq type="optional">geda-example</packagereq>
      <packagereq type="optional">geda-gattrib</packagereq>
      <packagereq type="optional">geda-gnetlist</packagereq>
      <packagereq type="optional">geda-gschem</packagereq>
      <packagereq type="optional">geda-gsymcheck</packagereq>
      <packagereq type="optional">geda-symbols</packagereq>
      <packagereq type="optional">geda-utils</packagereq>
      <packagereq type="optional">ghdl</packagereq>
      <packagereq type="optional">gnucap</packagereq>
      <packagereq type="optional">gpredict</packagereq>
      <packagereq type="optional">grads</packagereq>
      <packagereq type="optional">gresistor</packagereq>
      <packagereq type="optional">gtkwave</packagereq>
      <packagereq type="optional">gts</packagereq>
      <packagereq type="optional">harminv</packagereq>
      <packagereq type="optional">hdf</packagereq>
      <packagereq type="optional">hdf5</packagereq>
      <packagereq type="optional">hmmer</packagereq>
      <packagereq type="optional">kicad</packagereq>
      <packagereq type="optional">kpolynome</packagereq>
      <packagereq type="optional">kst</packagereq>
      <packagereq type="optional">lagan</packagereq>
      <packagereq type="optional">lapack</packagereq>
      <packagereq type="optional">libctl</packagereq>
      <packagereq type="optional">libmatheval</packagereq>
      <packagereq type="optional">ncarg</packagereq>
      <packagereq type="optional">nco</packagereq>
      <packagereq type="optional">ncview</packagereq>
      <packagereq type="optional">netcdf</packagereq>
      <packagereq type="optional">ngspice</packagereq>
      <packagereq type="optional">numpy</packagereq>
      <packagereq type="optional">octave</packagereq>
      <packagereq type="optional">octave-forge</packagereq>
      <packagereq type="optional">openbabel</packagereq>
      <packagereq type="optional">orpie</packagereq>
      <packagereq type="optional">osiv</packagereq>
      <packagereq type="optional">paraview</packagereq>
      <packagereq type="optional">paw</packagereq>
      <packagereq type="optional">pcb</packagereq>
      <packagereq type="optional">plotutils</packagereq>
      <packagereq type="optional">qalculate-gtk</packagereq>
      <packagereq type="optional">qalculate-kde</packagereq>
      <packagereq type="optional">qcad</packagereq>
      <packagereq type="optional">qucs</packagereq>
      <packagereq type="optional">R</packagereq>
      <packagereq type="optional">R-gnomeGUI</packagereq>
      <packagereq type="optional">rrdtool</packagereq>
      <packagereq type="optional">scalapack</packagereq>
      <packagereq type="optional">scrip</packagereq>
      <packagereq type="optional">SIBsim4</packagereq>
      <packagereq type="optional">veusz</packagereq>
      <packagereq type="optional">xcircuit</packagereq>
      <packagereq type="optional">xdrawchem</packagereq>
    </packagelist>
  </group>
  <group>
    <id>ftp-server</id>
    <_name>FTP Server</_name>
    <_description>These tools allow you to run an FTP server on the system.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">proftpd</packagereq>
      <packagereq type="optional">pure-ftpd</packagereq>
    </packagelist>
  </group>
  <group>
    <id>games</id>
    <_name>Games and Entertainment</_name>
    <_description>Various ways to relax and spend your free time.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abe</packagereq>
      <packagereq type="optional">abuse</packagereq>
      <packagereq type="optional">atomix</packagereq>
      <packagereq type="optional">auriferous</packagereq>
      <packagereq type="optional">ballbuster</packagereq>
      <packagereq type="optional">blobwars</packagereq>
      <packagereq type="optional">bsd-games</packagereq>
      <packagereq type="optional">bygfoot</packagereq>
      <packagereq type="optional">bzflag</packagereq>
      <packagereq type="optional">celestia</packagereq>
      <packagereq type="optional">cgoban</packagereq>
      <packagereq type="optional">chess</packagereq>
      <packagereq type="optional">clanbomber</packagereq>
      <packagereq type="optional">crack-attack</packagereq>
      <packagereq type="optional">crossfire-client</packagereq>
      <packagereq type="optional">crystal-stacker</packagereq>
      <packagereq type="optional">crystal-stacker-themes</packagereq>
      <packagereq type="optional">csmash</packagereq>
      <packagereq type="optional">enigma</packagereq>
      <packagereq type="optional">fbg</packagereq>
      <packagereq type="optional">fillets-ng</packagereq>
      <packagereq type="optional">foobillard</packagereq>
      <packagereq type="optional">fortune-mod</packagereq>
      <packagereq type="optional">fRaBs</packagereq>
      <packagereq type="optional">freeciv</packagereq>
      <packagereq type="optional">freedoom</packagereq>
      <packagereq type="optional">freedroid</packagereq>
      <packagereq type="optional">freedroidrpg</packagereq>
      <packagereq type="optional">frozen-bubble</packagereq>
      <packagereq type="optional">gl-117</packagereq>
      <packagereq type="optional">gnofract4d</packagereq>
      <packagereq type="optional">gnome-sudoku</packagereq>
      <packagereq type="optional">gnubg</packagereq>
      <packagereq type="optional">gnuchess</packagereq>
      <packagereq type="optional">gnugo</packagereq>
      <packagereq type="optional">grhino</packagereq>
      <packagereq type="optional">gweled</packagereq>
      <packagereq type="optional">lacewing</packagereq>
      <packagereq type="optional">lincity-ng</packagereq>
      <packagereq type="optional">lmarbles</packagereq>
      <packagereq type="optional">lucidlife</packagereq>
      <packagereq type="optional">Maelstrom</packagereq>
      <packagereq type="optional">magicor</packagereq>
      <packagereq type="optional">manaworld</packagereq>
      <packagereq type="optional">mirrormagic</packagereq>
      <packagereq type="optional">monkey-bubble</packagereq>
      <packagereq type="optional">monsterz</packagereq>
      <packagereq type="optional">nazghul</packagereq>
      <packagereq type="optional">nazghul-haxima</packagereq>
      <packagereq type="optional">nethack</packagereq>
      <packagereq type="optional">nethack-vultures</packagereq>
      <packagereq type="optional">netpanzer</packagereq>
      <packagereq type="optional">neverball</packagereq>
      <packagereq type="optional">nexuiz</packagereq>
      <packagereq type="optional">njam</packagereq>
      <packagereq type="optional">oneko</packagereq>
      <packagereq type="optional">overgod</packagereq>
      <packagereq type="optional">pengupop</packagereq>
      <packagereq type="optional">pinball</packagereq>
      <packagereq type="optional">pingus</packagereq>
      <packagereq type="optional">pipenightdreams</packagereq>
      <packagereq type="optional">powermanga</packagereq>
      <packagereq type="optional">ppracer</packagereq>
      <packagereq type="optional">qascade</packagereq>
      <packagereq type="optional">qgo</packagereq>
      <packagereq type="optional">qqo</packagereq>
      <packagereq type="optional">rafkill</packagereq>
      <packagereq type="optional">raidem</packagereq>
      <packagereq type="optional">rocksndiamonds</packagereq>
      <packagereq type="optional">rogue</packagereq>
      <packagereq type="optional">scorched3d</packagereq>
      <packagereq type="optional">shippy</packagereq>
      <packagereq type="optional">sirius</packagereq>
      <packagereq type="optional">sopwith</packagereq>
      <packagereq type="optional">starfighter</packagereq>
      <packagereq type="optional">sturmbahnfahrer</packagereq>
      <packagereq type="optional">supertux</packagereq>
      <packagereq type="optional">supertuxkart</packagereq>
      <packagereq type="optional">tong</packagereq>
      <packagereq type="optional">torcs</packagereq>
      <packagereq type="optional">trackballs</packagereq>
      <packagereq type="optional">trackballs-music</packagereq>
      <packagereq type="optional">tremulous</packagereq>
      <packagereq type="optional">tuxpuck</packagereq>
      <packagereq type="optional">ularn</packagereq>
      <packagereq type="optional">uqm</packagereq>
      <packagereq type="optional">viruskiller</packagereq>
      <packagereq type="optional">wesnoth</packagereq>
      <packagereq type="optional">worminator</packagereq>
      <packagereq type="optional">wormux</packagereq>
      <packagereq type="optional">xaos</packagereq>
      <packagereq type="optional">xarchon</packagereq>
      <packagereq type="optional">xboard</packagereq>
      <packagereq type="optional">xgalaxy</packagereq>
      <packagereq type="optional">xmoto</packagereq>
      <packagereq type="optional">xpilot-ng</packagereq>
      <packagereq type="optional">xplanet</packagereq>
      <packagereq type="optional">xscorch</packagereq>
      <packagereq type="optional">zasx</packagereq>
    </packagelist>
  </group>
  <group>
    <id>gnome-desktop</id>
    <_name>GNOME Desktop Environment</_name>
    <_description>GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">alacarte</packagereq>
      <packagereq type="optional">brightside</packagereq>
      <packagereq type="optional">buoh</packagereq>
      <packagereq type="optional">byzanz</packagereq>
      <packagereq type="optional">deskbar-applet</packagereq>
      <packagereq type="optional">gdesklets</packagereq>
      <packagereq type="optional">glipper</packagereq>
      <packagereq type="optional">glunarclock</packagereq>
      <packagereq type="optional">gmpc</packagereq>
      <packagereq type="optional">gnochm</packagereq>
      <packagereq type="optional">gnome-applet-netspeed</packagereq>
      <packagereq type="optional">gnome-applet-rhythmbox</packagereq>
      <packagereq type="optional">gnome-applet-sensors</packagereq>
      <packagereq type="optional">gnome-applet-timer</packagereq>
      <packagereq type="optional">gnome-theme-clearlooks-bigpack</packagereq>
      <packagereq type="optional">gnome-themes-extras</packagereq>
      <packagereq type="optional">gnotime</packagereq>
      <packagereq type="optional">gtweakui</packagereq>
      <packagereq type="optional">istanbul</packagereq>
      <packagereq type="optional">lock-keys-applet</packagereq>
      <packagereq type="optional">nautilus-actions</packagereq>
      <packagereq type="optional">nautilus-flac-converter</packagereq>
      <packagereq type="optional">nautilus-image-converter</packagereq>
      <packagereq type="optional">nautilus-open-terminal</packagereq>
      <packagereq type="optional">nautilus-search-tool</packagereq>
      <packagereq type="optional">rss-glx-gnome-screensaver</packagereq>
      <packagereq type="optional">sabayon</packagereq>
      <packagereq type="optional">seahorse</packagereq>
      <packagereq type="optional">smeg</packagereq>
      <packagereq type="optional">themes-backgrounds-gnome</packagereq>
      <packagereq type="optional">verbiste-gnome</packagereq>
      <packagereq type="optional">wallpapoz</packagereq>
      <packagereq type="optional">wp_tray</packagereq>
      <packagereq type="optional">xscreensaver-extras-gss</packagereq>
      <packagereq type="optional">xscreensaver-gl-extras-gss</packagereq>
    </packagelist>
  </group>
  <group>
    <id>gnome-software-development</id>
    <_name>GNOME Software Development</_name>
    <_description>Install these packages in order to develop GTK+ and GNOME graphical applications.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">anjuta</packagereq>
      <packagereq type="optional">anjuta-docs</packagereq>
      <packagereq type="optional">at-poke</packagereq>
      <packagereq type="optional">bakery-devel</packagereq>
      <packagereq type="optional">bit-devel</packagereq>
      <packagereq type="optional">bitgtkmm-devel</packagereq>
      <packagereq type="optional">cairomm-devel</packagereq>
      <packagereq type="optional">conexus-devel</packagereq>
      <packagereq type="optional">conexusmm-devel</packagereq>
      <packagereq type="optional">gazpacho</packagereq>
      <packagereq type="optional">gconfmm26-devel</packagereq>
      <packagereq type="optional">glibmm24-devel</packagereq>
      <packagereq type="optional">gnome-common</packagereq>
      <packagereq type="optional">gnome-python2-gda-devel</packagereq>
      <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
      <packagereq type="optional">gquilt</packagereq>
      <packagereq type="optional">gtk+extra</packagereq>
      <packagereq type="optional">gtk2hs</packagereq>
      <packagereq type="optional">gtkalog</packagereq>
      <packagereq type="optional">gtkdatabox</packagereq>
      <packagereq type="optional">gtkmm24-devel</packagereq>
      <packagereq type="optional">libglademm24-devel</packagereq>
      <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
      <packagereq type="optional">libgnomemm26-devel</packagereq>
      <packagereq type="optional">libgnomeuimm26-devel</packagereq>
      <packagereq type="optional">libsexy-devel</packagereq>
      <packagereq type="optional">libsexymm-devel</packagereq>
      <packagereq type="optional">libsigc++20-devel</packagereq>
      <packagereq type="optional">papyrus-devel</packagereq>
      <packagereq type="optional">plotmm-devel</packagereq>
    </packagelist>
  </group>
  <group>
    <id>graphical-internet</id>
    <_name>Graphical Internet</_name>
    <_description>This group includes graphical email, Web, and chat clients.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">amsn</packagereq>
      <packagereq type="optional">apollon</packagereq>
      <packagereq type="optional">azureus</packagereq>
      <packagereq type="optional">balsa</packagereq>
      <packagereq type="optional">bittorrent-gui</packagereq>
      <packagereq type="optional">blogtk</packagereq>
      <packagereq type="optional">bluefish</packagereq>
      <packagereq type="optional">contact-lookup-applet</packagereq>
      <packagereq type="optional">d4x</packagereq>
      <packagereq type="optional">deskbar-applet</packagereq>
      <packagereq type="optional">dillo</packagereq>
      <packagereq type="optional">drivel</packagereq>
      <packagereq type="optional">evolution-bogofilter</packagereq>
      <packagereq type="optional">fwbuilder</packagereq>
      <packagereq type="optional">gajim</packagereq>
      <packagereq type="optional">galeon</packagereq>
      <packagereq type="optional">gg2</packagereq>
      <packagereq type="optional">gnome-blog</packagereq>
      <packagereq type="optional">gnome-ppp</packagereq>
      <packagereq type="optional">gnome-telnet</packagereq>
      <packagereq type="optional">gnome-translate</packagereq>
      <packagereq type="optional">gnubiff</packagereq>
      <packagereq type="optional">gossip</packagereq>
      <packagereq type="optional">gtk-gnutella</packagereq>
      <packagereq type="optional">gtorrentviewer</packagereq>
      <packagereq type="optional">gwget</packagereq>
      <packagereq type="optional">jd</packagereq>
      <packagereq type="optional">kadu</packagereq>
      <packagereq type="optional">kickpim</packagereq>
      <packagereq type="optional">kita</packagereq>
      <packagereq type="optional">knetstats</packagereq>
      <packagereq type="optional">konversation</packagereq>
      <packagereq type="optional">kphone</packagereq>
      <packagereq type="optional">licq</packagereq>
      <packagereq type="optional">liferea</packagereq>
      <packagereq type="optional">linphone</packagereq>
      <packagereq type="optional">logjam</packagereq>
      <packagereq type="optional">mail-notification</packagereq>
      <packagereq type="optional">ochusha</packagereq>
      <packagereq type="optional">pan</packagereq>
      <packagereq type="optional">prozilla</packagereq>
      <packagereq type="optional">psi</packagereq>
      <packagereq type="optional">putty</packagereq>
      <packagereq type="optional">rssowl</packagereq>
      <packagereq type="optional">screem</packagereq>
      <packagereq type="optional">streamtuner</packagereq>
      <packagereq type="optional">sylpheed</packagereq>
      <packagereq type="optional">sylpheed-claws</packagereq>
      <packagereq type="optional">transmission</packagereq>
      <packagereq type="optional">twinkle</packagereq>
      <packagereq type="optional">valknut</packagereq>
      <packagereq type="optional">x3270-x11</packagereq>
      <packagereq type="optional">xchat-gnome</packagereq>
    </packagelist>
  </group>
  <group>
    <id>graphics</id>
    <_name>Graphics</_name>
    <_description>This group includes packages to help you manipulate and scan images.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">agave</packagereq>
      <packagereq type="optional">asymptote</packagereq>
      <packagereq type="optional">blender</packagereq>
      <packagereq type="optional">comix</packagereq>
      <packagereq type="optional">digikam</packagereq>
      <packagereq type="optional">fontforge</packagereq>
      <packagereq type="optional">fyre</packagereq>
      <packagereq type="optional">gpp</packagereq>
      <packagereq type="optional">gqview</packagereq>
      <packagereq type="optional">graphviz</packagereq>
      <packagereq type="optional">gv</packagereq>
      <packagereq type="optional">gwenview</packagereq>
      <packagereq type="optional">inkscape</packagereq>
      <packagereq type="optional">ipe</packagereq>
      <packagereq type="optional">k3d</packagereq>
      <packagereq type="optional">optipng</packagereq>
      <packagereq type="optional">pstoedit</packagereq>
      <packagereq type="optional">pydot</packagereq>
      <packagereq type="optional">qiv</packagereq>
      <packagereq type="optional">rawstudio</packagereq>
      <packagereq type="optional">renrot</packagereq>
      <packagereq type="optional">showimg</packagereq>
      <packagereq type="optional">skencil</packagereq>
      <packagereq type="optional">sodipodi</packagereq>
      <packagereq type="optional">tuxpaint</packagereq>
      <packagereq type="optional">ufraw</packagereq>
      <packagereq type="optional">wings</packagereq>
    </packagelist>
  </group>
  <group>
    <id>hardware-support</id>
    <_name>Hardware Support</_name>
    <_description>This group is a collection of tools for various hardware specific utilities.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">acpi</packagereq>
      <packagereq type="optional">acpitool</packagereq>
      <packagereq type="optional">gpsd</packagereq>
      <packagereq type="optional">gpsd-clients</packagereq>
      <packagereq type="optional">hddtemp</packagereq>
      <packagereq type="optional">i810switch</packagereq>
      <packagereq type="optional">i8kutils</packagereq>
      <packagereq type="optional">libifp</packagereq>
      <packagereq type="optional">lsscsi</packagereq>
      <packagereq type="optional">openct</packagereq>
      <packagereq type="optional">opensc</packagereq>
      <packagereq type="optional">s3switch</packagereq>
      <packagereq type="optional">tpb</packagereq>
    </packagelist>
  </group>
  <group>
    <id>hebrew-support</id>
    <_name>Hebrew Support</_name>
    <_description>This group is a collection of tools and resources of Hebrew environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">dejavu-fonts</packagereq>
      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
    </packagelist>
  </group>
  <group>
    <id>japanese-support</id>
    <_name>Japanese Support</_name>
    <_description>This group is a collection of tools and resources of Japanese environments.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">scim-input-pad</packagereq>
      <packagereq type="optional">scim-skk</packagereq>
      <packagereq type="optional">scim-tomoe</packagereq>
    </packagelist>
  </group>
  <group>
    <id>java</id>
    <_name>Java</_name>
    <_description>Support for running programs written in the Java programming language.</_description>
    <default>true</default>
    <uservisible>false</uservisible>
    <packagelist>
      <packagereq type="optional">jikes</packagereq>
    </packagelist>
  </group>
  <group>
    <id>java-development</id>
    <_name>Java Development</_name>
    <_description>Support for developing programs in the Java programming language.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">jlint</packagereq>
    </packagelist>
  </group>
  <group>
    <id>kde-desktop</id>
    <_name>KDE (K Desktop Environment)</_name>
    <_description>KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">basket</packagereq>
      <packagereq type="optional">crystal</packagereq>
      <packagereq type="optional">katapult</packagereq>
      <packagereq type="optional">kbackup</packagereq>
      <packagereq type="optional">kbibtex</packagereq>
      <packagereq type="optional">kchmviewer</packagereq>
      <packagereq type="optional">kdissert</packagereq>
      <packagereq type="optional">kdmtheme</packagereq>
      <packagereq type="optional">kerry</packagereq>
      <packagereq type="optional">kickpim</packagereq>
      <packagereq type="optional">kiosktool</packagereq>
      <packagereq type="optional">klamav</packagereq>
      <packagereq type="optional">kmenu-gnome</packagereq>
      <packagereq type="optional">kmobiletools</packagereq>
      <packagereq type="optional">kmymoney2</packagereq>
      <packagereq type="optional">knemo</packagereq>
      <packagereq type="optional">knetworkmanager</packagereq>
      <packagereq type="optional">kompose</packagereq>
      <packagereq type="optional">kooldock</packagereq>
      <packagereq type="optional">krecipes</packagereq>
      <packagereq type="optional">krusader</packagereq>
      <packagereq type="optional">ksensors</packagereq>
      <packagereq type="optional">kshutdown</packagereq>
      <packagereq type="optional">ksynaptics</packagereq>
      <packagereq type="optional">ktorrent</packagereq>
      <packagereq type="optional">kyum</packagereq>
      <packagereq type="optional">lineak-kdeplugins</packagereq>
      <packagereq type="optional">metamonitor</packagereq>
      <packagereq type="optional">oooqs2</packagereq>
      <packagereq type="optional">rekall</packagereq>
      <packagereq type="optional">rsibreak</packagereq>
      <packagereq type="optional">rss-glx-kde</packagereq>
      <packagereq type="optional">smb4k</packagereq>
    </packagelist>
  </group>
  <group>
    <id>kde-software-development</id>
    <_name>KDE Software Development</_name>
    <_description>Install these packages to develop QT and KDE graphical applications.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">gambas</packagereq>
      <packagereq type="optional">kdesvn</packagereq>
    </packagelist>
  </group>
  <group>
    <id>mail-server</id>
    <_name>Mail Server</_name>
    <_description>These packages allow you to configure an IMAP or SMTP mail server.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">amavisd-new</packagereq>
      <packagereq type="optional">clamav</packagereq>
      <packagereq type="optional">clamav-data</packagereq>
      <packagereq type="optional">clamav-milter</packagereq>
      <packagereq type="optional">crm114</packagereq>
      <packagereq type="optional">cyrus-imapd</packagereq>
      <packagereq type="optional">enemies-of-carlotta</packagereq>
      <packagereq type="optional">esmtp</packagereq>
      <packagereq type="optional">exim</packagereq>
      <packagereq type="optional">exim-doc</packagereq>
      <packagereq type="optional">milter-regex</packagereq>
      <packagereq type="optional">mlmmj</packagereq>
      <packagereq type="optional">perl-Cyrus</packagereq>
      <packagereq type="optional">pyzor</packagereq>
      <packagereq type="optional">spamass-milter</packagereq>
    </packagelist>
  </group>
  <group>
    <id>network-server</id>
    <_name>Network Servers</_name>
    <_description>This group is a collection of network servers for specific purposes</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">ctrlproxy</packagereq>
      <packagereq type="optional">dnsmasq</packagereq>
      <packagereq type="optional">ejabberd</packagereq>
      <packagereq type="optional">flumotion</packagereq>
      <packagereq type="optional">freenx</packagereq>
      <packagereq type="optional">icecast</packagereq>
      <packagereq type="optional">ipxripd</packagereq>
      <packagereq type="optional">ircd-hybrid</packagereq>
      <packagereq type="optional">jabberd</packagereq>
      <packagereq type="optional">kannel</packagereq>
      <packagereq type="optional">l2tpd</packagereq>
      <packagereq type="optional">NetworkManager-vpnc</packagereq>
      <packagereq type="optional">nsd</packagereq>
      <packagereq type="optional">oidentd</packagereq>
      <packagereq type="optional">openvpn</packagereq>
      <packagereq type="optional">puppet-server</packagereq>
      <packagereq type="optional">rbldnsd</packagereq>
      <packagereq type="optional">rinetd</packagereq>
      <packagereq type="optional">sobby</packagereq>
      <packagereq type="optional">torque-server</packagereq>
      <packagereq type="optional">ucarp</packagereq>
      <packagereq type="optional">ushare</packagereq>
      <packagereq type="optional">vnc-reflector</packagereq>
    </packagelist>
  </group>
  <group>
    <id>news-server</id>
    <_name>News Server</_name>
    <_description>This group allows you to configure the system as a news server.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">leafnode</packagereq>
      <packagereq type="optional">newscache</packagereq>
      <packagereq type="optional">suck</packagereq>
    </packagelist>
  </group>
  <group>
    <id>office</id>
    <_name>Office/Productivity</_name>
    <_description>The applications include office suites, PDF viewers, and more.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abiword</packagereq>
      <packagereq type="optional">aiksaurus-gtk</packagereq>
      <packagereq type="optional">contacts</packagereq>
      <packagereq type="optional">dates</packagereq>
      <packagereq type="optional">dia</packagereq>
      <packagereq type="optional">gdeskcal</packagereq>
      <packagereq type="optional">glabels</packagereq>
      <packagereq type="optional">glom</packagereq>
      <packagereq type="optional">gnotime</packagereq>
      <packagereq type="optional">gnumeric</packagereq>
      <packagereq type="optional">gramps</packagereq>
      <packagereq type="optional">grisbi</packagereq>
      <packagereq type="optional">gsview</packagereq>
      <packagereq type="optional">hnb</packagereq>
      <packagereq type="optional">koffice-suite</packagereq>
      <packagereq type="optional">krecipes</packagereq>
      <packagereq type="optional">lyx</packagereq>
      <packagereq type="optional">notecase</packagereq>
      <packagereq type="optional">notemeister</packagereq>
      <packagereq type="optional">pybliographer</packagereq>
      <packagereq type="optional">qa-assistant</packagereq>
      <packagereq type="optional">qcad</packagereq>
      <packagereq type="optional">revelation</packagereq>
      <packagereq type="optional">taskjuggler</packagereq>
      <packagereq type="optional">texmaker</packagereq>
      <packagereq type="optional">tinyerp</packagereq>
      <packagereq type="optional">tinyerp-server</packagereq>
      <packagereq type="optional">xchm</packagereq>
    </packagelist>
  </group>
  <group>
    <id>sound-and-video</id>
    <_name>Sound and Video</_name>
    <_description>From CD recording to playing audio CDs and multimedia files, this package group allows you to work with sound and video on the system.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abcde</packagereq>
      <packagereq type="optional">adplay</packagereq>
      <packagereq type="optional">akode</packagereq>
      <packagereq type="optional">alsamixergui</packagereq>
      <packagereq type="optional">amarok</packagereq>
      <packagereq type="optional">audacity</packagereq>
      <packagereq type="optional">bin2iso</packagereq>
      <packagereq type="optional">bmp</packagereq>
      <packagereq type="optional">brasero</packagereq>
      <packagereq type="optional">camE</packagereq>
      <packagereq type="optional">cdlabelgen</packagereq>
      <packagereq type="optional">dvdisaster</packagereq>
      <packagereq type="optional">easytag</packagereq>
      <packagereq type="optional">gcdmaster</packagereq>
      <packagereq type="optional">gcfilms</packagereq>
      <packagereq type="optional">gcombust</packagereq>
      <packagereq type="optional">glrellmms</packagereq>
      <packagereq type="optional">gnomad2</packagereq>
      <packagereq type="optional">gnomebaker</packagereq>
      <packagereq type="optional">gnomeradio</packagereq>
      <packagereq type="optional">graveman</packagereq>
      <packagereq type="optional">grip</packagereq>
      <packagereq type="optional">id3v2</packagereq>
      <packagereq type="optional">jack-audio-connection-kit</packagereq>
      <packagereq type="optional">kid3</packagereq>
      <packagereq type="optional">kover</packagereq>
      <packagereq type="optional">libvisual-plugins</packagereq>
      <packagereq type="optional">nomadsync</packagereq>
      <packagereq type="optional">regionset</packagereq>
      <packagereq type="optional">rosegarden4</packagereq>
      <packagereq type="optional">soundconverter</packagereq>
      <packagereq type="optional">soundtracker</packagereq>
      <packagereq type="optional">sweep</packagereq>
      <packagereq type="optional">tagtool</packagereq>
      <packagereq type="optional">tclabc</packagereq>
      <packagereq type="optional">ushare</packagereq>
      <packagereq type="optional">vdr</packagereq>
      <packagereq type="optional">wmix</packagereq>
      <packagereq type="optional">xmms</packagereq>
      <packagereq type="optional">xmms-adplug</packagereq>
      <packagereq type="optional">xmms-cdread</packagereq>
      <packagereq type="optional">xmms-flac</packagereq>
    </packagelist>
  </group>
  <group>
    <id>system-tools</id>
    <_name>System Tools</_name>
    <_description>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.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">aide</packagereq>
      <packagereq type="optional">airsnort</packagereq>
      <packagereq type="optional">apcupsd</packagereq>
      <packagereq type="optional">apg</packagereq>
      <packagereq type="optional">apt</packagereq>
      <packagereq type="optional">arc</packagereq>
      <packagereq type="optional">arj</packagereq>
      <packagereq type="optional">bochs</packagereq>
      <packagereq type="optional">cabextract</packagereq>
      <packagereq type="optional">cfengine</packagereq>
      <packagereq type="optional">chrpath</packagereq>
      <packagereq type="optional">conman</packagereq>
      <packagereq type="optional">connect-proxy</packagereq>
      <packagereq type="optional">convmv</packagereq>
      <packagereq type="optional">crack</packagereq>
      <packagereq type="optional">denyhosts</packagereq>
      <packagereq type="optional">dkms</packagereq>
      <packagereq type="optional">ebtables</packagereq>
      <packagereq type="optional">ed2k_hash</packagereq>
      <packagereq type="optional">emelfm2</packagereq>
      <packagereq type="optional">enca</packagereq>
      <packagereq type="optional">environment-modules</packagereq>
      <packagereq type="optional">epylog</packagereq>
      <packagereq type="optional">fatsort</packagereq>
      <packagereq type="optional">fcron</packagereq>
      <packagereq type="optional">fedora-package-config-apt</packagereq>
      <packagereq type="optional">fedora-package-config-smart</packagereq>
      <packagereq type="optional">foremost</packagereq>
      <packagereq type="optional">freeze</packagereq>
      <packagereq type="optional">fuse</packagereq>
      <packagereq type="optional">fwbuilder</packagereq>
      <packagereq type="optional">fwrestart</packagereq>
      <packagereq type="optional">ganglia</packagereq>
      <packagereq type="optional">ghasher</packagereq>
      <packagereq type="optional">ghex</packagereq>
      <packagereq type="optional">gkrellm</packagereq>
      <packagereq type="optional">gnokii</packagereq>
      <packagereq type="optional">grepmail</packagereq>
      <packagereq type="optional">gtklp</packagereq>
      <packagereq type="optional">gtkterm</packagereq>
      <packagereq type="optional">gxemul</packagereq>
      <packagereq type="optional">hercules</packagereq>
      <packagereq type="optional">hfsplus-tools</packagereq>
      <packagereq type="optional">ibmonitor</packagereq>
      <packagereq type="optional">inadyn</packagereq>
      <packagereq type="optional">ip6sic</packagereq>
      <packagereq type="optional">isic</packagereq>
      <packagereq type="optional">jfbterm</packagereq>
      <packagereq type="optional">john</packagereq>
      <packagereq type="optional">kdirstat</packagereq>
      <packagereq type="optional">keychain</packagereq>
      <packagereq type="optional">ksmarttray</packagereq>
      <packagereq type="optional">lft</packagereq>
      <packagereq type="optional">lirc</packagereq>
      <packagereq type="optional">lzop</packagereq>
      <packagereq type="optional">mmv</packagereq>
      <packagereq type="optional">moodss</packagereq>
      <packagereq type="optional">moomps</packagereq>
      <packagereq type="optional">munin</packagereq>
      <packagereq type="optional">nagios</packagereq>
      <packagereq type="optional">netgo</packagereq>
      <packagereq type="optional">nfswatch</packagereq>
      <packagereq type="optional">nomarch</packagereq>
      <packagereq type="optional">oddjob</packagereq>
      <packagereq type="optional">p0f</packagereq>
      <packagereq type="optional">p7zip</packagereq>
      <packagereq type="optional">pam_keyring</packagereq>
      <packagereq type="optional">par2cmdline</packagereq>
      <packagereq type="optional">pbzip2</packagereq>
      <packagereq type="optional">powerman</packagereq>
      <packagereq type="optional">puppet</packagereq>
      <packagereq type="optional">pwgen</packagereq>
      <packagereq type="optional">qstat</packagereq>
      <packagereq type="optional">rdiff-backup</packagereq>
      <packagereq type="optional">rootsh</packagereq>
      <packagereq type="optional">rsnapshot</packagereq>
      <packagereq type="optional">sabayon</packagereq>
      <packagereq type="optional">scrub</packagereq>
      <packagereq type="optional">sec</packagereq>
      <packagereq type="optional">shorewall</packagereq>
      <packagereq type="optional">smart</packagereq>
      <packagereq type="optional">smart-gui</packagereq>
      <packagereq type="optional">snort</packagereq>
      <packagereq type="optional">stripesnoop</packagereq>
      <packagereq type="optional">swaks</packagereq>
      <packagereq type="optional">swatch</packagereq>
      <packagereq type="optional">synaptic</packagereq>
      <packagereq type="optional">syslog-ng</packagereq>
      <packagereq type="optional">testdisk</packagereq>
      <packagereq type="optional">tiobench</packagereq>
      <packagereq type="optional">torque-client</packagereq>
      <packagereq type="optional">torque-gui</packagereq>
      <packagereq type="optional">ttywatch</packagereq>
      <packagereq type="optional">unison</packagereq>
      <packagereq type="optional">upx</packagereq>
      <packagereq type="optional">viaideinfo</packagereq>
      <packagereq type="optional">vnstat</packagereq>
      <packagereq type="optional">vpnc</packagereq>
      <packagereq type="optional">wifiroamd</packagereq>
      <packagereq type="optional">wine</packagereq>
      <packagereq type="optional">wlassistant</packagereq>
      <packagereq type="optional">x3270-x11</packagereq>
      <packagereq type="optional">xsupplicant</packagereq>
      <packagereq type="optional">zidrav</packagereq>
    </packagelist>
  </group>
  <group>
    <id>text-internet</id>
    <_name>Text-based Internet</_name>
    <_description>This group includes text-based email, Web, and chat clients. These applications do not require the X Window System.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">abook</packagereq>
      <packagereq type="optional">argus</packagereq>
      <packagereq type="optional">bittorrent</packagereq>
      <packagereq type="optional">centericq</packagereq>
      <packagereq type="optional">cone</packagereq>
      <packagereq type="optional">ctorrent</packagereq>
      <packagereq type="optional">ekg</packagereq>
      <packagereq type="optional">elmo</packagereq>
      <packagereq type="optional">iperf</packagereq>
      <packagereq type="optional">irssi</packagereq>
      <packagereq type="optional">libtranslate</packagereq>
      <packagereq type="optional">mew</packagereq>
      <packagereq type="optional">nail</packagereq>
      <packagereq type="optional">naim</packagereq>
      <packagereq type="optional">ncftp</packagereq>
      <packagereq type="optional">nget</packagereq>
      <packagereq type="optional">ninja</packagereq>
      <packagereq type="optional">nmh</packagereq>
      <packagereq type="optional">pork</packagereq>
      <packagereq type="optional">rtorrent</packagereq>
      <packagereq type="optional">snownews</packagereq>
      <packagereq type="optional">tin</packagereq>
      <packagereq type="optional">xprobe2</packagereq>
      <packagereq type="optional">yafc</packagereq>
    </packagelist>
  </group>
  <group>
    <id>web-development</id>
    <_name>Web Development</_name>
    <_description>These packages are helpful when developing web applications or web pages.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist/>
  </group>
  <group>
    <id>web-server</id>
    <_name>Web Server</_name>
    <_description>These tools allow you to run a Web server on the system.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">apachetop</packagereq>
      <packagereq type="optional">awstats</packagereq>
      <packagereq type="optional">boa</packagereq>
      <packagereq type="optional">dap-server-cgi</packagereq>
      <packagereq type="optional">lighttpd</packagereq>
      <packagereq type="optional">lighttpd-fastcgi</packagereq>
      <packagereq type="optional">mediawiki</packagereq>
      <packagereq type="optional">mod_cband</packagereq>
      <packagereq type="optional">mod_extract_forwarded</packagereq>
      <packagereq type="optional">mod_fcgid</packagereq>
      <packagereq type="optional">mod_geoip</packagereq>
      <packagereq type="optional">mod_security</packagereq>
      <packagereq type="optional">moin</packagereq>
      <packagereq type="optional">moin-latex</packagereq>
      <packagereq type="optional">namazu</packagereq>
      <packagereq type="optional">perl-HTML-Mason</packagereq>
      <packagereq type="optional">perl-Kwiki</packagereq>
      <packagereq type="optional">php-pecl-apc</packagereq>
      <packagereq type="optional">phpldapadmin</packagereq>
      <packagereq type="optional">plone</packagereq>
      <packagereq type="optional">tclhttpd</packagereq>
      <packagereq type="optional">thttpd</packagereq>
      <packagereq type="optional">TurboGears</packagereq>
      <packagereq type="optional">zope</packagereq>
    </packagelist>
  </group>
  <group>
    <id>window-managers</id>
    <_name>Window Managers</_name>
    <_description>Simple window managers that aren't part of a larger desktop environment.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">bbkeys</packagereq>
      <packagereq type="optional">blackbox</packagereq>
      <packagereq type="optional">fluxbox</packagereq>
      <packagereq type="optional">fluxconf</packagereq>
      <packagereq type="optional">hackedbox</packagereq>
      <packagereq type="optional">obconf</packagereq>
      <packagereq type="optional">obmenu</packagereq>
      <packagereq type="optional">openbox</packagereq>
      <packagereq type="optional">WindowMaker</packagereq>
      <packagereq type="optional">wmx</packagereq>
      <packagereq type="optional">xcompmgr</packagereq>
    </packagelist>
  </group>
  <group>
    <id>xemacs</id>
    <_name>XEmacs</_name>
    <_description>The XEmacs text editor.</_description>
    <default>false</default>
    <uservisible>false</uservisible>
    <grouplist>
      <groupreq>base</groupreq>
    </grouplist>
    <packagelist>
      <packagereq type="mandatory">xemacs</packagereq>
      <packagereq type="default">xemacs-info</packagereq>
      <packagereq type="default">xemacs-packages-base</packagereq>
      <packagereq type="default">xemacs-packages-extra</packagereq>
      <packagereq type="default">xemacs-packages-extra-info</packagereq>
      <packagereq type="optional">xemacs-el</packagereq>
      <packagereq type="optional">xemacs-nox</packagereq>
      <packagereq type="optional">xemacs-packages-base-el</packagereq>
      <packagereq type="optional">xemacs-packages-extra-el</packagereq>
    </packagelist>
  </group>
  <group>
    <id>xfce-desktop</id>
    <_name>XFCE</_name>
    <_description>A lightweight desktop environment that works well on low end machines.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="mandatory">libxfce4mcs</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-session-engines</packagereq>
      <packagereq type="mandatory">xfdesktop</packagereq>
      <packagereq type="mandatory">xfwm4</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>
      <packagereq type="default">xfce4-mixer</packagereq>
      <packagereq type="default">xfprint</packagereq>
      <packagereq type="optional">mousepad</packagereq>
      <packagereq type="optional">orage</packagereq>
      <packagereq type="optional">Terminal</packagereq>
      <packagereq type="optional">xfce4-battery-plugin</packagereq>
      <packagereq type="optional">xfce4-clipman-plugin</packagereq>
      <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
      <packagereq type="optional">xfce4-datetime-plugin</packagereq>
      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
      <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
      <packagereq type="optional">xfce4-genmon-plugin</packagereq>
      <packagereq type="optional">xfce4-minicmd-plugin</packagereq>
      <packagereq type="optional">xfce4-mount-plugin</packagereq>
      <packagereq type="optional">xfce4-netload-plugin</packagereq>
      <packagereq type="optional">xfce4-notes-plugin</packagereq>
      <packagereq type="optional">xfce4-quicklauncher-plugin</packagereq>
      <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
      <packagereq type="optional">xfce4-sensors-plugin</packagereq>
      <packagereq type="optional">xfce4-systemload-plugin</packagereq>
      <packagereq type="optional">xfce4-taskmanager</packagereq>
      <packagereq type="optional">xfce4-toys</packagereq>
      <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
      <packagereq type="optional">xfce4-weather-plugin</packagereq>
      <packagereq type="optional">xfce4-websearch-plugin</packagereq>
      <packagereq type="optional">xfce4-xkb-plugin</packagereq>
      <packagereq type="optional">xfce4-xmms-plugin</packagereq>
      <packagereq type="optional">xfwm4-themes</packagereq>
    </packagelist>
  </group>
  <group>
    <id>xfce-software-development</id>
    <_name>XFCE Software Development</_name>
    <_description>Install these packages in order to develop GTK+ and XFCE graphical applications.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <grouplist>
      <groupreq>x-software-development</groupreq>
    </grouplist>
    <packagelist>
      <packagereq type="mandatory">glib2-devel</packagereq>
      <packagereq type="mandatory">gtk-doc</packagereq>
      <packagereq type="mandatory">gtk2-devel</packagereq>
      <packagereq type="mandatory">libxfce4mcs-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="default">glade2</packagereq>
      <packagereq type="default">pygtk2-devel</packagereq>
    </packagelist>
  </group>
  <category>
    <id>desktops</id>
    <_name>Desktop Environments</_name>
    <_description>Desktop environments</_description>
    <display_order>10</display_order>
    <grouplist>
      <groupid>xfce-desktop</groupid>
    </grouplist>
  </category>
  <category>
    <id>apps</id>
    <_name>Applications</_name>
    <_description>Applications for a variety of tasks</_description>
    <display_order>20</display_order>
    <grouplist>
      <groupid>education</groupid>
    </grouplist>
  </category>
  <category>
    <id>development</id>
    <_name>Development</_name>
    <_description>Packages which provide functionality for developing and building applications.</_description>
    <display_order>70</display_order>
    <grouplist>
      <groupid>web-development</groupid>
      <groupid>xfce-software-development</groupid>
    </grouplist>
  </category>
  <category>
    <id>servers</id>
    <_name>Servers</_name>
    <_description>Software used for running network servers</_description>
    <display_order>90</display_order>
    <grouplist>
      <groupid>network-server</groupid>
    </grouplist>
  </category>
  <category>
    <id>base-system</id>
    <_name>Base System</_name>
    <_description>Various core pieces of the system.</_description>
    <display_order>99</display_order>
    <grouplist>
      <groupid>hardware-support</groupid>
    </grouplist>
  </category>
</comps>



From fedora-extras-commits at redhat.com  Wed Oct 25 20:11:24 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 25 Oct 2006 13:11:24 -0700
Subject: status-report-scripts parseBZbugList,1.53,1.54
Message-ID: <200610252011.k9PKBO0b004954@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4936

Modified Files:
	parseBZbugList 
Log Message:
Bump for FC6.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- parseBZbugList	18 Oct 2006 13:51:10 -0000	1.53
+++ parseBZbugList	25 Oct 2006 20:11:22 -0000	1.54
@@ -45,7 +45,7 @@
   "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&chfieldto=Now&field0-0-0=blocked&type0-0-0=equals&value0-0-0=163779&ctype=csv";
 # All open FE bug reports
 push @BZ_URLs,
-  "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&version=4&version=5&version=devel&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED&bug_severity=security&bug_severity=high&bug_severity=normal&bug_severity=low&bug_severity=translation&bug_severity=regression&chfieldto=Now&negate0=1&field0-0-0=component&type0-0-0=equals&value0-0-0=Package%20Review&ctype=csv";
+  "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&version=4&version=5&version=6&version=devel&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED&bug_severity=security&bug_severity=high&bug_severity=normal&bug_severity=low&bug_severity=translation&bug_severity=regression&chfieldto=Now&negate0=1&field0-0-0=component&type0-0-0=equals&value0-0-0=Package%20Review&ctype=csv";
 
 my %opt;
 my @options = ( "help", "repourl=s", "o=s", "d=s", "cvs=s",
@@ -55,7 +55,7 @@
 $main::members
   = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt";
 $main::cvsDir = "/export/scratch/extras";
-$main::currel = 5;
+$main::currel = 6;
 $main::firstrel = 1;
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
@@ -1294,7 +1294,8 @@
   }
   print "\n== Duplicated packages in Core and Extras ==\n";
   if ($COUNT_LIST{"commonrelease"} > 0) {
-    print "\nWe have $COUNT_LIST{'commonrelease'} packages duplicated for FC5:\n";
+    my $FC = "FC" . $main::currel;
+    print "\nWe have $COUNT_LIST{'commonrelease'} packages duplicated for $FC:\n";
     &displayPkgListByOwnerWiki($PKG_LIST{"commonrelease"});
   }
   if ($COUNT_LIST{"commondevel"} > 0) {
@@ -1309,7 +1310,8 @@
   }
   print STDERR "\nPackages appearing both in Core and Extras:\n";
   if ($COUNT_LIST{"commonrelease"} > 0) {
-    print STDERR " - $COUNT_LIST{'commonrelease'} packages duplicated for FC5:\n";
+    my $FC = "FC" . $main::currel;
+    print STDERR " - $COUNT_LIST{'commonrelease'} packages duplicated for $FC:\n";
     &displayPkgListByOwnerMail($PKG_LIST{"commonrelease"});
   }
   if ($COUNT_LIST{"commondevel"} > 0) {



From fedora-extras-commits at redhat.com  Wed Oct 25 20:14:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 25 Oct 2006 13:14:08 -0700
Subject: owners owners.list,1.1872,1.1873
Message-ID: <200610252014.k9PKE8jp004989@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4973

Modified Files:
	owners.list 
Log Message:
Fix sorting.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1872
retrieving revision 1.1873
diff -u -r1.1872 -r1.1873
--- owners.list	25 Oct 2006 13:19:50 -0000	1.1872
+++ owners.list	25 Oct 2006 20:13:37 -0000	1.1873
@@ -652,6 +652,7 @@
 Fedora Extras|haddock|Documentation tool for annotated Haskell source code|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
 Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -759,7 +760,6 @@
 Fedora Extras|kasablanca|Graphical FTP client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|katapult|Faster access to applications, bookmarks, and other items|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kbackup|Back up your data in a simple, user friendly way|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 25 20:47:19 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 25 Oct 2006 13:47:19 -0700
Subject: rpms/autogen/devel autogen.spec,1.3,1.4
Message-ID: <200610252047.k9PKlJPX005283@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259

Modified Files:
	autogen.spec 
Log Message:

Rebuild against newer libopts 
 	autogen.spec 



Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/autogen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.spec	21 Oct 2006 11:14:28 -0000	1.3
+++ autogen.spec	25 Oct 2006 20:46:49 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -118,6 +118,9 @@
 %{_libdir}/libguileopts.so
 
 %changelog
+* Wed Oct 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-2
+- rebuild
+
 * Fri Oct 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.8.7-1
 - bump to new version
 



From fedora-extras-commits at redhat.com  Wed Oct 25 21:56:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 25 Oct 2006 14:56:13 -0700
Subject: rpms/numpy/devel numpy-1.0-gfortran.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 numpy.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200610252156.k9PLuDJf008576@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/numpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8550

Modified Files:
	.cvsignore numpy.spec sources 
Added Files:
	numpy-1.0-gfortran.patch 
Log Message:
update to numpy 1.0

numpy-1.0-gfortran.patch:

--- NEW FILE numpy-1.0-gfortran.patch ---
diff -ur numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py numpy-1.0/numpy/distutils/fcompiler/gnu.py
--- numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py	2006-10-09 03:46:59.000000000 -0400
+++ numpy-1.0/numpy/distutils/fcompiler/gnu.py	2006-10-25 13:51:18.000000000 -0400
@@ -30,7 +30,7 @@
         'compiler_f77' : [fc_exe, "-g", "-Wall","-fno-second-underscore"],
         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
         'compiler_fix' : None,
-        'linker_so'    : [fc_exe, "-g", "-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-g", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe, "-g", "-Wall"]
@@ -255,7 +255,7 @@
         'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
         'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
         'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
-        'linker_so'    : [fc_exe,"-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe,"-Wall"]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Sep 2006 20:36:23 -0000	1.5
+++ .cvsignore	25 Oct 2006 21:55:43 -0000	1.6
@@ -1,2 +1,3 @@
 numpy-0.9.6.tar.gz
 numpy-0.9.8.tar.gz
+numpy-1.0.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numpy.spec	5 Sep 2006 20:36:23 -0000	1.6
+++ numpy.spec	25 Oct 2006 21:55:43 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        0.9.8
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -12,8 +12,7 @@
 URL:            http://numeric.scipy.org/
 Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-0.9.4-f2pynumpy.patch
-Patch1:         numpy-0.9.8-gfortran.patch
-Patch2:         numpy-0.9.8-check_types.patch
+Patch1:         numpy-1.0-gfortran.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran
@@ -34,7 +33,6 @@
 %setup -q
 %patch0 -p1 -b .f2pynumpy
 %patch1 -p1 -b .gfortran
-%patch2 -p1 -b .check_types
 
 %build
 ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -43,7 +41,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# skip-build currently broken, this works around it for now
+ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
+    %{__python} setup.py install --root $RPM_BUILD_ROOT
 rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
 rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc .
@@ -68,6 +70,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.0-1
+- New upstream release
+
 * Tue Sep 06 2006 Jarod Wilson <jwilson at redhat.com> 0.9.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Sep 2006 20:36:23 -0000	1.5
+++ sources	25 Oct 2006 21:55:43 -0000	1.6
@@ -1 +1 @@
-ca528d2b460a6567d70bb6bdf0dc1805  numpy-0.9.8.tar.gz
+47dd0daa82e7b3f0fe74b969b388d7b3  numpy-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 21:58:16 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 14:58:16 -0700
Subject: rpms/wvs-data - New directory
Message-ID: <200610252158.k9PLwGfs008645@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8640/wvs-data

Log Message:
Directory /cvs/extras/rpms/wvs-data added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 21:58:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 14:58:22 -0700
Subject: rpms/wvs-data/devel - New directory
Message-ID: <200610252158.k9PLwMs6008664@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8640/wvs-data/devel

Log Message:
Directory /cvs/extras/rpms/wvs-data/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Oct 25 21:58:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 14:58:41 -0700
Subject: rpms/wvs-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610252158.k9PLwfPd008700@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8694

Added Files:
	Makefile import.log 
Log Message:
Setup of module wvs-data


--- NEW FILE Makefile ---
# Top level Makefile for module wvs-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Oct 25 21:58:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 14:58:47 -0700
Subject: rpms/wvs-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610252158.k9PLwlC8008717@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8694/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wvs-data


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Oct 25 22:06:05 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 15:06:05 -0700
Subject: owners owners.list,1.1873,1.1874
Message-ID: <200610252206.k9PM65wk011738@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11719

Modified Files:
	owners.list 
Log Message:
add wvs-data


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1873
retrieving revision 1.1874
diff -u -r1.1873 -r1.1874
--- owners.list	25 Oct 2006 20:13:37 -0000	1.1873
+++ owners.list	25 Oct 2006 22:05:35 -0000	1.1874
@@ -2333,6 +2333,7 @@
 Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|denis at poolshark.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wvs-data|World Vector Shoreline data|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wxGTK|GTK+ port of the wxWidgets GUI library|mattdm at mattdm.org|extras-qa at fedoraproject.org|
 Fedora Extras|wxMaxima|Graphical user interface for Maxima|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Oct 25 22:11:48 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 15:11:48 -0700
Subject: rpms/wvs-data import.log,1.1,1.2
Message-ID: <200610252211.k9PMBmOW011862@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11825

Modified Files:
	import.log 
Log Message:
auto-import wvs-data-0.0.20020219-2 on branch devel from wvs-data-0.0.20020219-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Oct 2006 21:58:41 -0000	1.1
+++ import.log	25 Oct 2006 22:11:18 -0000	1.2
@@ -0,0 +1 @@
+wvs-data-0_0_20020219-2:HEAD:wvs-data-0.0.20020219-2.src.rpm:1161814270



From fedora-extras-commits at redhat.com  Wed Oct 25 22:11:49 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 25 Oct 2006 15:11:49 -0700
Subject: rpms/wvs-data/devel wvs-data.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610252211.k9PMBn2p011866@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11825/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wvs-data.spec 
Log Message:
auto-import wvs-data-0.0.20020219-2 on branch devel from wvs-data-0.0.20020219-2.src.rpm


--- NEW FILE wvs-data.spec ---
# Well, for now we use the timestamp of unpacked data
# for version

# Other information can be obtained on
# http://www.ngdc.noaa.gov/mgg/global/relief/ETOPO5/BOUNDARY/WVS/
# http://www.ngdc.noaa.gov/mgg/fliers/93mgg01.html

%define		WVS_date	20020219

Name:		wvs-data
Version:	0.0.%{WVS_date}
Release:	2
Summary:	World Vector Shoreline data

Group:		Applications/Engineering
License:	Public Domain
URL:		http://www.flaterco.com/xtide/files.html
Source0:	ftp://ftp.flaterco.com/xtide/wvs.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch

%description
This package contains World Vector Shoreline data, which can
be used for XTide related applications.

%prep
%setup -q -c %{name}-%{version}

%build

%install
%{__rm} -rf $RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -c -p -m644 *.dat \
	$RPM_BUILD_ROOT%{_datadir}/%{name}

%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_datadir}/%{name}/

%changelog
* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
- Directory name change.

* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-1
- Initial packaging.
- Use 0.0.%%{date} for version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Oct 2006 21:58:47 -0000	1.1
+++ .cvsignore	25 Oct 2006 22:11:19 -0000	1.2
@@ -0,0 +1 @@
+wvs.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Oct 2006 21:58:47 -0000	1.1
+++ sources	25 Oct 2006 22:11:19 -0000	1.2
@@ -0,0 +1 @@
+56325c8105c7137ced73396f2f2d8221  wvs.tar.bz2



From fedora-extras-commits at redhat.com  Wed Oct 25 22:18:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 25 Oct 2006 15:18:46 -0700
Subject: rpms/asymptote/FC-4 .cvsignore, 1.9, 1.10 asymptote.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610252218.k9PMIkP1012049@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972/FC-4

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Oct 2006 13:48:02 -0000	1.9
+++ .cvsignore	25 Oct 2006 22:18:16 -0000	1.10
@@ -1 +1 @@
-asymptote-1.15.tar.gz
+asymptote-1.16.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/asymptote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asymptote.spec	22 Oct 2006 13:48:02 -0000	1.10
+++ asymptote.spec	25 Oct 2006 22:18:16 -0000	1.11
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -41,6 +41,7 @@
 %prep
 %setup -q
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
+%{__sed} -i 's/\r//' doc/CAD1.asy
 
 
 %build
@@ -137,6 +138,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
 - Update to 1.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Oct 2006 13:48:02 -0000	1.9
+++ sources	25 Oct 2006 22:18:16 -0000	1.10
@@ -1 +1 @@
-0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz
+ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 22:18:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 25 Oct 2006 15:18:48 -0700
Subject: rpms/asymptote/FC-6 .cvsignore, 1.9, 1.10 asymptote.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610252218.k9PMImCX012057@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972/FC-6

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Oct 2006 13:48:03 -0000	1.9
+++ .cvsignore	25 Oct 2006 22:18:17 -0000	1.10
@@ -1 +1 @@
-asymptote-1.15.tar.gz
+asymptote-1.16.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/asymptote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asymptote.spec	22 Oct 2006 13:48:03 -0000	1.10
+++ asymptote.spec	25 Oct 2006 22:18:17 -0000	1.11
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -41,6 +41,7 @@
 %prep
 %setup -q
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
+%{__sed} -i 's/\r//' doc/CAD1.asy
 
 
 %build
@@ -137,6 +138,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
 - Update to 1.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Oct 2006 13:48:03 -0000	1.9
+++ sources	25 Oct 2006 22:18:17 -0000	1.10
@@ -1 +1 @@
-0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz
+ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 22:18:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 25 Oct 2006 15:18:47 -0700
Subject: rpms/asymptote/FC-5 .cvsignore, 1.9, 1.10 asymptote.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610252218.k9PMIlBw012054@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972/FC-5

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Oct 2006 13:48:02 -0000	1.9
+++ .cvsignore	25 Oct 2006 22:18:17 -0000	1.10
@@ -1 +1 @@
-asymptote-1.15.tar.gz
+asymptote-1.16.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/asymptote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asymptote.spec	22 Oct 2006 13:48:02 -0000	1.10
+++ asymptote.spec	25 Oct 2006 22:18:17 -0000	1.11
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -41,6 +41,7 @@
 %prep
 %setup -q
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
+%{__sed} -i 's/\r//' doc/CAD1.asy
 
 
 %build
@@ -137,6 +138,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
 - Update to 1.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Oct 2006 13:48:02 -0000	1.9
+++ sources	25 Oct 2006 22:18:17 -0000	1.10
@@ -1 +1 @@
-0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz
+ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 22:18:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 25 Oct 2006 15:18:48 -0700
Subject: rpms/asymptote/devel .cvsignore, 1.9, 1.10 asymptote.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <200610252218.k9PMImjn012062@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11972/devel

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Oct 2006 13:48:03 -0000	1.9
+++ .cvsignore	25 Oct 2006 22:18:18 -0000	1.10
@@ -1 +1 @@
-asymptote-1.15.tar.gz
+asymptote-1.16.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asymptote.spec	22 Oct 2006 13:48:03 -0000	1.10
+++ asymptote.spec	25 Oct 2006 22:18:18 -0000	1.11
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -41,6 +41,7 @@
 %prep
 %setup -q
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
+%{__sed} -i 's/\r//' doc/CAD1.asy
 
 
 %build
@@ -137,6 +138,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Sun Oct 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
 - Update to 1.15.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Oct 2006 13:48:03 -0000	1.9
+++ sources	25 Oct 2006 22:18:18 -0000	1.10
@@ -1 +1 @@
-0866162b99da97bcd593785fc2f890b0  asymptote-1.15.tar.gz
+ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Oct 25 22:26:22 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 25 Oct 2006 15:26:22 -0700
Subject: comps comps-fe5.xml.in, 1.180, 1.181 comps-fe6.xml.in, 1.203,
	1.204 comps-fe7.xml.in, 1.1, 1.2
Message-ID: <200610252226.k9PMQMXW012379@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12322

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Added crossfire, cyphesis, and xpilot game servers.




Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- comps-fe5.xml.in	21 Oct 2006 20:37:17 -0000	1.180
+++ comps-fe5.xml.in	25 Oct 2006 22:25:51 -0000	1.181
@@ -305,6 +305,8 @@
       <packagereq type="optional">chess</packagereq>
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">crack-attack</packagereq>
+      <packagereq type="optional">crossfire</packagereq>
+      <packagereq type="optional">crossfire-client</packagereq>
       <packagereq type="optional">crystal-stacker</packagereq>
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
@@ -384,6 +386,7 @@
       <packagereq type="optional">xgalaxy</packagereq>
       <packagereq type="optional">xmoto</packagereq>
       <packagereq type="optional">xpilot-ng</packagereq>
+      <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">zasx</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- comps-fe6.xml.in	21 Oct 2006 20:37:17 -0000	1.203
+++ comps-fe6.xml.in	25 Oct 2006 22:25:51 -0000	1.204
@@ -359,10 +359,12 @@
       <packagereq type="optional">chess</packagereq>
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">crack-attack</packagereq>
+      <packagereq type="optional">crossfire</packagereq>
       <packagereq type="optional">crossfire-client</packagereq>
       <packagereq type="optional">crystal-stacker</packagereq>
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
+      <packagereq type="optional">cyphesis</packagereq>
       <packagereq type="optional">enigma</packagereq>
       <packagereq type="optional">fbg</packagereq>
       <packagereq type="optional">fillets-ng</packagereq>
@@ -441,6 +443,7 @@
       <packagereq type="optional">xgalaxy</packagereq>
       <packagereq type="optional">xmoto</packagereq>
       <packagereq type="optional">xpilot-ng</packagereq>
+      <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">zasx</packagereq>


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comps-fe7.xml.in	25 Oct 2006 20:04:16 -0000	1.1
+++ comps-fe7.xml.in	25 Oct 2006 22:25:51 -0000	1.2
@@ -359,10 +359,12 @@
       <packagereq type="optional">chess</packagereq>
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">crack-attack</packagereq>
+      <packagereq type="optional">crossfire</packagereq>
       <packagereq type="optional">crossfire-client</packagereq>
       <packagereq type="optional">crystal-stacker</packagereq>
       <packagereq type="optional">crystal-stacker-themes</packagereq>
       <packagereq type="optional">csmash</packagereq>
+      <packagereq type="optional">cyphesis</packagereq>
       <packagereq type="optional">enigma</packagereq>
       <packagereq type="optional">fbg</packagereq>
       <packagereq type="optional">fillets-ng</packagereq>
@@ -441,6 +443,7 @@
       <packagereq type="optional">xgalaxy</packagereq>
       <packagereq type="optional">xmoto</packagereq>
       <packagereq type="optional">xpilot-ng</packagereq>
+      <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">zasx</packagereq>



From fedora-extras-commits at redhat.com  Wed Oct 25 22:28:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Wed, 25 Oct 2006 15:28:36 -0700
Subject: rpms/python-sexy/FC-6 python-sexy.spec,1.5,1.6
Message-ID: <200610252228.k9PMSa03012441@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/FC-6

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/FC-6/python-sexy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-sexy.spec	17 Oct 2006 15:22:00 -0000	1.5
+++ python-sexy.spec	25 Oct 2006 22:28:06 -0000	1.6
@@ -2,7 +2,7 @@
 %define real_name sexy-python
 Name:           python-sexy
 Version:        0.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Python bindings to libsexy
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel >= 2
 BuildRequires:  pygtk2-devel >= 2.8.0
 BuildRequires:  libxml2-devel
-Requires:  libsexy-devel >= 0.1.10
+Requires:  libsexy >= 0.1.10
 
 %description
 sexy-python is a set of Python bindings around libsexy.
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Tue Nov 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
+* Thu Oct 26 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-2
+- fixed requires that asked libsexy-devel instead of libsexy.
+
+* Tue Oct 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
 - updated to 0.1.9, license file issue has been fixed upstream
 
 * Tue Sep 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8-5



From fedora-extras-commits at redhat.com  Wed Oct 25 22:28:35 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Wed, 25 Oct 2006 15:28:35 -0700
Subject: rpms/python-sexy/FC-5 python-sexy.spec,1.1,1.2
Message-ID: <200610252228.k9PMSZP4012438@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/FC-5

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/FC-5/python-sexy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-sexy.spec	25 Aug 2006 18:59:15 -0000	1.1
+++ python-sexy.spec	25 Oct 2006 22:28:05 -0000	1.2
@@ -2,7 +2,7 @@
 %define real_name sexy-python
 Name:           python-sexy
 Version:        0.1.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Python bindings to libsexy
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8.5
+- fixed requires that asked libsexy-devel instead of libsexy
+
 * Thu Aug 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8-4
 - Added quiet extraction of source tarball, some cleaning to the spec file
 



From fedora-extras-commits at redhat.com  Wed Oct 25 22:28:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Wed, 25 Oct 2006 15:28:42 -0700
Subject: rpms/python-sexy/devel python-sexy.spec,1.5,1.6
Message-ID: <200610252228.k9PMSgtN012444@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-sexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/devel

Modified Files:
	python-sexy.spec 
Log Message:



Index: python-sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sexy/devel/python-sexy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-sexy.spec	17 Oct 2006 15:22:00 -0000	1.5
+++ python-sexy.spec	25 Oct 2006 22:28:12 -0000	1.6
@@ -2,7 +2,7 @@
 %define real_name sexy-python
 Name:           python-sexy
 Version:        0.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Python bindings to libsexy
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel >= 2
 BuildRequires:  pygtk2-devel >= 2.8.0
 BuildRequires:  libxml2-devel
-Requires:  libsexy-devel >= 0.1.10
+Requires:  libsexy >= 0.1.10
 
 %description
 sexy-python is a set of Python bindings around libsexy.
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Tue Nov 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
+* Thu Oct 26 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-2
+- fixed requires that asked libsexy-devel instead of libsexy.
+
+* Tue Oct 17 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.9-1
 - updated to 0.1.9, license file issue has been fixed upstream
 
 * Tue Sep 12 2006 Ha??kel Gu??mar <karlthered at gmail.com> - 0.1.8-5



From fedora-extras-commits at redhat.com  Wed Oct 25 23:04:15 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 25 Oct 2006 16:04:15 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.8,1.9
Message-ID: <200610252304.k9PN4FAD016571@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16550

Modified Files:
	Push.py 
Log Message:
fix a warning message


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Push.py	25 Oct 2006 13:01:11 -0000	1.8
+++ Push.py	25 Oct 2006 23:04:12 -0000	1.9
@@ -350,7 +350,7 @@
         if buildreport:
             rundirfile.write(buildreportinfo)
         rundirfile.close()
-        raise PushWarning, 'WARNING: %s ' % pkg_fn
+        raise PushWarning, 'WARNING: Multiple source rpms'
     
     package = filedict['srpm'][0]
     (n,a,e,v,r) = naevr(package)



From fedora-extras-commits at redhat.com  Wed Oct 25 23:55:45 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 25 Oct 2006 16:55:45 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.9,1.10
Message-ID: <200610252355.k9PNtjAG016970@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16952

Modified Files:
	Push.py 
Log Message:
fix a warning message once more


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Push.py	25 Oct 2006 23:04:12 -0000	1.9
+++ Push.py	25 Oct 2006 23:55:42 -0000	1.10
@@ -346,11 +346,11 @@
 
     if len(filedict['srpm']) > 1:
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
-        buildreportinfo = 'Invalid build-job: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        buildreportinfo = 'Invalid build results: %s-%s\n' % (name,os.path.basename(pkgrelroot))
         if buildreport:
             rundirfile.write(buildreportinfo)
         rundirfile.close()
-        raise PushWarning, 'WARNING: Multiple source rpms'
+        raise PushWarning, 'WARNING: Multiple source rpms in %s' % pkgrelroot
     
     package = filedict['srpm'][0]
     (n,a,e,v,r) = naevr(package)



From fedora-extras-commits at redhat.com  Thu Oct 26 03:40:51 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 25 Oct 2006 20:40:51 -0700
Subject: rpms/fluxstyle/devel fluxstyle.desktop,1.1,1.2
Message-ID: <200610260340.k9Q3epPI030024@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/fluxstyle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30004

Modified Files:
	fluxstyle.desktop 
Log Message:
Fix category in .desktop file 



Index: fluxstyle.desktop
===================================================================
RCS file: /cvs/extras/rpms/fluxstyle/devel/fluxstyle.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxstyle.desktop	25 Oct 2006 13:16:30 -0000	1.1
+++ fluxstyle.desktop	26 Oct 2006 03:40:20 -0000	1.2
@@ -7,4 +7,4 @@
 TryExec=fluxStyle
 Exec=fluxStyle
 Icon=fluxmetal.png
-Categories=Application;GTK;System;Utilities;
+Categories=Application;Settings;GTK;System;Utility;



From fedora-extras-commits at redhat.com  Thu Oct 26 05:54:29 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Oct 2006 22:54:29 -0700
Subject: comps comps-fe5.xml.in, 1.181, 1.182 comps-fe6.xml.in, 1.204,
	1.205 comps-fe7.xml.in, 1.2, 1.3
Message-ID: <200610260554.k9Q5sSZ1004135@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4110

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
+vdradmin-am


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- comps-fe5.xml.in	25 Oct 2006 22:25:51 -0000	1.181
+++ comps-fe5.xml.in	26 Oct 2006 05:53:58 -0000	1.182
@@ -955,6 +955,7 @@
       <packagereq type="optional">plone</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">TurboGears</packagereq>
+      <packagereq type="optional">vdradmin-am</packagereq>
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- comps-fe6.xml.in	25 Oct 2006 22:25:51 -0000	1.204
+++ comps-fe6.xml.in	26 Oct 2006 05:53:58 -0000	1.205
@@ -1088,6 +1088,7 @@
       <packagereq type="optional">tclhttpd</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">TurboGears</packagereq>
+      <packagereq type="optional">vdradmin-am</packagereq>
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comps-fe7.xml.in	25 Oct 2006 22:25:51 -0000	1.2
+++ comps-fe7.xml.in	26 Oct 2006 05:53:58 -0000	1.3
@@ -1088,6 +1088,7 @@
       <packagereq type="optional">tclhttpd</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">TurboGears</packagereq>
+      <packagereq type="optional">vdradmin-am</packagereq>
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Thu Oct 26 10:09:25 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 26 Oct 2006 03:09:25 -0700
Subject: rpms/fedora-package-config-smart/FC-5
	fedora-package-config-smart.spec, 1.3, 1.4
Message-ID: <200610261009.k9QA9PHC020404@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/FC-5

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Adjust for FC6, remove unsupported (by smart) mirrorlists


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-5/fedora-package-config-smart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-package-config-smart.spec	13 May 2006 09:43:29 -0000	1.3
+++ fedora-package-config-smart.spec	26 Oct 2006 10:08:55 -0000	1.4
@@ -1,7 +1,7 @@
-Summary: Fedora configuration files for the smart package manager 
+Summary: Fedora configuration files for the smart package manager
 Name: fedora-package-config-smart
 Version: 5
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/



From fedora-extras-commits at redhat.com  Thu Oct 26 10:09:24 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 26 Oct 2006 03:09:24 -0700
Subject: rpms/fedora-package-config-smart/FC-4
	fedora-package-config-smart.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610261009.k9QA9OmI020401@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/FC-4

Modified Files:
	fedora-package-config-smart.spec sources 
Log Message:
Adjust for FC6, remove unsupported (by smart) mirrorlists


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/fedora-package-config-smart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-package-config-smart.spec	13 May 2006 09:43:28 -0000	1.4
+++ fedora-package-config-smart.spec	26 Oct 2006 10:08:53 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the smart package manager
 Name: fedora-package-config-smart
 Version: 4
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Apr 2006 11:47:11 -0000	1.3
+++ sources	26 Oct 2006 10:08:53 -0000	1.4
@@ -1 +1 @@
-0623cece6bf5084642c5e154c29867aa  fedora-package-config-smart-4.tar.bz2
+ce4a216e5e49efcb212aa7b3ab450964  fedora-package-config-smart-4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 26 10:09:26 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 26 Oct 2006 03:09:26 -0700
Subject: rpms/fedora-package-config-smart/FC-6 .cvsignore, 1.4,
	1.5 fedora-package-config-smart.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610261009.k9QA9Q9u020409@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/FC-6

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
Adjust for FC6, remove unsupported (by smart) mirrorlists


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2006 00:36:25 -0000	1.4
+++ .cvsignore	26 Oct 2006 10:08:56 -0000	1.5
@@ -1 +1 @@
-fedora-package-config-smart-5.92.tar.bz2
+fedora-package-config-smart-6.tar.bz2


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-6/fedora-package-config-smart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-package-config-smart.spec	30 Aug 2006 00:27:39 -0000	1.4
+++ fedora-package-config-smart.spec	26 Oct 2006 10:08:56 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the smart package manager
 Name: fedora-package-config-smart
-Version: 5.92
-Release: 7
+Version: 6
+Release: 8
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -38,6 +38,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Oct 26 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 6-8
+- Update to Fedora Core 6.
+
 * Sat May 13 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-7
 - Sync with fedora-package-config-apt, see also #191580.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Sep 2006 07:51:51 -0000	1.5
+++ sources	26 Oct 2006 10:08:56 -0000	1.6
@@ -1 +1 @@
-0efc10150b9cb49b32cf69bc00d0a59c  fedora-package-config-smart-5.92.tar.bz2
+61aaadfe0ff641c6c1be3e3f93f3dc09  fedora-package-config-smart-6.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 26 10:09:27 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 26 Oct 2006 03:09:27 -0700
Subject: rpms/fedora-package-config-smart/devel .cvsignore, 1.4,
	1.5 fedora-package-config-smart.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200610261009.k9QA9R3T020414@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20335/devel

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
Adjust for FC6, remove unsupported (by smart) mirrorlists


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2006 00:36:25 -0000	1.4
+++ .cvsignore	26 Oct 2006 10:08:56 -0000	1.5
@@ -1 +1 @@
-fedora-package-config-smart-5.92.tar.bz2
+fedora-package-config-smart-6.89.tar.bz2


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/fedora-package-config-smart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-package-config-smart.spec	30 Aug 2006 00:27:39 -0000	1.4
+++ fedora-package-config-smart.spec	26 Oct 2006 10:08:56 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: Fedora configuration files for the smart package manager
 Name: fedora-package-config-smart
-Version: 5.92
+Version: 6.89
 Release: 7
 License: GPL
 Group: System Environment/Base
@@ -38,6 +38,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Oct 26 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 6.89-7
+- Update to post-FC6 rawhide.
+
 * Sat May 13 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-7
 - Sync with fedora-package-config-apt, see also #191580.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Sep 2006 07:51:51 -0000	1.5
+++ sources	26 Oct 2006 10:08:56 -0000	1.6
@@ -1 +1 @@
-0efc10150b9cb49b32cf69bc00d0a59c  fedora-package-config-smart-5.92.tar.bz2
+a8c5d17d5d3b0be3cb09f6d7f5a3f8f2  fedora-package-config-smart-6.89.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 26 12:52:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 05:52:51 -0700
Subject: rpms/sbcl/devel .cvsignore, 1.16, 1.17 sbcl.spec, 1.52, 1.53 sources,
	1.18, 1.19
Message-ID: <200610261252.k9QCqpvN027441@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27410

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.18-1
- sbcl-0.9.18



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Sep 2006 13:06:00 -0000	1.16
+++ .cvsignore	26 Oct 2006 12:52:20 -0000	1.17
@@ -3,3 +3,4 @@
 sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 sbcl-0.9.16-source.tar.bz2
 sbcl-0.9.17-source.tar.bz2
+sbcl-0.9.18-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sbcl.spec	27 Sep 2006 13:06:00 -0000	1.52
+++ sbcl.spec	26 Oct 2006 12:52:20 -0000	1.53
@@ -9,7 +9,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.17
+Version: 0.9.18
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -215,8 +215,11 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.18-1
+- sbcl-0.9.18
+
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.17-1
-- 0.9.17
+- sbcl-0.9.17
 
 * Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.16-3
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	27 Sep 2006 13:06:00 -0000	1.18
+++ sources	26 Oct 2006 12:52:20 -0000	1.19
@@ -1 +1 @@
-1f2297931f35d6d84d632c30aa099c13  sbcl-0.9.17-source.tar.bz2
+a00122024746ecb81bfff1a328bb2336  sbcl-0.9.18-source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Oct 26 13:30:55 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 26 Oct 2006 06:30:55 -0700
Subject: rpms/linphone/devel linphone.spec,1.22,1.23
Message-ID: <200610261330.k9QDUtZF030594@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30570

Modified Files:
	linphone.spec 
Log Message:
* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-1
- Update to 1.5.0
- Fix spelling error in description.
- Remove invalid categories on desktop file.




Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linphone.spec	30 Aug 2006 15:50:47 -0000	1.22
+++ linphone.spec	26 Oct 2006 13:30:25 -0000	1.23
@@ -1,24 +1,39 @@
 Name:           linphone
-Version:        1.2.0
-Release:        7%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
-URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
+URL:            http://www.linphone.org/
+Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
-Patch1:         linphone-1.2.0-ortp.patch
-Patch2:         linphone-1.1.0-Werror.patch
-Patch3:         linphone-1.2.0-maxrtp.patch
-Patch4:         linphone-1.2.0-gtkentry.patch
+Patch1:         linphone-1.4.1-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires:  libosip2-devel speex-devel >= 1.0.5  gettext desktop-file-utils
-BuildRequires:  ortp-devel >= 0.7.1
+BuildRequires:  libosip2-devel
+BuildRequires:  ortp-devel = 0.11.0
+
+BuildRequires:  readline-devel
+BuildRequires:  ncurses-devel
+
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  glib2-devel
+BuildRequires:  alsa-lib-devel
+
+BuildRequires:  speex-devel >= 1.2
+
+BuildRequires:  desktop-file-utils
+
 BuildRequires:  perl(XML::Parser)
 
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  libtool
+BuildRequires:  intltool
+BuildRequires:  gettext
+
 %description
 Linphone is mostly sip compliant. It works successfully with these
 implementations:
@@ -27,7 +42,7 @@
     * Hotsip, a free of charge phone for Windows.
     * Vocal, an open source SIP stack from Vovida that includes a SIP proxy
         that works with linphone since version 0.7.1.
-    * Siproxd is a free sip proxy being developped by Thomas Ries because he
+    * Siproxd is a free sip proxy being developed by Thomas Ries because he
         would like to have linphone working behind his firewall. Siproxd is
         simple to setup and works perfectly with linphone.
     * Partysip aims at being a generic and fully functionnal SIP proxy. Visit
@@ -46,14 +61,27 @@
 %prep
 %setup -q
 %patch -p 1 -b .old
-%patch1 -p 1 -b .ortp
-%patch2 -p 1 -b .Werror
-%patch3 -p 1 -b .maxrtp
-%patch4 -p 1 -b .gtkentry
+%patch1 -p 1 -b .libs
+
 rm -r oRTP
 
+libtoolize --copy --force
+autoheader
+aclocal -I m4
+automake --force-missing --add-missing --copy
+autoconf
+rm -rf config.cache
+
+pushd mediastreamer2
+libtoolize --copy --force
+autoheader
+aclocal
+automake --force-missing --add-missing --copy
+autoconf
+popd
+
 %build
-%configure
+%configure --disable-static --disable-video
 make %{?_smp_mflags}
 
 %install
@@ -65,10 +93,11 @@
 desktop-file-install --vendor=fedora \
   --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
+  --remove-category Application \
   --add-category Telephony \
   --add-category GTK \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,12 +112,13 @@
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*.server
 %{_libdir}/liblinphone.so.*
+%{_libdir}/libmediastreamer.so.*
+%{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/gtk-doc/html/mediastreamer
 %{_datadir}/pixmaps/linphone
 %{_datadir}/pixmaps/linphone2.png
 %{_datadir}/sounds/linphone
@@ -96,12 +126,18 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/linphone
-%{_libdir}/liblinphone.a
-%{_libdir}/liblinphone.la
+%{_includedir}/mediastreamer2
 %{_libdir}/liblinphone.so
+%{_libdir}/libmediastreamer.so
+%{_libdir}/libquickstream.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-1
+- Update to 1.5.0
+- Fix spelling error in description.
+- Remove invalid categories on desktop file.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0-7
 - Bump release so that I can "make tag"
 



From fedora-extras-commits at redhat.com  Thu Oct 26 13:47:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 26 Oct 2006 06:47:29 -0700
Subject: rpms/linphone/devel linphone-1.4.1-libs.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 linphone.spec, 1.23, 1.24 sources, 1.5,
	1.6 linphone-1.0.1-pkgconfig.patch, 1.1,
	NONE linphone-1.1.0-Werror.patch, 1.1,
	NONE linphone-1.2.0-gtkentry.patch, 1.1,
	NONE linphone-1.2.0-maxrtp.patch, 1.1,
	NONE linphone-1.2.0-ortp.patch, 1.1, NONE
Message-ID: <200610261347.k9QDlTw9030773@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30746

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.4.1-libs.patch 
Removed Files:
	linphone-1.0.1-pkgconfig.patch linphone-1.1.0-Werror.patch 
	linphone-1.2.0-gtkentry.patch linphone-1.2.0-maxrtp.patch 
	linphone-1.2.0-ortp.patch 
Log Message:
* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-2
- Don't forget to add new files and remove old ones!



linphone-1.4.1-libs.patch:

--- NEW FILE linphone-1.4.1-libs.patch ---
diff -ru linphone-1.4.1.old/configure.in linphone-1.4.1.new/configure.in
--- linphone-1.4.1.old/configure.in	2006-09-18 02:28:20.000000000 -0500
+++ linphone-1.4.1.new/configure.in	2006-10-09 08:49:20.000000000 -0500
@@ -242,7 +242,7 @@
 
 AC_SUBST(STRICT_OPTIONS)
 
-AC_CONFIG_SUBDIRS( oRTP mediastreamer2 )
+AC_CONFIG_SUBDIRS( mediastreamer2 )
 
 dnl check for db2html (docbook) to generate html user manual
 AC_CHECK_PROG(have_db2html,db2html, yes, no)
@@ -258,12 +258,7 @@
 
 AC_DEFINE_UNQUOTED(LINPHONE_VERSION,"$PACKAGE_VERSION",[Linphone's version number])
 
-dnl Packaging: Pick oRTP version from ${top_srcdir}/oRTP/configure.ac
-dnl Feel free to propose an alternative & cleaner version...
-top_srcdir=`dirname $0`
-changequote(, )dnl
-ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'`
-changequote([, ])dnl
+ORTP_VERSION=0.11.0
 AC_SUBST([ORTP_VERSION])
 
 AC_OUTPUT([ 
diff -ru linphone-1.4.1.old/Makefile.am linphone-1.4.1.new/Makefile.am
--- linphone-1.4.1.old/Makefile.am	2006-09-11 07:58:46.000000000 -0500
+++ linphone-1.4.1.new/Makefile.am	2006-10-09 08:49:33.000000000 -0500
@@ -3,7 +3,7 @@
 # let make re-run automake upon need
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = m4 pixmaps po ipkg oRTP gsmlib mediastreamer2\
+SUBDIRS = m4 pixmaps po ipkg gsmlib mediastreamer2\
 		media_api exosip coreapi console gnome share
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2006 12:05:15 -0000	1.5
+++ .cvsignore	26 Oct 2006 13:46:59 -0000	1.6
@@ -1 +1 @@
-linphone-1.2.0.tar.gz
+linphone-1.5.0.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linphone.spec	26 Oct 2006 13:30:25 -0000	1.23
+++ linphone.spec	26 Oct 2006 13:46:59 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -133,6 +133,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-2
+- Don't forget to add new files and remove old ones!
+
 * Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-1
 - Update to 1.5.0
 - Fix spelling error in description.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 12:05:15 -0000	1.5
+++ sources	26 Oct 2006 13:46:59 -0000	1.6
@@ -1 +1 @@
-bd5e513a665ce2e381afce64d569c707  linphone-1.2.0.tar.gz
+e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz


--- linphone-1.0.1-pkgconfig.patch DELETED ---


--- linphone-1.1.0-Werror.patch DELETED ---


--- linphone-1.2.0-gtkentry.patch DELETED ---


--- linphone-1.2.0-maxrtp.patch DELETED ---


--- linphone-1.2.0-ortp.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Oct 26 14:40:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Oct 2006 07:40:41 -0700
Subject: fedora-security/audit fe6,NONE,1.1
Message-ID: <200610261440.k9QEefk8001606@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586

Added Files:
	fe6 
Log Message:
Seed fe6 from fe5.


***** Error reading new file: [Errno 2] No such file or directory: 'fe6'



From fedora-extras-commits at redhat.com  Thu Oct 26 14:48:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Oct 2006 07:48:46 -0700
Subject: fedora-security/audit fe4,1.81,1.82 fe5,1.88,1.89 fe6,1.1,1.2
Message-ID: <200610261448.k9QEmkTg001681@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1659

Modified Files:
	fe4 fe5 fe6 
Log Message:
+CVE-2006-545[3-5] (bugzilla)


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fe4	23 Oct 2006 20:52:08 -0000	1.81
+++ fe4	26 Oct 2006 14:48:44 -0000	1.82
@@ -2,6 +2,9 @@
 
 ** are items that need attention
 
+CVE-2006-5455 VULNERABLE (bugzilla) #212355
+CVE-2006-5454 VULNERABLE (bugzilla) #212355
+CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- fe5	23 Oct 2006 20:52:08 -0000	1.88
+++ fe5	26 Oct 2006 14:48:44 -0000	1.89
@@ -2,6 +2,9 @@
 
 ** are items that need attention
 
+CVE-2006-5455 VULNERABLE (bugzilla) #212355
+CVE-2006-5454 VULNERABLE (bugzilla) #212355
+CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fe6	26 Oct 2006 14:40:38 -0000	1.1
+++ fe6	26 Oct 2006 14:48:44 -0000	1.2
@@ -2,6 +2,9 @@
 
 ** are items that need attention
 
+CVE-2006-5455 VULNERABLE (bugzilla) #212355
+CVE-2006-5454 VULNERABLE (bugzilla) #212355
+CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 VULNERABLE (clamav) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)



From fedora-extras-commits at redhat.com  Thu Oct 26 17:32:00 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu, 26 Oct 2006 10:32:00 -0700
Subject: fedora-security/audit fc5,1.371,1.372 fc6,1.124,1.125
Message-ID: <200610261732.k9QHW0Ul011254@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11234

Modified Files:
	fc5 fc6 
Log Message:
Note a new ruby issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- fc5	25 Oct 2006 17:22:00 -0000	1.371
+++ fc5	26 Oct 2006 17:31:57 -0000	1.372
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- fc6	25 Oct 2006 17:22:00 -0000	1.124
+++ fc6	26 Oct 2006 17:31:57 -0000	1.125
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]



From fedora-extras-commits at redhat.com  Thu Oct 26 19:15:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 12:15:11 -0700
Subject: rpms/uw-imap/devel .cvsignore, 1.5, 1.6 sources, 1.6,
	1.7 uw-imap.spec, 1.20, 1.21
Message-ID: <200610261915.k9QJFBV5017885@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17863

Modified Files:
	.cvsignore sources uw-imap.spec 
Log Message:
* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006c1-1
- imap-2006c1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Oct 2006 19:35:26 -0000	1.5
+++ .cvsignore	26 Oct 2006 19:14:40 -0000	1.6
@@ -1,3 +1,4 @@
 imap-2006.tar.Z
 imap-2006a.tar.Z
 imap-2006b.tar.Z
+imap-2006c1.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Oct 2006 19:35:26 -0000	1.6
+++ sources	26 Oct 2006 19:14:40 -0000	1.7
@@ -1 +1 @@
-6ba2c67118b7432d91999bcb5b227288  imap-2006b.tar.Z
+35a9976cc0c57e0423cd49fb0f967d5e  imap-2006c1.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- uw-imap.spec	6 Oct 2006 19:35:26 -0000	1.20
+++ uw-imap.spec	26 Oct 2006 19:14:40 -0000	1.21
@@ -1,7 +1,7 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006b
+Version: 2006c1
 Release: 1%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
@@ -274,6 +274,9 @@
 
 
 %changelog
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006c1-1
+- imap-2006c1
+
 * Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
 - imap-2006b
 - %%ghost %%config(missingok,noreplace) %%{_sysconfdir}/c-client.cf



From fedora-extras-commits at redhat.com  Thu Oct 26 19:22:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 12:22:43 -0700
Subject: rpms/geomview/devel geomview.spec,1.27,1.28
Message-ID: <200610261922.k9QJMhlI018003@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17987

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
  Conflicts: lam (bug #212435)



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- geomview.spec	1 Oct 2006 21:36:53 -0000	1.27
+++ geomview.spec	26 Oct 2006 19:22:13 -0000	1.28
@@ -205,9 +205,12 @@
 # maniview manpage
 %{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
-# rename animate.1 that Conflicts: ImageMagick
-test -f $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 && \
-  mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1
+# rename animate.1 that Conflicts: ImageMagick (#202039)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
+# rename sweep.1 that Conflicts: lam (#212435)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
 
 # rpmdocs
 make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
@@ -276,6 +279,10 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
+- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
+  Conflicts: lam (bug #212435)
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
 - 1.8.2rc9
 



From fedora-extras-commits at redhat.com  Thu Oct 26 19:34:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 12:34:35 -0700
Subject: rpms/geomview/devel geomview.spec,1.28,1.29
Message-ID: <200610261934.k9QJYZXh018108@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18088

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.23.rc9
- fixup desktop-file-install usage



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- geomview.spec	26 Oct 2006 19:22:13 -0000	1.28
+++ geomview.spec	26 Oct 2006 19:34:05 -0000	1.29
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.21.%{beta}%{?dist}
+Release: 0.23.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,10 +190,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   %{SOURCE1}
 
 # app icon
@@ -279,6 +277,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.23.rc9
+- fixup desktop-file-install usage
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
 - rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
   Conflicts: lam (bug #212435)



From fedora-extras-commits at redhat.com  Thu Oct 26 19:41:54 2006
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Thu, 26 Oct 2006 12:41:54 -0700
Subject: fedora-security/audit fc5,1.372,1.373 fc6,1.125,1.126
Message-ID: <200610261941.k9QJfsZW018195@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18174

Modified Files:
	fc5 fc6 
Log Message:
CVE-2006-5540 pgsql DoS



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- fc5	26 Oct 2006 17:31:57 -0000	1.372
+++ fc5	26 Oct 2006 19:41:51 -0000	1.373
@@ -1,8 +1,9 @@
-Up to date CVE as of CVE email 20061024
-Up to date FC5 as of 20061024
+Up to date CVE as of CVE email 20061026
+Up to date FC5 as of 20061026
 
 ** are items that need attention
 
+CVE-2006-5540 VULNERABLE (postgresql) #212360
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- fc6	26 Oct 2006 17:31:57 -0000	1.125
+++ fc6	26 Oct 2006 19:41:51 -0000	1.126
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5540 VULNERABLE (postgresql) #212360
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)



From fedora-extras-commits at redhat.com  Thu Oct 26 20:04:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:04:22 -0700
Subject: rpms/geomview/devel geomview.desktop, 1.3, 1.4 geomview.spec, 1.29,
	1.30
Message-ID: <200610262004.k9QK4MY1021197@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21179

Modified Files:
	geomview.desktop geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
- fixup desktop-file-install usage
- fixup geomview.desktop Categories



Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geomview.desktop	12 May 2006 18:53:24 -0000	1.3
+++ geomview.desktop	26 Oct 2006 20:03:51 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-MimeType=application/x-geomview
+MimeType=application/x-geomview;
 Type=Application
 Encoding=UTF-8
-Categories=Application;Graphics;Scientific;Education;Math;
+Categories=Graphics;Science;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- geomview.spec	26 Oct 2006 19:34:05 -0000	1.29
+++ geomview.spec	26 Oct 2006 20:03:51 -0000	1.30
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.23.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -277,8 +277,9 @@
 
 
 %changelog
-* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.23.rc9
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
 - fixup desktop-file-install usage
+- fixup geomview.desktop Categories
 
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
 - rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid



From fedora-extras-commits at redhat.com  Thu Oct 26 20:21:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:21:37 -0700
Subject: rpms/geomview/FC-6 geomview.desktop, 1.3, 1.4 geomview.spec, 1.27,
	1.28
Message-ID: <200610262021.k9QKLbcc021385@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21361

Modified Files:
	geomview.desktop geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
- fixup desktop-file-install usage
- fixup geomview.desktop Categories

* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
  Conflicts: lam (bug #212435)




Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-6/geomview.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geomview.desktop	12 May 2006 18:53:24 -0000	1.3
+++ geomview.desktop	26 Oct 2006 20:21:06 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-MimeType=application/x-geomview
+MimeType=application/x-geomview;
 Type=Application
 Encoding=UTF-8
-Categories=Application;Graphics;Scientific;Education;Math;
+Categories=Graphics;Science;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-6/geomview.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- geomview.spec	1 Oct 2006 21:36:53 -0000	1.27
+++ geomview.spec	26 Oct 2006 20:21:06 -0000	1.28
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.21.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,10 +190,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   %{SOURCE1}
 
 # app icon
@@ -205,9 +203,12 @@
 # maniview manpage
 %{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
-# rename animate.1 that Conflicts: ImageMagick
-test -f $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 && \
-  mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1
+# rename animate.1 that Conflicts: ImageMagick (#202039)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
+# rename sweep.1 that Conflicts: lam (#212435)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
 
 # rpmdocs
 make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
@@ -276,6 +277,14 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
+- fixup desktop-file-install usage
+- fixup geomview.desktop Categories
+
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
+- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
+  Conflicts: lam (bug #212435)
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
 - 1.8.2rc9
 



From fedora-extras-commits at redhat.com  Thu Oct 26 20:23:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:23:56 -0700
Subject: rpms/geomview/FC-5 geomview.spec,1.15,1.16
Message-ID: <200610262023.k9QKNuNP021459@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21443

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
- fixup desktop-file-install usage
- fixup geomview.desktop Categories

* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
  Conflicts: lam (bug #212435)




Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/geomview.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- geomview.spec	1 Oct 2006 21:54:51 -0000	1.15
+++ geomview.spec	26 Oct 2006 20:23:26 -0000	1.16
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.21.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,10 +190,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   %{SOURCE1}
 
 # app icon
@@ -205,9 +203,12 @@
 # maniview manpage
 %{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
-# rename animate.1 that Conflicts: ImageMagick
-test -f $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 && \
-  mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1
+# rename animate.1 that Conflicts: ImageMagick (#202039)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
+# rename sweep.1 that Conflicts: lam (#212435)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
 
 # rpmdocs
 make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
@@ -276,6 +277,14 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
+- fixup desktop-file-install usage
+- fixup geomview.desktop Categories
+
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
+- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
+  Conflicts: lam (bug #212435)
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
 - 1.8.2rc9
 



From fedora-extras-commits at redhat.com  Thu Oct 26 20:29:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:29:48 -0700
Subject: rpms/geomview/devel geomview.spec,1.30,1.31
Message-ID: <200610262029.k9QKTmTi021541@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21520

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
- re-instate dfi --vendor=fedora (thanks Ville!) 



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- geomview.spec	26 Oct 2006 20:03:51 -0000	1.30
+++ geomview.spec	26 Oct 2006 20:29:17 -0000	1.31
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.24.%{beta}%{?dist}
+Release: 0.25.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,7 +190,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-desktop-file-install --vendor="" \
+desktop-file-install --vendor="fedora" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
+- re-instate dfi --vendor=fedora (thanks Ville!) 
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
 - fixup desktop-file-install usage
 - fixup geomview.desktop Categories



From fedora-extras-commits at redhat.com  Thu Oct 26 20:31:53 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:31:53 -0700
Subject: rpms/maxima/devel maxima.spec,1.42,1.43 xmaxima.desktop,1.4,1.5
Message-ID: <200610262031.k9QKVre7021625@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21605

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10-0-6
- respin for sbcl-0.9.18
- fixup %triggerun's



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- maxima.spec	2 Oct 2006 16:55:41 -0000	1.42
+++ maxima.spec	26 Oct 2006 20:31:22 -0000	1.43
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -303,11 +303,16 @@
 ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||:
 
 %triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+if [ $2 -eq 0 ]; then
+ rm -f %{emacs_sitelisp}/maxima || :
+ rm -f %{emacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 %triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
-
+if [ $2 -eq 0 ]; then
+ rm -f %{xemacs_sitelisp}/maxima || :
+ rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 
 %clean
@@ -380,6 +385,10 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10-0-6
+- respin for sbcl-0.9.18
+- fixup %%triggerun's
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
 - update xdg-utils patch (for .dvi handling too)
 


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/xmaxima.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmaxima.desktop	5 Jan 2006 14:56:22 -0000	1.4
+++ xmaxima.desktop	26 Oct 2006 20:31:22 -0000	1.5
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Application;Science;Education;Math;
+Categories=Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Thu Oct 26 20:37:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 13:37:44 -0700
Subject: rpms/maxima/devel maxima.spec,1.43,1.44
Message-ID: <200610262037.k9QKbi7g021716@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21698

Modified Files:
	maxima.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-7
- respin for sbcl-0.9.18
- fixup %triggerun's
- drop dfi --add-category=X-Fedora



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- maxima.spec	26 Oct 2006 20:31:22 -0000	1.43
+++ maxima.spec	26 Oct 2006 20:37:14 -0000	1.44
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -158,7 +158,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 # almost any sbcl will do, but we want to be sure we're using the latest -- Rex
-BuildRequires: sbcl >= 0.9.17
+BuildRequires: sbcl >= 0.9.18
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -239,7 +239,7 @@
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" --vendor="fedora" \
+  --vendor="fedora" \
   %{SOURCE2} 
 
 # emaxima LaTeX style
@@ -385,9 +385,10 @@
 
 
 %changelog
-* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10-0-6
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-7
 - respin for sbcl-0.9.18
 - fixup %%triggerun's
+- drop dfi --add-category=X-Fedora
 
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
 - update xdg-utils patch (for .dvi handling too)



From fedora-extras-commits at redhat.com  Thu Oct 26 20:57:54 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 26 Oct 2006 13:57:54 -0700
Subject: check-mirrors check-mirrors.conf, 1.9, 1.10 check-mirrors.py, 1.31,
	1.32 return-mirrorlist.py, 1.17, 1.18
Message-ID: <200610262057.k9QKvsnu021932@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21911

Modified Files:
	check-mirrors.conf check-mirrors.py return-mirrorlist.py 
Log Message:
fixed multiple bugs discovered during the FC6 launch
return mirrors had a recursive function that would get called regularly
check-mirrors assumed that when an update failed, it should insert.  Not the case if the db is simply locked.




Index: check-mirrors.conf
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- check-mirrors.conf	2 Aug 2006 22:03:46 -0000	1.9
+++ check-mirrors.conf	26 Oct 2006 20:57:52 -0000	1.10
@@ -1,52 +1,175 @@
 [global]
-db=/tmp/mirrors.db
+db=/var/www/mirrors/mirrors.db
+
+[rawhide]
+inputfile = http://fedoraproject.org/mirrors/fedora-core-rawhide
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://Download.fedoraproject.org/pub/fedora/linux/core/development/$ARCH/os/
+file_prefix = rawhide
+
+[core-6]
+inputfile = http://fedoraproject.org/mirrors/fedora-core-6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/6/$ARCH/os/
+file_prefix = core-6 
+
+[extras-6]
+inputfile = http://fedoraproject.org/mirrors/fedora-extras-6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/6/$ARCH/
+file_prefix = extras-6
+
+[updates-released-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-released-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/6/$ARCH/
+file_prefix = updates-released-fc6
+
+[updates-released-debug-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-released-debug-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/6/$ARCH/debug/
+file_prefix = updates-released-debug-fc6
+
+[updates-released-source-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-released-source-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/6/SRPMS/
+file_prefix = updates-released-source-fc6
+
+[updates-testing-source-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-source-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/testing/6/SRPMS/
+file_prefix = updates-testing-source-fc6
+
+[updates-testing-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/testing/6/$ARCH/
+file_prefix = updates-testing-fc6
+
+[updates-testing-debug-fc6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-debug/fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/testing/6/$ARCH/debug
+file_prefix = updates-testing-fc6
+
+[core-source-6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/6/SRPMS/
+file_prefix = core-source-6
+
+[extras-source-6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/6/SRPMS/
+file_prefix = extras-source-6
+
+[core-debug-6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/6/$ARCH/debug/
+file_prefix = core-debug-6
+
+[extras-debug-6]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/6/$ARCH/debug/
+file_prefix = extras-debug-6
+
+[legacy-updates-6]
+inputfile = http://fedoraproject.org/mirrors/legacy-updates-released-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://download.fedoralegacy.org/fedora/6/updates/$ARCH
+file_prefix = legacy-updates-6
+
+[legacy-updates-testing-6]
+inputfile = http://fedoraproject.org/mirrors/legacy-updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://download.fedoralegacy.org/fedora/6/updates-testing/$ARCH
+file_prefix = legacy-updates-6
+
+
+[extras-source-devel]
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc6
+outputpath = /var/www/mirrors
+archlist = i386, x86_64, ppc
+timeout = 2
+canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/development/SRPMS/
+file_prefix = extras-source-devel
+
+
 
 [core-5]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-core-5
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/fedora-core-5
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
+timeout = 2
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/5/$ARCH/os/
 file_prefix = core-5 
 
 [extras-5]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-extras-5
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/fedora-extras-5
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
+timeout = 2
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/5/$ARCH/
 file_prefix = extras-5
 
 [updates-released-5]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-core-5
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/updates-released-fc5
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
+timeout = 2
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/5/$ARCH/
 file_prefix = updates-released-5
 
 [updates-testing-5]
-inputfile = http://fedora.redhat.com/download/mirrors/updates-testing-fc5
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/updates-testing-fc5
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
+timeout = 2
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/updates/testing/5/$ARCH/
 file_prefix = updates-testing-5
 
-[rawhide]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
-outputpath = /tmp/var/www/mirrors
-archlist = i386, x86_64, ppc
-timeout = 10
-canonical = http://download.fedoraproject.org/pub/fedora/linux/core/development/$ARCH/os/
-file_prefix = rawhide
-
 [extras-devel]
-inputfile = http://fedora.redhat.com/download/mirrors/fedora-extras-devel
-outputpath = /tmp/var/www/mirrors
+inputfile = http://fedoraproject.org/mirrors/fedora-extras-devel
+outputpath = /var/www/mirrors
 archlist = i386, x86_64, ppc
-timeout = 10
-canonical = http://download.fedoraproject.org/pub/fedora/linux/extras/development/$ARCH/
+timeout = 2
+canonical = http://Download.fedoraproject.org/pub/fedora/linux/extras/development/$ARCH/
 file_prefix = extras-devel
 
 #legacy-updates-released


Index: check-mirrors.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- check-mirrors.py	27 Sep 2006 01:49:59 -0000	1.31
+++ check-mirrors.py	26 Oct 2006 20:57:52 -0000	1.32
@@ -27,7 +27,7 @@
 # - pull mirrors from the database instead of fedora.redhat.com ?
 
 
-debug = False
+debug = True
 
 __revision__ = '$Id$'
 CONFIG = '/etc/check-mirrors.conf'
@@ -102,6 +102,8 @@
             self.dbcursor.execute(sql)
             self.dbconn.commit()
         except sqlite.Error, errmsg:
+            if '%s' % errmsg == 'database is locked':
+                return 1
             errorprint("Query: %s" % sql)
             errorprint("Query Error: %s" % errmsg)
             return False


Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- return-mirrorlist.py	15 Oct 2006 04:02:23 -0000	1.17
+++ return-mirrorlist.py	26 Oct 2006 20:57:52 -0000	1.18
@@ -78,7 +78,7 @@
             dataList.append([ item for item in row])
         return dataList
 
-    def printMirrors(self):
+    def printMirrors(self,recursive=0):
         """ Print mirrors """
         rows = self.getMirrors(self.repo, self.arch, self.country)
         results = 0
@@ -88,11 +88,11 @@
                 results = results + 1
 
         if results == 0:
-            if self.country != 'global':
+            if self.country != 'global' and recursive == 0:
                 print '# No results found for country: %s\n# Defaulting to global' % self.country
 		#self.country='global'
                 self.countrySQL=''
-                self.printMirrors()
+                self.printMirrors(recursive = 1)
                 #self.printMirrors(self.repo, self.arch, 'global')
             else:
                 print '# no mirrors found, using default'



From fedora-extras-commits at redhat.com  Thu Oct 26 21:07:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 14:07:48 -0700
Subject: rpms/geomview/FC-6 geomview.spec,1.28,1.29
Message-ID: <200610262107.k9QL7m55024966@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24942

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
- re-instate dfi --vendor=fedora (thanks Ville!) 



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-6/geomview.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- geomview.spec	26 Oct 2006 20:21:06 -0000	1.28
+++ geomview.spec	26 Oct 2006 21:07:17 -0000	1.29
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.24.%{beta}%{?dist}
+Release: 0.25.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,7 +190,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-desktop-file-install --vendor="" \
+desktop-file-install --vendor="fedora" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
+- re-instate dfi --vendor=fedora (thanks Ville!) 
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
 - fixup desktop-file-install usage
 - fixup geomview.desktop Categories



From fedora-extras-commits at redhat.com  Thu Oct 26 21:08:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Oct 2006 14:08:36 -0700
Subject: rpms/geomview/FC-5 geomview.spec,1.16,1.17
Message-ID: <200610262108.k9QL8aX1025028@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25012

Modified Files:
	geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
- re-instate dfi --vendor=fedora (thanks Ville!) 



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-5/geomview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geomview.spec	26 Oct 2006 20:23:26 -0000	1.16
+++ geomview.spec	26 Oct 2006 21:08:06 -0000	1.17
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.24.%{beta}%{?dist}
+Release: 0.25.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,7 +190,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-desktop-file-install --vendor="" \
+desktop-file-install --vendor="fedora" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.25.rc9
+- re-instate dfi --vendor=fedora (thanks Ville!) 
+
 * Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
 - fixup desktop-file-install usage
 - fixup geomview.desktop Categories



From fedora-extras-commits at redhat.com  Thu Oct 26 21:36:14 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Oct 2006 14:36:14 -0700
Subject: rpms/tuxpaint/devel tuxpaint.spec,1.13,1.14
Message-ID: <200610262136.k9QLaE9n025244@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25223

Modified Files:
	tuxpaint.spec 
Log Message:
Drop "--add-category X-Fedora".


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tuxpaint.spec	24 Oct 2006 18:56:11 -0000	1.13
+++ tuxpaint.spec	26 Oct 2006 21:35:44 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           tuxpaint
 Version:        0.9.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -49,7 +49,6 @@
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--vendor fedora \
-	--add-category X-Fedora \
 	%{SOURCE1}
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -71,6 +70,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Thu Oct 26 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-2
+- Drop "--add-category X-Fedora".
+
 * Tue Oct 24 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-1
 - Update to 0.9.16.
 



From fedora-extras-commits at redhat.com  Thu Oct 26 21:41:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:41:09 -0700
Subject: rpms/php-pear-XML-Serializer - New directory
Message-ID: <200610262141.k9QLf9e4025507@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503/php-pear-XML-Serializer

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Serializer added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 26 21:41:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:41:15 -0700
Subject: rpms/php-pear-XML-Serializer/devel - New directory
Message-ID: <200610262141.k9QLfFtf025521@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503/php-pear-XML-Serializer/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-Serializer/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Oct 26 21:41:27 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:41:27 -0700
Subject: rpms/php-pear-XML-Serializer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610262141.k9QLfRLe025552@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25546

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-XML-Serializer


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-XML-Serializer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Oct 26 21:41:33 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:41:33 -0700
Subject: rpms/php-pear-XML-Serializer/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610262141.k9QLfXFE025569@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25546/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-XML-Serializer


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Oct 26 21:42:22 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:42:22 -0700
Subject: rpms/php-pear-XML-Serializer import.log,1.1,1.2
Message-ID: <200610262142.k9QLgMis025649@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25610

Modified Files:
	import.log 
Log Message:
auto-import php-pear-XML-Serializer-0.18.0-2 on branch devel from php-pear-XML-Serializer-0.18.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Serializer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Oct 2006 21:41:27 -0000	1.1
+++ import.log	26 Oct 2006 21:41:52 -0000	1.2
@@ -0,0 +1 @@
+php-pear-XML-Serializer-0_18_0-2:HEAD:php-pear-XML-Serializer-0.18.0-2.src.rpm:1161898909



From fedora-extras-commits at redhat.com  Thu Oct 26 21:42:23 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:42:23 -0700
Subject: rpms/php-pear-XML-Serializer/devel php-pear-XML-Serializer.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610262142.k9QLgNww025653@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-Serializer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25610/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-XML-Serializer.spec 
Log Message:
auto-import php-pear-XML-Serializer-0.18.0-2 on branch devel from php-pear-XML-Serializer-0.18.0-2.src.rpm


--- NEW FILE php-pear-XML-Serializer.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name XML_Serializer

Name:           php-pear-XML-Serializer
Version:        0.18.0
Release:        2%{?dist}
Summary:        Swiss-army knife for reading and writing XML files

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/XML_Serializer
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(XML_Util) php-pear(XML_Parser)
Requires:       php-xml
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
XML_Serializer serializes complex data structures like arrays or object as
XML documents. This class helps you generating any XML document you require
without the need for DOM.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/doc docdir/%{pear_name}

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/XML/*


%changelog
* Mon Oct 16 2006 Christopher Stone <chris.stone at gmail.com> 0.18.0-2
- Move the todo file in %%{pear_datadir} into %%doc

* Sat Oct 14 2006 Christopher Stone <chris.stone at gmail.com> 0.18.0-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Serializer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Oct 2006 21:41:32 -0000	1.1
+++ .cvsignore	26 Oct 2006 21:41:53 -0000	1.2
@@ -0,0 +1 @@
+XML_Serializer-0.18.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Serializer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Oct 2006 21:41:32 -0000	1.1
+++ sources	26 Oct 2006 21:41:53 -0000	1.2
@@ -0,0 +1 @@
+f9d7dd792a7b3258dfa4544017734cf8  XML_Serializer-0.18.0.tgz



From fedora-extras-commits at redhat.com  Thu Oct 26 21:46:19 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 26 Oct 2006 14:46:19 -0700
Subject: owners owners.list,1.1874,1.1875
Message-ID: <200610262146.k9QLkJSf025713@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25697

Modified Files:
	owners.list 
Log Message:
php-pear-XML-Serializer


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1874
retrieving revision 1.1875
diff -u -r1.1874 -r1.1875
--- owners.list	25 Oct 2006 22:05:35 -0000	1.1874
+++ owners.list	26 Oct 2006 21:45:48 -0000	1.1875
@@ -1776,6 +1776,7 @@
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Parser|XML parsing class based on PHP's bundled expat|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-XML-Serializer|Swiss-army knife for reading and writing XML files|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Util|XML utility class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-apc|APC caches and optimizes PHP intermediate code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Oct 26 22:23:08 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 26 Oct 2006 15:23:08 -0700
Subject: rpms/imlib2/devel imlib2-1.3.0-multilib.patch, NONE, 1.1 imlib2.spec,
	1.23, 1.24
Message-ID: <200610262223.k9QMN86F029455@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29364

Modified Files:
	imlib2.spec 
Added Files:
	imlib2-1.3.0-multilib.patch 
Log Message:
* Thu Oct 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-2
- Multilib devel goodness (make -devel i386 and x86_64 parallel installable)
- Fix bug 212469
- Add libid3tag-devel to the BR's so id3tag support gets build in


imlib2-1.3.0-multilib.patch:

--- NEW FILE imlib2-1.3.0-multilib.patch ---
--- imlib2-1.3.0/configure.in~	2006-10-27 00:18:39.000000000 +0200
+++ imlib2-1.3.0/configure.in	2006-10-27 00:18:39.000000000 +0200
@@ -190,7 +190,7 @@
   AC_PATH_XTRA
   x_dir=${x_dir:-/usr/X11R6}
   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+  x_libs="-lX11 -lXext"
   AM_CONDITIONAL(BUILD_X11, true)
   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
 else
--- imlib2-1.3.0/configure~	2006-10-27 00:18:25.000000000 +0200
+++ imlib2-1.3.0/configure	2006-10-27 00:18:25.000000000 +0200
@@ -23117,7 +23117,7 @@
 
   x_dir=${x_dir:-/usr/X11R6}
   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+  x_libs="-lX11 -lXext"
 
 
 if true; then
--- imlib2-1.3.0/imlib2-config.in~	2006-10-27 00:17:29.000000000 +0200
+++ imlib2-1.3.0/imlib2-config.in	2006-10-27 00:17:29.000000000 +0200
@@ -45,8 +45,7 @@
       echo $includes
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -lImlib2 @my_libs@
+      echo -lImlib2 @my_libs@
       ;;
     *)
       echo "${usage}" 1>&2


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- imlib2.spec	24 Oct 2006 20:25:51 -0000	1.23
+++ imlib2.spec	26 Oct 2006 22:22:38 -0000	1.24
@@ -1,16 +1,17 @@
 Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
 Version:	1.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.enlightenment.org/Libraries/Imlib2/
 Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
 Patch0:		imlib2-1.2.1-X11-path.patch
+Patch1:         imlib2-1.3.0-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libjpeg-devel libpng-devel libtiff-devel
-BuildRequires:	libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
-BuildRequires:	libX11-devel libXext-devel pkgconfig
+BuildRequires:	giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
+BuildRequires:	libX11-devel libXext-devel libid3tag-devel pkgconfig
 
 %package devel
 Summary:	Development package for %{name}
@@ -43,6 +44,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .x11-path
+%patch1 -p1 -b .multilib
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
 
 
 %build
@@ -107,6 +114,11 @@
 
 
 %changelog
+* Thu Oct 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-2
+- Multilib devel goodness (make -devel i386 and x86_64 parallel installable)
+- Fix bug 212469
+- Add libid3tag-devel to the BR's so id3tag support gets build in
+
 * Tue Oct 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
 - New upstream release 1.3.0
 



From fedora-extras-commits at redhat.com  Thu Oct 26 23:53:58 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 16:53:58 -0700
Subject: rpms/php-json/FC-6 php-json.spec,1.6,1.7
Message-ID: <200610262353.k9QNrwW2001153@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-json/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1137

Modified Files:
	php-json.spec 
Log Message:
Rebuilding for new PHP



Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-6/php-json.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-json.spec	4 Sep 2006 23:00:45 -0000	1.6
+++ php-json.spec	26 Oct 2006 23:53:28 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -62,6 +62,9 @@
 %{php_extdir}/json.so
 
 %changelog
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-4
+- Rebuild for new PHP
+
 * Mon Sep  4 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-3
 - New Maintainer
 - New FE php macros



From fedora-extras-commits at redhat.com  Fri Oct 27 00:00:32 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 17:00:32 -0700
Subject: rpms/php-json/FC-6 php-json.spec,1.7,1.8
Message-ID: <200610270000.k9R00W3i001224@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-json/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1195

Modified Files:
	php-json.spec 
Log Message:
tagged before I committed last time...



Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-6/php-json.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-json.spec	26 Oct 2006 23:53:28 -0000	1.7
+++ php-json.spec	27 Oct 2006 00:00:02 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -62,7 +62,7 @@
 %{php_extdir}/json.so
 
 %changelog
-* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-4
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-5
 - Rebuild for new PHP
 
 * Mon Sep  4 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-3



From fedora-extras-commits at redhat.com  Fri Oct 27 00:03:17 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 17:03:17 -0700
Subject: rpms/php-json/FC-5 php-json.spec,1.6,1.7
Message-ID: <200610270003.k9R03Hwe004227@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-json/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4211

Modified Files:
	php-json.spec 
Log Message:
Rebuild for new PHP



Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-5/php-json.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-json.spec	19 Aug 2006 18:23:10 -0000	1.6
+++ php-json.spec	27 Oct 2006 00:02:47 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -62,6 +62,9 @@
 %{php_extdir}/json.so
 
 %changelog
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-2
+- Rebuild for new PHP
+
 * Sat Aug 19 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-1
 - New Maintainer
 - Bumped to 1.2.1



From fedora-extras-commits at redhat.com  Fri Oct 27 00:06:12 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 17:06:12 -0700
Subject: rpms/php-shout/FC-6 php-shout.spec,1.4,1.5
Message-ID: <200610270006.k9R06CFE004303@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-shout/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4278

Modified Files:
	php-shout.spec 
Log Message:
Rebuild for new PHP



Index: php-shout.spec
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-6/php-shout.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-shout.spec	28 Aug 2006 04:46:57 -0000	1.4
+++ php-shout.spec	27 Oct 2006 00:05:42 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:		php-shout
 Version:	0.3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	PHP module for communicating with Icecast servers
 
 Source0:	http://dl.sf.net/phpshout/phpShout-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{php_extdir}/shout.so
 
 %changelog
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-7
+- Rebuild for new PHP
+
 * Fri Aug 11 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-6
 - Mass Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Fri Oct 27 00:08:06 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 26 Oct 2006 17:08:06 -0700
Subject: rpms/php-shout/FC-5 php-shout.spec,1.3,1.4
Message-ID: <200610270008.k9R086Fn004441@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-shout/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4419

Modified Files:
	php-shout.spec 
Log Message:
Rebuild for new PHP



Index: php-shout.spec
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-5/php-shout.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-shout.spec	15 Aug 2006 04:06:48 -0000	1.3
+++ php-shout.spec	27 Oct 2006 00:07:36 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		php-shout
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	PHP module for communicating with Icecast servers
 
 Source0:	http://dl.sf.net/phpshout/phpShout-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{php_extdir}/shout.so
 
 %changelog
+* Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-6
+- Rebuild for new PHP
+
 * Fri Aug 11 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-5
 - New FE php macros
 - Minor syntax / permission changes



From fedora-extras-commits at redhat.com  Fri Oct 27 01:19:08 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 26 Oct 2006 18:19:08 -0700
Subject: rpms/wordpress/FC-4 README.fedora.wordpress, 1.1, 1.2 wordpress.spec,
	1.4, 1.5
Message-ID: <200610270119.k9R1J8Hl007689@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/wordpress/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622/FC-4

Modified Files:
	README.fedora.wordpress wordpress.spec 
Log Message:
Doc update fixing BZ 207822, release bump



Index: README.fedora.wordpress
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-4/README.fedora.wordpress,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora.wordpress	4 Jul 2006 05:25:59 -0000	1.1
+++ README.fedora.wordpress	27 Oct 2006 01:18:38 -0000	1.2
@@ -21,6 +21,12 @@
   Bye
   #
 
+Under certain curcumstances, you may need to run variations of the "grant"
+command:
+mysql> grant all privileges on wordpress.* to wordpress at localhost identified by 'wordpress';
+   OR
+mysql> grant all privileges on wordpress.* to wordpress@'%' identified by 'wordpress';
+
 This has created an empty database called 'wordpress', created a user named
 'wordpress' with a password of 'wordpress', and given the 'wordpress' user total
 permission over the 'wordpress' database.  Obviously, you'll want to select a


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-4/wordpress.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wordpress.spec	12 Aug 2006 21:56:32 -0000	1.4
+++ wordpress.spec	27 Oct 2006 01:18:38 -0000	1.5
@@ -3,7 +3,7 @@
 Name: wordpress
 Version: 2.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 # Source0 with name-version does not work for web retrieval, 
 # latest.tar.gz does not work for build
@@ -72,6 +72,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 26 2006 John Berninger <jwb at redhat dot com> - 2.0.4-1
+- Doc fix for BZ 207822
+
 * Sat Aug 12 2006 John Berninger <jwb at redhat dot com> - 2.0.4-0
 - Multiple security vuln's fixed upstream - bz 201989
 



From fedora-extras-commits at redhat.com  Fri Oct 27 01:19:10 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 26 Oct 2006 18:19:10 -0700
Subject: rpms/wordpress/FC-6 README.fedora.wordpress, 1.1, 1.2 wordpress.spec,
	1.5, 1.6
Message-ID: <200610270119.k9R1JAtk007697@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/wordpress/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622/FC-6

Modified Files:
	README.fedora.wordpress wordpress.spec 
Log Message:
Doc update fixing BZ 207822, release bump



Index: README.fedora.wordpress
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/README.fedora.wordpress,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora.wordpress	4 Jul 2006 05:25:39 -0000	1.1
+++ README.fedora.wordpress	27 Oct 2006 01:18:40 -0000	1.2
@@ -21,6 +21,12 @@
   Bye
   #
 
+Under certain curcumstances, you may need to run variations of the "grant"
+command:
+mysql> grant all privileges on wordpress.* to wordpress at localhost identified by 'wordpress';
+   OR
+mysql> grant all privileges on wordpress.* to wordpress@'%' identified by 'wordpress';
+
 This has created an empty database called 'wordpress', created a user named
 'wordpress' with a password of 'wordpress', and given the 'wordpress' user total
 permission over the 'wordpress' database.  Obviously, you'll want to select a


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/wordpress.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wordpress.spec	12 Aug 2006 22:25:05 -0000	1.5
+++ wordpress.spec	27 Oct 2006 01:18:40 -0000	1.6
@@ -3,7 +3,7 @@
 Name: wordpress
 Version: 2.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 # Source0 with name-version does not work for web retrieval, 
 # latest.tar.gz does not work for build
@@ -72,6 +72,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 26 2006 John Berninger <jwb at redhat dot com> - 2.0.4-1
+- Doc fix for BZ 207822
+
 * Sat Aug 12 2006 John Berninger <jwb at redhat dot com> - 2.0.4-0
 - Upstream security vulns - bz 201989
 



From fedora-extras-commits at redhat.com  Fri Oct 27 01:19:09 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 26 Oct 2006 18:19:09 -0700
Subject: rpms/wordpress/FC-5 README.fedora.wordpress, 1.1, 1.2 wordpress.spec,
	1.5, 1.6
Message-ID: <200610270119.k9R1J90Z007693@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/wordpress/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622/FC-5

Modified Files:
	README.fedora.wordpress wordpress.spec 
Log Message:
Doc update fixing BZ 207822, release bump



Index: README.fedora.wordpress
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-5/README.fedora.wordpress,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora.wordpress	4 Jul 2006 05:23:21 -0000	1.1
+++ README.fedora.wordpress	27 Oct 2006 01:18:39 -0000	1.2
@@ -21,6 +21,12 @@
   Bye
   #
 
+Under certain curcumstances, you may need to run variations of the "grant"
+command:
+mysql> grant all privileges on wordpress.* to wordpress at localhost identified by 'wordpress';
+   OR
+mysql> grant all privileges on wordpress.* to wordpress@'%' identified by 'wordpress';
+
 This has created an empty database called 'wordpress', created a user named
 'wordpress' with a password of 'wordpress', and given the 'wordpress' user total
 permission over the 'wordpress' database.  Obviously, you'll want to select a


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-5/wordpress.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wordpress.spec	12 Aug 2006 22:05:55 -0000	1.5
+++ wordpress.spec	27 Oct 2006 01:18:39 -0000	1.6
@@ -3,7 +3,7 @@
 Name: wordpress
 Version: 2.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 # Source0 with name-version does not work for web retrieval, 
 # latest.tar.gz does not work for build
@@ -72,6 +72,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 26 2006 John Benringer <jwb at redhat dot com> - 2.0.4-1
+- Doc fix for BZ 207822
+
 * Sat Aug 12 2006 John Berninger <jwb at redhat dot com> - 2.0.4-0
 - Multiple upstream security vulns - bz 201989
 



From fedora-extras-commits at redhat.com  Fri Oct 27 01:19:11 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 26 Oct 2006 18:19:11 -0700
Subject: rpms/wordpress/devel README.fedora.wordpress, 1.1,
	1.2 wordpress.spec, 1.5, 1.6
Message-ID: <200610270119.k9R1JB4c007701@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622/devel

Modified Files:
	README.fedora.wordpress wordpress.spec 
Log Message:
Doc update fixing BZ 207822, release bump



Index: README.fedora.wordpress
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/README.fedora.wordpress,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora.wordpress	4 Jul 2006 05:25:39 -0000	1.1
+++ README.fedora.wordpress	27 Oct 2006 01:18:40 -0000	1.2
@@ -21,6 +21,12 @@
   Bye
   #
 
+Under certain curcumstances, you may need to run variations of the "grant"
+command:
+mysql> grant all privileges on wordpress.* to wordpress at localhost identified by 'wordpress';
+   OR
+mysql> grant all privileges on wordpress.* to wordpress@'%' identified by 'wordpress';
+
 This has created an empty database called 'wordpress', created a user named
 'wordpress' with a password of 'wordpress', and given the 'wordpress' user total
 permission over the 'wordpress' database.  Obviously, you'll want to select a


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wordpress.spec	12 Aug 2006 22:25:05 -0000	1.5
+++ wordpress.spec	27 Oct 2006 01:18:40 -0000	1.6
@@ -3,7 +3,7 @@
 Name: wordpress
 Version: 2.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 # Source0 with name-version does not work for web retrieval, 
 # latest.tar.gz does not work for build
@@ -72,6 +72,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Thu Oct 26 2006 John Berninger <jwb at redhat dot com> - 2.0.4-1
+- Doc fix for BZ 207822
+
 * Sat Aug 12 2006 John Berninger <jwb at redhat dot com> - 2.0.4-0
 - Upstream security vulns - bz 201989
 



From fedora-extras-commits at redhat.com  Fri Oct 27 07:45:47 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 27 Oct 2006 00:45:47 -0700
Subject: fedora-security/audit fc5,1.373,1.374 fc6,1.126,1.127
Message-ID: <200610270745.k9R7jlPn027390@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27370

Modified Files:
	fc5 fc6 
Log Message:
Latest CVE and fedora mails



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- fc5	26 Oct 2006 19:41:51 -0000	1.373
+++ fc5	27 Oct 2006 07:45:44 -0000	1.374
@@ -3,7 +3,9 @@
 
 ** are items that need attention
 
-CVE-2006-5540 VULNERABLE (postgresql) #212360
+CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -1654,7 +1656,7 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
-CVE-2003-1307 ** mod_php
+CVE-2003-1307 ignore (mod_php) not a vulnerability
 CVE-2003-1303 version (php, fixed 4.3.3)
 CVE-2003-1302 version (php, fixed 4.3.1)
 CVE-2003-1295 version (xscreensaver)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- fc6	26 Oct 2006 19:41:51 -0000	1.126
+++ fc6	27 Oct 2006 07:45:44 -0000	1.127
@@ -1,9 +1,11 @@
-Up to date CVE as of CVE email 20061024
-Up to date FC6 as of 20061024
+Up to date CVE as of CVE email 20061026
+Up to date FC6 as of 20061026
 
 ** are items that need attention
 
-CVE-2006-5540 VULNERABLE (postgresql) #212360
+CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -1442,6 +1444,7 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
+CVE-2003-1307 ignore (mod_php) not a vulnerability
 CVE-2003-1303 version (php, fixed 4.3.3)
 CVE-2003-1302 version (php, fixed 4.3.1)
 CVE-2003-1265 VULNERABLE (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=198442



From fedora-extras-commits at redhat.com  Fri Oct 27 09:14:29 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 27 Oct 2006 02:14:29 -0700
Subject: rpms/international-time/devel international-time.spec,1.2,1.3
Message-ID: <200610270914.k9R9ET8h001316@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1300

Modified Files:
	international-time.spec 
Log Message:
* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
- Better categories for the desktop file.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/devel/international-time.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- international-time.spec	25 Oct 2006 10:55:05 -0000	1.2
+++ international-time.spec	27 Oct 2006 09:13:58 -0000	1.3
@@ -42,6 +42,8 @@
 install -m 0644 international-time.glade %{buildroot}%{_datadir}/%{name}
 desktop-file-install --vendor fedora \
   --dir %{buildroot}%{_datadir}/applications \
+  --add-category Utility \
+  --add-category Application \
   --add-category X-Fedora \
   international-time.desktop
 
@@ -64,6 +66,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
+- Better categories for the desktop file.
+
 * Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
 - Update desktop database on installation.
 



From fedora-extras-commits at redhat.com  Fri Oct 27 09:18:03 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 27 Oct 2006 02:18:03 -0700
Subject: extras-buildsys/utils/pushscript List.py,NONE,1.1
Message-ID: <200610270918.k9R9I3SD001908@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1879

Added Files:
	List.py 
Log Message:
just a helper: list pending build jobs


--- NEW FILE List.py ---
#!/usr/bin/python -t
# -*- mode: Python; indent-tabs-mode: nil; -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

import errno, os, sys

import Utils, Push


def main(cfg,dists):
    if not dists:
        dists = cfg.alldists
    
    for dist in dists:
        distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
        print distdir+':'
        needsignroot = os.path.join(cfg.stagesdir, distdir)
        results = Push.get_build_results(needsignroot,droppushed=True)
        for (name,pkgrelroots) in results:
            for pkgrelroot in pkgrelroots:
                print '    '+name+'-'+os.path.basename(pkgrelroot)
        print


if __name__ == '__main__':
    if len(sys.argv) < 2:
        print 'Usage: %s <project> [release]...\n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)

    cfg = Utils.load_config_module(sys.argv[1])

    Utils.signer_gid_check(cfg.signersgid)
    os.umask(cfg.signersumask)
    main(cfg,sys.argv[2:])
    sys.exit(0)



From fedora-extras-commits at redhat.com  Fri Oct 27 09:33:33 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 27 Oct 2006 02:33:33 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.3,1.4
Message-ID: <200610270933.k9R9XXA9005190@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5066

Modified Files:
	international-time.spec 
Log Message:
* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
- Better categories for the desktop file.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- international-time.spec	25 Oct 2006 16:19:15 -0000	1.3
+++ international-time.spec	27 Oct 2006 09:33:03 -0000	1.4
@@ -42,6 +42,8 @@
 install -m 0644 international-time.glade %{buildroot}%{_datadir}/%{name}
 desktop-file-install --vendor fedora \
   --dir %{buildroot}%{_datadir}/applications \
+  --add-category Utility \
+  --add-category Application \
   --add-category X-Fedora \
   international-time.desktop
 
@@ -64,6 +66,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
+- Better categories for the desktop file.
+
 * Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1
 - Update desktop database on installation.
 



From fedora-extras-commits at redhat.com  Fri Oct 27 09:35:00 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 27 Oct 2006 02:35:00 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.4,1.5
Message-ID: <200610270935.k9R9Z0h0005517@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5392

Modified Files:
	international-time.spec 
Log Message:
0.0.2-2.2


Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- international-time.spec	27 Oct 2006 09:33:03 -0000	1.4
+++ international-time.spec	27 Oct 2006 09:34:30 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: 	A tool for arranging times in advance with overseas colleagues
 Name: 		international-time
 Version: 	0.0.2
-Release: 	2%{?dist}.1
+Release: 	2%{?dist}.2
 License: 	GPL
 Group: 		Applications/System
 Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
@@ -66,7 +66,7 @@
 %{_datadir}/applications/*
 
 %changelog
-* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.2
 - Better categories for the desktop file.
 
 * Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1



From fedora-extras-commits at redhat.com  Fri Oct 27 11:29:34 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Fri, 27 Oct 2006 04:29:34 -0700
Subject: rpms/licq/devel .cvsignore, 1.3, 1.4 licq.spec, 1.11, 1.12 sources, 
	1.3, 1.4 licq-1.3.2-gcc-4_1-patch, 1.1,
	NONE licq-1.3.2-libdir.patch, 1.1, NONE licq-1.3.2-viewUrl.patch,
	1.1, NONE
Message-ID: <200610271129.k9RBTYkU018243@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18217

Modified Files:
	.cvsignore licq.spec sources 
Removed Files:
	licq-1.3.2-gcc-4_1-patch licq-1.3.2-libdir.patch 
	licq-1.3.2-viewUrl.patch 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2006 13:51:41 -0000	1.3
+++ .cvsignore	27 Oct 2006 11:29:04 -0000	1.4
@@ -1,2 +1 @@
-licq-1.3.2.tar.bz2
-licq-viewurl.sh
+licq-1.3.4.tar.gz


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- licq.spec	4 Oct 2006 23:03:17 -0000	1.11
+++ licq.spec	27 Oct 2006 11:29:04 -0000	1.12
@@ -1,9 +1,8 @@
 Name: licq
-Version: 1.3.2
-Release: 11
+Version: 1.3.4
+Release: 1
 License: GPL
-Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
-Source1: licq-viewurl.sh
+Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/
 Summary: Licq - A graphical ICQ Client for Linux
 Group: Applications/Internet
@@ -15,9 +14,6 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gettext, automake, libtool
-Patch1: licq-1.3.2-gcc-4_1-patch
-Patch2: licq-1.3.2-libdir.patch
-Patch3: licq-1.3.2-viewUrl.patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -48,15 +44,14 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc-4_1
-%patch2 -p1 -b .libdir
-%patch3 -p1 -b .viewUrl
 
 #remove cvs stuff
 rm -rf `find . -name CVS`
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+export KDEDIR=/usr/%_lib
+
 sed -i s/lib/%{_lib}/ include/licq_constants.h
 %configure
 make
@@ -67,12 +62,9 @@
   automake
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
-  export KDEDIR=/usr/%_lib
   %configure \
      --with-kde \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/
   make
 cd ../qt-gui
   aclocal
@@ -80,19 +72,10 @@
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
   %configure \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/ \
   make
-  #create Qt qm files
-  cd po
-  lrelease *.ts
-cd ../../osd
-  rm -rf autom4te.cache
-  sed -i s/aclocal-1.7/aclocal/ build
-  sed -i s/automake-1.7/automake/ build
-  ./build
-  %configure --libdir=%{_libdir}/licq
+cd ../osd
+  %configure --libdir=%{_libdir}/
   make
 
 %install
@@ -111,16 +94,13 @@
 cd ../osd
 make install
 
-#install url viewer
-install -m755 %SOURCE1 %buildroot/%_bindir/licq-viewurl.sh
-
 %find_lang licq_osd_plugin
 
 #remove devel 
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
-#remove licq.desktop installed by makefile
-rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/kde/licq.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +114,8 @@
 %{_bindir}/viewurl-netscape.sh
 %{_bindir}/viewurl-opera.sh
 %{_bindir}/viewurl-w3m.sh
-%attr(0755,root,root) %_bindir/licq-viewurl.sh
+%{_bindir}/viewurl-firefox.sh
+%{_bindir}/viewurl-seamonkey.sh
 %dir %{_libdir}/licq
 %{_libdir}/licq/licq_qt-gui.so
 %{_datadir}/licq
@@ -157,7 +138,7 @@
 %lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
 %lang(uk) %{_datadir}/licq/qt-gui/locale/uk.qm
 %{_datadir}/applications/fedora-licq.desktop
-%doc doc/ upgrade/ ChangeLog README* LICENSE
+%doc doc/ upgrade/ README* LICENSE
 
 %files kde
 %defattr(-,root,root)
@@ -170,8 +151,8 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.2-11
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Fri Sep 27 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-1
+- upgrade
 
 * Mon Sep 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-10
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2006 13:51:41 -0000	1.3
+++ sources	27 Oct 2006 11:29:04 -0000	1.4
@@ -1,2 +1 @@
-0471bb8fed91eefb23dfe153c9a4a806  licq-1.3.2.tar.bz2
-b5d06b8482e9f73c3889d0b445aace00  licq-viewurl.sh
+34a51541173a2ba453b5984b52bfa489  licq-1.3.4.tar.gz


--- licq-1.3.2-gcc-4_1-patch DELETED ---


--- licq-1.3.2-libdir.patch DELETED ---


--- licq-1.3.2-viewUrl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 12:35:18 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 27 Oct 2006 05:35:18 -0700
Subject: rpms/ORBit/devel ORBit.spec,1.2,1.3
Message-ID: <200610271235.k9RCZIfm021597@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/ORBit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21581

Modified Files:
	ORBit.spec 
Log Message:
Don't let the scriptlets "fail"



Index: ORBit.spec
===================================================================
RCS file: /cvs/extras/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ORBit.spec	28 Aug 2006 15:12:46 -0000	1.2
+++ ORBit.spec	27 Oct 2006 12:34:48 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		19%{?dist}
+Release:		20%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -75,10 +75,10 @@
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
 %preun devel
-[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir
+[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -120,6 +120,9 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Thu Oct 26 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-20
+- Don't let the scriptlets "fail"
+
 * Mon Aug 28 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-19
 - Fix undefined non-weak symbols in libIIOP.so (#202328)
 



From fedora-extras-commits at redhat.com  Fri Oct 27 12:36:41 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 27 Oct 2006 05:36:41 -0700
Subject: rpms/ORBit/FC-6 ORBit.spec,1.2,1.3
Message-ID: <200610271236.k9RCafql021662@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/ORBit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21646

Modified Files:
	ORBit.spec 
Log Message:
resync with devel


Index: ORBit.spec
===================================================================
RCS file: /cvs/extras/rpms/ORBit/FC-6/ORBit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ORBit.spec	28 Aug 2006 15:12:46 -0000	1.2
+++ ORBit.spec	27 Oct 2006 12:36:11 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		19%{?dist}
+Release:		20%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -75,10 +75,10 @@
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
 %preun devel
-[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir
+[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir || :
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -120,6 +120,9 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Thu Oct 26 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-20
+- Don't let the scriptlets "fail"
+
 * Mon Aug 28 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-19
 - Fix undefined non-weak symbols in libIIOP.so (#202328)
 



From fedora-extras-commits at redhat.com  Fri Oct 27 12:52:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 27 Oct 2006 05:52:14 -0700
Subject: rpms/libcddb/devel .cvsignore, 1.6, 1.7 libcddb.spec, 1.20,
	1.21 sources, 1.7, 1.8
Message-ID: <200610271252.k9RCqEPR021778@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libcddb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21754

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
- New upstream release 1.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2006 12:40:27 -0000	1.6
+++ .cvsignore	27 Oct 2006 12:51:44 -0000	1.7
@@ -1 +1 @@
-libcddb-1.2.2.tar.bz2
+libcddb-1.3.0.tar.bz2


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libcddb.spec	1 Oct 2006 12:40:27 -0000	1.20
+++ libcddb.spec	27 Oct 2006 12:51:44 -0000	1.21
@@ -1,6 +1,6 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.2.2
+Version:	1.3.0
 Release:	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-1
+- New upstream release 1.3.0
+
 * Sun Oct  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
 - New upstream release 1.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Oct 2006 12:40:27 -0000	1.7
+++ sources	27 Oct 2006 12:51:44 -0000	1.8
@@ -1 +1 @@
-0735015d78b2d951fae3e2fcfb660591  libcddb-1.2.2.tar.bz2
+e4a7f9579956c32b7f300eb12e9ea6df  libcddb-1.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 27 13:34:29 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 27 Oct 2006 06:34:29 -0700
Subject: rpms/bmp/FC-6 dead.package, NONE, 1.1 Makefile, 1.1, NONE beep.png, 
	1.1, NONE bmp-0.9.7-default-alsa.patch, 1.1,
	NONE bmp-0.9.7-default-skin.patch, 1.1,
	NONE bmp-0.9.7-readmacro.patch, 1.1,
	NONE bmp-0.9.7-shaded-skin.patch, 1.1,
	NONE bmp-0.9.7.1-xmms-skins.patch, 1.1, NONE bmp.sh, 1.2,
	NONE bmp.spec, 1.15, NONE branch, 1.1, NONE sources, 1.3, NONE
Message-ID: <200610271334.k9RDYTx3025025@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019

Added Files:
	dead.package 
Removed Files:
	Makefile beep.png bmp-0.9.7-default-alsa.patch 
	bmp-0.9.7-default-skin.patch bmp-0.9.7-readmacro.patch 
	bmp-0.9.7-shaded-skin.patch bmp-0.9.7.1-xmms-skins.patch 
	bmp.sh bmp.spec branch sources 
Log Message:
Obsolete package, obsoleted by audacious


--- NEW FILE dead.package ---
Obsolete package, obsoleted by audacious


--- Makefile DELETED ---


--- bmp-0.9.7-default-alsa.patch DELETED ---


--- bmp-0.9.7-default-skin.patch DELETED ---


--- bmp-0.9.7-readmacro.patch DELETED ---


--- bmp-0.9.7-shaded-skin.patch DELETED ---


--- bmp-0.9.7.1-xmms-skins.patch DELETED ---


--- bmp.sh DELETED ---


--- bmp.spec DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 13:35:04 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 27 Oct 2006 06:35:04 -0700
Subject: rpms/bmp/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE beep.png,
	1.1, NONE bmp-0.9.7-default-alsa.patch, 1.1,
	NONE bmp-0.9.7-default-skin.patch, 1.1,
	NONE bmp-0.9.7-readmacro.patch, 1.1,
	NONE bmp-0.9.7-shaded-skin.patch, 1.1,
	NONE bmp-0.9.7.1-xmms-skins.patch, 1.1, NONE bmp.sh, 1.2,
	NONE bmp.spec, 1.15, NONE sources, 1.3, NONE
Message-ID: <200610271335.k9RDZ43f025055@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25050

Added Files:
	dead.package 
Removed Files:
	Makefile beep.png bmp-0.9.7-default-alsa.patch 
	bmp-0.9.7-default-skin.patch bmp-0.9.7-readmacro.patch 
	bmp-0.9.7-shaded-skin.patch bmp-0.9.7.1-xmms-skins.patch 
	bmp.sh bmp.spec sources 
Log Message:
Obsolete package, obsoleted by audacious


--- NEW FILE dead.package ---
Obsolete package, obsoleted by audacious


--- Makefile DELETED ---


--- bmp-0.9.7-default-alsa.patch DELETED ---


--- bmp-0.9.7-default-skin.patch DELETED ---


--- bmp-0.9.7-readmacro.patch DELETED ---


--- bmp-0.9.7-shaded-skin.patch DELETED ---


--- bmp-0.9.7.1-xmms-skins.patch DELETED ---


--- bmp.sh DELETED ---


--- bmp.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 13:35:42 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 27 Oct 2006 06:35:42 -0700
Subject: rpms/bmp-flac2/FC-6 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE bmp-flac2.desktop, 1.1, NONE bmp-flac2.spec, 1.6,
	NONE branch, 1.1, NONE sources, 1.5, NONE
Message-ID: <200610271335.k9RDZgFN025086@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp-flac2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25081

Added Files:
	dead.package 
Removed Files:
	Makefile bmp-flac2.desktop bmp-flac2.spec branch sources 
Log Message:
Obsolete package, obsoleted by audacious


--- NEW FILE dead.package ---
Obsolete package, obsoleted by audacious


--- Makefile DELETED ---


--- bmp-flac2.desktop DELETED ---


--- bmp-flac2.spec DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 13:36:11 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 27 Oct 2006 06:36:11 -0700
Subject: rpms/bmp-flac2/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE bmp-flac2.desktop, 1.1, NONE bmp-flac2.spec, 1.6,
	NONE sources, 1.5, NONE
Message-ID: <200610271336.k9RDaBO6025117@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp-flac2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25112

Added Files:
	dead.package 
Removed Files:
	Makefile bmp-flac2.desktop bmp-flac2.spec sources 
Log Message:
Obsolete package, obsoleted by audacious


--- NEW FILE dead.package ---
Obsolete package, obsoleted by audacious


--- Makefile DELETED ---


--- bmp-flac2.desktop DELETED ---


--- bmp-flac2.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 13:51:04 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 06:51:04 -0700
Subject: rpms/xchat-gnome/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xchat-gnome-config.patch, 1.5, 1.6 xchat-gnome.spec, 1.28, 1.29
Message-ID: <200610271351.k9RDp4NB025274@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25247

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
- Update to 0.14.
- Remove xchat-gnome-remote.
- Drop X-Fedora desktop category.
- Use disable-schemas-install & disable-static with configure.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2006 15:42:35 -0000	1.11
+++ .cvsignore	27 Oct 2006 13:50:34 -0000	1.12
@@ -1 +1 @@
-xchat-gnome-0.13.tar.bz2
+xchat-gnome-0.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Jul 2006 15:42:35 -0000	1.11
+++ sources	27 Oct 2006 13:50:34 -0000	1.12
@@ -1 +1 @@
-5614773724afa0c2e617615722e10091  xchat-gnome-0.13.tar.bz2
+8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome-config.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchat-gnome-config.patch	26 Jul 2006 15:42:35 -0000	1.5
+++ xchat-gnome-config.patch	27 Oct 2006 13:50:34 -0000	1.6
@@ -1,30 +1,6 @@
-diff -ur xchat-gnome-0.13.OLD/plugins/perl/perl.c xchat-gnome-0.13/plugins/perl/perl.c
---- xchat-gnome-0.13.OLD/plugins/perl/perl.c	2006-05-01 11:31:57.000000000 -0400
-+++ xchat-gnome-0.13/plugins/perl/perl.c	2006-07-26 10:47:56.000000000 -0400
-@@ -93,7 +93,7 @@
- 	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
- 		xdir = xchat_get_info (ph, "xchatdir");
- 
--	/* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
-+	/* autoload from ~/.xchat-gnome/ or ${APPDATA}\X-Chat 2\ on win32 */
- 	perl_auto_load_from_path (xdir);
- 
- #ifdef WIN32
-diff -ur xchat-gnome-0.13.OLD/plugins/python/python.c xchat-gnome-0.13/plugins/python/python.c
---- xchat-gnome-0.13.OLD/plugins/python/python.c	2005-11-26 02:10:29.000000000 -0500
-+++ xchat-gnome-0.13/plugins/python/python.c	2006-07-26 10:47:32.000000000 -0400
-@@ -392,7 +392,7 @@
- 		return expanded;
- 	g_free(expanded);
- 
--	/* Check if ~/.xchat2/<filename> exists. */
-+	/* Check if ~/.xchat-gnome/<filename> exists. */
- 	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
- 				    filename, NULL);
- 	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-diff -ur xchat-gnome-0.13.OLD/src/common/cfgfiles.c xchat-gnome-0.13/src/common/cfgfiles.c
---- xchat-gnome-0.13.OLD/src/common/cfgfiles.c	2006-06-17 21:11:18.000000000 -0400
-+++ xchat-gnome-0.13/src/common/cfgfiles.c	2006-07-26 10:46:12.000000000 -0400
+diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
+--- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -43,10 +19,22 @@
  	}
  }
  
-diff -ur xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c	2006-04-17 18:15:14.000000000 -0400
-+++ xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c	2006-07-26 10:47:06.000000000 -0400
-@@ -182,7 +182,7 @@
+diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
+--- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
++++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
+@@ -100,7 +100,7 @@
+ void fe_get_int (char *prompt, int def, void *callback, void *ud);
+ #define FRF_WRITE 1	/* save file */
+ #define FRF_MULTIPLE 2	/* multi-select */
+-#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
++#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
+ #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
+ #define FRF_FILTERISINITIAL 16	/* unused */
+ #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
+diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
++++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+@@ -184,7 +184,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
  	homedir = g_get_home_dir();
@@ -55,7 +43,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -346,7 +346,7 @@
+@@ -347,7 +347,7 @@
  #endif
  
  	homedir = g_get_home_dir ();


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xchat-gnome.spec	31 Aug 2006 22:42:38 -0000	1.28
+++ xchat-gnome.spec	27 Oct 2006 13:50:34 -0000	1.29
@@ -1,9 +1,8 @@
-%define with_dbus 1
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.13
-Release:        4%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -22,10 +21,7 @@
 BuildRequires:  gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	gnome-doc-utils
-
-%if %{with_dbus}
 BuildRequires:	dbus-devel
-%endif
 
 # Leave as conditional until API is more stable.
 %if %{with_libnotify}
@@ -56,22 +52,18 @@
 
 
 %build
-%configure --disable-tcl --disable-scrollkeeper
+%configure --disable-tcl --disable-scrollkeeper --disable-schemas-install --disable-static
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{l,}a
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	--add-category X-Fedora				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -92,7 +84,7 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 for i in $SCHEMAS; do
 	gconftool-2 --makefile-install-rule \
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -107,7 +99,7 @@
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -134,14 +126,19 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
+%{_datadir}/dbus-1/services/org.gnome.Xchat.service
+%{_mandir}/man1/%{name}.1.gz
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/plugins/
-%if %{with_dbus}
-%{_bindir}/%{name}-remote
-%endif
 
 
 %changelog
+* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
+- Update to 0.14.
+- Remove xchat-gnome-remote.
+- Drop X-Fedora desktop category.
+- Use disable-schemas-install & disable-static with configure.
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-4
 - Add BR for perl(XML::Parser).
 



From fedora-extras-commits at redhat.com  Fri Oct 27 14:00:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 27 Oct 2006 07:00:50 -0700
Subject: rpms/perl-Math-Pari/devel .cvsignore, 1.5, 1.6 perl-Math-Pari.spec, 
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200610271400.k9RE0oMa025400@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25369

Modified Files:
	.cvsignore perl-Math-Pari.spec sources 
Log Message:
Update to 2.010709


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Oct 2006 07:29:44 -0000	1.5
+++ .cvsignore	27 Oct 2006 14:00:20 -0000	1.6
@@ -1,2 +1,2 @@
-Math-Pari-2.010708.tar.gz
+Math-Pari-2.010709.tar.gz
 pari-2.1.7.tgz


Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Math-Pari.spec	19 Oct 2006 07:29:44 -0000	1.5
+++ perl-Math-Pari.spec	27 Oct 2006 14:00:20 -0000	1.6
@@ -9,7 +9,7 @@
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	2.010708
+Version:	2.010709
 # You'll need to replace pariversion with a hardcoded version number if you're
 # testing with a development version of PARI, as this expression evaluates
 # the latest version of GP/PARI the perl module was tested with.
@@ -73,6 +73,9 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Fri Oct 27 2006 Paul Howarth <paul at city-fan.org> 2.010709-1
+- Update to 2.010709
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 2.010708-1
 - Update to 2.010708
 - Fix argument order for find with -depth


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Oct 2006 07:29:44 -0000	1.5
+++ sources	27 Oct 2006 14:00:20 -0000	1.6
@@ -1,2 +1,2 @@
-d06781230dc62eb75a88f5b509d55ac6  Math-Pari-2.010708.tar.gz
+58fdea358b37d00072723bd9cd69ce9e  Math-Pari-2.010709.tar.gz
 357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Fri Oct 27 14:11:54 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 07:11:54 -0700
Subject: rpms/xchat-gnome/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xchat-gnome-config.patch, 1.5, 1.6 xchat-gnome.spec, 1.28, 1.29
Message-ID: <200610271411.k9REBsM4028602@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28570

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
- Update to 0.14.
- Remove xchat-gnome-remote.
- Drop X-Fedora desktop category.
- Use disable-schemas-install & disable-static with configure.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2006 15:42:35 -0000	1.11
+++ .cvsignore	27 Oct 2006 14:11:24 -0000	1.12
@@ -1 +1 @@
-xchat-gnome-0.13.tar.bz2
+xchat-gnome-0.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Jul 2006 15:42:35 -0000	1.11
+++ sources	27 Oct 2006 14:11:24 -0000	1.12
@@ -1 +1 @@
-5614773724afa0c2e617615722e10091  xchat-gnome-0.13.tar.bz2
+8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome-config.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchat-gnome-config.patch	26 Jul 2006 15:42:35 -0000	1.5
+++ xchat-gnome-config.patch	27 Oct 2006 14:11:24 -0000	1.6
@@ -1,30 +1,6 @@
-diff -ur xchat-gnome-0.13.OLD/plugins/perl/perl.c xchat-gnome-0.13/plugins/perl/perl.c
---- xchat-gnome-0.13.OLD/plugins/perl/perl.c	2006-05-01 11:31:57.000000000 -0400
-+++ xchat-gnome-0.13/plugins/perl/perl.c	2006-07-26 10:47:56.000000000 -0400
-@@ -93,7 +93,7 @@
- 	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
- 		xdir = xchat_get_info (ph, "xchatdir");
- 
--	/* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
-+	/* autoload from ~/.xchat-gnome/ or ${APPDATA}\X-Chat 2\ on win32 */
- 	perl_auto_load_from_path (xdir);
- 
- #ifdef WIN32
-diff -ur xchat-gnome-0.13.OLD/plugins/python/python.c xchat-gnome-0.13/plugins/python/python.c
---- xchat-gnome-0.13.OLD/plugins/python/python.c	2005-11-26 02:10:29.000000000 -0500
-+++ xchat-gnome-0.13/plugins/python/python.c	2006-07-26 10:47:32.000000000 -0400
-@@ -392,7 +392,7 @@
- 		return expanded;
- 	g_free(expanded);
- 
--	/* Check if ~/.xchat2/<filename> exists. */
-+	/* Check if ~/.xchat-gnome/<filename> exists. */
- 	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
- 				    filename, NULL);
- 	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-diff -ur xchat-gnome-0.13.OLD/src/common/cfgfiles.c xchat-gnome-0.13/src/common/cfgfiles.c
---- xchat-gnome-0.13.OLD/src/common/cfgfiles.c	2006-06-17 21:11:18.000000000 -0400
-+++ xchat-gnome-0.13/src/common/cfgfiles.c	2006-07-26 10:46:12.000000000 -0400
+diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
+--- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -43,10 +19,22 @@
  	}
  }
  
-diff -ur xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c	2006-04-17 18:15:14.000000000 -0400
-+++ xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c	2006-07-26 10:47:06.000000000 -0400
-@@ -182,7 +182,7 @@
+diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
+--- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
++++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
+@@ -100,7 +100,7 @@
+ void fe_get_int (char *prompt, int def, void *callback, void *ud);
+ #define FRF_WRITE 1	/* save file */
+ #define FRF_MULTIPLE 2	/* multi-select */
+-#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
++#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
+ #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
+ #define FRF_FILTERISINITIAL 16	/* unused */
+ #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
+diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
++++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+@@ -184,7 +184,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
  	homedir = g_get_home_dir();
@@ -55,7 +43,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -346,7 +346,7 @@
+@@ -347,7 +347,7 @@
  #endif
  
  	homedir = g_get_home_dir ();


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xchat-gnome.spec	31 Aug 2006 22:42:38 -0000	1.28
+++ xchat-gnome.spec	27 Oct 2006 14:11:24 -0000	1.29
@@ -1,9 +1,8 @@
-%define with_dbus 1
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.13
-Release:        4%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -22,10 +21,7 @@
 BuildRequires:  gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	gnome-doc-utils
-
-%if %{with_dbus}
 BuildRequires:	dbus-devel
-%endif
 
 # Leave as conditional until API is more stable.
 %if %{with_libnotify}
@@ -56,22 +52,18 @@
 
 
 %build
-%configure --disable-tcl --disable-scrollkeeper
+%configure --disable-tcl --disable-scrollkeeper --disable-schemas-install --disable-static
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{l,}a
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	--add-category X-Fedora				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -92,7 +84,7 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 for i in $SCHEMAS; do
 	gconftool-2 --makefile-install-rule \
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -107,7 +99,7 @@
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -134,14 +126,19 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
+%{_datadir}/dbus-1/services/org.gnome.Xchat.service
+%{_mandir}/man1/%{name}.1.gz
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/plugins/
-%if %{with_dbus}
-%{_bindir}/%{name}-remote
-%endif
 
 
 %changelog
+* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
+- Update to 0.14.
+- Remove xchat-gnome-remote.
+- Drop X-Fedora desktop category.
+- Use disable-schemas-install & disable-static with configure.
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-4
 - Add BR for perl(XML::Parser).
 



From fedora-extras-commits at redhat.com  Fri Oct 27 14:17:35 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:17:35 -0700
Subject: rpms/nagios-plugins/FC-4 nagios-plugins.spec,1.15,1.16
Message-ID: <200610271417.k9REHZtC028739@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673/FC-4

Modified Files:
	nagios-plugins.spec 
Log Message:
Fixed bug 208232
212324
212555



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-4/nagios-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nagios-plugins.spec	25 Oct 2006 01:44:15 -0000	1.15
+++ nagios-plugins.spec	27 Oct 2006 14:17:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package



From fedora-extras-commits at redhat.com  Fri Oct 27 14:17:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:17:36 -0700
Subject: rpms/nagios-plugins/FC-5 nagios-plugins.spec,1.15,1.16
Message-ID: <200610271417.k9REHaZT028742@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673/FC-5

Modified Files:
	nagios-plugins.spec 
Log Message:
Fixed bug 208232
212324
212555



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-5/nagios-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nagios-plugins.spec	25 Oct 2006 01:44:15 -0000	1.15
+++ nagios-plugins.spec	27 Oct 2006 14:17:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package



From fedora-extras-commits at redhat.com  Fri Oct 27 14:17:41 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:17:41 -0700
Subject: rpms/nagios-plugins/FC-6 nagios-plugins.spec,1.19,1.20
Message-ID: <200610271417.k9REHf9J028745@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673/FC-6

Modified Files:
	nagios-plugins.spec 
Log Message:
Fixed bug 208232
212324
212555



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-6/nagios-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nagios-plugins.spec	25 Oct 2006 01:44:16 -0000	1.19
+++ nagios-plugins.spec	27 Oct 2006 14:17:11 -0000	1.20
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package



From fedora-extras-commits at redhat.com  Fri Oct 27 14:17:42 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:17:42 -0700
Subject: rpms/nagios-plugins/devel
	nagios-plugins-1.4.4-check_ide_smart.patch, 
	NONE, 1.1 nagios-plugins-1.4.4-linux_raid.patch, NONE,
	1.1 nagios-plugins.spec, 1.19, 1.20
Message-ID: <200610271417.k9REHg7g028748@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673/devel

Modified Files:
	nagios-plugins.spec 
Added Files:
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
Log Message:
Fixed bug 208232
212324
212555


nagios-plugins-1.4.4-check_ide_smart.patch:

--- NEW FILE nagios-plugins-1.4.4-check_ide_smart.patch ---
--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
+++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
 
 
 void
-print_thresholds (thresholds_t * p) 
+smart_print_thresholds (thresholds_t * p) 
 {
 	threshold_t * threshold = p->thresholds;
 	int i;
@@ -541,7 +541,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("Usage:");
+  printf (_("Usage:"));
   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
 }

nagios-plugins-1.4.4-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.4-linux_raid.patch ---
--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
+++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib utils.pm;
+use lib '/usr/lib/nagios/plugins';
 use utils qw(%ERRORS);



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nagios-plugins.spec	25 Oct 2006 01:44:17 -0000	1.19
+++ nagios-plugins.spec	27 Oct 2006 14:17:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux at gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package



From fedora-extras-commits at redhat.com  Fri Oct 27 14:19:25 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:19:25 -0700
Subject: rpms/nagios-plugins/FC-4 nagios-plugins-1.4.4-check_ide_smart.patch,
	NONE, 1.1 nagios-plugins-1.4.4-linux_raid.patch, NONE, 1.1
Message-ID: <200610271419.k9REJPgY028859@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/FC-4

Added Files:
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
Log Message:
Forgot to add patches

nagios-plugins-1.4.4-check_ide_smart.patch:

--- NEW FILE nagios-plugins-1.4.4-check_ide_smart.patch ---
--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
+++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
 
 
 void
-print_thresholds (thresholds_t * p) 
+smart_print_thresholds (thresholds_t * p) 
 {
 	threshold_t * threshold = p->thresholds;
 	int i;
@@ -541,7 +541,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("Usage:");
+  printf (_("Usage:"));
   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
 }

nagios-plugins-1.4.4-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.4-linux_raid.patch ---
--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
+++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib utils.pm;
+use lib '/usr/lib/nagios/plugins';
 use utils qw(%ERRORS);




From fedora-extras-commits at redhat.com  Fri Oct 27 14:19:31 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:19:31 -0700
Subject: rpms/nagios-plugins/FC-5 nagios-plugins-1.4.4-check_ide_smart.patch,
	NONE, 1.1 nagios-plugins-1.4.4-linux_raid.patch, NONE, 1.1
Message-ID: <200610271419.k9REJVLw028879@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/FC-5

Added Files:
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
Log Message:
Forgot to add patches

nagios-plugins-1.4.4-check_ide_smart.patch:

--- NEW FILE nagios-plugins-1.4.4-check_ide_smart.patch ---
--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
+++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
 
 
 void
-print_thresholds (thresholds_t * p) 
+smart_print_thresholds (thresholds_t * p) 
 {
 	threshold_t * threshold = p->thresholds;
 	int i;
@@ -541,7 +541,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("Usage:");
+  printf (_("Usage:"));
   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
 }

nagios-plugins-1.4.4-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.4-linux_raid.patch ---
--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
+++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib utils.pm;
+use lib '/usr/lib/nagios/plugins';
 use utils qw(%ERRORS);




From fedora-extras-commits at redhat.com  Fri Oct 27 14:19:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Oct 2006 07:19:36 -0700
Subject: rpms/nagios-plugins/FC-6 nagios-plugins-1.4.4-check_ide_smart.patch,
	NONE, 1.1 nagios-plugins-1.4.4-linux_raid.patch, NONE, 1.1
Message-ID: <200610271419.k9REJaCK028899@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/FC-6

Added Files:
	nagios-plugins-1.4.4-check_ide_smart.patch 
	nagios-plugins-1.4.4-linux_raid.patch 
Log Message:
Forgot to add patches

nagios-plugins-1.4.4-check_ide_smart.patch:

--- NEW FILE nagios-plugins-1.4.4-check_ide_smart.patch ---
--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
+++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
 
 
 void
-print_thresholds (thresholds_t * p) 
+smart_print_thresholds (thresholds_t * p) 
 {
 	threshold_t * threshold = p->thresholds;
 	int i;
@@ -541,7 +541,7 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("Usage:");
+  printf (_("Usage:"));
   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
 }

nagios-plugins-1.4.4-linux_raid.patch:

--- NEW FILE nagios-plugins-1.4.4-linux_raid.patch ---
--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
+++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
@@ -23,7 +23,7 @@
 #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min

 use strict;
-use lib utils.pm;
+use lib '/usr/lib/nagios/plugins';
 use utils qw(%ERRORS);




From fedora-extras-commits at redhat.com  Fri Oct 27 15:23:25 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 08:23:25 -0700
Subject: rpms/liferea/devel .cvsignore, 1.36, 1.37 liferea.spec, 1.53,
	1.54 sources, 1.37, 1.38
Message-ID: <200610271523.k9RFNPkG032508@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32488

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
- Update to 1.0.25.
- Drop X-Fedora category from desktop file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	19 Oct 2006 20:21:31 -0000	1.36
+++ .cvsignore	27 Oct 2006 15:22:54 -0000	1.37
@@ -1 +1 @@
-liferea-1.0.24.tar.gz
+liferea-1.0.25.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- liferea.spec	19 Oct 2006 20:21:31 -0000	1.53
+++ liferea.spec	27 Oct 2006 15:22:54 -0000	1.54
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.24
+Version:        1.0.25
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -63,7 +63,6 @@
 
 desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
@@ -109,6 +108,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
+- Update to 1.0.25.
+- Drop X-Fedora category from desktop file.
+
 * Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
 - Update to 1.0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 Oct 2006 20:21:31 -0000	1.37
+++ sources	27 Oct 2006 15:22:54 -0000	1.38
@@ -1 +1 @@
-f872d4ffd483cdcd4fe1f56dc86d5407  liferea-1.0.24.tar.gz
+45d511c9eb829797336a60a4a86b5939  liferea-1.0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 27 15:58:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 27 Oct 2006 08:58:35 -0700
Subject: rpms/ogre/devel .cvsignore, 1.3, 1.4 ogre-1.2.2-soname.patch, 1.1, 
	1.2 ogre.spec, 1.4, 1.5 sources, 1.3,
	1.4 ogre-1.2.1-char_height.patch, 1.1,
	NONE ogre-1.2.1-gtkmm.patch, 1.2,
	NONE ogre-1.2.1-visibility.patch, 1.1, NONE
Message-ID: <200610271558.k9RFwZpp032710@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32685

Modified Files:
	.cvsignore ogre-1.2.2-soname.patch ogre.spec sources 
Removed Files:
	ogre-1.2.1-char_height.patch ogre-1.2.1-gtkmm.patch 
	ogre-1.2.1-visibility.patch 
Log Message:
* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-1
- New upstream release 1.2.3
- Warning as always with a new upstream ogre release this breaks the ABI
  and changes the soname!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Aug 2006 12:46:04 -0000	1.3
+++ .cvsignore	27 Oct 2006 15:58:04 -0000	1.4
@@ -1 +1 @@
-ogre-linux_osx-v1-2-2p1.tar.bz2
+ogre-linux_osx-v1-2-3.tar.bz2

ogre-1.2.2-soname.patch:

Index: ogre-1.2.2-soname.patch
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-1.2.2-soname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-1.2.2-soname.patch	1 Aug 2006 12:50:10 -0000	1.1
+++ ogre-1.2.2-soname.patch	27 Oct 2006 15:58:04 -0000	1.2
@@ -25,8 +25,8 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE OGREMAIN_VERSION_INFO LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_DOUBLE_PRECISION_FLAGS OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE OGREMAIN_VERSION_INFO LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_DOUBLE_PRECISION_FLAGS OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -34,8 +34,8 @@
  CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  LIBS="$LIBS $SDL_LIBS"
  
--OGREMAIN_CURRENT=11
--OGREMAIN_REVISION=2
+-OGREMAIN_CURRENT=12
+-OGREMAIN_REVISION=0
 -OGREMAIN_AGE=0
 -OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
 -
@@ -60,8 +60,8 @@
  
 -dnl versioning info for libtool
 -dnl Note this is the ABI version which is not the same as our actual library version
--OGREMAIN_CURRENT=11
--OGREMAIN_REVISION=2
+-OGREMAIN_CURRENT=12
+-OGREMAIN_REVISION=0
 -OGREMAIN_AGE=0
 -OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
 -AC_SUBST(OGREMAIN_VERSION_INFO)


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ogre.spec	28 Aug 2006 12:04:02 -0000	1.4
+++ ogre.spec	27 Oct 2006 15:58:04 -0000	1.5
@@ -1,16 +1,13 @@
-%define version_postfix p1
-
 Name:           ogre
-Version:        1.2.2
-Release:        2.%{version_postfix}%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
-Source0:        http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -)%{version_postfix}.tar.bz2
+Source0:        http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
 Patch0:         ogre-1.2.1-rpath.patch
-Patch1:         ogre-1.2.1-gtkmm.patch
-Patch2:         ogre-1.2.2-soname.patch
+Patch1:         ogre-1.2.2-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel SDL-devel freetype-devel
 BuildRequires:  libglademm24-devel libsigc++20-devel
@@ -48,8 +45,7 @@
 %prep
 %setup -q -n ogrenew
 %patch0 -p1 -z .rpath
-%patch1 -p1 -z .gtkmm
-%patch2 -p1 -z .soname
+%patch1 -p1 -z .soname
 # sigh stop autoxxx from rerunning because of our patches above.
 touch aclocal.m4
 touch configure
@@ -130,6 +126,11 @@
 
 
 %changelog
+* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-1
+- New upstream release 1.2.3
+- Warning as always with a new upstream ogre release this breaks the ABI
+  and changes the soname!
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-2.p1
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Aug 2006 12:31:47 -0000	1.3
+++ sources	27 Oct 2006 15:58:04 -0000	1.4
@@ -1 +1 @@
-34004bdde39427e9a3213286f8cc057a  ogre-linux_osx-v1-2-2p1.tar.bz2
+b2a8e3df61e2245c46457367a6b73ca0  ogre-linux_osx-v1-2-3.tar.bz2


--- ogre-1.2.1-char_height.patch DELETED ---


--- ogre-1.2.1-gtkmm.patch DELETED ---


--- ogre-1.2.1-visibility.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 16:00:36 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 27 Oct 2006 09:00:36 -0700
Subject: rpms/chess/devel chess.spec,1.3,1.4
Message-ID: <200610271600.k9RG0ada000315@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/chess/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32767

Modified Files:
	chess.spec 
Log Message:
* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
- Rebuild for new ogre



Index: chess.spec
===================================================================
RCS file: /cvs/extras/rpms/chess/devel/chess.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chess.spec	28 Aug 2006 05:13:41 -0000	1.3
+++ chess.spec	27 Oct 2006 16:00:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           chess
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        3D chess game
 Group:          Amusements/Games
 License:        GPL
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
+- Rebuild for new ogre
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Fri Oct 27 16:05:15 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 09:05:15 -0700
Subject: rpms/liferea/FC-6 .cvsignore, 1.36, 1.37 liferea.spec, 1.53,
	1.54 sources, 1.37, 1.38
Message-ID: <200610271605.k9RG5FPM003334@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3305

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
- Update to 1.0.25.
- Drop X-Fedora category from desktop file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	19 Oct 2006 20:21:31 -0000	1.36
+++ .cvsignore	27 Oct 2006 16:04:43 -0000	1.37
@@ -1 +1 @@
-liferea-1.0.24.tar.gz
+liferea-1.0.25.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/liferea.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- liferea.spec	19 Oct 2006 20:21:31 -0000	1.53
+++ liferea.spec	27 Oct 2006 16:04:43 -0000	1.54
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.24
+Version:        1.0.25
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -63,7 +63,6 @@
 
 desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
@@ -109,6 +108,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
+- Update to 1.0.25.
+- Drop X-Fedora category from desktop file.
+
 * Thu Oct 19 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.24-1
 - Update to 1.0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 Oct 2006 20:21:31 -0000	1.37
+++ sources	27 Oct 2006 16:04:43 -0000	1.38
@@ -1 +1 @@
-f872d4ffd483cdcd4fe1f56dc86d5407  liferea-1.0.24.tar.gz
+45d511c9eb829797336a60a4a86b5939  liferea-1.0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 27 16:17:35 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Fri, 27 Oct 2006 09:17:35 -0700
Subject: rpms/mod_nss/FC-5 .cvsignore, 1.2, 1.3 mod_nss-conf.patch, 1.2,
	1.3 mod_nss.spec, 1.2, 1.3 sources, 1.2,
	1.3 mod_nss-eccinit.patch, 1.1, NONE
Message-ID: <200610271617.k9RGHZeD003500@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3475

Modified Files:
	.cvsignore mod_nss-conf.patch mod_nss.spec sources 
Removed Files:
	mod_nss-eccinit.patch 
Log Message:
Update to 1.0.6-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 18:05:12 -0000	1.2
+++ .cvsignore	27 Oct 2006 16:17:04 -0000	1.3
@@ -1 +1 @@
-mod_nss-1.0.3.tar.gz
+mod_nss-1.0.6.tar.gz

mod_nss-conf.patch:

Index: mod_nss-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-5/mod_nss-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss-conf.patch	4 Aug 2006 20:11:02 -0000	1.2
+++ mod_nss-conf.patch	27 Oct 2006 16:17:04 -0000	1.3
@@ -1,5 +1,5 @@
---- mod_nss-1.0.3/nss.conf.in.orig	2006-08-04 14:06:50.000000000 -0400
-+++ mod_nss-1.0.3/nss.conf.in	2006-08-04 15:24:34.000000000 -0400
+--- mod_nss-1.0.6/nss.conf.in.orig	2006-10-20 11:08:42.000000000 -0400
++++ mod_nss-1.0.6/nss.conf.in	2006-10-23 15:27:22.000000000 -0400
 @@ -8,14 +8,16 @@
  # consult the online docs. You have been warned.  
  #
@@ -28,7 +28,7 @@
  
  #   Configure the SSL Session Cache. 
  #   NSSSessionCacheSize is the number of entries in the cache.
-@@ -68,16 +70,18 @@
+@@ -68,17 +70,17 @@
  ## SSL Virtual Host Context
  ##
  
@@ -41,18 +41,16 @@
 +#ServerName www.example.com:8443
  #ServerAdmin you at example.com
  
--# mod_nss can log to separate log files, you can choose to do that if you'd like
+ # mod_nss can log to separate log files, you can choose to do that if you'd like
+ # LogLevel is not inherited from httpd.conf.
 -#ErrorLog @apache_prefix@/logs/error_log
 -#TransferLog @apache_prefix@/logs/access_log
-+# Use separate log files for the SSL virtual host; note that LogLevel
-+# is not inherited from httpd.conf.
-+ErrorLog @apache_prefix@/logs/nss_error_log
-+TransferLog @apache_prefix@/logs/nss_access_log
-+LogLevel warn
++ErrorLog @apache_prefix@/logs/error_log
++TransferLog @apache_prefix@/logs/access_log
+ LogLevel warn
  
  #   SSL Engine Switch:
- #   Enable/Disable SSL for this virtual host.
-@@ -111,7 +115,7 @@
+@@ -113,7 +115,7 @@
  #   The NSS security database directory that holds the certificates and
  #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
  #   Provide the directory that these files exist.
@@ -61,7 +59,7 @@
  
  #   Database Prefix:
  #   In order to be able to store multiple NSS databases in one directory
-@@ -175,7 +179,7 @@
+@@ -189,7 +191,7 @@
  <Files ~ "\.(cgi|shtml|phtml|php3?)$">
      NSSOptions +StdEnvVars
  </Files>


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-5/mod_nss.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss.spec	4 Aug 2006 20:11:02 -0000	1.2
+++ mod_nss.spec	27 Oct 2006 16:17:04 -0000	1.3
@@ -1,21 +1,20 @@
 Name: mod_nss
-Version: 1.0.3
-Release: 4%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
 URL: http://directory.fedora.redhat.com/wiki/Mod_nss
 Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
+BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.11.3
 BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
 Requires: httpd >= 0:2.0.52
-Requires: nspr >= 4.6
-Requires: nss >= 3.11, nss-tools >= 3.11
+Requires: nspr >= 4.6.3
+Requires: nss >= 3.11.3, nss-tools >= 3.11.3
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
-Patch3: mod_nss-eccinit.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -27,7 +26,6 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
-%patch3 -p1 -b .eccinit
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -108,6 +106,9 @@
 %{_sbindir}/gencert
 
 %changelog
+* Fri Oct 27 2006 Rob Crittenden <rcritten at redhat.com> 1.0.6-1
+- Update to 1.0.6
+
 * Fri Aug 04 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-4
 - Include LogLevel warn in nss.conf and use separate log files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 18:05:12 -0000	1.2
+++ sources	27 Oct 2006 16:17:04 -0000	1.3
@@ -1 +1 @@
-feb2d314983a72318cc08e0650501fac  mod_nss-1.0.3.tar.gz
+5e529856b7c05e94c62146ef80eb5e37  mod_nss-1.0.6.tar.gz


--- mod_nss-eccinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 16:37:45 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 27 Oct 2006 09:37:45 -0700
Subject: rpms/dvdisaster/FC-6 dvdisaster.spec,1.15,1.16
Message-ID: <200610271637.k9RGbjoT004027@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4011

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-6/dvdisaster.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dvdisaster.spec	23 Oct 2006 13:29:04 -0000	1.15
+++ dvdisaster.spec	27 Oct 2006 16:37:15 -0000	1.16
@@ -1,7 +1,7 @@
 Name: dvdisaster
 Summary: Additional error protection for CD/DVD media
 Version: 0.70.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-2
+- rebuild
+
 * Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-1
 - update to 0.70.2
 



From fedora-extras-commits at redhat.com  Fri Oct 27 16:39:32 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 27 Oct 2006 09:39:32 -0700
Subject: rpms/dvdisaster/devel dvdisaster.spec,1.15,1.16
Message-ID: <200610271639.k9RGdWxn004092@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4075

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dvdisaster.spec	23 Oct 2006 13:29:04 -0000	1.15
+++ dvdisaster.spec	27 Oct 2006 16:39:02 -0000	1.16
@@ -1,7 +1,7 @@
 Name: dvdisaster
 Summary: Additional error protection for CD/DVD media
 Version: 0.70.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-2
+- rebuild
+
 * Mon Oct 23 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.70.2-1
 - update to 0.70.2
 



From fedora-extras-commits at redhat.com  Fri Oct 27 16:57:44 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 27 Oct 2006 09:57:44 -0700
Subject: rpms/oorexx/FC-6 oorexx.spec,1.5,1.6
Message-ID: <200610271657.k9RGviwo004353@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/oorexx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4337/FC-6

Modified Files:
	oorexx.spec 
Log Message:



Index: oorexx.spec
===================================================================
RCS file: /cvs/extras/rpms/oorexx/FC-6/oorexx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- oorexx.spec	10 Oct 2006 08:49:04 -0000	1.5
+++ oorexx.spec	27 Oct 2006 16:57:14 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        3.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,7 +10,9 @@
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    x86_64
+%ifarch x86_64
+Requires:       glibc-devel.i386
+%endif
 
 
 %description
@@ -120,6 +122,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-6
+- For x86_64 require the 32-bit glibc-devel explicitly
+
 * Tue Oct 10 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-5
 - Exclude x86_64
 



From fedora-extras-commits at redhat.com  Fri Oct 27 17:18:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 27 Oct 2006 10:18:19 -0700
Subject: fedora-security/audit fe3, 1.22, 1.23 fe4, 1.82, 1.83 fe5, 1.89,
	1.90 fe6, 1.2, 1.3
Message-ID: <200610271718.k9RHIJN4007465@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7441

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
Catch up with clamav 0.88.5.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fe3	17 Oct 2006 19:15:24 -0000	1.22
+++ fe3	27 Oct 2006 17:18:16 -0000	1.23
@@ -2,12 +2,12 @@
 
 ** are items that need attention
 
-CVE-2006-5295 VULNERABLE (clamav) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
-CVE-2006-4182 VULNERABLE (clamav) #210973
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-3) #200545
 CVE-2006-3816 version (krusader, fixed 1.70.1) #200323


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fe4	26 Oct 2006 14:48:44 -0000	1.82
+++ fe4	27 Oct 2006 17:18:16 -0000	1.83
@@ -5,7 +5,7 @@
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
-CVE-2006-5295 VULNERABLE (clamav) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -31,7 +31,7 @@
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
-CVE-2006-4182 VULNERABLE (clamav) #210973
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-4) #200545


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- fe5	26 Oct 2006 14:48:44 -0000	1.89
+++ fe5	27 Oct 2006 17:18:16 -0000	1.90
@@ -5,7 +5,7 @@
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
-CVE-2006-5295 VULNERABLE (clamav) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -31,7 +31,7 @@
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
-CVE-2006-4182 VULNERABLE (clamav) #210973
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-5) #200545


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fe6	26 Oct 2006 14:48:44 -0000	1.2
+++ fe6	27 Oct 2006 17:18:16 -0000	1.3
@@ -5,7 +5,7 @@
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
-CVE-2006-5295 VULNERABLE (clamav) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5129 ** (moodle) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
@@ -31,7 +31,7 @@
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
-CVE-2006-4182 VULNERABLE (clamav) #210973
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
 CVE-2006-4028 version (wordpress, fixed 2.0.4) #201989
 CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 CVE-2006-3913 patch (freeciv, fixed 2.0.8-5) #200545



From fedora-extras-commits at redhat.com  Fri Oct 27 17:21:26 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Fri, 27 Oct 2006 10:21:26 -0700
Subject: rpms/mod_nss/FC-6 .cvsignore, 1.2, 1.3 mod_nss-conf.patch, 1.2,
	1.3 mod_nss.spec, 1.3, 1.4 sources, 1.2,
	1.3 mod_nss-eccinit.patch, 1.1, NONE
Message-ID: <200610271721.k9RHLQPT007612@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7522

Modified Files:
	.cvsignore mod_nss-conf.patch mod_nss.spec sources 
Removed Files:
	mod_nss-eccinit.patch 
Log Message:
Update to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 18:05:12 -0000	1.2
+++ .cvsignore	27 Oct 2006 17:20:55 -0000	1.3
@@ -1 +1 @@
-mod_nss-1.0.3.tar.gz
+mod_nss-1.0.6.tar.gz

mod_nss-conf.patch:

Index: mod_nss-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/mod_nss-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss-conf.patch	4 Aug 2006 20:11:03 -0000	1.2
+++ mod_nss-conf.patch	27 Oct 2006 17:20:55 -0000	1.3
@@ -1,5 +1,5 @@
---- mod_nss-1.0.3/nss.conf.in.orig	2006-08-04 14:06:50.000000000 -0400
-+++ mod_nss-1.0.3/nss.conf.in	2006-08-04 15:24:34.000000000 -0400
+--- mod_nss-1.0.6/nss.conf.in.orig	2006-10-20 11:08:42.000000000 -0400
++++ mod_nss-1.0.6/nss.conf.in	2006-10-23 15:27:22.000000000 -0400
 @@ -8,14 +8,16 @@
  # consult the online docs. You have been warned.  
  #
@@ -28,7 +28,7 @@
  
  #   Configure the SSL Session Cache. 
  #   NSSSessionCacheSize is the number of entries in the cache.
-@@ -68,16 +70,18 @@
+@@ -68,17 +70,17 @@
  ## SSL Virtual Host Context
  ##
  
@@ -41,18 +41,16 @@
 +#ServerName www.example.com:8443
  #ServerAdmin you at example.com
  
--# mod_nss can log to separate log files, you can choose to do that if you'd like
+ # mod_nss can log to separate log files, you can choose to do that if you'd like
+ # LogLevel is not inherited from httpd.conf.
 -#ErrorLog @apache_prefix@/logs/error_log
 -#TransferLog @apache_prefix@/logs/access_log
-+# Use separate log files for the SSL virtual host; note that LogLevel
-+# is not inherited from httpd.conf.
-+ErrorLog @apache_prefix@/logs/nss_error_log
-+TransferLog @apache_prefix@/logs/nss_access_log
-+LogLevel warn
++ErrorLog @apache_prefix@/logs/error_log
++TransferLog @apache_prefix@/logs/access_log
+ LogLevel warn
  
  #   SSL Engine Switch:
- #   Enable/Disable SSL for this virtual host.
-@@ -111,7 +115,7 @@
+@@ -113,7 +115,7 @@
  #   The NSS security database directory that holds the certificates and
  #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
  #   Provide the directory that these files exist.
@@ -61,7 +59,7 @@
  
  #   Database Prefix:
  #   In order to be able to store multiple NSS databases in one directory
-@@ -175,7 +179,7 @@
+@@ -189,7 +191,7 @@
  <Files ~ "\.(cgi|shtml|phtml|php3?)$">
      NSSOptions +StdEnvVars
  </Files>


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/mod_nss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_nss.spec	11 Sep 2006 13:40:15 -0000	1.3
+++ mod_nss.spec	27 Oct 2006 17:20:55 -0000	1.4
@@ -1,21 +1,20 @@
 Name: mod_nss
-Version: 1.0.3
-Release: 5%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
 URL: http://directory.fedora.redhat.com/wiki/Mod_nss
 Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
+BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.11.3
 BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
 Requires: httpd >= 0:2.0.52
-Requires: nspr >= 4.6
-Requires: nss >= 3.11, nss-tools >= 3.11
+Requires: nspr >= 4.6.3
+Requires: nss >= 3.11.3, nss-tools >= 3.11.3
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
-Patch3: mod_nss-eccinit.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -27,7 +26,6 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
-%patch3 -p1 -b .eccinit
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -108,8 +106,8 @@
 %{_sbindir}/gencert
 
 %changelog
-* Mon Sep 11 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-5
-- Mass rebuild for new toolset.
+* Mon Oct 23 2006 Rob Crittenden <rcritten at redhat.com> 1.0.6-1
+- Update to 1.0.6
 
 * Fri Aug 04 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-4
 - Include LogLevel warn in nss.conf and use separate log files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 18:05:12 -0000	1.2
+++ sources	27 Oct 2006 17:20:55 -0000	1.3
@@ -1 +1 @@
-feb2d314983a72318cc08e0650501fac  mod_nss-1.0.3.tar.gz
+5e529856b7c05e94c62146ef80eb5e37  mod_nss-1.0.6.tar.gz


--- mod_nss-eccinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 17:43:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 10:43:37 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 telepathy-gabble.spec, 1.12, 1.13
Message-ID: <200610271743.k9RHhb27008036@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8015

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Oct 2006 00:54:32 -0000	1.12
+++ .cvsignore	27 Oct 2006 17:43:07 -0000	1.13
@@ -1 +1 @@
-telepathy-gabble-0.4.1.tar.gz
+telepathy-gabble-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Oct 2006 00:54:32 -0000	1.12
+++ sources	27 Oct 2006 17:43:07 -0000	1.13
@@ -1 +1 @@
-e08f4e1f361165635128c5996d71e2b9  telepathy-gabble-0.4.1.tar.gz
+a1bc3939da26f9221b11806484d2b272  telepathy-gabble-0.4.2.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- telepathy-gabble.spec	24 Oct 2006 00:54:32 -0000	1.12
+++ telepathy-gabble.spec	27 Oct 2006 17:43:07 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2.
+
 * Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
 - Update to 0.4.1.
 



From fedora-extras-commits at redhat.com  Fri Oct 27 18:14:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 11:14:49 -0700
Subject: rpms/telepathy-gabble/FC-6 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 telepathy-gabble.spec, 1.12, 1.13
Message-ID: <200610271814.k9RIEntw011236@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11216

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Oct 2006 01:10:02 -0000	1.12
+++ .cvsignore	27 Oct 2006 18:14:19 -0000	1.13
@@ -1 +1 @@
-telepathy-gabble-0.4.1.tar.gz
+telepathy-gabble-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Oct 2006 01:10:02 -0000	1.12
+++ sources	27 Oct 2006 18:14:19 -0000	1.13
@@ -1 +1 @@
-e08f4e1f361165635128c5996d71e2b9  telepathy-gabble-0.4.1.tar.gz
+a1bc3939da26f9221b11806484d2b272  telepathy-gabble-0.4.2.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/FC-6/telepathy-gabble.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- telepathy-gabble.spec	24 Oct 2006 01:10:02 -0000	1.12
+++ telepathy-gabble.spec	27 Oct 2006 18:14:19 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2.
+
 * Mon Oct 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
 - Update to 0.4.1.
 



From fedora-extras-commits at redhat.com  Fri Oct 27 18:19:49 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Fri, 27 Oct 2006 11:19:49 -0700
Subject: rpms/mod_nss/devel .cvsignore, 1.2, 1.3 mod_nss-conf.patch, 1.2,
	1.3 mod_nss.spec, 1.3, 1.4 sources, 1.2,
	1.3 mod_nss-eccinit.patch, 1.1, NONE
Message-ID: <200610271819.k9RIJnPF011321@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11292

Modified Files:
	.cvsignore mod_nss-conf.patch mod_nss.spec sources 
Removed Files:
	mod_nss-eccinit.patch 
Log Message:
Update to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 18:05:12 -0000	1.2
+++ .cvsignore	27 Oct 2006 18:19:19 -0000	1.3
@@ -1 +1 @@
-mod_nss-1.0.3.tar.gz
+mod_nss-1.0.6.tar.gz

mod_nss-conf.patch:

Index: mod_nss-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss-conf.patch	4 Aug 2006 20:11:03 -0000	1.2
+++ mod_nss-conf.patch	27 Oct 2006 18:19:19 -0000	1.3
@@ -1,5 +1,5 @@
---- mod_nss-1.0.3/nss.conf.in.orig	2006-08-04 14:06:50.000000000 -0400
-+++ mod_nss-1.0.3/nss.conf.in	2006-08-04 15:24:34.000000000 -0400
+--- mod_nss-1.0.6/nss.conf.in.orig	2006-10-20 11:08:42.000000000 -0400
++++ mod_nss-1.0.6/nss.conf.in	2006-10-23 15:27:22.000000000 -0400
 @@ -8,14 +8,16 @@
  # consult the online docs. You have been warned.  
  #
@@ -28,7 +28,7 @@
  
  #   Configure the SSL Session Cache. 
  #   NSSSessionCacheSize is the number of entries in the cache.
-@@ -68,16 +70,18 @@
+@@ -68,17 +70,17 @@
  ## SSL Virtual Host Context
  ##
  
@@ -41,18 +41,16 @@
 +#ServerName www.example.com:8443
  #ServerAdmin you at example.com
  
--# mod_nss can log to separate log files, you can choose to do that if you'd like
+ # mod_nss can log to separate log files, you can choose to do that if you'd like
+ # LogLevel is not inherited from httpd.conf.
 -#ErrorLog @apache_prefix@/logs/error_log
 -#TransferLog @apache_prefix@/logs/access_log
-+# Use separate log files for the SSL virtual host; note that LogLevel
-+# is not inherited from httpd.conf.
-+ErrorLog @apache_prefix@/logs/nss_error_log
-+TransferLog @apache_prefix@/logs/nss_access_log
-+LogLevel warn
++ErrorLog @apache_prefix@/logs/error_log
++TransferLog @apache_prefix@/logs/access_log
+ LogLevel warn
  
  #   SSL Engine Switch:
- #   Enable/Disable SSL for this virtual host.
-@@ -111,7 +115,7 @@
+@@ -113,7 +115,7 @@
  #   The NSS security database directory that holds the certificates and
  #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
  #   Provide the directory that these files exist.
@@ -61,7 +59,7 @@
  
  #   Database Prefix:
  #   In order to be able to store multiple NSS databases in one directory
-@@ -175,7 +179,7 @@
+@@ -189,7 +191,7 @@
  <Files ~ "\.(cgi|shtml|phtml|php3?)$">
      NSSOptions +StdEnvVars
  </Files>


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_nss.spec	11 Sep 2006 13:40:15 -0000	1.3
+++ mod_nss.spec	27 Oct 2006 18:19:19 -0000	1.4
@@ -1,21 +1,20 @@
 Name: mod_nss
-Version: 1.0.3
-Release: 5%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
 URL: http://directory.fedora.redhat.com/wiki/Mod_nss
 Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
+BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.11.3
 BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
 Requires: httpd >= 0:2.0.52
-Requires: nspr >= 4.6
-Requires: nss >= 3.11, nss-tools >= 3.11
+Requires: nspr >= 4.6.3
+Requires: nss >= 3.11.3, nss-tools >= 3.11.3
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
-Patch3: mod_nss-eccinit.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -27,7 +26,6 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
-%patch3 -p1 -b .eccinit
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -108,8 +106,8 @@
 %{_sbindir}/gencert
 
 %changelog
-* Mon Sep 11 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-5
-- Mass rebuild for new toolset.
+* Mon Oct 23 2006 Rob Crittenden <rcritten at redhat.com> 1.0.6-1
+- Update to 1.0.6
 
 * Fri Aug 04 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-4
 - Include LogLevel warn in nss.conf and use separate log files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 18:05:12 -0000	1.2
+++ sources	27 Oct 2006 18:19:19 -0000	1.3
@@ -1 +1 @@
-feb2d314983a72318cc08e0650501fac  mod_nss-1.0.3.tar.gz
+5e529856b7c05e94c62146ef80eb5e37  mod_nss-1.0.6.tar.gz


--- mod_nss-eccinit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Oct 27 18:37:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 27 Oct 2006 11:37:05 -0700
Subject: rpms/TeXmacs/FC-6 .cvsignore, 1.22, 1.23 TeXmacs.spec, 1.41,
	1.42 sources, 1.23, 1.24
Message-ID: <200610271837.k9RIb5Pt011476@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11456/FC-6

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-6/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	7 Aug 2006 16:43:05 -0000	1.22
+++ .cvsignore	27 Oct 2006 18:36:35 -0000	1.23
@@ -1 +1 @@
-TeXmacs-1.0.6.5-src.tar.gz
+TeXmacs-1.0.6.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-6/TeXmacs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- TeXmacs.spec	7 Aug 2006 16:43:05 -0000	1.41
+++ TeXmacs.spec	27 Oct 2006 18:36:35 -0000	1.42
@@ -1,12 +1,12 @@
 Name:		TeXmacs
-Version:	1.0.6.5
+Version:	1.0.6.6
 Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.5-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.6-src.tar.gz
 Patch1:		TeXmacs-inline.patch
 Patch2:		TeXmacs-event.patch
 Patch3:		TeXmacs-gcc41.patch
@@ -15,11 +15,10 @@
 Requires:	tetex
 Requires:	tetex-fonts
 Requires:	ghostscript
-Buildrequires:	guile-devel
-Buildrequires:	gmp-devel
-Buildrequires:	desktop-file-utils
-Buildrequires:	tetex
-Buildrequires:  freetype-devel
+BuildRequires:	guile-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	tetex
+BuildRequires:  freetype-devel
 BuildRequires:  libICE-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libX11-devel
@@ -55,7 +54,7 @@
 
 %prep
 %setup -q -n TeXmacs-%{version}-src
-%patch2 -p1
+#%patch2 -p1
 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 
 
@@ -155,6 +154,9 @@
 
 
 %changelog
+* Mon Aug 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.6-1
+- new version 1.0.6.6
+
 * Mon Aug  7 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.5-1
 - new version 1.0.6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-6/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Aug 2006 16:43:05 -0000	1.23
+++ sources	27 Oct 2006 18:36:35 -0000	1.24
@@ -1 +1 @@
-9f9c96838d4845e50d8f82dfb8f3eecd  TeXmacs-1.0.6.5-src.tar.gz
+53e21e5cb1a536a60cd6fb28dcb598d9  TeXmacs-1.0.6.6-src.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 27 19:20:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 27 Oct 2006 12:20:18 -0700
Subject: rpms/kdeartwork-extras/FC-6 kdeartwork-extras.spec,1.1,1.2
Message-ID: <200610271920.k9RJKIab014657@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14639

Modified Files:
	kdeartwork-extras.spec 
Log Message:
* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-6
- -extras: Requires: xscreensaver-base



Index: kdeartwork-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/FC-6/kdeartwork-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeartwork-extras.spec	2 Oct 2006 14:54:31 -0000	1.1
+++ kdeartwork-extras.spec	27 Oct 2006 19:19:47 -0000	1.2
@@ -12,7 +12,7 @@
 #define icons 1
 
 Version: 3.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if "%{?core}" == "1"
 Name:    kdeartwork 
@@ -28,7 +28,7 @@
 %define _with_xscreensaver --with-xscreensaver
 %define xsc xscreensaver-extras xscreensaver-gl-extras
 BuildRequires: %{xsc}
-Requires:      %{xsc}
+Requires:      %{xsc} xscreensaver-base
 # split occured at 3.5.3-6
 Conflicts: kdeartwork < 3.5.3-6
 Requires: kdebase
@@ -207,11 +207,14 @@
 
 
 %changelog
+* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-6
+- -extras: Requires: xscreensaver-base
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-5
-- %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
+- -extras: %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
 
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-4
-- extras: drop (Build)Requires: xscreensaver-base
+- -extras: drop (Build)Requires: xscreensaver-base
 
 * Sat Sep 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-3
 - use %%_foo style macros in %%changelog



From fedora-extras-commits at redhat.com  Fri Oct 27 19:37:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 27 Oct 2006 12:37:45 -0700
Subject: rpms/kdeartwork-extras/devel .cvsignore, 1.2,
	1.3 kdeartwork-extras.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610271937.k9RJbj8e014812@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdeartwork-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14792

Modified Files:
	.cvsignore kdeartwork-extras.spec sources 
Log Message:
* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-2
- -extras: Requires: xscreensaver-base

* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-1
- 3.5.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2006 14:54:31 -0000	1.2
+++ .cvsignore	27 Oct 2006 19:37:15 -0000	1.3
@@ -1 +1,2 @@
 kdeartwork-3.5.4.tar.bz2
+kdeartwork-3.5.5.tar.bz2


Index: kdeartwork-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/kdeartwork-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeartwork-extras.spec	2 Oct 2006 14:54:31 -0000	1.1
+++ kdeartwork-extras.spec	27 Oct 2006 19:37:15 -0000	1.2
@@ -11,14 +11,12 @@
 %define extras 1
 #define icons 1
 
-Version: 3.5.4
-Release: 5%{?dist}
+Version: 3.5.5
+Release: 2%{?dist}
 
 %if "%{?core}" == "1"
 Name:    kdeartwork 
 Summary: Additional artwork (themes, sound themes, ...) for KDE 
-# For (kde) opengl screensavers, workaround http://bugzilla.redhat.com/193741
-#BuildRequires: libGL-devel libGLU-devel
 Requires: kdebase
 %endif
 
@@ -28,7 +26,7 @@
 %define _with_xscreensaver --with-xscreensaver
 %define xsc xscreensaver-extras xscreensaver-gl-extras
 BuildRequires: %{xsc}
-Requires:      %{xsc}
+Requires:      %{xsc} xscreensaver-base
 # split occured at 3.5.3-6
 Conflicts: kdeartwork < 3.5.3-6
 Requires: kdebase
@@ -60,6 +58,7 @@
 Patch1: kdeartwork-3.5.3-inherits.patch
 
 BuildRequires: kdebase-devel >= 6:%{version}
+BuildRequires: gettext
 
 ## upstream patches
 # fix GL issues, flickering, see http://bugs.kde.org/73813
@@ -207,11 +206,17 @@
 
 
 %changelog
+* Fri Oct 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-2
+- -extras: Requires: xscreensaver-base
+
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-1
+- 3.5.5
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-5
-- %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
+- -extras: %doc COPYING (use copy from kwin-styles/smooth-blend/COPYING)
 
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-4
-- extras: drop (Build)Requires: xscreensaver-base
+- -extras: drop (Build)Requires: xscreensaver-base
 
 * Sat Sep 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-3
 - use %%_foo style macros in %%changelog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork-extras/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2006 14:54:31 -0000	1.2
+++ sources	27 Oct 2006 19:37:15 -0000	1.3
@@ -1 +1 @@
-c7ff9048b9b68c976de08ed418598e40  kdeartwork-3.5.4.tar.bz2
+8d35156b506cf870eb9641f72a304c8c  kdeartwork-3.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 27 21:00:24 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 27 Oct 2006 14:00:24 -0700
Subject: extras-buildsys/utils/pushscript Utils.py,1.4,1.5
Message-ID: <200610272100.k9RL0O99018217@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18191

Modified Files:
	Utils.py 
Log Message:
Work around createrepo < 0.4.5 (upstream bug 595). Even if a future
upgrade of createrepo may work fine and never chokes on files in
".olddir", we here take over backing up files in "repodata" dir.




Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Utils.py	24 Oct 2006 22:41:38 -0000	1.4
+++ Utils.py	27 Oct 2006 21:00:21 -0000	1.5
@@ -33,15 +33,22 @@
     if DEBUG:
         print '    DEBUG:', msg
 
-def run_and_check(cmd):
+def run(cmd):
     debugprint(cmd)
     if not DEBUG:
         result = os.system(cmd)
         if result != 0:
             print >> sys.stderr, 'Error running command: %s ' % cmd
             if result > 127:
-                sys.exit(1)
-            sys.exit(result)
+                return 1
+            return result
+    else:
+        return 0
+
+def run_and_check(cmd):
+    result = run(cmd)
+    if result:
+        sys.exit(result)
 
 
 def load_config_module(project):
@@ -111,23 +118,9 @@
         install_copy(src,dest)
 
 
-def create_repository(cfg,repodir,debuginfo=True):
-    """create/update repository metadata for a given directory and
-    consider a 'debug' sub-repository by default"""
-
+def _create_repository(cfg,repodir,debuginfo=True):
     print 'Creating repository %s' % repodir
-    
-    if not os.path.exists(repodir):
-        os.makedirs(repodir)
-    
-    # TODO: Why remove the repodata dir? Isn't that entirely createrepo's
-    # work? (also further below for "debug")
-    # ? -> https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=595
-    rpdata = os.path.join(repodir, 'repodata')
-    debugprint('removing tree %s' % rpdata)
-    if os.path.exists(rpdata) and not DEBUG:
-        shutil.rmtree(rpdata)
-    
+
     compsarg = ''
     if os.path.exists( os.path.join(repodir,compsname) ):
         compsarg = '-g %s ' % compsname
@@ -135,7 +128,8 @@
     if debuginfo and os.path.exists( os.path.join(repodir,'debug') ):
         excludearg = "-x \'*debuginfo*\'"
     cmd = '%s -c %s -q %s %s %s' % (cfg.createrepo, cfg.cr_cachedir, compsarg, excludearg, repodir)
-    run_and_check(cmd)
+    if run(cmd):
+        raise Exception
     
     if debuginfo:
         # If there's a debug subdir, make that a repo, too.
@@ -147,9 +141,58 @@
             if os.path.exists(rpdata) and not DEBUG:
                 shutil.rmtree(rpdata)
             cmd = '%s -c %s -q %s' % (cfg.createrepo, cfg.cr_cachedir, dbg_repodir)
-            run_and_check(cmd)
+            if run(cmd):
+                raise Exception
+
+
+def _restore_repodata_dir(tmpdir,targetdir):  # helper function
+    for f in os.listdir(tmpdir):
+        sourcefile = os.path.join(tmpdir,f)
+        targetfile = os.path.join(targetdir,f)
+        if os.path.exists(targetfile):  # don't overwrite new files
+            if os.path.isdir(targetfile):
+                shutil.rmtree(sourcefile)
+            else:
+                os.remove(sourcefile)
+        else:
+            shutil.move(sourcefile,targetfile)
 
 
+def create_repository(cfg,repodir,debuginfo=True):
+    """create/update repository metadata for a given directory and
+    consider a 'debug' sub-repository by default"""
+
+    rpdata = os.path.join(repodir,'repodata')
+    for d in [repodir,rpdata]:
+        if not os.path.exists(d):
+            os.makedirs(d)
+
+    # Not only help createrepo < 0.4.5, but more important, create
+    # a backup of the "repodata" directory and restore repoview files,
+    # because it sucks to recreate them everytime from scratch.
+    # We used to remove the entire repodata directory because of:
+    # https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=595
+    
+    tmpdir = tempfile.mkdtemp('','.push',repodir)
+    if tmpdir == repodir: # paranoid, should never happen
+        sys.exit(errno.EPERM)
+    try:
+        for f in os.listdir(rpdata):
+            sourcefile = os.path.join(rpdata,f)
+            targetfile = os.path.join(tmpdir,f)
+            shutil.move(sourcefile,targetfile)
+
+        _create_repository(cfg,repodir,debuginfo)
+        
+        _restore_repodata_dir(tmpdir,rpdata)
+        shutil.rmtree(tmpdir)
+    except:  # everything is bad at this point
+        print 'ERROR: Creating temporary working directory failed.'
+        _restore_repodata_dir(tmpdir,rpdata)
+        shutil.rmtree(tmpdir)
+        sys.exit(errno.EPERM)
+    
+
 def is_repo_changed(repodir):
     """Checks if the repository has changed and needs to be reindexed"""
     ref_file = os.path.join(repodir, 'repodata', 'repomd.xml')



From fedora-extras-commits at redhat.com  Fri Oct 27 21:12:36 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 27 Oct 2006 14:12:36 -0700
Subject: rpms/csound/devel .cvsignore, 1.3,
	1.4 csound-5.03.0-no-usr-local.patch, 1.1,
	1.2 csound-5.03.0-remote-fixes.patch, 1.1, 1.2 csound.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200610272112.k9RLCaji021309@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275

Modified Files:
	.cvsignore csound-5.03.0-no-usr-local.patch 
	csound-5.03.0-remote-fixes.patch csound.spec sources 
Log Message:
* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
- Update to a cvs snapshot for the remote plugin and a few other fixes
- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
- Put the virtual MIDI keyboard into its own package




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Oct 2006 04:35:22 -0000	1.3
+++ .cvsignore	27 Oct 2006 21:12:05 -0000	1.4
@@ -1,3 +1,4 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
 Csound5.03_src-cvs20061023.tar.bz2
+Csound5.03_src-cvs20061027.tar.bz2

csound-5.03.0-no-usr-local.patch:

Index: csound-5.03.0-no-usr-local.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-no-usr-local.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-no-usr-local.patch	24 Oct 2006 04:35:22 -0000	1.1
+++ csound-5.03.0-no-usr-local.patch	27 Oct 2006 21:12:05 -0000	1.2
@@ -1,6 +1,6 @@
---- Csound5.03.0/SConstruct.no-usr-local	2006-10-23 15:42:27.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-10-23 15:43:31.000000000 -0400
-@@ -307,10 +307,10 @@
+--- Csound5.03.0/SConstruct.no-usr-local	2006-10-27 16:24:08.000000000 -0400
++++ Csound5.03.0/SConstruct	2006-10-27 16:26:03.000000000 -0400
+@@ -306,10 +306,10 @@
  if commonEnvironment['buildRelease'] == '0':
      commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
  if commonEnvironment['Word64'] == '1':
@@ -13,7 +13,7 @@
  
  if commonEnvironment['useDouble'] == '0':
      print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
-@@ -325,14 +325,12 @@
+@@ -324,14 +324,12 @@
  
  if getPlatform() == 'linux':
      commonEnvironment.Append(CCFLAGS = "-DLINUX")
@@ -28,7 +28,7 @@
      commonEnvironment.Append(CCFLAGS = "-DPIPES")
      if commonEnvironment['useAltivec'] == '1':
          print 'CONFIGURATION DECISION using Altivec optmisation'
-@@ -343,7 +341,6 @@
+@@ -342,7 +340,6 @@
      commonEnvironment.Append(CCFLAGS = "-DPIPES")
      commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
      if not withMSVC():
@@ -36,13 +36,17 @@
          commonEnvironment.Append(CPPPATH = '/usr/include')
          commonEnvironment.Append(CCFLAGS = "-mthreads")
      else:
-@@ -351,15 +348,14 @@
+@@ -350,18 +347,17 @@
  
  if getPlatform() == 'linux':
      path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
 -    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
 -    pythonIncludePath = [path1, path2]
 +    pythonIncludePath = [path1]
+     path1 = '/usr/include/tcl8.4'
+     path2 = '/usr/include/tk8.4'
+-    tclIncludePath = [path1, path2]
++    tclIncludePath = [path1]
      pythonLinkFlags = []
      if commonEnvironment['Word64'] == '1':
          tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']

csound-5.03.0-remote-fixes.patch:

Index: csound-5.03.0-remote-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-remote-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-remote-fixes.patch	25 Oct 2006 16:13:06 -0000	1.1
+++ csound-5.03.0-remote-fixes.patch	27 Oct 2006 21:12:05 -0000	1.2
@@ -1,6 +1,6 @@
---- Csound5.03.0/OOps/remote.c.remote-debug	2006-10-23 08:18:21.000000000 -0400
-+++ Csound5.03.0/OOps/remote.c	2006-10-25 12:08:20.000000000 -0400
-@@ -36,15 +36,18 @@
+--- Csound5.03.0/OOps/remote.c.remote-fixes	2006-10-27 16:00:10.000000000 -0400
++++ Csound5.03.0/OOps/remote.c	2006-10-27 16:32:02.000000000 -0400
+@@ -38,6 +38,9 @@
  
  #define ST(x)   (((REMOTE_GLOBALS*) ((CSOUND*)csound)->remoteGlobals)->x)
  
@@ -10,7 +10,8 @@
  void remoteRESET(CSOUND *csound)
  {
      csound->remoteGlobals = NULL;
- }
+@@ -46,9 +49,9 @@
+ #ifdef HAVE_SOCKETS
  
   /* get the IPaddress of this machine */
 -static void getIpAddress(char *ipaddr, char *ifname)
@@ -21,11 +22,11 @@
  #ifdef WIN32
      /* VL 12/10/06: something needs to go here */
      /* gethostbyname is the real answer; code below id unsafe */
-@@ -57,25 +60,26 @@
- memset(&sin, 0, sizeof (struct sockaddr_in));
- memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
- strcpy(ipaddr, inet_ntoa (sin.sin_addr));
-+ret = 0;
+@@ -61,25 +64,26 @@
+     memset(&sin, 0, sizeof (struct sockaddr_in));
+     memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
+     strcpy(ipaddr, inet_ntoa (sin.sin_addr));
++    ret = 0;
  
  #else
      struct ifreq ifr;
@@ -54,7 +55,7 @@
  }
  
  char remoteID(CSOUND *csound)
-@@ -84,31 +88,83 @@
+@@ -88,31 +92,83 @@
      return ST(ipadrs)[len-1];
  }
  
@@ -116,8 +117,8 @@
 +      goto error;
 +    }
 +
-+	/* get IP adrs of this machine */
-+	/* FIXME: don't hardcode eth0 */
++    /* get IP adrs of this machine */
++    /* FIXME: don't hardcode eth0 */
 +    if (getIpAddress(ST(ipadrs), "eth0") < 0) {
 +      csound->Message(csound, Str("unable to get local ip address."));
 +      goto error;
@@ -144,7 +145,7 @@
        SOCK *sop = ST(socksout), *sop_end = sop + MAXREMOTES;
        for ( ; sop < sop_end; sop++)
          if ((fd = sop->rfd) > 0)
-@@ -285,7 +341,12 @@
+@@ -289,7 +345,12 @@
  {   /*      INSTR 0 opcode  */
      short nargs = p->INOCOUNT;
  
@@ -158,7 +159,7 @@
      if (nargs < 3) {
        csound->InitError(csound, Str("missing instr nos"));
        return 0;
-@@ -327,7 +388,12 @@
+@@ -331,7 +392,12 @@
  {   /*      INSTR 0 opcode  */
      short nargs = p->INOCOUNT;
  
@@ -172,7 +173,7 @@
      if (nargs < 2) {
        csound->InitError(csound, Str("missing instr nos"));
        return NOTOK;
-@@ -357,7 +423,12 @@
+@@ -361,7 +427,12 @@
  {                                            /* INSTR 0 opcode  */
      short nargs = p->INOCOUNT;
  
@@ -186,7 +187,7 @@
      if (nargs < 3) {
        csound->InitError(csound, Str("missing channel nos"));
        return NOTOK;
-@@ -396,7 +467,12 @@
+@@ -400,7 +471,12 @@
  {                                         /*       INSTR 0 opcode  */
      short nargs = p->INOCOUNT;
      


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- csound.spec	25 Oct 2006 16:13:06 -0000	1.4
+++ csound.spec	27 Oct 2006 21:12:05 -0000	1.5
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       5%{?dist}
+Release:       7%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0:     http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061023.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -110,6 +110,15 @@
 %description gui
 Contains a FLTK-based GUI for Csound
 
+%package fltk
+Summary: FLTK plugins for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description fltk
+Contains FLTK plugins for csound
+
 %package jack
 Summary: Jack Audio plugins for Csound
 Group: Applications/Multimedia
@@ -145,6 +154,15 @@
 %description osc
 Open Sound Control (OSC) plugin for Csound
 
+%package virtual-keyboard
+Summary: Virtual MIDI keyboard plugin for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description virtual-keyboard
+A virtual MIDI keyboard plugin for Csound
+
 %package manual
 Summary: Csound manual
 Group: Documentation
@@ -346,6 +364,9 @@
 %files gui
 %defattr(-,root,root,0755)
 %{_bindir}/csound5gui
+
+%files fltk
+%defattr(-,root,root,0755)
 %{_libdir}/%{name}/plugins/libwidgets.so
 
 %files jack
@@ -364,6 +385,10 @@
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/plugins/libosc.so
 
+%files virtual-keyboard
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/plugins/libvirtual.so
+
 %files manual
 %defattr(-,root,root,0755)
 %doc manual/copying.txt manual/credits.txt manual/bugs.txt manual/readme.txt manual/news.txt
@@ -378,6 +403,11 @@
 %doc tutorial/*.py
 
 %changelog
+* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
+- Update to a cvs snapshot for the remote plugin and a few other fixes
+- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
+- Put the virtual MIDI keyboard into its own package
+
 * Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
 - Fix the remote plugin's local IP address read code, add more error checking
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Oct 2006 04:35:22 -0000	1.3
+++ sources	27 Oct 2006 21:12:05 -0000	1.4
@@ -1,2 +1,3 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
 58b8a3f2f7729387acb7cd365191a979  Csound5.03_src-cvs20061023.tar.bz2
+8f01e4b65c3cb046df04f7eae92448d5  Csound5.03_src-cvs20061027.tar.bz2



From fedora-extras-commits at redhat.com  Fri Oct 27 22:12:35 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:12:35 -0700
Subject: rpms/monodevelop/FC-5 monodevelop.spec,1.9,1.10
Message-ID: <200610272212.k9RMCZ6N024591@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24575

Modified Files:
	monodevelop.spec 
Log Message:

Add R apr-devel and fixed web url 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/FC-5/monodevelop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- monodevelop.spec	27 Sep 2006 20:17:51 -0000	1.9
+++ monodevelop.spec	27 Oct 2006 22:12:05 -0000	1.10
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://go-mono.com/sources/%{name}/
+URL: http://www.monodevelop.com
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -96,6 +96,10 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-6
+- fix for SVN
+- url now correct
+
 * Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
 - pkgconfig fix 
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:15:13 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:15:13 -0700
Subject: rpms/monodevelop/FC-6 monodevelop.spec,1.10,1.11
Message-ID: <200610272215.k9RMFDex024654@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24636

Modified Files:
	monodevelop.spec 
Log Message:

Fixed web url, added R apr-devel 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/FC-6/monodevelop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monodevelop.spec	27 Sep 2006 20:16:30 -0000	1.10
+++ monodevelop.spec	27 Oct 2006 22:14:43 -0000	1.11
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://go-mono.com/sources/%{name}/
+URL: http://www.monodevelop.com
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -96,6 +96,10 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-6
+- fixed url
+- added R apr-devel
+
 * Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
 - pkgconfig fix 
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:17:37 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:17:37 -0700
Subject: rpms/monodevelop/devel monodevelop.spec,1.10,1.11
Message-ID: <200610272217.k9RMHbqh024717@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24700

Modified Files:
	monodevelop.spec 
Log Message:

Fixed web url, added R apr-devel 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monodevelop.spec	27 Sep 2006 20:16:30 -0000	1.10
+++ monodevelop.spec	27 Oct 2006 22:17:07 -0000	1.11
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://go-mono.com/sources/%{name}/
+URL: http://www.monodevelop.com
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -96,6 +96,10 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-6
+- fixed url
+- added R apr-devel
+
 * Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
 - pkgconfig fix 
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:02 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:20:02 -0700
Subject: rpms/gtk-sharp/FC-6 gtk-sharp.spec,1.2,1.3
Message-ID: <200610272220.k9RMK2o3024809@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtk-sharp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24777

Modified Files:
	gtk-sharp.spec 
Log Message:

rebuild 
 	gtk-sharp.spec 



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-sharp/FC-6/gtk-sharp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-sharp.spec	4 Oct 2006 22:16:57 -0000	1.2
+++ gtk-sharp.spec	27 Oct 2006 22:19:32 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPL
@@ -109,6 +109,9 @@
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0.10-12
+- rebuild
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.10-11
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:20:46 -0700
Subject: rpms/perl-Chatbot-Eliza - New directory
Message-ID: <200610272220.k9RMKkEq024878@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24874/perl-Chatbot-Eliza

Log Message:
Directory /cvs/extras/rpms/perl-Chatbot-Eliza added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:20:56 -0700
Subject: rpms/perl-Chatbot-Eliza/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200610272220.k9RMKuvm024939@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24910/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Chatbot-Eliza


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:20:52 -0700
Subject: rpms/perl-Chatbot-Eliza/devel - New directory
Message-ID: <200610272220.k9RMKqel024894@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24874/perl-Chatbot-Eliza/devel

Log Message:
Directory /cvs/extras/rpms/perl-Chatbot-Eliza/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Oct 27 22:20:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:20:55 -0700
Subject: rpms/perl-Chatbot-Eliza Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610272220.k9RMKt3G024916@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24910

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Chatbot-Eliza


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Chatbot-Eliza
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Oct 27 22:21:32 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:21:32 -0700
Subject: rpms/perl-Chatbot-Eliza import.log,1.1,1.2
Message-ID: <200610272221.k9RMLWUm025017@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24961

Modified Files:
	import.log 
Log Message:
auto-import perl-Chatbot-Eliza-1.04-2.fc6 on branch devel from perl-Chatbot-Eliza-1.04-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Chatbot-Eliza/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Oct 2006 22:20:55 -0000	1.1
+++ import.log	27 Oct 2006 22:21:02 -0000	1.2
@@ -0,0 +1 @@
+perl-Chatbot-Eliza-1_04-2_fc6:HEAD:perl-Chatbot-Eliza-1.04-2.fc6.src.rpm:1161987661



From fedora-extras-commits at redhat.com  Fri Oct 27 22:21:33 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:21:33 -0700
Subject: rpms/perl-Chatbot-Eliza/devel perl-Chatbot-Eliza.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610272221.k9RMLXxS025021@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24961/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Chatbot-Eliza.spec 
Log Message:
auto-import perl-Chatbot-Eliza-1.04-2.fc6 on branch devel from perl-Chatbot-Eliza-1.04-2.fc6.src.rpm


--- NEW FILE perl-Chatbot-Eliza.spec ---
Name:           perl-Chatbot-Eliza
Version:        1.04
Release:        2%{?dist}
Summary:        Implementation of the Eliza algorithm
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Chatbot-Eliza/
Source0:        http://www.cpan.org/authors/id/J/JN/JNOLAN/Chatbot-Eliza-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module implements the classic Eliza algorithm. The original Eliza
program was written by Joseph Weizenbaum and described in the
Communications of the ACM in 1966. Eliza is a mock Rogerian
psychotherapist. It prompts for user input, and uses a simple
transformation algorithm to change user input into a follow-up question.
The program is designed to give the appearance of understanding.

%prep
%setup -q -n Chatbot-Eliza-%{version}

# quiet rpmlint :)
chmod -x *
chmod +x Chatbot

%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 simple.cgi doctor.txt README simple twobots debug.cgi
%lang(de) %doc deutsch*
%lang(no) %doc norsk*
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Oct 27 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-2
- change summary
- tag certain files in %%doc with %%lang

* Thu Oct 26 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Chatbot-Eliza/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Oct 2006 22:20:55 -0000	1.1
+++ .cvsignore	27 Oct 2006 22:21:03 -0000	1.2
@@ -0,0 +1 @@
+Chatbot-Eliza-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Chatbot-Eliza/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Oct 2006 22:20:55 -0000	1.1
+++ sources	27 Oct 2006 22:21:03 -0000	1.2
@@ -0,0 +1 @@
+754199bbe591eaa11301aee108586fcd  Chatbot-Eliza-1.04.tar.gz



From fedora-extras-commits at redhat.com  Fri Oct 27 22:21:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:21:56 -0700
Subject: owners owners.list,1.1875,1.1876
Message-ID: <200610272221.k9RMLuox025066@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24997

Modified Files:
	owners.list 
Log Message:
added perl-Chatbot-Eliza


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1875
retrieving revision 1.1876
diff -u -r1.1875 -r1.1876
--- owners.list	26 Oct 2006 21:45:48 -0000	1.1875
+++ owners.list	27 Oct 2006 22:21:26 -0000	1.1876
@@ -1278,6 +1278,7 @@
 Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-CGI-Untaint-email|Validate an email address|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Chart|Perl modules for producing many types of charts|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Chatbot-Eliza|Implementation of the Eliza algorithm|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Oct 27 22:22:10 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 27 Oct 2006 15:22:10 -0700
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.2,1.3
Message-ID: <200610272222.k9RMMAwk025090@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtk-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25016

Modified Files:
	gtk-sharp.spec 
Log Message:

rebuild 
 	gtk-sharp.spec 



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-sharp.spec	4 Oct 2006 22:16:57 -0000	1.2
+++ gtk-sharp.spec	27 Oct 2006 22:21:40 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPL
@@ -109,6 +109,9 @@
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Fri Oct 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0.10-12
+- rebuild
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.10-11
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Fri Oct 27 22:22:33 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Fri, 27 Oct 2006 15:22:33 -0700
Subject: rpms/perl-Chatbot-Eliza/devel perl-Chatbot-Eliza.spec,1.1,1.2
Message-ID: <200610272222.k9RMMX3J025127@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Chatbot-Eliza/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25074

Modified Files:
	perl-Chatbot-Eliza.spec 
Log Message:
release bump


Index: perl-Chatbot-Eliza.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chatbot-Eliza/devel/perl-Chatbot-Eliza.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Chatbot-Eliza.spec	27 Oct 2006 22:21:03 -0000	1.1
+++ perl-Chatbot-Eliza.spec	27 Oct 2006 22:22:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Chatbot-Eliza
 Version:        1.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Implementation of the Eliza algorithm
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 27 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-3
+- bump
+
 * Fri Oct 27 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.04-2
 - change summary
 - tag certain files in %%doc with %%lang



From fedora-extras-commits at redhat.com  Sat Oct 28 00:54:52 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 27 Oct 2006 17:54:52 -0700
Subject: extras-buildsys/utils/pushscript Utils.py, 1.5, 1.6 RepoView.py, 1.1,
	1.2
Message-ID: <200610280054.k9S0sqgR015727@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15705

Modified Files:
	Utils.py RepoView.py 
Log Message:
Also backup "debug/repodata", as we run repoview for debuginfo
packages, too (do we really want that?).

Now even less html files should be rewritten.

Temporarily run repoview non-quiet.



Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Utils.py	27 Oct 2006 21:00:21 -0000	1.5
+++ Utils.py	28 Oct 2006 00:54:49 -0000	1.6
@@ -131,19 +131,6 @@
     if run(cmd):
         raise Exception
     
-    if debuginfo:
-        # If there's a debug subdir, make that a repo, too.
-        dbg_repodir = os.path.join(repodir, 'debug')
-        if os.path.exists(dbg_repodir):
-            print 'Creating repository %s' % dbg_repodir
-            rpdata = os.path.join(dbg_repodir, 'repodata')  # see above
-            debugprint('removing tree %s' % rpdata)
-            if os.path.exists(rpdata) and not DEBUG:
-                shutil.rmtree(rpdata)
-            cmd = '%s -c %s -q %s' % (cfg.createrepo, cfg.cr_cachedir, dbg_repodir)
-            if run(cmd):
-                raise Exception
-
 
 def _restore_repodata_dir(tmpdir,targetdir):  # helper function
     for f in os.listdir(tmpdir):
@@ -158,10 +145,8 @@
             shutil.move(sourcefile,targetfile)
 
 
-def create_repository(cfg,repodir,debuginfo=True):
-    """create/update repository metadata for a given directory and
-    consider a 'debug' sub-repository by default"""
-
+def _backup_create_repository(cfg,repodir,debuginfo):
+    # Create dirs, if missing, so we would create empty backups, too.
     rpdata = os.path.join(repodir,'repodata')
     for d in [repodir,rpdata]:
         if not os.path.exists(d):
@@ -193,6 +178,18 @@
         sys.exit(errno.EPERM)
     
 
+def create_repository(cfg,repodir,debuginfo=True):
+    """create/update repository metadata for a given directory and
+    consider a 'debug' sub-repository by default"""
+
+    _backup_create_repository(cfg,repodir,debuginfo)
+
+    dbg_repodir = os.path.join(repodir, 'debug')
+    # If there's a debug subdir, make that a repo, too.
+    if debuginfo and os.path.exists(dbg_repodir):
+        _backup_create_repository(cfg,dbg_repodir,False)
+
+
 def is_repo_changed(repodir):
     """Checks if the repository has changed and needs to be reindexed"""
     ref_file = os.path.join(repodir, 'repodata', 'repomd.xml')


Index: RepoView.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoView.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepoView.py	29 Sep 2006 16:14:14 -0000	1.1
+++ RepoView.py	28 Oct 2006 00:54:49 -0000	1.2
@@ -20,14 +20,14 @@
 
 def do_repoview(cfg,repodir):
     print 'Generating repoview in %s' % repodir
-    cmd = '%s -q %s' % (cfg.repoview,repodir)
-    Utils.run_and_check(cmd)            
+    cmd = '%s %s' % (cfg.repoview,repodir)
+    Utils.run_and_check(cmd)
 
     # if there's a debug subdir, make that a repo, too.
     dbg_repodir = os.path.join(repodir, 'debug')
     if os.path.exists(dbg_repodir):
         print 'Generating repoview in %s' % dbg_repodir
-        cmd = '%s -q %s' % (cfg.repoview,dbg_repodir)
+        cmd = '%s %s' % (cfg.repoview,dbg_repodir)
         Utils.run_and_check(cmd)
 
 



From fedora-extras-commits at redhat.com  Sat Oct 28 03:29:17 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 27 Oct 2006 20:29:17 -0700
Subject: rpms/daap-sharp/devel .cvsignore, 1.2, 1.3 daap-sharp.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200610280329.k9S3THr0025243@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/daap-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25223

Modified Files:
	.cvsignore daap-sharp.spec sources 
Log Message:
* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-1
- Update to 0.3.5.
- Disable debug info.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/daap-sharp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2006 02:55:30 -0000	1.2
+++ .cvsignore	28 Oct 2006 03:28:46 -0000	1.3
@@ -1 +1 @@
-daap-sharp-0.3.3.tar.gz
+daap-sharp-0.3.5.tar.gz


Index: daap-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/daap-sharp/devel/daap-sharp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- daap-sharp.spec	16 Sep 2006 16:15:56 -0000	1.4
+++ daap-sharp.spec	28 Oct 2006 03:28:46 -0000	1.5
@@ -1,6 +1,8 @@
+%define debug_package %{nil}
+
 Name:           daap-sharp
-Version:        0.3.3
-Release:        6%{?dist}
+Version:        0.3.5
+Release:        1%{?dist}
 Summary:        DAAP (Digial Audio Access Protocol) implementation using Mono
 
 Group:          System Environment/Libraries
@@ -63,6 +65,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-1
+- Update to 0.3.5.
+- Disable debug info.
+
 * Sat Sep 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.3.3-6
 - Add requires for pkgconfig for devel.
 - Drop patch for libdir.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/daap-sharp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2006 02:55:30 -0000	1.2
+++ sources	28 Oct 2006 03:28:46 -0000	1.3
@@ -1 +1 @@
-53feead0f3ef75cf5e34cbb4f1d37f30  daap-sharp-0.3.3.tar.gz
+8ec7e4a45367b314a23fed09eea56eab  daap-sharp-0.3.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:33 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:33 -0700
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.21, 1.22
Message-ID: <200610280522.k9S5MXtV031525@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/FC-3

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:05 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:03 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:05 -0000	1.18
+++ sources	28 Oct 2006 05:22:03 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wine-docs.spec	21 Oct 2006 09:06:05 -0000	1.21
+++ wine-docs.spec	28 Oct 2006 05:22:03 -0000	1.22
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:34 -0700
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.25, 1.26
Message-ID: <200610280522.k9S5MYhJ031530@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/FC-4

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:06 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:04 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:06 -0000	1.18
+++ sources	28 Oct 2006 05:22:04 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wine-docs.spec	21 Oct 2006 09:06:06 -0000	1.25
+++ wine-docs.spec	28 Oct 2006 05:22:04 -0000	1.26
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -51,6 +51,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:42 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:42 -0700
Subject: rpms/wine-docs/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.18, 1.19
Message-ID: <200610280522.k9S5Mg2b031545@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/devel

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:13 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:11 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:13 -0000	1.18
+++ sources	28 Oct 2006 05:22:11 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine-docs.spec	21 Oct 2006 09:06:13 -0000	1.18
+++ wine-docs.spec	28 Oct 2006 05:22:11 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:40 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:40 -0700
Subject: rpms/wine-docs/FC-5 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.18, 1.19
Message-ID: <200610280522.k9S5Me4x031535@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/FC-5

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:12 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:10 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:12 -0000	1.18
+++ sources	28 Oct 2006 05:22:10 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine-docs.spec	21 Oct 2006 09:06:12 -0000	1.18
+++ wine-docs.spec	28 Oct 2006 05:22:10 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:22:41 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:22:41 -0700
Subject: rpms/wine-docs/FC-6 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 wine-docs.spec, 1.18, 1.19
Message-ID: <200610280522.k9S5MfY4031540@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31441/FC-6

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Oct 2006 09:06:13 -0000	1.18
+++ .cvsignore	28 Oct 2006 05:22:11 -0000	1.19
@@ -1 +1 @@
-wine-docs-0.9.23.tar.bz2
+wine-docs-0.9.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Oct 2006 09:06:13 -0000	1.18
+++ sources	28 Oct 2006 05:22:11 -0000	1.19
@@ -1 +1 @@
-8a03a05a9c85812bab239b9591dd2b3b  wine-docs-0.9.23.tar.bz2
+f15383c5cb41fbbb4578c4ca6af3b0b1  wine-docs-0.9.24.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-6/wine-docs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine-docs.spec	21 Oct 2006 09:06:13 -0000	1.18
+++ wine-docs.spec	28 Oct 2006 05:22:11 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.23
+Version:        0.9.24
 Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.23.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.24.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:41:10 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Fri, 27 Oct 2006 22:41:10 -0700
Subject: rpms/dircproxy/devel .cvsignore, 1.1, 1.2 dircproxy.spec, 1.1,
	1.2 sources, 1.1, 1.2 dircproxy-1.2.0-gcc4.patch, 1.1,
	NONE dircproxy-1.2.0-md5inversion.patch, 1.1, NONE
Message-ID: <200610280541.k9S5fAlv031862@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/dircproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31840

Modified Files:
	.cvsignore dircproxy.spec sources 
Removed Files:
	dircproxy-1.2.0-gcc4.patch dircproxy-1.2.0-md5inversion.patch 
Log Message:
bump to 1.2.0beta2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2006 15:11:12 -0000	1.1
+++ .cvsignore	28 Oct 2006 05:40:39 -0000	1.2
@@ -0,0 +1 @@
+dircproxy-1.2.0-beta2.tar.bz


Index: dircproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/dircproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dircproxy.spec	14 Sep 2006 15:11:38 -0000	1.1
+++ dircproxy.spec	28 Oct 2006 05:40:39 -0000	1.2
@@ -1,17 +1,15 @@
 Name:           dircproxy
 Version:        1.2.0
-Release:        0.4.beta%{?dist}
+%define betaver beta2
+Release:        0.5.%{betaver}%{?dist}
 Summary:        IRC proxy server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://dircproxy.securiweb.net/
-Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-beta.tar.bz
+Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-%{betaver}.tar.bz
 Source1:        dircproxy.init
 Source2:        dircproxy.sysconfig
-Source3:        README.ssl
-Patch0:         dircproxy-1.2.0-gcc4.patch
-Patch1:         dircproxy-1.2.0-md5inversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -27,10 +25,7 @@
 it'll let you know what you missed.
 
 %prep
-%setup -q -n %{name}-%{version}-beta
-%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .md5inv
-cp %{SOURCE3} .
+%setup -q -n %{name}-%{version}-%{betaver}
 
 %build
 %configure --enable-ssl
@@ -82,6 +77,9 @@
 %{_datadir}/dircproxy/
 
 %changelog
+* Tue Oct 10 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.5.beta2
+- Update to 1.2.0-beta2
+
 * Thu Sep 14 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.4.beta
 - Correct perms on sysconfig file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2006 15:11:12 -0000	1.1
+++ sources	28 Oct 2006 05:40:39 -0000	1.2
@@ -0,0 +1 @@
+850443437f709276ff21a173bbf98456  dircproxy-1.2.0-beta2.tar.bz


--- dircproxy-1.2.0-gcc4.patch DELETED ---


--- dircproxy-1.2.0-md5inversion.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 28 05:44:18 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Fri, 27 Oct 2006 22:44:18 -0700
Subject: rpms/dircproxy/FC-6 .cvsignore, 1.1, 1.2 dircproxy.spec, 1.1,
	1.2 sources, 1.1, 1.2 dircproxy-1.2.0-gcc4.patch, 1.1,
	NONE dircproxy-1.2.0-md5inversion.patch, 1.1, NONE
Message-ID: <200610280544.k9S5iIcv031945@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/dircproxy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31925

Modified Files:
	.cvsignore dircproxy.spec sources 
Removed Files:
	dircproxy-1.2.0-gcc4.patch dircproxy-1.2.0-md5inversion.patch 
Log Message:
bump to 1.2.0beta2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2006 15:11:12 -0000	1.1
+++ .cvsignore	28 Oct 2006 05:43:48 -0000	1.2
@@ -0,0 +1 @@
+dircproxy-1.2.0-beta2.tar.bz


Index: dircproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/FC-6/dircproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dircproxy.spec	14 Sep 2006 15:11:38 -0000	1.1
+++ dircproxy.spec	28 Oct 2006 05:43:48 -0000	1.2
@@ -1,17 +1,15 @@
 Name:           dircproxy
 Version:        1.2.0
-Release:        0.4.beta%{?dist}
+%define betaver beta2
+Release:        0.5.%{betaver}%{?dist}
 Summary:        IRC proxy server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://dircproxy.securiweb.net/
-Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-beta.tar.bz
+Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-%{betaver}.tar.bz
 Source1:        dircproxy.init
 Source2:        dircproxy.sysconfig
-Source3:        README.ssl
-Patch0:         dircproxy-1.2.0-gcc4.patch
-Patch1:         dircproxy-1.2.0-md5inversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -27,10 +25,7 @@
 it'll let you know what you missed.
 
 %prep
-%setup -q -n %{name}-%{version}-beta
-%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .md5inv
-cp %{SOURCE3} .
+%setup -q -n %{name}-%{version}-%{betaver}
 
 %build
 %configure --enable-ssl
@@ -82,6 +77,9 @@
 %{_datadir}/dircproxy/
 
 %changelog
+* Tue Oct 10 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.5.beta2
+- Update to 1.2.0-beta2
+
 * Thu Sep 14 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.4.beta
 - Correct perms on sysconfig file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2006 15:11:12 -0000	1.1
+++ sources	28 Oct 2006 05:43:48 -0000	1.2
@@ -0,0 +1 @@
+850443437f709276ff21a173bbf98456  dircproxy-1.2.0-beta2.tar.bz


--- dircproxy-1.2.0-gcc4.patch DELETED ---


--- dircproxy-1.2.0-md5inversion.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Oct 28 05:51:59 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:51:59 -0700
Subject: rpms/wine/FC-6 .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 wine.spec,
	1.37, 1.38
Message-ID: <200610280551.k9S5pxSU032106@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/FC-6

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 13:22:51 -0000	1.24
+++ .cvsignore	28 Oct 2006 05:51:29 -0000	1.25
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Oct 2006 13:22:51 -0000	1.25
+++ sources	28 Oct 2006 05:51:29 -0000	1.26
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wine.spec	18 Oct 2006 13:22:51 -0000	1.37
+++ wine.spec	28 Oct 2006 05:51:29 -0000	1.38
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -51,6 +51,7 @@
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  giflib-devel
 BuildRequires:  cups-devel
@@ -690,6 +691,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:51:58 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:51:58 -0700
Subject: rpms/wine/FC-5 .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 wine.spec,
	1.37, 1.38
Message-ID: <200610280551.k9S5pwwi032101@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 13:22:50 -0000	1.24
+++ .cvsignore	28 Oct 2006 05:51:28 -0000	1.25
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Oct 2006 13:22:50 -0000	1.25
+++ sources	28 Oct 2006 05:51:28 -0000	1.26
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wine.spec	18 Oct 2006 13:22:50 -0000	1.37
+++ wine.spec	28 Oct 2006 05:51:28 -0000	1.38
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -51,6 +51,7 @@
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  giflib-devel
 BuildRequires:  cups-devel
@@ -690,6 +691,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:51:58 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:51:58 -0700
Subject: rpms/wine/FC-4 .cvsignore, 1.21, 1.22 sources, 1.22, 1.23 wine.spec,
	1.31, 1.32
Message-ID: <200610280552.k9S5pw2j032098@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	21 Oct 2006 08:20:41 -0000	1.21
+++ .cvsignore	28 Oct 2006 05:51:27 -0000	1.22
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	21 Oct 2006 08:20:41 -0000	1.22
+++ sources	28 Oct 2006 05:51:27 -0000	1.23
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wine.spec	21 Oct 2006 08:20:41 -0000	1.31
+++ wine.spec	28 Oct 2006 05:51:28 -0000	1.32
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -678,6 +678,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:51:57 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:51:57 -0700
Subject: rpms/wine/FC-3 .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 wine.spec,
	1.28, 1.29
Message-ID: <200610280551.k9S5pvXX032093@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	21 Oct 2006 08:20:40 -0000	1.20
+++ .cvsignore	28 Oct 2006 05:51:27 -0000	1.21
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	21 Oct 2006 08:20:40 -0000	1.21
+++ sources	28 Oct 2006 05:51:27 -0000	1.22
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wine.spec	21 Oct 2006 08:20:40 -0000	1.28
+++ wine.spec	28 Oct 2006 05:51:27 -0000	1.29
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -678,6 +678,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Sat Oct 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:52:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Oct 2006 22:52:05 -0700
Subject: rpms/wine/devel .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 wine.spec,
	1.37, 1.38
Message-ID: <200610280552.k9S5q5Ll032113@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32003/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 13:22:51 -0000	1.24
+++ .cvsignore	28 Oct 2006 05:51:35 -0000	1.25
@@ -1 +1 @@
-wine-0.9.23-fe.tar.bz2
+wine-0.9.24-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Oct 2006 13:22:51 -0000	1.25
+++ sources	28 Oct 2006 05:51:35 -0000	1.26
@@ -1 +1 @@
-6dd92d3645048f66c5026a021ead0b32  wine-0.9.23-fe.tar.bz2
+1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wine.spec	18 Oct 2006 13:22:51 -0000	1.37
+++ wine.spec	28 Oct 2006 05:51:35 -0000	1.38
@@ -1,7 +1,7 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.23
+Version:	0.9.24
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -9,7 +9,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.23-fe.tar.bz2
+Source0:        wine-0.9.24-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -51,6 +51,7 @@
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  giflib-devel
 BuildRequires:  cups-devel
@@ -690,6 +691,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.24-1
+- version upgrade
+
 * Tue Oct 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.23-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Oct 28 05:56:27 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 22:56:27 -0700
Subject: rpms/scribes/devel .cvsignore, 1.5, 1.6 scribes.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200610280556.k9S5uRAM032350@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32330/devel

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
New upstream release (0.2.9.89)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2006 03:46:43 -0000	1.5
+++ .cvsignore	28 Oct 2006 05:55:57 -0000	1.6
@@ -1 +1 @@
-scribes-0.2.9.88.tar.bz2
+scribes-0.2.9.89.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scribes.spec	17 Oct 2006 03:49:39 -0000	1.14
+++ scribes.spec	28 Oct 2006 05:55:57 -0000	1.15
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define python_module_name	SCRIBES
+%define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.88
+Version:	0.2.9.89
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
+- Update to new upstream version (0.2.9.89)
+
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
 - Don't hardcode a Pysco requirement at all; but note that option in the
   %%description for those on x86 who want it, since the %ifarch conditional


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2006 03:46:43 -0000	1.5
+++ sources	28 Oct 2006 05:55:57 -0000	1.6
@@ -1 +1 @@
-cfcd7e4627b5ff4d77bf20bcd4b39535  scribes-0.2.9.88.tar.bz2
+7e94cc1ddb8ac32820fabefaf9ed305d  scribes-0.2.9.89.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 06:00:07 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 23:00:07 -0700
Subject: rpms/scribes/FC-6 .cvsignore, 1.5, 1.6 scribes.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200610280600.k9S6075r032431@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32403

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
New upstream release (0.2.9.89)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2006 03:46:43 -0000	1.5
+++ .cvsignore	28 Oct 2006 05:59:37 -0000	1.6
@@ -1 +1 @@
-scribes-0.2.9.88.tar.bz2
+scribes-0.2.9.89.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scribes.spec	17 Oct 2006 03:49:39 -0000	1.14
+++ scribes.spec	28 Oct 2006 05:59:37 -0000	1.15
@@ -1,9 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define python_module_name	SCRIBES
+%define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.88
+Version:	0.2.9.89
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
+- Update to new upstream version (0.2.9.89)
+
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
 - Don't hardcode a Pysco requirement at all; but note that option in the
   %%description for those on x86 who want it, since the %ifarch conditional


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2006 03:46:43 -0000	1.5
+++ sources	28 Oct 2006 05:59:37 -0000	1.6
@@ -1 +1 @@
-cfcd7e4627b5ff4d77bf20bcd4b39535  scribes-0.2.9.88.tar.bz2
+7e94cc1ddb8ac32820fabefaf9ed305d  scribes-0.2.9.89.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 06:16:42 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 27 Oct 2006 23:16:42 -0700
Subject: rpms/gaim-otr/devel gaim-beta4.patch,NONE,1.1
Message-ID: <200610280616.k9S6GgKN003028@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3020

Added Files:
	gaim-beta4.patch 
Log Message:
Patch for compiling against gaim 2.0.0-beta4


gaim-beta4.patch:

--- NEW FILE gaim-beta4.patch ---
diff -r -c -N gaim-otr/gtk-dialog.c gaim-otr-new/gtk-dialog.c
*** gaim-otr/gtk-dialog.c	2005-12-18 13:33:48.000000000 -0500
--- gaim-otr-new/gtk-dialog.c	2006-10-28 02:01:00.000000000 -0400
***************
*** 30,36 ****
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include "gtkstock.h"
  #endif
  #include "plugin.h"
  #include "notify.h"
--- 30,36 ----
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include <gtk/gtkstock.h>
  #endif
  #include "plugin.h"
  #include "notify.h"
***************
*** 648,662 ****
  
      switch (type) {
  	case GAIM_NOTIFY_MSG_ERROR:
! 	    icon_name = GAIM_STOCK_DIALOG_ERROR;
  	    break;
  
  	case GAIM_NOTIFY_MSG_WARNING:
! 	    icon_name = GAIM_STOCK_DIALOG_WARNING;
  	    break;
  
  	case GAIM_NOTIFY_MSG_INFO:
! 	    icon_name = GAIM_STOCK_DIALOG_INFO;
  	    break;
  
  	default:
--- 648,662 ----
  
      switch (type) {
  	case GAIM_NOTIFY_MSG_ERROR:
! 	    icon_name = GTK_STOCK_DIALOG_ERROR;
  	    break;
  
  	case GAIM_NOTIFY_MSG_WARNING:
! 	    icon_name = GTK_STOCK_DIALOG_WARNING;
  	    break;
  
  	case GAIM_NOTIFY_MSG_INFO:
! 	    icon_name = GTK_STOCK_DIALOG_INFO;
  	    break;
  
  	default:



From fedora-extras-commits at redhat.com  Sat Oct 28 06:17:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 27 Oct 2006 23:17:45 -0700
Subject: fedora-security/audit fe3, 1.23, 1.24 fe4, 1.83, 1.84 fe5, 1.90,
	1.91 fe6, 1.3, 1.4
Message-ID: <200610280617.k9S6HjUg003073@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3049

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-4513 VULNERABLE (wv) #212696


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fe3	27 Oct 2006 17:18:16 -0000	1.23
+++ fe3	28 Oct 2006 06:17:42 -0000	1.24
@@ -5,6 +5,7 @@
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
+CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4182 version (clamav, fixed 0.88.5) #210973


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fe4	27 Oct 2006 17:18:16 -0000	1.83
+++ fe4	28 Oct 2006 06:17:42 -0000	1.84
@@ -27,6 +27,7 @@
 CVE-2006-4568 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- fe5	27 Oct 2006 17:18:16 -0000	1.90
+++ fe5	28 Oct 2006 06:17:42 -0000	1.91
@@ -27,6 +27,7 @@
 CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fe6	27 Oct 2006 17:18:16 -0000	1.3
+++ fe6	28 Oct 2006 06:17:42 -0000	1.4
@@ -27,6 +27,7 @@
 CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163



From fedora-extras-commits at redhat.com  Sat Oct 28 06:34:14 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 27 Oct 2006 23:34:14 -0700
Subject: rpms/gaim-otr/devel gaim-otr.spec,1.23,1.24
Message-ID: <200610280634.k9S6YEXE003168@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3152

Modified Files:
	gaim-otr.spec 
Log Message:
* Sat Oct 28 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.3.20060921cvs
- Added patch for gaim 2.0.0-beta4



Index: gaim-otr.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-otr/devel/gaim-otr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gaim-otr.spec	2 Oct 2006 22:30:06 -0000	1.23
+++ gaim-otr.spec	28 Oct 2006 06:33:44 -0000	1.24
@@ -1,17 +1,18 @@
 Summary: Off-The-Record Messaging plugin for GAIM
 Name: gaim-otr
 Version: 3.0.1
-Release: 0.2.20060921cvs%{?dist}
+Release: 0.3.20060921cvs%{?dist}
 #Source: http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
 Source: %{name}-20060712.tar.gz
+Patch0: gaim-beta4.patch
 Url: http://www.cypherpunks.ca/otr/
 License: GPL
 Group: Applications/Internet
 Provides: otr-plugin = %{version}
 Obsoletes: otr-plugin
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gaim >= 2.0.0, libotr >= 3.0.0
-BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0, autoconf, automake, libtool, gaim-devel >= 2.0.0
+Requires: gaim >= 2.0.0-0.17.beta4, libotr >= 3.0.0
+BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0, autoconf, automake, libtool, gaim-devel >= 2.0.0-0.17.beta4
 
 %description 
 
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .beta4
 # temporary because we are using a cvs snapshot for now:
 #autoreconf
 autoreconf -s -i -v -f 
@@ -47,6 +49,9 @@
 %{_libdir}/gaim/gaim-otr.so
 
 %changelog
+* Sat Oct 28 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.3.20060921cvs
+- Added patch for gaim 2.0.0-beta4
+
 * Mon Oct  2 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.2.20060921cvs
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 06:36:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 27 Oct 2006 23:36:23 -0700
Subject: fedora-security/audit fe3, 1.24, 1.25 fe4, 1.84, 1.85 fe5, 1.91,
	1.92 fe6, 1.4, 1.5
Message-ID: <200610280636.k9S6aNQ7003261@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3237

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-4513 ** (abiword) #212698


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fe3	28 Oct 2006 06:17:42 -0000	1.24
+++ fe3	28 Oct 2006 06:36:21 -0000	1.25
@@ -6,6 +6,7 @@
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4182 version (clamav, fixed 0.88.5) #210973


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fe4	28 Oct 2006 06:17:42 -0000	1.84
+++ fe4	28 Oct 2006 06:36:21 -0000	1.85
@@ -28,6 +28,7 @@
 CVE-2006-4566 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- fe5	28 Oct 2006 06:17:42 -0000	1.91
+++ fe5	28 Oct 2006 06:36:21 -0000	1.92
@@ -28,6 +28,7 @@
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fe6	28 Oct 2006 06:17:42 -0000	1.4
+++ fe6	28 Oct 2006 06:36:21 -0000	1.5
@@ -28,6 +28,7 @@
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163



From fedora-extras-commits at redhat.com  Sat Oct 28 06:38:02 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 23:38:02 -0700
Subject: rpms/scribes/devel scribes.spec,1.15,1.16
Message-ID: <200610280638.k9S6c2xQ003294@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3278

Modified Files:
	scribes.spec 
Log Message:
Drop "--add-category X-Fedora" in desktop-file-install; fix last date entry in %changelog


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scribes.spec	28 Oct 2006 05:55:57 -0000	1.15
+++ scribes.spec	28 Oct 2006 06:37:32 -0000	1.16
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.89
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -95,7 +95,6 @@
 make DESTDIR=%{buildroot} install
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
@@ -153,7 +152,11 @@
 
 
 %changelog
-* Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
+* Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-2
+- Drop "--add-category X-Fedora" in desktop-file-install invocation
+- Fix last date entry in %%changelog
+
+* Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
 - Update to new upstream version (0.2.9.89)
 
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1



From fedora-extras-commits at redhat.com  Sat Oct 28 06:48:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 27 Oct 2006 23:48:24 -0700
Subject: fedora-security/audit fe3, 1.25, 1.26 fe4, 1.85, 1.86 fe5, 1.92,
	1.93 fe6, 1.5, 1.6
Message-ID: <200610280648.k9S6mO8D003353@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3329

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-560[12] (xsupplicant)


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fe3	28 Oct 2006 06:36:21 -0000	1.25
+++ fe3	28 Oct 2006 06:48:21 -0000	1.26
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-5602 VULNERABLE (xsupplicant) #212699
+CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- fe4	28 Oct 2006 06:36:21 -0000	1.85
+++ fe4	28 Oct 2006 06:48:21 -0000	1.86
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
+CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- fe5	28 Oct 2006 06:36:21 -0000	1.92
+++ fe5	28 Oct 2006 06:48:21 -0000	1.93
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
+CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fe6	28 Oct 2006 06:36:21 -0000	1.5
+++ fe6	28 Oct 2006 06:48:21 -0000	1.6
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
+CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355



From fedora-extras-commits at redhat.com  Sat Oct 28 06:49:50 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 23:49:50 -0700
Subject: rpms/scribes/FC-6 scribes.spec,1.15,1.16
Message-ID: <200610280649.k9S6noHT003394@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3364/FC-6

Modified Files:
	scribes.spec 
Log Message:
Update dbus-python dependency version (>= 0.70)


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scribes.spec	28 Oct 2006 05:59:37 -0000	1.15
+++ scribes.spec	28 Oct 2006 06:49:20 -0000	1.16
@@ -25,7 +25,7 @@
 BuildRequires:	gnome-doc-utils
 BuildRequires:	GConf2
 
-Requires:	dbus-python >= 0.60
+Requires:	dbus-python >= 0.70
 Requires:	pygobject2
 Requires:	pygtk2 >= 2.10
 Requires:	python >= 2.4
@@ -155,6 +155,7 @@
 %changelog
 * Wed Oct 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
 - Update to new upstream version (0.2.9.89)
+- Update dbus-python dependency version (>= 0.70)
 
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
 - Don't hardcode a Pysco requirement at all; but note that option in the



From fedora-extras-commits at redhat.com  Sat Oct 28 06:49:51 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 27 Oct 2006 23:49:51 -0700
Subject: rpms/scribes/devel scribes.spec,1.16,1.17
Message-ID: <200610280649.k9S6npu8003397@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3364/devel

Modified Files:
	scribes.spec 
Log Message:
Update dbus-python dependency version (>= 0.70)


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scribes.spec	28 Oct 2006 06:37:32 -0000	1.16
+++ scribes.spec	28 Oct 2006 06:49:20 -0000	1.17
@@ -25,7 +25,7 @@
 BuildRequires:	gnome-doc-utils
 BuildRequires:	GConf2
 
-Requires:	dbus-python >= 0.60
+Requires:	dbus-python >= 0.70
 Requires:	pygobject2
 Requires:	pygtk2 >= 2.10
 Requires:	python >= 2.4
@@ -155,6 +155,7 @@
 * Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-2
 - Drop "--add-category X-Fedora" in desktop-file-install invocation
 - Fix last date entry in %%changelog
+- Update dbus-python dependency version (>= 0.70)
 
 * Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-1
 - Update to new upstream version (0.2.9.89)



From fedora-extras-commits at redhat.com  Sat Oct 28 07:05:42 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:05:42 -0700
Subject: rpms/gtksourceview-sharp/FC-5 gtksourceview-sharp.spec,1.8,1.9
Message-ID: <200610280705.k9S75geo006422@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtksourceview-sharp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6402

Modified Files:
	gtksourceview-sharp.spec 
Log Message:

rebuild 
 	gtksourceview-sharp.spec 



Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview-sharp/FC-5/gtksourceview-sharp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtksourceview-sharp.spec	7 Sep 2006 20:11:58 -0000	1.8
+++ gtksourceview-sharp.spec	28 Oct 2006 07:05:11 -0000	1.9
@@ -9,7 +9,7 @@
 Summary: A C sharp binder for gtksourceview
 Name: gtksourceview-sharp
 Version: 2.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://go-mono.com/sources-latest/%{name}-%{version}/%{name}-%{version}-%{extra}.tar.gz
@@ -68,6 +68,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-24
+- rebuild
+
 * Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-23
 - D'oh!
 



From fedora-extras-commits at redhat.com  Sat Oct 28 07:09:07 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:09:07 -0700
Subject: rpms/gtksourceview-sharp/FC-6 gtksourceview-sharp.spec,1.10,1.11
Message-ID: <200610280709.k9S7971B006538@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtksourceview-sharp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6522

Modified Files:
	gtksourceview-sharp.spec 
Log Message:

rebuild 
 	gtksourceview-sharp.spec 



Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview-sharp/FC-6/gtksourceview-sharp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtksourceview-sharp.spec	7 Sep 2006 20:12:51 -0000	1.10
+++ gtksourceview-sharp.spec	28 Oct 2006 07:08:37 -0000	1.11
@@ -9,7 +9,7 @@
 Summary: A C sharp binder for gtksourceview
 Name: gtksourceview-sharp
 Version: 2.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://go-mono.com/sources-latest/%{name}-%{version}/%{name}-%{version}-%{extra}.tar.gz
@@ -68,6 +68,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-24
+- rebuild
+
 * Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-23
 - D'oh!
 



From fedora-extras-commits at redhat.com  Sat Oct 28 07:14:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:14:01 -0700
Subject: rpms/gtksourceview-sharp/devel gtksourceview-sharp.spec,1.10,1.11
Message-ID: <200610280714.k9S7E1QV006614@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gtksourceview-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598

Modified Files:
	gtksourceview-sharp.spec 
Log Message:

rebuild 
 	gtksourceview-sharp.spec 



Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview-sharp/devel/gtksourceview-sharp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtksourceview-sharp.spec	7 Sep 2006 20:12:51 -0000	1.10
+++ gtksourceview-sharp.spec	28 Oct 2006 07:13:31 -0000	1.11
@@ -9,7 +9,7 @@
 Summary: A C sharp binder for gtksourceview
 Name: gtksourceview-sharp
 Version: 2.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://go-mono.com/sources-latest/%{name}-%{version}/%{name}-%{version}-%{extra}.tar.gz
@@ -68,6 +68,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-24
+- rebuild
+
 * Thu Sep 07 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-23
 - D'oh!
 



From fedora-extras-commits at redhat.com  Sat Oct 28 07:16:28 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:16:28 -0700
Subject: rpms/anjuta/FC-6 anjuta2.spec,1.1,1.2
Message-ID: <200610280716.k9S7GSUt006691@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6664

Modified Files:
	anjuta2.spec 
Log Message:

rebuild against new libopts 
 	anjuta2.spec 



Index: anjuta2.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-6/anjuta2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anjuta2.spec	18 Oct 2006 20:42:16 -0000	1.1
+++ anjuta2.spec	28 Oct 2006 07:15:58 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
@@ -125,6 +125,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-9
+- rebuild for newer libopts
+
 * Tue Oct 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-8
 - fix the INSTALL line in install
 - fixed encoding on text files



From fedora-extras-commits at redhat.com  Sat Oct 28 07:20:59 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 28 Oct 2006 00:20:59 -0700
Subject: rpms/anjuta/devel anjuta2.spec,1.1,1.2
Message-ID: <200610280720.k9S7Kxc3006776@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6748

Modified Files:
	anjuta2.spec 
Log Message:

rebuild against newer libopts		
 	anjuta2.spec 



Index: anjuta2.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anjuta2.spec	18 Oct 2006 20:42:16 -0000	1.1
+++ anjuta2.spec	28 Oct 2006 07:20:28 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
@@ -125,6 +125,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Sat Oct 28 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-9
+- rebuild against new libopts
+
 * Tue Oct 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.2-8
 - fix the INSTALL line in install
 - fixed encoding on text files



From fedora-extras-commits at redhat.com  Sat Oct 28 07:39:43 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 00:39:43 -0700
Subject: rpms/scribes/devel scribes.spec,1.17,1.18
Message-ID: <200610280739.k9S7dhWJ006895@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6879/devel

Modified Files:
	scribes.spec 
Log Message:
Drop Application category from installed .desktop file


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scribes.spec	28 Oct 2006 06:49:20 -0000	1.17
+++ scribes.spec	28 Oct 2006 07:39:13 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name:		scribes
 Version:	0.2.9.89
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -95,6 +95,7 @@
 make DESTDIR=%{buildroot} install
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
+	--remove-category=Application	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
@@ -152,6 +153,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-3
+- Drop Application category from the installed .desktop file
+
 * Fri Oct 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.89-2
 - Drop "--add-category X-Fedora" in desktop-file-install invocation
 - Fix last date entry in %%changelog



From fedora-extras-commits at redhat.com  Sat Oct 28 08:07:29 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 28 Oct 2006 01:07:29 -0700
Subject: rpms/php-pear-Log/devel xml2changelog, NONE, 1.1 .cvsignore, 1.2,
	1.3 php-pear-Log.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610280807.k9S87T2s010040@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10019

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Added Files:
	xml2changelog 
Log Message:
	update to 1.9.9



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 19:59:09 -0000	1.2
+++ .cvsignore	28 Oct 2006 08:06:59 -0000	1.3
@@ -1 +1 @@
-Log-1.9.8.tgz
+Log-1.9.9.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/php-pear-Log.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Log.spec	7 Sep 2006 19:59:09 -0000	1.1
+++ php-pear-Log.spec	28 Oct 2006 08:06:59 -0000	1.2
@@ -1,20 +1,16 @@
-# default values when new /etc/rpm/macros.pear not present
-%{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Log
 
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.9.8
-Release:        5%{?dist}
+Version:        1.9.9
+Release:        1%{?dist}
 License:        PHP License
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:            http://pear.php.net/package/Log
 
@@ -47,7 +43,8 @@
 
 %prep
 %setup -c -q
-mv package2.xml Log-%{version}/Log.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
@@ -58,7 +55,7 @@
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Log.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -69,8 +66,7 @@
 
 popd
 # Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/* docdir
+mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
 
 %check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
@@ -80,23 +76,32 @@
 rm -rf %{buildroot}
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Log.xml >/dev/null || :
+%{__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 Log >/dev/null || :
+    %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE docdir/Log/docs/*
+%doc CHANGELOG LICENSE docdir/*
 %{pear_phpdir}/Log
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/Log.xml
+%{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Sat Oct 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.9-1
+- update to 1.9.9
+
+* Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-6
+- add CHANGELOG to %%doc
+
+* Fri Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5.fc5.1
+- rebuild for FC5
+
 * Thu Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5
 - BR php-pear >= 1:1.4.9-1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 19:59:09 -0000	1.2
+++ sources	28 Oct 2006 08:06:59 -0000	1.3
@@ -1 +1 @@
-d899cfa511b9bca9b54286245515586d  Log-1.9.8.tgz
+23f28e7fa803ddff7d68fec2850922d1  Log-1.9.9.tgz



From fedora-extras-commits at redhat.com  Sat Oct 28 08:19:23 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 28 Oct 2006 01:19:23 -0700
Subject: rpms/php-pear-Log/FC-6 xml2changelog, NONE, 1.1 .cvsignore, 1.2,
	1.3 php-pear-Log.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610280819.k9S8JNO0010169@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10134

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Added Files:
	xml2changelog 
Log Message:
	version 1.9.9



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 19:59:09 -0000	1.2
+++ .cvsignore	28 Oct 2006 08:18:53 -0000	1.3
@@ -1 +1 @@
-Log-1.9.8.tgz
+Log-1.9.9.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/php-pear-Log.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Log.spec	7 Sep 2006 19:59:09 -0000	1.1
+++ php-pear-Log.spec	28 Oct 2006 08:18:53 -0000	1.2
@@ -1,20 +1,16 @@
-# default values when new /etc/rpm/macros.pear not present
-%{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Log
 
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.9.8
-Release:        5%{?dist}
+Version:        1.9.9
+Release:        1%{?dist}
 License:        PHP License
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:            http://pear.php.net/package/Log
 
@@ -47,7 +43,8 @@
 
 %prep
 %setup -c -q
-mv package2.xml Log-%{version}/Log.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
@@ -58,7 +55,7 @@
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Log.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -69,8 +66,7 @@
 
 popd
 # Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/* docdir
+mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
 
 %check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
@@ -80,23 +76,32 @@
 rm -rf %{buildroot}
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Log.xml >/dev/null || :
+%{__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 Log >/dev/null || :
+    %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE docdir/Log/docs/*
+%doc CHANGELOG LICENSE docdir/*
 %{pear_phpdir}/Log
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/Log.xml
+%{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Sat Oct 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.9-1
+- update to 1.9.9
+
+* Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-6
+- add CHANGELOG to %%doc
+
+* Fri Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5.fc5.1
+- rebuild for FC5
+
 * Thu Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5
 - BR php-pear >= 1:1.4.9-1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 19:59:09 -0000	1.2
+++ sources	28 Oct 2006 08:18:53 -0000	1.3
@@ -1 +1 @@
-d899cfa511b9bca9b54286245515586d  Log-1.9.8.tgz
+23f28e7fa803ddff7d68fec2850922d1  Log-1.9.9.tgz



From fedora-extras-commits at redhat.com  Sat Oct 28 08:21:13 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 28 Oct 2006 01:21:13 -0700
Subject: rpms/php-pear-Log/FC-5 xml2changelog, NONE, 1.1 .cvsignore, 1.2,
	1.3 php-pear-Log.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610280821.k9S8LDgj010265@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10235

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Added Files:
	xml2changelog 
Log Message:
	version 1.9.9



--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		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);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 19:59:09 -0000	1.2
+++ .cvsignore	28 Oct 2006 08:20:43 -0000	1.3
@@ -1 +1 @@
-Log-1.9.8.tgz
+Log-1.9.9.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/php-pear-Log.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Log.spec	8 Sep 2006 16:56:59 -0000	1.2
+++ php-pear-Log.spec	28 Oct 2006 08:20:43 -0000	1.3
@@ -1,20 +1,16 @@
-# default values when new /etc/rpm/macros.pear not present
-%{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Log
 
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.9.8
-Release:        5%{?dist}.1
+Version:        1.9.9
+Release:        1%{?dist}
 License:        PHP License
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:            http://pear.php.net/package/Log
 
@@ -47,7 +43,8 @@
 
 %prep
 %setup -c -q
-mv package2.xml Log-%{version}/Log.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
@@ -58,7 +55,7 @@
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Log.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -69,8 +66,7 @@
 
 popd
 # Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/* docdir
+mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
 
 %check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
@@ -80,23 +76,29 @@
 rm -rf %{buildroot}
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Log.xml >/dev/null || :
+%{__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 Log >/dev/null || :
+    %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE docdir/Log/docs/*
+%doc CHANGELOG LICENSE docdir/*
 %{pear_phpdir}/Log
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/Log.xml
+%{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Sat Oct 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.9-1
+- update to 1.9.9
+
+* Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-6
+- add CHANGELOG to %%doc
+
 * Fri Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.9.8-5.fc5.1
 - rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 19:59:09 -0000	1.2
+++ sources	28 Oct 2006 08:20:43 -0000	1.3
@@ -1 +1 @@
-d899cfa511b9bca9b54286245515586d  Log-1.9.8.tgz
+23f28e7fa803ddff7d68fec2850922d1  Log-1.9.9.tgz



From fedora-extras-commits at redhat.com  Sat Oct 28 08:25:23 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Sat, 28 Oct 2006 01:25:23 -0700
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.10, 1.11
Message-ID: <200610280825.k9S8PN0F010335@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10319

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
fix BRs


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jack-audio-connection-kit.spec	24 Oct 2006 08:52:48 -0000	1.10
+++ jack-audio-connection-kit.spec	28 Oct 2006 08:24:53 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,7 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-BuildRequires: libfreebob >= 1.0.0
+BuildRequires: libfreebob-devel >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -120,6 +120,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Sat Oct 28 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-3
+- fix BuildRequires: libfreebob -> libfreebob-devel
+
 * Tue Oct 24 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.1
 - rebuild with libfreebob (should closed #211751)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 08:27:34 2006
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Sat, 28 Oct 2006 01:27:34 -0700
Subject: rpms/jack-audio-connection-kit/FC-6 jack-audio-connection-kit.spec, 
	1.10, 1.11
Message-ID: <200610280827.k9S8RYDe010404@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10388

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
fix BRs


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/FC-6/jack-audio-connection-kit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jack-audio-connection-kit.spec	24 Oct 2006 09:27:20 -0000	1.10
+++ jack-audio-connection-kit.spec	28 Oct 2006 08:27:04 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.102.20
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 License: GPL/LGPL
 Group: System Environment/Daemons
 Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
@@ -14,7 +14,7 @@
 BuildRequires: doxygen
 BuildRequires: readline-devel, libtermcap-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-BuildRequires: libfreebob >= 1.0.0
+BuildRequires: libfreebob-devel >= 1.0.0
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -120,6 +120,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Sat Oct 28 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-3
+- fix BuildRequires: libfreebob -> libfreebob-devel
+
 * Tue Oct 24 2006 Andy Shevchenko <andy at smile.org.ua> 0.102.20-2.1
 - rebuild with libfreebob (should closed #211751)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 08:54:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 01:54:08 -0700
Subject: rpms/wv/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5 wv.spec,1.14,1.15
Message-ID: <200610280854.k9S8s8AR010594@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/FC-5

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Dec 2005 21:11:53 -0000	1.4
+++ .cvsignore	28 Oct 2006 08:53:38 -0000	1.5
@@ -1 +1 @@
-wv-1.2.0.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Dec 2005 21:11:53 -0000	1.4
+++ sources	28 Oct 2006 08:53:38 -0000	1.5
@@ -1 +1 @@
-b6319d5e75611fe2210453b5feb82c0c  wv-1.2.0.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-5/wv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wv.spec	22 Feb 2006 00:03:54 -0000	1.14
+++ wv.spec	28 Oct 2006 08:53:38 -0000	1.15
@@ -1,11 +1,11 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.0
-Release:    3%{?dist}
+Version:    1.2.4
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.2.0.tar.gz
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
 #Patch0:     wv-wvtext-tmp.patch
 #Patch1:     wv-1.0.3-oledecod.patch
 #Patch2:     wv-1.0.3-gcc4.patch
@@ -85,6 +85,18 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
+- rebuild (releases 1 to 7, cvs problem)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-1
+- version 1.2.1
+
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
 - don't build the static lib
 



From fedora-extras-commits at redhat.com  Sat Oct 28 08:54:10 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 01:54:10 -0700
Subject: rpms/wv/devel .cvsignore,1.5,1.6 sources,1.5,1.6 wv.spec,1.20,1.21
Message-ID: <200610280854.k9S8sA8u010604@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/devel

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 14:50:07 -0000	1.5
+++ .cvsignore	28 Oct 2006 08:53:40 -0000	1.6
@@ -1 +1 @@
-wv-1.2.1.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 14:50:07 -0000	1.5
+++ sources	28 Oct 2006 08:53:40 -0000	1.6
@@ -1 +1 @@
-d757080af4595839d5d82a1a573c692c  wv-1.2.1.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/wv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wv.spec	8 Sep 2006 15:16:50 -0000	1.20
+++ wv.spec	28 Oct 2006 08:53:40 -0000	1.21
@@ -1,11 +1,11 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.1
-Release:    7%{?dist}
+Version:    1.2.4
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.2.1.tar.gz
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
 #Patch0:     wv-wvtext-tmp.patch
 #Patch1:     wv-1.0.3-oledecod.patch
 #Patch2:     wv-1.0.3-gcc4.patch
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
 * Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
 - rebuild (releases 1 to 7, cvs problem)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 08:54:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 01:54:08 -0700
Subject: rpms/wv/FC-4 .cvsignore,1.3,1.4 sources,1.3,1.4 wv.spec,1.10,1.11
Message-ID: <200610280854.k9S8s8Kc010589@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/FC-4

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 May 2005 15:30:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 08:53:37 -0000	1.4
@@ -1 +1 @@
-wv-1.0.3.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2005 15:30:18 -0000	1.3
+++ sources	28 Oct 2006 08:53:37 -0000	1.4
@@ -1 +1 @@
-71e42aa9af1e03cc8c608bbbdcb43af8  wv-1.0.3.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wv.spec	15 May 2005 15:30:18 -0000	1.10
+++ wv.spec	28 Oct 2006 08:53:37 -0000	1.11
@@ -1,26 +1,25 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.0.3
+Version:    1.2.4
 Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.0.3.tar.gz
-Patch0:     wv-wvtext-tmp.patch
-Patch1:     wv-1.0.3-oledecod.patch
-Patch2:     wv-1.0.3-gcc4.patch
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
+#Patch0:     wv-wvtext-tmp.patch
+#Patch1:     wv-1.0.3-oledecod.patch
+#Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
 
-#BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
+BuildRequires: libgsf-devel >= 1.11.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   wvware = %{version}-%{release}
-Provides:   wv-devel = %{version}-%{release}
 
 %description
 Wv is a program that understands the Microsoft Word 6/7/8/9
@@ -28,23 +27,36 @@
 documents into HTML, which can then be read with a browser.
 
 
+%package        devel
+Summary:        MSWord format converter - development files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+Wv is a program that understands the Microsoft Word 6/7/8/9
+binary file format and is able to convert Word
+documents into HTML, which can then be read with a browser.
+This package contains the development files
+
+
 %prep
 %setup -q
 #%patch0
-%patch1 -p1 -b .oledecod
-%patch2 -p1 -b .gcc4
+#%patch1 -p1 -b .oledecod
+#%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
 
 
 %build
 %configure --with-exporter \
-           --with-libxml2
+           --with-libxml2 \
+           --disable-static
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 #ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
@@ -62,13 +74,41 @@
 %doc COPYING README
 %{_bindir}/wv*
 %{_datadir}/wv
-%{_includedir}/wv
 %{_mandir}/man1/*
-%{_libdir}/libwv*
+%{_libdir}/libwv*.so.*
+
+%files      devel
+%defattr(-,root,root)
+%{_includedir}/wv
+%{_libdir}/libwv*.so
 %{_libdir}/pkgconfig/*
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
+- rebuild (releases 1 to 7, cvs problem)
+
+* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-1
+- version 1.2.1
+
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
+- rebuild
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
+- don't build the static lib
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-2
+- rebuild for FC5
+
+* Fri Nov 11 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-1
+- version 1.2.0
+
+* Fri Oct 28 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-2
+- split out a -devel package (#171962)
+
 * Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}
 - new version
 - fix build with gcc4



From fedora-extras-commits at redhat.com  Sat Oct 28 08:54:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 01:54:09 -0700
Subject: rpms/wv/FC-6 .cvsignore,1.5,1.6 sources,1.5,1.6 wv.spec,1.20,1.21
Message-ID: <200610280854.k9S8s9Hq010599@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521/FC-6

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
update to 1.2.4, fixes #212696 (CVE-2006-4513)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 14:50:07 -0000	1.5
+++ .cvsignore	28 Oct 2006 08:53:39 -0000	1.6
@@ -1 +1 @@
-wv-1.2.1.tar.gz
+wv-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 14:50:07 -0000	1.5
+++ sources	28 Oct 2006 08:53:39 -0000	1.6
@@ -1 +1 @@
-d757080af4595839d5d82a1a573c692c  wv-1.2.1.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-6/wv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wv.spec	8 Sep 2006 15:16:50 -0000	1.20
+++ wv.spec	28 Oct 2006 08:53:39 -0000	1.21
@@ -1,11 +1,11 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.1
-Release:    7%{?dist}
+Version:    1.2.4
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.2.1.tar.gz
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
 #Patch0:     wv-wvtext-tmp.patch
 #Patch1:     wv-1.0.3-oledecod.patch
 #Patch2:     wv-1.0.3-gcc4.patch
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
 * Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
 - rebuild (releases 1 to 7, cvs problem)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 09:12:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 02:12:47 -0700
Subject: rpms/perl-Unicode-Map8/FC-5
	perl-Unicode-Map8-0.12-declaration.patch, 
	NONE, 1.1 perl-Unicode-Map8-0.12-type.patch, NONE,
	1.1 perl-Unicode-Map8.spec, 1.9, 1.10
Message-ID: <200610280912.k9S9Cl9Z013854@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/FC-5

Modified Files:
	perl-Unicode-Map8.spec 
Added Files:
	perl-Unicode-Map8-0.12-declaration.patch 
	perl-Unicode-Map8-0.12-type.patch 
Log Message:
add openSuSE patches for x86_64

perl-Unicode-Map8-0.12-declaration.patch:

--- NEW FILE perl-Unicode-Map8-0.12-declaration.patch ---
--- map8.h
+++ map8.h
@@ -81,7 +81,7 @@
 
 U16*  map8_to_str16(Map8*, U8*, U16*, int, int*);
 U8*   map8_to_str8 (Map8*, U16*, U8*, int, int*);
-U8*   map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*);
+U8*   map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*);
 
 int   map8_empty_block(Map8*, U8);
 

perl-Unicode-Map8-0.12-type.patch:

--- NEW FILE perl-Unicode-Map8-0.12-type.patch ---
--- Map8.xs
+++ Map8.xs
@@ -348,7 +348,7 @@
 	Map8* m2
 	PREINIT:
 	    STRLEN len;
-	    STRLEN rlen;
+	    int rlen;
 	    char*  res;
 	INPUT:
 	    char* str = SvPV(ST(2), len);


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/FC-5/perl-Unicode-Map8.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Unicode-Map8.spec	22 Feb 2006 22:55:31 -0000	1.9
+++ perl-Unicode-Map8.spec	28 Oct 2006 09:12:17 -0000	1.10
@@ -2,21 +2,20 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        8%{?dist}
+Release:        10%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
-Source0:      http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Patch0:         perl-Unicode-Map8-0.12-declaration.patch
+Patch1:         perl-Unicode-Map8-0.12-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(Unicode::String)
 
-# Does not work on x86_64, see bug #182514
-ExcludeArch:  x86_64
-
 
 %description
 The Unicode::Map8 class implements efficient mapping tables between
@@ -65,6 +64,12 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
+- add patches for x86_64
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-9
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.12-8
 - ExcludeArch x86_64
 



From fedora-extras-commits at redhat.com  Sat Oct 28 09:12:48 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 02:12:48 -0700
Subject: rpms/perl-Unicode-Map8/FC-6
	perl-Unicode-Map8-0.12-declaration.patch, 
	NONE, 1.1 perl-Unicode-Map8-0.12-type.patch, NONE,
	1.1 perl-Unicode-Map8.spec, 1.10, 1.11
Message-ID: <200610280912.k9S9Cma0013857@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/FC-6

Modified Files:
	perl-Unicode-Map8.spec 
Added Files:
	perl-Unicode-Map8-0.12-declaration.patch 
	perl-Unicode-Map8-0.12-type.patch 
Log Message:
add openSuSE patches for x86_64

perl-Unicode-Map8-0.12-declaration.patch:

--- NEW FILE perl-Unicode-Map8-0.12-declaration.patch ---
--- map8.h
+++ map8.h
@@ -81,7 +81,7 @@
 
 U16*  map8_to_str16(Map8*, U8*, U16*, int, int*);
 U8*   map8_to_str8 (Map8*, U16*, U8*, int, int*);
-U8*   map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*);
+U8*   map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*);
 
 int   map8_empty_block(Map8*, U8);
 

perl-Unicode-Map8-0.12-type.patch:

--- NEW FILE perl-Unicode-Map8-0.12-type.patch ---
--- Map8.xs
+++ Map8.xs
@@ -348,7 +348,7 @@
 	Map8* m2
 	PREINIT:
 	    STRLEN len;
-	    STRLEN rlen;
+	    int rlen;
 	    char*  res;
 	INPUT:
 	    char* str = SvPV(ST(2), len);


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/FC-6/perl-Unicode-Map8.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Unicode-Map8.spec	30 Aug 2006 16:19:50 -0000	1.10
+++ perl-Unicode-Map8.spec	28 Oct 2006 09:12:18 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -10,13 +10,12 @@
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Patch0:         perl-Unicode-Map8-0.12-declaration.patch
+Patch1:         perl-Unicode-Map8-0.12-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(Unicode::String)
 
-# Does not work on x86_64, see bug #182514
-ExcludeArch:  x86_64
-
 
 %description
 The Unicode::Map8 class implements efficient mapping tables between
@@ -65,6 +64,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
+- add patches for x86_64
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-9
 - rebuild
 



From fedora-extras-commits at redhat.com  Sat Oct 28 09:12:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 02:12:54 -0700
Subject: rpms/perl-Unicode-Map8/devel
	perl-Unicode-Map8-0.12-declaration.patch, 
	NONE, 1.1 perl-Unicode-Map8-0.12-type.patch, NONE,
	1.1 perl-Unicode-Map8.spec, 1.10, 1.11
Message-ID: <200610280912.k9S9Cs9x013860@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/devel

Modified Files:
	perl-Unicode-Map8.spec 
Added Files:
	perl-Unicode-Map8-0.12-declaration.patch 
	perl-Unicode-Map8-0.12-type.patch 
Log Message:
add openSuSE patches for x86_64

perl-Unicode-Map8-0.12-declaration.patch:

--- NEW FILE perl-Unicode-Map8-0.12-declaration.patch ---
--- map8.h
+++ map8.h
@@ -81,7 +81,7 @@
 
 U16*  map8_to_str16(Map8*, U8*, U16*, int, int*);
 U8*   map8_to_str8 (Map8*, U16*, U8*, int, int*);
-U8*   map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*);
+U8*   map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*);
 
 int   map8_empty_block(Map8*, U8);
 

perl-Unicode-Map8-0.12-type.patch:

--- NEW FILE perl-Unicode-Map8-0.12-type.patch ---
--- Map8.xs
+++ Map8.xs
@@ -348,7 +348,7 @@
 	Map8* m2
 	PREINIT:
 	    STRLEN len;
-	    STRLEN rlen;
+	    int rlen;
 	    char*  res;
 	INPUT:
 	    char* str = SvPV(ST(2), len);


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Unicode-Map8.spec	30 Aug 2006 16:19:50 -0000	1.10
+++ perl-Unicode-Map8.spec	28 Oct 2006 09:12:24 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -10,13 +10,12 @@
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
+Patch0:         perl-Unicode-Map8-0.12-declaration.patch
+Patch1:         perl-Unicode-Map8-0.12-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(Unicode::String)
 
-# Does not work on x86_64, see bug #182514
-ExcludeArch:  x86_64
-
 
 %description
 The Unicode::Map8 class implements efficient mapping tables between
@@ -65,6 +64,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
+- add patches for x86_64
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-9
 - rebuild
 



From fedora-extras-commits at redhat.com  Sat Oct 28 10:20:34 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 28 Oct 2006 03:20:34 -0700
Subject: rpms/php-manual-en/devel php-manual-en.spec, 1.3, 1.4 sources, 1.4,
	1.5
Message-ID: <200610281020.k9SAKYZv017180@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-manual-en/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17157

Modified Files:
	php-manual-en.spec sources 
Log Message:
Update to 2006-10-26 version


Index: php-manual-en.spec
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/devel/php-manual-en.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-manual-en.spec	25 Sep 2006 13:37:40 -0000	1.3
+++ php-manual-en.spec	28 Oct 2006 10:20:03 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           php-manual-en
-Version:        20060920
+Version:        20061026
 Release:        1%{?dist}
 Summary:        Documentation for the PHP programming language
 
@@ -38,6 +38,9 @@
 %doc LICENSE
 
 %changelog
+* Sat Oct 28 2006 Tim Jackson <rpm at timj.co.uk> 20061026-1
+- Update to 2006-10-26 version
+
 * Mon Sep 25 2006 Tim Jackson <rpm at timj.co.uk> 20060920-1
 - Update to 2006-09-20 version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2006 13:37:40 -0000	1.4
+++ sources	28 Oct 2006 10:20:03 -0000	1.5
@@ -1 +1 @@
-f027a871710424de6d925cbd695de081  php_manual_en.tar.gz
+fa4b78102b8a7cc4b9bb3f07a7d818d0  php_manual_en.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 10:27:15 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 28 Oct 2006 03:27:15 -0700
Subject: rpms/php-manual-en/FC-5 php-manual-en.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200610281027.k9SARF6R017253@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-manual-en/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17235

Modified Files:
	php-manual-en.spec sources 
Log Message:
Update to 2006-10-26 version


Index: php-manual-en.spec
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/FC-5/php-manual-en.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-manual-en.spec	25 Sep 2006 13:38:29 -0000	1.3
+++ php-manual-en.spec	28 Oct 2006 10:26:45 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           php-manual-en
-Version:        20060920
+Version:        20061026
 Release:        1%{?dist}
 Summary:        Documentation for the PHP programming language
 
@@ -38,6 +38,9 @@
 %doc LICENSE
 
 %changelog
+* Sat Oct 28 2006 Tim Jackson <rpm at timj.co.uk> 20061026-1
+- Update to 2006-10-26 version
+
 * Mon Sep 25 2006 Tim Jackson <rpm at timj.co.uk> 20060920-1
 - Update to 2006-09-20 version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2006 13:38:29 -0000	1.4
+++ sources	28 Oct 2006 10:26:45 -0000	1.5
@@ -1 +1 @@
-f027a871710424de6d925cbd695de081  php_manual_en.tar.gz
+fa4b78102b8a7cc4b9bb3f07a7d818d0  php_manual_en.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 10:35:50 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 28 Oct 2006 03:35:50 -0700
Subject: rpms/php-manual-en/FC-6 php-manual-en.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200610281035.k9SAZo3I017346@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-manual-en/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17328

Modified Files:
	php-manual-en.spec sources 
Log Message:
Update to 2006-10-26 version


Index: php-manual-en.spec
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/FC-6/php-manual-en.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-manual-en.spec	25 Sep 2006 13:37:40 -0000	1.3
+++ php-manual-en.spec	28 Oct 2006 10:35:20 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           php-manual-en
-Version:        20060920
+Version:        20061026
 Release:        1%{?dist}
 Summary:        Documentation for the PHP programming language
 
@@ -38,6 +38,9 @@
 %doc LICENSE
 
 %changelog
+* Sat Oct 28 2006 Tim Jackson <rpm at timj.co.uk> 20061026-1
+- Update to 2006-10-26 version
+
 * Mon Sep 25 2006 Tim Jackson <rpm at timj.co.uk> 20060920-1
 - Update to 2006-09-20 version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-manual-en/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2006 13:37:40 -0000	1.4
+++ sources	28 Oct 2006 10:35:20 -0000	1.5
@@ -1 +1 @@
-f027a871710424de6d925cbd695de081  php_manual_en.tar.gz
+fa4b78102b8a7cc4b9bb3f07a7d818d0  php_manual_en.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:22:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 28 Oct 2006 06:22:03 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.12, 1.13 perl-Error.spec, 1.16, 
	1.17 sources, 1.12, 1.13
Message-ID: <200610281322.k9SDM3aq027089@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27069

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.17008


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Oct 2006 22:02:25 -0000	1.12
+++ .cvsignore	28 Oct 2006 13:21:33 -0000	1.13
@@ -1 +1 @@
-Error-0.17007.tar.gz
+Error-0.17008.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Error.spec	18 Oct 2006 22:02:25 -0000	1.16
+++ perl-Error.spec	28 Oct 2006 13:21:33 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.17007
+Version:        0.17008
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Error Perl module
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17008-1
+- Update to 0.17008.
+
 * Wed Oct 18 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1:0.17007-1
 - Update to 0.17007.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Oct 2006 22:02:25 -0000	1.12
+++ sources	28 Oct 2006 13:21:33 -0000	1.13
@@ -1 +1 @@
-fd80f6b2d1f5d31529145301031795b4  Error-0.17007.tar.gz
+647134e1aeb5893a4d08d711c858308b  Error-0.17008.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:29:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 28 Oct 2006 06:29:07 -0700
Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.8,
	1.9 perl-Module-ScanDeps.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200610281329.k9SDT7xQ027175@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27123/FC-5

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Sep 2006 12:13:17 -0000	1.8
+++ .cvsignore	28 Oct 2006 13:28:37 -0000	1.9
@@ -1 +1 @@
-Module-ScanDeps-0.66.tar.gz
+Module-ScanDeps-0.68.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/perl-Module-ScanDeps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-ScanDeps.spec	24 Sep 2006 12:13:17 -0000	1.8
+++ perl-Module-ScanDeps.spec	28 Oct 2006 13:28:37 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.66
+Version:        0.68
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.68-1
+- Update to 0.68.
+
 * Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.66-1
 - Update to 0.66.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Sep 2006 12:13:17 -0000	1.8
+++ sources	28 Oct 2006 13:28:37 -0000	1.9
@@ -1 +1 @@
-149d19cddaade706ead810442389db4a  Module-ScanDeps-0.66.tar.gz
+747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:29:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 28 Oct 2006 06:29:08 -0700
Subject: rpms/perl-Module-ScanDeps/FC-6 .cvsignore, 1.8,
	1.9 perl-Module-ScanDeps.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200610281329.k9SDT8Lk027180@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27123/FC-6

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Sep 2006 12:13:17 -0000	1.8
+++ .cvsignore	28 Oct 2006 13:28:37 -0000	1.9
@@ -1 +1 @@
-Module-ScanDeps-0.66.tar.gz
+Module-ScanDeps-0.68.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/perl-Module-ScanDeps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-ScanDeps.spec	24 Sep 2006 12:13:17 -0000	1.8
+++ perl-Module-ScanDeps.spec	28 Oct 2006 13:28:37 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.66
+Version:        0.68
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.68-1
+- Update to 0.68.
+
 * Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.66-1
 - Update to 0.66.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Sep 2006 12:13:17 -0000	1.8
+++ sources	28 Oct 2006 13:28:37 -0000	1.9
@@ -1 +1 @@
-149d19cddaade706ead810442389db4a  Module-ScanDeps-0.66.tar.gz
+747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:29:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 28 Oct 2006 06:29:13 -0700
Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.8,
	1.9 perl-Module-ScanDeps.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200610281329.k9SDTDZT027183@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27123/devel

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Sep 2006 12:13:17 -0000	1.8
+++ .cvsignore	28 Oct 2006 13:28:43 -0000	1.9
@@ -1 +1 @@
-Module-ScanDeps-0.66.tar.gz
+Module-ScanDeps-0.68.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-ScanDeps.spec	24 Sep 2006 12:13:17 -0000	1.8
+++ perl-Module-ScanDeps.spec	28 Oct 2006 13:28:43 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.66
+Version:        0.68
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.68-1
+- Update to 0.68.
+
 * Sun Sep 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.66-1
 - Update to 0.66.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Sep 2006 12:13:17 -0000	1.8
+++ sources	28 Oct 2006 13:28:43 -0000	1.9
@@ -1 +1 @@
-149d19cddaade706ead810442389db4a  Module-ScanDeps-0.66.tar.gz
+747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 13:31:12 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Sat, 28 Oct 2006 06:31:12 -0700
Subject: rpms/licq/devel licq.spec,1.12,1.13
Message-ID: <200610281331.k9SDVCbR027343@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27291

Modified Files:
	licq.spec 
Log Message:
fix desktop-file-install



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- licq.spec	27 Oct 2006 11:29:04 -0000	1.12
+++ licq.spec	28 Oct 2006 13:30:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.4
-Release: 1
+Release: 2
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/
@@ -85,7 +85,6 @@
 cd plugins/qt-gui
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         share/licq.desktop
 make install
 %find_lang licq
@@ -151,6 +150,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Sat Sep 28 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-2
+- fix desktop-file-install
+
 * Fri Sep 27 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-1
 - upgrade
 



From fedora-extras-commits at redhat.com  Sat Oct 28 14:14:58 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 28 Oct 2006 07:14:58 -0700
Subject: rpms/azureus/FC-6 azureus.script,1.9,1.10 azureus.spec,1.37,1.38
Message-ID: <200610281414.k9SEEw3m005992@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5792

Modified Files:
	azureus.script azureus.spec 
Log Message:
Add bcprov to classpath for Sun java.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- azureus.script	31 Jul 2006 01:39:16 -0000	1.9
+++ azureus.script	28 Oct 2006 14:14:28 -0000	1.10
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- azureus.spec	4 Oct 2006 22:49:08 -0000	1.37
+++ azureus.spec	28 Oct 2006 14:14:28 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -206,6 +206,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Sat Oct 28 2006 Anthony Green <green at redhat.com> 2.5.0.0-8
+- Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it
+  will run on non-gcj java alternatives.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.5.0.0-7
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 14:16:25 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 28 Oct 2006 07:16:25 -0700
Subject: rpms/azureus/devel azureus.script,1.9,1.10 azureus.spec,1.37,1.38
Message-ID: <200610281416.k9SEGPPe006391@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6171

Modified Files:
	azureus.script azureus.spec 
Log Message:
Add bcprov to classpath for non-gcj java.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- azureus.script	31 Jul 2006 01:39:16 -0000	1.9
+++ azureus.script	28 Oct 2006 14:15:55 -0000	1.10
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- azureus.spec	4 Oct 2006 22:49:08 -0000	1.37
+++ azureus.spec	28 Oct 2006 14:15:55 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -206,6 +206,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Sat Oct 28 2006 Anthony Green <green at redhat.com> 2.5.0.0-8
+- Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it
+  will run on non-gcj java alternatives.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.5.0.0-7
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 15:43:07 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:43:07 -0700
Subject: rpms/gcstar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610281543.k9SFh7it011807@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11801

Added Files:
	Makefile import.log 
Log Message:
Setup of module gcstar


--- NEW FILE Makefile ---
# Top level Makefile for module gcstar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Oct 28 15:43:08 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:43:08 -0700
Subject: rpms/gcstar/devel .cvsignore,NONE,1.1
Message-ID: <200610281543.k9SFh8pM011825@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11801/devel

Added Files:
	.cvsignore 
Log Message:
Setup of module gcstar


--- NEW FILE .cvsignore ---



From fedora-extras-commits at redhat.com  Sat Oct 28 15:44:01 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:44:01 -0700
Subject: rpms/gcstar import.log,1.1,1.2
Message-ID: <200610281544.k9SFi1mE011884@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11852

Modified Files:
	import.log 
Log Message:
auto-import gcstar-0.5.0-3 on branch devel from gcstar-0.5.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcstar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Oct 2006 15:43:07 -0000	1.1
+++ import.log	28 Oct 2006 15:43:31 -0000	1.2
@@ -0,0 +1 @@
+gcstar-0_5_0-3:HEAD:gcstar-0.5.0-3.src.rpm:1162050201



From fedora-extras-commits at redhat.com  Sat Oct 28 15:44:02 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:44:02 -0700
Subject: rpms/gcstar/devel .cvsignore,1.1,1.2
Message-ID: <200610281544.k9SFi2Kx011887@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11852/devel

Modified Files:
	.cvsignore 
Log Message:
auto-import gcstar-0.5.0-3 on branch devel from gcstar-0.5.0-3.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Oct 2006 15:43:08 -0000	1.1
+++ .cvsignore	28 Oct 2006 15:43:32 -0000	1.2
@@ -0,0 +1 @@
+gcstar-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 15:47:26 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 08:47:26 -0700
Subject: rpms/cvs2svn/devel .cvsignore, 1.3, 1.4 cvs2svn.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200610281547.k9SFlQLu011987@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/cvs2svn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925/devel

Modified Files:
	.cvsignore cvs2svn.spec sources 
Log Message:
Upstream 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2006 16:26:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-cvs2svn-1.4.0.tar.gz
+cvs2svn-1.5.0.tar.gz


Index: cvs2svn.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/devel/cvs2svn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cvs2svn.spec	7 Sep 2006 01:41:51 -0000	1.4
+++ cvs2svn.spec	28 Oct 2006 15:46:56 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           cvs2svn
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        CVS to Subversion Repository Converter
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://cvs2svn.tigris.org/
-Source0:        http://cvs2svn.tigris.org/files/documents/1462/33339/cvs2svn-%{version}.tar.gz
+Source0:        http://cvs2svn.tigris.org/files/documents/1462/34574/cvs2svn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.5.0-1
+- Upstream 1.5.0
+
 * Wed Sep 06 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.0-2
 - Ghostbusting
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2006 16:26:18 -0000	1.3
+++ sources	28 Oct 2006 15:46:56 -0000	1.4
@@ -1 +1 @@
-0f202ef164d2bbcd58711fa7c2565e00  cvs2svn-1.4.0.tar.gz
+dc5bf68303498542cfa061f7ae79d9dd  cvs2svn-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 15:47:24 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 08:47:24 -0700
Subject: rpms/cvs2svn/FC-5 .cvsignore, 1.3, 1.4 cvs2svn.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200610281547.k9SFlO3W011977@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/cvs2svn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925/FC-5

Modified Files:
	.cvsignore cvs2svn.spec sources 
Log Message:
Upstream 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2006 16:26:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 15:46:54 -0000	1.4
@@ -1 +1 @@
-cvs2svn-1.4.0.tar.gz
+cvs2svn-1.5.0.tar.gz


Index: cvs2svn.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-5/cvs2svn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cvs2svn.spec	7 Sep 2006 01:46:48 -0000	1.3
+++ cvs2svn.spec	28 Oct 2006 15:46:54 -0000	1.4
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           cvs2svn
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        CVS to Subversion Repository Converter
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://cvs2svn.tigris.org/
-Source0:        http://cvs2svn.tigris.org/files/documents/1462/33339/cvs2svn-%{version}.tar.gz
+Source0:        http://cvs2svn.tigris.org/files/documents/1462/34574/cvs2svn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.5.0-1
+- Upstream 1.5.0
+
 * Wed Sep 06 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.0-2
 - Ghostbusting
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2006 16:26:18 -0000	1.3
+++ sources	28 Oct 2006 15:46:54 -0000	1.4
@@ -1 +1 @@
-0f202ef164d2bbcd58711fa7c2565e00  cvs2svn-1.4.0.tar.gz
+dc5bf68303498542cfa061f7ae79d9dd  cvs2svn-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 15:47:25 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 08:47:25 -0700
Subject: rpms/cvs2svn/FC-6 .cvsignore, 1.3, 1.4 cvs2svn.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200610281547.k9SFlP6Y011982@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/cvs2svn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925/FC-6

Modified Files:
	.cvsignore cvs2svn.spec sources 
Log Message:
Upstream 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2006 16:26:18 -0000	1.3
+++ .cvsignore	28 Oct 2006 15:46:55 -0000	1.4
@@ -1 +1 @@
-cvs2svn-1.4.0.tar.gz
+cvs2svn-1.5.0.tar.gz


Index: cvs2svn.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-6/cvs2svn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cvs2svn.spec	7 Sep 2006 01:41:51 -0000	1.4
+++ cvs2svn.spec	28 Oct 2006 15:46:55 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           cvs2svn
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        CVS to Subversion Repository Converter
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://cvs2svn.tigris.org/
-Source0:        http://cvs2svn.tigris.org/files/documents/1462/33339/cvs2svn-%{version}.tar.gz
+Source0:        http://cvs2svn.tigris.org/files/documents/1462/34574/cvs2svn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.5.0-1
+- Upstream 1.5.0
+
 * Wed Sep 06 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.4.0-2
 - Ghostbusting
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvs2svn/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2006 16:26:18 -0000	1.3
+++ sources	28 Oct 2006 15:46:55 -0000	1.4
@@ -1 +1 @@
-0f202ef164d2bbcd58711fa7c2565e00  cvs2svn-1.4.0.tar.gz
+dc5bf68303498542cfa061f7ae79d9dd  cvs2svn-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 15:48:53 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:48:53 -0700
Subject: rpms/gcstar import.log,1.2,1.3
Message-ID: <200610281548.k9SFmrWn012128@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12090

Modified Files:
	import.log 
Log Message:
auto-import gcstar-0.5.0-4 on branch devel from gcstar-0.5.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcstar/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Oct 2006 15:43:31 -0000	1.2
+++ import.log	28 Oct 2006 15:48:23 -0000	1.3
@@ -1 +1,2 @@
 gcstar-0_5_0-3:HEAD:gcstar-0.5.0-3.src.rpm:1162050201
+gcstar-0_5_0-4:HEAD:gcstar-0.5.0-4.src.rpm:1162050493



From fedora-extras-commits at redhat.com  Sat Oct 28 15:48:54 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:48:54 -0700
Subject: rpms/gcstar/devel gcstar.spec,1.1,1.2
Message-ID: <200610281548.k9SFmsbA012131@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12090/devel

Modified Files:
	gcstar.spec 
Log Message:
auto-import gcstar-0.5.0-4 on branch devel from gcstar-0.5.0-4.src.rpm


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/gcstar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcstar.spec	23 Oct 2006 21:29:30 -0000	1.1
+++ gcstar.spec	28 Oct 2006 15:48:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gcstar
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -99,6 +99,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Oct 28 2006 Tian <tian at c-sait.net> - 0.5.0-4
+  - Re-creation of the module because of a problem with previous import
 * Sun Oct 22 2006 Tian <tian at c-sait.net> - 0.5.0-3
   - Restored BuildRequires
 * Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-2



From fedora-extras-commits at redhat.com  Sat Oct 28 15:54:30 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:54:30 -0700
Subject: rpms/gcstar/FC-5 gcstar.spec,1.1,1.2
Message-ID: <200610281554.k9SFsUss012310@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12294

Modified Files:
	gcstar.spec 
Log Message:
Version bumped because of problems with previous import



Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-5/gcstar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcstar.spec	23 Oct 2006 21:29:30 -0000	1.1
+++ gcstar.spec	28 Oct 2006 15:54:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gcstar
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -99,6 +99,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Oct 28 2006 Tian <tian at c-sait.net> - 0.5.0-4
+  - Re-creation of the module because of a problem with previous import
 * Sun Oct 22 2006 Tian <tian at c-sait.net> - 0.5.0-3
   - Restored BuildRequires
 * Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-2



From fedora-extras-commits at redhat.com  Sat Oct 28 15:56:05 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sat, 28 Oct 2006 08:56:05 -0700
Subject: rpms/gcstar/FC-6 gcstar.spec,1.1,1.2
Message-ID: <200610281556.k9SFu5bJ012606@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12385

Modified Files:
	gcstar.spec 
Log Message:
Version bumped because of problems with previous import



Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/gcstar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcstar.spec	23 Oct 2006 21:29:30 -0000	1.1
+++ gcstar.spec	28 Oct 2006 15:55:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gcstar
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -99,6 +99,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Oct 28 2006 Tian <tian at c-sait.net> - 0.5.0-4
+  - Re-creation of the module because of a problem with previous import
 * Sun Oct 22 2006 Tian <tian at c-sait.net> - 0.5.0-3
   - Restored BuildRequires
 * Sat Oct 21 2006 Tian <tian at c-sait.net> - 0.5.0-2



From fedora-extras-commits at redhat.com  Sat Oct 28 16:10:39 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 09:10:39 -0700
Subject: rpms/jd/devel .cvsignore,1.7,1.8 jd.spec,1.13,1.14 sources,1.7,1.8
Message-ID: <200610281610.k9SGAdJ3016061@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16034

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.cvs061028
- cvs 061028 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2006 05:31:18 -0000	1.7
+++ .cvsignore	28 Oct 2006 16:10:09 -0000	1.8
@@ -1 +1 @@
-jd-1.8.0-beta061023.tgz
+jd-1.8.0-cvs061028.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jd.spec	25 Oct 2006 18:34:20 -0000	1.13
+++ jd.spec	28 Oct 2006 16:10:09 -0000	1.14
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061023
+%define         strtag        cvs061028
 %define         repoid        22352
 
 
@@ -106,6 +106,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.cvs061028
+- 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Oct 2006 05:31:18 -0000	1.7
+++ sources	28 Oct 2006 16:10:09 -0000	1.8
@@ -1 +1 @@
-31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz
+6845b0b020e62f5708ddbd594c7db4f6  jd-1.8.0-cvs061028.tgz



From fedora-extras-commits at redhat.com  Sat Oct 28 16:13:34 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 09:13:34 -0700
Subject: rpms/yaz/FC-6 .cvsignore,1.3,1.4 sources,1.3,1.4 yaz.spec,1.3,1.4
Message-ID: <200610281613.k9SGDYjT016173@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/yaz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16115/FC-6

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
Upstream 2.1.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Aug 2006 21:21:02 -0000	1.3
+++ .cvsignore	28 Oct 2006 16:13:04 -0000	1.4
@@ -1 +1 @@
-yaz-2.1.26.tar.gz
+yaz-2.1.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Aug 2006 21:21:02 -0000	1.3
+++ sources	28 Oct 2006 16:13:04 -0000	1.4
@@ -1 +1 @@
-3c13d86714efe6d1f226c8f0a67923b6  yaz-2.1.26.tar.gz
+c55e693fdbb8d7b4f8248f687743b62a  yaz-2.1.36.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-6/yaz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yaz.spec	3 Sep 2006 16:39:15 -0000	1.3
+++ yaz.spec	28 Oct 2006 16:13:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           yaz
-Version:        2.1.26
-Release:        1.1%{?dist}
+Version:        2.1.36
+Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
 Group:          Applications/Internet
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.36-1
+- Upstream 2.1.36
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.26-1.1
 - Mass rebuild for FC6
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:13:33 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 09:13:33 -0700
Subject: rpms/yaz/FC-5 .cvsignore,1.3,1.4 sources,1.3,1.4 yaz.spec,1.2,1.3
Message-ID: <200610281613.k9SGDXfI016168@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/yaz/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16115/FC-5

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
Upstream 2.1.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Aug 2006 21:20:57 -0000	1.3
+++ .cvsignore	28 Oct 2006 16:13:03 -0000	1.4
@@ -1 +1 @@
-yaz-2.1.26.tar.gz
+yaz-2.1.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Aug 2006 21:20:57 -0000	1.3
+++ sources	28 Oct 2006 16:13:03 -0000	1.4
@@ -1 +1 @@
-3c13d86714efe6d1f226c8f0a67923b6  yaz-2.1.26.tar.gz
+c55e693fdbb8d7b4f8248f687743b62a  yaz-2.1.36.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/extras/rpms/yaz/FC-5/yaz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yaz.spec	15 Aug 2006 21:20:57 -0000	1.2
+++ yaz.spec	28 Oct 2006 16:13:03 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           yaz
-Version:        2.1.26
+Version:        2.1.36
 Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
@@ -105,6 +105,12 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.36-1
+- Upstream 2.1.36
+
+* Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.26-1.1
+- Mass rebuild for FC6
+
 * Tue Aug 15 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.26-1
 - Version 2.1.26
 - Kill all tabs



From fedora-extras-commits at redhat.com  Sat Oct 28 16:13:40 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat, 28 Oct 2006 09:13:40 -0700
Subject: rpms/yaz/devel .cvsignore,1.3,1.4 sources,1.3,1.4 yaz.spec,1.3,1.4
Message-ID: <200610281613.k9SGDe1j016181@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/yaz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16115/devel

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
Upstream 2.1.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yaz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Aug 2006 21:21:02 -0000	1.3
+++ .cvsignore	28 Oct 2006 16:13:10 -0000	1.4
@@ -1 +1 @@
-yaz-2.1.26.tar.gz
+yaz-2.1.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yaz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Aug 2006 21:21:02 -0000	1.3
+++ sources	28 Oct 2006 16:13:10 -0000	1.4
@@ -1 +1 @@
-3c13d86714efe6d1f226c8f0a67923b6  yaz-2.1.26.tar.gz
+c55e693fdbb8d7b4f8248f687743b62a  yaz-2.1.36.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/extras/rpms/yaz/devel/yaz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yaz.spec	3 Sep 2006 16:39:15 -0000	1.3
+++ yaz.spec	28 Oct 2006 16:13:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           yaz
-Version:        2.1.26
-Release:        1.1%{?dist}
+Version:        2.1.36
+Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
 Group:          Applications/Internet
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.36-1
+- Upstream 2.1.36
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.1.26-1.1
 - Mass rebuild for FC6
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:22:45 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 09:22:45 -0700
Subject: rpms/wvs-data/devel wvs-data.spec,1.1,1.2
Message-ID: <200610281622.k9SGMjGb016413@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16397

Modified Files:
	wvs-data.spec 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Add %{?dist} tag as buildsys forces this.



Index: wvs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/devel/wvs-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wvs-data.spec	25 Oct 2006 22:11:19 -0000	1.1
+++ wvs-data.spec	28 Oct 2006 16:22:15 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:		wvs-data
 Version:	0.0.%{WVS_date}
-Release:	2
+Release:	2%{?dist}
 Summary:	World Vector Shoreline data
 
 Group:		Applications/Engineering
@@ -45,6 +45,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Add %%{?dist} tag as buildsys forces this.
+
 * Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
 - Directory name change.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:23:51 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 09:23:51 -0700
Subject: rpms/wvs-data/FC-6 wvs-data.spec,1.1,1.2
Message-ID: <200610281623.k9SGNpdm016440@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16424

Modified Files:
	wvs-data.spec 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Add %{?dist} tag as buildsys forces this.



Index: wvs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/FC-6/wvs-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wvs-data.spec	25 Oct 2006 22:11:19 -0000	1.1
+++ wvs-data.spec	28 Oct 2006 16:23:21 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:		wvs-data
 Version:	0.0.%{WVS_date}
-Release:	2
+Release:	2%{?dist}
 Summary:	World Vector Shoreline data
 
 Group:		Applications/Engineering
@@ -45,6 +45,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Add %%{?dist} tag as buildsys forces this.
+
 * Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
 - Directory name change.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:24:49 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 09:24:49 -0700
Subject: rpms/wvs-data/FC-5 wvs-data.spec,1.1,1.2
Message-ID: <200610281624.k9SGOnxB016467@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16451

Modified Files:
	wvs-data.spec 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Add %{?dist} tag as buildsys forces this.



Index: wvs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/FC-5/wvs-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wvs-data.spec	25 Oct 2006 22:11:19 -0000	1.1
+++ wvs-data.spec	28 Oct 2006 16:24:18 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:		wvs-data
 Version:	0.0.%{WVS_date}
-Release:	2
+Release:	2%{?dist}
 Summary:	World Vector Shoreline data
 
 Group:		Applications/Engineering
@@ -45,6 +45,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Add %%{?dist} tag as buildsys forces this.
+
 * Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
 - Directory name change.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 16:38:30 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 28 Oct 2006 09:38:30 -0700
Subject: upgradecheck upgradecheck.py,1.27,1.28
Message-ID: <200610281638.k9SGcU6l016710@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16692

Modified Files:
	upgradecheck.py 
Log Message:
Send reports to fedora-maintainers as discussed on f-e-l.


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- upgradecheck.py	25 Oct 2006 07:38:15 -0000	1.27
+++ upgradecheck.py	28 Oct 2006 16:38:28 -0000	1.28
@@ -32,7 +32,7 @@
 from PackageOwners import PackageOwners
 
 mail_from = "buildsys at fedoraproject.org"
-mail_to = "fedora-extras-list at redhat.com"
+mail_to = "fedora-maintainers at redhat.com"
 mail_subject = "Package EVR problems in FC+FE %s" % datetime.date.today()
 smtp_server = None
 



From fedora-extras-commits at redhat.com  Sat Oct 28 17:05:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 28 Oct 2006 10:05:14 -0700
Subject: rpms/itpp/devel .cvsignore, 1.2, 1.3 itpp.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610281705.k9SH5ERI019811@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19785

Modified Files:
	.cvsignore itpp.spec sources 
Log Message:
new upstream 3.10.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2006 01:45:11 -0000	1.2
+++ .cvsignore	28 Oct 2006 17:04:41 -0000	1.3
@@ -1 +1 @@
-itpp-3.10.5.tar.bz2
+itpp-3.10.6.tar.bz2


Index: itpp.spec
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/itpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- itpp.spec	13 Oct 2006 01:45:11 -0000	1.1
+++ itpp.spec	28 Oct 2006 17:04:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           itpp
-Version:        3.10.5
-Release:        7%{?dist}
+Version:        3.10.6
+Release:        1%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -48,8 +48,7 @@
 
 
 %build
-chmod 644 itpp/base/itpp_version.h
-export LDFLAGS="-L/usr/lib/atlas -lstdc++"
+export LDFLAGS="-L/usr/lib/atlas"
 export CPPFLAGS="-I/usr/include/atlas"
 export F77=gfortran
 %configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Sun Oct 28 2006  Ed Hill <ed at eh3.com> - 3.10.6-1
+- new upstream 3.10.6
+
 * Wed Oct 11 2006  Ed Hill <ed at eh3.com> - 3.10.5-7
 - explicitly link with -lstdc++
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itpp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2006 01:45:11 -0000	1.2
+++ sources	28 Oct 2006 17:04:41 -0000	1.3
@@ -1 +1 @@
-a4c9a13ff457ee168cec5edade272ff8  itpp-3.10.5.tar.bz2
+b78a13b5b2c7ae5bcd369b3440804c45  itpp-3.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 17:12:36 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 10:12:36 -0700
Subject: rpms/jd/devel jd-1.8.0-cvs061028-support-x86_64.patch, NONE,
	1.1 jd.spec, 1.14, 1.15
Message-ID: <200610281712.k9SHCak0020102@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20061

Modified Files:
	jd.spec 
Added Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* 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.


jd-1.8.0-cvs061028-support-x86_64.patch:

--- NEW FILE jd-1.8.0-cvs061028-support-x86_64.patch ---
--- jd-1.8.0-cvs061028/configure.in.x86_64	2006-10-09 14:28:54.000000000 +0900
+++ jd-1.8.0-cvs061028/configure.in	2006-10-29 01:53:28.000000000 +0900
@@ -120,7 +120,7 @@
 
   AC_MSG_CHECKING(for libSM and libICE)
   LIBSM_LIBS="" 
-  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib"
+  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib /usr/X11R6/lib64 /usr/lib64"
   for i in $dirs ; do
     if test -r $i/libICE.so -a -r $i/libSM.so ; then
       AC_MSG_RESULT($i)


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jd.spec	28 Oct 2006 16:10:09 -0000	1.14
+++ jd.spec	28 Oct 2006 17:12:05 -0000	1.15
@@ -16,7 +16,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -45,7 +45,8 @@
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
 #Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        %{name}-%{main_ver}-%{strtag}.tgz
+Patch0:         jd-1.8.0-cvs061028-support-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -106,6 +108,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* 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.
+
 * Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.cvs061028
 - cvs 061028 (23:59 JST)
 



From fedora-extras-commits at redhat.com  Sat Oct 28 17:26:33 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 28 Oct 2006 10:26:33 -0700
Subject: rpms/itpp/FC-5 .cvsignore, 1.2, 1.3 itpp.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <200610281726.k9SHQXv3020709@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20650/FC-5

Modified Files:
	.cvsignore itpp.spec sources 
Log Message:
new upstream 3.10.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2006 01:45:11 -0000	1.2
+++ .cvsignore	28 Oct 2006 17:26:03 -0000	1.3
@@ -1 +1 @@
-itpp-3.10.5.tar.bz2
+itpp-3.10.6.tar.bz2


Index: itpp.spec
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-5/itpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- itpp.spec	13 Oct 2006 01:45:11 -0000	1.1
+++ itpp.spec	28 Oct 2006 17:26:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           itpp
-Version:        3.10.5
-Release:        7%{?dist}
+Version:        3.10.6
+Release:        1%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -48,8 +48,7 @@
 
 
 %build
-chmod 644 itpp/base/itpp_version.h
-export LDFLAGS="-L/usr/lib/atlas -lstdc++"
+export LDFLAGS="-L/usr/lib/atlas"
 export CPPFLAGS="-I/usr/include/atlas"
 export F77=gfortran
 %configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Sun Oct 28 2006  Ed Hill <ed at eh3.com> - 3.10.6-1
+- new upstream 3.10.6
+
 * Wed Oct 11 2006  Ed Hill <ed at eh3.com> - 3.10.5-7
 - explicitly link with -lstdc++
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2006 01:45:11 -0000	1.2
+++ sources	28 Oct 2006 17:26:03 -0000	1.3
@@ -1 +1 @@
-a4c9a13ff457ee168cec5edade272ff8  itpp-3.10.5.tar.bz2
+b78a13b5b2c7ae5bcd369b3440804c45  itpp-3.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 17:26:34 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sat, 28 Oct 2006 10:26:34 -0700
Subject: rpms/itpp/FC-6 .cvsignore, 1.2, 1.3 itpp.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <200610281726.k9SHQYg9020715@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/itpp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20650/FC-6

Modified Files:
	.cvsignore itpp.spec sources 
Log Message:
new upstream 3.10.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2006 01:45:11 -0000	1.2
+++ .cvsignore	28 Oct 2006 17:26:03 -0000	1.3
@@ -1 +1 @@
-itpp-3.10.5.tar.bz2
+itpp-3.10.6.tar.bz2


Index: itpp.spec
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-6/itpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- itpp.spec	13 Oct 2006 01:45:11 -0000	1.1
+++ itpp.spec	28 Oct 2006 17:26:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           itpp
-Version:        3.10.5
-Release:        7%{?dist}
+Version:        3.10.6
+Release:        1%{?dist}
 Summary:        C++ library for math, signal/speech processing, and communications
 
 Group:          System Environment/Libraries
@@ -48,8 +48,7 @@
 
 
 %build
-chmod 644 itpp/base/itpp_version.h
-export LDFLAGS="-L/usr/lib/atlas -lstdc++"
+export LDFLAGS="-L/usr/lib/atlas"
 export CPPFLAGS="-I/usr/include/atlas"
 export F77=gfortran
 %configure --with-blas="-latlas -lblas" --disable-dependency-tracking  \
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Sun Oct 28 2006  Ed Hill <ed at eh3.com> - 3.10.6-1
+- new upstream 3.10.6
+
 * Wed Oct 11 2006  Ed Hill <ed at eh3.com> - 3.10.5-7
 - explicitly link with -lstdc++
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itpp/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2006 01:45:11 -0000	1.2
+++ sources	28 Oct 2006 17:26:03 -0000	1.3
@@ -1 +1 @@
-a4c9a13ff457ee168cec5edade272ff8  itpp-3.10.5.tar.bz2
+b78a13b5b2c7ae5bcd369b3440804c45  itpp-3.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Oct 28 17:38:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 10:38:09 -0700
Subject: rpms/jd/FC-6 jd-1.8.0-cvs061028-support-x86_64.patch, NONE,
	1.1 jd.spec, 1.7, 1.8
Message-ID: <200610281738.k9SHc9jp021256@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21218

Modified Files:
	jd.spec 
Added Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
- Detect libSM and libICE for x86_64.


jd-1.8.0-cvs061028-support-x86_64.patch:

--- NEW FILE jd-1.8.0-cvs061028-support-x86_64.patch ---
--- jd-1.8.0-cvs061028/configure.in.x86_64	2006-10-09 14:28:54.000000000 +0900
+++ jd-1.8.0-cvs061028/configure.in	2006-10-29 01:53:28.000000000 +0900
@@ -120,7 +120,7 @@
 
   AC_MSG_CHECKING(for libSM and libICE)
   LIBSM_LIBS="" 
-  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib"
+  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib /usr/X11R6/lib64 /usr/lib64"
   for i in $dirs ; do
     if test -r $i/libICE.so -a -r $i/libSM.so ; then
       AC_MSG_RESULT($i)


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jd.spec	24 Oct 2006 05:32:41 -0000	1.7
+++ jd.spec	28 Oct 2006 17:37:39 -0000	1.8
@@ -16,7 +16,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -44,8 +44,9 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:         jd-1.8.0-cvs061028-support-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -103,6 +105,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
+- Detect libSM and libICE for x86_64.
+
 * 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
 



From fedora-extras-commits at redhat.com  Sat Oct 28 17:39:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 28 Oct 2006 10:39:47 -0700
Subject: rpms/jd/FC-5 jd-1.8.0-cvs061028-support-x86_64.patch, NONE,
	1.1 jd.spec, 1.6, 1.7
Message-ID: <200610281739.k9SHdlHC021316@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21289

Modified Files:
	jd.spec 
Added Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
- Detect libSM and libICE for x86_64.


jd-1.8.0-cvs061028-support-x86_64.patch:

--- NEW FILE jd-1.8.0-cvs061028-support-x86_64.patch ---
--- jd-1.8.0-cvs061028/configure.in.x86_64	2006-10-09 14:28:54.000000000 +0900
+++ jd-1.8.0-cvs061028/configure.in	2006-10-29 01:53:28.000000000 +0900
@@ -120,7 +120,7 @@
 
   AC_MSG_CHECKING(for libSM and libICE)
   LIBSM_LIBS="" 
-  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib"
+  dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/lib /usr/X11R6/lib64 /usr/lib64"
   for i in $dirs ; do
     if test -r $i/libICE.so -a -r $i/libSM.so ; then
       AC_MSG_RESULT($i)


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jd.spec	24 Oct 2006 05:34:08 -0000	1.6
+++ jd.spec	28 Oct 2006 17:39:17 -0000	1.7
@@ -16,7 +16,7 @@
 
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -44,8 +44,9 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:         jd-1.8.0-cvs061028-support-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -103,6 +105,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
+- Detect libSM and libICE for x86_64.
+
 * 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
 



From fedora-extras-commits at redhat.com  Sat Oct 28 18:48:34 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sat, 28 Oct 2006 11:48:34 -0700
Subject: rpms/gaim-otr/FC-6 gaim-beta4.patch,NONE,1.1
Message-ID: <200610281848.k9SImYAW024954@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24946

Added Files:
	gaim-beta4.patch 
Log Message:
patch for use with gaim 2.0.0-beta4.


gaim-beta4.patch:

--- NEW FILE gaim-beta4.patch ---
diff -r -c -N gaim-otr/gtk-dialog.c gaim-otr-new/gtk-dialog.c
*** gaim-otr/gtk-dialog.c	2005-12-18 13:33:48.000000000 -0500
--- gaim-otr-new/gtk-dialog.c	2006-10-28 02:01:00.000000000 -0400
***************
*** 30,36 ****
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include "gtkstock.h"
  #endif
  #include "plugin.h"
  #include "notify.h"
--- 30,36 ----
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include <gtk/gtkstock.h>
  #endif
  #include "plugin.h"
  #include "notify.h"
***************
*** 648,662 ****
  
      switch (type) {
  	case GAIM_NOTIFY_MSG_ERROR:
! 	    icon_name = GAIM_STOCK_DIALOG_ERROR;
  	    break;
  
  	case GAIM_NOTIFY_MSG_WARNING:
! 	    icon_name = GAIM_STOCK_DIALOG_WARNING;
  	    break;
  
  	case GAIM_NOTIFY_MSG_INFO:
! 	    icon_name = GAIM_STOCK_DIALOG_INFO;
  	    break;
  
  	default:
--- 648,662 ----
  
      switch (type) {
  	case GAIM_NOTIFY_MSG_ERROR:
! 	    icon_name = GTK_STOCK_DIALOG_ERROR;
  	    break;
  
  	case GAIM_NOTIFY_MSG_WARNING:
! 	    icon_name = GTK_STOCK_DIALOG_WARNING;
  	    break;
  
  	case GAIM_NOTIFY_MSG_INFO:
! 	    icon_name = GTK_STOCK_DIALOG_INFO;
  	    break;
  
  	default:



From fedora-extras-commits at redhat.com  Sat Oct 28 18:50:24 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sat, 28 Oct 2006 11:50:24 -0700
Subject: rpms/gaim-otr/FC-6 gaim-otr.spec,1.23,1.24
Message-ID: <200610281850.k9SIoO38024985@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/gaim-otr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24969

Modified Files:
	gaim-otr.spec 
Log Message:
* Sat Oct 28 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.3.20060921cvs
- Added patch for gaim 2.0.0-beta4



Index: gaim-otr.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-otr/FC-6/gaim-otr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gaim-otr.spec	2 Oct 2006 22:30:06 -0000	1.23
+++ gaim-otr.spec	28 Oct 2006 18:49:54 -0000	1.24
@@ -1,17 +1,18 @@
 Summary: Off-The-Record Messaging plugin for GAIM
 Name: gaim-otr
 Version: 3.0.1
-Release: 0.2.20060921cvs%{?dist}
+Release: 0.3.20060921cvs%{?dist}
 #Source: http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
 Source: %{name}-20060712.tar.gz
+Patch0: gaim-beta4.patch
 Url: http://www.cypherpunks.ca/otr/
 License: GPL
 Group: Applications/Internet
 Provides: otr-plugin = %{version}
 Obsoletes: otr-plugin
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gaim >= 2.0.0, libotr >= 3.0.0
-BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0, autoconf, automake, libtool, gaim-devel >= 2.0.0
+Requires: gaim >= 2.0.0-0.17.beta4, libotr >= 3.0.0
+BuildRequires: glib2-devel, gtk2-devel, libgcrypt-devel >= 1.2.0, libgpg-error-devel, gaim >= 1.0.0, libotr-devel >= 3.0.0, autoconf, automake, libtool, gaim-devel >= 2.0.0-0.17.beta4
 
 %description 
 
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .beta4
 # temporary because we are using a cvs snapshot for now:
 #autoreconf
 autoreconf -s -i -v -f 
@@ -47,6 +49,9 @@
 %{_libdir}/gaim/gaim-otr.so
 
 %changelog
+* Sat Oct 28 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.3.20060921cvs
+- Added patch for gaim 2.0.0-beta4
+
 * Mon Oct  2 2006 Paul Wouters <paul at cypherpunks.ca> 3.0.1-0.2.20060921cvs
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 18:51:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 28 Oct 2006 11:51:44 -0700
Subject: rpms/qt4/devel .cvsignore, 1.11, 1.12 qt4.spec, 1.25, 1.26 sources, 
	1.9, 1.10
Message-ID: <200610281851.k9SIpiZU025061@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25041

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use respun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Oct 2006 02:49:46 -0000	1.11
+++ .cvsignore	28 Oct 2006 18:51:14 -0000	1.12
@@ -1,5 +1,6 @@
 clog
 OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
 qt-x11-opensource-src-4.2.0.tar.gz
 qt-x11-opensource-src-4.2.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qt4.spec	23 Oct 2006 02:49:46 -0000	1.25
+++ qt4.spec	28 Oct 2006 18:51:14 -0000	1.26
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -84,11 +84,14 @@
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps}
+BuildRequires: %{x_deps} %{?x_deps_GL_hack}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
@@ -149,7 +152,7 @@
 Summary: API documentation, demos and example programs for %{name}
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}_%{release}
+Provides: %{name}-assistant = %{version}-%{release}
 # For docs -> doc rename, temporary, since it was a short-lived subpkg
 #Obsoletes: %{name}-docs < %{version}-%{release}
 #Provides:  %{name}-docs = %{version}-%{release}
@@ -506,6 +509,13 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+- use respun upstream 4.2.1 tarball
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1
+- 4.2.1
+
 * Wed Oct 04 2006 Rex Dieter 4.2.0-1
 - 4.2.0(final)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Oct 2006 02:49:46 -0000	1.9
+++ sources	28 Oct 2006 18:51:14 -0000	1.10
@@ -1 +1 @@
-6be04af6cdfc7f22e606fbcefd367eb7  qt-x11-opensource-src-4.2.1.tar.gz
+2ab1c88084f55b94809f025a8503bf18  qt-x11-opensource-src-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Oct 28 19:00:28 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 12:00:28 -0700
Subject: rpms/showimg/FC-5 showimg.spec,1.12,1.13
Message-ID: <200610281900.k9SJ0SFZ025254@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/FC-5

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-5/showimg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- showimg.spec	22 Sep 2006 09:51:47 -0000	1.12
+++ showimg.spec	28 Oct 2006 18:59:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,12 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-12
+- rebuild time !
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-10
 - yep, just that
 



From fedora-extras-commits at redhat.com  Sat Oct 28 19:00:27 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 12:00:27 -0700
Subject: rpms/showimg/FC-4 showimg.spec,1.11,1.12
Message-ID: <200610281900.k9SJ0RiZ025251@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/FC-4

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- showimg.spec	3 Oct 2006 07:27:47 -0000	1.11
+++ showimg.spec	28 Oct 2006 18:59:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,12 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-12
+- rebuild time !
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Thu Sep 21 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-10
 - yep, just that
 



From fedora-extras-commits at redhat.com  Sat Oct 28 19:00:28 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 12:00:28 -0700
Subject: rpms/showimg/FC-6 showimg.spec,1.15,1.16
Message-ID: <200610281900.k9SJ0S8M025257@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/FC-6

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-6/showimg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- showimg.spec	4 Oct 2006 22:34:55 -0000	1.15
+++ showimg.spec	28 Oct 2006 18:59:58 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-12
+- rebuild time !
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 19:00:29 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 28 Oct 2006 12:00:29 -0700
Subject: rpms/showimg/devel showimg.spec,1.15,1.16
Message-ID: <200610281900.k9SJ0TUm025260@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25181/devel

Modified Files:
	showimg.spec 
Log Message:
rebuild


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- showimg.spec	4 Oct 2006 22:34:55 -0000	1.15
+++ showimg.spec	28 Oct 2006 18:59:59 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-12
+- rebuild time !
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.5-11
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Oct 28 20:17:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 28 Oct 2006 13:17:44 -0700
Subject: fedora-security/audit fe5,1.93,1.94 fe6,1.6,1.7
Message-ID: <200610282017.k9SKHiDh031825@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31805

Modified Files:
	fe5 fe6 
Log Message:
CVE-2006-4513 (wv) fixed for FE[56]


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- fe5	28 Oct 2006 06:48:21 -0000	1.93
+++ fe5	28 Oct 2006 20:17:41 -0000	1.94
@@ -29,7 +29,7 @@
 CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
-CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 version (wv, fixed 1.2.4) #212696
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fe6	28 Oct 2006 06:48:21 -0000	1.6
+++ fe6	28 Oct 2006 20:17:41 -0000	1.7
@@ -29,7 +29,7 @@
 CVE-2006-4568 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 version (seamonkey, fixed 1.0.5) #209167
-CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 version (wv, fixed 1.2.4) #212696
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167



From fedora-extras-commits at redhat.com  Sat Oct 28 20:34:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 28 Oct 2006 13:34:32 -0700
Subject: rpms/gift/devel gift.spec,1.7,1.8
Message-ID: <200610282034.k9SKYW9q031952@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31936

Modified Files:
	gift.spec 
Log Message:
respin for devel/fc7



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gift.spec	10 Oct 2006 12:46:05 -0000	1.7
+++ gift.spec	28 Oct 2006 20:34:02 -0000	1.8
@@ -6,7 +6,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 6%{?dist}.1
+Release: 6%{?dist}
 
 License: GPL
 Group:	 System Environment/Daemons



From fedora-extras-commits at redhat.com  Sat Oct 28 22:08:52 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 28 Oct 2006 15:08:52 -0700
Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.31,1.32
Message-ID: <200610282208.k9SM8qXA006153@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6137

Modified Files:
	deskbar-applet.spec 
Log Message:
rebuild


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- deskbar-applet.spec	1 Oct 2006 22:03:15 -0000	1.31
+++ deskbar-applet.spec	28 Oct 2006 22:08:21 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -91,6 +91,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sat Oct 28 2006 Luke Macken <lmacken at redhat.com> - 2.16.0-2
+- Rebuild
+
 * Sun Oct  1 2006 Luke Macken <lmacken at redhat.com> - 2.16.0-1
 - 2.16.0
 



From fedora-extras-commits at redhat.com  Sat Oct 28 22:50:34 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat, 28 Oct 2006 15:50:34 -0700
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.5,1.6
Message-ID: <200610282250.k9SMoYHi006845@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6829

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Pick up libedataserver if bump.



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-phone-manager.spec	8 Oct 2006 21:57:41 -0000	1.5
+++ gnome-phone-manager.spec	28 Oct 2006 22:50:04 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -81,7 +81,10 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
-* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2
+* Sun Oct 29 2006 Linus Walleij <triad at df.lth.se> 0.8-4
+- Rebuild to pick up libedataserver i/f bump.
+
+* Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-3
 - Pick up intltool.
 
 * Sun Oct 8 2006 Linus Walleij <triad at df.lth.se> 0.8-2



From fedora-extras-commits at redhat.com  Sat Oct 28 22:52:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 28 Oct 2006 15:52:32 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.9,1.10
Message-ID: <200610282252.k9SMqW0j006914@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6894

Modified Files:
	Config_Extras.py 
Log Message:
repoview -> quiet again, but this time via the Config file :)


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Config_Extras.py	24 Oct 2006 20:28:19 -0000	1.9
+++ Config_Extras.py	28 Oct 2006 22:52:30 -0000	1.10
@@ -121,7 +121,7 @@
 cr_cachedir = '/tmp/repomd-cache'  # createrepo cachedir
 
 #repoview = '/usr/bin/repoview'
-repoview = '/srv/extras-push/work/repoview'
+repoview = '/srv/extras-push/work/repoview -q'
 
 #post_cmds = []
 post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),



From fedora-extras-commits at redhat.com  Sat Oct 28 22:55:41 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Oct 2006 15:55:41 -0700
Subject: rpms/eds-feed/devel eds-feed.spec,1.5,1.6
Message-ID: <200610282255.k9SMtf3Z006964@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6948

Modified Files:
	eds-feed.spec 
Log Message:
* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
- Rebuild for new eds.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/devel/eds-feed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eds-feed.spec	11 Oct 2006 16:00:43 -0000	1.5
+++ eds-feed.spec	28 Oct 2006 22:55:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
+- Rebuild for new eds.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-5
 - Remove requires on galago-filesystem, libgalago owns directory.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 22:58:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Oct 2006 15:58:20 -0700
Subject: rpms/eds-feed/FC-6 eds-feed.spec,1.5,1.6
Message-ID: <200610282258.k9SMwKla007050@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/eds-feed/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7033

Modified Files:
	eds-feed.spec 
Log Message:
* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
- Rebuild for new eds.



Index: eds-feed.spec
===================================================================
RCS file: /cvs/extras/rpms/eds-feed/FC-6/eds-feed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eds-feed.spec	11 Oct 2006 16:00:43 -0000	1.5
+++ eds-feed.spec	28 Oct 2006 22:57:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           eds-feed
 Version:        0.5.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Evolution Data Server feed for Galago
 
 Group:		System Environment/Daemons 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-6
+- Rebuild for new eds.
+
 * Wed Oct 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-5
 - Remove requires on galago-filesystem, libgalago owns directory.
 



From fedora-extras-commits at redhat.com  Sat Oct 28 23:00:35 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Oct 2006 16:00:35 -0700
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.20, 
	1.21
Message-ID: <200610282300.k9SN0Z8S007137@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7117

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
- Rebuild for new eds.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- contact-lookup-applet.spec	16 Oct 2006 23:20:11 -0000	1.20
+++ contact-lookup-applet.spec	28 Oct 2006 23:00:05 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
+- Rebuild for new eds.
+
 * Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
 - Update to 0.15.
 - Drop evolution api change patch.



From fedora-extras-commits at redhat.com  Sat Oct 28 23:01:18 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 28 Oct 2006 16:01:18 -0700
Subject: extras-buildsys/utils/pushscript README,1.5,1.6
Message-ID: <200610282301.k9SN1Ipw010095@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10077

Modified Files:
	README 
Log Message:



Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README	23 Oct 2006 11:24:35 -0000	1.5
+++ README	28 Oct 2006 23:01:15 -0000	1.6
@@ -1,9 +1,13 @@
-installed repoview is broken : quiet option doesn't work, we use a patched
-local installation
+repoview : installed repoview-0.5.1-1.centos4 is broken, quiet option
+doesn't work, we use a patched local installation (fix merged upstream)
 
-createrepo : pukes about unknown things (including repoview stuff) in
-repodata dirs, we rmtree the dir in Utils.create_repository before running
-createrepo -> https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=595
+createrepo : version < 0.4.5 pukes about unknown things (including
+repoview stuff) in repodata dirs - we work around that by moving the
+entire repodata dir to a tmp directory, then run createrepo and restore
+old files unless they would overwrite new files.  createrepo >= 0.4.5 will
+do something similar, but we don't want to run into any of createrepo's
+fatal error conditions (e.g. due to unexpected group file access problems
+or alike), where we would lose repoview'n'stuff in ".olddir".
 
 old yum Python modules : we use a newer/patched local copy (post yum 2.6.1
 with a patched "rpmUtils" and "yum" module), so we have more recent code



From fedora-extras-commits at redhat.com  Sat Oct 28 23:03:38 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Oct 2006 16:03:38 -0700
Subject: rpms/contact-lookup-applet/FC-6 contact-lookup-applet.spec, 1.20,
	1.21
Message-ID: <200610282303.k9SN3cSX010169@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
- Rebuild for new eds.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-6/contact-lookup-applet.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- contact-lookup-applet.spec	16 Oct 2006 23:20:11 -0000	1.20
+++ contact-lookup-applet.spec	28 Oct 2006 23:03:06 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
+- Rebuild for new eds.
+
 * Mon Oct 16 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
 - Update to 0.15.
 - Drop evolution api change patch.



From fedora-extras-commits at redhat.com  Sun Oct 29 00:48:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 28 Oct 2006 17:48:20 -0700
Subject: rpms/tuxpaint/devel tuxpaint.desktop, 1.2, 1.3 tuxpaint.spec, 1.14,
	1.15
Message-ID: <200610290048.k9T0mKT2013857@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/tuxpaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13839

Modified Files:
	tuxpaint.desktop tuxpaint.spec 
Log Message:
Fix category in tuxpaint.desktop.


Index: tuxpaint.desktop
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tuxpaint.desktop	3 Jun 2006 17:52:11 -0000	1.2
+++ tuxpaint.desktop	29 Oct 2006 00:47:50 -0000	1.3
@@ -14,5 +14,5 @@
 Comment[nl]=Tux Paint: een tekenprogramma voor kinderen.
 Comment[pt]=Tux Paint: um programa de desenho para crian??as.
 Comment[sv]=Tux Paint: ett ritprogram f??r yngre barn.
-Categories=Education;Graphics;Application;
+Categories=Education;Graphics;KidsGame;
 Encoding=UTF-8


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tuxpaint.spec	26 Oct 2006 21:35:44 -0000	1.14
+++ tuxpaint.spec	29 Oct 2006 00:47:50 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           tuxpaint
 Version:        0.9.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -49,6 +49,7 @@
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--vendor fedora \
+	--add-category KidsGame \
 	%{SOURCE1}
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -70,6 +71,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Fri Oct 27 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-3
+- Fix category in tuxpaint.desktop.
+
 * Thu Oct 26 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-2
 - Drop "--add-category X-Fedora".
 



From fedora-extras-commits at redhat.com  Sun Oct 29 00:49:09 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 28 Oct 2006 17:49:09 -0700
Subject: rpms/qtparted/devel qtparted-desktop.patch, 1.3, 1.4 qtparted.spec, 
	1.17, 1.18
Message-ID: <200610290049.k9T0n9qx013922@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13897

Modified Files:
	qtparted-desktop.patch qtparted.spec 
Log Message:
Enable ntfs support.
Make desktop-file-install happy with our categories again.


qtparted-desktop.patch:

Index: qtparted-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted-desktop.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtparted-desktop.patch	13 Aug 2005 23:10:51 -0000	1.3
+++ qtparted-desktop.patch	29 Oct 2006 00:48:38 -0000	1.4
@@ -1,5 +1,5 @@
---- data/qtparted.desktop.orig	2004-04-24 19:41:27.000000000 +0300
-+++ data/qtparted.desktop	2004-05-21 00:36:57.955313448 +0300
+--- data/qtparted.desktop.orig	2005-07-06 14:34:10.000000000 -0500
++++ data/qtparted.desktop	2006-10-28 12:27:59.000000000 -0500
 @@ -1,7 +1,7 @@
  [Desktop Entry]
 -Exec=/usr/sbin/qtparted
@@ -10,3 +10,9 @@
  Terminal=false
  Type=Application
  Comment=Application for partitioning a disk
+@@ -9,4 +9,4 @@
+ Comment[fr]=Application pour partitionner un disque
+ Comment[fi]=Kiintolevyn partitiointity??kalu
+ Encoding=UTF-8
+-Categories=Application;System;QT;
++Categories=Utility;System;Qt;


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qtparted.spec	28 Aug 2006 19:45:48 -0000	1.17
+++ qtparted.spec	29 Oct 2006 00:48:38 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -18,7 +18,7 @@
 
 BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 1.6.6
 BuildRequires:  desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
-BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs
+BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs, ntfsprogs-devel
 BuildRequires:  automake, perl, autoconf
 Requires:       usermode-gtk, e2fsprogs, jfsutils, xfsprogs
 
@@ -41,8 +41,7 @@
 
 %configure \
   --with-log-dir=%{_localstatedir}/log \
-  --disable-reiserfs \
-  --disable-ntfs
+  --disable-reiserfs
 make %{?_smp_mflags}
 
 
@@ -54,7 +53,6 @@
   --vendor fedora \
   --mode 644 \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   $RPM_BUILD_ROOT%{_datadir}/applnk/System/qtparted.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 ln -s %{_datadir}/qtparted/pics/qtparted_32.png \
@@ -108,6 +106,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Steven Pritchard <steve at kspei.com> - 0.4.5-10
+- Enable ntfs support.
+- Make desktop-file-install happy with our categories again.
+
 * Mon Aug 28 2006 Steven Pritchard <steve at kspei.com> - 0.4.5-9
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sun Oct 29 03:22:48 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 20:22:48 -0700
Subject: rpms/lucidlife/devel lucidlife-add-.desktop-encoding.patch, NONE,
	1.1 lucidlife-make-docs-use-proper-dir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lucidlife.spec, 1.13, 1.14 sources, 1.2,
	1.3 make-docs-use-proper-dir.patch, 1.1, NONE
Message-ID: <200610290322.k9T3MmIY024703@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24677

Modified Files:
	.cvsignore lucidlife.spec sources 
Added Files:
	lucidlife-add-.desktop-encoding.patch 
	lucidlife-make-docs-use-proper-dir.patch 
Removed Files:
	make-docs-use-proper-dir.patch 
Log Message:
New upstream release (0.9.1)

lucidlife-add-.desktop-encoding.patch:

--- NEW FILE lucidlife-add-.desktop-encoding.patch ---
--- lucidlife.desktop.in.old	2006-10-28 11:02:18.000000000 -0700
+++ lucidlife.desktop.in	2006-10-28 11:10:43.000000000 -0700
@@ -6,3 +6,4 @@
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Game;
+Encoding=UTF-8

lucidlife-make-docs-use-proper-dir.patch:

--- NEW FILE lucidlife-make-docs-use-proper-dir.patch ---
--- doc/Makefile.am.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.am	2006-03-28 20:22:32.000000000 -0800
@@ -1,4 +1,4 @@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 
 EXTRA_DIST = *.png *.gif *.html *.css
--- doc/Makefile.in.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.in	2006-03-28 20:24:32.000000000 -0800
@@ -188,7 +188,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 EXTRA_DIST = *.png *.gif *.html *.css
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2006 21:10:04 -0000	1.2
+++ .cvsignore	29 Oct 2006 03:22:18 -0000	1.3
@@ -1 +1 @@
-lucidlife-0.9.tar.gz
+lucidlife-0.9.1.tar.gz


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lucidlife.spec	27 Aug 2006 22:51:56 -0000	1.13
+++ lucidlife.spec	29 Oct 2006 03:22:18 -0000	1.14
@@ -1,13 +1,14 @@
 Name:           lucidlife
-Version:        0.9
-Release:        11%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://icculus.org/~jcspray/LucidLife/
 Source0:        http://icculus.org/~jcspray/LucidLife/%{name}-%{version}.tar.gz
-Patch0:			make-docs-use-proper-dir.patch
+Patch0:		%{name}-make-docs-use-proper-dir.patch
+Patch1:		%{name}-add-.desktop-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -29,6 +30,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .old
+%patch1 -p0 -b .old
 
 
 %build
@@ -42,8 +44,8 @@
 %find_lang %{name}
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	--add-category X-Fedora	\
 	--delete-original	\
+	--remove-category=Application	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
  
 
@@ -62,6 +64,14 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
+- Update to new upstream release (0.9.1)
+- Drop X-Fedora and Application categories in installed .desktop file
+- Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:
+  + add-.desktop-encoding.patch
+- Add %%name prefix to old make-docs-use-proper-dir patch filename
+  to keep it all in the same logical namespace.
+
 * Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-11
 - Mass FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2006 21:10:04 -0000	1.2
+++ sources	29 Oct 2006 03:22:18 -0000	1.3
@@ -1 +1 @@
-25bcde0ddbe4f7db4a7ea92fcc36b7bc  lucidlife-0.9.tar.gz
+68e9cfe091fa18380984609af9c56467  lucidlife-0.9.1.tar.gz


--- make-docs-use-proper-dir.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 03:32:51 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 28 Oct 2006 20:32:51 -0700
Subject: rpms/csound/FC-6 csound-5.03.0-disable-atsa.patch, NONE,
	1.1 csound-5.03.0-gstabs-disable-option.patch, NONE,
	1.1 csound-5.03.0-no-usr-local.patch, NONE,
	1.1 csound-5.03.0-remote-fixes.patch, NONE,
	1.1 csound-5.03.0-enable-fluidsynth.patch, 1.1, 1.2 csound.spec,
	1.2, 1.3 sources, 1.2, 1.3 csound-5.03.0-no-gstabs.patch, 1.1,
	NONE csound-5.03.0-printf-redef.patch, 1.1,
	NONE csound-5.03.0-uninitialized.patch, 1.1, NONE
Message-ID: <200610290332.k9T3WpaW025491@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25315

Modified Files:
	csound-5.03.0-enable-fluidsynth.patch csound.spec sources 
Added Files:
	csound-5.03.0-disable-atsa.patch 
	csound-5.03.0-gstabs-disable-option.patch 
	csound-5.03.0-no-usr-local.patch 
	csound-5.03.0-remote-fixes.patch 
Removed Files:
	csound-5.03.0-no-gstabs.patch csound-5.03.0-printf-redef.patch 
	csound-5.03.0-uninitialized.patch 
Log Message:
* Sat Oct 28 2006 Dan Williams <dcbw at redhat.com> 5.03.0-7
- Rebuild to drop old source tarball

* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
- Update to a cvs snapshot for the remote plugin and a few other fixes
- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
- Put the virtual MIDI keyboard into its own package

* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
- Fix the remote plugin's local IP address read code, add more error checking

* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
- Drop csound-5.03.0-uninitialized.patch, upstream
- Drop csound-5.03.0-printf-redef.patch, upstream
- CVS snapshot to grab some updated opcodes and fixes
- Make disabling -gstabs an option for better upstream palatability
- Disable atsa; it breaks the build for some unknown reason



csound-5.03.0-disable-atsa.patch:

--- NEW FILE csound-5.03.0-disable-atsa.patch ---
diff -ru Csound5.03.0/SConstruct /tmp/Csound5.03.0/SConstruct
--- Csound5.03.0/SConstruct	2006-10-23 16:07:41.000000000 -0400
+++ /tmp/Csound5.03.0/SConstruct	2006-08-11 09:23:01.000000000 -0400
@@ -1422,7 +1365,6 @@
 
 if (commonEnvironment['buildUtilities'] != '0'):
     utils = [
-        ['atsa',        'util/atsa_main.c'    ],
         ['cvanal',      'util/cvl_main.c'     ],
         ['dnoise',      'util/dnoise_main.c'  ],
         ['envext',      'util/env_main.c'     ],

csound-5.03.0-gstabs-disable-option.patch:

--- NEW FILE csound-5.03.0-gstabs-disable-option.patch ---
--- Csound5.03.0/SConstruct.gstabs-disable-option	2006-10-23 15:36:38.000000000 -0400
+++ Csound5.03.0/SConstruct	2006-10-23 15:39:28.000000000 -0400
@@ -161,6 +161,9 @@
 opts.Add('noDebug',
     'Build without debugging information.',
     '0')
+opts.Add('disableGStabs',
+    'Set to 1 if you want to turn off GStabs debug info support, which may break some architectures',
+    '0')
 opts.Add('gcc3opt',
     'Enable gcc 3.3.x or later optimizations for the specified CPU architecture (e.g. pentium3); implies noDebug.',
     '0')
@@ -289,7 +292,10 @@
     commonEnvironment.Prepend(CCFLAGS = ['-g', '-O2'])
   else:
     if not withMSVC():
-      commonEnvironment.Prepend(CCFLAGS = ['-g', '-gstabs', '-O2'])
+      debug_opts = ['-g', '-O2']
+      if commonEnvironment['disableGStabs'] == '0':
+        debug_opts.append('-gstabs')
+      commonEnvironment.Prepend(CCFLAGS = debug_opts)
 else:
   commonEnvironment.Prepend(CCFLAGS = ['-O2'])
 if commonEnvironment['useGprof'] == '1':

csound-5.03.0-no-usr-local.patch:

--- NEW FILE csound-5.03.0-no-usr-local.patch ---
--- Csound5.03.0/SConstruct.no-usr-local	2006-10-27 16:24:08.000000000 -0400
+++ Csound5.03.0/SConstruct	2006-10-27 16:26:03.000000000 -0400
@@ -306,10 +306,10 @@
 if commonEnvironment['buildRelease'] == '0':
     commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
 if commonEnvironment['Word64'] == '1':
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
     commonEnvironment.Append(CCFLAGS = ['-fPIC'])
 else:
-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
 
 if commonEnvironment['useDouble'] == '0':
     print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
@@ -324,14 +324,12 @@
 
 if getPlatform() == 'linux':
     commonEnvironment.Append(CCFLAGS = "-DLINUX")
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
     commonEnvironment.Append(CPPPATH = '/usr/include')
     commonEnvironment.Append(CPPPATH = '/usr/X11R6/include')
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
 elif getPlatform() == 'darwin':
     commonEnvironment.Append(CCFLAGS = "-DMACOSX")
-    commonEnvironment.Append(CPPPATH = '/usr/local/include')
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     if commonEnvironment['useAltivec'] == '1':
         print 'CONFIGURATION DECISION using Altivec optmisation'
@@ -342,7 +340,6 @@
     commonEnvironment.Append(CCFLAGS = "-DPIPES")
     commonEnvironment.Append(CCFLAGS = "-DOS_IS_WIN32")
     if not withMSVC():
-        commonEnvironment.Append(CPPPATH = '/usr/local/include')
         commonEnvironment.Append(CPPPATH = '/usr/include')
         commonEnvironment.Append(CCFLAGS = "-mthreads")
     else:
@@ -350,18 +347,17 @@
 
 if getPlatform() == 'linux':
     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
-    pythonIncludePath = [path1, path2]
+    pythonIncludePath = [path1]
     path1 = '/usr/include/tcl8.4'
     path2 = '/usr/include/tk8.4'
-    tclIncludePath = [path1, path2]
+    tclIncludePath = [path1]
     pythonLinkFlags = []
     if commonEnvironment['Word64'] == '1':
         tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
+        pythonLibraryPath = ['/usr/lib64', tmp]
     else:
         tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
-        pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
+        pythonLibraryPath = ['/usr/lib', tmp]
     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
 elif getPlatform() == 'darwin':
     pyBasePath = '/System/Library/Frameworks/Python.Framework'

csound-5.03.0-remote-fixes.patch:

--- NEW FILE csound-5.03.0-remote-fixes.patch ---
--- Csound5.03.0/OOps/remote.c.remote-fixes	2006-10-27 16:00:10.000000000 -0400
+++ Csound5.03.0/OOps/remote.c	2006-10-27 16:32:02.000000000 -0400
@@ -38,6 +38,9 @@
 
 #define ST(x)   (((REMOTE_GLOBALS*) ((CSOUND*)csound)->remoteGlobals)->x)
 
+void remote_Cleanup(CSOUND *csound);
+
+
 void remoteRESET(CSOUND *csound)
 {
     csound->remoteGlobals = NULL;
@@ -46,9 +49,9 @@
 #ifdef HAVE_SOCKETS
 
  /* get the IPaddress of this machine */
-static void getIpAddress(char *ipaddr, char *ifname)
+static int getIpAddress(char *ipaddr, char *ifname)
 {
-
+    int ret = -1;
 #ifdef WIN32
     /* VL 12/10/06: something needs to go here */
     /* gethostbyname is the real answer; code below id unsafe */
@@ -61,25 +64,26 @@
     memset(&sin, 0, sizeof (struct sockaddr_in));
     memmove(&sin.sin_addr, he->h_addr_list[0], he->h_length);
     strcpy(ipaddr, inet_ntoa (sin.sin_addr));
+    ret = 0;
 
 #else
     struct ifreq ifr;
-    int fd, i;
-    unsigned char val;
+    int fd;
 
     fd = socket(AF_INET,SOCK_DGRAM, 0);
     if (fd >= 0) {
       strcpy(ifr.ifr_name, ifname);
 
       if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
-        for( i=2; i<6; i++){
-          val = (unsigned char)ifr.ifr_ifru.ifru_addr.sa_data[i];
-          sprintf(ipaddr, "%s%d%s", ipaddr, val, i==5?"":".");
-        }
+        char *local;
+        local = inet_ntoa(((struct sockaddr_in *)(&ifr.ifr_addr))->sin_addr);
+        strcpy(ipaddr, local);
+        ret = 0;
       }
     }
     close(fd);
 #endif
+    return ret;
 }
 
 char remoteID(CSOUND *csound)
@@ -88,31 +92,83 @@
     return ST(ipadrs)[len-1];
 }
 
-static void callox(CSOUND *csound)
+static int callox(CSOUND *csound)
 {
-    if (csound->remoteGlobals == NULL)
+    if (csound->remoteGlobals == NULL) {
       csound->remoteGlobals = csound->Calloc(csound, sizeof(REMOTE_GLOBALS));
+      if (csound->remoteGlobals == NULL) {
+        csound->Message(csound, Str("insufficient memory to initialize remote"
+                        " globals."));
+        goto error;
+      }
+    }
 
     ST(socksout) = (SOCK*)csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(SOCK));
+    if (ST(socksout) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize outgoing "
+                      "socket table."));
+      goto error;
+    }
     ST(socksin) = (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(socksin) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize incoming "
+                      "socket table."));
+      goto error;
+    }
     ST(insrfd_list) =
       (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(insrfd_list) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "insrfd_list."));
+      goto error;
+    }
     ST(chnrfd_list) =
       (int*) csound->Calloc(csound,(size_t)MAXREMOTES * sizeof(int));
+    if (ST(chnrfd_list) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "chnrfd_list."));
+      goto error;
+    }
     ST(insrfd) = (int*) csound->Calloc(csound,(size_t)129 * sizeof(int));
+    if (ST(insrfd) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "insrfd table."));
+      goto error;
+    }
     ST(chnrfd) = (int*) csound->Calloc(csound,(size_t)17 * sizeof(int));
+    if (ST(chnrfd) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "chnrfd table."));
+      goto error;
+    }
     ST(ipadrs) = (char*) csound->Calloc(csound,(size_t)15 * sizeof(char));
+    if (ST(ipadrs) == NULL) {
+      csound->Message(csound, Str("insufficient memory to initialize "
+                      "local ip address."));
+      goto error;
+    }
+
+    /* get IP adrs of this machine */
+    /* FIXME: don't hardcode eth0 */
+    if (getIpAddress(ST(ipadrs), "eth0") < 0) {
+      csound->Message(csound, Str("unable to get local ip address."));
+      goto error;
+    }
+
+	return 0;
 
-    getIpAddress(ST(ipadrs), "eth0"); /* get IP adrs of this machine */
+error:
+    /* Clean up anything we may have allocated before running out of memory */
+    remote_Cleanup(csound);
+    return -1;
 }
 
 /* Cleanup the above; called from musmon csoundCleanup */
 void remote_Cleanup(CSOUND *csound)
 {
     int fd;
-/*     if (csound->remoteGlobals == NULL) return; */
-    if (ST(socksout) == NULL) return;     /* if nothing allocated, return */
-    else {
+    if (csound->remoteGlobals == NULL) return;
+    if (ST(socksout) != NULL) {
       SOCK *sop = ST(socksout), *sop_end = sop + MAXREMOTES;
       for ( ; sop < sop_end; sop++)
         if ((fd = sop->rfd) > 0)
@@ -289,7 +345,12 @@
 {   /*      INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 3) {
       csound->InitError(csound, Str("missing instr nos"));
       return 0;
@@ -331,7 +392,12 @@
 {   /*      INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 2) {
       csound->InitError(csound, Str("missing instr nos"));
       return NOTOK;
@@ -361,7 +427,12 @@
 {                                            /* INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
 
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 3) {
       csound->InitError(csound, Str("missing channel nos"));
       return NOTOK;
@@ -400,7 +471,12 @@
 {                                         /*       INSTR 0 opcode  */
     short nargs = p->INOCOUNT;
     
-    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) callox(csound);
+    if (csound->remoteGlobals==NULL || ST(socksin) == NULL) {
+      if (callox(csound) < 0) {
+        csound->InitError(csound, Str("failed to initialize remote globals."));
+        return 0;
+      }
+    }
     if (nargs < 2) {
       csound->InitError(csound, Str("missing channel nos"));
       return NOTOK;

csound-5.03.0-enable-fluidsynth.patch:

Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csound-5.03.0-enable-fluidsynth.patch	5 Sep 2006 18:09:14 -0000	1.1
+++ csound-5.03.0-enable-fluidsynth.patch	29 Oct 2006 03:32:20 -0000	1.2
@@ -1,16 +1,16 @@
---- Csound5.03.0/SConstruct.enable-fluidsynth	2006-08-11 09:23:01.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-08-30 13:48:19.000000000 -0400
-@@ -212,6 +212,9 @@
- opts.Add('buildOSXGUI',
-     'On OSX, set to 1 to build the basic GUI frontend',
+--- Csound5.03.0/SConstruct.enable-fluidsynth	2006-10-21 11:03:22.000000000 -0400
++++ Csound5.03.0/SConstruct	2006-10-23 15:36:10.000000000 -0400
+@@ -225,6 +225,9 @@
      '0')
+ opts.Add('isWinNT', 'On windows, if win2000 or NT is used',
+           '%d' % withMSVC())
 +opts.Add('useFluidsynth',
 +    'Set to 1 if you want OSC support',
 +    '0')
  
  # Define the common part of the build environment.
  # This section also sets up customized options for third-party libraries, which
-@@ -405,6 +408,7 @@
+@@ -426,6 +429,7 @@
  pdhfound = configure.CheckHeader("m_pd.h", language = "C")
  tclhfound = configure.CheckHeader("tcl.h", language = "C")
  luaFound = configure.CheckHeader("lua.h", language = "C")
@@ -18,7 +18,7 @@
  swigFound = 'swig' in commonEnvironment['TOOLS']
  print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
  pythonFound = configure.CheckHeader("Python.h", language = "C")
-@@ -1187,7 +1191,7 @@
+@@ -1228,7 +1232,7 @@
  
  # FLUIDSYNTH OPCODES
  


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound.spec	8 Sep 2006 14:59:23 -0000	1.2
+++ csound.spec	29 Oct 2006 03:32:20 -0000	1.3
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       3%{?dist}
+Release:       7%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0:     http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src.tgz
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -36,10 +36,11 @@
 # cvs -z9 -d :pserver:anonymous at csound.cvs.sourceforge.net:/cvsroot/csound checkout -P -r csound-5_03_0 manual
 Source1: Csound5.03_manual.tgz
 
-Patch0: csound-5.03.0-uninitialized.patch
-Patch1: csound-5.03.0-printf-redef.patch
-Patch2: csound-5.03.0-enable-fluidsynth.patch
-Patch3: csound-5.03.0-no-gstabs.patch
+Patch0: csound-5.03.0-enable-fluidsynth.patch
+Patch1: csound-5.03.0-gstabs-disable-option.patch
+Patch2: csound-5.03.0-no-usr-local.patch
+Patch3: csound-5.03.0-disable-atsa.patch
+Patch4: csound-5.03.0-remote-fixes.patch
 
 
 %description
@@ -109,6 +110,15 @@
 %description gui
 Contains a FLTK-based GUI for Csound
 
+%package fltk
+Summary: FLTK plugins for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description fltk
+Contains FLTK plugins for csound
+
 %package jack
 Summary: Jack Audio plugins for Csound
 Group: Applications/Multimedia
@@ -144,6 +154,15 @@
 %description osc
 Open Sound Control (OSC) plugin for Csound
 
+%package virtual-keyboard
+Summary: Virtual MIDI keyboard plugin for Csound
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: fltk
+
+%description virtual-keyboard
+A virtual MIDI keyboard plugin for Csound
+
 %package manual
 Summary: Csound manual
 Group: Documentation
@@ -161,10 +180,12 @@
 
 %prep
 %setup -q -n Csound5.03.0
-%patch0 -p1 -b .uninitialized
-%patch1 -p1 -b .printf-redef
-%patch2 -p1 -b .enable-fluidsynth
-%patch3 -p1 -b .no-gstabs
+%patch0 -p1 -b .enable-fluidsynth
+%patch1 -p1 -b .gstabs-disable-option
+%patch2 -p1 -b .no-usr-local
+%patch3 -p1 -b .disable-atsa
+%patch4 -p1 -b .remote-fixes
+
 tar xf %{SOURCE1}
 
 %build
@@ -174,6 +195,11 @@
       frontends/fltk_gui/CsoundGlobalSettings.cpp
 
 scons dynamicCsoundLibrary=1 \
+      buildRelease=0 \
+      noDebug=0 \
+      disableGStabs=1 \
+      buildInterfaces=1 \
+      useALSA=1 \
       usePortAudio=0 \
       usePortMIDI=0 \
       useOSC=1 \
@@ -186,6 +212,7 @@
       buildTclcsound=1 \
       buildJavaWrapper=1 \
       buildDSSI=1 \
+      buildUtilities=1 \
       prefix=%{_prefix} \
       customCCFLAGS="%{optflags}" \
       customCXXFLAGS="%{optflags}" \
@@ -268,6 +295,8 @@
 %{_bindir}/scsort
 %{_bindir}/sndinfo
 %{_bindir}/srconv
+%{_bindir}/pv_export
+%{_bindir}/pv_import
 %{_libdir}/lib%{name}.so.5.1
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/xmg/*.xmg
@@ -298,6 +327,9 @@
 %{_libdir}/%{name}/plugins/libudprecv.so
 %{_libdir}/%{name}/plugins/libudpsend.so
 %{_libdir}/%{name}/plugins/libvbap.so
+%{_libdir}/%{name}/plugins/libharmon.so
+%{_libdir}/%{name}/plugins/libugakbari.so
+%{_libdir}/%{name}/plugins/libvaops.so
 %{_libdir}/%{name}/plugins/opcodes.dir
 
 %files devel
@@ -332,6 +364,9 @@
 %files gui
 %defattr(-,root,root,0755)
 %{_bindir}/csound5gui
+
+%files fltk
+%defattr(-,root,root,0755)
 %{_libdir}/%{name}/plugins/libwidgets.so
 
 %files jack
@@ -350,6 +385,10 @@
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/plugins/libosc.so
 
+%files virtual-keyboard
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/plugins/libvirtual.so
+
 %files manual
 %defattr(-,root,root,0755)
 %doc manual/copying.txt manual/credits.txt manual/bugs.txt manual/readme.txt manual/news.txt
@@ -364,6 +403,24 @@
 %doc tutorial/*.py
 
 %changelog
+* Sat Oct 28 2006 Dan Williams <dcbw at redhat.com> 5.03.0-7
+- Rebuild to drop old source tarball
+
+* Fri Oct 27 2006 Dan Williams <dcbw at redhat.com> 5.03.0-6
+- Update to a cvs snapshot for the remote plugin and a few other fixes
+- Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits
+- Put the virtual MIDI keyboard into its own package
+
+* Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> 5.03.0-5
+- Fix the remote plugin's local IP address read code, add more error checking
+
+* Mon Oct 23 2006 Dan Williams <dcbw at redhat.com> 5.03.0-4
+- Drop csound-5.03.0-uninitialized.patch, upstream
+- Drop csound-5.03.0-printf-redef.patch, upstream
+- CVS snapshot to grab some updated opcodes and fixes
+- Make disabling -gstabs an option for better upstream palatability
+- Disable atsa; it breaks the build for some unknown reason
+
 * Fri Sep  8 2006 Dan Williams <dcbw at redhat.com> 5.03.0-3
 - csound-5.03.0-no-gstabs.patch added; produce dwarf2 like everyone else
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2006 18:09:14 -0000	1.2
+++ sources	29 Oct 2006 03:32:20 -0000	1.3
@@ -1,2 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-15801aef4abce5efb8975b201aa900a2  Csound5.03_src.tgz
+8f01e4b65c3cb046df04f7eae92448d5  Csound5.03_src-cvs20061027.tar.bz2


--- csound-5.03.0-no-gstabs.patch DELETED ---


--- csound-5.03.0-printf-redef.patch DELETED ---


--- csound-5.03.0-uninitialized.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 03:55:09 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 28 Oct 2006 20:55:09 -0700
Subject: rpms/moodle/FC-5 moodle.spec,1.7,1.8
Message-ID: <200610290355.k9T3t9Zd025690@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629/FC-5

Modified Files:
	moodle.spec 
Log Message:
release bump


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-5/moodle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moodle.spec	23 Oct 2006 01:34:29 -0000	1.7
+++ moodle.spec	29 Oct 2006 03:54:39 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sat Oct 28 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-3
+- Release bump
+
 * Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
 - Added requires php-mysql
 



From fedora-extras-commits at redhat.com  Sun Oct 29 03:55:08 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 28 Oct 2006 20:55:08 -0700
Subject: rpms/moodle/FC-4 moodle.spec,1.7,1.8
Message-ID: <200610290355.k9T3t89r025687@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629/FC-4

Modified Files:
	moodle.spec 
Log Message:
release bump


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moodle.spec	23 Oct 2006 01:34:28 -0000	1.7
+++ moodle.spec	29 Oct 2006 03:54:37 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sat Oct 28 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-3
+- Release bump
+
 * Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
 - Added requires php-mysql
 



From fedora-extras-commits at redhat.com  Sun Oct 29 03:55:10 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 28 Oct 2006 20:55:10 -0700
Subject: rpms/moodle/FC-6 moodle.spec,1.8,1.9
Message-ID: <200610290355.k9T3tABD025691@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629/FC-6

Modified Files:
	moodle.spec 
Log Message:
release bump


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-6/moodle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moodle.spec	23 Oct 2006 01:34:29 -0000	1.8
+++ moodle.spec	29 Oct 2006 03:54:40 -0000	1.9
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sat Oct 28 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-3
+- Release bump
+
 * Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
 - Added requires php-mysql
 



From fedora-extras-commits at redhat.com  Sun Oct 29 03:55:11 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 28 Oct 2006 20:55:11 -0700
Subject: rpms/moodle/devel moodle.spec,1.8,1.9
Message-ID: <200610290355.k9T3tBVM025696@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629/devel

Modified Files:
	moodle.spec 
Log Message:
release bump


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moodle.spec	23 Oct 2006 01:34:29 -0000	1.8
+++ moodle.spec	29 Oct 2006 03:54:41 -0000	1.9
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -708,6 +708,9 @@
 %endif
 
 %changelog
+* Sat Oct 28 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-3
+- Release bump
+
 * Sun Oct 22 2006 Mike McGrath <imlinux at gmail.com> - 1.6.3-2
 - Added requires php-mysql
 



From fedora-extras-commits at redhat.com  Sun Oct 29 04:25:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:25:34 -0700
Subject: rpms/php-pear-Date-Holidays - New directory
Message-ID: <200610290425.k9T4PYLw029023@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29019/php-pear-Date-Holidays

Log Message:
Directory /cvs/extras/rpms/php-pear-Date-Holidays added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 29 04:25:39 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:25:39 -0700
Subject: rpms/php-pear-Date-Holidays/devel - New directory
Message-ID: <200610290425.k9T4PdaO029037@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29019/php-pear-Date-Holidays/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Date-Holidays/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Oct 29 04:25:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:25:51 -0700
Subject: rpms/php-pear-Date-Holidays Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610290425.k9T4PppI029068@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29062

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Date-Holidays


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Date-Holidays
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Oct 29 04:25:57 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:25:57 -0700
Subject: rpms/php-pear-Date-Holidays/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610290425.k9T4PviH029084@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29062/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Date-Holidays


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Oct 29 04:26:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:26:51 -0700
Subject: rpms/php-pear-Date-Holidays import.log,1.1,1.2
Message-ID: <200610290426.k9T4Qpni029160@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29124

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Date-Holidays-0.16.1-1 on branch devel from php-pear-Date-Holidays-0.16.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date-Holidays/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Oct 2006 04:25:51 -0000	1.1
+++ import.log	29 Oct 2006 04:26:20 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Date-Holidays-0_16_1-1:HEAD:php-pear-Date-Holidays-0.16.1-1.src.rpm:1162095977



From fedora-extras-commits at redhat.com  Sun Oct 29 04:26:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:26:51 -0700
Subject: rpms/php-pear-Date-Holidays/devel php-pear-Date-Holidays.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610290426.k9T4QpIL029164@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date-Holidays/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29124/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Date-Holidays.spec 
Log Message:
auto-import php-pear-Date-Holidays-0.16.1-1 on branch devel from php-pear-Date-Holidays-0.16.1-1.src.rpm


--- NEW FILE php-pear-Date-Holidays.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Date_Holidays

Name:           php-pear-Date-Holidays
Version:        0.16.1
Release:        1%{?dist}
Summary:        Driver based class to calculate holidays

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Date_Holidays
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(Date) php-pear(XML_Serializer)
Requires:       php-pear(Console_Getargs)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
Date_Holidays helps you calculating the dates and titles of holidays and
other special celebrations. The calculation is driver-based so it is easy
to add new drivers that calculate a country's holidays. The methods of the
class can be used to get a holiday's date and title in various languages.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{_bindir}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/Date/Holidays*


%changelog
* Sat Oct 14 2006 Christoper Stone <chris.stone at gmail.com> 0.16.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date-Holidays/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Oct 2006 04:25:56 -0000	1.1
+++ .cvsignore	29 Oct 2006 04:26:21 -0000	1.2
@@ -0,0 +1 @@
+Date_Holidays-0.16.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date-Holidays/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Oct 2006 04:25:56 -0000	1.1
+++ sources	29 Oct 2006 04:26:21 -0000	1.2
@@ -0,0 +1 @@
+84dcf7f0c92afdf08b9c1d761a8ca89f  Date_Holidays-0.16.1.tgz



From fedora-extras-commits at redhat.com  Sun Oct 29 04:29:13 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 28 Oct 2006 21:29:13 -0700
Subject: owners owners.list,1.1876,1.1877
Message-ID: <200610290429.k9T4TDqn029222@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29206

Modified Files:
	owners.list 
Log Message:
php-pear-Date-Holidays


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1876
retrieving revision 1.1877
diff -u -r1.1876 -r1.1877
--- owners.list	27 Oct 2006 22:21:26 -0000	1.1876
+++ owners.list	29 Oct 2006 04:28:43 -0000	1.1877
@@ -1756,6 +1756,7 @@
 Fedora Extras|php-pear-Console-Getargs|Command-line arguments and parameters parser|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Console-Table|Class that makes it easy to build console style tables|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Date-Holidays|Driver based class to calculate holidays|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 29 05:12:08 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 22:12:08 -0700
Subject: rpms/lucidlife/FC-6 lucidlife-add-.desktop-encoding.patch, NONE,
	1.1 lucidlife-make-docs-use-proper-dir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lucidlife.spec, 1.13, 1.14 sources, 1.2,
	1.3 make-docs-use-proper-dir.patch, 1.1, NONE
Message-ID: <200610290512.k9T5C8l5032389@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32342

Modified Files:
	.cvsignore lucidlife.spec sources 
Added Files:
	lucidlife-add-.desktop-encoding.patch 
	lucidlife-make-docs-use-proper-dir.patch 
Removed Files:
	make-docs-use-proper-dir.patch 
Log Message:
Update to new upstream release (0.9.1)

lucidlife-add-.desktop-encoding.patch:

--- NEW FILE lucidlife-add-.desktop-encoding.patch ---
--- lucidlife.desktop.in.old	2006-10-28 11:02:18.000000000 -0700
+++ lucidlife.desktop.in	2006-10-28 11:10:43.000000000 -0700
@@ -6,3 +6,4 @@
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Game;
+Encoding=UTF-8

lucidlife-make-docs-use-proper-dir.patch:

--- NEW FILE lucidlife-make-docs-use-proper-dir.patch ---
--- doc/Makefile.am.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.am	2006-03-28 20:22:32.000000000 -0800
@@ -1,4 +1,4 @@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 
 EXTRA_DIST = *.png *.gif *.html *.css
--- doc/Makefile.in.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.in	2006-03-28 20:24:32.000000000 -0800
@@ -188,7 +188,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 EXTRA_DIST = *.png *.gif *.html *.css
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2006 21:10:04 -0000	1.2
+++ .cvsignore	29 Oct 2006 05:11:38 -0000	1.3
@@ -1 +1 @@
-lucidlife-0.9.tar.gz
+lucidlife-0.9.1.tar.gz


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-6/lucidlife.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lucidlife.spec	27 Aug 2006 22:51:56 -0000	1.13
+++ lucidlife.spec	29 Oct 2006 05:11:38 -0000	1.14
@@ -1,13 +1,14 @@
 Name:           lucidlife
-Version:        0.9
-Release:        11%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://icculus.org/~jcspray/LucidLife/
 Source0:        http://icculus.org/~jcspray/LucidLife/%{name}-%{version}.tar.gz
-Patch0:			make-docs-use-proper-dir.patch
+Patch0:		%{name}-make-docs-use-proper-dir.patch
+Patch1:		%{name}-add-.desktop-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -29,6 +30,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .old
+%patch1 -p0 -b .old
 
 
 %build
@@ -62,6 +64,13 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
+- Update to new upstream release (0.9.1)
+- Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:
+  + add-.desktop-encoding.patch
+- Add %%name prefix to old make-docs-use-proper-dir patch filename
+  to keep it all in the same logical namespace.
+
 * Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-11
 - Mass FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2006 21:10:04 -0000	1.2
+++ sources	29 Oct 2006 05:11:38 -0000	1.3
@@ -1 +1 @@
-25bcde0ddbe4f7db4a7ea92fcc36b7bc  lucidlife-0.9.tar.gz
+68e9cfe091fa18380984609af9c56467  lucidlife-0.9.1.tar.gz


--- make-docs-use-proper-dir.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 05:40:52 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 22:40:52 -0700
Subject: rpms/lucidlife/FC-5 lucidlife-add-.desktop-encoding.patch, NONE,
	1.1 lucidlife-make-docs-use-proper-dir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lucidlife.spec, 1.9, 1.10 sources, 1.2,
	1.3 make-docs-use-proper-dir.patch, 1.1, NONE
Message-ID: <200610290540.k9T5eqiB002117@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1956

Modified Files:
	.cvsignore lucidlife.spec sources 
Added Files:
	lucidlife-add-.desktop-encoding.patch 
	lucidlife-make-docs-use-proper-dir.patch 
Removed Files:
	make-docs-use-proper-dir.patch 
Log Message:
Update to new upstream release (0.9.1)

lucidlife-add-.desktop-encoding.patch:

--- NEW FILE lucidlife-add-.desktop-encoding.patch ---
--- lucidlife.desktop.in.old	2006-10-28 11:02:18.000000000 -0700
+++ lucidlife.desktop.in	2006-10-28 11:10:43.000000000 -0700
@@ -6,3 +6,4 @@
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Game;
+Encoding=UTF-8

lucidlife-make-docs-use-proper-dir.patch:

--- NEW FILE lucidlife-make-docs-use-proper-dir.patch ---
--- doc/Makefile.am.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.am	2006-03-28 20:22:32.000000000 -0800
@@ -1,4 +1,4 @@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 
 EXTRA_DIST = *.png *.gif *.html *.css
--- doc/Makefile.in.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.in	2006-03-28 20:24:32.000000000 -0800
@@ -188,7 +188,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 EXTRA_DIST = *.png *.gif *.html *.css
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2006 21:10:04 -0000	1.2
+++ .cvsignore	29 Oct 2006 05:40:21 -0000	1.3
@@ -1 +1 @@
-lucidlife-0.9.tar.gz
+lucidlife-0.9.1.tar.gz


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lucidlife.spec	9 Apr 2006 05:13:24 -0000	1.9
+++ lucidlife.spec	29 Oct 2006 05:40:21 -0000	1.10
@@ -1,13 +1,14 @@
 Name:           lucidlife
-Version:        0.9
-Release:        7%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://icculus.org/~jcspray/LucidLife/
 Source0:        http://icculus.org/~jcspray/LucidLife/%{name}-%{version}.tar.gz
-Patch0:			make-docs-use-proper-dir.patch
+Patch0:		%{name}-make-docs-use-proper-dir.patch
+Patch1:		%{name}-add-.desktop-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .old
+%patch1 -p0 -b .old
 
 
 %build
@@ -60,6 +62,13 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
+- Update to new upstream release (0.9.1)
+- Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:
+  + add-.desktop-encoding.patch
+- Add %%name prefix to old make-docs-use-proper-dir patch filename
+  to keep it all in the same logical namespace.
+
 * Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7
 - Use desktop-file-install's "--delete-original" option instead of doing
   it manually.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2006 21:10:04 -0000	1.2
+++ sources	29 Oct 2006 05:40:21 -0000	1.3
@@ -1 +1 @@
-25bcde0ddbe4f7db4a7ea92fcc36b7bc  lucidlife-0.9.tar.gz
+68e9cfe091fa18380984609af9c56467  lucidlife-0.9.1.tar.gz


--- make-docs-use-proper-dir.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 06:26:00 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 28 Oct 2006 23:26:00 -0700
Subject: rpms/lucidlife/FC-5 lucidlife.spec,1.10,1.11
Message-ID: <200610290626.k9T6Q0IV007342@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7322

Modified Files:
	lucidlife.spec 
Log Message:
Add gettext and perl(XML::Parser) to BR to fix reduced mock build


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lucidlife.spec	29 Oct 2006 05:40:21 -0000	1.10
+++ lucidlife.spec	29 Oct 2006 06:25:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           lucidlife
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
@@ -14,6 +14,8 @@
 BuildRequires:  gtk2-devel >= 2.6.0
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext
 
 %description
 LucidLife is a Conway's Life simulator. The rules are rather simple. The game
@@ -62,6 +64,9 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1.1
+- Add gettext and perl(XML::Parser) as BuildRequires to fix reduced mock build
+ 
 * Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
 - Update to new upstream release (0.9.1)
 - Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:



From fedora-extras-commits at redhat.com  Sun Oct 29 11:08:59 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 29 Oct 2006 04:08:59 -0700
Subject: rpms/heartbeat/devel heartbeat.spec,1.9,1.10
Message-ID: <200610291108.k9TB8xBK024290@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24274

Modified Files:
	heartbeat.spec 
Log Message:
* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
- fix preun, postun to check for upgrade (#212133)



Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- heartbeat.spec	30 Aug 2006 19:32:48 -0000	1.9
+++ heartbeat.spec	29 Oct 2006 11:08:28 -0000	1.10
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -157,9 +157,15 @@
 /sbin/chkconfig --add heartbeat
 
 %preun
-/sbin/chkconfig --del heartbeat
+if [ $1 = 0 ] ; then
+    /sbin/service heartbeat stop
+    /sbin/chkconfig --del heartbeat
+fi
 
 %postun 
+if [ "$1" -ge "1" ] ; then
+    /sbin/service heartbeat condrestart
+fi
 /sbin/ldconfig
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
@@ -295,6 +301,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
+- fix preun, postun to check for upgrade (#212133)
+
 * Wed Aug 30 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-2
 - rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:14:58 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 29 Oct 2006 04:14:58 -0700
Subject: rpms/wvs-data/devel wvs-data.spec,1.2,1.3
Message-ID: <200610291114.k9TBEw8f024490@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wvs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24472

Modified Files:
	wvs-data.spec 
Log Message:
* Sun Oct 29 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-3
- Bump to remove %{?dist} tag.



Index: wvs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/wvs-data/devel/wvs-data.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wvs-data.spec	28 Oct 2006 16:22:15 -0000	1.2
+++ wvs-data.spec	29 Oct 2006 11:14:27 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:		wvs-data
 Version:	0.0.%{WVS_date}
-Release:	2%{?dist}
+Release:	3
 Summary:	World Vector Shoreline data
 
 Group:		Applications/Engineering
@@ -45,8 +45,11 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Oct 29 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-3
+- Bump to remove %%{?dist} tag.
+
 * Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Add %%{?dist} tag as buildsys forces this.
+- Add %%{?dist} tag as CVS forces this.
 
 * Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.0.20020219-2
 - Directory name change.



From fedora-extras-commits at redhat.com  Sun Oct 29 11:24:58 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 04:24:58 -0700
Subject: rpms/kadu/devel .cvsignore, 1.6, 1.7 kadu.spec, 1.12, 1.13 sources, 
	1.6, 1.7
Message-ID: <200610291124.k9TBOw3U030606@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30586

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.16.20061029svn
- Bump cvs snapshot to 20061029



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Sep 2006 10:14:41 -0000	1.6
+++ .cvsignore	29 Oct 2006 11:24:27 -0000	1.7
@@ -1 +1 @@
-kadu-20060915.tar.bz2
+kadu-20061029.tar.bz2


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kadu.spec	10 Oct 2006 16:12:24 -0000	1.12
+++ kadu.spec	29 Oct 2006 11:24:27 -0000	1.13
@@ -1,7 +1,7 @@
-%define		cvs_date	20060915
+%define		cvs_date	20061029
 Name:		kadu
 Version:	0.5.0
-Release:	0.15.%{cvs_date}svn%{?dist}
+Release:	0.16.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -453,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.16.20061029svn
+- Bump cvs snapshot to 20061029
+
 * Tue Oct 10 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.15.20060915svn
 - Another fix to not rebuilding kadu-amarok
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Sep 2006 10:14:41 -0000	1.6
+++ sources	29 Oct 2006 11:24:27 -0000	1.7
@@ -1,4 +1,3 @@
-575746c975382dc7a7d275175449cb21  kadu-20060915.tar.bz2
 62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
 0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
@@ -16,3 +15,4 @@
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
 422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz
+203d4b6a041f39703a9b5d259a259c38  kadu-20061029.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 29 11:29:03 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 29 Oct 2006 04:29:03 -0700
Subject: rpms/heartbeat/FC-4 heartbeat.spec,1.5,1.6
Message-ID: <200610291129.k9TBT31O030715@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666/FC-4

Modified Files:
	heartbeat.spec 
Log Message:
fix preun, postun to check for upgrade (#212133)


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- heartbeat.spec	16 Aug 2006 12:03:07 -0000	1.5
+++ heartbeat.spec	29 Oct 2006 11:28:33 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          1%{?dist}
+Release:          3%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -157,9 +157,15 @@
 /sbin/chkconfig --add heartbeat
 
 %preun
-/sbin/chkconfig --del heartbeat
+if [ $1 = 0 ] ; then
+    /sbin/service heartbeat stop
+    /sbin/chkconfig --del heartbeat
+fi
 
 %postun 
+if [ "$1" -ge "1" ] ; then
+    /sbin/service heartbeat condrestart
+fi
 /sbin/ldconfig
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
@@ -295,6 +301,12 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
+- fix preun, postun to check for upgrade (#212133)
+
+* Wed Aug 30 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-2
+- rebuild for Fedora Extras 6
+
 * Wed Aug 16 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-1
 - upstream version 2.0.7
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:29:04 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 29 Oct 2006 04:29:04 -0700
Subject: rpms/heartbeat/FC-6 heartbeat.spec,1.9,1.10
Message-ID: <200610291129.k9TBT4kG030719@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666/FC-6

Modified Files:
	heartbeat.spec 
Log Message:
fix preun, postun to check for upgrade (#212133)


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-6/heartbeat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- heartbeat.spec	30 Aug 2006 19:32:48 -0000	1.9
+++ heartbeat.spec	29 Oct 2006 11:28:34 -0000	1.10
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -157,9 +157,15 @@
 /sbin/chkconfig --add heartbeat
 
 %preun
-/sbin/chkconfig --del heartbeat
+if [ $1 = 0 ] ; then
+    /sbin/service heartbeat stop
+    /sbin/chkconfig --del heartbeat
+fi
 
 %postun 
+if [ "$1" -ge "1" ] ; then
+    /sbin/service heartbeat condrestart
+fi
 /sbin/ldconfig
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
@@ -295,6 +301,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
+- fix preun, postun to check for upgrade (#212133)
+
 * Wed Aug 30 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-2
 - rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:29:04 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 29 Oct 2006 04:29:04 -0700
Subject: rpms/heartbeat/FC-5 heartbeat.spec,1.5,1.6
Message-ID: <200610291129.k9TBT4lZ030718@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666/FC-5

Modified Files:
	heartbeat.spec 
Log Message:
fix preun, postun to check for upgrade (#212133)


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- heartbeat.spec	16 Aug 2006 12:03:08 -0000	1.5
+++ heartbeat.spec	29 Oct 2006 11:28:33 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          1%{?dist}
+Release:          3%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -157,9 +157,15 @@
 /sbin/chkconfig --add heartbeat
 
 %preun
-/sbin/chkconfig --del heartbeat
+if [ $1 = 0 ] ; then
+    /sbin/service heartbeat stop
+    /sbin/chkconfig --del heartbeat
+fi
 
 %postun 
+if [ "$1" -ge "1" ] ; then
+    /sbin/service heartbeat condrestart
+fi
 /sbin/ldconfig
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
@@ -295,6 +301,12 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 29 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-3
+- fix preun, postun to check for upgrade (#212133)
+
+* Wed Aug 30 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-2
+- rebuild for Fedora Extras 6
+
 * Wed Aug 16 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.7-1
 - upstream version 2.0.7
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:47:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 04:47:48 -0700
Subject: rpms/kadu/devel kadu.spec,1.13,1.14
Message-ID: <200610291147.k9TBlmKR031003@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30983

Modified Files:
	kadu.spec 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.17.20061029svn
- Disabling kadu-amarok on ppc arch



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kadu.spec	29 Oct 2006 11:24:27 -0000	1.13
+++ kadu.spec	29 Oct 2006 11:47:18 -0000	1.14
@@ -244,7 +244,7 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
-%ifnarch ppc64 x86_64 s390 s390x ia64
+%ifnarch ppc64 x86_64 s390 s390x ia64 ppc
 	module_amarok \
 %endif
 	module_filedesc \
@@ -408,7 +408,7 @@
 %mod_files2 xmms
 
 
-%ifnarch ppc64 x86_64 s390 s390x ia64
+%ifnarch ppc64 x86_64 s390 s390x ia64 ppc
 %mod_files2 amarok
 
 %endif
@@ -453,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.17.20061029svn
+- Disabling kadu-amarok on ppc arch
+
 * Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.16.20061029svn
 - Bump cvs snapshot to 20061029
 



From fedora-extras-commits at redhat.com  Sun Oct 29 11:49:51 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 04:49:51 -0700
Subject: rpms/kadu/devel kadu.spec,1.14,1.15
Message-ID: <200610291149.k9TBnpuo031065@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31049

Modified Files:
	kadu.spec 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.17.20061029svn
- Disabling kadu-amarok on ppc arch



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kadu.spec	29 Oct 2006 11:47:18 -0000	1.14
+++ kadu.spec	29 Oct 2006 11:49:20 -0000	1.15
@@ -1,7 +1,7 @@
 %define		cvs_date	20061029
 Name:		kadu
 Version:	0.5.0
-Release:	0.16.%{cvs_date}svn%{?dist}
+Release:	0.17.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL



From fedora-extras-commits at redhat.com  Sun Oct 29 11:56:19 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 29 Oct 2006 04:56:19 -0700
Subject: comps Makefile,1.2,1.3
Message-ID: <200610291156.k9TBuJ8q031166@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31141

Modified Files:
	Makefile 
Log Message:
remove reference to non-existant "comps" target


Index: Makefile
===================================================================
RCS file: /cvs/extras/comps/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	26 Feb 2006 20:31:58 -0000	1.2
+++ Makefile	29 Oct 2006 11:55:48 -0000	1.3
@@ -1,7 +1,7 @@
 XMLINFILES=$(wildcard *.xml.in)
 XMLFILES = $(patsubst %.xml.in,%.xml,$(XMLINFILES))
 
-all: po comps $(XMLFILES)
+all: po $(XMLFILES)
 
 po: $(XMLINFILES)
 	make -C po || exit 1



From fedora-extras-commits at redhat.com  Sun Oct 29 12:40:01 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 05:40:01 -0700
Subject: rpms/perl-Unicode-Map8/FC-5 perl-Unicode-Map8.spec,1.10,1.11
Message-ID: <200610291240.k9TCe1VI002348@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304/FC-5

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
actually apply the patches...


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/FC-5/perl-Unicode-Map8.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Unicode-Map8.spec	28 Oct 2006 09:12:17 -0000	1.10
+++ perl-Unicode-Map8.spec	29 Oct 2006 12:39:31 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -28,6 +28,8 @@
 
 %prep
 %setup -q -n Unicode-Map8-%{version}
+%patch0 -p0 -b .declaration
+%patch1 -p0 -b .type
 
 
 %build
@@ -64,6 +66,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-11
+- actually apply the patches
+
 * Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
 - add patches for x86_64
 



From fedora-extras-commits at redhat.com  Sun Oct 29 12:40:02 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 05:40:02 -0700
Subject: rpms/perl-Unicode-Map8/FC-6 perl-Unicode-Map8.spec,1.11,1.12
Message-ID: <200610291240.k9TCe2jM002351@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304/FC-6

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
actually apply the patches...


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/FC-6/perl-Unicode-Map8.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Unicode-Map8.spec	28 Oct 2006 09:12:18 -0000	1.11
+++ perl-Unicode-Map8.spec	29 Oct 2006 12:39:32 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -28,6 +28,8 @@
 
 %prep
 %setup -q -n Unicode-Map8-%{version}
+%patch0 -p0 -b .declaration
+%patch1 -p0 -b .type
 
 
 %build
@@ -64,6 +66,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-11
+- actually apply the patches
+
 * Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
 - add patches for x86_64
 



From fedora-extras-commits at redhat.com  Sun Oct 29 12:40:03 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 05:40:03 -0700
Subject: rpms/perl-Unicode-Map8/devel perl-Unicode-Map8.spec,1.11,1.12
Message-ID: <200610291240.k9TCe3qt002354@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-Map8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304/devel

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
actually apply the patches...


Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Unicode-Map8.spec	28 Oct 2006 09:12:24 -0000	1.11
+++ perl-Unicode-Map8.spec	29 Oct 2006 12:39:32 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
@@ -28,6 +28,8 @@
 
 %prep
 %setup -q -n Unicode-Map8-%{version}
+%patch0 -p0 -b .declaration
+%patch1 -p0 -b .type
 
 
 %build
@@ -64,6 +66,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-11
+- actually apply the patches
+
 * Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.12-10
 - add patches for x86_64
 



From fedora-extras-commits at redhat.com  Sun Oct 29 13:04:13 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 06:04:13 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-5 perl-Unicode-MapUTF8.spec,1.7,1.8
Message-ID: <200610291304.k9TD4Dm7005615@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5566/FC-5

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Unicode-MapUTF8.spec	22 Feb 2006 23:01:11 -0000	1.7
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:42 -0000	1.8
@@ -1,23 +1,21 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Unicode-MapUTF8
-Version:        1.09
-Release:        6%{?dist}
+Version:        1.11
+Release:        2%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Unicode-MapUTF8/
-Source0:        http://www.cpan.org/authors/id/S/SN/SNOWHARE/Unicode-MapUTF8-1.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Jcode), perl(Unicode::String), perl(Unicode::Map)
 BuildRequires:  perl(Unicode::Map8)
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch: x86_64
 
 %description
 Unicode::MapUTF8 Provides an adapter layer between core routines for
@@ -65,6 +63,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- perl-Unicode-Map8 builds on x86_64 now, rebuilding
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1
+- update to 1.11
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.09-6
 - rebuild for FC5
 - ExcludeArch x86_64 because perl-Unicode-Map8 does not work on this arch



From fedora-extras-commits at redhat.com  Sun Oct 29 13:04:16 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 06:04:16 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-6 perl-Unicode-MapUTF8.spec,1.8,1.9
Message-ID: <200610291304.k9TD4GcJ005618@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5566/FC-6

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-6/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Unicode-MapUTF8.spec	30 Aug 2006 16:24:13 -0000	1.8
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:46 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -16,8 +16,6 @@
 BuildRequires:  perl(Jcode), perl(Unicode::String), perl(Unicode::Map)
 BuildRequires:  perl(Unicode::Map8)
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch: x86_64
 
 %description
 Unicode::MapUTF8 Provides an adapter layer between core routines for
@@ -65,6 +63,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- perl-Unicode-Map8 builds on x86_64 now, rebuilding
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1
 - update to 1.11
 



From fedora-extras-commits at redhat.com  Sun Oct 29 13:04:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 06:04:17 -0700
Subject: rpms/perl-Unicode-MapUTF8/devel perl-Unicode-MapUTF8.spec,1.8,1.9
Message-ID: <200610291304.k9TD4HKX005619@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5566/devel

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/devel/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Unicode-MapUTF8.spec	30 Aug 2006 16:24:13 -0000	1.8
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:47 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -16,8 +16,6 @@
 BuildRequires:  perl(Jcode), perl(Unicode::String), perl(Unicode::Map)
 BuildRequires:  perl(Unicode::Map8)
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch: x86_64
 
 %description
 Unicode::MapUTF8 Provides an adapter layer between core routines for
@@ -65,6 +63,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- perl-Unicode-Map8 builds on x86_64 now, rebuilding
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1
 - update to 1.11
 



From fedora-extras-commits at redhat.com  Sun Oct 29 14:09:40 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 07:09:40 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200610291409.k9TE9e88009151@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9131

Modified Files:
	.cvsignore sources 
Log Message:
update sources file to match spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:10:23 -0000	1.2
+++ .cvsignore	29 Oct 2006 14:09:09 -0000	1.3
@@ -1 +1 @@
-Unicode-MapUTF8-1.09.tar.gz
+Unicode-MapUTF8-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:10:23 -0000	1.2
+++ sources	29 Oct 2006 14:09:09 -0000	1.3
@@ -1 +1 @@
-32b2593bb38b24b5f5fef2aaf444a367  Unicode-MapUTF8-1.09.tar.gz
+16e66ee0bdc0e6cc9c36e29212d8ffdc  Unicode-MapUTF8-1.11.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 14:11:53 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 07:11:53 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-6 perl-Unicode-MapUTF8.spec,1.9,1.10
Message-ID: <200610291411.k9TEBr14009257@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/FC-6

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-6/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:46 -0000	1.9
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 14:11:23 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -64,6 +64,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- rebuild
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
 - perl-Unicode-Map8 builds on x86_64 now, rebuilding
 
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1



From fedora-extras-commits at redhat.com  Sun Oct 29 14:11:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 07:11:54 -0700
Subject: rpms/perl-Unicode-MapUTF8/devel perl-Unicode-MapUTF8.spec,1.9,1.10
Message-ID: <200610291411.k9TEBsXW009260@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/devel

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/devel/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:47 -0000	1.9
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 14:11:24 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -64,6 +64,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- rebuild
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
 - perl-Unicode-Map8 builds on x86_64 now, rebuilding
 
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1



From fedora-extras-commits at redhat.com  Sun Oct 29 14:11:53 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 07:11:53 -0700
Subject: rpms/perl-Unicode-MapUTF8/FC-5 perl-Unicode-MapUTF8.spec,1.8,1.9
Message-ID: <200610291411.k9TEBrmD009254@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/FC-5

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
rebuild


Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Unicode-MapUTF8/FC-5/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Unicode-MapUTF8.spec	29 Oct 2006 13:03:42 -0000	1.8
+++ perl-Unicode-MapUTF8.spec	29 Oct 2006 14:11:22 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
@@ -64,6 +64,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
+- rebuild
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-2
 - perl-Unicode-Map8 builds on x86_64 now, rebuilding
 
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.11-1



From fedora-extras-commits at redhat.com  Sun Oct 29 14:26:27 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sun, 29 Oct 2006 07:26:27 -0700
Subject: rpms/smbldap-tools/devel smbldap-tools.spec,1.3,1.4
Message-ID: <200610291426.k9TEQR0Y009525@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9487

Modified Files:
	smbldap-tools.spec 
Log Message:
perl(Unicode::MapUTF8) now available on x86_64, so remove ExcludeArch
and revert to noarch package (#211866)



Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smbldap-tools.spec	24 Oct 2006 07:35:18 -0000	1.3
+++ smbldap-tools.spec	29 Oct 2006 14:25:57 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
@@ -10,12 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
-#BuildArch:	noarch
-ExcludeArch:	x86_64
-# Debuginfo package would be empty as there are no binaries in this package
-%define debug_package %{nil}
+BuildArch:	noarch
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -69,6 +64,10 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Sun Oct 29 2006 Paul Howarth <paul at city-fan.org> 0.9.2-5
+- perl(Unicode::MapUTF8) now available on x86_64, so remove ExcludeArch
+  and revert to noarch package (#211866)
+
 * Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
 - Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
 - A consequence of this is that the package can no longer be noarch



From fedora-extras-commits at redhat.com  Sun Oct 29 14:27:31 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:27:31 -0700
Subject: rpms/kbibtex/devel kbibtex-0.1.5-filteredselection.patch, NONE,
	1.1 kbibtex-0.1.5-gcc4.2.patch, NONE,
	1.1 kbibtex-0.1.5-viewdocument.patch, NONE, 1.1 kbibtex.spec, 1.6, 1.7
Message-ID: <200610291427.k9TERV9S009559@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9524

Modified Files:
	kbibtex.spec 
Added Files:
	kbibtex-0.1.5-filteredselection.patch 
	kbibtex-0.1.5-gcc4.2.patch kbibtex-0.1.5-viewdocument.patch 
Log Message:
- official kbibtex patches against 1.5.0 applied



kbibtex-0.1.5-filteredselection.patch:

--- NEW FILE kbibtex-0.1.5-filteredselection.patch ---
Index: src/documentlistview.cpp
===================================================================
--- src/documentlistview.cpp	(Revision 301)
+++ src/documentlistview.cpp	(Revision 302)
@@ -221,10 +221,13 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            m_bibtexFile->deleteElement( kblvi->element() );
-            it++;
-            takeItem( kblvi );
-            delete ( kblvi );
+            if ( kblvi->isVisible() )
+            {
+                m_bibtexFile->deleteElement( kblvi->element() );
+                it++;
+                takeItem( kblvi );
+                delete ( kblvi );
+            }
         }
 
         if ( above )
@@ -246,7 +249,7 @@
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
             BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
-            if ( entry != NULL )
+            if ( entry != NULL && kblvi->isVisible() )
             {
                 if ( !refs.isEmpty() )
                     refs.append( "," );
@@ -621,7 +624,8 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            exporter->save( &buffer, kblvi->element() );
+            if ( kblvi->isVisible() )
+                exporter->save( &buffer, kblvi->element() );
             it++;
         }
         delete exporter;

kbibtex-0.1.5-gcc4.2.patch:

--- NEW FILE kbibtex-0.1.5-gcc4.2.patch ---
Index: src/fileimporter.h
===================================================================
--- src/fileimporter.h	(Revision 307)
+++ src/fileimporter.h	(Arbeitskopie)
@@ -39,7 +39,7 @@
         ~FileImporter();
 
         File* load ( const QString& text );
-        virtual File* load( QIODevice *iodevice ) = NULL;
+        virtual File* load( QIODevice *iodevice ) = 0;
 
         static bool guessCanDecode( const QString & ) { return FALSE; };
 

kbibtex-0.1.5-viewdocument.patch:

--- NEW FILE kbibtex-0.1.5-viewdocument.patch ---
Index: src/documentwidget.h
===================================================================
--- src/documentwidget.h	(Revision 308)
+++ src/documentwidget.h	(Revision 310)
@@ -106,6 +106,7 @@
         int m_newElementCounter;
         EditMode m_editMode;
         KActionMenu *m_viewDocumentActionMenu;
+        QStringList m_viewDocumentActionMenuURLs;
         KActionMenu *m_searchWebsitesActionMenu;
         KAction *m_find;
         KAction *m_findNext;
Index: src/documentwidget.cpp
===================================================================
--- src/documentwidget.cpp	(Revision 308)
+++ src/documentwidget.cpp	(Revision 310)
@@ -471,13 +471,13 @@
         m_listViewElements->setFactory( factory, client );
         m_sourceView->setFactory( factory, client );
 
+        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         if ( m_viewDocumentActionMenu != NULL )
             connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
 
         m_copyReference = client->action( "edit_copyref" );
         m_find = client->action( "edit_find" );
         m_findNext = client->action( "edit_find_next" );
-        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
         m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
     }
@@ -486,6 +486,7 @@
     {
         KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
         popup->clear();
+        m_viewDocumentActionMenuURLs.clear();
 
         BibTeX::Element * currentElement = NULL;
 
@@ -517,6 +518,7 @@
                         popup->insertItem( SmallIcon( "html" ), prettyURL );
                     else
                         popup->insertItem( prettyURL );
+                    m_viewDocumentActionMenuURLs.append( prettyURL );
                 }
                 m_viewDocumentActionMenu->setEnabled( TRUE );
             }
@@ -908,7 +910,7 @@
 
     void DocumentWidget::slotViewDocument( int id )
     {
-        kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
+        kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
     }
 
 }


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kbibtex.spec	18 Oct 2006 12:05:17 -0000	1.6
+++ kbibtex.spec	29 Oct 2006 14:27:00 -0000	1.7
@@ -1,12 +1,15 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
 Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
+Patch0:		kbibtex-0.1.5-filteredselection.patch
+Patch1:		kbibtex-0.1.5-gcc4.2.patch
+Patch2:		kbibtex-0.1.5-viewdocument.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -19,7 +22,9 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .filteredselection
+%patch1 -p0 -b .gcc4.2
+%patch2	-p0 -b .viewdocument
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -114,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
+- latest released patches (filteredselection,gcc4.2,viewdocument)
+
 * Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
 - Update to 0.1.5
 



From fedora-extras-commits at redhat.com  Sun Oct 29 14:33:38 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:33:38 -0700
Subject: rpms/kbibtex/FC-5 kbibtex.spec,1.5,1.6
Message-ID: <200610291433.k9TEXceg009723@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9707

Modified Files:
	kbibtex.spec 
Log Message:
- applied latest official kbibtex patch-set




Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kbibtex.spec	18 Oct 2006 11:51:35 -0000	1.5
+++ kbibtex.spec	29 Oct 2006 14:33:07 -0000	1.6
@@ -7,6 +7,9 @@
 License:	GPL
 URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
 Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
+Patch0:		kbibtex-0.1.5-filteredselection.patch
+Patch1:		kbibtex-0.1.5-gcc4.2.patch
+Patch2:		kbibtex-0.1.5-viewdocument.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -19,7 +22,9 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .filteredselection
+%patch1 -p0 -b .gcc4.2
+%patch2	-p0 -b .viewdocument
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -114,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
+- latest released patches (filteredselection,gcc4.2,viewdocument)
+
 * Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
 - Update to 1.5.0
 



From fedora-extras-commits at redhat.com  Sun Oct 29 14:34:55 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sun, 29 Oct 2006 07:34:55 -0700
Subject: rpms/smbldap-tools/FC-6 smbldap-tools.spec,1.3,1.4
Message-ID: <200610291434.k9TEYtil009795@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/smbldap-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9774

Modified Files:
	smbldap-tools.spec 
Log Message:
resync with devel


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/smbldap-tools/FC-6/smbldap-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smbldap-tools.spec	24 Oct 2006 07:37:19 -0000	1.3
+++ smbldap-tools.spec	29 Oct 2006 14:34:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://samba.idealx.org/index.en.html
@@ -10,12 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-# perl(Unicode::MapUTF8) not available on x86_64, see bugs #182514 and #211866
-#BuildArch:	noarch
-ExcludeArch:	x86_64
-# Debuginfo package would be empty as there are no binaries in this package
-%define debug_package %{nil}
+BuildArch:	noarch
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -69,6 +64,10 @@
 %{perl_vendorlib}/smbldap_tools.pm
 
 %changelog
+* Sun Oct 29 2006 Paul Howarth <paul at city-fan.org> 0.9.2-5
+- perl(Unicode::MapUTF8) now available on x86_64, so remove ExcludeArch
+  and revert to noarch package (#211866)
+
 * Mon Oct 23 2006 Paul Howarth <paul at city-fan.org> 0.9.2-4
 - Exclude x86_64 as perl(Unicode::MapUTF8) is unavailable (#211866)
 - A consequence of this is that the package can no longer be noarch



From fedora-extras-commits at redhat.com  Sun Oct 29 14:35:50 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:35:50 -0700
Subject: rpms/kbibtex/FC-5 kbibtex.spec,1.6,1.7
Message-ID: <200610291435.k9TEZojY009857@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9801

Modified Files:
	kbibtex.spec 
Log Message:
- corrected wrong release ver



Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kbibtex.spec	29 Oct 2006 14:33:07 -0000	1.6
+++ kbibtex.spec	29 Oct 2006 14:35:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors



From fedora-extras-commits at redhat.com  Sun Oct 29 14:41:00 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:41:00 -0700
Subject: rpms/kbibtex/FC-4 kbibtex.spec,1.3,1.4
Message-ID: <200610291441.k9TEf0Nr009941@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9914

Modified Files:
	kbibtex.spec 
Log Message:
- applied latest official kbibtex patch-set



Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/kbibtex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbibtex.spec	18 Oct 2006 11:55:09 -0000	1.3
+++ kbibtex.spec	29 Oct 2006 14:40:30 -0000	1.4
@@ -1,12 +1,15 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
 Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
+Patch0:		kbibtex-0.1.5-filteredselection.patch
+Patch1:		kbibtex-0.1.5-gcc4.2.patch
+Patch2:		kbibtex-0.1.5-viewdocument.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -19,7 +22,9 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .filteredselection
+%patch1 -p0 -b .gcc4.2
+%patch2	-p0 -b .viewdocument
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -114,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
+- latest released patches (filteredselection,gcc4.2,viewdocument)
+
 * Wed Oct 16 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
 - Update to 0.1.5
 



From fedora-extras-commits at redhat.com  Sun Oct 29 14:43:08 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:43:08 -0700
Subject: rpms/kbibtex/FC-5 kbibtex-0.1.5-filteredselection.patch, NONE,
	1.1 kbibtex-0.1.5-gcc4.2.patch, NONE,
	1.1 kbibtex-0.1.5-viewdocument.patch, NONE, 1.1
Message-ID: <200610291443.k9TEh8Q8010023@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10012

Added Files:
	kbibtex-0.1.5-filteredselection.patch 
	kbibtex-0.1.5-gcc4.2.patch kbibtex-0.1.5-viewdocument.patch 
Log Message:
- forgotten .patch files


kbibtex-0.1.5-filteredselection.patch:

--- NEW FILE kbibtex-0.1.5-filteredselection.patch ---
Index: src/documentlistview.cpp
===================================================================
--- src/documentlistview.cpp	(Revision 301)
+++ src/documentlistview.cpp	(Revision 302)
@@ -221,10 +221,13 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            m_bibtexFile->deleteElement( kblvi->element() );
-            it++;
-            takeItem( kblvi );
-            delete ( kblvi );
+            if ( kblvi->isVisible() )
+            {
+                m_bibtexFile->deleteElement( kblvi->element() );
+                it++;
+                takeItem( kblvi );
+                delete ( kblvi );
+            }
         }
 
         if ( above )
@@ -246,7 +249,7 @@
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
             BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
-            if ( entry != NULL )
+            if ( entry != NULL && kblvi->isVisible() )
             {
                 if ( !refs.isEmpty() )
                     refs.append( "," );
@@ -621,7 +624,8 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            exporter->save( &buffer, kblvi->element() );
+            if ( kblvi->isVisible() )
+                exporter->save( &buffer, kblvi->element() );
             it++;
         }
         delete exporter;

kbibtex-0.1.5-gcc4.2.patch:

--- NEW FILE kbibtex-0.1.5-gcc4.2.patch ---
Index: src/fileimporter.h
===================================================================
--- src/fileimporter.h	(Revision 307)
+++ src/fileimporter.h	(Arbeitskopie)
@@ -39,7 +39,7 @@
         ~FileImporter();
 
         File* load ( const QString& text );
-        virtual File* load( QIODevice *iodevice ) = NULL;
+        virtual File* load( QIODevice *iodevice ) = 0;
 
         static bool guessCanDecode( const QString & ) { return FALSE; };
 

kbibtex-0.1.5-viewdocument.patch:

--- NEW FILE kbibtex-0.1.5-viewdocument.patch ---
Index: src/documentwidget.h
===================================================================
--- src/documentwidget.h	(Revision 308)
+++ src/documentwidget.h	(Revision 310)
@@ -106,6 +106,7 @@
         int m_newElementCounter;
         EditMode m_editMode;
         KActionMenu *m_viewDocumentActionMenu;
+        QStringList m_viewDocumentActionMenuURLs;
         KActionMenu *m_searchWebsitesActionMenu;
         KAction *m_find;
         KAction *m_findNext;
Index: src/documentwidget.cpp
===================================================================
--- src/documentwidget.cpp	(Revision 308)
+++ src/documentwidget.cpp	(Revision 310)
@@ -471,13 +471,13 @@
         m_listViewElements->setFactory( factory, client );
         m_sourceView->setFactory( factory, client );
 
+        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         if ( m_viewDocumentActionMenu != NULL )
             connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
 
         m_copyReference = client->action( "edit_copyref" );
         m_find = client->action( "edit_find" );
         m_findNext = client->action( "edit_find_next" );
-        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
         m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
     }
@@ -486,6 +486,7 @@
     {
         KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
         popup->clear();
+        m_viewDocumentActionMenuURLs.clear();
 
         BibTeX::Element * currentElement = NULL;
 
@@ -517,6 +518,7 @@
                         popup->insertItem( SmallIcon( "html" ), prettyURL );
                     else
                         popup->insertItem( prettyURL );
+                    m_viewDocumentActionMenuURLs.append( prettyURL );
                 }
                 m_viewDocumentActionMenu->setEnabled( TRUE );
             }
@@ -908,7 +910,7 @@
 
     void DocumentWidget::slotViewDocument( int id )
     {
-        kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
+        kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
     }
 
 }



From fedora-extras-commits at redhat.com  Sun Oct 29 14:44:07 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:44:07 -0700
Subject: rpms/kbibtex/FC-4 kbibtex-0.1.5-filteredselection.patch, NONE,
	1.1 kbibtex-0.1.5-gcc4.2.patch, NONE,
	1.1 kbibtex-0.1.5-viewdocument.patch, NONE, 1.1
Message-ID: <200610291444.k9TEi7Yn010106@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10072

Added Files:
	kbibtex-0.1.5-filteredselection.patch 
	kbibtex-0.1.5-gcc4.2.patch kbibtex-0.1.5-viewdocument.patch 
Log Message:
- forgotten .patch files


kbibtex-0.1.5-filteredselection.patch:

--- NEW FILE kbibtex-0.1.5-filteredselection.patch ---
Index: src/documentlistview.cpp
===================================================================
--- src/documentlistview.cpp	(Revision 301)
+++ src/documentlistview.cpp	(Revision 302)
@@ -221,10 +221,13 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            m_bibtexFile->deleteElement( kblvi->element() );
-            it++;
-            takeItem( kblvi );
-            delete ( kblvi );
+            if ( kblvi->isVisible() )
+            {
+                m_bibtexFile->deleteElement( kblvi->element() );
+                it++;
+                takeItem( kblvi );
+                delete ( kblvi );
+            }
         }
 
         if ( above )
@@ -246,7 +249,7 @@
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
             BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
-            if ( entry != NULL )
+            if ( entry != NULL && kblvi->isVisible() )
             {
                 if ( !refs.isEmpty() )
                     refs.append( "," );
@@ -621,7 +624,8 @@
         while ( it.current() )
         {
             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-            exporter->save( &buffer, kblvi->element() );
+            if ( kblvi->isVisible() )
+                exporter->save( &buffer, kblvi->element() );
             it++;
         }
         delete exporter;

kbibtex-0.1.5-gcc4.2.patch:

--- NEW FILE kbibtex-0.1.5-gcc4.2.patch ---
Index: src/fileimporter.h
===================================================================
--- src/fileimporter.h	(Revision 307)
+++ src/fileimporter.h	(Arbeitskopie)
@@ -39,7 +39,7 @@
         ~FileImporter();
 
         File* load ( const QString& text );
-        virtual File* load( QIODevice *iodevice ) = NULL;
+        virtual File* load( QIODevice *iodevice ) = 0;
 
         static bool guessCanDecode( const QString & ) { return FALSE; };
 

kbibtex-0.1.5-viewdocument.patch:

--- NEW FILE kbibtex-0.1.5-viewdocument.patch ---
Index: src/documentwidget.h
===================================================================
--- src/documentwidget.h	(Revision 308)
+++ src/documentwidget.h	(Revision 310)
@@ -106,6 +106,7 @@
         int m_newElementCounter;
         EditMode m_editMode;
         KActionMenu *m_viewDocumentActionMenu;
+        QStringList m_viewDocumentActionMenuURLs;
         KActionMenu *m_searchWebsitesActionMenu;
         KAction *m_find;
         KAction *m_findNext;
Index: src/documentwidget.cpp
===================================================================
--- src/documentwidget.cpp	(Revision 308)
+++ src/documentwidget.cpp	(Revision 310)
@@ -471,13 +471,13 @@
         m_listViewElements->setFactory( factory, client );
         m_sourceView->setFactory( factory, client );
 
+        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         if ( m_viewDocumentActionMenu != NULL )
             connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
 
         m_copyReference = client->action( "edit_copyref" );
         m_find = client->action( "edit_find" );
         m_findNext = client->action( "edit_find_next" );
-        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
         m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
         m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
     }
@@ -486,6 +486,7 @@
     {
         KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
         popup->clear();
+        m_viewDocumentActionMenuURLs.clear();
 
         BibTeX::Element * currentElement = NULL;
 
@@ -517,6 +518,7 @@
                         popup->insertItem( SmallIcon( "html" ), prettyURL );
                     else
                         popup->insertItem( prettyURL );
+                    m_viewDocumentActionMenuURLs.append( prettyURL );
                 }
                 m_viewDocumentActionMenu->setEnabled( TRUE );
             }
@@ -908,7 +910,7 @@
 
     void DocumentWidget::slotViewDocument( int id )
     {
-        kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
+        kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
     }
 
 }



From fedora-extras-commits at redhat.com  Sun Oct 29 14:44:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 29 Oct 2006 07:44:31 -0700
Subject: rpms/xchat-gnome/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xchat-gnome-config.patch, 1.6, 1.7 xchat-gnome.spec, 1.29, 1.30
Message-ID: <200610291444.k9TEiV4T010131@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10076

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
- Update to 0.15.
- Add new icons.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Oct 2006 13:50:34 -0000	1.12
+++ .cvsignore	29 Oct 2006 14:44:00 -0000	1.13
@@ -1 +1 @@
-xchat-gnome-0.14.tar.bz2
+xchat-gnome-0.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Oct 2006 13:50:34 -0000	1.12
+++ sources	29 Oct 2006 14:44:00 -0000	1.13
@@ -1 +1 @@
-8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2
+a0f1f011e594d85a5a5781cfc5f52221  xchat-gnome-0.15.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome-config.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-gnome-config.patch	27 Oct 2006 13:50:34 -0000	1.6
+++ xchat-gnome-config.patch	29 Oct 2006 14:44:00 -0000	1.7
@@ -1,6 +1,7 @@
-diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
---- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
-+++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
+Only in xchat-gnome-0.15/plugins/python: #python.c#
+diff -ur xchat-gnome-0.15.OLD/src/common/cfgfiles.c xchat-gnome-0.15/src/common/cfgfiles.c
+--- xchat-gnome-0.15.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.15/src/common/cfgfiles.c	2006-10-29 00:12:49.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -19,21 +20,11 @@
  	}
  }
  
-diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
---- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
-+++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
-@@ -100,7 +100,7 @@
- void fe_get_int (char *prompt, int def, void *callback, void *ud);
- #define FRF_WRITE 1	/* save file */
- #define FRF_MULTIPLE 2	/* multi-select */
--#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
-+#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
- #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
- #define FRF_FILTERISINITIAL 16	/* unused */
- #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
-diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
-+++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+Only in xchat-gnome-0.15/src/common: cfgfiles.c~
+Only in xchat-gnome-0.15/src/common: #fe.h#
+diff -ur xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-28 01:48:21.000000000 -0400
++++ xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c	2006-10-29 00:13:17.000000000 -0400
 @@ -184,7 +184,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
@@ -43,7 +34,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -347,7 +347,7 @@
+@@ -346,7 +346,7 @@
  #endif
  
  	homedir = g_get_home_dir ();
@@ -52,3 +43,4 @@
  	pageref = page;
  	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
  	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
+Only in xchat-gnome-0.15/src/fe-gnome: preferences-page-plugins.c~


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xchat-gnome.spec	27 Oct 2006 13:50:34 -0000	1.29
+++ xchat-gnome.spec	29 Oct 2006 14:44:00 -0000	1.30
@@ -1,7 +1,7 @@
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
@@ -74,7 +74,7 @@
 %pre
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
     	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
@@ -122,7 +122,11 @@
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}-*.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}-*.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-plugin.svg
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -133,6 +137,10 @@
 
 
 %changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
+- Update to 0.15.
+- Add new icons.
+
 * Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
 - Update to 0.14.
 - Remove xchat-gnome-remote.



From fedora-extras-commits at redhat.com  Sun Oct 29 14:47:31 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 07:47:31 -0700
Subject: rpms/kbibtex/FC-5 kbibtex.spec,1.7,1.8
Message-ID: <200610291447.k9TElVpQ010220@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10190

Modified Files:
	kbibtex.spec 
Log Message:
- release bump for rebuild (forgotten patches (forgotten patches)



Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kbibtex.spec	29 Oct 2006 14:35:20 -0000	1.7
+++ kbibtex.spec	29 Oct 2006 14:47:01 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
@@ -119,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-3
+- rebuild (patches were not checked in)
+
 * Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
 - latest released patches (filteredselection,gcc4.2,viewdocument)
 



From fedora-extras-commits at redhat.com  Sun Oct 29 15:14:29 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sun, 29 Oct 2006 08:14:29 -0700
Subject: rpms/poedit/FC-5 .cvsignore, 1.2, 1.3 poedit.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200610291514.k9TFETCx013421@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13362/FC-5

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 15:41:45 -0000	1.2
+++ .cvsignore	29 Oct 2006 15:13:58 -0000	1.3
@@ -1 +1 @@
-poedit-1.3.4.tar.gz
+poedit-1.3.5.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/poedit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poedit.spec	20 Jun 2006 15:41:45 -0000	1.1
+++ poedit.spec	29 Oct 2006 15:13:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.3.4
-Release:        2%{?dist}
+Version:        1.3.5
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -37,24 +37,14 @@
 rm -rf \
 	$RPM_BUILD_ROOT%{_datadir}/applnk \
 	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/icons \
 	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps
-mkdir -p -m 0755 \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk/application
-cp -a src/icons/appicon/poedit.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-cp -a src/icons/appicon/poedit.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-sed -i -e 's|poedit.png|poedit.svg|g' install/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    install/poedit.desktop
-cp -a install/x-po.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
+    $RPM_BUILD_ROOT%{_datadir}/applications/poedit.desktop
 %{find_lang} poedit
 
 
@@ -83,14 +73,19 @@
 %doc NEWS TODO README COPYING AUTHORS docs/*.txt docs/en
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/icons/hicolor/*.png
-%{_datadir}/pixmaps/*.svg
+%{_datadir}/icons/hicolor/*/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man?/*
 %{_datadir}/poedit
 
 
 %changelog
+* Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
+- Upstream 1.3.5
+
+* Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.4-2.1
+- FC6 rebuild
+
 * Wed May 24 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.4-2
 - Remove any potential places where makefile may create copies of 
   .desktop files and icons.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 15:41:45 -0000	1.2
+++ sources	29 Oct 2006 15:13:58 -0000	1.3
@@ -1 +1 @@
-e76a84ae4be4ad9d9a176fd8a1a2effb  poedit-1.3.4.tar.gz
+e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 15:14:29 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sun, 29 Oct 2006 08:14:29 -0700
Subject: rpms/poedit/FC-6 .cvsignore, 1.2, 1.3 poedit.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610291514.k9TFETgQ013426@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13362/FC-6

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 15:41:45 -0000	1.2
+++ .cvsignore	29 Oct 2006 15:13:59 -0000	1.3
@@ -1 +1 @@
-poedit-1.3.4.tar.gz
+poedit-1.3.5.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/poedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poedit.spec	3 Sep 2006 18:09:53 -0000	1.2
+++ poedit.spec	29 Oct 2006 15:13:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.3.4
-Release:        2.1%{?dist}
+Version:        1.3.5
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -37,24 +37,14 @@
 rm -rf \
 	$RPM_BUILD_ROOT%{_datadir}/applnk \
 	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/icons \
 	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps
-mkdir -p -m 0755 \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk/application
-cp -a src/icons/appicon/poedit.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-cp -a src/icons/appicon/poedit.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-sed -i -e 's|poedit.png|poedit.svg|g' install/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    install/poedit.desktop
-cp -a install/x-po.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
+    $RPM_BUILD_ROOT%{_datadir}/applications/poedit.desktop
 %{find_lang} poedit
 
 
@@ -83,14 +73,16 @@
 %doc NEWS TODO README COPYING AUTHORS docs/*.txt docs/en
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/icons/hicolor/*.png
-%{_datadir}/pixmaps/*.svg
+%{_datadir}/icons/hicolor/*/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man?/*
 %{_datadir}/poedit
 
 
 %changelog
+* Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
+- Upstream 1.3.5
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.4-2.1
 - FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 15:41:45 -0000	1.2
+++ sources	29 Oct 2006 15:13:59 -0000	1.3
@@ -1 +1 @@
-e76a84ae4be4ad9d9a176fd8a1a2effb  poedit-1.3.4.tar.gz
+e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 15:14:30 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sun, 29 Oct 2006 08:14:30 -0700
Subject: rpms/poedit/devel .cvsignore, 1.2, 1.3 poedit.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200610291514.k9TFEUg1013431@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13362/devel

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 15:41:45 -0000	1.2
+++ .cvsignore	29 Oct 2006 15:14:00 -0000	1.3
@@ -1 +1 @@
-poedit-1.3.4.tar.gz
+poedit-1.3.5.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/poedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poedit.spec	3 Sep 2006 18:09:53 -0000	1.2
+++ poedit.spec	29 Oct 2006 15:14:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        1.3.4
-Release:        2.1%{?dist}
+Version:        1.3.5
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -37,24 +37,14 @@
 rm -rf \
 	$RPM_BUILD_ROOT%{_datadir}/applnk \
 	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/icons \
 	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps
-mkdir -p -m 0755 \
-	$RPM_BUILD_ROOT%{_datadir}/pixmaps \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk/application
-cp -a src/icons/appicon/poedit.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-cp -a src/icons/appicon/poedit.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-sed -i -e 's|poedit.png|poedit.svg|g' install/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    install/poedit.desktop
-cp -a install/x-po.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
+    $RPM_BUILD_ROOT%{_datadir}/applications/poedit.desktop
 %{find_lang} poedit
 
 
@@ -83,14 +73,16 @@
 %doc NEWS TODO README COPYING AUTHORS docs/*.txt docs/en
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/icons/hicolor/*.png
-%{_datadir}/pixmaps/*.svg
+%{_datadir}/icons/hicolor/*/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man?/*
 %{_datadir}/poedit
 
 
 %changelog
+* Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
+- Upstream 1.3.5
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.4-2.1
 - FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 15:41:45 -0000	1.2
+++ sources	29 Oct 2006 15:14:00 -0000	1.3
@@ -1 +1 @@
-e76a84ae4be4ad9d9a176fd8a1a2effb  poedit-1.3.4.tar.gz
+e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 15:15:54 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Sun, 29 Oct 2006 08:15:54 -0700
Subject: rpms/kbibtex/FC-4 kbibtex.spec,1.4,1.5
Message-ID: <200610291515.k9TFFsXQ013536@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13480

Modified Files:
	kbibtex.spec 
Log Message:
bumped the release ver because for rebuild (forgotten patches)



Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/kbibtex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kbibtex.spec	29 Oct 2006 14:40:30 -0000	1.4
+++ kbibtex.spec	29 Oct 2006 15:15:23 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		kbibtex
 Version:	0.1.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
@@ -119,6 +119,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-3
+- rebuild (patches were not checked in)
+
 * Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
 - latest released patches (filteredselection,gcc4.2,viewdocument)
 



From fedora-extras-commits at redhat.com  Sun Oct 29 15:26:47 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 29 Oct 2006 08:26:47 -0700
Subject: rpms/mail-notification/devel mail-notification.spec,1.29,1.30
Message-ID: <200610291526.k9TFQlPu013695@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13673

Modified Files:
	mail-notification.spec 
Log Message:
3.0-8 -- add workaround that hacks configure to allow building with evo 2.10


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mail-notification.spec	2 Sep 2006 11:14:38 -0000	1.29
+++ mail-notification.spec	29 Oct 2006 15:26:17 -0000	1.30
@@ -1,6 +1,8 @@
+# FIXME -- remove evo 2.10 workaround
+
 Name:           mail-notification
 Version:        3.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -54,6 +56,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1} ./README.FEDORA
+# FIXME -- quick workaround for now
+sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
 
 %build
 %configure --disable-schemas-install  --enable-evolution
@@ -127,6 +131,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  3.0-8
+- add workaround that hacks configure to allow building with evo 2.10
+
 * Sat Sep 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  3.0-7
 - don't run mail-notification with unset-obsolete-configuration at all
 



From fedora-extras-commits at redhat.com  Sun Oct 29 15:55:41 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Sun, 29 Oct 2006 08:55:41 -0700
Subject: rpms/licq/FC-6 .cvsignore, 1.3, 1.4 licq.spec, 1.11, 1.12 sources,
	1.3, 
	1.4 licq-1.3.2-gcc-4_1-patch, 1.1, NONE licq-1.3.2-libdir.patch,
	1.1, NONE licq-1.3.2-viewUrl.patch, 1.1, NONE
Message-ID: <200610291555.k9TFtfKf013918@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13892

Modified Files:
	.cvsignore licq.spec sources 
Removed Files:
	licq-1.3.2-gcc-4_1-patch licq-1.3.2-libdir.patch 
	licq-1.3.2-viewUrl.patch 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/licq/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2006 13:51:41 -0000	1.3
+++ .cvsignore	29 Oct 2006 15:55:10 -0000	1.4
@@ -1,2 +1 @@
-licq-1.3.2.tar.bz2
-licq-viewurl.sh
+licq-1.3.4.tar.gz


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/FC-6/licq.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- licq.spec	4 Oct 2006 23:03:17 -0000	1.11
+++ licq.spec	29 Oct 2006 15:55:10 -0000	1.12
@@ -1,9 +1,8 @@
 Name: licq
-Version: 1.3.2
-Release: 11
+Version: 1.3.4
+Release: 2%{?dist}
 License: GPL
-Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
-Source1: licq-viewurl.sh
+Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/
 Summary: Licq - A graphical ICQ Client for Linux
 Group: Applications/Internet
@@ -15,9 +14,6 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gettext, automake, libtool
-Patch1: licq-1.3.2-gcc-4_1-patch
-Patch2: licq-1.3.2-libdir.patch
-Patch3: licq-1.3.2-viewUrl.patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -48,15 +44,14 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc-4_1
-%patch2 -p1 -b .libdir
-%patch3 -p1 -b .viewUrl
 
 #remove cvs stuff
 rm -rf `find . -name CVS`
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+export KDEDIR=/usr/%_lib
+
 sed -i s/lib/%{_lib}/ include/licq_constants.h
 %configure
 make
@@ -67,12 +62,9 @@
   automake
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
-  export KDEDIR=/usr/%_lib
   %configure \
      --with-kde \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/
   make
 cd ../qt-gui
   aclocal
@@ -80,19 +72,10 @@
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
   %configure \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/ \
   make
-  #create Qt qm files
-  cd po
-  lrelease *.ts
-cd ../../osd
-  rm -rf autom4te.cache
-  sed -i s/aclocal-1.7/aclocal/ build
-  sed -i s/automake-1.7/automake/ build
-  ./build
-  %configure --libdir=%{_libdir}/licq
+cd ../osd
+  %configure --libdir=%{_libdir}/
   make
 
 %install
@@ -102,7 +85,6 @@
 cd plugins/qt-gui
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         share/licq.desktop
 make install
 %find_lang licq
@@ -111,16 +93,13 @@
 cd ../osd
 make install
 
-#install url viewer
-install -m755 %SOURCE1 %buildroot/%_bindir/licq-viewurl.sh
-
 %find_lang licq_osd_plugin
 
 #remove devel 
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
-#remove licq.desktop installed by makefile
-rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/kde/licq.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +113,8 @@
 %{_bindir}/viewurl-netscape.sh
 %{_bindir}/viewurl-opera.sh
 %{_bindir}/viewurl-w3m.sh
-%attr(0755,root,root) %_bindir/licq-viewurl.sh
+%{_bindir}/viewurl-firefox.sh
+%{_bindir}/viewurl-seamonkey.sh
 %dir %{_libdir}/licq
 %{_libdir}/licq/licq_qt-gui.so
 %{_datadir}/licq
@@ -157,7 +137,7 @@
 %lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
 %lang(uk) %{_datadir}/licq/qt-gui/locale/uk.qm
 %{_datadir}/applications/fedora-licq.desktop
-%doc doc/ upgrade/ ChangeLog README* LICENSE
+%doc doc/ upgrade/ README* LICENSE
 
 %files kde
 %defattr(-,root,root)
@@ -170,8 +150,11 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.2-11
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Sun Sep 29 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-2
+- fix desktop-file-install
+
+* Fri Sep 27 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-1
+- upgrade
 
 * Mon Sep 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-10
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2006 13:51:41 -0000	1.3
+++ sources	29 Oct 2006 15:55:10 -0000	1.4
@@ -1,2 +1 @@
-0471bb8fed91eefb23dfe153c9a4a806  licq-1.3.2.tar.bz2
-b5d06b8482e9f73c3889d0b445aace00  licq-viewurl.sh
+34a51541173a2ba453b5984b52bfa489  licq-1.3.4.tar.gz


--- licq-1.3.2-gcc-4_1-patch DELETED ---


--- licq-1.3.2-libdir.patch DELETED ---


--- licq-1.3.2-viewUrl.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 16:08:10 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Sun, 29 Oct 2006 09:08:10 -0700
Subject: rpms/licq/devel licq.spec,1.13,1.14
Message-ID: <200610291608.k9TG8Ajw017051@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16962

Modified Files:
	licq.spec 
Log Message:
add dist tag



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- licq.spec	28 Oct 2006 13:30:42 -0000	1.13
+++ licq.spec	29 Oct 2006 16:07:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.4
-Release: 2
+Release: 2%{?dist}
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/



From fedora-extras-commits at redhat.com  Sun Oct 29 17:33:21 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 10:33:21 -0700
Subject: rpms/grhino/FC-6 grhino-Makefile-in.patch, 1.2, 1.3 grhino.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200610291733.k9THXLgB020671@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20638

Modified Files:
	grhino.spec sources 
Added Files:
	grhino-Makefile-in.patch 
Log Message:
Reverting to 0.15.0 for now until build problem inside mock fixed


grhino-Makefile-in.patch:

Index: grhino-Makefile-in.patch
===================================================================
RCS file: grhino-Makefile-in.patch
diff -N grhino-Makefile-in.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ grhino-Makefile-in.patch	29 Oct 2006 17:32:50 -0000	1.3
@@ -0,0 +1,152 @@
+diff -ru grhino-0.15.0-orig/Makefile.in grhino-0.15.0/Makefile.in
+--- grhino-0.15.0-orig/Makefile.in	2005-04-15 09:03:04.000000000 -0500
++++ grhino-0.15.0/Makefile.in	2005-08-20 16:33:54.000000000 -0500
+@@ -444,82 +444,82 @@
+ 	$(adBeginSubdir) $@ $(adEndSubdir)
+ 
+ install_mkdir :
+-	if [ ! -e "$(bindir)" ]; then		\
+-		mkdir -p "$(bindir)";		\
+-		chmod 755 "$(bindir)";		\
+-	fi
+-	if [ ! -e "$(pattern_dir)" ]; then	\
+-		mkdir -p "$(pattern_dir)";	\
+-		chmod 755 "$(pattern_dir)";	\
+-	fi
+-	if [ ! -e "$(book_dir)" ]; then		\
+-		mkdir -p "$(book_dir)";		\
+-		chmod 755 "$(book_dir)";	\
+-	fi
+-	if [ ! -e "$(theme_dir)" ]; then	\
+-		mkdir -p "$(theme_dir)";	\
+-		chmod 755 "$(theme_dir)";	\
+-	fi
+-	if [ ! -e "$(theme_dir)/small" ]; then	\
+-		mkdir -p "$(theme_dir)/small";	\
+-		chmod 755 "$(theme_dir)/small";	\
+-	fi
+-	if [ ! -e "$(helpdir)" ]; then		\
+-		mkdir -p "$(helpdir)";		\
+-		chmod 755 "$(helpdir)";		\
+-	fi
+-	if [ ! -e "$(helpdir)/C" ]; then	\
+-		mkdir -p "$(helpdir)/C";	\
+-		chmod 755 "$(helpdir)/C";	\
+-	fi
+-	if [ ! -e "$(helpdir)/C/figures" ]; then  \
+-		mkdir -p "$(helpdir)/C/figures";  \
+-		chmod 755 "$(helpdir)/C/figures"; \
++	if [ ! -e "$(DESTDIR)$(bindir)" ]; then		\
++		mkdir -p "$(DESTDIR)$(bindir)";		\
++		chmod 755 "$(DESTDIR)$(bindir)";		\
++	fi
++	if [ ! -e "$(DESTDIR)$(pattern_dir)" ]; then	\
++		mkdir -p "$(DESTDIR)$(pattern_dir)";	\
++		chmod 755 "$(DESTDIR)$(pattern_dir)";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(book_dir)" ]; then		\
++		mkdir -p "$(DESTDIR)$(book_dir)";		\
++		chmod 755 "$(DESTDIR)$(book_dir)";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(theme_dir)" ]; then	\
++		mkdir -p "$(DESTDIR)$(theme_dir)";	\
++		chmod 755 "$(DESTDIR)$(theme_dir)";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(theme_dir)/small" ]; then	\
++		mkdir -p "$(DESTDIR)$(theme_dir)/small";	\
++		chmod 755 "$(DESTDIR)$(theme_dir)/small";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(helpdir)" ]; then		\
++		mkdir -p "$(DESTDIR)$(helpdir)";		\
++		chmod 755 "$(DESTDIR)$(helpdir)";		\
++	fi
++	if [ ! -e "$(DESTDIR)$(helpdir)/C" ]; then	\
++		mkdir -p "$(DESTDIR)$(helpdir)/C";	\
++		chmod 755 "$(DESTDIR)$(helpdir)/C";	\
++	fi
++	if [ ! -e "$(DESTDIR)$(helpdir)/C/figures" ]; then  \
++		mkdir -p "$(DESTDIR)$(helpdir)/C/figures";  \
++		chmod 755 "$(DESTDIR)$(helpdir)/C/figures"; \
+ 	fi
+ 
+ install : install_mkdir
+-	-$(INSTALL_PROGRAM) grhino "$(bindir)/grhino"
+-	-$(INSTALL_PROGRAM) gtp-rhino "$(bindir)/gtp-rhino"
+-	$(INSTALL_DATA) "$(srcdir)/row1.bin" "$(pattern_dir)/row1.bin"
+-	$(INSTALL_DATA) "$(srcdir)/row2.bin" "$(pattern_dir)/row2.bin"
+-	$(INSTALL_DATA) "$(srcdir)/row3.bin" "$(pattern_dir)/row3.bin"
+-	$(INSTALL_DATA) "$(srcdir)/row4.bin" "$(pattern_dir)/row4.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(pattern_dir)/diag1.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(pattern_dir)/diag2.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(pattern_dir)/diag3.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(pattern_dir)/diag4.bin"
+-	$(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(pattern_dir)/diag5.bin"
+-	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(pattern_dir)/corner5x2.bin"
+-	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(book_dir)/book.bin"
+-	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(helpdir)/C/legal.xml"
+-	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
+-		"$(srcdir)/help/C/grhino-C.omf.in" "$(helpdir)/C/grhino-C.omf"
+-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(helpdir)/C/grhino.xml"
++	-$(INSTALL_PROGRAM) grhino "$(DESTDIR)$(bindir)/grhino"
++	-$(INSTALL_PROGRAM) gtp-rhino "$(DESTDIR)$(bindir)/gtp-rhino"
++	$(INSTALL_DATA) "$(srcdir)/row1.bin" "$(DESTDIR)$(pattern_dir)/row1.bin"
++	$(INSTALL_DATA) "$(srcdir)/row2.bin" "$(DESTDIR)$(pattern_dir)/row2.bin"
++	$(INSTALL_DATA) "$(srcdir)/row3.bin" "$(DESTDIR)$(pattern_dir)/row3.bin"
++	$(INSTALL_DATA) "$(srcdir)/row4.bin" "$(DESTDIR)$(pattern_dir)/row4.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(DESTDIR)$(pattern_dir)/diag1.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(DESTDIR)$(pattern_dir)/diag2.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(DESTDIR)$(pattern_dir)/diag3.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(DESTDIR)$(pattern_dir)/diag4.bin"
++	$(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(DESTDIR)$(pattern_dir)/diag5.bin"
++	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
++	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
++	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
++	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
++		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
++	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
+-		"$(helpdir)/C/figures/gamelist.png"
++		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \
+-		"$(helpdir)/C/figures/history.png"
++		"$(DESTDIR)$(helpdir)/C/figures/history.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/mainwindow.png" \
+-		"$(helpdir)/C/figures/mainwindow.png"
++		"$(DESTDIR)$(helpdir)/C/figures/mainwindow.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/pattern.png" \
+-		"$(helpdir)/C/figures/pattern.png"
++		"$(DESTDIR)$(helpdir)/C/figures/pattern.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-ai.png" \
+-		"$(helpdir)/C/figures/prefs-ai.png"
++		"$(DESTDIR)$(helpdir)/C/figures/prefs-ai.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-board.png" \
+-		"$(helpdir)/C/figures/prefs-board.png"
++		"$(DESTDIR)$(helpdir)/C/figures/prefs-board.png"
+ 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-theme.png" \
+-		"$(helpdir)/C/figures/prefs-theme.png"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(theme_dir)/small/black.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(theme_dir)/small/black_last.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(theme_dir)/small/bottom.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(theme_dir)/small/empty.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(theme_dir)/small/hint_black.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(theme_dir)/small/hint_white.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(theme_dir)/small/left.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(theme_dir)/small/right.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(theme_dir)/small/top.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(theme_dir)/small/white.xpm"
+-	$(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(theme_dir)/small/white_last.xpm"
++		"$(DESTDIR)$(helpdir)/C/figures/prefs-theme.png"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(DESTDIR)$(theme_dir)/small/black.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(DESTDIR)$(theme_dir)/small/black_last.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(DESTDIR)$(theme_dir)/small/bottom.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(DESTDIR)$(theme_dir)/small/empty.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(DESTDIR)$(theme_dir)/small/hint_black.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(DESTDIR)$(theme_dir)/small/hint_white.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(DESTDIR)$(theme_dir)/small/left.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(DESTDIR)$(theme_dir)/small/right.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(DESTDIR)$(theme_dir)/small/top.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(DESTDIR)$(theme_dir)/small/white.xpm"
++	$(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(DESTDIR)$(theme_dir)/small/white_last.xpm"
+ 	if [ ! "@GMSGFMT@" = ":" ]; then				 \
+ 		cd po;							 \
+ 		$(MAKE) prefix="$(prefix)" DESTDIR="$(DESTDIR)" install; \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	10 Oct 2006 01:06:57 -0000	1.6
+++ grhino.spec	29 Oct 2006 17:32:50 -0000	1.7
@@ -1,20 +1,20 @@
 Name:           grhino
-Version:        0.15.2
-Release:        2%{?dist}
+Version:        0.15.0
+Release:        6%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
+#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
+Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-Makefile-in.patch
 Patch1:		grhino-configure-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -38,7 +38,7 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 
 
@@ -86,11 +86,8 @@
 
 
 %changelog
-* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
-- BuildRequire on gettext
-
-* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
-- Update to 0.15.2
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-6
+- Rebuild for Fedora Extras 6
 
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:36 -0000	1.5
+++ sources	29 Oct 2006 17:32:50 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2



From fedora-extras-commits at redhat.com  Sun Oct 29 17:54:14 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Sun, 29 Oct 2006 10:54:14 -0700
Subject: owners owners.list,1.1877,1.1878
Message-ID: <200610291754.k9THsETk020992@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20971

Modified Files:
	owners.list 
Log Message:
Taking duplicity as per Michaels okay...



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1877
retrieving revision 1.1878
diff -u -r1.1877 -r1.1878
--- owners.list	29 Oct 2006 04:28:43 -0000	1.1877
+++ owners.list	29 Oct 2006 17:53:44 -0000	1.1878
@@ -314,7 +314,7 @@
 Fedora Extras|dstat|System Status Monitor|scott at perturb.org|extras-qa at fedoraproject.org|
 Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dx|Open source version of IBM's Visualization Data Explorer|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Oct 29 17:57:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 29 Oct 2006 10:57:14 -0700
Subject: rpms/xchat-gnome/FC-6 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xchat-gnome-config.patch, 1.6, 1.7 xchat-gnome.spec, 1.29, 1.30
Message-ID: <200610291757.k9THvEbJ021072@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21041

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
- Update to 0.15.
- Add new icons.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Oct 2006 14:11:24 -0000	1.12
+++ .cvsignore	29 Oct 2006 17:56:44 -0000	1.13
@@ -1 +1 @@
-xchat-gnome-0.14.tar.bz2
+xchat-gnome-0.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Oct 2006 14:11:24 -0000	1.12
+++ sources	29 Oct 2006 17:56:44 -0000	1.13
@@ -1 +1 @@
-8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2
+a0f1f011e594d85a5a5781cfc5f52221  xchat-gnome-0.15.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome-config.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-gnome-config.patch	27 Oct 2006 14:11:24 -0000	1.6
+++ xchat-gnome-config.patch	29 Oct 2006 17:56:44 -0000	1.7
@@ -1,6 +1,7 @@
-diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
---- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
-+++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
+Only in xchat-gnome-0.15/plugins/python: #python.c#
+diff -ur xchat-gnome-0.15.OLD/src/common/cfgfiles.c xchat-gnome-0.15/src/common/cfgfiles.c
+--- xchat-gnome-0.15.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.15/src/common/cfgfiles.c	2006-10-29 00:12:49.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -19,21 +20,11 @@
  	}
  }
  
-diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
---- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
-+++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
-@@ -100,7 +100,7 @@
- void fe_get_int (char *prompt, int def, void *callback, void *ud);
- #define FRF_WRITE 1	/* save file */
- #define FRF_MULTIPLE 2	/* multi-select */
--#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
-+#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
- #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
- #define FRF_FILTERISINITIAL 16	/* unused */
- #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
-diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
-+++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+Only in xchat-gnome-0.15/src/common: cfgfiles.c~
+Only in xchat-gnome-0.15/src/common: #fe.h#
+diff -ur xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-28 01:48:21.000000000 -0400
++++ xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c	2006-10-29 00:13:17.000000000 -0400
 @@ -184,7 +184,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
@@ -43,7 +34,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -347,7 +347,7 @@
+@@ -346,7 +346,7 @@
  #endif
  
  	homedir = g_get_home_dir ();
@@ -52,3 +43,4 @@
  	pageref = page;
  	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
  	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
+Only in xchat-gnome-0.15/src/fe-gnome: preferences-page-plugins.c~


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xchat-gnome.spec	27 Oct 2006 14:11:24 -0000	1.29
+++ xchat-gnome.spec	29 Oct 2006 17:56:44 -0000	1.30
@@ -1,7 +1,7 @@
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
@@ -74,7 +74,7 @@
 %pre
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
     	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
@@ -122,7 +122,11 @@
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}-*.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}-*.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-plugin.svg
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -133,6 +137,10 @@
 
 
 %changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
+- Update to 0.15.
+- Add new icons.
+
 * Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
 - Update to 0.14.
 - Remove xchat-gnome-remote.



From fedora-extras-commits at redhat.com  Sun Oct 29 17:58:17 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 29 Oct 2006 10:58:17 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py, 1.10,
	1.11 Push.py, 1.10, 1.11
Message-ID: <200610291758.k9THwHfu021150@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21083

Modified Files:
	Config_Extras.py Push.py 
Log Message:
No need to set up ~/.rpmmacros just for this.



Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Config_Extras.py	28 Oct 2006 22:52:30 -0000	1.10
+++ Config_Extras.py	29 Oct 2006 17:58:15 -0000	1.11
@@ -28,7 +28,6 @@
     mail = True
     repoprune = True
     repoview = True
-    signkeycheck = True
     doublesync = False
 
 top_workdir = '/srv/rpmbuild'


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Push.py	25 Oct 2006 23:55:42 -0000	1.10
+++ Push.py	29 Oct 2006 17:58:15 -0000	1.11
@@ -262,7 +262,7 @@
     return hdr['excludearch']
 
 
-def sign_pkgs(filelist):
+def sign_pkgs(filelist,keyname):
     """gpg sign all the rpms"""
     numfiles = len(filelist)
     if numfiles < 1:
@@ -280,7 +280,7 @@
             filelist = []
     
         foo = string.join(files)
-        result = os.system('echo %s | xargs rpm --resign' % foo)
+        result = os.system('echo %s | xargs rpm --define "_signature gpg" --define "_gpg_name %s" --resign' % (foo,keyname))
         if result != 0:
             return result
         numfiles = len(filelist)
@@ -484,7 +484,7 @@
 
     try:
         print "Signing Packages:"
-        rv = sign_pkgs( find_files(signtmpdir,'*.rpm') )
+        rv = sign_pkgs( find_files(signtmpdir,'*.rpm'), cfg.signkeyname )
         if rv:
             print "Error signing packages! Please be patient - cleaning up."
             raise Exception
@@ -582,10 +582,6 @@
 
     os.umask(cfg.signersumask)
     Utils.signer_gid_check(cfg.signersgid)
-    if cfg.opts.signkeycheck:
-        if cfg.signkeyname != os.popen('rpm --eval %_gpg_name','r').read().rstrip():
-            print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!'
-            sys.exit(errno.EPERM)
 
     if '-f' in sys.argv[2:]:
         sys.argv.remove('-f')



From fedora-extras-commits at redhat.com  Sun Oct 29 18:01:30 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 11:01:30 -0700
Subject: rpms/wv/FC-4 wv-1.0.3-CVE-2006-4513.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 sources, 1.4, 1.5 wv.spec, 1.11, 1.12
Message-ID: <200610291801.k9TI1Uc1024136@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21208

Modified Files:
	.cvsignore sources wv.spec 
Added Files:
	wv-1.0.3-CVE-2006-4513.patch 
Log Message:
fix CVE-2006-4513

wv-1.0.3-CVE-2006-4513.patch:

--- NEW FILE wv-1.0.3-CVE-2006-4513.patch ---
diff -bruN wv-1.2.2/lfo.c wv-1.2.3/lfo.c
--- wv-1.2.2/lfo.c	2005-04-17 23:16:58.000000000 +0200
+++ wv-1.2.3/lfo.c	2006-10-20 03:48:47.000000000 +0200
@@ -32,6 +32,16 @@
 followed by its corresponding LVL structure (if LFOLVL.fFormatting is set).
 */
 
+static int
+multiplication_will_overflow(U32 a, U32 b)
+{
+  if((a > 0) && (b > 0) && (G_MAXUINT / a) >= b) {
+    return 0;
+  }
+
+  return 1;
+}
+
 int
 wvGetLFO_records (LFO ** lfo, LFOLVL ** lfolvl, LVL ** lvl, U32 * nolfo,
 		  U32 * nooflvl, U32 offset, U32 len, wvStream * fd)
@@ -49,7 +59,9 @@
     wvTrace (("pos %x %d\n", wvStream_tell (fd), *nooflvl));
     wvTrace (("nolfo is %d nooflvl is %d\n", *nolfo, *nooflvl));
 
-    if (*nooflvl == 0)
+    if ((*nooflvl == 0) ||
+	multiplication_will_overflow(sizeof (LFOLVL), *nooflvl) ||
+	multiplication_will_overflow(sizeof (LVL), *nooflvl))
       {
 	  *lfolvl = NULL;
 	  *lvl = NULL;
@@ -101,17 +113,23 @@
 	  *nolfo = read_32ubit (fd);
 	  wvTrace (("%d\n", *nolfo));
 
-	  *lfo = (LFO *) wvMalloc (*nolfo * sizeof (LFO));
+	  /* check for integer overflow */
+	  if (multiplication_will_overflow(*nolfo, sizeof(LFO))) {
+	    wvError (("Malicious document!\n"));			
+	    *nolfo = 0;
+	    return (1);
+	  } else {
+	    *lfo = (LFO *) wvMalloc (*nolfo * sizeof(LFO));
 	  if (*lfo == NULL)
 	    {
-		wvError (
-			 ("NO MEM 1, failed to alloc %d bytes\n",
+		wvError (("NO MEM 1, failed to alloc %d bytes\n",
 			  *nolfo * sizeof (LFO)));
 		return (1);
 	    }
 	  for (i = 0; i < *nolfo; i++)
 	      wvGetLFO (&((*lfo)[i]), fd);
       }
+      }
     return (0);
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Oct 2006 08:53:37 -0000	1.4
+++ .cvsignore	29 Oct 2006 18:00:59 -0000	1.5
@@ -1 +1 @@
-wv-1.2.4.tar.gz
+wv-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Oct 2006 08:53:37 -0000	1.4
+++ sources	29 Oct 2006 18:00:59 -0000	1.5
@@ -1 +1 @@
-c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz
+71e42aa9af1e03cc8c608bbbdcb43af8  wv-1.0.3.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wv.spec	28 Oct 2006 08:53:37 -0000	1.11
+++ wv.spec	29 Oct 2006 18:00:59 -0000	1.12
@@ -1,25 +1,27 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.4
-Release:    1%{?dist}
+Version:    1.0.3
+Release:    2%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
-#Patch0:     wv-wvtext-tmp.patch
-#Patch1:     wv-1.0.3-oledecod.patch
-#Patch2:     wv-1.0.3-gcc4.patch
+Source:     http://dl.sf.net/wvware/wv-1.0.3.tar.gz
+Patch0:     wv-wvtext-tmp.patch
+Patch1:     wv-1.0.3-oledecod.patch
+Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
+Patch6:     wv-1.0.3-CVE-2006-4513.patch
 
+#BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
-BuildRequires: libgsf-devel >= 1.11.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   wvware = %{version}-%{release}
+Provides:   wv-devel = %{version}-%{release}
 
 %description
 Wv is a program that understands the Microsoft Word 6/7/8/9
@@ -27,36 +29,24 @@
 documents into HTML, which can then be read with a browser.
 
 
-%package        devel
-Summary:        MSWord format converter - development files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-Wv is a program that understands the Microsoft Word 6/7/8/9
-binary file format and is able to convert Word
-documents into HTML, which can then be read with a browser.
-This package contains the development files
-
-
 %prep
 %setup -q
 #%patch0
-#%patch1 -p1 -b .oledecod
-#%patch2 -p1 -b .gcc4
+%patch1 -p1 -b .oledecod
+%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
+%patch6 -p1 -b .CVE-2006-4513
 
 
 %build
 %configure --with-exporter \
-           --with-libxml2 \
-           --disable-static
+           --with-libxml2
 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
 
 #ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
@@ -74,40 +64,15 @@
 %doc COPYING README
 %{_bindir}/wv*
 %{_datadir}/wv
-%{_mandir}/man1/*
-%{_libdir}/libwv*.so.*
-
-%files      devel
-%defattr(-,root,root)
 %{_includedir}/wv
-%{_libdir}/libwv*.so
+%{_mandir}/man1/*
+%{_libdir}/libwv*
 %{_libdir}/pkgconfig/*
 
 
 %changelog
-* Sat Oct 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.4-1
-- update to 1.2.4, fixes #212696 (CVE-2006-4513)
-
-* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-7
-- rebuild (releases 1 to 7, cvs problem)
-
-* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.2.1-1
-- version 1.2.1
-
-* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
-- rebuild
-
-* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
-- don't build the static lib
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-2
-- rebuild for FC5
-
-* Fri Nov 11 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-1
-- version 1.2.0
-
-* Fri Oct 28 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-2
-- split out a -devel package (#171962)
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.3-2
+- fix CVE-2006-4513
 
 * Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}
 - new version



From fedora-extras-commits at redhat.com  Sun Oct 29 18:03:24 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 29 Oct 2006 11:03:24 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py, 1.11,
	1.12 Push.py, 1.11, 1.12
Message-ID: <200610291803.k9TI3OKR024211@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24181

Modified Files:
	Config_Extras.py Push.py 
Log Message:
Didn't mean to commit this. Was just testing something with "Config_Test.py"



Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Config_Extras.py	29 Oct 2006 17:58:15 -0000	1.11
+++ Config_Extras.py	29 Oct 2006 18:03:18 -0000	1.12
@@ -28,6 +28,7 @@
     mail = True
     repoprune = True
     repoview = True
+    signkeycheck = True
     doublesync = False
 
 top_workdir = '/srv/rpmbuild'


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Push.py	29 Oct 2006 17:58:15 -0000	1.11
+++ Push.py	29 Oct 2006 18:03:18 -0000	1.12
@@ -262,7 +262,7 @@
     return hdr['excludearch']
 
 
-def sign_pkgs(filelist,keyname):
+def sign_pkgs(filelist):
     """gpg sign all the rpms"""
     numfiles = len(filelist)
     if numfiles < 1:
@@ -280,7 +280,7 @@
             filelist = []
     
         foo = string.join(files)
-        result = os.system('echo %s | xargs rpm --define "_signature gpg" --define "_gpg_name %s" --resign' % (foo,keyname))
+        result = os.system('echo %s | xargs rpm --resign' % foo)
         if result != 0:
             return result
         numfiles = len(filelist)
@@ -484,7 +484,7 @@
 
     try:
         print "Signing Packages:"
-        rv = sign_pkgs( find_files(signtmpdir,'*.rpm'), cfg.signkeyname )
+        rv = sign_pkgs( find_files(signtmpdir,'*.rpm') )
         if rv:
             print "Error signing packages! Please be patient - cleaning up."
             raise Exception
@@ -582,6 +582,10 @@
 
     os.umask(cfg.signersumask)
     Utils.signer_gid_check(cfg.signersgid)
+    if cfg.opts.signkeycheck:
+        if cfg.signkeyname != os.popen('rpm --eval %_gpg_name','r').read().rstrip():
+            print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!'
+            sys.exit(errno.EPERM)
 
     if '-f' in sys.argv[2:]:
         sys.argv.remove('-f')



From fedora-extras-commits at redhat.com  Sun Oct 29 18:46:12 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 29 Oct 2006 11:46:12 -0700
Subject: rpms/liferea/devel liferea.spec,1.54,1.55
Message-ID: <200610291846.k9TIkCS1024580@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24563

Modified Files:
	liferea.spec 
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-2
- Rebuild for new firefox.



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- liferea.spec	27 Oct 2006 15:22:54 -0000	1.54
+++ liferea.spec	29 Oct 2006 18:45:42 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -24,7 +24,7 @@
 BuildRequires:	dbus-devel
 %endif
 
-Requires:	firefox = 1.5.0.7
+Requires:	firefox = 2.0.2
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-2
+- Rebuild for new firefox.
+
 * Fri Oct 27 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-1
 - Update to 1.0.25.
 - Drop X-Fedora category from desktop file.



From fedora-extras-commits at redhat.com  Sun Oct 29 18:46:50 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 29 Oct 2006 11:46:50 -0700
Subject: rpms/wv/FC-4 wv-1.0.3-CVE-2006-4513.patch, 1.1, 1.2 wv.spec, 1.12,
	1.13
Message-ID: <200610291846.k9TIkov6024638@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24586

Modified Files:
	wv-1.0.3-CVE-2006-4513.patch wv.spec 
Log Message:
fix CVE-2006-4513 properly

wv-1.0.3-CVE-2006-4513.patch:

Index: wv-1.0.3-CVE-2006-4513.patch
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv-1.0.3-CVE-2006-4513.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wv-1.0.3-CVE-2006-4513.patch	29 Oct 2006 18:00:59 -0000	1.1
+++ wv-1.0.3-CVE-2006-4513.patch	29 Oct 2006 18:46:19 -0000	1.2
@@ -1,6 +1,5 @@
-diff -bruN wv-1.2.2/lfo.c wv-1.2.3/lfo.c
---- wv-1.2.2/lfo.c	2005-04-17 23:16:58.000000000 +0200
-+++ wv-1.2.3/lfo.c	2006-10-20 03:48:47.000000000 +0200
+--- lfo.c	2005-04-17 23:16:58.000000000 +0200
++++ lfo.c	2006-10-20 03:48:47.000000000 +0200
 @@ -32,6 +32,16 @@
  followed by its corresponding LVL structure (if LFOLVL.fFormatting is set).
  */
@@ -56,3 +55,26 @@
      return (0);
  }
  
+--- wvConfig.c  18 Apr 2005 21:14:48 -0000      1.70
++++ wvConfig.c  25 Oct 2006 11:55:04 -0000      1.71
+@@ -3682,7 +3682,8 @@
+ void
+ wvBeginDocument (expand_data * data)
+ {
+-    if ((data->sd != NULL) && (data->sd->elements[TT_DOCUMENT].str[0] != NULL))
++    if ((data->sd) && (data->sd->elements[TT_DOCUMENT].str)
++       && (data->sd->elements[TT_DOCUMENT].str[0] != NULL))
+       {
+          wvTrace (("doc begin is %s", data->sd->elements[TT_DOCUMENT].str[0]));
+          wvExpand (data, data->sd->elements[TT_DOCUMENT].str[0],
+@@ -3708,7 +3709,8 @@
+     data->props = (void *) &apap;
+     wvEndPara (data);
+ 
+-    if ((data->sd != NULL) && (data->sd->elements[TT_DOCUMENT].str[1] != NULL))
++    if ((data->sd) && (data->sd->elements[TT_DOCUMENT].str)
++       && (data->sd->elements[TT_DOCUMENT].str[1] != NULL))
+       {
+          wvExpand (data, data->sd->elements[TT_DOCUMENT].str[1],
+                    strlen (data->sd->elements[TT_DOCUMENT].str[1]));
+


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wv.spec	29 Oct 2006 18:00:59 -0000	1.12
+++ wv.spec	29 Oct 2006 18:46:19 -0000	1.13
@@ -1,7 +1,7 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.0.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
@@ -35,7 +35,7 @@
 %patch1 -p1 -b .oledecod
 %patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
-%patch6 -p1 -b .CVE-2006-4513
+%patch6 -p0 -b .CVE-2006-4513
 
 
 %build
@@ -72,6 +72,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.3-2
+- fix CVE-2006-4513 properly (see bug 212698)
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.3-2
 - fix CVE-2006-4513
 
 * Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}



From fedora-extras-commits at redhat.com  Sun Oct 29 19:21:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 12:21:21 -0700
Subject: rpms/python-mutagen/devel .cvsignore, 1.3, 1.4 python-mutagen.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610291921.k9TJLLVk027888@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/python-mutagen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27856

Modified Files:
	.cvsignore python-mutagen.spec sources 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
- Bump to 1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2006 22:00:33 -0000	1.3
+++ .cvsignore	29 Oct 2006 19:20:51 -0000	1.4
@@ -1 +1 @@
-mutagen-1.6.tar.gz
+mutagen-1.8.tar.gz


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/devel/python-mutagen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-mutagen.spec	29 Sep 2006 19:26:43 -0000	1.3
+++ python-mutagen.spec	29 Oct 2006 19:20:51 -0000	1.4
@@ -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-mutagen
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 Group:          Development/Languages
 License:        GPL
@@ -49,6 +49,9 @@
 %{python_sitelib}/mutagen/*.pyo
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
+- Bump to 1.8
+
 * Fri Sep 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.6-2
 - .pyo files no longer ghosted
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2006 22:00:33 -0000	1.3
+++ sources	29 Oct 2006 19:20:51 -0000	1.4
@@ -1 +1 @@
-d68a4803f1b1e2678647cc92899278fb  mutagen-1.6.tar.gz
+01c7158131a18c18914f9fd3ebd499a3  mutagen-1.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 19:26:49 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 12:26:49 -0700
Subject: rpms/python-mutagen/FC-5 .cvsignore, 1.3, 1.4 python-mutagen.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200610291926.k9TJQnWY028031@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/python-mutagen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28007

Modified Files:
	.cvsignore python-mutagen.spec sources 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
- Bump to 1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2006 22:04:23 -0000	1.3
+++ .cvsignore	29 Oct 2006 19:26:18 -0000	1.4
@@ -1 +1 @@
-mutagen-1.6.tar.gz
+mutagen-1.8.tar.gz


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-5/python-mutagen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-mutagen.spec	29 Sep 2006 19:30:16 -0000	1.4
+++ python-mutagen.spec	29 Oct 2006 19:26:18 -0000	1.5
@@ -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-mutagen
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 Group:          Development/Languages
 License:        GPL
@@ -49,6 +49,9 @@
 %{python_sitelib}/mutagen/*.pyo
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
+- Bump to 1.8
+
 * Fri Sep 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com>
 - .pyo files no longer ghosted
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2006 22:04:23 -0000	1.3
+++ sources	29 Oct 2006 19:26:18 -0000	1.4
@@ -1 +1 @@
-d68a4803f1b1e2678647cc92899278fb  mutagen-1.6.tar.gz
+01c7158131a18c18914f9fd3ebd499a3  mutagen-1.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:00 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 29 Oct 2006 12:31:00 -0700
Subject: rpms/fuse/FC-4 fuse-udev_rules.patch,1.3,1.4 fuse.spec,1.7,1.8
Message-ID: <200610291931.k9TJV0wc028208@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28127/FC-4

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule again

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse-udev_rules.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-udev_rules.patch	7 Oct 2006 06:46:59 -0000	1.3
+++ fuse-udev_rules.patch	29 Oct 2006 19:30:29 -0000	1.4
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fuse.spec	7 Oct 2006 06:46:59 -0000	1.7
+++ fuse.spec	29 Oct 2006 19:30:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sun Oct 29 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-5
+- Fixed udev-rule again
+
 * Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
 - Fixed udev-rule
 



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:01 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 29 Oct 2006 12:31:01 -0700
Subject: rpms/fuse/FC-5 fuse-udev_rules.patch,1.5,1.6 fuse.spec,1.11,1.12
Message-ID: <200610291931.k9TJV1VE028224@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28127/FC-5

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule again

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse-udev_rules.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuse-udev_rules.patch	7 Oct 2006 06:47:00 -0000	1.5
+++ fuse-udev_rules.patch	29 Oct 2006 19:30:30 -0000	1.6
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fuse.spec	7 Oct 2006 06:47:00 -0000	1.11
+++ fuse.spec	29 Oct 2006 19:30:30 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sun Oct 29 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-5
+- Fixed udev-rule again
+
 * Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
 - Fixed udev-rule
 



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:02 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 29 Oct 2006 12:31:02 -0700
Subject: rpms/fuse/FC-6 fuse-udev_rules.patch,1.5,1.6 fuse.spec,1.12,1.13
Message-ID: <200610291931.k9TJV22N028228@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28127/FC-6

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule again

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse-udev_rules.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuse-udev_rules.patch	7 Oct 2006 06:47:05 -0000	1.5
+++ fuse-udev_rules.patch	29 Oct 2006 19:30:31 -0000	1.6
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse.spec	7 Oct 2006 06:47:05 -0000	1.12
+++ fuse.spec	29 Oct 2006 19:30:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sun Oct 29 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-5
+- Fixed udev-rule again
+
 * Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
 - Fixed udev-rule
 



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:02 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 29 Oct 2006 12:31:02 -0700
Subject: rpms/fuse/devel fuse-udev_rules.patch,1.5,1.6 fuse.spec,1.12,1.13
Message-ID: <200610291931.k9TJV2ZM028232@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28127/devel

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:
Fixed udev-rule again

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse-udev_rules.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuse-udev_rules.patch	7 Oct 2006 06:47:05 -0000	1.5
+++ fuse-udev_rules.patch	29 Oct 2006 19:30:32 -0000	1.6
@@ -24,4 +24,4 @@
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"
-+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse.spec	7 Oct 2006 06:47:05 -0000	1.12
+++ fuse.spec	29 Oct 2006 19:30:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -117,6 +117,9 @@
 
 %changelog
 
+* Sun Oct 29 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-5
+- Fixed udev-rule again
+
 * Sat Oct  7 2006 Peter Lemenkov <lemenkov at gmail.com> 2.5.3-4
 - Fixed udev-rule
 



From fedora-extras-commits at redhat.com  Sun Oct 29 19:31:31 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Sun, 29 Oct 2006 12:31:31 -0700
Subject: rpms/python-mutagen/FC-6 .cvsignore, 1.3, 1.4 python-mutagen.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200610291931.k9TJVV7M028275@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/python-mutagen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28206

Modified Files:
	.cvsignore python-mutagen.spec sources 
Log Message:
* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
- Bump to 1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2006 22:00:33 -0000	1.3
+++ .cvsignore	29 Oct 2006 19:31:00 -0000	1.4
@@ -1 +1 @@
-mutagen-1.6.tar.gz
+mutagen-1.8.tar.gz


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-6/python-mutagen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-mutagen.spec	29 Sep 2006 19:26:43 -0000	1.3
+++ python-mutagen.spec	29 Oct 2006 19:31:00 -0000	1.4
@@ -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-mutagen
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 Group:          Development/Languages
 License:        GPL
@@ -49,6 +49,9 @@
 %{python_sitelib}/mutagen/*.pyo
 
 %changelog
+* Sun Oct 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.8-1
+- Bump to 1.8
+
 * Fri Sep 29 2006 Micha?? Bentkowski <mr.ecik at gmail.com> - 1.6-2
 - .pyo files no longer ghosted
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mutagen/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2006 22:00:33 -0000	1.3
+++ sources	29 Oct 2006 19:31:00 -0000	1.4
@@ -1 +1 @@
-d68a4803f1b1e2678647cc92899278fb  mutagen-1.6.tar.gz
+01c7158131a18c18914f9fd3ebd499a3  mutagen-1.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Oct 29 19:59:09 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 12:59:09 -0700
Subject: rpms/grhino/FC-6 grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, 
	NONE, 1.1 grhino.spec, 1.7, 1.8 sources, 1.6,
	1.7 grhino-Makefile-in.patch, 1.3, NONE
Message-ID: <200610291959.k9TJx9uS028586@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28562

Modified Files:
	grhino.spec sources 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	29 Oct 2006 17:32:50 -0000	1.7
+++ grhino.spec	29 Oct 2006 19:58:39 -0000	1.8
@@ -1,20 +1,20 @@
 Name:           grhino
-Version:        0.15.0
-Release:        6%{?dist}
+Version:        0.15.2
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
-#Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source0:	grhino-%{version}-patched.tar.bz2
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
-Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -38,8 +38,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -86,8 +87,14 @@
 
 
 %changelog
-* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-6
-- Rebuild for Fedora Extras 6
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
+* Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
+- Update to 0.15.2
 
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Oct 2006 17:32:50 -0000	1.6
+++ sources	29 Oct 2006 19:58:39 -0000	1.7
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Oct 29 20:15:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 13:15:49 -0700
Subject: rpms/grhino/FC-3 grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.4, 1.5
Message-ID: <200610292015.k9TKFnqj031817@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/FC-3

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grhino.spec	8 Oct 2006 14:11:34 -0000	1.4
+++ grhino.spec	29 Oct 2006 20:15:18 -0000	1.5
@@ -1,19 +1,20 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -37,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -85,6 +87,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2
 



From fedora-extras-commits at redhat.com  Sun Oct 29 20:15:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 13:15:49 -0700
Subject: rpms/grhino/FC-4 grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.5, 1.6
Message-ID: <200610292015.k9TKFn1D031820@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/FC-4

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
+++ grhino.spec	29 Oct 2006 20:15:19 -0000	1.6
@@ -1,19 +1,20 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -37,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -85,6 +87,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2
 



From fedora-extras-commits at redhat.com  Sun Oct 29 20:15:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 13:15:55 -0700
Subject: rpms/grhino/FC-5 grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.5, 1.6
Message-ID: <200610292015.k9TKFt6J031823@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/FC-5

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
+++ grhino.spec	29 Oct 2006 20:15:25 -0000	1.6
@@ -1,19 +1,20 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -37,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -85,6 +87,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2
 



From fedora-extras-commits at redhat.com  Sun Oct 29 20:15:56 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 29 Oct 2006 13:15:56 -0700
Subject: rpms/grhino/devel grhino-omf.patch, NONE,
	1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.6, 1.7
Message-ID: <200610292015.k9TKFuFH031826@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/devel

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	10 Oct 2006 01:06:57 -0000	1.6
+++ grhino.spec	29 Oct 2006 20:15:26 -0000	1.7
@@ -1,16 +1,16 @@
 Name:           grhino
 Version:        0.15.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
 * Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
 - BuildRequire on gettext
 



From fedora-extras-commits at redhat.com  Sun Oct 29 22:05:54 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 29 Oct 2006 15:05:54 -0700
Subject: rpms/php-pecl-xdebug/devel .cvsignore, 1.2, 1.3 php-pecl-xdebug.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610292205.k9TM5sKk006308@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6279

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
Upstream Sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 19:40:25 -0000	1.2
+++ .cvsignore	29 Oct 2006 22:05:24 -0000	1.3
@@ -1 +1 @@
-xdebug-2.0.0beta6.tgz
+xdebug-2.0.0RC1.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-xdebug.spec	6 Sep 2006 19:40:25 -0000	1.1
+++ php-pecl-xdebug.spec	29 Oct 2006 22:05:24 -0000	1.2
@@ -1,10 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta beta6
+%define beta RC1
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.1.%{beta}%{?dist}
+Release:        0.2.%{beta}%{?dist}
 Summary:        PECL package for debugging PHP scripts
 License:        PHP License
 Group:          Development/Languages
@@ -46,6 +46,9 @@
 %{php_extdir}/xdebug.so
 
 %changelog
+* Sun Oct 29 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.2.RC1
+- Upstream sync
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.1.beta6
 - Remove Provides php-xdebug
 - Fix Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 19:40:25 -0000	1.2
+++ sources	29 Oct 2006 22:05:24 -0000	1.3
@@ -1 +1 @@
-1ba82711d8f91c38c4b30a396cc2e72a  xdebug-2.0.0beta6.tgz
+a048de3dbb5a16489921f2096b8003e1  xdebug-2.0.0RC1.tgz



From fedora-extras-commits at redhat.com  Sun Oct 29 22:18:25 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 29 Oct 2006 15:18:25 -0700
Subject: rpms/php-pecl-xdebug/FC-5 .cvsignore, 1.2, 1.3 php-pecl-xdebug.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610292218.k9TMIPbE006573@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6535/FC-5

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 19:40:25 -0000	1.2
+++ .cvsignore	29 Oct 2006 22:17:54 -0000	1.3
@@ -1 +1 @@
-xdebug-2.0.0beta6.tgz
+xdebug-2.0.0RC1.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-5/php-pecl-xdebug.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-xdebug.spec	6 Sep 2006 19:40:25 -0000	1.1
+++ php-pecl-xdebug.spec	29 Oct 2006 22:17:54 -0000	1.2
@@ -1,10 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta beta6
+%define beta RC1
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.1.%{beta}%{?dist}
+Release:        0.2.%{beta}%{?dist}
 Summary:        PECL package for debugging PHP scripts
 License:        PHP License
 Group:          Development/Languages
@@ -46,6 +46,9 @@
 %{php_extdir}/xdebug.so
 
 %changelog
+* Sun Oct 29 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.2.RC1
+- Upstream sync
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.1.beta6
 - Remove Provides php-xdebug
 - Fix Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 19:40:25 -0000	1.2
+++ sources	29 Oct 2006 22:17:54 -0000	1.3
@@ -1 +1 @@
-1ba82711d8f91c38c4b30a396cc2e72a  xdebug-2.0.0beta6.tgz
+a048de3dbb5a16489921f2096b8003e1  xdebug-2.0.0RC1.tgz



From fedora-extras-commits at redhat.com  Sun Oct 29 22:18:25 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 29 Oct 2006 15:18:25 -0700
Subject: rpms/php-pecl-xdebug/FC-6 .cvsignore, 1.2, 1.3 php-pecl-xdebug.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200610292218.k9TMIPt6006580@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6535/FC-6

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 19:40:25 -0000	1.2
+++ .cvsignore	29 Oct 2006 22:17:55 -0000	1.3
@@ -1 +1 @@
-xdebug-2.0.0beta6.tgz
+xdebug-2.0.0RC1.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/php-pecl-xdebug.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-xdebug.spec	6 Sep 2006 19:40:25 -0000	1.1
+++ php-pecl-xdebug.spec	29 Oct 2006 22:17:55 -0000	1.2
@@ -1,10 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta beta6
+%define beta RC1
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.1.%{beta}%{?dist}
+Release:        0.2.%{beta}%{?dist}
 Summary:        PECL package for debugging PHP scripts
 License:        PHP License
 Group:          Development/Languages
@@ -46,6 +46,9 @@
 %{php_extdir}/xdebug.so
 
 %changelog
+* Sun Oct 29 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.2.RC1
+- Upstream sync
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.1.beta6
 - Remove Provides php-xdebug
 - Fix Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 19:40:25 -0000	1.2
+++ sources	29 Oct 2006 22:17:55 -0000	1.3
@@ -1 +1 @@
-1ba82711d8f91c38c4b30a396cc2e72a  xdebug-2.0.0beta6.tgz
+a048de3dbb5a16489921f2096b8003e1  xdebug-2.0.0RC1.tgz



From fedora-extras-commits at redhat.com  Sun Oct 29 22:26:48 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 29 Oct 2006 15:26:48 -0700
Subject: rpms/liferea/devel liferea.spec,1.55,1.56
Message-ID: <200610292226.k9TMQmju006768@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6749

Modified Files:
	liferea.spec 
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-3
- Actually use the correct version for firefox.



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- liferea.spec	29 Oct 2006 18:45:42 -0000	1.55
+++ liferea.spec	29 Oct 2006 22:26:18 -0000	1.56
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.25
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -24,7 +24,7 @@
 BuildRequires:	dbus-devel
 %endif
 
-Requires:	firefox = 2.0.2
+Requires:	firefox = 2.0
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-3
+- Actually use the correct version for firefox.
+
 * Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.25-2
 - Rebuild for new firefox.
 



From fedora-extras-commits at redhat.com  Mon Oct 30 05:12:09 2006
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Sun, 29 Oct 2006 22:12:09 -0700
Subject: rpms/php-shout/FC-6 .cvsignore, 1.2, 1.3 php-shout.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200610300512.k9U5C9Hi005990@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-shout/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970

Modified Files:
	.cvsignore php-shout.spec sources 
Log Message:
Bumped to 0.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Aug 2006 03:18:33 -0000	1.2
+++ .cvsignore	30 Oct 2006 05:11:38 -0000	1.3
@@ -1 +1 @@
-phpShout-0.3.1.tar.gz
+phpShout-0.9.1.tar.gz


Index: php-shout.spec
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-6/php-shout.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-shout.spec	27 Oct 2006 00:05:42 -0000	1.5
+++ php-shout.spec	30 Oct 2006 05:11:38 -0000	1.6
@@ -2,8 +2,8 @@
 %global php_extdir	%(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:		php-shout
-Version:	0.3.1
-Release:	7%{?dist}
+Version:	0.9.1
+Release:	1%{?dist}
 Summary:	PHP module for communicating with Icecast servers
 
 Source0:	http://dl.sf.net/phpshout/phpShout-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{php_extdir}/shout.so
 
 %changelog
+* Sun Oct 29 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.9.1-1
+- Bump to 0.9.1
+
 * Thu Oct 26 2006 Brandon Holbrook <fedora at theholbrooks.org> 0.3.1-7
 - Rebuild for new PHP
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-shout/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Aug 2006 03:18:33 -0000	1.2
+++ sources	30 Oct 2006 05:11:38 -0000	1.3
@@ -1 +1 @@
-3a630c1953e0bd0c42a3324f5e449077  phpShout-0.3.1.tar.gz
+0cb82355c6bdc985a9a0db923bf0372a  phpShout-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 06:47:43 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 29 Oct 2006 23:47:43 -0700
Subject: rpms/python-tgfastdata/devel python-tgfastdata.spec,1.1,1.2
Message-ID: <200610300647.k9U6lhAZ009432@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9409

Modified Files:
	python-tgfastdata.spec 
Log Message:
fix egg-info directory


Index: python-tgfastdata.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/devel/python-tgfastdata.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-tgfastdata.spec	15 Oct 2006 17:35:19 -0000	1.1
+++ python-tgfastdata.spec	30 Oct 2006 06:47:13 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           python-tgfastdata
 Version:        0.9a6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Automatic user interface generation for TurboGears
 
 Group:          Development/Languages
@@ -35,8 +35,8 @@
 install -p -m 0644 %{module}/templates/* %{buildroot}%{python_sitelib}/%{module}/templates
 
 # Install the egg-info directory
-mkdir -p %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
-install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
+mkdir -p %{buildroot}%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
+install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
 
 
 %clean
@@ -46,9 +46,12 @@
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}/%{module}/
-%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
+%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Mon Oct 30 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-5
+- Fix egg-info directory
+
 * Tue Oct 14 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-4
 - Fix Source0
 - Own %%{python_sitelib}/%{module}



From fedora-extras-commits at redhat.com  Mon Oct 30 06:56:16 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 29 Oct 2006 23:56:16 -0700
Subject: rpms/python-tgfastdata/FC-6 python-tgfastdata.spec,1.1,1.2
Message-ID: <200610300656.k9U6uG2k009558@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-tgfastdata/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9542

Modified Files:
	python-tgfastdata.spec 
Log Message:
fix egg-info directory


Index: python-tgfastdata.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tgfastdata/FC-6/python-tgfastdata.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-tgfastdata.spec	15 Oct 2006 17:35:19 -0000	1.1
+++ python-tgfastdata.spec	30 Oct 2006 06:55:46 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           python-tgfastdata
 Version:        0.9a6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Automatic user interface generation for TurboGears
 
 Group:          Development/Languages
@@ -35,8 +35,8 @@
 install -p -m 0644 %{module}/templates/* %{buildroot}%{python_sitelib}/%{module}/templates
 
 # Install the egg-info directory
-mkdir -p %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
-install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
+mkdir -p %{buildroot}%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
+install -p -m 0644 EGG-INFO/* %{buildroot}%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
 
 
 %clean
@@ -46,9 +46,12 @@
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}/%{module}/
-%{python_sitelib}/TurboKid-%{version}-py%{pyver}.egg-info
+%{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Mon Oct 30 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-5
+- Fix egg-info directory
+
 * Tue Oct 14 2006 Luke Macken <lmacken at redhat.com> - 0.9a6-4
 - Fix Source0
 - Own %%{python_sitelib}/%{module}



From fedora-extras-commits at redhat.com  Mon Oct 30 07:51:11 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Oct 2006 00:51:11 -0700
Subject: rpms/codeblocks/devel .cvsignore, 1.3, 1.4 codeblocks-autorev.patch,
	1.1, 1.2 codeblocks.spec, 1.2, 1.3 sources, 1.3,
	1.4 codeblocks-rpath.patch, 1.1, NONE
Message-ID: <200610300751.k9U7pB8W012942@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12896

Modified Files:
	.cvsignore codeblocks-autorev.patch codeblocks.spec sources 
Removed Files:
	codeblocks-rpath.patch 
Log Message:
- update to revision 3157
- kill rpath in the spec file using sed
- fix directory ownership



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 09:16:19 -0000	1.3
+++ .cvsignore	30 Oct 2006 07:50:41 -0000	1.4
@@ -1 +1 @@
-codeblocks-svn3030.tar.bz2
+codeblocks-svn3157.tar.bz2

codeblocks-autorev.patch:

Index: codeblocks-autorev.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks-autorev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-autorev.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-autorev.patch	30 Oct 2006 07:50:41 -0000	1.2
@@ -14,8 +14,11 @@
  # Deal with some gentoo-specific issues
  export WANT_AUTOMAKE='1.7'
  export WANT_AUTOCONF='2.5'
---- src/tools/Makefile.am.orig	2006-09-13 17:45:04.000000000 +0200
-+++ src/tools/Makefile.am	2006-09-13 17:45:11.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = autorevision ConsoleRunner
-+SUBDIRS = ConsoleRunner
+--- src/Makefile.am.orig	2006-10-15 10:11:04.000000000 +0200
++++ src/Makefile.am	2006-10-15 10:11:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = build_tools sdk src plugins tools setup templates scripts wxsmith
++SUBDIRS = sdk src plugins tools setup templates scripts wxsmith
+ 
+ dist_pkgdata_DATA = tips.txt
+ 


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks.spec	8 Oct 2006 09:16:19 -0000	1.2
+++ codeblocks.spec	30 Oct 2006 07:50:41 -0000	1.3
@@ -1,9 +1,9 @@
-%define		rev	3030
-%define		date	20061007
+%define		rev	3157
+%define		date	20061029
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.10.%{date}svn%{rev}%{?dist}
+Release:	0.11.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -19,7 +19,6 @@
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
-Source1:	codeblocks-rpath.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -68,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -77,9 +76,6 @@
 
 ./bootstrap
 
-# get rid of rpath in libs and plugins
-patch -p0 < %{SOURCE1}
-
 # generate autorevision.h
 cat > src/sdk/autorevision.h << EOF
 /*%{rev}*/
@@ -107,6 +103,10 @@
 
 %configure --enable-contrib
 
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -162,14 +162,15 @@
 %{_datadir}/pixmaps/codeblocks.png
 
 %dir %{pkgdatadir}
-%{pkgdatadir}/icons/*
+%{pkgdatadir}/icons
+%dir %{pkgdatadir}/images
 %{pkgdatadir}/images/*.png
-%{pkgdatadir}/images/16x16/*
-%{pkgdatadir}/images/codecompletion/*
-%{pkgdatadir}/images/settings/*
-%{pkgdatadir}/lexers/*
-%{pkgdatadir}/scripts/*
-%{pkgdatadir}/templates/*
+%{pkgdatadir}/images/16x16
+%{pkgdatadir}/images/codecompletion
+%{pkgdatadir}/images/settings
+%{pkgdatadir}/lexers
+%{pkgdatadir}/scripts
+%{pkgdatadir}/templates
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
 %{pkgdatadir}/classwizard.zip
@@ -201,7 +202,9 @@
 %{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
 %{pkgdatadir}/keybinder.zip
-%{pkgdatadir}/CBProfiler.zip
+%{pkgdatadir}/lib_finder.zip
+%{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -215,11 +218,18 @@
 %{plugindir}/libexporter.so
 %{plugindir}/libhelp_plugin.so
 %{plugindir}/libkeybinder.so
-%{plugindir}/libprofiler.so
+%{plugindir}/liblib_finder.so
+%{plugindir}/libProfiler.so
+%{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Mon Oct 30 2006 Dan Horak <dan[at]danny.cz> 1.0-0.11.20061029svn3157
+- update to revision 3157
+- kill rpath in the spec file using sed
+- fix directory ownership
+
 * Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
 - update to revision 3030
 - change the install paths for plugins in the spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 09:16:19 -0000	1.3
+++ sources	30 Oct 2006 07:50:41 -0000	1.4
@@ -1 +1 @@
-5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2
+da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2


--- codeblocks-rpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 30 08:40:10 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Oct 2006 01:40:10 -0700
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.3, 1.4 codeblocks-autorev.patch, 
	1.1, 1.2 codeblocks.spec, 1.2, 1.3 sources, 1.3,
	1.4 codeblocks-rpath.patch, 1.1, NONE
Message-ID: <200610300840.k9U8eARd016259@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16234

Modified Files:
	.cvsignore codeblocks-autorev.patch codeblocks.spec sources 
Removed Files:
	codeblocks-rpath.patch 
Log Message:
- update to revision 3157
- kill rpath in the spec file using sed
- fix directory ownership



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 09:16:19 -0000	1.3
+++ .cvsignore	30 Oct 2006 08:39:39 -0000	1.4
@@ -1 +1 @@
-codeblocks-svn3030.tar.bz2
+codeblocks-svn3157.tar.bz2

codeblocks-autorev.patch:

Index: codeblocks-autorev.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-autorev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-autorev.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-autorev.patch	30 Oct 2006 08:39:39 -0000	1.2
@@ -14,8 +14,11 @@
  # Deal with some gentoo-specific issues
  export WANT_AUTOMAKE='1.7'
  export WANT_AUTOCONF='2.5'
---- src/tools/Makefile.am.orig	2006-09-13 17:45:04.000000000 +0200
-+++ src/tools/Makefile.am	2006-09-13 17:45:11.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = autorevision ConsoleRunner
-+SUBDIRS = ConsoleRunner
+--- src/Makefile.am.orig	2006-10-15 10:11:04.000000000 +0200
++++ src/Makefile.am	2006-10-15 10:11:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = build_tools sdk src plugins tools setup templates scripts wxsmith
++SUBDIRS = sdk src plugins tools setup templates scripts wxsmith
+ 
+ dist_pkgdata_DATA = tips.txt
+ 


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks.spec	8 Oct 2006 09:16:19 -0000	1.2
+++ codeblocks.spec	30 Oct 2006 08:39:39 -0000	1.3
@@ -1,9 +1,9 @@
-%define		rev	3030
-%define		date	20061007
+%define		rev	3157
+%define		date	20061029
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.10.%{date}svn%{rev}%{?dist}
+Release:	0.11.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -19,7 +19,6 @@
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
-Source1:	codeblocks-rpath.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -68,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -77,9 +76,6 @@
 
 ./bootstrap
 
-# get rid of rpath in libs and plugins
-patch -p0 < %{SOURCE1}
-
 # generate autorevision.h
 cat > src/sdk/autorevision.h << EOF
 /*%{rev}*/
@@ -107,6 +103,10 @@
 
 %configure --enable-contrib
 
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -162,14 +162,15 @@
 %{_datadir}/pixmaps/codeblocks.png
 
 %dir %{pkgdatadir}
-%{pkgdatadir}/icons/*
+%{pkgdatadir}/icons
+%dir %{pkgdatadir}/images
 %{pkgdatadir}/images/*.png
-%{pkgdatadir}/images/16x16/*
-%{pkgdatadir}/images/codecompletion/*
-%{pkgdatadir}/images/settings/*
-%{pkgdatadir}/lexers/*
-%{pkgdatadir}/scripts/*
-%{pkgdatadir}/templates/*
+%{pkgdatadir}/images/16x16
+%{pkgdatadir}/images/codecompletion
+%{pkgdatadir}/images/settings
+%{pkgdatadir}/lexers
+%{pkgdatadir}/scripts
+%{pkgdatadir}/templates
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
 %{pkgdatadir}/classwizard.zip
@@ -201,7 +202,9 @@
 %{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
 %{pkgdatadir}/keybinder.zip
-%{pkgdatadir}/CBProfiler.zip
+%{pkgdatadir}/lib_finder.zip
+%{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -215,11 +218,18 @@
 %{plugindir}/libexporter.so
 %{plugindir}/libhelp_plugin.so
 %{plugindir}/libkeybinder.so
-%{plugindir}/libprofiler.so
+%{plugindir}/liblib_finder.so
+%{plugindir}/libProfiler.so
+%{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Mon Oct 30 2006 Dan Horak <dan[at]danny.cz> 1.0-0.11.20061029svn3157
+- update to revision 3157
+- kill rpath in the spec file using sed
+- fix directory ownership
+
 * Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
 - update to revision 3030
 - change the install paths for plugins in the spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 09:16:19 -0000	1.3
+++ sources	30 Oct 2006 08:39:39 -0000	1.4
@@ -1 +1 @@
-5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2
+da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2


--- codeblocks-rpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 30 08:47:08 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Oct 2006 01:47:08 -0700
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.3, 1.4 codeblocks-autorev.patch, 
	1.1, 1.2 codeblocks.spec, 1.2, 1.3 sources, 1.3,
	1.4 codeblocks-rpath.patch, 1.1, NONE
Message-ID: <200610300847.k9U8l8Ts016358@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16331

Modified Files:
	.cvsignore codeblocks-autorev.patch codeblocks.spec sources 
Removed Files:
	codeblocks-rpath.patch 
Log Message:
- update to revision 3157
- kill rpath in the spec file using sed
- fix directory ownership



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 09:18:38 -0000	1.3
+++ .cvsignore	30 Oct 2006 08:46:37 -0000	1.4
@@ -1 +1 @@
-codeblocks-svn3030.tar.bz2
+codeblocks-svn3157.tar.bz2

codeblocks-autorev.patch:

Index: codeblocks-autorev.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-autorev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-autorev.patch	13 Sep 2006 20:21:13 -0000	1.1
+++ codeblocks-autorev.patch	30 Oct 2006 08:46:37 -0000	1.2
@@ -14,8 +14,11 @@
  # Deal with some gentoo-specific issues
  export WANT_AUTOMAKE='1.7'
  export WANT_AUTOCONF='2.5'
---- src/tools/Makefile.am.orig	2006-09-13 17:45:04.000000000 +0200
-+++ src/tools/Makefile.am	2006-09-13 17:45:11.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = autorevision ConsoleRunner
-+SUBDIRS = ConsoleRunner
+--- src/Makefile.am.orig	2006-10-15 10:11:04.000000000 +0200
++++ src/Makefile.am	2006-10-15 10:11:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = build_tools sdk src plugins tools setup templates scripts wxsmith
++SUBDIRS = sdk src plugins tools setup templates scripts wxsmith
+ 
+ dist_pkgdata_DATA = tips.txt
+ 


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks.spec	8 Oct 2006 09:18:38 -0000	1.2
+++ codeblocks.spec	30 Oct 2006 08:46:37 -0000	1.3
@@ -1,9 +1,9 @@
-%define		rev	3030
-%define		date	20061007
+%define		rev	3157
+%define		date	20061029
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.10.%{date}svn%{rev}%{?dist}
+Release:	0.11.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -19,7 +19,6 @@
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
-Source1:	codeblocks-rpath.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -68,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -77,9 +76,6 @@
 
 ./bootstrap
 
-# get rid of rpath in libs and plugins
-patch -p0 < %{SOURCE1}
-
 # generate autorevision.h
 cat > src/sdk/autorevision.h << EOF
 /*%{rev}*/
@@ -107,6 +103,10 @@
 
 %configure --enable-contrib
 
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -162,14 +162,15 @@
 %{_datadir}/pixmaps/codeblocks.png
 
 %dir %{pkgdatadir}
-%{pkgdatadir}/icons/*
+%{pkgdatadir}/icons
+%dir %{pkgdatadir}/images
 %{pkgdatadir}/images/*.png
-%{pkgdatadir}/images/16x16/*
-%{pkgdatadir}/images/codecompletion/*
-%{pkgdatadir}/images/settings/*
-%{pkgdatadir}/lexers/*
-%{pkgdatadir}/scripts/*
-%{pkgdatadir}/templates/*
+%{pkgdatadir}/images/16x16
+%{pkgdatadir}/images/codecompletion
+%{pkgdatadir}/images/settings
+%{pkgdatadir}/lexers
+%{pkgdatadir}/scripts
+%{pkgdatadir}/templates
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
 %{pkgdatadir}/classwizard.zip
@@ -201,7 +202,9 @@
 %{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
 %{pkgdatadir}/keybinder.zip
-%{pkgdatadir}/CBProfiler.zip
+%{pkgdatadir}/lib_finder.zip
+%{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -215,11 +218,18 @@
 %{plugindir}/libexporter.so
 %{plugindir}/libhelp_plugin.so
 %{plugindir}/libkeybinder.so
-%{plugindir}/libprofiler.so
+%{plugindir}/liblib_finder.so
+%{plugindir}/libProfiler.so
+%{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Mon Oct 30 2006 Dan Horak <dan[at]danny.cz> 1.0-0.11.20061029svn3157
+- update to revision 3157
+- kill rpath in the spec file using sed
+- fix directory ownership
+
 * Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
 - update to revision 3030
 - change the install paths for plugins in the spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 09:18:38 -0000	1.3
+++ sources	30 Oct 2006 08:46:37 -0000	1.4
@@ -1 +1 @@
-5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2
+da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2


--- codeblocks-rpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Oct 30 08:50:52 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 30 Oct 2006 01:50:52 -0700
Subject: fedora-security/audit fc5,1.374,1.375 fc6,1.127,1.128
Message-ID: <200610300850.k9U8oq6i016438@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16418

Modified Files:
	fc5 fc6 
Log Message:
Catchup with weekend CVE and releases



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- fc5	27 Oct 2006 07:45:44 -0000	1.374
+++ fc5	30 Oct 2006 08:50:50 -0000	1.375
@@ -1,11 +1,15 @@
-Up to date CVE as of CVE email 20061026
-Up to date FC5 as of 20061026
+Up to date CVE as of CVE email 20061029
+Up to date FC5 as of 20061029
 
 ** are items that need attention
 
+CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5470 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -36,12 +40,14 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
+CVE-2006-4805 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
 CVE-2006-4624 version (mailman, fixed 2.1.9rc1) #205652 [since FEDORA-2006-1013]
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
+CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- fc6	27 Oct 2006 07:45:44 -0000	1.127
+++ fc6	30 Oct 2006 08:50:50 -0000	1.128
@@ -1,11 +1,15 @@
-Up to date CVE as of CVE email 20061026
-Up to date FC6 as of 20061026
+Up to date CVE as of CVE email 20061029
+Up to date FC6 as of 20061029
 
 ** are items that need attention
 
+CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
+CVE-2006-5470 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -36,12 +40,14 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055]
+CVE-2006-4805 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
 CVE-2006-4624 version (mailman, fixed 2.1.9rc1)
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1)
 CVE-2006-4600 version (openldap, fixed 2.3.25)
+CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7)



From fedora-extras-commits at redhat.com  Mon Oct 30 09:31:54 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 30 Oct 2006 02:31:54 -0700
Subject: rpms/brasero/FC-6 .cvsignore, 1.2, 1.3 brasero.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610300931.k9U9VsHf019827@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19807

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
- Update to 0.5.0
- Updated icon paths
- Added gconf schemas sections



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2006 22:59:10 -0000	1.2
+++ .cvsignore	30 Oct 2006 09:31:24 -0000	1.3
@@ -1 +1 @@
-brasero-0.4.4.tar.bz2
+brasero-0.5.0.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/brasero.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- brasero.spec	3 Oct 2006 22:59:10 -0000	1.1
+++ brasero.spec	30 Oct 2006 09:31:24 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:      brasero
-Version:   0.4.4
-Release:   3%{?dist}
+Version:   0.5.0
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPL
@@ -14,10 +14,11 @@
 BuildRequires:  libgnomeui-devel >= 2.10.0
 BuildRequires:  gstreamer-devel >= 0.10.6
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires:  nautilus-cd-burner-devel >= 2.14.0
-BuildRequires:  libnotify-devel >= 0.3.0
+BuildRequires:  nautilus-cd-burner-devel >= 2.16.0
 BuildRequires:  libbeagle-devel >= 0.1.1
 BuildRequires:  totem-devel >= 1.2.0
+BuildRequires:  libburn-devel >= 0.2.1
+BuildRequires:  libisofs-devel >= 0.2.1
 
 Requires:  dvd+rw-tools
 Requires:  cdrecord
@@ -27,6 +28,9 @@
 
 Requires(post):    shared-mime-info
 Requires(postun):  shared-mime-info
+Requires(pre):     GConf2
+Requires(post):    GConf2
+Requires(preun):   GConf2
 
 
 %description
@@ -39,12 +43,13 @@
 
 
 %build
-%configure --disable-caches
+%configure --disable-caches --disable-static --disable-schemas-install
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -60,34 +65,58 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null  || :
+killall -HUP gconfd-2 &>/dev/null || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%doc %{_mandir}/man1/%{name}.*
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/brasero.desktop
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/gnome/48x48/mimetypes/*
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/mime/packages/*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Sun Oct 29 2006 Denis Leroy <denis at poolshark.org> - 0.5.0-1
+- Update to 0.5.0
+- Updated icon paths
+- Added gconf schemas sections
+
 * Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-3
 - fixed homepage URL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2006 22:59:10 -0000	1.2
+++ sources	30 Oct 2006 09:31:24 -0000	1.3
@@ -1 +1 @@
-1ef6ae66677ed9136634692d8bc1cc7a  brasero-0.4.4.tar.bz2
+9cf947c4ca681e9ee66600022e697c80  brasero-0.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 09:36:33 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Mon, 30 Oct 2006 02:36:33 -0700
Subject: status-report-scripts parseBZbugList,1.54,1.55
Message-ID: <200610300936.k9U9aXst019932@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19914

Modified Files:
	parseBZbugList 
Log Message:
Add TODO item.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- parseBZbugList	25 Oct 2006 20:11:22 -0000	1.54
+++ parseBZbugList	30 Oct 2006 09:36:30 -0000	1.55
@@ -24,6 +24,7 @@
 
 # TODO stuff
 #  See why count in "Inactive maintainers with open bug reports" is strange.
+#  Maybe report a count of FE-DEADREVIEW.
 
 use strict;
 use Getopt::Long;
@@ -75,6 +76,7 @@
 my $FE_NEEDSPONSOR = 177841;
 my $FE_LEGAL = 182235;
 my $FE_GUIDELINES = 197974;
+my $FE_DEADREVIEW = 201449;
 my $extras_orphan = 'extras-orphan at fedoraproject.org';
 my %BZN;
 my %BZS;



From fedora-extras-commits at redhat.com  Mon Oct 30 10:05:39 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 30 Oct 2006 03:05:39 -0700
Subject: rpms/brasero/devel .cvsignore, 1.2, 1.3 brasero.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200610301005.k9UA5dob023020@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22989

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
- Update to 0.5.0
- Updated icon paths
- Added gconf schemas sections



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2006 22:59:10 -0000	1.2
+++ .cvsignore	30 Oct 2006 10:05:09 -0000	1.3
@@ -1 +1 @@
-brasero-0.4.4.tar.bz2
+brasero-0.5.0.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- brasero.spec	3 Oct 2006 22:59:10 -0000	1.1
+++ brasero.spec	30 Oct 2006 10:05:09 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name:      brasero
-Version:   0.4.4
-Release:   3%{?dist}
+Version:   0.5.0
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPL
@@ -14,10 +14,11 @@
 BuildRequires:  libgnomeui-devel >= 2.10.0
 BuildRequires:  gstreamer-devel >= 0.10.6
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires:  nautilus-cd-burner-devel >= 2.14.0
-BuildRequires:  libnotify-devel >= 0.3.0
+BuildRequires:  nautilus-cd-burner-devel >= 2.16.0
 BuildRequires:  libbeagle-devel >= 0.1.1
 BuildRequires:  totem-devel >= 1.2.0
+BuildRequires:  libburn-devel >= 0.2.1
+BuildRequires:  libisofs-devel >= 0.2.1
 
 Requires:  dvd+rw-tools
 Requires:  cdrecord
@@ -27,6 +28,9 @@
 
 Requires(post):    shared-mime-info
 Requires(postun):  shared-mime-info
+Requires(pre):     GConf2
+Requires(post):    GConf2
+Requires(preun):   GConf2
 
 
 %description
@@ -39,12 +43,13 @@
 
 
 %build
-%configure --disable-caches
+%configure --disable-caches --disable-static --disable-schemas-install
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -60,34 +65,58 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null  || :
+killall -HUP gconfd-2 &>/dev/null || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-touch --no-create %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+  killall -HUP gconfd-2 &>/dev/null || :
+fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%doc %{_mandir}/man1/%{name}.*
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/brasero.desktop
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/gnome/48x48/mimetypes/*
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/mime/packages/*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Sun Oct 29 2006 Denis Leroy <denis at poolshark.org> - 0.5.0-1
+- Update to 0.5.0
+- Updated icon paths
+- Added gconf schemas sections
+
 * Tue Oct  3 2006 Denis Leroy <denis at poolshark.org> - 0.4.4-3
 - fixed homepage URL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2006 22:59:10 -0000	1.2
+++ sources	30 Oct 2006 10:05:09 -0000	1.3
@@ -1 +1 @@
-1ef6ae66677ed9136634692d8bc1cc7a  brasero-0.4.4.tar.bz2
+9cf947c4ca681e9ee66600022e697c80  brasero-0.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 10:19:03 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 30 Oct 2006 03:19:03 -0700
Subject: rpms/hugs98/devel .cvsignore, 1.3, 1.4 hugs98.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200610301019.k9UAJ3kt023198@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23178

Modified Files:
	.cvsignore hugs98.spec sources 
Log Message:
new version Sep2006


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jun 2006 22:16:20 -0000	1.3
+++ .cvsignore	30 Oct 2006 10:18:33 -0000	1.4
@@ -1 +1 @@
-hugs98-plus-May2006.tar.gz
+hugs98-plus-Sep2006.tar.gz


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hugs98.spec	28 Aug 2006 09:13:58 -0000	1.9
+++ hugs98.spec	30 Oct 2006 10:18:33 -0000	1.10
@@ -1,14 +1,14 @@
-%define hugs_ver plus-May2006
+%define hugs_ver plus-Sep2006
 
 Name:		hugs98
-Version:	2006.05
-Release:	6%{?dist}
+Version:	2006.09
+Release:	1%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/2006-05/%{name}-%{hugs_ver}.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/2006-09/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -194,6 +194,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-1
+- new version Sep2006
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-6
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jun 2006 22:16:20 -0000	1.3
+++ sources	30 Oct 2006 10:18:33 -0000	1.4
@@ -1 +1 @@
-b6989dee41f818f5052d9d46e3663726  hugs98-plus-May2006.tar.gz
+e03e0ad79750d037237c47ebe33fa20e  hugs98-plus-Sep2006.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 10:25:12 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 30 Oct 2006 03:25:12 -0700
Subject: rpms/hugs98/FC-5 .cvsignore, 1.3, 1.4 hugs98.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200610301025.k9UAPCYs023308@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/FC-5

Modified Files:
	.cvsignore hugs98.spec sources 
Log Message:
new version Sep2006


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jun 2006 22:28:20 -0000	1.3
+++ .cvsignore	30 Oct 2006 10:24:42 -0000	1.4
@@ -1 +1 @@
-hugs98-plus-May2006.tar.gz
+hugs98-plus-Sep2006.tar.gz


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hugs98.spec	23 Jun 2006 08:12:50 -0000	1.9
+++ hugs98.spec	30 Oct 2006 10:24:42 -0000	1.10
@@ -1,14 +1,14 @@
-%define hugs_ver plus-May2006
+%define hugs_ver plus-Sep2006
 
 Name:		hugs98
-Version:	2006.05
-Release:	5%{?dist}
+Version:	2006.09
+Release:	1%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/2006-05/%{name}-%{hugs_ver}.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/2006-09/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -194,6 +194,12 @@
 
 
 %changelog
+* Mon Oct 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-1
+- new version Sep2006
+
+* Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-6
+- Rebuild for FE6
+
 * Fri Jun 23 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-5
 - switch char encoding from utf-8 to locale
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jun 2006 22:28:20 -0000	1.3
+++ sources	30 Oct 2006 10:24:42 -0000	1.4
@@ -1 +1 @@
-b6989dee41f818f5052d9d46e3663726  hugs98-plus-May2006.tar.gz
+e03e0ad79750d037237c47ebe33fa20e  hugs98-plus-Sep2006.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 10:25:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 30 Oct 2006 03:25:13 -0700
Subject: rpms/hugs98/FC-6 .cvsignore, 1.3, 1.4 hugs98.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200610301025.k9UAPDPV023313@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/FC-6

Modified Files:
	.cvsignore hugs98.spec sources 
Log Message:
new version Sep2006


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jun 2006 22:16:20 -0000	1.3
+++ .cvsignore	30 Oct 2006 10:24:42 -0000	1.4
@@ -1 +1 @@
-hugs98-plus-May2006.tar.gz
+hugs98-plus-Sep2006.tar.gz


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-6/hugs98.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hugs98.spec	28 Aug 2006 09:13:58 -0000	1.9
+++ hugs98.spec	30 Oct 2006 10:24:43 -0000	1.10
@@ -1,14 +1,14 @@
-%define hugs_ver plus-May2006
+%define hugs_ver plus-Sep2006
 
 Name:		hugs98
-Version:	2006.05
-Release:	6%{?dist}
+Version:	2006.09
+Release:	1%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/2006-05/%{name}-%{hugs_ver}.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/2006-09/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -194,6 +194,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-1
+- new version Sep2006
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-6
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jun 2006 22:16:20 -0000	1.3
+++ sources	30 Oct 2006 10:24:43 -0000	1.4
@@ -1 +1 @@
-b6989dee41f818f5052d9d46e3663726  hugs98-plus-May2006.tar.gz
+e03e0ad79750d037237c47ebe33fa20e  hugs98-plus-Sep2006.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 14:05:33 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 07:05:33 -0700
Subject: rpms/awstats/FC-5 awstats.spec,1.14,1.15
Message-ID: <200610301405.k9UE5XvU004233@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185/FC-5

Modified Files:
	awstats.spec 
Log Message:
fix dos encoding on logresolvemerge.pl (bug 212965)


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- awstats.spec	9 May 2006 09:04:15 -0000	1.14
+++ awstats.spec	30 Oct 2006 14:05:02 -0000	1.15
@@ -1,14 +1,13 @@
 Name:       awstats
-Version:    6.5
-Release:    5%{?dist}
+Version:    6.6
+Release:    0.3.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
-#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
+#Source0:    http://dl.sf.net/awstats/awstats-6.6.tar.gz
+Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
 Source1:    awstats.README.SELinux
-Patch0:     awstats-6.5-CVE-2006-1945.patch
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -35,15 +34,13 @@
 
 %prep
 %setup -q
-# no backup or the orig file will be installed
-%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
 chmod -x tools/httpd_conf
 find tools/xslt -type f | xargs chmod -x
 # Remove \r in conf file (file written on MS Windows)
-perl -pi -e 's/\r//g' tools/httpd_conf
+perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
 
@@ -176,11 +173,14 @@
 
 
 %changelog
-* Tue May 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-5
-- really fix CVE-2006-1945...
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+- fix DOS encoding on logresolvemerge.pl
 
-* Mon May 08 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-4
-- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923)
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
+- rebuild
+
+* Sun May 07 2006 Aurelien Bompard <gauret[AT]free.fr> 6.6-0.1.beta
+- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923)
 
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-3
 - SELinux support: use semanage to label the cgi and the database files



From fedora-extras-commits at redhat.com  Mon Oct 30 14:05:40 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 07:05:40 -0700
Subject: rpms/awstats/devel awstats.spec,1.15,1.16
Message-ID: <200610301405.k9UE5evP004239@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185/devel

Modified Files:
	awstats.spec 
Log Message:
fix dos encoding on logresolvemerge.pl (bug 212965)


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- awstats.spec	30 Aug 2006 14:29:10 -0000	1.15
+++ awstats.spec	30 Oct 2006 14:05:09 -0000	1.16
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.6
-Release:    0.2.beta%{?dist}
+Release:    0.3.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -40,7 +40,7 @@
 chmod -x tools/httpd_conf
 find tools/xslt -type f | xargs chmod -x
 # Remove \r in conf file (file written on MS Windows)
-perl -pi -e 's/\r//g' tools/httpd_conf
+perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
 
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+- fix DOS encoding on logresolvemerge.pl
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct 30 14:05:37 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 07:05:37 -0700
Subject: rpms/awstats/FC-6 awstats.spec,1.15,1.16
Message-ID: <200610301405.k9UE5b0t004236@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185/FC-6

Modified Files:
	awstats.spec 
Log Message:
fix dos encoding on logresolvemerge.pl (bug 212965)


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-6/awstats.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- awstats.spec	30 Aug 2006 14:29:10 -0000	1.15
+++ awstats.spec	30 Oct 2006 14:05:07 -0000	1.16
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.6
-Release:    0.2.beta%{?dist}
+Release:    0.3.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -40,7 +40,7 @@
 chmod -x tools/httpd_conf
 find tools/xslt -type f | xargs chmod -x
 # Remove \r in conf file (file written on MS Windows)
-perl -pi -e 's/\r//g' tools/httpd_conf
+perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
 
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+- fix DOS encoding on logresolvemerge.pl
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct 30 14:23:55 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 07:23:55 -0700
Subject: rpms/awstats/FC-5 awstats.spec,1.15,1.16
Message-ID: <200610301423.k9UENtKB004672@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4652

Modified Files:
	awstats.spec 
Log Message:
revert to FC-5 version + encoding fix


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- awstats.spec	30 Oct 2006 14:05:02 -0000	1.15
+++ awstats.spec	30 Oct 2006 14:23:25 -0000	1.16
@@ -1,13 +1,14 @@
 Name:       awstats
-Version:    6.6
-Release:    0.3.beta%{?dist}
+Version:    6.5
+Release:    6%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-#Source0:    http://dl.sf.net/awstats/awstats-6.6.tar.gz
-Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
 Source1:    awstats.README.SELinux
+Patch0:     awstats-6.5-CVE-2006-1945.patch
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -34,6 +35,8 @@
 
 %prep
 %setup -q
+# no backup or the orig file will be installed
+%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -173,14 +176,14 @@
 
 
 %changelog
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.5-5
 - fix DOS encoding on logresolvemerge.pl
 
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
-- rebuild
+* Tue May 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-5
+- really fix CVE-2006-1945...
 
-* Sun May 07 2006 Aurelien Bompard <gauret[AT]free.fr> 6.6-0.1.beta
-- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923)
+* Mon May 08 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-4
+- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923)
 
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-3
 - SELinux support: use semanage to label the cgi and the database files



From fedora-extras-commits at redhat.com  Mon Oct 30 15:05:05 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 30 Oct 2006 08:05:05 -0700
Subject: rpms/gtkwave/devel .cvsignore, 1.24, 1.25 gtkwave.spec, 1.26,
	1.27 sources, 1.24, 1.25
Message-ID: <200610301505.k9UF55ep007943@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7918

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 10:49:15 -0000	1.24
+++ .cvsignore	30 Oct 2006 15:04:34 -0000	1.25
@@ -1 +1 @@
-gtkwave-3.0.14.tar.gz
+gtkwave-3.0.15.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkwave.spec	18 Oct 2006 10:49:15 -0000	1.26
+++ gtkwave.spec	30 Oct 2006 15:04:34 -0000	1.27
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.14
+Version:		3.0.15
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 3.0.15-1
+- update to 3.0.15
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
 - update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Oct 2006 10:49:15 -0000	1.24
+++ sources	30 Oct 2006 15:04:34 -0000	1.25
@@ -1 +1 @@
-ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz
+c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:07:51 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 30 Oct 2006 08:07:51 -0700
Subject: rpms/gtkwave/FC-6 .cvsignore, 1.24, 1.25 gtkwave.spec, 1.26,
	1.27 sources, 1.24, 1.25
Message-ID: <200610301507.k9UF7pKt008081@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8059

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 10:49:15 -0000	1.24
+++ .cvsignore	30 Oct 2006 15:07:21 -0000	1.25
@@ -1 +1 @@
-gtkwave-3.0.14.tar.gz
+gtkwave-3.0.15.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/gtkwave.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkwave.spec	18 Oct 2006 10:49:15 -0000	1.26
+++ gtkwave.spec	30 Oct 2006 15:07:21 -0000	1.27
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.14
+Version:		3.0.15
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 3.0.15-1
+- update to 3.0.15
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
 - update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Oct 2006 10:49:15 -0000	1.24
+++ sources	30 Oct 2006 15:07:21 -0000	1.25
@@ -1 +1 @@
-ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz
+c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:09:11 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 30 Oct 2006 08:09:11 -0700
Subject: rpms/gtkwave/FC-5 .cvsignore, 1.24, 1.25 gtkwave.spec, 1.24,
	1.25 sources, 1.24, 1.25
Message-ID: <200610301509.k9UF9BGp008150@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8129

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 11:06:30 -0000	1.24
+++ .cvsignore	30 Oct 2006 15:08:41 -0000	1.25
@@ -1 +1 @@
-gtkwave-3.0.14.tar.gz
+gtkwave-3.0.15.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtkwave.spec	18 Oct 2006 11:06:30 -0000	1.24
+++ gtkwave.spec	30 Oct 2006 15:08:41 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.14
+Version:		3.0.15
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 3.0.15-1
+- update to 3.0.15
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
 - update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Oct 2006 11:06:30 -0000	1.24
+++ sources	30 Oct 2006 15:08:41 -0000	1.25
@@ -1 +1 @@
-ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz
+c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:10:33 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 30 Oct 2006 08:10:33 -0700
Subject: rpms/gtkwave/FC-4 .cvsignore, 1.24, 1.25 gtkwave.spec, 1.23,
	1.24 sources, 1.24, 1.25
Message-ID: <200610301510.k9UFAXPW008222@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8199

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	18 Oct 2006 11:07:49 -0000	1.24
+++ .cvsignore	30 Oct 2006 15:10:03 -0000	1.25
@@ -1 +1 @@
-gtkwave-3.0.14.tar.gz
+gtkwave-3.0.15.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtkwave.spec	18 Oct 2006 11:07:49 -0000	1.23
+++ gtkwave.spec	30 Oct 2006 15:10:03 -0000	1.24
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.14
+Version:		3.0.15
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 3.0.15-1
+- update to 3.0.15
+
 * Wed Oct 18 2006 Paul Howarth <paul at city-fan.org> 3.0.14-1
 - update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Oct 2006 11:07:49 -0000	1.24
+++ sources	30 Oct 2006 15:10:03 -0000	1.25
@@ -1 +1 @@
-ce1e3744bd5ba9d4d9dcc435df7ae200  gtkwave-3.0.14.tar.gz
+c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:27:19 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 30 Oct 2006 08:27:19 -0700
Subject: rpms/poedit/FC-5 .cvsignore, 1.3, 1.4 poedit.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200610301527.k9UFRJbg008537@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8485/FC-5

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2006 15:13:58 -0000	1.3
+++ .cvsignore	30 Oct 2006 15:26:49 -0000	1.4
@@ -1 +1 @@
-poedit-1.3.5.tar.gz
+poedit-1.3.6.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/poedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poedit.spec	29 Oct 2006 15:13:58 -0000	1.2
+++ poedit.spec	30 Oct 2006 15:26:49 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           poedit
-Version:        1.3.5
+Version:        1.3.6
 Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
@@ -35,10 +35,10 @@
 # Remove a few unnecessary locations where the makefile may install
 # copies of icons and .desktop files
 rm -rf \
-	$RPM_BUILD_ROOT%{_datadir}/applnk \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info
+    $RPM_BUILD_ROOT%{_datadir}/applnk \
+    $RPM_BUILD_ROOT%{_datadir}/mimelnk \
+    $RPM_BUILD_ROOT%{_datadir}/gnome \
+    $RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.6-1
+- Upstream 1.3.6
+
 * Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
 - Upstream 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2006 15:13:58 -0000	1.3
+++ sources	30 Oct 2006 15:26:49 -0000	1.4
@@ -1 +1 @@
-e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz
+01bab36f3065daf9dcddb5dedd7c7143  poedit-1.3.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:27:20 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 30 Oct 2006 08:27:20 -0700
Subject: rpms/poedit/FC-6 .cvsignore, 1.3, 1.4 poedit.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200610301527.k9UFRKZX008542@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8485/FC-6

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2006 15:13:59 -0000	1.3
+++ .cvsignore	30 Oct 2006 15:26:50 -0000	1.4
@@ -1 +1 @@
-poedit-1.3.5.tar.gz
+poedit-1.3.6.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/poedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poedit.spec	29 Oct 2006 15:13:59 -0000	1.3
+++ poedit.spec	30 Oct 2006 15:26:50 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           poedit
-Version:        1.3.5
+Version:        1.3.6
 Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
@@ -35,10 +35,10 @@
 # Remove a few unnecessary locations where the makefile may install
 # copies of icons and .desktop files
 rm -rf \
-	$RPM_BUILD_ROOT%{_datadir}/applnk \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info
+    $RPM_BUILD_ROOT%{_datadir}/applnk \
+    $RPM_BUILD_ROOT%{_datadir}/mimelnk \
+    $RPM_BUILD_ROOT%{_datadir}/gnome \
+    $RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.6-1
+- Upstream 1.3.6
+
 * Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
 - Upstream 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2006 15:13:59 -0000	1.3
+++ sources	30 Oct 2006 15:26:50 -0000	1.4
@@ -1 +1 @@
-e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz
+01bab36f3065daf9dcddb5dedd7c7143  poedit-1.3.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:27:26 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 30 Oct 2006 08:27:26 -0700
Subject: rpms/poedit/devel .cvsignore, 1.3, 1.4 poedit.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200610301527.k9UFRQT0008547@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8485/devel

Modified Files:
	.cvsignore poedit.spec sources 
Log Message:
Upstream 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2006 15:14:00 -0000	1.3
+++ .cvsignore	30 Oct 2006 15:26:55 -0000	1.4
@@ -1 +1 @@
-poedit-1.3.5.tar.gz
+poedit-1.3.6.tar.gz


Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/poedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poedit.spec	29 Oct 2006 15:14:00 -0000	1.3
+++ poedit.spec	30 Oct 2006 15:26:55 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           poedit
-Version:        1.3.5
+Version:        1.3.6
 Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
@@ -35,10 +35,10 @@
 # Remove a few unnecessary locations where the makefile may install
 # copies of icons and .desktop files
 rm -rf \
-	$RPM_BUILD_ROOT%{_datadir}/applnk \
-	$RPM_BUILD_ROOT%{_datadir}/mimelnk \
-	$RPM_BUILD_ROOT%{_datadir}/gnome \
-	$RPM_BUILD_ROOT%{_datadir}/mime-info
+    $RPM_BUILD_ROOT%{_datadir}/applnk \
+    $RPM_BUILD_ROOT%{_datadir}/mimelnk \
+    $RPM_BUILD_ROOT%{_datadir}/gnome \
+    $RPM_BUILD_ROOT%{_datadir}/mime-info
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.6-1
+- Upstream 1.3.6
+
 * Sun Oct 29 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.3.5-1
 - Upstream 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2006 15:14:00 -0000	1.3
+++ sources	30 Oct 2006 15:26:55 -0000	1.4
@@ -1 +1 @@
-e91337ceeeb652b1d8e6b76566f31090  poedit-1.3.5.tar.gz
+01bab36f3065daf9dcddb5dedd7c7143  poedit-1.3.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 15:39:43 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 30 Oct 2006 08:39:43 -0700
Subject: rpms/gaim-meanwhile/FC-6 .cvsignore, 1.9, 1.10 gaim-fedora-prefs.xml,
	1.1, 1.2 gaim-meanwhile.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200610301539.k9UFdhTi008739@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8717

Modified Files:
	.cvsignore gaim-fedora-prefs.xml gaim-meanwhile.spec sources 
Log Message:
Update to beta4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jun 2006 03:24:21 -0000	1.9
+++ .cvsignore	30 Oct 2006 15:39:13 -0000	1.10
@@ -1 +1 @@
-gaim-2.0.0beta3.tar.bz2
+gaim-2.0.0beta4.tar.bz2


Index: gaim-fedora-prefs.xml
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/gaim-fedora-prefs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-fedora-prefs.xml	29 Jun 2006 03:24:21 -0000	1.1
+++ gaim-fedora-prefs.xml	30 Oct 2006 15:39:13 -0000	1.2
@@ -1,261 +1,366 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
-<pref version='1.0' name='/'>
+<pref version='1' name='/'>
 	<pref name='core'>
 		<pref name='away'>
-			<pref name='away_when_idle' type='bool' value='1' />
-			<pref name='mins_before_away' type='int' value='5' />
-			<pref name='default_message' type='string' value='Slightly less boring default' />
-			<pref name='auto_reply' type='string' value='awayidle' />
-		</pref>
-		<pref name='buddies'>
-			<pref name='use_server_alias' type='bool' value='1' />
+			<pref name='idle_reporting' type='string' value='system'/>
+			<pref name='away_when_idle' type='bool' value='1'/>
+			<pref name='mins_before_away' type='int' value='5'/>
+			<pref name='auto_reply' type='string' value='awayidle'/>
 		</pref>
+		<pref name='buddies'/>
 		<pref name='contact'>
-			<pref name='last_match' type='bool' value='0' />
-			<pref name='offline_score' type='int' value='4' />
-			<pref name='away_score' type='int' value='2' />
-			<pref name='idle_score' type='int' value='1' />
+			<pref name='last_match' type='bool' value='0'/>
+			<pref name='offline_score' type='int' value='4'/>
+			<pref name='away_score' type='int' value='2'/>
+			<pref name='idle_score' type='int' value='1'/>
+		</pref>
+		<pref name='debug'>
+			<pref name='timestamps' type='bool' value='0'/>
+		</pref>
+		<pref name='status'>
+			<pref name='scores'>
+				<pref name='offline' type='int' value='-500'/>
+				<pref name='available' type='int' value='100'/>
+				<pref name='invisible' type='int' value='-50'/>
+				<pref name='away' type='int' value='-100'/>
+				<pref name='extended_away' type='int' value='-200'/>
+				<pref name='idle' type='int' value='-10'/>
+			</pref>
+		</pref>
+		<pref name='savedstatus'>
+			<pref name='default' type='int' value='1161808301'/>
+			<pref name='startup' type='int' value='0'/>
+			<pref name='startup_current_status' type='bool' value='1'/>
+			<pref name='idleaway' type='int' value='1161808306'/>
+			<pref name='isidleaway' type='bool' value='0'/>
+			<pref name='current' type='int' value='1153343286'/>
 		</pref>
 		<pref name='conversations'>
-			<pref name='use_alias_for_title' type='bool' value='1' />
 			<pref name='chat'>
-				<pref name='show_nick_change' type='bool' value='1' />
+				<pref name='show_nick_change' type='bool' value='1'/>
 			</pref>
 			<pref name='im'>
-				<pref name='send_typing' type='bool' value='1' />
+				<pref name='send_typing' type='bool' value='1'/>
 			</pref>
 		</pref>
 		<pref name='logging'>
-			<pref name='log_ims' type='bool' value='1' />
-			<pref name='log_chats' type='bool' value='0' />
-			<pref name='log_system' type='bool' value='0' />
-			<pref name='log_signon_signoff' type='bool' value='0' />
-			<pref name='log_idle_state' type='bool' value='0' />
-			<pref name='log_away_state' type='bool' value='0' />
-			<pref name='log_own_states' type='bool' value='0' />
-			<pref name='format' type='string' value='html' />
+			<pref name='log_ims' type='bool' value='1'/>
+			<pref name='log_chats' type='bool' value='0'/>
+			<pref name='log_system' type='bool' value='0'/>
+			<pref name='format' type='string' value='html'/>
 		</pref>
 		<pref name='network'>
-			<pref name='auto_ip' type='bool' value='1' />
-			<pref name='public_ip' type='string' value='' />
-			<pref name='ports_range_use' type='bool' value='0' />
-			<pref name='ports_range_start' type='int' value='1024' />
-			<pref name='ports_range_end' type='int' value='2048' />
+			<pref name='auto_ip' type='bool' value='1'/>
+			<pref name='public_ip' type='string' value='172.16.80.210'/>
+			<pref name='ports_range_use' type='bool' value='0'/>
+			<pref name='ports_range_start' type='int' value='1024'/>
+			<pref name='ports_range_end' type='int' value='2048'/>
+			<pref name='stun_server' type='string' value=''/>
 		</pref>
 		<pref name='proxy'>
-			<pref name='type' type='string' value='none' />
-			<pref name='host' type='string' value='' />
-			<pref name='port' type='int' value='0' />
-			<pref name='username' type='string' value='' />
-			<pref name='password' type='string' value='' />
+			<pref name='type' type='string' value='none'/>
+			<pref name='host' type='string' value=''/>
+			<pref name='port' type='int' value='0'/>
+			<pref name='username' type='string' value=''/>
+			<pref name='password' type='string' value=''/>
 		</pref>
 		<pref name='sound'>
-			<pref name='while_away' type='bool' value='0' />
+			<pref name='while_away' type='bool' value='0'/>
 		</pref>
 	</pref>
 	<pref name='plugins'>
 		<pref name='core'>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1' />
-				<pref name='notify_idle' type='bool' value='1' />
+			<pref name='psychic'>
+				<pref name='buddies_only' type='bool' value='0'/>
+				<pref name='show_notice' type='bool' value='1'/>
+				<pref name='activate_online' type='bool' value='1'/>
 			</pref>
-			<pref name='autorecon'>
-				<pref name='hide_connected_error' type='bool' value='0' />
-				<pref name='hide_connecting_error' type='bool' value='0' />
-				<pref name='restore_state' type='bool' value='1' />
+			<pref name='statenotify'>
+				<pref name='notify_away' type='bool' value='1'/>
+				<pref name='notify_idle' type='bool' value='1'/>
+				<pref name='notify_signon' type='bool' value='1'/>
 			</pref>
 		</pref>
-		<pref name='lopl' />
+		<pref name='lopl'/>
 		<pref name='prpl'>
+			<pref name='qq'>
+				<pref name='show_status_by_icon' type='bool' value='1'/>
+				<pref name='show_fake_video' type='bool' value='0'/>
+				<pref name='prompt_for_missing_packet' type='bool' value='1'/>
+				<pref name='prompt_group_msg_on_recv' type='bool' value='1'/>
+			</pref>
+			<pref name='oscar'>
+				<pref name='recent_buddies' type='bool' value='0'/>
+				<pref name='show_idle' type='bool' value='0'/>
+			</pref>
 			<pref name='silc'>
-				<pref name='sign_im' type='bool' value='0' />
-				<pref name='verify_im' type='bool' value='0' />
-				<pref name='sign_chat' type='bool' value='0' />
-				<pref name='verify_chat' type='bool' value='0' />
-				<pref name='vcard' type='string' value='' />
+				<pref name='sign_im' type='bool' value='0'/>
+				<pref name='verify_im' type='bool' value='0'/>
+				<pref name='sign_chat' type='bool' value='0'/>
+				<pref name='verify_chat' type='bool' value='0'/>
+				<pref name='vcard' type='string' value=''/>
 			</pref>
 			<pref name='msn'>
-				<pref name='conv_close_notice' type='bool' value='1' />
-				<pref name='conv_timeout_notice' type='bool' value='1' />
+				<pref name='conv_close_notice' type='bool' value='1'/>
+				<pref name='conv_timeout_notice' type='bool' value='1'/>
 			</pref>
 			<pref name='jabber'>
-				<pref name='hide_os' type='bool' value='0' />
+				<pref name='hide_os' type='bool' value='0'/>
 			</pref>
 		</pref>
 		<pref name='gtk'>
-			<pref name='docklet'>
-				<pref name='queue_messages' type='bool' value='0' />
+			<pref name='musicmessaging'>
+				<pref name='editor_path' type='string' value='/usr/local/bin/gscore'/>
+			</pref>
+			<pref name='extplacement'>
+				<pref name='placement_number' type='int' value='4'/>
+				<pref name='placement_number_separate' type='bool' value='0'/>
+			</pref>
+			<pref name='timestamp'>
+				<pref name='interval' type='int' value='300000'/>
+			</pref>
+			<pref name='timestamp_format'>
+				<pref name='force_24hr' type='bool' value='1'/>
+				<pref name='use_dates'>
+					<pref name='conversation' type='string' value='automatic'/>
+					<pref name='log' type='string' value='automatic'/>
+				</pref>
+			</pref>
+			<pref name='gaimrc'>
+				<pref name='set'>
+					<pref name='gtk-font-name' type='bool' value='0'/>
+					<pref name='gtk-key-theme-name' type='bool' value='0'/>
+					<pref name='color'>
+						<pref name='GtkWidget::cursor-color' type='bool' value='0'/>
+						<pref name='GtkWidget::secondary-cursor-color' type='bool' value='0'/>
+						<pref name='GtkIMHtml::hyperlink-color' type='bool' value='0'/>
+					</pref>
+					<pref name='size'>
+						<pref name='GtkTreeView::expander_size' type='bool' value='0'/>
+						<pref name='GtkTreeView::horizontal_separator' type='bool' value='0'/>
+					</pref>
+					<pref name='font'>
+						<pref name='*gaim_gtkconv_entry' type='bool' value='0'/>
+						<pref name='*gaim_gtkconv_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtklog_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtkrequest_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtknotify_imhtml' type='bool' value='0'/>
+					</pref>
+					<pref name='bool'>
+						<pref name='GtkTreeView::indent_expanders' type='bool' value='0'/>
+					</pref>
+				</pref>
+				<pref name='gtk-font-name' type='string' value=''/>
+				<pref name='gtk-key-theme-name' type='string' value=''/>
+				<pref name='color'>
+					<pref name='GtkWidget::cursor-color' type='string' value=''/>
+					<pref name='GtkWidget::secondary-cursor-color' type='string' value=''/>
+					<pref name='GtkIMHtml::hyperlink-color' type='string' value=''/>
+				</pref>
+				<pref name='size'>
+					<pref name='GtkTreeView::expander_size' type='int' value='0'/>
+					<pref name='GtkTreeView::horizontal_separator' type='int' value='0'/>
+				</pref>
+				<pref name='font'>
+					<pref name='*gaim_gtkconv_entry' type='string' value=''/>
+					<pref name='*gaim_gtkconv_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtklog_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtkrequest_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtknotify_imhtml' type='string' value=''/>
+				</pref>
+				<pref name='bool'>
+					<pref name='GtkTreeView::indent_expanders' type='bool' value='1'/>
+				</pref>
 			</pref>
 			<pref name='X11'>
 				<pref name='gestures'>
-					<pref name='visual' type='bool' value='0' />
+					<pref name='visual' type='bool' value='0'/>
 				</pref>
 				<pref name='notify'>
-					<pref name='type_im' type='bool' value='1' />
-					<pref name='type_chat' type='bool' value='0' />
-					<pref name='type_focused' type='bool' value='0' />
-					<pref name='method_string' type='bool' value='0' />
-					<pref name='title_string' type='string' value='(*)' />
-					<pref name='method_urgent' type='bool' value='1' />
-					<pref name='method_count' type='bool' value='1' />
-					<pref name='notify_focus' type='bool' value='1' />
-					<pref name='notify_click' type='bool' value='1' />
-					<pref name='notify_type' type='bool' value='1' />
-					<pref name='notify_send' type='bool' value='1' />
-					<pref name='notify_switch' type='bool' value='1' />
+					<pref name='type_im' type='bool' value='1'/>
+					<pref name='type_chat' type='bool' value='0'/>
+					<pref name='type_chat_nick' type='bool' value='0'/>
+					<pref name='type_focused' type='bool' value='0'/>
+					<pref name='method_string' type='bool' value='0'/>
+					<pref name='title_string' type='string' value='(*)'/>
+					<pref name='method_urgent' type='bool' value='1'/>
+					<pref name='method_count' type='bool' value='1'/>
+					<pref name='method_count_xprop' type='bool' value='0'/>
+					<pref name='method_raise' type='bool' value='0'/>
+					<pref name='notify_focus' type='bool' value='1'/>
+					<pref name='notify_click' type='bool' value='1'/>
+					<pref name='notify_type' type='bool' value='1'/>
+					<pref name='notify_send' type='bool' value='1'/>
+					<pref name='notify_switch' type='bool' value='1'/>
 				</pref>
 			</pref>
-			<pref name='timestamp'>
-				<pref name='interval' type='int' value='300000' />
+			<pref name='docklet'>
+				<pref name='blink_im' type='string' value='hidden'/>
+				<pref name='blink_chat' type='string' value='never'/>
 			</pref>
-			<pref name='extplacement'>
-				<pref name='placement_number' type='int' value='4' />
-				<pref name='placement_number_separate' type='bool' value='0' />
+		</pref>
+		<pref name='gnt'>
+			<pref name='gntgf'>
+				<pref name='events'>
+					<pref name='signonf' type='bool' value='1'/>
+					<pref name='immsg' type='bool' value='1'/>
+					<pref name='chatmsg' type='bool' value='1'/>
+					<pref name='chatnick' type='bool' value='1'/>
+				</pref>
+				<pref name='beep' type='bool' value='1'/>
+				<pref name='urgent' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>
 	<pref name='gaim'>
 		<pref name='gtk'>
-			<pref name='accounts'>
-				<pref name='dialog'>
-					<pref name='width' type='int' value='550' />
-					<pref name='height' type='int' value='250' />
-				</pref>
-			</pref>
-			<pref name='away'>
-				<pref name='queue_messages' type='bool' value='0' />
-			</pref>
 			<pref name='browsers'>
-				<pref name='place' type='int' value='0' />
-				<pref name='command' type='string' value='' />
-				<pref name='browser' type='string' value='gnome-open' />
-			</pref>
-			<pref name='idle'>
-				<pref name='reporting_method' type='string' value='system' />
+				<pref name='place' type='int' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='browser' type='string' value='gnome-open'/>
 			</pref>
 			<pref name='plugins'>
 				<pref name='loaded' type='stringlist'>
-					<item value='/usr/lib/gaim/autorecon.so' />
-					<item value='/usr/lib/gaim/history.so' />
-					<item value='/usr/lib/gaim/docklet.so' />
-					<item value='/usr/lib/gaim/extplacement.so' />
-					<item value='/usr/lib/gaim/notify.so' />
+					<item value='/usr/lib/gaim/autorecon.so'/>
+					<item value='/usr/lib/gaim/history.so'/>
+					<item value='/usr/lib/gaim/docklet.so'/>
+					<item value='/usr/lib/gaim/extplacement.so'/>
+					<item value='/usr/lib/gaim/notify.so'/>
 				</pref>
 			</pref>
+			<pref name='filelocations'>
+				<pref name='last_save_folder' type='string' value=''/>
+				<pref name='last_open_folder' type='string' value=''/>
+				<pref name='last_icon_folder' type='string' value=''/>
+			</pref>
 			<pref name='smileys'>
-				<pref name='theme' type='string' value='/usr/share/pixmaps/gaim/smileys/default/theme' />
+				<pref name='theme' type='string' value='Default'/>
 			</pref>
 			<pref name='debug'>
-				<pref name='enabled' type='bool' value='0' />
-				<pref name='timestamps' type='bool' value='0' />
-				<pref name='toolbar' type='bool' value='1' />
-				<pref name='width' type='int' value='450' />
-				<pref name='height' type='int' value='250' />
+				<pref name='enabled' type='bool' value='0'/>
+				<pref name='filterlevel' type='int' value='0'/>
+				<pref name='style' type='int' value='3'/>
+				<pref name='toolbar' type='bool' value='1'/>
+				<pref name='width' type='int' value='450'/>
+				<pref name='height' type='int' value='250'/>
+				<pref name='regex' type='string' value=''/>
+				<pref name='filter' type='bool' value='0'/>
+				<pref name='invert' type='bool' value='0'/>
+				<pref name='case_insensitive' type='bool' value='0'/>
+				<pref name='highlight' type='bool' value='0'/>
 			</pref>
 			<pref name='sound'>
 				<pref name='enabled'>
-					<pref name='login' type='bool' value='1' />
-					<pref name='logout' type='bool' value='1' />
-					<pref name='im_recv' type='bool' value='1' />
-					<pref name='first_im_recv' type='bool' value='0' />
-					<pref name='send_im' type='bool' value='1' />
-					<pref name='join_chat' type='bool' value='0' />
-					<pref name='left_chat' type='bool' value='0' />
-					<pref name='send_chat_msg' type='bool' value='0' />
-					<pref name='chat_msg_recv' type='bool' value='0' />
-					<pref name='nick_said' type='bool' value='0' />
-					<pref name='pounce_default' type='bool' value='1' />
+					<pref name='login' type='bool' value='1'/>
+					<pref name='logout' type='bool' value='1'/>
+					<pref name='im_recv' type='bool' value='1'/>
+					<pref name='first_im_recv' type='bool' value='0'/>
+					<pref name='send_im' type='bool' value='1'/>
+					<pref name='join_chat' type='bool' value='0'/>
+					<pref name='left_chat' type='bool' value='0'/>
+					<pref name='send_chat_msg' type='bool' value='0'/>
+					<pref name='chat_msg_recv' type='bool' value='0'/>
+					<pref name='nick_said' type='bool' value='0'/>
+					<pref name='pounce_default' type='bool' value='1'/>
 				</pref>
 				<pref name='file'>
-					<pref name='login' type='string' value='' />
-					<pref name='logout' type='string' value='' />
-					<pref name='im_recv' type='string' value='' />
-					<pref name='first_im_recv' type='string' value='' />
-					<pref name='send_im' type='string' value='' />
-					<pref name='join_chat' type='string' value='' />
-					<pref name='left_chat' type='string' value='' />
-					<pref name='send_chat_msg' type='string' value='' />
-					<pref name='chat_msg_recv' type='string' value='' />
-					<pref name='nick_said' type='string' value='' />
-					<pref name='pounce_default' type='string' value='' />
-				</pref>
-				<pref name='conv_focus' type='bool' value='1' />
-				<pref name='command' type='string' value='' />
-				<pref name='method' type='string' value='automatic' />
+					<pref name='login' type='string' value=''/>
+					<pref name='logout' type='string' value=''/>
+					<pref name='im_recv' type='string' value=''/>
+					<pref name='first_im_recv' type='string' value=''/>
+					<pref name='send_im' type='string' value=''/>
+					<pref name='join_chat' type='string' value=''/>
+					<pref name='left_chat' type='string' value=''/>
+					<pref name='send_chat_msg' type='string' value=''/>
+					<pref name='chat_msg_recv' type='string' value=''/>
+					<pref name='nick_said' type='string' value=''/>
+					<pref name='pounce_default' type='string' value=''/>
+				</pref>
+				<pref name='conv_focus' type='bool' value='1'/>
+				<pref name='mute' type='bool' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='method' type='string' value='automatic'/>
+				<pref name='volume' type='int' value='50'/>
+			</pref>
+			<pref name='accounts'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
+				<pref name='buddyicon' type='string' value=''/>
 			</pref>
 			<pref name='blist'>
-				<pref name='auto_expand_contacts' type='bool' value='1' />
-				<pref name='button_style' type='int' value='3' />
-				<pref name='grey_idle_buddies' type='bool' value='1' />
-				<pref name='raise_on_events' type='bool' value='0' />
-				<pref name='show_buddy_icons' type='bool' value='0' />
-				<pref name='show_empty_groups' type='bool' value='0' />
-				<pref name='show_idle_time' type='bool' value='1' />
-				<pref name='show_offline_buddies' type='bool' value='0' />
-				<pref name='show_warning_level' type='bool' value='1' />
-				<pref name='sort_type' type='string' value='alphabetical' />
-				<pref name='x' type='int' value='0' />
-				<pref name='y' type='int' value='0' />
-				<pref name='width' type='int' value='309' />
-				<pref name='height' type='int' value='500' />
-				<pref name='tooltip_delay' type='int' value='500' />
+				<pref name='show_buddy_icons' type='bool' value='0'/>
+				<pref name='show_empty_groups' type='bool' value='0'/>
+				<pref name='show_idle_time' type='bool' value='1'/>
+				<pref name='show_offline_buddies' type='bool' value='0'/>
+				<pref name='list_visible' type='bool' value='1'/>
+				<pref name='list_maximized' type='bool' value='0'/>
+				<pref name='sort_type' type='string' value='alphabetical'/>
+				<pref name='x' type='int' value='133'/>
+				<pref name='y' type='int' value='75'/>
+				<pref name='width' type='int' value='309'/>
+				<pref name='height' type='int' value='500'/>
+				<pref name='tooltip_delay' type='int' value='500'/>
+			</pref>
+			<pref name='status'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
 			</pref>
 			<pref name='conversations'>
-				<pref name='close_on_tabs' type='bool' value='1' />
-				<pref name='ctrl_enter_sends' type='bool' value='0' />
-				<pref name='enter_sends' type='bool' value='1' />
-				<pref name='escape_closes' type='bool' value='0' />
-				<pref name='send_formatting' type='bool' value='0' />
-				<pref name='send_bold' type='bool' value='0' />
-				<pref name='send_italic' type='bool' value='0' />
-				<pref name='send_underline' type='bool' value='0' />
-				<pref name='show_timestamps' type='bool' value='1' />
-				<pref name='spellcheck' type='bool' value='1' />
-				<pref name='ignore_colors' type='bool' value='0' />
-				<pref name='ignore_fonts' type='bool' value='0' />
-				<pref name='ignore_font_sizes' type='bool' value='0' />
-				<pref name='html_shortcuts' type='bool' value='1' />
-				<pref name='smiley_shortcuts' type='bool' value='0' />
-				<pref name='show_formatting_toolbar' type='bool' value='1' />
-				<pref name='passthrough_unknown_commands' type='bool' value='0' />
-				<pref name='placement' type='string' value='last' />
-				<pref name='placement_number' type='int' value='1' />
-				<pref name='bgcolor' type='string' value='' />
-				<pref name='fgcolor' type='string' value='' />
-				<pref name='font_face' type='string' value='' />
-				<pref name='font_size' type='int' value='3' />
-				<pref name='tabs' type='bool' value='1' />
-				<pref name='tab_side' type='int' value='2' />
-				<pref name='button_type' type='int' value='3' />
+				<pref name='use_smooth_scrolling' type='bool' value='1'/>
+				<pref name='close_on_tabs' type='bool' value='1'/>
+				<pref name='send_bold' type='bool' value='0'/>
+				<pref name='send_italic' type='bool' value='0'/>
+				<pref name='send_underline' type='bool' value='0'/>
+				<pref name='spellcheck' type='bool' value='1'/>
+				<pref name='show_incoming_formatting' type='bool' value='1'/>
+				<pref name='show_timestamps' type='bool' value='1'/>
+				<pref name='show_formatting_toolbar' type='bool' value='1'/>
+				<pref name='passthrough_unknown_commands' type='bool' value='0'/>
+				<pref name='placement' type='string' value='last'/>
+				<pref name='placement_number' type='int' value='1'/>
+				<pref name='bgcolor' type='string' value=''/>
+				<pref name='fgcolor' type='string' value=''/>
+				<pref name='font_face' type='string' value=''/>
+				<pref name='font_size' type='int' value='3'/>
+				<pref name='tabs' type='bool' value='1'/>
+				<pref name='tab_side' type='int' value='2'/>
+				<pref name='scrollback_lines' type='int' value='4000'/>
 				<pref name='chat'>
-					<pref name='color_nicks' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='userlist_width' type='int' value='80'/>
 				</pref>
 				<pref name='im'>
-					<pref name='animate_buddy_icons' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
-					<pref name='show_buddy_icons' type='bool' value='1' />
+					<pref name='animate_buddy_icons' type='bool' value='1'/>
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='show_buddy_icons' type='bool' value='1'/>
+					<pref name='hide_new' type='string' value='never'/>
 				</pref>
 			</pref>
 			<pref name='pounces'>
 				<pref name='default_actions'>
-					<pref name='open-window' type='bool' value='0' />
-					<pref name='popup-notify' type='bool' value='0' />
-					<pref name='send-message' type='bool' value='1' />
-					<pref name='execute-command' type='bool' value='0' />
-					<pref name='play-sound' type='bool' value='0' />
+					<pref name='open-window' type='bool' value='0'/>
+					<pref name='popup-notify' type='bool' value='0'/>
+					<pref name='send-message' type='bool' value='1'/>
+					<pref name='execute-command' type='bool' value='0'/>
+					<pref name='play-sound' type='bool' value='0'/>
+				</pref>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='520'/>
+					<pref name='height' type='int' value='321'/>
 				</pref>
 			</pref>
 			<pref name='filetransfer'>
-				<pref name='clear_finished' type='bool' value='1' />
-				<pref name='keep_open' type='bool' value='0' />
+				<pref name='clear_finished' type='bool' value='1'/>
+				<pref name='keep_open' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/gaim-meanwhile.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gaim-meanwhile.spec	28 Aug 2006 00:56:48 -0000	1.15
+++ gaim-meanwhile.spec	30 Oct 2006 15:39:13 -0000	1.16
@@ -23,11 +23,11 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta3
+%define betaver	beta4
 
 Name:		gaim-meanwhile
 Version:	2.0.0
-Release:	0.4.%{betaver}%{?dist}
+Release:	0.5.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -121,7 +121,7 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
-%patch5 -p1
+#%patch5 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -200,6 +200,8 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/libgaim*
 rm -rf $RPM_BUILD_ROOT%{_datadir}
 rm -rf $RPM_BUILD_ROOT%{_prefix}/src
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gaim.schemas
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gaim/private
 
 #preserve the libsametime debug libraries and delete the rest
 #mv $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/libsametime.so.debug $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/sametime.tmp
@@ -250,6 +252,9 @@
 %{_libdir}/gaim/
 
 %changelog
+* Sat Oct 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.5.beta4
+- Rebuild against most recent core package
+
 * Sun Aug 27 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.4.beta3
 - Bump and rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jun 2006 03:24:21 -0000	1.9
+++ sources	30 Oct 2006 15:39:13 -0000	1.10
@@ -1 +1 @@
-c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2
+ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 15:59:16 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 08:59:16 -0700
Subject: rpms/fslint/devel .cvsignore, 1.3, 1.4 fslint.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200610301559.k9UFxGUd008907@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8887

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2005 19:20:07 -0000	1.3
+++ .cvsignore	30 Oct 2006 15:58:46 -0000	1.4
@@ -1 +1 @@
-FSlint-2.11.tar.gz
+fslint-2.16.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fslint.spec	19 Sep 2006 12:46:18 -0000	1.7
+++ fslint.spec	30 Oct 2006 15:58:46 -0000	1.8
@@ -1,17 +1,18 @@
 Name:           fslint
-Version:        2.11
-Release:        3
+Version:        2.16
+Release:        1%{?dist}
+Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
+Source0:        http://www.pixelbeat.org/fslint/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -19,11 +20,9 @@
 
 
 %prep
-%setup -q -n FSlint-%{version}
-%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
-%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
-mv fslint/fstool/README README.fstool
-mv fslint/rmlint/README README.rmlint
+%setup -q -n %{name}-%{version}
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' fslint-gui
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' fslint-gui
 
 
 %build
@@ -32,19 +31,27 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -Dpm 755 fslint-gui $RPM_BUILD_ROOT%{_bindir}/fslint-gui
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,supprt}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/supprt/rmlint
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
 install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
+install -pm 755 fslint/{find*,fslint,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
 install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -pm 755 fslint/rmlint/* \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
+install -pm 644 fslint/supprt/fslver \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/get* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/rmlint/* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt/rmlint
+
+cp -a man/* \
+  $RPM_BUILD_ROOT%{_mandir}/man1/
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
@@ -64,14 +71,25 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/* README.*
-%{_bindir}/*lint
+%doc doc/*
+%{_mandir}/man1/fslint*
+%{_bindir}/fslint-gui
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
+- Update to 2.16 which has some minor packaging changes
+  to align with the debian package (suggested by lintian) and also
+- has man pages for fslint and fslint-gui.
+  Other Packaging changes introduced in 2.14 were
+- /usr/bin/{fs,FS}lint -> /usr/bin/fslint-gui
+- Tidy up /usr/bin/fslint/fslint directory
+- In addition to the above upstream changes I added
+  the dist tag to the release version
+
 * Tue Sep 19 2006 P??draig Brady <P at draigBrady.com> - 2.11-3
 - Rebuild for FC6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2005 19:20:07 -0000	1.3
+++ sources	30 Oct 2006 15:58:46 -0000	1.4
@@ -1 +1 @@
-518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz
+76307326b8be8a6404675965be481435  fslint-2.16.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 16:09:44 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 09:09:44 -0700
Subject: rpms/fslint/FC-6 .cvsignore, 1.3, 1.4 fslint.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200610301609.k9UG9icN011971@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11948

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2005 19:20:07 -0000	1.3
+++ .cvsignore	30 Oct 2006 16:09:14 -0000	1.4
@@ -1 +1 @@
-FSlint-2.11.tar.gz
+fslint-2.16.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/fslint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fslint.spec	19 Sep 2006 12:46:18 -0000	1.7
+++ fslint.spec	30 Oct 2006 16:09:14 -0000	1.8
@@ -1,17 +1,18 @@
 Name:           fslint
-Version:        2.11
-Release:        3
+Version:        2.16
+Release:        1%{?dist}
+Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
+Source0:        http://www.pixelbeat.org/fslint/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -19,11 +20,9 @@
 
 
 %prep
-%setup -q -n FSlint-%{version}
-%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
-%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
-mv fslint/fstool/README README.fstool
-mv fslint/rmlint/README README.rmlint
+%setup -q -n %{name}-%{version}
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' fslint-gui
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' fslint-gui
 
 
 %build
@@ -32,19 +31,27 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -Dpm 755 fslint-gui $RPM_BUILD_ROOT%{_bindir}/fslint-gui
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,supprt}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/supprt/rmlint
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
 install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
+install -pm 755 fslint/{find*,fslint,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
 install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -pm 755 fslint/rmlint/* \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
+install -pm 644 fslint/supprt/fslver \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/get* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/rmlint/* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt/rmlint
+
+cp -a man/* \
+  $RPM_BUILD_ROOT%{_mandir}/man1/
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
@@ -64,14 +71,25 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/* README.*
-%{_bindir}/*lint
+%doc doc/*
+%{_mandir}/man1/fslint*
+%{_bindir}/fslint-gui
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
+- Update to 2.16 which has some minor packaging changes
+  to align with the debian package (suggested by lintian) and also
+- has man pages for fslint and fslint-gui.
+  Other Packaging changes introduced in 2.14 were
+- /usr/bin/{fs,FS}lint -> /usr/bin/fslint-gui
+- Tidy up /usr/bin/fslint/fslint directory
+- In addition to the above upstream changes I added
+  the dist tag to the release version
+
 * Tue Sep 19 2006 P??draig Brady <P at draigBrady.com> - 2.11-3
 - Rebuild for FC6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2005 19:20:07 -0000	1.3
+++ sources	30 Oct 2006 16:09:14 -0000	1.4
@@ -1 +1 @@
-518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz
+76307326b8be8a6404675965be481435  fslint-2.16.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 16:15:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 09:15:34 -0700
Subject: rpms/fslint/FC-5 .cvsignore, 1.3, 1.4 fslint.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <200610301615.k9UGFYhT012070@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12050

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2005 19:20:07 -0000	1.3
+++ .cvsignore	30 Oct 2006 16:15:04 -0000	1.4
@@ -1 +1 @@
-FSlint-2.11.tar.gz
+fslint-2.16.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/fslint.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fslint.spec	29 Mar 2005 19:20:07 -0000	1.6
+++ fslint.spec	30 Oct 2006 16:15:04 -0000	1.7
@@ -1,17 +1,18 @@
 Name:           fslint
-Version:        2.11
-Release:        2
+Version:        2.16
+Release:        1%{?dist}
+Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
+Source0:        http://www.pixelbeat.org/fslint/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -19,11 +20,9 @@
 
 
 %prep
-%setup -q -n FSlint-%{version}
-%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
-%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
-mv fslint/fstool/README README.fstool
-mv fslint/rmlint/README README.rmlint
+%setup -q -n %{name}-%{version}
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' fslint-gui
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' fslint-gui
 
 
 %build
@@ -32,19 +31,27 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -Dpm 755 fslint-gui $RPM_BUILD_ROOT%{_bindir}/fslint-gui
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,supprt}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/supprt/rmlint
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
 install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
+install -pm 755 fslint/{find*,fslint,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
 install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -pm 755 fslint/rmlint/* \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
+install -pm 644 fslint/supprt/fslver \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/get* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt
+install -pm 755 fslint/supprt/rmlint/* \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/supprt/rmlint
+
+cp -a man/* \
+  $RPM_BUILD_ROOT%{_mandir}/man1/
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
@@ -64,14 +71,28 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/* README.*
-%{_bindir}/*lint
+%doc doc/*
+%{_mandir}/man1/fslint*
+%{_bindir}/fslint-gui
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
+- Update to 2.16 which has some minor packaging changes
+  to align with the debian package (suggested by lintian) and also
+- has man pages for fslint and fslint-gui.
+  Other Packaging changes introduced in 2.14 were
+- /usr/bin/{fs,FS}lint -> /usr/bin/fslint-gui
+- Tidy up /usr/bin/fslint/fslint directory
+- In addition to the above upstream changes I added
+  the dist tag to the release version
+
+* Tue Sep 19 2006 P??draig Brady <P at draigBrady.com> - 2.11-3
+- Rebuild for FC6 mass rebuild
+
 * Fri Mar 18 2005 P??draig Brady <P at draigBrady.com> - 2.11-2
 - Update to 2.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2005 19:20:07 -0000	1.3
+++ sources	30 Oct 2006 16:15:04 -0000	1.4
@@ -1 +1 @@
-518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz
+76307326b8be8a6404675965be481435  fslint-2.16.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 16:50:59 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:50:59 -0700
Subject: rpms/eclipse-emf - New directory
Message-ID: <200610301650.k9UGoxDG012444@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12440/eclipse-emf

Log Message:
Directory /cvs/extras/rpms/eclipse-emf added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 30 16:51:05 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:51:05 -0700
Subject: rpms/eclipse-emf/devel - New directory
Message-ID: <200610301651.k9UGp5Oe012462@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12440/eclipse-emf/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-emf/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 30 16:51:18 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:51:18 -0700
Subject: rpms/eclipse-emf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610301651.k9UGpIFc012495@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12488

Added Files:
	Makefile import.log 
Log Message:
Setup of module eclipse-emf


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-emf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 30 16:51:23 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:51:23 -0700
Subject: rpms/eclipse-emf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610301651.k9UGpNDD012512@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12488/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-emf


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 30 16:53:17 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:53:17 -0700
Subject: rpms/eclipse-emf import.log,1.1,1.2
Message-ID: <200610301653.k9UGrHX0012665@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12606

Modified Files:
	import.log 
Log Message:
auto-import eclipse-emf-2.2.1-1 on branch devel from eclipse-emf-2.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Oct 2006 16:51:17 -0000	1.1
+++ import.log	30 Oct 2006 16:52:47 -0000	1.2
@@ -0,0 +1 @@
+eclipse-emf-2_2_1-1:HEAD:eclipse-emf-2.2.1-1.src.rpm:1162226857



From fedora-extras-commits at redhat.com  Mon Oct 30 16:53:18 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 09:53:18 -0700
Subject: rpms/eclipse-emf/devel
	eclipse-emf-addforceContextQualiferproperty.patch, NONE,
	1.1 eclipse-emf-buildAll.patch, NONE,
	1.1 eclipse-emf-customTargets.xml.patch, NONE,
	1.1 eclipse-emf-examples-dontChangeBundleClasspath.patch, NONE,
	1.1 eclipse-emf-javadoc.patch, NONE,
	1.1 eclipse-emf-nobootclasspath.patch, NONE,
	1.1 eclipse-emf-platformjavadocname.patch, NONE,
	1.1 eclipse-emf.spec, NONE, 1.1 fetch-eclipse-emf.sh, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610301653.k9UGrI1H012669@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12606/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-emf-addforceContextQualiferproperty.patch 
	eclipse-emf-buildAll.patch eclipse-emf-customTargets.xml.patch 
	eclipse-emf-examples-dontChangeBundleClasspath.patch 
	eclipse-emf-javadoc.patch eclipse-emf-nobootclasspath.patch 
	eclipse-emf-platformjavadocname.patch eclipse-emf.spec 
	fetch-eclipse-emf.sh 
Log Message:
auto-import eclipse-emf-2.2.1-1 on branch devel from eclipse-emf-2.2.1-1.src.rpm

eclipse-emf-addforceContextQualiferproperty.patch:

--- NEW FILE eclipse-emf-addforceContextQualiferproperty.patch ---
Index: build.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/build.xml,v
retrieving revision 1.14
diff -u -p -r1.14 build.xml
--- build.xml	7 Nov 2005 20:37:26 -0000	1.14
+++ build.xml	27 Jul 2006 19:42:36 -0000
@@ -12,6 +12,7 @@
 		<property name="buildType" value="I" />
 		<property name="buildId" value="build" />
 		<property name="buildid" value="build" />
+		<property name="forceContextQualifier" value="v${DSTAMP}${TSTAMP}" />
 		
 		<!-- Verify buildDirectory ends in eclipse. -->
 		<property name="fullBuild" location="${buildDirectory}"/>

eclipse-emf-buildAll.patch:

--- NEW FILE eclipse-emf-buildAll.patch ---
Index: buildAll.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/buildAll.xml,v
retrieving revision 1.58
diff -u -p -r1.58 buildAll.xml
--- buildAll.xml	19 Jun 2006 16:53:35 -0000	1.58
+++ buildAll.xml	1 Aug 2006 23:07:02 -0000
@@ -20,7 +20,7 @@
 		<!-- Reduce the amount of info in the build log -->
 		<property name="javacVerbose" value="false"/>
 
-		<property name="buildDirectory" location="${basedir}/../src/eclipse"/>
+		<property name="buildDirectory" location="${basedir}/src/eclipse"/>
 		<property file="${basedir}/repoInfo.properties"/>
 		<property name="testBase" location="${buildDirectory}/../testing"/>
 		<available file="${buildDirectory}/label.properties" property="label.properties.exists"/>
@@ -43,7 +43,9 @@
 		</condition>
 	  
 	  <!-- build emf.build.jar -->
-	  <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
+	  <property name="emfBuilderDir" location="${buildDirectory}/../.." />
+	  <echo message="buildDirectory:  ${buildDirectory}"/>
+	  <echo message="emfBuilderDir:  ${emfBuilderDir}"/>
 	  <ant antfile="${emfBuilderDir}/org.eclipse.emf.build/build.xml" 
 	       inheritall="false" dir="${emfBuilderDir}/org.eclipse.emf.build"/>
 	</target>
@@ -136,6 +138,17 @@
 		<antcall target="cleanUp"/>
 	</target>
 
+	<target name="buildRPM" depends="init">
+		<ant antfile="build.xml" target="main">
+			<property name="component" value="sdk"/>
+		</ant>
+		<ant antfile="build.xml" target="main">
+			<property name="component" value="examples"/>
+		</ant>
+		<!-- extra zips -->
+		<ant antfile="${emfBuilderDir}/zips/build.xml"/>
+	</target>
+
 	<target name="buildAll" depends="init">
 		<ant antfile="build.xml" target="main">
 			<property name="component" value="sdk"/>

eclipse-emf-customTargets.xml.patch:

--- NEW FILE eclipse-emf-customTargets.xml.patch ---
Index: sdk/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/sdk/customTargets.xml,v
retrieving revision 1.36
diff -u -p -r1.36 customTargets.xml
--- sdk/customTargets.xml	17 Jul 2006 00:02:48 -0000	1.36
+++ sdk/customTargets.xml	24 Oct 2006 17:27:48 -0000
@@ -88,13 +88,15 @@
   <!-- Steps to do before generating build scripts -->
   <!-- ===================================================================== -->
   <target name="preGenerate">
-    <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
+    <property name="emfBuilderDir" location="${buildDirectory}/../../org.eclipse.emf.releng.build" />
+    <echo message="buildDirectory: ${buildDirectory}" />
     <echo message="emfBuilderDir: ${emfBuilderDir}" />
-    
+    <echo message="bundlesDirectory: ${buildDirectory}/plugins" />
+
     <java classname="org.eclipse.emf.build.ChangeBundleClasspath"
       classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
       <arg line="-bundlesDirectory ${buildDirectory}/plugins"/>
-      <arg line="-bundleDirectoryExcludeRegex org\.eclipse\.(emf|xsd)\.cheatsheets"/>
+      <arg line="-bundleDirectoryExcludeRegex org\.eclipse\.(emf|xsd)\.(cheatsheets|example)"/>
       <arg line="-verbose"/>
     </java>
 
@@ -140,7 +142,7 @@
   <!-- Steps to do after generating the build scripts -->
   <!-- ===================================================================== -->
   <target name="postGenerate">
-    <antcall target="clean" />
+<!--    <antcall target="clean" />-->
 
     <property name="emfBuilderDir" location="${buildDirectory}/../org.eclipse.emf.releng.build" />
     <echo message="emfBuilderDir: ${emfBuilderDir}" />

eclipse-emf-examples-dontChangeBundleClasspath.patch:

--- NEW FILE eclipse-emf-examples-dontChangeBundleClasspath.patch ---
Index: examples/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/examples/customTargets.xml,v
retrieving revision 1.16
diff -u -p -r1.16 customTargets.xml
--- examples/customTargets.xml	24 Aug 2006 14:47:17 -0000	1.16
+++ examples/customTargets.xml	20 Oct 2006 16:05:43 -0000
@@ -86,13 +86,6 @@
   <!-- Steps to do before generating build scripts -->
   <!-- ===================================================================== -->
   <target name="preGenerate">
-    <java classname="org.eclipse.emf.build.ChangeBundleClasspath" 
-    	classpath="${emfBuilderDir}/org.eclipse.emf.build/emf.build.jar">
-      <arg line="-bundlesDirectory ${buildDirectory}/plugins" />
-      <arg line="-bundleDirectoryMatchRegex org\.eclipse\.emf\.(java|examples|library|exporter\.html).*\.*" />
-      <arg line="-verbose" />
-    </java>
-  	
   	<property name="eclipse.plugins" value="${buildDirectory}/plugins"/>
   	<emf.build.SetRequiredBundleVersionRanges verbose="true">
   	  	<manifestSet dir="${eclipse.plugins}">

eclipse-emf-javadoc.patch:

--- NEW FILE eclipse-emf-javadoc.patch ---
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh	2006-07-13 13:57:55.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/antJavadoc.sh	2006-07-13 13:57:08.000000000 -0400
@@ -87,5 +87,5 @@
 ant	-f javadoc.xml \
 	-DdestDir="$destDir" \
 	-Dclasspath="$classpath" \
-	-DeclipseDir="$eclipseDir" \
+	-DeclipseDir="../../../../../../SDK" \
 	-Doverview="$eclipseDir/plugins/org.eclipse.emf.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-07-13 15:09:47.000000000 -0400
@@ -8,11 +8,11 @@
 	<property environment="env"/>
 	<property name="javaHome" value="${env.JAVA_HOME}"/>
 	
-	<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+	<property name="javadoc.link.location" value="../../../javadoc"/>
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2006-07-13 15:07:44.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/antJavadoc.sh	2006-07-13 15:07:13.000000000 -0400
@@ -63,5 +63,5 @@
 ant	-f javadoc.xml \
 	-DdestDir="$destDir" \
 	-Dclasspath="$classpath" \
-	-DeclipseDir="$eclipseDir" \
+	-DeclipseDir="../../../../../../SDK" \
 	-Doverview="$eclipseDir/plugins/org.eclipse.emf.ecore.sdo.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build/javadoc.xml.template	2006-07-13 15:08:28.000000000 -0400
@@ -8,11 +8,11 @@
 	<property environment="env"/>
 	<property name="javaHome" value="${env.JAVA_HOME}"/>
 	
-	<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+	<property name="javadoc.link.location" value="../../../javadoc"/>
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh	2006-07-13 15:09:00.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/antJavadoc.sh	2006-07-13 13:57:08.000000000 -0400
@@ -69,5 +69,5 @@
 ant	-f javadoc.xml \
 	-DdestDir="$destDir" \
 	-Dclasspath="$classpath" \
-	-DeclipseDir="$eclipseDir" \
+	-DeclipseDir="../../../../../../SDK" \
 	-Doverview="$eclipseDir/plugins/org.eclipse.xsd.doc/build/overview.html"
diff -uNr org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template
--- org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-07-13 13:57:08.000000000 -0400
+++ org.eclipse.emf.releng.build/src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-07-13 15:09:42.000000000 -0400
@@ -8,11 +8,11 @@
 	<property environment="env"/>
 	<property name="javaHome" value="${env.JAVA_HOME}"/>
 	
-	<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
+	<property name="javadoc.link.location" value="../../../javadoc"/>
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">

eclipse-emf-nobootclasspath.patch:

--- NEW FILE eclipse-emf-nobootclasspath.patch ---
diff -uNr src/eclipse/plugins/org.eclipse.emf.doc/build.xml src/eclipse/plugins/org.eclipse.emf.doc/build.xml
--- src/eclipse/plugins/org.eclipse.emf.doc/build.xml	2006-07-12 22:42:24.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.doc/build.xml	2006-07-12 22:43:00.000000000 -0400
@@ -16,15 +16,8 @@
 	<property name="compilerArg" value=""/>
 	<property name="javacSource" value="1.3"/>
 	<property name="javacTarget" value="1.2"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
 	<property name="bundleJavacSource" value="${javacSource}"/>
 	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
diff -uNr src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml
--- src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml	2006-07-12 22:42:25.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.ecore.sdo.doc/build.xml	2006-07-12 22:43:10.000000000 -0400
@@ -16,15 +16,8 @@
 	<property name="compilerArg" value=""/>
 	<property name="javacSource" value="1.3"/>
 	<property name="javacTarget" value="1.2"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
 	<property name="bundleJavacSource" value="${javacSource}"/>
 	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
diff -uNr src/eclipse/plugins/org.eclipse.xsd.doc/build.xml src/eclipse/plugins/org.eclipse.xsd.doc/build.xml
--- src/eclipse/plugins/org.eclipse.xsd.doc/build.xml	2006-07-12 22:42:25.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.xsd.doc/build.xml	2006-07-12 22:43:06.000000000 -0400
@@ -16,15 +16,8 @@
 	<property name="compilerArg" value=""/>
 	<property name="javacSource" value="1.3"/>
 	<property name="javacTarget" value="1.2"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
 	<property name="bundleJavacSource" value="${javacSource}"/>
 	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">

eclipse-emf-platformjavadocname.patch:

--- NEW FILE eclipse-emf-platformjavadocname.patch ---
--- src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-10-20 14:11:08.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.xsd.doc/build/javadoc.xml.template	2006-10-20 14:11:45.000000000 -0400
@@ -12,7 +12,7 @@
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.1.r321_v2006030.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">
--- src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-10-20 14:10:49.000000000 -0400
+++ src/eclipse/plugins/org.eclipse.emf.doc/build/javadoc.xml.template	2006-10-20 14:11:52.000000000 -0400
@@ -12,7 +12,7 @@
 	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
 
 	<target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.0.v20060612-0900.jar" dest="${javadoc.link.location}/platform/"/>
+		<unzip src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv_3.2.1.r321_v2006030.jar" dest="${javadoc.link.location}/platform/"/>
 	</target>
 	
 	<target name="javadoc" depends="extractPlatformJavadoc">


--- NEW FILE eclipse-emf.spec ---
%define gcj_support     1
%define major                   2
%define minor                   2
%define micro                   1
%define build_id                build_200609210005
%define eclipse_base            %{_datadir}/eclipse

Summary:        Eclipse Modeling Framework (EMF)
Name:           eclipse-emf
Version:        %{major}.%{minor}.%{micro}
Release:        1%{?dist}
License:        Eclipse Public License
Group:          System Environment/Libraries
URL:            http://www.eclipse.org/emf/
Requires:       eclipse-platform >= 1:3.2.1
Requires:       eclipse-platform < 1:3.2.2

# EMF's download page links to their map file for 2.2.1:
#   http://download.eclipse.org/tools/emf/downloads/drops/2.2.1/R200609210005/directory.txt
# and this tells us the CVS tag for 2.2.1. 
#
# Use the enclosed script to generate the source drop for EMF 2.2.1:
# 
# sh fetch-eclipse-emf.sh emf :pserver:anonymous at dev.eclipse.org:/home/tools \
#   build_200609210005 org.eclipse.emf.releng.build

Source0:        %{name}-fetched-src-%{build_id}.tar.bz2
Source1:        fetch-%{name}.sh

Patch0:         %{name}-customTargets.xml.patch
Patch1:         %{name}-nobootclasspath.patch
# Note, this patch includes the Eclipse SDK version number
Patch2:         %{name}-javadoc.patch
Patch3:         %{name}-addforceContextQualiferproperty.patch
Patch4:         %{name}-buildAll.patch
Patch5:         %{name}-examples-dontChangeBundleClasspath.patch
Patch6:         %{name}-platformjavadocname.patch

BuildRequires:  eclipse-pde
%if %{gcj_support}
BuildRequires:    gcc-java >= 4.0.2
BuildRequires:    java-gcj-compat-devel >= 1.0.64
Requires(post):   java-gcj-compat >= 1.0.64
Requires(postun): java-gcj-compat >= 1.0.64
%else
BuildRequires:    java-devel >= 1.4.2
%endif

%if %{gcj_support}
%else
BuildArch:        noarch
%endif

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%package        sdk
Summary:        Eclipse EMF SDK
Group:          System Environment/Libraries
Requires:       %{name}-sdo-sdk = %{version}-%{release}
Requires:       %{name}-xsd-sdk = %{version}-%{release}

%package        sdo
Summary:        Eclipse EMF SDO
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%package        sdo-sdk
Summary:        Eclipse EMF SDO Source (SDK)
Group:          System Environment/Libraries
Requires:       %{name}-sdo = %{version}-%{release}

%package        xsd
Summary:        Eclipse EMF XSD
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%package        xsd-sdk
Summary:        Eclipse EMF XSD Source (SDK)
Group:          System Environment/Libraries
Requires:       %{name}-xsd = %{version}-%{release}

%package        examples
Summary:        Eclipse EMF examples
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       %{name}-xsd = %{version}-%{release}

%package        standalone
Summary:        Eclipse EMF Standalone
Group:          System Environment/Libraries
Requires:       java-devel >= 1.4.2

%description
EMF is a modeling framework and code generation facility for building tools and
other applications based on a structured data model.

%description    sdk
Source for all of Eclipse EMF SDK for use within Eclipse.

%description    sdo
Service Data Objects (SDO) is a framework that simplifies and unifies data
application development in a service oriented architecture (SOA).

%description    sdo-sdk
Source for Eclipse EMF SDO for use within Eclipse.

%description    xsd
The XML Schema Infoset Model is a reference library that provides an API for
use with any code that examines, creates or modifies W3C XML Schema
(standalone or as part of other artifacts, such as XForms or WSDL documents). 

%description    xsd-sdk
Source for Eclipse EMF XSD for use within Eclipse.

%description    examples
Example source code and models that demonstrates how to use Eclipse EMF.

%description    standalone
An standalone (ie. independent of the Eclipse runtime) implementation of EMF.

%prep
%setup -q -c
pushd org.eclipse.emf.releng.build
%patch0 -p0
%patch1 -p0
%patch2 -p1
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch6 -p0

# Don't ever use bootclasspath
# FIXME:  why can't we use bootclasspath?  It gives the infamous
# "java.lang.Object cannot be found" error.
for f in emf/doc/build.properties emf/runtime/build.properties \
    examples/build.properties sdk/build.properties sdo/doc/build.properties \
    sdo/runtime/build.properties tests/build.properties \
    xsd/doc/build.properties xsd/runtime/build.properties; \
do sed --in-place 's/^bootclasspath/#bootclasspath/' $f; done
popd

%build
mkdir home
homedir=$(cd home > /dev/null && pwd)

# See comments in the script to understand this.
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
SDK=$(cd SDK > /dev/null && pwd)

# Build the EMF builder helper jars

# for ChangeBundleClasspath
pushd org.eclipse.emf.releng.build/org.eclipse.emf.build
# FIXME:  implement com.sun.tools.doclets.standard in gjdoc
rm -rf src/org/eclipse/emf/build/doclet/
ant
popd

# for SetRequiredBundleVersionRanges
pushd org.eclipse.emf.releng.build/org.eclipse.emf.build.ant
mkdir -p build

echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/assemble.org.eclipse.emf.build.ant.all.xml
echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/package.org.eclipse.emf.build.ant.all.xml

java -cp %{eclipse_base}/startup.jar                   \
     -Duser.home=$homedir                              \
     org.eclipse.core.launcher.Main                    \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=plugin                                    \
     -Did=org.eclipse.emf.build.ant                   \
     -DsourceDirectory=$(pwd)                          \
     -DbaseLocation=$SDK                               \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml

pushd build/plugins/org.eclipse.emf.build.ant
java -cp /usr/share/eclipse/startup.jar                   \
     org.eclipse.core.launcher.Main                    \
     -application org.eclipse.ant.core.antRunner       \
     -f build.xml build.update.jar
popd

# FIXME:  the SDK symlinks that point to /usr/share/eclipse end up causing the
# antRunner process below to not see anything in $SDK that *isn't* in
# /usr/share/eclipse.  As such, I've hacked this up to temporarily duplicate
# everything in /usr/share/eclipse and copy the emf.build.ant jar there for
# building.  Lame, yes, but it works and it only results in a bloated buildroot
# which is just temporary disk space.  Also, the task itself expects to have
# all of the plugins (including the SDK plugins themselves) in
# org.eclipse.emf.releng.build/src/eclipse/plugins so we symlink the SDK ones there.
# -- overholt 2006-07-27

pushd ../..
rm SDK/plugins/org.eclipse.pde.build
# Remove the bits of the SDK that we don't need
rm SDK/features/org.eclipse.pde.source*
rm SDK/features/org.eclipse.jdt.source*
rm SDK/features/org.eclipse.sdk*
rm SDK/plugins/org.eclipse.pde.source*
rm SDK/plugins/org.eclipse.jdt.source*
rm SDK/plugins/org.eclipse.jdt.doc*
rm SDK/plugins/org.eclipse.sdk*
# This tomcat chicanery will be fixed in a future Eclipse SDK RPM
mkdir SDK2
pushd SDK
for f in `find -mindepth 1 -maxdepth 1 -not -name plugins`; do cp -rL $f ../SDK2; done
mkdir ../SDK2/plugins
pushd plugins
for f in `find -mindepth 1 -not -name "org.eclipse.tomcat*"`; do cp -rL $f ../../SDK2/plugins; done
cp -r org.eclipse.tomcat* ../../SDK2/plugins
popd
popd
pushd SDK2/plugins 
ln -s org.eclipse.pde.build* org.eclipse.pde.build
popd
rm -rf SDK
mv SDK2 SDK
SDK=$(cd SDK && pwd)
popd

pushd ../src/eclipse/plugins
for f in `ls $SDK/plugins`; do ln -s $SDK/plugins/$f .; done
popd

# Make EMF ant task available to main EMF build
mv build/plugins/org.eclipse.emf.build.ant/*.jar $SDK/plugins
popd
# End build of EMF builder helper jar

cd org.eclipse.emf.releng.build

# some notes about what we're doing here:
#
# -Duser.home=$homedir: override java.home in the vm so that eclipse only adds files in the buildroot 
# -Dcomponent=sdk: the component of EMF we want to build 
# -DjavacFailOnError=true: fail if there is an error 
# -DdontUnzip=true: don't unzip the result, we will do it manually
# -DbaseLocation=$SDK: $SDK is a mirror of the system SDK dir that is writable by the process 
#                      running the build. This let's the build "see" the jars and have a place to 
#                      put the plugins that have just been built
# -DskipFetch=true: don't fetch the sources 
# -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
java -cp $SDK/startup.jar \
    -Duser.home=$homedir                        \
     org.eclipse.core.launcher.Main             \
    -application org.eclipse.ant.core.antRunner \
    -DjavacFailOnError=true                     \
    -DdontUnzip=true                            \
    -DmapsLocal=true                            \
    -DbaseLocation=$SDK                         \
    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build/scripts \
    -DskipFetch=true                            \
    -DbuildLabel=%{version}                     \
    -DbuildAlias=%{version}                     \
    -DbaseExists=true \
    -f buildAll.xml buildRPM

%install
rm -rf ${RPM_BUILD_ROOT}
install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}

# EMF SDK and Examples
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*SDK-%{version}.zip; do
  case $file in
    *eclipse*)
      # The ".." is needed since the zip files contain "eclipse/foo".
      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip -qq -o $file)
      ;;
  esac
done
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Examples-%{version}.zip; do
  case $file in
    *eclipse*)
      # The ".." is needed since the zip files contain "eclipse/foo".
      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip -qq -o $file)
      ;;
  esac
done

# EMF Models
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Models-%{version}.zip; do
   (cd $RPM_BUILD_ROOT/%{eclipse_base} && unzip -qq -o $file)
done
mv $RPM_BUILD_ROOT/%{eclipse_base}/readme_models.html \
  $RPM_BUILD_ROOT/%{eclipse_base}/emf/models

install -d -m755 ${RPM_BUILD_ROOT}/%{_datadir}/java/emf

# Standalone EMF
for file in $(pwd)/org.eclipse.emf.releng.build/src/eclipse/%{version}/*Standalone-%{version}.zip; do
   (cd $RPM_BUILD_ROOT/%{_datadir}/java && unzip -qq -o $file)
done
mv $RPM_BUILD_ROOT/%{_datadir}/java/emf/bin/* \
  $RPM_BUILD_ROOT/%{_datadir}/java/emf
rmdir $RPM_BUILD_ROOT/%{_datadir}/java/emf/bin
mv $RPM_BUILD_ROOT/%{_datadir}/java/images/* \
  $RPM_BUILD_ROOT/%{_datadir}/java/emf
rmdir $RPM_BUILD_ROOT/%{_datadir}/java/images
mv $RPM_BUILD_ROOT/%{_datadir}/java/readme_standalone.html \
  $RPM_BUILD_ROOT/%{_datadir}/java/emf

# These are already included in the Eclipse SDK but the packaging guidelines
# would like them in a directory owned by this package
mv $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html \
  $RPM_BUILD_ROOT/%{eclipse_base}/features/org.eclipse.emf_*
mv $RPM_BUILD_ROOT/%{eclipse_base}/notice.html \
  $RPM_BUILD_ROOT/%{eclipse_base}/features/org.eclipse.emf_*

%if %{gcj_support}
doc_zip=`ls $RPM_BUILD_ROOT/%{eclipse_base}/plugins | grep org.eclipse.emf.doc`;
aot-compile-rpm --exclude %{eclipse_base}/plugins/$doc_zip/doc.zip
%endif

%clean 
rm -rf ${RPM_BUILD_ROOT}

%if %{gcj_support}
%post sdo
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun sdo
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%post xsd
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun xsd
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.cheatsheets_*
%{eclipse_base}/plugins/org.eclipse.emf_*
%{eclipse_base}/plugins/org.eclipse.emf.ant_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ecore.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.codegen_*
%{eclipse_base}/plugins/org.eclipse.emf.common.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.common_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.change_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.change.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.xmi_*
%{eclipse_base}/plugins/org.eclipse.emf.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.edit.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2xml_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.ecore2xml.ui_*
%{eclipse_base}/plugins/org.eclipse.emf.converter_*
%{eclipse_base}/plugins/org.eclipse.emf.importer_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.ecore_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.java_*
%{eclipse_base}/plugins/org.eclipse.emf.importer.rose_*
%{eclipse_base}/plugins/org.eclipse.emf.exporter_*
%{eclipse_base}/features/org.eclipse.emf_*/*.jpg
%{eclipse_base}/features/org.eclipse.emf_*/feature*
%doc %{eclipse_base}/features/org.eclipse.emf_*/license.html
%doc %{eclipse_base}/features/org.eclipse.emf_*/notice.html
%doc %{eclipse_base}/features/org.eclipse.emf_*/epl-v10.html
%if %{gcj_support}
%{_libdir}/gcj/%{name}/cheatsheets*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ant_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ecore.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.codegen_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.common.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.common_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.converter_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.change.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.change_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.xmi_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.edit.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.exporter_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.java_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer.rose_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.importer_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2xml.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ecore2xml_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping_*
%endif

%files sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.source_*
%{eclipse_base}/plugins/org.eclipse.emf.source_*
%{eclipse_base}/features/org.eclipse.emf.sdk_*

%files sdo
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.commonj.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.editor_*
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.doc_*
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.commonj.sdo_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.ecore.sdo_*
%endif

%files sdo-sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.ecore.sdo.source_*
%{eclipse_base}/plugins/org.eclipse.emf.ecore.sdo.source_*

%files xsd
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.xsd_*
%{eclipse_base}/features/org.eclipse.xsd.doc_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.xsd2ecore.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.mapping.xsd2ecore_*
%{eclipse_base}/plugins/org.eclipse.xsd.cheatsheets_*
%{eclipse_base}/plugins/org.eclipse.xsd.doc_*
%{eclipse_base}/plugins/org.eclipse.xsd.ecore.importer_*
%{eclipse_base}/plugins/org.eclipse.xsd.ecore.exporter_*
%{eclipse_base}/plugins/org.eclipse.xsd.edit_*
%{eclipse_base}/plugins/org.eclipse.xsd.editor_*
%{eclipse_base}/plugins/org.eclipse.xsd_*
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.xsd2ecore.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.mapping.xsd2ecore_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.ecore.importer_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.ecore.exporter_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd.editor_*
%endif

%files xsd-sdk
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.xsd.source_*
%{eclipse_base}/plugins/org.eclipse.xsd.source_*

%files examples
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.emf.examples_*
%{eclipse_base}/plugins/org.eclipse.emf.examples_*
%{eclipse_base}/plugins/org.eclipse.emf.activities_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.examples.library.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.exporter.html_*
%{eclipse_base}/plugins/org.eclipse.emf.java.edit_*
%{eclipse_base}/plugins/org.eclipse.emf.java.editor_*
%{eclipse_base}/plugins/org.eclipse.emf.java_*
%{eclipse_base}/plugins/org.eclipse.xsd.example_*
%{eclipse_base}/emf/models/*_%{major}*
%doc %{eclipse_base}/emf/models/readme_models.html
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.examples.library.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.exporter.html_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java.edit_*
%{_libdir}/gcj/%{name}/org.eclipse.emf.java.editor_*
%{_libdir}/gcj/%{name}/org.eclipse.xsd_*
%{_libdir}/gcj/%{name}/xsd.example*
%endif

%files standalone
%defattr(-,root,root)
%{_datadir}/java/emf/*.jar
%doc %{_datadir}/java/emf/jars.gif
%doc %{_datadir}/java/emf/readme_standalone.html

%changelog
* Thu Oct 19 2006 Andrew Overholt <overholt at redhat.com> 2.2.1-1
- 2.2.1.
- Add sdk package, fix up inter-dependencies to match upstream.
- Don't natively-compile doc.zip (the included jar is just an example).
- Add fetching script with proper permissions.
- Add guards in %%post{,un}s for rebuild-gcj-db's presence.

* Fri Sep 08 2006 Andrew Overholt <overholt at redhat.com> 2.2.0-2
- Remove custom doclet references as gjdoc doesn't implement the necessary
  classes.
- Add examples.

* Tue Aug 01 2006 Andrew Overholt <overholt at redhat.com> 2.2.0-1jpp_1rh
- 2.2.0
- Build using buildAll.xml

* Fri Apr 07 2006 Andrew Overholt <overholt at redhat.com> 2.1.2-1jpp_1rh
- 2.1.2
- Specfile cleanup.

* Thu Mar 17 2005 Jeff Pound <jpound at redhat.com> 2.0.1-4
- Change pde build script location to 3.0.1.

* Wed Mar 16 2005 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-3
- Fixed description

* Fri Oct 29 2004 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-2
- Modified tar-ball to reflect version  

* Wed Oct 27 2004 Phil Muldoon <pmuldoon at redhat.com> 2.0.1-1
- Initial Import


--- NEW FILE fetch-eclipse-emf.sh ---
#!/bin/sh

# Generate a source drop for an eclipse.org project (tailored a bit for EMF)

# Usage message
usage="usage: $0 <project_name> <cvs_root> <cvs_tag> <cvs_directory>"

project_name=$1
cvs_root=$2
cvs_tag=$3
cvs_directory=$4

# Ensure we got all of the variables
if [ "x$project_name"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

if [ "x$cvs_root"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

if [ "x$cvs_tag"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

if [ "x$cvs_directory"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

mkdir -p temp/home && cd temp
touch home/.cvspass
cvs -d $cvs_root co -r $cvs_tag $cvs_directory
pushd $cvs_directory

# These patches do the following:
#   1. add a fetch target to grab the source
#   2. make it so that we don't have to strip the version at source grab time
#      (and thus depend upon org.eclipse.releng

patch -p0 << _EOF_

Index: build.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/build.xml,v
retrieving revision 1.14
diff -u -p -r1.14 build.xml
--- build.xml	7 Nov 2005 20:37:26 -0000	1.14
+++ build.xml	25 Oct 2006 18:07:28 -0000
@@ -44,4 +44,16 @@
 			<property name="builder" value="\${basedir}/\${component}" />
 		</ant>
 	</target>
-</project>
\ No newline at end of file
+
+        <target name="fetch" depends="init">
+                <ant antfile="build.xml" dir="\${pde.build.scripts}"
+                                target="preBuild">
+                        <property name="builder" value="\${basedir}/\${component}" />
+                </ant>
+                <ant antfile="build.xml" dir="\${pde.build.scripts}"
+                                target="fetch">
+                        <property name="builder" value="\${basedir}/\${component}" />
+                </ant>
+        </target>
+
+</project>
Index: sdk/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/sdk/customTargets.xml,v
retrieving revision 1.36
diff -u -p -r1.36 customTargets.xml
--- sdk/customTargets.xml	17 Jul 2006 00:02:48 -0000	1.36
+++ sdk/customTargets.xml	25 Oct 2006 17:59:33 -0000
@@ -28,7 +28,6 @@
   <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
   <!-- ===================================================================== -->
   <target name="checkLocal">
-    <available property="mapsLocal" file="\${buildDirectory}/maps/org.eclipse.emf" />
   </target>
 
   <target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
@@ -206,11 +205,11 @@
   </target>
 
   <target name="getBaseInit">
-    <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
     <property file="\${buildDirectory}/maps/org.eclipse.emf/build.cfg" />
   </target>
 
   <target name="getBaseEclipse" unless="baseExists" depends="getBaseInit">
+    <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
     <!-- if there's already an existing eclipse zip by the same name in the dest folder, don't download it again! -->
     <available file="\${downloadsDir}/\${eclipseFile}" property="baseZipExists" />
     <antcall target="downloadBaseEclipse" />
Index: examples/customTargets.xml
===================================================================
RCS file: /home/tools/org.eclipse.emf.releng.build/examples/customTargets.xml,v
retrieving revision 1.16
diff -u -p -r1.16 customTargets.xml
--- examples/customTargets.xml	24 Aug 2006 14:47:17 -0000	1.16
+++ examples/customTargets.xml	25 Oct 2006 17:59:33 -0000
@@ -27,7 +27,6 @@
   <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
   <!-- ===================================================================== -->
   <target name="checkLocal">
-    <available property="mapsLocal" file="\${buildDirectory}/maps/org.eclipse.emf" />
   </target>
 
   <target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
@@ -179,11 +178,11 @@
   </target>
 
   <target name="getBaseInit">
-    <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
     <property file="\${buildDirectory}/maps/org.eclipse.emf/build.cfg" />
   </target>
 
   <target name="getBaseEclipse" unless="baseExists" depends="getBaseInit">
+    <taskdef name="stripVersions" classname="org.eclipse.releng.VersionNumberStripper" />
     <!-- if there's already an existing eclipse zip by the same name in the dest folder, don't download it again! -->
     <available file="\${downloadsDir}/\${eclipseFile}" property="baseZipExists" />
     <antcall target="downloadBaseEclipse" />

_EOF_

# Fetch the actual source

java -cp /usr/share/eclipse/startup.jar \
  -Duser.home=../home org.eclipse.core.launcher.Main \
  -application org.eclipse.ant.core.antRunner \
  -buildfile build.xml \
  -DbaseLocation=/usr/share/eclipse \
  -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
  -Dcomponent=sdk \
  -DbaseExists=true \
  -DbuildLabel=$cvs_tag \
  -DfetchTag=$cvs_tag \
  -DmapCvsRoot="$cvs_root" \
  -DmapVersionTag=$cvs_tag \
  fetch

# Fetch examples

java -cp /usr/share/eclipse/startup.jar \
    -Duser.home=../../home \
    org.eclipse.core.launcher.Main \
    -application org.eclipse.ant.core.antRunner \
    -buildfile build.xml \
    -DbaseLocation=/usr/share/eclipse \
    -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
    -Dcomponent=examples \
    -DbaseExists=true \
    -DbuildLabel=$cvs_tag \
    -DfetchTag=$cvs_tag \
    -DmapCvsRoot="$cvs_root" \
    -DmapVersionTag=$cvs_tag \
    fetch
  
popd
# Make the source tarball
tar jcf eclipse-$project_name-fetched-src-$cvs_tag.tar.bz2 $cvs_directory


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Oct 2006 16:51:23 -0000	1.1
+++ .cvsignore	30 Oct 2006 16:52:48 -0000	1.2
@@ -0,0 +1 @@
+eclipse-emf-fetched-src-build_200609210005.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Oct 2006 16:51:23 -0000	1.1
+++ sources	30 Oct 2006 16:52:48 -0000	1.2
@@ -0,0 +1 @@
+1269e4e5c40ab6f733a44c816f8e2eac  eclipse-emf-fetched-src-build_200609210005.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 17:27:50 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 10:27:50 -0700
Subject: rpms/plone/devel .cvsignore, 1.11, 1.12 plone.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200610301727.k9UHRonD016126@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16104/devel

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
update to 2.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
+++ .cvsignore	30 Oct 2006 17:27:20 -0000	1.12
@@ -1,2 +1 @@
-Plone-2.5.tar.gz
-PasswordResetTool-0.4.1.tar.gz
+Plone-2.5.1-final.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- plone.spec	5 Oct 2006 11:32:21 -0000	1.17
+++ plone.spec	30 Oct 2006 17:27:20 -0000	1.18
@@ -5,16 +5,16 @@
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.5
-Release:        4%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
-Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
+#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
-Patch0:         Plone-2.5-atxmlperms.patch
+#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q -n Plone-%{version}
-%patch0 -p0 -b .atxmlperms
+#%patch0 -p0 -b .atxmlperms
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -52,8 +52,8 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
 # Fixed version of PasswordResetTool
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
 
 
 %clean
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- version 2.5.1
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
 - Update PasswordResetTool to fix CVE-2006-4247
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Oct 2006 11:32:21 -0000	1.11
+++ sources	30 Oct 2006 17:27:20 -0000	1.12
@@ -1,2 +1 @@
-0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
-df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz
+cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 17:54:01 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 30 Oct 2006 10:54:01 -0700
Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.1,1.2
Message-ID: <200610301754.k9UHs1h1016415@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16399

Modified Files:
	eclipse-emf.spec 
Log Message:
Add some unowned directories to files lists.


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-emf.spec	30 Oct 2006 16:52:48 -0000	1.1
+++ eclipse-emf.spec	30 Oct 2006 17:53:31 -0000	1.2
@@ -376,6 +376,7 @@
 %{eclipse_base}/plugins/org.eclipse.emf.exporter_*
 %{eclipse_base}/features/org.eclipse.emf_*/*.jpg
 %{eclipse_base}/features/org.eclipse.emf_*/feature*
+%dir %{eclipse_base}/features/org.eclipse.emf_*
 %doc %{eclipse_base}/features/org.eclipse.emf_*/license.html
 %doc %{eclipse_base}/features/org.eclipse.emf_*/notice.html
 %doc %{eclipse_base}/features/org.eclipse.emf_*/epl-v10.html
@@ -477,6 +478,8 @@
 %{eclipse_base}/plugins/org.eclipse.emf.java.editor_*
 %{eclipse_base}/plugins/org.eclipse.emf.java_*
 %{eclipse_base}/plugins/org.eclipse.xsd.example_*
+%dir %{eclipse_base}/emf
+%dir %{eclipse_base}/emf/models
 %{eclipse_base}/emf/models/*_%{major}*
 %doc %{eclipse_base}/emf/models/readme_models.html
 %if %{gcj_support}



From fedora-extras-commits at redhat.com  Mon Oct 30 18:19:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:19:18 -0700
Subject: rpms/plone/FC-6 plone.spec,1.17,1.18
Message-ID: <200610301819.k9UIJIro019514@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481/FC-6

Modified Files:
	plone.spec 
Log Message:
update to 2.5.1


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- plone.spec	5 Oct 2006 11:32:21 -0000	1.17
+++ plone.spec	30 Oct 2006 18:18:48 -0000	1.18
@@ -5,16 +5,16 @@
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.5
-Release:        4%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
-Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
+#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
-Patch0:         Plone-2.5-atxmlperms.patch
+#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q -n Plone-%{version}
-%patch0 -p0 -b .atxmlperms
+#%patch0 -p0 -b .atxmlperms
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -52,8 +52,8 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
 # Fixed version of PasswordResetTool
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
 
 
 %clean
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- version 2.5.1
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
 - Update PasswordResetTool to fix CVE-2006-4247
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:19:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:19:17 -0700
Subject: rpms/plone/FC-5 plone.spec,1.17,1.18
Message-ID: <200610301819.k9UIJH2G019511@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481/FC-5

Modified Files:
	plone.spec 
Log Message:
update to 2.5.1


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- plone.spec	5 Oct 2006 11:32:21 -0000	1.17
+++ plone.spec	30 Oct 2006 18:18:47 -0000	1.18
@@ -5,16 +5,16 @@
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.5
-Release:        4%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
-Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
+#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 #Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
-Patch0:         Plone-2.5-atxmlperms.patch
+#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q -n Plone-%{version}
-%patch0 -p0 -b .atxmlperms
+#%patch0 -p0 -b .atxmlperms
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -52,8 +52,8 @@
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
 # Fixed version of PasswordResetTool
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
+#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
 
 
 %clean
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- version 2.5.1
+
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
 - Update PasswordResetTool to fix CVE-2006-4247
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:22:38 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:22:38 -0700
Subject: rpms/plone/devel plone.spec,1.18,1.19
Message-ID: <200610301822.k9UIMcCh019659@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602/devel

Modified Files:
	plone.spec 
Log Message:
rebuild


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plone.spec	30 Oct 2006 17:27:20 -0000	1.18
+++ plone.spec	30 Oct 2006 18:22:08 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
@@ -73,6 +73,9 @@
 
 %changelog
 * Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- rebuild
+
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
 - version 2.5.1
 
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4



From fedora-extras-commits at redhat.com  Mon Oct 30 18:22:36 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:22:36 -0700
Subject: rpms/plone/FC-5 .cvsignore, 1.11, 1.12 plone.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200610301822.k9UIMa1I019653@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602/FC-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
+++ .cvsignore	30 Oct 2006 18:22:06 -0000	1.12
@@ -1,2 +1 @@
-Plone-2.5.tar.gz
-PasswordResetTool-0.4.1.tar.gz
+Plone-2.5.1-final.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plone.spec	30 Oct 2006 18:18:47 -0000	1.18
+++ plone.spec	30 Oct 2006 18:22:06 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
@@ -73,6 +73,9 @@
 
 %changelog
 * Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- rebuild
+
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
 - version 2.5.1
 
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Oct 2006 11:32:21 -0000	1.11
+++ sources	30 Oct 2006 18:22:06 -0000	1.12
@@ -1,2 +1 @@
-0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
-df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz
+cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 18:22:37 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:22:37 -0700
Subject: rpms/plone/FC-6 .cvsignore, 1.11, 1.12 plone.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200610301822.k9UIMbfg019658@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602/FC-6

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Oct 2006 11:32:21 -0000	1.11
+++ .cvsignore	30 Oct 2006 18:22:07 -0000	1.12
@@ -1,2 +1 @@
-Plone-2.5.tar.gz
-PasswordResetTool-0.4.1.tar.gz
+Plone-2.5.1-final.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plone.spec	30 Oct 2006 18:18:48 -0000	1.18
+++ plone.spec	30 Oct 2006 18:22:07 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
@@ -73,6 +73,9 @@
 
 %changelog
 * Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
+- rebuild
+
+* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
 - version 2.5.1
 
 * Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Oct 2006 11:32:21 -0000	1.11
+++ sources	30 Oct 2006 18:22:07 -0000	1.12
@@ -1,2 +1 @@
-0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz
-df94c9ba1d0dad5b2cc42f763ab7084e  PasswordResetTool-0.4.1.tar.gz
+cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 18:28:46 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 11:28:46 -0700
Subject: rpms/contacts/devel contacts.spec,1.6,1.7
Message-ID: <200610301828.k9UISkIn019830@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19809

Modified Files:
	contacts.spec 
Log Message:
rebuild



Index: contacts.spec
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/contacts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- contacts.spec	28 Aug 2006 02:50:08 -0000	1.6
+++ contacts.spec	30 Oct 2006 18:28:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		contacts        
 Version:        0.1
-Release:        5.20060813svn%{?dist}
+Release:        6.20060813svn%{?dist}
 Summary:        Contacts addressbook
 
 Group:         	Applications/Productivity
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Jesse Keating <jkeating at redhat.com> - 0.1-6.20060813svn
+- rebuild for new eds
+
 * Sun Aug 27 2006 Jesse Keating <jkeating at redhat.com> - 0.1-5.20060813svn
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:29:59 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:29:59 -0700
Subject: rpms/xine-lib/devel - New directory
Message-ID: <200610301829.k9UITx4P019937@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19922/xine-lib/devel

Log Message:
Directory /cvs/extras/rpms/xine-lib/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 30 18:29:57 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:29:57 -0700
Subject: rpms/xine-lib - New directory
Message-ID: <200610301829.k9UITv37019926@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19922/xine-lib

Log Message:
Directory /cvs/extras/rpms/xine-lib added to the repository




From fedora-extras-commits at redhat.com  Mon Oct 30 18:30:30 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:30:30 -0700
Subject: rpms/xine-lib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610301830.k9UIUUdU019983@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977

Added Files:
	Makefile import.log 
Log Message:
Setup of module xine-lib


--- NEW FILE Makefile ---
# Top level Makefile for module xine-lib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Oct 30 18:30:36 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:30:36 -0700
Subject: rpms/xine-lib/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200610301830.k9UIUaMV019999@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xine-lib


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Oct 30 18:33:24 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:33:24 -0700
Subject: rpms/xine-lib import.log,1.1,1.2
Message-ID: <200610301833.k9UIXOZg020112@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20068

Modified Files:
	import.log 
Log Message:
auto-import xine-lib-1.1.2-17 on branch devel from xine-lib-1.1.2-17.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Oct 2006 18:30:30 -0000	1.1
+++ import.log	30 Oct 2006 18:32:54 -0000	1.2
@@ -0,0 +1 @@
+xine-lib-1_1_2-17:HEAD:xine-lib-1.1.2-17.src.rpm:1162233165



From fedora-extras-commits at redhat.com  Mon Oct 30 18:33:25 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 11:33:25 -0700
Subject: rpms/xine-lib/devel xine-lib-1.1.1-configure-no-mcpu-march.patch,
	NONE, 1.1 xine-lib-1.1.1-deepbind-939.patch, NONE,
	1.1 xine-lib-1.1.1-multilib-devel.patch, NONE,
	1.1 xine-lib-cleanup-sources.sh, NONE, 1.1 xine-lib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200610301833.k9UIXPZ7020116@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20068/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xine-lib-1.1.1-configure-no-mcpu-march.patch 
	xine-lib-1.1.1-deepbind-939.patch 
	xine-lib-1.1.1-multilib-devel.patch 
	xine-lib-cleanup-sources.sh xine-lib.spec 
Log Message:
auto-import xine-lib-1.1.2-17 on branch devel from xine-lib-1.1.2-17.src.rpm

xine-lib-1.1.1-configure-no-mcpu-march.patch:

--- NEW FILE xine-lib-1.1.1-configure-no-mcpu-march.patch ---
--- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
+++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
@@ -161,10 +161,6 @@
                   ;;
 
               esac
-              if test x"$archopt_val" != x; then
-                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
-                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
-              fi
             fi
           else
             dnl we have the Intel compiler

xine-lib-1.1.1-deepbind-939.patch:

--- NEW FILE xine-lib-1.1.1-deepbind-939.patch ---
--- xine-lib-1.1.1/src/xine-engine/load_plugins.c.~1~	2005-09-19 09:14:02.000000000 -0700
+++ xine-lib-1.1.1/src/xine-engine/load_plugins.c	2006-04-22 23:07:33.000000000 -0700
@@ -591,7 +591,7 @@ static void collect_plugins(xine_t *this
 	    printf("load_plugins: %s not cached\n", str);
 #endif
 
-	  if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
+	  if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) {
 	    const char *error = dlerror();
 	    /* too noisy -- but good to catch unresolved references */
 	    xprintf(this, XINE_VERBOSITY_LOG, 
@@ -649,7 +649,7 @@ static int _load_plugin_class(xine_t *th
     /* load the dynamic library if needed */
     if (!node->file->lib_handle) {
       lprintf("dlopen %s\n", filename);
-      if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
+      if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) {
 	const char *error = dlerror();
 
 	xine_log (this, XINE_LOG_PLUGIN,

xine-lib-1.1.1-multilib-devel.patch:

--- NEW FILE xine-lib-1.1.1-multilib-devel.patch ---
--- misc/xine-config.in~	2005-09-05 20:02:57.000000000 +0300
+++ misc/xine-config.in	2006-06-13 01:43:55.000000000 +0300
@@ -2,8 +2,8 @@
 #
 #
 
-prefix=@XINE_CONFIG_PREFIX@
-exec_prefix=@exec_prefix@
+prefix=$(pkg-config libxine --variable=prefix)
+exec_prefix=$(pkg-config libxine --variable=exec_prefix)
 exec_prefix_set=no
 
 usage()
@@ -54,7 +54,7 @@
       echo_exec_prefix=yes
       ;;
     --version)
-      echo @XINE_MAJOR at .@XINE_MINOR at .@XINE_SUB@
+      pkg-config libxine --modversion
       ;;
     --acflags)
       echo_acflags=yes
@@ -100,14 +100,14 @@
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo -I at includedir@ @THREAD_CPPFLAGS@
+      pkg-config libxine --cflags
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo -L at libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@
+      pkg-config libxine --libs
 fi      
 if test "$echo_plugindir" = "yes"; then
-      echo "@XINE_PLUGINPATH@"
+      echo "$(pkg-config libxine --variable=libdir)/xine/plugins/$(pkg-config libxine --modversion)"
 fi      
 if test "$echo_datadir" = "yes"; then
       echo "@XINE_DATADIR@"


--- NEW FILE xine-lib-cleanup-sources.sh ---
#!/bin/bash

if [ -z "$1" -o $# -ne 1 ]; then
  echo "Usage: $0 <xine-version>"
  exit 2
fi

version=$1
tarball="xine-lib-$version.tar.bz2"
dir="xine-lib-$version"


if [ ! -f $tarball ]; then
  echo "Can't find $tarball !"
  exit 1
fi

echo "Uncompressing $tarball..."
rm -rf $dir
tar -xjf $tarball
cd $dir

# Main libraries
for remove in libfaad libffmpeg libmad libmpeg2 dxr3 libspudec libxineadec libspucmml libspucc liba52 libdts; do
    echo "removing src/$remove..."
    rm -rf src/$remove 
    sed -i -e "/$remove/d" src/Makefile.am
    sed -i -e "/^src\/$remove/d" configure.ac
done
# Input plugin libraries
for remove in libdvdnav vcd; do
    echo "removing src/input/$remove..."
    rm -rf src/input/$remove 
    sed -i -e "s/SUBDIRS = \(.*\)${remove}\(.*\)/SUBDIRS = \1\2/g" src/input/Makefile.am
    sed -i -e "/^src\/input\/$remove/d" configure.ac
done
# Input plugins
for p in dvd vcd mms; do
  echo "removing $p input plugin..."
  # Remove sources
  for sourcefile in `awk '/^xineplug_inp_'$p'_la_SOURCES/ { $1=""; $2=""; print $0}' src/input/Makefile.am`; do
      if [ "`grep -c $sourcefile src/input/Makefile.am`" -le 1 ]; then # if this file is only used for this plugin
          rm -f src/input/$sourcefile
      fi
  done
  # Remove from Makefile
  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
echo "removing planar and deinterlace postprocessors..."
sed -i -e 's/planar//g;s/deinterlace//g' src/post/Makefile.am # fails to build

# All clean !

cd ..
echo "Generating $tarball..."
rm -f $tarball.orig
mv $tarball $tarball.orig
tar -cjf $tarball $dir
rm -rf $dir


--- NEW FILE xine-lib.spec ---
# TODO, sometime, maybe:
# - libstk:  http://www.libstk.net/
# - polypaudio

%define         codecdir %{_libdir}/codecs
#%define         vdrver 0.7.9

Summary:        Xine library
Name:           xine-lib
Version:        1.1.2
Release:        17%{?dist}
License:        GPL
Group:          System Environment/Libraries
URL:            http://xinehq.de/
# The tarball is generated from the upstream tarball using
# the script in SOURCE1. It prunes potentially patented code
Source0:        http://dl.sourceforge.net/xine/xine-lib-1.1.2.tar.bz2
Source1:        xine-lib-cleanup-sources.sh
Patch1:         xine-lib-1.1.1-configure-no-mcpu-march.patch
Patch6:         xine-lib-1.1.1-deepbind-939.patch
Patch7:         xine-lib-1.1.1-multilib-devel.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
# X11
BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
# Video
BuildRequires:  freetype-devel SDL-devel libtheora-devel libmng-devel
BuildRequires:  aalib-devel >= 1.4 libcaca-devel
# Audio
BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
# CDs
BuildRequires:  libcdio-devel
# Other
BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
BuildRequires:  libtool >= 1.4.0 /usr/bin/automake-1.9 samba-common

%if 0%{?_with_directfb:1}
BuildRequires:        directfb-devel
%endif
%if 0%{!?_without_imagemagick:1}
BuildRequires:        ImageMagick-devel >= 6.2.4.6-1
%endif
#Provides:        %{name}(vdr) = %{vdrver}

%package devel
Summary:         Xine library development files
Group:           Development/Libraries
Requires:        %{name} = %{version}-%{release}
Requires:        pkgconfig zlib-devel
#Requires:        %{name}(vdr) = %{vdrver}
#Provides:        %{name}-devel(vdr) = %{vdrver}


%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.  Non-default rpmbuild options:
--without imagemagick:  Disable ImageMagick support
--with    directfb:     Enable DirectFB support

%description devel
This package contains development files for xine-lib.


%prep
%setup -q
%patch1 -p0 -b .nomcpu
###cp -p debian/changelog ChangeLog.vdr
# Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
%patch7 -p0 -b .multilib-devel

find . -name "*.[hc]" | xargs chmod -c -x

aclocal-1.9 -I m4
libtoolize --force
autoheader
automake-1.9 --gnu --add-missing
autoconf

# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure


%build
FFMPEG_CPPFLAGS=" "; FFMPEG_LIBS=" "; export FFMPEG_CPPFLAGS FFMPEG_LIBS
%configure --disable-dependency-tracking \
    --with-xv-path=%{_libdir} \
    --with-w32-path=%{codecdir} \
    --with-external-ffmpeg \
    --enable-ipv6 \
%if 0%{?_with_directfb:1}
    --enable-directfb \
%endif
%if 0%{?_without_imagemagick:1}
    --disable-imagemagick \
%endif
    --disable-rte \
    --disable-libfame \
    --disable-ffmpegtest \
    --disable-faad \
    --disable-mad \
    --disable-asf \
    --disable-vcd \
    --disable-a52dec \
    --with-external-dvdnav --disable-dvdnavtest

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT __docs
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang libxine1
cp -pR $RPM_BUILD_ROOT%{_docdir}/xine __docs
rm -rf $RPM_BUILD_ROOT%{_docdir}/xine

# Removing useless files
rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \
       __docs/README.{freebsd,irix,solaris,MINGWCROSS,WIN32} \
       __docs/README.{dxr3,network_dvd}

# Directory for binary codecs
mkdir -p $RPM_BUILD_ROOT%{codecdir}


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files -f libxine1.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS ChangeLog* README TODO __docs/README.* __docs/faq
%dir %{codecdir}
%{_datadir}/xine
%{_libdir}/libxine.so.*
%{_mandir}/man5/xine.5*
%dir %{_libdir}/xine/
%dir %{_libdir}/xine/plugins/
%dir %{_libdir}/xine/plugins/%{version}/
# I list all the plugins because I don't want a non-free plugin
# to sneak into a future version
# these plugins do not have legal problems according to the SuSE RPM
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so
#%{_libdir}/xine/plugins/%{version}/xineplug_inp_vdr.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_real_audio.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so
%{_libdir}/xine/plugins/%{version}/xineplug_flac.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
%endif
%ifnarch ppc64 s390 s390x
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
%endif
%{_libdir}/xine/plugins/%{version}/post/
%{_libdir}/xine/plugins/%{version}/vidix/
# Put it in a xine-lib-extras package one day ?
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so


%files devel
%defattr(-,root,root,-)
%doc __docs/hackersguide/*
%{_bindir}/xine-config
%{_datadir}/aclocal/xine.m4
%{_includedir}/xine.h
%{_includedir}/xine/
%{_libdir}/libxine.so
%{_libdir}/pkgconfig/libxine.pc
%{_mandir}/man1/xine-config.1*

# --------------------------------------------------------------------

%changelog
* Wed Oct 18 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-17
- cleanup docs
- remove mms
- delete more source files in the cleanup script
- drop patch3 (affecting mms)

* Tue Oct 17 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-16
- fix files list
- add BR gtk2-devel
- remove xineplug_decode_gdk_pixbuf.so from x86-only

* Mon Oct 16 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-15
- removed libdts
- drop dxr patch (it's removed from tarball)
- list xineplug_decode_gdk_pixbuf.so and xineplug_vo_out_vidix.so only on x86

* Sun Oct 15 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-14
- update SOURCE1 to remove liba52 from tarball (patented)

* Tue Sep 12 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-13
- drop patches 2 and 4

* Fri Sep 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.2-12
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Oct 2006 18:30:36 -0000	1.1
+++ .cvsignore	30 Oct 2006 18:32:55 -0000	1.2
@@ -0,0 +1 @@
+xine-lib-1.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Oct 2006 18:30:36 -0000	1.1
+++ sources	30 Oct 2006 18:32:55 -0000	1.2
@@ -0,0 +1 @@
+d1afb34d2335f8c9ded4d9a2b741251e  xine-lib-1.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Oct 30 18:39:51 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Mon, 30 Oct 2006 11:39:51 -0700
Subject: mock/etc fedora-6-i386-core.cfg, NONE, 1.1.2.1 fedora-6-ppc-core.cfg,
	NONE, 1.1.2.1 fedora-6-x86_64-core.cfg, NONE, 1.1.2.1 Makefile,
	1.5.2.1, 1.5.2.2
Message-ID: <200610301839.k9UIdp1C020198@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20180

Modified Files:
      Tag: mock-0-6-branch
	Makefile 
Added Files:
      Tag: mock-0-6-branch
	fedora-6-i386-core.cfg fedora-6-ppc-core.cfg 
	fedora-6-x86_64-core.cfg 
Log Message:
new config files for FC6; removed symlink from devel to fc6 in Makefile


--- NEW FILE fedora-6-i386-core.cfg ---
#!/usr/bin/python -tt

import os
config_opts['root'] = 'fedora-6-i386-core'
config_opts['target_arch'] = 'i386'


config_opts['yum.conf'] = """
[main]
cachedir=/var/cache/yum
debuglevel=1
reposdir=/dev/null
logfile=/var/log/yum.log
retries=20
obsoletes=1
gpgcheck=0
assumeyes=1

# repos

[core]
name=core
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6

[groups]
name=groups
baseurl=http://buildsys.fedoraproject.org/buildgroups/6/i386/

[extras]
name=extras
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6

[local]
name=local
baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/

"""





--- NEW FILE fedora-6-ppc-core.cfg ---
#!/usr/bin/python -tt
import os
config_opts['root'] = 'fedora-6-ppc-core'
config_opts['target_arch'] = 'ppc'


config_opts['yum.conf'] = """
[main]
cachedir=/var/cache/yum
debuglevel=1
reposdir=/dev/null
logfile=/var/log/yum.log
retries=20
obsoletes=1
gpgcheck=0
assumeyes=1
exclude=*.ppc64

# repos

[core]
name=core
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6

[groups]
name=groups
baseurl=http://buildsys.fedoraproject.org/buildgroups/6/ppc/

[extras]
name=extras
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6

[local]
name=local
baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/

"""





--- NEW FILE fedora-6-x86_64-core.cfg ---
#!/usr/bin/python -tt
import os

config_opts['root'] = 'fedora-6-x86_64-core'
config_opts['target_arch'] = 'x86_64'


config_opts['yum.conf'] = """
[main]
cachedir=/var/cache/yum
debuglevel=1
reposdir=/dev/null
logfile=/var/log/yum.log
retries=20
obsoletes=1
gpgcheck=0
assumeyes=1
exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86

# repos

[core]
name=core
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6

[groups]
name=groups
baseurl=http://buildsys.fedoraproject.org/buildgroups/6/x86_64/

[extras]
name=extras
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6

[local]
name=local
baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-6-extras/

"""





Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/etc/Makefile,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- Makefile	23 Aug 2006 22:00:06 -0000	1.5.2.1
+++ Makefile	30 Oct 2006 18:39:48 -0000	1.5.2.2
@@ -9,7 +9,3 @@
 	for item in *.cfg; do \
 		install -m 644 $$item $(DESTDIR)/etc/mock/$$item; \
 	done
-	for arch in i386 ppc x86_64 ; do \
-		ln -sv fedora-devel-$$arch-core.cfg  $(DESTDIR)/etc/mock/fedora-6-$$arch-core.cfg; \
-	done
-



From fedora-extras-commits at redhat.com  Mon Oct 30 18:41:31 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 11:41:31 -0700
Subject: rpms/dates/devel dates.spec,1.4,1.5
Message-ID: <200610301841.k9UIfVSk020231@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/dates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20213

Modified Files:
	dates.spec 
Log Message:
rebuild


Index: dates.spec
===================================================================
RCS file: /cvs/extras/rpms/dates/devel/dates.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dates.spec	31 Aug 2006 14:40:12 -0000	1.4
+++ dates.spec	30 Oct 2006 18:41:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			dates
 Version:		0.1
-Release:		4.20060813svn%{?dist}
+Release:		5.20060813svn%{?dist}
 Summary:		Small, lightweight calendar
 
 Group:			Applications/Productivity
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Jesse Keating <jkeating at redhat.com> - 0.1-5.20060813svn
+- rebuild for new eds
+
 * Thu Aug 31 2006 Jesse Keating <jkeating at redhat.com> - 0.1-4.20060813svn
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:47:06 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Mon, 30 Oct 2006 11:47:06 -0700
Subject: mock mock.spec,1.16.2.12,1.16.2.13
Message-ID: <200610301847.k9UIl6Ng020324@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20305

Modified Files:
      Tag: mock-0-6-branch
	mock.spec 
Log Message:
bumped version for FC6 release


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.16.2.12
retrieving revision 1.16.2.13
diff -u -r1.16.2.12 -r1.16.2.13
--- mock.spec	21 Oct 2006 19:03:48 -0000	1.16.2.12
+++ mock.spec	30 Oct 2006 18:47:04 -0000	1.16.2.13
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.6
+Version: 0.6.7
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
+- updated for FC6 release
+
 * Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
 - bumped version to 0.6.6 (fixed tarball problem)
 



From fedora-extras-commits at redhat.com  Mon Oct 30 18:49:00 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Mon, 30 Oct 2006 11:49:00 -0700
Subject: mock ChangeLog,1.8.2.3,1.8.2.4
Message-ID: <200610301849.k9UIn0ki020370@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20351

Modified Files:
      Tag: mock-0-6-branch
	ChangeLog 
Log Message:
entries for FC6 release


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/mock/ChangeLog,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- ChangeLog	21 Oct 2006 19:03:48 -0000	1.8.2.3
+++ ChangeLog	30 Oct 2006 18:48:57 -0000	1.8.2.4
@@ -1,3 +1,11 @@
+2006-10-30  Clark Williams  <williams at redhat.com>
+
+	* Makefile
+	Bumped version to 0.6.7 for FC6 release
+
+	* etc/fedora-6-*
+	Added for FC6 release
+
 2006-10-21  Clark Williams  <williams at redhat.com>
 
 	* mock.spec



From fedora-extras-commits at redhat.com  Mon Oct 30 20:42:03 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 30 Oct 2006 13:42:03 -0700
Subject: owners owners.list,1.1878,1.1879
Message-ID: <200610302042.k9UKg37j027152@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27136

Modified Files:
	owners.list 
Log Message:
add xine-lib


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1878
retrieving revision 1.1879
diff -u -r1.1878 -r1.1879
--- owners.list	29 Oct 2006 17:53:44 -0000	1.1878
+++ owners.list	30 Oct 2006 20:41:33 -0000	1.1879
@@ -2413,6 +2413,7 @@
 Fedora Extras|xfwm4|Next generation window manager for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xgalaxy|Galaxian / Galaga like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|xkeycaps|Graphical front end to xmodmap|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Oct 30 20:48:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 13:48:43 -0700
Subject: rpms/fslint/devel fslint.spec,1.8,1.9
Message-ID: <200610302048.k9UKmh6k027247@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27195/devel

Modified Files:
	fslint.spec 
Log Message:
Zero Epochs are superfluous nowadays and frowned upon in Fedora


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fslint.spec	30 Oct 2006 15:58:46 -0000	1.8
+++ fslint.spec	30 Oct 2006 20:48:13 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           fslint
 Version:        2.16
-Release:        1%{?dist}
-Epoch:          0
+Release:        2%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -12,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -80,6 +79,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 2.16-2
+- Zero Epochs are superfluous nowadays and frowned upon in Fedora
+
 * Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
 - Update to 2.16 which has some minor packaging changes
   to align with the debian package (suggested by lintian) and also



From fedora-extras-commits at redhat.com  Mon Oct 30 20:48:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 13:48:42 -0700
Subject: rpms/fslint/FC-5 fslint.spec,1.7,1.8
Message-ID: <200610302048.k9UKmgmI027241@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27195/FC-5

Modified Files:
	fslint.spec 
Log Message:
Zero Epochs are superfluous nowadays and frowned upon in Fedora


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/fslint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fslint.spec	30 Oct 2006 16:15:04 -0000	1.7
+++ fslint.spec	30 Oct 2006 20:48:11 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           fslint
 Version:        2.16
-Release:        1%{?dist}
-Epoch:          0
+Release:        2%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -12,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -80,6 +79,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 2.16-2
+- Zero Epochs are superfluous nowadays and frowned upon in Fedora
+
 * Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
 - Update to 2.16 which has some minor packaging changes
   to align with the debian package (suggested by lintian) and also



From fedora-extras-commits at redhat.com  Mon Oct 30 20:48:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Mon, 30 Oct 2006 13:48:42 -0700
Subject: rpms/fslint/FC-6 fslint.spec,1.8,1.9
Message-ID: <200610302048.k9UKmg1A027244@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27195/FC-6

Modified Files:
	fslint.spec 
Log Message:
Zero Epochs are superfluous nowadays and frowned upon in Fedora


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/fslint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fslint.spec	30 Oct 2006 16:09:14 -0000	1.8
+++ fslint.spec	30 Oct 2006 20:48:12 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           fslint
 Version:        2.16
-Release:        1%{?dist}
-Epoch:          0
+Release:        2%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -12,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
 FSlint is a toolkit to find all redundant disk usage (duplicate files
@@ -80,6 +79,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 2.16-2
+- Zero Epochs are superfluous nowadays and frowned upon in Fedora
+
 * Mon Oct 30 2006 P??draig Brady <P at draigBrady.com> - 0:2.16-1
 - Update to 2.16 which has some minor packaging changes
   to align with the debian package (suggested by lintian) and also



From fedora-extras-commits at redhat.com  Mon Oct 30 20:52:16 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 13:52:16 -0700
Subject: rpms/mock/devel .cvsignore, 1.10, 1.11 mock.spec, 1.23, 1.24 sources,
	1.13, 1.14
Message-ID: <200610302052.k9UKqG8m027410@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27388

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
New upstream release.
Import changes into spec file from upstream spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Oct 2006 14:47:06 -0000	1.10
+++ .cvsignore	30 Oct 2006 20:51:45 -0000	1.11
@@ -1 +1,2 @@
 mock-0.6.5.tar.gz
+mock-0.6.7.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mock.spec	4 Oct 2006 14:47:06 -0000	1.23
+++ mock.spec	30 Oct 2006 20:51:45 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.5
+Version: 0.6.7
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -39,11 +39,16 @@
 if [ ! -f default.cfg ]; then
     if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then
         ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
-    else
+    elif [ -f fedora-devel-%{_target_cpu}-core.cfg ]; then
+        ln -s fedora-devel-%{_target_cpu}-core.cfg default.cfg
+    elif [ -f fedora-development-i386-core.cfg ]; then
         ln -s fedora-development-i386-core.cfg default.cfg
+    elif [ -f fedora-devel-i386-core.cfg ]; then
+        ln -s fedora-devel-i386-core.cfg default.cfg
     fi
 fi
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +73,12 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
+- updated for FC6 release
+
+* Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
+- bumped version to 0.6.6 (fixed tarball problem)
+
 * Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
 - new upstream version to fix #151255
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Oct 2006 14:47:06 -0000	1.13
+++ sources	30 Oct 2006 20:51:45 -0000	1.14
@@ -1 +1 @@
-77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz
+1798d3eeaf474b476f8ed4e7dc9cc63f  mock-0.6.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 21:30:20 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 14:30:20 -0700
Subject: rpms/mock/devel .cvsignore, 1.11, 1.12 mock.spec, 1.24, 1.25 sources,
	1.14, 1.15
Message-ID: <200610302130.k9ULUKtH030761@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30723

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
Another upstream release with more tarball fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Oct 2006 20:51:45 -0000	1.11
+++ .cvsignore	30 Oct 2006 21:29:50 -0000	1.12
@@ -1,2 +1 @@
-mock-0.6.5.tar.gz
-mock-0.6.7.tar.gz
+mock-0.6.8.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mock.spec	30 Oct 2006 20:51:45 -0000	1.24
+++ mock.spec	30 Oct 2006 21:29:50 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.7
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
+- respun tarballs without buildsys rpms
+
 * Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
 - updated for FC6 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 Oct 2006 20:51:45 -0000	1.14
+++ sources	30 Oct 2006 21:29:50 -0000	1.15
@@ -1 +1 @@
-1798d3eeaf474b476f8ed4e7dc9cc63f  mock-0.6.7.tar.gz
+5f8308a6e5b8fe87943bb7b28dd55bfd  mock-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 21:35:44 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Mon, 30 Oct 2006 14:35:44 -0700
Subject: mock mock.spec,1.16.2.13,1.16.2.14
Message-ID: <200610302135.k9ULZiG6030861@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30843

Modified Files:
      Tag: mock-0-6-branch
	mock.spec 
Log Message:
removed tabs


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.16.2.13
retrieving revision 1.16.2.14
diff -u -r1.16.2.13 -r1.16.2.14
--- mock.spec	30 Oct 2006 18:47:04 -0000	1.16.2.13
+++ mock.spec	30 Oct 2006 21:35:41 -0000	1.16.2.14
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.7
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -30,7 +30,7 @@
 
 %if 0%{?fedora:1}
 if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then
-   	ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
+        ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
 fi
 %endif
 
@@ -43,7 +43,7 @@
     elif [ -f fedora-development-i386-core.cfg ]; then
         ln -s fedora-development-i386-core.cfg default.cfg
     elif [ -f fedora-devel-i386-core.cfg ]; then
-	ln -s fedora-devel-i386-core.cfg default.cfg
+        ln -s fedora-devel-i386-core.cfg default.cfg
     fi
 fi
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
+- respun tarballs without buildsys rpms
+
 * Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
 - updated for FC6 release
 



From fedora-extras-commits at redhat.com  Mon Oct 30 21:48:32 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 30 Oct 2006 14:48:32 -0700
Subject: rpms/kompose/devel kompose.spec,1.6,1.7
Message-ID: <200610302148.k9ULmWhR030980@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kompose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30928

Modified Files:
	kompose.spec 
Log Message:
Remove X-Fedora desktop category



Index: kompose.spec
===================================================================
RCS file: /cvs/extras/rpms/kompose/devel/kompose.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kompose.spec	25 Oct 2006 15:11:28 -0000	1.6
+++ kompose.spec	30 Oct 2006 21:48:02 -0000	1.7
@@ -36,7 +36,6 @@
        --add-category=Qt \
        --add-category=KDE \
        --add-category=Utility \
-       --add-category=X-Fedora \
        --delete-original --dir %{buildroot}%{_datadir}/applications \
        $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/kompose.desktop
 install -D src/hi32-app-kompose.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kompose.png
@@ -67,8 +66,9 @@
 %{_datadir}/pixmaps/kompose.png
 
 %changelog
-* Wed Oct 25 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-7
+* Mon Oct 30 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-7
 - Rebuild for new imlib2
+- Remove X-Fedora desktop category
 
 * Tue Aug 29 2006 - Orion Poplawski <orion at cora.nwra.com> 0.5.3-6
 - Revert to 0.5.3 and rebuild for FC6.  0.5.4 does not compile



From fedora-extras-commits at redhat.com  Mon Oct 30 21:48:49 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 14:48:49 -0700
Subject: rpms/mock/FC-5 mock.spec,1.22,1.23 sources,1.13,1.14
Message-ID: <200610302148.k9ULmnOw031010@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30948/FC-5

Modified Files:
	mock.spec sources 
Log Message:
Sync devel across FC-6 and FC-5



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mock.spec	4 Oct 2006 14:47:05 -0000	1.22
+++ mock.spec	30 Oct 2006 21:48:19 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.5
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -39,11 +39,16 @@
 if [ ! -f default.cfg ]; then
     if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then
         ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
-    else
+    elif [ -f fedora-devel-%{_target_cpu}-core.cfg ]; then
+        ln -s fedora-devel-%{_target_cpu}-core.cfg default.cfg
+    elif [ -f fedora-development-i386-core.cfg ]; then
         ln -s fedora-development-i386-core.cfg default.cfg
+    elif [ -f fedora-devel-i386-core.cfg ]; then
+        ln -s fedora-devel-i386-core.cfg default.cfg
     fi
 fi
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +73,15 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
+- respun tarballs without buildsys rpms
+
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
+- updated for FC6 release
+
+* Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
+- bumped version to 0.6.6 (fixed tarball problem)
+
 * Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
 - new upstream version to fix #151255
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Oct 2006 14:47:05 -0000	1.13
+++ sources	30 Oct 2006 21:48:19 -0000	1.14
@@ -1 +1 @@
-77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz
+5f8308a6e5b8fe87943bb7b28dd55bfd  mock-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 21:48:50 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 30 Oct 2006 14:48:50 -0700
Subject: rpms/mock/FC-6 mock.spec,1.23,1.24 sources,1.13,1.14
Message-ID: <200610302148.k9ULmoZZ031014@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30948/FC-6

Modified Files:
	mock.spec sources 
Log Message:
Sync devel across FC-6 and FC-5



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mock.spec	4 Oct 2006 14:47:06 -0000	1.23
+++ mock.spec	30 Oct 2006 21:48:20 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.5
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -39,11 +39,16 @@
 if [ ! -f default.cfg ]; then
     if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then
         ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
-    else
+    elif [ -f fedora-devel-%{_target_cpu}-core.cfg ]; then
+        ln -s fedora-devel-%{_target_cpu}-core.cfg default.cfg
+    elif [ -f fedora-development-i386-core.cfg ]; then
         ln -s fedora-development-i386-core.cfg default.cfg
+    elif [ -f fedora-devel-i386-core.cfg ]; then
+        ln -s fedora-devel-i386-core.cfg default.cfg
     fi
 fi
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +73,15 @@
 
 
 %changelog
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
+- respun tarballs without buildsys rpms
+
+* Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.7-1
+- updated for FC6 release
+
+* Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
+- bumped version to 0.6.6 (fixed tarball problem)
+
 * Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
 - new upstream version to fix #151255
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Oct 2006 14:47:06 -0000	1.13
+++ sources	30 Oct 2006 21:48:20 -0000	1.14
@@ -1 +1 @@
-77e38ec644346686e76423003d0286ce  mock-0.6.5.tar.gz
+5f8308a6e5b8fe87943bb7b28dd55bfd  mock-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Oct 30 23:56:14 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Mon, 30 Oct 2006 16:56:14 -0700
Subject: rpms/flumotion/FC-5 flumotion.spec,1.10,1.11
Message-ID: <200610302356.k9UNuEaH005382@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/flumotion/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5366

Modified Files:
	flumotion.spec 
Log Message:
fix xml comment


Index: flumotion.spec
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flumotion.spec	29 Sep 2006 10:14:36 -0000	1.10
+++ flumotion.spec	30 Oct 2006 23:55:43 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           flumotion
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flumotion - the Fluendo Streaming Server
 
 Group:          Applications/Internet
@@ -130,8 +130,10 @@
 <!--
     <port>7531</port>
     <transport>ssl</transport>
+-->
     <!-- certificate path can be relative to $sysconfdir/flumotion,
          or absolute -->
+<!--
     <certificate>default.pem</certificate>
 -->
     <component name="manager-bouncer" type="htpasswdcrypt">
@@ -226,6 +228,10 @@
 %{_sysconfdir}/rc.d/init.d/flumotion
 
 %changelog
+* Tue Oct 31 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.2.2-2
+- fix the comment in the xml
+
 * Fri Sep 29 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.2-1
 - new upstream release



From fedora-extras-commits at redhat.com  Tue Oct 31 00:40:48 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 17:40:48 -0700
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.8,
	1.9
Message-ID: <200610310040.k9V0emNM008623@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8607

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
change URL of Source0


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-datetime-plugin.spec	15 Oct 2006 13:19:21 -0000	1.8
+++ xfce4-datetime-plugin.spec	31 Oct 2006 00:40:17 -0000	1.9
@@ -6,7 +6,7 @@
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://xs4all.nl/~stacium/xfce/%{name}-%{version}.tar.gz
+Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel  >= 4.3.20, libxml2-devel



From fedora-extras-commits at redhat.com  Tue Oct 31 01:05:05 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 18:05:05 -0700
Subject: rpms/xfce4-genmon-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-genmon-plugin.spec, 1.5, 1.6
Message-ID: <200610310105.k9V155ix011650@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11630

Modified Files:
	.cvsignore sources xfce4-genmon-plugin.spec 
Log Message:
update to 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 12:18:36 -0000	1.3
+++ .cvsignore	31 Oct 2006 01:04:35 -0000	1.4
@@ -1 +1 @@
-xfce4-genmon-plugin-2.0.tar.bz2
+xfce4-genmon-plugin-3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 12:18:36 -0000	1.3
+++ sources	31 Oct 2006 01:04:35 -0000	1.4
@@ -1 +1 @@
-c859720637f943032545d7b1428aa0b4  xfce4-genmon-plugin-2.0.tar.bz2
+e44c78dab7a2856b76d5a1d8c9e6ebf2  xfce4-genmon-plugin-3.0.tar.bz2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-genmon-plugin.spec	5 Oct 2006 12:18:36 -0000	1.5
+++ xfce4-genmon-plugin.spec	31 Oct 2006 01:04:35 -0000	1.6
@@ -1,16 +1,17 @@
 Name:		xfce4-genmon-plugin
-Version:	2.0
-Release:	3%{?dist}
+Version:	3.0
+Release:	1%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	LGPL
-URL:		http://goodies.xfce.org/
+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)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	xfce4-dev-tools
 Requires:	xfce4-panel >= 4.3.99.1
 
 %description
@@ -21,23 +22,29 @@
 %setup -q
 
 %build
+xdt-autogen
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Tue Oct 31 01:31:43 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 30 Oct 2006 18:31:43 -0700
Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.9,
	1.10 gaim-fedora-prefs.xml, 
	1.1, 1.2 gaim-meanwhile.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200610310131.k9V1VhwT011880@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11818

Modified Files:
	.cvsignore gaim-fedora-prefs.xml gaim-meanwhile.spec sources 
Log Message:
Update to beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jun 2006 03:24:21 -0000	1.9
+++ .cvsignore	31 Oct 2006 01:31:13 -0000	1.10
@@ -1 +1 @@
-gaim-2.0.0beta3.tar.bz2
+gaim-2.0.0beta4.tar.bz2


Index: gaim-fedora-prefs.xml
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-fedora-prefs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-fedora-prefs.xml	29 Jun 2006 03:24:21 -0000	1.1
+++ gaim-fedora-prefs.xml	31 Oct 2006 01:31:13 -0000	1.2
@@ -1,261 +1,366 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
-<pref version='1.0' name='/'>
+<pref version='1' name='/'>
 	<pref name='core'>
 		<pref name='away'>
-			<pref name='away_when_idle' type='bool' value='1' />
-			<pref name='mins_before_away' type='int' value='5' />
-			<pref name='default_message' type='string' value='Slightly less boring default' />
-			<pref name='auto_reply' type='string' value='awayidle' />
-		</pref>
-		<pref name='buddies'>
-			<pref name='use_server_alias' type='bool' value='1' />
+			<pref name='idle_reporting' type='string' value='system'/>
+			<pref name='away_when_idle' type='bool' value='1'/>
+			<pref name='mins_before_away' type='int' value='5'/>
+			<pref name='auto_reply' type='string' value='awayidle'/>
 		</pref>
+		<pref name='buddies'/>
 		<pref name='contact'>
-			<pref name='last_match' type='bool' value='0' />
-			<pref name='offline_score' type='int' value='4' />
-			<pref name='away_score' type='int' value='2' />
-			<pref name='idle_score' type='int' value='1' />
+			<pref name='last_match' type='bool' value='0'/>
+			<pref name='offline_score' type='int' value='4'/>
+			<pref name='away_score' type='int' value='2'/>
+			<pref name='idle_score' type='int' value='1'/>
+		</pref>
+		<pref name='debug'>
+			<pref name='timestamps' type='bool' value='0'/>
+		</pref>
+		<pref name='status'>
+			<pref name='scores'>
+				<pref name='offline' type='int' value='-500'/>
+				<pref name='available' type='int' value='100'/>
+				<pref name='invisible' type='int' value='-50'/>
+				<pref name='away' type='int' value='-100'/>
+				<pref name='extended_away' type='int' value='-200'/>
+				<pref name='idle' type='int' value='-10'/>
+			</pref>
+		</pref>
+		<pref name='savedstatus'>
+			<pref name='default' type='int' value='1161808301'/>
+			<pref name='startup' type='int' value='0'/>
+			<pref name='startup_current_status' type='bool' value='1'/>
+			<pref name='idleaway' type='int' value='1161808306'/>
+			<pref name='isidleaway' type='bool' value='0'/>
+			<pref name='current' type='int' value='1153343286'/>
 		</pref>
 		<pref name='conversations'>
-			<pref name='use_alias_for_title' type='bool' value='1' />
 			<pref name='chat'>
-				<pref name='show_nick_change' type='bool' value='1' />
+				<pref name='show_nick_change' type='bool' value='1'/>
 			</pref>
 			<pref name='im'>
-				<pref name='send_typing' type='bool' value='1' />
+				<pref name='send_typing' type='bool' value='1'/>
 			</pref>
 		</pref>
 		<pref name='logging'>
-			<pref name='log_ims' type='bool' value='1' />
-			<pref name='log_chats' type='bool' value='0' />
-			<pref name='log_system' type='bool' value='0' />
-			<pref name='log_signon_signoff' type='bool' value='0' />
-			<pref name='log_idle_state' type='bool' value='0' />
-			<pref name='log_away_state' type='bool' value='0' />
-			<pref name='log_own_states' type='bool' value='0' />
-			<pref name='format' type='string' value='html' />
+			<pref name='log_ims' type='bool' value='1'/>
+			<pref name='log_chats' type='bool' value='0'/>
+			<pref name='log_system' type='bool' value='0'/>
+			<pref name='format' type='string' value='html'/>
 		</pref>
 		<pref name='network'>
-			<pref name='auto_ip' type='bool' value='1' />
-			<pref name='public_ip' type='string' value='' />
-			<pref name='ports_range_use' type='bool' value='0' />
-			<pref name='ports_range_start' type='int' value='1024' />
-			<pref name='ports_range_end' type='int' value='2048' />
+			<pref name='auto_ip' type='bool' value='1'/>
+			<pref name='public_ip' type='string' value='172.16.80.210'/>
+			<pref name='ports_range_use' type='bool' value='0'/>
+			<pref name='ports_range_start' type='int' value='1024'/>
+			<pref name='ports_range_end' type='int' value='2048'/>
+			<pref name='stun_server' type='string' value=''/>
 		</pref>
 		<pref name='proxy'>
-			<pref name='type' type='string' value='none' />
-			<pref name='host' type='string' value='' />
-			<pref name='port' type='int' value='0' />
-			<pref name='username' type='string' value='' />
-			<pref name='password' type='string' value='' />
+			<pref name='type' type='string' value='none'/>
+			<pref name='host' type='string' value=''/>
+			<pref name='port' type='int' value='0'/>
+			<pref name='username' type='string' value=''/>
+			<pref name='password' type='string' value=''/>
 		</pref>
 		<pref name='sound'>
-			<pref name='while_away' type='bool' value='0' />
+			<pref name='while_away' type='bool' value='0'/>
 		</pref>
 	</pref>
 	<pref name='plugins'>
 		<pref name='core'>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1' />
-				<pref name='notify_idle' type='bool' value='1' />
+			<pref name='psychic'>
+				<pref name='buddies_only' type='bool' value='0'/>
+				<pref name='show_notice' type='bool' value='1'/>
+				<pref name='activate_online' type='bool' value='1'/>
 			</pref>
-			<pref name='autorecon'>
-				<pref name='hide_connected_error' type='bool' value='0' />
-				<pref name='hide_connecting_error' type='bool' value='0' />
-				<pref name='restore_state' type='bool' value='1' />
+			<pref name='statenotify'>
+				<pref name='notify_away' type='bool' value='1'/>
+				<pref name='notify_idle' type='bool' value='1'/>
+				<pref name='notify_signon' type='bool' value='1'/>
 			</pref>
 		</pref>
-		<pref name='lopl' />
+		<pref name='lopl'/>
 		<pref name='prpl'>
+			<pref name='qq'>
+				<pref name='show_status_by_icon' type='bool' value='1'/>
+				<pref name='show_fake_video' type='bool' value='0'/>
+				<pref name='prompt_for_missing_packet' type='bool' value='1'/>
+				<pref name='prompt_group_msg_on_recv' type='bool' value='1'/>
+			</pref>
+			<pref name='oscar'>
+				<pref name='recent_buddies' type='bool' value='0'/>
+				<pref name='show_idle' type='bool' value='0'/>
+			</pref>
 			<pref name='silc'>
-				<pref name='sign_im' type='bool' value='0' />
-				<pref name='verify_im' type='bool' value='0' />
-				<pref name='sign_chat' type='bool' value='0' />
-				<pref name='verify_chat' type='bool' value='0' />
-				<pref name='vcard' type='string' value='' />
+				<pref name='sign_im' type='bool' value='0'/>
+				<pref name='verify_im' type='bool' value='0'/>
+				<pref name='sign_chat' type='bool' value='0'/>
+				<pref name='verify_chat' type='bool' value='0'/>
+				<pref name='vcard' type='string' value=''/>
 			</pref>
 			<pref name='msn'>
-				<pref name='conv_close_notice' type='bool' value='1' />
-				<pref name='conv_timeout_notice' type='bool' value='1' />
+				<pref name='conv_close_notice' type='bool' value='1'/>
+				<pref name='conv_timeout_notice' type='bool' value='1'/>
 			</pref>
 			<pref name='jabber'>
-				<pref name='hide_os' type='bool' value='0' />
+				<pref name='hide_os' type='bool' value='0'/>
 			</pref>
 		</pref>
 		<pref name='gtk'>
-			<pref name='docklet'>
-				<pref name='queue_messages' type='bool' value='0' />
+			<pref name='musicmessaging'>
+				<pref name='editor_path' type='string' value='/usr/local/bin/gscore'/>
+			</pref>
+			<pref name='extplacement'>
+				<pref name='placement_number' type='int' value='4'/>
+				<pref name='placement_number_separate' type='bool' value='0'/>
+			</pref>
+			<pref name='timestamp'>
+				<pref name='interval' type='int' value='300000'/>
+			</pref>
+			<pref name='timestamp_format'>
+				<pref name='force_24hr' type='bool' value='1'/>
+				<pref name='use_dates'>
+					<pref name='conversation' type='string' value='automatic'/>
+					<pref name='log' type='string' value='automatic'/>
+				</pref>
+			</pref>
+			<pref name='gaimrc'>
+				<pref name='set'>
+					<pref name='gtk-font-name' type='bool' value='0'/>
+					<pref name='gtk-key-theme-name' type='bool' value='0'/>
+					<pref name='color'>
+						<pref name='GtkWidget::cursor-color' type='bool' value='0'/>
+						<pref name='GtkWidget::secondary-cursor-color' type='bool' value='0'/>
+						<pref name='GtkIMHtml::hyperlink-color' type='bool' value='0'/>
+					</pref>
+					<pref name='size'>
+						<pref name='GtkTreeView::expander_size' type='bool' value='0'/>
+						<pref name='GtkTreeView::horizontal_separator' type='bool' value='0'/>
+					</pref>
+					<pref name='font'>
+						<pref name='*gaim_gtkconv_entry' type='bool' value='0'/>
+						<pref name='*gaim_gtkconv_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtklog_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtkrequest_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtknotify_imhtml' type='bool' value='0'/>
+					</pref>
+					<pref name='bool'>
+						<pref name='GtkTreeView::indent_expanders' type='bool' value='0'/>
+					</pref>
+				</pref>
+				<pref name='gtk-font-name' type='string' value=''/>
+				<pref name='gtk-key-theme-name' type='string' value=''/>
+				<pref name='color'>
+					<pref name='GtkWidget::cursor-color' type='string' value=''/>
+					<pref name='GtkWidget::secondary-cursor-color' type='string' value=''/>
+					<pref name='GtkIMHtml::hyperlink-color' type='string' value=''/>
+				</pref>
+				<pref name='size'>
+					<pref name='GtkTreeView::expander_size' type='int' value='0'/>
+					<pref name='GtkTreeView::horizontal_separator' type='int' value='0'/>
+				</pref>
+				<pref name='font'>
+					<pref name='*gaim_gtkconv_entry' type='string' value=''/>
+					<pref name='*gaim_gtkconv_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtklog_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtkrequest_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtknotify_imhtml' type='string' value=''/>
+				</pref>
+				<pref name='bool'>
+					<pref name='GtkTreeView::indent_expanders' type='bool' value='1'/>
+				</pref>
 			</pref>
 			<pref name='X11'>
 				<pref name='gestures'>
-					<pref name='visual' type='bool' value='0' />
+					<pref name='visual' type='bool' value='0'/>
 				</pref>
 				<pref name='notify'>
-					<pref name='type_im' type='bool' value='1' />
-					<pref name='type_chat' type='bool' value='0' />
-					<pref name='type_focused' type='bool' value='0' />
-					<pref name='method_string' type='bool' value='0' />
-					<pref name='title_string' type='string' value='(*)' />
-					<pref name='method_urgent' type='bool' value='1' />
-					<pref name='method_count' type='bool' value='1' />
-					<pref name='notify_focus' type='bool' value='1' />
-					<pref name='notify_click' type='bool' value='1' />
-					<pref name='notify_type' type='bool' value='1' />
-					<pref name='notify_send' type='bool' value='1' />
-					<pref name='notify_switch' type='bool' value='1' />
+					<pref name='type_im' type='bool' value='1'/>
+					<pref name='type_chat' type='bool' value='0'/>
+					<pref name='type_chat_nick' type='bool' value='0'/>
+					<pref name='type_focused' type='bool' value='0'/>
+					<pref name='method_string' type='bool' value='0'/>
+					<pref name='title_string' type='string' value='(*)'/>
+					<pref name='method_urgent' type='bool' value='1'/>
+					<pref name='method_count' type='bool' value='1'/>
+					<pref name='method_count_xprop' type='bool' value='0'/>
+					<pref name='method_raise' type='bool' value='0'/>
+					<pref name='notify_focus' type='bool' value='1'/>
+					<pref name='notify_click' type='bool' value='1'/>
+					<pref name='notify_type' type='bool' value='1'/>
+					<pref name='notify_send' type='bool' value='1'/>
+					<pref name='notify_switch' type='bool' value='1'/>
 				</pref>
 			</pref>
-			<pref name='timestamp'>
-				<pref name='interval' type='int' value='300000' />
+			<pref name='docklet'>
+				<pref name='blink_im' type='string' value='hidden'/>
+				<pref name='blink_chat' type='string' value='never'/>
 			</pref>
-			<pref name='extplacement'>
-				<pref name='placement_number' type='int' value='4' />
-				<pref name='placement_number_separate' type='bool' value='0' />
+		</pref>
+		<pref name='gnt'>
+			<pref name='gntgf'>
+				<pref name='events'>
+					<pref name='signonf' type='bool' value='1'/>
+					<pref name='immsg' type='bool' value='1'/>
+					<pref name='chatmsg' type='bool' value='1'/>
+					<pref name='chatnick' type='bool' value='1'/>
+				</pref>
+				<pref name='beep' type='bool' value='1'/>
+				<pref name='urgent' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>
 	<pref name='gaim'>
 		<pref name='gtk'>
-			<pref name='accounts'>
-				<pref name='dialog'>
-					<pref name='width' type='int' value='550' />
-					<pref name='height' type='int' value='250' />
-				</pref>
-			</pref>
-			<pref name='away'>
-				<pref name='queue_messages' type='bool' value='0' />
-			</pref>
 			<pref name='browsers'>
-				<pref name='place' type='int' value='0' />
-				<pref name='command' type='string' value='' />
-				<pref name='browser' type='string' value='gnome-open' />
-			</pref>
-			<pref name='idle'>
-				<pref name='reporting_method' type='string' value='system' />
+				<pref name='place' type='int' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='browser' type='string' value='gnome-open'/>
 			</pref>
 			<pref name='plugins'>
 				<pref name='loaded' type='stringlist'>
-					<item value='/usr/lib/gaim/autorecon.so' />
-					<item value='/usr/lib/gaim/history.so' />
-					<item value='/usr/lib/gaim/docklet.so' />
-					<item value='/usr/lib/gaim/extplacement.so' />
-					<item value='/usr/lib/gaim/notify.so' />
+					<item value='/usr/lib/gaim/autorecon.so'/>
+					<item value='/usr/lib/gaim/history.so'/>
+					<item value='/usr/lib/gaim/docklet.so'/>
+					<item value='/usr/lib/gaim/extplacement.so'/>
+					<item value='/usr/lib/gaim/notify.so'/>
 				</pref>
 			</pref>
+			<pref name='filelocations'>
+				<pref name='last_save_folder' type='string' value=''/>
+				<pref name='last_open_folder' type='string' value=''/>
+				<pref name='last_icon_folder' type='string' value=''/>
+			</pref>
 			<pref name='smileys'>
-				<pref name='theme' type='string' value='/usr/share/pixmaps/gaim/smileys/default/theme' />
+				<pref name='theme' type='string' value='Default'/>
 			</pref>
 			<pref name='debug'>
-				<pref name='enabled' type='bool' value='0' />
-				<pref name='timestamps' type='bool' value='0' />
-				<pref name='toolbar' type='bool' value='1' />
-				<pref name='width' type='int' value='450' />
-				<pref name='height' type='int' value='250' />
+				<pref name='enabled' type='bool' value='0'/>
+				<pref name='filterlevel' type='int' value='0'/>
+				<pref name='style' type='int' value='3'/>
+				<pref name='toolbar' type='bool' value='1'/>
+				<pref name='width' type='int' value='450'/>
+				<pref name='height' type='int' value='250'/>
+				<pref name='regex' type='string' value=''/>
+				<pref name='filter' type='bool' value='0'/>
+				<pref name='invert' type='bool' value='0'/>
+				<pref name='case_insensitive' type='bool' value='0'/>
+				<pref name='highlight' type='bool' value='0'/>
 			</pref>
 			<pref name='sound'>
 				<pref name='enabled'>
-					<pref name='login' type='bool' value='1' />
-					<pref name='logout' type='bool' value='1' />
-					<pref name='im_recv' type='bool' value='1' />
-					<pref name='first_im_recv' type='bool' value='0' />
-					<pref name='send_im' type='bool' value='1' />
-					<pref name='join_chat' type='bool' value='0' />
-					<pref name='left_chat' type='bool' value='0' />
-					<pref name='send_chat_msg' type='bool' value='0' />
-					<pref name='chat_msg_recv' type='bool' value='0' />
-					<pref name='nick_said' type='bool' value='0' />
-					<pref name='pounce_default' type='bool' value='1' />
+					<pref name='login' type='bool' value='1'/>
+					<pref name='logout' type='bool' value='1'/>
+					<pref name='im_recv' type='bool' value='1'/>
+					<pref name='first_im_recv' type='bool' value='0'/>
+					<pref name='send_im' type='bool' value='1'/>
+					<pref name='join_chat' type='bool' value='0'/>
+					<pref name='left_chat' type='bool' value='0'/>
+					<pref name='send_chat_msg' type='bool' value='0'/>
+					<pref name='chat_msg_recv' type='bool' value='0'/>
+					<pref name='nick_said' type='bool' value='0'/>
+					<pref name='pounce_default' type='bool' value='1'/>
 				</pref>
 				<pref name='file'>
-					<pref name='login' type='string' value='' />
-					<pref name='logout' type='string' value='' />
-					<pref name='im_recv' type='string' value='' />
-					<pref name='first_im_recv' type='string' value='' />
-					<pref name='send_im' type='string' value='' />
-					<pref name='join_chat' type='string' value='' />
-					<pref name='left_chat' type='string' value='' />
-					<pref name='send_chat_msg' type='string' value='' />
-					<pref name='chat_msg_recv' type='string' value='' />
-					<pref name='nick_said' type='string' value='' />
-					<pref name='pounce_default' type='string' value='' />
-				</pref>
-				<pref name='conv_focus' type='bool' value='1' />
-				<pref name='command' type='string' value='' />
-				<pref name='method' type='string' value='automatic' />
+					<pref name='login' type='string' value=''/>
+					<pref name='logout' type='string' value=''/>
+					<pref name='im_recv' type='string' value=''/>
+					<pref name='first_im_recv' type='string' value=''/>
+					<pref name='send_im' type='string' value=''/>
+					<pref name='join_chat' type='string' value=''/>
+					<pref name='left_chat' type='string' value=''/>
+					<pref name='send_chat_msg' type='string' value=''/>
+					<pref name='chat_msg_recv' type='string' value=''/>
+					<pref name='nick_said' type='string' value=''/>
+					<pref name='pounce_default' type='string' value=''/>
+				</pref>
+				<pref name='conv_focus' type='bool' value='1'/>
+				<pref name='mute' type='bool' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='method' type='string' value='automatic'/>
+				<pref name='volume' type='int' value='50'/>
+			</pref>
+			<pref name='accounts'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
+				<pref name='buddyicon' type='string' value=''/>
 			</pref>
 			<pref name='blist'>
-				<pref name='auto_expand_contacts' type='bool' value='1' />
-				<pref name='button_style' type='int' value='3' />
-				<pref name='grey_idle_buddies' type='bool' value='1' />
-				<pref name='raise_on_events' type='bool' value='0' />
-				<pref name='show_buddy_icons' type='bool' value='0' />
-				<pref name='show_empty_groups' type='bool' value='0' />
-				<pref name='show_idle_time' type='bool' value='1' />
-				<pref name='show_offline_buddies' type='bool' value='0' />
-				<pref name='show_warning_level' type='bool' value='1' />
-				<pref name='sort_type' type='string' value='alphabetical' />
-				<pref name='x' type='int' value='0' />
-				<pref name='y' type='int' value='0' />
-				<pref name='width' type='int' value='309' />
-				<pref name='height' type='int' value='500' />
-				<pref name='tooltip_delay' type='int' value='500' />
+				<pref name='show_buddy_icons' type='bool' value='0'/>
+				<pref name='show_empty_groups' type='bool' value='0'/>
+				<pref name='show_idle_time' type='bool' value='1'/>
+				<pref name='show_offline_buddies' type='bool' value='0'/>
+				<pref name='list_visible' type='bool' value='1'/>
+				<pref name='list_maximized' type='bool' value='0'/>
+				<pref name='sort_type' type='string' value='alphabetical'/>
+				<pref name='x' type='int' value='133'/>
+				<pref name='y' type='int' value='75'/>
+				<pref name='width' type='int' value='309'/>
+				<pref name='height' type='int' value='500'/>
+				<pref name='tooltip_delay' type='int' value='500'/>
+			</pref>
+			<pref name='status'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
 			</pref>
 			<pref name='conversations'>
-				<pref name='close_on_tabs' type='bool' value='1' />
-				<pref name='ctrl_enter_sends' type='bool' value='0' />
-				<pref name='enter_sends' type='bool' value='1' />
-				<pref name='escape_closes' type='bool' value='0' />
-				<pref name='send_formatting' type='bool' value='0' />
-				<pref name='send_bold' type='bool' value='0' />
-				<pref name='send_italic' type='bool' value='0' />
-				<pref name='send_underline' type='bool' value='0' />
-				<pref name='show_timestamps' type='bool' value='1' />
-				<pref name='spellcheck' type='bool' value='1' />
-				<pref name='ignore_colors' type='bool' value='0' />
-				<pref name='ignore_fonts' type='bool' value='0' />
-				<pref name='ignore_font_sizes' type='bool' value='0' />
-				<pref name='html_shortcuts' type='bool' value='1' />
-				<pref name='smiley_shortcuts' type='bool' value='0' />
-				<pref name='show_formatting_toolbar' type='bool' value='1' />
-				<pref name='passthrough_unknown_commands' type='bool' value='0' />
-				<pref name='placement' type='string' value='last' />
-				<pref name='placement_number' type='int' value='1' />
-				<pref name='bgcolor' type='string' value='' />
-				<pref name='fgcolor' type='string' value='' />
-				<pref name='font_face' type='string' value='' />
-				<pref name='font_size' type='int' value='3' />
-				<pref name='tabs' type='bool' value='1' />
-				<pref name='tab_side' type='int' value='2' />
-				<pref name='button_type' type='int' value='3' />
+				<pref name='use_smooth_scrolling' type='bool' value='1'/>
+				<pref name='close_on_tabs' type='bool' value='1'/>
+				<pref name='send_bold' type='bool' value='0'/>
+				<pref name='send_italic' type='bool' value='0'/>
+				<pref name='send_underline' type='bool' value='0'/>
+				<pref name='spellcheck' type='bool' value='1'/>
+				<pref name='show_incoming_formatting' type='bool' value='1'/>
+				<pref name='show_timestamps' type='bool' value='1'/>
+				<pref name='show_formatting_toolbar' type='bool' value='1'/>
+				<pref name='passthrough_unknown_commands' type='bool' value='0'/>
+				<pref name='placement' type='string' value='last'/>
+				<pref name='placement_number' type='int' value='1'/>
+				<pref name='bgcolor' type='string' value=''/>
+				<pref name='fgcolor' type='string' value=''/>
+				<pref name='font_face' type='string' value=''/>
+				<pref name='font_size' type='int' value='3'/>
+				<pref name='tabs' type='bool' value='1'/>
+				<pref name='tab_side' type='int' value='2'/>
+				<pref name='scrollback_lines' type='int' value='4000'/>
 				<pref name='chat'>
-					<pref name='color_nicks' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='userlist_width' type='int' value='80'/>
 				</pref>
 				<pref name='im'>
-					<pref name='animate_buddy_icons' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
-					<pref name='show_buddy_icons' type='bool' value='1' />
+					<pref name='animate_buddy_icons' type='bool' value='1'/>
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='show_buddy_icons' type='bool' value='1'/>
+					<pref name='hide_new' type='string' value='never'/>
 				</pref>
 			</pref>
 			<pref name='pounces'>
 				<pref name='default_actions'>
-					<pref name='open-window' type='bool' value='0' />
-					<pref name='popup-notify' type='bool' value='0' />
-					<pref name='send-message' type='bool' value='1' />
-					<pref name='execute-command' type='bool' value='0' />
-					<pref name='play-sound' type='bool' value='0' />
+					<pref name='open-window' type='bool' value='0'/>
+					<pref name='popup-notify' type='bool' value='0'/>
+					<pref name='send-message' type='bool' value='1'/>
+					<pref name='execute-command' type='bool' value='0'/>
+					<pref name='play-sound' type='bool' value='0'/>
+				</pref>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='520'/>
+					<pref name='height' type='int' value='321'/>
 				</pref>
 			</pref>
 			<pref name='filetransfer'>
-				<pref name='clear_finished' type='bool' value='1' />
-				<pref name='keep_open' type='bool' value='0' />
+				<pref name='clear_finished' type='bool' value='1'/>
+				<pref name='keep_open' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gaim-meanwhile.spec	28 Aug 2006 00:56:48 -0000	1.15
+++ gaim-meanwhile.spec	31 Oct 2006 01:31:13 -0000	1.16
@@ -23,11 +23,11 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta3
+%define betaver	beta4
 
 Name:		gaim-meanwhile
 Version:	2.0.0
-Release:	0.4.%{betaver}%{?dist}
+Release:	0.5.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -88,7 +88,7 @@
 %endif
 # Evolution integration (FC3+)
 %if %{evolution_integration}
-BuildRequires:	evolution-data-server-devel
+BuildRequires:	evolution-data-server-devel >= 1.9.1
 %endif
 # SILC integration (FC3+)
 %if %{silc_integration}
@@ -121,7 +121,8 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
-%patch5 -p1
+#PIE patch is broken
+#%patch5 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -200,6 +201,8 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/libgaim*
 rm -rf $RPM_BUILD_ROOT%{_datadir}
 rm -rf $RPM_BUILD_ROOT%{_prefix}/src
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gaim.schemas
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gaim/private
 
 #preserve the libsametime debug libraries and delete the rest
 #mv $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/libsametime.so.debug $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/sametime.tmp
@@ -250,6 +253,9 @@
 %{_libdir}/gaim/
 
 %changelog
+* Sat Oct 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.5.beta4
+- Rebuild against most recent core package
+
 * Sun Aug 27 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.4.beta3
 - Bump and rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jun 2006 03:24:21 -0000	1.9
+++ sources	31 Oct 2006 01:31:13 -0000	1.10
@@ -1 +1 @@
-c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2
+ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 01:45:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 18:45:27 -0700
Subject: rpms/gnome-applet-timer/devel .cvsignore, 1.3,
	1.4 gnome-applet-timer.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200610310145.k9V1jR9J011989@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11967

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.3.1 (#203234)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 14:44:55 -0000	1.3
+++ .cvsignore	31 Oct 2006 01:44:57 -0000	1.4
@@ -1 +1 @@
-timer-applet-1.2.tar.gz
+timer-applet-1.3.1.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-timer.spec	15 Sep 2006 10:05:35 -0000	1.6
+++ gnome-applet-timer.spec	31 Oct 2006 01:44:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -9,11 +9,12 @@
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel >= 2.6, gettext, scrollkeeper, perl(XML::Parser)
+BuildRequires:  gnome-panel-devel >= 2.6, libnotify-devel >= 0.3.0
+BuildRequires:  gettext, perl(XML::Parser), scrollkeeper
 Provides:       timer-applet = %{version}
 Requires(pre):  GConf2
 Requires(post): GConf2, scrollkeeper
-Requires(preun):  GConf2
+Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
 %description
@@ -53,7 +54,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 
@@ -61,7 +61,6 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-killall -HUP gconfd-2 || :
 
 scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || :
 
@@ -70,7 +69,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 %postun
@@ -89,6 +87,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Tue Oct 31 2006 Christoph Wickert <fedora wickert at arcor de> - 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
 - Mass rebuild for Fedora Core 6.
 - BuildRequire perl(XML::Parser).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 14:44:55 -0000	1.3
+++ sources	31 Oct 2006 01:44:57 -0000	1.4
@@ -1 +1 @@
-00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz
+6c7f36c41bd8d7a86c055bfdf42f1493  timer-applet-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 02:02:21 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 19:02:21 -0700
Subject: rpms/xfce4-genmon-plugin/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-genmon-plugin.spec, 1.5, 1.6
Message-ID: <200610310202.k9V22Lqb015009@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14987

Modified Files:
	.cvsignore sources xfce4-genmon-plugin.spec 
Log Message:
update to 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 12:18:36 -0000	1.3
+++ .cvsignore	31 Oct 2006 02:01:51 -0000	1.4
@@ -1 +1 @@
-xfce4-genmon-plugin-2.0.tar.bz2
+xfce4-genmon-plugin-3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 12:18:36 -0000	1.3
+++ sources	31 Oct 2006 02:01:51 -0000	1.4
@@ -1 +1 @@
-c859720637f943032545d7b1428aa0b4  xfce4-genmon-plugin-2.0.tar.bz2
+e44c78dab7a2856b76d5a1d8c9e6ebf2  xfce4-genmon-plugin-3.0.tar.bz2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-6/xfce4-genmon-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-genmon-plugin.spec	5 Oct 2006 12:18:36 -0000	1.5
+++ xfce4-genmon-plugin.spec	31 Oct 2006 02:01:51 -0000	1.6
@@ -1,16 +1,17 @@
 Name:		xfce4-genmon-plugin
-Version:	2.0
-Release:	3%{?dist}
+Version:	3.0
+Release:	1%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	LGPL
-URL:		http://goodies.xfce.org/
+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)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	xfce4-dev-tools
 Requires:	xfce4-panel >= 4.3.99.1
 
 %description
@@ -21,23 +22,29 @@
 %setup -q
 
 %build
+xdt-autogen
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 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
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Tue Oct 31 02:11:51 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon, 30 Oct 2006 19:11:51 -0700
Subject: rpms/gnome-applet-timer/FC-6 .cvsignore, 1.3,
	1.4 gnome-applet-timer.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200610310211.k9V2BptQ015147@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15123

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.3.1 (#203234)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 14:44:55 -0000	1.3
+++ .cvsignore	31 Oct 2006 02:11:21 -0000	1.4
@@ -1 +1 @@
-timer-applet-1.2.tar.gz
+timer-applet-1.3.1.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-6/gnome-applet-timer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-timer.spec	15 Sep 2006 10:05:35 -0000	1.6
+++ gnome-applet-timer.spec	31 Oct 2006 02:11:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -9,11 +9,12 @@
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel >= 2.6, gettext, scrollkeeper, perl(XML::Parser)
+BuildRequires:  gnome-panel-devel >= 2.6, libnotify-devel >= 0.3.0
+BuildRequires:  gettext, perl(XML::Parser), scrollkeeper
 Provides:       timer-applet = %{version}
 Requires(pre):  GConf2
 Requires(post): GConf2, scrollkeeper
-Requires(preun):  GConf2
+Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
 %description
@@ -53,7 +54,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 
@@ -61,7 +61,6 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/timer-applet.schemas >/dev/null || :
-killall -HUP gconfd-2 || :
 
 scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || :
 
@@ -70,7 +69,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/timer-applet.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 %postun
@@ -89,6 +87,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Tue Oct 31 2006 Christoph Wickert <fedora wickert at arcor de> - 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
 - Mass rebuild for Fedora Core 6.
 - BuildRequire perl(XML::Parser).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 14:44:55 -0000	1.3
+++ sources	31 Oct 2006 02:11:21 -0000	1.4
@@ -1 +1 @@
-00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz
+6c7f36c41bd8d7a86c055bfdf42f1493  timer-applet-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 04:43:54 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 30 Oct 2006 21:43:54 -0700
Subject: rpms/jd/devel .cvsignore, 1.8, 1.9 jd.spec, 1.15, 1.16 sources, 1.8,
	1.9 jd-1.8.0-cvs061028-support-x86_64.patch, 1.1, NONE
Message-ID: <200610310443.k9V4hsWP022653@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22633

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* Mon Oct 30 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.4.cvs061030
- cvs 061030 (25:15 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Oct 2006 16:10:09 -0000	1.8
+++ .cvsignore	31 Oct 2006 04:43:24 -0000	1.9
@@ -1 +1 @@
-jd-1.8.0-cvs061028.tgz
+jd-1.8.0-cvs061030.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jd.spec	28 Oct 2006 17:12:05 -0000	1.15
+++ jd.spec	31 Oct 2006 04:43:24 -0000	1.16
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061028
+%define         strtag        cvs061030
 %define         repoid        22352
 
 
@@ -20,7 +20,6 @@
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
-%define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
 
@@ -45,8 +44,7 @@
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
 #Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:        %{name}-%{main_ver}-%{strtag}.tgz
-Patch0:         jd-1.8.0-cvs061028-support-x86_64.patch
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -62,7 +60,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -85,8 +82,6 @@
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --remove-category X-Red-Hat-Base \
-   --remove-category Application \
    %{name}.desktop
 
 %clean
@@ -108,10 +103,11 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Oct 30 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.4.cvs061030
+- cvs 061030 (25:15 JST)
+
 * 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.
-
-* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.cvs061028
 - 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Oct 2006 16:10:09 -0000	1.8
+++ sources	31 Oct 2006 04:43:24 -0000	1.9
@@ -1 +1 @@
-6845b0b020e62f5708ddbd594c7db4f6  jd-1.8.0-cvs061028.tgz
+5810c2bb6cb4b6ff8cc84000eb0c166a  jd-1.8.0-cvs061030.tgz


--- jd-1.8.0-cvs061028-support-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 10:10:16 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 31 Oct 2006 03:10:16 -0700
Subject: rpms/yakuake/devel yakuake-getSessionName.diff, NONE,
	1.1 yakuake.spec, 1.4, 1.5
Message-ID: <200610311010.k9VAAGCa009333@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/yakuake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9306

Modified Files:
	yakuake.spec 
Added Files:
	yakuake-getSessionName.diff 
Log Message:
Add support for KonsoleScripts (#212862)

yakuake-getSessionName.diff:

--- NEW FILE yakuake-getSessionName.diff ---
diff -ur yakuake-2.7.5/yakuake/src/dcop_interface.h yakuake-2.7.5-patched/yakuake/src/dcop_interface.h
--- yakuake-2.7.5/yakuake/src/dcop_interface.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/dcop_interface.h	2006-08-08 14:10:16.721056702 +0300
@@ -43,6 +43,8 @@
     virtual void    slotToggleState() = 0;
 
     virtual void    slotRenameSession(int id, const QString & name) = 0;
+
+	virtual QString slotSessionName(int id) = 0;
     virtual void    slotSetSessionTitleText(int id, const QString & name) = 0;
     virtual void    slotRunCommandInSession(int id, const QString & value) = 0;
 };
diff -ur yakuake-2.7.5/yakuake/src/main_window.cpp yakuake-2.7.5-patched/yakuake/src/main_window.cpp
--- yakuake-2.7.5/yakuake/src/main_window.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.cpp	2006-08-08 14:12:08.191976212 +0300
@@ -290,6 +290,16 @@
 
 
 /******************************************************************************
+** Gets caption from an item given its id
+*********************************/
+
+QString MainWindow::slotSessionName(int id)
+{
+	return tabs_bar->getCaption(id);
+}
+
+
+/******************************************************************************
 ** Open inline edit for the current item and show tab bar if necessary
 ************************************************************************/
 
diff -ur yakuake-2.7.5/yakuake/src/main_window.h yakuake-2.7.5-patched/yakuake/src/main_window.h
--- yakuake-2.7.5/yakuake/src/main_window.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.h	2006-08-08 14:06:43.891845419 +0300
@@ -280,6 +280,7 @@
     void    slotPasteClipboard();
 
     void    slotRenameSession(int id, const QString & name);
+	QString slotSessionName(int id);
     void    slotInteractiveRename();
     void    slotSetSessionTitleText(int id, const QString & name);
     void    slotRunCommandInSession(int id, const QString & value);
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.cpp yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp
--- yakuake-2.7.5/yakuake/src/tabbed_widget.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp	2006-08-08 13:59:13.379880079 +0300
@@ -157,6 +157,18 @@
 
 
 /******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString    TabbedWidget::getCaption(int id)
+{
+    int index = items.findIndex(id);
+
+    return captions[index];
+}
+
+
+/******************************************************************************
 ** Open inline edit for the current item
 ******************************************/
 
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.h yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h
--- yakuake-2.7.5/yakuake/src/tabbed_widget.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h	2006-08-08 14:08:45.551397384 +0300
@@ -145,6 +145,7 @@
     void    selectPreviousItem();
 
     void    renameItem(int id, const QString & name);
+	QString getCaption(int id);
     void    interactiveRename();
 
     void    setFontColor(const QColor & color);
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.cpp yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp
--- yakuake-2.7.5/yakuake/src/tabs_bar.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp	2006-08-08 14:14:43.405611033 +0300
@@ -86,6 +86,16 @@
     tabs_widget->renameItem(id, name);
 }
 
+/******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString    TabsBar::getCaption(int id)
+{
+    return tabs_widget->getCaption(id);
+}
+
+
 
 /******************************************************************************
 ** Open inline edit for the current item
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.h yakuake-2.7.5-patched/yakuake/src/tabs_bar.h
--- yakuake-2.7.5/yakuake/src/tabs_bar.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.h	2006-08-08 14:15:04.210902512 +0300
@@ -127,6 +127,7 @@
     int     removeItem(int id);
 
     void    renameItem(int id, const QString & name);
+	QString getCaption(int id);
     void    interactiveRename();
 
 


Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yakuake.spec	15 Sep 2006 13:27:15 -0000	1.4
+++ yakuake.spec	31 Oct 2006 10:09:46 -0000	1.5
@@ -1,12 +1,14 @@
 Name:           yakuake
 Version:        2.7.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Terminal emulator for KDE
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://extragear.kde.org/apps/yakuake/
 Source0:        http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2
+# http://www.kde-look.org/content/download.php?content=43873&id=2
+Patch0:         http://ota.tr.spt.fi/~fisu81/stuff/konsolescripts/yakuake-getSessionName.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -19,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -79,6 +82,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.7.5-4
+- Add support for KonsoleScripts (#212862)
+
 * Fri Sep 15 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.7.5-3
 - Rebuild for FE6
 - Update e-mail address



From fedora-extras-commits at redhat.com  Tue Oct 31 10:54:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 03:54:58 -0700
Subject: rpms/childsplay_plugins/devel
	childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.1,
	1.2 childsplay_plugins.spec, 1.4,
	1.5 childsplay_plugins-0.80.8-assetml.patch, 1.2, NONE
Message-ID: <200610311054.k9VAsw0H009718@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9677

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Removed Files:
	childsplay_plugins-0.80.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	11 May 2006 18:18:46 -0000	1.1
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 10:54:28 -0000	1.2
@@ -4,10 +4,10 @@
      def _setup(self):
          """ Set all the stuff we need"""
          #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
--        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
--        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
-+        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
-+        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
+-        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
+-        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
          if not os.path.exists(self.sounddir):
 -            self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
 +            self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- childsplay_plugins.spec	6 Sep 2006 14:05:45 -0000	1.4
+++ childsplay_plugins.spec	31 Oct 2006 10:54:28 -0000	1.5
@@ -1,16 +1,15 @@
 Name:           childsplay_plugins
-Version:        0.83
-Release:        2%{?dist}
+Version:        0.84
+Release:        1%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
 License:        GPL
 URL:            http://childsplay.sourceforge.net/
 Source:         http://dl.sf.net/sourceforge/childsplay/%{name}-%{version}.tgz
 Patch0:         childsplay_plugins-0.80.7-alphabet-sounds.patch
-Patch1:         childsplay_plugins-0.80.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       childsplay >= 0.83
+Requires:       childsplay >= 0.84
 
 %description
 Plugins (games) for Childsplay a suite of educational games for young
@@ -21,7 +20,6 @@
 %setup -q
 # no backups otherwise the backups endup in the rpm.
 %patch0 -p1
-%patch1 -p1
 # the translation is merged into the assetml file, so don't ship it seperatly
 rm -r assetml/childsplay/sounds-misc/po
 
@@ -35,12 +33,9 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay
-mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
 
 
 %clean
@@ -51,10 +46,14 @@
 %defattr(-, root, root, -)
 %doc README*
 %{_datadir}/childsplay
-%{_datadir}/assetml
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
+- New upstream release 0.84
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
 - Don't %%ghost the .pyo files (bug 205370)
 


--- childsplay_plugins-0.80.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 10:55:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 03:55:23 -0700
Subject: rpms/childsplay/devel childsplay.spec, 1.6, 1.7 sources, 1.4,
	1.5 childsplay-0.81.8-assetml.patch, 1.2, NONE
Message-ID: <200610311055.k9VAtNne009722@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9700

Modified Files:
	childsplay.spec sources 
Removed Files:
	childsplay-0.81.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- childsplay.spec	22 Sep 2006 09:39:06 -0000	1.6
+++ childsplay.spec	31 Oct 2006 10:54:52 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           childsplay
-Version:        0.83.1
+Version:        0.84.1
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -8,11 +8,10 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Patch0:         childsplay-0.81.8-highscore.patch
-Patch1:         childsplay-0.81.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
-Requires:       pygame, childsplay_plugins >= 0.83
+Requires:       pygame, childsplay_plugins >= 0.84, hicolor-icon-theme
 
 %description
 Childsplay is a suite of educational games for young children. It's written in
@@ -27,8 +26,6 @@
 %prep
 %setup -q
 %patch0 -p1 -z .highscore
-# no backups otherwise the backups endup in the rpm.
-%patch1 -p1
 # we don't use the buggy provided install
 rm install.py
 # the translation is merged into the assetml file, so don't ship it seperatly
@@ -49,7 +46,7 @@
 echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
 echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py
 echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py
-echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py
+echo "ASSETMLDIR=\"%{_datadir}\"" >> BASEPATH.py
 echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py
 echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py
 
@@ -59,7 +56,6 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 cp -a *.py  $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -68,9 +64,7 @@
   $RPM_BUILD_ROOT%{_bindir}/letters-trans
 cp -a Data  $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
+cp -a assetml/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6
 
@@ -115,14 +109,18 @@
 %doc README* doc/GPL* doc/README* License_*.ttf.txt
 %{_bindir}/%{name}
 %{_bindir}/letters-trans
-%{_datadir}/childsplay
-%{_datadir}/assetml
+%{_datadir}/%{name}
 %{_mandir}/man6/*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
+- New upstream release 0.84.1
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83.1-1
 - New upstream release 0.83.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Sep 2006 09:39:55 -0000	1.4
+++ sources	31 Oct 2006 10:54:52 -0000	1.5
@@ -1 +1 @@
-bdcd090f0adcd992c62a60ef39819e14  childsplay-0.83.1.tgz
+ae4e26a361b12d88b2d597a57568ac5e  childsplay-0.84.1.tgz


--- childsplay-0.81.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:06 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 31 Oct 2006 04:02:06 -0700
Subject: rpms/amarok/FC-5 .cvsignore, 1.27, 1.28 amarok.spec, 1.62,
	1.63 sources, 1.27, 1.28
Message-ID: <200610311102.k9VB26K5012865@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12694/FC-5

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Sep 2006 13:27:07 -0000	1.27
+++ .cvsignore	31 Oct 2006 11:01:33 -0000	1.28
@@ -1 +1 @@
-amarok-1.4.3.tar.bz2
+amarok-1.4.4.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- amarok.spec	7 Oct 2006 09:01:50 -0000	1.62
+++ amarok.spec	31 Oct 2006 11:01:33 -0000	1.63
@@ -1,18 +1,16 @@
-# The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
-# than to include the unfinished gstreamer engine (private mail following
-# http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
+# TODO:
+# Rio Karma support : libkarma
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.3
-Release:    6%{?dist}
+Version:    1.4.4
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
-Patch0:     amarok-1.4.3-playlist_encoding.patch
+Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -26,6 +24,7 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  xine-lib-devel
 # Detected by configure
 BuildRequires:  ruby, ruby-devel
 BuildRequires:  libifp-devel, libusb-devel
@@ -43,8 +42,6 @@
 %endif
 
 Requires:  ruby
-# Helix is the only available engine
-Requires:  HelixPlayer
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -52,10 +49,6 @@
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 Provides:  amarok-devel = %{version}-%{release}
 
-# On those archs, there is no engine 
-# (Helix is unavailable, gstreamer is in beta, xine is encumbered)
-ExcludeArch: ppc64 x86_64 s390 s390x ia64
-
 
 %description
 Amarok is a KDE multimedia player with:
@@ -87,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .playlist_encoding
 
 
 
@@ -104,7 +96,6 @@
      --with-ifp \
      --with-libgpod \
      --without-mp4v2 \
-     --without-xine \
 %ifnarch ppc64 x86_64 s390 s390x ia64
      --with-helix=%{_libdir}/helix \
 %endif
@@ -179,7 +170,6 @@
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/%{name}
-%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
@@ -193,6 +183,7 @@
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
 %{_libdir}/kde3/libamarok_daap-mediadevice.*
@@ -224,6 +215,9 @@
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+# Xine engine
+%{_datadir}/services/amarok_xine-engine.desktop
+%{_libdir}/kde3/libamarok_xine-engine.*
 ## Gstreamer engine
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
@@ -244,6 +238,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-1
+- version 1.4.4
+- enable xine support since xine is now in Fedora
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
 - rebuild for new libtunepimp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Sep 2006 13:27:07 -0000	1.27
+++ sources	31 Oct 2006 11:01:33 -0000	1.28
@@ -1 +1 @@
-b0b4f8952ad23705c70815d50fd0af52  amarok-1.4.3.tar.bz2
+56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 31 Oct 2006 04:02:12 -0700
Subject: rpms/amarok/FC-6 .cvsignore, 1.27, 1.28 amarok.spec, 1.63,
	1.64 sources, 1.27, 1.28
Message-ID: <200610311102.k9VB2C1S012870@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12694/FC-6

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Sep 2006 13:27:07 -0000	1.27
+++ .cvsignore	31 Oct 2006 11:01:42 -0000	1.28
@@ -1 +1 @@
-amarok-1.4.3.tar.bz2
+amarok-1.4.4.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- amarok.spec	7 Oct 2006 09:01:54 -0000	1.63
+++ amarok.spec	31 Oct 2006 11:01:42 -0000	1.64
@@ -1,18 +1,16 @@
-# The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
-# than to include the unfinished gstreamer engine (private mail following
-# http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
+# TODO:
+# Rio Karma support : libkarma
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.3
-Release:    6%{?dist}
+Version:    1.4.4
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
-Patch0:     amarok-1.4.3-playlist_encoding.patch
+Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -26,6 +24,7 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  xine-lib-devel
 # Detected by configure
 BuildRequires:  ruby, ruby-devel
 BuildRequires:  libifp-devel, libusb-devel
@@ -43,8 +42,6 @@
 %endif
 
 Requires:  ruby
-# Helix is the only available engine
-Requires:  HelixPlayer
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -52,10 +49,6 @@
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 Provides:  amarok-devel = %{version}-%{release}
 
-# On those archs, there is no engine 
-# (Helix is unavailable, gstreamer is in beta, xine is encumbered)
-ExcludeArch: ppc64 x86_64 s390 s390x ia64
-
 
 %description
 Amarok is a KDE multimedia player with:
@@ -87,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .playlist_encoding
 
 
 
@@ -104,7 +96,6 @@
      --with-ifp \
      --with-libgpod \
      --without-mp4v2 \
-     --without-xine \
 %ifnarch ppc64 x86_64 s390 s390x ia64
      --with-helix=%{_libdir}/helix \
 %endif
@@ -179,7 +170,6 @@
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/%{name}
-%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
@@ -193,6 +183,7 @@
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
 %{_libdir}/kde3/libamarok_daap-mediadevice.*
@@ -224,6 +215,9 @@
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+# Xine engine
+%{_datadir}/services/amarok_xine-engine.desktop
+%{_libdir}/kde3/libamarok_xine-engine.*
 ## Gstreamer engine
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
@@ -244,6 +238,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-1
+- version 1.4.4
+- enable xine support since xine is now in Fedora
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
 - rebuild for new libtunepimp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Sep 2006 13:27:07 -0000	1.27
+++ sources	31 Oct 2006 11:01:42 -0000	1.28
@@ -1 +1 @@
-b0b4f8952ad23705c70815d50fd0af52  amarok-1.4.3.tar.bz2
+56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:15 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 31 Oct 2006 04:02:15 -0700
Subject: rpms/amarok/devel .cvsignore, 1.27, 1.28 amarok.spec, 1.63,
	1.64 sources, 1.27, 1.28
Message-ID: <200610311102.k9VB2FSL012875@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12694/devel

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Sep 2006 13:27:07 -0000	1.27
+++ .cvsignore	31 Oct 2006 11:01:45 -0000	1.28
@@ -1 +1 @@
-amarok-1.4.3.tar.bz2
+amarok-1.4.4.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- amarok.spec	7 Oct 2006 09:01:54 -0000	1.63
+++ amarok.spec	31 Oct 2006 11:01:45 -0000	1.64
@@ -1,18 +1,16 @@
-# The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
-# than to include the unfinished gstreamer engine (private mail following
-# http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
+# TODO:
+# Rio Karma support : libkarma
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.3
-Release:    6%{?dist}
+Version:    1.4.4
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
-Patch0:     amarok-1.4.3-playlist_encoding.patch
+Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -26,6 +24,7 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  xine-lib-devel
 # Detected by configure
 BuildRequires:  ruby, ruby-devel
 BuildRequires:  libifp-devel, libusb-devel
@@ -43,8 +42,6 @@
 %endif
 
 Requires:  ruby
-# Helix is the only available engine
-Requires:  HelixPlayer
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -52,10 +49,6 @@
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 Provides:  amarok-devel = %{version}-%{release}
 
-# On those archs, there is no engine 
-# (Helix is unavailable, gstreamer is in beta, xine is encumbered)
-ExcludeArch: ppc64 x86_64 s390 s390x ia64
-
 
 %description
 Amarok is a KDE multimedia player with:
@@ -87,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .playlist_encoding
 
 
 
@@ -104,7 +96,6 @@
      --with-ifp \
      --with-libgpod \
      --without-mp4v2 \
-     --without-xine \
 %ifnarch ppc64 x86_64 s390 s390x ia64
      --with-helix=%{_libdir}/helix \
 %endif
@@ -179,7 +170,6 @@
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/%{name}
-%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
@@ -193,6 +183,7 @@
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
 %{_libdir}/kde3/libamarok_daap-mediadevice.*
@@ -224,6 +215,9 @@
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+# Xine engine
+%{_datadir}/services/amarok_xine-engine.desktop
+%{_libdir}/kde3/libamarok_xine-engine.*
 ## Gstreamer engine
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
@@ -244,6 +238,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-1
+- version 1.4.4
+- enable xine support since xine is now in Fedora
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
 - rebuild for new libtunepimp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Sep 2006 13:27:07 -0000	1.27
+++ sources	31 Oct 2006 11:01:45 -0000	1.28
@@ -1 +1 @@
-b0b4f8952ad23705c70815d50fd0af52  amarok-1.4.3.tar.bz2
+56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:02:53 -0700
Subject: rpms/childsplay_plugins/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610311102.k9VB2rns012922@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12883

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2006 12:19:51 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:02:23 -0000	1.5
@@ -1 +1 @@
-childsplay_plugins-0.83.tgz
+childsplay_plugins-0.84.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2006 12:19:51 -0000	1.4
+++ sources	31 Oct 2006 11:02:23 -0000	1.5
@@ -1 +1 @@
-81355e87ee3968107305642333e253cf  childsplay_plugins-0.83.tgz
+573c1d60506143d68070e309c9009c20  childsplay_plugins-0.84.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:02:57 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:02:57 -0700
Subject: rpms/childsplay/devel .cvsignore,1.4,1.5
Message-ID: <200610311102.k9VB2v2G012925@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12896

Modified Files:
	.cvsignore 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Sep 2006 09:39:55 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:02:25 -0000	1.5
@@ -1 +1 @@
-childsplay-0.83.1.tgz
+childsplay-0.84.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:07:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:07:32 -0700
Subject: rpms/childsplay_plugins/FC-6
	childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.1,
	1.2 childsplay_plugins.spec, 1.4,
	1.5 childsplay_plugins-0.80.8-assetml.patch, 1.2, NONE
Message-ID: <200610311107.k9VB7W9w015152@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15074

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Removed Files:
	childsplay_plugins-0.80.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	11 May 2006 18:18:46 -0000	1.1
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 11:07:02 -0000	1.2
@@ -4,10 +4,10 @@
      def _setup(self):
          """ Set all the stuff we need"""
          #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
--        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
--        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
-+        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
-+        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
+-        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
+-        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
          if not os.path.exists(self.sounddir):
 -            self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
 +            self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/childsplay_plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- childsplay_plugins.spec	6 Sep 2006 14:05:45 -0000	1.4
+++ childsplay_plugins.spec	31 Oct 2006 11:07:02 -0000	1.5
@@ -1,16 +1,15 @@
 Name:           childsplay_plugins
-Version:        0.83
-Release:        2%{?dist}
+Version:        0.84
+Release:        1%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
 License:        GPL
 URL:            http://childsplay.sourceforge.net/
 Source:         http://dl.sf.net/sourceforge/childsplay/%{name}-%{version}.tgz
 Patch0:         childsplay_plugins-0.80.7-alphabet-sounds.patch
-Patch1:         childsplay_plugins-0.80.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       childsplay >= 0.83
+Requires:       childsplay >= 0.84
 
 %description
 Plugins (games) for Childsplay a suite of educational games for young
@@ -21,7 +20,6 @@
 %setup -q
 # no backups otherwise the backups endup in the rpm.
 %patch0 -p1
-%patch1 -p1
 # the translation is merged into the assetml file, so don't ship it seperatly
 rm -r assetml/childsplay/sounds-misc/po
 
@@ -35,12 +33,9 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay
-mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
 
 
 %clean
@@ -51,10 +46,14 @@
 %defattr(-, root, root, -)
 %doc README*
 %{_datadir}/childsplay
-%{_datadir}/assetml
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
+- New upstream release 0.84
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
 - Don't %%ghost the .pyo files (bug 205370)
 


--- childsplay_plugins-0.80.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:07:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:07:38 -0700
Subject: rpms/childsplay/FC-6 childsplay.spec, 1.6,
	1.7 childsplay-0.81.8-assetml.patch, 1.2, NONE
Message-ID: <200610311107.k9VB7cRn015184@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15097

Modified Files:
	childsplay.spec 
Removed Files:
	childsplay-0.81.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-6/childsplay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- childsplay.spec	22 Sep 2006 09:39:06 -0000	1.6
+++ childsplay.spec	31 Oct 2006 11:07:07 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           childsplay
-Version:        0.83.1
+Version:        0.84.1
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -8,11 +8,10 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Patch0:         childsplay-0.81.8-highscore.patch
-Patch1:         childsplay-0.81.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
-Requires:       pygame, childsplay_plugins >= 0.83
+Requires:       pygame, childsplay_plugins >= 0.84, hicolor-icon-theme
 
 %description
 Childsplay is a suite of educational games for young children. It's written in
@@ -27,8 +26,6 @@
 %prep
 %setup -q
 %patch0 -p1 -z .highscore
-# no backups otherwise the backups endup in the rpm.
-%patch1 -p1
 # we don't use the buggy provided install
 rm install.py
 # the translation is merged into the assetml file, so don't ship it seperatly
@@ -49,7 +46,7 @@
 echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
 echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py
 echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py
-echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py
+echo "ASSETMLDIR=\"%{_datadir}\"" >> BASEPATH.py
 echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py
 echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py
 
@@ -59,7 +56,6 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 cp -a *.py  $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -68,9 +64,7 @@
   $RPM_BUILD_ROOT%{_bindir}/letters-trans
 cp -a Data  $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
+cp -a assetml/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6
 
@@ -115,14 +109,18 @@
 %doc README* doc/GPL* doc/README* License_*.ttf.txt
 %{_bindir}/%{name}
 %{_bindir}/letters-trans
-%{_datadir}/childsplay
-%{_datadir}/assetml
+%{_datadir}/%{name}
 %{_mandir}/man6/*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
+- New upstream release 0.84.1
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
 * Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83.1-1
 - New upstream release 0.83.1
 


--- childsplay-0.81.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:08:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:08:43 -0700
Subject: rpms/childsplay/FC-5 childsplay.spec, 1.4,
	1.5 childsplay-0.81.8-assetml.patch, 1.2, NONE
Message-ID: <200610311108.k9VB8hTQ015292@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15249

Modified Files:
	childsplay.spec 
Removed Files:
	childsplay-0.81.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-5/childsplay.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- childsplay.spec	27 Aug 2006 12:20:56 -0000	1.4
+++ childsplay.spec	31 Oct 2006 11:08:13 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           childsplay
-Version:        0.83
+Version:        0.84.1
 Release:        1%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
@@ -8,11 +8,10 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tgz
 Source1:        childsplay.desktop
 Patch0:         childsplay-0.81.8-highscore.patch
-Patch1:         childsplay-0.81.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
-Requires:       pygame, childsplay_plugins >= 0.83
+Requires:       pygame, childsplay_plugins >= 0.84, hicolor-icon-theme
 
 %description
 Childsplay is a suite of educational games for young children. It's written in
@@ -27,8 +26,6 @@
 %prep
 %setup -q
 %patch0 -p1 -z .highscore
-# no backups otherwise the backups endup in the rpm.
-%patch1 -p1
 # we don't use the buggy provided install
 rm install.py
 # the translation is merged into the assetml file, so don't ship it seperatly
@@ -49,7 +46,7 @@
 echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py
 echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py
 echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py
-echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py
+echo "ASSETMLDIR=\"%{_datadir}\"" >> BASEPATH.py
 echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py
 echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py
 
@@ -59,7 +56,6 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 cp -a *.py  $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -68,9 +64,7 @@
   $RPM_BUILD_ROOT%{_bindir}/letters-trans
 cp -a Data  $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
+cp -a assetml/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6
 
@@ -115,26 +109,24 @@
 %doc README* doc/GPL* doc/README* License_*.ttf.txt
 %{_bindir}/%{name}
 %{_bindir}/letters-trans
-%dir %{_datadir}/childsplay
-%{_datadir}/childsplay/*.py
-%{_datadir}/childsplay/*.pyc
-%ghost %{_datadir}/childsplay/*.pyo
-%{_datadir}/childsplay/Data
-%{_datadir}/childsplay/childsplay-images
-%{_datadir}/childsplay/childsplay-sounds
-%{_datadir}/childsplay/memory-136x136
-%dir %{_datadir}/childsplay/plugins
-%{_datadir}/childsplay/plugins/*.py
-%{_datadir}/childsplay/plugins/*.pyc
-%ghost %{_datadir}/childsplay/plugins/*.pyo
-%{_datadir}/childsplay/plugins/*Data
-%{_datadir}/assetml
+%{_datadir}/%{name}
 %{_mandir}/man6/*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
+- New upstream release 0.84.1
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
+* Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83.1-1
+- New upstream release 0.83.1
+
+* Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
+- Don't %%ghost the .pyo files (bug 205370)
+
 * Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-1
 - New upstream version 0.83
 


--- childsplay-0.81.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:08:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:08:45 -0700
Subject: rpms/childsplay_plugins/FC-5
	childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.1,
	1.2 childsplay_plugins.spec, 1.3,
	1.4 childsplay_plugins-0.80.8-assetml.patch, 1.2, NONE
Message-ID: <200610311108.k9VB8jMI015296@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15266

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Removed Files:
	childsplay_plugins-0.80.8-assetml.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	11 May 2006 18:18:46 -0000	1.1
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 11:08:15 -0000	1.2
@@ -4,10 +4,10 @@
      def _setup(self):
          """ Set all the stuff we need"""
          #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
--        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
--        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language)
-+        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
-+        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet')
+-        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
+-        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
          if not os.path.exists(self.sounddir):
 -            self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
 +            self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/childsplay_plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- childsplay_plugins.spec	27 Aug 2006 12:20:34 -0000	1.3
+++ childsplay_plugins.spec	31 Oct 2006 11:08:15 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           childsplay_plugins
-Version:        0.83
+Version:        0.84
 Release:        1%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
@@ -7,10 +7,9 @@
 URL:            http://childsplay.sourceforge.net/
 Source:         http://dl.sf.net/sourceforge/childsplay/%{name}-%{version}.tgz
 Patch0:         childsplay_plugins-0.80.7-alphabet-sounds.patch
-Patch1:         childsplay_plugins-0.80.8-assetml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       childsplay >= 0.83
+Requires:       childsplay >= 0.84
 
 %description
 Plugins (games) for Childsplay a suite of educational games for young
@@ -21,7 +20,6 @@
 %setup -q
 # no backups otherwise the backups endup in the rpm.
 %patch0 -p1
-%patch1 -p1
 # the translation is merged into the assetml file, so don't ship it seperatly
 rm -r assetml/childsplay/sounds-misc/po
 
@@ -35,12 +33,9 @@
 # INSTALL.sh is seriously borked, so DIY
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
 cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons
 cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins
 cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay
-mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \
-  $RPM_BUILD_ROOT%{_datadir}/assetml
 
 
 %clean
@@ -50,18 +45,18 @@
 %files
 %defattr(-, root, root, -)
 %doc README*
-%dir %{_datadir}/childsplay
-%dir %{_datadir}/childsplay/plugins
-%{_datadir}/childsplay/plugins/*.py
-%{_datadir}/childsplay/plugins/*.pyc
-%ghost %{_datadir}/childsplay/plugins/*.pyo
-%{_datadir}/childsplay/plugins/*Data
-%{_datadir}/childsplay/plugins/SoundMemory
-%{_datadir}/childsplay/Data
-%{_datadir}/childsplay/sounds-misc
-%{_datadir}/assetml/*
+%{_datadir}/childsplay
+
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
+- New upstream release 0.84
+- Install the (still used) assetml files under %%{_datadir}/%%{name} instead
+  of under %%{_datadir}/assetml, since we no longer ship libassetml
+
+* Wed Sep  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-2
+- Don't %%ghost the .pyo files (bug 205370)
+
 * Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.83-1
 - New upstream version 0.83
 


--- childsplay_plugins-0.80.8-assetml.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 11:09:56 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 31 Oct 2006 04:09:56 -0700
Subject: rpms/revelation/devel revelation.spec,1.19,1.20
Message-ID: <200610311109.k9VB9uTW015372@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15316

Modified Files:
	revelation.spec 
Log Message:
0.4.7-6 -- track rawhide and BR gnome-python2-devel and cracklib-devel


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- revelation.spec	8 Sep 2006 17:34:29 -0000	1.19
+++ revelation.spec	31 Oct 2006 11:09:25 -0000	1.20
@@ -4,7 +4,7 @@
 Summary:	Password manager for GNOME 2
 Name:		revelation
 Version:	0.4.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Source0:	ftp://oss.codepoet.no/revelation/revelation-0.4.7.tar.bz2
@@ -19,12 +19,13 @@
 BuildRequires:	python >= 2.2
 BuildRequires:	python-devel >= 2.3
 BuildRequires:	pygtk2-devel >= 2.4
+BuildRequires:	gnome-python2-devel >= 2.5
 BuildRequires:	gnome-python2-gconf >= 2.0
 BuildRequires:	libgnomeui-devel >= 2.8
 BuildRequires:	gnome-keyring-devel >= 0.4.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	python-crypto >= 2.0
-BuildRequires:	cracklib
+BuildRequires:	cracklib-devel
 BuildRequires:	cracklib-dicts
 BuildRequires:	gnome-panel-devel gnome-python2-extras gnome-python2-desktop
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
@@ -102,6 +103,9 @@
 %{_libexecdir}/revelation-applet
 
 %changelog
+* Thu Oct 31 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.4.7-6
+- track rawhide and BR gnome-python2-devel and cracklib-devel
+
 * Thu Sep 07 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.4.7-5
 - Don't ghost pyo files (#205432)
 



From fedora-extras-commits at redhat.com  Tue Oct 31 11:10:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:10:10 -0700
Subject: rpms/childsplay/FC-5 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200610311110.k9VBAAvZ015419@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15335

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Aug 2006 12:20:56 -0000	1.3
+++ .cvsignore	31 Oct 2006 11:09:40 -0000	1.4
@@ -1 +1 @@
-childsplay-0.83.tgz
+childsplay-0.84.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Aug 2006 12:20:56 -0000	1.3
+++ sources	31 Oct 2006 11:09:40 -0000	1.4
@@ -1 +1 @@
-037aafb0a3ca8b16a596c06a9074cc20  childsplay-0.83.tgz
+ae4e26a361b12d88b2d597a57568ac5e  childsplay-0.84.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:10:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:10:16 -0700
Subject: rpms/childsplay_plugins/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610311110.k9VBAGTU015454@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15355

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2006 12:20:34 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:09:46 -0000	1.5
@@ -1 +1 @@
-childsplay_plugins-0.83.tgz
+childsplay_plugins-0.84.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2006 12:20:34 -0000	1.4
+++ sources	31 Oct 2006 11:09:46 -0000	1.5
@@ -1 +1 @@
-81355e87ee3968107305642333e253cf  childsplay_plugins-0.83.tgz
+573c1d60506143d68070e309c9009c20  childsplay_plugins-0.84.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:15:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:15:54 -0700
Subject: rpms/childsplay/FC-6 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610311115.k9VBFsRF015600@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15562

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84.1-1
- New upstream release 0.84.1
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Sep 2006 09:39:55 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:15:24 -0000	1.5
@@ -1 +1 @@
-childsplay-0.83.1.tgz
+childsplay-0.84.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Sep 2006 09:39:55 -0000	1.4
+++ sources	31 Oct 2006 11:15:24 -0000	1.5
@@ -1 +1 @@
-bdcd090f0adcd992c62a60ef39819e14  childsplay-0.83.1.tgz
+ae4e26a361b12d88b2d597a57568ac5e  childsplay-0.84.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 11:16:00 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 04:16:00 -0700
Subject: rpms/childsplay_plugins/FC-6 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200610311116.k9VBG0Me015634@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15582

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.84-1
- New upstream release 0.84
- Install the (still used) assetml files under %{_datadir}/%{name} instead
  of under %{_datadir}/assetml, since we no longer ship libassetml



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2006 12:19:51 -0000	1.4
+++ .cvsignore	31 Oct 2006 11:15:29 -0000	1.5
@@ -1 +1 @@
-childsplay_plugins-0.83.tgz
+childsplay_plugins-0.84.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2006 12:19:51 -0000	1.4
+++ sources	31 Oct 2006 11:15:29 -0000	1.5
@@ -1 +1 @@
-81355e87ee3968107305642333e253cf  childsplay_plugins-0.83.tgz
+573c1d60506143d68070e309c9009c20  childsplay_plugins-0.84.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 12:47:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 05:47:49 -0700
Subject: rpms/gtorrentviewer/devel gtorrentviewer.spec,1.9,1.10
Message-ID: <200610311247.k9VClnwQ019190@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtorrentviewer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19174

Modified Files:
	gtorrentviewer.spec 
Log Message:
rebuild for libcurl.so.4


Index: gtorrentviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/gtorrentviewer/devel/gtorrentviewer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtorrentviewer.spec	3 Oct 2006 09:38:56 -0000	1.9
+++ gtorrentviewer.spec	31 Oct 2006 12:47:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gtorrentviewer
 Version:	0.2b
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	A GTK2-based viewer and editor for BitTorrent meta files
 Group:		Applications/Internet
 License:	GPL
@@ -59,6 +59,9 @@
 %{_mandir}/man1/gtorrentviewer.1*
 
 %changelog
+* Tue Oct 30 2006 Paul Howarth <paul at city-fan.org> 0.2b-13
+- rebuild for libcurl.so.4
+
 * Tue Oct  3 2006 Paul Howarth <paul at city-fan.org> 0.2b-12
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 31 13:52:30 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 31 Oct 2006 06:52:30 -0700
Subject: rpms/international-time/FC-5 international-time.spec,1.2,1.3
Message-ID: <200610311352.k9VDqU7S022497@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22481

Modified Files:
	international-time.spec 
Log Message:
0.0.2-2.1.1


Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-5/international-time.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- international-time.spec	25 Oct 2006 10:55:05 -0000	1.2
+++ international-time.spec	31 Oct 2006 13:51:59 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: 	A tool for arranging times in advance with overseas colleagues
 Name: 		international-time
 Version: 	0.0.2
-Release: 	2%{?dist}
+Release: 	2%{?dist}.1.1
 License: 	GPL
 Group: 		Applications/System
 Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
@@ -64,7 +64,7 @@
 %{_datadir}/applications/*
 
 %changelog
-* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1.1
 - Update desktop database on installation.
 
 * Wed Oct 18 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-1



From fedora-extras-commits at redhat.com  Tue Oct 31 14:08:20 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 07:08:20 -0700
Subject: rpms/abcMIDI/FC-5 .cvsignore, 1.10, 1.11 abcMIDI.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200610311408.k9VE8KwH025648@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25594/FC-5

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061027


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Oct 2006 21:44:25 -0000	1.10
+++ .cvsignore	31 Oct 2006 14:07:49 -0000	1.11
@@ -1 +1 @@
-abcMIDI-2006-10-15.zip
+abcMIDI-2006-10-27.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcMIDI.spec	16 Oct 2006 21:44:25 -0000	1.10
+++ abcMIDI.spec	31 Oct 2006 14:07:49 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061015
-Release:        1.1%{?dist}
+Version:        20061027
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061027-1
+- new version 20061027
+
 * Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
 - new version 20061015
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Oct 2006 21:44:25 -0000	1.10
+++ sources	31 Oct 2006 14:07:49 -0000	1.11
@@ -1 +1 @@
-747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip
+d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip



From fedora-extras-commits at redhat.com  Tue Oct 31 14:08:20 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 07:08:20 -0700
Subject: rpms/abcMIDI/FC-6 .cvsignore, 1.10, 1.11 abcMIDI.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <200610311408.k9VE8KqO025653@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25594/FC-6

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061027


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Oct 2006 21:25:56 -0000	1.10
+++ .cvsignore	31 Oct 2006 14:07:50 -0000	1.11
@@ -1 +1 @@
-abcMIDI-2006-10-15.zip
+abcMIDI-2006-10-27.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/abcMIDI.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- abcMIDI.spec	18 Oct 2006 20:58:58 -0000	1.12
+++ abcMIDI.spec	31 Oct 2006 14:07:50 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061015
-Release:        2%{?dist}
+Version:        20061027
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061027-1
+- new version 20061027
+
 * Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
 - new version 20061015
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Oct 2006 21:25:56 -0000	1.10
+++ sources	31 Oct 2006 14:07:50 -0000	1.11
@@ -1 +1 @@
-747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip
+d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip



From fedora-extras-commits at redhat.com  Tue Oct 31 14:08:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 07:08:21 -0700
Subject: rpms/abcMIDI/devel .cvsignore, 1.10, 1.11 abcMIDI.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <200610311408.k9VE8LYI025658@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25594/devel

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061027


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Oct 2006 21:25:56 -0000	1.10
+++ .cvsignore	31 Oct 2006 14:07:51 -0000	1.11
@@ -1 +1 @@
-abcMIDI-2006-10-15.zip
+abcMIDI-2006-10-27.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- abcMIDI.spec	18 Oct 2006 20:58:58 -0000	1.12
+++ abcMIDI.spec	31 Oct 2006 14:07:51 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061015
-Release:        2%{?dist}
+Version:        20061027
+Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-15.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061027-1
+- new version 20061027
+
 * Mon Oct 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 20061015-1
 - new version 20061015
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Oct 2006 21:25:56 -0000	1.10
+++ sources	31 Oct 2006 14:07:51 -0000	1.11
@@ -1 +1 @@
-747a19f8b7320d90683142eea1b8f6a3  abcMIDI-2006-10-15.zip
+d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip



From fedora-extras-commits at redhat.com  Tue Oct 31 14:33:39 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 31 Oct 2006 07:33:39 -0700
Subject: rpms/yum-utils/FC-6 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 yum-utils.spec, 1.13, 1.14
Message-ID: <200610311433.k9VEXdAs026686@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26662

Modified Files:
	.cvsignore sources yum-utils.spec 
Log Message:

1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 03:32:28 -0000	1.6
+++ .cvsignore	31 Oct 2006 14:33:08 -0000	1.7
@@ -1 +1,2 @@
 yum-utils-1.0.tar.gz
+yum-utils-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 03:32:28 -0000	1.6
+++ sources	31 Oct 2006 14:33:08 -0000	1.7
@@ -1 +1,2 @@
 e9af7d38f47e5d2cd945790061fa5f8b  yum-utils-1.0.tar.gz
+53ba387a337b605c5490eac8229da32d  yum-utils-1.0.1.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/FC-6/yum-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yum-utils.spec	5 Oct 2006 11:47:29 -0000	1.13
+++ yum-utils.spec	31 Oct 2006 14:33:08 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.0
-Release: 2%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
@@ -120,6 +120,16 @@
 This plugin adds a --ignore-broken to yum to make it possible to
 check packages for dependency problems and skip the one with problems.
 
+%package -n yum-priorities
+Summary: plugin to give priorities to packages from different repos 
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-priorities
+This plugin allows repositories to have different priorities. 
+Packages in a repository with a lower priority can't be overridden by packages
+from a repository with a higher priority even if repo has a later version.
+
 %prep
 %setup -q
 
@@ -129,7 +139,7 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities"
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -223,7 +233,19 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf
 /usr/lib/yum-plugins/skip-broken.*
 
+%files -n yum-priorities
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf
+/usr/lib/yum-plugins/priorities.*
+
+
 %changelog
+* Tue Oct 31 2006 Tim Lauridsen <tla at rasmil.dk>
+- mark it as 1.0.1
+
+* Fri Oct 27 2006 Tim Lauridsen <tla at rasmil.dk>
+- Added priorities plugin written by Daniel de Kok <danieldk at pobox.com> 
+
 * Wed Oct  4 2006 Seth Vidal <skvidal at linux.duke.edu>
 - mark it as 1.0
 - change requires for the packages to yum 3.0



From fedora-extras-commits at redhat.com  Tue Oct 31 14:39:47 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 31 Oct 2006 07:39:47 -0700
Subject: rpms/yum-utils/devel sources,1.6,1.7 yum-utils.spec,1.13,1.14
Message-ID: <200610311439.k9VEdlrA026783@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26765

Modified Files:
	sources yum-utils.spec 
Log Message:

update devel branch



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 03:32:28 -0000	1.6
+++ sources	31 Oct 2006 14:39:17 -0000	1.7
@@ -1 +1,2 @@
 e9af7d38f47e5d2cd945790061fa5f8b  yum-utils-1.0.tar.gz
+53ba387a337b605c5490eac8229da32d  yum-utils-1.0.1.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yum-utils.spec	5 Oct 2006 11:47:29 -0000	1.13
+++ yum-utils.spec	31 Oct 2006 14:39:17 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.0
-Release: 2%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
@@ -120,6 +120,16 @@
 This plugin adds a --ignore-broken to yum to make it possible to
 check packages for dependency problems and skip the one with problems.
 
+%package -n yum-priorities
+Summary: plugin to give priorities to packages from different repos 
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-priorities
+This plugin allows repositories to have different priorities. 
+Packages in a repository with a lower priority can't be overridden by packages
+from a repository with a higher priority even if repo has a later version.
+
 %prep
 %setup -q
 
@@ -129,7 +139,7 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities"
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -223,7 +233,19 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf
 /usr/lib/yum-plugins/skip-broken.*
 
+%files -n yum-priorities
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf
+/usr/lib/yum-plugins/priorities.*
+
+
 %changelog
+* Tue Oct 31 2006 Tim Lauridsen <tla at rasmil.dk>
+- mark it as 1.0.1
+
+* Fri Oct 27 2006 Tim Lauridsen <tla at rasmil.dk>
+- Added priorities plugin written by Daniel de Kok <danieldk at pobox.com> 
+
 * Wed Oct  4 2006 Seth Vidal <skvidal at linux.duke.edu>
 - mark it as 1.0
 - change requires for the packages to yum 3.0



From fedora-extras-commits at redhat.com  Tue Oct 31 14:46:56 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 31 Oct 2006 07:46:56 -0700
Subject: fedora-security/audit fc5,1.375,1.376 fc6,1.128,1.129
Message-ID: <200610311446.k9VEkucP026876@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26856/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-4572



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- fc5	30 Oct 2006 08:50:50 -0000	1.375
+++ fc5	31 Oct 2006 14:46:54 -0000	1.376
@@ -49,6 +49,7 @@
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
 CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4573 VULNERABLE (screen) #212057
+CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7) [since FEDORA-2006-976]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- fc6	30 Oct 2006 08:50:50 -0000	1.128
+++ fc6	31 Oct 2006 14:46:54 -0000	1.129
@@ -49,6 +49,7 @@
 CVE-2006-4600 version (openldap, fixed 2.3.25)
 CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-4573 VULNERABLE (screen) #212057
+CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7)
 CVE-2006-4570 version (thunderbird, fixed 1.5.0.7)



From fedora-extras-commits at redhat.com  Tue Oct 31 14:57:46 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 31 Oct 2006 07:57:46 -0700
Subject: rpms/international-time/FC-6 international-time.spec,1.5,1.6
Message-ID: <200610311457.k9VEvkGg026939@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26923

Modified Files:
	international-time.spec 
Log Message:
* Tue Oct 31 2006 Tim Waugh <twaugh at redhat.com>
- Require desktop-file-utils, for scriptlets.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-6/international-time.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- international-time.spec	27 Oct 2006 09:34:30 -0000	1.5
+++ international-time.spec	31 Oct 2006 14:57:16 -0000	1.6
@@ -10,6 +10,7 @@
 BuildArch: 	noarch
 
 BuildRequires: 	desktop-file-utils >= 0.2.92
+Requires: 	desktop-file-utils >= 0.2.92
 Requires: 	pygtk2-libglade
 
 %description
@@ -66,6 +67,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Oct 31 2006 Tim Waugh <twaugh at redhat.com>
+- Require desktop-file-utils, for scriptlets.
+
 * Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.2
 - Better categories for the desktop file.
 



From fedora-extras-commits at redhat.com  Tue Oct 31 14:58:51 2006
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 31 Oct 2006 07:58:51 -0700
Subject: rpms/international-time/FC-5 international-time.spec,1.3,1.4
Message-ID: <200610311458.k9VEwpEI026961@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/extras/rpms/international-time/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26945

Modified Files:
	international-time.spec 
Log Message:
* Tue Oct 31 2006 Tim Waugh <twaugh at redhat.com>
- Require desktop-file-utils, for scriptlets.



Index: international-time.spec
===================================================================
RCS file: /cvs/extras/rpms/international-time/FC-5/international-time.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- international-time.spec	31 Oct 2006 13:51:59 -0000	1.3
+++ international-time.spec	31 Oct 2006 14:58:20 -0000	1.4
@@ -10,6 +10,7 @@
 BuildArch: 	noarch
 
 BuildRequires: 	desktop-file-utils >= 0.2.92
+Requires: 	desktop-file-utils >= 0.2.92
 Requires: 	pygtk2-libglade
 
 %description
@@ -64,6 +65,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Oct 31 2006 Tim Waugh <twaugh at redhat.com>
+- Require desktop-file-utils, for scriptlets.
+
 * Wed Oct 25 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-2.1.1
 - Update desktop database on installation.
 



From fedora-extras-commits at redhat.com  Tue Oct 31 15:00:51 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 31 Oct 2006 08:00:51 -0700
Subject: rpms/camE/devel camE.spec,1.12,1.13
Message-ID: <200610311500.k9VF0p6k026997@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/camE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26981

Modified Files:
	camE.spec 
Log Message:
Rebuild against new libcurl.



Index: camE.spec
===================================================================
RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- camE.spec	30 Aug 2006 09:17:59 -0000	1.12
+++ camE.spec	31 Oct 2006 15:00:21 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Rewrite of the xawtv webcam app, which adds imlib2 support
 Name: camE
 Version: 1.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://linuxbrit.co.uk/camE/
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Matthias Saou <http://freshrpms.net/> 1.9-8
+- Rebuild against new libcurl.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.9-7
 - FC6 rebuild.
 - Remove imlib2-devel build requirement, as giblib-devel requires it.



From fedora-extras-commits at redhat.com  Tue Oct 31 15:05:44 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 31 Oct 2006 08:05:44 -0700
Subject: rpms/xmlrpc-c/FC-6 xmlrpc-c.spec, 1.10, 1.11 sources, 1.5,
	1.6 0001-make-cmake-transition.txt, 1.1, 1.2
Message-ID: <200610311505.k9VF5iSk029998@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29978

Modified Files:
	xmlrpc-c.spec sources 0001-make-cmake-transition.txt 
Log Message:
updated to 1.06.06



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/xmlrpc-c.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmlrpc-c.spec	2 Oct 2006 15:02:03 -0000	1.10
+++ xmlrpc-c.spec	31 Oct 2006 15:05:14 -0000	1.11
@@ -4,8 +4,8 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.05
-Release:	%release_func 2
+Version:	1.06.06
+Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.06-1
+- updated to 1.06.06
+
 * Mon Oct  2 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-2
 - updated cmake patch
 - strip installed libraries


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2006 16:48:17 -0000	1.5
+++ sources	31 Oct 2006 15:05:14 -0000	1.6
@@ -1 +1 @@
-69f3644da7b8e9d13482c82838a4005a  xmlrpc-c-1.06.05.tgz
+ed508e56d11cb56188cf44a87d410f6c  xmlrpc-c-1.06.06.tgz


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/0001-make-cmake-transition.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-make-cmake-transition.txt	2 Oct 2006 15:02:03 -0000	1.1
+++ 0001-make-cmake-transition.txt	31 Oct 2006 15:05:14 -0000	1.2
@@ -68,7 +68,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.05" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.06" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.4")
 +set(XMLRPC_C_SOVERSION  "3")
 +



From fedora-extras-commits at redhat.com  Tue Oct 31 15:08:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Oct 2006 08:08:59 -0700
Subject: rpms/libtunepimp/devel libtunepimp.spec,1.22,1.23
Message-ID: <200610311508.k9VF8xPB030101@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30047

Modified Files:
	libtunepimp.spec 
Log Message:
* Tue Oct 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-4
- respin for curl update (fc7)



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libtunepimp.spec	12 Oct 2006 21:05:45 -0000	1.22
+++ libtunepimp.spec	31 Oct 2006 15:08:29 -0000	1.23
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -22,7 +22,6 @@
 BuildRequires: libmpcdec-devel
 
 BuildRequires: libofa-devel
-# These two are likely bogus (used just in examples/ ) -- Rex
 BuildRequires: curl-devel
 BuildRequires: expat-devel
 
@@ -134,6 +133,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-4
+- respin for curl update (fc7)
+
 * Thu Oct 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.2-3
 - rename python-libtunepimp -> python-tunepimp (to match python
   module name)



From fedora-extras-commits at redhat.com  Tue Oct 31 15:11:56 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 31 Oct 2006 08:11:56 -0700
Subject: rpms/moin/devel .cvsignore, 1.7, 1.8 moin.spec, 1.10, 1.11 sources, 
	1.7, 1.8
Message-ID: <200610311511.k9VFBuAF030187@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/moin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30167

Modified Files:
	.cvsignore moin.spec sources 
Log Message:
Update to 1.5.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Sep 2006 10:56:50 -0000	1.7
+++ .cvsignore	31 Oct 2006 15:11:26 -0000	1.8
@@ -1 +1 @@
-moin-1.5.5.tar.gz
+moin-1.5.6.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- moin.spec	18 Sep 2006 10:56:50 -0000	1.10
+++ moin.spec	31 Oct 2006 15:11:26 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
-Version: 1.5.5
+Version: 1.5.6
 Release: 1%{?dist}
 License: GPL
 Group:   Applications/Internet
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Matthias Saou <http://freshrpms.net/> 1.5.6-1
+- Update to 1.5.6.
+
 * Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 1.5.5-1
 - Update to 1.5.5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Sep 2006 10:56:50 -0000	1.7
+++ sources	31 Oct 2006 15:11:26 -0000	1.8
@@ -1 +1 @@
-68308ef881057cd5d8f27504302ec7cc  moin-1.5.5.tar.gz
+b87046e39a13f749163a39e8ffa0e0f4  moin-1.5.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 15:48:11 2006
From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell))
Date: Tue, 31 Oct 2006 08:48:11 -0700
Subject: rpms/jigdo/devel jigdo.spec,1.4,1.5
Message-ID: <200610311548.k9VFmB4u030631@cvs-int.fedora.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/jigdo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30604

Modified Files:
	jigdo.spec 
Log Message:
Rebuild for curl update


Index: jigdo.spec
===================================================================
RCS file: /cvs/extras/rpms/jigdo/devel/jigdo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jigdo.spec	11 Sep 2006 19:47:52 -0000	1.4
+++ jigdo.spec	31 Oct 2006 15:47:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		jigdo
 Version:	0.7.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Ease distribution of large files over the Internet
 
 Group:		Applications/Internet
@@ -65,6 +65,12 @@
 %attr(0644,root,root) %{_mandir}/man[^3]/*
 
 %changelog
+* Tue Oct 31 2006 Ian Burrell <ianburrell at gmail.com> - 0.7.3-3
+- Rebuild for curl update
+
+* Mon Sep 11 2006 Ian Burrell <ianburrell at gmail.com> - 0.7.3-2
+- Rebuild for FC6
+
 * Sun Jun 25 2006 Ian Burrell <ianburrell at gmail> - 0.7.3-1
 - Update to 0.7.3
 - Remove obsolete patches



From fedora-extras-commits at redhat.com  Tue Oct 31 16:07:13 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 31 Oct 2006 09:07:13 -0700
Subject: rpms/xmlrpc-c/FC-5 0001-make-cmake-transition.txt, 1.1, 1.2 sources,
	1.4, 1.5 xmlrpc-c.spec, 1.4, 1.5
Message-ID: <200610311607.k9VG7DT5001428@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1360/FC-5

Modified Files:
	0001-make-cmake-transition.txt sources xmlrpc-c.spec 
Log Message:
updated to 1.06.06


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/0001-make-cmake-transition.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-make-cmake-transition.txt	2 Oct 2006 15:10:48 -0000	1.1
+++ 0001-make-cmake-transition.txt	31 Oct 2006 16:06:42 -0000	1.2
@@ -68,7 +68,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.05" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.06" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.4")
 +set(XMLRPC_C_SOVERSION  "3")
 +


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Oct 2006 15:10:48 -0000	1.4
+++ sources	31 Oct 2006 16:06:43 -0000	1.5
@@ -1 +1 @@
-69f3644da7b8e9d13482c82838a4005a  xmlrpc-c-1.06.05.tgz
+ed508e56d11cb56188cf44a87d410f6c  xmlrpc-c-1.06.06.tgz


Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-5/xmlrpc-c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmlrpc-c.spec	2 Oct 2006 15:10:48 -0000	1.4
+++ xmlrpc-c.spec	31 Oct 2006 16:06:43 -0000	1.5
@@ -4,8 +4,8 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.05
-Release:	%release_func 2
+Version:	1.06.06
+Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.06-1
+- updated to 1.06.06
+
 * Mon Oct  2 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.05-2
 - updated cmake patch
 - strip installed libraries



From fedora-extras-commits at redhat.com  Tue Oct 31 16:13:10 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 31 Oct 2006 09:13:10 -0700
Subject: fedora-security/audit fc5,1.376,1.377 fc6,1.129,1.130
Message-ID: <200610311613.k9VGDABV001484@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1461

Modified Files:
	fc5 fc6 
Log Message:
Note a new libX11 issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- fc5	31 Oct 2006 14:46:54 -0000	1.376
+++ fc5	31 Oct 2006 16:13:07 -0000	1.377
@@ -12,6 +12,7 @@
 CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
+CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- fc6	31 Oct 2006 14:46:54 -0000	1.129
+++ fc6	31 Oct 2006 16:13:07 -0000	1.130
@@ -12,6 +12,7 @@
 CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
+CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]



From fedora-extras-commits at redhat.com  Tue Oct 31 16:15:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 09:15:39 -0700
Subject: rpms/q/devel .cvsignore,1.3,1.4 q.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610311615.k9VGFdvf001541@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/q/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1513

Modified Files:
	.cvsignore q.spec sources 
Log Message:
new version 7.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/q/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Aug 2006 11:46:23 -0000	1.3
+++ .cvsignore	31 Oct 2006 16:15:09 -0000	1.4
@@ -1 +1 @@
-q-7.4.tar.gz
+q-7.5.tar.gz


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/devel/q.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- q.spec	30 Aug 2006 11:46:23 -0000	1.4
+++ q.spec	31 Oct 2006 16:15:09 -0000	1.5
@@ -1,11 +1,11 @@
 Name: 		q
-Version: 	7.4
+Version: 	7.5
 Release: 	1%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPL
-Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.4.tar.gz
+Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
+- new version 7.5
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.4-1
 - new version 7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/q/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Aug 2006 11:46:23 -0000	1.3
+++ sources	31 Oct 2006 16:15:09 -0000	1.4
@@ -1 +1 @@
-0b6ddd02028aee60f5ee1cd1f8cc008a  q-7.4.tar.gz
+d556ee55016ff9f3ce328bb7962157fe  q-7.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 16:29:57 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 31 Oct 2006 09:29:57 -0700
Subject: rpms/manaworld/devel manaworld.spec,1.4,1.5
Message-ID: <200610311629.k9VGTvco001789@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1737

Modified Files:
	manaworld.spec 
Log Message:
Rebuild for curl .so name change




Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/manaworld.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- manaworld.spec	15 Oct 2006 03:22:08 -0000	1.4
+++ manaworld.spec	31 Oct 2006 16:29:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           manaworld
 Version:        0.0.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        2D MMORPG world
 
 Group:          Amusements/Games
@@ -69,7 +69,10 @@
 
 
 %changelog
-* Sat Oct 14 2006 Wart <wart at kobold.org> 0.0.21
+* Tue Oct 31 2006 Wart <wart at kobold.org> 0.0.21-2
+- Rebuild for curl .so name change
+
+* Sat Oct 14 2006 Wart <wart at kobold.org> 0.0.21-1
 - Update to 0.0.21
 
 * Fri Sep 1 2006 Wart <wart at kobold.org> 0.0.20-2



From fedora-extras-commits at redhat.com  Tue Oct 31 16:30:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Oct 2006 09:30:02 -0700
Subject: rpms/gkrellm/devel .cvsignore, 1.2, 1.3 gkrellm.spec, 1.4,
	1.5 sources, 1.2, 1.3 gkrellm-2.2.9-hwmon.patch, 1.1,
	NONE gkrellm-2.2.9-libsensors.patch, 1.1, NONE
Message-ID: <200610311630.k9VGU2X1001796@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1760

Modified Files:
	.cvsignore gkrellm.spec sources 
Removed Files:
	gkrellm-2.2.9-hwmon.patch gkrellm-2.2.9-libsensors.patch 
Log Message:
* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-1
- New upstream release 2.2.10
- Drop integrated lmsensors and sysfs sensors patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jul 2006 18:35:32 -0000	1.2
+++ .cvsignore	31 Oct 2006 16:29:31 -0000	1.3
@@ -1 +1 @@
-gkrellm-2.2.9.tar.bz2
+gkrellm-2.2.10.tar.bz2


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm.spec	4 Oct 2006 22:26:33 -0000	1.4
+++ gkrellm.spec	31 Oct 2006 16:29:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gkrellm
-Version:        2.2.9
-Release:        10%{?dist}
+Version:        2.2.10
+Release:        1%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPL
@@ -14,9 +14,7 @@
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-Patch5:         gkrellm-2.2.9-hwmon.patch
-Patch6:         gkrellm-2.2.9-libsensors.patch
-Patch7:         gkrellm-2.2.9-gkrellmd.conf.patch
+Patch5:         gkrellm-2.2.9-gkrellmd.conf.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 %ifarch %{ix86} x86_64
 BuildRequires:  lm_sensors-devel
@@ -63,14 +61,12 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1 -z .libdir
+%patch1 -p1 -z .config
+%patch2 -p1 -z .sansfont
+%patch3 -p1 -z .width
+%patch4 -p1 -z .libdir2
+%patch5 -p1 -z .conf-patch
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -184,6 +180,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-1
+- New upstream release 2.2.10
+- Drop integrated lmsensors and sysfs sensors patches
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.9-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jul 2006 18:35:32 -0000	1.2
+++ sources	31 Oct 2006 16:29:31 -0000	1.3
@@ -1 +1 @@
-5334155797901724f4eb46a82ad72395  gkrellm-2.2.9.tar.bz2
+57ef0525c0997ac2e7720712811f5a84  gkrellm-2.2.10.tar.bz2


--- gkrellm-2.2.9-hwmon.patch DELETED ---


--- gkrellm-2.2.9-libsensors.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 16:46:28 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 09:46:28 -0700
Subject: extras-buildsys/server PackageJob.py,1.54,1.55
Message-ID: <200610311646.k9VGkSbR001994@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1960/server

Modified Files:
	PackageJob.py 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	Patches by Joe Todaro <jstodaro at us.ibm.com>
	* server/PackageJob.py
		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,
			where the archjob key is filled in, but the archjob itself hasn't
			been created yet because it's not yet building




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- PackageJob.py	22 Jul 2006 15:07:12 -0000	1.54
+++ PackageJob.py	31 Oct 2006 16:46:21 -0000	1.55
@@ -707,7 +707,10 @@
     def _kill_all_archjobs(self, user_requested=False):
         self._archjobs_lock.acquire()
         for job in self._archjobs.values():
-            job.die(user_requested)
+            # During depsolve, self._archjobs will be populated with keys,
+            # but the values will be None since the archjobs aren't building yet.
+            if job != None:
+                job.die(user_requested)
         self._archjobs_lock.release()
 
     def wake(self):



From fedora-extras-commits at redhat.com  Tue Oct 31 16:46:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 09:46:23 -0700
Subject: extras-buildsys ChangeLog,1.211,1.212
Message-ID: <200610311646.k9VGkrNA001997@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1960

Modified Files:
	ChangeLog 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	Patches by Joe Todaro <jstodaro at us.ibm.com>
	* server/PackageJob.py
		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,
			where the archjob key is filled in, but the archjob itself hasn't
			been created yet because it's not yet building




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- ChangeLog	25 Oct 2006 17:34:30 -0000	1.211
+++ ChangeLog	31 Oct 2006 16:46:20 -0000	1.212
@@ -1,3 +1,11 @@
+2006-10-31  Dan Williams  <dcbw at redhat.com>
+
+	Patches by Joe Todaro <jstodaro at us.ibm.com>
+	* server/PackageJob.py
+		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,
+			where the archjob key is filled in, but the archjob itself hasn't
+			been created yet because it's not yet building
+
 2006-10-25  Dan Williams  <dcbw at redhat.com>
 
 	* www/template/main.psp



From fedora-extras-commits at redhat.com  Tue Oct 31 16:50:42 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 31 Oct 2006 09:50:42 -0700
Subject: rpms/camE/devel camE-1.9-curlopt.patch, NONE, 1.1 camE.spec, 1.13,
	1.14
Message-ID: <200610311650.k9VGogog002032@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/camE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2012

Modified Files:
	camE.spec 
Added Files:
	camE-1.9-curlopt.patch 
Log Message:
Add patch to remove obsolete CURLOPT_MUTE option.


camE-1.9-curlopt.patch:

--- NEW FILE camE-1.9-curlopt.patch ---
diff -Naupr camE-1.9.orig/webcam.c camE-1.9/webcam.c
--- camE-1.9.orig/webcam.c	2004-06-26 01:51:29.000000000 +0200
+++ camE-1.9/webcam.c	2006-10-31 17:44:10.000000000 +0100
@@ -987,8 +987,6 @@ ftp_upload(char *local,
     /* shut up completely */
     if (ftp_debug)
       curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1);
-    else
-      curl_easy_setopt(curl_handle, CURLOPT_MUTE, 1);
 
     curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1);
 


Index: camE.spec
===================================================================
RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- camE.spec	31 Oct 2006 15:00:21 -0000	1.13
+++ camE.spec	31 Oct 2006 16:50:12 -0000	1.14
@@ -7,6 +7,7 @@
 URL: http://linuxbrit.co.uk/camE/
 Source: http://linuxbrit.co.uk/downloads/camE-%{version}.tar.gz
 Patch0: camE-1.9-cflags.patch
+Patch1: camE-1.9-curlopt.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: giblib-devel, curl-devel, zlib-devel
 
@@ -17,7 +18,8 @@
 
 %prep
 %setup
-%patch -p1 -b .cflags
+%patch0 -p1 -b .cflags
+%patch1 -p1 -b .curlopt
 
 
 %build
@@ -43,6 +45,7 @@
 %changelog
 * Tue Oct 31 2006 Matthias Saou <http://freshrpms.net/> 1.9-8
 - Rebuild against new libcurl.
+- Add patch to remove obsolete CURLOPT_MUTE option.
 
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.9-7
 - FC6 rebuild.



From fedora-extras-commits at redhat.com  Tue Oct 31 17:00:50 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 10:00:50 -0700
Subject: rpms/libdap/devel libdap.spec,1.8,1.9
Message-ID: <200610311700.k9VH0o0e002246@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libdap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225

Modified Files:
	libdap.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-3
- rebuild for new libcurl soname



Index: libdap.spec
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libdap.spec	4 Oct 2006 22:47:27 -0000	1.8
+++ libdap.spec	31 Oct 2006 17:00:19 -0000	1.9
@@ -1,10 +1,8 @@
-
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
 Version: 3.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
-#Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz
 URL: http://www.opendap.org/
 
@@ -35,7 +33,9 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
-#
+# for the /usr/share/aclocal directory ownership
+Requires: automake
+
 %description devel
 This package contains all the files needed to develop applications that
 will use libdap.
@@ -44,7 +44,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -82,6 +82,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.2-3
+- rebuild for new libcurl soname
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.2-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 31 17:11:44 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 10:11:44 -0700
Subject: rpms/libnc-dap/devel libnc-dap.spec,1.11,1.12
Message-ID: <200610311711.k9VHBi1b005372@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnc-dap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5356

Modified Files:
	libnc-dap.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-5
- licence is LGPL since it cause the BSD code to be distributed as LGPL too



Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libnc-dap.spec	4 Oct 2006 22:45:20 -0000	1.11
+++ libnc-dap.spec	31 Oct 2006 17:11:14 -0000	1.12
@@ -1,14 +1,15 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
 Version: 3.6.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
 URL: http://www.opendap.org/
 
 Group: Development/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: LGPL/BSD
+# dncdump and netcdf headers are coverd by a BSD-like license
+License: LGPL
 BuildRequires: libdap-devel >= 3.7.0
 
 %description
@@ -18,14 +19,16 @@
 machines. Data served using DAP2 need not be stored in netcdf files 
 to be read using this replacement library.
 Also included in this package is the ncdump utility, also bundled with the
-original netcdf library, relinked with the library and thus able to read
-from DAP2 compatible servers.
+original netcdf library, renamed dncdump, relinked with the library and 
+thus able to read from DAP2 compatible servers.
 
 %package devel
 Summary: Static libraries and header files from libnc-dap
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libdap-devel >= 3.7.0
+# for /usr/share/aclocal owning
+Requires: automake
 
 %description devel
 This package contains all the files needed to develop applications that
@@ -35,7 +38,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -67,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-5
+- licence is LGPL since it cause the BSD code to be distributed as LGPL too
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.6.2-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 31 17:23:40 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 10:23:40 -0700
Subject: rpms/dap-server/devel dap-server.spec,1.19,1.20
Message-ID: <200610311723.k9VHNebp005608@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5592

Modified Files:
	dap-server.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.1-4
- rebuild for new libcurl soname (indirect dependency through libdap)



Index: dap-server.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dap-server.spec	4 Oct 2006 22:16:07 -0000	1.19
+++ dap-server.spec	31 Oct 2006 17:23:10 -0000	1.20
@@ -8,7 +8,7 @@
 Summary:         Basic request handling for OPeNDAP servers 
 Name:            dap-server
 Version:         3.7.1
-Release:         3%{?dist}
+Release:         4%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz
@@ -59,7 +59,7 @@
 %patch0
 
 %build
-%configure --with-cgidir=%{dap_cgidir} 
+%configure --with-cgidir=%{dap_cgidir} --disable-dependency-tracking
 #--with-cgiconfdir=%{dap_cgiconfdir}
 make %{?_smp_mflags}
 
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.1-4
+- rebuild for new libcurl soname (indirect dependency through libdap)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.1-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Tue Oct 31 17:31:42 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 31 Oct 2006 10:31:42 -0700
Subject: rpms/blender/devel blender.spec,1.32,1.33
Message-ID: <200610311731.k9VHVggh005704@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5680

Modified Files:
	blender.spec 
Log Message:
Fix broken deps


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- blender.spec	16 Oct 2006 20:49:20 -0000	1.32
+++ blender.spec	31 Oct 2006 17:31:11 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -160,6 +160,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Tue Oct 31 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-5
+- Rebuilt to fix broken deps
+
 * Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-4
 - /usr/lib/blender should own by the package
 



From fedora-extras-commits at redhat.com  Tue Oct 31 17:37:20 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 10:37:20 -0700
Subject: rpms/dap-netcdf_handler/devel dap-netcdf_handler.spec,1.8,1.9
Message-ID: <200610311737.k9VHbKXd005828@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-netcdf_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778

Modified Files:
	dap-netcdf_handler.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.3-3
- rebuild for new libcurl soname (indirect dependency through libdap)



Index: dap-netcdf_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/dap-netcdf_handler.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dap-netcdf_handler.spec	4 Oct 2006 22:46:37 -0000	1.8
+++ dap-netcdf_handler.spec	31 Oct 2006 17:36:50 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:         NetCDF 3 data handler for the OPeNDAP Data server
 Name:            dap-netcdf_handler
 Version:         3.7.3
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz
@@ -9,9 +9,6 @@
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   libdap-devel >= 3.7.0 netcdf-devel
-# Don't require dap-server as dap_nc_handler works without dap-server,
-# however dap_nc_handler should be of use only with dap-server in most cases.
-#Requires:        dap-server
 
 %description
 This is the netcdf data handler for our data server. It reads netcdf 3
@@ -22,7 +19,7 @@
 %setup -q -n netcdf_handler-%{version}
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -46,8 +43,11 @@
 %doc README
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.7.3-3
+- rebuild for new libcurl soname (indirect dependency through libdap)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.7.3-2
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.7.3-1
 - update to 3.7.3



From fedora-extras-commits at redhat.com  Tue Oct 31 17:39:54 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:39:54 -0700
Subject: rpms/python-zope-interface - New directory
Message-ID: <200610311739.k9VHdsW1005919@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915/python-zope-interface

Log Message:
Directory /cvs/extras/rpms/python-zope-interface added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 31 17:39:59 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:39:59 -0700
Subject: rpms/python-zope-interface/devel - New directory
Message-ID: <200610311739.k9VHdx52005933@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915/python-zope-interface/devel

Log Message:
Directory /cvs/extras/rpms/python-zope-interface/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Oct 31 17:40:22 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:40:22 -0700
Subject: rpms/python-zope-interface Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200610311740.k9VHeMw1005964@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5958

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-zope-interface


--- NEW FILE Makefile ---
# Top level Makefile for module python-zope-interface
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Oct 31 17:40:27 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:40:27 -0700
Subject: rpms/python-zope-interface/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200610311740.k9VHeR73005981@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5958/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-zope-interface


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Oct 31 17:41:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:41:56 -0700
Subject: rpms/python-zope-interface import.log,1.1,1.2
Message-ID: <200610311741.k9VHfuE6006096@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6056

Modified Files:
	import.log 
Log Message:
auto-import python-zope-interface-3.0.1-6 on branch devel from python-zope-interface-3.0.1-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-zope-interface/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Oct 2006 17:40:21 -0000	1.1
+++ import.log	31 Oct 2006 17:41:26 -0000	1.2
@@ -0,0 +1 @@
+python-zope-interface-3_0_1-6:HEAD:python-zope-interface-3.0.1-6.src.rpm:1162316476



From fedora-extras-commits at redhat.com  Tue Oct 31 17:41:57 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 10:41:57 -0700
Subject: rpms/python-zope-interface/devel ZPL-2.1.txt, NONE,
	1.1 ZopeInterface-3.0.1-declbug.patch, NONE,
	1.1 python-zope-interface.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200610311741.k9VHfvSF006100@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/python-zope-interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6056/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ZPL-2.1.txt ZopeInterface-3.0.1-declbug.patch 
	python-zope-interface.spec 
Log Message:
auto-import python-zope-interface-3.0.1-6 on branch devel from python-zope-interface-3.0.1-6.src.rpm


--- NEW FILE ZPL-2.1.txt ---
Zope Public License (ZPL) Version 2.1

A copyright notice accompanies this license document that identifies the
copyright holders.

This license has been certified as open source. It has also been designated
as GPL compatible by the Free Software Foundation (FSF).

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

   1. Redistributions in source code must retain the accompanying copyright
      notice, this list of conditions, and the following disclaimer.
   2. Redistributions in binary form must reproduce the accompanying copyright
      notice, this list of conditions, and the following disclaimer in the
      documentation and/or other materials provided with the distribution.
   3. Names of the copyright holders must not be used to endorse or promote
      products derived from this software without prior written permission from
      the copyright holders.
   4. The right to distribute this software or to use it for any purpose does
      not give you the right to use Servicemarks (sm) or Trademarks (tm) of the
      copyright holders. Use of them is covered by separate agreement with the
      copyright holders.
   5. If any files are modified, you must cause the modified files to carry
      prominent notices stating that you changed the files and the date of any
      change.

Disclaimer

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL THE COPYRIGHT HOLDERS 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.


ZopeInterface-3.0.1-declbug.patch:

--- NEW FILE ZopeInterface-3.0.1-declbug.patch ---
diff -urN ZopeInterface-3.0.1/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c ZopeInterface-3.0.1-declbug/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c
--- ZopeInterface-3.0.1/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c	2004-08-04 18:03:17.000000000 +0800
+++ ZopeInterface-3.0.1-declbug/Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c	2005-08-23 08:05:27.376784740 +0800
@@ -70,7 +70,7 @@
   return 0;
 }
 
-extern PyTypeObject SpecType;   /* Forward */
+static PyTypeObject SpecType;   /* Forward */
 
 static PyObject *
 implementedByFallback(PyObject *cls)


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

Name:		python-zope-interface
Version:	3.0.1
Release:	6%{?dist}
Summary:	Zope interfaces package
Group:		Development/Libraries
License:	Zope Public License
URL:		http://zope.org/Products/ZopeInterface
Source0:	http://zope.org/Products/ZopeInterface/3.0.1final/ZopeInterface-%{version}.tgz
Source1:	ZPL-2.1.txt
Patch0:		ZopeInterface-3.0.1-declbug.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	python-devel

%description
This is a separate distribution of the zope.interface package used in Zope 3.

It includes a patch to fix compilation on gcc 4.x, as described here:
http://www.zope.org/Collectors/Zope3-dev/366/

%prep
%setup -n ZopeInterface-%{version} -q
%{__cp} -a %{SOURCE1} .
%patch0 -p1

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root  %{buildroot}

%check
cd ./build/lib.* && PYTHONPATH=$(pwd) %{__python} ./zope/testing/tests.py

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

%files
%defattr(-,root,root,-)
%doc README.txt ZPL-2.1.txt
%{python_sitearch}/zope/

%changelog
* Tue Oct 31 2006 Paul Howarth <paul at city-fan.org> 3.0.1-6
- add %%check section

* Wed Sep 20 2006 Paul Howarth <paul at city-fan.org> 3.0.1-5
- dispense with %%{pybasever} macro and python-abi dependency, not needed from
  FC4 onwards
- include ZPL 2.1 license text
- add reference in %%description to origin of patch
- change License: tag from "ZPL 2.1" to "Zope Public License" to shut rpmlint up

* Thu Aug 31 2006 Paul Howarth <paul at city-fan.org> 3.0.1-4
- files list simplified as .pyo files are no longer %%ghost-ed

* Tue May  9 2006 Paul Howarth <paul at city-fan.org> 3.0.1-3
- import from PyVault Repository
- rewrite in Fedora Extras style

* Tue Aug 23 2005 Jeff Pitman <symbiont+pyvault at berlios.de> 3.0.1-2
- add bug fix for gcc 4

* Mon Feb 07 2005 Jeff Pitman <symbiont+pyvault at berlios.de> 3.0.1-1
- new rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-zope-interface/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Oct 2006 17:40:27 -0000	1.1
+++ .cvsignore	31 Oct 2006 17:41:27 -0000	1.2
@@ -0,0 +1 @@
+ZopeInterface-3.0.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-zope-interface/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Oct 2006 17:40:27 -0000	1.1
+++ sources	31 Oct 2006 17:41:27 -0000	1.2
@@ -0,0 +1 @@
+114f302c2b132d43ad4e01d108b4d192  ZopeInterface-3.0.1.tgz



From fedora-extras-commits at redhat.com  Tue Oct 31 17:57:38 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 10:57:38 -0700
Subject: extras-buildsys ChangeLog,1.212,1.213
Message-ID: <200610311757.k9VHvcKV006316@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6285

Modified Files:
	ChangeLog 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	* server/PackageJob.py
		- Fixes for older python versions that don't have yum.Errors.* but
			yum-utils' repomd module instead
		- Fixes for Yum 3.x logging changes




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- ChangeLog	31 Oct 2006 16:46:20 -0000	1.212
+++ ChangeLog	31 Oct 2006 17:57:36 -0000	1.213
@@ -1,5 +1,12 @@
 2006-10-31  Dan Williams  <dcbw at redhat.com>
 
+	* server/PackageJob.py
+		- Fixes for older python versions that don't have yum.Errors.* but
+			yum-utils' repomd module instead
+		- Fixes for Yum 3.x logging changes
+
+2006-10-31  Dan Williams  <dcbw at redhat.com>
+
 	Patches by Joe Todaro <jstodaro at us.ibm.com>
 	* server/PackageJob.py
 		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,



From fedora-extras-commits at redhat.com  Tue Oct 31 17:57:39 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 10:57:39 -0700
Subject: extras-buildsys/server PackageJob.py,1.55,1.56
Message-ID: <200610311757.k9VHvdD5006320@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6285/server

Modified Files:
	PackageJob.py 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	* server/PackageJob.py
		- Fixes for older python versions that don't have yum.Errors.* but
			yum-utils' repomd module instead
		- Fixes for Yum 3.x logging changes




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- PackageJob.py	31 Oct 2006 16:46:21 -0000	1.55
+++ PackageJob.py	31 Oct 2006 17:57:36 -0000	1.56
@@ -32,12 +32,19 @@
 from plague import DebugUtils
 
 import yum
+use_repomd = False
 try:
     import repomd.mdErrors
+    use_repomd = True
 except ImportError:
     pass
-from yum.logger import Logger
 
+use_yum_logger = False
+try:
+    from yum.logger import Logger
+    use_yum_logger = True
+except ImportError:
+    pass
 
 CVS_CMD = "/usr/bin/cvs"
 MAKE_CMD = "/usr/bin/make"
@@ -497,10 +504,17 @@
 
             depsolve_root = os.path.dirname(yum_config) + '/'
             base.doConfigSetup(fn=yum_config, root=depsolve_root)
+
             threshold = 0
             if DEBUG:
                 threshold = 5
-            base.log = Logger(threshold=threshold, file_object=sys.stdout)
+            if use_yum_logger == True:
+                # For yum 2.x and earlier
+                base.log = logger.Logger(threshold=threshold, file_object=sys.stdout)
+            else:
+                # Use python logging module (yum 3.x and later)
+                base.doLoggingSetup(threshold, 1)
+
             try:
                 base.doRepoSetup()
             except yum.Errors.RepoError, exc:
@@ -528,14 +542,18 @@
             for dep in srpm.requiresList():
                 if dep.startswith("rpmlib("):
                     continue
-                try:
-                    pkg = base.returnPackageByDep(dep)
-                except repomd.mdErrors.PackageSackError, exc:
-                    raise DepError(str(exc))
-                except yum.Errors.PackageSackError, exc:
-                    raise DepError(str(exc))
-                except yum.Errors.YumBaseError, exc:
-                    raise DepError(str(exc))
+                if use_repomd:
+                    try:
+                        pkg = base.returnPackageByDep(dep)
+                    except repomd.mdErrors.PackageSackError, exc:
+                        raise DepError(str(exc))
+                else:
+                    try:
+                        pkg = base.returnPackageByDep(dep)
+                    except yum.Errors.PackageSackError, exc:
+                        raise DepError(str(exc))
+                    except yum.Errors.YumBaseError, exc:
+                        raise DepError(str(exc))
         except DepError, exc:
             self._last_depsolve_error = str(exc)
             print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(exc))



From fedora-extras-commits at redhat.com  Tue Oct 31 18:10:51 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 11:10:51 -0700
Subject: extras-buildsys/common ssl-client-test.py, NONE,
	1.1 ssl-server-test.py, NONE, 1.1
Message-ID: <200610311810.k9VIApYL009717@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9665/common

Added Files:
	ssl-client-test.py ssl-server-test.py 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

    * common/ssl-client-test.py
      common/ssl-server-test.py
        - Two utilities to test the functionality of SSLConnection class
        and the SSL server/client classes




--- NEW FILE ssl-client-test.py ---
import threading
import time
import random
import OpenSSL
import socket
import SSLCommon
import SSLConnection
import sys, os
import urllib
import base64
import types


client_start = False

threadlist_lock = threading.Lock()
threadlist = {}
timed_out = 0

class TestClient(threading.Thread):
    def __init__(self, certs, num):
        self._ctx = SSLCommon.CreateSSLContext(certs)
        self._timeout = 20
        self._host = "localhost"
        self._port = 8888
        self.num = i
        threading.Thread.__init__(self)

    def get_host_info(self, host):
        x509 = {}
        if isinstance(host, types.TupleType):
            host, x509 = host

        import urllib
        auth, host = urllib.splituser(host)

        if auth:
            import base64
            auth = base64.encodestring(urllib.unquote(auth))
            auth = string.join(string.split(auth), "") # get rid of whitespace
            extra_headers = [
                ("Authorization", "Basic " + auth)
                ]
        else:
            extra_headers = None

        return host, extra_headers, x509

    def _make_connection(self):
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
        con = OpenSSL.SSL.Connection(self._ctx, sock)
        sock = SSLConnection.SSLConnection(con)
        sock.connect((self._host, self._port))
        return sock

    def run(self):
        request = "ping" * 40

        while not client_start:
            time.sleep(0.05)
        i = 0
        while i < 5:
            reply = None
            try:
                sock = self._make_connection()

                # Send request
                sock.sendall(request)

                # Wait for response
                print "Waiting for response"
                reply = sock.recv(1024)
                sock.close()
            except OpenSSL.SSL.Error, e:
                reply = "OpenSSL Error (%s)" % e
            except socket.error, e:
                reply = "Socket error (%s)" % e
            except socket.timeout, e:
                reply = "Socket timeout (%s)" % e
                threadlist_lock.acquire()
                timed_out = timed_out + 1
                threadlist_lock.release()
            print "TRY(%d / %d): %s" % (self.num, i, reply)
            time.sleep(0.05)
            i = i + 1
        threadlist_lock.acquire()
        del threadlist[self]
        threadlist_lock.release()


if __name__ == '__main__':
    if len(sys.argv) < 4:
        print "Usage: python %s key_and_cert ca_cert peer_ca_cert" % sys.argv[0]
        sys.exit(1)

    certs = {}
    certs['key_and_cert'] = sys.argv[1]
    certs['ca_cert'] = sys.argv[2]
    certs['peer_ca_cert'] = sys.argv[3]

    i = 100
    while i > 0:
        t = TestClient(certs, i)
        threadlist[t] = None
        print "Created thread %d." % i
        t.start()
        i = i - 1

    time.sleep(3)
    print "Unleashing threads."
    client_start = True
    while True:
        try:
            time.sleep(0.25)
            threadlist_lock.acquire()
            if len(threadlist) == 0:
                break
            threadlist_lock.release()
        except KeyboardInterrupt:
            os._exit(0)
    print "All done. (%d timed out)" % timed_out



--- NEW FILE ssl-server-test.py ---
import os, sys
import socket
import time
import SSLCommon
import SocketServer

response = "pong" * 20

class ReqHandler(SocketServer.StreamRequestHandler):
    def handle(self):
        print "Starting handler"
        # Read the request
        string = self.rfile.read(100)
        if len(string) > 0:
            print "request was: '%s' (%d)" % (string, len(string))
        else:
            print "request was zero-length"
        # Write the response
        self.wfile.write(response)

if __name__ == '__main__':
    if len(sys.argv) < 4:
        print "Usage: python %s key_and_cert ca_cert peer_ca_cert" % sys.argv[0]
        sys.exit(1)

    certs = {}
    certs['key_and_cert'] = sys.argv[1]
    certs['ca_cert'] = sys.argv[2]
    certs['peer_ca_cert'] = sys.argv[3]

    print "Starting the server."
    server = SSLCommon.PlgBaseSSLServer(('localhost', 8888), ReqHandler, certs)
    server.serve_forever()




From fedora-extras-commits at redhat.com  Tue Oct 31 18:10:45 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 31 Oct 2006 11:10:45 -0700
Subject: extras-buildsys ChangeLog,1.213,1.214
Message-ID: <200610311811.k9VIBFmS009739@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9665

Modified Files:
	ChangeLog 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

    * common/ssl-client-test.py
      common/ssl-server-test.py
        - Two utilities to test the functionality of SSLConnection class
        and the SSL server/client classes




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- ChangeLog	31 Oct 2006 17:57:36 -0000	1.213
+++ ChangeLog	31 Oct 2006 18:10:42 -0000	1.214
@@ -1,5 +1,12 @@
 2006-10-31  Dan Williams  <dcbw at redhat.com>
 
+    * common/ssl-client-test.py
+      common/ssl-server-test.py
+        - Two utilities to test the functionality of SSLConnection class
+        and the SSL server/client classes
+
+2006-10-31  Dan Williams  <dcbw at redhat.com>
+
 	* server/PackageJob.py
 		- Fixes for older python versions that don't have yum.Errors.* but
 			yum-utils' repomd module instead



From fedora-extras-commits at redhat.com  Tue Oct 31 18:27:53 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 11:27:53 -0700
Subject: rpms/q/devel q-7.5-curlopt.patch,NONE,1.1 q.spec,1.5,1.6
Message-ID: <200610311827.k9VIRrQP010678@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/q/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10629

Modified Files:
	q.spec 
Added Files:
	q-7.5-curlopt.patch 
Log Message:
patch for curloptions

q-7.5-curlopt.patch:

--- NEW FILE q-7.5-curlopt.patch ---
--- q-7.5/modules/curl/curl.c.curlopt	2006-10-31 19:19:44.000000000 +0100
+++ q-7.5/modules/curl/curl.c	2006-10-31 19:24:10.000000000 +0100
@@ -313,9 +313,9 @@
 #if LIBCURL_VERSION_NUM < 0x070a00
 #define CURLOPT_NOSIGNAL (-1)
 #endif
-#if LIBCURL_VERSION_NUM < 0x070402
+
 #define CURLOPT_PASSWDFUNCTION (-1)
-#endif
+
 #if LIBCURL_VERSION_NUM < 0x070702
 #define CURLOPT_HEADERFUNCTION (-1)
 #endif
@@ -1006,10 +1006,6 @@
 	cb = (int(*)())progress_cb;
 	dataopt = CURLOPT_PROGRESSDATA;
 	break;
-      case CURLOPT_PASSWDFUNCTION:
-	cb = (int(*)())passwd_cb;
-	dataopt = CURLOPT_PASSWDDATA;
-	break;
       case CURLOPT_HEADERFUNCTION:
 	cb = (int(*)())header_cb;
 	dataopt = CURLOPT_WRITEHEADER;


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/devel/q.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- q.spec	31 Oct 2006 16:15:09 -0000	1.5
+++ q.spec	31 Oct 2006 18:27:23 -0000	1.6
@@ -1,11 +1,12 @@
 Name: 		q
 Version: 	7.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPL
 Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
+Patch0:		q-7.5-curlopt.patch
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
@@ -64,6 +65,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i 's|/usr/sbin/apxs2|/usr/sbin/apxs -I../src -L../src|' mod_q/Makefile
 sed -i 's|@libtool@|libtool|' src/Makefile.in
 
@@ -154,6 +156,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-2
+- patch for curl options
+
 * Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
 - new version 7.5
 



From fedora-extras-commits at redhat.com  Tue Oct 31 18:31:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 11:31:42 -0700
Subject: rpms/q/FC-5 .cvsignore,1.3,1.4 q.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200610311831.k9VIVgfA011018@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/q/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10950/FC-5

Modified Files:
	.cvsignore q.spec sources 
Log Message:
new version 7.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Aug 2006 11:46:22 -0000	1.3
+++ .cvsignore	31 Oct 2006 18:31:12 -0000	1.4
@@ -1 +1 @@
-q-7.4.tar.gz
+q-7.5.tar.gz


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/q.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- q.spec	30 Aug 2006 11:46:22 -0000	1.3
+++ q.spec	31 Oct 2006 18:31:12 -0000	1.4
@@ -1,11 +1,11 @@
 Name: 		q
-Version: 	7.4
+Version: 	7.5
 Release: 	1%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPL
-Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.4.tar.gz
+Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
+- new version 7.5
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.4-1
 - new version 7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/q/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Aug 2006 11:46:22 -0000	1.3
+++ sources	31 Oct 2006 18:31:12 -0000	1.4
@@ -1 +1 @@
-0b6ddd02028aee60f5ee1cd1f8cc008a  q-7.4.tar.gz
+d556ee55016ff9f3ce328bb7962157fe  q-7.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 18:31:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 31 Oct 2006 11:31:43 -0700
Subject: rpms/q/FC-6 .cvsignore,1.3,1.4 q.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200610311831.k9VIVhvS011026@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/q/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10950/FC-6

Modified Files:
	.cvsignore q.spec sources 
Log Message:
new version 7.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Aug 2006 11:46:23 -0000	1.3
+++ .cvsignore	31 Oct 2006 18:31:13 -0000	1.4
@@ -1 +1 @@
-q-7.4.tar.gz
+q-7.5.tar.gz


Index: q.spec
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/q.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- q.spec	30 Aug 2006 11:46:23 -0000	1.4
+++ q.spec	31 Oct 2006 18:31:13 -0000	1.5
@@ -1,11 +1,11 @@
 Name: 		q
-Version: 	7.4
+Version: 	7.5
 Release: 	1%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPL
-Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.4.tar.gz
+Source: 	http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.5.tar.gz
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.5-1
+- new version 7.5
+
 * Wed Aug 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 7.4-1
 - new version 7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/q/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Aug 2006 11:46:23 -0000	1.3
+++ sources	31 Oct 2006 18:31:13 -0000	1.4
@@ -1 +1 @@
-0b6ddd02028aee60f5ee1cd1f8cc008a  q-7.4.tar.gz
+d556ee55016ff9f3ce328bb7962157fe  q-7.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 18:37:38 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 11:37:38 -0700
Subject: rpms/mod_fcgid/devel .cvsignore, 1.2, 1.3 configuration.htm, 1.1,
	1.2 doc.htm, 1.1, 1.2 mod_fcgid.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200610311837.k9VIbcBw011431@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/mod_fcgid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11373

Modified Files:
	.cvsignore configuration.htm doc.htm mod_fcgid.spec sources 
Log Message:
Update to 2.0
Source is now hosted at sourceforge.net
Update docs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 13:08:59 -0000	1.2
+++ .cvsignore	31 Oct 2006 18:37:08 -0000	1.3
@@ -1 +1 @@
-mod_fcgid.1.10.tar.gz
+mod_fcgid.2.0.tar.gz


Index: configuration.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/configuration.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configuration.htm	6 Sep 2006 13:08:59 -0000	1.1
+++ configuration.htm	31 Oct 2006 18:37:08 -0000	1.2
@@ -9,62 +9,62 @@
 
 <body>
 
-<p><b><a name="regular fastcgi"></a>This is a for regular fastcgi.&nbsp;</b><p>LoadModule fcgid_module           
+<p><b><a name="regular fastcgi"></a>This is a for regular fastcgi.&nbsp;</b><p>LoadModule fcgid_module              
 modules/mod_fcgid.so<p>
-&lt;Location /fcgid><br>         
-&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>         
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>         
-&nbsp;&nbsp;&nbsp; allow from all<br>         
+&lt;Location /fcgid><br>            
+&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>            
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>            
+&nbsp;&nbsp;&nbsp; allow from all<br>            
 &lt;/Location&gt;<p>
 &nbsp;
 <hr>
-<p><b><a name="suEXEC"></a>This is for suEXEC. Please get more information about suEXEC <a href="http://httpd.apache.org/docs-2.0/suexec.html">here</a>.&nbsp;</b><p>LoadModule fcgid_module            
+<p><b><a name="suEXEC"></a>This is for suEXEC. Please get more information about suEXEC <a href="http://httpd.apache.org/docs-2.0/suexec.html">here</a>.&nbsp;</b><p>LoadModule fcgid_module               
 modules/mod_fcgid.so<p>
-&lt;Location /fcgid&gt;<br>         
-&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>         
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>         
-&nbsp;&nbsp;&nbsp; allow from all<br>         
+&lt;Location /fcgid&gt;<br>            
+&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>            
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>            
+&nbsp;&nbsp;&nbsp; allow from all<br>            
 &lt;/Location&gt;<p>
-&lt;VirtualHost 192.168.1.89><br>         
-&nbsp;&nbsp;&nbsp; ServerAdmin <a href="mailto:webmaster at host.foo.com">webmaster at host.foo.com<br>        
-</a>&nbsp;&nbsp;&nbsp; DocumentRoot /usr/local/apache2/htdocs/<br>         
-&nbsp;&nbsp;&nbsp; ServerName host.foo.com<br>         
-&nbsp;&nbsp;&nbsp; SuexecUserGroup pqf pqf<br>         
+&lt;VirtualHost 192.168.1.89><br>            
+&nbsp;&nbsp;&nbsp; ServerAdmin <a href="mailto:webmaster at host.foo.com">webmaster at host.foo.com<br>           
+</a>&nbsp;&nbsp;&nbsp; DocumentRoot /usr/local/apache2/htdocs/<br>            
+&nbsp;&nbsp;&nbsp; ServerName host.foo.com<br>            
+&nbsp;&nbsp;&nbsp; SuexecUserGroup pqf pqf<br>            
 &lt;/VirtualHost&gt;<p>
 ??
 <hr>
-<p><b><a name="PHP"></a>This is for fastcgi-mode PHP (UNIX)</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>  
-&lt;Directory /usr/local/apache2/htdocs/php><br>         
-&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>         
-&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/bin/php .php<br>         
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>         
-&nbsp;&nbsp;&nbsp; allow from all<br>         
-&lt;/Directory><p><b>This works too:</b><p>LoadModule fcgid_module         
+<p><b><a name="PHP"></a>This is for fastcgi-mode PHP (UNIX)</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>     
+&lt;Directory /usr/local/apache2/htdocs/php><br>            
+&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>            
+&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/bin/php .php<br>            
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>            
+&nbsp;&nbsp;&nbsp; allow from all<br>            
+&lt;/Directory><p><b>This works too:</b><p>LoadModule fcgid_module            
 modules/mod_fcgid.so&nbsp;<p>
-AddHandler fcgid-script .php<br>        
-&lt;Directory /usr/local/apache2/htdocs/php&gt;<br>         
-&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/bin/php .php<br>         
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>         
-&nbsp;&nbsp;&nbsp; allow from all<br>         
+AddHandler fcgid-script .php<br>           
+&lt;Directory /usr/local/apache2/htdocs/php&gt;<br>            
+&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/bin/php .php<br>            
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>            
+&nbsp;&nbsp;&nbsp; allow from all<br>            
 &lt;/Directory&gt;<p><b># Please make sure:<br>    
 # php is configured with --enable-fastcgi option<br>    
 # check error_log(with debug level), if  
 any thing goes wrong</b> 
 <hr>
-<p><b><a name="suPHP"></a>This is for suPHP&nbsp; ( UNIX )</b>      
-<p>LoadModule fcgid_module modules/mod_fcgid.so<br>    
+<p><b><a name="suPHP"></a>This is for suPHP&nbsp; ( UNIX )</b>         
+<p>LoadModule fcgid_module modules/mod_fcgid.so<br>       
 <br>
-&lt;VirtualHost *:80><br>    
-&nbsp;&nbsp;&nbsp; ServerName test2.example.com<br>    
-&nbsp;&nbsp;&nbsp; DocumentRoot /usr/local/apache2/htdocs/test2.example.com/<br>    
-&nbsp;&nbsp;&nbsp; SuexecUserGroup pqf pqf<br>    
+&lt;VirtualHost *:80><br>       
+&nbsp;&nbsp;&nbsp; ServerName test2.example.com<br>       
+&nbsp;&nbsp;&nbsp; DocumentRoot /usr/local/apache2/htdocs/test2.example.com/<br>       
+&nbsp;&nbsp;&nbsp; SuexecUserGroup pqf pqf<br>       
 &lt;/VirtualHost><br>
 <br>
-&lt;Directory /usr/local/apache2/htdocs/test2.example.com/><br>    
-&nbsp;&nbsp;&nbsp; AddHandler fcgid-script .php<br>    
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br>    
-&nbsp;&nbsp;&nbsp; allow from all<br>    
-&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php<br>    
+&lt;Directory /usr/local/apache2/htdocs/test2.example.com/><br>       
+&nbsp;&nbsp;&nbsp; AddHandler fcgid-script .php<br>       
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>       
+&nbsp;&nbsp;&nbsp; allow from all<br>       
+&nbsp;&nbsp;&nbsp; FCGIWrapper /usr/local/apache2/htdocs/test2.example.com/php .php<br>       
 &lt;/Directory></p>
 <p>   
 <b>   
@@ -79,23 +79,89 @@
 
 <hr>
 <p><br>
-<b><a name="PHP-Windows"></a>This is for fastcgi-mode PHP ( Windows )</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>  
-&lt;Directory &quot;C:/Apache2/htdocs/php/&quot;&gt;<br>  
-&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>  
-&nbsp;&nbsp;&nbsp; Options execCGI<br>  
-&nbsp;&nbsp;&nbsp; AllowOverride None<br>  
-&nbsp;&nbsp;&nbsp; Order allow,deny<br>  
-&nbsp;&nbsp;&nbsp; Allow from all<br>  
-&nbsp;&nbsp;&nbsp; FCGIWrapper &quot;c:/php/php.exe&quot; .php<br>  
-&lt;/Directory><p><b>This works too:</b><p>LoadModule fcgid_module modules/mod_fcgid.so&nbsp;<p>
-AddHandler fcgid-script .php<br>
-&lt;Directory &quot;C:/Apache2/htdocs/php/&quot;&gt;<br> 
-&nbsp;&nbsp;&nbsp; FCGIWrapper &quot;c:/php/php.exe&quot; .php<br> 
-&nbsp;&nbsp;&nbsp; Options ExecCGI<br> 
-&nbsp;&nbsp;&nbsp; allow from all<br> 
+<b><a name="PHP-Windows"></a>This is for fastcgi-mode PHP ( Windows )</b><p>LoadModule fcgid_module modules/mod_fcgid.so<p>     
+&lt;Directory &quot;C:/Apache2/htdocs/php/&quot;&gt;<br>     
+&nbsp;&nbsp;&nbsp; SetHandler fcgid-script<br>     
+&nbsp;&nbsp;&nbsp; Options execCGI<br>     
+&nbsp;&nbsp;&nbsp; AllowOverride None<br>     
+&nbsp;&nbsp;&nbsp; Order allow,deny<br>     
+&nbsp;&nbsp;&nbsp; Allow from all<br>     
+&nbsp;&nbsp;&nbsp; FCGIWrapper &quot;c:/php/php.exe&quot; .php<br>     
+&lt;/Directory><p><b>This works too:</b><p>LoadModule fcgid_module modules/mod_fcgid.so&nbsp;<p>   
+AddHandler fcgid-script .php<br>   
+&lt;Directory &quot;C:/Apache2/htdocs/php/&quot;&gt;<br>    
+&nbsp;&nbsp;&nbsp; FCGIWrapper &quot;c:/php/php.exe&quot; .php<br>    
+&nbsp;&nbsp;&nbsp; Options ExecCGI<br>    
+&nbsp;&nbsp;&nbsp; allow from all<br>    
 &lt;/Directory&gt;<br>
 
 <hr>
+<p><b><a name="Authenticator"></a>This is for Authenticator</b></p>  
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p>&lt;Location /fcgid><br> 
+    SetHandler fcgid-script<br> 
+    Options ExecCGI<br> 
+    allow from all<br> 
+    AuthType Basic<br> 
+    AuthName ProtectedRealm<br> 
+    FastCgiAuthenticator /some/path/authenticator<br> 
+    require valid-user<br> 
+&lt;/Location><br>
+</p>
+<p><b>Another configuration: <a name="FastCgiAuthenticatorAuthoritative">FastCgiAuthenticatorAuthoritative</a> 
+(default On)</b></p>
+<p>Setting the <code>FastCgiAuthenticatorAuthoritative</code> directive 
+explicitly to <em>Off</em> allows authentication to be passed on to lower level 
+modules</p>
+
+<hr>
+<p><b><a name="Authorizer"></a>This is for Authorizer</b></p>  
+
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p>&lt;Location /fcgid><br> 
+    SetHandler fcgid-script<br> 
+    Options ExecCGI<br> 
+    allow from all<br> 
+    AuthType Basic<br> 
+    AuthName ProtectedRealm<br> 
+    FastCgiAuthorizer /some/place/Authorizer<br> 
+&lt;/Location></p>
+
+<p><b>Another configuration: <a name="FastCgiAuthorizerAuthoritative">FastCgiAuthorizerAuthoritative</a> 
+(default On)</b></p>
+
+<p>Setting the <code>FastCgiAuthorizerAuthoritative</code> directive explicitly 
+to <em>Off</em> allows authorization to be passed on to lower level modules</p>
+
+<hr>
+<p><b><a name="AccessChecker"></a>This is for AccessChecker</b></p>  
+<p>LoadModule fcgid_module modules/mod_fcgid.so
+<p>&lt;Location /fcgid><br> 
+    SetHandler fcgid-script<br> 
+    Options ExecCGI<br> 
+    allow from all<br> 
+    FastCgiAccessChecker /some/place/access-checker<br> 
+&lt;/Location><br>
+</p>
+<p><b>Another configuration: </b><a name="FastCgiAccessCheckerAuthoritative"><b>FastCgiAccessCheckerAuthoritative</b></a><b> 
+(default On)</b></p>
+<p>Setting the <code>FastCgiAccessCheckerAuthoritative</code> directive 
+explicitly to <em>Off</em> allows access checking to be passed on to lower level 
+modules</p>
+<p>??</p>
+<p>??</p>
+
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
+<p>??</p>
 <p>??</p>
 <p>??</p>
 <p>??</p>


Index: doc.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/doc.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doc.htm	6 Sep 2006 13:08:59 -0000	1.1
+++ doc.htm	31 Oct 2006 18:37:08 -0000	1.2
@@ -51,7 +51,10 @@
 (non-PHP, non-Ruby, non-Python)&nbsp;</a><p><a href="configuration.htm#suEXEC">Configuration
 for suEXEC fastcgi</a><p><a href="configuration.htm#PHP">Configuration for PHP
 (UNIX)</a><p><a href="configuration.htm#suPHP">Configuration for suPHP (UNIX)</a><p><a href="configuration.htm#PHP-Windows">Configuration
-for PHP (Windows)</a><p>&nbsp;
+for PHP (Windows)</a><p><a href="configuration.htm#Authenticator">Configuration
+for Authenticator</a><p><a href="configuration.htm#Authorizer">Configuration
+for Authorizer</a><p><a href="configuration.htm#AccessChecker">Configuration
+for AccessChecker</a><p>&nbsp;
 <hr>
 <ul>
   <li><h2><b><font size="4">There are
@@ -90,9 +93,16 @@
 fastcgi application.&nbsp;<p><b>IPCCommTimeout n (20 seconds)</b><p>The communication
 timeout to a fastcgi application. Please increase this value if your CGI have a
 slow initialization or slow respond.<p><b>OutputBufferSize n (64k bytes)</b><p>CGI
-output cache buffer size.<p><b>PHP_Fix_Pathinfo_Enable</b><b> n(n=0/1, default 0)</b><p>If
+output cache buffer size.<p><b>PHP_Fix_Pathinfo_Enable</b><b>  n(n=0/1, default 0)</b><p>If
 you are using PHP and set cgi.fix_pathinfo=1 in php.ini, set
-PHP_Fix_Pathinfo_Enable 1.
+PHP_Fix_Pathinfo_Enable 1.<p><b>MaxRequestsPerProcess n (-1)</b><p>(Added in
+version 1.11, patch from Robert L Mathews)<p>Adds a MaxRequestsPerProcess parameter that allows mod_fcgid to
+exit after handling a certain number of requests, similar to the existing ProcessLifeTime option.&nbsp;<p>This solves a problem with PHP in FastCGI mode. By default, PHP stops
+accepting new FastCGI connections after handling 500 requests; unfortunately, there is a potential race condition during the PHP cleanup code in which
+PHP can be shutting down but still have the socket open, so mod_fcgid under heavy load can send request number 501 to PHP and have it "accepted", but then
+PHP appears to simply exit, causing errors.<p>If you are using PHP, you should
+set it to 500. -1 mean fastcgi process will not exit no matter how many requests
+it has handled.<br>
 
 </td>
 


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_fcgid.spec	6 Sep 2006 13:47:08 -0000	1.2
+++ mod_fcgid.spec	31 Oct 2006 18:37:08 -0000	1.3
@@ -10,13 +10,13 @@
 %endif
 
 Name:           mod_fcgid
-Version:        1.10
-Release:        7%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Apache2 module for high-performance server-side scripting 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://fastcgi.coremail.cn/
-Source0:        http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz
+Source0:        http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
 Source1:        fcgid.conf
 Source2:        fastcgi.te
 Source3:        fastcgi.fc
@@ -144,6 +144,11 @@
 %endif
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth <paul at city-fan.org> 2.0-1
+- Update to 2.0
+- Source is now hosted at sourceforge.net
+- Update docs
+
 * Wed Sep  6 2006 Paul Howarth <paul at city-fan.org> 1.10-7
 - Include the right README* files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 13:08:59 -0000	1.2
+++ sources	31 Oct 2006 18:37:08 -0000	1.3
@@ -1 +1 @@
-6c36b18548ca64864ed3dd4cb759062f  mod_fcgid.1.10.tar.gz
+3aa51f1e293e6d881028295a23021dae  mod_fcgid.2.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 19:14:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 12:14:52 -0700
Subject: rpms/gaim-gadugadu/FC-6 dead.package,NONE,1.1
Message-ID: <200610311914.k9VJEq5o016315@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16308/FC-6

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


--- NEW FILE dead.package ---
Obsolete package.



From fedora-extras-commits at redhat.com  Tue Oct 31 19:14:57 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 12:14:57 -0700
Subject: rpms/gaim-gadugadu/devel dead.package,NONE,1.1
Message-ID: <200610311914.k9VJEv6P016332@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16308/devel

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


--- NEW FILE dead.package ---
Obsolete package.



From fedora-extras-commits at redhat.com  Tue Oct 31 19:18:07 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 12:18:07 -0700
Subject: rpms/gaim-gadugadu/FC-6 Makefile, 1.1, NONE gaim-gadugadu.spec, 1.1,
	NONE gaim2-PIE.patch, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610311918.k9VJI7KW016490@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16484/FC-6

Removed Files:
	Makefile gaim-gadugadu.spec gaim2-PIE.patch sources 
Log Message:
Removed files


--- Makefile DELETED ---


--- gaim-gadugadu.spec DELETED ---


--- gaim2-PIE.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:18:07 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 12:18:07 -0700
Subject: rpms/gaim-gadugadu/devel Makefile, 1.1, NONE gaim-gadugadu.spec, 1.1,
	NONE gaim2-PIE.patch, 1.1, NONE sources, 1.2, NONE
Message-ID: <200610311918.k9VJI79K016505@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16484/devel

Removed Files:
	Makefile gaim-gadugadu.spec gaim2-PIE.patch sources 
Log Message:
Removed files


--- Makefile DELETED ---


--- gaim-gadugadu.spec DELETED ---


--- gaim2-PIE.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:37:10 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 31 Oct 2006 12:37:10 -0700
Subject: rpms/w3c-markup-validator/FC-5
	w3c-markup-validator-0.7.3-html401.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-syspaths.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-xhtml1.patch, NONE,
	1.1 w3c-markup-validator.spec, 1.10,
	1.11 w3c-markup-validator-0.7.2-html401.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-syspaths.patch, 1.1, NONE
Message-ID: <200610311937.k9VJbA2l017433@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/FC-5

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.3-html401.patch 
	w3c-markup-validator-0.7.3-syspaths.patch 
	w3c-markup-validator-0.7.3-xhtml1.patch 
Removed Files:
	w3c-markup-validator-0.7.2-html401.patch 
	w3c-markup-validator-0.7.2-syspaths.patch 
Log Message:
* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
- Reference HTML 4.01 DTDs directly instead of making all system catalogs
  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
- Use system XHTML 1.0 DTDs.


w3c-markup-validator-0.7.3-html401.patch:

--- NEW FILE w3c-markup-validator-0.7.3-html401.patch ---
--- validator-0.7.3/htdocs/sgml-lib/sgml.soc~	2005-07-26 06:22:32.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/sgml.soc	2006-10-31 01:16:21.000000000 +0200
@@ -41,19 +41,19 @@
 PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN"	REC-html40-19980424/frameset.dtd
 
 	-- HTML 4.01 --
-PUBLIC "-//W3C//DTD HTML 4.01//EN"		REC-html401-19991224/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	REC-html401-19991224/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	REC-html401-19991224/frameset.dtd
-PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	REC-html401-19991224/HTMLspecial.ent
-PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//DTD HTML 4.01//EN"		/usr/share/sgml/html/4.01/strict.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	/usr/share/sgml/html/4.01/loose.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	/usr/share/sgml/html/4.01/frameset.dtd
+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	/usr/share/sgml/html/4.01/HTMLspecial.ent
+PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 	-- ISO-HTML --
 PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN"	ISO-HTML/15445.dtd
 PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN"	ISO-HTML/15445.dtd
-PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 
         -- Do not prefer document type name over a SYSTEM Identifier. --

w3c-markup-validator-0.7.3-syspaths.patch:

--- NEW FILE w3c-markup-validator-0.7.3-syspaths.patch ---
--- validator-0.7.3/httpd/cgi-bin/check~	2006-10-23 09:01:01.000000000 +0300
+++ validator-0.7.3/httpd/cgi-bin/check	2006-10-31 01:35:06.000000000 +0200
@@ -658,6 +658,7 @@
   #
   # Tell onsgmls about the SGML Library.
   $ENV{SGML_SEARCH_PATH} = $CFG->{Paths}->{SGML}->{Library};
+  $ENV{SGML_SEARCH_PATH} .= ":/usr/share/xml:/usr/share/sgml";
 
   #
   # Set the command to execute.

w3c-markup-validator-0.7.3-xhtml1.patch:

--- NEW FILE w3c-markup-validator-0.7.3-xhtml1.patch ---
--- validator-0.7.3/htdocs/sgml-lib/xml.soc~	2006-10-11 09:30:52.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/xml.soc	2006-10-31 01:30:03.000000000 +0200
@@ -36,17 +36,17 @@
        "REC-xhtml11-20010531/xhtml11-model-1.mod"
 
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "REC-xhtml1-20020801/xhtml1-strict.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-strict.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "REC-xhtml1-20020801/xhtml1-transitional.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-transitional.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-       "REC-xhtml1-20020801/xhtml1-frameset.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-frameset.dtd"
 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-lat1.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-lat1.ent"
 PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-symbol.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-symbol.ent"
 PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-special.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-special.ent"
 
 PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
        "REC-xhtml-basic-20001219/xhtml-basic10.dtd"


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/w3c-markup-validator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- w3c-markup-validator.spec	23 Oct 2006 21:13:24 -0000	1.10
+++ w3c-markup-validator.spec	31 Oct 2006 19:36:40 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -11,8 +11,9 @@
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
-Patch1:         %{name}-0.7.2-syspaths.patch
-Patch2:         %{name}-0.7.2-html401.patch
+Patch1:         %{name}-0.7.3-syspaths.patch
+Patch2:         %{name}-0.7.3-html401.patch
+Patch3:         %{name}-0.7.3-xhtml1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,8 @@
 Summary:        SGML and XML DTDs for the W3C Markup Validator
 Group:          Applications/Text
 Requires:       sgml-common
-Requires:       html401-dtds
+Requires:       html401-dtds /usr/share/sgml/html/4.01
+Requires:       xhtml1-dtds /usr/share/sgml/xhtml1/xhtml1-20020801/DTD
 
 %description    libs
 SGML and XML DTDs for the W3C Markup Validator.
@@ -38,10 +40,12 @@
 %prep
 %setup -q -a 1 -n validator-%{version}
 rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
+rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801
 mv validator-%{version}/htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p2
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -117,6 +121,11 @@
 
 
 %changelog
+* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
+- Reference HTML 4.01 DTDs directly instead of making all system catalogs
+  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
+- Use system XHTML 1.0 DTDs.
+
 * Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
 - 0.7.3, feedback and undebian patches applied upstream.
 - Use "W3C License" as the License tag to appease rpmlint.


--- w3c-markup-validator-0.7.2-html401.patch DELETED ---


--- w3c-markup-validator-0.7.2-syspaths.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:37:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 31 Oct 2006 12:37:11 -0700
Subject: rpms/w3c-markup-validator/FC-6
	w3c-markup-validator-0.7.3-html401.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-syspaths.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-xhtml1.patch, NONE,
	1.1 w3c-markup-validator.spec, 1.11,
	1.12 w3c-markup-validator-0.7.2-html401.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-syspaths.patch, 1.1, NONE
Message-ID: <200610311937.k9VJbB7o017437@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/FC-6

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.3-html401.patch 
	w3c-markup-validator-0.7.3-syspaths.patch 
	w3c-markup-validator-0.7.3-xhtml1.patch 
Removed Files:
	w3c-markup-validator-0.7.2-html401.patch 
	w3c-markup-validator-0.7.2-syspaths.patch 
Log Message:
* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
- Reference HTML 4.01 DTDs directly instead of making all system catalogs
  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
- Use system XHTML 1.0 DTDs.


w3c-markup-validator-0.7.3-html401.patch:

--- NEW FILE w3c-markup-validator-0.7.3-html401.patch ---
--- validator-0.7.3/htdocs/sgml-lib/sgml.soc~	2005-07-26 06:22:32.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/sgml.soc	2006-10-31 01:16:21.000000000 +0200
@@ -41,19 +41,19 @@
 PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN"	REC-html40-19980424/frameset.dtd
 
 	-- HTML 4.01 --
-PUBLIC "-//W3C//DTD HTML 4.01//EN"		REC-html401-19991224/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	REC-html401-19991224/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	REC-html401-19991224/frameset.dtd
-PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	REC-html401-19991224/HTMLspecial.ent
-PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//DTD HTML 4.01//EN"		/usr/share/sgml/html/4.01/strict.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	/usr/share/sgml/html/4.01/loose.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	/usr/share/sgml/html/4.01/frameset.dtd
+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	/usr/share/sgml/html/4.01/HTMLspecial.ent
+PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 	-- ISO-HTML --
 PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN"	ISO-HTML/15445.dtd
 PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN"	ISO-HTML/15445.dtd
-PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 
         -- Do not prefer document type name over a SYSTEM Identifier. --

w3c-markup-validator-0.7.3-syspaths.patch:

--- NEW FILE w3c-markup-validator-0.7.3-syspaths.patch ---
--- validator-0.7.3/httpd/cgi-bin/check~	2006-10-23 09:01:01.000000000 +0300
+++ validator-0.7.3/httpd/cgi-bin/check	2006-10-31 01:35:06.000000000 +0200
@@ -658,6 +658,7 @@
   #
   # Tell onsgmls about the SGML Library.
   $ENV{SGML_SEARCH_PATH} = $CFG->{Paths}->{SGML}->{Library};
+  $ENV{SGML_SEARCH_PATH} .= ":/usr/share/xml:/usr/share/sgml";
 
   #
   # Set the command to execute.

w3c-markup-validator-0.7.3-xhtml1.patch:

--- NEW FILE w3c-markup-validator-0.7.3-xhtml1.patch ---
--- validator-0.7.3/htdocs/sgml-lib/xml.soc~	2006-10-11 09:30:52.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/xml.soc	2006-10-31 01:30:03.000000000 +0200
@@ -36,17 +36,17 @@
        "REC-xhtml11-20010531/xhtml11-model-1.mod"
 
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "REC-xhtml1-20020801/xhtml1-strict.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-strict.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "REC-xhtml1-20020801/xhtml1-transitional.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-transitional.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-       "REC-xhtml1-20020801/xhtml1-frameset.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-frameset.dtd"
 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-lat1.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-lat1.ent"
 PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-symbol.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-symbol.ent"
 PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-special.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-special.ent"
 
 PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
        "REC-xhtml-basic-20001219/xhtml-basic10.dtd"


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/w3c-markup-validator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- w3c-markup-validator.spec	23 Oct 2006 21:13:25 -0000	1.11
+++ w3c-markup-validator.spec	31 Oct 2006 19:36:40 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -11,8 +11,9 @@
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
-Patch1:         %{name}-0.7.2-syspaths.patch
-Patch2:         %{name}-0.7.2-html401.patch
+Patch1:         %{name}-0.7.3-syspaths.patch
+Patch2:         %{name}-0.7.3-html401.patch
+Patch3:         %{name}-0.7.3-xhtml1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,8 @@
 Summary:        SGML and XML DTDs for the W3C Markup Validator
 Group:          Applications/Text
 Requires:       sgml-common
-Requires:       html401-dtds
+Requires:       html401-dtds /usr/share/sgml/html/4.01
+Requires:       xhtml1-dtds /usr/share/sgml/xhtml1/xhtml1-20020801/DTD
 
 %description    libs
 SGML and XML DTDs for the W3C Markup Validator.
@@ -38,10 +40,12 @@
 %prep
 %setup -q -a 1 -n validator-%{version}
 rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
+rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801
 mv validator-%{version}/htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p2
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -117,6 +121,11 @@
 
 
 %changelog
+* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
+- Reference HTML 4.01 DTDs directly instead of making all system catalogs
+  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
+- Use system XHTML 1.0 DTDs.
+
 * Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
 - 0.7.3, feedback and undebian patches applied upstream.
 - Use "W3C License" as the License tag to appease rpmlint.


--- w3c-markup-validator-0.7.2-html401.patch DELETED ---


--- w3c-markup-validator-0.7.2-syspaths.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:37:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 31 Oct 2006 12:37:17 -0700
Subject: rpms/w3c-markup-validator/devel
	w3c-markup-validator-0.7.3-html401.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-syspaths.patch, NONE,
	1.1 w3c-markup-validator-0.7.3-xhtml1.patch, NONE,
	1.1 w3c-markup-validator.spec, 1.11,
	1.12 w3c-markup-validator-0.7.2-html401.patch, 1.1,
	NONE w3c-markup-validator-0.7.2-syspaths.patch, 1.1, NONE
Message-ID: <200610311937.k9VJbHmP017443@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/devel

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.3-html401.patch 
	w3c-markup-validator-0.7.3-syspaths.patch 
	w3c-markup-validator-0.7.3-xhtml1.patch 
Removed Files:
	w3c-markup-validator-0.7.2-html401.patch 
	w3c-markup-validator-0.7.2-syspaths.patch 
Log Message:
* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
- Reference HTML 4.01 DTDs directly instead of making all system catalogs
  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
- Use system XHTML 1.0 DTDs.


w3c-markup-validator-0.7.3-html401.patch:

--- NEW FILE w3c-markup-validator-0.7.3-html401.patch ---
--- validator-0.7.3/htdocs/sgml-lib/sgml.soc~	2005-07-26 06:22:32.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/sgml.soc	2006-10-31 01:16:21.000000000 +0200
@@ -41,19 +41,19 @@
 PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN"	REC-html40-19980424/frameset.dtd
 
 	-- HTML 4.01 --
-PUBLIC "-//W3C//DTD HTML 4.01//EN"		REC-html401-19991224/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	REC-html401-19991224/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	REC-html401-19991224/frameset.dtd
-PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	REC-html401-19991224/HTMLspecial.ent
-PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//DTD HTML 4.01//EN"		/usr/share/sgml/html/4.01/strict.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	/usr/share/sgml/html/4.01/loose.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	/usr/share/sgml/html/4.01/frameset.dtd
+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	/usr/share/sgml/html/4.01/HTMLspecial.ent
+PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 	-- ISO-HTML --
 PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN"	ISO-HTML/15445.dtd
 PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN"	ISO-HTML/15445.dtd
-PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 
         -- Do not prefer document type name over a SYSTEM Identifier. --

w3c-markup-validator-0.7.3-syspaths.patch:

--- NEW FILE w3c-markup-validator-0.7.3-syspaths.patch ---
--- validator-0.7.3/httpd/cgi-bin/check~	2006-10-23 09:01:01.000000000 +0300
+++ validator-0.7.3/httpd/cgi-bin/check	2006-10-31 01:35:06.000000000 +0200
@@ -658,6 +658,7 @@
   #
   # Tell onsgmls about the SGML Library.
   $ENV{SGML_SEARCH_PATH} = $CFG->{Paths}->{SGML}->{Library};
+  $ENV{SGML_SEARCH_PATH} .= ":/usr/share/xml:/usr/share/sgml";
 
   #
   # Set the command to execute.

w3c-markup-validator-0.7.3-xhtml1.patch:

--- NEW FILE w3c-markup-validator-0.7.3-xhtml1.patch ---
--- validator-0.7.3/htdocs/sgml-lib/xml.soc~	2006-10-11 09:30:52.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/xml.soc	2006-10-31 01:30:03.000000000 +0200
@@ -36,17 +36,17 @@
        "REC-xhtml11-20010531/xhtml11-model-1.mod"
 
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "REC-xhtml1-20020801/xhtml1-strict.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-strict.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "REC-xhtml1-20020801/xhtml1-transitional.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-transitional.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-       "REC-xhtml1-20020801/xhtml1-frameset.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-frameset.dtd"
 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-lat1.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-lat1.ent"
 PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-symbol.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-symbol.ent"
 PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-special.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-special.ent"
 
 PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
        "REC-xhtml-basic-20001219/xhtml-basic10.dtd"


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- w3c-markup-validator.spec	23 Oct 2006 21:13:31 -0000	1.11
+++ w3c-markup-validator.spec	31 Oct 2006 19:36:46 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -11,8 +11,9 @@
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
-Patch1:         %{name}-0.7.2-syspaths.patch
-Patch2:         %{name}-0.7.2-html401.patch
+Patch1:         %{name}-0.7.3-syspaths.patch
+Patch2:         %{name}-0.7.3-html401.patch
+Patch3:         %{name}-0.7.3-xhtml1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,8 @@
 Summary:        SGML and XML DTDs for the W3C Markup Validator
 Group:          Applications/Text
 Requires:       sgml-common
-Requires:       html401-dtds
+Requires:       html401-dtds /usr/share/sgml/html/4.01
+Requires:       xhtml1-dtds /usr/share/sgml/xhtml1/xhtml1-20020801/DTD
 
 %description    libs
 SGML and XML DTDs for the W3C Markup Validator.
@@ -38,10 +40,12 @@
 %prep
 %setup -q -a 1 -n validator-%{version}
 rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
+rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801
 mv validator-%{version}/htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p2
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -117,6 +121,11 @@
 
 
 %changelog
+* Tue Oct 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-2
+- Reference HTML 4.01 DTDs directly instead of making all system catalogs
+  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
+- Use system XHTML 1.0 DTDs.
+
 * Mon Oct 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.3-1
 - 0.7.3, feedback and undebian patches applied upstream.
 - Use "W3C License" as the License tag to appease rpmlint.


--- w3c-markup-validator-0.7.2-html401.patch DELETED ---


--- w3c-markup-validator-0.7.2-syspaths.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Oct 31 19:38:10 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 31 Oct 2006 12:38:10 -0700
Subject: rpms/moodss/devel .cvsignore,1.10,1.11 sources,1.11,1.12
Message-ID: <200610311938.k9VJcAVY017495@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17455

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2006 18:10:21 -0000	1.10
+++ .cvsignore	31 Oct 2006 19:37:39 -0000	1.11
@@ -1 +1 @@
-moodss-21.3.tar.bz2
+moodss-21.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2006 18:10:21 -0000	1.11
+++ sources	31 Oct 2006 19:37:40 -0000	1.12
@@ -1 +1 @@
-8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2
+3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 19:44:58 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 31 Oct 2006 12:44:58 -0700
Subject: rpms/moodss/devel moodss.spec,1.24,1.25
Message-ID: <200610311944.k9VJiwwa017879@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17819/devel

Modified Files:
	moodss.spec 
Log Message:
21.4 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- moodss.spec	24 Oct 2006 18:29:30 -0000	1.24
+++ moodss.spec	31 Oct 2006 19:44:28 -0000	1.25
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.3
+Version: 21.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Oct 25 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.4-1
+- 21.4 upstream release
+
 * Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
 - 21.3 upstream release
 



From fedora-extras-commits at redhat.com  Tue Oct 31 19:47:04 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 31 Oct 2006 12:47:04 -0700
Subject: rpms/moodss/FC-5 .cvsignore, 1.10, 1.11 moodss.spec, 1.23,
	1.24 sources, 1.11, 1.12
Message-ID: <200610311947.k9VJl4Wf018007@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17955

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.4 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2006 18:25:36 -0000	1.10
+++ .cvsignore	31 Oct 2006 19:46:33 -0000	1.11
@@ -1 +1 @@
-moodss-21.3.tar.bz2
+moodss-21.4.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/moodss.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- moodss.spec	24 Oct 2006 18:25:36 -0000	1.23
+++ moodss.spec	31 Oct 2006 19:46:33 -0000	1.24
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.3
+Version: 21.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Oct 25 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.4-1
+- 21.4 upstream release
+
 * Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
 - 21.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2006 18:25:36 -0000	1.11
+++ sources	31 Oct 2006 19:46:33 -0000	1.12
@@ -1 +1 @@
-8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2
+3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 19:47:49 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 31 Oct 2006 12:47:49 -0700
Subject: fedora-security/audit fc5,1.377,1.378 fc6,1.130,1.131
Message-ID: <200610311947.k9VJlnaF018097@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18071/audit

Modified Files:
	fc5 fc6 
Log Message:
Add CVE-2006-5619



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- fc5	31 Oct 2006 16:13:07 -0000	1.377
+++ fc5	31 Oct 2006 19:47:47 -0000	1.378
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- fc6	31 Oct 2006 16:13:07 -0000	1.130
+++ fc6	31 Oct 2006 19:47:47 -0000	1.131
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360



From fedora-extras-commits at redhat.com  Tue Oct 31 19:52:55 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Tue, 31 Oct 2006 12:52:55 -0700
Subject: rpms/subversion-api-docs/FC-6 doxygen.conf, 1.1,
	1.2 subversion-api-docs.spec, 1.6, 1.7
Message-ID: <200610311952.k9VJqtO6018412@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18340

Modified Files:
	doxygen.conf subversion-api-docs.spec 
Log Message:
Prepare to push the button on 1.4.0.



Index: doxygen.conf
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/FC-6/doxygen.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doxygen.conf	9 Apr 2006 08:49:09 -0000	1.1
+++ doxygen.conf	31 Oct 2006 19:52:24 -0000	1.2
@@ -373,7 +373,7 @@
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
 # in the documentation.
 
-SHOW_DIRECTORIES       = YES
+SHOW_DIRECTORIES       = NO
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that 
 # doxygen should invoke to get the current version for each file (typically from the 


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/FC-6/subversion-api-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- subversion-api-docs.spec	16 Sep 2006 02:35:20 -0000	1.6
+++ subversion-api-docs.spec	31 Oct 2006 19:52:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		subversion-api-docs
-Version:	1.3.2
-Release:	2.1%{?dist}
+Version:	1.4.0
+Release:	1%{?dist}
 Summary:	Subversion API documentation
 
 Group:		Development/Tools
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Wed Nov 01 2006 Bojan Smojver <bojan at rexursive.com> 1.4.0-1
+- bump up to 1.4.0
+
 * Sat Sep 16 2006 Bojan Smojver <bojan at rexursive.com> 1.3.2-2.1
 - mass rebuild
 



From fedora-extras-commits at redhat.com  Tue Oct 31 19:57:48 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 31 Oct 2006 12:57:48 -0700
Subject: rpms/moodss/FC-6 .cvsignore, 1.10, 1.11 moodss.spec, 1.24,
	1.25 sources, 1.11, 1.12
Message-ID: <200610311957.k9VJvmTb018632@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18584

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.4 upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2006 18:27:05 -0000	1.10
+++ .cvsignore	31 Oct 2006 19:57:18 -0000	1.11
@@ -1 +1 @@
-moodss-21.3.tar.bz2
+moodss-21.4.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/moodss.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- moodss.spec	24 Oct 2006 18:27:05 -0000	1.24
+++ moodss.spec	31 Oct 2006 19:57:18 -0000	1.25
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.3
+Version: 21.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Oct 25 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.4-1
+- 21.4 upstream release
+
 * Fri Sep 29 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.3-1
 - 21.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2006 18:27:05 -0000	1.11
+++ sources	31 Oct 2006 19:57:18 -0000	1.12
@@ -1 +1 @@
-8092a0d3146ebac3293ff2daa53d1986  moodss-21.3.tar.bz2
+3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Oct 31 20:02:54 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 31 Oct 2006 13:02:54 -0700
Subject: comps comps-fe5.xml.in,1.182,1.183
Message-ID: <200610312002.k9VK2sik022002@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21962

Modified Files:
	comps-fe5.xml.in 
Log Message:
Added sextractor and wcstools to fe5 comps



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- comps-fe5.xml.in	26 Oct 2006 05:53:58 -0000	1.182
+++ comps-fe5.xml.in	31 Oct 2006 20:02:24 -0000	1.183
@@ -269,7 +269,9 @@
       <packagereq type="optional">R-RScaLAPACK</packagereq>
       <packagereq type="optional">scalapack</packagereq>
       <packagereq type="optional">scrip</packagereq>
+      <packagereq type="optional">sextractor</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
+      <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Tue Oct 31 20:07:36 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Tue, 31 Oct 2006 13:07:36 -0700
Subject: comps comps-fe6.xml.in,1.205,1.206 comps-fe7.xml.in,1.3,1.4
Message-ID: <200610312007.k9VK7a9q022265@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22181

Modified Files:
	comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Added sextractor and wcstools to fe6 and fe7



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- comps-fe6.xml.in	26 Oct 2006 05:53:58 -0000	1.205
+++ comps-fe6.xml.in	31 Oct 2006 20:07:05 -0000	1.206
@@ -321,8 +321,10 @@
       <packagereq type="optional">rrdtool</packagereq>
       <packagereq type="optional">scalapack</packagereq>
       <packagereq type="optional">scrip</packagereq>
+      <packagereq type="optional">sextractor</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
       <packagereq type="optional">veusz</packagereq>
+      <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">xcircuit</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
     </packagelist>


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comps-fe7.xml.in	26 Oct 2006 05:53:58 -0000	1.3
+++ comps-fe7.xml.in	31 Oct 2006 20:07:05 -0000	1.4
@@ -321,8 +321,10 @@
       <packagereq type="optional">rrdtool</packagereq>
       <packagereq type="optional">scalapack</packagereq>
       <packagereq type="optional">scrip</packagereq>
+      <packagereq type="optional">sextractor</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
       <packagereq type="optional">veusz</packagereq>
+      <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">xcircuit</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
     </packagelist>



From fedora-extras-commits at redhat.com  Tue Oct 31 20:28:16 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Oct 2006 13:28:16 -0700
Subject: owners owners.list,1.1879,1.1880
Message-ID: <200610312028.k9VKSGkp022963@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22942

Modified Files:
	owners.list 
Log Message:
Add python-zope-interface


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1879
retrieving revision 1.1880
diff -u -r1.1879 -r1.1880
--- owners.list	30 Oct 2006 20:41:33 -0000	1.1879
+++ owners.list	31 Oct 2006 20:27:45 -0000	1.1880
@@ -1938,6 +1938,7 @@
 Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|
+Fedora Extras|python-zope-interface|Zope interfaces package|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|PyX|Python graphics package|mpeters at mac.com|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|tcallawa at redhat.com|extras-qa at fedoraproject.org|foolish at guezz.net,jpmahowald at gmail.com



From fedora-extras-commits at redhat.com  Tue Oct 31 20:30:23 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 31 Oct 2006 13:30:23 -0700
Subject: rpms/grip/FC-6 grip.spec,1.14,1.15
Message-ID: <200610312030.k9VKUNeY023029@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23001

Modified Files:
	grip.spec 
Log Message:
* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-14
- rebuilt for new curl



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/FC-6/grip.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- grip.spec	9 Sep 2006 17:18:55 -0000	1.14
+++ grip.spec	31 Oct 2006 20:29:53 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -74,6 +74,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-14
+- rebuilt for new curl
+
 * Sat Sep 09 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-13
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Oct 31 20:52:17 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 31 Oct 2006 13:52:17 -0700
Subject: rpms/fbida/FC-6 fbida.spec,1.18,1.19
Message-ID: <200610312052.k9VKqHVD024939@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24921

Modified Files:
	fbida.spec 
Log Message:
* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 2.06-3
- rebuilt for new curl



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-6/fbida.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fbida.spec	29 Sep 2006 05:49:48 -0000	1.18
+++ fbida.spec	31 Oct 2006 20:51:47 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -68,6 +68,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 2.06-3
+- rebuilt for new curl
+
 * Fri Sep 29 2006 Adrian Reber <adrian at lisas.de> - 2.06-2
 - obsoleted fbida-ida subpackage (#208457)
 



From fedora-extras-commits at redhat.com  Tue Oct 31 20:57:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 13:57:15 -0700
Subject: rpms/gaim-gadugadu/FC-6 dead.package,1.1,1.2
Message-ID: <200610312057.k9VKvF3C025146@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116/gaim-gadugadu/FC-6

Modified Files:
	dead.package 
Log Message:
Added more informations


Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/gaim-gadugadu/FC-6/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	31 Oct 2006 19:14:51 -0000	1.1
+++ dead.package	31 Oct 2006 20:56:44 -0000	1.2
@@ -1 +1,5 @@
 Obsolete package.
+
+Gadu-Gadu support is now included in gaim package, so gaim-gadugadu is unnecessary.
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209000



From fedora-extras-commits at redhat.com  Tue Oct 31 20:57:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Tue, 31 Oct 2006 13:57:15 -0700
Subject: rpms/gaim-gadugadu/devel dead.package,1.1,1.2
Message-ID: <200610312057.k9VKvF38025149@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/extras/rpms/gaim-gadugadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116/gaim-gadugadu/devel

Modified Files:
	dead.package 
Log Message:
Added more informations


Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/gaim-gadugadu/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	31 Oct 2006 19:14:57 -0000	1.1
+++ dead.package	31 Oct 2006 20:56:45 -0000	1.2
@@ -1 +1,5 @@
 Obsolete package.
+
+Gadu-Gadu support is now included in gaim package, so gaim-gadugadu is unnecessary.
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209000



From fedora-extras-commits at redhat.com  Tue Oct 31 21:16:39 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 31 Oct 2006 14:16:39 -0700
Subject: rpms/fbida/devel fbida.spec,1.18,1.19
Message-ID: <200610312116.k9VLGdRF028286@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28270

Modified Files:
	fbida.spec 
Log Message:
* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 2.06-3
- rebuilt for new curl



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fbida.spec	29 Sep 2006 05:49:48 -0000	1.18
+++ fbida.spec	31 Oct 2006 21:16:08 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -68,6 +68,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 2.06-3
+- rebuilt for new curl
+
 * Fri Sep 29 2006 Adrian Reber <adrian at lisas.de> - 2.06-2
 - obsoleted fbida-ida subpackage (#208457)
 



From fedora-extras-commits at redhat.com  Tue Oct 31 21:32:43 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 31 Oct 2006 14:32:43 -0700
Subject: rpms/grip/devel grip.spec,1.14,1.15
Message-ID: <200610312132.k9VLWh5g028428@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28407

Modified Files:
	grip.spec 
Log Message:
* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-14
- rebuilt for new curl



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- grip.spec	9 Sep 2006 17:18:55 -0000	1.14
+++ grip.spec	31 Oct 2006 21:32:13 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -74,6 +74,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 31 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-14
+- rebuilt for new curl
+
 * Sat Sep 09 2006 Adrian Reber <adrian at lisas.de> - 1:3.2.0-13
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Oct 31 21:39:52 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 31 Oct 2006 14:39:52 -0700
Subject: rpms/pyicq-t/devel .cvsignore, 1.2, 1.3 pyicq-t.init, 1.1,
	1.2 pyicq-t.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610312139.k9VLdqkt028529@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/pyicq-t/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28507

Modified Files:
	.cvsignore pyicq-t.init pyicq-t.spec sources 
Log Message:
* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq
-t&relid=28)
- Fix init script to create subsys lock file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2006 23:42:07 -0000	1.2
+++ .cvsignore	31 Oct 2006 21:39:22 -0000	1.3
@@ -1 +1 @@
-pyicq-t-0.7b.tar.gz
+pyicq-t-0.8.tar.gz


Index: pyicq-t.init
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/pyicq-t.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyicq-t.init	5 Aug 2006 23:42:07 -0000	1.1
+++ pyicq-t.init	31 Oct 2006 21:39:22 -0000	1.2
@@ -12,7 +12,7 @@
         echo -n $"Starting ICQ transport: "
 	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
         RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
         echo
         return $RETVAL
 }


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/pyicq-t.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyicq-t.spec	8 Sep 2006 02:42:23 -0000	1.3
+++ pyicq-t.spec	31 Oct 2006 21:39:22 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           pyicq-t
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-0.7b.tar.gz
+Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -23,7 +23,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-Provides:	pyicqt
+Provides:       pyicqt
 Obsoletes:      pyicqt
 
 %description
@@ -45,7 +45,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n pyicq-t-0.7b
+%setup -q
 %patch0 -p0
 
 %build
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
+- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq-t&relid=28)
+- Fix init script to create subsys lock file
+
 * Thu Sep  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.7-5
 - Really no longer ghost *.pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2006 23:42:07 -0000	1.2
+++ sources	31 Oct 2006 21:39:22 -0000	1.3
@@ -1 +1 @@
-7de0df9311eb6923e6f59fdd914bb6ab  pyicq-t-0.7b.tar.gz
+0929aa4b726d8718e1b8c8cb900fa114  pyicq-t-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 21:42:59 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 31 Oct 2006 14:42:59 -0700
Subject: rpms/pyicq-t/FC-6 .cvsignore, 1.2, 1.3 pyicq-t.init, 1.1,
	1.2 pyicq-t.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610312142.k9VLgxvL028622@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/pyicq-t/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28598

Modified Files:
	.cvsignore pyicq-t.init pyicq-t.spec sources 
Log Message:
* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq
-t&relid=28)
- Fix init script to create subsys lock file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2006 23:42:07 -0000	1.2
+++ .cvsignore	31 Oct 2006 21:42:29 -0000	1.3
@@ -1 +1 @@
-pyicq-t-0.7b.tar.gz
+pyicq-t-0.8.tar.gz


Index: pyicq-t.init
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-6/pyicq-t.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyicq-t.init	5 Aug 2006 23:42:07 -0000	1.1
+++ pyicq-t.init	31 Oct 2006 21:42:29 -0000	1.2
@@ -12,7 +12,7 @@
         echo -n $"Starting ICQ transport: "
 	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
         RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
         echo
         return $RETVAL
 }


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-6/pyicq-t.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyicq-t.spec	8 Sep 2006 02:42:23 -0000	1.3
+++ pyicq-t.spec	31 Oct 2006 21:42:29 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           pyicq-t
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-0.7b.tar.gz
+Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -23,7 +23,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-Provides:	pyicqt
+Provides:       pyicqt
 Obsoletes:      pyicqt
 
 %description
@@ -45,7 +45,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n pyicq-t-0.7b
+%setup -q
 %patch0 -p0
 
 %build
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
+- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq-t&relid=28)
+- Fix init script to create subsys lock file
+
 * Thu Sep  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.7-5
 - Really no longer ghost *.pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2006 23:42:07 -0000	1.2
+++ sources	31 Oct 2006 21:42:29 -0000	1.3
@@ -1 +1 @@
-7de0df9311eb6923e6f59fdd914bb6ab  pyicq-t-0.7b.tar.gz
+0929aa4b726d8718e1b8c8cb900fa114  pyicq-t-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 21:45:25 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 31 Oct 2006 14:45:25 -0700
Subject: rpms/pyicq-t/FC-5 .cvsignore, 1.2, 1.3 pyicq-t.init, 1.1,
	1.2 pyicq-t.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610312145.k9VLjPJP028701@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/pyicq-t/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28669

Modified Files:
	.cvsignore pyicq-t.init pyicq-t.spec sources 
Log Message:
* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq
-t&relid=28)
- Fix init script to create subsys lock file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2006 23:42:07 -0000	1.2
+++ .cvsignore	31 Oct 2006 21:44:55 -0000	1.3
@@ -1 +1 @@
-pyicq-t-0.7b.tar.gz
+pyicq-t-0.8.tar.gz


Index: pyicq-t.init
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-5/pyicq-t.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyicq-t.init	5 Aug 2006 23:42:07 -0000	1.1
+++ pyicq-t.init	31 Oct 2006 21:44:55 -0000	1.2
@@ -12,7 +12,7 @@
         echo -n $"Starting ICQ transport: "
 	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
         RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
         echo
         return $RETVAL
 }


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-5/pyicq-t.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyicq-t.spec	8 Sep 2006 02:43:16 -0000	1.3
+++ pyicq-t.spec	31 Oct 2006 21:44:55 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           pyicq-t
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-0.7b.tar.gz
+Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -23,7 +23,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-Provides:	pyicqt
+Provides:       pyicqt
 Obsoletes:      pyicqt
 
 %description
@@ -45,7 +45,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n pyicq-t-0.7b
+%setup -q
 %patch0 -p0
 
 %build
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
+- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq-t&relid=28)
+- Fix init script to create subsys lock file
+
 * Thu Sep  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.7-5
 - Really no longer ghost *.pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2006 23:42:07 -0000	1.2
+++ sources	31 Oct 2006 21:44:55 -0000	1.3
@@ -1 +1 @@
-7de0df9311eb6923e6f59fdd914bb6ab  pyicq-t-0.7b.tar.gz
+0929aa4b726d8718e1b8c8cb900fa114  pyicq-t-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 21:46:32 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 31 Oct 2006 14:46:32 -0700
Subject: rpms/pyicq-t/FC-4 .cvsignore, 1.2, 1.3 pyicq-t.init, 1.1,
	1.2 pyicq-t.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200610312146.k9VLkWaT028772@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/pyicq-t/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28750

Modified Files:
	.cvsignore pyicq-t.init pyicq-t.spec sources 
Log Message:
* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq
-t&relid=28)
- Fix init script to create subsys lock file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2006 23:42:07 -0000	1.2
+++ .cvsignore	31 Oct 2006 21:46:02 -0000	1.3
@@ -1 +1 @@
-pyicq-t-0.7b.tar.gz
+pyicq-t-0.8.tar.gz


Index: pyicq-t.init
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-4/pyicq-t.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyicq-t.init	5 Aug 2006 23:42:07 -0000	1.1
+++ pyicq-t.init	31 Oct 2006 21:46:02 -0000	1.2
@@ -12,7 +12,7 @@
         echo -n $"Starting ICQ transport: "
 	(cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml)  && success || failure
         RETVAL=$?
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
         echo
         return $RETVAL
 }


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-4/pyicq-t.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyicq-t.spec	8 Sep 2006 02:43:55 -0000	1.3
+++ pyicq-t.spec	31 Oct 2006 21:46:02 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           pyicq-t
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://pyicq-t.blathersource.org/
-Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-0.7b.tar.gz
+Source0:        http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -23,7 +23,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-Provides:	pyicqt
+Provides:       pyicqt
 Obsoletes:      pyicqt
 
 %description
@@ -45,7 +45,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n pyicq-t-0.7b
+%setup -q
 %patch0 -p0
 
 %build
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Oct 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.8-1
+- Update to 0.8 (see http://www.blathersource.org/releases_view.php?projid=pyicq-t&relid=28)
+- Fix init script to create subsys lock file
+
 * Thu Sep  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.7-5
 - Really no longer ghost *.pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2006 23:42:07 -0000	1.2
+++ sources	31 Oct 2006 21:46:02 -0000	1.3
@@ -1 +1 @@
-7de0df9311eb6923e6f59fdd914bb6ab  pyicq-t-0.7b.tar.gz
+0929aa4b726d8718e1b8c8cb900fa114  pyicq-t-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Oct 31 22:36:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Oct 2006 15:36:28 -0700
Subject: rpms/gambas/devel gambas.spec,1.18,1.19
Message-ID: <200610312236.k9VMaS0T032141@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32124

Modified Files:
	gambas.spec 
Log Message:

Booooooooo!



Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gambas.spec	11 Sep 2006 01:44:17 -0000	1.18
+++ gambas.spec	31 Oct 2006 22:35:57 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.17
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -416,6 +416,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Tue Oct 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.17-4
+- a spoooky halloween bump for development
+
 * Sun Sep 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.17-3
 - disable x86_64, code is not (and likely never will be) 64bit clean
 



From fedora-extras-commits at redhat.com  Tue Oct 31 23:04:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 31 Oct 2006 16:04:33 -0700
Subject: rpms/gnome-applet-timer/FC-6 gnome-applet-timer.spec,1.7,1.8
Message-ID: <200610312304.k9VN4X6W002742@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2707/FC-6

Modified Files:
	gnome-applet-timer.spec 
Log Message:
fix of email adress


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-6/gnome-applet-timer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-applet-timer.spec	31 Oct 2006 02:11:21 -0000	1.7
+++ gnome-applet-timer.spec	31 Oct 2006 23:04:01 -0000	1.8
@@ -87,7 +87,7 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
-* Tue Oct 31 2006 Christoph Wickert <fedora wickert at arcor de> - 1.3.1-1
+* Tue Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 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



From fedora-extras-commits at redhat.com  Tue Oct 31 23:04:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 31 Oct 2006 16:04:34 -0700
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.7,1.8
Message-ID: <200610312304.k9VN4YJk002743@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2707/devel

Modified Files:
	gnome-applet-timer.spec 
Log Message:
fix of email adress


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-applet-timer.spec	31 Oct 2006 01:44:57 -0000	1.7
+++ gnome-applet-timer.spec	31 Oct 2006 23:04:04 -0000	1.8
@@ -87,7 +87,7 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
-* Tue Oct 31 2006 Christoph Wickert <fedora wickert at arcor de> - 1.3.1-1
+* Tue Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 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



From fedora-extras-commits at redhat.com  Tue Oct 31 23:11:47 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Oct 2006 16:11:47 -0700
Subject: rpms/cmake/devel cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.8,
	1.9
Message-ID: <200610312311.k9VNBl8o003139@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3114

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	11 Jul 2006 16:41:17 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:11:16 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cmake.spec	30 Aug 2006 02:26:07 -0000	1.8
+++ cmake.spec	31 Oct 2006 23:11:16 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-4
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Tue Oct 31 23:14:09 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Oct 2006 16:14:09 -0700
Subject: rpms/cmake/FC-5 cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.4,
	1.5
Message-ID: <200610312314.k9VNE9gq003223@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184/FC-5

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	31 Jul 2006 19:33:45 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:39 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cmake.spec	2 Aug 2006 17:55:32 -0000	1.4
+++ cmake.spec	31 Oct 2006 23:13:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Wed Aug  2 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-2
 - vim 7.0 now ships cmake files, so don't ship ours (bug #201018)
 - Add patch to Linux.cmake for Fortran soname support for plplot



From fedora-extras-commits at redhat.com  Tue Oct 31 23:14:10 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Oct 2006 16:14:10 -0700
Subject: rpms/cmake/FC-6 cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.8,
	1.9
Message-ID: <200610312314.k9VNEA8H003227@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184/FC-6

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	11 Jul 2006 16:41:17 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:40 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/cmake.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cmake.spec	30 Aug 2006 02:26:07 -0000	1.8
+++ cmake.spec	31 Oct 2006 23:13:40 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-4
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Tue Oct 31 23:16:03 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Oct 2006 16:16:03 -0700
Subject: rpms/cmake/FC-4 cmake-2.4.2-fedora.patch, 1.1, 1.2 cmake.spec, 1.6,
	1.7
Message-ID: <200610312316.k9VNG38N003262@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3241

Modified Files:
	cmake-2.4.2-fedora.patch cmake.spec 
Log Message:
Add /usr/lib/jvm/java to FindJNI search paths


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/cmake-2.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.4.2-fedora.patch	31 Jul 2006 19:32:26 -0000	1.1
+++ cmake-2.4.2-fedora.patch	31 Oct 2006 23:15:32 -0000	1.2
@@ -42,3 +42,21 @@
    /usr/local/share/swig1.3)
  IF(EXISTS ${SWIG_DIR})
    IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
+--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
++++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
+@@ -14,6 +14,7 @@
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   /usr/lib
++  /usr/lib/jvm/java/lib
+   /usr/local/lib
+   /usr/lib/java/jre/lib/i386
+   /usr/local/lib/java/jre/lib/i386
+@@ -27,6 +28,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
++  /usr/lib/jvm/java/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/cmake.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cmake.spec	2 Aug 2006 17:54:37 -0000	1.6
+++ cmake.spec	31 Oct 2006 23:15:32 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		cmake
 Version:	2.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
+- Add /usr/lib/jvm/java to FindJNI search paths
+
 * Wed Aug  2 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-2
 - Add patch to Linux.cmake for Fortran soname support for plplot